新增信息id

.github/ISSUE_TEMPLATE/#0_bug_report.yml

@@ -1,7 +1,7 @@
 name: 🐛 错误报告 (中文)
 description: 创建一个报告以帮助我们改进
 title: '[错误]: '
-labels: ['kind/bug']
+labels: ['bug']
 body:
   - type: markdown
     attributes:
@@ -18,9 +18,7 @@ body:
       options:
         - label: 我理解 Issue 是用于反馈和解决问题的，而非吐槽评论区，将尽可能提供更多信息帮助问题解决。
           required: true
-        - label: 我的问题不是 [常见问题](https://github.com/CherryHQ/cherry-studio/issues/3881) 中的内容。
-          required: true
-        - label: 我已经查看了 **置顶 Issue** 并搜索了现有的 [开放Issue](https://github.com/CherryHQ/cherry-studio/issues)和[已关闭Issue](https://github.com/CherryHQ/cherry-studio/issues?q=is%3Aissue%20state%3Aclosed%20)，没有找到类似的问题。
+        - label: 我已经查看了置顶 Issue 并搜索了现有的 [开放Issue](https://github.com/CherryHQ/cherry-studio/issues)和[已关闭Issue](https://github.com/CherryHQ/cherry-studio/issues?q=is%3Aissue%20state%3Aclosed%20)，没有找到类似的问题。
           required: true
         - label: 我填写了简短且清晰明确的标题，以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等。
           required: true
@@ -50,8 +48,8 @@ body:
     id: description
     attributes:
       label: 错误描述
-      description: 描述问题时请尽可能详细。请尽可能提供截图或屏幕录制，以帮助我们更好地理解问题。
-      placeholder: 告诉我们发生了什么...(记得附上截图/录屏，如果适用)
+      description: 描述问题时请尽可能详细
+      placeholder: 告诉我们发生了什么...
     validations:
       required: true
 
@@ -59,14 +57,12 @@ body:
     id: reproduction
     attributes:
       label: 重现步骤
-      description: 提供详细的重现步骤，以便于我们的开发人员可以准确地重现问题。请尽可能为每个步骤提供截图或屏幕录制。
+      description: 提供详细的重现步骤，以便于我们可以准确地重现问题
       placeholder: |
         1. 转到 '...'
         2. 点击 '....'
         3. 向下滚动到 '....'
         4. 看到错误
-
-        记得尽可能为每个步骤附上截图/录屏！
     validations:
       required: true
 

.github/ISSUE_TEMPLATE/#1_feature_request.yml

@@ -1,7 +1,7 @@
 name: 💡 功能建议 (中文)
 description: 为项目提出新的想法
 title: '[功能]: '
-labels: ['kind/enhancement']
+labels: ['enhancement']
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/#2_question.yml

@@ -1,7 +1,7 @@
-name: ❓ 提问 & 讨论 (中文)
+name: ❓ 讨论 & 提问 (中文)
 description: 寻求帮助、讨论问题、提出疑问等...
 title: '[讨论]: '
-labels: ['kind/question']
+labels: ['question']
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/#3_others.yml

@@ -1,76 +0,0 @@
-name: 🤔 其他问题 (中文)
-description: 提交不属于错误报告或功能需求的问题
-title: '[其他]: '
-body:
-  - type: markdown
-    attributes:
-      value: |
-        感谢您花时间提出问题！
-        在提交此问题之前，请确保您已经了解了[常见问题](https://docs.cherry-ai.com/question-contact/questions)和[知识科普](https://docs.cherry-ai.com/question-contact/knowledge)
-
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: 提交前检查
-      description: |
-        在提交 Issue 前请确保您已经完成了以下所有步骤
-      options:
-        - label: 我理解 Issue 是用于反馈和解决问题的，而非吐槽评论区，将尽可能提供更多信息帮助问题解决。
-          required: true
-        - label: 我已经查看了置顶 Issue 并搜索了现有的 [开放Issue](https://github.com/CherryHQ/cherry-studio/issues)和[已关闭Issue](https://github.com/CherryHQ/cherry-studio/issues?q=is%3Aissue%20state%3Aclosed%20)，没有找到类似的问题。
-          required: true
-        - label: 我填写了简短且清晰明确的标题，以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是"一个问题"、"求助"等。
-          required: true
-        - label: 我的问题不属于错误报告或功能需求类别。
-          required: true
-
-  - type: dropdown
-    id: platform
-    attributes:
-      label: 平台
-      description: 您正在使用哪个平台？
-      options:
-        - Windows
-        - macOS
-        - Linux
-    validations:
-      required: true
-
-  - type: input
-    id: version
-    attributes:
-      label: 版本
-      description: 您正在运行的 Cherry Studio 版本是什么？
-      placeholder: 例如 v1.0.0
-    validations:
-      required: true
-
-  - type: textarea
-    id: question
-    attributes:
-      label: 问题描述
-      description: 请详细描述您的问题或疑问
-      placeholder: 我想了解有关...的更多信息
-    validations:
-      required: true
-
-  - type: textarea
-    id: context
-    attributes:
-      label: 相关背景
-      description: 请提供与您的问题相关的任何背景信息或上下文
-      placeholder: 我尝试实现...时遇到了疑问
-    validations:
-      required: true
-
-  - type: textarea
-    id: attempts
-    attributes:
-      label: 您已尝试的方法
-      description: 请描述您为解决问题已经尝试过的方法（如果有）
-
-  - type: textarea
-    id: additional
-    attributes:
-      label: 附加信息
-      description: 任何能让我们对您的问题有更多了解的信息，包括截图或相关链接

.github/ISSUE_TEMPLATE/0_bug_report.yml

@@ -1,7 +1,7 @@
 name: 🐛 Bug Report (English)
 description: Create a report to help us improve
 title: '[Bug]: '
-labels: ['kind/bug']
+labels: ['bug']
 body:
   - type: markdown
     attributes:
@@ -18,9 +18,7 @@ body:
       options:
         - label: I understand that issues are for feedback and problem solving, not for complaining in the comment section, and will provide as much information as possible to help solve the problem.
           required: true
-        - label: My issue is not listed in the [FAQ](https://github.com/CherryHQ/cherry-studio/issues/3881).
-          required: true
-        - label: I've looked at **pinned issues** and searched for existing [Open Issues](https://github.com/CherryHQ/cherry-studio/issues), [Closed Issues](https://github.com/CherryHQ/cherry-studio/issues?q=is%3Aissue%20state%3Aclosed), and [Discussions](https://github.com/CherryHQ/cherry-studio/discussions), no similar issue or discussion was found.
+        - label: I've looked at pinned issues and searched for existing [Open Issues](https://github.com/CherryHQ/cherry-studio/issues), [Closed Issues](https://github.com/CherryHQ/cherry-studio/issues?q=is%3Aissue%20state%3Aclosed), and [Discussions](https://github.com/CherryHQ/cherry-studio/discussions), no similar issue or discussion was found.
           required: true
         - label: I've filled in short, clear headings so that developers can quickly identify a rough idea of what to expect when flipping through the list of issues. And not "a suggestion", "stuck", etc.
           required: true

.github/ISSUE_TEMPLATE/1_feature_request.yml

@@ -1,7 +1,7 @@
 name: 💡 Feature Request (English)
 description: Suggest an idea for this project
 title: '[Feature]: '
-labels: ['kind/enhancement']
+labels: ['enhancement']
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/2_question.yml

@@ -1,7 +1,7 @@
-name: ❓ Questions & Discussion
+name: ❓ Discussion & Questions
 description: Seeking help, discussing issues, asking questions, etc...
 title: '[Discussion]: '
-labels: ['kind/question']
+labels: ['question']
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/3_others.yml

@@ -1,76 +0,0 @@
-name: 🤔 Other Questions (English)
-description: Submit questions that don't fit into bug reports or feature requests
-title: '[Other]: '
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for taking the time to ask a question!
-        Before submitting this issue, please make sure you've reviewed the [FAQ](https://docs.cherry-ai.com/question-contact/questions) and [Knowledge Base](https://docs.cherry-ai.com/question-contact/knowledge)
-
-  - type: checkboxes
-    id: checklist
-    attributes:
-      label: Pre-submission Checklist
-      description: |
-        Please ensure you've completed all the steps below before submitting your issue
-      options:
-        - label: I understand that Issues are for feedback and problem-solving, not for complaints, and I will provide as much information as possible to help resolve the issue.
-          required: true
-        - label: I have checked the pinned Issues and searched through existing [open Issues](https://github.com/CherryHQ/cherry-studio/issues) and [closed Issues](https://github.com/CherryHQ/cherry-studio/issues?q=is%3Aissue%20state%3Aclosed%20) and didn't find similar questions.
-          required: true
-        - label: I have written a short and clear title that helps developers quickly understand the nature of my question, rather than vague titles like "A question" or "Help needed".
-          required: true
-        - label: My question doesn't fall under bug reports or feature requests categories.
-          required: true
-
-  - type: dropdown
-    id: platform
-    attributes:
-      label: Platform
-      description: Which platform are you using?
-      options:
-        - Windows
-        - macOS
-        - Linux
-    validations:
-      required: true
-
-  - type: input
-    id: version
-    attributes:
-      label: Version
-      description: What version of Cherry Studio are you running?
-      placeholder: e.g., v1.0.0
-    validations:
-      required: true
-
-  - type: textarea
-    id: question
-    attributes:
-      label: Question Description
-      description: Please describe your question or inquiry in detail
-      placeholder: I would like to know more about...
-    validations:
-      required: true
-
-  - type: textarea
-    id: context
-    attributes:
-      label: Relevant Context
-      description: Please provide any background information or context related to your question
-      placeholder: I encountered this question while trying to implement...
-    validations:
-      required: true
-
-  - type: textarea
-    id: attempts
-    attributes:
-      label: Attempted Solutions
-      description: Please describe any methods you've already tried to resolve your question (if applicable)
-
-  - type: textarea
-    id: additional
-    attributes:
-      label: Additional Information
-      description: Any other information that could help us better understand your question, including screenshots or relevant links

.github/issue-checker.yml

@@ -1,252 +0,0 @@
-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/pull_request_template.md

@@ -1,54 +0,0 @@
-<!-- Template from https://github.com/kubevirt/kubevirt/blob/main/.github/PULL_REQUEST_TEMPLATE.md?-->
-<!--  Thanks for sending a pull request!  Here are some tips for you:
-1. Consider creating this PR as draft: https://github.com/CherryHQ/cherry-studio/blob/main/CONTRIBUTING.md
--->
-
-### What this PR does
-
-Before this PR:
-
-After this PR:
-
-<!-- (optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: -->
-
-Fixes #
-
-### Why we need it and why it was done in this way
-
-The following tradeoffs were made:
-
-The following alternatives were considered:
-
-Links to places where the discussion took place: <!-- optional: slack, other GH issue, mailinglist, ... -->
-
-### Breaking changes
-
-<!-- optional -->
-
-If this PR introduces breaking changes, please describe the changes and the impact on users.
-
-### Special notes for your reviewer
-
-<!-- optional -->
-
-### Checklist
-
-This checklist is not enforcing, but it's a reminder of items that could be relevant to every PR.
-Approvers are expected to review this list.
-
-- [ ] PR: The PR description is expressive enough and will help future contributors
-- [ ] Code: [Write code that humans can understand](https://en.wikiquote.org/wiki/Martin_Fowler#code-for-humans) and [Keep it simple](https://en.wikipedia.org/wiki/KISS_principle)
-- [ ] Refactor: You have [left the code cleaner than you found it (Boy Scout Rule)](https://learning.oreilly.com/library/view/97-things-every/9780596809515/ch08.html)
-- [ ] Upgrade: Impact of this change on upgrade flows was considered and addressed if required
-- [ ] Documentation: A [user-guide update](https://docs.cherry-ai.com) was considered and is present (link) or not required. You want a user-guide update if it's a user facing feature.
-
-### Release note
-
-<!--  Write your release note:
-1. Enter your extended release note in the below block. If the PR requires additional action from users switching to the new release, include the string "action required".
-2. If no release note is required, just write "NONE".
--->
-
-```release-note
-
-```

.github/workflows/issue-checker.yml

@@ -1,25 +0,0 @@
-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

.github/workflows/issue-management.yml

@@ -1,58 +0,0 @@
-name: "Stale Issue Management"
-
-on:
-  schedule:
-    - cron: "0 0 * * *"
-  workflow_dispatch:
-
-env:
-  daysBeforeStale: 30 # Number of days of inactivity before marking as stale
-  daysBeforeClose: 10 # Number of days to wait after marking as stale before closing
-
-jobs:
-  stale:
-    if: github.repository_owner == 'CherryHQ'
-    runs-on: ubuntu-latest
-    permissions:
-      actions: write # Workaround for https://github.com/actions/stale/issues/1090
-      issues: write
-      # Completely disable stalling for PRs
-      pull-requests: none
-      contents: none
-    steps:
-      - name: Close needs-more-info issues
-        uses: actions/stale@v9
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          only-labels: "needs-more-info"
-          days-before-stale: ${{ env.daysBeforeStale }}
-          days-before-close: 0  # Close immediately after stale
-          stale-issue-label: "inactive"
-          close-issue-label: "closed:no-response"
-          stale-issue-message: |
-            This issue has been labeled as needing more information and has been inactive for ${{ env.daysBeforeStale }} days. 
-            It will be closed now due to lack of additional information.
-            
-            该问题被标记为"需要更多信息"且已经 ${{ env.daysBeforeStale }} 天没有任何活动，将立即关闭。
-          operations-per-run: 50
-          exempt-issue-labels: "pending, Dev Team"
-          days-before-pr-stale: -1
-          days-before-pr-close: -1
-
-      - name: Close inactive issues
-        uses: actions/stale@v9
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          days-before-stale: ${{ env.daysBeforeStale }}
-          days-before-close: ${{ env.daysBeforeClose }}
-          stale-issue-label: "inactive"
-          stale-issue-message: |
-            This issue has been inactive for a prolonged period and will be closed automatically in ${{ env.daysBeforeClose }} days.
-            该问题已长时间处于闲置状态，${{ env.daysBeforeClose }} 天后将自动关闭。
-          exempt-issue-labels: "pending, Dev Team, kind/enhancement"
-          days-before-pr-stale: -1 # Completely disable stalling for PRs
-          days-before-pr-close: -1 # Completely disable closing for PRs
-
-          # Temporary to reduce the huge issues number
-          operations-per-run: 100
-          debug-only: false

.github/workflows/nightly-build.yml

@@ -7,41 +7,9 @@ on:
 
 permissions:
   contents: write
-  actions: write # Required for deleting artifacts
 
 jobs:
-  cleanup-artifacts:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Delete old artifacts
-        env:
-          GH_TOKEN: ${{ github.token }}
-          REPO: ${{ github.repository }}
-        run: |
-          # Calculate the date 14 days ago
-          cutoff_date=$(date -d "14 days ago" +%Y-%m-%d)
-
-          # List and delete artifacts older than cutoff date
-          gh api repos/$REPO/actions/artifacts --paginate | \
-          jq -r '.artifacts[] | select(.name | startswith("cherry-studio-nightly-")) | select(.created_at < "'$cutoff_date'") | .id' | \
-          while read artifact_id; do
-            echo "Deleting artifact $artifact_id"
-            gh api repos/$REPO/actions/artifacts/$artifact_id -X DELETE
-          done
-
-  check-repository:
-    runs-on: ubuntu-latest
-    outputs:
-      should_run: ${{ github.repository == 'CherryHQ/cherry-studio' }}
-    steps:
-      - name: Check if running in main repository
-        run: |
-          echo "Running in repository: ${{ github.repository }}"
-          echo "Should run: ${{ github.repository == 'CherryHQ/cherry-studio' }}"
-
   nightly-build:
-    needs: check-repository
-    if: needs.check-repository.outputs.should_run == 'true'
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -52,19 +20,12 @@ jobs:
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v4
-        with:
-          ref: develop
 
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
           node-version: 20
 
-      - name: macos-latest dependencies fix
-        if: matrix.os == 'macos-latest'
-        run: |
-          brew install python-setuptools
-
       - name: Install corepack
         run: corepack enable && corepack prepare yarn@4.6.0 --activate
 
@@ -98,7 +59,6 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
-          NODE_OPTIONS: --max-old-space-size=8192
 
       - name: Build Mac
         if: matrix.os == 'macos-latest'
@@ -113,17 +73,19 @@ jobs:
           APPLE_TEAM_ID: ${{ vars.APPLE_TEAM_ID }}
           RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NODE_OPTIONS: --max-old-space-size=8192
 
       - name: Build Windows
         if: matrix.os == 'windows-latest'
         run: |
           yarn build:npm windows
-          yarn build:win
+          yarn build:win:x64
+          yarn build:win:arm64
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
-          NODE_OPTIONS: --max-old-space-size=8192
+
+      - name: Replace spaces in filenames
+        run: node scripts/replace-spaces.js
 
       - name: Rename artifacts with nightly format
         shell: bash
@@ -134,24 +96,39 @@ jobs:
           # Windows artifacts - based on actual file naming pattern
           if [ "${{ matrix.os }}" == "windows-latest" ]; then
             # Setup installer
-            find dist -name "*-x64-setup.exe" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-x64-setup.exe \;
-            find dist -name "*-arm64-setup.exe" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-arm64-setup.exe \;
-
+            find dist -name "*setup.exe" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-setup.exe \;
+            
             # Portable exe
-            find dist -name "*-x64-portable.exe" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-x64-portable.exe \;
-            find dist -name "*-arm64-portable.exe" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-arm64-portable.exe \;
+            find dist -name "*portable.exe" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-portable.exe \;
+
+            # Rename blockmap files to match the new exe names
+            if [ -f "dist/*setup.exe.blockmap" ]; then
+              cp dist/*setup.exe.blockmap renamed-artifacts/cherry-studio-nightly-${DATE}-setup.exe.blockmap || true
+            fi
           fi
 
           # macOS artifacts
           if [ "${{ matrix.os }}" == "macos-latest" ]; then
+            # 处理arm64架构文件
             find dist -name "*-arm64.dmg" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-arm64.dmg \;
+            find dist -name "*-arm64.dmg.blockmap" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-arm64.dmg.blockmap \;
+            find dist -name "*-arm64.zip" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-arm64.zip \;
+            find dist -name "*-arm64.zip.blockmap" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-arm64.zip.blockmap \;
+            
+            # 处理x64架构文件
             find dist -name "*-x64.dmg" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-x64.dmg \;
+            find dist -name "*-x64.dmg.blockmap" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-x64.dmg.blockmap \;
+            find dist -name "*-x64.zip" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-x64.zip \;
+            find dist -name "*-x64.zip.blockmap" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-x64.zip.blockmap \;
           fi
 
           # Linux artifacts
           if [ "${{ matrix.os }}" == "ubuntu-latest" ]; then
-            find dist -name "*-x86_64.AppImage" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-x86_64.AppImage \;
-            find dist -name "*-arm64.AppImage" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-arm64.AppImage \;
+            find dist -name "*.AppImage" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}.AppImage \;
+            find dist -name "*.snap" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}.snap \;
+            find dist -name "*.deb" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}.deb \;
+            find dist -name "*.rpm" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}.rpm \;
+            find dist -name "*.tar.gz" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}.tar.gz \;
           fi
 
           # Copy update files

.github/workflows/pr-ci.yml

@@ -5,7 +5,6 @@ on:
   pull_request:
     branches:
       - main
-      - develop
 
 jobs:
   build:

.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
       tag:
         description: 'Release tag (e.g. v1.0.0)'
         required: true
-        default: 'v1.0.0'
+        default: 'v0.9.18'
   push:
     tags:
       - v*.*.*
@@ -26,8 +26,6 @@ jobs:
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v4
-        with:
-          ref: main
 
       - name: Get release tag
         id: get-tag
@@ -44,11 +42,6 @@ jobs:
         with:
           node-version: 20
 
-      - name: macos-latest dependencies fix
-        if: matrix.os == 'macos-latest'
-        run: |
-          brew install python-setuptools
-
       - name: Install corepack
         run: corepack enable && corepack prepare yarn@4.6.0 --activate
 
@@ -78,12 +71,10 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
-          NODE_OPTIONS: --max-old-space-size=8192
 
       - name: Build Mac
         if: matrix.os == 'macos-latest'
         run: |
-          sudo -H pip install setuptools
           yarn build:npm mac
           yarn build:mac
         env:
@@ -94,7 +85,6 @@ jobs:
           APPLE_TEAM_ID: ${{ vars.APPLE_TEAM_ID }}
           RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NODE_OPTIONS: --max-old-space-size=8192
 
       - name: Build Windows
         if: matrix.os == 'windows-latest'
@@ -104,7 +94,9 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
-          NODE_OPTIONS: --max-old-space-size=8192
+
+      - name: Replace spaces in filenames
+        run: node scripts/replace-spaces.js
 
       - name: Release
         uses: ncipollo/release-action@v1

.gitignore

@@ -46,8 +46,3 @@ local
 .aider*
 .cursorrules
 .cursor/rules
-
-# test
-coverage
-.vitest-cache
-vitest.config.*.timestamp-*

.vscode/launch.json

@@ -7,7 +7,6 @@
       "request": "launch",
       "cwd": "${workspaceRoot}",
       "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron-vite",
-      "runtimeVersion": "20",
       "windows": {
         "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron-vite.cmd"
       },

.vscode/settings.json

@@ -31,13 +31,5 @@
   "[markdown]": {
     "files.trimTrailingWhitespace": false
   },
-  "i18n-ally.localesPaths": ["src/renderer/src/i18n/locales"],
-  "i18n-ally.enabledFrameworks": ["react-i18next", "i18next"],
-  "i18n-ally.keystyle": "nested", // 翻译路径格式
-  "i18n-ally.sortKeys": true, // 排序
-  "i18n-ally.namespace": true, // 开启命名空间
-  "i18n-ally.enabledParsers": ["ts", "js", "json"], // 解析语言
-  "i18n-ally.sourceLanguage": "en-us", // 翻译源语言
-  "i18n-ally.displayLanguage": "zh-cn",
-  "i18n-ally.fullReloadOnChanged": true // 界面显示语言
+  "i18n-ally.localesPaths": ["src/renderer/src/i18n"]
 }

.yarn/patches/openai-npm-4.87.3-2b30a7685f.patch

@@ -0,0 +1,39 @@
+diff --git a/core.js b/core.js
+index ebb071d31cd5a14792b62814df072c5971e83300..31e1062d4a7f2422ffec79cf96a35dbb69fe89cb 100644
+--- a/core.js
++++ b/core.js
+@@ -157,7 +157,7 @@ class APIClient {
+             Accept: 'application/json',
+             'Content-Type': 'application/json',
+             'User-Agent': this.getUserAgent(),
+-            ...getPlatformHeaders(),
++            // ...getPlatformHeaders(),
+             ...this.authHeaders(opts),
+         };
+     }
+diff --git a/core.mjs b/core.mjs
+index 9c1a0264dcd73a85de1cf81df4efab9ce9ee2ab7..33f9f1f237f2eb2667a05dae1a7e3dc916f6bfff 100644
+--- a/core.mjs
++++ b/core.mjs
+@@ -150,7 +150,7 @@ export class APIClient {
+             Accept: 'application/json',
+             'Content-Type': 'application/json',
+             'User-Agent': this.getUserAgent(),
+-            ...getPlatformHeaders(),
++            // ...getPlatformHeaders(),
+             ...this.authHeaders(opts),
+         };
+     }
+diff --git a/error.mjs b/error.mjs
+index 7d19f5578040afa004bc887aab1725e8703d2bac..59ec725b6142299a62798ac4bdedb63ba7d9932c 100644
+--- a/error.mjs
++++ b/error.mjs
+@@ -36,7 +36,7 @@ export class APIError extends OpenAIError {
+         if (!status || !headers) {
+             return new APIConnectionError({ message, cause: castToError(errorResponse) });
+         }
+-        const error = errorResponse?.['error'];
++        const error = errorResponse?.['error'] || errorResponse;
+         if (status === 400) {
+             return new BadRequestError(status, error, message, headers);
+         }

.yarn/patches/openai-npm-4.96.0-0665b05cb9.patch

@@ -1,85 +0,0 @@
-diff --git a/core.js b/core.js
-index 862d66101f441fb4f47dfc8cff5e2d39e1f5a11e..6464bebbf696c39d35f0368f061ea4236225c162 100644
---- a/core.js
-+++ b/core.js
-@@ -159,7 +159,7 @@ class APIClient {
-             Accept: 'application/json',
-             'Content-Type': 'application/json',
-             'User-Agent': this.getUserAgent(),
--            ...getPlatformHeaders(),
-+            // ...getPlatformHeaders(),
-             ...this.authHeaders(opts),
-         };
-     }
-diff --git a/core.mjs b/core.mjs
-index 05dbc6cfde51589a2b100d4e4b5b3c1a33b32b89..789fbb4985eb952a0349b779fa83b1a068af6e7e 100644
---- a/core.mjs
-+++ b/core.mjs
-@@ -152,7 +152,7 @@ export class APIClient {
-             Accept: 'application/json',
-             'Content-Type': 'application/json',
-             'User-Agent': this.getUserAgent(),
--            ...getPlatformHeaders(),
-+            // ...getPlatformHeaders(),
-             ...this.authHeaders(opts),
-         };
-     }
-diff --git a/error.mjs b/error.mjs
-index 7d19f5578040afa004bc887aab1725e8703d2bac..59ec725b6142299a62798ac4bdedb63ba7d9932c 100644
---- a/error.mjs
-+++ b/error.mjs
-@@ -36,7 +36,7 @@ export class APIError extends OpenAIError {
-         if (!status || !headers) {
-             return new APIConnectionError({ message, cause: castToError(errorResponse) });
-         }
--        const error = errorResponse?.['error'];
-+        const error = errorResponse?.['error'] || errorResponse;
-         if (status === 400) {
-             return new BadRequestError(status, error, message, headers);
-         }
-diff --git a/resources/embeddings.js b/resources/embeddings.js
-index aae578404cb2d09a39ac33fc416f1c215c45eecd..25c54b05bdae64d5c3b36fbb30dc7c8221b14034 100644
---- a/resources/embeddings.js
-+++ b/resources/embeddings.js
-@@ -36,6 +36,9 @@ class Embeddings extends resource_1.APIResource {
-         // No encoding_format specified, defaulting to base64 for performance reasons
-         // See https://github.com/openai/openai-node/pull/1312
-         let encoding_format = hasUserProvidedEncodingFormat ? body.encoding_format : 'base64';
-+        if (body.model.includes('jina')) {
-+            encoding_format = undefined;
-+        }
-         if (hasUserProvidedEncodingFormat) {
-             Core.debug('Request', 'User defined encoding_format:', body.encoding_format);
-         }
-@@ -47,7 +50,7 @@ class Embeddings extends resource_1.APIResource {
-             ...options,
-         });
-         // if the user specified an encoding_format, return the response as-is
--        if (hasUserProvidedEncodingFormat) {
-+        if (hasUserProvidedEncodingFormat || body.model.includes('jina')) {
-             return response;
-         }
-         // in this stage, we are sure the user did not specify an encoding_format
-diff --git a/resources/embeddings.mjs b/resources/embeddings.mjs
-index 0df3c6cc79a520e54acb4c2b5f77c43b774035ff..aa488b8a11b2c413c0a663d9a6059d286d7b5faf 100644
---- a/resources/embeddings.mjs
-+++ b/resources/embeddings.mjs
-@@ -10,6 +10,9 @@ export class Embeddings extends APIResource {
-         // No encoding_format specified, defaulting to base64 for performance reasons
-         // See https://github.com/openai/openai-node/pull/1312
-         let encoding_format = hasUserProvidedEncodingFormat ? body.encoding_format : 'base64';
-+        if (body.model.includes('jina')) {
-+            encoding_format = undefined;
-+        }
-         if (hasUserProvidedEncodingFormat) {
-             Core.debug('Request', 'User defined encoding_format:', body.encoding_format);
-         }
-@@ -21,7 +24,7 @@ export class Embeddings extends APIResource {
-             ...options,
-         });
-         // if the user specified an encoding_format, return the response as-is
--        if (hasUserProvidedEncodingFormat) {
-+        if (hasUserProvidedEncodingFormat || body.model.includes('jina')) {
-             return response;
-         }
-         // in this stage, we are sure the user did not specify an encoding_format

CONTRIBUTING.md

@@ -1,73 +1,45 @@
-[中文](./docs/CONTRIBUTING.zh.md) | [English](./CONTRIBUTING.md)
+# Cherry Studio 贡献者指南
 
-# Cherry Studio Contributor Guide
+欢迎来到 Cherry Studio 的贡献者社区！我们致力于将 Cherry Studio 打造成一个长期提供价值的项目，并希望邀请更多的开发者加入我们的行列。无论您是经验丰富的开发者还是刚刚起步的初学者，您的贡献都将帮助我们更好地服务用户，提升软件质量。
 
-Welcome to the Cherry Studio contributor community! We are committed to making Cherry Studio a project that provides long-term value and hope to invite more developers to join us. Whether you are an experienced developer or a beginner just starting out, your contributions will help us better serve users and improve software quality.
+## 如何贡献
 
-## How to Contribute
+以下是您可以参与的几种方式：
 
-Here are several ways you can participate:
+1. **贡献代码**：帮助我们开发新功能或优化现有代码。请确保您的代码符合我们的编码标准，并通过所有测试。
 
-1.  **Contribute Code**: Help us develop new features or optimize existing code. Please ensure your code adheres to our coding standards and passes all tests.
+2. **修复 BUG**：如果您发现了 BUG，欢迎提交修复方案。请在提交前确认问题已被解决，并附上相关测试。
 
-2.  **Fix Bugs**: If you find a bug, you are welcome to submit a fix. Please confirm the issue is resolved before submitting and include relevant tests.
+3. **维护 Issue**：协助我们管理 GitHub 上的 issue，帮助标记、分类和解决问题。
 
-3.  **Maintain Issues**: Help us manage issues on GitHub by assisting with tagging, classifying, and resolving problems.
+4. **产品设计**：参与产品设计讨论，帮助我们改进用户体验和界面设计。
 
-4.  **Product Design**: Participate in product design discussions to help us improve user experience and interface design.
+5. **编写文档**：帮助我们完善用户手册、API 文档和开发者指南。
 
-5.  **Write Documentation**: Help us improve the user manual, API documentation, and developer guides.
+6. **社区维护**：参与社区讨论，帮助解答用户问题，促进社区活跃。
 
-6.  **Community Maintenance**: Participate in community discussions, help answer user questions, and promote community activity.
+7. **推广使用**：通过博客、社交媒体等渠道推广 Cherry Studio，吸引更多用户和开发者。
 
-7.  **Promote Usage**: Promote Cherry Studio through blogs, social media, and other channels to attract more users and developers.
+## 开始贡献
 
-## Before You Start
+1. **Fork 仓库**：在 GitHub 上 fork 我们的仓库，并将其克隆到本地。
 
-Please make sure you have read the [Code of Conduct](CODE_OF_CONDUCT.md) and the [LICENSE](LICENSE).
+2. **创建分支**：为您要进行的更改创建一个新的分支。
 
-## Getting Started
+3. **提交更改**：在本地进行更改并提交。请确保您的提交信息清晰明了。
 
-To help you get familiar with the codebase, we recommend tackling issues tagged with one or more of the following labels: [good-first-issue](https://github.com/CherryHQ/cherry-studio/labels/good%20first%20issue), [help-wanted](https://github.com/CherryHQ/cherry-studio/labels/help%20wanted), or [kind/bug](https://github.com/CherryHQ/cherry-studio/labels/kind%2Fbug). Any help is welcome.
+4. **发起 Pull Request**：将您的更改推送到 GitHub，并发起 Pull Request。请描述您的更改内容和原因。
 
-### Testing
+### 其他建议
 
-Features without tests are considered non-existent. To ensure code is truly effective, relevant processes should be covered by unit tests and functional tests. Therefore, when considering contributions, please also consider testability. All tests can be run locally without dependency on CI. Please refer to the "Testing" section in the [Developer Guide](docs/dev.md).
+- **联系开发者**：在提交 PR 之前，您可以先和开发者进行联系，共同探讨或者获取帮助。
+- **成为核心开发者**：如果您能够稳定为项目贡献，恭喜您可以成为项目核心开发者，获取到项目成员身份。
 
-### Automated Testing for Pull Requests
+## 联系我们
 
-Automated tests are triggered on pull requests (PRs) opened by members of the Cherry Studio organization, except for draft PRs. PRs opened by new contributors will initially be marked with the `needs-ok-to-test` label and will not be automatically tested. Once a Cherry Studio organization member adds `/ok-to-test` to the PR, the test pipeline will be created.
+如果您有任何问题或建议，欢迎通过以下方式联系我们：
 
-### Consider Opening Your Pull Request as a Draft
-
-Not all pull requests are ready for review when created. This might be because the author wants to start a discussion, they are not entirely sure if the changes are heading in the right direction, or the changes are not yet complete. Please consider creating these PRs as [draft pull requests](https://github.blog/2019-02-14-introducing-draft-pull-requests/). Draft PRs are skipped by CI, thus saving CI resources. This also means reviewers will not be automatically assigned, and the community will understand that this PR is not yet ready for review.
-Reviewers will be assigned after you mark the draft pull request as ready for review.
-
-### Contributor Compliance with Project Terms
-
-We require every contributor to certify that they have the right to legally contribute to our project. Contributors express this by consciously signing their commits, thereby indicating their compliance with the [LICENSE](LICENSE).
-A signed commit is one where the commit message includes the following:
-
-You can generate a signed commit using the following command [git commit --signoff](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---signoff):
-
-```
-git commit --signoff -m "Your commit message"
-```
-
-### Getting Code Reviewed/Merged
-
-Maintainers are here to help you implement your use case within a reasonable timeframe. They will do their best to review your code and provide constructive feedback promptly. However, if you get stuck during the review process or feel your Pull Request is not receiving the attention it deserves, please contact us via comments in the Issue or through the [Community](README.md#-community).
-
-### Other Suggestions
-
-- **Contact Developers**: Before submitting a PR, you can contact the developers first to discuss or get help.
-- **Become a Core Developer**: If you contribute to the project consistently, congratulations, you can become a core developer and gain project membership status. Please check our [Membership Guide](https://github.com/CherryHQ/community/blob/main/docs/membership.en.md).
-
-## Contact Us
-
-If you have any questions or suggestions, feel free to contact us through the following ways:
-
-- WeChat: kangfenmao
+- 微信：kangfenmao
 - [GitHub Issues](https://github.com/CherryHQ/cherry-studio/issues)
 
-Thank you for your support and contributions! We look forward to working with you to make Cherry Studio a better product.
+感谢您的支持和贡献！我们期待与您一起将 Cherry Studio 打造成更好的产品。

LICENSE

@@ -1,87 +1,62 @@
-**许可协议 (Licensing)**
+**许可协议**
 
-本项目采用**区分用户的双重许可 (User-Segmented Dual Licensing)** 模式。
+采用 Apache License 2.0 修改版许可，并附加以下条件：
 
-**核心原则：**
+**一. 商用许可**
 
-* **个人用户 和 10人及以下企业/组织:** 默认适用 **GNU Affero 通用公共许可证 v3.0 (AGPLv3)**。  
-* **超过10人的企业/组织:** **必须** 获取 **商业许可证 (Commercial License)**。
+在以下任何一种情况下，您需要联系我们并获得明确的书面商业授权后，方可继续使用 Cherry Studio 材料：
 
-定义：“10人及以下”  
-指在您的组织（包括公司、非营利组织、政府机构、教育机构等任何实体）中，能够访问、使用或以任何方式直接或间接受益于本软件（Cherry Studio）功能的个人总数不超过10人。这包括但不限于开发者、测试人员、运营人员、最终用户、通过集成系统间接使用者等。
+1. **修改与衍生**： 您对 Cherry Studio 材料进行修改或基于其进行衍生开发（包括但不限于修改应用名称、Logo、代码、功能、界面，数据等）。
+2. **企业服务**： 在您的企业内部，或为企业客户提供基于 Cherry Studio 的服务，且该服务支持 10 人及以上累计用户使用。
+3. **硬件捆绑销售**： 您将 Cherry Studio 预装或集成到硬件设备或产品中进行捆绑销售。
+4. **政府或教育机构大规模采购**： 您的使用场景属于政府或教育机构的大规模采购项目，特别是涉及安全、数据隐私等敏感需求时。
+5. **面向公众的公有云服务**：基于 Cherry Studio，提供面向公众的公有云服务。
+
+**二. 贡献者协议**
+
+作为 Cherry Studio 的贡献者，您应当同意以下条款：
+
+1. **许可调整**：生产者有权根据需要对开源协议进行调整，使其更加严格或宽松。
+2. **商业用途**：您贡献的代码可能会被用于商业用途，包括但不限于云业务运营。
+
+**三. 其他条款**
+
+1. 本协议条款的解释权归 Cherry Studio 开发者所有。
+2. 本协议可能根据实际情况进行更新，更新时将通过本软件通知用户。
+
+如有任何问题或需申请商业授权，请联系 Cherry Studio 开发团队。
+
+除上述特定条件外，其他所有权利和限制均遵循 Apache License 2.0。有关 Apache License 2.0 的详细信息，请访问 http://www.apache.org/licenses/LICENSE-2.0。
 
 ---
 
-**1. 开源许可证 (Open Source License): AGPLv3 - 适用于个人及10人及以下组织**
 
-* 如果您是个人用户，或者您的组织满足上述“10人及以下”的定义，您可以在 **AGPLv3** 的条款下自由使用、修改和分发 Cherry Studio。AGPLv3 的完整文本可以访问 [https://www.gnu.org/licenses/agpl-3.0.html](https://www.gnu.org/licenses/agpl-3.0.html) 获取。  
-* **核心义务：** AGPLv3 的一个关键要求是，如果您修改了 Cherry Studio 并通过网络提供服务，或者分发了修改后的版本，您必须以 AGPLv3 许可证向接收者提供相应的**完整源代码**。即使您符合“10人及以下”的标准，如果您希望避免此源代码公开义务，您也需要考虑获取商业许可证（见下文）。  
-* 使用前请务必仔细阅读并理解 AGPLv3 的所有条款。
+**License Agreement**
 
-**2. 商业许可证 (Commercial License) - 适用于超过10人的组织，或希望规避 AGPLv3 义务的用户**
+This software is licensed under a modified version of the Apache License 2.0, with the following additional conditions。
 
-* **强制要求：** 如果您的组织**不**满足上述“10人及以下”的定义（即有11人或更多人可以访问、使用或受益于本软件），您**必须**联系我们获取并签署一份商业许可证才能使用 Cherry Studio。  
-* **自愿选择：** 即使您的组织满足“10人及以下”的条件，但如果您的使用场景**无法满足 AGPLv3 的条款要求**（特别是关于**源代码公开**的义务），或者您需要 AGPLv3 **未提供**的特定商业条款（如保证、赔偿、无 Copyleft 限制等），您也**必须**联系我们获取并签署一份商业许可证。  
-* **需要商业许可证的常见情况包括（但不限于）：**  
-  * 您的组织规模超过10人。  
-  * （无论组织规模）您希望分发修改过的 Cherry Studio 版本，但**不希望**根据 AGPLv3 公开您修改部分的源代码。  
-  * （无论组织规模）您希望基于修改过的 Cherry Studio 提供网络服务（SaaS），但**不希望**根据 AGPLv3 向服务使用者提供修改后的源代码。  
-  * （无论组织规模）您的公司政策、客户合同或项目要求不允许使用 AGPLv3 许可的软件，或要求闭源分发及保密。  
-* 商业许可证将为您提供豁免 AGPLv3 义务（如源代码公开）的权利，并可能包含额外的商业保障条款。  
-* **获取商业许可：** 请通过邮箱 **bd@cherry-ai.com** 联系 Cherry Studio 开发团队洽谈商业授权事宜。
+**I. Commercial Licensing**
 
-**3. 贡献 (Contributions)**
+You must contact us and obtain explicit written commercial authorization to continue using Cherry Studio materials under any of the following circumstances:
 
-* 我们欢迎社区对 Cherry Studio 的贡献。所有向本项目提交的贡献都将被视为在 **AGPLv3** 许可证下提供。  
-* 通过向本项目提交贡献（例如通过 Pull Request），即表示您同意您的代码以 AGPLv3 许可证授权给本项目及所有后续使用者（无论这些使用者最终遵循 AGPLv3 还是商业许可）。  
-* 您也理解并同意，您的贡献可能会被包含在根据商业许可证分发的 Cherry Studio 版本中。
+1. **Modifications and Derivatives:** You modify Cherry Studio materials or perform derivative development based on them (including but not limited to changing the application’s name, logo, code, functionality, user interface, data, etc.).
+2. **Enterprise Services:** You use Cherry Studio internally within your enterprise, or you provide Cherry Studio-based services for enterprise customers, and such services support cumulative usage by 10 or more users.
+3. **Hardware Bundling and Sales:** You pre-install or integrate Cherry Studio into hardware devices or products for bundled sale.
+4. **Large-scale Procurement by Government or Educational Institutions:** Your usage scenario involves large-scale procurement projects by government or educational institutions, especially in cases involving sensitive requirements such as security and data privacy.
+5. **Public Cloud Services:** You provide public cloud-based product services utilizing Cherry Studio.
 
-**4. 其他条款 (Other Terms)**
+**II. Contributor Agreement**
 
-* 关于商业许可证的具体条款和条件，以双方签署的正式商业许可协议为准。  
-* 项目维护者保留根据需要更新本许可政策（包括用户规模定义和阈值）的权利。相关更新将通过项目官方渠道（如代码仓库、官方网站）进行通知。
+As a contributor to Cherry Studio, you must agree to the following terms:
 
----
+1. **License Adjustments:** The producer reserves the right to adjust the open-source license as necessary, making it more strict or permissive.
+2. **Commercial Usage:** Your contributed code may be used commercially, including but not limited to cloud business operations.
 
-**Licensing**
+**III. Other Terms**
 
-This project employs a **User-Segmented Dual Licensing** model.
+1. Cherry Studio developers reserve the right of final interpretation of these agreement terms.
+2. This agreement may be updated according to practical circumstances, and users will be notified of updates through this software.
 
-**Core Principle:**
+If you have any questions or need to apply for commercial authorization, please contact the Cherry Studio development team.
 
-* **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**.
-
-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.
-
----
-
-**1. Open Source License: AGPLv3 - For Individuals and Organizations of 10 or Fewer**
-
-* 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.
-
-**2. Commercial License - For Organizations with More Than 10 Individuals, or Users Needing to Avoid AGPLv3 Obligations**
-
-* **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.
-
-**3. Contributions**
-
-* 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.
-
-**4. Other Terms**
-
-* 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).
+Other than these specific conditions, all remaining rights and restrictions follow the Apache License 2.0. For more detailed information regarding Apache License 2.0, please visit http://www.apache.org/licenses/LICENSE-2.0.

README.md

@@ -13,22 +13,24 @@
 
 Cherry Studio is a desktop client that supports for multiple LLM providers, available on Windows, Mac and Linux.
 
-👏 Join [Telegram Group](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/wez8HtpxqQ) | [QQ Group(575014769)](https://qm.qq.com/q/lo0D4qVZKi)
+👏 Join [Telegram Group](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/wez8HtpxqQ) | [QQ Group(472019156)](https://qm.qq.com/q/CbZiBWwCXu)
 
 ❤️ Like Cherry Studio? Give it a star 🌟 or [Sponsor](docs/sponsor.md) to support the development!
 
 # 📖 Guide
 
-<https://docs.cherry-ai.com>
+https://docs.cherry-ai.com
 
 # 🌠 Screenshot
 
-![](https://github.com/user-attachments/assets/082efa42-c4df-4863-a9cb-80435cecce0f)
-![](https://github.com/user-attachments/assets/f8411a65-c51f-47d3-9273-62ae384cc6f1)
-![](https://github.com/user-attachments/assets/0d235b3e-65ae-45ab-987f-8dbe003c52be)
+![](https://github.com/user-attachments/assets/28585d83-4bf0-4714-b561-8c7bf57cc600)
+![](https://github.com/user-attachments/assets/8576863a-f632-4776-bc12-657eeced9da3)
+![](https://github.com/user-attachments/assets/790790d7-b462-48dd-bde1-91c1697a4648)
 
 # 🌟 Key Features
 
+![](https://github.com/user-attachments/assets/7b4f2f78-5cbe-4be8-9aec-f98d8405a505)
+
 1. **Diverse LLM Provider Support**:
 
 - ☁️ Major LLM Cloud Services: OpenAI, Gemini, Anthropic, and more
@@ -82,11 +84,9 @@ Cherry Studio is a desktop client that supports for multiple LLM providers, avai
 
 # 🌈 Theme
 
-- Theme Gallery: <https://cherrycss.com>
-- Aero Theme: <https://github.com/hakadao/CherryStudio-Aero>
-- PaperMaterial Theme: <https://github.com/rainoffallingstar/CherryStudio-PaperMaterial>
-- Claude dynamic-style: <https://github.com/bjl101501/CherryStudio-Claudestyle-dynamic>
-- Maple Neon Theme: <https://github.com/BoningtonChen/CherryStudio_themes>
+- Theme Gallery: https://cherrycss.com
+- Aero Theme: https://github.com/hakadao/CherryStudio-Aero
+- PaperMaterial Theme: https://github.com/rainoffallingstar/CherryStudio-PaperMaterial
 
 Welcome PR for more themes
 
@@ -94,10 +94,6 @@ Welcome PR for more themes
 
 Refer to the [development documentation](docs/dev.md)
 
-Refer to the [Architecture overview documentation](https://deepwiki.com/CherryHQ/cherry-studio)
-
-Refer to the [Branching Strategy](docs/branching-strategy.md) for contribution guidelines
-
 # 🤝 Contributing
 
 We welcome contributions to Cherry Studio! Here are some ways you can contribute:
@@ -148,7 +144,7 @@ Thank you for your support and contributions!
 
 # ✉️ Contact
 
-<yinsenho@cherry-ai.com>
+yinsenho@cherry-ai.com
 
 # ⭐️ Star History
 

dev-app-update.yml

@@ -1,8 +1,8 @@
 # provider: generic
 # url: http://127.0.0.1:8080
 # updaterCacheDirName: cherry-studio-updater
-# provider: github
-# repo: cherry-studio
-# owner: kangfenmao
-provider: generic
-url: https://releases.cherry-ai.com
+provider: github
+repo: cherry-studio
+owner: kangfenmao
+# provider: generic
+# url: https://cherrystudio.ocool.online

docs/CONTRIBUTING.zh.md

@@ -1,77 +0,0 @@
-# Cherry Studio 贡献者指南
-
-[**English**](../CONTRIBUTING.md) | [**中文**](./CONTRIBUTING.zh.md)
-
-欢迎来到 Cherry Studio 的贡献者社区！我们致力于将 Cherry Studio 打造成一个长期提供价值的项目，并希望邀请更多的开发者加入我们的行列。无论您是经验丰富的开发者还是刚刚起步的初学者，您的贡献都将帮助我们更好地服务用户，提升软件质量。
-
-## 如何贡献
-
-以下是您可以参与的几种方式：
-
-1. **贡献代码**：帮助我们开发新功能或优化现有代码。请确保您的代码符合我们的编码标准，并通过所有测试。
-
-2. **修复 BUG**：如果您发现了 BUG，欢迎提交修复方案。请在提交前确认问题已被解决，并附上相关测试。
-
-3. **维护 Issue**：协助我们管理 GitHub 上的 issue，帮助标记、分类和解决问题。
-
-4. **产品设计**：参与产品设计讨论，帮助我们改进用户体验和界面设计。
-
-5. **编写文档**：帮助我们完善用户手册、API 文档和开发者指南。
-
-6. **社区维护**：参与社区讨论，帮助解答用户问题，促进社区活跃。
-
-7. **推广使用**：通过博客、社交媒体等渠道推广 Cherry Studio，吸引更多用户和开发者。
-
-## 开始之前
-
-请确保阅读了[行为准则](CODE_OF_CONDUCT.md)和[LICENSE](LICENSE)。
-
-## 开始贡献
-
-为了让您更熟悉代码，建议您处理一些标记有以下标签之一或多个的问题：[good-first-issue](https://github.com/CherryHQ/cherry-studio/labels/good%20first%20issue)、[help-wanted](https://github.com/CherryHQ/cherry-studio/labels/help%20wanted) 或 [kind/bug](https://github.com/CherryHQ/cherry-studio/labels/kind%2Fbug)。任何帮助都会收到欢迎。
-
-### 测试
-
-未经测试的功能等同于不存在。为确保代码真正有效，应通过单元测试和功能测试覆盖相关流程。因此，在考虑贡献时，也请考虑可测试性。所有测试均可本地运行，无需依赖 CI。请参阅[开发者指南](docs/dev.md#test)中的“Test”部分。
-
-### 拉取请求的自动化测试
-
-自动化测试会在 Cherry Studio 组织成员开启的拉取请求（PR）上触发，草稿 PR 除外。新贡献者开启的 PR 最初会标记为 needs-ok-to-test 标签且不自动测试。待 Cherry Studio 组织成员在 PR 上添加 /ok-to-test 后，测试通道将被创建。
-
-### 考虑将您的拉取请求作为草稿打开
-
-并非所有拉取请求在创建时就准备好接受审查。这可能是因为作者想发起讨论，或者他们不完全确定更改是否朝着正确的方向发展，甚至可能是因为更改尚未完成。请考虑将这些 PR 创建为[草稿拉取请求](https://github.blog/2019-02-14-introducing-draft-pull-requests/)。草稿 PR 会被CI跳过，从而节省CI资源。这也意味着审阅者不会被自动分配，社区会理解此 PR 尚未准备好接受审阅。
-在您将草稿拉取请求标记为准备审核后，审核人员将被分配
-
-### 贡献者遵守项目条款
-
-我们要求每位贡献者证明他们有权合法地为我们的项目做出贡献。贡献者通过有意识地签署他们的提交来表达这一点，并通过这一行为表明他们遵守许可证[LICENSE](LICENSE)。
-签名提交是指提交信息中包含以下内容的提交：
-
-```
-Signed-off-by: Your Name <your.email@example.com>
-```
-
-您可以通过以下命令[git commit --signoff](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---signoff)生成签名提交：
-
-```
-git commit --signoff -m "Your commit message"
-```
-
-### 获取代码审查/合并
-
-维护者在此帮助您在合理时间内实现您的用例。他们会尽力在合理时间内审查您的代码并提供建设性反馈。但如果您在审查过程中受阻，或认为您的 Pull Request 未得到应有的关注，请通过 Issue 中的评论或者[社群](README.md#-community)联系我们
-
-### 其他建议
-
-- **联系开发者**：在提交 PR 之前，您可以先和开发者进行联系，共同探讨或者获取帮助。
-- **成为核心开发者**：如果您能够稳定为项目贡献，恭喜您可以成为项目核心开发者，获取到项目成员身份。请查看我们的[成员指南](https://github.com/CherryHQ/community/blob/main/membership.md)
-
-## 联系我们
-
-如果您有任何问题或建议，欢迎通过以下方式联系我们：
-
-- 微信：kangfenmao
-- [GitHub Issues](https://github.com/CherryHQ/cherry-studio/issues)
-
-感谢您的支持和贡献！我们期待与您一起将 Cherry Studio 打造成更好的产品。

docs/README.ja.md

@@ -14,7 +14,7 @@
 
 Cherry Studio は、複数の LLM プロバイダーをサポートするデスクトップクライアントで、Windows、Mac、Linux で利用可能です。
 
-👏 [Telegram](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/wez8HtpxqQ) | [QQグループ(575014769)](https://qm.qq.com/q/lo0D4qVZKi)
+👏 [Telegram](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/wez8HtpxqQ) | [QQグループ(472019156)](https://qm.qq.com/q/CbZiBWwCXu)
 
 ❤️ Cherry Studio をお気に入りにしましたか？小さな星をつけてください 🌟 または [スポンサー](sponsor.md) をして開発をサポートしてください！❤️
 
@@ -24,12 +24,14 @@ https://docs.cherry-ai.com
 
 # 🌠 スクリーンショット
 
-![](https://github.com/user-attachments/assets/082efa42-c4df-4863-a9cb-80435cecce0f)
-![](https://github.com/user-attachments/assets/f8411a65-c51f-47d3-9273-62ae384cc6f1)
-![](https://github.com/user-attachments/assets/0d235b3e-65ae-45ab-987f-8dbe003c52be)
+![](https://github.com/user-attachments/assets/28585d83-4bf0-4714-b561-8c7bf57cc600)
+![](https://github.com/user-attachments/assets/8576863a-f632-4776-bc12-657eeced9da3)
+![](https://github.com/user-attachments/assets/790790d7-b462-48dd-bde1-91c1697a4648)
 
 # 🌟 主な機能
 
+![](https://github.com/user-attachments/assets/7b4f2f78-5cbe-4be8-9aec-f98d8405a505)
+
 1. **多様な LLM サービス対応**：
 
 - ☁️ 主要な LLM クラウドサービス対応：OpenAI、Gemini、Anthropic など
@@ -83,11 +85,8 @@ https://docs.cherry-ai.com
 
 # 🌈 テーマ
 
-- テーマギャラリー: https://cherrycss.com
-- Aero テーマ: https://github.com/hakadao/CherryStudio-Aero
-- PaperMaterial テーマ: https://github.com/rainoffallingstar/CherryStudio-PaperMaterial
-- Claude テーマ: https://github.com/bjl101501/CherryStudio-Claudestyle-dynamic
-- メープルネオンテーマ: https://github.com/BoningtonChen/CherryStudio_themes
+テーマギャラリー: https://cherrycss.com  
+Aero テーマ: https://github.com/hakadao/CherryStudio-Aero
 
 より多くのテーマのPRを歓迎します
 

docs/README.zh.md

@@ -14,7 +14,7 @@
 
 Cherry Studio 是一款支持多个大语言模型（LLM）服务商的桌面客户端，兼容 Windows、Mac 和 Linux 系统。
 
-👏 欢迎加入 [Telegram 群组](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/wez8HtpxqQ) | [QQ群(575014769)](https://qm.qq.com/q/lo0D4qVZKi)
+👏 欢迎加入 [Telegram 群组](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/wez8HtpxqQ) | [QQ群(472019156)](https://qm.qq.com/q/CbZiBWwCXu)
 
 ❤️ 喜欢 Cherry Studio? 点亮小星星 🌟 或 [赞助开发者](sponsor.md)! ❤️
 
@@ -24,12 +24,14 @@ https://docs.cherry-ai.com
 
 # 🌠 界面
 
-![](https://github.com/user-attachments/assets/082efa42-c4df-4863-a9cb-80435cecce0f)
-![](https://github.com/user-attachments/assets/f8411a65-c51f-47d3-9273-62ae384cc6f1)
-![](https://github.com/user-attachments/assets/0d235b3e-65ae-45ab-987f-8dbe003c52be)
+![](https://github.com/user-attachments/assets/28585d83-4bf0-4714-b561-8c7bf57cc600)
+![](https://github.com/user-attachments/assets/8576863a-f632-4776-bc12-657eeced9da3)
+![](https://github.com/user-attachments/assets/790790d7-b462-48dd-bde1-91c1697a4648)
 
 # 🌟 主要特性
 
+![](https://github.com/user-attachments/assets/995910f3-177a-4d1e-97ea-04e3b009ba36)
+
 1. **多样化 LLM 服务支持**：
 
 - ☁️ 支持主流 LLM 云服务：OpenAI、Gemini、Anthropic、硅基流动等
@@ -83,11 +85,8 @@ https://docs.cherry-ai.com
 
 # 🌈 主题
 
-- 主题库：https://cherrycss.com
-- Aero 主题：https://github.com/hakadao/CherryStudio-Aero
-- PaperMaterial 主题: https://github.com/rainoffallingstar/CherryStudio-PaperMaterial
-- 仿Claude 主题: https://github.com/bjl101501/CherryStudio-Claudestyle-dynamic
-- 霓虹枫叶字体主题: https://github.com/BoningtonChen/CherryStudio_themes
+主题库：https://cherrycss.com  
+Aero 主题：https://github.com/hakadao/CherryStudio-Aero
 
 欢迎 PR 更多主题
 
@@ -114,7 +113,7 @@ https://docs.cherry-ai.com
 3. **提交更改**：提交并推送您的更改。
 4. **打开 Pull Request**：描述您的更改和原因。
 
-有关更详细的指南，请参阅我们的 [贡献指南](./CONTRIBUTING.zh.md)。
+有关更详细的指南，请参阅我们的 [贡献指南](../CONTRIBUTING.md)。
 
 感谢您的支持和贡献！
 

docs/branching-strategy.md

@@ -1,51 +0,0 @@
-# 🌿 Branching Strategy
-
-Cherry Studio follows a structured branching strategy to maintain code quality and streamline the development process:
-
-## Main Branches
-
-- `main`: Production-ready branch containing stable releases
-
-  - All code here is thoroughly tested and ready for production
-  - Direct commits are not allowed - changes must come through pull requests
-  - Each merge to main represents a new release
-
-- `develop` (default): Primary development branch
-  - Contains the latest delivered development changes for the next release
-  - Relatively stable but may contain features in progress
-  - This is the default branch for development
-
-## Contributing Branches
-
-When contributing to Cherry Studio, please follow these guidelines:
-
-1. **For bug fixes:**
-
-   - Create a branch from `develop`
-   - Name format: `fix/issue-number-brief-description`
-   - Submit pull request back to `develop`
-
-2. **For new features:**
-
-   - Create a branch from `develop`
-   - Name format: `feature/issue-number-brief-description`
-   - Submit pull request back to `develop`
-
-3. **For documentation:**
-
-   - Create a branch from `develop`
-   - Name format: `docs/brief-description`
-   - Submit pull request back to `develop`
-
-4. **For critical hotfixes:**
-   - Create a branch from `main`
-   - Name format: `hotfix/issue-number-brief-description`
-   - Submit pull request to both `main` and `develop`
-
-## Pull Request Guidelines
-
-- Always create pull requests against the `develop` branch unless fixing a critical production issue
-- Ensure your branch is up to date with the latest `develop` changes before submitting
-- Include relevant issue numbers in your PR description
-- Make sure all tests pass and code meets our quality standards
-- Critical hotfixes may be submitted against `main` but must also be merged into `develop`

docs/dev.md

@@ -37,12 +37,6 @@ yarn install
 yarn dev
 ```
 
-### Test
-
-```bash
-yarn test
-```
-
 ### Build
 
 ```bash

docs/technical/Message.md

@@ -1,3 +0,0 @@
-# 消息的生命周期
-
-![image](./message-lifecycle.png)

docs/technical/how-to-use-messageBlock.md

@@ -1,127 +0,0 @@
-# messageBlock.ts 使用指南
-
-该文件定义了用于管理应用程序中所有 `MessageBlock` 实体的 Redux Slice。它使用 Redux Toolkit 的 `createSlice` 和 `createEntityAdapter` 来高效地处理规范化的状态，并提供了一系列 actions 和 selectors 用于与消息块数据交互。
-
-## 核心目标
-
-- **状态管理**: 集中管理所有 `MessageBlock` 的状态。`MessageBlock` 代表消息中的不同内容单元（如文本、代码、图片、引用等）。
-- **规范化**: 使用 `createEntityAdapter` 将 `MessageBlock` 数据存储在规范化的结构中（`{ ids: [], entities: {} }`），这有助于提高性能和简化更新逻辑。
-- **可预测性**: 提供明确的 actions 来修改状态，并通过 selectors 安全地访问状态。
-
-## 关键概念
-
-- **Slice (`createSlice`)**: Redux Toolkit 的核心 API，用于创建包含 reducer 逻辑、action creators 和初始状态的 Redux 模块。
-- **Entity Adapter (`createEntityAdapter`)**: Redux Toolkit 提供的工具，用于简化对规范化数据的 CRUD（创建、读取、更新、删除）操作。它会自动生成 reducer 函数和 selectors。
-- **Selectors**: 用于从 Redux store 中派生和计算数据的函数。Selectors 可以被记忆化（memoized），以提高性能。
-
-## State 结构
-
-`messageBlocks` slice 的状态结构由 `createEntityAdapter` 定义，大致如下：
-
-```typescript
-{
-  ids: string[]; // 存储所有 MessageBlock ID 的有序列表
-  entities: { [id: string]: MessageBlock }; // 按 ID 存储 MessageBlock 对象的字典
-  loadingState: 'idle' | 'loading' | 'succeeded' | 'failed'; // (可选) 其他状态，如加载状态
-  error: string | null; // (可选) 错误信息
-}
-```
-
-## Actions
-
-该 slice 导出以下 actions (由 `createSlice` 和 `createEntityAdapter` 自动生成或自定义)：
-
-- **`upsertOneBlock(payload: MessageBlock)`**:
-
-  - 添加一个新的 `MessageBlock` 或更新一个已存在的 `MessageBlock`。如果 payload 中的 `id` 已存在，则执行更新；否则执行插入。
-
-- **`upsertManyBlocks(payload: MessageBlock[])`**:
-
-  - 添加或更新多个 `MessageBlock`。常用于批量加载数据（例如，加载一个 Topic 的所有消息块）。
-
-- **`removeOneBlock(payload: string)`**:
-
-  - 根据提供的 `id` (payload) 移除单个 `MessageBlock`。
-
-- **`removeManyBlocks(payload: string[])`**:
-
-  - 根据提供的 `id` 数组 (payload) 移除多个 `MessageBlock`。常用于删除消息或清空 Topic 时清理相关的块。
-
-- **`removeAllBlocks()`**:
-
-  - 移除 state 中的所有 `MessageBlock` 实体。
-
-- **`updateOneBlock(payload: { id: string; changes: Partial<MessageBlock> })`**:
-
-  - 更新一个已存在的 `MessageBlock`。`payload` 需要包含块的 `id` 和一个包含要更改的字段的 `changes` 对象。
-
-- **`setMessageBlocksLoading(payload: 'idle' | 'loading')`**:
-
-  - (自定义) 设置 `loadingState` 属性。
-
-- **`setMessageBlocksError(payload: string)`**:
-  - (自定义) 设置 `loadingState` 为 `'failed'` 并记录错误信息。
-
-**使用示例 (在 Thunk 或其他 Dispatch 的地方):**
-
-```typescript
-import { upsertOneBlock, removeManyBlocks, updateOneBlock } from './messageBlock'
-import store from './store' // 假设这是你的 Redux store 实例
-
-// 添加或更新一个块
-const newBlock: MessageBlock = {
-  /* ... block data ... */
-}
-store.dispatch(upsertOneBlock(newBlock))
-
-// 更新一个块的内容
-store.dispatch(updateOneBlock({ id: blockId, changes: { content: 'New content' } }))
-
-// 删除多个块
-const blockIdsToRemove = ['id1', 'id2']
-store.dispatch(removeManyBlocks(blockIdsToRemove))
-```
-
-## Selectors
-
-该 slice 导出由 `createEntityAdapter` 生成的基础 selectors，并通过 `messageBlocksSelectors` 对象访问：
-
-- **`messageBlocksSelectors.selectIds(state: RootState): string[]`**: 返回包含所有块 ID 的数组。
-- **`messageBlocksSelectors.selectEntities(state: RootState): { [id: string]: MessageBlock }`**: 返回块 ID 到块对象的映射字典。
-- **`messageBlocksSelectors.selectAll(state: RootState): MessageBlock[]`**: 返回包含所有块对象的数组。
-- **`messageBlocksSelectors.selectTotal(state: RootState): number`**: 返回块的总数。
-- **`messageBlocksSelectors.selectById(state: RootState, id: string): MessageBlock | undefined`**: 根据 ID 返回单个块对象，如果找不到则返回 `undefined`。
-
-**此外，还提供了一个自定义的、记忆化的 selector：**
-
-- **`selectFormattedCitationsByBlockId(state: RootState, blockId: string | undefined): Citation[]`**:
-  - 接收一个 `blockId`。
-  - 如果该 ID 对应的块是 `CITATION` 类型，则提取并格式化其包含的引用信息（来自网页搜索、知识库等），进行去重和重新编号，最后返回一个 `Citation[]` 数组，用于在 UI 中显示。
-  - 如果块不存在或类型不匹配，返回空数组 `[]`。
-  - 这个 selector 封装了处理不同引用来源（Gemini, OpenAI, OpenRouter, Zhipu 等）的复杂逻辑。
-
-**使用示例 (在 React 组件或 `useSelector` 中):**
-
-```typescript
-import { useSelector } from 'react-redux'
-import { messageBlocksSelectors, selectFormattedCitationsByBlockId } from './messageBlock'
-import type { RootState } from './store'
-
-// 获取所有块
-const allBlocks = useSelector(messageBlocksSelectors.selectAll)
-
-// 获取特定 ID 的块
-const specificBlock = useSelector((state: RootState) => messageBlocksSelectors.selectById(state, someBlockId))
-
-// 获取特定引用块格式化后的引用列表
-const formattedCitations = useSelector((state: RootState) => selectFormattedCitationsByBlockId(state, citationBlockId))
-
-// 在组件中使用引用数据
-// {formattedCitations.map(citation => ...)}
-```
-
-## 集成
-
-`messageBlock.ts` slice 通常与 `messageThunk.ts` 中的 Thunks 紧密协作。Thunks 负责处理异步逻辑（如 API 调用、数据库操作），并在需要时 dispatch `messageBlock` slice 的 actions 来更新状态。例如，当 `messageThunk` 接收到流式响应时，它会 dispatch `upsertOneBlock` 或 `updateOneBlock` 来实时更新对应的 `MessageBlock`。同样，删除消息的 Thunk 会 dispatch `removeManyBlocks`。
-
-理解 `messageBlock.ts` 的职责是管理**状态本身**，而 `messageThunk.ts` 负责**触发状态变更**的异步流程，这对于维护清晰的应用架构至关重要。

docs/technical/how-to-use-messageThunk.md

@@ -1,105 +0,0 @@
-# messageThunk.ts 使用指南
-
-该文件包含用于管理应用程序中消息流、处理助手交互以及同步 Redux 状态与 IndexedDB 数据库的核心 Thunk Action Creators。主要围绕 `Message` 和 `MessageBlock` 对象进行操作。
-
-## 核心功能
-
-1.  **发送/接收消息**: 处理用户消息的发送，触发助手响应，并流式处理返回的数据，将其解析为不同的 `MessageBlock`。
-2.  **状态管理**: 确保 Redux store 中的消息和消息块状态与 IndexedDB 中的持久化数据保持一致。
-3.  **消息操作**: 提供删除、重发、重新生成、编辑后重发、追加响应、克隆等消息生命周期管理功能。
-4.  **Block 处理**: 动态创建、更新和保存各种类型的 `MessageBlock`（文本、思考过程、工具调用、引用、图片、错误、翻译等）。
-
-## 主要 Thunks
-
-以下是一些关键的 Thunk 函数及其用途：
-
-1.  **`sendMessage(userMessage, userMessageBlocks, assistant, topicId)`**
-
-    - **用途**: 发送一条新的用户消息。
-    - **流程**:
-      - 保存用户消息 (`userMessage`) 及其块 (`userMessageBlocks`) 到 Redux 和 DB。
-      - 检查 `@mentions` 以确定是单模型响应还是多模型响应。
-      - 创建助手消息(们)的存根 (Stub)。
-      - 将存根添加到 Redux 和 DB。
-      - 将核心处理逻辑 `fetchAndProcessAssistantResponseImpl` 添加到该 `topicId` 的队列中以获取实际响应。
-    - **Block 相关**: 主要处理用户消息的初始 `MessageBlock` 保存。
-
-2.  **`fetchAndProcessAssistantResponseImpl(dispatch, getState, topicId, assistant, assistantMessage)`**
-
-    - **用途**: (内部函数) 获取并处理单个助手响应的核心逻辑，被 `sendMessage`, `resend...`, `regenerate...`, `append...` 等调用。
-    - **流程**:
-      - 设置 Topic 加载状态。
-      - 准备上下文消息。
-      - 调用 `fetchChatCompletion` API 服务。
-      - 使用 `createStreamProcessor` 处理流式响应。
-      - 通过各种回调 (`onTextChunk`, `onThinkingChunk`, `onToolCallComplete`, `onImageGenerated`, `onError`, `onComplete` 等) 处理不同类型的事件。
-    - **Block 相关**:
-      - 根据流事件创建初始 `UNKNOWN` 块。
-      - 实时创建和更新 `MAIN_TEXT` 和 `THINKING` 块，使用 `throttledBlockUpdate` 和 `throttledBlockDbUpdate` 进行节流更新。
-      - 创建 `TOOL`, `CITATION`, `IMAGE`, `ERROR` 等类型的块。
-      - 在事件完成时（如 `onTextComplete`, `onToolCallComplete`）将块状态标记为 `SUCCESS` 或 `ERROR`，并使用 `saveUpdatedBlockToDB` 保存最终状态。
-      - 使用 `handleBlockTransition` 管理非流式块（如 `TOOL`, `CITATION`）的添加和状态更新。
-
-3.  **`loadTopicMessagesThunk(topicId, forceReload)`**
-
-    - **用途**: 从数据库加载指定主题的所有消息及其关联的 `MessageBlock`。
-    - **流程**:
-      - 从 DB 获取 `Topic` 及其 `messages` 列表。
-      - 根据消息 ID 列表从 DB 获取所有相关的 `MessageBlock`。
-      - 使用 `upsertManyBlocks` 将块更新到 Redux。
-      - 将消息更新到 Redux。
-    - **Block 相关**: 负责将持久化的 `MessageBlock` 加载到 Redux 状态。
-
-4.  **删除 Thunks**
-
-    - `deleteSingleMessageThunk(topicId, messageId)`: 删除单个消息及其所有 `MessageBlock`。
-    - `deleteMessageGroupThunk(topicId, askId)`: 删除一个用户消息及其所有相关的助手响应消息和它们的所有 `MessageBlock`。
-    - `clearTopicMessagesThunk(topicId)`: 清空主题下的所有消息及其所有 `MessageBlock`。
-    - **Block 相关**: 从 Redux 和 DB 中移除指定的 `MessageBlock`。
-
-5.  **重发/重新生成 Thunks**
-
-    - `resendMessageThunk(topicId, userMessageToResend, assistant)`: 重发用户消息。会重置（清空 Block 并标记为 PENDING）所有与该用户消息关联的助手响应，然后重新请求生成。
-    - `resendUserMessageWithEditThunk(topicId, originalMessage, mainTextBlockId, editedContent, assistant)`: 用户编辑消息内容后重发。先更新用户消息的 `MAIN_TEXT` 块内容，然后调用 `resendMessageThunk`。
-    - `regenerateAssistantResponseThunk(topicId, assistantMessageToRegenerate, assistant)`: 重新生成单个助手响应。重置该助手消息（清空 Block 并标记为 PENDING），然后重新请求生成。
-    - **Block 相关**: 删除旧的 `MessageBlock`，并在重新生成过程中创建新的 `MessageBlock`。
-
-6.  **`appendAssistantResponseThunk(topicId, existingAssistantMessageId, newModel, assistant)`**
-
-    - **用途**: 在已有的对话上下文中，针对同一个用户问题，使用新选择的模型追加一个新的助手响应。
-    - **流程**:
-      - 找到现有助手消息以获取原始 `askId`。
-      - 创建使用 `newModel` 的新助手消息存根（使用相同的 `askId`）。
-      - 添加新存根到 Redux 和 DB。
-      - 将 `fetchAndProcessAssistantResponseImpl` 添加到队列以生成新响应。
-    - **Block 相关**: 为新的助手响应创建全新的 `MessageBlock`。
-
-7.  **`cloneMessagesToNewTopicThunk(sourceTopicId, branchPointIndex, newTopic)`**
-
-    - **用途**: 将源主题的部分消息（及其 Block）克隆到一个**已存在**的新主题中。
-    - **流程**:
-      - 复制指定索引前的消息。
-      - 为所有克隆的消息和 Block 生成新的 UUID。
-      - 正确映射克隆消息之间的 `askId` 关系。
-      - 复制 `MessageBlock` 内容，更新其 `messageId` 指向新的消息 ID。
-      - 更新文件引用计数（如果 Block 是文件或图片）。
-      - 将克隆的消息和 Block 保存到新主题的 Redux 状态和 DB 中。
-    - **Block 相关**: 创建 `MessageBlock` 的副本，并更新其 ID 和 `messageId`。
-
-8.  **`initiateTranslationThunk(messageId, topicId, targetLanguage, sourceBlockId?, sourceLanguage?)`**
-    - **用途**: 为指定消息启动翻译流程，创建一个初始的 `TRANSLATION` 类型的 `MessageBlock`。
-    - **流程**:
-      - 创建一个状态为 `STREAMING` 的 `TranslationMessageBlock`。
-      - 将其添加到 Redux 和 DB。
-      - 更新原消息的 `blocks` 列表以包含新的翻译块 ID。
-    - **Block 相关**: 创建并保存一个占位的 `TranslationMessageBlock`。实际翻译内容的获取和填充需要后续步骤。
-
-## 内部机制和注意事项
-
-- **数据库交互**: 通过 `saveMessageAndBlocksToDB`, `updateExistingMessageAndBlocksInDB`, `saveUpdatesToDB`, `saveUpdatedBlockToDB`, `throttledBlockDbUpdate` 等辅助函数与 IndexedDB (`db`) 交互，确保数据持久化。
-- **状态同步**: Thunks 负责协调 Redux Store 和 IndexedDB 之间的数据一致性。
-- **队列 (`getTopicQueue`)**: 使用 `AsyncQueue` 确保对同一主题的操作（尤其是 API 请求）按顺序执行，避免竞态条件。
-- **节流 (`throttle`)**: 对流式响应中频繁的 Block 更新（文本、思考）使用 `lodash.throttle` 优化性能，减少 Redux dispatch 和 DB 写入次数。
-- **错误处理**: `fetchAndProcessAssistantResponseImpl` 内的回调函数（特别是 `onError`）处理流处理和 API 调用中可能出现的错误，并创建 `ERROR` 类型的 `MessageBlock`。
-
-开发者在使用这些 Thunks 时，通常需要提供 `dispatch`, `getState` (由 Redux Thunk 中间件注入)，以及如 `topicId`, `assistant` 配置对象, 相关的 `Message` 或 `MessageBlock` 对象/ID 等参数。理解每个 Thunk 的职责和它如何影响消息及块的状态至关重要。

docs/technical/how-to-use-useMessageOperations.md

@@ -1,156 +0,0 @@
-# useMessageOperations.ts 使用指南
-
-该文件定义了一个名为 `useMessageOperations` 的自定义 React Hook。这个 Hook 的主要目的是为 React 组件提供一个便捷的接口，用于执行与特定主题（Topic）相关的各种消息操作。它封装了调用 Redux Thunks (`messageThunk.ts`) 和 Actions (`newMessage.ts`, `messageBlock.ts`) 的逻辑，简化了组件与消息数据交互的代码。
-
-## 核心目标
-
-- **封装**: 将复杂的消息操作逻辑（如删除、重发、重新生成、编辑、翻译等）封装在易于使用的函数中。
-- **简化**: 让组件可以直接调用这些操作函数，而无需直接与 Redux `dispatch` 或 Thunks 交互。
-- **上下文关联**: 所有操作都与传入的 `topic` 对象相关联，确保操作作用于正确的主题。
-
-## 如何使用
-
-在你的 React 函数组件中，导入并调用 `useMessageOperations` Hook，并传入当前活动的 `Topic` 对象。
-
-```typescript
-import React from 'react';
-import { useMessageOperations } from '@renderer/hooks/useMessageOperations';
-import type { Topic, Message, Assistant, Model } from '@renderer/types';
-
-interface MyComponentProps {
-  currentTopic: Topic;
-  currentAssistant: Assistant;
-}
-
-function MyComponent({ currentTopic, currentAssistant }: MyComponentProps) {
-  const {
-    deleteMessage,
-    resendMessage,
-    regenerateAssistantMessage,
-    appendAssistantResponse,
-    getTranslationUpdater,
-    createTopicBranch,
-    // ... 其他操作函数
-  } = useMessageOperations(currentTopic);
-
-  const handleDelete = (messageId: string) => {
-    deleteMessage(messageId);
-  };
-
-  const handleResend = (message: Message) => {
-    resendMessage(message, currentAssistant);
-  };
-
-  const handleAppend = (existingMsg: Message, newModel: Model) => {
-    appendAssistantResponse(existingMsg, newModel, currentAssistant);
-  }
-
-  // ... 在组件中使用其他操作函数
-
-  return (
-    <div>
-      {/* Component UI */}
-      <button onClick={() => handleDelete('some-message-id')}>Delete Message</button>
-      {/* ... */}
-    </div>
-  );
-}
-```
-
-## 返回值
-
-`useMessageOperations(topic)` Hook 返回一个包含以下函数和值的对象：
-
-- **`deleteMessage(id: string)`**:
-
-  - 删除指定 `id` 的单个消息。
-  - 内部调用 `deleteSingleMessageThunk`。
-
-- **`deleteGroupMessages(askId: string)`**:
-
-  - 删除与指定 `askId` 相关联的一组消息（通常是用户提问及其所有助手回答）。
-  - 内部调用 `deleteMessageGroupThunk`。
-
-- **`editMessage(messageId: string, updates: Partial<Message>)`**:
-
-  - 更新指定 `messageId` 的消息的部分属性。
-  - **注意**: 目前主要用于更新 Redux 状态
-  - 内部调用 `newMessagesActions.updateMessage`。
-
-- **`resendMessage(message: Message, assistant: Assistant)`**:
-
-  - 重新发送指定的用户消息 (`message`)，这将触发其所有关联助手响应的重新生成。
-  - 内部调用 `resendMessageThunk`。
-
-- **`resendUserMessageWithEdit(message: Message, editedContent: string, assistant: Assistant)`**:
-
-  - 在用户消息的主要文本块被编辑后，重新发送该消息。
-  - 会先查找消息的 `MAIN_TEXT` 块 ID，然后调用 `resendUserMessageWithEditThunk`。
-
-- **`clearTopicMessages(_topicId?: string)`**:
-
-  - 清除当前主题（或可选的指定 `_topicId`）下的所有消息。
-  - 内部调用 `clearTopicMessagesThunk`。
-
-- **`createNewContext()`**:
-
-  - 发出一个全局事件 (`EVENT_NAMES.NEW_CONTEXT`)，通常用于通知 UI 清空显示，准备新的上下文。不直接修改 Redux 状态。
-
-- **`displayCount`**:
-
-  - (非操作函数) 从 Redux store 中获取当前的 `displayCount` 值。
-
-- **`pauseMessages()`**:
-
-  - 尝试中止当前主题中正在进行的消息生成（状态为 `processing` 或 `pending`）。
-  - 通过查找相关的 `askId` 并调用 `abortCompletion` 来实现。
-  - 同时会 dispatch `setTopicLoading` action 将加载状态设为 `false`。
-
-- **`resumeMessage(message: Message, assistant: Assistant)`**:
-
-  - 恢复/重新发送一个用户消息。目前实现为直接调用 `resendMessage`。
-
-- **`regenerateAssistantMessage(message: Message, assistant: Assistant)`**:
-
-  - 重新生成指定的**助手**消息 (`message`) 的响应。
-  - 内部调用 `regenerateAssistantResponseThunk`。
-
-- **`appendAssistantResponse(existingAssistantMessage: Message, newModel: Model, assistant: Assistant)`**:
-
-  - 针对 `existingAssistantMessage` 所回复的**同一用户提问**，使用 `newModel` 追加一个新的助手响应。
-  - 内部调用 `appendAssistantResponseThunk`。
-
-- **`getTranslationUpdater(messageId: string, targetLanguage: string, sourceBlockId?: string, sourceLanguage?: string)`**:
-
-  - **用途**: 获取一个用于逐步更新翻译块内容的函数。
-  - **流程**:
-    1.  内部调用 `initiateTranslationThunk` 来创建或获取一个 `TRANSLATION` 类型的 `MessageBlock`，并获取其 `blockId`。
-    2.  返回一个**异步更新函数**。
-  - **返回的更新函数 `(accumulatedText: string, isComplete?: boolean) => void`**:
-    - 接收累积的翻译文本和完成状态。
-    - 调用 `updateOneBlock` 更新 Redux 中的翻译块内容和状态 (`STREAMING` 或 `SUCCESS`)。
-    - 调用 `throttledBlockDbUpdate` 将更新（节流地）保存到数据库。
-  - 如果初始化失败（Thunk 返回 `undefined`），则此函数返回 `null`。
-
-- **`createTopicBranch(sourceTopicId: string, branchPointIndex: number, newTopic: Topic)`**:
-  - 创建一个主题分支，将 `sourceTopicId` 主题中 `branchPointIndex` 索引之前的消息克隆到 `newTopic` 中。
-  - **注意**: `newTopic` 对象必须是调用此函数**之前**已经创建并添加到 Redux 和数据库中的。
-  - 内部调用 `cloneMessagesToNewTopicThunk`。
-
-## 依赖
-
-- **`topic: Topic`**: 必须传入当前操作上下文的主题对象。Hook 返回的操作函数将始终作用于这个主题的 `topic.id`。
-- **Redux `dispatch`**: Hook 内部使用 `useAppDispatch` 获取 `dispatch` 函数来调用 actions 和 thunks。
-
-## 相关 Hooks
-
-在同一文件中还定义了两个辅助 Hook：
-
-- **`useTopicMessages(topic: Topic)`**:
-
-  - 使用 `selectMessagesForTopic` selector 来获取并返回指定主题的消息列表。
-
-- **`useTopicLoading(topic: Topic)`**:
-  - 使用 `selectNewTopicLoading` selector 来获取并返回指定主题的加载状态。
-
-这些 Hook 可以与 `useMessageOperations` 结合使用，方便地在组件中获取消息数据、加载状态，并执行相关操作。

electron-builder.yml

@@ -1,14 +1,5 @@
 appId: com.kangfenmao.CherryStudio
 productName: Cherry Studio
-electronLanguages:
-  - zh-CN
-  - zh-TW
-  - en-US
-  - ja # macOS/linux/win
-  - ru # macOS/linux/win
-  - zh_CN # for macOS
-  - zh_TW # for macOS
-  - en # for macOS
 directories:
   buildResources: build
 files:
@@ -38,7 +29,7 @@ files:
   - '!node_modules/mammoth/{mammoth.browser.js,mammoth.browser.min.js}'
 asarUnpack:
   - resources/**
-  - '**/*.{metal,exp,lib}'
+  - '**/*.{node,dll,metal,exp,lib}'
 win:
   executableName: Cherry Studio
   artifactName: ${productName}-${version}-${arch}-setup.${ext}
@@ -53,10 +44,8 @@ nsis:
   allowToChangeInstallationDirectory: true
   oneClick: false
   include: build/nsis-installer.nsh
-  buildUniversalInstaller: false
 portable:
   artifactName: ${productName}-${version}-${arch}-portable.${ext}
-  buildUniversalInstaller: false
 mac:
   entitlementsInherit: build/entitlements.mac.plist
   notarize: false
@@ -68,31 +57,37 @@ mac:
     - NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder.
   target:
     - target: dmg
+      arch:
+        - arm64
+        - x64
     - target: zip
+      arch:
+        - arm64
+        - x64
 linux:
   artifactName: ${productName}-${version}-${arch}.${ext}
   target:
     - target: AppImage
+      arch:
+        - arm64
+        - x64
   maintainer: electronjs.org
   category: Utility
-  desktop:
-    entry:
-      StartupWMClass: CherryStudio
-  mimeTypes:
-    - x-scheme-handler/cherrystudio
 publish:
-  provider: generic
-  url: https://releases.cherry-ai.com
+  # provider: generic
+  # url: https://cherrystudio.ocool.online
+  provider: github
+  repo: cherry-studio
+  owner: CherryHQ
 electronDownload:
   mirror: https://npmmirror.com/mirrors/electron/
 afterPack: scripts/after-pack.js
 afterSign: scripts/notarize.js
-artifactBuildCompleted: scripts/artifact-build-completed.js
 releaseInfo:
   releaseNotes: |
-    重构消息结构，支持不同类型消息按时间顺序显示
-    智能体支持导入和导出
-    快捷面板增加网络搜索引擎选择
-    显示设置增加缩放控制按钮
-    支持添加自定义小程序
-    性能优化和错误修复
+    增加对 grok-3 和 Grok-3-mini 的支持
+    助手支持使用拼音排序
+    网络搜索增加 Baidu, Google, Bing 支持（免费使用）
+    网络搜索增加 uBlacklist 订阅
+    快速面板 (QuickPanel) 进行性能优化
+    解决 mcp 依赖工具下载速度问题

electron.vite.config.ts

@@ -1,4 +1,4 @@
-import react from '@vitejs/plugin-react-swc'
+import react from '@vitejs/plugin-react'
 import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
 import { resolve } from 'path'
 import { visualizer } from 'rollup-plugin-visualizer'
@@ -52,17 +52,19 @@ export default defineConfig({
   renderer: {
     plugins: [
       react({
-        plugins: [
-          [
-            '@swc/plugin-styled-components',
-            {
-              displayName: true, // 开发环境下启用组件名称
-              fileName: false, // 不在类名中包含文件名
-              pure: true, // 优化性能
-              ssr: false // 不需要服务端渲染
-            }
+        babel: {
+          plugins: [
+            [
+              'styled-components',
+              {
+                displayName: true, // 开发环境下启用组件名称
+                fileName: false, // 不在类名中包含文件名
+                pure: true, // 优化性能
+                ssr: false // 不需要服务端渲染
+              }
+            ]
           ]
-        ]
+        }
       }),
       ...visualizerPlugin('renderer')
     ],
@@ -74,14 +76,6 @@ export default defineConfig({
     },
     optimizeDeps: {
       exclude: []
-    },
-    build: {
-      rollupOptions: {
-        input: {
-          index: resolve(__dirname, 'src/renderer/index.html'),
-          miniWindow: resolve(__dirname, 'src/renderer/miniWindow.html')
-        }
-      }
     }
   }
 })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "1.3.2",
+  "version": "1.2.2-batemo",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",
@@ -23,13 +23,13 @@
     "build": "npm run typecheck && electron-vite build",
     "build:check": "yarn test && yarn typecheck && yarn check:i18n",
     "build:unpack": "dotenv npm run build && electron-builder --dir",
-    "build:win": "dotenv npm run build && electron-builder --win --x64 --arm64",
+    "build:win": "dotenv npm run build && electron-builder --win",
     "build:win:x64": "dotenv npm run build && electron-builder --win --x64",
     "build:win:arm64": "dotenv npm run build && electron-builder --win --arm64",
-    "build:mac": "dotenv electron-vite build && electron-builder --mac --arm64 --x64",
+    "build:mac": "dotenv electron-vite build && electron-builder --mac",
     "build:mac:arm64": "dotenv electron-vite build && electron-builder --mac --arm64",
     "build:mac:x64": "dotenv electron-vite build && electron-builder --mac --x64",
-    "build:linux": "dotenv electron-vite build && electron-builder --linux --x64 --arm64",
+    "build:linux": "dotenv electron-vite build && electron-builder --linux",
     "build:linux:arm64": "dotenv electron-vite build && electron-builder --linux --arm64",
     "build:linux:x64": "dotenv electron-vite build && electron-builder --linux --x64",
     "build:npm": "node scripts/build-npm.js",
@@ -44,12 +44,7 @@
     "typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
     "typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",
     "check:i18n": "node scripts/check-i18n.js",
-    "test": "yarn test:renderer",
-    "test:coverage": "yarn test:renderer:coverage",
-    "test:node": "npx -y tsx --test src/**/*.test.ts",
-    "test:renderer": "vitest run",
-    "test:renderer:ui": "vitest --ui",
-    "test:renderer:coverage": "vitest run --coverage",
+    "test": "npx -y tsx --test src/**/*.test.ts",
     "format": "prettier --write .",
     "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
     "postinstall": "electron-builder install-app-deps",
@@ -69,49 +64,48 @@
     "@cherrystudio/embedjs-openai": "^0.1.28",
     "@electron-toolkit/utils": "^3.0.0",
     "@electron/notarize": "^2.5.0",
+    "@google/generative-ai": "^0.24.0",
     "@langchain/community": "^0.3.36",
+    "@mozilla/readability": "^0.6.0",
+    "@notionhq/client": "^2.2.15",
     "@strongtz/win32-arm64-msvc": "^0.4.7",
-    "@tanstack/react-query": "^5.27.0",
+    "@tryfabric/martian": "^1.2.4",
     "@types/react-infinite-scroll-component": "^5.0.0",
+    "@xyflow/react": "^12.4.4",
     "adm-zip": "^0.5.16",
-    "archiver": "^7.0.1",
     "async-mutex": "^0.5.0",
-    "bufferutil": "^4.0.9",
     "color": "^5.0.0",
+    "d3": "^7.9.0",
     "diff": "^7.0.0",
     "docx": "^9.0.2",
     "electron-log": "^5.1.5",
     "electron-store": "^8.2.0",
-    "electron-updater": "6.6.4",
+    "electron-updater": "^6.3.9",
     "electron-window-state": "^5.0.3",
     "epub": "patch:epub@npm%3A1.3.0#~/.yarn/patches/epub-npm-1.3.0-8325494ffe.patch",
-    "extract-zip": "^2.0.1",
-    "fast-xml-parser": "^5.2.0",
+    "fast-xml-parser": "^5.0.9",
     "fetch-socks": "^1.3.2",
     "fs-extra": "^11.2.0",
     "got-scraping": "^4.1.1",
     "jsdom": "^26.0.0",
     "markdown-it": "^14.1.0",
-    "node-stream-zip": "^1.15.0",
     "officeparser": "^4.1.1",
-    "os-proxy-config": "^1.1.2",
     "proxy-agent": "^6.5.0",
-    "rc-virtual-list": "^3.18.6",
-    "react-window": "^1.8.11",
     "tar": "^7.4.3",
+    "tiny-pinyin": "^1.3.2",
     "turndown": "^7.2.0",
     "turndown-plugin-gfm": "^1.0.2",
     "undici": "^7.4.0",
     "webdav": "^5.8.0",
-    "ws": "^8.18.1",
     "zipread": "^1.3.3"
   },
   "devDependencies": {
     "@agentic/exa": "^7.3.3",
     "@agentic/searxng": "^7.3.3",
     "@agentic/tavily": "^7.3.3",
+    "@analytics/google-analytics": "^1.1.0",
     "@ant-design/v5-patch-for-react-19": "^1.0.3",
-    "@anthropic-ai/sdk": "^0.41.0",
+    "@anthropic-ai/sdk": "^0.38.0",
     "@electron-toolkit/eslint-config-prettier": "^3.0.0",
     "@electron-toolkit/eslint-config-ts": "^3.0.0",
     "@electron-toolkit/preload": "^3.0.0",
@@ -119,19 +113,16 @@
     "@emotion/is-prop-valid": "^1.3.1",
     "@eslint-react/eslint-plugin": "^1.36.1",
     "@eslint/js": "^9.22.0",
-    "@google/genai": "^0.13.0",
+    "@google/genai": "^0.4.0",
     "@hello-pangea/dnd": "^16.6.0",
-    "@iconify-json/svg-spinners": "^1.2.2",
     "@kangfenmao/keyv-storage": "^0.1.0",
-    "@modelcontextprotocol/sdk": "^1.10.2",
-    "@mozilla/readability": "^0.6.0",
+    "@modelcontextprotocol/sdk": "^1.9.0",
     "@notionhq/client": "^2.2.15",
     "@reduxjs/toolkit": "^2.2.5",
-    "@shikijs/markdown-it": "^3.2.2",
-    "@swc/plugin-styled-components": "^7.1.3",
     "@tavily/core": "patch:@tavily/core@npm%3A0.3.1#~/.yarn/patches/@tavily-core-npm-0.3.1-fe69bf2bea.patch",
     "@tryfabric/martian": "^1.2.4",
     "@types/adm-zip": "^0",
+    "@types/d3": "^7",
     "@types/diff": "^7",
     "@types/fs-extra": "^11",
     "@types/lodash": "^4.17.5",
@@ -142,13 +133,9 @@
     "@types/react": "^19.0.12",
     "@types/react-dom": "^19.0.4",
     "@types/react-infinite-scroll-component": "^5.0.0",
-    "@types/react-window": "^1",
     "@types/tinycolor2": "^1",
-    "@types/ws": "^8",
-    "@vitejs/plugin-react-swc": "^3.9.0",
-    "@vitest/coverage-v8": "^3.1.1",
-    "@vitest/ui": "^3.1.1",
-    "@xyflow/react": "^12.4.4",
+    "@vitejs/plugin-react": "^4.2.1",
+    "analytics": "^0.8.16",
     "antd": "^5.22.5",
     "applescript": "^1.0.0",
     "axios": "^1.7.3",
@@ -159,7 +146,7 @@
     "dexie-react-hooks": "^1.1.7",
     "dotenv-cli": "^7.4.2",
     "electron": "31.7.6",
-    "electron-builder": "26.0.15",
+    "electron-builder": "^24.13.3",
     "electron-devtools-installer": "^3.2.0",
     "electron-icon-builder": "^2.0.1",
     "electron-vite": "^2.3.0",
@@ -175,13 +162,12 @@
     "lint-staged": "^15.5.0",
     "lodash": "^4.17.21",
     "lru-cache": "^11.1.0",
-    "lucide-react": "^0.487.0",
     "mime": "^4.0.4",
-    "motion": "^12.10.5",
     "npx-scope-finder": "^1.2.0",
-    "openai": "patch:openai@npm%3A4.96.0#~/.yarn/patches/openai-npm-4.96.0-0665b05cb9.patch",
+    "openai": "patch:openai@npm%3A4.87.3#~/.yarn/patches/openai-npm-4.87.3-2b30a7685f.patch",
     "p-queue": "^8.1.0",
     "prettier": "^3.5.3",
+    "rc-virtual-list": "^3.18.5",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-hotkeys-hook": "^4.6.1",
@@ -202,16 +188,14 @@
     "remark-math": "^6.0.0",
     "rollup-plugin-visualizer": "^5.12.0",
     "sass": "^1.77.2",
-    "shiki": "^3.2.2",
+    "shiki": "^3.2.1",
     "string-width": "^7.2.0",
     "styled-components": "^6.1.11",
-    "tiny-pinyin": "^1.3.2",
     "tinycolor2": "^1.6.0",
     "tokenx": "^0.4.1",
     "typescript": "^5.6.2",
     "uuid": "^10.0.0",
-    "vite": "6.2.6",
-    "vitest": "^3.1.1"
+    "vite": "^5.0.12"
   },
   "resolutions": {
     "pdf-parse@npm:1.1.1": "patch:pdf-parse@npm%3A1.1.1#~/.yarn/patches/pdf-parse-npm-1.1.1-04a6109b2a.patch",
@@ -219,11 +203,8 @@
     "@langchain/openai@npm:>=0.1.0 <0.4.0": "patch:@langchain/openai@npm%3A0.3.16#~/.yarn/patches/@langchain-openai-npm-0.3.16-e525b59526.patch",
     "node-gyp": "^9.1.0",
     "libsql@npm:^0.4.4": "patch:libsql@npm%3A0.4.7#~/.yarn/patches/libsql-npm-0.4.7-444e260fb1.patch",
-    "openai@npm:^4.77.0": "patch:openai@npm%3A4.96.0#~/.yarn/patches/openai-npm-4.96.0-0665b05cb9.patch",
-    "pkce-challenge@npm:^4.1.0": "patch:pkce-challenge@npm%3A4.1.0#~/.yarn/patches/pkce-challenge-npm-4.1.0-fbc51695a3.patch",
-    "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",
-    "shiki": "3.2.2",
-    "openai@npm:^4.87.3": "patch:openai@npm%3A4.96.0#~/.yarn/patches/openai-npm-4.96.0-0665b05cb9.patch"
+    "openai@npm:^4.77.0": "patch:openai@npm%3A4.87.3#~/.yarn/patches/openai-npm-4.87.3-2b30a7685f.patch",
+    "pkce-challenge@npm:^4.1.0": "patch:pkce-challenge@npm%3A4.1.0#~/.yarn/patches/pkce-challenge-npm-4.1.0-fbc51695a3.patch"
   },
   "packageManager": "yarn@4.6.0",
   "lint-staged": {

packages/shared/IpcChannel.ts

@@ -12,16 +12,12 @@ export enum IpcChannel {
   App_SetTrayOnClose = 'app:set-tray-on-close',
   App_RestartTray = 'app:restart-tray',
   App_SetTheme = 'app:set-theme',
-  App_SetAutoUpdate = 'app:set-auto-update',
-  App_HandleZoomFactor = 'app:handle-zoom-factor',
 
   App_IsBinaryExist = 'app:is-binary-exist',
   App_GetBinaryPath = 'app:get-binary-path',
   App_InstallUvBinary = 'app:install-uv-binary',
   App_InstallBunBinary = 'app:install-bun-binary',
 
-  Webview_SetOpenLinkExternal = 'webview:set-open-link-external',
-
   // Open
   Open_Path = 'open:path',
   Open_Website = 'open:website',
@@ -38,7 +34,6 @@ export enum IpcChannel {
   MiniWindow_SetPin = 'miniwindow:set-pin',
 
   // Mcp
-  Mcp_AddServer = 'mcp:add-server',
   Mcp_RemoveServer = 'mcp:remove-server',
   Mcp_RestartServer = 'mcp:restart-server',
   Mcp_StopServer = 'mcp:stop-server',
@@ -46,8 +41,6 @@ export enum IpcChannel {
   Mcp_CallTool = 'mcp:call-tool',
   Mcp_ListPrompts = 'mcp:list-prompts',
   Mcp_GetPrompt = 'mcp:get-prompt',
-  Mcp_ListResources = 'mcp:list-resources',
-  Mcp_GetResource = 'mcp:get-resource',
   Mcp_GetInstallInfo = 'mcp:get-install-info',
   Mcp_ServersChanged = 'mcp:servers-changed',
   Mcp_ServersUpdated = 'mcp:servers-updated',
@@ -82,6 +75,8 @@ export enum IpcChannel {
   Windows_ResetMinimumSize = 'window:reset-minimum-size',
   Windows_SetMinimumSize = 'window:set-minimum-size',
 
+  SelectionMenu_Action = 'selection-menu:action',
+
   KnowledgeBase_Create = 'knowledge-base:create',
   KnowledgeBase_Reset = 'knowledge-base:reset',
   KnowledgeBase_Delete = 'knowledge-base:delete',
@@ -103,13 +98,12 @@ export enum IpcChannel {
   File_SelectFolder = 'file:selectFolder',
   File_Create = 'file:create',
   File_Write = 'file:write',
-  File_WriteWithId = 'file:writeWithId',
   File_SaveImage = 'file:saveImage',
   File_Base64Image = 'file:base64Image',
   File_Download = 'file:download',
   File_Copy = 'file:copy',
-  File_BinaryImage = 'file:binaryImage',
-  File_Base64File = 'file:base64File',
+  File_BinaryFile = 'file:binaryFile',
+
   Fs_Read = 'fs:read',
 
   Export_Word = 'export:word',
@@ -124,7 +118,6 @@ export enum IpcChannel {
   Backup_ListWebdavFiles = 'backup:listWebdavFiles',
   Backup_CheckConnection = 'backup:checkConnection',
   Backup_CreateDirectory = 'backup:createDirectory',
-  Backup_DeleteWebdavFile = 'backup:deleteWebdavFile',
 
   // zip
   Zip_Compress = 'zip:compress',
@@ -132,9 +125,9 @@ export enum IpcChannel {
 
   // system
   System_GetDeviceType = 'system:getDeviceType',
-  System_GetHostname = 'system:getHostname',
 
   // events
+  SelectionAction = 'selection-action',
   BackupProgress = 'backup-progress',
   ThemeChange = 'theme:change',
   UpdateDownloadedCancelled = 'update-downloaded-cancelled',
@@ -152,6 +145,7 @@ export enum IpcChannel {
 
   HideMiniWindow = 'hide-mini-window',
   ShowMiniWindow = 'show-mini-window',
+  MiniWindowReload = 'miniwindow-reload',
 
   ReduxStateChange = 'redux-state-change',
   ReduxStoreReady = 'redux-store-ready',
@@ -161,9 +155,12 @@ export enum IpcChannel {
   SearchWindow_Close = 'search-window:close',
   SearchWindow_OpenUrl = 'search-window:open-url',
 
-  //Store Sync
-  StoreSync_Subscribe = 'store-sync:subscribe',
-  StoreSync_Unsubscribe = 'store-sync:unsubscribe',
-  StoreSync_OnUpdate = 'store-sync:on-update',
-  StoreSync_BroadcastSync = 'store-sync:broadcast-sync'
+  // Memory File Storage
+  Memory_LoadData = 'memory:load-data',
+  Memory_SaveData = 'memory:save-data',
+  Memory_DeleteShortMemoryById = 'memory:delete-short-memory-by-id',
+
+  // Long-term Memory File Storage
+  LongTermMemory_LoadData = 'long-term-memory:load-data',
+  LongTermMemory_SaveData = 'long-term-memory:save-data'
 }

packages/shared/config/constant.ts

@@ -134,14 +134,6 @@ export const textExts = [
   '.tf' // Technology File
 ]
 
-export const ZOOM_LEVELS = [0.25, 0.33, 0.5, 0.67, 0.75, 0.8, 0.9, 1, 1.1, 1.25, 1.5, 1.75, 2, 2.5, 3, 4, 5]
-
-// 从 ZOOM_LEVELS 生成 Ant Design Select 所需的 options 结构
-export const ZOOM_OPTIONS = ZOOM_LEVELS.map((level) => ({
-  value: level,
-  label: `${Math.round(level * 100)}%`
-}))
-
 export const ZOOM_SHORTCUTS = [
   {
     key: 'zoom_in',

resources/cherry-studio/license.html

@@ -14,76 +14,35 @@
     <div class="mb-12">
       <h1 class="text-3xl font-bold mb-8 text-gray-900">许可协议</h1>
 
-      <p class="mb-6 text-gray-700">本项目采用<strong>区分用户的双重许可 (User-Segmented Dual Licensing)</strong> 模式。</p>
+      <p class="mb-6 text-gray-700">采用 Apache License 2.0 修改版许可，并附加以下条件：</p>
 
       <section class="mb-8">
-        <h2 class="text-xl font-semibold mb-4 text-gray-900">核心原则</h2>
-        <ul class="list-disc pl-6 space-y-2 text-gray-700">
-          <li><strong>个人用户 和 10人及以下企业/组织:</strong> 默认适用 <strong>GNU Affero 通用公共许可证 v3.0 (AGPLv3)</strong>。</li>
-          <li><strong>超过10人的企业/组织:</strong> <strong>必须</strong> 获取 <strong>商业许可证 (Commercial License)</strong>。</li>
-        </ul>
+        <h2 class="text-xl font-semibold mb-4 text-gray-900">一. 商用许可</h2>
+        <p class="mb-4 text-gray-700">在以下任何一种情况下，您需要联系我们并获得明确的书面商业授权后，方可继续使用 Cherry Studio 材料：</p>
+        <ol class="list-decimal pl-6 space-y-2 text-gray-700">
+          <li><strong>修改与衍生</strong>： 您对 Cherry Studio 材料进行修改或基于其进行衍生开发（包括但不限于修改应用名称、Logo、代码、功能、界面，数据等）。</li>
+          <li><strong>企业服务</strong>： 在您的企业内部，或为企业客户提供基于 Cherry Studio 的服务，且该服务支持 10 人及以上累计用户使用。</li>
+          <li><strong>硬件捆绑销售</strong>： 您将 Cherry Studio 预装或集成到硬件设备或产品中进行捆绑销售。</li>
+          <li><strong>政府或教育机构大规模采购</strong>： 您的使用场景属于政府或教育机构的大规模采购项目，特别是涉及安全、数据隐私等敏感需求时。</li>
+          <li><strong>面向公众的公有云服务</strong>：基于 Cherry Studio，提供面向公众的公有云服务。</li>
+        </ol>
       </section>
 
       <section class="mb-8">
-        <h2 class="text-xl font-semibold mb-4 text-gray-900">定义："10人及以下"</h2>
-        <p class="text-gray-700">
-          指在您的组织（包括公司、非营利组织、政府机构、教育机构等任何实体）中，能够访问、使用或以任何方式直接或间接受益于本软件（Cherry
-          Studio）功能的个人总数不超过10人。这包括但不限于开发者、测试人员、运营人员、最终用户、通过集成系统间接使用者等。
-        </p>
+        <h2 class="text-xl font-semibold mb-4 text-gray-900">二. 贡献者协议</h2>
+        <p class="mb-4 text-gray-700">作为 Cherry Studio 的贡献者，您应当同意以下条款：</p>
+        <ol class="list-decimal pl-6 space-y-2 text-gray-700">
+          <li><strong>许可调整</strong>：生产者有权根据需要对开源协议进行调整，使其更加严格或宽松。</li>
+          <li><strong>商业用途</strong>：您贡献的代码可能会被用于商业用途，包括但不限于云业务运营。</li>
+        </ol>
       </section>
 
       <section class="mb-8">
-        <h2 class="text-xl font-semibold mb-4 text-gray-900">1. 开源许可证 (Open Source License): AGPLv3 - 适用于个人及10人及以下组织
-        </h2>
-        <ul class="list-disc pl-6 space-y-2 text-gray-700">
-          <li>如果您是个人用户，或者您的组织满足上述"10人及以下"的定义，您可以在 <strong>AGPLv3</strong> 的条款下自由使用、修改和分发 Cherry Studio。AGPLv3 的完整文本可以访问
-            <a href="https://www.gnu.org/licenses/agpl-3.0.html"
-              class="text-blue-600 hover:underline">https://www.gnu.org/licenses/agpl-3.0.html</a> 获取。
-          </li>
-          <li><strong>核心义务：</strong> AGPLv3 的一个关键要求是，如果您修改了 Cherry Studio 并通过网络提供服务，或者分发了修改后的版本，您必须以 AGPLv3
-            许可证向接收者提供相应的<strong>完整源代码</strong>。即使您符合"10人及以下"的标准，如果您希望避免此源代码公开义务，您也需要考虑获取商业许可证（见下文）。</li>
-          <li>使用前请务必仔细阅读并理解 AGPLv3 的所有条款。</li>
-        </ul>
-      </section>
-
-      <section class="mb-8">
-        <h2 class="text-xl font-semibold mb-4 text-gray-900">2. 商业许可证 (Commercial License) - 适用于超过10人的组织，或希望规避 AGPLv3
-          义务的用户</h2>
-        <ul class="list-disc pl-6 space-y-2 text-gray-700">
-          <li><strong>强制要求：</strong>
-            如果您的组织<strong>不</strong>满足上述"10人及以下"的定义（即有11人或更多人可以访问、使用或受益于本软件），您<strong>必须</strong>联系我们获取并签署一份商业许可证才能使用
-            Cherry Studio。</li>
-          <li><strong>自愿选择：</strong> 即使您的组织满足"10人及以下"的条件，但如果您的使用场景<strong>无法满足 AGPLv3
-              的条款要求</strong>（特别是关于<strong>源代码公开</strong>的义务），或者您需要 AGPLv3 <strong>未提供</strong>的特定商业条款（如保证、赔偿、无 Copyleft
-            限制等），您也<strong>必须</strong>联系我们获取并签署一份商业许可证。</li>
-          <li><strong>需要商业许可证的常见情况包括（但不限于）：</strong>
-            <ul class="list-disc pl-6 mt-2 space-y-1">
-              <li>您的组织规模超过10人。</li>
-              <li>（无论组织规模）您希望分发修改过的 Cherry Studio 版本，但<strong>不希望</strong>根据 AGPLv3 公开您修改部分的源代码。</li>
-              <li>（无论组织规模）您希望基于修改过的 Cherry Studio 提供网络服务（SaaS），但<strong>不希望</strong>根据 AGPLv3 向服务使用者提供修改后的源代码。</li>
-              <li>（无论组织规模）您的公司政策、客户合同或项目要求不允许使用 AGPLv3 许可的软件，或要求闭源分发及保密。</li>
-            </ul>
-          </li>
-          <li><strong>获取商业许可：</strong> 请通过邮箱 <a href="mailto:bd@cherry-ai.com"
-              class="text-blue-600 hover:underline">bd@cherry-ai.com</a> 联系 Cherry Studio 开发团队洽谈商业授权事宜。</li>
-        </ul>
-      </section>
-
-      <section class="mb-8">
-        <h2 class="text-xl font-semibold mb-4 text-gray-900">3. 贡献 (Contributions)</h2>
-        <ul class="list-disc pl-6 space-y-2 text-gray-700">
-          <li>我们欢迎社区对 Cherry Studio 的贡献。所有向本项目提交的贡献都将被视为在 <strong>AGPLv3</strong> 许可证下提供。</li>
-          <li>通过向本项目提交贡献（例如通过 Pull Request），即表示您同意您的代码以 AGPLv3 许可证授权给本项目及所有后续使用者（无论这些使用者最终遵循 AGPLv3 还是商业许可）。</li>
-          <li>您也理解并同意，您的贡献可能会被包含在根据商业许可证分发的 Cherry Studio 版本中。</li>
-        </ul>
-      </section>
-
-      <section class="mb-8">
-        <h2 class="text-xl font-semibold mb-4 text-gray-900">4. 其他条款 (Other Terms)</h2>
-        <ul class="list-disc pl-6 space-y-2 text-gray-700">
-          <li>关于商业许可证的具体条款和条件，以双方签署的正式商业许可协议为准。</li>
-          <li>项目维护者保留根据需要更新本许可政策（包括用户规模定义和阈值）的权利。相关更新将通过项目官方渠道（如代码仓库、官方网站）进行通知。</li>
-        </ul>
+        <h2 class="text-xl font-semibold mb-4 text-gray-900">三. 其他条款</h2>
+        <ol class="list-decimal pl-6 space-y-2 text-gray-700">
+          <li>本协议条款的解释权归 Cherry Studio 开发者所有。</li>
+          <li>本协议可能根据实际情况进行更新，更新时将通过本软件通知用户。</li>
+        </ol>
       </section>
     </div>
 
@@ -91,107 +50,58 @@
 
     <!-- English Version -->
     <div>
-      <h1 class="text-3xl font-bold mb-8 text-gray-900">Licensing</h1>
+      <h1 class="text-3xl font-bold mb-8 text-gray-900">License Agreement</h1>
 
-      <p class="mb-6 text-gray-700">This project employs a <strong>User-Segmented Dual Licensing</strong> model.</p>
+      <p class="mb-6 text-gray-700">This software is licensed under a modified version of the Apache License 2.0, with
+        the following additional conditions.</p>
 
       <section class="mb-8">
-        <h2 class="text-xl font-semibold mb-4 text-gray-900">Core Principle</h2>
-        <ul class="list-disc pl-6 space-y-2 text-gray-700">
-          <li><strong>Individual Users and Organizations with 10 or Fewer Individuals:</strong> Governed by default
-            under the <strong>GNU Affero General Public License v3.0 (AGPLv3)</strong>.</li>
-          <li><strong>Organizations with More Than 10 Individuals:</strong> <strong>Must</strong> obtain a
-            <strong>Commercial License</strong>.
-          </li>
-        </ul>
-      </section>
-
-      <section class="mb-8">
-        <h2 class="text-xl font-semibold mb-4 text-gray-900">Definition: "10 or Fewer Individuals"</h2>
-        <p class="text-gray-700">
-          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.
-        </p>
-      </section>
-
-      <section class="mb-8">
-        <h2 class="text-xl font-semibold mb-4 text-gray-900">1. Open Source License: AGPLv3 - For Individuals and
-          Organizations of 10 or Fewer</h2>
-        <ul class="list-disc pl-6 space-y-2 text-gray-700">
-          <li>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
-            <strong>AGPLv3</strong>. The full text of the AGPLv3 can be found at <a
-              href="https://www.gnu.org/licenses/agpl-3.0.html"
-              class="text-blue-600 hover:underline">https://www.gnu.org/licenses/agpl-3.0.html</a>.
-          </li>
-          <li><strong>Core Obligation:</strong> 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 <strong>complete
-              corresponding source code</strong> 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).</li>
-          <li>Please read and understand the full terms of the AGPLv3 carefully before use.</li>
-        </ul>
-      </section>
-
-      <section class="mb-8">
-        <h2 class="text-xl font-semibold mb-4 text-gray-900">2. Commercial License - For Organizations with More Than 10
-          Individuals, or Users Needing to Avoid AGPLv3 Obligations</h2>
-        <ul class="list-disc pl-6 space-y-2 text-gray-700">
-          <li><strong>Mandatory Requirement:</strong> If your organization does <strong>not</strong> meet the "10 or
-            Fewer Individuals" definition above (i.e., 11 or more individuals can access, use, or benefit from the
-            software), you <strong>must</strong> contact us to obtain and execute a Commercial License to use Cherry
+        <h2 class="text-xl font-semibold mb-4 text-gray-900">I. Commercial Licensing</h2>
+        <p class="mb-4 text-gray-700">You must contact us and obtain explicit written commercial authorization to
+          continue using Cherry Studio materials under any of the following circumstances:</p>
+        <ol class="list-decimal pl-6 space-y-2 text-gray-700">
+          <li><strong>Modifications and Derivatives:</strong> You modify Cherry Studio materials or perform derivative
+            development based on them (including but not limited to changing the application's name, logo, code,
+            functionality, user interface, data, etc.).</li>
+          <li><strong>Enterprise Services:</strong> You use Cherry Studio internally within your enterprise, or you
+            provide Cherry Studio-based services for enterprise customers, and such services support cumulative usage by
+            10 or more users.</li>
+          <li><strong>Hardware Bundling and Sales:</strong> You pre-install or integrate Cherry Studio into hardware
+            devices or products for bundled sale.</li>
+          <li><strong>Large-scale Procurement by Government or Educational Institutions:</strong> Your usage scenario
+            involves large-scale procurement projects by government or educational institutions, especially in cases
+            involving sensitive requirements such as security and data privacy.</li>
+          <li><strong>Public Cloud Services:</strong> You provide public cloud-based product services utilizing Cherry
             Studio.</li>
-          <li><strong>Voluntary Option:</strong> Even if your organization meets the "10 or Fewer Individuals"
-            condition, if your intended use case <strong>cannot comply with the terms of the AGPLv3</strong>
-            (particularly the obligations regarding <strong>source code disclosure</strong>), or if you require specific
-            commercial terms <strong>not offered</strong> by the AGPLv3 (such as warranties, indemnities, or freedom
-            from copyleft restrictions), you also <strong>must</strong> contact us to obtain and execute a Commercial
-            License.</li>
-          <li><strong>Common scenarios requiring a Commercial License include (but are not limited to):</strong>
-            <ul class="list-disc pl-6 mt-2 space-y-1">
-              <li>Your organization has more than 10 individuals who can access, use, or benefit from the software.</li>
-              <li>(Regardless of organization size) You wish to distribute a modified version of Cherry Studio but
-                <strong>do not want</strong> to disclose the source code of your modifications under AGPLv3.
-              </li>
-              <li>(Regardless of organization size) You wish to provide a network service (SaaS) based on a modified
-                version of Cherry Studio but <strong>do not want</strong> to provide the modified source code to users
-                of the service under AGPLv3.</li>
-              <li>(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.
-              </li>
-            </ul>
-          </li>
-          <li><strong>Obtaining a Commercial License:</strong> Please contact the Cherry Studio development team via
-            email at <a href="mailto:bd@cherry-ai.com" class="text-blue-600 hover:underline">bd@cherry-ai.com</a> to
-            discuss commercial licensing options.</li>
-        </ul>
+        </ol>
       </section>
 
       <section class="mb-8">
-        <h2 class="text-xl font-semibold mb-4 text-gray-900">3. Contributions</h2>
-        <ul class="list-disc pl-6 space-y-2 text-gray-700">
-          <li>We welcome community contributions to Cherry Studio. All contributions submitted to this project are
-            considered to be offered under the <strong>AGPLv3</strong> license.</li>
-          <li>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).</li>
-          <li>You also understand and agree that your contribution may be included in distributions of Cherry Studio
-            offered under our commercial license.</li>
-        </ul>
+        <h2 class="text-xl font-semibold mb-4 text-gray-900">II. Contributor Agreement</h2>
+        <p class="mb-4 text-gray-700">As a contributor to Cherry Studio, you must agree to the following terms:</p>
+        <ol class="list-decimal pl-6 space-y-2 text-gray-700">
+          <li><strong>License Adjustments:</strong> The producer reserves the right to adjust the open-source license as
+            necessary, making it more strict or permissive.</li>
+          <li><strong>Commercial Usage:</strong> Your contributed code may be used commercially, including but not
+            limited to cloud business operations.</li>
+        </ol>
       </section>
 
       <section class="mb-8">
-        <h2 class="text-xl font-semibold mb-4 text-gray-900">4. Other Terms</h2>
-        <ul class="list-disc pl-6 space-y-2 text-gray-700">
-          <li>The specific terms and conditions of the Commercial License are governed by the formal commercial license
-            agreement signed by both parties.</li>
-          <li>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).</li>
-        </ul>
+        <h2 class="text-xl font-semibold mb-4 text-gray-900">III. Other Terms</h2>
+        <ol class="list-decimal pl-6 space-y-2 text-gray-700">
+          <li>Cherry Studio developers reserve the right of final interpretation of these agreement terms.</li>
+          <li>This agreement may be updated according to practical circumstances, and users will be notified of updates
+            through this software.</li>
+        </ol>
       </section>
+
+      <p class="mt-8 text-gray-700">
+        Other than these specific conditions, all remaining rights and restrictions follow the Apache License 2.0. For
+        more detailed information regarding Apache License 2.0, please visit
+        <a href="http://www.apache.org/licenses/LICENSE-2.0"
+          class="text-blue-600 hover:underline">http://www.apache.org/licenses/LICENSE-2.0</a>.
+      </p>
     </div>
   </div>
 </body>

resources/textMonitor.swift

@@ -0,0 +1,117 @@
+import Cocoa
+import Foundation
+
+class TextSelectionObserver: NSObject {
+    let workspace = NSWorkspace.shared
+    var lastSelectedText: String?
+
+    override init() {
+        super.init()
+
+        // 注册通知观察者
+        let observer = NSWorkspace.shared.notificationCenter
+        observer.addObserver(
+            self,
+            selector: #selector(handleSelectionChange),
+            name: NSWorkspace.didActivateApplicationNotification,
+            object: nil
+        )
+
+        // 监听选择变化通知
+        var axObserver: AXObserver?
+        let error = AXObserverCreate(getpid(), { observer, element, notification, userData in
+            let selfPointer = userData!.load(as: TextSelectionObserver.self)
+            selfPointer.checkSelectedText()
+        }, &axObserver)
+
+        if error == .success, let axObserver = axObserver {
+            CFRunLoopAddSource(
+                RunLoop.main.getCFRunLoop(),
+                AXObserverGetRunLoopSource(axObserver),
+                .defaultMode
+            )
+
+            // 当前活动应用添加监听
+            updateActiveAppObserver(axObserver)
+        }
+    }
+
+    @objc func handleSelectionChange(_ notification: Notification) {
+        // 应用切换时更新监听
+        var axObserver: AXObserver?
+        let error = AXObserverCreate(getpid(), { _, _, _, _ in }, &axObserver)
+        if error == .success, let axObserver = axObserver {
+            updateActiveAppObserver(axObserver)
+        }
+    }
+
+    func updateActiveAppObserver(_ axObserver: AXObserver) {
+        guard let app = workspace.frontmostApplication else { return }
+        let pid = app.processIdentifier
+        let element = AXUIElementCreateApplication(pid)
+
+        // 添加选择变化通知监听
+        AXObserverAddNotification(
+            axObserver,
+            element,
+            kAXSelectedTextChangedNotification as CFString,
+            UnsafeMutableRawPointer(Unmanaged.passUnretained(self).toOpaque())
+        )
+    }
+
+    func checkSelectedText() {
+        if let text = getSelectedText() {
+            if text.count > 0 && text != lastSelectedText {
+                print(text)
+                fflush(stdout)
+                lastSelectedText = text
+            }
+        }
+    }
+
+    func getSelectedText() -> String? {
+        guard let app = NSWorkspace.shared.frontmostApplication else { return nil }
+        let pid = app.processIdentifier
+
+        let axApp = AXUIElementCreateApplication(pid)
+        var focusedElement: AnyObject?
+
+        // Get focused element
+        let result = AXUIElementCopyAttributeValue(axApp, kAXFocusedUIElementAttribute as CFString, &focusedElement)
+        guard result == .success else { return nil }
+
+        // Try different approaches to get selected text
+        var selectedText: AnyObject?
+
+        // First try: Direct selected text
+        var textResult = AXUIElementCopyAttributeValue(focusedElement as! AXUIElement, kAXSelectedTextAttribute as CFString, &selectedText)
+
+        // Second try: Selected text in text area
+        if textResult != .success {
+            var selectedTextRange: AnyObject?
+            textResult = AXUIElementCopyAttributeValue(focusedElement as! AXUIElement, kAXSelectedTextRangeAttribute as CFString, &selectedTextRange)
+            if textResult == .success {
+                textResult = AXUIElementCopyAttributeValue(focusedElement as! AXUIElement, kAXValueAttribute as CFString, &selectedText)
+            }
+        }
+
+        // Third try: Get selected text from parent element
+        if textResult != .success {
+            var parent: AnyObject?
+            if AXUIElementCopyAttributeValue(focusedElement as! AXUIElement, kAXParentAttribute as CFString, &parent) == .success {
+                textResult = AXUIElementCopyAttributeValue(parent as! AXUIElement, kAXSelectedTextAttribute as CFString, &selectedText)
+            }
+        }
+
+        guard textResult == .success, let text = selectedText as? String else { return nil }
+        return text
+    }
+}
+
+let observer = TextSelectionObserver()
+
+signal(SIGINT) { _ in
+    exit(0)
+}
+
+RunLoop.main.run()

scripts/after-pack.js

@@ -1,8 +1,10 @@
 const { Arch } = require('electron-builder')
+const { default: removeLocales } = require('./remove-locales')
 const fs = require('fs')
 const path = require('path')
 
 exports.default = async function (context) {
+  await removeLocales(context)
   const platform = context.packager.platform.name
   const arch = context.arch
 

scripts/artifact-build-completed.js

@@ -1,18 +0,0 @@
-const fs = require('fs')
-
-exports.default = function (buildResult) {
-  try {
-    console.log('[artifact build completed] rename artifact file...')
-    if (!buildResult.file.includes(' ')) {
-      return
-    }
-
-    let oldFilePath = buildResult.file
-    const newfilePath = oldFilePath.replace(/ /g, '-')
-    fs.renameSync(oldFilePath, newfilePath)
-    buildResult.file = newfilePath
-    console.log(`[artifact build completed] rename file ${oldFilePath} to ${newfilePath} `)
-  } catch (error) {
-    console.error('Error renaming file:', error)
-  }
-}

scripts/check-i18n.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, '__esModule', { value: true })
 var fs = require('fs')
 var path = require('path')
 var translationsDir = path.join(__dirname, '../src/renderer/src/i18n/locales')
-var baseLocale = 'en-us'
+var baseLocale = 'zh-CN'
 var baseFileName = ''.concat(baseLocale, '.json')
 var baseFilePath = path.join(translationsDir, baseFileName)
 /**

scripts/notarize.js

@@ -7,6 +7,7 @@ exports.default = async function notarizing(context) {
   }
 
   if (!process.env.APPLE_ID || !process.env.APPLE_APP_SPECIFIC_PASSWORD || !process.env.APPLE_TEAM_ID) {
+    console.log('Skipping notarization')
     return
   }
 

scripts/remove-locales.js

@@ -0,0 +1,58 @@
+const fs = require('fs')
+const path = require('path')
+
+exports.default = async function (context) {
+  const platform = context.packager.platform.name
+
+  // 根据平台确定 locales 目录位置
+  let resourceDirs = []
+  if (platform === 'mac') {
+    // macOS 的语言文件位置
+    resourceDirs = [
+      path.join(context.appOutDir, 'Cherry Studio.app', 'Contents', 'Resources'),
+      path.join(
+        context.appOutDir,
+        'Cherry Studio.app',
+        'Contents',
+        'Frameworks',
+        'Electron Framework.framework',
+        'Resources'
+      )
+    ]
+  } else {
+    // Windows 和 Linux 的语言文件位置
+    resourceDirs = [path.join(context.appOutDir, 'locales')]
+  }
+
+  // 处理每个资源目录
+  for (const resourceDir of resourceDirs) {
+    if (!fs.existsSync(resourceDir)) {
+      console.log(`Resource directory not found: ${resourceDir}, skipping...`)
+      continue
+    }
+
+    // 读取所有文件和目录
+    const items = fs.readdirSync(resourceDir)
+
+    // 遍历并删除不需要的语言文件
+    for (const item of items) {
+      if (platform === 'mac') {
+        // 在 macOS 上检查 .lproj 目录
+        if (item.endsWith('.lproj') && !item.match(/^(en|zh|ru)/)) {
+          const dirPath = path.join(resourceDir, item)
+          fs.rmSync(dirPath, { recursive: true, force: true })
+          console.log(`Removed locale directory: ${item} from ${resourceDir}`)
+        }
+      } else {
+        // 其他平台处理 .pak 文件
+        if (!item.match(/^(en|zh|ru)/)) {
+          const filePath = path.join(resourceDir, item)
+          fs.unlinkSync(filePath)
+          console.log(`Removed locale file: ${item} from ${resourceDir}`)
+        }
+      }
+    }
+  }
+
+  console.log('Locale cleanup completed!')
+}

scripts/replace-spaces.js

@@ -0,0 +1,58 @@
+// replaceSpaces.js
+
+const fs = require('fs')
+const path = require('path')
+
+const directory = 'dist'
+
+// 处理文件名中的空格
+function replaceFileNames() {
+  fs.readdir(directory, (err, files) => {
+    if (err) throw err
+
+    files.forEach((file) => {
+      const oldPath = path.join(directory, file)
+      const newPath = path.join(directory, file.replace(/ /g, '-'))
+
+      fs.stat(oldPath, (err, stats) => {
+        if (err) throw err
+
+        if (stats.isFile() && oldPath !== newPath) {
+          fs.rename(oldPath, newPath, (err) => {
+            if (err) throw err
+            console.log(`Renamed: ${oldPath} -> ${newPath}`)
+          })
+        }
+      })
+    })
+  })
+}
+
+function replaceYmlContent() {
+  fs.readdir(directory, (err, files) => {
+    if (err) throw err
+
+    files.forEach((file) => {
+      if (path.extname(file).toLowerCase() === '.yml') {
+        const filePath = path.join(directory, file)
+
+        fs.readFile(filePath, 'utf8', (err, data) => {
+          if (err) throw err
+
+          // 替换内容
+          const newContent = data.replace(/Cherry Studio-/g, 'Cherry-Studio-')
+
+          // 写回文件
+          fs.writeFile(filePath, newContent, 'utf8', (err) => {
+            if (err) throw err
+            console.log(`Updated content in: ${filePath}`)
+          })
+        })
+      }
+    })
+  })
+}
+
+// 执行两个操作
+replaceFileNames()
+replaceYmlContent()

scripts/update-i18n.ts

@@ -1,16 +1,16 @@
 /**
- * Paratera_API_KEY=sk-abcxxxxxxxxxxxxxxxxxxxxxxx123 ts-node scripts/update-i18n.ts
+ * OCOOL_API_KEY=sk-abcxxxxxxxxxxxxxxxxxxxxxxx123 ts-node scripts/update-i18n.ts
  */
 
 // OCOOL API KEY
-const Paratera_API_KEY = process.env.Paratera_API_KEY
+const OCOOL_API_KEY = process.env.OCOOL_API_KEY
 
 const INDEX = [
   //         语言的名称          代码            用来翻译的模型
-  { name: 'France', code: 'fr-fr', model: 'Qwen3-235B-A22B' },
-  { name: 'Spanish', code: 'es-es', model: 'Qwen3-235B-A22B' },
-  { name: 'Portuguese', code: 'pt-pt', model: 'Qwen3-235B-A22B' },
-  { name: 'Greek', code: 'el-gr', model: 'Qwen3-235B-A22B' }
+  { name: 'France', code: 'fr-fr', model: 'qwen2.5-32b-instruct' },
+  { name: 'Spanish', code: 'es-es', model: 'qwen2.5-32b-instruct' },
+  { name: 'Portuguese', code: 'pt-pt', model: 'qwen2.5-72b-instruct' },
+  { name: 'Greek', code: 'el-gr', model: 'qwen-turbo' }
 ]
 
 const fs = require('fs')
@@ -19,8 +19,8 @@ import OpenAI from 'openai'
 const zh = JSON.parse(fs.readFileSync('src/renderer/src/i18n/locales/zh-cn.json', 'utf8')) as object
 
 const openai = new OpenAI({
-  apiKey: Paratera_API_KEY,
-  baseURL: 'https://llmapi.paratera.com/v1'
+  apiKey: OCOOL_API_KEY,
+  baseURL: 'https://one.ocoolai.com/v1'
 })
 
 // 递归遍历翻译

src/main/config.ts

@@ -12,12 +12,12 @@ export const DATA_PATH = getDataPath()
 
 export const titleBarOverlayDark = {
   height: 40,
-  color: 'rgba(255,255,255,0)',
-  symbolColor: '#fff'
+  color: 'rgba(0,0,0,0)',
+  symbolColor: '#ffffff'
 }
 
 export const titleBarOverlayLight = {
   height: 40,
   color: 'rgba(255,255,255,0)',
-  symbolColor: '#000'
+  symbolColor: '#000000'
 }

src/main/constant.ts

@@ -2,4 +2,3 @@ export const isMac = process.platform === 'darwin'
 export const isWin = process.platform === 'win32'
 export const isLinux = process.platform === 'linux'
 export const isDev = process.env.NODE_ENV === 'development'
-export const isPortable = isWin && 'PORTABLE_EXECUTABLE_DIR' in process.env

src/main/embeddings/VoyageEmbeddings.ts

@@ -1,6 +1,5 @@
 import { BaseEmbeddings } from '@cherrystudio/embedjs-interfaces'
 import { VoyageEmbeddings as _VoyageEmbeddings } from '@langchain/community/embeddings/voyage'
-import Logger from 'electron-log'
 
 export default class VoyageEmbeddings extends BaseEmbeddings {
   private model: _VoyageEmbeddings
@@ -12,7 +11,6 @@ export default class VoyageEmbeddings extends BaseEmbeddings {
     if (!this.configuration.outputDimension) {
       throw new Error('You need to pass in the optional dimensions parameter for this model')
     }
-    Logger.log('VoyageEmbeddings', this.configuration)
     this.model = new _VoyageEmbeddings(this.configuration)
   }
   override async getDimensions(): Promise<number> {

src/main/index.ts

@@ -1,3 +1,5 @@
+import './services/MemoryFileService'
+
 import { electronApp, optimizer } from '@electron-toolkit/utils'
 import { replaceDevtoolsFont } from '@main/utils/windowUtil'
 import { IpcChannel } from '@shared/IpcChannel'
@@ -8,18 +10,10 @@ import Logger from 'electron-log'
 import { registerIpc } from './ipc'
 import { configManager } from './services/ConfigManager'
 import mcpService from './services/MCPService'
-import {
-  CHERRY_STUDIO_PROTOCOL,
-  handleProtocolUrl,
-  registerProtocolClient,
-  setupAppImageDeepLink
-} from './services/ProtocolClient'
+import { CHERRY_STUDIO_PROTOCOL, handleProtocolUrl, registerProtocolClient } from './services/ProtocolClient'
 import { registerShortcuts } from './services/ShortcutService'
 import { TrayService } from './services/TrayService'
 import { windowService } from './services/WindowService'
-import { setUserDataDir } from './utils/file'
-
-Logger.initialize()
 
 // Check for single instance lock
 if (!app.requestSingleInstanceLock()) {
@@ -58,11 +52,6 @@ if (!app.requestSingleInstanceLock()) {
 
     replaceDevtoolsFont(mainWindow)
 
-    setUserDataDir()
-
-    // Setup deep link for AppImage on Linux
-    await setupAppImageDeepLink()
-
     if (process.env.NODE_ENV === 'development') {
       installExtension([REDUX_DEVTOOLS, REACT_DEVELOPER_TOOLS])
         .then((name) => console.log(`Added Extension:  ${name}`))
@@ -71,10 +60,14 @@ if (!app.requestSingleInstanceLock()) {
     ipcMain.handle(IpcChannel.System_GetDeviceType, () => {
       return process.platform === 'darwin' ? 'mac' : process.platform === 'win32' ? 'windows' : 'linux'
     })
+  })
 
-    ipcMain.handle(IpcChannel.System_GetHostname, () => {
-      return require('os').hostname()
-    })
+  registerProtocolClient(app)
+
+  // macOS specific: handle protocol when app is already running
+  app.on('open-url', (event, url) => {
+    event.preventDefault()
+    handleProtocolUrl(url)
   })
 
   registerProtocolClient(app)

src/main/integration/nutstore/sso/lib/index.d.mts

@@ -1,14 +0,0 @@
-interface CreateOAuthUrlArgs {
-    app: string;
-}
-declare function createOAuthUrl({ app }: CreateOAuthUrlArgs): Promise<string>;
-declare function _dont_use_in_prod_createOAuthUrl({ app, }: CreateOAuthUrlArgs): Promise<string>;
-
-interface DecryptSecretArgs {
-    app: string;
-    s: string;
-}
-declare function decryptSecret({ app, s }: DecryptSecretArgs): Promise<string>;
-declare function _dont_use_in_prod_decryptSecret({ app, s, }: DecryptSecretArgs): Promise<string>;
-
-export { type CreateOAuthUrlArgs, type DecryptSecretArgs, _dont_use_in_prod_createOAuthUrl, _dont_use_in_prod_decryptSecret, createOAuthUrl, decryptSecret };

src/main/integration/nutstore/sso/lib/index.d.ts

@@ -0,0 +1,8 @@
+declare function decrypt(app: string, s: string): string
+
+interface Secret {
+  app: string
+}
+declare function createOAuthUrl(secret: Secret): string
+
+export { type Secret, createOAuthUrl, decrypt }

src/main/ipc.ts

@@ -1,12 +1,12 @@
+import './services/MemoryFileService'
+
 import fs from 'node:fs'
-import { arch } from 'node:os'
 
 import { isMac, isWin } from '@main/constant'
 import { getBinaryPath, isBinaryExists, runInstallScript } from '@main/utils/process'
-import { handleZoomFactor } from '@main/utils/zoom'
 import { IpcChannel } from '@shared/IpcChannel'
 import { Shortcut, ThemeMode } from '@types'
-import { BrowserWindow, ipcMain, nativeTheme, session, shell } from 'electron'
+import { BrowserWindow, ipcMain, session, shell } from 'electron'
 import log from 'electron-log'
 
 import { titleBarOverlayDark, titleBarOverlayLight } from './config'
@@ -20,19 +20,19 @@ import FileStorage from './services/FileStorage'
 import { GeminiService } from './services/GeminiService'
 import KnowledgeService from './services/KnowledgeService'
 import mcpService from './services/MCPService'
+import { memoryFileService } from './services/MemoryFileService'
 import * as NutstoreService from './services/NutstoreService'
 import ObsidianVaultService from './services/ObsidianVaultService'
 import { ProxyConfig, proxyManager } from './services/ProxyManager'
 import { searchService } from './services/SearchService'
 import { registerShortcuts, unregisterAllShortcuts } from './services/ShortcutService'
-import storeSyncService from './services/StoreSyncService'
 import { TrayService } from './services/TrayService'
-import { setOpenLinkExternal } from './services/WebviewService'
 import { windowService } from './services/WindowService'
 import { getResourcePath } from './utils'
 import { decrypt, encrypt } from './utils/aes'
 import { getConfigDir, getFilesDir } from './utils/file'
 import { compress, decompress } from './utils/zip'
+
 const fileManager = new FileStorage()
 const backupManager = new BackupManager()
 const exportService = new ExportService(fileManager)
@@ -49,9 +49,7 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     configPath: getConfigDir(),
     appDataPath: app.getPath('userData'),
     resourcesPath: getResourcePath(),
-    logsPath: log.transports.file.getFile().path,
-    arch: arch(),
-    isPortable: isWin && 'PORTABLE_EXECUTABLE_DIR' in process.env
+    logsPath: log.transports.file.getFile().path
   }))
 
   ipcMain.handle(IpcChannel.App_Proxy, async (_, proxy: string) => {
@@ -103,12 +101,6 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     configManager.setTrayOnClose(isActive)
   })
 
-  // auto update
-  ipcMain.handle(IpcChannel.App_SetAutoUpdate, (_, isActive: boolean) => {
-    appUpdater.setAutoUpdate(isActive)
-    configManager.setAutoUpdate(isActive)
-  })
-
   ipcMain.handle(IpcChannel.App_RestartTray, () => TrayService.getInstance().restartTray())
 
   ipcMain.handle(IpcChannel.Config_Set, (_, key: string, value: any) => {
@@ -120,41 +112,23 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   })
 
   // theme
-  ipcMain.handle(IpcChannel.App_SetTheme, (_, theme: ThemeMode) => {
-    const updateTitleBarOverlay = () => {
-      if (!mainWindow?.setTitleBarOverlay) return
-      const isDark = nativeTheme.shouldUseDarkColors
-      mainWindow.setTitleBarOverlay(isDark ? titleBarOverlayDark : titleBarOverlayLight)
-    }
+  ipcMain.handle(IpcChannel.App_SetTheme, (event, theme: ThemeMode) => {
+    if (theme === configManager.getTheme()) return
 
-    const broadcastThemeChange = () => {
-      const isDark = nativeTheme.shouldUseDarkColors
-      const effectiveTheme = isDark ? ThemeMode.dark : ThemeMode.light
-      BrowserWindow.getAllWindows().forEach((win) => win.webContents.send(IpcChannel.ThemeChange, effectiveTheme))
-    }
-
-    const notifyThemeChange = () => {
-      updateTitleBarOverlay()
-      broadcastThemeChange()
-    }
-
-    if (theme === ThemeMode.auto) {
-      nativeTheme.themeSource = 'system'
-      nativeTheme.on('updated', notifyThemeChange)
-    } else {
-      nativeTheme.themeSource = theme
-      nativeTheme.off('updated', notifyThemeChange)
-    }
-
-    updateTitleBarOverlay()
     configManager.setTheme(theme)
-    notifyThemeChange()
-  })
 
-  ipcMain.handle(IpcChannel.App_HandleZoomFactor, (_, delta: number, reset: boolean = false) => {
+    // should sync theme change to all windows
+    const senderWindowId = event.sender.id
     const windows = BrowserWindow.getAllWindows()
-    handleZoomFactor(windows, delta, reset)
-    return configManager.getZoomFactor()
+    // 向其他窗口广播主题变化
+    windows.forEach((win) => {
+      if (win.webContents.id !== senderWindowId) {
+        win.webContents.send(IpcChannel.ThemeChange, theme)
+      }
+    })
+
+    mainWindow?.setTitleBarOverlay &&
+      mainWindow.setTitleBarOverlay(theme === 'dark' ? titleBarOverlayDark : titleBarOverlayLight)
   })
 
   // clear cache
@@ -181,7 +155,11 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
 
   // check for update
   ipcMain.handle(IpcChannel.App_CheckForUpdate, async () => {
-    await appUpdater.checkForUpdates()
+    const update = await appUpdater.autoUpdater.checkForUpdates()
+    return {
+      currentVersion: appUpdater.autoUpdater.currentVersion,
+      updateInfo: update?.updateInfo
+    }
   })
 
   // zip
@@ -196,7 +174,6 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.Backup_ListWebdavFiles, backupManager.listWebdavFiles)
   ipcMain.handle(IpcChannel.Backup_CheckConnection, backupManager.checkConnection)
   ipcMain.handle(IpcChannel.Backup_CreateDirectory, backupManager.createDirectory)
-  ipcMain.handle(IpcChannel.Backup_DeleteWebdavFile, backupManager.deleteWebdavFile)
 
   // file
   ipcMain.handle(IpcChannel.File_Open, fileManager.open)
@@ -211,13 +188,11 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.File_SelectFolder, fileManager.selectFolder)
   ipcMain.handle(IpcChannel.File_Create, fileManager.createTempFile)
   ipcMain.handle(IpcChannel.File_Write, fileManager.writeFile)
-  ipcMain.handle(IpcChannel.File_WriteWithId, fileManager.writeFileWithId)
   ipcMain.handle(IpcChannel.File_SaveImage, fileManager.saveImage)
   ipcMain.handle(IpcChannel.File_Base64Image, fileManager.base64Image)
-  ipcMain.handle(IpcChannel.File_Base64File, fileManager.base64File)
   ipcMain.handle(IpcChannel.File_Download, fileManager.downloadFile)
   ipcMain.handle(IpcChannel.File_Copy, fileManager.copyFile)
-  ipcMain.handle(IpcChannel.File_BinaryImage, fileManager.binaryImage)
+  ipcMain.handle(IpcChannel.File_BinaryFile, fileManager.binaryFile)
 
   // fs
   ipcMain.handle(IpcChannel.Fs_Read, FileService.readFile)
@@ -292,8 +267,6 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.Mcp_CallTool, mcpService.callTool)
   ipcMain.handle(IpcChannel.Mcp_ListPrompts, mcpService.listPrompts)
   ipcMain.handle(IpcChannel.Mcp_GetPrompt, mcpService.getPrompt)
-  ipcMain.handle(IpcChannel.Mcp_ListResources, mcpService.listResources)
-  ipcMain.handle(IpcChannel.Mcp_GetResource, mcpService.getResource)
   ipcMain.handle(IpcChannel.Mcp_GetInstallInfo, mcpService.getInstallInfo)
 
   ipcMain.handle(IpcChannel.App_IsBinaryExist, (_, name: string) => isBinaryExists(name))
@@ -336,11 +309,20 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     return await searchService.openUrlInSearchWindow(uid, url)
   })
 
-  // webview
-  ipcMain.handle(IpcChannel.Webview_SetOpenLinkExternal, (_, webviewId: number, isExternal: boolean) =>
-    setOpenLinkExternal(webviewId, isExternal)
-  )
-
-  // store sync
-  storeSyncService.registerIpcHandler()
+  // memory
+  ipcMain.handle(IpcChannel.Memory_LoadData, async () => {
+    return await memoryFileService.loadData()
+  })
+  ipcMain.handle(IpcChannel.Memory_SaveData, async (_, data, forceOverwrite = false) => {
+    return await memoryFileService.saveData(data, forceOverwrite)
+  })
+  ipcMain.handle(IpcChannel.Memory_DeleteShortMemoryById, async (_, id) => {
+    return await memoryFileService.deleteShortMemoryById(id)
+  })
+  ipcMain.handle(IpcChannel.LongTermMemory_LoadData, async () => {
+    return await memoryFileService.loadLongTermData()
+  })
+  ipcMain.handle(IpcChannel.LongTermMemory_SaveData, async (_, data, forceOverwrite = false) => {
+    return await memoryFileService.saveLongTermData(data, forceOverwrite)
+  })
 }

src/main/mcpServers/brave-search.ts

@@ -237,7 +237,8 @@ async function getPoisData(apiKey: string, ids: string[]): Promise<BravePoiRespo
     throw new Error(`Brave API error: ${response.status} ${response.statusText}\n${await response.text()}`)
   }
 
-  return (await response.json()) as BravePoiResponse
+  const poisResponse = (await response.json()) as BravePoiResponse
+  return poisResponse
 }
 
 async function getDescriptionsData(apiKey: string, ids: string[]): Promise<BraveDescription> {
@@ -256,7 +257,8 @@ async function getDescriptionsData(apiKey: string, ids: string[]): Promise<Brave
     throw new Error(`Brave API error: ${response.status} ${response.statusText}\n${await response.text()}`)
   }
 
-  return (await response.json()) as BraveDescription
+  const descriptionsData = (await response.json()) as BraveDescription
+  return descriptionsData
 }
 
 function formatLocalResults(poisData: BravePoiResponse, descData: BraveDescription): string {

src/main/mcpServers/dify-knowledge.ts

@@ -1,260 +0,0 @@
-// inspired by https://dify.ai/blog/turn-your-dify-app-into-an-mcp-server
-import { Server } from '@modelcontextprotocol/sdk/server/index.js'
-import { CallToolRequestSchema, ListToolsRequestSchema, ToolSchema } from '@modelcontextprotocol/sdk/types.js'
-import { z } from 'zod'
-import { zodToJsonSchema } from 'zod-to-json-schema'
-
-interface DifyKnowledgeServerConfig {
-  difyKey: string
-  apiHost: string
-}
-
-interface DifyListKnowledgeResponse {
-  id: string
-  name: string
-  description: string
-}
-
-interface DifySearchKnowledgeResponse {
-  query: {
-    content: string
-  }
-  records: Array<{
-    segment: {
-      id: string
-      position: number
-      document_id: string
-      content: string
-      keywords: string[]
-      document?: {
-        id: string
-        data_source_type: string
-        name: string
-      }
-    }
-    score: number
-  }>
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const ToolInputSchema = ToolSchema.shape.inputSchema
-type ToolInput = z.infer<typeof ToolInputSchema>
-
-const SearchKnowledgeArgsSchema = z.object({
-  id: z.string().describe('Knowledge ID'),
-  query: z.string().describe('Query string'),
-  topK: z.number().optional().describe('Number of top results to return')
-})
-
-type McpResponse = {
-  content: Array<{ type: 'text'; text: string }>
-  isError?: boolean
-}
-
-class DifyKnowledgeServer {
-  public server: Server
-  private config: DifyKnowledgeServerConfig
-
-  constructor(difyKey: string, args: string[]) {
-    if (args.length === 0) {
-      throw new Error('DifyKnowledgeServer requires at least one argument')
-    }
-    this.config = {
-      difyKey: difyKey,
-      apiHost: args[0]
-    }
-    this.server = new Server(
-      {
-        name: '@cherry/dify-knowledge-server',
-        version: '0.1.0'
-      },
-      {
-        capabilities: {
-          tools: {}
-        }
-      }
-    )
-    this.initialize()
-  }
-
-  initialize() {
-    this.server.setRequestHandler(ListToolsRequestSchema, async () => {
-      return {
-        tools: [
-          {
-            name: 'list_knowledges',
-            description: 'List all knowledges',
-            inputSchema: {
-              type: 'object',
-              properties: {},
-              required: []
-            }
-          },
-          {
-            name: 'search_knowledge',
-            description: 'Search knowledge by id and query',
-            inputSchema: zodToJsonSchema(SearchKnowledgeArgsSchema) as ToolInput
-          }
-        ]
-      }
-    })
-
-    this.server.setRequestHandler(CallToolRequestSchema, async (request) => {
-      try {
-        const { name, arguments: args } = request.params
-        switch (name) {
-          case 'list_knowledges': {
-            return await this.performListKnowledges(this.config.difyKey, this.config.apiHost)
-          }
-          case 'search_knowledge': {
-            const parsed = SearchKnowledgeArgsSchema.safeParse(args)
-            if (!parsed.success) {
-              const errorDetails = JSON.stringify(parsed.error.format(), null, 2)
-              throw new Error(`无效的参数:\n${errorDetails}`)
-            }
-            return await this.performSearchKnowledge(
-              parsed.data.id,
-              parsed.data.query,
-              parsed.data.topK || 6,
-              this.config.difyKey,
-              this.config.apiHost
-            )
-          }
-          default:
-            throw new Error(`Unknown tool: ${name}`)
-        }
-      } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error)
-        return {
-          content: [{ type: 'text', text: `Error: ${errorMessage}` }],
-          isError: true
-        }
-      }
-    })
-  }
-
-  private async performListKnowledges(difyKey: string, apiHost: string): Promise<McpResponse> {
-    try {
-      const url = `${apiHost.replace(/\/$/, '')}/datasets`
-      const response = await fetch(url, {
-        method: 'GET',
-        headers: {
-          Authorization: `Bearer ${difyKey}`
-        }
-      })
-
-      if (!response.ok) {
-        const errorText = await response.text()
-        throw new Error(`API 请求失败，状态码 ${response.status}: ${errorText}`)
-      }
-
-      const apiResponse = await response.json()
-
-      const knowledges: DifyListKnowledgeResponse[] =
-        apiResponse?.data?.map((item: any) => ({
-          id: item.id,
-          name: item.name,
-          description: item.description || ''
-        })) || []
-
-      const listText =
-        knowledges.length > 0
-          ? knowledges.map((k) => `- **${k.name}** (ID: ${k.id})\n  ${k.description || 'No Description'}`).join('\n')
-          : '- No knowledges found.'
-
-      const formattedText = `### 可用知识库:\n\n${listText}`
-
-      return {
-        content: [{ type: 'text', text: formattedText }]
-      }
-    } catch (error) {
-      console.error('获取知识库列表时出错:', error)
-      const errorMessage = error instanceof Error ? error.message : String(error)
-      // 返回包含错误信息的 MCP 响应
-      return {
-        content: [{ type: 'text', text: `Accessing Knowledge Error: ${errorMessage}` }],
-        isError: true
-      }
-    }
-  }
-
-  private async performSearchKnowledge(
-    id: string,
-    query: string,
-    topK: number,
-    difyKey: string,
-    apiHost: string
-  ): Promise<McpResponse> {
-    try {
-      const url = `${apiHost.replace(/\/$/, '')}/datasets/${id}/retrieve`
-
-      const response = await fetch(url, {
-        method: 'POST',
-        headers: {
-          Authorization: `Bearer ${difyKey}`,
-          'Content-Type': 'application/json'
-        },
-        body: JSON.stringify({
-          query: query,
-          retrieval_model: {
-            top_k: topK,
-            // will be error if not set
-            reranking_enable: null,
-            score_threshold_enabled: null
-          }
-        })
-      })
-
-      if (!response.ok) {
-        const errorText = await response.text()
-        throw new Error(`API 请求失败，状态码 ${response.status}: ${errorText}`)
-      }
-
-      const searchResponse: DifySearchKnowledgeResponse = await response.json()
-
-      if (!searchResponse || !Array.isArray(searchResponse.records)) {
-        throw new Error(`从 Dify API 收到的响应格式无效: ${JSON.stringify(searchResponse)}`)
-      }
-
-      const header = `### Query: ${query}\n\n`
-      let body: string
-
-      if (searchResponse.records.length === 0) {
-        body = 'No results found.'
-      } else {
-        const resultsText = searchResponse.records
-          .map((record, index) => {
-            const docName = record.segment.document?.name || 'Unknown Document'
-            const content = record.segment.content.trim()
-            const score = record.score
-            const keywords = record.segment.keywords || []
-
-            let resultEntry = `#### ${index + 1}. ${docName} (Relevant Score: ${(score * 100).toFixed(1)}%)`
-            resultEntry += `\n${content}`
-            if (keywords.length > 0) {
-              resultEntry += `\n*Keywords: ${keywords.join(', ')}*`
-            }
-            return resultEntry
-          })
-          .join('\n\n')
-
-        body = `Found ${searchResponse.records.length} results:\n\n${resultsText}`
-      }
-
-      const formattedText = header + body
-
-      return {
-        content: [{ type: 'text', text: formattedText }]
-      }
-    } catch (error) {
-      console.error('搜索知识库时出错:', error)
-      const errorMessage = error instanceof Error ? error.message : String(error)
-      return {
-        content: [{ type: 'text', text: `Search Knowledge Error: ${errorMessage}` }],
-        isError: true
-      }
-    }
-  }
-}
-
-export default DifyKnowledgeServer

src/main/mcpServers/factory.ts

@@ -2,11 +2,11 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js'
 import Logger from 'electron-log'
 
 import BraveSearchServer from './brave-search'
-import DifyKnowledgeServer from './dify-knowledge'
 import FetchServer from './fetch'
 import FileSystemServer from './filesystem'
 import MemoryServer from './memory'
 import ThinkingServer from './sequentialthinking'
+import SimpleRememberServer from './simpleremember'
 
 export function createInMemoryMCPServer(name: string, args: string[] = [], envs: Record<string, string> = {}): Server {
   Logger.info(`[MCP] Creating in-memory MCP server: ${name} with args: ${args} and envs: ${JSON.stringify(envs)}`)
@@ -27,9 +27,9 @@ export function createInMemoryMCPServer(name: string, args: string[] = [], envs:
     case '@cherry/filesystem': {
       return new FileSystemServer(args).server
     }
-    case '@cherry/dify-knowledge': {
-      const difyKey = envs.DIFY_KEY
-      return new DifyKnowledgeServer(difyKey, args).server
+    case '@cherry/simpleremember': {
+      const envPath = envs.SIMPLEREMEMBER_FILE_PATH
+      return new SimpleRememberServer(envPath).server
     }
     default:
       throw new Error(`Unknown in-memory MCP server: ${name}`)

src/main/mcpServers/fetch.ts

@@ -209,16 +209,20 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
   const validatedArgs = RequestPayloadSchema.parse(args)
 
   if (request.params.name === 'fetch_html') {
-    return await Fetcher.html(validatedArgs)
+    const fetchResult = await Fetcher.html(validatedArgs)
+    return fetchResult
   }
   if (request.params.name === 'fetch_json') {
-    return await Fetcher.json(validatedArgs)
+    const fetchResult = await Fetcher.json(validatedArgs)
+    return fetchResult
   }
   if (request.params.name === 'fetch_txt') {
-    return await Fetcher.txt(validatedArgs)
+    const fetchResult = await Fetcher.txt(validatedArgs)
+    return fetchResult
   }
   if (request.params.name === 'fetch_markdown') {
-    return await Fetcher.markdown(validatedArgs)
+    const fetchResult = await Fetcher.markdown(validatedArgs)
+    return fetchResult
   }
   throw new Error('Tool not found')
 })

src/main/mcpServers/filesystem.ts

@@ -183,6 +183,7 @@ async function searchFiles(
         }
       } catch (error) {
         // Skip invalid paths during search
+        continue
       }
     }
   }

src/main/mcpServers/memory.ts

@@ -2,7 +2,6 @@ import { getConfigDir } from '@main/utils/file'
 import { Server } from '@modelcontextprotocol/sdk/server/index.js'
 import { CallToolRequestSchema, ErrorCode, ListToolsRequestSchema, McpError } from '@modelcontextprotocol/sdk/types.js'
 import { Mutex } from 'async-mutex' // 引入 Mutex
-import Logger from 'electron-log'
 import { promises as fs } from 'fs'
 import path from 'path'
 
@@ -356,9 +355,9 @@ class MemoryServer {
   private async _initializeManager(memoryPath: string): Promise<void> {
     try {
       this.knowledgeGraphManager = await KnowledgeGraphManager.create(memoryPath)
-      Logger.log('KnowledgeGraphManager initialized successfully.')
+      console.log('KnowledgeGraphManager initialized successfully.')
     } catch (error) {
-      Logger.error('Failed to initialize KnowledgeGraphManager:', error)
+      console.error('Failed to initialize KnowledgeGraphManager:', error)
       // Server might be unusable, consider how to handle this state
       // Maybe set a flag and return errors for all tool calls?
       this.knowledgeGraphManager = null // Ensure it's null if init fails

src/main/mcpServers/sequentialthinking.ts

@@ -55,8 +55,8 @@ class SequentialThinkingServer {
     const { thoughtNumber, totalThoughts, thought, isRevision, revisesThought, branchFromThought, branchId } =
       thoughtData
 
-    let prefix: string
-    let context: string
+    let prefix = ''
+    let context = ''
 
     if (isRevision) {
       prefix = chalk.yellow('🔄 Revision')

src/main/mcpServers/simpleremember.ts

@@ -0,0 +1,321 @@
+// src/main/mcpServers/simpleremember.ts
+import { getConfigDir } from '@main/utils/file'
+import { Server } from '@modelcontextprotocol/sdk/server/index.js'
+import {
+  CallToolRequestSchema,
+  ErrorCode,
+  ListPromptsRequestSchema,
+  ListToolsRequestSchema,
+  McpError
+} from '@modelcontextprotocol/sdk/types.js'
+import { Mutex } from 'async-mutex'
+import { promises as fs } from 'fs'
+import path from 'path'
+
+// 定义记忆文件路径
+const defaultMemoryPath = path.join(getConfigDir(), 'simpleremember.json')
+
+// 记忆项接口
+interface Memory {
+  content: string
+  createdAt: string
+}
+
+// 记忆存储结构
+interface MemoryStorage {
+  memories: Memory[]
+}
+
+class SimpleRememberManager {
+  private memoryPath: string
+  private memories: Memory[] = []
+  private fileMutex: Mutex = new Mutex()
+
+  constructor(memoryPath: string) {
+    this.memoryPath = memoryPath
+  }
+
+  // 静态工厂方法用于初始化
+  public static async create(memoryPath: string): Promise<SimpleRememberManager> {
+    const manager = new SimpleRememberManager(memoryPath)
+    await manager._ensureMemoryPathExists()
+    await manager._loadMemoriesFromDisk()
+    return manager
+  }
+
+  // 确保记忆文件存在
+  private async _ensureMemoryPathExists(): Promise<void> {
+    try {
+      const directory = path.dirname(this.memoryPath)
+      await fs.mkdir(directory, { recursive: true })
+      try {
+        await fs.access(this.memoryPath)
+      } catch (error) {
+        // 文件不存在，创建一个空文件
+        await fs.writeFile(this.memoryPath, JSON.stringify({ memories: [] }, null, 2))
+      }
+    } catch (error) {
+      console.error('Failed to ensure memory path exists:', error)
+      throw new McpError(
+        ErrorCode.InternalError,
+        `Failed to ensure memory path: ${error instanceof Error ? error.message : String(error)}`
+      )
+    }
+  }
+
+  // 从磁盘加载记忆
+  private async _loadMemoriesFromDisk(): Promise<void> {
+    try {
+      const data = await fs.readFile(this.memoryPath, 'utf-8')
+      // 处理空文件情况
+      if (data.trim() === '') {
+        this.memories = []
+        await this._persistMemories()
+        return
+      }
+      const storage: MemoryStorage = JSON.parse(data)
+      this.memories = storage.memories || []
+    } catch (error) {
+      if (error instanceof Error && 'code' in error && (error as any).code === 'ENOENT') {
+        this.memories = []
+        await this._persistMemories()
+      } else if (error instanceof SyntaxError) {
+        console.error('Failed to parse simpleremember.json, initializing with empty memories:', error)
+        this.memories = []
+        await this._persistMemories()
+      } else {
+        console.error('Unexpected error loading memories:', error)
+        throw new McpError(
+          ErrorCode.InternalError,
+          `Failed to load memories: ${error instanceof Error ? error.message : String(error)}`
+        )
+      }
+    }
+  }
+
+  // 将记忆持久化到磁盘
+  private async _persistMemories(): Promise<void> {
+    const release = await this.fileMutex.acquire()
+    try {
+      const storage: MemoryStorage = {
+        memories: this.memories
+      }
+      await fs.writeFile(this.memoryPath, JSON.stringify(storage, null, 2))
+    } catch (error) {
+      console.error('Failed to save memories:', error)
+      throw new McpError(
+        ErrorCode.InternalError,
+        `Failed to save memories: ${error instanceof Error ? error.message : String(error)}`
+      )
+    } finally {
+      release()
+    }
+  }
+
+  // 添加新记忆
+  async remember(memory: string): Promise<Memory> {
+    const newMemory: Memory = {
+      content: memory,
+      createdAt: new Date().toISOString()
+    }
+    this.memories.push(newMemory)
+    await this._persistMemories()
+    return newMemory
+  }
+
+  // 获取所有记忆
+  async getAllMemories(): Promise<Memory[]> {
+    return [...this.memories]
+  }
+
+  // 获取记忆 - 这个方法会被get_memories工具调用
+  async get_memories(): Promise<Memory[]> {
+    return this.getAllMemories()
+  }
+}
+
+// 定义工具 - 按照MCP规范定义工具
+const REMEMBER_TOOL = {
+  name: 'remember',
+  description:
+    '用于记忆长期有用信息的工具。这个工具会自动应用记忆，无需显式调用。只用于存储长期有用的信息，不适合临时信息。',
+  inputSchema: {
+    type: 'object',
+    properties: {
+      memory: {
+        type: 'string',
+        description: '要记住的简洁(1句话)记忆内容'
+      }
+    },
+    required: ['memory']
+  }
+}
+
+const GET_MEMORIES_TOOL = {
+  name: 'get_memories',
+  description: '获取所有已存储的记忆',
+  inputSchema: {
+    type: 'object',
+    properties: {}
+  }
+}
+
+// 添加日志以便调试
+console.log('[SimpleRemember] Defined tools:', { REMEMBER_TOOL, GET_MEMORIES_TOOL })
+
+class SimpleRememberServer {
+  public server: Server
+  private simpleRememberManager: SimpleRememberManager | null = null
+  private initializationPromise: Promise<void>
+
+  constructor(envPath: string = '') {
+    const memoryPath = envPath ? (path.isAbsolute(envPath) ? envPath : path.resolve(envPath)) : defaultMemoryPath
+
+    console.log('[SimpleRemember] Creating server with memory path:', memoryPath)
+
+    // 初始化服务器
+    this.server = new Server(
+      {
+        name: 'simple-remember-server',
+        version: '1.0.0'
+      },
+      {
+        capabilities: {
+          tools: {
+            // 按照MCP规范声明工具能力
+            listChanged: true
+          },
+          // 添加空的prompts能力，表示支持提示词功能但没有实际的提示词
+          prompts: {}
+        }
+      }
+    )
+
+    console.log('[SimpleRemember] Server initialized with tools capability')
+
+    // 手动添加工具到服务器的工具列表中
+    console.log('[SimpleRemember] Adding tools to server')
+
+    // 先设置请求处理程序，再初始化管理器
+    this.setupRequestHandlers()
+    this.initializationPromise = this._initializeManager(memoryPath)
+
+    console.log('[SimpleRemember] Server initialization complete')
+    // 打印工具信息以确认它们已注册
+    console.log('[SimpleRemember] Tools registered:', [REMEMBER_TOOL.name, GET_MEMORIES_TOOL.name])
+  }
+
+  private async _initializeManager(memoryPath: string): Promise<void> {
+    try {
+      this.simpleRememberManager = await SimpleRememberManager.create(memoryPath)
+      console.log('SimpleRememberManager initialized successfully.')
+    } catch (error) {
+      console.error('Failed to initialize SimpleRememberManager:', error)
+      this.simpleRememberManager = null
+    }
+  }
+
+  private async _getManager(): Promise<SimpleRememberManager> {
+    if (!this.simpleRememberManager) {
+      await this.initializationPromise
+      if (!this.simpleRememberManager) {
+        throw new McpError(ErrorCode.InternalError, 'SimpleRememberManager is not initialized')
+      }
+    }
+    return this.simpleRememberManager
+  }
+
+  setupRequestHandlers() {
+    // 添加对prompts/list请求的处理
+    this.server.setRequestHandler(ListPromptsRequestSchema, async (request) => {
+      console.log('[SimpleRemember] Listing prompts request received', request)
+
+      // 返回空的提示词列表
+      return {
+        prompts: []
+      }
+    })
+
+    this.server.setRequestHandler(ListToolsRequestSchema, async (request) => {
+      // 直接返回工具列表，不需要等待管理器初始化
+      console.log('[SimpleRemember] Listing tools request received', request)
+
+      // 打印工具定义以确保它们存在
+      console.log('[SimpleRemember] REMEMBER_TOOL:', JSON.stringify(REMEMBER_TOOL))
+      console.log('[SimpleRemember] GET_MEMORIES_TOOL:', JSON.stringify(GET_MEMORIES_TOOL))
+
+      const toolsList = [REMEMBER_TOOL, GET_MEMORIES_TOOL]
+      console.log('[SimpleRemember] Returning tools:', JSON.stringify(toolsList))
+
+      // 按照MCP规范返回工具列表
+      return {
+        tools: toolsList
+        // 如果有分页，可以添加nextCursor
+        // nextCursor: "next-page-cursor"
+      }
+    })
+
+    this.server.setRequestHandler(CallToolRequestSchema, async (request) => {
+      const { name, arguments: args } = request.params
+
+      console.log(`[SimpleRemember] Received tool call: ${name}`, args)
+
+      try {
+        const manager = await this._getManager()
+
+        if (name === 'remember') {
+          if (!args || typeof args.memory !== 'string') {
+            console.error(`[SimpleRemember] Invalid arguments for ${name}:`, args)
+            throw new McpError(ErrorCode.InvalidParams, `Invalid arguments for ${name}: 'memory' string is required.`)
+          }
+          console.log(`[SimpleRemember] Remembering: "${args.memory}"`)
+          const result = await manager.remember(args.memory)
+          console.log(`[SimpleRemember] Memory saved successfully:`, result)
+          // 按照MCP规范返回工具调用结果
+          return {
+            content: [
+              {
+                type: 'text',
+                text: `记忆已保存: "${args.memory}"`
+              }
+            ],
+            isError: false
+          }
+        }
+
+        if (name === 'get_memories') {
+          console.log(`[SimpleRemember] Getting all memories`)
+          const memories = await manager.get_memories()
+          console.log(`[SimpleRemember] Retrieved ${memories.length} memories`)
+          // 按照MCP规范返回工具调用结果
+          return {
+            content: [
+              {
+                type: 'text',
+                text: JSON.stringify(memories, null, 2)
+              }
+            ],
+            isError: false
+          }
+        }
+
+        console.error(`[SimpleRemember] Unknown tool: ${name}`)
+        throw new McpError(ErrorCode.MethodNotFound, `Unknown tool: ${name}`)
+      } catch (error) {
+        console.error(`[SimpleRemember] Error handling tool call ${name}:`, error)
+        // 按照MCP规范返回工具调用错误
+        return {
+          content: [
+            {
+              type: 'text',
+              text: error instanceof Error ? error.message : String(error)
+            }
+          ],
+          isError: true
+        }
+      }
+    })
+  }
+}
+
+export default SimpleRememberServer

src/main/reranker/BaseReranker.ts

@@ -17,10 +17,6 @@ export default abstract class BaseReranker {
    * Get Rerank Request Url
    */
   protected getRerankUrl() {
-    if (this.base.rerankModelProvider === 'dashscope') {
-      return 'https://dashscope.aliyuncs.com/api/v1/services/rerank/text-rerank/text-rerank'
-    }
-
     let baseURL = this.base?.rerankBaseURL?.endsWith('/')
       ? this.base.rerankBaseURL.slice(0, -1)
       : this.base.rerankBaseURL
@@ -32,56 +28,6 @@ export default abstract class BaseReranker {
     return `${baseURL}/rerank`
   }
 
-  /**
-   * Get Rerank Request Body
-   */
-  protected getRerankRequestBody(query: string, searchResults: ExtractChunkData[]) {
-    const provider = this.base.rerankModelProvider
-    const documents = searchResults.map((doc) => doc.pageContent)
-    const topN = this.base.topN || 5
-
-    if (provider === 'voyageai') {
-      return {
-        model: this.base.rerankModel,
-        query,
-        documents,
-        top_k: topN
-      }
-    } else if (provider === 'dashscope') {
-      return {
-        model: this.base.rerankModel,
-        input: {
-          query,
-          documents
-        },
-        parameters: {
-          top_n: topN
-        }
-      }
-    } else {
-      return {
-        model: this.base.rerankModel,
-        query,
-        documents,
-        top_n: topN
-      }
-    }
-  }
-
-  /**
-   * Extract Rerank Result
-   */
-  protected extractRerankResult(data: any) {
-    const provider = this.base.rerankModelProvider
-    if (provider === 'dashscope') {
-      return data.output.results
-    } else if (provider === 'voyageai') {
-      return data.data
-    } else {
-      return data.results
-    }
-  }
-
   /**
    * Get Rerank Result
    * @param searchResults

src/main/reranker/DefaultReranker.ts

@@ -0,0 +1,14 @@
+import type { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
+import { KnowledgeBaseParams } from '@types'
+
+import BaseReranker from './BaseReranker'
+
+export default class DefaultReranker extends BaseReranker {
+  constructor(base: KnowledgeBaseParams) {
+    super(base)
+  }
+
+  async rerank(): Promise<ExtractChunkData[]> {
+    throw new Error('Method not implemented.')
+  }
+}

src/main/reranker/JinaReranker.ts

@@ -1,10 +1,10 @@
 import { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
-import AxiosProxy from '@main/services/AxiosProxy'
 import { KnowledgeBaseParams } from '@types'
+import axios from 'axios'
 
 import BaseReranker from './BaseReranker'
 
-export default class GeneralReranker extends BaseReranker {
+export default class JinaReranker extends BaseReranker {
   constructor(base: KnowledgeBaseParams) {
     super(base)
   }
@@ -12,15 +12,21 @@ export default class GeneralReranker extends BaseReranker {
   public rerank = async (query: string, searchResults: ExtractChunkData[]): Promise<ExtractChunkData[]> => {
     const url = this.getRerankUrl()
 
-    const requestBody = this.getRerankRequestBody(query, searchResults)
+    const requestBody = {
+      model: this.base.rerankModel,
+      query,
+      documents: searchResults.map((doc) => doc.pageContent),
+      top_n: this.base.topN
+    }
 
     try {
-      const { data } = await AxiosProxy.axios.post(url, requestBody, { headers: this.defaultHeaders() })
+      const { data } = await axios.post(url, requestBody, { headers: this.defaultHeaders() })
 
-      const rerankResults = this.extractRerankResult(data)
+      const rerankResults = data.results
       return this.getRerankResult(searchResults, rerankResults)
     } catch (error: any) {
       const errorDetails = this.formatErrorMessage(url, error, requestBody)
+      console.error('Jina Reranker API Error:', errorDetails)
       throw new Error(`重排序请求失败: ${error.message}\n请求详情: ${errorDetails}`)
     }
   }

src/main/reranker/Reranker.ts

@@ -1,12 +1,13 @@
 import type { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
 import { KnowledgeBaseParams } from '@types'
 
-import GeneralReranker from './GeneralReranker'
+import BaseReranker from './BaseReranker'
+import RerankerFactory from './RerankerFactory'
 
 export default class Reranker {
-  private sdk: GeneralReranker
+  private sdk: BaseReranker
   constructor(base: KnowledgeBaseParams) {
-    this.sdk = new GeneralReranker(base)
+    this.sdk = RerankerFactory.create(base)
   }
   public async rerank(query: string, searchResults: ExtractChunkData[]): Promise<ExtractChunkData[]> {
     return this.sdk.rerank(query, searchResults)

src/main/reranker/RerankerFactory.ts

@@ -0,0 +1,20 @@
+import { KnowledgeBaseParams } from '@types'
+
+import BaseReranker from './BaseReranker'
+import DefaultReranker from './DefaultReranker'
+import JinaReranker from './JinaReranker'
+import SiliconFlowReranker from './SiliconFlowReranker'
+import VoyageReranker from './VoyageReranker'
+
+export default class RerankerFactory {
+  static create(base: KnowledgeBaseParams): BaseReranker {
+    if (base.rerankModelProvider === 'silicon') {
+      return new SiliconFlowReranker(base)
+    } else if (base.rerankModelProvider === 'jina') {
+      return new JinaReranker(base)
+    } else if (base.rerankModelProvider === 'voyageai') {
+      return new VoyageReranker(base)
+    }
+    return new DefaultReranker(base)
+  }
+}

src/main/reranker/SiliconFlowReranker.ts

@@ -0,0 +1,36 @@
+import type { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
+import { KnowledgeBaseParams } from '@types'
+import axios from 'axios'
+
+import BaseReranker from './BaseReranker'
+
+export default class SiliconFlowReranker extends BaseReranker {
+  constructor(base: KnowledgeBaseParams) {
+    super(base)
+  }
+
+  public rerank = async (query: string, searchResults: ExtractChunkData[]): Promise<ExtractChunkData[]> => {
+    const url = this.getRerankUrl()
+
+    const requestBody = {
+      model: this.base.rerankModel,
+      query,
+      documents: searchResults.map((doc) => doc.pageContent),
+      top_n: this.base.topN,
+      max_chunks_per_doc: this.base.chunkSize,
+      overlap_tokens: this.base.chunkOverlap
+    }
+
+    try {
+      const { data } = await axios.post(url, requestBody, { headers: this.defaultHeaders() })
+
+      const rerankResults = data.results
+      return this.getRerankResult(searchResults, rerankResults)
+    } catch (error: any) {
+      const errorDetails = this.formatErrorMessage(url, error, requestBody)
+
+      console.error('SiliconFlow Reranker API 错误:', errorDetails)
+      throw new Error(`重排序请求失败: ${error.message}\n请求详情: ${errorDetails}`)
+    }
+  }
+}

src/main/reranker/VoyageReranker.ts

@@ -0,0 +1,40 @@
+import { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
+import { KnowledgeBaseParams } from '@types'
+import axios from 'axios'
+
+import BaseReranker from './BaseReranker'
+
+export default class VoyageReranker extends BaseReranker {
+  constructor(base: KnowledgeBaseParams) {
+    super(base)
+  }
+
+  public rerank = async (query: string, searchResults: ExtractChunkData[]): Promise<ExtractChunkData[]> => {
+    const url = this.getRerankUrl()
+
+    const requestBody = {
+      model: this.base.rerankModel,
+      query,
+      documents: searchResults.map((doc) => doc.pageContent),
+      top_k: this.base.topN,
+      return_documents: false,
+      truncation: true
+    }
+
+    try {
+      const { data } = await axios.post(url, requestBody, {
+        headers: {
+          ...this.defaultHeaders()
+        }
+      })
+
+      const rerankResults = data.data
+      return this.getRerankResult(searchResults, rerankResults)
+    } catch (error: any) {
+      const errorDetails = this.formatErrorMessage(url, error, requestBody)
+
+      console.error('Voyage Reranker API Error:', errorDetails)
+      throw new Error(`重排序请求失败: ${error.message}\n请求详情: ${errorDetails}`)
+    }
+  }
+}

src/main/services/AppUpdater.ts

@@ -1,4 +1,3 @@
-import { isWin } from '@main/constant'
 import { IpcChannel } from '@shared/IpcChannel'
 import { UpdateInfo } from 'builder-util-runtime'
 import { app, BrowserWindow, dialog } from 'electron'
@@ -6,7 +5,6 @@ import logger from 'electron-log'
 import { AppUpdater as _AppUpdater, autoUpdater } from 'electron-updater'
 
 import icon from '../../../build/icon.png?asset'
-import { configManager } from './ConfigManager'
 
 export default class AppUpdater {
   autoUpdater: _AppUpdater = autoUpdater
@@ -17,8 +15,7 @@ export default class AppUpdater {
 
     autoUpdater.logger = logger
     autoUpdater.forceDevUpdateConfig = !app.isPackaged
-    autoUpdater.autoDownload = configManager.getAutoUpdate()
-    autoUpdater.autoInstallOnAppQuit = configManager.getAutoUpdate()
+    autoUpdater.autoDownload = true
 
     // 检测下载错误
     autoUpdater.on('error', (error) => {
@@ -56,40 +53,6 @@ export default class AppUpdater {
     this.autoUpdater = autoUpdater
   }
 
-  public setAutoUpdate(isActive: boolean) {
-    autoUpdater.autoDownload = isActive
-    autoUpdater.autoInstallOnAppQuit = isActive
-  }
-
-  public async checkForUpdates() {
-    if (isWin && 'PORTABLE_EXECUTABLE_DIR' in process.env) {
-      return {
-        currentVersion: app.getVersion(),
-        updateInfo: null
-      }
-    }
-
-    try {
-      const update = await this.autoUpdater.checkForUpdates()
-      if (update?.isUpdateAvailable && !this.autoUpdater.autoDownload) {
-        // 如果 autoDownload 为 false，则需要再调用下面的函数触发下
-        // do not use await, because it will block the return of this function
-        this.autoUpdater.downloadUpdate()
-      }
-
-      return {
-        currentVersion: this.autoUpdater.currentVersion,
-        updateInfo: update?.updateInfo
-      }
-    } catch (error) {
-      logger.error('Failed to check for update:', error)
-      return {
-        currentVersion: app.getVersion(),
-        updateInfo: null
-      }
-    }
-  }
-
   public async showUpdateDialog(mainWindow: BrowserWindow) {
     if (!this.releaseInfo) {
       return

src/main/services/AxiosProxy.ts

@@ -1,29 +0,0 @@
-import { AxiosInstance, default as axios_ } from 'axios'
-import { ProxyAgent } from 'proxy-agent'
-
-import { proxyManager } from './ProxyManager'
-
-class AxiosProxy {
-  private cacheAxios: AxiosInstance | null = null
-  private proxyAgent: ProxyAgent | null = null
-
-  get axios(): AxiosInstance {
-    const currentProxyAgent = proxyManager.getProxyAgent()
-
-    // 如果代理发生变化或尚未初始化，则重新创建 axios 实例
-    if (this.cacheAxios === null || (currentProxyAgent !== null && this.proxyAgent !== currentProxyAgent)) {
-      this.proxyAgent = currentProxyAgent
-
-      // 创建带有代理配置的 axios 实例
-      this.cacheAxios = axios_.create({
-        proxy: false,
-        httpAgent: currentProxyAgent || undefined,
-        httpsAgent: currentProxyAgent || undefined
-      })
-    }
-
-    return this.cacheAxios
-  }
-}
-
-export default new AxiosProxy()

src/main/services/BackupManager.ts

@@ -1,14 +1,14 @@
 import { IpcChannel } from '@shared/IpcChannel'
 import { WebDavConfig } from '@types'
-import archiver from 'archiver'
+import AdmZip from 'adm-zip'
 import { exec } from 'child_process'
 import { app } from 'electron'
 import Logger from 'electron-log'
-import extract from 'extract-zip'
 import * as fs from 'fs-extra'
 import * as path from 'path'
 import { createClient, CreateDirectoryOptions, FileStat } from 'webdav'
 
+import { getConfigDir } from '../utils/file'
 import WebDav from './WebDav'
 import { windowService } from './WindowService'
 
@@ -23,7 +23,6 @@ class BackupManager {
     this.backupToWebdav = this.backupToWebdav.bind(this)
     this.restoreFromWebdav = this.restoreFromWebdav.bind(this)
     this.listWebdavFiles = this.listWebdavFiles.bind(this)
-    this.deleteWebdavFile = this.deleteWebdavFile.bind(this)
   }
 
   private async setWritableRecursive(dirPath: string): Promise<void> {
@@ -92,7 +91,6 @@ class BackupManager {
 
       // 使用流的方式写入 data.json
       const tempDataPath = path.join(this.tempDir, 'data.json')
-
       await new Promise<void>((resolve, reject) => {
         const writeStream = fs.createWriteStream(tempDataPath)
         writeStream.write(data)
@@ -101,7 +99,6 @@ class BackupManager {
         writeStream.on('finish', () => resolve())
         writeStream.on('error', (error) => reject(error))
       })
-
       onProgress({ stage: 'writing_data', progress: 20, total: 100 })
 
       // 复制 Data 目录到临时目录
@@ -115,92 +112,37 @@ class BackupManager {
       // 使用流式复制
       await this.copyDirWithProgress(sourcePath, tempDataDir, (size) => {
         copiedSize += size
-        const progress = Math.min(50, Math.floor((copiedSize / totalSize) * 50))
+        const progress = Math.min(70, 20 + Math.floor((copiedSize / totalSize) * 50))
         onProgress({ stage: 'copying_files', progress, total: 100 })
       })
 
-      await this.setWritableRecursive(tempDataDir)
-      onProgress({ stage: 'preparing_compression', progress: 50, total: 100 })
+      // 复制记忆数据文件
+      const configDir = getConfigDir()
+      const memoryDataPath = path.join(configDir, 'memory-data.json')
+      const tempConfigDir = path.join(this.tempDir, 'Config')
+      const tempMemoryDataPath = path.join(tempConfigDir, 'memory-data.json')
 
-      // 创建输出文件流
-      const backupedFilePath = path.join(destinationPath, fileName)
-      const output = fs.createWriteStream(backupedFilePath)
+      // 确保目录存在
+      await fs.ensureDir(tempConfigDir)
 
-      // 创建 archiver 实例，启用 ZIP64 支持
-      const archive = archiver('zip', {
-        zlib: { level: 1 }, // 使用最低压缩级别以提高速度
-        zip64: true // 启用 ZIP64 支持以处理大文件
-      })
-
-      let lastProgress = 50
-      let totalEntries = 0
-      let processedEntries = 0
-      let totalBytes = 0
-      let processedBytes = 0
-
-      // 首先计算总文件数和总大小
-      const calculateTotals = async (dirPath: string) => {
-        const items = await fs.readdir(dirPath, { withFileTypes: true })
-        for (const item of items) {
-          const fullPath = path.join(dirPath, item.name)
-          if (item.isDirectory()) {
-            await calculateTotals(fullPath)
-          } else {
-            totalEntries++
-            const stats = await fs.stat(fullPath)
-            totalBytes += stats.size
-          }
-        }
+      // 如果记忆数据文件存在，则复制
+      if (await fs.pathExists(memoryDataPath)) {
+        await fs.copy(memoryDataPath, tempMemoryDataPath)
+        Logger.log('[BackupManager] Memory data file copied')
+        onProgress({ stage: 'copying_memory_data', progress: 75, total: 100 })
+      } else {
+        Logger.log('[BackupManager] Memory data file not found, skipping')
+        onProgress({ stage: 'copying_memory_data', progress: 75, total: 100 })
       }
 
-      await calculateTotals(this.tempDir)
+      await this.setWritableRecursive(tempDataDir)
+      onProgress({ stage: 'compressing', progress: 80, total: 100 })
 
-      // 监听文件添加事件
-      archive.on('entry', () => {
-        processedEntries++
-        if (totalEntries > 0) {
-          const progressPercent = Math.min(55, 50 + Math.floor((processedEntries / totalEntries) * 5))
-          if (progressPercent > lastProgress) {
-            lastProgress = progressPercent
-            onProgress({ stage: 'compressing', progress: progressPercent, total: 100 })
-          }
-        }
-      })
-
-      // 监听数据写入事件
-      archive.on('data', (chunk) => {
-        processedBytes += chunk.length
-        if (totalBytes > 0) {
-          const progressPercent = Math.min(99, 55 + Math.floor((processedBytes / totalBytes) * 44))
-          if (progressPercent > lastProgress) {
-            lastProgress = progressPercent
-            onProgress({ stage: 'compressing', progress: progressPercent, total: 100 })
-          }
-        }
-      })
-
-      // 使用 Promise 等待压缩完成
-      await new Promise<void>((resolve, reject) => {
-        output.on('close', () => {
-          onProgress({ stage: 'compressing', progress: 100, total: 100 })
-          resolve()
-        })
-        archive.on('error', reject)
-        archive.on('warning', (err: any) => {
-          if (err.code !== 'ENOENT') {
-            Logger.warn('[BackupManager] Archive warning:', err)
-          }
-        })
-
-        // 将输出流连接到压缩器
-        archive.pipe(output)
-
-        // 添加整个临时目录到压缩文件
-        archive.directory(this.tempDir, false)
-
-        // 完成压缩
-        archive.finalize()
-      })
+      // 使用 adm-zip 创建压缩文件
+      const zip = new AdmZip()
+      zip.addLocalFolder(this.tempDir)
+      const backupedFilePath = path.join(destinationPath, fileName)
+      zip.writeZip(backupedFilePath)
 
       // 清理临时目录
       await fs.remove(this.tempDir)
@@ -210,8 +152,6 @@ class BackupManager {
       return backupedFilePath
     } catch (error) {
       Logger.error('[BackupManager] Backup failed:', error)
-      // 确保清理临时目录
-      await fs.remove(this.tempDir).catch(() => {})
       throw error
     }
   }
@@ -230,22 +170,16 @@ class BackupManager {
       onProgress({ stage: 'preparing', progress: 0, total: 100 })
 
       Logger.log('[backup] step 1: unzip backup file', this.tempDir)
-
-      // 使用 extract-zip 解压
-      await extract(backupPath, {
-        dir: this.tempDir,
-        onEntry: () => {
-          // 这里可以处理进度，但 extract-zip 不提供总条目数信息
-          onProgress({ stage: 'extracting', progress: 15, total: 100 })
-        }
-      })
-      onProgress({ stage: 'extracting', progress: 25, total: 100 })
+      // 使用 adm-zip 解压
+      const zip = new AdmZip(backupPath)
+      zip.extractAllTo(this.tempDir, true) // true 表示覆盖已存在的文件
+      onProgress({ stage: 'extracting', progress: 20, total: 100 })
 
       Logger.log('[backup] step 2: read data.json')
       // 读取 data.json
       const dataPath = path.join(this.tempDir, 'data.json')
       const data = await fs.readFile(dataPath, 'utf-8')
-      onProgress({ stage: 'reading_data', progress: 35, total: 100 })
+      onProgress({ stage: 'reading_data', progress: 40, total: 100 })
 
       Logger.log('[backup] step 3: restore Data directory')
       // 恢复 Data 目录
@@ -262,11 +196,32 @@ class BackupManager {
       // 使用流式复制
       await this.copyDirWithProgress(sourcePath, destPath, (size) => {
         copiedSize += size
-        const progress = Math.min(85, 35 + Math.floor((copiedSize / totalSize) * 50))
+        const progress = Math.min(80, 40 + Math.floor((copiedSize / totalSize) * 40))
         onProgress({ stage: 'copying_files', progress, total: 100 })
       })
 
-      Logger.log('[backup] step 4: clean up temp directory')
+      // 恢复记忆数据文件
+      Logger.log('[backup] step 4: restore memory data file')
+      const tempConfigDir = path.join(this.tempDir, 'Config')
+      const tempMemoryDataPath = path.join(tempConfigDir, 'memory-data.json')
+
+      if (await fs.pathExists(tempMemoryDataPath)) {
+        const configDir = getConfigDir()
+        const memoryDataPath = path.join(configDir, 'memory-data.json')
+
+        // 确保目录存在
+        await fs.ensureDir(configDir)
+
+        // 复制记忆数据文件
+        await fs.copy(tempMemoryDataPath, memoryDataPath)
+        Logger.log('[backup] Memory data file restored')
+        onProgress({ stage: 'restoring_memory_data', progress: 90, total: 100 })
+      } else {
+        Logger.log('[backup] Memory data file not found in backup, skipping')
+        onProgress({ stage: 'restoring_memory_data', progress: 90, total: 100 })
+      }
+
+      Logger.log('[backup] step 5: clean up temp directory')
       // 清理临时目录
       await this.setWritableRecursive(this.tempDir)
       await fs.remove(this.tempDir)
@@ -286,18 +241,9 @@ class BackupManager {
     const filename = webdavConfig.fileName || 'cherry-studio.backup.zip'
     const backupedFilePath = await this.backup(_, filename, data)
     const webdavClient = new WebDav(webdavConfig)
-    try {
-      const result = await webdavClient.putFileContents(filename, fs.createReadStream(backupedFilePath), {
-        overwrite: true
-      })
-      // 上传成功后删除本地备份文件
-      await fs.remove(backupedFilePath)
-      return result
-    } catch (error) {
-      // 上传失败时也删除本地临时文件
-      await fs.remove(backupedFilePath).catch(() => {})
-      throw error
-    }
+    return await webdavClient.putFileContents(filename, fs.createReadStream(backupedFilePath), {
+      overwrite: true
+    })
   }
 
   async restoreFromWebdav(_: Electron.IpcMainInvokeEvent, webdavConfig: WebDavConfig) {
@@ -404,16 +350,6 @@ class BackupManager {
     const webdavClient = new WebDav(webdavConfig)
     return await webdavClient.createDirectory(path, options)
   }
-
-  async deleteWebdavFile(_: Electron.IpcMainInvokeEvent, fileName: string, webdavConfig: WebDavConfig) {
-    try {
-      const webdavClient = new WebDav(webdavConfig)
-      return await webdavClient.deleteFile(fileName)
-    } catch (error: any) {
-      Logger.error('Failed to delete WebDAV file:', error)
-      throw new Error(error.message || 'Failed to delete backup file')
-    }
-  }
 }
 
 export default BackupManager

src/main/services/ClipboardMonitor.ts

@@ -0,0 +1,118 @@
+import { debounce, getResourcePath } from '@main/utils'
+import { exec } from 'child_process'
+import { screen } from 'electron'
+import path from 'path'
+
+import { windowService } from './WindowService'
+
+export default class ClipboardMonitor {
+  private platform: string
+  private lastText: string
+  private user32: any
+  private observer: any
+  public onTextSelected: (text: string) => void
+
+  constructor() {
+    this.platform = process.platform
+    this.lastText = ''
+    this.onTextSelected = debounce((text: string) => this.handleTextSelected(text), 550)
+
+    if (this.platform === 'win32') {
+      this.setupWindows()
+    } else if (this.platform === 'darwin') {
+      this.setupMacOS()
+    }
+  }
+
+  setupMacOS() {
+    // 使用 Swift 脚本来监听文本选择
+    const scriptPath = path.join(getResourcePath(), 'textMonitor.swift')
+
+    // 启动 Swift 进程来监听文本选择
+    const process = exec(`swift ${scriptPath}`)
+
+    process?.stdout?.on('data', (data: string) => {
+      console.log('[ClipboardMonitor] MacOS data:', data)
+      const text = data.toString().trim()
+      if (text && text !== this.lastText) {
+        this.lastText = text
+        this.onTextSelected(text)
+      }
+    })
+
+    process.on('error', (error) => {
+      console.error('[ClipboardMonitor] MacOS error:', error)
+    })
+  }
+
+  setupWindows() {
+    // 使用 Windows API 监听文本选择事件
+    const ffi = require('ffi-napi')
+    const ref = require('ref-napi')
+
+    this.user32 = new ffi.Library('user32', {
+      SetWinEventHook: ['pointer', ['uint32', 'uint32', 'pointer', 'pointer', 'uint32', 'uint32', 'uint32']],
+      UnhookWinEvent: ['bool', ['pointer']]
+    })
+
+    // 定义事件常量
+    const EVENT_OBJECT_SELECTION = 0x8006
+    const WINEVENT_OUTOFCONTEXT = 0x0000
+    const WINEVENT_SKIPOWNTHREAD = 0x0001
+    const WINEVENT_SKIPOWNPROCESS = 0x0002
+
+    // 创建回调函数
+    const callback = ffi.Callback('void', ['pointer', 'uint32', 'pointer', 'long', 'long', 'uint32', 'uint32'], () => {
+      this.getSelectedText()
+    })
+
+    // 设置事件钩子
+    this.observer = this.user32.SetWinEventHook(
+      EVENT_OBJECT_SELECTION,
+      EVENT_OBJECT_SELECTION,
+      ref.NULL,
+      callback,
+      0,
+      0,
+      WINEVENT_OUTOFCONTEXT | WINEVENT_SKIPOWNTHREAD | WINEVENT_SKIPOWNPROCESS
+    )
+  }
+
+  getSelectedText() {
+    // Get selected text
+    if (this.platform === 'win32') {
+      const ref = require('ref-napi')
+      if (this.user32.OpenClipboard(ref.NULL)) {
+        // Get clipboard content
+        const text = this.user32.GetClipboardData(1) // CF_TEXT = 1
+        this.user32.CloseClipboard()
+
+        if (text && text !== this.lastText) {
+          this.lastText = text
+          this.onTextSelected(text)
+        }
+      }
+    }
+  }
+
+  private handleTextSelected(text: string) {
+    if (!text) return
+
+    console.log('[ClipboardMonitor] handleTextSelected', text)
+
+    windowService.setLastSelectedText(text)
+
+    const mousePosition = screen.getCursorScreenPoint()
+
+    windowService.showSelectionMenu({
+      x: mousePosition.x,
+      y: mousePosition.y + 10
+    })
+  }
+
+  dispose() {
+    if (this.platform === 'win32' && this.observer) {
+      this.user32.UnhookWinEvent(this.observer)
+    }
+  }
+}

src/main/services/ConfigManager.ts

@@ -14,9 +14,7 @@ enum ConfigKeys {
   ZoomFactor = 'ZoomFactor',
   Shortcuts = 'shortcuts',
   ClickTrayToShowQuickAssistant = 'clickTrayToShowQuickAssistant',
-  EnableQuickAssistant = 'enableQuickAssistant',
-  AutoUpdate = 'autoUpdate',
-  EnableDataCollection = 'enableDataCollection'
+  EnableQuickAssistant = 'enableQuickAssistant'
 }
 
 export class ConfigManager {
@@ -37,7 +35,7 @@ export class ConfigManager {
   }
 
   getTheme(): ThemeMode {
-    return this.get(ConfigKeys.Theme, ThemeMode.auto)
+    return this.get(ConfigKeys.Theme, ThemeMode.light)
   }
 
   setTheme(theme: ThemeMode) {
@@ -130,22 +128,6 @@ export class ConfigManager {
     this.set(ConfigKeys.EnableQuickAssistant, value)
   }
 
-  getAutoUpdate(): boolean {
-    return this.get<boolean>(ConfigKeys.AutoUpdate, true)
-  }
-
-  setAutoUpdate(value: boolean) {
-    this.set(ConfigKeys.AutoUpdate, value)
-  }
-
-  getEnableDataCollection(): boolean {
-    return this.get<boolean>(ConfigKeys.EnableDataCollection, true)
-  }
-
-  setEnableDataCollection(value: boolean) {
-    this.set(ConfigKeys.EnableDataCollection, value)
-  }
-
   set(key: string, value: unknown) {
     this.store.set(key, value)
   }

src/main/services/ContextMenu.ts

@@ -1,77 +0,0 @@
-import { Menu, MenuItemConstructorOptions } from 'electron'
-
-import { locales } from '../utils/locales'
-import { configManager } from './ConfigManager'
-
-class ContextMenu {
-  public contextMenu(w: Electron.BrowserWindow) {
-    w.webContents.on('context-menu', (_event, properties) => {
-      const template: MenuItemConstructorOptions[] = this.createEditMenuItems(properties)
-      const filtered = template.filter((item) => item.visible !== false)
-      if (filtered.length > 0) {
-        const menu = Menu.buildFromTemplate([...filtered, ...this.createInspectMenuItems(w)])
-        menu.popup()
-      }
-    })
-  }
-
-  private createInspectMenuItems(w: Electron.BrowserWindow): MenuItemConstructorOptions[] {
-    const locale = locales[configManager.getLanguage()]
-    const { common } = locale.translation
-    const template: MenuItemConstructorOptions[] = [
-      {
-        id: 'inspect',
-        label: common.inspect,
-        click: () => {
-          w.webContents.toggleDevTools()
-        },
-        enabled: true
-      }
-    ]
-
-    return template
-  }
-
-  private createEditMenuItems(properties: Electron.ContextMenuParams): MenuItemConstructorOptions[] {
-    const locale = locales[configManager.getLanguage()]
-    const { common } = locale.translation
-    const hasText = properties.selectionText.trim().length > 0
-    const can = (type: string) => properties.editFlags[`can${type}`] && hasText
-
-    const template: MenuItemConstructorOptions[] = [
-      {
-        id: 'copy',
-        label: common.copy,
-        role: 'copy',
-        enabled: can('Copy'),
-        visible: properties.isEditable || hasText
-      },
-      {
-        id: 'paste',
-        label: common.paste,
-        role: 'paste',
-        enabled: properties.editFlags.canPaste,
-        visible: properties.isEditable
-      },
-      {
-        id: 'cut',
-        label: common.cut,
-        role: 'cut',
-        enabled: can('Cut'),
-        visible: properties.isEditable
-      }
-    ]
-
-    // remove role from items that are not enabled
-    // https://github.com/electron/electron/issues/13554
-    template.forEach((item) => {
-      if (item.enabled === false) {
-        item.role = undefined
-      }
-    })
-
-    return template
-  }
-}
-
-export const contextMenu = new ContextMenu()

src/main/services/CopilotService.ts

@@ -1,11 +1,8 @@
-import { AxiosRequestConfig } from 'axios'
+import axios, { AxiosRequestConfig } from 'axios'
 import { app, safeStorage } from 'electron'
-import Logger from 'electron-log'
 import fs from 'fs/promises'
 import path from 'path'
 
-import aoxisProxy from './AxiosProxy'
-
 // 配置常量，集中管理
 const CONFIG = {
   GITHUB_CLIENT_ID: 'Iv1.b507a08c87ecfe98',
@@ -96,7 +93,7 @@ class CopilotService {
         }
       }
 
-      const response = await aoxisProxy.axios.get(CONFIG.API_URLS.GITHUB_USER, config)
+      const response = await axios.get(CONFIG.API_URLS.GITHUB_USER, config)
       return {
         login: response.data.login,
         avatar: response.data.avatar_url
@@ -117,7 +114,7 @@ class CopilotService {
     try {
       this.updateHeaders(headers)
 
-      const response = await aoxisProxy.axios.post<AuthResponse>(
+      const response = await axios.post<AuthResponse>(
         CONFIG.API_URLS.GITHUB_DEVICE_CODE,
         {
           client_id: CONFIG.GITHUB_CLIENT_ID,
@@ -149,7 +146,7 @@ class CopilotService {
       await this.delay(currentDelay)
 
       try {
-        const response = await aoxisProxy.axios.post<TokenResponse>(
+        const response = await axios.post<TokenResponse>(
           CONFIG.API_URLS.GITHUB_ACCESS_TOKEN,
           {
             client_id: CONFIG.GITHUB_CLIENT_ID,
@@ -211,7 +208,7 @@ class CopilotService {
         }
       }
 
-      const response = await aoxisProxy.axios.get<CopilotTokenResponse>(CONFIG.API_URLS.COPILOT_TOKEN, config)
+      const response = await axios.get<CopilotTokenResponse>(CONFIG.API_URLS.COPILOT_TOKEN, config)
 
       return response.data
     } catch (error) {
@@ -228,10 +225,10 @@ class CopilotService {
       try {
         await fs.access(this.tokenFilePath)
         await fs.unlink(this.tokenFilePath)
-        Logger.log('Successfully logged out from Copilot')
+        console.log('Successfully logged out from Copilot')
       } catch (error) {
         // 文件不存在不是错误，只是记录一下
-        Logger.log('Token file not found, nothing to delete')
+        console.log('Token file not found, nothing to delete')
       }
     } catch (error) {
       console.error('Failed to logout:', error)

src/main/services/ExportService.ts

@@ -83,7 +83,7 @@ export class ExportService {
             }
             break
           case 'text':
-            runs.push(new TextRun({ text: token.content, bold: isHeaderRow }))
+            runs.push(new TextRun({ text: token.content, bold: isHeaderRow ? true : false }))
             break
           case 'strong':
             runs.push(new TextRun({ text: token.content, bold: true }))

src/main/services/FileStorage.ts

@@ -28,16 +28,11 @@ class FileStorage {
   }
 
   private initStorageDir = (): void => {
-    try {
-      if (!fs.existsSync(this.storageDir)) {
-        fs.mkdirSync(this.storageDir, { recursive: true })
-      }
-      if (!fs.existsSync(this.tempDir)) {
-        fs.mkdirSync(this.tempDir, { recursive: true })
-      }
-    } catch (error) {
-      logger.error('[FileStorage] Failed to initialize storage directories:', error)
-      throw error
+    if (!fs.existsSync(this.storageDir)) {
+      fs.mkdirSync(this.storageDir, { recursive: true })
+    }
+    if (!fs.existsSync(this.tempDir)) {
+      fs.mkdirSync(this.tempDir, { recursive: true })
     }
   }
 
@@ -268,15 +263,7 @@ class FileStorage {
     }
   }
 
-  public base64File = async (_: Electron.IpcMainInvokeEvent, id: string): Promise<{ data: string; mime: string }> => {
-    const filePath = path.join(this.storageDir, id)
-    const buffer = await fs.promises.readFile(filePath)
-    const base64 = buffer.toString('base64')
-    const mime = `application/${path.extname(filePath).slice(1)}`
-    return { data: base64, mime }
-  }
-
-  public binaryImage = async (_: Electron.IpcMainInvokeEvent, id: string): Promise<{ data: Buffer; mime: string }> => {
+  public binaryFile = async (_: Electron.IpcMainInvokeEvent, id: string): Promise<{ data: Buffer; mime: string }> => {
     const filePath = path.join(this.storageDir, id)
     const data = await fs.promises.readFile(filePath)
     const mime = `image/${path.extname(filePath).slice(1)}`
@@ -480,25 +467,6 @@ class FileStorage {
       throw error
     }
   }
-
-  public writeFileWithId = async (_: Electron.IpcMainInvokeEvent, id: string, content: string): Promise<void> => {
-    try {
-      const filePath = path.join(this.storageDir, id)
-      logger.info('[FileStorage] Writing file:', filePath)
-
-      // 确保目录存在
-      if (!fs.existsSync(this.storageDir)) {
-        logger.info('[FileStorage] Creating storage directory:', this.storageDir)
-        fs.mkdirSync(this.storageDir, { recursive: true })
-      }
-
-      await fs.promises.writeFile(filePath, content, 'utf8')
-      logger.info('[FileStorage] File written successfully:', filePath)
-    } catch (error) {
-      logger.error('[FileStorage] Failed to write file:', error)
-      throw error
-    }
-  }
 }
 
 export default FileStorage

src/main/services/GeminiService.ts

@@ -1,4 +1,4 @@
-import { File, FileState, GoogleGenAI, Pager } from '@google/genai'
+import { FileMetadataResponse, FileState, GoogleAIFileManager } from '@google/generative-ai/server'
 import { FileType } from '@types'
 import fs from 'fs'
 
@@ -8,16 +8,13 @@ export class GeminiService {
   private static readonly FILE_LIST_CACHE_KEY = 'gemini_file_list'
   private static readonly CACHE_DURATION = 3000
 
-  static async uploadFile(_: Electron.IpcMainInvokeEvent, file: FileType, apiKey: string): Promise<File> {
-    const sdk = new GoogleGenAI({ vertexai: false, apiKey })
-    return await sdk.files.upload({
-      file: file.path,
-      config: {
-        mimeType: 'application/pdf',
-        name: file.id,
-        displayName: file.origin_name
-      }
+  static async uploadFile(_: Electron.IpcMainInvokeEvent, file: FileType, apiKey: string) {
+    const fileManager = new GoogleAIFileManager(apiKey)
+    const uploadResult = await fileManager.uploadFile(file.path, {
+      mimeType: 'application/pdf',
+      displayName: file.origin_name
     })
+    return uploadResult
   }
 
   static async base64File(_: Electron.IpcMainInvokeEvent, file: FileType) {
@@ -27,42 +24,40 @@ export class GeminiService {
     }
   }
 
-  static async retrieveFile(_: Electron.IpcMainInvokeEvent, file: FileType, apiKey: string): Promise<File | undefined> {
-    const sdk = new GoogleGenAI({ vertexai: false, apiKey })
+  static async retrieveFile(
+    _: Electron.IpcMainInvokeEvent,
+    file: FileType,
+    apiKey: string
+  ): Promise<FileMetadataResponse | undefined> {
+    const fileManager = new GoogleAIFileManager(apiKey)
+
     const cachedResponse = CacheService.get<any>(GeminiService.FILE_LIST_CACHE_KEY)
     if (cachedResponse) {
       return GeminiService.processResponse(cachedResponse, file)
     }
 
-    const response = await sdk.files.list()
+    const response = await fileManager.listFiles()
     CacheService.set(GeminiService.FILE_LIST_CACHE_KEY, response, GeminiService.CACHE_DURATION)
 
     return GeminiService.processResponse(response, file)
   }
 
-  private static async processResponse(response: Pager<File>, file: FileType) {
-    for await (const f of response) {
-      if (f.state === FileState.ACTIVE) {
-        if (f.displayName === file.origin_name && Number(f.sizeBytes) === file.size) {
-          return f
-        }
-      }
+  private static processResponse(response: any, file: FileType) {
+    if (response.files) {
+      return response.files
+        .filter((file) => file.state === FileState.ACTIVE)
+        .find((i) => i.displayName === file.origin_name && Number(i.sizeBytes) === file.size)
     }
-
     return undefined
   }
 
-  static async listFiles(_: Electron.IpcMainInvokeEvent, apiKey: string): Promise<File[]> {
-    const sdk = new GoogleGenAI({ vertexai: false, apiKey })
-    const files: File[] = []
-    for await (const f of await sdk.files.list()) {
-      files.push(f)
-    }
-    return files
+  static async listFiles(_: Electron.IpcMainInvokeEvent, apiKey: string) {
+    const fileManager = new GoogleAIFileManager(apiKey)
+    return await fileManager.listFiles()
   }
 
-  static async deleteFile(_: Electron.IpcMainInvokeEvent, fileId: string, apiKey: string) {
-    const sdk = new GoogleGenAI({ vertexai: false, apiKey })
-    await sdk.files.delete({ name: fileId })
+  static async deleteFile(_: Electron.IpcMainInvokeEvent, apiKey: string, fileId: string) {
+    const fileManager = new GoogleAIFileManager(apiKey)
+    await fileManager.deleteFile(fileId)
   }
 }

src/main/services/KnowledgeService.ts

@@ -459,7 +459,7 @@ class KnowledgeService {
     { uniqueId, uniqueIds, base }: { uniqueId: string; uniqueIds: string[]; base: KnowledgeBaseParams }
   ): Promise<void> => {
     const ragApplication = await this.getRagApplication(base)
-    Logger.log(`[ KnowledgeService Remove Item UniqueId: ${uniqueId}]`)
+    console.log(`[ KnowledgeService Remove Item UniqueId: ${uniqueId}]`)
     for (const id of uniqueIds) {
       await ragApplication.deleteLoader(id)
     }

src/main/services/MCPService.ts

@@ -1,37 +1,21 @@
-import crypto from 'node:crypto'
 import os from 'node:os'
 import path from 'node:path'
 
+import { isLinux, isMac, isWin } from '@main/constant'
 import { createInMemoryMCPServer } from '@main/mcpServers/factory'
 import { makeSureDirExists } from '@main/utils'
 import { getBinaryName, getBinaryPath } from '@main/utils/process'
 import { Client } from '@modelcontextprotocol/sdk/client/index.js'
-import { SSEClientTransport, SSEClientTransportOptions } from '@modelcontextprotocol/sdk/client/sse.js'
-import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'
-import {
-  StreamableHTTPClientTransport,
-  type StreamableHTTPClientTransportOptions
-} from '@modelcontextprotocol/sdk/client/streamableHttp'
+import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js'
+import { getDefaultEnvironment, StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'
 import { InMemoryTransport } from '@modelcontextprotocol/sdk/inMemory'
 import { nanoid } from '@reduxjs/toolkit'
-import {
-  GetMCPPromptResponse,
-  GetResourceResponse,
-  MCPCallToolResponse,
-  MCPPrompt,
-  MCPResource,
-  MCPServer,
-  MCPTool
-} from '@types'
+import { GetMCPPromptResponse, MCPPrompt, MCPServer, MCPTool } from '@types'
 import { app } from 'electron'
 import Logger from 'electron-log'
-import { EventEmitter } from 'events'
-import { memoize } from 'lodash'
 
 import { CacheService } from './CacheService'
-import { CallBackServer } from './mcp/oauth/callback'
-import { McpOAuthClientProvider } from './mcp/oauth/provider'
-import getLoginShellEnvironment from './mcp/shell-env'
+import { StreamableHTTPClientTransport, type StreamableHTTPClientTransportOptions } from './MCPStreamableHttpClient'
 
 // Generic type for caching wrapped functions
 type CachedFunction<T extends unknown[], R> = (...args: T) => Promise<R>
@@ -87,8 +71,6 @@ class McpService {
     this.callTool = this.callTool.bind(this)
     this.listPrompts = this.listPrompts.bind(this)
     this.getPrompt = this.getPrompt.bind(this)
-    this.listResources = this.listResources.bind(this)
-    this.getResource = this.getResource.bind(this)
     this.closeClient = this.closeClient.bind(this)
     this.removeServer = this.removeServer.bind(this)
     this.restartServer = this.restartServer.bind(this)
@@ -123,17 +105,9 @@ class McpService {
 
     const args = [...(server.args || [])]
 
-    // let transport: StdioClientTransport | SSEClientTransport | InMemoryTransport | StreamableHTTPClientTransport
-    const authProvider = new McpOAuthClientProvider({
-      serverUrlHash: crypto
-        .createHash('md5')
-        .update(server.baseUrl || '')
-        .digest('hex')
-    })
+    let transport: StdioClientTransport | SSEClientTransport | InMemoryTransport | StreamableHTTPClientTransport
 
-    const initTransport = async (): Promise<
-      StdioClientTransport | SSEClientTransport | InMemoryTransport | StreamableHTTPClientTransport
-    > => {
+    try {
       // Create appropriate transport based on configuration
       if (server.type === 'inMemory') {
         Logger.info(`[MCP] Using in-memory transport for server: ${server.name}`)
@@ -143,62 +117,34 @@ class McpService {
         try {
           await inMemoryServer.connect(serverTransport)
           Logger.info(`[MCP] In-memory server started: ${server.name}`)
-        } catch (error: Error | any) {
+        } catch (error) {
           Logger.error(`[MCP] Error starting in-memory server: ${error}`)
-          throw new Error(`Failed to start in-memory server: ${error.message}`)
+          throw new Error(`Failed to start in-memory server: ${error}`)
         }
         // set the client transport to the client
-        return clientTransport
+        transport = clientTransport
       } else if (server.baseUrl) {
         if (server.type === 'streamableHttp') {
-          const options: StreamableHTTPClientTransportOptions = {
-            requestInit: {
-              headers: server.headers || {}
-            },
-            authProvider
-          }
-          return new StreamableHTTPClientTransport(new URL(server.baseUrl!), options)
+          transport = new StreamableHTTPClientTransport(
+            new URL(server.baseUrl!),
+            {} as StreamableHTTPClientTransportOptions
+          )
         } else if (server.type === 'sse') {
-          const options: SSEClientTransportOptions = {
-            eventSourceInit: {
-              fetch: async (url, init) => {
-                const headers = { ...(server.headers || {}), ...(init?.headers || {}) }
-
-                // Get tokens from authProvider to make sure using the latest tokens
-                if (authProvider && typeof authProvider.tokens === 'function') {
-                  try {
-                    const tokens = await authProvider.tokens()
-                    if (tokens && tokens.access_token) {
-                      headers['Authorization'] = `Bearer ${tokens.access_token}`
-                    }
-                  } catch (error) {
-                    Logger.error('Failed to fetch tokens:', error)
-                  }
-                }
-
-                return fetch(url, { ...init, headers })
-              }
-            },
-            requestInit: {
-              headers: server.headers || {}
-            },
-            authProvider
-          }
-          return new SSEClientTransport(new URL(server.baseUrl!), options)
+          transport = new SSEClientTransport(new URL(server.baseUrl!))
         } else {
           throw new Error('Invalid server type')
         }
       } else if (server.command) {
         let cmd = server.command
 
-        if (server.command === 'npx') {
+        if (server.command === 'npx' || server.command === 'bun' || server.command === 'bunx') {
           cmd = await getBinaryPath('bun')
           Logger.info(`[MCP] Using command: ${cmd}`)
 
           // add -x to args if args exist
           if (args && args.length > 0) {
             if (!args.includes('-y')) {
-              args.unshift('-y')
+              !args.includes('-y') && args.unshift('-y')
             }
             if (!args.includes('x')) {
               args.unshift('x')
@@ -230,82 +176,25 @@ class McpService {
 
         Logger.info(`[MCP] Starting server with command: ${cmd} ${args ? args.join(' ') : ''}`)
         // Logger.info(`[MCP] Environment variables for server:`, server.env)
-        const loginShellEnv = await this.getLoginShellEnv()
-        const stdioTransport = new StdioClientTransport({
+
+        transport = new StdioClientTransport({
           command: cmd,
           args,
           env: {
-            ...loginShellEnv,
+            ...getDefaultEnvironment(),
+            PATH: this.getEnhancedPath(process.env.PATH || ''),
             ...server.env
           },
           stderr: 'pipe'
         })
-        stdioTransport.stderr?.on('data', (data) =>
+        transport.stderr?.on('data', (data) =>
           Logger.info(`[MCP] Stdio stderr for server: ${server.name} `, data.toString())
         )
-        return stdioTransport
       } else {
         throw new Error('Either baseUrl or command must be provided')
       }
-    }
 
-    const handleAuth = async (client: Client, transport: SSEClientTransport | StreamableHTTPClientTransport) => {
-      Logger.info(`[MCP] Starting OAuth flow for server: ${server.name}`)
-      // Create an event emitter for the OAuth callback
-      const events = new EventEmitter()
-
-      // Create a callback server
-      const callbackServer = new CallBackServer({
-        port: authProvider.config.callbackPort,
-        path: authProvider.config.callbackPath || '/oauth/callback',
-        events
-      })
-
-      // Set a timeout to close the callback server
-      const timeoutId = setTimeout(() => {
-        Logger.warn(`[MCP] OAuth flow timed out for server: ${server.name}`)
-        callbackServer.close()
-      }, 300000) // 5 minutes timeout
-
-      try {
-        // Wait for the authorization code
-        const authCode = await callbackServer.waitForAuthCode()
-        Logger.info(`[MCP] Received auth code: ${authCode}`)
-
-        // Complete the OAuth flow
-        await transport.finishAuth(authCode)
-
-        Logger.info(`[MCP] OAuth flow completed for server: ${server.name}`)
-
-        const newTransport = await initTransport()
-        // Try to connect again
-        await client.connect(newTransport)
-
-        Logger.info(`[MCP] Successfully authenticated with server: ${server.name}`)
-      } catch (oauthError) {
-        Logger.error(`[MCP] OAuth authentication failed for server ${server.name}:`, oauthError)
-        throw new Error(
-          `OAuth authentication failed: ${oauthError instanceof Error ? oauthError.message : String(oauthError)}`
-        )
-      } finally {
-        // Clear the timeout and close the callback server
-        clearTimeout(timeoutId)
-        callbackServer.close()
-      }
-    }
-
-    try {
-      const transport = await initTransport()
-      try {
-        await client.connect(transport)
-      } catch (error: Error | any) {
-        if (error instanceof Error && (error.name === 'UnauthorizedError' || error.message.includes('Unauthorized'))) {
-          Logger.info(`[MCP] Authentication required for server: ${server.name}`)
-          await handleAuth(client, transport as SSEClientTransport | StreamableHTTPClientTransport)
-        } else {
-          throw error
-        }
-      }
+      await client.connect(transport)
 
       // Store the new client in the cache
       this.clients.set(serverKey, client)
@@ -314,7 +203,7 @@ class McpService {
       return client
     } catch (error: any) {
       Logger.error(`[MCP] Error activating server ${server.name}:`, error)
-      throw new Error(`[MCP] Error activating server ${server.name}: ${error.message}`)
+      throw error
     }
   }
 
@@ -405,21 +294,12 @@ class McpService {
   public async callTool(
     _: Electron.IpcMainInvokeEvent,
     { server, name, args }: { server: MCPServer; name: string; args: any }
-  ): Promise<MCPCallToolResponse> {
+  ): Promise<any> {
     try {
       Logger.info('[MCP] Calling:', server.name, name, args)
-      if (typeof args === 'string') {
-        try {
-          args = JSON.parse(args)
-        } catch (e) {
-          Logger.error('[MCP] args parse error', args)
-        }
-      }
       const client = await this.initClient(server)
-      const result = await client.callTool({ name, arguments: args }, undefined, {
-        timeout: server.timeout ? server.timeout * 1000 : 60000 // Default timeout of 1 minute
-      })
-      return result as MCPCallToolResponse
+      const result = await client.callTool({ name, arguments: args })
+      return result
     } catch (error) {
       Logger.error(`[MCP] Error calling tool ${name} on ${server.name}:`, error)
       throw error
@@ -443,12 +323,13 @@ class McpService {
     const client = await this.initClient(server)
     try {
       const { prompts } = await client.listPrompts()
-      return prompts.map((prompt: any) => ({
+      const serverPrompts = prompts.map((prompt: any) => ({
         ...prompt,
         id: `p${nanoid()}`,
         serverId: server.id,
         serverName: server.name
       }))
+      return serverPrompts
     } catch (error) {
       Logger.error(`[MCP] Failed to list prompts for server: ${server.name}`, error)
       return []
@@ -505,101 +386,68 @@ class McpService {
   }
 
   /**
-   * List resources available on an MCP server (implementation)
+   * Get enhanced PATH including common tool locations
    */
-  private async listResourcesImpl(server: MCPServer): Promise<MCPResource[]> {
-    Logger.info(`[MCP] Listing resources for server: ${server.name}`)
-    const client = await this.initClient(server)
-    try {
-      const result = await client.listResources()
-      const resources = result.resources || []
-      const serverResources = (Array.isArray(resources) ? resources : []).map((resource: any) => ({
-        ...resource,
-        serverId: server.id,
-        serverName: server.name
-      }))
-      return serverResources
-    } catch (error) {
-      Logger.error(`[MCP] Failed to list resources for server: ${server.name}`, error)
-      return []
+  private getEnhancedPath(originalPath: string): string {
+    // 将原始 PATH 按分隔符分割成数组
+    const pathSeparator = process.platform === 'win32' ? ';' : ':'
+    const existingPaths = new Set(originalPath.split(pathSeparator).filter(Boolean))
+    const homeDir = process.env.HOME || process.env.USERPROFILE || ''
+
+    // 定义要添加的新路径
+    const newPaths: string[] = []
+
+    if (isMac) {
+      newPaths.push(
+        '/bin',
+        '/usr/bin',
+        '/usr/local/bin',
+        '/usr/local/sbin',
+        '/opt/homebrew/bin',
+        '/opt/homebrew/sbin',
+        '/usr/local/opt/node/bin',
+        `${homeDir}/.nvm/current/bin`,
+        `${homeDir}/.npm-global/bin`,
+        `${homeDir}/.yarn/bin`,
+        `${homeDir}/.cargo/bin`,
+        `${homeDir}/.cherrystudio/bin`,
+        '/opt/local/bin'
+      )
     }
-  }
 
-  /**
-   * List resources available on an MCP server with caching
-   */
-  public async listResources(_: Electron.IpcMainInvokeEvent, server: MCPServer): Promise<MCPResource[]> {
-    const cachedListResources = withCache<[MCPServer], MCPResource[]>(
-      this.listResourcesImpl.bind(this),
-      (server) => {
-        const serverKey = this.getServerKey(server)
-        return `mcp:list_resources:${serverKey}`
-      },
-      60 * 60 * 1000, // 60 minutes TTL
-      `[MCP] Resources from ${server.name}`
-    )
-    return cachedListResources(server)
-  }
+    if (isLinux) {
+      newPaths.push(
+        '/bin',
+        '/usr/bin',
+        '/usr/local/bin',
+        `${homeDir}/.nvm/current/bin`,
+        `${homeDir}/.npm-global/bin`,
+        `${homeDir}/.yarn/bin`,
+        `${homeDir}/.cargo/bin`,
+        `${homeDir}/.cherrystudio/bin`,
+        '/snap/bin'
+      )
+    }
 
-  /**
-   * Get a specific resource from an MCP server (implementation)
-   */
-  private async getResourceImpl(server: MCPServer, uri: string): Promise<GetResourceResponse> {
-    Logger.info(`[MCP] Getting resource ${uri} from server: ${server.name}`)
-    const client = await this.initClient(server)
-    try {
-      const result = await client.readResource({ uri: uri })
-      const contents: MCPResource[] = []
-      if (result.contents && result.contents.length > 0) {
-        result.contents.forEach((content: any) => {
-          contents.push({
-            ...content,
-            serverId: server.id,
-            serverName: server.name
-          })
-        })
+    if (isWin) {
+      newPaths.push(
+        `${process.env.APPDATA}\\npm`,
+        `${homeDir}\\AppData\\Local\\Yarn\\bin`,
+        `${homeDir}\\.cargo\\bin`,
+        `${homeDir}\\.cherrystudio\\bin`
+      )
+    }
+
+    // 只添加不存在的路径
+    newPaths.forEach((path) => {
+      if (path && !existingPaths.has(path)) {
+        existingPaths.add(path)
       }
-      return {
-        contents: contents
-      }
-    } catch (error: Error | any) {
-      Logger.error(`[MCP] Failed to get resource ${uri} from server: ${server.name}`, error)
-      throw new Error(`Failed to get resource ${uri} from server: ${server.name}: ${error.message}`)
-    }
-  }
+    })
 
-  /**
-   * Get a specific resource from an MCP server with caching
-   */
-  public async getResource(
-    _: Electron.IpcMainInvokeEvent,
-    { server, uri }: { server: MCPServer; uri: string }
-  ): Promise<GetResourceResponse> {
-    const cachedGetResource = withCache<[MCPServer, string], GetResourceResponse>(
-      this.getResourceImpl.bind(this),
-      (server, uri) => {
-        const serverKey = this.getServerKey(server)
-        return `mcp:get_resource:${serverKey}:${uri}`
-      },
-      30 * 60 * 1000, // 30 minutes TTL
-      `[MCP] Resource ${uri} from ${server.name}`
-    )
-    return await cachedGetResource(server, uri)
+    // 转换回字符串
+    return Array.from(existingPaths).join(pathSeparator)
   }
-
-  private getLoginShellEnv = memoize(async (): Promise<Record<string, string>> => {
-    try {
-      const loginEnv = await getLoginShellEnvironment()
-      const pathSeparator = process.platform === 'win32' ? ';' : ':'
-      const cherryBinPath = path.join(os.homedir(), '.cherrystudio', 'bin')
-      loginEnv.PATH = `${loginEnv.PATH}${pathSeparator}${cherryBinPath}`
-      Logger.info('[MCP] Successfully fetched login shell environment variables:')
-      return loginEnv
-    } catch (error) {
-      Logger.error('[MCP] Failed to fetch login shell environment variables:', error)
-      return {}
-    }
-  })
 }
 
 const mcpService = new McpService()

src/main/services/MCPStreamableHttpClient.ts

@@ -0,0 +1,394 @@
+import { auth, AuthResult, OAuthClientProvider, UnauthorizedError } from '@modelcontextprotocol/sdk/client/auth.js'
+import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
+import { JSONRPCMessage, JSONRPCMessageSchema } from '@modelcontextprotocol/sdk/types.js'
+
+export class StreamableHTTPError extends Error {
+  constructor(
+    public readonly code: number | undefined,
+    message: string | undefined,
+    public readonly event: ErrorEvent
+  ) {
+    super(`Streamable HTTP error: ${message}`)
+  }
+}
+
+/**
+ * Configuration options for the `StreamableHTTPClientTransport`.
+ */
+export type StreamableHTTPClientTransportOptions = {
+  /**
+   * An OAuth client provider to use for authentication.
+   *
+   * When an `authProvider` is specified and the connection is started:
+   * 1. The connection is attempted with any existing access token from the `authProvider`.
+   * 2. If the access token has expired, the `authProvider` is used to refresh the token.
+   * 3. If token refresh fails or no access token exists, and auth is required, `OAuthClientProvider.redirectToAuthorization` is called, and an `UnauthorizedError` will be thrown from `connect`/`start`.
+   *
+   * After the user has finished authorizing via their user agent, and is redirected back to the MCP client application, call `StreamableHTTPClientTransport.finishAuth` with the authorization code before retrying the connection.
+   *
+   * If an `authProvider` is not provided, and auth is required, an `UnauthorizedError` will be thrown.
+   *
+   * `UnauthorizedError` might also be thrown when sending any message over the transport, indicating that the session has expired, and needs to be re-authed and reconnected.
+   */
+  authProvider?: OAuthClientProvider
+
+  /**
+   * Customizes HTTP requests to the server.
+   */
+  requestInit?: RequestInit
+}
+
+/**
+ * Client transport for Streamable HTTP: this implements the MCP Streamable HTTP transport specification.
+ * It will connect to a server using HTTP POST for sending messages and HTTP GET with Server-Sent Events
+ * for receiving messages.
+ */
+export class StreamableHTTPClientTransport implements Transport {
+  private _activeStreams: Map<string, ReadableStreamDefaultReader<Uint8Array>> = new Map()
+  private _abortController?: AbortController
+  private _url: URL
+  private _requestInit?: RequestInit
+  private _authProvider?: OAuthClientProvider
+  private _sessionId?: string
+  private _lastEventId?: string
+
+  onclose?: () => void
+  onerror?: (error: Error) => void
+  onmessage?: (message: JSONRPCMessage) => void
+
+  constructor(url: URL, opts?: StreamableHTTPClientTransportOptions) {
+    this._url = url
+    this._requestInit = opts?.requestInit
+    this._authProvider = opts?.authProvider
+  }
+
+  private async _authThenStart(): Promise<void> {
+    if (!this._authProvider) {
+      throw new UnauthorizedError('No auth provider')
+    }
+
+    let result: AuthResult
+    try {
+      result = await auth(this._authProvider, { serverUrl: this._url })
+    } catch (error) {
+      this.onerror?.(error as Error)
+      throw error
+    }
+
+    if (result !== 'AUTHORIZED') {
+      throw new UnauthorizedError()
+    }
+
+    return await this._startOrAuth()
+  }
+
+  private async _commonHeaders(): Promise<HeadersInit> {
+    const headers: HeadersInit = {}
+    if (this._authProvider) {
+      const tokens = await this._authProvider.tokens()
+      if (tokens) {
+        headers['Authorization'] = `Bearer ${tokens.access_token}`
+      }
+    }
+
+    if (this._sessionId) {
+      headers['mcp-session-id'] = this._sessionId
+    }
+
+    return headers
+  }
+
+  private async _startOrAuth(): Promise<void> {
+    try {
+      // Try to open an initial SSE stream with GET to listen for server messages
+      // This is optional according to the spec - server may not support it
+      const commonHeaders = await this._commonHeaders()
+      const headers = new Headers(commonHeaders)
+      headers.set('Accept', 'text/event-stream')
+
+      // Include Last-Event-ID header for resumable streams
+      if (this._lastEventId) {
+        headers.set('last-event-id', this._lastEventId)
+      }
+
+      // 删除可能存在的HTTP/2伪头部
+      if (headers.has(':path')) {
+        headers.delete(':path')
+      }
+      if (headers.has(':method')) {
+        headers.delete(':method')
+      }
+      if (headers.has(':authority')) {
+        headers.delete(':authority')
+      }
+      if (headers.has(':scheme')) {
+        headers.delete(':scheme')
+      }
+
+      const response = await fetch(this._url, {
+        method: 'GET',
+        headers,
+        signal: this._abortController?.signal
+      })
+
+      if (response.status === 405) {
+        // Server doesn't support GET for SSE, which is allowed by the spec
+        // We'll rely on SSE responses to POST requests for communication
+        return
+      }
+
+      if (!response.ok) {
+        if (response.status === 401 && this._authProvider) {
+          // Need to authenticate
+          return await this._authThenStart()
+        }
+
+        const error = new Error(`Failed to open SSE stream: ${response.status} ${response.statusText}`)
+        this.onerror?.(error)
+        throw error
+      }
+
+      // Successful connection, handle the SSE stream as a standalone listener
+      const streamId = `initial-${Date.now()}`
+      this._handleSseStream(response.body, streamId)
+    } catch (error) {
+      this.onerror?.(error as Error)
+      throw error
+    }
+  }
+
+  async start() {
+    if (this._activeStreams.size > 0) {
+      throw new Error(
+        'StreamableHTTPClientTransport already started! If using Client class, note that connect() calls start() automatically.'
+      )
+    }
+
+    this._abortController = new AbortController()
+    return await this._startOrAuth()
+  }
+
+  /**
+   * Call this method after the user has finished authorizing via their user agent and is redirected back to the MCP client application. This will exchange the authorization code for an access token, enabling the next connection attempt to successfully auth.
+   */
+  async finishAuth(authorizationCode: string): Promise<void> {
+    if (!this._authProvider) {
+      throw new UnauthorizedError('No auth provider')
+    }
+
+    const result = await auth(this._authProvider, { serverUrl: this._url, authorizationCode })
+    if (result !== 'AUTHORIZED') {
+      throw new UnauthorizedError('Failed to authorize')
+    }
+  }
+
+  async close(): Promise<void> {
+    // Close all active streams
+    for (const reader of this._activeStreams.values()) {
+      try {
+        reader.cancel()
+      } catch (error) {
+        this.onerror?.(error as Error)
+      }
+    }
+    this._activeStreams.clear()
+
+    // Abort any pending requests
+    this._abortController?.abort()
+
+    // If we have a session ID, send a DELETE request to explicitly terminate the session
+    if (this._sessionId) {
+      try {
+        const commonHeaders = await this._commonHeaders()
+        const response = await fetch(this._url, {
+          method: 'DELETE',
+          headers: commonHeaders,
+          signal: this._abortController?.signal
+        })
+
+        if (!response.ok) {
+          // Server might respond with 405 if it doesn't support explicit session termination
+          // We don't throw an error in that case
+          if (response.status !== 405) {
+            const text = await response.text().catch(() => null)
+            throw new Error(`Error terminating session (HTTP ${response.status}): ${text}`)
+          }
+        }
+      } catch (error) {
+        // We still want to invoke onclose even if the session termination fails
+        this.onerror?.(error as Error)
+      }
+    }
+
+    this.onclose?.()
+  }
+
+  async send(message: JSONRPCMessage | JSONRPCMessage[]): Promise<void> {
+    try {
+      const commonHeaders = await this._commonHeaders()
+      const headers = new Headers({ ...commonHeaders, ...this._requestInit?.headers })
+      headers.set('content-type', 'application/json')
+      headers.set('accept', 'application/json, text/event-stream')
+
+      // 添加错误处理，确保不使用HTTP/2伪头部
+      // 删除可能存在的HTTP/2伪头部
+      if (headers.has(':path')) {
+        headers.delete(':path')
+      }
+      if (headers.has(':method')) {
+        headers.delete(':method')
+      }
+      if (headers.has(':authority')) {
+        headers.delete(':authority')
+      }
+      if (headers.has(':scheme')) {
+        headers.delete(':scheme')
+      }
+
+      const init = {
+        ...this._requestInit,
+        method: 'POST',
+        headers,
+        body: JSON.stringify(message),
+        signal: this._abortController?.signal
+      }
+
+      const response = await fetch(this._url, init)
+
+      // Handle session ID received during initialization
+      const sessionId = response.headers.get('mcp-session-id')
+      if (sessionId) {
+        this._sessionId = sessionId
+      }
+
+      if (!response.ok) {
+        if (response.status === 401 && this._authProvider) {
+          const result = await auth(this._authProvider, { serverUrl: this._url })
+          if (result !== 'AUTHORIZED') {
+            throw new UnauthorizedError()
+          }
+
+          // Purposely _not_ awaited, so we don't call onerror twice
+          return this.send(message)
+        }
+
+        const text = await response.text().catch(() => null)
+        throw new Error(`Error POSTing to endpoint (HTTP ${response.status}): ${text}`)
+      }
+
+      // If the response is 202 Accepted, there's no body to process
+      if (response.status === 202) {
+        return
+      }
+
+      // Get original message(s) for detecting request IDs
+      const messages = Array.isArray(message) ? message : [message]
+
+      // Extract IDs from request messages for tracking responses
+      const requestIds = messages
+        .filter((msg) => 'method' in msg && 'id' in msg)
+        .map((msg) => ('id' in msg ? msg.id : undefined))
+        .filter((id) => id !== undefined)
+
+      // If we have request IDs and an SSE response, create a unique stream ID
+      const hasRequests = requestIds.length > 0
+
+      // Check the response type
+      const contentType = response.headers.get('content-type')
+
+      if (hasRequests) {
+        if (contentType?.includes('text/event-stream')) {
+          // For streaming responses, create a unique stream ID based on request IDs
+          const streamId = `req-${requestIds.join('-')}-${Date.now()}`
+          this._handleSseStream(response.body, streamId)
+        } else if (contentType?.includes('application/json')) {
+          // For non-streaming servers, we might get direct JSON responses
+          const data = await response.json()
+          const responseMessages = Array.isArray(data)
+            ? data.map((msg) => JSONRPCMessageSchema.parse(msg))
+            : [JSONRPCMessageSchema.parse(data)]
+
+          for (const msg of responseMessages) {
+            this.onmessage?.(msg)
+          }
+        }
+      }
+    } catch (error) {
+      this.onerror?.(error as Error)
+      throw error
+    }
+  }
+
+  private _handleSseStream(stream: ReadableStream<Uint8Array> | null, streamId: string): void {
+    if (!stream) {
+      return
+    }
+
+    // Set up stream handling for server-sent events
+    const reader = stream.getReader()
+    this._activeStreams.set(streamId, reader)
+    const decoder = new TextDecoder()
+    let buffer = ''
+
+    const processStream = async () => {
+      try {
+        while (true) {
+          const { done, value } = await reader.read()
+          if (done) {
+            // Stream closed by server
+            this._activeStreams.delete(streamId)
+            break
+          }
+
+          buffer += decoder.decode(value, { stream: true })
+
+          // Process SSE messages in the buffer
+          const events = buffer.split('\n\n')
+          buffer = events.pop() || ''
+
+          for (const event of events) {
+            const lines = event.split('\n')
+            let id: string | undefined
+            let eventType: string | undefined
+            let data: string | undefined
+
+            // Parse SSE message according to the format
+            for (const line of lines) {
+              if (line.startsWith('id:')) {
+                id = line.slice(3).trim()
+              } else if (line.startsWith('event:')) {
+                eventType = line.slice(6).trim()
+              } else if (line.startsWith('data:')) {
+                data = line.slice(5).trim()
+              }
+            }
+
+            // Update last event ID if provided by server
+            // As per spec: the ID MUST be globally unique across all streams within that session
+            if (id) {
+              this._lastEventId = id
+            }
+
+            // Handle message event
+            if (data) {
+              // Default event type is 'message' per SSE spec if not specified
+              if (!eventType || eventType === 'message') {
+                try {
+                  const message = JSONRPCMessageSchema.parse(JSON.parse(data))
+                  this.onmessage?.(message)
+                } catch (error) {
+                  this.onerror?.(error as Error)
+                }
+              }
+            }
+          }
+        }
+      } catch (error) {
+        this._activeStreams.delete(streamId)
+        this.onerror?.(error as Error)
+      }
+    }
+
+    processStream()
+  }
+}

src/main/services/MemoryFileService.ts

@@ -0,0 +1,310 @@
+import log from 'electron-log'
+import { promises as fs } from 'fs'
+import path from 'path'
+
+import { getConfigDir } from '../utils/file'
+
+// 定义记忆文件路径
+const memoryDataPath = path.join(getConfigDir(), 'memory-data.json')
+// 定义长期记忆文件路径
+const longTermMemoryDataPath = path.join(getConfigDir(), 'long-term-memory-data.json')
+
+export class MemoryFileService {
+  constructor() {
+    this.registerIpcHandlers()
+  }
+
+  async loadData() {
+    try {
+      // 确保配置目录存在
+      const configDir = path.dirname(memoryDataPath)
+      try {
+        await fs.mkdir(configDir, { recursive: true })
+      } catch (mkdirError) {
+        log.warn('Failed to create config directory, it may already exist:', mkdirError)
+      }
+
+      // 检查文件是否存在
+      try {
+        await fs.access(memoryDataPath)
+      } catch (accessError) {
+        // 文件不存在，创建默认文件
+        log.info('Memory data file does not exist, creating default file')
+        const defaultData = {
+          memoryLists: [
+            {
+              id: 'default',
+              name: '默认列表',
+              isActive: true
+            }
+          ],
+          shortMemories: [],
+          analyzeModel: 'gpt-3.5-turbo',
+          shortMemoryAnalyzeModel: 'gpt-3.5-turbo',
+          historicalContextAnalyzeModel: 'gpt-3.5-turbo',
+          vectorizeModel: 'gpt-3.5-turbo'
+        }
+        await fs.writeFile(memoryDataPath, JSON.stringify(defaultData, null, 2))
+        return defaultData
+      }
+
+      // 读取文件
+      const data = await fs.readFile(memoryDataPath, 'utf-8')
+      const parsedData = JSON.parse(data)
+      log.info('Memory data loaded successfully')
+      return parsedData
+    } catch (error) {
+      log.error('Failed to load memory data:', error)
+      return null
+    }
+  }
+
+  async saveData(data: any, forceOverwrite: boolean = false) {
+    try {
+      // 确保配置目录存在
+      const configDir = path.dirname(memoryDataPath)
+      try {
+        await fs.mkdir(configDir, { recursive: true })
+      } catch (mkdirError) {
+        log.warn('Failed to create config directory, it may already exist:', mkdirError)
+      }
+
+      // 如果强制覆盖，直接使用传入的数据
+      if (forceOverwrite) {
+        log.info('Force overwrite enabled for short memory data, using provided data directly')
+
+        // 确保数据包含必要的字段
+        const defaultData = {
+          memoryLists: [],
+          shortMemories: [],
+          analyzeModel: '',
+          shortMemoryAnalyzeModel: '',
+          historicalContextAnalyzeModel: '',
+          vectorizeModel: ''
+        }
+
+        // 合并默认数据和传入的数据，确保数据结构完整
+        const completeData = { ...defaultData, ...data }
+
+        // 保存数据
+        await fs.writeFile(memoryDataPath, JSON.stringify(completeData, null, 2))
+        log.info('Memory data saved successfully (force overwrite)')
+        return true
+      }
+
+      // 尝试读取现有数据并合并
+      let existingData = {}
+      try {
+        await fs.access(memoryDataPath)
+        const fileContent = await fs.readFile(memoryDataPath, 'utf-8')
+        existingData = JSON.parse(fileContent)
+        log.info('Existing memory data loaded for merging')
+      } catch (readError) {
+        log.warn('No existing memory data found or failed to read:', readError)
+        // 如果文件不存在或读取失败，使用空对象
+      }
+
+      // 合并数据，注意数组的处理
+      const mergedData = { ...existingData }
+
+      // 处理每个属性
+      Object.entries(data).forEach(([key, value]) => {
+        // 如果是数组属性，需要特殊处理
+        if (Array.isArray(value) && Array.isArray(mergedData[key])) {
+          // 对于 shortMemories 和 memories，直接使用传入的数组，完全替换现有的记忆
+          if (key === 'shortMemories' || key === 'memories') {
+            mergedData[key] = value
+            log.info(`Replacing ${key} array with provided data`)
+          } else {
+            // 其他数组属性，使用新值
+            mergedData[key] = value
+          }
+        } else {
+          // 非数组属性，直接使用新值
+          mergedData[key] = value
+        }
+      })
+
+      // 保存合并后的数据
+      await fs.writeFile(memoryDataPath, JSON.stringify(mergedData, null, 2))
+      log.info('Memory data saved successfully')
+      return true
+    } catch (error) {
+      log.error('Failed to save memory data:', error)
+      return false
+    }
+  }
+
+  async loadLongTermData() {
+    try {
+      // 确保配置目录存在
+      const configDir = path.dirname(longTermMemoryDataPath)
+      try {
+        await fs.mkdir(configDir, { recursive: true })
+      } catch (mkdirError) {
+        log.warn('Failed to create config directory, it may already exist:', mkdirError)
+      }
+
+      // 检查文件是否存在
+      try {
+        await fs.access(longTermMemoryDataPath)
+      } catch (accessError) {
+        // 文件不存在，创建默认文件
+        log.info('Long-term memory data file does not exist, creating default file')
+        const now = new Date().toISOString()
+        const defaultData = {
+          memoryLists: [
+            {
+              id: 'default',
+              name: '默认列表',
+              isActive: true,
+              createdAt: now,
+              updatedAt: now
+            }
+          ],
+          memories: [],
+          currentListId: 'default',
+          analyzeModel: 'gpt-3.5-turbo'
+        }
+        await fs.writeFile(longTermMemoryDataPath, JSON.stringify(defaultData, null, 2))
+        return defaultData
+      }
+
+      // 读取文件
+      const data = await fs.readFile(longTermMemoryDataPath, 'utf-8')
+      const parsedData = JSON.parse(data)
+      log.info('Long-term memory data loaded successfully')
+      return parsedData
+    } catch (error) {
+      log.error('Failed to load long-term memory data:', error)
+      return null
+    }
+  }
+
+  async saveLongTermData(data: any, forceOverwrite: boolean = false) {
+    try {
+      // 确保配置目录存在
+      const configDir = path.dirname(longTermMemoryDataPath)
+      try {
+        await fs.mkdir(configDir, { recursive: true })
+      } catch (mkdirError) {
+        log.warn('Failed to create config directory, it may already exist:', mkdirError)
+      }
+
+      // 如果强制覆盖，直接使用传入的数据
+      if (forceOverwrite) {
+        log.info('Force overwrite enabled, using provided data directly')
+
+        // 确保数据包含必要的字段
+        const defaultData = {
+          memoryLists: [],
+          memories: [],
+          currentListId: '',
+          analyzeModel: ''
+        }
+
+        // 合并默认数据和传入的数据，确保数据结构完整
+        const completeData = { ...defaultData, ...data }
+
+        // 保存数据
+        await fs.writeFile(longTermMemoryDataPath, JSON.stringify(completeData, null, 2))
+        log.info('Long-term memory data saved successfully (force overwrite)')
+        return true
+      }
+
+      // 尝试读取现有数据并合并
+      let existingData = {}
+      try {
+        await fs.access(longTermMemoryDataPath)
+        const fileContent = await fs.readFile(longTermMemoryDataPath, 'utf-8')
+        existingData = JSON.parse(fileContent)
+        log.info('Existing long-term memory data loaded for merging')
+      } catch (readError) {
+        log.warn('No existing long-term memory data found or failed to read:', readError)
+        // 如果文件不存在或读取失败，使用空对象
+      }
+
+      // 合并数据，注意数组的处理
+      const mergedData = { ...existingData }
+
+      // 处理每个属性
+      Object.entries(data).forEach(([key, value]) => {
+        // 如果是数组属性，需要特殊处理
+        if (Array.isArray(value) && Array.isArray(mergedData[key])) {
+          // 对于 memories 和 shortMemories，直接使用传入的数组，完全替换现有的记忆
+          if (key === 'memories' || key === 'shortMemories') {
+            mergedData[key] = value
+            log.info(`Replacing ${key} array with provided data`)
+          } else {
+            // 其他数组属性，使用新值
+            mergedData[key] = value
+          }
+        } else {
+          // 非数组属性，直接使用新值
+          mergedData[key] = value
+        }
+      })
+
+      // 保存合并后的数据
+      await fs.writeFile(longTermMemoryDataPath, JSON.stringify(mergedData, null, 2))
+      log.info('Long-term memory data saved successfully')
+      return true
+    } catch (error) {
+      log.error('Failed to save long-term memory data:', error)
+      return false
+    }
+  }
+
+  /**
+   * 删除指定ID的短期记忆
+   * @param id 要删除的短期记忆ID
+   * @returns 是否成功删除
+   */
+  async deleteShortMemoryById(id: string) {
+    try {
+      // 检查文件是否存在
+      try {
+        await fs.access(memoryDataPath)
+      } catch (accessError) {
+        log.error('Memory data file does not exist, cannot delete memory')
+        return false
+      }
+
+      // 读取文件
+      const fileContent = await fs.readFile(memoryDataPath, 'utf-8')
+      const data = JSON.parse(fileContent)
+
+      // 检查shortMemories数组是否存在
+      if (!data.shortMemories || !Array.isArray(data.shortMemories)) {
+        log.error('No shortMemories array found in memory data file')
+        return false
+      }
+
+      // 过滤掉要删除的记忆
+      const originalLength = data.shortMemories.length
+      data.shortMemories = data.shortMemories.filter((memory: any) => memory.id !== id)
+
+      // 如果长度没变，说明没有找到要删除的记忆
+      if (data.shortMemories.length === originalLength) {
+        log.warn(`Short memory with ID ${id} not found, nothing to delete`)
+        return false
+      }
+
+      // 写回文件
+      await fs.writeFile(memoryDataPath, JSON.stringify(data, null, 2))
+      log.info(`Successfully deleted short memory with ID ${id}`)
+      return true
+    } catch (error) {
+      log.error('Failed to delete short memory:', error)
+      return false
+    }
+  }
+
+  private registerIpcHandlers() {
+    // 注册处理函数已移至ipc.ts文件中
+    // 这里不需要重复注册
+  }
+}
+
+// 创建并导出MemoryFileService实例
+export const memoryFileService = new MemoryFileService()

src/main/services/NutstoreService.ts

@@ -5,8 +5,6 @@ import { XMLParser } from 'fast-xml-parser'
 import { isNil, partial } from 'lodash'
 import { type FileStat } from 'webdav'
 
-import { createOAuthUrl, decryptSecret } from '../integration/nutstore/sso/lib/index.mjs'
-
 interface OAuthResponse {
   username: string
   userid: string
@@ -32,17 +30,18 @@ interface WebDAVResponse {
 }
 
 export async function getNutstoreSSOUrl() {
-  return await createOAuthUrl({
+  const { createOAuthUrl } = await import('../integration/nutstore/sso/lib')
+
+  const url = createOAuthUrl({
     app: 'cherrystudio'
   })
+  return url
 }
 
 export async function decryptToken(token: string) {
+  const { decrypt } = await import('../integration/nutstore/sso/lib')
   try {
-    const decrypted = await decryptSecret({
-      app: 'cherrystudio',
-      s: token
-    })
+    const decrypted = decrypt('cherrystudio', token)
     return JSON.parse(decrypted) as OAuthResponse
   } catch (error) {
     console.error('解密失败:', error)

src/main/services/ObsidianVaultService.ts

@@ -1,5 +1,4 @@
 import { app } from 'electron'
-import Logger from 'electron-log'
 import fs from 'fs'
 import path from 'path'
 
@@ -156,7 +155,7 @@ class ObsidianVaultService {
         return []
       }
 
-      Logger.log('获取Vault文件结构:', vault.name, vault.path)
+      console.log('获取Vault文件结构:', vault.name, vault.path)
       return this.getVaultStructure(vault.path)
     } catch (error) {
       console.error('获取Vault文件结构时发生错误:', error)

src/main/services/ProtocolClient.ts

@@ -1,12 +1,3 @@
-import { exec } from 'node:child_process'
-import fs from 'node:fs/promises'
-import path from 'node:path'
-import { promisify } from 'node:util'
-
-import { app } from 'electron'
-import Logger from 'electron-log'
-
-import { handleMcpProtocolUrl } from './urlschema/mcp-install'
 import { windowService } from './WindowService'
 
 export const CHERRY_STUDIO_PROTOCOL = 'cherrystudio'
@@ -25,17 +16,12 @@ export function handleProtocolUrl(url: string) {
   if (!url) return
   // Process the URL that was used to open the app
   // The url will be in the format: cherrystudio://data?param1=value1&param2=value2
+  console.log('Received URL:', url)
 
   // Parse the URL and extract parameters
   const urlObj = new URL(url)
   const params = new URLSearchParams(urlObj.search)
 
-  switch (urlObj.hostname.toLowerCase()) {
-    case 'mcp':
-      handleMcpProtocolUrl(urlObj)
-      return
-  }
-
   // You can send the data to your renderer process
   const mainWindow = windowService.getMainWindow()
 
@@ -46,78 +32,3 @@ export function handleProtocolUrl(url: string) {
     })
   }
 }
-
-const execAsync = promisify(exec)
-
-const DESKTOP_FILE_NAME = 'cherrystudio-url-handler.desktop'
-
-/**
- * Sets up deep linking for the AppImage build on Linux by creating a .desktop file.
- * This allows the OS to open cherrystudio:// URLs with this App.
- */
-export async function setupAppImageDeepLink(): Promise<void> {
-  // Only run on Linux and when packaged as an AppImage
-  if (process.platform !== 'linux' || !process.env.APPIMAGE) {
-    return
-  }
-
-  Logger.info('AppImage environment detected on Linux, setting up deep link.')
-
-  try {
-    const appPath = app.getPath('exe')
-    if (!appPath) {
-      Logger.error('Could not determine App path.')
-      return
-    }
-
-    const homeDir = app.getPath('home')
-    const applicationsDir = path.join(homeDir, '.local', 'share', 'applications')
-    const desktopFilePath = path.join(applicationsDir, DESKTOP_FILE_NAME)
-
-    // Ensure the applications directory exists
-    await fs.mkdir(applicationsDir, { recursive: true })
-
-    // Content of the .desktop file
-    // %U allows passing the URL to the application
-    // NoDisplay=true hides it from the regular application menu
-    const desktopFileContent = `[Desktop Entry]
-Name=Cherry Studio
-Exec=${escapePathForExec(appPath)} %U
-Terminal=false
-Type=Application
-MimeType=x-scheme-handler/${CHERRY_STUDIO_PROTOCOL};
-NoDisplay=true
-`
-
-    // Write the .desktop file (overwrite if exists)
-    await fs.writeFile(desktopFilePath, desktopFileContent, 'utf-8')
-    Logger.info(`Created/Updated desktop file: ${desktopFilePath}`)
-
-    // Update the desktop database
-    // It's important to update the database for the changes to take effect
-    try {
-      const { stdout, stderr } = await execAsync(`update-desktop-database ${escapePathForExec(applicationsDir)}`)
-      if (stderr) {
-        Logger.warn(`update-desktop-database stderr: ${stderr}`)
-      }
-      Logger.info(`update-desktop-database stdout: ${stdout}`)
-      Logger.info('Desktop database updated successfully.')
-    } catch (updateError) {
-      Logger.error('Failed to update desktop database:', updateError)
-      // Continue even if update fails, as the file is still created.
-    }
-  } catch (error) {
-    // Log the error but don't prevent the app from starting
-    Logger.error('Failed to setup AppImage deep link:', error)
-  }
-}
-
-/**
- * Escapes a path for safe use within the Exec field of a .desktop file
- * and for shell commands. Handles spaces and potentially other special characters
- * by quoting.
- */
-function escapePathForExec(filePath: string): string {
-  // Simple quoting for paths with spaces.
-  return `'${filePath.replace(/'/g, "'\\''")}'`
-}

src/main/services/ProxyManager.ts

@@ -1,6 +1,5 @@
 import { ProxyConfig as _ProxyConfig, session } from 'electron'
 import { socksDispatcher } from 'fetch-socks'
-import { getSystemProxy } from 'os-proxy-config'
 import { ProxyAgent as GeneralProxyAgent } from 'proxy-agent'
 import { ProxyAgent, setGlobalDispatcher } from 'undici'
 
@@ -71,14 +70,15 @@ export class ProxyManager {
 
   private async setSystemProxy(): Promise<void> {
     try {
-      const currentProxy = await getSystemProxy()
-      if (!currentProxy || currentProxy.proxyUrl === this.config.url) {
-        return
-      }
       await this.setSessionsProxy({ mode: 'system' })
-      this.config.url = currentProxy.proxyUrl.toLowerCase()
-      this.setEnvironment(this.config.url)
-      this.proxyAgent = new GeneralProxyAgent()
+      const proxyString = await session.defaultSession.resolveProxy('https://dummy.com')
+      const [protocol, address] = proxyString.split(';')[0].split(' ')
+      const url = protocol === 'PROXY' ? `http://${address}` : null
+      if (url && url !== this.config.url) {
+        this.config.url = url.toLowerCase()
+        this.setEnvironment(this.config.url)
+        this.proxyAgent = new GeneralProxyAgent()
+      }
     } catch (error) {
       console.error('Failed to set system proxy:', error)
       throw error
@@ -127,13 +127,22 @@ export class ProxyManager {
       const [protocol, address] = proxyUrl.split('://')
       const [host, port] = address.split(':')
       if (!protocol.includes('socks')) {
-        setGlobalDispatcher(new ProxyAgent(proxyUrl))
+        // 使用标准方式创建ProxyAgent，但添加错误处理
+        try {
+          // 尝试使用代理
+          const agent = new ProxyAgent(proxyUrl)
+          setGlobalDispatcher(agent)
+          console.log('[Proxy] Successfully set HTTP proxy:', proxyUrl)
+        } catch (error) {
+          console.error('[Proxy] Failed to set proxy:', error)
+        }
       } else {
-        global[Symbol.for('undici.globalDispatcher.1')] = socksDispatcher({
+        const dispatcher = socksDispatcher({
           port: parseInt(port),
           type: protocol === 'socks5' ? 5 : 4,
           host: host
         })
+        global[Symbol.for('undici.globalDispatcher.1')] = dispatcher
       }
     }
   }

src/main/services/ReduxService.ts

@@ -191,7 +191,7 @@ export const reduxService = new ReduxService()
  try {
  // 读取状态
  const settings = await reduxService.select('state.settings')
- Logger.log('settings', settings)
+ console.log('settings', settings)
 
  // 派发 action
  await reduxService.dispatch({
@@ -201,7 +201,7 @@ export const reduxService = new ReduxService()
 
  // 订阅状态变化
  const unsubscribe = await reduxService.subscribe('state.settings.apiKey', (newValue) => {
- Logger.log('API key changed:', newValue)
+ console.log('API key changed:', newValue)
  })
 
  // 批量执行 actions
@@ -212,16 +212,16 @@ export const reduxService = new ReduxService()
 
  // 同步方法虽然可能不是最新的数据，但响应更快
  const apiKey = reduxService.selectSync('state.settings.apiKey')
- Logger.log('apiKey', apiKey)
+ console.log('apiKey', apiKey)
 
  // 处理保证是最新的数据
  const apiKey1 = await reduxService.select('state.settings.apiKey')
- Logger.log('apiKey1', apiKey1)
+ console.log('apiKey1', apiKey1)
 
  // 取消订阅
  unsubscribe()
  } catch (error) {
- Logger.error('Error:', error)
+ console.error('Error:', error)
  }
  }
  */

src/main/services/RemoteStorage.ts

@@ -1,57 +0,0 @@
-// import Logger from 'electron-log'
-// import { Operator } from 'opendal'
-
-// export default class RemoteStorage {
-//   public instance: Operator | undefined
-
-//   /**
-//    *
-//    * @param scheme is the scheme for opendal services. Available value includes "azblob", "azdls", "cos", "gcs", "obs", "oss", "s3", "webdav", "webhdfs", "aliyun-drive", "alluxio", "azfile", "dropbox", "gdrive", "onedrive", "postgresql", "mysql", "redis", "swift", "mongodb", "alluxio", "b2", "seafile", "upyun", "koofr", "yandex-disk"
-//    * @param options is the options for given opendal services. Valid options depend on the scheme. Checkout https://docs.rs/opendal/latest/opendal/services/index.html for all valid options.
-//    *
-//    * For example, use minio as remote storage:
-//    *
-//    * ```typescript
-//    * const storage = new RemoteStorage('s3', {
-//    *   endpoint: 'http://localhost:9000',
-//    *   region: 'us-east-1',
-//    *   bucket: 'testbucket',
-//    *   access_key_id: 'user',
-//    *   secret_access_key: 'password',
-//    *   root: '/path/to/basepath',
-//    * })
-//    * ```
-//    */
-//   constructor(scheme: string, options?: Record<string, string> | undefined | null) {
-//     this.instance = new Operator(scheme, options)
-
-//     this.putFileContents = this.putFileContents.bind(this)
-//     this.getFileContents = this.getFileContents.bind(this)
-//   }
-
-//   public putFileContents = async (filename: string, data: string | Buffer) => {
-//     if (!this.instance) {
-//       return new Error('RemoteStorage client not initialized')
-//     }
-
-//     try {
-//       return await this.instance.write(filename, data)
-//     } catch (error) {
-//       Logger.error('[RemoteStorage] Error putting file contents:', error)
-//       throw error
-//     }
-//   }
-
-//   public getFileContents = async (filename: string) => {
-//     if (!this.instance) {
-//       throw new Error('RemoteStorage client not initialized')
-//     }
-
-//     try {
-//       return await this.instance.read(filename)
-//     } catch (error) {
-//       Logger.error('[RemoteStorage] Error getting file contents:', error)
-//       throw error
-//     }
-//   }
-// }

src/main/services/SearchService.ts

@@ -74,7 +74,8 @@ export class SearchService {
     })
 
     // Get the page content after ensuring it's fully loaded
-    return await window.webContents.executeJavaScript('document.documentElement.outerHTML')
+    const content = await window.webContents.executeJavaScript('document.documentElement.outerHTML')
+    return content
   }
 }
 

src/main/services/ShortcutService.ts

@@ -1,4 +1,3 @@
-import { handleZoomFactor } from '@main/utils/zoom'
 import { Shortcut } from '@types'
 import { BrowserWindow, globalShortcut } from 'electron'
 import Logger from 'electron-log'
@@ -15,11 +14,14 @@ const windowOnHandlers = new Map<BrowserWindow, { onFocusHandler: () => void; on
 function getShortcutHandler(shortcut: Shortcut) {
   switch (shortcut.key) {
     case 'zoom_in':
-      return (window: BrowserWindow) => handleZoomFactor([window], 0.1)
+      return (window: BrowserWindow) => handleZoom(0.1)(window)
     case 'zoom_out':
-      return (window: BrowserWindow) => handleZoomFactor([window], -0.1)
+      return (window: BrowserWindow) => handleZoom(-0.1)(window)
     case 'zoom_reset':
-      return (window: BrowserWindow) => handleZoomFactor([window], 0, true)
+      return (window: BrowserWindow) => {
+        window.webContents.setZoomFactor(1)
+        configManager.setZoomFactor(1)
+      }
     case 'show_app':
       return () => {
         windowService.toggleMainWindow()
@@ -37,6 +39,17 @@ function formatShortcutKey(shortcut: string[]): string {
   return shortcut.join('+')
 }
 
+function handleZoom(delta: number) {
+  return (window: BrowserWindow) => {
+    const currentZoom = configManager.getZoomFactor()
+    const newZoom = Number((currentZoom + delta).toFixed(1))
+    if (newZoom >= 0.1 && newZoom <= 5.0) {
+      window.webContents.setZoomFactor(newZoom)
+      configManager.setZoomFactor(newZoom)
+    }
+  }
+}
+
 const convertShortcutRecordedByKeyboardEventKeyValueToElectronGlobalShortcutFormat = (
   shortcut: string | string[]
 ): string => {

src/main/services/StoreSyncService.ts

@@ -1,116 +0,0 @@
-import { IpcChannel } from '@shared/IpcChannel'
-import type { StoreSyncAction } from '@types'
-import { BrowserWindow, ipcMain } from 'electron'
-
-/**
- * StoreSyncService class manages Redux store synchronization between multiple windows in the main process
- * It uses singleton pattern to ensure only one sync service instance exists in the application
- *
- * Main features:
- * 1. Manages window subscriptions for store sync
- * 2. Handles IPC communication for store sync between windows
- * 3. Broadcasts Redux actions from one window to all other windows
- * 4. Adds metadata to synced actions to prevent infinite sync loops
- */
-export class StoreSyncService {
-  private static instance: StoreSyncService
-  private windowIds: number[] = []
-  private isIpcHandlerRegistered = false
-
-  private constructor() {
-    return
-  }
-
-  /**
-   * Get the singleton instance of StoreSyncService
-   */
-  public static getInstance(): StoreSyncService {
-    if (!StoreSyncService.instance) {
-      StoreSyncService.instance = new StoreSyncService()
-    }
-    return StoreSyncService.instance
-  }
-
-  /**
-   * Subscribe a window to store sync
-   * @param windowId ID of the window to subscribe
-   */
-  public subscribe(windowId: number): void {
-    if (!this.windowIds.includes(windowId)) {
-      this.windowIds.push(windowId)
-    }
-  }
-
-  /**
-   * Unsubscribe a window from store sync
-   * @param windowId ID of the window to unsubscribe
-   */
-  public unsubscribe(windowId: number): void {
-    this.windowIds = this.windowIds.filter((id) => id !== windowId)
-  }
-
-  /**
-   * Register IPC handlers for store sync communication
-   * Handles window subscription, unsubscription and action broadcasting
-   */
-  public registerIpcHandler(): void {
-    if (this.isIpcHandlerRegistered) return
-
-    ipcMain.handle(IpcChannel.StoreSync_Subscribe, (event) => {
-      const windowId = BrowserWindow.fromWebContents(event.sender)?.id
-      if (windowId) {
-        this.subscribe(windowId)
-      }
-    })
-
-    ipcMain.handle(IpcChannel.StoreSync_Unsubscribe, (event) => {
-      const windowId = BrowserWindow.fromWebContents(event.sender)?.id
-      if (windowId) {
-        this.unsubscribe(windowId)
-      }
-    })
-
-    ipcMain.handle(IpcChannel.StoreSync_OnUpdate, (event, action: StoreSyncAction) => {
-      const sourceWindowId = BrowserWindow.fromWebContents(event.sender)?.id
-
-      if (!sourceWindowId) return
-
-      // Broadcast the action to all other windows
-      this.broadcastToOtherWindows(sourceWindowId, action)
-    })
-
-    this.isIpcHandlerRegistered = true
-  }
-
-  /**
-   * Broadcast a Redux action to all other windows except the source
-   * @param sourceWindowId ID of the window that originated the action
-   * @param action Redux action to broadcast
-   */
-  private broadcastToOtherWindows(sourceWindowId: number, action: StoreSyncAction): void {
-    // Add metadata to indicate this action came from sync
-    const syncAction = {
-      ...action,
-      meta: {
-        ...action.meta,
-        fromSync: true,
-        source: `windowId:${sourceWindowId}`
-      }
-    }
-
-    // Send to all windows except the source
-    this.windowIds.forEach((windowId) => {
-      if (windowId !== sourceWindowId) {
-        const targetWindow = BrowserWindow.fromId(windowId)
-        if (targetWindow && !targetWindow.isDestroyed()) {
-          targetWindow.webContents.send(IpcChannel.StoreSync_BroadcastSync, syncAction)
-        } else {
-          this.unsubscribe(windowId)
-        }
-      }
-    })
-  }
-}
-
-// Export singleton instance
-export default StoreSyncService.getInstance()

src/main/services/WebDav.ts

@@ -26,7 +26,6 @@ export default class WebDav {
     this.putFileContents = this.putFileContents.bind(this)
     this.getFileContents = this.getFileContents.bind(this)
     this.createDirectory = this.createDirectory.bind(this)
-    this.deleteFile = this.deleteFile.bind(this)
   }
 
   public putFileContents = async (
@@ -99,19 +98,4 @@ export default class WebDav {
       throw error
     }
   }
-
-  public deleteFile = async (filename: string) => {
-    if (!this.instance) {
-      throw new Error('WebDAV client not initialized')
-    }
-
-    const remoteFilePath = `${this.webdavPath}/${filename}`
-
-    try {
-      return await this.instance.deleteFile(remoteFilePath)
-    } catch (error) {
-      Logger.error('[WebDAV] Error deleting file on WebDAV:', error)
-      throw error
-    }
-  }
 }

src/main/services/WebviewService.ts

@@ -1,35 +0,0 @@
-import { session, shell, webContents } from 'electron'
-
-/**
- * init the useragent of the webview session
- * remove the CherryStudio and Electron from the useragent
- */
-export function initSessionUserAgent() {
-  const wvSession = session.fromPartition('persist:webview')
-  const newChromeVersion = '135.0.7049.96'
-  const originUA = wvSession.getUserAgent()
-  const newUA = originUA
-    .replace(/CherryStudio\/\S+\s/, '')
-    .replace(/Electron\/\S+\s/, '')
-    .replace(/Chrome\/\d+\.\d+\.\d+\.\d+/, `Chrome/${newChromeVersion}`)
-
-  wvSession.setUserAgent(newUA)
-}
-
-/**
- * WebviewService handles the behavior of links opened from webview elements
- * It controls whether links should be opened within the application or in an external browser
- */
-export function setOpenLinkExternal(webviewId: number, isExternal: boolean) {
-  const webview = webContents.fromId(webviewId)
-  if (!webview) return
-
-  webview.setWindowOpenHandler(({ url }) => {
-    if (isExternal) {
-      shell.openExternal(url)
-      return { action: 'deny' }
-    } else {
-      return { action: 'allow' }
-    }
-  })
-}

src/main/services/WindowService.ts

@@ -2,17 +2,15 @@ import { is } from '@electron-toolkit/utils'
 import { isDev, isLinux, isMac, isWin } from '@main/constant'
 import { getFilesDir } from '@main/utils/file'
 import { IpcChannel } from '@shared/IpcChannel'
-import { ThemeMode } from '@types'
-import { app, BrowserWindow, nativeTheme, shell } from 'electron'
+import { app, BrowserWindow, ipcMain, Menu, MenuItem, shell } from 'electron'
 import Logger from 'electron-log'
 import windowStateKeeper from 'electron-window-state'
 import { join } from 'path'
 
 import icon from '../../../build/icon.png?asset'
 import { titleBarOverlayDark, titleBarOverlayLight } from '../config'
+import { locales } from '../utils/locales'
 import { configManager } from './ConfigManager'
-import { contextMenu } from './ContextMenu'
-import { initSessionUserAgent } from './WebviewService'
 
 export class WindowService {
   private static instance: WindowService | null = null
@@ -22,7 +20,9 @@ export class WindowService {
   //hacky-fix: store the focused status of mainWindow before miniWindow shows
   //to restore the focus status when miniWindow hides
   private wasMainWindowFocused: boolean = false
-  private lastRendererProcessCrashTime: number = 0
+  private selectionMenuWindow: BrowserWindow | null = null
+  private lastSelectedText: string = ''
+  private contextMenu: Menu | null = null
 
   public static getInstance(): WindowService {
     if (!WindowService.instance) {
@@ -41,16 +41,10 @@ export class WindowService {
     const mainWindowState = windowStateKeeper({
       defaultWidth: 1080,
       defaultHeight: 670,
-      fullScreen: false,
-      maximize: false
+      fullScreen: false
     })
 
     const theme = configManager.getTheme()
-    if (theme === ThemeMode.auto) {
-      nativeTheme.themeSource = 'system'
-    } else {
-      nativeTheme.themeSource = theme
-    }
 
     this.mainWindow = new BrowserWindow({
       x: mainWindowState.x,
@@ -64,10 +58,9 @@ export class WindowService {
       transparent: isMac,
       vibrancy: 'sidebar',
       visualEffectState: 'active',
-      titleBarStyle: 'hidden',
-      titleBarOverlay: nativeTheme.shouldUseDarkColors ? titleBarOverlayDark : titleBarOverlayLight,
-      backgroundColor: isMac ? undefined : nativeTheme.shouldUseDarkColors ? '#181818' : '#FFFFFF',
-      darkTheme: nativeTheme.shouldUseDarkColors,
+      titleBarStyle: isLinux ? 'default' : 'hidden',
+      titleBarOverlay: theme === 'dark' ? titleBarOverlayDark : titleBarOverlayLight,
+      backgroundColor: isMac ? undefined : theme === 'dark' ? '#181818' : '#FFFFFF',
       trafficLightPosition: { x: 8, y: 12 },
       ...(isLinux ? { icon } : {}),
       webPreferences: {
@@ -87,61 +80,32 @@ export class WindowService {
       this.miniWindow = this.createMiniWindow(true)
     }
 
-    //init the MinApp webviews' useragent
-    initSessionUserAgent()
-
     return this.mainWindow
   }
 
   private setupMainWindow(mainWindow: BrowserWindow, mainWindowState: any) {
     mainWindowState.manage(mainWindow)
 
-    this.setupMaximize(mainWindow, mainWindowState.isMaximized)
     this.setupContextMenu(mainWindow)
     this.setupWindowEvents(mainWindow)
     this.setupWebContentsHandlers(mainWindow)
     this.setupWindowLifecycleEvents(mainWindow)
-    this.setupMainWindowMonitor(mainWindow)
     this.loadMainWindowContent(mainWindow)
   }
 
-  private setupMainWindowMonitor(mainWindow: BrowserWindow) {
-    mainWindow.webContents.on('render-process-gone', (_, details) => {
-      Logger.error(`Renderer process crashed with: ${JSON.stringify(details)}`)
-      const currentTime = Date.now()
-      const lastCrashTime = this.lastRendererProcessCrashTime
-      this.lastRendererProcessCrashTime = currentTime
-      if (currentTime - lastCrashTime > 60 * 1000) {
-        // 如果大于1分钟，则重启渲染进程
-        mainWindow.webContents.reload()
-      } else {
-        // 如果小于1分钟，则退出应用, 可能是连续crash，需要退出应用
-        app.exit(1)
-      }
-    })
-
-    mainWindow.webContents.on('unresponsive', () => {
-      // 在升级到electron 34后，可以获取具体js stack trace,目前只打个日志监控下
-      // https://www.electronjs.org/blog/electron-34-0#unresponsive-renderer-javascript-call-stacks
-      Logger.error('Renderer process unresponsive')
-    })
-  }
-
-  private setupMaximize(mainWindow: BrowserWindow, isMaximized: boolean) {
-    if (isMaximized) {
-      // 如果是从托盘启动，则需要延迟最大化，否则显示的就不是重启前的最大化窗口了
-      configManager.getLaunchToTray()
-        ? mainWindow.once('show', () => {
-            mainWindow.maximize()
-          })
-        : mainWindow.maximize()
-    }
-  }
-
   private setupContextMenu(mainWindow: BrowserWindow) {
-    contextMenu.contextMenu(mainWindow)
-    app.on('browser-window-created', (_, win) => {
-      contextMenu.contextMenu(win)
+    if (!this.contextMenu) {
+      const locale = locales[configManager.getLanguage()]
+      const { common } = locale.translation
+
+      this.contextMenu = new Menu()
+      this.contextMenu.append(new MenuItem({ label: common.copy, role: 'copy' }))
+      this.contextMenu.append(new MenuItem({ label: common.paste, role: 'paste' }))
+      this.contextMenu.append(new MenuItem({ label: common.cut, role: 'cut' }))
+    }
+
+    mainWindow.webContents.on('context-menu', () => {
+      this.contextMenu?.popup()
     })
 
     // Dangerous API
@@ -150,6 +114,13 @@ export class WindowService {
         webPreferences.preload = join(__dirname, '../preload/index.js')
       })
     }
+
+    // Handle webview context menu
+    mainWindow.webContents.on('did-attach-webview', (_, webContents) => {
+      webContents.on('context-menu', () => {
+        this.contextMenu?.popup()
+      })
+    })
   }
 
   private setupWindowEvents(mainWindow: BrowserWindow) {
@@ -220,11 +191,9 @@ export class WindowService {
 
       const oauthProviderUrls = [
         'https://account.siliconflow.cn/oauth',
-        'https://cloud.siliconflow.cn/bills',
         'https://cloud.siliconflow.cn/expensebill',
         'https://aihubmix.com/token',
-        'https://aihubmix.com/topup',
-        'https://aihubmix.com/statistics'
+        'https://aihubmix.com/topup'
       ]
 
       if (oauthProviderUrls.some((link) => url.startsWith(link))) {
@@ -274,7 +243,6 @@ export class WindowService {
   private loadMainWindowContent(mainWindow: BrowserWindow) {
     if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
       mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'])
-      // mainWindow.webContents.openDevTools()
     } else {
       mainWindow.loadFile(join(__dirname, '../renderer/index.html'))
     }
@@ -304,14 +272,9 @@ export class WindowService {
         }
       }
 
-      /**
-       * 上述逻辑以下:
-       * win/linux: 是“开启托盘+设置关闭时最小化到托盘”的情况
-       * mac: 任何情况都会到这里，因此需要单独处理mac
-       */
+      //上述逻辑以下，是“开启托盘+设置关闭时最小化到托盘”的情况
 
       event.preventDefault()
-
       mainWindow.hide()
 
       //for mac users, should hide dock icon if close to tray
@@ -357,14 +320,10 @@ export class WindowService {
         this.mainWindow.setVisibleOnAllWorkspaces(true)
       }
 
-      /**
-       * [macOS] After being closed in fullscreen, the fullscreen behavior will become strange when window shows again
-       * So we need to set it to FALSE explicitly.
-       * althougle other platforms don't have the issue, but it's a good practice to do so
-       *
-       *  Check if window is visible to prevent interrupting fullscreen state when clicking dock icon
-       */
-      if (this.mainWindow.isFullScreen() && !this.mainWindow.isVisible()) {
+      //[macOS] After being closed in fullscreen, the fullscreen behavior will become strange when window shows again
+      // So we need to set it to FALSE explicitly.
+      // althougle other platforms don't have the issue, but it's a good practice to do so
+      if (this.mainWindow.isFullScreen()) {
         this.mainWindow.setFullScreen(false)
       }
 
@@ -467,10 +426,16 @@ export class WindowService {
       this.miniWindow?.webContents.send(IpcChannel.ShowMiniWindow)
     })
 
+    ipcMain.on(IpcChannel.MiniWindowReload, () => {
+      this.miniWindow?.reload()
+    })
+
     if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
-      this.miniWindow.loadURL(process.env['ELECTRON_RENDERER_URL'] + '/miniWindow.html')
+      this.miniWindow.loadURL(process.env['ELECTRON_RENDERER_URL'] + '#/mini')
     } else {
-      this.miniWindow.loadFile(join(__dirname, '../renderer/miniWindow.html'))
+      this.miniWindow.loadFile(join(__dirname, '../renderer/index.html'), {
+        hash: '#/mini'
+      })
     }
 
     return this.miniWindow
@@ -483,6 +448,10 @@ export class WindowService {
       return
     }
 
+    if (this.selectionMenuWindow && !this.selectionMenuWindow.isDestroyed()) {
+      this.selectionMenuWindow.hide()
+    }
+
     if (this.miniWindow && !this.miniWindow.isDestroyed()) {
       this.wasMainWindowFocused = this.mainWindow?.isFocused() || false
 
@@ -529,6 +498,74 @@ export class WindowService {
   public setPinMiniWindow(isPinned) {
     this.isPinnedMiniWindow = isPinned
   }
+
+  public showSelectionMenu(bounds: { x: number; y: number }) {
+    if (this.selectionMenuWindow && !this.selectionMenuWindow.isDestroyed()) {
+      this.selectionMenuWindow.setPosition(bounds.x, bounds.y)
+      this.selectionMenuWindow.show()
+      return
+    }
+
+    const theme = configManager.getTheme()
+
+    this.selectionMenuWindow = new BrowserWindow({
+      width: 280,
+      height: 40,
+      x: bounds.x,
+      y: bounds.y,
+      show: true,
+      autoHideMenuBar: true,
+      transparent: true,
+      frame: false,
+      alwaysOnTop: false,
+      skipTaskbar: true,
+      backgroundColor: isMac ? undefined : theme === 'dark' ? '#181818' : '#FFFFFF',
+      resizable: false,
+      vibrancy: 'popover',
+      webPreferences: {
+        preload: join(__dirname, '../preload/index.js'),
+        sandbox: false,
+        webSecurity: false
+      }
+    })
+
+    // 点击其他地方时隐藏窗口
+    this.selectionMenuWindow.on('blur', () => {
+      this.selectionMenuWindow?.hide()
+      this.miniWindow?.webContents.send(IpcChannel.SelectionAction, {
+        action: 'home',
+        selectedText: this.lastSelectedText
+      })
+    })
+
+    if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
+      this.selectionMenuWindow.loadURL(process.env['ELECTRON_RENDERER_URL'] + '/src/windows/menu/menu.html')
+    } else {
+      this.selectionMenuWindow.loadFile(join(__dirname, '../renderer/src/windows/menu/menu.html'))
+    }
+
+    this.setupSelectionMenuEvents()
+  }
+
+  private setupSelectionMenuEvents() {
+    if (!this.selectionMenuWindow) return
+
+    ipcMain.removeHandler(IpcChannel.SelectionMenu_Action)
+    ipcMain.handle(IpcChannel.SelectionMenu_Action, (_, action) => {
+      this.selectionMenuWindow?.hide()
+      this.showMiniWindow()
+      setTimeout(() => {
+        this.miniWindow?.webContents.send(IpcChannel.SelectionAction, {
+          action,
+          selectedText: this.lastSelectedText
+        })
+      }, 100)
+    })
+  }
+
+  public setLastSelectedText(text: string) {
+    this.lastSelectedText = text
+  }
 }
 
 export const windowService = WindowService.getInstance()

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

@@ -1,75 +0,0 @@
-import Logger from 'electron-log'
-import EventEmitter from 'events'
-import http from 'http'
-import { URL } from 'url'
-
-import { OAuthCallbackServerOptions } from './types'
-
-export class CallBackServer {
-  private server: Promise<http.Server>
-  private events: EventEmitter
-
-  constructor(options: OAuthCallbackServerOptions) {
-    const { port, path, events } = options
-    this.events = events
-    this.server = this.initialize(port, path)
-  }
-
-  initialize(port: number, path: string): Promise<http.Server> {
-    const server = http.createServer((req, res) => {
-      // Only handle requests to the callback path
-      if (req.url?.startsWith(path)) {
-        try {
-          // Parse the URL to extract the authorization code
-          const url = new URL(req.url, `http://127.0.0.1:${port}`)
-          const code = url.searchParams.get('code')
-          if (code) {
-            // Emit the code event
-            this.events.emit('auth-code-received', code)
-          }
-        } catch (error) {
-          Logger.error('Error processing OAuth callback:', error)
-          res.writeHead(500, { 'Content-Type': 'text/plain' })
-          res.end('Internal Server Error')
-        }
-      } else {
-        // Not a callback request
-        res.writeHead(404, { 'Content-Type': 'text/plain' })
-        res.end('Not Found')
-      }
-    })
-
-    // Handle server errors
-    server.on('error', (error) => {
-      Logger.error('OAuth callback server error:', error)
-    })
-
-    return new Promise<http.Server>((resolve, reject) => {
-      server.listen(port, () => {
-        Logger.info(`OAuth callback server listening on port ${port}`)
-        resolve(server)
-      })
-
-      server.on('error', (error) => {
-        reject(error)
-      })
-    })
-  }
-
-  get getServer(): Promise<http.Server> {
-    return this.server
-  }
-
-  async close() {
-    const server = await this.server
-    server.close()
-  }
-
-  async waitForAuthCode(): Promise<string> {
-    return new Promise((resolve) => {
-      this.events.once('auth-code-received', (code) => {
-        resolve(code)
-      })
-    })
-  }
-}

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

@@ -1,78 +0,0 @@
-import path from 'node:path'
-
-import { getConfigDir } from '@main/utils/file'
-import { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth'
-import { OAuthClientInformation, OAuthClientInformationFull, OAuthTokens } from '@modelcontextprotocol/sdk/shared/auth'
-import Logger from 'electron-log'
-import open from 'open'
-
-import { JsonFileStorage } from './storage'
-import { OAuthProviderOptions } from './types'
-
-export class McpOAuthClientProvider implements OAuthClientProvider {
-  private storage: JsonFileStorage
-  public readonly config: Required<OAuthProviderOptions>
-
-  constructor(options: OAuthProviderOptions) {
-    const configDir = path.join(getConfigDir(), 'mcp', 'oauth')
-    this.config = {
-      serverUrlHash: options.serverUrlHash,
-      callbackPort: options.callbackPort || 12346,
-      callbackPath: options.callbackPath || '/oauth/callback',
-      configDir: options.configDir || configDir,
-      clientName: options.clientName || 'Cherry Studio',
-      clientUri: options.clientUri || 'https://github.com/CherryHQ/cherry-studio'
-    }
-    this.storage = new JsonFileStorage(this.config.serverUrlHash, this.config.configDir)
-  }
-
-  get redirectUrl(): string {
-    return `http://127.0.0.1:${this.config.callbackPort}${this.config.callbackPath}`
-  }
-
-  get clientMetadata() {
-    return {
-      redirect_uris: [this.redirectUrl],
-      token_endpoint_auth_method: 'none',
-      grant_types: ['authorization_code', 'refresh_token'],
-      response_types: ['code'],
-      client_name: this.config.clientName,
-      client_uri: this.config.clientUri
-    }
-  }
-
-  async clientInformation(): Promise<OAuthClientInformation | undefined> {
-    return this.storage.getClientInformation()
-  }
-
-  async saveClientInformation(info: OAuthClientInformationFull): Promise<void> {
-    await this.storage.saveClientInformation(info)
-  }
-
-  async tokens(): Promise<OAuthTokens | undefined> {
-    return this.storage.getTokens()
-  }
-
-  async saveTokens(tokens: OAuthTokens): Promise<void> {
-    await this.storage.saveTokens(tokens)
-  }
-
-  async redirectToAuthorization(authorizationUrl: URL): Promise<void> {
-    try {
-      // Open the browser to the authorization URL
-      await open(authorizationUrl.toString())
-      Logger.info('Browser opened automatically.')
-    } catch (error) {
-      Logger.error('Could not open browser automatically.')
-      throw error // Let caller handle the error
-    }
-  }
-
-  async saveCodeVerifier(codeVerifier: string): Promise<void> {
-    await this.storage.saveCodeVerifier(codeVerifier)
-  }
-
-  async codeVerifier(): Promise<string> {
-    return this.storage.getCodeVerifier()
-  }
-}