feat: refactor web search to provider-specific tools with advanced parameters

- Add ExaSearchTool and TavilySearchTool with provider-specific parameters
- Extend type system for Exa (neural search, date filters) and Tavily (AI answers, search depth)
- Update all providers to support ProviderSpecificParams interface
- Add searchResultAdapters for unified citation conversion
- Remove rawContent from LLM output and storage to reduce token usage
- Support favicon, highlights, answer, images metadata
- Update UI components to handle new tool names
- Preserve existing RAG compression and token cutoff capabilities

Breaking changes: None (backward compatible with existing providers)

.github/issue-checker.yml

@@ -0,0 +1,252 @@
+default-mode:
+  add:
+  remove: [pull_request_target, issues]
+
+labels:
+  # <!-- [Ss]kip `LABEL` --> 跳过一个 label
+  # <!-- [Rr]emove `LABEL` --> 去掉一个 label
+
+  # skips and removes
+  - name: skip all
+    content:
+    regexes: '[Ss]kip (?:[Aa]ll |)[Ll]abels?'
+  - name: remove all
+    content:
+    regexes: '[Rr]emove (?:[Aa]ll |)[Ll]abels?'
+
+  - name: skip kind/bug
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)kind/bug(?:`|)'
+  - name: remove kind/bug
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)kind/bug(?:`|)'
+
+  - name: skip kind/enhancement
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)kind/enhancement(?:`|)'
+  - name: remove kind/enhancement
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)kind/enhancement(?:`|)'
+
+  - name: skip kind/question
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)kind/question(?:`|)'
+  - name: remove kind/question
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)kind/question(?:`|)'
+
+  - name: skip area/Connectivity
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)area/Connectivity(?:`|)'
+  - name: remove area/Connectivity
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)area/Connectivity(?:`|)'
+
+  - name: skip area/UI/UX
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)area/UI/UX(?:`|)'
+  - name: remove area/UI/UX
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)area/UI/UX(?:`|)'
+
+  - name: skip kind/documentation
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)kind/documentation(?:`|)'
+  - name: remove kind/documentation
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)kind/documentation(?:`|)'
+
+  - name: skip client:linux
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)client:linux(?:`|)'
+  - name: remove client:linux
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)client:linux(?:`|)'
+
+  - name: skip client:mac
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)client:mac(?:`|)'
+  - name: remove client:mac
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)client:mac(?:`|)'
+
+  - name: skip client:win
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)client:win(?:`|)'
+  - name: remove client:win
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)client:win(?:`|)'
+
+  - name: skip sig/Assistant
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)sig/Assistant(?:`|)'
+  - name: remove sig/Assistant
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)sig/Assistant(?:`|)'
+
+  - name: skip sig/Data
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)sig/Data(?:`|)'
+  - name: remove sig/Data
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)sig/Data(?:`|)'
+
+  - name: skip sig/MCP
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)sig/MCP(?:`|)'
+  - name: remove sig/MCP
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)sig/MCP(?:`|)'
+
+  - name: skip sig/RAG
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)sig/RAG(?:`|)'
+  - name: remove sig/RAG
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)sig/RAG(?:`|)'
+
+  - name: skip lgtm
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)lgtm(?:`|)'
+  - name: remove lgtm
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)lgtm(?:`|)'
+
+  - name: skip License
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)License(?:`|)'
+  - name: remove License
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)License(?:`|)'
+
+  # `Dev Team`
+  - name: Dev Team
+    mode:
+      add: [pull_request_target, issues]
+    author_association:
+      - COLLABORATOR
+
+  # Area labels
+  - name: area/Connectivity
+    content: area/Connectivity
+    regexes: '代理|[Pp]roxy'
+    skip-if:
+      - skip all
+      - skip area/Connectivity
+    remove-if:
+      - remove all
+      - remove area/Connectivity
+
+  - name: area/UI/UX
+    content: area/UI/UX
+    regexes: '界面|[Uu][Ii]|重叠|按钮|图标|组件|渲染|菜单|栏目|头像|主题|样式|[Cc][Ss][Ss]'
+    skip-if:
+      - skip all
+      - skip area/UI/UX
+    remove-if:
+      - remove all
+      - remove area/UI/UX
+
+  # Kind labels
+  - name: kind/documentation
+    content: kind/documentation
+    regexes: '文档|教程|[Dd]oc(s|umentation)|[Rr]eadme'
+    skip-if:
+      - skip all
+      - skip kind/documentation
+    remove-if:
+      - remove all
+      - remove kind/documentation
+
+  # Client labels
+  - name: client:linux
+    content: client:linux
+    regexes: '(?:[Ll]inux|[Uu]buntu|[Dd]ebian)'
+    skip-if:
+      - skip all
+      - skip client:linux
+    remove-if:
+      - remove all
+      - remove client:linux
+
+  - name: client:mac
+    content: client:mac
+    regexes: '(?:[Mm]ac|[Mm]acOS|[Oo]SX)'
+    skip-if:
+      - skip all
+      - skip client:mac
+    remove-if:
+      - remove all
+      - remove client:mac
+
+  - name: client:win
+    content: client:win
+    regexes: '(?:[Ww]in|[Ww]indows)'
+    skip-if:
+      - skip all
+      - skip client:win
+    remove-if:
+      - remove all
+      - remove client:win
+
+  # SIG labels
+  - name: sig/Assistant
+    content: sig/Assistant
+    regexes: '快捷助手|[Aa]ssistant'
+    skip-if:
+      - skip all
+      - skip sig/Assistant
+    remove-if:
+      - remove all
+      - remove sig/Assistant
+
+  - name: sig/Data
+    content: sig/Data
+    regexes: '[Ww]ebdav|坚果云|备份|同步|数据|Obsidian|Notion|Joplin|思源'
+    skip-if:
+      - skip all
+      - skip sig/Data
+    remove-if:
+      - remove all
+      - remove sig/Data
+
+  - name: sig/MCP
+    content: sig/MCP
+    regexes: '[Mm][Cc][Pp]'
+    skip-if:
+      - skip all
+      - skip sig/MCP
+    remove-if:
+      - remove all
+      - remove sig/MCP
+
+  - name: sig/RAG
+    content: sig/RAG
+    regexes: '知识库|[Rr][Aa][Gg]'
+    skip-if:
+      - skip all
+      - skip sig/RAG
+    remove-if:
+      - remove all
+      - remove sig/RAG
+
+  # Other labels
+  - name: lgtm
+    content: lgtm
+    regexes: '(?:[Ll][Gg][Tt][Mm]|[Ll]ooks [Gg]ood [Tt]o [Mm]e)'
+    skip-if:
+      - skip all
+      - skip lgtm
+    remove-if:
+      - remove all
+      - remove lgtm
+
+  - name: License
+    content: License
+    regexes: '(?:[Ll]icense|[Cc]opyright|[Mm][Ii][Tt]|[Aa]pache)'
+    skip-if:
+      - skip all
+      - skip License
+    remove-if:
+      - remove all
+      - remove License

.github/workflows/claude-translator.yml

@@ -16,13 +16,10 @@ on:
 jobs:
   translate:
     if: |
-      (github.event_name == 'issues')
-      || (github.event_name == 'issue_comment' && github.event.sender.type != 'Bot')
-      || (
-        (github.event_name == 'pull_request_review' || github.event_name == 'pull_request_review_comment')
-        && github.event.sender.type != 'Bot'
-        && github.event.pull_request.head.repo.fork == false
-      )
+      (github.event_name == 'issues') ||
+      (github.event_name == 'issue_comment' && github.event.sender.type != 'Bot') ||
+      (github.event_name == 'pull_request_review' && github.event.sender.type != 'Bot') ||
+      (github.event_name == 'pull_request_review_comment' && github.event.sender.type != 'Bot')
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -45,7 +42,7 @@ jobs:
           # See: https://github.com/anthropics/claude-code-action/blob/main/docs/security.md
           github_token: ${{ secrets.TOKEN_GITHUB_WRITE }}
           allowed_non_write_users: "*"
-          anthropic_api_key: ${{ secrets.CLAUDE_TRANSLATOR_APIKEY }}
+          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
           claude_args: "--allowed-tools Bash(gh issue:*),Bash(gh api:repos/*/issues:*),Bash(gh api:repos/*/pulls/*/reviews/*),Bash(gh api:repos/*/pulls/comments/*)"
           prompt: |
             你是一个多语言翻译助手。你需要响应 GitHub Webhooks 中的以下四种事件：
@@ -108,5 +105,3 @@ jobs:
 
             使用以下命令获取完整信息：
             gh issue view ${{ github.event.issue.number }} --json title,body,comments
-        env:
-          ANTHROPIC_BASE_URL: ${{ secrets.CLAUDE_TRANSLATOR_BASEURL }}

.github/workflows/delete-branch.yml

@@ -13,7 +13,6 @@ jobs:
     steps:
       - name: Delete merged branch
         uses: actions/github-script@v8
-        continue-on-error: true
         with:
           script: |
             github.rest.git.deleteRef({

.github/workflows/issue-checker.yml

@@ -0,0 +1,25 @@
+name: 'Issue Checker'
+
+on:
+  issues:
+    types: [opened, edited]
+  pull_request_target:
+    types: [opened, edited]
+  issue_comment:
+    types: [created, edited]
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: MaaAssistantArknights/issue-checker@v1.14
+        with:
+          repo-token: '${{ secrets.GITHUB_TOKEN }}'
+          configuration-path: .github/issue-checker.yml
+          not-before: 2022-08-05T00:00:00Z
+          include-title: 1

.yarn/patches/@ai-sdk-google-npm-2.0.14-376d8b03cc.patch

@@ -1,8 +1,8 @@
 diff --git a/dist/index.mjs b/dist/index.mjs
-index 69ab1599c76801dc1167551b6fa283dded123466..f0af43bba7ad1196fe05338817e65b4ebda40955 100644
+index 110f37ec18c98b1d55ae2b73cc716194e6f9094d..17e109b7778cbebb904f1919e768d21a2833d965 100644
 --- a/dist/index.mjs
 +++ b/dist/index.mjs
-@@ -477,7 +477,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
+@@ -448,7 +448,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
  
  // src/get-model-path.ts
  function getModelPath(modelId) {

LICENSE

@@ -1,661 +1,42 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
+**Licensing**
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+This project employs a **User-Segmented Dual Licensing** model.
 
-                            Preamble
+**Core Principle:**
 
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
+* **Individual Users and Organizations with 10 or Fewer Individuals:** Governed by default under the **GNU Affero General Public License v3.0 (AGPLv3)**.  
+* **Organizations with More Than 10 Individuals:** **Must** obtain a **Commercial License**.
 
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
+Definition: "10 or Fewer Individuals"  
+Refers to any organization (including companies, non-profits, government agencies, educational institutions, etc.) where the total number of individuals who can access, use, or in any way directly or indirectly benefit from the functionality of this software (Cherry Studio) does not exceed 10. This includes, but is not limited to, developers, testers, operations staff, end-users, and indirect users via integrated systems.
 
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
+---
 
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
+**1. Open Source License: AGPLv3 - For Individuals and Organizations of 10 or Fewer**
 
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
+* If you are an individual user, or if your organization meets the "10 or Fewer Individuals" definition above, you are free to use, modify, and distribute Cherry Studio under the terms of the **AGPLv3**. The full text of the AGPLv3 can be found in the LICENSE file at [https://www.gnu.org/licenses/agpl-3.0.html](https://www.gnu.org/licenses/agpl-3.0.html).  
+* **Core Obligation:** A key requirement of the AGPLv3 is that if you modify Cherry Studio and make it available over a network, or distribute the modified version, you must provide the **complete corresponding source code** under the AGPLv3 license to the recipients. Even if you qualify under the "10 or Fewer Individuals" rule, if you wish to avoid this source code disclosure obligation, you will need to obtain a Commercial License (see below).  
+* Please read and understand the full terms of the AGPLv3 carefully before use.
 
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
+**2. Commercial License - For Organizations with More Than 10 Individuals, or Users Needing to Avoid AGPLv3 Obligations**
 
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
+* **Mandatory Requirement:** If your organization does **not** meet the "10 or Fewer Individuals" definition above (i.e., 11 or more individuals can access, use, or benefit from the software), you **must** contact us to obtain and execute a Commercial License to use Cherry Studio.  
+* **Voluntary Option:** Even if your organization meets the "10 or Fewer Individuals" condition, if your intended use case **cannot comply with the terms of the AGPLv3** (particularly the obligations regarding **source code disclosure**), or if you require specific commercial terms **not offered** by the AGPLv3 (such as warranties, indemnities, or freedom from copyleft restrictions), you also **must** contact us to obtain and execute a Commercial License.  
+* **Common scenarios requiring a Commercial License include (but are not limited to):**  
+  * Your organization has more than 10 individuals who can access, use, or benefit from the software.  
+  * (Regardless of organization size) You wish to distribute a modified version of Cherry Studio but **do not want** to disclose the source code of your modifications under AGPLv3.  
+  * (Regardless of organization size) You wish to provide a network service (SaaS) based on a modified version of Cherry Studio but **do not want** to provide the modified source code to users of the service under AGPLv3.  
+  * (Regardless of organization size) Your corporate policies, client contracts, or project requirements prohibit the use of AGPLv3-licensed software or mandate closed-source distribution and confidentiality.  
+* The Commercial License grants you rights exempting you from AGPLv3 obligations (like source code disclosure) and may include additional commercial assurances.  
+* **Obtaining a Commercial License:** Please contact the Cherry Studio development team via email at **bd@cherry-ai.com** to discuss commercial licensing options.
 
-  The precise terms and conditions for copying, distribution and
-modification follow.
+**3. Contributions**
 
-                       TERMS AND CONDITIONS
+* We welcome community contributions to Cherry Studio. All contributions submitted to this project are considered to be offered under the **AGPLv3** license.  
+* By submitting a contribution to this project (e.g., via a Pull Request), you agree to license your code under the AGPLv3 to the project and all its downstream users (regardless of whether those users ultimately operate under AGPLv3 or a Commercial License).  
+* You also understand and agree that your contribution may be included in distributions of Cherry Studio offered under our commercial license.
 
-  0. Definitions.
+**4. Other Terms**
 
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
+* The specific terms and conditions of the Commercial License are governed by the formal commercial license agreement signed by both parties.  
+* The project maintainers reserve the right to update this licensing policy (including the definition and threshold for user count) as needed. Updates will be communicated through official project channels (e.g., code repository, official website).

README.md

@@ -141,7 +141,6 @@ We're actively working on the following features and improvements:
 - iOS App (Phase 1)
 - Multi-Window support
 - Window Pinning functionality
-- Intel AI PC (Core Ultra) Support
 
 4. 🔌 **Advanced Features**
 
@@ -287,14 +286,6 @@ We believe the Enterprise Edition will become your team's AI productivity engine
  </picture>
 </a>
 
-# 📜 License
-
-The Cherry Studio Community Edition is governed by the standard GNU Affero General Public License v3.0 (AGPL-3.0), available at https://www.gnu.org/licenses/agpl-3.0.html.
-
-Use of the Cherry Studio Community Edition for commercial purposes is permitted, subject to full compliance with the terms and conditions of the AGPL-3.0 license.
-
-Should you require a commercial license that provides an exemption from the AGPL-3.0 requirements, please contact us at bd@cherry-ai.com.
-
 <!-- Links & Images -->
 
 [deepwiki-shield]: https://img.shields.io/badge/Deepwiki-CherryHQ-0088CC?logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNy45MyAzMiI+PHBhdGggZD0iTTE5LjMzIDE0LjEyYy42Ny0uMzkgMS41LS4zOSAyLjE4IDBsMS43NCAxYy4wNi4wMy4xMS4wNi4xOC4wN2guMDRjLjA2LjAzLjEyLjAzLjE4LjAzaC4wMmMuMDYgMCAuMTEgMCAuMTctLjAyaC4wM2MuMDYtLjAyLjEyLS4wNS4xNy0uMDhoLjAybDMuNDgtMi4wMWMuMjUtLjE0LjQtLjQxLjQtLjdWOC40YS44MS44MSAwIDAgMC0uNC0uN2wtMy40OC0yLjAxYS44My44MyAwIDAgMC0uODEgMEwxOS43NyA3LjdoLS4wMWwtLjE1LjEyLS4wMi4wMnMtLjA3LjA5LS4xLjE0VjhhLjQuNCAwIDAgMC0uMDguMTd2LjA0Yy0uMDMuMDYtLjAzLjEyLS4wMy4xOXYyLjAxYzAgLjc4LS40MSAxLjQ5LTEuMDkgMS44OC0uNjcuMzktMS41LjM5LTIuMTggMGwtMS43NC0xYS42LjYgMCAwIDAtLjIxLS4wOGMtLjA2LS4wMS0uMTItLjAyLS4xOC0uMDJoLS4wM2MtLjA2IDAtLjExLjAxLS4xNy4wMmgtLjAzYy0uMDYuMDItLjEyLjA0LS4xNy4wN2gtLjAybC0zLjQ3IDIuMDFjLS4yNS4xNC0uNC40MS0uNC43VjE4YzAgLjI5LjE1LjU1LjQuN2wzLjQ4IDIuMDFoLjAyYy4wNi4wNC4xMS4wNi4xNy4wOGguMDNjLjA1LjAyLjExLjAzLjE3LjAzaC4wMmMuMDYgMCAuMTIgMCAuMTgtLjAyaC4wNGMuMDYtLjAzLjEyLS4wNS4xOC0uMDhsMS43NC0xYy42Ny0uMzkgMS41LS4zOSAyLjE3IDBzMS4wOSAxLjExIDEuMDkgMS44OHYyLjAxYzAgLjA3IDAgLjEzLjAyLjE5di4wNGMuMDMuMDYuMDUuMTIuMDguMTd2LjAycy4wOC4wOS4xMi4xM2wuMDIuMDJzLjA5LjA4LjE1LjExYzAgMCAuMDEgMCAuMDEuMDFsMy40OCAyLjAxYy4yNS4xNC41Ni4xNC44MSAwbDMuNDgtMi4wMWMuMjUtLjE0LjQtLjQxLjQtLjd2LTQuMDFhLjgxLjgxIDAgMCAwLS40LS43bC0zLjQ4LTIuMDFoLS4wMmMtLjA1LS4wNC0uMTEtLjA2LS4xNy0uMDhoLS4wM2EuNS41IDAgMCAwLS4xNy0uMDNoLS4wM2MtLjA2IDAtLjEyIDAtLjE4LjAyLS4wNy4wMi0uMTUuMDUtLjIxLjA4bC0xLjc0IDFjLS42Ny4zOS0xLjUuMzktMi4xNyAwYTIuMTkgMi4xOSAwIDAgMS0xLjA5LTEuODhjMC0uNzguNDItMS40OSAxLjA5LTEuODhaIiBzdHlsZT0iZmlsbDojNWRiZjlkIi8+PHBhdGggZD0ibS40IDEzLjExIDMuNDcgMi4wMWMuMjUuMTQuNTYuMTQuOCAwbDMuNDctMi4wMWguMDFsLjE1LS4xMi4wMi0uMDJzLjA3LS4wOS4xLS4xNGwuMDItLjAyYy4wMy0uMDUuMDUtLjExLjA3LS4xN3YtLjA0Yy4wMy0uMDYuMDMtLjEyLjAzLS4xOVYxMC40YzAtLjc4LjQyLTEuNDkgMS4wOS0xLjg4czEuNS0uMzkgMi4xOCAwbDEuNzQgMWMuMDcuMDQuMTQuMDcuMjEuMDguMDYuMDEuMTIuMDIuMTguMDJoLjAzYy4wNiAwIC4xMS0uMDEuMTctLjAyaC4wM2MuMDYtLjAyLjEyLS4wNC4xNy0uMDdoLjAybDMuNDctMi4wMmMuMjUtLjE0LjQtLjQxLjQtLjd2LTRhLjgxLjgxIDAgMCAwLS40LS43bC0zLjQ2LTJhLjgzLjgzIDAgMCAwLS44MSAwbC0zLjQ4IDIuMDFoLS4wMWwtLjE1LjEyLS4wMi4wMi0uMS4xMy0uMDIuMDJjLS4wMy4wNS0uMDUuMTEtLjA3LjE3di4wNGMtLjAzLjA2LS4wMy4xMi0uMDMuMTl2Mi4wMWMwIC43OC0uNDIgMS40OS0xLjA5IDEuODhzLTEuNS4zOS0yLjE4IDBsLTEuNzQtMWEuNi42IDAgMCAwLS4yMS0uMDhjLS4wNi0uMDEtLjEyLS4wMi0uMTgtLjAyaC0uMDNjLS4wNiAwLS4xMS4wMS0uMTcuMDJoLS4wM2MtLjA2LjAyLS4xMi4wNS0uMTcuMDhoLS4wMkwuNCA3LjcxYy0uMjUuMTQtLjQuNDEtLjQuNjl2NC4wMWMwIC4yOS4xNS41Ni40LjciIHN0eWxlPSJmaWxsOiM0NDY4YzQiLz48cGF0aCBkPSJtMTcuODQgMjQuNDgtMy40OC0yLjAxaC0uMDJjLS4wNS0uMDQtLjExLS4wNi0uMTctLjA4aC0uMDNhLjUuNSAwIDAgMC0uMTctLjAzaC0uMDNjLS4wNiAwLS4xMiAwLS4xOC4wMmgtLjA0Yy0uMDYuMDMtLjEyLjA1LS4xOC4wOGwtMS43NCAxYy0uNjcuMzktMS41LjM5LTIuMTggMGEyLjE5IDIuMTkgMCAwIDEtMS4wOS0xLjg4di0yLjAxYzAtLjA2IDAtLjEzLS4wMi0uMTl2LS4wNGMtLjAzLS4wNi0uMDUtLjExLS4wOC0uMTdsLS4wMi0uMDJzLS4wNi0uMDktLjEtLjEzTDguMjkgMTlzLS4wOS0uMDgtLjE1LS4xMWgtLjAxbC0zLjQ3LTIuMDJhLjgzLjgzIDAgMCAwLS44MSAwTC4zNyAxOC44OGEuODcuODcgMCAwIDAtLjM3LjcxdjQuMDFjMCAuMjkuMTUuNTUuNC43bDMuNDcgMi4wMWguMDJjLjA1LjA0LjExLjA2LjE3LjA4aC4wM2MuMDUuMDIuMTEuMDMuMTYuMDNoLjAzYy4wNiAwIC4xMiAwIC4xOC0uMDJoLjA0Yy4wNi0uMDMuMTItLjA1LjE4LS4wOGwxLjc0LTFjLjY3LS4zOSAxLjUtLjM5IDIuMTcgMHMxLjA5IDEuMTEgMS4wOSAxLjg4djIuMDFjMCAuMDcgMCAuMTMuMDIuMTl2LjA0Yy4wMy4wNi4wNS4xMS4wOC4xN2wuMDIuMDJzLjA2LjA5LjEuMTRsLjAyLjAycy4wOS4wOC4xNS4xMWguMDFsMy40OCAyLjAyYy4yNS4xNC41Ni4xNC44MSAwbDMuNDgtMi4wMWMuMjUtLjE0LjQtLjQxLjQtLjdWMjUuMmEuODEuODEgMCAwIDAtLjQtLjdaIiBzdHlsZT0iZmlsbDojNDI5M2Q5Ii8+PC9zdmc+

electron-builder.yml

@@ -9,7 +9,6 @@ electronLanguages:
   - zh_CN # for macOS
   - zh_TW # for macOS
   - en # for macOS
-  - de
 directories:
   buildResources: build
 
@@ -126,61 +125,21 @@ afterSign: scripts/notarize.js
 artifactBuildCompleted: scripts/artifact-build-completed.js
 releaseInfo:
   releaseNotes: |
-    <!--LANG:en-->
-    What's New in v1.7.0-beta.2
+    What's New in v1.6.3
 
-    New Features:
-    - Session Settings: Manage session-specific settings and model configurations independently
-    - Notes Full-Text Search: Search across all notes with match highlighting
-    - Built-in DiDi MCP Server: Integration with DiDi ride-hailing services (China only)
-    - Intel OV OCR: Hardware-accelerated OCR using Intel NPU
-    - Auto-start API Server: Automatically starts when agents exist
-
-    Improvements:
-    - Agent model selection now requires explicit user choice
-    - Added Mistral AI provider support
-    - Added NewAPI generic provider support
-    - Improved navbar layout consistency across different modes
-    - Enhanced chat component responsiveness
-    - Better code block display on small screens
-    - Updated OVMS to 2025.3 official release
-    - Added Greek language support
+    Features:
+    - Notes: Add spell-check control, automatic table line wrapping, export functionality, and LLM-based renaming
+    - UI: Expand topic rename clickable area, add middle-click tab closing, remove redundant scrollbars, fix message menubar overflow
+    - Editor: Add read-only extension support, make TextFilePreview read-only but copyable
+    - Models: Update support for DeepSeek v3.2, Claude 4.5, GLM 4.6, Gemini regex, and vision models
+    - Code Tools: Add GitHub Copilot CLI integration
 
     Bug Fixes:
-    - Fixed GitHub Copilot gpt-5-codex streaming issues
-    - Fixed assistant creation failures
-    - Fixed translate auto-copy functionality
-    - Fixed miniapps external link opening
-    - Fixed message layout and overflow issues
-    - Fixed API key parsing to preserve spaces
-    - Fixed agent display in different navbar layouts
+    - Fix migration for missing providers
+    - Fix forked topic retaining old name after rename
+    - Restore first token latency reporting in metrics
+    - Fix UI scrollbar and overflow issues
 
-    <!--LANG:zh-CN-->
-    v1.7.0-beta.2 新特性
-
-    新功能:
-    - 会话设置：独立管理会话特定的设置和模型配置
-    - 笔记全文搜索：跨所有笔记搜索并高亮匹配内容
-    - 内置滴滴 MCP 服务器：集成滴滴打车服务(仅限中国地区)
-    - Intel OV OCR：使用 Intel NPU 的硬件加速 OCR
-    - 自动启动 API 服务器：当存在 Agent 时自动启动
-
-    改进:
-    - Agent 模型选择现在需要用户显式选择
-    - 添加 Mistral AI 提供商支持
-    - 添加 NewAPI 通用提供商支持
-    - 改进不同模式下的导航栏布局一致性
-    - 增强聊天组件响应式设计
-    - 优化小屏幕代码块显示
-    - 更新 OVMS 至 2025.3 正式版
-    - 添加希腊语支持
-
-    问题修复:
-    - 修复 GitHub Copilot gpt-5-codex 流式传输问题
-    - 修复助手创建失败
-    - 修复翻译自动复制功能
-    - 修复小程序外部链接打开
-    - 修复消息布局和溢出问题
-    - 修复 API 密钥解析以保留空格
-    - 修复不同导航栏布局中的 Agent 显示
-    <!--LANG:END-->
+    Technical Updates:
+    - Upgrade to Electron 37.6.0
+    - Update dependencies across packages

eslint.config.mjs

@@ -2,7 +2,6 @@ import tseslint from '@electron-toolkit/eslint-config-ts'
 import eslint from '@eslint/js'
 import eslintReact from '@eslint-react/eslint-plugin'
 import { defineConfig } from 'eslint/config'
-import importZod from 'eslint-plugin-import-zod'
 import oxlint from 'eslint-plugin-oxlint'
 import reactHooks from 'eslint-plugin-react-hooks'
 import simpleImportSort from 'eslint-plugin-simple-import-sort'
@@ -16,8 +15,7 @@ export default defineConfig([
   {
     plugins: {
       'simple-import-sort': simpleImportSort,
-      'unused-imports': unusedImports,
-      'import-zod': importZod
+      'unused-imports': unusedImports
     },
     rules: {
       '@typescript-eslint/explicit-function-return-type': 'off',
@@ -27,7 +25,6 @@ export default defineConfig([
       'simple-import-sort/exports': 'error',
       'unused-imports/no-unused-imports': 'error',
       '@eslint-react/no-prop-types': 'error',
-      'import-zod/prefer-zod-namespace': 'error'
     }
   },
   // Configuration for ensuring compatibility with the original ESLint(8.x) rules

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "1.7.0-beta.2",
+  "version": "1.7.0-alpha.5",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",
@@ -83,7 +83,6 @@
     "@libsql/win32-x64-msvc": "^0.4.7",
     "@napi-rs/system-ocr": "patch:@napi-rs/system-ocr@npm%3A1.0.2#~/.yarn/patches/@napi-rs-system-ocr-npm-1.0.2-59e7a78e8b.patch",
     "@strongtz/win32-arm64-msvc": "^0.4.7",
-    "express": "^5.1.0",
     "font-list": "^2.0.0",
     "graceful-fs": "^4.2.11",
     "jsdom": "26.1.0",
@@ -93,7 +92,6 @@
     "selection-hook": "^1.0.12",
     "sharp": "^0.34.3",
     "swagger-jsdoc": "^6.2.8",
-    "swagger-ui-express": "^5.0.1",
     "tesseract.js": "patch:tesseract.js@npm%3A6.0.1#~/.yarn/patches/tesseract.js-npm-6.0.1-2562a7e46d.patch",
     "turndown": "7.2.0"
   },
@@ -101,10 +99,10 @@
     "@agentic/exa": "^7.3.3",
     "@agentic/searxng": "^7.3.3",
     "@agentic/tavily": "^7.3.3",
-    "@ai-sdk/amazon-bedrock": "^3.0.35",
-    "@ai-sdk/google-vertex": "^3.0.40",
-    "@ai-sdk/mistral": "^2.0.19",
-    "@ai-sdk/perplexity": "^2.0.13",
+    "@ai-sdk/amazon-bedrock": "^3.0.29",
+    "@ai-sdk/google-vertex": "^3.0.33",
+    "@ai-sdk/mistral": "^2.0.17",
+    "@ai-sdk/perplexity": "^2.0.11",
     "@ant-design/v5-patch-for-react-19": "^1.0.3",
     "@anthropic-ai/sdk": "^0.41.0",
     "@anthropic-ai/vertex-sdk": "patch:@anthropic-ai/vertex-sdk@npm%3A0.11.4#~/.yarn/patches/@anthropic-ai-vertex-sdk-npm-0.11.4-c19cb41edb.patch",
@@ -126,7 +124,6 @@
     "@cherrystudio/embedjs-ollama": "^0.1.31",
     "@cherrystudio/embedjs-openai": "^0.1.31",
     "@cherrystudio/extension-table-plus": "workspace:^",
-    "@cherrystudio/openai": "^6.5.0",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/modifiers": "^9.0.0",
     "@dnd-kit/sortable": "^10.0.0",
@@ -155,7 +152,6 @@
     "@opentelemetry/sdk-trace-base": "^2.0.0",
     "@opentelemetry/sdk-trace-node": "^2.0.0",
     "@opentelemetry/sdk-trace-web": "^2.0.0",
-    "@opeoginni/github-copilot-openai-compatible": "0.1.19",
     "@playwright/test": "^1.52.0",
     "@radix-ui/react-context-menu": "^2.2.16",
     "@reduxjs/toolkit": "^2.2.5",
@@ -223,7 +219,7 @@
     "@viz-js/lang-dot": "^1.0.5",
     "@viz-js/viz": "^3.14.0",
     "@xyflow/react": "^12.4.4",
-    "ai": "^5.0.68",
+    "ai": "^5.0.59",
     "antd": "patch:antd@npm%3A5.27.0#~/.yarn/patches/antd-npm-5.27.0-aa91c36546.patch",
     "archiver": "^7.0.1",
     "async-mutex": "^0.5.0",
@@ -248,23 +244,23 @@
     "dotenv-cli": "^7.4.2",
     "drizzle-kit": "^0.31.4",
     "drizzle-orm": "^0.44.5",
-    "electron": "38.4.0",
+    "electron": "37.6.0",
     "electron-builder": "26.0.15",
     "electron-devtools-installer": "^3.2.0",
     "electron-reload": "^2.0.0-alpha.1",
     "electron-store": "^8.2.0",
     "electron-updater": "6.6.4",
-    "electron-vite": "4.0.1",
+    "electron-vite": "4.0.0",
     "electron-window-state": "^5.0.3",
     "emittery": "^1.0.3",
     "emoji-picker-element": "^1.22.1",
     "epub": "patch:epub@npm%3A1.3.0#~/.yarn/patches/epub-npm-1.3.0-8325494ffe.patch",
     "eslint": "^9.22.0",
-    "eslint-plugin-import-zod": "^1.2.0",
     "eslint-plugin-oxlint": "^1.15.0",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-unused-imports": "^4.1.4",
+    "express": "^5.1.0",
     "express-validator": "^7.2.1",
     "fast-diff": "^1.3.0",
     "fast-xml-parser": "^5.2.0",
@@ -281,7 +277,6 @@
     "husky": "^9.1.7",
     "i18next": "^23.11.5",
     "iconv-lite": "^0.6.3",
-    "ipaddr.js": "^2.2.0",
     "isbinaryfile": "5.0.4",
     "jaison": "^2.0.2",
     "jest-styled-components": "^7.2.0",
@@ -298,15 +293,16 @@
     "motion": "^12.10.5",
     "notion-helper": "^1.3.22",
     "npx-scope-finder": "^1.2.0",
-    "oxlint": "^1.22.0",
+    "openai": "patch:openai@npm%3A5.12.2#~/.yarn/patches/openai-npm-5.12.2-30b075401c.patch",
+    "oxlint": "^1.15.0",
     "oxlint-tsgolint": "^0.2.0",
     "p-queue": "^8.1.0",
     "pdf-lib": "^1.17.1",
     "pdf-parse": "^1.1.1",
-    "playwright": "^1.55.1",
+    "playwright": "^1.52.0",
     "proxy-agent": "^6.5.0",
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "react-error-boundary": "^6.0.0",
     "react-hotkeys-hook": "^4.6.1",
     "react-i18next": "^14.1.2",
@@ -338,6 +334,7 @@
     "string-width": "^7.2.0",
     "striptags": "^3.2.0",
     "styled-components": "^6.1.11",
+    "swagger-ui-express": "^5.0.1",
     "swr": "^2.3.6",
     "tailwindcss": "^4.1.13",
     "tar": "^7.4.3",
@@ -350,7 +347,7 @@
     "undici": "6.21.2",
     "unified": "^11.0.5",
     "uuid": "^13.0.0",
-    "vite": "npm:rolldown-vite@7.1.5",
+    "vite": "npm:rolldown-vite@latest",
     "vitest": "^3.2.4",
     "webdav": "^5.8.0",
     "winston": "^3.17.0",
@@ -373,25 +370,17 @@
     "app-builder-lib@npm:26.0.13": "patch:app-builder-lib@npm%3A26.0.13#~/.yarn/patches/app-builder-lib-npm-26.0.13-a064c9e1d0.patch",
     "app-builder-lib@npm:26.0.15": "patch:app-builder-lib@npm%3A26.0.15#~/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch",
     "atomically@npm:^1.7.0": "patch:atomically@npm%3A1.7.0#~/.yarn/patches/atomically-npm-1.7.0-e742e5293b.patch",
-    "esbuild": "^0.25.0",
     "file-stream-rotator@npm:^0.6.1": "patch:file-stream-rotator@npm%3A0.6.1#~/.yarn/patches/file-stream-rotator-npm-0.6.1-eab45fb13d.patch",
     "libsql@npm:^0.4.4": "patch:libsql@npm%3A0.4.7#~/.yarn/patches/libsql-npm-0.4.7-444e260fb1.patch",
     "node-abi": "4.12.0",
-    "openai@npm:^4.77.0": "npm:@cherrystudio/openai@6.5.0",
-    "openai@npm:^4.87.3": "npm:@cherrystudio/openai@6.5.0",
+    "openai@npm:^4.77.0": "patch:openai@npm%3A5.12.2#~/.yarn/patches/openai-npm-5.12.2-30b075401c.patch",
+    "openai@npm:^4.87.3": "patch:openai@npm%3A5.12.2#~/.yarn/patches/openai-npm-5.12.2-30b075401c.patch",
     "pdf-parse@npm:1.1.1": "patch:pdf-parse@npm%3A1.1.1#~/.yarn/patches/pdf-parse-npm-1.1.1-04a6109b2a.patch",
     "pkce-challenge@npm:^4.1.0": "patch:pkce-challenge@npm%3A4.1.0#~/.yarn/patches/pkce-challenge-npm-4.1.0-fbc51695a3.patch",
-    "tar-fs": "^2.1.4",
     "undici": "6.21.2",
-    "vite": "npm:rolldown-vite@7.1.5",
+    "vite": "npm:rolldown-vite@latest",
     "tesseract.js@npm:*": "patch:tesseract.js@npm%3A6.0.1#~/.yarn/patches/tesseract.js-npm-6.0.1-2562a7e46d.patch",
-    "@ai-sdk/google@npm:2.0.20": "patch:@ai-sdk/google@npm%3A2.0.20#~/.yarn/patches/@ai-sdk-google-npm-2.0.20-b9102f9d54.patch",
-    "@img/sharp-darwin-arm64": "0.34.3",
-    "@img/sharp-darwin-x64": "0.34.3",
-    "@img/sharp-linux-arm": "0.34.3",
-    "@img/sharp-linux-arm64": "0.34.3",
-    "@img/sharp-linux-x64": "0.34.3",
-    "@img/sharp-win32-x64": "0.34.3"
+    "@ai-sdk/google@npm:2.0.14": "patch:@ai-sdk/google@npm%3A2.0.14#~/.yarn/patches/@ai-sdk-google-npm-2.0.14-376d8b03cc.patch"
   },
   "packageManager": "yarn@4.9.1",
   "lint-staged": {

packages/aiCore/package.json

@@ -36,14 +36,14 @@
     "ai": "^5.0.26"
   },
   "dependencies": {
-    "@ai-sdk/anthropic": "^2.0.27",
-    "@ai-sdk/azure": "^2.0.49",
-    "@ai-sdk/deepseek": "^1.0.23",
-    "@ai-sdk/openai": "^2.0.48",
-    "@ai-sdk/openai-compatible": "^1.0.22",
+    "@ai-sdk/anthropic": "^2.0.22",
+    "@ai-sdk/azure": "^2.0.42",
+    "@ai-sdk/deepseek": "^1.0.20",
+    "@ai-sdk/openai": "^2.0.42",
+    "@ai-sdk/openai-compatible": "^1.0.19",
     "@ai-sdk/provider": "^2.0.0",
-    "@ai-sdk/provider-utils": "^3.0.12",
-    "@ai-sdk/xai": "^2.0.26",
+    "@ai-sdk/provider-utils": "^3.0.10",
+    "@ai-sdk/xai": "^2.0.23",
     "zod": "^4.1.5"
   },
   "devDependencies": {

packages/aiCore/src/core/plugins/built-in/webSearchPlugin/helper.ts

@@ -1,7 +1,7 @@
 import { anthropic } from '@ai-sdk/anthropic'
 import { google } from '@ai-sdk/google'
 import { openai } from '@ai-sdk/openai'
-import { InferToolInput, InferToolOutput, type Tool } from 'ai'
+import { InferToolInput, InferToolOutput } from 'ai'
 
 import { ProviderOptionsMap } from '../../../options/types'
 import { OpenRouterSearchConfig } from './openrouter'
@@ -15,13 +15,6 @@ export type AnthropicSearchConfig = NonNullable<Parameters<typeof anthropic.tool
 export type GoogleSearchConfig = NonNullable<Parameters<typeof google.tools.googleSearch>[0]>
 export type XAISearchConfig = NonNullable<ProviderOptionsMap['xai']['searchParameters']>
 
-type NormalizeTool<T> = T extends Tool<infer INPUT, infer OUTPUT> ? Tool<INPUT, OUTPUT> : Tool<any, any>
-
-type AnthropicWebSearchTool = NormalizeTool<ReturnType<typeof anthropic.tools.webSearch_20250305>>
-type OpenAIWebSearchTool = NormalizeTool<ReturnType<typeof openai.tools.webSearch>>
-type OpenAIChatWebSearchTool = NormalizeTool<ReturnType<typeof openai.tools.webSearchPreview>>
-type GoogleWebSearchTool = NormalizeTool<ReturnType<typeof google.tools.googleSearch>>
-
 /**
  * 插件初始化时接收的完整配置对象
  *
@@ -66,7 +59,7 @@ export const DEFAULT_WEB_SEARCH_CONFIG: WebSearchPluginConfig = {
 
 export type WebSearchToolOutputSchema = {
   // Anthropic 工具 - 手动定义
-  anthropic: InferToolOutput<AnthropicWebSearchTool>
+  anthropic: InferToolOutput<ReturnType<typeof anthropic.tools.webSearch_20250305>>
 
   // OpenAI 工具 - 基于实际输出
   // TODO: 上游定义不规范,是unknown
@@ -89,8 +82,8 @@ export type WebSearchToolOutputSchema = {
 }
 
 export type WebSearchToolInputSchema = {
-  anthropic: InferToolInput<AnthropicWebSearchTool>
-  openai: InferToolInput<OpenAIWebSearchTool>
-  google: InferToolInput<GoogleWebSearchTool>
-  'openai-chat': InferToolInput<OpenAIChatWebSearchTool>
+  anthropic: InferToolInput<ReturnType<typeof anthropic.tools.webSearch_20250305>>
+  openai: InferToolInput<ReturnType<typeof openai.tools.webSearch>>
+  google: InferToolInput<ReturnType<typeof google.tools.googleSearch>>
+  'openai-chat': InferToolInput<ReturnType<typeof openai.tools.webSearchPreview>>
 }

packages/aiCore/src/core/providers/schemas.ts

@@ -13,7 +13,7 @@ import { LanguageModelV2 } from '@ai-sdk/provider'
 import { createXai } from '@ai-sdk/xai'
 import { createOpenRouter } from '@openrouter/ai-sdk-provider'
 import { customProvider, Provider } from 'ai'
-import * as z from 'zod'
+import { z } from 'zod'
 
 /**
  * 基础 Provider IDs

packages/shared/IpcChannel.ts

@@ -5,8 +5,8 @@ export enum IpcChannel {
   App_SetLanguage = 'app:set-language',
   App_SetEnableSpellCheck = 'app:set-enable-spell-check',
   App_SetSpellCheckLanguages = 'app:set-spell-check-languages',
+  App_ShowUpdateDialog = 'app:show-update-dialog',
   App_CheckForUpdate = 'app:check-for-update',
-  App_QuitAndInstall = 'app:quit-and-install',
   App_Reload = 'app:reload',
   App_Quit = 'app:quit',
   App_Info = 'app:info',
@@ -53,7 +53,6 @@ export enum IpcChannel {
 
   Webview_SetOpenLinkExternal = 'webview:set-open-link-external',
   Webview_SetSpellCheckEnabled = 'webview:set-spell-check-enabled',
-  Webview_SearchHotkey = 'webview:search-hotkey',
 
   // Open
   Open_Path = 'open:path',
@@ -235,6 +234,7 @@ export enum IpcChannel {
   // events
   BackupProgress = 'backup-progress',
   ThemeUpdated = 'theme:updated',
+  UpdateDownloadedCancelled = 'update-downloaded-cancelled',
   RestoreProgress = 'restore-progress',
   UpdateError = 'update-error',
   UpdateAvailable = 'update-available',
@@ -317,7 +317,6 @@ export enum IpcChannel {
   ApiServer_Stop = 'api-server:stop',
   ApiServer_Restart = 'api-server:restart',
   ApiServer_GetStatus = 'api-server:get-status',
-  // NOTE: This api is not be used.
   ApiServer_GetConfig = 'api-server:get-config',
 
   // Anthropic OAuth
@@ -337,7 +336,6 @@ export enum IpcChannel {
 
   // OCR
   OCR_ocr = 'ocr:ocr',
-  OCR_ListProviders = 'ocr:list-providers',
 
   // OVMS
   Ovms_AddModel = 'ovms:add-model',

packages/shared/config/types.ts

@@ -22,12 +22,3 @@ export type MCPProgressEvent = {
   callId: string
   progress: number // 0-1 range
 }
-
-export type WebviewKeyEvent = {
-  webviewId: number
-  key: string
-  control: boolean
-  meta: boolean
-  shift: boolean
-  alt: boolean
-}

resources/scripts/install-ovms.js

@@ -5,171 +5,105 @@ const { execSync } = require('child_process')
 const { downloadWithPowerShell } = require('./download')
 
 // Base URL for downloading OVMS binaries
-const OVMS_RELEASE_BASE_URL =
-  'https://storage.openvinotoolkit.org/repositories/openvino_model_server/packages/2025.3.0/ovms_windows_python_on.zip'
-const OVMS_EX_URL = 'https://gitcode.com/gcw_ggDjjkY3/kjfile/releases/download/download/ovms_25.3_ex.zip'
+const OVMS_PKG_NAME = 'ovms250911.zip'
+const OVMS_RELEASE_BASE_URL = [`https://gitcode.com/gcw_ggDjjkY3/kjfile/releases/download/download/${OVMS_PKG_NAME}`]
 
 /**
- * error code:
- * 101: Unsupported CPU (not Intel Ultra)
- * 102: Unsupported platform (not Windows)
- * 103: Download failed
- * 104: Installation failed
- * 105: Failed to create ovdnd.exe
- * 106: Failed to create run.bat
- * 110: Cleanup of old installation failed
+ * Downloads and extracts the OVMS binary for the specified platform
  */
-
-/**
- * Clean old OVMS installation if it exists
- */
-function cleanOldOvmsInstallation() {
-  console.log('Cleaning the existing OVMS installation...')
+async function downloadOvmsBinary() {
+  // Create output directory structure - OVMS goes into its own subdirectory
   const csDir = path.join(os.homedir(), '.cherrystudio')
+
+  // Ensure directories exist
+  fs.mkdirSync(csDir, { recursive: true })
+
   const csOvmsDir = path.join(csDir, 'ovms')
+  // Delete existing OVMS directory if it exists
   if (fs.existsSync(csOvmsDir)) {
-    try {
-      fs.rmSync(csOvmsDir, { recursive: true })
-    } catch (error) {
-      console.warn(`Failed to clean up old OVMS installation: ${error.message}`)
-      return 110
-    }
+    fs.rmSync(csOvmsDir, { recursive: true })
   }
 
-  return 0
-}
-
-/**
- * Install OVMS Base package
- */
-async function installOvmsBase() {
-  // Download the base package
   const tempdir = os.tmpdir()
   const tempFilename = path.join(tempdir, 'ovms.zip')
 
-  try {
-    console.log(`Downloading OVMS Base Package from ${OVMS_RELEASE_BASE_URL} to ${tempFilename}...`)
+  // Try each URL until one succeeds
+  let downloadSuccess = false
+  let lastError = null
 
-    // Try PowerShell download first, fallback to Node.js download if it fails
-    await downloadWithPowerShell(OVMS_RELEASE_BASE_URL, tempFilename)
-    console.log(`Successfully downloaded from: ${OVMS_RELEASE_BASE_URL}`)
-  } catch (error) {
-    console.error(`Download OVMS Base failed: ${error.message}`)
-    fs.unlinkSync(tempFilename)
+  for (let i = 0; i < OVMS_RELEASE_BASE_URL.length; i++) {
+    const downloadUrl = OVMS_RELEASE_BASE_URL[i]
+    console.log(`Attempting download from URL ${i + 1}/${OVMS_RELEASE_BASE_URL.length}: ${downloadUrl}`)
+
+    try {
+      console.log(`Downloading OVMS from ${downloadUrl} to ${tempFilename}...`)
+
+      // Try PowerShell download first, fallback to Node.js download if it fails
+      await downloadWithPowerShell(downloadUrl, tempFilename)
+
+      // If we get here, download was successful
+      downloadSuccess = true
+      console.log(`Successfully downloaded from: ${downloadUrl}`)
+      break
+    } catch (error) {
+      console.warn(`Download failed from ${downloadUrl}: ${error.message}`)
+      lastError = error
+
+      // Clean up failed download file if it exists
+      if (fs.existsSync(tempFilename)) {
+        try {
+          fs.unlinkSync(tempFilename)
+        } catch (cleanupError) {
+          console.warn(`Failed to clean up temporary file: ${cleanupError.message}`)
+        }
+      }
+
+      // Continue to next URL if this one failed
+      if (i < OVMS_RELEASE_BASE_URL.length - 1) {
+        console.log(`Trying next URL...`)
+      }
+    }
+  }
+
+  // Check if any download succeeded
+  if (!downloadSuccess) {
+    console.error(`All download URLs failed. Last error: ${lastError?.message || 'Unknown error'}`)
     return 103
   }
 
-  // unzip the base package to the target directory
-  const csDir = path.join(os.homedir(), '.cherrystudio')
-  const csOvmsDir = path.join(csDir, 'ovms')
-  fs.mkdirSync(csOvmsDir, { recursive: true })
-
   try {
+    console.log(`Extracting to ${csDir}...`)
+
     // Use tar.exe to extract the ZIP file
-    console.log(`Extracting OVMS Base to ${csOvmsDir}...`)
-    execSync(`tar -xf ${tempFilename} -C ${csOvmsDir}`, { stdio: 'inherit' })
-    console.log(`OVMS extracted to ${csOvmsDir}`)
+    console.log(`Extracting OVMS to ${csDir}...`)
+    execSync(`tar -xf ${tempFilename} -C ${csDir}`, { stdio: 'inherit' })
+    console.log(`OVMS extracted to ${csDir}`)
 
     // Clean up temporary file
     fs.unlinkSync(tempFilename)
     console.log(`Installation directory: ${csDir}`)
   } catch (error) {
     console.error(`Error installing OVMS: ${error.message}`)
-    fs.unlinkSync(tempFilename)
+    if (fs.existsSync(tempFilename)) {
+      fs.unlinkSync(tempFilename)
+    }
+
+    // Check if ovmsDir is empty and remove it if so
+    try {
+      const ovmsDir = path.join(csDir, 'ovms')
+      const files = fs.readdirSync(ovmsDir)
+      if (files.length === 0) {
+        fs.rmSync(ovmsDir, { recursive: true })
+        console.log(`Removed empty directory: ${ovmsDir}`)
+      }
+    } catch (cleanupError) {
+      console.warn(`Warning: Failed to clean up directory: ${cleanupError.message}`)
+      return 105
+    }
+
     return 104
   }
 
-  const csOvmsBinDir = path.join(csOvmsDir, 'ovms')
-  // copy ovms.exe to ovdnd.exe
-  try {
-    fs.copyFileSync(path.join(csOvmsBinDir, 'ovms.exe'), path.join(csOvmsBinDir, 'ovdnd.exe'))
-    console.log('Copied ovms.exe to ovdnd.exe')
-  } catch (error) {
-    console.error(`Error copying ovms.exe to ovdnd.exe: ${error.message}`)
-    return 105
-  }
-
-  // copy {csOvmsBinDir}/setupvars.bat to {csOvmsBinDir}/run.bat, and append the following lines to run.bat:
-  // del %USERPROFILE%\.cherrystudio\ovms_log.log
-  // ovms.exe --config_path models/config.json --rest_port 8000 --log_level DEBUG --log_path %USERPROFILE%\.cherrystudio\ovms_log.log
-  const runBatPath = path.join(csOvmsBinDir, 'run.bat')
-  try {
-    fs.copyFileSync(path.join(csOvmsBinDir, 'setupvars.bat'), runBatPath)
-    fs.appendFileSync(runBatPath, '\r\n')
-    fs.appendFileSync(runBatPath, 'del %USERPROFILE%\\.cherrystudio\\ovms_log.log\r\n')
-    fs.appendFileSync(
-      runBatPath,
-      'ovms.exe --config_path models/config.json --rest_port 8000 --log_level DEBUG --log_path %USERPROFILE%\\.cherrystudio\\ovms_log.log\r\n'
-    )
-    console.log(`Created run.bat at: ${runBatPath}`)
-  } catch (error) {
-    console.error(`Error creating run.bat: ${error.message}`)
-    return 106
-  }
-
-  // create {csOvmsBinDir}/models/config.json with content '{"model_config_list": []}'
-  const configJsonPath = path.join(csOvmsBinDir, 'models', 'config.json')
-  fs.mkdirSync(path.dirname(configJsonPath), { recursive: true })
-  fs.writeFileSync(configJsonPath, '{"mediapipe_config_list":[],"model_config_list":[]}')
-  console.log(`Created config file: ${configJsonPath}`)
-
-  return 0
-}
-
-/**
- * Install OVMS Extra package
- */
-async function installOvmsExtra() {
-  // Download the extra package
-  const tempdir = os.tmpdir()
-  const tempFilename = path.join(tempdir, 'ovms_ex.zip')
-
-  try {
-    console.log(`Downloading OVMS Extra Package from ${OVMS_EX_URL} to ${tempFilename}...`)
-
-    // Try PowerShell download first, fallback to Node.js download if it fails
-    await downloadWithPowerShell(OVMS_EX_URL, tempFilename)
-    console.log(`Successfully downloaded from: ${OVMS_EX_URL}`)
-  } catch (error) {
-    console.error(`Download OVMS Extra failed: ${error.message}`)
-    fs.unlinkSync(tempFilename)
-    return 103
-  }
-
-  // unzip the extra package to the target directory
-  const csDir = path.join(os.homedir(), '.cherrystudio')
-  const csOvmsDir = path.join(csDir, 'ovms')
-
-  try {
-    // Use tar.exe to extract the ZIP file
-    console.log(`Extracting OVMS Extra to ${csOvmsDir}...`)
-    execSync(`tar -xf ${tempFilename} -C ${csOvmsDir}`, { stdio: 'inherit' })
-    console.log(`OVMS extracted to ${csOvmsDir}`)
-
-    // Clean up temporary file
-    fs.unlinkSync(tempFilename)
-    console.log(`Installation directory: ${csDir}`)
-  } catch (error) {
-    console.error(`Error installing OVMS Extra: ${error.message}`)
-    fs.unlinkSync(tempFilename)
-    return 104
-  }
-
-  // apply ovms patch, copy all files in {csOvmsDir}/patch/ovms to {csOvmsDir}/ovms with overwrite mode
-  const patchDir = path.join(csOvmsDir, 'patch', 'ovms')
-  const csOvmsBinDir = path.join(csOvmsDir, 'ovms')
-  try {
-    const files = fs.readdirSync(patchDir)
-    files.forEach((file) => {
-      const srcPath = path.join(patchDir, file)
-      const destPath = path.join(csOvmsBinDir, file)
-      fs.copyFileSync(srcPath, destPath)
-      console.log(`Applied patch file: ${file}`)
-    })
-  } catch (error) {
-    console.error(`Error applying OVMS patch: ${error.message}`)
-  }
-
   return 0
 }
 
@@ -224,27 +158,7 @@ async function installOvms() {
     return 102
   }
 
-  // Clean old installation if it exists
-  const cleanupCode = cleanOldOvmsInstallation()
-  if (cleanupCode !== 0) {
-    console.error(`OVMS cleanup failed with code: ${cleanupCode}`)
-    return cleanupCode
-  }
-
-  const installBaseCode = await installOvmsBase()
-  if (installBaseCode !== 0) {
-    console.error(`OVMS Base installation failed with code: ${installBaseCode}`)
-    cleanOldOvmsInstallation()
-    return installBaseCode
-  }
-
-  const installExtraCode = await installOvmsExtra()
-  if (installExtraCode !== 0) {
-    console.error(`OVMS Extra installation failed with code: ${installExtraCode}`)
-    return installExtraCode
-  }
-
-  return 0
+  return await downloadOvmsBinary()
 }
 
 // Run the installation

scripts/auto-translate-i18n.ts

@@ -2,9 +2,9 @@
  * 该脚本用于少量自动翻译所有baseLocale以外的文本。待翻译文案必须以[to be translated]开头
  *
  */
-import OpenAI from '@cherrystudio/openai'
 import cliProgress from 'cli-progress'
 import * as fs from 'fs'
+import OpenAI from 'openai'
 import * as path from 'path'
 
 const localesDir = path.join(__dirname, '../src/renderer/src/i18n/locales')

scripts/update-i18n.ts

@@ -4,9 +4,9 @@
  * API_KEY=sk-xxxx BASE_URL=xxxx MODEL=xxxx ts-node scripts/update-i18n.ts
  */
 
-import OpenAI from '@cherrystudio/openai'
 import cliProgress from 'cli-progress'
 import fs from 'fs'
+import OpenAI from 'openai'
 
 type I18NValue = string | { [key: string]: I18NValue }
 type I18N = { [key: string]: I18NValue }

src/main/apiServer/routes/agents/handlers/agents.ts

@@ -132,20 +132,6 @@ export const createAgent = async (req: Request, res: Response): Promise<Response
  *           minimum: 0
  *           default: 0
  *         description: Number of agents to skip
- *       - in: query
- *         name: sortBy
- *         schema:
- *           type: string
- *           enum: [created_at, updated_at, name]
- *           default: created_at
- *         description: Field to sort by
- *       - in: query
- *         name: orderBy
- *         schema:
- *           type: string
- *           enum: [asc, desc]
- *           default: desc
- *         description: Sort order (asc = ascending, desc = descending)
  *     responses:
  *       200:
  *         description: List of agents
@@ -184,12 +170,10 @@ export const listAgents = async (req: Request, res: Response): Promise<Response>
   try {
     const limit = req.query.limit ? parseInt(req.query.limit as string) : 20
     const offset = req.query.offset ? parseInt(req.query.offset as string) : 0
-    const sortBy = (req.query.sortBy as 'created_at' | 'updated_at' | 'name') || 'created_at'
-    const orderBy = (req.query.orderBy as 'asc' | 'desc') || 'desc'
 
-    logger.debug('Listing agents', { limit, offset, sortBy, orderBy })
+    logger.debug('Listing agents', { limit, offset })
 
-    const result = await agentService.listAgents({ limit, offset, sortBy, orderBy })
+    const result = await agentService.listAgents({ limit, offset })
 
     logger.info('Agents listed', {
       returned: result.agents.length,

src/main/apiServer/routes/chat.ts

@@ -1,5 +1,5 @@
-import { ChatCompletionCreateParams } from '@cherrystudio/openai/resources'
 import express, { Request, Response } from 'express'
+import { ChatCompletionCreateParams } from 'openai/resources'
 
 import { loggerService } from '../../services/LoggerService'
 import {

src/main/apiServer/server.ts

@@ -1,8 +1,7 @@
 import { createServer } from 'node:http'
 
-import { loggerService } from '@logger'
-
 import { agentService } from '../services/agents'
+import { loggerService } from '../services/LoggerService'
 import { app } from './app'
 import { config } from './config'
 
@@ -16,17 +15,11 @@ export class ApiServer {
   private server: ReturnType<typeof createServer> | null = null
 
   async start(): Promise<void> {
-    if (this.server && this.server.listening) {
+    if (this.server) {
       logger.warn('Server already running')
       return
     }
 
-    // Clean up any failed server instance
-    if (this.server && !this.server.listening) {
-      logger.warn('Cleaning up failed server instance')
-      this.server = null
-    }
-
     // Load config
     const { port, host } = await config.load()
 
@@ -46,11 +39,7 @@ export class ApiServer {
         resolve()
       })
 
-      this.server!.on('error', (error) => {
-        // Clean up the server instance if listen fails
-        this.server = null
-        reject(error)
-      })
+      this.server!.on('error', reject)
     })
   }
 

src/main/apiServer/services/chat-completion.ts

@@ -1,6 +1,6 @@
-import OpenAI from '@cherrystudio/openai'
-import { ChatCompletionCreateParams, ChatCompletionCreateParamsStreaming } from '@cherrystudio/openai/resources'
 import { Provider } from '@types'
+import OpenAI from 'openai'
+import { ChatCompletionCreateParams, ChatCompletionCreateParamsStreaming } from 'openai/resources'
 
 import { loggerService } from '../../services/LoggerService'
 import { ModelValidationError, validateModelId } from '../utils'

src/main/apiServer/services/models.ts

@@ -1,13 +1,6 @@
-import { isEmpty } from 'lodash'
-
 import { ApiModel, ApiModelsFilter, ApiModelsResponse } from '../../../renderer/src/types/apiModels'
 import { loggerService } from '../../services/LoggerService'
-import {
-  getAvailableProviders,
-  getProviderAnthropicModelChecker,
-  listAllAvailableModels,
-  transformModelToOpenAI
-} from '../utils'
+import { getAvailableProviders, listAllAvailableModels, transformModelToOpenAI } from '../utils'
 
 const logger = loggerService.withContext('ModelsService')
 
@@ -23,7 +16,9 @@ export class ModelsService {
       let providers = await getAvailableProviders()
 
       if (filter.providerType === 'anthropic') {
-        providers = providers.filter((p) => p.type === 'anthropic' || !isEmpty(p.anthropicApiHost?.trim()))
+        providers = providers.filter(
+          (p) => p.type === 'anthropic' || (p.anthropicApiHost !== undefined && p.anthropicApiHost.trim() !== '')
+        )
       }
 
       const models = await listAllAvailableModels(providers)
@@ -32,18 +27,18 @@ export class ModelsService {
 
       for (const model of models) {
         const provider = providers.find((p) => p.id === model.provider)
-        logger.debug(`Processing model ${model.id}`)
-        if (!provider) {
-          logger.debug(`Skipping model ${model.id} . Reason: Provider not found.`)
+        logger.debug(`Processing model ${model.id} from provider ${model.provider}`, {
+          isAnthropicModel: provider?.isAnthropicModel
+        })
+        if (
+          !provider ||
+          (filter.providerType === 'anthropic' && provider.isAnthropicModel && !provider.isAnthropicModel(model))
+        ) {
           continue
         }
-
-        if (filter.providerType === 'anthropic') {
-          const checker = getProviderAnthropicModelChecker(provider.id)
-          if (!checker(model)) {
-            logger.debug(`Skipping model ${model.id} from ${model.provider}. Reason: Not an Anthropic model.`)
-            continue
-          }
+        // Special case: For "aihubmix", it should be covered by above condition, but just in case
+        if (provider.id === 'aihubmix' && filter.providerType === 'anthropic' && !model.id.includes('claude')) {
+          continue
         }
 
         const openAIModel = transformModelToOpenAI(model, provider)

src/main/apiServer/utils/index.ts

@@ -279,16 +279,3 @@ export function validateProvider(provider: Provider): boolean {
     return false
   }
 }
-
-export const getProviderAnthropicModelChecker = (providerId: string): ((m: Model) => boolean) => {
-  switch (providerId) {
-    case 'cherryin':
-    case 'new-api':
-      return (m: Model) => m.endpoint_type === 'anthropic'
-    case 'aihubmix':
-      return (m: Model) => m.id.includes('claude')
-    default:
-      // allow all models when checker not configured
-      return () => true
-  }
-}

src/main/index.ts

@@ -30,7 +30,6 @@ import selectionService, { initSelectionService } from './services/SelectionServ
 import { registerShortcuts } from './services/ShortcutService'
 import { TrayService } from './services/TrayService'
 import { windowService } from './services/WindowService'
-import { initWebviewHotkeys } from './services/WebviewService'
 
 const logger = loggerService.withContext('MainEntry')
 
@@ -109,7 +108,6 @@ if (!app.requestSingleInstanceLock()) {
   // Some APIs can only be used after this event occurs.
 
   app.whenReady().then(async () => {
-    initWebviewHotkeys()
     // Set app user model id for windows
     electronApp.setAppUserModelId(import.meta.env.VITE_MAIN_BUNDLE_ID || 'com.kangfenmao.CherryStudio')
 
@@ -159,26 +157,11 @@ if (!app.requestSingleInstanceLock()) {
       logger.error('Failed to initialize Agent service:', error)
     }
 
-    // Start API server if enabled or if agents exist
+    // Start API server if enabled
     try {
       const config = await apiServerService.getCurrentConfig()
       logger.info('API server config:', config)
-
-      // Check if there are any agents
-      let shouldStart = config.enabled
-      if (!shouldStart) {
-        try {
-          const { total } = await agentService.listAgents({ limit: 1 })
-          if (total > 0) {
-            shouldStart = true
-            logger.info(`Detected ${total} agent(s), auto-starting API server`)
-          }
-        } catch (error: any) {
-          logger.warn('Failed to check agent count:', error)
-        }
-      }
-
-      if (shouldStart) {
+      if (config.enabled) {
         await apiServerService.start()
       }
     } catch (error: any) {

src/main/ipc.ts

@@ -142,7 +142,7 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.Open_Website, (_, url: string) => shell.openExternal(url))
 
   // Update
-  ipcMain.handle(IpcChannel.App_QuitAndInstall, () => appUpdater.quitAndInstall())
+  ipcMain.handle(IpcChannel.App_ShowUpdateDialog, () => appUpdater.showUpdateDialog(mainWindow))
 
   // language
   ipcMain.handle(IpcChannel.App_SetLanguage, (_, language) => {
@@ -786,6 +786,7 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.Webview_SetOpenLinkExternal, (_, webviewId: number, isExternal: boolean) =>
     setOpenLinkExternal(webviewId, isExternal)
   )
+
   ipcMain.handle(IpcChannel.Webview_SetSpellCheckEnabled, (_, webviewId: number, isEnable: boolean) => {
     const webview = webContents.fromId(webviewId)
     if (!webview) return
@@ -875,7 +876,6 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.OCR_ocr, (_, file: SupportedOcrFile, provider: OcrProvider) =>
     ocrService.ocr(file, provider)
   )
-  ipcMain.handle(IpcChannel.OCR_ListProviders, () => ocrService.listProviderIds())
 
   // OVMS
   ipcMain.handle(IpcChannel.Ovms_AddModel, (_, modelName: string, modelId: string, modelSource: string, task: string) =>

src/main/knowledge/reranker/BaseReranker.ts

@@ -80,7 +80,6 @@ export default abstract class BaseReranker {
       message: error.message,
       status: error.response?.status,
       statusText: error.response?.statusText,
-      responseBody: error.response?.body, // Include the actual API error response
       requestBody: requestBody
     }
     return JSON.stringify(errorDetails, null, 2)

src/main/knowledge/reranker/GeneralReranker.ts

@@ -2,15 +2,6 @@ import { KnowledgeBaseParams, KnowledgeSearchResult } from '@types'
 import { net } from 'electron'
 
 import BaseReranker from './BaseReranker'
-
-interface RerankError extends Error {
-  response?: {
-    status: number
-    statusText: string
-    body?: unknown
-  }
-}
-
 export default class GeneralReranker extends BaseReranker {
   constructor(base: KnowledgeBaseParams) {
     super(base)
@@ -26,30 +17,7 @@ export default class GeneralReranker extends BaseReranker {
       })
 
       if (!response.ok) {
-        // Read the response body to get detailed error information
-        // Clone the response to avoid consuming the body multiple times
-        const clonedResponse = response.clone()
-        let errorBody: unknown
-
-        try {
-          errorBody = await clonedResponse.json()
-        } catch {
-          // If response body is not JSON, try to read as text
-          try {
-            errorBody = await response.text()
-          } catch {
-            errorBody = null
-          }
-        }
-
-        const error = new Error(`HTTP ${response.status}: ${response.statusText}`) as RerankError
-        // Attach response details to the error object for formatErrorMessage
-        error.response = {
-          status: response.status,
-          statusText: response.statusText,
-          body: errorBody
-        }
-        throw error
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`)
       }
 
       const data = await response.json()

src/main/mcpServers/didi-mcp.ts

@@ -1,473 +0,0 @@
-/**
- * DiDi MCP Server Implementation
- *
- * Based on official DiDi MCP API capabilities.
- * API Documentation: https://mcp.didichuxing.com/api?tap=api
- *
- * Provides ride-hailing services including map search, price estimation,
- * order management, and driver tracking.
- *
- * Note: Only available in Mainland China.
- */
-
-import { loggerService } from '@logger'
-import { Server } from '@modelcontextprotocol/sdk/server/index.js'
-import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
-
-const logger = loggerService.withContext('DiDiMCPServer')
-
-export class DiDiMcpServer {
-  private _server: Server
-  private readonly baseUrl = 'http://mcp.didichuxing.com/mcp-servers'
-  private apiKey: string
-
-  constructor(apiKey?: string) {
-    this._server = new Server(
-      {
-        name: 'didi-mcp-server',
-        version: '0.1.0'
-      },
-      {
-        capabilities: {
-          tools: {}
-        }
-      }
-    )
-
-    // Get API key from parameter or environment variables
-    this.apiKey = apiKey || process.env.DIDI_API_KEY || ''
-    if (!this.apiKey) {
-      logger.warn('DIDI_API_KEY environment variable is not set')
-    }
-
-    this.setupRequestHandlers()
-  }
-
-  get server(): Server {
-    return this._server
-  }
-
-  private setupRequestHandlers() {
-    // List available tools
-    this._server.setRequestHandler(ListToolsRequestSchema, async () => {
-      return {
-        tools: [
-          {
-            name: 'maps_textsearch',
-            description: 'Search for POI locations based on keywords and city',
-            inputSchema: {
-              type: 'object',
-              properties: {
-                city: {
-                  type: 'string',
-                  description: 'Query city'
-                },
-                keywords: {
-                  type: 'string',
-                  description: 'Search keywords'
-                },
-                location: {
-                  type: 'string',
-                  description: 'Location coordinates, format: longitude,latitude'
-                }
-              },
-              required: ['keywords', 'city']
-            }
-          },
-          {
-            name: 'taxi_cancel_order',
-            description: 'Cancel a taxi order',
-            inputSchema: {
-              type: 'object',
-              properties: {
-                order_id: {
-                  type: 'string',
-                  description: 'Order ID from order creation or query results'
-                },
-                reason: {
-                  type: 'string',
-                  description:
-                    'Cancellation reason (optional). Examples: no longer needed, waiting too long, urgent matter'
-                }
-              },
-              required: ['order_id']
-            }
-          },
-          {
-            name: 'taxi_create_order',
-            description: 'Create taxi order directly via API without opening any app interface',
-            inputSchema: {
-              type: 'object',
-              properties: {
-                caller_car_phone: {
-                  type: 'string',
-                  description: 'Caller phone number (optional)'
-                },
-                estimate_trace_id: {
-                  type: 'string',
-                  description: 'Estimation trace ID from estimation results'
-                },
-                product_category: {
-                  type: 'string',
-                  description: 'Vehicle category ID from estimation results, comma-separated for multiple types'
-                }
-              },
-              required: ['product_category', 'estimate_trace_id']
-            }
-          },
-          {
-            name: 'taxi_estimate',
-            description: 'Get available ride-hailing vehicle types and fare estimates',
-            inputSchema: {
-              type: 'object',
-              properties: {
-                from_lat: {
-                  type: 'string',
-                  description: 'Departure latitude, must be from map tools'
-                },
-                from_lng: {
-                  type: 'string',
-                  description: 'Departure longitude, must be from map tools'
-                },
-                from_name: {
-                  type: 'string',
-                  description: 'Departure location name'
-                },
-                to_lat: {
-                  type: 'string',
-                  description: 'Destination latitude, must be from map tools'
-                },
-                to_lng: {
-                  type: 'string',
-                  description: 'Destination longitude, must be from map tools'
-                },
-                to_name: {
-                  type: 'string',
-                  description: 'Destination name'
-                }
-              },
-              required: ['from_lng', 'from_lat', 'from_name', 'to_lng', 'to_lat', 'to_name']
-            }
-          },
-          {
-            name: 'taxi_generate_ride_app_link',
-            description: 'Generate deep links to open ride-hailing apps based on origin, destination and vehicle type',
-            inputSchema: {
-              type: 'object',
-              properties: {
-                from_lat: {
-                  type: 'string',
-                  description: 'Departure latitude, must be from map tools'
-                },
-                from_lng: {
-                  type: 'string',
-                  description: 'Departure longitude, must be from map tools'
-                },
-                product_category: {
-                  type: 'string',
-                  description: 'Vehicle category IDs from estimation results, comma-separated for multiple types'
-                },
-                to_lat: {
-                  type: 'string',
-                  description: 'Destination latitude, must be from map tools'
-                },
-                to_lng: {
-                  type: 'string',
-                  description: 'Destination longitude, must be from map tools'
-                }
-              },
-              required: ['from_lng', 'from_lat', 'to_lng', 'to_lat']
-            }
-          },
-          {
-            name: 'taxi_get_driver_location',
-            description: 'Get real-time driver location for a taxi order',
-            inputSchema: {
-              type: 'object',
-              properties: {
-                order_id: {
-                  type: 'string',
-                  description: 'Taxi order ID'
-                }
-              },
-              required: ['order_id']
-            }
-          },
-          {
-            name: 'taxi_query_order',
-            description: 'Query taxi order status and information such as driver contact, license plate, ETA',
-            inputSchema: {
-              type: 'object',
-              properties: {
-                order_id: {
-                  type: 'string',
-                  description: 'Order ID from order creation results, if available; otherwise queries incomplete orders'
-                }
-              }
-            }
-          }
-        ]
-      }
-    })
-
-    // Handle tool calls
-    this._server.setRequestHandler(CallToolRequestSchema, async (request) => {
-      const { name, arguments: args } = request.params
-
-      try {
-        switch (name) {
-          case 'maps_textsearch':
-            return await this.handleMapsTextSearch(args)
-          case 'taxi_cancel_order':
-            return await this.handleTaxiCancelOrder(args)
-          case 'taxi_create_order':
-            return await this.handleTaxiCreateOrder(args)
-          case 'taxi_estimate':
-            return await this.handleTaxiEstimate(args)
-          case 'taxi_generate_ride_app_link':
-            return await this.handleTaxiGenerateRideAppLink(args)
-          case 'taxi_get_driver_location':
-            return await this.handleTaxiGetDriverLocation(args)
-          case 'taxi_query_order':
-            return await this.handleTaxiQueryOrder(args)
-          default:
-            throw new Error(`Unknown tool: ${name}`)
-        }
-      } catch (error) {
-        logger.error(`Error calling tool ${name}:`, error as Error)
-        throw error
-      }
-    })
-  }
-
-  private async handleMapsTextSearch(args: any) {
-    const { city, keywords, location } = args
-
-    const params = {
-      name: 'maps_textsearch',
-      arguments: {
-        keywords,
-        city,
-        ...(location && { location })
-      }
-    }
-
-    try {
-      const response = await this.makeRequest('tools/call', params)
-      return {
-        content: [
-          {
-            type: 'text',
-            text: JSON.stringify(response, null, 2)
-          }
-        ]
-      }
-    } catch (error) {
-      logger.error('Maps text search error:', error as Error)
-      throw error
-    }
-  }
-
-  private async handleTaxiCancelOrder(args: any) {
-    const { order_id, reason } = args
-
-    const params = {
-      name: 'taxi_cancel_order',
-      arguments: {
-        order_id,
-        ...(reason && { reason })
-      }
-    }
-
-    try {
-      const response = await this.makeRequest('tools/call', params)
-      return {
-        content: [
-          {
-            type: 'text',
-            text: JSON.stringify(response, null, 2)
-          }
-        ]
-      }
-    } catch (error) {
-      logger.error('Taxi cancel order error:', error as Error)
-      throw error
-    }
-  }
-
-  private async handleTaxiCreateOrder(args: any) {
-    const { caller_car_phone, estimate_trace_id, product_category } = args
-
-    const params = {
-      name: 'taxi_create_order',
-      arguments: {
-        product_category,
-        estimate_trace_id,
-        ...(caller_car_phone && { caller_car_phone })
-      }
-    }
-
-    try {
-      const response = await this.makeRequest('tools/call', params)
-      return {
-        content: [
-          {
-            type: 'text',
-            text: JSON.stringify(response, null, 2)
-          }
-        ]
-      }
-    } catch (error) {
-      logger.error('Taxi create order error:', error as Error)
-      throw error
-    }
-  }
-
-  private async handleTaxiEstimate(args: any) {
-    const { from_lng, from_lat, from_name, to_lng, to_lat, to_name } = args
-
-    const params = {
-      name: 'taxi_estimate',
-      arguments: {
-        from_lng,
-        from_lat,
-        from_name,
-        to_lng,
-        to_lat,
-        to_name
-      }
-    }
-
-    try {
-      const response = await this.makeRequest('tools/call', params)
-      return {
-        content: [
-          {
-            type: 'text',
-            text: JSON.stringify(response, null, 2)
-          }
-        ]
-      }
-    } catch (error) {
-      logger.error('Taxi estimate error:', error as Error)
-      throw error
-    }
-  }
-
-  private async handleTaxiGenerateRideAppLink(args: any) {
-    const { from_lng, from_lat, to_lng, to_lat, product_category } = args
-
-    const params = {
-      name: 'taxi_generate_ride_app_link',
-      arguments: {
-        from_lng,
-        from_lat,
-        to_lng,
-        to_lat,
-        ...(product_category && { product_category })
-      }
-    }
-
-    try {
-      const response = await this.makeRequest('tools/call', params)
-      return {
-        content: [
-          {
-            type: 'text',
-            text: JSON.stringify(response, null, 2)
-          }
-        ]
-      }
-    } catch (error) {
-      logger.error('Taxi generate ride app link error:', error as Error)
-      throw error
-    }
-  }
-
-  private async handleTaxiGetDriverLocation(args: any) {
-    const { order_id } = args
-
-    const params = {
-      name: 'taxi_get_driver_location',
-      arguments: {
-        order_id
-      }
-    }
-
-    try {
-      const response = await this.makeRequest('tools/call', params)
-      return {
-        content: [
-          {
-            type: 'text',
-            text: JSON.stringify(response, null, 2)
-          }
-        ]
-      }
-    } catch (error) {
-      logger.error('Taxi get driver location error:', error as Error)
-      throw error
-    }
-  }
-
-  private async handleTaxiQueryOrder(args: any) {
-    const { order_id } = args
-
-    const params = {
-      name: 'taxi_query_order',
-      arguments: {
-        ...(order_id && { order_id })
-      }
-    }
-
-    try {
-      const response = await this.makeRequest('tools/call', params)
-      return {
-        content: [
-          {
-            type: 'text',
-            text: JSON.stringify(response, null, 2)
-          }
-        ]
-      }
-    } catch (error) {
-      logger.error('Taxi query order error:', error as Error)
-      throw error
-    }
-  }
-
-  private async makeRequest(method: string, params: any): Promise<any> {
-    const requestData = {
-      jsonrpc: '2.0',
-      method: method,
-      id: Date.now(),
-      ...(Object.keys(params).length > 0 && { params })
-    }
-
-    // API key is passed as URL parameter
-    const url = `${this.baseUrl}?key=${this.apiKey}`
-
-    const response = await fetch(url, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify(requestData)
-    })
-
-    if (!response.ok) {
-      const errorText = await response.text()
-      throw new Error(`HTTP ${response.status}: ${errorText}`)
-    }
-
-    const data = await response.json()
-
-    if (data.error) {
-      throw new Error(`API Error: ${JSON.stringify(data.error)}`)
-    }
-
-    return data.result
-  }
-}
-
-export default DiDiMcpServer

src/main/mcpServers/dify-knowledge.ts

@@ -3,7 +3,7 @@ import { loggerService } from '@logger'
 import { Server } from '@modelcontextprotocol/sdk/server/index.js'
 import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
 import { net } from 'electron'
-import * as z from 'zod'
+import { z } from 'zod'
 
 const logger = loggerService.withContext('DifyKnowledgeServer')
 

src/main/mcpServers/factory.ts

@@ -3,7 +3,6 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js'
 import { BuiltinMCPServerName, BuiltinMCPServerNames } from '@types'
 
 import BraveSearchServer from './brave-search'
-import DiDiMcpServer from './didi-mcp'
 import DifyKnowledgeServer from './dify-knowledge'
 import FetchServer from './fetch'
 import FileSystemServer from './filesystem'
@@ -43,10 +42,6 @@ export function createInMemoryMCPServer(
     case BuiltinMCPServerNames.python: {
       return new PythonServer().server
     }
-    case BuiltinMCPServerNames.didiMCP: {
-      const apiKey = envs.DIDI_API_KEY
-      return new DiDiMcpServer(apiKey).server
-    }
     default:
       throw new Error(`Unknown in-memory MCP server: ${name}`)
   }

src/main/mcpServers/fetch.ts

@@ -5,7 +5,7 @@ import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprot
 import { net } from 'electron'
 import { JSDOM } from 'jsdom'
 import TurndownService from 'turndown'
-import * as z from 'zod'
+import { z } from 'zod'
 
 export const RequestPayloadSchema = z.object({
   url: z.url(),

src/main/mcpServers/filesystem.ts

@@ -8,7 +8,7 @@ import fs from 'fs/promises'
 import { minimatch } from 'minimatch'
 import os from 'os'
 import path from 'path'
-import * as z from 'zod'
+import { z } from 'zod'
 
 const logger = loggerService.withContext('MCP:FileSystemServer')
 

src/main/services/ApiServerService.ts

@@ -1,11 +1,5 @@
 import { IpcChannel } from '@shared/IpcChannel'
-import {
-  ApiServerConfig,
-  GetApiServerStatusResult,
-  RestartApiServerStatusResult,
-  StartApiServerStatusResult,
-  StopApiServerStatusResult
-} from '@types'
+import { ApiServerConfig } from '@types'
 import { ipcMain } from 'electron'
 
 import { apiServer } from '../apiServer'
@@ -58,7 +52,7 @@ export class ApiServerService {
 
   registerIpcHandlers(): void {
     // API Server
-    ipcMain.handle(IpcChannel.ApiServer_Start, async (): Promise<StartApiServerStatusResult> => {
+    ipcMain.handle(IpcChannel.ApiServer_Start, async () => {
       try {
         await this.start()
         return { success: true }
@@ -67,7 +61,7 @@ export class ApiServerService {
       }
     })
 
-    ipcMain.handle(IpcChannel.ApiServer_Stop, async (): Promise<StopApiServerStatusResult> => {
+    ipcMain.handle(IpcChannel.ApiServer_Stop, async () => {
       try {
         await this.stop()
         return { success: true }
@@ -76,7 +70,7 @@ export class ApiServerService {
       }
     })
 
-    ipcMain.handle(IpcChannel.ApiServer_Restart, async (): Promise<RestartApiServerStatusResult> => {
+    ipcMain.handle(IpcChannel.ApiServer_Restart, async () => {
       try {
         await this.restart()
         return { success: true }
@@ -85,7 +79,7 @@ export class ApiServerService {
       }
     })
 
-    ipcMain.handle(IpcChannel.ApiServer_GetStatus, async (): Promise<GetApiServerStatusResult> => {
+    ipcMain.handle(IpcChannel.ApiServer_GetStatus, async () => {
       try {
         const config = await this.getCurrentConfig()
         return {

src/main/services/AppUpdater.ts

@@ -1,15 +1,17 @@
 import { loggerService } from '@logger'
 import { isWin } from '@main/constant'
 import { getIpCountry } from '@main/utils/ipService'
+import { locales } from '@main/utils/locales'
 import { generateUserAgent } from '@main/utils/systemInfo'
 import { FeedUrl, UpgradeChannel } from '@shared/config/constant'
 import { IpcChannel } from '@shared/IpcChannel'
 import { CancellationToken, UpdateInfo } from 'builder-util-runtime'
-import { app, net } from 'electron'
+import { app, BrowserWindow, dialog, net } from 'electron'
 import { AppUpdater as _AppUpdater, autoUpdater, Logger, NsisUpdater, UpdateCheckResult } from 'electron-updater'
 import path from 'path'
 import semver from 'semver'
 
+import icon from '../../../build/icon.png?asset'
 import { configManager } from './ConfigManager'
 import { windowService } from './WindowService'
 
@@ -24,6 +26,7 @@ const LANG_MARKERS = {
 
 export default class AppUpdater {
   autoUpdater: _AppUpdater = autoUpdater
+  private releaseInfo: UpdateInfo | undefined
   private cancellationToken: CancellationToken = new CancellationToken()
   private updateCheckResult: UpdateCheckResult | null = null
 
@@ -63,6 +66,7 @@ export default class AppUpdater {
     autoUpdater.on('update-downloaded', (releaseInfo: UpdateInfo) => {
       const processedReleaseInfo = this.processReleaseInfo(releaseInfo)
       windowService.getMainWindow()?.webContents.send(IpcChannel.UpdateDownloaded, processedReleaseInfo)
+      this.releaseInfo = processedReleaseInfo
       logger.info('update downloaded', processedReleaseInfo)
     })
 
@@ -243,9 +247,37 @@ export default class AppUpdater {
     }
   }
 
-  public quitAndInstall() {
-    app.isQuitting = true
-    setImmediate(() => autoUpdater.quitAndInstall())
+  public async showUpdateDialog(mainWindow: BrowserWindow) {
+    if (!this.releaseInfo) {
+      return
+    }
+    const locale = locales[configManager.getLanguage()]
+    const { update: updateLocale } = locale.translation
+
+    let detail = this.formatReleaseNotes(this.releaseInfo.releaseNotes)
+    if (detail === '') {
+      detail = updateLocale.noReleaseNotes
+    }
+
+    dialog
+      .showMessageBox({
+        type: 'info',
+        title: updateLocale.title,
+        icon,
+        message: updateLocale.message.replace('{{version}}', this.releaseInfo.version),
+        detail,
+        buttons: [updateLocale.later, updateLocale.install],
+        defaultId: 1,
+        cancelId: 0
+      })
+      .then(({ response }) => {
+        if (response === 1) {
+          app.isQuitting = true
+          setImmediate(() => autoUpdater.quitAndInstall())
+        } else {
+          mainWindow.webContents.send(IpcChannel.UpdateDownloadedCancelled)
+        }
+      })
   }
 
   /**
@@ -317,9 +349,38 @@ export default class AppUpdater {
 
     return processedInfo
   }
+
+  /**
+   * Format release notes for display
+   * @param releaseNotes - Release notes in various formats
+   * @returns Formatted string for display
+   */
+  private formatReleaseNotes(releaseNotes: string | ReleaseNoteInfo[] | null | undefined): string {
+    if (!releaseNotes) {
+      return ''
+    }
+
+    if (typeof releaseNotes === 'string') {
+      // Check if it contains multi-language markers
+      if (this.hasMultiLanguageMarkers(releaseNotes)) {
+        return this.parseMultiLangReleaseNotes(releaseNotes)
+      }
+      return releaseNotes
+    }
+
+    if (Array.isArray(releaseNotes)) {
+      return releaseNotes.map((note) => note.note).join('\n')
+    }
+
+    return ''
+  }
 }
 interface GithubReleaseInfo {
   draft: boolean
   prerelease: boolean
   tag_name: string
 }
+interface ReleaseNoteInfo {
+  readonly version: string
+  readonly note: string | null
+}

src/main/services/KnowledgeService.ts

@@ -29,7 +29,7 @@ import Reranker from '@main/knowledge/reranker/Reranker'
 import { fileStorage } from '@main/services/FileStorage'
 import { windowService } from '@main/services/WindowService'
 import { getDataPath } from '@main/utils'
-import { getAllFiles, sanitizeFilename } from '@main/utils/file'
+import { getAllFiles } from '@main/utils/file'
 import { TraceMethod } from '@mcp-trace/trace-core'
 import { MB } from '@shared/config/constant'
 import type { LoaderReturn } from '@shared/config/types'
@@ -147,16 +147,11 @@ class KnowledgeService {
     }
   }
 
-  private getDbPath = (id: string): string => {
-    // 消除网络搜索requestI d中的特殊字符
-    return path.join(this.storageDir, sanitizeFilename(id, '_'))
-  }
-
   /**
    * Delete knowledge base file
    */
   private deleteKnowledgeFile = (id: string): boolean => {
-    const dbPath = this.getDbPath(id)
+    const dbPath = path.join(this.storageDir, id)
     if (fs.existsSync(dbPath)) {
       try {
         fs.rmSync(dbPath, { recursive: true })
@@ -249,8 +244,7 @@ class KnowledgeService {
       dimensions
     })
     try {
-      const dbPath = this.getDbPath(id)
-      const libSqlDb = new LibSqlDb({ path: dbPath })
+      const libSqlDb = new LibSqlDb({ path: path.join(this.storageDir, id) })
       // Save database instance for later closing
       this.dbInstances.set(id, libSqlDb)
 

src/main/services/ProxyManager.ts

@@ -4,7 +4,6 @@ import { app, ProxyConfig, session } from 'electron'
 import { socksDispatcher } from 'fetch-socks'
 import http from 'http'
 import https from 'https'
-import * as ipaddr from 'ipaddr.js'
 import { getSystemProxy } from 'os-proxy-config'
 import { ProxyAgent } from 'proxy-agent'
 import { Dispatcher, EnvHttpProxyAgent, getGlobalDispatcher, setGlobalDispatcher } from 'undici'
@@ -12,293 +11,41 @@ import { Dispatcher, EnvHttpProxyAgent, getGlobalDispatcher, setGlobalDispatcher
 const logger = loggerService.withContext('ProxyManager')
 let byPassRules: string[] = []
 
-type HostnameMatchType = 'exact' | 'wildcardSubdomain' | 'generalWildcard'
-
-const enum ProxyBypassRuleType {
-  Local = 'local',
-  Cidr = 'cidr',
-  Ip = 'ip',
-  Domain = 'domain'
-}
-
-interface ParsedProxyBypassRule {
-  type: ProxyBypassRuleType
-  matchType: HostnameMatchType
-  rule: string
-  scheme?: string
-  port?: string
-  domain?: string
-  regex?: RegExp
-  cidr?: [ipaddr.IPv4 | ipaddr.IPv6, number]
-  ip?: string
-}
-
-let parsedByPassRules: ParsedProxyBypassRule[] = []
-
-const getDefaultPortForProtocol = (protocol: string): string | null => {
-  switch (protocol.toLowerCase()) {
-    case 'http:':
-      return '80'
-    case 'https:':
-      return '443'
-    default:
-      return null
-  }
-}
-
-const buildWildcardRegex = (pattern: string): RegExp => {
-  const escapedSegments = pattern.split('*').map((segment) => segment.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'))
-  return new RegExp(`^${escapedSegments.join('.*')}$`, 'i')
-}
-
-const isWildcardIp = (value: string): boolean => {
-  if (!value.includes('*')) {
-    return false
-  }
-  const replaced = value.replace(/\*/g, '0')
-  return ipaddr.isValid(replaced)
-}
-
-const matchHostnameRule = (hostname: string, rule: ParsedProxyBypassRule): boolean => {
-  const normalizedHostname = hostname.toLowerCase()
-
-  switch (rule.matchType) {
-    case 'exact':
-      return normalizedHostname === rule.domain
-    case 'wildcardSubdomain': {
-      const domain = rule.domain
-      if (!domain) {
-        return false
-      }
-      return normalizedHostname === domain || normalizedHostname.endsWith(`.${domain}`)
-    }
-    case 'generalWildcard':
-      return rule.regex ? rule.regex.test(normalizedHostname) : false
-    default:
-      return false
-  }
-}
-
-const parseProxyBypassRule = (rule: string): ParsedProxyBypassRule | null => {
-  const trimmedRule = rule.trim()
-  if (!trimmedRule) {
-    return null
-  }
-
-  if (trimmedRule === '<local>') {
-    return {
-      type: ProxyBypassRuleType.Local,
-      matchType: 'exact',
-      rule: '<local>'
-    }
-  }
-
-  let workingRule = trimmedRule
-  let scheme: string | undefined
-  const schemeMatch = workingRule.match(/^([a-zA-Z][a-zA-Z\d+\-.]*):\/\//)
-  if (schemeMatch) {
-    scheme = schemeMatch[1].toLowerCase()
-    workingRule = workingRule.slice(schemeMatch[0].length)
-  }
-
-  // CIDR notation must be processed before port extraction
-  if (workingRule.includes('/')) {
-    const cleanedCidr = workingRule.replace(/^\[|\]$/g, '')
-    if (ipaddr.isValidCIDR(cleanedCidr)) {
-      return {
-        type: ProxyBypassRuleType.Cidr,
-        matchType: 'exact',
-        rule: workingRule,
-        scheme,
-        cidr: ipaddr.parseCIDR(cleanedCidr)
-      }
-    }
-  }
-
-  // Extract port: supports "host:port" and "[ipv6]:port" formats
-  let port: string | undefined
-  const portMatch = workingRule.match(/^(.+?):(\d+)$/)
-  if (portMatch) {
-    // For IPv6, ensure we're not splitting inside the brackets
-    const potentialHost = portMatch[1]
-    if (!potentialHost.startsWith('[') || potentialHost.includes(']')) {
-      workingRule = potentialHost
-      port = portMatch[2]
-    }
-  }
-
-  const cleanedHost = workingRule.replace(/^\[|\]$/g, '')
-  const normalizedHost = cleanedHost.toLowerCase()
-
-  if (!cleanedHost) {
-    return null
-  }
-
-  if (ipaddr.isValid(cleanedHost)) {
-    return {
-      type: ProxyBypassRuleType.Ip,
-      matchType: 'exact',
-      rule: cleanedHost,
-      scheme,
-      port,
-      ip: cleanedHost
-    }
-  }
-
-  if (isWildcardIp(cleanedHost)) {
-    const regexPattern = cleanedHost.replace(/\./g, '\\.').replace(/\*/g, '\\d+')
-    return {
-      type: ProxyBypassRuleType.Ip,
-      matchType: 'generalWildcard',
-      rule: cleanedHost,
-      scheme,
-      port,
-      regex: new RegExp(`^${regexPattern}$`)
-    }
-  }
-
-  if (workingRule.startsWith('*.')) {
-    const domain = normalizedHost.slice(2)
-    return {
-      type: ProxyBypassRuleType.Domain,
-      matchType: 'wildcardSubdomain',
-      rule: workingRule,
-      scheme,
-      port,
-      domain
-    }
-  }
-
-  if (workingRule.startsWith('.')) {
-    const domain = normalizedHost.slice(1)
-    return {
-      type: ProxyBypassRuleType.Domain,
-      matchType: 'wildcardSubdomain',
-      rule: workingRule,
-      scheme,
-      port,
-      domain
-    }
-  }
-
-  if (workingRule.includes('*')) {
-    return {
-      type: ProxyBypassRuleType.Domain,
-      matchType: 'generalWildcard',
-      rule: workingRule,
-      scheme,
-      port,
-      regex: buildWildcardRegex(normalizedHost)
-    }
-  }
-
-  return {
-    type: ProxyBypassRuleType.Domain,
-    matchType: 'exact',
-    rule: workingRule,
-    scheme,
-    port,
-    domain: normalizedHost
-  }
-}
-
-const isLocalHostname = (hostname: string): boolean => {
-  const normalized = hostname.toLowerCase()
-  if (normalized === 'localhost') {
-    return true
-  }
-
-  const cleaned = hostname.replace(/^\[|\]$/g, '')
-  if (ipaddr.isValid(cleaned)) {
-    const parsed = ipaddr.parse(cleaned)
-    return parsed.range() === 'loopback'
-  }
-
-  return false
-}
-
-export const updateByPassRules = (rules: string[]): void => {
-  byPassRules = rules
-  parsedByPassRules = []
-
-  for (const rule of rules) {
-    const parsedRule = parseProxyBypassRule(rule)
-    if (parsedRule) {
-      parsedByPassRules.push(parsedRule)
-    } else {
-      logger.warn(`Skipping invalid proxy bypass rule: ${rule}`)
-    }
-  }
-}
-
-export const isByPass = (url: string) => {
-  if (parsedByPassRules.length === 0) {
+const isByPass = (url: string) => {
+  if (byPassRules.length === 0) {
     return false
   }
 
   try {
-    const parsedUrl = new URL(url)
-    const hostname = parsedUrl.hostname
-    const cleanedHostname = hostname.replace(/^\[|\]$/g, '')
-    const protocol = parsedUrl.protocol
-    const protocolName = protocol.replace(':', '').toLowerCase()
-    const defaultPort = getDefaultPortForProtocol(protocol)
-    const port = parsedUrl.port || defaultPort || ''
-    const hostnameIsIp = ipaddr.isValid(cleanedHostname)
+    const subjectUrlTokens = new URL(url)
+    for (const rule of byPassRules) {
+      const ruleMatch = rule.replace(/^(?<leadingDot>\.)/, '*').match(/^(?<hostname>.+?)(?::(?<port>\d+))?$/)
 
-    for (const rule of parsedByPassRules) {
-      if (rule.scheme && rule.scheme !== protocolName) {
+      if (!ruleMatch || !ruleMatch.groups) {
+        logger.warn('Failed to parse bypass rule:', { rule })
         continue
       }
 
-      if (rule.port && rule.port !== port) {
+      if (!ruleMatch.groups.hostname) {
         continue
       }
 
-      switch (rule.type) {
-        case ProxyBypassRuleType.Local:
-          if (isLocalHostname(hostname)) {
-            return true
-          }
-          break
-        case ProxyBypassRuleType.Ip:
-          if (!hostnameIsIp) {
-            break
-          }
+      const hostnameIsMatch = subjectUrlTokens.hostname === ruleMatch.groups.hostname
 
-          if (rule.ip && cleanedHostname === rule.ip) {
-            return true
-          }
-
-          if (rule.regex && rule.regex.test(cleanedHostname)) {
-            return true
-          }
-          break
-        case ProxyBypassRuleType.Cidr:
-          if (hostnameIsIp && rule.cidr) {
-            const parsedHost = ipaddr.parse(cleanedHostname)
-            const [cidrAddress, prefixLength] = rule.cidr
-            // Ensure IP version matches before comparing
-            if (parsedHost.kind() === cidrAddress.kind() && parsedHost.match([cidrAddress, prefixLength])) {
-              return true
-            }
-          }
-          break
-        case ProxyBypassRuleType.Domain:
-          if (!hostnameIsIp && matchHostnameRule(hostname, rule)) {
-            return true
-          }
-          break
-        default:
-          logger.error(`Unknown proxy bypass rule type: ${rule.type}`)
-          break
+      if (
+        hostnameIsMatch &&
+        (!ruleMatch.groups ||
+          !ruleMatch.groups.port ||
+          (subjectUrlTokens.port && subjectUrlTokens.port === ruleMatch.groups.port))
+      ) {
+        return true
       }
     }
+    return false
   } catch (error) {
     logger.error('Failed to check bypass:', error as Error)
     return false
   }
-  return false
 }
 class SelectiveDispatcher extends Dispatcher {
   private proxyDispatcher: Dispatcher
@@ -407,31 +154,19 @@ export class ProxyManager {
     this.isSettingProxy = true
 
     try {
+      this.config = config
       this.clearSystemProxyMonitor()
       if (config.mode === 'system') {
         const currentProxy = await getSystemProxy()
         if (currentProxy) {
-          logger.info(`current system proxy: ${currentProxy.proxyUrl}, bypass rules: ${currentProxy.noProxy.join(',')}`)
-          config.proxyRules = currentProxy.proxyUrl.toLowerCase()
-          config.proxyBypassRules = currentProxy.noProxy.join(',')
+          logger.info(`current system proxy: ${currentProxy.proxyUrl}`)
+          this.config.proxyRules = currentProxy.proxyUrl.toLowerCase()
         }
         this.monitorSystemProxy()
       }
 
-      // Support both semicolon and comma as separators
-      if (config.proxyBypassRules !== this.config.proxyBypassRules) {
-        const rawRules = config.proxyBypassRules
-          ? config.proxyBypassRules
-              .split(/[;,]/)
-              .map((rule) => rule.trim())
-              .filter((rule) => rule.length > 0)
-          : []
-
-        updateByPassRules(rawRules)
-      }
-
-      this.setGlobalProxy(config)
-      this.config = config
+      byPassRules = config.proxyBypassRules?.split(',') || []
+      this.setGlobalProxy(this.config)
     } catch (error) {
       logger.error('Failed to config proxy:', error as Error)
       throw error

src/main/services/WebviewService.ts

@@ -1,5 +1,4 @@
-import { IpcChannel } from '@shared/IpcChannel'
-import { app, session, shell, webContents } from 'electron'
+import { session, shell, webContents } from 'electron'
 
 /**
  * init the useragent of the webview session
@@ -37,66 +36,3 @@ export function setOpenLinkExternal(webviewId: number, isExternal: boolean) {
     }
   })
 }
-
-const attachKeyboardHandler = (contents: Electron.WebContents) => {
-  if (contents.getType?.() !== 'webview') {
-    return
-  }
-
-  const handleBeforeInput = (event: Electron.Event, input: Electron.Input) => {
-    if (!input) {
-      return
-    }
-
-    const key = input.key?.toLowerCase()
-    if (!key) {
-      return
-    }
-
-    const isFindShortcut = (input.control || input.meta) && key === 'f'
-    const isEscape = key === 'escape'
-    const isEnter = key === 'enter'
-
-    if (!isFindShortcut && !isEscape && !isEnter) {
-      return
-    }
-
-    const host = contents.hostWebContents
-    if (!host || host.isDestroyed()) {
-      return
-    }
-
-    // Always prevent Cmd/Ctrl+F to override the guest page's native find dialog
-    if (isFindShortcut) {
-      event.preventDefault()
-    }
-
-    // Send the hotkey event to the renderer
-    // The renderer will decide whether to preventDefault for Escape and Enter
-    // based on whether the search bar is visible
-    host.send(IpcChannel.Webview_SearchHotkey, {
-      webviewId: contents.id,
-      key,
-      control: Boolean(input.control),
-      meta: Boolean(input.meta),
-      shift: Boolean(input.shift),
-      alt: Boolean(input.alt)
-    })
-  }
-
-  contents.on('before-input-event', handleBeforeInput)
-  contents.once('destroyed', () => {
-    contents.removeListener('before-input-event', handleBeforeInput)
-  })
-}
-
-export function initWebviewHotkeys() {
-  webContents.getAllWebContents().forEach((contents) => {
-    if (contents.isDestroyed()) return
-    attachKeyboardHandler(contents)
-  })
-
-  app.on('web-contents-created', (_, contents) => {
-    attachKeyboardHandler(contents)
-  })
-}

src/main/services/__tests__/AppUpdater.test.ts

@@ -274,4 +274,46 @@ describe('AppUpdater', () => {
       expect(result.releaseNotes).toBeNull()
     })
   })
+
+  describe('formatReleaseNotes', () => {
+    it('should format string release notes with markers', () => {
+      vi.mocked(configManager.getLanguage).mockReturnValue('en-US')
+      const notes = `<!--LANG:en-->English<!--LANG:zh-CN-->中文<!--LANG:END-->`
+
+      const result = (appUpdater as any).formatReleaseNotes(notes)
+
+      expect(result).toBe('English')
+    })
+
+    it('should format string release notes without markers', () => {
+      const notes = 'Simple notes'
+
+      const result = (appUpdater as any).formatReleaseNotes(notes)
+
+      expect(result).toBe('Simple notes')
+    })
+
+    it('should format array release notes', () => {
+      const notes = [
+        { version: '1.0.0', note: 'Note 1' },
+        { version: '1.0.1', note: 'Note 2' }
+      ]
+
+      const result = (appUpdater as any).formatReleaseNotes(notes)
+
+      expect(result).toBe('Note 1\nNote 2')
+    })
+
+    it('should handle null release notes', () => {
+      const result = (appUpdater as any).formatReleaseNotes(null)
+
+      expect(result).toBe('')
+    })
+
+    it('should handle undefined release notes', () => {
+      const result = (appUpdater as any).formatReleaseNotes(undefined)
+
+      expect(result).toBe('')
+    })
+  })
 })

src/main/services/__tests__/ProxyManager.test.ts

@@ -1,86 +0,0 @@
-import { beforeEach, describe, expect, it } from 'vitest'
-
-import { isByPass, updateByPassRules } from '../ProxyManager'
-
-describe('ProxyManager - bypass evaluation', () => {
-  beforeEach(() => {
-    updateByPassRules([])
-  })
-
-  it('matches simple hostname patterns', () => {
-    updateByPassRules(['foobar.com'])
-    expect(isByPass('http://foobar.com')).toBe(true)
-    expect(isByPass('http://www.foobar.com')).toBe(false)
-
-    updateByPassRules(['*.foobar.com'])
-    expect(isByPass('http://api.foobar.com')).toBe(true)
-    expect(isByPass('http://foobar.com')).toBe(true)
-    expect(isByPass('http://foobar.org')).toBe(false)
-
-    updateByPassRules(['*foobar.com'])
-    expect(isByPass('http://devfoobar.com')).toBe(true)
-    expect(isByPass('http://foobar.com')).toBe(true)
-    expect(isByPass('http://foobar.company')).toBe(false)
-  })
-
-  it('matches hostname patterns with scheme and port qualifiers', () => {
-    updateByPassRules(['https://secure.example.com'])
-    expect(isByPass('https://secure.example.com')).toBe(true)
-    expect(isByPass('https://secure.example.com:443/home')).toBe(true)
-    expect(isByPass('http://secure.example.com')).toBe(false)
-
-    updateByPassRules(['https://secure.example.com:8443'])
-    expect(isByPass('https://secure.example.com:8443')).toBe(true)
-    expect(isByPass('https://secure.example.com')).toBe(false)
-    expect(isByPass('https://secure.example.com:443')).toBe(false)
-
-    updateByPassRules(['https://x.*.y.com:99'])
-    expect(isByPass('https://x.api.y.com:99')).toBe(true)
-    expect(isByPass('https://x.api.y.com')).toBe(false)
-    expect(isByPass('http://x.api.y.com:99')).toBe(false)
-  })
-
-  it('matches domain suffix patterns with leading dot', () => {
-    updateByPassRules(['.example.com'])
-    expect(isByPass('https://example.com')).toBe(true)
-    expect(isByPass('https://api.example.com')).toBe(true)
-    expect(isByPass('https://deep.api.example.com')).toBe(true)
-    expect(isByPass('https://example.org')).toBe(false)
-
-    updateByPassRules(['.com'])
-    expect(isByPass('https://anything.com')).toBe(true)
-    expect(isByPass('https://example.org')).toBe(false)
-
-    updateByPassRules(['http://.google.com'])
-    expect(isByPass('http://maps.google.com')).toBe(true)
-    expect(isByPass('https://maps.google.com')).toBe(false)
-  })
-
-  it('matches IP literals, CIDR ranges, and wildcard IPs', () => {
-    updateByPassRules(['127.0.0.1', '[::1]', '192.168.1.0/24', 'fefe:13::abc/33', '192.168.*.*'])
-
-    expect(isByPass('http://127.0.0.1')).toBe(true)
-    expect(isByPass('http://[::1]')).toBe(true)
-    expect(isByPass('http://192.168.1.55')).toBe(true)
-    expect(isByPass('http://192.168.200.200')).toBe(true)
-    expect(isByPass('http://192.169.1.1')).toBe(false)
-    expect(isByPass('http://[fefe:13::abc]')).toBe(true)
-  })
-
-  it('matches CIDR ranges specified with IPv6 prefix lengths', () => {
-    updateByPassRules(['[2001:db8::1]', '2001:db8::/32'])
-
-    expect(isByPass('http://[2001:db8::1]')).toBe(true)
-    expect(isByPass('http://[2001:db8:0:0:0:0:0:ffff]')).toBe(true)
-    expect(isByPass('http://[2001:db9::1]')).toBe(false)
-  })
-
-  it('matches local addresses when <local> keyword is provided', () => {
-    updateByPassRules(['<local>'])
-
-    expect(isByPass('http://localhost')).toBe(true)
-    expect(isByPass('http://127.0.0.1')).toBe(true)
-    expect(isByPass('http://[::1]')).toBe(true)
-    expect(isByPass('http://dev.localdomain')).toBe(false)
-  })
-})

src/main/services/agents/services/AgentService.ts

@@ -11,7 +11,7 @@ import {
   UpdateAgentRequest,
   UpdateAgentResponse
 } from '@types'
-import { asc, count, desc, eq } from 'drizzle-orm'
+import { count, eq } from 'drizzle-orm'
 
 import { BaseService } from '../BaseService'
 import { type AgentRow, agentsTable, type InsertAgentRow } from '../database/schema'
@@ -100,13 +100,7 @@ export class AgentService extends BaseService {
 
     const totalResult = await this.database.select({ count: count() }).from(agentsTable)
 
-    const sortBy = options.sortBy || 'created_at'
-    const orderBy = options.orderBy || 'desc'
-
-    const sortField = agentsTable[sortBy]
-    const orderFn = orderBy === 'asc' ? asc : desc
-
-    const baseQuery = this.database.select().from(agentsTable).orderBy(orderFn(sortField))
+    const baseQuery = this.database.select().from(agentsTable).orderBy(agentsTable.created_at)
 
     const result =
       options.limit !== undefined

src/main/services/mcp/oauth/types.ts

@@ -4,7 +4,7 @@ import {
   OAuthTokens
 } from '@modelcontextprotocol/sdk/shared/auth.js'
 import EventEmitter from 'events'
-import * as z from 'zod'
+import { z } from 'zod'
 
 export interface OAuthStorageData {
   clientInfo?: OAuthClientInformation

src/main/services/ocr/OcrService.ts

@@ -2,7 +2,6 @@ import { loggerService } from '@logger'
 import { isLinux } from '@main/constant'
 import { BuiltinOcrProviderIds, OcrHandler, OcrProvider, OcrResult, SupportedOcrFile } from '@types'
 
-import { ovOcrService } from './builtin/OvOcrService'
 import { ppocrService } from './builtin/PpocrService'
 import { systemOcrService } from './builtin/SystemOcrService'
 import { tesseractService } from './builtin/TesseractService'
@@ -23,10 +22,6 @@ export class OcrService {
     this.registry.delete(providerId)
   }
 
-  public listProviderIds(): string[] {
-    return Array.from(this.registry.keys())
-  }
-
   public async ocr(file: SupportedOcrFile, provider: OcrProvider): Promise<OcrResult> {
     const handler = this.registry.get(provider.id)
     if (!handler) {
@@ -44,5 +39,3 @@ ocrService.register(BuiltinOcrProviderIds.tesseract, tesseractService.ocr.bind(t
 !isLinux && ocrService.register(BuiltinOcrProviderIds.system, systemOcrService.ocr.bind(systemOcrService))
 
 ocrService.register(BuiltinOcrProviderIds.paddleocr, ppocrService.ocr.bind(ppocrService))
-
-ovOcrService.isAvailable() && ocrService.register(BuiltinOcrProviderIds.ovocr, ovOcrService.ocr.bind(ovOcrService))

src/main/services/ocr/builtin/OvOcrService.ts

@@ -1,128 +0,0 @@
-import { loggerService } from '@logger'
-import { isWin } from '@main/constant'
-import { isImageFileMetadata, OcrOvConfig, OcrResult, SupportedOcrFile } from '@types'
-import { exec } from 'child_process'
-import * as fs from 'fs'
-import * as os from 'os'
-import * as path from 'path'
-import { promisify } from 'util'
-
-import { OcrBaseService } from './OcrBaseService'
-
-const logger = loggerService.withContext('OvOcrService')
-const execAsync = promisify(exec)
-
-const PATH_BAT_FILE = path.join(os.homedir(), '.cherrystudio', 'ovms', 'ovocr', 'run.npu.bat')
-
-export class OvOcrService extends OcrBaseService {
-  constructor() {
-    super()
-  }
-
-  public isAvailable(): boolean {
-    return (
-      isWin &&
-      os.cpus()[0].model.toLowerCase().includes('intel') &&
-      os.cpus()[0].model.toLowerCase().includes('ultra') &&
-      fs.existsSync(PATH_BAT_FILE)
-    )
-  }
-
-  private getOvOcrPath(): string {
-    return path.join(os.homedir(), '.cherrystudio', 'ovms', 'ovocr')
-  }
-
-  private getImgDir(): string {
-    return path.join(this.getOvOcrPath(), 'img')
-  }
-
-  private getOutputDir(): string {
-    return path.join(this.getOvOcrPath(), 'output')
-  }
-
-  private async clearDirectory(dirPath: string): Promise<void> {
-    if (fs.existsSync(dirPath)) {
-      const files = await fs.promises.readdir(dirPath)
-      for (const file of files) {
-        const filePath = path.join(dirPath, file)
-        const stats = await fs.promises.stat(filePath)
-        if (stats.isDirectory()) {
-          await this.clearDirectory(filePath)
-          await fs.promises.rmdir(filePath)
-        } else {
-          await fs.promises.unlink(filePath)
-        }
-      }
-    } else {
-      // If the directory does not exist, create it
-      await fs.promises.mkdir(dirPath, { recursive: true })
-    }
-  }
-
-  private async copyFileToImgDir(sourceFilePath: string, targetFileName: string): Promise<void> {
-    const imgDir = this.getImgDir()
-    const targetFilePath = path.join(imgDir, targetFileName)
-    await fs.promises.copyFile(sourceFilePath, targetFilePath)
-  }
-
-  private async runOcrBatch(): Promise<void> {
-    const ovOcrPath = this.getOvOcrPath()
-
-    try {
-      // Execute run.bat in the ov-ocr directory
-      await execAsync(`"${PATH_BAT_FILE}"`, {
-        cwd: ovOcrPath,
-        timeout: 60000 // 60 second timeout
-      })
-    } catch (error) {
-      logger.error(`Error running ovocr batch: ${error}`)
-      throw new Error(`Failed to run OCR batch: ${error}`)
-    }
-  }
-
-  private async ocrImage(filePath: string, options?: OcrOvConfig): Promise<OcrResult> {
-    logger.info(`OV OCR called on ${filePath} with options ${JSON.stringify(options)}`)
-
-    try {
-      // 1. Clear img directory and output directory
-      await this.clearDirectory(this.getImgDir())
-      await this.clearDirectory(this.getOutputDir())
-
-      // 2. Copy file to img directory
-      const fileName = path.basename(filePath)
-      await this.copyFileToImgDir(filePath, fileName)
-      logger.info(`File copied to img directory: ${fileName}`)
-
-      // 3. Run run.bat
-      logger.info('Running OV OCR batch process...')
-      await this.runOcrBatch()
-
-      // 4. Check that output/[basename].txt file exists
-      const baseNameWithoutExt = path.basename(fileName, path.extname(fileName))
-      const outputFilePath = path.join(this.getOutputDir(), `${baseNameWithoutExt}.txt`)
-      if (!fs.existsSync(outputFilePath)) {
-        throw new Error(`OV OCR output file not found at: ${outputFilePath}`)
-      }
-
-      // 5. Read output/[basename].txt file content
-      const ocrText = await fs.promises.readFile(outputFilePath, 'utf-8')
-      logger.info(`OV OCR text extracted: ${ocrText.substring(0, 100)}...`)
-
-      // 6. Return result
-      return { text: ocrText }
-    } catch (error) {
-      logger.error(`Error during OV OCR process: ${error}`)
-      throw error
-    }
-  }
-
-  public ocr = async (file: SupportedOcrFile, options?: OcrOvConfig): Promise<OcrResult> => {
-    if (isImageFileMetadata(file)) {
-      return this.ocrImage(file.path, options)
-    } else {
-      throw new Error('Unsupported file type, currently only image files are supported')
-    }
-  }
-}
-
-export const ovOcrService = new OvOcrService()

src/main/services/ocr/builtin/PpocrService.ts

@@ -1,7 +1,7 @@
 import { loadOcrImage } from '@main/utils/ocr'
 import { ImageFileMetadata, isImageFileMetadata, OcrPpocrConfig, OcrResult, SupportedOcrFile } from '@types'
 import { net } from 'electron'
-import * as z from 'zod'
+import { z } from 'zod'
 
 import { OcrBaseService } from './OcrBaseService'
 

src/main/services/remotefile/OpenAIService.ts

@@ -1,8 +1,8 @@
-import OpenAI from '@cherrystudio/openai'
 import { loggerService } from '@logger'
 import { fileStorage } from '@main/services/FileStorage'
 import { FileListResponse, FileMetadata, FileUploadResponse, Provider } from '@types'
 import * as fs from 'fs'
+import OpenAI from 'openai'
 
 import { CacheService } from '../CacheService'
 import { BaseFileService } from './BaseFileService'

src/main/utils/locales.ts

@@ -2,7 +2,6 @@ import EnUs from '../../renderer/src/i18n/locales/en-us.json'
 import ZhCn from '../../renderer/src/i18n/locales/zh-cn.json'
 import ZhTw from '../../renderer/src/i18n/locales/zh-tw.json'
 // Machine translation
-import deDE from '../../renderer/src/i18n/translate/de-de.json'
 import elGR from '../../renderer/src/i18n/translate/el-gr.json'
 import esES from '../../renderer/src/i18n/translate/es-es.json'
 import frFR from '../../renderer/src/i18n/translate/fr-fr.json'
@@ -17,7 +16,6 @@ const locales = Object.fromEntries(
     ['zh-TW', ZhTw],
     ['ja-JP', JaJP],
     ['ru-RU', RuRu],
-    ['de-DE', deDE],
     ['el-GR', elGR],
     ['es-ES', esES],
     ['fr-FR', frFR],

src/preload/index.ts

@@ -3,7 +3,7 @@ import { SpanEntity, TokenUsage } from '@mcp-trace/trace-core'
 import { SpanContext } from '@opentelemetry/api'
 import { TerminalConfig, UpgradeChannel } from '@shared/config/constant'
 import type { LogLevel, LogSourceWithContext } from '@shared/config/logger'
-import type { FileChangeEvent, WebviewKeyEvent } from '@shared/config/types'
+import type { FileChangeEvent } from '@shared/config/types'
 import { IpcChannel } from '@shared/IpcChannel'
 import type { Notification } from '@types'
 import {
@@ -12,7 +12,6 @@ import {
   FileListResponse,
   FileMetadata,
   FileUploadResponse,
-  GetApiServerStatusResult,
   KnowledgeBaseParams,
   KnowledgeItem,
   KnowledgeSearchResult,
@@ -23,11 +22,8 @@ import {
   OcrProvider,
   OcrResult,
   Provider,
-  RestartApiServerStatusResult,
   S3Config,
   Shortcut,
-  StartApiServerStatusResult,
-  StopApiServerStatusResult,
   SupportedOcrFile,
   ThemeMode,
   WebDavConfig
@@ -55,7 +51,7 @@ const api = {
   setProxy: (proxy: string | undefined, bypassRules?: string) =>
     ipcRenderer.invoke(IpcChannel.App_Proxy, proxy, bypassRules),
   checkForUpdate: () => ipcRenderer.invoke(IpcChannel.App_CheckForUpdate),
-  quitAndInstall: () => ipcRenderer.invoke(IpcChannel.App_QuitAndInstall),
+  showUpdateDialog: () => ipcRenderer.invoke(IpcChannel.App_ShowUpdateDialog),
   setLanguage: (lang: string) => ipcRenderer.invoke(IpcChannel.App_SetLanguage, lang),
   setEnableSpellCheck: (isEnable: boolean) => ipcRenderer.invoke(IpcChannel.App_SetEnableSpellCheck, isEnable),
   setSpellCheckLanguages: (languages: string[]) => ipcRenderer.invoke(IpcChannel.App_SetSpellCheckLanguages, languages),
@@ -227,7 +223,7 @@ const api = {
     create: (base: KnowledgeBaseParams, context?: SpanContext) =>
       tracedInvoke(IpcChannel.KnowledgeBase_Create, context, base),
     reset: (base: KnowledgeBaseParams) => ipcRenderer.invoke(IpcChannel.KnowledgeBase_Reset, base),
-    delete: (id: string) => ipcRenderer.invoke(IpcChannel.KnowledgeBase_Delete, id),
+    delete: (base: KnowledgeBaseParams, id: string) => ipcRenderer.invoke(IpcChannel.KnowledgeBase_Delete, base, id),
     add: ({
       base,
       item,
@@ -394,16 +390,7 @@ const api = {
     setOpenLinkExternal: (webviewId: number, isExternal: boolean) =>
       ipcRenderer.invoke(IpcChannel.Webview_SetOpenLinkExternal, webviewId, isExternal),
     setSpellCheckEnabled: (webviewId: number, isEnable: boolean) =>
-      ipcRenderer.invoke(IpcChannel.Webview_SetSpellCheckEnabled, webviewId, isEnable),
-    onFindShortcut: (callback: (payload: WebviewKeyEvent) => void) => {
-      const listener = (_event: Electron.IpcRendererEvent, payload: WebviewKeyEvent) => {
-        callback(payload)
-      }
-      ipcRenderer.on(IpcChannel.Webview_SearchHotkey, listener)
-      return () => {
-        ipcRenderer.off(IpcChannel.Webview_SearchHotkey, listener)
-      }
-    }
+      ipcRenderer.invoke(IpcChannel.Webview_SetSpellCheckEnabled, webviewId, isEnable)
   },
   storeSync: {
     subscribe: () => ipcRenderer.invoke(IpcChannel.StoreSync_Subscribe),
@@ -480,8 +467,7 @@ const api = {
   },
   ocr: {
     ocr: (file: SupportedOcrFile, provider: OcrProvider): Promise<OcrResult> =>
-      ipcRenderer.invoke(IpcChannel.OCR_ocr, file, provider),
-    listProviders: (): Promise<string[]> => ipcRenderer.invoke(IpcChannel.OCR_ListProviders)
+      ipcRenderer.invoke(IpcChannel.OCR_ocr, file, provider)
   },
   cherryai: {
     generateSignature: (params: { method: string; path: string; query: string; body: Record<string, any> }) =>
@@ -501,12 +487,6 @@ const api = {
         ipcRenderer.removeListener(channel, listener)
       }
     }
-  },
-  apiServer: {
-    getStatus: (): Promise<GetApiServerStatusResult> => ipcRenderer.invoke(IpcChannel.ApiServer_GetStatus),
-    start: (): Promise<StartApiServerStatusResult> => ipcRenderer.invoke(IpcChannel.ApiServer_Start),
-    restart: (): Promise<RestartApiServerStatusResult> => ipcRenderer.invoke(IpcChannel.ApiServer_Restart),
-    stop: (): Promise<StopApiServerStatusResult> => ipcRenderer.invoke(IpcChannel.ApiServer_Stop)
   }
 }
 

src/renderer/src/aiCore/chunk/AiSdkToChunkAdapter.ts

@@ -6,11 +6,9 @@
 import { loggerService } from '@logger'
 import { AISDKWebSearchResult, MCPTool, WebSearchResults, WebSearchSource } from '@renderer/types'
 import { Chunk, ChunkType } from '@renderer/types/chunk'
-import { ProviderSpecificError } from '@renderer/types/provider-specific-error'
-import { formatErrorMessage } from '@renderer/utils/error'
 import { convertLinks, flushLinkConverterBuffer } from '@renderer/utils/linkConverter'
 import type { ClaudeCodeRawValue } from '@shared/agents/claudecode/types'
-import { AISDKError, type TextStreamPart, type ToolSet } from 'ai'
+import type { TextStreamPart, ToolSet } from 'ai'
 
 import { ToolCallChunkHandler } from './handleToolCallChunk'
 
@@ -357,14 +355,7 @@ export class AiSdkToChunkAdapter {
       case 'error':
         this.onChunk({
           type: ChunkType.ERROR,
-          error:
-            chunk.error instanceof AISDKError
-              ? chunk.error
-              : new ProviderSpecificError({
-                  message: formatErrorMessage(chunk.error),
-                  provider: 'unknown',
-                  cause: chunk.error
-                })
+          error: chunk.error as Record<string, any>
         })
         break
 

src/renderer/src/aiCore/index_new.ts

@@ -83,8 +83,10 @@ export default class ModernAiProvider {
       throw new Error('Model is required for completions. Please use constructor with model parameter.')
     }
 
-    // 每次请求时重新生成配置以确保API key轮换生效
-    this.config = providerToAiSdkConfig(this.actualProvider, this.model)
+    // 确保配置存在
+    if (!this.config) {
+      this.config = providerToAiSdkConfig(this.actualProvider, this.model)
+    }
 
     // 准备特殊配置
     await prepareSpecialProviderConfig(this.actualProvider, this.config)

src/renderer/src/aiCore/legacy/clients/BaseApiClient.ts

@@ -70,19 +70,13 @@ export abstract class BaseApiClient<
 {
   public provider: Provider
   protected host: string
+  protected apiKey: string
   protected sdkInstance?: TSdkInstance
 
   constructor(provider: Provider) {
     this.provider = provider
     this.host = this.getBaseURL()
-  }
-
-  /**
-   * Get the current API key with rotation support
-   * This getter ensures API keys rotate on each access when multiple keys are configured
-   */
-  protected get apiKey(): string {
-    return this.getApiKey()
+    this.apiKey = this.getApiKey()
   }
 
   /**

src/renderer/src/aiCore/legacy/clients/cherryai/CherryAiAPIClient.ts

@@ -1,6 +1,6 @@
-import OpenAI from '@cherrystudio/openai'
 import { Provider } from '@renderer/types'
 import { OpenAISdkParams, OpenAISdkRawOutput } from '@renderer/types/sdk'
+import OpenAI from 'openai'
 
 import { OpenAIAPIClient } from '../openai/OpenAIApiClient'
 

src/renderer/src/aiCore/legacy/clients/openai/OpenAIApiClient.ts

@@ -1,9 +1,3 @@
-import OpenAI, { AzureOpenAI } from '@cherrystudio/openai'
-import {
-  ChatCompletionContentPart,
-  ChatCompletionContentPartRefusal,
-  ChatCompletionTool
-} from '@cherrystudio/openai/resources'
 import { loggerService } from '@logger'
 import { DEFAULT_MAX_TOKENS } from '@renderer/config/constant'
 import {
@@ -18,7 +12,6 @@ import {
   isGPT5SeriesModel,
   isGrokReasoningModel,
   isNotSupportSystemMessageModel,
-  isOpenAIDeepResearchModel,
   isOpenAIOpenWeightModel,
   isOpenAIReasoningModel,
   isQwenAlwaysThinkModel,
@@ -85,6 +78,8 @@ import {
 } from '@renderer/utils/mcp-tools'
 import { findFileBlocks, findImageBlocks } from '@renderer/utils/messageUtils/find'
 import { t } from 'i18next'
+import OpenAI, { AzureOpenAI } from 'openai'
+import { ChatCompletionContentPart, ChatCompletionContentPartRefusal, ChatCompletionTool } from 'openai/resources'
 
 import { GenericChunk } from '../../middleware/schemas'
 import { RequestTransformer, ResponseChunkTransformer, ResponseChunkTransformerContext } from '../types'
@@ -130,12 +125,6 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
       return {}
     }
 
-    if (isOpenAIDeepResearchModel(model)) {
-      return {
-        reasoning_effort: 'medium'
-      }
-    }
-
     const reasoningEffort = assistant?.settings?.reasoning_effort
 
     if (isSupportedThinkingTokenZhipuModel(model)) {

src/renderer/src/aiCore/legacy/clients/openai/OpenAIBaseClient.ts

@@ -1,6 +1,4 @@
-import OpenAI, { AzureOpenAI } from '@cherrystudio/openai'
 import { loggerService } from '@logger'
-import { COPILOT_DEFAULT_HEADERS } from '@renderer/aiCore/provider/constants'
 import {
   isClaudeReasoningModel,
   isOpenAIReasoningModel,
@@ -26,6 +24,7 @@ import {
   ReasoningEffortOptionalParams
 } from '@renderer/types/sdk'
 import { formatApiHost } from '@renderer/utils/api'
+import OpenAI, { AzureOpenAI } from 'openai'
 
 import { BaseApiClient } from '../BaseApiClient'
 
@@ -168,7 +167,8 @@ export abstract class OpenAIBaseClient<
         defaultHeaders: {
           ...this.defaultHeaders(),
           ...this.provider.extra_headers,
-          ...(this.provider.id === 'copilot' ? COPILOT_DEFAULT_HEADERS : {})
+          ...(this.provider.id === 'copilot' ? { 'editor-version': 'vscode/1.97.2' } : {}),
+          ...(this.provider.id === 'copilot' ? { 'copilot-vision-request': 'true' } : {})
         }
       }) as TSdkInstance
     }

src/renderer/src/aiCore/legacy/clients/openai/OpenAIResponseAPIClient.ts

@@ -1,5 +1,3 @@
-import OpenAI, { AzureOpenAI } from '@cherrystudio/openai'
-import { ResponseInput } from '@cherrystudio/openai/resources/responses/responses'
 import { loggerService } from '@logger'
 import { GenericChunk } from '@renderer/aiCore/legacy/middleware/schemas'
 import { CompletionsContext } from '@renderer/aiCore/legacy/middleware/types'
@@ -47,6 +45,8 @@ import { findFileBlocks, findImageBlocks } from '@renderer/utils/messageUtils/fi
 import { MB } from '@shared/config/constant'
 import { t } from 'i18next'
 import { isEmpty } from 'lodash'
+import OpenAI, { AzureOpenAI } from 'openai'
+import { ResponseInput } from 'openai/resources/responses/responses'
 
 import { RequestTransformer, ResponseChunkTransformer } from '../types'
 import { OpenAIAPIClient } from './OpenAIApiClient'
@@ -343,27 +343,7 @@ export class OpenAIResponseAPIClient extends OpenAIBaseClient<
     }
     switch (message.type) {
       case 'function_call_output':
-        {
-          let str = ''
-          if (typeof message.output === 'string') {
-            str = message.output
-          } else {
-            for (const part of message.output) {
-              switch (part.type) {
-                case 'input_text':
-                  str += part.text
-                  break
-                case 'input_image':
-                  str += part.image_url || ''
-                  break
-                case 'input_file':
-                  str += part.file_data || ''
-                  break
-              }
-            }
-          }
-          sum += estimateTextTokens(str)
-        }
+        sum += estimateTextTokens(message.output)
         break
       case 'function_call':
         sum += estimateTextTokens(message.arguments)

src/renderer/src/aiCore/legacy/clients/ovms/OVMSClient.ts

@@ -1,7 +1,7 @@
-import OpenAI from '@cherrystudio/openai'
 import { loggerService } from '@logger'
 import { isSupportedModel } from '@renderer/config/models'
 import { objectKeys, Provider } from '@renderer/types'
+import OpenAI from 'openai'
 
 import { OpenAIAPIClient } from '../openai/OpenAIApiClient'
 

src/renderer/src/aiCore/legacy/clients/ppio/PPIOAPIClient.ts

@@ -1,7 +1,7 @@
-import OpenAI from '@cherrystudio/openai'
 import { loggerService } from '@logger'
 import { isSupportedModel } from '@renderer/config/models'
 import { Model, Provider } from '@renderer/types'
+import OpenAI from 'openai'
 
 import { OpenAIAPIClient } from '../openai/OpenAIApiClient'
 

src/renderer/src/aiCore/legacy/clients/types.ts

@@ -1,5 +1,4 @@
 import Anthropic from '@anthropic-ai/sdk'
-import OpenAI from '@cherrystudio/openai'
 import { Assistant, MCPTool, MCPToolResponse, Model, ToolCallResponse } from '@renderer/types'
 import { Provider } from '@renderer/types'
 import {
@@ -14,6 +13,7 @@ import {
   SdkTool,
   SdkToolCall
 } from '@renderer/types/sdk'
+import OpenAI from 'openai'
 
 import { CompletionsParams, GenericChunk } from '../middleware/schemas'
 import { CompletionsContext } from '../middleware/types'

src/renderer/src/aiCore/legacy/clients/zhipu/ZhipuAPIClient.ts

@@ -1,7 +1,7 @@
-import OpenAI from '@cherrystudio/openai'
 import { loggerService } from '@logger'
 import { Provider } from '@renderer/types'
 import { GenerateImageParams } from '@renderer/types'
+import OpenAI from 'openai'
 
 import { OpenAIAPIClient } from '../openai/OpenAIApiClient'
 

src/renderer/src/aiCore/legacy/middleware/feat/ImageGenerationMiddleware.ts

@@ -1,10 +1,10 @@
-import OpenAI from '@cherrystudio/openai'
-import { toFile } from '@cherrystudio/openai/uploads'
 import { isDedicatedImageGenerationModel } from '@renderer/config/models'
 import FileManager from '@renderer/services/FileManager'
 import { ChunkType } from '@renderer/types/chunk'
 import { findImageBlocks, getMainTextContent } from '@renderer/utils/messageUtils/find'
 import { defaultTimeout } from '@shared/config/constant'
+import OpenAI from 'openai'
+import { toFile } from 'openai/uploads'
 
 import { BaseApiClient } from '../../clients/BaseApiClient'
 import { CompletionsParams, CompletionsResult, GenericChunk } from '../schemas'

src/renderer/src/aiCore/middleware/AiSdkMiddlewareBuilder.ts

@@ -4,9 +4,6 @@ import type { MCPTool, Message, Model, Provider } from '@renderer/types'
 import type { Chunk } from '@renderer/types/chunk'
 import { extractReasoningMiddleware, LanguageModelMiddleware, simulateStreamingMiddleware } from 'ai'
 
-import { noThinkMiddleware } from './noThinkMiddleware'
-import { toolChoiceMiddleware } from './toolChoiceMiddleware'
-
 const logger = loggerService.withContext('AiSdkMiddlewareBuilder')
 
 /**
@@ -32,8 +29,6 @@ export interface AiSdkMiddlewareConfig {
   uiMessages?: Message[]
   // 内置搜索配置
   webSearchPluginConfig?: WebSearchPluginConfig
-  // 知识库识别开关，默认开启
-  knowledgeRecognition?: 'off' | 'on'
 }
 
 /**
@@ -124,15 +119,6 @@ export class AiSdkMiddlewareBuilder {
 export function buildAiSdkMiddlewares(config: AiSdkMiddlewareConfig): LanguageModelMiddleware[] {
   const builder = new AiSdkMiddlewareBuilder()
 
-  // 0. 知识库强制调用中间件（必须在最前面，确保第一轮强制调用知识库）
-  if (config.knowledgeRecognition === 'off') {
-    builder.add({
-      name: 'force-knowledge-first',
-      middleware: toolChoiceMiddleware('builtin_knowledge_search')
-    })
-    logger.debug('Added toolChoice middleware to force knowledge base search on first round')
-  }
-
   // 1. 根据provider添加特定中间件
   if (config.provider) {
     addProviderSpecificMiddlewares(builder, config)
@@ -200,14 +186,6 @@ function addProviderSpecificMiddlewares(builder: AiSdkMiddlewareBuilder, config:
       // 其他provider的通用处理
       break
   }
-
-  // OVMS+MCP's specific middleware
-  if (config.provider.id === 'ovms' && config.mcpTools && config.mcpTools.length > 0) {
-    builder.add({
-      name: 'no-think',
-      middleware: noThinkMiddleware()
-    })
-  }
 }
 
 /**

src/renderer/src/aiCore/middleware/noThinkMiddleware.ts

@@ -1,52 +0,0 @@
-import { loggerService } from '@logger'
-import { LanguageModelMiddleware } from 'ai'
-
-const logger = loggerService.withContext('noThinkMiddleware')
-
-/**
- * No Think Middleware
- * Automatically appends ' /no_think' string to the end of user messages for the provider
- * This prevents the model from generating unnecessary thinking process and returns results directly
- * @returns LanguageModelMiddleware
- */
-export function noThinkMiddleware(): LanguageModelMiddleware {
-  return {
-    middlewareVersion: 'v2',
-
-    transformParams: async ({ params }) => {
-      const transformedParams = { ...params }
-      // Process messages in prompt
-      if (transformedParams.prompt && Array.isArray(transformedParams.prompt)) {
-        transformedParams.prompt = transformedParams.prompt.map((message) => {
-          // Only process user messages
-          if (message.role === 'user') {
-            // Process content array
-            if (Array.isArray(message.content)) {
-              const lastContent = message.content[message.content.length - 1]
-              // If the last content is text type, append ' /no_think'
-              if (lastContent && lastContent.type === 'text' && typeof lastContent.text === 'string') {
-                // Avoid duplicate additions
-                if (!lastContent.text.endsWith('/no_think')) {
-                  logger.debug('Adding /no_think to user message')
-                  return {
-                    ...message,
-                    content: [
-                      ...message.content.slice(0, -1),
-                      {
-                        ...lastContent,
-                        text: lastContent.text + ' /no_think'
-                      }
-                    ]
-                  }
-                }
-              }
-            }
-          }
-          return message
-        })
-      }
-
-      return transformedParams
-    }
-  }
-}

src/renderer/src/aiCore/middleware/toolChoiceMiddleware.ts

@@ -1,45 +0,0 @@
-import { loggerService } from '@logger'
-import { LanguageModelMiddleware } from 'ai'
-
-const logger = loggerService.withContext('toolChoiceMiddleware')
-
-/**
- * Tool Choice Middleware
- * Controls tool selection strategy across multiple rounds of tool calls:
- * - First round: Forces the model to call a specific tool (e.g., knowledge base search)
- * - Subsequent rounds: Allows the model to automatically choose any available tool
- *
- * This ensures knowledge base is consulted first while still enabling MCP tools
- * and other capabilities in follow-up interactions.
- *
- * @param forceFirstToolName - The tool name to force on the first round
- * @returns LanguageModelMiddleware
- */
-export function toolChoiceMiddleware(forceFirstToolName: string): LanguageModelMiddleware {
-  let toolCallRound = 0
-
-  return {
-    middlewareVersion: 'v2',
-
-    transformParams: async ({ params }) => {
-      toolCallRound++
-
-      const transformedParams = { ...params }
-
-      if (toolCallRound === 1) {
-        // First round: force the specified tool
-        logger.debug(`Round ${toolCallRound}: Forcing tool choice to '${forceFirstToolName}'`)
-        transformedParams.toolChoice = {
-          type: 'tool',
-          toolName: forceFirstToolName
-        }
-      } else {
-        // Subsequent rounds: allow automatic tool selection
-        logger.debug(`Round ${toolCallRound}: Using automatic tool choice`)
-        transformedParams.toolChoice = { type: 'auto' }
-      }
-
-      return transformedParams
-    }
-  }
-}

src/renderer/src/aiCore/plugins/searchOrchestrationPlugin.ts

@@ -24,8 +24,10 @@ import { generateText } from 'ai'
 import { isEmpty } from 'lodash'
 
 import { MemoryProcessor } from '../../services/MemoryProcessor'
+import { exaSearchTool } from '../tools/ExaSearchTool'
 import { knowledgeSearchTool } from '../tools/KnowledgeSearchTool'
 import { memorySearchTool } from '../tools/MemorySearchTool'
+import { tavilySearchTool } from '../tools/TavilySearchTool'
 import { webSearchToolWithPreExtractedKeywords } from '../tools/WebSearchTool'
 
 const logger = loggerService.withContext('SearchOrchestrationPlugin')
@@ -316,13 +318,28 @@ export const searchOrchestrationPlugin = (assistant: Assistant, topicId: string)
           const needsSearch = analysisResult.websearch.question && analysisResult.websearch.question[0] !== 'not_needed'
 
           if (needsSearch) {
-            // onChunk({ type: ChunkType.EXTERNEL_TOOL_IN_PROGRESS })
-            // logger.info('🌐 Adding web search tool with pre-extracted keywords')
-            params.tools['builtin_web_search'] = webSearchToolWithPreExtractedKeywords(
-              assistant.webSearchProviderId,
-              analysisResult.websearch,
-              context.requestId
-            )
+            // 根据 Provider ID 动态选择工具
+            switch (assistant.webSearchProviderId) {
+              case 'exa':
+                logger.info('🌐 Adding Exa search tool (provider-specific)')
+                // Exa 工具直接接受单个查询字符串，使用第一个问题或合并所有问题
+                params.tools['builtin_exa_search'] = exaSearchTool(context.requestId)
+                break
+              case 'tavily':
+                logger.info('🌐 Adding Tavily search tool (provider-specific)')
+                // Tavily 工具直接接受单个查询字符串
+                params.tools['builtin_tavily_search'] = tavilySearchTool(context.requestId)
+                break
+              default:
+                logger.info('🌐 Adding web search tool with pre-extracted keywords')
+                // 其他 Provider 使用通用的 WebSearchTool
+                params.tools['builtin_web_search'] = webSearchToolWithPreExtractedKeywords(
+                  assistant.webSearchProviderId,
+                  analysisResult.websearch,
+                  context.requestId
+                )
+                break
+            }
           }
         }
 

src/renderer/src/aiCore/prepareParams/fileProcessor.ts

@@ -3,7 +3,6 @@
  * 处理文件内容提取、文件格式转换、文件上传等逻辑
  */
 
-import type OpenAI from '@cherrystudio/openai'
 import { loggerService } from '@logger'
 import { getProviderByModel } from '@renderer/services/AssistantService'
 import type { FileMetadata, Message, Model } from '@renderer/types'
@@ -11,6 +10,7 @@ import { FileTypes } from '@renderer/types'
 import { FileMessageBlock } from '@renderer/types/newMessage'
 import { findFileBlocks } from '@renderer/utils/messageUtils/find'
 import type { FilePart, TextPart } from 'ai'
+import type OpenAI from 'openai'
 
 import { getAiSdkProviderId } from '../provider/factory'
 import { getFileSizeLimit, supportsImageInput, supportsLargeFileUpload, supportsPdfInput } from './modelCapabilities'

src/renderer/src/aiCore/prepareParams/parameterBuilder.ts

@@ -23,7 +23,6 @@ import { CherryWebSearchConfig } from '@renderer/store/websearch'
 import { type Assistant, type MCPTool, type Provider } from '@renderer/types'
 import type { StreamTextParams } from '@renderer/types/aiCoreTypes'
 import { mapRegexToPatterns } from '@renderer/utils/blacklistMatchPattern'
-import { replacePromptVariables } from '@renderer/utils/prompt'
 import type { ModelMessage, Tool } from 'ai'
 import { stepCountIs } from 'ai'
 
@@ -127,7 +126,7 @@ export async function buildStreamTextParams(
   let webSearchPluginConfig: WebSearchPluginConfig | undefined = undefined
   if (enableWebSearch) {
     if (isBaseProvider(aiSdkProviderId)) {
-      webSearchPluginConfig = buildProviderBuiltinWebSearchConfig(aiSdkProviderId, webSearchConfig, model)
+      webSearchPluginConfig = buildProviderBuiltinWebSearchConfig(aiSdkProviderId, webSearchConfig)
     }
     if (!tools) {
       tools = {}
@@ -160,14 +159,14 @@ export async function buildStreamTextParams(
     abortSignal: options.requestOptions?.signal,
     headers: options.requestOptions?.headers,
     providerOptions,
-    stopWhen: stepCountIs(20),
+    stopWhen: stepCountIs(10),
     maxRetries: 0
   }
   if (tools) {
     params.tools = tools
   }
   if (assistant.prompt) {
-    params.system = await replacePromptVariables(assistant.prompt, model.name)
+    params.system = assistant.prompt
   }
   logger.debug('params', params)
   return {

src/renderer/src/aiCore/provider/__tests__/providerConfig.test.ts

@@ -1,89 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-vi.mock('@renderer/services/LoggerService', () => ({
-  loggerService: {
-    withContext: () => ({
-      debug: vi.fn(),
-      info: vi.fn(),
-      warn: vi.fn(),
-      error: vi.fn()
-    })
-  }
-}))
-
-vi.mock('@renderer/services/AssistantService', () => ({
-  getProviderByModel: vi.fn()
-}))
-
-vi.mock('@renderer/store', () => ({
-  default: {
-    getState: () => ({ copilot: { defaultHeaders: {} } })
-  }
-}))
-
-import type { Model, Provider } from '@renderer/types'
-
-import { COPILOT_DEFAULT_HEADERS, COPILOT_EDITOR_VERSION, isCopilotResponsesModel } from '../constants'
-import { providerToAiSdkConfig } from '../providerConfig'
-
-const createWindowKeyv = () => {
-  const store = new Map<string, string>()
-  return {
-    get: (key: string) => store.get(key),
-    set: (key: string, value: string) => {
-      store.set(key, value)
-    }
-  }
-}
-
-const createCopilotProvider = (): Provider => ({
-  id: 'copilot',
-  type: 'openai',
-  name: 'GitHub Copilot',
-  apiKey: 'test-key',
-  apiHost: 'https://api.githubcopilot.com',
-  models: [],
-  isSystem: true
-})
-
-const createModel = (id: string, name = id): Model => ({
-  id,
-  name,
-  provider: 'copilot',
-  group: 'copilot'
-})
-
-describe('Copilot responses routing', () => {
-  beforeEach(() => {
-    ;(globalThis as any).window = {
-      ...(globalThis as any).window,
-      keyv: createWindowKeyv()
-    }
-  })
-
-  it('detects official GPT-5 Codex identifiers case-insensitively', () => {
-    expect(isCopilotResponsesModel(createModel('gpt-5-codex', 'gpt-5-codex'))).toBe(true)
-    expect(isCopilotResponsesModel(createModel('GPT-5-CODEX', 'GPT-5-CODEX'))).toBe(true)
-    expect(isCopilotResponsesModel(createModel('gpt-5-codex', 'custom-name'))).toBe(true)
-    expect(isCopilotResponsesModel(createModel('custom-id', 'custom-name'))).toBe(false)
-  })
-
-  it('configures gpt-5-codex with the Copilot provider', () => {
-    const provider = createCopilotProvider()
-    const config = providerToAiSdkConfig(provider, createModel('gpt-5-codex', 'GPT-5-CODEX'))
-
-    expect(config.providerId).toBe('github-copilot-openai-compatible')
-    expect(config.options.headers?.['Editor-Version']).toBe(COPILOT_EDITOR_VERSION)
-    expect(config.options.headers?.['Copilot-Integration-Id']).toBe(COPILOT_DEFAULT_HEADERS['Copilot-Integration-Id'])
-    expect(config.options.headers?.['copilot-vision-request']).toBe('true')
-  })
-
-  it('uses the Copilot provider for other models and keeps headers', () => {
-    const provider = createCopilotProvider()
-    const config = providerToAiSdkConfig(provider, createModel('gpt-4'))
-
-    expect(config.providerId).toBe('github-copilot-openai-compatible')
-    expect(config.options.headers?.['Editor-Version']).toBe(COPILOT_DEFAULT_HEADERS['Editor-Version'])
-    expect(config.options.headers?.['Copilot-Integration-Id']).toBe(COPILOT_DEFAULT_HEADERS['Copilot-Integration-Id'])
-  })
-})

src/renderer/src/aiCore/provider/config/aihubmix.ts

@@ -1,7 +1,7 @@
 /**
  * AiHubMix规则集
  */
-import { isOpenAILLMModel } from '@renderer/config/models'
+import { isOpenAIModel } from '@renderer/config/models'
 import { Provider } from '@renderer/types'
 
 import { provider2Provider, startsWith } from './helper'
@@ -42,7 +42,7 @@ const AIHUBMIX_RULES: RuleSet = {
       }
     },
     {
-      match: isOpenAILLMModel,
+      match: isOpenAIModel,
       provider: (provider: Provider) => {
         return extraProviderConfig({
           ...provider,

src/renderer/src/aiCore/provider/constants.ts

@@ -1,25 +0,0 @@
-import type { Model } from '@renderer/types'
-
-export const COPILOT_EDITOR_VERSION = 'vscode/1.104.1'
-export const COPILOT_PLUGIN_VERSION = 'copilot-chat/0.26.7'
-export const COPILOT_INTEGRATION_ID = 'vscode-chat'
-export const COPILOT_USER_AGENT = 'GitHubCopilotChat/0.26.7'
-
-export const COPILOT_DEFAULT_HEADERS = {
-  'Copilot-Integration-Id': COPILOT_INTEGRATION_ID,
-  'User-Agent': COPILOT_USER_AGENT,
-  'Editor-Version': COPILOT_EDITOR_VERSION,
-  'Editor-Plugin-Version': COPILOT_PLUGIN_VERSION,
-  'editor-version': COPILOT_EDITOR_VERSION,
-  'editor-plugin-version': COPILOT_PLUGIN_VERSION,
-  'copilot-vision-request': 'true'
-} as const
-
-// Models that require the OpenAI Responses endpoint when routed through GitHub Copilot (#10560)
-const COPILOT_RESPONSES_MODEL_IDS = ['gpt-5-codex']
-
-export function isCopilotResponsesModel(model: Model): boolean {
-  const normalizedId = model.id?.trim().toLowerCase()
-  const normalizedName = model.name?.trim().toLowerCase()
-  return COPILOT_RESPONSES_MODEL_IDS.some((target) => normalizedId === target || normalizedName === target)
-}

src/renderer/src/aiCore/provider/factory.ts

@@ -28,8 +28,7 @@ const STATIC_PROVIDER_MAPPING: Record<string, ProviderId> = {
   gemini: 'google', // Google Gemini -> google
   'azure-openai': 'azure', // Azure OpenAI -> azure
   'openai-response': 'openai', // OpenAI Responses -> openai
-  grok: 'xai', // Grok -> xai
-  copilot: 'github-copilot-openai-compatible'
+  grok: 'xai' // Grok -> xai
 }
 
 /**

src/renderer/src/aiCore/provider/providerConfig.ts

@@ -21,7 +21,6 @@ import { formatApiHost } from '@renderer/utils/api'
 import { cloneDeep, trim } from 'lodash'
 
 import { aihubmixProviderCreator, newApiResolverCreator, vertexAnthropicProviderCreator } from './config'
-import { COPILOT_DEFAULT_HEADERS } from './constants'
 import { getAiSdkProviderId } from './factory'
 
 const logger = loggerService.withContext('ProviderConfigProcessor')
@@ -63,14 +62,13 @@ function handleSpecialProviders(model: Model, provider: Provider): Provider {
   //   return createVertexProvider(provider)
   // }
 
-  if (isNewApiProvider(provider)) {
-    return newApiResolverCreator(model, provider)
-  }
-
   if (isSystemProvider(provider)) {
     if (provider.id === 'aihubmix') {
       return aihubmixProviderCreator(model, provider)
     }
+    if (isNewApiProvider(provider)) {
+      return newApiResolverCreator(model, provider)
+    }
     if (provider.id === 'vertexai') {
       return vertexAnthropicProviderCreator(model, provider)
     }
@@ -111,9 +109,6 @@ function formatProviderApiHost(provider: Provider): Provider {
     if (!formatted.anthropicApiHost) {
       formatted.anthropicApiHost = formatted.apiHost
     }
-  } else if (formatted.id === 'copilot') {
-    const trimmed = trim(formatted.apiHost)
-    formatted.apiHost = trimmed.endsWith('/') ? trimmed.slice(0, -1) : trimmed
   } else if (formatted.type === 'gemini') {
     formatted.apiHost = formatApiHost(formatted.apiHost, 'v1beta')
   } else {
@@ -156,26 +151,6 @@ export function providerToAiSdkConfig(
     baseURL: trim(actualProvider.apiHost),
     apiKey: getRotatedApiKey(actualProvider)
   }
-
-  const isCopilotProvider = actualProvider.id === 'copilot'
-  if (isCopilotProvider) {
-    const storedHeaders = store.getState().copilot.defaultHeaders ?? {}
-    const options = ProviderConfigFactory.fromProvider('github-copilot-openai-compatible', baseConfig, {
-      headers: {
-        ...COPILOT_DEFAULT_HEADERS,
-        ...storedHeaders,
-        ...actualProvider.extra_headers
-      },
-      name: actualProvider.id,
-      includeUsage: true
-    })
-
-    return {
-      providerId: 'github-copilot-openai-compatible',
-      options
-    }
-  }
-
   // 处理OpenAI模式
   const extraOptions: any = {}
   if (actualProvider.type === 'openai-response' && !isOpenAIChatCompletionOnlyModel(model)) {
@@ -197,6 +172,15 @@ export function providerToAiSdkConfig(
       }
     }
   }
+
+  // copilot
+  if (actualProvider.id === 'copilot') {
+    extraOptions.headers = {
+      ...extraOptions.headers,
+      'editor-version': 'vscode/1.97.2',
+      'copilot-vision-request': 'true'
+    }
+  }
   // azure
   if (aiSdkProviderId === 'azure' || actualProvider.type === 'azure-openai') {
     extraOptions.apiVersion = actualProvider.apiVersion
@@ -245,6 +229,7 @@ export function providerToAiSdkConfig(
     }
   }
 
+  // 如果AI SDK支持该provider，使用原生配置
   if (hasProviderConfig(aiSdkProviderId) && aiSdkProviderId !== 'openai-compatible') {
     const options = ProviderConfigFactory.fromProvider(aiSdkProviderId, baseConfig, extraOptions)
     return {
@@ -292,17 +277,9 @@ export async function prepareSpecialProviderConfig(
 ) {
   switch (provider.id) {
     case 'copilot': {
-      const defaultHeaders = store.getState().copilot.defaultHeaders ?? {}
-      const headers = {
-        ...COPILOT_DEFAULT_HEADERS,
-        ...defaultHeaders
-      }
-      const { token } = await window.api.copilot.getToken(headers)
+      const defaultHeaders = store.getState().copilot.defaultHeaders
+      const { token } = await window.api.copilot.getToken(defaultHeaders)
       config.options.apiKey = token
-      config.options.headers = {
-        ...headers,
-        ...config.options.headers
-      }
       break
     }
     case 'cherryai': {

src/renderer/src/aiCore/provider/providerInitialization.ts

@@ -32,14 +32,6 @@ export const NEW_PROVIDER_CONFIGS: ProviderConfig[] = [
     supportsImageGeneration: true,
     aliases: ['vertexai-anthropic']
   },
-  {
-    id: 'github-copilot-openai-compatible',
-    name: 'GitHub Copilot OpenAI Compatible',
-    import: () => import('@opeoginni/github-copilot-openai-compatible'),
-    creatorFunctionName: 'createGitHubCopilotOpenAICompatible',
-    supportsImageGeneration: false,
-    aliases: ['copilot', 'github-copilot']
-  },
   {
     id: 'bedrock',
     name: 'Amazon Bedrock',
@@ -55,14 +47,6 @@ export const NEW_PROVIDER_CONFIGS: ProviderConfig[] = [
     creatorFunctionName: 'createPerplexity',
     supportsImageGeneration: false,
     aliases: ['perplexity']
-  },
-  {
-    id: 'mistral',
-    name: 'Mistral',
-    import: () => import('@ai-sdk/mistral'),
-    creatorFunctionName: 'createMistral',
-    supportsImageGeneration: false,
-    aliases: ['mistral']
   }
 ] as const
 

src/renderer/src/aiCore/tools/ExaSearchTool.ts

@@ -0,0 +1,166 @@
+import { loggerService } from '@logger'
+import { REFERENCE_PROMPT } from '@renderer/config/prompts'
+import WebSearchService from '@renderer/services/WebSearchService'
+import { ProviderSpecificParams, WebSearchProviderResponse } from '@renderer/types'
+import { ExtractResults } from '@renderer/utils/extract'
+import { type InferToolInput, type InferToolOutput, tool } from 'ai'
+import { z } from 'zod'
+
+const logger = loggerService.withContext('ExaSearchTool')
+
+/**
+ * Exa 专用搜索工具 - 暴露 Exa 的高级搜索能力给 LLM
+ * 支持 Neural Search、Category Filtering、Date Range 等功能
+ */
+export const exaSearchTool = (requestId: string) => {
+  const webSearchProvider = WebSearchService.getWebSearchProvider('exa')
+
+  if (!webSearchProvider) {
+    throw new Error('Exa provider not found or not configured')
+  }
+
+  return tool({
+    name: 'builtin_exa_search',
+    description: `Advanced AI-powered search using Exa.ai with neural understanding and filtering capabilities.
+
+Key Features:
+- Neural Search: AI-powered semantic search that understands intent
+- Search Type: Choose between neural (AI), keyword (traditional), or auto mode
+- Category Filter: Focus on specific content types (company, research paper, news, etc.)
+- Date Range: Filter by publication date
+- Auto-prompt: Let Exa optimize your query automatically
+
+Best for: Research, finding specific types of content, semantic search, and understanding complex queries.`,
+
+    inputSchema: z.object({
+      query: z.string().describe('The search query - be specific and clear'),
+      numResults: z.number().min(1).max(20).optional().describe('Number of results to return (1-20, default: 5)'),
+      type: z
+        .enum(['neural', 'keyword', 'auto', 'fast'])
+        .optional()
+        .describe(
+          'Search type: neural (embeddings-based), keyword (Google-like SERP), auto (default, intelligently combines both), or fast (streamlined versions)'
+        ),
+      category: z
+        .string()
+        .optional()
+        .describe(
+          'Filter by content category: company, research paper, news, github, tweet, movie, song, personal site, pdf, etc.'
+        ),
+      startPublishedDate: z
+        .string()
+        .optional()
+        .describe('Start date filter based on published date in ISO 8601 format (YYYY-MM-DD or YYYY-MM-DDTHH:MM:SSZ)'),
+      endPublishedDate: z
+        .string()
+        .optional()
+        .describe('End date filter based on published date in ISO 8601 format (YYYY-MM-DD or YYYY-MM-DDTHH:MM:SSZ)'),
+      startCrawlDate: z
+        .string()
+        .optional()
+        .describe('Start date filter based on crawl date in ISO 8601 format (YYYY-MM-DD or YYYY-MM-DDTHH:MM:SSZ)'),
+      endCrawlDate: z
+        .string()
+        .optional()
+        .describe('End date filter based on crawl date in ISO 8601 format (YYYY-MM-DD or YYYY-MM-DDTHH:MM:SSZ)'),
+      useAutoprompt: z.boolean().optional().describe('Let Exa optimize your query automatically (recommended: true)')
+    }),
+
+    execute: async (params, { abortSignal }) => {
+      // 构建 provider 特定参数（排除 query 和 numResults，这些由系统控制）
+      const providerParams: ProviderSpecificParams = {
+        exa: {
+          type: params.type,
+          category: params.category,
+          startPublishedDate: params.startPublishedDate,
+          endPublishedDate: params.endPublishedDate,
+          startCrawlDate: params.startCrawlDate,
+          endCrawlDate: params.endCrawlDate,
+          useAutoprompt: params.useAutoprompt
+        }
+      }
+      // 构建 ExtractResults 结构
+      const extractResults: ExtractResults = {
+        websearch: {
+          question: [params.query]
+        }
+      }
+
+      // 统一调用 processWebsearch - 保留所有中间件（时间戳、黑名单、tracing、压缩）
+      const finalResults: WebSearchProviderResponse = await WebSearchService.processWebsearch(
+        webSearchProvider,
+        extractResults,
+        requestId,
+        abortSignal,
+        providerParams
+      )
+
+      logger.info(`Exa search completed: ${finalResults.results.length} results for "${params.query}"`)
+
+      return finalResults
+    },
+
+    toModelOutput: (results) => {
+      let summary = 'No search results found.'
+      if (results.query && results.results.length > 0) {
+        summary = `Found ${results.results.length} relevant sources using Exa AI search. Use [number] format to cite specific information.`
+      }
+
+      const citationData = results.results.map((result, index) => {
+        const citation: any = {
+          number: index + 1,
+          title: result.title,
+          content: result.content,
+          url: result.url
+        }
+
+        // 添加 Exa 特有的元数据
+        if ('favicon' in result && result.favicon) {
+          citation.favicon = result.favicon
+        }
+        if ('author' in result && result.author) {
+          citation.author = result.author
+        }
+        if ('publishedDate' in result && result.publishedDate) {
+          citation.publishedDate = result.publishedDate
+        }
+        if ('score' in result && result.score !== undefined) {
+          citation.score = result.score
+        }
+        if ('highlights' in result && result.highlights) {
+          citation.highlights = result.highlights
+        }
+
+        return citation
+      })
+
+      // 使用 REFERENCE_PROMPT 格式化引用
+      const referenceContent = `\`\`\`json\n${JSON.stringify(citationData, null, 2)}\n\`\`\``
+      const fullInstructions = REFERENCE_PROMPT.replace(
+        '{question}',
+        "Based on the Exa search results, please answer the user's question with proper citations."
+      ).replace('{references}', referenceContent)
+
+      return {
+        type: 'content',
+        value: [
+          {
+            type: 'text',
+            text: 'Exa AI Search: Neural search with semantic understanding and rich metadata (author, publish date, highlights).'
+          },
+          {
+            type: 'text',
+            text: summary
+          },
+          {
+            type: 'text',
+            text: fullInstructions
+          }
+        ]
+      }
+    }
+  })
+}
+
+export type ExaSearchToolOutput = InferToolOutput<ReturnType<typeof exaSearchTool>>
+export type ExaSearchToolInput = InferToolInput<ReturnType<typeof exaSearchTool>>

src/renderer/src/aiCore/tools/KnowledgeSearchTool.ts

@@ -4,7 +4,7 @@ import type { Assistant, KnowledgeReference } from '@renderer/types'
 import { ExtractResults, KnowledgeExtractResults } from '@renderer/utils/extract'
 import { type InferToolInput, type InferToolOutput, tool } from 'ai'
 import { isEmpty } from 'lodash'
-import * as z from 'zod'
+import { z } from 'zod'
 
 /**
  * 知识库搜索工具

src/renderer/src/aiCore/tools/MemorySearchTool.ts

@@ -1,7 +1,7 @@
 import store from '@renderer/store'
 import { selectCurrentUserId, selectGlobalMemoryEnabled, selectMemoryConfig } from '@renderer/store/memory'
 import { type InferToolInput, type InferToolOutput, tool } from 'ai'
-import * as z from 'zod'
+import { z } from 'zod'
 
 import { MemoryProcessor } from '../../services/MemoryProcessor'
 

src/renderer/src/aiCore/tools/TavilySearchTool.ts

@@ -0,0 +1,161 @@
+import { loggerService } from '@logger'
+import { REFERENCE_PROMPT } from '@renderer/config/prompts'
+import WebSearchService from '@renderer/services/WebSearchService'
+import { ProviderSpecificParams, WebSearchProviderResponse } from '@renderer/types'
+import { ExtractResults } from '@renderer/utils/extract'
+import { type InferToolInput, type InferToolOutput, tool } from 'ai'
+import { z } from 'zod'
+
+const logger = loggerService.withContext('TavilySearchTool')
+
+/**
+ * Tavily 专用搜索工具 - 暴露 Tavily 的高级搜索能力给 LLM
+ * 支持 AI-powered answers、Search depth control、Topic filtering 等功能
+ */
+export const tavilySearchTool = (requestId: string) => {
+  const webSearchProvider = WebSearchService.getWebSearchProvider('tavily')
+
+  if (!webSearchProvider) {
+    throw new Error('Tavily provider not found or not configured')
+  }
+
+  return tool({
+    name: 'builtin_tavily_search',
+    description: `AI-powered search using Tavily with direct answers and comprehensive content extraction.
+
+Key Features:
+- Direct AI Answer: Get a concise, factual answer extracted from search results
+- Search Depth: Choose between basic (fast) or advanced (comprehensive) search
+- Topic Focus: Filter by general, news, or finance topics
+- Full Content: Access complete webpage content, not just snippets
+- Rich Media: Optionally include relevant images from search results
+
+Best for: Quick factual answers, news monitoring, financial research, and comprehensive content analysis.`,
+
+    inputSchema: z.object({
+      query: z.string().describe('The search query - be specific and clear'),
+      maxResults: z
+        .number()
+        .min(1)
+        .max(20)
+        .optional()
+        .describe('Maximum number of results to return (1-20, default: 5)'),
+      topic: z
+        .enum(['general', 'news', 'finance'])
+        .optional()
+        .describe('Topic filter: general (default), news (latest news), or finance (financial/market data)'),
+      searchDepth: z
+        .enum(['basic', 'advanced'])
+        .optional()
+        .describe('Search depth: basic (faster, top results) or advanced (slower, more comprehensive)'),
+      includeAnswer: z
+        .boolean()
+        .optional()
+        .describe('Include AI-generated direct answer extracted from results (default: true)'),
+      includeRawContent: z
+        .boolean()
+        .optional()
+        .describe('Include full webpage content instead of just snippets (default: true)'),
+      includeImages: z.boolean().optional().describe('Include relevant images from search results (default: false)')
+    }),
+
+    execute: async (params, { abortSignal }) => {
+      try {
+        // 构建 provider 特定参数
+        const providerParams: ProviderSpecificParams = {
+          tavily: {
+            topic: params.topic,
+            searchDepth: params.searchDepth,
+            includeAnswer: params.includeAnswer,
+            includeRawContent: params.includeRawContent,
+            includeImages: params.includeImages
+          }
+        }
+
+        // 构建 ExtractResults 结构
+        const extractResults: ExtractResults = {
+          websearch: {
+            question: [params.query]
+          }
+        }
+
+        // 统一调用 processWebsearch - 保留所有中间件（时间戳、黑名单、tracing、压缩）
+        const finalResults: WebSearchProviderResponse = await WebSearchService.processWebsearch(
+          webSearchProvider,
+          extractResults,
+          requestId,
+          abortSignal,
+          providerParams
+        )
+
+        logger.info(`Tavily search completed: ${finalResults.results.length} results for "${params.query}"`)
+
+        return finalResults
+      } catch (error) {
+        if (error instanceof DOMException && error.name === 'AbortError') {
+          logger.info('Tavily search aborted')
+          throw error
+        }
+        logger.error('Tavily search failed:', error as Error)
+        throw new Error(`Tavily search failed: ${error instanceof Error ? error.message : 'Unknown error'}`)
+      }
+    },
+
+    toModelOutput: (results) => {
+      let summary = 'No search results found.'
+      if (results.query && results.results.length > 0) {
+        summary = `Found ${results.results.length} relevant sources using Tavily AI search. Use [number] format to cite specific information.`
+      }
+
+      const citationData = results.results.map((result, index) => {
+        const citation: any = {
+          number: index + 1,
+          title: result.title,
+          content: result.content,
+          url: result.url
+        }
+
+        // 添加 Tavily 特有的元数据
+        if ('answer' in result && result.answer) {
+          citation.answer = result.answer // Tavily 的直接答案
+        }
+        if ('images' in result && result.images && result.images.length > 0) {
+          citation.images = result.images // Tavily 的图片
+        }
+        if ('score' in result && result.score !== undefined) {
+          citation.score = result.score
+        }
+
+        return citation
+      })
+
+      // 使用 REFERENCE_PROMPT 格式化引用
+      const referenceContent = `\`\`\`json\n${JSON.stringify(citationData, null, 2)}\n\`\`\``
+      const fullInstructions = REFERENCE_PROMPT.replace(
+        '{question}',
+        "Based on the Tavily search results, please answer the user's question with proper citations."
+      ).replace('{references}', referenceContent)
+
+      return {
+        type: 'content',
+        value: [
+          {
+            type: 'text',
+            text: 'Tavily AI Search: AI-powered with direct answers, full content extraction, and optional image results.'
+          },
+          {
+            type: 'text',
+            text: summary
+          },
+          {
+            type: 'text',
+            text: fullInstructions
+          }
+        ]
+      }
+    }
+  })
+}
+
+export type TavilySearchToolOutput = InferToolOutput<ReturnType<typeof tavilySearchTool>>
+export type TavilySearchToolInput = InferToolInput<ReturnType<typeof tavilySearchTool>>

src/renderer/src/aiCore/tools/WebSearchTool.ts

@@ -3,7 +3,7 @@ import WebSearchService from '@renderer/services/WebSearchService'
 import { WebSearchProvider, WebSearchProviderResponse } from '@renderer/types'
 import { ExtractResults } from '@renderer/utils/extract'
 import { type InferToolInput, type InferToolOutput, tool } from 'ai'
-import * as z from 'zod'
+import { z } from 'zod'
 
 /**
  * 使用预提取关键词的网络搜索工具
@@ -40,7 +40,7 @@ You can use this tool as-is to search with the prepared queries, or provide addi
         .describe('Optional additional context, keywords, or specific focus to enhance the search')
     }),
 
-    execute: async ({ additionalContext }) => {
+    execute: async ({ additionalContext }, { abortSignal }) => {
       let finalQueries = [...extractedKeywords.question]
 
       if (additionalContext?.trim()) {
@@ -67,7 +67,15 @@ You can use this tool as-is to search with the prepared queries, or provide addi
           links: extractedKeywords.links
         }
       }
-      searchResults = await WebSearchService.processWebsearch(webSearchProvider!, extractResults, requestId)
+      // abortSignal?.addEventListener('abort', () => {
+      //   console.log('tool_call_abortSignal', abortSignal?.aborted)
+      // })
+      searchResults = await WebSearchService.processWebsearch(
+        webSearchProvider!,
+        extractResults,
+        requestId,
+        abortSignal
+      )
 
       return searchResults
     },

src/renderer/src/aiCore/utils/reasoning.ts

@@ -5,11 +5,8 @@ import {
   GEMINI_FLASH_MODEL_REGEX,
   getThinkModelType,
   isDeepSeekHybridInferenceModel,
-  isDoubaoSeedAfter251015,
   isDoubaoThinkingAutoModel,
-  isGrok4FastReasoningModel,
   isGrokReasoningModel,
-  isOpenAIDeepResearchModel,
   isOpenAIReasoningModel,
   isQwenAlwaysThinkModel,
   isQwenReasoningModel,
@@ -45,12 +42,6 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin
   if (!isReasoningModel(model)) {
     return {}
   }
-
-  if (isOpenAIDeepResearchModel(model)) {
-    return {
-      reasoning_effort: 'medium'
-    }
-  }
   const reasoningEffort = assistant?.settings?.reasoning_effort
 
   if (!reasoningEffort) {
@@ -61,12 +52,7 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin
         return {}
       }
       // Don't disable reasoning for models that require it
-      if (
-        isGrokReasoningModel(model) ||
-        isOpenAIReasoningModel(model) ||
-        isQwenAlwaysThinkModel(model) ||
-        model.id.includes('seed-oss')
-      ) {
+      if (isGrokReasoningModel(model) || isOpenAIReasoningModel(model) || model.id.includes('seed-oss')) {
         return {}
       }
       return { reasoning: { enabled: false, exclude: true } }
@@ -114,7 +100,6 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin
   // reasoningEffort有效的情况
   // DeepSeek hybrid inference models, v3.1 and maybe more in the future
   // 不同的 provider 有不同的思考控制方式，在这里统一解决
-
   if (isDeepSeekHybridInferenceModel(model)) {
     if (isSystemProvider(provider)) {
       switch (provider.id) {
@@ -157,16 +142,6 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin
 
   // OpenRouter models
   if (model.provider === SystemProviderIds.openrouter) {
-    // Grok 4 Fast doesn't support effort levels, always use enabled: true
-    if (isGrok4FastReasoningModel(model)) {
-      return {
-        reasoning: {
-          enabled: true // Ignore effort level, just enable reasoning
-        }
-      }
-    }
-
-    // Other OpenRouter models that support effort levels
     if (isSupportedReasoningEffortModel(model) || isSupportedThinkingTokenModel(model)) {
       return {
         reasoning: {
@@ -178,10 +153,6 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin
 
   // Doubao 思考模式支持
   if (isSupportedThinkingTokenDoubaoModel(model)) {
-    if (isDoubaoSeedAfter251015(model)) {
-      return { reasoningEffort }
-    }
-    // Comment below this line seems weird. reasoning is high instead of null/undefined. Who wrote this?
     // reasoningEffort 为空，默认开启 enabled
     if (reasoningEffort === 'high') {
       return { thinking: { type: 'enabled' } }
@@ -238,12 +209,12 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin
     const supportedOptions = MODEL_SUPPORTED_REASONING_EFFORT[modelType]
     if (supportedOptions.includes(reasoningEffort)) {
       return {
-        reasoningEffort
+        reasoning_effort: reasoningEffort
       }
     } else {
       // 如果不支持，fallback到第一个支持的值
       return {
-        reasoningEffort: supportedOptions[0]
+        reasoning_effort: supportedOptions[0]
       }
     }
   }
@@ -324,11 +295,7 @@ export function getOpenAIReasoningParams(assistant: Assistant, model: Model): Re
     reasoningSummary = summaryText
   }
 
-  let reasoningEffort = assistant?.settings?.reasoning_effort
-
-  if (isOpenAIDeepResearchModel(model)) {
-    reasoningEffort = 'medium'
-  }
+  const reasoningEffort = assistant?.settings?.reasoning_effort
 
   if (!reasoningEffort) {
     return {}
@@ -445,13 +412,6 @@ export function getGeminiReasoningParams(assistant: Assistant, model: Model): Re
   return {}
 }
 
-/**
- * Get XAI-specific reasoning parameters
- * This function should only be called for XAI provider models
- * @param assistant - The assistant configuration
- * @param model - The model being used
- * @returns XAI-specific reasoning parameters
- */
 export function getXAIReasoningParams(assistant: Assistant, model: Model): Record<string, any> {
   if (!isSupportedReasoningEffortGrokModel(model)) {
     return {}
@@ -459,11 +419,6 @@ export function getXAIReasoningParams(assistant: Assistant, model: Model): Recor
 
   const { reasoning_effort: reasoningEffort } = getAssistantSettings(assistant)
 
-  if (!reasoningEffort) {
-    return {}
-  }
-
-  // For XAI provider Grok models, use reasoningEffort parameter directly
   return {
     reasoningEffort
   }

src/renderer/src/aiCore/utils/websearch.ts

@@ -4,7 +4,7 @@ import {
   WebSearchPluginConfig
 } from '@cherrystudio/ai-core/core/plugins/built-in/webSearchPlugin/helper'
 import { BaseProviderId } from '@cherrystudio/ai-core/provider'
-import { isOpenAIDeepResearchModel, isOpenAIWebSearchChatCompletionOnlyModel } from '@renderer/config/models'
+import { isOpenAIWebSearchChatCompletionOnlyModel } from '@renderer/config/models'
 import { CherryWebSearchConfig } from '@renderer/store/websearch'
 import { Model } from '@renderer/types'
 import { mapRegexToPatterns } from '@renderer/utils/blacklistMatchPattern'
@@ -43,27 +43,20 @@ function mapMaxResultToOpenAIContextSize(maxResults: number): OpenAISearchConfig
 
 export function buildProviderBuiltinWebSearchConfig(
   providerId: BaseProviderId,
-  webSearchConfig: CherryWebSearchConfig,
-  model?: Model
+  webSearchConfig: CherryWebSearchConfig
 ): WebSearchPluginConfig | undefined {
   switch (providerId) {
     case 'openai': {
-      const searchContextSize = isOpenAIDeepResearchModel(model)
-        ? 'medium'
-        : mapMaxResultToOpenAIContextSize(webSearchConfig.maxResults)
       return {
         openai: {
-          searchContextSize
+          searchContextSize: mapMaxResultToOpenAIContextSize(webSearchConfig.maxResults)
         }
       }
     }
     case 'openai-chat': {
-      const searchContextSize = isOpenAIDeepResearchModel(model)
-        ? 'medium'
-        : mapMaxResultToOpenAIContextSize(webSearchConfig.maxResults)
       return {
         'openai-chat': {
-          searchContextSize
+          searchContextSize: mapMaxResultToOpenAIContextSize(webSearchConfig.maxResults)
         }
       }
     }

src/renderer/src/api/agent.ts

@@ -9,8 +9,6 @@ import {
   CreateAgentRequest,
   CreateAgentResponse,
   CreateAgentResponseSchema,
-  CreateAgentSessionResponse,
-  CreateAgentSessionResponseSchema,
   CreateSessionForm,
   CreateSessionRequest,
   GetAgentResponse,
@@ -21,7 +19,6 @@ import {
   ListAgentSessionsResponseSchema,
   type ListAgentsResponse,
   ListAgentsResponseSchema,
-  ListOptions,
   objectEntries,
   objectKeys,
   UpdateAgentForm,
@@ -96,19 +93,10 @@ export class AgentApiClient {
     }
   }
 
-  public async listAgents(options?: ListOptions): Promise<ListAgentsResponse> {
+  public async listAgents(): Promise<ListAgentsResponse> {
     const url = this.agentPaths.base
     try {
-      const params = new URLSearchParams()
-      if (options?.limit !== undefined) params.append('limit', String(options.limit))
-      if (options?.offset !== undefined) params.append('offset', String(options.offset))
-      if (options?.sortBy) params.append('sortBy', options.sortBy)
-      if (options?.orderBy) params.append('orderBy', options.orderBy)
-
-      const queryString = params.toString()
-      const fullUrl = queryString ? `${url}?${queryString}` : url
-
-      const response = await this.axios.get(fullUrl)
+      const response = await this.axios.get(url)
       const result = ListAgentsResponseSchema.safeParse(response.data)
       if (!result.success) {
         throw new Error('Not a valid Agents array.')
@@ -183,12 +171,12 @@ export class AgentApiClient {
     }
   }
 
-  public async createSession(agentId: string, session: CreateSessionForm): Promise<CreateAgentSessionResponse> {
+  public async createSession(agentId: string, session: CreateSessionForm): Promise<GetAgentSessionResponse> {
     const url = this.getSessionPaths(agentId).base
     try {
       const payload = session satisfies CreateSessionRequest
       const response = await this.axios.post(url, payload)
-      const data = CreateAgentSessionResponseSchema.parse(response.data)
+      const data = GetAgentSessionResponseSchema.parse(response.data)
       return data
     } catch (error) {
       throw processError(error, 'Failed to add session.')

src/renderer/src/assets/styles/ant.css

@@ -102,20 +102,13 @@
 }
 
 .ant-dropdown-menu .ant-dropdown-menu-sub {
-  max-height: min(500px, 80vh);
+  max-height: 80vh;
   width: max-content;
   overflow-y: auto;
   overflow-x: hidden;
   border: 0.5px solid var(--color-border);
 }
 
-@media (max-height: 700px) {
-  .ant-dropdown .ant-dropdown-menu,
-  .ant-dropdown .ant-dropdown-menu-sub {
-    max-height: 50vh !important;
-  }
-}
-
 .ant-dropdown {
   background-color: var(--ant-color-bg-elevated);
   overflow: hidden;
@@ -124,7 +117,7 @@
 }
 
 .ant-dropdown .ant-dropdown-menu {
-  max-height: min(500px, 80vh);
+  max-height: 80vh;
   overflow-y: auto;
   border: 0.5px solid var(--color-border);
 }

src/renderer/src/components/ApiModelLabel.tsx

@@ -1,5 +1,5 @@
 import { Avatar, cn } from '@heroui/react'
-import { getModelLogoById } from '@renderer/config/models'
+import { getModelLogo } from '@renderer/config/models'
 import { ApiModel } from '@renderer/types'
 import React from 'react'
 
@@ -19,10 +19,7 @@ export interface ModelLabelProps extends Omit<React.ComponentPropsWithRef<'div'>
 export const ApiModelLabel: React.FC<ModelLabelProps> = ({ model, className, classNames, ...props }) => {
   return (
     <div className={cn('flex items-center gap-1', className, classNames?.container)} {...props}>
-      <Avatar
-        src={model ? (getModelLogoById(model.id) ?? getModelLogoById(model.name)) : undefined}
-        className={cn('h-4 w-4', classNames?.avatar)}
-      />
+      <Avatar src={model ? getModelLogo(model.id) : undefined} className={cn('h-4 w-4', classNames?.avatar)} />
       <Ellipsis className={classNames?.modelName}>{model?.name}</Ellipsis>
       <span className={classNames?.divider}> | </span>
       <Ellipsis className={classNames?.providerName}>{model?.provider_name}</Ellipsis>

src/renderer/src/components/Avatar/ModelAvatar.tsx

@@ -14,7 +14,7 @@ interface Props {
 const ModelAvatar: FC<Props> = ({ model, size, props, className }) => {
   return (
     <Avatar
-      src={getModelLogo(model)}
+      src={getModelLogo(model?.id || '')}
       style={{
         width: size,
         height: size,

src/renderer/src/components/CodeBlockView/view.tsx

@@ -326,7 +326,7 @@ const CodeBlockWrapper = styled.div<{ $isInSpecialView: boolean }>`
    * 一是 CodeViewer 在气泡样式下的用户消息中无法撑开气泡，
    * 二是 代码块内容过少时 toolbar 会和 title 重叠。
    */
-  min-width: 35ch;
+  min-width: 45ch;
 
   .code-toolbar {
     background-color: ${(props) => (props.$isInSpecialView ? 'transparent' : 'var(--color-background-mute)')};

src/renderer/src/components/CodeEditor/hooks.ts

@@ -2,7 +2,7 @@ import { linter } from '@codemirror/lint' // statically imported by @uiw/codemir
 import { EditorView } from '@codemirror/view'
 import { loggerService } from '@logger'
 import { Extension, keymap } from '@uiw/react-codemirror'
-import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useEffect, useMemo, useState } from 'react'
 
 import { getNormalizedExtension } from './utils'
 
@@ -203,80 +203,3 @@ export function useHeightListener({ onHeightChange }: UseHeightListenerProps) {
     })
   }, [onHeightChange])
 }
-
-interface UseScrollToLineOptions {
-  highlight?: boolean
-}
-
-export function useScrollToLine(editorViewRef: React.MutableRefObject<EditorView | null>) {
-  const findLineElement = useCallback((view: EditorView, position: number): HTMLElement | null => {
-    const domAtPos = view.domAtPos(position)
-    let node: Node | null = domAtPos.node
-
-    if (node.nodeType === Node.TEXT_NODE) {
-      node = node.parentElement
-    }
-
-    while (node) {
-      if (node instanceof HTMLElement && node.classList.contains('cm-line')) {
-        return node
-      }
-      node = node.parentElement
-    }
-
-    return null
-  }, [])
-
-  const highlightLine = useCallback((view: EditorView, element: HTMLElement) => {
-    const previousHighlight = view.dom.querySelector('.animation-locate-highlight') as HTMLElement | null
-    if (previousHighlight) {
-      previousHighlight.classList.remove('animation-locate-highlight')
-    }
-
-    element.classList.add('animation-locate-highlight')
-
-    const handleAnimationEnd = () => {
-      element.classList.remove('animation-locate-highlight')
-      element.removeEventListener('animationend', handleAnimationEnd)
-    }
-
-    element.addEventListener('animationend', handleAnimationEnd)
-  }, [])
-
-  return useCallback(
-    (lineNumber: number, options?: UseScrollToLineOptions) => {
-      const view = editorViewRef.current
-      if (!view) return
-
-      const targetLine = view.state.doc.line(Math.min(lineNumber, view.state.doc.lines))
-
-      const lineElement = findLineElement(view, targetLine.from)
-      if (lineElement) {
-        lineElement.scrollIntoView({ behavior: 'smooth', block: 'center', inline: 'nearest' })
-
-        if (options?.highlight) {
-          requestAnimationFrame(() => highlightLine(view, lineElement))
-        }
-        return
-      }
-
-      view.dispatch({
-        effects: EditorView.scrollIntoView(targetLine.from, {
-          y: 'start'
-        })
-      })
-
-      if (!options?.highlight) {
-        return
-      }
-
-      setTimeout(() => {
-        const fallbackElement = findLineElement(view, targetLine.from)
-        if (fallbackElement) {
-          highlightLine(view, fallbackElement)
-        }
-      }, 200)
-    },
-    [editorViewRef, findLineElement, highlightLine]
-  )
-}

src/renderer/src/components/CodeEditor/index.tsx

@@ -5,14 +5,13 @@ import diff from 'fast-diff'
 import { useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react'
 import { memo } from 'react'
 
-import { useBlurHandler, useHeightListener, useLanguageExtensions, useSaveKeymap, useScrollToLine } from './hooks'
+import { useBlurHandler, useHeightListener, useLanguageExtensions, useSaveKeymap } from './hooks'
 
 // 标记非用户编辑的变更
 const External = Annotation.define<boolean>()
 
 export interface CodeEditorHandles {
   save?: () => void
-  scrollToLine?: (lineNumber: number, options?: { highlight?: boolean }) => void
 }
 
 export interface CodeEditorProps {
@@ -182,11 +181,8 @@ const CodeEditor = ({
     ].flat()
   }, [extensions, langExtensions, wrapped, saveKeymapExtension, blurExtension, heightListenerExtension])
 
-  const scrollToLine = useScrollToLine(editorViewRef)
-
   useImperativeHandle(ref, () => ({
-    save: handleSave,
-    scrollToLine
+    save: handleSave
   }))
 
   return (

src/renderer/src/components/ConfirmDialog.tsx

@@ -1,45 +0,0 @@
-import { Button } from '@heroui/react'
-import { CheckIcon, XIcon } from 'lucide-react'
-import { FC } from 'react'
-import { createPortal } from 'react-dom'
-
-interface Props {
-  x: number
-  y: number
-  message: string
-  onConfirm: () => void
-  onCancel: () => void
-}
-
-const ConfirmDialog: FC<Props> = ({ x, y, message, onConfirm, onCancel }) => {
-  if (typeof document === 'undefined') {
-    return null
-  }
-
-  return createPortal(
-    <>
-      <div className="fixed inset-0 z-[99998] bg-transparent" onClick={onCancel} />
-      <div
-        className="-translate-x-1/2 -translate-y-full fixed z-[99999] mt-[-8px] transform"
-        style={{
-          left: `${x}px`,
-          top: `${y}px`
-        }}>
-        <div className="flex min-w-[160px] items-center rounded-lg border border-[var(--color-border)] bg-[var(--color-background)] p-3 shadow-[0_4px_12px_rgba(0,0,0,0.15)]">
-          <div className="mr-2 text-sm leading-[1.4]">{message}</div>
-          <div className="flex justify-center gap-2">
-            <Button onPress={onCancel} radius="full" className="h-6 w-6 min-w-0 p-1" color="danger">
-              <XIcon className="text-danger-foreground" size={16} />
-            </Button>
-            <Button onPress={onConfirm} radius="full" className="h-6 w-6 min-w-0 p-1" color="success">
-              <CheckIcon className="text-success-foreground" size={16} />
-            </Button>
-          </div>
-        </div>
-      </div>
-    </>,
-    document.body
-  )
-}
-
-export default ConfirmDialog

src/renderer/src/components/HighlightText.tsx

@@ -1,48 +0,0 @@
-import { FC, memo, useMemo } from 'react'
-
-interface HighlightTextProps {
-  text: string
-  keyword: string
-  caseSensitive?: boolean
-  className?: string
-}
-
-/**
- * Text highlighting component that marks keyword matches
- */
-const HighlightText: FC<HighlightTextProps> = ({ text, keyword, caseSensitive = false, className }) => {
-  const highlightedText = useMemo(() => {
-    if (!keyword || !text) {
-      return <span>{text}</span>
-    }
-
-    // Escape regex special characters
-    const escapedKeyword = keyword.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-    const flags = caseSensitive ? 'g' : 'gi'
-    const regex = new RegExp(`(${escapedKeyword})`, flags)
-
-    // Split text by keyword matches
-    const parts = text.split(regex)
-
-    return (
-      <>
-        {parts.map((part, index) => {
-          // Check if part matches keyword
-          const isMatch = regex.test(part)
-          regex.lastIndex = 0 // Reset regex state
-
-          if (isMatch) {
-            return <mark key={index}>{part}</mark>
-          }
-          return <span key={index}>{part}</span>
-        })}
-      </>
-    )
-  }, [text, keyword, caseSensitive])
-
-  const combinedClassName = className ? `ant-typography ${className}` : 'ant-typography'
-
-  return <span className={combinedClassName}>{highlightedText}</span>
-}
-
-export default memo(HighlightText)

src/renderer/src/components/MinApp/MinappPopupContainer.tsx

@@ -549,7 +549,7 @@ const MinappPopupContainer: React.FC = () => {
       {/* 在所有小程序中显示GoogleLoginTip */}
       <GoogleLoginTip isReady={isReady} currentUrl={currentUrl} currentAppId={currentMinappId} />
       {!isReady && (
-        <EmptyView style={{ backgroundColor: 'var(--color-background-soft)' }}>
+        <EmptyView>
           <Avatar
             src={currentAppInfo?.logo}
             size={80}

src/renderer/src/components/MinApp/WebviewContainer.tsx

@@ -25,7 +25,7 @@ const WebviewContainer = memo(
     onNavigateCallback: (appid: string, url: string) => void
   }) => {
     const webviewRef = useRef<WebviewTag | null>(null)
-    const { enableSpellCheck, minappsOpenLinkExternal } = useSettings()
+    const { enableSpellCheck } = useSettings()
 
     const setRef = (appid: string) => {
       onSetRefCallback(appid, null)
@@ -76,8 +76,6 @@ const WebviewContainer = memo(
         const webviewId = webviewRef.current?.getWebContentsId()
         if (webviewId) {
           window.api?.webview?.setSpellCheckEnabled?.(webviewId, enableSpellCheck)
-          // Set link opening behavior for this webview
-          window.api?.webview?.setOpenLinkExternal?.(webviewId, minappsOpenLinkExternal)
         }
       }
 
@@ -106,22 +104,6 @@ const WebviewContainer = memo(
       // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [appid, url])
 
-    // Update webview settings when they change
-    useEffect(() => {
-      if (!webviewRef.current) return
-
-      try {
-        const webviewId = webviewRef.current.getWebContentsId()
-        if (webviewId) {
-          window.api?.webview?.setSpellCheckEnabled?.(webviewId, enableSpellCheck)
-          window.api?.webview?.setOpenLinkExternal?.(webviewId, minappsOpenLinkExternal)
-        }
-      } catch (error) {
-        // WebView may not be ready yet, settings will be applied in dom-ready event
-        logger.debug(`WebView ${appid} not ready for settings update`)
-      }
-    }, [appid, minappsOpenLinkExternal, enableSpellCheck])
-
     const WebviewStyle: React.CSSProperties = {
       width: '100%',
       height: '100%',

src/renderer/src/components/Popups/ApiKeyListPopup/popup.tsx

@@ -10,7 +10,6 @@ interface ShowParams {
   providerId: string
   title?: string
   showHealthCheck?: boolean
-  providerType?: 'llm' | 'webSearch' | 'preprocess'
 }
 
 interface Props extends ShowParams {
@@ -20,7 +19,7 @@ interface Props extends ShowParams {
 /**
  * API Key 列表弹窗容器组件
  */
-const PopupContainer: React.FC<Props> = ({ providerId, title, resolve, showHealthCheck = true, providerType }) => {
+const PopupContainer: React.FC<Props> = ({ providerId, title, resolve, showHealthCheck = true }) => {
   const [open, setOpen] = useState(true)
   const { t } = useTranslation()
 
@@ -33,20 +32,14 @@ const PopupContainer: React.FC<Props> = ({ providerId, title, resolve, showHealt
   }
 
   const ListComponent = useMemo(() => {
-    const type =
-      providerType ||
-      (isWebSearchProviderId(providerId) ? 'webSearch' : isPreprocessProviderId(providerId) ? 'preprocess' : 'llm')
-
-    switch (type) {
-      case 'webSearch':
-        return <WebSearchApiKeyList providerId={providerId as any} showHealthCheck={showHealthCheck} />
-      case 'preprocess':
-        return <DocPreprocessApiKeyList providerId={providerId as any} showHealthCheck={showHealthCheck} />
-      case 'llm':
-      default:
-        return <LlmApiKeyList providerId={providerId} showHealthCheck={showHealthCheck} />
+    if (isWebSearchProviderId(providerId)) {
+      return <WebSearchApiKeyList providerId={providerId} showHealthCheck={showHealthCheck} />
     }
-  }, [providerId, showHealthCheck, providerType])
+    if (isPreprocessProviderId(providerId)) {
+      return <DocPreprocessApiKeyList providerId={providerId} showHealthCheck={showHealthCheck} />
+    }
+    return <LlmApiKeyList providerId={providerId} showHealthCheck={showHealthCheck} />
+  }, [providerId, showHealthCheck])
 
   return (
     <Modal

src/renderer/src/components/Popups/SelectModelPopup/api-model-popup.tsx

@@ -3,7 +3,7 @@ import { HStack } from '@renderer/components/Layout'
 import ModelTagsWithLabel from '@renderer/components/ModelTagsWithLabel'
 import { TopView } from '@renderer/components/TopView'
 import { DynamicVirtualList, type DynamicVirtualListRef } from '@renderer/components/VirtualList'
-import { getModelLogoById } from '@renderer/config/models'
+import { getModelLogo } from '@renderer/config/models'
 import { useApiModels } from '@renderer/hooks/agents/useModels'
 import { getModelUniqId } from '@renderer/services/ModelService'
 import { getProviderNameById } from '@renderer/services/ProviderService'
@@ -114,7 +114,7 @@ const PopupContainer: React.FC<Props> = ({ model, apiFilter, modelFilter, showTa
           </TagsContainer>
         ),
         icon: (
-          <Avatar src={getModelLogoById(model.id || '')} size={24}>
+          <Avatar src={getModelLogo(model.id || '')} size={24}>
             {first(model.name) || 'M'}
           </Avatar>
         ),