chore(version): 0.8.24

历史消息懒加载

.eslintignore

@@ -2,4 +2,4 @@ node_modules
 dist
 out
 .gitignore
-
+scripts/cloudflare-worker.js

.github/ISSUE_TEMPLATE/#0_bug_report.yml

@@ -0,0 +1,73 @@
+name: 🐛 错误报告
+description: 创建一个报告以帮助我们改进
+title: '[错误]: '
+labels: ['bug']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢您花时间填写此错误报告！
+
+  - 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: description
+    attributes:
+      label: 错误描述
+      description: 清晰简洁地描述错误是什么
+      placeholder: 告诉我们发生了什么...
+    validations:
+      required: true
+
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: 重现步骤
+      description: 重现行为的步骤
+      placeholder: |
+        1. 转到 '...'
+        2. 点击 '....'
+        3. 向下滚动到 '....'
+        4. 看到错误
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: 预期行为
+      description: 清晰简洁地描述您期望发生的事情
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: 相关日志输出
+      description: 请复制并粘贴任何相关的日志输出
+      render: shell
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: 附加信息
+      description: 在此添加有关问题的任何其他上下文

.github/ISSUE_TEMPLATE/#1_feature_request.yml

@@ -0,0 +1,38 @@
+name: 💡 功能建议
+description: 为项目提出新的想法
+title: '[功能]: '
+labels: ['enhancement']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢您花时间提出新的功能建议!
+
+  - type: textarea
+    id: problem
+    attributes:
+      label: 您的功能建议是否与某个问题相关?
+      description: 请简明扼要地描述您遇到的问题
+      placeholder: 我总是感到沮丧,因为...
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: 请描述您希望实现的解决方案
+      description: 请简明扼要地描述您希望发生的情况
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: 请描述您考虑过的其他方案
+      description: 请简明扼要地描述您考虑过的任何其他解决方案或功能
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: 其他补充信息
+      description: 在此添加任何其他与功能建议相关的上下文或截图

.github/ISSUE_TEMPLATE/#2_question.yml

@@ -0,0 +1,44 @@
+name: ❓ 提问
+description: 提出一个问题或寻求帮助
+title: '[问题]: '
+labels: ['question']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢您的提问！请尽可能详细地描述您的问题，这样我们才能更好地帮助您。
+
+  - type: textarea
+    id: question
+    attributes:
+      label: 您的问题
+      description: 请详细描述您的问题
+      placeholder: 请尽可能清楚地说明您的问题...
+    validations:
+      required: true
+
+  - type: textarea
+    id: context
+    attributes:
+      label: 相关背景
+      description: 请提供一些背景信息，帮助我们更好地理解您的问题
+      placeholder: 例如：使用场景、已尝试的解决方案等
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: 补充信息
+      description: 任何其他相关的信息、截图或代码示例
+      render: shell
+
+  - type: dropdown
+    id: priority
+    attributes:
+      label: 优先级
+      description: 这个问题对您来说有多紧急？
+      options:
+        - 低 (有空再看)
+        - 中 (希望尽快得到答复)
+        - 高 (阻碍工作进行)
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/0_bug_report.yml

@@ -0,0 +1,73 @@
+name: 🐛 Bug Report
+description: Create a report to help us improve
+title: '[Bug]: '
+labels: ['bug']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+
+  - type: dropdown
+    id: platform
+    attributes:
+      label: Platform
+      description: What 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: description
+    attributes:
+      label: Bug Description
+      description: A clear and concise description of what the bug is
+      placeholder: Tell us what happened...
+    validations:
+      required: true
+
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Steps To Reproduce
+      description: Steps to reproduce the behavior
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected Behavior
+      description: A clear and concise description of what you expected to happen
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant Log Output
+      description: Please copy and paste any relevant log output
+      render: shell
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Context
+      description: Add any other context about the problem here

.github/ISSUE_TEMPLATE/1_feature_request.yml

@@ -0,0 +1,38 @@
+name: 💡 Feature Request
+description: Suggest an idea for this project
+title: '[Feature]: '
+labels: ['enhancement']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to suggest a new feature!
+
+  - type: textarea
+    id: problem
+    attributes:
+      label: Is your feature request related to a problem?
+      description: A clear and concise description of what the problem is
+      placeholder: I'm always frustrated when...
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Context
+      description: Add any other context or screenshots about the feature request here

.github/ISSUE_TEMPLATE/2_question.yml

@@ -0,0 +1,44 @@
+name: ❓ Question
+description: Ask a question or seek help
+title: '[Question]: '
+labels: ['question']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for asking a question! Please provide as much detail as possible so we can better assist you.
+
+  - type: textarea
+    id: question
+    attributes:
+      label: Your Question
+      description: Please describe your question in detail
+      placeholder: Please explain your question as clearly as possible...
+    validations:
+      required: true
+
+  - type: textarea
+    id: context
+    attributes:
+      label: Context
+      description: Please provide some background information to help us better understand your question
+      placeholder: "For example: use case, solutions you've tried, etc."
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Information
+      description: Any other relevant information, screenshots, or code examples
+      render: shell
+
+  - type: dropdown
+    id: priority
+    attributes:
+      label: Priority
+      description: How urgent is this question for you?
+      options:
+        - Low (Can wait)
+        - Medium (Would like a response soon)
+        - High (Blocking progress)
+    validations:
+      required: true

.github/workflows/release.yml

@@ -1,6 +1,12 @@
 name: Release
 
 on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version (e.g. v1.2.3)'
+        required: true
+        type: string
   push:
     tags:
       - v*.*.*
@@ -71,5 +77,6 @@ jobs:
             dist/*.rpm
             dist/*.tar.gz
             dist/latest*.yml
+            dist/*.blockmap
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

.gitignore

@@ -19,12 +19,6 @@ lerna-debug.log*
 *.sln
 *.sw?
 
-# NPM
-npm/*/*
-!npm/*/dist
-!npm/*/package.json
-!npm/*/*.js
-
 # Yarn
 .pnp.*
 .yarn/*

.prettierignore

@@ -5,3 +5,4 @@ LICENSE.md
 tsconfig.json
 tsconfig.*.json
 CHANGELOG*.md
+agents.json

.yarn/patches/openai-npm-4.71.1-b5940d6401.patch

@@ -0,0 +1,26 @@
+diff --git a/core.js b/core.js
+index 00b67a48b7b5cf0029413fc84abd0c01630c3d14..5550b58495b468060f775ca86e4d849d82573ea5 100644
+--- a/core.js
++++ b/core.js
+@@ -156,7 +156,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 8bc7a0ee10d61560d7113cf3f703355bb19f7ddd..5e4c8586ea6b13fe887a22af2de05eaa4700b5ec 100644
+--- a/core.mjs
++++ b/core.mjs
+@@ -149,7 +149,7 @@ export class APIClient {
+             Accept: 'application/json',
+             'Content-Type': 'application/json',
+             'User-Agent': this.getUserAgent(),
+-            ...getPlatformHeaders(),
++            // ...getPlatformHeaders(),
+             ...this.authHeaders(opts),
+         };
+     }

CODE_OF_CONDUCT.md

@@ -0,0 +1,29 @@
+# Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+- Using welcoming and inclusive language
+- Being respectful of differing viewpoints and experiences
+- Gracefully accepting constructive criticism
+- Focusing on what is best for the community
+- Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+- The use of sexualized language or imagery and unwelcome sexual attention or advances
+- Trolling, insulting/derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or electronic address, without explicit permission
+- Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.

CONTRIBUTING.md

@@ -0,0 +1,45 @@
+# Cherry Studio 贡献者指南
+
+欢迎来到 Cherry Studio 的贡献者社区！我们致力于将 Cherry Studio 打造成一个长期提供价值的项目，并希望邀请更多的开发者加入我们的行列。无论您是经验丰富的开发者还是刚刚起步的初学者，您的贡献都将帮助我们更好地服务用户，提升软件质量。
+
+## 如何贡献
+
+以下是您可以参与的几种方式：
+
+1. **贡献代码**：帮助我们开发新功能或优化现有代码。请确保您的代码符合我们的编码标准，并通过所有测试。
+
+2. **修复 BUG**：如果您发现了 BUG，欢迎提交修复方案。请在提交前确认问题已被解决，并附上相关测试。
+
+3. **维护 Issue**：协助我们管理 GitHub 上的 issue，帮助标记、分类和解决问题。
+
+4. **产品设计**：参与产品设计讨论，帮助我们改进用户体验和界面设计。
+
+5. **编写文档**：帮助我们完善用户手册、API 文档和开发者指南。
+
+6. **社区维护**：参与社区讨论，帮助解答用户问题，促进社区活跃。
+
+7. **推广使用**：通过博客、社交媒体等渠道推广 Cherry Studio，吸引更多用户和开发者。
+
+## 开始贡献
+
+1. **Fork 仓库**：在 GitHub 上 fork 我们的仓库，并将其克隆到本地。
+
+2. **创建分支**：为您要进行的更改创建一个新的分支。
+
+3. **提交更改**：在本地进行更改并提交。请确保您的提交信息清晰明了。
+
+4. **发起 Pull Request**：将您的更改推送到 GitHub，并发起 Pull Request。请描述您的更改内容和原因。
+
+### 其他建议
+
+- **联系开发者**：在提交 PR 之前，您可以先和开发者进行联系，共同探讨或者获取帮助。
+- **成为核心开发者**：如果您能够稳定为项目贡献，恭喜您可以成为项目核心开发者，获取到项目成员身份。
+
+## 联系我们
+
+如果您有任何问题或建议，欢迎通过以下方式联系我们：
+
+- 微信：kangfenmao
+- [GitHub Issues](https://github.com/kangfenmao/cherry-studio/issues)
+
+感谢您的支持和贡献！我们期待与您一起将 Cherry Studio 打造成更好的产品。

LICENSE

@@ -1,101 +1,79 @@
-### Cherry Studio 商业许可协议
+## Cherry Studio 用户协议
+
+欢迎使用 Cherry Studio 桌面 AI 客户端工具。请仔细阅读以下协议条款，继续使用本软件即表示您同意本协议内容。
+
+**许可协议**
+
+本软件采用 Apache License 2.0 许可。除 Apache License 2.0 规定的条款外，您在使用 Cherry Studio 时还应遵守以下附加条款：
+
+**一. 商用许可**
+
+1. **免费商用**：用户在不修改代码的情况下，可以免费用于商业目的。
+2. **商业授权**：如果您满足以下任意条件之一，需取得商业授权：
+   1. 对本软件进行二次修改、开发（包括但不限于修改应用名称、logo、代码以及功能）。
+   2. 为企业客户提供多租户服务，且该服务支持 10 人或以上的使用。
+   3. 预装或集成到硬件设备或产品中进行捆绑销售。
+   4. 政府或教育机构的大规模采购项目，特别是涉及安全、数据隐私等敏感需求时。
+
+**二. 贡献者协议**
+
+作为 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。
 
 ---
 
-#### 中文版
+根据 Apache 许可证 2.0 版（“许可证”）进行许可；除非符合许可证，否则您不得使用此文件。您可以在以下网址获取许可证副本：
 
-**Cherry Studio 商业许可协议**
+http://www.apache.org/licenses/LICENSE-2.0
 
-本协议（以下简称“协议”）由以下双方签订：
+除非适用法律要求或书面同意，软件根据许可证分发的内容以“原样”分发，不附带任何明示或暗示的保证或条件。请参阅特定语言管理权限的许可证和许可证下的限制。
 
-- 许可方：王谦（kangfenmao@qq.com）
-- 被许可方：[被许可方名称]
+## Cherry Studio User Agreement
 
-**1. 定义**
+Welcome to Cherry Studio, a desktop AI client tool. Please read the following agreement carefully. By continuing to use this software, you agree to the terms outlined below.
 
-- “软件”指 Cherry Studio 软件，网址为 https://cherry-ai.com。
-- “商业用途”指任何以盈利为目的的使用。
+**License Agreement**
 
-**2. 许可**
+This software is licensed under the **Apache License 2.0**. In addition to the terms of the Apache License 2.0, the following additional terms apply to the use of Cherry Studio:
 
-- 未经许可方明确书面许可，被许可方不得将软件用于商业用途。
-- 未经许可方事先书面同意，被许可方不得将软件全部或部分用于商业用途分发。
-- 未经许可方明确授权，被许可方不得再许可、租赁、销售、出租或以其他方式将软件转让给任何第三方用于商业用途。
+**I. Commercial Use License**
 
-**3. 责任限制**
+1. **Free Commercial Use**: Users can use the software for commercial purposes without modifying the code.
+2. **Commercial License Required**: A commercial license is required if any of the following conditions are met:
+   1. You modify, develop, or alter the software, including but not limited to changes to the application name, logo, code, or functionality.
+   2. You provide multi-tenant services to enterprise customers with 10 or more users.
+   3. You pre-install or integrate the software into hardware devices or products and bundle it for sale.
+   4. You are engaging in large-scale procurement for government or educational institutions, especially involving security, data privacy, or other sensitive requirements.
 
-开发者不对因使用本软件而产生的任何直接或间接损失承担责任。用户应自行承担使用本软件的风险。
+**II. Contributor Agreement**
 
-**4. 许可协议生效日期**
+As a contributor to Cherry Studio, you agree to the following:
 
-本许可协议自用户首次下载或使用本软件之日起生效。
+1. **License Adjustment**: The producer reserves the right to adjust the open-source license as needed, making it stricter or more lenient.
+2. **Commercial Use**: Any code you contribute may be used for commercial purposes, including but not limited to cloud business operations.
 
-**5. 许可终止**
+**III. Other Terms**
 
-如发现用户违反上述条款，开发者有权随时终止本许可，并要求用户停止使用本软件及删除所有相关副本。
+1. The interpretation of these terms is subject to the discretion of Cherry Studio developers.
+2. These terms may be updated, and users will be notified through the software when changes occur.
 
-**6. 其他**
+For any questions or to request a commercial license, please contact the Cherry Studio development team.
 
-本协议的解释、效力及争议的解决，均适用中华人民共和国法律。
-
-**7. 联系信息**
-
-- 许可方联系方式：
-  - 手机号：18539907620
-  - 邮箱：kangfenmao@qq.com
-
-**许可方（签字）：**  
-**日期：**
-
-**被许可方（签字）：**  
-**日期：**
+Apart from the specific conditions mentioned above, all other rights and restrictions follow the Apache License 2.0. Detailed information about the Apache License 2.0 can be found at http://www.apache.org/licenses/LICENSE-2.0.
 
 ---
 
-#### English Version
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 
-**Cherry Studio Commercial License Agreement**
-
-This Agreement ("Agreement") is entered into by and between:
-
-- Licensor: Wang Qian (kangfenmao)
-- Licensee: [Licensee Name]
-
-**1. Definitions**
-
-- "Software" refers to the Cherry Studio software, available at https://cherry-ai.com.
-- "Commercial Use" refers to any use for profit.
-
-**2. License**
-
-- The Licensee may not use the Software for Commercial Use without the Licensor's explicit written permission.
-- The Licensee may not distribute the Software in whole or in part for Commercial Use without the Licensor's prior written consent.
-- The Licensee may not sublicense, lease, sell, rent, or otherwise transfer the Software to any third party for Commercial Use without the Licensor's explicit authorization.
-
-**3. Termination of License**
-
-The developer reserves the right to terminate this license at any time if the terms are violated, and may require the user to cease using the software and delete all related copies.
-
-**4. Effective Date of License Agreement**
-
-This license agreement becomes effective from the date the user first downloads or uses the software.
-
-**5. Termination of License**
-
-The developer reserves the right to terminate this license at any time if the terms are violated, and may require the user to cease using the software and delete all related copies.
-
-**6. Miscellaneous**
-
-This Agreement shall be governed by and construed in accordance with the laws of the People's Republic of China.
-
-**7. Contact Information**
-
-- Licensor's Contact Details:
-  - Phone: 18539907620
-  - Email: kangfenmao@qq.com
-
-**Licensor (Signature):**  
-**Date:**
-
-**Licensee (Signature):**  
-**Date:**
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

README.md

@@ -1,35 +1,67 @@
 <div align="center">
   <a href="https://github.com/kangfenmao/cherry-studio/releases">
-    <img src="https://github.com/user-attachments/assets/7b4f2f78-5cbe-4be8-9aec-f98d8405a505" alt="banner" />
+    <img src="https://github.com/kangfenmao/cherry-studio/blob/main/build/icon.png?raw=true" width="150" height="150" alt="banner" />
   </a>
-  English | <a href="./docs/README.zh.md">中文</a>
+</div>
+<div align="center">
+  English | <a href="./docs/README.zh.md">中文</a> | <a href="./docs/README.ja.md">日本語</a>
 </div>
 
 # 🍒 Cherry Studio
 
+![](https://github.com/user-attachments/assets/7b4f2f78-5cbe-4be8-9aec-f98d8405a505)
+
 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)
+
 # 🌠 Screenshot
 
 ![](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)
 
-# 🌟 Features
+# 🌟 Key Features
 
-1. Support for Multiple LLM Providers.
-2. Allows creation of multiple Assistants.
-3. Enables creation of multiple topics.
-4. Allows using multiple models to answer questions in the same conversation.
-5. Supports drag-and-drop sorting.
-6. Code highlighting.
-7. Mermaid chart
+1. **Diverse LLM Provider Support**:
+
+   - ☁️ Major LLM Cloud Services: OpenAI, Gemini, Anthropic, and more
+   - 🔗 AI Web Service Integration: Claude, Peplexity, Poe, and others
+   - 💻 Local Model Support with Ollama
+
+2. **AI Assistants & Conversations**:
+
+   - 📚 300+ Pre-configured AI Assistants
+   - 🤖 Custom Assistant Creation
+   - 💬 Multi-model Simultaneous Conversations
+
+3. **Document & Data Processing**:
+
+   - 📄 Support for Text, Images, Office, PDF, and more
+   - ☁️ WebDAV File Management and Backup
+   - 📊 Mermaid Chart Visualization
+   - 💻 Code Syntax Highlighting
+
+4. **Practical Tools Integration**:
+
+   - 🔍 Global Search Functionality
+   - 📝 Topic Management System
+   - 🔤 AI-powered Translation
+   - 🎯 Drag-and-drop Sorting
+   - 🔌 Mini Program Support
+
+5. **Enhanced User Experience**:
+   - 🖥️ Cross-platform Support for Windows, Mac, and Linux
+   - 📦 Ready to Use, No Environment Setup Required
+   - 🎨 Light/Dark Themes and Transparent Window
+   - 📝 Complete Markdown Rendering
+   - 🤲 Easy Content Sharing
 
 # 🖥️ Develop
 
-## Recommended IDE Setup
+## IDE Setup
 
-- [VSCode](https://code.visualstudio.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
+[Cursor](https://www.cursor.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
 
 ## Project Setup
 
@@ -58,20 +90,52 @@ $ yarn build:mac
 $ yarn build:linux
 ```
 
-# ⭐️ Star History
+# 🤝 Contributing
 
-[![Star History Chart](https://api.star-history.com/svg?repos=kangfenmao/cherry-studio&type=Timeline)](https://star-history.com/#kangfenmao/cherry-studio&Timeline)
+We welcome contributions to Cherry Studio! Here are some ways you can contribute:
+
+1. **Contribute Code**: Develop new features or optimize existing code.
+2. **Fix Bugs**: Submit fixes for any bugs you find.
+3. **Maintain Issues**: Help manage GitHub issues.
+4. **Product Design**: Participate in design discussions.
+5. **Write Documentation**: Improve user manuals and guides.
+6. **Community Engagement**: Join discussions and help users.
+7. **Promote Usage**: Spread the word about Cherry Studio.
+
+## Getting Started
+
+1. **Fork the Repository**: Fork and clone it to your local machine.
+2. **Create a Branch**: For your changes.
+3. **Submit Changes**: Commit and push your changes.
+4. **Open a Pull Request**: Describe your changes and reasons.
+
+For more detailed guidelines, please refer to our [Contributing Guide](./CONTRIBUTING.md).
+
+Thank you for your support and contributions!
 
 # 🚀 Contributors
 
 <a href="https://github.com/kangfenmao/cherry-studio/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=kangfenmao/cherry-studio" />
 </a>
+<br /><br />
 
-# Sponsor
+# 🌐 Community
+
+[Telegram](https://t.me/CherryStudioAI) | [Email](mailto:kangfenmao@gmail.com) | [Twitter](https://x.com/kangfenmao)
+
+# 📣 Product Hunt
+
+<a href="https://www.producthunt.com/posts/cherry-studio?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cherry&#0045;studio" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=496640&theme=light" alt="Cherry&#0032;Studio - AI&#0032;Chatbots&#0044;&#0032;AI&#0032;Desktop&#0032;Client | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+
+# ☕ Sponsor
 
 [Buy Me a Coffee](docs/sponsor.md)
 
 # 📃 License
 
 [LICENSE](./LICENSE)
+
+# ⭐️ Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=kangfenmao/cherry-studio&type=Timeline)](https://star-history.com/#kangfenmao/cherry-studio&Timeline)

dev-app-update.yml

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

docs/README.ja.md

@@ -0,0 +1,140 @@
+<div align="center">
+  <a href="https://github.com/kangfenmao/cherry-studio/releases">
+    <img src="https://github.com/kangfenmao/cherry-studio/blob/main/build/icon.png?raw=true" width="150" height="150" alt="banner" />
+  </a>
+</div>
+<div align="center">
+  <a href="./README.md">English</a> | <a href="./README.zh.md">中文</a> | 日本語
+</div>
+
+# 🍒 Cherry Studio
+
+![](https://github.com/user-attachments/assets/7b4f2f78-5cbe-4be8-9aec-f98d8405a505)
+
+Cherry Studioは、複数のLLMプロバイダーをサポートするデスクトップクライアントで、Windows、Mac、Linuxで利用可能です。
+
+👏 [Telegramグループ](https://t.me/CherryStudioAI)に参加しましょう
+
+# 🌠 スクリーンショット
+
+![](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)
+
+# 🌟 主な機能
+
+1. **多様な LLM サービス対応**：
+
+   - ☁️ 主要な LLM クラウドサービス対応：OpenAI、Gemini、Anthropic など
+   - 🔗 AI Web サービス統合：Claude、Peplexity、Poe など
+   - 💻 Ollama によるローカルモデル実行対応
+
+2. **AI アシスタントと対話**：
+
+   - 📚 300+ の事前設定済み AI アシスタント
+   - 🤖 カスタム AI アシスタントの作成
+   - 💬 複数モデルでの同時対話機能
+
+3. **文書とデータ処理**：
+
+   - 📄 テキスト、画像、Office、PDF など多様な形式対応
+   - ☁️ WebDAV によるファイル管理とバックアップ
+   - 📊 Mermaid による図表作成
+   - 💻 コードハイライト機能
+
+4. **実用的なツール統合**：
+
+   - 🔍 グローバル検索機能
+   - 📝 トピック管理システム
+   - 🔤 AI による翻訳機能
+   - 🎯 ドラッグ＆ドロップによる整理
+   - 🔌 ミニプログラム対応
+
+5. **優れたユーザー体験**：
+   - 🖥️ Windows、Mac、Linux のクロスプラットフォーム対応
+   - 📦 環境構築不要ですぐに使用可能
+   - 🎨 ライト/ダークテーマと透明ウィンドウ対応
+   - 📝 完全な Markdown レンダリング
+   - 🤲 簡単な共有機能
+
+# 🖥️ 開発
+
+## IDEの設定
+
+[Cursor](https://www.cursor.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
+
+## プロジェクトの設定
+
+### インストール
+
+```bash
+$ yarn
+```
+
+### 開発
+
+```bash
+$ yarn dev
+```
+
+### ビルド
+
+```bash
+# Windowsの場合
+$ yarn build:win
+
+# macOSの場合
+$ yarn build:mac
+
+# Linuxの場合
+$ yarn build:linux
+```
+
+# 🤝 貢献
+
+Cherry Studioへの貢献を歓迎します！以下の方法で貢献できます：
+
+1. **コードの貢献**：新機能を開発するか、既存のコードを最適化します。
+2. **バグの修正**：見つけたバグを修正します。
+3. **問題の管理**：GitHubの問題を管理するのを手伝います。
+4. **製品デザイン**：デザインの議論に参加します。
+5. **ドキュメントの作成**：ユーザーマニュアルやガイドを改善します。
+6. **コミュニティの参加**：ディスカッションに参加し、ユーザーを支援します。
+7. **使用の促進**：Cherry Studioを広めます。
+
+## 始め方
+
+1. **リポジトリをフォーク**：フォークしてローカルマシンにクローンします。
+2. **ブランチを作成**：変更のためのブランチを作成します。
+3. **変更を提出**：変更をコミットしてプッシュします。
+4. **プルリクエストを開く**：変更内容と理由を説明します。
+
+詳細なガイドラインについては、[貢献ガイド](./CONTRIBUTING.md)をご覧ください。
+
+ご支援と貢献に感謝します！
+
+# 🚀 コントリビューター
+
+<a href="https://github.com/kangfenmao/cherry-studio/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=kangfenmao/cherry-studio" />
+</a>
+
+# コミュニティ
+
+[Telegram](https://t.me/CherryStudioAI) | [Email](mailto:kangfenmao@gmail.com) | [Twitter](https://x.com/kangfenmao)
+
+# 📣 プロダクトハント
+
+<a href="https://www.producthunt.com/posts/cherry-studio?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cherry&#0045;studio" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=496640&theme=light" alt="Cherry&#0032;Studio - AI&#0032;Chatbots&#0044;&#0032;AI&#0032;Desktop&#0032;Client | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+
+# スポンサー
+
+[Buy Me a Coffee](sponsor.md)
+
+# 📃 ライセンス
+
+[LICENSE](../LICENSE)
+
+# ⭐️ スター履歴
+
+[![Star History Chart](https://api.star-history.com/svg?repos=kangfenmao/cherry-studio&type=Timeline)](https://star-history.com/#kangfenmao/cherry-studio&Timeline)

docs/README.zh.md

@@ -1,96 +1,141 @@
 <div align="center">
   <a href="https://github.com/kangfenmao/cherry-studio/releases">
-    <img src="https://github.com/user-attachments/assets/995910f3-177a-4d1e-97ea-04e3b009ba36" alt="banner"/>
+    <img src="https://github.com/kangfenmao/cherry-studio/blob/main/build/icon.png?raw=true" width="150" height="150" alt="banner" />
   </a>
-  English / <a href="https://github.com/kangfenmao/cherry-studio">中文</a>
+</div>
+<div align="center">
+  中文 / <a href="https://github.com/kangfenmao/cherry-studio">English</a> / <a href="./README.ja.md">日本語</a>
 </div>
 
 # 🍒 Cherry Studio
 
-Cherry Studio 是一款跨平台桌面客户端，支持多个大语言模型（LLM）服务商，兼容 Windows、Mac 和 Linux 系统，并拥丰富的个性化选项与领先的功能设计。
+![](https://github.com/user-attachments/assets/995910f3-177a-4d1e-97ea-04e3b009ba36)
+
+Cherry Studio 是一款支持多个大语言模型（LLM）服务商的桌面客户端，兼容 Windows、Mac 和 Linux 系统。
+
+👏 欢迎加入 [Telegram 群组](https://t.me/CherryStudioAI)
 
 # 🌠 界面
 
-<img width="1582" alt="Xnip2024-09-23_15-01-53" src="https://github.com/user-attachments/assets/554aa31b-87b6-49fe-877d-af313e1608b0">
-<img width="1582" alt="Xnip2024-09-23_15-02-27" src="https://github.com/user-attachments/assets/f43fb4c8-194a-4f46-8575-6db2bd136cb9">
-<img width="1582" alt="Xnip2024-09-23_16-12-19" src="https://github.com/user-attachments/assets/82ce3cc1-5a0b-49aa-9fe4-0376d34be1f8">
-<img width="1582" alt="Xnip2024-09-23_16-11-44" src="https://github.com/user-attachments/assets/55e420c8-fc0f-40a0-868e-d75bebeb5af3">
-<img width="1582" alt="Xnip2024-09-23_16-11-50" src="https://github.com/user-attachments/assets/7413384e-a7c7-4525-96ea-ccd395d7e51a">
-<img width="1582" alt="Xnip2024-09-23_16-12-59" src="https://github.com/user-attachments/assets/894b5e97-569f-4471-813c-c48d19455215">
+![](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)
 
-# 🌟 特性
+# 🌟 主要特性
 
-## 😌 轻松上手
+1. **多样化 LLM 服务支持**：
 
-🍏Windows，Mac，Linux跨平台支持
+   - ☁️ 支持主流 LLM 云服务：OpenAI、Gemini、Anthropic、硅基流动等
+   - 🔗 集成流行 AI Web 服务：Claude、Peplexity、Poe、腾讯元宝、知乎直答等
+   - 💻 支持 Ollama 本地模型部署
 
-📦开箱即用，无需 Python 与 Docker
+2. **智能助手与对话**：
 
-🤝简洁、友好的界面与交互设计
+   - 📚 内置 300+ 预配置 AI 助手
+   - 🤖 支持自定义创建专属助手
+   - 💬 多模型同时对话，获得多样化观点
 
-## 🛠️多样化的 LLM 服务模式支持
+3. **文档与数据处理**：
 
-☁️ 全面覆盖 LLM 云服务，支持自定义 api key 与模型管理：OpenAI，Gemini，Anthropic，硅基流动...
+   - 📄 支持文本、图片、Office、PDF 等多种格式
+   - ☁️ WebDAV 文件管理与数据备份
+   - 📊 Mermaid 图表可视化
+   - 💻 代码高亮显示
 
-🔗汇聚流行的 AI Web 服务，并计划通过功能增强提升体验：Claude，Peplexity，Poe，腾讯元宝，知乎直答...
+4. **实用工具集成**：
 
-💻支持 Ollama 运行本地模型
+   - 🔍 全局搜索功能
+   - 📝 话题管理系统
+   - 🔤 AI 驱动的翻译功能
+   - 🎯 拖拽排序
+   - 🔌 小程序支持
 
-## 📲个性化的功能体验
+5. **优质使用体验**：
+   - 🖥️ Windows、Mac、Linux 跨平台支持
+   - 📦 开箱即用，无需配置环境
+   - 🎨 支持明暗主题与透明窗口
+   - 📝 完整的 Markdown 渲染
+   - 🤲 便捷的内容分享功能
 
-📄完整的 Markdown 与 Mermaid 渲染支持
+# 🖥️ 开发
 
-🤖使用与创建智能体提升工作效率
+## IDE 设置
 
-🔤持续迭代的翻译功能
-
-🤲生成结果支持 Markdown 与图片分享
-
-📎文件与图片上传，RAG 与多模态对话
-
-🎨透明窗口与明暗主题支持
-
-# 🖥️ 开发指南
-
-## 推荐的开发环境
-
-- [VSCode](https://code.visualstudio.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
+[Cursor](https://www.cursor.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
 
 ## 项目设置
 
-### 安装依赖
+### 安装
 
 ```bash
 $ yarn
 ```
 
-### 启动开发环境
+### 开发
 
 ```bash
 $ yarn dev
 ```
 
-### 构建版本
+### 构建
 
 ```bash
-# For windows
+# Windows
 $ yarn build:win
 
-# For macOS
+# macOS
 $ yarn build:mac
 
-# For Linux
+# Linux
 $ yarn build:linux
 ```
 
+# 🤝 贡献
+
+我们欢迎对 Cherry Studio 的贡献！您可以通过以下方式贡献：
+
+1. **贡献代码**：开发新功能或优化现有代码。
+2. **修复错误**：提交您发现的错误修复。
+3. **维护问题**：帮助管理 GitHub 问题。
+4. **产品设计**：参与设计讨论。
+5. **撰写文档**：改进用户手册和指南。
+6. **社区参与**：加入讨论并帮助用户。
+7. **推广使用**：宣传 Cherry Studio。
+
+## 入门
+
+1. **Fork 仓库**：Fork 并克隆到您的本地机器。
+2. **创建分支**：为您的更改创建分支。
+3. **提交更改**：提交并推送您的更改。
+4. **打开 Pull Request**：描述您的更改和原因。
+
+有关更详细的指南，请参阅我们的 [贡献指南](./CONTRIBUTING.md)。
+
+感谢您的支持和贡献！
+
+# 🚀 贡献者
+
+<a href="https://github.com/kangfenmao/cherry-studio/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=kangfenmao/cherry-studio" />
+</a>
+<br /><br />
+
+# 🌐 社区
+
+[Telegram](https://t.me/CherryStudioAI) | [Email](mailto:kangfenmao@gmail.com) | [Twitter](https://x.com/kangfenmao)
+
+# 📣 产品猎人
+
+<a href="https://www.producthunt.com/posts/cherry-studio?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cherry&#0045;studio" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=496640&theme=light" alt="Cherry&#0032;Studio - AI&#0032;Chatbots&#0044;&#0032;AI&#0032;Desktop&#0032;Client | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+
+# ☕ 赞助
+
+[微信赞赏码](sponsor.md)
+
+# 📃 许可证
+
+[LICENSE](../LICENSE)
+
 # ⭐️ Star 记录
 
 [![Star History Chart](https://api.star-history.com/svg?repos=kangfenmao/cherry-studio&type=Timeline)](https://star-history.com/#kangfenmao/cherry-studio&Timeline)
-
-# 赞助
-
-[微信赞赏码](docs/sponsor.md)
-
-# 📃 许可证
-
-[LICENSE](./LICENSE)

docs/Sponsor.md

@@ -1,5 +0,0 @@
-# Sponsor
-
-<div align="center">
-  <img src="https://github.com/user-attachments/assets/4665f07f-5ecc-4bd8-8727-ae00f35d6d98" alt="Buy Me a Coffee" width="280"/>
-</div>

docs/dev/FAQ.md

@@ -1,95 +0,0 @@
-# FAQ 文档
-本文档适用于：产品手册、官网页面、课程测验、现场 Q&A。
-
-## 问题1：Cherry Studio 支持哪些操作系统？
-- **答案**：Cherry Studio 支持 Windows、Mac 和 Linux 操作系统。
-
-## 问题2：Cherry Studio 的主要功能有哪些？
-- **答案**：Cherry Studio 的主要功能包括：
-  1. 支持多个 LLM 提供商
-  2. 允许创建多个助手
-  3. 支持创建多个主题
-  4. 允许在同一对话中使用多个模型来回答问题
-  5. 支持拖放排序
-  6. 代码高亮
-  7. Mermaid 图表支持
-
-## 问题3：Cherry Studio 的主要目录结构是怎样的？
-- **答案**：Cherry Studio 的主要目录结构如下：
-  - `/src`: 主要源代码目录
-  - `/build`: 构建相关文件
-  - `/docs`: 文档目录
-  - `/resources`: 资源文件目录
-  - `/scripts`: 脚本文件目录
-
-## 问题4：如何在 Windows 环境下 fork Cherry Studio 并修改部分功能？
-- **答案**：在 Windows 环境下 fork Cherry Studio 并修改部分功能的步骤如下：
-  1. 在 GitHub 上 fork Cherry Studio 仓库
-  2. 克隆 fork 的仓库到本地：`git clone https://github.com/your-username/cherry-studio.git`
-  3. 进入项目目录：`cd cherry-studio`
-  4. 安装依赖：`yarn install`
-  5. 修改所需的功能代码
-  6. 测试修改：`yarn dev`
-  7. 提交修改：`git add .` 和 `git commit -m "描述你的修改"`
-  8. 推送到你的 fork 仓库：`git push origin main`
-
-## 问题5：Cherry Studio 使用了哪些主要技术栈？
-- **答案**：Cherry Studio 主要使用了以下技术栈：
-  - TypeScript
-  - SCSS
-  - Electron
-  - Vite
-  - Sequelize
-
-## 问题6：如何贡献代码到 Cherry Studio 项目？
-- **答案**：贡献代码到 Cherry Studio 项目的步骤如下：
-  1. Fork 项目仓库
-  2. 创建你的特性分支：`git checkout -b feature/AmazingFeature`
-  3. 提交你的修改：`git commit -m 'Add some AmazingFeature'`
-  4. 推送到分支：`git push origin feature/AmazingFeature`
-  5. 打开一个 Pull Request
-
-## 问题7：Cherry Studio 的 `/src` 目录主要包含哪些内容？
-- **答案**：Cherry Studio 的 `/src` 目录主要包含以下内容：
-  - 主进程代码（Electron 主进程）
-  - 渲染进程代码（用户界面）
-  - 组件
-  - 工具函数
-  - 状态管理
-  - 样式文件
-
-## 问题8：如何在 Cherry Studio 中添加新的 LLM 提供商？
-- **答案**：要在 Cherry Studio 中添加新的 LLM 提供商，你需要：
-  1. 在 `/src/services` 或类似目录下创建新的服务文件
-  2. 实现与新 LLM 提供商 API 的集成
-  3. 在用户界面中添加新提供商的选项
-  4. 更新配置和状态管理以支持新提供商
-
-## 问题9：Cherry Studio 的构建过程是怎样的？
-- **答案**：Cherry Studio 的构建过程主要包括：
-  1. 使用 Vite 构建前端资源
-  2. 使用 Electron Builder 打包桌面应用
-  3. 根据不同平台（Windows、Mac、Linux）生成相应的安装包
-
-## 问题10：如何在 Cherry Studio 中实现新的 UI 主题？
-- **答案**：在 Cherry Studio 中实现新的 UI 主题的步骤：
-  1. 在 `/src/styles` 目录下创建新的主题 SCSS 文件
-  2. 定义新主题的颜色变量和样式
-  3. 在主样式文件中导入新主题
-  4. 更新主题切换逻辑以包含新主题
-  5. 在用户界面中添加新主题的选项
-
-## 问题11：Cherry Studio 如何处理多语言支持？
-- **答案**：Cherry Studio 可能通过以下方式处理多语言支持：
-  1. 使用 i18n 库进行国际化
-  2. 在 `/src/locales` 或类似目录下存储不同语言的翻译文件
-  3. 实现语言切换功能
-  4. 在组件中使用翻译函数或组件来显示多语言文本
-
-## 问题12：如何为 Cherry Studio 编写单元测试？
-- **答案**：为 Cherry Studio 编写单元测试的步骤：
-  1. 在 `/tests` 目录下创建测试文件
-  2. 使用测试框架（如 Jest）编写测试用例
-  3. 模拟 Electron 环境和其他依赖
-  4. 运行测试命令：`yarn test`
-  5. 确保测试覆盖主要功能和组件

docs/dev/faq.md

@@ -1,95 +0,0 @@
-# FAQ 文档
-本文档适用于：产品手册、官网页面、课程测验、现场 Q&A。
-
-## 问题1：Cherry Studio 支持哪些操作系统？
-- **答案**：Cherry Studio 支持 Windows、Mac 和 Linux 操作系统。
-
-## 问题2：Cherry Studio 的主要功能有哪些？
-- **答案**：Cherry Studio 的主要功能包括：
-  1. 支持多个 LLM 提供商
-  2. 允许创建多个助手
-  3. 支持创建多个主题
-  4. 允许在同一对话中使用多个模型来回答问题
-  5. 支持拖放排序
-  6. 代码高亮
-  7. Mermaid 图表支持
-
-## 问题3：Cherry Studio 的主要目录结构是怎样的？
-- **答案**：Cherry Studio 的主要目录结构如下：
-  - `/src`: 主要源代码目录
-  - `/build`: 构建相关文件
-  - `/docs`: 文档目录
-  - `/resources`: 资源文件目录
-  - `/scripts`: 脚本文件目录
-
-## 问题4：如何在 Windows 环境下 fork Cherry Studio 并修改部分功能？
-- **答案**：在 Windows 环境下 fork Cherry Studio 并修改部分功能的步骤如下：
-  1. 在 GitHub 上 fork Cherry Studio 仓库
-  2. 克隆 fork 的仓库到本地：`git clone https://github.com/your-username/cherry-studio.git`
-  3. 进入项目目录：`cd cherry-studio`
-  4. 安装依赖：`yarn install`
-  5. 修改所需的功能代码
-  6. 测试修改：`yarn dev`
-  7. 提交修改：`git add .` 和 `git commit -m "描述你的修改"`
-  8. 推送到你的 fork 仓库：`git push origin main`
-
-## 问题5：Cherry Studio 使用了哪些主要技术栈？
-- **答案**：Cherry Studio 主要使用了以下技术栈：
-  - TypeScript
-  - SCSS
-  - Electron
-  - Vite
-  - Sequelize
-
-## 问题6：如何贡献代码到 Cherry Studio 项目？
-- **答案**：贡献代码到 Cherry Studio 项目的步骤如下：
-  1. Fork 项目仓库
-  2. 创建你的特性分支：`git checkout -b feature/AmazingFeature`
-  3. 提交你的修改：`git commit -m 'Add some AmazingFeature'`
-  4. 推送到分支：`git push origin feature/AmazingFeature`
-  5. 打开一个 Pull Request
-
-## 问题7：Cherry Studio 的 `/src` 目录主要包含哪些内容？
-- **答案**：Cherry Studio 的 `/src` 目录主要包含以下内容：
-  - 主进程代码（Electron 主进程）
-  - 渲染进程代码（用户界面）
-  - 组件
-  - 工具函数
-  - 状态管理
-  - 样式文件
-
-## 问题8：如何在 Cherry Studio 中添加新的 LLM 提供商？
-- **答案**：要在 Cherry Studio 中添加新的 LLM 提供商，你需要：
-  1. 在 `/src/services` 或类似目录下创建新的服务文件
-  2. 实现与新 LLM 提供商 API 的集成
-  3. 在用户界面中添加新提供商的选项
-  4. 更新配置和状态管理以支持新提供商
-
-## 问题9：Cherry Studio 的构建过程是怎样的？
-- **答案**：Cherry Studio 的构建过程主要包括：
-  1. 使用 Vite 构建前端资源
-  2. 使用 Electron Builder 打包桌面应用
-  3. 根据不同平台（Windows、Mac、Linux）生成相应的安装包
-
-## 问题10：如何在 Cherry Studio 中实现新的 UI 主题？
-- **答案**：在 Cherry Studio 中实现新的 UI 主题的步骤：
-  1. 在 `/src/styles` 目录下创建新的主题 SCSS 文件
-  2. 定义新主题的颜色变量和样式
-  3. 在主样式文件中导入新主题
-  4. 更新主题切换逻辑以包含新主题
-  5. 在用户界面中添加新主题的选项
-
-## 问题11：Cherry Studio 如何处理多语言支持？
-- **答案**：Cherry Studio 可能通过以下方式处理多语言支持：
-  1. 使用 i18n 库进行国际化
-  2. 在 `/src/locales` 或类似目录下存储不同语言的翻译文件
-  3. 实现语言切换功能
-  4. 在组件中使用翻译函数或组件来显示多语言文本
-
-## 问题12：如何为 Cherry Studio 编写单元测试？
-- **答案**：为 Cherry Studio 编写单元测试的步骤：
-  1. 在 `/tests` 目录下创建测试文件
-  2. 使用测试框架（如 Jest）编写测试用例
-  3. 模拟 Electron 环境和其他依赖
-  4. 运行测试命令：`yarn test`
-  5. 确保测试覆盖主要功能和组件

docs/dev/structure.md

@@ -1,72 +0,0 @@
-## Cherry Studio目录结构和功能
-
-### 1. `/src`: 主要源代码目录
-   - ** `/main`**: Electron主进程相关代码
-     - 负责应用的生命周期管理、窗口创建、IPC通信等
-   - ** `/renderer`**: Electron渲染进程相关代码
-     - 包含用户界面的实现，使用TypeScript和SCSS
-   - ** `/preload`**: 预加载脚本
-     - 用于在渲染进程中安全地暴露主进程功能
-   - ** `/components`**: React组件
-     - 可复用的UI组件，如对话框、输入框等
-   - ** `/pages`**: 应用的主要页面
-     - 如聊天界面、设置页面等
-   - ** `/store`**: 状态管理
-     - 可能使用Redux或MobX来管理应用状态
-   - ** `/utils`**: 工具函数
-     - 包含各种辅助函数和工具类
-   - ** `/styles`**: 全局样式文件
-     - 包含SCSS文件，定义全局样式和主题
-
-### 2. `/public`: 静态资源目录
-   - 包含图标、字体等静态文件
-
-### 3. `/electron`: Electron相关配置
-   - 包含Electron的构建和打包配置
-
-### 4. `/scripts`: 构建和开发脚本
-   - 包含npm脚本，用于开发、构建和部署
-
-### 5. `/types`: TypeScript类型定义
-   - 包含自定义的类型定义文件
-
-### 6. `/tests`: 测试文件目录
-   - 包含单元测试和集成测试
-
-### 7. `/docs`: 文档目录
-   - 包含项目文档、API文档等
-
-### 8. `/config`: 配置文件目录
-   - 包含各种配置文件，如webpack配置、环境变量等
-
-### 9. `/migrations`: 数据库迁移文件
-   - 由于使用了Sequelize，这里可能包含数据库结构的变更记录
-
-### 10. `/models`: 数据模型
-    - 定义Sequelize的数据模型，对应数据库表结构
-
-## 主要功能实现
-
-### 1. LLM提供商集成
-   - 可能在`/src/utils`或`/src/services`中实现与不同LLM API的集成
-
-### 2. 多助手和多主题支持
-   - 在`/src/store`中管理助手和主题的状态
-   - 在`/src/components`中实现相关的UI组件
-
-### 3. 多模型对话
-   - 在`/src/pages`的聊天界面中实现
-   - 可能使用`/src/store`来管理对话状态
-
-### 4. 拖放排序
-   - 在`/src/components`中实现相关的可拖拽组件
-
-### 5. 代码高亮
-   - 可能使用第三方库，如Prism.js，集成在`/src/components`中
-
-### 6. Mermaid图表支持
-   - 在`/src/components`中集成Mermaid库
-
-### 7. 数据持久化
-   - 使用Sequelize在`/models`中定义数据模型
-   - 在`/migrations`中管理数据库结构变更

electron-builder.yml

@@ -9,9 +9,8 @@ files:
   - '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
   - '!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}'
   - '!src'
-  - '!local'
   - '!scripts'
-  - '!resources'
+  - '!local'
 asarUnpack:
   - resources/**
 win:
@@ -56,18 +55,19 @@ appImage:
   artifactName: ${productName}-${version}-${arch}.${ext}
 npmRebuild: false
 publish:
-  provider: github
-  repo: cherry-studio
-  owner: kangfenmao
+  provider: generic
+  url: https://cherrystudio.ocool.online
 electronDownload:
   mirror: https://npmmirror.com/mirrors/electron/
 afterSign: scripts/notarize.js
 releaseInfo:
   releaseNotes: |
-    本次更新：
-      增加 Azure OpenAI 服务商
-      修复表格换行问题
-    近期更新：
-      增加 WebDAV 备份功能 by @DrayChou
-      增加话题历史记录
-      增加消息搜索功能
+    增加快捷键切换助手和话题显示
+    历史消息懒加载 by @1355873789
+    更快的应用更新下载速度 by @1355873789
+    更加清晰的模型分组
+    修复部分代码块无法正常显示问题
+    增加应用更新内容显示
+    消息发送增加 Ctrl + Enter 快捷键
+    清除上下文消息点击可以撤销
+    增加 Top-P 设置选项

electron.vite.config.ts

@@ -7,8 +7,9 @@ export default defineConfig({
     plugins: [externalizeDepsPlugin()],
     resolve: {
       alias: {
+        '@main': resolve('src/main'),
         '@types': resolve('src/renderer/src/types'),
-        '@main': resolve('src/main')
+        '@shared': resolve('packages/shared')
       }
     }
   },
@@ -16,11 +17,15 @@ export default defineConfig({
     plugins: [externalizeDepsPlugin()]
   },
   renderer: {
+    plugins: [react()],
     resolve: {
       alias: {
-        '@renderer': resolve('src/renderer/src')
+        '@renderer': resolve('src/renderer/src'),
+        '@shared': resolve('packages/shared')
       }
     },
-    plugins: [react()]
+    optimizeDeps: {
+      exclude: ['chunk-7UIZINC5.js', 'chunk-7OJJKI46.js']
+    }
   }
 })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "0.7.13",
+  "version": "0.8.24",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",
@@ -8,7 +8,11 @@
   "homepage": "https://github.com/kangfenmao/cherry-studio",
   "workspaces": {
     "packages": [
-      "local"
+      "local",
+      "packages/*"
+    ],
+    "nohoist": [
+      "packages/database"
     ]
   },
   "scripts": {
@@ -27,19 +31,25 @@
     "build:linux": "dotenv electron-vite build && electron-builder --linux --publish never",
     "release": "node scripts/version.js",
     "publish": "yarn release patch push",
+    "pulish:artifacts": "cd packages/artifacts && npm publish && cd -",
+    "generate:agents": "yarn workspace @cherry-studio/database agents",
     "generate:icons": "electron-icon-builder --input=./build/logo.png --output=build"
   },
   "dependencies": {
     "@electron-toolkit/preload": "^3.0.0",
     "@electron-toolkit/utils": "^3.0.0",
-    "archiver": "^7.0.1",
+    "@types/react-infinite-scroll-component": "^5.0.0",
+    "adm-zip": "^0.5.16",
+    "docx": "^9.0.2",
     "electron-log": "^5.1.5",
     "electron-store": "^8.2.0",
-    "electron-updater": "^6.1.7",
+    "electron-updater": "^6.3.9",
     "electron-window-state": "^5.0.3",
     "fs-extra": "^11.2.0",
     "html2canvas": "^1.4.1",
-    "unzipper": "^0.12.3",
+    "markdown-it": "^14.1.0",
+    "officeparser": "^4.1.1",
+    "react-infinite-scroll-component": "^6.1.0",
     "webdav": "4.11.4"
   },
   "devDependencies": {
@@ -51,13 +61,14 @@
     "@hello-pangea/dnd": "^16.6.0",
     "@kangfenmao/keyv-storage": "^0.1.0",
     "@reduxjs/toolkit": "^2.2.5",
+    "@types/adm-zip": "^0",
     "@types/fs-extra": "^11",
     "@types/lodash": "^4.17.5",
+    "@types/markdown-it": "^14",
     "@types/node": "^18.19.9",
     "@types/react": "^18.2.48",
     "@types/react-dom": "^18.2.18",
     "@types/tinycolor2": "^1",
-    "@types/unzipper": "^0",
     "@vitejs/plugin-react": "^4.2.1",
     "antd": "^5.18.3",
     "axios": "^1.7.3",
@@ -80,27 +91,28 @@
     "eslint-plugin-unused-imports": "^4.0.0",
     "gpt-tokens": "^1.3.10",
     "i18next": "^23.11.5",
-    "localforage": "^1.10.0",
     "lodash": "^4.17.21",
     "mime": "^4.0.4",
-    "openai": "^4.52.1",
+    "openai": "patch:openai@npm%3A4.71.1#~/.yarn/patches/openai-npm-4.71.1-b5940d6401.patch",
     "prettier": "^3.2.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
+    "react-hotkeys-hook": "^4.6.1",
     "react-i18next": "^14.1.2",
     "react-markdown": "^9.0.1",
     "react-redux": "^9.1.2",
     "react-router": "6",
     "react-router-dom": "6",
     "react-spinners": "^0.14.1",
-    "react-syntax-highlighter": "^15.5.0",
     "redux": "^5.0.1",
     "redux-persist": "^6.0.0",
-    "rehype-katex": "^7.0.0",
+    "rehype-katex": "^7.0.1",
+    "rehype-mathjax": "^6.0.0",
     "rehype-raw": "^7.0.0",
     "remark-gfm": "^4.0.0",
     "remark-math": "^6.0.0",
     "sass": "^1.77.2",
+    "shiki": "^1.22.2",
     "styled-components": "^6.1.11",
     "tinycolor2": "^1.6.0",
     "typescript": "^5.6.2",

packages/artifacts/README.md

@@ -0,0 +1 @@
+# Cherry Studio Artifacts

packages/artifacts/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "@cherry-studio/artifacts",
+  "version": "0.1.0",
+  "description": "Cherry Studio Artifacts",
+  "main": "index.js",
+  "homepage": "https://github.com/kangfenmao/cherry-studio/blob/main/npm/artifacts",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [
+    "artifacts"
+  ],
+  "author": "kangfenmao",
+  "license": "ISC"
+}

packages/artifacts/statics/word-explanation-card.css

@@ -0,0 +1,108 @@
+:root {
+  /* 莫兰迪色系：使用柔和、低饱和度的颜色 */
+  --primary-color: #b6b5a7; /* 莫兰迪灰褐色，用于背景文字 */
+  --secondary-color: #9a8f8f; /* 莫兰迪灰棕色，用于标题背景 */
+  --accent-color: #c5b4a0; /* 莫兰迪淡棕色，用于强调元素 */
+  --background-color: #e8e3de; /* 莫兰迪米色，用于页面背景 */
+  --text-color: #5b5b5b; /* 莫兰迪深灰色，用于主要文字 */
+  --light-text-color: #8c8c8c; /* 莫兰迪中灰色，用于次要文字 */
+  --divider-color: #d1cbc3; /* 莫兰迪浅灰色，用于分隔线 */
+}
+body,
+html {
+  margin: 0;
+  padding: 0;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: var(--background-color); /* 使用莫兰迪米色作为页面背景 */
+  font-family: 'Noto Sans SC', sans-serif;
+  color: var(--text-color); /* 使用莫兰迪深灰色作为主要文字颜色 */
+}
+.card {
+  width: 300px;
+  height: 500px;
+  background-color: #f2ede9; /* 莫兰迪浅米色，用于卡片背景 */
+  border-radius: 20px;
+  box-shadow: 0 20px 40px rgba(0, 0, 0, 0.1);
+  overflow: hidden;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+}
+.header {
+  background-color: var(--secondary-color); /* 使用莫兰迪灰棕色作为标题背景 */
+  color: #f2ede9; /* 浅色文字与深色背景形成对比 */
+  padding: 20px;
+  text-align: left;
+  position: relative;
+  z-index: 1;
+}
+h1 {
+  font-family: 'Noto Serif SC', serif;
+  font-size: 20px;
+  margin: 0;
+  font-weight: 700;
+}
+.content {
+  padding: 30px 20px;
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+}
+.word {
+  text-align: left;
+  margin-bottom: 20px;
+}
+.word-main {
+  font-family: 'Noto Serif SC', serif;
+  font-size: 36px;
+  color: var(--text-color); /* 使用莫兰迪深灰色作为主要词汇颜色 */
+  margin-bottom: 10px;
+  position: relative;
+}
+.word-main::after {
+  content: '';
+  position: absolute;
+  left: 0;
+  bottom: -5px;
+  width: 50px;
+  height: 3px;
+  background-color: var(--accent-color); /* 使用莫兰迪淡棕色作为下划线 */
+}
+.word-sub {
+  font-size: 14px;
+  color: var(--light-text-color); /* 使用莫兰迪中灰色作为次要文字颜色 */
+  margin: 5px 0;
+}
+.divider {
+  width: 100%;
+  height: 1px;
+  background-color: var(--divider-color); /* 使用莫兰迪浅灰色作为分隔线 */
+  margin: 20px 0;
+}
+.explanation {
+  font-size: 18px;
+  line-height: 1.6;
+  text-align: left;
+  flex-grow: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
+.quote {
+  position: relative;
+  padding-left: 20px;
+  border-left: 3px solid var(--accent-color); /* 使用莫兰迪淡棕色作为引用边框 */
+}
+.background-text {
+  position: absolute;
+  font-size: 150px;
+  color: rgba(182, 181, 167, 0.15); /* 使用莫兰迪灰褐色的透明版本作为背景文字 */
+  z-index: 0;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  font-weight: bold;
+}

packages/database/.gitignore

@@ -0,0 +1,3 @@
+data/*
+!data/.gitkeep
+

packages/database/README.md

@@ -0,0 +1,3 @@
+# Cherry Studio Database
+
+Cherry Studio 依赖的数据文件由这个数据库来生成，数据库文件请联系开发者获取

packages/database/package.json

@@ -0,0 +1,13 @@
+{
+  "name": "@cherry-studio/database",
+  "packageManager": "yarn@4.3.1",
+  "dependencies": {
+    "csv-parser": "^3.0.0",
+    "sqlite3": "^5.1.7"
+  },
+  "scripts": {
+    "agents": "node src/agents.js",
+    "email": "yarn csv && node src/email.js",
+    "csv": "node src/csv.js"
+  }
+}

packages/database/src/agents.js

@@ -0,0 +1,47 @@
+const sqlite3 = require('sqlite3').verbose()
+const fs = require('fs')
+
+// 连接到数据库
+const db = new sqlite3.Database('./data/CherryStudio.sqlite3', (err) => {
+  if (err) {
+    console.error('Error connecting to the database:', err.message)
+    return
+  }
+  console.log('Connected to the database.')
+})
+
+// 查询数据并转换为JSON
+db.all('SELECT * FROM agents', [], (err, rows) => {
+  if (err) {
+    console.error('Error querying the database:', err.message)
+    return
+  }
+
+  // 将 ID 类型转换为字符串
+  for (const row of rows) {
+    row.id = row.id.toString()
+    row.group = row.group.toString().split(',')
+    row.group = row.group.map((item) => item.trim().replace('\r\n', ''))
+  }
+
+  // 将查询结果转换为JSON字符串
+  const jsonData = JSON.stringify(rows, null, 2)
+
+  // 将JSON数据写入文件
+  fs.writeFile('../../src/renderer/src/config/agents.json', jsonData, (err) => {
+    if (err) {
+      console.error('Error writing to file:', err.message)
+      return
+    }
+    console.log('Data has been written to agents.json')
+  })
+
+  // 关闭数据库连接
+  db.close((err) => {
+    if (err) {
+      console.error('Error closing the database:', err.message)
+      return
+    }
+    console.log('Database connection closed.')
+  })
+})

packages/database/src/csv.js

@@ -0,0 +1,77 @@
+const fs = require('fs')
+const csv = require('csv-parser')
+const sqlite3 = require('sqlite3').verbose()
+
+// 连接到 SQLite 数据库
+const db = new sqlite3.Database('./data/CherryStudio.sqlite3', (err) => {
+  if (err) {
+    console.error('Error opening database', err)
+    return
+  }
+  console.log('Connected to the SQLite database.')
+})
+
+// 创建一个数组来存储 CSV 数据
+const results = []
+
+// 读取 CSV 文件
+fs.createReadStream('./data/data.csv')
+  .pipe(csv())
+  .on('data', (data) => results.push(data))
+  .on('end', () => {
+    // 准备 SQL 插入语句，使用 INSERT OR IGNORE
+    const stmt = db.prepare('INSERT OR IGNORE INTO emails (email, github, sent) VALUES (?, ?, ?)')
+
+    // 插入每一行数据
+    let inserted = 0
+    let skipped = 0
+    let emptyEmail = 0
+
+    db.serialize(() => {
+      // 开始一个事务以提高性能
+      db.run('BEGIN TRANSACTION')
+
+      results.forEach((row) => {
+        // 检查 email 是否为空
+        if (!row.email || row.email.trim() === '') {
+          emptyEmail++
+          return // 跳过这一行
+        }
+
+        stmt.run(row.email, row['user-href'], 0, function (err) {
+          if (err) {
+            console.error('Error inserting row', err)
+          } else {
+            if (this.changes === 1) {
+              inserted++
+            } else {
+              skipped++
+            }
+          }
+        })
+      })
+
+      // 提交事务
+      db.run('COMMIT', (err) => {
+        if (err) {
+          console.error('Error committing transaction', err)
+        } else {
+          console.log(
+            `Insertion complete. Inserted: ${inserted}, Skipped (duplicate): ${skipped}, Skipped (empty email): ${emptyEmail}`
+          )
+        }
+
+        // 完成插入
+        stmt.finalize()
+
+        // 关闭数据库连接
+        db.close((err) => {
+          if (err) {
+            console.error('Error closing database', err)
+          } else {
+            console.log('Database connection closed.')
+          }
+        })
+      })
+    })
+  })

packages/database/src/email.js

@@ -0,0 +1,36 @@
+const sqlite3 = require('sqlite3').verbose()
+
+// 连接到数据库
+const db = new sqlite3.Database('./data/CherryStudio.sqlite3', (err) => {
+  if (err) {
+    console.error('Error connecting to the database:', err.message)
+    return
+  }
+})
+
+// 查询数据并转换为JSON
+db.all('SELECT * FROM emails WHERE sent = 0', [], (err, rows) => {
+  if (err) {
+    console.error('Error querying the database:', err.message)
+    return
+  }
+
+  for (const row of rows) {
+    console.log(row.email)
+    // Update row set sent = 1
+    db.run('UPDATE emails SET sent = 1 WHERE id = ?', [row.id], (err) => {
+      if (err) {
+        console.error('Error updating the database:', err.message)
+        return
+      }
+    })
+  }
+
+  // 关闭数据库连接
+  db.close((err) => {
+    if (err) {
+      console.error('Error closing the database:', err.message)
+      return
+    }
+  })
+})

packages/shared/config/constant.ts

@@ -0,0 +1,115 @@
+export const imageExts = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.webp']
+export const videoExts = ['.mp4', '.avi', '.mov', '.wmv', '.flv', '.mkv']
+export const audioExts = ['.mp3', '.wav', '.ogg', '.flac', '.aac']
+export const documentExts = ['.pdf', '.docx', '.pptx', '.xlsx', '.odt', '.odp', '.ods']
+export const textExts = [
+  '.txt', // 普通文本文件
+  '.md', // Markdown 文件
+  '.mdx', // Markdown 文件
+  '.html', // HTML 文件
+  '.htm', // HTML 文件的另一种扩展名
+  '.xml', // XML 文件
+  '.json', // JSON 文件
+  '.yaml', // YAML 文件
+  '.yml', // YAML 文件的另一种扩展名
+  '.csv', // 逗号分隔值文件
+  '.tsv', // 制表符分隔值文件
+  '.ini', // 配置文件
+  '.log', // 日志文件
+  '.rtf', // 富文本格式文件
+  '.tex', // LaTeX 文件
+  '.srt', // 字幕文件
+  '.xhtml', // XHTML 文件
+  '.nfo', // 信息文件（主要用于场景发布）
+  '.conf', // 配置文件
+  '.config', // 配置文件
+  '.env', // 环境变量文件
+  '.rst', // reStructuredText 文件
+  '.php', // PHP 脚本文件，包含嵌入的 HTML
+  '.js', // JavaScript 文件（部分是文本，部分可能包含代码）
+  '.ts', // TypeScript 文件
+  '.jsp', // JavaServer Pages 文件
+  '.aspx', // ASP.NET 文件
+  '.bat', // Windows 批处理文件
+  '.sh', // Unix/Linux Shell 脚本文件
+  '.py', // Python 脚本文件
+  '.rb', // Ruby 脚本文件
+  '.pl', // Perl 脚本文件
+  '.sql', // SQL 脚本文件
+  '.css', // Cascading Style Sheets 文件
+  '.less', // Less CSS 预处理器文件
+  '.scss', // Sass CSS 预处理器文件
+  '.sass', // Sass 文件
+  '.styl', // Stylus CSS 预处理器文件
+  '.coffee', // CoffeeScript 文件
+  '.ino', // Arduino 代码文件
+  '.asm', // Assembly 语言文件
+  '.go', // Go 语言文件
+  '.scala', // Scala 语言文件
+  '.swift', // Swift 语言文件
+  '.kt', // Kotlin 语言文件
+  '.rs', // Rust 语言文件
+  '.lua', // Lua 语言文件
+  '.groovy', // Groovy 语言文件
+  '.dart', // Dart 语言文件
+  '.hs', // Haskell 语言文件
+  '.clj', // Clojure 语言文件
+  '.cljs', // ClojureScript 语言文件
+  '.elm', // Elm 语言文件
+  '.erl', // Erlang 语言文件
+  '.ex', // Elixir 语言文件
+  '.exs', // Elixir 脚本文件
+  '.pug', // Pug (formerly Jade) 模板文件
+  '.haml', // Haml 模板文件
+  '.slim', // Slim 模板文件
+  '.tpl', // 模板文件（通用）
+  '.ejs', // Embedded JavaScript 模板文件
+  '.hbs', // Handlebars 模板文件
+  '.mustache', // Mustache 模板文件
+  '.jade', // Jade 模板文件 (已重命名为 Pug)
+  '.twig', // Twig 模板文件
+  '.blade', // Blade 模板文件 (Laravel)
+  '.vue', // Vue.js 单文件组件
+  '.jsx', // React JSX 文件
+  '.tsx', // React TSX 文件
+  '.graphql', // GraphQL 查询语言文件
+  '.gql', // GraphQL 查询语言文件
+  '.proto', // Protocol Buffers 文件
+  '.thrift', // Thrift 文件
+  '.toml', // TOML 配置文件
+  '.edn', // Clojure 数据表示文件
+  '.cake', // CakePHP 配置文件
+  '.ctp', // CakePHP 视图文件
+  '.cfm', // ColdFusion 标记语言文件
+  '.cfc', // ColdFusion 组件文件
+  '.m', // Objective-C 源文件
+  '.mm', // Objective-C++ 源文件
+  '.gradle', // Gradle 构建文件
+  '.groovy', // Gradle 构建文件
+  '.kts', // Kotlin Script 文件
+  '.java' // Java 代码文件
+]
+
+export const ZOOM_SHORTCUTS = [
+  {
+    key: 'zoom_in',
+    shortcut: ['CommandOrControl', '='],
+    editable: false,
+    enabled: true,
+    system: true
+  },
+  {
+    key: 'zoom_out',
+    shortcut: ['CommandOrControl', '-'],
+    editable: false,
+    enabled: true,
+    system: true
+  },
+  {
+    key: 'zoom_reset',
+    shortcut: ['CommandOrControl', '0'],
+    editable: false,
+    enabled: true,
+    system: true
+  }
+]

resources/cherry-studio/license.html

@@ -0,0 +1,118 @@
+<!doctype html>
+<html lang="zh-CN">
+
+<head>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>CherryStudio 许可协议-ZH/EN</title>
+  <link href="https://cdn.jsdelivr.net/npm/tailwindcss@2.2.19/dist/tailwind.min.css" rel="stylesheet" />
+</head>
+
+<body class="bg-gray-100 p-8">
+  <div class="container mx-auto bg-white p-6 rounded shadow-lg">
+    <h1 class="text-3xl font-bold mb-6 text-center">Cherry Studio 许可协议</h1>
+    <div class="mb-8">
+      <h2 class="text-2xl font-semibold mb-4">许可协议</h2>
+      <p class="mb-4">
+        本软件采用 <strong>Apache License 2.0</strong> 许可。除 Apache License 2.0 规定的条款外，您在使用 Cherry
+        Studio 时还应遵守以下附加条款：
+      </p>
+      <h3 class="text-xl font-semibold mb-2">一. 商用许可</h3>
+      <ol class="list-decimal list-inside mb-4">
+        <li><strong>免费商用</strong>：用户在不修改代码的情况下，可以免费用于商业目的。</li>
+        <li>
+          <strong>商业授权</strong>：如果您满足以下任意条件之一，需取得商业授权：
+          <ol class="list-decimal list-inside ml-4">
+            <li>对本软件进行二次修改、开发（包括但不限于修改应用名称、logo、代码以及功能）。</li>
+            <li>为企业客户提供多租户服务，且该服务支持 10 人或以上的使用。</li>
+            <li>预装或集成到硬件设备或产品中进行捆绑销售。</li>
+            <li>政府或教育机构的大规模采购项目，特别是涉及安全、数据隐私等敏感需求时。</li>
+          </ol>
+        </li>
+      </ol>
+      <h3 class="text-xl font-semibold mb-2">二. 贡献者协议</h3>
+      <ol class="list-decimal list-inside mb-4">
+        <li><strong>许可调整</strong>：生产者有权根据需要对开源协议进行调整，使其更加严格或宽松。</li>
+        <li><strong>商业用途</strong>：您贡献的代码可能会被用于商业用途，包括但不限于云业务运营。</li>
+      </ol>
+      <h3 class="text-xl font-semibold mb-2">三. 其他条款</h3>
+      <ol class="list-decimal list-inside mb-4">
+        <li>本协议条款的解释权归 Cherry Studio 开发者所有。</li>
+        <li>本协议可能根据实际情况进行更新，更新时将通过本软件通知用户。</li>
+      </ol>
+      <p class="mb-4">如有任何问题或需申请商业授权，请联系 Cherry Studio 开发团队。</p>
+      <p>
+        除上述特定条件外，其他所有权利和限制均遵循 Apache License 2.0。有关 Apache License 2.0 的详细信息，请访问
+        <a href="http://www.apache.org/licenses/LICENSE-2.0"
+          class="text-blue-500 underline">http://www.apache.org/licenses/LICENSE-2.0</a>
+      </p>
+    </div>
+    <h1 class="text-3xl font-bold mb-6 text-center">Cherry Studio License</h1>
+    <div class="mb-8">
+      <h2 class="text-2xl font-semibold mb-4">License Agreement</h2>
+      <p class="mb-4">
+        This software is licensed under the <strong>Apache License 2.0</strong>. In addition to the terms of the
+        Apache License 2.0, the following additional terms apply to the use of Cherry Studio:
+      </p>
+      <h3 class="text-xl font-semibold mb-2">I. Commercial Use License</h3>
+      <ol class="list-decimal list-inside mb-4">
+        <li>
+          <strong>Free Commercial Use</strong>: Users can use the software for commercial purposes without
+          modifying
+          the code.
+        </li>
+        <li>
+          <strong>Commercial License Required</strong>: A commercial license is required if any of the
+          following
+          conditions are met:
+          <ol class="list-decimal list-inside ml-4">
+            <li>
+              You modify, develop, or alter the software, including but not limited to changes to the
+              application
+              name, logo, code, or functionality.
+            </li>
+            <li>You provide multi-tenant services to enterprise customers with 10 or more users.</li>
+            <li>
+              You pre-install or integrate the software into hardware devices or products and bundle it
+              for sale.
+            </li>
+            <li>
+              You are engaging in large-scale procurement for government or educational institutions,
+              especially
+              involving security, data privacy, or other sensitive requirements.
+            </li>
+          </ol>
+        </li>
+      </ol>
+      <h3 class="text-xl font-semibold mb-2">II. Contributor Agreement</h3>
+      <ol class="list-decimal list-inside mb-4">
+        <li>
+          <strong>License Adjustment</strong>: The producer reserves the right to adjust the open-source
+          license as
+          needed, making it stricter or more lenient.
+        </li>
+        <li>
+          <strong>Commercial Use</strong>: Any code you contribute may be used for commercial purposes,
+          including but
+          not limited to cloud business operations.
+        </li>
+      </ol>
+      <h3 class="text-xl font-semibold mb-2">III. Other Terms</h3>
+      <ol class="list-decimal list-inside mb-4">
+        <li>The interpretation of these terms is subject to the discretion of Cherry Studio developers.</li>
+        <li>These terms may be updated, and users will be notified through the software when changes occur.</li>
+      </ol>
+      <p class="mb-4">
+        For any questions or to request a commercial license, please contact the Cherry Studio development team.
+      </p>
+      <p>
+        Apart from the specific conditions mentioned above, all other rights and restrictions follow the Apache
+        License 2.0. Detailed information about the Apache License 2.0 can be found at
+        <a href="http://www.apache.org/licenses/LICENSE-2.0"
+          class="text-blue-500 underline">http://www.apache.org/licenses/LICENSE-2.0</a>
+      </p>
+    </div>
+  </div>
+</body>
+
+</html>

scripts/cloudflare-worker.js

@@ -0,0 +1,515 @@
+// 配置信息
+const config = {
+  R2_CUSTOM_DOMAIN: 'cherrystudio.ocool.online',
+  R2_BUCKET_NAME: 'cherrystudio',
+  // 缓存键名
+  CACHE_KEY: 'cherry-studio-latest-release',
+  VERSION_DB: 'versions.json',
+  LOG_FILE: 'logs.json',
+  MAX_LOGS: 1000  // 最多保存多少条日志
+};
+
+// Worker 入口函数
+const worker = {
+  // 定时器触发配置
+  scheduled: {
+      cron: '*/1 * * * *'  // 每分钟执行一次
+  },
+
+  // 定时器执行函数 - 只负责检查和更新
+  async scheduled(event, env, ctx) {
+      try {
+          await initDataFiles(env);
+          console.log('开始定时检查新版本...');
+          // 使用新的 checkNewRelease 函数
+          await checkNewRelease(env);
+      } catch (error) {
+          console.error('定时任务执行失败:', error);
+      }
+  },
+
+  // HTTP 请求处理函数 - 只负责返回数据
+  async fetch(request, env, ctx) {
+      if (!env || !env.R2_BUCKET) {
+          return new Response(JSON.stringify({
+              error: 'R2 存储桶未正确配置'
+          }), {
+              status: 500,
+              headers: { 'Content-Type': 'application/json' }
+          });
+      }
+
+      const url = new URL(request.url);
+      const filename = url.pathname.slice(1);
+
+      try {
+          // 处理文件下载请求
+          if (filename) {
+              return await handleDownload(env, filename);
+          }
+
+          // 只返回缓存的版本信息
+          return await getCachedRelease(env);
+      } catch (error) {
+          return new Response(JSON.stringify({
+              error: error.message,
+              stack: error.stack
+          }), {
+              status: 500,
+              headers: { 'Content-Type': 'application/json' }
+          });
+      }
+  }
+};
+
+export default worker;
+
+/**
+* 添加日志记录函数
+*/
+async function addLog(env, type, event, details = null) {
+  try {
+      const logFile = await env.R2_BUCKET.get(config.LOG_FILE);
+      let logs = { logs: [] };
+
+      if (logFile) {
+          logs = JSON.parse(await logFile.text());
+      }
+
+      logs.logs.unshift({
+          timestamp: new Date().toISOString(),
+          type,
+          event,
+          details
+      });
+
+      // 保持日志数量在限制内
+      if (logs.logs.length > config.MAX_LOGS) {
+          logs.logs = logs.logs.slice(0, config.MAX_LOGS);
+      }
+
+      await env.R2_BUCKET.put(config.LOG_FILE, JSON.stringify(logs, null, 2));
+  } catch (error) {
+      console.error('写入日志失败:', error);
+  }
+}
+
+/**
+* 获取最新版本信息
+*/
+async function getLatestRelease(env) {
+  try {
+      const cached = await env.R2_BUCKET.get(config.CACHE_KEY);
+      if (!cached) {
+          // 如果缓存不存在，先检查版本数据库
+          const versionDB = await env.R2_BUCKET.get(config.VERSION_DB);
+          if (versionDB) {
+              const versions = JSON.parse(await versionDB.text());
+              if (versions.latestVersion) {
+                  // 从版本数据库重建缓存
+                  const latestVersion = versions.versions[versions.latestVersion];
+                  const cacheData = {
+                      version: latestVersion.version,
+                      publishedAt: latestVersion.publishedAt,
+                      changelog: latestVersion.changelog,
+                      downloads: latestVersion.files
+                          .filter(file => file.uploaded)
+                          .map(file => ({
+                              name: file.name,
+                              url: `https://${config.R2_CUSTOM_DOMAIN}/${file.name}`,
+                              size: formatFileSize(file.size)
+                          }))
+                  };
+                  // 更新缓存
+                  await env.R2_BUCKET.put(config.CACHE_KEY, JSON.stringify(cacheData));
+                  return new Response(JSON.stringify(cacheData), {
+                      headers: {
+                          'Content-Type': 'application/json',
+                          'Access-Control-Allow-Origin': '*'
+                      }
+                  });
+              }
+          }
+          // 如果版本数据库也没有数据，才执行检查更新
+          const data = await checkNewRelease(env);
+          return new Response(JSON.stringify(data), {
+              headers: {
+                  'Content-Type': 'application/json',
+                  'Access-Control-Allow-Origin': '*'
+              }
+          });
+      }
+
+      const data = await cached.text();
+      return new Response(data, {
+          headers: {
+              'Content-Type': 'application/json',
+              'Access-Control-Allow-Origin': '*'
+          }
+      });
+  } catch (error) {
+      await addLog(env, 'ERROR', '获取版本信息失败', error.message);
+      return new Response(JSON.stringify({
+          error: '获取版本信息失败: ' + error.message,
+          detail: '请稍<E8AFB7><E7A88D><EFBFBD>再试'
+      }), {
+          status: 500,
+          headers: {
+              'Content-Type': 'application/json',
+              'Access-Control-Allow-Origin': '*'
+          }
+      });
+  }
+}
+
+// 修改下载处理函数，直接接收 env
+async function handleDownload(env, filename) {
+  try {
+      const object = await env.R2_BUCKET.get(filename);
+
+      if (!object) {
+          return new Response('文件未找到', { status: 404 });
+      }
+
+      // 设置响应头
+      const headers = new Headers();
+      object.writeHttpMetadata(headers);
+      headers.set('etag', object.httpEtag);
+      headers.set('Content-Disposition', `attachment; filename="${filename}"`);
+
+      return new Response(object.body, {
+          headers
+      });
+  } catch (error) {
+      console.error('下载文件时发生错误:', error);
+      return new Response('获取文件失败', { status: 500 });
+  }
+}
+
+/**
+* 根据文件扩展名获取对应的 Content-Type
+*/
+function getContentType(filename) {
+  const ext = filename.split('.').pop().toLowerCase();
+  const types = {
+      'exe': 'application/x-msdownload',      // Windows 可执行文件
+      'dmg': 'application/x-apple-diskimage', // macOS 安装包
+      'zip': 'application/zip',               // 压缩包
+      'AppImage': 'application/x-executable', // Linux 可执行文件
+      'blockmap': 'application/octet-stream'  // 更新文件
+  };
+  return types[ext] || 'application/octet-stream';
+}
+
+/**
+* 格式化文件大小
+* 将字节转换为人类可读的格式（B, KB, MB, GB）
+*/
+function formatFileSize(bytes) {
+  const units = ['B', 'KB', 'MB', 'GB'];
+  let size = bytes;
+  let unitIndex = 0;
+
+  while (size >= 1024 && unitIndex < units.length - 1) {
+      size /= 1024;
+      unitIndex++;
+  }
+
+  return `${size.toFixed(2)} ${units[unitIndex]}`;
+}
+
+/**
+* 版本号比较函数
+* 用于对版本号进行排序
+*/
+function compareVersions(a, b) {
+  const partsA = a.replace('v', '').split('.');
+  const partsB = b.replace('v', '').split('.');
+
+  for (let i = 0; i < Math.max(partsA.length, partsB.length); i++) {
+      const numA = parseInt(partsA[i] || 0);
+      const numB = parseInt(partsB[i] || 0);
+
+      if (numA !== numB) {
+          return numA - numB;
+      }
+  }
+
+  return 0;
+}
+
+/**
+* 初始化数据文件
+*/
+async function initDataFiles(env) {
+  try {
+      // 检查并初始化版本数据库
+      const versionDB = await env.R2_BUCKET.get(config.VERSION_DB);
+      if (!versionDB) {
+          const initialVersions = {
+              versions: {},
+              latestVersion: null,
+              lastChecked: new Date().toISOString()
+          };
+          await env.R2_BUCKET.put(config.VERSION_DB, JSON.stringify(initialVersions, null, 2));
+          await addLog(env, 'INFO', 'versions.json 初始化成功');
+      }
+
+      // 检查并初始化日志文件
+      const logFile = await env.R2_BUCKET.get(config.LOG_FILE);
+      if (!logFile) {
+          const initialLogs = {
+              logs: [{
+                  timestamp: new Date().toISOString(),
+                  type: 'INFO',
+                  event: '系统初始化'
+              }]
+          };
+          await env.R2_BUCKET.put(config.LOG_FILE, JSON.stringify(initialLogs, null, 2));
+          console.log('logs.json 初始化成功');
+      }
+  } catch (error) {
+      console.error('初始化数据文件失败:', error);
+  }
+}
+
+// 新增：只获取缓存的版本信息
+async function getCachedRelease(env) {
+  try {
+      const cached = await env.R2_BUCKET.get(config.CACHE_KEY);
+      if (!cached) {
+          // 如果缓存不存在，从版本数据库获取
+          const versionDB = await env.R2_BUCKET.get(config.VERSION_DB);
+          if (versionDB) {
+              const versions = JSON.parse(await versionDB.text());
+              if (versions.latestVersion) {
+                  const latestVersion = versions.versions[versions.latestVersion];
+                  const cacheData = {
+                      version: latestVersion.version,
+                      publishedAt: latestVersion.publishedAt,
+                      changelog: latestVersion.changelog,
+                      downloads: latestVersion.files
+                          .filter(file => file.uploaded)
+                          .map(file => ({
+                              name: file.name,
+                              url: `https://${config.R2_CUSTOM_DOMAIN}/${file.name}`,
+                              size: formatFileSize(file.size)
+                          }))
+                  };
+                  // 重建缓存
+                  await env.R2_BUCKET.put(config.CACHE_KEY, JSON.stringify(cacheData));
+                  return new Response(JSON.stringify(cacheData), {
+                      headers: {
+                          'Content-Type': 'application/json',
+                          'Access-Control-Allow-Origin': '*'
+                      }
+                  });
+              }
+          }
+          // 如果没有任何数据，返回错误
+          return new Response(JSON.stringify({
+              error: '没有可用的版本信息'
+          }), {
+              status: 404,
+              headers: {
+                  'Content-Type': 'application/json',
+                  'Access-Control-Allow-Origin': '*'
+              }
+          });
+      }
+
+      // 返回缓存数据
+      return new Response(await cached.text(), {
+          headers: {
+              'Content-Type': 'application/json',
+              'Access-Control-Allow-Origin': '*'
+          }
+      });
+  } catch (error) {
+      await addLog(env, 'ERROR', '获取缓存版本信息失败', error.message);
+      throw error;
+  }
+}
+
+// 新增：只检查新版本并更新
+async function checkNewRelease(env) {
+  try {
+      // 获取 GitHub 最新版本
+      const githubResponse = await fetch('https://api.github.com/repos/kangfenmao/cherry-studio/releases/latest', {
+          headers: { 'User-Agent': 'CloudflareWorker' },
+      });
+
+      if (!githubResponse.ok) {
+          throw new Error('GitHub API 请求失败');
+      }
+
+      const releaseData = await githubResponse.json();
+      const version = releaseData.tag_name;
+
+      // 获取版本数据库
+      const versionDB = await env.R2_BUCKET.get(config.VERSION_DB);
+      let versions = { versions: {}, latestVersion: null, lastChecked: new Date().toISOString() };
+
+      if (versionDB) {
+          versions = JSON.parse(await versionDB.text());
+      }
+
+      // 移除版本检查，改为记录是否有文件更新的标志
+      let hasUpdates = false;
+      if (versions.latestVersion !== version) {
+          await addLog(env, 'INFO', `发现新版本: ${version}`);
+          hasUpdates = true;
+      } else {
+          await addLog(env, 'INFO', `版本 ${version} 文件完整性检查开始`);
+      }
+
+      // 准备新版本记录
+      const versionRecord = {
+          version,
+          publishedAt: releaseData.published_at,
+          uploadedAt: null,
+          files: releaseData.assets.map(asset => ({
+              name: asset.name,
+              size: asset.size,
+              uploaded: false
+          })),
+          changelog: releaseData.body
+      };
+
+      // 检查并上传文件
+      for (const asset of releaseData.assets) {
+          try {
+              const existingFile = await env.R2_BUCKET.get(asset.name);
+              // 检查文件是否存在且大小是否一致
+              if (!existingFile || existingFile.size !== asset.size) {
+                  hasUpdates = true;
+                  const response = await fetch(asset.browser_download_url);
+                  if (!response.ok) {
+                      throw new Error(`下载失败: HTTP ${response.status}`);
+                  }
+
+                  const file = await response.arrayBuffer();
+                  await env.R2_BUCKET.put(asset.name, file, {
+                      httpMetadata: { contentType: getContentType(asset.name) }
+                  });
+
+                  // 更新文件状态
+                  const fileIndex = versionRecord.files.findIndex(f => f.name === asset.name);
+                  if (fileIndex !== -1) {
+                      versionRecord.files[fileIndex].uploaded = true;
+                  }
+
+                  await addLog(env, 'INFO', `文件${existingFile ? '更新' : '上传'}成功: ${asset.name}`);
+              } else {
+                  // 文件存在且大小相同，标记为已上传
+                  const fileIndex = versionRecord.files.findIndex(f => f.name === asset.name);
+                  if (fileIndex !== -1) {
+                      versionRecord.files[fileIndex].uploaded = true;
+                  }
+                  await addLog(env, 'INFO', `文件完整性验证通过: ${asset.name}`);
+              }
+          } catch (error) {
+              await addLog(env, 'ERROR', `文件处理失败: ${asset.name}`, error.message);
+          }
+      }
+
+      // 只有在有更新或是新版本时才更新数据库和缓存
+      if (hasUpdates) {
+          // 更新版本记录
+          versionRecord.uploadedAt = new Date().toISOString();
+          versions.versions[version] = versionRecord;
+          versions.latestVersion = version;
+
+          // 保存版本数据库
+          await env.R2_BUCKET.put(config.VERSION_DB, JSON.stringify(versions, null, 2));
+
+          // 更新缓存
+          const cacheData = {
+              version,
+              publishedAt: releaseData.published_at,
+              changelog: releaseData.body,
+              downloads: versionRecord.files
+                  .filter(file => file.uploaded)
+                  .map(file => ({
+                      name: file.name,
+                      url: `https://${config.R2_CUSTOM_DOMAIN}/${file.name}`,
+                      size: formatFileSize(file.size)
+                  }))
+          };
+
+          await env.R2_BUCKET.put(config.CACHE_KEY, JSON.stringify(cacheData));
+          await addLog(env, 'INFO', hasUpdates ? '更新完成' : '文件完整性检查完成');
+
+          // 清理旧版本
+          const versionList = Object.keys(versions.versions).sort((a, b) => compareVersions(b, a));
+          if (versionList.length > 2) {
+              // 获取需要保留的两个最新版本
+              const keepVersions = versionList.slice(0, 2);
+              // 获取所有需要删除的版本
+              const oldVersions = versionList.slice(2);
+
+              // 先获取 R2 桶中的所有文件列表
+              const allFiles = await listAllFiles(env);
+
+              // 获取需要保留的文件名列表
+              const keepFiles = new Set();
+              for (const keepVersion of keepVersions) {
+                  const versionFiles = versions.versions[keepVersion].files;
+                  versionFiles.forEach(file => keepFiles.add(file.name));
+              }
+
+              // 删除所有旧版本文件
+              for (const oldVersion of oldVersions) {
+                  const oldFiles = versions.versions[oldVersion].files;
+                  for (const file of oldFiles) {
+                      try {
+                          if (file.uploaded) {
+                              await env.R2_BUCKET.delete(file.name);
+                              await addLog(env, 'INFO', `删除旧文件: ${file.name}`);
+                          }
+                      } catch (error) {
+                          await addLog(env, 'ERROR', `删除旧文件失败: ${file.name}`, error.message);
+                      }
+                  }
+                  delete versions.versions[oldVersion];
+              }
+
+              // 清理可能遗留的旧文件
+              for (const file of allFiles) {
+                  if (!keepFiles.has(file.name)) {
+                      try {
+                          await env.R2_BUCKET.delete(file.name);
+                          await addLog(env, 'INFO', `删除遗留文件: ${file.name}`);
+                      } catch (error) {
+                          await addLog(env, 'ERROR', `删除遗留文件失败: ${file.name}`, error.message);
+                      }
+                  }
+              }
+
+              // 保存更新后的版本数据库
+              await env.R2_BUCKET.put(config.VERSION_DB, JSON.stringify(versions, null, 2));
+          }
+      } else {
+          await addLog(env, 'INFO', '所有文件完整性检查通过，无需更新');
+      }
+
+      return hasUpdates ? cacheData : null;
+  } catch (error) {
+      await addLog(env, 'ERROR', '检查新版本失败', error.message);
+      throw error;
+  }
+}
+
+// 新增：获取 R2 桶中的所有文件列表
+async function listAllFiles(env) {
+  const files = [];
+  let cursor;
+
+  do {
+      const listed = await env.R2_BUCKET.list({ cursor, include: ['customMetadata'] });
+      files.push(...listed.objects);
+      cursor = listed.cursor;
+  } while (cursor);
+
+  return files;
+} 

src/main/config.ts

@@ -1,25 +1,15 @@
-import fs from 'node:fs'
-
 import { app } from 'electron'
-import Store from 'electron-store'
-import path from 'path'
+
+import { getDataPath } from './utils'
 
 const isDev = process.env.NODE_ENV === 'development'
 
-isDev && app.setPath('userData', app.getPath('userData') + 'Dev')
-
-const getDataPath = () => {
-  const dataPath = path.join(app.getPath('userData'), 'Data')
-  if (!fs.existsSync(dataPath)) {
-    fs.mkdirSync(dataPath, { recursive: true })
-  }
-  return dataPath
+if (isDev) {
+  app.setPath('userData', app.getPath('userData') + 'Dev')
 }
 
 export const DATA_PATH = getDataPath()
 
-export const appConfig = new Store()
-
 export const titleBarOverlayDark = {
   height: 40,
   color: '#00000000',

src/main/constant.ts

@@ -0,0 +1,3 @@
+export const isMac = process.platform === 'darwin'
+export const isWin = process.platform === 'win32'
+export const isLinux = process.platform === 'linux'

src/main/electron.d.ts

@@ -0,0 +1,9 @@
+declare global {
+  namespace Electron {
+    interface App {
+      isQuitting: boolean
+    }
+  }
+}
+
+export {}

src/main/index.ts

@@ -3,9 +3,16 @@ import { app, BrowserWindow } from 'electron'
 import installExtension, { REDUX_DEVTOOLS } from 'electron-devtools-installer'
 
 import { registerIpc } from './ipc'
+import { registerShortcuts } from './services/ShortcutService'
+import { TrayService } from './services/TrayService'
+import { windowService } from './services/WindowService'
 import { updateUserDataPath } from './utils/upgrade'
-import { createMainWindow } from './window'
 
+// Check for single instance lock
+if (!app.requestSingleInstanceLock()) {
+  app.quit()
+  process.exit(0)
+} else {
   // This method will be called when Electron has finished
   // initialization and is ready to create browser windows.
   // Some APIs can only be used after this event occurs.
@@ -15,20 +22,20 @@ app.whenReady().then(async () => {
     // Set app user model id for windows
     electronApp.setAppUserModelId(import.meta.env.VITE_MAIN_BUNDLE_ID || 'com.kangfenmao.CherryStudio')
 
-  // Default open or close DevTools by F12 in development
-  // and ignore CommandOrControl + R in production.
-  // see https://github.com/alex8088/electron-toolkit/tree/master/packages/utils
-  app.on('browser-window-created', (_, window) => {
-    optimizer.watchWindowShortcuts(window)
-  })
+    const mainWindow = windowService.createMainWindow()
+    new TrayService()
 
     app.on('activate', function () {
       // On macOS it's common to re-create a window in the app when the
       // dock icon is clicked and there are no other windows open.
-    if (BrowserWindow.getAllWindows().length === 0) createMainWindow()
+      if (BrowserWindow.getAllWindows().length === 0) {
+        windowService.createMainWindow()
+      } else {
+        windowService.showMainWindow()
+      }
     })
 
-  const mainWindow = createMainWindow()
+    registerShortcuts(mainWindow)
 
     registerIpc(mainWindow, app)
 
@@ -39,14 +46,24 @@ app.whenReady().then(async () => {
     }
   })
 
-// Quit when all windows are closed, except on macOS. There, it's common
-// for applications and their menu bar to stay active until the user quits
-// explicitly with Cmd + Q.
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
+  // Listen for second instance
+  app.on('second-instance', () => {
+    const mainWindow = BrowserWindow.getAllWindows()[0]
+    if (mainWindow) {
+      mainWindow.isMinimized() && mainWindow.restore()
+      mainWindow.show()
+      mainWindow.focus()
     }
   })
 
+  app.on('browser-window-created', (_, window) => {
+    optimizer.watchWindowShortcuts(window)
+  })
+
+  app.on('before-quit', () => {
+    app.isQuitting = true
+  })
+
   // In this file you can include the rest of your app"s specific main process
   // code. You can also put them in separate files and require them here.
+}

src/main/ipc.ts

@@ -1,39 +1,104 @@
-import { BrowserWindow, ipcMain, session, shell } from 'electron'
+import fs from 'node:fs'
+import path from 'node:path'
 
-import { appConfig, titleBarOverlayDark, titleBarOverlayLight } from './config'
+import { Shortcut, ThemeMode } from '@types'
+import { BrowserWindow, ipcMain, ProxyConfig, session, shell } from 'electron'
+import log from 'electron-log'
+
+import { titleBarOverlayDark, titleBarOverlayLight } from './config'
 import AppUpdater from './services/AppUpdater'
 import BackupManager from './services/BackupManager'
-import FileManager from './services/FileManager'
-import { createMinappWindow } from './window'
+import { configManager } from './services/ConfigManager'
+import { ExportService } from './services/ExportService'
+import FileStorage from './services/FileStorage'
+import { registerShortcuts, unregisterAllShortcuts } from './services/ShortcutService'
+import { windowService } from './services/WindowService'
+import { compress, decompress } from './utils/zip'
 
-const fileManager = new FileManager()
+const fileManager = new FileStorage()
 const backupManager = new BackupManager()
+const exportService = new ExportService(fileManager)
 
 export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   const { autoUpdater } = new AppUpdater(mainWindow)
 
-  // IPC
-  ipcMain.handle('get-app-info', () => ({
+  ipcMain.handle('app:info', () => ({
     version: app.getVersion(),
     isPackaged: app.isPackaged,
-    appPath: app.getAppPath()
+    appPath: app.getAppPath(),
+    filesPath: path.join(app.getPath('userData'), 'Data', 'Files'),
+    appDataPath: app.getPath('userData'),
+    logsPath: log.transports.file.getFile().path
   }))
 
-  ipcMain.handle('open-website', (_, url: string) => {
-    shell.openExternal(url)
+  ipcMain.handle('app:proxy', async (_, proxy: string) => {
+    const sessions = [session.defaultSession, session.fromPartition('persist:webview')]
+    const proxyConfig: ProxyConfig = proxy === 'system' ? { mode: 'system' } : proxy ? { proxyRules: proxy } : {}
+    await Promise.all(sessions.map((session) => session.setProxy(proxyConfig)))
   })
 
-  ipcMain.handle('set-proxy', (_, proxy: string) => {
-    session.defaultSession.setProxy(proxy ? { proxyRules: proxy } : {})
+  ipcMain.handle('app:reload', () => mainWindow.reload())
+  ipcMain.handle('open:website', (_, url: string) => shell.openExternal(url))
+
+  // language
+  ipcMain.handle('app:set-language', (_, language) => {
+    configManager.setLanguage(language)
   })
 
-  ipcMain.handle('reload', () => mainWindow.reload())
+  // tray
+  ipcMain.handle('app:set-tray', (_, isActive: boolean) => {
+    configManager.setTray(isActive)
+  })
 
+  // theme
+  ipcMain.handle('app:set-theme', (_, theme: ThemeMode) => {
+    configManager.setTheme(theme)
+    mainWindow?.setTitleBarOverlay &&
+      mainWindow.setTitleBarOverlay(theme === 'dark' ? titleBarOverlayDark : titleBarOverlayLight)
+  })
+
+  // clear cache
+  ipcMain.handle('app:clear-cache', async () => {
+    const sessions = [session.defaultSession, session.fromPartition('persist:webview')]
+
+    try {
+      await Promise.all(
+        sessions.map(async (session) => {
+          await session.clearCache()
+          await session.clearStorageData({
+            storages: ['cookies', 'filesystem', 'shadercache', 'websql', 'serviceworkers', 'cachestorage']
+          })
+        })
+      )
+      await fileManager.clearTemp()
+      await fs.writeFileSync(log.transports.file.getFile().path, '')
+      return { success: true }
+    } catch (error: any) {
+      log.error('Failed to clear cache:', error)
+      return { success: false, error: error.message }
+    }
+  })
+
+  // check for update
+  ipcMain.handle('app:check-for-update', async () => {
+    const update = await autoUpdater.checkForUpdates()
+    return {
+      currentVersion: autoUpdater.currentVersion,
+      updateInfo: update?.updateInfo
+    }
+  })
+
+  // zip
+  ipcMain.handle('zip:compress', (_, text: string) => compress(text))
+  ipcMain.handle('zip:decompress', (_, text: Buffer) => decompress(text))
+
+  // backup
   ipcMain.handle('backup:backup', backupManager.backup)
   ipcMain.handle('backup:restore', backupManager.restore)
   ipcMain.handle('backup:backupToWebdav', backupManager.backupToWebdav)
   ipcMain.handle('backup:restoreFromWebdav', backupManager.restoreFromWebdav)
 
+  // file
   ipcMain.handle('file:open', fileManager.open)
   ipcMain.handle('file:save', fileManager.save)
   ipcMain.handle('file:select', fileManager.selectFile)
@@ -47,9 +112,12 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle('file:write', fileManager.writeFile)
   ipcMain.handle('file:saveImage', fileManager.saveImage)
   ipcMain.handle('file:base64Image', fileManager.base64Image)
+  ipcMain.handle('file:download', fileManager.downloadFile)
+  ipcMain.handle('file:copy', fileManager.copyFile)
 
+  // minapp
   ipcMain.handle('minapp', (_, args) => {
-    createMinappWindow({
+    windowService.createMinappWindow({
       url: args.url,
       parent: mainWindow,
       windowOptions: {
@@ -59,17 +127,21 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     })
   })
 
-  ipcMain.handle('set-theme', (_, theme: 'light' | 'dark') => {
-    appConfig.set('theme', theme)
-    mainWindow?.setTitleBarOverlay &&
-      mainWindow.setTitleBarOverlay(theme === 'dark' ? titleBarOverlayDark : titleBarOverlayLight)
+  // export
+  ipcMain.handle('export:word', exportService.exportToWord)
+
+  // open path
+  ipcMain.handle('open:path', async (_, path: string) => {
+    await shell.openPath(path)
   })
 
-  // 触发检查更新(此方法用于被渲染线程调用，例如页面点击检查更新按钮来调用此方法)
-  ipcMain.handle('check-for-update', async () => {
-    return {
-      currentVersion: autoUpdater.currentVersion,
-      update: await autoUpdater.checkForUpdates()
+  // shortcuts
+  ipcMain.handle('shortcuts:update', (_, shortcuts: Shortcut[]) => {
+    configManager.setShortcuts(shortcuts)
+    // Refresh shortcuts registration
+    if (mainWindow) {
+      unregisterAllShortcuts()
+      registerShortcuts(mainWindow)
     }
   })
 }

src/main/services/AppUpdater.ts

@@ -1,15 +1,18 @@
-import { BrowserWindow, dialog } from 'electron'
+import { app, BrowserWindow, dialog } from 'electron'
 import logger from 'electron-log'
 import { AppUpdater as _AppUpdater, autoUpdater, UpdateInfo } from 'electron-updater'
 
+import icon from '../../../build/icon.png?asset'
+
 export default class AppUpdater {
   autoUpdater: _AppUpdater = autoUpdater
 
   constructor(mainWindow: BrowserWindow) {
-    logger.transports.file.level = 'debug'
+    logger.transports.file.level = 'info'
+
     autoUpdater.logger = logger
-    autoUpdater.forceDevUpdateConfig = true
-    autoUpdater.autoDownload = false
+    autoUpdater.forceDevUpdateConfig = !app.isPackaged
+    autoUpdater.autoDownload = true
 
     // 检测下载错误
     autoUpdater.on('error', (error) => {
@@ -18,38 +21,8 @@ export default class AppUpdater {
     })
 
     autoUpdater.on('update-available', (releaseInfo: UpdateInfo) => {
-      autoUpdater.logger?.info('检测到新版本，确认是否下载')
+      logger.info('检测到新版本', releaseInfo)
       mainWindow.webContents.send('update-available', releaseInfo)
-      const releaseNotes = releaseInfo.releaseNotes
-      let releaseContent = ''
-      if (releaseNotes) {
-        if (typeof releaseNotes === 'string') {
-          releaseContent = <string>releaseNotes
-        } else if (releaseNotes instanceof Array) {
-          releaseNotes.forEach((releaseNote) => {
-            releaseContent += `${releaseNote}\n`
-          })
-        }
-      } else {
-        releaseContent = '暂无更新说明'
-      }
-
-      // 弹框确认是否下载更新（releaseContent是更新日志）
-      dialog
-        .showMessageBox({
-          type: 'info',
-          title: '应用有新的更新',
-          detail: releaseContent,
-          message: '发现新版本，是否现在更新？',
-          buttons: ['下次再说', '更新']
-        })
-        .then(({ response }) => {
-          if (response === 1) {
-            logger.info('用户选择更新，准备下载更新')
-            mainWindow.webContents.send('download-update')
-            autoUpdater.downloadUpdate()
-          }
-        })
     })
 
     // 检测到不需要更新时
@@ -59,23 +32,53 @@ export default class AppUpdater {
 
     // 更新下载进度
     autoUpdater.on('download-progress', (progress) => {
-      logger.info('下载进度', progress)
       mainWindow.webContents.send('download-progress', progress)
     })
 
     // 当需要更新的内容下载完成后
-    autoUpdater.on('update-downloaded', () => {
-      logger.info('下载完成，准备更新')
+    autoUpdater.on('update-downloaded', (releaseInfo: UpdateInfo) => {
+      mainWindow.webContents.send('update-downloaded')
+
+      logger.info('下载完成，询问用户是否更新', releaseInfo)
+
       dialog
         .showMessageBox({
+          type: 'info',
           title: '安装更新',
-          message: '更新下载完毕，应用将重启并进行安装'
+          icon,
+          message: `新版本 ${releaseInfo.version} 已准备就绪`,
+          detail: this.formatReleaseNotes(releaseInfo.releaseNotes),
+          buttons: ['稍后安装', '立即安装'],
+          defaultId: 1,
+          cancelId: 0
         })
-        .then(() => {
+        .then(({ response }) => {
+          if (response === 1) {
+            app.isQuitting = true
             setImmediate(() => autoUpdater.quitAndInstall())
+          } else {
+            mainWindow.webContents.send('update-downloaded-cancelled')
+          }
         })
     })
 
     this.autoUpdater = autoUpdater
   }
+
+  private formatReleaseNotes(releaseNotes: string | ReleaseNoteInfo[] | null | undefined): string {
+    if (!releaseNotes) {
+      return '暂无更新说明'
+    }
+
+    if (typeof releaseNotes === 'string') {
+      return releaseNotes
+    }
+
+    return releaseNotes.map((note) => note.note).join('\n')
+  }
+}
+
+interface ReleaseNoteInfo {
+  readonly version: string
+  readonly note: string | null
 }

src/main/services/BackupManager.ts

@@ -1,10 +1,9 @@
 import { WebDavConfig } from '@types'
-import archiver from 'archiver'
+import AdmZip from 'adm-zip'
 import { app } from 'electron'
 import Logger from 'electron-log'
 import * as fs from 'fs-extra'
 import * as path from 'path'
-import * as unzipper from 'unzipper'
 
 import WebDav from './WebDav'
 
@@ -26,7 +25,6 @@ class BackupManager {
     destinationPath: string = this.backupDir
   ): Promise<string> {
     try {
-      // 创建临时目录
       await fs.ensureDir(this.tempDir)
 
       // 将 data 写入临时文件
@@ -38,21 +36,16 @@ class BackupManager {
       const tempDataDir = path.join(this.tempDir, 'Data')
       await fs.copy(sourcePath, tempDataDir)
 
-      // 创建 zip 文件
-      const output = fs.createWriteStream(path.join(destinationPath, fileName))
-      const archive = archiver('zip', { zlib: { level: 9 } })
-
-      archive.pipe(output)
-      archive.directory(this.tempDir, false)
-      await 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)
 
       Logger.log('Backup completed successfully')
-
-      const backupedFilePath = path.join(destinationPath, fileName)
-
       return backupedFilePath
     } catch (error) {
       Logger.error('Backup failed:', error)
@@ -61,31 +54,43 @@ class BackupManager {
   }
 
   async restore(_: Electron.IpcMainInvokeEvent, backupPath: string): Promise<string> {
+    try {
       // 创建临时目录
       await fs.ensureDir(this.tempDir)
 
-    // 解压备份文件到临时目录
-    await fs
-      .createReadStream(backupPath)
-      .pipe(unzipper.Extract({ path: this.tempDir }))
-      .promise()
+      Logger.log('[backup] step 1: unzip backup file', this.tempDir)
+
+      // 使用 adm-zip 解压
+      const zip = new AdmZip(backupPath)
+      zip.extractAllTo(this.tempDir, true) // true 表示覆盖已存在的文件
+
+      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')
 
+      Logger.log('[backup] step 3: restore Data directory')
+
       // 恢复 Data 目录
       const sourcePath = path.join(this.tempDir, 'Data')
       const destPath = path.join(app.getPath('userData'), 'Data')
       await fs.remove(destPath)
       await fs.copy(sourcePath, destPath)
 
+      Logger.log('[backup] step 4: clean up temp directory')
+
       // 清理临时目录
       await fs.remove(this.tempDir)
 
-    Logger.log('Restore completed successfully')
+      Logger.log('[backup] step 5: Restore completed successfully')
 
       return data
+    } catch (error) {
+      Logger.error('[backup] Restore failed:', error)
+      await fs.remove(this.tempDir).catch(() => {})
+      throw error
+    }
   }
 
   async backupToWebdav(_: Electron.IpcMainInvokeEvent, data: string, webdavConfig: WebDavConfig) {
@@ -102,7 +107,13 @@ class BackupManager {
     const webdavClient = new WebDav(webdavConfig)
     const retrievedFile = await webdavClient.getFileContents(filename)
     const backupedFilePath = path.join(this.backupDir, filename)
+
+    if (!fs.existsSync(this.backupDir)) {
+      fs.mkdirSync(this.backupDir, { recursive: true })
+    }
+
     await fs.writeFileSync(backupedFilePath, retrievedFile as Buffer)
+
     return await this.restore(_, backupedFilePath)
   }
 }

src/main/services/ConfigManager.ts

@@ -0,0 +1,88 @@
+import { ZOOM_SHORTCUTS } from '@shared/config/constant'
+import { LanguageVarious, Shortcut, ThemeMode } from '@types'
+import { app } from 'electron'
+import Store from 'electron-store'
+
+import { locales } from '../utils/locales'
+
+export class ConfigManager {
+  private store: Store
+  private subscribers: Map<string, Array<(newValue: any) => void>> = new Map()
+
+  constructor() {
+    this.store = new Store()
+  }
+
+  getLanguage(): LanguageVarious {
+    const locale = Object.keys(locales).includes(app.getLocale()) ? app.getLocale() : 'en-US'
+    return this.store.get('language', locale) as LanguageVarious
+  }
+
+  setLanguage(theme: LanguageVarious) {
+    this.store.set('language', theme)
+  }
+
+  getTheme(): ThemeMode {
+    return this.store.get('theme', ThemeMode.light) as ThemeMode
+  }
+
+  setTheme(theme: ThemeMode) {
+    this.store.set('theme', theme)
+  }
+
+  isTray(): boolean {
+    return !!this.store.get('tray', true)
+  }
+
+  setTray(value: boolean) {
+    this.store.set('tray', value)
+    this.notifySubscribers('tray', value)
+  }
+
+  getZoomFactor(): number {
+    return this.store.get('zoomFactor', 1) as number
+  }
+
+  setZoomFactor(factor: number) {
+    this.store.set('zoomFactor', factor)
+    this.notifySubscribers('zoomFactor', factor)
+  }
+
+  subscribe<T>(key: string, callback: (newValue: T) => void) {
+    if (!this.subscribers.has(key)) {
+      this.subscribers.set(key, [])
+    }
+    this.subscribers.get(key)!.push(callback)
+  }
+
+  unsubscribe<T>(key: string, callback: (newValue: T) => void) {
+    const subscribers = this.subscribers.get(key)
+    if (subscribers) {
+      this.subscribers.set(
+        key,
+        subscribers.filter((subscriber) => subscriber !== callback)
+      )
+    }
+  }
+
+  private notifySubscribers<T>(key: string, newValue: T) {
+    const subscribers = this.subscribers.get(key)
+    if (subscribers) {
+      subscribers.forEach((subscriber) => subscriber(newValue))
+    }
+  }
+
+  getShortcuts() {
+    return this.store.get('shortcuts', ZOOM_SHORTCUTS) as Shortcut[] | []
+  }
+
+  setShortcuts(shortcuts: Shortcut[]) {
+    this.store.set(
+      'shortcuts',
+      shortcuts.filter((shortcut) => shortcut.system)
+    )
+    this.notifySubscribers('shortcuts', shortcuts)
+  }
+}
+
+export const configManager = new ConfigManager()

src/main/services/ExportService.ts

@@ -0,0 +1,222 @@
+/* eslint-disable no-case-declarations */
+// ExportService
+
+import { AlignmentType, BorderStyle, Document, HeadingLevel, Packer, Paragraph, ShadingType, TextRun } from 'docx'
+import { dialog } from 'electron'
+import Logger from 'electron-log'
+import MarkdownIt from 'markdown-it'
+
+import FileStorage from './FileStorage'
+
+export class ExportService {
+  private fileManager: FileStorage
+  private md: MarkdownIt
+
+  constructor(fileManager: FileStorage) {
+    this.fileManager = fileManager
+    this.md = new MarkdownIt()
+  }
+
+  private convertMarkdownToDocxElements(markdown: string) {
+    const tokens = this.md.parse(markdown, {})
+    const elements: any[] = []
+    let listLevel = 0
+
+    const processInlineTokens = (tokens: any[]): TextRun[] => {
+      const runs: TextRun[] = []
+      for (const token of tokens) {
+        switch (token.type) {
+          case 'text':
+            runs.push(new TextRun(token.content))
+            break
+          case 'strong':
+            runs.push(new TextRun({ text: token.content, bold: true }))
+            break
+          case 'em':
+            runs.push(new TextRun({ text: token.content, italics: true }))
+            break
+          case 'code_inline':
+            runs.push(new TextRun({ text: token.content, font: 'Consolas', size: 20 }))
+            break
+        }
+      }
+      return runs
+    }
+
+    for (let i = 0; i < tokens.length; i++) {
+      const token = tokens[i]
+
+      switch (token.type) {
+        case 'heading_open':
+          // 获取标题级别 (h1 -> h6)
+          const level = parseInt(token.tag.slice(1)) as 1 | 2 | 3 | 4 | 5 | 6
+          const headingText = tokens[i + 1].content
+          elements.push(
+            new Paragraph({
+              text: headingText,
+              heading: HeadingLevel[`HEADING_${level}`],
+              spacing: {
+                before: 240,
+                after: 120
+              }
+            })
+          )
+          i += 2 // 跳过内容标记和闭合标记
+          break
+
+        case 'paragraph_open':
+          const inlineTokens = tokens[i + 1].children || []
+          elements.push(
+            new Paragraph({
+              children: processInlineTokens(inlineTokens),
+              spacing: {
+                before: 120,
+                after: 120
+              }
+            })
+          )
+          i += 2
+          break
+
+        case 'bullet_list_open':
+          listLevel++
+          break
+
+        case 'bullet_list_close':
+          listLevel--
+          break
+
+        case 'list_item_open':
+          const itemInlineTokens = tokens[i + 2].children || []
+          elements.push(
+            new Paragraph({
+              children: [
+                new TextRun({ text: '•', bold: true }),
+                new TextRun({ text: '\t' }),
+                ...processInlineTokens(itemInlineTokens)
+              ],
+              indent: {
+                left: listLevel * 720
+              }
+            })
+          )
+          i += 3
+          break
+
+        case 'fence': // 代码块
+          const codeLines = token.content.split('\n')
+          elements.push(
+            new Paragraph({
+              children: codeLines.map(
+                (line) =>
+                  new TextRun({
+                    text: line + '\n',
+                    font: 'Consolas',
+                    size: 20,
+                    break: 1
+                  })
+              ),
+              shading: {
+                type: ShadingType.SOLID,
+                color: 'F5F5F5'
+              },
+              spacing: {
+                before: 120,
+                after: 120
+              },
+              border: {
+                top: { style: BorderStyle.SINGLE, size: 1, color: 'DDDDDD' },
+                bottom: { style: BorderStyle.SINGLE, size: 1, color: 'DDDDDD' },
+                left: { style: BorderStyle.SINGLE, size: 1, color: 'DDDDDD' },
+                right: { style: BorderStyle.SINGLE, size: 1, color: 'DDDDDD' }
+              }
+            })
+          )
+          break
+
+        case 'hr':
+          elements.push(
+            new Paragraph({
+              children: [new TextRun({ text: '─'.repeat(50), color: '999999' })],
+              alignment: AlignmentType.CENTER
+            })
+          )
+          break
+
+        case 'blockquote_open':
+          const quoteText = tokens[i + 2].content
+          elements.push(
+            new Paragraph({
+              children: [
+                new TextRun({
+                  text: quoteText,
+                  italics: true
+                })
+              ],
+              indent: {
+                left: 720
+              },
+              border: {
+                left: {
+                  style: BorderStyle.SINGLE,
+                  size: 3,
+                  color: 'CCCCCC'
+                }
+              },
+              spacing: {
+                before: 120,
+                after: 120
+              }
+            })
+          )
+          i += 3
+          break
+      }
+    }
+
+    return elements
+  }
+
+  public exportToWord = async (_: Electron.IpcMainInvokeEvent, markdown: string, fileName: string): Promise<void> => {
+    try {
+      const elements = this.convertMarkdownToDocxElements(markdown)
+
+      const doc = new Document({
+        styles: {
+          paragraphStyles: [
+            {
+              id: 'Normal',
+              name: 'Normal',
+              run: {
+                size: 24,
+                font: 'Arial'
+              }
+            }
+          ]
+        },
+        sections: [
+          {
+            properties: {},
+            children: elements
+          }
+        ]
+      })
+
+      const buffer = await Packer.toBuffer(doc)
+
+      const filePath = dialog.showSaveDialogSync({
+        title: '保存文件',
+        filters: [{ name: 'Word Document', extensions: ['docx'] }],
+        defaultPath: fileName
+      })
+
+      if (filePath) {
+        await this.fileManager.writeFile(_, filePath, buffer)
+        Logger.info('[ExportService] Document exported successfully')
+      }
+    } catch (error) {
+      Logger.error('[ExportService] Export to Word failed:', error)
+      throw error
+    }
+  }
+}

src/main/services/FileStorage.ts

@@ -1,4 +1,5 @@
 import { getFileType } from '@main/utils/file'
+import { documentExts, imageExts } from '@shared/config/constant'
 import { FileType } from '@types'
 import * as crypto from 'crypto'
 import {
@@ -13,11 +14,14 @@ import logger from 'electron-log'
 import * as fs from 'fs'
 import { writeFileSync } from 'fs'
 import { readFile } from 'fs/promises'
+import officeParser from 'officeparser'
 import * as path from 'path'
+import { chdir } from 'process'
 import { v4 as uuidv4 } from 'uuid'
 
-class FileManager {
+class FileStorage {
   private storageDir = path.join(app.getPath('userData'), 'Data', 'Files')
+  private tempDir = path.join(app.getPath('temp'), 'CherryStudio')
 
   constructor() {
     this.initStorageDir()
@@ -27,6 +31,9 @@ class FileManager {
     if (!fs.existsSync(this.storageDir)) {
       fs.mkdirSync(this.storageDir, { recursive: true })
     }
+    if (!fs.existsSync(this.tempDir)) {
+      fs.mkdirSync(this.tempDir, { recursive: true })
+    }
   }
 
   private getFileHash = async (filePath: string): Promise<string> => {
@@ -112,6 +119,31 @@ class FileManager {
     return Promise.all(fileMetadataPromises)
   }
 
+  private async compressImage(sourcePath: string, destPath: string): Promise<void> {
+    try {
+      const stats = fs.statSync(sourcePath)
+      const fileSizeInMB = stats.size / (1024 * 1024)
+
+      // 如果图片大于1MB才进行压缩
+      if (fileSizeInMB > 1) {
+        try {
+          await fs.promises.copyFile(sourcePath, destPath)
+          logger.info('[FileStorage] Image compressed successfully:', sourcePath)
+        } catch (jimpError) {
+          logger.error('[FileStorage] Image compression failed:', jimpError)
+          await fs.promises.copyFile(sourcePath, destPath)
+        }
+      } else {
+        // 小图片直接复制
+        await fs.promises.copyFile(sourcePath, destPath)
+      }
+    } catch (error) {
+      logger.error('[FileStorage] Image handling failed:', error)
+      // 错误情况下直接复制原文件
+      await fs.promises.copyFile(sourcePath, destPath)
+    }
+  }
+
   public uploadFile = async (_: Electron.IpcMainInvokeEvent, file: FileType): Promise<FileType> => {
     const duplicateFile = await this.findDuplicateFile(file.path)
 
@@ -121,10 +153,18 @@ class FileManager {
 
     const uuid = uuidv4()
     const origin_name = path.basename(file.path)
-    const ext = path.extname(origin_name)
+    const ext = path.extname(origin_name).toLowerCase()
     const destPath = path.join(this.storageDir, uuid + ext)
 
+    logger.info('[FileStorage] Uploading file:', file.path)
+
+    // 根据文件类型选择处理方式
+    if (imageExts.includes(ext)) {
+      await this.compressImage(file.path, destPath)
+    } else {
       await fs.promises.copyFile(file.path, destPath)
+    }
+
     const stats = await fs.promises.stat(destPath)
     const fileType = getFileType(ext)
 
@@ -173,15 +213,29 @@ class FileManager {
 
   public readFile = async (_: Electron.IpcMainInvokeEvent, id: string): Promise<string> => {
     const filePath = path.join(this.storageDir, id)
+
+    if (documentExts.includes(path.extname(filePath))) {
+      const originalCwd = process.cwd()
+      try {
+        chdir(this.tempDir)
+        const data = await officeParser.parseOfficeAsync(filePath)
+        chdir(originalCwd)
+        return data
+      } catch (error) {
+        chdir(originalCwd)
+        logger.error(error)
+        throw error
+      }
+    }
+
     return fs.readFileSync(filePath, 'utf8')
   }
 
   public createTempFile = async (_: Electron.IpcMainInvokeEvent, fileName: string): Promise<string> => {
-    const tempDir = path.join(app.getPath('temp'), 'CherryStudio')
-    if (!fs.existsSync(tempDir)) {
-      fs.mkdirSync(tempDir, { recursive: true })
+    if (!fs.existsSync(this.tempDir)) {
+      fs.mkdirSync(this.tempDir, { recursive: true })
     }
-    const tempFilePath = path.join(tempDir, `temp_file_${uuidv4()}_${fileName}`)
+    const tempFilePath = path.join(this.tempDir, `temp_file_${uuidv4()}_${fileName}`)
     return tempFilePath
   }
 
@@ -213,6 +267,11 @@ class FileManager {
     await this.initStorageDir()
   }
 
+  public clearTemp = async (): Promise<void> => {
+    await fs.promises.rmdir(this.tempDir, { recursive: true })
+    await fs.promises.mkdir(this.tempDir, { recursive: true })
+  }
+
   public open = async (
     _: Electron.IpcMainInvokeEvent,
     options: OpenDialogOptions
@@ -244,7 +303,7 @@ class FileManager {
     fileName: string,
     content: string,
     options?: SaveDialogOptions
-  ): Promise<void> => {
+  ): Promise<string | null> => {
     try {
       const result: SaveDialogReturnValue = await dialog.showSaveDialog({
         title: '保存文件',
@@ -255,8 +314,11 @@ class FileManager {
       if (!result.canceled && result.filePath) {
         await writeFileSync(result.filePath, content, { encoding: 'utf-8' })
       }
+
+      return result.filePath
     } catch (err) {
       logger.error('[IPC - Error]', 'An error occurred saving the file:', err)
+      return null
     }
   }
 
@@ -294,6 +356,105 @@ class FileManager {
       return null
     }
   }
+
+  public downloadFile = async (_: Electron.IpcMainInvokeEvent, url: string): Promise<FileType> => {
+    try {
+      const response = await fetch(url)
+      if (!response.ok) {
+        throw new Error(`HTTP error! status: ${response.status}`)
       }
 
-export default FileManager
+      // 尝试从Content-Disposition获取文件名
+      const contentDisposition = response.headers.get('Content-Disposition')
+      let filename = 'download'
+
+      if (contentDisposition) {
+        const filenameMatch = contentDisposition.match(/filename="?(.+)"?/i)
+        if (filenameMatch) {
+          filename = filenameMatch[1]
+        }
+      }
+
+      // 如果URL中有文件名，使用URL中的文件名
+      const urlFilename = url.split('/').pop()
+      if (urlFilename && urlFilename.includes('.')) {
+        filename = urlFilename
+      }
+
+      // 如果文件名没有后缀，根据Content-Type添加后缀
+      if (!filename.includes('.')) {
+        const contentType = response.headers.get('Content-Type')
+        const ext = this.getExtensionFromMimeType(contentType)
+        filename += ext
+      }
+
+      const uuid = uuidv4()
+      const ext = path.extname(filename)
+      const destPath = path.join(this.storageDir, uuid + ext)
+
+      // 将响应内容写入文件
+      const buffer = Buffer.from(await response.arrayBuffer())
+      await fs.promises.writeFile(destPath, buffer)
+
+      const stats = await fs.promises.stat(destPath)
+      const fileType = getFileType(ext)
+
+      const fileMetadata: FileType = {
+        id: uuid,
+        origin_name: filename,
+        name: uuid + ext,
+        path: destPath,
+        created_at: stats.birthtime,
+        size: stats.size,
+        ext: ext,
+        type: fileType,
+        count: 1
+      }
+
+      return fileMetadata
+    } catch (error) {
+      logger.error('[FileStorage] Download file error:', error)
+      throw error
+    }
+  }
+
+  private getExtensionFromMimeType(mimeType: string | null): string {
+    if (!mimeType) return '.bin'
+
+    const mimeToExtension: { [key: string]: string } = {
+      'image/jpeg': '.jpg',
+      'image/png': '.png',
+      'image/gif': '.gif',
+      'application/pdf': '.pdf',
+      'text/plain': '.txt',
+      'application/msword': '.doc',
+      'application/vnd.openxmlformats-officedocument.wordprocessingml.document': '.docx',
+      'application/zip': '.zip',
+      'application/x-zip-compressed': '.zip',
+      'application/octet-stream': '.bin'
+    }
+
+    return mimeToExtension[mimeType] || '.bin'
+  }
+
+  public copyFile = async (_: Electron.IpcMainInvokeEvent, id: string, destPath: string): Promise<void> => {
+    try {
+      const sourcePath = path.join(this.storageDir, id)
+
+      // 确保目标目录存在
+      const destDir = path.dirname(destPath)
+      if (!fs.existsSync(destDir)) {
+        await fs.promises.mkdir(destDir, { recursive: true })
+      }
+
+      // 复制文件
+      await fs.promises.copyFile(sourcePath, destPath)
+      logger.info('[FileStorage] File copied successfully:', { from: sourcePath, to: destPath })
+    } catch (error) {
+      logger.error('[FileStorage] Copy file failed:', error)
+      throw error
+    }
+  }
+}
+
+export default FileStorage

src/main/services/ShortcutService.ts

@@ -0,0 +1,131 @@
+import { Shortcut } from '@types'
+import { BrowserWindow, globalShortcut } from 'electron'
+import Logger from 'electron-log'
+
+import { configManager } from './ConfigManager'
+
+let showAppAccelerator: string | null = null
+
+function getShortcutHandler(shortcut: Shortcut) {
+  switch (shortcut.key) {
+    case 'zoom_in':
+      return (window: BrowserWindow) => handleZoom(0.1)(window)
+    case 'zoom_out':
+      return (window: BrowserWindow) => handleZoom(-0.1)(window)
+    case 'zoom_reset':
+      return (window: BrowserWindow) => {
+        window.webContents.setZoomFactor(1)
+        configManager.setZoomFactor(1)
+      }
+    case 'show_app':
+      return (window: BrowserWindow) => {
+        if (window.isVisible()) {
+          window.hide()
+        } else {
+          window.show()
+          window.focus()
+        }
+      }
+    default:
+      return null
+  }
+}
+
+function formatShortcutKey(shortcut: string[]): string {
+  return shortcut.join('+')
+}
+
+function handleZoom(delta: number) {
+  return (window: BrowserWindow) => {
+    const currentZoom = window.webContents.getZoomFactor()
+    const newZoom = currentZoom + delta
+    if (newZoom >= 0.1 && newZoom <= 5.0) {
+      window.webContents.setZoomFactor(newZoom)
+      configManager.setZoomFactor(newZoom)
+    }
+  }
+}
+
+export function registerShortcuts(window: BrowserWindow) {
+  window.webContents.setZoomFactor(configManager.getZoomFactor())
+
+  const register = () => {
+    if (window.isDestroyed()) return
+
+    const shortcuts = configManager.getShortcuts()
+    if (!shortcuts) return
+
+    shortcuts.forEach((shortcut) => {
+      try {
+        if (shortcut.shortcut.length === 0) {
+          return
+        }
+
+        const handler = getShortcutHandler(shortcut)
+
+        if (!handler) {
+          return
+        }
+
+        const accelerator = formatShortcutKey(shortcut.shortcut)
+
+        if (shortcut.key === 'show_app') {
+          showAppAccelerator = accelerator
+        }
+
+        if (shortcut.key.includes('zoom')) {
+          switch (shortcut.key) {
+            case 'zoom_in':
+              globalShortcut.register('CommandOrControl+=', () => shortcut.enabled && handler(window))
+              globalShortcut.register('CommandOrControl+numadd', () => shortcut.enabled && handler(window))
+              return
+            case 'zoom_out':
+              globalShortcut.register('CommandOrControl+-', () => shortcut.enabled && handler(window))
+              globalShortcut.register('CommandOrControl+numsub', () => shortcut.enabled && handler(window))
+              return
+            case 'zoom_reset':
+              globalShortcut.register('CommandOrControl+0', () => shortcut.enabled && handler(window))
+              return
+          }
+        }
+
+        if (shortcut.enabled) {
+          globalShortcut.register(accelerator, () => handler(window))
+        }
+      } catch (error) {
+        Logger.error(`[ShortcutService] Failed to register shortcut ${shortcut.key}`)
+      }
+    })
+  }
+
+  const unregister = () => {
+    if (window.isDestroyed()) return
+
+    try {
+      globalShortcut.unregisterAll()
+
+      if (showAppAccelerator) {
+        const handler = getShortcutHandler({ key: 'show_app' } as Shortcut)
+        handler && globalShortcut.register(showAppAccelerator, () => handler(window))
+      }
+    } catch (error) {
+      Logger.error('[ShortcutService] Failed to unregister shortcuts')
+    }
+  }
+
+  window.on('focus', () => register())
+  window.on('blur', () => unregister())
+
+  if (!window.isDestroyed() && window.isFocused()) {
+    register()
+  }
+}
+
+export function unregisterAllShortcuts() {
+  try {
+    showAppAccelerator = null
+    globalShortcut.unregisterAll()
+  } catch (error) {
+    Logger.error('[ShortcutService] Failed to unregister all shortcuts')
+  }
+}

src/main/services/TrayService.ts

@@ -0,0 +1,90 @@
+import { isMac } from '@main/constant'
+import { locales } from '@main/utils/locales'
+import { app, Menu, nativeImage, nativeTheme, Tray } from 'electron'
+
+import icon from '../../../build/tray_icon.png?asset'
+import iconDark from '../../../build/tray_icon_dark.png?asset'
+import iconLight from '../../../build/tray_icon_light.png?asset'
+import { configManager } from './ConfigManager'
+import { windowService } from './WindowService'
+
+export class TrayService {
+  private tray: Tray | null = null
+
+  constructor() {
+    this.updateTray()
+    this.watchTrayChanges()
+  }
+
+  private createTray() {
+    const iconPath = isMac ? (nativeTheme.shouldUseDarkColors ? iconLight : iconDark) : icon
+    const tray = new Tray(iconPath)
+
+    if (process.platform === 'win32') {
+      tray.setImage(iconPath)
+    } else if (process.platform === 'darwin') {
+      const image = nativeImage.createFromPath(iconPath)
+      const resizedImage = image.resize({ width: 16, height: 16 })
+      resizedImage.setTemplateImage(true)
+      tray.setImage(resizedImage)
+    } else if (process.platform === 'linux') {
+      const image = nativeImage.createFromPath(iconPath)
+      const resizedImage = image.resize({ width: 16, height: 16 })
+      tray.setImage(resizedImage)
+    }
+
+    this.tray = tray
+
+    const locale = locales[configManager.getLanguage()]
+    const { tray: trayLocale } = locale.translation
+
+    const contextMenu = Menu.buildFromTemplate([
+      {
+        label: trayLocale.show_window,
+        click: () => windowService.showMainWindow()
+      },
+      { type: 'separator' },
+      {
+        label: trayLocale.quit,
+        click: () => this.quit()
+      }
+    ])
+
+    if (process.platform === 'linux') {
+      this.tray.setContextMenu(contextMenu)
+    }
+
+    this.tray.setToolTip('Cherry Studio')
+
+    this.tray.on('right-click', () => {
+      this.tray?.popUpContextMenu(contextMenu)
+    })
+
+    this.tray.on('click', () => {
+      windowService.showMainWindow()
+    })
+  }
+
+  private updateTray() {
+    if (configManager.isTray()) {
+      this.createTray()
+    } else {
+      this.destroyTray()
+    }
+  }
+
+  private destroyTray() {
+    if (this.tray) {
+      this.tray.destroy()
+      this.tray = null
+    }
+  }
+
+  private watchTrayChanges() {
+    configManager.subscribe<boolean>('tray', () => this.updateTray())
+  }
+
+  private quit() {
+    app.quit()
+  }
+}

src/main/services/WebDav.ts

@@ -12,7 +12,9 @@ export default class WebDav {
 
     this.instance = createClient(params.webdavHost, {
       username: params.webdavUser,
-      password: params.webdavPass
+      password: params.webdavPass,
+      maxBodyLength: Infinity,
+      maxContentLength: Infinity
     })
 
     this.putFileContents = this.putFileContents.bind(this)

src/main/services/WindowService.ts

@@ -0,0 +1,198 @@
+import { is } from '@electron-toolkit/utils'
+import { isLinux, isWin } from '@main/constant'
+import { app, BrowserWindow, Menu, MenuItem, shell } from 'electron'
+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'
+
+export class WindowService {
+  private static instance: WindowService | null = null
+  private mainWindow: BrowserWindow | null = null
+
+  public static getInstance(): WindowService {
+    if (!WindowService.instance) {
+      WindowService.instance = new WindowService()
+    }
+    return WindowService.instance
+  }
+
+  public createMainWindow(): BrowserWindow {
+    if (this.mainWindow && !this.mainWindow.isDestroyed()) {
+      return this.mainWindow
+    }
+
+    const mainWindowState = windowStateKeeper({
+      defaultWidth: 1080,
+      defaultHeight: 670
+    })
+
+    const theme = configManager.getTheme()
+    const isMac = process.platform === 'darwin'
+
+    this.mainWindow = new BrowserWindow({
+      x: mainWindowState.x,
+      y: mainWindowState.y,
+      width: mainWindowState.width,
+      height: mainWindowState.height,
+      minWidth: 1080,
+      minHeight: 600,
+      show: true,
+      autoHideMenuBar: true,
+      transparent: isMac,
+      vibrancy: 'under-window',
+      visualEffectState: 'active',
+      titleBarStyle: 'hidden',
+      titleBarOverlay: theme === 'dark' ? titleBarOverlayDark : titleBarOverlayLight,
+      backgroundColor: isMac ? undefined : theme === 'dark' ? '#181818' : '#FFFFFF',
+      trafficLightPosition: { x: 8, y: 12 },
+      ...(process.platform === 'linux' ? { icon } : {}),
+      webPreferences: {
+        preload: join(__dirname, '../preload/index.js'),
+        sandbox: false,
+        webSecurity: false,
+        webviewTag: true
+      }
+    })
+
+    this.setupMainWindow(this.mainWindow, mainWindowState)
+    return this.mainWindow
+  }
+
+  public createMinappWindow({
+    url,
+    parent,
+    windowOptions
+  }: {
+    url: string
+    parent?: BrowserWindow
+    windowOptions?: Electron.BrowserWindowConstructorOptions
+  }): BrowserWindow {
+    const width = windowOptions?.width || 1000
+    const height = windowOptions?.height || 680
+
+    const minappWindow = new BrowserWindow({
+      width,
+      height,
+      autoHideMenuBar: true,
+      title: 'Cherry Studio',
+      ...windowOptions,
+      parent,
+      webPreferences: {
+        preload: join(__dirname, '../preload/minapp.js'),
+        sandbox: false,
+        contextIsolation: false
+      }
+    })
+
+    minappWindow.loadURL(url)
+    return minappWindow
+  }
+
+  private setupMainWindow(mainWindow: BrowserWindow, mainWindowState: any) {
+    mainWindowState.manage(mainWindow)
+
+    this.setupContextMenu(mainWindow)
+    this.setupWindowEvents(mainWindow)
+    this.setupWebContentsHandlers(mainWindow)
+    this.setupWindowLifecycleEvents(mainWindow)
+    this.loadMainWindowContent(mainWindow)
+  }
+
+  private setupContextMenu(mainWindow: BrowserWindow) {
+    mainWindow.webContents.on('context-menu', () => {
+      const locale = locales[configManager.getLanguage()]
+      const { common } = locale.translation
+
+      const menu = new Menu()
+      menu.append(new MenuItem({ label: common.copy, role: 'copy' }))
+      menu.append(new MenuItem({ label: common.paste, role: 'paste' }))
+      menu.append(new MenuItem({ label: common.cut, role: 'cut' }))
+      menu.popup()
+    })
+  }
+
+  private setupWindowEvents(mainWindow: BrowserWindow) {
+    mainWindow.on('ready-to-show', () => {
+      mainWindow.show()
+    })
+  }
+
+  private setupWebContentsHandlers(mainWindow: BrowserWindow) {
+    mainWindow.webContents.on('will-navigate', (event, url) => {
+      event.preventDefault()
+      shell.openExternal(url)
+    })
+
+    mainWindow.webContents.setWindowOpenHandler((details) => {
+      shell.openExternal(details.url)
+      return { action: 'deny' }
+    })
+
+    this.setupWebRequestHeaders(mainWindow)
+  }
+
+  private setupWebRequestHeaders(mainWindow: BrowserWindow) {
+    mainWindow.webContents.session.webRequest.onHeadersReceived({ urls: ['*://*/*'] }, (details, callback) => {
+      if (details.responseHeaders?.['X-Frame-Options']) {
+        delete details.responseHeaders['X-Frame-Options']
+      }
+      if (details.responseHeaders?.['x-frame-options']) {
+        delete details.responseHeaders['x-frame-options']
+      }
+      if (details.responseHeaders?.['Content-Security-Policy']) {
+        delete details.responseHeaders['Content-Security-Policy']
+      }
+      if (details.responseHeaders?.['content-security-policy']) {
+        delete details.responseHeaders['content-security-policy']
+      }
+      callback({ cancel: false, responseHeaders: details.responseHeaders })
+    })
+  }
+
+  private loadMainWindowContent(mainWindow: BrowserWindow) {
+    if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
+      mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'])
+    } else {
+      mainWindow.loadFile(join(__dirname, '../renderer/index.html'))
+    }
+  }
+
+  public getMainWindow(): BrowserWindow | null {
+    return this.mainWindow
+  }
+
+  private setupWindowLifecycleEvents(mainWindow: BrowserWindow) {
+    mainWindow.on('close', (event) => {
+      const notInTray = !configManager.isTray()
+
+      // Windows and Linux
+      if ((isWin || isLinux) && notInTray) {
+        return app.quit()
+      }
+
+      // Mac
+      if (!app.isQuitting) {
+        event.preventDefault()
+        mainWindow.hide()
+      }
+    })
+  }
+
+  public showMainWindow() {
+    if (this.mainWindow) {
+      if (this.mainWindow.isMinimized()) {
+        return this.mainWindow.restore()
+      }
+      this.mainWindow.show()
+      this.mainWindow.focus()
+    } else {
+      this.createMainWindow()
+    }
+  }
+}
+
+export const windowService = WindowService.getInstance()

src/main/utils/file.ts

@@ -1,101 +1,7 @@
-import { FileTypes } from '../../renderer/src/types'
+import { audioExts, documentExts, imageExts, textExts, videoExts } from '@shared/config/constant'
+import { FileTypes } from '@types'
 
 export function getFileType(ext: string): FileTypes {
-  const imageExts = ['.jpg', '.jpeg', '.png', '.gif', '.bmp', '.webp']
-  const videoExts = ['.mp4', '.avi', '.mov', '.wmv', '.flv', '.mkv']
-  const audioExts = ['.mp3', '.wav', '.ogg', '.flac', '.aac']
-  const documentExts = ['.pdf', '.doc', '.docx', '.xls', '.xlsx', '.ppt', '.pptx']
-  const textExts = [
-    '.txt', // 普通文本文件
-    '.md', // Markdown 文件
-    '.mdx', // Markdown 文件
-    '.html', // HTML 文件
-    '.htm', // HTML 文件的另一种扩展名
-    '.xml', // XML 文件
-    '.json', // JSON 文件
-    '.yaml', // YAML 文件
-    '.yml', // YAML 文件的另一种扩展名
-    '.csv', // 逗号分隔值文件
-    '.tsv', // 制表符分隔值文件
-    '.ini', // 配置文件
-    '.log', // 日志文件
-    '.rtf', // 富文本格式文件
-    '.tex', // LaTeX 文件
-    '.srt', // 字幕文件
-    '.xhtml', // XHTML 文件
-    '.nfo', // 信息文件（主要用于场景发布）
-    '.conf', // 配置文件
-    '.config', // 配置文件
-    '.env', // 环境变量文件
-    '.properties', // 配置属性文件
-    '.latex', // LaTeX 文档文件
-    '.rst', // reStructuredText 文件
-    '.php', // PHP 脚本文件，包含嵌入的 HTML
-    '.js', // JavaScript 文件（部分是文本，部分可能包含代码）
-    '.ts', // TypeScript 文件
-    '.jsp', // JavaServer Pages 文件
-    '.aspx', // ASP.NET 文件
-    '.bat', // Windows 批处理文件
-    '.sh', // Unix/Linux Shell 脚本文件
-    '.py', // Python 脚本文件
-    '.rb', // Ruby 脚本文件
-    '.pl', // Perl 脚本文件
-    '.sql', // SQL 脚本文件
-    '.css', // Cascading Style Sheets 文件
-    '.less', // Less CSS 预处理器文件
-    '.scss', // Sass CSS 预处理器文件
-    '.sass', // Sass 文件
-    '.styl', // Stylus CSS 预处理器文件
-    '.coffee', // CoffeeScript 文件
-    '.ino', // Arduino 代码文件
-    '.ino', // Arduino 代码文件
-    '.asm', // Assembly 语言文件
-    '.go', // Go 语言文件
-    '.scala', // Scala 语言文件
-    '.swift', // Swift 语言文件
-    '.kt', // Kotlin 语言文件
-    '.rs', // Rust 语言文件
-    '.lua', // Lua 语言文件
-    '.groovy', // Groovy 语言文件
-    '.dart', // Dart 语言文件
-    '.hs', // Haskell 语言文件
-    '.clj', // Clojure 语言文件
-    '.cljs', // ClojureScript 语言文件
-    '.elm', // Elm 语言文件
-    '.erl', // Erlang 语言文件
-    '.ex', // Elixir 语言文件
-    '.exs', // Elixir 脚本文件
-    '.pug', // Pug (formerly Jade) 模板文件
-    '.haml', // Haml 模板文件
-    '.slim', // Slim 模板文件
-    '.tpl', // 模板文件（通用）
-    '.ejs', // Embedded JavaScript 模板文件
-    '.hbs', // Handlebars 模板文件
-    '.mustache', // Mustache 模板文件
-    '.jade', // Jade 模板文件 (已重命名为 Pug)
-    '.twig', // Twig 模板文件
-    '.blade', // Blade 模板文件 (Laravel)
-    '.vue', // Vue.js 单文件组件
-    '.jsx', // React JSX 文件
-    '.tsx', // React TSX 文件
-    '.graphql', // GraphQL 查询语言文件
-    '.gql', // GraphQL 查询语言文件
-    '.proto', // Protocol Buffers 文件
-    '.thrift', // Thrift 文件
-    '.toml', // TOML 配置文件
-    '.edn', // Clojure 数据表示文件
-    '.cake', // CakePHP 配置文件
-    '.ctp', // CakePHP 视图文件
-    '.cfm', // ColdFusion 标记语言文件
-    '.cfc', // ColdFusion 组件文件
-    '.m', // Objective-C 源文件
-    '.mm', // Objective-C++ 源文件
-    '.gradle', // Gradle 构建文件
-    '.groovy', // Gradle 构建文件
-    '.gradle', // Gradle 构建文件
-    '.kts' // Kotlin Script 文件
-  ]
-
   ext = ext.toLowerCase()
   if (imageExts.includes(ext)) return FileTypes.IMAGE
   if (videoExts.includes(ext)) return FileTypes.VIDEO

src/main/utils/index.ts

@@ -1,3 +1,4 @@
+import fs from 'node:fs'
 import path from 'node:path'
 
 import { app } from 'electron'
@@ -5,3 +6,11 @@ import { app } from 'electron'
 export function getResourcePath() {
   return path.join(app.getAppPath(), 'resources')
 }
+
+export function getDataPath() {
+  const dataPath = path.join(app.getPath('userData'), 'Data')
+  if (!fs.existsSync(dataPath)) {
+    fs.mkdirSync(dataPath, { recursive: true })
+  }
+  return dataPath
+}

src/main/utils/locales.ts

@@ -0,0 +1,13 @@
+import EnUs from '../../renderer/src/i18n/locales/en-us.json'
+import RuRu from '../../renderer/src/i18n/locales/ru-ru.json'
+import ZhCn from '../../renderer/src/i18n/locales/zh-cn.json'
+import ZhTw from '../../renderer/src/i18n/locales/zh-tw.json'
+
+const locales = {
+  'en-US': EnUs,
+  'zh-CN': ZhCn,
+  'zh-TW': ZhTw,
+  'ru-RU': RuRu
+}
+
+export { locales }

src/main/utils/windowUtil.ts

@@ -0,0 +1,16 @@
+function isTilingWindowManager() {
+  if (process.platform === 'darwin') {
+    return false
+  }
+
+  if (process.platform !== 'linux') {
+    return true
+  }
+
+  const desktopEnv = process.env.XDG_CURRENT_DESKTOP?.toLowerCase()
+  const tilingSystems = ['hyprland', 'i3', 'sway', 'bspwm', 'dwm', 'awesome', 'qtile', 'herbstluftwm', 'xmonad']
+
+  return tilingSystems.some((system) => desktopEnv?.includes(system))
+}
+
+export { isTilingWindowManager }

src/main/utils/zip.ts

@@ -0,0 +1,39 @@
+import util from 'node:util'
+import zlib from 'node:zlib'
+
+import logger from 'electron-log'
+
+// 将 zlib 的 gzip 和 gunzip 方法转换为 Promise 版本
+const gzipPromise = util.promisify(zlib.gzip)
+const gunzipPromise = util.promisify(zlib.gunzip)
+
+/**
+ * 压缩字符串
+ * @param {string} string - 要压缩的 JSON 字符串
+ * @returns {Promise<Buffer>} 压缩后的 Buffer
+ */
+export async function compress(str) {
+  try {
+    const buffer = Buffer.from(str, 'utf-8')
+    const compressedBuffer = await gzipPromise(buffer)
+    return compressedBuffer
+  } catch (error) {
+    logger.error('Compression failed:', error)
+    throw error
+  }
+}
+
+/**
+ * 解压缩 Buffer 到 JSON 字符串
+ * @param {Buffer} compressedBuffer - 压缩的 Buffer
+ * @returns {Promise<string>} 解压缩后的 JSON 字符串
+ */
+export async function decompress(compressedBuffer) {
+  try {
+    const buffer = await gunzipPromise(compressedBuffer)
+    return buffer.toString('utf-8')
+  } catch (error) {
+    logger.error('Decompression failed:', error)
+    throw error
+  }
+}

src/main/window.ts

@@ -1,126 +0,0 @@
-import { is } from '@electron-toolkit/utils'
-import { BrowserWindow, Menu, MenuItem, shell } from 'electron'
-import windowStateKeeper from 'electron-window-state'
-import { join } from 'path'
-
-import icon from '../../build/icon.png?asset'
-import { appConfig, titleBarOverlayDark, titleBarOverlayLight } from './config'
-
-export function createMainWindow() {
-  // Load the previous state with fallback to defaults
-  const mainWindowState = windowStateKeeper({
-    defaultWidth: 1080,
-    defaultHeight: 670
-  })
-
-  const theme = appConfig.get('theme') || 'light'
-
-  // Create the browser window.
-  const mainWindow = new BrowserWindow({
-    x: mainWindowState.x,
-    y: mainWindowState.y,
-    width: mainWindowState.width,
-    height: mainWindowState.height,
-    minWidth: 1080,
-    minHeight: 600,
-    show: true,
-    autoHideMenuBar: true,
-    transparent: process.platform === 'darwin',
-    vibrancy: 'fullscreen-ui',
-    visualEffectState: 'active',
-    titleBarStyle: 'hidden',
-    titleBarOverlay: theme === 'dark' ? titleBarOverlayDark : titleBarOverlayLight,
-    trafficLightPosition: { x: 8, y: 12 },
-    ...(process.platform === 'linux' ? { icon } : {}),
-    webPreferences: {
-      preload: join(__dirname, '../preload/index.js'),
-      sandbox: false,
-      webSecurity: false,
-      webviewTag: true
-      // devTools: !app.isPackaged,
-    }
-  })
-
-  mainWindowState.manage(mainWindow)
-
-  mainWindow.webContents.on('context-menu', () => {
-    const menu = new Menu()
-    menu.append(new MenuItem({ label: '复制', role: 'copy', sublabel: '⌘ + C' }))
-    menu.append(new MenuItem({ label: '粘贴', role: 'paste', sublabel: '⌘ + V' }))
-    menu.append(new MenuItem({ label: '剪切', role: 'cut', sublabel: '⌘ + X' }))
-    menu.append(new MenuItem({ type: 'separator' }))
-    menu.append(new MenuItem({ label: '全选', role: 'selectAll', sublabel: '⌘ + A' }))
-    menu.popup()
-  })
-
-  mainWindow.on('ready-to-show', () => {
-    mainWindow.show()
-  })
-
-  mainWindow.webContents.on('will-navigate', (event, url) => {
-    event.preventDefault()
-    shell.openExternal(url)
-  })
-
-  mainWindow.webContents.setWindowOpenHandler((details) => {
-    shell.openExternal(details.url)
-    return { action: 'deny' }
-  })
-
-  mainWindow.webContents.session.webRequest.onHeadersReceived({ urls: ['*://*/*'] }, (details, callback) => {
-    if (details.responseHeaders?.['X-Frame-Options']) {
-      delete details.responseHeaders['X-Frame-Options']
-    }
-    if (details.responseHeaders?.['x-frame-options']) {
-      delete details.responseHeaders['x-frame-options']
-    }
-    if (details.responseHeaders?.['Content-Security-Policy']) {
-      delete details.responseHeaders['Content-Security-Policy']
-    }
-    if (details.responseHeaders?.['content-security-policy']) {
-      delete details.responseHeaders['content-security-policy']
-    }
-    callback({ cancel: false, responseHeaders: details.responseHeaders })
-  })
-
-  // HMR for renderer base on electron-vite cli.
-  // Load the remote URL for development or the local html file for production.
-  if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
-    mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'])
-  } else {
-    mainWindow.loadFile(join(__dirname, '../renderer/index.html'))
-  }
-
-  return mainWindow
-}
-
-export function createMinappWindow({
-  url,
-  parent,
-  windowOptions
-}: {
-  url: string
-  parent?: BrowserWindow
-  windowOptions?: Electron.BrowserWindowConstructorOptions
-}) {
-  const width = windowOptions?.width || 1000
-  const height = windowOptions?.height || 680
-
-  const minappWindow = new BrowserWindow({
-    width,
-    height,
-    autoHideMenuBar: true,
-    title: 'Cherry Studio',
-    ...windowOptions,
-    parent,
-    webPreferences: {
-      preload: join(__dirname, '../preload/minapp.js'),
-      sandbox: false,
-      contextIsolation: false
-    }
-  })
-
-  minappWindow.loadURL(url)
-
-  return minappWindow
-}

src/preload/index.d.ts

@@ -1,26 +1,29 @@
 import { ElectronAPI } from '@electron-toolkit/preload'
 import { FileType } from '@renderer/types'
 import { WebDavConfig } from '@renderer/types'
+import { AppInfo, LanguageVarious } from '@renderer/types'
 import type { OpenDialogOptions } from 'electron'
+import type { UpdateInfo } from 'electron-updater'
 import { Readable } from 'stream'
 
 declare global {
   interface Window {
     electron: ElectronAPI
     api: {
-      getAppInfo: () => Promise<{
-        version: string
-        isPackaged: boolean
-        appPath: string
-      }>
-      checkForUpdate: () => void
+      getAppInfo: () => Promise<AppInfo>
+      checkForUpdate: () => Promise<{ currentVersion: string; updateInfo: UpdateInfo | null }>
       openWebsite: (url: string) => void
       setProxy: (proxy: string | undefined) => void
+      setLanguage: (theme: LanguageVarious) => void
+      setTray: (isActive: boolean) => void
       setTheme: (theme: 'light' | 'dark') => void
       minApp: (options: { url: string; windowOptions?: Electron.BrowserWindowConstructorOptions }) => void
       reload: () => void
+      clearCache: () => Promise<{ success: boolean; error?: string }>
+      zip: {
         compress: (text: string) => Promise<Buffer>
         decompress: (text: Buffer) => Promise<string>
+      }
       backup: {
         backup: (fileName: string, data: string, destinationPath?: string) => Promise<Readable>
         restore: (backupPath: string) => Promise<string>
@@ -38,9 +41,22 @@ declare global {
         create: (fileName: string) => Promise<string>
         write: (filePath: string, data: Uint8Array | string) => Promise<void>
         open: (options?: OpenDialogOptions) => Promise<{ fileName: string; filePath: string; content: Buffer } | null>
-        save: (path: string, content: string | NodeJS.ArrayBufferView, options?: SaveDialogOptions) => void
+        save: (
+          path: string,
+          content: string | NodeJS.ArrayBufferView,
+          options?: SaveDialogOptions
+        ) => Promise<string | null>
         saveImage: (name: string, data: string) => void
         base64Image: (fileId: string) => Promise<{ mime: string; base64: string; data: string }>
+        download: (url: string) => Promise<FileType | null>
+        copy: (fileId: string, destPath: string) => Promise<void>
+      }
+      export: {
+        toWord: (markdown: string, fileName: string) => Promise<void>
+      }
+      openPath: (path: string) => Promise<void>
+      shortcuts: {
+        update: (shortcuts: Shortcut[]) => Promise<void>
       }
     }
   }

src/preload/index.ts

@@ -1,16 +1,23 @@
 import { electronAPI } from '@electron-toolkit/preload'
-import { WebDavConfig } from '@types'
+import { Shortcut, WebDavConfig } from '@types'
 import { contextBridge, ipcRenderer, OpenDialogOptions } from 'electron'
 
 // Custom APIs for renderer
 const api = {
-  getAppInfo: () => ipcRenderer.invoke('get-app-info'),
-  checkForUpdate: () => ipcRenderer.invoke('check-for-update'),
-  openWebsite: (url: string) => ipcRenderer.invoke('open-website', url),
-  setProxy: (proxy: string) => ipcRenderer.invoke('set-proxy', proxy),
-  setTheme: (theme: 'light' | 'dark') => ipcRenderer.invoke('set-theme', theme),
+  getAppInfo: () => ipcRenderer.invoke('app:info'),
+  reload: () => ipcRenderer.invoke('app:reload'),
+  setProxy: (proxy: string) => ipcRenderer.invoke('app:proxy', proxy),
+  checkForUpdate: () => ipcRenderer.invoke('app:check-for-update'),
+  setLanguage: (lang: string) => ipcRenderer.invoke('app:set-language', lang),
+  setTray: (isActive: boolean) => ipcRenderer.invoke('app:set-tray', isActive),
+  setTheme: (theme: 'light' | 'dark') => ipcRenderer.invoke('app:set-theme', theme),
+  openWebsite: (url: string) => ipcRenderer.invoke('open:website', url),
   minApp: (url: string) => ipcRenderer.invoke('minapp', url),
-  reload: () => ipcRenderer.invoke('reload'),
+  clearCache: () => ipcRenderer.invoke('app:clear-cache'),
+  zip: {
+    compress: (text: string) => ipcRenderer.invoke('zip:compress', text),
+    decompress: (text: Buffer) => ipcRenderer.invoke('zip:decompress', text)
+  },
   backup: {
     backup: (fileName: string, data: string, destinationPath?: string) =>
       ipcRenderer.invoke('backup:backup', fileName, data, destinationPath),
@@ -33,7 +40,16 @@ const api = {
       ipcRenderer.invoke('file:save', path, content, options),
     selectFolder: () => ipcRenderer.invoke('file:selectFolder'),
     saveImage: (name: string, data: string) => ipcRenderer.invoke('file:saveImage', name, data),
-    base64Image: (fileId: string) => ipcRenderer.invoke('file:base64Image', fileId)
+    base64Image: (fileId: string) => ipcRenderer.invoke('file:base64Image', fileId),
+    download: (url: string) => ipcRenderer.invoke('file:download', url),
+    copy: (fileId: string, destPath: string) => ipcRenderer.invoke('file:copy', fileId, destPath)
+  },
+  export: {
+    toWord: (markdown: string, fileName: string) => ipcRenderer.invoke('export:word', markdown, fileName)
+  },
+  openPath: (path: string) => ipcRenderer.invoke('open:path', path),
+  shortcuts: {
+    update: (shortcuts: Shortcut[]) => ipcRenderer.invoke('shortcuts:update', shortcuts)
   }
 }
 

src/renderer/index.html

@@ -1,16 +1,18 @@
 <!doctype html>
 <html lang="zh-CN">
+
 <head>
   <meta charset="UTF-8" />
   <meta name="viewport" content="initial-scale=1, width=device-width" />
-    <meta
-      http-equiv="Content-Security-Policy"
-      content="default-src 'self'; connect-src *; script-src 'self' *; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' *; font-src 'self' data: *; img-src 'self' data: file: *; frame-src * file:" />
+  <meta http-equiv="Content-Security-Policy"
+    content="default-src 'self'; connect-src blob: *; script-src 'self' 'unsafe-eval' *; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' *; font-src 'self' data: *; img-src 'self' data: file: * blob:; frame-src * file:" />
+
   <style>
     html,
     body {
       margin: 0;
     }
+
     #spinner {
       position: fixed;
       width: 100vw;
@@ -19,18 +21,21 @@
       flex-direction: row;
       justify-content: center;
       align-items: center;
-        background: rgba(255, 255, 255, 0.5);
     }
+
     #spinner img {
       width: 100px;
+      border-radius: 50px;
     }
   </style>
 </head>
+
 <body>
   <div id="root"></div>
   <div id="spinner">
-      <img src="/src/assets/images/logo/cherry-text.svg" />
+    <img src="/src/assets/images/logo.png" />
   </div>
   <script type="module" src="/src/main.tsx"></script>
 </body>
+
 </html>

src/renderer/src/App.tsx

@@ -8,12 +8,13 @@ import { PersistGate } from 'redux-persist/integration/react'
 import Sidebar from './components/app/Sidebar'
 import TopViewContainer from './components/TopView'
 import AntdProvider from './context/AntdProvider'
+import { SyntaxHighlighterProvider } from './context/SyntaxHighlighterProvider'
 import { ThemeProvider } from './context/ThemeProvider'
 import AgentsPage from './pages/agents/AgentsPage'
 import AppsPage from './pages/apps/AppsPage'
 import FilesPage from './pages/files/FilesPage'
-import HistoryPage from './pages/history/HistoryPage'
 import HomePage from './pages/home/HomePage'
+import PaintingsPage from './pages/paintings/PaintingsPage'
 import SettingsPage from './pages/settings/SettingsPage'
 import TranslatePage from './pages/translate/TranslatePage'
 
@@ -22,6 +23,7 @@ function App(): JSX.Element {
     <Provider store={store}>
       <ThemeProvider>
         <AntdProvider>
+          <SyntaxHighlighterProvider>
             <PersistGate loading={null} persistor={persistor}>
               <TopViewContainer>
                 <HashRouter>
@@ -30,14 +32,15 @@ function App(): JSX.Element {
                     <Route path="/" element={<HomePage />} />
                     <Route path="/files" element={<FilesPage />} />
                     <Route path="/agents" element={<AgentsPage />} />
+                    <Route path="/paintings" element={<PaintingsPage />} />
                     <Route path="/translate" element={<TranslatePage />} />
                     <Route path="/apps" element={<AppsPage />} />
-                  <Route path="/messages/*" element={<HistoryPage />} />
                     <Route path="/settings/*" element={<SettingsPage />} />
                   </Routes>
                 </HashRouter>
               </TopViewContainer>
             </PersistGate>
+          </SyntaxHighlighterProvider>
         </AntdProvider>
       </ThemeProvider>
     </Provider>

src/renderer/src/assets/fonts/icon-fonts/iconfont.css

@@ -1,6 +1,6 @@
 @font-face {
-  font-family: 'iconfont'; /* Project id 4563475 */
-  src: url('iconfont.woff2?t=1725606177995') format('woff2');
+  font-family: 'iconfont'; /* Project id 4753420 */
+  src: url('iconfont.woff2?t=1733224456443') format('woff2');
 }
 
 .iconfont {
@@ -11,6 +11,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-at1:before {
+  content: '\e7df';
+}
+
+.icon-at:before {
+  content: '\e630';
+}
+
 .icon-a-darkmode:before {
   content: '\e6cd';
 }
@@ -27,10 +35,6 @@
   content: '\e942';
 }
 
-.icon-grid-row-2copy:before {
-  content: '\e681';
-}
-
 .icon-inbox:before {
   content: '\e869';
 }
@@ -71,10 +75,6 @@
   content: '\e944';
 }
 
-.icon-a-addchat:before {
-  content: '\e658';
-}
-
 .icon-appstore:before {
   content: '\e792';
 }

src/renderer/src/assets/images/apps/bolt.svg

@@ -0,0 +1,18 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="16" height="16" rx="4" fill="black"/>
+<g filter="url(#filter0_i_2119_154)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.64368 11.7731C7.91976 11.7731 7.20901 11.5147 6.80099 10.9591L6.65707 11.6143L4 13L4.28684 11.6143L6.22186 3H8.59103L7.9066 6.03634C8.45941 5.44199 8.97273 5.22234 9.63083 5.22234C11.0523 5.22234 12 6.1397 12 7.81938C12 9.55074 10.9076 11.7731 8.64368 11.7731ZM9.55186 8.31036C9.55186 9.11144 8.97273 9.71871 8.22249 9.71871C7.8013 9.71871 7.4196 9.56366 7.16952 9.29233L7.53806 7.70309C7.81447 7.43176 8.13036 7.27671 8.49889 7.27671C9.06486 7.27671 9.55186 7.69017 9.55186 8.31036Z" fill="white"/>
+</g>
+<defs>
+<filter id="filter0_i_2119_154" x="4" y="3" width="8" height="10" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="0.0192413"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0.95 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_2119_154"/>
+</filter>
+</defs>
+</svg>

src/renderer/src/assets/images/paintings/image-size-1-1.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2.06667 4.73333C2.06667 3.26057 3.26057 2.06667 4.73333 2.06667H9V1H4.73333C2.67147 1 1 2.67147 1 4.73333V9H2.06667V4.73333ZM2.06667 15.2667C2.06667 16.7394 3.26057 17.9333 4.73333 17.9333H9V19H4.73333C2.67147 19 1 17.3285 1 15.2667V11H2.06667V15.2667ZM15.2667 2.06667C16.7394 2.06667 17.9333 3.26057 17.9333 4.73333V9H19V4.73333C19 2.67147 17.3285 1 15.2667 1H11V2.06667H15.2667ZM17.9333 15.2667C17.9333 16.7394 16.7394 17.9333 15.2667 17.9333H11V19H15.2667C17.3285 19 19 17.3285 19 15.2667V11H17.9333V15.2667Z" fill="#030712"/>
+</svg>

src/renderer/src/assets/images/paintings/image-size-1-2.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.93333 3.73333C4.93333 2.26057 5.978 1.06667 7.26667 1.06667H9V0H7.26667C5.46254 0 4 1.67147 4 3.73333V8H4.93333V3.73333ZM4.93333 16.2667C4.93333 17.7394 5.978 18.9333 7.26667 18.9333H9V20H7.26667C5.46254 20 4 18.3285 4 16.2667V12H4.93333V16.2667ZM13.7333 1.06667C15.022 1.06667 16.0667 2.26057 16.0667 3.73333V8H17V3.73333C17 1.67147 15.5375 0 13.7333 0H12V1.06667H13.7333ZM16.0667 16.2667C16.0667 17.7394 15.022 18.9333 13.7333 18.9333H12V20H13.7333C15.5375 20 17 18.3285 17 16.2667V12H16.0667V16.2667Z" fill="#030712"/>
+</svg>

src/renderer/src/assets/images/paintings/image-size-16-9.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.06667 7.26667C1.06667 5.978 2.26057 4.93333 3.73333 4.93333H8V4H3.73333C1.67147 4 0 5.46254 0 7.26667V9H1.06667V7.26667ZM1.06667 11.2667C1.06667 12.7394 2.26057 13.9333 3.73333 13.9333H8V15H3.73333C1.67147 15 0 13.3285 0 11.2667V10H1.06667V11.2667ZM16.2667 4.93333C17.7394 4.93333 18.9333 5.978 18.9333 7.26667V9H20V7.26667C20 5.46254 18.3285 4 16.2667 4H12V4.93333H16.2667ZM18.9333 11.2667C18.9333 12.7394 17.7394 13.9333 16.2667 13.9333H12V15H16.2667C18.3285 15 20 13.3285 20 11.2667V10H18.9333V11.2667Z" fill="#030712"/>
+</svg>

src/renderer/src/assets/images/paintings/image-size-3-2.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.06667 5.26667C1.06667 3.978 2.26057 2.93333 3.73333 2.93333H8V2H3.73333C1.67147 2 0 3.46254 0 5.26667V9H1.06667V5.26667ZM1.06667 14.7333C1.06667 16.022 2.26057 17.0667 3.73333 17.0667H8V18H3.73333C1.67147 18 0 16.5375 0 14.7333V11H1.06667V14.7333ZM16.2667 2.93333C17.7394 2.93333 18.9333 3.978 18.9333 5.26667V9H20V5.26667C20 3.46254 18.3285 2 16.2667 2H12V2.93333H16.2667ZM18.9333 14.7333C18.9333 16.022 17.7394 17.0667 16.2667 17.0667H12V18H16.2667C18.3285 18 20 16.5375 20 14.7333V11H18.9333V14.7333Z" fill="#030712"/>
+</svg>

src/renderer/src/assets/images/paintings/image-size-3-4.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2.93333 3.73333C2.93333 2.26057 3.978 1.06667 5.26667 1.06667H9V0H5.26667C3.46254 0 2 1.67147 2 3.73333V8H2.93333V3.73333ZM2.93333 16.2667C2.93333 17.7394 3.978 18.9333 5.26667 18.9333H9V20H5.26667C3.46254 20 2 18.3285 2 16.2667V12H2.93333V16.2667ZM14.7333 1.06667C16.022 1.06667 17.0667 2.26057 17.0667 3.73333V8H18V3.73333C18 1.67147 16.5375 0 14.7333 0H11V1.06667H14.7333ZM17.0667 16.2667C17.0667 17.7394 16.022 18.9333 14.7333 18.9333H11V20H14.7333C16.5375 20 18 18.3285 18 16.2667V12H17.0667V16.2667Z" fill="#030712"/>
+</svg>

src/renderer/src/assets/images/paintings/image-size-9-16.svg

@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M5.93333 3.73333C5.93333 2.26057 6.978 1.06667 8.26667 1.06667H10V0H8.26667C6.46254 0 5 1.67147 5 3.73333V8H5.93333V3.73333ZM5.93333 16.2667C5.93333 17.7394 6.978 18.9333 8.26667 18.9333H10V20H8.26667C6.46254 20 5 18.3285 5 16.2667V12H5.93333V16.2667ZM12.7333 1.06667C14.022 1.06667 15.0667 2.26057 15.0667 3.73333V8H16V3.73333C16 1.67147 14.5375 0 12.7333 0H11V1.06667H12.7333ZM15.0667 16.2667C15.0667 17.7394 14.022 18.9333 12.7333 18.9333H11V20H12.7333C14.5375 20 16 18.3285 16 16.2667V12H15.0667V16.2667Z" fill="#030712"/>
+</svg>

src/renderer/src/assets/styles/ant.scss

@@ -1,11 +1,13 @@
-#inputbar .ant-input {
+#inputbar {
   resize: none;
 }
 
-.chat-nav-dropdown {
-  .ant-dropdown-menu {
-    padding-bottom: 12px;
+.ant-image-preview-switch-left {
+  -webkit-app-region: no-drag;
 }
+
+.ant-btn:not(:disabled):focus-visible {
+  outline: none;
 }
 
 .ant-segmented-group {
@@ -40,35 +42,6 @@
   -webkit-app-region: no-drag;
 }
 
-.segmented-tab {
-  .ant-segmented-item {
-    overflow: hidden;
-  }
-  .ant-segmented-item-selected {
-    background-color: var(--color-background-mute);
-  }
-  .ant-segmented-item-label {
-    align-items: center;
-    display: flex;
-    flex-direction: row;
-    justify-content: center;
-    font-size: 13px;
-  }
-  .iconfont {
-    font-size: 13px;
-    margin-left: -2px;
-  }
-  .anticon-setting {
-    font-size: 12px;
-  }
-  .icon-business-smart-assistant {
-    margin-right: -2px;
-  }
-  .ant-segmented-item-icon + * {
-    margin-left: 4px;
-  }
-}
-
 .message-attachments {
   .ant-upload-list-item:hover {
     background-color: initial !important;

src/renderer/src/assets/styles/index.scss

@@ -1,6 +1,6 @@
 @import './markdown.scss';
-@import './scrollbar.scss';
 @import './ant.scss';
+@import './scrollbar.scss';
 @import '../fonts/icon-fonts/iconfont.css';
 @import '../fonts/ubuntu/ubuntu.css';
 
@@ -9,9 +9,9 @@
   --color-white-soft: rgba(255, 255, 255, 0.8);
   --color-white-mute: rgba(255, 255, 255, 0.94);
 
-  --color-black: #181818;
-  --color-black-soft: #202020;
-  --color-black-mute: #262626;
+  --color-black: #151515;
+  --color-black-soft: #222222;
+  --color-black-mute: #333333;
 
   --color-gray-1: #515c67;
   --color-gray-2: #414853;
@@ -32,15 +32,16 @@
   --color-text: var(--color-text-1);
   --color-icon: #ffffff99;
   --color-icon-white: #ffffff;
-  --color-border: #ffffff24;
-  --color-border-soft: #ffffff20;
+  --color-border: #ffffff22;
+  --color-border-soft: #ffffff11;
+  --color-border-mute: #ffffff11;
   --color-error: #f44336;
   --color-link: #1677ff;
   --color-code-background: #323232;
-  --color-scrollbar-thumb: rgba(255, 255, 255, 0.08);
-  --color-scrollbar-thumb-hover: rgba(255, 255, 255, 0.15);
   --color-hover: rgba(40, 40, 40, 1);
   --color-active: rgba(55, 55, 55, 1);
+  --color-frame-border: #333;
+  --color-group-background: var(--color-background-soft);
 
   --navbar-background-mac: rgba(30, 30, 30, 0.6);
   --navbar-background: rgba(30, 30, 30);
@@ -48,11 +49,16 @@
   --navbar-height: 40px;
   --sidebar-width: 50px;
   --status-bar-height: 40px;
-  --input-bar-height: 85px;
+  --input-bar-height: 100px;
 
   --assistants-width: 275px;
   --topic-list-width: 275px;
   --settings-width: 250px;
+
+  --chat-background: #111111;
+  --chat-background-user: #28b561;
+  --chat-background-assistant: #2c2c2c;
+  --chat-text-user: var(--color-black);
 }
 
 body[theme-mode='light'] {
@@ -84,17 +90,23 @@ body[theme-mode='light'] {
   --color-icon: #00000099;
   --color-icon-white: #000000;
   --color-border: #00000028;
-  --color-border-soft: #00000028;
+  --color-border-soft: #00000020;
+  --color-border-mute: #00000010;
   --color-error: #f44336;
   --color-link: #1677ff;
   --color-code-background: #e3e3e3;
-  --color-scrollbar-thumb: rgba(0, 0, 0, 0.08);
-  --color-scrollbar-thumb-hover: rgba(0, 0, 0, 0.15);
   --color-hover: var(--color-white-mute);
   --color-active: var(--color-white-soft);
+  --color-frame-border: #ddd;
+  --color-group-background: var(--color-white);
 
   --navbar-background-mac: rgba(255, 255, 255, 0.6);
   --navbar-background: rgba(255, 255, 255);
+
+  --chat-background: #f3f3f3;
+  --chat-background-user: #95ec69;
+  --chat-background-assistant: #ffffff;
+  --chat-text-user: var(--color-text);
 }
 
 *,
@@ -140,6 +152,7 @@ html,
 body,
 #root {
   height: 100%;
+  width: 100%;
   margin: 0;
 }
 
@@ -158,11 +171,9 @@ body,
 
 body[os='mac'] {
   #content-container {
-    border-top-left-radius: 10px;
-    border-bottom-left-radius: 10px;
-    border-top-right-radius: 10px;
+    border-top-left-radius: 12px;
     border-left: 0.5px solid var(--color-border);
-    box-shadow: 0 0 15px 1px rgba(0, 0, 0, 0.05);
+    box-shadow: -2px 0px 20px -4px rgba(0, 0, 0, 0.08);
   }
 }
 
@@ -193,7 +204,51 @@ body[os='windows'] {
 }
 
 .text-nowrap {
-  white-space: nowrap;
+  display: -webkit-box !important;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
   overflow: hidden;
   text-overflow: ellipsis;
+  white-space: normal;
+  word-wrap: break-word;
+}
+
+.bubble {
+  background-color: var(--chat-background);
+  #chat-main {
+    background-color: var(--chat-background);
+  }
+  #messages {
+    background-color: var(--chat-background);
+  }
+  #inputbar {
+    border-radius: 0;
+    margin: 0;
+    border: none;
+    border-top: 1px solid var(--color-border-mute);
+    background: var(--color-background);
+  }
+  .system-prompt {
+    background-color: var(--chat-background-assistant);
+  }
+  .message-content-container {
+    margin: 5px 0;
+    border-radius: 8px;
+    padding: 10px 15px 0 15px;
+  }
+  .message-user {
+    color: var(--chat-text-user);
+    .markdown,
+    .anticon,
+    .iconfont,
+    .message-tokens {
+      color: var(--chat-text-user) !important;
+    }
+    .message-action-button:hover {
+      background-color: var(--color-white-soft);
+    }
+  }
+  code {
+    color: var(--color-text);
+  }
 }

src/renderer/src/assets/styles/markdown.scss

@@ -55,6 +55,8 @@
 
   p {
     margin: 1em 0;
+    white-space: pre-wrap;
+
     &:last-child {
       margin-bottom: 5px;
     }
@@ -93,12 +95,7 @@
   }
 
   span {
-    word-break: break-all;
-  }
-
-  code {
-    white-space: pre-wrap !important;
-    font-family: 'Courier New', Courier, monospace;
+    white-space: pre;
   }
 
   p code,
@@ -106,14 +103,22 @@
     background: var(--color-background-mute);
     padding: 3px 5px;
     border-radius: 5px;
+    word-break: keep-all;
+    white-space: pre;
+  }
+
+  code {
+    font-family: 'Cascadia Code', 'Fira Code', 'Consolas', monospace;
   }
 
   pre {
-    white-space: pre-wrap !important;
     border-radius: 5px;
     overflow-x: auto;
     font-family: 'Fira Code', 'Courier New', Courier, monospace;
     background-color: var(--color-background-mute);
+    &:has(> .mermaid) {
+      background-color: transparent;
+    }
     &:not(pre pre) {
       > code:not(pre pre > code) {
         padding: 15px;

src/renderer/src/assets/styles/scrollbar.scss

@@ -1,7 +1,21 @@
+:root {
+  --color-scrollbar-thumb: rgba(255, 255, 255, 0.15);
+  --color-scrollbar-thumb-hover: rgba(255, 255, 255, 0.2);
+  --color-scrollbar-thumb-right: rgba(255, 255, 255, 0.18);
+  --color-scrollbar-thumb-right-hover: rgba(255, 255, 255, 0.25);
+}
+
+body[theme-mode='light'] {
+  --color-scrollbar-thumb: rgba(0, 0, 0, 0.15);
+  --color-scrollbar-thumb-hover: rgba(0, 0, 0, 0.2);
+  --color-scrollbar-thumb-right: rgba(0, 0, 0, 0.18);
+  --color-scrollbar-thumb-right-hover: rgba(0, 0, 0, 0.25);
+}
+
 /* 全局初始化滚动条样式 */
 ::-webkit-scrollbar {
-  width: 2px;
-  height: 2px;
+  width: 6px;
+  height: 6px;
 }
 
 ::-webkit-scrollbar-track {
@@ -9,8 +23,17 @@
 }
 
 ::-webkit-scrollbar-thumb {
+  border-radius: 10px;
   background: var(--color-scrollbar-thumb);
   &:hover {
     background: var(--color-scrollbar-thumb-hover);
   }
 }
+
+pre::-webkit-scrollbar-thumb {
+  border-radius: 0;
+  background: rgba(0, 0, 0, 0.08);
+  &:hover {
+    background: rgba(0, 0, 0, 0.15);
+  }
+}

src/renderer/src/components/AssistantSettings/AssistantMessagesSettings.tsx

@@ -0,0 +1,160 @@
+import { DeleteOutlined, PlusOutlined } from '@ant-design/icons'
+import { Assistant, AssistantMessage, AssistantSettings } from '@renderer/types'
+import { Button, Card, Col, Divider, Form as FormAntd, FormInstance, Row, Space, Switch } from 'antd'
+import TextArea from 'antd/es/input/TextArea'
+import { FC, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import styled from 'styled-components'
+
+interface Props {
+  assistant: Assistant
+  updateAssistant: (assistant: Assistant) => void
+  updateAssistantSettings: (settings: Partial<AssistantSettings>) => void
+}
+
+const AssistantMessagesSettings: FC<Props> = ({ assistant, updateAssistant, updateAssistantSettings }) => {
+  const { t } = useTranslation()
+  const [form] = Form.useForm()
+  const formRef = useRef<FormInstance>(null)
+  const [messages, setMessagess] = useState<AssistantMessage[]>(assistant?.messages || [])
+  const [hideMessages, setHideMessages] = useState(assistant?.settings?.hideMessages || false)
+
+  const showSaveButton = (assistant?.messages || []).length !== messages.length
+
+  const onSave = () => {
+    // 检查是否有空对话组
+    for (let i = 0; i < messages.length; i += 2) {
+      const userContent = messages[i].content.trim()
+      const assistantContent = messages[i + 1]?.content.trim()
+      if (userContent === '' || assistantContent === '') {
+        window.modal.error({
+          centered: true,
+          content: t('agents.edit.message.empty.content')
+        })
+        return
+      }
+    }
+
+    // 过滤掉空消息并将消息分组
+    const filteredMessagess = messages.reduce((acc, conv, index) => {
+      if (index % 2 === 0) {
+        const userContent = conv.content.trim()
+        const assistantContent = messages[index + 1]?.content.trim()
+        if (userContent !== '' || assistantContent !== '') {
+          acc.push({ role: 'user', content: userContent }, { role: 'assistant', content: assistantContent })
+        }
+      }
+      return acc
+    }, [] as AssistantMessage[])
+
+    updateAssistant({
+      ...assistant,
+      messages: filteredMessagess
+    })
+
+    window.message.success({ content: t('message.save.success.title'), key: 'save-messages' })
+  }
+
+  const addMessages = () => {
+    setMessagess([...messages, { role: 'user', content: '' }, { role: 'assistant', content: '' }])
+  }
+
+  const updateMessages = (index: number, role: 'user' | 'assistant', content: string) => {
+    const newMessagess = [...messages]
+    newMessagess[index] = { role, content }
+    setMessagess(newMessagess)
+  }
+
+  const deleteMessages = (index: number) => {
+    const newMessagess = [...messages]
+    newMessagess.splice(index, 2) // 删除用户和助手的对话
+    setMessagess(newMessagess)
+  }
+
+  return (
+    <Container>
+      <Form ref={formRef} layout="vertical" form={form} labelAlign="right" colon={false}>
+        <Form.Item label={t('agents.edit.settings.hide_preset_messages')}>
+          <Switch
+            checked={hideMessages}
+            onChange={(checked) => {
+              setHideMessages(checked)
+              updateAssistantSettings({ hideMessages: checked })
+            }}
+          />
+        </Form.Item>
+        <Divider style={{ marginBottom: 15 }} />
+        <Form.Item label={t('agents.edit.message.group.title')}>
+          {messages.map(
+            (_, index) =>
+              index % 2 === 0 && (
+                <Card
+                  size="small"
+                  key={index}
+                  style={{ marginBottom: 16 }}
+                  title={`${t('agents.edit.message.group.title')} #${index / 2 + 1}`}
+                  extra={<Button icon={<DeleteOutlined />} type="text" danger onClick={() => deleteMessages(index)} />}>
+                  <Row gutter={16} align="middle" style={{ marginBottom: 16 }}>
+                    <Col span={3}>
+                      <label>{t('agents.edit.message.user.title')}</label>
+                    </Col>
+                    <Col span={21}>
+                      <TextArea
+                        value={messages[index].content}
+                        onChange={(e) => updateMessages(index, 'user', e.target.value)}
+                        placeholder={t('agents.edit.message.user.placeholder')}
+                        rows={1}
+                      />
+                    </Col>
+                  </Row>
+                  <Row gutter={16} align="top">
+                    <Col span={3}>
+                      <label>{t('agents.edit.message.assistant.title')}</label>
+                    </Col>
+                    <Col span={21}>
+                      <TextArea
+                        value={messages[index + 1]?.content || ''}
+                        onChange={(e) => updateMessages(index + 1, 'assistant', e.target.value)}
+                        placeholder={t('agents.edit.message.assistant.placeholder')}
+                        rows={3}
+                      />
+                    </Col>
+                  </Row>
+                </Card>
+              )
+          )}
+          <Space>
+            <Button icon={<PlusOutlined />} onClick={addMessages}>
+              {t('agents.edit.message.add.title')}
+            </Button>
+          </Space>
+        </Form.Item>
+        <Divider style={{ marginBottom: 15 }} />
+        <Form.Item>
+          {showSaveButton && (
+            <Button type="primary" onClick={onSave}>
+              {t('common.save')}
+            </Button>
+          )}
+        </Form.Item>
+      </Form>
+      <div style={{ minHeight: 50 }} />
+    </Container>
+  )
+}
+
+const Container = styled.div`
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  height: 100%;
+  padding-top: 10px;
+`
+
+const Form = styled(FormAntd)`
+  .ant-form-item-no-colon {
+    font-weight: 500;
+  }
+`
+
+export default AssistantMessagesSettings

src/renderer/src/components/AssistantSettings/AssistantModelSettings.tsx

@@ -1,118 +1,200 @@
-import { QuestionCircleOutlined } from '@ant-design/icons'
+import { PlusOutlined, QuestionCircleOutlined } from '@ant-design/icons'
 import { HStack } from '@renderer/components/Layout'
-import { DEFAULT_CONEXTCOUNT, DEFAULT_MAX_TOKENS, DEFAULT_TEMPERATURE } from '@renderer/config/constant'
-import { useAssistant } from '@renderer/hooks/useAssistant'
-import { SettingRow, SettingRowTitle } from '@renderer/pages/settings'
+import { DEFAULT_CONTEXTCOUNT, DEFAULT_TEMPERATURE } from '@renderer/config/constant'
+import { SettingRow } from '@renderer/pages/settings'
 import { Assistant, AssistantSettings } from '@renderer/types'
-import { Button, Col, Row, Slider, Switch, Tooltip } from 'antd'
-import { FC, useEffect, useState } from 'react'
+import { Button, Col, Divider, InputNumber, Row, Slider, Switch, Tooltip } from 'antd'
+import { FC, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
+import ModelAvatar from '../Avatar/ModelAvatar'
+import SelectModelPopup from '../Popups/SelectModelPopup'
+
 interface Props {
   assistant: Assistant
+  updateAssistant: (assistant: Assistant) => void
+  updateAssistantSettings: (settings: Partial<AssistantSettings>) => void
 }
 
-const AssistantModelSettings: FC<Props> = (props) => {
-  const { assistant, updateAssistantSettings, updateAssistant } = useAssistant(props.assistant.id)
+const AssistantModelSettings: FC<Props> = ({ assistant, updateAssistant, updateAssistantSettings }) => {
   const [temperature, setTemperature] = useState(assistant?.settings?.temperature ?? DEFAULT_TEMPERATURE)
-  const [contextCount, setConextCount] = useState(assistant?.settings?.contextCount ?? DEFAULT_CONEXTCOUNT)
+  const [contextCount, setContextCount] = useState(assistant?.settings?.contextCount ?? DEFAULT_CONTEXTCOUNT)
   const [enableMaxTokens, setEnableMaxTokens] = useState(assistant?.settings?.enableMaxTokens ?? false)
   const [maxTokens, setMaxTokens] = useState(assistant?.settings?.maxTokens ?? 0)
+  const [autoResetModel, setAutoResetModel] = useState(assistant?.settings?.autoResetModel ?? false)
   const [streamOutput, setStreamOutput] = useState(assistant?.settings?.streamOutput ?? true)
+  const [defaultModel, setDefaultModel] = useState(assistant?.defaultModel)
+  const [topP, setTopP] = useState(assistant?.settings?.topP ?? 1)
   const { t } = useTranslation()
 
-  const onUpdateAssistantSettings = (settings: Partial<AssistantSettings>) => {
-    updateAssistantSettings({
-      temperature: settings.temperature ?? temperature,
-      contextCount: settings.contextCount ?? contextCount,
-      enableMaxTokens: settings.enableMaxTokens ?? enableMaxTokens,
-      maxTokens: settings.maxTokens ?? maxTokens,
-      streamOutput: settings.streamOutput ?? streamOutput
-    })
-  }
-
   const onTemperatureChange = (value) => {
     if (!isNaN(value as number)) {
-      onUpdateAssistantSettings({ temperature: value })
+      updateAssistantSettings({ temperature: value })
     }
   }
 
-  const onConextCountChange = (value) => {
+  const onContextCountChange = (value) => {
     if (!isNaN(value as number)) {
-      onUpdateAssistantSettings({ contextCount: value })
+      updateAssistantSettings({ contextCount: value })
     }
   }
 
   const onMaxTokensChange = (value) => {
     if (!isNaN(value as number)) {
-      onUpdateAssistantSettings({ maxTokens: value })
+      updateAssistantSettings({ maxTokens: value })
+    }
+  }
+
+  const onTopPChange = (value) => {
+    if (!isNaN(value as number)) {
+      updateAssistantSettings({ topP: value })
     }
   }
 
   const onReset = () => {
     setTemperature(DEFAULT_TEMPERATURE)
-    setConextCount(DEFAULT_CONEXTCOUNT)
-    updateAssistant({
-      ...assistant,
-      settings: {
-        ...assistant.settings,
+    setContextCount(DEFAULT_CONTEXTCOUNT)
+    setEnableMaxTokens(false)
+    setMaxTokens(0)
+    setStreamOutput(true)
+    setTopP(1)
+    updateAssistantSettings({
       temperature: DEFAULT_TEMPERATURE,
-        contextCount: DEFAULT_CONEXTCOUNT,
+      contextCount: DEFAULT_CONTEXTCOUNT,
       enableMaxTokens: false,
-        maxTokens: DEFAULT_MAX_TOKENS,
-        streamOutput: true
-      }
+      maxTokens: 0,
+      streamOutput: true,
+      topP: 1
     })
   }
 
-  useEffect(() => {
-    setTemperature(assistant?.settings?.temperature ?? DEFAULT_TEMPERATURE)
-    setConextCount(assistant?.settings?.contextCount ?? DEFAULT_CONEXTCOUNT)
-    setEnableMaxTokens(assistant?.settings?.enableMaxTokens ?? false)
-    setMaxTokens(assistant?.settings?.maxTokens ?? DEFAULT_MAX_TOKENS)
-    setStreamOutput(assistant?.settings?.streamOutput ?? true)
-  }, [assistant])
+  const onSelectModel = async () => {
+    const selectedModel = await SelectModelPopup.show({ model: assistant?.model })
+    if (selectedModel) {
+      setDefaultModel(selectedModel)
+      updateAssistant({
+        ...assistant,
+        defaultModel: selectedModel
+      })
+    }
+  }
 
   return (
     <Container>
+      <Row align="middle" style={{ marginBottom: 10 }}>
+        <Label style={{ marginBottom: 10 }}>{t('assistants.settings.default_model')}</Label>
+        <Col span={24}>
+          <HStack alignItems="center">
+            <Button
+              icon={defaultModel ? <ModelAvatar model={defaultModel} size={20} /> : <PlusOutlined />}
+              onClick={onSelectModel}>
+              {defaultModel ? defaultModel.name : t('agents.edit.model.select.title')}
+            </Button>
+          </HStack>
+        </Col>
+      </Row>
+      <Divider style={{ margin: '10px 0' }} />
+      <SettingRow style={{ minHeight: 30 }}>
+        <Label>
+          {t('assistants.settings.auto_reset_model')}{' '}
+          <Tooltip title={t('assistants.settings.auto_reset_model.tip')}>
+            <QuestionIcon />
+          </Tooltip>
+        </Label>
+        <Switch
+          value={autoResetModel}
+          onChange={(checked) => {
+            setAutoResetModel(checked)
+            updateAssistantSettings({ autoResetModel: checked })
+          }}
+        />
+      </SettingRow>
+      <Divider style={{ margin: '10px 0' }} />
       <Row align="middle">
         <Label>{t('chat.settings.temperature')}</Label>
         <Tooltip title={t('chat.settings.temperature.tip')}>
           <QuestionIcon />
         </Tooltip>
       </Row>
-      <Row align="middle" gutter={10}>
-        <Col span={24}>
+      <Row align="middle" gutter={20}>
+        <Col span={21}>
           <Slider
             min={0}
             max={2}
             onChange={setTemperature}
             onChangeComplete={onTemperatureChange}
             value={typeof temperature === 'number' ? temperature : 0}
+            marks={{ 0: '0', 0.7: '0.7', 2: '2' }}
             step={0.1}
           />
         </Col>
+        <Col span={3}>
+          <InputNumber
+            min={0}
+            max={2}
+            step={0.1}
+            value={temperature}
+            onChange={onTemperatureChange}
+            style={{ width: '100%' }}
+          />
+        </Col>
       </Row>
       <Row align="middle">
-        <Label>{t('chat.settings.conext_count')}</Label>
-        <Tooltip title={t('chat.settings.conext_count.tip')}>
+        <Label>{t('chat.settings.top_p')}</Label>
+        <Tooltip title={t('chat.settings.top_p.tip')}>
           <QuestionIcon />
         </Tooltip>
       </Row>
-      <Row align="middle" gutter={10}>
-        <Col span={24}>
+      <Row align="middle" gutter={20}>
+        <Col span={21}>
+          <Slider
+            min={0}
+            max={1}
+            onChange={setTopP}
+            onChangeComplete={onTopPChange}
+            value={typeof topP === 'number' ? topP : 1}
+            marks={{ 0: '0', 1: '1' }}
+            step={0.1}
+          />
+        </Col>
+        <Col span={3}>
+          <InputNumber min={0} max={1} step={0.01} value={topP} onChange={onTopPChange} style={{ width: '100%' }} />
+        </Col>
+      </Row>
+      <Row align="middle">
+        <Label>
+          {t('chat.settings.context_count')}{' '}
+          <Tooltip title={t('chat.settings.context_count.tip')}>
+            <QuestionIcon />
+          </Tooltip>
+        </Label>
+      </Row>
+      <Row align="middle" gutter={20}>
+        <Col span={21}>
           <Slider
             min={0}
             max={20}
-            onChange={setConextCount}
-            onChangeComplete={onConextCountChange}
+            onChange={setContextCount}
+            onChangeComplete={onContextCountChange}
             value={typeof contextCount === 'number' ? contextCount : 0}
+            marks={{ 0: '0', 5: '5', 10: '10', 15: '15', 20: t('chat.settings.max') }}
             step={1}
           />
         </Col>
+        <Col span={3}>
+          <InputNumber
+            min={0}
+            max={20}
+            step={1}
+            value={contextCount}
+            onChange={onContextCountChange}
+            style={{ width: '100%' }}
+          />
+        </Col>
       </Row>
-      <Row align="middle" justify="space-between">
+      <Divider style={{ margin: '10px 0' }} />
+      <SettingRow style={{ minHeight: 30 }}>
         <HStack alignItems="center">
           <Label>{t('chat.settings.max_tokens')}</Label>
           <Tooltip title={t('chat.settings.max_tokens.tip')}>
@@ -123,12 +205,13 @@ const AssistantModelSettings: FC<Props> = (props) => {
           checked={enableMaxTokens}
           onChange={(enabled) => {
             setEnableMaxTokens(enabled)
-            onUpdateAssistantSettings({ enableMaxTokens: enabled })
+            updateAssistantSettings({ enableMaxTokens: enabled })
           }}
         />
-      </Row>
-      <Row align="middle" gutter={10}>
-        <Col span={24}>
+      </SettingRow>
+      {enableMaxTokens && (
+        <Row align="middle" gutter={20}>
+          <Col span={21}>
             <Slider
               disabled={!enableMaxTokens}
               min={0}
@@ -137,22 +220,38 @@ const AssistantModelSettings: FC<Props> = (props) => {
               onChangeComplete={onMaxTokensChange}
               value={typeof maxTokens === 'number' ? maxTokens : 0}
               step={100}
+              marks={{
+                0: '0',
+                32000: t('chat.settings.max')
+              }}
+            />
+          </Col>
+          <Col span={3}>
+            <InputNumber
+              disabled={!enableMaxTokens}
+              min={0}
+              max={32000}
+              step={100}
+              value={maxTokens}
+              onChange={onMaxTokensChange}
+              style={{ width: '100%' }}
             />
           </Col>
         </Row>
-      <SettingRow>
-        <SettingRowTitleSmall>{t('model.stream_output')}</SettingRowTitleSmall>
+      )}
+      <Divider style={{ margin: '10px 0' }} />
+      <SettingRow style={{ minHeight: 30 }}>
+        <Label>{t('model.stream_output')}</Label>
         <Switch
           checked={streamOutput}
           onChange={(checked) => {
             setStreamOutput(checked)
-            onUpdateAssistantSettings({ streamOutput: checked })
+            updateAssistantSettings({ streamOutput: checked })
           }}
         />
       </SettingRow>
-      <HStack
-        justifyContent="flex-end"
-        style={{ marginTop: 20, padding: '10px 0', borderTop: '0.5px solid var(--color-border)' }}>
+      <Divider style={{ margin: '15px 0' }} />
+      <HStack justifyContent="flex-end">
         <Button onClick={onReset} style={{ width: 80 }} danger type="primary">
           {t('chat.settings.reset')}
         </Button>
@@ -166,12 +265,12 @@ const Container = styled.div`
   flex: 1;
   flex-direction: column;
   overflow: hidden;
-  padding-bottom: 10px;
+  padding: 5px;
 `
 
 const Label = styled.p`
-  margin: 0;
   margin-right: 5px;
+  font-weight: 500;
 `
 
 const QuestionIcon = styled(QuestionCircleOutlined)`
@@ -180,8 +279,4 @@ const QuestionIcon = styled(QuestionCircleOutlined)`
   color: var(--color-text-3);
 `
 
-const SettingRowTitleSmall = styled(SettingRowTitle)`
-  font-size: 13px;
-`
-
 export default AssistantModelSettings

src/renderer/src/components/AssistantSettings/AssistantPromptSettings.tsx

@@ -1,15 +1,20 @@
-import { useAssistant } from '@renderer/hooks/useAssistant'
-import { syncAsistantToAgent } from '@renderer/services/assistant'
-import { Assistant } from '@renderer/types'
-import { Input } from 'antd'
+import { Assistant, AssistantSettings } from '@renderer/types'
+import { Button, Input } from 'antd'
 import TextArea from 'antd/es/input/TextArea'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import styled from 'styled-components'
 
-import { Box, VStack } from '../Layout'
+import { Box, HStack } from '../Layout'
 
-const AssistantPromptSettings: React.FC<{ assistant: Assistant }> = (props) => {
-  const { assistant, updateAssistant } = useAssistant(props.assistant.id)
+interface Props {
+  assistant: Assistant
+  updateAssistant: (assistant: Assistant) => void
+  updateAssistantSettings: (settings: AssistantSettings) => void
+  onOk: () => void
+}
+
+const AssistantPromptSettings: React.FC<Props> = ({ assistant, updateAssistant, onOk }) => {
   const [name, setName] = useState(assistant.name)
   const [prompt, setPrompt] = useState(assistant.prompt)
   const { t } = useTranslation()
@@ -17,19 +22,20 @@ const AssistantPromptSettings: React.FC<{ assistant: Assistant }> = (props) => {
   const onUpdate = () => {
     const _assistant = { ...assistant, name, prompt }
     updateAssistant(_assistant)
-    syncAsistantToAgent(_assistant)
   }
 
   return (
-    <VStack flex={1}>
-      <Box mb={8}>{t('common.name')}</Box>
+    <Container>
+      <Box mb={8} style={{ fontWeight: 'bold' }}>
+        {t('common.name')}
+      </Box>
       <Input
         placeholder={t('common.assistant') + t('common.name')}
         value={name}
         onChange={(e) => setName(e.target.value)}
         onBlur={onUpdate}
       />
-      <Box mt={8} mb={8}>
+      <Box mt={8} mb={8} style={{ fontWeight: 'bold' }}>
         {t('common.prompt')}
       </Box>
       <TextArea
@@ -38,10 +44,23 @@ const AssistantPromptSettings: React.FC<{ assistant: Assistant }> = (props) => {
         value={prompt}
         onChange={(e) => setPrompt(e.target.value)}
         onBlur={onUpdate}
-        style={{ minHeight: 'calc(80vh - 150px)', maxHeight: 'calc(80vh - 150px)' }}
+        style={{ minHeight: 'calc(80vh - 200px)', maxHeight: 'calc(80vh - 150px)' }}
       />
-    </VStack>
+      <HStack width="100%" justifyContent="flex-end" mt="10px">
+        <Button type="primary" onClick={onOk}>
+          {t('common.close')}
+        </Button>
+      </HStack>
+    </Container>
   )
 }
 
+const Container = styled.div`
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  overflow: hidden;
+  padding: 5px;
+`
+
 export default AssistantPromptSettings