From b91ac0de1dd900aae4b476425db6df763ed454d8 Mon Sep 17 00:00:00 2001
From: Wang Jiyuan <59059173+EurFelux@users.noreply.github.com>
Date: Fri, 20 Jun 2025 22:30:14 +0800
Subject: [PATCH 01/75] fix(models): Unexpected inability to disable image
 generation feature (#7401)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(models): 修复禁用图片生成模型检查逻辑

* fix(models): use getBaseName()
---
 src/renderer/src/config/models.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/src/config/models.ts b/src/renderer/src/config/models.ts
index 23ba31557a..9cb07528e3 100644
--- a/src/renderer/src/config/models.ts
+++ b/src/renderer/src/config/models.ts
@@ -2720,7 +2720,7 @@ export function isSupportedDisableGenerationModel(model: Model): boolean {
     return false
   }
 
-  return SUPPORTED_DISABLE_GENERATION_MODELS.includes(model.id)
+  return SUPPORTED_DISABLE_GENERATION_MODELS.includes(getBaseModelName(model.id))
 }
 
 export function getOpenAIWebSearchParams(model: Model, isEnableWebSearch?: boolean): Record<string, any> {

From 37aaaee0866c214c5643518a796dad7009aa27cf Mon Sep 17 00:00:00 2001
From: beyondkmp <beyondkmp@gmail.com>
Date: Sat, 21 Jun 2025 19:47:15 +0800
Subject: [PATCH 02/75] fix: add node-stream-zip for zip file extraction in
 install-bun script (#7403)

* chore(package): add node-stream-zip for zip file extraction in install-bun script

* refactor(install-uv): replace AdmZip with node-stream-zip for improved zip file extraction

* fix(install-uv): ensure correct extraction of uv binary for Unix/Linux/macOS

* refactor(install-uv): remove redundant file handling and cleanup for Unix/Linux/macOS installation

* fix(install-uv): update tar extraction command to strip leading components for Unix/Linux/macOS

* fix(install-uv): clarify comment for zip file extraction on Windows

* fix(install-bun): correct extraction directory for bun binary

* fix(install-bun, install-uv): update default versions and improve zip extraction process

* fix(install-bun): remove redundant cleanup of source directory after bun installation
---
 package.json                     |  2 +-
 resources/scripts/install-bun.js | 45 ++++++++---------
 resources/scripts/install-uv.js  | 84 ++++++++++++++------------------
 3 files changed, 60 insertions(+), 71 deletions(-)

diff --git a/package.json b/package.json
index 57f14e728d..dc29289380 100644
--- a/package.json
+++ b/package.json
@@ -62,6 +62,7 @@
     "@libsql/win32-x64-msvc": "^0.4.7",
     "@strongtz/win32-arm64-msvc": "^0.4.7",
     "jsdom": "26.1.0",
+    "node-stream-zip": "^1.15.0",
     "notion-helper": "^1.3.22",
     "os-proxy-config": "^1.1.2",
     "selection-hook": "^0.9.23",
@@ -176,7 +177,6 @@
     "mermaid": "^11.6.0",
     "mime": "^4.0.4",
     "motion": "^12.10.5",
-    "node-stream-zip": "^1.15.0",
     "npx-scope-finder": "^1.2.0",
     "officeparser": "^4.1.1",
     "openai": "patch:openai@npm%3A5.1.0#~/.yarn/patches/openai-npm-5.1.0-0e7b3ccb07.patch",
diff --git a/resources/scripts/install-bun.js b/resources/scripts/install-bun.js
index 9637c60f3a..8e232dfa9c 100644
--- a/resources/scripts/install-bun.js
+++ b/resources/scripts/install-bun.js
@@ -2,12 +2,12 @@ const fs = require('fs')
 const path = require('path')
 const os = require('os')
 const { execSync } = require('child_process')
-const AdmZip = require('adm-zip')
+const StreamZip = require('node-stream-zip')
 const { downloadWithRedirects } = require('./download')
 
 // Base URL for downloading bun binaries
 const BUN_RELEASE_BASE_URL = 'https://gitcode.com/CherryHQ/bun/releases/download'
-const DEFAULT_BUN_VERSION = '1.2.9' // Default fallback version
+const DEFAULT_BUN_VERSION = '1.2.17' // Default fallback version
 
 // Mapping of platform+arch to binary package name
 const BUN_PACKAGES = {
@@ -66,35 +66,36 @@ async function downloadBunBinary(platform, arch, version = DEFAULT_BUN_VERSION,
 
     // Extract the zip file using adm-zip
     console.log(`Extracting ${packageName} to ${binDir}...`)
-    const zip = new AdmZip(tempFilename)
-    zip.extractAllTo(tempdir, true)
+    const zip = new StreamZip.async({ file: tempFilename })
 
-    // Move files using Node.js fs
-    const sourceDir = path.join(tempdir, packageName.split('.')[0])
-    const files = fs.readdirSync(sourceDir)
+    // Get all entries in the zip file
+    const entries = await zip.entries()
 
-    for (const file of files) {
-      const sourcePath = path.join(sourceDir, file)
-      const destPath = path.join(binDir, file)
+    // Extract files directly to binDir, flattening the directory structure
+    for (const entry of Object.values(entries)) {
+      if (!entry.isDirectory) {
+        // Get just the filename without path
+        const filename = path.basename(entry.name)
+        const outputPath = path.join(binDir, filename)
 
-      fs.copyFileSync(sourcePath, destPath)
-      fs.unlinkSync(sourcePath)
-
-      // Set executable permissions for non-Windows platforms
-      if (platform !== 'win32') {
-        try {
-          // 755 permission: rwxr-xr-x
-          fs.chmodSync(destPath, '755')
-        } catch (error) {
-          console.warn(`Warning: Failed to set executable permissions: ${error.message}`)
+        console.log(`Extracting ${entry.name} -> ${filename}`)
+        await zip.extract(entry.name, outputPath)
+        // Make executable files executable on Unix-like systems
+        if (platform !== 'win32') {
+          try {
+            fs.chmodSync(outputPath, 0o755)
+          } catch (chmodError) {
+            console.error(`Warning: Failed to set executable permissions on ${filename}`)
+            return false
+          }
         }
+        console.log(`Extracted ${entry.name} -> ${outputPath}`)
       }
     }
+    await zip.close()
 
     // Clean up
     fs.unlinkSync(tempFilename)
-    fs.rmSync(sourceDir, { recursive: true })
-
     console.log(`Successfully installed bun ${version} for ${platformKey}`)
     return true
   } catch (error) {
diff --git a/resources/scripts/install-uv.js b/resources/scripts/install-uv.js
index 32892b9c63..2c882d07da 100644
--- a/resources/scripts/install-uv.js
+++ b/resources/scripts/install-uv.js
@@ -2,34 +2,33 @@ const fs = require('fs')
 const path = require('path')
 const os = require('os')
 const { execSync } = require('child_process')
-const tar = require('tar')
-const AdmZip = require('adm-zip')
+const StreamZip = require('node-stream-zip')
 const { downloadWithRedirects } = require('./download')
 
 // Base URL for downloading uv binaries
 const UV_RELEASE_BASE_URL = 'https://gitcode.com/CherryHQ/uv/releases/download'
-const DEFAULT_UV_VERSION = '0.6.14'
+const DEFAULT_UV_VERSION = '0.7.13'
 
 // Mapping of platform+arch to binary package name
 const UV_PACKAGES = {
-  'darwin-arm64': 'uv-aarch64-apple-darwin.tar.gz',
-  'darwin-x64': 'uv-x86_64-apple-darwin.tar.gz',
+  'darwin-arm64': 'uv-aarch64-apple-darwin.zip',
+  'darwin-x64': 'uv-x86_64-apple-darwin.zip',
   'win32-arm64': 'uv-aarch64-pc-windows-msvc.zip',
   'win32-ia32': 'uv-i686-pc-windows-msvc.zip',
   'win32-x64': 'uv-x86_64-pc-windows-msvc.zip',
-  'linux-arm64': 'uv-aarch64-unknown-linux-gnu.tar.gz',
-  'linux-ia32': 'uv-i686-unknown-linux-gnu.tar.gz',
-  'linux-ppc64': 'uv-powerpc64-unknown-linux-gnu.tar.gz',
-  'linux-ppc64le': 'uv-powerpc64le-unknown-linux-gnu.tar.gz',
-  'linux-s390x': 'uv-s390x-unknown-linux-gnu.tar.gz',
-  'linux-x64': 'uv-x86_64-unknown-linux-gnu.tar.gz',
-  'linux-armv7l': 'uv-armv7-unknown-linux-gnueabihf.tar.gz',
+  'linux-arm64': 'uv-aarch64-unknown-linux-gnu.zip',
+  'linux-ia32': 'uv-i686-unknown-linux-gnu.zip',
+  'linux-ppc64': 'uv-powerpc64-unknown-linux-gnu.zip',
+  'linux-ppc64le': 'uv-powerpc64le-unknown-linux-gnu.zip',
+  'linux-s390x': 'uv-s390x-unknown-linux-gnu.zip',
+  'linux-x64': 'uv-x86_64-unknown-linux-gnu.zip',
+  'linux-armv7l': 'uv-armv7-unknown-linux-gnueabihf.zip',
   // MUSL variants
-  'linux-musl-arm64': 'uv-aarch64-unknown-linux-musl.tar.gz',
-  'linux-musl-ia32': 'uv-i686-unknown-linux-musl.tar.gz',
-  'linux-musl-x64': 'uv-x86_64-unknown-linux-musl.tar.gz',
-  'linux-musl-armv6l': 'uv-arm-unknown-linux-musleabihf.tar.gz',
-  'linux-musl-armv7l': 'uv-armv7-unknown-linux-musleabihf.tar.gz'
+  'linux-musl-arm64': 'uv-aarch64-unknown-linux-musl.zip',
+  'linux-musl-ia32': 'uv-i686-unknown-linux-musl.zip',
+  'linux-musl-x64': 'uv-x86_64-unknown-linux-musl.zip',
+  'linux-musl-armv6l': 'uv-arm-unknown-linux-musleabihf.zip',
+  'linux-musl-armv7l': 'uv-armv7-unknown-linux-musleabihf.zip'
 }
 
 /**
@@ -66,46 +65,35 @@ async function downloadUvBinary(platform, arch, version = DEFAULT_UV_VERSION, is
 
     console.log(`Extracting ${packageName} to ${binDir}...`)
 
-    // 根据文件扩展名选择解压方法
-    if (packageName.endsWith('.zip')) {
-      // 使用 adm-zip 处理 zip 文件
-      const zip = new AdmZip(tempFilename)
-      zip.extractAllTo(binDir, true)
-      fs.unlinkSync(tempFilename)
-      console.log(`Successfully installed uv ${version} for ${platform}-${arch}`)
-      return true
-    } else {
-      // tar.gz 文件的处理保持不变
-      await tar.x({
-        file: tempFilename,
-        cwd: tempdir,
-        z: true
-      })
+    const zip = new StreamZip.async({ file: tempFilename })
 
-      // Move files using Node.js fs
-      const sourceDir = path.join(tempdir, packageName.split('.')[0])
-      const files = fs.readdirSync(sourceDir)
-      for (const file of files) {
-        const sourcePath = path.join(sourceDir, file)
-        const destPath = path.join(binDir, file)
-        fs.copyFileSync(sourcePath, destPath)
-        fs.unlinkSync(sourcePath)
+    // Get all entries in the zip file
+    const entries = await zip.entries()
 
-        // Set executable permissions for non-Windows platforms
+    // Extract files directly to binDir, flattening the directory structure
+    for (const entry of Object.values(entries)) {
+      if (!entry.isDirectory) {
+        // Get just the filename without path
+        const filename = path.basename(entry.name)
+        const outputPath = path.join(binDir, filename)
+
+        console.log(`Extracting ${entry.name} -> ${filename}`)
+        await zip.extract(entry.name, outputPath)
+        // Make executable files executable on Unix-like systems
         if (platform !== 'win32') {
           try {
-            fs.chmodSync(destPath, '755')
-          } catch (error) {
-            console.warn(`Warning: Failed to set executable permissions: ${error.message}`)
+            fs.chmodSync(outputPath, 0o755)
+          } catch (chmodError) {
+            console.error(`Warning: Failed to set executable permissions on ${filename}`)
+            return false
           }
         }
+        console.log(`Extracted ${entry.name} -> ${outputPath}`)
       }
-
-      // Clean up
-      fs.unlinkSync(tempFilename)
-      fs.rmSync(sourceDir, { recursive: true })
     }
 
+    await zip.close()
+    fs.unlinkSync(tempFilename)
     console.log(`Successfully installed uv ${version} for ${platform}-${arch}`)
     return true
   } catch (error) {

From 60b37876b1ab3bc555583a3bc9f5cd42a71b6a08 Mon Sep 17 00:00:00 2001
From: Wang Jiyuan <59059173+EurFelux@users.noreply.github.com>
Date: Sat, 21 Jun 2025 21:20:40 +0800
Subject: [PATCH 03/75] fix: remove duplicated deepseek-v3 in volcengine
 (#7406)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix: 移除重复的DeepSeek-V3模型配置
---
 src/renderer/src/config/models.ts | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/renderer/src/config/models.ts b/src/renderer/src/config/models.ts
index 9cb07528e3..a847f6d491 100644
--- a/src/renderer/src/config/models.ts
+++ b/src/renderer/src/config/models.ts
@@ -1352,12 +1352,6 @@ export const SYSTEM_MODELS: Record<string, Model[]> = {
       name: 'DeepSeek-V3',
       group: 'DeepSeek'
     },
-    {
-      id: 'deepseek-v3-250324',
-      provider: 'doubao',
-      name: 'DeepSeek-V3',
-      group: 'DeepSeek'
-    },
     {
       id: 'doubao-pro-32k-241215',
       provider: 'doubao',

From c660aaba3db6df6e6b5edfa135341da07c176446 Mon Sep 17 00:00:00 2001
From: beyondkmp <beyondkmp@gmail.com>
Date: Sun, 22 Jun 2025 10:32:23 +0800
Subject: [PATCH 04/75] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=9B=AE=E5=BD=95=E8=BF=81=E7=A7=BB=E7=9A=84bug=20(#7?=
 =?UTF-8?q?386)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: move initAppDataDir function inline and remove export from utils/file.ts

* fix some bugs

* fix shouldcopy error

* fix: handle appDataPath initialization and update logic in file.ts; update defaultChecked in DataSettings component

* fix: improve appDataPath handling and migration logic in file.ts

* fix: add error message for selecting the same app data path in DataSettings component and update localization files

* fix: ensure migration confirmation modal is shown correctly in DataSettings component

* feat: add new IPC channel for retrieving data path from arguments and update related components for migration handling

* fix: update app data path validation to check for prefix match in DataSettings component

* refactor: simplify data migration logic in DataSettings component by removing unnecessary flag

* fix: update initAppDataDir invocation to check for app packaging status in bootstrap.ts
---
 packages/shared/IpcChannel.ts                 |   3 +
 src/main/bootstrap.ts                         |   5 +
 src/main/index.ts                             |   7 +-
 src/main/ipc.ts                               |  26 +++-
 src/main/utils/file.ts                        |  84 ++++++++----
 src/preload/index.ts                          |   5 +-
 src/renderer/src/hooks/useAppInit.ts          |   8 ++
 src/renderer/src/i18n/locales/en-us.json      |   9 +-
 src/renderer/src/i18n/locales/ja-jp.json      |  11 +-
 src/renderer/src/i18n/locales/ru-ru.json      |   9 +-
 src/renderer/src/i18n/locales/zh-cn.json      |   9 +-
 src/renderer/src/i18n/locales/zh-tw.json      |   9 +-
 .../settings/DataSettings/DataSettings.tsx    | 129 ++++++++++++++----
 13 files changed, 240 insertions(+), 74 deletions(-)
 create mode 100644 src/main/bootstrap.ts

diff --git a/packages/shared/IpcChannel.ts b/packages/shared/IpcChannel.ts
index d02cd15be8..4c6988cf6e 100644
--- a/packages/shared/IpcChannel.ts
+++ b/packages/shared/IpcChannel.ts
@@ -20,6 +20,9 @@ export enum IpcChannel {
   App_Copy = 'app:copy',
   App_SetStopQuitApp = 'app:set-stop-quit-app',
   App_SetAppDataPath = 'app:set-app-data-path',
+  App_GetDataPathFromArgs = 'app:get-data-path-from-args',
+  App_FlushAppData = 'app:flush-app-data',
+  App_IsNotEmptyDir = 'app:is-not-empty-dir',
   App_RelaunchApp = 'app:relaunch-app',
   App_IsBinaryExist = 'app:is-binary-exist',
   App_GetBinaryPath = 'app:get-binary-path',
diff --git a/src/main/bootstrap.ts b/src/main/bootstrap.ts
new file mode 100644
index 0000000000..f682c06fcd
--- /dev/null
+++ b/src/main/bootstrap.ts
@@ -0,0 +1,5 @@
+import { app } from 'electron'
+
+import { initAppDataDir } from './utils/file'
+
+app.isPackaged && initAppDataDir()
diff --git a/src/main/index.ts b/src/main/index.ts
index 102264317a..3699335a90 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -1,7 +1,11 @@
+// don't reorder this file, it's used to initialize the app data dir and
+// other which should be run before the main process is ready
+// eslint-disable-next-line
+import './bootstrap'
+
 import '@main/config'
 
 import { electronApp, optimizer } from '@electron-toolkit/utils'
-import { initAppDataDir } from '@main/utils/file'
 import { replaceDevtoolsFont } from '@main/utils/windowUtil'
 import { app } from 'electron'
 import installExtension, { REACT_DEVELOPER_TOOLS, REDUX_DEVTOOLS } from 'electron-devtools-installer'
@@ -22,7 +26,6 @@ import { registerShortcuts } from './services/ShortcutService'
 import { TrayService } from './services/TrayService'
 import { windowService } from './services/WindowService'
 
-initAppDataDir()
 Logger.initialize()
 
 /**
diff --git a/src/main/ipc.ts b/src/main/ipc.ts
index 1fc398b8c6..5e1ac819a9 100644
--- a/src/main/ipc.ts
+++ b/src/main/ipc.ts
@@ -34,7 +34,7 @@ import { setOpenLinkExternal } from './services/WebviewService'
 import { windowService } from './services/WindowService'
 import { calculateDirectorySize, getResourcePath } from './utils'
 import { decrypt, encrypt } from './utils/aes'
-import { getCacheDir, getConfigDir, getFilesDir, hasWritePermission, updateConfig } from './utils/file'
+import { getCacheDir, getConfigDir, getFilesDir, hasWritePermission, updateAppDataConfig } from './utils/file'
 import { compress, decompress } from './utils/zip'
 
 const fileManager = new FileStorage()
@@ -218,10 +218,28 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
 
   // Set app data path
   ipcMain.handle(IpcChannel.App_SetAppDataPath, async (_, filePath: string) => {
-    updateConfig(filePath)
+    updateAppDataConfig(filePath)
     app.setPath('userData', filePath)
   })
 
+  ipcMain.handle(IpcChannel.App_GetDataPathFromArgs, () => {
+    return process.argv
+      .slice(1)
+      .find((arg) => arg.startsWith('--new-data-path='))
+      ?.split('--new-data-path=')[1]
+  })
+
+  ipcMain.handle(IpcChannel.App_FlushAppData, () => {
+    BrowserWindow.getAllWindows().forEach((w) => {
+      w.webContents.session.flushStorageData()
+      w.webContents.session.cookies.flushStore()
+    })
+  })
+
+  ipcMain.handle(IpcChannel.App_IsNotEmptyDir, async (_, path: string) => {
+    return fs.readdirSync(path).length > 0
+  })
+
   // Copy user data to new location
   ipcMain.handle(IpcChannel.App_Copy, async (_, oldPath: string, newPath: string) => {
     try {
@@ -234,8 +252,8 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   })
 
   // Relaunch app
-  ipcMain.handle(IpcChannel.App_RelaunchApp, () => {
-    app.relaunch()
+  ipcMain.handle(IpcChannel.App_RelaunchApp, (_, options?: Electron.RelaunchOptions) => {
+    app.relaunch(options)
     app.exit(0)
   })
 
diff --git a/src/main/utils/file.ts b/src/main/utils/file.ts
index 737dcee0ba..177a28a90f 100644
--- a/src/main/utils/file.ts
+++ b/src/main/utils/file.ts
@@ -8,6 +8,20 @@ import { FileType, FileTypes } from '@types'
 import { app } from 'electron'
 import { v4 as uuidv4 } from 'uuid'
 
+export function initAppDataDir() {
+  const appDataPath = getAppDataPathFromConfig()
+  if (appDataPath) {
+    app.setPath('userData', appDataPath)
+    return
+  }
+
+  if (isPortable) {
+    const portableDir = process.env.PORTABLE_EXECUTABLE_DIR
+    app.setPath('userData', path.join(portableDir || app.getPath('exe'), 'data'))
+    return
+  }
+}
+
 // 创建文件类型映射表，提高查找效率
 const fileTypeMap = new Map<string, FileTypes>()
 
@@ -35,46 +49,70 @@ export function hasWritePermission(path: string) {
 function getAppDataPathFromConfig() {
   try {
     const configPath = path.join(getConfigDir(), 'config.json')
-    if (fs.existsSync(configPath)) {
-      const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'))
-      if (config.appDataPath && fs.existsSync(config.appDataPath) && hasWritePermission(config.appDataPath)) {
-        return config.appDataPath
-      }
+    if (!fs.existsSync(configPath)) {
+      return null
     }
+
+    const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'))
+
+    if (!config.appDataPath) {
+      return null
+    }
+
+    let appDataPath = null
+    // 兼容旧版本
+    if (config.appDataPath && typeof config.appDataPath === 'string') {
+      appDataPath = config.appDataPath
+      // 将旧版本数据迁移到新版本
+      appDataPath && updateAppDataConfig(appDataPath)
+    } else {
+      appDataPath = config.appDataPath.find(
+        (item: { executablePath: string }) => item.executablePath === app.getPath('exe')
+      )?.dataPath
+    }
+
+    if (appDataPath && fs.existsSync(appDataPath) && hasWritePermission(appDataPath)) {
+      return appDataPath
+    }
+
+    return null
   } catch (error) {
     return null
   }
-  return null
 }
 
-export function initAppDataDir() {
-  const appDataPath = getAppDataPathFromConfig()
-  if (appDataPath) {
-    app.setPath('userData', appDataPath)
-    return
-  }
-
-  if (isPortable) {
-    const portableDir = process.env.PORTABLE_EXECUTABLE_DIR
-    app.setPath('userData', path.join(portableDir || app.getPath('exe'), 'data'))
-    return
-  }
-}
-
-export function updateConfig(appDataPath: string) {
+export function updateAppDataConfig(appDataPath: string) {
   const configDir = getConfigDir()
   if (!fs.existsSync(configDir)) {
     fs.mkdirSync(configDir, { recursive: true })
   }
 
+  // config.json
+  // appDataPath: [{ executablePath: string, dataPath: string }]
   const configPath = path.join(getConfigDir(), 'config.json')
   if (!fs.existsSync(configPath)) {
-    fs.writeFileSync(configPath, JSON.stringify({ appDataPath }, null, 2))
+    fs.writeFileSync(
+      configPath,
+      JSON.stringify({ appDataPath: [{ executablePath: app.getPath('exe'), dataPath: appDataPath }] }, null, 2)
+    )
     return
   }
 
   const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'))
-  config.appDataPath = appDataPath
+  if (!config.appDataPath || (config.appDataPath && typeof config.appDataPath !== 'object')) {
+    config.appDataPath = []
+  }
+
+  const existingPath = config.appDataPath.find(
+    (item: { executablePath: string }) => item.executablePath === app.getPath('exe')
+  )
+
+  if (existingPath) {
+    existingPath.dataPath = appDataPath
+  } else {
+    config.appDataPath.push({ executablePath: app.getPath('exe'), dataPath: appDataPath })
+  }
+
   fs.writeFileSync(configPath, JSON.stringify(config, null, 2))
 }
 
diff --git a/src/preload/index.ts b/src/preload/index.ts
index 2a8ac3df89..5138d4e4de 100644
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -29,9 +29,12 @@ const api = {
   select: (options: Electron.OpenDialogOptions) => ipcRenderer.invoke(IpcChannel.App_Select, options),
   hasWritePermission: (path: string) => ipcRenderer.invoke(IpcChannel.App_HasWritePermission, path),
   setAppDataPath: (path: string) => ipcRenderer.invoke(IpcChannel.App_SetAppDataPath, path),
+  getDataPathFromArgs: () => ipcRenderer.invoke(IpcChannel.App_GetDataPathFromArgs),
   copy: (oldPath: string, newPath: string) => ipcRenderer.invoke(IpcChannel.App_Copy, oldPath, newPath),
   setStopQuitApp: (stop: boolean, reason: string) => ipcRenderer.invoke(IpcChannel.App_SetStopQuitApp, stop, reason),
-  relaunchApp: () => ipcRenderer.invoke(IpcChannel.App_RelaunchApp),
+  flushAppData: () => ipcRenderer.invoke(IpcChannel.App_FlushAppData),
+  isNotEmptyDir: (path: string) => ipcRenderer.invoke(IpcChannel.App_IsNotEmptyDir, path),
+  relaunchApp: (options?: Electron.RelaunchOptions) => ipcRenderer.invoke(IpcChannel.App_RelaunchApp, options),
   openWebsite: (url: string) => ipcRenderer.invoke(IpcChannel.Open_Website, url),
   getCacheSize: () => ipcRenderer.invoke(IpcChannel.App_GetCacheSize),
   clearCache: () => ipcRenderer.invoke(IpcChannel.App_ClearCache),
diff --git a/src/renderer/src/hooks/useAppInit.ts b/src/renderer/src/hooks/useAppInit.ts
index 531582708d..8b5fe0ade6 100644
--- a/src/renderer/src/hooks/useAppInit.ts
+++ b/src/renderer/src/hooks/useAppInit.ts
@@ -30,6 +30,14 @@ export function useAppInit() {
     console.timeEnd('init')
   }, [])
 
+  useEffect(() => {
+    window.api.getDataPathFromArgs().then((dataPath) => {
+      if (dataPath) {
+        window.navigate('/settings/data', { replace: true })
+      }
+    })
+  }, [])
+
   useUpdateHandler()
   useFullScreenNotice()
 
diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index b62c708825..b8bcfb66b2 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -1087,10 +1087,10 @@
         "app_data": "App Data",
         "app_data.select": "Modify Directory",
         "app_data.select_title": "Change App Data Directory",
-        "app_data.restart_notice": "The app will need to restart to apply the changes",
-        "app_data.copy_data_option": "Copy data from original directory to new directory",
+        "app_data.restart_notice": "The app may need to restart multiple times to apply the changes",
+        "app_data.copy_data_option": "Copy data, will automatically restart after copying the original directory data to the new directory",
         "app_data.copy_time_notice": "Copying data may take a while, do not force quit app",
-        "app_data.path_changed_without_copy": "Path changed successfully, but data not copied",
+        "app_data.path_changed_without_copy": "Path changed successfully",
         "app_data.copying_warning": "Data copying, do not force quit app",
         "app_data.copying": "Copying data to new location...",
         "app_data.copy_success": "Successfully copied data to new location",
@@ -1103,6 +1103,9 @@
         "app_data.select_error_root_path": "New path cannot be the root path",
         "app_data.select_error_write_permission": "New path does not have write permission",
         "app_data.stop_quit_app_reason": "The app is currently migrating data and cannot be exited",
+        "app_data.select_not_empty_dir": "New path is not empty",
+        "app_data.select_not_empty_dir_content": "New path is not empty, if you select copy, it will overwrite the data in the new path, there is a risk of data loss, continue?",
+        "app_data.select_error_same_path": "New path is the same as the old path, please select another path",
         "app_knowledge": "Knowledge Base Files",
         "app_knowledge.button.delete": "Delete File",
         "app_knowledge.remove_all": "Remove Knowledge Base Files",
diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json
index bc363a0e91..430cba8351 100644
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@@ -1085,10 +1085,10 @@
         "app_data": "アプリデータ",
         "app_data.select": "ディレクトリを変更",
         "app_data.select_title": "アプリデータディレクトリの変更",
-        "app_data.restart_notice": "変更を適用するには、アプリを再起動する必要があります",
-        "app_data.copy_data_option": "データをコピーする, 開くと元のディレクトリのデータが新しいディレクトリにコピーされます",
-        "app_data.copy_time_notice": "データコピーには時間がかかります。アプリを強制終了しないでください",
-        "app_data.path_changed_without_copy": "パスが変更されましたが、データがコピーされていません",
+        "app_data.restart_notice": "変更を適用するには、アプリを再起動する必要があります。",
+        "app_data.copy_data_option": "データをコピーする, 開くと元のディレクトリのデータが新しいディレクトリにコピーされます。",
+        "app_data.copy_time_notice": "データコピーには時間がかかります。アプリを強制終了しないでください。",
+        "app_data.path_changed_without_copy": "パスが変更されました。",
         "app_data.copying_warning": "データコピー中、アプリを強制終了しないでください",
         "app_data.copying": "新しい場所にデータをコピーしています...",
         "app_data.copy_success": "データを新しい場所に正常にコピーしました",
@@ -1101,6 +1101,9 @@
         "app_data.select_error_root_path": "新しいパスはルートパスにできません",
         "app_data.select_error_write_permission": "新しいパスに書き込み権限がありません",
         "app_data.stop_quit_app_reason": "アプリは現在データを移行しているため、終了できません",
+        "app_data.select_not_empty_dir": "新しいパスは空ではありません",
+        "app_data.select_not_empty_dir_content": "新しいパスは空ではありません。コピーを選択すると、新しいパスのデータが上書きされます。データが失われるリスクがあります。続行しますか？",
+        "app_data.select_error_same_path": "新しいパスは元のパスと同じです。別のパスを選択してください",
         "app_knowledge": "知識ベースファイル",
         "app_knowledge.button.delete": "ファイルを削除",
         "app_knowledge.remove_all": "ナレッジベースファイルを削除",
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index 8b325b4b31..af26cddf92 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -1085,10 +1085,10 @@
         "app_data": "Данные приложения",
         "app_data.select": "Изменить директорию",
         "app_data.select_title": "Изменить директорию данных приложения",
-        "app_data.restart_notice": "Для применения изменений потребуется перезапуск приложения",
-        "app_data.copy_data_option": "Копировать данные из исходной директории в новую директорию",
+        "app_data.restart_notice": "Для применения изменений может потребоваться несколько перезапусков приложения",
+        "app_data.copy_data_option": "Копировать данные, будет автоматически перезапущено после копирования данных из исходной директории в новую директорию",
         "app_data.copy_time_notice": "Копирование данных из исходной директории займет некоторое время, пожалуйста, будьте терпеливы",
-        "app_data.path_changed_without_copy": "Путь изменен успешно, но данные не скопированы",
+        "app_data.path_changed_without_copy": "Путь изменен успешно",
         "app_data.copying_warning": "Копирование данных, нельзя взаимодействовать с приложением, не закрывайте приложение",
         "app_data.copying": "Копирование данных в новое место...",
         "app_data.copy_success": "Данные успешно скопированы в новое место",
@@ -1101,6 +1101,9 @@
         "app_data.select_error_root_path": "Новый путь не может быть корневым",
         "app_data.select_error_write_permission": "Новый путь не имеет разрешения на запись",
         "app_data.stop_quit_app_reason": "Приложение в настоящее время перемещает данные и не может быть закрыто",
+        "app_data.select_not_empty_dir": "Новый путь не пуст",
+        "app_data.select_not_empty_dir_content": "Новый путь не пуст, если вы выбираете копирование, он перезапишет данные в новом пути, есть риск потери данных, продолжить?",
+        "app_data.select_error_same_path": "Новый путь совпадает с исходным путем, пожалуйста, выберите другой путь",
         "app_knowledge": "Файлы базы знаний",
         "app_knowledge.button.delete": "Удалить файл",
         "app_knowledge.remove_all": "Удалить файлы базы знаний",
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index a60589c71a..fd393e36ce 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -1087,10 +1087,10 @@
         "app_data": "应用数据",
         "app_data.select": "修改目录",
         "app_data.select_title": "更改应用数据目录",
-        "app_data.restart_notice": "应用需要重启以应用更改",
-        "app_data.copy_data_option": "复制数据，开启后会将原始目录数据复制到新目录",
+        "app_data.restart_notice": "应用可能会重启多次以应用更改",
+        "app_data.copy_data_option": "复制数据，会自动重启后将原始目录数据复制到新目录",
         "app_data.copy_time_notice": "复制数据将需要一些时间，复制期间不要关闭应用",
-        "app_data.path_changed_without_copy": "路径已更改成功，但数据未复制",
+        "app_data.path_changed_without_copy": "路径已更改成功",
         "app_data.copying_warning": "数据复制中，不要强制退出app",
         "app_data.copying": "正在将数据复制到新位置...",
         "app_data.copy_success": "已成功复制数据到新位置",
@@ -1103,6 +1103,9 @@
         "app_data.select_error_root_path": "新路径不能是根路径",
         "app_data.select_error_write_permission": "新路径没有写入权限",
         "app_data.stop_quit_app_reason": "应用目前在迁移数据, 不能退出",
+        "app_data.select_not_empty_dir": "新路径不为空",
+        "app_data.select_not_empty_dir_content": "新路径不为空，选择复制将覆盖新路径中的数据, 有数据丢失的风险，是否继续？",
+        "app_data.select_error_same_path": "新路径与旧路径相同，请选择其他路径",
         "app_knowledge": "知识库文件",
         "app_knowledge.button.delete": "删除文件",
         "app_knowledge.remove_all": "删除知识库文件",
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index 4742cff3a3..995bee24bc 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -1087,10 +1087,10 @@
         "app_data": "應用數據",
         "app_data.select": "修改目錄",
         "app_data.select_title": "變更應用數據目錄",
-        "app_data.restart_notice": "變更數據目錄後需要重啟應用才能生效",
-        "app_data.copy_data_option": "複製數據, 開啟後會將原始目錄數據複製到新目錄",
+        "app_data.restart_notice": "變更數據目錄後可能需要重啟應用才能生效",
+        "app_data.copy_data_option": "複製數據, 會自動重啟後將原始目錄數據複製到新目錄",
         "app_data.copy_time_notice": "複製數據將需要一些時間，複製期間不要關閉應用",
-        "app_data.path_changed_without_copy": "路徑已變更成功，但數據未複製",
+        "app_data.path_changed_without_copy": "路徑已變更成功",
         "app_data.copying_warning": "數據複製中，不要強制退出應用",
         "app_data.copying": "正在複製數據到新位置...",
         "app_data.copy_success": "成功複製數據到新位置",
@@ -1103,6 +1103,9 @@
         "app_data.select_error_root_path": "新路徑不能是根路徑",
         "app_data.select_error_write_permission": "新路徑沒有寫入權限",
         "app_data.stop_quit_app_reason": "應用目前正在遷移數據，不能退出",
+        "app_data.select_not_empty_dir": "新路徑不為空",
+        "app_data.select_not_empty_dir_content": "新路徑不為空，選擇複製將覆蓋新路徑中的數據, 有數據丟失的風險，是否繼續？",
+        "app_data.select_error_same_path": "新路徑與舊路徑相同，請選擇其他路徑",
         "app_knowledge": "知識庫文件",
         "app_knowledge.button.delete": "刪除檔案",
         "app_knowledge.remove_all": "刪除知識庫檔案",
diff --git a/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx b/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
index 5a80545345..52b1c0bbb7 100644
--- a/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
@@ -202,6 +202,12 @@ const DataSettings: FC = () => {
       return
     }
 
+    // check new app data path is same as old app data path
+    if (newAppDataPath.startsWith(appInfo!.appDataPath)) {
+      window.message.error(t('settings.data.app_data.select_error_same_path'))
+      return
+    }
+
     // check new app data path has write permission
     const hasWritePermission = await window.api.hasWritePermission(newAppDataPath)
     if (!hasWritePermission) {
@@ -213,22 +219,34 @@ const DataSettings: FC = () => {
       <div style={{ fontSize: '18px', fontWeight: 'bold' }}>{t('settings.data.app_data.migration_title')}</div>
     )
     const migrationClassName = 'migration-modal'
-    const messageKey = 'data-migration'
 
-    // 显示确认对话框
-    showMigrationConfirmModal(appInfo.appDataPath, newAppDataPath, migrationTitle, migrationClassName, messageKey)
+    if (await window.api.isNotEmptyDir(newAppDataPath)) {
+      const modal = window.modal.confirm({
+        title: t('settings.data.app_data.select_not_empty_dir'),
+        content: t('settings.data.app_data.select_not_empty_dir_content'),
+        centered: true,
+        okText: t('common.confirm'),
+        cancelText: t('common.cancel'),
+        onOk: () => {
+          modal.destroy()
+          // 显示确认对话框
+          showMigrationConfirmModal(appInfo.appDataPath, newAppDataPath, migrationTitle, migrationClassName)
+        }
+      })
+      return
+    }
+    showMigrationConfirmModal(appInfo.appDataPath, newAppDataPath, migrationTitle, migrationClassName)
   }
 
   // 显示确认迁移的对话框
-  const showMigrationConfirmModal = (
+  const showMigrationConfirmModal = async (
     originalPath: string,
     newPath: string,
     title: React.ReactNode,
-    className: string,
-    messageKey: string
+    className: string
   ) => {
     // 复制数据选项状态
-    let shouldCopyData = true
+    let shouldCopyData = !(await window.api.isNotEmptyDir(newPath))
 
     // 创建路径内容组件
     const PathsContent = () => (
@@ -248,7 +266,7 @@ const DataSettings: FC = () => {
       <div>
         <MigrationPathRow style={{ marginTop: '20px', flexDirection: 'row', alignItems: 'center' }}>
           <Switch
-            defaultChecked={true}
+            defaultChecked={shouldCopyData}
             onChange={(checked) => {
               shouldCopyData = checked
             }}
@@ -290,22 +308,17 @@ const DataSettings: FC = () => {
           // 立即关闭确认对话框
           modal.destroy()
 
-          // 设置停止退出应用
-          window.api.setStopQuitApp(true, t('settings.data.app_data.stop_quit_app_reason'))
-
           if (shouldCopyData) {
             // 如果选择复制数据，显示进度模态框并执行迁移
-            const { loadingModal, progressInterval, updateProgress } = showProgressModal(title, className, PathsContent)
-
-            try {
-              await startMigration(originalPath, newPath, progressInterval, updateProgress, loadingModal, messageKey)
-            } catch (error) {
-              if (progressInterval) {
-                clearInterval(progressInterval)
-              }
-              loadingModal.destroy()
-              throw error
-            }
+            window.message.info({
+              content: t('settings.data.app_data.restart_notice'),
+              duration: 3
+            })
+            setTimeout(() => {
+              window.api.relaunchApp({
+                args: ['--new-data-path=' + newPath]
+              })
+            }, 300)
           } else {
             // 如果不复制数据，直接设置新的应用数据路径
             await window.api.setAppDataPath(newPath)
@@ -324,12 +337,7 @@ const DataSettings: FC = () => {
         } catch (error) {
           window.api.setStopQuitApp(false, '')
           window.message.error({
-            content:
-              (shouldCopyData
-                ? t('settings.data.app_data.copy_failed')
-                : t('settings.data.app_data.path_change_failed')) +
-              ': ' +
-              error,
+            content: t('settings.data.app_data.path_change_failed') + ': ' + error,
             duration: 5
           })
         }
@@ -337,6 +345,68 @@ const DataSettings: FC = () => {
     })
   }
 
+  useEffect(() => {
+    const handleDataMigration = async () => {
+      const newDataPath = await window.api.getDataPathFromArgs()
+      if (!newDataPath) return
+
+      const originalPath = (await window.api.getAppInfo())?.appDataPath
+      if (!originalPath) return
+
+      const title = (
+        <div style={{ fontSize: '18px', fontWeight: 'bold' }}>{t('settings.data.app_data.migration_title')}</div>
+      )
+      const className = 'migration-modal'
+      const messageKey = 'data-migration'
+
+      // Create PathsContent component for this specific migration
+      const PathsContent = () => (
+        <div>
+          <MigrationPathRow>
+            <MigrationPathLabel>{t('settings.data.app_data.original_path')}:</MigrationPathLabel>
+            <MigrationPathValue>{originalPath}</MigrationPathValue>
+          </MigrationPathRow>
+          <MigrationPathRow style={{ marginTop: '16px' }}>
+            <MigrationPathLabel>{t('settings.data.app_data.new_path')}:</MigrationPathLabel>
+            <MigrationPathValue>{newDataPath}</MigrationPathValue>
+          </MigrationPathRow>
+        </div>
+      )
+
+      const { loadingModal, progressInterval, updateProgress } = showProgressModal(title, className, PathsContent)
+      try {
+        window.api.setStopQuitApp(true, t('settings.data.app_data.stop_quit_app_reason'))
+        await startMigration(originalPath, newDataPath, progressInterval, updateProgress, loadingModal, messageKey)
+
+        // 更新应用数据路径
+        setAppInfo(await window.api.getAppInfo())
+
+        // 通知用户并重启应用
+        setTimeout(() => {
+          window.message.success(t('settings.data.app_data.select_success'))
+          window.api.setStopQuitApp(false, '')
+          window.api.relaunchApp({
+            args: ['--user-data-dir=' + newDataPath]
+          })
+        }, 1000)
+      } catch (error) {
+        window.api.setStopQuitApp(false, '')
+        window.message.error({
+          content: t('settings.data.app_data.copy_failed') + ': ' + error,
+          key: messageKey,
+          duration: 5
+        })
+      } finally {
+        if (progressInterval) {
+          clearInterval(progressInterval)
+        }
+        loadingModal.destroy()
+      }
+    }
+
+    handleDataMigration()
+  }, [])
+
   // 显示进度模态框
   const showProgressModal = (title: React.ReactNode, className: string, PathsContent: React.FC) => {
     let currentProgress = 0
@@ -411,6 +481,9 @@ const DataSettings: FC = () => {
     loadingModal: { destroy: () => void },
     messageKey: string
   ): Promise<void> => {
+    // flush app data
+    await window.api.flushAppData()
+
     // 开始复制过程
     const copyResult = await window.api.copy(originalPath, newPath)
 

From d9b8e68c300aaf2fca605424144a685f67555ba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E7=94=B1=E7=9A=84=E4=B8=96=E7=95=8C=E4=BA=BA?=
 <3196812536@qq.com>
Date: Sun, 22 Jun 2025 12:28:31 +0800
Subject: [PATCH 05/75] fix: update source language handling and persist user
 selection in TranslatePage component (#7243)

---
 .../src/pages/translate/TranslatePage.tsx         | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/pages/translate/TranslatePage.tsx b/src/renderer/src/pages/translate/TranslatePage.tsx
index 1d8edd93d0..11db557bf9 100644
--- a/src/renderer/src/pages/translate/TranslatePage.tsx
+++ b/src/renderer/src/pages/translate/TranslatePage.tsx
@@ -229,7 +229,7 @@ const TranslatePage: FC = () => {
   const [bidirectionalPair, setBidirectionalPair] = useState<[string, string]>(['english', 'chinese'])
   const [settingsVisible, setSettingsVisible] = useState(false)
   const [detectedLanguage, setDetectedLanguage] = useState<string | null>(null)
-  const [sourceLanguage, setSourceLanguage] = useState<string>('auto') // 添加用户选择的源语言状态
+  const [sourceLanguage, setSourceLanguage] = useState<string>('auto')
   const contentContainerRef = useRef<HTMLDivElement>(null)
   const textAreaRef = useRef<TextAreaRef>(null)
   const outputTextRef = useRef<HTMLDivElement>(null)
@@ -307,8 +307,7 @@ const TranslatePage: FC = () => {
       let actualSourceLanguage: string
       if (sourceLanguage === 'auto') {
         actualSourceLanguage = await detectLanguage(text)
-        console.log('检测到的语言:', actualSourceLanguage)
-        setDetectedLanguage(actualSourceLanguage) // 更新检测到的语言
+        setDetectedLanguage(actualSourceLanguage)
       } else {
         actualSourceLanguage = sourceLanguage
       }
@@ -385,6 +384,9 @@ const TranslatePage: FC = () => {
       const targetLang = await db.settings.get({ id: 'translate:target:language' })
       targetLang && setTargetLanguage(targetLang.value)
 
+      const sourceLang = await db.settings.get({ id: 'translate:source:language' })
+      sourceLang && setSourceLanguage(sourceLang.value)
+
       const bidirectionalPairSetting = await db.settings.get({ id: 'translate:bidirectional:pair' })
       if (bidirectionalPairSetting) {
         const langPair = bidirectionalPairSetting.value
@@ -526,12 +528,15 @@ const TranslatePage: FC = () => {
                 value={sourceLanguage}
                 style={{ width: 180 }}
                 optionFilterProp="label"
-                onChange={(value) => setSourceLanguage(value)}
+                onChange={(value) => {
+                  setSourceLanguage(value)
+                  db.settings.put({ id: 'translate:source:language', value })
+                }}
                 options={[
                   {
                     value: 'auto',
                     label: detectedLanguage
-                      ? `${t('translate.detected.language')}(${t(`languages.${detectedLanguage.toLowerCase()}`)})`
+                      ? `${t('translate.detected.language')} (${t(`languages.${detectedLanguage.toLowerCase()}`)})`
                       : t('translate.detected.language')
                   },
                   ...translateLanguageOptions().map((lang) => ({

From 50d6f1f8314e53eebcfb1bd576074f8fc5466c84 Mon Sep 17 00:00:00 2001
From: Wang Jiyuan <59059173+EurFelux@users.noreply.github.com>
Date: Sun, 22 Jun 2025 17:03:43 +0800
Subject: [PATCH 06/75] refactor(middleware): Add error property to
 CompletionResult and handle errors when checking API (#7407)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor(aiCore): 添加错误处理

* remove console.log
---
 .../src/aiCore/middleware/common/ErrorHandlerMiddleware.ts  | 3 ++-
 src/renderer/src/aiCore/middleware/schemas.ts               | 2 +-
 src/renderer/src/services/ApiService.ts                     | 6 ++++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/aiCore/middleware/common/ErrorHandlerMiddleware.ts b/src/renderer/src/aiCore/middleware/common/ErrorHandlerMiddleware.ts
index 8875a0b627..ad023e4285 100644
--- a/src/renderer/src/aiCore/middleware/common/ErrorHandlerMiddleware.ts
+++ b/src/renderer/src/aiCore/middleware/common/ErrorHandlerMiddleware.ts
@@ -25,7 +25,7 @@ export const ErrorHandlerMiddleware =
       // 尝试执行下一个中间件
       return await next(ctx, params)
     } catch (error: any) {
-      console.log('ErrorHandlerMiddleware_error', error)
+      console.error('ErrorHandlerMiddleware_error', error)
       // 1. 使用通用的工具函数将错误解析为标准格式
       const errorChunk = createErrorChunk(error)
       // 2. 调用从外部传入的 onError 回调
@@ -50,6 +50,7 @@ export const ErrorHandlerMiddleware =
         rawOutput: undefined,
         stream: errorStream, // 将包含错误的流传递下去
         controller: undefined,
+        error: typeof error?.message === 'string' ? error.message : 'unknown error',
         getText: () => '' // 错误情况下没有文本结果
       }
     }
diff --git a/src/renderer/src/aiCore/middleware/schemas.ts b/src/renderer/src/aiCore/middleware/schemas.ts
index 33d9816b4f..02d7199454 100644
--- a/src/renderer/src/aiCore/middleware/schemas.ts
+++ b/src/renderer/src/aiCore/middleware/schemas.ts
@@ -62,7 +62,7 @@ export interface CompletionsResult {
   rawOutput?: SdkRawOutput
   stream?: ReadableStream<SdkRawChunk> | ReadableStream<Chunk> | AsyncIterable<Chunk>
   controller?: AbortController
-
+  error?: string
   getText: () => string
 }
 
diff --git a/src/renderer/src/services/ApiService.ts b/src/renderer/src/services/ApiService.ts
index 46c5fd849c..b962ec8917 100644
--- a/src/renderer/src/services/ApiService.ts
+++ b/src/renderer/src/services/ApiService.ts
@@ -595,6 +595,9 @@ export async function checkApi(provider: Provider, model: Model): Promise<void>
 
       // Try streaming check first
       const result = await ai.completions(params)
+      if (result.error) {
+        throw new Error(result.error)
+      }
       if (!result.getText()) {
         throw new Error('No response received')
       }
@@ -608,6 +611,9 @@ export async function checkApi(provider: Provider, model: Model): Promise<void>
         streamOutput: false
       }
       const result = await ai.completions(params)
+      if (result.error) {
+        throw new Error(result.error)
+      }
       if (!result.getText()) {
         throw new Error('No response received')
       }

From 355d2aebb40332c6615ca631f1e4174a7693ca56 Mon Sep 17 00:00:00 2001
From: kangfenmao <kangfenmao@qq.com>
Date: Sun, 22 Jun 2025 17:31:43 +0800
Subject: [PATCH 07/75] chore(version): 1.4.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dc29289380..1cdfc9296b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",

From 2350919f366f3b289169e84553cdee879ee8925a Mon Sep 17 00:00:00 2001
From: Wang Jiyuan <59059173+EurFelux@users.noreply.github.com>
Date: Sun, 22 Jun 2025 21:33:17 +0800
Subject: [PATCH 08/75] fix: use shouldThrow param in checkApi instead of
 adding error property to CompletionsResult (#7457)

* Revert "refactor(middleware): Add error property to CompletionResult and handle errors when checking API (#7407)"

This reverts commit 50d6f1f8314e53eebcfb1bd576074f8fc5466c84.

* fix: use shouldThrow param in checkApi
---
 .../middleware/common/ErrorHandlerMiddleware.ts      |  3 +--
 src/renderer/src/aiCore/middleware/schemas.ts        |  2 +-
 src/renderer/src/services/ApiService.ts              | 12 ++++--------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/renderer/src/aiCore/middleware/common/ErrorHandlerMiddleware.ts b/src/renderer/src/aiCore/middleware/common/ErrorHandlerMiddleware.ts
index ad023e4285..8875a0b627 100644
--- a/src/renderer/src/aiCore/middleware/common/ErrorHandlerMiddleware.ts
+++ b/src/renderer/src/aiCore/middleware/common/ErrorHandlerMiddleware.ts
@@ -25,7 +25,7 @@ export const ErrorHandlerMiddleware =
       // 尝试执行下一个中间件
       return await next(ctx, params)
     } catch (error: any) {
-      console.error('ErrorHandlerMiddleware_error', error)
+      console.log('ErrorHandlerMiddleware_error', error)
       // 1. 使用通用的工具函数将错误解析为标准格式
       const errorChunk = createErrorChunk(error)
       // 2. 调用从外部传入的 onError 回调
@@ -50,7 +50,6 @@ export const ErrorHandlerMiddleware =
         rawOutput: undefined,
         stream: errorStream, // 将包含错误的流传递下去
         controller: undefined,
-        error: typeof error?.message === 'string' ? error.message : 'unknown error',
         getText: () => '' // 错误情况下没有文本结果
       }
     }
diff --git a/src/renderer/src/aiCore/middleware/schemas.ts b/src/renderer/src/aiCore/middleware/schemas.ts
index 02d7199454..33d9816b4f 100644
--- a/src/renderer/src/aiCore/middleware/schemas.ts
+++ b/src/renderer/src/aiCore/middleware/schemas.ts
@@ -62,7 +62,7 @@ export interface CompletionsResult {
   rawOutput?: SdkRawOutput
   stream?: ReadableStream<SdkRawChunk> | ReadableStream<Chunk> | AsyncIterable<Chunk>
   controller?: AbortController
-  error?: string
+
   getText: () => string
 }
 
diff --git a/src/renderer/src/services/ApiService.ts b/src/renderer/src/services/ApiService.ts
index b962ec8917..0dfad984af 100644
--- a/src/renderer/src/services/ApiService.ts
+++ b/src/renderer/src/services/ApiService.ts
@@ -590,14 +590,12 @@ export async function checkApi(provider: Provider, model: Model): Promise<void>
         callType: 'check',
         messages: 'hi',
         assistant,
-        streamOutput: true
+        streamOutput: true,
+        shouldThrow: true
       }
 
       // Try streaming check first
       const result = await ai.completions(params)
-      if (result.error) {
-        throw new Error(result.error)
-      }
       if (!result.getText()) {
         throw new Error('No response received')
       }
@@ -608,12 +606,10 @@ export async function checkApi(provider: Provider, model: Model): Promise<void>
         callType: 'check',
         messages: 'hi',
         assistant,
-        streamOutput: false
+        streamOutput: false,
+        shouldThrow: true
       }
       const result = await ai.completions(params)
-      if (result.error) {
-        throw new Error(result.error)
-      }
       if (!result.getText()) {
         throw new Error('No response received')
       }

From a8e23966fa1d3d97e15dddacd4d40c0a6368c481 Mon Sep 17 00:00:00 2001
From: Tristan Zhang <82869104+ABucket@users.noreply.github.com>
Date: Mon, 23 Jun 2025 08:55:03 +0800
Subject: [PATCH 09/75] feat(FileStorage): add support for .doc files using
 word-extractor (#7374)

* feat(FileStorage): add support for .doc files and integrate word-extractor

* chore(package): add word-extractor to devdependencies
---
 package.json                          |  2 ++
 packages/shared/config/constant.ts    |  2 +-
 src/main/loader/index.ts              |  1 +
 src/main/services/FileStorage.ts      | 13 +++++++++++-
 src/main/utils/__tests__/file.test.ts |  1 +
 yarn.lock                             | 30 +++++++++++++++++++++++++++
 6 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 1cdfc9296b..7a673b8417 100644
--- a/package.json
+++ b/package.json
@@ -124,6 +124,7 @@
     "@types/react-infinite-scroll-component": "^5.0.0",
     "@types/react-window": "^1",
     "@types/tinycolor2": "^1",
+    "@types/word-extractor": "^1",
     "@uiw/codemirror-extensions-langs": "^4.23.12",
     "@uiw/codemirror-themes-all": "^4.23.12",
     "@uiw/react-codemirror": "^4.23.12",
@@ -218,6 +219,7 @@
     "vite": "6.2.6",
     "vitest": "^3.1.4",
     "webdav": "^5.8.0",
+    "word-extractor": "^1.0.4",
     "zipread": "^1.3.3"
   },
   "resolutions": {
diff --git a/packages/shared/config/constant.ts b/packages/shared/config/constant.ts
index 5a3465f648..719600650e 100644
--- a/packages/shared/config/constant.ts
+++ b/packages/shared/config/constant.ts
@@ -1,7 +1,7 @@
 export const imageExts = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.webp']
 export const videoExts = ['.mp4', '.avi', '.mov', '.wmv', '.flv', '.mkv']
 export const audioExts = ['.mp3', '.wav', '.ogg', '.flac', '.aac']
-export const documentExts = ['.pdf', '.docx', '.pptx', '.xlsx', '.odt', '.odp', '.ods']
+export const documentExts = ['.pdf', '.doc', '.docx', '.pptx', '.xlsx', '.odt', '.odp', '.ods']
 export const thirdPartyApplicationExts = ['.draftsExport']
 export const bookExts = ['.epub']
 const textExtsByCategory = new Map([
diff --git a/src/main/loader/index.ts b/src/main/loader/index.ts
index db837f414f..ba66b33e3d 100644
--- a/src/main/loader/index.ts
+++ b/src/main/loader/index.ts
@@ -16,6 +16,7 @@ const FILE_LOADER_MAP: Record<string, string> = {
   // 内置类型
   '.pdf': 'common',
   '.csv': 'common',
+  '.doc': 'common',
   '.docx': 'common',
   '.pptx': 'common',
   '.xlsx': 'common',
diff --git a/src/main/services/FileStorage.ts b/src/main/services/FileStorage.ts
index 2ac689b8cc..437f25f78c 100644
--- a/src/main/services/FileStorage.ts
+++ b/src/main/services/FileStorage.ts
@@ -220,10 +220,21 @@ class FileStorage {
   public readFile = async (_: Electron.IpcMainInvokeEvent, id: string): Promise<string> => {
     const filePath = path.join(this.storageDir, id)
 
-    if (documentExts.includes(path.extname(filePath))) {
+    const fileExtension = path.extname(filePath)
+
+    if (documentExts.includes(fileExtension)) {
       const originalCwd = process.cwd()
       try {
         chdir(this.tempDir)
+
+        if (fileExtension === '.doc') {
+          const WordExtractor = require('word-extractor')
+          const extractor = new WordExtractor()
+          const extracted = await extractor.extract(filePath)
+          chdir(originalCwd)
+          return extracted.getBody()
+        }
+
         const data = await officeParser.parseOfficeAsync(filePath)
         chdir(originalCwd)
         return data
diff --git a/src/main/utils/__tests__/file.test.ts b/src/main/utils/__tests__/file.test.ts
index aae00e85d4..14f4801524 100644
--- a/src/main/utils/__tests__/file.test.ts
+++ b/src/main/utils/__tests__/file.test.ts
@@ -92,6 +92,7 @@ describe('file', () => {
     it('should return DOCUMENT for document extensions', () => {
       expect(getFileType('.pdf')).toBe(FileTypes.DOCUMENT)
       expect(getFileType('.pptx')).toBe(FileTypes.DOCUMENT)
+      expect(getFileType('.doc')).toBe(FileTypes.DOCUMENT)
       expect(getFileType('.docx')).toBe(FileTypes.DOCUMENT)
       expect(getFileType('.xlsx')).toBe(FileTypes.DOCUMENT)
       expect(getFileType('.odt')).toBe(FileTypes.DOCUMENT)
diff --git a/yarn.lock b/yarn.lock
index b066f44a11..eefde56f9c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4754,6 +4754,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/word-extractor@npm:^1":
+  version: 1.0.6
+  resolution: "@types/word-extractor@npm:1.0.6"
+  dependencies:
+    "@types/node": "npm:*"
+  checksum: 10c0/84f89c458213db5aec4d6badad14e0f2c07ac4b92f16165d19a95548f2b98fd5fff00419d49547464cb75c9432b5e9cb3b452d75eb5f07d808e31b44be390453
+  languageName: node
+  linkType: hard
+
 "@types/ws@npm:^8.5.4":
   version: 8.18.1
   resolution: "@types/ws@npm:8.18.1"
@@ -5642,6 +5651,7 @@ __metadata:
     "@types/react-infinite-scroll-component": "npm:^5.0.0"
     "@types/react-window": "npm:^1"
     "@types/tinycolor2": "npm:^1"
+    "@types/word-extractor": "npm:^1"
     "@uiw/codemirror-extensions-langs": "npm:^4.23.12"
     "@uiw/codemirror-themes-all": "npm:^4.23.12"
     "@uiw/react-codemirror": "npm:^4.23.12"
@@ -5742,6 +5752,7 @@ __metadata:
     vite: "npm:6.2.6"
     vitest: "npm:^3.1.4"
     webdav: "npm:^5.8.0"
+    word-extractor: "npm:^1.0.4"
     zipread: "npm:^1.3.3"
   languageName: unknown
   linkType: soft
@@ -16428,6 +16439,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"saxes@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "saxes@npm:5.0.1"
+  dependencies:
+    xmlchars: "npm:^2.2.0"
+  checksum: 10c0/b7476c41dbe1c3a89907d2546fecfba234de5e66743ef914cde2603f47b19bed09732ab51b528ad0f98b958369d8be72b6f5af5c9cfad69972a73d061f0b3952
+  languageName: node
+  linkType: hard
+
 "saxes@npm:^6.0.0":
   version: 6.0.0
   resolution: "saxes@npm:6.0.0"
@@ -18632,6 +18652,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"word-extractor@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "word-extractor@npm:1.0.4"
+  dependencies:
+    saxes: "npm:^5.0.1"
+    yauzl: "npm:^2.10.0"
+  checksum: 10c0/f8c6b4f9278802d0c803479c1441713e351e67f7b0d2f85bd8cbe94b76298d4adb058b5f23ee0a01faa02f3b1f01c507a4a2f44fa39cfcbd498a51769dd9e8e7
+  languageName: node
+  linkType: hard
+
 "word-wrap@npm:^1.2.5":
   version: 1.2.5
   resolution: "word-wrap@npm:1.2.5"

From b4c8e42d879d81e73d43980945df70d1b036dd45 Mon Sep 17 00:00:00 2001
From: purefkh <purefkh@gmail.com>
Date: Mon, 23 Jun 2025 09:48:29 +0800
Subject: [PATCH 10/75] fix(rename): disable thinking for topic rename (#7461)

---
 src/renderer/src/services/ApiService.ts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/services/ApiService.ts b/src/renderer/src/services/ApiService.ts
index 0dfad984af..fb2c073109 100644
--- a/src/renderer/src/services/ApiService.ts
+++ b/src/renderer/src/services/ApiService.ts
@@ -462,12 +462,23 @@ export async function fetchMessagesSummary({ messages, assistant }: { messages:
   })
   const conversation = JSON.stringify(structredMessages)
 
+  // 复制 assistant 对象，并强制关闭思考预算
+  const summaryAssistant = {
+    ...assistant,
+    settings: {
+      ...assistant.settings,
+      reasoning_effort: undefined,
+      qwenThinkMode: false
+    }
+  }
+
   const params: CompletionsParams = {
     callType: 'summary',
     messages: conversation,
-    assistant: { ...assistant, prompt, model },
+    assistant: { ...summaryAssistant, prompt, model },
     maxTokens: 1000,
-    streamOutput: false
+    streamOutput: false,
+    enableReasoning: false
   }
 
   try {

From 32d6c2e1d896f7ab90ea61565c64c75b401ae730 Mon Sep 17 00:00:00 2001
From: Wang Jiyuan <59059173+EurFelux@users.noreply.github.com>
Date: Mon, 23 Jun 2025 09:59:50 +0800
Subject: [PATCH 11/75] feat(TopicsTab): Allow deletion of inactive topics
 (#7415)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(主题列表): 修复主题列表项悬停样式和菜单显示条件

调整主题列表项悬停时的背景色过渡效果，并修正菜单显示逻辑，仅在非挂起状态显示

* fix(TopicsTab): 移除话题待处理状态检查

* fix(TopicsTab): 修复删除话题时未检查当前活跃话题的问题
---
 src/renderer/src/pages/home/Tabs/TopicsTab.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/pages/home/Tabs/TopicsTab.tsx b/src/renderer/src/pages/home/Tabs/TopicsTab.tsx
index 6d370484fb..01a548b8c1 100644
--- a/src/renderer/src/pages/home/Tabs/TopicsTab.tsx
+++ b/src/renderer/src/pages/home/Tabs/TopicsTab.tsx
@@ -127,11 +127,13 @@ const Topics: FC<Props> = ({ assistant: _assistant, activeTopic, setActiveTopic
       }
       await modelGenerating()
       const index = findIndex(assistant.topics, (t) => t.id === topic.id)
-      setActiveTopic(assistant.topics[index + 1 === assistant.topics.length ? index - 1 : index + 1])
+      if (topic.id === activeTopic.id) {
+        setActiveTopic(assistant.topics[index + 1 === assistant.topics.length ? index - 1 : index + 1])
+      }
       removeTopic(topic)
       setDeletingTopicId(null)
     },
-    [assistant.topics, onClearMessages, removeTopic, setActiveTopic]
+    [activeTopic.id, assistant.topics, onClearMessages, removeTopic, setActiveTopic]
   )
 
   const onPinTopic = useCallback(
@@ -471,7 +473,7 @@ const Topics: FC<Props> = ({ assistant: _assistant, activeTopic, setActiveTopic
                   <TopicName className={getTopicNameClassName()} title={topicName}>
                     {topicName}
                   </TopicName>
-                  {isActive && !topic.pinned && (
+                  {!topic.pinned && (
                     <Tooltip
                       placement="bottom"
                       mouseEnterDelay={0.7}
@@ -548,6 +550,10 @@ const TopicListItem = styled.div`
   }
   &:hover {
     background-color: var(--color-list-item-hover);
+    transition: background-color 0.1s;
+    .menu {
+      opacity: 1;
+    }
   }
   &.active {
     background-color: var(--color-list-item);

From a2e2eb3b73821629e99591871ec8a4643963438f Mon Sep 17 00:00:00 2001
From: Murphy <69335326+MurphyLo@users.noreply.github.com>
Date: Mon, 23 Jun 2025 12:51:08 +0800
Subject: [PATCH 12/75] fix: re-add newline separator between reasoning_summary
 parts after openai middleware refactor (#7390)

re-add newline separator between reasoning_summary parts after openai client refactor

Signed-off-by: MurphyLo <murphylo@mail.bnu.edu.cn>
---
 .../aiCore/clients/openai/OpenAIResponseAPIClient.ts  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/renderer/src/aiCore/clients/openai/OpenAIResponseAPIClient.ts b/src/renderer/src/aiCore/clients/openai/OpenAIResponseAPIClient.ts
index 5871a04cab..1f9af6ca77 100644
--- a/src/renderer/src/aiCore/clients/openai/OpenAIResponseAPIClient.ts
+++ b/src/renderer/src/aiCore/clients/openai/OpenAIResponseAPIClient.ts
@@ -425,6 +425,7 @@ export class OpenAIResponseAPIClient extends OpenAIBaseClient<
     const toolCalls: OpenAIResponseSdkToolCall[] = []
     const outputItems: OpenAI.Responses.ResponseOutputItem[] = []
     let hasBeenCollectedToolCalls = false
+    let hasReasoningSummary = false
     return () => ({
       async transform(chunk: OpenAIResponseSdkRawChunk, controller: TransformStreamDefaultController<GenericChunk>) {
         // 处理chunk
@@ -496,6 +497,16 @@ export class OpenAIResponseAPIClient extends OpenAIBaseClient<
                 outputItems.push(chunk.item)
               }
               break
+            case 'response.reasoning_summary_part.added':
+              if (hasReasoningSummary) {
+                const separator = '\n\n'
+                controller.enqueue({
+                  type: ChunkType.THINKING_DELTA,
+                  text: separator
+                })
+              }
+              hasReasoningSummary = true
+              break
             case 'response.reasoning_summary_text.delta':
               controller.enqueue({
                 type: ChunkType.THINKING_DELTA,

From 4f2c8bd905f1b8fb0785881dd48528d26aff6350 Mon Sep 17 00:00:00 2001
From: one <wangan.cs@gmail.com>
Date: Mon, 23 Jun 2025 15:19:21 +0800
Subject: [PATCH 13/75] fix(Markdown): improve latex brackets handling (#7358)

---
 package.json                                  |   2 +
 .../src/pages/home/Markdown/Markdown.tsx      |   6 +-
 .../home/Markdown/__tests__/Markdown.test.tsx |  14 +-
 .../src/utils/__tests__/formats.test.ts       |  31 ---
 .../src/utils/__tests__/markdown.test.ts      | 195 ++++++++++++++++++
 src/renderer/src/utils/formats.ts             |  18 --
 src/renderer/src/utils/markdown.ts            |  80 +++++++
 yarn.lock                                     |  16 ++
 8 files changed, 298 insertions(+), 64 deletions(-)

diff --git a/package.json b/package.json
index 7a673b8417..ee795f17ee 100644
--- a/package.json
+++ b/package.json
@@ -112,6 +112,7 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@tryfabric/martian": "^1.2.4",
+    "@types/balanced-match": "^3",
     "@types/diff": "^7",
     "@types/fs-extra": "^11",
     "@types/lodash": "^4.17.5",
@@ -138,6 +139,7 @@
     "archiver": "^7.0.1",
     "async-mutex": "^0.5.0",
     "axios": "^1.7.3",
+    "balanced-match": "^3.0.1",
     "browser-image-compression": "^2.0.2",
     "color": "^5.0.0",
     "dayjs": "^1.11.11",
diff --git a/src/renderer/src/pages/home/Markdown/Markdown.tsx b/src/renderer/src/pages/home/Markdown/Markdown.tsx
index 2a6446fec7..454550c5c8 100644
--- a/src/renderer/src/pages/home/Markdown/Markdown.tsx
+++ b/src/renderer/src/pages/home/Markdown/Markdown.tsx
@@ -8,8 +8,8 @@ import { useSettings } from '@renderer/hooks/useSettings'
 import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
 import type { MainTextMessageBlock, ThinkingMessageBlock, TranslationMessageBlock } from '@renderer/types/newMessage'
 import { parseJSON } from '@renderer/utils'
-import { escapeBrackets, removeSvgEmptyLines } from '@renderer/utils/formats'
-import { findCitationInChildren, getCodeBlockId } from '@renderer/utils/markdown'
+import { removeSvgEmptyLines } from '@renderer/utils/formats'
+import { findCitationInChildren, getCodeBlockId, processLatexBrackets } from '@renderer/utils/markdown'
 import { isEmpty } from 'lodash'
 import { type FC, memo, useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -52,7 +52,7 @@ const Markdown: FC<Props> = ({ block }) => {
     const empty = isEmpty(block.content)
     const paused = block.status === 'paused'
     const content = empty && paused ? t('message.chat.completion.paused') : block.content
-    return removeSvgEmptyLines(escapeBrackets(content))
+    return removeSvgEmptyLines(processLatexBrackets(content))
   }, [block, t])
 
   const rehypePlugins = useMemo(() => {
diff --git a/src/renderer/src/pages/home/Markdown/__tests__/Markdown.test.tsx b/src/renderer/src/pages/home/Markdown/__tests__/Markdown.test.tsx
index abd7067ab0..be9b18c13b 100644
--- a/src/renderer/src/pages/home/Markdown/__tests__/Markdown.test.tsx
+++ b/src/renderer/src/pages/home/Markdown/__tests__/Markdown.test.tsx
@@ -42,13 +42,13 @@ vi.mock('@renderer/utils', () => ({
 }))
 
 vi.mock('@renderer/utils/formats', () => ({
-  escapeBrackets: vi.fn((str) => str),
   removeSvgEmptyLines: vi.fn((str) => str)
 }))
 
 vi.mock('@renderer/utils/markdown', () => ({
   findCitationInChildren: vi.fn(() => '{"id": 1, "url": "https://example.com"}'),
-  getCodeBlockId: vi.fn(() => 'code-block-1')
+  getCodeBlockId: vi.fn(() => 'code-block-1'),
+  processLatexBrackets: vi.fn((str) => str)
 }))
 
 // Mock components with more realistic behavior
@@ -212,16 +212,6 @@ describe('Markdown', () => {
       expect(markdown).not.toHaveTextContent('Paused')
     })
 
-    it('should process content through format utilities', async () => {
-      const { escapeBrackets, removeSvgEmptyLines } = await import('@renderer/utils/formats')
-      const content = 'Content with [brackets] and SVG'
-
-      render(<Markdown block={createMainTextBlock({ content })} />)
-
-      expect(escapeBrackets).toHaveBeenCalledWith(content)
-      expect(removeSvgEmptyLines).toHaveBeenCalledWith(content)
-    })
-
     it('should match snapshot', () => {
       const { container } = render(<Markdown block={createMainTextBlock()} />)
       expect(container.firstChild).toMatchSnapshot()
diff --git a/src/renderer/src/utils/__tests__/formats.test.ts b/src/renderer/src/utils/__tests__/formats.test.ts
index 5a817f45d9..09189b4526 100644
--- a/src/renderer/src/utils/__tests__/formats.test.ts
+++ b/src/renderer/src/utils/__tests__/formats.test.ts
@@ -6,7 +6,6 @@ import { describe, expect, it, vi } from 'vitest'
 import {
   addImageFileToContents,
   encodeHTML,
-  escapeBrackets,
   escapeDollarNumber,
   extractTitle,
   removeSvgEmptyLines,
@@ -180,36 +179,6 @@ describe('formats', () => {
     })
   })
 
-  describe('escapeBrackets', () => {
-    it('should convert \\[...\\] to display math format', () => {
-      expect(escapeBrackets('The formula is \\[a+b=c\\]')).toBe('The formula is \n$$\na+b=c\n$$\n')
-    })
-
-    it('should convert \\(...\\) to inline math format', () => {
-      expect(escapeBrackets('The formula is \\(a+b=c\\)')).toBe('The formula is $a+b=c$')
-    })
-
-    it('should not affect code blocks', () => {
-      const codeBlock = 'This is text with a code block ```const x = \\[1, 2, 3\\]```'
-      expect(escapeBrackets(codeBlock)).toBe(codeBlock)
-    })
-
-    it('should not affect inline code', () => {
-      const inlineCode = 'This is text with `const x = \\[1, 2, 3\\]` inline code'
-      expect(escapeBrackets(inlineCode)).toBe(inlineCode)
-    })
-
-    it('should handle multiple occurrences', () => {
-      const input = 'Formula 1: \\[a+b=c\\] and formula 2: \\(x+y=z\\)'
-      const expected = 'Formula 1: \n$$\na+b=c\n$$\n and formula 2: $x+y=z$'
-      expect(escapeBrackets(input)).toBe(expected)
-    })
-
-    it('should handle empty string', () => {
-      expect(escapeBrackets('')).toBe('')
-    })
-  })
-
   describe('extractTitle', () => {
     it('should extract title from HTML string', () => {
       const html = '<html><head><title>Page Title</title></head><body>Content</body></html>'
diff --git a/src/renderer/src/utils/__tests__/markdown.test.ts b/src/renderer/src/utils/__tests__/markdown.test.ts
index e35550bf49..4f48deba0c 100644
--- a/src/renderer/src/utils/__tests__/markdown.test.ts
+++ b/src/renderer/src/utils/__tests__/markdown.test.ts
@@ -9,6 +9,7 @@ import {
   getCodeBlockId,
   getExtensionByLanguage,
   markdownToPlainText,
+  processLatexBrackets,
   removeTrailingDoubleSpaces,
   updateCodeBlock
 } from '../markdown'
@@ -461,4 +462,198 @@ describe('markdown', () => {
       expect(markdownToPlainText('This is plain text.')).toBe('This is plain text.')
     })
   })
+
+  describe('processLatexBrackets', () => {
+    describe('basic LaTeX conversion', () => {
+      it('should convert display math \\[...\\] to $$...$$', () => {
+        expect(processLatexBrackets('The formula is \\[a+b=c\\]')).toBe('The formula is $$a+b=c$$')
+      })
+
+      it('should convert inline math \\(...\\) to $...$', () => {
+        expect(processLatexBrackets('The formula is \\(a+b=c\\)')).toBe('The formula is $a+b=c$')
+      })
+    })
+
+    describe('code block protection', () => {
+      it('should not affect multi-line code blocks', () => {
+        const input = 'Text ```const arr = \\[1, 2, 3\\]\\nconst func = \\(x\\) => x``` more text'
+        expect(processLatexBrackets(input)).toBe(input)
+      })
+
+      it('should not affect inline code', () => {
+        const input = 'This is text with `const x = \\[1, 2, 3\\]` inline code'
+        expect(processLatexBrackets(input)).toBe(input)
+      })
+
+      it('should handle mixed code and LaTeX', () => {
+        const input = 'Math: \\[x + y\\] and code: `arr = \\[1, 2\\]` and more math: \\(z\\)'
+        const expected = 'Math: $$x + y$$ and code: `arr = \\[1, 2\\]` and more math: $z$'
+        expect(processLatexBrackets(input)).toBe(expected)
+      })
+
+      it('should protect complex code blocks', () => {
+        for (const [input, expected] of new Map([
+          [
+            '```javascript\\nconst latex = "\\\\[formula\\\\]"\\n```',
+            '```javascript\\nconst latex = "\\\\[formula\\\\]"\\n```'
+          ],
+          ['`\\[escaped brackets\\]`', '`\\[escaped brackets\\]`'],
+          [
+            '```\\narray = \\[\\n  \\(item1\\),\\n  \\(item2\\)\\n\\]\\n```',
+            '```\\narray = \\[\\n  \\(item1\\),\\n  \\(item2\\)\\n\\]\\n```'
+          ]
+        ])) {
+          expect(processLatexBrackets(input)).toBe(expected)
+        }
+      })
+    })
+
+    describe('link protection', () => {
+      it('should not affect LaTeX in link text', () => {
+        const input = '[\\[pdf\\] Document](https://example.com/doc.pdf)'
+        expect(processLatexBrackets(input)).toBe(input)
+      })
+
+      it('should not affect LaTeX in link URLs', () => {
+        const input = '[Click here](https://example.com/path\\[with\\]brackets)'
+        expect(processLatexBrackets(input)).toBe(input)
+      })
+
+      it('should handle mixed links and LaTeX', () => {
+        const input = 'See [\\[pdf\\] file](url) for formula \\[x + y = z\\]'
+        const expected = 'See [\\[pdf\\] file](url) for formula $$x + y = z$$'
+        expect(processLatexBrackets(input)).toBe(expected)
+      })
+
+      it('should protect complex link patterns', () => {
+        for (const [input, expected] of new Map([
+          ['[Title with \\(math\\)](https://example.com)', '[Title with \\(math\\)](https://example.com)'],
+          ['[Link](https://example.com/\\[path\\]/file)', '[Link](https://example.com/\\[path\\]/file)'],
+          [
+            '[\\[Section 1\\] Overview](url) and \\[math formula\\]',
+            '[\\[Section 1\\] Overview](url) and $$math formula$$'
+          ]
+        ])) {
+          expect(processLatexBrackets(input)).toBe(expected)
+        }
+      })
+    })
+
+    describe('edge cases', () => {
+      it('should handle empty string', () => {
+        expect(processLatexBrackets('')).toBe('')
+      })
+
+      it('should handle content without LaTeX', () => {
+        for (const [input, expected] of new Map([
+          ['Regular text without math', 'Regular text without math'],
+          ['Text with [regular] brackets', 'Text with [regular] brackets'],
+          ['Text with (parentheses)', 'Text with (parentheses)'],
+          ['No special characters here', 'No special characters here']
+        ])) {
+          expect(processLatexBrackets(input)).toBe(expected)
+        }
+      })
+
+      it('should handle malformed LaTeX patterns', () => {
+        for (const [input, expected] of new Map([
+          ['\\[unclosed bracket', '\\[unclosed bracket'],
+          ['unopened bracket\\]', 'unopened bracket\\]'],
+          ['\\(unclosed paren', '\\(unclosed paren'],
+          ['unopened paren\\)', 'unopened paren\\)'],
+          ['\\[\\]', '$$$$'], // Empty LaTeX block
+          ['\\(\\)', '$$'] // Empty LaTeX inline
+        ])) {
+          expect(processLatexBrackets(input)).toBe(expected)
+        }
+      })
+
+      it('should handle nested brackets', () => {
+        for (const [input, expected] of new Map([
+          ['\\[outer \\[inner\\] formula\\]', '$$outer \\[inner\\] formula$$'],
+          ['\\(a + \\(b + c\\)\\)', '$a + \\(b + c\\)$']
+        ])) {
+          expect(processLatexBrackets(input)).toBe(expected)
+        }
+      })
+    })
+
+    describe('complex cases', () => {
+      it('should handle complex mixed content', () => {
+        const complexInput = `
+# Mathematical Document
+
+Here's a simple formula \\(E = mc^2\\) in text.
+
+## Section 1: Equations
+
+The quadratic formula is \\[x = \\frac{-b \\pm \\sqrt{b^2-4ac}}{2a}\\].
+
+- Item 1: See formula \\(\\alpha + \\beta = \\gamma\\) in this list
+- Item 2: Check [\\[PDF\\] Complex Analysis](https://example.com/math.pdf)
+  - Subitem 2.1: Basic concepts and definitions
+  - Subitem 2.2: The Cauchy-Riemann equations \\[\\frac{\\partial u}{\\partial x} = \\frac{\\partial v}{\\partial y}, \\quad \\frac{\\partial u}{\\partial y} = -\\frac{\\partial v}{\\partial x}\\]
+  - Subitem 2.3: Green's theorem connects line integrals and double integrals
+  \\[
+  \\oint_C (P dx + Q dy) = \\iint_D \\left(\\frac{\\partial Q}{\\partial x} - \\frac{\\partial P}{\\partial y}\\right) dx dy
+  \\]
+  - Subitem 2.4: Applications in engineering and physics
+- Item 3: The sum \\[\\sum_{i=1}^{n} \\frac{1}{i^2} = \\frac{\\pi^2}{6}\\] is famous
+
+\`\`\`javascript
+// Code should not be affected
+const matrix = \\[
+  \\[1, 2\\],
+  \\[3, 4\\]
+\\];
+const func = \\(x\\) => x * 2;
+\`\`\`
+
+Read more in [Section \\[3.2\\]: Advanced Topics](url) and see inline code \`\\[array\\]\`.
+
+Final thoughts on \\(\\nabla \\cdot \\vec{F} = \\rho\\) and display math:
+
+\\[\\int_0^\\infty e^{-x^2} dx = \\frac{\\sqrt{\\pi}}{2}\\]
+`
+
+        const expectedOutput = `
+# Mathematical Document
+
+Here's a simple formula $E = mc^2$ in text.
+
+## Section 1: Equations
+
+The quadratic formula is $$x = \\frac{-b \\pm \\sqrt{b^2-4ac}}{2a}$$.
+
+- Item 1: See formula $\\alpha + \\beta = \\gamma$ in this list
+- Item 2: Check [\\[PDF\\] Complex Analysis](https://example.com/math.pdf)
+  - Subitem 2.1: Basic concepts and definitions
+  - Subitem 2.2: The Cauchy-Riemann equations $$\\frac{\\partial u}{\\partial x} = \\frac{\\partial v}{\\partial y}, \\quad \\frac{\\partial u}{\\partial y} = -\\frac{\\partial v}{\\partial x}$$
+  - Subitem 2.3: Green's theorem connects line integrals and double integrals
+  $$
+  \\oint_C (P dx + Q dy) = \\iint_D \\left(\\frac{\\partial Q}{\\partial x} - \\frac{\\partial P}{\\partial y}\\right) dx dy
+  $$
+  - Subitem 2.4: Applications in engineering and physics
+- Item 3: The sum $$\\sum_{i=1}^{n} \\frac{1}{i^2} = \\frac{\\pi^2}{6}$$ is famous
+
+\`\`\`javascript
+// Code should not be affected
+const matrix = \\[
+  \\[1, 2\\],
+  \\[3, 4\\]
+\\];
+const func = \\(x\\) => x * 2;
+\`\`\`
+
+Read more in [Section \\[3.2\\]: Advanced Topics](url) and see inline code \`\\[array\\]\`.
+
+Final thoughts on $\\nabla \\cdot \\vec{F} = \\rho$ and display math:
+
+$$\\int_0^\\infty e^{-x^2} dx = \\frac{\\sqrt{\\pi}}{2}$$
+`
+
+        expect(processLatexBrackets(complexInput)).toBe(expectedOutput)
+      })
+    })
+  })
 })
diff --git a/src/renderer/src/utils/formats.ts b/src/renderer/src/utils/formats.ts
index 559b4e7a52..ee64efd443 100644
--- a/src/renderer/src/utils/formats.ts
+++ b/src/renderer/src/utils/formats.ts
@@ -53,24 +53,6 @@ export function escapeDollarNumber(text: string) {
   return escapedText
 }
 
-export function escapeBrackets(text: string) {
-  const pattern = /(```[\s\S]*?```|`.*?`)|\\\[([\s\S]*?[^\\])\\]|\\\((.*?)\\\)/g
-  return text.replace(pattern, (match, codeBlock, squareBracket, roundBracket) => {
-    if (codeBlock) {
-      return codeBlock
-    } else if (squareBracket) {
-      return `
-$$
-${squareBracket}
-$$
-`
-    } else if (roundBracket) {
-      return `$${roundBracket}$`
-    }
-    return match
-  })
-}
-
 export function extractTitle(html: string): string | null {
   if (!html) return null
 
diff --git a/src/renderer/src/utils/markdown.ts b/src/renderer/src/utils/markdown.ts
index a54e3d69d0..57025ca633 100644
--- a/src/renderer/src/utils/markdown.ts
+++ b/src/renderer/src/utils/markdown.ts
@@ -1,4 +1,5 @@
 import { languages } from '@shared/config/languages'
+import balanced from 'balanced-match'
 import remarkParse from 'remark-parse'
 import remarkStringify from 'remark-stringify'
 import removeMarkdown from 'remove-markdown'
@@ -29,6 +30,85 @@ export const findCitationInChildren = (children: any): string => {
   return ''
 }
 
+// 检查是否包含潜在的 LaTeX 模式
+const containsLatexRegex = /\\\(.*?\\\)|\\\[.*?\\\]|\$.*?\$|\\begin\{equation\}.*?\\end\{equation\}/
+
+/**
+ * 转换 LaTeX 公式括号 `\[\]` 和 `\(\)` 为 Markdown 格式 `$$...$$` 和 `$...$`
+ *
+ * remark-math 本身不支持 LaTeX 原生语法，作为替代的一些插件效果也不理想。
+ *
+ * 目前的实现：
+ * - 保护代码块和链接，避免被 remark-math 处理
+ * - 支持嵌套括号的平衡匹配
+ * - 转义 `\\(x\\)` 会被处理为 `\$x\$`，`\\[x\\]` 会被处理为 `\$$x\$$`
+ *
+ * @see https://github.com/remarkjs/remark-math/issues/39
+ * @param text 输入的 Markdown 文本
+ * @returns 处理后的字符串
+ */
+export const processLatexBrackets = (text: string) => {
+  // 没有 LaTeX 模式直接返回
+  if (!containsLatexRegex.test(text)) {
+    return text
+  }
+
+  // 保护代码块和链接
+  const protectedItems: string[] = []
+  let processedContent = text
+
+  processedContent = processedContent
+    // 保护代码块（包括多行代码块和行内代码）
+    .replace(/(```[\s\S]*?```|`[^`]*`)/g, (match) => {
+      const index = protectedItems.length
+      protectedItems.push(match)
+      return `__CHERRY_STUDIO_PROTECTED_${index}__`
+    })
+    // 保护链接 [text](url)
+    .replace(/\[([^[\]]*(?:\[[^\]]*\][^[\]]*)*)\]\([^)]*?\)/g, (match) => {
+      const index = protectedItems.length
+      protectedItems.push(match)
+      return `__CHERRY_STUDIO_PROTECTED_${index}__`
+    })
+
+  // LaTeX 括号转换函数
+  const processMath = (content: string, openDelim: string, closeDelim: string, wrapper: string): string => {
+    let result = ''
+    let remaining = content
+
+    while (remaining.length > 0) {
+      const match = balanced(openDelim, closeDelim, remaining)
+      if (!match) {
+        result += remaining
+        break
+      }
+
+      result += match.pre
+      result += `${wrapper}${match.body}${wrapper}`
+      remaining = match.post
+    }
+
+    return result
+  }
+
+  // 先处理块级公式，再处理内联公式
+  let result = processMath(processedContent, '\\[', '\\]', '$$')
+  result = processMath(result, '\\(', '\\)', '$')
+
+  // 还原被保护的内容
+  result = result.replace(/__CHERRY_STUDIO_PROTECTED_(\d+)__/g, (match, indexStr) => {
+    const index = parseInt(indexStr, 10)
+    // 添加边界检查，防止数组越界
+    if (index >= 0 && index < protectedItems.length) {
+      return protectedItems[index]
+    }
+    // 如果索引无效，保持原始匹配
+    return match
+  })
+
+  return result
+}
+
 /**
  * 转换数学公式格式：
  * - 将 LaTeX 格式的 '\\[' 和 '\\]' 转换为 '$$$$'。
diff --git a/yarn.lock b/yarn.lock
index eefde56f9c..75f9e2f434 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4115,6 +4115,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/balanced-match@npm:^3":
+  version: 3.0.2
+  resolution: "@types/balanced-match@npm:3.0.2"
+  checksum: 10c0/833f6499609363537026c4ec2770af5c5a36e71b80f7b5b23884b15296301bfcf974cd40bc75fda940dea4994acd96c9222b284c248383a1ade59bf8835940b0
+  languageName: node
+  linkType: hard
+
 "@types/cacheable-request@npm:^6.0.1":
   version: 6.0.3
   resolution: "@types/cacheable-request@npm:6.0.3"
@@ -5639,6 +5646,7 @@ __metadata:
     "@testing-library/jest-dom": "npm:^6.6.3"
     "@testing-library/react": "npm:^16.3.0"
     "@tryfabric/martian": "npm:^1.2.4"
+    "@types/balanced-match": "npm:^3"
     "@types/diff": "npm:^7"
     "@types/fs-extra": "npm:^11"
     "@types/lodash": "npm:^4.17.5"
@@ -5665,6 +5673,7 @@ __metadata:
     archiver: "npm:^7.0.1"
     async-mutex: "npm:^0.5.0"
     axios: "npm:^1.7.3"
+    balanced-match: "npm:^3.0.1"
     browser-image-compression: "npm:^2.0.2"
     color: "npm:^5.0.0"
     dayjs: "npm:^1.11.11"
@@ -6297,6 +6306,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"balanced-match@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "balanced-match@npm:3.0.1"
+  checksum: 10c0/ac8dd63a5b260610c2cbda982f436e964c1b9ae8764d368a523769da40a31710abd6e19f0fdf1773c4ad7b2ea7ba7b285d547375dc723f6e754369835afc8e9f
+  languageName: node
+  linkType: hard
+
 "bare-events@npm:^2.2.0":
   version: 2.5.4
   resolution: "bare-events@npm:2.5.4"

From aee8fe61969f446ad68e51bd44ef7ab307c89224 Mon Sep 17 00:00:00 2001
From: Wang Jiyuan <59059173+EurFelux@users.noreply.github.com>
Date: Mon, 23 Jun 2025 15:27:20 +0800
Subject: [PATCH 14/75] feat(mcpServers): Add a thought field to sequential
 thinking mcp server (#7465)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat(mcpServers): 在sequentialthinking中添加thought字段
---
 src/main/mcpServers/sequentialthinking.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/mcpServers/sequentialthinking.ts b/src/main/mcpServers/sequentialthinking.ts
index 4589c0bf34..bcda96e192 100644
--- a/src/main/mcpServers/sequentialthinking.ts
+++ b/src/main/mcpServers/sequentialthinking.ts
@@ -106,6 +106,7 @@ class SequentialThinkingServer {
             type: 'text',
             text: JSON.stringify(
               {
+                thought: validatedInput.thought,
                 thoughtNumber: validatedInput.thoughtNumber,
                 totalThoughts: validatedInput.totalThoughts,
                 nextThoughtNeeded: validatedInput.nextThoughtNeeded,

From be15206234ffbb5232ac48f06eaa3a1aabaa4e2f Mon Sep 17 00:00:00 2001
From: beyondkmp <beyondkmp@gmail.com>
Date: Mon, 23 Jun 2025 17:18:46 +0800
Subject: [PATCH 15/75] fix: Data config improvement (#7471)

* fix: update localization files for data migration warnings and path validation messages

* fix: update app data path validation and localization messages for installation path consistency

* fix: enhance app data flushing process by adding connection closure and delay in DataSettings component
---
 src/main/ipc.ts                               | 10 ++-
 src/renderer/src/i18n/locales/en-us.json      |  5 +-
 src/renderer/src/i18n/locales/ja-jp.json      |  5 +-
 src/renderer/src/i18n/locales/ru-ru.json      |  5 +-
 src/renderer/src/i18n/locales/zh-cn.json      |  5 +-
 src/renderer/src/i18n/locales/zh-tw.json      |  5 +-
 .../settings/DataSettings/DataSettings.tsx    | 73 +++++++++++--------
 src/renderer/src/types/index.ts               |  1 +
 8 files changed, 69 insertions(+), 40 deletions(-)

diff --git a/src/main/ipc.ts b/src/main/ipc.ts
index 5e1ac819a9..5f54d64e07 100644
--- a/src/main/ipc.ts
+++ b/src/main/ipc.ts
@@ -1,5 +1,6 @@
 import fs from 'node:fs'
 import { arch } from 'node:os'
+import path from 'node:path'
 
 import { isMac, isWin } from '@main/constant'
 import { getBinaryPath, isBinaryExists, runInstallScript } from '@main/utils/process'
@@ -57,7 +58,8 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     resourcesPath: getResourcePath(),
     logsPath: log.transports.file.getFile().path,
     arch: arch(),
-    isPortable: isWin && 'PORTABLE_EXECUTABLE_DIR' in process.env
+    isPortable: isWin && 'PORTABLE_EXECUTABLE_DIR' in process.env,
+    installPath: path.dirname(app.getPath('exe'))
   }))
 
   ipcMain.handle(IpcChannel.App_Proxy, async (_, proxy: string) => {
@@ -233,7 +235,13 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     BrowserWindow.getAllWindows().forEach((w) => {
       w.webContents.session.flushStorageData()
       w.webContents.session.cookies.flushStore()
+
+      w.webContents.session.closeAllConnections()
     })
+
+    session.defaultSession.flushStorageData()
+    session.defaultSession.cookies.flushStore()
+    session.defaultSession.closeAllConnections()
   })
 
   ipcMain.handle(IpcChannel.App_IsNotEmptyDir, async (_, path: string) => {
diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index b8bcfb66b2..fefebd6394 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -1091,7 +1091,7 @@
         "app_data.copy_data_option": "Copy data, will automatically restart after copying the original directory data to the new directory",
         "app_data.copy_time_notice": "Copying data may take a while, do not force quit app",
         "app_data.path_changed_without_copy": "Path changed successfully",
-        "app_data.copying_warning": "Data copying, do not force quit app",
+        "app_data.copying_warning": "Data copying, do not force quit app, the app will restart after copied",
         "app_data.copying": "Copying data to new location...",
         "app_data.copy_success": "Successfully copied data to new location",
         "app_data.copy_failed": "Failed to copy data",
@@ -1104,8 +1104,9 @@
         "app_data.select_error_write_permission": "New path does not have write permission",
         "app_data.stop_quit_app_reason": "The app is currently migrating data and cannot be exited",
         "app_data.select_not_empty_dir": "New path is not empty",
-        "app_data.select_not_empty_dir_content": "New path is not empty, if you select copy, it will overwrite the data in the new path, there is a risk of data loss, continue?",
+        "app_data.select_not_empty_dir_content": "New path is not empty, it will overwrite the data in the new path, there is a risk of data loss and copy failure, continue?",
         "app_data.select_error_same_path": "New path is the same as the old path, please select another path",
+        "app_data.select_error_in_app_path": "New path is the same as the application installation path, please select another path",
         "app_knowledge": "Knowledge Base Files",
         "app_knowledge.button.delete": "Delete File",
         "app_knowledge.remove_all": "Remove Knowledge Base Files",
diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json
index 430cba8351..612df65d71 100644
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@@ -1089,7 +1089,7 @@
         "app_data.copy_data_option": "データをコピーする, 開くと元のディレクトリのデータが新しいディレクトリにコピーされます。",
         "app_data.copy_time_notice": "データコピーには時間がかかります。アプリを強制終了しないでください。",
         "app_data.path_changed_without_copy": "パスが変更されました。",
-        "app_data.copying_warning": "データコピー中、アプリを強制終了しないでください",
+        "app_data.copying_warning": "データコピー中、アプリを強制終了しないでください。コピーが完了すると、アプリが自動的に再起動します。",
         "app_data.copying": "新しい場所にデータをコピーしています...",
         "app_data.copy_success": "データを新しい場所に正常にコピーしました",
         "app_data.copy_failed": "データのコピーに失敗しました",
@@ -1102,8 +1102,9 @@
         "app_data.select_error_write_permission": "新しいパスに書き込み権限がありません",
         "app_data.stop_quit_app_reason": "アプリは現在データを移行しているため、終了できません",
         "app_data.select_not_empty_dir": "新しいパスは空ではありません",
-        "app_data.select_not_empty_dir_content": "新しいパスは空ではありません。コピーを選択すると、新しいパスのデータが上書きされます。データが失われるリスクがあります。続行しますか？",
+        "app_data.select_not_empty_dir_content": "新しいパスは空ではありません。新しいパスのデータが上書きされます。データが失われるリスクがあります。続行しますか？",
         "app_data.select_error_same_path": "新しいパスは元のパスと同じです。別のパスを選択してください",
+        "app_data.select_error_in_app_path": "新しいパスはアプリのインストールパスと同じです。別のパスを選択してください",
         "app_knowledge": "知識ベースファイル",
         "app_knowledge.button.delete": "ファイルを削除",
         "app_knowledge.remove_all": "ナレッジベースファイルを削除",
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index af26cddf92..ec2ad7785f 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -1089,7 +1089,7 @@
         "app_data.copy_data_option": "Копировать данные, будет автоматически перезапущено после копирования данных из исходной директории в новую директорию",
         "app_data.copy_time_notice": "Копирование данных из исходной директории займет некоторое время, пожалуйста, будьте терпеливы",
         "app_data.path_changed_without_copy": "Путь изменен успешно",
-        "app_data.copying_warning": "Копирование данных, нельзя взаимодействовать с приложением, не закрывайте приложение",
+        "app_data.copying_warning": "Копирование данных, нельзя взаимодействовать с приложением, не закрывайте приложение, приложение будет перезапущено после копирования",
         "app_data.copying": "Копирование данных в новое место...",
         "app_data.copy_success": "Данные успешно скопированы в новое место",
         "app_data.copy_failed": "Не удалось скопировать данные",
@@ -1102,7 +1102,8 @@
         "app_data.select_error_write_permission": "Новый путь не имеет разрешения на запись",
         "app_data.stop_quit_app_reason": "Приложение в настоящее время перемещает данные и не может быть закрыто",
         "app_data.select_not_empty_dir": "Новый путь не пуст",
-        "app_data.select_not_empty_dir_content": "Новый путь не пуст, если вы выбираете копирование, он перезапишет данные в новом пути, есть риск потери данных, продолжить?",
+        "app_data.select_not_empty_dir_content": "Новый путь не пуст, он перезапишет данные в новом пути, есть риск потери данных и ошибки копирования, продолжить?",
+        "app_data.select_error_in_app_path": "Новый путь совпадает с исходным путем, пожалуйста, выберите другой путь",
         "app_data.select_error_same_path": "Новый путь совпадает с исходным путем, пожалуйста, выберите другой путь",
         "app_knowledge": "Файлы базы знаний",
         "app_knowledge.button.delete": "Удалить файл",
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index fd393e36ce..8d7c30f323 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -1091,7 +1091,7 @@
         "app_data.copy_data_option": "复制数据，会自动重启后将原始目录数据复制到新目录",
         "app_data.copy_time_notice": "复制数据将需要一些时间，复制期间不要关闭应用",
         "app_data.path_changed_without_copy": "路径已更改成功",
-        "app_data.copying_warning": "数据复制中，不要强制退出app",
+        "app_data.copying_warning": "数据复制中，不要强制退出app, 复制完成后会自动重启应用",
         "app_data.copying": "正在将数据复制到新位置...",
         "app_data.copy_success": "已成功复制数据到新位置",
         "app_data.copy_failed": "复制数据失败",
@@ -1104,8 +1104,9 @@
         "app_data.select_error_write_permission": "新路径没有写入权限",
         "app_data.stop_quit_app_reason": "应用目前在迁移数据, 不能退出",
         "app_data.select_not_empty_dir": "新路径不为空",
-        "app_data.select_not_empty_dir_content": "新路径不为空，选择复制将覆盖新路径中的数据, 有数据丢失的风险，是否继续？",
+        "app_data.select_not_empty_dir_content": "新路径不为空，将覆盖新路径中的数据, 有数据丢失和复制失败的风险，是否继续？",
         "app_data.select_error_same_path": "新路径与旧路径相同，请选择其他路径",
+        "app_data.select_error_in_app_path": "新路径与应用安装路径相同，请选择其他路径",
         "app_knowledge": "知识库文件",
         "app_knowledge.button.delete": "删除文件",
         "app_knowledge.remove_all": "删除知识库文件",
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index 995bee24bc..1d23fb540a 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -1091,7 +1091,7 @@
         "app_data.copy_data_option": "複製數據, 會自動重啟後將原始目錄數據複製到新目錄",
         "app_data.copy_time_notice": "複製數據將需要一些時間，複製期間不要關閉應用",
         "app_data.path_changed_without_copy": "路徑已變更成功",
-        "app_data.copying_warning": "數據複製中，不要強制退出應用",
+        "app_data.copying_warning": "數據複製中，不要強制退出應用, 複製完成後會自動重啟應用",
         "app_data.copying": "正在複製數據到新位置...",
         "app_data.copy_success": "成功複製數據到新位置",
         "app_data.copy_failed": "複製數據失敗",
@@ -1104,8 +1104,9 @@
         "app_data.select_error_write_permission": "新路徑沒有寫入權限",
         "app_data.stop_quit_app_reason": "應用目前正在遷移數據，不能退出",
         "app_data.select_not_empty_dir": "新路徑不為空",
-        "app_data.select_not_empty_dir_content": "新路徑不為空，選擇複製將覆蓋新路徑中的數據, 有數據丟失的風險，是否繼續？",
+        "app_data.select_not_empty_dir_content": "新路徑不為空，選擇複製將覆蓋新路徑中的數據, 有數據丟失和複製失敗的風險，是否繼續？",
         "app_data.select_error_same_path": "新路徑與舊路徑相同，請選擇其他路徑",
+        "app_data.select_error_in_app_path": "新路徑與應用安裝路徑相同，請選擇其他路徑",
         "app_knowledge": "知識庫文件",
         "app_knowledge.button.delete": "刪除檔案",
         "app_knowledge.remove_all": "刪除知識庫檔案",
diff --git a/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx b/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
index 52b1c0bbb7..0038f1947c 100644
--- a/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
@@ -202,12 +202,18 @@ const DataSettings: FC = () => {
       return
     }
 
-    // check new app data path is same as old app data path
-    if (newAppDataPath.startsWith(appInfo!.appDataPath)) {
+    // check new app data path is not in old app data path
+    if (newAppDataPath.startsWith(appInfo.appDataPath)) {
       window.message.error(t('settings.data.app_data.select_error_same_path'))
       return
     }
 
+    // check new app data path is not in app install path
+    if (newAppDataPath.startsWith(appInfo.installPath)) {
+      window.message.error(t('settings.data.app_data.select_error_in_app_path'))
+      return
+    }
+
     // check new app data path has write permission
     const hasWritePermission = await window.api.hasWritePermission(newAppDataPath)
     if (!hasWritePermission) {
@@ -219,25 +225,30 @@ const DataSettings: FC = () => {
       <div style={{ fontSize: '18px', fontWeight: 'bold' }}>{t('settings.data.app_data.migration_title')}</div>
     )
     const migrationClassName = 'migration-modal'
-
-    if (await window.api.isNotEmptyDir(newAppDataPath)) {
-      const modal = window.modal.confirm({
-        title: t('settings.data.app_data.select_not_empty_dir'),
-        content: t('settings.data.app_data.select_not_empty_dir_content'),
-        centered: true,
-        okText: t('common.confirm'),
-        cancelText: t('common.cancel'),
-        onOk: () => {
-          modal.destroy()
-          // 显示确认对话框
-          showMigrationConfirmModal(appInfo.appDataPath, newAppDataPath, migrationTitle, migrationClassName)
-        }
-      })
-      return
-    }
     showMigrationConfirmModal(appInfo.appDataPath, newAppDataPath, migrationTitle, migrationClassName)
   }
 
+  const doubleConfirmModalBeforeCopyData = (newPath: string) => {
+    window.modal.confirm({
+      title: t('settings.data.app_data.select_not_empty_dir'),
+      content: t('settings.data.app_data.select_not_empty_dir_content'),
+      centered: true,
+      okText: t('common.confirm'),
+      cancelText: t('common.cancel'),
+      onOk: () => {
+        window.message.info({
+          content: t('settings.data.app_data.restart_notice'),
+          duration: 2
+        })
+        setTimeout(() => {
+          window.api.relaunchApp({
+            args: ['--new-data-path=' + newPath]
+          })
+        }, 500)
+      }
+    })
+  }
+
   // 显示确认迁移的对话框
   const showMigrationConfirmModal = async (
     originalPath: string,
@@ -280,7 +291,7 @@ const DataSettings: FC = () => {
     )
 
     // 显示确认模态框
-    const modal = window.modal.confirm({
+    window.modal.confirm({
       title,
       className,
       width: 'min(600px, 90vw)',
@@ -305,11 +316,12 @@ const DataSettings: FC = () => {
       cancelText: t('common.cancel'),
       onOk: async () => {
         try {
-          // 立即关闭确认对话框
-          modal.destroy()
-
           if (shouldCopyData) {
-            // 如果选择复制数据，显示进度模态框并执行迁移
+            if (await window.api.isNotEmptyDir(newPath)) {
+              doubleConfirmModalBeforeCopyData(newPath)
+              return
+            }
+
             window.message.info({
               content: t('settings.data.app_data.restart_notice'),
               duration: 3
@@ -318,12 +330,12 @@ const DataSettings: FC = () => {
               window.api.relaunchApp({
                 args: ['--new-data-path=' + newPath]
               })
-            }, 300)
-          } else {
-            // 如果不复制数据，直接设置新的应用数据路径
-            await window.api.setAppDataPath(newPath)
-            window.message.success(t('settings.data.app_data.path_changed_without_copy'))
+            }, 500)
+            return
           }
+          // 如果不复制数据，直接设置新的应用数据路径
+          await window.api.setAppDataPath(newPath)
+          window.message.success(t('settings.data.app_data.path_changed_without_copy'))
 
           // 更新应用数据路径
           setAppInfo(await window.api.getAppInfo())
@@ -333,7 +345,7 @@ const DataSettings: FC = () => {
             window.message.success(t('settings.data.app_data.select_success'))
             window.api.setStopQuitApp(false, '')
             window.api.relaunchApp()
-          }, 1000)
+          }, 500)
         } catch (error) {
           window.api.setStopQuitApp(false, '')
           window.message.error({
@@ -484,6 +496,9 @@ const DataSettings: FC = () => {
     // flush app data
     await window.api.flushAppData()
 
+    // wait 2 seconds to flush app data
+    await new Promise((resolve) => setTimeout(resolve, 2000))
+
     // 开始复制过程
     const copyResult = await window.api.copy(originalPath, newPath)
 
diff --git a/src/renderer/src/types/index.ts b/src/renderer/src/types/index.ts
index e60f374ba7..75e1da19ce 100644
--- a/src/renderer/src/types/index.ts
+++ b/src/renderer/src/types/index.ts
@@ -387,6 +387,7 @@ export type AppInfo = {
   logsPath: string
   arch: string
   isPortable: boolean
+  installPath: string
 }
 
 export interface Shortcut {

From bbe380cc9e43e68eb8a6c175edd7f7c9f057f97b Mon Sep 17 00:00:00 2001
From: beyondkmp <beyondkmp@gmail.com>
Date: Mon, 23 Jun 2025 21:19:21 +0800
Subject: [PATCH 16/75] feat(ContextMenu): add spell check and dictionary
 suggestions to context menu (#7067)

* feat(ContextMenu): add spell check and dictionary suggestions to context menu

- Implemented spell check functionality in the context menu with options to learn spelling and view dictionary suggestions.
- Updated WindowService to enable spellcheck in the webview.
- Enabled spell check in Inputbar and MessageEditor components.

* feat(SpellCheck): implement spell check language settings and initialization

- Added support for configuring spell check languages based on user-selected language.
- Introduced IPC channel for setting spell check languages.
- Updated settings to manage spell check enablement and languages.
- Enhanced UI to allow users to toggle spell check functionality and select languages.
- Default spell check languages are set based on the current UI language if none are specified.

* refactor(SpellCheck): enhance spell check language mapping and UI settings

- Updated spell check language mapping to default to English for unsupported languages.
- Improved UI logic to only update spell check languages when enabled and no manual selections are made.
- Added a new selection component for users to choose from commonly supported spell check languages.

* feat(SpellCheck): integrate spell check functionality into Inputbar and MessageEditor

- Added enableSpellCheck setting to control spell check functionality in both Inputbar and MessageEditor components.
- Updated spellCheck prop to utilize the new setting, enhancing user experience by allowing customization of spell check behavior.

* refactor(SpellCheck): move spell check initialization to WindowService

- Removed spell check language initialization from index.ts and integrated it into WindowService.
- Added setupSpellCheck method to configure spell check languages based on user settings.
- Enhanced error handling for spell check language setup.

* feat(SpellCheck): add enable spell check functionality and IPC channel

- Introduced a new IPC channel for enabling/disabling spell check functionality.
- Updated the preload API to include a method for setting spell check enablement.
- Modified the main IPC handler to manage spell check settings based on user input.
- Simplified spell check language handling in the settings component by directly invoking the new API method.

* refactor(SpellCheck): remove spellcheck option from WindowService configuration

- Removed the spellcheck property from the WindowService configuration object.
- This change streamlines the configuration setup as spell check functionality is now managed through IPC channels.

* feat(i18n): add spell check translations for Japanese, Russian, and Traditional Chinese

- Added new translations for spell check functionality in ja-jp, ru-ru, and zh-tw locale files.
- Included descriptions and language selection options for spell check settings to enhance user experience.

* feat(migrate): add spell check configuration migration

- Implemented migration for spell check settings, disabling spell check and clearing selected languages in the new configuration.
- Enhanced error handling to ensure state consistency during migration process.

* fix(migrate): ensure spell check settings are updated safely

- Added a check to ensure state.settings exists before modifying spell check settings during migration.
- Removed redundant error handling that returned the state unmodified in case of an error.

* fix(WindowService): set default values for spell check configuration and update related UI texts

* refactor(Inputbar, MessageEditor): remove contextMenu attribute and add context menu handling in MessageEditor

---------

Co-authored-by: beyondkmp <beyondkmkp@gmail.com>
---
 packages/shared/IpcChannel.ts                 |  2 +
 src/main/ipc.ts                               | 20 ++++++
 src/main/services/ContextMenu.ts              | 60 +++++++++++++++-
 src/main/services/WindowService.ts            | 13 ++++
 src/preload/index.ts                          |  2 +
 src/renderer/src/i18n/locales/en-us.json      |  4 +-
 src/renderer/src/i18n/locales/ja-jp.json      |  2 +
 src/renderer/src/i18n/locales/ru-ru.json      |  2 +
 src/renderer/src/i18n/locales/zh-cn.json      | 12 ++--
 src/renderer/src/i18n/locales/zh-tw.json      |  2 +
 .../src/pages/home/Inputbar/Inputbar.tsx      |  6 +-
 .../src/pages/home/Messages/MessageEditor.tsx |  9 ++-
 .../src/pages/settings/GeneralSettings.tsx    | 69 ++++++++++++++++++-
 src/renderer/src/store/migrate.ts             |  4 ++
 src/renderer/src/store/settings.ts            | 14 +++-
 15 files changed, 204 insertions(+), 17 deletions(-)

diff --git a/packages/shared/IpcChannel.ts b/packages/shared/IpcChannel.ts
index 4c6988cf6e..a3988d1c42 100644
--- a/packages/shared/IpcChannel.ts
+++ b/packages/shared/IpcChannel.ts
@@ -3,6 +3,8 @@ export enum IpcChannel {
   App_ClearCache = 'app:clear-cache',
   App_SetLaunchOnBoot = 'app:set-launch-on-boot',
   App_SetLanguage = 'app:set-language',
+  App_SetEnableSpellCheck = 'app:set-enable-spell-check',
+  App_SetSpellCheckLanguages = 'app:set-spell-check-languages',
   App_ShowUpdateDialog = 'app:show-update-dialog',
   App_CheckForUpdate = 'app:check-for-update',
   App_Reload = 'app:reload',
diff --git a/src/main/ipc.ts b/src/main/ipc.ts
index 5f54d64e07..88d66d4a39 100644
--- a/src/main/ipc.ts
+++ b/src/main/ipc.ts
@@ -87,6 +87,26 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     configManager.setLanguage(language)
   })
 
+  // spell check
+  ipcMain.handle(IpcChannel.App_SetEnableSpellCheck, (_, isEnable: boolean) => {
+    const windows = BrowserWindow.getAllWindows()
+    windows.forEach((window) => {
+      window.webContents.session.setSpellCheckerEnabled(isEnable)
+    })
+  })
+
+  // spell check languages
+  ipcMain.handle(IpcChannel.App_SetSpellCheckLanguages, (_, languages: string[]) => {
+    if (languages.length === 0) {
+      return
+    }
+    const windows = BrowserWindow.getAllWindows()
+    windows.forEach((window) => {
+      window.webContents.session.setSpellCheckerLanguages(languages)
+    })
+    configManager.set('spellCheckLanguages', languages)
+  })
+
   // launch on boot
   ipcMain.handle(IpcChannel.App_SetLaunchOnBoot, (_, openAtLogin: boolean) => {
     // Set login item settings for windows and mac
diff --git a/src/main/services/ContextMenu.ts b/src/main/services/ContextMenu.ts
index 2f4f5aa20f..34ec4b911a 100644
--- a/src/main/services/ContextMenu.ts
+++ b/src/main/services/ContextMenu.ts
@@ -9,7 +9,18 @@ class ContextMenu {
       const template: MenuItemConstructorOptions[] = this.createEditMenuItems(properties)
       const filtered = template.filter((item) => item.visible !== false)
       if (filtered.length > 0) {
-        const menu = Menu.buildFromTemplate([...filtered, ...this.createInspectMenuItems(w)])
+        let template = [...filtered, ...this.createInspectMenuItems(w)]
+        const dictionarySuggestions = this.createDictionarySuggestions(properties, w)
+        if (dictionarySuggestions.length > 0) {
+          template = [
+            ...dictionarySuggestions,
+            { type: 'separator' },
+            this.createSpellCheckMenuItem(properties, w),
+            { type: 'separator' },
+            ...template
+          ]
+        }
+        const menu = Menu.buildFromTemplate(template)
         menu.popup()
       }
     })
@@ -72,6 +83,53 @@ class ContextMenu {
 
     return template
   }
+
+  private createSpellCheckMenuItem(
+    properties: Electron.ContextMenuParams,
+    mainWindow: Electron.BrowserWindow
+  ): MenuItemConstructorOptions {
+    const hasText = properties.selectionText.length > 0
+
+    return {
+      id: 'learnSpelling',
+      label: '&Learn Spelling',
+      visible: Boolean(properties.isEditable && hasText && properties.misspelledWord),
+      click: () => {
+        mainWindow.webContents.session.addWordToSpellCheckerDictionary(properties.misspelledWord)
+      }
+    }
+  }
+
+  private createDictionarySuggestions(
+    properties: Electron.ContextMenuParams,
+    mainWindow: Electron.BrowserWindow
+  ): MenuItemConstructorOptions[] {
+    const hasText = properties.selectionText.length > 0
+
+    if (!hasText || !properties.misspelledWord) {
+      return []
+    }
+
+    if (properties.dictionarySuggestions.length === 0) {
+      return [
+        {
+          id: 'dictionarySuggestions',
+          label: 'No Guesses Found',
+          visible: true,
+          enabled: false
+        }
+      ]
+    }
+
+    return properties.dictionarySuggestions.map((suggestion) => ({
+      id: 'dictionarySuggestions',
+      label: suggestion,
+      visible: Boolean(properties.isEditable && hasText && properties.misspelledWord),
+      click: (menuItem: Electron.MenuItem) => {
+        mainWindow.webContents.replaceMisspelling(menuItem.label)
+      }
+    }))
+  }
 }
 
 export const contextMenu = new ContextMenu()
diff --git a/src/main/services/WindowService.ts b/src/main/services/WindowService.ts
index f6322e8939..78784120b0 100644
--- a/src/main/services/WindowService.ts
+++ b/src/main/services/WindowService.ts
@@ -95,6 +95,7 @@ export class WindowService {
 
     this.setupMaximize(mainWindow, mainWindowState.isMaximized)
     this.setupContextMenu(mainWindow)
+    this.setupSpellCheck(mainWindow)
     this.setupWindowEvents(mainWindow)
     this.setupWebContentsHandlers(mainWindow)
     this.setupWindowLifecycleEvents(mainWindow)
@@ -102,6 +103,18 @@ export class WindowService {
     this.loadMainWindowContent(mainWindow)
   }
 
+  private setupSpellCheck(mainWindow: BrowserWindow) {
+    const enableSpellCheck = configManager.get('enableSpellCheck', false)
+    if (enableSpellCheck) {
+      try {
+        const spellCheckLanguages = configManager.get('spellCheckLanguages', []) as string[]
+        spellCheckLanguages.length > 0 && mainWindow.webContents.session.setSpellCheckerLanguages(spellCheckLanguages)
+      } catch (error) {
+        Logger.error('Failed to set spell check languages:', error as Error)
+      }
+    }
+  }
+
   private setupMainWindowMonitor(mainWindow: BrowserWindow) {
     mainWindow.webContents.on('render-process-gone', (_, details) => {
       Logger.error(`Renderer process crashed with: ${JSON.stringify(details)}`)
diff --git a/src/preload/index.ts b/src/preload/index.ts
index 5138d4e4de..114ad13ef6 100644
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -17,6 +17,8 @@ const api = {
   checkForUpdate: () => ipcRenderer.invoke(IpcChannel.App_CheckForUpdate),
   showUpdateDialog: () => ipcRenderer.invoke(IpcChannel.App_ShowUpdateDialog),
   setLanguage: (lang: string) => ipcRenderer.invoke(IpcChannel.App_SetLanguage, lang),
+  setEnableSpellCheck: (isEnable: boolean) => ipcRenderer.invoke(IpcChannel.App_SetEnableSpellCheck, isEnable),
+  setSpellCheckLanguages: (languages: string[]) => ipcRenderer.invoke(IpcChannel.App_SetSpellCheckLanguages, languages),
   setLaunchOnBoot: (isActive: boolean) => ipcRenderer.invoke(IpcChannel.App_SetLaunchOnBoot, isActive),
   setLaunchToTray: (isActive: boolean) => ipcRenderer.invoke(IpcChannel.App_SetLaunchToTray, isActive),
   setTray: (isActive: boolean) => ipcRenderer.invoke(IpcChannel.App_SetTray, isActive),
diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index fefebd6394..fa1f493d80 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -864,7 +864,7 @@
       "paint_course": "tutorial",
       "prompt_placeholder_edit": "Enter your image description, text drawing uses \"double quotes\" to wrap",
       "prompt_placeholder_en": "Enter your image description, currently Imagen only supports English prompts",
-      "proxy_required": "Open the proxy and enable “TUN mode” to view generated images or copy them to the browser for opening. In the future, domestic direct connection will be supported",
+      "proxy_required": "Open the proxy and enable \"TUN mode\" to view generated images or copy them to the browser for opening. In the future, domestic direct connection will be supported",
       "image_file_required": "Please upload an image first",
       "image_file_retry": "Please re-upload an image first",
       "image_placeholder": "No image available",
@@ -1392,6 +1392,8 @@
       "general.user_name": "User Name",
       "general.user_name.placeholder": "Enter your name",
       "general.view_webdav_settings": "View WebDAV settings",
+      "general.spell_check": "Spell Check",
+      "general.spell_check.languages": "Use spell check for",
       "input.auto_translate_with_space": "Quickly translate with 3 spaces",
       "input.show_translate_confirm": "Show translation confirmation dialog",
       "input.target_language": "Target language",
diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json
index 612df65d71..ffa579d563 100644
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@@ -1387,6 +1387,8 @@
       "general.user_name": "ユーザー名",
       "general.user_name.placeholder": "ユーザー名を入力",
       "general.view_webdav_settings": "WebDAV設定を表示",
+      "general.spell_check": "スペルチェック",
+      "general.spell_check.languages": "スペルチェック言語",
       "input.auto_translate_with_space": "スペースを3回押して翻訳",
       "input.target_language": "目標言語",
       "input.target_language.chinese": "簡体字中国語",
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index ec2ad7785f..a713da42ee 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -1387,6 +1387,8 @@
       "general.user_name": "Имя пользователя",
       "general.user_name.placeholder": "Введите ваше имя",
       "general.view_webdav_settings": "Просмотр настроек WebDAV",
+      "general.spell_check": "Проверка орфографии",
+      "general.spell_check.languages": "Языки проверки орфографии",
       "input.auto_translate_with_space": "Быстрый перевод с помощью 3-х пробелов",
       "input.target_language": "Целевой язык",
       "input.target_language.chinese": "Китайский упрощенный",
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index 8d7c30f323..c16089db5e 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -863,8 +863,8 @@
       "learn_more": "了解更多",
       "paint_course": "教程",
       "prompt_placeholder_edit": "输入你的图片描述，文本绘制用 \"双引号\" 包裹",
-      "prompt_placeholder_en": "输入”英文“图片描述，目前 Imagen 仅支持英文提示词",
-      "proxy_required": "打开代理并开启”TUN模式“查看生成图片或复制到浏览器打开，后续会支持国内直连",
+      "prompt_placeholder_en": "输入\"英文\"图片描述，目前 Imagen 仅支持英文提示词",
+      "proxy_required": "打开代理并开启\"TUN模式\"查看生成图片或复制到浏览器打开，后续会支持国内直连",
       "image_file_required": "请先上传图片",
       "image_file_retry": "请重新上传图片",
       "image_placeholder": "暂无图片",
@@ -960,7 +960,7 @@
         "magic_prompt_option_tip": "智能优化放大提示词"
       },
       "text_desc_required": "请先输入图片描述",
-      "req_error_text": "运行失败，请重试。提示词避免“版权词”和”敏感词”哦。",
+      "req_error_text": "运行失败，请重试。提示词避免\"版权词\"和\"敏感词\"哦。",
       "req_error_token": "请检查令牌有效性",
       "req_error_no_balance": "请检查令牌有效性",
       "image_handle_required": "请先上传图片",
@@ -1390,9 +1390,11 @@
       "general.restore.button": "恢复",
       "general.title": "常规设置",
       "general.user_name": "用户名",
-      "general.user_name.placeholder": "请输入用户名",
+      "general.user_name.placeholder": "输入您的姓名",
       "general.view_webdav_settings": "查看 WebDAV 设置",
-      "input.auto_translate_with_space": "快速敲击3次空格翻译",
+      "general.spell_check": "拼写检查",
+      "general.spell_check.languages": "拼写检查语言",
+      "input.auto_translate_with_space": "3个空格快速翻译",
       "input.show_translate_confirm": "显示翻译确认对话框",
       "input.target_language": "目标语言",
       "input.target_language.chinese": "简体中文",
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index 1d23fb540a..72be4f02e6 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -1389,6 +1389,8 @@
       "general.user_name": "使用者名稱",
       "general.user_name.placeholder": "輸入您的名稱",
       "general.view_webdav_settings": "檢視 WebDAV 設定",
+      "general.spell_check": "拼寫檢查",
+      "general.spell_check.languages": "拼寫檢查語言",
       "input.auto_translate_with_space": "快速敲擊 3 次空格翻譯",
       "input.show_translate_confirm": "顯示翻譯確認對話框",
       "input.target_language": "目標語言",
diff --git a/src/renderer/src/pages/home/Inputbar/Inputbar.tsx b/src/renderer/src/pages/home/Inputbar/Inputbar.tsx
index 958b779030..360a76d8a8 100644
--- a/src/renderer/src/pages/home/Inputbar/Inputbar.tsx
+++ b/src/renderer/src/pages/home/Inputbar/Inputbar.tsx
@@ -77,7 +77,8 @@ const Inputbar: FC<Props> = ({ assistant: _assistant, setActiveTopic, topic }) =
     showInputEstimatedTokens,
     autoTranslateWithSpace,
     enableQuickPanelTriggers,
-    enableBackspaceDeleteModel
+    enableBackspaceDeleteModel,
+    enableSpellCheck
   } = useSettings()
   const [expended, setExpend] = useState(false)
   const [estimateTokenCount, setEstimateTokenCount] = useState(0)
@@ -780,9 +781,8 @@ const Inputbar: FC<Props> = ({ assistant: _assistant, setActiveTopic, topic }) =
                 : t('chat.input.placeholder', { key: getSendMessageShortcutLabel(sendMessageShortcut) })
             }
             autoFocus
-            contextMenu="true"
             variant="borderless"
-            spellCheck={false}
+            spellCheck={enableSpellCheck}
             rows={2}
             ref={textareaRef}
             style={{
diff --git a/src/renderer/src/pages/home/Messages/MessageEditor.tsx b/src/renderer/src/pages/home/Messages/MessageEditor.tsx
index 895eb787d2..62636ccd68 100644
--- a/src/renderer/src/pages/home/Messages/MessageEditor.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageEditor.tsx
@@ -40,7 +40,7 @@ const MessageBlockEditor: FC<Props> = ({ message, onSave, onResend, onCancel })
   const model = assistant.model || assistant.defaultModel
   const isVision = useMemo(() => isVisionModel(model), [model])
   const supportExts = useMemo(() => [...textExts, ...documentExts, ...(isVision ? imageExts : [])], [isVision])
-  const { pasteLongTextAsFile, pasteLongTextThreshold, fontSize, sendMessageShortcut } = useSettings()
+  const { pasteLongTextAsFile, pasteLongTextThreshold, fontSize, sendMessageShortcut, enableSpellCheck } = useSettings()
   const { t } = useTranslation()
   const textareaRef = useRef<TextAreaRef>(null)
   const attachmentButtonRef = useRef<AttachmentButtonRef>(null)
@@ -222,13 +222,16 @@ const MessageBlockEditor: FC<Props> = ({ message, onSave, onResend, onCancel })
             }}
             onKeyDown={(e) => handleKeyDown(e, block.id)}
             autoFocus
-            contextMenu="true"
-            spellCheck={false}
+            spellCheck={enableSpellCheck}
             onPaste={(e) => onPaste(e.nativeEvent)}
             onFocus={() => {
               // 记录当前聚焦的组件
               PasteService.setLastFocusedComponent('messageEditor')
             }}
+            onContextMenu={(e) => {
+              // 阻止事件冒泡，避免触发全局的 Electron contextMenu
+              e.stopPropagation()
+            }}
             style={{
               fontSize,
               padding: '0px 15px 8px 15px'
diff --git a/src/renderer/src/pages/settings/GeneralSettings.tsx b/src/renderer/src/pages/settings/GeneralSettings.tsx
index 7665099f23..ba0de7fdf9 100644
--- a/src/renderer/src/pages/settings/GeneralSettings.tsx
+++ b/src/renderer/src/pages/settings/GeneralSettings.tsx
@@ -2,8 +2,15 @@ import { useTheme } from '@renderer/context/ThemeProvider'
 import { useSettings } from '@renderer/hooks/useSettings'
 import i18n from '@renderer/i18n'
 import { RootState, useAppDispatch } from '@renderer/store'
-import { setEnableDataCollection, setLanguage, setNotificationSettings } from '@renderer/store/settings'
-import { setProxyMode, setProxyUrl as _setProxyUrl } from '@renderer/store/settings'
+import {
+  setEnableDataCollection,
+  setEnableSpellCheck,
+  setLanguage,
+  setNotificationSettings,
+  setProxyMode,
+  setProxyUrl as _setProxyUrl,
+  setSpellCheckLanguages
+} from '@renderer/store/settings'
 import { LanguageVarious } from '@renderer/types'
 import { NotificationSource } from '@renderer/types/notification'
 import { isValidProxyUrl } from '@renderer/utils'
@@ -26,7 +33,8 @@ const GeneralSettings: FC = () => {
     trayOnClose,
     tray,
     proxyMode: storeProxyMode,
-    enableDataCollection
+    enableDataCollection,
+    enableSpellCheck
   } = useSettings()
   const [proxyUrl, setProxyUrl] = useState<string | undefined>(storeProxyUrl)
   const { theme } = useTheme()
@@ -69,6 +77,11 @@ const GeneralSettings: FC = () => {
     i18n.changeLanguage(value)
   }
 
+  const handleSpellCheckChange = (checked: boolean) => {
+    dispatch(setEnableSpellCheck(checked))
+    window.api.setEnableSpellCheck(checked)
+  }
+
   const onSetProxyUrl = () => {
     if (proxyUrl && !isValidProxyUrl(proxyUrl)) {
       window.message.error({ content: t('message.error.invalid.proxy.url'), key: 'proxy-error' })
@@ -109,11 +122,30 @@ const GeneralSettings: FC = () => {
   ]
 
   const notificationSettings = useSelector((state: RootState) => state.settings.notification)
+  const spellCheckLanguages = useSelector((state: RootState) => state.settings.spellCheckLanguages)
 
   const handleNotificationChange = (type: NotificationSource, value: boolean) => {
     dispatch(setNotificationSettings({ ...notificationSettings, [type]: value }))
   }
 
+  // Define available spell check languages with display names (only commonly supported languages)
+  const spellCheckLanguageOptions = [
+    { value: 'en-US', label: 'English (US)', flag: '🇺🇸' },
+    { value: 'es', label: 'Español', flag: '🇪🇸' },
+    { value: 'fr', label: 'Français', flag: '🇫🇷' },
+    { value: 'de', label: 'Deutsch', flag: '🇩🇪' },
+    { value: 'it', label: 'Italiano', flag: '🇮🇹' },
+    { value: 'pt', label: 'Português', flag: '🇵🇹' },
+    { value: 'ru', label: 'Русский', flag: '🇷🇺' },
+    { value: 'nl', label: 'Nederlands', flag: '🇳🇱' },
+    { value: 'pl', label: 'Polski', flag: '🇵🇱' }
+  ]
+
+  const handleSpellCheckLanguagesChange = (selectedLanguages: string[]) => {
+    dispatch(setSpellCheckLanguages(selectedLanguages))
+    window.api.setSpellCheckLanguages(selectedLanguages)
+  }
+
   return (
     <SettingContainer theme={theme}>
       <SettingGroup theme={theme}>
@@ -135,6 +167,37 @@ const GeneralSettings: FC = () => {
           </Select>
         </SettingRow>
         <SettingDivider />
+        <SettingRow>
+          <SettingRowTitle>{t('settings.general.spell_check')}</SettingRowTitle>
+          <Switch checked={enableSpellCheck} onChange={handleSpellCheckChange} />
+        </SettingRow>
+        {enableSpellCheck && (
+          <>
+            <SettingDivider />
+            <SettingRow>
+              <SettingRowTitle>{t('settings.general.spell_check.languages')}</SettingRowTitle>
+              <Select
+                mode="multiple"
+                value={spellCheckLanguages}
+                style={{ width: 280 }}
+                placeholder={t('settings.general.spell_check.languages')}
+                onChange={handleSpellCheckLanguagesChange}
+                options={spellCheckLanguageOptions.map((lang) => ({
+                  value: lang.value,
+                  label: (
+                    <Space.Compact direction="horizontal" block>
+                      <Space.Compact block>{lang.label}</Space.Compact>
+                      <span role="img" aria-label={lang.flag}>
+                        {lang.flag}
+                      </span>
+                    </Space.Compact>
+                  )
+                }))}
+              />
+            </SettingRow>
+          </>
+        )}
+        <SettingDivider />
         <SettingRow>
           <SettingRowTitle>{t('settings.proxy.mode.title')}</SettingRowTitle>
           <Select
diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts
index 305d26b758..ece6204f66 100644
--- a/src/renderer/src/store/migrate.ts
+++ b/src/renderer/src/store/migrate.ts
@@ -1603,6 +1603,10 @@ const migrateConfig = {
           state.settings.exportMenuOptions.plain_text = true
         }
       }
+      if (state.settings) {
+        state.settings.enableSpellCheck = false
+        state.settings.spellCheckLanguages = []
+      }
       return state
     } catch (error) {
       return state
diff --git a/src/renderer/src/store/settings.ts b/src/renderer/src/store/settings.ts
index 49cbee952c..d4014adf25 100644
--- a/src/renderer/src/store/settings.ts
+++ b/src/renderer/src/store/settings.ts
@@ -155,6 +155,8 @@ export interface SettingsState {
   minappsOpenLinkExternal: boolean
   // 隐私设置
   enableDataCollection: boolean
+  enableSpellCheck: boolean
+  spellCheckLanguages: string[]
   enableQuickPanelTriggers: boolean
   enableBackspaceDeleteModel: boolean
   exportMenuOptions: {
@@ -298,6 +300,8 @@ export const initialState: SettingsState = {
   showOpenedMinappsInSidebar: true,
   minappsOpenLinkExternal: false,
   enableDataCollection: false,
+  enableSpellCheck: false,
+  spellCheckLanguages: [],
   enableQuickPanelTriggers: false,
   enableBackspaceDeleteModel: true,
   exportMenuOptions: {
@@ -657,6 +661,12 @@ const settingsSlice = createSlice({
     setEnableDataCollection: (state, action: PayloadAction<boolean>) => {
       state.enableDataCollection = action.payload
     },
+    setEnableSpellCheck: (state, action: PayloadAction<boolean>) => {
+      state.enableSpellCheck = action.payload
+    },
+    setSpellCheckLanguages: (state, action: PayloadAction<string[]>) => {
+      state.spellCheckLanguages = action.payload
+    },
     setExportMenuOptions: (state, action: PayloadAction<typeof initialState.exportMenuOptions>) => {
       state.exportMenuOptions = action.payload
     },
@@ -776,8 +786,10 @@ export const {
   setShowOpenedMinappsInSidebar,
   setMinappsOpenLinkExternal,
   setEnableDataCollection,
-  setEnableQuickPanelTriggers,
+  setEnableSpellCheck,
+  setSpellCheckLanguages,
   setExportMenuOptions,
+  setEnableQuickPanelTriggers,
   setEnableBackspaceDeleteModel,
   setOpenAISummaryText,
   setOpenAIServiceTier,

From f69ea8648c2b5c1ce1bf9854016b76018889be1e Mon Sep 17 00:00:00 2001
From: Ying-xi <62348590+Ying-xi@users.noreply.github.com>
Date: Tue, 24 Jun 2025 00:06:52 +0800
Subject: [PATCH 17/75] fix: display updated timestamp when available in
 knowledge base (#7453)

* fix: display updated timestamp when available in knowledge base

- Add updated_at field when creating knowledge items
- Show updated_at timestamp if it's newer than created_at
- Fallback to created_at if updated_at is not available or older

Fixes #4587

Signed-off-by: Ying-xi <62348590+Ying-xi@users.noreply.github.com>

* refactor(knowledge): extract display time logic into a reusable function

Signed-off-by: Ying-xi <62348590+Ying-xi@users.noreply.github.com>

---------

Signed-off-by: Ying-xi <62348590+Ying-xi@users.noreply.github.com>
---
 src/renderer/src/hooks/useKnowledge.ts            |  3 ++-
 .../src/pages/knowledge/KnowledgeContent.tsx      | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/renderer/src/hooks/useKnowledge.ts b/src/renderer/src/hooks/useKnowledge.ts
index 662829612e..efdc9bd120 100644
--- a/src/renderer/src/hooks/useKnowledge.ts
+++ b/src/renderer/src/hooks/useKnowledge.ts
@@ -169,7 +169,8 @@ export const useKnowledge = (baseId: string) => {
         processingStatus: 'pending',
         processingProgress: 0,
         processingError: '',
-        uniqueId: undefined
+        uniqueId: undefined,
+        updated_at: Date.now()
       })
       setTimeout(() => KnowledgeQueue.checkAllBases(), 0)
     }
diff --git a/src/renderer/src/pages/knowledge/KnowledgeContent.tsx b/src/renderer/src/pages/knowledge/KnowledgeContent.tsx
index 37362bd1d6..7d5d251660 100644
--- a/src/renderer/src/pages/knowledge/KnowledgeContent.tsx
+++ b/src/renderer/src/pages/knowledge/KnowledgeContent.tsx
@@ -35,6 +35,11 @@ interface KnowledgeContentProps {
 
 const fileTypes = [...bookExts, ...thirdPartyApplicationExts, ...documentExts, ...textExts]
 
+const getDisplayTime = (item: KnowledgeItem) => {
+  const timestamp = item.updated_at && item.updated_at > item.created_at ? item.updated_at : item.created_at
+  return dayjs(timestamp).format('MM-DD HH:mm')
+}
+
 const KnowledgeContent: FC<KnowledgeContentProps> = ({ selectedBase }) => {
   const { t } = useTranslation()
   const [expandAll, setExpandAll] = useState(false)
@@ -335,7 +340,7 @@ const KnowledgeContent: FC<KnowledgeContentProps> = ({ selectedBase }) => {
                             </ClickableSpan>
                           ),
                           ext: file.ext,
-                          extra: `${dayjs(file.created_at).format('MM-DD HH:mm')} · ${formatFileSize(file.size)}`,
+                          extra: `${getDisplayTime(item)} · ${formatFileSize(file.size)}`,
                           actions: (
                             <FlexAlignCenter>
                               {item.uniqueId && (
@@ -392,7 +397,7 @@ const KnowledgeContent: FC<KnowledgeContentProps> = ({ selectedBase }) => {
                     </ClickableSpan>
                   ),
                   ext: '.folder',
-                  extra: `${dayjs(item.created_at).format('MM-DD HH:mm')}`,
+                  extra: getDisplayTime(item),
                   actions: (
                     <FlexAlignCenter>
                       {item.uniqueId && <Button type="text" icon={<RefreshIcon />} onClick={() => refreshItem(item)} />}
@@ -470,7 +475,7 @@ const KnowledgeContent: FC<KnowledgeContentProps> = ({ selectedBase }) => {
                     </Dropdown>
                   ),
                   ext: '.url',
-                  extra: `${dayjs(item.created_at).format('MM-DD HH:mm')}`,
+                  extra: getDisplayTime(item),
                   actions: (
                     <FlexAlignCenter>
                       {item.uniqueId && <Button type="text" icon={<RefreshIcon />} onClick={() => refreshItem(item)} />}
@@ -525,7 +530,7 @@ const KnowledgeContent: FC<KnowledgeContentProps> = ({ selectedBase }) => {
                     </ClickableSpan>
                   ),
                   ext: '.sitemap',
-                  extra: `${dayjs(item.created_at).format('MM-DD HH:mm')}`,
+                  extra: getDisplayTime(item),
                   actions: (
                     <FlexAlignCenter>
                       {item.uniqueId && <Button type="text" icon={<RefreshIcon />} onClick={() => refreshItem(item)} />}
@@ -570,7 +575,7 @@ const KnowledgeContent: FC<KnowledgeContentProps> = ({ selectedBase }) => {
                 fileInfo={{
                   name: <span onClick={() => handleEditNote(note)}>{(note.content as string).slice(0, 50)}...</span>,
                   ext: '.txt',
-                  extra: `${dayjs(note.created_at).format('MM-DD HH:mm')}`,
+                  extra: getDisplayTime(note),
                   actions: (
                     <FlexAlignCenter>
                       <Button type="text" onClick={() => handleEditNote(note)} icon={<EditOutlined />} />

From 31b3ce1049a607d2448213e5bc1c1fc0f28231d2 Mon Sep 17 00:00:00 2001
From: Xunjin ZHENG <xunjin.zheng@outlook.com>
Date: Tue, 24 Jun 2025 01:54:12 +0800
Subject: [PATCH 18/75] feat: Update API Key Management Interface (#3444)

* feat: enhance API key management in ApiCheckPopup: allow users to add new API key

- Enhanced ApiCheckPopup component to allow users to add new API key, including validation for duplicate entries and improved user feedback.

* feat: update localization strings and refactor API key management components

- Added "Invalid API key" message to localization files for English, Japanese, Russian, Simplified Chinese, and Traditional Chinese.
- Refactored API key management by replacing the ApiCheckPopup with a new ApiKeyList component, enhancing user experience and modularity in handling API keys across provider settings.

* refactor: update OAuthButton and ApiKeyList components for improved UI and localization

- Commented out the translation key in OAuthButton for future use.
- Removed unnecessary localization strings related to API key tips across multiple languages.
- Enhanced ApiKeyList component with styled components for better layout and user interaction.
- Updated ProviderSetting and WebSearchProviderSetting to streamline API key management UI.

* refactor: streamline ApiKeyList component and update localization strings

- Removed the "Check Multiple API Keys" translation key from English, Japanese, Russian, Simplified Chinese, and Traditional Chinese localization files.
- Updated ApiKeyList component to eliminate the model prop, enhancing its simplicity and usability.
- Improved error handling in API key validation by integrating model selection directly within the check process.

* feat: add latency tooltip to API key validation in ApiKeyList component and update localization strings

- Introduced a latency tooltip in the ApiKeyList component to display the time taken for API key validation.
- Updated localization files for English, Japanese, Russian, Simplified Chinese, and Traditional Chinese to include the new latency tooltip string.

* refactor: remove unused imports in WebSearchProviderSetting component

* refactor: improve error handling and latency tracking in ApiKeyList component

- Enhanced error handling during model selection to prevent failures when the user cancels the popup.
- Introduced latency tracking for API key validation, ensuring accurate measurement of response times.
- Streamlined the code for better readability and maintainability.

* refactor: improve styling in ApiKeyList component for better UI consistency

- Updated padding styles for error messages and list items in the ApiKeyList component to enhance visual clarity and user experience.
- Adjusted Card component properties to ensure consistent styling across the interface.

* refactor: extract key formatting logic into a separate function in ApiKeyList component

- Created a new function `formatAndConvertKeysToArray` to handle the formatting and conversion of API keys into an array of unique key objects.
- Updated the state initialization and effect hook in the ApiKeyList component to utilize the new function, improving code readability and maintainability.

* refactor: conditionally render API key section for non-copilot providers

- Updated the ProviderSetting component to conditionally display the API key section only for providers other than 'copilot', improving the user interface and experience.
- Maintained existing functionality for API key management while enhancing code readability.

* refactor: enhance ApiKeyList component for copilot provider handling

- Introduced a new condition to manage the rendering and functionality of buttons in the ApiKeyList component based on the provider type, specifically for 'copilot'.
- Updated the ProviderSetting component to ensure the API key section is consistently displayed for all providers, improving overall user experience and code clarity.

* fix model type error

* feat(ApiKeyList): exclude rerank models from being checked for API key validation after #3969 is merged

* refactor(ApiKeyList): conditionally render check and remove buttons based on key statuses

* refactor(ApiKeyList): using Promise.all for improved performance after #4066 is merged

* refactor(ProviderSettings): update API key display and tooltip integration for improved layout and accessibility

* fix(ApiKeyList): prevent notifications from showing when checking multiple API keys

* feat(ApiKeyList): enhance API key handling with improved key formatting and auto-focus logic for add button

* refactor: clean up WebSearchProviderSetting component

* refactor(ApiKeyList): replace icon buttons with styled components for save and cancel actions

* refactor: API key list UI and remove unused components

Simplified the API key list UI by removing custom styled components for status and actions, replacing them with Ant Design icons and buttons. Improved the key checking logic and removed the tooltip for key check results. Also removed an unused help text in ProviderSetting.

* refactor: add edit functionality to API key list

Introduces the ability to edit existing API keys in the ApiKeyList component. Removes custom save/cancel icon buttons in favor of standard input blur/enter and icon actions. Also adjusts styling for help text in ProviderSetting.

* refactor(ApiKeyList): enhance key status display with tooltips and color coding

* feat(i18n): add "checking" status message in multiple languages

* feat(ApiKeyList): enhance API key management with confirmation for deletion and improved state handling

- Added confirmation for deleting API keys, allowing users to confirm before removal.
- Introduced a cancel state for adding new keys to improve user experience.
- Enhanced key status updates to prevent unnecessary re-renders.
- Improved UI interactions with better handling of edit and cancel actions.
- Added escape key functionality for canceling edits and new key entries.

* fix(ApiKeyList): adjust layout of API key list for improved spacing and alignment

- Updated the Flex component to justify content between elements, enhancing the visual layout of the API key list.
- Minor style adjustment to maintain consistency in the user interface.

* fix(ApiKeyList): refine padding for API key list items to enhance visual consistency

- Adjusted padding for API key list text and items to improve overall layout and alignment.
- Ensured consistent spacing across different states of the API key list.

---------

Co-authored-by: Pleasurecruise <3196812536@qq.com>
Co-authored-by: suyao <sy20010504@gmail.com>
---
 src/renderer/src/i18n/locales/en-us.json      |   9 +-
 src/renderer/src/i18n/locales/ja-jp.json      |   9 +-
 src/renderer/src/i18n/locales/ru-ru.json      |   9 +-
 src/renderer/src/i18n/locales/zh-cn.json      |   9 +-
 src/renderer/src/i18n/locales/zh-tw.json      |   9 +-
 .../ProviderSettings/ApiCheckPopup.tsx        | 231 -------
 .../settings/ProviderSettings/ApiKeyList.tsx  | 638 ++++++++++++++++++
 .../ProviderSettings/ProviderSetting.tsx      | 138 +---
 .../WebSearchProviderSetting.tsx              | 110 +--
 9 files changed, 698 insertions(+), 464 deletions(-)
 delete mode 100644 src/renderer/src/pages/settings/ProviderSettings/ApiCheckPopup.tsx
 create mode 100644 src/renderer/src/pages/settings/ProviderSettings/ApiKeyList.tsx

diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index fa1f493d80..c760f49378 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -1605,6 +1605,7 @@
       "models.check.model_status_summary": "{{provider}}: {{summary}}",
       "models.check.no_api_keys": "No API keys found, please add API keys first.",
       "models.check.passed": "Passed",
+      "models.check.checking": "Checking",
       "models.check.select_api_key": "Select the API key to use:",
       "models.check.single": "Single",
       "models.check.start": "Start",
@@ -1653,7 +1654,6 @@
         "api.url.tip": "Ending with / ignores v1, ending with # forces use of input address",
         "api_host": "API Host",
         "api_key": "API Key",
-        "api_key.tip": "Multiple keys separated by commas",
         "api_version": "API Version",
         "basic_auth": "HTTP authentication",
         "basic_auth.tip": "Applicable to instances deployed remotely (see the documentation). Currently, only the Basic scheme (RFC 7617) is supported.",
@@ -1708,9 +1708,9 @@
         "get_api_key": "Get API Key",
         "is_not_support_array_content": "Enable compatible mode",
         "no_models_for_check": "No models available for checking (e.g. chat models)",
-        "not_checked": "Not Checked",
         "remove_duplicate_keys": "Remove Duplicate Keys",
         "remove_invalid_keys": "Remove Invalid Keys",
+        "invalid_key": "Invalid API key",
         "search": "Search Providers...",
         "search_placeholder": "Search model id or name",
         "title": "Model Provider",
@@ -1739,7 +1739,10 @@
           },
           "documentation": "View official documentation for more configuration details:",
           "learn_more": "Learn More"
-        }
+        },
+        "enter_new_api_key": "Enter new API key",
+        "key_already_exists": "API key already exists",
+        "check_tooltip.latency": "Latency"
       },
       "proxy": {
         "mode": {
diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json
index ffa579d563..3899742f9a 100644
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@@ -1599,6 +1599,7 @@
       "models.check.model_status_summary": "{{provider}}: {{summary}}",
       "models.check.no_api_keys": "APIキーが見つかりません。まずAPIキーを追加してください。",
       "models.check.passed": "成功",
+      "models.check.checking": "チェック中",
       "models.check.select_api_key": "使用するAPIキーを選択：",
       "models.check.single": "単一",
       "models.check.start": "開始",
@@ -1641,7 +1642,6 @@
         "api.url.tip": "/で終わる場合、v1を無視します。#で終わる場合、入力されたアドレスを強制的に使用します",
         "api_host": "APIホスト",
         "api_key": "APIキー",
-        "api_key.tip": "複数のキーはカンマで区切ります",
         "api_version": "APIバージョン",
         "basic_auth": "HTTP 認証",
         "basic_auth.tip": "サーバー展開によるインスタンスに適用されます（ドキュメントを参照）。現在はBasicスキーム（RFC7617）のみをサポートしています。",
@@ -1693,9 +1693,9 @@
         "get_api_key": "APIキーを取得",
         "is_not_support_array_content": "互換モードを有効にする",
         "no_models_for_check": "チェックするモデルがありません（例：会話モデル）",
-        "not_checked": "未チェック",
         "remove_duplicate_keys": "重複キーを削除",
         "remove_invalid_keys": "無効なキーを削除",
+        "invalid_key": "無効なAPIキー",
         "search": "プロバイダーを検索...",
         "search_placeholder": "モデルIDまたは名前を検索",
         "title": "モデルプロバイダー",
@@ -1727,7 +1727,10 @@
           },
           "documentation": "詳細な設定については、公式ドキュメントを参照してください:",
           "learn_more": "詳細を確認"
-        }
+        },
+        "enter_new_api_key": "新しいAPIキーを入力",
+        "key_already_exists": "APIキーはすでに存在します",
+        "check_tooltip.latency": "遅延"
       },
       "proxy": {
         "mode": {
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index a713da42ee..619f931c8f 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -1599,6 +1599,7 @@
       "models.check.model_status_summary": "{{provider}}: {{summary}}",
       "models.check.no_api_keys": "API ключи не найдены, пожалуйста, добавьте API ключи.",
       "models.check.passed": "Прошло",
+      "models.check.checking": "Проверка",
       "models.check.select_api_key": "Выберите API ключ для использования:",
       "models.check.single": "Один",
       "models.check.start": "Начать",
@@ -1641,7 +1642,6 @@
         "api.url.tip": "Заканчивая на / игнорирует v1, заканчивая на # принудительно использует введенный адрес",
         "api_host": "Хост API",
         "api_key": "Ключ API",
-        "api_key.tip": "Несколько ключей, разделенных запятыми",
         "api_version": "Версия API",
         "basic_auth": "HTTP аутентификация",
         "basic_auth.tip": "Применимо к экземплярам, развернутым через сервер (см. документацию). В настоящее время поддерживается только схема Basic (RFC7617).",
@@ -1693,9 +1693,9 @@
         "get_api_key": "Получить ключ API",
         "is_not_support_array_content": "Включить совместимый режим",
         "no_models_for_check": "Нет моделей для проверки (например, диалоговые модели)",
-        "not_checked": "Не проверено",
         "remove_duplicate_keys": "Удалить дубликаты ключей",
         "remove_invalid_keys": "Удалить недействительные ключи",
+        "invalid_key": "Недействительный ключ API",
         "search": "Поиск поставщиков...",
         "search_placeholder": "Поиск по ID или имени модели",
         "title": "Провайдеры моделей",
@@ -1727,7 +1727,10 @@
           },
           "documentation": "Смотрите официальную документацию для получения более подробной информации о конфигурации:",
           "learn_more": "Узнать больше"
-        }
+        },
+        "enter_new_api_key": "Введите новый API ключ",
+        "key_already_exists": "API ключ уже существует",
+        "check_tooltip.latency": "Задержка"
       },
       "proxy": {
         "mode": {
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index c16089db5e..0b5c446313 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -1605,6 +1605,7 @@
       "models.check.model_status_summary": "{{provider}}: {{summary}}",
       "models.check.no_api_keys": "未找到API密钥，请先添加API密钥",
       "models.check.passed": "通过",
+      "models.check.checking": "检测中",
       "models.check.select_api_key": "选择要使用的API密钥：",
       "models.check.single": "单个",
       "models.check.start": "开始",
@@ -1653,7 +1654,6 @@
         "api.url.tip": "/结尾忽略v1版本，#结尾强制使用输入地址",
         "api_host": "API 地址",
         "api_key": "API 密钥",
-        "api_key.tip": "多个密钥使用逗号分隔",
         "api_version": "API 版本",
         "basic_auth": "HTTP 认证",
         "basic_auth.tip": "适用于通过服务器部署的实例（参见文档）。目前仅支持 Basic 方案（RFC7617）",
@@ -1708,9 +1708,9 @@
         "get_api_key": "点击这里获取密钥",
         "is_not_support_array_content": "开启兼容模式",
         "no_models_for_check": "没有可以被检测的模型（例如对话模型）",
-        "not_checked": "未检测",
         "remove_duplicate_keys": "移除重复密钥",
         "remove_invalid_keys": "删除无效密钥",
+        "invalid_key": "无效的 API 密钥",
         "search": "搜索模型平台...",
         "search_placeholder": "搜索模型 ID 或名称",
         "title": "模型服务",
@@ -1739,7 +1739,10 @@
           },
           "documentation": "查看官方文档了解更多配置详情：",
           "learn_more": "了解更多"
-        }
+        },
+        "enter_new_api_key": "输入新的API密钥",
+        "key_already_exists": "API密钥已存在",
+        "check_tooltip.latency": "耗时"
       },
       "proxy": {
         "mode": {
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index 72be4f02e6..6d95afee24 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -1602,6 +1602,7 @@
       "models.check.model_status_summary": "{{provider}}: {{summary}}",
       "models.check.no_api_keys": "未找到API密鑰，請先添加API密鑰",
       "models.check.passed": "通過",
+      "models.check.checking": "檢查中",
       "models.check.select_api_key": "選擇要使用的API密鑰：",
       "models.check.single": "單個",
       "models.check.start": "開始",
@@ -1644,7 +1645,6 @@
         "api.url.tip": "/結尾忽略 v1 版本，#結尾強制使用輸入位址",
         "api_host": "API 主機地址",
         "api_key": "API 金鑰",
-        "api_key.tip": "多個金鑰使用逗號分隔",
         "api_version": "API 版本",
         "basic_auth": "HTTP 認證",
         "basic_auth.tip": "適用於透過伺服器部署的實例（請參閱文檔）。目前僅支援 Basic 方案（RFC7617）",
@@ -1696,9 +1696,9 @@
         "get_api_key": "點選這裡取得金鑰",
         "is_not_support_array_content": "開啟相容模式",
         "no_models_for_check": "沒有可以被檢查的模型（例如對話模型）",
-        "not_checked": "未檢查",
         "remove_duplicate_keys": "移除重複金鑰",
         "remove_invalid_keys": "刪除無效金鑰",
+        "invalid_key": "無效的 API 金鑰",
         "search": "搜尋模型平臺...",
         "search_placeholder": "搜尋模型 ID 或名稱",
         "title": "模型提供者",
@@ -1730,7 +1730,10 @@
           },
           "documentation": "檢視官方文件以取得更多設定詳細資訊：",
           "learn_more": "瞭解更多"
-        }
+        },
+        "enter_new_api_key": "輸入新的API密鑰",
+        "key_already_exists": "API密鑰已存在",
+        "check_tooltip.latency": "耗時"
       },
       "proxy": {
         "mode": {
diff --git a/src/renderer/src/pages/settings/ProviderSettings/ApiCheckPopup.tsx b/src/renderer/src/pages/settings/ProviderSettings/ApiCheckPopup.tsx
deleted file mode 100644
index afd6ba576e..0000000000
--- a/src/renderer/src/pages/settings/ProviderSettings/ApiCheckPopup.tsx
+++ /dev/null
@@ -1,231 +0,0 @@
-import { CheckCircleFilled, CloseCircleFilled, LoadingOutlined, MinusCircleOutlined } from '@ant-design/icons'
-import Scrollbar from '@renderer/components/Scrollbar'
-import { TopView } from '@renderer/components/TopView'
-import { checkApi } from '@renderer/services/ApiService'
-import WebSearchService from '@renderer/services/WebSearchService'
-import { Model, Provider, WebSearchProvider } from '@renderer/types'
-import { maskApiKey } from '@renderer/utils/api'
-import { Button, List, Modal, Space, Spin, Typography } from 'antd'
-import { useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import styled from 'styled-components'
-
-interface ShowParams {
-  title: string
-  provider: Provider | WebSearchProvider
-  model?: Model
-  apiKeys: string[]
-  type: 'provider' | 'websearch'
-}
-
-interface Props extends ShowParams {
-  resolve: (data: any) => void
-}
-
-interface KeyStatus {
-  key: string
-  isValid?: boolean
-  checking?: boolean
-}
-
-const PopupContainer: React.FC<Props> = ({ title, provider, model, apiKeys, type, resolve }) => {
-  const [open, setOpen] = useState(true)
-  const [keyStatuses, setKeyStatuses] = useState<KeyStatus[]>(() => {
-    const uniqueKeys = new Set(apiKeys)
-    return Array.from(uniqueKeys).map((key) => ({ key }))
-  })
-  const { t } = useTranslation()
-  const [isChecking, setIsChecking] = useState(false)
-  const [isCheckingSingle, setIsCheckingSingle] = useState(false)
-
-  const checkAllKeys = async () => {
-    setIsChecking(true)
-    const newStatuses = [...keyStatuses]
-
-    try {
-      // 使用Promise.all并行处理所有API验证请求
-      const checkPromises = newStatuses.map(async (status, i) => {
-        // 先更新当前密钥为检查中状态
-        setKeyStatuses((prev) => prev.map((status, idx) => (idx === i ? { ...status, checking: true } : status)))
-
-        try {
-          let valid = false
-          if (type === 'provider' && model) {
-            await checkApi({ ...(provider as Provider), apiKey: status.key }, model)
-            valid = true
-          } else {
-            const result = await WebSearchService.checkSearch({
-              ...(provider as WebSearchProvider),
-              apiKey: status.key
-            })
-            valid = result.valid
-          }
-
-          // 更新验证结果
-          setKeyStatuses((prev) => prev.map((s, idx) => (idx === i ? { ...s, checking: false, isValid: valid } : s)))
-
-          return { index: i, valid }
-        } catch (error: unknown) {
-          // 处理错误情况
-          setKeyStatuses((prev) => prev.map((s, idx) => (idx === i ? { ...s, checking: false, isValid: false } : s)))
-          return { index: i, valid: false }
-        }
-      })
-
-      // 等待所有请求完成
-      await Promise.all(checkPromises)
-    } finally {
-      setIsChecking(false)
-    }
-  }
-
-  const checkSingleKey = async (keyIndex: number) => {
-    if (isChecking || keyStatuses[keyIndex].checking) {
-      return
-    }
-
-    setIsCheckingSingle(true)
-    setKeyStatuses((prev) => prev.map((status, idx) => (idx === keyIndex ? { ...status, checking: true } : status)))
-
-    try {
-      let valid = false
-      if (type === 'provider' && model) {
-        await checkApi({ ...(provider as Provider), apiKey: keyStatuses[keyIndex].key }, model)
-        valid = true
-      } else {
-        const result = await WebSearchService.checkSearch({
-          ...(provider as WebSearchProvider),
-          apiKey: keyStatuses[keyIndex].key
-        })
-        valid = result.valid
-      }
-
-      setKeyStatuses((prev) =>
-        prev.map((status, idx) => (idx === keyIndex ? { ...status, checking: false, isValid: valid } : status))
-      )
-    } catch (error: unknown) {
-      setKeyStatuses((prev) =>
-        prev.map((status, idx) => (idx === keyIndex ? { ...status, checking: false, isValid: false } : status))
-      )
-    } finally {
-      setIsCheckingSingle(false)
-    }
-  }
-
-  const removeInvalidKeys = () => {
-    setKeyStatuses((prev) => prev.filter((status) => status.isValid !== false))
-  }
-
-  const removeKey = (keyIndex: number) => {
-    setKeyStatuses((prev) => prev.filter((_, idx) => idx !== keyIndex))
-  }
-
-  const onOk = () => {
-    const allKeys = keyStatuses.map((status) => status.key)
-    resolve({ validKeys: allKeys })
-    setOpen(false)
-  }
-
-  const onCancel = () => {
-    setOpen(false)
-  }
-
-  const onClose = () => {
-    resolve({})
-  }
-
-  return (
-    <Modal
-      title={title}
-      open={open}
-      onOk={onOk}
-      onCancel={onCancel}
-      afterClose={onClose}
-      transitionName="animation-move-down"
-      centered
-      maskClosable={false}
-      footer={
-        <Space style={{ display: 'flex', justifyContent: 'space-between' }}>
-          <Space>
-            <Button key="remove" danger onClick={removeInvalidKeys} disabled={isChecking || isCheckingSingle}>
-              {t('settings.provider.remove_invalid_keys')}
-            </Button>
-          </Space>
-          <Space>
-            <Button key="check" type="primary" ghost onClick={checkAllKeys} disabled={isChecking || isCheckingSingle}>
-              {t('settings.provider.check_all_keys')}
-            </Button>
-            <Button key="save" type="primary" onClick={onOk}>
-              {t('common.save')}
-            </Button>
-          </Space>
-        </Space>
-      }>
-      <Scrollbar style={{ maxHeight: '70vh', overflowX: 'hidden' }}>
-        <List
-          dataSource={keyStatuses}
-          renderItem={(status, index) => (
-            <List.Item>
-              <Space style={{ width: '100%', justifyContent: 'space-between' }}>
-                <Typography.Text copyable={{ text: status.key }}>{maskApiKey(status.key)}</Typography.Text>
-                <Space>
-                  {status.checking && (
-                    <Space>
-                      <Spin indicator={<LoadingOutlined style={{ fontSize: 16 }} spin />} />
-                    </Space>
-                  )}
-                  {status.isValid === true && !status.checking && <CheckCircleFilled style={{ color: '#52c41a' }} />}
-                  {status.isValid === false && !status.checking && <CloseCircleFilled style={{ color: '#ff4d4f' }} />}
-                  {status.isValid === undefined && !status.checking && (
-                    <span>{t('settings.provider.not_checked')}</span>
-                  )}
-                  <Button size="small" onClick={() => checkSingleKey(index)} disabled={isChecking || isCheckingSingle}>
-                    {t('settings.provider.check')}
-                  </Button>
-                  <RemoveIcon
-                    onClick={() => !isChecking && !isCheckingSingle && removeKey(index)}
-                    style={{
-                      cursor: isChecking || isCheckingSingle ? 'not-allowed' : 'pointer',
-                      opacity: isChecking || isCheckingSingle ? 0.5 : 1
-                    }}
-                  />
-                </Space>
-              </Space>
-            </List.Item>
-          )}
-        />
-      </Scrollbar>
-    </Modal>
-  )
-}
-
-export default class ApiCheckPopup {
-  static topviewId = 0
-  static hide() {
-    TopView.hide('ApiCheckPopup')
-  }
-  static show(props: ShowParams) {
-    return new Promise<any>((resolve) => {
-      TopView.show(
-        <PopupContainer
-          {...props}
-          resolve={(v) => {
-            resolve(v)
-            this.hide()
-          }}
-        />,
-        'ApiCheckPopup'
-      )
-    })
-  }
-}
-
-const RemoveIcon = styled(MinusCircleOutlined)`
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  font-size: 18px;
-  color: var(--color-error);
-  cursor: pointer;
-  transition: all 0.2s ease-in-out;
-`
diff --git a/src/renderer/src/pages/settings/ProviderSettings/ApiKeyList.tsx b/src/renderer/src/pages/settings/ProviderSettings/ApiKeyList.tsx
new file mode 100644
index 0000000000..def4ba061a
--- /dev/null
+++ b/src/renderer/src/pages/settings/ProviderSettings/ApiKeyList.tsx
@@ -0,0 +1,638 @@
+import {
+  CheckCircleFilled,
+  CloseCircleFilled,
+  CloseCircleOutlined,
+  DeleteOutlined,
+  EditOutlined,
+  LoadingOutlined,
+  MinusCircleOutlined,
+  PlusOutlined
+} from '@ant-design/icons'
+import Scrollbar from '@renderer/components/Scrollbar'
+import { isEmbeddingModel, isRerankModel } from '@renderer/config/models'
+import { checkApi, formatApiKeys } from '@renderer/services/ApiService'
+import { isProviderSupportAuth } from '@renderer/services/ProviderService'
+import WebSearchService from '@renderer/services/WebSearchService'
+import { Model, Provider, WebSearchProvider } from '@renderer/types'
+import { maskApiKey, splitApiKeyString } from '@renderer/utils/api'
+import { Button, Card, Flex, Input, List, Space, Spin, Tooltip, Typography } from 'antd'
+import { isEmpty } from 'lodash'
+import { FC, useEffect, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import styled from 'styled-components'
+
+import SelectProviderModelPopup from './SelectProviderModelPopup'
+
+interface Props {
+  provider: Provider | WebSearchProvider
+  apiKeys: string
+  onChange: (keys: string) => void
+  type?: 'provider' | 'websearch'
+}
+
+interface KeyStatus {
+  key: string
+  isValid?: boolean
+  checking?: boolean
+  error?: string
+  model?: Model
+  latency?: number
+}
+
+const STATUS_COLORS = {
+  success: '#52c41a',
+  error: '#ff4d4f'
+}
+
+const formatAndConvertKeysToArray = (apiKeys: string): KeyStatus[] => {
+  const formattedApiKeys = formatApiKeys(apiKeys)
+  if (formattedApiKeys.includes(',')) {
+    const keys = splitApiKeyString(formattedApiKeys)
+    const uniqueKeys = new Set(keys)
+    return Array.from(uniqueKeys).map((key) => ({ key }))
+  } else {
+    return formattedApiKeys ? [{ key: formattedApiKeys }] : []
+  }
+}
+
+const ApiKeyList: FC<Props> = ({ provider, apiKeys, onChange, type = 'provider' }) => {
+  const [keyStatuses, setKeyStatuses] = useState<KeyStatus[]>(() => formatAndConvertKeysToArray(apiKeys))
+  const [isAddingNew, setIsAddingNew] = useState(false)
+  const [newApiKey, setNewApiKey] = useState('')
+  const [isCancelingNewKey, setIsCancelingNewKey] = useState(false)
+  const newInputRef = useRef<any>(null)
+  const [editingIndex, setEditingIndex] = useState<number | null>(null)
+  const [editValue, setEditValue] = useState('')
+  const editInputRef = useRef<any>(null)
+  const { t } = useTranslation()
+  const [isChecking, setIsChecking] = useState(false)
+  const [isCheckingSingle, setIsCheckingSingle] = useState(false)
+  const [confirmDeleteIndex, setConfirmDeleteIndex] = useState<number | null>(null)
+  const isCopilot = provider.id === 'copilot'
+
+  useEffect(() => {
+    if (isAddingNew && newInputRef.current) {
+      newInputRef.current.focus()
+    }
+  }, [isAddingNew])
+
+  useEffect(() => {
+    const newKeyStatuses = formatAndConvertKeysToArray(apiKeys)
+
+    setKeyStatuses((currentStatuses) => {
+      const newKeys = newKeyStatuses.map((k) => k.key)
+      const currentKeys = currentStatuses.map((k) => k.key)
+
+      // If the keys are the same, no need to update, prevents re-render loops.
+      if (newKeys.join(',') === currentKeys.join(',')) {
+        return currentStatuses
+      }
+
+      // Merge new keys with existing statuses to preserve them.
+      const statusesMap = new Map(currentStatuses.map((s) => [s.key, s]))
+      return newKeyStatuses.map((k) => statusesMap.get(k.key) || k)
+    })
+  }, [apiKeys])
+
+  useEffect(() => {
+    if (editingIndex !== null && editInputRef.current) {
+      editInputRef.current.focus()
+    }
+  }, [editingIndex])
+
+  const handleAddNewKey = () => {
+    setIsCancelingNewKey(false)
+    setIsAddingNew(true)
+    setNewApiKey('')
+  }
+
+  const handleSaveNewKey = () => {
+    if (isCancelingNewKey) {
+      setIsCancelingNewKey(false)
+      return
+    }
+
+    if (newApiKey.trim()) {
+      // Check if the key already exists
+      const keyExists = keyStatuses.some((status) => status.key === newApiKey.trim())
+
+      if (keyExists) {
+        window.message.error({
+          key: 'duplicate-key',
+          style: { marginTop: '3vh' },
+          duration: 3,
+          content: t('settings.provider.key_already_exists')
+        })
+        return
+      }
+
+      if (newApiKey.includes(',')) {
+        window.message.error({
+          key: 'invalid-key',
+          style: { marginTop: '3vh' },
+          duration: 3,
+          content: t('settings.provider.invalid_key')
+        })
+        return
+      }
+
+      const updatedKeyStatuses = [...keyStatuses, { key: newApiKey.trim() }]
+      setKeyStatuses(updatedKeyStatuses)
+      // Update parent component with new keys
+      onChange(updatedKeyStatuses.map((status) => status.key).join(','))
+    }
+
+    // Add a small delay before resetting to prevent immediate re-triggering
+    setTimeout(() => {
+      setIsAddingNew(false)
+      setNewApiKey('')
+    }, 100)
+  }
+
+  const handleCancelNewKey = () => {
+    setIsCancelingNewKey(true)
+    setIsAddingNew(false)
+    setNewApiKey('')
+  }
+
+  const getModelForCheck = async (selectedModel?: Model): Promise<Model | null> => {
+    if (type !== 'provider') return null
+
+    const modelsToCheck = (provider as Provider).models.filter(
+      (model) => !isEmbeddingModel(model) && !isRerankModel(model)
+    )
+
+    if (isEmpty(modelsToCheck)) {
+      window.message.error({
+        key: 'no-models',
+        style: { marginTop: '3vh' },
+        duration: 5,
+        content: t('settings.provider.no_models_for_check')
+      })
+      return null
+    }
+
+    try {
+      return (
+        selectedModel ||
+        (await SelectProviderModelPopup.show({
+          provider: provider as Provider
+        }))
+      )
+    } catch (err) {
+      // User canceled the popup
+      return null
+    }
+  }
+
+  const checkSingleKey = async (keyIndex: number, selectedModel?: Model, isCheckingAll: boolean = false) => {
+    if (isChecking || keyStatuses[keyIndex].checking) {
+      return
+    }
+
+    try {
+      let latency: number
+      let model: Model | undefined
+
+      if (type === 'provider') {
+        const selectedModelForCheck = await getModelForCheck(selectedModel)
+        if (!selectedModelForCheck) {
+          setKeyStatuses((prev) =>
+            prev.map((status, idx) => (idx === keyIndex ? { ...status, checking: false } : status))
+          )
+          setIsCheckingSingle(false)
+          return
+        }
+        model = selectedModelForCheck
+
+        setIsCheckingSingle(true)
+        setKeyStatuses((prev) => prev.map((status, idx) => (idx === keyIndex ? { ...status, checking: true } : status)))
+
+        const startTime = Date.now()
+        await checkApi({ ...(provider as Provider), apiKey: keyStatuses[keyIndex].key }, model)
+        latency = Date.now() - startTime
+      } else {
+        setIsCheckingSingle(true)
+        setKeyStatuses((prev) => prev.map((status, idx) => (idx === keyIndex ? { ...status, checking: true } : status)))
+
+        const startTime = Date.now()
+        await WebSearchService.checkSearch({
+          ...(provider as WebSearchProvider),
+          apiKey: keyStatuses[keyIndex].key
+        })
+        latency = Date.now() - startTime
+      }
+
+      // Only show notification when checking a single key
+      if (!isCheckingAll) {
+        window.message.success({
+          key: 'api-check',
+          style: { marginTop: '3vh' },
+          duration: 2,
+          content: t('message.api.connection.success')
+        })
+      }
+
+      setKeyStatuses((prev) =>
+        prev.map((status, idx) =>
+          idx === keyIndex
+            ? {
+                ...status,
+                checking: false,
+                isValid: true,
+                model: selectedModel || model,
+                latency
+              }
+            : status
+        )
+      )
+    } catch (error: any) {
+      // Only show notification when checking a single key
+      if (!isCheckingAll) {
+        const errorMessage = error?.message ? ' ' + error.message : ''
+        window.message.error({
+          key: 'api-check',
+          style: { marginTop: '3vh' },
+          duration: 8,
+          content: t('message.api.connection.failed') + errorMessage
+        })
+      }
+
+      setKeyStatuses((prev) =>
+        prev.map((status, idx) =>
+          idx === keyIndex
+            ? {
+                ...status,
+                checking: false,
+                isValid: false,
+                error: error instanceof Error ? error.message : String(error)
+              }
+            : status
+        )
+      )
+    } finally {
+      setIsCheckingSingle(false)
+    }
+  }
+
+  const checkAllKeys = async () => {
+    setIsChecking(true)
+
+    try {
+      let selectedModel
+      if (type === 'provider') {
+        selectedModel = await getModelForCheck()
+        if (!selectedModel) {
+          return
+        }
+      }
+
+      await Promise.all(keyStatuses.map((_, index) => checkSingleKey(index, selectedModel, true)))
+    } finally {
+      setIsChecking(false)
+    }
+  }
+
+  const removeInvalidKeys = () => {
+    const updatedKeyStatuses = keyStatuses.filter((status) => status.isValid !== false)
+    setKeyStatuses(updatedKeyStatuses)
+    onChange(updatedKeyStatuses.map((status) => status.key).join(','))
+  }
+
+  const removeKey = (keyIndex: number) => {
+    if (confirmDeleteIndex === keyIndex) {
+      // Second click - actually remove the key
+      const updatedKeyStatuses = keyStatuses.filter((_, idx) => idx !== keyIndex)
+      setKeyStatuses(updatedKeyStatuses)
+      onChange(updatedKeyStatuses.map((status) => status.key).join(','))
+      setConfirmDeleteIndex(null)
+    } else {
+      // First click - show confirmation state
+      setConfirmDeleteIndex(keyIndex)
+      // Auto-reset after 3 seconds
+      setTimeout(() => {
+        setConfirmDeleteIndex(null)
+      }, 3000)
+    }
+  }
+
+  const renderKeyCheckResultTooltip = (status: KeyStatus) => {
+    if (status.checking) {
+      return t('settings.models.check.checking')
+    }
+
+    const statusTitle = status.isValid ? t('settings.models.check.passed') : t('settings.models.check.failed')
+    const statusColor = status.isValid ? STATUS_COLORS.success : STATUS_COLORS.error
+
+    return (
+      <div style={{ maxHeight: '200px', overflowY: 'auto', maxWidth: '300px', wordWrap: 'break-word' }}>
+        <strong style={{ color: statusColor }}>{statusTitle}</strong>
+        {type === 'provider' && status.model && (
+          <div style={{ marginTop: 5 }}>
+            {t('common.model')}: {status.model.name}
+          </div>
+        )}
+        {status.latency && status.isValid && (
+          <div style={{ marginTop: 5 }}>
+            {t('settings.provider.check_tooltip.latency')}: {(status.latency / 1000).toFixed(2)}s
+          </div>
+        )}
+        {status.error && <div style={{ marginTop: 5 }}>{status.error}</div>}
+      </div>
+    )
+  }
+
+  const shouldAutoFocus = () => {
+    if (type === 'provider') {
+      return (provider as Provider).enabled && apiKeys === '' && !isProviderSupportAuth(provider as Provider)
+    } else if (type === 'websearch') {
+      return apiKeys === ''
+    }
+    return false
+  }
+
+  const handleEditKey = (index: number) => {
+    setEditingIndex(index)
+    setEditValue(keyStatuses[index].key)
+  }
+
+  const handleSaveEdit = () => {
+    if (editingIndex === null) return
+
+    if (editValue.trim()) {
+      const keyExists = keyStatuses.some((status, idx) => idx !== editingIndex && status.key === editValue.trim())
+
+      if (keyExists) {
+        window.message.error({
+          key: 'duplicate-key',
+          style: { marginTop: '3vh' },
+          duration: 3,
+          content: t('settings.provider.key_already_exists')
+        })
+        return
+      }
+
+      if (editValue.includes(',')) {
+        window.message.error({
+          key: 'invalid-key',
+          style: { marginTop: '3vh' },
+          duration: 3,
+          content: t('settings.provider.invalid_key')
+        })
+        return
+      }
+
+      const updatedKeyStatuses = [...keyStatuses]
+      updatedKeyStatuses[editingIndex] = {
+        ...updatedKeyStatuses[editingIndex],
+        key: editValue.trim(),
+        isValid: undefined
+      }
+
+      setKeyStatuses(updatedKeyStatuses)
+      onChange(updatedKeyStatuses.map((status) => status.key).join(','))
+    }
+
+    // Add a small delay before resetting to prevent immediate re-triggering
+    setTimeout(() => {
+      setEditingIndex(null)
+      setEditValue('')
+    }, 100)
+  }
+
+  const handleCancelEdit = () => {
+    setEditingIndex(null)
+    setEditValue('')
+  }
+
+  return (
+    <>
+      <Card
+        size="small"
+        type="inner"
+        styles={{ body: { padding: 0 } }}
+        style={{ marginBottom: '10px', border: '0.5px solid var(--color-border)' }}>
+        {keyStatuses.length === 0 && !isAddingNew ? (
+          <Typography.Text type="secondary" style={{ padding: '4px 11px', display: 'block' }}>
+            {t('error.no_api_key')}
+          </Typography.Text>
+        ) : (
+          <>
+            {keyStatuses.length > 0 && (
+              <Scrollbar style={{ maxHeight: '50vh', overflowX: 'hidden' }}>
+                <List
+                  size="small"
+                  dataSource={keyStatuses}
+                  renderItem={(status, index) => (
+                    <List.Item style={{ padding: '4px 11px' }}>
+                      <ApiKeyListItem>
+                        <ApiKeyContainer>
+                          {editingIndex === index ? (
+                            <Input.Password
+                              ref={editInputRef}
+                              value={editValue}
+                              onChange={(e) => setEditValue(e.target.value)}
+                              onBlur={handleSaveEdit}
+                              onPressEnter={handleSaveEdit}
+                              onKeyDown={(e) => {
+                                if (e.key === 'Escape') {
+                                  e.preventDefault()
+                                  handleCancelEdit()
+                                }
+                              }}
+                              style={{ width: '100%', fontSize: '14px' }}
+                              spellCheck={false}
+                              type="password"
+                            />
+                          ) : (
+                            <Typography.Text copyable={{ text: status.key }}>{maskApiKey(status.key)}</Typography.Text>
+                          )}
+                        </ApiKeyContainer>
+                        <ApiKeyActions>
+                          {editingIndex === index ? (
+                            <CloseCircleOutlined
+                              onClick={handleCancelEdit}
+                              title={t('common.cancel')}
+                              style={{
+                                cursor: 'pointer',
+                                fontSize: '16px',
+                                color: 'var(--color-error)'
+                              }}
+                            />
+                          ) : (
+                            <>
+                              <Tooltip title={renderKeyCheckResultTooltip(status)}>
+                                {status.checking && (
+                                  <Space>
+                                    <Spin indicator={<LoadingOutlined style={{ fontSize: 16 }} spin />} />
+                                  </Space>
+                                )}
+                                {status.isValid === true && !status.checking && (
+                                  <CheckCircleFilled style={{ color: STATUS_COLORS.success }} />
+                                )}
+                                {status.isValid === false && !status.checking && (
+                                  <CloseCircleFilled style={{ color: STATUS_COLORS.error }} />
+                                )}
+                              </Tooltip>
+                              <Button
+                                size="small"
+                                onClick={() => checkSingleKey(index)}
+                                disabled={isChecking || isCheckingSingle || isCopilot}>
+                                {t('settings.provider.check')}
+                              </Button>
+                              {!isCopilot && (
+                                <>
+                                  <EditOutlined
+                                    onClick={() => !isChecking && !isCheckingSingle && handleEditKey(index)}
+                                    style={{
+                                      cursor: isChecking || isCheckingSingle ? 'not-allowed' : 'pointer',
+                                      opacity: isChecking || isCheckingSingle ? 0.5 : 1,
+                                      fontSize: '16px'
+                                    }}
+                                    title={t('common.edit')}
+                                  />
+                                  {confirmDeleteIndex === index ? (
+                                    <DeleteOutlined
+                                      onClick={() => !isChecking && !isCheckingSingle && removeKey(index)}
+                                      style={{
+                                        cursor: isChecking || isCheckingSingle ? 'not-allowed' : 'pointer',
+                                        opacity: isChecking || isCheckingSingle ? 0.5 : 1,
+                                        fontSize: '16px',
+                                        color: 'var(--color-error)'
+                                      }}
+                                      title={t('common.delete')}
+                                    />
+                                  ) : (
+                                    <MinusCircleOutlined
+                                      onClick={() => !isChecking && !isCheckingSingle && removeKey(index)}
+                                      style={{
+                                        cursor: isChecking || isCheckingSingle ? 'not-allowed' : 'pointer',
+                                        opacity: isChecking || isCheckingSingle ? 0.5 : 1,
+                                        fontSize: '16px',
+                                        color: 'var(--color-error)'
+                                      }}
+                                      title={t('common.delete')}
+                                    />
+                                  )}
+                                </>
+                              )}
+                            </>
+                          )}
+                        </ApiKeyActions>
+                      </ApiKeyListItem>
+                    </List.Item>
+                  )}
+                />
+              </Scrollbar>
+            )}
+            {isAddingNew && (
+              <List.Item style={{ padding: '4px 11px' }}>
+                <ApiKeyListItem>
+                  <Input.Password
+                    ref={newInputRef}
+                    value={newApiKey}
+                    onChange={(e) => setNewApiKey(e.target.value)}
+                    placeholder={t('settings.provider.enter_new_api_key')}
+                    style={{ width: '60%', fontSize: '14px' }}
+                    onPressEnter={handleSaveNewKey}
+                    onBlur={handleSaveNewKey}
+                    onKeyDown={(e) => {
+                      if (e.key === 'Escape') {
+                        e.preventDefault()
+                        handleCancelNewKey()
+                      }
+                    }}
+                    spellCheck={false}
+                    type="password"
+                  />
+                  <ApiKeyActions>
+                    <CloseCircleOutlined
+                      onMouseDown={handleCancelNewKey}
+                      title={t('common.cancel')}
+                      style={{
+                        cursor: isChecking || isCheckingSingle ? 'not-allowed' : 'pointer',
+                        opacity: isChecking || isCheckingSingle ? 0.5 : 1,
+                        fontSize: '16px',
+                        color: 'var(--color-error)'
+                      }}
+                    />
+                  </ApiKeyActions>
+                </ApiKeyListItem>
+              </List.Item>
+            )}
+          </>
+        )}
+      </Card>
+
+      <Flex gap={10} justify="space-between" style={{ marginTop: '8px' }}>
+        {!isCopilot && (
+          <>
+            <Space>
+              <Button
+                key="add"
+                type="primary"
+                onClick={editingIndex !== null ? handleSaveEdit : isAddingNew ? handleSaveNewKey : handleAddNewKey}
+                icon={<PlusOutlined />}
+                autoFocus={shouldAutoFocus()}>
+                {editingIndex !== null || isAddingNew ? t('common.save') : t('common.add')}
+              </Button>
+            </Space>
+            {keyStatuses.length > 1 && (
+              <Space>
+                <Button key="check" type="default" onClick={checkAllKeys} disabled={isChecking || isCheckingSingle}>
+                  {t('settings.provider.check_all_keys')}
+                </Button>
+                <Button
+                  key="remove"
+                  type="default"
+                  danger
+                  onClick={removeInvalidKeys}
+                  disabled={isChecking || isCheckingSingle}>
+                  {t('settings.provider.remove_invalid_keys')}
+                </Button>
+              </Space>
+            )}
+          </>
+        )}
+      </Flex>
+    </>
+  )
+}
+
+// Styled components for the list items
+const ApiKeyListItem = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  padding: 0;
+  margin: 0;
+`
+
+const ApiKeyContainer = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+`
+
+const ApiKeyActions = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 10px;
+
+  @keyframes pulse {
+    0% {
+      opacity: 1;
+    }
+    50% {
+      opacity: 0.5;
+    }
+    100% {
+      opacity: 1;
+    }
+  }
+`
+
+export default ApiKeyList
diff --git a/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx b/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx
index 74a414d81c..f708b28679 100644
--- a/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx
+++ b/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx
@@ -1,14 +1,11 @@
-import { CheckOutlined, LoadingOutlined } from '@ant-design/icons'
 import { isOpenAIProvider } from '@renderer/aiCore/clients/ApiClientFactory'
 import OpenAIAlert from '@renderer/components/Alert/OpenAIAlert'
 import { StreamlineGoodHealthAndWellBeing } from '@renderer/components/Icons/SVGIcon'
 import { HStack } from '@renderer/components/Layout'
-import { isEmbeddingModel, isRerankModel } from '@renderer/config/models'
+import { isRerankModel } from '@renderer/config/models'
 import { PROVIDER_CONFIG } from '@renderer/config/providers'
 import { useTheme } from '@renderer/context/ThemeProvider'
 import { useAllProviders, useProvider, useProviders } from '@renderer/hooks/useProvider'
-import i18n from '@renderer/i18n'
-import { checkApi, formatApiKeys } from '@renderer/services/ApiService'
 import { checkModelsHealth, getModelCheckSummary } from '@renderer/services/HealthCheckService'
 import { isProviderSupportAuth } from '@renderer/services/ProviderService'
 import { Provider } from '@renderer/types'
@@ -16,7 +13,7 @@ import { formatApiHost, splitApiKeyString } from '@renderer/utils/api'
 import { lightbulbVariants } from '@renderer/utils/motionVariants'
 import { Button, Divider, Flex, Input, Space, Switch, Tooltip } from 'antd'
 import Link from 'antd/es/typography/Link'
-import { debounce, isEmpty } from 'lodash'
+import { isEmpty } from 'lodash'
 import { Settings2, SquareArrowOutUpRight } from 'lucide-react'
 import { motion } from 'motion/react'
 import { FC, useCallback, useDeferredValue, useEffect, useState } from 'react'
@@ -31,7 +28,7 @@ import {
   SettingSubtitle,
   SettingTitle
 } from '..'
-import ApiCheckPopup from './ApiCheckPopup'
+import ApiKeyList from './ApiKeyList'
 import DMXAPISettings from './DMXAPISettings'
 import GithubCopilotSettings from './GithubCopilotSettings'
 import GPUStackSettings from './GPUStackSettings'
@@ -41,7 +38,6 @@ import ModelList, { ModelStatus } from './ModelList'
 import ModelListSearchBar from './ModelListSearchBar'
 import ProviderOAuth from './ProviderOAuth'
 import ProviderSettingsPopup from './ProviderSettingsPopup'
-import SelectProviderModelPopup from './SelectProviderModelPopup'
 import VertexAISettings from './VertexAISettings'
 
 interface Props {
@@ -55,14 +51,11 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
   const [apiKey, setApiKey] = useState(provider.apiKey)
   const [apiHost, setApiHost] = useState(provider.apiHost)
   const [apiVersion, setApiVersion] = useState(provider.apiVersion)
-  const [apiValid, setApiValid] = useState(false)
-  const [apiChecking, setApiChecking] = useState(false)
   const [modelSearchText, setModelSearchText] = useState('')
   const deferredModelSearchText = useDeferredValue(modelSearchText)
   const { updateProvider, models } = useProvider(provider.id)
   const { t } = useTranslation()
   const { theme } = useTheme()
-  const [inputValue, setInputValue] = useState(apiKey)
 
   const isAzureOpenAI = provider.id === 'azure-openai' || provider.type === 'azure-openai'
 
@@ -76,14 +69,6 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
   const [modelStatuses, setModelStatuses] = useState<ModelStatus[]>([])
   const [isHealthChecking, setIsHealthChecking] = useState(false)
 
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  const debouncedSetApiKey = useCallback(
-    debounce((value) => {
-      setApiKey(formatApiKeys(value))
-    }, 100),
-    []
-  )
-
   const moveProviderToTop = useCallback(
     (providerId: string) => {
       const reorderedProviders = [...allProviders]
@@ -99,12 +84,6 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
     [allProviders, updateProviders]
   )
 
-  const onUpdateApiKey = () => {
-    if (apiKey !== provider.apiKey) {
-      updateProvider({ ...provider, apiKey })
-    }
-  }
-
   const onUpdateApiHost = () => {
     if (apiHost.trim()) {
       updateProvider({ ...provider, apiHost })
@@ -113,6 +92,11 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
     }
   }
 
+  const handleApiKeyChange = (newApiKey: string) => {
+    setApiKey(newApiKey)
+    updateProvider({ ...provider, apiKey: newApiKey })
+  }
+
   const onUpdateApiVersion = () => updateProvider({ ...provider, apiVersion })
 
   const onHealthCheck = async () => {
@@ -192,75 +176,6 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
     setIsHealthChecking(false)
   }
 
-  const onCheckApi = async () => {
-    const modelsToCheck = models.filter((model) => !isEmbeddingModel(model) && !isRerankModel(model))
-
-    if (isEmpty(modelsToCheck)) {
-      window.message.error({
-        key: 'no-models',
-        style: { marginTop: '3vh' },
-        duration: 5,
-        content: t('settings.provider.no_models_for_check')
-      })
-      return
-    }
-
-    const model = await SelectProviderModelPopup.show({ provider })
-
-    if (!model) {
-      window.message.error({ content: i18n.t('message.error.enter.model'), key: 'api-check' })
-      return
-    }
-
-    if (apiKey.includes(',')) {
-      const keys = splitApiKeyString(apiKey)
-
-      const result = await ApiCheckPopup.show({
-        title: t('settings.provider.check_multiple_keys'),
-        provider: { ...provider, apiHost },
-        model,
-        apiKeys: keys,
-        type: 'provider'
-      })
-
-      if (result?.validKeys) {
-        const newApiKey = result.validKeys.join(',')
-        setInputValue(newApiKey)
-        setApiKey(newApiKey)
-        updateProvider({ ...provider, apiKey: newApiKey })
-      }
-    } else {
-      setApiChecking(true)
-
-      try {
-        await checkApi({ ...provider, apiKey, apiHost }, model)
-
-        window.message.success({
-          key: 'api-check',
-          style: { marginTop: '3vh' },
-          duration: 2,
-          content: i18n.t('message.api.connection.success')
-        })
-
-        setApiValid(true)
-        setTimeout(() => setApiValid(false), 3000)
-      } catch (error: any) {
-        const errorMessage = error?.message ? ' ' + error.message : ''
-
-        window.message.error({
-          key: 'api-check',
-          style: { marginTop: '3vh' },
-          duration: 8,
-          content: i18n.t('message.api.connection.failed') + errorMessage
-        })
-
-        setApiValid(false)
-      } finally {
-        setApiChecking(false)
-      }
-    }
-  }
-
   const onReset = () => {
     setApiHost(configedApiHost)
     updateProvider({ ...provider, apiHost: configedApiHost })
@@ -329,7 +244,6 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
           provider={provider}
           setApiKey={(v) => {
             setApiKey(v)
-            setInputValue(v)
             updateProvider({ ...provider, apiKey: v })
           }}
         />
@@ -338,35 +252,14 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
       {isDmxapi && <DMXAPISettings provider={provider} setApiKey={setApiKey} />}
       {provider.id !== 'vertexai' && (
         <>
-          <SettingSubtitle style={{ marginTop: 5 }}>{t('settings.provider.api_key')}</SettingSubtitle>
-          <Space.Compact style={{ width: '100%', marginTop: 5 }}>
-            <Input.Password
-              value={inputValue}
-              placeholder={t('settings.provider.api_key')}
-              onChange={(e) => {
-                setInputValue(e.target.value)
-                debouncedSetApiKey(e.target.value)
-              }}
-              onBlur={() => {
-                const formattedValue = formatApiKeys(inputValue)
-                setInputValue(formattedValue)
-                setApiKey(formattedValue)
-                onUpdateApiKey()
-              }}
-              spellCheck={false}
-              autoFocus={provider.enabled && apiKey === '' && !isProviderSupportAuth(provider)}
-              disabled={provider.id === 'copilot'}
-            />
-            <Button
-              type={apiValid ? 'primary' : 'default'}
-              ghost={apiValid}
-              onClick={onCheckApi}
-              disabled={!apiHost || apiChecking}>
-              {apiChecking ? <LoadingOutlined spin /> : apiValid ? <CheckOutlined /> : t('settings.provider.check')}
-            </Button>
-          </Space.Compact>
+          <SettingSubtitle style={{ marginBottom: 5 }}>
+            <Space align="center" style={{ width: '100%', justifyContent: 'space-between' }}>
+              <SettingSubtitle style={{ marginTop: 0 }}>{t('settings.provider.api_key')}</SettingSubtitle>
+            </Space>
+          </SettingSubtitle>
+          <ApiKeyList provider={provider} apiKeys={apiKey} onChange={handleApiKeyChange} type="provider" />
           {apiKeyWebsite && (
-            <SettingHelpTextRow style={{ justifyContent: 'space-between' }}>
+            <SettingHelpTextRow style={{ justifyContent: 'space-between', marginTop: '10px' }}>
               <HStack>
                 {!isDmxapi && (
                   <SettingHelpLink target="_blank" href={apiKeyWebsite}>
@@ -374,7 +267,6 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
                   </SettingHelpLink>
                 )}
               </HStack>
-              <SettingHelpText>{t('settings.provider.api_key.tip')}</SettingHelpText>
             </SettingHelpTextRow>
           )}
           {!isDmxapi && (
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSetting.tsx b/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSetting.tsx
index 44a3f01714..97d01d4f5e 100644
--- a/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSetting.tsx
+++ b/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSetting.tsx
@@ -1,19 +1,17 @@
-import { CheckOutlined, ExportOutlined, LoadingOutlined } from '@ant-design/icons'
+import { ExportOutlined } from '@ant-design/icons'
 import { getWebSearchProviderLogo, WEB_SEARCH_PROVIDER_CONFIG } from '@renderer/config/webSearchProviders'
 import { useWebSearchProvider } from '@renderer/hooks/useWebSearchProviders'
-import { formatApiKeys } from '@renderer/services/ApiService'
-import WebSearchService from '@renderer/services/WebSearchService'
 import { WebSearchProvider } from '@renderer/types'
 import { hasObjectKey } from '@renderer/utils'
-import { Button, Divider, Flex, Form, Input, Tooltip } from 'antd'
+import { Divider, Flex, Form, Input, Tooltip } from 'antd'
 import Link from 'antd/es/typography/Link'
 import { Info } from 'lucide-react'
 import { FC, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
-import { SettingDivider, SettingHelpLink, SettingHelpText, SettingHelpTextRow, SettingSubtitle, SettingTitle } from '..'
-import ApiCheckPopup from '../ProviderSettings/ApiCheckPopup'
+import { SettingDivider, SettingHelpLink, SettingHelpTextRow, SettingSubtitle, SettingTitle } from '..'
+import ApiKeyList from '../ProviderSettings/ApiKeyList'
 
 interface Props {
   provider: WebSearchProvider
@@ -24,19 +22,16 @@ const WebSearchProviderSetting: FC<Props> = ({ provider: _provider }) => {
   const { t } = useTranslation()
   const [apiKey, setApiKey] = useState(provider.apiKey || '')
   const [apiHost, setApiHost] = useState(provider.apiHost || '')
-  const [apiChecking, setApiChecking] = useState(false)
   const [basicAuthUsername, setBasicAuthUsername] = useState(provider.basicAuthUsername || '')
   const [basicAuthPassword, setBasicAuthPassword] = useState(provider.basicAuthPassword || '')
-  const [apiValid, setApiValid] = useState(false)
 
   const webSearchProviderConfig = WEB_SEARCH_PROVIDER_CONFIG[provider.id]
   const apiKeyWebsite = webSearchProviderConfig?.websites?.apiKey
   const officialWebsite = webSearchProviderConfig?.websites?.official
 
-  const onUpdateApiKey = () => {
-    if (apiKey !== provider.apiKey) {
-      updateProvider({ ...provider, apiKey })
-    }
+  const handleApiKeyChange = (newApiKey: string) => {
+    setApiKey(newApiKey)
+    updateProvider({ ...provider, apiKey: newApiKey })
   }
 
   const onUpdateApiHost = () => {
@@ -71,65 +66,6 @@ const WebSearchProviderSetting: FC<Props> = ({ provider: _provider }) => {
     }
   }
 
-  async function checkSearch() {
-    if (!provider) {
-      window.message.error({
-        content: t('settings.websearch.no_provider_selected'),
-        duration: 3,
-        icon: <Info size={18} />,
-        key: 'no-provider-selected'
-      })
-      return
-    }
-
-    if (apiKey.includes(',')) {
-      const keys = apiKey
-        .split(',')
-        .map((k) => k.trim())
-        .filter((k) => k)
-
-      const result = await ApiCheckPopup.show({
-        title: t('settings.provider.check_multiple_keys'),
-        provider: { ...provider, apiHost },
-        apiKeys: keys,
-        type: 'websearch'
-      })
-
-      if (result?.validKeys) {
-        setApiKey(result.validKeys.join(','))
-        updateProvider({ ...provider, apiKey: result.validKeys.join(',') })
-      }
-      return
-    }
-
-    try {
-      setApiChecking(true)
-      const { valid, error } = await WebSearchService.checkSearch(provider)
-
-      const errorMessage = error && error?.message ? ' ' + error?.message : ''
-      window.message[valid ? 'success' : 'error']({
-        key: 'api-check',
-        style: { marginTop: '3vh' },
-        duration: valid ? 2 : 8,
-        content: valid ? t('settings.websearch.check_success') : t('settings.websearch.check_failed') + errorMessage
-      })
-
-      setApiValid(valid)
-    } catch (err) {
-      console.error('Check search error:', err)
-      setApiValid(false)
-      window.message.error({
-        key: 'check-search-error',
-        style: { marginTop: '3vh' },
-        duration: 8,
-        content: t('settings.websearch.check_failed')
-      })
-    } finally {
-      setApiChecking(false)
-      setTimeout(() => setApiValid(false), 2500)
-    }
-  }
-
   useEffect(() => {
     setApiKey(provider.apiKey ?? '')
     setApiHost(provider.apiHost ?? '')
@@ -154,30 +90,14 @@ const WebSearchProviderSetting: FC<Props> = ({ provider: _provider }) => {
       {hasObjectKey(provider, 'apiKey') && (
         <>
           <SettingSubtitle style={{ marginTop: 5, marginBottom: 10 }}>{t('settings.provider.api_key')}</SettingSubtitle>
-          <Flex gap={8}>
-            <Input.Password
-              value={apiKey}
-              placeholder={t('settings.provider.api_key')}
-              onChange={(e) => setApiKey(formatApiKeys(e.target.value))}
-              onBlur={onUpdateApiKey}
-              spellCheck={false}
-              type="password"
-              autoFocus={apiKey === ''}
-            />
-            <Button
-              ghost={apiValid}
-              type={apiValid ? 'primary' : 'default'}
-              onClick={checkSearch}
-              disabled={apiChecking}>
-              {apiChecking ? <LoadingOutlined spin /> : apiValid ? <CheckOutlined /> : t('settings.websearch.check')}
-            </Button>
-          </Flex>
-          <SettingHelpTextRow style={{ justifyContent: 'space-between', marginTop: 5 }}>
-            <SettingHelpLink target="_blank" href={apiKeyWebsite}>
-              {t('settings.websearch.get_api_key')}
-            </SettingHelpLink>
-            <SettingHelpText>{t('settings.provider.api_key.tip')}</SettingHelpText>
-          </SettingHelpTextRow>
+          <ApiKeyList provider={provider} apiKeys={apiKey} onChange={handleApiKeyChange} type="websearch" />
+          {apiKeyWebsite && (
+            <SettingHelpTextRow style={{ justifyContent: 'space-between', marginTop: 5 }}>
+              <SettingHelpLink target="_blank" href={apiKeyWebsite}>
+                {t('settings.websearch.get_api_key')}
+              </SettingHelpLink>
+            </SettingHelpTextRow>
+          )}
         </>
       )}
       {hasObjectKey(provider, 'apiHost') && (

From f2c9bf433e25912bced3bca0ba525f986dc4ae60 Mon Sep 17 00:00:00 2001
From: one <wangan.cs@gmail.com>
Date: Tue, 24 Jun 2025 04:01:05 +0800
Subject: [PATCH 19/75] refactor(CodePreview): auto resize gutters (#7481)

* refactor(CodePreview): auto resize gutters

* refactor: remove unnecessary usememo
---
 .../components/CodeBlockView/CodePreview.tsx   | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/renderer/src/components/CodeBlockView/CodePreview.tsx b/src/renderer/src/components/CodeBlockView/CodePreview.tsx
index d3c56f295b..566a980f67 100644
--- a/src/renderer/src/components/CodeBlockView/CodePreview.tsx
+++ b/src/renderer/src/components/CodeBlockView/CodePreview.tsx
@@ -168,9 +168,15 @@ const CodePreview = ({ children, language, setTools }: CodePreviewProps) => {
     }
   }, [highlightCode])
 
-  const hasHighlightedCode = useMemo(() => {
-    return tokenLines.length > 0
-  }, [tokenLines.length])
+  useEffect(() => {
+    const container = codeContentRef.current
+    if (!container || !codeShowLineNumbers) return
+
+    const digits = Math.max(tokenLines.length.toString().length, 1)
+    container.style.setProperty('--line-digits', digits.toString())
+  }, [codeShowLineNumbers, tokenLines.length])
+
+  const hasHighlightedCode = tokenLines.length > 0
 
   return (
     <ContentContainer
@@ -242,6 +248,10 @@ const ContentContainer = styled.div<{
   border-radius: 5px;
   margin-top: 0;
 
+  /* 动态宽度计算 */
+  --line-digits: 0;
+  --gutter-width: max(calc(var(--line-digits) * 0.7rem), 2.1rem);
+
   .shiki {
     padding: 1em;
 
@@ -252,7 +262,7 @@ const ContentContainer = styled.div<{
       .line {
         display: block;
         min-height: 1.3rem;
-        padding-left: ${(props) => (props.$lineNumbers ? '2rem' : '0')};
+        padding-left: ${(props) => (props.$lineNumbers ? 'var(--gutter-width)' : '0')};
 
         * {
           overflow-wrap: ${(props) => (props.$wrap ? 'break-word' : 'normal')};

From e2b813372950b041cf81c777d5b9236d097ff1e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E7=94=B1=E7=9A=84=E4=B8=96=E7=95=8C=E4=BA=BA?=
 <3196812536@qq.com>
Date: Tue, 24 Jun 2025 18:51:58 +0800
Subject: [PATCH 20/75] refactor: file actions into FileAction service (#7413)

* refactor: file actions into FileAction service

Moved file sorting, deletion, and renaming logic from FilesPage to a new FileAction service for better modularity and reuse. Updated FileList and FilesPage to use the new service functions, and improved the delete button UI in FileList.
---
 src/renderer/src/pages/files/FileList.tsx  |  42 +++++++
 src/renderer/src/pages/files/FilesPage.tsx | 137 +--------------------
 src/renderer/src/services/FileAction.ts    |  98 +++++++++++++++
 3 files changed, 143 insertions(+), 134 deletions(-)
 create mode 100644 src/renderer/src/services/FileAction.ts

diff --git a/src/renderer/src/pages/files/FileList.tsx b/src/renderer/src/pages/files/FileList.tsx
index cdb0421439..a08de9912f 100644
--- a/src/renderer/src/pages/files/FileList.tsx
+++ b/src/renderer/src/pages/files/FileList.tsx
@@ -1,3 +1,5 @@
+import { DeleteOutlined, ExclamationCircleOutlined } from '@ant-design/icons'
+import { handleDelete } from '@renderer/services/FileAction'
 import FileManager from '@renderer/services/FileManager'
 import { FileType, FileTypes } from '@renderer/types'
 import { formatFileSize } from '@renderer/utils'
@@ -48,6 +50,24 @@ const FileList: React.FC<FileItemProps> = ({ id, list, files }) => {
                   <ImageInfo>
                     <div>{formatFileSize(file.size)}</div>
                   </ImageInfo>
+                  <DeleteButton
+                    title={t('files.delete.title')}
+                    onClick={(e) => {
+                      e.stopPropagation()
+                      window.modal.confirm({
+                        title: t('files.delete.title'),
+                        content: t('files.delete.content'),
+                        okText: t('common.confirm'),
+                        cancelText: t('common.cancel'),
+                        centered: true,
+                        onOk: () => {
+                          handleDelete(file.id, t)
+                        },
+                        icon: <ExclamationCircleOutlined style={{ color: 'red' }} />
+                      })
+                    }}>
+                    <DeleteOutlined />
+                  </DeleteButton>
                 </ImageWrapper>
               </Col>
             ))}
@@ -159,4 +179,26 @@ const ImageInfo = styled.div`
   }
 `
 
+const DeleteButton = styled.div`
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  width: 24px;
+  height: 24px;
+  border-radius: 50%;
+  background-color: rgba(0, 0, 0, 0.6);
+  color: white;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  opacity: 0;
+  transition: opacity 0.3s ease;
+  z-index: 1;
+
+  &:hover {
+    background-color: rgba(255, 0, 0, 0.8);
+  }
+`
+
 export default memo(FileList)
diff --git a/src/renderer/src/pages/files/FilesPage.tsx b/src/renderer/src/pages/files/FilesPage.tsx
index c070478fea..2890a0cb85 100644
--- a/src/renderer/src/pages/files/FilesPage.tsx
+++ b/src/renderer/src/pages/files/FilesPage.tsx
@@ -7,13 +7,10 @@ import {
 } from '@ant-design/icons'
 import { Navbar, NavbarCenter } from '@renderer/components/app/Navbar'
 import ListItem from '@renderer/components/ListItem'
-import TextEditPopup from '@renderer/components/Popups/TextEditPopup'
-import Logger from '@renderer/config/logger'
 import db from '@renderer/databases'
+import { handleDelete, handleRename, sortFiles, tempFilesSort } from '@renderer/services/FileAction'
 import FileManager from '@renderer/services/FileManager'
-import store from '@renderer/store'
 import { FileType, FileTypes } from '@renderer/types'
-import { Message } from '@renderer/types/newMessage'
 import { formatFileSize } from '@renderer/utils'
 import { Button, Empty, Flex, Popconfirm } from 'antd'
 import dayjs from 'dayjs'
@@ -34,34 +31,6 @@ const FilesPage: FC = () => {
   const [sortField, setSortField] = useState<SortField>('created_at')
   const [sortOrder, setSortOrder] = useState<SortOrder>('desc')
 
-  const tempFilesSort = (files: FileType[]) => {
-    return files.sort((a, b) => {
-      const aIsTemp = a.origin_name.startsWith('temp_file')
-      const bIsTemp = b.origin_name.startsWith('temp_file')
-      if (aIsTemp && !bIsTemp) return 1
-      if (!aIsTemp && bIsTemp) return -1
-      return 0
-    })
-  }
-
-  const sortFiles = (files: FileType[]) => {
-    return [...files].sort((a, b) => {
-      let comparison = 0
-      switch (sortField) {
-        case 'created_at':
-          comparison = dayjs(a.created_at).unix() - dayjs(b.created_at).unix()
-          break
-        case 'size':
-          comparison = a.size - b.size
-          break
-        case 'name':
-          comparison = a.origin_name.localeCompare(b.origin_name)
-          break
-      }
-      return sortOrder === 'asc' ? comparison : -comparison
-    })
-  }
-
   const files = useLiveQuery<FileType[]>(() => {
     if (fileType === 'all') {
       return db.files.orderBy('count').toArray().then(tempFilesSort)
@@ -69,106 +38,7 @@ const FilesPage: FC = () => {
     return db.files.where('type').equals(fileType).sortBy('count').then(tempFilesSort)
   }, [fileType])
 
-  const sortedFiles = files ? sortFiles(files) : []
-
-  const handleDelete = async (fileId: string) => {
-    const file = await FileManager.getFile(fileId)
-    if (!file) return
-
-    const paintings = await store.getState().paintings.paintings
-    const paintingsFiles = paintings.flatMap((p) => p.files)
-
-    if (paintingsFiles.some((p) => p.id === fileId)) {
-      window.modal.warning({ content: t('files.delete.paintings.warning'), centered: true })
-      return
-    }
-    if (file) {
-      await FileManager.deleteFile(fileId, true)
-    }
-
-    const relatedBlocks = await db.message_blocks.where('file.id').equals(fileId).toArray()
-
-    const blockIdsToDelete = relatedBlocks.map((block) => block.id)
-
-    const blocksByMessageId: Record<string, string[]> = {}
-    for (const block of relatedBlocks) {
-      if (!blocksByMessageId[block.messageId]) {
-        blocksByMessageId[block.messageId] = []
-      }
-      blocksByMessageId[block.messageId].push(block.id)
-    }
-
-    try {
-      const affectedMessageIds = [...new Set(relatedBlocks.map((b) => b.messageId))]
-
-      if (affectedMessageIds.length === 0 && blockIdsToDelete.length > 0) {
-        // This case should ideally not happen if relatedBlocks were found,
-        // but handle it just in case: only delete blocks.
-        await db.message_blocks.bulkDelete(blockIdsToDelete)
-        Logger.log(
-          `Deleted ${blockIdsToDelete.length} blocks related to file ${fileId}. No associated messages found (unexpected).`
-        )
-        return
-      }
-
-      await db.transaction('rw', db.topics, db.message_blocks, async () => {
-        // Fetch all topics (potential performance bottleneck if many topics)
-        const allTopics = await db.topics.toArray()
-        const topicsToUpdate: Record<string, { messages: Message[] }> = {} // Store updates keyed by topicId
-
-        for (const topic of allTopics) {
-          let topicModified = false
-          // Ensure topic.messages exists and is an array before mapping
-          const currentMessages = Array.isArray(topic.messages) ? topic.messages : []
-          const updatedMessages = currentMessages.map((message) => {
-            // Check if this message is affected
-            if (affectedMessageIds.includes(message.id)) {
-              // Ensure message.blocks exists and is an array
-              const currentBlocks = Array.isArray(message.blocks) ? message.blocks : []
-              const originalBlockCount = currentBlocks.length
-              // Filter out the blocks marked for deletion
-              const newBlocks = currentBlocks.filter((blockId) => !blockIdsToDelete.includes(blockId))
-              if (newBlocks.length < originalBlockCount) {
-                topicModified = true
-                return { ...message, blocks: newBlocks } // Return updated message
-              }
-            }
-            return message // Return original message
-          })
-
-          if (topicModified) {
-            // Store the update for this topic
-            topicsToUpdate[topic.id] = { messages: updatedMessages }
-          }
-        }
-
-        // Apply updates to topics
-        const updatePromises = Object.entries(topicsToUpdate).map(([topicId, updateData]) =>
-          db.topics.update(topicId, updateData)
-        )
-        await Promise.all(updatePromises)
-
-        // Finally, delete the MessageBlocks
-        await db.message_blocks.bulkDelete(blockIdsToDelete)
-      })
-
-      Logger.log(`Deleted ${blockIdsToDelete.length} blocks and updated relevant topic messages for file ${fileId}.`)
-    } catch (error) {
-      Logger.error(`Error updating topics or deleting blocks for file ${fileId}:`, error)
-      window.modal.error({ content: t('files.delete.db_error'), centered: true }) // 提示数据库操作失败
-      // Consider whether to attempt to restore the physical file (usually difficult)
-    }
-  }
-
-  const handleRename = async (fileId: string) => {
-    const file = await FileManager.getFile(fileId)
-    if (file) {
-      const newName = await TextEditPopup.show({ text: file.origin_name })
-      if (newName) {
-        FileManager.updateFile({ ...file, origin_name: newName })
-      }
-    }
-  }
+  const sortedFiles = files ? sortFiles(files, sortField, sortOrder) : []
 
   const dataSource = sortedFiles?.map((file) => {
     return {
@@ -189,7 +59,7 @@ const FilesPage: FC = () => {
             description={t('files.delete.content')}
             okText={t('common.confirm')}
             cancelText={t('common.cancel')}
-            onConfirm={() => handleDelete(file.id)}
+            onConfirm={() => handleDelete(file.id, t)}
             icon={<ExclamationCircleOutlined style={{ color: 'red' }} />}>
             <Button type="text" danger icon={<DeleteOutlined />} />
           </Popconfirm>
@@ -310,7 +180,6 @@ const SideNav = styled.div`
       background-color: var(--color-background-soft);
       color: var(--color-primary);
       border: 0.5px solid var(--color-border);
-      color: var(--color-text);
     }
   }
 `
diff --git a/src/renderer/src/services/FileAction.ts b/src/renderer/src/services/FileAction.ts
new file mode 100644
index 0000000000..679c2741d1
--- /dev/null
+++ b/src/renderer/src/services/FileAction.ts
@@ -0,0 +1,98 @@
+import TextEditPopup from '@renderer/components/Popups/TextEditPopup'
+import Logger from '@renderer/config/logger'
+import db from '@renderer/databases'
+import FileManager from '@renderer/services/FileManager'
+import store from '@renderer/store'
+import { FileType } from '@renderer/types'
+import { Message } from '@renderer/types/newMessage'
+import dayjs from 'dayjs'
+
+// 排序相关
+export type SortField = 'created_at' | 'size' | 'name'
+export type SortOrder = 'asc' | 'desc'
+
+export function tempFilesSort(files: FileType[]): FileType[] {
+  return files.sort((a, b) => {
+    const aIsTemp = a.origin_name.startsWith('temp_file')
+    const bIsTemp = b.origin_name.startsWith('temp_file')
+    if (aIsTemp && !bIsTemp) return 1
+    if (!aIsTemp && bIsTemp) return -1
+    return 0
+  })
+}
+
+export function sortFiles(files: FileType[], sortField: SortField, sortOrder: SortOrder): FileType[] {
+  return [...files].sort((a, b) => {
+    let comparison = 0
+    switch (sortField) {
+      case 'created_at':
+        comparison = dayjs(a.created_at).unix() - dayjs(b.created_at).unix()
+        break
+      case 'size':
+        comparison = a.size - b.size
+        break
+      case 'name':
+        comparison = a.origin_name.localeCompare(b.origin_name)
+        break
+    }
+    return sortOrder === 'asc' ? comparison : -comparison
+  })
+}
+
+// 删除操作
+export async function handleDelete(fileId: string, t: (key: string) => string) {
+  const file = await FileManager.getFile(fileId)
+  if (!file) return
+
+  const paintings = await store.getState().paintings.paintings
+  const paintingsFiles = paintings.flatMap((p) => p.files)
+
+  if (paintingsFiles.some((p) => p.id === fileId)) {
+    window.modal.warning({ content: t('files.delete.paintings.warning'), centered: true })
+    return
+  }
+  await FileManager.deleteFile(fileId, true)
+
+  const relatedBlocks = await db.message_blocks.where('file.id').equals(fileId).toArray()
+  const blockIdsToDelete = relatedBlocks.map((b) => b.id)
+  const affectedMessageIds = [...new Set(relatedBlocks.map((b) => b.messageId))]
+
+  try {
+    await db.transaction('rw', db.topics, db.message_blocks, async () => {
+      const allTopics = await db.topics.toArray()
+      const topicsToUpdate: Record<string, { messages: Message[] }> = {}
+
+      for (const topic of allTopics) {
+        let modified = false
+        const newMessages = (topic.messages || []).map((msg) => {
+          if (affectedMessageIds.includes(msg.id)) {
+            const filtered = (msg.blocks || []).filter((blk) => !blockIdsToDelete.includes(blk))
+            if (filtered.length < (msg.blocks || []).length) {
+              modified = true
+              return { ...msg, blocks: filtered }
+            }
+          }
+          return msg
+        })
+        if (modified) topicsToUpdate[topic.id] = { messages: newMessages }
+      }
+
+      await Promise.all(Object.entries(topicsToUpdate).map(([id, data]) => db.topics.update(id, data)))
+      await db.message_blocks.bulkDelete(blockIdsToDelete)
+    })
+    Logger.log(`Deleted ${blockIdsToDelete.length} blocks for file ${fileId}`)
+  } catch (err) {
+    Logger.error(`Error removing file blocks for ${fileId}:`, err)
+    window.modal.error({ content: t('files.delete.db_error'), centered: true })
+  }
+}
+
+// 重命名操作
+export async function handleRename(fileId: string) {
+  const file = await FileManager.getFile(fileId)
+  if (!file) return
+  const newName = await TextEditPopup.show({ text: file.origin_name })
+  if (newName) {
+    FileManager.updateFile({ ...file, origin_name: newName })
+  }
+}

From 10559034566adfdcda71b5ab842b655972625831 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E7=94=B1=E7=9A=84=E4=B8=96=E7=95=8C=E4=BA=BA?=
 <3196812536@qq.com>
Date: Tue, 24 Jun 2025 21:12:49 +0800
Subject: [PATCH 21/75] fix: add tag collapse state management for assistants
 (#7436)

Add tag collapse state management for assistants

Introduces a collapsedTags state to manage the collapsed/expanded state of tag groups in the assistants list. Updates useTags and AssistantsTab to use this state, and adds actions to toggle and initialize tag collapse in the Redux store.
---
 src/renderer/src/hooks/useTags.ts             | 45 +++++++++----------
 .../src/pages/home/Tabs/AssistantsTab.tsx     | 12 +----
 src/renderer/src/store/assistants.ts          | 30 ++++++++++---
 3 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/src/renderer/src/hooks/useTags.ts b/src/renderer/src/hooks/useTags.ts
index 44d43377c1..cdd0af5246 100644
--- a/src/renderer/src/hooks/useTags.ts
+++ b/src/renderer/src/hooks/useTags.ts
@@ -1,6 +1,6 @@
 import { createSelector } from '@reduxjs/toolkit'
 import { RootState, useAppDispatch, useAppSelector } from '@renderer/store'
-import { setTagsOrder, updateAssistants } from '@renderer/store/assistants'
+import { setTagsOrder, updateTagCollapse } from '@renderer/store/assistants'
 import { flatMap, groupBy, uniq } from 'lodash'
 import { useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -12,6 +12,8 @@ const selectAssistantsState = (state: RootState) => state.assistants
 // 记忆化 tagsOrder 选择器（自动处理默认值）--- 这是一个选择器，用于从 store 中获取 tagsOrder 的值。因为之前的tagsOrder是后面新加的，不这样做会报错，所以这里需要处理一下默认值
 const selectTagsOrder = createSelector([selectAssistantsState], (assistants) => assistants.tagsOrder ?? [])
 
+const selectCollapsedTags = createSelector([selectAssistantsState], (assistants) => assistants.collapsedTags ?? {})
+
 // 定义useTags的返回类型，包含所有标签和获取特定标签的助手函数
 // 为了不增加新的概念，标签直接作为助手的属性，所以这里的标签是指助手的标签属性
 // 但是为了方便管理，增加了一个获取特定标签的助手函数
@@ -20,6 +22,7 @@ export const useTags = () => {
   const { t } = useTranslation()
   const dispatch = useAppDispatch()
   const savedTagsOrder = useAppSelector(selectTagsOrder)
+  const collapsedTags = useAppSelector(selectCollapsedTags)
 
   // 计算所有标签
   const allTags = useMemo(() => {
@@ -38,28 +41,6 @@ export const useTags = () => {
     [assistants]
   )
 
-  const updateTagsOrder = useCallback(
-    (newOrder: string[]) => {
-      dispatch(setTagsOrder(newOrder))
-      updateAssistants(
-        assistants.map((assistant) => {
-          if (!assistant.tags || assistant.tags.length === 0) {
-            return assistant
-          }
-          const newTags = [...assistant.tags]
-          newTags.sort((a, b) => {
-            return newOrder.indexOf(a) - newOrder.indexOf(b)
-          })
-          return {
-            ...assistant,
-            tags: newTags
-          }
-        })
-      )
-    },
-    [assistants, dispatch]
-  )
-
   const getGroupedAssistants = useMemo(() => {
     // 按标签分组，处理多标签的情况
     const assistantsByTags = flatMap(assistants, (assistant) => {
@@ -100,10 +81,26 @@ export const useTags = () => {
     return grouped
   }, [assistants, t, savedTagsOrder])
 
+  const updateTagsOrder = useCallback(
+    (newOrder: string[]) => {
+      dispatch(setTagsOrder(newOrder))
+    },
+    [dispatch]
+  )
+
+  const toggleTagCollapse = useCallback(
+    (tag: string) => {
+      dispatch(updateTagCollapse(tag))
+    },
+    [dispatch]
+  )
+
   return {
     allTags,
     getAssistantsByTag,
     getGroupedAssistants,
-    updateTagsOrder
+    updateTagsOrder,
+    collapsedTags,
+    toggleTagCollapse
   }
 }
diff --git a/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx b/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx
index cbcd272791..b164e7b492 100644
--- a/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx
+++ b/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx
@@ -27,10 +27,9 @@ const Assistants: FC<AssistantsTabProps> = ({
 }) => {
   const { assistants, removeAssistant, addAssistant, updateAssistants } = useAssistants()
   const [dragging, setDragging] = useState(false)
-  const [collapsedTags, setCollapsedTags] = useState<Record<string, boolean>>({})
   const { addAgent } = useAgents()
   const { t } = useTranslation()
-  const { getGroupedAssistants } = useTags()
+  const { getGroupedAssistants, collapsedTags, toggleTagCollapse } = useTags()
   const { assistantsTabSortType = 'list', setAssistantsTabSortType } = useAssistantsTabSortType()
   const containerRef = useRef<HTMLDivElement>(null)
 
@@ -46,13 +45,6 @@ const Assistants: FC<AssistantsTabProps> = ({
     [activeAssistant, assistants, removeAssistant, setActiveAssistant, onCreateDefaultAssistant]
   )
 
-  const toggleTagCollapse = useCallback((tag: string) => {
-    setCollapsedTags((prev) => ({
-      ...prev,
-      [tag]: !prev[tag]
-    }))
-  }, [])
-
   const handleSortByChange = useCallback(
     (sortType: AssistantsSortType) => {
       setAssistantsTabSortType(sortType)
@@ -103,7 +95,6 @@ const Assistants: FC<AssistantsTabProps> = ({
                   <DragableList
                     list={group.assistants}
                     onUpdate={(newList) => handleGroupReorder(group.tag, newList)}
-                    style={{ paddingBottom: dragging ? '34px' : 0 }}
                     onDragStart={() => setDragging(true)}
                     onDragEnd={() => setDragging(false)}>
                     {(assistant) => (
@@ -141,7 +132,6 @@ const Assistants: FC<AssistantsTabProps> = ({
       <DragableList
         list={assistants}
         onUpdate={updateAssistants}
-        style={{ paddingBottom: dragging ? '34px' : 0 }}
         onDragStart={() => setDragging(true)}
         onDragEnd={() => setDragging(false)}>
         {(assistant) => (
diff --git a/src/renderer/src/store/assistants.ts b/src/renderer/src/store/assistants.ts
index 14213006d3..35ea98af76 100644
--- a/src/renderer/src/store/assistants.ts
+++ b/src/renderer/src/store/assistants.ts
@@ -9,12 +9,14 @@ export interface AssistantsState {
   defaultAssistant: Assistant
   assistants: Assistant[]
   tagsOrder: string[]
+  collapsedTags: Record<string, boolean>
 }
 
 const initialState: AssistantsState = {
   defaultAssistant: getDefaultAssistant(),
   assistants: [getDefaultAssistant()],
-  tagsOrder: []
+  tagsOrder: [],
+  collapsedTags: {}
 }
 
 const assistantsSlice = createSlice({
@@ -58,6 +60,26 @@ const assistantsSlice = createSlice({
         }
       }
     },
+    setTagsOrder: (state, action: PayloadAction<string[]>) => {
+      const newOrder = action.payload
+      state.tagsOrder = newOrder
+      const prevCollapsed = state.collapsedTags || {}
+      const updatedCollapsed: Record<string, boolean> = { ...prevCollapsed }
+      newOrder.forEach((tag) => {
+        if (!(tag in updatedCollapsed)) {
+          updatedCollapsed[tag] = false
+        }
+      })
+      state.collapsedTags = updatedCollapsed
+    },
+    updateTagCollapse: (state, action: PayloadAction<string>) => {
+      const tag = action.payload
+      const prev = state.collapsedTags || {}
+      state.collapsedTags = {
+        ...prev,
+        [tag]: !prev[tag]
+      }
+    },
     addTopic: (state, action: PayloadAction<{ assistantId: string; topic: Topic }>) => {
       const topic = action.payload.topic
       topic.createdAt = topic.createdAt || new Date().toISOString()
@@ -130,9 +152,6 @@ const assistantsSlice = createSlice({
             }
           : assistant
       )
-    },
-    setTagsOrder: (state, action: PayloadAction<string[]>) => {
-      state.tagsOrder = action.payload
     }
   }
 })
@@ -150,7 +169,8 @@ export const {
   removeAllTopics,
   setModel,
   setTagsOrder,
-  updateAssistantSettings
+  updateAssistantSettings,
+  updateTagCollapse
 } = assistantsSlice.actions
 
 export default assistantsSlice.reducer

From becb6543e06cebcea9395ae17d0917de0ff67375 Mon Sep 17 00:00:00 2001
From: one <wangan.cs@gmail.com>
Date: Tue, 24 Jun 2025 23:42:55 +0800
Subject: [PATCH 22/75] fix(model): doubao thinking param (#7499)

---
 src/renderer/src/config/models.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/src/config/models.ts b/src/renderer/src/config/models.ts
index a847f6d491..d9453cea34 100644
--- a/src/renderer/src/config/models.ts
+++ b/src/renderer/src/config/models.ts
@@ -2847,7 +2847,7 @@ export const findTokenLimit = (modelId: string): { min: number; max: number } |
 
 // Doubao 支持思考模式的模型正则
 export const DOUBAO_THINKING_MODEL_REGEX =
-  /doubao-(?:1[.-]5-thinking-vision-pro|1[.-]5-thinking-pro-m|seed-1[.-]6(?:-flash)?)(?:-[\w-]+)?/i
+  /doubao-(?:1[.-]5-thinking-vision-pro|1[.-]5-thinking-pro-m|seed-1[.-]6(?:-flash)?)(?:-\d{6})?$/i
 
 // 支持 auto 的 Doubao 模型 doubao-seed-1.6-xxx doubao-seed-1-6-xxx  doubao-1-5-thinking-pro-m-xxx
 export const DOUBAO_THINKING_AUTO_MODEL_REGEX = /doubao-(1-5-thinking-pro-m|seed-1\.6|seed-1-6-[\w-]+)(?:-[\w-]+)*/i

From 3640d846b9af44642237f55328b4dccbc34244bc Mon Sep 17 00:00:00 2001
From: beyondkmp <beyondkmp@gmail.com>
Date: Wed, 25 Jun 2025 00:39:28 +0800
Subject: [PATCH 23/75] feat: Implement occupied directories handling during
 data copy (#7485)

* feat: Implement occupied directories handling during data copy

- Added `occupiedDirs` constant to manage directories that should not be copied.
- Enhanced the `copyOccupiedDirsInMainProcess` function to copy occupied directories to a new app data path in the main process.
- Updated IPC and preload APIs to support passing occupied directories during the copy operation.
- Modified the DataSettings component to utilize the new copy functionality with occupied directories.

* fix: Improve occupied directories handling during data copy

- Updated the filter logic in the `registerIpc` function to resolve directory paths correctly.
- Modified the `DataSettings` component to pass the correct occupied directories format during the copy operation.
---
 packages/shared/config/constant.ts            |  2 ++
 src/main/bootstrap.ts                         | 28 +++++++++++++++++++
 src/main/ipc.ts                               | 12 ++++++--
 src/preload/index.ts                          |  3 +-
 .../settings/DataSettings/DataSettings.tsx    |  7 ++++-
 5 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/packages/shared/config/constant.ts b/packages/shared/config/constant.ts
index 719600650e..0b568461ea 100644
--- a/packages/shared/config/constant.ts
+++ b/packages/shared/config/constant.ts
@@ -409,3 +409,5 @@ export enum FeedUrl {
   EARLY_ACCESS = 'https://github.com/CherryHQ/cherry-studio/releases/latest/download'
 }
 export const defaultTimeout = 5 * 1000 * 60
+
+export const occupiedDirs = ['logs', 'Network', 'Partitions/webview/Network']
diff --git a/src/main/bootstrap.ts b/src/main/bootstrap.ts
index f682c06fcd..15648f6ffc 100644
--- a/src/main/bootstrap.ts
+++ b/src/main/bootstrap.ts
@@ -1,5 +1,33 @@
+import { occupiedDirs } from '@shared/config/constant'
 import { app } from 'electron'
+import fs from 'fs'
+import path from 'path'
 
 import { initAppDataDir } from './utils/file'
 
 app.isPackaged && initAppDataDir()
+
+// 在主进程中复制 appData 中某些一直被占用的文件
+// 在renderer进程还没有启动时，主进程可以复制这些文件到新的appData中
+function copyOccupiedDirsInMainProcess() {
+  const newAppDataPath = process.argv
+    .slice(1)
+    .find((arg) => arg.startsWith('--new-data-path='))
+    ?.split('--new-data-path=')[1]
+  if (!newAppDataPath) {
+    return
+  }
+
+  if (process.platform === 'win32') {
+    const appDataPath = app.getPath('userData')
+    occupiedDirs.forEach((dir) => {
+      const dirPath = path.join(appDataPath, dir)
+      const newDirPath = path.join(newAppDataPath, dir)
+      if (fs.existsSync(dirPath)) {
+        fs.cpSync(dirPath, newDirPath, { recursive: true })
+      }
+    })
+  }
+}
+
+copyOccupiedDirsInMainProcess()
diff --git a/src/main/ipc.ts b/src/main/ipc.ts
index 88d66d4a39..bcb90ee5d6 100644
--- a/src/main/ipc.ts
+++ b/src/main/ipc.ts
@@ -269,9 +269,17 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   })
 
   // Copy user data to new location
-  ipcMain.handle(IpcChannel.App_Copy, async (_, oldPath: string, newPath: string) => {
+  ipcMain.handle(IpcChannel.App_Copy, async (_, oldPath: string, newPath: string, occupiedDirs: string[] = []) => {
     try {
-      await fs.promises.cp(oldPath, newPath, { recursive: true })
+      await fs.promises.cp(oldPath, newPath, {
+        recursive: true,
+        filter: (src) => {
+          if (occupiedDirs.some((dir) => src.startsWith(path.resolve(dir)))) {
+            return false
+          }
+          return true
+        }
+      })
       return { success: true }
     } catch (error: any) {
       log.error('Failed to copy user data:', error)
diff --git a/src/preload/index.ts b/src/preload/index.ts
index 114ad13ef6..b6c87259ce 100644
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -32,7 +32,8 @@ const api = {
   hasWritePermission: (path: string) => ipcRenderer.invoke(IpcChannel.App_HasWritePermission, path),
   setAppDataPath: (path: string) => ipcRenderer.invoke(IpcChannel.App_SetAppDataPath, path),
   getDataPathFromArgs: () => ipcRenderer.invoke(IpcChannel.App_GetDataPathFromArgs),
-  copy: (oldPath: string, newPath: string) => ipcRenderer.invoke(IpcChannel.App_Copy, oldPath, newPath),
+  copy: (oldPath: string, newPath: string, occupiedDirs: string[] = []) =>
+    ipcRenderer.invoke(IpcChannel.App_Copy, oldPath, newPath, occupiedDirs),
   setStopQuitApp: (stop: boolean, reason: string) => ipcRenderer.invoke(IpcChannel.App_SetStopQuitApp, stop, reason),
   flushAppData: () => ipcRenderer.invoke(IpcChannel.App_FlushAppData),
   isNotEmptyDir: (path: string) => ipcRenderer.invoke(IpcChannel.App_IsNotEmptyDir, path),
diff --git a/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx b/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
index 0038f1947c..94030bfbab 100644
--- a/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
@@ -19,6 +19,7 @@ import store, { useAppDispatch } from '@renderer/store'
 import { setSkipBackupFile as _setSkipBackupFile } from '@renderer/store/settings'
 import { AppInfo } from '@renderer/types'
 import { formatFileSize } from '@renderer/utils'
+import { occupiedDirs } from '@shared/config/constant'
 import { Button, Progress, Switch, Typography } from 'antd'
 import { FileText, FolderCog, FolderInput, Sparkle } from 'lucide-react'
 import { FC, useEffect, useState } from 'react'
@@ -500,7 +501,11 @@ const DataSettings: FC = () => {
     await new Promise((resolve) => setTimeout(resolve, 2000))
 
     // 开始复制过程
-    const copyResult = await window.api.copy(originalPath, newPath)
+    const copyResult = await window.api.copy(
+      originalPath,
+      newPath,
+      occupiedDirs.map((dir) => originalPath + '/' + dir)
+    )
 
     // 停止进度更新
     if (progressInterval) {

From 17951ad157558441f2a1298ba6b7c82cecf085e6 Mon Sep 17 00:00:00 2001
From: chenxue <DDU1222@users.noreply.github.com>
Date: Wed, 25 Jun 2025 09:17:27 +0800
Subject: [PATCH 24/75] feat: add appcode (#7507)

Co-authored-by: zhaochenxue <zhaochenxue@bixin.cn>
---
 .../src/aiCore/clients/AihubmixAPIClient.ts      | 16 ++++++++++++----
 .../clients/anthropic/AnthropicAPIClient.ts      |  3 ++-
 .../src/aiCore/clients/gemini/GeminiAPIClient.ts |  5 ++++-
 .../aiCore/clients/openai/OpenAIBaseClient.ts    |  1 +
 .../clients/openai/OpenAIResponseAPIClient.ts    |  3 ++-
 src/renderer/src/types/index.ts                  |  1 +
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/renderer/src/aiCore/clients/AihubmixAPIClient.ts b/src/renderer/src/aiCore/clients/AihubmixAPIClient.ts
index b24eea2a2d..541c083e8c 100644
--- a/src/renderer/src/aiCore/clients/AihubmixAPIClient.ts
+++ b/src/renderer/src/aiCore/clients/AihubmixAPIClient.ts
@@ -42,11 +42,19 @@ export class AihubmixAPIClient extends BaseApiClient {
   constructor(provider: Provider) {
     super(provider)
 
+    const providerExtraHeaders = {
+      ...provider,
+      extra_headers: {
+        ...provider.extra_headers,
+        'APP-Code': 'MLTG2087'
+      }
+    }
+
     // 初始化各个client - 现在有类型安全
-    const claudeClient = new AnthropicAPIClient(provider)
-    const geminiClient = new GeminiAPIClient({ ...provider, apiHost: 'https://aihubmix.com/gemini' })
-    const openaiClient = new OpenAIResponseAPIClient(provider)
-    const defaultClient = new OpenAIAPIClient(provider)
+    const claudeClient = new AnthropicAPIClient(providerExtraHeaders)
+    const geminiClient = new GeminiAPIClient({ ...providerExtraHeaders, apiHost: 'https://aihubmix.com/gemini' })
+    const openaiClient = new OpenAIResponseAPIClient(providerExtraHeaders)
+    const defaultClient = new OpenAIAPIClient(providerExtraHeaders)
 
     this.clients.set('claude', claudeClient)
     this.clients.set('gemini', geminiClient)
diff --git a/src/renderer/src/aiCore/clients/anthropic/AnthropicAPIClient.ts b/src/renderer/src/aiCore/clients/anthropic/AnthropicAPIClient.ts
index eb7d930c5d..465cdff5ac 100644
--- a/src/renderer/src/aiCore/clients/anthropic/AnthropicAPIClient.ts
+++ b/src/renderer/src/aiCore/clients/anthropic/AnthropicAPIClient.ts
@@ -94,7 +94,8 @@ export class AnthropicAPIClient extends BaseApiClient<
       baseURL: this.getBaseURL(),
       dangerouslyAllowBrowser: true,
       defaultHeaders: {
-        'anthropic-beta': 'output-128k-2025-02-19'
+        'anthropic-beta': 'output-128k-2025-02-19',
+        ...this.provider.extra_headers
       }
     })
     return this.sdkInstance
diff --git a/src/renderer/src/aiCore/clients/gemini/GeminiAPIClient.ts b/src/renderer/src/aiCore/clients/gemini/GeminiAPIClient.ts
index dd4fb1d516..8cb46143b2 100644
--- a/src/renderer/src/aiCore/clients/gemini/GeminiAPIClient.ts
+++ b/src/renderer/src/aiCore/clients/gemini/GeminiAPIClient.ts
@@ -176,7 +176,10 @@ export class GeminiAPIClient extends BaseApiClient<
       apiVersion: this.getApiVersion(),
       httpOptions: {
         baseUrl: this.getBaseURL(),
-        apiVersion: this.getApiVersion()
+        apiVersion: this.getApiVersion(),
+        headers: {
+          ...this.provider.extra_headers
+        }
       }
     })
 
diff --git a/src/renderer/src/aiCore/clients/openai/OpenAIBaseClient.ts b/src/renderer/src/aiCore/clients/openai/OpenAIBaseClient.ts
index 7730f228af..72fa1d7df8 100644
--- a/src/renderer/src/aiCore/clients/openai/OpenAIBaseClient.ts
+++ b/src/renderer/src/aiCore/clients/openai/OpenAIBaseClient.ts
@@ -159,6 +159,7 @@ export abstract class OpenAIBaseClient<
         baseURL: this.getBaseURL(),
         defaultHeaders: {
           ...this.defaultHeaders(),
+          ...this.provider.extra_headers,
           ...(this.provider.id === 'copilot' ? { 'editor-version': 'vscode/1.97.2' } : {}),
           ...(this.provider.id === 'copilot' ? { 'copilot-vision-request': 'true' } : {})
         }
diff --git a/src/renderer/src/aiCore/clients/openai/OpenAIResponseAPIClient.ts b/src/renderer/src/aiCore/clients/openai/OpenAIResponseAPIClient.ts
index 1f9af6ca77..a6c49a5cf8 100644
--- a/src/renderer/src/aiCore/clients/openai/OpenAIResponseAPIClient.ts
+++ b/src/renderer/src/aiCore/clients/openai/OpenAIResponseAPIClient.ts
@@ -81,7 +81,8 @@ export class OpenAIResponseAPIClient extends OpenAIBaseClient<
       apiKey: this.apiKey,
       baseURL: this.getBaseURL(),
       defaultHeaders: {
-        ...this.defaultHeaders()
+        ...this.defaultHeaders(),
+        ...this.provider.extra_headers
       }
     })
   }
diff --git a/src/renderer/src/types/index.ts b/src/renderer/src/types/index.ts
index 75e1da19ce..beb93bdf44 100644
--- a/src/renderer/src/types/index.ts
+++ b/src/renderer/src/types/index.ts
@@ -161,6 +161,7 @@ export type Provider = {
   isNotSupportArrayContent?: boolean
   isVertex?: boolean
   notes?: string
+  extra_headers?: Record<string, string>
 }
 
 export type ProviderType =

From 9fe5fb9a91dfa18bd09be578bf09f2465dfcca7d Mon Sep 17 00:00:00 2001
From: SuYao <sy20010504@gmail.com>
Date: Wed, 25 Jun 2025 12:49:00 +0800
Subject: [PATCH 25/75] fix: non streamoutput sometimes (#7512)

* feat(migrate): add default settings for assistants during migration

- Introduced a new migration step to assign default settings for assistants that lack configuration.
- Default settings include temperature, context count, and other parameters to ensure consistent behavior across the application.

* chore(store): increment version number to 115 for persisted reducer
---
 src/renderer/src/store/index.ts   |  2 +-
 src/renderer/src/store/migrate.ts | 22 +++++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/store/index.ts b/src/renderer/src/store/index.ts
index 81b547eed1..ae5c52a9fb 100644
--- a/src/renderer/src/store/index.ts
+++ b/src/renderer/src/store/index.ts
@@ -50,7 +50,7 @@ const persistedReducer = persistReducer(
   {
     key: 'cherry-studio',
     storage,
-    version: 114,
+    version: 115,
     blacklist: ['runtime', 'messages', 'messageBlocks'],
     migrate
   },
diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts
index ece6204f66..df89be66b8 100644
--- a/src/renderer/src/store/migrate.ts
+++ b/src/renderer/src/store/migrate.ts
@@ -1,5 +1,5 @@
 import { nanoid } from '@reduxjs/toolkit'
-import { isMac } from '@renderer/config/constant'
+import { DEFAULT_CONTEXTCOUNT, DEFAULT_TEMPERATURE, isMac } from '@renderer/config/constant'
 import { DEFAULT_MIN_APPS } from '@renderer/config/minapps'
 import { SYSTEM_MODELS } from '@renderer/config/models'
 import { TRANSLATE_PROMPT } from '@renderer/config/prompts'
@@ -1611,6 +1611,26 @@ const migrateConfig = {
     } catch (error) {
       return state
     }
+  },
+  '115': (state: RootState) => {
+    try {
+      state.assistants.assistants.forEach((assistant) => {
+        if (!assistant.settings) {
+          assistant.settings = {
+            temperature: DEFAULT_TEMPERATURE,
+            contextCount: DEFAULT_CONTEXTCOUNT,
+            topP: 1,
+            toolUseMode: 'prompt',
+            customParameters: [],
+            streamOutput: true,
+            enableMaxTokens: false
+          }
+        }
+      })
+      return state
+    } catch (error) {
+      return state
+    }
   }
 }
 

From 3df5aeb3c3afbec6fd525f96a0fbfc9108fdf521 Mon Sep 17 00:00:00 2001
From: kangfenmao <kangfenmao@qq.com>
Date: Wed, 25 Jun 2025 13:10:46 +0800
Subject: [PATCH 26/75] Revert "feat: Update API Key Management Interface
 (#3444)"

This reverts commit 31b3ce1049a607d2448213e5bc1c1fc0f28231d2.
---
 src/renderer/src/i18n/locales/en-us.json      |   9 +-
 src/renderer/src/i18n/locales/ja-jp.json      |   9 +-
 src/renderer/src/i18n/locales/ru-ru.json      |   9 +-
 src/renderer/src/i18n/locales/zh-cn.json      |   9 +-
 src/renderer/src/i18n/locales/zh-tw.json      |   9 +-
 .../ProviderSettings/ApiCheckPopup.tsx        | 231 +++++++
 .../settings/ProviderSettings/ApiKeyList.tsx  | 638 ------------------
 .../ProviderSettings/ProviderSetting.tsx      | 138 +++-
 .../WebSearchProviderSetting.tsx              | 110 ++-
 9 files changed, 464 insertions(+), 698 deletions(-)
 create mode 100644 src/renderer/src/pages/settings/ProviderSettings/ApiCheckPopup.tsx
 delete mode 100644 src/renderer/src/pages/settings/ProviderSettings/ApiKeyList.tsx

diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index c760f49378..fa1f493d80 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -1605,7 +1605,6 @@
       "models.check.model_status_summary": "{{provider}}: {{summary}}",
       "models.check.no_api_keys": "No API keys found, please add API keys first.",
       "models.check.passed": "Passed",
-      "models.check.checking": "Checking",
       "models.check.select_api_key": "Select the API key to use:",
       "models.check.single": "Single",
       "models.check.start": "Start",
@@ -1654,6 +1653,7 @@
         "api.url.tip": "Ending with / ignores v1, ending with # forces use of input address",
         "api_host": "API Host",
         "api_key": "API Key",
+        "api_key.tip": "Multiple keys separated by commas",
         "api_version": "API Version",
         "basic_auth": "HTTP authentication",
         "basic_auth.tip": "Applicable to instances deployed remotely (see the documentation). Currently, only the Basic scheme (RFC 7617) is supported.",
@@ -1708,9 +1708,9 @@
         "get_api_key": "Get API Key",
         "is_not_support_array_content": "Enable compatible mode",
         "no_models_for_check": "No models available for checking (e.g. chat models)",
+        "not_checked": "Not Checked",
         "remove_duplicate_keys": "Remove Duplicate Keys",
         "remove_invalid_keys": "Remove Invalid Keys",
-        "invalid_key": "Invalid API key",
         "search": "Search Providers...",
         "search_placeholder": "Search model id or name",
         "title": "Model Provider",
@@ -1739,10 +1739,7 @@
           },
           "documentation": "View official documentation for more configuration details:",
           "learn_more": "Learn More"
-        },
-        "enter_new_api_key": "Enter new API key",
-        "key_already_exists": "API key already exists",
-        "check_tooltip.latency": "Latency"
+        }
       },
       "proxy": {
         "mode": {
diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json
index 3899742f9a..ffa579d563 100644
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@@ -1599,7 +1599,6 @@
       "models.check.model_status_summary": "{{provider}}: {{summary}}",
       "models.check.no_api_keys": "APIキーが見つかりません。まずAPIキーを追加してください。",
       "models.check.passed": "成功",
-      "models.check.checking": "チェック中",
       "models.check.select_api_key": "使用するAPIキーを選択：",
       "models.check.single": "単一",
       "models.check.start": "開始",
@@ -1642,6 +1641,7 @@
         "api.url.tip": "/で終わる場合、v1を無視します。#で終わる場合、入力されたアドレスを強制的に使用します",
         "api_host": "APIホスト",
         "api_key": "APIキー",
+        "api_key.tip": "複数のキーはカンマで区切ります",
         "api_version": "APIバージョン",
         "basic_auth": "HTTP 認証",
         "basic_auth.tip": "サーバー展開によるインスタンスに適用されます（ドキュメントを参照）。現在はBasicスキーム（RFC7617）のみをサポートしています。",
@@ -1693,9 +1693,9 @@
         "get_api_key": "APIキーを取得",
         "is_not_support_array_content": "互換モードを有効にする",
         "no_models_for_check": "チェックするモデルがありません（例：会話モデル）",
+        "not_checked": "未チェック",
         "remove_duplicate_keys": "重複キーを削除",
         "remove_invalid_keys": "無効なキーを削除",
-        "invalid_key": "無効なAPIキー",
         "search": "プロバイダーを検索...",
         "search_placeholder": "モデルIDまたは名前を検索",
         "title": "モデルプロバイダー",
@@ -1727,10 +1727,7 @@
           },
           "documentation": "詳細な設定については、公式ドキュメントを参照してください:",
           "learn_more": "詳細を確認"
-        },
-        "enter_new_api_key": "新しいAPIキーを入力",
-        "key_already_exists": "APIキーはすでに存在します",
-        "check_tooltip.latency": "遅延"
+        }
       },
       "proxy": {
         "mode": {
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index 619f931c8f..a713da42ee 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -1599,7 +1599,6 @@
       "models.check.model_status_summary": "{{provider}}: {{summary}}",
       "models.check.no_api_keys": "API ключи не найдены, пожалуйста, добавьте API ключи.",
       "models.check.passed": "Прошло",
-      "models.check.checking": "Проверка",
       "models.check.select_api_key": "Выберите API ключ для использования:",
       "models.check.single": "Один",
       "models.check.start": "Начать",
@@ -1642,6 +1641,7 @@
         "api.url.tip": "Заканчивая на / игнорирует v1, заканчивая на # принудительно использует введенный адрес",
         "api_host": "Хост API",
         "api_key": "Ключ API",
+        "api_key.tip": "Несколько ключей, разделенных запятыми",
         "api_version": "Версия API",
         "basic_auth": "HTTP аутентификация",
         "basic_auth.tip": "Применимо к экземплярам, развернутым через сервер (см. документацию). В настоящее время поддерживается только схема Basic (RFC7617).",
@@ -1693,9 +1693,9 @@
         "get_api_key": "Получить ключ API",
         "is_not_support_array_content": "Включить совместимый режим",
         "no_models_for_check": "Нет моделей для проверки (например, диалоговые модели)",
+        "not_checked": "Не проверено",
         "remove_duplicate_keys": "Удалить дубликаты ключей",
         "remove_invalid_keys": "Удалить недействительные ключи",
-        "invalid_key": "Недействительный ключ API",
         "search": "Поиск поставщиков...",
         "search_placeholder": "Поиск по ID или имени модели",
         "title": "Провайдеры моделей",
@@ -1727,10 +1727,7 @@
           },
           "documentation": "Смотрите официальную документацию для получения более подробной информации о конфигурации:",
           "learn_more": "Узнать больше"
-        },
-        "enter_new_api_key": "Введите новый API ключ",
-        "key_already_exists": "API ключ уже существует",
-        "check_tooltip.latency": "Задержка"
+        }
       },
       "proxy": {
         "mode": {
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index 0b5c446313..c16089db5e 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -1605,7 +1605,6 @@
       "models.check.model_status_summary": "{{provider}}: {{summary}}",
       "models.check.no_api_keys": "未找到API密钥，请先添加API密钥",
       "models.check.passed": "通过",
-      "models.check.checking": "检测中",
       "models.check.select_api_key": "选择要使用的API密钥：",
       "models.check.single": "单个",
       "models.check.start": "开始",
@@ -1654,6 +1653,7 @@
         "api.url.tip": "/结尾忽略v1版本，#结尾强制使用输入地址",
         "api_host": "API 地址",
         "api_key": "API 密钥",
+        "api_key.tip": "多个密钥使用逗号分隔",
         "api_version": "API 版本",
         "basic_auth": "HTTP 认证",
         "basic_auth.tip": "适用于通过服务器部署的实例（参见文档）。目前仅支持 Basic 方案（RFC7617）",
@@ -1708,9 +1708,9 @@
         "get_api_key": "点击这里获取密钥",
         "is_not_support_array_content": "开启兼容模式",
         "no_models_for_check": "没有可以被检测的模型（例如对话模型）",
+        "not_checked": "未检测",
         "remove_duplicate_keys": "移除重复密钥",
         "remove_invalid_keys": "删除无效密钥",
-        "invalid_key": "无效的 API 密钥",
         "search": "搜索模型平台...",
         "search_placeholder": "搜索模型 ID 或名称",
         "title": "模型服务",
@@ -1739,10 +1739,7 @@
           },
           "documentation": "查看官方文档了解更多配置详情：",
           "learn_more": "了解更多"
-        },
-        "enter_new_api_key": "输入新的API密钥",
-        "key_already_exists": "API密钥已存在",
-        "check_tooltip.latency": "耗时"
+        }
       },
       "proxy": {
         "mode": {
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index 6d95afee24..72be4f02e6 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -1602,7 +1602,6 @@
       "models.check.model_status_summary": "{{provider}}: {{summary}}",
       "models.check.no_api_keys": "未找到API密鑰，請先添加API密鑰",
       "models.check.passed": "通過",
-      "models.check.checking": "檢查中",
       "models.check.select_api_key": "選擇要使用的API密鑰：",
       "models.check.single": "單個",
       "models.check.start": "開始",
@@ -1645,6 +1644,7 @@
         "api.url.tip": "/結尾忽略 v1 版本，#結尾強制使用輸入位址",
         "api_host": "API 主機地址",
         "api_key": "API 金鑰",
+        "api_key.tip": "多個金鑰使用逗號分隔",
         "api_version": "API 版本",
         "basic_auth": "HTTP 認證",
         "basic_auth.tip": "適用於透過伺服器部署的實例（請參閱文檔）。目前僅支援 Basic 方案（RFC7617）",
@@ -1696,9 +1696,9 @@
         "get_api_key": "點選這裡取得金鑰",
         "is_not_support_array_content": "開啟相容模式",
         "no_models_for_check": "沒有可以被檢查的模型（例如對話模型）",
+        "not_checked": "未檢查",
         "remove_duplicate_keys": "移除重複金鑰",
         "remove_invalid_keys": "刪除無效金鑰",
-        "invalid_key": "無效的 API 金鑰",
         "search": "搜尋模型平臺...",
         "search_placeholder": "搜尋模型 ID 或名稱",
         "title": "模型提供者",
@@ -1730,10 +1730,7 @@
           },
           "documentation": "檢視官方文件以取得更多設定詳細資訊：",
           "learn_more": "瞭解更多"
-        },
-        "enter_new_api_key": "輸入新的API密鑰",
-        "key_already_exists": "API密鑰已存在",
-        "check_tooltip.latency": "耗時"
+        }
       },
       "proxy": {
         "mode": {
diff --git a/src/renderer/src/pages/settings/ProviderSettings/ApiCheckPopup.tsx b/src/renderer/src/pages/settings/ProviderSettings/ApiCheckPopup.tsx
new file mode 100644
index 0000000000..afd6ba576e
--- /dev/null
+++ b/src/renderer/src/pages/settings/ProviderSettings/ApiCheckPopup.tsx
@@ -0,0 +1,231 @@
+import { CheckCircleFilled, CloseCircleFilled, LoadingOutlined, MinusCircleOutlined } from '@ant-design/icons'
+import Scrollbar from '@renderer/components/Scrollbar'
+import { TopView } from '@renderer/components/TopView'
+import { checkApi } from '@renderer/services/ApiService'
+import WebSearchService from '@renderer/services/WebSearchService'
+import { Model, Provider, WebSearchProvider } from '@renderer/types'
+import { maskApiKey } from '@renderer/utils/api'
+import { Button, List, Modal, Space, Spin, Typography } from 'antd'
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import styled from 'styled-components'
+
+interface ShowParams {
+  title: string
+  provider: Provider | WebSearchProvider
+  model?: Model
+  apiKeys: string[]
+  type: 'provider' | 'websearch'
+}
+
+interface Props extends ShowParams {
+  resolve: (data: any) => void
+}
+
+interface KeyStatus {
+  key: string
+  isValid?: boolean
+  checking?: boolean
+}
+
+const PopupContainer: React.FC<Props> = ({ title, provider, model, apiKeys, type, resolve }) => {
+  const [open, setOpen] = useState(true)
+  const [keyStatuses, setKeyStatuses] = useState<KeyStatus[]>(() => {
+    const uniqueKeys = new Set(apiKeys)
+    return Array.from(uniqueKeys).map((key) => ({ key }))
+  })
+  const { t } = useTranslation()
+  const [isChecking, setIsChecking] = useState(false)
+  const [isCheckingSingle, setIsCheckingSingle] = useState(false)
+
+  const checkAllKeys = async () => {
+    setIsChecking(true)
+    const newStatuses = [...keyStatuses]
+
+    try {
+      // 使用Promise.all并行处理所有API验证请求
+      const checkPromises = newStatuses.map(async (status, i) => {
+        // 先更新当前密钥为检查中状态
+        setKeyStatuses((prev) => prev.map((status, idx) => (idx === i ? { ...status, checking: true } : status)))
+
+        try {
+          let valid = false
+          if (type === 'provider' && model) {
+            await checkApi({ ...(provider as Provider), apiKey: status.key }, model)
+            valid = true
+          } else {
+            const result = await WebSearchService.checkSearch({
+              ...(provider as WebSearchProvider),
+              apiKey: status.key
+            })
+            valid = result.valid
+          }
+
+          // 更新验证结果
+          setKeyStatuses((prev) => prev.map((s, idx) => (idx === i ? { ...s, checking: false, isValid: valid } : s)))
+
+          return { index: i, valid }
+        } catch (error: unknown) {
+          // 处理错误情况
+          setKeyStatuses((prev) => prev.map((s, idx) => (idx === i ? { ...s, checking: false, isValid: false } : s)))
+          return { index: i, valid: false }
+        }
+      })
+
+      // 等待所有请求完成
+      await Promise.all(checkPromises)
+    } finally {
+      setIsChecking(false)
+    }
+  }
+
+  const checkSingleKey = async (keyIndex: number) => {
+    if (isChecking || keyStatuses[keyIndex].checking) {
+      return
+    }
+
+    setIsCheckingSingle(true)
+    setKeyStatuses((prev) => prev.map((status, idx) => (idx === keyIndex ? { ...status, checking: true } : status)))
+
+    try {
+      let valid = false
+      if (type === 'provider' && model) {
+        await checkApi({ ...(provider as Provider), apiKey: keyStatuses[keyIndex].key }, model)
+        valid = true
+      } else {
+        const result = await WebSearchService.checkSearch({
+          ...(provider as WebSearchProvider),
+          apiKey: keyStatuses[keyIndex].key
+        })
+        valid = result.valid
+      }
+
+      setKeyStatuses((prev) =>
+        prev.map((status, idx) => (idx === keyIndex ? { ...status, checking: false, isValid: valid } : status))
+      )
+    } catch (error: unknown) {
+      setKeyStatuses((prev) =>
+        prev.map((status, idx) => (idx === keyIndex ? { ...status, checking: false, isValid: false } : status))
+      )
+    } finally {
+      setIsCheckingSingle(false)
+    }
+  }
+
+  const removeInvalidKeys = () => {
+    setKeyStatuses((prev) => prev.filter((status) => status.isValid !== false))
+  }
+
+  const removeKey = (keyIndex: number) => {
+    setKeyStatuses((prev) => prev.filter((_, idx) => idx !== keyIndex))
+  }
+
+  const onOk = () => {
+    const allKeys = keyStatuses.map((status) => status.key)
+    resolve({ validKeys: allKeys })
+    setOpen(false)
+  }
+
+  const onCancel = () => {
+    setOpen(false)
+  }
+
+  const onClose = () => {
+    resolve({})
+  }
+
+  return (
+    <Modal
+      title={title}
+      open={open}
+      onOk={onOk}
+      onCancel={onCancel}
+      afterClose={onClose}
+      transitionName="animation-move-down"
+      centered
+      maskClosable={false}
+      footer={
+        <Space style={{ display: 'flex', justifyContent: 'space-between' }}>
+          <Space>
+            <Button key="remove" danger onClick={removeInvalidKeys} disabled={isChecking || isCheckingSingle}>
+              {t('settings.provider.remove_invalid_keys')}
+            </Button>
+          </Space>
+          <Space>
+            <Button key="check" type="primary" ghost onClick={checkAllKeys} disabled={isChecking || isCheckingSingle}>
+              {t('settings.provider.check_all_keys')}
+            </Button>
+            <Button key="save" type="primary" onClick={onOk}>
+              {t('common.save')}
+            </Button>
+          </Space>
+        </Space>
+      }>
+      <Scrollbar style={{ maxHeight: '70vh', overflowX: 'hidden' }}>
+        <List
+          dataSource={keyStatuses}
+          renderItem={(status, index) => (
+            <List.Item>
+              <Space style={{ width: '100%', justifyContent: 'space-between' }}>
+                <Typography.Text copyable={{ text: status.key }}>{maskApiKey(status.key)}</Typography.Text>
+                <Space>
+                  {status.checking && (
+                    <Space>
+                      <Spin indicator={<LoadingOutlined style={{ fontSize: 16 }} spin />} />
+                    </Space>
+                  )}
+                  {status.isValid === true && !status.checking && <CheckCircleFilled style={{ color: '#52c41a' }} />}
+                  {status.isValid === false && !status.checking && <CloseCircleFilled style={{ color: '#ff4d4f' }} />}
+                  {status.isValid === undefined && !status.checking && (
+                    <span>{t('settings.provider.not_checked')}</span>
+                  )}
+                  <Button size="small" onClick={() => checkSingleKey(index)} disabled={isChecking || isCheckingSingle}>
+                    {t('settings.provider.check')}
+                  </Button>
+                  <RemoveIcon
+                    onClick={() => !isChecking && !isCheckingSingle && removeKey(index)}
+                    style={{
+                      cursor: isChecking || isCheckingSingle ? 'not-allowed' : 'pointer',
+                      opacity: isChecking || isCheckingSingle ? 0.5 : 1
+                    }}
+                  />
+                </Space>
+              </Space>
+            </List.Item>
+          )}
+        />
+      </Scrollbar>
+    </Modal>
+  )
+}
+
+export default class ApiCheckPopup {
+  static topviewId = 0
+  static hide() {
+    TopView.hide('ApiCheckPopup')
+  }
+  static show(props: ShowParams) {
+    return new Promise<any>((resolve) => {
+      TopView.show(
+        <PopupContainer
+          {...props}
+          resolve={(v) => {
+            resolve(v)
+            this.hide()
+          }}
+        />,
+        'ApiCheckPopup'
+      )
+    })
+  }
+}
+
+const RemoveIcon = styled(MinusCircleOutlined)`
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 18px;
+  color: var(--color-error);
+  cursor: pointer;
+  transition: all 0.2s ease-in-out;
+`
diff --git a/src/renderer/src/pages/settings/ProviderSettings/ApiKeyList.tsx b/src/renderer/src/pages/settings/ProviderSettings/ApiKeyList.tsx
deleted file mode 100644
index def4ba061a..0000000000
--- a/src/renderer/src/pages/settings/ProviderSettings/ApiKeyList.tsx
+++ /dev/null
@@ -1,638 +0,0 @@
-import {
-  CheckCircleFilled,
-  CloseCircleFilled,
-  CloseCircleOutlined,
-  DeleteOutlined,
-  EditOutlined,
-  LoadingOutlined,
-  MinusCircleOutlined,
-  PlusOutlined
-} from '@ant-design/icons'
-import Scrollbar from '@renderer/components/Scrollbar'
-import { isEmbeddingModel, isRerankModel } from '@renderer/config/models'
-import { checkApi, formatApiKeys } from '@renderer/services/ApiService'
-import { isProviderSupportAuth } from '@renderer/services/ProviderService'
-import WebSearchService from '@renderer/services/WebSearchService'
-import { Model, Provider, WebSearchProvider } from '@renderer/types'
-import { maskApiKey, splitApiKeyString } from '@renderer/utils/api'
-import { Button, Card, Flex, Input, List, Space, Spin, Tooltip, Typography } from 'antd'
-import { isEmpty } from 'lodash'
-import { FC, useEffect, useRef, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import styled from 'styled-components'
-
-import SelectProviderModelPopup from './SelectProviderModelPopup'
-
-interface Props {
-  provider: Provider | WebSearchProvider
-  apiKeys: string
-  onChange: (keys: string) => void
-  type?: 'provider' | 'websearch'
-}
-
-interface KeyStatus {
-  key: string
-  isValid?: boolean
-  checking?: boolean
-  error?: string
-  model?: Model
-  latency?: number
-}
-
-const STATUS_COLORS = {
-  success: '#52c41a',
-  error: '#ff4d4f'
-}
-
-const formatAndConvertKeysToArray = (apiKeys: string): KeyStatus[] => {
-  const formattedApiKeys = formatApiKeys(apiKeys)
-  if (formattedApiKeys.includes(',')) {
-    const keys = splitApiKeyString(formattedApiKeys)
-    const uniqueKeys = new Set(keys)
-    return Array.from(uniqueKeys).map((key) => ({ key }))
-  } else {
-    return formattedApiKeys ? [{ key: formattedApiKeys }] : []
-  }
-}
-
-const ApiKeyList: FC<Props> = ({ provider, apiKeys, onChange, type = 'provider' }) => {
-  const [keyStatuses, setKeyStatuses] = useState<KeyStatus[]>(() => formatAndConvertKeysToArray(apiKeys))
-  const [isAddingNew, setIsAddingNew] = useState(false)
-  const [newApiKey, setNewApiKey] = useState('')
-  const [isCancelingNewKey, setIsCancelingNewKey] = useState(false)
-  const newInputRef = useRef<any>(null)
-  const [editingIndex, setEditingIndex] = useState<number | null>(null)
-  const [editValue, setEditValue] = useState('')
-  const editInputRef = useRef<any>(null)
-  const { t } = useTranslation()
-  const [isChecking, setIsChecking] = useState(false)
-  const [isCheckingSingle, setIsCheckingSingle] = useState(false)
-  const [confirmDeleteIndex, setConfirmDeleteIndex] = useState<number | null>(null)
-  const isCopilot = provider.id === 'copilot'
-
-  useEffect(() => {
-    if (isAddingNew && newInputRef.current) {
-      newInputRef.current.focus()
-    }
-  }, [isAddingNew])
-
-  useEffect(() => {
-    const newKeyStatuses = formatAndConvertKeysToArray(apiKeys)
-
-    setKeyStatuses((currentStatuses) => {
-      const newKeys = newKeyStatuses.map((k) => k.key)
-      const currentKeys = currentStatuses.map((k) => k.key)
-
-      // If the keys are the same, no need to update, prevents re-render loops.
-      if (newKeys.join(',') === currentKeys.join(',')) {
-        return currentStatuses
-      }
-
-      // Merge new keys with existing statuses to preserve them.
-      const statusesMap = new Map(currentStatuses.map((s) => [s.key, s]))
-      return newKeyStatuses.map((k) => statusesMap.get(k.key) || k)
-    })
-  }, [apiKeys])
-
-  useEffect(() => {
-    if (editingIndex !== null && editInputRef.current) {
-      editInputRef.current.focus()
-    }
-  }, [editingIndex])
-
-  const handleAddNewKey = () => {
-    setIsCancelingNewKey(false)
-    setIsAddingNew(true)
-    setNewApiKey('')
-  }
-
-  const handleSaveNewKey = () => {
-    if (isCancelingNewKey) {
-      setIsCancelingNewKey(false)
-      return
-    }
-
-    if (newApiKey.trim()) {
-      // Check if the key already exists
-      const keyExists = keyStatuses.some((status) => status.key === newApiKey.trim())
-
-      if (keyExists) {
-        window.message.error({
-          key: 'duplicate-key',
-          style: { marginTop: '3vh' },
-          duration: 3,
-          content: t('settings.provider.key_already_exists')
-        })
-        return
-      }
-
-      if (newApiKey.includes(',')) {
-        window.message.error({
-          key: 'invalid-key',
-          style: { marginTop: '3vh' },
-          duration: 3,
-          content: t('settings.provider.invalid_key')
-        })
-        return
-      }
-
-      const updatedKeyStatuses = [...keyStatuses, { key: newApiKey.trim() }]
-      setKeyStatuses(updatedKeyStatuses)
-      // Update parent component with new keys
-      onChange(updatedKeyStatuses.map((status) => status.key).join(','))
-    }
-
-    // Add a small delay before resetting to prevent immediate re-triggering
-    setTimeout(() => {
-      setIsAddingNew(false)
-      setNewApiKey('')
-    }, 100)
-  }
-
-  const handleCancelNewKey = () => {
-    setIsCancelingNewKey(true)
-    setIsAddingNew(false)
-    setNewApiKey('')
-  }
-
-  const getModelForCheck = async (selectedModel?: Model): Promise<Model | null> => {
-    if (type !== 'provider') return null
-
-    const modelsToCheck = (provider as Provider).models.filter(
-      (model) => !isEmbeddingModel(model) && !isRerankModel(model)
-    )
-
-    if (isEmpty(modelsToCheck)) {
-      window.message.error({
-        key: 'no-models',
-        style: { marginTop: '3vh' },
-        duration: 5,
-        content: t('settings.provider.no_models_for_check')
-      })
-      return null
-    }
-
-    try {
-      return (
-        selectedModel ||
-        (await SelectProviderModelPopup.show({
-          provider: provider as Provider
-        }))
-      )
-    } catch (err) {
-      // User canceled the popup
-      return null
-    }
-  }
-
-  const checkSingleKey = async (keyIndex: number, selectedModel?: Model, isCheckingAll: boolean = false) => {
-    if (isChecking || keyStatuses[keyIndex].checking) {
-      return
-    }
-
-    try {
-      let latency: number
-      let model: Model | undefined
-
-      if (type === 'provider') {
-        const selectedModelForCheck = await getModelForCheck(selectedModel)
-        if (!selectedModelForCheck) {
-          setKeyStatuses((prev) =>
-            prev.map((status, idx) => (idx === keyIndex ? { ...status, checking: false } : status))
-          )
-          setIsCheckingSingle(false)
-          return
-        }
-        model = selectedModelForCheck
-
-        setIsCheckingSingle(true)
-        setKeyStatuses((prev) => prev.map((status, idx) => (idx === keyIndex ? { ...status, checking: true } : status)))
-
-        const startTime = Date.now()
-        await checkApi({ ...(provider as Provider), apiKey: keyStatuses[keyIndex].key }, model)
-        latency = Date.now() - startTime
-      } else {
-        setIsCheckingSingle(true)
-        setKeyStatuses((prev) => prev.map((status, idx) => (idx === keyIndex ? { ...status, checking: true } : status)))
-
-        const startTime = Date.now()
-        await WebSearchService.checkSearch({
-          ...(provider as WebSearchProvider),
-          apiKey: keyStatuses[keyIndex].key
-        })
-        latency = Date.now() - startTime
-      }
-
-      // Only show notification when checking a single key
-      if (!isCheckingAll) {
-        window.message.success({
-          key: 'api-check',
-          style: { marginTop: '3vh' },
-          duration: 2,
-          content: t('message.api.connection.success')
-        })
-      }
-
-      setKeyStatuses((prev) =>
-        prev.map((status, idx) =>
-          idx === keyIndex
-            ? {
-                ...status,
-                checking: false,
-                isValid: true,
-                model: selectedModel || model,
-                latency
-              }
-            : status
-        )
-      )
-    } catch (error: any) {
-      // Only show notification when checking a single key
-      if (!isCheckingAll) {
-        const errorMessage = error?.message ? ' ' + error.message : ''
-        window.message.error({
-          key: 'api-check',
-          style: { marginTop: '3vh' },
-          duration: 8,
-          content: t('message.api.connection.failed') + errorMessage
-        })
-      }
-
-      setKeyStatuses((prev) =>
-        prev.map((status, idx) =>
-          idx === keyIndex
-            ? {
-                ...status,
-                checking: false,
-                isValid: false,
-                error: error instanceof Error ? error.message : String(error)
-              }
-            : status
-        )
-      )
-    } finally {
-      setIsCheckingSingle(false)
-    }
-  }
-
-  const checkAllKeys = async () => {
-    setIsChecking(true)
-
-    try {
-      let selectedModel
-      if (type === 'provider') {
-        selectedModel = await getModelForCheck()
-        if (!selectedModel) {
-          return
-        }
-      }
-
-      await Promise.all(keyStatuses.map((_, index) => checkSingleKey(index, selectedModel, true)))
-    } finally {
-      setIsChecking(false)
-    }
-  }
-
-  const removeInvalidKeys = () => {
-    const updatedKeyStatuses = keyStatuses.filter((status) => status.isValid !== false)
-    setKeyStatuses(updatedKeyStatuses)
-    onChange(updatedKeyStatuses.map((status) => status.key).join(','))
-  }
-
-  const removeKey = (keyIndex: number) => {
-    if (confirmDeleteIndex === keyIndex) {
-      // Second click - actually remove the key
-      const updatedKeyStatuses = keyStatuses.filter((_, idx) => idx !== keyIndex)
-      setKeyStatuses(updatedKeyStatuses)
-      onChange(updatedKeyStatuses.map((status) => status.key).join(','))
-      setConfirmDeleteIndex(null)
-    } else {
-      // First click - show confirmation state
-      setConfirmDeleteIndex(keyIndex)
-      // Auto-reset after 3 seconds
-      setTimeout(() => {
-        setConfirmDeleteIndex(null)
-      }, 3000)
-    }
-  }
-
-  const renderKeyCheckResultTooltip = (status: KeyStatus) => {
-    if (status.checking) {
-      return t('settings.models.check.checking')
-    }
-
-    const statusTitle = status.isValid ? t('settings.models.check.passed') : t('settings.models.check.failed')
-    const statusColor = status.isValid ? STATUS_COLORS.success : STATUS_COLORS.error
-
-    return (
-      <div style={{ maxHeight: '200px', overflowY: 'auto', maxWidth: '300px', wordWrap: 'break-word' }}>
-        <strong style={{ color: statusColor }}>{statusTitle}</strong>
-        {type === 'provider' && status.model && (
-          <div style={{ marginTop: 5 }}>
-            {t('common.model')}: {status.model.name}
-          </div>
-        )}
-        {status.latency && status.isValid && (
-          <div style={{ marginTop: 5 }}>
-            {t('settings.provider.check_tooltip.latency')}: {(status.latency / 1000).toFixed(2)}s
-          </div>
-        )}
-        {status.error && <div style={{ marginTop: 5 }}>{status.error}</div>}
-      </div>
-    )
-  }
-
-  const shouldAutoFocus = () => {
-    if (type === 'provider') {
-      return (provider as Provider).enabled && apiKeys === '' && !isProviderSupportAuth(provider as Provider)
-    } else if (type === 'websearch') {
-      return apiKeys === ''
-    }
-    return false
-  }
-
-  const handleEditKey = (index: number) => {
-    setEditingIndex(index)
-    setEditValue(keyStatuses[index].key)
-  }
-
-  const handleSaveEdit = () => {
-    if (editingIndex === null) return
-
-    if (editValue.trim()) {
-      const keyExists = keyStatuses.some((status, idx) => idx !== editingIndex && status.key === editValue.trim())
-
-      if (keyExists) {
-        window.message.error({
-          key: 'duplicate-key',
-          style: { marginTop: '3vh' },
-          duration: 3,
-          content: t('settings.provider.key_already_exists')
-        })
-        return
-      }
-
-      if (editValue.includes(',')) {
-        window.message.error({
-          key: 'invalid-key',
-          style: { marginTop: '3vh' },
-          duration: 3,
-          content: t('settings.provider.invalid_key')
-        })
-        return
-      }
-
-      const updatedKeyStatuses = [...keyStatuses]
-      updatedKeyStatuses[editingIndex] = {
-        ...updatedKeyStatuses[editingIndex],
-        key: editValue.trim(),
-        isValid: undefined
-      }
-
-      setKeyStatuses(updatedKeyStatuses)
-      onChange(updatedKeyStatuses.map((status) => status.key).join(','))
-    }
-
-    // Add a small delay before resetting to prevent immediate re-triggering
-    setTimeout(() => {
-      setEditingIndex(null)
-      setEditValue('')
-    }, 100)
-  }
-
-  const handleCancelEdit = () => {
-    setEditingIndex(null)
-    setEditValue('')
-  }
-
-  return (
-    <>
-      <Card
-        size="small"
-        type="inner"
-        styles={{ body: { padding: 0 } }}
-        style={{ marginBottom: '10px', border: '0.5px solid var(--color-border)' }}>
-        {keyStatuses.length === 0 && !isAddingNew ? (
-          <Typography.Text type="secondary" style={{ padding: '4px 11px', display: 'block' }}>
-            {t('error.no_api_key')}
-          </Typography.Text>
-        ) : (
-          <>
-            {keyStatuses.length > 0 && (
-              <Scrollbar style={{ maxHeight: '50vh', overflowX: 'hidden' }}>
-                <List
-                  size="small"
-                  dataSource={keyStatuses}
-                  renderItem={(status, index) => (
-                    <List.Item style={{ padding: '4px 11px' }}>
-                      <ApiKeyListItem>
-                        <ApiKeyContainer>
-                          {editingIndex === index ? (
-                            <Input.Password
-                              ref={editInputRef}
-                              value={editValue}
-                              onChange={(e) => setEditValue(e.target.value)}
-                              onBlur={handleSaveEdit}
-                              onPressEnter={handleSaveEdit}
-                              onKeyDown={(e) => {
-                                if (e.key === 'Escape') {
-                                  e.preventDefault()
-                                  handleCancelEdit()
-                                }
-                              }}
-                              style={{ width: '100%', fontSize: '14px' }}
-                              spellCheck={false}
-                              type="password"
-                            />
-                          ) : (
-                            <Typography.Text copyable={{ text: status.key }}>{maskApiKey(status.key)}</Typography.Text>
-                          )}
-                        </ApiKeyContainer>
-                        <ApiKeyActions>
-                          {editingIndex === index ? (
-                            <CloseCircleOutlined
-                              onClick={handleCancelEdit}
-                              title={t('common.cancel')}
-                              style={{
-                                cursor: 'pointer',
-                                fontSize: '16px',
-                                color: 'var(--color-error)'
-                              }}
-                            />
-                          ) : (
-                            <>
-                              <Tooltip title={renderKeyCheckResultTooltip(status)}>
-                                {status.checking && (
-                                  <Space>
-                                    <Spin indicator={<LoadingOutlined style={{ fontSize: 16 }} spin />} />
-                                  </Space>
-                                )}
-                                {status.isValid === true && !status.checking && (
-                                  <CheckCircleFilled style={{ color: STATUS_COLORS.success }} />
-                                )}
-                                {status.isValid === false && !status.checking && (
-                                  <CloseCircleFilled style={{ color: STATUS_COLORS.error }} />
-                                )}
-                              </Tooltip>
-                              <Button
-                                size="small"
-                                onClick={() => checkSingleKey(index)}
-                                disabled={isChecking || isCheckingSingle || isCopilot}>
-                                {t('settings.provider.check')}
-                              </Button>
-                              {!isCopilot && (
-                                <>
-                                  <EditOutlined
-                                    onClick={() => !isChecking && !isCheckingSingle && handleEditKey(index)}
-                                    style={{
-                                      cursor: isChecking || isCheckingSingle ? 'not-allowed' : 'pointer',
-                                      opacity: isChecking || isCheckingSingle ? 0.5 : 1,
-                                      fontSize: '16px'
-                                    }}
-                                    title={t('common.edit')}
-                                  />
-                                  {confirmDeleteIndex === index ? (
-                                    <DeleteOutlined
-                                      onClick={() => !isChecking && !isCheckingSingle && removeKey(index)}
-                                      style={{
-                                        cursor: isChecking || isCheckingSingle ? 'not-allowed' : 'pointer',
-                                        opacity: isChecking || isCheckingSingle ? 0.5 : 1,
-                                        fontSize: '16px',
-                                        color: 'var(--color-error)'
-                                      }}
-                                      title={t('common.delete')}
-                                    />
-                                  ) : (
-                                    <MinusCircleOutlined
-                                      onClick={() => !isChecking && !isCheckingSingle && removeKey(index)}
-                                      style={{
-                                        cursor: isChecking || isCheckingSingle ? 'not-allowed' : 'pointer',
-                                        opacity: isChecking || isCheckingSingle ? 0.5 : 1,
-                                        fontSize: '16px',
-                                        color: 'var(--color-error)'
-                                      }}
-                                      title={t('common.delete')}
-                                    />
-                                  )}
-                                </>
-                              )}
-                            </>
-                          )}
-                        </ApiKeyActions>
-                      </ApiKeyListItem>
-                    </List.Item>
-                  )}
-                />
-              </Scrollbar>
-            )}
-            {isAddingNew && (
-              <List.Item style={{ padding: '4px 11px' }}>
-                <ApiKeyListItem>
-                  <Input.Password
-                    ref={newInputRef}
-                    value={newApiKey}
-                    onChange={(e) => setNewApiKey(e.target.value)}
-                    placeholder={t('settings.provider.enter_new_api_key')}
-                    style={{ width: '60%', fontSize: '14px' }}
-                    onPressEnter={handleSaveNewKey}
-                    onBlur={handleSaveNewKey}
-                    onKeyDown={(e) => {
-                      if (e.key === 'Escape') {
-                        e.preventDefault()
-                        handleCancelNewKey()
-                      }
-                    }}
-                    spellCheck={false}
-                    type="password"
-                  />
-                  <ApiKeyActions>
-                    <CloseCircleOutlined
-                      onMouseDown={handleCancelNewKey}
-                      title={t('common.cancel')}
-                      style={{
-                        cursor: isChecking || isCheckingSingle ? 'not-allowed' : 'pointer',
-                        opacity: isChecking || isCheckingSingle ? 0.5 : 1,
-                        fontSize: '16px',
-                        color: 'var(--color-error)'
-                      }}
-                    />
-                  </ApiKeyActions>
-                </ApiKeyListItem>
-              </List.Item>
-            )}
-          </>
-        )}
-      </Card>
-
-      <Flex gap={10} justify="space-between" style={{ marginTop: '8px' }}>
-        {!isCopilot && (
-          <>
-            <Space>
-              <Button
-                key="add"
-                type="primary"
-                onClick={editingIndex !== null ? handleSaveEdit : isAddingNew ? handleSaveNewKey : handleAddNewKey}
-                icon={<PlusOutlined />}
-                autoFocus={shouldAutoFocus()}>
-                {editingIndex !== null || isAddingNew ? t('common.save') : t('common.add')}
-              </Button>
-            </Space>
-            {keyStatuses.length > 1 && (
-              <Space>
-                <Button key="check" type="default" onClick={checkAllKeys} disabled={isChecking || isCheckingSingle}>
-                  {t('settings.provider.check_all_keys')}
-                </Button>
-                <Button
-                  key="remove"
-                  type="default"
-                  danger
-                  onClick={removeInvalidKeys}
-                  disabled={isChecking || isCheckingSingle}>
-                  {t('settings.provider.remove_invalid_keys')}
-                </Button>
-              </Space>
-            )}
-          </>
-        )}
-      </Flex>
-    </>
-  )
-}
-
-// Styled components for the list items
-const ApiKeyListItem = styled.div`
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-  padding: 0;
-  margin: 0;
-`
-
-const ApiKeyContainer = styled.div`
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-`
-
-const ApiKeyActions = styled.div`
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  gap: 10px;
-
-  @keyframes pulse {
-    0% {
-      opacity: 1;
-    }
-    50% {
-      opacity: 0.5;
-    }
-    100% {
-      opacity: 1;
-    }
-  }
-`
-
-export default ApiKeyList
diff --git a/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx b/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx
index f708b28679..74a414d81c 100644
--- a/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx
+++ b/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx
@@ -1,11 +1,14 @@
+import { CheckOutlined, LoadingOutlined } from '@ant-design/icons'
 import { isOpenAIProvider } from '@renderer/aiCore/clients/ApiClientFactory'
 import OpenAIAlert from '@renderer/components/Alert/OpenAIAlert'
 import { StreamlineGoodHealthAndWellBeing } from '@renderer/components/Icons/SVGIcon'
 import { HStack } from '@renderer/components/Layout'
-import { isRerankModel } from '@renderer/config/models'
+import { isEmbeddingModel, isRerankModel } from '@renderer/config/models'
 import { PROVIDER_CONFIG } from '@renderer/config/providers'
 import { useTheme } from '@renderer/context/ThemeProvider'
 import { useAllProviders, useProvider, useProviders } from '@renderer/hooks/useProvider'
+import i18n from '@renderer/i18n'
+import { checkApi, formatApiKeys } from '@renderer/services/ApiService'
 import { checkModelsHealth, getModelCheckSummary } from '@renderer/services/HealthCheckService'
 import { isProviderSupportAuth } from '@renderer/services/ProviderService'
 import { Provider } from '@renderer/types'
@@ -13,7 +16,7 @@ import { formatApiHost, splitApiKeyString } from '@renderer/utils/api'
 import { lightbulbVariants } from '@renderer/utils/motionVariants'
 import { Button, Divider, Flex, Input, Space, Switch, Tooltip } from 'antd'
 import Link from 'antd/es/typography/Link'
-import { isEmpty } from 'lodash'
+import { debounce, isEmpty } from 'lodash'
 import { Settings2, SquareArrowOutUpRight } from 'lucide-react'
 import { motion } from 'motion/react'
 import { FC, useCallback, useDeferredValue, useEffect, useState } from 'react'
@@ -28,7 +31,7 @@ import {
   SettingSubtitle,
   SettingTitle
 } from '..'
-import ApiKeyList from './ApiKeyList'
+import ApiCheckPopup from './ApiCheckPopup'
 import DMXAPISettings from './DMXAPISettings'
 import GithubCopilotSettings from './GithubCopilotSettings'
 import GPUStackSettings from './GPUStackSettings'
@@ -38,6 +41,7 @@ import ModelList, { ModelStatus } from './ModelList'
 import ModelListSearchBar from './ModelListSearchBar'
 import ProviderOAuth from './ProviderOAuth'
 import ProviderSettingsPopup from './ProviderSettingsPopup'
+import SelectProviderModelPopup from './SelectProviderModelPopup'
 import VertexAISettings from './VertexAISettings'
 
 interface Props {
@@ -51,11 +55,14 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
   const [apiKey, setApiKey] = useState(provider.apiKey)
   const [apiHost, setApiHost] = useState(provider.apiHost)
   const [apiVersion, setApiVersion] = useState(provider.apiVersion)
+  const [apiValid, setApiValid] = useState(false)
+  const [apiChecking, setApiChecking] = useState(false)
   const [modelSearchText, setModelSearchText] = useState('')
   const deferredModelSearchText = useDeferredValue(modelSearchText)
   const { updateProvider, models } = useProvider(provider.id)
   const { t } = useTranslation()
   const { theme } = useTheme()
+  const [inputValue, setInputValue] = useState(apiKey)
 
   const isAzureOpenAI = provider.id === 'azure-openai' || provider.type === 'azure-openai'
 
@@ -69,6 +76,14 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
   const [modelStatuses, setModelStatuses] = useState<ModelStatus[]>([])
   const [isHealthChecking, setIsHealthChecking] = useState(false)
 
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const debouncedSetApiKey = useCallback(
+    debounce((value) => {
+      setApiKey(formatApiKeys(value))
+    }, 100),
+    []
+  )
+
   const moveProviderToTop = useCallback(
     (providerId: string) => {
       const reorderedProviders = [...allProviders]
@@ -84,6 +99,12 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
     [allProviders, updateProviders]
   )
 
+  const onUpdateApiKey = () => {
+    if (apiKey !== provider.apiKey) {
+      updateProvider({ ...provider, apiKey })
+    }
+  }
+
   const onUpdateApiHost = () => {
     if (apiHost.trim()) {
       updateProvider({ ...provider, apiHost })
@@ -92,11 +113,6 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
     }
   }
 
-  const handleApiKeyChange = (newApiKey: string) => {
-    setApiKey(newApiKey)
-    updateProvider({ ...provider, apiKey: newApiKey })
-  }
-
   const onUpdateApiVersion = () => updateProvider({ ...provider, apiVersion })
 
   const onHealthCheck = async () => {
@@ -176,6 +192,75 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
     setIsHealthChecking(false)
   }
 
+  const onCheckApi = async () => {
+    const modelsToCheck = models.filter((model) => !isEmbeddingModel(model) && !isRerankModel(model))
+
+    if (isEmpty(modelsToCheck)) {
+      window.message.error({
+        key: 'no-models',
+        style: { marginTop: '3vh' },
+        duration: 5,
+        content: t('settings.provider.no_models_for_check')
+      })
+      return
+    }
+
+    const model = await SelectProviderModelPopup.show({ provider })
+
+    if (!model) {
+      window.message.error({ content: i18n.t('message.error.enter.model'), key: 'api-check' })
+      return
+    }
+
+    if (apiKey.includes(',')) {
+      const keys = splitApiKeyString(apiKey)
+
+      const result = await ApiCheckPopup.show({
+        title: t('settings.provider.check_multiple_keys'),
+        provider: { ...provider, apiHost },
+        model,
+        apiKeys: keys,
+        type: 'provider'
+      })
+
+      if (result?.validKeys) {
+        const newApiKey = result.validKeys.join(',')
+        setInputValue(newApiKey)
+        setApiKey(newApiKey)
+        updateProvider({ ...provider, apiKey: newApiKey })
+      }
+    } else {
+      setApiChecking(true)
+
+      try {
+        await checkApi({ ...provider, apiKey, apiHost }, model)
+
+        window.message.success({
+          key: 'api-check',
+          style: { marginTop: '3vh' },
+          duration: 2,
+          content: i18n.t('message.api.connection.success')
+        })
+
+        setApiValid(true)
+        setTimeout(() => setApiValid(false), 3000)
+      } catch (error: any) {
+        const errorMessage = error?.message ? ' ' + error.message : ''
+
+        window.message.error({
+          key: 'api-check',
+          style: { marginTop: '3vh' },
+          duration: 8,
+          content: i18n.t('message.api.connection.failed') + errorMessage
+        })
+
+        setApiValid(false)
+      } finally {
+        setApiChecking(false)
+      }
+    }
+  }
+
   const onReset = () => {
     setApiHost(configedApiHost)
     updateProvider({ ...provider, apiHost: configedApiHost })
@@ -244,6 +329,7 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
           provider={provider}
           setApiKey={(v) => {
             setApiKey(v)
+            setInputValue(v)
             updateProvider({ ...provider, apiKey: v })
           }}
         />
@@ -252,14 +338,35 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
       {isDmxapi && <DMXAPISettings provider={provider} setApiKey={setApiKey} />}
       {provider.id !== 'vertexai' && (
         <>
-          <SettingSubtitle style={{ marginBottom: 5 }}>
-            <Space align="center" style={{ width: '100%', justifyContent: 'space-between' }}>
-              <SettingSubtitle style={{ marginTop: 0 }}>{t('settings.provider.api_key')}</SettingSubtitle>
-            </Space>
-          </SettingSubtitle>
-          <ApiKeyList provider={provider} apiKeys={apiKey} onChange={handleApiKeyChange} type="provider" />
+          <SettingSubtitle style={{ marginTop: 5 }}>{t('settings.provider.api_key')}</SettingSubtitle>
+          <Space.Compact style={{ width: '100%', marginTop: 5 }}>
+            <Input.Password
+              value={inputValue}
+              placeholder={t('settings.provider.api_key')}
+              onChange={(e) => {
+                setInputValue(e.target.value)
+                debouncedSetApiKey(e.target.value)
+              }}
+              onBlur={() => {
+                const formattedValue = formatApiKeys(inputValue)
+                setInputValue(formattedValue)
+                setApiKey(formattedValue)
+                onUpdateApiKey()
+              }}
+              spellCheck={false}
+              autoFocus={provider.enabled && apiKey === '' && !isProviderSupportAuth(provider)}
+              disabled={provider.id === 'copilot'}
+            />
+            <Button
+              type={apiValid ? 'primary' : 'default'}
+              ghost={apiValid}
+              onClick={onCheckApi}
+              disabled={!apiHost || apiChecking}>
+              {apiChecking ? <LoadingOutlined spin /> : apiValid ? <CheckOutlined /> : t('settings.provider.check')}
+            </Button>
+          </Space.Compact>
           {apiKeyWebsite && (
-            <SettingHelpTextRow style={{ justifyContent: 'space-between', marginTop: '10px' }}>
+            <SettingHelpTextRow style={{ justifyContent: 'space-between' }}>
               <HStack>
                 {!isDmxapi && (
                   <SettingHelpLink target="_blank" href={apiKeyWebsite}>
@@ -267,6 +374,7 @@ const ProviderSetting: FC<Props> = ({ provider: _provider }) => {
                   </SettingHelpLink>
                 )}
               </HStack>
+              <SettingHelpText>{t('settings.provider.api_key.tip')}</SettingHelpText>
             </SettingHelpTextRow>
           )}
           {!isDmxapi && (
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSetting.tsx b/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSetting.tsx
index 97d01d4f5e..44a3f01714 100644
--- a/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSetting.tsx
+++ b/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSetting.tsx
@@ -1,17 +1,19 @@
-import { ExportOutlined } from '@ant-design/icons'
+import { CheckOutlined, ExportOutlined, LoadingOutlined } from '@ant-design/icons'
 import { getWebSearchProviderLogo, WEB_SEARCH_PROVIDER_CONFIG } from '@renderer/config/webSearchProviders'
 import { useWebSearchProvider } from '@renderer/hooks/useWebSearchProviders'
+import { formatApiKeys } from '@renderer/services/ApiService'
+import WebSearchService from '@renderer/services/WebSearchService'
 import { WebSearchProvider } from '@renderer/types'
 import { hasObjectKey } from '@renderer/utils'
-import { Divider, Flex, Form, Input, Tooltip } from 'antd'
+import { Button, Divider, Flex, Form, Input, Tooltip } from 'antd'
 import Link from 'antd/es/typography/Link'
 import { Info } from 'lucide-react'
 import { FC, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
-import { SettingDivider, SettingHelpLink, SettingHelpTextRow, SettingSubtitle, SettingTitle } from '..'
-import ApiKeyList from '../ProviderSettings/ApiKeyList'
+import { SettingDivider, SettingHelpLink, SettingHelpText, SettingHelpTextRow, SettingSubtitle, SettingTitle } from '..'
+import ApiCheckPopup from '../ProviderSettings/ApiCheckPopup'
 
 interface Props {
   provider: WebSearchProvider
@@ -22,16 +24,19 @@ const WebSearchProviderSetting: FC<Props> = ({ provider: _provider }) => {
   const { t } = useTranslation()
   const [apiKey, setApiKey] = useState(provider.apiKey || '')
   const [apiHost, setApiHost] = useState(provider.apiHost || '')
+  const [apiChecking, setApiChecking] = useState(false)
   const [basicAuthUsername, setBasicAuthUsername] = useState(provider.basicAuthUsername || '')
   const [basicAuthPassword, setBasicAuthPassword] = useState(provider.basicAuthPassword || '')
+  const [apiValid, setApiValid] = useState(false)
 
   const webSearchProviderConfig = WEB_SEARCH_PROVIDER_CONFIG[provider.id]
   const apiKeyWebsite = webSearchProviderConfig?.websites?.apiKey
   const officialWebsite = webSearchProviderConfig?.websites?.official
 
-  const handleApiKeyChange = (newApiKey: string) => {
-    setApiKey(newApiKey)
-    updateProvider({ ...provider, apiKey: newApiKey })
+  const onUpdateApiKey = () => {
+    if (apiKey !== provider.apiKey) {
+      updateProvider({ ...provider, apiKey })
+    }
   }
 
   const onUpdateApiHost = () => {
@@ -66,6 +71,65 @@ const WebSearchProviderSetting: FC<Props> = ({ provider: _provider }) => {
     }
   }
 
+  async function checkSearch() {
+    if (!provider) {
+      window.message.error({
+        content: t('settings.websearch.no_provider_selected'),
+        duration: 3,
+        icon: <Info size={18} />,
+        key: 'no-provider-selected'
+      })
+      return
+    }
+
+    if (apiKey.includes(',')) {
+      const keys = apiKey
+        .split(',')
+        .map((k) => k.trim())
+        .filter((k) => k)
+
+      const result = await ApiCheckPopup.show({
+        title: t('settings.provider.check_multiple_keys'),
+        provider: { ...provider, apiHost },
+        apiKeys: keys,
+        type: 'websearch'
+      })
+
+      if (result?.validKeys) {
+        setApiKey(result.validKeys.join(','))
+        updateProvider({ ...provider, apiKey: result.validKeys.join(',') })
+      }
+      return
+    }
+
+    try {
+      setApiChecking(true)
+      const { valid, error } = await WebSearchService.checkSearch(provider)
+
+      const errorMessage = error && error?.message ? ' ' + error?.message : ''
+      window.message[valid ? 'success' : 'error']({
+        key: 'api-check',
+        style: { marginTop: '3vh' },
+        duration: valid ? 2 : 8,
+        content: valid ? t('settings.websearch.check_success') : t('settings.websearch.check_failed') + errorMessage
+      })
+
+      setApiValid(valid)
+    } catch (err) {
+      console.error('Check search error:', err)
+      setApiValid(false)
+      window.message.error({
+        key: 'check-search-error',
+        style: { marginTop: '3vh' },
+        duration: 8,
+        content: t('settings.websearch.check_failed')
+      })
+    } finally {
+      setApiChecking(false)
+      setTimeout(() => setApiValid(false), 2500)
+    }
+  }
+
   useEffect(() => {
     setApiKey(provider.apiKey ?? '')
     setApiHost(provider.apiHost ?? '')
@@ -90,14 +154,30 @@ const WebSearchProviderSetting: FC<Props> = ({ provider: _provider }) => {
       {hasObjectKey(provider, 'apiKey') && (
         <>
           <SettingSubtitle style={{ marginTop: 5, marginBottom: 10 }}>{t('settings.provider.api_key')}</SettingSubtitle>
-          <ApiKeyList provider={provider} apiKeys={apiKey} onChange={handleApiKeyChange} type="websearch" />
-          {apiKeyWebsite && (
-            <SettingHelpTextRow style={{ justifyContent: 'space-between', marginTop: 5 }}>
-              <SettingHelpLink target="_blank" href={apiKeyWebsite}>
-                {t('settings.websearch.get_api_key')}
-              </SettingHelpLink>
-            </SettingHelpTextRow>
-          )}
+          <Flex gap={8}>
+            <Input.Password
+              value={apiKey}
+              placeholder={t('settings.provider.api_key')}
+              onChange={(e) => setApiKey(formatApiKeys(e.target.value))}
+              onBlur={onUpdateApiKey}
+              spellCheck={false}
+              type="password"
+              autoFocus={apiKey === ''}
+            />
+            <Button
+              ghost={apiValid}
+              type={apiValid ? 'primary' : 'default'}
+              onClick={checkSearch}
+              disabled={apiChecking}>
+              {apiChecking ? <LoadingOutlined spin /> : apiValid ? <CheckOutlined /> : t('settings.websearch.check')}
+            </Button>
+          </Flex>
+          <SettingHelpTextRow style={{ justifyContent: 'space-between', marginTop: 5 }}>
+            <SettingHelpLink target="_blank" href={apiKeyWebsite}>
+              {t('settings.websearch.get_api_key')}
+            </SettingHelpLink>
+            <SettingHelpText>{t('settings.provider.api_key.tip')}</SettingHelpText>
+          </SettingHelpTextRow>
         </>
       )}
       {hasObjectKey(provider, 'apiHost') && (

From 64b01cce47b234d0f11e9492d275e996e843aa21 Mon Sep 17 00:00:00 2001
From: Teo <cheesen.xu@gmail.com>
Date: Wed, 25 Jun 2025 14:34:18 +0800
Subject: [PATCH 27/75] =?UTF-8?q?feat:=20=20=E4=B8=80=E4=BA=9BUI=E4=B8=8A?=
 =?UTF-8?q?=E7=9A=84=E4=BC=98=E5=8C=96=E5=92=8C=E9=87=8D=E6=9E=84=20(#7479?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 调整AntdProvider中主题配置，包括颜色、尺寸
- 重构聊天气泡模式的样式
- 重构多选模式的样式
- 添加Selector组件取代ant Select组件
- 重构消息搜索弹窗界面
- 重构知识库搜索弹窗界面
- 优化其他弹框UI
---
 src/renderer/src/assets/styles/ant.scss       | 214 +++++-----------
 src/renderer/src/assets/styles/color.scss     |  14 +-
 src/renderer/src/assets/styles/index.scss     |  71 +++---
 src/renderer/src/assets/styles/markdown.scss  |  28 ++-
 .../components/CodeBlockView/CodePreview.tsx  |   6 +-
 .../src/components/CodeBlockView/index.tsx    |   5 +
 .../src/components/CodeEditor/index.tsx       |   6 +-
 .../src/components/ContextMenu/index.tsx      | 106 +++-----
 .../src/components/CustomCollapse.tsx         |   9 +
 .../src/components/EditableNumber/index.tsx   | 114 +++++++++
 .../components/Popups/MultiSelectionPopup.tsx |  68 +++--
 .../src/components/Popups/SearchPopup.tsx     |  13 +-
 .../Popups/SelectModelPopup/popup.tsx         |   7 +-
 .../src/components/Scrollbar/index.tsx        |   6 +-
 src/renderer/src/components/Selector.tsx      | 192 ++++++++++++++
 src/renderer/src/context/AntdProvider.tsx     |  55 +++-
 src/renderer/src/i18n/locales/en-us.json      |   1 +
 src/renderer/src/i18n/locales/ja-jp.json      |   1 +
 src/renderer/src/i18n/locales/ru-ru.json      |   1 +
 src/renderer/src/i18n/locales/zh-cn.json      |   1 +
 src/renderer/src/i18n/locales/zh-tw.json      |   1 +
 .../pages/agents/components/AddAgentPopup.tsx |   4 +-
 .../agents/components/ImportAgentPopup.tsx    |  20 +-
 .../src/pages/history/HistoryPage.tsx         | 102 ++++----
 .../history/components/SearchMessage.tsx      |  21 +-
 .../history/components/SearchResults.tsx      |   3 +-
 .../history/components/TopicMessages.tsx      |  17 +-
 .../history/components/TopicsHistory.tsx      |   3 +-
 src/renderer/src/pages/home/Chat.tsx          |   3 +-
 .../src/pages/home/Inputbar/Inputbar.tsx      |  60 ++---
 .../src/pages/home/Inputbar/TokenCount.tsx    |   2 +-
 .../pages/home/Markdown/CitationTooltip.tsx   |   3 +-
 .../src/pages/home/Markdown/CodeBlock.tsx     |   2 +-
 .../__tests__/CitationTooltip.test.tsx        |   2 +-
 .../CitationTooltip.test.tsx.snap             |   2 +-
 .../pages/home/Messages/Blocks/ImageBlock.tsx |   5 +-
 .../home/Messages/Blocks/ThinkingBlock.tsx    |  10 +-
 .../src/pages/home/Messages/Blocks/index.tsx  |  12 +-
 .../src/pages/home/Messages/CitationsList.tsx | 137 ++++++----
 .../src/pages/home/Messages/Message.tsx       | 138 +++--------
 .../pages/home/Messages/MessageAnchorLine.tsx |  32 ++-
 .../src/pages/home/Messages/MessageEditor.tsx |   3 +-
 .../src/pages/home/Messages/MessageGroup.tsx  | 223 ++++++++---------
 .../home/Messages/MessageGroupMenuBar.tsx     |   9 +-
 .../home/Messages/MessageGroupSettings.tsx    |  19 +-
 .../src/pages/home/Messages/MessageHeader.tsx | 128 +++++-----
 .../pages/home/Messages/MessageMenubar.tsx    |   3 +-
 .../src/pages/home/Messages/Messages.tsx      |  43 ++--
 .../src/pages/home/Messages/NarrowLayout.tsx  |   6 +-
 .../src/pages/home/Messages/Prompt.tsx        |   4 +-
 .../src/pages/home/Tabs/SettingsTab.tsx       | 119 ++++-----
 .../Tabs/components/OpenAISettingsGroup.tsx   |   6 +-
 .../components/AddKnowledgePopup.tsx          |  24 +-
 .../components/KnowledgeSearchPopup.tsx       | 199 +++++++++------
 .../components/KnowledgeSettingsPopup.tsx     |  46 ++--
 .../AssistantKnowledgeBaseSettings.tsx        |   3 +-
 .../AssistantModelSettings.tsx                | 234 +++++++++++-------
 .../AssistantPromptSettings.tsx               |   2 +-
 .../settings/AssistantSettings/index.tsx      |  16 +-
 .../AgentsSubscribeUrlSettings.tsx            |   1 -
 .../settings/DataSettings/JoplinSettings.tsx  |  19 +-
 .../settings/DataSettings/NotionSettings.tsx  |  21 +-
 .../DataSettings/NutstoreSettings.tsx         |  32 ++-
 .../settings/DataSettings/SiyuanSettings.tsx  |  19 +-
 .../settings/DataSettings/WebDavSettings.tsx  |  57 +++--
 .../settings/DataSettings/YuqueSettings.tsx   |  19 +-
 .../DisplaySettings/DisplaySettings.tsx       |   8 +-
 .../src/pages/settings/GeneralSettings.tsx    |  96 +++----
 .../DefaultAssistantSettings.tsx              |  24 +-
 .../ProviderSettings/AddModelPopup.tsx        |   2 +-
 .../ProviderSettings/EditModelsPopup.tsx      |  10 +-
 .../ProviderSettings/ModelEditContent.tsx     |  49 ++--
 .../WebSearchSettings/AddSubscribePopup.tsx   |   8 +-
 .../settings/WebSearchSettings/index.tsx      |   6 +-
 .../src/pages/translate/TranslatePage.tsx     |   7 +-
 .../windows/mini/chat/components/Message.tsx  |   1 -
 76 files changed, 1637 insertions(+), 1326 deletions(-)
 create mode 100644 src/renderer/src/components/EditableNumber/index.tsx
 create mode 100644 src/renderer/src/components/Selector.tsx

diff --git a/src/renderer/src/assets/styles/ant.scss b/src/renderer/src/assets/styles/ant.scss
index ebe45ef5c6..225cbe8a9d 100644
--- a/src/renderer/src/assets/styles/ant.scss
+++ b/src/renderer/src/assets/styles/ant.scss
@@ -58,166 +58,80 @@
   }
 }
 
-.mention-models-dropdown {
-  &.ant-dropdown {
-    background: rgba(var(--color-base-rgb), 0.65) !important;
-    backdrop-filter: blur(35px) saturate(150%) !important;
-    animation-duration: 0.15s !important;
-  }
-
-  /* 移动其他样式到 mention-models-dropdown 类下 */
-  .ant-slide-up-enter .ant-dropdown-menu,
-  .ant-slide-up-appear .ant-dropdown-menu,
-  .ant-slide-up-leave .ant-dropdown-menu,
-  .ant-slide-up-enter-active .ant-dropdown-menu,
-  .ant-slide-up-appear-active .ant-dropdown-menu,
-  .ant-slide-up-leave-active .ant-dropdown-menu {
-    background: rgba(var(--color-base-rgb), 0.65) !important;
-    backdrop-filter: blur(35px) saturate(150%) !important;
-  }
-
-  .ant-dropdown-menu {
-    /* 保持原有的下拉菜单样式，但限定在 mention-models-dropdown 类下 */
-    max-height: 400px;
-    overflow-y: auto;
-    overflow-x: hidden;
-    padding: 4px 12px;
-    position: relative;
-    background: rgba(var(--color-base-rgb), 0.65) !important;
-    backdrop-filter: blur(35px) saturate(150%) !important;
-    border: 0.5px solid rgba(var(--color-border-rgb), 0.3);
-    border-radius: 10px;
-    box-shadow:
-      0 0 0 0.5px rgba(0, 0, 0, 0.15),
-      0 4px 16px rgba(0, 0, 0, 0.15),
-      0 2px 8px rgba(0, 0, 0, 0.12),
-      inset 0 0 0 0.5px rgba(255, 255, 255, var(--inner-glow-opacity, 0.1));
-    transform-origin: top;
-    will-change: transform, opacity;
-    transition: all 0.15s cubic-bezier(0.4, 0, 0.2, 1);
-    margin-bottom: 0;
-
-    &.no-scrollbar {
-      padding-right: 12px;
-    }
-
-    &.has-scrollbar {
-      padding-right: 2px;
-    }
-
-    // Scrollbar styles
-    &::-webkit-scrollbar {
-      width: 14px;
-      height: 6px;
-    }
-
-    &::-webkit-scrollbar-thumb {
-      border: 4px solid transparent;
-      background-clip: padding-box;
-      border-radius: 7px;
-      background-color: var(--color-scrollbar-thumb);
-      min-height: 50px;
-      transition: all 0.2s;
-    }
-
-    &:hover::-webkit-scrollbar-thumb {
-      background-color: var(--color-scrollbar-thumb);
-    }
-
-    &::-webkit-scrollbar-thumb:hover {
-      background-color: var(--color-scrollbar-thumb-hover);
-    }
-
-    &::-webkit-scrollbar-thumb:active {
-      background-color: var(--color-scrollbar-thumb-hover);
-    }
-
-    &::-webkit-scrollbar-track {
-      background: transparent;
-      border-radius: 7px;
-    }
-  }
-
-  .ant-dropdown-menu-item-group {
-    margin-bottom: 4px;
-
-    &:not(:first-child) {
-      margin-top: 4px;
-    }
-
-    .ant-dropdown-menu-item-group-title {
-      padding: 5px 12px;
-      color: var(--color-text-3);
-      font-size: 12px;
-      font-weight: 500;
-      text-transform: uppercase;
-      letter-spacing: 0.03em;
-      opacity: 0.7;
-    }
-  }
-
-  // Handle no-results case margin
-  .no-results {
-    padding: 8px 12px;
-    color: var(--color-text-3);
-    cursor: default;
-    font-size: 13px;
-    opacity: 0.8;
-    margin-bottom: 40px;
-
-    &:hover {
-      background: none;
-    }
-  }
-
-  .ant-dropdown-menu-item {
-    padding: 5px 12px;
-    margin: 0 -12px;
-    cursor: pointer;
-    transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    border-radius: 6px;
-    font-size: 13px;
-
-    &:hover {
-      background: rgba(var(--color-hover-rgb), 0.5);
-    }
-
-    &.ant-dropdown-menu-item-selected {
-      background-color: rgba(var(--color-primary-rgb), 0.12);
-      color: var(--color-primary);
-    }
-
-    .ant-dropdown-menu-item-icon {
-      margin-right: 0;
-      opacity: 0.9;
-    }
-  }
+.ant-dropdown-menu .ant-dropdown-menu-sub {
+  max-height: 50vh;
+  width: max-content;
+  overflow-y: auto;
+  overflow-x: hidden;
+  border: 0.5px solid var(--color-border);
 }
-
 .ant-dropdown {
+  background-color: var(--ant-color-bg-elevated);
+  overflow: hidden;
+  border-radius: var(--ant-border-radius-lg);
   .ant-dropdown-menu {
     max-height: 50vh;
     overflow-y: auto;
     border: 0.5px solid var(--color-border);
-    .ant-dropdown-menu-sub {
-      max-height: 50vh;
-      width: max-content;
-      overflow-y: auto;
-      overflow-x: hidden;
-      border: 0.5px solid var(--color-border);
-    }
   }
   .ant-dropdown-arrow + .ant-dropdown-menu {
     border: none;
   }
 }
-
 .ant-select-dropdown {
   border: 0.5px solid var(--color-border);
 }
+.ant-dropdown-menu-submenu {
+  background-color: var(--ant-color-bg-elevated);
+  overflow: hidden;
+  border-radius: var(--ant-border-radius-lg);
+}
+
+.ant-popover {
+  .ant-popover-inner {
+    border: 0.5px solid var(--color-border);
+    .ant-popover-inner-content {
+      max-height: 70vh;
+      overflow-y: auto;
+    }
+  }
+  .ant-popover-arrow + .ant-popover-content {
+    .ant-popover-inner {
+      border: none;
+    }
+  }
+}
+
+.ant-modal:not(.ant-modal-confirm) {
+  .ant-modal-confirm-body-has-title {
+    padding: 16px 0 0 0;
+  }
+  .ant-modal-content {
+    border-radius: 10px;
+    border: 0.5px solid var(--color-border);
+    padding: 0 0 8px 0;
+    .ant-modal-header {
+      padding: 16px 16px 0 16px;
+      border-radius: 10px;
+    }
+    .ant-modal-body {
+      max-height: 80vh;
+      overflow-y: auto;
+      padding: 0 16px 0 16px;
+    }
+    .ant-modal-footer {
+      padding: 0 16px 8px 16px;
+    }
+    .ant-modal-confirm-btns {
+      margin-bottom: 8px;
+    }
+  }
+}
+.ant-modal.ant-modal-confirm.ant-modal-confirm-confirm {
+  .ant-modal-content {
+    padding: 16px;
+  }
+}
 
 .ant-collapse {
   border: 1px solid var(--color-border);
@@ -227,8 +141,14 @@
 }
 
 .ant-collapse-content {
-  border-top: 1px solid var(--color-border) !important;
+  border-top: 0.5px solid var(--color-border) !important;
   .ant-color-picker & {
     border-top: none !important;
   }
 }
+
+.ant-slider {
+  .ant-slider-handle::after {
+    box-shadow: 0 1px 4px 0px rgb(128 128 128 / 50%) !important;
+  }
+}
diff --git a/src/renderer/src/assets/styles/color.scss b/src/renderer/src/assets/styles/color.scss
index 6100e1d0ee..ce7e9cefe9 100644
--- a/src/renderer/src/assets/styles/color.scss
+++ b/src/renderer/src/assets/styles/color.scss
@@ -47,7 +47,7 @@
   --color-list-item: #222;
   --color-list-item-hover: #1e1e1e;
 
-  --modal-background: #1f1f1f;
+  --modal-background: #111111;
 
   --color-highlight: rgba(0, 0, 0, 1);
   --color-background-highlight: rgba(255, 255, 0, 0.9);
@@ -66,9 +66,9 @@
   --settings-width: 250px;
   --scrollbar-width: 5px;
 
-  --chat-background: #111111;
-  --chat-background-user: #28b561;
-  --chat-background-assistant: #2c2c2c;
+  --chat-background: transparent;
+  --chat-background-user: rgba(255, 255, 255, 0.08);
+  --chat-background-assistant: transparent;
   --chat-text-user: var(--color-black);
 
   --list-item-border-radius: 20px;
@@ -132,8 +132,8 @@
   --navbar-background-mac: rgba(255, 255, 255, 0.55);
   --navbar-background: rgba(244, 244, 244);
 
-  --chat-background: #f3f3f3;
-  --chat-background-user: #95ec69;
-  --chat-background-assistant: #ffffff;
+  --chat-background: transparent;
+  --chat-background-user: rgba(0, 0, 0, 0.045);
+  --chat-background-assistant: transparent;
   --chat-text-user: var(--color-text);
 }
diff --git a/src/renderer/src/assets/styles/index.scss b/src/renderer/src/assets/styles/index.scss
index 9974f19596..da28abc8c5 100644
--- a/src/renderer/src/assets/styles/index.scss
+++ b/src/renderer/src/assets/styles/index.scss
@@ -111,27 +111,7 @@ ul {
   word-wrap: break-word;
 }
 
-.bubble {
-  background-color: var(--chat-background);
-  #chat-main {
-    background-color: var(--chat-background);
-  }
-  #messages {
-    background-color: var(--chat-background);
-  }
-  #inputbar {
-    margin: -5px 15px 15px 15px;
-    background: var(--color-background);
-  }
-  .system-prompt {
-    background-color: var(--chat-background-assistant);
-  }
-  .message-content-container {
-    margin: 5px 0;
-    border-radius: 8px;
-    padding: 0.5rem 1rem;
-  }
-
+.bubble:not(.multi-select-mode) {
   .block-wrapper {
     display: flow-root;
   }
@@ -149,30 +129,35 @@ ul {
   }
 
   .message-user {
-    color: var(--chat-text-user);
-    .message-content-container-user .anticon {
-      color: var(--chat-text-user) !important;
+    .message-header {
+      flex-direction: row-reverse;
+      text-align: right;
+      .message-header-info-wrap {
+        flex-direction: row-reverse;
+        text-align: right;
+      }
     }
-
-    .markdown {
-      color: var(--chat-text-user);
-    }
-  }
-  .group-grid-container.horizontal,
-  .group-grid-container.grid {
-    .message-content-container-assistant {
-      padding: 0;
-    }
-  }
-  .group-message-wrapper {
-    background-color: var(--color-background);
     .message-content-container {
-      width: 100%;
+      border-radius: 10px 0 10px 10px;
+      padding: 10px 16px 10px 16px;
+      background-color: var(--chat-background-user);
+      align-self: self-end;
+    }
+    .MessageFooter {
+      margin-top: 2px;
+      align-self: self-end;
     }
   }
-  .group-menu-bar {
-    background-color: var(--color-background);
+
+  .message-assistant {
+    .message-content-container {
+      padding-left: 0;
+    }
+    .MessageFooter {
+      margin-left: 0;
+    }
   }
+
   code {
     color: var(--color-text);
   }
@@ -196,3 +181,9 @@ span.highlight {
 span.highlight.selected {
   background-color: var(--color-background-highlight-accent);
 }
+
+textarea {
+  &::-webkit-resizer {
+    display: none;
+  }
+}
diff --git a/src/renderer/src/assets/styles/markdown.scss b/src/renderer/src/assets/styles/markdown.scss
index 0c80d9f68a..eea9070cae 100644
--- a/src/renderer/src/assets/styles/markdown.scss
+++ b/src/renderer/src/assets/styles/markdown.scss
@@ -98,7 +98,6 @@
     border: none;
     border-top: 0.5px solid var(--color-border);
     margin: 20px 0;
-    background-color: var(--color-border);
   }
 
   span {
@@ -119,7 +118,7 @@
   }
 
   pre {
-    border-radius: 5px;
+    border-radius: 8px;
     overflow-x: auto;
     font-family: 'Fira Code', 'Courier New', Courier, monospace;
     background-color: var(--color-background-mute);
@@ -157,15 +156,28 @@
   }
 
   table {
-    border-collapse: collapse;
+    --table-border-radius: 8px;
     margin: 1em 0;
     width: 100%;
+    border-radius: var(--table-border-radius);
+    overflow: hidden;
+    border-collapse: separate;
+    border: 0.5px solid var(--color-border);
+    border-spacing: 0;
   }
 
   th,
   td {
-    border: 0.5px solid var(--color-border);
+    border-right: 0.5px solid var(--color-border);
+    border-bottom: 0.5px solid var(--color-border);
     padding: 0.5em;
+    &:last-child {
+      border-right: none;
+    }
+  }
+
+  tr:last-child td {
+    border-bottom: none;
   }
 
   th {
@@ -238,6 +250,10 @@
       text-decoration: underline;
     }
   }
+
+  > *:last-child {
+    margin-bottom: 0 !important;
+  }
 }
 
 .footnotes {
@@ -309,7 +325,7 @@ mjx-container {
 
 /* CodeMirror 相关样式 */
 .cm-editor {
-  border-radius: 5px;
+  border-radius: inherit;
 
   &.cm-focused {
     outline: none;
@@ -317,7 +333,7 @@ mjx-container {
 
   .cm-scroller {
     font-family: var(--code-font-family);
-    border-radius: 5px;
+    border-radius: inherit;
 
     .cm-gutters {
       line-height: 1.6;
diff --git a/src/renderer/src/components/CodeBlockView/CodePreview.tsx b/src/renderer/src/components/CodeBlockView/CodePreview.tsx
index 566a980f67..dde163283d 100644
--- a/src/renderer/src/components/CodeBlockView/CodePreview.tsx
+++ b/src/renderer/src/components/CodeBlockView/CodePreview.tsx
@@ -244,8 +244,7 @@ const ContentContainer = styled.div<{
 }>`
   position: relative;
   overflow: auto;
-  border: 0.5px solid transparent;
-  border-radius: 5px;
+  border-radius: inherit;
   margin-top: 0;
 
   /* 动态宽度计算 */
@@ -254,6 +253,7 @@ const ContentContainer = styled.div<{
 
   .shiki {
     padding: 1em;
+    border-radius: inherit;
 
     code {
       display: flex;
@@ -301,7 +301,7 @@ const ContentContainer = styled.div<{
     }
   }
 
-  animation: ${(props) => (props.$fadeIn ? 'contentFadeIn 0.3s ease-in-out forwards' : 'none')};
+  animation: ${(props) => (props.$fadeIn ? 'contentFadeIn 0.1s ease-in forwards' : 'none')};
 `
 
 const CodePlaceholder = styled.div`
diff --git a/src/renderer/src/components/CodeBlockView/index.tsx b/src/renderer/src/components/CodeBlockView/index.tsx
index 811b8665cc..c25ab3079d 100644
--- a/src/renderer/src/components/CodeBlockView/index.tsx
+++ b/src/renderer/src/components/CodeBlockView/index.tsx
@@ -273,6 +273,7 @@ const CodeHeader = styled.div<{ $isInSpecialView: boolean }>`
   align-items: center;
   color: var(--color-text);
   font-size: 14px;
+  line-height: 1;
   font-weight: bold;
   padding: 0 10px;
   border-top-left-radius: 8px;
@@ -288,6 +289,10 @@ const SplitViewWrapper = styled.div`
     flex: 1 1 auto;
     width: 100%;
   }
+
+  &:not(:has(+ [class*='Container'])) {
+    border-radius: 0 0 8px 8px;
+  }
 `
 
 export default memo(CodeBlockView)
diff --git a/src/renderer/src/components/CodeEditor/index.tsx b/src/renderer/src/components/CodeEditor/index.tsx
index d92fd91e8e..db699fa030 100644
--- a/src/renderer/src/components/CodeEditor/index.tsx
+++ b/src/renderer/src/components/CodeEditor/index.tsx
@@ -227,10 +227,10 @@ const CodeEditor = ({
         ...customBasicSetup // override basicSetup
       }}
       style={{
-        ...style,
         fontSize: `${fontSize - 1}px`,
-        border: '0.5px solid transparent',
-        marginTop: 0
+        marginTop: 0,
+        borderRadius: 'inherit',
+        ...style
       }}
     />
   )
diff --git a/src/renderer/src/components/ContextMenu/index.tsx b/src/renderer/src/components/ContextMenu/index.tsx
index 195fcb2a38..610afa695f 100644
--- a/src/renderer/src/components/ContextMenu/index.tsx
+++ b/src/renderer/src/components/ContextMenu/index.tsx
@@ -1,87 +1,59 @@
 import { Dropdown } from 'antd'
-import { useCallback, useEffect, useState } from 'react'
+import { useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import styled from 'styled-components'
 
 interface ContextMenuProps {
   children: React.ReactNode
-  onContextMenu?: (e: React.MouseEvent) => void
-  style?: React.CSSProperties
 }
 
-const ContextMenu: React.FC<ContextMenuProps> = ({ children, onContextMenu, style }) => {
+const ContextMenu: React.FC<ContextMenuProps> = ({ children }) => {
   const { t } = useTranslation()
-  const [contextMenuPosition, setContextMenuPosition] = useState<{ x: number; y: number } | null>(null)
-  const [selectedText, setSelectedText] = useState<string>('')
+  const [selectedText, setSelectedText] = useState<string | undefined>(undefined)
 
-  const handleContextMenu = useCallback(
-    (e: React.MouseEvent) => {
-      e.preventDefault()
-      const _selectedText = window.getSelection()?.toString()
-      if (_selectedText) {
-        setContextMenuPosition({ x: e.clientX, y: e.clientY })
-        setSelectedText(_selectedText)
-      }
-      onContextMenu?.(e)
-    },
-    [onContextMenu]
-  )
+  const contextMenuItems = useMemo(() => {
+    if (!selectedText) return []
 
-  useEffect(() => {
-    const handleClick = () => {
-      setContextMenuPosition(null)
-    }
-    document.addEventListener('click', handleClick)
-    return () => {
-      document.removeEventListener('click', handleClick)
-    }
-  }, [])
-
-  // 获取右键菜单项
-  const getContextMenuItems = (t: (key: string) => string, selectedText: string) => [
-    {
-      key: 'copy',
-      label: t('common.copy'),
-      onClick: () => {
-        if (selectedText) {
-          navigator.clipboard
-            .writeText(selectedText)
-            .then(() => {
-              window.message.success({ content: t('message.copied'), key: 'copy-message' })
-            })
-            .catch(() => {
-              window.message.error({ content: t('message.copy.failed'), key: 'copy-message-failed' })
-            })
-        }
-      }
-    },
-    {
-      key: 'quote',
-      label: t('chat.message.quote'),
-      onClick: () => {
-        if (selectedText) {
-          window.api?.quoteToMainWindow(selectedText)
+    return [
+      {
+        key: 'copy',
+        label: t('common.copy'),
+        onClick: () => {
+          if (selectedText) {
+            navigator.clipboard
+              .writeText(selectedText)
+              .then(() => {
+                window.message.success({ content: t('message.copied'), key: 'copy-message' })
+              })
+              .catch(() => {
+                window.message.error({ content: t('message.copy.failed'), key: 'copy-message-failed' })
+              })
+          }
+        }
+      },
+      {
+        key: 'quote',
+        label: t('chat.message.quote'),
+        onClick: () => {
+          if (selectedText) {
+            window.api?.quoteToMainWindow(selectedText)
+          }
         }
       }
+    ]
+  }, [selectedText, t])
+
+  const onOpenChange = (open: boolean) => {
+    if (open) {
+      const selectedText = window.getSelection()?.toString()
+      setSelectedText(selectedText)
     }
-  ]
+  }
 
   return (
-    <ContextContainer onContextMenu={handleContextMenu} className="context-menu-container" style={style}>
-      {contextMenuPosition && (
-        <Dropdown
-          overlayStyle={{ position: 'fixed', left: contextMenuPosition.x, top: contextMenuPosition.y, zIndex: 1000 }}
-          menu={{ items: getContextMenuItems(t, selectedText) }}
-          open={true}
-          trigger={['contextMenu']}>
-          <div />
-        </Dropdown>
-      )}
+    <Dropdown onOpenChange={onOpenChange} menu={{ items: contextMenuItems }} trigger={['contextMenu']}>
       {children}
-    </ContextContainer>
+    </Dropdown>
   )
 }
 
-const ContextContainer = styled.div``
-
 export default ContextMenu
diff --git a/src/renderer/src/components/CustomCollapse.tsx b/src/renderer/src/components/CustomCollapse.tsx
index 9c94084d70..c6f4f79a78 100644
--- a/src/renderer/src/components/CustomCollapse.tsx
+++ b/src/renderer/src/components/CustomCollapse.tsx
@@ -1,5 +1,6 @@
 import { Collapse } from 'antd'
 import { merge } from 'lodash'
+import { ChevronRight } from 'lucide-react'
 import { FC, memo, useMemo, useState } from 'react'
 
 interface CustomCollapseProps {
@@ -78,6 +79,14 @@ const CustomCollapse: FC<CustomCollapseProps> = ({
       destroyInactivePanel={destroyInactivePanel}
       collapsible={collapsible}
       onChange={setActiveKeys}
+      expandIcon={({ isActive }) => (
+        <ChevronRight
+          size={16}
+          color="var(--color-text-3)"
+          strokeWidth={1.5}
+          style={{ transform: isActive ? 'rotate(90deg)' : 'rotate(0deg)' }}
+        />
+      )}
       items={[
         {
           styles: collapseItemStyles,
diff --git a/src/renderer/src/components/EditableNumber/index.tsx b/src/renderer/src/components/EditableNumber/index.tsx
new file mode 100644
index 0000000000..3cc0f09507
--- /dev/null
+++ b/src/renderer/src/components/EditableNumber/index.tsx
@@ -0,0 +1,114 @@
+import { InputNumber } from 'antd'
+import { FC, useEffect, useRef, useState } from 'react'
+import styled from 'styled-components'
+
+export interface EditableNumberProps {
+  value?: number | null
+  min?: number
+  max?: number
+  step?: number
+  precision?: number
+  placeholder?: string
+  disabled?: boolean
+  changeOnBlur?: boolean
+  onChange?: (value: number | null) => void
+  onBlur?: () => void
+  style?: React.CSSProperties
+  className?: string
+  size?: 'small' | 'middle' | 'large'
+  suffix?: string
+  prefix?: string
+  align?: 'start' | 'center' | 'end'
+}
+
+const EditableNumber: FC<EditableNumberProps> = ({
+  value,
+  min,
+  max,
+  step = 0.01,
+  precision,
+  placeholder,
+  disabled = false,
+  onChange,
+  onBlur,
+  changeOnBlur = false,
+  style,
+  className,
+  size = 'middle',
+  align = 'end'
+}) => {
+  const [isEditing, setIsEditing] = useState(false)
+  const [inputValue, setInputValue] = useState(value)
+  const inputRef = useRef<HTMLInputElement>(null)
+
+  useEffect(() => {
+    setInputValue(value)
+  }, [value])
+
+  const handleFocus = () => {
+    if (disabled) return
+    setIsEditing(true)
+  }
+
+  const handleInputChange = (newValue: number | null) => {
+    onChange?.(newValue ?? null)
+  }
+
+  const handleBlur = () => {
+    setIsEditing(false)
+    onBlur?.()
+  }
+
+  const handleKeyDown = (e: React.KeyboardEvent) => {
+    if (e.key === 'Enter') {
+      handleBlur()
+    } else if (e.key === 'Escape') {
+      setInputValue(value)
+      setIsEditing(false)
+    }
+  }
+
+  return (
+    <Container>
+      <InputNumber
+        style={{ ...style, opacity: isEditing ? 1 : 0 }}
+        ref={inputRef}
+        value={inputValue}
+        min={min}
+        max={max}
+        step={step}
+        precision={precision}
+        size={size}
+        onChange={handleInputChange}
+        onBlur={handleBlur}
+        onFocus={handleFocus}
+        onKeyDown={handleKeyDown}
+        className={className}
+        controls={isEditing}
+        changeOnBlur={changeOnBlur}
+      />
+      <DisplayText style={style} className={className} $align={align} $isEditing={isEditing}>
+        {value ?? placeholder}
+      </DisplayText>
+    </Container>
+  )
+}
+
+const Container = styled.div`
+  display: inline-block;
+  position: relative;
+`
+
+const DisplayText = styled.div<{
+  $align: 'start' | 'center' | 'end'
+  $isEditing: boolean
+}>`
+  position: absolute;
+  inset: 0;
+  display: ${({ $isEditing }) => ($isEditing ? 'none' : 'flex')};
+  align-items: center;
+  justify-content: ${({ $align }) => $align};
+  pointer-events: none;
+`
+
+export default EditableNumber
diff --git a/src/renderer/src/components/Popups/MultiSelectionPopup.tsx b/src/renderer/src/components/Popups/MultiSelectionPopup.tsx
index f021b631f9..f277fbe3a8 100644
--- a/src/renderer/src/components/Popups/MultiSelectionPopup.tsx
+++ b/src/renderer/src/components/Popups/MultiSelectionPopup.tsx
@@ -35,17 +35,38 @@ const MultiSelectActionPopup: FC<Props> = ({ topic }) => {
         <SelectionCount>{t('common.selectedMessages', { count: selectedMessageIds.length })}</SelectionCount>
         <ActionButtons>
           <Tooltip title={t('common.save')}>
-            <ActionButton icon={<Save size={16} />} disabled={isActionDisabled} onClick={() => handleAction('save')} />
+            <Button
+              shape="circle"
+              color="default"
+              variant="text"
+              icon={<Save size={16} />}
+              disabled={isActionDisabled}
+              onClick={() => handleAction('save')}
+            />
           </Tooltip>
           <Tooltip title={t('common.copy')}>
-            <ActionButton icon={<Copy size={16} />} disabled={isActionDisabled} onClick={() => handleAction('copy')} />
+            <Button
+              shape="circle"
+              color="default"
+              variant="text"
+              icon={<Copy size={16} />}
+              disabled={isActionDisabled}
+              onClick={() => handleAction('copy')}
+            />
           </Tooltip>
           <Tooltip title={t('common.delete')}>
-            <ActionButton danger icon={<Trash size={16} />} onClick={() => handleAction('delete')} />
+            <Button
+              shape="circle"
+              color="danger"
+              variant="text"
+              danger
+              icon={<Trash size={16} />}
+              onClick={() => handleAction('delete')}
+            />
           </Tooltip>
         </ActionButtons>
         <Tooltip title={t('chat.navigation.close')}>
-          <ActionButton icon={<X size={16} />} onClick={handleClose} />
+          <Button shape="circle" color="default" variant="text" icon={<X size={16} />} onClick={handleClose} />
         </Tooltip>
       </ActionBar>
     </Container>
@@ -53,45 +74,38 @@ const MultiSelectActionPopup: FC<Props> = ({ topic }) => {
 }
 
 const Container = styled.div`
-  width: 100%;
-  padding: 36px 20px;
-  background-color: var(--color-background);
-  border-top: 1px solid var(--color-border);
+  position: fixed;
+  inset: auto 0 0 0;
+  z-index: 1000;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 16px;
 `
 
 const ActionBar = styled.div`
   display: flex;
   align-items: center;
   justify-content: space-between;
+  background-color: var(--color-background);
+  padding: 4px 4px;
+  border-radius: 99px;
+  box-shadow: 0 0px 5px 0px rgb(128 128 128 / 30%);
+  border: 0.5px solid var(--color-border);
+  gap: 16px;
 `
 
 const ActionButtons = styled.div`
-  display: flex;
-  gap: 16px;
-`
-
-const ActionButton = styled(Button)`
   display: flex;
   align-items: center;
-  justify-content: center;
-  padding: 8px 16px;
-  border-radius: 50%;
-  .anticon {
-    font-size: 16px;
-  }
-  &:hover {
-    background-color: var(--color-background-mute);
-  }
-  &:disabled {
-    opacity: 0.5;
-    cursor: not-allowed;
-  }
+  gap: 8px;
 `
 
 const SelectionCount = styled.div`
-  margin-right: 15px;
   color: var(--color-text-2);
   font-size: 14px;
+  padding-left: 8px;
+  flex-shrink: 0;
 `
 
 export default MultiSelectActionPopup
diff --git a/src/renderer/src/components/Popups/SearchPopup.tsx b/src/renderer/src/components/Popups/SearchPopup.tsx
index 5b3936cbf5..16003c22ba 100644
--- a/src/renderer/src/components/Popups/SearchPopup.tsx
+++ b/src/renderer/src/components/Popups/SearchPopup.tsx
@@ -32,16 +32,23 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
       onCancel={onCancel}
       afterClose={onClose}
       title={null}
-      width="920px"
+      width={700}
       transitionName="animation-move-down"
       styles={{
         content: {
+          borderRadius: 20,
           padding: 0,
-          border: `1px solid var(--color-frame-border)`
+          overflow: 'hidden',
+          paddingBottom: 16
         },
-        body: { height: '85vh' }
+        body: {
+          height: '80vh',
+          maxHeight: 'inherit',
+          padding: 0
+        }
       }}
       centered
+      closable={false}
       footer={null}>
       <HistoryPage />
     </Modal>
diff --git a/src/renderer/src/components/Popups/SelectModelPopup/popup.tsx b/src/renderer/src/components/Popups/SelectModelPopup/popup.tsx
index a02c63bcb2..646e8894dc 100644
--- a/src/renderer/src/components/Popups/SelectModelPopup/popup.tsx
+++ b/src/renderer/src/components/Popups/SelectModelPopup/popup.tsx
@@ -388,8 +388,11 @@ const PopupContainer: React.FC<Props> = ({ model, resolve }) => {
           borderRadius: 20,
           padding: 0,
           overflow: 'hidden',
-          paddingBottom: 20,
-          border: '1px solid var(--color-border)'
+          paddingBottom: 16
+        },
+        body: {
+          maxHeight: 'inherit',
+          padding: 0
         }
       }}
       closeIcon={null}
diff --git a/src/renderer/src/components/Scrollbar/index.tsx b/src/renderer/src/components/Scrollbar/index.tsx
index 12cb3ef6d6..c3bd1b2d0c 100644
--- a/src/renderer/src/components/Scrollbar/index.tsx
+++ b/src/renderer/src/components/Scrollbar/index.tsx
@@ -48,17 +48,17 @@ const Scrollbar: FC<Props> = ({ ref: passedRef, children, onScroll: externalOnSc
   }, [throttledInternalScrollHandler, clearScrollingTimeout])
 
   return (
-    <Container
+    <ScrollBarContainer
       {...htmlProps} // Pass other HTML attributes
       $isScrolling={isScrolling}
       onScroll={combinedOnScroll} // Use the combined handler
       ref={passedRef}>
       {children}
-    </Container>
+    </ScrollBarContainer>
   )
 }
 
-const Container = styled.div<{ $isScrolling: boolean }>`
+const ScrollBarContainer = styled.div<{ $isScrolling: boolean }>`
   overflow-y: auto;
   &::-webkit-scrollbar-thumb {
     transition: background 2s ease;
diff --git a/src/renderer/src/components/Selector.tsx b/src/renderer/src/components/Selector.tsx
new file mode 100644
index 0000000000..1fb0efa6e8
--- /dev/null
+++ b/src/renderer/src/components/Selector.tsx
@@ -0,0 +1,192 @@
+import { Dropdown, DropdownProps } from 'antd'
+import { Check, ChevronsUpDown } from 'lucide-react'
+import { ReactNode, useEffect, useMemo, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import styled, { css } from 'styled-components'
+
+interface SelectorOption<V = string | number> {
+  label: string | ReactNode
+  value: V
+  type?: 'group'
+  options?: SelectorOption<V>[]
+  disabled?: boolean
+}
+
+interface BaseSelectorProps<V = string | number> {
+  options: SelectorOption<V>[]
+  placeholder?: string
+  placement?: 'topLeft' | 'topCenter' | 'topRight' | 'bottomLeft' | 'bottomCenter' | 'bottomRight' | 'top' | 'bottom'
+  /** 字体大小 */
+  size?: number
+  /** 是否禁用 */
+  disabled?: boolean
+}
+
+interface SingleSelectorProps<V> extends BaseSelectorProps<V> {
+  multiple?: false
+  value?: V
+  onChange: (value: V) => void
+}
+
+interface MultipleSelectorProps<V> extends BaseSelectorProps<V> {
+  multiple: true
+  value?: V[]
+  onChange: (value: V[]) => void
+}
+
+type SelectorProps<V> = SingleSelectorProps<V> | MultipleSelectorProps<V>
+
+const Selector = <V extends string | number>({
+  options,
+  value,
+  onChange = () => {},
+  placement = 'bottomRight',
+  size = 13,
+  placeholder,
+  disabled = false,
+  multiple = false
+}: SelectorProps<V>) => {
+  const [open, setOpen] = useState(false)
+  const { t } = useTranslation()
+  const inputRef = useRef<any>(null)
+
+  useEffect(() => {
+    if (open) {
+      setTimeout(() => {
+        inputRef.current?.focus()
+      }, 1)
+    }
+  }, [open])
+
+  const selectedValues = useMemo(() => {
+    if (multiple) {
+      return (value as V[]) || []
+    }
+    return value !== undefined ? [value as V] : []
+  }, [value, multiple])
+
+  const label = useMemo(() => {
+    if (selectedValues.length > 0) {
+      const findLabels = (opts: SelectorOption<V>[]): (string | ReactNode)[] => {
+        const labels: (string | ReactNode)[] = []
+        for (const opt of opts) {
+          if (selectedValues.includes(opt.value)) {
+            labels.push(opt.label)
+          }
+          if (opt.options) {
+            labels.push(...findLabels(opt.options))
+          }
+        }
+        return labels
+      }
+      const labels = findLabels(options)
+      if (labels.length === 0) return placeholder
+      if (labels.length === 1) return labels[0]
+      return t('common.selectedItems', { count: labels.length })
+    }
+    return placeholder
+  }, [selectedValues, placeholder, options, t])
+
+  const items = useMemo(() => {
+    const mapOption = (option: SelectorOption<V>) => ({
+      key: option.value,
+      label: option.label,
+      extra: <CheckIcon>{selectedValues.includes(option.value) && <Check size={14} />}</CheckIcon>,
+      disabled: option.disabled,
+      type: option.type || (option.options ? 'group' : undefined),
+      children: option.options?.map(mapOption)
+    })
+
+    return options.map(mapOption)
+  }, [options, selectedValues])
+
+  function onClick(e: { key: string }) {
+    if (disabled) return
+
+    const newValue = e.key as V
+    if (multiple) {
+      const newValues = selectedValues.includes(newValue)
+        ? selectedValues.filter((v) => v !== newValue)
+        : [...selectedValues, newValue]
+      ;(onChange as MultipleSelectorProps<V>['onChange'])(newValues)
+    } else {
+      ;(onChange as SingleSelectorProps<V>['onChange'])(newValue)
+      setOpen(false)
+    }
+  }
+
+  const handleOpenChange: DropdownProps['onOpenChange'] = (nextOpen, info) => {
+    if (disabled) return
+
+    if (info.source === 'trigger' || nextOpen) {
+      setOpen(nextOpen)
+    }
+  }
+
+  return (
+    <Dropdown
+      overlayClassName="selector-dropdown"
+      menu={{ items, onClick }}
+      trigger={['click']}
+      placement={placement}
+      open={open && !disabled}
+      onOpenChange={handleOpenChange}>
+      <Label $size={size} $open={open} $disabled={disabled} $isPlaceholder={label === placeholder}>
+        {label}
+        <LabelIcon size={size + 3} />
+      </Label>
+    </Dropdown>
+  )
+}
+
+const LabelIcon = styled(ChevronsUpDown)`
+  border-radius: 4px;
+  padding: 2px 0;
+  background-color: var(--color-background-soft);
+  transition: background-color 0.2s;
+`
+
+const Label = styled.div<{ $size: number; $open: boolean; $disabled: boolean; $isPlaceholder: boolean }>`
+  display: flex;
+  align-items: center;
+  gap: 4px;
+  border-radius: 99px;
+  padding: 3px 2px 3px 10px;
+  font-size: ${({ $size }) => $size}px;
+  line-height: 1;
+  cursor: ${({ $disabled }) => ($disabled ? 'not-allowed' : 'pointer')};
+  opacity: ${({ $disabled }) => ($disabled ? 0.6 : 1)};
+  color: ${({ $isPlaceholder }) => ($isPlaceholder ? 'var(--color-text-2)' : 'inherit')};
+
+  transition:
+    background-color 0.2s,
+    opacity 0.2s;
+  &:hover {
+    ${({ $disabled }) =>
+      !$disabled &&
+      css`
+        background-color: var(--color-background-mute);
+        ${LabelIcon} {
+          background-color: var(--color-background-mute);
+        }
+      `}
+  }
+  ${({ $open, $disabled }) =>
+    $open &&
+    !$disabled &&
+    css`
+      background-color: var(--color-background-mute);
+      ${LabelIcon} {
+        background-color: var(--color-background-mute);
+      }
+    `}
+`
+
+const CheckIcon = styled.div`
+  width: 20px;
+  display: flex;
+  align-items: center;
+  justify-content: end;
+`
+
+export default Selector
diff --git a/src/renderer/src/context/AntdProvider.tsx b/src/renderer/src/context/AntdProvider.tsx
index 592121cccb..7d22fbb6a5 100644
--- a/src/renderer/src/context/AntdProvider.tsx
+++ b/src/renderer/src/context/AntdProvider.tsx
@@ -38,7 +38,20 @@ const AntdProvider: FC<PropsWithChildren> = ({ children }) => {
             boxShadowSecondary: 'none',
             defaultShadow: 'none',
             dangerShadow: 'none',
-            primaryShadow: 'none'
+            primaryShadow: 'none',
+            controlHeight: 30,
+            paddingInline: 10
+          },
+          Input: {
+            controlHeight: 30,
+            colorBorder: 'var(--color-border)'
+          },
+          InputNumber: {
+            colorBorder: 'var(--color-border)'
+          },
+          Select: {
+            controlHeight: 30,
+            colorBorder: 'var(--color-border)'
           },
           Collapse: {
             headerBg: 'transparent'
@@ -50,13 +63,47 @@ const AntdProvider: FC<PropsWithChildren> = ({ children }) => {
             fontFamily: 'var(--code-font-family)'
           },
           Segmented: {
-            itemActiveBg: 'var(--color-background-mute)',
-            itemHoverBg: 'var(--color-background-mute)'
+            itemActiveBg: 'var(--color-background-soft)',
+            itemHoverBg: 'var(--color-background-soft)',
+            trackBg: 'rgba(153,153,153,0.15)'
+          },
+          Switch: {
+            colorTextQuaternary: 'rgba(153,153,153,0.20)',
+            trackMinWidth: 40,
+            handleSize: 19,
+            trackMinWidthSM: 28,
+            trackHeightSM: 17,
+            handleSizeSM: 14,
+            trackPadding: 1.5
+          },
+          Dropdown: {
+            controlPaddingHorizontal: 8,
+            borderRadiusLG: 10,
+            borderRadiusSM: 8
+          },
+          Popover: {
+            borderRadiusLG: 10
+          },
+          Slider: {
+            handleLineWidth: 1.5,
+            handleSize: 15,
+            handleSizeHover: 15,
+            dotSize: 7,
+            railSize: 5,
+            colorBgElevated: '#ffffff'
+          },
+          Modal: {
+            colorBgElevated: 'var(--modal-background)'
+          },
+          Divider: {
+            colorSplit: 'rgba(128,128,128,0.15)'
           }
         },
         token: {
           colorPrimary: colorPrimary,
-          fontFamily: 'var(--font-family)'
+          fontFamily: 'var(--font-family)',
+          colorBgMask: _theme === 'dark' ? 'rgba(0,0,0,0.7)' : 'rgba(255,255,255,0.8)',
+          motionDurationMid: '100ms'
         }
       }}>
       {children}
diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index fa1f493d80..7e6d40826b 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -412,6 +412,7 @@
       "search": "Search",
       "select": "Select",
       "selectedMessages": "Selected {{count}} messages",
+      "selectedItems": "Selected {{count}} items",
       "success": "Success",
       "topics": "Topics",
       "warning": "Warning",
diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json
index ffa579d563..4e2c5b0646 100644
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@@ -412,6 +412,7 @@
       "search": "検索",
       "select": "選択",
       "selectedMessages": "{{count}}件のメッセージを選択しました",
+      "selectedItems": "{{count}}件の項目を選択しました",
       "success": "成功",
       "topics": "トピック",
       "warning": "警告",
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index a713da42ee..8f52666854 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -412,6 +412,7 @@
       "search": "Поиск",
       "select": "Выбрать",
       "selectedMessages": "Выбрано {{count}} сообщений",
+      "selectedItems": "Выбрано {{count}} элементов",
       "success": "Успешно",
       "topics": "Топики",
       "warning": "Предупреждение",
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index c16089db5e..9a2ad2597c 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -412,6 +412,7 @@
       "search": "搜索",
       "select": "选择",
       "selectedMessages": "选中 {{count}} 条消息",
+      "selectedItems": "已选择 {{count}} 项",
       "success": "成功",
       "topics": "话题",
       "warning": "警告",
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index 72be4f02e6..64ef5bac85 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -412,6 +412,7 @@
       "search": "搜尋",
       "select": "選擇",
       "selectedMessages": "選中 {{count}} 條訊息",
+      "selectedItems": "已選擇 {{count}} 項",
       "success": "成功",
       "topics": "話題",
       "warning": "警告",
diff --git a/src/renderer/src/pages/agents/components/AddAgentPopup.tsx b/src/renderer/src/pages/agents/components/AddAgentPopup.tsx
index fc341e970e..089ec16fa1 100644
--- a/src/renderer/src/pages/agents/components/AddAgentPopup.tsx
+++ b/src/renderer/src/pages/agents/components/AddAgentPopup.tsx
@@ -14,6 +14,7 @@ import { Agent, KnowledgeBase } from '@renderer/types'
 import { getLeadingEmoji, uuid } from '@renderer/utils'
 import { Button, Form, FormInstance, Input, Modal, Popover, Select, SelectProps } from 'antd'
 import TextArea from 'antd/es/input/TextArea'
+import { ChevronDown } from 'lucide-react'
 import { useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import stringWidth from 'string-width'
@@ -150,7 +151,7 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
       maskClosable={false}
       afterClose={onClose}
       okText={t('agents.add.title')}
-      width={800}
+      width={600}
       transitionName="animation-move-down"
       centered>
       <Form
@@ -212,6 +213,7 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
                   .toLowerCase()
                   .includes(input.toLowerCase())
               }
+              suffixIcon={<ChevronDown size={16} color="var(--color-border)" />}
             />
           </Form.Item>
         )}
diff --git a/src/renderer/src/pages/agents/components/ImportAgentPopup.tsx b/src/renderer/src/pages/agents/components/ImportAgentPopup.tsx
index 64c6f34b2f..7f4b094886 100644
--- a/src/renderer/src/pages/agents/components/ImportAgentPopup.tsx
+++ b/src/renderer/src/pages/agents/components/ImportAgentPopup.tsx
@@ -4,7 +4,7 @@ import { getDefaultModel } from '@renderer/services/AssistantService'
 import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
 import { Agent } from '@renderer/types'
 import { uuid } from '@renderer/utils'
-import { Button, Form, Input, Modal, Radio, Space } from 'antd'
+import { Button, Flex, Form, Input, Modal, Radio } from 'antd'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
@@ -98,7 +98,14 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
       title={t('agents.import.title')}
       open={open}
       onCancel={onCancel}
-      footer={null}
+      footer={
+        <Flex justify="end" gap={8}>
+          <Button onClick={onCancel}>{t('common.cancel')}</Button>
+          <Button type="primary" onClick={() => form.submit()} loading={loading}>
+            {t('agents.import.button')}
+          </Button>
+        </Flex>
+      }
       transitionName="animation-move-down"
       centered>
       <Form form={form} onFinish={onFinish} layout="vertical">
@@ -120,15 +127,6 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
             <Button onClick={() => form.submit()}>{t('agents.import.select_file')}</Button>
           </Form.Item>
         )}
-
-        <Form.Item>
-          <Space>
-            <Button onClick={onCancel}>{t('common.cancel')}</Button>
-            <Button type="primary" onClick={() => form.submit()} loading={loading}>
-              {t('agents.import.button')}
-            </Button>
-          </Space>
-        </Form.Item>
       </Form>
     </Modal>
   )
diff --git a/src/renderer/src/pages/history/HistoryPage.tsx b/src/renderer/src/pages/history/HistoryPage.tsx
index f1b3890660..d20accfd87 100644
--- a/src/renderer/src/pages/history/HistoryPage.tsx
+++ b/src/renderer/src/pages/history/HistoryPage.tsx
@@ -1,11 +1,11 @@
-import { ArrowLeftOutlined, EnterOutlined } from '@ant-design/icons'
+import { HStack } from '@renderer/components/Layout'
 import { useAppDispatch } from '@renderer/store'
 import { loadTopicMessagesThunk } from '@renderer/store/thunk/messageThunk'
 import { Topic } from '@renderer/types'
 import type { Message } from '@renderer/types/newMessage'
-import { Input, InputRef } from 'antd'
+import { Divider, Input, InputRef } from 'antd'
 import { last } from 'lodash'
-import { Search } from 'lucide-react'
+import { ChevronLeft, CornerDownLeft, Search } from 'lucide-react'
 import { FC, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
@@ -73,26 +73,35 @@ const TopicsPage: FC = () => {
 
   return (
     <Container>
-      <Header>
-        {stack.length > 1 && (
-          <HeaderLeft>
-            <MenuIcon onClick={goBack}>
-              <ArrowLeftOutlined />
-            </MenuIcon>
-          </HeaderLeft>
-        )}
-        <SearchInput
-          placeholder={t('history.search.placeholder')}
-          type="search"
-          value={search}
-          autoFocus
-          allowClear
+      <HStack style={{ padding: '0 12px', marginTop: 8 }}>
+        <Input
+          prefix={
+            stack.length > 1 ? (
+              <SearchIcon className="back-icon" onClick={goBack}>
+                <ChevronLeft size={16} />
+              </SearchIcon>
+            ) : (
+              <SearchIcon>
+                <Search size={15} />
+              </SearchIcon>
+            )
+          }
+          suffix={search.length >= 2 ? <CornerDownLeft size={16} /> : null}
           ref={inputRef}
+          placeholder={t('history.search.placeholder')}
+          value={search}
           onChange={(e) => setSearch(e.target.value.trimStart())}
-          suffix={search.length >= 2 ? <EnterOutlined /> : <Search size={16} />}
+          allowClear
+          autoFocus
+          spellCheck={false}
+          style={{ paddingLeft: 0 }}
+          variant="borderless"
+          size="middle"
           onPressEnter={onSearch}
         />
-      </Header>
+      </HStack>
+      <Divider style={{ margin: 0, marginTop: 4, borderBlockStartWidth: 0.5 }} />
+
       <TopicsHistory
         keywords={search}
         onClick={onTopicClick as any}
@@ -118,50 +127,23 @@ const Container = styled.div`
   height: 100%;
 `
 
-const Header = styled.div`
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: center;
-  padding: 12px 0;
-  width: 100%;
-  position: relative;
-  background-color: var(--color-background-mute);
-  border-top-left-radius: 8px;
-  border-top-right-radius: 8px;
-  border-bottom: 0.5px solid var(--color-frame-border);
-`
-
-const HeaderLeft = styled.div`
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  position: absolute;
-  top: 12px;
-  left: 15px;
-`
-
-const MenuIcon = styled.div`
-  cursor: pointer;
-  display: flex;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  width: 33px;
-  height: 33px;
+const SearchIcon = styled.div`
+  width: 32px;
+  height: 32px;
   border-radius: 50%;
-  &:hover {
-    background-color: var(--color-background);
-    .anticon {
-      color: var(--color-text-1);
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  background-color: var(--color-background-soft);
+  margin-right: 2px;
+  &.back-icon {
+    cursor: pointer;
+    transition: background-color 0.2s;
+    &:hover {
+      background-color: var(--color-background-mute);
     }
   }
 `
 
-const SearchInput = styled(Input)`
-  border-radius: 30px;
-  width: 800px;
-  height: 36px;
-`
-
 export default TopicsPage
diff --git a/src/renderer/src/pages/history/components/SearchMessage.tsx b/src/renderer/src/pages/history/components/SearchMessage.tsx
index b6b7c73146..9ba138cde4 100644
--- a/src/renderer/src/pages/history/components/SearchMessage.tsx
+++ b/src/renderer/src/pages/history/components/SearchMessage.tsx
@@ -1,7 +1,5 @@
-import { ArrowRightOutlined } from '@ant-design/icons'
 import { HStack } from '@renderer/components/Layout'
 import { MessageEditingProvider } from '@renderer/context/MessageEditingContext'
-import { useSettings } from '@renderer/hooks/useSettings'
 import { getTopicById } from '@renderer/hooks/useTopic'
 import { default as MessageItem } from '@renderer/pages/home/Messages/Message'
 import { locateToMessage } from '@renderer/services/MessagesService'
@@ -10,6 +8,7 @@ import { Topic } from '@renderer/types'
 import type { Message } from '@renderer/types/newMessage'
 import { runAsyncFunction } from '@renderer/utils'
 import { Button } from 'antd'
+import { Forward } from 'lucide-react'
 import { FC, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
@@ -20,7 +19,6 @@ interface Props extends React.HTMLAttributes<HTMLDivElement> {
 
 const SearchMessage: FC<Props> = ({ message, ...props }) => {
   const navigate = NavigationService.navigate!
-  const { messageStyle } = useSettings()
   const { t } = useTranslation()
   const [topic, setTopic] = useState<Topic | null>(null)
 
@@ -43,18 +41,18 @@ const SearchMessage: FC<Props> = ({ message, ...props }) => {
 
   return (
     <MessageEditingProvider>
-      <MessagesContainer {...props} className={messageStyle}>
-        <ContainerWrapper style={{ paddingTop: 20, paddingBottom: 20, position: 'relative' }}>
+      <MessagesContainer {...props}>
+        <ContainerWrapper>
           <MessageItem message={message} topic={topic} hideMenuBar={true} />
           <Button
             type="text"
             size="middle"
-            style={{ color: 'var(--color-text-3)', position: 'absolute', right: 0, top: 10 }}
+            style={{ color: 'var(--color-text-3)', position: 'absolute', right: 16, top: 16 }}
             onClick={() => locateToMessage(navigate, message)}
-            icon={<ArrowRightOutlined />}
+            icon={<Forward size={16} />}
           />
           <HStack mt="10px" justifyContent="center">
-            <Button onClick={() => locateToMessage(navigate, message)} icon={<ArrowRightOutlined />}>
+            <Button onClick={() => locateToMessage(navigate, message)} icon={<Forward size={16} />}>
               {t('history.locate.message')}
             </Button>
           </HStack>
@@ -74,12 +72,11 @@ const MessagesContainer = styled.div`
 `
 
 const ContainerWrapper = styled.div`
-  width: 800px;
+  width: 100%;
   display: flex;
   flex-direction: column;
-  .message {
-    padding: 0;
-  }
+  padding: 16px;
+  position: relative;
 `
 
 export default SearchMessage
diff --git a/src/renderer/src/pages/history/components/SearchResults.tsx b/src/renderer/src/pages/history/components/SearchResults.tsx
index 5882f4945c..2fd299a388 100644
--- a/src/renderer/src/pages/history/components/SearchResults.tsx
+++ b/src/renderer/src/pages/history/components/SearchResults.tsx
@@ -151,7 +151,8 @@ const Container = styled.div`
 `
 
 const ContainerWrapper = styled.div`
-  width: 800px;
+  width: 100%;
+  padding: 0 16px;
   display: flex;
   flex-direction: column;
 `
diff --git a/src/renderer/src/pages/history/components/TopicMessages.tsx b/src/renderer/src/pages/history/components/TopicMessages.tsx
index 27372db4f3..1b4be00029 100644
--- a/src/renderer/src/pages/history/components/TopicMessages.tsx
+++ b/src/renderer/src/pages/history/components/TopicMessages.tsx
@@ -1,9 +1,8 @@
-import { ArrowRightOutlined, MessageOutlined } from '@ant-design/icons'
+import { MessageOutlined } from '@ant-design/icons'
 import { HStack } from '@renderer/components/Layout'
 import SearchPopup from '@renderer/components/Popups/SearchPopup'
 import { MessageEditingProvider } from '@renderer/context/MessageEditingContext'
 import useScrollPosition from '@renderer/hooks/useScrollPosition'
-import { useSettings } from '@renderer/hooks/useSettings'
 import { getAssistantById } from '@renderer/services/AssistantService'
 import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
 import { isGenerating, locateToMessage } from '@renderer/services/MessagesService'
@@ -13,6 +12,7 @@ import { loadTopicMessagesThunk } from '@renderer/store/thunk/messageThunk'
 import { Topic } from '@renderer/types'
 import { Button, Divider, Empty } from 'antd'
 import { t } from 'i18next'
+import { Forward } from 'lucide-react'
 import { FC, useEffect } from 'react'
 import styled from 'styled-components'
 
@@ -25,7 +25,6 @@ interface Props extends React.HTMLAttributes<HTMLDivElement> {
 const TopicMessages: FC<Props> = ({ topic, ...props }) => {
   const navigate = NavigationService.navigate!
   const { handleScroll, containerRef } = useScrollPosition('TopicMessages')
-  const { messageStyle } = useSettings()
   const dispatch = useAppDispatch()
 
   useEffect(() => {
@@ -48,8 +47,8 @@ const TopicMessages: FC<Props> = ({ topic, ...props }) => {
 
   return (
     <MessageEditingProvider>
-      <MessagesContainer {...props} ref={containerRef} onScroll={handleScroll} className={messageStyle}>
-        <ContainerWrapper style={{ paddingTop: 30, paddingBottom: 30 }}>
+      <MessagesContainer {...props} ref={containerRef} onScroll={handleScroll}>
+        <ContainerWrapper>
           {topic?.messages.map((message) => (
             <div key={message.id} style={{ position: 'relative' }}>
               <MessageItem message={message} topic={topic} hideMenuBar={true} />
@@ -58,7 +57,7 @@ const TopicMessages: FC<Props> = ({ topic, ...props }) => {
                 size="middle"
                 style={{ color: 'var(--color-text-3)', position: 'absolute', right: 0, top: 5 }}
                 onClick={() => locateToMessage(navigate, message)}
-                icon={<ArrowRightOutlined />}
+                icon={<Forward size={16} />}
               />
               <Divider style={{ margin: '8px auto 15px' }} variant="dashed" />
             </div>
@@ -86,12 +85,10 @@ const MessagesContainer = styled.div`
 `
 
 const ContainerWrapper = styled.div`
-  width: 800px;
+  width: 100%;
+  padding: 16px;
   display: flex;
   flex-direction: column;
-  .message {
-    padding: 0;
-  }
 `
 
 export default TopicMessages
diff --git a/src/renderer/src/pages/history/components/TopicsHistory.tsx b/src/renderer/src/pages/history/components/TopicsHistory.tsx
index 85d8ef5a26..d95a3f7ae6 100644
--- a/src/renderer/src/pages/history/components/TopicsHistory.tsx
+++ b/src/renderer/src/pages/history/components/TopicsHistory.tsx
@@ -78,7 +78,8 @@ const TopicsHistory: React.FC<Props> = ({ keywords, onClick, onSearch, ...props
 }
 
 const ContainerWrapper = styled.div`
-  width: 800px;
+  width: 100%;
+  padding: 0 16px;
   display: flex;
   flex-direction: column;
 `
diff --git a/src/renderer/src/pages/home/Chat.tsx b/src/renderer/src/pages/home/Chat.tsx
index e2fdbb740c..8d16c5a36c 100644
--- a/src/renderer/src/pages/home/Chat.tsx
+++ b/src/renderer/src/pages/home/Chat.tsx
@@ -7,6 +7,7 @@ import { useSettings } from '@renderer/hooks/useSettings'
 import { useShortcut } from '@renderer/hooks/useShortcuts'
 import { useShowTopics } from '@renderer/hooks/useStore'
 import { Assistant, Topic } from '@renderer/types'
+import { classNames } from '@renderer/utils'
 import { Flex } from 'antd'
 import { debounce } from 'lodash'
 import React, { FC, useMemo, useState } from 'react'
@@ -106,7 +107,7 @@ const Chat: FC<Props> = (props) => {
   }
 
   return (
-    <Container id="chat" className={messageStyle}>
+    <Container id="chat" className={classNames([messageStyle, { 'multi-select-mode': isMultiSelectMode }])}>
       <Main ref={mainRef} id="chat-main" vertical flex={1} justify="space-between" style={{ maxWidth }}>
         <ContentSearch
           ref={contentSearchRef}
diff --git a/src/renderer/src/pages/home/Inputbar/Inputbar.tsx b/src/renderer/src/pages/home/Inputbar/Inputbar.tsx
index 360a76d8a8..9d3da9646e 100644
--- a/src/renderer/src/pages/home/Inputbar/Inputbar.tsx
+++ b/src/renderer/src/pages/home/Inputbar/Inputbar.tsx
@@ -139,17 +139,21 @@ const Inputbar: FC<Props> = ({ assistant: _assistant, setActiveTopic, topic }) =
   _text = text
   _files = files
 
-  const resizeTextArea = useCallback(() => {
-    const textArea = textareaRef.current?.resizableTextArea?.textArea
-    if (textArea) {
-      // 如果已经手动设置了高度,则不自动调整
-      if (textareaHeight) {
-        return
+  const resizeTextArea = useCallback(
+    (force: boolean = false) => {
+      const textArea = textareaRef.current?.resizableTextArea?.textArea
+      if (textArea) {
+        // 如果已经手动设置了高度,则不自动调整
+        if (textareaHeight && !force) {
+          return
+        }
+        if (textArea?.scrollHeight) {
+          textArea.style.height = Math.min(textArea.scrollHeight, 400) + 'px'
+        }
       }
-      textArea.style.height = 'auto'
-      textArea.style.height = textArea?.scrollHeight > 400 ? '400px' : `${textArea?.scrollHeight}px`
-    }
-  }, [textareaHeight])
+    },
+    [textareaHeight]
+  )
 
   const sendMessage = useCallback(async () => {
     if (inputEmpty || loading) {
@@ -749,13 +753,13 @@ const Inputbar: FC<Props> = ({ assistant: _assistant, setActiveTopic, topic }) =
   }
 
   return (
-    <Container
-      onDragOver={handleDragOver}
-      onDrop={handleDrop}
-      onDragEnter={handleDragEnter}
-      onDragLeave={handleDragLeave}
-      className="inputbar">
-      <NarrowLayout style={{ width: '100%' }}>
+    <NarrowLayout style={{ width: '100%' }}>
+      <Container
+        onDragOver={handleDragOver}
+        onDrop={handleDrop}
+        onDragEnter={handleDragEnter}
+        onDragLeave={handleDragLeave}
+        className="inputbar">
         <QuickPanelView setInputText={setText} />
         <InputBarContainer
           id="inputbar"
@@ -787,7 +791,7 @@ const Inputbar: FC<Props> = ({ assistant: _assistant, setActiveTopic, topic }) =
             ref={textareaRef}
             style={{
               fontSize,
-              minHeight: textareaHeight ? `${textareaHeight}px` : undefined
+              minHeight: textareaHeight ? `${textareaHeight}px` : '30px'
             }}
             styles={{ textarea: TextareaStyle }}
             onFocus={(e: React.FocusEvent<HTMLTextAreaElement>) => {
@@ -851,8 +855,8 @@ const Inputbar: FC<Props> = ({ assistant: _assistant, setActiveTopic, topic }) =
             </ToolbarMenu>
           </Toolbar>
         </InputBarContainer>
-      </NarrowLayout>
-    </Container>
+      </Container>
+    </NarrowLayout>
   )
 }
 
@@ -887,16 +891,15 @@ const Container = styled.div`
   flex-direction: column;
   position: relative;
   z-index: 2;
+  padding: 0 16px 16px 16px;
 `
 
 const InputBarContainer = styled.div`
   border: 0.5px solid var(--color-border);
   transition: all 0.2s ease;
   position: relative;
-  margin: 14px 20px;
-  margin-top: 0;
   border-radius: 15px;
-  padding-top: 6px; // 为拖动手柄留出空间
+  padding-top: 8px; // 为拖动手柄留出空间
   background-color: var(--color-background-opacity);
 
   &.file-dragging {
@@ -919,7 +922,7 @@ const InputBarContainer = styled.div`
 
 const TextareaStyle: CSSProperties = {
   paddingLeft: 0,
-  padding: '6px 15px 8px' // 减小顶部padding
+  padding: '6px 15px 0px' // 减小顶部padding
 }
 
 const Textarea = styled(TextArea)`
@@ -934,16 +937,17 @@ const Textarea = styled(TextArea)`
   &.ant-input {
     line-height: 1.4;
   }
+  &::-webkit-scrollbar {
+    width: 3px;
+  }
 `
 
 const Toolbar = styled.div`
   display: flex;
   flex-direction: row;
   justify-content: space-between;
-  padding: 0 8px;
-  padding-bottom: 0;
-  margin-bottom: 4px;
-  height: 30px;
+  padding: 5px 8px;
+  height: 40px;
   gap: 16px;
   position: relative;
   z-index: 2;
diff --git a/src/renderer/src/pages/home/Inputbar/TokenCount.tsx b/src/renderer/src/pages/home/Inputbar/TokenCount.tsx
index 0f556a1d15..bad0729b8e 100644
--- a/src/renderer/src/pages/home/Inputbar/TokenCount.tsx
+++ b/src/renderer/src/pages/home/Inputbar/TokenCount.tsx
@@ -45,7 +45,7 @@ const TokenCount: FC<Props> = ({ estimateTokenCount, inputTokenCount, contextCou
 
   return (
     <Container>
-      <Popover content={PopoverContent}>
+      <Popover content={PopoverContent} arrow={false}>
         <MenuOutlined /> {contextCount.current} / {formatMaxCount(contextCount.max)}
         <Divider type="vertical" style={{ marginTop: 0, marginLeft: 5, marginRight: 5 }} />
         <ArrowUpOutlined />
diff --git a/src/renderer/src/pages/home/Markdown/CitationTooltip.tsx b/src/renderer/src/pages/home/Markdown/CitationTooltip.tsx
index 45b804c851..6041b562af 100644
--- a/src/renderer/src/pages/home/Markdown/CitationTooltip.tsx
+++ b/src/renderer/src/pages/home/Markdown/CitationTooltip.tsx
@@ -54,9 +54,10 @@ const CitationTooltip: React.FC<CitationTooltipProps> = ({ children, citation })
 
   return (
     <Tooltip
+      arrow={false}
       overlay={tooltipContent}
       placement="top"
-      color="var(--color-background-mute)"
+      color="var(--color-background)"
       styles={{
         body: {
           border: '1px solid var(--color-border)',
diff --git a/src/renderer/src/pages/home/Markdown/CodeBlock.tsx b/src/renderer/src/pages/home/Markdown/CodeBlock.tsx
index 5692d50bf7..f6a2905448 100644
--- a/src/renderer/src/pages/home/Markdown/CodeBlock.tsx
+++ b/src/renderer/src/pages/home/Markdown/CodeBlock.tsx
@@ -27,7 +27,7 @@ const CodeBlock: React.FC<Props> = ({ children, className, id, onSave }) => {
       {children}
     </CodeBlockView>
   ) : (
-    <code className={className} style={{ textWrap: 'wrap' }}>
+    <code className={className} style={{ textWrap: 'wrap', fontSize: '95%', padding: '2px 4px' }}>
       {children}
     </code>
   )
diff --git a/src/renderer/src/pages/home/Markdown/__tests__/CitationTooltip.test.tsx b/src/renderer/src/pages/home/Markdown/__tests__/CitationTooltip.test.tsx
index 06a390c06a..072bf3047e 100644
--- a/src/renderer/src/pages/home/Markdown/__tests__/CitationTooltip.test.tsx
+++ b/src/renderer/src/pages/home/Markdown/__tests__/CitationTooltip.test.tsx
@@ -93,7 +93,7 @@ describe('CitationTooltip', () => {
 
       const tooltip = screen.getByTestId('tooltip-wrapper')
       expect(tooltip).toHaveAttribute('data-placement', 'top')
-      expect(tooltip).toHaveAttribute('data-color', 'var(--color-background-mute)')
+      expect(tooltip).toHaveAttribute('data-color', 'var(--color-background)')
 
       const styles = JSON.parse(tooltip.getAttribute('data-styles') || '{}')
       expect(styles.body).toEqual({
diff --git a/src/renderer/src/pages/home/Markdown/__tests__/__snapshots__/CitationTooltip.test.tsx.snap b/src/renderer/src/pages/home/Markdown/__tests__/__snapshots__/CitationTooltip.test.tsx.snap
index ff5c69767e..e9c6def351 100644
--- a/src/renderer/src/pages/home/Markdown/__tests__/__snapshots__/CitationTooltip.test.tsx.snap
+++ b/src/renderer/src/pages/home/Markdown/__tests__/__snapshots__/CitationTooltip.test.tsx.snap
@@ -47,7 +47,7 @@ exports[`CitationTooltip > basic rendering > should match snapshot 1`] = `
 }
 
 <div
-  data-color="var(--color-background-mute)"
+  data-color="var(--color-background)"
   data-placement="top"
   data-styles="{"body":{"border":"1px solid var(--color-border)","padding":"12px","borderRadius":"8px"}}"
   data-testid="tooltip-wrapper"
diff --git a/src/renderer/src/pages/home/Messages/Blocks/ImageBlock.tsx b/src/renderer/src/pages/home/Messages/Blocks/ImageBlock.tsx
index 8cecea1ad8..db4b35efa8 100644
--- a/src/renderer/src/pages/home/Messages/Blocks/ImageBlock.tsx
+++ b/src/renderer/src/pages/home/Messages/Blocks/ImageBlock.tsx
@@ -18,12 +18,12 @@ const ImageBlock: React.FC<Props> = ({ block }) => {
         ? [`file://${block?.file?.path}`]
         : []
     return (
-      <Container style={{ marginBottom: 8 }}>
+      <Container>
         {images.map((src, index) => (
           <ImageViewer
             src={src}
             key={`image-${index}`}
-            style={{ maxWidth: 500, maxHeight: 500, padding: 5, borderRadius: 8 }}
+            style={{ maxWidth: 500, maxHeight: 500, padding: 0, borderRadius: 8 }}
           />
         ))}
       </Container>
@@ -34,6 +34,5 @@ const Container = styled.div`
   display: flex;
   flex-direction: row;
   gap: 10px;
-  margin-top: 8px;
 `
 export default React.memo(ImageBlock)
diff --git a/src/renderer/src/pages/home/Messages/Blocks/ThinkingBlock.tsx b/src/renderer/src/pages/home/Messages/Blocks/ThinkingBlock.tsx
index 74d16a80f0..e1420ba6cb 100644
--- a/src/renderer/src/pages/home/Messages/Blocks/ThinkingBlock.tsx
+++ b/src/renderer/src/pages/home/Messages/Blocks/ThinkingBlock.tsx
@@ -3,7 +3,7 @@ import { useSettings } from '@renderer/hooks/useSettings'
 import { MessageBlockStatus, type ThinkingMessageBlock } from '@renderer/types/newMessage'
 import { lightbulbVariants } from '@renderer/utils/motionVariants'
 import { Collapse, message as antdMessage, Tooltip } from 'antd'
-import { Lightbulb } from 'lucide-react'
+import { ChevronRight, Lightbulb } from 'lucide-react'
 import { motion } from 'motion/react'
 import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -57,6 +57,14 @@ const ThinkingBlock: React.FC<Props> = ({ block }) => {
       size="small"
       onChange={() => setActiveKey((key) => (key ? '' : 'thought'))}
       className="message-thought-container"
+      expandIcon={({ isActive }) => (
+        <ChevronRight
+          color="var(--color-text-3)"
+          size={16}
+          strokeWidth={1.5}
+          style={{ transform: isActive ? 'rotate(90deg)' : 'rotate(0deg)' }}
+        />
+      )}
       expandIconPosition="end"
       items={[
         {
diff --git a/src/renderer/src/pages/home/Messages/Blocks/index.tsx b/src/renderer/src/pages/home/Messages/Blocks/index.tsx
index b469f03264..9f4d6e838a 100644
--- a/src/renderer/src/pages/home/Messages/Blocks/index.tsx
+++ b/src/renderer/src/pages/home/Messages/Blocks/index.tsx
@@ -164,17 +164,7 @@ export default React.memo(MessageBlockRenderer)
 
 const ImageBlockGroup = styled.div`
   display: grid;
-  grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
+  grid-template-columns: repeat(3, minmax(200px, 1fr));
   gap: 8px;
   max-width: 960px;
-  /* > * {
-    min-width: 200px;
-  } */
-  @media (min-width: 1536px) {
-    grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
-    max-width: 1280px;
-    > * {
-      min-width: 250px;
-    }
-  }
 `
diff --git a/src/renderer/src/pages/home/Messages/CitationsList.tsx b/src/renderer/src/pages/home/Messages/CitationsList.tsx
index 672587fff5..0c40f83ed6 100644
--- a/src/renderer/src/pages/home/Messages/CitationsList.tsx
+++ b/src/renderer/src/pages/home/Messages/CitationsList.tsx
@@ -1,10 +1,9 @@
 import ContextMenu from '@renderer/components/ContextMenu'
 import Favicon from '@renderer/components/Icons/FallbackFavicon'
-import { HStack } from '@renderer/components/Layout'
 import { fetchWebContent } from '@renderer/utils/fetch'
 import { cleanMarkdownContent } from '@renderer/utils/formats'
 import { QueryClient, QueryClientProvider, useQuery } from '@tanstack/react-query'
-import { Button, Drawer, message, Skeleton } from 'antd'
+import { Button, message, Popover, Skeleton } from 'antd'
 import { Check, Copy, FileSearch } from 'lucide-react'
 import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -48,16 +47,49 @@ const truncateText = (text: string, maxLength = 100) => {
 
 const CitationsList: React.FC<CitationsListProps> = ({ citations }) => {
   const { t } = useTranslation()
-  const [open, setOpen] = useState(false)
 
   const previewItems = citations.slice(0, 3)
   const count = citations.length
   if (!count) return null
 
+  const popoverContent = (
+    <PopoverContent>
+      {citations.map((citation) => (
+        <PopoverContentItem key={citation.url || citation.number}>
+          {citation.type === 'websearch' ? (
+            <WebSearchCitation citation={citation} />
+          ) : (
+            <KnowledgeCitation citation={citation} />
+          )}
+        </PopoverContentItem>
+      ))}
+    </PopoverContent>
+  )
+
   return (
     <QueryClientProvider client={queryClient}>
-      <>
-        <OpenButton type="text" onClick={() => setOpen(true)}>
+      <Popover
+        arrow={false}
+        content={popoverContent}
+        title={
+          <div
+            style={{
+              padding: '8px 12px 8px',
+              marginBottom: -8,
+              fontWeight: 'bold',
+              borderBottom: '0.5px solid var(--color-border)'
+            }}>
+            {t('message.citations')}
+          </div>
+        }
+        placement="right"
+        trigger="hover"
+        styles={{
+          body: {
+            padding: '0 0 8px 0'
+          }
+        }}>
+        <OpenButton type="text">
           <PreviewIcons>
             {previewItems.map((c, i) => (
               <PreviewIcon key={i} style={{ zIndex: previewItems.length - i }}>
@@ -71,27 +103,7 @@ const CitationsList: React.FC<CitationsListProps> = ({ citations }) => {
           </PreviewIcons>
           {t('message.citation', { count })}
         </OpenButton>
-
-        <Drawer
-          title={t('message.citations')}
-          placement="right"
-          onClose={() => setOpen(false)}
-          open={open}
-          width={680}
-          styles={{ header: { border: 'none' }, body: { paddingTop: 0 } }}
-          destroyOnClose={false}>
-          {open &&
-            citations.map((citation) => (
-              <HStack key={citation.url || citation.number} style={{ alignItems: 'center', gap: 8, marginBottom: 12 }}>
-                {citation.type === 'websearch' ? (
-                  <WebSearchCitation citation={citation} />
-                ) : (
-                  <KnowledgeCitation citation={citation} />
-                )}
-              </HStack>
-            ))}
-        </Drawer>
-      </>
+      </Popover>
     </QueryClientProvider>
   )
 }
@@ -136,16 +148,17 @@ const WebSearchCitation: React.FC<{ citation: Citation }> = ({ citation }) => {
   })
 
   return (
-    <WebSearchCard>
-      <ContextMenu>
+    <ContextMenu>
+      <WebSearchCard>
         <WebSearchCardHeader>
-          <CitationIndex>{citation.number}</CitationIndex>
           {citation.showFavicon && citation.url && (
             <Favicon hostname={new URL(citation.url).hostname} alt={citation.title || citation.hostname || ''} />
           )}
           <CitationLink className="text-nowrap" href={citation.url} onClick={(e) => handleLinkClick(citation.url, e)}>
             {citation.title || <span className="hostname">{citation.hostname}</span>}
           </CitationLink>
+
+          <CitationIndex>{citation.number}</CitationIndex>
           {fetchedContent && <CopyButton content={fetchedContent} />}
         </WebSearchCardHeader>
         {isLoading ? (
@@ -153,28 +166,29 @@ const WebSearchCitation: React.FC<{ citation: Citation }> = ({ citation }) => {
         ) : (
           <WebSearchCardContent className="selectable-text">{fetchedContent}</WebSearchCardContent>
         )}
-      </ContextMenu>
-    </WebSearchCard>
+      </WebSearchCard>
+    </ContextMenu>
   )
 }
 
 const KnowledgeCitation: React.FC<{ citation: Citation }> = ({ citation }) => {
   return (
-    <WebSearchCard>
-      <ContextMenu>
+    <ContextMenu>
+      <WebSearchCard>
         <WebSearchCardHeader>
-          <CitationIndex>{citation.number}</CitationIndex>
           {citation.showFavicon && <FileSearch width={16} />}
           <CitationLink className="text-nowrap" href={citation.url} onClick={(e) => handleLinkClick(citation.url, e)}>
             {citation.title}
           </CitationLink>
+
+          <CitationIndex>{citation.number}</CitationIndex>
           {citation.content && <CopyButton content={citation.content} />}
         </WebSearchCardHeader>
         <WebSearchCardContent className="selectable-text">
           {citation.content && truncateText(citation.content, 100)}
         </WebSearchCardContent>
-      </ContextMenu>
-    </WebSearchCard>
+      </WebSearchCard>
+    </ContextMenu>
   )
 }
 
@@ -213,10 +227,19 @@ const PreviewIcon = styled.div`
 `
 
 const CitationIndex = styled.div`
-  font-size: 14px;
+  width: 14px;
+  height: 14px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+  background-color: var(--color-reference);
+  font-size: 10px;
   line-height: 1.6;
-  color: var(--color-text-2);
-  margin-right: 8px;
+  color: var(--color-reference-text);
+  flex-shrink: 0;
+  opacity: 1;
+  transition: opacity 0.3s ease;
 `
 
 const CitationLink = styled.a`
@@ -224,7 +247,7 @@ const CitationLink = styled.a`
   line-height: 1.6;
   color: var(--color-text-1);
   text-decoration: none;
-
+  flex: 1;
   .hostname {
     color: var(--color-link);
   }
@@ -236,10 +259,14 @@ const CopyIconWrapper = styled.div`
   align-items: center;
   justify-content: center;
   color: var(--color-text-2);
-  opacity: 0.6;
-  margin-left: auto;
+  opacity: 0;
   padding: 4px;
   border-radius: 4px;
+  position: absolute;
+  right: 0;
+  top: 50%;
+  transform: translateY(-50%);
+  transition: opacity 0.3s ease;
 
   &:hover {
     opacity: 1;
@@ -251,11 +278,17 @@ const WebSearchCard = styled.div`
   display: flex;
   flex-direction: column;
   width: 100%;
-  padding: 12px;
-  border-radius: var(--list-item-border-radius);
-  background-color: var(--color-background);
+  padding: 12px 0;
   transition: all 0.3s ease;
   position: relative;
+  &:hover {
+    ${CopyIconWrapper} {
+      opacity: 1;
+    }
+    ${CitationIndex} {
+      opacity: 0;
+    }
+  }
 `
 
 const WebSearchCardHeader = styled.div`
@@ -265,6 +298,7 @@ const WebSearchCardHeader = styled.div`
   gap: 8px;
   margin-bottom: 6px;
   width: 100%;
+  position: relative;
 `
 
 const WebSearchCardContent = styled.div`
@@ -273,6 +307,7 @@ const WebSearchCardContent = styled.div`
   color: var(--color-text-2);
   user-select: text;
   cursor: text;
+  word-break: break-all;
 
   &.selectable-text {
     -webkit-user-select: text;
@@ -282,4 +317,16 @@ const WebSearchCardContent = styled.div`
   }
 `
 
+const PopoverContent = styled.div`
+  max-width: min(340px, 60vw);
+  max-height: 60vh;
+  padding: 0 12px;
+`
+const PopoverContentItem = styled.div`
+  border-bottom: 0.5px solid var(--color-border);
+  &:last-child {
+    border-bottom: none;
+  }
+`
+
 export default CitationsList
diff --git a/src/renderer/src/pages/home/Messages/Message.tsx b/src/renderer/src/pages/home/Messages/Message.tsx
index 19fcbdaded..96067bc375 100644
--- a/src/renderer/src/pages/home/Messages/Message.tsx
+++ b/src/renderer/src/pages/home/Messages/Message.tsx
@@ -1,9 +1,8 @@
-import ContextMenu from '@renderer/components/ContextMenu'
 import { useMessageEditing } from '@renderer/context/MessageEditingContext'
 import { useAssistant } from '@renderer/hooks/useAssistant'
 import { useMessageOperations } from '@renderer/hooks/useMessageOperations'
 import { useModel } from '@renderer/hooks/useModel'
-import { useMessageStyle, useSettings } from '@renderer/hooks/useSettings'
+import { useSettings } from '@renderer/hooks/useSettings'
 import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
 import { getMessageModelId } from '@renderer/services/MessagesService'
 import { getModelUniqId } from '@renderer/services/ModelService'
@@ -42,14 +41,12 @@ const MessageItem: FC<Props> = ({
   index,
   hideMenuBar = false,
   isGrouped,
-  isStreaming = false,
-  style
+  isStreaming = false
 }) => {
   const { t } = useTranslation()
   const { assistant, setModel } = useAssistant(message.assistantId)
   const model = useModel(getMessageModelId(message), message.model?.provider) || message.model
-  const { isBubbleStyle } = useMessageStyle()
-  const { showMessageDivider, messageFont, fontSize, narrowMode, messageStyle } = useSettings()
+  const { messageFont, fontSize } = useSettings()
   const { editMessageBlocks, resendUserMessageWithEdit, editMessage } = useMessageOperations(topic)
   const messageContainerRef = useRef<HTMLDivElement>(null)
   const { editingMessageId, stopEditing } = useMessageEditing()
@@ -101,9 +98,6 @@ const MessageItem: FC<Props> = ({
   const isAssistantMessage = message.role === 'assistant'
   const showMenubar = !hideMenuBar && !isStreaming && !message.status.includes('ing') && !isEditing
 
-  const messageBorder = !isBubbleStyle && showMessageDivider ? '1px dotted var(--color-border)' : 'none'
-  const messageBackground = getMessageBackground(isBubbleStyle, isAssistantMessage)
-
   const messageHighlightHandler = useCallback((highlight: boolean = true) => {
     if (messageContainerRef.current) {
       messageContainerRef.current.scrollIntoView({ behavior: 'smooth' })
@@ -140,101 +134,38 @@ const MessageItem: FC<Props> = ({
         'message-assistant': isAssistantMessage,
         'message-user': !isAssistantMessage
       })}
-      ref={messageContainerRef}
-      style={{
-        ...style,
-        justifyContent: isBubbleStyle ? (isAssistantMessage ? 'flex-start' : 'flex-end') : undefined,
-        flex: isBubbleStyle ? undefined : 1
-      }}>
+      ref={messageContainerRef}>
+      <MessageHeader
+        message={message}
+        assistant={assistant}
+        model={model}
+        key={getModelUniqId(model)}
+        index={index}
+        topic={topic}
+      />
       {isEditing && (
-        <ContextMenu
-          style={{
-            display: 'flex',
-            flexDirection: 'column',
-            alignSelf: isAssistantMessage ? 'flex-start' : 'flex-end',
-            width: isBubbleStyle ? '70%' : '100%'
-          }}>
-          <MessageHeader
-            message={message}
-            assistant={assistant}
-            model={model}
-            key={getModelUniqId(model)}
-            index={index}
-          />
-          <div style={{ paddingLeft: messageStyle === 'plain' ? 46 : undefined }}>
-            <MessageEditor
-              message={message}
-              onSave={handleEditSave}
-              onResend={handleEditResend}
-              onCancel={handleEditCancel}
-            />
-          </div>
-        </ContextMenu>
+        <MessageEditor
+          message={message}
+          onSave={handleEditSave}
+          onResend={handleEditResend}
+          onCancel={handleEditCancel}
+        />
       )}
       {!isEditing && (
-        <ContextMenu
-          style={{
-            display: 'flex',
-            flexDirection: 'column',
-            alignSelf: isAssistantMessage ? 'flex-start' : 'flex-end',
-            flex: 1,
-            maxWidth: '100%'
-          }}>
-          <MessageHeader
-            message={message}
-            assistant={assistant}
-            model={model}
-            key={getModelUniqId(model)}
-            index={index}
-          />
+        <>
           <MessageContentContainer
-            className={
-              message.role === 'user'
-                ? 'message-content-container message-content-container-user'
-                : message.role === 'assistant'
-                  ? 'message-content-container message-content-container-assistant'
-                  : 'message-content-container'
-            }
+            className="message-content-container"
             style={{
               fontFamily: messageFont === 'serif' ? 'var(--font-family-serif)' : 'var(--font-family)',
               fontSize,
-              background: messageBackground,
-              overflowY: 'visible',
-              maxWidth: narrowMode ? 760 : undefined,
-              alignSelf: isBubbleStyle ? (isAssistantMessage ? 'start' : 'end') : undefined
+              overflowY: 'visible'
             }}>
             <MessageErrorBoundary>
               <MessageContent message={message} />
             </MessageErrorBoundary>
-            {showMenubar && !isBubbleStyle && (
-              <MessageFooter
-                className="MessageFooter"
-                style={{
-                  borderTop: messageBorder,
-                  flexDirection: !isLastMessage ? 'row-reverse' : undefined
-                }}>
-                <MessageMenubar
-                  message={message}
-                  assistant={assistant}
-                  model={model}
-                  index={index}
-                  topic={topic}
-                  isLastMessage={isLastMessage}
-                  isAssistantMessage={isAssistantMessage}
-                  isGrouped={isGrouped}
-                  messageContainerRef={messageContainerRef as React.RefObject<HTMLDivElement>}
-                  setModel={setModel}
-                />
-              </MessageFooter>
-            )}
           </MessageContentContainer>
-          {showMenubar && isBubbleStyle && (
-            <MessageFooter
-              className="MessageFooter"
-              style={{
-                borderTop: messageBorder,
-                flexDirection: !isAssistantMessage ? 'row-reverse' : undefined
-              }}>
+          {showMenubar && (
+            <MessageFooter className="MessageFooter">
               <MessageMenubar
                 message={message}
                 assistant={assistant}
@@ -249,28 +180,22 @@ const MessageItem: FC<Props> = ({
               />
             </MessageFooter>
           )}
-        </ContextMenu>
+        </>
       )}
     </MessageContainer>
   )
 }
 
-const getMessageBackground = (isBubbleStyle: boolean, isAssistantMessage: boolean) => {
-  return isBubbleStyle
-    ? isAssistantMessage
-      ? 'var(--chat-background-assistant)'
-      : 'var(--chat-background-user)'
-    : undefined
-}
-
 const MessageContainer = styled.div`
   display: flex;
+  flex-direction: column;
   width: 100%;
   position: relative;
   transition: background-color 0.3s ease;
-  padding: 0 20px;
   transform: translateZ(0);
   will-change: transform;
+  padding: 10px 10px 0 10px;
+  border-radius: 10px;
   &.message-highlight {
     background-color: var(--color-primary-mute);
   }
@@ -292,11 +217,7 @@ const MessageContainer = styled.div`
 
 const MessageContentContainer = styled.div`
   max-width: 100%;
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  justify-content: space-between;
-  margin-left: 46px;
+  padding-left: 46px;
   margin-top: 5px;
   overflow-y: auto;
 `
@@ -306,9 +227,8 @@ const MessageFooter = styled.div`
   flex-direction: row;
   justify-content: space-between;
   align-items: center;
-  padding: 2px 0;
-  margin-top: 2px;
   gap: 20px;
+  margin-left: 46px;
 `
 
 const NewContextMessage = styled.div`
diff --git a/src/renderer/src/pages/home/Messages/MessageAnchorLine.tsx b/src/renderer/src/pages/home/Messages/MessageAnchorLine.tsx
index 3e4773dcd1..7b116f8495 100644
--- a/src/renderer/src/pages/home/Messages/MessageAnchorLine.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageAnchorLine.tsx
@@ -184,7 +184,7 @@ const MessageAnchorLine: FC<MessageLineProps> = ({ messages }) => {
             else messageItemsRef.current.delete('bottom-anchor')
           }}
           style={{
-            opacity: mouseY ? 0.5 + calculateValueByDistance('bottom-anchor', 1) : 0.6
+            opacity: mouseY ? 0.5 : Math.max(0, 0.6 - (0.3 * Math.abs(0 - messages.length / 2)) / 5)
           }}
           onClick={scrollToBottom}>
           <CircleChevronDown
@@ -194,7 +194,7 @@ const MessageAnchorLine: FC<MessageLineProps> = ({ messages }) => {
         </MessageItem>
         {messages.map((message, index) => {
           const opacity = 0.5 + calculateValueByDistance(message.id, 1)
-          const scale = 1 + calculateValueByDistance(message.id, 1)
+          const scale = 1 + calculateValueByDistance(message.id, 1.2)
           const size = 10 + calculateValueByDistance(message.id, 20)
           const avatarSource = getAvatarSource(isLocalAi, getMessageModelId(message))
           const username = removeLeadingEmoji(getUserName(message))
@@ -219,15 +219,14 @@ const MessageAnchorLine: FC<MessageLineProps> = ({ messages }) => {
               </MessageItemContainer>
 
               {message.role === 'assistant' ? (
-                <Avatar
+                <MessageItemAvatar
                   src={avatarSource}
                   size={size}
                   style={{
                     border: isLocalAi ? '1px solid var(--color-border-soft)' : 'none',
                     filter: theme === 'dark' ? 'invert(0.05)' : undefined
-                  }}>
-                  A
-                </Avatar>
+                  }}
+                />
               ) : (
                 <>
                   {isEmoji(avatar) ? (
@@ -241,7 +240,7 @@ const MessageAnchorLine: FC<MessageLineProps> = ({ messages }) => {
                       {avatar}
                     </EmojiAvatar>
                   ) : (
-                    <Avatar src={avatar} size={size} />
+                    <MessageItemAvatar src={avatar} size={size} />
                   )}
                 </>
               )}
@@ -260,17 +259,28 @@ const MessageItemContainer = styled.div`
   align-items: flex-end;
   justify-content: space-between;
   text-align: right;
-  gap: 4px;
+  gap: 3px;
   opacity: 0;
   transform-origin: right center;
+  transition: transform cubic-bezier(0.25, 1, 0.5, 1) 150ms;
+  will-change: transform;
+`
+
+const MessageItemAvatar = styled(Avatar)`
+  transition:
+    width,
+    height,
+    cubic-bezier(0.25, 1, 0.5, 1) 150ms;
+  will-change: width, height;
 `
 
 const MessageLineContainer = styled.div<{ $height: number | null }>`
   width: 14px;
   position: fixed;
-  top: ${(props) => (props.$height ? `calc(${props.$height / 2}px + var(--status-bar-height))` : '50%')};
+  top: calc(50% - var(--status-bar-height) - 10px);
   right: 13px;
-  max-height: ${(props) => (props.$height ? `${props.$height}px` : 'calc(100% - var(--status-bar-height) * 2)')};
+  max-height: ${(props) =>
+    props.$height ? `${props.$height - 20}px` : 'calc(100% - var(--status-bar-height) * 2 - 20px)'};
   transform: translateY(-50%);
   z-index: 0;
   user-select: none;
@@ -280,7 +290,7 @@ const MessageLineContainer = styled.div<{ $height: number | null }>`
   font-size: 5px;
   overflow: hidden;
   &:hover {
-    width: 440px;
+    width: 500px;
     overflow-x: visible;
     overflow-y: hidden;
     ${MessageItemContainer} {
diff --git a/src/renderer/src/pages/home/Messages/MessageEditor.tsx b/src/renderer/src/pages/home/Messages/MessageEditor.tsx
index 62636ccd68..36449c8efd 100644
--- a/src/renderer/src/pages/home/Messages/MessageEditor.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageEditor.tsx
@@ -308,10 +308,11 @@ const MessageBlockEditor: FC<Props> = ({ message, onSave, onResend, onCancel })
 
 const EditorContainer = styled.div`
   padding: 8px 0;
-  border: 1px solid var(--color-border);
+  border: 0.5px solid var(--color-border);
   transition: all 0.2s ease;
   border-radius: 15px;
   margin-top: 5px;
+  margin-bottom: 10px;
   background-color: var(--color-background-opacity);
   width: 100%;
 
diff --git a/src/renderer/src/pages/home/Messages/MessageGroup.tsx b/src/renderer/src/pages/home/Messages/MessageGroup.tsx
index efc9cd8f5d..69b7e7243b 100644
--- a/src/renderer/src/pages/home/Messages/MessageGroup.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageGroup.tsx
@@ -1,4 +1,3 @@
-import Scrollbar from '@renderer/components/Scrollbar'
 import { MessageEditingProvider } from '@renderer/context/MessageEditingContext'
 import { useChatContext } from '@renderer/hooks/useChatContext'
 import { useMessageOperations } from '@renderer/hooks/useMessageOperations'
@@ -10,11 +9,10 @@ import type { Message } from '@renderer/types/newMessage'
 import { classNames } from '@renderer/utils'
 import { Popover } from 'antd'
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import styled, { css } from 'styled-components'
+import styled from 'styled-components'
 
 import MessageItem from './Message'
 import MessageGroupMenuBar from './MessageGroupMenuBar'
-import SelectableMessage from './MessageSelect'
 
 interface Props {
   messages: (Message & { index: number })[]
@@ -62,7 +60,6 @@ const MessageGroup = ({ messages, topic, registerMessageElement }: Props) => {
   )
 
   const isGrouped = isMultiSelectMode ? false : messageLength > 1 && messages.every((m) => m.role === 'assistant')
-  const isHorizontal = multiModelMessageStyle === 'horizontal'
   const isGrid = multiModelMessageStyle === 'grid'
 
   useEffect(() => {
@@ -166,25 +163,19 @@ const MessageGroup = ({ messages, topic, registerMessageElement }: Props) => {
         isGrouped,
         message,
         topic,
-        index: message.index,
-        style: {
-          paddingTop: isGrouped && ['horizontal', 'grid'].includes(multiModelMessageStyle) ? 0 : 15
-        }
+        index: message.index
       }
 
       const messageContent = (
         <MessageWrapper
           id={`message-${message.id}`}
-          $layout={multiModelMessageStyle}
-          // $selected={index === selectedIndex}
-          $isGrouped={isGrouped}
           key={message.id}
-          className={classNames({
-            // 加个卡片布局
-            'group-message-wrapper': message.role === 'assistant' && (isHorizontal || isGrid) && isGrouped,
-            [multiModelMessageStyle]: isGrouped,
-            selected: message.id === selectedMessageId
-          })}>
+          className={classNames([
+            {
+              [multiModelMessageStyle]: message.role === 'assistant',
+              selected: message.id === selectedMessageId
+            }
+          ])}>
           <MessageItem {...messageProps} />
         </MessageWrapper>
       )
@@ -193,47 +184,43 @@ const MessageGroup = ({ messages, topic, registerMessageElement }: Props) => {
         return (
           <Popover
             key={message.id}
+            destroyTooltipOnHide
             content={
               <MessageWrapper
-                $layout={multiModelMessageStyle}
-                // $selected={index === selectedIndex}
-                $isGrouped={isGrouped}
-                $isInPopover={true}>
+                className={classNames([
+                  'in-popover',
+                  {
+                    [multiModelMessageStyle]: message.role === 'assistant',
+                    selected: message.id === selectedMessageId
+                  }
+                ])}>
                 <MessageItem {...messageProps} />
               </MessageWrapper>
             }
             trigger={gridPopoverTrigger}
-            styles={{ root: { maxWidth: '60vw', minWidth: '550px', overflowY: 'auto', zIndex: 1000 } }}>
-            <div style={{ cursor: 'pointer' }}>{messageContent}</div>
+            styles={{
+              root: { maxWidth: '60vw', overflowY: 'auto', zIndex: 1000 },
+              body: { padding: 2 }
+            }}>
+            {messageContent}
           </Popover>
         )
       }
 
-      return (
-        <SelectableMessage
-          key={`selectable-${message.id}`}
-          messageId={message.id}
-          topic={topic}
-          isClearMessage={message.type === 'clear'}>
-          {messageContent}
-        </SelectableMessage>
-      )
+      return messageContent
     },
-    [isGrid, isGrouped, topic, multiModelMessageStyle, isHorizontal, selectedMessageId, gridPopoverTrigger]
+    [isGrid, isGrouped, topic, multiModelMessageStyle, selectedMessageId, gridPopoverTrigger]
   )
 
   return (
     <MessageEditingProvider>
       <GroupContainer
-        id={`message-group-${messages[0].askId}`}
-        $isGrouped={isGrouped}
-        $layout={multiModelMessageStyle}
-        className={classNames([isGrouped && 'group-container', isHorizontal && 'horizontal', isGrid && 'grid'])}>
+        id={messages[0].askId ? `message-group-${messages[0].askId}` : undefined}
+        className={classNames([multiModelMessageStyle, { 'multi-select-mode': isMultiSelectMode }])}>
         <GridContainer
           $count={messageLength}
-          $layout={multiModelMessageStyle}
           $gridColumns={gridColumns}
-          className={classNames([isGrouped && 'group-grid-container', isHorizontal && 'horizontal', isGrid && 'grid'])}>
+          className={classNames([multiModelMessageStyle, { 'multi-select-mode': isMultiSelectMode }])}>
           {messages.map(renderMessage)}
         </GridContainer>
         {isGrouped && (
@@ -256,73 +243,103 @@ const MessageGroup = ({ messages, topic, registerMessageElement }: Props) => {
   )
 }
 
-const GroupContainer = styled.div<{ $isGrouped: boolean; $layout: MultiModelMessageStyle }>`
-  padding-top: ${({ $isGrouped, $layout }) => ($isGrouped && 'horizontal' === $layout ? '15px' : '0')};
-  &.group-container.horizontal,
-  &.group-container.grid {
-    padding: 0 20px;
-    .message {
-      padding: 0;
-    }
+const GroupContainer = styled.div`
+  &.horizontal,
+  &.grid {
+    padding: 4px 10px;
     .group-menu-bar {
       margin-left: 0;
       margin-right: 0;
     }
   }
+  &.multi-select-mode {
+    padding: 5px 10px;
+  }
 `
 
-const GridContainer = styled.div<{ $count: number; $layout: MultiModelMessageStyle; $gridColumns: number }>`
+const GridContainer = styled.div<{ $count: number; $gridColumns: number }>`
   width: 100%;
   display: grid;
-  gap: ${({ $layout }) => ($layout === 'horizontal' ? '16px' : '0')};
-  grid-template-columns: repeat(
-    ${({ $layout, $count }) => (['fold', 'vertical'].includes($layout) ? 1 : $count)},
-    minmax(480px, 1fr)
-  );
-  @media (max-width: 800px) {
-    grid-template-columns: repeat(
-      ${({ $layout, $count }) => (['fold', 'vertical'].includes($layout) ? 1 : $count)},
-      minmax(400px, 1fr)
-    );
+  overflow-y: visible;
+  gap: 16px;
+  &.horizontal {
+    padding-bottom: 4px;
+    grid-template-columns: repeat(${({ $count }) => $count}, minmax(480px, 1fr));
+    overflow-x: auto;
+  }
+  &.fold,
+  &.vertical {
+    grid-template-columns: repeat(1, minmax(0, 1fr));
+    gap: 8px;
+  }
+  &.grid {
+    grid-template-columns: repeat(
+      ${({ $count, $gridColumns }) => ($count > 1 ? $gridColumns || 2 : 1)},
+      minmax(0, 1fr)
+    );
+    grid-template-rows: auto;
+  }
+
+  &.multi-select-mode {
+    grid-template-columns: repeat(1, minmax(0, 1fr));
+    gap: 10px;
+    .message {
+      border: 0.5px solid var(--color-border);
+      border-radius: 10px;
+      padding: 10px;
+      .message-content-container {
+        max-height: 200px;
+        overflow-y: hidden !important;
+      }
+      .MessageFooter {
+        display: none;
+      }
+    }
   }
-  ${({ $layout }) =>
-    $layout === 'horizontal' &&
-    css`
-      margin-top: 15px;
-    `}
-  ${({ $gridColumns, $layout, $count }) =>
-    $layout === 'grid' &&
-    css`
-      margin-top: 15px;
-      grid-template-columns: repeat(${$count > 1 ? $gridColumns || 2 : 1}, minmax(0, 1fr));
-      grid-template-rows: auto;
-      gap: 16px;
-    `}
-  ${({ $layout }) => {
-    return $layout === 'horizontal'
-      ? css`
-          overflow-y: auto;
-        `
-      : 'overflow-y: visible;'
-  }}
 `
 
 interface MessageWrapperProps {
-  $layout: 'fold' | 'horizontal' | 'vertical' | 'grid'
-  // $selected: boolean
-  $isGrouped: boolean
   $isInPopover?: boolean
 }
 
-const MessageWrapper = styled(Scrollbar)<MessageWrapperProps>`
-  width: 100%;
-  display: flex;
-
+const MessageWrapper = styled.div<MessageWrapperProps>`
   &.horizontal {
-    display: inline-block;
+    overflow-y: auto;
+    .message {
+      border: 0.5px solid var(--color-border);
+      border-radius: 10px;
+    }
+    .message-content-container {
+      padding-left: 0;
+      max-height: calc(100vh - 350px);
+      overflow-y: auto !important;
+      margin-right: -10px;
+    }
+    .MessageFooter {
+      margin-left: 0;
+      margin-top: 2px;
+      margin-bottom: 2px;
+    }
   }
   &.grid {
-    display: inline-block;
+    height: 300px;
+    overflow-y: hidden;
+    border: 0.5px solid var(--color-border);
+    border-radius: 10px;
+    cursor: pointer;
+  }
+  &.in-popover {
+    height: auto;
+    border: none;
+    max-height: 50vh;
+    overflow-y: auto;
+    cursor: default;
+    .message-content-container {
+      padding-left: 0;
+    }
+    .MessageFooter {
+      margin-left: 0;
+    }
   }
   &.fold {
     display: none;
@@ -330,38 +347,6 @@ const MessageWrapper = styled(Scrollbar)<MessageWrapperProps>`
       display: inline-block;
     }
   }
-
-  ${({ $layout, $isGrouped }) => {
-    if ($layout === 'horizontal' && $isGrouped) {
-      return css`
-        border: 0.5px solid var(--color-border);
-        padding: 10px;
-        border-radius: 6px;
-        max-height: 600px;
-        margin-bottom: 10px;
-      `
-    }
-    return ''
-  }}
-
-  ${({ $layout, $isInPopover, $isGrouped }) => {
-    // 如果布局是grid，并且是组消息，则设置最大高度和溢出行为（卡片不可滚动，点击展开后可滚动）
-    // 如果布局是horizontal，则设置溢出行为（卡片可滚动）
-    // 如果布局是fold、vertical，高度不限制，与正常消息流布局一致，则设置卡片不可滚动（visible）
-    return $layout === 'grid' && $isGrouped
-      ? css`
-          max-height: ${$isInPopover ? '50vh' : '300px'};
-          overflow-y: ${$isInPopover ? 'auto' : 'hidden'};
-          border: 0.5px solid ${$isInPopover ? 'transparent' : 'var(--color-border)'};
-          padding: 10px;
-          border-radius: 6px;
-          background-color: var(--color-background);
-        `
-      : css`
-          overflow-y: ${$layout === 'horizontal' ? 'auto' : 'visible'};
-          border-radius: 6px;
-        `
-  }}
 `
 
 export default memo(MessageGroup)
diff --git a/src/renderer/src/pages/home/Messages/MessageGroupMenuBar.tsx b/src/renderer/src/pages/home/Messages/MessageGroupMenuBar.tsx
index bd639eb472..6c2e7766d7 100644
--- a/src/renderer/src/pages/home/Messages/MessageGroupMenuBar.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageGroupMenuBar.tsx
@@ -59,6 +59,7 @@ const MessageGroupMenuBar: FC<Props> = ({
         <LayoutContainer>
           {['fold', 'vertical', 'horizontal', 'grid'].map((layout) => (
             <Tooltip
+              mouseEnterDelay={0.5}
               key={layout}
               title={t(`message.message.multi_model_style`) + ': ' + t(`message.message.multi_model_style.${layout}`)}>
               <LayoutOption
@@ -101,15 +102,13 @@ const GroupMenuBar = styled.div<{ $layout: MultiModelMessageStyle }>`
   flex-direction: row;
   align-items: center;
   gap: 10px;
-  margin: 0 20px;
-  padding: 6px 10px;
-  border-radius: 6px;
-  margin-top: 10px;
+  padding: 8px;
+  border-radius: 10px;
+  margin: 8px 10px 16px;
   justify-content: space-between;
   overflow: hidden;
   border: 0.5px solid var(--color-border);
   height: 40px;
-  background-color: var(--color-background);
 `
 
 const LayoutContainer = styled.div`
diff --git a/src/renderer/src/pages/home/Messages/MessageGroupSettings.tsx b/src/renderer/src/pages/home/Messages/MessageGroupSettings.tsx
index 0b52c4168e..208a75f952 100644
--- a/src/renderer/src/pages/home/Messages/MessageGroupSettings.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageGroupSettings.tsx
@@ -1,10 +1,11 @@
 import { SettingOutlined } from '@ant-design/icons'
+import Selector from '@renderer/components/Selector'
 import { useSettings } from '@renderer/hooks/useSettings'
 import { SettingDivider } from '@renderer/pages/settings'
 import { SettingRow } from '@renderer/pages/settings'
 import { useAppDispatch } from '@renderer/store'
 import { setGridColumns, setGridPopoverTrigger } from '@renderer/store/settings'
-import { Col, Row, Select, Slider } from 'antd'
+import { Col, Row, Slider } from 'antd'
 import { Popover } from 'antd'
 import { FC, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -18,19 +19,21 @@ const MessageGroupSettings: FC = () => {
 
   return (
     <Popover
+      arrow={false}
       trigger={undefined}
-      showArrow
       content={
-        <div style={{ padding: 10 }}>
+        <div style={{ padding: 8 }}>
           <SettingRow>
             <div style={{ marginRight: 10 }}>{t('settings.messages.grid_popover_trigger')}</div>
-            <Select
+            <Selector
+              size={14}
               value={gridPopoverTrigger || 'hover'}
               onChange={(value) => dispatch(setGridPopoverTrigger(value as 'hover' | 'click'))}
-              size="small">
-              <Select.Option value="hover">{t('settings.messages.grid_popover_trigger.hover')}</Select.Option>
-              <Select.Option value="click">{t('settings.messages.grid_popover_trigger.click')}</Select.Option>
-            </Select>
+              options={[
+                { label: t('settings.messages.grid_popover_trigger.hover'), value: 'hover' },
+                { label: t('settings.messages.grid_popover_trigger.click'), value: 'click' }
+              ]}
+            />
           </SettingRow>
           <SettingDivider />
           <SettingRow>
diff --git a/src/renderer/src/pages/home/Messages/MessageHeader.tsx b/src/renderer/src/pages/home/Messages/MessageHeader.tsx
index 285cfd516f..465ca923b8 100644
--- a/src/renderer/src/pages/home/Messages/MessageHeader.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageHeader.tsx
@@ -4,16 +4,17 @@ import { APP_NAME, AppLogo, isLocalAi } from '@renderer/config/env'
 import { getModelLogo } from '@renderer/config/models'
 import { useTheme } from '@renderer/context/ThemeProvider'
 import useAvatar from '@renderer/hooks/useAvatar'
+import { useChatContext } from '@renderer/hooks/useChatContext'
 import { useMinappPopup } from '@renderer/hooks/useMinappPopup'
 import { useMessageStyle, useSettings } from '@renderer/hooks/useSettings'
 import { getMessageModelId } from '@renderer/services/MessagesService'
 import { getModelName } from '@renderer/services/ModelService'
-import type { Assistant, Model } from '@renderer/types'
+import type { Assistant, Model, Topic } from '@renderer/types'
 import type { Message } from '@renderer/types/newMessage'
 import { firstLetter, isEmoji, removeLeadingEmoji } from '@renderer/utils'
-import { Avatar } from 'antd'
+import { Avatar, Checkbox } from 'antd'
 import dayjs from 'dayjs'
-import { CSSProperties, FC, memo, useCallback, useMemo } from 'react'
+import { FC, memo, useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
@@ -24,6 +25,7 @@ interface Props {
   assistant: Assistant
   model?: Model
   index: number | undefined
+  topic: Topic
 }
 
 const getAvatarSource = (isLocalAi: boolean, modelId: string | undefined) => {
@@ -31,7 +33,7 @@ const getAvatarSource = (isLocalAi: boolean, modelId: string | undefined) => {
   return modelId ? getModelLogo(modelId) : undefined
 }
 
-const MessageHeader: FC<Props> = memo(({ assistant, model, message, index }) => {
+const MessageHeader: FC<Props> = memo(({ assistant, model, message, index, topic }) => {
   const avatar = useAvatar()
   const { theme } = useTheme()
   const { userName, sidebarIcons } = useSettings()
@@ -39,6 +41,10 @@ const MessageHeader: FC<Props> = memo(({ assistant, model, message, index }) =>
   const { isBubbleStyle } = useMessageStyle()
   const { openMinappById } = useMinappPopup()
 
+  const { isMultiSelectMode, selectedMessageIds, handleSelectMessage } = useChatContext(topic)
+
+  const isSelected = selectedMessageIds?.includes(message.id)
+
   const avatarSource = useMemo(() => getAvatarSource(isLocalAi, getMessageModelId(message)), [message])
 
   const getUserName = useCallback(() => {
@@ -67,65 +73,54 @@ const MessageHeader: FC<Props> = memo(({ assistant, model, message, index }) =>
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [model?.provider, showMinappIcon])
 
-  const avatarStyle: CSSProperties | undefined = isBubbleStyle
-    ? {
-        flexDirection: isAssistantMessage ? 'row' : 'row-reverse',
-        textAlign: isAssistantMessage ? 'left' : 'right'
-      }
-    : undefined
-
-  const containerStyle = isBubbleStyle
-    ? {
-        justifyContent: isAssistantMessage ? 'flex-start' : 'flex-end'
-      }
-    : undefined
-
   return (
-    <Container className="message-header" style={containerStyle}>
-      <AvatarWrapper style={avatarStyle}>
-        {isAssistantMessage ? (
-          <Avatar
-            src={avatarSource}
-            size={35}
-            style={{
-              borderRadius: '25%',
-              cursor: showMinappIcon ? 'pointer' : 'default',
-              border: isLocalAi ? '1px solid var(--color-border-soft)' : 'none',
-              filter: theme === 'dark' ? 'invert(0.05)' : undefined
-            }}
-            onClick={showMiniApp}>
-            {avatarName}
-          </Avatar>
-        ) : (
-          <>
-            {isEmoji(avatar) ? (
-              <EmojiAvatar onClick={() => UserPopup.show()} size={35} fontSize={20}>
-                {avatar}
-              </EmojiAvatar>
-            ) : (
-              <Avatar
-                src={avatar}
-                size={35}
-                style={{ borderRadius: '25%', cursor: 'pointer' }}
-                onClick={() => UserPopup.show()}
-              />
-            )}
-          </>
-        )}
-        <UserWrap>
-          <UserName isBubbleStyle={isBubbleStyle} theme={theme}>
-            {username}
-          </UserName>
-          <InfoWrap
-            style={{
-              flexDirection: !isAssistantMessage && isBubbleStyle ? 'row-reverse' : undefined
-            }}>
-            <MessageTime>{dayjs(message?.updatedAt ?? message.createdAt).format('MM/DD HH:mm')}</MessageTime>
-            {showTokens && <DividerContainer style={{ color: 'var(--color-text-3)' }}> | </DividerContainer>}
-            <MessageTokens message={message} isLastMessage={isLastMessage} />
-          </InfoWrap>
-        </UserWrap>
-      </AvatarWrapper>
+    <Container className="message-header">
+      {isAssistantMessage ? (
+        <Avatar
+          src={avatarSource}
+          size={35}
+          style={{
+            borderRadius: '25%',
+            cursor: showMinappIcon ? 'pointer' : 'default',
+            border: isLocalAi ? '1px solid var(--color-border-soft)' : 'none',
+            filter: theme === 'dark' ? 'invert(0.05)' : undefined
+          }}
+          onClick={showMiniApp}>
+          {avatarName}
+        </Avatar>
+      ) : (
+        <>
+          {isEmoji(avatar) ? (
+            <EmojiAvatar onClick={() => UserPopup.show()} size={35} fontSize={20}>
+              {avatar}
+            </EmojiAvatar>
+          ) : (
+            <Avatar
+              src={avatar}
+              size={35}
+              style={{ borderRadius: '25%', cursor: 'pointer' }}
+              onClick={() => UserPopup.show()}
+            />
+          )}
+        </>
+      )}
+      <UserWrap>
+        <UserName isBubbleStyle={isBubbleStyle} theme={theme}>
+          {username}
+        </UserName>
+        <InfoWrap className="message-header-info-wrap">
+          <MessageTime>{dayjs(message?.updatedAt ?? message.createdAt).format('MM/DD HH:mm')}</MessageTime>
+          {showTokens && <DividerContainer style={{ color: 'var(--color-text-3)' }}> | </DividerContainer>}
+          <MessageTokens message={message} isLastMessage={isLastMessage} />
+        </InfoWrap>
+      </UserWrap>
+      {isMultiSelectMode && (
+        <Checkbox
+          checked={isSelected}
+          onChange={(e) => handleSelectMessage(message.id, e.target.checked)}
+          style={{ position: 'absolute', right: 0, top: 0 }}
+        />
+      )}
     </Container>
   )
 })
@@ -133,23 +128,18 @@ const MessageHeader: FC<Props> = memo(({ assistant, model, message, index }) =>
 MessageHeader.displayName = 'MessageHeader'
 
 const Container = styled.div`
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  padding-bottom: 4px;
-`
-
-const AvatarWrapper = styled.div`
   display: flex;
   flex-direction: row;
   align-items: center;
   gap: 10px;
+  position: relative;
 `
 
 const UserWrap = styled.div`
   display: flex;
   flex-direction: column;
   justify-content: space-between;
+  flex: 1;
 `
 
 const InfoWrap = styled.div`
diff --git a/src/renderer/src/pages/home/Messages/MessageMenubar.tsx b/src/renderer/src/pages/home/Messages/MessageMenubar.tsx
index c7e39adf2d..50a4fc95ed 100644
--- a/src/renderer/src/pages/home/Messages/MessageMenubar.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageMenubar.tsx
@@ -507,8 +507,7 @@ const MessageMenubar: FC<Props> = (props) => {
         <Dropdown
           menu={{ items: dropdownItems, onClick: (e) => e.domEvent.stopPropagation() }}
           trigger={['click']}
-          placement="topRight"
-          arrow>
+          placement="topRight">
           <ActionButton
             className="message-action-button"
             onClick={(e) => e.stopPropagation()}
diff --git a/src/renderer/src/pages/home/Messages/Messages.tsx b/src/renderer/src/pages/home/Messages/Messages.tsx
index cae4237ffd..1a7d46024c 100644
--- a/src/renderer/src/pages/home/Messages/Messages.tsx
+++ b/src/renderer/src/pages/home/Messages/Messages.tsx
@@ -1,3 +1,4 @@
+import ContextMenu from '@renderer/components/ContextMenu'
 import SvgSpinners180Ring from '@renderer/components/Icons/SvgSpinners180Ring'
 import Scrollbar from '@renderer/components/Scrollbar'
 import { LOAD_MORE_COUNT } from '@renderer/config/constant'
@@ -271,7 +272,6 @@ const Messages: React.FC<MessagesProps> = ({ assistant, topic, setActiveTopic, o
       id="messages"
       className="messages-container"
       ref={scrollContainerRef}
-      style={{ position: 'relative', paddingTop: showPrompt ? 10 : 0 }}
       key={assistant.id}
       onScroll={handleScrollPosition}>
       <NarrowLayout style={{ display: 'flex', flexDirection: 'column-reverse' }}>
@@ -283,22 +283,25 @@ const Messages: React.FC<MessagesProps> = ({ assistant, topic, setActiveTopic, o
           scrollableTarget="messages"
           inverse
           style={{ overflow: 'visible' }}>
-          <ScrollContainer>
-            {groupedMessages.map(([key, groupMessages]) => (
-              <MessageGroup
-                key={key}
-                messages={groupMessages}
-                topic={topic}
-                registerMessageElement={registerMessageElement}
-              />
-            ))}
-            {isLoadingMore && (
-              <LoaderContainer>
-                <SvgSpinners180Ring color="var(--color-text-2)" />
-              </LoaderContainer>
-            )}
-          </ScrollContainer>
+          <ContextMenu>
+            <ScrollContainer>
+              {groupedMessages.map(([key, groupMessages]) => (
+                <MessageGroup
+                  key={key}
+                  messages={groupMessages}
+                  topic={topic}
+                  registerMessageElement={registerMessageElement}
+                />
+              ))}
+              {isLoadingMore && (
+                <LoaderContainer>
+                  <SvgSpinners180Ring color="var(--color-text-2)" />
+                </LoaderContainer>
+              )}
+            </ScrollContainer>
+          </ContextMenu>
         </InfiniteScroll>
+
         {showPrompt && <Prompt assistant={assistant} key={assistant.prompt} topic={topic} />}
       </NarrowLayout>
       {messageNavigation === 'anchor' && <MessageAnchorLine messages={displayMessages} />}
@@ -361,6 +364,10 @@ const LoaderContainer = styled.div`
 const ScrollContainer = styled.div`
   display: flex;
   flex-direction: column-reverse;
+  padding: 20px 10px 20px 16px;
+  .multi-select-mode & {
+    padding-bottom: 60px;
+  }
 `
 
 interface ContainerProps {
@@ -370,11 +377,9 @@ interface ContainerProps {
 const MessagesContainer = styled(Scrollbar)<ContainerProps>`
   display: flex;
   flex-direction: column-reverse;
-  padding: 10px 0 20px;
   overflow-x: hidden;
-  background-color: var(--color-background);
   z-index: 1;
-  margin-right: 2px;
+  position: relative;
 `
 
 export default Messages
diff --git a/src/renderer/src/pages/home/Messages/NarrowLayout.tsx b/src/renderer/src/pages/home/Messages/NarrowLayout.tsx
index b1579b4dc5..6431bb151c 100644
--- a/src/renderer/src/pages/home/Messages/NarrowLayout.tsx
+++ b/src/renderer/src/pages/home/Messages/NarrowLayout.tsx
@@ -10,7 +10,11 @@ const NarrowLayout: FC<Props> = ({ children, ...props }) => {
   const { narrowMode } = useSettings()
 
   if (narrowMode) {
-    return <Container {...props}>{children}</Container>
+    return (
+      <Container className="narrow-mode" {...props}>
+        {children}
+      </Container>
+    )
   }
 
   return children
diff --git a/src/renderer/src/pages/home/Messages/Prompt.tsx b/src/renderer/src/pages/home/Messages/Prompt.tsx
index 1fe67eca43..f0df2a460f 100644
--- a/src/renderer/src/pages/home/Messages/Prompt.tsx
+++ b/src/renderer/src/pages/home/Messages/Prompt.tsx
@@ -30,11 +30,11 @@ const Prompt: FC<Props> = ({ assistant, topic }) => {
 }
 
 const Container = styled.div<{ $isDark: boolean }>`
-  padding: 10px 20px;
-  margin: 5px 20px 0 20px;
+  padding: 10px 16px;
   border-radius: 10px;
   cursor: pointer;
   border: 0.5px solid var(--color-border);
+  margin: 10px 10px 0 10px;
 `
 
 const Text = styled.div`
diff --git a/src/renderer/src/pages/home/Tabs/SettingsTab.tsx b/src/renderer/src/pages/home/Tabs/SettingsTab.tsx
index b3b7a844e7..67c3ba7b97 100644
--- a/src/renderer/src/pages/home/Tabs/SettingsTab.tsx
+++ b/src/renderer/src/pages/home/Tabs/SettingsTab.tsx
@@ -1,6 +1,7 @@
-import { CheckOutlined } from '@ant-design/icons'
+import EditableNumber from '@renderer/components/EditableNumber'
 import { HStack } from '@renderer/components/Layout'
 import Scrollbar from '@renderer/components/Scrollbar'
+import Selector from '@renderer/components/Selector'
 import { DEFAULT_CONTEXTCOUNT, DEFAULT_MAX_TOKENS, DEFAULT_TEMPERATURE } from '@renderer/config/constant'
 import {
   isOpenAIModel,
@@ -38,7 +39,6 @@ import {
   setPasteLongTextThreshold,
   setRenderInputMessageAsMarkdown,
   setShowInputEstimatedTokens,
-  setShowMessageDivider,
   setShowPrompt,
   setShowTokens,
   setShowTranslateConfirm,
@@ -54,7 +54,7 @@ import {
 } from '@renderer/types'
 import { modalConfirm } from '@renderer/utils'
 import { getSendMessageShortcutLabel } from '@renderer/utils/input'
-import { Button, Col, InputNumber, Row, Select, Slider, Switch, Tooltip } from 'antd'
+import { Button, Col, InputNumber, Row, Slider, Switch, Tooltip } from 'antd'
 import { CircleHelp, Settings2 } from 'lucide-react'
 import { FC, useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -86,7 +86,6 @@ const SettingsTab: FC<Props> = (props) => {
 
   const {
     showPrompt,
-    showMessageDivider,
     messageFont,
     showInputEstimatedTokens,
     sendMessageShortcut,
@@ -312,20 +311,6 @@ const SettingsTab: FC<Props> = (props) => {
             <Switch size="small" checked={showTokens} onChange={(checked) => dispatch(setShowTokens(checked))} />
           </SettingRow>
           <SettingDivider />
-          <SettingRow>
-            <SettingRowTitleSmall>
-              {t('settings.messages.divider')}
-              <Tooltip title={t('settings.messages.divider.tooltip')}>
-                <CircleHelp size={14} style={{ marginLeft: 4 }} color="var(--color-text-2)" />
-              </Tooltip>
-            </SettingRowTitleSmall>
-            <Switch
-              size="small"
-              checked={showMessageDivider}
-              onChange={(checked) => dispatch(setShowMessageDivider(checked))}
-            />
-          </SettingRow>
-          <SettingDivider />
           <SettingRow>
             <SettingRowTitleSmall>{t('settings.messages.use_serif_font')}</SettingRowTitleSmall>
             <Switch
@@ -351,56 +336,56 @@ const SettingsTab: FC<Props> = (props) => {
           <SettingDivider />
           <SettingRow>
             <SettingRowTitleSmall>{t('message.message.style')}</SettingRowTitleSmall>
-            <StyledSelect
+            <Selector
               value={messageStyle}
               onChange={(value) => dispatch(setMessageStyle(value as 'plain' | 'bubble'))}
-              style={{ width: 135 }}
-              size="small">
-              <Select.Option value="plain">{t('message.message.style.plain')}</Select.Option>
-              <Select.Option value="bubble">{t('message.message.style.bubble')}</Select.Option>
-            </StyledSelect>
+              options={[
+                { value: 'plain', label: t('message.message.style.plain') },
+                { value: 'bubble', label: t('message.message.style.bubble') }
+              ]}
+            />
           </SettingRow>
           <SettingDivider />
           <SettingRow>
             <SettingRowTitleSmall>{t('message.message.multi_model_style')}</SettingRowTitleSmall>
-            <StyledSelect
-              size="small"
+            <Selector
               value={multiModelMessageStyle}
               onChange={(value) =>
                 dispatch(setMultiModelMessageStyle(value as 'fold' | 'vertical' | 'horizontal' | 'grid'))
               }
-              style={{ width: 135 }}>
-              <Select.Option value="fold">{t('message.message.multi_model_style.fold')}</Select.Option>
-              <Select.Option value="vertical">{t('message.message.multi_model_style.vertical')}</Select.Option>
-              <Select.Option value="horizontal">{t('message.message.multi_model_style.horizontal')}</Select.Option>
-              <Select.Option value="grid">{t('message.message.multi_model_style.grid')}</Select.Option>
-            </StyledSelect>
+              options={[
+                { value: 'fold', label: t('message.message.multi_model_style.fold') },
+                { value: 'vertical', label: t('message.message.multi_model_style.vertical') },
+                { value: 'horizontal', label: t('message.message.multi_model_style.horizontal') },
+                { value: 'grid', label: t('message.message.multi_model_style.grid') }
+              ]}
+            />
           </SettingRow>
           <SettingDivider />
           <SettingRow>
             <SettingRowTitleSmall>{t('settings.messages.navigation')}</SettingRowTitleSmall>
-            <StyledSelect
-              size="small"
+            <Selector
               value={messageNavigation}
               onChange={(value) => dispatch(setMessageNavigation(value as 'none' | 'buttons' | 'anchor'))}
-              style={{ width: 135 }}>
-              <Select.Option value="none">{t('settings.messages.navigation.none')}</Select.Option>
-              <Select.Option value="buttons">{t('settings.messages.navigation.buttons')}</Select.Option>
-              <Select.Option value="anchor">{t('settings.messages.navigation.anchor')}</Select.Option>
-            </StyledSelect>
+              options={[
+                { value: 'none', label: t('settings.messages.navigation.none') },
+                { value: 'buttons', label: t('settings.messages.navigation.buttons') },
+                { value: 'anchor', label: t('settings.messages.navigation.anchor') }
+              ]}
+            />
           </SettingRow>
           <SettingDivider />
           <SettingRow>
             <SettingRowTitleSmall>{t('settings.messages.math_engine')}</SettingRowTitleSmall>
-            <StyledSelect
+            <Selector
               value={mathEngine}
               onChange={(value) => dispatch(setMathEngine(value as MathEngine))}
-              style={{ width: 135 }}
-              size="small">
-              <Select.Option value="KaTeX">KaTeX</Select.Option>
-              <Select.Option value="MathJax">MathJax</Select.Option>
-              <Select.Option value="none">{t('settings.messages.math_engine.none')}</Select.Option>
-            </StyledSelect>
+              options={[
+                { value: 'KaTeX', label: 'KaTeX' },
+                { value: 'MathJax', label: 'MathJax' },
+                { value: 'none', label: t('settings.messages.math_engine.none') }
+              ]}
+            />
           </SettingRow>
           <SettingDivider />
           <SettingRow>
@@ -430,17 +415,14 @@ const SettingsTab: FC<Props> = (props) => {
         <SettingGroup>
           <SettingRow>
             <SettingRowTitleSmall>{t('message.message.code_style')}</SettingRowTitleSmall>
-            <StyledSelect
+            <Selector
               value={codeStyle}
               onChange={(value) => onCodeStyleChange(value as CodeStyleVarious)}
-              style={{ width: 135 }}
-              size="small">
-              {themeNames.map((theme) => (
-                <Select.Option key={theme} value={theme}>
-                  {theme}
-                </Select.Option>
-              ))}
-            </StyledSelect>
+              options={themeNames.map((theme) => ({
+                value: theme,
+                label: theme
+              }))}
+            />
           </SettingRow>
           <SettingDivider />
           <SettingRow>
@@ -466,7 +448,7 @@ const SettingsTab: FC<Props> = (props) => {
                     <CircleHelp size={14} style={{ marginLeft: 4 }} color="var(--color-text-2)" />
                   </Tooltip>
                 </SettingRowTitleSmall>
-                <InputNumber
+                <EditableNumber
                   size="small"
                   min={1}
                   max={60}
@@ -577,7 +559,7 @@ const SettingsTab: FC<Props> = (props) => {
               <SettingDivider />
               <SettingRow>
                 <SettingRowTitleSmall>{t('settings.messages.input.paste_long_text_threshold')}</SettingRowTitleSmall>
-                <InputNumber
+                <EditableNumber
                   size="small"
                   min={500}
                   max={10000}
@@ -641,11 +623,9 @@ const SettingsTab: FC<Props> = (props) => {
           <SettingDivider />
           <SettingRow>
             <SettingRowTitleSmall>{t('settings.input.target_language')}</SettingRowTitleSmall>
-            <StyledSelect
-              defaultValue={'english' as TranslateLanguageVarious}
-              size="small"
+            <Selector
               value={targetLanguage}
-              menuItemSelectedIcon={<CheckOutlined />}
+              onChange={(value) => setTargetLanguage(value as TranslateLanguageVarious)}
               options={[
                 { value: 'chinese', label: t('settings.input.target_language.chinese') },
                 { value: 'chinese-traditional', label: t('settings.input.target_language.chinese-traditional') },
@@ -653,17 +633,14 @@ const SettingsTab: FC<Props> = (props) => {
                 { value: 'japanese', label: t('settings.input.target_language.japanese') },
                 { value: 'russian', label: t('settings.input.target_language.russian') }
               ]}
-              onChange={(value) => setTargetLanguage(value as TranslateLanguageVarious)}
-              style={{ width: 135 }}
             />
           </SettingRow>
           <SettingDivider />
           <SettingRow>
             <SettingRowTitleSmall>{t('settings.messages.input.send_shortcuts')}</SettingRowTitleSmall>
-            <StyledSelect
-              size="small"
+            <Selector
               value={sendMessageShortcut}
-              menuItemSelectedIcon={<CheckOutlined />}
+              onChange={(value) => setSendMessageShortcut(value as SendMessageShortcut)}
               options={[
                 { value: 'Enter', label: getSendMessageShortcutLabel('Enter') },
                 { value: 'Ctrl+Enter', label: getSendMessageShortcutLabel('Ctrl+Enter') },
@@ -671,8 +648,6 @@ const SettingsTab: FC<Props> = (props) => {
                 { value: 'Command+Enter', label: getSendMessageShortcutLabel('Command+Enter') },
                 { value: 'Shift+Enter', label: getSendMessageShortcutLabel('Shift+Enter') }
               ]}
-              onChange={(value) => setSendMessageShortcut(value as SendMessageShortcut)}
-              style={{ width: 135 }}
             />
           </SettingRow>
         </SettingGroup>
@@ -704,12 +679,4 @@ const SettingGroup = styled.div<{ theme?: ThemeMode }>`
   margin-bottom: 10px;
 `
 
-const StyledSelect = styled(Select)`
-  .ant-select-selector {
-    border-radius: 15px !important;
-    padding: 4px 10px !important;
-    height: 26px !important;
-  }
-`
-
 export default SettingsTab
diff --git a/src/renderer/src/pages/home/Tabs/components/OpenAISettingsGroup.tsx b/src/renderer/src/pages/home/Tabs/components/OpenAISettingsGroup.tsx
index 2aa25c5ff1..18b6800a6d 100644
--- a/src/renderer/src/pages/home/Tabs/components/OpenAISettingsGroup.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/OpenAISettingsGroup.tsx
@@ -1,3 +1,4 @@
+import Selector from '@renderer/components/Selector'
 import { SettingDivider, SettingRow } from '@renderer/pages/settings'
 import { CollapsibleSettingGroup } from '@renderer/pages/settings/SettingGroup'
 import { RootState, useAppDispatch } from '@renderer/store'
@@ -102,13 +103,11 @@ const OpenAISettingsGroup: FC<Props> = ({
               <CircleHelp size={14} style={{ marginLeft: 4 }} color="var(--color-text-2)" />
             </Tooltip>
           </SettingRowTitleSmall>
-          <StyledSelect
+          <Selector
             value={serviceTierMode}
-            style={{ width: 135 }}
             onChange={(value) => {
               setServiceTierMode(value as OpenAIServiceTier)
             }}
-            size="small"
             options={serviceTierOptions}
           />
         </SettingRow>
@@ -135,6 +134,7 @@ const OpenAISettingsGroup: FC<Props> = ({
           </>
         )}
       </SettingGroup>
+      <SettingDivider />
     </CollapsibleSettingGroup>
   )
 }
diff --git a/src/renderer/src/pages/knowledge/components/AddKnowledgePopup.tsx b/src/renderer/src/pages/knowledge/components/AddKnowledgePopup.tsx
index c59c944415..528f64f41a 100644
--- a/src/renderer/src/pages/knowledge/components/AddKnowledgePopup.tsx
+++ b/src/renderer/src/pages/knowledge/components/AddKnowledgePopup.tsx
@@ -13,6 +13,7 @@ import { KnowledgeBase, Model } from '@renderer/types'
 import { getErrorMessage } from '@renderer/utils/error'
 import { Flex, Form, Input, InputNumber, Modal, Select, Slider, Switch } from 'antd'
 import { find, sortBy } from 'lodash'
+import { ChevronDown } from 'lucide-react'
 import { nanoid } from 'nanoid'
 import { useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -116,6 +117,7 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
             const aiProvider = new AiProvider(provider)
             values.dimensions = await aiProvider.getEmbeddingDimensions(selectedEmbeddingModel)
           } catch (error) {
+            console.error('Error getting embedding dimensions:', error)
             window.message.error(t('message.error.get_embedding_dimensions') + '\n' + getErrorMessage(error))
             setLoading(false)
             return
@@ -181,7 +183,12 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
           label={t('models.embedding_model')}
           tooltip={{ title: t('models.embedding_model_tooltip'), placement: 'right' }}
           rules={[{ required: true, message: t('message.error.enter.model') }]}>
-          <Select style={{ width: '100%' }} options={embeddingSelectOptions} placeholder={t('settings.models.empty')} />
+          <Select
+            style={{ width: '100%' }}
+            options={embeddingSelectOptions}
+            placeholder={t('settings.models.empty')}
+            suffixIcon={<ChevronDown size={16} color="var(--color-border)" />}
+          />
         </Form.Item>
 
         <Form.Item
@@ -189,7 +196,12 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
           label={t('models.rerank_model')}
           tooltip={{ title: t('models.rerank_model_tooltip'), placement: 'right' }}
           rules={[{ required: false, message: t('message.error.enter.model') }]}>
-          <Select style={{ width: '100%' }} options={rerankSelectOptions} placeholder={t('settings.models.empty')} />
+          <Select
+            style={{ width: '100%' }}
+            options={rerankSelectOptions}
+            placeholder={t('settings.models.empty')}
+            suffixIcon={<ChevronDown size={16} color="var(--color-border)" />}
+          />
         </Form.Item>
         <SettingHelpText style={{ marginTop: -15, marginBottom: 20 }}>
           {t('models.rerank_model_not_support_provider', {
@@ -201,13 +213,7 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
           label={t('knowledge.document_count')}
           initialValue={DEFAULT_KNOWLEDGE_DOCUMENT_COUNT} // 设置初始值
           tooltip={{ title: t('knowledge.document_count_help') }}>
-          <Slider
-            style={{ width: '100%' }}
-            min={1}
-            max={30}
-            step={1}
-            marks={{ 1: '1', 6: t('knowledge.document_count_default'), 30: '30' }}
-          />
+          <Slider min={1} max={30} step={1} marks={{ 1: '1', 6: t('knowledge.document_count_default'), 30: '30' }} />
         </Form.Item>
         <Form.Item
           name="autoDims"
diff --git a/src/renderer/src/pages/knowledge/components/KnowledgeSearchPopup.tsx b/src/renderer/src/pages/knowledge/components/KnowledgeSearchPopup.tsx
index 34f750c908..f9018d7f49 100644
--- a/src/renderer/src/pages/knowledge/components/KnowledgeSearchPopup.tsx
+++ b/src/renderer/src/pages/knowledge/components/KnowledgeSearchPopup.tsx
@@ -1,14 +1,15 @@
 import { CopyOutlined } from '@ant-design/icons'
 import type { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
+import { HStack } from '@renderer/components/Layout'
 import { TopView } from '@renderer/components/TopView'
 import { searchKnowledgeBase } from '@renderer/services/KnowledgeService'
 import { FileType, KnowledgeBase } from '@renderer/types'
-import { Input, List, message, Modal, Spin, Tooltip, Typography } from 'antd'
-import { useRef, useState } from 'react'
+import { Divider, Input, List, message, Modal, Spin, Tooltip, Typography } from 'antd'
+import { Search } from 'lucide-react'
+import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
-const { Search } = Input
 const { Text, Paragraph } = Typography
 
 interface ShowParams {
@@ -25,7 +26,6 @@ const PopupContainer: React.FC<Props> = ({ base, resolve }) => {
   const [results, setResults] = useState<Array<ExtractChunkData & { file: FileType | null }>>([])
   const [searchKeyword, setSearchKeyword] = useState('')
   const { t } = useTranslation()
-  const searchInputRef = useRef<any>(null)
 
   const handleSearch = async (value: string) => {
     if (!value.trim()) {
@@ -84,77 +84,98 @@ const PopupContainer: React.FC<Props> = ({ base, resolve }) => {
 
   return (
     <Modal
-      title={t('knowledge.search')}
+      title={null}
       open={open}
       onOk={onOk}
       onCancel={onCancel}
       afterClose={onClose}
-      afterOpenChange={(visible) => visible && searchInputRef.current?.focus()}
-      width={800}
+      width={700}
       footer={null}
       centered
-      transitionName="animation-move-down">
-      <SearchContainer>
-        <Search
-          placeholder={t('knowledge.search_placeholder')}
+      closable={false}
+      transitionName="animation-move-down"
+      styles={{
+        content: {
+          borderRadius: 20,
+          padding: 0,
+          overflow: 'hidden',
+          paddingBottom: 12
+        },
+        body: {
+          maxHeight: '80vh',
+          overflow: 'hidden',
+          padding: 0
+        }
+      }}>
+      <HStack style={{ padding: '0 12px', marginTop: 8 }}>
+        <Input
+          prefix={
+            <SearchIcon>
+              <Search size={15} />
+            </SearchIcon>
+          }
+          value={searchKeyword}
+          placeholder={t('knowledge.search')}
           allowClear
-          enterButton
-          size="large"
-          onSearch={handleSearch}
-          ref={searchInputRef}
+          autoFocus
+          spellCheck={false}
+          style={{ paddingLeft: 0 }}
+          variant="borderless"
+          size="middle"
+          onChange={(e) => setSearchKeyword(e.target.value)}
+          onPressEnter={() => handleSearch(searchKeyword)}
         />
-        <ResultsContainer>
-          {loading ? (
-            <LoadingContainer>
-              <Spin size="large" />
-            </LoadingContainer>
-          ) : (
-            <List
-              dataSource={results}
-              renderItem={(item) => (
-                <List.Item>
-                  <ResultItem>
-                    <TagContainer>
-                      <ScoreTag>Score: {(item.score * 100).toFixed(1)}%</ScoreTag>
-                      <Tooltip title={t('common.copy')}>
-                        <CopyButton onClick={() => handleCopy(item.pageContent)}>
-                          <CopyOutlined />
-                        </CopyButton>
-                      </Tooltip>
-                    </TagContainer>
-                    <Paragraph style={{ userSelect: 'text' }}>{highlightText(item.pageContent)}</Paragraph>
-                    <MetadataContainer>
-                      <Text type="secondary">
-                        {t('knowledge.source')}:{' '}
-                        {item.file ? (
-                          <a href={`http://file/${item.file.name}`} target="_blank" rel="noreferrer">
-                            {item.file.origin_name}
-                          </a>
-                        ) : (
-                          item.metadata.source
-                        )}
-                      </Text>
-                    </MetadataContainer>
-                  </ResultItem>
-                </List.Item>
-              )}
-            />
-          )}
-        </ResultsContainer>
-      </SearchContainer>
+      </HStack>
+      <Divider style={{ margin: 0, marginTop: 4, borderBlockStartWidth: 0.5 }} />
+
+      <ResultsContainer>
+        {loading ? (
+          <LoadingContainer>
+            <Spin size="large" />
+          </LoadingContainer>
+        ) : (
+          <List
+            dataSource={results}
+            renderItem={(item) => (
+              <List.Item>
+                <ResultItem>
+                  <MetadataContainer>
+                    <Text type="secondary" ellipsis>
+                      {t('knowledge.source')}:{' '}
+                      {item.file ? (
+                        <a href={`http://file/${item.file.name}`} target="_blank" rel="noreferrer">
+                          {item.file.origin_name}
+                        </a>
+                      ) : (
+                        item.metadata.source
+                      )}
+                    </Text>
+                    <ScoreTag>Score: {(item.score * 100).toFixed(1)}%</ScoreTag>
+                  </MetadataContainer>
+                  <TagContainer>
+                    <Tooltip title={t('common.copy')}>
+                      <CopyButton onClick={() => handleCopy(item.pageContent)}>
+                        <CopyOutlined />
+                      </CopyButton>
+                    </Tooltip>
+                  </TagContainer>
+                  <Paragraph style={{ userSelect: 'text', marginBottom: 0 }}>
+                    {highlightText(item.pageContent)}
+                  </Paragraph>
+                </ResultItem>
+              </List.Item>
+            )}
+          />
+        )}
+      </ResultsContainer>
     </Modal>
   )
 }
 
-const SearchContainer = styled.div`
-  display: flex;
-  flex-direction: column;
-  gap: 20px;
-`
-
 const ResultsContainer = styled.div`
-  max-height: 60vh;
+  padding: 0 16px;
   overflow-y: auto;
+  max-height: 70vh;
 `
 
 const LoadingContainer = styled.div`
@@ -164,21 +185,29 @@ const LoadingContainer = styled.div`
   height: 200px;
 `
 
+const TagContainer = styled.div`
+  position: absolute;
+  top: 58px;
+  right: 16px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  opacity: 0;
+  transition: opacity 0.2s;
+`
+
 const ResultItem = styled.div`
   width: 100%;
   position: relative;
   padding: 16px;
   background: var(--color-background-soft);
   border-radius: 8px;
-`
 
-const TagContainer = styled.div`
-  position: absolute;
-  top: 8px;
-  right: 8px;
-  display: flex;
-  align-items: center;
-  gap: 8px;
+  &:hover {
+    ${TagContainer} {
+      opacity: 1 !important;
+    }
+  }
 `
 
 const ScoreTag = styled.div`
@@ -187,6 +216,7 @@ const ScoreTag = styled.div`
   color: white;
   border-radius: 4px;
   font-size: 12px;
+  flex-shrink: 0;
 `
 
 const CopyButton = styled.div`
@@ -195,7 +225,7 @@ const CopyButton = styled.div`
   justify-content: center;
   width: 24px;
   height: 24px;
-  background: var(--color-background);
+  background: var(--color-background-mute);
   color: var(--color-text);
   border-radius: 4px;
   cursor: pointer;
@@ -208,12 +238,35 @@ const CopyButton = styled.div`
 `
 
 const MetadataContainer = styled.div`
-  margin-top: 8px;
-  padding-top: 8px;
-  border-top: 1px solid var(--color-border);
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 16px;
+  margin-bottom: 8px;
+  padding-bottom: 8px;
+  border-bottom: 1px solid var(--color-border);
   user-select: text;
 `
 
+const SearchIcon = styled.div`
+  width: 32px;
+  height: 32px;
+  border-radius: 50%;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  background-color: var(--color-background-soft);
+  margin-right: 2px;
+  &.back-icon {
+    cursor: pointer;
+    transition: background-color 0.2s;
+    &:hover {
+      background-color: var(--color-background-mute);
+    }
+  }
+`
+
 const TopViewKey = 'KnowledgeSearchPopup'
 
 export default class KnowledgeSearchPopup {
diff --git a/src/renderer/src/pages/knowledge/components/KnowledgeSettingsPopup.tsx b/src/renderer/src/pages/knowledge/components/KnowledgeSettingsPopup.tsx
index d994fa9ee1..625ca2c90f 100644
--- a/src/renderer/src/pages/knowledge/components/KnowledgeSettingsPopup.tsx
+++ b/src/renderer/src/pages/knowledge/components/KnowledgeSettingsPopup.tsx
@@ -1,4 +1,4 @@
-import { DownOutlined, WarningOutlined } from '@ant-design/icons'
+import { WarningOutlined } from '@ant-design/icons'
 import { TopView } from '@renderer/components/TopView'
 import { DEFAULT_KNOWLEDGE_DOCUMENT_COUNT } from '@renderer/config/constant'
 import { getEmbeddingMaxContext } from '@renderer/config/embedings'
@@ -10,11 +10,11 @@ import { useProviders } from '@renderer/hooks/useProvider'
 import { SettingHelpText } from '@renderer/pages/settings'
 import { getModelUniqId } from '@renderer/services/ModelService'
 import { KnowledgeBase } from '@renderer/types'
-import { Alert, Form, Input, InputNumber, Modal, Select, Slider } from 'antd'
+import { Alert, Button, Form, Input, InputNumber, Modal, Select, Slider } from 'antd'
 import { sortBy } from 'lodash'
+import { ChevronDown } from 'lucide-react'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import styled from 'styled-components'
 
 interface ShowParams {
   base: KnowledgeBase
@@ -140,7 +140,13 @@ const PopupContainer: React.FC<Props> = ({ base: _base, resolve }) => {
           initialValue={getModelUniqId(base.model)}
           tooltip={{ title: t('models.embedding_model_tooltip'), placement: 'right' }}
           rules={[{ required: true, message: t('message.error.enter.model') }]}>
-          <Select style={{ width: '100%' }} options={selectOptions} placeholder={t('settings.models.empty')} disabled />
+          <Select
+            style={{ width: '100%' }}
+            options={selectOptions}
+            placeholder={t('settings.models.empty')}
+            disabled
+            suffixIcon={<ChevronDown size={16} color="var(--color-border)" />}
+          />
         </Form.Item>
 
         <Form.Item
@@ -154,6 +160,7 @@ const PopupContainer: React.FC<Props> = ({ base: _base, resolve }) => {
             options={rerankSelectOptions}
             placeholder={t('settings.models.empty')}
             allowClear
+            suffixIcon={<ChevronDown size={16} color="var(--color-border)" />}
           />
         </Form.Item>
         <SettingHelpText style={{ marginTop: -15, marginBottom: 20 }}>
@@ -166,27 +173,21 @@ const PopupContainer: React.FC<Props> = ({ base: _base, resolve }) => {
           name="documentCount"
           label={t('knowledge.document_count')}
           tooltip={{ title: t('knowledge.document_count_help') }}>
-          <Slider
-            style={{ width: '100%' }}
-            min={1}
-            max={30}
-            step={1}
-            marks={{ 1: '1', 6: t('knowledge.document_count_default'), 30: '30' }}
-          />
+          <Slider min={1} max={30} step={1} marks={{ 1: '1', 6: t('knowledge.document_count_default'), 30: '30' }} />
         </Form.Item>
 
-        <AdvancedSettingsButton onClick={() => setShowAdvanced(!showAdvanced)}>
-          <DownOutlined
+        <Button color="default" variant="filled" onClick={() => setShowAdvanced(!showAdvanced)}>
+          {t('common.advanced_settings')}
+          <ChevronDown
+            size={16}
             style={{
               transform: showAdvanced ? 'rotate(180deg)' : 'rotate(0deg)',
-              transition: 'transform 0.3s',
-              marginRight: 8
+              transition: 'transform 0.3s'
             }}
           />
-          {t('common.advanced_settings')}
-        </AdvancedSettingsButton>
+        </Button>
 
-        <div style={{ display: showAdvanced ? 'block' : 'none' }}>
+        <div style={{ display: showAdvanced ? 'block' : 'none', marginTop: 16 }}>
           <Form.Item
             name="chunkSize"
             label={t('knowledge.chunk_size')}
@@ -269,15 +270,6 @@ const PopupContainer: React.FC<Props> = ({ base: _base, resolve }) => {
 
 const TopViewKey = 'KnowledgeSettingsPopup'
 
-const AdvancedSettingsButton = styled.div`
-  cursor: pointer;
-  margin-bottom: 16px;
-  margin-top: -10px;
-  color: var(--color-primary);
-  display: flex;
-  align-items: center;
-`
-
 export default class KnowledgeSettingsPopup {
   static hide() {
     TopView.hide(TopViewKey)
diff --git a/src/renderer/src/pages/settings/AssistantSettings/AssistantKnowledgeBaseSettings.tsx b/src/renderer/src/pages/settings/AssistantSettings/AssistantKnowledgeBaseSettings.tsx
index 169ed3ffd5..a593f41cbe 100644
--- a/src/renderer/src/pages/settings/AssistantSettings/AssistantKnowledgeBaseSettings.tsx
+++ b/src/renderer/src/pages/settings/AssistantSettings/AssistantKnowledgeBaseSettings.tsx
@@ -3,7 +3,7 @@ import { Box } from '@renderer/components/Layout'
 import { useAppSelector } from '@renderer/store'
 import { Assistant, AssistantSettings } from '@renderer/types'
 import { Row, Segmented, Select, SelectProps, Tooltip } from 'antd'
-import { CircleHelp } from 'lucide-react'
+import { ChevronDown, CircleHelp } from 'lucide-react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
@@ -46,6 +46,7 @@ const AssistantKnowledgeBaseSettings: React.FC<Props> = ({ assistant, updateAssi
             .toLowerCase()
             .includes(input.toLowerCase())
         }
+        suffixIcon={<ChevronDown size={16} color="var(--color-border)" />}
       />
       <Row align="middle" style={{ marginTop: 10 }}>
         <Label>{t('assistants.settings.knowledge_base.recognition')}</Label>
diff --git a/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx b/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx
index 1a22848ce5..31e44abfbb 100644
--- a/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx
+++ b/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx
@@ -1,13 +1,16 @@
 import { DeleteOutlined, PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons'
 import ModelAvatar from '@renderer/components/Avatar/ModelAvatar'
+import EditableNumber from '@renderer/components/EditableNumber'
 import { HStack } from '@renderer/components/Layout'
 import SelectModelPopup from '@renderer/components/Popups/SelectModelPopup'
+import Selector from '@renderer/components/Selector'
 import { DEFAULT_CONTEXTCOUNT, DEFAULT_TEMPERATURE } from '@renderer/config/constant'
 import { SettingRow } from '@renderer/pages/settings'
 import { Assistant, AssistantSettingCustomParameters, AssistantSettings } from '@renderer/types'
 import { modalConfirm } from '@renderer/utils'
 import { Button, Col, Divider, Input, InputNumber, Row, Select, Slider, Switch, Tooltip } from 'antd'
 import { isNull } from 'lodash'
+import { ChevronDown } from 'lucide-react'
 import { FC, useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
@@ -107,9 +110,15 @@ const AssistantModelSettings: FC<Props> = ({ assistant, updateAssistant, updateA
         )
       case 'boolean':
         return (
-          <Switch
-            checked={param.value as boolean}
-            onChange={(checked) => onUpdateCustomParameter(index, 'value', checked)}
+          <Select
+            value={param.value as boolean}
+            onChange={(value) => onUpdateCustomParameter(index, 'value', value)}
+            style={{ width: '100%' }}
+            options={[
+              { label: 'true', value: true },
+              { label: 'false', value: false }
+            ]}
+            suffixIcon={<ChevronDown size={16} color="var(--color-border)" />}
           />
         )
       case 'json':
@@ -188,38 +197,57 @@ const AssistantModelSettings: FC<Props> = ({ assistant, updateAssistant, updateA
 
   return (
     <Container>
-      <Row align="middle" style={{ marginBottom: 10 }}>
-        <Label style={{ marginBottom: 10 }}>{t('assistants.settings.default_model')}</Label>
-        <Col span={24}>
-          <HStack alignItems="center" gap={5}>
+      <HStack alignItems="center" justifyContent="space-between" style={{ marginBottom: 10 }}>
+        <Label>{t('assistants.settings.default_model')}</Label>
+        <HStack alignItems="center" gap={5}>
+          <ModelSelectButton
+            icon={defaultModel ? <ModelAvatar model={defaultModel} size={20} /> : <PlusOutlined />}
+            onClick={onSelectModel}>
+            <ModelName>{defaultModel ? defaultModel.name : t('agents.edit.model.select.title')}</ModelName>
+          </ModelSelectButton>
+          {defaultModel && (
             <Button
-              icon={defaultModel ? <ModelAvatar model={defaultModel} size={20} /> : <PlusOutlined />}
-              onClick={onSelectModel}>
-              {defaultModel ? defaultModel.name : t('agents.edit.model.select.title')}
-            </Button>
-            {defaultModel && (
-              <Button
-                icon={<DeleteOutlined />}
-                type="text"
-                onClick={() => {
-                  setDefaultModel(undefined)
-                  updateAssistant({ ...assistant, defaultModel: undefined })
-                }}
-                danger
-              />
-            )}
-          </HStack>
-        </Col>
-      </Row>
+              color="danger"
+              variant="filled"
+              icon={<DeleteOutlined />}
+              onClick={() => {
+                setDefaultModel(undefined)
+                updateAssistant({ ...assistant, defaultModel: undefined })
+              }}
+              danger
+            />
+          )}
+        </HStack>
+      </HStack>
       <Divider style={{ margin: '10px 0' }} />
       <Row align="middle">
-        <Label>{t('chat.settings.temperature')}</Label>
-        <Tooltip title={t('chat.settings.temperature.tip')}>
-          <QuestionIcon />
-        </Tooltip>
-      </Row>
-      <Row align="middle" gutter={20}>
         <Col span={20}>
+          <Label>
+            {t('chat.settings.temperature')}
+            <Tooltip title={t('chat.settings.temperature.tip')}>
+              <QuestionIcon />
+            </Tooltip>
+          </Label>
+        </Col>
+        <Col span={4}>
+          <EditableNumber
+            min={0}
+            max={2}
+            step={0.01}
+            precision={2}
+            value={temperature}
+            onChange={(value) => {
+              if (value !== null) {
+                setTemperature(value)
+                setTimeout(() => updateAssistantSettings({ temperature: value }), 500)
+              }
+            }}
+            style={{ width: '100%' }}
+          />
+        </Col>
+      </Row>
+      <Row align="middle" gutter={24}>
+        <Col span={24}>
           <Slider
             min={0}
             max={2}
@@ -230,43 +258,20 @@ const AssistantModelSettings: FC<Props> = ({ assistant, updateAssistant, updateA
             step={0.01}
           />
         </Col>
-        <Col span={4}>
-          <InputNumber
-            min={0}
-            max={2}
-            step={0.01}
-            value={temperature}
-            changeOnBlur
-            onChange={(value) => {
-              if (!isNull(value)) {
-                setTemperature(value)
-                setTimeout(() => updateAssistantSettings({ temperature: value }), 500)
-              }
-            }}
-            style={{ width: '100%' }}
-          />
-        </Col>
       </Row>
+      <Divider style={{ margin: '10px 0' }} />
+
       <Row align="middle">
-        <Label>{t('chat.settings.top_p')}</Label>
-        <Tooltip title={t('chat.settings.top_p.tip')}>
-          <QuestionIcon />
-        </Tooltip>
-      </Row>
-      <Row align="middle" gutter={20}>
         <Col span={20}>
-          <Slider
-            min={0}
-            max={1}
-            onChange={setTopP}
-            onChangeComplete={onTopPChange}
-            value={typeof topP === 'number' ? topP : 1}
-            marks={{ 0: '0', 1: '1' }}
-            step={0.01}
-          />
+          <Label>
+            {t('chat.settings.top_p')}
+            <Tooltip title={t('chat.settings.top_p.tip')}>
+              <QuestionIcon />
+            </Tooltip>
+          </Label>
         </Col>
         <Col span={4}>
-          <InputNumber
+          <EditableNumber
             min={0}
             max={1}
             step={0.01}
@@ -282,29 +287,32 @@ const AssistantModelSettings: FC<Props> = ({ assistant, updateAssistant, updateA
           />
         </Col>
       </Row>
-      <Row align="middle">
-        <Label>
-          {t('chat.settings.context_count')}{' '}
-          <Tooltip title={t('chat.settings.context_count.tip')}>
-            <QuestionIcon />
-          </Tooltip>
-        </Label>
-      </Row>
-      <Row align="middle" gutter={20}>
-        <Col span={20}>
+      <Row align="middle" gutter={24}>
+        <Col span={24}>
           <Slider
             min={0}
-            max={100}
-            onChange={setContextCount}
-            onChangeComplete={onContextCountChange}
-            value={typeof contextCount === 'number' ? contextCount : 0}
-            marks={{ 0: '0', 25: '25', 50: '50', 75: '75', 100: t('chat.settings.max') }}
-            step={1}
-            tooltip={{ formatter: formatSliderTooltip }}
+            max={1}
+            onChange={setTopP}
+            onChangeComplete={onTopPChange}
+            value={typeof topP === 'number' ? topP : 1}
+            marks={{ 0: '0', 1: '1' }}
+            step={0.01}
           />
         </Col>
+      </Row>
+      <Divider style={{ margin: '10px 0' }} />
+
+      <Row align="middle">
+        <Col span={20}>
+          <Label>
+            {t('chat.settings.context_count')}{' '}
+            <Tooltip title={t('chat.settings.context_count.tip')}>
+              <QuestionIcon />
+            </Tooltip>
+          </Label>
+        </Col>
         <Col span={4}>
-          <InputNumber
+          <EditableNumber
             min={0}
             max={20}
             step={1}
@@ -320,6 +328,20 @@ const AssistantModelSettings: FC<Props> = ({ assistant, updateAssistant, updateA
           />
         </Col>
       </Row>
+      <Row align="middle" gutter={24}>
+        <Col span={24}>
+          <Slider
+            min={0}
+            max={100}
+            onChange={setContextCount}
+            onChangeComplete={onContextCountChange}
+            value={typeof contextCount === 'number' ? contextCount : 0}
+            marks={{ 0: '0', 25: '25', 50: '50', 75: '75', 100: t('chat.settings.max') }}
+            step={1}
+            tooltip={{ formatter: formatSliderTooltip }}
+          />
+        </Col>
+      </Row>
       <Divider style={{ margin: '10px 0' }} />
       <SettingRow style={{ minHeight: 30 }}>
         <HStack alignItems="center">
@@ -382,16 +404,18 @@ const AssistantModelSettings: FC<Props> = ({ assistant, updateAssistant, updateA
       <Divider style={{ margin: '10px 0' }} />
       <SettingRow style={{ minHeight: 30 }}>
         <Label>{t('assistants.settings.tool_use_mode')}</Label>
-        <Select
+        <Selector
           value={toolUseMode}
-          style={{ width: 110 }}
+          options={[
+            { label: t('assistants.settings.tool_use_mode.prompt'), value: 'prompt' },
+            { label: t('assistants.settings.tool_use_mode.function'), value: 'function' }
+          ]}
           onChange={(value) => {
             setToolUseMode(value)
             updateAssistantSettings({ toolUseMode: value })
-          }}>
-          <Select.Option value="prompt">{t('assistants.settings.tool_use_mode.prompt')}</Select.Option>
-          <Select.Option value="function">{t('assistants.settings.tool_use_mode.function')}</Select.Option>
-        </Select>
+          }}
+          size={14}
+        />
       </SettingRow>
       <Divider style={{ margin: '10px 0' }} />
       <SettingRow style={{ minHeight: 30 }}>
@@ -409,20 +433,26 @@ const AssistantModelSettings: FC<Props> = ({ assistant, updateAssistant, updateA
               onChange={(e) => onUpdateCustomParameter(index, 'name', e.target.value)}
             />
           </Col>
-          <Col span={4}>
+          <Col span={6}>
             <Select
               value={param.type}
               onChange={(value) => onUpdateCustomParameter(index, 'type', value)}
-              style={{ width: '100%' }}>
+              style={{ width: '100%' }}
+              suffixIcon={<ChevronDown size={16} color="var(--color-border)" />}>
               <Select.Option value="string">{t('models.parameter_type.string')}</Select.Option>
               <Select.Option value="number">{t('models.parameter_type.number')}</Select.Option>
               <Select.Option value="boolean">{t('models.parameter_type.boolean')}</Select.Option>
               <Select.Option value="json">{t('models.parameter_type.json')}</Select.Option>
             </Select>
           </Col>
-          <Col span={12}>{renderParameterValueInput(param, index)}</Col>
+          <Col span={10}>{renderParameterValueInput(param, index)}</Col>
           <Col span={2} style={{ display: 'flex', justifyContent: 'flex-end' }}>
-            <Button icon={<DeleteOutlined />} onClick={() => onDeleteCustomParameter(index)} danger />
+            <Button
+              color="danger"
+              variant="filled"
+              icon={<DeleteOutlined />}
+              onClick={() => onDeleteCustomParameter(index)}
+            />
           </Col>
         </Row>
       ))}
@@ -440,13 +470,16 @@ const Container = styled.div`
   display: flex;
   flex: 1;
   flex-direction: column;
-  overflow: hidden;
   padding: 5px;
 `
 
 const Label = styled.p`
   margin-right: 5px;
   font-weight: 500;
+  display: flex;
+  align-items: center;
+  gap: 5px;
+  flex-shrink: 0;
 `
 
 const QuestionIcon = styled(QuestionCircleOutlined)`
@@ -455,4 +488,21 @@ const QuestionIcon = styled(QuestionCircleOutlined)`
   color: var(--color-text-3);
 `
 
+const ModelSelectButton = styled(Button)`
+  max-width: 300px;
+  justify-content: flex-start;
+
+  .ant-btn-icon {
+    flex-shrink: 0;
+  }
+`
+
+const ModelName = styled.span`
+  max-width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  display: inline-block;
+`
+
 export default AssistantModelSettings
diff --git a/src/renderer/src/pages/settings/AssistantSettings/AssistantPromptSettings.tsx b/src/renderer/src/pages/settings/AssistantSettings/AssistantPromptSettings.tsx
index d5b2882986..22ff2a7d62 100644
--- a/src/renderer/src/pages/settings/AssistantSettings/AssistantPromptSettings.tsx
+++ b/src/renderer/src/pages/settings/AssistantSettings/AssistantPromptSettings.tsx
@@ -65,7 +65,7 @@ const AssistantPromptSettings: React.FC<Props> = ({ assistant, updateAssistant }
       <HStack gap={8} alignItems="center">
         <Popover content={<EmojiPicker onEmojiClick={handleEmojiSelect} />} arrow trigger="click">
           <EmojiButtonWrapper>
-            <Button style={{ fontSize: 20, padding: '4px', minWidth: '32px', height: '32px' }}>{emoji}</Button>
+            <Button style={{ fontSize: 18, padding: '4px', minWidth: '28px', height: '28px' }}>{emoji}</Button>
             {emoji && (
               <CloseCircleFilled
                 className="delete-icon"
diff --git a/src/renderer/src/pages/settings/AssistantSettings/index.tsx b/src/renderer/src/pages/settings/AssistantSettings/index.tsx
index 350c7d571c..12ba5d612d 100644
--- a/src/renderer/src/pages/settings/AssistantSettings/index.tsx
+++ b/src/renderer/src/pages/settings/AssistantSettings/index.tsx
@@ -89,12 +89,14 @@ const AssistantSettingPopupContainer: React.FC<Props> = ({ resolve, tab, ...prop
       styles={{
         content: {
           padding: 0,
-          overflow: 'hidden',
-          background: 'var(--color-background)'
+          overflow: 'hidden'
         },
-        header: { padding: '10px 15px', borderBottom: '0.5px solid var(--color-border)', margin: 0 }
+        header: { padding: '10px 15px', borderBottom: '0.5px solid var(--color-border)', margin: 0, borderRadius: 0 },
+        body: {
+          padding: 0
+        }
       }}
-      width="70vw"
+      width="min(800px, 70vw)"
       height="80vh"
       centered>
       <HStack>
@@ -145,15 +147,14 @@ const AssistantSettingPopupContainer: React.FC<Props> = ({ resolve, tab, ...prop
 }
 
 const LeftMenu = styled.div`
-  background-color: var(--color-background);
   height: calc(80vh - 20px);
   border-right: 0.5px solid var(--color-border);
 `
 
 const Settings = styled.div`
   flex: 1;
-  padding: 10px 20px;
-  height: calc(80vh - 20px);
+  padding: 16px 16px;
+  height: calc(80vh - 16px);
   overflow-y: scroll;
 `
 
@@ -163,6 +164,7 @@ const StyledModal = styled(Modal)`
   }
   .ant-modal-close {
     top: 4px;
+    right: 4px;
   }
   .ant-menu-item {
     height: 36px;
diff --git a/src/renderer/src/pages/settings/DataSettings/AgentsSubscribeUrlSettings.tsx b/src/renderer/src/pages/settings/DataSettings/AgentsSubscribeUrlSettings.tsx
index eb37f41737..f4e76fadd9 100755
--- a/src/renderer/src/pages/settings/DataSettings/AgentsSubscribeUrlSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/AgentsSubscribeUrlSettings.tsx
@@ -39,7 +39,6 @@ const AgentsSubscribeUrlSettings: FC = () => {
           />
         </HStack>
       </SettingRow>
-      <SettingDivider />
     </SettingGroup>
   )
 }
diff --git a/src/renderer/src/pages/settings/DataSettings/JoplinSettings.tsx b/src/renderer/src/pages/settings/DataSettings/JoplinSettings.tsx
index 3574c808d1..32b3148541 100644
--- a/src/renderer/src/pages/settings/DataSettings/JoplinSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/JoplinSettings.tsx
@@ -4,7 +4,7 @@ import { useTheme } from '@renderer/context/ThemeProvider'
 import { useMinappPopup } from '@renderer/hooks/useMinappPopup'
 import { RootState, useAppDispatch } from '@renderer/store'
 import { setJoplinExportReasoning, setJoplinToken, setJoplinUrl } from '@renderer/store/settings'
-import { Button, Switch, Tooltip } from 'antd'
+import { Button, Space, Switch, Tooltip } from 'antd'
 import Input from 'antd/es/input/Input'
 import { FC } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -106,14 +106,15 @@ const JoplinSettings: FC = () => {
           </Tooltip>
         </SettingRowTitle>
         <HStack alignItems="center" gap="5px" style={{ width: 315 }}>
-          <Input
-            type="password"
-            value={joplinToken || ''}
-            onChange={handleJoplinTokenChange}
-            style={{ width: 250 }}
-            placeholder={t('settings.data.joplin.token_placeholder')}
-          />
-          <Button onClick={handleJoplinConnectionCheck}>{t('settings.data.joplin.check.button')}</Button>
+          <Space.Compact style={{ width: '100%' }}>
+            <Input
+              type="password"
+              value={joplinToken || ''}
+              onChange={handleJoplinTokenChange}
+              placeholder={t('settings.data.joplin.token_placeholder')}
+            />
+            <Button onClick={handleJoplinConnectionCheck}>{t('settings.data.joplin.check.button')}</Button>
+          </Space.Compact>
         </HStack>
       </SettingRow>
       <SettingDivider />
diff --git a/src/renderer/src/pages/settings/DataSettings/NotionSettings.tsx b/src/renderer/src/pages/settings/DataSettings/NotionSettings.tsx
index 719a2363d7..26e8d0872a 100644
--- a/src/renderer/src/pages/settings/DataSettings/NotionSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/NotionSettings.tsx
@@ -10,7 +10,7 @@ import {
   setNotionExportReasoning,
   setNotionPageNameKey
 } from '@renderer/store/settings'
-import { Button, Switch, Tooltip } from 'antd'
+import { Button, Space, Switch, Tooltip } from 'antd'
 import Input from 'antd/es/input/Input'
 import { FC } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -121,15 +121,16 @@ const NotionSettings: FC = () => {
       <SettingRow>
         <SettingRowTitle>{t('settings.data.notion.api_key')}</SettingRowTitle>
         <HStack alignItems="center" gap="5px" style={{ width: 315 }}>
-          <Input
-            type="password"
-            value={notionApiKey || ''}
-            onChange={handleNotionTokenChange}
-            onBlur={handleNotionTokenChange}
-            style={{ width: 250 }}
-            placeholder={t('settings.data.notion.api_key_placeholder')}
-          />
-          <Button onClick={handleNotionConnectionCheck}>{t('settings.data.notion.check.button')}</Button>
+          <Space.Compact style={{ width: '100%' }}>
+            <Input
+              type="password"
+              value={notionApiKey || ''}
+              onChange={handleNotionTokenChange}
+              onBlur={handleNotionTokenChange}
+              placeholder={t('settings.data.notion.api_key_placeholder')}
+            />
+            <Button onClick={handleNotionConnectionCheck}>{t('settings.data.notion.check.button')}</Button>
+          </Space.Compact>
         </HStack>
       </SettingRow>
       <SettingDivider />
diff --git a/src/renderer/src/pages/settings/DataSettings/NutstoreSettings.tsx b/src/renderer/src/pages/settings/DataSettings/NutstoreSettings.tsx
index 15207200b4..108452c133 100644
--- a/src/renderer/src/pages/settings/DataSettings/NutstoreSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/NutstoreSettings.tsx
@@ -1,6 +1,7 @@
 import { CheckOutlined, FolderOutlined, LoadingOutlined, SyncOutlined, WarningOutlined } from '@ant-design/icons'
 import { HStack } from '@renderer/components/Layout'
 import NutstorePathPopup from '@renderer/components/Popups/NutsorePathPopup'
+import Selector from '@renderer/components/Selector'
 import { WebdavBackupManager } from '@renderer/components/WebdavBackupManager'
 import { useWebdavBackupModal, WebdavBackupModal } from '@renderer/components/WebdavModals'
 import { useTheme } from '@renderer/context/ThemeProvider'
@@ -23,7 +24,7 @@ import {
 } from '@renderer/store/nutstore'
 import { modalConfirm } from '@renderer/utils'
 import { NUTSTORE_HOST } from '@shared/config/nutstore'
-import { Button, Input, Select, Switch, Tooltip, Typography } from 'antd'
+import { Button, Input, Switch, Tooltip, Typography } from 'antd'
 import dayjs from 'dayjs'
 import { FC, useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -279,18 +280,23 @@ const NutstoreSettings: FC = () => {
           <SettingDivider />
           <SettingRow>
             <SettingRowTitle>{t('settings.data.webdav.autoSync')}</SettingRowTitle>
-            <Select value={syncInterval} onChange={onSyncIntervalChange} style={{ width: 120 }}>
-              <Select.Option value={0}>{t('settings.data.webdav.autoSync.off')}</Select.Option>
-              <Select.Option value={1}>{t('settings.data.webdav.minute_interval', { count: 1 })}</Select.Option>
-              <Select.Option value={5}>{t('settings.data.webdav.minute_interval', { count: 5 })}</Select.Option>
-              <Select.Option value={15}>{t('settings.data.webdav.minute_interval', { count: 15 })}</Select.Option>
-              <Select.Option value={30}>{t('settings.data.webdav.minute_interval', { count: 30 })}</Select.Option>
-              <Select.Option value={60}>{t('settings.data.webdav.hour_interval', { count: 1 })}</Select.Option>
-              <Select.Option value={120}>{t('settings.data.webdav.hour_interval', { count: 2 })}</Select.Option>
-              <Select.Option value={360}>{t('settings.data.webdav.hour_interval', { count: 6 })}</Select.Option>
-              <Select.Option value={720}>{t('settings.data.webdav.hour_interval', { count: 12 })}</Select.Option>
-              <Select.Option value={1440}>{t('settings.data.webdav.hour_interval', { count: 24 })}</Select.Option>
-            </Select>
+            <Selector
+              size={14}
+              value={syncInterval}
+              onChange={onSyncIntervalChange}
+              options={[
+                { label: t('settings.data.webdav.autoSync.off'), value: 0 },
+                { label: t('settings.data.webdav.minute_interval', { count: 1 }), value: 1 },
+                { label: t('settings.data.webdav.minute_interval', { count: 5 }), value: 5 },
+                { label: t('settings.data.webdav.minute_interval', { count: 15 }), value: 15 },
+                { label: t('settings.data.webdav.minute_interval', { count: 30 }), value: 30 },
+                { label: t('settings.data.webdav.hour_interval', { count: 1 }), value: 60 },
+                { label: t('settings.data.webdav.hour_interval', { count: 2 }), value: 120 },
+                { label: t('settings.data.webdav.hour_interval', { count: 6 }), value: 360 },
+                { label: t('settings.data.webdav.hour_interval', { count: 12 }), value: 720 },
+                { label: t('settings.data.webdav.hour_interval', { count: 24 }), value: 1440 }
+              ]}
+            />
           </SettingRow>
           {nutstoreAutoSync && syncInterval > 0 && (
             <>
diff --git a/src/renderer/src/pages/settings/DataSettings/SiyuanSettings.tsx b/src/renderer/src/pages/settings/DataSettings/SiyuanSettings.tsx
index 3ba6673eea..2681f13053 100644
--- a/src/renderer/src/pages/settings/DataSettings/SiyuanSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/SiyuanSettings.tsx
@@ -4,7 +4,7 @@ import { useTheme } from '@renderer/context/ThemeProvider'
 import { useMinappPopup } from '@renderer/hooks/useMinappPopup'
 import { RootState, useAppDispatch } from '@renderer/store'
 import { setSiyuanApiUrl, setSiyuanBoxId, setSiyuanRootPath, setSiyuanToken } from '@renderer/store/settings'
-import { Button, Tooltip } from 'antd'
+import { Button, Space, Tooltip } from 'antd'
 import Input from 'antd/es/input/Input'
 import { FC } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -108,14 +108,15 @@ const SiyuanSettings: FC = () => {
           </Tooltip>
         </SettingRowTitle>
         <HStack alignItems="center" gap="5px" style={{ width: 315 }}>
-          <Input
-            type="password"
-            value={siyuanToken || ''}
-            onChange={handleTokenChange}
-            style={{ width: 250 }}
-            placeholder={t('settings.data.siyuan.token_placeholder')}
-          />
-          <Button onClick={handleCheckConnection}>{t('settings.data.siyuan.check.button')}</Button>
+          <Space.Compact style={{ width: '100%' }}>
+            <Input
+              type="password"
+              value={siyuanToken || ''}
+              onChange={handleTokenChange}
+              placeholder={t('settings.data.siyuan.token_placeholder')}
+            />
+            <Button onClick={handleCheckConnection}>{t('settings.data.siyuan.check.button')}</Button>
+          </Space.Compact>
         </HStack>
       </SettingRow>
       <SettingDivider />
diff --git a/src/renderer/src/pages/settings/DataSettings/WebDavSettings.tsx b/src/renderer/src/pages/settings/DataSettings/WebDavSettings.tsx
index 8e2a7e5aa2..54db33f024 100644
--- a/src/renderer/src/pages/settings/DataSettings/WebDavSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/WebDavSettings.tsx
@@ -1,5 +1,6 @@
 import { FolderOpenOutlined, SaveOutlined, SyncOutlined, WarningOutlined } from '@ant-design/icons'
 import { HStack } from '@renderer/components/Layout'
+import Selector from '@renderer/components/Selector'
 import { WebdavBackupManager } from '@renderer/components/WebdavBackupManager'
 import { useWebdavBackupModal, WebdavBackupModal } from '@renderer/components/WebdavModals'
 import { useTheme } from '@renderer/context/ThemeProvider'
@@ -16,7 +17,7 @@ import {
   setWebdavSyncInterval as _setWebdavSyncInterval,
   setWebdavUser as _setWebdavUser
 } from '@renderer/store/settings'
-import { Button, Input, Select, Switch, Tooltip } from 'antd'
+import { Button, Input, Switch, Tooltip } from 'antd'
 import dayjs from 'dayjs'
 import { FC, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -173,31 +174,43 @@ const WebDavSettings: FC = () => {
       <SettingDivider />
       <SettingRow>
         <SettingRowTitle>{t('settings.data.webdav.autoSync')}</SettingRowTitle>
-        <Select value={syncInterval} onChange={onSyncIntervalChange} disabled={!webdavHost} style={{ width: 120 }}>
-          <Select.Option value={0}>{t('settings.data.webdav.autoSync.off')}</Select.Option>
-          <Select.Option value={1}>{t('settings.data.webdav.minute_interval', { count: 1 })}</Select.Option>
-          <Select.Option value={5}>{t('settings.data.webdav.minute_interval', { count: 5 })}</Select.Option>
-          <Select.Option value={15}>{t('settings.data.webdav.minute_interval', { count: 15 })}</Select.Option>
-          <Select.Option value={30}>{t('settings.data.webdav.minute_interval', { count: 30 })}</Select.Option>
-          <Select.Option value={60}>{t('settings.data.webdav.hour_interval', { count: 1 })}</Select.Option>
-          <Select.Option value={120}>{t('settings.data.webdav.hour_interval', { count: 2 })}</Select.Option>
-          <Select.Option value={360}>{t('settings.data.webdav.hour_interval', { count: 6 })}</Select.Option>
-          <Select.Option value={720}>{t('settings.data.webdav.hour_interval', { count: 12 })}</Select.Option>
-          <Select.Option value={1440}>{t('settings.data.webdav.hour_interval', { count: 24 })}</Select.Option>
-        </Select>
+        <Selector
+          size={14}
+          value={syncInterval}
+          onChange={onSyncIntervalChange}
+          disabled={!webdavHost}
+          options={[
+            { label: t('settings.data.webdav.autoSync.off'), value: 0 },
+            { label: t('settings.data.webdav.minute_interval', { count: 1 }), value: 1 },
+            { label: t('settings.data.webdav.minute_interval', { count: 5 }), value: 5 },
+            { label: t('settings.data.webdav.minute_interval', { count: 15 }), value: 15 },
+            { label: t('settings.data.webdav.minute_interval', { count: 30 }), value: 30 },
+            { label: t('settings.data.webdav.hour_interval', { count: 1 }), value: 60 },
+            { label: t('settings.data.webdav.hour_interval', { count: 2 }), value: 120 },
+            { label: t('settings.data.webdav.hour_interval', { count: 6 }), value: 360 },
+            { label: t('settings.data.webdav.hour_interval', { count: 12 }), value: 720 },
+            { label: t('settings.data.webdav.hour_interval', { count: 24 }), value: 1440 }
+          ]}
+        />
       </SettingRow>
       <SettingDivider />
       <SettingRow>
         <SettingRowTitle>{t('settings.data.webdav.maxBackups')}</SettingRowTitle>
-        <Select value={maxBackups} onChange={onMaxBackupsChange} disabled={!webdavHost} style={{ width: 120 }}>
-          <Select.Option value={0}>{t('settings.data.webdav.maxBackups.unlimited')}</Select.Option>
-          <Select.Option value={1}>1</Select.Option>
-          <Select.Option value={3}>3</Select.Option>
-          <Select.Option value={5}>5</Select.Option>
-          <Select.Option value={10}>10</Select.Option>
-          <Select.Option value={20}>20</Select.Option>
-          <Select.Option value={50}>50</Select.Option>
-        </Select>
+        <Selector
+          size={14}
+          value={maxBackups}
+          onChange={onMaxBackupsChange}
+          disabled={!webdavHost}
+          options={[
+            { label: t('settings.data.webdav.maxBackups.unlimited'), value: 0 },
+            { label: '1', value: 1 },
+            { label: '3', value: 3 },
+            { label: '5', value: 5 },
+            { label: '10', value: 10 },
+            { label: '20', value: 20 },
+            { label: '50', value: 50 }
+          ]}
+        />
       </SettingRow>
       <SettingDivider />
       <SettingRow>
diff --git a/src/renderer/src/pages/settings/DataSettings/YuqueSettings.tsx b/src/renderer/src/pages/settings/DataSettings/YuqueSettings.tsx
index 72a629e55b..60a8d6ef7c 100644
--- a/src/renderer/src/pages/settings/DataSettings/YuqueSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/YuqueSettings.tsx
@@ -4,7 +4,7 @@ import { useTheme } from '@renderer/context/ThemeProvider'
 import { useMinappPopup } from '@renderer/hooks/useMinappPopup'
 import { RootState, useAppDispatch } from '@renderer/store'
 import { setYuqueRepoId, setYuqueToken, setYuqueUrl } from '@renderer/store/settings'
-import { Button, Tooltip } from 'antd'
+import { Button, Space, Tooltip } from 'antd'
 import Input from 'antd/es/input/Input'
 import { FC } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -100,14 +100,15 @@ const YuqueSettings: FC = () => {
           </Tooltip>
         </SettingRowTitle>
         <HStack alignItems="center" gap="5px" style={{ width: 315 }}>
-          <Input
-            type="password"
-            value={yuqueToken || ''}
-            onChange={handleYuqueTokenChange}
-            style={{ width: 250 }}
-            placeholder={t('settings.data.yuque.token_placeholder')}
-          />
-          <Button onClick={handleYuqueConnectionCheck}>{t('settings.data.yuque.check.button')}</Button>
+          <Space.Compact style={{ width: '100%' }}>
+            <Input
+              type="password"
+              value={yuqueToken || ''}
+              onChange={handleYuqueTokenChange}
+              placeholder={t('settings.data.yuque.token_placeholder')}
+            />
+            <Button onClick={handleYuqueConnectionCheck}>{t('settings.data.yuque.check.button')}</Button>
+          </Space.Compact>
         </HStack>
       </SettingRow>
     </SettingGroup>
diff --git a/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx b/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx
index 48c8dcbe92..56d09bd8dc 100644
--- a/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx
+++ b/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx
@@ -196,7 +196,7 @@ const DisplaySettings: FC = () => {
               value={userTheme.colorPrimary}
               onChange={(color) => handleColorPrimaryChange(color.toHexString())}
               showText
-              style={{ width: '110px' }}
+              size="small"
               presets={[
                 {
                   label: 'Presets',
@@ -222,13 +222,15 @@ const DisplaySettings: FC = () => {
         <SettingRow>
           <SettingRowTitle>{t('settings.zoom.title')}</SettingRowTitle>
           <ZoomButtonGroup>
-            <Button onClick={() => handleZoomFactor(-0.1)} icon={<Minus size="14" />} />
+            <Button onClick={() => handleZoomFactor(-0.1)} icon={<Minus size="14" />} color="default" variant="text" />
             <ZoomValue>{Math.round(currentZoom * 100)}%</ZoomValue>
-            <Button onClick={() => handleZoomFactor(0.1)} icon={<Plus size="14" />} />
+            <Button onClick={() => handleZoomFactor(0.1)} icon={<Plus size="14" />} color="default" variant="text" />
             <Button
               onClick={() => handleZoomFactor(0, true)}
               style={{ marginLeft: 8 }}
               icon={<RotateCcw size="14" />}
+              color="default"
+              variant="text"
             />
           </ZoomButtonGroup>
         </SettingRow>
diff --git a/src/renderer/src/pages/settings/GeneralSettings.tsx b/src/renderer/src/pages/settings/GeneralSettings.tsx
index ba0de7fdf9..3c9ebd84d4 100644
--- a/src/renderer/src/pages/settings/GeneralSettings.tsx
+++ b/src/renderer/src/pages/settings/GeneralSettings.tsx
@@ -1,3 +1,4 @@
+import Selector from '@renderer/components/Selector'
 import { useTheme } from '@renderer/context/ThemeProvider'
 import { useSettings } from '@renderer/hooks/useSettings'
 import i18n from '@renderer/i18n'
@@ -15,7 +16,7 @@ import { LanguageVarious } from '@renderer/types'
 import { NotificationSource } from '@renderer/types/notification'
 import { isValidProxyUrl } from '@renderer/utils'
 import { defaultLanguage } from '@shared/config/constant'
-import { Input, Select, Space, Switch } from 'antd'
+import { Flex, Input, Switch } from 'antd'
 import { FC, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useSelector } from 'react-redux'
@@ -92,7 +93,7 @@ const GeneralSettings: FC = () => {
     window.api.setProxy(proxyUrl)
   }
 
-  const proxyModeOptions = [
+  const proxyModeOptions: { value: 'system' | 'custom' | 'none'; label: string }[] = [
     { value: 'system', label: t('settings.proxy.mode.system') },
     { value: 'custom', label: t('settings.proxy.mode.custom') },
     { value: 'none', label: t('settings.proxy.mode.none') }
@@ -153,59 +154,27 @@ const GeneralSettings: FC = () => {
         <SettingDivider />
         <SettingRow>
           <SettingRowTitle>{t('common.language')}</SettingRowTitle>
-          <Select defaultValue={language || defaultLanguage} style={{ width: 180 }} onChange={onSelectLanguage}>
-            {languagesOptions.map((lang) => (
-              <Select.Option key={lang.value} value={lang.value}>
-                <Space.Compact direction="horizontal" block>
-                  <Space.Compact block>{lang.label}</Space.Compact>
+          <Selector
+            size={14}
+            value={language || defaultLanguage}
+            onChange={onSelectLanguage}
+            options={languagesOptions.map((lang) => ({
+              label: (
+                <Flex align="center" gap={8}>
                   <span role="img" aria-label={lang.flag}>
                     {lang.flag}
                   </span>
-                </Space.Compact>
-              </Select.Option>
-            ))}
-          </Select>
+                  {lang.label}
+                </Flex>
+              ),
+              value: lang.value
+            }))}
+          />
         </SettingRow>
         <SettingDivider />
-        <SettingRow>
-          <SettingRowTitle>{t('settings.general.spell_check')}</SettingRowTitle>
-          <Switch checked={enableSpellCheck} onChange={handleSpellCheckChange} />
-        </SettingRow>
-        {enableSpellCheck && (
-          <>
-            <SettingDivider />
-            <SettingRow>
-              <SettingRowTitle>{t('settings.general.spell_check.languages')}</SettingRowTitle>
-              <Select
-                mode="multiple"
-                value={spellCheckLanguages}
-                style={{ width: 280 }}
-                placeholder={t('settings.general.spell_check.languages')}
-                onChange={handleSpellCheckLanguagesChange}
-                options={spellCheckLanguageOptions.map((lang) => ({
-                  value: lang.value,
-                  label: (
-                    <Space.Compact direction="horizontal" block>
-                      <Space.Compact block>{lang.label}</Space.Compact>
-                      <span role="img" aria-label={lang.flag}>
-                        {lang.flag}
-                      </span>
-                    </Space.Compact>
-                  )
-                }))}
-              />
-            </SettingRow>
-          </>
-        )}
-        <SettingDivider />
         <SettingRow>
           <SettingRowTitle>{t('settings.proxy.mode.title')}</SettingRowTitle>
-          <Select
-            value={storeProxyMode}
-            style={{ width: 180 }}
-            onChange={onProxyModeChange}
-            options={proxyModeOptions}
-          />
+          <Selector value={storeProxyMode} onChange={onProxyModeChange} options={proxyModeOptions} />
         </SettingRow>
         {storeProxyMode === 'custom' && (
           <>
@@ -223,6 +192,37 @@ const GeneralSettings: FC = () => {
             </SettingRow>
           </>
         )}
+        <SettingDivider />
+        <SettingRow>
+          <SettingRowTitle>{t('settings.general.spell_check')}</SettingRowTitle>
+          <Switch checked={enableSpellCheck} onChange={handleSpellCheckChange} />
+        </SettingRow>
+        {enableSpellCheck && (
+          <>
+            <SettingDivider />
+            <SettingRow>
+              <SettingRowTitle>{t('settings.general.spell_check.languages')}</SettingRowTitle>
+              <Selector<string>
+                size={14}
+                multiple
+                value={spellCheckLanguages}
+                placeholder={t('settings.general.spell_check.languages')}
+                onChange={handleSpellCheckLanguagesChange}
+                options={spellCheckLanguageOptions.map((lang) => ({
+                  value: lang.value,
+                  label: (
+                    <Flex align="center" gap={8}>
+                      <span role="img" aria-label={lang.flag}>
+                        {lang.flag}
+                      </span>
+                      {lang.label}
+                    </Flex>
+                  )
+                }))}
+              />
+            </SettingRow>
+          </>
+        )}
       </SettingGroup>
       <SettingGroup theme={theme}>
         <SettingTitle>{t('settings.notification.title')}</SettingTitle>
diff --git a/src/renderer/src/pages/settings/ModelSettings/DefaultAssistantSettings.tsx b/src/renderer/src/pages/settings/ModelSettings/DefaultAssistantSettings.tsx
index 3e1ca1ce63..e7c72ac0e5 100644
--- a/src/renderer/src/pages/settings/ModelSettings/DefaultAssistantSettings.tsx
+++ b/src/renderer/src/pages/settings/ModelSettings/DefaultAssistantSettings.tsx
@@ -7,7 +7,7 @@ import { useTheme } from '@renderer/context/ThemeProvider'
 import { useDefaultAssistant } from '@renderer/hooks/useAssistant'
 import { AssistantSettings as AssistantSettingsType } from '@renderer/types'
 import { getLeadingEmoji, modalConfirm } from '@renderer/utils'
-import { Button, Col, Input, InputNumber, Modal, Popover, Row, Slider, Switch, Tooltip } from 'antd'
+import { Button, Col, Flex, Input, InputNumber, Modal, Popover, Row, Slider, Switch, Tooltip } from 'antd'
 import TextArea from 'antd/es/input/TextArea'
 import { Dispatch, FC, SetStateAction, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -101,7 +101,7 @@ const AssistantSettings: FC = () => {
       <HStack gap={8} alignItems="center" style={{ margin: '10px 0' }}>
         <Popover content={<EmojiPicker onEmojiClick={handleEmojiSelect} />} arrow>
           <EmojiButtonWrapper>
-            <Button style={{ fontSize: 20, padding: '4px', minWidth: '32px', height: '32px' }}>{emoji}</Button>
+            <Button style={{ fontSize: 20, padding: '4px', minWidth: '30px', height: '30px' }}>{emoji}</Button>
             {emoji && (
               <CloseCircleFilled
                 className="delete-icon"
@@ -145,7 +145,7 @@ const AssistantSettings: FC = () => {
           justifyContent: 'space-between'
         }}>
         {t('settings.assistant.model_params')}
-        <Button onClick={onReset} style={{ width: 90 }}>
+        <Button onClick={onReset} style={{ width: 81 }}>
           {t('chat.settings.reset')}
         </Button>
       </SettingSubtitle>
@@ -156,7 +156,7 @@ const AssistantSettings: FC = () => {
         </Tooltip>
       </Row>
       <Row align="middle" style={{ marginBottom: 10 }} gutter={20}>
-        <Col span={21}>
+        <Col span={19}>
           <Slider
             min={0}
             max={2}
@@ -167,7 +167,7 @@ const AssistantSettings: FC = () => {
             step={0.01}
           />
         </Col>
-        <Col span={3}>
+        <Col span={5}>
           <InputNumber
             min={0}
             max={2}
@@ -185,7 +185,7 @@ const AssistantSettings: FC = () => {
         </Tooltip>
       </Row>
       <Row align="middle" style={{ marginBottom: 10 }} gutter={20}>
-        <Col span={21}>
+        <Col span={19}>
           <Slider
             min={0}
             max={1}
@@ -196,7 +196,7 @@ const AssistantSettings: FC = () => {
             step={0.01}
           />
         </Col>
-        <Col span={3}>
+        <Col span={5}>
           <InputNumber min={0} max={1} step={0.01} value={topP} onChange={onTopPChange} style={{ width: '100%' }} />
         </Col>
       </Row>
@@ -207,7 +207,7 @@ const AssistantSettings: FC = () => {
         </Tooltip>
       </Row>
       <Row align="middle" style={{ marginBottom: 10 }} gutter={20}>
-        <Col span={21}>
+        <Col span={19}>
           <Slider
             min={0}
             max={20}
@@ -218,7 +218,7 @@ const AssistantSettings: FC = () => {
             step={1}
           />
         </Col>
-        <Col span={3}>
+        <Col span={5}>
           <InputNumber
             min={0}
             max={20}
@@ -229,7 +229,7 @@ const AssistantSettings: FC = () => {
           />
         </Col>
       </Row>
-      <Row align="middle" style={{ marginBottom: 10 }}>
+      <Flex justify="space-between" align="center" style={{ marginBottom: 10 }}>
         <HStack alignItems="center">
           <Label>{t('chat.settings.max_tokens')}</Label>
           <Tooltip title={t('chat.settings.max_tokens.tip')}>
@@ -255,7 +255,7 @@ const AssistantSettings: FC = () => {
             onUpdateAssistantSettings({ enableMaxTokens: enabled })
           }}
         />
-      </Row>
+      </Flex>
       {enableMaxTokens && (
         <Row align="middle" gutter={20}>
           <Col span={24}>
@@ -307,7 +307,7 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
       afterClose={onClose}
       transitionName="animation-move-down"
       centered
-      width={800}
+      width={500}
       footer={null}>
       <AssistantSettings />
     </Modal>
diff --git a/src/renderer/src/pages/settings/ProviderSettings/AddModelPopup.tsx b/src/renderer/src/pages/settings/ProviderSettings/AddModelPopup.tsx
index cf79088ac4..1ff9517f9b 100644
--- a/src/renderer/src/pages/settings/ProviderSettings/AddModelPopup.tsx
+++ b/src/renderer/src/pages/settings/ProviderSettings/AddModelPopup.tsx
@@ -121,7 +121,7 @@ const PopupContainer: React.FC<Props> = ({ title, provider, resolve }) => {
           tooltip={t('settings.models.add.group_name.tooltip')}>
           <Input placeholder={t('settings.models.add.group_name.placeholder')} spellCheck={false} />
         </Form.Item>
-        <Form.Item style={{ marginBottom: 0, textAlign: 'center' }}>
+        <Form.Item style={{ marginBottom: 8, textAlign: 'center' }}>
           <Flex justify="end" align="center" style={{ position: 'relative' }}>
             <Button type="primary" htmlType="submit" size="middle">
               {t('settings.models.add.add_model')}
diff --git a/src/renderer/src/pages/settings/ProviderSettings/EditModelsPopup.tsx b/src/renderer/src/pages/settings/ProviderSettings/EditModelsPopup.tsx
index f659d7f094..c12844df32 100644
--- a/src/renderer/src/pages/settings/ProviderSettings/EditModelsPopup.tsx
+++ b/src/renderer/src/pages/settings/ProviderSettings/EditModelsPopup.tsx
@@ -256,10 +256,6 @@ const PopupContainer: React.FC<Props> = ({ provider: _provider, resolve }) => {
       afterClose={onClose}
       footer={null}
       width="800px"
-      styles={{
-        content: { padding: 0 },
-        header: { padding: '16px 22px 30px 22px' }
-      }}
       transitionName="animation-move-down"
       centered>
       <SearchContainer>
@@ -381,8 +377,6 @@ const SearchContainer = styled.div`
   display: flex;
   flex-direction: column;
   gap: 15px;
-  padding: 0 22px;
-  margin-top: -10px;
 
   .ant-radio-group {
     display: flex;
@@ -399,12 +393,10 @@ const TopToolsWrapper = styled.div`
 const ListContainer = styled.div`
   height: calc(100vh - 300px);
   overflow-y: scroll;
-  padding: 0 6px 16px 6px;
-  margin-left: 16px;
-  margin-right: 10px;
   display: flex;
   flex-direction: column;
   gap: 16px;
+  padding-right: 2px;
 `
 
 const FlexColumn = styled.div`
diff --git a/src/renderer/src/pages/settings/ProviderSettings/ModelEditContent.tsx b/src/renderer/src/pages/settings/ProviderSettings/ModelEditContent.tsx
index d1cb1d66a1..4ccd61ab7d 100644
--- a/src/renderer/src/pages/settings/ProviderSettings/ModelEditContent.tsx
+++ b/src/renderer/src/pages/settings/ProviderSettings/ModelEditContent.tsx
@@ -1,4 +1,3 @@
-import { DownOutlined, UpOutlined } from '@ant-design/icons'
 import CopyIcon from '@renderer/components/Icons/CopyIcon'
 import {
   isEmbeddingModel,
@@ -10,6 +9,7 @@ import {
 import { Model, ModelType } from '@renderer/types'
 import { getDefaultGroupName } from '@renderer/utils'
 import { Button, Checkbox, Divider, Flex, Form, Input, InputNumber, message, Modal, Select } from 'antd'
+import { ChevronDown, ChevronUp } from 'lucide-react'
 import { FC, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
@@ -133,23 +133,26 @@ const ModelEditContent: FC<ModelEditContentProps> = ({ model, onUpdateModel, ope
           tooltip={t('settings.models.add.group_name.tooltip')}>
           <Input placeholder={t('settings.models.add.group_name.placeholder')} spellCheck={false} />
         </Form.Item>
-        <Form.Item style={{ marginBottom: 15, textAlign: 'center' }}>
-          <Flex justify="center" align="center" style={{ position: 'relative' }}>
-            <MoreSettingsRow
+        <Form.Item style={{ marginBottom: 8, textAlign: 'center' }}>
+          <Flex justify="space-between" align="center" style={{ position: 'relative' }}>
+            <Button
+              color="default"
+              variant="filled"
+              icon={showMoreSettings ? <ChevronUp size={16} /> : <ChevronDown size={16} />}
+              iconPosition="end"
               onClick={() => setShowMoreSettings(!showMoreSettings)}
-              style={{ position: 'absolute', right: 0 }}>
+              style={{ color: 'var(--color-text-3)' }}>
               {t('settings.moresetting')}
-              <ExpandIcon>{showMoreSettings ? <UpOutlined /> : <DownOutlined />}</ExpandIcon>
-            </MoreSettingsRow>
+            </Button>
             <Button type="primary" htmlType="submit" size="middle">
               {t('common.save')}
             </Button>
           </Flex>
         </Form.Item>
         {showMoreSettings && (
-          <div>
-            <Divider style={{ margin: '0 0 15px 0' }} />
-            <TypeTitle>{t('models.type.select')}</TypeTitle>
+          <div style={{ marginBottom: 8 }}>
+            <Divider style={{ margin: '16px 0 16px 0' }} />
+            <TypeTitle>{t('models.type.select')}:</TypeTitle>
             {(() => {
               const defaultTypes = [
                 ...(isVisionModel(model) ? ['vision'] : []),
@@ -235,6 +238,7 @@ const ModelEditContent: FC<ModelEditContentProps> = ({ model, onUpdateModel, ope
                   }
                 }}
                 dropdownMatchSelectWidth={false}
+                suffixIcon={<ChevronDown size={16} color="var(--color-border)" />}
               />
             </Form.Item>
 
@@ -281,32 +285,9 @@ const ModelEditContent: FC<ModelEditContentProps> = ({ model, onUpdateModel, ope
 }
 
 const TypeTitle = styled.div`
-  margin-top: 16px;
-  margin-bottom: 12px;
+  margin: 12px 0;
   font-size: 14px;
   font-weight: 600;
 `
 
-const ExpandIcon = styled.div`
-  font-size: 12px;
-  color: var(--color-text-3);
-`
-
-const MoreSettingsRow = styled.div`
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  color: var(--color-text-3);
-  cursor: pointer;
-  padding: 4px 8px;
-  border-radius: 4px;
-  max-width: 150px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-
-  &:hover {
-    background-color: var(--color-background-soft);
-  }
-`
-
 export default ModelEditContent
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/AddSubscribePopup.tsx b/src/renderer/src/pages/settings/WebSearchSettings/AddSubscribePopup.tsx
index 12f5e29925..7577ed8c07 100644
--- a/src/renderer/src/pages/settings/WebSearchSettings/AddSubscribePopup.tsx
+++ b/src/renderer/src/pages/settings/WebSearchSettings/AddSubscribePopup.tsx
@@ -1,5 +1,5 @@
 import { TopView } from '@renderer/components/TopView'
-import { Button, Form, FormProps, Input, Modal } from 'antd'
+import { Button, Flex, Form, FormProps, Input, Modal } from 'antd'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
@@ -66,7 +66,7 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
       centered>
       <Form
         form={form}
-        labelCol={{ flex: '150px' }}
+        labelCol={{ flex: '110px' }}
         labelAlign="right"
         colon={false}
         style={{ marginTop: 25 }}
@@ -89,11 +89,11 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
         <Form.Item name="name" label={t('settings.websearch.subscribe_name')}>
           <Input placeholder={t('settings.websearch.subscribe_name.placeholder')} spellCheck={false} />
         </Form.Item>
-        <Form.Item label=" ">
+        <Flex justify="end" style={{ marginBottom: 8 }}>
           <Button type="primary" htmlType="submit">
             {t('settings.websearch.subscribe_add')}
           </Button>
-        </Form.Item>
+        </Flex>
       </Form>
     </Modal>
   )
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/index.tsx b/src/renderer/src/pages/settings/WebSearchSettings/index.tsx
index e00eb785e7..6fab13d388 100644
--- a/src/renderer/src/pages/settings/WebSearchSettings/index.tsx
+++ b/src/renderer/src/pages/settings/WebSearchSettings/index.tsx
@@ -1,8 +1,8 @@
+import Selector from '@renderer/components/Selector'
 import { useTheme } from '@renderer/context/ThemeProvider'
 import { useDefaultWebSearchProvider, useWebSearchProviders } from '@renderer/hooks/useWebSearchProviders'
 import { WebSearchProvider } from '@renderer/types'
 import { hasObjectKey } from '@renderer/utils'
-import { Select } from 'antd'
 import { FC, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
@@ -37,9 +37,9 @@ const WebSearchSettings: FC = () => {
         <SettingRow>
           <SettingRowTitle>{t('settings.websearch.search_provider')}</SettingRowTitle>
           <div style={{ display: 'flex', gap: '8px' }}>
-            <Select
+            <Selector
+              size={14}
               value={selectedProvider?.id}
-              style={{ width: '200px' }}
               onChange={(value: string) => updateSelectedWebSearchProvider(value)}
               placeholder={t('settings.websearch.search_provider_placeholder')}
               options={providers.map((p) => ({
diff --git a/src/renderer/src/pages/translate/TranslatePage.tsx b/src/renderer/src/pages/translate/TranslatePage.tsx
index 11db557bf9..cb65c7c34e 100644
--- a/src/renderer/src/pages/translate/TranslatePage.tsx
+++ b/src/renderer/src/pages/translate/TranslatePage.tsx
@@ -23,7 +23,7 @@ import TextArea, { TextAreaRef } from 'antd/es/input/TextArea'
 import dayjs from 'dayjs'
 import { useLiveQuery } from 'dexie-react-hooks'
 import { find, isEmpty, sortBy } from 'lodash'
-import { HelpCircle, Settings2, TriangleAlert } from 'lucide-react'
+import { ChevronDown, HelpCircle, Settings2, TriangleAlert } from 'lucide-react'
 import { FC, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import ReactMarkdown from 'react-markdown'
@@ -126,6 +126,7 @@ const TranslateSettings: FC<{
               }}
               options={selectOptions}
               showSearch
+              suffixIcon={<ChevronDown strokeWidth={1.5} size={16} color="var(--color-text-3)" />}
             />
           </HStack>
           {!translateModel && (
@@ -187,6 +188,7 @@ const TranslateSettings: FC<{
                       </Space.Compact>
                     )
                   }))}
+                  suffixIcon={<ChevronDown strokeWidth={1.5} size={16} color="var(--color-text-3)" />}
                 />
                 <span>⇆</span>
                 <Select
@@ -204,6 +206,7 @@ const TranslateSettings: FC<{
                       </Space.Compact>
                     )
                   }))}
+                  suffixIcon={<ChevronDown strokeWidth={1.5} size={16} color="var(--color-text-3)" />}
                 />
               </Flex>
             )}
@@ -452,6 +455,7 @@ const TranslatePage: FC = () => {
             </Space.Compact>
           )
         }))}
+        suffixIcon={<ChevronDown strokeWidth={1.5} size={16} color="var(--color-text-3)" />}
       />
     )
   }
@@ -551,6 +555,7 @@ const TranslatePage: FC = () => {
                     )
                   }))
                 ]}
+                suffixIcon={<ChevronDown strokeWidth={1.5} size={16} color="var(--color-text-3)" />}
               />
               <Button
                 type="text"
diff --git a/src/renderer/src/windows/mini/chat/components/Message.tsx b/src/renderer/src/windows/mini/chat/components/Message.tsx
index de262a72b1..6260e798fc 100644
--- a/src/renderer/src/windows/mini/chat/components/Message.tsx
+++ b/src/renderer/src/windows/mini/chat/components/Message.tsx
@@ -85,7 +85,6 @@ const MessageContentContainer = styled.div`
   flex: 1;
   flex-direction: column;
   justify-content: space-between;
-  margin-left: 46px;
   margin-top: 5px;
 `
 

From a94847faebe1f92834a6d0f0a8213852b836dea2 Mon Sep 17 00:00:00 2001
From: Chen Tao <70054568+eeee0717@users.noreply.github.com>
Date: Wed, 25 Jun 2025 15:48:04 +0800
Subject: [PATCH 28/75] fix: bailian reranker (#7518)

---
 src/main/reranker/BaseReranker.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/reranker/BaseReranker.ts b/src/main/reranker/BaseReranker.ts
index 16d36f87fc..9a40dfbdf8 100644
--- a/src/main/reranker/BaseReranker.ts
+++ b/src/main/reranker/BaseReranker.ts
@@ -17,7 +17,7 @@ export default abstract class BaseReranker {
    * Get Rerank Request Url
    */
   protected getRerankUrl() {
-    if (this.base.rerankModelProvider === 'dashscope') {
+    if (this.base.rerankModelProvider === 'bailian') {
       return 'https://dashscope.aliyuncs.com/api/v1/services/rerank/text-rerank/text-rerank'
     }
 
@@ -50,7 +50,7 @@ export default abstract class BaseReranker {
         documents,
         top_k: topN
       }
-    } else if (provider === 'dashscope') {
+    } else if (provider === 'bailian') {
       return {
         model: this.base.rerankModel,
         input: {
@@ -82,7 +82,7 @@ export default abstract class BaseReranker {
    */
   protected extractRerankResult(data: any) {
     const provider = this.base.rerankModelProvider
-    if (provider === 'dashscope') {
+    if (provider === 'bailian') {
       return data.output.results
     } else if (provider === 'voyageai') {
       return data.data

From 04e6f2c1ad5b869ac78d713e74cda9c121910639 Mon Sep 17 00:00:00 2001
From: LiuVaayne <10231735+vaayne@users.noreply.github.com>
Date: Wed, 25 Jun 2025 18:21:10 +0800
Subject: [PATCH 29/75] feat: implement Python MCP server using existing
 Pyodide infrastructure (#7506)

---
 packages/shared/IpcChannel.ts               |   3 +
 src/main/ipc.ts                             |  12 +++
 src/main/mcpServers/factory.ts              |   4 +
 src/main/mcpServers/python.ts               | 113 ++++++++++++++++++++
 src/main/services/PythonService.ts          | 102 ++++++++++++++++++
 src/preload/index.ts                        |   4 +
 src/renderer/src/services/PyodideService.ts |  33 ++++++
 src/renderer/src/store/mcp.ts               |   8 ++
 8 files changed, 279 insertions(+)
 create mode 100644 src/main/mcpServers/python.ts
 create mode 100644 src/main/services/PythonService.ts

diff --git a/packages/shared/IpcChannel.ts b/packages/shared/IpcChannel.ts
index a3988d1c42..b77fd5d430 100644
--- a/packages/shared/IpcChannel.ts
+++ b/packages/shared/IpcChannel.ts
@@ -69,6 +69,9 @@ export enum IpcChannel {
   Mcp_ServersUpdated = 'mcp:servers-updated',
   Mcp_CheckConnectivity = 'mcp:check-connectivity',
 
+  // Python
+  Python_Execute = 'python:execute',
+
   //copilot
   Copilot_GetAuthMessage = 'copilot:get-auth-message',
   Copilot_GetCopilotToken = 'copilot:get-copilot-token',
diff --git a/src/main/ipc.ts b/src/main/ipc.ts
index bcb90ee5d6..8d8690a54e 100644
--- a/src/main/ipc.ts
+++ b/src/main/ipc.ts
@@ -25,6 +25,7 @@ import NotificationService from './services/NotificationService'
 import * as NutstoreService from './services/NutstoreService'
 import ObsidianVaultService from './services/ObsidianVaultService'
 import { ProxyConfig, proxyManager } from './services/ProxyManager'
+import { pythonService } from './services/PythonService'
 import { searchService } from './services/SearchService'
 import { SelectionService } from './services/SelectionService'
 import { registerShortcuts, unregisterAllShortcuts } from './services/ShortcutService'
@@ -48,6 +49,9 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   const appUpdater = new AppUpdater(mainWindow)
   const notificationService = new NotificationService(mainWindow)
 
+  // Initialize Python service with main window
+  pythonService.setMainWindow(mainWindow)
+
   ipcMain.handle(IpcChannel.App_Info, () => ({
     version: app.getVersion(),
     isPackaged: app.isPackaged,
@@ -431,6 +435,14 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.Mcp_GetInstallInfo, mcpService.getInstallInfo)
   ipcMain.handle(IpcChannel.Mcp_CheckConnectivity, mcpService.checkMcpConnectivity)
 
+  // Register Python execution handler
+  ipcMain.handle(
+    IpcChannel.Python_Execute,
+    async (_, script: string, context?: Record<string, any>, timeout?: number) => {
+      return await pythonService.executeScript(script, context, timeout)
+    }
+  )
+
   ipcMain.handle(IpcChannel.App_IsBinaryExist, (_, name: string) => isBinaryExists(name))
   ipcMain.handle(IpcChannel.App_GetBinaryPath, (_, name: string) => getBinaryPath(name))
   ipcMain.handle(IpcChannel.App_InstallUvBinary, () => runInstallScript('install-uv.js'))
diff --git a/src/main/mcpServers/factory.ts b/src/main/mcpServers/factory.ts
index 1c508f8844..2376ef223e 100644
--- a/src/main/mcpServers/factory.ts
+++ b/src/main/mcpServers/factory.ts
@@ -6,6 +6,7 @@ import DifyKnowledgeServer from './dify-knowledge'
 import FetchServer from './fetch'
 import FileSystemServer from './filesystem'
 import MemoryServer from './memory'
+import PythonServer from './python'
 import ThinkingServer from './sequentialthinking'
 
 export function createInMemoryMCPServer(name: string, args: string[] = [], envs: Record<string, string> = {}): Server {
@@ -31,6 +32,9 @@ export function createInMemoryMCPServer(name: string, args: string[] = [], envs:
       const difyKey = envs.DIFY_KEY
       return new DifyKnowledgeServer(difyKey, args).server
     }
+    case '@cherry/python': {
+      return new PythonServer().server
+    }
     default:
       throw new Error(`Unknown in-memory MCP server: ${name}`)
   }
diff --git a/src/main/mcpServers/python.ts b/src/main/mcpServers/python.ts
new file mode 100644
index 0000000000..6fe0b80db1
--- /dev/null
+++ b/src/main/mcpServers/python.ts
@@ -0,0 +1,113 @@
+import { pythonService } from '@main/services/PythonService'
+import { Server } from '@modelcontextprotocol/sdk/server/index.js'
+import { CallToolRequestSchema, ErrorCode, ListToolsRequestSchema, McpError } from '@modelcontextprotocol/sdk/types.js'
+import Logger from 'electron-log'
+
+/**
+ * Python MCP Server for executing Python code using Pyodide
+ */
+class PythonServer {
+  public server: Server
+
+  constructor() {
+    this.server = new Server(
+      {
+        name: 'python-server',
+        version: '1.0.0'
+      },
+      {
+        capabilities: {
+          tools: {}
+        }
+      }
+    )
+
+    this.setupRequestHandlers()
+  }
+
+  private setupRequestHandlers() {
+    // List available tools
+    this.server.setRequestHandler(ListToolsRequestSchema, async () => {
+      return {
+        tools: [
+          {
+            name: 'python_execute',
+            description: `Execute Python code using Pyodide in a sandboxed environment. Supports most Python standard library and scientific packages.
+The code will be executed with Python 3.12.
+Dependencies may be defined via PEP 723 script metadata, e.g. to install "pydantic", the script should start
+with a comment of the form:
+# /// script
+# dependencies = ['pydantic']
+# ///
+print('python code here')`,
+            inputSchema: {
+              type: 'object',
+              properties: {
+                code: {
+                  type: 'string',
+                  description: 'The Python code to execute'
+                },
+                context: {
+                  type: 'object',
+                  description: 'Optional context variables to pass to the Python execution environment',
+                  additionalProperties: true
+                },
+                timeout: {
+                  type: 'number',
+                  description: 'Timeout in milliseconds (default: 60000)',
+                  default: 60000
+                }
+              },
+              required: ['code']
+            }
+          }
+        ]
+      }
+    })
+
+    // Handle tool calls
+    this.server.setRequestHandler(CallToolRequestSchema, async (request) => {
+      const { name, arguments: args } = request.params
+
+      if (name !== 'python_execute') {
+        throw new McpError(ErrorCode.MethodNotFound, `Tool ${name} not found`)
+      }
+
+      try {
+        const {
+          code,
+          context = {},
+          timeout = 60000
+        } = args as {
+          code: string
+          context?: Record<string, any>
+          timeout?: number
+        }
+
+        if (!code || typeof code !== 'string') {
+          throw new McpError(ErrorCode.InvalidParams, 'Code parameter is required and must be a string')
+        }
+
+        Logger.info('Executing Python code via Pyodide')
+
+        const result = await pythonService.executeScript(code, context, timeout)
+
+        return {
+          content: [
+            {
+              type: 'text',
+              text: result
+            }
+          ]
+        }
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error)
+        Logger.error('Python execution error:', errorMessage)
+
+        throw new McpError(ErrorCode.InternalError, `Python execution failed: ${errorMessage}`)
+      }
+    })
+  }
+}
+
+export default PythonServer
diff --git a/src/main/services/PythonService.ts b/src/main/services/PythonService.ts
new file mode 100644
index 0000000000..13b4546e56
--- /dev/null
+++ b/src/main/services/PythonService.ts
@@ -0,0 +1,102 @@
+import { randomUUID } from 'node:crypto'
+
+import { BrowserWindow, ipcMain } from 'electron'
+
+interface PythonExecutionRequest {
+  id: string
+  script: string
+  context: Record<string, any>
+  timeout: number
+}
+
+interface PythonExecutionResponse {
+  id: string
+  result?: string
+  error?: string
+}
+
+/**
+ * Service for executing Python code by communicating with the PyodideService in the renderer process
+ */
+export class PythonService {
+  private static instance: PythonService | null = null
+  private mainWindow: BrowserWindow | null = null
+  private pendingRequests = new Map<string, { resolve: (value: string) => void; reject: (error: Error) => void }>()
+
+  private constructor() {
+    // Private constructor for singleton pattern
+    this.setupIpcHandlers()
+  }
+
+  public static getInstance(): PythonService {
+    if (!PythonService.instance) {
+      PythonService.instance = new PythonService()
+    }
+    return PythonService.instance
+  }
+
+  private setupIpcHandlers() {
+    // Handle responses from renderer
+    ipcMain.on('python-execution-response', (_, response: PythonExecutionResponse) => {
+      const request = this.pendingRequests.get(response.id)
+      if (request) {
+        this.pendingRequests.delete(response.id)
+        if (response.error) {
+          request.reject(new Error(response.error))
+        } else {
+          request.resolve(response.result || '')
+        }
+      }
+    })
+  }
+
+  public setMainWindow(mainWindow: BrowserWindow) {
+    this.mainWindow = mainWindow
+  }
+
+  /**
+   * Execute Python code by sending request to renderer PyodideService
+   */
+  public async executeScript(
+    script: string,
+    context: Record<string, any> = {},
+    timeout: number = 60000
+  ): Promise<string> {
+    if (!this.mainWindow) {
+      throw new Error('Main window not set in PythonService')
+    }
+
+    return new Promise((resolve, reject) => {
+      const requestId = randomUUID()
+
+      // Store the request
+      this.pendingRequests.set(requestId, { resolve, reject })
+
+      // Set up timeout
+      const timeoutId = setTimeout(() => {
+        this.pendingRequests.delete(requestId)
+        reject(new Error('Python execution timed out'))
+      }, timeout + 5000) // Add 5s buffer for IPC communication
+
+      // Update resolve/reject to clear timeout
+      const originalResolve = resolve
+      const originalReject = reject
+      this.pendingRequests.set(requestId, {
+        resolve: (value: string) => {
+          clearTimeout(timeoutId)
+          originalResolve(value)
+        },
+        reject: (error: Error) => {
+          clearTimeout(timeoutId)
+          originalReject(error)
+        }
+      })
+
+      // Send request to renderer
+      const request: PythonExecutionRequest = { id: requestId, script, context, timeout }
+      this.mainWindow?.webContents.send('python-execution-request', request)
+    })
+  }
+}
+
+export const pythonService = PythonService.getInstance()
diff --git a/src/preload/index.ts b/src/preload/index.ts
index b6c87259ce..3e9ae532b2 100644
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -182,6 +182,10 @@ const api = {
     getInstallInfo: () => ipcRenderer.invoke(IpcChannel.Mcp_GetInstallInfo),
     checkMcpConnectivity: (server: any) => ipcRenderer.invoke(IpcChannel.Mcp_CheckConnectivity, server)
   },
+  python: {
+    execute: (script: string, context?: Record<string, any>, timeout?: number) =>
+      ipcRenderer.invoke(IpcChannel.Python_Execute, script, context, timeout)
+  },
   shell: {
     openExternal: (url: string, options?: Electron.OpenExternalOptions) => shell.openExternal(url, options)
   },
diff --git a/src/renderer/src/services/PyodideService.ts b/src/renderer/src/services/PyodideService.ts
index ff2ac77467..374561ec02 100644
--- a/src/renderer/src/services/PyodideService.ts
+++ b/src/renderer/src/services/PyodideService.ts
@@ -229,3 +229,36 @@ class PyodideService {
 
 // 创建并导出单例实例
 export const pyodideService = PyodideService.getInstance()
+
+// Set up IPC handler for main process requests
+if (typeof window !== 'undefined' && window.electron?.ipcRenderer) {
+  interface PythonExecutionRequest {
+    id: string
+    script: string
+    context: Record<string, any>
+    timeout: number
+  }
+
+  interface PythonExecutionResponse {
+    id: string
+    result?: string
+    error?: string
+  }
+
+  window.electron.ipcRenderer.on('python-execution-request', async (_, request: PythonExecutionRequest) => {
+    try {
+      const result = await pyodideService.runScript(request.script, request.context, request.timeout)
+      const response: PythonExecutionResponse = {
+        id: request.id,
+        result
+      }
+      window.electron.ipcRenderer.send('python-execution-response', response)
+    } catch (error) {
+      const response: PythonExecutionResponse = {
+        id: request.id,
+        error: error instanceof Error ? error.message : String(error)
+      }
+      window.electron.ipcRenderer.send('python-execution-response', response)
+    }
+  })
+}
diff --git a/src/renderer/src/store/mcp.ts b/src/renderer/src/store/mcp.ts
index 4894d93474..05caf291c4 100644
--- a/src/renderer/src/store/mcp.ts
+++ b/src/renderer/src/store/mcp.ts
@@ -137,6 +137,14 @@ export const builtinMCPServers: MCPServer[] = [
       DIFY_KEY: 'YOUR_DIFY_KEY'
     },
     provider: 'CherryAI'
+  },
+  {
+    id: nanoid(),
+    name: '@cherry/python',
+    type: 'inMemory',
+    description: '在安全的沙盒环境中执行 Python 代码。使用 Pyodide 运行 Python，支持大多数标准库和科学计算包',
+    isActive: false,
+    provider: 'CherryAI'
   }
 ]
 

From 0001bc60a90e22d9d4ea3b472254308e5edf4c4b Mon Sep 17 00:00:00 2001
From: fullex <106392080+0xfullex@users.noreply.github.com>
Date: Wed, 25 Jun 2025 19:59:47 +0800
Subject: [PATCH 30/75] refactor: rename isWindows to isWin for consistency
 across main/renderer (#7530)

refactor: rename isWindows to isWin for consistency across components
---
 .../src/components/MinApp/MinappPopupContainer.tsx     |  6 +++---
 src/renderer/src/components/app/Navbar.tsx             |  6 +++---
 src/renderer/src/config/constant.ts                    |  2 +-
 src/renderer/src/hooks/useFullScreenNotice.ts          |  4 ++--
 src/renderer/src/hooks/useShortcuts.ts                 |  4 ++--
 .../pages/settings/MCPSettings/McpSettingsNavbar.tsx   |  4 ++--
 .../SelectionAssistantSettings.tsx                     | 10 +++++-----
 src/renderer/src/pages/settings/ShortcutSettings.tsx   |  6 +++---
 src/renderer/src/utils/export.ts                       |  4 ++--
 src/renderer/src/utils/input.ts                        |  4 ++--
 10 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/renderer/src/components/MinApp/MinappPopupContainer.tsx b/src/renderer/src/components/MinApp/MinappPopupContainer.tsx
index bd360c8a30..f9a4ee7e1e 100644
--- a/src/renderer/src/components/MinApp/MinappPopupContainer.tsx
+++ b/src/renderer/src/components/MinApp/MinappPopupContainer.tsx
@@ -10,7 +10,7 @@ import {
   PushpinOutlined,
   ReloadOutlined
 } from '@ant-design/icons'
-import { isLinux, isMac, isWindows } from '@renderer/config/constant'
+import { isLinux, isMac, isWin } from '@renderer/config/constant'
 import { DEFAULT_MIN_APPS } from '@renderer/config/minapps'
 import { useBridge } from '@renderer/hooks/useBridge'
 import { useMinappPopup } from '@renderer/hooks/useMinappPopup'
@@ -303,7 +303,7 @@ const MinappPopupContainer: React.FC = () => {
           </Tooltip>
         )}
         <Spacer />
-        <ButtonsGroup className={isWindows || isLinux ? 'windows' : ''}>
+        <ButtonsGroup className={isWin || isLinux ? 'windows' : ''}>
           <Tooltip title={t('minapp.popup.goBack')} mouseEnterDelay={0.8} placement="bottom">
             <Button onClick={() => handleGoBack(appInfo.id)}>
               <ArrowLeftOutlined />
@@ -452,7 +452,7 @@ const ButtonsGroup = styled.div`
   gap: 5px;
   -webkit-app-region: no-drag;
   &.windows {
-    margin-right: ${isWindows ? '130px' : isLinux ? '100px' : 0};
+    margin-right: ${isWin ? '130px' : isLinux ? '100px' : 0};
     background-color: var(--color-background-mute);
     border-radius: 50px;
     padding: 0 3px;
diff --git a/src/renderer/src/components/app/Navbar.tsx b/src/renderer/src/components/app/Navbar.tsx
index e6176c2a00..9514f200b8 100644
--- a/src/renderer/src/components/app/Navbar.tsx
+++ b/src/renderer/src/components/app/Navbar.tsx
@@ -1,4 +1,4 @@
-import { isLinux, isMac, isWindows } from '@renderer/config/constant'
+import { isLinux, isMac, isWin } from '@renderer/config/constant'
 import { useFullscreen } from '@renderer/hooks/useFullscreen'
 import useNavBackgroundColor from '@renderer/hooks/useNavBackgroundColor'
 import type { FC, PropsWithChildren } from 'react'
@@ -78,7 +78,7 @@ const NavbarRightContainer = styled.div<{ $isFullscreen: boolean }>`
   display: flex;
   align-items: center;
   padding: 0 12px;
-  padding-right: ${({ $isFullscreen }) => ($isFullscreen ? '12px' : isWindows ? '140px' : isLinux ? '120px' : '12px')};
+  padding-right: ${({ $isFullscreen }) => ($isFullscreen ? '12px' : isWin ? '140px' : isLinux ? '120px' : '12px')};
   justify-content: flex-end;
 `
 
@@ -91,5 +91,5 @@ const NavbarMainContainer = styled.div<{ $isFullscreen: boolean }>`
   padding: 0 ${isMac ? '20px' : 0};
   font-weight: bold;
   color: var(--color-text-1);
-  padding-right: ${({ $isFullscreen }) => ($isFullscreen ? '12px' : isWindows ? '140px' : isLinux ? '120px' : '12px')};
+  padding-right: ${({ $isFullscreen }) => ($isFullscreen ? '12px' : isWin ? '140px' : isLinux ? '120px' : '12px')};
 `
diff --git a/src/renderer/src/config/constant.ts b/src/renderer/src/config/constant.ts
index 05f9bfbc19..5a50daa9d1 100644
--- a/src/renderer/src/config/constant.ts
+++ b/src/renderer/src/config/constant.ts
@@ -6,7 +6,7 @@ export const DEFAULT_KNOWLEDGE_THRESHOLD = 0.0
 
 export const platform = window.electron?.process?.platform
 export const isMac = platform === 'darwin'
-export const isWindows = platform === 'win32' || platform === 'win64'
+export const isWin = platform === 'win32' || platform === 'win64'
 export const isLinux = platform === 'linux'
 
 export const SILICON_CLIENT_ID = 'SFaJLLq0y6CAMoyDm81aMu'
diff --git a/src/renderer/src/hooks/useFullScreenNotice.ts b/src/renderer/src/hooks/useFullScreenNotice.ts
index 9f95ddd9c7..69af2da4be 100644
--- a/src/renderer/src/hooks/useFullScreenNotice.ts
+++ b/src/renderer/src/hooks/useFullScreenNotice.ts
@@ -1,4 +1,4 @@
-import { isWindows } from '@renderer/config/constant'
+import { isWin } from '@renderer/config/constant'
 import { IpcChannel } from '@shared/IpcChannel'
 import { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -8,7 +8,7 @@ export function useFullScreenNotice() {
 
   useEffect(() => {
     const cleanup = window.electron.ipcRenderer.on(IpcChannel.FullscreenStatusChanged, (_, isFullscreen) => {
-      if (isWindows && isFullscreen) {
+      if (isWin && isFullscreen) {
         window.message.info({
           content: t('common.fullscreen'),
           duration: 3,
diff --git a/src/renderer/src/hooks/useShortcuts.ts b/src/renderer/src/hooks/useShortcuts.ts
index 691bd42f97..a809eee09e 100644
--- a/src/renderer/src/hooks/useShortcuts.ts
+++ b/src/renderer/src/hooks/useShortcuts.ts
@@ -1,4 +1,4 @@
-import { isMac, isWindows } from '@renderer/config/constant'
+import { isMac, isWin } from '@renderer/config/constant'
 import { useAppSelector } from '@renderer/store'
 import { orderBy } from 'lodash'
 import { useCallback } from 'react'
@@ -72,7 +72,7 @@ export function useShortcutDisplay(key: string) {
           case 'ctrl':
             return isMac ? '⌃' : 'Ctrl'
           case 'command':
-            return isMac ? '⌘' : isWindows ? 'Win' : 'Super'
+            return isMac ? '⌘' : isWin ? 'Win' : 'Super'
           case 'alt':
             return isMac ? '⌥' : 'Alt'
           case 'shift':
diff --git a/src/renderer/src/pages/settings/MCPSettings/McpSettingsNavbar.tsx b/src/renderer/src/pages/settings/MCPSettings/McpSettingsNavbar.tsx
index 7986ea5766..cef0625785 100644
--- a/src/renderer/src/pages/settings/MCPSettings/McpSettingsNavbar.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/McpSettingsNavbar.tsx
@@ -1,6 +1,6 @@
 import { NavbarRight } from '@renderer/components/app/Navbar'
 import { HStack } from '@renderer/components/Layout'
-import { isLinux, isWindows } from '@renderer/config/constant'
+import { isLinux, isWin } from '@renderer/config/constant'
 import { useFullscreen } from '@renderer/hooks/useFullscreen'
 import { Button, Dropdown, Menu, type MenuProps } from 'antd'
 import { ChevronDown, Search } from 'lucide-react'
@@ -74,7 +74,7 @@ export const McpSettingsNavbar = () => {
   }))
 
   return (
-    <NavbarRight style={{ paddingRight: useFullscreen() ? '12px' : isWindows ? 150 : isLinux ? 120 : 12 }}>
+    <NavbarRight style={{ paddingRight: useFullscreen() ? '12px' : isWin ? 150 : isLinux ? 120 : 12 }}>
       <HStack alignItems="center" gap={5}>
         <Button
           size="small"
diff --git a/src/renderer/src/pages/settings/SelectionAssistantSettings/SelectionAssistantSettings.tsx b/src/renderer/src/pages/settings/SelectionAssistantSettings/SelectionAssistantSettings.tsx
index 4947b00336..c10ecd617b 100644
--- a/src/renderer/src/pages/settings/SelectionAssistantSettings/SelectionAssistantSettings.tsx
+++ b/src/renderer/src/pages/settings/SelectionAssistantSettings/SelectionAssistantSettings.tsx
@@ -1,4 +1,4 @@
-import { isWindows } from '@renderer/config/constant'
+import { isWin } from '@renderer/config/constant'
 import { useTheme } from '@renderer/context/ThemeProvider'
 import { useSelectionAssistant } from '@renderer/hooks/useSelectionAssistant'
 import { FilterMode, TriggerMode } from '@renderer/types/selectionTypes'
@@ -53,7 +53,7 @@ const SelectionAssistantSettings: FC = () => {
 
   // force disable selection assistant on non-windows systems
   useEffect(() => {
-    if (!isWindows && selectionEnabled) {
+    if (!isWin && selectionEnabled) {
       setSelectionEnabled(false)
     }
   }, [selectionEnabled, setSelectionEnabled])
@@ -76,12 +76,12 @@ const SelectionAssistantSettings: FC = () => {
         <SettingRow>
           <SettingLabel>
             <SettingRowTitle>{t('selection.settings.enable.title')}</SettingRowTitle>
-            {!isWindows && <SettingDescription>{t('selection.settings.enable.description')}</SettingDescription>}
+            {!isWin && <SettingDescription>{t('selection.settings.enable.description')}</SettingDescription>}
           </SettingLabel>
           <Switch
-            checked={isWindows && selectionEnabled}
+            checked={isWin && selectionEnabled}
             onChange={(checked) => setSelectionEnabled(checked)}
-            disabled={!isWindows}
+            disabled={!isWin}
           />
         </SettingRow>
 
diff --git a/src/renderer/src/pages/settings/ShortcutSettings.tsx b/src/renderer/src/pages/settings/ShortcutSettings.tsx
index a414dd2212..9c8eec0653 100644
--- a/src/renderer/src/pages/settings/ShortcutSettings.tsx
+++ b/src/renderer/src/pages/settings/ShortcutSettings.tsx
@@ -1,6 +1,6 @@
 import { ClearOutlined, UndoOutlined } from '@ant-design/icons'
 import { HStack } from '@renderer/components/Layout'
-import { isMac, isWindows } from '@renderer/config/constant'
+import { isMac, isWin } from '@renderer/config/constant'
 import { useTheme } from '@renderer/context/ThemeProvider'
 import { useShortcuts } from '@renderer/hooks/useShortcuts'
 import { useAppDispatch } from '@renderer/store'
@@ -24,7 +24,7 @@ const ShortcutSettings: FC = () => {
 
   //if shortcut is not available on all the platforms, block the shortcut here
   let shortcuts = originalShortcuts
-  if (!isWindows) {
+  if (!isWin) {
     //Selection Assistant only available on Windows now
     const excludedShortcuts = ['selection_assistant_toggle', 'selection_assistant_select_text']
     shortcuts = shortcuts.filter((s) => !excludedShortcuts.includes(s.key))
@@ -86,7 +86,7 @@ const ShortcutSettings: FC = () => {
           case 'Ctrl':
             return isMac ? '⌃' : 'Ctrl'
           case 'Command':
-            return isMac ? '⌘' : isWindows ? 'Win' : 'Super'
+            return isMac ? '⌘' : isWin ? 'Win' : 'Super'
           case 'Alt':
             return isMac ? '⌥' : 'Alt'
           case 'Shift':
diff --git a/src/renderer/src/utils/export.ts b/src/renderer/src/utils/export.ts
index 373ad08dc7..6c0004d90b 100644
--- a/src/renderer/src/utils/export.ts
+++ b/src/renderer/src/utils/export.ts
@@ -546,13 +546,13 @@ export const exportMarkdownToObsidian = async (attributes: any) => {
  */
 function transformObsidianFileName(fileName: string): string {
   const platform = window.navigator.userAgent
-  const isWindows = /win/i.test(platform)
+  const isWin = /win/i.test(platform)
   const isMac = /mac/i.test(platform)
 
   // 删除Obsidian 全平台无效字符
   let sanitized = fileName.replace(/[#|\\^\\[\]]/g, '')
 
-  if (isWindows) {
+  if (isWin) {
     // Windows 的清理
     sanitized = sanitized
       .replace(/[<>:"\\/\\|?*]/g, '') // 移除无效字符
diff --git a/src/renderer/src/utils/input.ts b/src/renderer/src/utils/input.ts
index 649941072d..3f1f337190 100644
--- a/src/renderer/src/utils/input.ts
+++ b/src/renderer/src/utils/input.ts
@@ -1,4 +1,4 @@
-import { isMac, isWindows } from '@renderer/config/constant'
+import { isMac, isWin } from '@renderer/config/constant'
 import Logger from '@renderer/config/logger'
 import type { SendMessageShortcut } from '@renderer/store/settings'
 import { FileType } from '@renderer/types'
@@ -71,7 +71,7 @@ export const getSendMessageShortcutLabel = (shortcut: SendMessageShortcut) => {
     case 'Alt+Enter':
       return `${isMac ? '⌥' : 'Alt'} + Enter`
     case 'Command+Enter':
-      return `${isMac ? '⌘' : isWindows ? 'Win' : 'Super'} + Enter`
+      return `${isMac ? '⌘' : isWin ? 'Win' : 'Super'} + Enter`
     case 'Shift+Enter':
       return 'Shift + Enter'
     default:

From 839c44eb7a97f93d0236a8d34e548a5292beec59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E7=94=B1=E7=9A=84=E4=B8=96=E7=95=8C=E4=BA=BA?=
 <3196812536@qq.com>
Date: Wed, 25 Jun 2025 21:07:40 +0800
Subject: [PATCH 31/75] refactor: data migration modal logic in DataSettings
 (#7503)

* refactor: data migration modal logic in DataSettings

Moved showProgressModal and startMigration functions inside the useEffect hook and added t as a dependency. This improves encapsulation and ensures translation updates are handled correctly.

* remove trailing whitespace in DataSettings.tsx

Cleaned up a line by removing unnecessary trailing whitespace in the DataSettings component.
---
 .../settings/DataSettings/DataSettings.tsx    | 256 +++++++++---------
 1 file changed, 128 insertions(+), 128 deletions(-)

diff --git a/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx b/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
index 94030bfbab..93a138f847 100644
--- a/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
@@ -372,6 +372,134 @@ const DataSettings: FC = () => {
       const className = 'migration-modal'
       const messageKey = 'data-migration'
 
+      // 显示进度模态框
+      const showProgressModal = (title: React.ReactNode, className: string, PathsContent: React.FC) => {
+        let currentProgress = 0
+        let progressInterval: NodeJS.Timeout | null = null
+
+        // 创建进度更新模态框
+        const loadingModal = window.modal.info({
+          title,
+          className,
+          width: 'min(600px, 90vw)',
+          style: { minHeight: '400px' },
+          icon: <LoadingOutlined style={{ fontSize: 18 }} />,
+          content: (
+            <MigrationModalContent>
+              <PathsContent />
+              <MigrationNotice>
+                <p>{t('settings.data.app_data.copying')}</p>
+                <div style={{ marginTop: '12px' }}>
+                  <Progress percent={currentProgress} status="active" strokeWidth={8} />
+                </div>
+                <p style={{ color: 'var(--color-warning)', marginTop: '12px', fontSize: '13px' }}>
+                  {t('settings.data.app_data.copying_warning')}
+                </p>
+              </MigrationNotice>
+            </MigrationModalContent>
+          ),
+          centered: true,
+          closable: false,
+          maskClosable: false,
+          okButtonProps: { style: { display: 'none' } }
+        })
+
+        // 更新进度的函数
+        const updateProgress = (progress: number, status: 'active' | 'success' = 'active') => {
+          loadingModal.update({
+            title,
+            content: (
+              <MigrationModalContent>
+                <PathsContent />
+                <MigrationNotice>
+                  <p>{t('settings.data.app_data.copying')}</p>
+                  <div style={{ marginTop: '12px' }}>
+                    <Progress percent={Math.round(progress)} status={status} strokeWidth={8} />
+                  </div>
+                  <p style={{ color: 'var(--color-warning)', marginTop: '12px', fontSize: '13px' }}>
+                    {t('settings.data.app_data.copying_warning')}
+                  </p>
+                </MigrationNotice>
+              </MigrationModalContent>
+            )
+          })
+        }
+
+        // 开始模拟进度更新
+        progressInterval = setInterval(() => {
+          if (currentProgress < 95) {
+            currentProgress += Math.random() * 5 + 1
+            if (currentProgress > 95) currentProgress = 95
+            updateProgress(currentProgress)
+          }
+        }, 500)
+
+        return { loadingModal, progressInterval, updateProgress }
+      }
+
+      // 开始迁移数据
+      const startMigration = async (
+        originalPath: string,
+        newPath: string,
+        progressInterval: NodeJS.Timeout | null,
+        updateProgress: (progress: number, status?: 'active' | 'success') => void,
+        loadingModal: { destroy: () => void },
+        messageKey: string
+      ): Promise<void> => {
+        // flush app data
+        await window.api.flushAppData()
+
+        // wait 2 seconds to flush app data
+        await new Promise((resolve) => setTimeout(resolve, 2000))
+
+        // 开始复制过程
+        const copyResult = await window.api.copy(
+          originalPath,
+          newPath,
+          occupiedDirs.map((dir) => originalPath + '/' + dir)
+        )
+
+        // 停止进度更新
+        if (progressInterval) {
+          clearInterval(progressInterval)
+        }
+
+        // 显示100%完成
+        updateProgress(100, 'success')
+
+        if (!copyResult.success) {
+          // 延迟关闭加载模态框
+          await new Promise<void>((resolve) => {
+            setTimeout(() => {
+              loadingModal.destroy()
+              window.message.error({
+                content: t('settings.data.app_data.copy_failed') + ': ' + copyResult.error,
+                key: messageKey,
+                duration: 5
+              })
+              resolve()
+            }, 500)
+          })
+
+          throw new Error(copyResult.error || 'Unknown error during copy')
+        }
+
+        // 在复制成功后设置新的AppDataPath
+        await window.api.setAppDataPath(newPath)
+
+        // 短暂延迟以显示100%完成
+        await new Promise((resolve) => setTimeout(resolve, 500))
+
+        // 关闭加载模态框
+        loadingModal.destroy()
+
+        window.message.success({
+          content: t('settings.data.app_data.copy_success'),
+          key: messageKey,
+          duration: 2
+        })
+      }
+
       // Create PathsContent component for this specific migration
       const PathsContent = () => (
         <div>
@@ -420,134 +548,6 @@ const DataSettings: FC = () => {
     handleDataMigration()
   }, [])
 
-  // 显示进度模态框
-  const showProgressModal = (title: React.ReactNode, className: string, PathsContent: React.FC) => {
-    let currentProgress = 0
-    let progressInterval: NodeJS.Timeout | null = null
-
-    // 创建进度更新模态框
-    const loadingModal = window.modal.info({
-      title,
-      className,
-      width: 'min(600px, 90vw)',
-      style: { minHeight: '400px' },
-      icon: <LoadingOutlined style={{ fontSize: 18 }} />,
-      content: (
-        <MigrationModalContent>
-          <PathsContent />
-          <MigrationNotice>
-            <p>{t('settings.data.app_data.copying')}</p>
-            <div style={{ marginTop: '12px' }}>
-              <Progress percent={currentProgress} status="active" strokeWidth={8} />
-            </div>
-            <p style={{ color: 'var(--color-warning)', marginTop: '12px', fontSize: '13px' }}>
-              {t('settings.data.app_data.copying_warning')}
-            </p>
-          </MigrationNotice>
-        </MigrationModalContent>
-      ),
-      centered: true,
-      closable: false,
-      maskClosable: false,
-      okButtonProps: { style: { display: 'none' } }
-    })
-
-    // 更新进度的函数
-    const updateProgress = (progress: number, status: 'active' | 'success' = 'active') => {
-      loadingModal.update({
-        title,
-        content: (
-          <MigrationModalContent>
-            <PathsContent />
-            <MigrationNotice>
-              <p>{t('settings.data.app_data.copying')}</p>
-              <div style={{ marginTop: '12px' }}>
-                <Progress percent={Math.round(progress)} status={status} strokeWidth={8} />
-              </div>
-              <p style={{ color: 'var(--color-warning)', marginTop: '12px', fontSize: '13px' }}>
-                {t('settings.data.app_data.copying_warning')}
-              </p>
-            </MigrationNotice>
-          </MigrationModalContent>
-        )
-      })
-    }
-
-    // 开始模拟进度更新
-    progressInterval = setInterval(() => {
-      if (currentProgress < 95) {
-        currentProgress += Math.random() * 5 + 1
-        if (currentProgress > 95) currentProgress = 95
-        updateProgress(currentProgress)
-      }
-    }, 500)
-
-    return { loadingModal, progressInterval, updateProgress }
-  }
-
-  // 开始迁移数据
-  const startMigration = async (
-    originalPath: string,
-    newPath: string,
-    progressInterval: NodeJS.Timeout | null,
-    updateProgress: (progress: number, status?: 'active' | 'success') => void,
-    loadingModal: { destroy: () => void },
-    messageKey: string
-  ): Promise<void> => {
-    // flush app data
-    await window.api.flushAppData()
-
-    // wait 2 seconds to flush app data
-    await new Promise((resolve) => setTimeout(resolve, 2000))
-
-    // 开始复制过程
-    const copyResult = await window.api.copy(
-      originalPath,
-      newPath,
-      occupiedDirs.map((dir) => originalPath + '/' + dir)
-    )
-
-    // 停止进度更新
-    if (progressInterval) {
-      clearInterval(progressInterval)
-    }
-
-    // 显示100%完成
-    updateProgress(100, 'success')
-
-    if (!copyResult.success) {
-      // 延迟关闭加载模态框
-      await new Promise<void>((resolve) => {
-        setTimeout(() => {
-          loadingModal.destroy()
-          window.message.error({
-            content: t('settings.data.app_data.copy_failed') + ': ' + copyResult.error,
-            key: messageKey,
-            duration: 5
-          })
-          resolve()
-        }, 500)
-      })
-
-      throw new Error(copyResult.error || 'Unknown error during copy')
-    }
-
-    // 在复制成功后设置新的AppDataPath
-    await window.api.setAppDataPath(newPath)
-
-    // 短暂延迟以显示100%完成
-    await new Promise((resolve) => setTimeout(resolve, 500))
-
-    // 关闭加载模态框
-    loadingModal.destroy()
-
-    window.message.success({
-      content: t('settings.data.app_data.copy_success'),
-      key: messageKey,
-      duration: 2
-    })
-  }
-
   const onSkipBackupFilesChange = (value: boolean) => {
     setSkipBackupFile(value)
     dispatch(_setSkipBackupFile(value))

From 5138f5b314c0da6d4c1625e2946b2eeab0dcf897 Mon Sep 17 00:00:00 2001
From: one <wangan.cs@gmail.com>
Date: Wed, 25 Jun 2025 21:10:15 +0800
Subject: [PATCH 32/75] fix: clear search cache on resending (#7510)

---
 src/renderer/src/store/thunk/messageThunk.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/renderer/src/store/thunk/messageThunk.ts b/src/renderer/src/store/thunk/messageThunk.ts
index afab876195..f329af0c7d 100644
--- a/src/renderer/src/store/thunk/messageThunk.ts
+++ b/src/renderer/src/store/thunk/messageThunk.ts
@@ -1051,10 +1051,19 @@ export const resendMessageThunk =
         (m) => m.askId === userMessageToResend.id && m.role === 'assistant'
       )
 
+      // Clear cached search results for the user message being resent
+      // This ensures that the regenerated responses will not use stale search results
+      try {
+        window.keyv.remove(`web-search-${userMessageToResend.id}`)
+        window.keyv.remove(`knowledge-search-${userMessageToResend.id}`)
+      } catch (error) {
+        console.warn(`Failed to clear keyv cache for message ${userMessageToResend.id}:`, error)
+      }
+
       const resetDataList: Message[] = []
 
       if (assistantMessagesToReset.length === 0) {
-        // 没有用户消息,就创建一个或多个
+        // 没有相关的助手消息就创建一个或多个
 
         if (userMessageToResend?.mentions?.length) {
           console.log('userMessageToResend.mentions', userMessageToResend.mentions)

From 066aad7fedfad3347174ca1471388b4ab27ca39f Mon Sep 17 00:00:00 2001
From: Wang Jiyuan <59059173+EurFelux@users.noreply.github.com>
Date: Wed, 25 Jun 2025 21:15:05 +0800
Subject: [PATCH 33/75] fix: Resolve vllm bad request caused by always sending
 dimensions in embedding requests (#7525)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix(知识库): 将dimensions字段改为可选并修复相关逻辑
---
 .../src/pages/knowledge/components/AddKnowledgePopup.tsx      | 4 ++--
 src/renderer/src/types/index.ts                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/pages/knowledge/components/AddKnowledgePopup.tsx b/src/renderer/src/pages/knowledge/components/AddKnowledgePopup.tsx
index 528f64f41a..5ce1801243 100644
--- a/src/renderer/src/pages/knowledge/components/AddKnowledgePopup.tsx
+++ b/src/renderer/src/pages/knowledge/components/AddKnowledgePopup.tsx
@@ -112,7 +112,7 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
           return
         }
 
-        if (autoDims || typeof values.dimensions === 'undefined') {
+        if (autoDims || values.dimensions === undefined) {
           try {
             const aiProvider = new AiProvider(provider)
             values.dimensions = await aiProvider.getEmbeddingDimensions(selectedEmbeddingModel)
@@ -132,7 +132,7 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
           name: values.name,
           model: selectedEmbeddingModel,
           rerankModel: selectedRerankModel,
-          dimensions: values.dimensions,
+          dimensions: autoDims ? undefined : values.dimensions,
           documentCount: values.documentCount || DEFAULT_KNOWLEDGE_DOCUMENT_COUNT,
           items: [],
           created_at: Date.now(),
diff --git a/src/renderer/src/types/index.ts b/src/renderer/src/types/index.ts
index beb93bdf44..340119fa31 100644
--- a/src/renderer/src/types/index.ts
+++ b/src/renderer/src/types/index.ts
@@ -423,7 +423,7 @@ export interface KnowledgeBase {
   id: string
   name: string
   model: Model
-  dimensions: number
+  dimensions?: number
   description?: string
   items: KnowledgeItem[]
   created_at: number

From 17a8f0a724f8016287a112af984b04078196a922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=A4=A9=E5=AF=92?= <silenceboychen@gmail.com>
Date: Wed, 25 Jun 2025 21:37:10 +0800
Subject: [PATCH 34/75] feat: Support custom registry address when configuring
 mcp for npm & fix lint error (#7531)

* feat: Support custom registry address when configuring mcp for npm

* fix: lint
---
 src/renderer/src/i18n/locales/en-us.json      |  1 +
 src/renderer/src/i18n/locales/ja-jp.json      |  1 +
 src/renderer/src/i18n/locales/ru-ru.json      |  1 +
 src/renderer/src/i18n/locales/zh-cn.json      |  1 +
 src/renderer/src/i18n/locales/zh-tw.json      |  1 +
 .../settings/MCPSettings/McpSettings.tsx      | 56 ++++++++++++++++++-
 6 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index 7e6d40826b..303899f2e8 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -1519,6 +1519,7 @@
         "registry": "Package Registry",
         "registryTooltip": "Choose the registry for package installation to resolve network issues with the default registry.",
         "registryDefault": "Default",
+        "customRegistryPlaceholder": "Enter private registry URL, e.g.: https://npm.company.com",
         "not_support": "Model not supported",
         "user": "User",
         "system": "System",
diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json
index 4e2c5b0646..bd20c61ead 100644
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@@ -1513,6 +1513,7 @@
         "registry": "パッケージ管理レジストリ",
         "registryTooltip": "デフォルトのレジストリでネットワークの問題が発生した場合、パッケージインストールに使用するレジストリを選択してください。",
         "registryDefault": "デフォルト",
+        "customRegistryPlaceholder": "プライベート倉庫のアドレスを入力してください（例：https://npm.company.com）",
         "not_support": "モデルはサポートされていません",
         "user": "ユーザー",
         "system": "システム",
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index 8f52666854..fcd5487b92 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -1513,6 +1513,7 @@
         "registry": "Реестр пакетов",
         "registryTooltip": "Выберите реестр для установки пакетов, если возникают проблемы с сетью при использовании реестра по умолчанию.",
         "registryDefault": "По умолчанию",
+        "customRegistryPlaceholder": "Введите адрес частного склада, например: https://npm.company.com",
         "not_support": "Модель не поддерживается",
         "user": "Пользователь",
         "system": "Система",
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index 9a2ad2597c..9bc4201f71 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -1519,6 +1519,7 @@
         "registry": "包管理源",
         "registryTooltip": "选择用于安装包的源，以解决默认源的网络问题",
         "registryDefault": "默认",
+        "customRegistryPlaceholder": "请输入私有仓库地址，如: https://npm.company.com",
         "not_support": "模型不支持",
         "user": "用户",
         "system": "系统",
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index 64ef5bac85..e99c57e170 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -1516,6 +1516,7 @@
         "registry": "套件管理源",
         "registryTooltip": "選擇用於安裝套件的源，以解決預設源的網路問題",
         "registryDefault": "預設",
+        "customRegistryPlaceholder": "請輸入私有倉庫位址，如: https://npm.company.com",
         "not_support": "不支援此模型",
         "user": "用戶",
         "system": "系統",
diff --git a/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx b/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx
index c20df064d3..3dc423b202 100644
--- a/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx
@@ -41,7 +41,10 @@ interface Registry {
   url: string
 }
 
-const NpmRegistry: Registry[] = [{ name: '淘宝 NPM Mirror', url: 'https://registry.npmmirror.com' }]
+const NpmRegistry: Registry[] = [
+  { name: '淘宝 NPM Mirror', url: 'https://registry.npmmirror.com' },
+  { name: '自定义', url: 'custom' }
+]
 const PipRegistry: Registry[] = [
   { name: '清华大学', url: 'https://pypi.tuna.tsinghua.edu.cn/simple' },
   { name: '阿里云', url: 'http://mirrors.aliyun.com/pypi/simple/' },
@@ -86,6 +89,8 @@ const McpSettings: React.FC = () => {
   const [resources, setResources] = useState<MCPResource[]>([])
   const [isShowRegistry, setIsShowRegistry] = useState(false)
   const [registry, setRegistry] = useState<Registry[]>()
+  const [customRegistryUrl, setCustomRegistryUrl] = useState('')
+  const [selectedRegistryType, setSelectedRegistryType] = useState<string>('')
 
   const [showAdvanced, setShowAdvanced] = useState(false)
 
@@ -107,15 +112,34 @@ const McpSettings: React.FC = () => {
         setIsShowRegistry(true)
 
         // Determine registry type based on command
+        let currentRegistry: Registry[] = []
         if (server.command.includes('uv') || server.command.includes('uvx')) {
+          currentRegistry = PipRegistry
           setRegistry(PipRegistry)
         } else if (
           server.command.includes('npx') ||
           server.command.includes('bun') ||
           server.command.includes('bunx')
         ) {
+          currentRegistry = NpmRegistry
           setRegistry(NpmRegistry)
         }
+
+        // Check if the registryUrl is a custom URL (not in the predefined list)
+        const isCustomRegistry =
+          currentRegistry.length > 0 &&
+          !currentRegistry.some((reg) => reg.url === server.registryUrl) &&
+          server.registryUrl !== '' // empty string is default
+
+        if (isCustomRegistry) {
+          // Set custom registry state
+          setSelectedRegistryType('custom')
+          setCustomRegistryUrl(server.registryUrl)
+        } else {
+          // Reset custom registry state for predefined registries
+          setSelectedRegistryType('')
+          setCustomRegistryUrl('')
+        }
       }
     }
 
@@ -294,6 +318,16 @@ const McpSettings: React.FC = () => {
   const onSelectRegistry = (url: string) => {
     const command = form.getFieldValue('command') || ''
 
+    // If custom registry is selected
+    if (url === 'custom') {
+      setSelectedRegistryType('custom')
+      // Don't set the registryUrl yet, wait for user input
+      return
+    }
+
+    setSelectedRegistryType('')
+    setCustomRegistryUrl('')
+
     // Add new registry env variables
     if (command.includes('uv') || command.includes('uvx')) {
       // envs['PIP_INDEX_URL'] = url
@@ -308,6 +342,12 @@ const McpSettings: React.FC = () => {
     setIsFormChanged(true)
   }
 
+  const onCustomRegistryChange = (url: string) => {
+    setCustomRegistryUrl(url)
+    form.setFieldsValue({ registryUrl: url })
+    setIsFormChanged(true)
+  }
+
   const onDeleteMcpServer = useCallback(
     async (server: MCPServer) => {
       try {
@@ -484,7 +524,8 @@ const McpSettings: React.FC = () => {
                   name="registryUrl"
                   label={t('settings.mcp.registry')}
                   tooltip={t('settings.mcp.registryTooltip')}>
-                  <Radio.Group>
+                  <Radio.Group
+                    value={selectedRegistryType === 'custom' ? 'custom' : form.getFieldValue('registryUrl') || ''}>
                     <Radio
                       key="no-proxy"
                       value=""
@@ -504,6 +545,17 @@ const McpSettings: React.FC = () => {
                       </Radio>
                     ))}
                   </Radio.Group>
+                  {selectedRegistryType === 'custom' && (
+                    <Input
+                      placeholder={t(
+                        'settings.mcp.customRegistryPlaceholder',
+                        '请输入私有仓库地址，如: https://npm.company.com'
+                      )}
+                      value={customRegistryUrl}
+                      onChange={(e) => onCustomRegistryChange(e.target.value)}
+                      style={{ marginTop: 8 }}
+                    />
+                  )}
                 </Form.Item>
               )}
 

From 9362304db0a2d239f04e2b97dda8ff755cfd3cfb Mon Sep 17 00:00:00 2001
From: SuYao <sy20010504@gmail.com>
Date: Wed, 25 Jun 2025 22:16:27 +0800
Subject: [PATCH 35/75] refactor(GeminiAPIClient): separate model and user
 message handling to adapt vertex (#7511)

- Introduced a new modelParts array to manage model-related messages separately from user messages.
- Updated the logic to push model messages to currentReqMessages only if they exist, improving clarity and structure.
- Adjusted the return order of messages in buildSdkMessages to ensure history is appended correctly.
- Enhanced McpToolChunkMiddleware to reset tool processing state output when output is present.
---
 .../aiCore/clients/gemini/GeminiAPIClient.ts  | 27 ++++++++++++++-----
 .../middleware/core/McpToolChunkMiddleware.ts |  4 +++
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/renderer/src/aiCore/clients/gemini/GeminiAPIClient.ts b/src/renderer/src/aiCore/clients/gemini/GeminiAPIClient.ts
index 8cb46143b2..549e931966 100644
--- a/src/renderer/src/aiCore/clients/gemini/GeminiAPIClient.ts
+++ b/src/renderer/src/aiCore/clients/gemini/GeminiAPIClient.ts
@@ -686,16 +686,19 @@ export class GeminiAPIClient extends BaseApiClient<
     toolCalls: FunctionCall[]
   ): Content[] {
     const parts: Part[] = []
+    const modelParts: Part[] = []
     if (output) {
-      parts.push({
+      modelParts.push({
         text: output
       })
     }
+
     toolCalls.forEach((toolCall) => {
-      parts.push({
+      modelParts.push({
         functionCall: toolCall
       })
     })
+
     parts.push(
       ...toolResults
         .map((ts) => ts.parts)
@@ -703,10 +706,22 @@ export class GeminiAPIClient extends BaseApiClient<
         .filter((p) => p !== undefined)
     )
 
-    const lastMessage = currentReqMessages[currentReqMessages.length - 1]
-    if (lastMessage) {
-      lastMessage.parts?.push(...parts)
+    const userMessage: Content = {
+      role: 'user',
+      parts: []
     }
+
+    if (modelParts.length > 0) {
+      currentReqMessages.push({
+        role: 'model',
+        parts: modelParts
+      })
+    }
+    if (parts.length > 0) {
+      userMessage.parts?.push(...parts)
+      currentReqMessages.push(userMessage)
+    }
+
     return currentReqMessages
   }
 
@@ -747,7 +762,7 @@ export class GeminiAPIClient extends BaseApiClient<
         }
       })
     }
-    return [messageParam, ...(sdkPayload.history || [])]
+    return [...(sdkPayload.history || []), messageParam]
   }
 
   private async uploadFile(file: FileType): Promise<File> {
diff --git a/src/renderer/src/aiCore/middleware/core/McpToolChunkMiddleware.ts b/src/renderer/src/aiCore/middleware/core/McpToolChunkMiddleware.ts
index fa0cc2cf61..893018d4c5 100644
--- a/src/renderer/src/aiCore/middleware/core/McpToolChunkMiddleware.ts
+++ b/src/renderer/src/aiCore/middleware/core/McpToolChunkMiddleware.ts
@@ -255,6 +255,10 @@ function buildParamsWithToolResults(
   // 从回复中构建助手消息
   const newReqMessages = apiClient.buildSdkMessages(currentReqMessages, output, toolResults, toolCalls)
 
+  if (output && ctx._internal.toolProcessingState) {
+    ctx._internal.toolProcessingState.output = undefined
+  }
+
   // 估算新增消息的 token 消耗并累加到 usage 中
   if (ctx._internal.observer?.usage && newReqMessages.length > currentReqMessages.length) {
     try {

From 3d535d0e681966a6f02a8b9f068519426831e4c0 Mon Sep 17 00:00:00 2001
From: fullex <0xfullex@gmail.com>
Date: Wed, 25 Jun 2025 21:52:27 +0800
Subject: [PATCH 36/75] feat: enhance WindowFooter with show/hide functionality
 for UI elements

- Added state management to control visibility of UI elements in the WindowFooter.
- Implemented a timer to automatically hide elements after a period of inactivity.
- Updated hotkey handlers to reset the visibility timer on user interaction.
- Modified styled component to reflect the new visibility logic.
---
 .../action/components/WindowFooter.tsx        | 42 +++++++++++++++++--
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/renderer/src/windows/selection/action/components/WindowFooter.tsx b/src/renderer/src/windows/selection/action/components/WindowFooter.tsx
index 78e2979786..4843196b41 100644
--- a/src/renderer/src/windows/selection/action/components/WindowFooter.tsx
+++ b/src/renderer/src/windows/selection/action/components/WindowFooter.tsx
@@ -1,6 +1,6 @@
 import { LoadingOutlined } from '@ant-design/icons'
 import { CircleX, Copy, Pause, RefreshCw } from 'lucide-react'
-import { FC, useEffect, useState } from 'react'
+import { FC, useEffect, useRef, useState } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
@@ -24,6 +24,8 @@ const WindowFooter: FC<FooterProps> = ({
   const [isEscHovered, setIsEscHovered] = useState(false)
   const [isRegenerateHovered, setIsRegenerateHovered] = useState(false)
   const [isContainerHovered, setIsContainerHovered] = useState(false)
+  const [isShowMe, setIsShowMe] = useState(true)
+  const hideTimerRef = useRef<NodeJS.Timeout | null>(null)
 
   useEffect(() => {
     window.addEventListener('focus', handleWindowFocus)
@@ -32,18 +34,49 @@ const WindowFooter: FC<FooterProps> = ({
     return () => {
       window.removeEventListener('focus', handleWindowFocus)
       window.removeEventListener('blur', handleWindowBlur)
+      if (hideTimerRef.current) {
+        clearTimeout(hideTimerRef.current)
+      }
     }
   }, [])
 
+  useEffect(() => {
+    hideTimerRef.current = setTimeout(() => {
+      setIsShowMe(false)
+      hideTimerRef.current = null
+    }, 3000)
+
+    return () => {
+      if (hideTimerRef.current) {
+        clearTimeout(hideTimerRef.current)
+      }
+    }
+  }, [])
+
+  const showMePeriod = () => {
+    if (hideTimerRef.current) {
+      clearTimeout(hideTimerRef.current)
+    }
+
+    setIsShowMe(true)
+    hideTimerRef.current = setTimeout(() => {
+      setIsShowMe(false)
+      hideTimerRef.current = null
+    }, 2000)
+  }
+
   useHotkeys('c', () => {
+    showMePeriod()
     handleCopy()
   })
 
   useHotkeys('r', () => {
+    showMePeriod()
     handleRegenerate()
   })
 
   useHotkeys('esc', () => {
+    showMePeriod()
     handleEsc()
   })
 
@@ -107,7 +140,8 @@ const WindowFooter: FC<FooterProps> = ({
     <Container
       onMouseEnter={() => setIsContainerHovered(true)}
       onMouseLeave={() => setIsContainerHovered(false)}
-      $isHovered={isContainerHovered}>
+      $isHovered={isContainerHovered}
+      $showInitially={isShowMe}>
       <OpButtonWrapper>
         <OpButton onClick={handleEsc} $isWindowFocus={isWindowFocus} data-hovered={isEscHovered}>
           {loading ? (
@@ -144,7 +178,7 @@ const WindowFooter: FC<FooterProps> = ({
   )
 }
 
-const Container = styled.div<{ $isHovered: boolean }>`
+const Container = styled.div<{ $isHovered: boolean; $showInitially: boolean }>`
   position: absolute;
   bottom: 0;
   left: 50%;
@@ -160,7 +194,7 @@ const Container = styled.div<{ $isHovered: boolean }>`
   height: 32px;
   backdrop-filter: blur(8px);
   border-radius: 8px;
-  opacity: 0;
+  opacity: ${(props) => (props.$showInitially ? 1 : 0)};
   transition: all 0.3s ease;
 
   &:hover {

From 5f2d0d4bfc55c29edbbe5b50364a421c252e800e Mon Sep 17 00:00:00 2001
From: fullex <106392080+0xfullex@users.noreply.github.com>
Date: Thu, 26 Jun 2025 01:16:17 +0800
Subject: [PATCH 37/75] fix(SelectionAssistant): opacity slider too slow when
 sliding in settings page (#7537)

feat: enhance opacity control in Selection Assistant Settings

- Added state management for opacity value in SelectionAssistantSettings component.
- Updated Slider component to use the new opacity state instead of the previous actionWindowOpacity variable.
- Ensured onChangeComplete updates the actionWindowOpacity accordingly.
---
 .../SelectionAssistantSettings.tsx                        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/pages/settings/SelectionAssistantSettings/SelectionAssistantSettings.tsx b/src/renderer/src/pages/settings/SelectionAssistantSettings/SelectionAssistantSettings.tsx
index c10ecd617b..0bbebf57e9 100644
--- a/src/renderer/src/pages/settings/SelectionAssistantSettings/SelectionAssistantSettings.tsx
+++ b/src/renderer/src/pages/settings/SelectionAssistantSettings/SelectionAssistantSettings.tsx
@@ -50,6 +50,7 @@ const SelectionAssistantSettings: FC = () => {
     setFilterList
   } = useSelectionAssistant()
   const [isFilterListModalOpen, setIsFilterListModalOpen] = useState(false)
+  const [opacityValue, setOpacityValue] = useState(actionWindowOpacity)
 
   // force disable selection assistant on non-windows systems
   useEffect(() => {
@@ -195,14 +196,15 @@ const SelectionAssistantSettings: FC = () => {
                 <SettingRowTitle>{t('selection.settings.window.opacity.title')}</SettingRowTitle>
                 <SettingDescription>{t('selection.settings.window.opacity.description')}</SettingDescription>
               </SettingLabel>
-              <div style={{ marginRight: '16px' }}>{actionWindowOpacity}%</div>
+              <div style={{ marginRight: '16px' }}>{opacityValue}%</div>
               <Slider
                 style={{ width: 100 }}
                 min={20}
                 max={100}
                 reverse
-                value={actionWindowOpacity}
-                onChange={setActionWindowOpacity}
+                value={opacityValue}
+                onChange={setOpacityValue}
+                onChangeComplete={setActionWindowOpacity}
                 tooltip={{ open: false }}
               />
             </SettingRow>

From 751879d42e011963a72a6dfac4233721de50fab3 Mon Sep 17 00:00:00 2001
From: suyao <sy20010504@gmail.com>
Date: Thu, 26 Jun 2025 00:52:48 +0800
Subject: [PATCH 38/75] feat(AihubmixAPIClient): add getBaseURL method to
 handle client base URL retrieval

---
 src/renderer/src/aiCore/clients/AihubmixAPIClient.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/renderer/src/aiCore/clients/AihubmixAPIClient.ts b/src/renderer/src/aiCore/clients/AihubmixAPIClient.ts
index 541c083e8c..d940abdfe7 100644
--- a/src/renderer/src/aiCore/clients/AihubmixAPIClient.ts
+++ b/src/renderer/src/aiCore/clients/AihubmixAPIClient.ts
@@ -66,6 +66,13 @@ export class AihubmixAPIClient extends BaseApiClient {
     this.currentClient = this.defaultClient as BaseApiClient
   }
 
+  override getBaseURL(): string {
+    if (!this.currentClient) {
+      return this.provider.apiHost
+    }
+    return this.currentClient.getBaseURL()
+  }
+
   /**
    * 类型守卫：确保client是BaseApiClient的实例
    */

From 1f09c8a022a19dee174e92d9f302ec05e27d3ebf Mon Sep 17 00:00:00 2001
From: fullex <106392080+0xfullex@users.noreply.github.com>
Date: Thu, 26 Jun 2025 10:17:09 +0800
Subject: [PATCH 39/75] refactor(SelectionAssistant): make all Toolbar CSS
 variables customizable (#7532)

refactor: update selection toolbar styles and structure

- Enhanced the selection toolbar's HTML structure for better readability.
- Updated CSS variables for improved theming and consistency across the toolbar.
- Refactored the styled components in SelectionToolbar.tsx to utilize new CSS variables for layout and styling.
- Added support for hover states and improved button styling for better user experience.
---
 src/renderer/selectionToolbar.html            | 61 ++++++++---------
 .../src/assets/styles/selection-toolbar.scss  | 59 +++++++++++++----
 .../selection/toolbar/SelectionToolbar.tsx    | 65 +++++++++----------
 3 files changed, 110 insertions(+), 75 deletions(-)

diff --git a/src/renderer/selectionToolbar.html b/src/renderer/selectionToolbar.html
index 1a219f6472..34efa7effc 100644
--- a/src/renderer/selectionToolbar.html
+++ b/src/renderer/selectionToolbar.html
@@ -2,42 +2,45 @@
 <html lang="zh-CN">
 
 <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="initial-scale=1, width=device-width" />
-    <meta http-equiv="Content-Security-Policy"
-        content="default-src 'self'; connect-src blob: *; script-src 'self' 'unsafe-eval' *; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' *; font-src 'self' data: *; img-src 'self' data: file: * blob:; frame-src * file:" />
-    <title>Cherry Studio Selection Toolbar</title>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="initial-scale=1, width=device-width" />
+  <meta http-equiv="Content-Security-Policy"
+    content="default-src 'self'; connect-src blob: *; script-src 'self' 'unsafe-eval' *; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' *; font-src 'self' data: *; img-src 'self' data: file: * blob:; frame-src * file:" />
+  <title>Cherry Studio Selection Toolbar</title>
 
 </head>
 
 <body>
-    <div id="root"></div>
-    <script type="module" src="/src/windows/selection/toolbar/entryPoint.tsx"></script>
-    <style>
-        html {
-            margin: 0;
-        }
+  <div id="root"></div>
+  <script type="module" src="/src/windows/selection/toolbar/entryPoint.tsx"></script>
+  <style>
+    html {
+      margin: 0 !important;
+      background-color: transparent !important;
+      background-image: none !important;
 
-        body {
-            margin: 0;
-            padding: 0;
-            overflow: hidden;
-            width: 100vw;
-            height: 100vh;
+    }
 
-            -webkit-user-select: none;
-            -moz-user-select: none;
-            -ms-user-select: none;
-            user-select: none;
-        }
+    body {
+      margin: 0 !important;
+      padding: 0 !important;
+      overflow: hidden !important;
+      width: 100vw !important;
+      height: 100vh !important;
 
-        #root {
-            margin: 0;
-            padding: 0;
-            width: max-content !important;
-            height: fit-content !important;
-        }
-    </style>
+      -webkit-user-select: none;
+      -moz-user-select: none;
+      -ms-user-select: none;
+      user-select: none;
+    }
+
+    #root {
+      margin: 0 !important;
+      padding: 0 !important;
+      width: max-content !important;
+      height: fit-content !important;
+    }
+  </style>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/src/renderer/src/assets/styles/selection-toolbar.scss b/src/renderer/src/assets/styles/selection-toolbar.scss
index dfbb6bbd59..bfe329c696 100644
--- a/src/renderer/src/assets/styles/selection-toolbar.scss
+++ b/src/renderer/src/assets/styles/selection-toolbar.scss
@@ -5,22 +5,57 @@ html {
 }
 
 :root {
-  --color-selection-toolbar-background: rgba(20, 20, 20, 0.95);
-  --color-selection-toolbar-border: rgba(55, 55, 55, 0.5);
-  --color-selection-toolbar-shadow: rgba(50, 50, 50, 0.3);
-
-  --color-selection-toolbar-text: rgba(255, 255, 245, 0.9);
-  --color-selection-toolbar-hover-bg: #222222;
-
+  // Basic Colors
   --color-primary: #00b96b;
   --color-error: #f44336;
+
+  --selection-toolbar-color-primary: var(--color-primary);
+  --selection-toolbar-color-error: var(--color-error);
+
+  // Toolbar
+  --selection-toolbar-height: 36px; // default: 36px   max: 42px
+  --selection-toolbar-font-size: 14px; // default: 14px
+
+  --selection-toolbar-logo-display: flex; // values: flex | none
+  --selection-toolbar-logo-size: 22px; // default: 22px
+  --selection-toolbar-logo-margin: 0 0 0 5px; // default: 0 0 05px
+
+  // DO NOT MODIFY THESE VALUES, IF YOU DON'T KNOW WHAT YOU ARE DOING
+  --selection-toolbar-padding: 2px 4px 2px 2px; // default: 2px 4px 2px 2px
+  --selection-toolbar-margin: 2px 3px 5px 3px; // default: 2px 3px 5px 3px
+  // ------------------------------------------------------------
+
+  --selection-toolbar-border-radius: 6px;
+  --selection-toolbar-border: 1px solid rgba(55, 55, 55, 0.5);
+  --selection-toolbar-box-shadow: 0px 2px 3px rgba(50, 50, 50, 0.3);
+  --selection-toolbar-background: rgba(20, 20, 20, 0.95);
+
+  // Buttons
+
+  --selection-toolbar-button-icon-size: 16px; // default: 16px
+  --selection-toolbar-button-text-margin: 0 0 0 3px; // default: 0 0 0 3px
+  --selection-toolbar-button-margin: 0 2px; // default: 0 2px
+  --selection-toolbar-button-padding: 4px 6px; // default: 4px 6px
+  --selection-toolbar-button-border-radius: 4px; // default: 4px
+  --selection-toolbar-button-border: none; // default: none
+  --selection-toolbar-button-box-shadow: none; // default: none
+
+  --selection-toolbar-button-text-color: rgba(255, 255, 245, 0.9);
+  --selection-toolbar-button-icon-color: var(--selection-toolbar-button-text-color);
+  --selection-toolbar-button-text-color-hover: var(--selection-toolbar-color-primary);
+  --selection-toolbar-button-icon-color-hover: var(--selection-toolbar-color-primary);
+  --selection-toolbar-button-bgcolor: transparent; // default: transparent
+  --selection-toolbar-button-bgcolor-hover: #222222;
 }
 
 [theme-mode='light'] {
-  --color-selection-toolbar-background: rgba(245, 245, 245, 0.95);
-  --color-selection-toolbar-border: rgba(200, 200, 200, 0.5);
-  --color-selection-toolbar-shadow: rgba(50, 50, 50, 0.3);
+  --selection-toolbar-border: 1px solid rgba(200, 200, 200, 0.5);
+  --selection-toolbar-box-shadow: 0px 2px 3px rgba(50, 50, 50, 0.3);
+  --selection-toolbar-background: rgba(245, 245, 245, 0.95);
 
-  --color-selection-toolbar-text: rgba(0, 0, 0, 1);
-  --color-selection-toolbar-hover-bg: rgba(0, 0, 0, 0.04);
+  --selection-toolbar-button-text-color: rgba(0, 0, 0, 1);
+  --selection-toolbar-button-icon-color: var(--selection-toolbar-button-text-color);
+  --selection-toolbar-button-text-color-hover: var(--selection-toolbar-color-primary);
+  --selection-toolbar-button-icon-color-hover: var(--selection-toolbar-color-primary);
+  --selection-toolbar-button-bgcolor-hover: rgba(0, 0, 0, 0.04);
 }
diff --git a/src/renderer/src/windows/selection/toolbar/SelectionToolbar.tsx b/src/renderer/src/windows/selection/toolbar/SelectionToolbar.tsx
index 21c54a923f..af6a94372c 100644
--- a/src/renderer/src/windows/selection/toolbar/SelectionToolbar.tsx
+++ b/src/renderer/src/windows/selection/toolbar/SelectionToolbar.tsx
@@ -260,32 +260,29 @@ const Container = styled.div`
   display: inline-flex;
   flex-direction: row;
   align-items: center;
-  border-radius: 6px;
-  background-color: var(--color-selection-toolbar-background);
-  border-color: var(--color-selection-toolbar-border);
-  box-shadow: 0px 2px 3px var(--color-selection-toolbar-shadow);
-  padding: 2px;
-  margin: 2px 3px 5px 3px;
+  height: var(--selection-toolbar-height);
+  border-radius: var(--selection-toolbar-border-radius);
+  border: var(--selection-toolbar-border);
+  box-shadow: var(--selection-toolbar-box-shadow);
+  background: var(--selection-toolbar-background);
+  padding: var(--selection-toolbar-padding) !important;
+  margin: var(--selection-toolbar-margin) !important;
   user-select: none;
-  border-width: 1px;
-  border-style: solid;
-  height: 36px;
-  padding-right: 4px;
   box-sizing: border-box;
 `
 
 const LogoWrapper = styled.div<{ $draggable: boolean }>`
-  display: flex;
+  display: var(--selection-toolbar-logo-display);
   align-items: center;
   justify-content: center;
-  margin-left: 5px;
+  margin: var(--selection-toolbar-logo-margin);
   background-color: transparent;
   ${({ $draggable }) => $draggable && ' -webkit-app-region: drag;'}
 `
 
 const Logo = styled(Avatar)`
-  height: 22px;
-  width: 22px;
+  height: var(--selection-toolbar-logo-size);
+  width: var(--selection-toolbar-logo-size);
   &.animate {
     animation: rotate 1s ease;
   }
@@ -318,37 +315,37 @@ const ActionButton = styled.div`
   flex-direction: row;
   align-items: center;
   justify-content: center;
-  margin: 0 2px;
-  background-color: transparent;
-  cursor: pointer;
-  border-radius: 4px;
-  padding: 4px 6px;
+  cursor: pointer !important;
+  margin: var(--selection-toolbar-button-margin);
+  padding: var(--selection-toolbar-button-padding);
+  background-color: var(--selection-toolbar-button-bgcolor);
+  border-radius: var(--selection-toolbar-button-border-radius);
+  border: var(--selection-toolbar-button-border);
+  box-shadow: var(--selection-toolbar-button-box-shadow);
   transition: all 0.1s ease-in-out;
   will-change: color, background-color;
 
   .btn-icon {
-    width: 16px;
-    height: 16px;
-    color: var(--color-selection-toolbar-text);
+    width: var(--selection-toolbar-button-icon-size);
+    height: var(--selection-toolbar-button-icon-size);
+    color: var(--selection-toolbar-button-icon-color);
     background-color: transparent;
     transition: color 0.1s ease-in-out;
     will-change: color;
   }
   .btn-title {
-    color: var(--color-selection-toolbar-text);
-    --font-size: 14px;
+    color: var(--selection-toolbar-button-text-color);
     transition: color 0.1s ease-in-out;
     will-change: color;
   }
   &:hover {
-    color: var(--color-primary);
     .btn-icon {
-      color: var(--color-primary);
+      color: var(--selection-toolbar-button-icon-color-hover);
     }
     .btn-title {
-      color: var(--color-primary);
+      color: var(--selection-toolbar-button-text-color-hover);
     }
-    background-color: var(--color-selection-toolbar-hover-bg);
+    background-color: var(--selection-toolbar-button-bgcolor-hover);
   }
 `
 const ActionIcon = styled.div`
@@ -356,8 +353,8 @@ const ActionIcon = styled.div`
   align-items: center;
   justify-content: center;
   position: relative;
-  height: 16px;
-  width: 16px;
+  height: var(--selection-toolbar-button-icon-size);
+  width: var(--selection-toolbar-button-icon-size);
   background-color: transparent;
 
   .btn-icon {
@@ -372,11 +369,11 @@ const ActionIcon = styled.div`
   }
 
   .icon-fail {
-    color: var(--color-error);
+    color: var(--selection-toolbar-color-error);
   }
 
   .icon-success {
-    color: var(--color-primary);
+    color: var(--selection-toolbar-color-primary);
   }
 
   .icon-scale-in {
@@ -436,12 +433,12 @@ const ActionIcon = styled.div`
   }
 `
 const ActionTitle = styled.span`
-  font-size: 14px;
+  font-size: var(--selection-toolbar-font-size);
   max-width: 120px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  margin-left: 3px;
+  margin: var(--selection-toolbar-button-text-margin);
   background-color: transparent;
 `
 

From 5e0cae06db7c208e9ea9a2b1535b6b1a2bc5a839 Mon Sep 17 00:00:00 2001
From: one <wangan.cs@gmail.com>
Date: Thu, 26 Jun 2025 11:19:11 +0800
Subject: [PATCH 40/75] fix(CodeEditor): save to db (#7504)

---
 src/renderer/src/pages/home/Messages/Messages.tsx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/renderer/src/pages/home/Messages/Messages.tsx b/src/renderer/src/pages/home/Messages/Messages.tsx
index 1a7d46024c..999ddc05ec 100644
--- a/src/renderer/src/pages/home/Messages/Messages.tsx
+++ b/src/renderer/src/pages/home/Messages/Messages.tsx
@@ -17,9 +17,9 @@ import { estimateHistoryTokens } from '@renderer/services/TokenService'
 import store, { useAppDispatch } from '@renderer/store'
 import { messageBlocksSelectors, updateOneBlock } from '@renderer/store/messageBlock'
 import { newMessagesActions } from '@renderer/store/newMessage'
-import { saveMessageAndBlocksToDB } from '@renderer/store/thunk/messageThunk'
+import { saveMessageAndBlocksToDB, updateMessageAndBlocksThunk } from '@renderer/store/thunk/messageThunk'
 import type { Assistant, Topic } from '@renderer/types'
-import { type Message, MessageBlockType } from '@renderer/types/newMessage'
+import { type Message, MessageBlock, MessageBlockType } from '@renderer/types/newMessage'
 import {
   captureScrollableDivAsBlob,
   captureScrollableDivAsDataURL,
@@ -211,7 +211,15 @@ const Messages: React.FC<MessagesProps> = ({ assistant, topic, setActiveTopic, o
           if (msgBlock && isTextLikeBlock(msgBlock) && msgBlock.type !== MessageBlockType.ERROR) {
             try {
               const updatedRaw = updateCodeBlock(msgBlock.content, codeBlockId, newContent)
+              const updatedBlock: MessageBlock = {
+                ...msgBlock,
+                content: updatedRaw,
+                updatedAt: new Date().toISOString()
+              }
+
               dispatch(updateOneBlock({ id: msgBlockId, changes: { content: updatedRaw } }))
+              await dispatch(updateMessageAndBlocksThunk(topic.id, null, [updatedBlock]))
+
               window.message.success({ content: t('code_block.edit.save.success'), key: 'save-code' })
             } catch (error) {
               console.error(`Failed to save code block ${codeBlockId} content to message block ${msgBlockId}:`, error)

From 08a526e51127e24a0fb85efe8d889255fada9387 Mon Sep 17 00:00:00 2001
From: Teo <cheesen.xu@gmail.com>
Date: Thu, 26 Jun 2025 11:42:12 +0800
Subject: [PATCH 41/75] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=BB=9A=E5=8A=A8=E6=9D=A1=20(#7549)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(Messages): integrate Scrollbar component into Message and MessageGroup styled containers

* style(Messages): add margin-top to MessageFooter for improved layout

* fix(SelectionToolbar): update regex to remove background styles more accurately
---
 src/renderer/src/pages/home/Messages/Message.tsx              | 4 +++-
 src/renderer/src/pages/home/Messages/MessageGroup.tsx         | 3 ++-
 .../src/windows/selection/toolbar/SelectionToolbar.tsx        | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/pages/home/Messages/Message.tsx b/src/renderer/src/pages/home/Messages/Message.tsx
index 96067bc375..d013e34e0e 100644
--- a/src/renderer/src/pages/home/Messages/Message.tsx
+++ b/src/renderer/src/pages/home/Messages/Message.tsx
@@ -1,3 +1,4 @@
+import Scrollbar from '@renderer/components/Scrollbar'
 import { useMessageEditing } from '@renderer/context/MessageEditingContext'
 import { useAssistant } from '@renderer/hooks/useAssistant'
 import { useMessageOperations } from '@renderer/hooks/useMessageOperations'
@@ -215,7 +216,7 @@ const MessageContainer = styled.div`
   }
 `
 
-const MessageContentContainer = styled.div`
+const MessageContentContainer = styled(Scrollbar)`
   max-width: 100%;
   padding-left: 46px;
   margin-top: 5px;
@@ -229,6 +230,7 @@ const MessageFooter = styled.div`
   align-items: center;
   gap: 20px;
   margin-left: 46px;
+  margin-top: 2px;
 `
 
 const NewContextMessage = styled.div`
diff --git a/src/renderer/src/pages/home/Messages/MessageGroup.tsx b/src/renderer/src/pages/home/Messages/MessageGroup.tsx
index 69b7e7243b..995540a6cf 100644
--- a/src/renderer/src/pages/home/Messages/MessageGroup.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageGroup.tsx
@@ -1,3 +1,4 @@
+import Scrollbar from '@renderer/components/Scrollbar'
 import { MessageEditingProvider } from '@renderer/context/MessageEditingContext'
 import { useChatContext } from '@renderer/hooks/useChatContext'
 import { useMessageOperations } from '@renderer/hooks/useMessageOperations'
@@ -257,7 +258,7 @@ const GroupContainer = styled.div`
   }
 `
 
-const GridContainer = styled.div<{ $count: number; $gridColumns: number }>`
+const GridContainer = styled(Scrollbar)<{ $count: number; $gridColumns: number }>`
   width: 100%;
   display: grid;
   overflow-y: visible;
diff --git a/src/renderer/src/windows/selection/toolbar/SelectionToolbar.tsx b/src/renderer/src/windows/selection/toolbar/SelectionToolbar.tsx
index af6a94372c..00f38e01b8 100644
--- a/src/renderer/src/windows/selection/toolbar/SelectionToolbar.tsx
+++ b/src/renderer/src/windows/selection/toolbar/SelectionToolbar.tsx
@@ -159,7 +159,7 @@ const SelectionToolbar: FC<{ demo?: boolean }> = ({ demo = false }) => {
     }
 
     if (customCss) {
-      const newCustomCss = customCss.replace(/background(-image|-color)?\s*:[^;]+;/gi, '')
+      const newCustomCss = customCss.replace(/(^|\s)background(-image|-color)?\s*:[^;]+;/gi, '')
 
       customCssElement = document.createElement('style')
       customCssElement.id = 'user-defined-custom-css'

From 3048d0850cd63b578dfde71bfd696bedd40563a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=A2=E5=A5=8B=E7=8C=AB?= <kangfenmao@qq.com>
Date: Thu, 26 Jun 2025 12:00:31 +0800
Subject: [PATCH 42/75] fix: Gemini reasoning model check and improve citation
 popover structure (#7554)

- Added a new condition to the Gemini reasoning model check to include models with IDs starting with 'gemini' and containing 'thinking'.
- Refactored the CitationsList component to improve the structure of popover content for web search and knowledge citations.
- Updated styled components for better layout and responsiveness in the citation popover.
- Adjusted margin styles in ErrorBlock for consistent spacing.
---
 src/renderer/src/config/models.ts             |  4 +++
 .../pages/home/Messages/Blocks/ErrorBlock.tsx |  2 +-
 .../src/pages/home/Messages/CitationsList.tsx | 25 ++++++++++++-------
 .../components/KnowledgeSearchPopup.tsx       | 12 +++++++--
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/renderer/src/config/models.ts b/src/renderer/src/config/models.ts
index d9453cea34..6bd366617b 100644
--- a/src/renderer/src/config/models.ts
+++ b/src/renderer/src/config/models.ts
@@ -2469,6 +2469,10 @@ export function isGeminiReasoningModel(model?: Model): boolean {
     return false
   }
 
+  if (model.id.startsWith('gemini') && model.id.includes('thinking')) {
+    return true
+  }
+
   if (model.id.includes('gemini-2.5')) {
     return true
   }
diff --git a/src/renderer/src/pages/home/Messages/Blocks/ErrorBlock.tsx b/src/renderer/src/pages/home/Messages/Blocks/ErrorBlock.tsx
index 2cdc9a684c..b20b62bbc9 100644
--- a/src/renderer/src/pages/home/Messages/Blocks/ErrorBlock.tsx
+++ b/src/renderer/src/pages/home/Messages/Blocks/ErrorBlock.tsx
@@ -31,7 +31,7 @@ const MessageErrorInfo: React.FC<{ block: ErrorMessageBlock }> = ({ block }) =>
 }
 
 const Alert = styled(AntdAlert)`
-  margin: 0.5rem 0;
+  margin: 0.5rem 0 !important;
   padding: 10px;
   font-size: 12px;
 `
diff --git a/src/renderer/src/pages/home/Messages/CitationsList.tsx b/src/renderer/src/pages/home/Messages/CitationsList.tsx
index 0c40f83ed6..8929ffd89c 100644
--- a/src/renderer/src/pages/home/Messages/CitationsList.tsx
+++ b/src/renderer/src/pages/home/Messages/CitationsList.tsx
@@ -53,17 +53,21 @@ const CitationsList: React.FC<CitationsListProps> = ({ citations }) => {
   if (!count) return null
 
   const popoverContent = (
-    <PopoverContent>
+    <div>
       {citations.map((citation) => (
         <PopoverContentItem key={citation.url || citation.number}>
           {citation.type === 'websearch' ? (
-            <WebSearchCitation citation={citation} />
+            <PopoverContent>
+              <WebSearchCitation citation={citation} />
+            </PopoverContent>
           ) : (
-            <KnowledgeCitation citation={citation} />
+            <KnowledgePopoverContent>
+              <KnowledgeCitation citation={citation} />
+            </KnowledgePopoverContent>
           )}
         </PopoverContentItem>
       ))}
-    </PopoverContent>
+    </div>
   )
 
   return (
@@ -184,9 +188,7 @@ const KnowledgeCitation: React.FC<{ citation: Citation }> = ({ citation }) => {
           <CitationIndex>{citation.number}</CitationIndex>
           {citation.content && <CopyButton content={citation.content} />}
         </WebSearchCardHeader>
-        <WebSearchCardContent className="selectable-text">
-          {citation.content && truncateText(citation.content, 100)}
-        </WebSearchCardContent>
+        <WebSearchCardContent className="selectable-text">{citation.content && citation.content}</WebSearchCardContent>
       </WebSearchCard>
     </ContextMenu>
   )
@@ -196,7 +198,7 @@ const OpenButton = styled(Button)`
   display: flex;
   align-items: center;
   padding: 3px 8px;
-  margin-bottom: 8px;
+  margin: 8px 0;
   align-self: flex-start;
   font-size: 12px;
   background-color: var(--color-background-soft);
@@ -318,10 +320,15 @@ const WebSearchCardContent = styled.div`
 `
 
 const PopoverContent = styled.div`
-  max-width: min(340px, 60vw);
+  max-width: min(400px, 60vw);
   max-height: 60vh;
   padding: 0 12px;
 `
+
+const KnowledgePopoverContent = styled(PopoverContent)`
+  max-width: 800px;
+`
+
 const PopoverContentItem = styled.div`
   border-bottom: 0.5px solid var(--color-border);
   &:last-child {
diff --git a/src/renderer/src/pages/knowledge/components/KnowledgeSearchPopup.tsx b/src/renderer/src/pages/knowledge/components/KnowledgeSearchPopup.tsx
index f9018d7f49..21be188ffc 100644
--- a/src/renderer/src/pages/knowledge/components/KnowledgeSearchPopup.tsx
+++ b/src/renderer/src/pages/knowledge/components/KnowledgeSearchPopup.tsx
@@ -4,9 +4,9 @@ import { HStack } from '@renderer/components/Layout'
 import { TopView } from '@renderer/components/TopView'
 import { searchKnowledgeBase } from '@renderer/services/KnowledgeService'
 import { FileType, KnowledgeBase } from '@renderer/types'
-import { Divider, Input, List, message, Modal, Spin, Tooltip, Typography } from 'antd'
+import { Divider, Input, InputRef, List, message, Modal, Spin, Tooltip, Typography } from 'antd'
 import { Search } from 'lucide-react'
-import { useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
@@ -26,6 +26,7 @@ const PopupContainer: React.FC<Props> = ({ base, resolve }) => {
   const [results, setResults] = useState<Array<ExtractChunkData & { file: FileType | null }>>([])
   const [searchKeyword, setSearchKeyword] = useState('')
   const { t } = useTranslation()
+  const searchInputRef = useRef<InputRef>(null)
 
   const handleSearch = async (value: string) => {
     if (!value.trim()) {
@@ -82,6 +83,12 @@ const PopupContainer: React.FC<Props> = ({ base, resolve }) => {
     }
   }
 
+  useEffect(() => {
+    if (searchInputRef.current) {
+      searchInputRef.current.focus()
+    }
+  }, [])
+
   return (
     <Modal
       title={null}
@@ -109,6 +116,7 @@ const PopupContainer: React.FC<Props> = ({ base, resolve }) => {
       }}>
       <HStack style={{ padding: '0 12px', marginTop: 8 }}>
         <Input
+          ref={searchInputRef}
           prefix={
             <SearchIcon>
               <Search size={15} />

From 1db93e8b569f066b243b1fe8671399ab27bf9c09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=A2=E5=A5=8B=E7=8C=AB?= <kangfenmao@qq.com>
Date: Thu, 26 Jun 2025 13:19:36 +0800
Subject: [PATCH 43/75] Fix anthropic request cannot handle webSearch and
 knowbase references (#7559)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复 Anthropic 模型请求忽略了知识库和网络搜索引用内容的问题
---
 .../src/aiCore/clients/anthropic/AnthropicAPIClient.ts        | 4 ++--
 src/renderer/src/pages/home/Messages/Blocks/ThinkingBlock.tsx | 2 +-
 .../__tests__/__snapshots__/ThinkingBlock.test.tsx.snap       | 2 +-
 src/renderer/src/pages/home/Messages/CitationsList.tsx        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/aiCore/clients/anthropic/AnthropicAPIClient.ts b/src/renderer/src/aiCore/clients/anthropic/AnthropicAPIClient.ts
index 465cdff5ac..e07b7508db 100644
--- a/src/renderer/src/aiCore/clients/anthropic/AnthropicAPIClient.ts
+++ b/src/renderer/src/aiCore/clients/anthropic/AnthropicAPIClient.ts
@@ -66,7 +66,7 @@ import {
   mcpToolCallResponseToAnthropicMessage,
   mcpToolsToAnthropicTools
 } from '@renderer/utils/mcp-tools'
-import { findFileBlocks, findImageBlocks, getMainTextContent } from '@renderer/utils/messageUtils/find'
+import { findFileBlocks, findImageBlocks } from '@renderer/utils/messageUtils/find'
 import { buildSystemPrompt } from '@renderer/utils/prompt'
 
 import { BaseApiClient } from '../BaseApiClient'
@@ -192,7 +192,7 @@ export class AnthropicAPIClient extends BaseApiClient<
     const parts: MessageParam['content'] = [
       {
         type: 'text',
-        text: getMainTextContent(message)
+        text: await this.getMessageContent(message)
       }
     ]
 
diff --git a/src/renderer/src/pages/home/Messages/Blocks/ThinkingBlock.tsx b/src/renderer/src/pages/home/Messages/Blocks/ThinkingBlock.tsx
index e1420ba6cb..fa422ea524 100644
--- a/src/renderer/src/pages/home/Messages/Blocks/ThinkingBlock.tsx
+++ b/src/renderer/src/pages/home/Messages/Blocks/ThinkingBlock.tsx
@@ -150,7 +150,7 @@ const ThinkingTimeSeconds = memo(
 )
 
 const CollapseContainer = styled(Collapse)`
-  margin-bottom: 15px;
+  margin: 15px 0;
 `
 
 const MessageTitleLabel = styled.div`
diff --git a/src/renderer/src/pages/home/Messages/Blocks/__tests__/__snapshots__/ThinkingBlock.test.tsx.snap b/src/renderer/src/pages/home/Messages/Blocks/__tests__/__snapshots__/ThinkingBlock.test.tsx.snap
index 7f1f866b8b..805e7d2a90 100644
--- a/src/renderer/src/pages/home/Messages/Blocks/__tests__/__snapshots__/ThinkingBlock.test.tsx.snap
+++ b/src/renderer/src/pages/home/Messages/Blocks/__tests__/__snapshots__/ThinkingBlock.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`ThinkingBlock > basic rendering > should match snapshot 1`] = `
 .c0 {
-  margin-bottom: 15px;
+  margin: 15px 0;
 }
 
 .c1 {
diff --git a/src/renderer/src/pages/home/Messages/CitationsList.tsx b/src/renderer/src/pages/home/Messages/CitationsList.tsx
index 8929ffd89c..f147619adc 100644
--- a/src/renderer/src/pages/home/Messages/CitationsList.tsx
+++ b/src/renderer/src/pages/home/Messages/CitationsList.tsx
@@ -326,7 +326,7 @@ const PopoverContent = styled.div`
 `
 
 const KnowledgePopoverContent = styled(PopoverContent)`
-  max-width: 800px;
+  max-width: 600px;
 `
 
 const PopoverContentItem = styled.div`

From 5811adfb7f324b5cf039af35fc6962b0f956d1ae Mon Sep 17 00:00:00 2001
From: one <wangan.cs@gmail.com>
Date: Thu, 26 Jun 2025 13:30:49 +0800
Subject: [PATCH 44/75] refactor(CodePreview): handle chunking in
 ShikiStreamService, make the algorithm more robust (#7409)

* refactor(ShikiStreamService, CodePreview): handle chunking in ShikiStreamService, make the algorithm more robust

- Add highlightStreamingCode with improved robustness
- Improve viewport detection

* perf: improve checks for appending

* chore: update comments
---
 .../components/CodeBlockView/CodePreview.tsx  | 118 ++++++++----------
 .../src/context/CodeStyleProvider.tsx         |  13 ++
 .../src/services/ShikiStreamService.ts        |  83 +++++++++++-
 3 files changed, 147 insertions(+), 67 deletions(-)

diff --git a/src/renderer/src/components/CodeBlockView/CodePreview.tsx b/src/renderer/src/components/CodeBlockView/CodePreview.tsx
index dde163283d..b550cd2467 100644
--- a/src/renderer/src/components/CodeBlockView/CodePreview.tsx
+++ b/src/renderer/src/components/CodeBlockView/CodePreview.tsx
@@ -4,7 +4,7 @@ import { useSettings } from '@renderer/hooks/useSettings'
 import { uuid } from '@renderer/utils'
 import { getReactStyleFromToken } from '@renderer/utils/shiki'
 import { ChevronsDownUp, ChevronsUpDown, Text as UnWrapIcon, WrapText as WrapIcon } from 'lucide-react'
-import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import React, { memo, useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ThemedToken } from 'shiki/core'
 import styled from 'styled-components'
@@ -18,19 +18,20 @@ interface CodePreviewProps {
 /**
  * Shiki 流式代码高亮组件
  *
- * - 通过 shiki tokenizer 处理流式响应
- * - 为了正确执行语法高亮，必须保证流式响应都依次到达 tokenizer，不能跳过
+ * - 通过 shiki tokenizer 处理流式响应，高性能
+ * - 进入视口后触发高亮，改善页面内有大量长代码块时的响应
+ * - 并发安全
  */
 const CodePreview = ({ children, language, setTools }: CodePreviewProps) => {
   const { codeShowLineNumbers, fontSize, codeCollapsible, codeWrappable } = useSettings()
-  const { activeShikiTheme, highlightCodeChunk, cleanupTokenizers } = useCodeStyle()
+  const { activeShikiTheme, highlightStreamingCode, cleanupTokenizers } = useCodeStyle()
   const [isExpanded, setIsExpanded] = useState(!codeCollapsible)
   const [isUnwrapped, setIsUnwrapped] = useState(!codeWrappable)
   const [tokenLines, setTokenLines] = useState<ThemedToken[][]>([])
-  const codeContentRef = useRef<HTMLDivElement>(null)
-  const prevCodeLengthRef = useRef(0)
-  const safeCodeStringRef = useRef(children)
-  const highlightQueueRef = useRef<Promise<void>>(Promise.resolve())
+  const [isInViewport, setIsInViewport] = useState(false)
+  const codeContainerRef = useRef<HTMLDivElement>(null)
+  const processingRef = useRef(false)
+  const latestRequestedContentRef = useRef<string | null>(null)
   const callerId = useRef(`${Date.now()}-${uuid()}`).current
   const shikiThemeRef = useRef(activeShikiTheme)
 
@@ -45,7 +46,7 @@ const CodePreview = ({ children, language, setTools }: CodePreviewProps) => {
       icon: isExpanded ? <ChevronsDownUp className="icon" /> : <ChevronsUpDown className="icon" />,
       tooltip: isExpanded ? t('code_block.collapse') : t('code_block.expand'),
       visible: () => {
-        const scrollHeight = codeContentRef.current?.scrollHeight
+        const scrollHeight = codeContainerRef.current?.scrollHeight
         return codeCollapsible && (scrollHeight ?? 0) > 350
       },
       onClick: () => setIsExpanded((prev) => !prev)
@@ -77,81 +78,63 @@ const CodePreview = ({ children, language, setTools }: CodePreviewProps) => {
     setIsUnwrapped(!codeWrappable)
   }, [codeWrappable])
 
-  // 处理尾部空白字符
-  const safeCodeString = useMemo(() => {
-    return typeof children === 'string' ? children.trimEnd() : ''
-  }, [children])
-
   const highlightCode = useCallback(async () => {
-    if (!safeCodeString) return
+    const currentContent = typeof children === 'string' ? children.trimEnd() : ''
 
-    if (prevCodeLengthRef.current === safeCodeString.length) return
+    // 记录最新要处理的内容，为了保证最终状态正确
+    latestRequestedContentRef.current = currentContent
 
-    // 捕获当前状态
-    const startPos = prevCodeLengthRef.current
-    const endPos = safeCodeString.length
+    // 如果正在处理，先跳出，等到完成后会检查是否有新内容
+    if (processingRef.current) return
 
-    // 添加到处理队列，确保按顺序处理
-    highlightQueueRef.current = highlightQueueRef.current.then(async () => {
-      // FIXME: 长度有问题，或者破坏了流式内容，需要清理 tokenizer 并使用完整代码重新高亮
-      if (prevCodeLengthRef.current > safeCodeString.length || !safeCodeString.startsWith(safeCodeStringRef.current)) {
-        cleanupTokenizers(callerId)
-        prevCodeLengthRef.current = 0
-        safeCodeStringRef.current = ''
+    processingRef.current = true
 
-        const result = await highlightCodeChunk(safeCodeString, language, callerId)
-        setTokenLines(result.lines)
+    try {
+      // 循环处理，确保会处理最新内容
+      while (latestRequestedContentRef.current !== null) {
+        const contentToProcess = latestRequestedContentRef.current
+        latestRequestedContentRef.current = null // 标记开始处理
 
-        prevCodeLengthRef.current = safeCodeString.length
-        safeCodeStringRef.current = safeCodeString
+        // 传入完整内容，让 ShikiStreamService 检测变化并处理增量高亮
+        const result = await highlightStreamingCode(contentToProcess, language, callerId)
 
-        return
+        // 如有结果，更新 tokenLines
+        if (result.lines.length > 0 || result.recall !== 0) {
+          setTokenLines((prev) => {
+            return result.recall === -1
+              ? result.lines
+              : [...prev.slice(0, Math.max(0, prev.length - result.recall)), ...result.lines]
+          })
+        }
       }
-
-      // 跳过 race condition，延迟到后续任务
-      if (prevCodeLengthRef.current !== startPos) {
-        return
-      }
-
-      const incrementalCode = safeCodeString.slice(startPos, endPos)
-      const result = await highlightCodeChunk(incrementalCode, language, callerId)
-      setTokenLines((lines) => [...lines.slice(0, Math.max(0, lines.length - result.recall)), ...result.lines])
-      prevCodeLengthRef.current = endPos
-      safeCodeStringRef.current = safeCodeString
-    })
-  }, [callerId, cleanupTokenizers, highlightCodeChunk, language, safeCodeString])
+    } finally {
+      processingRef.current = false
+    }
+  }, [highlightStreamingCode, language, callerId, children])
 
   // 主题变化时强制重新高亮
   useEffect(() => {
     if (shikiThemeRef.current !== activeShikiTheme) {
-      prevCodeLengthRef.current++
       shikiThemeRef.current = activeShikiTheme
+      cleanupTokenizers(callerId)
+      setTokenLines([])
     }
-  }, [activeShikiTheme])
+  }, [activeShikiTheme, callerId, cleanupTokenizers])
 
   // 组件卸载时清理资源
   useEffect(() => {
     return () => cleanupTokenizers(callerId)
   }, [callerId, cleanupTokenizers])
 
-  // 触发代码高亮
-  // - 进入视口后触发第一次高亮
-  // - 内容变化后触发之后的高亮
+  // 视口检测逻辑，进入视口后触发第一次代码高亮
   useEffect(() => {
-    let isMounted = true
-
-    if (prevCodeLengthRef.current > 0) {
-      setTimeout(highlightCode, 0)
-      return
-    }
-
-    const codeElement = codeContentRef.current
+    const codeElement = codeContainerRef.current
     if (!codeElement) return
 
     const observer = new IntersectionObserver(
       (entries) => {
-        if (entries[0].intersectionRatio > 0 && isMounted) {
-          setTimeout(highlightCode, 0)
+        if (entries[0].intersectionRatio > 0) {
+          setIsInViewport(true)
           observer.disconnect()
         }
       },
@@ -161,15 +144,18 @@ const CodePreview = ({ children, language, setTools }: CodePreviewProps) => {
     )
 
     observer.observe(codeElement)
+    return () => observer.disconnect()
+  }, []) // 只执行一次
 
-    return () => {
-      isMounted = false
-      observer.disconnect()
-    }
-  }, [highlightCode])
+  // 触发代码高亮
+  useEffect(() => {
+    if (!isInViewport) return
+
+    setTimeout(highlightCode, 0)
+  }, [isInViewport, highlightCode])
 
   useEffect(() => {
-    const container = codeContentRef.current
+    const container = codeContainerRef.current
     if (!container || !codeShowLineNumbers) return
 
     const digits = Math.max(tokenLines.length.toString().length, 1)
@@ -180,7 +166,7 @@ const CodePreview = ({ children, language, setTools }: CodePreviewProps) => {
 
   return (
     <ContentContainer
-      ref={codeContentRef}
+      ref={codeContainerRef}
       $lineNumbers={codeShowLineNumbers}
       $wrap={codeWrappable && !isUnwrapped}
       $fadeIn={hasHighlightedCode}
diff --git a/src/renderer/src/context/CodeStyleProvider.tsx b/src/renderer/src/context/CodeStyleProvider.tsx
index 06dc345f7a..28b71eb7e1 100644
--- a/src/renderer/src/context/CodeStyleProvider.tsx
+++ b/src/renderer/src/context/CodeStyleProvider.tsx
@@ -10,6 +10,7 @@ import { createContext, type PropsWithChildren, use, useCallback, useEffect, use
 
 interface CodeStyleContextType {
   highlightCodeChunk: (trunk: string, language: string, callerId: string) => Promise<HighlightChunkResult>
+  highlightStreamingCode: (code: string, language: string, callerId: string) => Promise<HighlightChunkResult>
   cleanupTokenizers: (callerId: string) => void
   getShikiPreProperties: (language: string) => Promise<ShikiPreProperties>
   highlightCode: (code: string, language: string) => Promise<string>
@@ -22,6 +23,7 @@ interface CodeStyleContextType {
 
 const defaultCodeStyleContext: CodeStyleContextType = {
   highlightCodeChunk: async () => ({ lines: [], recall: 0 }),
+  highlightStreamingCode: async () => ({ lines: [], recall: 0 }),
   cleanupTokenizers: () => {},
   getShikiPreProperties: async () => ({ class: '', style: '', tabindex: 0 }),
   highlightCode: async () => '',
@@ -114,6 +116,15 @@ export const CodeStyleProvider: React.FC<PropsWithChildren> = ({ children }) =>
     shikiStreamService.cleanupTokenizers(callerId)
   }, [])
 
+  // 高亮流式输出的代码
+  const highlightStreamingCode = useCallback(
+    async (fullContent: string, language: string, callerId: string) => {
+      const normalizedLang = languageMap[language as keyof typeof languageMap] || language.toLowerCase()
+      return shikiStreamService.highlightStreamingCode(fullContent, normalizedLang, activeShikiTheme, callerId)
+    },
+    [activeShikiTheme, languageMap]
+  )
+
   // 获取 Shiki pre 标签属性
   const getShikiPreProperties = useCallback(
     async (language: string) => {
@@ -148,6 +159,7 @@ export const CodeStyleProvider: React.FC<PropsWithChildren> = ({ children }) =>
   const contextValue = useMemo(
     () => ({
       highlightCodeChunk,
+      highlightStreamingCode,
       cleanupTokenizers,
       getShikiPreProperties,
       highlightCode,
@@ -159,6 +171,7 @@ export const CodeStyleProvider: React.FC<PropsWithChildren> = ({ children }) =>
     }),
     [
       highlightCodeChunk,
+      highlightStreamingCode,
       cleanupTokenizers,
       getShikiPreProperties,
       highlightCode,
diff --git a/src/renderer/src/services/ShikiStreamService.ts b/src/renderer/src/services/ShikiStreamService.ts
index 8ddc2a8be1..8d5c6f6223 100644
--- a/src/renderer/src/services/ShikiStreamService.ts
+++ b/src/renderer/src/services/ShikiStreamService.ts
@@ -20,7 +20,7 @@ export type ShikiPreProperties = {
  * 代码 chunk 高亮结果
  *
  * @param lines 所有高亮行（包括稳定和不稳定）
- * @param recall 需要撤回的行数
+ * @param recall 需要撤回的行数，-1 表示撤回所有行
  */
 export interface HighlightChunkResult {
   lines: ThemedToken[][]
@@ -47,6 +47,13 @@ class ShikiStreamService {
     }
   })
 
+  // 缓存每个 callerId 对应的已处理内容
+  private codeCache = new LRUCache<string, string>({
+    max: 100, // 最大缓存数量
+    ttl: 1000 * 60 * 30, // 30分钟过期时间
+    updateAgeOnGet: true
+  })
+
   // Worker 相关资源
   private worker: Worker | null = null
   private workerInitPromise: Promise<void> | null = null
@@ -261,6 +268,72 @@ class ShikiStreamService {
     return hast.children[0].properties as ShikiPreProperties
   }
 
+  /**
+   * 高亮流式输出的代码，调用方传入完整代码内容，得到增量高亮结果。
+   *
+   * - 检测当前内容与上次处理内容的差异。
+   * - 如果是末尾追加，只传输增量部分（此时性能最好，如遇性能问题，考虑检查这里的逻辑）。
+   * - 如果不是追加，重置 tokenizer 并处理完整内容。
+   *
+   * 调用者需要自行处理撤回。
+   * @param code 完整代码内容
+   * @param language 语言
+   * @param theme 主题
+   * @param callerId 调用者ID
+   * @returns 高亮结果，recall 为 -1 表示撤回所有行
+   */
+  async highlightStreamingCode(
+    code: string,
+    language: string,
+    theme: string,
+    callerId: string
+  ): Promise<HighlightChunkResult> {
+    const cacheKey = `${callerId}-${language}-${theme}`
+    const lastContent = this.codeCache.get(cacheKey) || ''
+
+    let isAppend = false
+
+    if (code.length === lastContent.length) {
+      // 内容没有变化，返回空结果
+      if (code === lastContent) {
+        return { lines: [], recall: 0 }
+      }
+    } else if (code.length > lastContent.length) {
+      // 长度增加，可能是追加
+      isAppend = code.startsWith(lastContent)
+    }
+
+    try {
+      let result: HighlightChunkResult
+
+      if (isAppend) {
+        // 流式追加，只传输增量
+        const chunk = code.slice(lastContent.length)
+        result = await this.highlightCodeChunk(chunk, language, theme, callerId)
+      } else {
+        // 非追加变化，重置并处理完整内容
+        this.cleanupTokenizers(callerId)
+        this.codeCache.delete(cacheKey) // 清除缓存
+
+        result = await this.highlightCodeChunk(code, language, theme, callerId)
+
+        // 撤回所有行
+        result = {
+          ...result,
+          recall: -1
+        }
+      }
+
+      // 成功处理后更新缓存
+      this.codeCache.set(cacheKey, code)
+      return result
+    } catch (error) {
+      // 处理失败时不更新缓存，保持之前的状态
+      console.error('Failed to highlight streaming code:', error)
+      throw error
+    }
+  }
+
   /**
    * 高亮代码 chunk，返回本次高亮的所有 ThemedToken 行
    *
@@ -405,6 +478,13 @@ class ShikiStreamService {
       })
     }
 
+    // 清理对应的内容缓存
+    for (const key of this.codeCache.keys()) {
+      if (key.startsWith(`${callerId}-`)) {
+        this.codeCache.delete(key)
+      }
+    }
+
     // 再清理主线程中的 tokenizers，移除所有以 callerId 开头的缓存项
     for (const key of this.tokenizerCache.keys()) {
       if (key.startsWith(`${callerId}-`)) {
@@ -429,6 +509,7 @@ class ShikiStreamService {
 
     this.workerDegradationCache.clear()
     this.tokenizerCache.clear()
+    this.codeCache.clear()
     this.highlighter = null
     this.workerInitPromise = null
     this.workerInitRetryCount = 0

From f555e604a361563548d06e847b71fc9622099e41 Mon Sep 17 00:00:00 2001
From: suyao <sy20010504@gmail.com>
Date: Thu, 26 Jun 2025 01:31:44 +0800
Subject: [PATCH 45/75] fix(models): update isReasoningModel function to
 exclude embedding models

- Added a check to the isReasoningModel function to return false for embedding models, ensuring correct model classification.
---
 src/renderer/src/config/models.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/renderer/src/config/models.ts b/src/renderer/src/config/models.ts
index 6bd366617b..f934fbbb81 100644
--- a/src/renderer/src/config/models.ts
+++ b/src/renderer/src/config/models.ts
@@ -2545,6 +2545,10 @@ export function isReasoningModel(model?: Model): boolean {
     return false
   }
 
+  if (isEmbeddingModel(model)) {
+    return false
+  }
+
   if (model.provider === 'doubao') {
     return (
       REASONING_REGEX.test(model.name) ||

From 6342998c9f9d4c63203f041c7981a6282db7eb09 Mon Sep 17 00:00:00 2001
From: one <wangan.cs@gmail.com>
Date: Thu, 26 Jun 2025 15:01:36 +0800
Subject: [PATCH 46/75] feat(MentionedModels): improve feedback for
 MessageGroupModelList (#7539)

* feat(MentionedModels): improve feedback for MessageGroupModelList

* refactor: reuse pulse animation, fix tooltip triggering area

* refactor: use lightbulbSoftVariants
---
 .../home/Messages/MessageGroupModelList.tsx   | 50 ++++++++++++-------
 src/renderer/src/utils/motionVariants.ts      | 19 +++++++
 2 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/src/renderer/src/pages/home/Messages/MessageGroupModelList.tsx b/src/renderer/src/pages/home/Messages/MessageGroupModelList.tsx
index 8fe085aa2f..c185d509f1 100644
--- a/src/renderer/src/pages/home/Messages/MessageGroupModelList.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageGroupModelList.tsx
@@ -6,8 +6,10 @@ import { useSettings } from '@renderer/hooks/useSettings'
 import { useAppDispatch } from '@renderer/store'
 import { setFoldDisplayMode } from '@renderer/store/settings'
 import type { Model } from '@renderer/types'
-import type { Message } from '@renderer/types/newMessage'
+import { AssistantMessageStatus, type Message } from '@renderer/types/newMessage'
+import { lightbulbSoftVariants } from '@renderer/utils/motionVariants'
 import { Avatar, Segmented as AntdSegmented, Tooltip } from 'antd'
+import { motion } from 'motion/react'
 import { FC, memo, useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
@@ -26,50 +28,62 @@ const MessageGroupModelList: FC<MessageGroupModelListProps> = ({ messages, selec
   const { foldDisplayMode } = useSettings()
   const isCompact = foldDisplayMode === 'compact'
 
+  const isMessageProcessing = useCallback((message: Message) => {
+    return [
+      AssistantMessageStatus.PENDING,
+      AssistantMessageStatus.PROCESSING,
+      AssistantMessageStatus.SEARCHING
+    ].includes(message.status as AssistantMessageStatus)
+  }, [])
+
   const renderLabel = useCallback(
     (message: Message) => {
       const modelTip = message.model?.name
+      const isProcessing = isMessageProcessing(message)
 
       if (isCompact) {
         return (
-          <Tooltip key={message.id} title={modelTip} mouseEnterDelay={0.5}>
+          <Tooltip key={message.id} title={modelTip} mouseEnterDelay={0.5} mouseLeaveDelay={0}>
             <AvatarWrapper
               className="avatar-wrapper"
               $isSelected={message.id === selectMessageId}
               onClick={() => {
                 setSelectedMessage(message)
               }}>
-              <ModelAvatar model={message.model as Model} size={22} />
+              <motion.span variants={lightbulbSoftVariants} animate={isProcessing ? 'active' : 'idle'} initial="idle">
+                <ModelAvatar model={message.model as Model} size={22} />
+              </motion.span>
             </AvatarWrapper>
           </Tooltip>
         )
       }
       return (
         <SegmentedLabel>
-          <ModelAvatar model={message.model as Model} size={20} />
+          <ModelAvatar className={isProcessing ? 'animation-pulse' : ''} model={message.model as Model} size={20} />
           <ModelName>{message.model?.name}</ModelName>
         </SegmentedLabel>
       )
     },
-    [isCompact, selectMessageId, setSelectedMessage]
+    [isCompact, isMessageProcessing, selectMessageId, setSelectedMessage]
   )
 
   return (
     <Container>
-      <DisplayModeToggle
-        displayMode={foldDisplayMode}
-        onClick={() => dispatch(setFoldDisplayMode(isCompact ? 'expanded' : 'compact'))}>
-        <Tooltip
-          title={
-            isCompact
-              ? t(`message.message.multi_model_style.fold.expand`)
-              : t('message.message.multi_model_style.fold.compress')
-          }
-          placement="top">
+      <Tooltip
+        title={
+          isCompact
+            ? t(`message.message.multi_model_style.fold.expand`)
+            : t('message.message.multi_model_style.fold.compress')
+        }
+        placement="top"
+        mouseEnterDelay={0.5}
+        mouseLeaveDelay={0}>
+        <DisplayModeToggle
+          displayMode={foldDisplayMode}
+          onClick={() => dispatch(setFoldDisplayMode(isCompact ? 'expanded' : 'compact'))}>
           {isCompact ? <ArrowsAltOutlined /> : <ShrinkOutlined />}
-        </Tooltip>
-      </DisplayModeToggle>
-
+        </DisplayModeToggle>
+      </Tooltip>
       <ModelsContainer $displayMode={foldDisplayMode}>
         {isCompact ? (
           /* Compact style display */
diff --git a/src/renderer/src/utils/motionVariants.ts b/src/renderer/src/utils/motionVariants.ts
index 1f4812369f..8d5d25ade6 100644
--- a/src/renderer/src/utils/motionVariants.ts
+++ b/src/renderer/src/utils/motionVariants.ts
@@ -16,3 +16,22 @@ export const lightbulbVariants = {
     }
   }
 }
+
+export const lightbulbSoftVariants = {
+  active: {
+    opacity: [1, 0.5, 1],
+    transition: {
+      duration: 2,
+      ease: 'easeInOut',
+      times: [0, 0.5, 1],
+      repeat: Infinity
+    }
+  },
+  idle: {
+    opacity: 1,
+    transition: {
+      duration: 0.3,
+      ease: 'easeInOut'
+    }
+  }
+}

From 4c66b205bb7ae525f33dc356d33ba753b18c3260 Mon Sep 17 00:00:00 2001
From: beyondkmp <beyondkmp@gmail.com>
Date: Thu, 26 Jun 2025 15:43:45 +0800
Subject: [PATCH 47/75] feat: implement early access feature toggle and update
 related configurations (#7304)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: implement early access feature toggle and update related configurations

- Replace FeedUrl with EnableEarlyAccess in IpcChannel and ConfigManager
- Update AppUpdater to handle early access updates from GitHub
- Modify settings and localization files to reflect early access functionality
- Ensure proper integration in the renderer and preload layers

* fix: enhance error handling in AppUpdater for GitHub release fetching

- Wrap the fetch call in a try-catch block to handle potential errors when retrieving the latest non-draft version from GitHub.
- Log an error message if the fetch fails and return a default feed URL.

* refactor: remove early access feature handling from AppUpdater

- Eliminate the early access feature toggle logic from the AppUpdater class.
- Adjust the feed URL setting to ensure it retrieves the latest non-draft version from GitHub when applicable.
- Clean up unnecessary user-agent header in the fetch request.

* feat(AppUpdater): enhance update feed URL logic and disable differential downloads

- Introduced a new private method to streamline feed URL setting based on early access and IP country.
- Disabled differential downloads for compatibility with GitHub and GitCode.
- Cleaned up the checkForUpdates method for better readability and maintainability.

* refactor(AppUpdater): simplify early access feed URL logic

- Consolidated the feed URL setting logic in setEnableEarlyAccess to a single line for improved readability.
- Removed redundant conditional checks while maintaining functionality for early access updates.

* refactor(AppUpdater): update feed URL structure and remove early access setting

- Modified the return structure of the latest release URL to include the channel type.
- Removed the early access setting from the IPC handler, streamlining the update process.
- Ensured the autoUpdater channel is set based on the latest release information.

* feat(UpgradeChannel): add upgrade channel management and IPC integration

- Introduced a new UpgradeChannel enum to manage different upgrade paths (latest, rc, beta).
- Updated IpcChannel to include App_SetUpgradeChannel for setting the upgrade channel.
- Enhanced ConfigManager to store and retrieve the selected upgrade channel.
- Modified AppUpdater to fetch pre-release versions based on the selected upgrade channel.
- Updated settings UI to allow users to select their preferred upgrade channel with tooltips for guidance.
- Localized new strings for upgrade channel options in multiple languages.

* refactor(AboutSettings): update version type detection and localize upgrade channel tooltips

- Changed version type detection to use the UpgradeChannel enum for better clarity.
- Localized success messages for switching upgrade channels to enhance user experience.

* chore: update version to 1.4.4-beta.1 and refactor upgrade channel handling in AboutSettings

- Updated package version to 1.4.4-beta.1.
- Renamed version type detection function to getVersionChannel for clarity.
- Refactored available version options to getAvailableTestChannels for better organization.
- Added logic to clear update info when switching upgrade channels and when toggling early access settings.

* chore: update version to 1.4.4 in package.json

* fix lint error

* feat(AppUpdater): enhance upgrade channel management and localization

- Added cancellation functionality for ongoing downloads in AppUpdater.
- Introduced a new upgrade channel option for the latest stable version.
- Updated IPC handlers to cancel downloads when changing early access settings or upgrade channels.
- Localized new strings for the latest version option in multiple languages.
- Refactored AboutSettings to include the latest version in the upgrade channel selection.

* refactor(AboutSettings): remove version channel detection logic

- Eliminated the getVersionChannel function to simplify version handling.
- Updated AboutSettings to streamline upgrade channel management.

* feat(AboutSettings): set default upgrade channel to latest

- Updated the AboutSettings component to set the default value of the upgrade channel to the latest option, enhancing user experience in channel selection.

* refactor(AboutSettings): simplify upgrade channel change handling

- Removed individual success messages for different upgrade channels in the handleUpgradeChannelChange function, streamlining the code and improving maintainability.

* refactor: file actions into FileAction service (#7413)

* refactor: file actions into FileAction service

Moved file sorting, deletion, and renaming logic from FilesPage to a new FileAction service for better modularity and reuse. Updated FileList and FilesPage to use the new service functions, and improved the delete button UI in FileList.

* fix: add tag collapse state management for assistants (#7436)

Add tag collapse state management for assistants

Introduces a collapsedTags state to manage the collapsed/expanded state of tag groups in the assistants list. Updates useTags and AssistantsTab to use this state, and adds actions to toggle and initialize tag collapse in the Redux store.

* fix(model): doubao thinking param (#7499)

* feat: Implement occupied directories handling during data copy (#7485)

* feat: Implement occupied directories handling during data copy

- Added `occupiedDirs` constant to manage directories that should not be copied.
- Enhanced the `copyOccupiedDirsInMainProcess` function to copy occupied directories to a new app data path in the main process.
- Updated IPC and preload APIs to support passing occupied directories during the copy operation.
- Modified the DataSettings component to utilize the new copy functionality with occupied directories.

* fix: Improve occupied directories handling during data copy

- Updated the filter logic in the `registerIpc` function to resolve directory paths correctly.
- Modified the `DataSettings` component to pass the correct occupied directories format during the copy operation.

* feat: add appcode (#7507)

Co-authored-by: zhaochenxue <zhaochenxue@bixin.cn>

* fix: non streamoutput sometimes (#7512)

* feat(migrate): add default settings for assistants during migration

- Introduced a new migration step to assign default settings for assistants that lack configuration.
- Default settings include temperature, context count, and other parameters to ensure consistent behavior across the application.

* chore(store): increment version number to 115 for persisted reducer

* Revert "feat: Update API Key Management Interface (#3444)"

This reverts commit 31b3ce1049a607d2448213e5bc1c1fc0f28231d2.

* feat:  一些UI上的优化和重构 (#7479)

- 调整AntdProvider中主题配置，包括颜色、尺寸
- 重构聊天气泡模式的样式
- 重构多选模式的样式
- 添加Selector组件取代ant Select组件
- 重构消息搜索弹窗界面
- 重构知识库搜索弹窗界面
- 优化其他弹框UI

* fix: bailian reranker (#7518)

* feat: implement Python MCP server using existing Pyodide infrastructure (#7506)

* refactor: rename isWindows to isWin for consistency across main/renderer (#7530)

refactor: rename isWindows to isWin for consistency across components

* refactor: data migration modal logic in DataSettings (#7503)

* refactor: data migration modal logic in DataSettings

Moved showProgressModal and startMigration functions inside the useEffect hook and added t as a dependency. This improves encapsulation and ensures translation updates are handled correctly.

* remove trailing whitespace in DataSettings.tsx

Cleaned up a line by removing unnecessary trailing whitespace in the DataSettings component.

* fix: clear search cache on resending (#7510)

* fix: Resolve vllm bad request caused by always sending dimensions in embedding requests (#7525)

fix(知识库): 将dimensions字段改为可选并修复相关逻辑

* feat: Support custom registry address when configuring mcp for npm & fix lint error (#7531)

* feat: Support custom registry address when configuring mcp for npm

* fix: lint

* refactor(GeminiAPIClient): separate model and user message handling to adapt vertex (#7511)

- Introduced a new modelParts array to manage model-related messages separately from user messages.
- Updated the logic to push model messages to currentReqMessages only if they exist, improving clarity and structure.
- Adjusted the return order of messages in buildSdkMessages to ensure history is appended correctly.
- Enhanced McpToolChunkMiddleware to reset tool processing state output when output is present.

* feat: enhance WindowFooter with show/hide functionality for UI elements

- Added state management to control visibility of UI elements in the WindowFooter.
- Implemented a timer to automatically hide elements after a period of inactivity.
- Updated hotkey handlers to reset the visibility timer on user interaction.
- Modified styled component to reflect the new visibility logic.

* fix(SelectionAssistant): opacity slider too slow when sliding in settings page (#7537)

feat: enhance opacity control in Selection Assistant Settings

- Added state management for opacity value in SelectionAssistantSettings component.
- Updated Slider component to use the new opacity state instead of the previous actionWindowOpacity variable.
- Ensured onChangeComplete updates the actionWindowOpacity accordingly.

* feat(AihubmixAPIClient): add getBaseURL method to handle client base URL retrieval

* fix(migrate): restore upgradeChannel setting in migration logic

- Reintroduced the upgradeChannel setting to the state during the migration process, ensuring it defaults to LATEST when applicable.
- Adjusted the migration logic to maintain consistency in settings management.

---------

Co-authored-by: 自由的世界人 <3196812536@qq.com>
Co-authored-by: one <wangan.cs@gmail.com>
Co-authored-by: chenxue <DDU1222@users.noreply.github.com>
Co-authored-by: zhaochenxue <zhaochenxue@bixin.cn>
Co-authored-by: SuYao <sy20010504@gmail.com>
Co-authored-by: kangfenmao <kangfenmao@qq.com>
Co-authored-by: Teo <cheesen.xu@gmail.com>
Co-authored-by: Chen Tao <70054568+eeee0717@users.noreply.github.com>
Co-authored-by: LiuVaayne <10231735+vaayne@users.noreply.github.com>
Co-authored-by: fullex <106392080+0xfullex@users.noreply.github.com>
Co-authored-by: Wang Jiyuan <59059173+EurFelux@users.noreply.github.com>
Co-authored-by: 陈天寒 <silenceboychen@gmail.com>
Co-authored-by: fullex <0xfullex@gmail.com>
---
 packages/shared/IpcChannel.ts                 |  3 +-
 packages/shared/config/constant.ts            |  9 +-
 src/main/ipc.ts                               | 12 ++-
 src/main/services/AppUpdater.ts               | 94 ++++++++++++++++---
 src/main/services/ConfigManager.ts            | 21 +++--
 src/preload/index.ts                          |  5 +-
 src/renderer/src/hooks/useSettings.ts         | 10 +-
 src/renderer/src/i18n/locales/en-us.json      |  9 +-
 src/renderer/src/i18n/locales/ja-jp.json      |  9 +-
 src/renderer/src/i18n/locales/ru-ru.json      |  9 +-
 src/renderer/src/i18n/locales/zh-cn.json      |  9 +-
 src/renderer/src/i18n/locales/zh-tw.json      |  9 +-
 .../src/pages/settings/AboutSettings.tsx      | 82 +++++++++++++++-
 src/renderer/src/store/migrate.ts             |  4 +
 src/renderer/src/store/settings.ts            |  7 ++
 15 files changed, 254 insertions(+), 38 deletions(-)

diff --git a/packages/shared/IpcChannel.ts b/packages/shared/IpcChannel.ts
index b77fd5d430..8da9a67429 100644
--- a/packages/shared/IpcChannel.ts
+++ b/packages/shared/IpcChannel.ts
@@ -15,7 +15,8 @@ export enum IpcChannel {
   App_SetTrayOnClose = 'app:set-tray-on-close',
   App_SetTheme = 'app:set-theme',
   App_SetAutoUpdate = 'app:set-auto-update',
-  App_SetFeedUrl = 'app:set-feed-url',
+  App_SetEnableEarlyAccess = 'app:set-enable-early-access',
+  App_SetUpgradeChannel = 'app:set-upgrade-channel',
   App_HandleZoomFactor = 'app:handle-zoom-factor',
   App_Select = 'app:select',
   App_HasWritePermission = 'app:has-write-permission',
diff --git a/packages/shared/config/constant.ts b/packages/shared/config/constant.ts
index 0b568461ea..975767fefa 100644
--- a/packages/shared/config/constant.ts
+++ b/packages/shared/config/constant.ts
@@ -406,8 +406,15 @@ export const defaultLanguage = 'en-US'
 
 export enum FeedUrl {
   PRODUCTION = 'https://releases.cherry-ai.com',
-  EARLY_ACCESS = 'https://github.com/CherryHQ/cherry-studio/releases/latest/download'
+  GITHUB_LATEST = 'https://github.com/CherryHQ/cherry-studio/releases/latest/download'
 }
+
+export enum UpgradeChannel {
+  LATEST = 'latest', // 最新稳定版本
+  RC = 'rc', // 公测版本
+  BETA = 'beta' // 预览版本
+}
+
 export const defaultTimeout = 5 * 1000 * 60
 
 export const occupiedDirs = ['logs', 'Network', 'Partitions/webview/Network']
diff --git a/src/main/ipc.ts b/src/main/ipc.ts
index 8d8690a54e..b2003f8db8 100644
--- a/src/main/ipc.ts
+++ b/src/main/ipc.ts
@@ -5,7 +5,7 @@ import path from 'node:path'
 import { isMac, isWin } from '@main/constant'
 import { getBinaryPath, isBinaryExists, runInstallScript } from '@main/utils/process'
 import { handleZoomFactor } from '@main/utils/zoom'
-import { FeedUrl } from '@shared/config/constant'
+import { UpgradeChannel } from '@shared/config/constant'
 import { IpcChannel } from '@shared/IpcChannel'
 import { Shortcut, ThemeMode } from '@types'
 import { BrowserWindow, dialog, ipcMain, session, shell } from 'electron'
@@ -141,8 +141,14 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     configManager.setAutoUpdate(isActive)
   })
 
-  ipcMain.handle(IpcChannel.App_SetFeedUrl, (_, feedUrl: FeedUrl) => {
-    appUpdater.setFeedUrl(feedUrl)
+  ipcMain.handle(IpcChannel.App_SetEnableEarlyAccess, async (_, isActive: boolean) => {
+    appUpdater.cancelDownload()
+    configManager.setEnableEarlyAccess(isActive)
+  })
+
+  ipcMain.handle(IpcChannel.App_SetUpgradeChannel, async (_, channel: UpgradeChannel) => {
+    appUpdater.cancelDownload()
+    configManager.setUpgradeChannel(channel)
   })
 
   ipcMain.handle(IpcChannel.Config_Set, (_, key: string, value: any, isNotify: boolean = false) => {
diff --git a/src/main/services/AppUpdater.ts b/src/main/services/AppUpdater.ts
index 4c71a05556..e26a779d59 100644
--- a/src/main/services/AppUpdater.ts
+++ b/src/main/services/AppUpdater.ts
@@ -1,8 +1,8 @@
 import { isWin } from '@main/constant'
 import { locales } from '@main/utils/locales'
-import { FeedUrl } from '@shared/config/constant'
+import { FeedUrl, UpgradeChannel } from '@shared/config/constant'
 import { IpcChannel } from '@shared/IpcChannel'
-import { UpdateInfo } from 'builder-util-runtime'
+import { CancellationToken, UpdateInfo } from 'builder-util-runtime'
 import { app, BrowserWindow, dialog } from 'electron'
 import logger from 'electron-log'
 import { AppUpdater as _AppUpdater, autoUpdater, NsisUpdater } from 'electron-updater'
@@ -14,6 +14,7 @@ import { configManager } from './ConfigManager'
 export default class AppUpdater {
   autoUpdater: _AppUpdater = autoUpdater
   private releaseInfo: UpdateInfo | undefined
+  private cancellationToken: CancellationToken = new CancellationToken()
 
   constructor(mainWindow: BrowserWindow) {
     logger.transports.file.level = 'info'
@@ -22,9 +23,7 @@ export default class AppUpdater {
     autoUpdater.forceDevUpdateConfig = !app.isPackaged
     autoUpdater.autoDownload = configManager.getAutoUpdate()
     autoUpdater.autoInstallOnAppQuit = configManager.getAutoUpdate()
-    autoUpdater.setFeedURL(configManager.getFeedUrl())
 
-    // 检测下载错误
     autoUpdater.on('error', (error) => {
       // 简单记录错误信息和时间戳
       logger.error('更新异常', {
@@ -64,6 +63,33 @@ export default class AppUpdater {
     this.autoUpdater = autoUpdater
   }
 
+  private async _getPreReleaseVersionFromGithub(channel: UpgradeChannel) {
+    try {
+      const responses = await fetch('https://api.github.com/repos/CherryHQ/cherry-studio/releases?per_page=8', {
+        headers: {
+          Accept: 'application/vnd.github+json',
+          'X-GitHub-Api-Version': '2022-11-28',
+          'Accept-Language': 'en-US,en;q=0.9'
+        }
+      })
+      const data = (await responses.json()) as GithubReleaseInfo[]
+      logger.debug('github release data', data)
+      const release: GithubReleaseInfo | undefined = data.find((item: GithubReleaseInfo) => {
+        return item.prerelease && item.tag_name.includes(`-${channel}.`)
+      })
+
+      if (!release) {
+        return null
+      }
+
+      logger.info('release info', release.tag_name)
+      return `https://github.com/CherryHQ/cherry-studio/releases/download/${release.tag_name}`
+    } catch (error) {
+      logger.error('Failed to get latest not draft version from github:', error)
+      return null
+    }
+  }
+
   private async _getIpCountry() {
     try {
       // add timeout using AbortController
@@ -93,9 +119,44 @@ export default class AppUpdater {
     autoUpdater.autoInstallOnAppQuit = isActive
   }
 
-  public setFeedUrl(feedUrl: FeedUrl) {
-    autoUpdater.setFeedURL(feedUrl)
-    configManager.setFeedUrl(feedUrl)
+  private async _setFeedUrl() {
+    // disable downgrade and differential download
+    // github and gitcode don't support multiple range download
+    this.autoUpdater.allowDowngrade = false
+    this.autoUpdater.disableDifferentialDownload = true
+
+    if (configManager.getEnableEarlyAccess()) {
+      const channel = configManager.getUpgradeChannel()
+      if (channel === UpgradeChannel.LATEST) {
+        this.autoUpdater.setFeedURL(FeedUrl.GITHUB_LATEST)
+        this.autoUpdater.channel = UpgradeChannel.LATEST
+        return true
+      }
+
+      const preReleaseUrl = await this._getPreReleaseVersionFromGithub(channel)
+      if (preReleaseUrl) {
+        this.autoUpdater.setFeedURL(preReleaseUrl)
+        this.autoUpdater.channel = channel
+        return true
+      }
+      return false
+    }
+
+    // no early access, use latest version
+    this.autoUpdater.channel = 'latest'
+    this.autoUpdater.setFeedURL(FeedUrl.PRODUCTION)
+
+    const ipCountry = await this._getIpCountry()
+    logger.info('ipCountry', ipCountry)
+    if (ipCountry.toLowerCase() !== 'cn') {
+      this.autoUpdater.setFeedURL(FeedUrl.GITHUB_LATEST)
+    }
+    return true
+  }
+
+  public cancelDownload() {
+    this.cancellationToken.cancel()
+    this.cancellationToken = new CancellationToken()
   }
 
   public async checkForUpdates() {
@@ -106,10 +167,12 @@ export default class AppUpdater {
       }
     }
 
-    const ipCountry = await this._getIpCountry()
-    logger.info('ipCountry', ipCountry)
-    if (ipCountry !== 'CN') {
-      this.autoUpdater.setFeedURL(FeedUrl.EARLY_ACCESS)
+    const isSetFeedUrl = await this._setFeedUrl()
+    if (!isSetFeedUrl) {
+      return {
+        currentVersion: app.getVersion(),
+        updateInfo: null
+      }
     }
 
     try {
@@ -117,7 +180,8 @@ export default class AppUpdater {
       if (update?.isUpdateAvailable && !this.autoUpdater.autoDownload) {
         // 如果 autoDownload 为 false，则需要再调用下面的函数触发下
         // do not use await, because it will block the return of this function
-        this.autoUpdater.downloadUpdate()
+        logger.info('downloadUpdate manual by check for updates', this.cancellationToken)
+        this.autoUpdater.downloadUpdate(this.cancellationToken)
       }
 
       return {
@@ -178,7 +242,11 @@ export default class AppUpdater {
     return releaseNotes.map((note) => note.note).join('\n')
   }
 }
-
+interface GithubReleaseInfo {
+  draft: boolean
+  prerelease: boolean
+  tag_name: string
+}
 interface ReleaseNoteInfo {
   readonly version: string
   readonly note: string | null
diff --git a/src/main/services/ConfigManager.ts b/src/main/services/ConfigManager.ts
index 573674bd70..6d33b6e3dd 100644
--- a/src/main/services/ConfigManager.ts
+++ b/src/main/services/ConfigManager.ts
@@ -1,4 +1,4 @@
-import { defaultLanguage, FeedUrl, ZOOM_SHORTCUTS } from '@shared/config/constant'
+import { defaultLanguage, UpgradeChannel, ZOOM_SHORTCUTS } from '@shared/config/constant'
 import { LanguageVarious, Shortcut, ThemeMode } from '@types'
 import { app } from 'electron'
 import Store from 'electron-store'
@@ -16,7 +16,8 @@ export enum ConfigKeys {
   ClickTrayToShowQuickAssistant = 'clickTrayToShowQuickAssistant',
   EnableQuickAssistant = 'enableQuickAssistant',
   AutoUpdate = 'autoUpdate',
-  FeedUrl = 'feedUrl',
+  EnableEarlyAccess = 'enableEarlyAccess',
+  UpgradeChannel = 'upgradeChannel',
   EnableDataCollection = 'enableDataCollection',
   SelectionAssistantEnabled = 'selectionAssistantEnabled',
   SelectionAssistantTriggerMode = 'selectionAssistantTriggerMode',
@@ -142,12 +143,20 @@ export class ConfigManager {
     this.set(ConfigKeys.AutoUpdate, value)
   }
 
-  getFeedUrl(): string {
-    return this.get<string>(ConfigKeys.FeedUrl, FeedUrl.PRODUCTION)
+  getEnableEarlyAccess(): boolean {
+    return this.get<boolean>(ConfigKeys.EnableEarlyAccess, false)
   }
 
-  setFeedUrl(value: FeedUrl) {
-    this.set(ConfigKeys.FeedUrl, value)
+  setEnableEarlyAccess(value: boolean) {
+    this.set(ConfigKeys.EnableEarlyAccess, value)
+  }
+
+  getUpgradeChannel(): UpgradeChannel {
+    return this.get<UpgradeChannel>(ConfigKeys.UpgradeChannel, UpgradeChannel.LATEST)
+  }
+
+  setUpgradeChannel(value: UpgradeChannel) {
+    this.set(ConfigKeys.UpgradeChannel, value)
   }
 
   getEnableDataCollection(): boolean {
diff --git a/src/preload/index.ts b/src/preload/index.ts
index 3e9ae532b2..ed2a2042e0 100644
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -1,6 +1,6 @@
 import type { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
 import { electronAPI } from '@electron-toolkit/preload'
-import { FeedUrl } from '@shared/config/constant'
+import { UpgradeChannel } from '@shared/config/constant'
 import { IpcChannel } from '@shared/IpcChannel'
 import { FileType, KnowledgeBaseParams, KnowledgeItem, MCPServer, Shortcut, ThemeMode, WebDavConfig } from '@types'
 import { contextBridge, ipcRenderer, OpenDialogOptions, shell, webUtils } from 'electron'
@@ -23,7 +23,8 @@ const api = {
   setLaunchToTray: (isActive: boolean) => ipcRenderer.invoke(IpcChannel.App_SetLaunchToTray, isActive),
   setTray: (isActive: boolean) => ipcRenderer.invoke(IpcChannel.App_SetTray, isActive),
   setTrayOnClose: (isActive: boolean) => ipcRenderer.invoke(IpcChannel.App_SetTrayOnClose, isActive),
-  setFeedUrl: (feedUrl: FeedUrl) => ipcRenderer.invoke(IpcChannel.App_SetFeedUrl, feedUrl),
+  setEnableEarlyAccess: (isActive: boolean) => ipcRenderer.invoke(IpcChannel.App_SetEnableEarlyAccess, isActive),
+  setUpgradeChannel: (channel: UpgradeChannel) => ipcRenderer.invoke(IpcChannel.App_SetUpgradeChannel, channel),
   setTheme: (theme: ThemeMode) => ipcRenderer.invoke(IpcChannel.App_SetTheme, theme),
   handleZoomFactor: (delta: number, reset: boolean = false) =>
     ipcRenderer.invoke(IpcChannel.App_HandleZoomFactor, delta, reset),
diff --git a/src/renderer/src/hooks/useSettings.ts b/src/renderer/src/hooks/useSettings.ts
index 10f9ee9001..72560706e6 100644
--- a/src/renderer/src/hooks/useSettings.ts
+++ b/src/renderer/src/hooks/useSettings.ts
@@ -17,10 +17,11 @@ import {
   setTopicPosition,
   setTray as _setTray,
   setTrayOnClose,
+  setUpgradeChannel as _setUpgradeChannel,
   setWindowStyle
 } from '@renderer/store/settings'
 import { SidebarIcon, ThemeMode, TranslateLanguageVarious } from '@renderer/types'
-import { FeedUrl } from '@shared/config/constant'
+import { UpgradeChannel } from '@shared/config/constant'
 
 export function useSettings() {
   const settings = useAppSelector((state) => state.settings)
@@ -62,7 +63,12 @@ export function useSettings() {
 
     setEarlyAccess(isEarlyAccess: boolean) {
       dispatch(_setEarlyAccess(isEarlyAccess))
-      window.api.setFeedUrl(isEarlyAccess ? FeedUrl.EARLY_ACCESS : FeedUrl.PRODUCTION)
+      window.api.setEnableEarlyAccess(isEarlyAccess)
+    },
+
+    setUpgradeChannel(channel: UpgradeChannel) {
+      dispatch(_setUpgradeChannel(channel))
+      window.api.setUpgradeChannel(channel)
     },
 
     setTheme(theme: ThemeMode) {
diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index 303899f2e8..b58056ae92 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -1385,7 +1385,14 @@
       "general.image_upload": "Image Upload",
       "general.auto_check_update.title": "Auto Update",
       "general.early_access.title": "Early Access",
-      "general.early_access.tooltip": "Enable to use the latest version from GitHub, which may be slower. Please backup your data in advance.",
+      "general.early_access.tooltip": "Updating to test versions cannot be downgraded, there is a risk of data loss, please backup your data in advance",
+      "general.early_access.beta_version": "Beta Version",
+      "general.early_access.rc_version": "RC Version",
+      "general.early_access.latest_version": "Latest Version",
+      "general.early_access.latest_version_tooltip": "github latest version, latest stable version",
+      "general.early_access.version_options": "Version Options",
+      "general.early_access.rc_version_tooltip": "More stable, please backup your data",
+      "general.early_access.beta_version_tooltip": "Latest features but unstable, use with caution",
       "general.reset.button": "Reset",
       "general.reset.title": "Data Reset",
       "general.restore.button": "Restore",
diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json
index bd20c61ead..64f6a98475 100644
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@@ -1830,7 +1830,14 @@
       },
       "general.auto_check_update.title": "自動更新",
       "general.early_access.title": "早期アクセス",
-      "general.early_access.tooltip": "有効にすると、GitHub の最新バージョンを使用します。ダウンロード速度が遅く、不安定な場合があります。データを事前にバックアップしてください。",
+      "general.early_access.tooltip": "更新すると、データが失われる可能性があります。データを事前にバックアップしてください。",
+      "general.early_access.beta_version": "ベータ版",
+      "general.early_access.rc_version": "RC版",
+      "general.early_access.latest_version": "最新版",
+      "general.early_access.latest_version_tooltip": "github latest バージョン, 最新安定版",
+      "general.early_access.version_options": "バージョンオプション",
+      "general.early_access.rc_version_tooltip": "より安定しています。データを事前にバックアップしてください。",
+      "general.early_access.beta_version_tooltip": "最新の機能ですが、不安定な場合があります。使用には注意してください。",
       "quickPhrase": {
         "title": "クイックフレーズ",
         "add": "フレーズを追加",
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index fcd5487b92..e027e7270d 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -1830,7 +1830,14 @@
       },
       "general.auto_check_update.title": "Автоматическое обновление",
       "general.early_access.title": "Ранний доступ",
-      "general.early_access.tooltip": "Включить для использования последней версии из GitHub, что может быть медленнее и нестабильно. Пожалуйста, сделайте резервную копию данных заранее.",
+      "general.early_access.tooltip": "Обновление до тестовых версий не может быть откачено, существует риск потери данных, пожалуйста, сделайте резервную копию данных заранее",
+      "general.early_access.beta_version": "Бета версия",
+      "general.early_access.rc_version": "RC версия",
+      "general.early_access.latest_version": "Стабильная версия",
+      "general.early_access.latest_version_tooltip": "github latest версия, стабильная версия",
+      "general.early_access.version_options": "Варианты версии",
+      "general.early_access.rc_version_tooltip": "Более стабильно, пожалуйста, сделайте резервную копию данных заранее",
+      "general.early_access.beta_version_tooltip": "Самые последние функции, но нестабильно, используйте с осторожностью",
       "quickPhrase": {
         "title": "Быстрые фразы",
         "add": "Добавить фразу",
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index 9bc4201f71..894d53c2be 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -1385,7 +1385,14 @@
       "general.image_upload": "图片上传",
       "general.auto_check_update.title": "自动更新",
       "general.early_access.title": "抢先体验",
-      "general.early_access.tooltip": "开启后，将使用 GitHub 的最新版本，下载速度可能较慢，请务必提前备份数据",
+      "general.early_access.tooltip": "更新到测试版本不能降级，有数据丢失风险，请务必提前备份数据",
+      "general.early_access.beta_version": "预览版本",
+      "general.early_access.rc_version": "公测版本",
+      "general.early_access.latest_version": "稳定版本",
+      "general.early_access.version_options": "版本选择",
+      "general.early_access.rc_version_tooltip": "相对稳定，请备份数据",
+      "general.early_access.beta_version_tooltip": "功能最新但不稳定，谨慎使用",
+      "general.early_access.latest_version_tooltip": "github latest 版本, 最新稳定版本",
       "general.reset.button": "重置",
       "general.reset.title": "重置数据",
       "general.restore.button": "恢复",
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index e99c57e170..65a3a3f58c 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -1833,7 +1833,14 @@
       },
       "general.auto_check_update.title": "自動更新",
       "general.early_access.title": "搶先體驗",
-      "general.early_access.tooltip": "開啟後，將使用 GitHub 的最新版本，下載速度可能較慢，請務必提前備份數據",
+      "general.early_access.tooltip": "更新到測試版本不能降級，有數據丟失風險，請務必提前備份數據",
+      "general.early_access.beta_version": "預覽版本",
+      "general.early_access.rc_version": "公測版本",
+      "general.early_access.latest_version": "穩定版本",
+      "general.early_access.latest_version_tooltip": "github latest 版本, 最新穩定版本",
+      "general.early_access.version_options": "版本選項",
+      "general.early_access.rc_version_tooltip": "相對穩定，請務必提前備份數據",
+      "general.early_access.beta_version_tooltip": "功能最新但不穩定，謹慎使用",
       "quickPhrase": {
         "title": "快捷短語",
         "add": "新增短語",
diff --git a/src/renderer/src/pages/settings/AboutSettings.tsx b/src/renderer/src/pages/settings/AboutSettings.tsx
index 82f11ec7d4..9bf65e4489 100644
--- a/src/renderer/src/pages/settings/AboutSettings.tsx
+++ b/src/renderer/src/pages/settings/AboutSettings.tsx
@@ -10,7 +10,8 @@ import { useAppDispatch } from '@renderer/store'
 import { setUpdateState } from '@renderer/store/runtime'
 import { ThemeMode } from '@renderer/types'
 import { compareVersions, runAsyncFunction } from '@renderer/utils'
-import { Avatar, Button, Progress, Row, Switch, Tag, Tooltip } from 'antd'
+import { UpgradeChannel } from '@shared/config/constant'
+import { Avatar, Button, Progress, Radio, Row, Switch, Tag, Tooltip } from 'antd'
 import { debounce } from 'lodash'
 import { Bug, FileCheck, Github, Globe, Mail, Rss } from 'lucide-react'
 import { FC, useEffect, useState } from 'react'
@@ -25,7 +26,8 @@ const AboutSettings: FC = () => {
   const [version, setVersion] = useState('')
   const [isPortable, setIsPortable] = useState(false)
   const { t } = useTranslation()
-  const { autoCheckUpdate, setAutoCheckUpdate, earlyAccess, setEarlyAccess } = useSettings()
+  const { autoCheckUpdate, setAutoCheckUpdate, earlyAccess, setEarlyAccess, upgradeChannel, setUpgradeChannel } =
+    useSettings()
   const { theme } = useTheme()
   const dispatch = useAppDispatch()
   const { update } = useRuntime()
@@ -95,15 +97,65 @@ const AboutSettings: FC = () => {
 
   const hasNewVersion = update?.info?.version && version ? compareVersions(update.info.version, version) > 0 : false
 
+  const handleUpgradeChannelChange = async (value: UpgradeChannel) => {
+    setUpgradeChannel(value)
+    // Clear update info when switching upgrade channel
+    dispatch(
+      setUpdateState({
+        available: false,
+        info: null,
+        downloaded: false,
+        checking: false,
+        downloading: false,
+        downloadProgress: 0
+      })
+    )
+  }
+
+  // Get available test version options based on current version
+  const getAvailableTestChannels = () => {
+    return [
+      {
+        tooltip: t('settings.general.early_access.latest_version_tooltip'),
+        label: t('settings.general.early_access.latest_version'),
+        value: UpgradeChannel.LATEST
+      },
+      {
+        tooltip: t('settings.general.early_access.rc_version_tooltip'),
+        label: t('settings.general.early_access.rc_version'),
+        value: UpgradeChannel.RC
+      },
+      {
+        tooltip: t('settings.general.early_access.beta_version_tooltip'),
+        label: t('settings.general.early_access.beta_version'),
+        value: UpgradeChannel.BETA
+      }
+    ]
+  }
+
+  const handlerSetEarlyAccess = (value: boolean) => {
+    setEarlyAccess(value)
+    dispatch(
+      setUpdateState({
+        available: false,
+        info: null,
+        downloaded: false,
+        checking: false,
+        downloading: false,
+        downloadProgress: 0
+      })
+    )
+    if (value === false) setUpgradeChannel(UpgradeChannel.LATEST)
+  }
+
   useEffect(() => {
     runAsyncFunction(async () => {
       const appInfo = await window.api.getAppInfo()
       setVersion(appInfo.version)
       setIsPortable(appInfo.isPortable)
     })
-    setEarlyAccess(earlyAccess)
     setAutoCheckUpdate(autoCheckUpdate)
-  }, [autoCheckUpdate, earlyAccess, setAutoCheckUpdate, setEarlyAccess])
+  }, [autoCheckUpdate, setAutoCheckUpdate, setEarlyAccess])
 
   return (
     <SettingContainer theme={theme}>
@@ -167,9 +219,29 @@ const AboutSettings: FC = () => {
             <SettingRow>
               <SettingRowTitle>{t('settings.general.early_access.title')}</SettingRowTitle>
               <Tooltip title={t('settings.general.early_access.tooltip')} trigger={['hover', 'focus']}>
-                <Switch value={earlyAccess} onChange={(v) => setEarlyAccess(v)} />
+                <Switch value={earlyAccess} onChange={(v) => handlerSetEarlyAccess(v)} />
               </Tooltip>
             </SettingRow>
+            {earlyAccess && getAvailableTestChannels().length > 0 && (
+              <>
+                <SettingDivider />
+                <SettingRow>
+                  <SettingRowTitle>{t('settings.general.early_access.version_options')}</SettingRowTitle>
+                  <Radio.Group
+                    size="small"
+                    buttonStyle="solid"
+                    defaultValue={UpgradeChannel.LATEST}
+                    value={upgradeChannel}
+                    onChange={(e) => handleUpgradeChannelChange(e.target.value)}>
+                    {getAvailableTestChannels().map((option) => (
+                      <Tooltip key={option.value} title={option.tooltip}>
+                        <Radio.Button value={option.value}>{option.label}</Radio.Button>
+                      </Tooltip>
+                    ))}
+                  </Radio.Group>
+                </SettingRow>
+              </>
+            )}
           </>
         )}
       </SettingGroup>
diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts
index df89be66b8..0e9385de0c 100644
--- a/src/renderer/src/store/migrate.ts
+++ b/src/renderer/src/store/migrate.ts
@@ -7,6 +7,7 @@ import db from '@renderer/databases'
 import i18n from '@renderer/i18n'
 import { Assistant, Provider, WebSearchProvider } from '@renderer/types'
 import { getDefaultGroupName, getLeadingEmoji, runAsyncFunction, uuid } from '@renderer/utils'
+import { UpgradeChannel } from '@shared/config/constant'
 import { isEmpty } from 'lodash'
 import { createMigrate } from 'redux-persist'
 
@@ -1627,6 +1628,9 @@ const migrateConfig = {
           }
         }
       })
+      if (state.settings) {
+        state.settings.upgradeChannel = UpgradeChannel.LATEST
+      }
       return state
     } catch (error) {
       return state
diff --git a/src/renderer/src/store/settings.ts b/src/renderer/src/store/settings.ts
index d4014adf25..ee991556f7 100644
--- a/src/renderer/src/store/settings.ts
+++ b/src/renderer/src/store/settings.ts
@@ -11,6 +11,7 @@ import {
   ThemeMode,
   TranslateLanguageVarious
 } from '@renderer/types'
+import { UpgradeChannel } from '@shared/config/constant'
 
 import { WebDAVSyncState } from './backup'
 
@@ -68,6 +69,7 @@ export interface SettingsState {
   clickAssistantToShowTopic: boolean
   autoCheckUpdate: boolean
   earlyAccess: boolean
+  upgradeChannel: UpgradeChannel
   renderInputMessageAsMarkdown: boolean
   // 代码执行
   codeExecution: {
@@ -221,6 +223,7 @@ export const initialState: SettingsState = {
   clickAssistantToShowTopic: true,
   autoCheckUpdate: true,
   earlyAccess: false,
+  upgradeChannel: UpgradeChannel.LATEST,
   renderInputMessageAsMarkdown: false,
   codeExecution: {
     enabled: false,
@@ -429,6 +432,9 @@ const settingsSlice = createSlice({
     setEarlyAccess: (state, action: PayloadAction<boolean>) => {
       state.earlyAccess = action.payload
     },
+    setUpgradeChannel: (state, action: PayloadAction<UpgradeChannel>) => {
+      state.upgradeChannel = action.payload
+    },
     setRenderInputMessageAsMarkdown: (state, action: PayloadAction<boolean>) => {
       state.renderInputMessageAsMarkdown = action.payload
     },
@@ -725,6 +731,7 @@ export const {
   setPasteLongTextAsFile,
   setAutoCheckUpdate,
   setEarlyAccess,
+  setUpgradeChannel,
   setRenderInputMessageAsMarkdown,
   setClickAssistantToShowTopic,
   setSkipBackupFile,

From 8723bbeaf8a21a65688787a5f643a4d181244e55 Mon Sep 17 00:00:00 2001
From: one <wangan.cs@gmail.com>
Date: Thu, 26 Jun 2025 15:52:58 +0800
Subject: [PATCH 48/75] fix(Markdown): falsely early return for display
 `\[\n...\n\]` (#7565)

---
 .../src/utils/__tests__/markdown.test.ts      | 32 +++++++++++++++++--
 src/renderer/src/utils/markdown.ts            |  4 +--
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/utils/__tests__/markdown.test.ts b/src/renderer/src/utils/__tests__/markdown.test.ts
index 4f48deba0c..f16509ced4 100644
--- a/src/renderer/src/utils/__tests__/markdown.test.ts
+++ b/src/renderer/src/utils/__tests__/markdown.test.ts
@@ -465,10 +465,28 @@ describe('markdown', () => {
 
   describe('processLatexBrackets', () => {
     describe('basic LaTeX conversion', () => {
-      it('should convert display math \\[...\\] to $$...$$', () => {
+      it('should convert (inline) display math \\[...\\] to $$...$$', () => {
         expect(processLatexBrackets('The formula is \\[a+b=c\\]')).toBe('The formula is $$a+b=c$$')
       })
 
+      it('should convert display math \\[...\\] to $$...$$', () => {
+        const input = `
+The formula is
+
+\\[
+a+b=c
+\\]
+`
+        const expected = `
+The formula is
+
+$$
+a+b=c
+$$
+`
+        expect(processLatexBrackets(input)).toBe(expected)
+      })
+
       it('should convert inline math \\(...\\) to $...$', () => {
         expect(processLatexBrackets('The formula is \\(a+b=c\\)')).toBe('The formula is $a+b=c$')
       })
@@ -611,9 +629,13 @@ const func = \\(x\\) => x * 2;
 
 Read more in [Section \\[3.2\\]: Advanced Topics](url) and see inline code \`\\[array\\]\`.
 
-Final thoughts on \\(\\nabla \\cdot \\vec{F} = \\rho\\) and display math:
+Final thoughts on \\(\\nabla \\cdot \\vec{F} = \\rho\\) in inline math and display math:
 
 \\[\\int_0^\\infty e^{-x^2} dx = \\frac{\\sqrt{\\pi}}{2}\\]
+
+\\[
+\\int_0^\\infty e^{-x^2} dx = \\frac{\\sqrt{\\pi}}{2}
+\\]
 `
 
         const expectedOutput = `
@@ -647,9 +669,13 @@ const func = \\(x\\) => x * 2;
 
 Read more in [Section \\[3.2\\]: Advanced Topics](url) and see inline code \`\\[array\\]\`.
 
-Final thoughts on $\\nabla \\cdot \\vec{F} = \\rho$ and display math:
+Final thoughts on $\\nabla \\cdot \\vec{F} = \\rho$ in inline math and display math:
 
 $$\\int_0^\\infty e^{-x^2} dx = \\frac{\\sqrt{\\pi}}{2}$$
+
+$$
+\\int_0^\\infty e^{-x^2} dx = \\frac{\\sqrt{\\pi}}{2}
+$$
 `
 
         expect(processLatexBrackets(complexInput)).toBe(expectedOutput)
diff --git a/src/renderer/src/utils/markdown.ts b/src/renderer/src/utils/markdown.ts
index 57025ca633..4fc499300d 100644
--- a/src/renderer/src/utils/markdown.ts
+++ b/src/renderer/src/utils/markdown.ts
@@ -1,5 +1,5 @@
 import { languages } from '@shared/config/languages'
-import balanced from 'balanced-match'
+import { default as balanced } from 'balanced-match'
 import remarkParse from 'remark-parse'
 import remarkStringify from 'remark-stringify'
 import removeMarkdown from 'remove-markdown'
@@ -31,7 +31,7 @@ export const findCitationInChildren = (children: any): string => {
 }
 
 // 检查是否包含潜在的 LaTeX 模式
-const containsLatexRegex = /\\\(.*?\\\)|\\\[.*?\\\]|\$.*?\$|\\begin\{equation\}.*?\\end\{equation\}/
+const containsLatexRegex = /\\\(.*?\\\)|\\\[.*?\\\]|\$.*?\$|\\begin\{equation\}.*?\\end\{equation\}/s
 
 /**
  * 转换 LaTeX 公式括号 `\[\]` 和 `\(\)` 为 Markdown 格式 `$$...$$` 和 `$...$`

From 0160655dbaa7722f1bb2c3f030bd04062a3bf1d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=A2=E5=A5=8B=E7=8C=AB?= <kangfenmao@qq.com>
Date: Thu, 26 Jun 2025 16:48:56 +0800
Subject: [PATCH 49/75] =?UTF-8?q?feat(FileStorage):=20enhance=20open=20dia?=
 =?UTF-8?q?log=20to=20handle=20large=20files=20by=20retur=E2=80=A6=20(#756?=
 =?UTF-8?q?8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat(FileStorage): enhance open dialog to handle large files by returning size without reading content

- Updated the open method to return file size for files larger than 2GB without reading their content.
- Modified return type to include an optional content field and size property for better file handling.

修复恢复备份的时候选择超过 2GB 文件报错的问题
---
 src/main/services/FileStorage.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/services/FileStorage.ts b/src/main/services/FileStorage.ts
index 437f25f78c..2d8810adca 100644
--- a/src/main/services/FileStorage.ts
+++ b/src/main/services/FileStorage.ts
@@ -363,7 +363,7 @@ class FileStorage {
   public open = async (
     _: Electron.IpcMainInvokeEvent,
     options: OpenDialogOptions
-  ): Promise<{ fileName: string; filePath: string; content: Buffer } | null> => {
+  ): Promise<{ fileName: string; filePath: string; content?: Buffer; size: number } | null> => {
     try {
       const result: OpenDialogReturnValue = await dialog.showOpenDialog({
         title: '打开文件',
@@ -375,8 +375,16 @@ class FileStorage {
       if (!result.canceled && result.filePaths.length > 0) {
         const filePath = result.filePaths[0]
         const fileName = filePath.split('/').pop() || ''
-        const content = await readFile(filePath)
-        return { fileName, filePath, content }
+        const stats = await fs.promises.stat(filePath)
+
+        // If the file is less than 2GB, read the content
+        if (stats.size < 2 * 1024 * 1024 * 1024) {
+          const content = await readFile(filePath)
+          return { fileName, filePath, content, size: stats.size }
+        }
+
+        // For large files, only return file information, do not read content
+        return { fileName, filePath, size: stats.size }
       }
 
       return null

From f5165e12f1861e849ce9ec278765a83b7b1c9a1d Mon Sep 17 00:00:00 2001
From: Teo <cheesen.xu@gmail.com>
Date: Thu, 26 Jun 2025 17:05:48 +0800
Subject: [PATCH 50/75] fix(Messages): Fix single model response style issue
 (#7560)

* fix(Messages): update multiModelMessageStyle condition to check message count

* style(Messages): update styles for MultiSelectionPopup and MessageGroup components
---
 .../components/Popups/MultiSelectionPopup.tsx |  2 +-
 .../src/pages/home/Messages/MessageGroup.tsx  | 25 ++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/renderer/src/components/Popups/MultiSelectionPopup.tsx b/src/renderer/src/components/Popups/MultiSelectionPopup.tsx
index f277fbe3a8..31c9877eca 100644
--- a/src/renderer/src/components/Popups/MultiSelectionPopup.tsx
+++ b/src/renderer/src/components/Popups/MultiSelectionPopup.tsx
@@ -90,7 +90,7 @@ const ActionBar = styled.div`
   background-color: var(--color-background);
   padding: 4px 4px;
   border-radius: 99px;
-  box-shadow: 0 0px 5px 0px rgb(128 128 128 / 30%);
+  box-shadow: 0px 2px 8px 0px rgb(128 128 128 / 20%);
   border: 0.5px solid var(--color-border);
   gap: 16px;
 `
diff --git a/src/renderer/src/pages/home/Messages/MessageGroup.tsx b/src/renderer/src/pages/home/Messages/MessageGroup.tsx
index 995540a6cf..9d0fb1c6f8 100644
--- a/src/renderer/src/pages/home/Messages/MessageGroup.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageGroup.tsx
@@ -173,7 +173,7 @@ const MessageGroup = ({ messages, topic, registerMessageElement }: Props) => {
           key={message.id}
           className={classNames([
             {
-              [multiModelMessageStyle]: message.role === 'assistant',
+              [multiModelMessageStyle]: message.role === 'assistant' && messages.length > 1,
               selected: message.id === selectedMessageId
             }
           ])}>
@@ -191,7 +191,7 @@ const MessageGroup = ({ messages, topic, registerMessageElement }: Props) => {
                 className={classNames([
                   'in-popover',
                   {
-                    [multiModelMessageStyle]: message.role === 'assistant',
+                    [multiModelMessageStyle]: message.role === 'assistant' && messages.length > 1,
                     selected: message.id === selectedMessageId
                   }
                 ])}>
@@ -210,7 +210,7 @@ const MessageGroup = ({ messages, topic, registerMessageElement }: Props) => {
 
       return messageContent
     },
-    [isGrid, isGrouped, topic, multiModelMessageStyle, selectedMessageId, gridPopoverTrigger]
+    [isGrid, isGrouped, topic, multiModelMessageStyle, messages.length, selectedMessageId, gridPopoverTrigger]
   )
 
   return (
@@ -284,6 +284,9 @@ const GridContainer = styled(Scrollbar)<{ $count: number; $gridColumns: number }
   &.multi-select-mode {
     grid-template-columns: repeat(1, minmax(0, 1fr));
     gap: 10px;
+    .grid {
+      height: auto;
+    }
     .message {
       border: 0.5px solid var(--color-border);
       border-radius: 10px;
@@ -307,10 +310,12 @@ const MessageWrapper = styled.div<MessageWrapperProps>`
   &.horizontal {
     overflow-y: auto;
     .message {
+      height: 100%;
       border: 0.5px solid var(--color-border);
       border-radius: 10px;
     }
     .message-content-container {
+      flex: 1;
       padding-left: 0;
       max-height: calc(100vh - 350px);
       overflow-y: auto !important;
@@ -328,6 +333,20 @@ const MessageWrapper = styled.div<MessageWrapperProps>`
     border: 0.5px solid var(--color-border);
     border-radius: 10px;
     cursor: pointer;
+    .message {
+      height: 100%;
+    }
+    .message-content-container {
+      overflow: hidden;
+      padding-left: 0;
+      flex: 1;
+      pointer-events: none;
+    }
+    .MessageFooter {
+      margin-left: 0;
+      margin-top: 2px;
+      margin-bottom: 2px;
+    }
   }
   &.in-popover {
     height: auto;

From 46de46965fd85b4c942b0d703efac4c3eb748d8a Mon Sep 17 00:00:00 2001
From: kangfenmao <kangfenmao@qq.com>
Date: Thu, 26 Jun 2025 18:19:27 +0800
Subject: [PATCH 51/75] chore(version): 1.4.6

---
 electron-builder.yml | 13 +++++++------
 package.json         |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/electron-builder.yml b/electron-builder.yml
index 0da2d7f5fe..d1a70bf896 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -107,9 +107,10 @@ afterSign: scripts/notarize.js
 artifactBuildCompleted: scripts/artifact-build-completed.js
 releaseInfo:
   releaseNotes: |
-    - 新功能：可选数据保存目录
-    - 快捷助手：支持单独选择助手，支持暂停、上下文、思考过程、流式
-    - 划词助手：系统托盘菜单开关
-    - 翻译：新增 Markdown 预览选项
-    - 新供应商：新增 Vertex AI 服务商
-    - 错误修复和界面优化
+    界面优化：优化多处界面样式，气泡样式改版，自动调整代码预览边栏宽度
+    知识库：修复知识库引用不显示问题，修复部分嵌入模型适配问题
+    备份与恢复：修复超过 2GB 大文件无法恢复问题
+    文件处理：添加 .doc 文件支持
+    划词助手：支持自定义 CSS 样式
+    MCP：基于 Pyodide 实现 Python MCP 服务
+    其他错误修复和优化
diff --git a/package.json b/package.json
index ee795f17ee..6127aa6f27 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",

From 093d04c386e8d5682d322809c613322b4bc2b741 Mon Sep 17 00:00:00 2001
From: Teo <cheesen.xu@gmail.com>
Date: Fri, 27 Jun 2025 12:15:39 +0800
Subject: [PATCH 52/75] fix(Selector): Fix the issue with the Selector
 component being selected. (#7600)

* fix(Selector): update value comparison logic to use 'some' for selected values

* feat(ModelSettings): add ChevronDown icon as suffix for Select components
---
 src/renderer/src/components/Selector.tsx                  | 4 ++--
 .../src/pages/settings/ModelSettings/ModelSettings.tsx    | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/renderer/src/components/Selector.tsx b/src/renderer/src/components/Selector.tsx
index 1fb0efa6e8..5c064c19d8 100644
--- a/src/renderer/src/components/Selector.tsx
+++ b/src/renderer/src/components/Selector.tsx
@@ -70,7 +70,7 @@ const Selector = <V extends string | number>({
       const findLabels = (opts: SelectorOption<V>[]): (string | ReactNode)[] => {
         const labels: (string | ReactNode)[] = []
         for (const opt of opts) {
-          if (selectedValues.includes(opt.value)) {
+          if (selectedValues.some((v) => v == opt.value)) {
             labels.push(opt.label)
           }
           if (opt.options) {
@@ -91,7 +91,7 @@ const Selector = <V extends string | number>({
     const mapOption = (option: SelectorOption<V>) => ({
       key: option.value,
       label: option.label,
-      extra: <CheckIcon>{selectedValues.includes(option.value) && <Check size={14} />}</CheckIcon>,
+      extra: <CheckIcon>{selectedValues.some((v) => v == option.value) && <Check size={14} />}</CheckIcon>,
       disabled: option.disabled,
       type: option.type || (option.options ? 'group' : undefined),
       children: option.options?.map(mapOption)
diff --git a/src/renderer/src/pages/settings/ModelSettings/ModelSettings.tsx b/src/renderer/src/pages/settings/ModelSettings/ModelSettings.tsx
index fbfc8bb05b..cf6dd7c41f 100644
--- a/src/renderer/src/pages/settings/ModelSettings/ModelSettings.tsx
+++ b/src/renderer/src/pages/settings/ModelSettings/ModelSettings.tsx
@@ -16,7 +16,7 @@ import { setTranslateModelPrompt } from '@renderer/store/settings'
 import { Model } from '@renderer/types'
 import { Button, Select, Tooltip } from 'antd'
 import { find, sortBy } from 'lodash'
-import { CircleHelp, FolderPen, Languages, MessageSquareMore, Rocket, Settings2 } from 'lucide-react'
+import { ChevronDown, CircleHelp, FolderPen, Languages, MessageSquareMore, Rocket, Settings2 } from 'lucide-react'
 import { FC, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
@@ -104,6 +104,7 @@ const ModelSettings: FC = () => {
             options={selectOptions}
             showSearch
             placeholder={t('settings.models.empty')}
+            suffixIcon={<ChevronDown size={16} color="var(--color-border)" />}
           />
           <Button icon={<Settings2 size={16} />} style={{ marginLeft: 8 }} onClick={DefaultAssistantSettings.show} />
         </HStack>
@@ -125,6 +126,7 @@ const ModelSettings: FC = () => {
             options={selectOptions}
             showSearch
             placeholder={t('settings.models.empty')}
+            suffixIcon={<ChevronDown size={16} color="var(--color-border)" />}
           />
           <Button icon={<Settings2 size={16} />} style={{ marginLeft: 8 }} onClick={TopicNamingModalPopup.show} />
         </HStack>
@@ -146,6 +148,7 @@ const ModelSettings: FC = () => {
             options={selectOptions}
             showSearch
             placeholder={t('settings.models.empty')}
+            suffixIcon={<ChevronDown size={16} color="var(--color-border)" />}
           />
           <Button icon={<Settings2 size={16} />} style={{ marginLeft: 8 }} onClick={onUpdateTranslateModel} />
           {translateModelPrompt !== TRANSLATE_PROMPT && (
@@ -191,7 +194,8 @@ const ModelSettings: FC = () => {
               value={quickAssistantId || defaultAssistant.id}
               style={{ width: 360 }}
               onChange={(value) => dispatch(setQuickAssistantId(value))}
-              placeholder={t('settings.models.quick_assistant_selection')}>
+              placeholder={t('settings.models.quick_assistant_selection')}
+              suffixIcon={<ChevronDown size={16} color="var(--color-border)" />}>
               <Select.Option key={defaultAssistant.id} value={defaultAssistant.id}>
                 <AssistantItem>
                   <ModelAvatar model={defaultAssistant.model || defaultModel} size={18} />

From a6b53457b0c11801e2a9181f92e542ea51b8d969 Mon Sep 17 00:00:00 2001
From: Wang Jiyuan <59059173+EurFelux@users.noreply.github.com>
Date: Fri, 27 Jun 2025 13:45:15 +0800
Subject: [PATCH 53/75] fix(models): Resolve case sensitivity issue with model
 names (#7595)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(models): 修复模型名称大小写敏感问题

确保在检查支持的禁用生成模型时，将模型名称统一转换为小写进行比较

* feat(utils): 添加获取小写基础模型名称的函数

新增 getLowerBaseModelName 函数，用于从模型ID中提取基础名称并转换为小写
替换多处直接调用 getBaseModelName().toLowerCase() 的代码，提高代码复用性
---
 src/renderer/src/config/models.ts             | 10 +++----
 .../src/utils/__tests__/naming.test.ts        | 30 +++++++++++++++++++
 src/renderer/src/utils/naming.ts              | 13 ++++++++
 3 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/config/models.ts b/src/renderer/src/config/models.ts
index f934fbbb81..64b32c6699 100644
--- a/src/renderer/src/config/models.ts
+++ b/src/renderer/src/config/models.ts
@@ -145,7 +145,7 @@ import YoudaoLogo from '@renderer/assets/images/providers/netease-youdao.svg'
 import NomicLogo from '@renderer/assets/images/providers/nomic.png'
 import { getProviderByModel } from '@renderer/services/AssistantService'
 import { Model } from '@renderer/types'
-import { getBaseModelName } from '@renderer/utils'
+import { getLowerBaseModelName } from '@renderer/utils'
 import OpenAI from 'openai'
 
 import { WEB_SEARCH_PROMPT_FOR_OPENROUTER } from './prompts'
@@ -2503,7 +2503,7 @@ export function isSupportedThinkingTokenQwenModel(model?: Model): boolean {
     return false
   }
 
-  const baseName = getBaseModelName(model.id, '/').toLowerCase()
+  const baseName = getLowerBaseModelName(model.id, '/')
 
   return (
     baseName.startsWith('qwen3') ||
@@ -2616,7 +2616,7 @@ export function isWebSearchModel(model: Model): boolean {
     return false
   }
 
-  const baseName = getBaseModelName(model.id, '/').toLowerCase()
+  const baseName = getLowerBaseModelName(model.id, '/')
 
   // 不管哪个供应商都判断了
   if (model.id.includes('claude')) {
@@ -2710,7 +2710,7 @@ export function isGenerateImageModel(model: Model): boolean {
     return false
   }
 
-  const baseName = getBaseModelName(model.id, '/').toLowerCase()
+  const baseName = getLowerBaseModelName(model.id, '/')
   if (GENERATE_IMAGE_MODELS.includes(baseName)) {
     return true
   }
@@ -2722,7 +2722,7 @@ export function isSupportedDisableGenerationModel(model: Model): boolean {
     return false
   }
 
-  return SUPPORTED_DISABLE_GENERATION_MODELS.includes(getBaseModelName(model.id))
+  return SUPPORTED_DISABLE_GENERATION_MODELS.includes(getLowerBaseModelName(model.id))
 }
 
 export function getOpenAIWebSearchParams(model: Model, isEnableWebSearch?: boolean): Record<string, any> {
diff --git a/src/renderer/src/utils/__tests__/naming.test.ts b/src/renderer/src/utils/__tests__/naming.test.ts
index 1d4560a3ab..3765e1e3b8 100644
--- a/src/renderer/src/utils/__tests__/naming.test.ts
+++ b/src/renderer/src/utils/__tests__/naming.test.ts
@@ -8,6 +8,7 @@ import {
   getDefaultGroupName,
   getFirstCharacter,
   getLeadingEmoji,
+  getLowerBaseModelName,
   isEmoji,
   removeLeadingEmoji,
   removeSpecialCharactersForTopicName
@@ -190,6 +191,35 @@ describe('naming', () => {
     })
   })
 
+  describe('getLowerBaseModelName', () => {
+    it('should convert base model name to lowercase', () => {
+      // 验证将基础模型名称转换为小写
+      expect(getLowerBaseModelName('DeepSeek/DeepSeek-R1')).toBe('deepseek-r1')
+      expect(getLowerBaseModelName('openai/GPT-4.1')).toBe('gpt-4.1')
+      expect(getLowerBaseModelName('Anthropic/Claude-3.5-Sonnet')).toBe('claude-3.5-sonnet')
+    })
+
+    it('should handle multiple levels of paths', () => {
+      // 验证处理多层路径
+      expect(getLowerBaseModelName('Pro/DeepSeek-AI/DeepSeek-R1')).toBe('deepseek-r1')
+      expect(getLowerBaseModelName('Org/Team/Group/Model')).toBe('model')
+    })
+
+    it('should return lowercase original id if no delimiter found', () => {
+      // 验证没有分隔符时返回小写原始ID
+      expect(getLowerBaseModelName('DeepSeek-R1')).toBe('deepseek-r1')
+      expect(getLowerBaseModelName('GPT-4:Free')).toBe('gpt-4:free')
+    })
+
+    it('should handle edge cases', () => {
+      // 验证边缘情况
+      expect(getLowerBaseModelName('')).toBe('')
+      expect(getLowerBaseModelName('Model/')).toBe('')
+      expect(getLowerBaseModelName('/Model')).toBe('model')
+      expect(getLowerBaseModelName('Model//Name')).toBe('name')
+    })
+  })
+
   describe('generateColorFromChar', () => {
     it('should generate a valid hex color code', () => {
       // 验证生成有效的十六进制颜色代码
diff --git a/src/renderer/src/utils/naming.ts b/src/renderer/src/utils/naming.ts
index df178104de..e26813fa41 100644
--- a/src/renderer/src/utils/naming.ts
+++ b/src/renderer/src/utils/naming.ts
@@ -60,6 +60,19 @@ export const getBaseModelName = (id: string, delimiter: string = '/'): string =>
   return parts[parts.length - 1]
 }
 
+/**
+ * 从模型 ID 中提取基础名称并转换为小写。
+ * 例如：
+ * - 'deepseek/DeepSeek-R1' => 'deepseek-r1'
+ * - 'deepseek-ai/deepseek/DeepSeek-R1' => 'deepseek-r1'
+ * @param {string} id 模型 ID
+ * @param {string} [delimiter='/'] 分隔符，默认为 '/'
+ * @returns {string} 小写的基础名称
+ */
+export const getLowerBaseModelName = (id: string, delimiter: string = '/'): string => {
+  return getBaseModelName(id, delimiter).toLowerCase()
+}
+
 /**
  * 用于获取 avatar 名字的辅助函数，会取出字符串的第一个字符，支持表情符号。
  * @param {string} str 输入字符串

From e8e9a2d86f2cc50c8b537e9a0b4da581fae04921 Mon Sep 17 00:00:00 2001
From: one <wangan.cs@gmail.com>
Date: Fri, 27 Jun 2025 13:46:09 +0800
Subject: [PATCH 54/75] fix(Markdown, LaTeX): do not touch escaped brackets
 (#7582)

- Keep `\\[` as is
- Use a custom match algorithm rather than balanced match
---
 package.json                                  |  2 -
 .../src/utils/__tests__/markdown.test.ts      | 16 +++++
 src/renderer/src/utils/markdown.ts            | 58 +++++++++++++++++--
 yarn.lock                                     | 16 -----
 4 files changed, 70 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 6127aa6f27..d550355d04 100644
--- a/package.json
+++ b/package.json
@@ -112,7 +112,6 @@
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@tryfabric/martian": "^1.2.4",
-    "@types/balanced-match": "^3",
     "@types/diff": "^7",
     "@types/fs-extra": "^11",
     "@types/lodash": "^4.17.5",
@@ -139,7 +138,6 @@
     "archiver": "^7.0.1",
     "async-mutex": "^0.5.0",
     "axios": "^1.7.3",
-    "balanced-match": "^3.0.1",
     "browser-image-compression": "^2.0.2",
     "color": "^5.0.0",
     "dayjs": "^1.11.11",
diff --git a/src/renderer/src/utils/__tests__/markdown.test.ts b/src/renderer/src/utils/__tests__/markdown.test.ts
index f16509ced4..a078f2c418 100644
--- a/src/renderer/src/utils/__tests__/markdown.test.ts
+++ b/src/renderer/src/utils/__tests__/markdown.test.ts
@@ -490,6 +490,22 @@ $$
       it('should convert inline math \\(...\\) to $...$', () => {
         expect(processLatexBrackets('The formula is \\(a+b=c\\)')).toBe('The formula is $a+b=c$')
       })
+
+      it('should handle complex mathematical text with escaped brackets', () => {
+        const input = `设 \\(A\\) 为 \\(n\\times n\\) 的实可逆矩阵，
+\\[
+B=\\begin{pmatrix} O & A \\\\[2pt] A' & O \\end{pmatrix}\\;(2n\\times 2n,\\;B=B'),
+\\]
+求 \\(B\\) 的正惯性指数 \\(p(B)\\) 和负惯性指数 \\(q(B)\\)。`
+
+        const expected = `设 $A$ 为 $n\\times n$ 的实可逆矩阵，
+$$
+B=\\begin{pmatrix} O & A \\\\[2pt] A' & O \\end{pmatrix}\\;(2n\\times 2n,\\;B=B'),
+$$
+求 $B$ 的正惯性指数 $p(B)$ 和负惯性指数 $q(B)$。`
+
+        expect(processLatexBrackets(input)).toBe(expected)
+      })
     })
 
     describe('code block protection', () => {
diff --git a/src/renderer/src/utils/markdown.ts b/src/renderer/src/utils/markdown.ts
index 4fc499300d..8505ed36c7 100644
--- a/src/renderer/src/utils/markdown.ts
+++ b/src/renderer/src/utils/markdown.ts
@@ -1,5 +1,4 @@
 import { languages } from '@shared/config/languages'
-import { default as balanced } from 'balanced-match'
 import remarkParse from 'remark-parse'
 import remarkStringify from 'remark-stringify'
 import removeMarkdown from 'remove-markdown'
@@ -31,7 +30,7 @@ export const findCitationInChildren = (children: any): string => {
 }
 
 // 检查是否包含潜在的 LaTeX 模式
-const containsLatexRegex = /\\\(.*?\\\)|\\\[.*?\\\]|\$.*?\$|\\begin\{equation\}.*?\\end\{equation\}/s
+const containsLatexRegex = /\\\(.*?\\\)|\\\[.*?\\\]/s
 
 /**
  * 转换 LaTeX 公式括号 `\[\]` 和 `\(\)` 为 Markdown 格式 `$$...$$` 和 `$...$`
@@ -41,7 +40,7 @@ const containsLatexRegex = /\\\(.*?\\\)|\\\[.*?\\\]|\$.*?\$|\\begin\{equation\}.
  * 目前的实现：
  * - 保护代码块和链接，避免被 remark-math 处理
  * - 支持嵌套括号的平衡匹配
- * - 转义 `\\(x\\)` 会被处理为 `\$x\$`，`\\[x\\]` 会被处理为 `\$$x\$$`
+ * - 转义括号 `\\(\\)` 或 `\\[\\]` 不会被处理
  *
  * @see https://github.com/remarkjs/remark-math/issues/39
  * @param text 输入的 Markdown 文本
@@ -77,7 +76,7 @@ export const processLatexBrackets = (text: string) => {
     let remaining = content
 
     while (remaining.length > 0) {
-      const match = balanced(openDelim, closeDelim, remaining)
+      const match = findLatexMatch(remaining, openDelim, closeDelim)
       if (!match) {
         result += remaining
         break
@@ -109,6 +108,57 @@ export const processLatexBrackets = (text: string) => {
   return result
 }
 
+/**
+ * 查找 LaTeX 数学公式的匹配括号对
+ *
+ * 使用平衡括号算法处理嵌套结构，正确识别转义字符
+ *
+ * @param text 要搜索的文本
+ * @param openDelim 开始分隔符 (如 '\[' 或 '\(')
+ * @param closeDelim 结束分隔符 (如 '\]' 或 '\)')
+ * @returns 匹配结果对象或 null
+ */
+const findLatexMatch = (text: string, openDelim: string, closeDelim: string) => {
+  // 统计连续反斜杠：奇数个表示转义，偶数个表示未转义
+  const escaped = (i: number) => {
+    let count = 0
+    while (--i >= 0 && text[i] === '\\') count++
+    return count & 1
+  }
+
+  // 查找第一个有效的开始标记
+  for (let i = 0, n = text.length; i <= n - openDelim.length; i++) {
+    // 没有找到开始分隔符或被转义，跳过
+    if (!text.startsWith(openDelim, i) || escaped(i)) continue
+
+    // 处理嵌套结构
+    for (let j = i + openDelim.length, depth = 1; j <= n - closeDelim.length && depth; j++) {
+      // 计算当前位置对深度的影响：+1(开始), -1(结束), 0(无关)
+      const delta =
+        text.startsWith(openDelim, j) && !escaped(j) ? 1 : text.startsWith(closeDelim, j) && !escaped(j) ? -1 : 0
+
+      if (delta) {
+        depth += delta
+
+        // 找到了匹配的结束位置
+        if (!depth)
+          return {
+            start: i,
+            end: j + closeDelim.length,
+            pre: text.slice(0, i),
+            body: text.slice(i + openDelim.length, j),
+            post: text.slice(j + closeDelim.length)
+          }
+
+        // 跳过已处理的分隔符字符，避免重复检查
+        j += (delta > 0 ? openDelim : closeDelim).length - 1
+      }
+    }
+  }
+
+  return null
+}
+
 /**
  * 转换数学公式格式：
  * - 将 LaTeX 格式的 '\\[' 和 '\\]' 转换为 '$$$$'。
diff --git a/yarn.lock b/yarn.lock
index 75f9e2f434..eefde56f9c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4115,13 +4115,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/balanced-match@npm:^3":
-  version: 3.0.2
-  resolution: "@types/balanced-match@npm:3.0.2"
-  checksum: 10c0/833f6499609363537026c4ec2770af5c5a36e71b80f7b5b23884b15296301bfcf974cd40bc75fda940dea4994acd96c9222b284c248383a1ade59bf8835940b0
-  languageName: node
-  linkType: hard
-
 "@types/cacheable-request@npm:^6.0.1":
   version: 6.0.3
   resolution: "@types/cacheable-request@npm:6.0.3"
@@ -5646,7 +5639,6 @@ __metadata:
     "@testing-library/jest-dom": "npm:^6.6.3"
     "@testing-library/react": "npm:^16.3.0"
     "@tryfabric/martian": "npm:^1.2.4"
-    "@types/balanced-match": "npm:^3"
     "@types/diff": "npm:^7"
     "@types/fs-extra": "npm:^11"
     "@types/lodash": "npm:^4.17.5"
@@ -5673,7 +5665,6 @@ __metadata:
     archiver: "npm:^7.0.1"
     async-mutex: "npm:^0.5.0"
     axios: "npm:^1.7.3"
-    balanced-match: "npm:^3.0.1"
     browser-image-compression: "npm:^2.0.2"
     color: "npm:^5.0.0"
     dayjs: "npm:^1.11.11"
@@ -6306,13 +6297,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"balanced-match@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "balanced-match@npm:3.0.1"
-  checksum: 10c0/ac8dd63a5b260610c2cbda982f436e964c1b9ae8764d368a523769da40a31710abd6e19f0fdf1773c4ad7b2ea7ba7b285d547375dc723f6e754369835afc8e9f
-  languageName: node
-  linkType: hard
-
 "bare-events@npm:^2.2.0":
   version: 2.5.4
   resolution: "bare-events@npm:2.5.4"

From 766897e733369ca67e5b70844b2daa26bf369fde Mon Sep 17 00:00:00 2001
From: one <wangan.cs@gmail.com>
Date: Fri, 27 Jun 2025 16:09:06 +0800
Subject: [PATCH 55/75] refactor: show error on missing mcp tool (#7587)

---
 src/renderer/src/i18n/locales/en-us.json | 3 ++-
 src/renderer/src/i18n/locales/ja-jp.json | 3 ++-
 src/renderer/src/i18n/locales/ru-ru.json | 3 ++-
 src/renderer/src/i18n/locales/zh-cn.json | 3 ++-
 src/renderer/src/i18n/locales/zh-tw.json | 3 ++-
 src/renderer/src/utils/mcp-tools.ts      | 2 ++
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index b58056ae92..b36b931f25 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -1478,7 +1478,8 @@
           "version": "Version"
         },
         "errors": {
-          "32000": "MCP server failed to start, please check the parameters according to the tutorial"
+          "32000": "MCP server failed to start, please check the parameters according to the tutorial",
+          "toolNotFound": "Tool {{name}} not found"
         },
         "serverPlural": "servers",
         "serverSingular": "server",
diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json
index 64f6a98475..a43b02177c 100644
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@@ -1473,7 +1473,8 @@
         "updateSuccess": "サーバーが正常に更新されました",
         "url": "URL",
         "errors": {
-          "32000": "MCP サーバーが起動しませんでした。パラメーターを確認してください"
+          "32000": "MCP サーバーが起動しませんでした。パラメーターを確認してください",
+          "toolNotFound": "ツール {{name}} が見つかりません"
         },
         "editMcpJson": "MCP 設定を編集",
         "installHelp": "インストールヘルプを取得",
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index e027e7270d..3eea3431f4 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -1465,7 +1465,8 @@
           "version": "Версия"
         },
         "errors": {
-          "32000": "MCP сервер не запущен, пожалуйста, проверьте параметры"
+          "32000": "MCP сервер не запущен, пожалуйста, проверьте параметры",
+          "toolNotFound": "Инструмент {{name}} не найден"
         },
         "serverPlural": "серверы",
         "serverSingular": "сервер",
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index 894d53c2be..7bb2f25608 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -1478,7 +1478,8 @@
           "version": "版本"
         },
         "errors": {
-          "32000": "MCP 服务器启动失败，请根据教程检查参数是否填写完整"
+          "32000": "MCP 服务器启动失败，请根据教程检查参数是否填写完整",
+          "toolNotFound": "未找到工具 {{name}}"
         },
         "serverPlural": "服务器",
         "serverSingular": "服务器",
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index 65a3a3f58c..949afc9639 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -1468,7 +1468,8 @@
           "version": "版本"
         },
         "errors": {
-          "32000": "MCP 伺服器啟動失敗，請根據教程檢查參數是否填寫完整"
+          "32000": "MCP 伺服器啟動失敗，請根據教程檢查參數是否填寫完整",
+          "toolNotFound": "未找到工具 {{name}}"
         },
         "serverPlural": "伺服器",
         "serverSingular": "伺服器",
diff --git a/src/renderer/src/utils/mcp-tools.ts b/src/renderer/src/utils/mcp-tools.ts
index b26836ee13..ecc5e4d433 100644
--- a/src/renderer/src/utils/mcp-tools.ts
+++ b/src/renderer/src/utils/mcp-tools.ts
@@ -2,6 +2,7 @@ import { ContentBlockParam, MessageParam, ToolUnion, ToolUseBlock } from '@anthr
 import { Content, FunctionCall, Part, Tool, Type as GeminiSchemaType } from '@google/genai'
 import Logger from '@renderer/config/logger'
 import { isFunctionCallingModel, isVisionModel } from '@renderer/config/models'
+import i18n from '@renderer/i18n'
 import store from '@renderer/store'
 import { addMCPServer } from '@renderer/store/mcp'
 import {
@@ -479,6 +480,7 @@ export function parseToolUse(content: string, mcpTools: MCPTool[]): ToolUseRespo
     const mcpTool = mcpTools.find((tool) => tool.id === toolName)
     if (!mcpTool) {
       Logger.error(`Tool "${toolName}" not found in MCP tools`)
+      window.message.error(i18n.t('settings.mcp.errors.toolNotFound', { name: toolName }))
       continue
     }
 

From 16772c1d37f0aba2794aad66c065e07d4887d83b Mon Sep 17 00:00:00 2001
From: one <wangan.cs@gmail.com>
Date: Fri, 27 Jun 2025 02:41:28 +0800
Subject: [PATCH 56/75] refactor(CodePreview): line numbers as elements

---
 .../components/CodeBlockView/CodePreview.tsx  | 125 +++++++++---------
 1 file changed, 65 insertions(+), 60 deletions(-)

diff --git a/src/renderer/src/components/CodeBlockView/CodePreview.tsx b/src/renderer/src/components/CodeBlockView/CodePreview.tsx
index b550cd2467..7cfd0ba31d 100644
--- a/src/renderer/src/components/CodeBlockView/CodePreview.tsx
+++ b/src/renderer/src/components/CodeBlockView/CodePreview.tsx
@@ -4,7 +4,7 @@ import { useSettings } from '@renderer/hooks/useSettings'
 import { uuid } from '@renderer/utils'
 import { getReactStyleFromToken } from '@renderer/utils/shiki'
 import { ChevronsDownUp, ChevronsUpDown, Text as UnWrapIcon, WrapText as WrapIcon } from 'lucide-react'
-import React, { memo, useCallback, useEffect, useRef, useState } from 'react'
+import React, { memo, useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ThemedToken } from 'shiki/core'
 import styled from 'styled-components'
@@ -154,12 +154,18 @@ const CodePreview = ({ children, language, setTools }: CodePreviewProps) => {
     setTimeout(highlightCode, 0)
   }, [isInViewport, highlightCode])
 
-  useEffect(() => {
+  const lastDigitsRef = useRef(1)
+
+  useLayoutEffect(() => {
     const container = codeContainerRef.current
     if (!container || !codeShowLineNumbers) return
 
     const digits = Math.max(tokenLines.length.toString().length, 1)
-    container.style.setProperty('--line-digits', digits.toString())
+    if (digits === lastDigitsRef.current) return
+
+    const gutterWidth = digits * 0.6
+    container.style.setProperty('--gutter-width', `${gutterWidth}rem`)
+    lastDigitsRef.current = digits
   }, [codeShowLineNumbers, tokenLines.length])
 
   const hasHighlightedCode = tokenLines.length > 0
@@ -167,7 +173,6 @@ const CodePreview = ({ children, language, setTools }: CodePreviewProps) => {
   return (
     <ContentContainer
       ref={codeContainerRef}
-      $lineNumbers={codeShowLineNumbers}
       $wrap={codeWrappable && !isUnwrapped}
       $fadeIn={hasHighlightedCode}
       style={{
@@ -175,7 +180,7 @@ const CodePreview = ({ children, language, setTools }: CodePreviewProps) => {
         maxHeight: codeCollapsible && !isExpanded ? '350px' : 'none'
       }}>
       {hasHighlightedCode ? (
-        <ShikiTokensRenderer language={language} tokenLines={tokenLines} />
+        <ShikiTokensRenderer language={language} tokenLines={tokenLines} showLineNumbers={codeShowLineNumbers} />
       ) : (
         <CodePlaceholder>{children}</CodePlaceholder>
       )}
@@ -188,43 +193,47 @@ const CodePreview = ({ children, language, setTools }: CodePreviewProps) => {
  *
  * 独立出来，方便将来做 virtual list
  */
-const ShikiTokensRenderer: React.FC<{ language: string; tokenLines: ThemedToken[][] }> = memo(
-  ({ language, tokenLines }) => {
-    const { getShikiPreProperties } = useCodeStyle()
-    const rendererRef = useRef<HTMLPreElement>(null)
+const ShikiTokensRenderer: React.FC<{
+  language: string
+  tokenLines: ThemedToken[][]
+  showLineNumbers: boolean
+}> = memo(({ language, tokenLines, showLineNumbers }) => {
+  const { getShikiPreProperties } = useCodeStyle()
+  const rendererRef = useRef<HTMLPreElement>(null)
 
-    // 设置 pre 标签属性
-    useEffect(() => {
-      getShikiPreProperties(language).then((properties) => {
-        const pre = rendererRef.current
-        if (pre) {
-          pre.className = properties.class
-          pre.style.cssText = properties.style
-          pre.tabIndex = properties.tabindex
-        }
-      })
-    }, [language, getShikiPreProperties])
+  // 设置 pre 标签属性
+  useEffect(() => {
+    getShikiPreProperties(language).then((properties) => {
+      const pre = rendererRef.current
+      if (pre) {
+        pre.className = properties.class
+        pre.style.cssText = properties.style
+        pre.tabIndex = properties.tabindex
+      }
+    })
+  }, [language, getShikiPreProperties])
 
-    return (
-      <pre className="shiki" ref={rendererRef}>
-        <code>
-          {tokenLines.map((lineTokens, lineIndex) => (
-            <span key={`line-${lineIndex}`} className="line">
+  return (
+    <pre className="shiki" ref={rendererRef}>
+      <code>
+        {tokenLines.map((lineTokens, lineIndex) => (
+          <span key={`line-${lineIndex}`} className="line">
+            {showLineNumbers && <span className="line-number">{lineIndex + 1}</span>}
+            <span className="line-content">
               {lineTokens.map((token, tokenIndex) => (
                 <span key={`token-${tokenIndex}`} style={getReactStyleFromToken(token)}>
                   {token.content}
                 </span>
               ))}
             </span>
-          ))}
-        </code>
-      </pre>
-    )
-  }
-)
+          </span>
+        ))}
+      </code>
+    </pre>
+  )
+})
 
 const ContentContainer = styled.div<{
-  $lineNumbers: boolean
   $wrap: boolean
   $fadeIn: boolean
 }>`
@@ -233,9 +242,8 @@ const ContentContainer = styled.div<{
   border-radius: inherit;
   margin-top: 0;
 
-  /* 动态宽度计算 */
-  --line-digits: 0;
-  --gutter-width: max(calc(var(--line-digits) * 0.7rem), 2.1rem);
+  /* gutter 宽度默认值 */
+  --gutter-width: 0.6rem;
 
   .shiki {
     padding: 1em;
@@ -246,38 +254,35 @@ const ContentContainer = styled.div<{
       flex-direction: column;
 
       .line {
-        display: block;
+        display: flex;
+        align-items: flex-start;
         min-height: 1.3rem;
-        padding-left: ${(props) => (props.$lineNumbers ? 'var(--gutter-width)' : '0')};
 
-        * {
-          overflow-wrap: ${(props) => (props.$wrap ? 'break-word' : 'normal')};
-          white-space: ${(props) => (props.$wrap ? 'pre-wrap' : 'pre')};
+        .line-number {
+          width: var(--gutter-width);
+          text-align: right;
+          opacity: 0.35;
+          margin-right: 1rem;
+          user-select: none;
+          flex-shrink: 0;
+          overflow: hidden;
+          line-height: inherit;
+          font-family: inherit;
+          font-variant-numeric: tabular-nums;
+        }
+
+        .line-content {
+          flex: 1;
+
+          * {
+            overflow-wrap: ${(props) => (props.$wrap ? 'break-word' : 'normal')};
+            white-space: ${(props) => (props.$wrap ? 'pre-wrap' : 'pre')};
+          }
         }
       }
     }
   }
 
-  ${(props) =>
-    props.$lineNumbers &&
-    `
-      code {
-        counter-reset: step;
-        counter-increment: step 0;
-        position: relative;
-      }
-
-      code .line::before {
-        content: counter(step);
-        counter-increment: step;
-        width: 1rem;
-        position: absolute;
-        left: 0;
-        text-align: right;
-        opacity: 0.35;
-      }
-    `}
-
   @keyframes contentFadeIn {
     from {
       opacity: 0;

From 639ddd562861dc4b477d209fe63e1cc1db03665d Mon Sep 17 00:00:00 2001
From: one <wangan.cs@gmail.com>
Date: Fri, 27 Jun 2025 11:57:22 +0800
Subject: [PATCH 57/75] refactor: add ShikiTokensRendererProps

---
 .../src/components/CodeBlockView/CodePreview.tsx     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/components/CodeBlockView/CodePreview.tsx b/src/renderer/src/components/CodeBlockView/CodePreview.tsx
index 7cfd0ba31d..0ae6a14fef 100644
--- a/src/renderer/src/components/CodeBlockView/CodePreview.tsx
+++ b/src/renderer/src/components/CodeBlockView/CodePreview.tsx
@@ -188,16 +188,18 @@ const CodePreview = ({ children, language, setTools }: CodePreviewProps) => {
   )
 }
 
+interface ShikiTokensRendererProps {
+  language: string
+  tokenLines: ThemedToken[][]
+  showLineNumbers?: boolean
+}
+
 /**
  * 渲染 Shiki 高亮后的 tokens
  *
  * 独立出来，方便将来做 virtual list
  */
-const ShikiTokensRenderer: React.FC<{
-  language: string
-  tokenLines: ThemedToken[][]
-  showLineNumbers: boolean
-}> = memo(({ language, tokenLines, showLineNumbers }) => {
+const ShikiTokensRenderer: React.FC<ShikiTokensRendererProps> = memo(({ language, tokenLines, showLineNumbers }) => {
   const { getShikiPreProperties } = useCodeStyle()
   const rendererRef = useRef<HTMLPreElement>(null)
 

From 3726ceaf48f5eecf019bfc24715f25592b2fd628 Mon Sep 17 00:00:00 2001
From: one <wangan.cs@gmail.com>
Date: Fri, 27 Jun 2025 12:01:07 +0800
Subject: [PATCH 58/75] refactor: use useLayoutEffect for shiki renderer

---
 src/renderer/src/components/CodeBlockView/CodePreview.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/src/components/CodeBlockView/CodePreview.tsx b/src/renderer/src/components/CodeBlockView/CodePreview.tsx
index 0ae6a14fef..55a10d5535 100644
--- a/src/renderer/src/components/CodeBlockView/CodePreview.tsx
+++ b/src/renderer/src/components/CodeBlockView/CodePreview.tsx
@@ -204,7 +204,7 @@ const ShikiTokensRenderer: React.FC<ShikiTokensRendererProps> = memo(({ language
   const rendererRef = useRef<HTMLPreElement>(null)
 
   // 设置 pre 标签属性
-  useEffect(() => {
+  useLayoutEffect(() => {
     getShikiPreProperties(language).then((properties) => {
       const pre = rendererRef.current
       if (pre) {

From 1fe439bb517c2ad933b38ce73abfe3893ecb0bd4 Mon Sep 17 00:00:00 2001
From: Wei Lin <shps951002@gmail.com>
Date: Fri, 27 Jun 2025 18:02:37 +0800
Subject: [PATCH 59/75] docs: add 20 language links of README (#7611)

PR adds 20 languages link to the README and user can easily to access translated READEME, supports google/bing multiple languages SEO search.

Page demo https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=ja

> OpenAiTx is free and open-source : https://github.com/OpenAiTx/OpenAiTx

![Image](https://github.com/user-attachments/assets/41c79fad-5f63-4ed3-8d48-99f3b89879ba)
---
 README.md | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/README.md b/README.md
index b589376b7b..7ce7ada20f 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,33 @@
+<div align="right" >
+  <details>
+    <summary >🌐 Language</summary>
+    <div>
+      <div align="right">
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=en">English</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=zh-CN">简体中文</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=zh-TW">繁體中文</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=ja">日本語</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=ko">한국어</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=hi">हिन्दी</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=th">ไทย</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=fr">Français</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=de">Deutsch</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=es">Español</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=it">Itapano</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=ru">Русский</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=pt">Português</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=nl">Nederlands</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=pl">Polski</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=ar">العربية</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=fa">فارسی</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=tr">Türkçe</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=vi">Tiếng Việt</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=id">Bahasa Indonesia</a></p>
+      </div>
+    </div>
+  </details>
+</div>
+
 <h1 align="center">
   <a href="https://github.com/CherryHQ/cherry-studio/releases">
     <img src="https://github.com/CherryHQ/cherry-studio/blob/main/build/icon.png?raw=true" width="150" height="150" alt="banner" /><br>

From d463d6ea2e0954f1e20f4e9b0955497675ebec8b Mon Sep 17 00:00:00 2001
From: one <wangan.cs@gmail.com>
Date: Fri, 27 Jun 2025 18:04:42 +0800
Subject: [PATCH 60/75] feat(WebSearch): support RAG for external websearch,
 improve feedback (#7446)

* feat(WebSearch, RAG): support RAG for external websearch

* refactor(WebSearch): handle content limit in service

* refactor: update migrate

* refactor: UI, constants, types

* refactor: migrate contentLimit to cutoffLimit

* refactor: update default rag document count

* refactor: add a helper function for merging references

* refactor: reference filtering

* feat: feedback for websearch phases

* feat: support cutoff by token

* refactor: add a warning and fix the bound of cutoff limit

* fix: not pass `dimensions` if it is not set by the user

* refactor: update i18n and error message

* refactor: improve UI

* fix: cutoff unit style
---
 package.json                                  |   2 +-
 src/main/loader/noteLoader.ts                 |  44 ++
 src/main/services/KnowledgeService.ts         |  13 +-
 src/renderer/src/components/Spinner.tsx       |   4 +-
 src/renderer/src/config/constant.ts           |   1 +
 .../src/hooks/useWebSearchProviders.ts        |  14 +
 src/renderer/src/i18n/locales/en-us.json      |  37 +-
 src/renderer/src/i18n/locales/ja-jp.json      |  37 +-
 src/renderer/src/i18n/locales/ru-ru.json      |  37 +-
 src/renderer/src/i18n/locales/zh-cn.json      |  37 +-
 src/renderer/src/i18n/locales/zh-tw.json      |  37 +-
 .../home/Messages/Blocks/CitationBlock.tsx    |  32 +-
 .../components/KnowledgeSearchPopup.tsx       |   3 +-
 .../WebSearchSettings/BasicSettings.tsx       |  34 +-
 .../CompressionSettings/CutoffSettings.tsx    |  60 +++
 .../CompressionSettings/RagSettings.tsx       | 207 +++++++++
 .../CompressionSettings/index.tsx             |  47 +++
 .../settings/WebSearchSettings/index.tsx      |   2 +
 .../WebSearchProvider/BochaProvider.ts        |   9 +-
 .../WebSearchProvider/ExaProvider.ts          |   7 +-
 .../WebSearchProvider/LocalSearchProvider.ts  |   6 +-
 .../WebSearchProvider/SearxngProvider.ts      |   6 +-
 .../WebSearchProvider/TavilyProvider.ts       |   7 +-
 src/renderer/src/services/ApiService.ts       |   7 +-
 src/renderer/src/services/KnowledgeService.ts |   2 +-
 src/renderer/src/services/WebSearchService.ts | 399 +++++++++++++++++-
 src/renderer/src/store/index.ts               |   2 +-
 src/renderer/src/store/migrate.ts             |  25 ++
 src/renderer/src/store/runtime.ts             |  26 +-
 src/renderer/src/store/websearch.ts           |  34 +-
 src/renderer/src/types/index.ts               |   9 +-
 .../src/utils/__tests__/websearch.test.ts     | 226 ++++++++++
 src/renderer/src/utils/websearch.ts           | 116 +++++
 yarn.lock                                     |  10 +-
 34 files changed, 1424 insertions(+), 115 deletions(-)
 create mode 100644 src/main/loader/noteLoader.ts
 create mode 100644 src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/CutoffSettings.tsx
 create mode 100644 src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/RagSettings.tsx
 create mode 100644 src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/index.tsx
 create mode 100644 src/renderer/src/utils/__tests__/websearch.test.ts
 create mode 100644 src/renderer/src/utils/websearch.ts

diff --git a/package.json b/package.json
index d550355d04..c6eac03d52 100644
--- a/package.json
+++ b/package.json
@@ -213,7 +213,7 @@
     "styled-components": "^6.1.11",
     "tar": "^7.4.3",
     "tiny-pinyin": "^1.3.2",
-    "tokenx": "^0.4.1",
+    "tokenx": "^1.1.0",
     "typescript": "^5.6.2",
     "uuid": "^10.0.0",
     "vite": "6.2.6",
diff --git a/src/main/loader/noteLoader.ts b/src/main/loader/noteLoader.ts
new file mode 100644
index 0000000000..693f5f3c0a
--- /dev/null
+++ b/src/main/loader/noteLoader.ts
@@ -0,0 +1,44 @@
+import { BaseLoader } from '@cherrystudio/embedjs-interfaces'
+import { cleanString } from '@cherrystudio/embedjs-utils'
+import { RecursiveCharacterTextSplitter } from '@langchain/textsplitters'
+import md5 from 'md5'
+
+export class NoteLoader extends BaseLoader<{ type: 'NoteLoader' }> {
+  private readonly text: string
+  private readonly sourceUrl?: string
+
+  constructor({
+    text,
+    sourceUrl,
+    chunkSize,
+    chunkOverlap
+  }: {
+    text: string
+    sourceUrl?: string
+    chunkSize?: number
+    chunkOverlap?: number
+  }) {
+    super(`NoteLoader_${md5(text + (sourceUrl || ''))}`, { text, sourceUrl }, chunkSize ?? 2000, chunkOverlap ?? 0)
+    this.text = text
+    this.sourceUrl = sourceUrl
+  }
+
+  override async *getUnfilteredChunks() {
+    const chunker = new RecursiveCharacterTextSplitter({
+      chunkSize: this.chunkSize,
+      chunkOverlap: this.chunkOverlap
+    })
+
+    const chunks = await chunker.splitText(cleanString(this.text))
+
+    for (const chunk of chunks) {
+      yield {
+        pageContent: chunk,
+        metadata: {
+          type: 'NoteLoader' as const,
+          source: this.sourceUrl || 'note'
+        }
+      }
+    }
+  }
+}
diff --git a/src/main/services/KnowledgeService.ts b/src/main/services/KnowledgeService.ts
index 62b2bba08f..d2d381c598 100644
--- a/src/main/services/KnowledgeService.ts
+++ b/src/main/services/KnowledgeService.ts
@@ -16,13 +16,14 @@
 import * as fs from 'node:fs'
 import path from 'node:path'
 
-import { RAGApplication, RAGApplicationBuilder, TextLoader } from '@cherrystudio/embedjs'
+import { RAGApplication, RAGApplicationBuilder } from '@cherrystudio/embedjs'
 import type { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
 import { LibSqlDb } from '@cherrystudio/embedjs-libsql'
 import { SitemapLoader } from '@cherrystudio/embedjs-loader-sitemap'
 import { WebLoader } from '@cherrystudio/embedjs-loader-web'
 import Embeddings from '@main/embeddings/Embeddings'
 import { addFileLoader } from '@main/loader'
+import { NoteLoader } from '@main/loader/noteLoader'
 import Reranker from '@main/reranker/Reranker'
 import { windowService } from '@main/services/WindowService'
 import { getDataPath } from '@main/utils'
@@ -143,7 +144,7 @@ class KnowledgeService {
     this.getRagApplication(base)
   }
 
-  public reset = async (_: Electron.IpcMainInvokeEvent, { base }: { base: KnowledgeBaseParams }): Promise<void> => {
+  public reset = async (_: Electron.IpcMainInvokeEvent, base: KnowledgeBaseParams): Promise<void> => {
     const ragApplication = await this.getRagApplication(base)
     await ragApplication.reset()
   }
@@ -333,6 +334,7 @@ class KnowledgeService {
   ): LoaderTask {
     const { base, item, forceReload } = options
     const content = item.content as string
+    const sourceUrl = (item as any).sourceUrl
 
     const encoder = new TextEncoder()
     const contentBytes = encoder.encode(content)
@@ -342,7 +344,12 @@ class KnowledgeService {
           state: LoaderTaskItemState.PENDING,
           task: () => {
             const loaderReturn = ragApplication.addLoader(
-              new TextLoader({ text: content, chunkSize: base.chunkSize, chunkOverlap: base.chunkOverlap }),
+              new NoteLoader({
+                text: content,
+                sourceUrl,
+                chunkSize: base.chunkSize,
+                chunkOverlap: base.chunkOverlap
+              }),
               forceReload
             ) as Promise<LoaderReturn>
 
diff --git a/src/renderer/src/components/Spinner.tsx b/src/renderer/src/components/Spinner.tsx
index 74408fc50d..5495115056 100644
--- a/src/renderer/src/components/Spinner.tsx
+++ b/src/renderer/src/components/Spinner.tsx
@@ -1,6 +1,5 @@
 import { Search } from 'lucide-react'
 import { motion } from 'motion/react'
-import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
 interface Props {
@@ -18,7 +17,6 @@ const spinnerVariants = {
 }
 
 export default function Spinner({ text }: Props) {
-  const { t } = useTranslation()
   return (
     <Searching
       variants={spinnerVariants}
@@ -31,7 +29,7 @@ export default function Spinner({ text }: Props) {
         ease: 'easeInOut'
       }}>
       <Search size={16} style={{ color: 'unset' }} />
-      <span>{t(text)}</span>
+      <span>{text}</span>
     </Searching>
   )
 }
diff --git a/src/renderer/src/config/constant.ts b/src/renderer/src/config/constant.ts
index 5a50daa9d1..1a8a0d0fee 100644
--- a/src/renderer/src/config/constant.ts
+++ b/src/renderer/src/config/constant.ts
@@ -3,6 +3,7 @@ export const DEFAULT_CONTEXTCOUNT = 5
 export const DEFAULT_MAX_TOKENS = 4096
 export const DEFAULT_KNOWLEDGE_DOCUMENT_COUNT = 6
 export const DEFAULT_KNOWLEDGE_THRESHOLD = 0.0
+export const DEFAULT_WEBSEARCH_RAG_DOCUMENT_COUNT = 1
 
 export const platform = window.electron?.process?.platform
 export const isMac = platform === 'darwin'
diff --git a/src/renderer/src/hooks/useWebSearchProviders.ts b/src/renderer/src/hooks/useWebSearchProviders.ts
index b018d2a65c..f5c1dda78c 100644
--- a/src/renderer/src/hooks/useWebSearchProviders.ts
+++ b/src/renderer/src/hooks/useWebSearchProviders.ts
@@ -1,9 +1,12 @@
 import { useAppDispatch, useAppSelector } from '@renderer/store'
 import {
   addSubscribeSource as _addSubscribeSource,
+  type CompressionConfig,
   removeSubscribeSource as _removeSubscribeSource,
+  setCompressionConfig,
   setDefaultProvider as _setDefaultProvider,
   setSubscribeSources as _setSubscribeSources,
+  updateCompressionConfig,
   updateSubscribeBlacklist as _updateSubscribeBlacklist,
   updateWebSearchProvider,
   updateWebSearchProviders
@@ -90,3 +93,14 @@ export const useBlacklist = () => {
     setSubscribeSources
   }
 }
+
+export const useWebSearchSettings = () => {
+  const state = useAppSelector((state) => state.websearch)
+  const dispatch = useAppDispatch()
+
+  return {
+    ...state,
+    setCompressionConfig: (config: CompressionConfig) => dispatch(setCompressionConfig(config)),
+    updateCompressionConfig: (config: Partial<CompressionConfig>) => dispatch(updateCompressionConfig(config))
+  }
+}
diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index b36b931f25..ecb7182753 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -703,6 +703,13 @@
       "success.siyuan.export": "Successfully exported to Siyuan Note",
       "warn.yuque.exporting": "Exporting to Yuque, please do not request export repeatedly!",
       "warn.siyuan.exporting": "Exporting to Siyuan Note, please do not request export repeatedly!",
+      "websearch": {
+        "rag": "Executing RAG...",
+        "rag_complete": "Keeping {{countAfter}} out of {{countBefore}} results...",
+        "rag_failed": "RAG failed, returning empty results...",
+        "cutoff": "Truncating search content...",
+        "fetch_complete": "Completed {{count}} searches..."
+      },
       "download.success": "Download successfully",
       "download.failed": "Download failed"
     },
@@ -776,6 +783,7 @@
       "dimensions": "Dimensions {{dimensions}}",
       "edit": "Edit Model",
       "embedding": "Embedding",
+      "embedding_dimensions": "Embedding Dimensions",
       "embedding_model": "Embedding Model",
       "embedding_model_tooltip": "Add in Settings->Model Provider->Manage",
       "function_calling": "Function Calling",
@@ -1845,8 +1853,33 @@
         "overwrite_tooltip": "Force use search service instead of LLM",
         "apikey": "API key",
         "free": "Free",
-        "content_limit": "Content length limit",
-        "content_limit_tooltip": "Limit the content length of the search results; content that exceeds the limit will be truncated."
+        "compression": {
+          "title": "Search Result Compression",
+          "method": "Compression Method",
+          "method.none": "None",
+          "method.cutoff": "Cutoff",
+          "cutoff.limit": "Cutoff Limit",
+          "cutoff.limit.placeholder": "Enter length",
+          "cutoff.limit.tooltip": "Limit the content length of search results, content exceeding the limit will be truncated (e.g., 2000 characters)",
+          "cutoff.unit.char": "Char",
+          "cutoff.unit.token": "Token",
+          "method.rag": "RAG",
+          "rag.document_count": "Document Count",
+          "rag.document_count.default": "Default",
+          "rag.document_count.tooltip": "Expected number of documents to extract from each search result, the actual total number of extracted documents is this value multiplied by the number of search results.",
+          "rag.embedding_dimensions.auto_get": "Auto Get Dimensions",
+          "rag.embedding_dimensions.placeholder": "Leave empty",
+          "rag.embedding_dimensions.tooltip": "If left blank, the dimensions parameter will not be passed",
+          "info": {
+            "dimensions_auto_success": "Dimensions auto-obtained successfully, dimensions: {{dimensions}}"
+          },
+          "error": {
+            "embedding_model_required": "Please select an embedding model first",
+            "dimensions_auto_failed": "Failed to auto-obtain dimensions",
+            "provider_not_found": "Provider not found",
+            "rag_failed": "RAG failed"
+          }
+        }
       },
       "quickPhrase": {
         "title": "Quick Phrases",
diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json
index a43b02177c..4b0d34eeb2 100644
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@@ -702,6 +702,13 @@
       "warn.yuque.exporting": "語雀にエクスポート中です。重複してエクスポートしないでください!",
       "warn.siyuan.exporting": "思源ノートにエクスポート中です。重複してエクスポートしないでください!",
       "error.yuque.no_config": "語雀のAPIアドレスまたはトークンが設定されていません",
+      "websearch": {
+        "rag": "RAGを実行中...",
+        "rag_complete": "{{countBefore}}個の結果から{{countAfter}}個を保持...",
+        "rag_failed": "RAGが失敗しました。空の結果を返します...",
+        "cutoff": "検索内容を切り詰めています...",
+        "fetch_complete": "{{count}}回の検索を完了しました..."
+      },
       "download.success": "ダウンロードに成功しました",
       "download.failed": "ダウンロードに失敗しました",
       "error.fetchTopicName": "トピック名の取得に失敗しました"
@@ -776,6 +783,7 @@
       "dimensions": "{{dimensions}} 次元",
       "edit": "モデルを編集",
       "embedding": "埋め込み",
+      "embedding_dimensions": "埋め込み次元",
       "embedding_model": "埋め込み模型",
       "embedding_model_tooltip": "設定->モデルサービス->管理で追加",
       "function_calling": "関数呼び出し",
@@ -1826,8 +1834,33 @@
         "overwrite_tooltip": "大規模言語モデルではなく、サービス検索を使用する",
         "apikey": "API キー",
         "free": "無料",
-        "content_limit": "内容の長さ制限",
-        "content_limit_tooltip": "検索結果の内容長を制限し、制限を超える内容は切り捨てられます。"
+        "compression": {
+          "title": "検索結果の圧縮",
+          "method": "圧縮方法",
+          "method.none": "圧縮しない",
+          "method.cutoff": "切り捨て",
+          "cutoff.limit": "切り捨て長",
+          "cutoff.limit.placeholder": "長さを入力",
+          "cutoff.limit.tooltip": "検索結果の内容長を制限し、制限を超える内容は切り捨てられます（例：2000文字）",
+          "cutoff.unit.char": "文字",
+          "cutoff.unit.token": "トークン",
+          "method.rag": "RAG",
+          "rag.document_count": "文書数",
+          "rag.document_count.default": "デフォルト",
+          "rag.document_count.tooltip": "単一の検索結果から抽出する文書数。実際に抽出される文書数は、この値に検索結果数を乗じたものです。",
+          "rag.embedding_dimensions.auto_get": "次元を自動取得",
+          "rag.embedding_dimensions.placeholder": "次元を設定しない",
+          "rag.embedding_dimensions.tooltip": "空の場合、dimensions パラメーターは渡されません",
+          "info": {
+            "dimensions_auto_success": "次元が自動取得されました。次元: {{dimensions}}"
+          },
+          "error": {
+            "embedding_model_required": "まず埋め込みモデルを選択してください",
+            "dimensions_auto_failed": "次元の自動取得に失敗しました",
+            "provider_not_found": "プロバイダーが見つかりません",
+            "rag_failed": "RAG に失敗しました"
+          }
+        }
       },
       "general.auto_check_update.title": "自動更新",
       "general.early_access.title": "早期アクセス",
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index 3eea3431f4..d7f20e297b 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -702,6 +702,13 @@
       "success.siyuan.export": "Успешный экспорт в Siyuan",
       "warn.yuque.exporting": "Экспортируется в Yuque, пожалуйста, не отправляйте повторные запросы!",
       "warn.siyuan.exporting": "Экспортируется в Siyuan, пожалуйста, не отправляйте повторные запросы!",
+      "websearch": {
+        "rag": "Выполнение RAG...",
+        "rag_complete": "Сохранено {{countAfter}} из {{countBefore}} результатов...",
+        "rag_failed": "RAG не удалось, возвращается пустой результат...",
+        "cutoff": "Обрезка содержимого поиска...",
+        "fetch_complete": "Завершено {{count}} поисков..."
+      },
       "download.success": "Скачано успешно",
       "download.failed": "Скачивание не удалось",
       "error.fetchTopicName": "Не удалось назвать топик"
@@ -776,6 +783,7 @@
       "dimensions": "{{dimensions}} мер",
       "edit": "Редактировать модель",
       "embedding": "Встраиваемые",
+      "embedding_dimensions": "Встраиваемые размерности",
       "embedding_model": "Встраиваемые модели",
       "embedding_model_tooltip": "Добавьте в настройки->модель сервиса->управление",
       "function_calling": "Вызов функции",
@@ -1826,8 +1834,33 @@
         "overwrite_tooltip": "Использовать провайдера поиска вместо LLM",
         "apikey": "API ключ",
         "free": "Бесплатно",
-        "content_limit": "Ограничение длины текста",
-        "content_limit_tooltip": "Ограничьте длину содержимого результатов поиска, контент, превышающий ограничение, будет обрезан."
+        "compression": {
+          "title": "Сжатие результатов поиска",
+          "method": "Метод сжатия",
+          "method.none": "Не сжимать",
+          "method.cutoff": "Обрезка",
+          "cutoff.limit": "Лимит обрезки",
+          "cutoff.limit.placeholder": "Введите длину",
+          "cutoff.limit.tooltip": "Ограничьте длину содержимого результатов поиска, контент, превышающий ограничение, будет обрезан (например, 2000 символов)",
+          "cutoff.unit.char": "Символы",
+          "cutoff.unit.token": "Токены",
+          "method.rag": "RAG",
+          "rag.document_count": "Количество документов",
+          "rag.document_count.default": "По умолчанию",
+          "rag.document_count.tooltip": "Ожидаемое количество документов, которые будут извлечены из каждого результата поиска. Фактическое количество извлеченных документов равно этому значению, умноженному на количество результатов поиска.",
+          "rag.embedding_dimensions.auto_get": "Автоматически получить размерности",
+          "rag.embedding_dimensions.placeholder": "Не устанавливать размерности",
+          "rag.embedding_dimensions.tooltip": "Если оставить пустым, параметр dimensions не будет передан",
+          "info": {
+            "dimensions_auto_success": "Размерности успешно получены, размерности: {{dimensions}}"
+          },
+          "error": {
+            "embedding_model_required": "Пожалуйста, сначала выберите модель встраивания",
+            "dimensions_auto_failed": "Не удалось получить размерности",
+            "provider_not_found": "Поставщик не найден",
+            "rag_failed": "RAG не удалось"
+          }
+        }
       },
       "general.auto_check_update.title": "Автоматическое обновление",
       "general.early_access.title": "Ранний доступ",
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index 7bb2f25608..6b662d38ee 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -703,6 +703,13 @@
       "success.siyuan.export": "导出到思源笔记成功",
       "warn.yuque.exporting": "正在导出语雀, 请勿重复请求导出!",
       "warn.siyuan.exporting": "正在导出到思源笔记，请勿重复请求导出!",
+      "websearch": {
+        "rag": "正在执行 RAG...",
+        "rag_complete": "保留 {{countBefore}} 个结果中的 {{countAfter}} 个...",
+        "rag_failed": "RAG 失败，返回空结果...",
+        "cutoff": "正在截断搜索内容...",
+        "fetch_complete": "已完成 {{count}} 次搜索..."
+      },
       "download.success": "下载成功",
       "download.failed": "下载失败"
     },
@@ -776,6 +783,7 @@
       "dimensions": "{{dimensions}} 维",
       "edit": "编辑模型",
       "embedding": "嵌入",
+      "embedding_dimensions": "嵌入维度",
       "embedding_model": "嵌入模型",
       "embedding_model_tooltip": "在设置->模型服务中点击管理按钮添加",
       "function_calling": "函数调用",
@@ -1845,8 +1853,33 @@
         "title": "网络搜索",
         "apikey": "API 密钥",
         "free": "免费",
-        "content_limit": "内容长度限制",
-        "content_limit_tooltip": "限制搜索结果的内容长度, 超过限制的内容将被截断"
+        "compression": {
+          "title": "搜索结果压缩",
+          "method": "压缩方法",
+          "method.none": "不压缩",
+          "method.cutoff": "截断",
+          "cutoff.limit": "截断长度",
+          "cutoff.limit.placeholder": "输入长度",
+          "cutoff.limit.tooltip": "限制搜索结果的内容长度, 超过限制的内容将被截断（例如 2000 字符）",
+          "cutoff.unit.char": "字符",
+          "cutoff.unit.token": "Token",
+          "method.rag": "RAG",
+          "rag.document_count": "文档数量",
+          "rag.document_count.default": "默认",
+          "rag.document_count.tooltip": "预期从单个搜索结果中提取的文档数量，实际提取的总数量是这个值乘以搜索结果数量。",
+          "rag.embedding_dimensions.auto_get": "自动获取维度",
+          "rag.embedding_dimensions.placeholder": "不设置维度",
+          "rag.embedding_dimensions.tooltip": "留空则不传递 dimensions 参数",
+          "info": {
+            "dimensions_auto_success": "维度自动获取成功，维度为 {{dimensions}}"
+          },
+          "error": {
+            "embedding_model_required": "请先选择嵌入模型",
+            "dimensions_auto_failed": "维度自动获取失败",
+            "provider_not_found": "未找到服务商",
+            "rag_failed": "RAG 失败"
+          }
+        }
       },
       "quickPhrase": {
         "title": "快捷短语",
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index 949afc9639..44d99d4da9 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -703,6 +703,13 @@
       "success.siyuan.export": "導出到思源筆記成功",
       "warn.yuque.exporting": "正在導出語雀，請勿重複請求導出！",
       "warn.siyuan.exporting": "正在導出到思源筆記，請勿重複請求導出！",
+      "websearch": {
+        "rag": "正在執行 RAG...",
+        "rag_complete": "保留 {{countBefore}} 個結果中的 {{countAfter}} 個...",
+        "rag_failed": "RAG 失敗，返回空結果...",
+        "cutoff": "正在截斷搜尋內容...",
+        "fetch_complete": "已完成 {{count}} 次搜尋..."
+      },
       "download.success": "下載成功",
       "download.failed": "下載失敗"
     },
@@ -776,6 +783,7 @@
       "dimensions": "{{dimensions}} 維",
       "edit": "編輯模型",
       "embedding": "嵌入",
+      "embedding_dimensions": "嵌入維度",
       "embedding_model": "嵌入模型",
       "embedding_model_tooltip": "在設定->模型服務中點選管理按鈕新增",
       "function_calling": "函數調用",
@@ -1829,8 +1837,33 @@
         "overwrite_tooltip": "強制使用搜尋服務商而不是大語言模型進行搜尋",
         "apikey": "API 金鑰",
         "free": "免費",
-        "content_limit": "內容長度限制",
-        "content_limit_tooltip": "限制搜尋結果的內容長度，超過限制的內容將被截斷"
+        "compression": {
+          "title": "搜尋結果壓縮",
+          "method": "壓縮方法",
+          "method.none": "不壓縮",
+          "method.cutoff": "截斷",
+          "cutoff.limit": "截斷長度",
+          "cutoff.limit.placeholder": "輸入長度",
+          "cutoff.limit.tooltip": "限制搜尋結果的內容長度，超過限制的內容將被截斷（例如 2000 字符）",
+          "cutoff.unit.char": "字符",
+          "cutoff.unit.token": "Token",
+          "method.rag": "RAG",
+          "rag.document_count": "文檔數量",
+          "rag.document_count.default": "預設",
+          "rag.document_count.tooltip": "預期從單個搜尋結果中提取的文檔數量，實際提取的總數量是這個值乘以搜尋結果數量。",
+          "rag.embedding_dimensions.auto_get": "自動獲取維度",
+          "rag.embedding_dimensions.placeholder": "不設置維度",
+          "rag.embedding_dimensions.tooltip": "留空則不傳遞 dimensions 參數",
+          "info": {
+            "dimensions_auto_success": "維度自動獲取成功，維度為 {{dimensions}}"
+          },
+          "error": {
+            "embedding_model_required": "請先選擇嵌入模型",
+            "dimensions_auto_failed": "維度自動獲取失敗",
+            "provider_not_found": "未找到服務商",
+            "rag_failed": "RAG 失敗"
+          }
+        }
       },
       "general.auto_check_update.title": "自動更新",
       "general.early_access.title": "搶先體驗",
diff --git a/src/renderer/src/pages/home/Messages/Blocks/CitationBlock.tsx b/src/renderer/src/pages/home/Messages/Blocks/CitationBlock.tsx
index fdd4640d00..f86dd6de16 100644
--- a/src/renderer/src/pages/home/Messages/Blocks/CitationBlock.tsx
+++ b/src/renderer/src/pages/home/Messages/Blocks/CitationBlock.tsx
@@ -5,13 +5,19 @@ import { selectFormattedCitationsByBlockId } from '@renderer/store/messageBlock'
 import { WebSearchSource } from '@renderer/types'
 import { type CitationMessageBlock, MessageBlockStatus } from '@renderer/types/newMessage'
 import React, { useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
 import { useSelector } from 'react-redux'
 import styled from 'styled-components'
 
 import CitationsList from '../CitationsList'
 
 function CitationBlock({ block }: { block: CitationMessageBlock }) {
+  const { t } = useTranslation()
   const formattedCitations = useSelector((state: RootState) => selectFormattedCitationsByBlockId(state, block.id))
+  const { websearch } = useSelector((state: RootState) => state.runtime)
+  const message = useSelector((state: RootState) => state.messages.entities[block.messageId])
+  const userMessageId = message?.askId || block.messageId // 如果没有 askId 则回退到 messageId
+
   const hasGeminiBlock = block.response?.source === WebSearchSource.GEMINI
   const hasCitations = useMemo(() => {
     return (
@@ -21,8 +27,32 @@ function CitationBlock({ block }: { block: CitationMessageBlock }) {
     )
   }, [formattedCitations, block.knowledge, hasGeminiBlock])
 
+  const getWebSearchStatusText = (requestId: string) => {
+    const status = websearch.activeSearches[requestId] ?? { phase: 'default' }
+
+    switch (status.phase) {
+      case 'fetch_complete':
+        return t('message.websearch.fetch_complete', {
+          count: status.countAfter ?? 0
+        })
+      case 'rag':
+        return t('message.websearch.rag')
+      case 'rag_complete':
+        return t('message.websearch.rag_complete', {
+          countBefore: status.countBefore ?? 0,
+          countAfter: status.countAfter ?? 0
+        })
+      case 'rag_failed':
+        return t('message.websearch.rag_failed')
+      case 'cutoff':
+        return t('message.websearch.cutoff')
+      default:
+        return t('message.searching')
+    }
+  }
+
   if (block.status === MessageBlockStatus.PROCESSING) {
-    return <Spinner text="message.searching" />
+    return <Spinner text={getWebSearchStatusText(userMessageId)} />
   }
 
   if (!hasCitations) {
diff --git a/src/renderer/src/pages/knowledge/components/KnowledgeSearchPopup.tsx b/src/renderer/src/pages/knowledge/components/KnowledgeSearchPopup.tsx
index 21be188ffc..fc12ba5aec 100644
--- a/src/renderer/src/pages/knowledge/components/KnowledgeSearchPopup.tsx
+++ b/src/renderer/src/pages/knowledge/components/KnowledgeSearchPopup.tsx
@@ -41,7 +41,8 @@ const PopupContainer: React.FC<Props> = ({ base, resolve }) => {
       const searchResults = await searchKnowledgeBase(value, base)
       setResults(searchResults)
     } catch (error) {
-      console.error('Search failed:', error)
+      console.error(`Failed to search knowledge base ${base.name}:`, error)
+      setResults([])
     } finally {
       setLoading(false)
     }
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx b/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx
index 098c007ca8..2a85df4b7f 100644
--- a/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx
+++ b/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx
@@ -1,18 +1,16 @@
 import { useTheme } from '@renderer/context/ThemeProvider'
-import { useAppDispatch, useAppSelector } from '@renderer/store'
-import { setContentLimit, setMaxResult, setSearchWithTime } from '@renderer/store/websearch'
-import { Input, Slider, Switch, Tooltip } from 'antd'
+import { useWebSearchSettings } from '@renderer/hooks/useWebSearchProviders'
+import { useAppDispatch } from '@renderer/store'
+import { setMaxResult, setSearchWithTime } from '@renderer/store/websearch'
+import { Slider, Switch } from 'antd'
 import { t } from 'i18next'
-import { Info } from 'lucide-react'
 import { FC } from 'react'
 
 import { SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '..'
 
 const BasicSettings: FC = () => {
   const { theme } = useTheme()
-  const searchWithTime = useAppSelector((state) => state.websearch.searchWithTime)
-  const maxResults = useAppSelector((state) => state.websearch.maxResults)
-  const contentLimit = useAppSelector((state) => state.websearch.contentLimit)
+  const { searchWithTime, maxResults } = useWebSearchSettings()
 
   const dispatch = useAppDispatch()
 
@@ -38,28 +36,6 @@ const BasicSettings: FC = () => {
             onChangeComplete={(value) => dispatch(setMaxResult(value))}
           />
         </SettingRow>
-        <SettingDivider style={{ marginTop: 15, marginBottom: 10 }} />
-        <SettingRow>
-          <SettingRowTitle>
-            {t('settings.websearch.content_limit')}
-            <Tooltip title={t('settings.websearch.content_limit_tooltip')} placement="right">
-              <Info size={16} color="var(--color-icon)" style={{ marginLeft: 5, cursor: 'pointer' }} />
-            </Tooltip>
-          </SettingRowTitle>
-          <Input
-            style={{ width: '100px' }}
-            placeholder="2000"
-            value={contentLimit === undefined ? '' : contentLimit}
-            onChange={(e) => {
-              const value = e.target.value
-              if (value === '') {
-                dispatch(setContentLimit(undefined))
-              } else if (!isNaN(Number(value)) && Number(value) > 0) {
-                dispatch(setContentLimit(Number(value)))
-              }
-            }}
-          />
-        </SettingRow>
       </SettingGroup>
     </>
   )
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/CutoffSettings.tsx b/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/CutoffSettings.tsx
new file mode 100644
index 0000000000..add4024598
--- /dev/null
+++ b/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/CutoffSettings.tsx
@@ -0,0 +1,60 @@
+import { useWebSearchSettings } from '@renderer/hooks/useWebSearchProviders'
+import { SettingRow, SettingRowTitle } from '@renderer/pages/settings'
+import { Input, Select, Space, Tooltip } from 'antd'
+import { ChevronDown, Info } from 'lucide-react'
+import { useTranslation } from 'react-i18next'
+
+const INPUT_BOX_WIDTH = '200px'
+
+const CutoffSettings = () => {
+  const { t } = useTranslation()
+  const { compressionConfig, updateCompressionConfig } = useWebSearchSettings()
+
+  const handleCutoffLimitChange = (value: number | null) => {
+    updateCompressionConfig({ cutoffLimit: value || undefined })
+  }
+
+  const handleCutoffUnitChange = (unit: 'char' | 'token') => {
+    updateCompressionConfig({ cutoffUnit: unit })
+  }
+
+  const unitOptions = [
+    { value: 'char', label: t('settings.websearch.compression.cutoff.unit.char') },
+    { value: 'token', label: t('settings.websearch.compression.cutoff.unit.token') }
+  ]
+
+  return (
+    <SettingRow>
+      <SettingRowTitle>
+        {t('settings.websearch.compression.cutoff.limit')}
+        <Tooltip title={t('settings.websearch.compression.cutoff.limit.tooltip')} placement="right">
+          <Info size={16} color="var(--color-icon)" style={{ marginLeft: 5, cursor: 'pointer' }} />
+        </Tooltip>
+      </SettingRowTitle>
+      <Space.Compact style={{ width: INPUT_BOX_WIDTH }}>
+        <Input
+          style={{ maxWidth: '60%' }}
+          placeholder={t('settings.websearch.compression.cutoff.limit.placeholder')}
+          value={compressionConfig?.cutoffLimit === undefined ? '' : compressionConfig.cutoffLimit}
+          onChange={(e) => {
+            const value = e.target.value
+            if (value === '') {
+              handleCutoffLimitChange(null)
+            } else if (!isNaN(Number(value)) && Number(value) > 0) {
+              handleCutoffLimitChange(Number(value))
+            }
+          }}
+        />
+        <Select
+          value={compressionConfig?.cutoffUnit || 'char'}
+          style={{ minWidth: '40%' }}
+          onChange={handleCutoffUnitChange}
+          options={unitOptions}
+          suffixIcon={<ChevronDown size={16} color="var(--color-border)" />}
+        />
+      </Space.Compact>
+    </SettingRow>
+  )
+}
+
+export default CutoffSettings
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/RagSettings.tsx b/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/RagSettings.tsx
new file mode 100644
index 0000000000..c064bfc59b
--- /dev/null
+++ b/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/RagSettings.tsx
@@ -0,0 +1,207 @@
+import AiProvider from '@renderer/aiCore'
+import { DEFAULT_WEBSEARCH_RAG_DOCUMENT_COUNT } from '@renderer/config/constant'
+import Logger from '@renderer/config/logger'
+import { isEmbeddingModel, isRerankModel } from '@renderer/config/models'
+import { NOT_SUPPORTED_REANK_PROVIDERS } from '@renderer/config/providers'
+import { useProviders } from '@renderer/hooks/useProvider'
+import { useWebSearchSettings } from '@renderer/hooks/useWebSearchProviders'
+import { SettingDivider, SettingRow, SettingRowTitle } from '@renderer/pages/settings'
+import { getModelUniqId } from '@renderer/services/ModelService'
+import { Model } from '@renderer/types'
+import { Button, InputNumber, Select, Slider, Tooltip } from 'antd'
+import { find, sortBy } from 'lodash'
+import { ChevronDown, Info, RefreshCw } from 'lucide-react'
+import { useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+const INPUT_BOX_WIDTH = '200px'
+
+const RagSettings = () => {
+  const { t } = useTranslation()
+  const { providers } = useProviders()
+  const { compressionConfig, updateCompressionConfig } = useWebSearchSettings()
+  const [loadingDimensions, setLoadingDimensions] = useState(false)
+
+  const embeddingModels = useMemo(() => {
+    return providers
+      .map((p) => p.models)
+      .flat()
+      .filter((model) => isEmbeddingModel(model))
+  }, [providers])
+
+  const rerankModels = useMemo(() => {
+    return providers
+      .map((p) => p.models)
+      .flat()
+      .filter((model) => isRerankModel(model))
+  }, [providers])
+
+  const embeddingSelectOptions = useMemo(() => {
+    return providers
+      .filter((p) => p.models.length > 0)
+      .map((p) => ({
+        label: p.isSystem ? t(`provider.${p.id}`) : p.name,
+        title: p.name,
+        options: sortBy(p.models, 'name')
+          .filter((model) => isEmbeddingModel(model))
+          .map((m) => ({
+            label: m.name,
+            value: getModelUniqId(m),
+            providerId: p.id,
+            modelId: m.id
+          }))
+      }))
+      .filter((group) => group.options.length > 0)
+  }, [providers, t])
+
+  const rerankSelectOptions = useMemo(() => {
+    return providers
+      .filter((p) => p.models.length > 0)
+      .filter((p) => !NOT_SUPPORTED_REANK_PROVIDERS.includes(p.id))
+      .map((p) => ({
+        label: p.isSystem ? t(`provider.${p.id}`) : p.name,
+        title: p.name,
+        options: sortBy(p.models, 'name')
+          .filter((model) => isRerankModel(model))
+          .map((m) => ({
+            label: m.name,
+            value: getModelUniqId(m)
+          }))
+      }))
+      .filter((group) => group.options.length > 0)
+  }, [providers, t])
+
+  const handleEmbeddingModelChange = (modelValue: string) => {
+    const selectedModel = find(embeddingModels, JSON.parse(modelValue)) as Model
+    updateCompressionConfig({ embeddingModel: selectedModel })
+  }
+
+  const handleRerankModelChange = (modelValue?: string) => {
+    const selectedModel = modelValue ? (find(rerankModels, JSON.parse(modelValue)) as Model) : undefined
+    updateCompressionConfig({ rerankModel: selectedModel })
+  }
+
+  const handleEmbeddingDimensionsChange = (value: number | null) => {
+    updateCompressionConfig({ embeddingDimensions: value || undefined })
+  }
+
+  const handleDocumentCountChange = (value: number) => {
+    updateCompressionConfig({ documentCount: value })
+  }
+
+  const handleAutoGetDimensions = async () => {
+    if (!compressionConfig?.embeddingModel) {
+      Logger.log('[RagSettings] handleAutoGetDimensions: no embedding model')
+      window.message.error(t('settings.websearch.compression.error.embedding_model_required'))
+      return
+    }
+
+    const provider = providers.find((p) => p.id === compressionConfig.embeddingModel?.provider)
+    if (!provider) {
+      Logger.log('[RagSettings] handleAutoGetDimensions: provider not found')
+      window.message.error(t('settings.websearch.compression.error.provider_not_found'))
+      return
+    }
+
+    setLoadingDimensions(true)
+    try {
+      const aiProvider = new AiProvider(provider)
+      const dimensions = await aiProvider.getEmbeddingDimensions(compressionConfig.embeddingModel)
+
+      updateCompressionConfig({ embeddingDimensions: dimensions })
+
+      window.message.success(t('settings.websearch.compression.info.dimensions_auto_success', { dimensions }))
+    } catch (error) {
+      Logger.error('[RagSettings] handleAutoGetDimensions: failed to get embedding dimensions', error)
+      window.message.error(t('settings.websearch.compression.error.dimensions_auto_failed'))
+    } finally {
+      setLoadingDimensions(false)
+    }
+  }
+
+  return (
+    <>
+      <SettingRow>
+        <SettingRowTitle>{t('models.embedding_model')}</SettingRowTitle>
+        <Select
+          value={compressionConfig?.embeddingModel ? getModelUniqId(compressionConfig.embeddingModel) : undefined}
+          style={{ width: INPUT_BOX_WIDTH }}
+          options={embeddingSelectOptions}
+          placeholder={t('settings.models.empty')}
+          onChange={handleEmbeddingModelChange}
+          allowClear={false}
+          showSearch
+          suffixIcon={<ChevronDown size={16} color="var(--color-border)" />}
+        />
+      </SettingRow>
+      <SettingDivider />
+
+      <SettingRow>
+        <SettingRowTitle>
+          {t('models.embedding_dimensions')}
+          <Tooltip title={t('settings.websearch.compression.rag.embedding_dimensions.tooltip')}>
+            <Info size={16} color="var(--color-icon)" style={{ marginLeft: 5, cursor: 'pointer' }} />
+          </Tooltip>
+        </SettingRowTitle>
+        <div style={{ display: 'flex', gap: '8px', alignItems: 'center', width: INPUT_BOX_WIDTH }}>
+          <InputNumber
+            value={compressionConfig?.embeddingDimensions}
+            style={{ flex: 1 }}
+            placeholder={t('settings.websearch.compression.rag.embedding_dimensions.placeholder')}
+            min={0}
+            onChange={handleEmbeddingDimensionsChange}
+          />
+          <Tooltip title={t('settings.websearch.compression.rag.embedding_dimensions.auto_get')}>
+            <Button
+              icon={<RefreshCw size={16} />}
+              loading={loadingDimensions}
+              disabled={!compressionConfig?.embeddingModel}
+              onClick={handleAutoGetDimensions}
+            />
+          </Tooltip>
+        </div>
+      </SettingRow>
+      <SettingDivider />
+
+      <SettingRow>
+        <SettingRowTitle>{t('models.rerank_model')}</SettingRowTitle>
+        <Select
+          value={compressionConfig?.rerankModel ? getModelUniqId(compressionConfig.rerankModel) : undefined}
+          style={{ width: INPUT_BOX_WIDTH }}
+          options={rerankSelectOptions}
+          placeholder={t('settings.models.empty')}
+          onChange={handleRerankModelChange}
+          allowClear
+          showSearch
+          suffixIcon={<ChevronDown size={16} color="var(--color-border)" />}
+        />
+      </SettingRow>
+      <SettingDivider />
+
+      <SettingRow>
+        <SettingRowTitle>
+          {t('settings.websearch.compression.rag.document_count')}
+          <Tooltip title={t('settings.websearch.compression.rag.document_count.tooltip')} placement="right">
+            <Info size={16} color="var(--color-icon)" style={{ marginLeft: 5, cursor: 'pointer' }} />
+          </Tooltip>
+        </SettingRowTitle>
+        <div style={{ width: INPUT_BOX_WIDTH }}>
+          <Slider
+            value={compressionConfig?.documentCount || DEFAULT_WEBSEARCH_RAG_DOCUMENT_COUNT}
+            min={1}
+            max={10}
+            step={1}
+            onChange={handleDocumentCountChange}
+            marks={{
+              1: t('settings.websearch.compression.rag.document_count.default'),
+              3: '3',
+              10: '10'
+            }}
+          />
+        </div>
+      </SettingRow>
+    </>
+  )
+}
+
+export default RagSettings
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/index.tsx b/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/index.tsx
new file mode 100644
index 0000000000..1ae8520add
--- /dev/null
+++ b/src/renderer/src/pages/settings/WebSearchSettings/CompressionSettings/index.tsx
@@ -0,0 +1,47 @@
+import { useWebSearchSettings } from '@renderer/hooks/useWebSearchProviders'
+import { SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '@renderer/pages/settings'
+import { Select } from 'antd'
+import { ChevronDown } from 'lucide-react'
+import { useTranslation } from 'react-i18next'
+
+import CutoffSettings from './CutoffSettings'
+import RagSettings from './RagSettings'
+
+const CompressionSettings = () => {
+  const { t } = useTranslation()
+  const { compressionConfig, updateCompressionConfig } = useWebSearchSettings()
+
+  const compressionMethodOptions = [
+    { value: 'none', label: t('settings.websearch.compression.method.none') },
+    { value: 'cutoff', label: t('settings.websearch.compression.method.cutoff') },
+    { value: 'rag', label: t('settings.websearch.compression.method.rag') }
+  ]
+
+  const handleCompressionMethodChange = (method: 'none' | 'cutoff' | 'rag') => {
+    updateCompressionConfig({ method })
+  }
+
+  return (
+    <SettingGroup>
+      <SettingTitle>{t('settings.websearch.compression.title')}</SettingTitle>
+      <SettingDivider />
+
+      <SettingRow>
+        <SettingRowTitle>{t('settings.websearch.compression.method')}</SettingRowTitle>
+        <Select
+          value={compressionConfig?.method || 'none'}
+          style={{ width: '200px' }}
+          onChange={handleCompressionMethodChange}
+          options={compressionMethodOptions}
+          suffixIcon={<ChevronDown size={16} color="var(--color-border)" />}
+        />
+      </SettingRow>
+      <SettingDivider />
+
+      {compressionConfig?.method === 'cutoff' && <CutoffSettings />}
+      {compressionConfig?.method === 'rag' && <RagSettings />}
+    </SettingGroup>
+  )
+}
+
+export default CompressionSettings
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/index.tsx b/src/renderer/src/pages/settings/WebSearchSettings/index.tsx
index 6fab13d388..ecf2b8375b 100644
--- a/src/renderer/src/pages/settings/WebSearchSettings/index.tsx
+++ b/src/renderer/src/pages/settings/WebSearchSettings/index.tsx
@@ -9,6 +9,7 @@ import { useTranslation } from 'react-i18next'
 import { SettingContainer, SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '..'
 import BasicSettings from './BasicSettings'
 import BlacklistSettings from './BlacklistSettings'
+import CompressionSettings from './CompressionSettings'
 import WebSearchProviderSetting from './WebSearchProviderSetting'
 
 const WebSearchSettings: FC = () => {
@@ -56,6 +57,7 @@ const WebSearchSettings: FC = () => {
         </SettingGroup>
       )}
       <BasicSettings />
+      <CompressionSettings />
       <BlacklistSettings />
     </SettingContainer>
   )
diff --git a/src/renderer/src/providers/WebSearchProvider/BochaProvider.ts b/src/renderer/src/providers/WebSearchProvider/BochaProvider.ts
index 6d2bc2401e..1a3d53d87c 100644
--- a/src/renderer/src/providers/WebSearchProvider/BochaProvider.ts
+++ b/src/renderer/src/providers/WebSearchProvider/BochaProvider.ts
@@ -26,15 +26,13 @@ export default class BochaProvider extends BaseWebSearchProvider {
         Authorization: `Bearer ${this.apiKey}`
       }
 
-      const contentLimit = websearch.contentLimit
-
       const params: BochaSearchParams = {
         query,
         count: websearch.maxResults,
         exclude: websearch.excludeDomains.join(','),
         freshness: websearch.searchWithTime ? 'oneDay' : 'noLimit',
-        summary: false,
-        page: contentLimit ? Math.ceil(contentLimit / websearch.maxResults) : 1
+        summary: true,
+        page: 1
       }
 
       const response = await fetch(`${this.apiHost}/v1/web-search`, {
@@ -58,7 +56,8 @@ export default class BochaProvider extends BaseWebSearchProvider {
         query: resp.data.queryContext.originalQuery,
         results: resp.data.webPages.value.map((result) => ({
           title: result.name,
-          content: result.snippet,
+          // 优先使用 summary（更详细），如果没有则使用 snippet
+          content: result.summary || result.snippet || '',
           url: result.url
         }))
       }
diff --git a/src/renderer/src/providers/WebSearchProvider/ExaProvider.ts b/src/renderer/src/providers/WebSearchProvider/ExaProvider.ts
index 8f65449b05..7aee19609f 100644
--- a/src/renderer/src/providers/WebSearchProvider/ExaProvider.ts
+++ b/src/renderer/src/providers/WebSearchProvider/ExaProvider.ts
@@ -35,14 +35,9 @@ export default class ExaProvider extends BaseWebSearchProvider {
       return {
         query: response.autopromptString,
         results: response.results.slice(0, websearch.maxResults).map((result) => {
-          let content = result.text || ''
-          if (websearch.contentLimit && content.length > websearch.contentLimit) {
-            content = content.slice(0, websearch.contentLimit) + '...'
-          }
-
           return {
             title: result.title || 'No title',
-            content: content,
+            content: result.text || '',
             url: result.url || ''
           }
         })
diff --git a/src/renderer/src/providers/WebSearchProvider/LocalSearchProvider.ts b/src/renderer/src/providers/WebSearchProvider/LocalSearchProvider.ts
index 8f171dd3e5..8a09b76016 100644
--- a/src/renderer/src/providers/WebSearchProvider/LocalSearchProvider.ts
+++ b/src/renderer/src/providers/WebSearchProvider/LocalSearchProvider.ts
@@ -55,11 +55,7 @@ export default class LocalSearchProvider extends BaseWebSearchProvider {
       // Fetch content for each URL concurrently
       const fetchPromises = validItems.map(async (item) => {
         // Logger.log(`Fetching content for ${item.url}...`)
-        const result = await fetchWebContent(item.url, 'markdown', this.provider.usingBrowser, httpOptions)
-        if (websearch.contentLimit && result.content.length > websearch.contentLimit) {
-          result.content = result.content.slice(0, websearch.contentLimit) + '...'
-        }
-        return result
+        return await fetchWebContent(item.url, 'markdown', this.provider.usingBrowser, httpOptions)
       })
 
       // Wait for all fetches to complete
diff --git a/src/renderer/src/providers/WebSearchProvider/SearxngProvider.ts b/src/renderer/src/providers/WebSearchProvider/SearxngProvider.ts
index 926da8a248..82b95142f6 100644
--- a/src/renderer/src/providers/WebSearchProvider/SearxngProvider.ts
+++ b/src/renderer/src/providers/WebSearchProvider/SearxngProvider.ts
@@ -122,11 +122,7 @@ export default class SearxngProvider extends BaseWebSearchProvider {
       // Fetch content for each URL concurrently
       const fetchPromises = validItems.map(async (item) => {
         // Logger.log(`Fetching content for ${item.url}...`)
-        const result = await fetchWebContent(item.url, 'markdown', this.provider.usingBrowser)
-        if (websearch.contentLimit && result.content.length > websearch.contentLimit) {
-          result.content = result.content.slice(0, websearch.contentLimit) + '...'
-        }
-        return result
+        return await fetchWebContent(item.url, 'markdown', this.provider.usingBrowser)
       })
 
       // Wait for all fetches to complete
diff --git a/src/renderer/src/providers/WebSearchProvider/TavilyProvider.ts b/src/renderer/src/providers/WebSearchProvider/TavilyProvider.ts
index e38b2661d9..225bce308f 100644
--- a/src/renderer/src/providers/WebSearchProvider/TavilyProvider.ts
+++ b/src/renderer/src/providers/WebSearchProvider/TavilyProvider.ts
@@ -31,14 +31,9 @@ export default class TavilyProvider extends BaseWebSearchProvider {
       return {
         query: result.query,
         results: result.results.slice(0, websearch.maxResults).map((result) => {
-          let content = result.content || ''
-          if (websearch.contentLimit && content.length > websearch.contentLimit) {
-            content = content.slice(0, websearch.contentLimit) + '...'
-          }
-
           return {
             title: result.title || 'No title',
-            content: content,
+            content: result.content || '',
             url: result.url || ''
           }
         })
diff --git a/src/renderer/src/services/ApiService.ts b/src/renderer/src/services/ApiService.ts
index fb2c073109..4704a8bfd3 100644
--- a/src/renderer/src/services/ApiService.ts
+++ b/src/renderer/src/services/ApiService.ts
@@ -157,8 +157,13 @@ async function fetchExternalTool(
     try {
       // Use the consolidated processWebsearch function
       WebSearchService.createAbortSignal(lastUserMessage.id)
+      const webSearchResponse = await WebSearchService.processWebsearch(
+        webSearchProvider!,
+        extractResults,
+        lastUserMessage.id
+      )
       return {
-        results: await WebSearchService.processWebsearch(webSearchProvider!, extractResults),
+        results: webSearchResponse,
         source: WebSearchSource.WEBSEARCH
       }
     } catch (error) {
diff --git a/src/renderer/src/services/KnowledgeService.ts b/src/renderer/src/services/KnowledgeService.ts
index da7b939161..707e4df0b8 100644
--- a/src/renderer/src/services/KnowledgeService.ts
+++ b/src/renderer/src/services/KnowledgeService.ts
@@ -130,7 +130,7 @@ export const searchKnowledgeBase = async (
     )
   } catch (error) {
     Logger.error(`Error searching knowledge base ${base.name}:`, error)
-    return []
+    throw error
   }
 }
 
diff --git a/src/renderer/src/services/WebSearchService.ts b/src/renderer/src/services/WebSearchService.ts
index cf773a7512..efb726a0aa 100644
--- a/src/renderer/src/services/WebSearchService.ts
+++ b/src/renderer/src/services/WebSearchService.ts
@@ -1,13 +1,38 @@
+import { DEFAULT_WEBSEARCH_RAG_DOCUMENT_COUNT } from '@renderer/config/constant'
 import Logger from '@renderer/config/logger'
+import i18n from '@renderer/i18n'
 import WebSearchEngineProvider from '@renderer/providers/WebSearchProvider'
 import store from '@renderer/store'
-import { WebSearchState } from '@renderer/store/websearch'
-import { WebSearchProvider, WebSearchProviderResponse } from '@renderer/types'
-import { hasObjectKey } from '@renderer/utils'
+import { setWebSearchStatus } from '@renderer/store/runtime'
+import { CompressionConfig, WebSearchState } from '@renderer/store/websearch'
+import {
+  KnowledgeBase,
+  KnowledgeItem,
+  KnowledgeReference,
+  WebSearchProvider,
+  WebSearchProviderResponse,
+  WebSearchProviderResult,
+  WebSearchStatus
+} from '@renderer/types'
+import { hasObjectKey, uuid } from '@renderer/utils'
 import { addAbortController } from '@renderer/utils/abortController'
+import { formatErrorMessage } from '@renderer/utils/error'
 import { ExtractResults } from '@renderer/utils/extract'
 import { fetchWebContents } from '@renderer/utils/fetch'
+import { consolidateReferencesByUrl, selectReferences } from '@renderer/utils/websearch'
 import dayjs from 'dayjs'
+import { LRUCache } from 'lru-cache'
+
+import { getKnowledgeBaseParams } from './KnowledgeService'
+import { getKnowledgeSourceUrl, searchKnowledgeBase } from './KnowledgeService'
+
+interface RequestState {
+  signal: AbortSignal | null
+  searchBase?: KnowledgeBase
+  isPaused: boolean
+  createdAt: number
+}
+
 /**
  * 提供网络搜索相关功能的服务类
  */
@@ -19,12 +44,47 @@ class WebSearchService {
 
   isPaused = false
 
-  createAbortSignal(key: string) {
+  // 管理不同请求的状态
+  private requestStates = new LRUCache<string, RequestState>({
+    max: 5, // 最多5个并发请求
+    ttl: 1000 * 60 * 2, // 2分钟过期
+    dispose: (requestState: RequestState, requestId: string) => {
+      if (!requestState.searchBase) return
+      window.api.knowledgeBase
+        .delete(requestState.searchBase.id)
+        .catch((error) => Logger.warn(`[WebSearchService] Failed to cleanup search base for ${requestId}:`, error))
+    }
+  })
+
+  /**
+   * 获取或创建单个请求的状态
+   * @param requestId 请求 ID（通常是消息 ID）
+   */
+  private getRequestState(requestId: string): RequestState {
+    let state = this.requestStates.get(requestId)
+    if (!state) {
+      state = {
+        signal: null,
+        isPaused: false,
+        createdAt: Date.now()
+      }
+      this.requestStates.set(requestId, state)
+    }
+    return state
+  }
+
+  createAbortSignal(requestId: string) {
     const controller = new AbortController()
-    this.signal = controller.signal
-    addAbortController(key, () => {
-      this.isPaused = true
+    this.signal = controller.signal // 保持向后兼容
+
+    const state = this.getRequestState(requestId)
+    state.signal = controller.signal
+
+    addAbortController(requestId, () => {
+      this.isPaused = true // 保持向后兼容
+      state.isPaused = true
       this.signal = null
+      this.requestStates.delete(requestId)
       controller.abort()
     })
     return controller
@@ -137,45 +197,338 @@ class WebSearchService {
     }
   }
 
+  /**
+   * 设置网络搜索状态
+   */
+  private async setWebSearchStatus(requestId: string, status: WebSearchStatus, delayMs?: number) {
+    store.dispatch(setWebSearchStatus({ requestId, status }))
+    if (delayMs) {
+      await new Promise((resolve) => setTimeout(resolve, delayMs))
+    }
+  }
+
+  /**
+   * 确保搜索压缩知识库存在并配置正确
+   */
+  private async ensureSearchBase(
+    config: CompressionConfig,
+    documentCount: number,
+    requestId: string
+  ): Promise<KnowledgeBase> {
+    const baseId = `websearch-compression-${requestId}`
+    const state = this.getRequestState(requestId)
+
+    // 如果已存在且配置未变，直接复用
+    if (state.searchBase && this.isConfigMatched(state.searchBase, config)) {
+      return state.searchBase
+    }
+
+    // 清理旧的知识库
+    if (state.searchBase) {
+      await window.api.knowledgeBase.delete(state.searchBase.id)
+    }
+
+    if (!config.embeddingModel) {
+      throw new Error('Embedding model is required for RAG compression')
+    }
+
+    // 创建新的知识库
+    state.searchBase = {
+      id: baseId,
+      name: `WebSearch-RAG-${requestId}`,
+      model: config.embeddingModel,
+      rerankModel: config.rerankModel,
+      dimensions: config.embeddingDimensions,
+      documentCount,
+      items: [],
+      created_at: Date.now(),
+      updated_at: Date.now(),
+      version: 1
+    }
+
+    // 更新LRU cache
+    this.requestStates.set(requestId, state)
+
+    // 创建知识库
+    const baseParams = getKnowledgeBaseParams(state.searchBase)
+    await window.api.knowledgeBase.create(baseParams)
+
+    return state.searchBase
+  }
+
+  /**
+   * 检查配置是否匹配
+   */
+  private isConfigMatched(base: KnowledgeBase, config: CompressionConfig): boolean {
+    return (
+      base.model.id === config.embeddingModel?.id &&
+      base.rerankModel?.id === config.rerankModel?.id &&
+      base.dimensions === config.embeddingDimensions
+    )
+  }
+
+  /**
+   * 对搜索知识库执行多问题查询并按分数排序
+   * @param questions 问题列表
+   * @param searchBase 搜索知识库
+   * @returns 排序后的知识引用列表
+   */
+  private async querySearchBase(questions: string[], searchBase: KnowledgeBase): Promise<KnowledgeReference[]> {
+    // 1. 单独搜索每个问题
+    const searchPromises = questions.map((question) => searchKnowledgeBase(question, searchBase))
+    const allResults = await Promise.all(searchPromises)
+
+    // 2. 合并所有结果并按分数排序
+    const flatResults = allResults.flat().sort((a, b) => b.score - a.score)
+
+    // 3. 去重，保留最高分的重复内容
+    const seen = new Set<string>()
+    const uniqueResults = flatResults.filter((item) => {
+      if (seen.has(item.pageContent)) {
+        return false
+      }
+      seen.add(item.pageContent)
+      return true
+    })
+
+    // 4. 转换为引用格式
+    return await Promise.all(
+      uniqueResults.map(async (result, index) => ({
+        id: index + 1,
+        content: result.pageContent,
+        sourceUrl: await getKnowledgeSourceUrl(result),
+        type: 'url' as const
+      }))
+    )
+  }
+
+  /**
+   * 使用RAG压缩搜索结果。
+   * - 一次性将所有搜索结果添加到知识库
+   * - 从知识库中 retrieve 相关结果
+   * - 根据 sourceUrl 映射回原始搜索结果
+   *
+   * @param questions 问题列表
+   * @param rawResults 原始搜索结果
+   * @param config 压缩配置
+   * @param requestId 请求ID
+   * @returns 压缩后的搜索结果
+   */
+  private async compressWithSearchBase(
+    questions: string[],
+    rawResults: WebSearchProviderResult[],
+    config: CompressionConfig,
+    requestId: string
+  ): Promise<WebSearchProviderResult[]> {
+    // 根据搜索次数计算所需的文档数量
+    const totalDocumentCount =
+      Math.max(0, rawResults.length) * (config.documentCount ?? DEFAULT_WEBSEARCH_RAG_DOCUMENT_COUNT)
+
+    const searchBase = await this.ensureSearchBase(config, totalDocumentCount, requestId)
+
+    // 1. 清空知识库
+    await window.api.knowledgeBase.reset(getKnowledgeBaseParams(searchBase))
+
+    // 2. 一次性添加所有搜索结果到知识库
+    const addPromises = rawResults.map(async (result) => {
+      const item: KnowledgeItem & { sourceUrl?: string } = {
+        id: uuid(),
+        type: 'note',
+        content: result.content,
+        sourceUrl: result.url, // 设置 sourceUrl 用于映射
+        created_at: Date.now(),
+        updated_at: Date.now(),
+        processingStatus: 'pending'
+      }
+
+      await window.api.knowledgeBase.add({
+        base: getKnowledgeBaseParams(searchBase),
+        item
+      })
+    })
+
+    // 等待所有结果添加完成
+    await Promise.all(addPromises)
+
+    // 3. 对知识库执行多问题搜索获取压缩结果
+    const references = await this.querySearchBase(questions, searchBase)
+
+    // 4. 使用 Round Robin 策略选择引用
+    const selectedReferences = selectReferences(rawResults, references, totalDocumentCount)
+
+    Logger.log('[WebSearchService] With RAG, the number of search results:', {
+      raw: rawResults.length,
+      retrieved: references.length,
+      selected: selectedReferences.length
+    })
+
+    // 5. 按 sourceUrl 分组并合并同源片段
+    return consolidateReferencesByUrl(rawResults, selectedReferences)
+  }
+
+  /**
+   * 使用截断方式压缩搜索结果，可以选择单位 char 或 token。
+   *
+   * @param rawResults 原始搜索结果
+   * @param config 压缩配置
+   * @returns 截断后的搜索结果
+   */
+  private async compressWithCutoff(
+    rawResults: WebSearchProviderResult[],
+    config: CompressionConfig
+  ): Promise<WebSearchProviderResult[]> {
+    if (!config.cutoffLimit) {
+      Logger.warn('[WebSearchService] Cutoff limit is not set, skipping compression')
+      return rawResults
+    }
+
+    const perResultLimit = Math.max(1, Math.floor(config.cutoffLimit / rawResults.length))
+
+    // 动态导入 tokenx
+    const { sliceByTokens } = await import('tokenx')
+
+    return rawResults.map((result) => {
+      if (config.cutoffUnit === 'token') {
+        // 使用 token 截断
+        const slicedContent = sliceByTokens(result.content, 0, perResultLimit)
+        return {
+          ...result,
+          content: slicedContent.length < result.content.length ? slicedContent + '...' : slicedContent
+        }
+      } else {
+        // 使用字符截断（默认行为）
+        return {
+          ...result,
+          content:
+            result.content.length > perResultLimit ? result.content.slice(0, perResultLimit) + '...' : result.content
+        }
+      }
+    })
+  }
+
+  /**
+   * 处理网络搜索请求的核心方法，处理过程中会设置运行时状态供 UI 使用。
+   *
+   * 该方法执行以下步骤：
+   * - 验证输入参数并处理边界情况
+   * - 处理特殊的summarize请求
+   * - 并行执行多个搜索查询
+   * - 聚合搜索结果并处理失败情况
+   * - 根据配置应用结果压缩（RAG或截断）
+   * - 返回最终的搜索响应
+   *
+   * @param webSearchProvider - 要使用的网络搜索提供商
+   * @param extractResults - 包含搜索问题和链接的提取结果对象
+   * @param requestId - 唯一的请求标识符，用于状态跟踪和资源管理
+   *
+   * @returns 包含搜索结果的响应对象
+   */
   public async processWebsearch(
     webSearchProvider: WebSearchProvider,
-    extractResults: ExtractResults
+    extractResults: ExtractResults,
+    requestId: string
   ): Promise<WebSearchProviderResponse> {
+    // 重置状态
+    await this.setWebSearchStatus(requestId, { phase: 'default' })
+
     // 检查 websearch 和 question 是否有效
     if (!extractResults.websearch?.question || extractResults.websearch.question.length === 0) {
       Logger.log('[processWebsearch] No valid question found in extractResults.websearch')
       return { results: [] }
     }
 
+    // 使用请求特定的signal，如果没有则回退到全局signal
+    const signal = this.getRequestState(requestId).signal || this.signal
+
     const questions = extractResults.websearch.question
     const links = extractResults.websearch.links
-    const firstQuestion = questions[0]
-    if (firstQuestion === 'summarize' && links && links.length > 0) {
-      const contents = await fetchWebContents(links, undefined, undefined, {
-        signal: this.signal
-      })
-      return {
-        query: 'summaries',
-        results: contents
-      }
-    }
-    const searchPromises = questions.map((q) => this.search(webSearchProvider, q, { signal: this.signal }))
-    const searchResults = await Promise.allSettled(searchPromises)
-    const aggregatedResults: any[] = []
 
+    // 处理 summarize
+    if (questions[0] === 'summarize' && links && links.length > 0) {
+      const contents = await fetchWebContents(links, undefined, undefined, { signal })
+      return { query: 'summaries', results: contents }
+    }
+
+    const searchPromises = questions.map((q) => this.search(webSearchProvider, q, { signal }))
+    const searchResults = await Promise.allSettled(searchPromises)
+
+    // 统计成功完成的搜索数量
+    const successfulSearchCount = searchResults.filter((result) => result.status === 'fulfilled').length
+    if (successfulSearchCount > 1) {
+      await this.setWebSearchStatus(
+        requestId,
+        {
+          phase: 'fetch_complete',
+          countAfter: successfulSearchCount
+        },
+        1000
+      )
+    }
+
+    let finalResults: WebSearchProviderResult[] = []
     searchResults.forEach((result) => {
       if (result.status === 'fulfilled') {
         if (result.value.results) {
-          aggregatedResults.push(...result.value.results)
+          finalResults.push(...result.value.results)
         }
       }
       if (result.status === 'rejected') {
         throw result.reason
       }
     })
+
+    // 如果没有搜索结果，直接返回空结果
+    if (finalResults.length === 0) {
+      await this.setWebSearchStatus(requestId, { phase: 'default' })
+      return {
+        query: questions.join(' | '),
+        results: []
+      }
+    }
+
+    const { compressionConfig } = this.getWebSearchState()
+
+    // RAG压缩处理
+    if (compressionConfig?.method === 'rag' && requestId) {
+      await this.setWebSearchStatus(requestId, { phase: 'rag' }, 500)
+
+      const originalCount = finalResults.length
+
+      try {
+        finalResults = await this.compressWithSearchBase(questions, finalResults, compressionConfig, requestId)
+        await this.setWebSearchStatus(
+          requestId,
+          {
+            phase: 'rag_complete',
+            countBefore: originalCount,
+            countAfter: finalResults.length
+          },
+          1000
+        )
+      } catch (error) {
+        Logger.warn('[WebSearchService] RAG compression failed, will return empty results:', error)
+        window.message.error({
+          key: 'websearch-rag-failed',
+          duration: 10,
+          content: `${i18n.t('settings.websearch.compression.error.rag_failed')}: ${formatErrorMessage(error)}`
+        })
+
+        finalResults = []
+        await this.setWebSearchStatus(requestId, { phase: 'rag_failed' }, 1000)
+      }
+    }
+    // 截断压缩处理
+    else if (compressionConfig?.method === 'cutoff' && compressionConfig.cutoffLimit) {
+      await this.setWebSearchStatus(requestId, { phase: 'cutoff' }, 500)
+      finalResults = await this.compressWithCutoff(finalResults, compressionConfig)
+    }
+
+    // 重置状态
+    await this.setWebSearchStatus(requestId, { phase: 'default' })
+
     return {
       query: questions.join(' | '),
-      results: aggregatedResults
+      results: finalResults
     }
   }
 }
diff --git a/src/renderer/src/store/index.ts b/src/renderer/src/store/index.ts
index ae5c52a9fb..4a26bf96c0 100644
--- a/src/renderer/src/store/index.ts
+++ b/src/renderer/src/store/index.ts
@@ -50,7 +50,7 @@ const persistedReducer = persistReducer(
   {
     key: 'cherry-studio',
     storage,
-    version: 115,
+    version: 116,
     blacklist: ['runtime', 'messages', 'messageBlocks'],
     migrate
   },
diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts
index 0e9385de0c..c8a132180f 100644
--- a/src/renderer/src/store/migrate.ts
+++ b/src/renderer/src/store/migrate.ts
@@ -1631,6 +1631,31 @@ const migrateConfig = {
       if (state.settings) {
         state.settings.upgradeChannel = UpgradeChannel.LATEST
       }
+      return state
+    } catch (error) {
+      return state
+    }
+  },
+  '116': (state: RootState) => {
+    try {
+      if (state.websearch) {
+        // migrate contentLimit to cutoffLimit
+        // @ts-ignore eslint-disable-next-line
+        if (state.websearch.contentLimit) {
+          state.websearch.compressionConfig = {
+            method: 'cutoff',
+            cutoffUnit: 'char',
+            // @ts-ignore eslint-disable-next-line
+            cutoffLimit: state.websearch.contentLimit
+          }
+        } else {
+          state.websearch.compressionConfig = { method: 'none', cutoffUnit: 'char' }
+        }
+
+        // @ts-ignore eslint-disable-next-line
+        delete state.websearch.contentLimit
+      }
+
       return state
     } catch (error) {
       return state
diff --git a/src/renderer/src/store/runtime.ts b/src/renderer/src/store/runtime.ts
index 5c84ab8000..d1e3752d10 100644
--- a/src/renderer/src/store/runtime.ts
+++ b/src/renderer/src/store/runtime.ts
@@ -1,6 +1,6 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
 import { AppLogo, UserAvatar } from '@renderer/config/env'
-import type { MinAppType, Topic } from '@renderer/types'
+import type { MinAppType, Topic, WebSearchStatus } from '@renderer/types'
 import type { UpdateInfo } from 'builder-util-runtime'
 
 export interface ChatState {
@@ -13,6 +13,10 @@ export interface ChatState {
   newlyRenamedTopics: string[]
 }
 
+export interface WebSearchState {
+  activeSearches: Record<string, WebSearchStatus>
+}
+
 export interface UpdateState {
   info: UpdateInfo | null
   checking: boolean
@@ -39,6 +43,7 @@ export interface RuntimeState {
   update: UpdateState
   export: ExportState
   chat: ChatState
+  websearch: WebSearchState
 }
 
 export interface ExportState {
@@ -72,6 +77,9 @@ const initialState: RuntimeState = {
     activeTopic: null,
     renamingTopics: [],
     newlyRenamedTopics: []
+  },
+  websearch: {
+    activeSearches: {}
   }
 }
 
@@ -130,6 +138,17 @@ const runtimeSlice = createSlice({
     },
     setNewlyRenamedTopics: (state, action: PayloadAction<string[]>) => {
       state.chat.newlyRenamedTopics = action.payload
+    },
+    // WebSearch related actions
+    setActiveSearches: (state, action: PayloadAction<Record<string, WebSearchStatus>>) => {
+      state.websearch.activeSearches = action.payload
+    },
+    setWebSearchStatus: (state, action: PayloadAction<{ requestId: string; status: WebSearchStatus }>) => {
+      const { requestId, status } = action.payload
+      if (status.phase === 'default') {
+        delete state.websearch.activeSearches[requestId]
+      }
+      state.websearch.activeSearches[requestId] = status
     }
   }
 })
@@ -151,7 +170,10 @@ export const {
   setSelectedMessageIds,
   setActiveTopic,
   setRenamingTopics,
-  setNewlyRenamedTopics
+  setNewlyRenamedTopics,
+  // WebSearch related actions
+  setActiveSearches,
+  setWebSearchStatus
 } = runtimeSlice.actions
 
 export default runtimeSlice.reducer
diff --git a/src/renderer/src/store/websearch.ts b/src/renderer/src/store/websearch.ts
index 4f223ccbf1..ad6172065a 100644
--- a/src/renderer/src/store/websearch.ts
+++ b/src/renderer/src/store/websearch.ts
@@ -1,5 +1,5 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
-import type { WebSearchProvider } from '@renderer/types'
+import type { Model, WebSearchProvider } from '@renderer/types'
 export interface SubscribeSource {
   key: number
   url: string
@@ -7,6 +7,16 @@ export interface SubscribeSource {
   blacklist?: string[] // 存储从该订阅源获取的黑名单
 }
 
+export interface CompressionConfig {
+  method: 'none' | 'cutoff' | 'rag'
+  cutoffLimit?: number
+  cutoffUnit?: 'char' | 'token'
+  embeddingModel?: Model
+  embeddingDimensions?: number // undefined表示自动获取
+  documentCount?: number // 每个搜索结果的文档数量（只是预期值）
+  rerankModel?: Model
+}
+
 export interface WebSearchState {
   // 默认搜索提供商的ID
   /** @deprecated 支持在快捷菜单中自选搜索供应商，所以这个不再适用 */
@@ -24,12 +34,13 @@ export interface WebSearchState {
   // 是否覆盖服务商搜索
   /** @deprecated 支持在快捷菜单中自选搜索供应商，所以这个不再适用 */
   overwrite: boolean
-  contentLimit?: number
+  // 搜索结果压缩
+  compressionConfig?: CompressionConfig
   // 具体供应商的配置
   providerConfig: Record<string, any>
 }
 
-const initialState: WebSearchState = {
+export const initialState: WebSearchState = {
   defaultProvider: 'local-bing',
   providers: [
     {
@@ -78,6 +89,10 @@ const initialState: WebSearchState = {
   excludeDomains: [],
   subscribeSources: [],
   overwrite: false,
+  compressionConfig: {
+    method: 'none',
+    cutoffUnit: 'char'
+  },
   providerConfig: {}
 }
 
@@ -150,8 +165,14 @@ const websearchSlice = createSlice({
         state.providers.push(action.payload)
       }
     },
-    setContentLimit: (state, action: PayloadAction<number | undefined>) => {
-      state.contentLimit = action.payload
+    setCompressionConfig: (state, action: PayloadAction<CompressionConfig>) => {
+      state.compressionConfig = action.payload
+    },
+    updateCompressionConfig: (state, action: PayloadAction<Partial<CompressionConfig>>) => {
+      state.compressionConfig = {
+        ...state.compressionConfig,
+        ...action.payload
+      } as CompressionConfig
     },
     setProviderConfig: (state, action: PayloadAction<Record<string, any>>) => {
       state.providerConfig = action.payload
@@ -176,7 +197,8 @@ export const {
   setSubscribeSources,
   setOverwrite,
   addWebSearchProvider,
-  setContentLimit,
+  setCompressionConfig,
+  updateCompressionConfig,
   setProviderConfig,
   updateProviderConfig
 } = websearchSlice.actions
diff --git a/src/renderer/src/types/index.ts b/src/renderer/src/types/index.ts
index 340119fa31..3b4cc5cdc3 100644
--- a/src/renderer/src/types/index.ts
+++ b/src/renderer/src/types/index.ts
@@ -500,7 +500,6 @@ export type WebSearchProvider = {
   url?: string
   basicAuthUsername?: string
   basicAuthPassword?: string
-  contentLimit?: number
   usingBrowser?: boolean
 }
 
@@ -542,6 +541,14 @@ export type WebSearchResponse = {
   source: WebSearchSource
 }
 
+export type WebSearchPhase = 'default' | 'fetch_complete' | 'rag' | 'rag_complete' | 'rag_failed' | 'cutoff'
+
+export type WebSearchStatus = {
+  phase: WebSearchPhase
+  countBefore?: number
+  countAfter?: number
+}
+
 export type KnowledgeReference = {
   id: number
   content: string
diff --git a/src/renderer/src/utils/__tests__/websearch.test.ts b/src/renderer/src/utils/__tests__/websearch.test.ts
new file mode 100644
index 0000000000..2f807d111e
--- /dev/null
+++ b/src/renderer/src/utils/__tests__/websearch.test.ts
@@ -0,0 +1,226 @@
+import { KnowledgeReference, WebSearchProviderResult } from '@renderer/types'
+import { describe, expect, it } from 'vitest'
+
+import { consolidateReferencesByUrl, selectReferences } from '../websearch'
+
+describe('websearch', () => {
+  describe('consolidateReferencesByUrl', () => {
+    const createMockRawResult = (url: string, title: string): WebSearchProviderResult => ({
+      title,
+      url,
+      content: `Original content for ${title}`
+    })
+
+    const createMockReference = (sourceUrl: string, content: string, id: number = 1): KnowledgeReference => ({
+      id,
+      sourceUrl,
+      content,
+      type: 'url'
+    })
+
+    it('should consolidate single reference to matching raw result', () => {
+      // 基本功能：单个引用与原始结果匹配
+      const rawResults = [createMockRawResult('https://example.com', 'Example Title')]
+      const references = [createMockReference('https://example.com', 'Retrieved content')]
+
+      const result = consolidateReferencesByUrl(rawResults, references)
+
+      expect(result).toHaveLength(1)
+      expect(result[0]).toEqual({
+        title: 'Example Title',
+        url: 'https://example.com',
+        content: 'Retrieved content'
+      })
+    })
+
+    it('should consolidate multiple references from same source URL', () => {
+      // 多个片段合并到同一个URL
+      const rawResults = [createMockRawResult('https://example.com', 'Example Title')]
+      const references = [
+        createMockReference('https://example.com', 'First content', 1),
+        createMockReference('https://example.com', 'Second content', 2)
+      ]
+
+      const result = consolidateReferencesByUrl(rawResults, references)
+
+      expect(result).toHaveLength(1)
+      expect(result[0]).toEqual({
+        title: 'Example Title',
+        url: 'https://example.com',
+        content: 'First content\n\n---\n\nSecond content'
+      })
+    })
+
+    it('should consolidate references from multiple source URLs', () => {
+      // 多个不同URL的引用
+      const rawResults = [
+        createMockRawResult('https://example.com', 'Example Title'),
+        createMockRawResult('https://test.com', 'Test Title')
+      ]
+      const references = [
+        createMockReference('https://example.com', 'Example content', 1),
+        createMockReference('https://test.com', 'Test content', 2)
+      ]
+
+      const result = consolidateReferencesByUrl(rawResults, references)
+
+      expect(result).toHaveLength(2)
+      // 结果顺序可能不确定，使用 toContainEqual
+      expect(result).toContainEqual({
+        title: 'Example Title',
+        url: 'https://example.com',
+        content: 'Example content'
+      })
+      expect(result).toContainEqual({
+        title: 'Test Title',
+        url: 'https://test.com',
+        content: 'Test content'
+      })
+    })
+
+    it('should use custom separator for multiple references', () => {
+      // 自定义分隔符
+      const rawResults = [createMockRawResult('https://example.com', 'Example Title')]
+      const references = [
+        createMockReference('https://example.com', 'First content', 1),
+        createMockReference('https://example.com', 'Second content', 2)
+      ]
+
+      const result = consolidateReferencesByUrl(rawResults, references, ' | ')
+
+      expect(result).toHaveLength(1)
+      expect(result[0].content).toBe('First content | Second content')
+    })
+
+    it('should ignore references with no matching raw result', () => {
+      // 无匹配的引用
+      const rawResults = [createMockRawResult('https://example.com', 'Example Title')]
+      const references = [
+        createMockReference('https://example.com', 'Matching content', 1),
+        createMockReference('https://nonexistent.com', 'Non-matching content', 2)
+      ]
+
+      const result = consolidateReferencesByUrl(rawResults, references)
+
+      expect(result).toHaveLength(1)
+      expect(result[0]).toEqual({
+        title: 'Example Title',
+        url: 'https://example.com',
+        content: 'Matching content'
+      })
+    })
+
+    it('should return empty array when no references match raw results', () => {
+      // 完全无匹配的情况
+      const rawResults = [createMockRawResult('https://example.com', 'Example Title')]
+      const references = [createMockReference('https://nonexistent.com', 'Non-matching content', 1)]
+
+      const result = consolidateReferencesByUrl(rawResults, references)
+
+      expect(result).toHaveLength(0)
+    })
+
+    it('should handle empty inputs', () => {
+      // 边界条件：空输入
+      expect(consolidateReferencesByUrl([], [])).toEqual([])
+
+      const rawResults = [createMockRawResult('https://example.com', 'Example Title')]
+      expect(consolidateReferencesByUrl(rawResults, [])).toEqual([])
+
+      const references = [createMockReference('https://example.com', 'Content', 1)]
+      expect(consolidateReferencesByUrl([], references)).toEqual([])
+    })
+
+    it('should preserve original result metadata', () => {
+      // 验证原始结果的元数据保持不变
+      const rawResults = [createMockRawResult('https://example.com', 'Complex Title with Special Characters & Symbols')]
+      const references = [createMockReference('https://example.com', 'New content', 1)]
+
+      const result = consolidateReferencesByUrl(rawResults, references)
+
+      expect(result[0].title).toBe('Complex Title with Special Characters & Symbols')
+      expect(result[0].url).toBe('https://example.com')
+    })
+  })
+
+  describe('selectReferences', () => {
+    const createMockRawResult = (url: string, title: string): WebSearchProviderResult => ({
+      title,
+      url,
+      content: `Original content for ${title}`
+    })
+
+    const createMockReference = (sourceUrl: string, content: string, id: number = 1): KnowledgeReference => ({
+      id,
+      sourceUrl,
+      content,
+      type: 'url'
+    })
+
+    it('should select references using round robin strategy', () => {
+      const rawResults = [
+        createMockRawResult('https://a.com', 'A'),
+        createMockRawResult('https://b.com', 'B'),
+        createMockRawResult('https://c.com', 'C')
+      ]
+
+      const references = [
+        createMockReference('https://a.com', 'A1', 1),
+        createMockReference('https://a.com', 'A2', 2),
+        createMockReference('https://b.com', 'B1', 3),
+        createMockReference('https://c.com', 'C1', 4),
+        createMockReference('https://c.com', 'C2', 5)
+      ]
+
+      const result = selectReferences(rawResults, references, 4)
+
+      expect(result).toHaveLength(4)
+      // 按照 rawResults 顺序轮询：A1, B1, C1, A2
+      expect(result[0].content).toBe('A1')
+      expect(result[1].content).toBe('B1')
+      expect(result[2].content).toBe('C1')
+      expect(result[3].content).toBe('A2')
+    })
+
+    it('should handle maxRefs larger than available references', () => {
+      const rawResults = [createMockRawResult('https://a.com', 'A')]
+      const references = [createMockReference('https://a.com', 'A1', 1)]
+
+      const result = selectReferences(rawResults, references, 10)
+
+      expect(result).toHaveLength(1)
+      expect(result[0].content).toBe('A1')
+    })
+
+    it('should return empty array for edge cases', () => {
+      const rawResults = [createMockRawResult('https://a.com', 'A')]
+      const references = [createMockReference('https://a.com', 'A1', 1)]
+
+      // maxRefs is 0
+      expect(selectReferences(rawResults, references, 0)).toEqual([])
+
+      // empty references
+      expect(selectReferences(rawResults, [], 5)).toEqual([])
+
+      // no matching URLs
+      const nonMatchingRefs = [createMockReference('https://different.com', 'Content', 1)]
+      expect(selectReferences(rawResults, nonMatchingRefs, 5)).toEqual([])
+    })
+
+    it('should preserve rawResults order in round robin', () => {
+      // rawResults 的顺序应该影响轮询顺序
+      const rawResults = [
+        createMockRawResult('https://z.com', 'Z'), // 应该第一个被选择
+        createMockRawResult('https://a.com', 'A') // 应该第二个被选择
+      ]
+
+      const references = [createMockReference('https://a.com', 'A1', 1), createMockReference('https://z.com', 'Z1', 2)]
+
+      const result = selectReferences(rawResults, references, 2)
+
+      expect(result).toHaveLength(2)
+      expect(result[0].content).toBe('Z1') // Z 先被选择
+      expect(result[1].content).toBe('A1') // A 后被选择
+    })
+  })
+})
diff --git a/src/renderer/src/utils/websearch.ts b/src/renderer/src/utils/websearch.ts
new file mode 100644
index 0000000000..05f82861c8
--- /dev/null
+++ b/src/renderer/src/utils/websearch.ts
@@ -0,0 +1,116 @@
+import { KnowledgeReference, WebSearchProviderResult } from '@renderer/types'
+
+/**
+ * 将检索到的知识片段按源URL整合为搜索结果
+ *
+ * 这个函数接收原始搜索结果和从知识库检索到的相关片段，
+ * 将同源的片段按URL分组并合并为最终的搜索结果。
+ *
+ * @param rawResults 原始搜索结果，用于提供标题和URL信息
+ * @param references 从知识库检索到的相关片段
+ * @param separator 合并片段时使用的分隔符，默认为 '\n\n---\n\n'
+ * @returns 合并后的搜索结果数组
+ */
+export function consolidateReferencesByUrl(
+  rawResults: WebSearchProviderResult[],
+  references: KnowledgeReference[],
+  separator: string = '\n\n---\n\n'
+): WebSearchProviderResult[] {
+  // 创建URL到原始结果的映射，用于快速查找
+  const urlToOriginalResult = new Map(rawResults.map((result) => [result.url, result]))
+
+  // 使用 reduce 进行分组和内容收集
+  const sourceGroups = references.reduce((groups, reference) => {
+    const originalResult = urlToOriginalResult.get(reference.sourceUrl)
+    if (!originalResult) return groups
+
+    const existing = groups.get(reference.sourceUrl)
+    if (existing) {
+      // 如果已存在该URL的分组，直接添加内容
+      existing.contents.push(reference.content)
+    } else {
+      // 创建新的分组
+      groups.set(reference.sourceUrl, {
+        originalResult,
+        contents: [reference.content]
+      })
+    }
+    return groups
+  }, new Map<string, { originalResult: WebSearchProviderResult; contents: string[] }>())
+
+  // 转换为最终结果
+  return Array.from(sourceGroups.values(), (group) => ({
+    title: group.originalResult.title,
+    url: group.originalResult.url,
+    content: group.contents.join(separator)
+  }))
+}
+
+/**
+ * 使用 Round Robin 策略从引用中选择指定数量的项目
+ * 按照原始搜索结果的顺序轮询选择，确保每个源都有机会被选中
+ *
+ * @param rawResults 原始搜索结果，用于确定轮询顺序
+ * @param references 所有可选的引用项目
+ * @param maxRefs 最大选择数量
+ * @returns 按 Round Robin 策略选择的引用数组
+ */
+export function selectReferences(
+  rawResults: WebSearchProviderResult[],
+  references: KnowledgeReference[],
+  maxRefs: number
+): KnowledgeReference[] {
+  if (maxRefs <= 0 || references.length === 0) {
+    return []
+  }
+
+  // 建立URL到索引的映射，用于确定轮询顺序
+  const urlToIndex = new Map<string, number>()
+  rawResults.forEach((result, index) => {
+    urlToIndex.set(result.url, index)
+  })
+
+  // 按sourceUrl分组references，每组内按原顺序保持（已按分数排序）
+  const groupsByUrl = new Map<string, KnowledgeReference[]>()
+  references.forEach((ref) => {
+    if (!groupsByUrl.has(ref.sourceUrl)) {
+      groupsByUrl.set(ref.sourceUrl, [])
+    }
+    groupsByUrl.get(ref.sourceUrl)!.push(ref)
+  })
+
+  // 获取有效的URL列表，按rawResults顺序排序
+  const availableUrls = Array.from(groupsByUrl.keys())
+    .filter((url) => urlToIndex.has(url))
+    .sort((a, b) => urlToIndex.get(a)! - urlToIndex.get(b)!)
+
+  if (availableUrls.length === 0) {
+    return []
+  }
+
+  // Round Robin 选择
+  const selected: KnowledgeReference[] = []
+  let roundIndex = 0
+
+  while (selected.length < maxRefs && availableUrls.length > 0) {
+    const currentUrl = availableUrls[roundIndex]
+    const group = groupsByUrl.get(currentUrl)!
+
+    if (group.length > 0) {
+      selected.push(group.shift()!)
+    }
+
+    // 如果当前组为空，从可用URL列表中移除
+    if (group.length === 0) {
+      availableUrls.splice(roundIndex, 1)
+      // 调整索引，避免跳过下一个URL
+      if (roundIndex >= availableUrls.length) {
+        roundIndex = 0
+      }
+    } else {
+      roundIndex = (roundIndex + 1) % availableUrls.length
+    }
+  }
+
+  return selected
+}
diff --git a/yarn.lock b/yarn.lock
index eefde56f9c..2386409f15 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5745,7 +5745,7 @@ __metadata:
     styled-components: "npm:^6.1.11"
     tar: "npm:^7.4.3"
     tiny-pinyin: "npm:^1.3.2"
-    tokenx: "npm:^0.4.1"
+    tokenx: "npm:^1.1.0"
     turndown: "npm:7.2.0"
     typescript: "npm:^5.6.2"
     uuid: "npm:^10.0.0"
@@ -17588,10 +17588,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tokenx@npm:^0.4.1":
-  version: 0.4.1
-  resolution: "tokenx@npm:0.4.1"
-  checksum: 10c0/377f4e3c31ff9dc57b5b6af0fb1ae821227dee5e1d87b92a3ab1a0ed25454f01185c709d73592002b0d3024de1c904c8f029c46ae1806677816e4659fb8c481e
+"tokenx@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "tokenx@npm:1.1.0"
+  checksum: 10c0/8214bce58b48e130bcf4a27ac1bb5abf486c395310fb0c8f54e31656acacf97da533372afb9e8ac8f7736e6c3f29af86ea9623d4875f1399e66a5203b80609db
   languageName: node
   linkType: hard
 

From 98b12fb8009ed1e84454d38455b14e2a3705073a Mon Sep 17 00:00:00 2001
From: Chen Tao <70054568+eeee0717@users.noreply.github.com>
Date: Fri, 27 Jun 2025 18:07:17 +0800
Subject: [PATCH 61/75] fix: tei reranker (#7606)

fix(tei)
---
 src/main/reranker/BaseReranker.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/reranker/BaseReranker.ts b/src/main/reranker/BaseReranker.ts
index 9a40dfbdf8..83d241fe85 100644
--- a/src/main/reranker/BaseReranker.ts
+++ b/src/main/reranker/BaseReranker.ts
@@ -86,7 +86,7 @@ export default abstract class BaseReranker {
       return data.output.results
     } else if (provider === 'voyageai') {
       return data.data
-    } else if (provider === 'mis-tei') {
+    } else if (provider?.includes('tei')) {
       return data.map((item: any) => {
         return {
           index: item.index,

From c7c1cf2552ea96cb8728e333cc12d5c1801e7a1a Mon Sep 17 00:00:00 2001
From: one <wangan.cs@gmail.com>
Date: Fri, 27 Jun 2025 21:53:43 +0800
Subject: [PATCH 62/75] refactor: increase css editor height, fix
 EditMcpJsonPopup (#7535)

* refactor: increase css editor height

* fix: lint warnings

* refactor: use vh for height

* fix: editmcpjsonpopup editor unavailable after deleting all the code
---
 .../settings/DataSettings/DataSettings.tsx    |  2 +-
 .../DisplaySettings/DisplaySettings.tsx       |  4 +-
 .../settings/MCPSettings/EditMcpJsonPopup.tsx | 42 ++++++++++---------
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx b/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
index 93a138f847..fece64a16a 100644
--- a/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
@@ -546,7 +546,7 @@ const DataSettings: FC = () => {
     }
 
     handleDataMigration()
-  }, [])
+  }, [t])
 
   const onSkipBackupFilesChange = (value: boolean) => {
     setSkipBackupFile(value)
diff --git a/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx b/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx
index 56d09bd8dc..27453ef1cd 100644
--- a/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx
+++ b/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx
@@ -315,9 +315,9 @@ const DisplaySettings: FC = () => {
           language="css"
           placeholder={t('settings.display.custom.css.placeholder')}
           onChange={(value) => dispatch(setCustomCss(value))}
-          height="350px"
+          height="60vh"
           options={{
-            collapsible: true,
+            collapsible: false,
             wrappable: true,
             autocompletion: true,
             lineNumbers: true,
diff --git a/src/renderer/src/pages/settings/MCPSettings/EditMcpJsonPopup.tsx b/src/renderer/src/pages/settings/MCPSettings/EditMcpJsonPopup.tsx
index 77ad41fb54..0e505b3840 100644
--- a/src/renderer/src/pages/settings/MCPSettings/EditMcpJsonPopup.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/EditMcpJsonPopup.tsx
@@ -3,7 +3,7 @@ import { TopView } from '@renderer/components/TopView'
 import { useAppDispatch, useAppSelector } from '@renderer/store'
 import { setMCPServers } from '@renderer/store/mcp'
 import { MCPServer } from '@renderer/types'
-import { Modal, Typography } from 'antd'
+import { Modal, Spin, Typography } from 'antd'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
@@ -16,12 +16,14 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
   const [jsonConfig, setJsonConfig] = useState('')
   const [jsonSaving, setJsonSaving] = useState(false)
   const [jsonError, setJsonError] = useState('')
+  const [isLoading, setIsLoading] = useState(true)
   const mcpServers = useAppSelector((state) => state.mcp.servers)
 
   const dispatch = useAppDispatch()
   const { t } = useTranslation()
 
   useEffect(() => {
+    setIsLoading(true)
     try {
       const mcpServersObj: Record<string, any> = {}
 
@@ -40,6 +42,8 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
     } catch (error) {
       console.error('Failed to format JSON:', error)
       setJsonError(t('settings.mcp.jsonFormatError'))
+    } finally {
+      setIsLoading(false)
     }
   }, [mcpServers, t])
 
@@ -118,24 +122,24 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
           {jsonError ? <span style={{ color: 'red' }}>{jsonError}</span> : ''}
         </Typography.Text>
       </div>
-      {jsonConfig && (
-        <div style={{ marginBottom: '16px' }}>
-          <CodeEditor
-            value={jsonConfig}
-            language="json"
-            onChange={(value) => setJsonConfig(value)}
-            maxHeight="60vh"
-            options={{
-              lint: true,
-              collapsible: true,
-              wrappable: true,
-              lineNumbers: true,
-              foldGutter: true,
-              highlightActiveLine: true,
-              keymap: true
-            }}
-          />
-        </div>
+      {isLoading ? (
+        <Spin size="large" />
+      ) : (
+        <CodeEditor
+          value={jsonConfig}
+          language="json"
+          onChange={(value) => setJsonConfig(value)}
+          height="60vh"
+          options={{
+            lint: true,
+            collapsible: false,
+            wrappable: true,
+            lineNumbers: true,
+            foldGutter: true,
+            highlightActiveLine: true,
+            keymap: true
+          }}
+        />
       )}
       <Typography.Text type="secondary">{t('settings.mcp.jsonModeHint')}</Typography.Text>
     </Modal>

From 2d3f5baf72c74ca498f265e68631cda7fce1f1f4 Mon Sep 17 00:00:00 2001
From: Wang Jiyuan <59059173+EurFelux@users.noreply.github.com>
Date: Fri, 27 Jun 2025 22:33:27 +0800
Subject: [PATCH 63/75] feat: Increase the upper limit of web search results
 (#7439)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(WebSearchSettings): 将最大搜索结果限制从20增加到50

* fix(WebSearchSettings): 调整搜索结果滑块宽度并添加50的标记
---
 .../src/pages/settings/WebSearchSettings/BasicSettings.tsx  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx b/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx
index 2a85df4b7f..f891e2aee1 100644
--- a/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx
+++ b/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx
@@ -28,11 +28,11 @@ const BasicSettings: FC = () => {
           <SettingRowTitle>{t('settings.websearch.search_max_result')}</SettingRowTitle>
           <Slider
             defaultValue={maxResults}
-            style={{ width: '200px' }}
+            style={{ width: '500px' }}
             min={1}
-            max={20}
+            max={50}
             step={1}
-            marks={{ 1: '1', 5: t('settings.websearch.search_result_default'), 20: '20' }}
+            marks={{ 1: '1', 5: t('settings.websearch.search_result_default'), 20: '20', 50: '50' }}
             onChangeComplete={(value) => dispatch(setMaxResult(value))}
           />
         </SettingRow>

From 14e31018f7b50519da55ca986961db3426131ce8 Mon Sep 17 00:00:00 2001
From: beyondkmp <beyondkmp@gmail.com>
Date: Sat, 28 Jun 2025 08:36:32 +0800
Subject: [PATCH 64/75] fix:  support spell check for mini app (#7602)

* feat(IpcChannel): add Webview_SetSpellCheckEnabled channel and implement spell check handling for webviews

- Introduced a new IPC channel for enabling/disabling spell check in webviews.
- Updated the registerIpc function to handle spell check settings for all webviews.
- Enhanced WebviewContainer to set spell check state on DOM ready event.
- Refactored context menu setup to accommodate webview context menus.

* refactor(ContextMenu): update methods to use Electron.WebContents instead of BrowserWindow

- Changed method signatures to accept Electron.WebContents for better context handling.
- Updated internal calls to utilize the new WebContents reference for toggling dev tools and managing spell check functionality.

* refactor(WebviewContainer): clean up import order and remove unused code

- Adjusted the import order in WebviewContainer.tsx for better readability.
- Removed redundant import of useSettings to streamline the component.
---
 packages/shared/IpcChannel.ts                 |  1 +
 src/main/ipc.ts                               | 15 +++++--
 src/main/services/ContextMenu.ts              | 16 +++----
 src/main/services/WindowService.ts            |  7 ++--
 src/preload/index.ts                          |  4 +-
 .../components/MinApp/WebviewContainer.tsx    | 11 +++++
 .../src/pages/settings/GeneralSettings.tsx    | 42 +++++++++----------
 7 files changed, 59 insertions(+), 37 deletions(-)

diff --git a/packages/shared/IpcChannel.ts b/packages/shared/IpcChannel.ts
index 8da9a67429..8782d02f24 100644
--- a/packages/shared/IpcChannel.ts
+++ b/packages/shared/IpcChannel.ts
@@ -38,6 +38,7 @@ export enum IpcChannel {
   Notification_OnClick = 'notification:on-click',
 
   Webview_SetOpenLinkExternal = 'webview:set-open-link-external',
+  Webview_SetSpellCheckEnabled = 'webview:set-spell-check-enabled',
 
   // Open
   Open_Path = 'open:path',
diff --git a/src/main/ipc.ts b/src/main/ipc.ts
index b2003f8db8..32baecac35 100644
--- a/src/main/ipc.ts
+++ b/src/main/ipc.ts
@@ -8,7 +8,7 @@ import { handleZoomFactor } from '@main/utils/zoom'
 import { UpgradeChannel } from '@shared/config/constant'
 import { IpcChannel } from '@shared/IpcChannel'
 import { Shortcut, ThemeMode } from '@types'
-import { BrowserWindow, dialog, ipcMain, session, shell } from 'electron'
+import { BrowserWindow, dialog, ipcMain, session, shell, webContents } from 'electron'
 import log from 'electron-log'
 import { Notification } from 'src/renderer/src/types/notification'
 
@@ -93,9 +93,10 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
 
   // spell check
   ipcMain.handle(IpcChannel.App_SetEnableSpellCheck, (_, isEnable: boolean) => {
-    const windows = BrowserWindow.getAllWindows()
-    windows.forEach((window) => {
-      window.webContents.session.setSpellCheckerEnabled(isEnable)
+    // disable spell check for all webviews
+    const webviews = webContents.getAllWebContents()
+    webviews.forEach((webview) => {
+      webview.session.setSpellCheckerEnabled(isEnable)
     })
   })
 
@@ -494,6 +495,12 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     setOpenLinkExternal(webviewId, isExternal)
   )
 
+  ipcMain.handle(IpcChannel.Webview_SetSpellCheckEnabled, (_, webviewId: number, isEnable: boolean) => {
+    const webview = webContents.fromId(webviewId)
+    if (!webview) return
+    webview.session.setSpellCheckerEnabled(isEnable)
+  })
+
   // store sync
   storeSyncService.registerIpcHandler()
 
diff --git a/src/main/services/ContextMenu.ts b/src/main/services/ContextMenu.ts
index 34ec4b911a..411d6e075d 100644
--- a/src/main/services/ContextMenu.ts
+++ b/src/main/services/ContextMenu.ts
@@ -4,8 +4,8 @@ import { locales } from '../utils/locales'
 import { configManager } from './ConfigManager'
 
 class ContextMenu {
-  public contextMenu(w: Electron.BrowserWindow) {
-    w.webContents.on('context-menu', (_event, properties) => {
+  public contextMenu(w: Electron.WebContents) {
+    w.on('context-menu', (_event, properties) => {
       const template: MenuItemConstructorOptions[] = this.createEditMenuItems(properties)
       const filtered = template.filter((item) => item.visible !== false)
       if (filtered.length > 0) {
@@ -26,7 +26,7 @@ class ContextMenu {
     })
   }
 
-  private createInspectMenuItems(w: Electron.BrowserWindow): MenuItemConstructorOptions[] {
+  private createInspectMenuItems(w: Electron.WebContents): MenuItemConstructorOptions[] {
     const locale = locales[configManager.getLanguage()]
     const { common } = locale.translation
     const template: MenuItemConstructorOptions[] = [
@@ -34,7 +34,7 @@ class ContextMenu {
         id: 'inspect',
         label: common.inspect,
         click: () => {
-          w.webContents.toggleDevTools()
+          w.toggleDevTools()
         },
         enabled: true
       }
@@ -86,7 +86,7 @@ class ContextMenu {
 
   private createSpellCheckMenuItem(
     properties: Electron.ContextMenuParams,
-    mainWindow: Electron.BrowserWindow
+    w: Electron.WebContents
   ): MenuItemConstructorOptions {
     const hasText = properties.selectionText.length > 0
 
@@ -95,14 +95,14 @@ class ContextMenu {
       label: '&Learn Spelling',
       visible: Boolean(properties.isEditable && hasText && properties.misspelledWord),
       click: () => {
-        mainWindow.webContents.session.addWordToSpellCheckerDictionary(properties.misspelledWord)
+        w.session.addWordToSpellCheckerDictionary(properties.misspelledWord)
       }
     }
   }
 
   private createDictionarySuggestions(
     properties: Electron.ContextMenuParams,
-    mainWindow: Electron.BrowserWindow
+    w: Electron.WebContents
   ): MenuItemConstructorOptions[] {
     const hasText = properties.selectionText.length > 0
 
@@ -126,7 +126,7 @@ class ContextMenu {
       label: suggestion,
       visible: Boolean(properties.isEditable && hasText && properties.misspelledWord),
       click: (menuItem: Electron.MenuItem) => {
-        mainWindow.webContents.replaceMisspelling(menuItem.label)
+        w.replaceMisspelling(menuItem.label)
       }
     }))
   }
diff --git a/src/main/services/WindowService.ts b/src/main/services/WindowService.ts
index 78784120b0..ada014f0db 100644
--- a/src/main/services/WindowService.ts
+++ b/src/main/services/WindowService.ts
@@ -143,9 +143,10 @@ export class WindowService {
   }
 
   private setupContextMenu(mainWindow: BrowserWindow) {
-    contextMenu.contextMenu(mainWindow)
-    app.on('browser-window-created', (_, win) => {
-      contextMenu.contextMenu(win)
+    contextMenu.contextMenu(mainWindow.webContents)
+    // setup context menu for all webviews like miniapp
+    app.on('web-contents-created', (_, webContents) => {
+      contextMenu.contextMenu(webContents)
     })
 
     // Dangerous API
diff --git a/src/preload/index.ts b/src/preload/index.ts
index ed2a2042e0..7867c66917 100644
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -229,7 +229,9 @@ const api = {
   },
   webview: {
     setOpenLinkExternal: (webviewId: number, isExternal: boolean) =>
-      ipcRenderer.invoke(IpcChannel.Webview_SetOpenLinkExternal, webviewId, isExternal)
+      ipcRenderer.invoke(IpcChannel.Webview_SetOpenLinkExternal, webviewId, isExternal),
+    setSpellCheckEnabled: (webviewId: number, isEnable: boolean) =>
+      ipcRenderer.invoke(IpcChannel.Webview_SetSpellCheckEnabled, webviewId, isEnable)
   },
   storeSync: {
     subscribe: () => ipcRenderer.invoke(IpcChannel.StoreSync_Subscribe),
diff --git a/src/renderer/src/components/MinApp/WebviewContainer.tsx b/src/renderer/src/components/MinApp/WebviewContainer.tsx
index e5f08c350b..507de765af 100644
--- a/src/renderer/src/components/MinApp/WebviewContainer.tsx
+++ b/src/renderer/src/components/MinApp/WebviewContainer.tsx
@@ -1,3 +1,4 @@
+import { useSettings } from '@renderer/hooks/useSettings'
 import { WebviewTag } from 'electron'
 import { memo, useEffect, useRef } from 'react'
 
@@ -21,6 +22,7 @@ const WebviewContainer = memo(
     onNavigateCallback: (appid: string, url: string) => void
   }) => {
     const webviewRef = useRef<WebviewTag | null>(null)
+    const { enableSpellCheck } = useSettings()
 
     const setRef = (appid: string) => {
       onSetRefCallback(appid, null)
@@ -46,6 +48,14 @@ const WebviewContainer = memo(
         onNavigateCallback(appid, event.url)
       }
 
+      const handleDomReady = () => {
+        const webviewId = webviewRef.current?.getWebContentsId()
+        if (webviewId) {
+          window.api?.webview?.setSpellCheckEnabled?.(webviewId, enableSpellCheck)
+        }
+      }
+
+      webviewRef.current.addEventListener('dom-ready', handleDomReady)
       webviewRef.current.addEventListener('did-finish-load', handleLoaded)
       webviewRef.current.addEventListener('did-navigate-in-page', handleNavigate)
 
@@ -55,6 +65,7 @@ const WebviewContainer = memo(
       return () => {
         webviewRef.current?.removeEventListener('did-finish-load', handleLoaded)
         webviewRef.current?.removeEventListener('did-navigate-in-page', handleNavigate)
+        webviewRef.current?.removeEventListener('dom-ready', handleDomReady)
       }
       // because the appid and url are enough, no need to add onLoadedCallback
       // eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/src/renderer/src/pages/settings/GeneralSettings.tsx b/src/renderer/src/pages/settings/GeneralSettings.tsx
index 3c9ebd84d4..3f166a1cd4 100644
--- a/src/renderer/src/pages/settings/GeneralSettings.tsx
+++ b/src/renderer/src/pages/settings/GeneralSettings.tsx
@@ -172,27 +172,6 @@ const GeneralSettings: FC = () => {
           />
         </SettingRow>
         <SettingDivider />
-        <SettingRow>
-          <SettingRowTitle>{t('settings.proxy.mode.title')}</SettingRowTitle>
-          <Selector value={storeProxyMode} onChange={onProxyModeChange} options={proxyModeOptions} />
-        </SettingRow>
-        {storeProxyMode === 'custom' && (
-          <>
-            <SettingDivider />
-            <SettingRow>
-              <SettingRowTitle>{t('settings.proxy.title')}</SettingRowTitle>
-              <Input
-                placeholder="socks5://127.0.0.1:6153"
-                value={proxyUrl}
-                onChange={(e) => setProxyUrl(e.target.value)}
-                style={{ width: 180 }}
-                onBlur={() => onSetProxyUrl()}
-                type="url"
-              />
-            </SettingRow>
-          </>
-        )}
-        <SettingDivider />
         <SettingRow>
           <SettingRowTitle>{t('settings.general.spell_check')}</SettingRowTitle>
           <Switch checked={enableSpellCheck} onChange={handleSpellCheckChange} />
@@ -223,6 +202,27 @@ const GeneralSettings: FC = () => {
             </SettingRow>
           </>
         )}
+        <SettingDivider />
+        <SettingRow>
+          <SettingRowTitle>{t('settings.proxy.mode.title')}</SettingRowTitle>
+          <Selector value={storeProxyMode} onChange={onProxyModeChange} options={proxyModeOptions} />
+        </SettingRow>
+        {storeProxyMode === 'custom' && (
+          <>
+            <SettingDivider />
+            <SettingRow>
+              <SettingRowTitle>{t('settings.proxy.title')}</SettingRowTitle>
+              <Input
+                placeholder="socks5://127.0.0.1:6153"
+                value={proxyUrl}
+                onChange={(e) => setProxyUrl(e.target.value)}
+                style={{ width: 180 }}
+                onBlur={() => onSetProxyUrl()}
+                type="url"
+              />
+            </SettingRow>
+          </>
+        )}
       </SettingGroup>
       <SettingGroup theme={theme}>
         <SettingTitle>{t('settings.notification.title')}</SettingTitle>

From 49653435c25be7c4b4ed68a9dede23b5ef365635 Mon Sep 17 00:00:00 2001
From: Wang Jiyuan <59059173+EurFelux@users.noreply.github.com>
Date: Sat, 28 Jun 2025 14:10:55 +0800
Subject: [PATCH 65/75] fix(models): Add inference model detection for
 qwen-plus and qwen-turbo (#7622)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat(models): 添加对qwen-plus和qwen-turbo模型的推理模型判断
---
 src/renderer/src/config/models.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/renderer/src/config/models.ts b/src/renderer/src/config/models.ts
index 64b32c6699..0172bda938 100644
--- a/src/renderer/src/config/models.ts
+++ b/src/renderer/src/config/models.ts
@@ -2508,9 +2508,11 @@ export function isSupportedThinkingTokenQwenModel(model?: Model): boolean {
   return (
     baseName.startsWith('qwen3') ||
     [
+      'qwen-plus',
       'qwen-plus-latest',
       'qwen-plus-0428',
       'qwen-plus-2025-04-28',
+      'qwen-turbo',
       'qwen-turbo-latest',
       'qwen-turbo-0428',
       'qwen-turbo-2025-04-28'

From cf87a840f74b5bd1b3a52bc556c24469b880b26e Mon Sep 17 00:00:00 2001
From: beyondkmp <beyondkmp@gmail.com>
Date: Sat, 28 Jun 2025 16:45:02 +0800
Subject: [PATCH 66/75] fix(FileStorage): remove redundant WordExtractor import
 (#7625)

---
 src/main/services/FileStorage.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/services/FileStorage.ts b/src/main/services/FileStorage.ts
index 2d8810adca..0c81a454a7 100644
--- a/src/main/services/FileStorage.ts
+++ b/src/main/services/FileStorage.ts
@@ -19,6 +19,7 @@ import { getDocument } from 'officeparser/pdfjs-dist-build/pdf.js'
 import * as path from 'path'
 import { chdir } from 'process'
 import { v4 as uuidv4 } from 'uuid'
+import WordExtractor from 'word-extractor'
 
 class FileStorage {
   private storageDir = getFilesDir()
@@ -228,7 +229,6 @@ class FileStorage {
         chdir(this.tempDir)
 
         if (fileExtension === '.doc') {
-          const WordExtractor = require('word-extractor')
           const extractor = new WordExtractor()
           const extracted = await extractor.extract(filePath)
           chdir(originalCwd)

From 83b95f98309b60033ac6048dbdd40584fd82080b Mon Sep 17 00:00:00 2001
From: happyZYM <zhuangyumin@sjtu.edu.cn>
Date: Sat, 28 Jun 2025 16:45:54 +0800
Subject: [PATCH 67/75] fix: restore strict no-think for Openrouter provider
 with latest api (#7620)

---
 src/renderer/src/aiCore/clients/openai/OpenAIApiClient.ts | 7 +++----
 src/renderer/src/types/sdk.ts                             | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/aiCore/clients/openai/OpenAIApiClient.ts b/src/renderer/src/aiCore/clients/openai/OpenAIApiClient.ts
index a53247c1f7..499edfbb5c 100644
--- a/src/renderer/src/aiCore/clients/openai/OpenAIApiClient.ts
+++ b/src/renderer/src/aiCore/clients/openai/OpenAIApiClient.ts
@@ -113,6 +113,9 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
     }
 
     if (!reasoningEffort) {
+      if (model.provider === 'openrouter') {
+        return { reasoning: { enabled: false, exclude: true } }
+      }
       if (isSupportedThinkingTokenQwenModel(model)) {
         return { enable_thinking: false }
       }
@@ -122,10 +125,6 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
       }
 
       if (isSupportedThinkingTokenGeminiModel(model)) {
-        // openrouter没有提供一个不推理的选项，先隐藏
-        if (this.provider.id === 'openrouter') {
-          return { reasoning: { max_tokens: 0, exclude: true } }
-        }
         if (GEMINI_FLASH_MODEL_REGEX.test(model.id)) {
           return { reasoning_effort: 'none' }
         }
diff --git a/src/renderer/src/types/sdk.ts b/src/renderer/src/types/sdk.ts
index 559e02ecae..6505210b60 100644
--- a/src/renderer/src/types/sdk.ts
+++ b/src/renderer/src/types/sdk.ts
@@ -48,7 +48,7 @@ type OpenAIParamsWithoutReasoningEffort = Omit<OpenAI.Chat.Completions.ChatCompl
 
 export type ReasoningEffortOptionalParams = {
   thinking?: { type: 'disabled' | 'enabled' | 'auto'; budget_tokens?: number }
-  reasoning?: { max_tokens?: number; exclude?: boolean; effort?: string } | OpenAI.Reasoning
+  reasoning?: { max_tokens?: number; exclude?: boolean; effort?: string; enabled?: boolean } | OpenAI.Reasoning
   reasoning_effort?: OpenAI.Chat.Completions.ChatCompletionCreateParams['reasoning_effort'] | 'none' | 'auto'
   enable_thinking?: boolean
   thinking_budget?: number

From daaf9c2b0630d76bb7c1af03d9e50f730c9c46d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E7=94=B1=E7=9A=84=E4=B8=96=E7=95=8C=E4=BA=BA?=
 <3196812536@qq.com>
Date: Sat, 28 Jun 2025 16:51:49 +0800
Subject: [PATCH 68/75] fix: move ContentSearch below Messages in Chat layout
 (#7628)

Reordered the ContentSearch component to render after the Messages component within the Chat page. This change likely improves the UI flow by displaying the search functionality below the chat messages.
---
 src/renderer/src/pages/home/Chat.tsx | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/renderer/src/pages/home/Chat.tsx b/src/renderer/src/pages/home/Chat.tsx
index 8d16c5a36c..fb623b62a5 100644
--- a/src/renderer/src/pages/home/Chat.tsx
+++ b/src/renderer/src/pages/home/Chat.tsx
@@ -109,13 +109,6 @@ const Chat: FC<Props> = (props) => {
   return (
     <Container id="chat" className={classNames([messageStyle, { 'multi-select-mode': isMultiSelectMode }])}>
       <Main ref={mainRef} id="chat-main" vertical flex={1} justify="space-between" style={{ maxWidth }}>
-        <ContentSearch
-          ref={contentSearchRef}
-          searchTarget={mainRef as React.RefObject<HTMLElement>}
-          filter={contentSearchFilter}
-          includeUser={filterIncludeUser}
-          onIncludeUserChange={userOutlinedItemClickHandler}
-        />
         <Messages
           key={props.activeTopic.id}
           assistant={assistant}
@@ -124,6 +117,13 @@ const Chat: FC<Props> = (props) => {
           onComponentUpdate={messagesComponentUpdateHandler}
           onFirstUpdate={messagesComponentFirstUpdateHandler}
         />
+        <ContentSearch
+          ref={contentSearchRef}
+          searchTarget={mainRef as React.RefObject<HTMLElement>}
+          filter={contentSearchFilter}
+          includeUser={filterIncludeUser}
+          onIncludeUserChange={userOutlinedItemClickHandler}
+        />
         <QuickPanelProvider>
           <Inputbar assistant={assistant} setActiveTopic={props.setActiveTopic} topic={props.activeTopic} />
           {isMultiSelectMode && <MultiSelectActionPopup topic={props.activeTopic} />}

From dfcebe97678f31b84874046f2fd6cdaa5b0d2b9b Mon Sep 17 00:00:00 2001
From: SuYao <sy20010504@gmail.com>
Date: Sat, 28 Jun 2025 16:58:17 +0800
Subject: [PATCH 69/75] fix(models): update regex patterns for Doubao models
 and enhance function checks (#7624)

- Adjusted regex for visionAllowedModels and DOUBAO_THINKING_MODEL_REGEX to allow for optional suffixes.
- Enhanced isFunctionCallingModel and isDoubaoThinkingAutoModel functions to check both model.id and model.name for better matching.
---
 src/renderer/src/config/models.ts | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/config/models.ts b/src/renderer/src/config/models.ts
index 0172bda938..18d24d9ba6 100644
--- a/src/renderer/src/config/models.ts
+++ b/src/renderer/src/config/models.ts
@@ -184,7 +184,7 @@ const visionAllowedModels = [
   'deepseek-vl(?:[\\w-]+)?',
   'kimi-latest',
   'gemma-3(?:-[\\w-]+)',
-  'doubao-seed-1[.-]6(?:-[\\w-]+)'
+  'doubao-seed-1[.-]6(?:-[\\w-]+)?'
 ]
 
 const visionExcludedModels = [
@@ -273,6 +273,10 @@ export function isFunctionCallingModel(model: Model): boolean {
     return ['deepseek-v3-tool', 'deepseek-v3-0324', 'qwq-32b', 'qwen2.5-72b-instruct'].includes(model.id)
   }
 
+  if (model.provider === 'doubao') {
+    return FUNCTION_CALLING_REGEX.test(model.id) || FUNCTION_CALLING_REGEX.test(model.name)
+  }
+
   if (['deepseek', 'anthropic'].includes(model.provider)) {
     return true
   }
@@ -2525,7 +2529,7 @@ export function isSupportedThinkingTokenDoubaoModel(model?: Model): boolean {
     return false
   }
 
-  return DOUBAO_THINKING_MODEL_REGEX.test(model.id)
+  return DOUBAO_THINKING_MODEL_REGEX.test(model.id) || DOUBAO_THINKING_MODEL_REGEX.test(model.name)
 }
 
 export function isClaudeReasoningModel(model?: Model): boolean {
@@ -2857,13 +2861,14 @@ export const findTokenLimit = (modelId: string): { min: number; max: number } |
 
 // Doubao 支持思考模式的模型正则
 export const DOUBAO_THINKING_MODEL_REGEX =
-  /doubao-(?:1[.-]5-thinking-vision-pro|1[.-]5-thinking-pro-m|seed-1[.-]6(?:-flash)?)(?:-\d{6})?$/i
+  /doubao-(?:1[.-]5-thinking-vision-pro|1[.-]5-thinking-pro-m|seed-1[.-]6(?:-flash)?(?!-(?:thinking)(?:-|$)))(?:-[\w-]+)*/i
 
 // 支持 auto 的 Doubao 模型 doubao-seed-1.6-xxx doubao-seed-1-6-xxx  doubao-1-5-thinking-pro-m-xxx
-export const DOUBAO_THINKING_AUTO_MODEL_REGEX = /doubao-(1-5-thinking-pro-m|seed-1\.6|seed-1-6-[\w-]+)(?:-[\w-]+)*/i
+export const DOUBAO_THINKING_AUTO_MODEL_REGEX =
+  /doubao-(1-5-thinking-pro-m|seed-1[.-]6)(?!-(?:flash|thinking)(?:-|$))(?:-[\w-]+)*/i
 
 export function isDoubaoThinkingAutoModel(model: Model): boolean {
-  return DOUBAO_THINKING_AUTO_MODEL_REGEX.test(model.id)
+  return DOUBAO_THINKING_AUTO_MODEL_REGEX.test(model.id) || DOUBAO_THINKING_AUTO_MODEL_REGEX.test(model.name)
 }
 
 export const GEMINI_FLASH_MODEL_REGEX = new RegExp('gemini-.*-flash.*$')

From 780373d5f74781442d3f26800f3176d57a6ee60d Mon Sep 17 00:00:00 2001
From: beyondkmp <beyondkmp@gmail.com>
Date: Sat, 28 Jun 2025 17:17:47 +0800
Subject: [PATCH 70/75] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=20(#7590)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(AppUpdater): add support for pre-release versions and enhance feed URL logic

- Introduced a new FeedUrl for the lowest pre-release version.
- Updated AppUpdater to handle early access and upgrade channel settings more effectively.
- Enhanced IPC logging for early access and upgrade channel changes.
- Refactored feed URL setting logic to streamline update processes.

* fix(AppUpdater, ipc): enhance early access and upgrade channel handling

- Added checks to prevent unnecessary cancellation of downloads when early access and upgrade channel settings remain unchanged.
- Updated IPC handlers to ensure early access is enabled when switching upgrade channels if it was previously disabled.
- Improved logging for better traceability of changes in early access and upgrade channel settings.

* delete code

* delete logs

* refactor(AboutSettings): enhance upgrade channel management

- Introduced logic to determine the current upgrade channel based on version.
- Refactored available test channels to use a more structured approach with tooltips and labels.
- Updated the method for retrieving available test channels to improve clarity and maintainability.

* feat(IpcChannel, ConfigManager, AppUpdater): implement test plan and channel management

- Replaced early access features with test plan and test channel options in IpcChannel and ConfigManager.
- Updated IPC handlers to manage test plan and test channel settings, including logging enhancements.
- Refactored AppUpdater to support fetching pre-release versions based on the selected test channel.
- Modified settings and localization files to reflect the new test plan functionality.
- Adjusted AboutSettings and related components to integrate test plan management and improve user experience.

* format code

* refactor(AppUpdater, AboutSettings): improve test channel logic and localization updates

- Refactored the logic in AppUpdater to enhance the handling of test channels, ensuring correct channel retrieval based on the current version.
- Updated the AboutSettings component to include useEffect for managing test channel changes and displaying appropriate warnings.
- Modified localization files for multiple languages to clarify the behavior of test version switching, aligning with the new logic.
---
 packages/shared/IpcChannel.ts                 |  4 +-
 packages/shared/config/constant.ts            |  3 +-
 src/main/ipc.ts                               | 18 ++--
 src/main/services/AppUpdater.ts               | 83 +++++++++++++------
 src/main/services/ConfigManager.ts            | 20 ++---
 src/preload/index.ts                          |  4 +-
 src/renderer/src/hooks/useSettings.ts         | 16 ++--
 src/renderer/src/i18n/locales/en-us.json      | 17 ++--
 src/renderer/src/i18n/locales/ja-jp.json      | 17 ++--
 src/renderer/src/i18n/locales/ru-ru.json      | 17 ++--
 src/renderer/src/i18n/locales/zh-cn.json      | 17 ++--
 src/renderer/src/i18n/locales/zh-tw.json      | 17 ++--
 .../src/pages/settings/AboutSettings.tsx      | 65 +++++++++------
 src/renderer/src/store/migrate.ts             |  4 +-
 src/renderer/src/store/settings.ts            | 20 ++---
 15 files changed, 185 insertions(+), 137 deletions(-)

diff --git a/packages/shared/IpcChannel.ts b/packages/shared/IpcChannel.ts
index 8782d02f24..daea5dad6e 100644
--- a/packages/shared/IpcChannel.ts
+++ b/packages/shared/IpcChannel.ts
@@ -15,8 +15,8 @@ export enum IpcChannel {
   App_SetTrayOnClose = 'app:set-tray-on-close',
   App_SetTheme = 'app:set-theme',
   App_SetAutoUpdate = 'app:set-auto-update',
-  App_SetEnableEarlyAccess = 'app:set-enable-early-access',
-  App_SetUpgradeChannel = 'app:set-upgrade-channel',
+  App_SetTestPlan = 'app:set-test-plan',
+  App_SetTestChannel = 'app:set-test-channel',
   App_HandleZoomFactor = 'app:handle-zoom-factor',
   App_Select = 'app:select',
   App_HasWritePermission = 'app:has-write-permission',
diff --git a/packages/shared/config/constant.ts b/packages/shared/config/constant.ts
index 975767fefa..e4545d44cb 100644
--- a/packages/shared/config/constant.ts
+++ b/packages/shared/config/constant.ts
@@ -406,7 +406,8 @@ export const defaultLanguage = 'en-US'
 
 export enum FeedUrl {
   PRODUCTION = 'https://releases.cherry-ai.com',
-  GITHUB_LATEST = 'https://github.com/CherryHQ/cherry-studio/releases/latest/download'
+  GITHUB_LATEST = 'https://github.com/CherryHQ/cherry-studio/releases/latest/download',
+  PRERELEASE_LOWEST = 'https://github.com/CherryHQ/cherry-studio/releases/download/v1.4.0'
 }
 
 export enum UpgradeChannel {
diff --git a/src/main/ipc.ts b/src/main/ipc.ts
index 32baecac35..8c6810bcdc 100644
--- a/src/main/ipc.ts
+++ b/src/main/ipc.ts
@@ -142,14 +142,20 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     configManager.setAutoUpdate(isActive)
   })
 
-  ipcMain.handle(IpcChannel.App_SetEnableEarlyAccess, async (_, isActive: boolean) => {
-    appUpdater.cancelDownload()
-    configManager.setEnableEarlyAccess(isActive)
+  ipcMain.handle(IpcChannel.App_SetTestPlan, async (_, isActive: boolean) => {
+    log.info('set test plan', isActive)
+    if (isActive !== configManager.getTestPlan()) {
+      appUpdater.cancelDownload()
+      configManager.setTestPlan(isActive)
+    }
   })
 
-  ipcMain.handle(IpcChannel.App_SetUpgradeChannel, async (_, channel: UpgradeChannel) => {
-    appUpdater.cancelDownload()
-    configManager.setUpgradeChannel(channel)
+  ipcMain.handle(IpcChannel.App_SetTestChannel, async (_, channel: UpgradeChannel) => {
+    log.info('set test channel', channel)
+    if (channel !== configManager.getTestChannel()) {
+      appUpdater.cancelDownload()
+      configManager.setTestChannel(channel)
+    }
   })
 
   ipcMain.handle(IpcChannel.Config_Set, (_, key: string, value: any, isNotify: boolean = false) => {
diff --git a/src/main/services/AppUpdater.ts b/src/main/services/AppUpdater.ts
index e26a779d59..82165fd715 100644
--- a/src/main/services/AppUpdater.ts
+++ b/src/main/services/AppUpdater.ts
@@ -5,7 +5,7 @@ import { IpcChannel } from '@shared/IpcChannel'
 import { CancellationToken, UpdateInfo } from 'builder-util-runtime'
 import { app, BrowserWindow, dialog } from 'electron'
 import logger from 'electron-log'
-import { AppUpdater as _AppUpdater, autoUpdater, NsisUpdater } from 'electron-updater'
+import { AppUpdater as _AppUpdater, autoUpdater, NsisUpdater, UpdateCheckResult } from 'electron-updater'
 import path from 'path'
 
 import icon from '../../../build/icon.png?asset'
@@ -15,6 +15,7 @@ export default class AppUpdater {
   autoUpdater: _AppUpdater = autoUpdater
   private releaseInfo: UpdateInfo | undefined
   private cancellationToken: CancellationToken = new CancellationToken()
+  private updateCheckResult: UpdateCheckResult | null = null
 
   constructor(mainWindow: BrowserWindow) {
     logger.transports.file.level = 'info'
@@ -65,6 +66,7 @@ export default class AppUpdater {
 
   private async _getPreReleaseVersionFromGithub(channel: UpgradeChannel) {
     try {
+      logger.info('get pre release version from github', channel)
       const responses = await fetch('https://api.github.com/repos/CherryHQ/cherry-studio/releases?per_page=8', {
         headers: {
           Accept: 'application/vnd.github+json',
@@ -73,11 +75,12 @@ export default class AppUpdater {
         }
       })
       const data = (await responses.json()) as GithubReleaseInfo[]
-      logger.debug('github release data', data)
       const release: GithubReleaseInfo | undefined = data.find((item: GithubReleaseInfo) => {
         return item.prerelease && item.tag_name.includes(`-${channel}.`)
       })
 
+      logger.info('release info', release)
+
       if (!release) {
         return null
       }
@@ -119,31 +122,57 @@ export default class AppUpdater {
     autoUpdater.autoInstallOnAppQuit = isActive
   }
 
-  private async _setFeedUrl() {
-    // disable downgrade and differential download
-    // github and gitcode don't support multiple range download
-    this.autoUpdater.allowDowngrade = false
-    this.autoUpdater.disableDifferentialDownload = true
+  private _getChannelByVersion(version: string) {
+    if (version.includes(`-${UpgradeChannel.BETA}.`)) {
+      return UpgradeChannel.BETA
+    }
+    if (version.includes(`-${UpgradeChannel.RC}.`)) {
+      return UpgradeChannel.RC
+    }
+    return UpgradeChannel.LATEST
+  }
+
+  private _getTestChannel() {
+    const currentChannel = this._getChannelByVersion(app.getVersion())
+    const savedChannel = configManager.getTestChannel()
+
+    if (currentChannel === UpgradeChannel.LATEST) {
+      return savedChannel || UpgradeChannel.RC
+    }
+
+    if (savedChannel === currentChannel) {
+      return savedChannel
+    }
+
+    // if the upgrade channel is not equal to the current channel, use the latest channel
+    return UpgradeChannel.LATEST
+  }
+
+  private async _setFeedUrl() {
+    const testPlan = configManager.getTestPlan()
+    if (testPlan) {
+      const channel = this._getTestChannel()
 
-    if (configManager.getEnableEarlyAccess()) {
-      const channel = configManager.getUpgradeChannel()
       if (channel === UpgradeChannel.LATEST) {
-        this.autoUpdater.setFeedURL(FeedUrl.GITHUB_LATEST)
         this.autoUpdater.channel = UpgradeChannel.LATEST
-        return true
+        this.autoUpdater.setFeedURL(FeedUrl.GITHUB_LATEST)
+        return
       }
 
       const preReleaseUrl = await this._getPreReleaseVersionFromGithub(channel)
       if (preReleaseUrl) {
         this.autoUpdater.setFeedURL(preReleaseUrl)
         this.autoUpdater.channel = channel
-        return true
+        return
       }
-      return false
+
+      // if no prerelease url, use lowest prerelease version to avoid error
+      this.autoUpdater.setFeedURL(FeedUrl.PRERELEASE_LOWEST)
+      this.autoUpdater.channel = UpgradeChannel.LATEST
+      return
     }
 
-    // no early access, use latest version
-    this.autoUpdater.channel = 'latest'
+    this.autoUpdater.channel = UpgradeChannel.LATEST
     this.autoUpdater.setFeedURL(FeedUrl.PRODUCTION)
 
     const ipCountry = await this._getIpCountry()
@@ -151,12 +180,14 @@ export default class AppUpdater {
     if (ipCountry.toLowerCase() !== 'cn') {
       this.autoUpdater.setFeedURL(FeedUrl.GITHUB_LATEST)
     }
-    return true
   }
 
   public cancelDownload() {
     this.cancellationToken.cancel()
     this.cancellationToken = new CancellationToken()
+    if (this.autoUpdater.autoDownload) {
+      this.updateCheckResult?.cancellationToken?.cancel()
+    }
   }
 
   public async checkForUpdates() {
@@ -167,17 +198,17 @@ export default class AppUpdater {
       }
     }
 
-    const isSetFeedUrl = await this._setFeedUrl()
-    if (!isSetFeedUrl) {
-      return {
-        currentVersion: app.getVersion(),
-        updateInfo: null
-      }
-    }
+    await this._setFeedUrl()
+
+    // disable downgrade after change the channel
+    this.autoUpdater.allowDowngrade = false
+
+    // github and gitcode don't support multiple range download
+    this.autoUpdater.disableDifferentialDownload = true
 
     try {
-      const update = await this.autoUpdater.checkForUpdates()
-      if (update?.isUpdateAvailable && !this.autoUpdater.autoDownload) {
+      this.updateCheckResult = await this.autoUpdater.checkForUpdates()
+      if (this.updateCheckResult?.isUpdateAvailable && !this.autoUpdater.autoDownload) {
         // 如果 autoDownload 为 false，则需要再调用下面的函数触发下
         // do not use await, because it will block the return of this function
         logger.info('downloadUpdate manual by check for updates', this.cancellationToken)
@@ -186,7 +217,7 @@ export default class AppUpdater {
 
       return {
         currentVersion: this.autoUpdater.currentVersion,
-        updateInfo: update?.updateInfo
+        updateInfo: this.updateCheckResult?.updateInfo
       }
     } catch (error) {
       logger.error('Failed to check for update:', error)
diff --git a/src/main/services/ConfigManager.ts b/src/main/services/ConfigManager.ts
index 6d33b6e3dd..8e4b5d2bf1 100644
--- a/src/main/services/ConfigManager.ts
+++ b/src/main/services/ConfigManager.ts
@@ -16,8 +16,8 @@ export enum ConfigKeys {
   ClickTrayToShowQuickAssistant = 'clickTrayToShowQuickAssistant',
   EnableQuickAssistant = 'enableQuickAssistant',
   AutoUpdate = 'autoUpdate',
-  EnableEarlyAccess = 'enableEarlyAccess',
-  UpgradeChannel = 'upgradeChannel',
+  TestPlan = 'testPlan',
+  TestChannel = 'testChannel',
   EnableDataCollection = 'enableDataCollection',
   SelectionAssistantEnabled = 'selectionAssistantEnabled',
   SelectionAssistantTriggerMode = 'selectionAssistantTriggerMode',
@@ -143,20 +143,20 @@ export class ConfigManager {
     this.set(ConfigKeys.AutoUpdate, value)
   }
 
-  getEnableEarlyAccess(): boolean {
-    return this.get<boolean>(ConfigKeys.EnableEarlyAccess, false)
+  getTestPlan(): boolean {
+    return this.get<boolean>(ConfigKeys.TestPlan, false)
   }
 
-  setEnableEarlyAccess(value: boolean) {
-    this.set(ConfigKeys.EnableEarlyAccess, value)
+  setTestPlan(value: boolean) {
+    this.set(ConfigKeys.TestPlan, value)
   }
 
-  getUpgradeChannel(): UpgradeChannel {
-    return this.get<UpgradeChannel>(ConfigKeys.UpgradeChannel, UpgradeChannel.LATEST)
+  getTestChannel(): UpgradeChannel {
+    return this.get<UpgradeChannel>(ConfigKeys.TestChannel)
   }
 
-  setUpgradeChannel(value: UpgradeChannel) {
-    this.set(ConfigKeys.UpgradeChannel, value)
+  setTestChannel(value: UpgradeChannel) {
+    this.set(ConfigKeys.TestChannel, value)
   }
 
   getEnableDataCollection(): boolean {
diff --git a/src/preload/index.ts b/src/preload/index.ts
index 7867c66917..8412e00bc3 100644
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -23,8 +23,8 @@ const api = {
   setLaunchToTray: (isActive: boolean) => ipcRenderer.invoke(IpcChannel.App_SetLaunchToTray, isActive),
   setTray: (isActive: boolean) => ipcRenderer.invoke(IpcChannel.App_SetTray, isActive),
   setTrayOnClose: (isActive: boolean) => ipcRenderer.invoke(IpcChannel.App_SetTrayOnClose, isActive),
-  setEnableEarlyAccess: (isActive: boolean) => ipcRenderer.invoke(IpcChannel.App_SetEnableEarlyAccess, isActive),
-  setUpgradeChannel: (channel: UpgradeChannel) => ipcRenderer.invoke(IpcChannel.App_SetUpgradeChannel, channel),
+  setTestPlan: (isActive: boolean) => ipcRenderer.invoke(IpcChannel.App_SetTestPlan, isActive),
+  setTestChannel: (channel: UpgradeChannel) => ipcRenderer.invoke(IpcChannel.App_SetTestChannel, channel),
   setTheme: (theme: ThemeMode) => ipcRenderer.invoke(IpcChannel.App_SetTheme, theme),
   handleZoomFactor: (delta: number, reset: boolean = false) =>
     ipcRenderer.invoke(IpcChannel.App_HandleZoomFactor, delta, reset),
diff --git a/src/renderer/src/hooks/useSettings.ts b/src/renderer/src/hooks/useSettings.ts
index 72560706e6..dfb75cc791 100644
--- a/src/renderer/src/hooks/useSettings.ts
+++ b/src/renderer/src/hooks/useSettings.ts
@@ -4,7 +4,6 @@ import {
   SendMessageShortcut,
   setAssistantIconType,
   setAutoCheckUpdate as _setAutoCheckUpdate,
-  setEarlyAccess as _setEarlyAccess,
   setLaunchOnBoot,
   setLaunchToTray,
   setPinTopicsToTop,
@@ -12,12 +11,13 @@ import {
   setShowTokens,
   setSidebarIcons,
   setTargetLanguage,
+  setTestChannel as _setTestChannel,
+  setTestPlan as _setTestPlan,
   setTheme,
   SettingsState,
   setTopicPosition,
   setTray as _setTray,
   setTrayOnClose,
-  setUpgradeChannel as _setUpgradeChannel,
   setWindowStyle
 } from '@renderer/store/settings'
 import { SidebarIcon, ThemeMode, TranslateLanguageVarious } from '@renderer/types'
@@ -61,14 +61,14 @@ export function useSettings() {
       window.api.setAutoUpdate(isAutoUpdate)
     },
 
-    setEarlyAccess(isEarlyAccess: boolean) {
-      dispatch(_setEarlyAccess(isEarlyAccess))
-      window.api.setEnableEarlyAccess(isEarlyAccess)
+    setTestPlan(isTestPlan: boolean) {
+      dispatch(_setTestPlan(isTestPlan))
+      window.api.setTestPlan(isTestPlan)
     },
 
-    setUpgradeChannel(channel: UpgradeChannel) {
-      dispatch(_setUpgradeChannel(channel))
-      window.api.setUpgradeChannel(channel)
+    setTestChannel(channel: UpgradeChannel) {
+      dispatch(_setTestChannel(channel))
+      window.api.setTestChannel(channel)
     },
 
     setTheme(theme: ThemeMode) {
diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index ecb7182753..9a5e61122e 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -1392,15 +1392,14 @@
       "general.emoji_picker": "Emoji Picker",
       "general.image_upload": "Image Upload",
       "general.auto_check_update.title": "Auto Update",
-      "general.early_access.title": "Early Access",
-      "general.early_access.tooltip": "Updating to test versions cannot be downgraded, there is a risk of data loss, please backup your data in advance",
-      "general.early_access.beta_version": "Beta Version",
-      "general.early_access.rc_version": "RC Version",
-      "general.early_access.latest_version": "Latest Version",
-      "general.early_access.latest_version_tooltip": "github latest version, latest stable version",
-      "general.early_access.version_options": "Version Options",
-      "general.early_access.rc_version_tooltip": "More stable, please backup your data",
-      "general.early_access.beta_version_tooltip": "Latest features but unstable, use with caution",
+      "general.test_plan.title": "Test Plan",
+      "general.test_plan.tooltip": "Participate in the test plan to experience the latest features faster, but also brings more risks, please backup your data in advance",
+      "general.test_plan.beta_version": "Beta Version (Beta)",
+      "general.test_plan.beta_version_tooltip": "Features may change at any time, bugs are more, upgrade quickly",
+      "general.test_plan.rc_version": "Preview Version (RC)",
+      "general.test_plan.rc_version_tooltip": "Close to stable version, features are basically stable, bugs are few",
+      "general.test_plan.version_options": "Version Options",
+      "general.test_plan.version_channel_not_match": "Preview and test version switching will take effect after the next stable version is released",
       "general.reset.button": "Reset",
       "general.reset.title": "Data Reset",
       "general.restore.button": "Restore",
diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json
index 4b0d34eeb2..b1b03c4f3b 100644
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@@ -1863,15 +1863,14 @@
         }
       },
       "general.auto_check_update.title": "自動更新",
-      "general.early_access.title": "早期アクセス",
-      "general.early_access.tooltip": "更新すると、データが失われる可能性があります。データを事前にバックアップしてください。",
-      "general.early_access.beta_version": "ベータ版",
-      "general.early_access.rc_version": "RC版",
-      "general.early_access.latest_version": "最新版",
-      "general.early_access.latest_version_tooltip": "github latest バージョン, 最新安定版",
-      "general.early_access.version_options": "バージョンオプション",
-      "general.early_access.rc_version_tooltip": "より安定しています。データを事前にバックアップしてください。",
-      "general.early_access.beta_version_tooltip": "最新の機能ですが、不安定な場合があります。使用には注意してください。",
+      "general.test_plan.title": "テストプラン",
+      "general.test_plan.tooltip": "テストプランに参加すると、最新の機能をより早く体験できますが、同時により多くのリスクが伴います。データを事前にバックアップしてください。",
+      "general.test_plan.beta_version": "ベータ版(Beta)",
+      "general.test_plan.beta_version_tooltip": "機能が変更される可能性があります。バグが多く、迅速にアップグレードされます。",
+      "general.test_plan.rc_version": "プレビュー版(RC)",
+      "general.test_plan.rc_version_tooltip": "安定版に近い機能ですが、バグが少なく、迅速にアップグレードされます。",
+      "general.test_plan.version_options": "バージョンオプション",
+      "general.test_plan.version_channel_not_match": "プレビュー版とテスト版の切り替えは、次の正式版リリース時に有効になります。",
       "quickPhrase": {
         "title": "クイックフレーズ",
         "add": "フレーズを追加",
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index d7f20e297b..46faee8677 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -1863,15 +1863,14 @@
         }
       },
       "general.auto_check_update.title": "Автоматическое обновление",
-      "general.early_access.title": "Ранний доступ",
-      "general.early_access.tooltip": "Обновление до тестовых версий не может быть откачено, существует риск потери данных, пожалуйста, сделайте резервную копию данных заранее",
-      "general.early_access.beta_version": "Бета версия",
-      "general.early_access.rc_version": "RC версия",
-      "general.early_access.latest_version": "Стабильная версия",
-      "general.early_access.latest_version_tooltip": "github latest версия, стабильная версия",
-      "general.early_access.version_options": "Варианты версии",
-      "general.early_access.rc_version_tooltip": "Более стабильно, пожалуйста, сделайте резервную копию данных заранее",
-      "general.early_access.beta_version_tooltip": "Самые последние функции, но нестабильно, используйте с осторожностью",
+      "general.test_plan.title": "Тестовый план",
+      "general.test_plan.tooltip": "Участвовать в тестовом плане, чтобы быстрее получать новые функции, но при этом возникает больше рисков, пожалуйста, сделайте резервную копию данных заранее",
+      "general.test_plan.beta_version": "Тестовая версия (Beta)",
+      "general.test_plan.beta_version_tooltip": "Функции могут меняться в любое время, ошибки больше, обновление происходит быстрее",
+      "general.test_plan.rc_version": "Предварительная версия (RC)",
+      "general.test_plan.rc_version_tooltip": "Похожа на стабильную версию, функции стабильны, ошибки меньше, обновление происходит быстрее",
+      "general.test_plan.version_options": "Варианты версии",
+      "general.test_plan.version_channel_not_match": "Предварительная и тестовая версия будут доступны после выхода следующей стабильной версии",
       "quickPhrase": {
         "title": "Быстрые фразы",
         "add": "Добавить фразу",
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index 6b662d38ee..828d46d3c7 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -1392,15 +1392,14 @@
       "general.emoji_picker": "表情选择器",
       "general.image_upload": "图片上传",
       "general.auto_check_update.title": "自动更新",
-      "general.early_access.title": "抢先体验",
-      "general.early_access.tooltip": "更新到测试版本不能降级，有数据丢失风险，请务必提前备份数据",
-      "general.early_access.beta_version": "预览版本",
-      "general.early_access.rc_version": "公测版本",
-      "general.early_access.latest_version": "稳定版本",
-      "general.early_access.version_options": "版本选择",
-      "general.early_access.rc_version_tooltip": "相对稳定，请备份数据",
-      "general.early_access.beta_version_tooltip": "功能最新但不稳定，谨慎使用",
-      "general.early_access.latest_version_tooltip": "github latest 版本, 最新稳定版本",
+      "general.test_plan.title": "测试计划",
+      "general.test_plan.tooltip": "参与测试计划，可以更快体验到最新功能，但同时也会带来更多风险，务必提前做好备份",
+      "general.test_plan.beta_version": "测试版(Beta)",
+      "general.test_plan.beta_version_tooltip": "功能可能随时变化，bug较多，升级较快",
+      "general.test_plan.rc_version": "预览版(RC)",
+      "general.test_plan.rc_version_tooltip": "接近正式版，功能基本稳定，bug较少",
+      "general.test_plan.version_options": "版本选择",
+      "general.test_plan.version_channel_not_match": "预览版和测试版的切换将在下一个正式版发布时生效",
       "general.reset.button": "重置",
       "general.reset.title": "重置数据",
       "general.restore.button": "恢复",
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index 44d99d4da9..0b833c5b5e 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -1866,15 +1866,14 @@
         }
       },
       "general.auto_check_update.title": "自動更新",
-      "general.early_access.title": "搶先體驗",
-      "general.early_access.tooltip": "更新到測試版本不能降級，有數據丟失風險，請務必提前備份數據",
-      "general.early_access.beta_version": "預覽版本",
-      "general.early_access.rc_version": "公測版本",
-      "general.early_access.latest_version": "穩定版本",
-      "general.early_access.latest_version_tooltip": "github latest 版本, 最新穩定版本",
-      "general.early_access.version_options": "版本選項",
-      "general.early_access.rc_version_tooltip": "相對穩定，請務必提前備份數據",
-      "general.early_access.beta_version_tooltip": "功能最新但不穩定，謹慎使用",
+      "general.test_plan.title": "測試計畫",
+      "general.test_plan.tooltip": "參與測試計畫，體驗最新功能，但同時也帶來更多風險，請務必提前備份數據",
+      "general.test_plan.beta_version": "測試版本(Beta)",
+      "general.test_plan.beta_version_tooltip": "功能可能會隨時變化，錯誤較多，升級較快",
+      "general.test_plan.rc_version": "預覽版本(RC)",
+      "general.test_plan.rc_version_tooltip": "相對穩定，請務必提前備份數據",
+      "general.test_plan.version_options": "版本選項",
+      "general.test_plan.version_channel_not_match": "預覽版和測試版的切換將在下一個正式版發布時生效",
       "quickPhrase": {
         "title": "快捷短語",
         "add": "新增短語",
diff --git a/src/renderer/src/pages/settings/AboutSettings.tsx b/src/renderer/src/pages/settings/AboutSettings.tsx
index 9bf65e4489..50832da2e6 100644
--- a/src/renderer/src/pages/settings/AboutSettings.tsx
+++ b/src/renderer/src/pages/settings/AboutSettings.tsx
@@ -26,8 +26,7 @@ const AboutSettings: FC = () => {
   const [version, setVersion] = useState('')
   const [isPortable, setIsPortable] = useState(false)
   const { t } = useTranslation()
-  const { autoCheckUpdate, setAutoCheckUpdate, earlyAccess, setEarlyAccess, upgradeChannel, setUpgradeChannel } =
-    useSettings()
+  const { autoCheckUpdate, setAutoCheckUpdate, testPlan, setTestPlan, testChannel, setTestChannel } = useSettings()
   const { theme } = useTheme()
   const dispatch = useAppDispatch()
   const { update } = useRuntime()
@@ -97,8 +96,20 @@ const AboutSettings: FC = () => {
 
   const hasNewVersion = update?.info?.version && version ? compareVersions(update.info.version, version) > 0 : false
 
-  const handleUpgradeChannelChange = async (value: UpgradeChannel) => {
-    setUpgradeChannel(value)
+  const currentChannelByVersion =
+    [
+      { pattern: `-${UpgradeChannel.BETA}.`, channel: UpgradeChannel.BETA },
+      { pattern: `-${UpgradeChannel.RC}.`, channel: UpgradeChannel.RC }
+    ].find(({ pattern }) => version.includes(pattern))?.channel || UpgradeChannel.LATEST
+
+  useEffect(() => {
+    if (testPlan && currentChannelByVersion !== UpgradeChannel.LATEST && testChannel !== currentChannelByVersion) {
+      window.message.warning(t('settings.general.test_plan.version_channel_not_match'))
+    }
+  }, [testPlan, testChannel, currentChannelByVersion, t])
+
+  const handleTestChannelChange = async (value: UpgradeChannel) => {
+    setTestChannel(value)
     // Clear update info when switching upgrade channel
     dispatch(
       setUpdateState({
@@ -116,25 +127,20 @@ const AboutSettings: FC = () => {
   const getAvailableTestChannels = () => {
     return [
       {
-        tooltip: t('settings.general.early_access.latest_version_tooltip'),
-        label: t('settings.general.early_access.latest_version'),
-        value: UpgradeChannel.LATEST
-      },
-      {
-        tooltip: t('settings.general.early_access.rc_version_tooltip'),
-        label: t('settings.general.early_access.rc_version'),
+        tooltip: t('settings.general.test_plan.rc_version_tooltip'),
+        label: t('settings.general.test_plan.rc_version'),
         value: UpgradeChannel.RC
       },
       {
-        tooltip: t('settings.general.early_access.beta_version_tooltip'),
-        label: t('settings.general.early_access.beta_version'),
+        tooltip: t('settings.general.test_plan.beta_version_tooltip'),
+        label: t('settings.general.test_plan.beta_version'),
         value: UpgradeChannel.BETA
       }
     ]
   }
 
-  const handlerSetEarlyAccess = (value: boolean) => {
-    setEarlyAccess(value)
+  const handleSetTestPlan = (value: boolean) => {
+    setTestPlan(value)
     dispatch(
       setUpdateState({
         available: false,
@@ -145,7 +151,17 @@ const AboutSettings: FC = () => {
         downloadProgress: 0
       })
     )
-    if (value === false) setUpgradeChannel(UpgradeChannel.LATEST)
+
+    if (value === true) {
+      setTestChannel(getTestChannel())
+    }
+  }
+
+  const getTestChannel = () => {
+    if (testChannel === UpgradeChannel.LATEST) {
+      return UpgradeChannel.RC
+    }
+    return testChannel
   }
 
   useEffect(() => {
@@ -155,7 +171,7 @@ const AboutSettings: FC = () => {
       setIsPortable(appInfo.isPortable)
     })
     setAutoCheckUpdate(autoCheckUpdate)
-  }, [autoCheckUpdate, setAutoCheckUpdate, setEarlyAccess])
+  }, [autoCheckUpdate, setAutoCheckUpdate])
 
   return (
     <SettingContainer theme={theme}>
@@ -217,22 +233,21 @@ const AboutSettings: FC = () => {
             </SettingRow>
             <SettingDivider />
             <SettingRow>
-              <SettingRowTitle>{t('settings.general.early_access.title')}</SettingRowTitle>
-              <Tooltip title={t('settings.general.early_access.tooltip')} trigger={['hover', 'focus']}>
-                <Switch value={earlyAccess} onChange={(v) => handlerSetEarlyAccess(v)} />
+              <SettingRowTitle>{t('settings.general.test_plan.title')}</SettingRowTitle>
+              <Tooltip title={t('settings.general.test_plan.tooltip')} trigger={['hover', 'focus']}>
+                <Switch value={testPlan} onChange={(v) => handleSetTestPlan(v)} />
               </Tooltip>
             </SettingRow>
-            {earlyAccess && getAvailableTestChannels().length > 0 && (
+            {testPlan && (
               <>
                 <SettingDivider />
                 <SettingRow>
-                  <SettingRowTitle>{t('settings.general.early_access.version_options')}</SettingRowTitle>
+                  <SettingRowTitle>{t('settings.general.test_plan.version_options')}</SettingRowTitle>
                   <Radio.Group
                     size="small"
                     buttonStyle="solid"
-                    defaultValue={UpgradeChannel.LATEST}
-                    value={upgradeChannel}
-                    onChange={(e) => handleUpgradeChannelChange(e.target.value)}>
+                    value={getTestChannel()}
+                    onChange={(e) => handleTestChannelChange(e.target.value)}>
                     {getAvailableTestChannels().map((option) => (
                       <Tooltip key={option.value} title={option.tooltip}>
                         <Radio.Button value={option.value}>{option.label}</Radio.Button>
diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts
index c8a132180f..501c5e483a 100644
--- a/src/renderer/src/store/migrate.ts
+++ b/src/renderer/src/store/migrate.ts
@@ -1543,7 +1543,7 @@ const migrateConfig = {
         state.paintings.tokenFluxPaintings = []
       }
       state.settings.showTokens = true
-      state.settings.earlyAccess = false
+      state.settings.testPlan = false
       return state
     } catch (error) {
       return state
@@ -1629,7 +1629,7 @@ const migrateConfig = {
         }
       })
       if (state.settings) {
-        state.settings.upgradeChannel = UpgradeChannel.LATEST
+        state.settings.testChannel = UpgradeChannel.LATEST
       }
       return state
     } catch (error) {
diff --git a/src/renderer/src/store/settings.ts b/src/renderer/src/store/settings.ts
index ee991556f7..7d8e14ed11 100644
--- a/src/renderer/src/store/settings.ts
+++ b/src/renderer/src/store/settings.ts
@@ -68,8 +68,8 @@ export interface SettingsState {
   pasteLongTextThreshold: number
   clickAssistantToShowTopic: boolean
   autoCheckUpdate: boolean
-  earlyAccess: boolean
-  upgradeChannel: UpgradeChannel
+  testPlan: boolean
+  testChannel: UpgradeChannel
   renderInputMessageAsMarkdown: boolean
   // 代码执行
   codeExecution: {
@@ -222,8 +222,8 @@ export const initialState: SettingsState = {
   pasteLongTextThreshold: 1500,
   clickAssistantToShowTopic: true,
   autoCheckUpdate: true,
-  earlyAccess: false,
-  upgradeChannel: UpgradeChannel.LATEST,
+  testPlan: false,
+  testChannel: UpgradeChannel.LATEST,
   renderInputMessageAsMarkdown: false,
   codeExecution: {
     enabled: false,
@@ -429,11 +429,11 @@ const settingsSlice = createSlice({
     setAutoCheckUpdate: (state, action: PayloadAction<boolean>) => {
       state.autoCheckUpdate = action.payload
     },
-    setEarlyAccess: (state, action: PayloadAction<boolean>) => {
-      state.earlyAccess = action.payload
+    setTestPlan: (state, action: PayloadAction<boolean>) => {
+      state.testPlan = action.payload
     },
-    setUpgradeChannel: (state, action: PayloadAction<UpgradeChannel>) => {
-      state.upgradeChannel = action.payload
+    setTestChannel: (state, action: PayloadAction<UpgradeChannel>) => {
+      state.testChannel = action.payload
     },
     setRenderInputMessageAsMarkdown: (state, action: PayloadAction<boolean>) => {
       state.renderInputMessageAsMarkdown = action.payload
@@ -730,8 +730,8 @@ export const {
   setAssistantIconType,
   setPasteLongTextAsFile,
   setAutoCheckUpdate,
-  setEarlyAccess,
-  setUpgradeChannel,
+  setTestPlan,
+  setTestChannel,
   setRenderInputMessageAsMarkdown,
   setClickAssistantToShowTopic,
   setSkipBackupFile,

From ece59cfacfd4146020667378e2bb832127ce6b63 Mon Sep 17 00:00:00 2001
From: beyondkmp <beyondkmp@gmail.com>
Date: Sat, 28 Jun 2025 17:52:36 +0800
Subject: [PATCH 71/75] fix(migrate): handle state return in migration process
 and add upgradechannel setting (#7634)

* fix(migrate): handle state return in migration process and add upgrade channel setting

* fix(migrate): move upgrade channel setting to the correct migration step
---
 src/renderer/src/store/migrate.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts
index 501c5e483a..8eea0a34a7 100644
--- a/src/renderer/src/store/migrate.ts
+++ b/src/renderer/src/store/migrate.ts
@@ -1628,9 +1628,6 @@ const migrateConfig = {
           }
         }
       })
-      if (state.settings) {
-        state.settings.testChannel = UpgradeChannel.LATEST
-      }
       return state
     } catch (error) {
       return state
@@ -1655,6 +1652,9 @@ const migrateConfig = {
         // @ts-ignore eslint-disable-next-line
         delete state.websearch.contentLimit
       }
+      if (state.settings) {
+        state.settings.testChannel = UpgradeChannel.LATEST
+      }
 
       return state
     } catch (error) {

From 8de6ae1772070e6ec635cdaf3a6db7fb744ab05e Mon Sep 17 00:00:00 2001
From: one <wangan.cs@gmail.com>
Date: Sat, 28 Jun 2025 19:00:26 +0800
Subject: [PATCH 72/75] fix(Menubar): icon for multi select (#7635)

---
 src/renderer/src/pages/home/Messages/MessageMenubar.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/pages/home/Messages/MessageMenubar.tsx b/src/renderer/src/pages/home/Messages/MessageMenubar.tsx
index 50a4fc95ed..fda0f40a4b 100644
--- a/src/renderer/src/pages/home/Messages/MessageMenubar.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageMenubar.tsx
@@ -1,4 +1,4 @@
-import { CheckOutlined, EditOutlined, MenuOutlined, QuestionCircleOutlined, SyncOutlined } from '@ant-design/icons'
+import { CheckOutlined, EditOutlined, QuestionCircleOutlined, SyncOutlined } from '@ant-design/icons'
 import ObsidianExportPopup from '@renderer/components/Popups/ObsidianExportPopup'
 import SelectModelPopup from '@renderer/components/Popups/SelectModelPopup'
 import { TranslateLanguageOptions } from '@renderer/config/translate'
@@ -29,7 +29,7 @@ import { removeTrailingDoubleSpaces } from '@renderer/utils/markdown'
 import { findMainTextBlocks, findTranslationBlocks, getMainTextContent } from '@renderer/utils/messageUtils/find'
 import { Dropdown, Popconfirm, Tooltip } from 'antd'
 import dayjs from 'dayjs'
-import { AtSign, Copy, Languages, Menu, RefreshCw, Save, Share, Split, ThumbsUp, Trash } from 'lucide-react'
+import { AtSign, Copy, Languages, ListChecks, Menu, RefreshCw, Save, Share, Split, ThumbsUp, Trash } from 'lucide-react'
 import { FilePenLine } from 'lucide-react'
 import { FC, memo, useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -195,7 +195,7 @@ const MessageMenubar: FC<Props> = (props) => {
       {
         label: t('chat.multiple.select'),
         key: 'multi-select',
-        icon: <MenuOutlined size={16} />,
+        icon: <ListChecks size={16} />,
         onClick: () => {
           toggleMultiSelectMode(true)
         }

From 101d73fc10989d5dc078bfa0b8c4e2db6d5e9c93 Mon Sep 17 00:00:00 2001
From: Kingsword <kingsword09@gmail.com>
Date: Sat, 28 Jun 2025 20:04:03 +0800
Subject: [PATCH 73/75] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor(ContentSear?=
 =?UTF-8?q?ch):=20ContentSearch=20to=20use=20CSS=20highlights=20API=20(#74?=
 =?UTF-8?q?93)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/assets/styles/index.scss     |   4 +-
 src/renderer/src/components/ContentSearch.tsx | 623 ++++++------------
 src/renderer/src/pages/home/Chat.tsx          |  38 +-
 3 files changed, 223 insertions(+), 442 deletions(-)

diff --git a/src/renderer/src/assets/styles/index.scss b/src/renderer/src/assets/styles/index.scss
index da28abc8c5..c4bd23d1fc 100644
--- a/src/renderer/src/assets/styles/index.scss
+++ b/src/renderer/src/assets/styles/index.scss
@@ -173,12 +173,12 @@ ul {
   color: var(--color-icon);
 }
 
-span.highlight {
+::highlight(search-matches) {
   background-color: var(--color-background-highlight);
   color: var(--color-highlight);
 }
 
-span.highlight.selected {
+::highlight(current-match) {
   background-color: var(--color-background-highlight-accent);
 }
 
diff --git a/src/renderer/src/components/ContentSearch.tsx b/src/renderer/src/components/ContentSearch.tsx
index 08a1fd415a..1f895e348b 100644
--- a/src/renderer/src/components/ContentSearch.tsx
+++ b/src/renderer/src/components/ContentSearch.tsx
@@ -3,13 +3,10 @@ import NarrowLayout from '@renderer/pages/home/Messages/NarrowLayout'
 import { Tooltip } from 'antd'
 import { debounce } from 'lodash'
 import { CaseSensitive, ChevronDown, ChevronUp, User, WholeWord, X } from 'lucide-react'
-import React, { useCallback, useEffect, useImperativeHandle, useRef, useState } from 'react'
+import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
-const HIGHLIGHT_CLASS = 'highlight'
-const HIGHLIGHT_SELECT_CLASS = 'selected'
-
 interface Props {
   children?: React.ReactNode
   searchTarget: React.RefObject<React.ReactNode> | React.RefObject<HTMLElement> | HTMLElement
@@ -18,19 +15,14 @@ interface Props {
    *
    * 返回`true`表示该`node`会被搜索
    */
-  filter: (node: Node) => boolean
+  filter: NodeFilter
   includeUser?: boolean
   onIncludeUserChange?: (value: boolean) => void
 }
 
 enum SearchCompletedState {
   NotSearched,
-  FirstSearched
-}
-
-enum SearchTargetIndex {
-  Next,
-  Prev
+  Searched
 }
 
 export interface ContentSearchRef {
@@ -47,60 +39,20 @@ export interface ContentSearchRef {
   focus(): void
 }
 
-interface MatchInfo {
-  index: number
-  length: number
-  text: string
-}
-
 const escapeRegExp = (string: string): string => {
   return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') // $& means the whole matched string
 }
 
-const findWindowVerticalCenterElementIndex = (elementList: HTMLElement[]): number | null => {
-  if (!elementList || elementList.length === 0) {
-    return null
-  }
-  let closestElementIndex: number | null = null
-  let minVerticalDistance = Infinity
-  const windowCenterY = window.innerHeight / 2
-  for (let i = 0; i < elementList.length; i++) {
-    const element = elementList[i]
-    if (!(element instanceof HTMLElement)) {
-      continue
-    }
-    const rect = element.getBoundingClientRect()
-    if (rect.bottom < 0 || rect.top > window.innerHeight) {
-      continue
-    }
-    const elementCenterY = rect.top + rect.height / 2
-    const verticalDistance = Math.abs(elementCenterY - windowCenterY)
-    if (verticalDistance < minVerticalDistance) {
-      minVerticalDistance = verticalDistance
-      closestElementIndex = i
-    }
-  }
-  return closestElementIndex
-}
-
-const highlightText = (
-  textNode: Node,
+const findRangesInTarget = (
+  target: HTMLElement,
+  filter: NodeFilter,
   searchText: string,
-  highlightClass: string,
   isCaseSensitive: boolean,
   isWholeWord: boolean
-): HTMLSpanElement[] | null => {
-  const textNodeParentNode: HTMLElement | null = textNode.parentNode as HTMLElement
-  if (textNodeParentNode) {
-    if (textNodeParentNode.classList.contains(highlightClass)) {
-      return null
-    }
-  }
-  if (textNode.nodeType !== Node.TEXT_NODE || !textNode.textContent) {
-    return null
-  }
+): Range[] => {
+  CSS.highlights.clear()
+  const ranges: Range[] = []
 
-  const textContent = textNode.textContent
   const escapedSearchText = escapeRegExp(searchText)
 
   // 检查搜索文本是否仅包含拉丁字母
@@ -109,89 +61,66 @@ const highlightText = (
   // 只有当搜索文本仅包含拉丁字母时才应用大小写敏感
   const regexFlags = hasOnlyLatinLetters && isCaseSensitive ? 'g' : 'gi'
   const regexPattern = isWholeWord ? `\\b${escapedSearchText}\\b` : escapedSearchText
-  const regex = new RegExp(regexPattern, regexFlags)
+  const searchRegex = new RegExp(regexPattern, regexFlags)
+  const treeWalker = document.createTreeWalker(target, NodeFilter.SHOW_TEXT, filter)
+  const allTextNodes: { node: Node; startOffset: number }[] = []
+  let fullText = ''
 
-  let match
-  const matches: MatchInfo[] = []
-  while ((match = regex.exec(textContent)) !== null) {
-    if (typeof match.index === 'number' && typeof match[0] === 'string') {
-      matches.push({ index: match.index, length: match[0].length, text: match[0] })
-    } else {
-      console.error('Unexpected match format:', match)
-    }
+  // 1. 拼接所有文本节点内容
+  while (treeWalker.nextNode()) {
+    allTextNodes.push({
+      node: treeWalker.currentNode,
+      startOffset: fullText.length
+    })
+    fullText += treeWalker.currentNode.nodeValue
   }
 
-  if (matches.length === 0) {
-    return null
-  }
+  // 2.在完整文本中查找匹配项
+  let match: RegExpExecArray | null = null
+  while ((match = searchRegex.exec(fullText))) {
+    const matchStart = match.index
+    const matchEnd = matchStart + match[0].length
 
-  const parentNode = textNode.parentNode
-  if (!parentNode) {
-    return null
-  }
+    // 3. 将匹配项的索引映射回DOM Range
+    let startNode: Node | null = null
+    let endNode: Node | null = null
+    let startOffset = 0
+    let endOffset = 0
 
-  const fragment = document.createDocumentFragment()
-  let currentIndex = 0
-  const highlightTextSet = new Set<HTMLSpanElement>()
-
-  matches.forEach(({ index, length, text }) => {
-    if (index > currentIndex) {
-      fragment.appendChild(document.createTextNode(textContent.substring(currentIndex, index)))
-    }
-    const highlightSpan = document.createElement('span')
-    highlightSpan.className = highlightClass
-    highlightSpan.textContent = text // Use the matched text to preserve case if not case-sensitive
-    fragment.appendChild(highlightSpan)
-    highlightTextSet.add(highlightSpan)
-    currentIndex = index + length
-  })
-
-  if (currentIndex < textContent.length) {
-    fragment.appendChild(document.createTextNode(textContent.substring(currentIndex)))
-  }
-
-  parentNode.replaceChild(fragment, textNode)
-  return [...highlightTextSet]
-}
-
-const mergeAdjacentTextNodes = (node: HTMLElement) => {
-  const children = Array.from(node.childNodes)
-  const groups: Array<Node | { text: string; nodes: Node[] }> = []
-  let currentTextGroup: { text: string; nodes: Node[] } | null = null
-
-  for (const child of children) {
-    if (child.nodeType === Node.TEXT_NODE) {
-      if (currentTextGroup === null) {
-        currentTextGroup = {
-          text: child.textContent ?? '',
-          nodes: [child]
-        }
-      } else {
-        currentTextGroup.text += child.textContent
-        currentTextGroup.nodes.push(child)
+    // 找到起始节点和偏移
+    for (const nodeInfo of allTextNodes) {
+      if (
+        matchStart >= nodeInfo.startOffset &&
+        matchStart < nodeInfo.startOffset + (nodeInfo.node.nodeValue?.length ?? 0)
+      ) {
+        startNode = nodeInfo.node
+        startOffset = matchStart - nodeInfo.startOffset
+        break
       }
-    } else {
-      if (currentTextGroup !== null) {
-        groups.push(currentTextGroup!)
-        currentTextGroup = null
+    }
+
+    // 找到结束节点和偏移
+    for (const nodeInfo of allTextNodes) {
+      if (
+        matchEnd > nodeInfo.startOffset &&
+        matchEnd <= nodeInfo.startOffset + (nodeInfo.node.nodeValue?.length ?? 0)
+      ) {
+        endNode = nodeInfo.node
+        endOffset = matchEnd - nodeInfo.startOffset
+        break
       }
-      groups.push(child)
+    }
+
+    // 如果起始和结束节点都找到了，则创建一个 Range
+    if (startNode && endNode) {
+      const range = new Range()
+      range.setStart(startNode, startOffset)
+      range.setEnd(endNode, endOffset)
+      ranges.push(range)
     }
   }
 
-  if (currentTextGroup !== null) {
-    groups.push(currentTextGroup)
-  }
-
-  const newChildren = groups.map((group) => {
-    if (group instanceof Node) {
-      return group
-    } else {
-      return document.createTextNode(group.text)
-    }
-  })
-
-  node.replaceChildren(...newChildren)
+  return ranges
 }
 
 // eslint-disable-next-line @eslint-react/no-forward-ref
@@ -206,328 +135,178 @@ export const ContentSearch = React.forwardRef<ContentSearchRef, Props>(
     })()
     const containerRef = React.useRef<HTMLDivElement>(null)
     const searchInputRef = React.useRef<HTMLInputElement>(null)
-    const [searchResultIndex, setSearchResultIndex] = useState(0)
-    const [totalCount, setTotalCount] = useState(0)
     const [enableContentSearch, setEnableContentSearch] = useState(false)
     const [searchCompleted, setSearchCompleted] = useState(SearchCompletedState.NotSearched)
     const [isCaseSensitive, setIsCaseSensitive] = useState(false)
     const [isWholeWord, setIsWholeWord] = useState(false)
-    const [shouldScroll, setShouldScroll] = useState(false)
-    const highlightTextSet = useState(new Set<Node>())[0]
+    const [allRanges, setAllRanges] = useState<Range[]>([])
+    const [currentIndex, setCurrentIndex] = useState(0)
     const prevSearchText = useRef('')
     const { t } = useTranslation()
 
-    const locateByIndex = (index: number, shouldScroll = true) => {
-      if (target) {
-        const highlightTextNodes = [...highlightTextSet] as HTMLElement[]
-        highlightTextNodes.sort((a, b) => {
-          const { top: aTop } = a.getBoundingClientRect()
-          const { top: bTop } = b.getBoundingClientRect()
-          return aTop - bTop
-        })
-        for (const node of highlightTextNodes) {
-          node.classList.remove(HIGHLIGHT_SELECT_CLASS)
-        }
-        setSearchResultIndex(index)
-        if (highlightTextNodes.length > 0) {
-          const highlightTextNode = highlightTextNodes[index] ?? null
-          if (highlightTextNode) {
-            highlightTextNode.classList.add(HIGHLIGHT_SELECT_CLASS)
+    const resetSearch = useCallback(() => {
+      CSS.highlights.clear()
+      setAllRanges([])
+      setSearchCompleted(SearchCompletedState.NotSearched)
+    }, [])
+
+    const locateByIndex = useCallback(
+      (shouldScroll = true) => {
+        // 清理旧的高亮
+        CSS.highlights.clear()
+
+        if (allRanges.length > 0) {
+          // 1. 创建并注册所有匹配项的高亮
+          const allMatchesHighlight = new Highlight(...allRanges)
+          CSS.highlights.set('search-matches', allMatchesHighlight)
+
+          // 2. 如果有当前项，为其创建并注册一个特殊的高亮
+          if (currentIndex !== -1 && allRanges[currentIndex]) {
+            const currentMatchRange = allRanges[currentIndex]
+            const currentMatchHighlight = new Highlight(currentMatchRange)
+            CSS.highlights.set('current-match', currentMatchHighlight)
+
+            // 3. 将当前项滚动到视图中
+            // 获取第一个文本节点的父元素来进行滚动
+            const parentElement = currentMatchRange.startContainer.parentElement
             if (shouldScroll) {
-              highlightTextNode.scrollIntoView({
+              parentElement?.scrollIntoView({
                 behavior: 'smooth',
-                block: 'center'
-                // inline: 'center' 水平方向居中可能会导致 content 页面整体偏右, 使得左半部的内容被遮挡. 因此先注释掉该代码
+                block: 'center',
+                inline: 'nearest'
               })
             }
           }
         }
-      }
-    }
+      },
+      [allRanges, currentIndex]
+    )
 
-    const restoreHighlight = () => {
-      const highlightTextParentNodeSet = new Set<HTMLElement>()
-      // Make a copy because the set might be modified during iteration indirectly
-      const nodesToRestore = [...highlightTextSet]
-      for (const highlightTextNode of nodesToRestore) {
-        if (highlightTextNode.textContent) {
-          const textNode = document.createTextNode(highlightTextNode.textContent)
-          const node = highlightTextNode as HTMLElement
-          if (node.parentNode) {
-            highlightTextParentNodeSet.add(node.parentNode as HTMLElement)
-            node.replaceWith(textNode) // This removes the node from the DOM
-          }
-        }
-      }
-      highlightTextSet.clear() // Clear the original set after processing
-      for (const parentNode of highlightTextParentNodeSet) {
-        mergeAdjacentTextNodes(parentNode)
-      }
-      // highlightTextSet.clear() // Already cleared
-    }
-
-    const search = (searchTargetIndex?: SearchTargetIndex): number | null => {
+    const search = useCallback(() => {
       const searchText = searchInputRef.current?.value.trim() ?? null
+      setSearchCompleted(SearchCompletedState.Searched)
       if (target && searchText !== null && searchText !== '') {
-        restoreHighlight()
-        const iter = document.createNodeIterator(target, NodeFilter.SHOW_TEXT)
-        let textNode: Node | null
-        const textNodeSet: Set<Node> = new Set()
-        while ((textNode = iter.nextNode())) {
-          if (filter(textNode)) {
-            textNodeSet.add(textNode)
-          }
-        }
-
-        const highlightTextSetTemp = new Set<HTMLSpanElement>()
-        for (const node of textNodeSet) {
-          const list = highlightText(node, searchText, HIGHLIGHT_CLASS, isCaseSensitive, isWholeWord)
-          if (list) {
-            list.forEach((node) => highlightTextSetTemp.add(node))
-          }
-        }
-        const highlightTextList = [...highlightTextSetTemp]
-        setTotalCount(highlightTextList.length)
-        highlightTextSetTemp.forEach((node) => highlightTextSet.add(node))
-        const changeIndex = () => {
-          let index: number
-          switch (searchTargetIndex) {
-            case SearchTargetIndex.Next:
-              {
-                index = (searchResultIndex + 1) % highlightTextList.length
-              }
-              break
-            case SearchTargetIndex.Prev:
-              {
-                index = (searchResultIndex - 1 + highlightTextList.length) % highlightTextList.length
-              }
-              break
-            default: {
-              index = searchResultIndex
-            }
-          }
-          return Math.max(index, 0)
-        }
-
-        const targetIndex = (() => {
-          switch (searchCompleted) {
-            case SearchCompletedState.NotSearched: {
-              setSearchCompleted(SearchCompletedState.FirstSearched)
-              const index = findWindowVerticalCenterElementIndex(highlightTextList)
-              if (index !== null) {
-                setSearchResultIndex(index)
-                return index
-              } else {
-                setSearchResultIndex(0)
-                return 0
-              }
-            }
-            case SearchCompletedState.FirstSearched: {
-              return changeIndex()
-            }
-            default: {
-              return null
-            }
-          }
-        })()
-
-        if (targetIndex === null) {
-          return null
-        } else {
-          const totalCount = highlightTextSet.size
-          if (targetIndex >= totalCount) {
-            return totalCount - 1
-          } else {
-            return targetIndex
-          }
-        }
-      } else {
-        return null
+        const ranges = findRangesInTarget(target, filter, searchText, isCaseSensitive, isWholeWord)
+        setAllRanges(ranges)
+        setCurrentIndex(0)
       }
-    }
+    }, [target, filter, isCaseSensitive, isWholeWord])
 
-    const _searchHandlerDebounce = debounce(() => {
-      implementation.search()
-    }, 300)
-    const searchHandler = useCallback(_searchHandlerDebounce, [_searchHandlerDebounce])
-    const userInputHandler = (event: React.ChangeEvent<HTMLInputElement>) => {
-      const value = event.target.value.trim()
-      if (value.length === 0) {
-        restoreHighlight()
-        setTotalCount(0)
-        setSearchResultIndex(0)
-        setSearchCompleted(SearchCompletedState.NotSearched)
-      } else {
-        // 用户输入时允许滚动
-        setShouldScroll(true)
-        searchHandler()
-      }
-      prevSearchText.current = value
-    }
-
-    const keyDownHandler = (event: React.KeyboardEvent<HTMLInputElement>) => {
-      const { code, key, shiftKey } = event
-      if (key === 'Process') {
-        return
-      }
-
-      switch (code) {
-        case 'Enter':
-          {
-            if (shiftKey) {
-              implementation.searchPrev()
-            } else {
-              implementation.searchNext()
-            }
-            event.preventDefault()
-          }
-          break
-        case 'Escape':
-          {
-            implementation.disable()
-          }
-          break
-      }
-    }
-
-    const searchInputFocus = () => requestAnimationFrame(() => searchInputRef.current?.focus())
-
-    const userOutlinedButtonOnClick = () => {
-      if (onIncludeUserChange) {
-        onIncludeUserChange(!includeUser)
-      }
-      searchInputFocus()
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    const implementation = {
-      disable() {
-        setEnableContentSearch(false)
-        restoreHighlight()
-        setShouldScroll(false)
-      },
-      enable(initialText?: string) {
-        setEnableContentSearch(true)
-        setShouldScroll(false) // Default to false, search itself might set it to true
-        if (searchInputRef.current) {
-          const inputEl = searchInputRef.current
-          if (initialText && initialText.trim().length > 0) {
-            inputEl.value = initialText
-            // Trigger search after setting initial text
-            // Need to make sure search() uses the new value
-            // and also to focus and select
-            requestAnimationFrame(() => {
-              inputEl.focus()
-              inputEl.select()
-              setShouldScroll(true)
-              const targetIndex = search()
-              if (targetIndex !== null) {
-                locateByIndex(targetIndex, true) // Ensure scrolling
-              } else {
-                // If search returns null (e.g., empty input or no matches with initial text), clear state
-                restoreHighlight()
-                setTotalCount(0)
-                setSearchResultIndex(0)
+    const implementation = useMemo(
+      () => ({
+        disable: () => {
+          setEnableContentSearch(false)
+          CSS.highlights.clear()
+        },
+        enable: (initialText?: string) => {
+          setEnableContentSearch(true)
+          if (searchInputRef.current) {
+            const inputEl = searchInputRef.current
+            if (initialText && initialText.trim().length > 0) {
+              inputEl.value = initialText
+              requestAnimationFrame(() => {
+                inputEl.focus()
+                inputEl.select()
+                search()
+                CSS.highlights.clear()
                 setSearchCompleted(SearchCompletedState.NotSearched)
-              }
-            })
-          } else {
-            requestAnimationFrame(() => {
-              inputEl.focus()
-              inputEl.select()
-            })
-            // Only search if there's existing text and no new initialText
-            if (inputEl.value.trim()) {
-              const targetIndex = search()
-              if (targetIndex !== null) {
-                setSearchResultIndex(targetIndex)
-                // locateByIndex(targetIndex, false); // Don't scroll if just enabling with existing text
-              }
+              })
+            } else {
+              requestAnimationFrame(() => {
+                inputEl.focus()
+                inputEl.select()
+              })
             }
           }
-        }
-      },
-      searchNext() {
-        if (enableContentSearch) {
-          const targetIndex = search(SearchTargetIndex.Next)
-          if (targetIndex !== null) {
-            locateByIndex(targetIndex)
+        },
+        searchNext: () => {
+          if (allRanges.length > 0) {
+            setCurrentIndex((prev) => (prev < allRanges.length - 1 ? prev + 1 : 0))
           }
-        }
-      },
-      searchPrev() {
-        if (enableContentSearch) {
-          const targetIndex = search(SearchTargetIndex.Prev)
-          if (targetIndex !== null) {
-            locateByIndex(targetIndex)
+        },
+        searchPrev: () => {
+          if (allRanges.length > 0) {
+            setCurrentIndex((prev) => (prev > 0 ? prev - 1 : allRanges.length - 1))
           }
-        }
-      },
-      resetSearchState() {
-        if (enableContentSearch) {
+        },
+        resetSearchState: () => {
           setSearchCompleted(SearchCompletedState.NotSearched)
-          // Maybe also reset index? Depends on desired behavior
-          // setSearchResultIndex(0);
+        },
+        search: () => {
+          search()
+          locateByIndex(true)
+        },
+        silentSearch: () => {
+          search()
+          locateByIndex(false)
+        },
+        focus: () => {
+          searchInputRef.current?.focus()
         }
+      }),
+      [allRanges.length, locateByIndex, search]
+    )
+
+    const _searchHandlerDebounce = useMemo(() => debounce(implementation.search, 300), [implementation.search])
+
+    const searchHandler = useCallback(() => {
+      _searchHandlerDebounce()
+    }, [_searchHandlerDebounce])
+
+    const userInputHandler = useCallback(
+      (event: React.ChangeEvent<HTMLInputElement>) => {
+        const value = event.target.value.trim()
+        if (value.length === 0) {
+          resetSearch()
+        } else {
+          searchHandler()
+        }
+        prevSearchText.current = value
       },
-      search() {
-        if (enableContentSearch) {
-          const targetIndex = search()
-          if (targetIndex !== null) {
-            locateByIndex(targetIndex, shouldScroll)
+      [searchHandler, resetSearch]
+    )
+
+    const keyDownHandler = useCallback(
+      (event: React.KeyboardEvent<HTMLInputElement>) => {
+        if (event.key === 'Enter') {
+          event.preventDefault()
+          const value = (event.target as HTMLInputElement).value.trim()
+          if (value.length === 0) {
+            resetSearch()
+            return
+          }
+          if (event.shiftKey) {
+            implementation.searchPrev()
           } else {
-            // If search returns null (e.g., empty input), clear state
-            restoreHighlight()
-            setTotalCount(0)
-            setSearchResultIndex(0)
-            setSearchCompleted(SearchCompletedState.NotSearched)
+            implementation.searchNext()
           }
+        } else if (event.key === 'Escape') {
+          implementation.disable()
         }
       },
-      silentSearch() {
-        if (enableContentSearch) {
-          const targetIndex = search()
-          if (targetIndex !== null) {
-            // 只更新索引，不触发滚动
-            locateByIndex(targetIndex, false)
-          }
-        }
-      },
-      focus() {
-        searchInputFocus()
-      }
-    }
+      [implementation, resetSearch]
+    )
 
-    useImperativeHandle(ref, () => ({
-      disable() {
-        implementation.disable()
-      },
-      enable(initialText?: string) {
-        implementation.enable(initialText)
-      },
-      searchNext() {
-        implementation.searchNext()
-      },
-      searchPrev() {
-        implementation.searchPrev()
-      },
-      search() {
-        implementation.search()
-      },
-      silentSearch() {
-        implementation.silentSearch()
-      },
-      focus() {
-        implementation.focus()
-      }
-    }))
+    const searchInputFocus = useCallback(() => {
+      requestAnimationFrame(() => searchInputRef.current?.focus())
+    }, [])
+
+    const userOutlinedButtonOnClick = useCallback(() => {
+      onIncludeUserChange?.(!includeUser)
+      searchInputFocus()
+    }, [includeUser, onIncludeUserChange, searchInputFocus])
+
+    useImperativeHandle(ref, () => implementation, [implementation])
+
+    useEffect(() => {
+      locateByIndex()
+    }, [currentIndex, locateByIndex])
 
-    // Re-run search when options change and search is active
     useEffect(() => {
       if (enableContentSearch && searchInputRef.current?.value.trim()) {
-        implementation.search()
+        search()
       }
-    }, [isCaseSensitive, isWholeWord, enableContentSearch, implementation]) // Add enableContentSearch dependency
+    }, [isCaseSensitive, isWholeWord, enableContentSearch, search])
 
     const prevButtonOnClick = () => {
       implementation.searchPrev()
@@ -589,11 +368,11 @@ export const ContentSearch = React.forwardRef<ContentSearchRef, Props>(
             <Separator></Separator>
             <SearchResults>
               {searchCompleted !== SearchCompletedState.NotSearched ? (
-                totalCount > 0 ? (
+                allRanges.length > 0 ? (
                   <>
-                    <SearchResultCount>{searchResultIndex + 1}</SearchResultCount>
+                    <SearchResultCount>{currentIndex + 1}</SearchResultCount>
                     <SearchResultSeparator>/</SearchResultSeparator>
-                    <SearchResultTotalCount>{totalCount}</SearchResultTotalCount>
+                    <SearchResultTotalCount>{allRanges.length}</SearchResultTotalCount>
                   </>
                 ) : (
                   <NoResults>{t('common.no_results')}</NoResults>
@@ -603,10 +382,10 @@ export const ContentSearch = React.forwardRef<ContentSearchRef, Props>(
               )}
             </SearchResults>
             <ToolBar>
-              <ToolbarButton type="text" onClick={prevButtonOnClick} disabled={totalCount === 0}>
+              <ToolbarButton type="text" onClick={prevButtonOnClick} disabled={allRanges.length === 0}>
                 <ChevronUp size={18} />
               </ToolbarButton>
-              <ToolbarButton type="text" onClick={nextButtonOnClick} disabled={totalCount === 0}>
+              <ToolbarButton type="text" onClick={nextButtonOnClick} disabled={allRanges.length === 0}>
                 <ChevronDown size={18} />
               </ToolbarButton>
               <ToolbarButton type="text" onClick={closeButtonOnClick}>
diff --git a/src/renderer/src/pages/home/Chat.tsx b/src/renderer/src/pages/home/Chat.tsx
index fb623b62a5..2639a06387 100644
--- a/src/renderer/src/pages/home/Chat.tsx
+++ b/src/renderer/src/pages/home/Chat.tsx
@@ -55,28 +55,30 @@ const Chat: FC<Props> = (props) => {
     }
   })
 
-  const contentSearchFilter = (node: Node): boolean => {
-    if (node.parentNode) {
-      let parentNode: HTMLElement | null = node.parentNode as HTMLElement
-      while (parentNode?.parentNode) {
-        if (parentNode.classList.contains('MessageFooter')) {
-          return false
-        }
+  const contentSearchFilter: NodeFilter = {
+    acceptNode(node) {
+      if (node.parentNode) {
+        let parentNode: HTMLElement | null = node.parentNode as HTMLElement
+        while (parentNode?.parentNode) {
+          if (parentNode.classList.contains('MessageFooter')) {
+            return NodeFilter.FILTER_REJECT
+          }
 
-        if (filterIncludeUser) {
-          if (parentNode?.classList.contains('message-content-container')) {
-            return true
-          }
-        } else {
-          if (parentNode?.classList.contains('message-content-container-assistant')) {
-            return true
+          if (filterIncludeUser) {
+            if (parentNode?.classList.contains('message-content-container')) {
+              return NodeFilter.FILTER_ACCEPT
+            }
+          } else {
+            if (parentNode?.classList.contains('message-content-container-assistant')) {
+              return NodeFilter.FILTER_ACCEPT
+            }
           }
+          parentNode = parentNode.parentNode as HTMLElement
         }
-        parentNode = parentNode.parentNode as HTMLElement
+        return NodeFilter.FILTER_REJECT
+      } else {
+        return NodeFilter.FILTER_REJECT
       }
-      return false
-    } else {
-      return false
     }
   }
 

From 27d22e90d4c96f4aca396337b202df17ca8b3390 Mon Sep 17 00:00:00 2001
From: kangfenmao <kangfenmao@qq.com>
Date: Sat, 28 Jun 2025 20:38:53 +0800
Subject: [PATCH 74/75] chore(version): 1.4.7

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c6eac03d52..88c2295312 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "1.4.6",
+  "version": "1.4.7",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",

From 3f5901766d4d7d0a7780185c7f2d67c455dc274f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?George=C2=B7Dong?=
 <98630204+GeorgeDong32@users.noreply.github.com>
Date: Sat, 28 Jun 2025 22:19:37 +0800
Subject: [PATCH 75/75] feat: Add S3 Backup (#6802)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: import opendal

* feat: 添加S3备份支持及相关设置界面

- 在IpcChannel中新增S3备份相关IPC事件，支持备份、恢复、
  列表、删除文件及连接检测
- 在ipc主进程注册对应的S3备份处理函数，集成backupManager
- 新增S3设置页面，支持配置Endpoint、Region、Bucket、AccessKey等
  参数，并提供同步和备份策略的UI控制
- 删除未使用的RemoteStorage.ts，简化代码库

提升备份功能的灵活性，支持S3作为远程存储目标

* feat(S3 Backup): 完善S3备份功能

- 支持自动备份
- 优化设置前端
- 优化备份恢复代码

* feat(i18n): add S3 storage translations

* feat(settings): 优化数据设置页面和S3设置页面UI

* feat(settings): optimize S3 settings state structure and update usage

* refactor: simplify S3 backup and restore modal logic

* feat(s3 backup): improve S3 settings defaults and modal props

* fix(i18n): optimize S3 access key translations

* feat(backup): optimize logging and progress reporting

* fix(settings): set S3 maxBackups as unlimited by default

* chore(package): restore opendal dependency in package.json

---------

Co-authored-by: suyao <sy20010504@gmail.com>
---
 package.json                                  |   1 +
 packages/shared/IpcChannel.ts                 |   5 +
 src/main/ipc.ts                               |   5 +
 src/main/services/BackupManager.ts            | 234 +++++++++--
 src/main/services/RemoteStorage.ts            | 126 +++---
 src/preload/index.ts                          |  19 +-
 .../src/components/S3BackupManager.tsx        | 298 ++++++++++++++
 src/renderer/src/components/S3Modals.tsx      | 258 ++++++++++++
 src/renderer/src/i18n/locales/en-us.json      |  64 +++
 src/renderer/src/i18n/locales/ja-jp.json      |  64 +++
 src/renderer/src/i18n/locales/ru-ru.json      |  64 +++
 src/renderer/src/i18n/locales/zh-cn.json      |  66 +++-
 src/renderer/src/i18n/locales/zh-tw.json      |  66 +++-
 src/renderer/src/init.ts                      |   4 +-
 .../settings/DataSettings/DataSettings.tsx    |  10 +-
 .../settings/DataSettings/S3Settings.tsx      | 276 +++++++++++++
 src/renderer/src/services/BackupService.ts    | 366 ++++++++++++++++--
 src/renderer/src/store/backup.ts              |  11 +-
 src/renderer/src/store/settings.ts            |  34 +-
 src/renderer/src/types/index.ts               |  12 +
 yarn.lock                                     |  80 ++++
 21 files changed, 1941 insertions(+), 122 deletions(-)
 create mode 100644 src/renderer/src/components/S3BackupManager.tsx
 create mode 100644 src/renderer/src/components/S3Modals.tsx
 create mode 100644 src/renderer/src/pages/settings/DataSettings/S3Settings.tsx

diff --git a/package.json b/package.json
index 88c2295312..5455f348b2 100644
--- a/package.json
+++ b/package.json
@@ -181,6 +181,7 @@
     "npx-scope-finder": "^1.2.0",
     "officeparser": "^4.1.1",
     "openai": "patch:openai@npm%3A5.1.0#~/.yarn/patches/openai-npm-5.1.0-0e7b3ccb07.patch",
+    "opendal": "0.47.11",
     "p-queue": "^8.1.0",
     "playwright": "^1.52.0",
     "prettier": "^3.5.3",
diff --git a/packages/shared/IpcChannel.ts b/packages/shared/IpcChannel.ts
index daea5dad6e..ca49bd40c5 100644
--- a/packages/shared/IpcChannel.ts
+++ b/packages/shared/IpcChannel.ts
@@ -153,6 +153,11 @@ export enum IpcChannel {
   Backup_CheckConnection = 'backup:checkConnection',
   Backup_CreateDirectory = 'backup:createDirectory',
   Backup_DeleteWebdavFile = 'backup:deleteWebdavFile',
+  Backup_BackupToS3 = 'backup:backupToS3',
+  Backup_RestoreFromS3 = 'backup:restoreFromS3',
+  Backup_ListS3Files = 'backup:listS3Files',
+  Backup_DeleteS3File = 'backup:deleteS3File',
+  Backup_CheckS3Connection = 'backup:checkS3Connection',
 
   // zip
   Zip_Compress = 'zip:compress',
diff --git a/src/main/ipc.ts b/src/main/ipc.ts
index 8c6810bcdc..af043c7c8c 100644
--- a/src/main/ipc.ts
+++ b/src/main/ipc.ts
@@ -344,6 +344,11 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.Backup_CheckConnection, backupManager.checkConnection)
   ipcMain.handle(IpcChannel.Backup_CreateDirectory, backupManager.createDirectory)
   ipcMain.handle(IpcChannel.Backup_DeleteWebdavFile, backupManager.deleteWebdavFile)
+  ipcMain.handle(IpcChannel.Backup_BackupToS3, backupManager.backupToS3)
+  ipcMain.handle(IpcChannel.Backup_RestoreFromS3, backupManager.restoreFromS3)
+  ipcMain.handle(IpcChannel.Backup_ListS3Files, backupManager.listS3Files)
+  ipcMain.handle(IpcChannel.Backup_DeleteS3File, backupManager.deleteS3File)
+  ipcMain.handle(IpcChannel.Backup_CheckS3Connection, backupManager.checkS3Connection)
 
   // file
   ipcMain.handle(IpcChannel.File_Open, fileManager.open)
diff --git a/src/main/services/BackupManager.ts b/src/main/services/BackupManager.ts
index e994e90bed..6e0c813e6d 100644
--- a/src/main/services/BackupManager.ts
+++ b/src/main/services/BackupManager.ts
@@ -1,5 +1,6 @@
 import { IpcChannel } from '@shared/IpcChannel'
 import { WebDavConfig } from '@types'
+import { S3Config } from '@types'
 import archiver from 'archiver'
 import { exec } from 'child_process'
 import { app } from 'electron'
@@ -10,6 +11,7 @@ import * as path from 'path'
 import { CreateDirectoryOptions, FileStat } from 'webdav'
 
 import { getDataPath } from '../utils'
+import S3Storage from './RemoteStorage'
 import WebDav from './WebDav'
 import { windowService } from './WindowService'
 
@@ -25,6 +27,11 @@ class BackupManager {
     this.restoreFromWebdav = this.restoreFromWebdav.bind(this)
     this.listWebdavFiles = this.listWebdavFiles.bind(this)
     this.deleteWebdavFile = this.deleteWebdavFile.bind(this)
+    this.backupToS3 = this.backupToS3.bind(this)
+    this.restoreFromS3 = this.restoreFromS3.bind(this)
+    this.listS3Files = this.listS3Files.bind(this)
+    this.deleteS3File = this.deleteS3File.bind(this)
+    this.checkS3Connection = this.checkS3Connection.bind(this)
   }
 
   private async setWritableRecursive(dirPath: string): Promise<void> {
@@ -85,7 +92,11 @@ class BackupManager {
 
     const onProgress = (processData: { stage: string; progress: number; total: number }) => {
       mainWindow?.webContents.send(IpcChannel.BackupProgress, processData)
-      Logger.log('[BackupManager] backup progress', processData)
+      // 只在关键阶段记录日志：开始、结束和主要阶段转换点
+      const logStages = ['preparing', 'writing_data', 'preparing_compression', 'completed']
+      if (logStages.includes(processData.stage) || processData.progress === 100) {
+        Logger.log('[BackupManager] backup progress', processData)
+      }
     }
 
     try {
@@ -147,18 +158,23 @@ class BackupManager {
       let totalBytes = 0
       let processedBytes = 0
 
-      // 首先计算总文件数和总大小
+      // 首先计算总文件数和总大小，但不记录详细日志
       const calculateTotals = async (dirPath: string) => {
-        const items = await fs.readdir(dirPath, { withFileTypes: true })
-        for (const item of items) {
-          const fullPath = path.join(dirPath, item.name)
-          if (item.isDirectory()) {
-            await calculateTotals(fullPath)
-          } else {
-            totalEntries++
-            const stats = await fs.stat(fullPath)
-            totalBytes += stats.size
+        try {
+          const items = await fs.readdir(dirPath, { withFileTypes: true })
+          for (const item of items) {
+            const fullPath = path.join(dirPath, item.name)
+            if (item.isDirectory()) {
+              await calculateTotals(fullPath)
+            } else {
+              totalEntries++
+              const stats = await fs.stat(fullPath)
+              totalBytes += stats.size
+            }
           }
+        } catch (error) {
+          // 仅在出错时记录日志
+          Logger.error('[BackupManager] Error calculating totals:', error)
         }
       }
 
@@ -230,7 +246,11 @@ class BackupManager {
 
     const onProgress = (processData: { stage: string; progress: number; total: number }) => {
       mainWindow?.webContents.send(IpcChannel.RestoreProgress, processData)
-      Logger.log('[BackupManager] restore progress', processData)
+      // 只在关键阶段记录日志
+      const logStages = ['preparing', 'extracting', 'extracted', 'reading_data', 'completed']
+      if (logStages.includes(processData.stage) || processData.progress === 100) {
+        Logger.log('[BackupManager] restore progress', processData)
+      }
     }
 
     try {
@@ -382,21 +402,54 @@ class BackupManager {
     destination: string,
     onProgress: (size: number) => void
   ): Promise<void> {
-    const items = await fs.readdir(source, { withFileTypes: true })
+    // 先统计总文件数
+    let totalFiles = 0
+    let processedFiles = 0
+    let lastProgressReported = 0
 
-    for (const item of items) {
-      const sourcePath = path.join(source, item.name)
-      const destPath = path.join(destination, item.name)
+    // 计算总文件数
+    const countFiles = async (dir: string): Promise<number> => {
+      let count = 0
+      const items = await fs.readdir(dir, { withFileTypes: true })
+      for (const item of items) {
+        if (item.isDirectory()) {
+          count += await countFiles(path.join(dir, item.name))
+        } else {
+          count++
+        }
+      }
+      return count
+    }
 
-      if (item.isDirectory()) {
-        await fs.ensureDir(destPath)
-        await this.copyDirWithProgress(sourcePath, destPath, onProgress)
-      } else {
-        const stats = await fs.stat(sourcePath)
-        await fs.copy(sourcePath, destPath)
-        onProgress(stats.size)
+    totalFiles = await countFiles(source)
+
+    // 复制文件并更新进度
+    const copyDir = async (src: string, dest: string): Promise<void> => {
+      const items = await fs.readdir(src, { withFileTypes: true })
+
+      for (const item of items) {
+        const sourcePath = path.join(src, item.name)
+        const destPath = path.join(dest, item.name)
+
+        if (item.isDirectory()) {
+          await fs.ensureDir(destPath)
+          await copyDir(sourcePath, destPath)
+        } else {
+          const stats = await fs.stat(sourcePath)
+          await fs.copy(sourcePath, destPath)
+          processedFiles++
+
+          // 只在进度变化超过5%时报告进度
+          const currentProgress = Math.floor((processedFiles / totalFiles) * 100)
+          if (currentProgress - lastProgressReported >= 5 || processedFiles === totalFiles) {
+            lastProgressReported = currentProgress
+            onProgress(stats.size)
+          }
+        }
       }
     }
+
+    await copyDir(source, destination)
   }
 
   async checkConnection(_: Electron.IpcMainInvokeEvent, webdavConfig: WebDavConfig) {
@@ -423,6 +476,141 @@ class BackupManager {
       throw new Error(error.message || 'Failed to delete backup file')
     }
   }
+
+  async backupToS3(_: Electron.IpcMainInvokeEvent, data: string, s3Config: S3Config) {
+    // 获取设备名
+    const os = require('os')
+    const deviceName = os.hostname ? os.hostname() : 'device'
+    const timestamp = new Date()
+      .toISOString()
+      .replace(/[-:T.Z]/g, '')
+      .slice(0, 14)
+    const filename = s3Config.fileName || `cherry-studio.backup.${deviceName}.${timestamp}.zip`
+
+    // 不记录详细日志，只记录开始和结束
+    Logger.log(`[BackupManager] Starting S3 backup to ${filename}`)
+
+    const backupedFilePath = await this.backup(_, filename, data, undefined, s3Config.skipBackupFile)
+    const s3Client = new S3Storage('s3', {
+      endpoint: s3Config.endpoint,
+      region: s3Config.region,
+      bucket: s3Config.bucket,
+      access_key_id: s3Config.access_key_id,
+      secret_access_key: s3Config.secret_access_key,
+      root: s3Config.root || ''
+    })
+    try {
+      const fileBuffer = await fs.promises.readFile(backupedFilePath)
+      const result = await s3Client.putFileContents(filename, fileBuffer)
+      await fs.remove(backupedFilePath)
+
+      Logger.log(`[BackupManager] S3 backup completed successfully: ${filename}`)
+      return result
+    } catch (error) {
+      Logger.error(`[BackupManager] S3 backup failed:`, error)
+      await fs.remove(backupedFilePath)
+      throw error
+    }
+  }
+
+  async restoreFromS3(_: Electron.IpcMainInvokeEvent, s3Config: S3Config) {
+    const filename = s3Config.fileName || 'cherry-studio.backup.zip'
+
+    // 只记录开始和结束或错误
+    Logger.log(`[BackupManager] Starting restore from S3: ${filename}`)
+
+    const s3Client = new S3Storage('s3', {
+      endpoint: s3Config.endpoint,
+      region: s3Config.region,
+      bucket: s3Config.bucket,
+      access_key_id: s3Config.access_key_id,
+      secret_access_key: s3Config.secret_access_key,
+      root: s3Config.root || ''
+    })
+    try {
+      const retrievedFile = await s3Client.getFileContents(filename)
+      const backupedFilePath = path.join(this.backupDir, filename)
+      if (!fs.existsSync(this.backupDir)) {
+        fs.mkdirSync(this.backupDir, { recursive: true })
+      }
+      await new Promise<void>((resolve, reject) => {
+        const writeStream = fs.createWriteStream(backupedFilePath)
+        writeStream.write(retrievedFile as Buffer)
+        writeStream.end()
+        writeStream.on('finish', () => resolve())
+        writeStream.on('error', (error) => reject(error))
+      })
+
+      Logger.log(`[BackupManager] S3 restore file downloaded successfully: ${filename}`)
+      return await this.restore(_, backupedFilePath)
+    } catch (error: any) {
+      Logger.error('[BackupManager] Failed to restore from S3:', error)
+      throw new Error(error.message || 'Failed to restore backup file')
+    }
+  }
+
+  listS3Files = async (_: Electron.IpcMainInvokeEvent, s3Config: S3Config) => {
+    try {
+      const s3Client = new S3Storage('s3', {
+        endpoint: s3Config.endpoint,
+        region: s3Config.region,
+        bucket: s3Config.bucket,
+        access_key_id: s3Config.access_key_id,
+        secret_access_key: s3Config.secret_access_key,
+        root: s3Config.root || ''
+      })
+      const entries = await s3Client.instance?.list('/')
+      const files: Array<{ fileName: string; modifiedTime: string; size: number }> = []
+      if (entries) {
+        for await (const entry of entries) {
+          const path = entry.path()
+          if (path.endsWith('.zip')) {
+            const meta = await s3Client.instance!.stat(path)
+            if (meta.isFile()) {
+              files.push({
+                fileName: path.replace(/^\/+/, ''),
+                modifiedTime: meta.lastModified || '',
+                size: Number(meta.contentLength || 0n)
+              })
+            }
+          }
+        }
+      }
+      return files.sort((a, b) => new Date(b.modifiedTime).getTime() - new Date(a.modifiedTime).getTime())
+    } catch (error: any) {
+      Logger.error('Failed to list S3 files:', error)
+      throw new Error(error.message || 'Failed to list backup files')
+    }
+  }
+
+  async deleteS3File(_: Electron.IpcMainInvokeEvent, fileName: string, s3Config: S3Config) {
+    try {
+      const s3Client = new S3Storage('s3', {
+        endpoint: s3Config.endpoint,
+        region: s3Config.region,
+        bucket: s3Config.bucket,
+        access_key_id: s3Config.access_key_id,
+        secret_access_key: s3Config.secret_access_key,
+        root: s3Config.root || ''
+      })
+      return await s3Client.deleteFile(fileName)
+    } catch (error: any) {
+      Logger.error('Failed to delete S3 file:', error)
+      throw new Error(error.message || 'Failed to delete backup file')
+    }
+  }
+
+  async checkS3Connection(_: Electron.IpcMainInvokeEvent, s3Config: S3Config) {
+    const s3Client = new S3Storage('s3', {
+      endpoint: s3Config.endpoint,
+      region: s3Config.region,
+      bucket: s3Config.bucket,
+      access_key_id: s3Config.access_key_id,
+      secret_access_key: s3Config.secret_access_key,
+      root: s3Config.root || ''
+    })
+    return await s3Client.checkConnection()
+  }
 }
 
 export default BackupManager
diff --git a/src/main/services/RemoteStorage.ts b/src/main/services/RemoteStorage.ts
index b62489bbbe..4efc57b6c6 100644
--- a/src/main/services/RemoteStorage.ts
+++ b/src/main/services/RemoteStorage.ts
@@ -1,57 +1,83 @@
-// import Logger from 'electron-log'
-// import { Operator } from 'opendal'
+import Logger from 'electron-log'
+import type { Operator as OperatorType } from 'opendal'
+const { Operator } = require('opendal')
 
-// export default class RemoteStorage {
-//   public instance: Operator | undefined
+export default class S3Storage {
+  public instance: OperatorType | undefined
 
-//   /**
-//    *
-//    * @param scheme is the scheme for opendal services. Available value includes "azblob", "azdls", "cos", "gcs", "obs", "oss", "s3", "webdav", "webhdfs", "aliyun-drive", "alluxio", "azfile", "dropbox", "gdrive", "onedrive", "postgresql", "mysql", "redis", "swift", "mongodb", "alluxio", "b2", "seafile", "upyun", "koofr", "yandex-disk"
-//    * @param options is the options for given opendal services. Valid options depend on the scheme. Checkout https://docs.rs/opendal/latest/opendal/services/index.html for all valid options.
-//    *
-//    * For example, use minio as remote storage:
-//    *
-//    * ```typescript
-//    * const storage = new RemoteStorage('s3', {
-//    *   endpoint: 'http://localhost:9000',
-//    *   region: 'us-east-1',
-//    *   bucket: 'testbucket',
-//    *   access_key_id: 'user',
-//    *   secret_access_key: 'password',
-//    *   root: '/path/to/basepath',
-//    * })
-//    * ```
-//    */
-//   constructor(scheme: string, options?: Record<string, string> | undefined | null) {
-//     this.instance = new Operator(scheme, options)
+  /**
+   *
+   * @param scheme is the scheme for opendal services. Available value includes "azblob", "azdls", "cos", "gcs", "obs", "oss", "s3", "webdav", "webhdfs", "aliyun-drive", "alluxio", "azfile", "dropbox", "gdrive", "onedrive", "postgresql", "mysql", "redis", "swift", "mongodb", "alluxio", "b2", "seafile", "upyun", "koofr", "yandex-disk"
+   * @param options is the options for given opendal services. Valid options depend on the scheme. Checkout https://docs.rs/opendal/latest/opendal/services/index.html for all valid options.
+   *
+   * For example, use minio as remote storage:
+   *
+   * ```typescript
+   * const storage = new S3Storage('s3', {
+   *   endpoint: 'http://localhost:9000',
+   *   region: 'us-east-1',
+   *   bucket: 'testbucket',
+   *   access_key_id: 'user',
+   *   secret_access_key: 'password',
+   *   root: '/path/to/basepath',
+   * })
+   * ```
+   */
+  constructor(scheme: string, options?: Record<string, string> | undefined | null) {
+    this.instance = new Operator(scheme, options)
 
-//     this.putFileContents = this.putFileContents.bind(this)
-//     this.getFileContents = this.getFileContents.bind(this)
-//   }
+    this.putFileContents = this.putFileContents.bind(this)
+    this.getFileContents = this.getFileContents.bind(this)
+  }
 
-//   public putFileContents = async (filename: string, data: string | Buffer) => {
-//     if (!this.instance) {
-//       return new Error('RemoteStorage client not initialized')
-//     }
+  public putFileContents = async (filename: string, data: string | Buffer) => {
+    if (!this.instance) {
+      return new Error('RemoteStorage client not initialized')
+    }
 
-//     try {
-//       return await this.instance.write(filename, data)
-//     } catch (error) {
-//       Logger.error('[RemoteStorage] Error putting file contents:', error)
-//       throw error
-//     }
-//   }
+    try {
+      return await this.instance.write(filename, data)
+    } catch (error) {
+      Logger.error('[RemoteStorage] Error putting file contents:', error)
+      throw error
+    }
+  }
 
-//   public getFileContents = async (filename: string) => {
-//     if (!this.instance) {
-//       throw new Error('RemoteStorage client not initialized')
-//     }
+  public getFileContents = async (filename: string) => {
+    if (!this.instance) {
+      throw new Error('RemoteStorage client not initialized')
+    }
 
-//     try {
-//       return await this.instance.read(filename)
-//     } catch (error) {
-//       Logger.error('[RemoteStorage] Error getting file contents:', error)
-//       throw error
-//     }
-//   }
-// }
+    try {
+      return await this.instance.read(filename)
+    } catch (error) {
+      Logger.error('[RemoteStorage] Error getting file contents:', error)
+      throw error
+    }
+  }
+
+  public deleteFile = async (filename: string) => {
+    if (!this.instance) {
+      throw new Error('RemoteStorage client not initialized')
+    }
+    try {
+      return await this.instance.delete(filename)
+    } catch (error) {
+      Logger.error('[RemoteStorage] Error deleting file:', error)
+      throw error
+    }
+  }
+
+  public checkConnection = async () => {
+    if (!this.instance) {
+      throw new Error('RemoteStorage client not initialized')
+    }
+    try {
+      // 检查根目录是否可访问
+      return await this.instance.stat('/')
+    } catch (error) {
+      Logger.error('[RemoteStorage] Error checking connection:', error)
+      throw error
+    }
+  }
+}
diff --git a/src/preload/index.ts b/src/preload/index.ts
index 8412e00bc3..f6e49ece10 100644
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -2,7 +2,16 @@ import type { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
 import { electronAPI } from '@electron-toolkit/preload'
 import { UpgradeChannel } from '@shared/config/constant'
 import { IpcChannel } from '@shared/IpcChannel'
-import { FileType, KnowledgeBaseParams, KnowledgeItem, MCPServer, Shortcut, ThemeMode, WebDavConfig } from '@types'
+import {
+  FileType,
+  KnowledgeBaseParams,
+  KnowledgeItem,
+  MCPServer,
+  S3Config,
+  Shortcut,
+  ThemeMode,
+  WebDavConfig
+} from '@types'
 import { contextBridge, ipcRenderer, OpenDialogOptions, shell, webUtils } from 'electron'
 import { Notification } from 'src/renderer/src/types/notification'
 import { CreateDirectoryOptions } from 'webdav'
@@ -71,7 +80,13 @@ const api = {
     createDirectory: (webdavConfig: WebDavConfig, path: string, options?: CreateDirectoryOptions) =>
       ipcRenderer.invoke(IpcChannel.Backup_CreateDirectory, webdavConfig, path, options),
     deleteWebdavFile: (fileName: string, webdavConfig: WebDavConfig) =>
-      ipcRenderer.invoke(IpcChannel.Backup_DeleteWebdavFile, fileName, webdavConfig)
+      ipcRenderer.invoke(IpcChannel.Backup_DeleteWebdavFile, fileName, webdavConfig),
+    backupToS3: (data: string, s3Config: S3Config) => ipcRenderer.invoke(IpcChannel.Backup_BackupToS3, data, s3Config),
+    restoreFromS3: (s3Config: S3Config) => ipcRenderer.invoke(IpcChannel.Backup_RestoreFromS3, s3Config),
+    listS3Files: (s3Config: S3Config) => ipcRenderer.invoke(IpcChannel.Backup_ListS3Files, s3Config),
+    deleteS3File: (fileName: string, s3Config: S3Config) =>
+      ipcRenderer.invoke(IpcChannel.Backup_DeleteS3File, fileName, s3Config),
+    checkS3Connection: (s3Config: S3Config) => ipcRenderer.invoke(IpcChannel.Backup_CheckS3Connection, s3Config)
   },
   file: {
     select: (options?: OpenDialogOptions) => ipcRenderer.invoke(IpcChannel.File_Select, options),
diff --git a/src/renderer/src/components/S3BackupManager.tsx b/src/renderer/src/components/S3BackupManager.tsx
new file mode 100644
index 0000000000..ecc9ed88ef
--- /dev/null
+++ b/src/renderer/src/components/S3BackupManager.tsx
@@ -0,0 +1,298 @@
+import { DeleteOutlined, ExclamationCircleOutlined, ReloadOutlined } from '@ant-design/icons'
+import { restoreFromS3 } from '@renderer/services/BackupService'
+import { formatFileSize } from '@renderer/utils'
+import { Button, Modal, Table, Tooltip } from 'antd'
+import dayjs from 'dayjs'
+import { useCallback, useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+interface BackupFile {
+  fileName: string
+  modifiedTime: string
+  size: number
+}
+
+interface S3Config {
+  endpoint: string
+  region: string
+  bucket: string
+  access_key_id: string
+  secret_access_key: string
+  root?: string
+}
+
+interface S3BackupManagerProps {
+  visible: boolean
+  onClose: () => void
+  s3Config: {
+    endpoint?: string
+    region?: string
+    bucket?: string
+    access_key_id?: string
+    secret_access_key?: string
+    root?: string
+  }
+  restoreMethod?: (fileName: string) => Promise<void>
+}
+
+export function S3BackupManager({ visible, onClose, s3Config, restoreMethod }: S3BackupManagerProps) {
+  const [backupFiles, setBackupFiles] = useState<BackupFile[]>([])
+  const [loading, setLoading] = useState(false)
+  const [selectedRowKeys, setSelectedRowKeys] = useState<React.Key[]>([])
+  const [deleting, setDeleting] = useState(false)
+  const [restoring, setRestoring] = useState(false)
+  const [pagination, setPagination] = useState({
+    current: 1,
+    pageSize: 5,
+    total: 0
+  })
+  const { t } = useTranslation()
+
+  const { endpoint, region, bucket, access_key_id, secret_access_key, root } = s3Config
+
+  const fetchBackupFiles = useCallback(async () => {
+    if (!endpoint || !region || !bucket || !access_key_id || !secret_access_key) {
+      window.message.error(t('settings.data.s3.manager.config.incomplete'))
+      return
+    }
+
+    setLoading(true)
+    try {
+      const files = await window.api.backup.listS3Files({
+        endpoint,
+        region,
+        bucket,
+        access_key_id,
+        secret_access_key,
+        root
+      } as S3Config)
+      setBackupFiles(files)
+      setPagination((prev) => ({
+        ...prev,
+        total: files.length
+      }))
+    } catch (error: any) {
+      window.message.error(t('settings.data.s3.manager.files.fetch.error', { message: error.message }))
+    } finally {
+      setLoading(false)
+    }
+  }, [endpoint, region, bucket, access_key_id, secret_access_key, root, t])
+
+  useEffect(() => {
+    if (visible) {
+      fetchBackupFiles()
+      setSelectedRowKeys([])
+      setPagination((prev) => ({
+        ...prev,
+        current: 1
+      }))
+    }
+  }, [visible, fetchBackupFiles])
+
+  const handleTableChange = (pagination: any) => {
+    setPagination(pagination)
+  }
+
+  const handleDeleteSelected = async () => {
+    if (selectedRowKeys.length === 0) {
+      window.message.warning(t('settings.data.s3.manager.select.warning'))
+      return
+    }
+
+    if (!endpoint || !region || !bucket || !access_key_id || !secret_access_key) {
+      window.message.error(t('settings.data.s3.manager.config.incomplete'))
+      return
+    }
+
+    window.modal.confirm({
+      title: t('settings.data.s3.manager.delete.confirm.title'),
+      icon: <ExclamationCircleOutlined />,
+      content: t('settings.data.s3.manager.delete.confirm.multiple', { count: selectedRowKeys.length }),
+      okText: t('settings.data.s3.manager.delete.confirm.title'),
+      cancelText: t('common.cancel'),
+      centered: true,
+      onOk: async () => {
+        setDeleting(true)
+        try {
+          // 依次删除选中的文件
+          for (const key of selectedRowKeys) {
+            await window.api.backup.deleteS3File(key.toString(), {
+              endpoint,
+              region,
+              bucket,
+              access_key_id,
+              secret_access_key,
+              root
+            } as S3Config)
+          }
+          window.message.success(
+            t('settings.data.s3.manager.delete.success.multiple', { count: selectedRowKeys.length })
+          )
+          setSelectedRowKeys([])
+          await fetchBackupFiles()
+        } catch (error: any) {
+          window.message.error(t('settings.data.s3.manager.delete.error', { message: error.message }))
+        } finally {
+          setDeleting(false)
+        }
+      }
+    })
+  }
+
+  const handleDeleteSingle = async (fileName: string) => {
+    if (!endpoint || !region || !bucket || !access_key_id || !secret_access_key) {
+      window.message.error(t('settings.data.s3.manager.config.incomplete'))
+      return
+    }
+
+    window.modal.confirm({
+      title: t('settings.data.s3.manager.delete.confirm.title'),
+      icon: <ExclamationCircleOutlined />,
+      content: t('settings.data.s3.manager.delete.confirm.single', { fileName }),
+      okText: t('settings.data.s3.manager.delete.confirm.title'),
+      cancelText: t('common.cancel'),
+      centered: true,
+      onOk: async () => {
+        setDeleting(true)
+        try {
+          await window.api.backup.deleteS3File(fileName, {
+            endpoint,
+            region,
+            bucket,
+            access_key_id,
+            secret_access_key,
+            root
+          } as S3Config)
+          window.message.success(t('settings.data.s3.manager.delete.success.single'))
+          await fetchBackupFiles()
+        } catch (error: any) {
+          window.message.error(t('settings.data.s3.manager.delete.error', { message: error.message }))
+        } finally {
+          setDeleting(false)
+        }
+      }
+    })
+  }
+
+  const handleRestore = async (fileName: string) => {
+    if (!endpoint || !region || !bucket || !access_key_id || !secret_access_key) {
+      window.message.error(t('settings.data.s3.manager.config.incomplete'))
+      return
+    }
+
+    window.modal.confirm({
+      title: t('settings.data.s3.restore.confirm.title'),
+      icon: <ExclamationCircleOutlined />,
+      content: t('settings.data.s3.restore.confirm.content'),
+      okText: t('settings.data.s3.restore.confirm.ok'),
+      cancelText: t('settings.data.s3.restore.confirm.cancel'),
+      centered: true,
+      onOk: async () => {
+        setRestoring(true)
+        try {
+          await (restoreMethod || restoreFromS3)(fileName)
+          window.message.success(t('settings.data.s3.restore.success'))
+          onClose() // 关闭模态框
+        } catch (error: any) {
+          window.message.error(t('settings.data.s3.restore.error', { message: error.message }))
+        } finally {
+          setRestoring(false)
+        }
+      }
+    })
+  }
+
+  const columns = [
+    {
+      title: t('settings.data.s3.manager.columns.fileName'),
+      dataIndex: 'fileName',
+      key: 'fileName',
+      ellipsis: {
+        showTitle: false
+      },
+      render: (fileName: string) => (
+        <Tooltip placement="topLeft" title={fileName}>
+          {fileName}
+        </Tooltip>
+      )
+    },
+    {
+      title: t('settings.data.s3.manager.columns.modifiedTime'),
+      dataIndex: 'modifiedTime',
+      key: 'modifiedTime',
+      width: 180,
+      render: (time: string) => dayjs(time).format('YYYY-MM-DD HH:mm:ss')
+    },
+    {
+      title: t('settings.data.s3.manager.columns.size'),
+      dataIndex: 'size',
+      key: 'size',
+      width: 120,
+      render: (size: number) => formatFileSize(size)
+    },
+    {
+      title: t('settings.data.s3.manager.columns.actions'),
+      key: 'action',
+      width: 160,
+      render: (_: any, record: BackupFile) => (
+        <>
+          <Button type="link" onClick={() => handleRestore(record.fileName)} disabled={restoring || deleting}>
+            {t('settings.data.s3.manager.restore')}
+          </Button>
+          <Button
+            type="link"
+            danger
+            onClick={() => handleDeleteSingle(record.fileName)}
+            disabled={deleting || restoring}>
+            {t('settings.data.s3.manager.delete')}
+          </Button>
+        </>
+      )
+    }
+  ]
+
+  const rowSelection = {
+    selectedRowKeys,
+    onChange: (selectedRowKeys: React.Key[]) => {
+      setSelectedRowKeys(selectedRowKeys)
+    }
+  }
+
+  return (
+    <Modal
+      title={t('settings.data.s3.manager.title')}
+      open={visible}
+      onCancel={onClose}
+      width={800}
+      centered
+      transitionName="animation-move-down"
+      footer={[
+        <Button key="refresh" icon={<ReloadOutlined />} onClick={fetchBackupFiles} disabled={loading}>
+          {t('settings.data.s3.manager.refresh')}
+        </Button>,
+        <Button
+          key="delete"
+          danger
+          icon={<DeleteOutlined />}
+          onClick={handleDeleteSelected}
+          disabled={selectedRowKeys.length === 0 || deleting}
+          loading={deleting}>
+          {t('settings.data.s3.manager.delete.selected', { count: selectedRowKeys.length })}
+        </Button>,
+        <Button key="close" onClick={onClose}>
+          {t('settings.data.s3.manager.close')}
+        </Button>
+      ]}>
+      <Table
+        rowKey="fileName"
+        columns={columns}
+        dataSource={backupFiles}
+        rowSelection={rowSelection}
+        pagination={pagination}
+        loading={loading}
+        onChange={handleTableChange}
+        size="middle"
+      />
+    </Modal>
+  )
+}
diff --git a/src/renderer/src/components/S3Modals.tsx b/src/renderer/src/components/S3Modals.tsx
new file mode 100644
index 0000000000..a74ad2e9ca
--- /dev/null
+++ b/src/renderer/src/components/S3Modals.tsx
@@ -0,0 +1,258 @@
+import { backupToS3, handleData } from '@renderer/services/BackupService'
+import { formatFileSize } from '@renderer/utils'
+import { Input, Modal, Select, Spin } from 'antd'
+import dayjs from 'dayjs'
+import { useCallback, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+interface BackupFile {
+  fileName: string
+  modifiedTime: string
+  size: number
+}
+
+export function useS3BackupModal() {
+  const [customFileName, setCustomFileName] = useState('')
+  const [isModalVisible, setIsModalVisible] = useState(false)
+  const [backuping, setBackuping] = useState(false)
+
+  const handleBackup = async () => {
+    setBackuping(true)
+    try {
+      await backupToS3({ customFileName, showMessage: true })
+    } finally {
+      setBackuping(false)
+      setIsModalVisible(false)
+    }
+  }
+
+  const handleCancel = () => {
+    setIsModalVisible(false)
+  }
+
+  const showBackupModal = useCallback(async () => {
+    // 获取默认文件名
+    const deviceType = await window.api.system.getDeviceType()
+    const hostname = await window.api.system.getHostname()
+    const timestamp = dayjs().format('YYYYMMDDHHmmss')
+    const defaultFileName = `cherry-studio.${timestamp}.${hostname}.${deviceType}.zip`
+    setCustomFileName(defaultFileName)
+    setIsModalVisible(true)
+  }, [])
+
+  return {
+    isModalVisible,
+    handleBackup,
+    handleCancel,
+    backuping,
+    customFileName,
+    setCustomFileName,
+    showBackupModal
+  }
+}
+
+type S3BackupModalProps = {
+  isModalVisible: boolean
+  handleBackup: () => Promise<void>
+  handleCancel: () => void
+  backuping: boolean
+  customFileName: string
+  setCustomFileName: (value: string) => void
+}
+
+export function S3BackupModal({
+  isModalVisible,
+  handleBackup,
+  handleCancel,
+  backuping,
+  customFileName,
+  setCustomFileName
+}: S3BackupModalProps) {
+  const { t } = useTranslation()
+
+  return (
+    <Modal
+      title={t('settings.data.s3.backup.modal.title')}
+      open={isModalVisible}
+      onOk={handleBackup}
+      onCancel={handleCancel}
+      okButtonProps={{ loading: backuping }}
+      transitionName="animation-move-down"
+      centered>
+      <Input
+        value={customFileName}
+        onChange={(e) => setCustomFileName(e.target.value)}
+        placeholder={t('settings.data.s3.backup.modal.filename.placeholder')}
+      />
+    </Modal>
+  )
+}
+
+interface UseS3RestoreModalProps {
+  endpoint: string | undefined
+  region: string | undefined
+  bucket: string | undefined
+  access_key_id: string | undefined
+  secret_access_key: string | undefined
+  root?: string | undefined
+}
+
+export function useS3RestoreModal({
+  endpoint,
+  region,
+  bucket,
+  access_key_id,
+  secret_access_key,
+  root
+}: UseS3RestoreModalProps) {
+  const [isRestoreModalVisible, setIsRestoreModalVisible] = useState(false)
+  const [restoring, setRestoring] = useState(false)
+  const [selectedFile, setSelectedFile] = useState<string | null>(null)
+  const [loadingFiles, setLoadingFiles] = useState(false)
+  const [backupFiles, setBackupFiles] = useState<BackupFile[]>([])
+  const { t } = useTranslation()
+
+  const showRestoreModal = useCallback(async () => {
+    if (!endpoint || !region || !bucket || !access_key_id || !secret_access_key) {
+      window.message.error({ content: t('settings.data.s3.manager.config.incomplete'), key: 's3-error' })
+      return
+    }
+
+    setIsRestoreModalVisible(true)
+    setLoadingFiles(true)
+    try {
+      const files = await window.api.backup.listS3Files({
+        endpoint,
+        region,
+        bucket,
+        access_key_id,
+        secret_access_key,
+        root
+      })
+      setBackupFiles(files)
+    } catch (error: any) {
+      window.message.error({
+        content: t('settings.data.s3.manager.files.fetch.error', { message: error.message }),
+        key: 'list-files-error'
+      })
+    } finally {
+      setLoadingFiles(false)
+    }
+  }, [endpoint, region, bucket, access_key_id, secret_access_key, root, t])
+
+  const handleRestore = useCallback(async () => {
+    if (!selectedFile || !endpoint || !region || !bucket || !access_key_id || !secret_access_key) {
+      window.message.error({
+        content: !selectedFile
+          ? t('settings.data.s3.restore.file.required')
+          : t('settings.data.s3.restore.config.incomplete'),
+        key: 'restore-error'
+      })
+      return
+    }
+
+    window.modal.confirm({
+      title: t('settings.data.s3.restore.confirm.title'),
+      content: t('settings.data.s3.restore.confirm.content'),
+      okText: t('settings.data.s3.restore.confirm.ok'),
+      cancelText: t('settings.data.s3.restore.confirm.cancel'),
+      centered: true,
+      onOk: async () => {
+        setRestoring(true)
+        try {
+          const data = await window.api.backup.restoreFromS3({
+            endpoint,
+            region,
+            bucket,
+            access_key_id,
+            secret_access_key,
+            root,
+            fileName: selectedFile
+          })
+          await handleData(JSON.parse(data))
+          window.message.success(t('settings.data.s3.restore.success'))
+          setIsRestoreModalVisible(false)
+        } catch (error: any) {
+          window.message.error({
+            content: t('settings.data.s3.restore.error', { message: error.message }),
+            key: 'restore-error'
+          })
+        } finally {
+          setRestoring(false)
+        }
+      }
+    })
+  }, [selectedFile, endpoint, region, bucket, access_key_id, secret_access_key, root, t])
+
+  const handleCancel = () => {
+    setIsRestoreModalVisible(false)
+  }
+
+  return {
+    isRestoreModalVisible,
+    handleRestore,
+    handleCancel,
+    restoring,
+    selectedFile,
+    setSelectedFile,
+    loadingFiles,
+    backupFiles,
+    showRestoreModal
+  }
+}
+
+type S3RestoreModalProps = ReturnType<typeof useS3RestoreModal>
+
+export function S3RestoreModal({
+  isRestoreModalVisible,
+  handleRestore,
+  handleCancel,
+  restoring,
+  selectedFile,
+  setSelectedFile,
+  loadingFiles,
+  backupFiles
+}: S3RestoreModalProps) {
+  const { t } = useTranslation()
+
+  return (
+    <Modal
+      title={t('settings.data.s3.restore.modal.title')}
+      open={isRestoreModalVisible}
+      onOk={handleRestore}
+      onCancel={handleCancel}
+      okButtonProps={{ loading: restoring }}
+      width={600}
+      transitionName="animation-move-down"
+      centered>
+      <div style={{ position: 'relative' }}>
+        <Select
+          style={{ width: '100%' }}
+          placeholder={t('settings.data.s3.restore.modal.select.placeholder')}
+          value={selectedFile}
+          onChange={setSelectedFile}
+          options={backupFiles.map(formatFileOption)}
+          loading={loadingFiles}
+          showSearch
+          filterOption={(input, option) =>
+            typeof option?.label === 'string' ? option.label.toLowerCase().includes(input.toLowerCase()) : false
+          }
+        />
+        {loadingFiles && (
+          <div style={{ position: 'absolute', top: '50%', left: '50%', transform: 'translate(-50%, -50%)' }}>
+            <Spin />
+          </div>
+        )}
+      </div>
+    </Modal>
+  )
+}
+
+function formatFileOption(file: BackupFile) {
+  const date = dayjs(file.modifiedTime).format('YYYY-MM-DD HH:mm:ss')
+  const size = formatFileSize(file.size)
+  return {
+    label: `${file.fileName} (${date}, ${size})`,
+    value: file.fileName
+  }
+}
diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index 9a5e61122e..b8b60ece63 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -1248,6 +1248,70 @@
           "maxBackups": "Maximum Backups",
           "maxBackups.unlimited": "Unlimited"
         },
+        "s3": {
+          "title": "S3 Compatible Storage",
+          "title.help": "Object storage services compatible with AWS S3 API, such as AWS S3, Cloudflare R2, Alibaba Cloud OSS, Tencent Cloud COS, etc.",
+          "endpoint": "API Endpoint",
+          "endpoint.placeholder": "https://s3.example.com",
+          "region": "Region",
+          "region.placeholder": "Region, e.g: us-east-1",
+          "bucket": "Bucket",
+          "bucket.placeholder": "Bucket, e.g: example",
+          "accessKeyId": "Access Key ID",
+          "accessKeyId.placeholder": "Access Key ID",
+          "secretAccessKey": "Secret Access Key",
+          "secretAccessKey.placeholder": "Secret Access Key",
+          "root": "Backup Directory (Optional)",
+          "root.placeholder": "e.g: /cherry-studio",
+          "backup.operation": "Backup Operation",
+          "backup.button": "Backup Now",
+          "backup.manager.button": "Manage Backups",
+          "backup.modal.title": "S3 Backup",
+          "backup.modal.filename.placeholder": "Please enter backup filename",
+          "backup.success": "S3 backup successful",
+          "backup.error": "S3 backup failed: {{message}}",
+          "autoSync": "Auto Sync",
+          "autoSync.off": "Off",
+          "autoSync.minute": "Every {{count}} minute",
+          "autoSync.hour": "Every {{count}} hour",
+          "maxBackups": "Maximum Backups",
+          "maxBackups.unlimited": "Unlimited",
+          "skipBackupFile": "Lightweight Backup",
+          "skipBackupFile.help": "When enabled, file data will be skipped during backup, only configuration information will be backed up, significantly reducing backup file size",
+          "syncStatus": "Sync Status",
+          "syncStatus.noSync": "Not synced",
+          "syncStatus.error": "Sync error: {{message}}",
+          "syncStatus.lastSync": "Last sync: {{time}}",
+          "manager.title": "S3 Backup File Manager",
+          "manager.refresh": "Refresh",
+          "manager.delete.selected": "Delete Selected ({{count}})",
+          "manager.close": "Close",
+          "manager.columns.fileName": "File Name",
+          "manager.columns.modifiedTime": "Modified Time",
+          "manager.columns.size": "File Size",
+          "manager.columns.actions": "Actions",
+          "manager.restore": "Restore",
+          "manager.delete": "Delete",
+          "manager.config.incomplete": "Please fill in complete S3 configuration",
+          "manager.files.fetch.error": "Failed to fetch backup file list: {{message}}",
+          "manager.delete.confirm.title": "Confirm Delete",
+          "manager.delete.confirm.multiple": "Are you sure you want to delete {{count}} selected backup files? This action cannot be undone.",
+          "manager.delete.confirm.single": "Are you sure you want to delete backup file \"{{fileName}}\"? This action cannot be undone.",
+          "manager.delete.success.multiple": "Successfully deleted {{count}} backup files",
+          "manager.delete.success.single": "Backup file deleted successfully",
+          "manager.delete.error": "Failed to delete backup file: {{message}}",
+          "manager.select.warning": "Please select backup files to delete",
+          "restore.modal.title": "S3 Data Restore",
+          "restore.modal.select.placeholder": "Please select backup file to restore",
+          "restore.confirm.title": "Confirm Restore Data",
+          "restore.confirm.content": "Restoring data will overwrite all current data. This action cannot be undone. Are you sure you want to continue?",
+          "restore.confirm.ok": "Confirm Restore",
+          "restore.confirm.cancel": "Cancel",
+          "restore.success": "Data restore successful",
+          "restore.error": "Data restore failed: {{message}}",
+          "restore.config.incomplete": "Please fill in complete S3 configuration",
+          "restore.file.required": "Please select backup file to restore"
+        },
         "yuque": {
           "check": {
             "button": "Check",
diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json
index b1b03c4f3b..1dbf64f933 100644
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@@ -1228,6 +1228,70 @@
           "maxBackups": "最大バックアップ数",
           "maxBackups.unlimited": "無制限"
         },
+        "s3": {
+          "title": "S3互換ストレージ",
+          "title.help": "AWS S3 APIと互換性のあるオブジェクトストレージサービス（例：AWS S3、Cloudflare R2、Alibaba Cloud OSS、Tencent Cloud COSなど）",
+          "endpoint": "APIエンドポイント",
+          "endpoint.placeholder": "https://s3.example.com",
+          "region": "リージョン",
+          "region.placeholder": "Region、例: us-east-1",
+          "bucket": "バケット",
+          "bucket.placeholder": "Bucket、例: example",
+          "accessKeyId": "Access Key ID",
+          "accessKeyId.placeholder": "Access Key ID",
+          "secretAccessKey": "Secret Access Key",
+          "secretAccessKey.placeholder": "Secret Access Key",
+          "root": "バックアップディレクトリ（オプション）",
+          "root.placeholder": "例：/cherry-studio",
+          "backup.operation": "バックアップ操作",
+          "backup.button": "今すぐバックアップ",
+          "backup.manager.button": "バックアップ管理",
+          "backup.modal.title": "S3バックアップ",
+          "backup.modal.filename.placeholder": "バックアップファイル名を入力してください",
+          "backup.success": "S3バックアップ成功",
+          "backup.error": "S3バックアップ失敗: {{message}}",
+          "autoSync": "自動同期",
+          "autoSync.off": "オフ",
+          "autoSync.minute": "{{count}}分毎",
+          "autoSync.hour": "{{count}}時間毎",
+          "maxBackups": "最大バックアップ数",
+          "maxBackups.unlimited": "無制限",
+          "skipBackupFile": "軽量バックアップ",
+          "skipBackupFile.help": "有効にすると、バックアップ時にファイルデータがスキップされ、設定情報のみがバックアップされ、バックアップファイルのサイズが大幅に削減されます。",
+          "syncStatus": "同期ステータス",
+          "syncStatus.noSync": "未同期",
+          "syncStatus.error": "同期エラー: {{message}}",
+          "syncStatus.lastSync": "最終同期: {{time}}",
+          "manager.title": "S3バックアップファイルマネージャー",
+          "manager.refresh": "更新",
+          "manager.delete.selected": "選択項目を削除 ({{count}})",
+          "manager.close": "閉じる",
+          "manager.columns.fileName": "ファイル名",
+          "manager.columns.modifiedTime": "変更日時",
+          "manager.columns.size": "ファイルサイズ",
+          "manager.columns.actions": "操作",
+          "manager.restore": "復元",
+          "manager.delete": "削除",
+          "manager.config.incomplete": "完全なS3設定情報を入力してください",
+          "manager.files.fetch.error": "バックアップファイルリストの取得に失敗しました: {{message}}",
+          "manager.delete.confirm.title": "削除の確認",
+          "manager.delete.confirm.multiple": "選択した{{count}}個のバックアップファイルを削除してもよろしいですか？この操作は元に戻せません。",
+          "manager.delete.confirm.single": "バックアップファイル「{{fileName}}」を削除してもよろしいですか？この操作は元に戻せません。",
+          "manager.delete.success.multiple": "{{count}}個のバックアップファイルを正常に削除しました",
+          "manager.delete.success.single": "バックアップファイルの削除に成功しました",
+          "manager.delete.error": "バックアップファイルの削除に失敗しました: {{message}}",
+          "manager.select.warning": "削除するバックアップファイルを選択してください",
+          "restore.modal.title": "S3データ復元",
+          "restore.modal.select.placeholder": "復元するバックアップファイルを選択してください",
+          "restore.confirm.title": "データ復元の確認",
+          "restore.confirm.content": "データを復元すると、現在のすべてのデータが上書きされます。この操作は元に戻せません。続行してもよろしいですか？",
+          "restore.confirm.ok": "復元を確認",
+          "restore.confirm.cancel": "キャンセル",
+          "restore.success": "データの復元に成功しました",
+          "restore.error": "データの復元に失敗しました: {{message}}",
+          "restore.config.incomplete": "完全なS3設定情報を入力してください",
+          "restore.file.required": "復元するバックアップファイルを選択してください"
+        },
         "yuque": {
           "check": {
             "button": "接続確認",
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index 46faee8677..4be09aa0a8 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -1246,6 +1246,70 @@
           "maxBackups": "Максимальное количество резервных копий",
           "maxBackups.unlimited": "Без ограничений"
         },
+        "s3": {
+          "title": "S3-совместимое хранилище",
+          "title.help": "Сервисы объектного хранения, совместимые с AWS S3 API, такие как AWS S3, Cloudflare R2, Alibaba Cloud OSS, Tencent Cloud COS и т.д.",
+          "endpoint": "Конечная точка API",
+          "endpoint.placeholder": "https://s3.example.com",
+          "region": "Регион",
+          "region.placeholder": "Регион, например: us-east-1",
+          "bucket": "Корзина",
+          "bucket.placeholder": "Корзина, например: example",
+          "accessKeyId": "Access Key ID",
+          "accessKeyId.placeholder": "Access Key ID",
+          "secretAccessKey": "Secret Access Key",
+          "secretAccessKey.placeholder": "Secret Access Key",
+          "root": "Каталог резервных копий (необязательно)",
+          "root.placeholder": "например: /cherry-studio",
+          "backup.operation": "Операция резервного копирования",
+          "backup.button": "Создать резервную копию сейчас",
+          "backup.manager.button": "Управление резервными копиями",
+          "backup.modal.title": "Резервное копирование S3",
+          "backup.modal.filename.placeholder": "Пожалуйста, введите имя файла резервной копии",
+          "backup.success": "Резервное копирование S3 успешно",
+          "backup.error": "Ошибка резервного копирования S3: {{message}}",
+          "autoSync": "Автосинхронизация",
+          "autoSync.off": "Выкл.",
+          "autoSync.minute": "Каждые {{count}} мин.",
+          "autoSync.hour": "Каждые {{count}} ч.",
+          "maxBackups": "Макс. резервных копий",
+          "maxBackups.unlimited": "Неограниченно",
+          "skipBackupFile": "Облегченное резервное копирование",
+          "skipBackupFile.help": "Если включено, данные файлов будут пропущены во время резервного копирования, будет скопирована только информация о конфигурации, что значительно уменьшит размер файла резервной копии.",
+          "syncStatus": "Статус синхронизации",
+          "syncStatus.noSync": "Не синхронизировано",
+          "syncStatus.error": "Ошибка синхронизации: {{message}}",
+          "syncStatus.lastSync": "Последняя синхронизация: {{time}}",
+          "manager.title": "Менеджер файлов резервных копий S3",
+          "manager.refresh": "Обновить",
+          "manager.delete.selected": "Удалить выбранные ({{count}})",
+          "manager.close": "Закрыть",
+          "manager.columns.fileName": "Имя файла",
+          "manager.columns.modifiedTime": "Время изменения",
+          "manager.columns.size": "Размер файла",
+          "manager.columns.actions": "Действия",
+          "manager.restore": "Восстановить",
+          "manager.delete": "Удалить",
+          "manager.config.incomplete": "Пожалуйста, заполните полную конфигурацию S3",
+          "manager.files.fetch.error": "Не удалось получить список файлов резервных копий: {{message}}",
+          "manager.delete.confirm.title": "Подтвердить удаление",
+          "manager.delete.confirm.multiple": "Вы уверены, что хотите удалить {{count}} выбранных файлов резервных копий? Это действие нельзя отменить.",
+          "manager.delete.confirm.single": "Вы уверены, что хотите удалить файл резервной копии \"{{fileName}}\"? Это действие нельзя отменить.",
+          "manager.delete.success.multiple": "Успешно удалено {{count}} файлов резервных копий",
+          "manager.delete.success.single": "Файл резервной копии успешно удален",
+          "manager.delete.error": "Не удалось удалить файл резервной копии: {{message}}",
+          "manager.select.warning": "Пожалуйста, выберите файлы резервных копий для удаления",
+          "restore.modal.title": "Восстановление данных S3",
+          "restore.modal.select.placeholder": "Пожалуйста, выберите файл резервной копии для восстановления",
+          "restore.confirm.title": "Подтвердить восстановление данных",
+          "restore.confirm.content": "Восстановление данных перезапишет все текущие данные. Это действие нельзя отменить. Вы уверены, что хотите продолжить?",
+          "restore.confirm.ok": "Подтвердить восстановление",
+          "restore.confirm.cancel": "Отмена",
+          "restore.success": "Восстановление данных успешно",
+          "restore.error": "Ошибка восстановления данных: {{message}}",
+          "restore.config.incomplete": "Пожалуйста, заполните полную конфигурацию S3",
+          "restore.file.required": "Пожалуйста, выберите файл резервной копии для восстановления"
+        },
         "yuque": {
           "check": {
             "button": "Проверить",
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index 828d46d3c7..0b4d7da254 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -1248,7 +1248,71 @@
           "title": "WebDAV",
           "user": "WebDAV 用户名",
           "maxBackups": "最大备份数",
-          "maxBackups.unlimited": "无限制"
+          "maxBackups.unlimited": "不限"
+        },
+        "s3": {
+          "title": "S3 兼容存储",
+          "title.help": "与AWS S3 API兼容的对象存储服务, 例如AWS S3, Cloudflare R2, 阿里云OSS, 腾讯云COS等",
+          "endpoint": "API 地址",
+          "endpoint.placeholder": "https://s3.example.com",
+          "region": "区域",
+          "region.placeholder": "Region, 例如: us-east-1",
+          "bucket": "存储桶",
+          "bucket.placeholder": "Bucket, 例如: example",
+          "accessKeyId": "Access Key ID",
+          "accessKeyId.placeholder": "Access Key ID",
+          "secretAccessKey": "Secret Access Key",
+          "secretAccessKey.placeholder": "Secret Access Key",
+          "root": "备份目录（可选）",
+          "root.placeholder": "例如：/cherry-studio",
+          "backup.operation": "备份操作",
+          "backup.button": "立即备份",
+          "backup.manager.button": "管理备份",
+          "backup.modal.title": "S3 备份",
+          "backup.modal.filename.placeholder": "请输入备份文件名",
+          "backup.success": "S3 备份成功",
+          "backup.error": "S3 备份失败: {{message}}",
+          "autoSync": "自动同步",
+          "autoSync.off": "关闭",
+          "autoSync.minute": "每 {{count}} 分钟",
+          "autoSync.hour": "每 {{count}} 小时",
+          "maxBackups": "最大备份数",
+          "maxBackups.unlimited": "不限",
+          "skipBackupFile": "精简备份",
+          "skipBackupFile.help": "开启后备份时将跳过文件数据，仅备份配置信息，显著减小备份文件体积",
+          "syncStatus": "同步状态",
+          "syncStatus.noSync": "未同步",
+          "syncStatus.error": "同步错误: {{message}}",
+          "syncStatus.lastSync": "上次同步: {{time}}",
+          "manager.title": "S3 备份文件管理",
+          "manager.refresh": "刷新",
+          "manager.delete.selected": "删除选中 ({{count}})",
+          "manager.close": "关闭",
+          "manager.columns.fileName": "文件名",
+          "manager.columns.modifiedTime": "修改时间",
+          "manager.columns.size": "文件大小",
+          "manager.columns.actions": "操作",
+          "manager.restore": "恢复",
+          "manager.delete": "删除",
+          "manager.config.incomplete": "请填写完整的 S3 配置信息",
+          "manager.files.fetch.error": "获取备份文件列表失败: {{message}}",
+          "manager.delete.confirm.title": "确认删除",
+          "manager.delete.confirm.multiple": "确定要删除选中的 {{count}} 个备份文件吗？此操作不可撤销。",
+          "manager.delete.confirm.single": "确定要删除备份文件 \"{{fileName}}\" 吗？此操作不可撤销。",
+          "manager.delete.success.multiple": "成功删除 {{count}} 个备份文件",
+          "manager.delete.success.single": "删除备份文件成功",
+          "manager.delete.error": "删除备份文件失败: {{message}}",
+          "manager.select.warning": "请选择要删除的备份文件",
+          "restore.modal.title": "S3 数据恢复",
+          "restore.modal.select.placeholder": "请选择要恢复的备份文件",
+          "restore.confirm.title": "确认恢复数据",
+          "restore.confirm.content": "恢复数据将覆盖当前所有数据，此操作不可撤销。确定要继续吗？",
+          "restore.confirm.ok": "确认恢复",
+          "restore.confirm.cancel": "取消",
+          "restore.success": "数据恢复成功",
+          "restore.error": "数据恢复失败: {{message}}",
+          "restore.config.incomplete": "请填写完整的 S3 配置信息",
+          "restore.file.required": "请选择要恢复的备份文件"
         },
         "yuque": {
           "check": {
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index 0b833c5b5e..9b6299f385 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -1246,7 +1246,71 @@
           "title": "WebDAV",
           "user": "WebDAV 使用者名稱",
           "maxBackups": "最大備份數量",
-          "maxBackups.unlimited": "無限制"
+          "maxBackups.unlimited": "不限"
+        },
+        "s3": {
+          "title": "S3 相容儲存",
+          "title.help": "與AWS S3 API相容的物件儲存服務，例如AWS S3、Cloudflare R2、阿里雲OSS、騰訊雲COS等",
+          "endpoint": "API 位址",
+          "endpoint.placeholder": "https://s3.example.com",
+          "region": "區域",
+          "region.placeholder": "Region，例如: us-east-1",
+          "bucket": "儲存桶",
+          "bucket.placeholder": "Bucket，例如: example",
+          "accessKeyId": "Access Key ID",
+          "accessKeyId.placeholder": "Access Key ID",
+          "secretAccessKey": "Secret Access Key",
+          "secretAccessKey.placeholder": "Secret Access Key",
+          "root": "備份目錄（可選）",
+          "root.placeholder": "例如：/cherry-studio",
+          "backup.operation": "備份操作",
+          "backup.button": "立即備份",
+          "backup.manager.button": "管理備份",
+          "backup.modal.title": "S3 備份",
+          "backup.modal.filename.placeholder": "請輸入備份檔案名稱",
+          "backup.success": "S3 備份成功",
+          "backup.error": "S3 備份失敗: {{message}}",
+          "autoSync": "自動同步",
+          "autoSync.off": "關閉",
+          "autoSync.minute": "每 {{count}} 分鐘",
+          "autoSync.hour": "每 {{count}} 小時",
+          "maxBackups": "最大備份數",
+          "maxBackups.unlimited": "不限",
+          "skipBackupFile": "精簡備份",
+          "skipBackupFile.help": "開啟後備份時將跳過檔案資料，僅備份設定資訊，顯著減小備份檔案體積",
+          "syncStatus": "同步狀態",
+          "syncStatus.noSync": "未同步",
+          "syncStatus.error": "同步錯誤: {{message}}",
+          "syncStatus.lastSync": "上次同步: {{time}}",
+          "manager.title": "S3 備份檔案管理",
+          "manager.refresh": "重新整理",
+          "manager.delete.selected": "刪除選中 ({{count}})",
+          "manager.close": "關閉",
+          "manager.columns.fileName": "檔案名稱",
+          "manager.columns.modifiedTime": "修改時間",
+          "manager.columns.size": "檔案大小",
+          "manager.columns.actions": "操作",
+          "manager.restore": "恢復",
+          "manager.delete": "刪除",
+          "manager.config.incomplete": "請填寫完整的 S3 設定資訊",
+          "manager.files.fetch.error": "取得備份檔案清單失敗: {{message}}",
+          "manager.delete.confirm.title": "確認刪除",
+          "manager.delete.confirm.multiple": "確定要刪除選中的 {{count}} 個備份檔案嗎？此操作不可撤銷。",
+          "manager.delete.confirm.single": "確定要刪除備份檔案 \"{{fileName}}\" 嗎？此操作不可撤銷。",
+          "manager.delete.success.multiple": "成功刪除 {{count}} 個備份檔案",
+          "manager.delete.success.single": "刪除備份檔案成功",
+          "manager.delete.error": "刪除備份檔案失敗: {{message}}",
+          "manager.select.warning": "請選擇要刪除的備份檔案",
+          "restore.modal.title": "S3 資料恢復",
+          "restore.modal.select.placeholder": "請選擇要恢復的備份檔案",
+          "restore.confirm.title": "確認恢復資料",
+          "restore.confirm.content": "恢復資料將覆寫當前所有資料，此操作不可撤銷。確定要繼續嗎？",
+          "restore.confirm.ok": "確認恢復",
+          "restore.confirm.cancel": "取消",
+          "restore.success": "資料恢復成功",
+          "restore.error": "資料恢復失敗: {{message}}",
+          "restore.config.incomplete": "請填寫完整的 S3 設定資訊",
+          "restore.file.required": "請選擇要恢復的備份檔案"
         },
         "yuque": {
           "check": {
diff --git a/src/renderer/src/init.ts b/src/renderer/src/init.ts
index 096ec7a6f0..c5d969b6fd 100644
--- a/src/renderer/src/init.ts
+++ b/src/renderer/src/init.ts
@@ -12,9 +12,9 @@ function initKeyv() {
 
 function initAutoSync() {
   setTimeout(() => {
-    const { webdavAutoSync } = store.getState().settings
+    const { webdavAutoSync, s3 } = store.getState().settings
     const { nutstoreAutoSync } = store.getState().nutstore
-    if (webdavAutoSync) {
+    if (webdavAutoSync || (s3 && s3.autoSync)) {
       startAutoSync()
     }
     if (nutstoreAutoSync) {
diff --git a/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx b/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
index fece64a16a..1ef101157c 100644
--- a/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
@@ -1,4 +1,5 @@
 import {
+  CloudServerOutlined,
   CloudSyncOutlined,
   FileSearchOutlined,
   FolderOpenOutlined,
@@ -42,6 +43,7 @@ import MarkdownExportSettings from './MarkdownExportSettings'
 import NotionSettings from './NotionSettings'
 import NutstoreSettings from './NutstoreSettings'
 import ObsidianSettings from './ObsidianSettings'
+import S3Settings from './S3Settings'
 import SiyuanSettings from './SiyuanSettings'
 import WebDavSettings from './WebDavSettings'
 import YuqueSettings from './YuqueSettings'
@@ -88,6 +90,7 @@ const DataSettings: FC = () => {
     { key: 'divider_1', isDivider: true, text: t('settings.data.divider.cloud_storage') },
     { key: 'webdav', title: 'settings.data.webdav.title', icon: <CloudSyncOutlined style={{ fontSize: 16 }} /> },
     { key: 'nutstore', title: 'settings.data.nutstore.title', icon: <NutstoreIcon /> },
+    { key: 's3', title: 'settings.data.s3.title', icon: <CloudServerOutlined style={{ fontSize: 16 }} /> },
     { key: 'divider_2', isDivider: true, text: t('settings.data.divider.export_settings') },
     {
       key: 'export_menu',
@@ -653,6 +656,7 @@ const DataSettings: FC = () => {
         )}
         {menu === 'webdav' && <WebDavSettings />}
         {menu === 'nutstore' && <NutstoreSettings />}
+        {menu === 's3' && <S3Settings />}
         {menu === 'export_menu' && <ExportMenuOptions />}
         {menu === 'markdown_export' && <MarkdownExportSettings />}
         {menu === 'notion' && <NotionSettings />}
@@ -686,8 +690,12 @@ const MenuList = styled.div`
   gap: 5px;
   width: var(--settings-width);
   padding: 12px;
+  padding-bottom: 48px;
   border-right: 0.5px solid var(--color-border);
-  height: 100%;
+  height: 100vh;
+  overflow: auto;
+  box-sizing: border-box;
+  min-height: 0;
   .iconfont {
     color: var(--color-text-2);
     line-height: 16px;
diff --git a/src/renderer/src/pages/settings/DataSettings/S3Settings.tsx b/src/renderer/src/pages/settings/DataSettings/S3Settings.tsx
new file mode 100644
index 0000000000..d3c582a431
--- /dev/null
+++ b/src/renderer/src/pages/settings/DataSettings/S3Settings.tsx
@@ -0,0 +1,276 @@
+import { FolderOpenOutlined, SaveOutlined, SyncOutlined, WarningOutlined } from '@ant-design/icons'
+import { HStack } from '@renderer/components/Layout'
+import { S3BackupManager } from '@renderer/components/S3BackupManager'
+import { S3BackupModal, useS3BackupModal } from '@renderer/components/S3Modals'
+import { useTheme } from '@renderer/context/ThemeProvider'
+import { useSettings } from '@renderer/hooks/useSettings'
+import { startAutoSync, stopAutoSync } from '@renderer/services/BackupService'
+import { useAppDispatch, useAppSelector } from '@renderer/store'
+import { S3Config, setS3 } from '@renderer/store/settings'
+import { Button, Input, Select, Switch, Tooltip } from 'antd'
+import dayjs from 'dayjs'
+import { FC, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { SettingDivider, SettingGroup, SettingHelpText, SettingRow, SettingRowTitle, SettingTitle } from '..'
+
+const S3Settings: FC = () => {
+  const { s3 = {} as S3Config } = useSettings()
+
+  const {
+    endpoint: s3EndpointInit = '',
+    region: s3RegionInit = '',
+    bucket: s3BucketInit = '',
+    accessKeyId: s3AccessKeyIdInit = '',
+    secretAccessKey: s3SecretAccessKeyInit = '',
+    root: s3RootInit = '',
+    syncInterval: s3SyncIntervalInit = 0,
+    maxBackups: s3MaxBackupsInit = 5,
+    skipBackupFile: s3SkipBackupFileInit = false
+  } = s3
+
+  const [endpoint, setEndpoint] = useState<string | undefined>(s3EndpointInit)
+  const [region, setRegion] = useState<string | undefined>(s3RegionInit)
+  const [bucket, setBucket] = useState<string | undefined>(s3BucketInit)
+  const [accessKeyId, setAccessKeyId] = useState<string | undefined>(s3AccessKeyIdInit)
+  const [secretAccessKey, setSecretAccessKey] = useState<string | undefined>(s3SecretAccessKeyInit)
+  const [root, setRoot] = useState<string | undefined>(s3RootInit)
+  const [skipBackupFile, setSkipBackupFile] = useState<boolean>(s3SkipBackupFileInit)
+  const [backupManagerVisible, setBackupManagerVisible] = useState(false)
+
+  const [syncInterval, setSyncInterval] = useState<number>(s3SyncIntervalInit)
+  const [maxBackups, setMaxBackups] = useState<number>(s3MaxBackupsInit)
+
+  const dispatch = useAppDispatch()
+  const { theme } = useTheme()
+  const { t } = useTranslation()
+
+  const { s3Sync } = useAppSelector((state) => state.backup)
+
+  const onSyncIntervalChange = (value: number) => {
+    setSyncInterval(value)
+    dispatch(setS3({ ...s3, syncInterval: value, autoSync: value !== 0 }))
+    if (value === 0) {
+      stopAutoSync()
+    } else {
+      startAutoSync()
+    }
+  }
+
+  const onMaxBackupsChange = (value: number) => {
+    setMaxBackups(value)
+    dispatch(setS3({ ...s3, maxBackups: value }))
+  }
+
+  const onSkipBackupFilesChange = (value: boolean) => {
+    setSkipBackupFile(value)
+    dispatch(setS3({ ...s3, skipBackupFile: value }))
+  }
+
+  const renderSyncStatus = () => {
+    if (!endpoint) return null
+
+    if (!s3Sync?.lastSyncTime && !s3Sync?.syncing && !s3Sync?.lastSyncError) {
+      return <span style={{ color: 'var(--text-secondary)' }}>{t('settings.data.s3.syncStatus.noSync')}</span>
+    }
+
+    return (
+      <HStack gap="5px" alignItems="center">
+        {s3Sync?.syncing && <SyncOutlined spin />}
+        {!s3Sync?.syncing && s3Sync?.lastSyncError && (
+          <Tooltip title={t('settings.data.s3.syncStatus.error', { message: s3Sync.lastSyncError })}>
+            <WarningOutlined style={{ color: 'red' }} />
+          </Tooltip>
+        )}
+        {s3Sync?.lastSyncTime && (
+          <span style={{ color: 'var(--text-secondary)' }}>
+            {t('settings.data.s3.syncStatus.lastSync', { time: dayjs(s3Sync.lastSyncTime).format('HH:mm:ss') })}
+          </span>
+        )}
+      </HStack>
+    )
+  }
+
+  const { isModalVisible, handleBackup, handleCancel, backuping, customFileName, setCustomFileName, showBackupModal } =
+    useS3BackupModal()
+
+  const showBackupManager = () => {
+    setBackupManagerVisible(true)
+  }
+
+  const closeBackupManager = () => {
+    setBackupManagerVisible(false)
+  }
+
+  return (
+    <SettingGroup theme={theme}>
+      <SettingTitle>{t('settings.data.s3.title')}</SettingTitle>
+      <SettingHelpText>{t('settings.data.s3.title.help')}</SettingHelpText>
+      <SettingDivider />
+      <SettingRow>
+        <SettingRowTitle>{t('settings.data.s3.endpoint')}</SettingRowTitle>
+        <Input
+          placeholder={t('settings.data.s3.endpoint.placeholder')}
+          value={endpoint}
+          onChange={(e) => setEndpoint(e.target.value)}
+          style={{ width: 250 }}
+          type="url"
+          onBlur={() => dispatch(setS3({ ...s3, endpoint: endpoint || '' }))}
+        />
+      </SettingRow>
+      <SettingDivider />
+      <SettingRow>
+        <SettingRowTitle>{t('settings.data.s3.region')}</SettingRowTitle>
+        <Input
+          placeholder={t('settings.data.s3.region.placeholder')}
+          value={region}
+          onChange={(e) => setRegion(e.target.value)}
+          style={{ width: 250 }}
+          onBlur={() => dispatch(setS3({ ...s3, region: region || '' }))}
+        />
+      </SettingRow>
+      <SettingDivider />
+      <SettingRow>
+        <SettingRowTitle>{t('settings.data.s3.bucket')}</SettingRowTitle>
+        <Input
+          placeholder={t('settings.data.s3.bucket.placeholder')}
+          value={bucket}
+          onChange={(e) => setBucket(e.target.value)}
+          style={{ width: 250 }}
+          onBlur={() => dispatch(setS3({ ...s3, bucket: bucket || '' }))}
+        />
+      </SettingRow>
+      <SettingDivider />
+      <SettingRow>
+        <SettingRowTitle>{t('settings.data.s3.accessKeyId')}</SettingRowTitle>
+        <Input
+          placeholder={t('settings.data.s3.accessKeyId.placeholder')}
+          value={accessKeyId}
+          onChange={(e) => setAccessKeyId(e.target.value)}
+          style={{ width: 250 }}
+          onBlur={() => dispatch(setS3({ ...s3, accessKeyId: accessKeyId || '' }))}
+        />
+      </SettingRow>
+      <SettingDivider />
+      <SettingRow>
+        <SettingRowTitle>{t('settings.data.s3.secretAccessKey')}</SettingRowTitle>
+        <Input.Password
+          placeholder={t('settings.data.s3.secretAccessKey.placeholder')}
+          value={secretAccessKey}
+          onChange={(e) => setSecretAccessKey(e.target.value)}
+          style={{ width: 250 }}
+          onBlur={() => dispatch(setS3({ ...s3, secretAccessKey: secretAccessKey || '' }))}
+        />
+      </SettingRow>
+      <SettingDivider />
+      <SettingRow>
+        <SettingRowTitle>{t('settings.data.s3.root')}</SettingRowTitle>
+        <Input
+          placeholder={t('settings.data.s3.root.placeholder')}
+          value={root}
+          onChange={(e) => setRoot(e.target.value)}
+          style={{ width: 250 }}
+          onBlur={() => dispatch(setS3({ ...s3, root: root || '' }))}
+        />
+      </SettingRow>
+      <SettingDivider />
+      <SettingRow>
+        <SettingRowTitle>{t('settings.data.s3.backup.operation')}</SettingRowTitle>
+        <HStack gap="5px" justifyContent="space-between">
+          <Button
+            onClick={showBackupModal}
+            icon={<SaveOutlined />}
+            loading={backuping}
+            disabled={!accessKeyId || !secretAccessKey}>
+            {t('settings.data.s3.backup.button')}
+          </Button>
+          <Button
+            onClick={showBackupManager}
+            icon={<FolderOpenOutlined />}
+            disabled={!endpoint || !region || !bucket || !accessKeyId || !secretAccessKey}>
+            {t('settings.data.s3.backup.manager.button')}
+          </Button>
+        </HStack>
+      </SettingRow>
+      <SettingDivider />
+      <SettingRow>
+        <SettingRowTitle>{t('settings.data.s3.autoSync')}</SettingRowTitle>
+        <Select
+          value={syncInterval}
+          onChange={onSyncIntervalChange}
+          disabled={!endpoint || !accessKeyId || !secretAccessKey}
+          style={{ width: 120 }}>
+          <Select.Option value={0}>{t('settings.data.s3.autoSync.off')}</Select.Option>
+          <Select.Option value={1}>{t('settings.data.s3.autoSync.minute', { count: 1 })}</Select.Option>
+          <Select.Option value={5}>{t('settings.data.s3.autoSync.minute', { count: 5 })}</Select.Option>
+          <Select.Option value={15}>{t('settings.data.s3.autoSync.minute', { count: 15 })}</Select.Option>
+          <Select.Option value={30}>{t('settings.data.s3.autoSync.minute', { count: 30 })}</Select.Option>
+          <Select.Option value={60}>{t('settings.data.s3.autoSync.hour', { count: 1 })}</Select.Option>
+          <Select.Option value={120}>{t('settings.data.s3.autoSync.hour', { count: 2 })}</Select.Option>
+          <Select.Option value={360}>{t('settings.data.s3.autoSync.hour', { count: 6 })}</Select.Option>
+          <Select.Option value={720}>{t('settings.data.s3.autoSync.hour', { count: 12 })}</Select.Option>
+          <Select.Option value={1440}>{t('settings.data.s3.autoSync.hour', { count: 24 })}</Select.Option>
+        </Select>
+      </SettingRow>
+      <SettingDivider />
+      <SettingRow>
+        <SettingRowTitle>{t('settings.data.s3.maxBackups')}</SettingRowTitle>
+        <Select
+          value={maxBackups}
+          onChange={onMaxBackupsChange}
+          disabled={!endpoint || !accessKeyId || !secretAccessKey}
+          style={{ width: 120 }}>
+          <Select.Option value={0}>{t('settings.data.s3.maxBackups.unlimited')}</Select.Option>
+          <Select.Option value={1}>1</Select.Option>
+          <Select.Option value={3}>3</Select.Option>
+          <Select.Option value={5}>5</Select.Option>
+          <Select.Option value={10}>10</Select.Option>
+          <Select.Option value={20}>20</Select.Option>
+          <Select.Option value={50}>50</Select.Option>
+        </Select>
+      </SettingRow>
+      <SettingDivider />
+      <SettingRow>
+        <SettingRowTitle>{t('settings.data.s3.skipBackupFile')}</SettingRowTitle>
+        <Switch checked={skipBackupFile} onChange={onSkipBackupFilesChange} />
+      </SettingRow>
+      <SettingRow>
+        <SettingHelpText>{t('settings.data.s3.skipBackupFile.help')}</SettingHelpText>
+      </SettingRow>
+      {syncInterval > 0 && (
+        <>
+          <SettingDivider />
+          <SettingRow>
+            <SettingRowTitle>{t('settings.data.s3.syncStatus')}</SettingRowTitle>
+            {renderSyncStatus()}
+          </SettingRow>
+        </>
+      )}
+      <>
+        <S3BackupModal
+          isModalVisible={isModalVisible}
+          handleBackup={handleBackup}
+          handleCancel={handleCancel}
+          backuping={backuping}
+          customFileName={customFileName}
+          setCustomFileName={setCustomFileName}
+        />
+
+        <S3BackupManager
+          visible={backupManagerVisible}
+          onClose={closeBackupManager}
+          s3Config={{
+            endpoint,
+            region,
+            bucket,
+            access_key_id: accessKeyId,
+            secret_access_key: secretAccessKey,
+            root
+          }}
+        />
+      </>
+    </SettingGroup>
+  )
+}
+
+export default S3Settings
diff --git a/src/renderer/src/services/BackupService.ts b/src/renderer/src/services/BackupService.ts
index 3d78b2752a..b99ea6c77e 100644
--- a/src/renderer/src/services/BackupService.ts
+++ b/src/renderer/src/services/BackupService.ts
@@ -4,11 +4,62 @@ import { upgradeToV7 } from '@renderer/databases/upgrades'
 import i18n from '@renderer/i18n'
 import store from '@renderer/store'
 import { setWebDAVSyncState } from '@renderer/store/backup'
+import { setS3SyncState } from '@renderer/store/backup'
 import { uuid } from '@renderer/utils'
 import dayjs from 'dayjs'
 
 import { NotificationService } from './NotificationService'
 
+// 重试删除S3文件的辅助函数
+async function deleteS3FileWithRetry(fileName: string, s3Config: any, maxRetries = 3) {
+  let lastError: Error | null = null
+
+  for (let attempt = 1; attempt <= maxRetries; attempt++) {
+    try {
+      await window.api.backup.deleteS3File(fileName, s3Config)
+      Logger.log(`[Backup] Successfully deleted old backup file: ${fileName} (attempt ${attempt})`)
+      return true
+    } catch (error: any) {
+      lastError = error
+      Logger.warn(`[Backup] Delete attempt ${attempt}/${maxRetries} failed for ${fileName}:`, error.message)
+
+      // 如果不是最后一次尝试，等待一段时间再重试
+      if (attempt < maxRetries) {
+        const delay = attempt * 1000 + Math.random() * 1000 // 1-2秒的随机延迟
+        await new Promise((resolve) => setTimeout(resolve, delay))
+      }
+    }
+  }
+
+  Logger.error(`[Backup] Failed to delete old backup file after ${maxRetries} attempts: ${fileName}`, lastError)
+  return false
+}
+
+// 重试删除WebDAV文件的辅助函数
+async function deleteWebdavFileWithRetry(fileName: string, webdavConfig: any, maxRetries = 3) {
+  let lastError: Error | null = null
+
+  for (let attempt = 1; attempt <= maxRetries; attempt++) {
+    try {
+      await window.api.backup.deleteWebdavFile(fileName, webdavConfig)
+      Logger.log(`[Backup] Successfully deleted old backup file: ${fileName} (attempt ${attempt})`)
+      return true
+    } catch (error: any) {
+      lastError = error
+      Logger.warn(`[Backup] Delete attempt ${attempt}/${maxRetries} failed for ${fileName}:`, error.message)
+
+      // 如果不是最后一次尝试，等待一段时间再重试
+      if (attempt < maxRetries) {
+        const delay = attempt * 1000 + Math.random() * 1000 // 1-2秒的随机延迟
+        await new Promise((resolve) => setTimeout(resolve, delay))
+      }
+    }
+  }
+
+  Logger.error(`[Backup] Failed to delete old backup file after ${maxRetries} attempts: ${fileName}`, lastError)
+  return false
+}
+
 export async function backup(skipBackupFile: boolean) {
   const filename = `cherry-studio.${dayjs().format('YYYYMMDDHHmm')}.zip`
   const fileContnet = await getBackupData()
@@ -161,17 +212,21 @@ export async function backupToWebdav({
             // 文件已按修改时间降序排序，所以最旧的文件在末尾
             const filesToDelete = currentDeviceFiles.slice(webdavMaxBackups)
 
-            for (const file of filesToDelete) {
-              try {
-                await window.api.backup.deleteWebdavFile(file.fileName, {
-                  webdavHost,
-                  webdavUser,
-                  webdavPass,
-                  webdavPath
-                })
-                Logger.log(`[Backup] Deleted old backup file: ${file.fileName}`)
-              } catch (error) {
-                Logger.error(`[Backup] Failed to delete old backup file: ${file.fileName}`, error)
+            Logger.log(`[Backup] Cleaning up ${filesToDelete.length} old backup files`)
+
+            // 串行删除文件，避免并发请求导致的问题
+            for (let i = 0; i < filesToDelete.length; i++) {
+              const file = filesToDelete[i]
+              await deleteWebdavFileWithRetry(file.fileName, {
+                webdavHost,
+                webdavUser,
+                webdavPass,
+                webdavPath
+              })
+
+              // 在删除操作之间添加短暂延迟，避免请求过于频繁
+              if (i < filesToDelete.length - 1) {
+                await new Promise((resolve) => setTimeout(resolve, 500))
               }
             }
           }
@@ -242,6 +297,201 @@ export async function restoreFromWebdav(fileName?: string) {
   }
 }
 
+// 备份到 S3
+export async function backupToS3({
+  showMessage = false,
+  customFileName = '',
+  autoBackupProcess = false
+}: { showMessage?: boolean; customFileName?: string; autoBackupProcess?: boolean } = {}) {
+  const notificationService = NotificationService.getInstance()
+  if (isManualBackupRunning) {
+    Logger.log('[Backup] Manual backup already in progress')
+    return
+  }
+
+  // force set showMessage to false when auto backup process
+  if (autoBackupProcess) {
+    showMessage = false
+  }
+
+  isManualBackupRunning = true
+
+  store.dispatch(setS3SyncState({ syncing: true, lastSyncError: null }))
+
+  const {
+    s3: {
+      endpoint: s3Endpoint,
+      region: s3Region,
+      bucket: s3Bucket,
+      accessKeyId: s3AccessKeyId,
+      secretAccessKey: s3SecretAccessKey,
+      root: s3Root,
+      maxBackups: s3MaxBackups,
+      skipBackupFile: s3SkipBackupFile
+    }
+  } = store.getState().settings
+  let deviceType = 'unknown'
+  let hostname = 'unknown'
+  try {
+    deviceType = (await window.api.system.getDeviceType()) || 'unknown'
+    hostname = (await window.api.system.getHostname()) || 'unknown'
+  } catch (error) {
+    Logger.error('[Backup] Failed to get device type or hostname:', error)
+  }
+  const timestamp = dayjs().format('YYYYMMDDHHmmss')
+  const backupFileName = customFileName || `cherry-studio.${timestamp}.${hostname}.${deviceType}.zip`
+  const finalFileName = backupFileName.endsWith('.zip') ? backupFileName : `${backupFileName}.zip`
+  const backupData = await getBackupData()
+
+  // 上传文件
+  try {
+    await window.api.backup.backupToS3(backupData, {
+      endpoint: s3Endpoint,
+      region: s3Region,
+      bucket: s3Bucket,
+      access_key_id: s3AccessKeyId,
+      secret_access_key: s3SecretAccessKey,
+      root: s3Root,
+      fileName: finalFileName,
+      skipBackupFile: s3SkipBackupFile
+    })
+
+    // S3上传成功
+    store.dispatch(
+      setS3SyncState({
+        lastSyncError: null
+      })
+    )
+    notificationService.send({
+      id: uuid(),
+      type: 'success',
+      title: i18n.t('common.success'),
+      message: i18n.t('message.backup.success'),
+      silent: false,
+      timestamp: Date.now(),
+      source: 'backup'
+    })
+    showMessage && window.message.success({ content: i18n.t('message.backup.success'), key: 'backup' })
+
+    // 清理旧备份文件
+    if (s3MaxBackups > 0) {
+      try {
+        // 获取所有备份文件
+        const files = await window.api.backup.listS3Files({
+          endpoint: s3Endpoint,
+          region: s3Region,
+          bucket: s3Bucket,
+          access_key_id: s3AccessKeyId,
+          secret_access_key: s3SecretAccessKey,
+          root: s3Root
+        })
+
+        // 筛选当前设备的备份文件
+        const currentDeviceFiles = files.filter((file) => {
+          // 检查文件名是否包含当前设备的标识信息
+          return file.fileName.includes(deviceType) && file.fileName.includes(hostname)
+        })
+
+        // 如果当前设备的备份文件数量超过最大保留数量，删除最旧的文件
+        if (currentDeviceFiles.length > s3MaxBackups) {
+          // 文件已按修改时间降序排序，所以最旧的文件在末尾
+          const filesToDelete = currentDeviceFiles.slice(s3MaxBackups)
+
+          Logger.log(`[Backup] Cleaning up ${filesToDelete.length} old backup files`)
+
+          // 串行删除文件，避免并发请求导致的问题
+          for (let i = 0; i < filesToDelete.length; i++) {
+            const file = filesToDelete[i]
+            await deleteS3FileWithRetry(file.fileName, {
+              endpoint: s3Endpoint,
+              region: s3Region,
+              bucket: s3Bucket,
+              access_key_id: s3AccessKeyId,
+              secret_access_key: s3SecretAccessKey,
+              root: s3Root
+            })
+
+            // 在删除操作之间添加短暂延迟，避免请求过于频繁
+            if (i < filesToDelete.length - 1) {
+              await new Promise((resolve) => setTimeout(resolve, 500))
+            }
+          }
+        }
+      } catch (error) {
+        Logger.error('[Backup] Failed to clean up old backup files:', error)
+      }
+    }
+  } catch (error: any) {
+    // if auto backup process, throw error
+    if (autoBackupProcess) {
+      throw error
+    }
+    notificationService.send({
+      id: uuid(),
+      type: 'error',
+      title: i18n.t('message.backup.failed'),
+      message: error.message,
+      silent: false,
+      timestamp: Date.now(),
+      source: 'backup'
+    })
+    store.dispatch(setS3SyncState({ lastSyncError: error.message }))
+    console.error('[Backup] backupToS3: Error uploading file to S3:', error)
+    showMessage && window.message.error({ content: i18n.t('message.backup.failed'), key: 'backup' })
+    throw error
+  } finally {
+    if (!autoBackupProcess) {
+      store.dispatch(
+        setS3SyncState({
+          lastSyncTime: Date.now(),
+          syncing: false
+        })
+      )
+    }
+    isManualBackupRunning = false
+  }
+}
+
+// 从 S3 恢复
+export async function restoreFromS3(fileName?: string) {
+  const {
+    s3: {
+      endpoint: s3Endpoint,
+      region: s3Region,
+      bucket: s3Bucket,
+      accessKeyId: s3AccessKeyId,
+      secretAccessKey: s3SecretAccessKey,
+      root: s3Root
+    }
+  } = store.getState().settings
+  let data = ''
+
+  try {
+    data = await window.api.backup.restoreFromS3({
+      endpoint: s3Endpoint,
+      region: s3Region,
+      bucket: s3Bucket,
+      access_key_id: s3AccessKeyId,
+      secret_access_key: s3SecretAccessKey,
+      root: s3Root,
+      fileName
+    })
+  } catch (error: any) {
+    console.error('[Backup] restoreFromS3: Error downloading file from S3:', error)
+    window.modal.error({
+      title: i18n.t('message.restore.failed'),
+      content: error.message
+    })
+  }
+
+  try {
+    await handleData(JSON.parse(data))
+  } catch (error) {
+    console.error('[Backup] Error downloading file from S3:', error)
+    window.message.error({ content: i18n.t('error.backup.file_format'), key: 'restore' })
+  }
+}
+
 let autoSyncStarted = false
 let syncTimeout: NodeJS.Timeout | null = null
 let isAutoBackupRunning = false
@@ -252,9 +502,17 @@ export function startAutoSync(immediate = false) {
     return
   }
 
-  const { webdavAutoSync, webdavHost } = store.getState().settings
+  const {
+    webdavAutoSync,
+    webdavHost,
+    s3: { autoSync: s3AutoSync, endpoint: s3Endpoint }
+  } = store.getState().settings
 
-  if (!webdavAutoSync || !webdavHost) {
+  // 检查WebDAV或S3自动同步配置
+  const hasWebdavConfig = webdavAutoSync && webdavHost
+  const hasS3Config = s3AutoSync && s3Endpoint
+
+  if (!hasWebdavConfig && !hasS3Config) {
     Logger.log('[AutoSync] Invalid sync settings, auto sync disabled')
     return
   }
@@ -277,22 +535,29 @@ export function startAutoSync(immediate = false) {
       syncTimeout = null
     }
 
-    const { webdavSyncInterval } = store.getState().settings
-    const { webdavSync } = store.getState().backup
+    const {
+      webdavSyncInterval: _webdavSyncInterval,
+      s3: { syncInterval: _s3SyncInterval }
+    } = store.getState().settings
+    const { webdavSync, s3Sync } = store.getState().backup
 
-    if (webdavSyncInterval <= 0) {
+    // 使用当前激活的同步配置
+    const syncInterval = hasWebdavConfig ? _webdavSyncInterval : _s3SyncInterval
+    const lastSyncTime = hasWebdavConfig ? webdavSync?.lastSyncTime : s3Sync?.lastSyncTime
+
+    if (syncInterval <= 0) {
       Logger.log('[AutoSync] Invalid sync interval, auto sync disabled')
       stopAutoSync()
       return
     }
 
     // 用户指定的自动备份时间间隔（毫秒）
-    const requiredInterval = webdavSyncInterval * 60 * 1000
+    const requiredInterval = syncInterval * 60 * 1000
 
     let timeUntilNextSync = 1000 //also immediate
     switch (type) {
-      case 'fromLastSyncTime': // 如果存在最后一次同步WebDAV的时间，以它为参考计算下一次同步的时间
-        timeUntilNextSync = Math.max(1000, (webdavSync?.lastSyncTime || 0) + requiredInterval - Date.now())
+      case 'fromLastSyncTime': // 如果存在最后一次同步的时间，以它为参考计算下一次同步的时间
+        timeUntilNextSync = Math.max(1000, (lastSyncTime || 0) + requiredInterval - Date.now())
         break
       case 'fromNow':
         timeUntilNextSync = requiredInterval
@@ -301,8 +566,9 @@ export function startAutoSync(immediate = false) {
 
     syncTimeout = setTimeout(performAutoBackup, timeUntilNextSync)
 
+    const backupType = hasWebdavConfig ? 'WebDAV' : 'S3'
     Logger.log(
-      `[AutoSync] Next sync scheduled in ${Math.floor(timeUntilNextSync / 1000 / 60)} minutes ${Math.floor(
+      `[AutoSync] Next ${backupType} sync scheduled in ${Math.floor(timeUntilNextSync / 1000 / 60)} minutes ${Math.floor(
         (timeUntilNextSync / 1000) % 60
       )} seconds`
     )
@@ -321,17 +587,28 @@ export function startAutoSync(immediate = false) {
 
     while (retryCount < maxRetries) {
       try {
-        Logger.log(`[AutoSync] Starting auto backup... (attempt ${retryCount + 1}/${maxRetries})`)
+        const backupType = hasWebdavConfig ? 'WebDAV' : 'S3'
+        Logger.log(`[AutoSync] Starting auto ${backupType} backup... (attempt ${retryCount + 1}/${maxRetries})`)
 
-        await backupToWebdav({ autoBackupProcess: true })
-
-        store.dispatch(
-          setWebDAVSyncState({
-            lastSyncError: null,
-            lastSyncTime: Date.now(),
-            syncing: false
-          })
-        )
+        if (hasWebdavConfig) {
+          await backupToWebdav({ autoBackupProcess: true })
+          store.dispatch(
+            setWebDAVSyncState({
+              lastSyncError: null,
+              lastSyncTime: Date.now(),
+              syncing: false
+            })
+          )
+        } else if (hasS3Config) {
+          await backupToS3({ autoBackupProcess: true })
+          store.dispatch(
+            setS3SyncState({
+              lastSyncError: null,
+              lastSyncTime: Date.now(),
+              syncing: false
+            })
+          )
+        }
 
         isAutoBackupRunning = false
         scheduleNextBackup()
@@ -340,20 +617,31 @@ export function startAutoSync(immediate = false) {
       } catch (error: any) {
         retryCount++
         if (retryCount === maxRetries) {
-          Logger.error('[AutoSync] Auto backup failed after all retries:', error)
+          const backupType = hasWebdavConfig ? 'WebDAV' : 'S3'
+          Logger.error(`[AutoSync] Auto ${backupType} backup failed after all retries:`, error)
 
-          store.dispatch(
-            setWebDAVSyncState({
-              lastSyncError: 'Auto backup failed',
-              lastSyncTime: Date.now(),
-              syncing: false
-            })
-          )
+          if (hasWebdavConfig) {
+            store.dispatch(
+              setWebDAVSyncState({
+                lastSyncError: 'Auto backup failed',
+                lastSyncTime: Date.now(),
+                syncing: false
+              })
+            )
+          } else if (hasS3Config) {
+            store.dispatch(
+              setS3SyncState({
+                lastSyncError: 'Auto backup failed',
+                lastSyncTime: Date.now(),
+                syncing: false
+              })
+            )
+          }
 
           //only show 1 time error modal, and autoback stopped until user click ok
           await window.modal.error({
             title: i18n.t('message.backup.failed'),
-            content: `[WebDAV Auto Backup] ${new Date().toLocaleString()} ` + error.message
+            content: `[${backupType} Auto Backup] ${new Date().toLocaleString()} ` + error.message
           })
 
           scheduleNextBackup('fromNow')
diff --git a/src/renderer/src/store/backup.ts b/src/renderer/src/store/backup.ts
index a8b7d342c5..0740032efb 100644
--- a/src/renderer/src/store/backup.ts
+++ b/src/renderer/src/store/backup.ts
@@ -8,6 +8,7 @@ export interface WebDAVSyncState {
 
 export interface BackupState {
   webdavSync: WebDAVSyncState
+  s3Sync: WebDAVSyncState
 }
 
 const initialState: BackupState = {
@@ -15,6 +16,11 @@ const initialState: BackupState = {
     lastSyncTime: null,
     syncing: false,
     lastSyncError: null
+  },
+  s3Sync: {
+    lastSyncTime: null,
+    syncing: false,
+    lastSyncError: null
   }
 }
 
@@ -24,9 +30,12 @@ const backupSlice = createSlice({
   reducers: {
     setWebDAVSyncState: (state, action: PayloadAction<Partial<WebDAVSyncState>>) => {
       state.webdavSync = { ...state.webdavSync, ...action.payload }
+    },
+    setS3SyncState: (state, action: PayloadAction<Partial<WebDAVSyncState>>) => {
+      state.s3Sync = { ...state.s3Sync, ...action.payload }
     }
   }
 })
 
-export const { setWebDAVSyncState } = backupSlice.actions
+export const { setWebDAVSyncState, setS3SyncState } = backupSlice.actions
 export default backupSlice.reducer
diff --git a/src/renderer/src/store/settings.ts b/src/renderer/src/store/settings.ts
index 7d8e14ed11..8afbafc2a7 100644
--- a/src/renderer/src/store/settings.ts
+++ b/src/renderer/src/store/settings.ts
@@ -37,6 +37,19 @@ export type UserTheme = {
   colorPrimary: string
 }
 
+export interface S3Config {
+  endpoint: string
+  region: string
+  bucket: string
+  accessKeyId: string
+  secretAccessKey: string
+  root: string
+  autoSync: boolean
+  syncInterval: number
+  maxBackups: number
+  skipBackupFile: boolean
+}
+
 export interface SettingsState {
   showAssistants: boolean
   showTopics: boolean
@@ -185,6 +198,7 @@ export interface SettingsState {
     knowledgeEmbed: boolean
   }
   defaultPaintingProvider: PaintingProvider
+  s3: S3Config
 }
 
 export type MultiModelMessageStyle = 'horizontal' | 'vertical' | 'fold' | 'grid'
@@ -329,7 +343,19 @@ export const initialState: SettingsState = {
     backup: false,
     knowledgeEmbed: false
   },
-  defaultPaintingProvider: 'aihubmix'
+  defaultPaintingProvider: 'aihubmix',
+  s3: {
+    endpoint: '',
+    region: '',
+    bucket: '',
+    accessKeyId: '',
+    secretAccessKey: '',
+    root: '',
+    autoSync: false,
+    syncInterval: 0,
+    maxBackups: 0,
+    skipBackupFile: false
+  }
 }
 
 const settingsSlice = createSlice({
@@ -693,6 +719,9 @@ const settingsSlice = createSlice({
     },
     setDefaultPaintingProvider: (state, action: PayloadAction<PaintingProvider>) => {
       state.defaultPaintingProvider = action.payload
+    },
+    setS3: (state, action: PayloadAction<S3Config>) => {
+      state.s3 = action.payload
     }
   }
 })
@@ -801,7 +830,8 @@ export const {
   setOpenAISummaryText,
   setOpenAIServiceTier,
   setNotificationSettings,
-  setDefaultPaintingProvider
+  setDefaultPaintingProvider,
+  setS3
 } = settingsSlice.actions
 
 export default settingsSlice.reducer
diff --git a/src/renderer/src/types/index.ts b/src/renderer/src/types/index.ts
index 3b4cc5cdc3..448f04c647 100644
--- a/src/renderer/src/types/index.ts
+++ b/src/renderer/src/types/index.ts
@@ -730,4 +730,16 @@ export interface StoreSyncAction {
 
 export type OpenAISummaryText = 'auto' | 'concise' | 'detailed' | 'off'
 export type OpenAIServiceTier = 'auto' | 'default' | 'flex'
+
+export type S3Config = {
+  endpoint: string
+  region: string
+  bucket: string
+  access_key_id: string
+  secret_access_key: string
+  root?: string
+  fileName?: string
+  skipBackupFile?: boolean
+}
+
 export type { Message } from './newMessage'
diff --git a/yarn.lock b/yarn.lock
index 2386409f15..1d1df92837 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3198,6 +3198,55 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@opendal/lib-darwin-arm64@npm:0.47.11":
+  version: 0.47.11
+  resolution: "@opendal/lib-darwin-arm64@npm:0.47.11"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@opendal/lib-darwin-x64@npm:0.47.11":
+  version: 0.47.11
+  resolution: "@opendal/lib-darwin-x64@npm:0.47.11"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@opendal/lib-linux-arm64-gnu@npm:0.47.11":
+  version: 0.47.11
+  resolution: "@opendal/lib-linux-arm64-gnu@npm:0.47.11"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@opendal/lib-linux-arm64-musl@npm:0.47.11":
+  version: 0.47.11
+  resolution: "@opendal/lib-linux-arm64-musl@npm:0.47.11"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@opendal/lib-linux-x64-gnu@npm:0.47.11":
+  version: 0.47.11
+  resolution: "@opendal/lib-linux-x64-gnu@npm:0.47.11"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@opendal/lib-win32-arm64-msvc@npm:0.47.11":
+  version: 0.47.11
+  resolution: "@opendal/lib-win32-arm64-msvc@npm:0.47.11"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@opendal/lib-win32-x64-msvc@npm:0.47.11":
+  version: 0.47.11
+  resolution: "@opendal/lib-win32-x64-msvc@npm:0.47.11"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@parcel/watcher-android-arm64@npm:2.5.1":
   version: 2.5.1
   resolution: "@parcel/watcher-android-arm64@npm:2.5.1"
@@ -5711,6 +5760,7 @@ __metadata:
     npx-scope-finder: "npm:^1.2.0"
     officeparser: "npm:^4.1.1"
     openai: "patch:openai@npm%3A5.1.0#~/.yarn/patches/openai-npm-5.1.0-0e7b3ccb07.patch"
+    opendal: "npm:0.47.11"
     os-proxy-config: "npm:^1.1.2"
     p-queue: "npm:^8.1.0"
     playwright: "npm:^1.52.0"
@@ -14128,6 +14178,36 @@ __metadata:
   languageName: node
   linkType: hard
 
+"opendal@npm:0.47.11":
+  version: 0.47.11
+  resolution: "opendal@npm:0.47.11"
+  dependencies:
+    "@opendal/lib-darwin-arm64": "npm:0.47.11"
+    "@opendal/lib-darwin-x64": "npm:0.47.11"
+    "@opendal/lib-linux-arm64-gnu": "npm:0.47.11"
+    "@opendal/lib-linux-arm64-musl": "npm:0.47.11"
+    "@opendal/lib-linux-x64-gnu": "npm:0.47.11"
+    "@opendal/lib-win32-arm64-msvc": "npm:0.47.11"
+    "@opendal/lib-win32-x64-msvc": "npm:0.47.11"
+  dependenciesMeta:
+    "@opendal/lib-darwin-arm64":
+      optional: true
+    "@opendal/lib-darwin-x64":
+      optional: true
+    "@opendal/lib-linux-arm64-gnu":
+      optional: true
+    "@opendal/lib-linux-arm64-musl":
+      optional: true
+    "@opendal/lib-linux-x64-gnu":
+      optional: true
+    "@opendal/lib-win32-arm64-msvc":
+      optional: true
+    "@opendal/lib-win32-x64-msvc":
+      optional: true
+  checksum: 10c0/0783da2651bb27ac693ce38938d12b00124530fb965364517eef3de17b3ff898cdecf06260a79a7d70745d57c2ba952a753a4bab52e0831aa7232c3a69120225
+  languageName: node
+  linkType: hard
+
 "option@npm:~0.2.1":
   version: 0.2.4
   resolution: "option@npm:0.2.4"