Merge branch 'main' into fix/7816

2025-12-28 05:11:24 +08:00 · 2025-07-09 10:44:19 +08:00 · 2025-07-09 10:44:19 +08:00 · baeb9519e4
commit baeb9519e4
parent 6ad4e2129c 8f38422e7f
236 changed files with 19350 additions and 9254 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -1,9 +1,9 @@
-root = true
-
-[*]
-charset = utf-8
-indent_style = space
-indent_size = 2
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@ -0,0 +1,2 @@
+# ignore #7923 eol change and code formatting
+4ac8a388347ff35f34de42c3ef4a2f81f03fb3b1
--- a/.gitattributes
+++ b/.gitattributes
@ -1,2 +1,3 @@
+* text=auto eol=lf
 /.yarn/**            linguist-vendored
 /.yarn/releases/*    binary
--- a/.github/ISSUE_TEMPLATE/#3_others.yml
+++ b/.github/ISSUE_TEMPLATE/#3_others.yml
@ -73,4 +73,4 @@ body:
    id: additional
    attributes:
      label: 附加信息
-      description: 任何能让我们对您的问题有更多了解的信息，包括截图或相关链接
+      description: 任何能让我们对您的问题有更多了解的信息，包括截图或相关链接
--- a/.github/ISSUE_TEMPLATE/3_others.yml
+++ b/.github/ISSUE_TEMPLATE/3_others.yml
@ -73,4 +73,4 @@ body:
    id: additional
    attributes:
      label: Additional Information
-      description: Any other information that could help us better understand your question, including screenshots or relevant links
+      description: Any other information that could help us better understand your question, including screenshots or relevant links
--- a/.github/issue-checker.yml
+++ b/.github/issue-checker.yml
@ -9,115 +9,115 @@ labels:
  # skips and removes
  - name: skip all
    content:
-    regexes: "[Ss]kip (?:[Aa]ll |)[Ll]abels?"
+    regexes: '[Ss]kip (?:[Aa]ll |)[Ll]abels?'
  - name: remove all
    content:
-    regexes: "[Rr]emove (?:[Aa]ll |)[Ll]abels?"
+    regexes: '[Rr]emove (?:[Aa]ll |)[Ll]abels?'

  - name: skip kind/bug
    content:
-    regexes: "[Ss]kip (?:[Ll]abels? |)(?:`|)kind/bug(?:`|)"
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)kind/bug(?:`|)'
  - name: remove kind/bug
    content:
-    regexes: "[Rr]emove (?:[Ll]abels? |)(?:`|)kind/bug(?:`|)"
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)kind/bug(?:`|)'

  - name: skip kind/enhancement
    content:
-    regexes: "[Ss]kip (?:[Ll]abels? |)(?:`|)kind/enhancement(?:`|)"
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)kind/enhancement(?:`|)'
  - name: remove kind/enhancement
    content:
-    regexes: "[Rr]emove (?:[Ll]abels? |)(?:`|)kind/enhancement(?:`|)"
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)kind/enhancement(?:`|)'

  - name: skip kind/question
    content:
-    regexes: "[Ss]kip (?:[Ll]abels? |)(?:`|)kind/question(?:`|)"
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)kind/question(?:`|)'
  - name: remove kind/question
    content:
-    regexes: "[Rr]emove (?:[Ll]abels? |)(?:`|)kind/question(?:`|)"
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)kind/question(?:`|)'

  - name: skip area/Connectivity
    content:
-    regexes: "[Ss]kip (?:[Ll]abels? |)(?:`|)area/Connectivity(?:`|)"
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)area/Connectivity(?:`|)'
  - name: remove area/Connectivity
    content:
-    regexes: "[Rr]emove (?:[Ll]abels? |)(?:`|)area/Connectivity(?:`|)"
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)area/Connectivity(?:`|)'

  - name: skip area/UI/UX
    content:
-    regexes: "[Ss]kip (?:[Ll]abels? |)(?:`|)area/UI/UX(?:`|)"
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)area/UI/UX(?:`|)'
  - name: remove area/UI/UX
    content:
-    regexes: "[Rr]emove (?:[Ll]abels? |)(?:`|)area/UI/UX(?:`|)"
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)area/UI/UX(?:`|)'

  - name: skip kind/documentation
    content:
-    regexes: "[Ss]kip (?:[Ll]abels? |)(?:`|)kind/documentation(?:`|)"
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)kind/documentation(?:`|)'
  - name: remove kind/documentation
    content:
-    regexes: "[Rr]emove (?:[Ll]abels? |)(?:`|)kind/documentation(?:`|)"
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)kind/documentation(?:`|)'

  - name: skip client:linux
    content:
-    regexes: "[Ss]kip (?:[Ll]abels? |)(?:`|)client:linux(?:`|)"
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)client:linux(?:`|)'
  - name: remove client:linux
    content:
-    regexes: "[Rr]emove (?:[Ll]abels? |)(?:`|)client:linux(?:`|)"
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)client:linux(?:`|)'

  - name: skip client:mac
    content:
-    regexes: "[Ss]kip (?:[Ll]abels? |)(?:`|)client:mac(?:`|)"
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)client:mac(?:`|)'
  - name: remove client:mac
    content:
-    regexes: "[Rr]emove (?:[Ll]abels? |)(?:`|)client:mac(?:`|)"
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)client:mac(?:`|)'

  - name: skip client:win
    content:
-    regexes: "[Ss]kip (?:[Ll]abels? |)(?:`|)client:win(?:`|)"
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)client:win(?:`|)'
  - name: remove client:win
    content:
-    regexes: "[Rr]emove (?:[Ll]abels? |)(?:`|)client:win(?:`|)"
-  
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)client:win(?:`|)'
+
  - name: skip sig/Assistant
    content:
-    regexes: "[Ss]kip (?:[Ll]abels? |)(?:`|)sig/Assistant(?:`|)"
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)sig/Assistant(?:`|)'
  - name: remove sig/Assistant
    content:
-    regexes: "[Rr]emove (?:[Ll]abels? |)(?:`|)sig/Assistant(?:`|)"
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)sig/Assistant(?:`|)'

  - name: skip sig/Data
    content:
-    regexes: "[Ss]kip (?:[Ll]abels? |)(?:`|)sig/Data(?:`|)"
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)sig/Data(?:`|)'
  - name: remove sig/Data
    content:
-    regexes: "[Rr]emove (?:[Ll]abels? |)(?:`|)sig/Data(?:`|)"
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)sig/Data(?:`|)'

  - name: skip sig/MCP
    content:
-    regexes: "[Ss]kip (?:[Ll]abels? |)(?:`|)sig/MCP(?:`|)"
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)sig/MCP(?:`|)'
  - name: remove sig/MCP
    content:
-    regexes: "[Rr]emove (?:[Ll]abels? |)(?:`|)sig/MCP(?:`|)"
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)sig/MCP(?:`|)'

  - name: skip sig/RAG
    content:
-    regexes: "[Ss]kip (?:[Ll]abels? |)(?:`|)sig/RAG(?:`|)"
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)sig/RAG(?:`|)'
  - name: remove sig/RAG
    content:
-    regexes: "[Rr]emove (?:[Ll]abels? |)(?:`|)sig/RAG(?:`|)"
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)sig/RAG(?:`|)'

  - name: skip lgtm
    content:
-    regexes: "[Ss]kip (?:[Ll]abels? |)(?:`|)lgtm(?:`|)"
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)lgtm(?:`|)'
  - name: remove lgtm
    content:
-    regexes: "[Rr]emove (?:[Ll]abels? |)(?:`|)lgtm(?:`|)"
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)lgtm(?:`|)'

  - name: skip License
    content:
-    regexes: "[Ss]kip (?:[Ll]abels? |)(?:`|)License(?:`|)"
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)License(?:`|)'
  - name: remove License
    content:
-    regexes: "[Rr]emove (?:[Ll]abels? |)(?:`|)License(?:`|)"
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)License(?:`|)'

  # `Dev Team`
  - name: Dev Team
@ -129,7 +129,7 @@ labels:
  # Area labels
  - name: area/Connectivity
    content: area/Connectivity
-    regexes: "代理|[Pp]roxy"
+    regexes: '代理|[Pp]roxy'
    skip-if:
      - skip all
      - skip area/Connectivity
@ -139,7 +139,7 @@ labels:

  - name: area/UI/UX
    content: area/UI/UX
-    regexes: "界面|[Uu][Ii]|重叠|按钮|图标|组件|渲染|菜单|栏目|头像|主题|样式|[Cc][Ss][Ss]"
+    regexes: '界面|[Uu][Ii]|重叠|按钮|图标|组件|渲染|菜单|栏目|头像|主题|样式|[Cc][Ss][Ss]'
    skip-if:
      - skip all
      - skip area/UI/UX
@ -150,7 +150,7 @@ labels:
  # Kind labels
  - name: kind/documentation
    content: kind/documentation
-    regexes: "文档|教程|[Dd]oc(s|umentation)|[Rr]eadme"
+    regexes: '文档|教程|[Dd]oc(s|umentation)|[Rr]eadme'
    skip-if:
      - skip all
      - skip kind/documentation
@ -161,7 +161,7 @@ labels:
  # Client labels
  - name: client:linux
    content: client:linux
-    regexes: "(?:[Ll]inux|[Uu]buntu|[Dd]ebian)"
+    regexes: '(?:[Ll]inux|[Uu]buntu|[Dd]ebian)'
    skip-if:
      - skip all
      - skip client:linux
@ -171,7 +171,7 @@ labels:

  - name: client:mac
    content: client:mac
-    regexes: "(?:[Mm]ac|[Mm]acOS|[Oo]SX)"
+    regexes: '(?:[Mm]ac|[Mm]acOS|[Oo]SX)'
    skip-if:
      - skip all
      - skip client:mac
@ -181,7 +181,7 @@ labels:

  - name: client:win
    content: client:win
-    regexes: "(?:[Ww]in|[Ww]indows)"
+    regexes: '(?:[Ww]in|[Ww]indows)'
    skip-if:
      - skip all
      - skip client:win
@ -192,7 +192,7 @@ labels:
  # SIG labels
  - name: sig/Assistant
    content: sig/Assistant
-    regexes: "快捷助手|[Aa]ssistant"
+    regexes: '快捷助手|[Aa]ssistant'
    skip-if:
      - skip all
      - skip sig/Assistant
@ -202,7 +202,7 @@ labels:

  - name: sig/Data
    content: sig/Data
-    regexes: "[Ww]ebdav|坚果云|备份|同步|数据|Obsidian|Notion|Joplin|思源"
+    regexes: '[Ww]ebdav|坚果云|备份|同步|数据|Obsidian|Notion|Joplin|思源'
    skip-if:
      - skip all
      - skip sig/Data
@ -212,7 +212,7 @@ labels:

  - name: sig/MCP
    content: sig/MCP
-    regexes: "[Mm][Cc][Pp]"
+    regexes: '[Mm][Cc][Pp]'
    skip-if:
      - skip all
      - skip sig/MCP
@ -222,7 +222,7 @@ labels:

  - name: sig/RAG
    content: sig/RAG
-    regexes: "知识库|[Rr][Aa][Gg]"
+    regexes: '知识库|[Rr][Aa][Gg]'
    skip-if:
      - skip all
      - skip sig/RAG
@ -233,7 +233,7 @@ labels:
  # Other labels
  - name: lgtm
    content: lgtm
-    regexes: "(?:[Ll][Gg][Tt][Mm]|[Ll]ooks [Gg]ood [Tt]o [Mm]e)"
+    regexes: '(?:[Ll][Gg][Tt][Mm]|[Ll]ooks [Gg]ood [Tt]o [Mm]e)'
    skip-if:
      - skip all
      - skip lgtm
@ -243,7 +243,7 @@ labels:

  - name: License
    content: License
-    regexes: "(?:[Ll]icense|[Cc]opyright|[Mm][Ii][Tt]|[Aa]pache)"
+    regexes: '(?:[Ll]icense|[Cc]opyright|[Mm][Ii][Tt]|[Aa]pache)'
    skip-if:
      - skip all
      - skip License
--- a/.github/workflows/dispatch-docs-update.yml
+++ b/.github/workflows/dispatch-docs-update.yml
@ -0,0 +1,27 @@
+name: Dispatch Docs Update on Release
+
+on:
+  release:
+    types: [released]
+
+permissions:
+  contents: write
+
+jobs:
+  dispatch-docs-update:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get Release Tag from Event
+        id: get-event-tag
+        shell: bash
+        run: |
+          # 从当前 Release 事件中获取 tag_name
+          echo "tag=${{ github.event.release.tag_name }}" >> $GITHUB_OUTPUT
+
+      - name: Dispatch update-download-version workflow to cherry-studio-docs
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ secrets.REPO_DISPATCH_TOKEN }}
+          repository: CherryHQ/cherry-studio-docs
+          event-type: update-download-version
+          client-payload: '{"version": "${{ steps.get-event-tag.outputs.tag }}"}'
--- a/.github/workflows/issue-checker.yml
+++ b/.github/workflows/issue-checker.yml
@ -1,4 +1,4 @@
-name: "Issue Checker"
+name: 'Issue Checker'

 on:
  issues:
@ -19,7 +19,7 @@ jobs:
    steps:
      - uses: MaaAssistantArknights/issue-checker@v1.14
        with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          repo-token: '${{ secrets.GITHUB_TOKEN }}'
          configuration-path: .github/issue-checker.yml
          not-before: 2022-08-05T00:00:00Z
-          include-title: 1
+          include-title: 1
--- a/.github/workflows/issue-management.yml
+++ b/.github/workflows/issue-management.yml
@ -1,8 +1,8 @@
-name: "Stale Issue Management"
+name: 'Stale Issue Management'

 on:
  schedule:
-    - cron: "0 0 * * *"
+    - cron: '0 0 * * *'
  workflow_dispatch:

 env:
@ -24,18 +24,18 @@ jobs:
        uses: actions/stale@v9
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          only-labels: "needs-more-info"
+          only-labels: 'needs-more-info'
          days-before-stale: ${{ env.daysBeforeStale }}
-          days-before-close: 0  # Close immediately after stale
-          stale-issue-label: "inactive"
-          close-issue-label: "closed:no-response"
+          days-before-close: 0 # Close immediately after stale
+          stale-issue-label: 'inactive'
+          close-issue-label: 'closed:no-response'
          stale-issue-message: |
            This issue has been labeled as needing more information and has been inactive for ${{ env.daysBeforeStale }} days. 
            It will be closed now due to lack of additional information.
-            
+
            该问题被标记为"需要更多信息"且已经 ${{ env.daysBeforeStale }} 天没有任何活动，将立即关闭。
          operations-per-run: 50
-          exempt-issue-labels: "pending, Dev Team"
+          exempt-issue-labels: 'pending, Dev Team'
          days-before-pr-stale: -1
          days-before-pr-close: -1

@ -45,11 +45,11 @@ jobs:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          days-before-stale: ${{ env.daysBeforeStale }}
          days-before-close: ${{ env.daysBeforeClose }}
-          stale-issue-label: "inactive"
+          stale-issue-label: 'inactive'
          stale-issue-message: |
            This issue has been inactive for a prolonged period and will be closed automatically in ${{ env.daysBeforeClose }} days.
            该问题已长时间处于闲置状态，${{ env.daysBeforeClose }} 天后将自动关闭。
-          exempt-issue-labels: "pending, Dev Team, kind/enhancement"
+          exempt-issue-labels: 'pending, Dev Team, kind/enhancement'
          days-before-pr-stale: -1 # Completely disable stalling for PRs
          days-before-pr-close: -1 # Completely disable closing for PRs

--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -118,38 +118,3 @@ jobs:
          tag: ${{ steps.get-tag.outputs.tag }}
          artifacts: 'dist/*.exe,dist/*.zip,dist/*.dmg,dist/*.AppImage,dist/*.snap,dist/*.deb,dist/*.rpm,dist/*.tar.gz,dist/latest*.yml,dist/rc*.yml,dist/*.blockmap'
          token: ${{ secrets.GITHUB_TOKEN }}
-
-  dispatch-docs-update:
-    needs: release
-    if: success() && github.repository == 'CherryHQ/cherry-studio' # 确保所有构建成功且在主仓库中运行
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get release tag
-        id: get-tag
-        shell: bash
-        run: |
-          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            echo "tag=${{ github.event.inputs.tag }}" >> $GITHUB_OUTPUT
-          else
-            echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Check if tag is pre-release
-        id: check-tag
-        shell: bash
-        run: |
-          TAG="${{ steps.get-tag.outputs.tag }}"
-          if [[ "$TAG" == *"rc"* || "$TAG" == *"pre-release"* ]]; then
-            echo "is_pre_release=true" >> $GITHUB_OUTPUT
-          else
-            echo "is_pre_release=false" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Dispatch update-download-version workflow to cherry-studio-docs
-        if: steps.check-tag.outputs.is_pre_release == 'false'
-        uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ secrets.REPO_DISPATCH_TOKEN }}
-          repository: CherryHQ/cherry-studio-docs
-          event-type: update-download-version
-          client-payload: '{"version": "${{ steps.get-tag.outputs.tag }}"}'
--- a/.yarn/patches/@google-genai-npm-1.0.1-e26f0f9af7.patch
+++ b/.yarn/patches/@google-genai-npm-1.0.1-e26f0f9af7.patch
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,4 +1,4 @@
-[中文](./docs/CONTRIBUTING.zh.md) | [English](./CONTRIBUTING.md)
+[中文](docs/CONTRIBUTING.zh.md) | [English](CONTRIBUTING.md)

 # Cherry Studio Contributor Guide

@ -58,6 +58,10 @@ git commit --signoff -m "Your commit message"

 Maintainers are here to help you implement your use case within a reasonable timeframe. They will do their best to review your code and provide constructive feedback promptly. However, if you get stuck during the review process or feel your Pull Request is not receiving the attention it deserves, please contact us via comments in the Issue or through the [Community](README.md#-community).

+### Participating in the Test Plan
+
+The Test Plan aims to provide users with a more stable application experience and faster iteration speed. For details, please refer to the [Test Plan](docs/testplan-en.md).
+
 ### Other Suggestions

 - **Contact Developers**: Before submitting a PR, you can contact the developers first to discuss or get help.
--- a/README.md
+++ b/README.md
@ -47,6 +47,7 @@
 <div align="center">
  
 [![][github-release-shield]][github-release-link]
+[![][github-nightly-shield]][github-nightly-link]
 [![][github-contributors-shield]][github-contributors-link]
 [![][license-shield]][license-link]
 [![][commercial-shield]][commercial-link]
@ -182,7 +183,7 @@ Refer to the [Branching Strategy](docs/branching-strategy-en.md) for contributio
 3. **Submit Changes**: Commit and push your changes.
 4. **Open a Pull Request**: Describe your changes and reasons.

-For more detailed guidelines, please refer to our [Contributing Guide](./CONTRIBUTING.md).
+For more detailed guidelines, please refer to our [Contributing Guide](CONTRIBUTING.md).

 Thank you for your support and contributions!

@ -287,7 +288,7 @@ We believe the Enterprise Edition will become your team's AI productivity engine

 <!-- Links & Images -->

-[deepwiki-shield]: https://img.shields.io/badge/Deepwiki-CherryHQ-0088CC
+[deepwiki-shield]: https://img.shields.io/badge/Deepwiki-CherryHQ-0088CC?logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNy45MyAzMiI+PHBhdGggZD0iTTE5LjMzIDE0LjEyYy42Ny0uMzkgMS41LS4zOSAyLjE4IDBsMS43NCAxYy4wNi4wMy4xMS4wNi4xOC4wN2guMDRjLjA2LjAzLjEyLjAzLjE4LjAzaC4wMmMuMDYgMCAuMTEgMCAuMTctLjAyaC4wM2MuMDYtLjAyLjEyLS4wNS4xNy0uMDhoLjAybDMuNDgtMi4wMWMuMjUtLjE0LjQtLjQxLjQtLjdWOC40YS44MS44MSAwIDAgMC0uNC0uN2wtMy40OC0yLjAxYS44My44MyAwIDAgMC0uODEgMEwxOS43NyA3LjdoLS4wMWwtLjE1LjEyLS4wMi4wMnMtLjA3LjA5LS4xLjE0VjhhLjQuNCAwIDAgMC0uMDguMTd2LjA0Yy0uMDMuMDYtLjAzLjEyLS4wMy4xOXYyLjAxYzAgLjc4LS40MSAxLjQ5LTEuMDkgMS44OC0uNjcuMzktMS41LjM5LTIuMTggMGwtMS43NC0xYS42LjYgMCAwIDAtLjIxLS4wOGMtLjA2LS4wMS0uMTItLjAyLS4xOC0uMDJoLS4wM2MtLjA2IDAtLjExLjAxLS4xNy4wMmgtLjAzYy0uMDYuMDItLjEyLjA0LS4xNy4wN2gtLjAybC0zLjQ3IDIuMDFjLS4yNS4xNC0uNC40MS0uNC43VjE4YzAgLjI5LjE1LjU1LjQuN2wzLjQ4IDIuMDFoLjAyYy4wNi4wNC4xMS4wNi4xNy4wOGguMDNjLjA1LjAyLjExLjAzLjE3LjAzaC4wMmMuMDYgMCAuMTIgMCAuMTgtLjAyaC4wNGMuMDYtLjAzLjEyLS4wNS4xOC0uMDhsMS43NC0xYy42Ny0uMzkgMS41LS4zOSAyLjE3IDBzMS4wOSAxLjExIDEuMDkgMS44OHYyLjAxYzAgLjA3IDAgLjEzLjAyLjE5di4wNGMuMDMuMDYuMDUuMTIuMDguMTd2LjAycy4wOC4wOS4xMi4xM2wuMDIuMDJzLjA5LjA4LjE1LjExYzAgMCAuMDEgMCAuMDEuMDFsMy40OCAyLjAxYy4yNS4xNC41Ni4xNC44MSAwbDMuNDgtMi4wMWMuMjUtLjE0LjQtLjQxLjQtLjd2LTQuMDFhLjgxLjgxIDAgMCAwLS40LS43bC0zLjQ4LTIuMDFoLS4wMmMtLjA1LS4wNC0uMTEtLjA2LS4xNy0uMDhoLS4wM2EuNS41IDAgMCAwLS4xNy0uMDNoLS4wM2MtLjA2IDAtLjEyIDAtLjE4LjAyLS4wNy4wMi0uMTUuMDUtLjIxLjA4bC0xLjc0IDFjLS42Ny4zOS0xLjUuMzktMi4xNyAwYTIuMTkgMi4xOSAwIDAgMS0xLjA5LTEuODhjMC0uNzguNDItMS40OSAxLjA5LTEuODhaIiBzdHlsZT0iZmlsbDojNWRiZjlkIi8+PHBhdGggZD0ibS40IDEzLjExIDMuNDcgMi4wMWMuMjUuMTQuNTYuMTQuOCAwbDMuNDctMi4wMWguMDFsLjE1LS4xMi4wMi0uMDJzLjA3LS4wOS4xLS4xNGwuMDItLjAyYy4wMy0uMDUuMDUtLjExLjA3LS4xN3YtLjA0Yy4wMy0uMDYuMDMtLjEyLjAzLS4xOVYxMC40YzAtLjc4LjQyLTEuNDkgMS4wOS0xLjg4czEuNS0uMzkgMi4xOCAwbDEuNzQgMWMuMDcuMDQuMTQuMDcuMjEuMDguMDYuMDEuMTIuMDIuMTguMDJoLjAzYy4wNiAwIC4xMS0uMDEuMTctLjAyaC4wM2MuMDYtLjAyLjEyLS4wNC4xNy0uMDdoLjAybDMuNDctMi4wMmMuMjUtLjE0LjQtLjQxLjQtLjd2LTRhLjgxLjgxIDAgMCAwLS40LS43bC0zLjQ2LTJhLjgzLjgzIDAgMCAwLS44MSAwbC0zLjQ4IDIuMDFoLS4wMWwtLjE1LjEyLS4wMi4wMi0uMS4xMy0uMDIuMDJjLS4wMy4wNS0uMDUuMTEtLjA3LjE3di4wNGMtLjAzLjA2LS4wMy4xMi0uMDMuMTl2Mi4wMWMwIC43OC0uNDIgMS40OS0xLjA5IDEuODhzLTEuNS4zOS0yLjE4IDBsLTEuNzQtMWEuNi42IDAgMCAwLS4yMS0uMDhjLS4wNi0uMDEtLjEyLS4wMi0uMTgtLjAyaC0uMDNjLS4wNiAwLS4xMS4wMS0uMTcuMDJoLS4wM2MtLjA2LjAyLS4xMi4wNS0uMTcuMDhoLS4wMkwuNCA3LjcxYy0uMjUuMTQtLjQuNDEtLjQuNjl2NC4wMWMwIC4yOS4xNS41Ni40LjciIHN0eWxlPSJmaWxsOiM0NDY4YzQiLz48cGF0aCBkPSJtMTcuODQgMjQuNDgtMy40OC0yLjAxaC0uMDJjLS4wNS0uMDQtLjExLS4wNi0uMTctLjA4aC0uMDNhLjUuNSAwIDAgMC0uMTctLjAzaC0uMDNjLS4wNiAwLS4xMiAwLS4xOC4wMmgtLjA0Yy0uMDYuMDMtLjEyLjA1LS4xOC4wOGwtMS43NCAxYy0uNjcuMzktMS41LjM5LTIuMTggMGEyLjE5IDIuMTkgMCAwIDEtMS4wOS0xLjg4di0yLjAxYzAtLjA2IDAtLjEzLS4wMi0uMTl2LS4wNGMtLjAzLS4wNi0uMDUtLjExLS4wOC0uMTdsLS4wMi0uMDJzLS4wNi0uMDktLjEtLjEzTDguMjkgMTlzLS4wOS0uMDgtLjE1LS4xMWgtLjAxbC0zLjQ3LTIuMDJhLjgzLjgzIDAgMCAwLS44MSAwTC4zNyAxOC44OGEuODcuODcgMCAwIDAtLjM3LjcxdjQuMDFjMCAuMjkuMTUuNTUuNC43bDMuNDcgMi4wMWguMDJjLjA1LjA0LjExLjA2LjE3LjA4aC4wM2MuMDUuMDIuMTEuMDMuMTYuMDNoLjAzYy4wNiAwIC4xMiAwIC4xOC0uMDJoLjA0Yy4wNi0uMDMuMTItLjA1LjE4LS4wOGwxLjc0LTFjLjY3LS4zOSAxLjUtLjM5IDIuMTcgMHMxLjA5IDEuMTEgMS4wOSAxLjg4djIuMDFjMCAuMDcgMCAuMTMuMDIuMTl2LjA0Yy4wMy4wNi4wNS4xMS4wOC4xN2wuMDIuMDJzLjA2LjA5LjEuMTRsLjAyLjAycy4wOS4wOC4xNS4xMWguMDFsMy40OCAyLjAyYy4yNS4xNC41Ni4xNC44MSAwbDMuNDgtMi4wMWMuMjUtLjE0LjQtLjQxLjQtLjdWMjUuMmEuODEuODEgMCAwIDAtLjQtLjdaIiBzdHlsZT0iZmlsbDojNDI5M2Q5Ii8+PC9zdmc+
 [deepwiki-link]: https://deepwiki.com/CherryHQ/cherry-studio
 [twitter-shield]: https://img.shields.io/badge/Twitter-CherryStudioApp-0088CC?logo=x
 [twitter-link]: https://twitter.com/CherryStudioHQ
@ -298,9 +299,11 @@ We believe the Enterprise Edition will become your team's AI productivity engine

 <!-- Links & Images -->

-[github-release-shield]: https://img.shields.io/github/v/release/CherryHQ/cherry-studio
+[github-release-shield]: https://img.shields.io/github/v/release/CherryHQ/cherry-studio?logo=github
 [github-release-link]: https://github.com/CherryHQ/cherry-studio/releases
-[github-contributors-shield]: https://img.shields.io/github/contributors/CherryHQ/cherry-studio
+[github-nightly-shield]: https://img.shields.io/github/actions/workflow/status/CherryHQ/cherry-studio/nightly-build.yml?label=nightly%20build&logo=github
+[github-nightly-link]: https://github.com/CherryHQ/cherry-studio/actions/workflows/nightly-build.yml
+[github-contributors-shield]: https://img.shields.io/github/contributors/CherryHQ/cherry-studio?logo=github
 [github-contributors-link]: https://github.com/CherryHQ/cherry-studio/graphs/contributors

 <!-- Links & Images -->
--- a/docs/CONTRIBUTING.zh.md
+++ b/docs/CONTRIBUTING.zh.md
@ -1,6 +1,6 @@
 # Cherry Studio 贡献者指南

-[**English**](../CONTRIBUTING.md) | [**中文**](./CONTRIBUTING.zh.md)
+[**English**](../CONTRIBUTING.md) | [**中文**](CONTRIBUTING.zh.md)

 欢迎来到 Cherry Studio 的贡献者社区！我们致力于将 Cherry Studio 打造成一个长期提供价值的项目，并希望邀请更多的开发者加入我们的行列。无论您是经验丰富的开发者还是刚刚起步的初学者，您的贡献都将帮助我们更好地服务用户，提升软件质量。

@ -24,7 +24,7 @@

 ## 开始之前

-请确保阅读了[行为准则](CODE_OF_CONDUCT.md)和[LICENSE](LICENSE)。
+请确保阅读了[行为准则](../CODE_OF_CONDUCT.md)和[LICENSE](../LICENSE)。

 ## 开始贡献

@ -32,7 +32,7 @@

 ### 测试

-未经测试的功能等同于不存在。为确保代码真正有效，应通过单元测试和功能测试覆盖相关流程。因此，在考虑贡献时，也请考虑可测试性。所有测试均可本地运行，无需依赖 CI。请参阅[开发者指南](docs/dev.md#test)中的“Test”部分。
+未经测试的功能等同于不存在。为确保代码真正有效，应通过单元测试和功能测试覆盖相关流程。因此，在考虑贡献时，也请考虑可测试性。所有测试均可本地运行，无需依赖 CI。请参阅[开发者指南](dev.md#test)中的“Test”部分。

 ### 拉取请求的自动化测试

@ -60,7 +60,11 @@ git commit --signoff -m "Your commit message"

 ### 获取代码审查/合并

-维护者在此帮助您在合理时间内实现您的用例。他们会尽力在合理时间内审查您的代码并提供建设性反馈。但如果您在审查过程中受阻，或认为您的 Pull Request 未得到应有的关注，请通过 Issue 中的评论或者[社群](README.md#-community)联系我们
+维护者在此帮助您在合理时间内实现您的用例。他们会尽力在合理时间内审查您的代码并提供建设性反馈。但如果您在审查过程中受阻，或认为您的 Pull Request 未得到应有的关注，请通过 Issue 中的评论或者[社群](README.zh.md#-community)联系我们
+
+### 参与测试计划
+
+测试计划旨在为用户提供更稳定的应用体验和更快的迭代速度，详细情况请参阅[测试计划](testplan-zh.md)。

 ### 其他建议

--- a/docs/README.zh.md
+++ b/docs/README.zh.md
@ -190,7 +190,7 @@ https://docs.cherry-ai.com
 3. **提交更改**：提交并推送您的更改
 4. **打开 Pull Request**：描述您的更改和原因

-有关更详细的指南，请参阅我们的 [贡献指南](./CONTRIBUTING.zh.md)
+有关更详细的指南，请参阅我们的 [贡献指南](CONTRIBUTING.zh.md)

 感谢您的支持和贡献！

--- a/docs/branching-strategy-en.md
+++ b/docs/branching-strategy-en.md
@ -16,6 +16,8 @@ Cherry Studio implements a structured branching strategy to maintain code qualit
  - Only accepts documentation updates and bug fixes
  - Thoroughly tested before production deployment

+For details about the `testplan` branch used in the Test Plan, please refer to the [Test Plan](testplan-en.md).
+
 ## Contributing Branches

 When contributing to Cherry Studio, please follow these guidelines:
--- a/docs/branching-strategy-zh.md
+++ b/docs/branching-strategy-zh.md
@ -16,6 +16,8 @@ Cherry Studio 采用结构化的分支策略来维护代码质量并简化开发
  - 只接受文档更新和 bug 修复
  - 经过完整测试后可以发布到生产环境

+关于测试计划所使用的`testplan`分支，请查阅[测试计划](testplan-zh.md)。
+
 ## 贡献分支

 在为 Cherry Studio 贡献代码时，请遵循以下准则：
--- a/docs/technical/db.settings.md
+++ b/docs/technical/db.settings.md
@ -0,0 +1,11 @@
+# 数据库设置字段
+
+此文档包含部分字段的数据类型说明。
+
+## 字段
+
+| 字段名                         | 类型                           | 说明         |
+| ------------------------------ | ------------------------------ | ------------ |
+| `translate:target:language`    | `LanguageCode`                 | 翻译目标语言 |
+| `translate:source:language`    | `LanguageCode`                 | 翻译源语言   |
+| `translate:bidirectional:pair` | `[LanguageCode, LanguageCode]` | 双向翻译对   |
--- a/docs/testplan-en.md
+++ b/docs/testplan-en.md
@ -0,0 +1,99 @@
+# Test Plan
+
+To provide users with a more stable application experience and faster iteration speed, Cherry Studio has launched the "Test Plan".
+
+## User Guide
+
+The Test Plan is divided into the RC channel and the Beta channel, with the following differences:
+
+- **RC (Release Candidate)**: The features are stable, with fewer bugs, and it is close to the official release.
+- **Beta**: Features may change at any time, and there may be more bugs, but users can experience future features earlier.
+
+Users can enable the "Test Plan" and select the version channel in the software's `Settings` > `About`. Please note that the versions in the "Test Plan" cannot guarantee data consistency, so be sure to back up your data before using them.
+
+Users are welcome to submit issues or provide feedback through other channels for any bugs encountered during testing. Your feedback is very important to us.
+
+## Developer Guide
+
+### Participating in the Test Plan
+
+Developers should submit `PRs` according to the [Contributor Guide](../CONTRIBUTING.md) (and ensure the target branch is `main`). The repository maintainers will evaluate whether the `PR` should be included in the Test Plan based on factors such as the impact of the feature on the application, its importance, and whether broader testing is needed.
+
+If the `PR` is added to the Test Plan, the repository maintainers will:
+
+- Notify the `PR` submitter.
+- Set the PR to `draft` status (to avoid accidental merging into `main` before testing is complete).
+- Set the `milestone` to the specific Test Plan version.
+- Modify the `PR` title.
+
+During participation in the Test Plan, `PR` submitters should:
+
+- Keep the `PR` branch synchronized with the latest `main` (i.e., the `PR` branch should always be based on the latest `main` code).
+- Ensure the `PR` branch is conflict-free.
+- Actively respond to comments & reviews and fix bugs.
+- Enable maintainers to modify the `PR` branch to allow for bug fixes at any time.
+
+Inclusion in the Test Plan does not guarantee the final merging of the `PR`. It may be shelved due to immature features or poor testing feedback.
+
+### Test Plan Lead
+
+A maintainer will be assigned as the lead for a specific version (e.g., `1.5.0-rc`). The responsibilities of the Test Plan lead include:
+
+- Determining whether a `PR` meets the Test Plan requirements and deciding whether it should be included in the current Test Plan.
+- Modifying the status of `PRs` added to the Test Plan and communicating relevant matters with the `PR` submitter.
+- Before the Test Plan release, merging the branches of `PRs` added to the Test Plan (using squash merge) into the corresponding version branch of `testplan` and resolving conflicts.
+- Ensuring the `testplan` branch is synchronized with the latest `main`.
+- Overseeing the Test Plan release.
+
+## In-Depth Understanding
+
+### About `PRs`
+
+A `PR` is a collection of a specific branch (and commits), comments, reviews, and other information, and it is the **smallest management unit** of the Test Plan.
+
+Compared to submitting all features to a single branch, the Test Plan manages features through `PRs`, which offers greater flexibility and efficiency:
+
+- Features can be added or removed between different versions of the Test Plan without cumbersome `revert` operations.
+- Clear feature boundaries and responsibilities are established. Bug fixes are completed within their respective `PRs`, isolating cross-impact and better tracking progress.
+- The `PR` submitter is responsible for resolving conflicts with the latest `main`. The Test Plan lead is responsible for resolving conflicts between `PR` branches. However, since features added to the Test Plan are relatively independent (in other words, if a feature has broad implications, it should be independently included in the Test Plan), conflicts are generally few or simple.
+
+### The `testplan` Branch
+
+The `testplan` branch is a **temporary** branch used for Test Plan releases.
+
+Note:
+
+- **Do not develop based on this branch**. It may change or even be deleted at any time, and there is no guarantee of commit completeness or order.
+- **Do not submit `commits` or `PRs` to this branch**, as they will not be retained.
+- The `testplan` branch is always based on the latest `main` branch (not on a released version), with features added on top.
+
+#### RC Branch
+
+Branch name: `testplan/rc/x.y.z`
+
+Used for RC releases, where `x.y.z` is the target version number. Note that whether it is rc.1 or rc.5, as long as the major version number is `x.y.z`, it is completed in this branch.
+
+Generally, the version number for releases from this branch is named `x.y.z-rc.n`.
+
+#### Beta Branch
+
+Branch name: `testplan/beta/x.y.z`
+
+Used for Beta releases, where `x.y.z` is the target version number. Note that whether it is beta.1 or beta.5, as long as the major version number is `x.y.z`, it is completed in this branch.
+
+Generally, the version number for releases from this branch is named `x.y.z-beta.n`.
+
+### Version Rules
+
+The application version number for the Test Plan is: `x.y.z-CHA.n`, where:
+
+- `x.y.z` is the conventional version number, referred to here as the **target version number**.
+- `CHA` is the channel code (Channel), currently divided into `rc` and `beta`.
+- `n` is the release number, starting from `1`.
+
+Examples of complete version numbers: `1.5.0-rc.3`, `1.5.1-beta.1`, `1.6.0-beta.6`.
+
+The **target version number** of the Test Plan points to the official version number where these features are expected to be added. For example:
+
+- `1.5.0-rc.3` means this is a preview of the `1.5.0` official release (the current latest official release is `1.4.9`, and `1.5.0` has not yet been officially released).
+- `1.5.1-beta.1` means this is a beta version of the `1.5.1` official release (the current latest official release is `1.5.0`, and `1.5.1` has not yet been officially released).
--- a/docs/testplan-zh.md
+++ b/docs/testplan-zh.md
@ -0,0 +1,99 @@
+# 测试计划
+
+为了给用户提供更稳定的应用体验，并提供更快的迭代速度，Cherry Studio推出“测试计划”。
+
+## 用户指南
+
+测试计划分为RC版通道和Beta版通道吗，区别在于：
+
+- **RC版（预览版）**：RC即Release Candidate，功能已经稳定，BUG较少，接近正式版
+- **Beta版（测试版）**：功能可能随时变化，BUG较多，可以较早体验未来功能
+
+用户可以在软件的`设置`-`关于`中，开启“测试计划”并选择版本通道。请注意“测试计划”的版本无法保证数据的一致性，请使用前一定要备份数据。
+
+用户在测试过程中发现的BUG，欢迎提交issue或通过其他渠道反馈。用户的反馈对我们非常重要。
+
+## 开发者指南
+
+### 参与测试计划
+
+开发者按照[贡献者指南](CONTRIBUTING.zh.md)要求正常提交`PR`（并注意提交target为`main`）。仓库维护者会综合考虑（例如该功能对应用的影响程度，功能的重要性，是否需要更广泛的测试等），决定该`PR`是否应加入测试计划。
+
+若该`PR`加入测试计划，仓库维护者会做如下操作：
+
+- 通知`PR`提交人
+- 设置PR为`draft`状态（避免在测试完成前意外并入`main`）
+- `milestone`设置为具体测试计划版本
+- 修改`PR`标题
+
+`PR`提交人在参与测试计划过程中，应做到：
+
+- 保持`PR`分支与最新`main`同步（即`PR`分支总是应基于最新`main`代码）
+- 保持`PR`分支为无冲突状态
+- 积极响应 comments & reviews，修复bug
+- 开启维护者可以修改`PR`分支的权限，以便维护者能随时修改BUG
+
+加入测试计划并不保证`PR`的最终合并，也有可能由于功能不成熟或测试反馈不佳而搁置
+
+### 测试计划负责人
+
+某个维护者会被指定为某个版本期间（例如`1.5.0-rc`）的测试计划负责人。测试计划负责人的工作为：
+
+- 判断某个`PR`是否符合测试计划要求，并决定是否应合入当期测试计划
+- 修改加入测试计划的`PR`状态，并与`PR`提交人沟通相关事宜
+- 在测试计划发版前，将加入测试计划的`PR`分支逐一合并（采用squash merge）至`testplan`对应版本分支，并解决冲突
+- 保证`testplan`分支与最新`main`同步
+- 负责测试计划发版
+
+## 深入理解
+
+### 关于`PR`
+
+`PR`是特定分支（及commits）、comments、reviews等各种信息的集合，也是测试计划的**最小管理单元**。
+
+相比将所有功能都提交到某个分支，测试计划通过`PR`来管理功能，这可以带来极大的灵活度和效率：
+
+- 测试计划的各个版本间，可以随意增减功能，而无需繁琐的`revert`操作
+- 明确了功能边界和负责人，bug修复在各自`PR`中完成，隔离了交叉影响，也能更好观察进度
+- `PR`提交人负责与最新`main`之间的冲突；测试计划负责人负责各`PR`分支之间的冲突，但因加入测试计划的各功能相对比较独立（话句话说，如果功能牵涉较广，则应独立上测试计划），冲突一般比较少或简单。
+
+### `testplan`分支
+
+`testplan`分支是用于测试计划发版所用的**临时**分支。
+
+注意：
+
+- **请勿基于该分支开发**。该分支随时会变化甚至删除，且并不保证commit的完整和顺序。
+- **请勿向该分支提交`commit`及`PR`**，将不会得到保留
+- `testplan`分支总是基于最新`main`分支（而不是基于已发布版本），在其之上添加功能
+
+#### RC版分支
+
+分支名称：`testplan/rc/x.y.z`
+
+用于RC版的发版，x.y.z为目标版本号，注意无论是rc.1还是rc.5，只要主版本号为x.y.z，都在该分支完成。
+
+一般而言，该分支发版的版本号命名为`x.y.z-rc.n`
+
+#### Beta版分支
+
+分支名称：`testplan/beta/x.y.z`
+
+用于Beta版的发版，x.y.z为目标版本号，注意无论是beta.1还是beta.5，只要主版本号为x.y.z，都在该分支完成。
+
+一般而言，该分支发版的版本号命名为`x.y.z-beta.n`
+
+### 版本规则
+
+测试计划的应用版本号为：`x.y.z-CHA.n`，其中：
+
+- `x.y.z`为一般意义上的版本号，在这里称为**目标版本号**
+- `CHA`为通道号（Channel），现在分为`rc`和`beta`
+- `n`为发版编号，从`1`计数
+
+完整的版本号举例：`1.5.0-rc.3`、`1.5.1-beta.1`、`1.6.0-beta.6`
+
+测试计划的**目标版本号**指向希望添加这些功能的正式版版本号。例如：
+
+- `1.5.0-rc.3`是指，这是`1.5.0`正式版的预览版（当前最新正式版是`1.4.9`，而`1.5.0`正式版还未发布）
+- `1.5.1-beta.1`是指，这是`1.5.1`正式版的测试版（当前最新正式版是`1.5.0`，而`1.5.1`正式版还未发布）
--- a/electron-builder.yml
+++ b/electron-builder.yml
@ -117,9 +117,9 @@ afterSign: scripts/notarize.js
 artifactBuildCompleted: scripts/artifact-build-completed.js
 releaseInfo:
  releaseNotes: |
-    划词助手：支持 macOS 系统
-    文档处理：增加 MinerU、Doc2x，Mistral 等服务商支持
-    知识库：新的知识库界面，增加扫描版 PDF 支持
-    OCR：macOS 增加系统 OCR 支持
-    服务商：支持一键添加服务商，新增 PH8 大模型开放平台, 支持 PPIO OAuth 登录
-    修复：Linux下数据目录移动问题
+    服务商：新增 NewAPI 服务商支持
+    绘图：新增 NewAPI 绘图服务商支持
+    备份：支持 s3 兼容存储备份
+    服务商：支持多个密钥管理，支持配置自定义请求头
+    设置：支持禁用硬件加速
+    其他：性能优化和错误改进
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@ -26,7 +26,7 @@ export default defineConfig([
      'simple-import-sort/exports': 'error',
      'unused-imports/no-unused-imports': 'error',
      '@eslint-react/no-prop-types': 'error',
-      'prettier/prettier': ['error', { endOfLine: 'auto' }]
+      'prettier/prettier': ['error']
    }
  },
  // Configuration for ensuring compatibility with the original ESLint(8.x) rules
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "CherryStudio",
-  "version": "1.4.8",
+  "version": "1.4.9",
  "private": true,
  "description": "A powerful AI assistant for producer.",
  "main": "./out/main/index.js",
@ -55,20 +55,23 @@
    "test:lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts",
    "format": "prettier --write .",
    "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
-    "prepare": "husky"
+    "prepare": "git config blame.ignoreRevsFile .git-blame-ignore-revs && husky"
  },
  "dependencies": {
+    "@aws-sdk/client-s3": "^3.840.0",
    "@cherrystudio/pdf-to-img-napi": "^0.0.1",
    "@libsql/client": "0.14.0",
    "@libsql/win32-x64-msvc": "^0.4.7",
    "@strongtz/win32-arm64-msvc": "^0.4.7",
+    "iconv-lite": "^0.6.3",
+    "jschardet": "^3.1.4",
    "jsdom": "26.1.0",
    "macos-release": "^3.4.0",
    "node-stream-zip": "^1.15.0",
    "notion-helper": "^1.3.22",
    "os-proxy-config": "^1.1.2",
    "pdfjs-dist": "4.10.38",
-    "selection-hook": "^1.0.4",
+    "selection-hook": "^1.0.5",
    "turndown": "7.2.0"
  },
  "devDependencies": {
@ -104,7 +107,7 @@
    "@langchain/community": "^0.3.36",
    "@langchain/ollama": "^0.2.1",
    "@mistralai/mistralai": "^1.6.0",
-    "@modelcontextprotocol/sdk": "^1.11.4",
+    "@modelcontextprotocol/sdk": "^1.12.3",
    "@mozilla/readability": "^0.6.0",
    "@notionhq/client": "^2.2.15",
    "@playwright/test": "^1.52.0",
--- a/packages/shared/IpcChannel.ts
+++ b/packages/shared/IpcChannel.ts
@ -36,6 +36,7 @@ export enum IpcChannel {
  App_MacRequestProcessTrust = 'app:mac-request-process-trust',

  App_QuoteToMain = 'app:quote-to-main',
+  App_SetDisableHardwareAcceleration = 'app:set-disable-hardware-acceleration',

  Notification_Send = 'notification:send',
  Notification_OnClick = 'notification:on-click',
@ -73,6 +74,8 @@ export enum IpcChannel {
  Mcp_ServersChanged = 'mcp:servers-changed',
  Mcp_ServersUpdated = 'mcp:servers-updated',
  Mcp_CheckConnectivity = 'mcp:check-connectivity',
+  Mcp_SetProgress = 'mcp:set-progress',
+  Mcp_AbortTool = 'mcp:abort-tool',

  // Python
  Python_Execute = 'python:execute',
@ -164,6 +167,16 @@ export enum IpcChannel {
  Backup_CheckConnection = 'backup:checkConnection',
  Backup_CreateDirectory = 'backup:createDirectory',
  Backup_DeleteWebdavFile = 'backup:deleteWebdavFile',
+  Backup_BackupToLocalDir = 'backup:backupToLocalDir',
+  Backup_RestoreFromLocalBackup = 'backup:restoreFromLocalBackup',
+  Backup_ListLocalBackupFiles = 'backup:listLocalBackupFiles',
+  Backup_DeleteLocalBackupFile = 'backup:deleteLocalBackupFile',
+  Backup_SetLocalBackupDir = 'backup:setLocalBackupDir',
+  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',
--- a/src/main/index.ts
+++ b/src/main/index.ts
@ -28,6 +28,14 @@ import { windowService } from './services/WindowService'

 Logger.initialize()

+/**
+ * Disable hardware acceleration if setting is enabled
+ */
+const disableHardwareAcceleration = configManager.getDisableHardwareAcceleration()
+if (disableHardwareAcceleration) {
+  app.disableHardwareAcceleration()
+}
+
 /**
 * Disable chromium's window animations
 * main purpose for this is to avoid the transparent window flashing when it is shown
--- a/src/main/ipc.ts
+++ b/src/main/ipc.ts
@ -12,6 +12,7 @@ import { BrowserWindow, dialog, ipcMain, session, shell, systemPreferences, webC
 import log from 'electron-log'
 import { Notification } from 'src/renderer/src/types/notification'

+import appService from './services/AppService'
 import AppUpdater from './services/AppUpdater'
 import BackupManager from './services/BackupManager'
 import { configManager } from './services/ConfigManager'
@ -114,12 +115,8 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
  })

  // launch on boot
-  ipcMain.handle(IpcChannel.App_SetLaunchOnBoot, (_, openAtLogin: boolean) => {
-    // Set login item settings for windows and mac
-    // linux is not supported because it requires more file operations
-    if (isWin || isMac) {
-      app.setLoginItemSettings({ openAtLogin })
-    }
+  ipcMain.handle(IpcChannel.App_SetLaunchOnBoot, (_, isLaunchOnBoot: boolean) => {
+    appService.setAppLaunchOnBoot(isLaunchOnBoot)
  })

  // launch to tray
@ -368,6 +365,16 @@ 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_BackupToLocalDir, backupManager.backupToLocalDir)
+  ipcMain.handle(IpcChannel.Backup_RestoreFromLocalBackup, backupManager.restoreFromLocalBackup)
+  ipcMain.handle(IpcChannel.Backup_ListLocalBackupFiles, backupManager.listLocalBackupFiles)
+  ipcMain.handle(IpcChannel.Backup_DeleteLocalBackupFile, backupManager.deleteLocalBackupFile)
+  ipcMain.handle(IpcChannel.Backup_SetLocalBackupDir, backupManager.setLocalBackupDir)
+  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)
@ -494,6 +501,10 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
  ipcMain.handle(IpcChannel.Mcp_GetResource, mcpService.getResource)
  ipcMain.handle(IpcChannel.Mcp_GetInstallInfo, mcpService.getInstallInfo)
  ipcMain.handle(IpcChannel.Mcp_CheckConnectivity, mcpService.checkMcpConnectivity)
+  ipcMain.handle(IpcChannel.Mcp_AbortTool, mcpService.abortTool)
+  ipcMain.handle(IpcChannel.Mcp_SetProgress, (_, progress: number) => {
+    mainWindow.webContents.send('mcp-progress', progress)
+  })

  // Register Python execution handler
  ipcMain.handle(
@ -561,4 +572,8 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
  SelectionService.registerIpcHandler()

  ipcMain.handle(IpcChannel.App_QuoteToMain, (_, text: string) => windowService.quoteToMainWindow(text))
+
+  ipcMain.handle(IpcChannel.App_SetDisableHardwareAcceleration, (_, isDisable: boolean) => {
+    configManager.setDisableHardwareAcceleration(isDisable)
+  })
 }
--- a/src/main/knowledage/loader/index.ts
+++ b/src/main/knowledage/loader/index.ts
@ -1,8 +1,7 @@
-import * as fs from 'node:fs'
-
 import { JsonLoader, LocalPathLoader, RAGApplication, TextLoader } from '@cherrystudio/embedjs'
 import type { AddLoaderReturn } from '@cherrystudio/embedjs-interfaces'
 import { WebLoader } from '@cherrystudio/embedjs-loader-web'
+import { readTextFileWithAutoEncoding } from '@main/utils/file'
 import { LoaderReturn } from '@shared/config/types'
 import { FileMetadata, KnowledgeBaseParams } from '@types'
 import Logger from 'electron-log'
@ -115,7 +114,7 @@ export async function addFileLoader(
      // HTML类型处理
      loaderReturn = await ragApplication.addLoader(
        new WebLoader({
-          urlOrContent: fs.readFileSync(file.path, 'utf-8'),
+          urlOrContent: readTextFileWithAutoEncoding(file.path),
          chunkSize: base.chunkSize,
          chunkOverlap: base.chunkOverlap
        }) as any,
@ -125,7 +124,7 @@ export async function addFileLoader(

    case 'json':
      try {
-        jsonObject = JSON.parse(fs.readFileSync(file.path, 'utf-8'))
+        jsonObject = JSON.parse(readTextFileWithAutoEncoding(file.path))
      } catch (error) {
        jsonParsed = false
        Logger.warn('[KnowledgeBase] failed parsing json file, falling back to text processing:', file.path, error)
@ -141,7 +140,7 @@ export async function addFileLoader(
      // 如果是其他文本类型且尚未读取文件，则读取文件
      loaderReturn = await ragApplication.addLoader(
        new TextLoader({
-          text: fs.readFileSync(file.path, 'utf-8'),
+          text: readTextFileWithAutoEncoding(file.path),
          chunkSize: base.chunkSize,
          chunkOverlap: base.chunkOverlap
        }) as any,
--- a/src/main/knowledage/ocr/BaseOcrProvider.ts
+++ b/src/main/knowledage/ocr/BaseOcrProvider.ts
--- a/src/main/knowledage/ocr/DefaultOcrProvider.ts
+++ b/src/main/knowledage/ocr/DefaultOcrProvider.ts
--- a/src/main/knowledage/ocr/MacSysOcrProvider.ts
+++ b/src/main/knowledage/ocr/MacSysOcrProvider.ts
--- a/src/main/knowledage/ocr/OcrProvider.ts
+++ b/src/main/knowledage/ocr/OcrProvider.ts
--- a/src/main/knowledage/ocr/OcrProviderFactory.ts
+++ b/src/main/knowledage/ocr/OcrProviderFactory.ts
--- a/src/main/knowledage/preprocess/BasePreprocessProvider.ts
+++ b/src/main/knowledage/preprocess/BasePreprocessProvider.ts
--- a/src/main/knowledage/preprocess/DefaultPreprocessProvider.ts
+++ b/src/main/knowledage/preprocess/DefaultPreprocessProvider.ts
--- a/src/main/knowledage/preprocess/Doc2xPreprocessProvider.ts
+++ b/src/main/knowledage/preprocess/Doc2xPreprocessProvider.ts
--- a/src/main/knowledage/preprocess/MineruPreprocessProvider.ts
+++ b/src/main/knowledage/preprocess/MineruPreprocessProvider.ts
@ -111,7 +111,6 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
  }

  private async validateFile(filePath: string): Promise<void> {
-    const quota = await this.checkQuota()
    const pdfBuffer = await fs.promises.readFile(filePath)

    const doc = await this.readPdf(new Uint8Array(pdfBuffer))
@ -125,10 +124,6 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
      const fileSizeMB = Math.round(pdfBuffer.length / (1024 * 1024))
      throw new Error(`PDF file size (${fileSizeMB}MB) exceeds the limit of 200MB`)
    }
-    // 检查配额
-    if (quota <= 0 || quota - doc.numPages <= 0) {
-      throw new Error('MinerU解析配额不足，请申请企业账户或自行部署，剩余额度：' + quota)
-    }
  }

  private createProcessedFileInfo(file: FileMetadata, outputPath: string): FileMetadata {
--- a/src/main/knowledage/preprocess/MistralPreprocessProvider.ts
+++ b/src/main/knowledage/preprocess/MistralPreprocessProvider.ts
--- a/src/main/knowledage/preprocess/PreprocessProvider.ts
+++ b/src/main/knowledage/preprocess/PreprocessProvider.ts
--- a/src/main/knowledage/preprocess/PreprocessProviderFactory.ts
+++ b/src/main/knowledage/preprocess/PreprocessProviderFactory.ts
--- a/src/main/services/AppService.ts
+++ b/src/main/services/AppService.ts
@ -0,0 +1,81 @@
+import { isDev, isLinux, isMac, isWin } from '@main/constant'
+import { app } from 'electron'
+import log from 'electron-log'
+import fs from 'fs'
+import os from 'os'
+import path from 'path'
+
+export class AppService {
+  private static instance: AppService
+
+  private constructor() {
+    // Private constructor to prevent direct instantiation
+  }
+
+  public static getInstance(): AppService {
+    if (!AppService.instance) {
+      AppService.instance = new AppService()
+    }
+    return AppService.instance
+  }
+
+  public async setAppLaunchOnBoot(isLaunchOnBoot: boolean): Promise<void> {
+    // Set login item settings for windows and mac
+    // linux is not supported because it requires more file operations
+    if (isWin || isMac) {
+      app.setLoginItemSettings({ openAtLogin: isLaunchOnBoot })
+    } else if (isLinux) {
+      try {
+        const autostartDir = path.join(os.homedir(), '.config', 'autostart')
+        const desktopFile = path.join(autostartDir, isDev ? 'cherry-studio-dev.desktop' : 'cherry-studio.desktop')
+
+        if (isLaunchOnBoot) {
+          // Ensure autostart directory exists
+          try {
+            await fs.promises.access(autostartDir)
+          } catch {
+            await fs.promises.mkdir(autostartDir, { recursive: true })
+          }
+
+          // Get executable path
+          let executablePath = app.getPath('exe')
+          if (process.env.APPIMAGE) {
+            // For AppImage packaged apps, use APPIMAGE environment variable
+            executablePath = process.env.APPIMAGE
+          }
+
+          // Create desktop file content
+          const desktopContent = `[Desktop Entry]
+  Type=Application
+  Name=Cherry Studio
+  Comment=A powerful AI assistant for producer.
+  Exec=${executablePath}
+  Icon=cherrystudio
+  Terminal=false
+  StartupNotify=false
+  Categories=Development;Utility;
+  X-GNOME-Autostart-enabled=true
+  Hidden=false`
+
+          // Write desktop file
+          await fs.promises.writeFile(desktopFile, desktopContent)
+          log.info('Created autostart desktop file for Linux')
+        } else {
+          // Remove desktop file
+          try {
+            await fs.promises.access(desktopFile)
+            await fs.promises.unlink(desktopFile)
+            log.info('Removed autostart desktop file for Linux')
+          } catch {
+            // File doesn't exist, no need to remove
+          }
+        }
+      } catch (error) {
+        log.error('Failed to set launch on boot for Linux:', error)
+      }
+    }
+  }
+}
+
+// Default export as singleton instance
+export default AppService.getInstance()
--- 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 './S3Storage'
 import WebDav from './WebDav'
 import { windowService } from './WindowService'

@ -25,6 +27,16 @@ class BackupManager {
    this.restoreFromWebdav = this.restoreFromWebdav.bind(this)
    this.listWebdavFiles = this.listWebdavFiles.bind(this)
    this.deleteWebdavFile = this.deleteWebdavFile.bind(this)
+    this.listLocalBackupFiles = this.listLocalBackupFiles.bind(this)
+    this.deleteLocalBackupFile = this.deleteLocalBackupFile.bind(this)
+    this.backupToLocalDir = this.backupToLocalDir.bind(this)
+    this.restoreFromLocalBackup = this.restoreFromLocalBackup.bind(this)
+    this.setLocalBackupDir = this.setLocalBackupDir.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 +97,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 +163,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 +251,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 +407,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 +481,191 @@ class BackupManager {
      throw new Error(error.message || 'Failed to delete backup file')
    }
  }
+
+  async backupToLocalDir(
+    _: Electron.IpcMainInvokeEvent,
+    data: string,
+    fileName: string,
+    localConfig: {
+      localBackupDir: string
+      skipBackupFile: boolean
+    }
+  ) {
+    try {
+      const backupDir = localConfig.localBackupDir
+      // Create backup directory if it doesn't exist
+      await fs.ensureDir(backupDir)
+
+      const backupedFilePath = await this.backup(_, fileName, data, backupDir, localConfig.skipBackupFile)
+      return backupedFilePath
+    } catch (error) {
+      Logger.error('[BackupManager] Local backup failed:', error)
+      throw error
+    }
+  }
+
+  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(s3Config)
+    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 restoreFromLocalBackup(_: Electron.IpcMainInvokeEvent, fileName: string, localBackupDir: string) {
+    try {
+      const backupDir = localBackupDir
+      const backupPath = path.join(backupDir, fileName)
+
+      if (!fs.existsSync(backupPath)) {
+        throw new Error(`Backup file not found: ${backupPath}`)
+      }
+
+      return await this.restore(_, backupPath)
+    } catch (error) {
+      Logger.error('[BackupManager] Local restore failed:', error)
+      throw error
+    }
+  }
+
+  async listLocalBackupFiles(_: Electron.IpcMainInvokeEvent, localBackupDir: string) {
+    try {
+      const files = await fs.readdir(localBackupDir)
+      const result: Array<{ fileName: string; modifiedTime: string; size: number }> = []
+
+      for (const file of files) {
+        const filePath = path.join(localBackupDir, file)
+        const stat = await fs.stat(filePath)
+
+        if (stat.isFile() && file.endsWith('.zip')) {
+          result.push({
+            fileName: file,
+            modifiedTime: stat.mtime.toISOString(),
+            size: stat.size
+          })
+        }
+      }
+
+      // Sort by modified time, newest first
+      return result.sort((a, b) => new Date(b.modifiedTime).getTime() - new Date(a.modifiedTime).getTime())
+    } catch (error) {
+      Logger.error('[BackupManager] List local backup files failed:', error)
+      throw error
+    }
+  }
+
+  async deleteLocalBackupFile(_: Electron.IpcMainInvokeEvent, fileName: string, localBackupDir: string) {
+    try {
+      const filePath = path.join(localBackupDir, fileName)
+
+      if (!fs.existsSync(filePath)) {
+        throw new Error(`Backup file not found: ${filePath}`)
+      }
+
+      await fs.remove(filePath)
+      return true
+    } catch (error) {
+      Logger.error('[BackupManager] Delete local backup file failed:', error)
+      throw error
+    }
+  }
+
+  async setLocalBackupDir(_: Electron.IpcMainInvokeEvent, dirPath: string) {
+    try {
+      // Check if directory exists
+      await fs.ensureDir(dirPath)
+      return true
+    } catch (error) {
+      Logger.error('[BackupManager] Set local backup directory failed:', error)
+      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(s3Config)
+    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(s3Config)
+
+      const objects = await s3Client.listFiles()
+      const files = objects
+        .filter((obj) => obj.key.endsWith('.zip'))
+        .map((obj) => {
+          const segments = obj.key.split('/')
+          const fileName = segments[segments.length - 1]
+          return {
+            fileName,
+            modifiedTime: obj.lastModified || '',
+            size: obj.size
+          }
+        })
+
+      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(s3Config)
+      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(s3Config)
+    return await s3Client.checkConnection()
+  }
 }

 export default BackupManager
--- a/src/main/services/ConfigManager.ts
+++ b/src/main/services/ConfigManager.ts
@ -24,7 +24,8 @@ export enum ConfigKeys {
  SelectionAssistantFollowToolbar = 'selectionAssistantFollowToolbar',
  SelectionAssistantRemeberWinSize = 'selectionAssistantRemeberWinSize',
  SelectionAssistantFilterMode = 'selectionAssistantFilterMode',
-  SelectionAssistantFilterList = 'selectionAssistantFilterList'
+  SelectionAssistantFilterList = 'selectionAssistantFilterList',
+  DisableHardwareAcceleration = 'disableHardwareAcceleration'
 }

 export class ConfigManager {
@ -218,6 +219,14 @@ export class ConfigManager {
    this.setAndNotify(ConfigKeys.SelectionAssistantFilterList, value)
  }

+  getDisableHardwareAcceleration(): boolean {
+    return this.get<boolean>(ConfigKeys.DisableHardwareAcceleration, false)
+  }
+
+  setDisableHardwareAcceleration(value: boolean) {
+    this.set(ConfigKeys.DisableHardwareAcceleration, value)
+  }
+
  setAndNotify(key: string, value: unknown) {
    this.set(key, value, true)
  }
--- a/src/main/services/FileStorage.ts
+++ b/src/main/services/FileStorage.ts
@ -1,4 +1,4 @@
-import { getFilesDir, getFileType, getTempDir } from '@main/utils/file'
+import { getFilesDir, getFileType, getTempDir, readTextFileWithAutoEncoding } from '@main/utils/file'
 import { documentExts, imageExts, MB } from '@shared/config/constant'
 import { FileMetadata } from '@types'
 import * as crypto from 'crypto'
@ -188,6 +188,8 @@ class FileStorage {
      count: 1
    }

+    logger.info('[FileStorage] File uploaded:', fileMetadata)
+
    return fileMetadata
  }

@ -256,7 +258,13 @@ class FileStorage {
      }
    }

-    return fs.readFileSync(filePath, 'utf8')
+    try {
+      const result = readTextFileWithAutoEncoding(filePath)
+      return result
+    } catch (error) {
+      logger.error(error)
+      return 'failed to read file'
+    }
  }

  public createTempFile = async (_: Electron.IpcMainInvokeEvent, fileName: string): Promise<string> => {
--- a/src/main/services/KnowledgeService.ts
+++ b/src/main/services/KnowledgeService.ts
@ -24,9 +24,9 @@ import { WebLoader } from '@cherrystudio/embedjs-loader-web'
 import Embeddings from '@main/knowledage/embeddings/Embeddings'
 import { addFileLoader } from '@main/knowledage/loader'
 import { NoteLoader } from '@main/knowledage/loader/noteLoader'
+import OcrProvider from '@main/knowledage/ocr/OcrProvider'
+import PreprocessProvider from '@main/knowledage/preprocess/PreprocessProvider'
 import Reranker from '@main/knowledage/reranker/Reranker'
-import OcrProvider from '@main/ocr/OcrProvider'
-import PreprocessProvider from '@main/preprocess/PreprocessProvider'
 import { windowService } from '@main/services/WindowService'
 import { getDataPath } from '@main/utils'
 import { getAllFiles } from '@main/utils/file'
--- a/src/main/services/MCPService.ts
+++ b/src/main/services/MCPService.ts
@ -28,6 +28,7 @@ import { app } from 'electron'
 import Logger from 'electron-log'
 import { EventEmitter } from 'events'
 import { memoize } from 'lodash'
+import { v4 as uuidv4 } from 'uuid'

 import { CacheService } from './CacheService'
 import { CallBackServer } from './mcp/oauth/callback'
@ -71,6 +72,7 @@ function withCache<T extends unknown[], R>(
 class McpService {
  private clients: Map<string, Client> = new Map()
  private pendingClients: Map<string, Promise<Client>> = new Map()
+  private activeToolCalls: Map<string, AbortController> = new Map()

  constructor() {
    this.initClient = this.initClient.bind(this)
@ -84,6 +86,7 @@ class McpService {
    this.removeServer = this.removeServer.bind(this)
    this.restartServer = this.restartServer.bind(this)
    this.stopServer = this.stopServer.bind(this)
+    this.abortTool = this.abortTool.bind(this)
    this.cleanup = this.cleanup.bind(this)
  }

@ -455,10 +458,14 @@ class McpService {
   */
  public async callTool(
    _: Electron.IpcMainInvokeEvent,
-    { server, name, args }: { server: MCPServer; name: string; args: any }
+    { server, name, args, callId }: { server: MCPServer; name: string; args: any; callId?: string }
  ): Promise<MCPCallToolResponse> {
+    const toolCallId = callId || uuidv4()
+    const abortController = new AbortController()
+    this.activeToolCalls.set(toolCallId, abortController)
+
    try {
-      Logger.info('[MCP] Calling:', server.name, name, args)
+      Logger.info('[MCP] Calling:', server.name, name, args, 'callId:', toolCallId)
      if (typeof args === 'string') {
        try {
          args = JSON.parse(args)
@ -468,12 +475,19 @@ class McpService {
      }
      const client = await this.initClient(server)
      const result = await client.callTool({ name, arguments: args }, undefined, {
-        timeout: server.timeout ? server.timeout * 1000 : 60000 // Default timeout of 1 minute
+        onprogress: (process) => {
+          console.log('[MCP] Progress:', process.progress / (process.total || 1))
+          window.api.mcp.setProgress(process.progress / (process.total || 1))
+        },
+        timeout: server.timeout ? server.timeout * 1000 : 60000, // Default timeout of 1 minute
+        signal: this.activeToolCalls.get(toolCallId)?.signal
      })
      return result as MCPCallToolResponse
    } catch (error) {
      Logger.error(`[MCP] Error calling tool ${name} on ${server.name}:`, error)
      throw error
+    } finally {
+      this.activeToolCalls.delete(toolCallId)
    }
  }

@ -664,6 +678,20 @@ class McpService {
    delete env.http_proxy
    delete env.https_proxy
  }
+
+  // 实现 abortTool 方法
+  public async abortTool(_: Electron.IpcMainInvokeEvent, callId: string) {
+    const activeToolCall = this.activeToolCalls.get(callId)
+    if (activeToolCall) {
+      activeToolCall.abort()
+      this.activeToolCalls.delete(callId)
+      Logger.info(`[MCP] Aborted tool call: ${callId}`)
+      return true
+    } else {
+      Logger.warn(`[MCP] No active tool call found for callId: ${callId}`)
+      return false
+    }
+  }
 }

 export default new McpService()
--- a/src/main/services/RemoteStorage.ts
+++ b/src/main/services/RemoteStorage.ts
@ -1,57 +0,0 @@
-// import Logger from 'electron-log'
-// import { Operator } from 'opendal'
-
-// export default class RemoteStorage {
-//   public instance: Operator | 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)
-
-//     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')
-//     }
-
-//     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')
-//     }
-
-//     try {
-//       return await this.instance.read(filename)
-//     } catch (error) {
-//       Logger.error('[RemoteStorage] Error getting file contents:', error)
-//       throw error
-//     }
-//   }
-// }
--- a/src/main/services/S3Storage.ts
+++ b/src/main/services/S3Storage.ts
@ -0,0 +1,183 @@
+import {
+  DeleteObjectCommand,
+  GetObjectCommand,
+  HeadBucketCommand,
+  ListObjectsV2Command,
+  PutObjectCommand,
+  S3Client
+} from '@aws-sdk/client-s3'
+import type { S3Config } from '@types'
+import Logger from 'electron-log'
+import * as net from 'net'
+import { Readable } from 'stream'
+
+/**
+ * 将可读流转换为 Buffer
+ */
+function streamToBuffer(stream: Readable): Promise<Buffer> {
+  return new Promise((resolve, reject) => {
+    const chunks: Buffer[] = []
+    stream.on('data', (chunk) => chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk)))
+    stream.on('error', reject)
+    stream.on('end', () => resolve(Buffer.concat(chunks)))
+  })
+}
+
+// 需要使用 Virtual Host-Style 的服务商域名后缀白名单
+const VIRTUAL_HOST_SUFFIXES = ['aliyuncs.com', 'myqcloud.com']
+
+/**
+ * 使用 AWS SDK v3 的简单 S3 封装，兼容之前 RemoteStorage 的最常用接口。
+ */
+export default class S3Storage {
+  private client: S3Client
+  private bucket: string
+  private root: string
+
+  constructor(config: S3Config) {
+    const { endpoint, region, accessKeyId, secretAccessKey, bucket, root } = config
+
+    const usePathStyle = (() => {
+      if (!endpoint) return false
+
+      try {
+        const { hostname } = new URL(endpoint)
+
+        if (hostname === 'localhost' || net.isIP(hostname) !== 0) {
+          return true
+        }
+
+        const isInWhiteList = VIRTUAL_HOST_SUFFIXES.some((suffix) => hostname.endsWith(suffix))
+        return !isInWhiteList
+      } catch (e) {
+        Logger.warn('[S3Storage] Failed to parse endpoint, fallback to Path-Style:', endpoint, e)
+        return true
+      }
+    })()
+
+    this.client = new S3Client({
+      region,
+      endpoint: endpoint || undefined,
+      credentials: {
+        accessKeyId: accessKeyId,
+        secretAccessKey: secretAccessKey
+      },
+      forcePathStyle: usePathStyle
+    })
+
+    this.bucket = bucket
+    this.root = root?.replace(/^\/+/g, '').replace(/\/+$/g, '') || ''
+
+    this.putFileContents = this.putFileContents.bind(this)
+    this.getFileContents = this.getFileContents.bind(this)
+    this.deleteFile = this.deleteFile.bind(this)
+    this.listFiles = this.listFiles.bind(this)
+    this.checkConnection = this.checkConnection.bind(this)
+  }
+
+  /**
+   * 内部辅助方法，用来拼接带 root 的对象 key
+   */
+  private buildKey(key: string): string {
+    if (!this.root) return key
+    return key.startsWith(`${this.root}/`) ? key : `${this.root}/${key}`
+  }
+
+  async putFileContents(key: string, data: Buffer | string) {
+    try {
+      const contentType = key.endsWith('.zip') ? 'application/zip' : 'application/octet-stream'
+
+      return await this.client.send(
+        new PutObjectCommand({
+          Bucket: this.bucket,
+          Key: this.buildKey(key),
+          Body: data,
+          ContentType: contentType
+        })
+      )
+    } catch (error) {
+      Logger.error('[S3Storage] Error putting object:', error)
+      throw error
+    }
+  }
+
+  async getFileContents(key: string): Promise<Buffer> {
+    try {
+      const res = await this.client.send(new GetObjectCommand({ Bucket: this.bucket, Key: this.buildKey(key) }))
+      if (!res.Body || !(res.Body instanceof Readable)) {
+        throw new Error('Empty body received from S3')
+      }
+      return await streamToBuffer(res.Body as Readable)
+    } catch (error) {
+      Logger.error('[S3Storage] Error getting object:', error)
+      throw error
+    }
+  }
+
+  async deleteFile(key: string) {
+    try {
+      const keyWithRoot = this.buildKey(key)
+      const variations = new Set([keyWithRoot, key.replace(/^\//, '')])
+      for (const k of variations) {
+        try {
+          await this.client.send(new DeleteObjectCommand({ Bucket: this.bucket, Key: k }))
+        } catch {
+          // 忽略删除失败
+        }
+      }
+    } catch (error) {
+      Logger.error('[S3Storage] Error deleting object:', error)
+      throw error
+    }
+  }
+
+  /**
+   * 列举指定前缀下的对象，默认列举全部。
+   */
+  async listFiles(prefix = ''): Promise<Array<{ key: string; lastModified?: string; size: number }>> {
+    const files: Array<{ key: string; lastModified?: string; size: number }> = []
+    let continuationToken: string | undefined
+    const fullPrefix = this.buildKey(prefix)
+
+    try {
+      do {
+        const res = await this.client.send(
+          new ListObjectsV2Command({
+            Bucket: this.bucket,
+            Prefix: fullPrefix === '' ? undefined : fullPrefix,
+            ContinuationToken: continuationToken
+          })
+        )
+
+        res.Contents?.forEach((obj) => {
+          if (!obj.Key) return
+          files.push({
+            key: obj.Key,
+            lastModified: obj.LastModified?.toISOString(),
+            size: obj.Size ?? 0
+          })
+        })
+
+        continuationToken = res.IsTruncated ? res.NextContinuationToken : undefined
+      } while (continuationToken)
+
+      return files
+    } catch (error) {
+      Logger.error('[S3Storage] Error listing objects:', error)
+      throw error
+    }
+  }
+
+  /**
+   * 尝试调用 HeadBucket 判断凭证/网络是否可用
+   */
+  async checkConnection() {
+    try {
+      await this.client.send(new HeadBucketCommand({ Bucket: this.bucket }))
+      return true
+    } catch (error) {
+      Logger.error('[S3Storage] Error checking connection:', error)
+      throw error
+    }
+  }
+}
--- a/src/main/services/SelectionService.ts
+++ b/src/main/services/SelectionService.ts
@ -141,7 +141,7 @@ export class SelectionService {
   * Initialize zoom factor from config and subscribe to changes
   * Ensures UI elements scale properly with system DPI settings
   */
-  private initZoomFactor() {
+  private initZoomFactor(): void {
    const zoomFactor = configManager.getZoomFactor()
    if (zoomFactor) {
      this.setZoomFactor(zoomFactor)
@ -154,7 +154,7 @@ export class SelectionService {
    this.zoomFactor = zoomFactor
  }

-  private initConfig() {
+  private initConfig(): void {
    this.triggerMode = configManager.getSelectionAssistantTriggerMode() as TriggerMode
    this.isFollowToolbar = configManager.getSelectionAssistantFollowToolbar()
    this.isRemeberWinSize = configManager.getSelectionAssistantRemeberWinSize()
@ -207,7 +207,7 @@ export class SelectionService {
   * @param mode - The mode to set, either 'default', 'whitelist', or 'blacklist'
   * @param list - An array of strings representing the list of items to include or exclude
   */
-  private setHookGlobalFilterMode(mode: string, list: string[]) {
+  private setHookGlobalFilterMode(mode: string, list: string[]): void {
    if (!this.selectionHook) return

    const modeMap = {
@ -245,7 +245,7 @@ export class SelectionService {
    }
  }

-  private setHookFineTunedList() {
+  private setHookFineTunedList(): void {
    if (!this.selectionHook) return

    const excludeClipboardCursorDetectList = isWin
@ -271,6 +271,11 @@ export class SelectionService {
   * @returns {boolean} Success status of service start
   */
  public start(): boolean {
+    if (!isSupportedOS) {
+      this.logError(new Error('SelectionService start(): not supported on this OS'))
+      return false
+    }
+
    if (!this.selectionHook) {
      this.logError(new Error('SelectionService start(): instance is null'))
      return false
@ -373,7 +378,7 @@ export class SelectionService {
   * Toggle the enabled state of the selection service
   * Will sync the new enabled store to all renderer windows
   */
-  public toggleEnabled(enabled: boolean | undefined = undefined) {
+  public toggleEnabled(enabled: boolean | undefined = undefined): void {
    if (!this.selectionHook) return

    const newEnabled = enabled === undefined ? !configManager.getSelectionAssistantEnabled() : enabled
@ -389,7 +394,7 @@ export class SelectionService {
   * Sets up window properties, event handlers, and loads the toolbar UI
   * @param readyCallback Optional callback when window is ready to show
   */
-  private createToolbarWindow(readyCallback?: () => void) {
+  private createToolbarWindow(readyCallback?: () => void): void {
    if (this.isToolbarAlive()) return

    const { toolbarWidth, toolbarHeight } = this.getToolbarRealSize()
@ -414,9 +419,11 @@ export class SelectionService {
      backgroundMaterial: 'none',

      // Platform specific settings
-      //   [macOS] DO NOT set type to 'panel', it will not work because it conflicts with other settings
      //   [macOS] DO NOT set focusable to false, it will make other windows bring to front together
-      ...(isWin ? { type: 'toolbar', focusable: false } : {}),
+      //   [macOS] `panel` conflicts with other settings ,
+      //           and log will show `NSWindow does not support nonactivating panel styleMask 0x80`
+      //           but it seems still work on fullscreen apps, so we set this anyway
+      ...(isWin ? { type: 'toolbar', focusable: false } : { type: 'panel' }),
      hiddenInMissionControl: true, // [macOS only]
      acceptFirstMouse: true, // [macOS only]

@ -447,13 +454,6 @@ export class SelectionService {
    // Add show/hide event listeners
    this.toolbarWindow.on('show', () => {
      this.toolbarWindow?.webContents.send(IpcChannel.Selection_ToolbarVisibilityChange, true)
-
-      // [macOS] force the toolbar window to be visible on current desktop
-      // but it will make docker icon flash. And we found that it's not necessary now.
-      // will remove after testing
-      // if (isMac) {
-      //   this.toolbarWindow!.setVisibleOnAllWorkspaces(false)
-      // }
    })

    this.toolbarWindow.on('hide', () => {
@ -485,10 +485,10 @@ export class SelectionService {
   * @param point Reference point for positioning, logical coordinates
   * @param orientation Preferred position relative to reference point
   */
-  private showToolbarAtPosition(point: Point, orientation: RelativeOrientation) {
+  private showToolbarAtPosition(point: Point, orientation: RelativeOrientation, programName: string): void {
    if (!this.isToolbarAlive()) {
      this.createToolbarWindow(() => {
-        this.showToolbarAtPosition(point, orientation)
+        this.showToolbarAtPosition(point, orientation, programName)
      })
      return
    }
@ -509,16 +509,45 @@ export class SelectionService {
    //should set every time the window is shown
    this.toolbarWindow!.setAlwaysOnTop(true, 'screen-saver')

-    // [macOS] force the toolbar window to be visible on current desktop
-    // but it will make docker icon flash. And we found that it's not necessary now.
-    // will remove after testing
-    // if (isMac) {
-    //   this.toolbarWindow!.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true })
-    // }
+    // [macOS] a series of hacky ways only for macOS
+    if (isMac) {
+      // [macOS] a hacky way
+      // when set `skipTransformProcessType: true`, if the selection is in self app, it will make the selection canceled after toolbar showing
+      // so we just don't set `skipTransformProcessType: true` when in self app
+      const isSelf = ['com.github.Electron', 'com.kangfenmao.CherryStudio'].includes(programName)

-    // [macOS] MUST use `showInactive()` to prevent other windows bring to front together
-    // [Windows] is OK for both `show()` and `showInactive()` because of `focusable: false`
-    this.toolbarWindow!.showInactive()
+      if (!isSelf) {
+        // [macOS] an ugly hacky way
+        // `focusable: true` will make mainWindow disappeared when `setVisibleOnAllWorkspaces`
+        // so we set `focusable: true` before showing, and then set false after showing
+        this.toolbarWindow!.setFocusable(false)
+
+        // [macOS]
+        // force `setVisibleOnAllWorkspaces: true` to let toolbar show in all workspaces. And we MUST not set it to false again
+        // set `skipTransformProcessType: true` to avoid dock icon spinning when `setVisibleOnAllWorkspaces`
+        this.toolbarWindow!.setVisibleOnAllWorkspaces(true, {
+          visibleOnFullScreen: true,
+          skipTransformProcessType: true
+        })
+      }
+
+      // [macOS] MUST use `showInactive()` to prevent other windows bring to front together
+      // [Windows] is OK for both `show()` and `showInactive()` because of `focusable: false`
+      this.toolbarWindow!.showInactive()
+
+      // [macOS] restore the focusable status
+      this.toolbarWindow!.setFocusable(true)
+
+      this.startHideByMouseKeyListener()
+
+      return
+    }
+
+    /**
+     * The following is for Windows
+     */
+
+    this.toolbarWindow!.show()

    /**
     * [Windows]
@ -588,8 +617,8 @@ export class SelectionService {
   * Check if toolbar window exists and is not destroyed
   * @returns {boolean} Toolbar window status
   */
-  private isToolbarAlive() {
-    return this.toolbarWindow && !this.toolbarWindow.isDestroyed()
+  private isToolbarAlive(): boolean {
+    return !!(this.toolbarWindow && !this.toolbarWindow.isDestroyed())
  }

  /**
@ -598,7 +627,7 @@ export class SelectionService {
   * @param width New toolbar width
   * @param height New toolbar height
   */
-  public determineToolbarSize(width: number, height: number) {
+  public determineToolbarSize(width: number, height: number): void {
    const toolbarWidth = Math.ceil(width)

    // only update toolbar width if it's changed
@ -611,7 +640,7 @@ export class SelectionService {
   * Get actual toolbar dimensions accounting for zoom factor
   * @returns Object containing toolbar width and height
   */
-  private getToolbarRealSize() {
+  private getToolbarRealSize(): { toolbarWidth: number; toolbarHeight: number } {
    return {
      toolbarWidth: this.TOOLBAR_WIDTH * this.zoomFactor,
      toolbarHeight: this.TOOLBAR_HEIGHT * this.zoomFactor
@ -882,8 +911,8 @@ export class SelectionService {
      refPoint = { x: Math.round(refPoint.x), y: Math.round(refPoint.y) }
    }

-    this.showToolbarAtPosition(refPoint, refOrientation)
-    this.toolbarWindow?.webContents.send(IpcChannel.Selection_TextSelected, selectionData)
+    this.showToolbarAtPosition(refPoint, refOrientation, selectionData.programName)
+    this.toolbarWindow!.webContents.send(IpcChannel.Selection_TextSelected, selectionData)
  }

  /**
@ -891,7 +920,7 @@ export class SelectionService {
   */

  // Start monitoring global mouse clicks
-  private startHideByMouseKeyListener() {
+  private startHideByMouseKeyListener(): void {
    try {
      // Register event handlers
      this.selectionHook!.on('mouse-down', this.handleMouseDownHide)
@ -904,7 +933,7 @@ export class SelectionService {
  }

  // Stop monitoring global mouse clicks
-  private stopHideByMouseKeyListener() {
+  private stopHideByMouseKeyListener(): void {
    if (!this.isHideByMouseKeyListenerActive) return

    try {
@ -1098,7 +1127,7 @@ export class SelectionService {
   * Initialize preloaded action windows
   * Creates a pool of windows at startup for faster response
   */
-  private async initPreloadedActionWindows() {
+  private async initPreloadedActionWindows(): Promise<void> {
    try {
      // Create initial pool of preloaded windows
      for (let i = 0; i < this.PRELOAD_ACTION_WINDOW_COUNT; i++) {
@ -1112,7 +1141,7 @@ export class SelectionService {
  /**
   * Close all preloaded action windows
   */
-  private closePreloadedActionWindows() {
+  private closePreloadedActionWindows(): void {
    for (const actionWindow of this.preloadedActionWindows) {
      if (!actionWindow.isDestroyed()) {
        actionWindow.destroy()
@ -1124,7 +1153,7 @@ export class SelectionService {
   * Preload a new action window asynchronously
   * This method is called after popping a window to ensure we always have windows ready
   */
-  private async pushNewActionWindow() {
+  private async pushNewActionWindow(): Promise<void> {
    try {
      const actionWindow = this.createPreloadedActionWindow()
      this.preloadedActionWindows.push(actionWindow)
@ -1138,7 +1167,7 @@ export class SelectionService {
   * Immediately returns a window and asynchronously creates a new one
   * @returns {BrowserWindow} The action window
   */
-  private popActionWindow() {
+  private popActionWindow(): BrowserWindow {
    // Get a window from the preloaded queue or create a new one if empty
    const actionWindow = this.preloadedActionWindows.pop() || this.createPreloadedActionWindow()

@ -1202,7 +1231,7 @@ export class SelectionService {
   * Ensures window stays within screen boundaries
   * @param actionWindow Window to position and show
   */
-  private showActionWindow(actionWindow: BrowserWindow) {
+  private showActionWindow(actionWindow: BrowserWindow): void {
    let actionWindowWidth = this.ACTION_WINDOW_WIDTH
    let actionWindowHeight = this.ACTION_WINDOW_HEIGHT

@ -1228,6 +1257,7 @@ export class SelectionService {
      })

      actionWindow.show()
+
      return
    }

@ -1292,38 +1322,40 @@ export class SelectionService {
   * Switches between selection-based and alt-key based triggering
   * Manages appropriate event listeners for each mode
   */
-  private processTriggerMode() {
+  private processTriggerMode(): void {
+    if (!this.selectionHook) return
+
    switch (this.triggerMode) {
      case TriggerMode.Selected:
        if (this.isCtrlkeyListenerActive) {
-          this.selectionHook!.off('key-down', this.handleKeyDownCtrlkeyMode)
-          this.selectionHook!.off('key-up', this.handleKeyUpCtrlkeyMode)
+          this.selectionHook.off('key-down', this.handleKeyDownCtrlkeyMode)
+          this.selectionHook.off('key-up', this.handleKeyUpCtrlkeyMode)

          this.isCtrlkeyListenerActive = false
        }

-        this.selectionHook!.setSelectionPassiveMode(false)
+        this.selectionHook.setSelectionPassiveMode(false)
        break
      case TriggerMode.Ctrlkey:
        if (!this.isCtrlkeyListenerActive) {
-          this.selectionHook!.on('key-down', this.handleKeyDownCtrlkeyMode)
-          this.selectionHook!.on('key-up', this.handleKeyUpCtrlkeyMode)
+          this.selectionHook.on('key-down', this.handleKeyDownCtrlkeyMode)
+          this.selectionHook.on('key-up', this.handleKeyUpCtrlkeyMode)

          this.isCtrlkeyListenerActive = true
        }

-        this.selectionHook!.setSelectionPassiveMode(true)
+        this.selectionHook.setSelectionPassiveMode(true)
        break
      case TriggerMode.Shortcut:
        //remove the ctrlkey listener, don't need any key listener for shortcut mode
        if (this.isCtrlkeyListenerActive) {
-          this.selectionHook!.off('key-down', this.handleKeyDownCtrlkeyMode)
-          this.selectionHook!.off('key-up', this.handleKeyUpCtrlkeyMode)
+          this.selectionHook.off('key-down', this.handleKeyDownCtrlkeyMode)
+          this.selectionHook.off('key-up', this.handleKeyUpCtrlkeyMode)

          this.isCtrlkeyListenerActive = false
        }

-        this.selectionHook!.setSelectionPassiveMode(true)
+        this.selectionHook.setSelectionPassiveMode(true)
        break
    }
  }
@ -1404,13 +1436,13 @@ export class SelectionService {
    this.isIpcHandlerRegistered = true
  }

-  private logInfo(message: string, forceShow: boolean = false) {
+  private logInfo(message: string, forceShow: boolean = false): void {
    if (isDev || forceShow) {
      Logger.info('[SelectionService] Info: ', message)
    }
  }

-  private logError(...args: [...string[], Error]) {
+  private logError(...args: [...string[], Error]): void {
    Logger.error('[SelectionService] Error: ', ...args)
  }
 }
@ -1423,7 +1455,7 @@ export class SelectionService {
 export function initSelectionService(): boolean {
  if (!isSupportedOS) return false

-  configManager.subscribe(ConfigKeys.SelectionAssistantEnabled, (enabled: boolean) => {
+  configManager.subscribe(ConfigKeys.SelectionAssistantEnabled, (enabled: boolean): void => {
    //avoid closure
    const ss = SelectionService.getInstance()
    if (!ss) {
--- a/src/main/services/ThemeService.ts
+++ b/src/main/services/ThemeService.ts
@ -1,48 +1,48 @@
-import { IpcChannel } from '@shared/IpcChannel'
-import { ThemeMode } from '@types'
-import { BrowserWindow, nativeTheme } from 'electron'
-
-import { titleBarOverlayDark, titleBarOverlayLight } from '../config'
-import { configManager } from './ConfigManager'
-
-class ThemeService {
-  private theme: ThemeMode = ThemeMode.system
-  constructor() {
-    this.theme = configManager.getTheme()
-
-    if (this.theme === ThemeMode.dark || this.theme === ThemeMode.light || this.theme === ThemeMode.system) {
-      nativeTheme.themeSource = this.theme
-    } else {
-      // 兼容旧版本
-      configManager.setTheme(ThemeMode.system)
-      nativeTheme.themeSource = ThemeMode.system
-    }
-    nativeTheme.on('updated', this.themeUpdatadHandler.bind(this))
-  }
-
-  themeUpdatadHandler() {
-    BrowserWindow.getAllWindows().forEach((win) => {
-      if (win && !win.isDestroyed() && win.setTitleBarOverlay) {
-        try {
-          win.setTitleBarOverlay(nativeTheme.shouldUseDarkColors ? titleBarOverlayDark : titleBarOverlayLight)
-        } catch (error) {
-          // don't throw error if setTitleBarOverlay failed
-          // Because it may be called with some windows have some title bar
-        }
-      }
-      win.webContents.send(IpcChannel.ThemeUpdated, nativeTheme.shouldUseDarkColors ? ThemeMode.dark : ThemeMode.light)
-    })
-  }
-
-  setTheme(theme: ThemeMode) {
-    if (theme === this.theme) {
-      return
-    }
-
-    this.theme = theme
-    nativeTheme.themeSource = theme
-    configManager.setTheme(theme)
-  }
-}
-
-export const themeService = new ThemeService()
+import { IpcChannel } from '@shared/IpcChannel'
+import { ThemeMode } from '@types'
+import { BrowserWindow, nativeTheme } from 'electron'
+
+import { titleBarOverlayDark, titleBarOverlayLight } from '../config'
+import { configManager } from './ConfigManager'
+
+class ThemeService {
+  private theme: ThemeMode = ThemeMode.system
+  constructor() {
+    this.theme = configManager.getTheme()
+
+    if (this.theme === ThemeMode.dark || this.theme === ThemeMode.light || this.theme === ThemeMode.system) {
+      nativeTheme.themeSource = this.theme
+    } else {
+      // 兼容旧版本
+      configManager.setTheme(ThemeMode.system)
+      nativeTheme.themeSource = ThemeMode.system
+    }
+    nativeTheme.on('updated', this.themeUpdatadHandler.bind(this))
+  }
+
+  themeUpdatadHandler() {
+    BrowserWindow.getAllWindows().forEach((win) => {
+      if (win && !win.isDestroyed() && win.setTitleBarOverlay) {
+        try {
+          win.setTitleBarOverlay(nativeTheme.shouldUseDarkColors ? titleBarOverlayDark : titleBarOverlayLight)
+        } catch (error) {
+          // don't throw error if setTitleBarOverlay failed
+          // Because it may be called with some windows have some title bar
+        }
+      }
+      win.webContents.send(IpcChannel.ThemeUpdated, nativeTheme.shouldUseDarkColors ? ThemeMode.dark : ThemeMode.light)
+    })
+  }
+
+  setTheme(theme: ThemeMode) {
+    if (theme === this.theme) {
+      return
+    }
+
+    this.theme = theme
+    nativeTheme.themeSource = theme
+    configManager.setTheme(theme)
+  }
+}
+
+export const themeService = new ThemeService()
--- a/src/main/services/WindowService.ts
+++ b/src/main/services/WindowService.ts
@ -41,8 +41,8 @@ export class WindowService {
    }

    const mainWindowState = windowStateKeeper({
-      defaultWidth: 1080,
-      defaultHeight: 670,
+      defaultWidth: 960,
+      defaultHeight: 600,
      fullScreen: false,
      maximize: false
    })
@ -52,7 +52,7 @@ export class WindowService {
      y: mainWindowState.y,
      width: mainWindowState.width,
      height: mainWindowState.height,
-      minWidth: 1080,
+      minWidth: 960,
      minHeight: 600,
      show: false,
      autoHideMenuBar: true,
--- a/src/main/services/urlschema/handle-providers.ts
+++ b/src/main/services/urlschema/handle-providers.ts
@ -1,3 +1,4 @@
+import { isMac } from '@main/constant'
 import Logger from 'electron-log'

 import { windowService } from '../WindowService'
@ -33,8 +34,13 @@ export async function handleProvidersProtocolUrl(url: URL) {
        (await mainWindow.webContents.executeJavaScript(`typeof window.navigate === 'function'`))
      ) {
        mainWindow.webContents.executeJavaScript(`window.navigate('/settings/provider?addProviderData=${data}')`)
+
+        if (isMac) {
+          windowService.showMainWindow()
+        }
      } else {
        setTimeout(() => {
+          Logger.info('handleProvidersProtocolUrl timeout', { data, version })
          handleProvidersProtocolUrl(url)
        }, 1000)
      }
--- a/src/main/utils/tests/file.test.ts
+++ b/src/main/utils/tests/file.test.ts
@ -3,8 +3,10 @@ import os from 'node:os'
 import path from 'node:path'

 import { FileTypes } from '@types'
+import iconv from 'iconv-lite'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'

+import { detectEncoding, readTextFileWithAutoEncoding } from '../file'
 import { getAllFiles, getAppConfigDir, getConfigDir, getFilesDir, getFileType, getTempDir } from '../file'

 // Mock dependencies
@ -241,4 +243,104 @@ describe('file', () => {
      expect(appConfigDir).toBe('/mock/home/.cherrystudio/config/')
    })
  })
+
+  // 在 describe('file') 块内部添加新的 describe 块
+  describe('detectEncoding', () => {
+    const mockFilePath = '/path/to/mock/file.txt'
+
+    beforeEach(() => {
+      vi.mocked(fs.openSync).mockReturnValue(123)
+      vi.mocked(fs.closeSync).mockImplementation(() => {})
+    })
+
+    it('should correctly detect UTF-8 encoding', () => {
+      // 准备UTF-8编码的Buffer
+      const content = '这是UTF-8测试内容'
+      const buffer = Buffer.from(content, 'utf-8')
+
+      // 模拟文件读取
+      vi.mocked(fs.readSync).mockImplementation((_, buf) => {
+        const targetBuffer = new Uint8Array(buf.buffer)
+        const sourceBuffer = new Uint8Array(buffer)
+        targetBuffer.set(sourceBuffer)
+        return 1024
+      })
+
+      const encoding = detectEncoding(mockFilePath)
+      expect(encoding).toBe('UTF-8')
+    })
+
+    it('should correctly detect GB2312 encoding', () => {
+      // 使用iconv创建GB2312编码内容
+      const content = '这是一段GB2312编码的测试内容'
+      const gb2312Buffer = iconv.encode(content, 'GB2312')
+
+      // 模拟文件读取
+      vi.mocked(fs.readSync).mockImplementation((_, buf) => {
+        const targetBuffer = new Uint8Array(buf.buffer)
+        const sourceBuffer = new Uint8Array(gb2312Buffer)
+        targetBuffer.set(sourceBuffer)
+        return gb2312Buffer.length
+      })
+
+      const encoding = detectEncoding(mockFilePath)
+      expect(encoding).toMatch(/GB2312|GB18030/i)
+    })
+
+    it('should correctly detect ASCII encoding', () => {
+      // 准备ASCII编码内容
+      const content = 'ASCII content'
+      const buffer = Buffer.from(content, 'ascii')
+
+      // 模拟文件读取
+      vi.mocked(fs.readSync).mockImplementation((_, buf) => {
+        const targetBuffer = new Uint8Array(buf.buffer)
+        const sourceBuffer = new Uint8Array(buffer)
+        targetBuffer.set(sourceBuffer)
+        return buffer.length
+      })
+
+      const encoding = detectEncoding(mockFilePath)
+      expect(encoding.toLowerCase()).toBe('ascii')
+    })
+  })
+
+  describe('readTextFileWithAutoEncoding', () => {
+    const mockFilePath = '/path/to/mock/file.txt'
+
+    beforeEach(() => {
+      vi.mocked(fs.openSync).mockReturnValue(123)
+      vi.mocked(fs.closeSync).mockImplementation(() => {})
+    })
+
+    it('should read file with auto encoding', () => {
+      const content = '这是一段GB2312编码的测试内容'
+      const buffer = iconv.encode(content, 'GB2312')
+      vi.mocked(fs.readSync).mockImplementation((_, buf) => {
+        const targetBuffer = new Uint8Array(buf.buffer)
+        const sourceBuffer = new Uint8Array(buffer)
+        targetBuffer.set(sourceBuffer)
+        return buffer.length
+      })
+      vi.mocked(fs.readFileSync).mockReturnValue(buffer)
+
+      const result = readTextFileWithAutoEncoding(mockFilePath)
+      expect(result).toBe(content)
+    })
+
+    it('should try to fix bad detected encoding', () => {
+      const content = '这是一段GB2312编码的测试内容'
+      const buffer = iconv.encode(content, 'GB2312')
+      vi.mocked(fs.readSync).mockImplementation((_, buf) => {
+        const targetBuffer = new Uint8Array(buf.buffer)
+        const sourceBuffer = new Uint8Array(buffer)
+        targetBuffer.set(sourceBuffer)
+        return buffer.length
+      })
+      vi.mocked(fs.readFileSync).mockReturnValue(buffer)
+      vi.mocked(vi.fn(detectEncoding)).mockReturnValue('UTF-8')
+      const result = readTextFileWithAutoEncoding(mockFilePath)
+      expect(result).toBe(content)
+    })
+  })
 })
--- a/src/main/utils/file.ts
+++ b/src/main/utils/file.ts
@ -6,6 +6,9 @@ import { isLinux, isPortable } from '@main/constant'
 import { audioExts, documentExts, imageExts, textExts, videoExts } from '@shared/config/constant'
 import { FileMetadata, FileTypes } from '@types'
 import { app } from 'electron'
+import Logger from 'electron-log'
+import iconv from 'iconv-lite'
+import { detect as detectEncoding_, detectAll as detectEncodingAll } from 'jschardet'
 import { v4 as uuidv4 } from 'uuid'

 export function initAppDataDir() {
@ -202,3 +205,57 @@ export function getCacheDir() {
 export function getAppConfigDir(name: string) {
  return path.join(getConfigDir(), name)
 }
+
+/**
+ * 使用 jschardet 库检测文件编码格式
+ * @param filePath - 文件路径
+ * @returns 返回文件的编码格式，如 UTF-8, ascii, GB2312 等
+ */
+export function detectEncoding(filePath: string): string {
+  // 读取文件前1KB来检测编码
+  const buffer = Buffer.alloc(1024)
+  const fd = fs.openSync(filePath, 'r')
+  fs.readSync(fd, buffer, 0, 1024, 0)
+  fs.closeSync(fd)
+  const { encoding } = detectEncoding_(buffer)
+  return encoding
+}
+
+/**
+ * 读取文件内容并自动检测编码格式进行解码
+ * @param filePath - 文件路径
+ * @returns 解码后的文件内容
+ */
+export function readTextFileWithAutoEncoding(filePath: string) {
+  const encoding = detectEncoding(filePath)
+  const data = fs.readFileSync(filePath)
+  const content = iconv.decode(data, encoding)
+
+  if (content.includes('\uFFFD') && encoding !== 'UTF-8') {
+    Logger.error(`文件 ${filePath} 自动识别编码为 ${encoding}，但包含错误字符。尝试其他编码`)
+    const buffer = Buffer.alloc(1024)
+    const fd = fs.openSync(filePath, 'r')
+    fs.readSync(fd, buffer, 0, 1024, 0)
+    fs.closeSync(fd)
+    const encodings = detectEncodingAll(buffer)
+    if (encodings.length > 0) {
+      for (const item of encodings) {
+        if (item.encoding === encoding) {
+          continue
+        }
+        Logger.log(`尝试使用 ${item.encoding} 解码文件 ${filePath}`)
+        const content = iconv.decode(buffer, item.encoding)
+        if (!content.includes('\uFFFD')) {
+          Logger.log(`文件 ${filePath} 解码成功，编码为 ${item.encoding}`)
+          return content
+        } else {
+          Logger.error(`文件 ${filePath} 使用 ${item.encoding} 解码失败，尝试下一个编码`)
+        }
+      }
+    }
+    Logger.error(`文件 ${filePath} 所有可能的编码均解码失败，尝试使用 UTF-8 解码`)
+    return iconv.decode(buffer, 'UTF-8')
+  }
+
+  return content
+}
--- a/src/main/utils/zoom.ts
+++ b/src/main/utils/zoom.ts
@ -1,26 +1,26 @@
-import { BrowserWindow } from 'electron'
-
-import { configManager } from '../services/ConfigManager'
-
-export function handleZoomFactor(wins: BrowserWindow[], delta: number, reset: boolean = false) {
-  if (reset) {
-    wins.forEach((win) => {
-      win.webContents.setZoomFactor(1)
-    })
-    configManager.setZoomFactor(1)
-    return
-  }
-
-  if (delta === 0) {
-    return
-  }
-
-  const currentZoom = configManager.getZoomFactor()
-  const newZoom = Number((currentZoom + delta).toFixed(1))
-  if (newZoom >= 0.5 && newZoom <= 2.0) {
-    wins.forEach((win) => {
-      win.webContents.setZoomFactor(newZoom)
-    })
-    configManager.setZoomFactor(newZoom)
-  }
-}
+import { BrowserWindow } from 'electron'
+
+import { configManager } from '../services/ConfigManager'
+
+export function handleZoomFactor(wins: BrowserWindow[], delta: number, reset: boolean = false) {
+  if (reset) {
+    wins.forEach((win) => {
+      win.webContents.setZoomFactor(1)
+    })
+    configManager.setZoomFactor(1)
+    return
+  }
+
+  if (delta === 0) {
+    return
+  }
+
+  const currentZoom = configManager.getZoomFactor()
+  const newZoom = Number((currentZoom + delta).toFixed(1))
+  if (newZoom >= 0.5 && newZoom <= 2.0) {
+    wins.forEach((win) => {
+      win.webContents.setZoomFactor(newZoom)
+    })
+    configManager.setZoomFactor(newZoom)
+  }
+}
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@ -10,6 +10,7 @@ import {
  KnowledgeItem,
  MCPServer,
  Provider,
+  S3Config,
  Shortcut,
  ThemeMode,
  WebDavConfig
@ -72,9 +73,9 @@ const api = {
    decompress: (text: Buffer) => ipcRenderer.invoke(IpcChannel.Zip_Decompress, text)
  },
  backup: {
-    backup: (fileName: string, data: string, destinationPath?: string, skipBackupFile?: boolean) =>
-      ipcRenderer.invoke(IpcChannel.Backup_Backup, fileName, data, destinationPath, skipBackupFile),
-    restore: (backupPath: string) => ipcRenderer.invoke(IpcChannel.Backup_Restore, backupPath),
+    backup: (filename: string, content: string, path: string, skipBackupFile: boolean) =>
+      ipcRenderer.invoke(IpcChannel.Backup_Backup, filename, content, path, skipBackupFile),
+    restore: (path: string) => ipcRenderer.invoke(IpcChannel.Backup_Restore, path),
    backupToWebdav: (data: string, webdavConfig: WebDavConfig) =>
      ipcRenderer.invoke(IpcChannel.Backup_BackupToWebdav, data, webdavConfig),
    restoreFromWebdav: (webdavConfig: WebDavConfig) =>
@ -86,7 +87,28 @@ 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),
+    backupToLocalDir: (
+      data: string,
+      fileName: string,
+      localConfig: { localBackupDir?: string; skipBackupFile?: boolean }
+    ) => ipcRenderer.invoke(IpcChannel.Backup_BackupToLocalDir, data, fileName, localConfig),
+    restoreFromLocalBackup: (fileName: string, localBackupDir?: string) =>
+      ipcRenderer.invoke(IpcChannel.Backup_RestoreFromLocalBackup, fileName, localBackupDir),
+    listLocalBackupFiles: (localBackupDir?: string) =>
+      ipcRenderer.invoke(IpcChannel.Backup_ListLocalBackupFiles, localBackupDir),
+    deleteLocalBackupFile: (fileName: string, localBackupDir?: string) =>
+      ipcRenderer.invoke(IpcChannel.Backup_DeleteLocalBackupFile, fileName, localBackupDir),
+    setLocalBackupDir: (dirPath: string) => ipcRenderer.invoke(IpcChannel.Backup_SetLocalBackupDir, dirPath),
+    checkWebdavConnection: (webdavConfig: WebDavConfig) =>
+      ipcRenderer.invoke(IpcChannel.Backup_CheckConnection, 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),
@ -206,8 +228,8 @@ const api = {
    restartServer: (server: MCPServer) => ipcRenderer.invoke(IpcChannel.Mcp_RestartServer, server),
    stopServer: (server: MCPServer) => ipcRenderer.invoke(IpcChannel.Mcp_StopServer, server),
    listTools: (server: MCPServer) => ipcRenderer.invoke(IpcChannel.Mcp_ListTools, server),
-    callTool: ({ server, name, args }: { server: MCPServer; name: string; args: any }) =>
-      ipcRenderer.invoke(IpcChannel.Mcp_CallTool, { server, name, args }),
+    callTool: ({ server, name, args, callId }: { server: MCPServer; name: string; args: any; callId?: string }) =>
+      ipcRenderer.invoke(IpcChannel.Mcp_CallTool, { server, name, args, callId }),
    listPrompts: (server: MCPServer) => ipcRenderer.invoke(IpcChannel.Mcp_ListPrompts, server),
    getPrompt: ({ server, name, args }: { server: MCPServer; name: string; args?: Record<string, any> }) =>
      ipcRenderer.invoke(IpcChannel.Mcp_GetPrompt, { server, name, args }),
@ -215,7 +237,9 @@ const api = {
    getResource: ({ server, uri }: { server: MCPServer; uri: string }) =>
      ipcRenderer.invoke(IpcChannel.Mcp_GetResource, { server, uri }),
    getInstallInfo: () => ipcRenderer.invoke(IpcChannel.Mcp_GetInstallInfo),
-    checkMcpConnectivity: (server: any) => ipcRenderer.invoke(IpcChannel.Mcp_CheckConnectivity, server)
+    checkMcpConnectivity: (server: any) => ipcRenderer.invoke(IpcChannel.Mcp_CheckConnectivity, server),
+    abortTool: (callId: string) => ipcRenderer.invoke(IpcChannel.Mcp_AbortTool, callId),
+    setProgress: (progress: number) => ipcRenderer.invoke(IpcChannel.Mcp_SetProgress, progress)
  },
  python: {
    execute: (script: string, context?: Record<string, any>, timeout?: number) =>
@ -290,7 +314,9 @@ const api = {
    minimizeActionWindow: () => ipcRenderer.invoke(IpcChannel.Selection_ActionWindowMinimize),
    pinActionWindow: (isPinned: boolean) => ipcRenderer.invoke(IpcChannel.Selection_ActionWindowPin, isPinned)
  },
-  quoteToMainWindow: (text: string) => ipcRenderer.invoke(IpcChannel.App_QuoteToMain, text)
+  quoteToMainWindow: (text: string) => ipcRenderer.invoke(IpcChannel.App_QuoteToMain, text),
+  setDisableHardwareAcceleration: (isDisable: boolean) =>
+    ipcRenderer.invoke(IpcChannel.App_SetDisableHardwareAcceleration, isDisable)
 }

 // Use `contextBridge` APIs to expose Electron APIs to
--- a/src/renderer/index.html
+++ b/src/renderer/index.html
@ -1,46 +1,45 @@
 <!doctype html>
 <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' 'unsafe-inline' *; 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</title>

-<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' 'unsafe-inline' *; 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</title>
+    <style>
+      html,
+      body {
+        margin: 0;
+      }

-  <style>
-    html,
-    body {
-      margin: 0;
-    }
+      #spinner {
+        position: fixed;
+        width: 100vw;
+        height: 100vh;
+        flex-direction: row;
+        justify-content: center;
+        align-items: center;
+        display: flex;
+      }

-    #spinner {
-      position: fixed;
-      width: 100vw;
-      height: 100vh;
-      flex-direction: row;
-      justify-content: center;
-      align-items: center;
-      display: flex;
-    }
+      #spinner img {
+        width: 100px;
+        border-radius: 50px;
+      }
+    </style>
+  </head>

-    #spinner img {
-      width: 100px;
-      border-radius: 50px;
-    }
-  </style>
-</head>
-
-<body>
-  <div id="root"></div>
-  <div id="spinner">
-    <img src="/src/assets/images/logo.png" />
-  </div>
-  <script>
-    console.time('init')
-  </script>
-  <script type="module" src="/src/init.ts"></script>
-  <script type="module" src="/src/entryPoint.tsx"></script>
-</body>
-
-</html>
+  <body>
+    <div id="root"></div>
+    <div id="spinner">
+      <img src="/src/assets/images/logo.png" />
+    </div>
+    <script>
+      console.time('init')
+    </script>
+    <script type="module" src="/src/init.ts"></script>
+    <script type="module" src="/src/entryPoint.tsx"></script>
+  </body>
+</html>
--- a/src/renderer/miniWindow.html
+++ b/src/renderer/miniWindow.html
@ -1,24 +1,23 @@
 <!doctype html>
 <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</title>

-<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</title>
+    <style>
+      html,
+      body {
+        margin: 0;
+      }
+    </style>
+  </head>

-  <style>
-    html,
-    body {
-      margin: 0;
-    }
-  </style>
-</head>
-
-<body>
-  <div id="root"></div>
-  <script type="module" src="/src/windows/mini/entryPoint.tsx"></script>
-</body>
-
-</html>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/windows/mini/entryPoint.tsx"></script>
+  </body>
+</html>
--- a/src/renderer/selectionAction.html
+++ b/src/renderer/selectionAction.html
@ -1,41 +1,39 @@
 <!doctype html>
 <html lang="zh-CN">
-
-<head>
+  <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:" />
+    <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 Assistant</title>
+  </head>

-</head>
-
-<body>
+  <body>
    <div id="root"></div>
    <script type="module" src="/src/windows/selection/action/entryPoint.tsx"></script>
    <style>
-        html {
-            margin: 0;
-            padding: 0;
-            box-sizing: border-box;
-        }
+      html {
+        margin: 0;
+        padding: 0;
+        box-sizing: border-box;
+      }

-        body {
-            width: 100vw;
-            height: 100vh;
-            margin: 0;
-            padding: 0;
-            box-sizing: border-box;
-        }
+      body {
+        width: 100vw;
+        height: 100vh;
+        margin: 0;
+        padding: 0;
+        box-sizing: border-box;
+      }

-        #root {
-            margin: 0;
-            padding: 0;
-            width: 100%;
-            height: 100%;
-            box-sizing: border-box;
-        }
+      #root {
+        margin: 0;
+        padding: 0;
+        width: 100%;
+        height: 100%;
+        box-sizing: border-box;
+      }
    </style>
-</body>
-
-</html>
+  </body>
+</html>
--- a/src/renderer/selectionToolbar.html
+++ b/src/renderer/selectionToolbar.html
@ -1,46 +1,43 @@
 <!doctype html>
 <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>
+  </head>

-<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>
+  <body>
+    <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;
+      }

-</head>
+      body {
+        margin: 0 !important;
+        padding: 0 !important;
+        overflow: hidden !important;
+        width: 100vw !important;
+        height: 100vh !important;

-<body>
-  <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;
+        -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;
-
-      -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>
+      #root {
+        margin: 0 !important;
+        padding: 0 !important;
+        width: max-content !important;
+        height: fit-content !important;
+      }
+    </style>
+  </body>
+</html>
--- a/src/renderer/src/aiCore/clients/ApiClientFactory.ts
+++ b/src/renderer/src/aiCore/clients/ApiClientFactory.ts
@ -47,10 +47,9 @@ export class ApiClientFactory {
    // 然后检查标准的provider type
    switch (provider.type) {
      case 'openai':
-      case 'azure-openai':
-        console.log(`[ApiClientFactory] Creating OpenAIApiClient for provider: ${provider.id}`)
        instance = new OpenAIAPIClient(provider) as BaseApiClient
        break
+      case 'azure-openai':
      case 'openai-response':
        instance = new OpenAIResponseAPIClient(provider) as BaseApiClient
        break
--- a/src/renderer/src/aiCore/clients/NewAPIClient.ts
+++ b/src/renderer/src/aiCore/clients/NewAPIClient.ts
@ -106,7 +106,7 @@ export class NewAPIClient extends BaseApiClient {
      return client
    }

-    if (model.endpoint_type === 'openai') {
+    if (model.endpoint_type === 'openai' || model.endpoint_type === 'image-generation') {
      const client = this.clients.get('openai')
      if (!client || !this.isValidClient(client)) {
        throw new Error('Failed to get openai client')
--- a/src/renderer/src/aiCore/clients/anthropic/AnthropicAPIClient.ts
+++ b/src/renderer/src/aiCore/clients/anthropic/AnthropicAPIClient.ts
@ -49,7 +49,9 @@ import {
  LLMWebSearchCompleteChunk,
  LLMWebSearchInProgressChunk,
  MCPToolCreatedChunk,
+  TextCompleteChunk,
  TextDeltaChunk,
+  ThinkingCompleteChunk,
  ThinkingDeltaChunk
 } from '@renderer/types/chunk'
 import { type Message } from '@renderer/types/newMessage'
@ -517,7 +519,7 @@ export class AnthropicAPIClient extends BaseApiClient<
    return () => {
      let accumulatedJson = ''
      const toolCalls: Record<number, ToolUseBlock> = {}
-
+      const ChunkIdTypeMap: Record<number, ChunkType> = {}
      return {
        async transform(rawChunk: AnthropicSdkRawChunk, controller: TransformStreamDefaultController<GenericChunk>) {
          switch (rawChunk.type) {
@ -612,6 +614,19 @@ export class AnthropicAPIClient extends BaseApiClient<
                  toolCalls[rawChunk.index] = contentBlock
                  break
                }
+                case 'text': {
+                  if (!ChunkIdTypeMap[rawChunk.index]) {
+                    ChunkIdTypeMap[rawChunk.index] = ChunkType.TEXT_DELTA // 用textdelta代表文本块
+                  }
+                  break
+                }
+                case 'thinking':
+                case 'redacted_thinking': {
+                  if (!ChunkIdTypeMap[rawChunk.index]) {
+                    ChunkIdTypeMap[rawChunk.index] = ChunkType.THINKING_DELTA // 用thinkingdelta代表思考块
+                  }
+                  break
+                }
              }
              break
            }
@ -646,6 +661,15 @@ export class AnthropicAPIClient extends BaseApiClient<
              break
            }
            case 'content_block_stop': {
+              if (ChunkIdTypeMap[rawChunk.index] === ChunkType.TEXT_DELTA) {
+                controller.enqueue({
+                  type: ChunkType.TEXT_COMPLETE
+                } as TextCompleteChunk)
+              } else if (ChunkIdTypeMap[rawChunk.index] === ChunkType.THINKING_DELTA) {
+                controller.enqueue({
+                  type: ChunkType.THINKING_COMPLETE
+                } as ThinkingCompleteChunk)
+              }
              const toolCall = toolCalls[rawChunk.index]
              if (toolCall) {
                try {
--- a/src/renderer/src/aiCore/clients/openai/OpenAIApiClient.ts
+++ b/src/renderer/src/aiCore/clients/openai/OpenAIApiClient.ts
@ -564,11 +564,11 @@ export class OpenAIAPIClient extends OpenAIBaseClient<

      // Perplexity citations
      // @ts-ignore - citations may not be in standard type definitions
-      if (context.provider?.id === 'perplexity' && chunk.citations && chunk.citations.length > 0) {
+      if (context.provider?.id === 'perplexity' && chunk.search_results && chunk.search_results.length > 0) {
        hasBeenCollectedWebSearch = true
        return {
          // @ts-ignore - citations may not be in standard type definitions
-          results: chunk.citations,
+          results: chunk.search_results,
          source: WebSearchSource.PERPLEXITY
        }
      }
@ -672,74 +672,21 @@ export class OpenAIAPIClient extends OpenAIBaseClient<

        // 处理chunk
        if ('choices' in chunk && chunk.choices && chunk.choices.length > 0) {
-          const choice = chunk.choices[0]
+          for (const choice of chunk.choices) {
+            if (!choice) continue

-          if (!choice) return
-
-          // 对于流式响应，使用 delta；对于非流式响应，使用 message。
-          // 然而某些 OpenAI 兼容平台在非流式请求时会错误地返回一个空对象的 delta 字段。
-          // 如果 delta 为空对象，应当忽略它并回退到 message，避免造成内容缺失。
-          let contentSource: OpenAISdkRawContentSource | null = null
-          if ('delta' in choice && choice.delta && Object.keys(choice.delta).length > 0) {
-            contentSource = choice.delta
-          } else if ('message' in choice) {
-            contentSource = choice.message
-          }
-
-          if (!contentSource) return
-
-          const webSearchData = collectWebSearchData(chunk, contentSource, context)
-          if (webSearchData) {
-            controller.enqueue({
-              type: ChunkType.LLM_WEB_SEARCH_COMPLETE,
-              llm_web_search: webSearchData
-            })
-          }
-
-          // 处理推理内容 (e.g. from OpenRouter DeepSeek-R1)
-          // @ts-ignore - reasoning_content is not in standard OpenAI types but some providers use it
-          const reasoningText = contentSource.reasoning_content || contentSource.reasoning
-          if (reasoningText) {
-            controller.enqueue({
-              type: ChunkType.THINKING_DELTA,
-              text: reasoningText
-            })
-          }
-
-          // 处理文本内容
-          if (contentSource.content) {
-            controller.enqueue({
-              type: ChunkType.TEXT_DELTA,
-              text: contentSource.content
-            })
-          }
-
-          // 处理工具调用
-          if (contentSource.tool_calls) {
-            for (const toolCall of contentSource.tool_calls) {
-              if ('index' in toolCall) {
-                const { id, index, function: fun } = toolCall
-                if (fun?.name) {
-                  toolCalls[index] = {
-                    id: id || '',
-                    function: {
-                      name: fun.name,
-                      arguments: fun.arguments || ''
-                    },
-                    type: 'function'
-                  }
-                } else if (fun?.arguments) {
-                  toolCalls[index].function.arguments += fun.arguments
-                }
-              } else {
-                toolCalls.push(toolCall)
-              }
+            // 对于流式响应，使用 delta；对于非流式响应，使用 message。
+            // 然而某些 OpenAI 兼容平台在非流式请求时会错误地返回一个空对象的 delta 字段。
+            // 如果 delta 为空对象，应当忽略它并回退到 message，避免造成内容缺失。
+            let contentSource: OpenAISdkRawContentSource | null = null
+            if ('delta' in choice && choice.delta && Object.keys(choice.delta).length > 0) {
+              contentSource = choice.delta
+            } else if ('message' in choice) {
+              contentSource = choice.message
            }
-          }

-          // 处理finish_reason，发送流结束信号
-          if ('finish_reason' in choice && choice.finish_reason) {
-            Logger.debug(`[OpenAIApiClient] Stream finished with reason: ${choice.finish_reason}`)
+            if (!contentSource) continue
+
            const webSearchData = collectWebSearchData(chunk, contentSource, context)
            if (webSearchData) {
              controller.enqueue({
@ -747,7 +694,60 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
                llm_web_search: webSearchData
              })
            }
-            emitCompletionSignals(controller)
+
+            // 处理推理内容 (e.g. from OpenRouter DeepSeek-R1)
+            // @ts-ignore - reasoning_content is not in standard OpenAI types but some providers use it
+            const reasoningText = contentSource.reasoning_content || contentSource.reasoning
+            if (reasoningText) {
+              controller.enqueue({
+                type: ChunkType.THINKING_DELTA,
+                text: reasoningText
+              })
+            }
+
+            // 处理文本内容
+            if (contentSource.content) {
+              controller.enqueue({
+                type: ChunkType.TEXT_DELTA,
+                text: contentSource.content
+              })
+            }
+
+            // 处理工具调用
+            if (contentSource.tool_calls) {
+              for (const toolCall of contentSource.tool_calls) {
+                if ('index' in toolCall) {
+                  const { id, index, function: fun } = toolCall
+                  if (fun?.name) {
+                    toolCalls[index] = {
+                      id: id || '',
+                      function: {
+                        name: fun.name,
+                        arguments: fun.arguments || ''
+                      },
+                      type: 'function'
+                    }
+                  } else if (fun?.arguments) {
+                    toolCalls[index].function.arguments += fun.arguments
+                  }
+                } else {
+                  toolCalls.push(toolCall)
+                }
+              }
+            }
+
+            // 处理finish_reason，发送流结束信号
+            if ('finish_reason' in choice && choice.finish_reason) {
+              Logger.debug(`[OpenAIApiClient] Stream finished with reason: ${choice.finish_reason}`)
+              const webSearchData = collectWebSearchData(chunk, contentSource, context)
+              if (webSearchData) {
+                controller.enqueue({
+                  type: ChunkType.LLM_WEB_SEARCH_COMPLETE,
+                  llm_web_search: webSearchData
+                })
+              }
+              emitCompletionSignals(controller)
+            }
          }
        }
      },
--- a/src/renderer/src/aiCore/clients/openai/OpenAIResponseAPIClient.ts
+++ b/src/renderer/src/aiCore/clients/openai/OpenAIResponseAPIClient.ts
@ -2,6 +2,7 @@ import { GenericChunk } from '@renderer/aiCore/middleware/schemas'
 import { CompletionsContext } from '@renderer/aiCore/middleware/types'
 import {
  isOpenAIChatCompletionOnlyModel,
+  isOpenAILLMModel,
  isSupportedReasoningEffortOpenAIModel,
  isVisionModel
 } from '@renderer/config/models'
@ -64,10 +65,10 @@ export class OpenAIResponseAPIClient extends OpenAIBaseClient<
   * 根据模型特征选择合适的客户端
   */
  public getClient(model: Model) {
-    if (isOpenAIChatCompletionOnlyModel(model)) {
-      return this.client
-    } else {
+    if (isOpenAILLMModel(model) && !isOpenAIChatCompletionOnlyModel(model)) {
      return this
+    } else {
+      return this.client
    }
  }

@ -492,6 +493,10 @@ export class OpenAIResponseAPIClient extends OpenAIBaseClient<
            case 'response.output_item.added':
              if (chunk.item.type === 'function_call') {
                outputItems.push(chunk.item)
+              } else if (chunk.item.type === 'web_search_call') {
+                controller.enqueue({
+                  type: ChunkType.LLM_WEB_SEARCH_IN_PROGRESS
+                })
              }
              break
            case 'response.reasoning_summary_part.added':
--- a/src/renderer/src/aiCore/middleware/common/AbortHandlerMiddleware.ts
+++ b/src/renderer/src/aiCore/middleware/common/AbortHandlerMiddleware.ts
@ -67,7 +67,12 @@ export const AbortHandlerMiddleware: CompletionsMiddleware =
    const streamWithAbortHandler = (result.stream as ReadableStream<Chunk>).pipeThrough(
      new TransformStream<Chunk, Chunk | ErrorChunk>({
        transform(chunk, controller) {
-          // 检查 abort 状态
+          // 如果已经收到错误块，不再检查 abort 状态
+          if (chunk.type === ChunkType.ERROR) {
+            controller.enqueue(chunk)
+            return
+          }
+
          if (abortSignal?.aborted) {
            // 转换为 ErrorChunk
            const errorChunk: ErrorChunk = {
--- a/src/renderer/src/aiCore/middleware/common/FinalChunkConsumerMiddleware.ts
+++ b/src/renderer/src/aiCore/middleware/common/FinalChunkConsumerMiddleware.ts
@ -136,7 +136,6 @@ function extractAndAccumulateUsageMetrics(ctx: CompletionsContext, chunk: Generi
      Logger.debug(`[${MIDDLEWARE_NAME}] First token timestamp: ${ctx._internal.customState.firstTokenTimestamp}`)
    }
    if (chunk.type === ChunkType.LLM_RESPONSE_COMPLETE) {
-      Logger.debug(`[${MIDDLEWARE_NAME}] LLM_RESPONSE_COMPLETE chunk received:`, ctx._internal)
      // 从LLM_RESPONSE_COMPLETE chunk中提取usage数据
      if (chunk.response?.usage) {
        accumulateUsage(ctx._internal.observer.usage, chunk.response.usage)
--- a/src/renderer/src/aiCore/middleware/core/McpToolChunkMiddleware.ts
+++ b/src/renderer/src/aiCore/middleware/core/McpToolChunkMiddleware.ts
@ -89,6 +89,11 @@ function createToolHandlingTransform(
  let hasToolUseResponses = false
  let streamEnded = false

+  // 存储已执行的工具结果
+  const executedToolResults: SdkMessageParam[] = []
+  const executedToolCalls: SdkToolCall[] = []
+  const executionPromises: Promise<void>[] = []
+
  return new TransformStream({
    async transform(chunk: GenericChunk, controller) {
      try {
@ -98,22 +103,64 @@ function createToolHandlingTransform(

          // 1. 处理Function Call方式的工具调用
          if (createdChunk.tool_calls && createdChunk.tool_calls.length > 0) {
-            toolCalls.push(...createdChunk.tool_calls)
            hasToolCalls = true
+
+            for (const toolCall of createdChunk.tool_calls) {
+              toolCalls.push(toolCall)
+
+              const executionPromise = (async () => {
+                try {
+                  const result = await executeToolCalls(
+                    ctx,
+                    [toolCall],
+                    mcpTools,
+                    allToolResponses,
+                    currentParams.onChunk,
+                    currentParams.assistant.model!
+                  )
+
+                  // 缓存执行结果
+                  executedToolResults.push(...result.toolResults)
+                  executedToolCalls.push(...result.confirmedToolCalls)
+                } catch (error) {
+                  console.error(`🔧 [${MIDDLEWARE_NAME}] Error executing tool call asynchronously:`, error)
+                }
+              })()
+
+              executionPromises.push(executionPromise)
+            }
          }

          // 2. 处理Tool Use方式的工具调用
          if (createdChunk.tool_use_responses && createdChunk.tool_use_responses.length > 0) {
-            toolUseResponses.push(...createdChunk.tool_use_responses)
            hasToolUseResponses = true
+            for (const toolUseResponse of createdChunk.tool_use_responses) {
+              toolUseResponses.push(toolUseResponse)
+              const executionPromise = (async () => {
+                try {
+                  const result = await executeToolUseResponses(
+                    ctx,
+                    [toolUseResponse], // 单个执行
+                    mcpTools,
+                    allToolResponses,
+                    currentParams.onChunk,
+                    currentParams.assistant.model!
+                  )
+
+                  // 缓存执行结果
+                  executedToolResults.push(...result.toolResults)
+                } catch (error) {
+                  console.error(`🔧 [${MIDDLEWARE_NAME}] Error executing tool use response asynchronously:`, error)
+                  // 错误时不影响其他工具的执行
+                }
+              })()
+
+              executionPromises.push(executionPromise)
+            }
          }
-
-          // 不转发MCP工具进展chunks，避免重复处理
-          return
+        } else {
+          controller.enqueue(chunk)
        }
-
-        // 转发其他所有chunk
-        controller.enqueue(chunk)
      } catch (error) {
        console.error(`🔧 [${MIDDLEWARE_NAME}] Error processing chunk:`, error)
        controller.error(error)
@ -121,43 +168,33 @@ function createToolHandlingTransform(
    },

    async flush(controller) {
-      const shouldExecuteToolCalls = hasToolCalls && toolCalls.length > 0
-      const shouldExecuteToolUseResponses = hasToolUseResponses && toolUseResponses.length > 0
-
-      if (!streamEnded && (shouldExecuteToolCalls || shouldExecuteToolUseResponses)) {
+      // 在流结束时等待所有异步工具执行完成，然后进行递归调用
+      if (!streamEnded && (hasToolCalls || hasToolUseResponses)) {
        streamEnded = true

        try {
-          let toolResult: SdkMessageParam[] = []
-
-          if (shouldExecuteToolCalls) {
-            toolResult = await executeToolCalls(
-              ctx,
-              toolCalls,
-              mcpTools,
-              allToolResponses,
-              currentParams.onChunk,
-              currentParams.assistant.model!
-            )
-          } else if (shouldExecuteToolUseResponses) {
-            toolResult = await executeToolUseResponses(
-              ctx,
-              toolUseResponses,
-              mcpTools,
-              allToolResponses,
-              currentParams.onChunk,
-              currentParams.assistant.model!
-            )
-          }
-
-          if (toolResult.length > 0) {
+          await Promise.all(executionPromises)
+          if (executedToolResults.length > 0) {
            const output = ctx._internal.toolProcessingState?.output
+            const newParams = buildParamsWithToolResults(
+              ctx,
+              currentParams,
+              output,
+              executedToolResults,
+              executedToolCalls
+            )
+
+            // 在递归调用前通知UI开始新的LLM响应处理
+            if (currentParams.onChunk) {
+              currentParams.onChunk({
+                type: ChunkType.LLM_RESPONSE_CREATED
+              })
+            }

-            const newParams = buildParamsWithToolResults(ctx, currentParams, output, toolResult, toolCalls)
            await executeWithToolHandling(newParams, depth + 1)
          }
        } catch (error) {
-          console.error(`🔧 [${MIDDLEWARE_NAME}] Error in tool processing:`, error)
+          Logger.error(`🔧 [${MIDDLEWARE_NAME}] Error in tool processing:`, error)
          controller.error(error)
        } finally {
          hasToolCalls = false
@ -178,8 +215,7 @@ async function executeToolCalls(
  allToolResponses: MCPToolResponse[],
  onChunk: CompletionsParams['onChunk'],
  model: Model
-): Promise<SdkMessageParam[]> {
-  // 转换为MCPToolResponse格式
+): Promise<{ toolResults: SdkMessageParam[]; confirmedToolCalls: SdkToolCall[] }> {
  const mcpToolResponses: ToolCallResponse[] = toolCalls
    .map((toolCall) => {
      const mcpTool = ctx.apiClientInstance.convertSdkToolCallToMcp(toolCall, mcpTools)
@ -192,11 +228,11 @@ async function executeToolCalls(

  if (mcpToolResponses.length === 0) {
    console.warn(`🔧 [${MIDDLEWARE_NAME}] No valid MCP tool responses to execute`)
-    return []
+    return { toolResults: [], confirmedToolCalls: [] }
  }

  // 使用现有的parseAndCallTools函数执行工具
-  const toolResults = await parseAndCallTools(
+  const { toolResults, confirmedToolResponses } = await parseAndCallTools(
    mcpToolResponses,
    allToolResponses,
    onChunk,
@ -204,10 +240,24 @@ async function executeToolCalls(
      return ctx.apiClientInstance.convertMcpToolResponseToSdkMessageParam(mcpToolResponse, resp, model)
    },
    model,
-    mcpTools
+    mcpTools,
+    ctx._internal?.flowControl?.abortSignal
  )

-  return toolResults
+  // 找出已确认工具对应的原始toolCalls
+  const confirmedToolCalls = toolCalls.filter((toolCall) => {
+    return confirmedToolResponses.find((confirmed) => {
+      // 根据不同的ID字段匹配原始toolCall
+      return (
+        ('name' in toolCall &&
+          (toolCall.name?.includes(confirmed.tool.name) || toolCall.name?.includes(confirmed.tool.id))) ||
+        confirmed.tool.name === toolCall.id ||
+        confirmed.tool.id === toolCall.id
+      )
+    })
+  })
+
+  return { toolResults, confirmedToolCalls }
 }

 /**
@ -221,9 +271,9 @@ async function executeToolUseResponses(
  allToolResponses: MCPToolResponse[],
  onChunk: CompletionsParams['onChunk'],
  model: Model
-): Promise<SdkMessageParam[]> {
+): Promise<{ toolResults: SdkMessageParam[] }> {
  // 直接使用parseAndCallTools函数处理已经解析好的ToolUseResponse
-  const toolResults = await parseAndCallTools(
+  const { toolResults } = await parseAndCallTools(
    toolUseResponses,
    allToolResponses,
    onChunk,
@ -231,10 +281,11 @@ async function executeToolUseResponses(
      return ctx.apiClientInstance.convertMcpToolResponseToSdkMessageParam(mcpToolResponse, resp, model)
    },
    model,
-    mcpTools
+    mcpTools,
+    ctx._internal?.flowControl?.abortSignal
  )

-  return toolResults
+  return { toolResults }
 }

 /**
@ -245,7 +296,7 @@ function buildParamsWithToolResults(
  currentParams: CompletionsParams,
  output: SdkRawOutput | string | undefined,
  toolResults: SdkMessageParam[],
-  toolCalls: SdkToolCall[]
+  confirmedToolCalls: SdkToolCall[]
 ): CompletionsParams {
  // 获取当前已经转换好的reqMessages，如果没有则使用原始messages
  const currentReqMessages = getCurrentReqMessages(ctx)
@ -253,7 +304,7 @@ function buildParamsWithToolResults(
  const apiClient = ctx.apiClientInstance

  // 从回复中构建助手消息
-  const newReqMessages = apiClient.buildSdkMessages(currentReqMessages, output, toolResults, toolCalls)
+  const newReqMessages = apiClient.buildSdkMessages(currentReqMessages, output, toolResults, confirmedToolCalls)

  if (output && ctx._internal.toolProcessingState) {
    ctx._internal.toolProcessingState.output = undefined
--- a/src/renderer/src/aiCore/middleware/core/TextChunkMiddleware.ts
+++ b/src/renderer/src/aiCore/middleware/core/TextChunkMiddleware.ts
@ -1,5 +1,5 @@
 import Logger from '@renderer/config/logger'
-import { ChunkType, TextDeltaChunk } from '@renderer/types/chunk'
+import { ChunkType, TextCompleteChunk, TextDeltaChunk } from '@renderer/types/chunk'

 import { CompletionsParams, CompletionsResult, GenericChunk } from '../schemas'
 import { CompletionsContext, CompletionsMiddleware } from '../types'
@ -38,7 +38,7 @@ export const TextChunkMiddleware: CompletionsMiddleware =

        // 用于跨chunk的状态管理
        let accumulatedTextContent = ''
-        let hasEnqueue = false
+        let hasTextCompleteEventEnqueue = false
        const enhancedTextStream = resultFromUpstream.pipeThrough(
          new TransformStream<GenericChunk, GenericChunk>({
            transform(chunk: GenericChunk, controller) {
@ -53,30 +53,44 @@ export const TextChunkMiddleware: CompletionsMiddleware =

                // 创建新的chunk，包含处理后的文本
                controller.enqueue(chunk)
-              } else if (accumulatedTextContent) {
-                if (chunk.type !== ChunkType.LLM_RESPONSE_COMPLETE) {
-                  controller.enqueue(chunk)
-                  hasEnqueue = true
-                }
-                const finalText = accumulatedTextContent
-                ctx._internal.customState!.accumulatedText = finalText
-                if (ctx._internal.toolProcessingState && !ctx._internal.toolProcessingState?.output) {
-                  ctx._internal.toolProcessingState.output = finalText
-                }
-
-                // 处理 onResponse 回调 - 发送最终完整文本
-                if (params.onResponse) {
-                  params.onResponse(finalText, true)
-                }
-
+              } else if (chunk.type === ChunkType.TEXT_COMPLETE) {
+                const textChunk = chunk as TextCompleteChunk
                controller.enqueue({
-                  type: ChunkType.TEXT_COMPLETE,
-                  text: finalText
+                  ...textChunk,
+                  text: accumulatedTextContent
                })
+                if (params.onResponse) {
+                  params.onResponse(accumulatedTextContent, true)
+                }
+                hasTextCompleteEventEnqueue = true
                accumulatedTextContent = ''
-                if (!hasEnqueue) {
+              } else if (accumulatedTextContent && !hasTextCompleteEventEnqueue) {
+                if (chunk.type === ChunkType.LLM_RESPONSE_COMPLETE) {
+                  const finalText = accumulatedTextContent
+                  ctx._internal.customState!.accumulatedText = finalText
+                  if (ctx._internal.toolProcessingState && !ctx._internal.toolProcessingState?.output) {
+                    ctx._internal.toolProcessingState.output = finalText
+                  }
+
+                  // 处理 onResponse 回调 - 发送最终完整文本
+                  if (params.onResponse) {
+                    params.onResponse(finalText, true)
+                  }
+
+                  controller.enqueue({
+                    type: ChunkType.TEXT_COMPLETE,
+                    text: finalText
+                  })
+                  controller.enqueue(chunk)
+                } else {
+                  controller.enqueue({
+                    type: ChunkType.TEXT_COMPLETE,
+                    text: accumulatedTextContent
+                  })
                  controller.enqueue(chunk)
                }
+                hasTextCompleteEventEnqueue = true
+                accumulatedTextContent = ''
              } else {
                // 其他类型的chunk直接传递
                controller.enqueue(chunk)
--- a/src/renderer/src/aiCore/middleware/core/ThinkChunkMiddleware.ts
+++ b/src/renderer/src/aiCore/middleware/core/ThinkChunkMiddleware.ts
@ -65,6 +65,16 @@ export const ThinkChunkMiddleware: CompletionsMiddleware =
                  thinking_millsec: thinkingStartTime > 0 ? Date.now() - thinkingStartTime : 0
                }
                controller.enqueue(enhancedChunk)
+              } else if (chunk.type === ChunkType.THINKING_COMPLETE) {
+                const thinkingCompleteChunk = chunk as ThinkingCompleteChunk
+                controller.enqueue({
+                  ...thinkingCompleteChunk,
+                  text: accumulatedThinkingContent,
+                  thinking_millsec: thinkingStartTime > 0 ? Date.now() - thinkingStartTime : 0
+                })
+                hasThinkingContent = false
+                accumulatedThinkingContent = ''
+                thinkingStartTime = 0
              } else if (hasThinkingContent && thinkingStartTime > 0) {
                // 收到任何非THINKING_DELTA的chunk时，如果有累积的思考内容，生成THINKING_COMPLETE
                const thinkingCompleteChunk: ThinkingCompleteChunk = {
--- a/src/renderer/src/aiCore/middleware/core/WebSearchMiddleware.ts
+++ b/src/renderer/src/aiCore/middleware/core/WebSearchMiddleware.ts
@ -42,7 +42,12 @@ export const WebSearchMiddleware: CompletionsMiddleware =
                const providerType = model.provider || 'openai'
                // 使用当前可用的Web搜索结果进行链接转换
                const text = chunk.text
-                const result = smartLinkConverter(text, providerType, isFirstChunk)
+                const result = smartLinkConverter(
+                  text,
+                  providerType,
+                  isFirstChunk,
+                  ctx._internal.webSearchState!.results
+                )
                if (isFirstChunk) {
                  isFirstChunk = false
                }
--- a/src/renderer/src/aiCore/middleware/feat/ThinkingTagExtractionMiddleware.ts
+++ b/src/renderer/src/aiCore/middleware/feat/ThinkingTagExtractionMiddleware.ts
@ -69,7 +69,7 @@ export const ThinkingTagExtractionMiddleware: CompletionsMiddleware =
                const extractionResults = tagExtractor.processText(textChunk.text)

                for (const extractionResult of extractionResults) {
-                  if (extractionResult.complete && extractionResult.tagContentExtracted) {
+                  if (extractionResult.complete && extractionResult.tagContentExtracted?.trim()) {
                    // 生成 THINKING_COMPLETE 事件
                    const thinkingCompleteChunk: ThinkingCompleteChunk = {
                      type: ChunkType.THINKING_COMPLETE,
@ -89,12 +89,14 @@ export const ThinkingTagExtractionMiddleware: CompletionsMiddleware =
                        thinkingStartTime = Date.now()
                      }

-                      const thinkingDeltaChunk: ThinkingDeltaChunk = {
-                        type: ChunkType.THINKING_DELTA,
-                        text: extractionResult.content,
-                        thinking_millsec: thinkingStartTime > 0 ? Date.now() - thinkingStartTime : 0
+                      if (extractionResult.content?.trim()) {
+                        const thinkingDeltaChunk: ThinkingDeltaChunk = {
+                          type: ChunkType.THINKING_DELTA,
+                          text: extractionResult.content,
+                          thinking_millsec: thinkingStartTime > 0 ? Date.now() - thinkingStartTime : 0
+                        }
+                        controller.enqueue(thinkingDeltaChunk)
                      }
-                      controller.enqueue(thinkingDeltaChunk)
                    } else {
                      // 发送清理后的文本内容
                      const cleanTextChunk: TextDeltaChunk = {
--- a/src/renderer/src/aiCore/middleware/feat/ToolUseExtractionMiddleware.ts
+++ b/src/renderer/src/aiCore/middleware/feat/ToolUseExtractionMiddleware.ts
@ -22,7 +22,8 @@ const TOOL_USE_TAG_CONFIG: TagConfig = {
 * 1. 从文本流中检测并提取 <tool_use></tool_use> 标签
 * 2. 解析工具调用信息并转换为 ToolUseResponse 格式
 * 3. 生成 MCP_TOOL_CREATED chunk 供 McpToolChunkMiddleware 处理
- * 4. 清理文本流，移除工具使用标签但保留正常文本
+ * 4. 丢弃 tool_use 之后的所有内容（助手幻觉）
+ * 5. 清理文本流，移除工具使用标签但保留正常文本
 *
 * 注意：此中间件只负责提取和转换，实际工具调用由 McpToolChunkMiddleware 处理
 */
@ -32,13 +33,10 @@ export const ToolUseExtractionMiddleware: CompletionsMiddleware =
  async (ctx: CompletionsContext, params: CompletionsParams): Promise<CompletionsResult> => {
    const mcpTools = params.mcpTools || []

-    // 如果没有工具，直接调用下一个中间件
    if (!mcpTools || mcpTools.length === 0) return next(ctx, params)

-    // 调用下游中间件
    const result = await next(ctx, params)

-    // 响应后处理：处理工具使用标签提取
    if (result.stream) {
      const resultFromUpstream = result.stream as ReadableStream<GenericChunk>

@ -60,7 +58,9 @@ function createToolUseExtractionTransform(
  _ctx: CompletionsContext,
  mcpTools: MCPTool[]
 ): TransformStream<GenericChunk, GenericChunk> {
-  const tagExtractor = new TagExtractor(TOOL_USE_TAG_CONFIG)
+  const toolUseExtractor = new TagExtractor(TOOL_USE_TAG_CONFIG)
+  let hasAnyToolUse = false
+  let toolCounter = 0

  return new TransformStream({
    async transform(chunk: GenericChunk, controller) {
@ -68,30 +68,37 @@ function createToolUseExtractionTransform(
        // 处理文本内容，检测工具使用标签
        if (chunk.type === ChunkType.TEXT_DELTA) {
          const textChunk = chunk as TextDeltaChunk
-          const extractionResults = tagExtractor.processText(textChunk.text)

-          for (const result of extractionResults) {
+          // 处理 tool_use 标签
+          const toolUseResults = toolUseExtractor.processText(textChunk.text)
+
+          for (const result of toolUseResults) {
            if (result.complete && result.tagContentExtracted) {
              // 提取到完整的工具使用内容，解析并转换为 SDK ToolCall 格式
-              const toolUseResponses = parseToolUse(result.tagContentExtracted, mcpTools)
+              const toolUseResponses = parseToolUse(result.tagContentExtracted, mcpTools, toolCounter)
+              toolCounter += toolUseResponses.length

              if (toolUseResponses.length > 0) {
-                // 生成 MCP_TOOL_CREATED chunk，复用现有的处理流程
+                // 生成 MCP_TOOL_CREATED chunk
                const mcpToolCreatedChunk: MCPToolCreatedChunk = {
                  type: ChunkType.MCP_TOOL_CREATED,
                  tool_use_responses: toolUseResponses
                }
                controller.enqueue(mcpToolCreatedChunk)
+
+                // 标记已有工具调用
+                hasAnyToolUse = true
              }
            } else if (!result.isTagContent && result.content) {
-              // 发送标签外的正常文本内容
-              const cleanTextChunk: TextDeltaChunk = {
-                ...textChunk,
-                text: result.content
+              if (!hasAnyToolUse) {
+                const cleanTextChunk: TextDeltaChunk = {
+                  ...textChunk,
+                  text: result.content
+                }
+                controller.enqueue(cleanTextChunk)
              }
-              controller.enqueue(cleanTextChunk)
            }
-            // 注意：标签内的内容不会作为TEXT_DELTA转发，避免重复显示
+            // tool_use 标签内的内容不转发，避免重复显示
          }
          return
        }
@ -105,16 +112,17 @@ function createToolUseExtractionTransform(
    },

    async flush(controller) {
-      // 检查是否有未完成的标签内容
-      const finalResult = tagExtractor.finalize()
-      if (finalResult && finalResult.tagContentExtracted) {
-        const toolUseResponses = parseToolUse(finalResult.tagContentExtracted, mcpTools)
+      // 检查是否有未完成的 tool_use 标签内容
+      const finalToolUseResult = toolUseExtractor.finalize()
+      if (finalToolUseResult && finalToolUseResult.tagContentExtracted) {
+        const toolUseResponses = parseToolUse(finalToolUseResult.tagContentExtracted, mcpTools, toolCounter)
        if (toolUseResponses.length > 0) {
          const mcpToolCreatedChunk: MCPToolCreatedChunk = {
            type: ChunkType.MCP_TOOL_CREATED,
            tool_use_responses: toolUseResponses
          }
          controller.enqueue(mcpToolCreatedChunk)
+          hasAnyToolUse = true
        }
      }
    }
--- a/src/renderer/src/assets/fonts/country-flag-fonts/flag.css
+++ b/src/renderer/src/assets/fonts/country-flag-fonts/flag.css
@ -1,13 +1,13 @@
-@font-face {
-  font-family: 'Twemoji Country Flags';
-  unicode-range:
-    U+1F1E6-1F1FF, U+1F3F4, U+E0062-E0063, U+E0065, U+E0067, U+E006C, U+E006E, U+E0073-E0074, U+E0077, U+E007F;
-  /*https://github.com/beyondkmp/country-flag-emoji-polyfill/blob/master/font/TwemojiCountryFlags.woff2 */
-  src: url('TwemojiCountryFlags.woff2') format('woff2');
-  font-display: swap;
-}
-
-/* 国旗字体样式类 */
-.country-flag-font {
-  font-family: 'Twemoji Country Flags', 'Apple Color Emoji', 'Segoe UI Emoji', sans-serif;
-}
+@font-face {
+  font-family: 'Twemoji Country Flags';
+  unicode-range:
+    U+1F1E6-1F1FF, U+1F3F4, U+E0062-E0063, U+E0065, U+E0067, U+E006C, U+E006E, U+E0073-E0074, U+E0077, U+E007F;
+  /*https://github.com/beyondkmp/country-flag-emoji-polyfill/blob/master/font/TwemojiCountryFlags.woff2 */
+  src: url('TwemojiCountryFlags.woff2') format('woff2');
+  font-display: swap;
+}
+
+/* 国旗字体样式类 */
+.country-flag-font {
+  font-family: 'Twemoji Country Flags', 'Apple Color Emoji', 'Segoe UI Emoji', sans-serif;
+}
--- a/src/renderer/src/assets/styles/color.scss
+++ b/src/renderer/src/assets/styles/color.scss
@ -72,6 +72,10 @@
  --chat-text-user: var(--color-black);

  --list-item-border-radius: 20px;
+
+  --color-status-success: #52c41a;
+  --color-status-error: #ff4d4f;
+  --color-status-warning: #faad14;
 }

 [theme-mode='light'] {
--- a/src/renderer/src/assets/styles/font.scss
+++ b/src/renderer/src/assets/styles/font.scss
@ -1,20 +1,20 @@
-:root {
-  --font-family:
-    Ubuntu, -apple-system, BlinkMacSystemFont, 'Segoe UI', system-ui, Roboto, Oxygen, Cantarell, 'Open Sans',
-    'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
-    'Noto Color Emoji';
-
-  --font-family-serif:
-    serif, -apple-system, BlinkMacSystemFont, 'Segoe UI', system-ui, Ubuntu, Roboto, Oxygen, Cantarell, 'Open Sans',
-    'Helvetica Neue', Arial, 'Noto Sans', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
-
-  --code-font-family: 'Cascadia Code', 'Fira Code', 'Consolas', Menlo, Courier, monospace;
-}
-
-// Windows系统专用字体配置
-body[os='windows'] {
-  --font-family:
-    'Twemoji Country Flags', Ubuntu, -apple-system, BlinkMacSystemFont, 'Segoe UI', system-ui, Roboto, Oxygen,
-    Cantarell, 'Open Sans', 'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
-    'Segoe UI Symbol', 'Noto Color Emoji';
-}
+:root {
+  --font-family:
+    Ubuntu, -apple-system, BlinkMacSystemFont, 'Segoe UI', system-ui, Roboto, Oxygen, Cantarell, 'Open Sans',
+    'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
+    'Noto Color Emoji';
+
+  --font-family-serif:
+    serif, -apple-system, BlinkMacSystemFont, 'Segoe UI', system-ui, Ubuntu, Roboto, Oxygen, Cantarell, 'Open Sans',
+    'Helvetica Neue', Arial, 'Noto Sans', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+
+  --code-font-family: 'Cascadia Code', 'Fira Code', 'Consolas', Menlo, Courier, monospace;
+}
+
+// Windows系统专用字体配置
+body[os='windows'] {
+  --font-family:
+    'Twemoji Country Flags', Ubuntu, -apple-system, BlinkMacSystemFont, 'Segoe UI', system-ui, Roboto, Oxygen,
+    Cantarell, 'Open Sans', 'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji',
+    'Segoe UI Symbol', 'Noto Color Emoji';
+}
--- a/src/renderer/src/assets/styles/markdown.scss
+++ b/src/renderer/src/assets/styles/markdown.scss
@ -326,6 +326,8 @@ mjx-container {
 /* Shiki 相关样式 */
 .shiki {
  font-family: var(--code-font-family);
+  // 保持行高为初始值，在 shiki 代码块中处理
+  line-height: initial;
 }

 /* CodeMirror 相关样式 */
--- a/src/renderer/src/assets/styles/scrollbar.scss
+++ b/src/renderer/src/assets/styles/scrollbar.scss
@ -49,3 +49,11 @@ pre:not(.shiki)::-webkit-scrollbar-thumb {
  --color-scrollbar-thumb: var(--color-scrollbar-thumb-light);
  --color-scrollbar-thumb-hover: var(--color-scrollbar-thumb-light-hover);
 }
+
+/* 用于截图时隐藏滚动条
+ * FIXME: 临时方案，因为 html-to-image 没有正确处理伪元素。
+ */
+.hide-scrollbar,
+.hide-scrollbar * {
+  scrollbar-width: none !important;
+}
--- a/src/renderer/src/components/CodeBlockView/CodePreview.tsx
+++ b/src/renderer/src/components/CodeBlockView/CodePreview.tsx
@ -9,6 +9,7 @@ import { debounce } from 'lodash'
 import { ChevronsDownUp, ChevronsUpDown, Text as UnWrapIcon, WrapText as WrapIcon } from 'lucide-react'
 import React, { memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import { ThemedToken } from 'shiki/core'
 import styled from 'styled-components'

 interface CodePreviewProps {
@ -107,7 +108,8 @@ const CodePreview = ({ children, language, setTools }: CodePreviewProps) => {
  // Virtualizer 配置
  const getScrollElement = useCallback(() => scrollerRef.current, [])
  const getItemKey = useCallback((index: number) => `${callerId}-${index}`, [callerId])
-  const estimateSize = useCallback(() => (fontSize - 1) * 1.6, [fontSize]) // 同步全局样式
+  // `line-height: 1.6` 为全局样式，但是为了避免测量误差在这里取整
+  const estimateSize = useCallback(() => Math.round((fontSize - 1) * 1.6), [fontSize])

  // 创建 virtualizer 实例
  const virtualizer = useVirtualizer({
@ -144,11 +146,13 @@ const CodePreview = ({ children, language, setTools }: CodePreviewProps) => {
        ref={scrollerRef}
        className="shiki-scroller"
        $wrap={shouldWrap}
+        $lineHeight={estimateSize()}
        style={
          {
            '--gutter-width': `${gutterDigits}ch`,
            fontSize: `${fontSize - 1}px`,
-            maxHeight: shouldCollapse ? MAX_COLLAPSE_HEIGHT : undefined
+            maxHeight: shouldCollapse ? MAX_COLLAPSE_HEIGHT : undefined,
+            overflowY: shouldCollapse ? 'auto' : 'hidden'
          } as React.CSSProperties
        }>
        <div
@ -193,9 +197,49 @@ const CodePreview = ({ children, language, setTools }: CodePreviewProps) => {

 CodePreview.displayName = 'CodePreview'

+/**
+ * 补全代码行 tokens，把原始内容拼接到高亮内容之后，确保渲染出整行来。
+ */
+function completeLineTokens(themedTokens: ThemedToken[], rawLine: string): ThemedToken[] {
+  // 如果出现空行，补一个空格保证行高
+  if (rawLine.length === 0) {
+    return [
+      {
+        content: ' ',
+        offset: 0,
+        color: 'inherit',
+        bgColor: 'inherit',
+        htmlStyle: {
+          opacity: '0.35'
+        }
+      }
+    ]
+  }
+
+  const themedContent = themedTokens.map((token) => token.content).join('')
+  const extraContent = rawLine.slice(themedContent.length)
+
+  // 已有内容已经全部高亮，直接返回
+  if (!extraContent) return themedTokens
+
+  // 补全剩余内容
+  return [
+    ...themedTokens,
+    {
+      content: extraContent,
+      offset: themedContent.length,
+      color: 'inherit',
+      bgColor: 'inherit',
+      htmlStyle: {
+        opacity: '0.35'
+      }
+    }
+  ]
+}
+
 interface VirtualizedRowData {
  rawLine: string
-  tokenLine?: any[]
+  tokenLine?: ThemedToken[]
  showLineNumbers: boolean
 }

@ -208,17 +252,11 @@ const VirtualizedRow = memo(
      <div className="line">
        {showLineNumbers && <span className="line-number">{index + 1}</span>}
        <span className="line-content">
-          {tokenLine ? (
-            // 渲染高亮后的内容
-            tokenLine.map((token, tokenIndex) => (
-              <span key={tokenIndex} style={getReactStyleFromToken(token)}>
-                {token.content}
-              </span>
-            ))
-          ) : (
-            // 渲染原始内容
-            <span className="line-content-raw">{rawLine || ' '}</span>
-          )}
+          {completeLineTokens(tokenLine ?? [], rawLine).map((token, tokenIndex) => (
+            <span key={tokenIndex} style={getReactStyleFromToken(token)}>
+              {token.content}
+            </span>
+          ))}
        </span>
      </div>
    )
@ -229,18 +267,19 @@ VirtualizedRow.displayName = 'VirtualizedRow'

 const ScrollContainer = styled.div<{
  $wrap?: boolean
+  $lineHeight?: number
 }>`
  display: block;
-  overflow: auto;
+  overflow-x: auto;
  position: relative;
  border-radius: inherit;
-  height: auto;
  padding: 0.5em 1em;

  .line {
    display: flex;
    align-items: flex-start;
    width: 100%;
+    line-height: ${(props) => props.$lineHeight}px;

    .line-number {
      width: var(--gutter-width, 1.2ch);
@ -250,23 +289,17 @@ const ScrollContainer = styled.div<{
      user-select: none;
      flex-shrink: 0;
      overflow: hidden;
-      line-height: inherit;
      font-family: inherit;
      font-variant-numeric: tabular-nums;
    }

    .line-content {
      flex: 1;
-      line-height: inherit;
      * {
        white-space: ${(props) => (props.$wrap ? 'pre-wrap' : 'pre')};
        overflow-wrap: ${(props) => (props.$wrap ? 'break-word' : 'normal')};
      }
    }
-
-    .line-content-raw {
-      opacity: 0.35;
-    }
  }
 `

--- a/src/renderer/src/components/CodeBlockView/index.tsx
+++ b/src/renderer/src/components/CodeBlockView/index.tsx
@ -292,6 +292,7 @@ const SplitViewWrapper = styled.div`

  &:not(:has(+ [class*='Container'])) {
    border-radius: 0 0 8px 8px;
+    overflow: hidden;
  }
 `

--- a/src/renderer/src/components/CodeEditor/hook.ts
+++ b/src/renderer/src/components/CodeEditor/hook.ts
@ -1,65 +0,0 @@
-import { useCodeStyle } from '@renderer/context/CodeStyleProvider'
-import { Extension } from '@uiw/react-codemirror'
-import { useEffect, useState } from 'react'
-
-let linterPromise: Promise<any> | null = null
-function importLintPackage() {
-  if (!linterPromise) {
-    linterPromise = import('@codemirror/lint').then((mod) => mod.linter)
-  }
-  return linterPromise
-}
-
-// 语言对应的 linter 加载器
-const linterLoaders: Record<string, () => Promise<any>> = {
-  json: async () => {
-    const [linter, jsonParseLinter] = await Promise.all([
-      importLintPackage(),
-      import('@codemirror/lang-json').then((mod) => mod.jsonParseLinter)
-    ])
-    return linter(jsonParseLinter())
-  }
-}
-
-export const useLanguageExtensions = (language: string, lint?: boolean) => {
-  const { languageMap } = useCodeStyle()
-  const [extensions, setExtensions] = useState<Extension[]>([])
-
-  // 加载语言
-  useEffect(() => {
-    let normalizedLang = languageMap[language as keyof typeof languageMap] || language.toLowerCase()
-
-    // 如果语言名包含 `-`，转换为驼峰命名法
-    if (normalizedLang.includes('-')) {
-      normalizedLang = normalizedLang.replace(/-([a-z])/g, (_, char) => char.toUpperCase())
-    }
-
-    import('@uiw/codemirror-extensions-langs')
-      .then(({ loadLanguage }) => {
-        const extension = loadLanguage(normalizedLang as any)
-        if (extension) {
-          setExtensions((prev) => [...prev, extension])
-        }
-      })
-      .catch((error) => {
-        console.debug(`Failed to load language: ${normalizedLang}`, error)
-      })
-  }, [language, languageMap])
-
-  useEffect(() => {
-    if (!lint) return
-
-    const loader = linterLoaders[language]
-    if (loader) {
-      loader()
-        .then((extension) => {
-          setExtensions((prev) => [...prev, extension])
-        })
-        .catch((error) => {
-          console.error(`Failed to load linter for ${language}`, error)
-        })
-    }
-  }, [language, lint])
-
-  return extensions
-}
--- a/src/renderer/src/components/CodeEditor/hooks.ts
+++ b/src/renderer/src/components/CodeEditor/hooks.ts
@ -0,0 +1,108 @@
+import { linter } from '@codemirror/lint' // statically imported by @uiw/codemirror-extensions-basic-setup
+import { EditorView } from '@codemirror/view'
+import { useCodeStyle } from '@renderer/context/CodeStyleProvider'
+import { Extension, keymap } from '@uiw/react-codemirror'
+import { useEffect, useMemo, useState } from 'react'
+
+// 语言对应的 linter 加载器
+const linterLoaders: Record<string, () => Promise<any>> = {
+  json: async () => {
+    const jsonParseLinter = await import('@codemirror/lang-json').then((mod) => mod.jsonParseLinter)
+    return linter(jsonParseLinter())
+  }
+}
+
+export const useLanguageExtensions = (language: string, lint?: boolean) => {
+  const { languageMap } = useCodeStyle()
+  const [extensions, setExtensions] = useState<Extension[]>([])
+
+  // 加载语言
+  useEffect(() => {
+    let normalizedLang = languageMap[language as keyof typeof languageMap] || language.toLowerCase()
+
+    // 如果语言名包含 `-`，转换为驼峰命名法
+    if (normalizedLang.includes('-')) {
+      normalizedLang = normalizedLang.replace(/-([a-z])/g, (_, char) => char.toUpperCase())
+    }
+
+    import('@uiw/codemirror-extensions-langs')
+      .then(({ loadLanguage }) => {
+        const extension = loadLanguage(normalizedLang as any)
+        if (extension) {
+          setExtensions((prev) => [...prev, extension])
+        }
+      })
+      .catch((error) => {
+        console.debug(`Failed to load language: ${normalizedLang}`, error)
+      })
+  }, [language, languageMap])
+
+  useEffect(() => {
+    if (!lint) return
+
+    const loader = linterLoaders[language]
+    if (loader) {
+      loader()
+        .then((extension) => {
+          setExtensions((prev) => [...prev, extension])
+        })
+        .catch((error) => {
+          console.error(`Failed to load linter for ${language}`, error)
+        })
+    }
+  }, [language, lint])
+
+  return extensions
+}
+
+interface UseSaveKeymapProps {
+  onSave?: (content: string) => void
+  enabled?: boolean
+}
+
+/**
+ * CodeMirror 扩展，用于处理保存快捷键 (Cmd/Ctrl + S)
+ * @param onSave 保存时触发的回调函数
+ * @param enabled 是否启用此快捷键
+ * @returns 扩展或空数组
+ */
+export function useSaveKeymap({ onSave, enabled = true }: UseSaveKeymapProps) {
+  return useMemo(() => {
+    if (!enabled || !onSave) {
+      return []
+    }
+
+    return keymap.of([
+      {
+        key: 'Mod-s',
+        run: (view: EditorView) => {
+          onSave(view.state.doc.toString())
+          return true
+        },
+        preventDefault: true
+      }
+    ])
+  }, [onSave, enabled])
+}
+
+interface UseBlurHandlerProps {
+  onBlur?: (content: string) => void
+}
+
+/**
+ * CodeMirror 扩展，用于处理编辑器的 blur 事件
+ * @param onBlur blur 事件触发时的回调函数
+ * @returns 扩展或空数组
+ */
+export function useBlurHandler({ onBlur }: UseBlurHandlerProps) {
+  return useMemo(() => {
+    if (!onBlur) {
+      return []
+    }
+    return EditorView.domEventHandlers({
+      blur: (_event, view) => {
+        onBlur(view.state.doc.toString())
+      }
+    })
+  }, [onBlur])
+}
--- a/src/renderer/src/components/CodeEditor/index.tsx
+++ b/src/renderer/src/components/CodeEditor/index.tsx
@ -1,7 +1,7 @@
 import { CodeTool, TOOL_SPECS, useCodeTool } from '@renderer/components/CodeToolbar'
 import { useCodeStyle } from '@renderer/context/CodeStyleProvider'
 import { useSettings } from '@renderer/hooks/useSettings'
-import CodeMirror, { Annotation, BasicSetupOptions, EditorView, Extension, keymap } from '@uiw/react-codemirror'
+import CodeMirror, { Annotation, BasicSetupOptions, EditorView, Extension } from '@uiw/react-codemirror'
 import diff from 'fast-diff'
 import {
  ChevronsDownUp,
@ -14,7 +14,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { memo } from 'react'
 import { useTranslation } from 'react-i18next'

-import { useLanguageExtensions } from './hook'
+import { useBlurHandler, useLanguageExtensions, useSaveKeymap } from './hooks'

 // 标记非用户编辑的变更
 const External = Annotation.define<boolean>()
@ -25,6 +25,7 @@ interface Props {
  language: string
  onSave?: (newContent: string) => void
  onChange?: (newContent: string) => void
+  onBlur?: (newContent: string) => void
  setTools?: (value: React.SetStateAction<CodeTool[]>) => void
  height?: string
  minHeight?: string
@ -54,6 +55,7 @@ const CodeEditor = ({
  language,
  onSave,
  onChange,
+  onBlur,
  setTools,
  height,
  minHeight,
@ -166,28 +168,18 @@ const CodeEditor = ({
    setIsUnwrapped(!wrappable)
  }, [wrappable])

-  // 保存功能的快捷键
-  const saveKeymap = useMemo(() => {
-    return keymap.of([
-      {
-        key: 'Mod-s',
-        run: () => {
-          handleSave()
-          return true
-        },
-        preventDefault: true
-      }
-    ])
-  }, [handleSave])
+  const saveKeymapExtension = useSaveKeymap({ onSave, enabled: enableKeymap })
+  const blurExtension = useBlurHandler({ onBlur })

  const customExtensions = useMemo(() => {
    return [
      ...(extensions ?? []),
      ...langExtensions,
      ...(isUnwrapped ? [] : [EditorView.lineWrapping]),
-      ...(enableKeymap ? [saveKeymap] : [])
-    ]
-  }, [extensions, langExtensions, isUnwrapped, enableKeymap, saveKeymap])
+      saveKeymapExtension,
+      blurExtension
+    ].flat()
+  }, [extensions, langExtensions, isUnwrapped, saveKeymapExtension, blurExtension])

  return (
    <CodeMirror
--- a/src/renderer/src/components/ContentSearch.tsx
+++ b/src/renderer/src/components/ContentSearch.tsx
@ -208,8 +208,6 @@ export const ContentSearch = React.forwardRef<ContentSearchRef, Props>(
                inputEl.focus()
                inputEl.select()
                search()
-                CSS.highlights.clear()
-                setSearchCompleted(SearchCompletedState.NotSearched)
              })
            } else {
              requestAnimationFrame(() => {
--- a/src/renderer/src/components/DraggableList/index.tsx
+++ b/src/renderer/src/components/DraggableList/index.tsx
@ -0,0 +1,2 @@
+export { default as DraggableList } from './list'
+export { default as DraggableVirtualList } from './virtual-list'
--- a/src/renderer/src/components/DraggableList/list.tsx
+++ b/src/renderer/src/components/DraggableList/list.tsx
@ -23,7 +23,7 @@ interface Props<T> {
  droppableProps?: Partial<DroppableProps>
 }

-const DragableList: FC<Props<any>> = ({
+const DraggableList: FC<Props<any>> = ({
  children,
  list,
  style,
@ -78,4 +78,4 @@ const DragableList: FC<Props<any>> = ({
  )
 }

-export default DragableList
+export default DraggableList
--- a/src/renderer/src/components/DraggableList/virtual-list.tsx
+++ b/src/renderer/src/components/DraggableList/virtual-list.tsx
@ -0,0 +1,212 @@
+import {
+  DragDropContext,
+  Draggable,
+  Droppable,
+  DroppableProps,
+  DropResult,
+  OnDragEndResponder,
+  OnDragStartResponder,
+  ResponderProvided
+} from '@hello-pangea/dnd'
+import Scrollbar from '@renderer/components/Scrollbar'
+import { droppableReorder } from '@renderer/utils'
+import { useVirtualizer } from '@tanstack/react-virtual'
+import { type Key, memo, useCallback, useRef } from 'react'
+
+/**
+ * 泛型 Props，用于配置 DraggableVirtualList。
+ *
+ * @template T 列表元素的类型
+ * @property {string} [className] 根节点附加 class
+ * @property {React.CSSProperties} [style] 根节点附加样式
+ * @property {React.CSSProperties} [itemStyle] 元素内容区域的附加样式
+ * @property {React.CSSProperties} [itemContainerStyle] 元素拖拽容器的附加样式
+ * @property {Partial<DroppableProps>} [droppableProps] 透传给 Droppable 的额外配置
+ * @property {(list: T[]) => void} onUpdate 拖拽排序完成后的回调，返回新的列表顺序
+ * @property {OnDragStartResponder} [onDragStart] 开始拖拽时的回调
+ * @property {OnDragEndResponder}   [onDragEnd] 结束拖拽时的回调
+ * @property {T[]} list 渲染的数据源
+ * @property {(index: number) => Key} [itemKey] 提供给虚拟列表的行 key，若不提供默认使用 index
+ * @property {number} [overscan=5] 前后额外渲染的行数，提升快速滚动时的体验
+ * @property {(item: T, index: number) => React.ReactNode} children 列表项渲染函数
+ */
+interface DraggableVirtualListProps<T> {
+  ref?: React.Ref<HTMLDivElement>
+  className?: string
+  style?: React.CSSProperties
+  itemStyle?: React.CSSProperties
+  itemContainerStyle?: React.CSSProperties
+  droppableProps?: Partial<DroppableProps>
+  onUpdate: (list: T[]) => void
+  onDragStart?: OnDragStartResponder
+  onDragEnd?: OnDragEndResponder
+  list: T[]
+  itemKey?: (index: number) => Key
+  overscan?: number
+  children: (item: T, index: number) => React.ReactNode
+}
+
+/**
+ * 带虚拟滚动与拖拽排序能力的（垂直）列表组件。
+ * - 滚动容器由该组件内部管理。
+ * @template T 列表元素的类型
+ * @param {DraggableVirtualListProps<T>} props 组件参数
+ * @returns {React.ReactElement}
+ */
+function DraggableVirtualList<T>({
+  ref,
+  className,
+  style,
+  itemStyle,
+  itemContainerStyle,
+  droppableProps,
+  onDragStart,
+  onUpdate,
+  onDragEnd,
+  list,
+  itemKey,
+  overscan = 5,
+  children
+}: DraggableVirtualListProps<T>): React.ReactElement {
+  const _onDragEnd = (result: DropResult, provided: ResponderProvided) => {
+    onDragEnd?.(result, provided)
+    if (result.destination) {
+      const sourceIndex = result.source.index
+      const destIndex = result.destination.index
+      const reorderAgents = droppableReorder(list, sourceIndex, destIndex)
+      onUpdate(reorderAgents)
+    }
+  }
+
+  // 虚拟列表滚动容器的 ref
+  const parentRef = useRef<HTMLDivElement>(null)
+
+  const virtualizer = useVirtualizer({
+    count: list.length,
+    getScrollElement: useCallback(() => parentRef.current, []),
+    getItemKey: itemKey,
+    estimateSize: useCallback(() => 50, []),
+    overscan
+  })
+
+  return (
+    <div ref={ref} className={`${className} draggable-virtual-list`} style={{ height: '100%', ...style }}>
+      <DragDropContext onDragStart={onDragStart} onDragEnd={_onDragEnd}>
+        <Droppable
+          droppableId="droppable"
+          mode="virtual"
+          renderClone={(provided, _snapshot, rubric) => {
+            const item = list[rubric.source.index]
+            return (
+              <div
+                {...provided.draggableProps}
+                {...provided.dragHandleProps}
+                ref={provided.innerRef}
+                style={{
+                  ...itemStyle,
+                  ...provided.draggableProps.style
+                }}>
+                {item && children(item, rubric.source.index)}
+              </div>
+            )
+          }}
+          {...droppableProps}>
+          {(provided) => {
+            // 让 dnd 和虚拟列表共享同一个滚动容器
+            const setRefs = (el: HTMLDivElement | null) => {
+              provided.innerRef(el)
+              parentRef.current = el
+            }
+
+            return (
+              <Scrollbar
+                ref={setRefs}
+                {...provided.droppableProps}
+                className="virtual-scroller"
+                style={{
+                  height: '100%',
+                  width: '100%',
+                  overflowY: 'auto',
+                  position: 'relative'
+                }}>
+                <div
+                  className="virtual-list"
+                  style={{
+                    height: `${virtualizer.getTotalSize()}px`,
+                    width: '100%',
+                    position: 'relative'
+                  }}>
+                  {virtualizer.getVirtualItems().map((virtualItem) => (
+                    <VirtualRow
+                      key={virtualItem.key}
+                      virtualItem={virtualItem}
+                      list={list}
+                      itemStyle={itemStyle}
+                      itemContainerStyle={itemContainerStyle}
+                      virtualizer={virtualizer}
+                      children={children}
+                    />
+                  ))}
+                </div>
+              </Scrollbar>
+            )
+          }}
+        </Droppable>
+      </DragDropContext>
+    </div>
+  )
+}
+
+/**
+ * 渲染单个可拖拽的虚拟列表项，高度为动态测量
+ */
+const VirtualRow = memo(({ virtualItem, list, children, itemStyle, itemContainerStyle, virtualizer }: any) => {
+  const item = list[virtualItem.index]
+  const draggableId = String(virtualItem.key)
+  return (
+    <Draggable
+      key={`draggable_${draggableId}_${virtualItem.index}`}
+      draggableId={draggableId}
+      index={virtualItem.index}>
+      {(provided) => {
+        const setDragRefs = (el: HTMLElement | null) => {
+          provided.innerRef(el)
+          virtualizer.measureElement(el)
+        }
+
+        const dndStyle = provided.draggableProps.style
+        const virtualizerTransform = `translateY(${virtualItem.start}px)`
+
+        // dnd 的 transform 负责拖拽时的位移和让位动画，
+        // virtualizer 的 translateY 负责将项定位到虚拟列表的正确位置，
+        // 它们拼接起来可以同时实现拖拽视觉效果和虚拟化定位。
+        const combinedTransform = dndStyle?.transform
+          ? `${dndStyle.transform} ${virtualizerTransform}`
+          : virtualizerTransform
+
+        return (
+          <div
+            {...provided.draggableProps}
+            ref={setDragRefs}
+            className="draggable-item"
+            data-index={virtualItem.index}
+            style={{
+              ...itemContainerStyle,
+              ...dndStyle,
+              position: 'absolute',
+              top: 0,
+              left: 0,
+              width: '100%',
+              transform: combinedTransform
+            }}>
+            <div {...provided.dragHandleProps} className="draggable-content" style={{ ...itemStyle }}>
+              {item && children(item, virtualItem.index)}
+            </div>
+          </div>
+        )
+      }}
+    </Draggable>
+  )
+})
+
+export default DraggableVirtualList
--- a/src/renderer/src/components/Icons/SVGIcon.tsx
+++ b/src/renderer/src/components/Icons/SVGIcon.tsx
@ -1,14 +1,25 @@
+import { lightbulbVariants } from '@renderer/utils/motionVariants'
+import { motion } from 'framer-motion'
 import { SVGProps } from 'react'

-export const StreamlineGoodHealthAndWellBeing = (props: SVGProps<SVGSVGElement>) => {
+export const StreamlineGoodHealthAndWellBeing = (
+  props: SVGProps<SVGSVGElement> & {
+    size?: number | string
+    isActive?: boolean
+  }
+) => {
+  const { size = '1em', isActive, ...svgProps } = props
+
  return (
-    <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 14 14" {...props}>
-      {/* Icon from Streamline by Streamline - https://creativecommons.org/licenses/by/4.0/ */}
-      <g fill="none" stroke="currentColor" strokeLinecap="round" strokeLinejoin="round">
-        <path d="m10.097 12.468l-2.773-2.52c-1.53-1.522.717-4.423 2.773-2.045c2.104-2.33 4.303.57 2.773 2.045z"></path>
-        <path d="M.621 6.088h1.367l1.823 3.19l4.101-7.747l1.823 3.646"></path>
-      </g>
-    </svg>
+    <motion.span variants={lightbulbVariants} animate={isActive ? 'active' : 'idle'} initial="idle">
+      <svg xmlns="http://www.w3.org/2000/svg" width={size} height={size} viewBox="0 -2 14 16" {...svgProps}>
+        {/* Icon from Streamline by Streamline - https://creativecommons.org/licenses/by/4.0/ */}
+        <g fill="none" stroke="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth={1.2}>
+          <path d="m10.097 12.468l-2.773-2.52c-1.53-1.522.717-4.423 2.773-2.045c2.104-2.33 4.303.57 2.773 2.045z"></path>
+          <path d="M.621 6.088h1.367l1.823 3.19l4.101-7.747l1.823 3.646"></path>
+        </g>
+      </svg>
+    </motion.span>
  )
 }

--- a/src/renderer/src/components/Icons/tests/CopyIcon.test.tsx
+++ b/src/renderer/src/components/Icons/tests/CopyIcon.test.tsx
@ -0,0 +1,15 @@
+import { render } from '@testing-library/react'
+import { describe, expect, it, vi } from 'vitest'
+
+import CopyIcon from '../CopyIcon'
+
+describe('CopyIcon', () => {
+  it('should match snapshot with props and className', () => {
+    const onClick = vi.fn()
+    const { container } = render(
+      <CopyIcon className="custom-class" onClick={onClick} title="Copy to clipboard" data-testid="copy-icon" />
+    )
+
+    expect(container.firstChild).toMatchSnapshot()
+  })
+})
--- a/src/renderer/src/components/Icons/tests/MinAppIcon.test.tsx
+++ b/src/renderer/src/components/Icons/tests/MinAppIcon.test.tsx
@ -0,0 +1,65 @@
+import { render } from '@testing-library/react'
+import { describe, expect, it, vi } from 'vitest'
+
+import MinAppIcon from '../MinAppIcon'
+
+vi.mock('@renderer/config/minapps', () => ({
+  DEFAULT_MIN_APPS: [
+    {
+      id: 'test-app-1',
+      name: 'Test App 1',
+      logo: '/test-logo-1.png',
+      url: 'https://test1.com',
+      bodered: true,
+      background: '#f0f0f0'
+    },
+    {
+      id: 'test-app-2',
+      name: 'Test App 2',
+      logo: '/test-logo-2.png',
+      url: 'https://test2.com',
+      bodered: false,
+      background: undefined
+    }
+  ]
+}))
+
+describe('MinAppIcon', () => {
+  const mockApp = {
+    id: 'test-app-1',
+    name: 'Test App',
+    url: 'https://test.com',
+    style: {
+      opacity: 0.8,
+      transform: 'scale(1.1)'
+    }
+  }
+
+  it('should render correctly with various props', () => {
+    const customStyle = { marginTop: '10px' }
+    const { container } = render(<MinAppIcon app={mockApp} size={64} style={customStyle} sidebar={false} />)
+
+    expect(container.firstChild).toMatchSnapshot()
+  })
+
+  it('should not apply app.style when sidebar is true', () => {
+    const { container } = render(<MinAppIcon app={mockApp} sidebar={true} />)
+    const img = container.querySelector('img')
+
+    expect(img).not.toHaveStyle({
+      opacity: '0.8',
+      transform: 'scale(1.1)'
+    })
+  })
+
+  it('should return null when app is not found in DEFAULT_MIN_APPS', () => {
+    const unknownApp = {
+      id: 'unknown-app',
+      name: 'Unknown App',
+      url: 'https://unknown.com'
+    }
+    const { container } = render(<MinAppIcon app={unknownApp} />)
+
+    expect(container.firstChild).toBeNull()
+  })
+})
--- a/src/renderer/src/components/Icons/tests/snapshots/CopyIcon.test.tsx.snap
+++ b/src/renderer/src/components/Icons/tests/snapshots/CopyIcon.test.tsx.snap
@ -0,0 +1,9 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`CopyIcon > should match snapshot with props and className 1`] = `
+<i
+  class="iconfont icon-copy custom-class"
+  data-testid="copy-icon"
+  title="Copy to clipboard"
+/>
+`;
--- a/src/renderer/src/components/Icons/tests/snapshots/MinAppIcon.test.tsx.snap
+++ b/src/renderer/src/components/Icons/tests/snapshots/MinAppIcon.test.tsx.snap
@ -0,0 +1,15 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`MinAppIcon > should render correctly with various props 1`] = `
+.c0 {
+  border-radius: 16px;
+  user-select: none;
+  -webkit-user-drag: none;
+}
+
+<img
+  class="c0"
+  src="/test-logo-1.png"
+  style="border: 0.5px solid var(--color-border); width: 64px; height: 64px; background-color: rgb(240, 240, 240); opacity: 0.8; transform: scale(1.1); margin-top: 10px;"
+/>
+`;
--- a/src/renderer/src/components/LocalBackupManager.tsx
+++ b/src/renderer/src/components/LocalBackupManager.tsx
@ -0,0 +1,255 @@
+import { DeleteOutlined, ExclamationCircleOutlined, ReloadOutlined } from '@ant-design/icons'
+import { restoreFromLocalBackup } from '@renderer/services/BackupService'
+import { formatFileSize } from '@renderer/utils'
+import { Button, message, 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 LocalBackupManagerProps {
+  visible: boolean
+  onClose: () => void
+  localBackupDir?: string
+  restoreMethod?: (fileName: string) => Promise<void>
+}
+
+export function LocalBackupManager({ visible, onClose, localBackupDir, restoreMethod }: LocalBackupManagerProps) {
+  const { t } = useTranslation()
+  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 fetchBackupFiles = useCallback(async () => {
+    if (!localBackupDir) {
+      return
+    }
+
+    setLoading(true)
+    try {
+      const files = await window.api.backup.listLocalBackupFiles(localBackupDir)
+      setBackupFiles(files)
+      setPagination((prev) => ({
+        ...prev,
+        total: files.length
+      }))
+    } catch (error: any) {
+      message.error(`${t('settings.data.local.backup.manager.fetch.error')}: ${error.message}`)
+    } finally {
+      setLoading(false)
+    }
+  }, [localBackupDir, 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) {
+      message.warning(t('settings.data.local.backup.manager.select.files.delete'))
+      return
+    }
+
+    if (!localBackupDir) {
+      return
+    }
+
+    window.modal.confirm({
+      title: t('settings.data.local.backup.manager.delete.confirm.title'),
+      icon: <ExclamationCircleOutlined />,
+      content: t('settings.data.local.backup.manager.delete.confirm.multiple', { count: selectedRowKeys.length }),
+      okText: t('common.confirm'),
+      cancelText: t('common.cancel'),
+      centered: true,
+      onOk: async () => {
+        setDeleting(true)
+        try {
+          // Delete selected files one by one
+          for (const key of selectedRowKeys) {
+            await window.api.backup.deleteLocalBackupFile(key.toString(), localBackupDir)
+          }
+          message.success(
+            t('settings.data.local.backup.manager.delete.success.multiple', { count: selectedRowKeys.length })
+          )
+          setSelectedRowKeys([])
+          await fetchBackupFiles()
+        } catch (error: any) {
+          message.error(`${t('settings.data.local.backup.manager.delete.error')}: ${error.message}`)
+        } finally {
+          setDeleting(false)
+        }
+      }
+    })
+  }
+
+  const handleDeleteSingle = async (fileName: string) => {
+    if (!localBackupDir) {
+      return
+    }
+
+    window.modal.confirm({
+      title: t('settings.data.local.backup.manager.delete.confirm.title'),
+      icon: <ExclamationCircleOutlined />,
+      content: t('settings.data.local.backup.manager.delete.confirm.single', { fileName }),
+      okText: t('common.confirm'),
+      cancelText: t('common.cancel'),
+      centered: true,
+      onOk: async () => {
+        setDeleting(true)
+        try {
+          await window.api.backup.deleteLocalBackupFile(fileName, localBackupDir)
+          message.success(t('settings.data.local.backup.manager.delete.success.single'))
+          await fetchBackupFiles()
+        } catch (error: any) {
+          message.error(`${t('settings.data.local.backup.manager.delete.error')}: ${error.message}`)
+        } finally {
+          setDeleting(false)
+        }
+      }
+    })
+  }
+
+  const handleRestore = async (fileName: string) => {
+    if (!localBackupDir) {
+      return
+    }
+
+    window.modal.confirm({
+      title: t('settings.data.local.restore.confirm.title'),
+      icon: <ExclamationCircleOutlined />,
+      content: t('settings.data.local.restore.confirm.content'),
+      okText: t('common.confirm'),
+      cancelText: t('common.cancel'),
+      centered: true,
+      onOk: async () => {
+        setRestoring(true)
+        try {
+          await (restoreMethod || restoreFromLocalBackup)(fileName)
+          message.success(t('settings.data.local.backup.manager.restore.success'))
+          onClose() // Close the modal
+        } catch (error: any) {
+          message.error(`${t('settings.data.local.backup.manager.restore.error')}: ${error.message}`)
+        } finally {
+          setRestoring(false)
+        }
+      }
+    })
+  }
+
+  const columns = [
+    {
+      title: t('settings.data.local.backup.manager.columns.fileName'),
+      dataIndex: 'fileName',
+      key: 'fileName',
+      ellipsis: {
+        showTitle: false
+      },
+      render: (fileName: string) => (
+        <Tooltip placement="topLeft" title={fileName}>
+          {fileName}
+        </Tooltip>
+      )
+    },
+    {
+      title: t('settings.data.local.backup.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.local.backup.manager.columns.size'),
+      dataIndex: 'size',
+      key: 'size',
+      width: 120,
+      render: (size: number) => formatFileSize(size)
+    },
+    {
+      title: t('settings.data.local.backup.manager.columns.actions'),
+      key: 'action',
+      width: 160,
+      render: (_: any, record: BackupFile) => (
+        <>
+          <Button type="link" onClick={() => handleRestore(record.fileName)} disabled={restoring || deleting}>
+            {t('settings.data.local.backup.manager.restore.text')}
+          </Button>
+          <Button
+            type="link"
+            danger
+            onClick={() => handleDeleteSingle(record.fileName)}
+            disabled={deleting || restoring}>
+            {t('settings.data.local.backup.manager.delete.text')}
+          </Button>
+        </>
+      )
+    }
+  ]
+
+  const rowSelection = {
+    selectedRowKeys,
+    onChange: (selectedRowKeys: React.Key[]) => {
+      setSelectedRowKeys(selectedRowKeys)
+    }
+  }
+
+  return (
+    <Modal
+      title={t('settings.data.local.backup.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.local.backup.manager.refresh')}
+        </Button>,
+        <Button
+          key="delete"
+          danger
+          icon={<DeleteOutlined />}
+          onClick={handleDeleteSelected}
+          disabled={selectedRowKeys.length === 0 || deleting}
+          loading={deleting}>
+          {t('settings.data.local.backup.manager.delete.selected')} ({selectedRowKeys.length})
+        </Button>,
+        <Button key="close" onClick={onClose}>
+          {t('common.close')}
+        </Button>
+      ]}>
+      <Table
+        rowKey="fileName"
+        columns={columns}
+        dataSource={backupFiles}
+        rowSelection={rowSelection}
+        pagination={pagination}
+        loading={loading}
+        onChange={handleTableChange}
+        size="middle"
+      />
+    </Modal>
+  )
+}
--- a/src/renderer/src/components/LocalBackupModals.tsx
+++ b/src/renderer/src/components/LocalBackupModals.tsx
@ -0,0 +1,98 @@
+import { backupToLocalDir } from '@renderer/services/BackupService'
+import { Button, Input, Modal } from 'antd'
+import dayjs from 'dayjs'
+import { useCallback, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+interface LocalBackupModalProps {
+  isModalVisible: boolean
+  handleBackup: () => void
+  handleCancel: () => void
+  backuping: boolean
+  customFileName: string
+  setCustomFileName: (value: string) => void
+}
+
+export function LocalBackupModal({
+  isModalVisible,
+  handleBackup,
+  handleCancel,
+  backuping,
+  customFileName,
+  setCustomFileName
+}: LocalBackupModalProps) {
+  const { t } = useTranslation()
+
+  return (
+    <Modal
+      title={t('settings.data.local.backup.modal.title')}
+      open={isModalVisible}
+      onOk={handleBackup}
+      onCancel={handleCancel}
+      footer={[
+        <Button key="back" onClick={handleCancel}>
+          {t('common.cancel')}
+        </Button>,
+        <Button key="submit" type="primary" loading={backuping} onClick={handleBackup}>
+          {t('common.confirm')}
+        </Button>
+      ]}>
+      <Input
+        value={customFileName}
+        onChange={(e) => setCustomFileName(e.target.value)}
+        placeholder={t('settings.data.local.backup.modal.filename.placeholder')}
+      />
+    </Modal>
+  )
+}
+
+// Hook for backup modal
+export function useLocalBackupModal(localBackupDir: string | undefined) {
+  const [isModalVisible, setIsModalVisible] = useState(false)
+  const [backuping, setBackuping] = useState(false)
+  const [customFileName, setCustomFileName] = useState('')
+
+  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)
+  }, [])
+
+  const handleBackup = async () => {
+    if (!localBackupDir) {
+      setIsModalVisible(false)
+      return
+    }
+
+    setBackuping(true)
+    try {
+      await backupToLocalDir({
+        showMessage: true,
+        customFileName
+      })
+      setIsModalVisible(false)
+    } catch (error) {
+      console.error('[LocalBackupModal] Backup failed:', error)
+    } finally {
+      setBackuping(false)
+    }
+  }
+
+  return {
+    isModalVisible,
+    handleBackup,
+    handleCancel,
+    backuping,
+    customFileName,
+    setCustomFileName,
+    showBackupModal
+  }
+}
--- a/src/renderer/src/components/MarkdownEditor/README.md
+++ b/src/renderer/src/components/MarkdownEditor/README.md
@ -1 +0,0 @@
- 
--- a/src/renderer/src/components/Popups/ApiKeyListPopup/hook.ts
+++ b/src/renderer/src/components/Popups/ApiKeyListPopup/hook.ts
@ -0,0 +1,307 @@
+import Logger from '@renderer/config/logger'
+import { isEmbeddingModel, isRerankModel } from '@renderer/config/models'
+import SelectProviderModelPopup from '@renderer/pages/settings/ProviderSettings/SelectProviderModelPopup'
+import { checkApi } from '@renderer/services/ApiService'
+import WebSearchService from '@renderer/services/WebSearchService'
+import { Model, PreprocessProvider, Provider, WebSearchProvider } from '@renderer/types'
+import { formatApiKeys, splitApiKeyString } from '@renderer/utils/api'
+import { formatErrorMessage } from '@renderer/utils/error'
+import { TFunction } from 'i18next'
+import { isEmpty } from 'lodash'
+import { useCallback, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { ApiKeyConnectivity, ApiKeyValidity, ApiKeyWithStatus, ApiProviderKind, ApiProviderUnion } from './types'
+
+interface UseApiKeysProps {
+  provider: ApiProviderUnion
+  updateProvider: (provider: Partial<ApiProviderUnion>) => void
+  providerKind: ApiProviderKind
+}
+
+/**
+ * API Keys 管理 hook
+ */
+export function useApiKeys({ provider, updateProvider, providerKind }: UseApiKeysProps) {
+  const { t } = useTranslation()
+
+  // 连通性检查的 UI 状态管理
+  const [connectivityStates, setConnectivityStates] = useState<Map<string, ApiKeyConnectivity>>(new Map())
+
+  // 保存 apiKey 到 provider
+  const updateProviderWithKey = useCallback(
+    (newKeys: string[]) => {
+      const validKeys = newKeys.filter((k) => k.trim())
+      const formattedKeyString = formatApiKeys(validKeys.join(','))
+      updateProvider({ apiKey: formattedKeyString })
+    },
+    [updateProvider]
+  )
+
+  // 解析 keyString 为数组
+  const keys = useMemo(() => {
+    if (!provider.apiKey) return []
+    const formattedApiKeys = formatApiKeys(provider.apiKey)
+    const keys = splitApiKeyString(formattedApiKeys)
+    return Array.from(new Set(keys))
+  }, [provider.apiKey])
+
+  // 合并基本数据和连通性状态
+  const keysWithStatus = useMemo((): ApiKeyWithStatus[] => {
+    return keys.map((key) => {
+      const connectivityState = connectivityStates.get(key) || {
+        status: 'not_checked' as const,
+        checking: false,
+        error: undefined,
+        model: undefined,
+        latency: undefined
+      }
+      return {
+        key,
+        ...connectivityState
+      }
+    })
+  }, [keys, connectivityStates])
+
+  // 更新单个 key 的连通性状态
+  const updateConnectivityState = useCallback((key: string, state: Partial<ApiKeyConnectivity>) => {
+    setConnectivityStates((prev) => {
+      const newMap = new Map(prev)
+      const currentState = prev.get(key) || {
+        status: 'not_checked' as const,
+        checking: false,
+        error: undefined,
+        model: undefined,
+        latency: undefined
+      }
+      newMap.set(key, { ...currentState, ...state })
+      return newMap
+    })
+  }, [])
+
+  // 验证 API key 格式
+  const validateApiKey = useCallback(
+    (key: string, existingKeys: string[] = []): ApiKeyValidity => {
+      const trimmedKey = key.trim()
+
+      if (!trimmedKey) {
+        return { isValid: false, error: t('settings.provider.api.key.error.empty') }
+      }
+
+      if (existingKeys.includes(trimmedKey)) {
+        return { isValid: false, error: t('settings.provider.api.key.error.duplicate') }
+      }
+
+      return { isValid: true }
+    },
+    [t]
+  )
+
+  // 添加新 key
+  const addKey = useCallback(
+    (key: string): ApiKeyValidity => {
+      const validation = validateApiKey(key, keys)
+
+      if (!validation.isValid) {
+        return validation
+      }
+
+      updateProviderWithKey([...keys, key.trim()])
+      return { isValid: true }
+    },
+    [validateApiKey, keys, updateProviderWithKey]
+  )
+
+  // 更新 key
+  const updateKey = useCallback(
+    (index: number, key: string): ApiKeyValidity => {
+      if (index < 0 || index >= keys.length) {
+        Logger.error('[ApiKeyList] invalid key index', { index })
+        return { isValid: false, error: 'Invalid index' }
+      }
+
+      const otherKeys = keys.filter((_, i) => i !== index)
+      const validation = validateApiKey(key, otherKeys)
+
+      if (!validation.isValid) {
+        return validation
+      }
+
+      // 清除旧 key 的连通性状态
+      const oldKey = keys[index]
+      if (oldKey !== key.trim()) {
+        setConnectivityStates((prev) => {
+          const newMap = new Map(prev)
+          newMap.delete(oldKey)
+          return newMap
+        })
+      }
+
+      const newKeys = [...keys]
+      newKeys[index] = key.trim()
+      updateProviderWithKey(newKeys)
+
+      return { isValid: true }
+    },
+    [keys, validateApiKey, updateProviderWithKey]
+  )
+
+  // 移除 key
+  const removeKey = useCallback(
+    (index: number) => {
+      if (index < 0 || index >= keys.length) return
+
+      const keyToRemove = keys[index]
+      const newKeys = keys.filter((_, i) => i !== index)
+
+      // 清除对应的连通性状态
+      setConnectivityStates((prev) => {
+        const newMap = new Map(prev)
+        newMap.delete(keyToRemove)
+        return newMap
+      })
+
+      updateProviderWithKey(newKeys)
+    },
+    [keys, updateProviderWithKey]
+  )
+
+  // 移除连通性检查失败的 keys
+  const removeInvalidKeys = useCallback(() => {
+    const validKeys = keysWithStatus.filter((keyStatus) => keyStatus.status !== 'error').map((k) => k.key)
+
+    // 清除被删除的 keys 的连通性状态
+    const keysToRemove = keysWithStatus.filter((keyStatus) => keyStatus.status === 'error').map((k) => k.key)
+
+    setConnectivityStates((prev) => {
+      const newMap = new Map(prev)
+      keysToRemove.forEach((key) => newMap.delete(key))
+      return newMap
+    })
+
+    updateProviderWithKey(validKeys)
+  }, [keysWithStatus, updateProviderWithKey])
+
+  // 检查单个 key 的连通性，不负责选择和验证模型
+  const runConnectivityCheck = useCallback(
+    async (index: number, model?: Model): Promise<void> => {
+      const keyToCheck = keys[index]
+      const currentState = connectivityStates.get(keyToCheck)
+      if (currentState?.checking) return
+
+      // 设置检查状态
+      updateConnectivityState(keyToCheck, { checking: true })
+
+      try {
+        const startTime = Date.now()
+        if (isLlmProvider(provider, providerKind) && model) {
+          await checkApi({ ...provider, apiKey: keyToCheck }, model)
+        } else {
+          const result = await WebSearchService.checkSearch({ ...provider, apiKey: keyToCheck })
+          if (!result.valid) throw new Error(result.error)
+        }
+        const latency = Date.now() - startTime
+
+        // 连通性检查成功
+        updateConnectivityState(keyToCheck, {
+          checking: false,
+          status: 'success',
+          model,
+          latency,
+          error: undefined
+        })
+      } catch (error: any) {
+        // 连通性检查失败
+        updateConnectivityState(keyToCheck, {
+          checking: false,
+          status: 'error',
+          error: formatErrorMessage(error),
+          model: undefined,
+          latency: undefined
+        })
+
+        Logger.error('[ApiKeyList] failed to validate the connectivity of the api key', error)
+      }
+    },
+    [keys, connectivityStates, updateConnectivityState, provider, providerKind]
+  )
+
+  // 检查单个 key 的连通性
+  const checkKeyConnectivity = useCallback(
+    async (index: number): Promise<void> => {
+      if (!provider || index < 0 || index >= keys.length) return
+
+      const keyToCheck = keys[index]
+      const currentState = connectivityStates.get(keyToCheck)
+      if (currentState?.checking) return
+
+      const model = isLlmProvider(provider, providerKind) ? await getModelForCheck(provider, t) : undefined
+      if (model === null) return
+
+      await runConnectivityCheck(index, model)
+    },
+    [provider, keys, connectivityStates, providerKind, t, runConnectivityCheck]
+  )
+
+  // 检查所有 keys 的连通性
+  const checkAllKeysConnectivity = useCallback(async () => {
+    if (!provider || keys.length === 0) return
+
+    const model = isLlmProvider(provider, providerKind) ? await getModelForCheck(provider, t) : undefined
+    if (model === null) return
+
+    await Promise.allSettled(keys.map((_, index) => runConnectivityCheck(index, model)))
+  }, [provider, keys, providerKind, t, runConnectivityCheck])
+
+  // 计算是否有 key 正在检查
+  const isChecking = useMemo(() => {
+    return Array.from(connectivityStates.values()).some((state) => state.checking)
+  }, [connectivityStates])
+
+  return {
+    keys: keysWithStatus,
+    addKey,
+    updateKey,
+    removeKey,
+    removeInvalidKeys,
+    checkKeyConnectivity,
+    checkAllKeysConnectivity,
+    isChecking
+  }
+}
+
+export function isLlmProvider(obj: any, kind: ApiProviderKind): obj is Provider {
+  return kind === 'llm' && 'type' in obj && 'models' in obj
+}
+
+export function isWebSearchProvider(obj: any, kind: ApiProviderKind): obj is WebSearchProvider {
+  return kind === 'websearch' && ('url' in obj || 'engines' in obj)
+}
+
+export function isPreprocessProvider(obj: any, kind: ApiProviderKind): obj is PreprocessProvider {
+  return kind === 'doc-preprocess' && ('quota' in obj || 'options' in obj)
+}
+
+// 获取模型用于检查
+async function getModelForCheck(provider: Provider, t: TFunction): Promise<Model | null> {
+  const modelsToCheck = 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 {
+    const selectedModel = await SelectProviderModelPopup.show({ provider })
+    if (!selectedModel) return null
+    return selectedModel
+  } catch (error) {
+    Logger.error('[ApiKeyList] failed to select model', error)
+    return null
+  }
+}
--- a/src/renderer/src/components/Popups/ApiKeyListPopup/index.ts
+++ b/src/renderer/src/components/Popups/ApiKeyListPopup/index.ts
@ -0,0 +1,2 @@
+export { default as ApiKeyListPopup } from './popup'
+export * from './types'
--- a/src/renderer/src/components/Popups/ApiKeyListPopup/item.tsx
+++ b/src/renderer/src/components/Popups/ApiKeyListPopup/item.tsx
@ -0,0 +1,213 @@
+import { CheckCircleFilled, CloseCircleFilled, MinusOutlined } from '@ant-design/icons'
+import { StreamlineGoodHealthAndWellBeing } from '@renderer/components/Icons/SVGIcon'
+import { maskApiKey } from '@renderer/utils/api'
+import { Button, Flex, Input, InputRef, List, Popconfirm, Tooltip, Typography } from 'antd'
+import { Check, PenLine, X } from 'lucide-react'
+import { FC, memo, useEffect, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import styled from 'styled-components'
+
+import { ApiKeyValidity, ApiKeyWithStatus } from './types'
+
+export interface ApiKeyItemProps {
+  keyStatus: ApiKeyWithStatus
+  onUpdate: (newKey: string) => ApiKeyValidity
+  onRemove: () => void
+  onCheck: () => Promise<void>
+  disabled?: boolean
+  showHealthCheck?: boolean
+  isNew?: boolean
+}
+
+/**
+ * API Key 项组件
+ * 支持编辑、删除、连接检查等操作
+ */
+const ApiKeyItem: FC<ApiKeyItemProps> = ({
+  keyStatus,
+  onUpdate,
+  onRemove,
+  onCheck,
+  disabled: _disabled = false,
+  showHealthCheck = true,
+  isNew = false
+}) => {
+  const { t } = useTranslation()
+  const [isEditing, setIsEditing] = useState(isNew || !keyStatus.key.trim())
+  const [editValue, setEditValue] = useState(keyStatus.key)
+  const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false)
+  const inputRef = useRef<InputRef>(null)
+
+  const disabled = keyStatus.checking || _disabled
+  const isNotChecked = keyStatus.status === 'not_checked'
+  const isSuccess = keyStatus.status === 'success'
+  const statusColor = isSuccess ? 'var(--color-status-success)' : 'var(--color-status-error)'
+
+  useEffect(() => {
+    if (isEditing && inputRef.current) {
+      inputRef.current.focus()
+    }
+  }, [isEditing])
+
+  useEffect(() => {
+    setHasUnsavedChanges(editValue.trim() !== keyStatus.key.trim())
+  }, [editValue, keyStatus.key])
+
+  const handleEdit = () => {
+    if (disabled) return
+    setIsEditing(true)
+    setEditValue(keyStatus.key)
+  }
+
+  const handleSave = () => {
+    const result = onUpdate(editValue)
+    if (!result.isValid) {
+      window.message.warning({
+        key: 'api-key-error',
+        content: result.error
+      })
+      return
+    }
+
+    setIsEditing(false)
+  }
+
+  const handleCancelEdit = () => {
+    if (isNew || !keyStatus.key.trim()) {
+      // 临时项取消时直接移除
+      onRemove()
+    } else {
+      // 现有项取消时恢复原值
+      setEditValue(keyStatus.key)
+      setIsEditing(false)
+    }
+  }
+
+  const renderStatusIcon = () => {
+    if (keyStatus.checking || isNotChecked) return null
+
+    const StatusIcon = isSuccess ? CheckCircleFilled : CloseCircleFilled
+    return <StatusIcon style={{ color: statusColor }} />
+  }
+
+  const renderKeyCheckResultTooltip = () => {
+    if (keyStatus.checking) {
+      return t('settings.models.check.checking')
+    }
+
+    if (isNotChecked) {
+      return ''
+    }
+
+    const statusTitle = isSuccess ? t('settings.models.check.passed') : t('settings.models.check.failed')
+
+    return (
+      <div style={{ maxHeight: '200px', overflowY: 'auto', maxWidth: '300px', wordWrap: 'break-word' }}>
+        <strong style={{ color: statusColor }}>{statusTitle}</strong>
+        {keyStatus.model && (
+          <div style={{ marginTop: 5 }}>
+            {t('common.model')}: {keyStatus.model.name}
+          </div>
+        )}
+        {keyStatus.latency && isSuccess && (
+          <div style={{ marginTop: 5 }}>
+            {t('settings.provider.api.key.check.latency')}: {(keyStatus.latency / 1000).toFixed(2)}s
+          </div>
+        )}
+        {keyStatus.error && <div style={{ marginTop: 5 }}>{keyStatus.error}</div>}
+      </div>
+    )
+  }
+
+  return (
+    <List.Item>
+      {isEditing ? (
+        <ItemInnerContainer style={{ gap: '10px' }}>
+          <Input.Password
+            ref={inputRef}
+            value={editValue}
+            onChange={(e) => setEditValue(e.target.value)}
+            onPressEnter={handleSave}
+            placeholder={t('settings.provider.api.key.new_key.placeholder')}
+            style={{ flex: 1, fontSize: '14px', marginLeft: '-10px' }}
+            spellCheck={false}
+            disabled={disabled}
+          />
+          <Flex gap={0} align="center">
+            <Tooltip title={t('common.save')}>
+              <Button
+                type={hasUnsavedChanges ? 'primary' : 'text'}
+                icon={<Check size={16} />}
+                onClick={handleSave}
+                disabled={disabled}
+              />
+            </Tooltip>
+            <Tooltip title={t('common.cancel')}>
+              <Button type="text" icon={<X size={16} />} onClick={handleCancelEdit} disabled={disabled} />
+            </Tooltip>
+          </Flex>
+        </ItemInnerContainer>
+      ) : (
+        <ItemInnerContainer style={{ gap: '10px' }}>
+          <Tooltip
+            title={
+              <Typography.Text style={{ color: 'white' }} copyable={{ text: keyStatus.key }}>
+                {keyStatus.key}
+              </Typography.Text>
+            }
+            mouseEnterDelay={0.5}
+            placement="top"
+            // 确保不留下明文
+            destroyTooltipOnHide>
+            <span style={{ cursor: 'help' }}>{maskApiKey(keyStatus.key)}</span>
+          </Tooltip>
+
+          <Flex gap={10} align="center">
+            <Tooltip title={renderKeyCheckResultTooltip()} styles={{ body: { userSelect: 'text' } }}>
+              {renderStatusIcon()}
+            </Tooltip>
+
+            <Flex gap={0} align="center">
+              {showHealthCheck && (
+                <Tooltip title={t('settings.provider.check')} mouseLeaveDelay={0}>
+                  <Button
+                    type="text"
+                    icon={<StreamlineGoodHealthAndWellBeing size={'1.2em'} isActive={keyStatus.checking} />}
+                    onClick={onCheck}
+                    disabled={disabled}
+                  />
+                </Tooltip>
+              )}
+              <Tooltip title={t('common.edit')} mouseLeaveDelay={0}>
+                <Button type="text" icon={<PenLine size={16} />} onClick={handleEdit} disabled={disabled} />
+              </Tooltip>
+              <Popconfirm
+                title={t('common.delete_confirm')}
+                onConfirm={onRemove}
+                disabled={disabled}
+                okText={t('common.confirm')}
+                cancelText={t('common.cancel')}
+                okButtonProps={{ danger: true }}>
+                <Tooltip title={t('common.delete')} mouseLeaveDelay={0}>
+                  <Button type="text" icon={<MinusOutlined />} disabled={disabled} />
+                </Tooltip>
+              </Popconfirm>
+            </Flex>
+          </Flex>
+        </ItemInnerContainer>
+      )}
+    </List.Item>
+  )
+}
+
+const ItemInnerContainer = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  padding: 0;
+  margin: 0;
+`
+
+export default memo(ApiKeyItem)
--- a/src/renderer/src/components/Popups/ApiKeyListPopup/list.tsx
+++ b/src/renderer/src/components/Popups/ApiKeyListPopup/list.tsx
@ -0,0 +1,224 @@
+import { PlusOutlined } from '@ant-design/icons'
+import { StreamlineGoodHealthAndWellBeing } from '@renderer/components/Icons/SVGIcon'
+import Scrollbar from '@renderer/components/Scrollbar'
+import { usePreprocessProvider } from '@renderer/hooks/usePreprocess'
+import { useProvider } from '@renderer/hooks/useProvider'
+import { useWebSearchProvider } from '@renderer/hooks/useWebSearchProviders'
+import { SettingHelpText } from '@renderer/pages/settings'
+import { isProviderSupportAuth } from '@renderer/services/ProviderService'
+import { Button, Card, Flex, List, Popconfirm, Space, Tooltip, Typography } from 'antd'
+import { Trash } from 'lucide-react'
+import { FC, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { isLlmProvider, useApiKeys } from './hook'
+import ApiKeyItem from './item'
+import { ApiKeyWithStatus, ApiProviderKind, ApiProviderUnion } from './types'
+
+interface ApiKeyListProps {
+  provider: ApiProviderUnion
+  updateProvider: (provider: Partial<ApiProviderUnion>) => void
+  providerKind: ApiProviderKind
+  showHealthCheck?: boolean
+}
+
+/**
+ * Api key 列表，管理 CRUD 操作、连接检查
+ */
+export const ApiKeyList: FC<ApiKeyListProps> = ({ provider, updateProvider, providerKind, showHealthCheck = true }) => {
+  const { t } = useTranslation()
+
+  // 临时新项状态
+  const [pendingNewKey, setPendingNewKey] = useState<{ key: string; id: string } | null>(null)
+
+  const {
+    keys,
+    addKey,
+    updateKey,
+    removeKey,
+    removeInvalidKeys,
+    checkKeyConnectivity,
+    checkAllKeysConnectivity,
+    isChecking
+  } = useApiKeys({ provider, updateProvider, providerKind: providerKind })
+
+  // 创建一个临时新项
+  const handleAddNew = () => {
+    setPendingNewKey({ key: '', id: Date.now().toString() })
+  }
+
+  const handleUpdate = (index: number, newKey: string, isNew: boolean) => {
+    if (isNew) {
+      // 新项保存时，调用真正的 addKey，然后清除临时状态
+      const result = addKey(newKey)
+      if (result.isValid) {
+        setPendingNewKey(null)
+      }
+      return result
+    } else {
+      // 现有项更新
+      return updateKey(index, newKey)
+    }
+  }
+
+  const handleRemove = (index: number, isNew: boolean) => {
+    if (isNew) {
+      setPendingNewKey(null) // 新项取消时，直接清除临时状态
+    } else {
+      removeKey(index) // 现有项删除
+    }
+  }
+
+  const shouldAutoFocus = () => {
+    if (provider.apiKey) return false
+    return isLlmProvider(provider, providerKind) && provider.enabled && !isProviderSupportAuth(provider)
+  }
+
+  // 合并真实 keys 和临时新项
+  const displayKeys: ApiKeyWithStatus[] = pendingNewKey
+    ? [
+        ...keys,
+        {
+          key: pendingNewKey.key,
+          status: 'not_checked',
+          checking: false
+        }
+      ]
+    : keys
+
+  return (
+    <>
+      {/* Keys 列表 */}
+      <Card
+        size="small"
+        type="inner"
+        styles={{ body: { padding: 0 } }}
+        style={{ marginBottom: '5px', border: '0.5px solid var(--color-border)' }}>
+        {displayKeys.length === 0 ? (
+          <Typography.Text type="secondary" style={{ padding: '4px 11px', display: 'block' }}>
+            {t('error.no_api_key')}
+          </Typography.Text>
+        ) : (
+          <Scrollbar style={{ maxHeight: '60vh', overflowX: 'hidden' }}>
+            <List
+              size="small"
+              dataSource={displayKeys}
+              renderItem={(keyStatus, index) => {
+                const isNew = pendingNewKey && index === displayKeys.length - 1
+                return (
+                  <ApiKeyItem
+                    key={isNew ? pendingNewKey.id : index}
+                    keyStatus={keyStatus}
+                    showHealthCheck={showHealthCheck}
+                    isNew={!!isNew}
+                    onUpdate={(newKey) => handleUpdate(index, newKey, !!isNew)}
+                    onRemove={() => handleRemove(index, !!isNew)}
+                    onCheck={() => checkKeyConnectivity(index)}
+                  />
+                )
+              }}
+            />
+          </Scrollbar>
+        )}
+      </Card>
+
+      <Flex align="center" justify="space-between" style={{ marginTop: '0.5rem' }}>
+        {/* 帮助文本 */}
+        <SettingHelpText>{t('settings.provider.api_key.tip')}</SettingHelpText>
+
+        {/* 标题和操作按钮 */}
+        <Space style={{ gap: 6 }}>
+          {/* 批量删除无效 keys */}
+          {showHealthCheck && keys.length > 1 && (
+            <Space style={{ gap: 0 }}>
+              <Popconfirm
+                title={t('common.delete_confirm')}
+                onConfirm={removeInvalidKeys}
+                okText={t('common.confirm')}
+                cancelText={t('common.cancel')}
+                okButtonProps={{ danger: true }}>
+                <Tooltip title={t('settings.provider.remove_invalid_keys')} placement="top" mouseLeaveDelay={0}>
+                  <Button type="text" icon={<Trash size={16} />} disabled={isChecking || !!pendingNewKey} danger />
+                </Tooltip>
+              </Popconfirm>
+
+              {/* 批量检查 */}
+              <Tooltip title={t('settings.provider.check_all_keys')} placement="top" mouseLeaveDelay={0}>
+                <Button
+                  type="text"
+                  icon={<StreamlineGoodHealthAndWellBeing size={'1.2em'} />}
+                  onClick={checkAllKeysConnectivity}
+                  disabled={isChecking || !!pendingNewKey}
+                />
+              </Tooltip>
+            </Space>
+          )}
+
+          {/* 添加新 key */}
+          <Button
+            key="add"
+            type="primary"
+            onClick={handleAddNew}
+            icon={<PlusOutlined />}
+            autoFocus={shouldAutoFocus()}
+            disabled={isChecking || !!pendingNewKey}>
+            {t('common.add')}
+          </Button>
+        </Space>
+      </Flex>
+    </>
+  )
+}
+
+interface SpecificApiKeyListProps {
+  providerId: string
+  providerKind: ApiProviderKind
+  showHealthCheck?: boolean
+}
+
+export const LlmApiKeyList: FC<SpecificApiKeyListProps> = ({ providerId, providerKind, showHealthCheck = true }) => {
+  const { provider, updateProvider } = useProvider(providerId)
+
+  return (
+    <ApiKeyList
+      provider={provider}
+      updateProvider={updateProvider}
+      providerKind={providerKind}
+      showHealthCheck={showHealthCheck}
+    />
+  )
+}
+
+export const WebSearchApiKeyList: FC<SpecificApiKeyListProps> = ({
+  providerId,
+  providerKind,
+  showHealthCheck = true
+}) => {
+  const { provider, updateProvider } = useWebSearchProvider(providerId)
+
+  return (
+    <ApiKeyList
+      provider={provider}
+      updateProvider={updateProvider}
+      providerKind={providerKind}
+      showHealthCheck={showHealthCheck}
+    />
+  )
+}
+
+export const DocPreprocessApiKeyList: FC<SpecificApiKeyListProps> = ({
+  providerId,
+  providerKind,
+  showHealthCheck = true
+}) => {
+  const { provider, updateProvider } = usePreprocessProvider(providerId)
+
+  return (
+    <ApiKeyList
+      provider={provider}
+      updateProvider={updateProvider}
+      providerKind={providerKind}
+      showHealthCheck={showHealthCheck}
+    />
+  )
+}
--- a/src/renderer/src/components/Popups/ApiKeyListPopup/popup.tsx
+++ b/src/renderer/src/components/Popups/ApiKeyListPopup/popup.tsx
@ -0,0 +1,88 @@
+import { TopView } from '@renderer/components/TopView'
+import { Modal } from 'antd'
+import { useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { DocPreprocessApiKeyList, LlmApiKeyList, WebSearchApiKeyList } from './list'
+import { ApiProviderKind } from './types'
+
+interface ShowParams {
+  providerId: string
+  providerKind: ApiProviderKind
+  title?: string
+  showHealthCheck?: boolean
+}
+
+interface Props extends ShowParams {
+  resolve: (value: any) => void
+}
+
+/**
+ * API Key 列表弹窗容器组件
+ */
+const PopupContainer: React.FC<Props> = ({ providerId, providerKind, title, resolve, showHealthCheck = true }) => {
+  const [open, setOpen] = useState(true)
+  const { t } = useTranslation()
+
+  const onCancel = () => {
+    setOpen(false)
+  }
+
+  const onClose = () => {
+    resolve(null)
+  }
+
+  const ListComponent = useMemo(() => {
+    switch (providerKind) {
+      case 'llm':
+        return LlmApiKeyList
+      case 'websearch':
+        return WebSearchApiKeyList
+      case 'doc-preprocess':
+        return DocPreprocessApiKeyList
+      default:
+        return null
+    }
+  }, [providerKind])
+
+  return (
+    <Modal
+      title={title || t('settings.provider.api.key.list.title')}
+      open={open}
+      onCancel={onCancel}
+      afterClose={onClose}
+      transitionName="animation-move-down"
+      centered
+      width={600}
+      footer={null}>
+      {ListComponent && (
+        <ListComponent providerId={providerId} providerKind={providerKind} showHealthCheck={showHealthCheck} />
+      )}
+    </Modal>
+  )
+}
+
+const TopViewKey = 'ApiKeyListPopup'
+
+export default class ApiKeyListPopup {
+  static topviewId = 0
+
+  static hide() {
+    TopView.hide(TopViewKey)
+  }
+
+  static show(props: ShowParams) {
+    return new Promise<any>((resolve) => {
+      TopView.show(
+        <PopupContainer
+          {...props}
+          resolve={(v) => {
+            resolve(v)
+            TopView.hide(TopViewKey)
+          }}
+        />,
+        TopViewKey
+      )
+    })
+  }
+}
--- a/src/renderer/src/components/Popups/ApiKeyListPopup/types.ts
+++ b/src/renderer/src/components/Popups/ApiKeyListPopup/types.ts
@ -0,0 +1,31 @@
+import { Model, PreprocessProvider, Provider, WebSearchProvider } from '@renderer/types'
+
+/**
+ * API Key 连通性检查的状态
+ */
+export type ApiKeyConnectivity = {
+  status: 'success' | 'error' | 'not_checked'
+  checking?: boolean
+  error?: string
+  model?: Model
+  latency?: number
+}
+
+/**
+ * API key 及其连通性检查的状态
+ */
+export type ApiKeyWithStatus = {
+  key: string
+} & ApiKeyConnectivity
+
+/**
+ * API key 格式有效性
+ */
+export type ApiKeyValidity = {
+  isValid: boolean
+  error?: string
+}
+
+export type ApiProviderUnion = Provider | WebSearchProvider | PreprocessProvider
+
+export type ApiProviderKind = 'llm' | 'websearch' | 'doc-preprocess'
--- a/Show More
+++ b/Show More