feat: plugins

.eslintrc.cjs

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

.github/ISSUE_TEMPLATE/#0_bug_report.yml

@@ -1,4 +1,4 @@
-name: 🐛 错误报告 (中文)
+name: 🐛 错误报告
 description: 创建一个报告以帮助我们改进
 title: '[错误]: '
 labels: ['bug']
@@ -7,21 +7,6 @@ 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
@@ -48,7 +33,7 @@ body:
     id: description
     attributes:
       label: 错误描述
-      description: 描述问题时请尽可能详细
+      description: 清晰简洁地描述错误是什么
       placeholder: 告诉我们发生了什么...
     validations:
       required: true
@@ -57,7 +42,7 @@ body:
     id: reproduction
     attributes:
       label: 重现步骤
-      description: 提供详细的重现步骤，以便于我们可以准确地重现问题
+      description: 重现行为的步骤
       placeholder: |
         1. 转到 '...'
         2. 点击 '....'
@@ -85,4 +70,4 @@ body:
     id: additional
     attributes:
       label: 附加信息
-      description: 任何能让我们对你所遇到的问题有更多了解的东西
+      description: 在此添加有关问题的任何其他上下文

.github/ISSUE_TEMPLATE/#1_feature_request.yml

@@ -1,4 +1,4 @@
-name: 💡 功能建议 (中文)
+name: 💡 功能建议
 description: 为项目提出新的想法
 title: '[功能]: '
 labels: ['enhancement']
@@ -7,49 +7,11 @@ body:
     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相关?
+      label: 您的功能建议是否与某个问题相关?
       description: 请简明扼要地描述您遇到的问题
       placeholder: 我总是感到沮丧,因为...
     validations:

.github/ISSUE_TEMPLATE/#2_question.yml

@@ -1,6 +1,6 @@
-name: ❓ 讨论 & 提问 (中文)
-description: 寻求帮助、讨论问题、提出疑问等...
-title: '[讨论]: '
+name: ❓ 提问
+description: 提出一个问题或寻求帮助
+title: '[问题]: '
 labels: ['question']
 body:
   - type: markdown
@@ -8,39 +8,6 @@ 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/ISSUE_TEMPLATE/0_bug_report.yml

@@ -1,4 +1,4 @@
-name: 🐛 Bug Report (English)
+name: 🐛 Bug Report
 description: Create a report to help us improve
 title: '[Bug]: '
 labels: ['bug']
@@ -6,22 +6,7 @@ body:
   - type: markdown
     attributes:
       value: |
-          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
+        Thanks for taking the time to fill out this bug report!
 
   - type: dropdown
     id: platform
@@ -48,8 +33,8 @@ body:
     id: description
     attributes:
       label: Bug Description
-      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)
+      description: A clear and concise description of what the bug is
+      placeholder: Tell us what happened...
     validations:
       required: true
 
@@ -57,14 +42,12 @@ body:
     id: reproduction
     attributes:
       label: Steps To Reproduce
-      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.
+      description: Steps to reproduce the behavior
       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
 
@@ -87,4 +70,4 @@ body:
     id: additional
     attributes:
       label: Additional Context
-      description: Anything that gives us a better understanding of the problem you're experiencing
+      description: Add any other context about the problem here

.github/ISSUE_TEMPLATE/1_feature_request.yml

@@ -1,4 +1,4 @@
-name: 💡 Feature Request (English)
+name: 💡 Feature Request
 description: Suggest an idea for this project
 title: '[Feature]: '
 labels: ['enhancement']
@@ -6,71 +6,33 @@ body:
   - type: markdown
     attributes:
       value: |
-        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
+        Thanks for taking the time to suggest a new feature!
 
   - type: textarea
     id: problem
     attributes:
-      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)
+      label: Is your feature request related to a problem?
+      description: A clear and concise description of what the problem is
+      placeholder: I'm always frustrated when...
     validations:
       required: true
 
   - type: textarea
     id: solution
     attributes:
-      label: 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.
+      label: Describe the solution you'd like
+      description: A clear and concise description of what you want to happen
     validations:
       required: true
 
   - type: textarea
     id: alternatives
     attributes:
-      label: Alternative Solutions
-      description: Please briefly describe any alternative solutions or features you have considered. Feel free to include screenshots or mockups of alternative approaches.
+      label: Describe alternatives you've considered
+      description: A clear and concise description of any alternative solutions or features you've considered
 
   - type: textarea
     id: additional
     attributes:
-      label: Additional Information
-      description: Add any other context, screenshots, mockups or recordings that can help us better understand your feature request.
+      label: Additional Context
+      description: Add any other context or screenshots about the feature request here

.github/ISSUE_TEMPLATE/2_question.yml

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

.github/workflows/nightly-build.yml

@@ -1,113 +0,0 @@
-name: Nightly Build
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 17 * * *' # 1:00 BJ Time
-
-permissions:
-  contents: write
-
-jobs:
-  release:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-      fail-fast: false
-
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Install corepack
-        run: corepack enable && corepack prepare yarn@4.6.0 --activate
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
-
-      - name: Cache yarn dependencies
-        uses: actions/cache@v4
-        with:
-          path: |
-            ${{ steps.yarn-cache-dir-path.outputs.dir }}
-            node_modules
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Install Dependencies
-        run: yarn install
-
-      - name: Generate date tag
-        id: date
-        run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
-        shell: bash
-
-      - name: Build Linux
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          yarn build:npm linux
-          yarn build:linux
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
-
-      - name: Build Mac
-        if: matrix.os == 'macos-latest'
-        run: |
-          yarn build:npm mac
-          yarn build:mac
-        env:
-          CSC_LINK: ${{ secrets.CSC_LINK }}
-          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-          APPLE_ID: ${{ vars.APPLE_ID }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{ vars.APPLE_APP_SPECIFIC_PASSWORD }}
-          APPLE_TEAM_ID: ${{ vars.APPLE_TEAM_ID }}
-          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.GITHUB_TOKEN }}
-          RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
-
-      - name: Replace spaces in filenames
-        run: node scripts/replace-spaces.js
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: nightly-${{ steps.date.outputs.date }}-${{ matrix.os }}
-          path: |
-            dist/*.exe
-            dist/*.zip
-            dist/*.dmg
-            dist/*.AppImage
-            dist/*.snap
-            dist/*.deb
-            dist/*.rpm
-            dist/*.tar.gz
-            dist/latest*.yml
-            dist/*.blockmap
-          retention-days: 3 # 保留3天
-
-      - name: Add warning to summary
-        run: |
-          echo "## ⚠️ 警告：这是每日构建版本" >> $GITHUB_STEP_SUMMARY
-          echo "此版本为自动构建的不稳定版本，仅供测试使用。不建议在生产环境中使用。" >> $GITHUB_STEP_SUMMARY
-          echo "安装此版本前请务必备份数据，并做好数据迁移准备。" >> $GITHUB_STEP_SUMMARY
-          echo "构建日期：$(date +'%Y-%m-%d')" >> $GITHUB_STEP_SUMMARY
-          echo "## ⚠️ Warning: This is a nightly build version" >> $GITHUB_STEP_SUMMARY
-          echo "This version is an unstable version built automatically and is only for testing. It is not recommended to use it in a production environment." >> $GITHUB_STEP_SUMMARY
-          echo "Please backup your data before installing this version and prepare for data migration." >> $GITHUB_STEP_SUMMARY
-          echo "Build date: $(date +'%Y-%m-%d')" >> $GITHUB_STEP_SUMMARY

.github/workflows/pr-ci.yml

@@ -1,46 +0,0 @@
-name: Pull Request CI
-
-on:
-  workflow_dispatch:
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out Git repository
-        uses: actions/checkout@v4
-
-      - name: Install Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Install corepack
-        run: corepack enable && corepack prepare yarn@4.6.0 --activate
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
-
-      - name: Cache yarn dependencies
-        uses: actions/cache@v4
-        with:
-          path: |
-            ${{ steps.yarn-cache-dir-path.outputs.dir }}
-            node_modules
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-
-      - name: Install Dependencies
-        run: yarn install
-
-      - name: Build Check
-        run: yarn build:check
-
-      - name: Lint Check
-        run: yarn lint

.github/workflows/release.yml

@@ -2,11 +2,6 @@ name: Release
 
 on:
   workflow_dispatch:
-    inputs:
-      tag:
-        description: 'Release tag (e.g. v1.0.0)'
-        required: true
-        default: 'v0.9.18'
   push:
     tags:
       - v*.*.*
@@ -21,36 +16,25 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-      fail-fast: false
 
     steps:
       - name: Check out Git repository
-        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
+        uses: actions/checkout@v3
 
       - name: Install Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
         with:
           node-version: 20
 
       - name: Install corepack
-        run: corepack enable && corepack prepare yarn@4.6.0 --activate
+        run: corepack enable && corepack prepare yarn@4.3.1 --activate
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
 
       - name: Cache yarn dependencies
-        uses: actions/cache@v4
+        uses: actions/cache@v3
         with:
           path: |
             ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -69,8 +53,7 @@ jobs:
           yarn build:linux
 
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
       - name: Build Mac
         if: matrix.os == 'macos-latest'
@@ -83,25 +66,31 @@ jobs:
           APPLE_ID: ${{ vars.APPLE_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ vars.APPLE_APP_SPECIFIC_PASSWORD }}
           APPLE_TEAM_ID: ${{ vars.APPLE_TEAM_ID }}
-          RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
       - name: Build Windows
         if: matrix.os == 'windows-latest'
         run: yarn build:win
         env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
       - name: Replace spaces in filenames
         run: node scripts/replace-spaces.js
 
       - name: Release
-        uses: ncipollo/release-action@v1
+        uses: softprops/action-gh-release@v2
         with:
           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.GITHUB_TOKEN }}
+          files: |
+            dist/*.exe
+            dist/*.zip
+            dist/*.dmg
+            dist/*.AppImage
+            dist/*.snap
+            dist/*.deb
+            dist/*.rpm
+            dist/*.tar.gz
+            dist/latest*.yml
+            dist/*.blockmap
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

.gitignore

@@ -44,6 +44,3 @@ stats.html
 
 # Local
 local
-.aider*
-.cursorrules
-.cursor/rules

.husky/pre-commit

@@ -1 +0,0 @@
-yarn lint-staged

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

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

@@ -0,0 +1,25 @@
+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,13 +0,0 @@
-diff --git a/src/markdown-loader.js b/src/markdown-loader.js
-index eaf30b114a273e68abbb92c8b07018495e63f4cb..4b06519bdb51845e4693fe877da9de01c7a81039 100644
---- a/src/markdown-loader.js
-+++ b/src/markdown-loader.js
-@@ -21,7 +21,7 @@ export class MarkdownLoader extends BaseLoader {
-             ? (await getSafe(this.filePathOrUrl, { format: 'buffer' })).body
-             : 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()] });
-         this.debug('Markdown parsed...');
-         const webLoader = new WebLoader({
-             urlOrContent: result,

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

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

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

@@ -0,0 +1,54 @@
+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/@modelcontextprotocol-sdk-npm-1.6.1-b46313efe7.patch

@@ -1,26 +0,0 @@
-diff --git a/dist/cjs/client/stdio.js b/dist/cjs/client/stdio.js
-index 2ada8771c5f76673b5021d6453c6bdd7e0b88013..89f6ea9ca7de86294d3d966f3454b98e19bfe534 100644
---- a/dist/cjs/client/stdio.js
-+++ b/dist/cjs/client/stdio.js
-@@ -68,7 +68,7 @@ class StdioClientTransport {
-             this._process = (0, node_child_process_1.spawn)(this._serverParams.command, (_a = this._serverParams.args) !== null && _a !== void 0 ? _a : [], {
-                 env: (_b = this._serverParams.env) !== null && _b !== void 0 ? _b : getDefaultEnvironment(),
-                 stdio: ["pipe", "pipe", (_c = this._serverParams.stderr) !== null && _c !== void 0 ? _c : "inherit"],
--                shell: false,
-+                shell: process.platform === 'win32' ? true : false,
-                 signal: this._abortController.signal,
-                 windowsHide: node_process_1.default.platform === "win32" && isElectron(),
-                 cwd: this._serverParams.cwd,
-diff --git a/dist/esm/client/stdio.js b/dist/esm/client/stdio.js
-index 387c982fd40fd8db9790a78e1a05c9ecb81501c0..7b7e60a306bca73149609015a27e904a0a68ca02 100644
---- a/dist/esm/client/stdio.js
-+++ b/dist/esm/client/stdio.js
-@@ -61,7 +61,7 @@ export class StdioClientTransport {
-             this._process = spawn(this._serverParams.command, (_a = this._serverParams.args) !== null && _a !== void 0 ? _a : [], {
-                 env: (_b = this._serverParams.env) !== null && _b !== void 0 ? _b : getDefaultEnvironment(),
-                 stdio: ["pipe", "pipe", (_c = this._serverParams.stderr) !== null && _c !== void 0 ? _c : "inherit"],
--                shell: false,
-+                shell: process.platform === 'win32' ? true : false,
-                 signal: this._abortController.signal,
-                 windowsHide: process.platform === "win32" && isElectron(),
-                 cwd: this._serverParams.cwd,

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

@@ -1,57 +0,0 @@
-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/epub-npm-1.3.0-8325494ffe.patch

@@ -1,53 +0,0 @@
-diff --git a/epub.js b/epub.js
-index 50efff7678ca4879ed639d3bb70fd37e7477fd16..accbe689cd200bd59475dd20fca596511d0f33e0 100644
---- a/epub.js
-+++ b/epub.js
-@@ -3,9 +3,28 @@ var xml2jsOptions = xml2js.defaults['0.1'];
- var EventEmitter = require('events').EventEmitter;
- 
- try {
--    // zipfile is an optional dependency:
--    var ZipFile = require("zipfile").ZipFile;
--} catch (err) {
-+    var zipread = require("zipread");
-+    var ZipFile = function(filename) {
-+        var zip = zipread(filename);
-+        this.zip = zip;
-+        var files = zip.files;
-+
-+        files = Object.values(files).filter((file) => {
-+            return !file.dir;
-+        }).map((file) => {
-+            return file.name;
-+        });
-+
-+        this.names = files;
-+        this.count = this.names.length;
-+    };
-+    ZipFile.prototype.readFile = function(name, cb) {
-+        this.zip.readFile(name
-+            , function(err, buffer) {
-+                return cb(null, buffer);
-+            });
-+    };
-+} catch(err) {
-     // Mock zipfile using pure-JS adm-zip:
-     var AdmZip = require('adm-zip');
- 
-diff --git a/package.json b/package.json
-index 8c3dccf0caac8913a2edabd7049b25bb9063c905..57bac3b71ddd73916adbdf00b049089181db5bcb 100644
---- a/package.json
-+++ b/package.json
-@@ -40,10 +40,8 @@
-   ],
-   "dependencies": {
-     "adm-zip": "^0.4.11",
--    "xml2js": "^0.4.23"
--  },
--  "optionalDependencies": {
--    "zipfile": "^0.5.11"
-+    "xml2js": "^0.4.23",
-+    "zipread": "^1.3.3"
-   },
-   "devDependencies": {
-     "@types/mocha": "^5.2.5",

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

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

@@ -1,39 +0,0 @@
-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,20 +1,19 @@
-<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" /><br>
-  </a>
-</h1>
-  <p align="center">English | <a href="./docs/README.zh.md">中文</a> | <a href="./docs/README.ja.md">日本語</a><br></p>
 <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>
+  <a href="https://github.com/kangfenmao/cherry-studio/releases">
+    <img src="https://github.com/kangfenmao/cherry-studio/blob/main/build/icon.png?raw=true" width="150" height="150" alt="banner" />
+  </a>
+</div>
+<div align="center">
+  English | <a href="./docs/README.zh.md">中文</a> | <a href="./docs/README.ja.md">日本語</a>
 </div>
 
 # 🍒 Cherry Studio
 
+![](https://github.com/user-attachments/assets/7b4f2f78-5cbe-4be8-9aec-f98d8405a505)
+
 Cherry Studio is a desktop client that supports for multiple LLM providers, available on Windows, Mac and Linux.
 
-👏 Join [Telegram Group](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/wez8HtpxqQ) | [QQ Group(472019156)](https://qm.qq.com/q/CbZiBWwCXu)
-
-❤️ Like Cherry Studio? Give it a star 🌟 or [Sponsor](docs/sponsor.md) to support the development!
+👏 Join [Telegram Group](https://t.me/CherryStudioAI)
 
 # 🌠 Screenshot
 
@@ -24,61 +23,72 @@ Cherry Studio is a desktop client that supports for multiple LLM providers, avai
 
 # 🌟 Key Features
 
-![](https://github.com/user-attachments/assets/7b4f2f78-5cbe-4be8-9aec-f98d8405a505)
-
 1. **Diverse LLM Provider Support**:
 
-- ☁️ Major LLM Cloud Services: OpenAI, Gemini, Anthropic, and more
-- 🔗 AI Web Service Integration: Claude, Peplexity, Poe, and others
-- 💻 Local Model Support with Ollama, LM Studio
+   - ☁️ Major LLM Cloud Services: OpenAI, Gemini, Anthropic, and more
+   - 🔗 AI Web Service Integration: Claude, Peplexity, Poe, and others
+   - 💻 Local Model Support with Ollama
 
 2. **AI Assistants & Conversations**:
 
-- 📚 300+ Pre-configured AI Assistants
-- 🤖 Custom Assistant Creation
-- 💬 Multi-model Simultaneous Conversations
+   - 📚 300+ Pre-configured AI Assistants
+   - 🤖 Custom Assistant Creation
+   - 💬 Multi-model Simultaneous Conversations
 
 3. **Document & Data Processing**:
 
-- 📄 Support for Text, Images, Office, PDF, and more
-- ☁️ WebDAV File Management and Backup
-- 📊 Mermaid Chart Visualization
-- 💻 Code Syntax Highlighting
+   - 📄 Support for Text, Images, Office, PDF, and more
+   - ☁️ WebDAV File Management and Backup
+   - 📊 Mermaid Chart Visualization
+   - 💻 Code Syntax Highlighting
 
 4. **Practical Tools Integration**:
 
-- 🔍 Global Search Functionality
-- 📝 Topic Management System
-- 🔤 AI-powered Translation
-- 🎯 Drag-and-drop Sorting
-- 🔌 Mini Program Support
+   - 🔍 Global Search Functionality
+   - 📝 Topic Management System
+   - 🔤 AI-powered Translation
+   - 🎯 Drag-and-drop Sorting
+   - 🔌 Mini Program Support
 
 5. **Enhanced User Experience**:
-
-- 🖥️ Cross-platform Support for Windows, Mac, and Linux
-- 📦 Ready to Use, No Environment Setup Required
-- 🎨 Light/Dark Themes and Transparent Window
-- 📝 Complete Markdown Rendering
-- 🤲 Easy Content Sharing
-
-# 📝 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
-- [x] All models support networking
-- [x] Launch of the first official version
-- [x] Bug fixes and improvements (In progress...)
-- [ ] 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
+   - 🖥️ Cross-platform Support for Windows, Mac, and Linux
+   - 📦 Ready to Use, No Environment Setup Required
+   - 🎨 Light/Dark Themes and Transparent Window
+   - 📝 Complete Markdown Rendering
+   - 🤲 Easy Content Sharing
 
 # 🖥️ Develop
 
-Refer to the [development documentation](docs/dev.md)
+## IDE Setup
+
+[Cursor](https://www.cursor.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
+
+## Project Setup
+
+### Install
+
+```bash
+$ yarn
+```
+
+### Development
+
+```bash
+$ yarn dev
+```
+
+### Build
+
+```bash
+# For windows
+$ yarn build:win
+
+# For macOS
+$ yarn build:mac
+
+# For Linux
+$ yarn build:linux
+```
 
 # 🤝 Contributing
 
@@ -103,12 +113,6 @@ 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.
-
-- [ublacklist](https://github.com/iorate/ublacklist):Blocks specific sites from appearing in Google search results
-
 # 🚀 Contributors
 
 <a href="https://github.com/kangfenmao/cherry-studio/graphs/contributors">

docs/README.ja.md

@@ -1,21 +1,19 @@
-<h1 align="center">
+<div align="center">
   <a href="https://github.com/kangfenmao/cherry-studio/releases">
     <img src="https://github.com/kangfenmao/cherry-studio/blob/main/build/icon.png?raw=true" width="150" height="150" alt="banner" />
   </a>
-</h1>
-<p align="center">
-  <a href="https://github.com/kangfenmao/cherry-studio">English</a> | <a href="./README.zh.md">中文</a> | 日本語 <br>
-</p>
-<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>
+<div align="center">
+  <a href="./README.md">English</a> | <a href="./README.zh.md">中文</a> | 日本語
+</div>
+
 # 🍒 Cherry Studio
 
+![](https://github.com/user-attachments/assets/7b4f2f78-5cbe-4be8-9aec-f98d8405a505)
+
 Cherry Studioは、複数のLLMプロバイダーをサポートするデスクトップクライアントで、Windows、Mac、Linuxで利用可能です。
 
-👏 [Telegram](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/wez8HtpxqQ) | [QQグループ(472019156)](https://qm.qq.com/q/CbZiBWwCXu)
-
-❤️ Cherry Studioをお気に入りにしましたか？小さな星をつけてください 🌟 または [スポンサー](sponsor.md) をして開発をサポートしてください！❤️
+👏 [Telegramグループ](https://t.me/CherryStudioAI)に参加しましょう
 
 # 🌠 スクリーンショット
 
@@ -25,61 +23,72 @@ Cherry Studioは、複数のLLMプロバイダーをサポートするデスク
 
 # 🌟 主な機能
 
-![](https://github.com/user-attachments/assets/7b4f2f78-5cbe-4be8-9aec-f98d8405a505)
-
 1. **多様な LLM サービス対応**：
 
-- ☁️ 主要な LLM クラウドサービス対応：OpenAI、Gemini、Anthropic など
-- 🔗 AI Web サービス統合：Claude、Peplexity、Poe など
-- 💻 Ollama、LM Studio によるローカルモデル実行対応
+   - ☁️ 主要な LLM クラウドサービス対応：OpenAI、Gemini、Anthropic など
+   - 🔗 AI Web サービス統合：Claude、Peplexity、Poe など
+   - 💻 Ollama によるローカルモデル実行対応
 
 2. **AI アシスタントと対話**：
 
-- 📚 300+ の事前設定済み AI アシスタント
-- 🤖 カスタム AI アシスタントの作成
-- 💬 複数モデルでの同時対話機能
+   - 📚 300+ の事前設定済み AI アシスタント
+   - 🤖 カスタム AI アシスタントの作成
+   - 💬 複数モデルでの同時対話機能
 
 3. **文書とデータ処理**：
 
-- 📄 テキスト、画像、Office、PDF など多様な形式対応
-- ☁️ WebDAV によるファイル管理とバックアップ
-- 📊 Mermaid による図表作成
-- 💻 コードハイライト機能
+   - 📄 テキスト、画像、Office、PDF など多様な形式対応
+   - ☁️ WebDAV によるファイル管理とバックアップ
+   - 📊 Mermaid による図表作成
+   - 💻 コードハイライト機能
 
 4. **実用的なツール統合**：
 
-- 🔍 グローバル検索機能
-- 📝 トピック管理システム
-- 🔤 AI による翻訳機能
-- 🎯 ドラッグ＆ドロップによる整理
-- 🔌 ミニプログラム対応
+   - 🔍 グローバル検索機能
+   - 📝 トピック管理システム
+   - 🔤 AI による翻訳機能
+   - 🎯 ドラッグ＆ドロップによる整理
+   - 🔌 ミニプログラム対応
 
 5. **優れたユーザー体験**：
-
-- 🖥️ Windows、Mac、Linux のクロスプラットフォーム対応
-- 📦 環境構築不要ですぐに使用可能
-- 🎨 ライト/ダークテーマと透明ウィンドウ対応
-- 📝 完全な Markdown レンダリング
-- 🤲 簡単な共有機能
-
-# 📝 TODO
-
-- [x] クイックポップアップ（クリップボードの読み取り、簡単な質問、説明、翻訳、要約）
-- [x] 複数モデルの回答の比較
-- [x] サービスプロバイダーが提供するSSOを使用したログインをサポート
-- [x] すべてのモデルがネットワークをサポート
-- [x] 最初の公式バージョンのリリース
-- [ ] 錯誤修復と改善 (開発中...)
-- [ ] プラグイン機能（JavaScript）
-- [ ] ブラウザ拡張機能（テキストをハイライトして翻訳、要約、ナレッジベースに追加）
-- [ ] iOS & Android クライアント
-- [ ] AIノート
-- [ ] 音声入出力（AIコール）
-- [ ] データバックアップはカスタムバックアップコンテンツをサポート
+   - 🖥️ Windows、Mac、Linux のクロスプラットフォーム対応
+   - 📦 環境構築不要ですぐに使用可能
+   - 🎨 ライト/ダークテーマと透明ウィンドウ対応
+   - 📝 完全な Markdown レンダリング
+   - 🤲 簡単な共有機能
 
 # 🖥️ 開発
 
-参考[開発ドキュメント](dev.md)
+## IDEの設定
+
+[Cursor](https://www.cursor.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
+
+## プロジェクトの設定
+
+### インストール
+
+```bash
+$ yarn
+```
+
+### 開発
+
+```bash
+$ yarn dev
+```
+
+### ビルド
+
+```bash
+# Windowsの場合
+$ yarn build:win
+
+# macOSの場合
+$ yarn build:mac
+
+# Linuxの場合
+$ yarn build:linux
+```
 
 # 🤝 貢献
 
@@ -104,10 +113,6 @@ 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,20 +1,19 @@
-<h1 align="center">
+<div align="center">
   <a href="https://github.com/kangfenmao/cherry-studio/releases">
     <img src="https://github.com/kangfenmao/cherry-studio/blob/main/build/icon.png?raw=true" width="150" height="150" alt="banner" />
   </a>
-</h1>
-<p align="center">
-  <a href="https://github.com/kangfenmao/cherry-studio">English</a> | 中文 | <a href="./README.ja.md">日本語</a><br></p>
-<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>
+<div align="center">
+  中文 / <a href="https://github.com/kangfenmao/cherry-studio">English</a> / <a href="./README.ja.md">日本語</a>
+</div>
+
 # 🍒 Cherry Studio
 
+![](https://github.com/user-attachments/assets/995910f3-177a-4d1e-97ea-04e3b009ba36)
+
 Cherry Studio 是一款支持多个大语言模型（LLM）服务商的桌面客户端，兼容 Windows、Mac 和 Linux 系统。
 
-👏 欢迎加入 [Telegram 群组](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/wez8HtpxqQ) | [QQ群(472019156)](https://qm.qq.com/q/CbZiBWwCXu)
-
-❤️ 喜欢 Cherry Studio? 点亮小星星 🌟 或 [赞助开发者](sponsor.md)! ❤️
+👏 欢迎加入 [Telegram 群组](https://t.me/CherryStudioAI)
 
 # 🌠 界面
 
@@ -24,61 +23,72 @@ Cherry Studio 是一款支持多个大语言模型（LLM）服务商的桌面客
 
 # 🌟 主要特性
 
-![](https://github.com/user-attachments/assets/995910f3-177a-4d1e-97ea-04e3b009ba36)
-
 1. **多样化 LLM 服务支持**：
 
-- ☁️ 支持主流 LLM 云服务：OpenAI、Gemini、Anthropic、硅基流动等
-- 🔗 集成流行 AI Web 服务：Claude、Peplexity、Poe、腾讯元宝、知乎直答等
-- 💻 支持 Ollama、LM Studio 本地模型部署
+   - ☁️ 支持主流 LLM 云服务：OpenAI、Gemini、Anthropic、硅基流动等
+   - 🔗 集成流行 AI Web 服务：Claude、Peplexity、Poe、腾讯元宝、知乎直答等
+   - 💻 支持 Ollama 本地模型部署
 
 2. **智能助手与对话**：
 
-- 📚 内置 300+ 预配置 AI 助手
-- 🤖 支持自定义创建专属助手
-- 💬 多模型同时对话，获得多样化观点
+   - 📚 内置 300+ 预配置 AI 助手
+   - 🤖 支持自定义创建专属助手
+   - 💬 多模型同时对话，获得多样化观点
 
 3. **文档与数据处理**：
 
-- 📄 支持文本、图片、Office、PDF 等多种格式
-- ☁️ WebDAV 文件管理与数据备份
-- 📊 Mermaid 图表可视化
-- 💻 代码高亮显示
+   - 📄 支持文本、图片、Office、PDF 等多种格式
+   - ☁️ WebDAV 文件管理与数据备份
+   - 📊 Mermaid 图表可视化
+   - 💻 代码高亮显示
 
 4. **实用工具集成**：
 
-- 🔍 全局搜索功能
-- 📝 话题管理系统
-- 🔤 AI 驱动的翻译功能
-- 🎯 拖拽排序
-- 🔌 小程序支持
+   - 🔍 全局搜索功能
+   - 📝 话题管理系统
+   - 🔤 AI 驱动的翻译功能
+   - 🎯 拖拽排序
+   - 🔌 小程序支持
 
 5. **优质使用体验**：
-
-- 🖥️ Windows、Mac、Linux 跨平台支持
-- 📦 开箱即用，无需配置环境
-- 🎨 支持明暗主题与透明窗口
-- 📝 完整的 Markdown 渲染
-- 🤲 便捷的内容分享功能
-
-# 📝 待辦事項
-
-- [x] 快捷弹窗 (读取剪贴板、快速提问、解释、翻译、总结）
-- [x] 多模型回答对比
-- [x] 支持使用服务供应商提供的 SSO 进行登入
-- [x] 全部模型支持连网（开发中...）
-- [x] 推出第一个正式版
-- [x] 错误修复和改进（开发中...）
-- [ ] 插件功能（JavaScript）
-- [ ] 浏览器插件（划词翻译、总结、新增至知识库）
-- [ ] iOS & Android 客户端
-- [ ] AI 笔记
-- [ ] 语音输入输出（AI 通话）
-- [ ] 数据备份支持自定义备份内容
+   - 🖥️ Windows、Mac、Linux 跨平台支持
+   - 📦 开箱即用，无需配置环境
+   - 🎨 支持明暗主题与透明窗口
+   - 📝 完整的 Markdown 渲染
+   - 🤲 便捷的内容分享功能
 
 # 🖥️ 开发
 
-参考[开发文档](dev.md)
+## IDE 设置
+
+[Cursor](https://www.cursor.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
+
+## 项目设置
+
+### 安装
+
+```bash
+$ yarn
+```
+
+### 开发
+
+```bash
+$ yarn dev
+```
+
+### 构建
+
+```bash
+# Windows
+$ yarn build:win
+
+# macOS
+$ yarn build:mac
+
+# Linux
+$ yarn build:linux
+```
 
 # 🤝 贡献
 
@@ -103,10 +113,6 @@ Cherry Studio 是一款支持多个大语言模型（LLM）服务商的桌面客
 
 感谢您的支持和贡献！
 
-## 相关项目
-
-- [one-api](https://github.com/songquanpeng/one-api):LLM API管理及分发系统，支持OpenAI、Azure、Anthropic等主流模型，统一API接口，可用于密钥管理与二次分发。
-
 # 🚀 贡献者
 
 <a href="https://github.com/kangfenmao/cherry-studio/graphs/contributors">

docs/dev.md

@@ -1,51 +0,0 @@
-# 🖥️ Develop
-
-## IDE Setup
-
-[Cursor](https://www.cursor.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
-
-## Project Setup
-
-### Install
-
-```bash
-yarn
-```
-
-### Development
-
-### Setup Node.js
-
-Download and install [Node.js v20.x.x](https://nodejs.org/en/download)
-
-### Setup Yarn
-
-```bash
-corepack enable
-corepack prepare yarn@4.6.0 --activate
-```
-
-### Install Dependencies
-
-```bash
-yarn install
-```
-
-### Start
-
-```bash
-yarn dev
-```
-
-### Build
-
-```bash
-# For windows
-$ yarn build:win
-
-# For macOS
-$ yarn build:mac
-
-# For Linux
-$ yarn build:linux
-```

docs/technical/KnowledgeService.md

@@ -1,174 +0,0 @@
-我来详细介绍 KnowledgeService 中控制并发处理的项目数量和工作负载的部分。
-
-## 并发控制与工作负载管理机制
-
-KnowledgeService 实现了一个精细的任务队列系统，用于控制并发处理的项目数量和工作负载。这个系统主要通过以下几个关键部分实现：
-
-### 1. 关键变量和限制
-
-```typescript
-private workload = 0
-private processingItemCount = 0
-private knowledgeItemProcessingQueueMappingPromise: Map<LoaderTaskOfSet, () => void> = new Map()
-private static MAXIMUM_WORKLOAD = 1024 * 1024 * 80  // 约80MB
-private static MAXIMUM_PROCESSING_ITEM_COUNT = 30
-```
-
-- `workload`: 跟踪当前正在处理的总工作量（以字节为单位）
-- `processingItemCount`: 跟踪当前正在处理的项目数量
-- `MAXIMUM_WORKLOAD`: 设置最大工作负载为80MB
-- `MAXIMUM_PROCESSING_ITEM_COUNT`: 设置最大并发处理项目数为30个
-
-### 2. 工作负载评估
-
-每个任务都有一个评估工作负载的机制，通过 `evaluateTaskWorkload` 属性来表示：
-
-```typescript
-interface EvaluateTaskWorkload {
-  workload: number
-}
-```
-
-不同类型的任务有不同的工作负载评估方式：
-
-- 文件任务：使用文件大小作为工作负载 `{ workload: file.size }`
-- URL任务：使用固定值 `{ workload: 1024 * 1024 * 2 }` (约2MB)
-- 网站地图任务：使用固定值 `{ workload: 1024 * 1024 * 20 }` (约20MB)
-- 笔记任务：使用文本内容的字节长度 `{ workload: contentBytes.length }`
-
-### 3. 任务状态管理
-
-任务通过状态枚举来跟踪其生命周期：
-
-```typescript
-enum LoaderTaskItemState {
-  PENDING, // 等待处理
-  PROCESSING, // 正在处理
-  DONE // 已完成
-}
-```
-
-### 4. 任务队列处理核心逻辑
-
-核心的队列处理逻辑在 `processingQueueHandle` 方法中：
-
-```typescript
-private processingQueueHandle() {
-  const getSubtasksUntilMaximumLoad = (): QueueTaskItem[] => {
-    const queueTaskList: QueueTaskItem[] = []
-    that: for (const [task, resolve] of this.knowledgeItemProcessingQueueMappingPromise) {
-      for (const item of task.loaderTasks) {
-        if (this.maximumLoad()) {
-          break that
-        }
-
-        const { state, task: taskPromise, evaluateTaskWorkload } = item
-
-        if (state !== LoaderTaskItemState.PENDING) {
-          continue
-        }
-
-        const { workload } = evaluateTaskWorkload
-        this.workload += workload
-        this.processingItemCount += 1
-        item.state = LoaderTaskItemState.PROCESSING
-        queueTaskList.push({
-          taskPromise: () =>
-            taskPromise().then(() => {
-              this.workload -= workload
-              this.processingItemCount -= 1
-              task.loaderTasks.delete(item)
-              if (task.loaderTasks.size === 0) {
-                this.knowledgeItemProcessingQueueMappingPromise.delete(task)
-                resolve()
-              }
-              this.processingQueueHandle()
-            }),
-          resolve: () => {},
-          evaluateTaskWorkload
-        })
-      }
-    }
-    return queueTaskList
-  }
-
-  const subTasks = getSubtasksUntilMaximumLoad()
-  if (subTasks.length > 0) {
-    const subTaskPromises = subTasks.map(({ taskPromise }) => taskPromise())
-    Promise.all(subTaskPromises).then(() => {
-      subTasks.forEach(({ resolve }) => resolve())
-    })
-  }
-}
-```
-
-这个方法的工作流程是：
-
-1. 遍历所有待处理的任务集合
-2. 对于每个任务集合中的每个子任务：
-   - 检查是否已达到最大负载（通过 `maximumLoad()` 方法）
-   - 如果任务状态为 PENDING，则：
-     - 增加当前工作负载和处理项目计数
-     - 将任务状态更新为 PROCESSING
-     - 将任务添加到待执行队列
-3. 执行所有收集到的子任务
-4. 当子任务完成时：
-   - 减少工作负载和处理项目计数
-   - 从任务集合中移除已完成的任务
-   - 如果任务集合为空，则解析相应的 Promise
-   - 递归调用 `processingQueueHandle()` 以处理更多任务
-
-### 5. 负载检查
-
-```typescript
-private maximumLoad() {
-  return (
-    this.processingItemCount >= KnowledgeService.MAXIMUM_PROCESSING_ITEM_COUNT ||
-    this.workload >= KnowledgeService.MAXIMUM_WORKLOAD
-  )
-}
-```
-
-这个方法检查当前是否已达到最大负载，通过两个条件：
-
-- 处理项目数量达到上限（30个）
-- 总工作负载达到上限（80MB）
-
-### 6. 任务添加与执行流程
-
-当添加新任务时，流程如下：
-
-1. 创建任务（根据类型不同创建不同的任务）
-2. 通过 `appendProcessingQueue` 将任务添加到队列
-3. 调用 `processingQueueHandle` 开始处理队列中的任务
-
-```typescript
-private appendProcessingQueue(task: LoaderTask): Promise<LoaderReturn> {
-  return new Promise((resolve) => {
-    this.knowledgeItemProcessingQueueMappingPromise.set(loaderTaskIntoOfSet(task), () => {
-      resolve(task.loaderDoneReturn!)
-    })
-  })
-}
-```
-
-## 并发控制的优势
-
-这种并发控制机制有几个重要优势：
-
-1. **资源使用优化**：通过限制同时处理的项目数量和总工作负载，避免系统资源过度使用
-2. **自动调节**：当任务完成时，会自动从队列中获取新任务，保持资源的高效利用
-3. **灵活性**：不同类型的任务有不同的工作负载评估，更准确地反映实际资源需求
-4. **可靠性**：通过状态管理和Promise解析机制，确保任务正确完成并通知调用者
-
-## 实际应用场景
-
-这种并发控制在处理大量数据时特别有用，例如：
-
-- 导入大型目录时，可能包含数百个文件
-- 处理大型网站地图，可能包含大量URL
-- 处理多个用户同时添加知识库项目的请求
-
-通过这种机制，系统可以平滑地处理大量请求，避免资源耗尽，同时保持良好的响应性。
-
-总结来说，KnowledgeService 实现了一个复杂而高效的任务队列系统，通过精确控制并发处理的项目数量和工作负载，确保系统在处理大量数据时保持稳定和高效。

electron-builder.yml

@@ -24,18 +24,14 @@ 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}'
 asarUnpack:
   - resources/**
   - '**/*.{node,dll,metal,exp,lib}'
 win:
   executableName: Cherry Studio
-  artifactName: ${productName}-${version}-portable.${ext}
-  target:
-    - target: nsis
-    - target: portable
 nsis:
   artifactName: ${productName}-${version}-setup.${ext}
   shortcutName: ${productName}
@@ -47,7 +43,6 @@ nsis:
 mac:
   entitlementsInherit: build/entitlements.mac.plist
   notarize: false
-  artifactName: ${productName}-${version}-${arch}.${ext}
   extendInfo:
     - NSCameraUsageDescription: Application requests access to the device's camera.
     - NSMicrophoneUsageDescription: Application requests access to the device's microphone.
@@ -62,8 +57,9 @@ mac:
       arch:
         - arm64
         - x64
-linux:
+dmg:
   artifactName: ${productName}-${version}-${arch}.${ext}
+linux:
   target:
     - target: AppImage
       arch:
@@ -71,6 +67,8 @@ linux:
         - x64
   maintainer: electronjs.org
   category: Utility
+appImage:
+  artifactName: ${productName}-${version}-${arch}.${ext}
 publish:
   provider: generic
   url: https://cherrystudio.ocool.online
@@ -80,4 +78,4 @@ afterPack: scripts/after-pack.js
 afterSign: scripts/notarize.js
 releaseInfo:
   releaseNotes: |
-    修复公式渲染问题
+    增加 Genspark 小程序

electron.vite.config.ts

@@ -20,9 +20,7 @@ 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-loader-image',
-          'p-queue'
+          '@llm-tools/embedjs-libsql'
         ]
       }),
       ...visualizerPlugin('main')
@@ -44,24 +42,7 @@ export default defineConfig({
     plugins: [externalizeDepsPlugin()]
   },
   renderer: {
-    plugins: [
-      react({
-        babel: {
-          plugins: [
-            [
-              'styled-components',
-              {
-                displayName: true, // 开发环境下启用组件名称
-                fileName: false, // 不在类名中包含文件名
-                pure: true, // 优化性能
-                ssr: false // 不需要服务端渲染
-              }
-            ]
-          ]
-        }
-      }),
-      ...visualizerPlugin('renderer')
-    ],
+    plugins: [react(), ...visualizerPlugin('renderer')],
     resolve: {
       alias: {
         '@renderer': resolve('src/renderer/src'),
@@ -69,7 +50,7 @@ export default defineConfig({
       }
     },
     optimizeDeps: {
-      exclude: ['chunk-PZ64DZKH.js', 'chunk-JMKENWIY.js', 'chunk-UXYB6GHG.js', 'chunk-ALDIEZMG.js']
+      exclude: ['chunk-QH6N6I7P.js', 'chunk-PB73W2YU.js']
     }
   }
 })

package.json

@@ -1,11 +1,11 @@
 {
   "name": "CherryStudio",
-  "version": "1.1.4",
+  "version": "0.9.2",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",
-  "author": "support@cherry-ai.com",
-  "homepage": "https://github.com/CherryHQ/cherry-studio",
+  "author": "kangfenmao@qq.com",
+  "homepage": "https://github.com/kangfenmao/cherry-studio",
   "workspaces": {
     "packages": [
       "local",
@@ -18,10 +18,16 @@
     }
   },
   "scripts": {
+    "format": "prettier --write .",
+    "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
+    "typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
+    "typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",
+    "typecheck": "npm run typecheck:node && npm run typecheck:web",
     "start": "electron-vite preview",
     "dev": "electron-vite dev",
+    "build:check": "yarn typecheck",
     "build": "npm run typecheck && electron-vite build",
-    "build:check": "yarn test && yarn typecheck && yarn check:i18n",
+    "postinstall": "electron-builder install-app-deps",
     "build:unpack": "dotenv npm run build && electron-builder --dir",
     "build:win": "dotenv npm run build && electron-builder --win",
     "build:win:x64": "dotenv npm run build && electron-builder --win --x64",
@@ -33,44 +39,27 @@
     "build:linux:x64": "dotenv electron-vite build && electron-builder --linux --x64",
     "build:npm": "node scripts/build-npm.js",
     "release": "node scripts/version.js",
-    "publish": "yarn build:check && yarn release patch push",
+    "publish": "yarn release patch push",
     "pulish:artifacts": "cd packages/artifacts && npm publish && cd -",
     "generate:agents": "yarn workspace @cherry-studio/database agents",
     "generate:icons": "electron-icon-builder --input=./build/logo.png --output=build",
     "analyze:renderer": "VISUALIZER_RENDERER=true yarn build",
-    "analyze:main": "VISUALIZER_MAIN=true yarn build",
-    "typecheck": "npm run typecheck:node && npm run typecheck:web",
-    "typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
-    "typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",
-    "check:i18n": "node scripts/check-i18n.js",
-    "test": "npx -y tsx --test src/**/*.test.ts",
-    "format": "prettier --write .",
-    "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
-    "postinstall": "electron-builder install-app-deps",
-    "prepare": "husky"
+    "analyze:main": "VISUALIZER_MAIN=true yarn build"
   },
   "dependencies": {
-    "@agentic/exa": "^7.3.3",
-    "@agentic/searxng": "^7.3.3",
-    "@agentic/tavily": "^7.3.3",
     "@electron-toolkit/preload": "^3.0.0",
     "@electron-toolkit/utils": "^3.0.0",
     "@electron/notarize": "^2.5.0",
-    "@emotion/is-prop-valid": "^1.3.1",
-    "@google/generative-ai": "^0.21.0",
-    "@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",
-    "@modelcontextprotocol/sdk": "patch:@modelcontextprotocol/sdk@npm%3A1.6.1#~/.yarn/patches/@modelcontextprotocol-sdk-npm-1.6.1-b46313efe7.patch",
-    "@notionhq/client": "^2.2.15",
-    "@tryfabric/martian": "^1.2.4",
+    "@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": "^0.1.25",
+    "@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",
     "@types/react-infinite-scroll-component": "^5.0.0",
     "adm-zip": "^0.5.16",
     "apache-arrow": "^18.1.0",
@@ -79,43 +68,34 @@
     "electron-store": "^8.2.0",
     "electron-updater": "^6.3.9",
     "electron-window-state": "^5.0.3",
-    "epub": "patch:epub@npm%3A1.3.0#~/.yarn/patches/epub-npm-1.3.0-8325494ffe.patch",
-    "fetch-socks": "^1.3.2",
     "fs-extra": "^11.2.0",
+    "html2canvas": "^1.4.1",
     "markdown-it": "^14.1.0",
     "officeparser": "^4.1.1",
-    "p-queue": "^8.1.0",
     "tokenx": "^0.4.1",
-    "undici": "^7.4.0",
-    "webdav": "4.11.4",
-    "zipread": "^1.3.3"
+    "webdav": "4.11.4"
   },
   "devDependencies": {
-    "@anthropic-ai/sdk": "^0.38.0",
+    "@anthropic-ai/sdk": "^0.24.3",
     "@electron-toolkit/eslint-config-prettier": "^2.0.0",
     "@electron-toolkit/eslint-config-ts": "^1.0.1",
     "@electron-toolkit/tsconfig": "^1.0.1",
+    "@google/generative-ai": "^0.21.0",
     "@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",
     "@types/tinycolor2": "^1",
     "@vitejs/plugin-react": "^4.2.1",
     "antd": "^5.22.5",
-    "applescript": "^1.0.0",
-    "axios": "^1.7.3",
-    "babel-plugin-styled-components": "^2.1.4",
+    "axios": "^1.7.9",
     "browser-image-compression": "^2.0.2",
     "dayjs": "^1.11.11",
     "dexie": "^4.0.8",
@@ -133,14 +113,11 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-unused-imports": "^4.0.0",
-    "html-to-image": "^1.11.13",
-    "husky": "^9.1.7",
     "i18next": "^23.11.5",
-    "lint-staged": "^15.5.0",
     "lodash": "^4.17.21",
     "mime": "^4.0.4",
-    "openai": "patch:openai@npm%3A4.77.3#~/.yarn/patches/openai-npm-4.77.3-59c6d42e7a.patch",
-    "prettier": "^3.5.3",
+    "openai": "patch:openai@npm%3A4.76.2#~/.yarn/patches/openai-npm-4.76.2-8ff1374617.patch",
+    "prettier": "^3.2.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-hotkeys-hook": "^4.6.1",
@@ -154,14 +131,13 @@
     "redux": "^5.0.1",
     "redux-persist": "^6.0.0",
     "rehype-katex": "^7.0.1",
-    "rehype-mathjax": "^7.0.0",
+    "rehype-mathjax": "^6.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",
@@ -174,18 +150,7 @@
   },
   "resolutions": {
     "pdf-parse@npm:1.1.1": "patch:pdf-parse@npm%3A1.1.1#~/.yarn/patches/pdf-parse-npm-1.1.1-04a6109b2a.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"
+    "@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"
   },
-  "packageManager": "yarn@4.6.0",
-  "lint-staged": {
-    "*.{js,jsx,ts,tsx,cjs,mjs,cts,mts}": [
-      "prettier --write",
-      "eslint --fix"
-    ],
-    "*.{json,md,yml,yaml,css,scss,html}": [
-      "prettier --write"
-    ]
-  }
+  "packageManager": "yarn@4.5.0"
 }

packages/database/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cherry-studio/database",
-  "packageManager": "yarn@4.6.0",
+  "packageManager": "yarn@4.3.1",
   "dependencies": {
     "csv-parser": "^3.0.0",
     "sqlite3": "^5.1.7"

packages/shared/config/constant.ts

@@ -2,8 +2,6 @@ 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 文件
@@ -19,10 +17,7 @@ export const textExts = [
   '.ini', // 配置文件
   '.log', // 日志文件
   '.rtf', // 富文本格式文件
-  '.org', // org-mode 文件
-  '.wiki', // VimWiki 文件
   '.tex', // LaTeX 文件
-  '.bib', // BibTeX 文件
   '.srt', // 字幕文件
   '.xhtml', // XHTML 文件
   '.nfo', // 信息文件（主要用于场景发布）
@@ -38,7 +33,6 @@ export const textExts = [
   '.bat', // Windows 批处理文件
   '.sh', // Unix/Linux Shell 脚本文件
   '.py', // Python 脚本文件
-  '.ipynb', // Jupyter 笔记本格式
   '.rb', // Ruby 脚本文件
   '.pl', // Perl 脚本文件
   '.sql', // SQL 脚本文件
@@ -93,17 +87,7 @@ export const textExts = [
   '.gradle', // Gradle 构建文件
   '.groovy', // Gradle 构建文件
   '.kts', // Kotlin Script 文件
-  '.java', // Java 代码文件
-  '.cs', // C# 代码文件
-  '.cpp', // C++ 代码文件
-  '.c', // C++ 代码文件
-  '.h', // C++ 头文件
-  '.hpp', // C++ 头文件
-  '.cc', // C++ 源文件
-  '.cxx', // C++ 源文件
-  '.cppm', // C++20 模块接口文件
-  '.ipp', // 模板实现文件
-  '.ixx' // C++20 模块实现文件
+  '.java' // Java 代码文件
 ]
 
 export const ZOOM_SHORTCUTS = [

packages/shared/config/types.ts

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

resources/textMonitor.swift

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

scripts/check-i18n.js

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

@@ -1,98 +0,0 @@
-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/config.ts

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

src/main/index.ts

@@ -1,12 +1,12 @@
 import { electronApp, optimizer } from '@electron-toolkit/utils'
-import { replaceDevtoolsFont } from '@main/utils/windowUtil'
-import { app } from 'electron'
+import { app, BrowserWindow } from 'electron'
 import installExtension, { REDUX_DEVTOOLS } from 'electron-devtools-installer'
 
 import { registerIpc } from './ipc'
 import { registerShortcuts } from './services/ShortcutService'
 import { TrayService } from './services/TrayService'
 import { windowService } from './services/WindowService'
+import { updateUserDataPath } from './utils/upgrade'
 
 // Check for single instance lock
 if (!app.requestSingleInstanceLock()) {
@@ -16,8 +16,9 @@ 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()
+
     // Set app user model id for windows
     electronApp.setAppUserModelId(import.meta.env.VITE_MAIN_BUNDLE_ID || 'com.kangfenmao.CherryStudio')
 
@@ -25,8 +26,9 @@ if (!app.requestSingleInstanceLock()) {
     new TrayService()
 
     app.on('activate', function () {
-      const mainWindow = windowService.getMainWindow()
-      if (!mainWindow || mainWindow.isDestroyed()) {
+      // 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) {
         windowService.createMainWindow()
       } else {
         windowService.showMainWindow()
@@ -37,8 +39,6 @@ if (!app.requestSingleInstanceLock()) {
 
     registerIpc(mainWindow, app)
 
-    replaceDevtoolsFont(mainWindow)
-
     if (process.env.NODE_ENV === 'development') {
       installExtension(REDUX_DEVTOOLS)
         .then((name) => console.log(`Added Extension:  ${name}`))
@@ -48,7 +48,12 @@ if (!app.requestSingleInstanceLock()) {
 
   // Listen for second instance
   app.on('second-instance', () => {
-    windowService.showMainWindow()
+    const mainWindow = BrowserWindow.getAllWindows()[0]
+    if (mainWindow) {
+      mainWindow.isMinimized() && mainWindow.restore()
+      mainWindow.show()
+      mainWindow.focus()
+    }
   })
 
   app.on('browser-window-created', (_, window) => {

src/main/ipc.ts

@@ -1,7 +1,10 @@
 import fs from 'node:fs'
+import path from 'node:path'
+import vm from 'node:vm'
 
-import { MCPServer, Shortcut, ThemeMode } from '@types'
-import { BrowserWindow, ipcMain, session, shell } from 'electron'
+import { Shortcut, ThemeMode } from '@types'
+import axios from 'axios'
+import { BrowserWindow, ipcMain, ProxyConfig, session, shell } from 'electron'
 import log from 'electron-log'
 
 import { titleBarOverlayDark, titleBarOverlayLight } from './config'
@@ -9,50 +12,37 @@ import AppUpdater from './services/AppUpdater'
 import BackupManager from './services/BackupManager'
 import { configManager } from './services/ConfigManager'
 import { ExportService } from './services/ExportService'
-import FileService from './services/FileService'
 import FileStorage from './services/FileStorage'
-import { GeminiService } from './services/GeminiService'
 import KnowledgeService from './services/KnowledgeService'
-import MCPService from './services/MCPService'
-import { ProxyConfig, proxyManager } from './services/ProxyManager'
 import { registerShortcuts, unregisterAllShortcuts } from './services/ShortcutService'
-import { TrayService } from './services/TrayService'
 import { windowService } from './services/WindowService'
-import { getResourcePath } from './utils'
-import { decrypt, encrypt } from './utils/aes'
-import { getFilesDir } from './utils/file'
 import { compress, decompress } from './utils/zip'
 
 const fileManager = new FileStorage()
 const backupManager = new BackupManager()
 const exportService = new ExportService(fileManager)
-const mcpService = new MCPService()
 
 export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
-  const appUpdater = new AppUpdater(mainWindow)
+  const { autoUpdater } = new AppUpdater(mainWindow)
 
   ipcMain.handle('app:info', () => ({
     version: app.getVersion(),
     isPackaged: app.isPackaged,
     appPath: app.getAppPath(),
-    filesPath: getFilesDir(),
+    filesPath: path.join(app.getPath('userData'), 'Data', 'Files'),
     appDataPath: app.getPath('userData'),
-    resourcesPath: getResourcePath(),
     logsPath: log.transports.file.getFile().path
   }))
 
   ipcMain.handle('app:proxy', async (_, proxy: string) => {
-    const proxyConfig: ProxyConfig =
-      proxy === 'system' ? { mode: 'system' } : proxy ? { mode: 'custom', url: proxy } : { mode: 'none' }
-    await proxyManager.configureProxy(proxyConfig)
+    const sessions = [session.defaultSession, session.fromPartition('persist:webview')]
+    const proxyConfig: ProxyConfig = proxy === 'system' ? { mode: 'system' } : proxy ? { proxyRules: proxy } : {}
+    await Promise.all(sessions.map((session) => session.setProxy(proxyConfig)))
   })
 
   ipcMain.handle('app:reload', () => mainWindow.reload())
   ipcMain.handle('open:website', (_, url: string) => shell.openExternal(url))
 
-  // Update
-  ipcMain.handle('app:show-update-dialog', () => appUpdater.showUpdateDialog(mainWindow))
-
   // language
   ipcMain.handle('app:set-language', (_, language) => {
     configManager.setLanguage(language)
@@ -63,16 +53,6 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     configManager.setTray(isActive)
   })
 
-  ipcMain.handle('app:restart-tray', () => TrayService.getInstance().restartTray())
-
-  ipcMain.handle('config:set', (_, key: string, value: any) => {
-    configManager.set(key, value)
-  })
-
-  ipcMain.handle('config:get', (_, key: string) => {
-    return configManager.get(key)
-  })
-
   // theme
   ipcMain.handle('app:set-theme', (_, theme: ThemeMode) => {
     configManager.setTheme(theme)
@@ -104,9 +84,9 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
 
   // check for update
   ipcMain.handle('app:check-for-update', async () => {
-    const update = await appUpdater.autoUpdater.checkForUpdates()
+    const update = await autoUpdater.checkForUpdates()
     return {
-      currentVersion: appUpdater.autoUpdater.currentVersion,
+      currentVersion: autoUpdater.currentVersion,
       updateInfo: update?.updateInfo
     }
   })
@@ -138,10 +118,6 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle('file:base64Image', fileManager.base64Image)
   ipcMain.handle('file:download', fileManager.downloadFile)
   ipcMain.handle('file:copy', fileManager.copyFile)
-  ipcMain.handle('file:binaryFile', fileManager.binaryFile)
-
-  // fs
-  ipcMain.handle('fs:read', FileService.readFile)
 
   // minapp
   ipcMain.handle('minapp', (_, args) => {
@@ -181,62 +157,9 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle('knowledge-base:remove', KnowledgeService.remove)
   ipcMain.handle('knowledge-base:search', KnowledgeService.search)
 
-  // window
-  ipcMain.handle('window:set-minimum-size', (_, width: number, height: number) => {
-    mainWindow?.setMinimumSize(width, height)
+  // vm
+  ipcMain.handle('run-js', (_, code: string) => {
+    const context = vm.createContext(Object.assign({ fetch: fetch, URL: URL, axios: axios }, global))
+    return vm.runInContext(code, context)
   })
-
-  ipcMain.handle('window:reset-minimum-size', () => {
-    mainWindow?.setMinimumSize(1080, 600)
-    const [width, height] = mainWindow?.getSize() ?? [1080, 600]
-    if (width < 1080) {
-      mainWindow?.setSize(1080, height)
-    }
-  })
-
-  // gemini
-  ipcMain.handle('gemini:upload-file', GeminiService.uploadFile)
-  ipcMain.handle('gemini:base64-file', GeminiService.base64File)
-  ipcMain.handle('gemini:retrieve-file', GeminiService.retrieveFile)
-  ipcMain.handle('gemini:list-files', GeminiService.listFiles)
-  ipcMain.handle('gemini:delete-file', GeminiService.deleteFile)
-
-  // mini window
-  ipcMain.handle('miniwindow:show', () => windowService.showMiniWindow())
-  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)
-  )
-
-  // Register MCP handlers
-  ipcMain.on('mcp:servers-from-renderer', (_, servers) => mcpService.setServers(servers))
-  ipcMain.handle('mcp:list-servers', async () => mcpService.listAvailableServices())
-  ipcMain.handle('mcp:add-server', async (_, server: MCPServer) => mcpService.addServer(server))
-  ipcMain.handle('mcp:update-server', async (_, server: MCPServer) => mcpService.updateServer(server))
-  ipcMain.handle('mcp:delete-server', async (_, serverName: string) => mcpService.deleteServer(serverName))
-  ipcMain.handle('mcp:set-server-active', async (_, { name, isActive }) =>
-    mcpService.setServerActive({ name, isActive })
-  )
-
-  // According to preload, this should take no parameters, but our implementation accepts
-  // an optional serverName for better flexibility
-  ipcMain.handle('mcp:list-tools', async (_, serverName?: string) => mcpService.listTools(serverName))
-  ipcMain.handle('mcp:call-tool', async (_, params: { client: string; name: string; args: any }) =>
-    mcpService.callTool(params)
-  )
-
-  ipcMain.handle('mcp:cleanup', async () => mcpService.cleanup())
-
-  // Listen for changes in MCP servers and notify renderer
-  mcpService.on('servers-updated', (servers) => {
-    mainWindow?.webContents.send('mcp:servers-updated', servers)
-  })
-
-  // Clean up MCP services when app quits
-  app.on('before-quit', () => mcpService.cleanup())
 }

src/main/loader/draftsExportLoader.ts

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

@@ -1,248 +0,0 @@
-import { RecursiveCharacterTextSplitter } from '@langchain/textsplitters'
-import { BaseLoader } from '@llm-tools/embedjs-interfaces'
-import { cleanString } from '@llm-tools/embedjs-utils'
-import { getTempDir } from '@main/utils/file'
-import Logger from 'electron-log'
-import EPub from 'epub'
-import * as fs from 'fs'
-import path from 'path'
-
-/**
- * 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 tempFilePath = path.join(getTempDir(), `epub-${Date.now()}.txt`)
-      const writeStream = fs.createWriteStream(tempFilePath)
-
-      // 遍历所有章节
-      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) {
-            // 直接写入文件
-            writeStream.write(text + '\n\n')
-          }
-        } catch (error) {
-          Logger.error(`[EpubLoader] Error processing chapter ${chapter.id}:`, error)
-        }
-      }
-
-      // 关闭写入流
-      writeStream.end()
-
-      // 等待写入完成
-      await new Promise<void>((resolve, reject) => {
-        writeStream.on('finish', resolve)
-        writeStream.on('error', reject)
-      })
-
-      // 从临时文件读取内容
-      this.extractedText = fs.readFileSync(tempFilePath, 'utf-8')
-
-      // 删除临时文件
-      fs.unlinkSync(tempFilePath)
-
-      // 只添加一条完成日志
-      Logger.info(`[EpubLoader] 电子书 ${this.metadata?.title || path.basename(this.filePath)} 处理完成`)
-    } 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

@@ -1,158 +0,0 @@
-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'
-
-// 文件扩展名到加载器类型的映射
-const FILE_LOADER_MAP: Record<string, string> = {
-  // 内置类型
-  '.pdf': 'common',
-  '.csv': 'common',
-  '.docx': 'common',
-  '.pptx': 'common',
-  '.xlsx': 'common',
-  '.md': 'common',
-  // OD类型
-  '.odt': 'od',
-  '.ods': 'od',
-  '.odp': 'od',
-  // epub类型
-  '.epub': 'epub',
-  // Drafts类型
-  '.draftsexport': 'drafts',
-  // HTML类型
-  '.html': 'html',
-  '.htm': 'html',
-  // JSON类型
-  '.json': 'json'
-  // 其他类型默认为文本类型
-}
-
-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> {
-  // 获取文件类型，如果没有匹配则默认为文本类型
-  const loaderType = FILE_LOADER_MAP[file.ext.toLowerCase()] || 'text'
-  let loaderReturn: AddLoaderReturn
-
-  // JSON类型处理
-  let jsonObject = {}
-  let jsonParsed = true
-  Logger.info(`[KnowledgeBase] processing file ${file.path} as ${loaderType} type`)
-  switch (loaderType) {
-    case 'common':
-      // 内置类型处理
-      loaderReturn = await ragApplication.addLoader(
-        new LocalPathLoader({
-          path: file.path,
-          chunkSize: base.chunkSize,
-          chunkOverlap: base.chunkOverlap
-        }) as any,
-        forceReload
-      )
-      break
-
-    case 'od':
-      // OD类型处理
-      loaderReturn = await addOdLoader(ragApplication, file, base, forceReload)
-      break
-    case 'epub':
-      // epub类型处理
-      loaderReturn = await ragApplication.addLoader(
-        new EpubLoader({
-          filePath: file.path,
-          chunkSize: base.chunkSize ?? 1000,
-          chunkOverlap: base.chunkOverlap ?? 200
-        }) as any,
-        forceReload
-      )
-      break
-
-    case 'drafts':
-      // Drafts类型处理
-      loaderReturn = await ragApplication.addLoader(new DraftsExportLoader(file.path) as any, forceReload)
-      break
-
-    case 'html':
-      // HTML类型处理
-      loaderReturn = await ragApplication.addLoader(
-        new WebLoader({
-          urlOrContent: fs.readFileSync(file.path, 'utf-8'),
-          chunkSize: base.chunkSize,
-          chunkOverlap: base.chunkOverlap
-        }) as any,
-        forceReload
-      )
-      break
-
-    case 'json':
-      try {
-        jsonObject = JSON.parse(fs.readFileSync(file.path, 'utf-8'))
-      } catch (error) {
-        jsonParsed = false
-        Logger.warn('[KnowledgeBase] failed parsing json file, falling back to text processing:', file.path, error)
-      }
-
-      if (jsonParsed) {
-        loaderReturn = await ragApplication.addLoader(new JsonLoader({ object: jsonObject }), forceReload)
-        break
-      }
-    // fallthrough - JSON 解析失败时作为文本处理
-    default:
-      // 文本类型处理（默认）
-      // 如果是其他文本类型且尚未读取文件，则读取文件
-      loaderReturn = await ragApplication.addLoader(
-        new TextLoader({
-          text: fs.readFileSync(file.path, 'utf-8'),
-          chunkSize: base.chunkSize,
-          chunkOverlap: base.chunkOverlap
-        }) as any,
-        forceReload
-      )
-      break
-  }
-
-  return {
-    entriesAdded: loaderReturn.entriesAdded,
-    uniqueId: loaderReturn.uniqueId,
-    uniqueIds: [loaderReturn.uniqueId],
-    loaderType: loaderReturn.loaderType
-  } as LoaderReturn
-}

src/main/loader/odLoader.ts

@@ -1,71 +0,0 @@
-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/AppUpdater.ts

@@ -1,13 +1,11 @@
-import { UpdateInfo } from 'builder-util-runtime'
 import { app, BrowserWindow, dialog } from 'electron'
 import logger from 'electron-log'
-import { AppUpdater as _AppUpdater, autoUpdater } from 'electron-updater'
+import { AppUpdater as _AppUpdater, autoUpdater, UpdateInfo } from 'electron-updater'
 
 import icon from '../../../build/icon.png?asset'
 
 export default class AppUpdater {
   autoUpdater: _AppUpdater = autoUpdater
-  private releaseInfo: UpdateInfo | undefined
 
   constructor(mainWindow: BrowserWindow) {
     logger.transports.file.level = 'info'
@@ -18,12 +16,7 @@ export default class AppUpdater {
 
     // 检测下载错误
     autoUpdater.on('error', (error) => {
-      // 简单记录错误信息和时间戳
-      logger.error('更新异常', {
-        message: error.message,
-        stack: error.stack,
-        time: new Date().toISOString()
-      })
+      logger.error('更新异常', error)
       mainWindow.webContents.send('update-error', error)
     })
 
@@ -44,40 +37,34 @@ export default class AppUpdater {
 
     // 当需要更新的内容下载完成后
     autoUpdater.on('update-downloaded', (releaseInfo: UpdateInfo) => {
-      mainWindow.webContents.send('update-downloaded', releaseInfo)
-      this.releaseInfo = releaseInfo
-      logger.info('下载完成', releaseInfo)
+      mainWindow.webContents.send('update-downloaded')
+
+      logger.info('下载完成，询问用户是否更新', releaseInfo)
+
+      dialog
+        .showMessageBox({
+          type: 'info',
+          title: '安装更新',
+          icon,
+          message: `新版本 ${releaseInfo.version} 已准备就绪`,
+          detail: this.formatReleaseNotes(releaseInfo.releaseNotes),
+          buttons: ['稍后安装', '立即安装'],
+          defaultId: 1,
+          cancelId: 0
+        })
+        .then(({ response }) => {
+          if (response === 1) {
+            app.isQuitting = true
+            setImmediate(() => autoUpdater.quitAndInstall())
+          } else {
+            mainWindow.webContents.send('update-downloaded-cancelled')
+          }
+        })
     })
 
     this.autoUpdater = autoUpdater
   }
 
-  public async showUpdateDialog(mainWindow: BrowserWindow) {
-    if (!this.releaseInfo) {
-      return
-    }
-
-    dialog
-      .showMessageBox({
-        type: 'info',
-        title: '安装更新',
-        icon,
-        message: `新版本 ${this.releaseInfo.version} 已准备就绪`,
-        detail: this.formatReleaseNotes(this.releaseInfo.releaseNotes),
-        buttons: ['稍后安装', '立即安装'],
-        defaultId: 1,
-        cancelId: 0
-      })
-      .then(({ response }) => {
-        if (response === 1) {
-          app.isQuitting = true
-          setImmediate(() => autoUpdater.quitAndInstall())
-        } else {
-          mainWindow.webContents.send('update-downloaded-cancelled')
-        }
-      })
-  }
-
   private formatReleaseNotes(releaseNotes: string | ReleaseNoteInfo[] | null | undefined): string {
     if (!releaseNotes) {
       return '暂无更新说明'

src/main/services/BackupManager.ts

@@ -1,13 +1,11 @@
 import { WebDavConfig } from '@types'
 import AdmZip from 'adm-zip'
-import { exec } from 'child_process'
 import { app } from 'electron'
 import Logger from 'electron-log'
 import * as fs from 'fs-extra'
 import * as path from 'path'
 
 import WebDav from './WebDav'
-import { windowService } from './WindowService'
 
 class BackupManager {
   private tempDir = path.join(app.getPath('temp'), 'cherry-studio', 'backup', 'temp')
@@ -20,92 +18,23 @@ class BackupManager {
     this.restoreFromWebdav = this.restoreFromWebdav.bind(this)
   }
 
-  private async setWritableRecursive(dirPath: string): Promise<void> {
-    try {
-      const items = await fs.readdir(dirPath, { withFileTypes: true })
-
-      for (const item of items) {
-        const fullPath = path.join(dirPath, item.name)
-
-        // 先处理子目录
-        if (item.isDirectory()) {
-          await this.setWritableRecursive(fullPath)
-        }
-
-        // 统一设置权限（Windows需要特殊处理）
-        await this.forceSetWritable(fullPath)
-      }
-
-      // 确保根目录权限
-      await this.forceSetWritable(dirPath)
-    } catch (error) {
-      Logger.error(`权限设置失败：${dirPath}`, error)
-      throw error
-    }
-  }
-
-  // 新增跨平台权限设置方法
-  private async forceSetWritable(targetPath: string): Promise<void> {
-    try {
-      // Windows系统需要先取消只读属性
-      if (process.platform === 'win32') {
-        await fs.chmod(targetPath, 0o666) // Windows会忽略权限位但能移除只读
-      } else {
-        const stats = await fs.stat(targetPath)
-        const mode = stats.isDirectory() ? 0o777 : 0o666
-        await fs.chmod(targetPath, mode)
-      }
-
-      // 双重保险：使用文件属性命令（Windows专用）
-      if (process.platform === 'win32') {
-        await exec(`attrib -R "${targetPath}" /L /D`)
-      }
-    } catch (error) {
-      if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
-        Logger.warn(`权限设置警告：${targetPath}`, error)
-      }
-    }
-  }
-
   async backup(
     _: Electron.IpcMainInvokeEvent,
     fileName: string,
     data: string,
     destinationPath: string = this.backupDir
   ): Promise<string> {
-    const mainWindow = windowService.getMainWindow()
-
-    const onProgress = (processData: { stage: string; progress: number; total: number }) => {
-      mainWindow?.webContents.send('backup-progress', processData)
-      Logger.log('[BackupManager] backup progress', processData)
-    }
-
     try {
       await fs.ensureDir(this.tempDir)
-      onProgress({ stage: 'preparing', progress: 0, total: 100 })
 
       // 将 data 写入临时文件
       const tempDataPath = path.join(this.tempDir, 'data.json')
       await fs.writeFile(tempDataPath, data)
-      onProgress({ stage: 'writing_data', progress: 20, total: 100 })
 
       // 复制 Data 目录到临时目录
       const sourcePath = path.join(app.getPath('userData'), 'Data')
       const tempDataDir = path.join(this.tempDir, 'Data')
-
-      // 获取源目录总大小
-      const totalSize = await this.getDirSize(sourcePath)
-      let copiedSize = 0
-
-      // 使用流式复制
-      await this.copyDirWithProgress(sourcePath, tempDataDir, (size) => {
-        copiedSize += size
-        const progress = Math.min(80, 20 + Math.floor((copiedSize / totalSize) * 60))
-        onProgress({ stage: 'copying_files', progress, total: 100 })
-      })
-
-      await this.setWritableRecursive(tempDataDir)
-      onProgress({ stage: 'compressing', progress: 80, total: 100 })
+      await fs.copy(sourcePath, tempDataDir)
 
       // 使用 adm-zip 创建压缩文件
       const zip = new AdmZip()
@@ -115,7 +44,6 @@ class BackupManager {
 
       // 清理临时目录
       await fs.remove(this.tempDir)
-      onProgress({ stage: 'completed', progress: 100, total: 100 })
 
       Logger.log('Backup completed successfully')
       return backupedFilePath
@@ -126,54 +54,34 @@ class BackupManager {
   }
 
   async restore(_: Electron.IpcMainInvokeEvent, backupPath: string): Promise<string> {
-    const mainWindow = windowService.getMainWindow()
-
-    const onProgress = (processData: { stage: string; progress: number; total: number }) => {
-      mainWindow?.webContents.send('restore-progress', processData)
-      Logger.log('[BackupManager] restore progress', processData)
-    }
-
     try {
       // 创建临时目录
       await fs.ensureDir(this.tempDir)
-      onProgress({ stage: 'preparing', progress: 0, total: 100 })
 
       Logger.log('[backup] step 1: unzip backup file', this.tempDir)
+
       // 使用 adm-zip 解压
       const zip = new AdmZip(backupPath)
       zip.extractAllTo(this.tempDir, true) // true 表示覆盖已存在的文件
-      onProgress({ stage: 'extracting', progress: 20, total: 100 })
 
       Logger.log('[backup] step 2: read data.json')
+
       // 读取 data.json
       const dataPath = path.join(this.tempDir, 'data.json')
       const data = await fs.readFile(dataPath, 'utf-8')
-      onProgress({ stage: 'reading_data', progress: 40, total: 100 })
 
       Logger.log('[backup] step 3: restore Data directory')
+
       // 恢复 Data 目录
       const sourcePath = path.join(this.tempDir, 'Data')
       const destPath = path.join(app.getPath('userData'), 'Data')
-
-      // 获取源目录总大小
-      const totalSize = await this.getDirSize(sourcePath)
-      let copiedSize = 0
-
-      await this.setWritableRecursive(destPath)
       await fs.remove(destPath)
-
-      // 使用流式复制
-      await this.copyDirWithProgress(sourcePath, destPath, (size) => {
-        copiedSize += size
-        const progress = Math.min(90, 40 + Math.floor((copiedSize / totalSize) * 50))
-        onProgress({ stage: 'copying_files', progress, total: 100 })
-      })
+      await fs.copy(sourcePath, destPath)
 
       Logger.log('[backup] step 4: clean up temp directory')
+
       // 清理临时目录
-      await this.setWritableRecursive(this.tempDir)
       await fs.remove(this.tempDir)
-      onProgress({ stage: 'completed', progress: 100, total: 100 })
 
       Logger.log('[backup] step 5: Restore completed successfully')
 
@@ -208,44 +116,6 @@ class BackupManager {
 
     return await this.restore(_, backupedFilePath)
   }
-
-  private async getDirSize(dirPath: string): Promise<number> {
-    let size = 0
-    const items = await fs.readdir(dirPath, { withFileTypes: true })
-
-    for (const item of items) {
-      const fullPath = path.join(dirPath, item.name)
-      if (item.isDirectory()) {
-        size += await this.getDirSize(fullPath)
-      } else {
-        const stats = await fs.stat(fullPath)
-        size += stats.size
-      }
-    }
-    return size
-  }
-
-  private async copyDirWithProgress(
-    source: string,
-    destination: string,
-    onProgress: (size: number) => void
-  ): Promise<void> {
-    const items = await fs.readdir(source, { withFileTypes: true })
-
-    for (const item of items) {
-      const sourcePath = path.join(source, item.name)
-      const destPath = path.join(destination, item.name)
-
-      if (item.isDirectory()) {
-        await fs.ensureDir(destPath)
-        await this.copyDirWithProgress(sourcePath, destPath, onProgress)
-      } else {
-        const stats = await fs.stat(sourcePath)
-        await fs.copy(sourcePath, destPath)
-        onProgress(stats.size)
-      }
-    }
-  }
 }
 
 export default BackupManager

src/main/services/CacheService.ts

@@ -1,74 +0,0 @@
-interface CacheItem<T> {
-  data: T
-  timestamp: number
-  duration: number
-}
-
-export class CacheService {
-  private static cache: Map<string, CacheItem<any>> = new Map()
-
-  /**
-   * Set cache
-   * @param key Cache key
-   * @param data Cache data
-   * @param duration Cache duration (in milliseconds)
-   */
-  static set<T>(key: string, data: T, duration: number): void {
-    this.cache.set(key, {
-      data,
-      timestamp: Date.now(),
-      duration
-    })
-  }
-
-  /**
-   * Get cache
-   * @param key Cache key
-   * @returns Returns data if cache exists and not expired, otherwise returns null
-   */
-  static get<T>(key: string): T | null {
-    const item = this.cache.get(key)
-    if (!item) return null
-
-    const now = Date.now()
-    if (now - item.timestamp > item.duration) {
-      this.remove(key)
-      return null
-    }
-
-    return item.data
-  }
-
-  /**
-   * Remove specific cache
-   * @param key Cache key
-   */
-  static remove(key: string): void {
-    this.cache.delete(key)
-  }
-
-  /**
-   * Clear all cache
-   */
-  static clear(): void {
-    this.cache.clear()
-  }
-
-  /**
-   * Check if cache exists and is valid
-   * @param key Cache key
-   * @returns boolean
-   */
-  static has(key: string): boolean {
-    const item = this.cache.get(key)
-    if (!item) return false
-
-    const now = Date.now()
-    if (now - item.timestamp > item.duration) {
-      this.remove(key)
-      return false
-    }
-
-    return true
-  }
-}

src/main/services/ClipboardMonitor.ts

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

src/main/services/ConfigManager.ts

@@ -30,7 +30,7 @@ export class ConfigManager {
     this.store.set('theme', theme)
   }
 
-  getTray(): boolean {
+  isTray(): boolean {
     return !!this.store.get('tray', true)
   }
 
@@ -83,30 +83,6 @@ export class ConfigManager {
     )
     this.notifySubscribers('shortcuts', shortcuts)
   }
-
-  getClickTrayToShowQuickAssistant(): boolean {
-    return this.store.get('clickTrayToShowQuickAssistant', false) as boolean
-  }
-
-  setClickTrayToShowQuickAssistant(value: boolean) {
-    this.store.set('clickTrayToShowQuickAssistant', value)
-  }
-
-  getEnableQuickAssistant(): boolean {
-    return this.store.get('enableQuickAssistant', false) as boolean
-  }
-
-  setEnableQuickAssistant(value: boolean) {
-    this.store.set('enableQuickAssistant', value)
-  }
-
-  set(key: string, value: any) {
-    this.store.set(key, value)
-  }
-
-  get(key: string) {
-    return this.store.get(key)
-  }
 }
 
 export const configManager = new ConfigManager()

src/main/services/ExportService.ts

@@ -1,22 +1,7 @@
 /* eslint-disable no-case-declarations */
 // ExportService
 
-import {
-  AlignmentType,
-  BorderStyle,
-  Document,
-  ExternalHyperlink,
-  HeadingLevel,
-  Packer,
-  Paragraph,
-  ShadingType,
-  Table,
-  TableCell,
-  TableRow,
-  TextRun,
-  VerticalAlign,
-  WidthType
-} from 'docx'
+import { AlignmentType, BorderStyle, Document, HeadingLevel, Packer, Paragraph, ShadingType, TextRun } from 'docx'
 import { dialog } from 'electron'
 import Logger from 'electron-log'
 import MarkdownIt from 'markdown-it'
@@ -36,54 +21,13 @@ export class ExportService {
     const tokens = this.md.parse(markdown, {})
     const elements: any[] = []
     let listLevel = 0
-    let currentTable: Table | null = null
-    let currentRowCells: TableCell[] = []
-    let isHeaderRow = false
-    let tableColumnCount = 0
-    let tableRows: TableRow[] = [] // Store rows temporarily
 
-    const processInlineTokens = (tokens: any[], isHeaderRow: boolean): (TextRun | ExternalHyperlink)[] => {
-      const runs: (TextRun | ExternalHyperlink)[] = []
-      let linkText = ''
-      let linkUrl = ''
-      let insideLink = false
-
-      for (let i = 0; i < tokens.length; i++) {
-        const token = tokens[i]
+    const processInlineTokens = (tokens: any[]): TextRun[] => {
+      const runs: TextRun[] = []
+      for (const token of tokens) {
         switch (token.type) {
-          case 'link_open':
-            insideLink = true
-            linkUrl = token.attrs.find((attr: [string, string]) => attr[0] === 'href')[1]
-            linkText = tokens[i + 1].content
-            i += 1
-            break
-          case 'link_close':
-            if (insideLink && linkUrl && linkText) {
-              // Handle any accumulated link text with the ExternalHyperlink
-              runs.push(
-                new ExternalHyperlink({
-                  children: [
-                    new TextRun({
-                      text: linkText,
-                      style: 'Hyperlink',
-                      color: '0000FF',
-                      underline: {
-                        type: 'single'
-                      }
-                    })
-                  ],
-                  link: linkUrl
-                })
-              )
-
-              // Reset link variables
-              linkText = ''
-              linkUrl = ''
-              insideLink = false
-            }
-            break
           case 'text':
-            runs.push(new TextRun({ text: token.content, bold: isHeaderRow ? true : false }))
+            runs.push(new TextRun(token.content))
             break
           case 'strong':
             runs.push(new TextRun({ text: token.content, bold: true }))
@@ -101,6 +45,7 @@ export class ExportService {
 
     for (let i = 0; i < tokens.length; i++) {
       const token = tokens[i]
+
       switch (token.type) {
         case 'heading_open':
           // 获取标题级别 (h1 -> h6)
@@ -123,7 +68,7 @@ export class ExportService {
           const inlineTokens = tokens[i + 1].children || []
           elements.push(
             new Paragraph({
-              children: processInlineTokens(inlineTokens, false),
+              children: processInlineTokens(inlineTokens),
               spacing: {
                 before: 120,
                 after: 120
@@ -148,7 +93,7 @@ export class ExportService {
               children: [
                 new TextRun({ text: '•', bold: true }),
                 new TextRun({ text: '\t' }),
-                ...processInlineTokens(itemInlineTokens, false)
+                ...processInlineTokens(itemInlineTokens)
               ],
               indent: {
                 left: listLevel * 720
@@ -226,116 +171,6 @@ export class ExportService {
           )
           i += 3
           break
-
-        // 表格处理
-        case 'table_open':
-          tableRows = [] // Reset table rows for new table
-          break
-
-        case 'thead_open':
-          isHeaderRow = true
-          break
-
-        case 'tbody_open':
-          isHeaderRow = false
-          break
-
-        case 'tr_open':
-          currentRowCells = []
-          break
-
-        case 'tr_close':
-          const row = new TableRow({
-            children: currentRowCells,
-            tableHeader: isHeaderRow
-          })
-          tableRows.push(row)
-          // 计算表格有多少列（针对第一行）
-          if (tableColumnCount === 0) {
-            tableColumnCount = currentRowCells.length
-          }
-          break
-
-        case 'th_open':
-        case 'td_open':
-          const isFirstColumn = currentRowCells.length === 0 // 判断是否是第一列
-          const borders = {
-            top: {
-              style: BorderStyle.NONE
-            },
-            bottom: isHeaderRow
-              ? {
-                  style: BorderStyle.SINGLE,
-                  size: 0.5,
-                  color: '000000'
-                }
-              : {
-                  style: BorderStyle.NONE
-                },
-            left: {
-              style: BorderStyle.NONE
-            },
-            right: {
-              style: BorderStyle.NONE
-            }
-          }
-          const cellContent = tokens[i + 1]
-          const cellOptions = {
-            children: [
-              new Paragraph({
-                children: cellContent.children
-                  ? processInlineTokens(cellContent.children, isHeaderRow || isFirstColumn)
-                  : [new TextRun({ text: cellContent.content || '', bold: isHeaderRow || isFirstColumn })],
-                alignment: AlignmentType.CENTER
-              })
-            ],
-            verticalAlign: VerticalAlign.CENTER,
-            borders: borders
-          }
-          currentRowCells.push(new TableCell(cellOptions))
-          i += 2 // 跳过内容和结束标记
-          break
-        case 'table_close':
-          // Create table with the collected rows - avoid using protected properties
-          // Create the table with all rows
-          currentTable = new Table({
-            width: {
-              size: 100,
-              type: WidthType.PERCENTAGE
-            },
-            rows: tableRows,
-            borders: {
-              top: {
-                style: BorderStyle.SINGLE,
-                size: 1,
-                color: '000000'
-              },
-              bottom: {
-                style: BorderStyle.SINGLE,
-                size: 1,
-                color: '000000'
-              },
-              left: {
-                style: BorderStyle.NONE
-              },
-              right: {
-                style: BorderStyle.NONE
-              },
-              insideHorizontal: {
-                style: BorderStyle.NONE
-              },
-              insideVertical: {
-                style: BorderStyle.NONE
-              }
-            }
-          })
-          elements.push(currentTable)
-          currentTable = null
-          tableColumnCount = 0
-          tableRows = []
-          currentRowCells = []
-          isHeaderRow = false
-          break
       }
     }
 

src/main/services/FileService.ts

@@ -1,7 +0,0 @@
-import fs from 'node:fs'
-
-export default class FileService {
-  public static async readFile(_: Electron.IpcMainInvokeEvent, path: string) {
-    return fs.readFileSync(path, 'utf8')
-  }
-}

src/main/services/FileStorage.ts

@@ -1,8 +1,9 @@
-import { getFilesDir, getFileType, getTempDir } from '@main/utils/file'
+import { getFileType } from '@main/utils/file'
 import { documentExts, imageExts } from '@shared/config/constant'
 import { FileType } from '@types'
 import * as crypto from 'crypto'
 import {
+  app,
   dialog,
   OpenDialogOptions,
   OpenDialogReturnValue,
@@ -20,8 +21,8 @@ import { chdir } from 'process'
 import { v4 as uuidv4 } from 'uuid'
 
 class FileStorage {
-  private storageDir = getFilesDir()
-  private tempDir = getTempDir()
+  private storageDir = path.join(app.getPath('userData'), 'Data', 'Files')
+  private tempDir = path.join(app.getPath('temp'), 'CherryStudio')
 
   constructor() {
     this.initStorageDir()
@@ -69,7 +70,7 @@ class FileStorage {
             origin_name: file,
             name: file + ext,
             path: storedFilePath,
-            created_at: storedStats.birthtime.toISOString(),
+            created_at: storedStats.birthtime,
             size: storedStats.size,
             ext,
             type: getFileType(ext),
@@ -108,7 +109,7 @@ class FileStorage {
         origin_name: path.basename(filePath),
         name: path.basename(filePath),
         path: filePath,
-        created_at: stats.birthtime.toISOString(),
+        created_at: stats.birthtime,
         size: stats.size,
         ext: ext,
         type: fileType,
@@ -173,7 +174,7 @@ class FileStorage {
       origin_name,
       name: uuid + ext,
       path: destPath,
-      created_at: stats.birthtime.toISOString(),
+      created_at: stats.birthtime,
       size: stats.size,
       ext: ext,
       type: fileType,
@@ -197,7 +198,7 @@ class FileStorage {
       origin_name: path.basename(filePath),
       name: path.basename(filePath),
       path: filePath,
-      created_at: stats.birthtime.toISOString(),
+      created_at: stats.birthtime,
       size: stats.size,
       ext: ext,
       type: fileType,
@@ -254,8 +255,7 @@ class FileStorage {
     const filePath = path.join(this.storageDir, id)
     const data = await fs.promises.readFile(filePath)
     const base64 = data.toString('base64')
-    const ext = path.extname(filePath).slice(1) == 'jpg' ? 'jpeg' : path.extname(filePath).slice(1)
-    const mime = `image/${ext}`
+    const mime = `image/${path.extname(filePath).slice(1)}`
     return {
       mime,
       base64,
@@ -263,20 +263,13 @@ class FileStorage {
     }
   }
 
-  public binaryFile = async (_: Electron.IpcMainInvokeEvent, id: string): Promise<{ data: Buffer; mime: string }> => {
-    const filePath = path.join(this.storageDir, id)
-    const data = await fs.promises.readFile(filePath)
-    const mime = `image/${path.extname(filePath).slice(1)}`
-    return { data, mime }
-  }
-
   public clear = async (): Promise<void> => {
-    await fs.promises.rm(this.storageDir, { recursive: true })
+    await fs.promises.rmdir(this.storageDir, { recursive: true })
     await this.initStorageDir()
   }
 
   public clearTemp = async (): Promise<void> => {
-    await fs.promises.rm(this.tempDir, { recursive: true })
+    await fs.promises.rmdir(this.tempDir, { recursive: true })
     await fs.promises.mkdir(this.tempDir, { recursive: true })
   }
 
@@ -388,7 +381,7 @@ class FileStorage {
       }
 
       // 如果URL中有文件名，使用URL中的文件名
-      const urlFilename = url.split('/').pop()?.split('?')[0]
+      const urlFilename = url.split('/').pop()
       if (urlFilename && urlFilename.includes('.')) {
         filename = urlFilename
       }
@@ -416,7 +409,7 @@ class FileStorage {
         origin_name: filename,
         name: uuid + ext,
         path: destPath,
-        created_at: stats.birthtime.toISOString(),
+        created_at: stats.birthtime,
         size: stats.size,
         ext: ext,
         type: fileType,

src/main/services/GeminiService.ts

@@ -1,68 +0,0 @@
-import { FileMetadataResponse, FileState, GoogleAIFileManager } from '@google/generative-ai/server'
-import { FileType } from '@types'
-import fs from 'fs'
-
-import { CacheService } from './CacheService'
-import { proxyManager } from './ProxyManager'
-
-export class GeminiService {
-  private static readonly FILE_LIST_CACHE_KEY = 'gemini_file_list'
-  private static readonly CACHE_DURATION = 3000
-
-  static async uploadFile(_: Electron.IpcMainInvokeEvent, file: FileType, apiKey: string) {
-    proxyManager.setGlobalProxy()
-    const fileManager = new GoogleAIFileManager(apiKey)
-    const uploadResult = await fileManager.uploadFile(file.path, {
-      mimeType: 'application/pdf',
-      displayName: file.origin_name
-    })
-    return uploadResult
-  }
-
-  static async base64File(_: Electron.IpcMainInvokeEvent, file: FileType) {
-    return {
-      data: Buffer.from(fs.readFileSync(file.path)).toString('base64'),
-      mimeType: 'application/pdf'
-    }
-  }
-
-  static async retrieveFile(
-    _: Electron.IpcMainInvokeEvent,
-    file: FileType,
-    apiKey: string
-  ): Promise<FileMetadataResponse | undefined> {
-    proxyManager.setGlobalProxy()
-    const fileManager = new GoogleAIFileManager(apiKey)
-
-    const cachedResponse = CacheService.get<any>(GeminiService.FILE_LIST_CACHE_KEY)
-    if (cachedResponse) {
-      return GeminiService.processResponse(cachedResponse, file)
-    }
-
-    const response = await fileManager.listFiles()
-    CacheService.set(GeminiService.FILE_LIST_CACHE_KEY, response, GeminiService.CACHE_DURATION)
-
-    return GeminiService.processResponse(response, file)
-  }
-
-  private static processResponse(response: any, file: FileType) {
-    if (response.files) {
-      return response.files
-        .filter((file) => file.state === FileState.ACTIVE)
-        .find((i) => i.displayName === file.origin_name && Number(i.sizeBytes) === file.size)
-    }
-    return undefined
-  }
-
-  static async listFiles(_: Electron.IpcMainInvokeEvent, apiKey: string) {
-    proxyManager.setGlobalProxy()
-    const fileManager = new GoogleAIFileManager(apiKey)
-    return await fileManager.listFiles()
-  }
-
-  static async deleteFile(_: Electron.IpcMainInvokeEvent, apiKey: string, fileId: string) {
-    proxyManager.setGlobalProxy()
-    const fileManager = new GoogleAIFileManager(apiKey)
-    await fileManager.deleteFile(fileId)
-  }
-}

src/main/services/KnowledgeService.ts

@@ -1,100 +1,21 @@
-/**
- * Knowledge Service - Manages knowledge bases using RAG (Retrieval-Augmented Generation)
- *
- * This service handles creation, management, and querying of knowledge bases from various sources
- * including files, directories, URLs, sitemaps, and notes.
- *
- * Features:
- * - Concurrent task processing with workload management
- * - Multiple data source support
- * - Vector database integration
- *
- * For detailed documentation, see:
- * @see {@link ../../../docs/technical/KnowledgeService.md}
- */
-
 import * as fs from 'node:fs'
 import path from 'node:path'
 
-import { RAGApplication, RAGApplicationBuilder, TextLoader } from '@llm-tools/embedjs'
-import type { ExtractChunkData } from '@llm-tools/embedjs-interfaces'
+import { LocalPathLoader, RAGApplication, RAGApplicationBuilder, TextLoader } from '@llm-tools/embedjs'
+import type { AddLoaderReturn, 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 { proxyManager } from '@main/services/ProxyManager'
-import { windowService } from '@main/services/WindowService'
 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 Logger from 'electron-log'
-import { v4 as uuidv4 } from 'uuid'
-
-export interface KnowledgeBaseAddItemOptions {
-  base: KnowledgeBaseParams
-  item: KnowledgeItem
-  forceReload?: boolean
-}
-
-interface KnowledgeBaseAddItemOptionsNonNullableAttribute {
-  base: KnowledgeBaseParams
-  item: KnowledgeItem
-  forceReload: boolean
-}
-
-interface EvaluateTaskWorkload {
-  workload: number
-}
-
-type LoaderDoneReturn = LoaderReturn | null
-
-enum LoaderTaskItemState {
-  PENDING,
-  PROCESSING,
-  DONE
-}
-
-interface LoaderTaskItem {
-  state: LoaderTaskItemState
-  task: () => Promise<unknown>
-  evaluateTaskWorkload: EvaluateTaskWorkload
-}
-
-interface LoaderTask {
-  loaderTasks: LoaderTaskItem[]
-  loaderDoneReturn: LoaderDoneReturn
-}
-
-interface LoaderTaskOfSet {
-  loaderTasks: Set<LoaderTaskItem>
-  loaderDoneReturn: LoaderDoneReturn
-}
-
-interface QueueTaskItem {
-  taskPromise: () => Promise<unknown>
-  resolve: () => void
-  evaluateTaskWorkload: EvaluateTaskWorkload
-}
-
-const loaderTaskIntoOfSet = (loaderTask: LoaderTask): LoaderTaskOfSet => {
-  return {
-    loaderTasks: new Set(loaderTask.loaderTasks),
-    loaderDoneReturn: loaderTask.loaderDoneReturn
-  }
-}
 
 class KnowledgeService {
   private storageDir = path.join(app.getPath('userData'), 'Data', 'KnowledgeBase')
-  // Byte based
-  private workload = 0
-  private processingItemCount = 0
-  private knowledgeItemProcessingQueueMappingPromise: Map<LoaderTaskOfSet, () => void> = new Map()
-  private static MAXIMUM_WORKLOAD = 1024 * 1024 * 80
-  private static MAXIMUM_PROCESSING_ITEM_COUNT = 30
-  private static ERROR_LOADER_RETURN: LoaderReturn = { entriesAdded: 0, uniqueId: '', uniqueIds: [''], loaderType: '' }
 
   constructor() {
     this.initStorageDir()
@@ -114,7 +35,6 @@ class KnowledgeService {
     baseURL,
     dimensions
   }: KnowledgeBaseParams): Promise<RAGApplication> => {
-    const batchSize = 10
     return new RAGApplicationBuilder()
       .setModel('NO_MODEL')
       .setEmbeddingModel(
@@ -124,16 +44,15 @@ class KnowledgeService {
               azureOpenAIApiVersion: apiVersion,
               azureOpenAIApiDeploymentName: model,
               azureOpenAIApiInstanceName: getInstanceName(baseURL),
-              configuration: { httpAgent: proxyManager.getProxyAgent() },
               dimensions,
-              batchSize
+              batchSize: 15
             })
           : new OpenAiEmbeddings({
               model,
               apiKey,
-              configuration: { baseURL, httpAgent: proxyManager.getProxyAgent() },
+              configuration: { baseURL },
               dimensions,
-              batchSize
+              batchSize: 15
             })
       )
       .setVectorDatabase(new LibSqlDb({ path: path.join(this.storageDir, id) }))
@@ -156,324 +75,71 @@ class KnowledgeService {
     }
   }
 
-  private maximumLoad() {
-    return (
-      this.processingItemCount >= KnowledgeService.MAXIMUM_PROCESSING_ITEM_COUNT ||
-      this.workload >= KnowledgeService.MAXIMUM_WORKLOAD
-    )
-  }
+  public add = async (
+    _: Electron.IpcMainInvokeEvent,
+    { base, item, forceReload = false }: { base: KnowledgeBaseParams; item: KnowledgeItem; forceReload: boolean }
+  ): Promise<AddLoaderReturn> => {
+    const ragApplication = await this.getRagApplication(base)
 
-  private fileTask(
-    ragApplication: RAGApplication,
-    options: KnowledgeBaseAddItemOptionsNonNullableAttribute
-  ): LoaderTask {
-    const { base, item, forceReload } = options
-    const file = item.content as FileType
-
-    const loaderTask: LoaderTask = {
-      loaderTasks: [
-        {
-          state: LoaderTaskItemState.PENDING,
-          task: () =>
-            addFileLoader(ragApplication, file, base, forceReload)
-              .then((result) => {
-                loaderTask.loaderDoneReturn = result
-                return result
-              })
-              .catch((err) => {
-                Logger.error(err)
-                return KnowledgeService.ERROR_LOADER_RETURN
-              }),
-          evaluateTaskWorkload: { workload: file.size }
-        }
-      ],
-      loaderDoneReturn: null
+    if (item.type === 'directory') {
+      const directory = item.content as string
+      return await ragApplication.addLoader(new LocalPathLoader({ path: directory }), forceReload)
     }
 
-    return loaderTask
-  }
-
-  private directoryTask(
-    ragApplication: RAGApplication,
-    options: KnowledgeBaseAddItemOptionsNonNullableAttribute
-  ): LoaderTask {
-    const { base, item, forceReload } = options
-    const directory = item.content as string
-    const files = getAllFiles(directory)
-    const totalFiles = files.length
-    let processedFiles = 0
-
-    const sendDirectoryProcessingPercent = (totalFiles: number, processedFiles: number) => {
-      const mainWindow = windowService.getMainWindow()
-      mainWindow?.webContents.send('directory-processing-percent', {
-        itemId: item.id,
-        percent: (processedFiles / totalFiles) * 100
-      })
-    }
-
-    const loaderDoneReturn: LoaderDoneReturn = {
-      entriesAdded: 0,
-      uniqueId: `DirectoryLoader_${uuidv4()}`,
-      uniqueIds: [],
-      loaderType: 'DirectoryLoader'
-    }
-    const loaderTasks: LoaderTaskItem[] = []
-    for (const file of files) {
-      loaderTasks.push({
-        state: LoaderTaskItemState.PENDING,
-        task: () =>
-          addFileLoader(ragApplication, file, base, forceReload)
-            .then((result) => {
-              loaderDoneReturn.entriesAdded += 1
-              processedFiles += 1
-              sendDirectoryProcessingPercent(totalFiles, processedFiles)
-              loaderDoneReturn.uniqueIds.push(result.uniqueId)
-              return result
-            })
-            .catch((err) => {
-              Logger.error(err)
-              return KnowledgeService.ERROR_LOADER_RETURN
-            }),
-        evaluateTaskWorkload: { workload: file.size }
-      })
-    }
-
-    return {
-      loaderTasks,
-      loaderDoneReturn
-    }
-  }
-
-  private urlTask(
-    ragApplication: RAGApplication,
-    options: KnowledgeBaseAddItemOptionsNonNullableAttribute
-  ): LoaderTask {
-    const { base, item, forceReload } = options
-    const content = item.content as string
-
-    const loaderTask: LoaderTask = {
-      loaderTasks: [
-        {
-          state: LoaderTaskItemState.PENDING,
-          task: () => {
-            const loaderReturn = ragApplication.addLoader(
-              new WebLoader({
-                urlOrContent: content,
-                chunkSize: base.chunkSize,
-                chunkOverlap: base.chunkOverlap
-              }),
-              forceReload
-            ) as Promise<LoaderReturn>
-
-            return loaderReturn
-              .then((result) => {
-                const { entriesAdded, uniqueId, loaderType } = result
-                loaderTask.loaderDoneReturn = {
-                  entriesAdded: entriesAdded,
-                  uniqueId: uniqueId,
-                  uniqueIds: [uniqueId],
-                  loaderType: loaderType
-                }
-                return result
-              })
-              .catch((err) => {
-                Logger.error(err)
-                return KnowledgeService.ERROR_LOADER_RETURN
-              })
-          },
-          evaluateTaskWorkload: { workload: 1024 * 1024 * 2 }
-        }
-      ],
-      loaderDoneReturn: null
-    }
-    return loaderTask
-  }
-
-  private sitemapTask(
-    ragApplication: RAGApplication,
-    options: KnowledgeBaseAddItemOptionsNonNullableAttribute
-  ): LoaderTask {
-    const { base, item, forceReload } = options
-    const content = item.content as string
-
-    const loaderTask: LoaderTask = {
-      loaderTasks: [
-        {
-          state: LoaderTaskItemState.PENDING,
-          task: () =>
-            ragApplication
-              .addLoader(
-                new SitemapLoader({ url: content, chunkSize: base.chunkSize, chunkOverlap: base.chunkOverlap }) as any,
-                forceReload
-              )
-              .then((result) => {
-                const { entriesAdded, uniqueId, loaderType } = result
-                loaderTask.loaderDoneReturn = {
-                  entriesAdded: entriesAdded,
-                  uniqueId: uniqueId,
-                  uniqueIds: [uniqueId],
-                  loaderType: loaderType
-                }
-                return result
-              })
-              .catch((err) => {
-                Logger.error(err)
-                return KnowledgeService.ERROR_LOADER_RETURN
-              }),
-          evaluateTaskWorkload: { workload: 1024 * 1024 * 20 }
-        }
-      ],
-      loaderDoneReturn: null
-    }
-    return loaderTask
-  }
-
-  private noteTask(
-    ragApplication: RAGApplication,
-    options: KnowledgeBaseAddItemOptionsNonNullableAttribute
-  ): LoaderTask {
-    const { base, item, forceReload } = options
-    const content = item.content as string
-    console.debug('chunkSize', base.chunkSize)
-
-    const encoder = new TextEncoder()
-    const contentBytes = encoder.encode(content)
-    const loaderTask: LoaderTask = {
-      loaderTasks: [
-        {
-          state: LoaderTaskItemState.PENDING,
-          task: () => {
-            const loaderReturn = ragApplication.addLoader(
-              new TextLoader({ text: content, chunkSize: base.chunkSize, chunkOverlap: base.chunkOverlap }),
-              forceReload
-            ) as Promise<LoaderReturn>
-
-            return loaderReturn
-              .then(({ entriesAdded, uniqueId, loaderType }) => {
-                loaderTask.loaderDoneReturn = {
-                  entriesAdded: entriesAdded,
-                  uniqueId: uniqueId,
-                  uniqueIds: [uniqueId],
-                  loaderType: loaderType
-                }
-              })
-              .catch((err) => {
-                Logger.error(err)
-                return KnowledgeService.ERROR_LOADER_RETURN
-              })
-          },
-          evaluateTaskWorkload: { workload: contentBytes.length }
-        }
-      ],
-      loaderDoneReturn: null
-    }
-    return loaderTask
-  }
-
-  private processingQueueHandle() {
-    const getSubtasksUntilMaximumLoad = (): QueueTaskItem[] => {
-      const queueTaskList: QueueTaskItem[] = []
-      that: for (const [task, resolve] of this.knowledgeItemProcessingQueueMappingPromise) {
-        for (const item of task.loaderTasks) {
-          if (this.maximumLoad()) {
-            break that
-          }
-
-          const { state, task: taskPromise, evaluateTaskWorkload } = item
-
-          if (state !== LoaderTaskItemState.PENDING) {
-            continue
-          }
-
-          const { workload } = evaluateTaskWorkload
-          this.workload += workload
-          this.processingItemCount += 1
-          item.state = LoaderTaskItemState.PROCESSING
-          queueTaskList.push({
-            taskPromise: () =>
-              taskPromise().then(() => {
-                this.workload -= workload
-                this.processingItemCount -= 1
-                task.loaderTasks.delete(item)
-                if (task.loaderTasks.size === 0) {
-                  this.knowledgeItemProcessingQueueMappingPromise.delete(task)
-                  resolve()
-                }
-                this.processingQueueHandle()
-              }),
-            resolve: () => {},
-            evaluateTaskWorkload
-          })
-        }
+    if (item.type === 'url') {
+      const content = item.content as string
+      if (content.startsWith('http')) {
+        return await ragApplication.addLoader(new WebLoader({ urlOrContent: content }), forceReload)
       }
-      return queueTaskList
     }
-    const subTasks = getSubtasksUntilMaximumLoad()
-    if (subTasks.length > 0) {
-      const subTaskPromises = subTasks.map(({ taskPromise }) => taskPromise())
-      Promise.all(subTaskPromises).then(() => {
-        subTasks.forEach(({ resolve }) => resolve())
-      })
+
+    if (item.type === 'sitemap') {
+      const content = item.content as string
+      return await ragApplication.addLoader(new SitemapLoader({ url: content }), forceReload)
     }
-  }
 
-  private appendProcessingQueue(task: LoaderTask): Promise<LoaderReturn> {
-    return new Promise((resolve) => {
-      this.knowledgeItemProcessingQueueMappingPromise.set(loaderTaskIntoOfSet(task), () => {
-        resolve(task.loaderDoneReturn!)
-      })
-    })
-  }
+    if (item.type === 'note') {
+      const content = item.content as string
+      return await ragApplication.addLoader(new TextLoader({ text: content }), forceReload)
+    }
 
-  public add = (_: Electron.IpcMainInvokeEvent, options: KnowledgeBaseAddItemOptions): Promise<LoaderReturn> => {
-    proxyManager.setGlobalProxy()
-    return new Promise((resolve) => {
-      const { base, item, forceReload = false } = options
-      const optionsNonNullableAttribute = { base, item, forceReload }
-      this.getRagApplication(base)
-        .then((ragApplication) => {
-          const task = (() => {
-            switch (item.type) {
-              case 'file':
-                return this.fileTask(ragApplication, optionsNonNullableAttribute)
-              case 'directory':
-                return this.directoryTask(ragApplication, optionsNonNullableAttribute)
-              case 'url':
-                return this.urlTask(ragApplication, optionsNonNullableAttribute)
-              case 'sitemap':
-                return this.sitemapTask(ragApplication, optionsNonNullableAttribute)
-              case 'note':
-                return this.noteTask(ragApplication, optionsNonNullableAttribute)
-              default:
-                return null
-            }
-          })()
+    if (item.type === 'file') {
+      const file = item.content as FileType
 
-          if (task) {
-            this.appendProcessingQueue(task).then(() => {
-              resolve(task.loaderDoneReturn!)
-            })
-            this.processingQueueHandle()
-          } else {
-            resolve(KnowledgeService.ERROR_LOADER_RETURN)
-          }
-        })
-        .catch((err) => {
-          Logger.error(err)
-          resolve(KnowledgeService.ERROR_LOADER_RETURN)
-        })
-    })
+      if (file.ext === '.pdf') {
+        return await ragApplication.addLoader(new PdfLoader({ filePathOrUrl: file.path }) as any, 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', '.mdx'].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: '' }
   }
 
   public remove = async (
     _: Electron.IpcMainInvokeEvent,
-    { uniqueId, uniqueIds, base }: { uniqueId: string; uniqueIds: string[]; base: KnowledgeBaseParams }
+    { uniqueId, base }: { uniqueId: string; base: KnowledgeBaseParams }
   ): Promise<void> => {
     const ragApplication = await this.getRagApplication(base)
-    console.debug(`[ KnowledgeService Remove Item UniqueId: ${uniqueId}]`)
-    for (const id of uniqueIds) {
-      await ragApplication.deleteLoader(id)
-    }
+    await ragApplication.deleteLoader(uniqueId)
   }
 
   public search = async (

src/main/services/MCPService.ts

@@ -1,553 +0,0 @@
-import { isLinux, isMac, isWin } from '@main/constant'
-import type { Client } from '@modelcontextprotocol/sdk/client/index.js'
-import type { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js'
-import type { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'
-import { MCPServer, MCPTool } from '@types'
-import log from 'electron-log'
-import { EventEmitter } from 'events'
-import { v4 as uuidv4 } from 'uuid'
-
-import { windowService } from './WindowService'
-
-/**
- * Service for managing Model Context Protocol servers and tools
- */
-export default class MCPService extends EventEmitter {
-  private servers: MCPServer[] = []
-  private activeServers: Map<string, any> = new Map()
-  private clients: { [key: string]: any } = {}
-  private Client: typeof Client | undefined
-  private stdioTransport: typeof StdioClientTransport | undefined
-  private sseTransport: typeof SSEClientTransport | undefined
-  private initialized = false
-  private initPromise: Promise<void> | null = null
-
-  // Simplified server loading state management
-  private readyState = {
-    serversLoaded: false,
-    promise: null as Promise<void> | null,
-    resolve: null as ((value: void) => void) | null
-  }
-
-  constructor() {
-    super()
-    this.createServerLoadingPromise()
-  }
-
-  /**
-   * Create a promise that resolves when servers are loaded
-   */
-  private createServerLoadingPromise(): void {
-    this.readyState.promise = new Promise<void>((resolve) => {
-      this.readyState.resolve = resolve
-    })
-  }
-
-  /**
-   * Set servers received from Redux and trigger initialization if needed
-   */
-  public setServers(servers: MCPServer[]): void {
-    this.servers = servers
-    log.info(`[MCP] Received ${servers.length} servers from Redux`)
-
-    // Mark servers as loaded and resolve the waiting promise
-    if (!this.readyState.serversLoaded && this.readyState.resolve) {
-      this.readyState.serversLoaded = true
-      this.readyState.resolve()
-      this.readyState.resolve = null
-    }
-
-    // Initialize if not already initialized
-    if (!this.initialized) {
-      this.init().catch(this.logError('Failed to initialize MCP service'))
-    }
-  }
-
-  /**
-   * Initialize the MCP service if not already initialized
-   */
-  public async init(): Promise<void> {
-    // If already initialized, return immediately
-    if (this.initialized) return
-
-    // If initialization is in progress, return that promise
-    if (this.initPromise) return this.initPromise
-
-    this.initPromise = (async () => {
-      try {
-        // Wait for servers to be loaded from Redux
-        await this.waitForServers()
-
-        log.info('[MCP] Starting initialization')
-
-        // Load SDK components in parallel for better performance
-        const [Client, StdioTransport, SSETransport] = await Promise.all([
-          this.importClient(),
-          this.importStdioClientTransport(),
-          this.importSSEClientTransport()
-        ])
-
-        this.Client = Client
-        this.stdioTransport = StdioTransport
-        this.sseTransport = SSETransport
-
-        // Mark as initialized before loading servers
-        this.initialized = true
-
-        // Load active servers
-        await this.loadActiveServers()
-        log.info('[MCP] Initialization completed successfully')
-
-        return
-      } catch (err) {
-        this.initialized = false // Reset flag on error
-        log.error('[MCP] Failed to initialize:', err)
-        throw err
-      } finally {
-        this.initPromise = null
-      }
-    })()
-
-    return this.initPromise
-  }
-
-  /**
-   * Wait for servers to be loaded from Redux
-   */
-  private async waitForServers(): Promise<void> {
-    if (!this.readyState.serversLoaded && this.readyState.promise) {
-      log.info('[MCP] Waiting for servers data from Redux...')
-      await this.readyState.promise
-      log.info('[MCP] Servers received, continuing initialization')
-    }
-  }
-
-  /**
-   * Helper to create consistent error logging functions
-   */
-  private logError(message: string) {
-    return (err: Error) => log.error(`[MCP] ${message}:`, err)
-  }
-
-  /**
-   * Import the MCP client SDK
-   */
-  private async importClient() {
-    try {
-      const { Client } = await import('@modelcontextprotocol/sdk/client/index.js')
-      return Client
-    } catch (err) {
-      log.error('[MCP] Failed to import Client:', err)
-      throw err
-    }
-  }
-
-  /**
-   * Import the stdio transport
-   */
-  private async importStdioClientTransport() {
-    try {
-      const { StdioClientTransport } = await import('@modelcontextprotocol/sdk/client/stdio.js')
-      return StdioClientTransport
-    } catch (err) {
-      log.error('[MCP] Failed to import StdioTransport:', err)
-      throw err
-    }
-  }
-
-  /**
-   * Import the SSE transport
-   */
-  private async importSSEClientTransport() {
-    try {
-      const { SSEClientTransport } = await import('@modelcontextprotocol/sdk/client/sse.js')
-      return SSEClientTransport
-    } catch (err) {
-      log.error('[MCP] Failed to import SSETransport:', err)
-      throw err
-    }
-  }
-
-  /**
-   * List all available MCP servers
-   */
-  public async listAvailableServices(): Promise<MCPServer[]> {
-    await this.ensureInitialized()
-    return this.servers
-  }
-
-  /**
-   * Ensure the service is initialized before operations
-   */
-  private async ensureInitialized() {
-    if (!this.initialized) {
-      log.debug('[MCP] Ensuring initialization')
-      await this.init()
-    }
-  }
-
-  /**
-   * Add a new MCP server
-   */
-  public async addServer(server: MCPServer): Promise<void> {
-    await this.ensureInitialized()
-
-    // Check for duplicate name
-    if (this.servers.some((s) => s.name === server.name)) {
-      throw new Error(`Server with name ${server.name} already exists`)
-    }
-
-    // Activate if needed
-    if (server.isActive) {
-      await this.activate(server)
-    }
-
-    // Add to servers list
-    this.servers = [...this.servers, server]
-    this.notifyReduxServersChanged(this.servers)
-  }
-
-  /**
-   * Update an existing MCP server
-   */
-  public async updateServer(server: MCPServer): Promise<void> {
-    await this.ensureInitialized()
-
-    const index = this.servers.findIndex((s) => s.name === server.name)
-    if (index === -1) {
-      throw new Error(`Server ${server.name} not found`)
-    }
-
-    // Check activation status change
-    const wasActive = this.servers[index].isActive
-    if (wasActive && !server.isActive) {
-      await this.deactivate(server.name)
-    } else if (!wasActive && server.isActive) {
-      await this.activate(server)
-    }
-
-    // Update servers list
-    const updatedServers = [...this.servers]
-    updatedServers[index] = server
-    this.servers = updatedServers
-    this.notifyReduxServersChanged(updatedServers)
-  }
-
-  /**
-   * Delete an MCP server
-   */
-  public async deleteServer(serverName: string): Promise<void> {
-    await this.ensureInitialized()
-
-    // Deactivate if running
-    if (this.clients[serverName]) {
-      await this.deactivate(serverName)
-    }
-
-    // Update servers list
-    const filteredServers = this.servers.filter((s) => s.name !== serverName)
-    this.servers = filteredServers
-    this.notifyReduxServersChanged(filteredServers)
-  }
-
-  /**
-   * Set a server's active state
-   */
-  public async setServerActive(params: { name: string; isActive: boolean }): Promise<void> {
-    await this.ensureInitialized()
-
-    const { name, isActive } = params
-    const server = this.servers.find((s) => s.name === name)
-
-    if (!server) {
-      throw new Error(`Server ${name} not found`)
-    }
-
-    // Activate or deactivate as needed
-    if (isActive) {
-      await this.activate(server)
-    } else {
-      await this.deactivate(name)
-    }
-
-    // Update server status
-    server.isActive = isActive
-    this.notifyReduxServersChanged([...this.servers])
-  }
-
-  /**
-   * Notify Redux in the renderer process about server changes
-   */
-  private notifyReduxServersChanged(servers: MCPServer[]): void {
-    const mainWindow = windowService.getMainWindow()
-    if (mainWindow) {
-      mainWindow.webContents.send('mcp:servers-changed', servers)
-    }
-  }
-
-  /**
-   * Activate an MCP server
-   */
-  public async activate(server: MCPServer): Promise<void> {
-    await this.ensureInitialized()
-
-    const { name, baseUrl, command, args, env } = server
-
-    // Skip if already running
-    if (this.clients[name]) {
-      log.info(`[MCP] Server ${name} is already running`)
-      return
-    }
-
-    let transport: StdioClientTransport | SSEClientTransport
-
-    try {
-      // Create appropriate transport based on configuration
-      if (baseUrl) {
-        transport = new this.sseTransport!(new URL(baseUrl))
-      } else if (command) {
-        let cmd: string = command
-        if (command === 'npx') {
-          cmd = process.platform === 'win32' ? `${command}.cmd` : command
-        }
-
-        transport = new this.stdioTransport!({
-          command: cmd,
-          args,
-          stderr: 'pipe',
-          env: {
-            PATH: this.getEnhancedPath(process.env.PATH || ''),
-            ...env
-          }
-        })
-      } else {
-        throw new Error('Either baseUrl or command must be provided')
-      }
-
-      // Create and connect client
-      const client = new this.Client!({ name, version: '1.0.0' }, { capabilities: {} })
-
-      await client.connect(transport)
-
-      // Store client and server info
-      this.clients[name] = client
-      this.activeServers.set(name, { client, server })
-
-      log.info(`[MCP] Server ${name} started successfully`)
-      this.emit('server-started', { name })
-    } catch (error) {
-      log.error(`[MCP] Error activating server ${name}:`, error)
-      server.isActive = false
-      throw error
-    }
-  }
-
-  /**
-   * Deactivate an MCP server
-   */
-  public async deactivate(name: string): Promise<void> {
-    await this.ensureInitialized()
-
-    if (!this.clients[name]) {
-      log.warn(`[MCP] Server ${name} is not running`)
-      return
-    }
-
-    try {
-      log.info(`[MCP] Stopping server: ${name}`)
-      await this.clients[name].close()
-      delete this.clients[name]
-      this.activeServers.delete(name)
-      this.emit('server-stopped', { name })
-    } catch (error) {
-      log.error(`[MCP] Error deactivating server ${name}:`, error)
-      throw error
-    }
-  }
-
-  /**
-   * List available tools from active MCP servers
-   */
-  public async listTools(serverName?: string): Promise<MCPTool[]> {
-    await this.ensureInitialized()
-
-    try {
-      // If server name provided, list tools for that server only
-      if (serverName) {
-        return await this.listToolsFromServer(serverName)
-      }
-
-      // Otherwise list tools from all active servers
-      let allTools: MCPTool[] = []
-
-      for (const clientName in this.clients) {
-        try {
-          const tools = await this.listToolsFromServer(clientName)
-          allTools = allTools.concat(tools)
-        } catch (error) {
-          this.logError(`[MCP] Error listing tools for ${clientName}`)
-        }
-      }
-
-      log.info(`[MCP] Total tools listed: ${allTools.length}`)
-      return allTools
-    } catch (error) {
-      this.logError('Error listing tools:')
-      return []
-    }
-  }
-
-  /**
-   * Helper method to list tools from a specific server
-   */
-  private async listToolsFromServer(serverName: string): Promise<MCPTool[]> {
-    if (!this.clients[serverName]) {
-      throw new Error(`MCP Client ${serverName} not found`)
-    }
-
-    const { tools } = await this.clients[serverName].listTools()
-    return tools.map((tool: any) => ({
-      ...tool,
-      serverName,
-      id: 'f' + uuidv4().replace(/-/g, '')
-    }))
-  }
-
-  /**
-   * Call a tool on an MCP server
-   */
-  public async callTool(params: { client: string; name: string; args: any }): Promise<any> {
-    await this.ensureInitialized()
-
-    const { client, name, args } = params
-
-    if (!this.clients[client]) {
-      throw new Error(`MCP Client ${client} not found`)
-    }
-
-    log.info('[MCP] Calling:', client, name, args)
-
-    try {
-      return await this.clients[client].callTool({
-        name,
-        arguments: args
-      })
-    } catch (error) {
-      log.error(`[MCP] Error calling tool ${name} on ${client}:`, error)
-      throw error
-    }
-  }
-
-  /**
-   * Clean up all MCP resources
-   */
-  public async cleanup(): Promise<void> {
-    const clientNames = Object.keys(this.clients)
-
-    if (clientNames.length === 0) {
-      log.info('[MCP] No active servers to clean up')
-      return
-    }
-
-    log.info(`[MCP] Cleaning up ${clientNames.length} active servers`)
-
-    // Deactivate all clients
-    await Promise.allSettled(
-      clientNames.map((name) =>
-        this.deactivate(name).catch((err) => {
-          log.error(`[MCP] Error during cleanup of ${name}:`, err)
-        })
-      )
-    )
-
-    this.clients = {}
-    this.activeServers.clear()
-    log.info('[MCP] All servers cleaned up')
-  }
-
-  /**
-   * Load all active servers
-   */
-  private async loadActiveServers(): Promise<void> {
-    const activeServers = this.servers.filter((server) => server.isActive)
-
-    if (activeServers.length === 0) {
-      log.info('[MCP] No active servers to load')
-      return
-    }
-
-    log.info(`[MCP] Loading ${activeServers.length} active servers`)
-
-    // Activate servers in parallel for better performance
-    await Promise.allSettled(
-      activeServers.map(async (server) => {
-        try {
-          await this.activate(server)
-          log.info(`[MCP] Successfully activated server: ${server.name}`)
-        } catch (error) {
-          this.logError(`Failed to activate server ${server.name}`)
-          this.emit('server-error', { name: server.name, error })
-        }
-      })
-    )
-
-    log.info(`[MCP] Loaded and activated ${Object.keys(this.clients).length} servers`)
-  }
-
-  /**
-   * Get enhanced PATH including common tool locations
-   */
-  private getEnhancedPath(originalPath: string): string {
-    // 将原始 PATH 按分隔符分割成数组
-    const pathSeparator = process.platform === 'win32' ? ';' : ':'
-    const existingPaths = new Set(originalPath.split(pathSeparator).filter(Boolean))
-    const homeDir = process.env.HOME || process.env.USERPROFILE || ''
-
-    // 定义要添加的新路径
-    const newPaths: string[] = []
-
-    if (isMac) {
-      newPaths.push(
-        '/bin',
-        '/usr/bin',
-        '/usr/local/bin',
-        '/usr/local/sbin',
-        '/opt/homebrew/bin',
-        '/opt/homebrew/sbin',
-        '/usr/local/opt/node/bin',
-        `${homeDir}/.nvm/current/bin`,
-        `${homeDir}/.npm-global/bin`,
-        `${homeDir}/.yarn/bin`,
-        `${homeDir}/.cargo/bin`,
-        '/opt/local/bin'
-      )
-    }
-
-    if (isLinux) {
-      newPaths.push(
-        '/bin',
-        '/usr/bin',
-        '/usr/local/bin',
-        `${homeDir}/.nvm/current/bin`,
-        `${homeDir}/.npm-global/bin`,
-        `${homeDir}/.yarn/bin`,
-        `${homeDir}/.cargo/bin`,
-        '/snap/bin'
-      )
-    }
-
-    if (isWin) {
-      newPaths.push(`${process.env.APPDATA}\\npm`, `${homeDir}\\AppData\\Local\\Yarn\\bin`, `${homeDir}\\.cargo\\bin`)
-    }
-
-    // 只添加不存在的路径
-    newPaths.forEach((path) => {
-      if (path && !existingPaths.has(path)) {
-        existingPaths.add(path)
-      }
-    })
-
-    // 转换回字符串
-    return Array.from(existingPaths).join(pathSeparator)
-  }
-}

src/main/services/ProxyManager.ts

@@ -1,157 +0,0 @@
-import { ProxyConfig as _ProxyConfig, session } from 'electron'
-import { socksDispatcher } from 'fetch-socks'
-import { HttpsProxyAgent } from 'https-proxy-agent'
-import { ProxyAgent, setGlobalDispatcher } from 'undici'
-
-type ProxyMode = 'system' | 'custom' | 'none'
-
-export interface ProxyConfig {
-  mode: ProxyMode
-  url?: string | null
-}
-
-export class ProxyManager {
-  private config: ProxyConfig
-  private proxyAgent: HttpsProxyAgent | null = null
-  private proxyUrl: string | null = null
-  private systemProxyInterval: NodeJS.Timeout | null = null
-
-  constructor() {
-    this.config = {
-      mode: 'none',
-      url: ''
-    }
-  }
-
-  private async setSessionsProxy(config: _ProxyConfig): Promise<void> {
-    const sessions = [session.defaultSession, session.fromPartition('persist:webview')]
-    await Promise.all(sessions.map((session) => session.setProxy(config)))
-  }
-
-  private async monitorSystemProxy(): Promise<void> {
-    // Clear any existing interval first
-    this.clearSystemProxyMonitor()
-    // Set new interval
-    this.systemProxyInterval = setInterval(async () => {
-      await this.setSystemProxy()
-    }, 10000)
-  }
-
-  private clearSystemProxyMonitor(): void {
-    if (this.systemProxyInterval) {
-      clearInterval(this.systemProxyInterval)
-      this.systemProxyInterval = null
-    }
-  }
-
-  async configureProxy(config: ProxyConfig): Promise<void> {
-    try {
-      this.config = config
-      this.clearSystemProxyMonitor()
-      if (this.config.mode === 'system') {
-        await this.setSystemProxy()
-        this.monitorSystemProxy()
-      } else if (this.config.mode == 'custom') {
-        await this.setCustomProxy()
-      } else {
-        await this.clearProxy()
-      }
-    } catch (error) {
-      console.error('Failed to config proxy:', error)
-      throw error
-    }
-  }
-
-  private setEnvironment(url: string): void {
-    process.env.grpc_proxy = url
-    process.env.HTTP_PROXY = url
-    process.env.HTTPS_PROXY = url
-    process.env.http_proxy = url
-    process.env.https_proxy = url
-  }
-
-  private async setSystemProxy(): Promise<void> {
-    try {
-      await this.setSessionsProxy({ mode: 'system' })
-      const url = await this.resolveSystemProxy()
-      if (url && url !== this.proxyUrl) {
-        this.proxyUrl = url.toLowerCase()
-        this.proxyAgent = new HttpsProxyAgent(this.proxyUrl)
-        this.setEnvironment(this.proxyUrl)
-      }
-    } catch (error) {
-      console.error('Failed to set system proxy:', error)
-      throw error
-    }
-  }
-
-  private async setCustomProxy(): Promise<void> {
-    try {
-      if (this.config.url) {
-        this.proxyUrl = this.config.url.toLowerCase()
-        this.proxyAgent = new HttpsProxyAgent(this.proxyUrl)
-        this.setEnvironment(this.proxyUrl)
-        await this.setSessionsProxy({ proxyRules: this.proxyUrl })
-      }
-    } catch (error) {
-      console.error('Failed to set custom proxy:', error)
-      throw error
-    }
-  }
-
-  private async clearProxy(): Promise<void> {
-    delete process.env.HTTP_PROXY
-    delete process.env.HTTPS_PROXY
-    await this.setSessionsProxy({})
-    this.config = { mode: 'none' }
-    this.proxyAgent = null
-    this.proxyUrl = null
-  }
-
-  private async resolveSystemProxy(): Promise<string | null> {
-    try {
-      return await this.resolveElectronProxy()
-    } catch (error) {
-      console.error('Failed to resolve system proxy:', error)
-      return null
-    }
-  }
-
-  private async resolveElectronProxy(): Promise<string | null> {
-    try {
-      const proxyString = await session.defaultSession.resolveProxy('https://dummy.com')
-      const [protocol, address] = proxyString.split(';')[0].split(' ')
-      return protocol === 'PROXY' ? `http://${address}` : null
-    } catch (error) {
-      console.error('Failed to resolve electron proxy:', error)
-      return null
-    }
-  }
-
-  getProxyAgent(): HttpsProxyAgent | null {
-    return this.proxyAgent
-  }
-
-  getProxyUrl(): string | null {
-    return this.proxyUrl
-  }
-
-  setGlobalProxy() {
-    const proxyUrl = this.proxyUrl
-    if (proxyUrl) {
-      const [protocol, host, port] = proxyUrl.split(':')
-      if (!protocol.includes('socks')) {
-        setGlobalDispatcher(new ProxyAgent(proxyUrl))
-      } else {
-        const dispatcher = socksDispatcher({
-          port: parseInt(port),
-          type: protocol === 'socks5' ? 5 : 4,
-          host: host
-        })
-        global[Symbol.for('undici.globalDispatcher.1')] = dispatcher
-      }
-    }
-  }
-}
-
-export const proxyManager = new ProxyManager()

src/main/services/ReduxService.ts

@@ -1,220 +0,0 @@
-import { ipcMain } from 'electron'
-import { EventEmitter } from 'events'
-
-import { windowService } from './WindowService'
-
-type StoreValue = any
-type Unsubscribe = () => void
-
-export class ReduxService extends EventEmitter {
-  private stateCache: any = {}
-  private isReady = false
-
-  constructor() {
-    super()
-    this.setupIpcHandlers()
-  }
-
-  private setupIpcHandlers() {
-    // 监听 store 就绪事件
-    ipcMain.handle('redux-store-ready', () => {
-      this.isReady = true
-      this.emit('ready')
-    })
-
-    // 监听 store 状态变化
-    ipcMain.on('redux-state-change', (_, newState) => {
-      this.stateCache = newState
-      this.emit('stateChange', newState)
-    })
-  }
-
-  private async waitForStoreReady(webContents: Electron.WebContents, timeout = 10000): Promise<void> {
-    if (this.isReady) return
-
-    const startTime = Date.now()
-    while (Date.now() - startTime < timeout) {
-      try {
-        const isReady = await webContents.executeJavaScript(`
-          !!window.store && typeof window.store.getState === 'function'
-        `)
-        if (isReady) {
-          this.isReady = true
-          return
-        }
-      } catch (error) {
-        // 忽略错误，继续等待
-      }
-      await new Promise((resolve) => setTimeout(resolve, 100))
-    }
-    throw new Error('Timeout waiting for Redux store to be ready')
-  }
-
-  // 添加同步获取状态的方法
-  getStateSync() {
-    return this.stateCache
-  }
-
-  // 添加同步选择器方法
-  selectSync<T = StoreValue>(selector: string): T | undefined {
-    try {
-      // 使用 Function 构造器来安全地执行选择器
-      const selectorFn = new Function('state', `return ${selector}`)
-      return selectorFn(this.stateCache)
-    } catch (error) {
-      console.error('Failed to select from cache:', error)
-      return undefined
-    }
-  }
-
-  // 修改 select 方法，优先使用缓存
-  async select<T = StoreValue>(selector: string): Promise<T> {
-    try {
-      // 如果已经准备就绪，先尝试从缓存中获取
-      if (this.isReady) {
-        const cachedValue = this.selectSync<T>(selector)
-        if (cachedValue !== undefined) {
-          return cachedValue
-        }
-      }
-
-      // 如果缓存中没有，再从渲染进程获取
-      const mainWindow = windowService.getMainWindow()
-      if (!mainWindow) {
-        throw new Error('Main window is not available')
-      }
-      await this.waitForStoreReady(mainWindow.webContents)
-      return await mainWindow.webContents.executeJavaScript(`
-        (() => {
-          const state = window.store.getState();
-          return ${selector};
-        })()
-      `)
-    } catch (error) {
-      console.error('Failed to select store value:', error)
-      throw error
-    }
-  }
-
-  // 派发 action
-  async dispatch(action: any): Promise<void> {
-    const mainWindow = windowService.getMainWindow()
-    if (!mainWindow) {
-      throw new Error('Main window is not available')
-    }
-    await this.waitForStoreReady(mainWindow.webContents)
-    try {
-      await mainWindow.webContents.executeJavaScript(`
-        window.store.dispatch(${JSON.stringify(action)})
-      `)
-    } catch (error) {
-      console.error('Failed to dispatch action:', error)
-      throw error
-    }
-  }
-
-  // 订阅状态变化
-  async subscribe(selector: string, callback: (newValue: any) => void): Promise<Unsubscribe> {
-    const mainWindow = windowService.getMainWindow()
-    if (!mainWindow) {
-      throw new Error('Main window is not available')
-    }
-    await this.waitForStoreReady(mainWindow.webContents)
-
-    // 在渲染进程中设置监听
-    await mainWindow.webContents.executeJavaScript(`
-      if (!window._storeSubscriptions) {
-        window._storeSubscriptions = new Set();
-
-        // 设置全局状态变化监听
-        const unsubscribe = window.store.subscribe(() => {
-          const state = window.store.getState();
-          window.electron.ipcRenderer.send('redux-state-change', state);
-        });
-
-        window._storeSubscriptions.add(unsubscribe);
-      }
-    `)
-
-    // 在主进程中处理回调
-    const handler = async () => {
-      try {
-        const newValue = await this.select(selector)
-        callback(newValue)
-      } catch (error) {
-        console.error('Error in subscription handler:', error)
-      }
-    }
-
-    this.on('stateChange', handler)
-    return () => {
-      this.off('stateChange', handler)
-    }
-  }
-
-  // 获取整个状态树
-  async getState(): Promise<any> {
-    const mainWindow = windowService.getMainWindow()
-    if (!mainWindow) {
-      throw new Error('Main window is not available')
-    }
-    await this.waitForStoreReady(mainWindow.webContents)
-    try {
-      return await mainWindow.webContents.executeJavaScript(`
-        window.store.getState()
-      `)
-    } catch (error) {
-      console.error('Failed to get state:', error)
-      throw error
-    }
-  }
-
-  // 批量执行 actions
-  async batch(actions: any[]): Promise<void> {
-    for (const action of actions) {
-      await this.dispatch(action)
-    }
-  }
-}
-
-export const reduxService = new ReduxService()
-
-/** example
-async function example() {
-  try {
-    // 读取状态
-    const settings = await reduxService.select('state.settings')
-    console.log('settings', settings)
-
-    // 派发 action
-    await reduxService.dispatch({
-      type: 'settings/updateApiKey',
-      payload: 'new-api-key'
-    })
-
-    // 订阅状态变化
-    const unsubscribe = await reduxService.subscribe('state.settings.apiKey', (newValue) => {
-      console.log('API key changed:', newValue)
-    })
-
-    // 批量执行 actions
-    await reduxService.batch([
-      { type: 'action1', payload: 'data1' },
-      { type: 'action2', payload: 'data2' }
-    ])
-
-    // 同步方法虽然可能不是最新的数据，但响应更快
-    const apiKey = reduxService.selectSync('state.settings.apiKey')
-    console.log('apiKey', apiKey)
-
-    // 处理保证是最新的数据
-    const apiKey1 = await reduxService.select('state.settings.apiKey')
-    console.log('apiKey1', apiKey1)
-
-    // 取消订阅
-    unsubscribe()
-  } catch (error) {
-    console.error('Error:', error)
-  }
-}
-*/

src/main/services/ShortcutService.ts

@@ -3,10 +3,8 @@ import { BrowserWindow, globalShortcut } from 'electron'
 import Logger from 'electron-log'
 
 import { configManager } from './ConfigManager'
-import { windowService } from './WindowService'
 
 let showAppAccelerator: string | null = null
-let showMiniWindowAccelerator: string | null = null
 
 function getShortcutHandler(shortcut: Shortcut) {
   switch (shortcut.key) {
@@ -22,20 +20,12 @@ function getShortcutHandler(shortcut: Shortcut) {
     case 'show_app':
       return (window: BrowserWindow) => {
         if (window.isVisible()) {
-          if (window.isFocused()) {
-            window.hide()
-          } else {
-            window.focus()
-          }
+          window.hide()
         } else {
           window.show()
           window.focus()
         }
       }
-    case 'mini_window':
-      return () => {
-        windowService.toggleMiniWindow()
-      }
     default:
       return null
   }
@@ -47,8 +37,8 @@ function formatShortcutKey(shortcut: string[]): string {
 
 function handleZoom(delta: number) {
   return (window: BrowserWindow) => {
-    const currentZoom = configManager.getZoomFactor()
-    const newZoom = Number((currentZoom + delta).toFixed(1))
+    const currentZoom = window.webContents.getZoomFactor()
+    const newZoom = currentZoom + delta
     if (newZoom >= 0.1 && newZoom <= 5.0) {
       window.webContents.setZoomFactor(newZoom)
       configManager.setZoomFactor(newZoom)
@@ -56,65 +46,8 @@ 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())
-  })
+  window.webContents.setZoomFactor(configManager.getZoomFactor())
 
   const register = () => {
     if (window.isDestroyed()) return
@@ -136,14 +69,10 @@ export function registerShortcuts(window: BrowserWindow) {
 
         const accelerator = formatShortcutKey(shortcut.shortcut)
 
-        if (shortcut.key === 'show_app' && shortcut.enabled) {
+        if (shortcut.key === 'show_app') {
           showAppAccelerator = accelerator
         }
 
-        if (shortcut.key === 'mini_window' && shortcut.enabled) {
-          showMiniWindowAccelerator = accelerator
-        }
-
         if (shortcut.key.includes('zoom')) {
           switch (shortcut.key) {
             case 'zoom_in':
@@ -161,9 +90,6 @@ export function registerShortcuts(window: BrowserWindow) {
         }
 
         if (shortcut.enabled) {
-          const accelerator = convertShortcutRecordedByKeyboardEventKeyValueToElectronGlobalShortcutFormat(
-            shortcut.shortcut
-          )
           globalShortcut.register(accelerator, () => handler(window))
         }
       } catch (error) {
@@ -180,16 +106,7 @@ export function registerShortcuts(window: BrowserWindow) {
 
       if (showAppAccelerator) {
         const handler = getShortcutHandler({ key: 'show_app' } as Shortcut)
-        const accelerator =
-          convertShortcutRecordedByKeyboardEventKeyValueToElectronGlobalShortcutFormat(showAppAccelerator)
-        handler && globalShortcut.register(accelerator, () => handler(window))
-      }
-
-      if (showMiniWindowAccelerator) {
-        const handler = getShortcutHandler({ key: 'mini_window' } as Shortcut)
-        const accelerator =
-          convertShortcutRecordedByKeyboardEventKeyValueToElectronGlobalShortcutFormat(showMiniWindowAccelerator)
-        handler && globalShortcut.register(accelerator, () => handler(window))
+        handler && globalShortcut.register(showAppAccelerator, () => handler(window))
       }
     } catch (error) {
       Logger.error('[ShortcutService] Failed to unregister shortcuts')
@@ -207,7 +124,6 @@ export function registerShortcuts(window: BrowserWindow) {
 export function unregisterAllShortcuts() {
   try {
     showAppAccelerator = null
-    showMiniWindowAccelerator = null
     globalShortcut.unregisterAll()
   } catch (error) {
     Logger.error('[ShortcutService] Failed to unregister all shortcuts')

src/main/services/TrayService.ts

@@ -1,6 +1,6 @@
 import { isMac } from '@main/constant'
 import { locales } from '@main/utils/locales'
-import { app, Menu, MenuItemConstructorOptions, nativeImage, nativeTheme, Tray } from 'electron'
+import { app, Menu, nativeImage, nativeTheme, Tray } from 'electron'
 
 import icon from '../../../build/tray_icon.png?asset'
 import iconDark from '../../../build/tray_icon_dark.png?asset'
@@ -9,22 +9,14 @@ import { configManager } from './ConfigManager'
 import { windowService } from './WindowService'
 
 export class TrayService {
-  private static instance: TrayService
   private tray: Tray | null = null
 
   constructor() {
     this.updateTray()
     this.watchTrayChanges()
-    TrayService.instance = this
-  }
-
-  public static getInstance() {
-    return TrayService.instance
   }
 
   private createTray() {
-    this.destroyTray()
-
     const iconPath = isMac ? (nativeTheme.shouldUseDarkColors ? iconLight : iconDark) : icon
     const tray = new Tray(iconPath)
 
@@ -46,25 +38,17 @@ export class TrayService {
     const locale = locales[configManager.getLanguage()]
     const { tray: trayLocale } = locale.translation
 
-    const enableQuickAssistant = configManager.getEnableQuickAssistant()
-
-    const template = [
+    const contextMenu = Menu.buildFromTemplate([
       {
         label: trayLocale.show_window,
         click: () => windowService.showMainWindow()
       },
-      enableQuickAssistant && {
-        label: trayLocale.show_mini_window,
-        click: () => windowService.showMiniWindow()
-      },
       { type: 'separator' },
       {
         label: trayLocale.quit,
         click: () => this.quit()
       }
-    ].filter(Boolean) as MenuItemConstructorOptions[]
-
-    const contextMenu = Menu.buildFromTemplate(template)
+    ])
 
     if (process.platform === 'linux') {
       this.tray.setContextMenu(contextMenu)
@@ -77,30 +61,18 @@ export class TrayService {
     })
 
     this.tray.on('click', () => {
-      if (enableQuickAssistant && configManager.getClickTrayToShowQuickAssistant()) {
-        windowService.showMiniWindow()
-      } else {
-        windowService.showMainWindow()
-      }
+      windowService.showMainWindow()
     })
   }
 
   private updateTray() {
-    const showTray = configManager.getTray()
-    if (showTray) {
+    if (configManager.isTray()) {
       this.createTray()
     } else {
       this.destroyTray()
     }
   }
 
-  public restartTray() {
-    if (configManager.getTray()) {
-      this.destroyTray()
-      this.createTray()
-    }
-  }
-
   private destroyTray() {
     if (this.tray) {
       this.tray.destroy()

src/main/services/WebDav.ts

@@ -1,24 +1,20 @@
-import { proxyManager } from '@main/services/ProxyManager'
 import { WebDavConfig } from '@types'
 import Logger from 'electron-log'
-import { HttpProxyAgent } from 'http-proxy-agent'
 import Stream from 'stream'
 import { BufferLike, createClient, GetFileContentsOptions, PutFileContentsOptions, WebDAVClient } from 'webdav'
+
 export default class WebDav {
   public instance: WebDAVClient | undefined
   private webdavPath: string
 
   constructor(params: WebDavConfig) {
     this.webdavPath = params.webdavPath
-    const url = proxyManager.getProxyUrl()
 
     this.instance = createClient(params.webdavHost, {
       username: params.webdavUser,
       password: params.webdavPass,
       maxBodyLength: Infinity,
-      maxContentLength: Infinity,
-      httpAgent: url ? new HttpProxyAgent(url) : undefined,
-      httpsAgent: proxyManager.getProxyAgent()
+      maxContentLength: Infinity
     })
 
     this.putFileContents = this.putFileContents.bind(this)

src/main/services/WindowService.ts

@@ -1,10 +1,9 @@
 import { is } from '@electron-toolkit/utils'
 import { isLinux, isWin } from '@main/constant'
-import { getFilesDir } from '@main/utils/file'
-import { app, BrowserWindow, ipcMain, Menu, MenuItem, shell } from 'electron'
+import { app, BrowserWindow, Menu, MenuItem, shell } from 'electron'
 import Logger from 'electron-log'
 import windowStateKeeper from 'electron-window-state'
-import { join } from 'path'
+import path, { join } from 'path'
 
 import icon from '../../../build/icon.png?asset'
 import { titleBarOverlayDark, titleBarOverlayLight } from '../config'
@@ -14,11 +13,6 @@ import { configManager } from './ConfigManager'
 export class WindowService {
   private static instance: WindowService | null = null
   private mainWindow: BrowserWindow | null = null
-  private miniWindow: BrowserWindow | null = null
-  private wasFullScreen: boolean = false
-  private selectionMenuWindow: BrowserWindow | null = null
-  private lastSelectedText: string = ''
-  private contextMenu: Menu | null = null
 
   public static getInstance(): WindowService {
     if (!WindowService.instance) {
@@ -29,7 +23,6 @@ export class WindowService {
 
   public createMainWindow(): BrowserWindow {
     if (this.mainWindow && !this.mainWindow.isDestroyed()) {
-      this.mainWindow.show()
       return this.mainWindow
     }
 
@@ -49,10 +42,10 @@ export class WindowService {
       height: mainWindowState.height,
       minWidth: 1080,
       minHeight: 600,
-      show: false, // 初始不显示
+      show: true,
       autoHideMenuBar: true,
       transparent: isMac,
-      vibrancy: 'sidebar',
+      vibrancy: 'under-window',
       visualEffectState: 'active',
       titleBarStyle: isLinux ? 'default' : 'hidden',
       titleBarOverlay: theme === 'dark' ? titleBarOverlayDark : titleBarOverlayLight,
@@ -63,13 +56,11 @@ export class WindowService {
         preload: join(__dirname, '../preload/index.js'),
         sandbox: false,
         webSecurity: false,
-        webviewTag: true,
-        allowRunningInsecureContent: true
+        webviewTag: true
       }
     })
 
     this.setupMainWindow(this.mainWindow, mainWindowState)
-
     return this.mainWindow
   }
 
@@ -114,54 +105,22 @@ export class WindowService {
   }
 
   private setupContextMenu(mainWindow: BrowserWindow) {
-    if (!this.contextMenu) {
+    mainWindow.webContents.on('context-menu', () => {
       const locale = locales[configManager.getLanguage()]
       const { common } = locale.translation
 
-      this.contextMenu = new Menu()
-      this.contextMenu.append(new MenuItem({ label: common.copy, role: 'copy' }))
-      this.contextMenu.append(new MenuItem({ label: common.paste, role: 'paste' }))
-      this.contextMenu.append(new MenuItem({ label: common.cut, role: 'cut' }))
-    }
-
-    mainWindow.webContents.on('context-menu', () => {
-      this.contextMenu?.popup()
-    })
-
-    // Handle webview context menu
-    mainWindow.webContents.on('did-attach-webview', (_, webContents) => {
-      webContents.on('context-menu', () => {
-        this.contextMenu?.popup()
-      })
+      const menu = new Menu()
+      menu.append(new MenuItem({ label: common.copy, role: 'copy' }))
+      menu.append(new MenuItem({ label: common.paste, role: 'paste' }))
+      menu.append(new MenuItem({ label: common.cut, role: 'cut' }))
+      menu.popup()
     })
   }
 
   private setupWindowEvents(mainWindow: BrowserWindow) {
-    mainWindow.once('ready-to-show', () => {
+    mainWindow.on('ready-to-show', () => {
       mainWindow.show()
     })
-
-    // 处理全屏相关事件
-    mainWindow.on('enter-full-screen', () => {
-      this.wasFullScreen = true
-      mainWindow.webContents.send('fullscreen-status-changed', true)
-    })
-
-    mainWindow.on('leave-full-screen', () => {
-      this.wasFullScreen = false
-      mainWindow.webContents.send('fullscreen-status-changed', false)
-    })
-
-    // 添加Escape键退出全屏的支持
-    mainWindow.webContents.on('before-input-event', (event, input) => {
-      // 当按下Escape键且窗口处于全屏状态时退出全屏
-      if (input.key === 'Escape' && !input.alt && !input.control && !input.meta && !input.shift) {
-        if (mainWindow.isFullScreen()) {
-          event.preventDefault()
-          mainWindow.setFullScreen(false)
-        }
-      }
-    })
   }
 
   private setupWebContentsHandlers(mainWindow: BrowserWindow) {
@@ -177,27 +136,9 @@ 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 = getFilesDir()
+        const storageDir = path.join(app.getPath('userData'), 'Data', 'Files')
         const filePath = storageDir + '/' + fileName
         shell.openPath(filePath).catch((err) => Logger.error('Failed to open file:', err))
       } else {
@@ -242,219 +183,32 @@ export class WindowService {
 
   private setupWindowLifecycleEvents(mainWindow: BrowserWindow) {
     mainWindow.on('close', (event) => {
-      // 如果已经触发退出，直接退出
-      if (app.isQuitting) {
-        return app.quit()
-      }
+      const notInTray = !configManager.isTray()
 
-      // 没有开启托盘，且是Windows或Linux系统，直接退出
-      const notInTray = !configManager.getTray()
+      // Windows and Linux
       if ((isWin || isLinux) && notInTray) {
         return app.quit()
       }
 
-      // 如果是Windows或Linux，且处于全屏状态，则退出应用
-      if (this.wasFullScreen) {
-        if (isWin || isLinux) {
-          return app.quit()
-        } else {
-          event.preventDefault()
-          mainWindow.setFullScreen(false)
-          return
-        }
-      }
-      event.preventDefault()
-      mainWindow.hide()
-    })
-
-    mainWindow.on('closed', () => {
-      this.mainWindow = null
-    })
-
-    mainWindow.on('show', () => {
-      if (this.miniWindow && !this.miniWindow.isDestroyed()) {
-        this.miniWindow.hide()
+      // Mac
+      if (!app.isQuitting) {
+        event.preventDefault()
+        mainWindow.hide()
       }
     })
   }
 
   public showMainWindow() {
-    if (this.miniWindow && !this.miniWindow.isDestroyed()) {
-      this.miniWindow.hide()
-    }
-
-    if (this.mainWindow && !this.mainWindow.isDestroyed()) {
+    if (this.mainWindow) {
       if (this.mainWindow.isMinimized()) {
-        this.mainWindow.restore()
+        return this.mainWindow.restore()
       }
       this.mainWindow.show()
       this.mainWindow.focus()
     } else {
-      this.mainWindow = this.createMainWindow()
-      this.mainWindow.focus()
+      this.createMainWindow()
     }
   }
-
-  public showMiniWindow() {
-    const enableQuickAssistant = configManager.getEnableQuickAssistant()
-
-    if (!enableQuickAssistant) {
-      return
-    }
-
-    if (this.mainWindow && !this.mainWindow.isDestroyed()) {
-      this.mainWindow.hide()
-    }
-    if (this.selectionMenuWindow && !this.selectionMenuWindow.isDestroyed()) {
-      this.selectionMenuWindow.hide()
-    }
-
-    if (this.miniWindow && !this.miniWindow.isDestroyed()) {
-      if (this.miniWindow.isMinimized()) {
-        this.miniWindow.restore()
-      }
-      this.miniWindow.show()
-      this.miniWindow.center()
-      this.miniWindow.focus()
-      return
-    }
-
-    const isMac = process.platform === 'darwin'
-
-    this.miniWindow = new BrowserWindow({
-      width: 500,
-      height: 520,
-      show: true,
-      autoHideMenuBar: true,
-      transparent: isMac,
-      vibrancy: 'under-window',
-      visualEffectState: 'followWindow',
-      center: true,
-      frame: false,
-      alwaysOnTop: true,
-      resizable: false,
-      useContentSize: true,
-      webPreferences: {
-        preload: join(__dirname, '../preload/index.js'),
-        sandbox: false,
-        webSecurity: false,
-        webviewTag: true
-      }
-    })
-
-    this.miniWindow.on('blur', () => {
-      this.miniWindow?.hide()
-    })
-
-    this.miniWindow.on('closed', () => {
-      this.miniWindow = null
-    })
-
-    this.miniWindow.on('hide', () => {
-      this.miniWindow?.webContents.send('hide-mini-window')
-    })
-
-    this.miniWindow.on('show', () => {
-      this.miniWindow?.webContents.send('show-mini-window')
-    })
-
-    ipcMain.on('miniwindow-reload', () => {
-      this.miniWindow?.reload()
-    })
-
-    if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
-      this.miniWindow.loadURL(process.env['ELECTRON_RENDERER_URL'] + '#/mini')
-    } else {
-      this.miniWindow.loadFile(join(__dirname, '../renderer/index.html'), {
-        hash: '#/mini'
-      })
-    }
-  }
-
-  public hideMiniWindow() {
-    this.miniWindow?.hide()
-  }
-
-  public closeMiniWindow() {
-    this.miniWindow?.close()
-  }
-
-  public toggleMiniWindow() {
-    if (this.miniWindow) {
-      this.miniWindow.isVisible() ? this.miniWindow.hide() : this.miniWindow.show()
-    } else {
-      this.showMiniWindow()
-    }
-  }
-
-  public showSelectionMenu(bounds: { x: number; y: number }) {
-    if (this.selectionMenuWindow && !this.selectionMenuWindow.isDestroyed()) {
-      this.selectionMenuWindow.setPosition(bounds.x, bounds.y)
-      this.selectionMenuWindow.show()
-      return
-    }
-
-    const theme = configManager.getTheme()
-    const isMac = process.platform === 'darwin'
-
-    this.selectionMenuWindow = new BrowserWindow({
-      width: 280,
-      height: 40,
-      x: bounds.x,
-      y: bounds.y,
-      show: true,
-      autoHideMenuBar: true,
-      transparent: true,
-      frame: false,
-      alwaysOnTop: false,
-      skipTaskbar: true,
-      backgroundColor: isMac ? undefined : theme === 'dark' ? '#181818' : '#FFFFFF',
-      resizable: false,
-      vibrancy: 'popover',
-      webPreferences: {
-        preload: join(__dirname, '../preload/index.js'),
-        sandbox: false,
-        webSecurity: false
-      }
-    })
-
-    // 点击其他地方时隐藏窗口
-    this.selectionMenuWindow.on('blur', () => {
-      this.selectionMenuWindow?.hide()
-      this.miniWindow?.webContents.send('selection-action', {
-        action: 'home',
-        selectedText: this.lastSelectedText
-      })
-    })
-
-    if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
-      this.selectionMenuWindow.loadURL(process.env['ELECTRON_RENDERER_URL'] + '/src/windows/menu/menu.html')
-    } else {
-      this.selectionMenuWindow.loadFile(join(__dirname, '../renderer/src/windows/menu/menu.html'))
-    }
-
-    this.setupSelectionMenuEvents()
-  }
-
-  private setupSelectionMenuEvents() {
-    if (!this.selectionMenuWindow) return
-
-    ipcMain.removeHandler('selection-menu:action')
-    ipcMain.handle('selection-menu:action', (_, action) => {
-      this.selectionMenuWindow?.hide()
-      this.showMiniWindow()
-      setTimeout(() => {
-        this.miniWindow?.webContents.send('selection-action', {
-          action,
-          selectedText: this.lastSelectedText
-        })
-      }, 100)
-    })
-  }
-
-  public setLastSelectedText(text: string) {
-    this.lastSelectedText = text
-  }
 }
 
 export const windowService = WindowService.getInstance()

src/main/utils/aes.ts

@@ -1,19 +1,22 @@
 import * as crypto from 'crypto'
 
+// 定义密钥和初始化向量（IV）
+const secretKey = 'kDQvWz5slot3syfucoo53X6KKsEUJoeFikpiUWRJTLIo3zcUPpFvEa009kK13KCr'
+const iv = Buffer.from('Cherry Studio', 'hex')
+
 // 加密函数
-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)
+export function encrypt(text: string): { iv: string; encryptedData: string } {
+  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, secretKey: string): string {
+export function decrypt(encryptedData: string, iv: 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,76 +1,12 @@
-import * as fs from 'node:fs'
-import path from 'node:path'
-
 import { audioExts, documentExts, imageExts, textExts, videoExts } from '@shared/config/constant'
-import { FileType, FileTypes } from '@types'
-import { app } from 'electron'
-import { v4 as uuidv4 } from 'uuid'
-
-// 创建文件类型映射表，提高查找效率
-const fileTypeMap = new Map<string, FileTypes>()
-
-// 初始化映射表
-function initFileTypeMap() {
-  imageExts.forEach((ext) => fileTypeMap.set(ext, FileTypes.IMAGE))
-  videoExts.forEach((ext) => fileTypeMap.set(ext, FileTypes.VIDEO))
-  audioExts.forEach((ext) => fileTypeMap.set(ext, FileTypes.AUDIO))
-  textExts.forEach((ext) => fileTypeMap.set(ext, FileTypes.TEXT))
-  documentExts.forEach((ext) => fileTypeMap.set(ext, FileTypes.DOCUMENT))
-}
-
-// 初始化映射表
-initFileTypeMap()
+import { FileTypes } from '@types'
 
 export function getFileType(ext: string): FileTypes {
   ext = ext.toLowerCase()
-  return fileTypeMap.get(ext) || 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().toISOString()
-      }
-
-      arrayOfFiles.push(fileItem)
-    }
-  })
-
-  return arrayOfFiles
-}
-
-export function getTempDir() {
-  return path.join(app.getPath('temp'), 'CherryStudio')
-}
-
-export function getFilesDir() {
-  return path.join(app.getPath('userData'), 'Data', 'Files')
+  if (imageExts.includes(ext)) return FileTypes.IMAGE
+  if (videoExts.includes(ext)) return FileTypes.VIDEO
+  if (audioExts.includes(ext)) return FileTypes.AUDIO
+  if (textExts.includes(ext)) return FileTypes.TEXT
+  if (documentExts.includes(ext)) return FileTypes.DOCUMENT
+  return FileTypes.OTHER
 }

src/main/utils/index.ts

@@ -22,23 +22,3 @@ export function getInstanceName(baseURL: string) {
     return ''
   }
 }
-
-export function debounce(func: (...args: any[]) => void, wait: number, immediate: boolean = false) {
-  let timeout: NodeJS.Timeout | null = null
-  return function (...args: any[]) {
-    if (timeout) clearTimeout(timeout)
-    if (immediate) {
-      func(...args)
-    } else {
-      timeout = setTimeout(() => func(...args), wait)
-    }
-  }
-}
-
-export function dumpPersistState() {
-  const persistState = JSON.parse(localStorage.getItem('persist:cherry-studio') || '{}')
-  for (const key in persistState) {
-    persistState[key] = JSON.parse(persistState[key])
-  }
-  return JSON.stringify(persistState)
-}

src/main/utils/upgrade.ts

@@ -0,0 +1,77 @@
+import { spawn } from 'child_process'
+import { app, dialog } from 'electron'
+import Logger from 'electron-log'
+import fs from 'fs'
+import path from 'path'
+
+export async function updateUserDataPath() {
+  const currentPath = app.getPath('userData')
+  const oldPath = currentPath.replace('CherryStudio', 'cherry-studio')
+
+  if (currentPath !== oldPath && fs.existsSync(oldPath)) {
+    Logger.log('Update userData path')
+
+    try {
+      if (process.platform === 'win32') {
+        // Windows 系统：创建 bat 文件
+        const batPath = await createWindowsBatFile(oldPath, currentPath)
+        await promptRestartAndExecute(batPath)
+      } else {
+        // 其他系统：直接更新
+        fs.rmSync(currentPath, { recursive: true, force: true })
+        fs.renameSync(oldPath, currentPath)
+        Logger.log(`Directory renamed: ${currentPath}`)
+        await promptRestart()
+      }
+    } catch (error: any) {
+      Logger.error('Error updating userData path:', error)
+      dialog.showErrorBox('错误', `更新用户数据目录时发生错误: ${error.message}`)
+    }
+  } else {
+    Logger.log('userData path does not need to be updated')
+  }
+}
+
+async function createWindowsBatFile(oldPath: string, currentPath: string): Promise<string> {
+  const batPath = path.join(app.getPath('temp'), 'rename_userdata.bat')
+  const appPath = app.getPath('exe')
+  const batContent = `
+@echo off
+timeout /t 2 /nobreak
+rmdir /s /q "${currentPath}"
+rename "${oldPath}" "${path.basename(currentPath)}"
+start "" "${appPath}"
+del "%~f0"
+  `
+  fs.writeFileSync(batPath, batContent)
+  return batPath
+}
+
+async function promptRestartAndExecute(batPath: string) {
+  await dialog.showMessageBox({
+    type: 'info',
+    title: '应用需要重启',
+    message: '用户数据目录将在重启后更新。请重启应用以应用更改。',
+    buttons: ['手动重启']
+  })
+
+  // 执行 bat 文件
+  spawn('cmd.exe', ['/c', batPath], {
+    detached: true,
+    stdio: 'ignore'
+  })
+
+  app.exit(0)
+}
+
+async function promptRestart() {
+  await dialog.showMessageBox({
+    type: 'info',
+    title: '应用需要重启',
+    message: '用户数据目录已更新。请重启应用以应用更改。',
+    buttons: ['重启']
+  })
+
+  app.relaunch()
+  app.exit(0)
+}

src/main/utils/windowUtil.ts

@@ -1,5 +1,3 @@
-import { BrowserWindow } from 'electron'
-
 function isTilingWindowManager() {
   if (process.platform === 'darwin') {
     return false
@@ -15,33 +13,4 @@ function isTilingWindowManager() {
   return tilingSystems.some((system) => desktopEnv?.includes(system))
 }
 
-export const replaceDevtoolsFont = (browserWindow: BrowserWindow) => {
-  if (process.platform === 'win32') {
-    browserWindow.webContents.on('devtools-opened', () => {
-      const css = `
-        :root {
-            --sys-color-base: var(--ref-palette-neutral100);
-            --source-code-font-family: consolas;
-            --source-code-font-size: 12px;
-            --monospace-font-family: consolas;
-            --monospace-font-size: 12px;
-            --default-font-family: system-ui, sans-serif;
-            --default-font-size: 12px;
-        }
-        .-theme-with-dark-background {
-            --sys-color-base: var(--ref-palette-secondary25);
-        }
-        body {
-            --default-font-family: system-ui,sans-serif;
-        }`
-
-      browserWindow.webContents.devToolsWebContents?.executeJavaScript(`
-        const overriddenStyle = document.createElement('style');
-        overriddenStyle.innerHTML = '${css.replaceAll('\n', ' ')}';
-        document.body.append(overriddenStyle);
-        document.body.classList.remove('platform-windows');`)
-    })
-  }
-}
-
 export { isTilingWindowManager }

src/preload/index.d.ts

@@ -1,9 +1,8 @@
 import { ElectronAPI } from '@electron-toolkit/preload'
-import type { FileMetadataResponse, ListFilesResponse, UploadFileResponse } from '@google/generative-ai/server'
-import { ExtractChunkData } from '@llm-tools/embedjs-interfaces'
-import type { MCPServer, MCPTool } from '@renderer/types'
-import { AppInfo, FileType, KnowledgeBaseParams, KnowledgeItem, LanguageVarious, WebDavConfig } from '@renderer/types'
-import type { LoaderReturn } from '@shared/config/types'
+import { AddLoaderReturn, 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 { OpenDialogOptions } from 'electron'
 import type { UpdateInfo } from 'electron-updater'
 import { Readable } from 'stream'
@@ -14,12 +13,10 @@ declare global {
     api: {
       getAppInfo: () => Promise<AppInfo>
       checkForUpdate: () => Promise<{ currentVersion: string; updateInfo: UpdateInfo | null }>
-      showUpdateDialog: () => Promise<void>
       openWebsite: (url: string) => void
       setProxy: (proxy: string | undefined) => void
       setLanguage: (theme: LanguageVarious) => void
       setTray: (isActive: boolean) => void
-      restartTray: () => void
       setTheme: (theme: 'light' | 'dark') => void
       minApp: (options: { url: string; windowOptions?: Electron.BrowserWindowConstructorOptions }) => void
       reload: () => void
@@ -55,10 +52,6 @@ declare global {
         base64Image: (fileId: string) => Promise<{ mime: string; base64: string; data: string }>
         download: (url: string) => Promise<FileType | null>
         copy: (fileId: string, destPath: string) => Promise<void>
-        binaryFile: (fileId: string) => Promise<{ data: Buffer; mime: string }>
-      }
-      fs: {
-        read: (path: string) => Promise<string>
       }
       export: {
         toWord: (markdown: string, fileName: string) => Promise<void>
@@ -79,61 +72,12 @@ declare global {
           base: KnowledgeBaseParams
           item: KnowledgeItem
           forceReload?: boolean
-        }) => Promise<LoaderReturn>
-        remove: ({
-          uniqueId,
-          uniqueIds,
-          base
-        }: {
-          uniqueId: string
-          uniqueIds: string[]
-          base: KnowledgeBaseParams
-        }) => Promise<void>
+        }) => Promise<AddLoaderReturn>
+        remove: ({ uniqueId, base }: { uniqueId: string; base: KnowledgeBaseParams }) => Promise<void>
         search: ({ search, base }: { search: string; base: KnowledgeBaseParams }) => Promise<ExtractChunkData[]>
       }
-      window: {
-        setMinimumSize: (width: number, height: number) => Promise<void>
-        resetMinimumSize: () => Promise<void>
-      }
-      gemini: {
-        uploadFile: (file: FileType, apiKey: string) => Promise<UploadFileResponse>
-        retrieveFile: (file: FileType, apiKey: string) => Promise<FileMetadataResponse | undefined>
-        base64File: (file: FileType) => Promise<{ data: string; mimeType: string }>
-        listFiles: (apiKey: string) => Promise<ListFilesResponse>
-        deleteFile: (apiKey: string, fileId: string) => Promise<void>
-      }
-      selectionMenu: {
-        action: (action: string) => Promise<void>
-      }
-      config: {
-        set: (key: string, value: any) => Promise<void>
-        get: (key: string) => Promise<any>
-      }
-      miniWindow: {
-        show: () => Promise<void>
-        hide: () => Promise<void>
-        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>
-      }
-      mcp: {
-        // servers
-        listServers: () => Promise<MCPServer[]>
-        addServer: (server: MCPServer) => Promise<void>
-        updateServer: (server: MCPServer) => Promise<void>
-        deleteServer: (serverName: string) => Promise<void>
-        setServerActive: (name: string, isActive: boolean) => Promise<void>
-        // tools
-        listTools: () => Promise<MCPTool[]>
-        callTool: ({ client, name, args }: { client: string; name: string; args: any }) => Promise<any>
-        // status
-        cleanup: () => Promise<void>
+      vm: {
+        run: (code: string) => Promise<any>
       }
     }
   }

src/preload/index.ts

@@ -1,6 +1,6 @@
 import { electronAPI } from '@electron-toolkit/preload'
-import { FileType, KnowledgeBaseParams, KnowledgeItem, MCPServer, Shortcut, WebDavConfig } from '@types'
-import { contextBridge, ipcRenderer, OpenDialogOptions, shell } from 'electron'
+import { KnowledgeBaseParams, KnowledgeItem, Shortcut, WebDavConfig } from '@types'
+import { contextBridge, ipcRenderer, OpenDialogOptions } from 'electron'
 
 // Custom APIs for renderer
 const api = {
@@ -8,10 +8,8 @@ const api = {
   reload: () => ipcRenderer.invoke('app:reload'),
   setProxy: (proxy: string) => ipcRenderer.invoke('app:proxy', proxy),
   checkForUpdate: () => ipcRenderer.invoke('app:check-for-update'),
-  showUpdateDialog: () => ipcRenderer.invoke('app:show-update-dialog'),
   setLanguage: (lang: string) => ipcRenderer.invoke('app:set-language', lang),
   setTray: (isActive: boolean) => ipcRenderer.invoke('app:set-tray', isActive),
-  restartTray: () => ipcRenderer.invoke('app:restart-tray'),
   setTheme: (theme: 'light' | 'dark') => ipcRenderer.invoke('app:set-theme', theme),
   openWebsite: (url: string) => ipcRenderer.invoke('open:website', url),
   minApp: (url: string) => ipcRenderer.invoke('minapp', url),
@@ -45,11 +43,7 @@ const api = {
     saveImage: (name: string, data: string) => ipcRenderer.invoke('file:saveImage', name, data),
     base64Image: (fileId: string) => ipcRenderer.invoke('file:base64Image', fileId),
     download: (url: string) => ipcRenderer.invoke('file:download', url),
-    copy: (fileId: string, destPath: string) => ipcRenderer.invoke('file:copy', fileId, destPath),
-    binaryFile: (fileId: string) => ipcRenderer.invoke('file:binaryFile', fileId)
-  },
-  fs: {
-    read: (path: string) => ipcRenderer.invoke('fs:read', path)
+    copy: (fileId: string, destPath: string) => ipcRenderer.invoke('file:copy', fileId, destPath)
   },
   export: {
     toWord: (markdown: string, fileName: string) => ipcRenderer.invoke('export:word', markdown, fileName)
@@ -72,53 +66,13 @@ const api = {
       item: KnowledgeItem
       forceReload?: boolean
     }) => ipcRenderer.invoke('knowledge-base:add', { base, item, forceReload }),
-    remove: ({ uniqueId, uniqueIds, base }: { uniqueId: string; uniqueIds: string[]; base: KnowledgeBaseParams }) =>
-      ipcRenderer.invoke('knowledge-base:remove', { uniqueId, uniqueIds, base }),
+    remove: ({ uniqueId, base }: { uniqueId: string; base: KnowledgeBaseParams }) =>
+      ipcRenderer.invoke('knowledge-base:remove', { uniqueId, base }),
     search: ({ search, base }: { search: string; base: KnowledgeBaseParams }) =>
       ipcRenderer.invoke('knowledge-base:search', { search, base })
   },
-  window: {
-    setMinimumSize: (width: number, height: number) => ipcRenderer.invoke('window:set-minimum-size', width, height),
-    resetMinimumSize: () => ipcRenderer.invoke('window:reset-minimum-size')
-  },
-  gemini: {
-    uploadFile: (file: FileType, apiKey: string) => ipcRenderer.invoke('gemini:upload-file', file, apiKey),
-    base64File: (file: FileType) => ipcRenderer.invoke('gemini:base64-file', file),
-    retrieveFile: (file: FileType, apiKey: string) => ipcRenderer.invoke('gemini:retrieve-file', file, apiKey),
-    listFiles: (apiKey: string) => ipcRenderer.invoke('gemini:list-files', apiKey),
-    deleteFile: (apiKey: string, fileId: string) => ipcRenderer.invoke('gemini:delete-file', apiKey, fileId)
-  },
-  selectionMenu: {
-    action: (action: string) => ipcRenderer.invoke('selection-menu:action', action)
-  },
-  config: {
-    set: (key: string, value: any) => ipcRenderer.invoke('config:set', key, value),
-    get: (key: string) => ipcRenderer.invoke('config:get', key)
-  },
-  miniWindow: {
-    show: () => ipcRenderer.invoke('miniwindow:show'),
-    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)
-  },
-  mcp: {
-    listServers: () => ipcRenderer.invoke('mcp:list-servers'),
-    addServer: (server: MCPServer) => ipcRenderer.invoke('mcp:add-server', server),
-    updateServer: (server: MCPServer) => ipcRenderer.invoke('mcp:update-server', server),
-    deleteServer: (serverName: string) => ipcRenderer.invoke('mcp:delete-server', serverName),
-    setServerActive: (name: string, isActive: boolean) =>
-      ipcRenderer.invoke('mcp:set-server-active', { name, isActive }),
-    listTools: (serverName?: string) => ipcRenderer.invoke('mcp:list-tools', serverName),
-    callTool: (params: { client: string; name: string; args: any }) => ipcRenderer.invoke('mcp:call-tool', params),
-    cleanup: () => ipcRenderer.invoke('mcp:cleanup')
-  },
-  shell: {
-    openExternal: shell.openExternal
+  vm: {
+    run: (code: string) => ipcRenderer.invoke('run-js', code)
   }
 }
 

src/renderer/index.html

@@ -6,7 +6,6 @@
   <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,
@@ -18,10 +17,10 @@
       position: fixed;
       width: 100vw;
       height: 100vh;
+      display: flex;
       flex-direction: row;
       justify-content: center;
       align-items: center;
-      display: none;
     }
 
     #spinner img {
@@ -36,7 +35,6 @@
   <div id="spinner">
     <img src="/src/assets/images/logo.png" />
   </div>
-  <script type="module" src="/src/init.ts"></script>
   <script type="module" src="/src/main.tsx"></script>
 </body>
 

src/renderer/src/App.tsx

@@ -8,10 +8,8 @@ import { PersistGate } from 'redux-persist/integration/react'
 import Sidebar from './components/app/Sidebar'
 import TopViewContainer from './components/TopView'
 import AntdProvider from './context/AntdProvider'
-import StyleSheetManager from './context/StyleSheetManager'
 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'
@@ -24,32 +22,29 @@ import TranslatePage from './pages/translate/TranslatePage'
 function App(): JSX.Element {
   return (
     <Provider store={store}>
-      <StyleSheetManager>
-        <ThemeProvider>
-          <AntdProvider>
-            <SyntaxHighlighterProvider>
-              <PersistGate loading={null} persistor={persistor}>
-                <TopViewContainer>
-                  <HashRouter>
-                    <NavigationHandler />
-                    <Sidebar />
-                    <Routes>
-                      <Route path="/" element={<HomePage />} />
-                      <Route path="/agents" element={<AgentsPage />} />
-                      <Route path="/paintings" element={<PaintingsPage />} />
-                      <Route path="/translate" element={<TranslatePage />} />
-                      <Route path="/files" element={<FilesPage />} />
-                      <Route path="/knowledge" element={<KnowledgePage />} />
-                      <Route path="/apps" element={<AppsPage />} />
-                      <Route path="/settings/*" element={<SettingsPage />} />
-                    </Routes>
-                  </HashRouter>
-                </TopViewContainer>
-              </PersistGate>
-            </SyntaxHighlighterProvider>
-          </AntdProvider>
-        </ThemeProvider>
-      </StyleSheetManager>
+      <ThemeProvider>
+        <AntdProvider>
+          <SyntaxHighlighterProvider>
+            <PersistGate loading={null} persistor={persistor}>
+              <TopViewContainer>
+                <HashRouter>
+                  <Sidebar />
+                  <Routes>
+                    <Route path="/" element={<HomePage />} />
+                    <Route path="/agents" element={<AgentsPage />} />
+                    <Route path="/paintings" element={<PaintingsPage />} />
+                    <Route path="/translate" element={<TranslatePage />} />
+                    <Route path="/files" element={<FilesPage />} />
+                    <Route path="/knowledge" element={<KnowledgePage />} />
+                    <Route path="/apps" element={<AppsPage />} />
+                    <Route path="/settings/*" element={<SettingsPage />} />
+                  </Routes>
+                </HashRouter>
+              </TopViewContainer>
+            </PersistGate>
+          </SyntaxHighlighterProvider>
+        </AntdProvider>
+      </ThemeProvider>
     </Provider>
   )
 }

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

@@ -1,6 +1,6 @@
 @font-face {
   font-family: 'iconfont'; /* Project id 4753420 */
-  src: url('iconfont.woff2?t=1741743579060') format('woff2');
+  src: url('iconfont.woff2?t=1733224456443') format('woff2');
 }
 
 .iconfont {
@@ -11,26 +11,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-notion:before {
-  content: '\e690';
-}
-
-.icon-thinking:before {
-  content: '\e65b';
+.icon-at1:before {
+  content: '\e7df';
 }
 
 .icon-at:before {
-  content: '\e623';
-}
-
-.icon-icon-adaptive-width:before {
-  content: '\e87a';
-}
-
-.icon-at1:before {
   content: '\e630';
 }
 
+.icon-a-darkmode:before {
+  content: '\e6cd';
+}
+
 .icon-ai-model:before {
   content: '\e827';
 }

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

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

@@ -1 +0,0 @@
-<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/flowith.svg

@@ -1,4 +0,0 @@
-<svg width="464" height="464" viewBox="0 0 464 464" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="464" height="464" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M243 127C235.268 127 229 133.268 229 141V322C229 329.732 235.268 336 243 336H283C290.732 336 297 329.732 297 322V141C297 133.268 290.732 127 283 127H243ZM167.562 128C163.762 128 160.317 129.518 157.805 131.978C157.787 131.995 157.759 131.977 157.767 131.954C157.775 131.93 157.743 131.913 157.727 131.933L157.311 132.486C156.679 133.171 156.115 133.92 155.629 134.722C154.303 136.486 153.139 138.365 152.152 140.338L88.8745 266.857L85.2894 274.899C85.2249 275.037 85.1626 275.177 85.1027 275.318L84.7141 276.189C84.7086 276.201 84.7223 276.213 84.7339 276.206C84.745 276.2 84.7583 276.211 84.7541 276.223C84.2654 277.639 84 279.16 84 280.742L84 322.399C84 330.067 90.2354 336.284 97.9271 336.284H139.708C147.4 336.284 153.635 330.067 153.635 322.399V266.857L153.636 252.97C153.636 222.295 178.577 197.428 209.344 197.428C217.035 197.428 223.271 191.211 223.271 183.542V141.886C223.271 134.217 217.035 128 209.344 128H167.562ZM304.5 301.57C304.5 282.398 320.088 266.856 339.318 266.856C358.547 266.856 374.135 282.398 374.135 301.57C374.135 320.742 358.547 336.284 339.318 336.284C320.088 336.284 304.5 320.742 304.5 301.57Z" fill="black"/>
-</svg>

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

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