chore(version): 1.0.0

* fix: 长对话Notion导出失败(分页导出)

* feat: 添加Notion导出自动分页设置

.eslintrc.cjs

@@ -16,6 +16,7 @@ module.exports = {
     'react/prop-types': 'off',
     'simple-import-sort/imports': 'error',
     'simple-import-sort/exports': 'error',
-    'react/no-is-mounted': 'off'
+    'react/no-is-mounted': 'off',
+    'prettier/prettier': ['error', { endOfLine: 'auto' }]
   }
 }

.github/ISSUE_TEMPLATE/#1_feature_request.yml

@@ -1,38 +0,0 @@
-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/0_bug_report.yml

@@ -6,7 +6,22 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to fill out this bug report!
+        Thank you for taking the time to fill out this bug report!
+        Before submitting this issue, please make sure that you have understood the [FAQ](https://docs.cherry-ai.com/question-contact/questions) and [Knowledge Science](https://docs.cherry-ai.com/question-contact/knowledge)
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Issue Checklist
+      description: |
+        Before submitting an issue, please make sure you have completed the following steps
+      options:
+        - label: I understand that issues are for feedback and problem solving, not for complaining in the comment section, and will provide as much information as possible to help solve the problem.
+          required: true
+        - label: I've looked at pinned issues and searched for existing [Open Issues](https://github.com/CherryHQ/cherry-studio/issues), [Closed Issues](https://github.com/CherryHQ/cherry-studio/issues?q=is%3Aissue%20state%3Aclosed), and [Discussions](https://github.com/CherryHQ/cherry-studio/discussions), no similar issue or discussion was found.
+          required: true
+        - label: I've filled in short, clear headings so that developers can quickly identify a rough idea of what to expect when flipping through the list of issues. And not "a suggestion", "stuck", etc.
+          required: true
 
   - type: dropdown
     id: platform
@@ -33,8 +48,8 @@ body:
     id: description
     attributes:
       label: Bug Description
-      description: A clear and concise description of what the bug is
-      placeholder: Tell us what happened...
+      description: Please be as detailed as possible when describing the problem. Please provide screenshots or screen recordings whenever possible to help us better understand the issue.
+      placeholder: Tell us what happened... (Remember to attach screenshots/recordings if applicable)
     validations:
       required: true
 
@@ -42,12 +57,14 @@ body:
     id: reproduction
     attributes:
       label: Steps To Reproduce
-      description: Steps to reproduce the behavior
+      description: Provide detailed steps to reproduce the issue so that our developers can reproduce the issue accurately. Please include screenshots or screen recordings for each step when possible.
       placeholder: |
         1. Go to '...'
         2. Click on '....'
         3. Scroll down to '....'
         4. See error
+
+        Remember to attach screenshots/recordings for each step when possible!
     validations:
       required: true
 
@@ -70,4 +87,4 @@ body:
     id: additional
     attributes:
       label: Additional Context
-      description: Add any other context about the problem here
+      description: Anything that gives us a better understanding of the problem you're experiencing

.github/ISSUE_TEMPLATE/1_feature_request.yml

@@ -6,33 +6,71 @@ body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to suggest a new feature!
+        Thank you for taking the time to submit a feature request!
+        Before submitting this issue, please make sure you have reviewed the [Project Roadmap](https://docs.cherry-ai.com/cherrystudio/planning) and the [Feature Overview](https://docs.cherry-ai.com/cherrystudio/preview).
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Issue Checklist
+      description: |
+        Before submitting an issue, please make sure you have completed the following steps
+      options:
+        - label: I understand that issues are for reporting problems and requesting features, not for off-topic comments, and I will provide as much detail as possible to help resolve the issue.
+          required: true
+        - label: I have checked the pinned issues and searched through the existing [open issues](https://github.com/CherryHQ/cherry-studio/issues), [closed issues](https://github.com/CherryHQ/cherry-studio/issues?q=is%3Aissue%20state%3Aclosed), and [discussions](https://github.com/CherryHQ/cherry-studio/discussions) and did not find a similar suggestion.
+          required: true
+        - label: I have provided a short and descriptive title so that developers can quickly understand the issue when browsing the issue list, rather than vague titles like "A suggestion" or "Stuck."
+          required: true
+        - label: The latest version of Cherry Studio does not include the feature I am suggesting.
+          required: true
+
+  - 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: 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...
+      label: Is your feature request related to an existing issue?
+      description: Please briefly describe the problem you are experiencing. If possible, include screenshots or recordings to help illustrate the current situation or pain points.
+      placeholder: I often feel frustrated because... (Remember to attach screenshots/recordings if applicable)
     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
+      label: Desired Solution
+      description: Please briefly describe what you would like to happen. You can include mockups, screenshots, or screen recordings to better illustrate your proposed solution.
     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
+      label: Alternative Solutions
+      description: Please briefly describe any alternative solutions or features you have considered. Feel free to include screenshots or mockups of alternative approaches.
 
   - type: textarea
     id: additional
     attributes:
-      label: Additional Context
-      description: Add any other context or screenshots about the feature request here
+      label: Additional Information
+      description: Add any other context, screenshots, mockups or recordings that can help us better understand your feature request.

.github/ISSUE_TEMPLATE/2_question.yml

@@ -1,19 +1,54 @@
-name: ❓ Question
-description: Ask a question or seek help
-title: '[Question]: '
+name: ❓ Discussion & Questions
+description: Seeking help, discussing issues, asking questions, etc...
+title: '[Discussion]: '
 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.
+        Thank you for your question! Please describe your issue in as much detail as possible so that we can better assist you.
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Issue Checklist
+      description: |
+        Before submitting an issue, please make sure you have completed the following steps
+      options:
+        - label: I understand that issues are meant for feedback and problem-solving, not for venting, and I will provide as much detail as possible to help resolve the issue.
+          required: true
+        - label: I have checked the pinned issues and searched through the existing [open issues](https://github.com/CherryHQ/cherry-studio/issues), [closed issues](https://github.com/CherryHQ/cherry-studio/issues?q=is%3Aissue%20state%3Aclosed), and [discussions](https://github.com/CherryHQ/cherry-studio/discussions) and did not find a similar suggestion.
+          required: true
+        - label: I confirm that I am here to ask questions and discuss issues, not to report bugs or request features.
+          required: true
+
+  - 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: question
     attributes:
       label: Your Question
-      description: Please describe your question in detail
-      placeholder: Please explain your question as clearly as possible...
+      description: Please describe your issue in detail. Include screenshots or screen recordings whenever possible to help us better understand your question.
+      placeholder: Please explain your issue as clearly as possible...(Remember to attach screenshots/recordings if applicable)
     validations:
       required: true
 
@@ -21,23 +56,23 @@ body:
     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."
+      description: Please provide some background information to help us better understand your question. Screenshots or recordings of your current setup or situation can be very helpful.
+      placeholder: "For example: use case, solutions you've tried, etc. Don't forget to include relevant screenshots/recordings!"
 
   - type: textarea
     id: additional
     attributes:
       label: Additional Information
-      description: Any other relevant information, screenshots, or code examples
+      description: Any other relevant information, screenshots, recordings, or code examples that can help us better assist you
       render: shell
 
   - type: dropdown
     id: priority
     attributes:
       label: Priority
-      description: How urgent is this question for you?
+      description: How urgent is this issue for you?
       options:
-        - Low (Can wait)
+        - Low (Review when available)
         - Medium (Would like a response soon)
         - High (Blocking progress)
     validations:

.github/issues/#0_bug_report.yml

@@ -1,4 +1,4 @@
-name: 🐛 错误报告
+name: 🐛 错误报告 (中文)
 description: 创建一个报告以帮助我们改进
 title: '[错误]: '
 labels: ['bug']
@@ -7,6 +7,21 @@ body:
     attributes:
       value: |
         感谢您花时间填写此错误报告！
+        在提交此问题之前，请确保您已经了解了[常见问题](https://docs.cherry-ai.com/question-contact/questions)和[知识科普](https://docs.cherry-ai.com/question-contact/knowledge)
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: 提交前检查
+      description: |
+        在提交 Issue 前请确保您已经完成了以下所有步骤
+      options:
+        - label: 我理解 Issue 是用于反馈和解决问题的，而非吐槽评论区，将尽可能提供更多信息帮助问题解决。
+          required: true
+        - label: 我已经查看了置顶 Issue 并搜索了现有的 [开放Issue](https://github.com/CherryHQ/cherry-studio/issues)和[已关闭Issue](https://github.com/CherryHQ/cherry-studio/issues?q=is%3Aissue%20state%3Aclosed%20)，没有找到类似的问题。
+          required: true
+        - label: 我填写了简短且清晰明确的标题，以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等。
+          required: true
 
   - type: dropdown
     id: platform
@@ -33,7 +48,7 @@ body:
     id: description
     attributes:
       label: 错误描述
-      description: 清晰简洁地描述错误是什么
+      description: 描述问题时请尽可能详细
       placeholder: 告诉我们发生了什么...
     validations:
       required: true
@@ -42,7 +57,7 @@ body:
     id: reproduction
     attributes:
       label: 重现步骤
-      description: 重现行为的步骤
+      description: 提供详细的重现步骤，以便于我们可以准确地重现问题
       placeholder: |
         1. 转到 '...'
         2. 点击 '....'
@@ -70,4 +85,4 @@ body:
     id: additional
     attributes:
       label: 附加信息
-      description: 在此添加有关问题的任何其他上下文
+      description: 任何能让我们对你所遇到的问题有更多了解的东西

.github/issues/#1_feature_request.yml

@@ -0,0 +1,76 @@
+name: 💡 功能建议 (中文)
+description: 为项目提出新的想法
+title: '[功能]: '
+labels: ['enhancement']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢您花时间提出新的功能建议!
+        在提交此问题之前，请确保您已经了解了[项目规划](https://docs.cherry-ai.com/cherrystudio/planning)和[功能介绍](https://docs.cherry-ai.com/cherrystudio/preview)
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: 提交前检查
+      description: |
+        在提交 Issue 前请确保您已经完成了以下所有步骤
+      options:
+        - label: 我理解 Issue 是用于反馈和解决问题的，而非吐槽评论区，将尽可能提供更多信息帮助问题解决。
+          required: true
+        - label: 我已经查看了置顶 Issue 并搜索了现有的 [开放Issue](https://github.com/CherryHQ/cherry-studio/issues)和[已关闭Issue](https://github.com/CherryHQ/cherry-studio/issues?q=is%3Aissue%20state%3Aclosed%20)，没有找到类似的建议。
+          required: true
+        - label: 我填写了简短且清晰明确的标题，以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等。
+          required: true
+        - label: 最新的 Cherry Studio 版本没有实现我所提出的功能。
+          required: true
+
+  - type: dropdown
+    id: platform
+    attributes:
+      label: 平台
+      description: 您正在使用哪个平台？
+      options:
+        - Windows
+        - macOS
+        - Linux
+    validations:
+      required: true
+
+  - type: input
+    id: version
+    attributes:
+      label: 版本
+      description: 您正在运行的 Cherry Studio 版本是什么？
+      placeholder: 例如 v1.0.0
+    validations:
+      required: true
+
+  - type: textarea
+    id: problem
+    attributes:
+      label: 您的功能建议是否与某个问题/issue相关?
+      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/issues/#2_question.yml

@@ -1,6 +1,6 @@
-name: ❓ 提问
-description: 提出一个问题或寻求帮助
-title: '[问题]: '
+name: ❓ 讨论 & 提问 (中文)
+description: 寻求帮助、讨论问题、提出疑问等...
+title: '[讨论]: '
 labels: ['question']
 body:
   - type: markdown
@@ -8,6 +8,39 @@ body:
       value: |
         感谢您的提问！请尽可能详细地描述您的问题，这样我们才能更好地帮助您。
 
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Issue 检查清单
+      description: |
+        在提交 Issue 前请确保您已经完成了以下所有步骤
+      options:
+        - label: 我理解 Issue 是用于反馈和解决问题的，而非吐槽评论区，将尽可能提供更多信息帮助问题解决。
+          required: true
+        - label: 我确认自己需要的是提出问题并且讨论问题，而不是 Bug 反馈或需求建议。
+          required: true
+
+  - type: dropdown
+    id: platform
+    attributes:
+      label: 平台
+      description: 您正在使用哪个平台？
+      options:
+        - Windows
+        - macOS
+        - Linux
+    validations:
+      required: true
+
+  - type: input
+    id: version
+    attributes:
+      label: 版本
+      description: 您正在运行的 Cherry Studio 版本是什么？
+      placeholder: 例如 v1.0.0
+    validations:
+      required: true
+
   - type: textarea
     id: question
     attributes:

.github/workflows/release.yml

@@ -2,6 +2,11 @@ name: Release
 
 on:
   workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Release tag (e.g. v1.0.0)'
+        required: true
+        default: 'v0.9.18'
   push:
     tags:
       - v*.*.*
@@ -16,10 +21,21 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
+      fail-fast: false
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Get release tag
+        id: get-tag
+        shell: bash
+        run: |
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            echo "tag=${{ github.event.inputs.tag }}" >> $GITHUB_OUTPUT
+          else
+            echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+          fi
 
       - name: Install Node.js
         uses: actions/setup-node@v3
@@ -53,7 +69,8 @@ jobs:
           yarn build:linux
 
         env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
 
       - name: Build Mac
         if: matrix.os == 'macos-latest'
@@ -66,13 +83,15 @@ jobs:
           APPLE_ID: ${{ vars.APPLE_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ vars.APPLE_APP_SPECIFIC_PASSWORD }}
           APPLE_TEAM_ID: ${{ vars.APPLE_TEAM_ID }}
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Windows
         if: matrix.os == 'windows-latest'
         run: yarn build:win
         env:
-          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
 
       - name: Replace spaces in filenames
         run: node scripts/replace-spaces.js
@@ -83,5 +102,6 @@ jobs:
           draft: true
           allowUpdates: true
           makeLatest: false
+          tag: ${{ steps.get-tag.outputs.tag }}
           artifacts: 'dist/*.exe,dist/*.zip,dist/*.dmg,dist/*.AppImage,dist/*.snap,dist/*.deb,dist/*.rpm,dist/*.tar.gz,dist/latest*.yml,dist/*.blockmap'
-          token: ${{ secrets.GH_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -44,3 +44,5 @@ stats.html
 
 # Local
 local
+.aider*
+.cursorrules

.yarn/patches/@langchain-openai-npm-0.3.16-e525b59526.patch

@@ -0,0 +1,19 @@
+diff --git a/dist/embeddings.js b/dist/embeddings.js
+index 1f8154be3e9c22442a915eb4b85fa6d2a21b0d0c..dc13ef4a30e6c282824a5357bcee9bd0ae222aab 100644
+--- a/dist/embeddings.js
++++ b/dist/embeddings.js
+@@ -214,10 +214,12 @@ export class OpenAIEmbeddings extends Embeddings {
+      * @returns Promise that resolves to an embedding for the document.
+      */
+     async embedQuery(text) {
++        const isBaiduCloud = this.clientConfig.baseURL.includes('baidubce.com')
++        const input = this.stripNewLines ? text.replace(/\n/g, ' ') : text
+         const params = {
+             model: this.model,
+-            input: this.stripNewLines ? text.replace(/\n/g, " ") : text,
+-        };
++            input: isBaiduCloud ? [input] : input
++        }
+         if (this.dimensions) {
+             params.dimensions = this.dimensions;
+         }

.yarn/patches/@llm-tools-embedjs-libsql-npm-0.1.25-fad000d74c.patch

@@ -1,25 +0,0 @@
-diff --git a/src/libsql-db.js b/src/libsql-db.js
-index 58c42e4910bd0e53bc497ff9b9702b1f7a961266..250bc97c50a9b790e8798441d904d040f2d2af43 100644
---- a/src/libsql-db.js
-+++ b/src/libsql-db.js
-@@ -41,9 +41,9 @@ export class LibSqlDb {
-     }
-     async similaritySearch(query, k) {
-         const statement = `SELECT id, pageContent, uniqueLoaderId, source, metadata,
--                vector_distance_cos(vector, vector32('[${query.join(',')}]'))
-+                vector_distance_cos(vector, vector32('[${query.join(',')}]')) as distance
-             FROM ${this.tableName}
--            ORDER BY vector_distance_cos(vector, vector32('[${query.join(',')}]')) ASC
-+            ORDER BY distance ASC
-             LIMIT ${k};`;
-         this.debug(`Executing statement - ${truncateCenterString(statement, 700)}`);
-         const results = await this.client.execute(statement);
-@@ -52,7 +52,7 @@ export class LibSqlDb {
-             return {
-                 metadata,
-                 pageContent: result.pageContent.toString(),
--                score: 1,
-+                score: 1 - result.distance,
-             };
-         });
-     }

.yarn/patches/@llm-tools-embedjs-loader-markdown-npm-0.1.28-81647ffac6.patch

@@ -1,16 +1,10 @@
 diff --git a/src/markdown-loader.js b/src/markdown-loader.js
-index 8a17cb7f5a68d90d2be21682db6e95ce22a3e71c..9ee868ef9d4ff3dc914b3abc3c8006deb1e9c6c6 100644
+index eaf30b114a273e68abbb92c8b07018495e63f4cb..4b06519bdb51845e4693fe877da9de01c7a81039 100644
 --- a/src/markdown-loader.js
 +++ b/src/markdown-loader.js
-@@ -1,5 +1,4 @@
- import { micromark } from 'micromark';
--import { mdxJsx } from 'micromark-extension-mdx-jsx';
- import { gfmHtml, gfm } from 'micromark-extension-gfm';
- import createDebugMessages from 'debug';
- import fs from 'node:fs';
-@@ -21,7 +20,7 @@ export class MarkdownLoader extends BaseLoader {
+@@ -21,7 +21,7 @@ export class MarkdownLoader extends BaseLoader {
              ? (await getSafe(this.filePathOrUrl, { format: 'buffer' })).body
-             : await stream2buffer(fs.createReadStream(this.filePathOrUrl));
+             : await streamToBuffer(fs.createReadStream(this.filePathOrUrl));
          this.debug('MarkdownLoader stream created');
 -        const result = micromark(buffer, { extensions: [gfm(), mdxJsx()], htmlExtensions: [gfmHtml()] });
 +        const result = micromark(buffer, { extensions: [gfm()], htmlExtensions: [gfmHtml()] });

.yarn/patches/@llm-tools-embedjs-npm-0.1.25-ec5645cf36.patch

@@ -1,17 +0,0 @@
-diff --git a/src/core/rag-embedding.js b/src/core/rag-embedding.js
-index 50c3c4064af17bc4c7c46554d8f2419b3afceb0e..632c9b2e04d2e0e3bb09ef1cd8f29d2560e6afc1 100644
---- a/src/core/rag-embedding.js
-+++ b/src/core/rag-embedding.js
-@@ -1,10 +1,8 @@
- export class RAGEmbedding {
-     static singleton;
-     static async init(embeddingModel) {
--        if (!this.singleton) {
--            await embeddingModel.init();
--            this.singleton = new RAGEmbedding(embeddingModel);
--        }
-+        await embeddingModel.init();
-+        this.singleton = new RAGEmbedding(embeddingModel);
-     }
-     static getInstance() {
-         return RAGEmbedding.singleton;

.yarn/patches/@llm-tools-embedjs-npm-0.1.28-8e4393fa2d.patch

@@ -0,0 +1,158 @@
+diff --git a/src/loaders/local-path-loader.d.ts b/src/loaders/local-path-loader.d.ts
+index 48c20e68c469cd309be2dc8f28e44c1bd04a26e9..1c16d83bcbf9b7140292793d6cbb8c04281949d9 100644
+--- a/src/loaders/local-path-loader.d.ts
++++ b/src/loaders/local-path-loader.d.ts
+@@ -4,8 +4,10 @@ export declare class LocalPathLoader extends BaseLoader<{
+ }> {
+     private readonly debug;
+     private readonly path;
+-    constructor({ path }: {
++    constructor({ path, chunkSize, chunkOverlap }: {
+         path: string;
++        chunkSize?: number;
++        chunkOverlap?: number;
+     });
+     getUnfilteredChunks(): AsyncGenerator<{
+         metadata: {
+diff --git a/src/loaders/local-path-loader.js b/src/loaders/local-path-loader.js
+index 4cf8a6bd1d890244c8ec49d4a05ee3bd58861c79..ec8215b01195a21ef20f3c5d56ecc99f186bb596 100644
+--- a/src/loaders/local-path-loader.js
++++ b/src/loaders/local-path-loader.js
+@@ -8,8 +8,8 @@ import { BaseLoader } from '@llm-tools/embedjs-interfaces';
+ export class LocalPathLoader extends BaseLoader {
+     debug = createDebugMessages('embedjs:loader:LocalPathLoader');
+     path;
+-    constructor({ path }) {
+-        super(`LocalPathLoader_${md5(path)}`, { path });
++    constructor({ path, chunkSize, chunkOverlap }) {
++        super(`LocalPathLoader_${md5(path)}`, { path }, chunkSize ?? 1000, chunkOverlap ?? 0);
+         this.path = path;
+     }
+     async *getUnfilteredChunks() {
+@@ -36,10 +36,12 @@ export class LocalPathLoader extends BaseLoader {
+                 const extension = currentPath.split('.').pop().toLowerCase();
+                 if (extension === 'md' || extension === 'mdx')
+                     mime = 'text/markdown';
++                if (extension === 'txt')
++                    mime = 'text/plain';
+                 this.debug(`File '${this.path}' mime type updated to 'text/markdown'`);
+             }
+             try {
+-                const loader = await createLoaderFromMimeType(currentPath, mime);
++                const loader = await createLoaderFromMimeType(currentPath, mime, this.chunkSize, this.chunkOverlap);
+                 for await (const result of await loader.getUnfilteredChunks()) {
+                     yield {
+                         pageContent: result.pageContent,
+diff --git a/src/util/mime.d.ts b/src/util/mime.d.ts
+index 57f56a1b8edc98366af9f84d671676c41c2f01ca..14be3b5727cff6eb1978838045e9a788f8f53bfb 100644
+--- a/src/util/mime.d.ts
++++ b/src/util/mime.d.ts
+@@ -1,2 +1,2 @@
+ import { BaseLoader } from '@llm-tools/embedjs-interfaces';
+-export declare function createLoaderFromMimeType(loaderData: string, mimeType: string): Promise<BaseLoader>;
++export declare function createLoaderFromMimeType(loaderData: string, mimeType: string, chunkSize?: number, chunkOverlap?: number): Promise<BaseLoader>;
+diff --git a/src/util/mime.js b/src/util/mime.js
+index b6426a859968e2bf6206795f70333e90ae27aeb7..16ae2adb863f8d7abfa757f1c5cc39f6bb1c44fa 100644
+--- a/src/util/mime.js
++++ b/src/util/mime.js
+@@ -1,7 +1,9 @@
+ import mime from 'mime';
+ import createDebugMessages from 'debug';
+ import { TextLoader } from '../loaders/text-loader.js';
+-export async function createLoaderFromMimeType(loaderData, mimeType) {
++import fs from 'node:fs'
++
++export async function createLoaderFromMimeType(loaderData, mimeType, chunkSize, chunkOverlap) {
+     createDebugMessages('embedjs:util:createLoaderFromMimeType')(`Incoming mime type '${mimeType}'`);
+     switch (mimeType) {
+         case 'application/msword':
+@@ -10,7 +12,7 @@ export async function createLoaderFromMimeType(loaderData, mimeType) {
+                 throw new Error('Package `@llm-tools/embedjs-loader-msoffice` needs to be installed to load docx files');
+             });
+             createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported DocxLoader');
+-            return new DocxLoader({ filePathOrUrl: loaderData });
++            return new DocxLoader({ filePathOrUrl: loaderData, chunkSize, chunkOverlap });
+         }
+         case 'application/vnd.ms-excel':
+         case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': {
+@@ -18,21 +20,21 @@ export async function createLoaderFromMimeType(loaderData, mimeType) {
+                 throw new Error('Package `@llm-tools/embedjs-loader-msoffice` needs to be installed to load excel files');
+             });
+             createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported ExcelLoader');
+-            return new ExcelLoader({ filePathOrUrl: loaderData });
++            return new ExcelLoader({ filePathOrUrl: loaderData, chunkSize, chunkOverlap  });
+         }
+         case 'application/pdf': {
+             const { PdfLoader } = await import('@llm-tools/embedjs-loader-pdf').catch(() => {
+                 throw new Error('Package `@llm-tools/embedjs-loader-pdf` needs to be installed to load PDF files');
+             });
+             createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported PdfLoader');
+-            return new PdfLoader({ filePathOrUrl: loaderData });
++            return new PdfLoader({ filePathOrUrl: loaderData, chunkSize, chunkOverlap });
+         }
+         case 'application/vnd.openxmlformats-officedocument.presentationml.presentation': {
+             const { PptLoader } = await import('@llm-tools/embedjs-loader-msoffice').catch(() => {
+                 throw new Error('Package `@llm-tools/embedjs-loader-msoffice` needs to be installed to load pptx files');
+             });
+             createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported PptLoader');
+-            return new PptLoader({ filePathOrUrl: loaderData });
++            return new PptLoader({ filePathOrUrl: loaderData, chunkSize, chunkOverlap });
+         }
+         case 'text/plain': {
+             const fineType = mime.getType(loaderData);
+@@ -42,24 +44,24 @@ export async function createLoaderFromMimeType(loaderData, mimeType) {
+                     throw new Error('Package `@llm-tools/embedjs-loader-csv` needs to be installed to load CSV files');
+                 });
+                 createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported CsvLoader');
+-                return new CsvLoader({ filePathOrUrl: loaderData });
++                return new CsvLoader({ filePathOrUrl: loaderData, chunkSize, chunkOverlap });
+             }
+-            else
+-                return new TextLoader({ text: loaderData });
++            const content = fs.readFileSync(loaderData, 'utf-8');
++            return new TextLoader({ text: content, chunkSize, chunkOverlap });
+         }
+         case 'application/csv': {
+             const { CsvLoader } = await import('@llm-tools/embedjs-loader-csv').catch(() => {
+                 throw new Error('Package `@llm-tools/embedjs-loader-csv` needs to be installed to load CSV files');
+             });
+             createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported CsvLoader');
+-            return new CsvLoader({ filePathOrUrl: loaderData });
++            return new CsvLoader({ filePathOrUrl: loaderData, chunkSize, chunkOverlap });
+         }
+         case 'text/html': {
+             const { WebLoader } = await import('@llm-tools/embedjs-loader-web').catch(() => {
+                 throw new Error('Package `@llm-tools/embedjs-loader-web` needs to be installed to load web documents');
+             });
+             createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported WebLoader');
+-            return new WebLoader({ urlOrContent: loaderData });
++            return new WebLoader({ urlOrContent: loaderData, chunkSize, chunkOverlap });
+         }
+         case 'text/xml': {
+             const { SitemapLoader } = await import('@llm-tools/embedjs-loader-sitemap').catch(() => {
+@@ -67,14 +69,14 @@ export async function createLoaderFromMimeType(loaderData, mimeType) {
+             });
+             createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported SitemapLoader');
+             if (await SitemapLoader.test(loaderData)) {
+-                return new SitemapLoader({ url: loaderData });
++                return new SitemapLoader({ url: loaderData, chunkSize, chunkOverlap });
+             }
+             //This is not a Sitemap but is still XML
+             const { XmlLoader } = await import('@llm-tools/embedjs-loader-xml').catch(() => {
+                 throw new Error('Package `@llm-tools/embedjs-loader-xml` needs to be installed to load XML documents');
+             });
+             createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported XmlLoader');
+-            return new XmlLoader({ filePathOrUrl: loaderData });
++            return new XmlLoader({ filePathOrUrl: loaderData, chunkSize, chunkOverlap });
+         }
+         case 'text/x-markdown':
+         case 'text/markdown': {
+@@ -82,7 +84,7 @@ export async function createLoaderFromMimeType(loaderData, mimeType) {
+                 throw new Error('Package `@llm-tools/embedjs-loader-markdown` needs to be installed to load markdown files');
+             });
+             createDebugMessages('embedjs:util:createLoaderFromMimeType')('Dynamically imported MarkdownLoader');
+-            return new MarkdownLoader({ filePathOrUrl: loaderData });
++            return new MarkdownLoader({ filePathOrUrl: loaderData, chunkSize, chunkOverlap });
+         }
+         case 'image/png':
+         case 'image/jpeg': {

.yarn/patches/@llm-tools-embedjs-utils-npm-0.1.25-fd8fe8a193.patch

@@ -1,54 +0,0 @@
-diff --git a/src/util/strings.cjs b/src/util/strings.cjs
-index 9933cc6e3866c476b47342a29ddb206eb90fa4a5..2965c4f2808bf94af9ef3e2ec889e5552e30e6ae 100644
---- a/src/util/strings.cjs
-+++ b/src/util/strings.cjs
-@@ -38,13 +38,16 @@ function toTitleCase(str) {
-     });
- }
- function isValidURL(url) {
--    try {
--        new URL(url);
--        return true;
--    }
--    catch {
--        return false;
-+    if (url.startsWith('http://') || url.startsWith('https://') || url.startsWith('ftp://')) {
-+        try {
-+            new URL(url);
-+            return true;
-+        }
-+        catch {
-+            return false;
-+        }
-     }
-+    return false;
- }
- function isValidJson(str) {
-     try {
-diff --git a/src/util/strings.js b/src/util/strings.js
-index f5c1655512099b880fc5022e95d5e0c4d1d073f2..1a64bd662a22efd2effd9d2846ffcf0b93391963 100644
---- a/src/util/strings.js
-+++ b/src/util/strings.js
-@@ -29,13 +29,16 @@ export function toTitleCase(str) {
-     });
- }
- export function isValidURL(url) {
--    try {
--        new URL(url);
--        return true;
--    }
--    catch {
--        return false;
-+    if (url.startsWith('http://') || url.startsWith('https://') || url.startsWith('ftp://')) {
-+        try {
-+            new URL(url);
-+            return true;
-+        }
-+        catch {
-+            return false;
-+        }
-     }
-+    return false;
- }
- export function isValidJson(str) {
-     try {

.yarn/patches/@tavily-core-npm-0.3.1-fe69bf2bea.patch

@@ -0,0 +1,57 @@
+diff --git a/dist/index.js b/dist/index.js
+index 88c405a000d21b3631eaa378690907c5527b8eaf..e03e66440c7c93aee38adf57df3096c6fefcd96d 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -82,7 +82,6 @@ module.exports = __toCommonJS(index_exports);
+ 
+ // src/utils.ts
+ var import_axios = __toESM(require("axios"));
+-var import_js_tiktoken = require("js-tiktoken");
+ var BASE_URL = "https://api.tavily.com";
+ var DEFAULT_MODEL_ENCODING = "gpt-3.5-turbo";
+ var DEFAULT_MAX_TOKENS = 4e3;
+@@ -97,8 +96,7 @@ function post(endpoint, body, apiKey) {
+   });
+ }
+ function getTotalTokensFromString(str, encodingName = DEFAULT_MODEL_ENCODING) {
+-  const encoding = (0, import_js_tiktoken.encodingForModel)(encodingName);
+-  return encoding.encode(str).length;
++  return 0;
+ }
+ function getMaxTokensFromList(data, maxTokens = DEFAULT_MAX_TOKENS) {
+   var result = [];
+diff --git a/dist/index.mjs b/dist/index.mjs
+index 0a9ea6a0add8d709e6721e806571f373d9fe0487..b81f1ea48a2b2a30ee98d53980a1b04ea3fdc5d4 100644
+--- a/dist/index.mjs
++++ b/dist/index.mjs
+@@ -49,7 +49,6 @@ var __async = (__this, __arguments, generator) => {
+ 
+ // src/utils.ts
+ import axios from "axios";
+-import { encodingForModel } from "js-tiktoken";
+ var BASE_URL = "https://api.tavily.com";
+ var DEFAULT_MODEL_ENCODING = "gpt-3.5-turbo";
+ var DEFAULT_MAX_TOKENS = 4e3;
+@@ -64,8 +63,7 @@ function post(endpoint, body, apiKey) {
+   });
+ }
+ function getTotalTokensFromString(str, encodingName = DEFAULT_MODEL_ENCODING) {
+-  const encoding = encodingForModel(encodingName);
+-  return encoding.encode(str).length;
++  return 0;
+ }
+ function getMaxTokensFromList(data, maxTokens = DEFAULT_MAX_TOKENS) {
+   var result = [];
+diff --git a/package.json b/package.json
+index 36d4a613166a7906c1dc5377a89dc0a65f746f73..dc6e0e9363046755cad123e627cc270a2e3580d1 100644
+--- a/package.json
++++ b/package.json
+@@ -36,7 +36,6 @@
+     "typescript": "^5.6.2"
+   },
+   "dependencies": {
+-    "axios": "^1.7.7",
+-    "js-tiktoken": "^1.0.14"
++    "axios": "^1.7.7"
+   }
+ }

.yarn/patches/openai-npm-4.76.2-8ff1374617.patch

@@ -1,26 +0,0 @@
-diff --git a/core.js b/core.js
-index 30c91e66bf595a66c09eb3dbcbda7d58154865f5..b511ff24ea1891904c60174c6ed26ecdd4d5ac51 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 ac267bcfcff44b1f7c9bea5513bba94726a31795..dd5bd9f29609d3f0eea4bd5b225f302893df14ad 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),
-         };
-     }

.yarn/patches/openai-npm-4.77.3-59c6d42e7a.patch

@@ -0,0 +1,39 @@
+diff --git a/core.js b/core.js
+index e75a18281ce8f051990c5a50bc1076afdddf91a3..e62f796791a155f23d054e74a429516c14d6e11b 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 fcef58eb502664c41a77483a00db8adaf29b2817..18c5d6ed4be86b3640931277bdc27700006764d7 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),
+         };
+     }
+diff --git a/error.mjs b/error.mjs
+index 7d19f5578040afa004bc887aab1725e8703d2bac..59ec725b6142299a62798ac4bdedb63ba7d9932c 100644
+--- a/error.mjs
++++ b/error.mjs
+@@ -36,7 +36,7 @@ export class APIError extends OpenAIError {
+         if (!status || !headers) {
+             return new APIConnectionError({ message, cause: castToError(errorResponse) });
+         }
+-        const error = errorResponse?.['error'];
++        const error = errorResponse?.['error'] || errorResponse;
+         if (status === 400) {
+             return new BadRequestError(status, error, message, headers);
+         }

README.md

@@ -1,17 +1,20 @@
-<div align="center">
+<h1 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" />
+    <img src="https://github.com/kangfenmao/cherry-studio/blob/main/build/icon.png?raw=true" width="150" height="150" alt="banner" /><br>
   </a>
-</div>
+</h1>
+  <p align="center">English | <a href="./docs/README.zh.md">中文</a> | <a href="./docs/README.ja.md">日本語</a><br></p>
 <div align="center">
-  English | <a href="./docs/README.zh.md">中文</a> | <a href="./docs/README.ja.md">日本語</a>
+ <a href="https://trendshift.io/repositories/11772" target="_blank"><img src="https://trendshift.io/api/badge/repositories/11772" alt="kangfenmao%2Fcherry-studio | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 </div>
 
 # 🍒 Cherry Studio
 
 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)
+👏 Join [Telegram Group](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/wez8HtpxqQ) | [QQ Group(1022779719)](https://qm.qq.com/q/Qtw8As0cwe)
+
+❤️ Like Cherry Studio? Give it a star 🌟 or [Sponsor](docs/sponsor.md) to support the development!
 
 # 🌠 Screenshot
 
@@ -27,7 +30,7 @@ Cherry Studio is a desktop client that supports for multiple LLM providers, avai
 
    - ☁️ Major LLM Cloud Services: OpenAI, Gemini, Anthropic, and more
    - 🔗 AI Web Service Integration: Claude, Peplexity, Poe, and others
-   - 💻 Local Model Support with Ollama
+   - 💻 Local Model Support with Ollama, LM Studio
 
 2. **AI Assistants & Conversations**:
 
@@ -57,6 +60,20 @@ Cherry Studio is a desktop client that supports for multiple LLM providers, avai
    - 📝 Complete Markdown Rendering
    - 🤲 Easy Content Sharing
 
+# 📝 TODO
+
+- [x] Quick popup (read clipboard, quick question, explain, translate, summarize)
+- [x] Comparison of multi-model answers
+- [x] Support login using SSO provided by service providers
+- [ ] All models support networking (in development...)
+- [ ] Launch of the first official version
+- [ ] Plugin functionality (JavaScript)
+- [ ] Browser extension (highlight text to translate, summarize, add to knowledge base)
+- [ ] iOS & Android client
+- [ ] AI notes
+- [ ] Voice input and output (AI call)
+- [ ] Data backup supports custom backup content
+
 # 🖥️ Develop
 
 ## IDE Setup
@@ -113,6 +130,10 @@ For more detailed guidelines, please refer to our [Contributing Guide](./CONTRIB
 
 Thank you for your support and contributions!
 
+## Related Projects
+
+- [one-api](https://github.com/songquanpeng/one-api):LLM API management and distribution system, supporting mainstream models like OpenAI, Azure, and Anthropic. Features unified API interface, suitable for key management and secondary distribution.
+
 # 🚀 Contributors
 
 <a href="https://github.com/kangfenmao/cherry-studio/graphs/contributors">

docs/README.ja.md

@@ -1,17 +1,21 @@
-<div align="center">
+<h1 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>
+</h1>
 <div align="center">
   <a href="./README.md">English</a> | <a href="./README.zh.md">中文</a> | 日本語
 </div>
-
+<div align="center">
+ <a href="https://trendshift.io/repositories/11772" target="_blank"><img src="https://trendshift.io/api/badge/repositories/11772" alt="kangfenmao%2Fcherry-studio | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+</div>
 # 🍒 Cherry Studio
 
 Cherry Studioは、複数のLLMプロバイダーをサポートするデスクトップクライアントで、Windows、Mac、Linuxで利用可能です。
 
-👏 [Telegramグループ](https://t.me/CherryStudioAI)に参加しましょう
+👏 [Telegram](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/wez8HtpxqQ) | [QQグループ(1022779719)](https://qm.qq.com/q/Qtw8As0cwe)
+
+❤️ Cherry Studioをお気に入りにしましたか？小さな星をつけてください 🌟 または [スポンサー](sponsor.md) をして開発をサポートしてください！❤️
 
 # 🌠 スクリーンショット
 
@@ -27,7 +31,7 @@ Cherry Studioは、複数のLLMプロバイダーをサポートするデスク
 
    - ☁️ 主要な LLM クラウドサービス対応：OpenAI、Gemini、Anthropic など
    - 🔗 AI Web サービス統合：Claude、Peplexity、Poe など
-   - 💻 Ollama によるローカルモデル実行対応
+   - 💻 Ollama、LM Studio によるローカルモデル実行対応
 
 2. **AI アシスタントと対話**：
 
@@ -57,6 +61,20 @@ Cherry Studioは、複数のLLMプロバイダーをサポートするデスク
    - 📝 完全な Markdown レンダリング
    - 🤲 簡単な共有機能
 
+# 📝 TODO
+
+- [x] クイックポップアップ（クリップボードの読み取り、簡単な質問、説明、翻訳、要約）
+- [x] 複数モデルの回答の比較
+- [x] サービスプロバイダーが提供するSSOを使用したログインをサポート
+- [ ] すべてのモデルがネットワークをサポート（開発中...）
+- [ ] 最初の公式バージョンのリリース
+- [ ] プラグイン機能（JavaScript）
+- [ ] ブラウザ拡張機能（テキストをハイライトして翻訳、要約、ナレッジベースに追加）
+- [ ] iOS & Android クライアント
+- [ ] AIノート
+- [ ] 音声入出力（AIコール）
+- [ ] データバックアップはカスタムバックアップコンテンツをサポート
+
 # 🖥️ 開発
 
 ## IDEの設定
@@ -113,6 +131,10 @@ Cherry Studioへの貢献を歓迎します！以下の方法で貢献できま
 
 ご支援と貢献に感謝します！
 
+## 関連頁版
+
+- [one-api](https://github.com/songquanpeng/one-api):LLM APIの管理・配信システム。OpenAI、Azure、Anthropicなどの主要モデルに対応し、統一APIインターフェースを提供。APIキー管理と再配布に利用可能。
+
 # 🚀 コントリビューター
 
 <a href="https://github.com/kangfenmao/cherry-studio/graphs/contributors">

docs/README.zh.md

@@ -1,17 +1,21 @@
-<div align="center">
+<h1 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>
+</h1>
 <div align="center">
   中文 / <a href="https://github.com/kangfenmao/cherry-studio">English</a> / <a href="./README.ja.md">日本語</a>
 </div>
-
+<div align="center">
+ <a href="https://trendshift.io/repositories/11772" target="_blank"><img src="https://trendshift.io/api/badge/repositories/11772" alt="kangfenmao%2Fcherry-studio | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+</div>
 # 🍒 Cherry Studio
 
 Cherry Studio 是一款支持多个大语言模型（LLM）服务商的桌面客户端，兼容 Windows、Mac 和 Linux 系统。
 
-👏 欢迎加入 [Telegram 群组](https://t.me/CherryStudioAI)
+👏 欢迎加入 [Telegram 群组](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/wez8HtpxqQ) | [QQ群(1022779719)](https://qm.qq.com/q/Qtw8As0cwe)
+
+❤️ 喜欢 Cherry Studio? 点亮小星星 🌟 或 [赞助开发者](sponsor.md)! ❤️
 
 # 🌠 界面
 
@@ -27,7 +31,7 @@ Cherry Studio 是一款支持多个大语言模型（LLM）服务商的桌面客
 
    - ☁️ 支持主流 LLM 云服务：OpenAI、Gemini、Anthropic、硅基流动等
    - 🔗 集成流行 AI Web 服务：Claude、Peplexity、Poe、腾讯元宝、知乎直答等
-   - 💻 支持 Ollama 本地模型部署
+   - 💻 支持 Ollama、LM Studio 本地模型部署
 
 2. **智能助手与对话**：
 
@@ -57,6 +61,20 @@ Cherry Studio 是一款支持多个大语言模型（LLM）服务商的桌面客
    - 📝 完整的 Markdown 渲染
    - 🤲 便捷的内容分享功能
 
+# 📝 待辦事項
+
+- [x] 快捷彈窗 (讀取剪貼簿、快速提問、解釋、翻譯、總結）
+- [x] 多模型回答對比
+- [x] 支援使用服務供應商提供的 SSO 進行登入
+- [ ] 全部模型支援連網（開發中...）
+- [ ] 推出第一個正式版
+- [ ] 插件功能（JavaScript）
+- [ ] 瀏覽器插件（劃詞翻譯、總結、新增至知識庫）
+- [ ] iOS & Android 客戶端
+- [ ] AI 筆記
+- [ ] 語音輸入輸出（AI 通話）
+- [ ] 資料備份支援自訂備份內容
+
 # 🖥️ 开发
 
 ## IDE 设置
@@ -113,6 +131,10 @@ $ yarn build:linux
 
 感谢您的支持和贡献！
 
+## 相关项目
+
+- [one-api](https://github.com/songquanpeng/one-api):LLM API管理及分发系统，支持OpenAI、Azure、Anthropic等主流模型，统一API接口，可用于密钥管理与二次分发。
+
 # 🚀 贡献者
 
 <a href="https://github.com/kangfenmao/cherry-studio/graphs/contributors">

electron-builder.yml

@@ -24,6 +24,7 @@ files:
   - '!**/{LICENSE,LICENSE.txt,LICENSE-MIT.txt,*.LICENSE.txt,NOTICE.txt,README.md,CHANGELOG.md}'
   - '!node_modules/rollup-plugin-visualizer'
   - '!node_modules/js-tiktoken'
+  - '!node_modules/@tavily/core/node_modules/js-tiktoken'
   - '!node_modules/pdf-parse/lib/pdf.js/{v1.9.426,v1.10.88,v2.0.550}'
   - '!node_modules/mammoth/{mammoth.browser.js,mammoth.browser.min.js}'
   - '!node_modules/html2canvas/dist/{html2canvas.min.js,html2canvas.esm.js}'
@@ -80,7 +81,4 @@ afterPack: scripts/after-pack.js
 afterSign: scripts/notarize.js
 releaseInfo:
   releaseNotes: |
-    消息分组显示 @teojs
-    支持 DeepSeek R1 模型
-    助手的预设消息保存逻辑的修改 @duanyongcheng
-    错误修复和性能优化
+    全部模型支持 Web 搜索

electron.vite.config.ts

@@ -20,7 +20,8 @@ export default defineConfig({
           '@llm-tools/embedjs-loader-xml',
           '@llm-tools/embedjs-loader-pdf',
           '@llm-tools/embedjs-loader-sitemap',
-          '@llm-tools/embedjs-libsql'
+          '@llm-tools/embedjs-libsql',
+          '@llm-tools/embedjs-loader-image'
         ]
       }),
       ...visualizerPlugin('main')
@@ -50,7 +51,7 @@ export default defineConfig({
       }
     },
     optimizeDeps: {
-      exclude: ['chunk-RK3FTE5R.js']
+      exclude: ['chunk-PZ64DZKH.js', 'chunk-JMKENWIY.js', 'chunk-UXYB6GHG.js']
     }
   }
 })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "0.9.16",
+  "version": "1.0.0",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",
@@ -44,23 +44,25 @@
     "generate:agents": "yarn workspace @cherry-studio/database agents",
     "generate:icons": "electron-icon-builder --input=./build/logo.png --output=build",
     "analyze:renderer": "VISUALIZER_RENDERER=true yarn build",
-    "analyze:main": "VISUALIZER_MAIN=true yarn build"
+    "analyze:main": "VISUALIZER_MAIN=true yarn build",
+    "check": "node scripts/check-i18n.js"
   },
   "dependencies": {
     "@electron-toolkit/preload": "^3.0.0",
     "@electron-toolkit/utils": "^3.0.0",
     "@electron/notarize": "^2.5.0",
     "@google/generative-ai": "^0.21.0",
-    "@llm-tools/embedjs": "patch:@llm-tools/embedjs@npm%3A0.1.25#~/.yarn/patches/@llm-tools-embedjs-npm-0.1.25-ec5645cf36.patch",
-    "@llm-tools/embedjs-libsql": "patch:@llm-tools/embedjs-libsql@npm%3A0.1.25#~/.yarn/patches/@llm-tools-embedjs-libsql-npm-0.1.25-fad000d74c.patch",
-    "@llm-tools/embedjs-loader-csv": "^0.1.25",
-    "@llm-tools/embedjs-loader-markdown": "patch:@llm-tools/embedjs-loader-markdown@npm%3A0.1.25#~/.yarn/patches/@llm-tools-embedjs-loader-markdown-npm-0.1.25-d1d536d640.patch",
-    "@llm-tools/embedjs-loader-msoffice": "^0.1.25",
-    "@llm-tools/embedjs-loader-pdf": "^0.1.25",
-    "@llm-tools/embedjs-loader-sitemap": "^0.1.25",
-    "@llm-tools/embedjs-loader-web": "^0.1.25",
-    "@llm-tools/embedjs-loader-xml": "^0.1.25",
-    "@llm-tools/embedjs-openai": "^0.1.25",
+    "@llm-tools/embedjs": "patch:@llm-tools/embedjs@npm%3A0.1.28#~/.yarn/patches/@llm-tools-embedjs-npm-0.1.28-8e4393fa2d.patch",
+    "@llm-tools/embedjs-libsql": "^0.1.28",
+    "@llm-tools/embedjs-loader-csv": "^0.1.28",
+    "@llm-tools/embedjs-loader-markdown": "patch:@llm-tools/embedjs-loader-markdown@npm%3A0.1.28#~/.yarn/patches/@llm-tools-embedjs-loader-markdown-npm-0.1.28-81647ffac6.patch",
+    "@llm-tools/embedjs-loader-msoffice": "^0.1.28",
+    "@llm-tools/embedjs-loader-pdf": "^0.1.28",
+    "@llm-tools/embedjs-loader-sitemap": "^0.1.28",
+    "@llm-tools/embedjs-loader-web": "^0.1.28",
+    "@llm-tools/embedjs-loader-xml": "^0.1.28",
+    "@llm-tools/embedjs-openai": "^0.1.28",
+    "@notionhq/client": "^2.2.15",
     "@types/react-infinite-scroll-component": "^5.0.0",
     "adm-zip": "^0.5.16",
     "apache-arrow": "^18.1.0",
@@ -69,6 +71,7 @@
     "electron-store": "^8.2.0",
     "electron-updater": "^6.3.9",
     "electron-window-state": "^5.0.3",
+    "epub": "^1.3.0",
     "fs-extra": "^11.2.0",
     "html2canvas": "^1.4.1",
     "markdown-it": "^14.1.0",
@@ -83,12 +86,16 @@
     "@electron-toolkit/tsconfig": "^1.0.1",
     "@hello-pangea/dnd": "^16.6.0",
     "@kangfenmao/keyv-storage": "^0.1.0",
+    "@llm-tools/embedjs-loader-image": "^0.1.28",
     "@reduxjs/toolkit": "^2.2.5",
+    "@tavily/core": "patch:@tavily/core@npm%3A0.3.1#~/.yarn/patches/@tavily-core-npm-0.3.1-fe69bf2bea.patch",
     "@types/adm-zip": "^0",
     "@types/fs-extra": "^11",
     "@types/lodash": "^4.17.5",
     "@types/markdown-it": "^14",
+    "@types/md5": "^2.3.5",
     "@types/node": "^18.19.9",
+    "@types/pako": "^1.0.2",
     "@types/react": "^18.2.48",
     "@types/react-dom": "^18.2.18",
     "@types/react-infinite-scroll-component": "^5.0.0",
@@ -117,7 +124,7 @@
     "i18next": "^23.11.5",
     "lodash": "^4.17.21",
     "mime": "^4.0.4",
-    "openai": "patch:openai@npm%3A4.76.2#~/.yarn/patches/openai-npm-4.76.2-8ff1374617.patch",
+    "openai": "patch:openai@npm%3A4.77.3#~/.yarn/patches/openai-npm-4.77.3-59c6d42e7a.patch",
     "prettier": "^3.2.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
@@ -132,13 +139,14 @@
     "redux": "^5.0.1",
     "redux-persist": "^6.0.0",
     "rehype-katex": "^7.0.1",
-    "rehype-mathjax": "^6.0.0",
+    "rehype-mathjax": "^7.0.0",
     "rehype-raw": "^7.0.0",
     "remark-gfm": "^4.0.0",
     "remark-math": "^6.0.0",
     "rollup-plugin-visualizer": "^5.12.0",
     "sass": "^1.77.2",
     "shiki": "^1.22.2",
+    "string-width": "^7.2.0",
     "styled-components": "^6.1.11",
     "tinycolor2": "^1.6.0",
     "typescript": "^5.6.2",
@@ -151,7 +159,9 @@
   },
   "resolutions": {
     "pdf-parse@npm:1.1.1": "patch:pdf-parse@npm%3A1.1.1#~/.yarn/patches/pdf-parse-npm-1.1.1-04a6109b2a.patch",
-    "@llm-tools/embedjs-utils@npm:0.1.25": "patch:@llm-tools/embedjs-utils@npm%3A0.1.25#~/.yarn/patches/@llm-tools-embedjs-utils-npm-0.1.25-fd8fe8a193.patch"
+    "@langchain/openai@npm:^0.3.16": "patch:@langchain/openai@npm%3A0.3.16#~/.yarn/patches/@langchain-openai-npm-0.3.16-e525b59526.patch",
+    "@langchain/openai@npm:>=0.1.0 <0.4.0": "patch:@langchain/openai@npm%3A0.3.16#~/.yarn/patches/@langchain-openai-npm-0.3.16-e525b59526.patch",
+    "openai@npm:^4.77.0": "patch:openai@npm%3A4.77.3#~/.yarn/patches/openai-npm-4.77.3-59c6d42e7a.patch"
   },
-  "packageManager": "yarn@4.5.0"
+  "packageManager": "yarn@4.6.0"
 }

packages/shared/config/constant.ts

@@ -2,6 +2,8 @@ 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 thirdPartyApplicationExts = ['.draftsExport']
+export const bookExts = ['.epub']
 export const textExts = [
   '.txt', // 普通文本文件
   '.md', // Markdown 文件
@@ -87,7 +89,11 @@ export const textExts = [
   '.gradle', // Gradle 构建文件
   '.groovy', // Gradle 构建文件
   '.kts', // Kotlin Script 文件
-  '.java' // Java 代码文件
+  '.java', // Java 代码文件
+  '.cs', // C# 代码文件
+  '.cpp', // C++ 代码文件
+  '.c', // C++ 代码文件
+  '.h' // C++ 头文件
 ]
 
 export const ZOOM_SHORTCUTS = [

packages/shared/config/types.ts

@@ -0,0 +1,6 @@
+export type LoaderReturn = {
+  entriesAdded: number
+  uniqueId: string
+  uniqueIds: string[]
+  loaderType: string
+}

scripts/check-i18n.js

@@ -0,0 +1,104 @@
+'use strict'
+Object.defineProperty(exports, '__esModule', { value: true })
+var fs = require('fs')
+var path = require('path')
+var translationsDir = path.join(__dirname, '../src/renderer/src/i18n/locales')
+var baseLocale = 'zh-CN'
+var baseFileName = ''.concat(baseLocale, '.json')
+var baseFilePath = path.join(translationsDir, baseFileName)
+/**
+ * 递归同步 target 对象，使其与 template 对象保持一致
+ * 1. 如果 template 中存在 target 中缺少的 key，则添加（'[to be translated]'）
+ * 2. 如果 target 中存在 template 中不存在的 key，则删除
+ * 3. 对于子对象，递归同步
+ *
+ * @param target 目标对象（需要更新的语言对象）
+ * @param template 主模板对象（中文）
+ * @returns 返回是否对 target 进行了更新
+ */
+function syncRecursively(target, template) {
+  var isUpdated = false
+  // 添加 template 中存在但 target 中缺少的 key
+  for (var key in template) {
+    if (!(key in target)) {
+      target[key] =
+        typeof template[key] === 'object' && template[key] !== null ? {} : '[to be translated]:'.concat(template[key])
+      console.log('\u6DFB\u52A0\u65B0\u5C5E\u6027\uFF1A'.concat(key))
+      isUpdated = true
+    }
+    if (typeof template[key] === 'object' && template[key] !== null) {
+      if (typeof target[key] !== 'object' || target[key] === null) {
+        target[key] = {}
+        isUpdated = true
+      }
+      // 递归同步子对象
+      var childUpdated = syncRecursively(target[key], template[key])
+      if (childUpdated) {
+        isUpdated = true
+      }
+    }
+  }
+  // 删除 target 中存在但 template 中没有的 key
+  for (var targetKey in target) {
+    if (!(targetKey in template)) {
+      console.log('\u79FB\u9664\u591A\u4F59\u5C5E\u6027\uFF1A'.concat(targetKey))
+      delete target[targetKey]
+      isUpdated = true
+    }
+  }
+  return isUpdated
+}
+function syncTranslations() {
+  if (!fs.existsSync(baseFilePath)) {
+    console.error(
+      '\u4E3B\u6A21\u677F\u6587\u4EF6 '.concat(
+        baseFileName,
+        ' \u4E0D\u5B58\u5728\uFF0C\u8BF7\u68C0\u67E5\u8DEF\u5F84\u6216\u6587\u4EF6\u540D\u3002'
+      )
+    )
+    return
+  }
+  var baseContent = fs.readFileSync(baseFilePath, 'utf-8')
+  var baseJson = {}
+  try {
+    baseJson = JSON.parse(baseContent)
+  } catch (error) {
+    console.error('\u89E3\u6790 '.concat(baseFileName, ' \u51FA\u9519:'), error)
+    return
+  }
+  var files = fs.readdirSync(translationsDir).filter(function (file) {
+    return file.endsWith('.json') && file !== baseFileName
+  })
+  for (var _i = 0, files_1 = files; _i < files_1.length; _i++) {
+    var file = files_1[_i]
+    var filePath = path.join(translationsDir, file)
+    var targetJson = {}
+    try {
+      var fileContent = fs.readFileSync(filePath, 'utf-8')
+      targetJson = JSON.parse(fileContent)
+    } catch (error) {
+      console.error(
+        '\u89E3\u6790 '.concat(
+          file,
+          ' \u51FA\u9519\uFF0C\u8DF3\u8FC7\u6B64\u6587\u4EF6\u3002\u9519\u8BEF\u4FE1\u606F:'
+        ),
+        error
+      )
+      continue
+    }
+    var isUpdated = syncRecursively(targetJson, baseJson)
+    if (isUpdated) {
+      try {
+        fs.writeFileSync(filePath, JSON.stringify(targetJson, null, 2), 'utf-8')
+        console.log(
+          '\u6587\u4EF6 '.concat(file, ' \u5DF2\u66F4\u65B0\u540C\u6B65\u4E3B\u6A21\u677F\u7684\u5185\u5BB9\u3002')
+        )
+      } catch (error) {
+        console.error('\u5199\u5165 '.concat(file, ' \u51FA\u9519:'), error)
+      }
+    } else {
+      console.log('\u6587\u4EF6 '.concat(file, ' \u65E0\u9700\u66F4\u65B0\u3002'))
+    }
+  }
+}
+syncTranslations()

scripts/check-i18n.ts

@@ -0,0 +1,98 @@
+import * as fs from 'fs'
+import * as path from 'path'
+
+const translationsDir = path.join(__dirname, '../src/renderer/src/i18n/locales')
+const baseLocale = 'zh-CN'
+const baseFileName = `${baseLocale}.json`
+const baseFilePath = path.join(translationsDir, baseFileName)
+
+/**
+ * 递归同步 target 对象，使其与 template 对象保持一致
+ * 1. 如果 template 中存在 target 中缺少的 key，则添加（'[to be translated]'）
+ * 2. 如果 target 中存在 template 中不存在的 key，则删除
+ * 3. 对于子对象，递归同步
+ *
+ * @param target 目标对象（需要更新的语言对象）
+ * @param template 主模板对象（中文）
+ * @returns 返回是否对 target 进行了更新
+ */
+function syncRecursively(target: any, template: any): boolean {
+  let isUpdated = false
+
+  // 添加 template 中存在但 target 中缺少的 key
+  for (const key in template) {
+    if (!(key in target)) {
+      target[key] =
+        typeof template[key] === 'object' && template[key] !== null ? {} : `[to be translated]:${template[key]}`
+      console.log(`添加新属性：${key}`)
+      isUpdated = true
+    }
+    if (typeof template[key] === 'object' && template[key] !== null) {
+      if (typeof target[key] !== 'object' || target[key] === null) {
+        target[key] = {}
+        isUpdated = true
+      }
+      // 递归同步子对象
+      const childUpdated = syncRecursively(target[key], template[key])
+      if (childUpdated) {
+        isUpdated = true
+      }
+    }
+  }
+
+  // 删除 target 中存在但 template 中没有的 key
+  for (const targetKey in target) {
+    if (!(targetKey in template)) {
+      console.log(`移除多余属性：${targetKey}`)
+      delete target[targetKey]
+      isUpdated = true
+    }
+  }
+
+  return isUpdated
+}
+
+function syncTranslations() {
+  if (!fs.existsSync(baseFilePath)) {
+    console.error(`主模板文件 ${baseFileName} 不存在，请检查路径或文件名`)
+    return
+  }
+
+  const baseContent = fs.readFileSync(baseFilePath, 'utf-8')
+  let baseJson: Record<string, any> = {}
+  try {
+    baseJson = JSON.parse(baseContent)
+  } catch (error) {
+    console.error(`解析 ${baseFileName} 出错:`, error)
+    return
+  }
+
+  const files = fs.readdirSync(translationsDir).filter((file) => file.endsWith('.json') && file !== baseFileName)
+
+  for (const file of files) {
+    const filePath = path.join(translationsDir, file)
+    let targetJson: Record<string, any> = {}
+    try {
+      const fileContent = fs.readFileSync(filePath, 'utf-8')
+      targetJson = JSON.parse(fileContent)
+    } catch (error) {
+      console.error(`解析 ${file} 出错，跳过此文件。错误信息:`, error)
+      continue
+    }
+
+    const isUpdated = syncRecursively(targetJson, baseJson)
+
+    if (isUpdated) {
+      try {
+        fs.writeFileSync(filePath, JSON.stringify(targetJson, null, 2) + '\n', 'utf-8')
+        console.log(`文件 ${file} 已更新同步主模板的内容`)
+      } catch (error) {
+        console.error(`写入 ${file} 出错:`, error)
+      }
+    } else {
+      console.log(`文件 ${file} 无需更新`)
+    }
+  }
+}
+
+syncTranslations()

src/main/index.ts

@@ -1,5 +1,5 @@
 import { electronApp, optimizer } from '@electron-toolkit/utils'
-import { app, BrowserWindow } from 'electron'
+import { app } from 'electron'
 import installExtension, { REDUX_DEVTOOLS } from 'electron-devtools-installer'
 
 import { registerIpc } from './ipc'
@@ -16,9 +16,29 @@ if (!app.requestSingleInstanceLock()) {
   // 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.
+
   app.whenReady().then(async () => {
     await updateUserDataPath()
 
+    // Register custom protocol
+    if (!app.isDefaultProtocolClient('cherrystudio')) {
+      app.setAsDefaultProtocolClient('cherrystudio')
+    }
+
+    // Handle protocol open
+    app.on('open-url', (event, url) => {
+      event.preventDefault()
+      const parsedUrl = new URL(url)
+      if (parsedUrl.pathname === 'siliconflow.oauth.login') {
+        const code = parsedUrl.searchParams.get('code')
+        if (code) {
+          // Handle the OAuth code here
+          console.log('OAuth code received:', code)
+          // You can send this code to your renderer process via IPC if needed
+        }
+      }
+    })
+
     // Set app user model id for windows
     electronApp.setAppUserModelId(import.meta.env.VITE_MAIN_BUNDLE_ID || 'com.kangfenmao.CherryStudio')
 
@@ -26,15 +46,13 @@ if (!app.requestSingleInstanceLock()) {
     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) {
+      const mainWindow = windowService.getMainWindow()
+      if (!mainWindow || mainWindow.isDestroyed()) {
         windowService.createMainWindow()
       } else {
         windowService.showMainWindow()
       }
     })
-
     registerShortcuts(mainWindow)
 
     registerIpc(mainWindow, app)
@@ -48,12 +66,7 @@ if (!app.requestSingleInstanceLock()) {
 
   // Listen for second instance
   app.on('second-instance', () => {
-    const mainWindow = BrowserWindow.getAllWindows()[0]
-    if (mainWindow) {
-      mainWindow.isMinimized() && mainWindow.restore()
-      mainWindow.show()
-      mainWindow.focus()
-    }
+    windowService.showMainWindow()
   })
 
   app.on('browser-window-created', (_, window) => {

src/main/ipc.ts

@@ -18,6 +18,8 @@ import { registerShortcuts, unregisterAllShortcuts } from './services/ShortcutSe
 import { TrayService } from './services/TrayService'
 import { windowService } from './services/WindowService'
 import { getResourcePath } from './utils'
+import { decrypt } from './utils/aes'
+import { encrypt } from './utils/aes'
 import { compress, decompress } from './utils/zip'
 
 const fileManager = new FileStorage()
@@ -199,4 +201,10 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle('miniwindow:hide', () => windowService.hideMiniWindow())
   ipcMain.handle('miniwindow:close', () => windowService.closeMiniWindow())
   ipcMain.handle('miniwindow:toggle', () => windowService.toggleMiniWindow())
+
+  // aes
+  ipcMain.handle('aes:encrypt', (_, text: string, secretKey: string, iv: string) => encrypt(text, secretKey, iv))
+  ipcMain.handle('aes:decrypt', (_, encryptedData: string, iv: string, secretKey: string) =>
+    decrypt(encryptedData, iv, secretKey)
+  )
 }

src/main/loader/draftsExportLoader.ts

@@ -0,0 +1,22 @@
+import * as fs from 'node:fs'
+
+import { JsonLoader } from '@llm-tools/embedjs'
+
+/**
+ * Drafts 应用导出的笔记文件加载器
+ * 原始文件是一个 JSON 数组。每条笔记只保留 content、tags、modified_at 三个字段
+ */
+export class DraftsExportLoader extends JsonLoader {
+  constructor(filePath: string) {
+    const fileContent = fs.readFileSync(filePath, 'utf-8')
+    const rawJson = JSON.parse(fileContent) as any[]
+    const json = rawJson.map((item) => {
+      return {
+        content: item.content?.replace(/\n/g, '<br>'),
+        tags: item.tags,
+        modified_at: item.created_at
+      }
+    })
+    super({ object: json })
+  }
+}

src/main/loader/epubLoader.ts

@@ -0,0 +1,228 @@
+import { RecursiveCharacterTextSplitter } from '@langchain/textsplitters'
+import { BaseLoader } from '@llm-tools/embedjs-interfaces'
+import { cleanString } from '@llm-tools/embedjs-utils'
+import Logger from 'electron-log'
+import EPub from 'epub'
+import * as fs from 'fs'
+
+/**
+ * epub 加载器的配置选项
+ */
+interface EpubLoaderOptions {
+  /** epub 文件路径 */
+  filePath: string
+  /** 文本分块大小 */
+  chunkSize: number
+  /** 分块重叠大小 */
+  chunkOverlap: number
+}
+
+/**
+ * epub 文件的元数据信息
+ */
+interface EpubMetadata {
+  /** 作者显示名称（例如："Lewis Carroll"） */
+  creator?: string
+  /** 作者规范化名称，用于排序和索引（例如："Carroll, Lewis"） */
+  creatorFileAs?: string
+  /** 书籍标题（例如："Alice's Adventures in Wonderland"） */
+  title?: string
+  /** 语言代码（例如："en" 或 "zh-CN"） */
+  language?: string
+  /** 主题或分类（例如："Fantasy"、"Fiction"） */
+  subject?: string
+  /** 创建日期（例如："2024-02-14"） */
+  date?: string
+  /** 书籍描述或简介 */
+  description?: string
+}
+
+/**
+ * epub 章节信息
+ */
+interface EpubChapter {
+  /** 章节 ID */
+  id: string
+  /** 章节标题 */
+  title?: string
+  /** 章节顺序 */
+  order?: number
+}
+
+/**
+ * epub 文件加载器
+ * 用于解析 epub 电子书文件，提取文本内容和元数据
+ */
+export class EpubLoader extends BaseLoader<Record<string, string | number | boolean>, Record<string, unknown>> {
+  protected filePath: string
+  protected chunkSize: number
+  protected chunkOverlap: number
+  private extractedText: string
+  private metadata: EpubMetadata | null
+
+  /**
+   * 创建 epub 加载器实例
+   * @param options 加载器配置选项
+   */
+  constructor(options: EpubLoaderOptions) {
+    super(options.filePath, {
+      chunkSize: options.chunkSize,
+      chunkOverlap: options.chunkOverlap
+    })
+    this.filePath = options.filePath
+    this.chunkSize = options.chunkSize
+    this.chunkOverlap = options.chunkOverlap
+    this.extractedText = ''
+    this.metadata = null
+  }
+
+  /**
+   * 等待 epub 文件初始化完成
+   * epub 库使用事件机制，需要等待 'end' 事件触发后才能访问文件内容
+   * @param epub epub 实例
+   * @returns 元数据和章节信息
+   */
+  private waitForEpubInit(epub: any): Promise<{ metadata: EpubMetadata; chapters: EpubChapter[] }> {
+    return new Promise((resolve, reject) => {
+      epub.on('end', () => {
+        // 提取元数据
+        const metadata: EpubMetadata = {
+          creator: epub.metadata.creator,
+          creatorFileAs: epub.metadata.creatorFileAs,
+          title: epub.metadata.title,
+          language: epub.metadata.language,
+          subject: epub.metadata.subject,
+          date: epub.metadata.date,
+          description: epub.metadata.description
+        }
+
+        // 提取章节信息
+        const chapters: EpubChapter[] = epub.flow.map((chapter: any, index: number) => ({
+          id: chapter.id,
+          title: chapter.title || `Chapter ${index + 1}`,
+          order: index + 1
+        }))
+
+        resolve({ metadata, chapters })
+      })
+
+      epub.on('error', (error: Error) => {
+        reject(error)
+      })
+
+      epub.parse()
+    })
+  }
+
+  /**
+   * 获取章节内容
+   * @param epub epub 实例
+   * @param chapterId 章节 ID
+   * @returns 章节文本内容
+   */
+  private getChapter(epub: any, chapterId: string): Promise<string> {
+    return new Promise((resolve, reject) => {
+      epub.getChapter(chapterId, (error: Error | null, text: string) => {
+        if (error) {
+          reject(error)
+        } else {
+          resolve(text)
+        }
+      })
+    })
+  }
+
+  /**
+   * 从 epub 文件中提取文本内容
+   * 1. 检查文件是否存在
+   * 2. 初始化 epub 并获取元数据
+   * 3. 遍历所有章节并提取文本
+   * 4. 清理 HTML 标签
+   * 5. 合并所有章节文本
+   */
+  private async extractTextFromEpub() {
+    try {
+      // 检查文件是否存在
+      if (!fs.existsSync(this.filePath)) {
+        throw new Error(`File not found: ${this.filePath}`)
+      }
+
+      const epub = new EPub(this.filePath)
+
+      // 等待 epub 初始化完成并获取元数据
+      const { metadata, chapters } = await this.waitForEpubInit(epub)
+      this.metadata = metadata
+
+      if (!epub.flow || epub.flow.length === 0) {
+        throw new Error('No content found in epub file')
+      }
+
+      const chapterTexts: string[] = []
+
+      // 遍历所有章节
+      for (const chapter of chapters) {
+        try {
+          const content = await this.getChapter(epub, chapter.id)
+
+          if (!content) {
+            continue
+          }
+
+          // 移除 HTML 标签并清理文本
+          const text = content
+            .replace(/<[^>]*>/g, ' ') // 移除所有 HTML 标签
+            .replace(/\s+/g, ' ') // 将多个空白字符替换为单个空格
+            .trim() // 移除首尾空白
+
+          if (text) {
+            chapterTexts.push(text)
+          }
+        } catch (error) {
+          Logger.error(`[EpubLoader] Error processing chapter ${chapter.id}:`, error)
+        }
+      }
+
+      // 使用双换行符连接所有章节文本
+      this.extractedText = chapterTexts.join('\n\n')
+    } catch (error) {
+      Logger.error('[EpubLoader] Error in extractTextFromEpub:', error)
+      throw error
+    }
+  }
+
+  /**
+   * 生成文本块
+   * 重写 BaseLoader 的方法，将提取的文本分割成适当大小的块
+   * 每个块都包含源文件和元数据信息
+   */
+  override async *getUnfilteredChunks() {
+    // 如果还没有提取文本，先提取
+    if (!this.extractedText) {
+      await this.extractTextFromEpub()
+    }
+
+    Logger.info('[EpubLoader] 书名：', this.metadata?.title || '未知书名', ' 文本大小：', this.extractedText.length)
+
+    // 创建文本分块器
+    const chunker = new RecursiveCharacterTextSplitter({
+      chunkSize: this.chunkSize,
+      chunkOverlap: this.chunkOverlap
+    })
+
+    // 清理并分割文本
+    const chunks = await chunker.splitText(cleanString(this.extractedText))
+
+    // 为每个文本块添加元数据
+    for (const chunk of chunks) {
+      yield {
+        pageContent: chunk,
+        metadata: {
+          source: this.filePath,
+          title: this.metadata?.title || '',
+          creator: this.metadata?.creator || '',
+          language: this.metadata?.language || ''
+        }
+      }
+    }
+  }
+}

src/main/loader/index.ts

@@ -0,0 +1,159 @@
+import * as fs from 'node:fs'
+
+import { JsonLoader, LocalPathLoader, RAGApplication, TextLoader } from '@llm-tools/embedjs'
+import type { AddLoaderReturn } from '@llm-tools/embedjs-interfaces'
+import { WebLoader } from '@llm-tools/embedjs-loader-web'
+import { LoaderReturn } from '@shared/config/types'
+import { FileType, KnowledgeBaseParams } from '@types'
+import Logger from 'electron-log'
+
+import { DraftsExportLoader } from './draftsExportLoader'
+import { EpubLoader } from './epubLoader'
+import { OdLoader, OdType } from './odLoader'
+
+// embedjs内置loader类型
+const commonExts = ['.pdf', '.csv', '.docx', '.pptx', '.xlsx', '.md']
+
+export async function addOdLoader(
+  ragApplication: RAGApplication,
+  file: FileType,
+  base: KnowledgeBaseParams,
+  forceReload: boolean
+): Promise<AddLoaderReturn> {
+  const loaderMap: Record<string, OdType> = {
+    '.odt': OdType.OdtLoader,
+    '.ods': OdType.OdsLoader,
+    '.odp': OdType.OdpLoader
+  }
+  const odType = loaderMap[file.ext]
+  if (!odType) {
+    throw new Error('Unknown odType')
+  }
+  return ragApplication.addLoader(
+    new OdLoader({
+      odType,
+      filePath: file.path,
+      chunkSize: base.chunkSize,
+      chunkOverlap: base.chunkOverlap
+    }) as any,
+    forceReload
+  )
+}
+
+export async function addFileLoader(
+  ragApplication: RAGApplication,
+  file: FileType,
+  base: KnowledgeBaseParams,
+  forceReload: boolean
+): Promise<LoaderReturn> {
+  // 内置类型
+  if (commonExts.includes(file.ext)) {
+    const loaderReturn = await ragApplication.addLoader(
+      // @ts-ignore LocalPathLoader
+      new LocalPathLoader({ path: file.path, chunkSize: base.chunkSize, chunkOverlap: base.chunkOverlap }) as any,
+      forceReload
+    )
+    return {
+      entriesAdded: loaderReturn.entriesAdded,
+      uniqueId: loaderReturn.uniqueId,
+      uniqueIds: [loaderReturn.uniqueId],
+      loaderType: loaderReturn.loaderType
+    } as LoaderReturn
+  }
+
+  // 自定义类型
+  if (['.odt', '.ods', '.odp'].includes(file.ext)) {
+    const loaderReturn = await addOdLoader(ragApplication, file, base, forceReload)
+    return {
+      entriesAdded: loaderReturn.entriesAdded,
+      uniqueId: loaderReturn.uniqueId,
+      uniqueIds: [loaderReturn.uniqueId],
+      loaderType: loaderReturn.loaderType
+    } as LoaderReturn
+  }
+
+  // epub 文件处理
+  if (file.ext === '.epub') {
+    const loaderReturn = await ragApplication.addLoader(
+      new EpubLoader({
+        filePath: file.path,
+        chunkSize: base.chunkSize ?? 1000,
+        chunkOverlap: base.chunkOverlap ?? 200
+      }) as any,
+      forceReload
+    )
+    return {
+      entriesAdded: loaderReturn.entriesAdded,
+      uniqueId: loaderReturn.uniqueId,
+      uniqueIds: [loaderReturn.uniqueId],
+      loaderType: loaderReturn.loaderType
+    } as LoaderReturn
+  }
+
+  // DraftsExport类型 (file.ext会自动转换成小写)
+  if (['.draftsexport'].includes(file.ext)) {
+    const loaderReturn = await ragApplication.addLoader(new DraftsExportLoader(file.path) as any, forceReload)
+    return {
+      entriesAdded: loaderReturn.entriesAdded,
+      uniqueId: loaderReturn.uniqueId,
+      uniqueIds: [loaderReturn.uniqueId],
+      loaderType: loaderReturn.loaderType
+    }
+  }
+
+  const fileContent = fs.readFileSync(file.path, 'utf-8')
+
+  // HTML类型
+  if (['.html', '.htm'].includes(file.ext)) {
+    const loaderReturn = await ragApplication.addLoader(
+      new WebLoader({
+        urlOrContent: fileContent,
+        chunkSize: base.chunkSize,
+        chunkOverlap: base.chunkOverlap
+      }) as any,
+      forceReload
+    )
+    return {
+      entriesAdded: loaderReturn.entriesAdded,
+      uniqueId: loaderReturn.uniqueId,
+      uniqueIds: [loaderReturn.uniqueId],
+      loaderType: loaderReturn.loaderType
+    }
+  }
+
+  // JSON类型
+  if (['.json'].includes(file.ext)) {
+    let jsonObject = {}
+    let jsonParsed = true
+    try {
+      jsonObject = JSON.parse(fileContent)
+    } catch (error) {
+      jsonParsed = false
+      Logger.warn('[KnowledgeBase] failed parsing json file, failling back to text processing:', file.path, error)
+    }
+    if (jsonParsed) {
+      const loaderReturn = await ragApplication.addLoader(new JsonLoader({ object: jsonObject }))
+      return {
+        entriesAdded: loaderReturn.entriesAdded,
+        uniqueId: loaderReturn.uniqueId,
+        uniqueIds: [loaderReturn.uniqueId],
+        loaderType: loaderReturn.loaderType
+      }
+    }
+  }
+
+  // 文本类型
+  const loaderReturn = await ragApplication.addLoader(
+    new TextLoader({ text: fileContent, chunkSize: base.chunkSize, chunkOverlap: base.chunkOverlap }) as any,
+    forceReload
+  )
+
+  Logger.info('[KnowledgeBase] processing file', file.path)
+
+  return {
+    entriesAdded: loaderReturn.entriesAdded,
+    uniqueId: loaderReturn.uniqueId,
+    uniqueIds: [loaderReturn.uniqueId],
+    loaderType: loaderReturn.loaderType
+  } as LoaderReturn
+}

src/main/loader/odLoader.ts

@@ -0,0 +1,71 @@
+import { RecursiveCharacterTextSplitter } from '@langchain/textsplitters'
+import { BaseLoader } from '@llm-tools/embedjs-interfaces'
+import { cleanString } from '@llm-tools/embedjs-utils'
+import md5 from 'md5'
+import { OfficeParserConfig, parseOfficeAsync } from 'officeparser'
+
+export enum OdType {
+  OdtLoader = 'OdtLoader',
+  OdsLoader = 'OdsLoader',
+  OdpLoader = 'OdpLoader',
+  undefined = 'undefined'
+}
+
+export class OdLoader<OdType> extends BaseLoader<{ type: string }> {
+  private readonly odType: OdType
+  private readonly filePath: string
+  private extractedText: string
+  private config: OfficeParserConfig
+
+  constructor({
+    odType,
+    filePath,
+    chunkSize,
+    chunkOverlap
+  }: {
+    odType: OdType
+    filePath: string
+    chunkSize?: number
+    chunkOverlap?: number
+  }) {
+    super(`${odType}_${md5(filePath)}`, { filePath }, chunkSize ?? 1000, chunkOverlap ?? 0)
+    this.odType = odType
+    this.filePath = filePath
+    this.extractedText = ''
+    this.config = {
+      newlineDelimiter: ' ',
+      ignoreNotes: false
+    }
+  }
+
+  private async extractTextFromOdt() {
+    try {
+      this.extractedText = await parseOfficeAsync(this.filePath, this.config)
+    } catch (err) {
+      console.error('odLoader error', err)
+      throw err
+    }
+  }
+
+  override async *getUnfilteredChunks() {
+    if (!this.extractedText) {
+      await this.extractTextFromOdt()
+    }
+    const chunker = new RecursiveCharacterTextSplitter({
+      chunkSize: this.chunkSize,
+      chunkOverlap: this.chunkOverlap
+    })
+
+    const chunks = await chunker.splitText(cleanString(this.extractedText))
+
+    for (const chunk of chunks) {
+      yield {
+        pageContent: chunk,
+        metadata: {
+          type: this.odType as string,
+          source: this.filePath
+        }
+      }
+    }
+  }
+}

src/main/services/FileStorage.ts

@@ -388,7 +388,7 @@ class FileStorage {
       }
 
       // 如果URL中有文件名，使用URL中的文件名
-      const urlFilename = url.split('/').pop()
+      const urlFilename = url.split('/').pop()?.split('?')[0]
       if (urlFilename && urlFilename.includes('.')) {
         filename = urlFilename
       }

src/main/services/KnowledgeService.ts

@@ -1,18 +1,21 @@
 import * as fs from 'node:fs'
 import path from 'node:path'
 
-import { LocalPathLoader, RAGApplication, RAGApplicationBuilder, TextLoader } from '@llm-tools/embedjs'
-import type { AddLoaderReturn, ExtractChunkData } from '@llm-tools/embedjs-interfaces'
+import { RAGApplication, RAGApplicationBuilder, TextLoader } from '@llm-tools/embedjs'
+import type { ExtractChunkData } from '@llm-tools/embedjs-interfaces'
 import { LibSqlDb } from '@llm-tools/embedjs-libsql'
-import { MarkdownLoader } from '@llm-tools/embedjs-loader-markdown'
-import { DocxLoader, ExcelLoader, PptLoader } from '@llm-tools/embedjs-loader-msoffice'
-import { PdfLoader } from '@llm-tools/embedjs-loader-pdf'
 import { SitemapLoader } from '@llm-tools/embedjs-loader-sitemap'
 import { WebLoader } from '@llm-tools/embedjs-loader-web'
 import { AzureOpenAiEmbeddings, OpenAiEmbeddings } from '@llm-tools/embedjs-openai'
+import { addFileLoader } from '@main/loader'
 import { getInstanceName } from '@main/utils'
+import { getAllFiles } from '@main/utils/file'
+import type { LoaderReturn } from '@shared/config/types'
 import { FileType, KnowledgeBaseParams, KnowledgeItem } from '@types'
 import { app } from 'electron'
+import { v4 as uuidv4 } from 'uuid'
+
+import { windowService } from './WindowService'
 
 class KnowledgeService {
   private storageDir = path.join(app.getPath('userData'), 'Data', 'KnowledgeBase')
@@ -35,6 +38,7 @@ class KnowledgeService {
     baseURL,
     dimensions
   }: KnowledgeBaseParams): Promise<RAGApplication> => {
+    const batchSize = 10
     return new RAGApplicationBuilder()
       .setModel('NO_MODEL')
       .setEmbeddingModel(
@@ -45,14 +49,14 @@ class KnowledgeService {
               azureOpenAIApiDeploymentName: model,
               azureOpenAIApiInstanceName: getInstanceName(baseURL),
               dimensions,
-              batchSize: 10
+              batchSize
             })
           : new OpenAiEmbeddings({
               model,
               apiKey,
               configuration: { baseURL },
               dimensions,
-              batchSize: 10
+              batchSize
             })
       )
       .setVectorDatabase(new LibSqlDb({ path: path.join(this.storageDir, id) }))
@@ -78,70 +82,103 @@ class KnowledgeService {
   public add = async (
     _: Electron.IpcMainInvokeEvent,
     { base, item, forceReload = false }: { base: KnowledgeBaseParams; item: KnowledgeItem; forceReload: boolean }
-  ): Promise<AddLoaderReturn> => {
+  ): Promise<LoaderReturn> => {
     const ragApplication = await this.getRagApplication(base)
 
+    const sendDirectoryProcessingPercent = (totalFiles: number, processedFiles: number) => {
+      const mainWindow = windowService.getMainWindow()
+      mainWindow?.webContents.send(base.id, (processedFiles / totalFiles) * 100)
+    }
+
     if (item.type === 'directory') {
       const directory = item.content as string
-      return await ragApplication.addLoader(new LocalPathLoader({ path: directory }), forceReload)
+      const files = getAllFiles(directory)
+      const totalFiles = files.length
+      let processedFiles = 0
+
+      const loaderPromises = files.map(async (file) => {
+        const result = await addFileLoader(ragApplication, file, base, forceReload)
+        processedFiles++
+        sendDirectoryProcessingPercent(totalFiles, processedFiles)
+        return result
+      })
+
+      const loaderResults = await Promise.allSettled(loaderPromises)
+      // @ts-ignore uniqueId
+      const uniqueIds = loaderResults.filter((result) => result.status === 'fulfilled').map((result) => result.uniqueId)
+
+      return {
+        entriesAdded: loaderResults.length,
+        uniqueId: `DirectoryLoader_${uuidv4()}`,
+        uniqueIds,
+        loaderType: 'DirectoryLoader'
+      } as LoaderReturn
     }
 
     if (item.type === 'url') {
       const content = item.content as string
       if (content.startsWith('http')) {
-        // @ts-ignore loader type
-        return await ragApplication.addLoader(new WebLoader({ urlOrContent: content }), forceReload)
+        const loaderReturn = await ragApplication.addLoader(
+          new WebLoader({ urlOrContent: content, chunkSize: base.chunkSize, chunkOverlap: base.chunkOverlap }) as any,
+          forceReload
+        )
+        return {
+          entriesAdded: loaderReturn.entriesAdded,
+          uniqueId: loaderReturn.uniqueId,
+          uniqueIds: [loaderReturn.uniqueId],
+          loaderType: loaderReturn.loaderType
+        } as LoaderReturn
       }
     }
 
     if (item.type === 'sitemap') {
       const content = item.content as string
       // @ts-ignore loader type
-      return await ragApplication.addLoader(new SitemapLoader({ url: content }), forceReload)
+      const loaderReturn = await ragApplication.addLoader(
+        new SitemapLoader({ url: content, chunkSize: base.chunkSize, chunkOverlap: base.chunkOverlap }) as any,
+        forceReload
+      )
+      return {
+        entriesAdded: loaderReturn.entriesAdded,
+        uniqueId: loaderReturn.uniqueId,
+        uniqueIds: [loaderReturn.uniqueId],
+        loaderType: loaderReturn.loaderType
+      } as LoaderReturn
     }
 
     if (item.type === 'note') {
       const content = item.content as string
-      return await ragApplication.addLoader(new TextLoader({ text: content }), forceReload)
+      console.debug('chunkSize', base.chunkSize)
+      const loaderReturn = await ragApplication.addLoader(
+        new TextLoader({ text: content, chunkSize: base.chunkSize, chunkOverlap: base.chunkOverlap }),
+        forceReload
+      )
+      return {
+        entriesAdded: loaderReturn.entriesAdded,
+        uniqueId: loaderReturn.uniqueId,
+        uniqueIds: [loaderReturn.uniqueId],
+        loaderType: loaderReturn.loaderType
+      } as LoaderReturn
     }
 
     if (item.type === 'file') {
       const file = item.content as FileType
 
-      if (file.ext === '.pdf') {
-        return await ragApplication.addLoader(new PdfLoader({ filePathOrUrl: file.path }) as any, forceReload)
+      return await addFileLoader(ragApplication, file, base, forceReload)
     }
 
-      if (file.ext === '.docx') {
-        return await ragApplication.addLoader(new DocxLoader({ filePathOrUrl: file.path }) as any, forceReload)
-      }
-
-      if (file.ext === '.pptx') {
-        return await ragApplication.addLoader(new PptLoader({ filePathOrUrl: file.path }) as any, forceReload)
-      }
-
-      if (file.ext === '.xlsx') {
-        return await ragApplication.addLoader(new ExcelLoader({ filePathOrUrl: file.path }) as any, forceReload)
-      }
-
-      if (['.md'].includes(file.ext)) {
-        return await ragApplication.addLoader(new MarkdownLoader({ filePathOrUrl: file.path }) as any, forceReload)
-      }
-
-      const fileContent = fs.readFileSync(file.path, 'utf-8')
-
-      return await ragApplication.addLoader(new TextLoader({ text: fileContent }), forceReload)
-    }
-
-    return { entriesAdded: 0, uniqueId: '', loaderType: '' }
+    return { entriesAdded: 0, uniqueId: '', uniqueIds: [''], loaderType: '' }
   }
 
   public remove = async (
     _: Electron.IpcMainInvokeEvent,
-    { uniqueId, base }: { uniqueId: string; base: KnowledgeBaseParams }
+    { uniqueId, uniqueIds, base }: { uniqueId: string; uniqueIds: string[]; base: KnowledgeBaseParams }
   ): Promise<void> => {
     const ragApplication = await this.getRagApplication(base)
-    await ragApplication.deleteLoader(uniqueId)
+    console.debug(`[ KnowledgeService Remove Item UniqueId: ${uniqueId}]`)
+    for (const id of uniqueIds) {
+      await ragApplication.deleteLoader(id)
+    }
   }
 
   public search = async (

src/main/services/ShortcutService.ts

@@ -22,7 +22,11 @@ function getShortcutHandler(shortcut: Shortcut) {
     case 'show_app':
       return (window: BrowserWindow) => {
         if (window.isVisible()) {
+          if (window.isFocused()) {
             window.hide()
+          } else {
+            window.focus()
+          }
         } else {
           window.show()
           window.focus()
@@ -43,8 +47,8 @@ function formatShortcutKey(shortcut: string[]): string {
 
 function handleZoom(delta: number) {
   return (window: BrowserWindow) => {
-    const currentZoom = window.webContents.getZoomFactor()
-    const newZoom = currentZoom + delta
+    const currentZoom = configManager.getZoomFactor()
+    const newZoom = Number((currentZoom + delta).toFixed(1))
     if (newZoom >= 0.1 && newZoom <= 5.0) {
       window.webContents.setZoomFactor(newZoom)
       configManager.setZoomFactor(newZoom)
@@ -52,8 +56,65 @@ function handleZoom(delta: number) {
   }
 }
 
+const convertShortcutRecordedByKeyboardEventKeyValueToElectronGlobalShortcutFormat = (
+  shortcut: string | string[]
+): string => {
+  const accelerator = (() => {
+    if (Array.isArray(shortcut)) {
+      return shortcut
+    } else {
+      return shortcut.split('+').map((key) => key.trim())
+    }
+  })()
+
+  return accelerator
+    .map((key) => {
+      switch (key) {
+        case 'Command':
+          return 'CommandOrControl'
+        case 'Control':
+          return 'Control'
+        case 'Ctrl':
+          return 'Control'
+        case 'ArrowUp':
+          return 'Up'
+        case 'ArrowDown':
+          return 'Down'
+        case 'ArrowLeft':
+          return 'Left'
+        case 'ArrowRight':
+          return 'Right'
+        case 'AltGraph':
+          return 'Alt'
+        case 'Slash':
+          return '/'
+        case 'Semicolon':
+          return ';'
+        case 'BracketLeft':
+          return '['
+        case 'BracketRight':
+          return ']'
+        case 'Backslash':
+          return '\\'
+        case 'Quote':
+          return "'"
+        case 'Comma':
+          return ','
+        case 'Minus':
+          return '-'
+        case 'Equal':
+          return '='
+        default:
+          return key
+      }
+    })
+    .join('+')
+}
+
 export function registerShortcuts(window: BrowserWindow) {
+  window.once('ready-to-show', () => {
     window.webContents.setZoomFactor(configManager.getZoomFactor())
+  })
 
   const register = () => {
     if (window.isDestroyed()) return
@@ -75,11 +136,11 @@ export function registerShortcuts(window: BrowserWindow) {
 
         const accelerator = formatShortcutKey(shortcut.shortcut)
 
-        if (shortcut.key === 'show_app') {
+        if (shortcut.key === 'show_app' && shortcut.enabled) {
           showAppAccelerator = accelerator
         }
 
-        if (shortcut.key === 'mini_window') {
+        if (shortcut.key === 'mini_window' && shortcut.enabled) {
           showMiniWindowAccelerator = accelerator
         }
 
@@ -100,7 +161,10 @@ export function registerShortcuts(window: BrowserWindow) {
         }
 
         if (shortcut.enabled) {
-          globalShortcut.register(formatShortcutKey(shortcut.shortcut), () => handler(window))
+          const accelerator = convertShortcutRecordedByKeyboardEventKeyValueToElectronGlobalShortcutFormat(
+            shortcut.shortcut
+          )
+          globalShortcut.register(accelerator, () => handler(window))
         }
       } catch (error) {
         Logger.error(`[ShortcutService] Failed to register shortcut ${shortcut.key}`)
@@ -116,12 +180,16 @@ export function registerShortcuts(window: BrowserWindow) {
 
       if (showAppAccelerator) {
         const handler = getShortcutHandler({ key: 'show_app' } as Shortcut)
-        handler && globalShortcut.register(showAppAccelerator, () => handler(window))
+        const accelerator =
+          convertShortcutRecordedByKeyboardEventKeyValueToElectronGlobalShortcutFormat(showAppAccelerator)
+        handler && globalShortcut.register(accelerator, () => handler(window))
       }
 
       if (showMiniWindowAccelerator) {
         const handler = getShortcutHandler({ key: 'mini_window' } as Shortcut)
-        handler && globalShortcut.register(showMiniWindowAccelerator, () => handler(window))
+        const accelerator =
+          convertShortcutRecordedByKeyboardEventKeyValueToElectronGlobalShortcutFormat(showMiniWindowAccelerator)
+        handler && globalShortcut.register(accelerator, () => handler(window))
       }
     } catch (error) {
       Logger.error('[ShortcutService] Failed to unregister shortcuts')

src/main/services/WindowService.ts

@@ -17,6 +17,7 @@ export class WindowService {
   private wasFullScreen: boolean = false
   private selectionMenuWindow: BrowserWindow | null = null
   private lastSelectedText: string = ''
+  private contextMenu: Menu | null = null
 
   public static getInstance(): WindowService {
     if (!WindowService.instance) {
@@ -27,6 +28,7 @@ export class WindowService {
 
   public createMainWindow(): BrowserWindow {
     if (this.mainWindow && !this.mainWindow.isDestroyed()) {
+      this.mainWindow.show()
       return this.mainWindow
     }
 
@@ -60,7 +62,8 @@ export class WindowService {
         preload: join(__dirname, '../preload/index.js'),
         sandbox: false,
         webSecurity: false,
-        webviewTag: true
+        webviewTag: true,
+        allowRunningInsecureContent: true
       }
     })
 
@@ -110,15 +113,25 @@ export class WindowService {
   }
 
   private setupContextMenu(mainWindow: BrowserWindow) {
-    mainWindow.webContents.on('context-menu', () => {
+    if (!this.contextMenu) {
       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()
+      this.contextMenu = new Menu()
+      this.contextMenu.append(new MenuItem({ label: common.copy, role: 'copy' }))
+      this.contextMenu.append(new MenuItem({ label: common.paste, role: 'paste' }))
+      this.contextMenu.append(new MenuItem({ label: common.cut, role: 'cut' }))
+    }
+
+    mainWindow.webContents.on('context-menu', () => {
+      this.contextMenu?.popup()
+    })
+
+    // Handle webview context menu
+    mainWindow.webContents.on('did-attach-webview', (_, webContents) => {
+      webContents.on('context-menu', () => {
+        this.contextMenu?.popup()
+      })
     })
   }
 
@@ -152,6 +165,24 @@ export class WindowService {
     mainWindow.webContents.setWindowOpenHandler((details) => {
       const { url } = details
 
+      const oauthProviderUrls = [
+        'https://account.siliconflow.cn/oauth',
+        'https://cloud.siliconflow.cn/expensebill',
+        'https://aihubmix.com/token',
+        'https://aihubmix.com/topup'
+      ]
+
+      if (oauthProviderUrls.some((link) => url.startsWith(link))) {
+        return {
+          action: 'allow',
+          overrideBrowserWindowOptions: {
+            webPreferences: {
+              partition: 'persist:webview'
+            }
+          }
+        }
+      }
+
       if (url.includes('http://file/')) {
         const fileName = url.replace('http://file/', '')
         const storageDir = path.join(app.getPath('userData'), 'Data', 'Files')
@@ -218,17 +249,32 @@ export class WindowService {
       event.preventDefault()
       mainWindow.hide()
     })
+
+    mainWindow.on('closed', () => {
+      this.mainWindow = null
+    })
+
+    mainWindow.on('show', () => {
+      if (this.miniWindow && !this.miniWindow.isDestroyed()) {
+        this.miniWindow.hide()
+      }
+    })
   }
 
   public showMainWindow() {
-    if (this.mainWindow) {
+    if (this.miniWindow && !this.miniWindow.isDestroyed()) {
+      this.miniWindow.hide()
+    }
+
+    if (this.mainWindow && !this.mainWindow.isDestroyed()) {
       if (this.mainWindow.isMinimized()) {
-        return this.mainWindow.restore()
+        this.mainWindow.restore()
       }
       this.mainWindow.show()
       this.mainWindow.focus()
     } else {
-      this.createMainWindow()
+      this.mainWindow = this.createMainWindow()
+      this.mainWindow.focus()
     }
   }
 
@@ -239,7 +285,10 @@ export class WindowService {
       return
     }
 
-    if (this.selectionMenuWindow) {
+    if (this.mainWindow && !this.mainWindow.isDestroyed()) {
+      this.mainWindow.hide()
+    }
+    if (this.selectionMenuWindow && !this.selectionMenuWindow.isDestroyed()) {
       this.selectionMenuWindow.hide()
     }
 

src/main/utils/aes.ts

@@ -1,22 +1,19 @@
 import * as crypto from 'crypto'
 
-// 定义密钥和初始化向量（IV）
-const secretKey = 'kDQvWz5slot3syfucoo53X6KKsEUJoeFikpiUWRJTLIo3zcUPpFvEa009kK13KCr'
-const iv = Buffer.from('Cherry Studio', 'hex')
-
 // 加密函数
-export function encrypt(text: string): { iv: string; encryptedData: string } {
-  const cipher = crypto.createCipheriv('aes-256-cbc', Buffer.from(secretKey), iv)
+export function encrypt(text: string, secretKey: string, iv: string): { iv: string; encryptedData: string } {
+  const _iv = Buffer.from(iv, 'hex')
+  const cipher = crypto.createCipheriv('aes-256-cbc', Buffer.from(secretKey), _iv)
   let encrypted = cipher.update(text, 'utf8', 'hex')
   encrypted += cipher.final('hex')
   return {
-    iv: iv.toString('hex'),
+    iv: _iv.toString('hex'),
     encryptedData: encrypted
   }
 }
 
 // 解密函数
-export function decrypt(encryptedData: string, iv: string): string {
+export function decrypt(encryptedData: string, iv: string, secretKey: string): string {
   const decipher = crypto.createDecipheriv('aes-256-cbc', Buffer.from(secretKey), Buffer.from(iv, 'hex'))
   let decrypted = decipher.update(encryptedData, 'hex', 'utf8')
   decrypted += decipher.final('utf8')

src/main/utils/file.ts

@@ -1,5 +1,9 @@
+import * as fs from 'node:fs'
+import path from 'node:path'
+
 import { audioExts, documentExts, imageExts, textExts, videoExts } from '@shared/config/constant'
-import { FileTypes } from '@types'
+import { FileType, FileTypes } from '@types'
+import { v4 as uuidv4 } from 'uuid'
 
 export function getFileType(ext: string): FileTypes {
   ext = ext.toLowerCase()
@@ -10,3 +14,43 @@ export function getFileType(ext: string): FileTypes {
   if (documentExts.includes(ext)) return FileTypes.DOCUMENT
   return FileTypes.OTHER
 }
+export function getAllFiles(dirPath: string, arrayOfFiles: FileType[] = []): FileType[] {
+  const files = fs.readdirSync(dirPath)
+
+  files.forEach((file) => {
+    if (file.startsWith('.')) {
+      return
+    }
+
+    const fullPath = path.join(dirPath, file)
+    if (fs.statSync(fullPath).isDirectory()) {
+      arrayOfFiles = getAllFiles(fullPath, arrayOfFiles)
+    } else {
+      const ext = path.extname(file)
+      const fileType = getFileType(ext)
+
+      if ([FileTypes.OTHER, FileTypes.IMAGE, FileTypes.VIDEO, FileTypes.AUDIO].includes(fileType)) {
+        return
+      }
+
+      const name = path.basename(file)
+      const size = fs.statSync(fullPath).size
+
+      const fileItem: FileType = {
+        id: uuidv4(),
+        name,
+        path: fullPath,
+        size,
+        ext,
+        count: 1,
+        origin_name: name,
+        type: fileType,
+        created_at: new Date()
+      }
+
+      arrayOfFiles.push(fileItem)
+    }
+  })
+
+  return arrayOfFiles
+}

src/preload/index.d.ts

@@ -1,9 +1,10 @@
 import { ElectronAPI } from '@electron-toolkit/preload'
 import type { FileMetadataResponse, ListFilesResponse, UploadFileResponse } from '@google/generative-ai/server'
-import { AddLoaderReturn, ExtractChunkData } from '@llm-tools/embedjs-interfaces'
+import { ExtractChunkData } from '@llm-tools/embedjs-interfaces'
 import { FileType } from '@renderer/types'
 import { WebDavConfig } from '@renderer/types'
 import { AppInfo, KnowledgeBaseParams, KnowledgeItem, LanguageVarious } from '@renderer/types'
+import type { LoaderReturn } from '@shared/config/types'
 import type { OpenDialogOptions } from 'electron'
 import type { UpdateInfo } from 'electron-updater'
 import { Readable } from 'stream'
@@ -78,8 +79,16 @@ declare global {
           base: KnowledgeBaseParams
           item: KnowledgeItem
           forceReload?: boolean
-        }) => Promise<AddLoaderReturn>
-        remove: ({ uniqueId, base }: { uniqueId: string; base: KnowledgeBaseParams }) => Promise<void>
+        }) => Promise<LoaderReturn>
+        remove: ({
+          uniqueId,
+          uniqueIds,
+          base
+        }: {
+          uniqueId: string
+          uniqueIds: string[]
+          base: KnowledgeBaseParams
+        }) => Promise<void>
         search: ({ search, base }: { search: string; base: KnowledgeBaseParams }) => Promise<ExtractChunkData[]>
       }
       window: {
@@ -106,6 +115,13 @@ declare global {
         close: () => Promise<void>
         toggle: () => Promise<void>
       }
+      aes: {
+        encrypt: (text: string, secretKey: string, iv: string) => Promise<{ iv: string; encryptedData: string }>
+        decrypt: (encryptedData: string, iv: string, secretKey: string) => Promise<string>
+      }
+      shell: {
+        openExternal: (url: string, options?: OpenExternalOptions) => Promise<void>
+      }
     }
   }
 }

src/preload/index.ts

@@ -1,6 +1,6 @@
 import { electronAPI } from '@electron-toolkit/preload'
 import { FileType, KnowledgeBaseParams, KnowledgeItem, Shortcut, WebDavConfig } from '@types'
-import { contextBridge, ipcRenderer, OpenDialogOptions } from 'electron'
+import { contextBridge, ipcRenderer, OpenDialogOptions, shell } from 'electron'
 
 // Custom APIs for renderer
 const api = {
@@ -71,8 +71,8 @@ const api = {
       item: KnowledgeItem
       forceReload?: boolean
     }) => ipcRenderer.invoke('knowledge-base:add', { base, item, forceReload }),
-    remove: ({ uniqueId, base }: { uniqueId: string; base: KnowledgeBaseParams }) =>
-      ipcRenderer.invoke('knowledge-base:remove', { uniqueId, base }),
+    remove: ({ uniqueId, uniqueIds, base }: { uniqueId: string; uniqueIds: string[]; base: KnowledgeBaseParams }) =>
+      ipcRenderer.invoke('knowledge-base:remove', { uniqueId, uniqueIds, base }),
     search: ({ search, base }: { search: string; base: KnowledgeBaseParams }) =>
       ipcRenderer.invoke('knowledge-base:search', { search, base })
   },
@@ -99,6 +99,14 @@ const api = {
     hide: () => ipcRenderer.invoke('miniwindow:hide'),
     close: () => ipcRenderer.invoke('miniwindow:close'),
     toggle: () => ipcRenderer.invoke('miniwindow:toggle')
+  },
+  aes: {
+    encrypt: (text: string, secretKey: string, iv: string) => ipcRenderer.invoke('aes:encrypt', text, secretKey, iv),
+    decrypt: (encryptedData: string, iv: string, secretKey: string) =>
+      ipcRenderer.invoke('aes:decrypt', encryptedData, iv, secretKey)
+  },
+  shell: {
+    openExternal: shell.openExternal
   }
 }
 

src/renderer/index.html

@@ -6,6 +6,7 @@
   <meta name="viewport" content="initial-scale=1, width=device-width" />
   <meta http-equiv="Content-Security-Policy"
     content="default-src 'self'; connect-src blob: *; script-src 'self' 'unsafe-eval' *; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' *; font-src 'self' data: *; img-src 'self' data: file: * blob:; frame-src * file:" />
+  <title>Cherry Studio</title>
 
   <style>
     html,

src/renderer/src/App.tsx

@@ -10,6 +10,7 @@ import TopViewContainer from './components/TopView'
 import AntdProvider from './context/AntdProvider'
 import { SyntaxHighlighterProvider } from './context/SyntaxHighlighterProvider'
 import { ThemeProvider } from './context/ThemeProvider'
+import NavigationHandler from './handler/NavigationHandler'
 import AgentsPage from './pages/agents/AgentsPage'
 import AppsPage from './pages/apps/AppsPage'
 import FilesPage from './pages/files/FilesPage'
@@ -28,6 +29,8 @@ function App(): JSX.Element {
             <PersistGate loading={null} persistor={persistor}>
               <TopViewContainer>
                 <HashRouter>
+                  <NavigationHandler />
+                  {/* 添加导航处理组件 */}
                   <Sidebar />
                   <Routes>
                     <Route path="/" element={<HomePage />} />

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

@@ -1,91 +1,96 @@
 @font-face {
-  font-family: "iconfont"; /* Project id 4753420 */
-  src: url('iconfont.woff2?t=1736309723926') format('woff2'),
-       url('iconfont.woff?t=1736309723926') format('woff'),
-       url('iconfont.ttf?t=1736309723926') format('truetype');
+  font-family: 'iconfont'; /* Project id 4753420 */
+  src: url('iconfont.woff2?t=1738750230250') format('woff2');
 }
 
 .iconfont {
-  font-family: "iconfont" !important;
+  font-family: 'iconfont' !important;
   font-size: 16px;
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-thinking:before {
+  content: '\e65b';
+}
+
 .icon-at:before {
-  content: "\e623";
+  content: '\e623';
 }
 
 .icon-icon-adaptive-width:before {
-  content: "\e87a";
+  content: '\e87a';
+}
+
+.icon-at1:before {
+  content: '\e630';
 }
 
 .icon-a-darkmode:before {
-  content: "\e6cd";
+  content: '\e6cd';
 }
 
 .icon-ai-model:before {
-  content: "\e827";
+  content: '\e827';
 }
 
 .icon-ai-model1:before {
-  content: "\ec09";
+  content: '\ec09';
 }
 
 .icon-gridlines:before {
-  content: "\e942";
+  content: '\e942';
 }
 
 .icon-inbox:before {
-  content: "\e869";
+  content: '\e869';
 }
 
 .icon-business-smart-assistant:before {
-  content: "\e601";
+  content: '\e601';
 }
 
 .icon-copy:before {
-  content: "\e6ae";
+  content: '\e6ae';
 }
 
 .icon-ic_send:before {
-  content: "\e795";
+  content: '\e795';
 }
 
 .icon-dark1:before {
-  content: "\e72f";
+  content: '\e72f';
 }
 
 .icon-theme-light:before {
-  content: "\e6b7";
+  content: '\e6b7';
 }
 
 .icon-translate_line:before {
-  content: "\e7de";
+  content: '\e7de';
 }
 
 .icon-history:before {
-  content: "\e758";
+  content: '\e758';
 }
 
 .icon-hide-sidebar:before {
-  content: "\e8eb";
+  content: '\e8eb';
 }
 
 .icon-show-sidebar:before {
-  content: "\e944";
+  content: '\e944';
 }
 
 .icon-appstore:before {
-  content: "\e792";
+  content: '\e792';
 }
 
 .icon-chat:before {
-  content: "\e615";
+  content: '\e615';
 }
 
 .icon-setting:before {
-  content: "\e78e";
+  content: '\e78e';
 }
-

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

@@ -0,0 +1,27 @@
+<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="256" height="256" rx="32" fill="#0057CE"/>
+<mask id="path-2-inside-1_4113_89308" fill="white">
+<path d="M169.6 131.626C173.075 129.641 176.32 128.241 180.1 126.943C183.74 125.695 187.444 124.664 191.186 123.735C194.915 122.806 198.682 122.017 202.449 121.228C206.216 120.439 209.958 119.675 213.598 118.314C231.429 111.619 242.221 93.6357 239.612 74.9396C237.003 56.2435 221.692 41.8237 202.691 40.1564C194.062 39.4055 185.726 41.4164 178.013 44.9418C170.326 48.4545 163.288 53.4435 157.166 59.158C144.795 70.676 135.657 85.4649 130.083 101.208C124.47 117.054 122.37 134.095 123.694 150.806C124.356 159.129 125.883 167.504 128.326 175.509C130.719 183.362 134.181 191.469 138.839 198.342C136.828 185.475 138.559 172.175 143.917 160.262C149.262 148.375 158.121 138.193 169.6 131.626Z"/>
+</mask>
+<path d="M169.6 131.626C173.075 129.641 176.32 128.241 180.1 126.943C183.74 125.695 187.444 124.664 191.186 123.735C194.915 122.806 198.682 122.017 202.449 121.228C206.216 120.439 209.958 119.675 213.598 118.314C231.429 111.619 242.221 93.6357 239.612 74.9396C237.003 56.2435 221.692 41.8237 202.691 40.1564C194.062 39.4055 185.726 41.4164 178.013 44.9418C170.326 48.4545 163.288 53.4435 157.166 59.158C144.795 70.676 135.657 85.4649 130.083 101.208C124.47 117.054 122.37 134.095 123.694 150.806C124.356 159.129 125.883 167.504 128.326 175.509C130.719 183.362 134.181 191.469 138.839 198.342C136.828 185.475 138.559 172.175 143.917 160.262C149.262 148.375 158.121 138.193 169.6 131.626Z" fill="white" stroke="white" stroke-width="32" mask="url(#path-2-inside-1_4113_89308)"/>
+<path d="M162.246 150.4C161.915 153.913 163.073 157.464 165.542 160.06C168.011 162.657 171.499 164.031 174.668 165.253C178.13 166.577 181.12 167.658 184.353 169.529C187.433 171.311 190.157 173.526 192.435 176.262C201.802 187.449 200.937 203.867 190.462 214.049C179.988 224.23 163.379 224.778 152.243 215.321C149.404 212.903 146.884 209.798 144.81 206.756C141.654 186.52 147.775 165.317 162.246 150.4Z" fill="white"/>
+<mask id="path-4-outside-2_4113_89308" maskUnits="userSpaceOnUse" x="136" y="138.4" width="71" height="92" fill="black">
+<rect fill="white" x="136" y="138.4" width="71" height="92"/>
+<path d="M162.246 150.4C165.542 153.666 163.073 157.464 165.542 160.06C168.011 162.657 171.499 164.031 174.668 165.253C178.13 166.577 181.12 167.658 184.353 169.529C187.433 171.311 190.157 173.526 192.435 176.262C201.802 187.449 200.937 203.867 190.462 214.049C179.988 224.23 163.379 224.778 152.243 215.321C149.404 212.903 146.884 209.798 144.81 206.756C141.654 186.52 147.775 165.317 162.246 150.4Z"/>
+</mask>
+<path d="M162.246 150.4C165.542 153.666 163.073 157.464 165.542 160.06C168.011 162.657 171.499 164.031 174.668 165.253C178.13 166.577 181.12 167.658 184.353 169.529C187.433 171.311 190.157 173.526 192.435 176.262C201.802 187.449 200.937 203.867 190.462 214.049C179.988 224.23 163.379 224.778 152.243 215.321C149.404 212.903 146.884 209.798 144.81 206.756C141.654 186.52 147.775 165.317 162.246 150.4Z" stroke="#0057CE" stroke-width="16" mask="url(#path-4-outside-2_4113_89308)"/>
+<mask id="path-5-inside-3_4113_89308" fill="white">
+<path d="M50.4113 61.9063C63.3547 61.8935 75.9164 69.008 85.0163 76.9879C94.6761 85.4641 102.16 96.2567 107.085 107.991C112.036 119.789 114.416 132.542 114.327 145.282C114.238 157.665 111.769 171.079 106.296 182.394C105.774 167.821 100.123 153.885 90.3107 143.003C88.5926 141.107 86.7981 139.389 84.6599 137.938C82.5218 136.487 80.2691 135.418 77.8382 134.565C73.1164 132.911 67.7838 132.134 62.8711 131.6C57.8057 131.04 52.7149 130.709 47.6622 129.971C42.4695 129.207 37.8114 128.087 33.1787 125.427C19.688 117.715 13.1463 102.009 17.1808 87.1441C21.2153 72.2661 34.846 61.919 50.4113 61.9063Z"/>
+</mask>
+<path d="M50.4113 61.9063C63.3547 61.8935 75.9164 69.008 85.0163 76.9879C94.6761 85.4641 102.16 96.2567 107.085 107.991C112.036 119.789 114.416 132.542 114.327 145.282C114.238 157.665 111.769 171.079 106.296 182.394C105.774 167.821 100.123 153.885 90.3107 143.003C88.5926 141.107 86.7981 139.389 84.6599 137.938C82.5218 136.487 80.2691 135.418 77.8382 134.565C73.1164 132.911 67.7838 132.134 62.8711 131.6C57.8057 131.04 52.7149 130.709 47.6622 129.971C42.4695 129.207 37.8114 128.087 33.1787 125.427C19.688 117.715 13.1463 102.009 17.1808 87.1441C21.2153 72.2661 34.846 61.919 50.4113 61.9063Z" fill="white" stroke="white" stroke-width="32" mask="url(#path-5-inside-3_4113_89308)"/>
+<mask id="path-6-inside-4_4113_89308" fill="white">
+<path d="M82.5802 149.38C81.3584 148.03 80.0857 146.745 78.673 145.6C80.4294 148.578 80.6075 151.95 79.8694 155.196C79.1312 158.429 77.5021 161.419 75.4403 163.99C73.3149 166.625 70.8204 168.725 68.1095 170.71C65.7423 172.441 62.2932 174.656 60.1551 176.73C53.8679 182.839 52.5824 192.384 57.0369 199.893C61.4914 207.415 70.5277 210.979 78.9912 208.535C83.662 207.186 87.6202 204.144 90.7638 200.67C93.9455 197.157 96.5291 192.983 98.5655 188.757C98.0437 174.185 92.3928 160.261 82.5802 149.38Z"/>
+</mask>
+<path d="M82.5802 149.38C81.3584 148.03 80.0857 146.745 78.673 145.6C80.4294 148.578 80.6075 151.95 79.8694 155.196C79.1312 158.429 77.5021 161.419 75.4403 163.99C73.3149 166.625 70.8204 168.725 68.1095 170.71C65.7423 172.441 62.2932 174.656 60.1551 176.73C53.8679 182.839 52.5824 192.384 57.0369 199.893C61.4914 207.415 70.5277 210.979 78.9912 208.535C83.662 207.186 87.6202 204.144 90.7638 200.67C93.9455 197.157 96.5291 192.983 98.5655 188.757C98.0437 174.185 92.3928 160.261 82.5802 149.38Z" stroke="white" stroke-width="24" mask="url(#path-6-inside-4_4113_89308)"/>
+<mask id="path-7-outside-5_4113_89308" maskUnits="userSpaceOnUse" x="45.3994" y="138.6" width="62" height="79" fill="black">
+<rect fill="white" x="45.3994" y="138.6" width="62" height="79"/>
+<path d="M82.5802 149.38C81.3584 148.03 80.0857 146.745 78.673 145.6C80.4294 148.578 80.6075 151.95 79.8694 155.196C79.1312 158.429 77.5021 161.419 75.4403 163.99C73.3149 166.625 70.8204 168.725 68.1095 170.71C65.7423 172.441 62.2932 174.656 60.1551 176.73C53.8679 182.839 52.5824 192.384 57.0369 199.893C61.4914 207.415 70.5277 210.979 78.9912 208.535C83.662 207.186 87.6202 204.144 90.7638 200.67C93.9455 197.157 96.5291 192.983 98.5655 188.757C98.0437 174.185 92.3928 160.261 82.5802 149.38Z"/>
+</mask>
+<path d="M82.5802 149.38C81.3584 148.03 80.0857 146.745 78.673 145.6C80.4294 148.578 80.6075 151.95 79.8694 155.196C79.1312 158.429 77.5021 161.419 75.4403 163.99C73.3149 166.625 70.8204 168.725 68.1095 170.71C65.7423 172.441 62.2932 174.656 60.1551 176.73C53.8679 182.839 52.5824 192.384 57.0369 199.893C61.4914 207.415 70.5277 210.979 78.9912 208.535C83.662 207.186 87.6202 204.144 90.7638 200.67C93.9455 197.157 96.5291 192.983 98.5655 188.757C98.0437 174.185 92.3928 160.261 82.5802 149.38Z" fill="white"/>
+<path d="M82.5802 149.38C81.3584 148.03 80.0857 146.745 78.673 145.6C80.4294 148.578 80.6075 151.95 79.8694 155.196C79.1312 158.429 77.5021 161.419 75.4403 163.99C73.3149 166.625 70.8204 168.725 68.1095 170.71C65.7423 172.441 62.2932 174.656 60.1551 176.73C53.8679 182.839 52.5824 192.384 57.0369 199.893C61.4914 207.415 70.5277 210.979 78.9912 208.535C83.662 207.186 87.6202 204.144 90.7638 200.67C93.9455 197.157 96.5291 192.983 98.5655 188.757C98.0437 174.185 92.3928 160.261 82.5802 149.38Z" stroke="#0057CE" stroke-width="16" mask="url(#path-7-outside-5_4113_89308)"/>
+</svg>

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

@@ -0,0 +1 @@
+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Dify</title><clipPath id="lobe-icons-dify-fill"><path d="M1 0h10.286c6.627 0 12 5.373 12 12s-5.373 12-12 12H1V0z"></path></clipPath><foreignObject clip-path="url(#lobe-icons-dify-fill)" height="24" style="background:conic-gradient(from 180deg at 50% 50%, #0222C3, #8FB1F4, #FFFFFF)" width="24"></foreignObject></svg>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="512px" height="512px" viewBox="0 0 512 512" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(85.09804%,85.09804%,85.09804%);fill-opacity:1;" d="M 512 256 C 512 114.613281 397.386719 0 256 0 C 114.613281 0 0 114.613281 0 256 C 0 397.386719 114.613281 512 256 512 C 397.386719 512 512 397.386719 512 256 Z M 512 256 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 256.011719 114.753906 C 167.050781 114.753906 94.945312 186.261719 94.945312 274.507812 L 94.945312 350.988281 L 124.628906 350.988281 L 124.628906 343.359375 C 124.628906 307.574219 153.867188 278.558594 189.941406 278.558594 C 226.015625 278.558594 255.253906 307.585938 255.253906 343.359375 L 255.253906 350.988281 L 284.9375 350.988281 L 284.9375 343.359375 C 284.9375 291.308594 242.390625 249.140625 189.929688 249.140625 C 169.503906 249.140625 150.582031 255.53125 135.082031 266.433594 C 151.296875 234.464844 184.691406 212.535156 223.242188 212.535156 C 277.707031 212.535156 321.867188 256.339844 321.867188 310.355469 L 321.867188 350.996094 L 351.5625 350.996094 L 351.5625 310.355469 C 351.5625 240.074219 294.113281 183.082031 223.242188 183.082031 C 191.382812 183.082031 162.230469 194.601562 139.785156 213.683594 C 161.824219 172.375 205.578125 144.214844 256 144.214844 C 328.566406 144.214844 387.382812 202.550781 387.382812 274.515625 L 387.382812 350.996094 L 417.066406 350.996094 L 417.066406 274.515625 C 417.066406 186.28125 344.960938 114.761719 256 114.761719 Z M 256.011719 114.753906 "/>
+</g>
+</svg>

src/renderer/src/assets/images/providers/baidu-cloud.svg

@@ -0,0 +1 @@
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>BaiduCloud</title><path d="M21.715 5.61l-3.983 2.31a.903.903 0 01-.896 0L12.44 5.384a.903.903 0 00-.897 0L7.156 7.92a.903.903 0 01-.896 0L2.276 5.617 12.002 0l9.713 5.61z" fill="#5BCA87"></path><path d="M18.641 9.467a.89.89 0 00-.438.77v5.072a.896.896 0 01-.445.77l-4.428 2.51a.884.884 0 00-.445.777v4.607l4.429-2.536 5.31-3.047V7.157l-3.983 2.31z" fill="#EC5D3E"></path><path d="M10.98 18.941a.936.936 0 00-.305-.352l-4.429-2.516a.903.903 0 01-.431-.764v-5.078a.89.89 0 00-.452-.757l-.451-.26L1.38 7.158V18.39l5.311 3.047L11.126 24v-4.608a.881.881 0 00-.146-.45z" fill="#2464F5"></path></svg>

src/renderer/src/assets/images/search/tavily-dark.svg

@@ -0,0 +1,14 @@
+<svg width="778" height="257" viewBox="0 0 778 257" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M97.1853 5.35901L127.346 53.1064C132.19 60.7745 126.68 70.7725 117.61 70.7725H105.279V142.278H87.4492V-0.00683594C91.1876 -0.00683594 94.926 1.78179 97.1853 5.35901Z" fill="#8FBCFA"/>
+<path d="M47.5482 53.1064L77.7098 5.35901C79.9691 1.78179 83.7075 -0.00683594 87.4459 -0.00683594V142.279C81.0587 141.981 74.8755 143.829 69.616 147.544V70.7725H57.2849C48.2149 70.7725 42.7047 60.7745 47.5482 53.1064Z" fill="#468BFF"/>
+<path d="M182.003 189.445L107.34 189.445C111.648 184.622 114.201 178.481 114.476 171.615H252.782C252.782 175.353 250.993 179.092 247.416 181.351L199.669 211.512C192.001 216.356 182.003 210.846 182.003 201.776V189.445Z" fill="#FDBB11"/>
+<path d="M199.668 131.718L247.415 161.879C250.993 164.138 252.781 167.877 252.781 171.615H114.471C114.72 165.212 112.733 158.898 108.957 153.785H182.002V141.454C182.002 132.384 192 126.874 199.668 131.718Z" fill="#F6D785"/>
+<path d="M46.9409 209.797L3.37891 253.359C6.02226 256.003 9.93035 257.381 14.0576 256.45L69.1472 244.014C77.9944 242.017 81.1678 231.051 74.7545 224.638L66.035 215.918L98.7916 183.055C105.771 176.075 105.462 164.899 98.6758 158.113L46.9409 209.797Z" fill="#FF9A9D"/>
+<path d="M40.8221 190.708L73.6898 157.963C80.6694 150.983 91.8931 151.328 98.679 158.113L46.9436 209.802L3.38131 253.364C0.737954 250.721 -0.640662 246.812 0.291 242.685L12.7265 187.596C14.7236 178.748 25.6895 175.575 32.1028 181.988L40.8221 190.708Z" fill="#FE363B"/>
+<path d="M777.344 93.6689L718.337 234.049H692.704L713.348 186.567L675.156 93.6689H702.166L726.766 160.246L751.711 93.6689H777.344Z" fill="#FFFFFF"/>
+<path d="M664.096 70.1191V188.976H640.012V70.1191H664.096Z" fill="#FFFFFF"/>
+<path d="M606.041 82.2736C601.797 82.2736 598.242 80.9547 595.375 78.3168C592.622 75.5643 591.246 72.181 591.246 68.1668C591.246 64.1527 592.622 60.8267 595.375 58.1889C598.242 55.4363 601.797 54.0601 606.041 54.0601C610.284 54.0601 613.783 55.4363 616.535 58.1889C619.402 60.8267 620.836 63.6942 620.836 67.7084C620.836 71.7225 619.402 75.5643 616.535 78.3168C613.783 80.9547 610.284 82.2736 606.041 82.2736ZM617.911 93.6279V188.978H593.827V93.6279H617.911Z" fill="#FFFFFF"/>
+<path d="M532.3 166.783L556.385 93.6689H582.018L546.751 188.976H517.505L482.41 93.6689H508.215L532.3 166.783Z" fill="#FFFFFF"/>
+<path d="M371.52 140.972C371.52 131.338 373.412 122.794 377.197 115.339C381.096 107.884 386.314 102.15 392.852 98.1355C399.504 94.1213 406.901 92.1143 415.044 92.1143C422.155 92.1143 428.348 93.5479 433.624 96.4151C439.014 99.2823 443.315 102.895 446.526 107.253V93.6626H470.783V188.969H446.526V175.035C443.43 179.507 439.129 183.235 433.624 186.217C428.233 189.084 421.983 190.518 414.872 190.518C406.844 190.518 399.504 188.453 392.852 184.324C386.314 180.196 381.096 174.404 377.197 166.949C373.412 159.38 371.52 150.72 371.52 140.972ZM446.526 141.316C446.526 135.467 445.379 130.478 443.086 126.349C440.792 122.105 437.695 118.894 433.796 116.715C429.896 114.421 425.71 113.274 421.237 113.274C416.764 113.274 412.636 114.364 408.851 116.543C405.066 118.722 401.97 121.933 399.561 126.177C397.267 130.306 396.12 135.237 396.12 140.972C396.12 146.706 397.267 151.753 399.561 156.111C401.97 160.354 405.066 163.623 408.851 165.917C412.75 168.211 416.879 169.357 421.237 169.357C425.71 169.357 429.896 168.268 433.796 166.089C437.695 163.795 440.792 160.584 443.086 156.455C445.379 152.211 446.526 147.165 446.526 141.316Z" fill="#FFFFFF"/>
+<path d="M340.767 113.445V159.55C340.767 162.762 341.513 165.113 343.004 166.604C344.609 167.98 347.247 168.668 350.917 168.668H362.099V188.968H346.96C326.66 188.968 316.51 179.105 316.51 159.378V113.445H305.156V93.6614H316.51V70.0928H340.767V93.6614H362.099V113.445H340.767Z" fill="#FFFFFF"/>
+</svg>

src/renderer/src/assets/images/search/tavily.svg

@@ -0,0 +1,14 @@
+<svg width="778" height="257" viewBox="0 0 778 257" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M97.1853 5.35901L127.346 53.1064C132.19 60.7745 126.68 70.7725 117.61 70.7725H105.279V142.278H87.4492V-0.00683594C91.1876 -0.00683594 94.926 1.78179 97.1853 5.35901Z" fill="#8FBCFA"/>
+<path d="M47.5482 53.1064L77.7098 5.35901C79.9691 1.78179 83.7075 -0.00683594 87.4459 -0.00683594V142.279C81.0587 141.981 74.8755 143.829 69.616 147.544V70.7725H57.2849C48.2149 70.7725 42.7047 60.7745 47.5482 53.1064Z" fill="#468BFF"/>
+<path d="M182.003 189.445L107.34 189.445C111.648 184.622 114.201 178.481 114.476 171.615H252.782C252.782 175.353 250.993 179.092 247.416 181.351L199.669 211.512C192.001 216.356 182.003 210.846 182.003 201.776V189.445Z" fill="#FDBB11"/>
+<path d="M199.668 131.718L247.415 161.879C250.993 164.138 252.781 167.877 252.781 171.615H114.471C114.72 165.212 112.733 158.898 108.957 153.785H182.002V141.454C182.002 132.384 192 126.874 199.668 131.718Z" fill="#F6D785"/>
+<path d="M46.9409 209.797L3.37891 253.359C6.02226 256.003 9.93035 257.381 14.0576 256.45L69.1472 244.014C77.9944 242.017 81.1678 231.051 74.7545 224.638L66.035 215.918L98.7916 183.055C105.771 176.075 105.462 164.899 98.6758 158.113L46.9409 209.797Z" fill="#FF9A9D"/>
+<path d="M40.8221 190.708L73.6898 157.963C80.6694 150.983 91.8931 151.328 98.679 158.113L46.9436 209.802L3.38131 253.364C0.737954 250.721 -0.640662 246.812 0.291 242.685L12.7265 187.596C14.7236 178.748 25.6895 175.575 32.1028 181.988L40.8221 190.708Z" fill="#FE363B"/>
+<path d="M777.344 93.6689L718.337 234.049H692.704L713.348 186.567L675.156 93.6689H702.166L726.766 160.246L751.711 93.6689H777.344Z" fill="#2C2F32"/>
+<path d="M664.096 70.1191V188.976H640.012V70.1191H664.096Z" fill="#2C2F32"/>
+<path d="M606.041 82.2736C601.797 82.2736 598.242 80.9547 595.375 78.3168C592.622 75.5643 591.246 72.181 591.246 68.1668C591.246 64.1527 592.622 60.8267 595.375 58.1889C598.242 55.4363 601.797 54.0601 606.041 54.0601C610.284 54.0601 613.783 55.4363 616.535 58.1889C619.402 60.8267 620.836 63.6942 620.836 67.7084C620.836 71.7225 619.402 75.5643 616.535 78.3168C613.783 80.9547 610.284 82.2736 606.041 82.2736ZM617.911 93.6279V188.978H593.827V93.6279H617.911Z" fill="#2C2F32"/>
+<path d="M532.3 166.783L556.385 93.6689H582.018L546.751 188.976H517.505L482.41 93.6689H508.215L532.3 166.783Z" fill="#2C2F32"/>
+<path d="M371.52 140.972C371.52 131.338 373.412 122.794 377.197 115.339C381.096 107.884 386.314 102.15 392.852 98.1355C399.504 94.1213 406.901 92.1143 415.044 92.1143C422.155 92.1143 428.348 93.5479 433.624 96.4151C439.014 99.2823 443.315 102.895 446.526 107.253V93.6626H470.783V188.969H446.526V175.035C443.43 179.507 439.129 183.235 433.624 186.217C428.233 189.084 421.983 190.518 414.872 190.518C406.844 190.518 399.504 188.453 392.852 184.324C386.314 180.196 381.096 174.404 377.197 166.949C373.412 159.38 371.52 150.72 371.52 140.972ZM446.526 141.316C446.526 135.467 445.379 130.478 443.086 126.349C440.792 122.105 437.695 118.894 433.796 116.715C429.896 114.421 425.71 113.274 421.237 113.274C416.764 113.274 412.636 114.364 408.851 116.543C405.066 118.722 401.97 121.933 399.561 126.177C397.267 130.306 396.12 135.237 396.12 140.972C396.12 146.706 397.267 151.753 399.561 156.111C401.97 160.354 405.066 163.623 408.851 165.917C412.75 168.211 416.879 169.357 421.237 169.357C425.71 169.357 429.896 168.268 433.796 166.089C437.695 163.795 440.792 160.584 443.086 156.455C445.379 152.211 446.526 147.165 446.526 141.316Z" fill="#2C2F32"/>
+<path d="M340.767 113.445V159.55C340.767 162.762 341.513 165.113 343.004 166.604C344.609 167.98 347.247 168.668 350.917 168.668H362.099V188.968H346.96C326.66 188.968 316.51 179.105 316.51 159.378V113.445H305.156V93.6614H316.51V70.0928H340.767V93.6614H362.099V113.445H340.767Z" fill="#2C2F32"/>
+</svg>

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

@@ -256,6 +256,9 @@ body,
       border: 1px solid var(--color-background-mute);
     }
   }
+  .group-menu-bar {
+    background-color: var(--color-background);
+  }
   code {
     color: var(--color-text);
   }

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

@@ -64,6 +64,10 @@
     &:first-child {
       margin-top: 0;
     }
+
+    &:has(+ ul) {
+      margin-bottom: 0;
+    }
   }
 
   ul {

src/renderer/src/components/DragableList/index.tsx

@@ -46,23 +46,28 @@ const DragableList: FC<Props<any>> = ({
     <DragDropContext onDragStart={onDragStart} onDragEnd={_onDragEnd}>
       <Droppable droppableId="droppable" {...droppableProps}>
         {(provided) => (
-          <div {...provided.droppableProps} ref={provided.innerRef} style={{ ...style }}>
+          <div {...provided.droppableProps} ref={provided.innerRef} style={style}>
             {list.map((item, index) => {
               const id = item.id || item
               return (
-                <Draggable key={`draggable_${id}_${index}`} draggableId={id} index={index} {...droppableProps}>
+                <Draggable key={`draggable_${id}_${index}`} draggableId={id} index={index}>
                   {(provided) => (
                     <div
                       ref={provided.innerRef}
                       {...provided.draggableProps}
                       {...provided.dragHandleProps}
-                      style={{ ...provided.draggableProps.style, marginBottom: 8, ...listStyle }}>
+                      style={{
+                        ...listStyle,
+                        ...provided.draggableProps.style,
+                        marginBottom: 8
+                      }}>
                       {children(item, index)}
                     </div>
                   )}
                 </Draggable>
               )
             })}
+            {provided.placeholder}
           </div>
         )}
       </Droppable>

src/renderer/src/components/Ellipsis/index.tsx

@@ -0,0 +1,26 @@
+import React from 'react'
+import styled from 'styled-components'
+
+type Props = {
+  text: string | number
+  maxLine?: number
+} & React.HTMLAttributes<HTMLDivElement>
+
+const Ellipsis = (props: Props) => {
+  const { text, maxLine = 1, ...rest } = props
+  return (
+    <EllipsisContainer maxLine={maxLine} {...rest}>
+      {text}
+    </EllipsisContainer>
+  )
+}
+
+const EllipsisContainer = styled.div<{ maxLine: number }>`
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  -webkit-line-clamp: ${({ maxLine }) => maxLine};
+`
+
+export default Ellipsis

src/renderer/src/components/Icons/MinAppIcon.tsx

@@ -24,6 +24,7 @@ const MinAppIcon: FC<Props> = ({ app, size = 48, style }) => {
         width: `${size}px`,
         height: `${size}px`,
         backgroundColor: _app.background,
+        ...app.style,
         ...style
       }}
     />

src/renderer/src/components/Icons/ReasoningIcon.tsx

@@ -0,0 +1,24 @@
+import React, { FC } from 'react'
+import styled from 'styled-components'
+
+const ReasoningIcon: FC<React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>, HTMLElement>> = (props) => {
+  return (
+    <Container>
+      <Icon className="iconfont icon-thinking" {...(props as any)} />
+    </Container>
+  )
+}
+
+const Container = styled.div`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+`
+
+const Icon = styled.i`
+  color: var(--color-link);
+  font-size: 16px;
+  margin-right: 6px;
+`
+
+export default ReasoningIcon

src/renderer/src/components/Icons/VisionIcon.tsx

@@ -3,13 +3,23 @@ import React, { FC } from 'react'
 import styled from 'styled-components'
 
 const VisionIcon: FC<React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>, HTMLElement>> = (props) => {
-  return <Icon {...(props as any)} />
+  return (
+    <Container>
+      <Icon {...(props as any)} />
+    </Container>
+  )
 }
 
+const Container = styled.div`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+`
+
 const Icon = styled(EyeOutlined)`
   color: var(--color-primary);
-  font-size: 14px;
-  margin-left: 4px;
+  font-size: 15px;
+  margin-right: 6px;
 `
 
 export default VisionIcon

src/renderer/src/components/Icons/WebSearchIcon.tsx

@@ -3,13 +3,23 @@ import React, { FC } from 'react'
 import styled from 'styled-components'
 
 const WebSearchIcon: FC<React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>, HTMLElement>> = (props) => {
-  return <Icon {...(props as any)} />
+  return (
+    <Container>
+      <Icon {...(props as any)} />
+    </Container>
+  )
 }
 
+const Container = styled.div`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+`
+
 const Icon = styled(GlobalOutlined)`
   color: var(--color-link);
-  font-size: 12px;
-  margin-left: 4px;
+  font-size: 15px;
+  margin-right: 6px;
 `
 
 export default WebSearchIcon

src/renderer/src/components/Layout/index.ts

@@ -95,14 +95,14 @@ export const Box = styled.div<BoxProps>`
   box-sizing: border-box;
   border: ${(props) => props?.border || 'none'};
   gap: ${(p) => (p.gap ? getElementValue(p.gap) : 0)};
-  margin: ${(props) => (props.m || props.margin ? props.m ?? props.margin : 'none')};
+  margin: ${(props) => (props.m || props.margin ? (props.m ?? props.margin) : 'none')};
   margin-top: ${(props) => (props.mt || props.marginTop ? getElementValue(props.mt || props.marginTop) : 'default')};
   margin-bottom: ${(props) =>
     props.mb || props.marginBottom ? getElementValue(props.mb ?? props.marginBottom) : 'default'};
   margin-left: ${(props) => (props.ml || props.marginLeft ? getElementValue(props.ml ?? props.marginLeft) : 'default')};
   margin-right: ${(props) =>
     props.mr || props.marginRight ? getElementValue(props.mr ?? props.marginRight) : 'default'};
-  padding: ${(props) => (props.p || props.padding ? props.p ?? props.padding : 'none')};
+  padding: ${(props) => (props.p || props.padding ? (props.p ?? props.padding) : 'none')};
   padding-top: ${(props) => (props.pt || props.paddingTop ? getElementValue(props.pt ?? props.paddingTop) : 'auto')};
   padding-bottom: ${(props) =>
     props.pb || props.paddingBottom ? getElementValue(props.pb ?? props.paddingBottom) : 'auto'};

src/renderer/src/components/MinApp/index.tsx

@@ -1,6 +1,7 @@
 /* eslint-disable react/no-unknown-property */
-import { CloseOutlined, ExportOutlined, PushpinOutlined, ReloadOutlined } from '@ant-design/icons'
+import { CloseOutlined, CodeOutlined, ExportOutlined, PushpinOutlined, ReloadOutlined } from '@ant-design/icons'
 import { isMac, isWindows } from '@renderer/config/constant'
+import { AppLogo } from '@renderer/config/env'
 import { DEFAULT_MIN_APPS } from '@renderer/config/minapps'
 import { useBridge } from '@renderer/hooks/useBridge'
 import { useMinapps } from '@renderer/hooks/useMinapps'
@@ -41,7 +42,11 @@ const PopupContainer: React.FC<Props> = ({ app, resolve }) => {
   }
 
   MinApp.onClose = onClose
-
+  const openDevTools = () => {
+    if (webviewRef.current) {
+      webviewRef.current.openDevTools()
+    }
+  }
   const onReload = () => {
     if (webviewRef.current) {
       webviewRef.current.src = app.url
@@ -49,14 +54,17 @@ const PopupContainer: React.FC<Props> = ({ app, resolve }) => {
   }
 
   const onOpenLink = () => {
-    window.api.openWebsite(app.url)
+    if (webviewRef.current) {
+      const currentUrl = webviewRef.current.getURL()
+      window.api.openWebsite(currentUrl)
+    }
   }
 
   const onTogglePin = () => {
     const newPinned = isPinned ? pinned.filter((item) => item.id !== app.id) : [...pinned, app]
     updatePinnedMinapps(newPinned)
   }
-
+  const isInDevelopment = process.env.NODE_ENV === 'development'
   const Title = () => {
     return (
       <TitleContainer style={{ justifyContent: 'space-between' }}>
@@ -75,6 +83,11 @@ const PopupContainer: React.FC<Props> = ({ app, resolve }) => {
               <ExportOutlined />
             </Button>
           )}
+          {isInDevelopment && (
+            <Button onClick={openDevTools}>
+              <CodeOutlined />
+            </Button>
+          )}
           <Button onClick={() => onClose()}>
             <CloseOutlined />
           </Button>
@@ -236,6 +249,10 @@ export default class MinApp {
       await delay(0)
     }
 
+    if (!app.logo) {
+      app.logo = AppLogo
+    }
+
     MinApp.app = app
     store.dispatch(setMinappShow(true))
 
@@ -257,5 +274,6 @@ export default class MinApp {
     TopView.hide('MinApp')
     store.dispatch(setMinappShow(false))
     MinApp.app = null
+    MinApp.onClose = () => {}
   }
 }

src/renderer/src/components/ModelTags.tsx

@@ -1,36 +1,40 @@
-import { isEmbeddingModel, isVisionModel, isWebSearchModel } from '@renderer/config/models'
+import { isEmbeddingModel, isReasoningModel, isVisionModel, isWebSearchModel } from '@renderer/config/models'
 import { Model } from '@renderer/types'
 import { isFreeModel } from '@renderer/utils'
 import { Tag } from 'antd'
 import { FC } from 'react'
 import { useTranslation } from 'react-i18next'
+import styled from 'styled-components'
 
+import ReasoningIcon from './Icons/ReasoningIcon'
 import VisionIcon from './Icons/VisionIcon'
 import WebSearchIcon from './Icons/WebSearchIcon'
 
 interface ModelTagsProps {
   model: Model
   showFree?: boolean
+  showReasoning?: boolean
 }
 
-const ModelTags: FC<ModelTagsProps> = ({ model, showFree = true }) => {
+const ModelTags: FC<ModelTagsProps> = ({ model, showFree = true, showReasoning = true }) => {
   const { t } = useTranslation()
   return (
-    <>
+    <Container>
       {isVisionModel(model) && <VisionIcon />}
       {isWebSearchModel(model) && <WebSearchIcon />}
-      {showFree && isFreeModel(model) && (
-        <Tag style={{ marginLeft: 10 }} color="green">
-          {t('models.free')}
-        </Tag>
-      )}
-      {isEmbeddingModel(model) && (
-        <Tag style={{ marginLeft: 10 }} color="orange">
-          {t('models.embedding')}
-        </Tag>
-      )}
-    </>
+      {showReasoning && isReasoningModel(model) && <ReasoningIcon />}
+      {isEmbeddingModel(model) && <Tag color="orange">{t('models.embedding')}</Tag>}
+      {showFree && isFreeModel(model) && <Tag color="green">{t('models.free')}</Tag>}
+    </Container>
   )
 }
 
+const Container = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  gap: 2px;
+`
+
 export default ModelTags

src/renderer/src/components/OAuth/OAuthButton.tsx

@@ -0,0 +1,39 @@
+import { Provider } from '@renderer/types'
+import { oauthWithAihubmix, oauthWithSiliconFlow } from '@renderer/utils/oauth'
+import { Button, ButtonProps } from 'antd'
+import { FC } from 'react'
+import { useTranslation } from 'react-i18next'
+
+interface Props extends ButtonProps {
+  provider: Provider
+  onSuccess?: (key: string) => void
+}
+
+const OAuthButton: FC<Props> = ({ provider, ...props }) => {
+  const { t } = useTranslation()
+
+  const onAuth = () => {
+    const onSuccess = (key: string) => {
+      if (key.trim()) {
+        props.onSuccess?.(key)
+        window.message.success({ content: t('auth.get_key_success'), key: 'auth-success' })
+      }
+    }
+
+    if (provider.id === 'silicon') {
+      oauthWithSiliconFlow(onSuccess)
+    }
+
+    if (provider.id === 'aihubmix') {
+      oauthWithAihubmix(onSuccess)
+    }
+  }
+
+  return (
+    <Button onClick={onAuth} {...props}>
+      {t('auth.get_key')}
+    </Button>
+  )
+}
+
+export default OAuthButton

src/renderer/src/components/Popups/MinAppsPopover.tsx

@@ -4,7 +4,7 @@ import App from '@renderer/pages/apps/App'
 import { Popover } from 'antd'
 import { Empty } from 'antd'
 import { isEmpty } from 'lodash'
-import { FC, useState } from 'react'
+import { FC, useEffect, useState } from 'react'
 import { useHotkeys } from 'react-hotkeys-hook'
 import styled from 'styled-components'
 
@@ -26,8 +26,22 @@ const MinAppsPopover: FC<Props> = ({ children }) => {
     setOpen(false)
   }
 
+  const [maxHeight, setMaxHeight] = useState(window.innerHeight - 100)
+
+  useEffect(() => {
+    const handleResize = () => {
+      setMaxHeight(window.innerHeight - 100)
+    }
+
+    window.addEventListener('resize', handleResize)
+
+    return () => {
+      window.removeEventListener('resize', handleResize)
+    }
+  }, [])
+
   const content = (
-    <PopoverContent>
+    <PopoverContent maxHeight={maxHeight}>
       <AppsContainer>
         {minapps.map((app) => (
           <App key={app.id} app={app} onClick={handleClose} size={50} />
@@ -54,7 +68,10 @@ const MinAppsPopover: FC<Props> = ({ children }) => {
   )
 }
 
-const PopoverContent = styled(Scrollbar)``
+const PopoverContent = styled(Scrollbar)<{ maxHeight: number }>`
+  max-height: ${(props) => props.maxHeight}px;
+  overflow-y: auto;
+`
 
 const AppsContainer = styled.div`
   display: grid;

src/renderer/src/components/Popups/PromptPopup.tsx

@@ -1,6 +1,6 @@
 import { Input, Modal } from 'antd'
 import { TextAreaProps } from 'antd/es/input'
-import { useState } from 'react'
+import { useRef, useState } from 'react'
 
 import { Box } from '../Layout'
 import { TopView } from '../TopView'
@@ -27,6 +27,7 @@ const PromptPopupContainer: React.FC<Props> = ({
 }) => {
   const [value, setValue] = useState(defaultValue)
   const [open, setOpen] = useState(true)
+  const textAreaRef = useRef<any>(null)
 
   const onOk = () => {
     setOpen(false)
@@ -41,17 +42,35 @@ const PromptPopupContainer: React.FC<Props> = ({
     resolve(null)
   }
 
+  const handleAfterOpenChange = (visible: boolean) => {
+    if (visible) {
+      const textArea = textAreaRef.current?.resizableTextArea?.textArea
+      if (textArea) {
+        textArea.focus()
+        const length = textArea.value.length
+        textArea.setSelectionRange(length, length)
+      }
+    }
+  }
+
   PromptPopup.hide = onCancel
 
   return (
-    <Modal title={title} open={open} onOk={onOk} onCancel={onCancel} afterClose={onClose} centered>
+    <Modal
+      title={title}
+      open={open}
+      onOk={onOk}
+      onCancel={onCancel}
+      afterClose={onClose}
+      afterOpenChange={handleAfterOpenChange}
+      centered>
       <Box mb={8}>{message}</Box>
       <Input.TextArea
+        ref={textAreaRef}
         placeholder={inputPlaceholder}
         value={value}
         onChange={(e) => setValue(e.target.value)}
         allowClear
-        autoFocus
         onPressEnter={onOk}
         rows={1}
         {...inputProps}

src/renderer/src/components/Popups/SelectModelPopup.tsx

@@ -74,9 +74,9 @@ const PopupContainer: React.FC<PopupContainerProps> = ({ model, resolve }) => {
           key: getModelUniqId(m),
           label: (
             <ModelItem>
-              <span>
-                {m?.name} <ModelTags model={m} />
-              </span>
+              <ModelNameRow>
+                <span>{m?.name}</span> <ModelTags model={m} />
+              </ModelNameRow>
               <PinIcon
                 onClick={(e) => {
                   e.stopPropagation()
@@ -118,7 +118,9 @@ const PopupContainer: React.FC<PopupContainerProps> = ({ model, resolve }) => {
         key: getModelUniqId(m) + '_pinned',
         label: (
           <ModelItem>
-            {m?.name} <ModelTags model={m} />
+            <ModelNameRow>
+              <span>{m?.name}</span> <ModelTags model={m} />
+            </ModelNameRow>
             <PinIcon
               onClick={(e) => {
                 e.stopPropagation()
@@ -277,6 +279,13 @@ const ModelItem = styled.div`
   width: 100%;
 `
 
+const ModelNameRow = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 8px;
+`
+
 const EmptyState = styled.div`
   display: flex;
   justify-content: center;

src/renderer/src/components/Popups/TextEditPopup.tsx

@@ -51,6 +51,17 @@ const PopupContainer: React.FC<Props> = ({ text, textareaProps, modalProps, reso
     setTimeout(resizeTextArea, 0)
   }, [])
 
+  const handleAfterOpenChange = (visible: boolean) => {
+    if (visible) {
+      const textArea = textareaRef.current?.resizableTextArea?.textArea
+      if (textArea) {
+        textArea.focus()
+        const length = textArea.value.length
+        textArea.setSelectionRange(length, length)
+      }
+    }
+  }
+
   TextEditPopup.hide = onCancel
 
   return (
@@ -65,6 +76,7 @@ const PopupContainer: React.FC<Props> = ({ text, textareaProps, modalProps, reso
       onOk={onOk}
       onCancel={onCancel}
       afterClose={onClose}
+      afterOpenChange={handleAfterOpenChange}
       centered>
       <TextArea
         ref={textareaRef}