Merge pull request #4331 from CherryHQ/main

Merge main code

.eslintignore

@@ -1,5 +0,0 @@
-node_modules
-dist
-out
-.gitignore
-scripts/cloudflare-worker.js

.eslintrc.cjs

@@ -1,22 +0,0 @@
-module.exports = {
-  plugins: ['unused-imports', 'simple-import-sort'],
-  extends: [
-    'eslint:recommended',
-    'plugin:react/recommended',
-    'plugin:react/jsx-runtime',
-    'plugin:react-hooks/recommended',
-    '@electron-toolkit/eslint-config-ts/recommended',
-    '@electron-toolkit/eslint-config-prettier'
-  ],
-  rules: {
-    '@typescript-eslint/explicit-function-return-type': 'off',
-    '@typescript-eslint/no-explicit-any': 'off',
-    'unused-imports/no-unused-imports': 'error',
-    '@typescript-eslint/no-non-null-asserted-optional-chain': 'off',
-    'react/prop-types': 'off',
-    'simple-import-sort/imports': 'error',
-    'simple-import-sort/exports': 'error',
-    'react/no-is-mounted': 'off',
-    'prettier/prettier': ['error', { endOfLine: 'auto' }]
-  }
-}

.gitattributes

@@ -0,0 +1,2 @@
+/.yarn/**            linguist-vendored
+/.yarn/releases/*    binary

.github/workflows/nightly-build.yml

@@ -9,7 +9,7 @@ permissions:
   contents: write
 
 jobs:
-  release:
+  nightly-build:
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -84,29 +84,177 @@ jobs:
       - name: Replace spaces in filenames
         run: node scripts/replace-spaces.js
 
+      - name: Rename artifacts with nightly format
+        shell: bash
+        run: |
+          mkdir -p renamed-artifacts
+          DATE=${{ steps.date.outputs.date }}
+
+          # Windows artifacts - based on actual file naming pattern
+          if [ "${{ matrix.os }}" == "windows-latest" ]; then
+            # Setup installer
+            find dist -name "*setup.exe" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-setup.exe \;
+            
+            # Portable exe
+            find dist -name "*portable.exe" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-portable.exe \;
+
+            # Rename blockmap files to match the new exe names
+            if [ -f "dist/*setup.exe.blockmap" ]; then
+              cp dist/*setup.exe.blockmap renamed-artifacts/cherry-studio-nightly-${DATE}-setup.exe.blockmap || true
+            fi
+          fi
+
+          # macOS artifacts
+          if [ "${{ matrix.os }}" == "macos-latest" ]; then
+            # 处理arm64架构文件
+            find dist -name "*-arm64.dmg" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-arm64.dmg \;
+            find dist -name "*-arm64.dmg.blockmap" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-arm64.dmg.blockmap \;
+            find dist -name "*-arm64.zip" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-arm64.zip \;
+            find dist -name "*-arm64.zip.blockmap" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-arm64.zip.blockmap \;
+            
+            # 处理x64架构文件
+            find dist -name "*-x64.dmg" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-x64.dmg \;
+            find dist -name "*-x64.dmg.blockmap" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-x64.dmg.blockmap \;
+            find dist -name "*-x64.zip" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-x64.zip \;
+            find dist -name "*-x64.zip.blockmap" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}-x64.zip.blockmap \;
+          fi
+
+          # Linux artifacts
+          if [ "${{ matrix.os }}" == "ubuntu-latest" ]; then
+            find dist -name "*.AppImage" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}.AppImage \;
+            find dist -name "*.snap" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}.snap \;
+            find dist -name "*.deb" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}.deb \;
+            find dist -name "*.rpm" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}.rpm \;
+            find dist -name "*.tar.gz" -exec cp {} renamed-artifacts/cherry-studio-nightly-${DATE}.tar.gz \;
+          fi
+
+          # Copy update files
+          cp dist/latest*.yml renamed-artifacts/ || true
+
+      # Generate SHA256 checksums (Windows)
+      - name: Generate SHA256 checksums (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          cd renamed-artifacts
+          echo "# SHA256 checksums for Windows - $(Get-Date -Format 'yyyy-MM-dd')" > SHA256SUMS.txt
+          Get-ChildItem -File | Where-Object { $_.Name -ne 'SHA256SUMS.txt' } | ForEach-Object {
+            $file = $_.Name
+            $hash = (Get-FileHash -Algorithm SHA256 $file).Hash.ToLower()
+            Add-Content -Path SHA256SUMS.txt -Value "$hash  $file"
+          }
+          cat SHA256SUMS.txt
+
+      # Generate SHA256 checksums (macOS/Linux)
+      - name: Generate SHA256 checksums (macOS/Linux)
+        if: runner.os != 'Windows'
+        shell: bash
+        run: |
+          cd renamed-artifacts
+          echo "# SHA256 checksums for ${{ runner.os }} - $(date +'%Y-%m-%d')" > SHA256SUMS.txt
+          if command -v shasum &>/dev/null; then
+            # macOS
+            shasum -a 256 * 2>/dev/null | grep -v SHA256SUMS.txt >> SHA256SUMS.txt || echo "No files to hash" >> SHA256SUMS.txt
+          else
+            # Linux
+            sha256sum * 2>/dev/null | grep -v SHA256SUMS.txt >> SHA256SUMS.txt || echo "No files to hash" >> SHA256SUMS.txt
+          fi
+          cat SHA256SUMS.txt
+
+      - name: List files to be uploaded
+        shell: bash
+        run: |
+          echo "准备上传的文件:"
+          if [ -x "$(command -v tree)" ]; then
+            tree renamed-artifacts
+          elif [ "$RUNNER_OS" == "Windows" ]; then
+            dir renamed-artifacts
+          else
+            ls -la renamed-artifacts
+          fi
+          echo "总计: $(find renamed-artifacts -type f | wc -l) 个文件"
+
       - 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
+          name: cherry-studio-nightly-${{ steps.date.outputs.date }}-${{ matrix.os }}
+          path: renamed-artifacts/*
           retention-days: 3 # 保留3天
+          compression-level: 8
 
-      - name: Add warning to summary
+  Build-Summary:
+    needs: nightly-build
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get date tag
+        id: date
+        run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
+        shell: bash
+
+      - name: Download all artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: all-artifacts
+          merge-multiple: false
+        continue-on-error: true
+
+      - name: Create summary report
         run: |
           echo "## ⚠️ 警告：这是每日构建版本" >> $GITHUB_STEP_SUMMARY
           echo "此版本为自动构建的不稳定版本，仅供测试使用。不建议在生产环境中使用。" >> $GITHUB_STEP_SUMMARY
           echo "安装此版本前请务必备份数据，并做好数据迁移准备。" >> $GITHUB_STEP_SUMMARY
           echo "构建日期：$(date +'%Y-%m-%d')" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+
+          echo "## 📦 安装包校验和" >> $GITHUB_STEP_SUMMARY
+          echo "请在下载后验证文件完整性。提供 SHA256 校验和。" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+
+          # Check each platform's artifacts and show checksums if available
+
+          # Windows
+          WIN_ARTIFACT_DIR="all-artifacts/cherry-studio-nightly-${{ steps.date.outputs.date }}-windows-latest"
+          if [ -d "$WIN_ARTIFACT_DIR" ] && [ -f "$WIN_ARTIFACT_DIR/SHA256SUMS.txt" ]; then
+            echo "### Windows 安装包" >> $GITHUB_STEP_SUMMARY
+            echo '```' >> $GITHUB_STEP_SUMMARY
+            cat "$WIN_ARTIFACT_DIR/SHA256SUMS.txt" >> $GITHUB_STEP_SUMMARY
+            echo '```' >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "### Windows 安装包" >> $GITHUB_STEP_SUMMARY
+            echo "❌ Windows 构建未成功完成或未生成校验和。" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+          fi
+
+          # macOS
+          MAC_ARTIFACT_DIR="all-artifacts/cherry-studio-nightly-${{ steps.date.outputs.date }}-macos-latest"
+          if [ -d "$MAC_ARTIFACT_DIR" ] && [ -f "$MAC_ARTIFACT_DIR/SHA256SUMS.txt" ]; then
+            echo "### macOS 安装包" >> $GITHUB_STEP_SUMMARY
+            echo '```' >> $GITHUB_STEP_SUMMARY
+            cat "$MAC_ARTIFACT_DIR/SHA256SUMS.txt" >> $GITHUB_STEP_SUMMARY
+            echo '```' >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "### macOS 安装包" >> $GITHUB_STEP_SUMMARY
+            echo "❌ macOS 构建未成功完成或未生成校验和。" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+          fi
+
+          # Linux
+          LINUX_ARTIFACT_DIR="all-artifacts/cherry-studio-nightly-${{ steps.date.outputs.date }}-ubuntu-latest"
+          if [ -d "$LINUX_ARTIFACT_DIR" ] && [ -f "$LINUX_ARTIFACT_DIR/SHA256SUMS.txt" ]; then
+            echo "### Linux 安装包" >> $GITHUB_STEP_SUMMARY
+            echo '```' >> $GITHUB_STEP_SUMMARY
+            cat "$LINUX_ARTIFACT_DIR/SHA256SUMS.txt" >> $GITHUB_STEP_SUMMARY
+            echo '```' >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "### Linux 安装包" >> $GITHUB_STEP_SUMMARY
+            echo "❌ Linux 构建未成功完成或未生成校验和。" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+          fi
+
           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

.npmrc

@@ -0,0 +1 @@
+electron_mirror=https://npmmirror.com/mirrors/electron/

.prettierignore

@@ -6,3 +6,4 @@ tsconfig.json
 tsconfig.*.json
 CHANGELOG*.md
 agents.json
+src/renderer/src/integration/nutstore/sso/lib

.vscode/settings.json

@@ -4,7 +4,8 @@
     "source.fixAll.eslint": "explicit"
   },
   "search.exclude": {
-    "**/dist/**": true
+    "**/dist/**": true,
+    ".yarn/releases/**": true
   },
   "[javascript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"

.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.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/@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/pkce-challenge-npm-4.1.0-fbc51695a3.patch

@@ -0,0 +1,18 @@
+diff --git a/dist/index.node.js b/dist/index.node.js
+index bb108cbc210af5b99e864fd1dd8c555e948ecf7a..8ef8c1aab59215c21d161c0e52125724528ecab8 100644
+--- a/dist/index.node.js
++++ b/dist/index.node.js
+@@ -1,8 +1,11 @@
+ let crypto;
+ crypto =
+     globalThis.crypto?.webcrypto ?? // Node.js 16 REPL has globalThis.crypto as node:crypto
+-        globalThis.crypto ?? // Node.js 18+ 
+-        (await import("node:crypto")).webcrypto; // Node.js 16 non-REPL
++        globalThis.crypto ?? // Node.js 18+
++        (async() => {
++            const crypto = await import("node:crypto");
++            return crypto.webcrypto;
++        })();
+ /**
+  * Creates an array of length `size` of random bytes
+  * @param size

.yarnrc.yml

@@ -3,3 +3,5 @@ enableImmutableInstalls: false
 httpTimeout: 300000
 
 nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.6.0.cjs

CONTRIBUTING.md

@@ -40,6 +40,6 @@
 如果您有任何问题或建议，欢迎通过以下方式联系我们：
 
 - 微信：kangfenmao
-- [GitHub Issues](https://github.com/kangfenmao/cherry-studio/issues)
+- [GitHub Issues](https://github.com/CherryHQ/cherry-studio/issues)
 
 感谢您的支持和贡献！我们期待与您一起将 Cherry Studio 打造成更好的产品。

LICENSE

@@ -1,19 +1,16 @@
-## Cherry Studio 用户协议
-
-欢迎使用 Cherry Studio 桌面 AI 客户端工具。请仔细阅读以下协议条款，继续使用本软件即表示您同意本协议内容。
-
 **许可协议**
 
 本软件采用 Apache License 2.0 许可。除 Apache License 2.0 规定的条款外，您在使用 Cherry Studio 时还应遵守以下附加条款：
 
 **一. 商用许可**
 
-1. **免费商用**：用户在不修改代码的情况下，可以免费用于商业目的。
-2. **商业授权**：如果您满足以下任意条件之一，需取得商业授权：
-   1. 对本软件进行二次修改、开发（包括但不限于修改应用名称、logo、代码以及功能）。
-   2. 为企业客户提供多租户服务，且该服务支持 10 人或以上的使用。
-   3. 预装或集成到硬件设备或产品中进行捆绑销售。
-   4. 政府或教育机构的大规模采购项目，特别是涉及安全、数据隐私等敏感需求时。
+在以下任何一种情况下，您需要联系我们并获得明确的书面商业授权后，方可继续使用 Cherry Studio 材料：
+
+1. **修改与衍生**： 您对 Cherry Studio 材料进行修改或基于其进行衍生开发（包括但不限于修改应用名称、Logo、代码、功能、界面，数据等）。
+2. **企业服务**： 在您的企业内部，或为企业客户提供基于 CherryStudio 的服务，且该服务支持 10 人及以上累计用户使用。
+3. **硬件捆绑销售**： 您将 Cherry Studio 预装或集成到硬件设备或产品中进行捆绑销售。
+4. **政府或教育机构大规模采购**： 您的使用场景属于政府或教育机构的大规模采购项目，特别是涉及安全、数据隐私等敏感需求时。
+5. **面向公众的公有云服务**：基于 Cherry Studio，提供面向公众的公有云服务。
 
 **二. 贡献者协议**
 
@@ -33,47 +30,33 @@
 
 ---
 
-根据 Apache 许可证 2.0 版（“许可证”）进行许可；除非符合许可证，否则您不得使用此文件。您可以在以下网址获取许可证副本：
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-除非适用法律要求或书面同意，软件根据许可证分发的内容以“原样”分发，不附带任何明示或暗示的保证或条件。请参阅特定语言管理权限的许可证和许可证下的限制。
-
-## Cherry Studio User Agreement
-
-Welcome to Cherry Studio, a desktop AI client tool. Please read the following agreement carefully. By continuing to use this software, you agree to the terms outlined below.
 
 **License Agreement**
 
-This software is licensed under the **Apache License 2.0**. In addition to the terms of the Apache License 2.0, the following additional terms apply to the use of Cherry Studio:
+This software is licensed under the Apache License 2.0. In addition to the terms stipulated by the Apache License 2.0, you must comply with the following supplementary terms when using Cherry Studio:
 
-**I. Commercial Use License**
+**I. Commercial Licensing**
 
-1. **Free Commercial Use**: Users can use the software for commercial purposes without modifying the code.
-2. **Commercial License Required**: A commercial license is required if any of the following conditions are met:
-   1. You modify, develop, or alter the software, including but not limited to changes to the application name, logo, code, or functionality.
-   2. You provide multi-tenant services to enterprise customers with 10 or more users.
-   3. You pre-install or integrate the software into hardware devices or products and bundle it for sale.
-   4. You are engaging in large-scale procurement for government or educational institutions, especially involving security, data privacy, or other sensitive requirements.
+You must contact us and obtain explicit written commercial authorization to continue using Cherry Studio materials under any of the following circumstances:
+
+1. **Modifications and Derivatives:** You modify Cherry Studio materials or perform derivative development based on them (including but not limited to changing the application’s name, logo, code, functionality, user interface, data, etc.).
+2. **Enterprise Services:** You use Cherry Studio internally within your enterprise, or you provide Cherry Studio-based services for enterprise customers, and such services support cumulative usage by 10 or more users.
+3. **Hardware Bundling and Sales:** You pre-install or integrate Cherry Studio into hardware devices or products for bundled sale.
+4. **Large-scale Procurement by Government or Educational Institutions:** Your usage scenario involves large-scale procurement projects by government or educational institutions, especially in cases involving sensitive requirements such as security and data privacy.
+5. **Public Cloud Services:** You provide public cloud-based product services utilizing Cherry Studio.
 
 **II. Contributor Agreement**
 
-As a contributor to Cherry Studio, you agree to the following:
+As a contributor to Cherry Studio, you must agree to the following terms:
 
-1. **License Adjustment**: The producer reserves the right to adjust the open-source license as needed, making it stricter or more lenient.
-2. **Commercial Use**: Any code you contribute may be used for commercial purposes, including but not limited to cloud business operations.
+1. **License Adjustments:** The producer reserves the right to adjust the open-source license as necessary, making it more strict or permissive.
+2. **Commercial Usage:** Your contributed code may be used commercially, including but not limited to cloud business operations.
 
 **III. Other Terms**
 
-1. The interpretation of these terms is subject to the discretion of Cherry Studio developers.
-2. These terms may be updated, and users will be notified through the software when changes occur.
+1. Cherry Studio developers reserve the right of final interpretation of these agreement terms.
+2. This agreement may be updated according to practical circumstances, and users will be notified of updates through this software.
 
-For any questions or to request a commercial license, please contact the Cherry Studio development team.
+If you have any questions or need to apply for commercial authorization, please contact the Cherry Studio development team.
 
-Apart from the specific conditions mentioned above, all other rights and restrictions follow the Apache License 2.0. Detailed information about the Apache License 2.0 can be found at http://www.apache.org/licenses/LICENSE-2.0.
-
----
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+Other than these specific conditions, all remaining rights and restrictions follow the Apache License 2.0. For more detailed information regarding Apache License 2.0, please visit http://www.apache.org/licenses/LICENSE-2.0.

README.md

@@ -1,11 +1,12 @@
 <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 href="https://github.com/CherryHQ/cherry-studio/releases">
+    <img src="https://github.com/CherryHQ/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://www.producthunt.com/posts/cherry-studio?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cherry&#0045;studio" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=496640&theme=light" alt="Cherry&#0032;Studio - AI&#0032;Chatbots&#0044;&#0032;AI&#0032;Desktop&#0032;Client | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
 </div>
 
 # 🍒 Cherry Studio
@@ -16,6 +17,10 @@ Cherry Studio is a desktop client that supports for multiple LLM providers, avai
 
 ❤️ Like Cherry Studio? Give it a star 🌟 or [Sponsor](docs/sponsor.md) to support the development!
 
+# 📖 Guide
+
+https://docs.cherry-ai.com
+
 # 🌠 Screenshot
 
 ![](https://github.com/user-attachments/assets/28585d83-4bf0-4714-b561-8c7bf57cc600)
@@ -52,6 +57,7 @@ Cherry Studio is a desktop client that supports for multiple LLM providers, avai
 - 🔤 AI-powered Translation
 - 🎯 Drag-and-drop Sorting
 - 🔌 Mini Program Support
+- ⚙️ MCP(Model Context Protocol) Server
 
 5. **Enhanced User Experience**:
 
@@ -76,6 +82,14 @@ Cherry Studio is a desktop client that supports for multiple LLM providers, avai
 - [ ] Voice input and output (AI call)
 - [ ] Data backup supports custom backup content
 
+# 🌈 Theme
+
+- Theme Gallery: https://cherrycss.com  
+- Aero Theme: https://github.com/hakadao/CherryStudio-Aero
+- PaperMaterial Theme: https://github.com/rainoffallingstar/CherryStudio-PaperMaterial
+
+Welcome PR for more themes
+
 # 🖥️ Develop
 
 Refer to the [development documentation](docs/dev.md)
@@ -111,18 +125,14 @@ Thank you for your support and contributions!
 
 # 🚀 Contributors
 
-<a href="https://github.com/kangfenmao/cherry-studio/graphs/contributors">
+<a href="https://github.com/CherryHQ/cherry-studio/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=kangfenmao/cherry-studio" />
 </a>
 <br /><br />
 
 # 🌐 Community
 
-[Telegram](https://t.me/CherryStudioAI) | [Email](mailto:kangfenmao@gmail.com) | [Twitter](https://x.com/kangfenmao)
-
-# 📣 Product Hunt
-
-<a href="https://www.producthunt.com/posts/cherry-studio?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cherry&#0045;studio" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=496640&theme=light" alt="Cherry&#0032;Studio - AI&#0032;Chatbots&#0044;&#0032;AI&#0032;Desktop&#0032;Client | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+[Telegram](https://t.me/CherryStudioAI) | [Email](mailto:support@cherry-ai.com) | [Twitter](https://x.com/kangfenmao)
 
 # ☕ Sponsor
 
@@ -132,6 +142,10 @@ Thank you for your support and contributions!
 
 [LICENSE](./LICENSE)
 
+# ✉️ Contact
+
+yinsenho@cherry-ai.com
+
 # ⭐️ Star History
 
 [![Star History Chart](https://api.star-history.com/svg?repos=kangfenmao/cherry-studio&type=Timeline)](https://star-history.com/#kangfenmao/cherry-studio&Timeline)

dev-app-update.yml

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

docs/README.ja.md

@@ -1,21 +1,26 @@
 <h1 align="center">
-  <a href="https://github.com/kangfenmao/cherry-studio/releases">
-    <img src="https://github.com/kangfenmao/cherry-studio/blob/main/build/icon.png?raw=true" width="150" height="150" alt="banner" />
+  <a href="https://github.com/CherryHQ/cherry-studio/releases">
+    <img src="https://github.com/CherryHQ/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>
+  <a href="https://github.com/CherryHQ/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>
+ <a href="https://www.producthunt.com/posts/cherry-studio?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cherry&#0045;studio" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=496640&theme=light" alt="Cherry&#0032;Studio - AI&#0032;Chatbots&#0044;&#0032;AI&#0032;Desktop&#0032;Client | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
 </div>
 # 🍒 Cherry Studio
 
-Cherry Studioは、複数のLLMプロバイダーをサポートするデスクトップクライアントで、Windows、Mac、Linuxで利用可能です。
+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) をして開発をサポートしてください！❤️
+❤️ Cherry Studio をお気に入りにしましたか？小さな星をつけてください 🌟 または [スポンサー](sponsor.md) をして開発をサポートしてください！❤️
+
+# 📖 ガイド
+
+https://docs.cherry-ai.com
 
 # 🌠 スクリーンショット
 
@@ -53,6 +58,7 @@ Cherry Studioは、複数のLLMプロバイダーをサポートするデスク
 - 🔤 AI による翻訳機能
 - 🎯 ドラッグ＆ドロップによる整理
 - 🔌 ミニプログラム対応
+- ⚙️ MCP（モデルコンテキストプロトコル） サービス
 
 5. **優れたユーザー体験**：
 
@@ -66,7 +72,7 @@ Cherry Studioは、複数のLLMプロバイダーをサポートするデスク
 
 - [x] クイックポップアップ（クリップボードの読み取り、簡単な質問、説明、翻訳、要約）
 - [x] 複数モデルの回答の比較
-- [x] サービスプロバイダーが提供するSSOを使用したログインをサポート
+- [x] サービスプロバイダーが提供する SSO を使用したログインをサポート
 - [x] すべてのモデルがネットワークをサポート
 - [x] 最初の公式バージョンのリリース
 - [ ] 錯誤修復と改善 (開発中...)
@@ -74,24 +80,31 @@ Cherry Studioは、複数のLLMプロバイダーをサポートするデスク
 - [ ] ブラウザ拡張機能（テキストをハイライトして翻訳、要約、ナレッジベースに追加）
 - [ ] iOS & Android クライアント
 - [ ] AIノート
-- [ ] 音声入出力（AIコール）
+- [ ] 音声入出力（AI コール）
 - [ ] データバックアップはカスタムバックアップコンテンツをサポート
 
+# 🌈 テーマ
+
+テーマギャラリー: https://cherrycss.com  
+Aero テーマ: https://github.com/hakadao/CherryStudio-Aero
+
+より多くのテーマのPRを歓迎します
+
 # 🖥️ 開発
 
 参考[開発ドキュメント](dev.md)
 
 # 🤝 貢献
 
-Cherry Studioへの貢献を歓迎します！以下の方法で貢献できます：
+Cherry Studio への貢献を歓迎します！以下の方法で貢献できます：
 
 1. **コードの貢献**：新機能を開発するか、既存のコードを最適化します。
 2. **バグの修正**：見つけたバグを修正します。
-3. **問題の管理**：GitHubの問題を管理するのを手伝います。
+3. **問題の管理**：GitHub の問題を管理するのを手伝います。
 4. **製品デザイン**：デザインの議論に参加します。
 5. **ドキュメントの作成**：ユーザーマニュアルやガイドを改善します。
 6. **コミュニティの参加**：ディスカッションに参加し、ユーザーを支援します。
-7. **使用の促進**：Cherry Studioを広めます。
+7. **使用の促進**：Cherry Studio を広めます。
 
 ## 始め方
 
@@ -100,27 +113,23 @@ Cherry Studioへの貢献を歓迎します！以下の方法で貢献できま
 3. **変更を提出**：変更をコミットしてプッシュします。
 4. **プルリクエストを開く**：変更内容と理由を説明します。
 
-詳細なガイドラインについては、[貢献ガイド](./CONTRIBUTING.md)をご覧ください。
+詳細なガイドラインについては、[貢献ガイド](../CONTRIBUTING.md)をご覧ください。
 
 ご支援と貢献に感謝します！
 
 ## 関連頁版
 
-- [one-api](https://github.com/songquanpeng/one-api):LLM APIの管理・配信システム。OpenAI、Azure、Anthropicなどの主要モデルに対応し、統一APIインターフェースを提供。APIキー管理と再配布に利用可能。
+- [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">
+<a href="https://github.com/CherryHQ/cherry-studio/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=kangfenmao/cherry-studio" />
 </a>
 
 # コミュニティ
 
-[Telegram](https://t.me/CherryStudioAI) | [Email](mailto:kangfenmao@gmail.com) | [Twitter](https://x.com/kangfenmao)
-
-# 📣 プロダクトハント
-
-<a href="https://www.producthunt.com/posts/cherry-studio?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cherry&#0045;studio" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=496640&theme=light" alt="Cherry&#0032;Studio - AI&#0032;Chatbots&#0044;&#0032;AI&#0032;Desktop&#0032;Client | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+[Telegram](https://t.me/CherryStudioAI) | [Email](mailto:support@cherry-ai.com) | [Twitter](https://x.com/kangfenmao)
 
 # スポンサー
 
@@ -130,6 +139,10 @@ Cherry Studioへの貢献を歓迎します！以下の方法で貢献できま
 
 [LICENSE](../LICENSE)
 
+# ✉️ お問い合わせ
+
+yinsenho@cherry-ai.com
+
 # ⭐️ スター履歴
 
 [![Star History Chart](https://api.star-history.com/svg?repos=kangfenmao/cherry-studio&type=Timeline)](https://star-history.com/#kangfenmao/cherry-studio&Timeline)

docs/README.zh.md

@@ -1,13 +1,15 @@
 <h1 align="center">
-  <a href="https://github.com/kangfenmao/cherry-studio/releases">
-    <img src="https://github.com/kangfenmao/cherry-studio/blob/main/build/icon.png?raw=true" width="150" height="150" alt="banner" />
+  <a href="https://github.com/CherryHQ/cherry-studio/releases">
+    <img src="https://github.com/CherryHQ/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>
+  <a href="https://github.com/CherryHQ/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>
+ <a href="https://www.producthunt.com/posts/cherry-studio?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cherry&#0045;studio" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=496640&theme=light" alt="Cherry&#0032;Studio - AI&#0032;Chatbots&#0044;&#0032;AI&#0032;Desktop&#0032;Client | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
 </div>
+
 # 🍒 Cherry Studio
 
 Cherry Studio 是一款支持多个大语言模型（LLM）服务商的桌面客户端，兼容 Windows、Mac 和 Linux 系统。
@@ -16,6 +18,10 @@ Cherry Studio 是一款支持多个大语言模型（LLM）服务商的桌面客
 
 ❤️ 喜欢 Cherry Studio? 点亮小星星 🌟 或 [赞助开发者](sponsor.md)! ❤️
 
+# 📖 使用教程
+
+https://docs.cherry-ai.com
+
 # 🌠 界面
 
 ![](https://github.com/user-attachments/assets/28585d83-4bf0-4714-b561-8c7bf57cc600)
@@ -52,6 +58,7 @@ Cherry Studio 是一款支持多个大语言模型（LLM）服务商的桌面客
 - 🔤 AI 驱动的翻译功能
 - 🎯 拖拽排序
 - 🔌 小程序支持
+- ⚙️ MCP(模型上下文协议) 服务
 
 5. **优质使用体验**：
 
@@ -63,7 +70,7 @@ Cherry Studio 是一款支持多个大语言模型（LLM）服务商的桌面客
 
 # 📝 待辦事項
 
-- [x] 快捷弹窗 (读取剪贴板、快速提问、解释、翻译、总结）
+- [x] 快捷弹窗（读取剪贴板、快速提问、解释、翻译、总结）
 - [x] 多模型回答对比
 - [x] 支持使用服务供应商提供的 SSO 进行登入
 - [x] 全部模型支持连网（开发中...）
@@ -76,6 +83,13 @@ Cherry Studio 是一款支持多个大语言模型（LLM）服务商的桌面客
 - [ ] 语音输入输出（AI 通话）
 - [ ] 数据备份支持自定义备份内容
 
+# 🌈 主题
+
+主题库：https://cherrycss.com  
+Aero 主题：https://github.com/hakadao/CherryStudio-Aero
+
+欢迎 PR 更多主题
+
 # 🖥️ 开发
 
 参考[开发文档](dev.md)
@@ -99,28 +113,24 @@ Cherry Studio 是一款支持多个大语言模型（LLM）服务商的桌面客
 3. **提交更改**：提交并推送您的更改。
 4. **打开 Pull Request**：描述您的更改和原因。
 
-有关更详细的指南，请参阅我们的 [贡献指南](./CONTRIBUTING.md)。
+有关更详细的指南，请参阅我们的 [贡献指南](../CONTRIBUTING.md)。
 
 感谢您的支持和贡献！
 
 ## 相关项目
 
-- [one-api](https://github.com/songquanpeng/one-api):LLM API管理及分发系统，支持OpenAI、Azure、Anthropic等主流模型，统一API接口，可用于密钥管理与二次分发。
+- [one-api](https://github.com/songquanpeng/one-api)：LLM API 管理及分发系统，支持 OpenAI、Azure、Anthropic 等主流模型，统一 API 接口，可用于密钥管理与二次分发。
 
 # 🚀 贡献者
 
-<a href="https://github.com/kangfenmao/cherry-studio/graphs/contributors">
+<a href="https://github.com/CherryHQ/cherry-studio/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=kangfenmao/cherry-studio" />
 </a>
 <br /><br />
 
 # 🌐 社区
 
-[Telegram](https://t.me/CherryStudioAI) | [Email](mailto:kangfenmao@gmail.com) | [Twitter](https://x.com/kangfenmao)
-
-# 📣 产品猎人
-
-<a href="https://www.producthunt.com/posts/cherry-studio?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cherry&#0045;studio" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=496640&theme=light" alt="Cherry&#0032;Studio - AI&#0032;Chatbots&#0044;&#0032;AI&#0032;Desktop&#0032;Client | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+[Telegram](https://t.me/CherryStudioAI) | [Email](mailto:support@cherry-ai.com) | [Twitter](https://x.com/kangfenmao)
 
 # ☕ 赞助
 
@@ -130,6 +140,10 @@ Cherry Studio 是一款支持多个大语言模型（LLM）服务商的桌面客
 
 [LICENSE](../LICENSE)
 
+# ✉️ 联系我们
+
+yinsenho@cherry-ai.com
+
 # ⭐️ Star 记录
 
 [![Star History Chart](https://api.star-history.com/svg?repos=kangfenmao/cherry-studio&type=Timeline)](https://star-history.com/#kangfenmao/cherry-studio&Timeline)

electron-builder.yml

@@ -72,12 +72,18 @@ linux:
   maintainer: electronjs.org
   category: Utility
 publish:
-  provider: generic
-  url: https://cherrystudio.ocool.online
+  # provider: generic
+  # url: https://cherrystudio.ocool.online
+  provider: github
+  repo: cherry-studio
+  owner: CherryHQ
 electronDownload:
   mirror: https://npmmirror.com/mirrors/electron/
 afterPack: scripts/after-pack.js
 afterSign: scripts/notarize.js
 releaseInfo:
   releaseNotes: |
-    修复公式渲染问题
+    小程序支持多开
+    支持 GPT-4o 图像生成
+    修复 MCP 服务器无法使用问题
+    修复升级导致旧版本数据丢失问题

electron.vite.config.ts

@@ -12,17 +12,18 @@ export default defineConfig({
     plugins: [
       externalizeDepsPlugin({
         exclude: [
-          '@llm-tools/embedjs',
-          '@llm-tools/embedjs-openai',
-          '@llm-tools/embedjs-loader-web',
-          '@llm-tools/embedjs-loader-markdown',
-          '@llm-tools/embedjs-loader-msoffice',
-          '@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'
+          '@cherrystudio/embedjs',
+          '@cherrystudio/embedjs-openai',
+          '@cherrystudio/embedjs-loader-web',
+          '@cherrystudio/embedjs-loader-markdown',
+          '@cherrystudio/embedjs-loader-msoffice',
+          '@cherrystudio/embedjs-loader-xml',
+          '@cherrystudio/embedjs-loader-pdf',
+          '@cherrystudio/embedjs-loader-sitemap',
+          '@cherrystudio/embedjs-libsql',
+          '@cherrystudio/embedjs-loader-image',
+          'p-queue',
+          'webdav'
         ]
       }),
       ...visualizerPlugin('main')
@@ -69,7 +70,7 @@ export default defineConfig({
       }
     },
     optimizeDeps: {
-      exclude: ['chunk-PZ64DZKH.js', 'chunk-JMKENWIY.js', 'chunk-UXYB6GHG.js', 'chunk-ALDIEZMG.js']
+      exclude: ['chunk-PZ64DZKH.js', 'chunk-JMKENWIY.js', 'chunk-UXYB6GHG.js', 'chunk-ALDIEZMG.js', 'chunk-4X6ZJEXY.js']
     }
   }
 })

eslint.config.mjs

@@ -0,0 +1,68 @@
+import electronConfigPrettier from '@electron-toolkit/eslint-config-prettier'
+import tseslint from '@electron-toolkit/eslint-config-ts'
+import eslint from '@eslint/js'
+import eslintReact from '@eslint-react/eslint-plugin'
+import { defineConfig } from 'eslint/config'
+import reactHooks from 'eslint-plugin-react-hooks'
+import simpleImportSort from 'eslint-plugin-simple-import-sort'
+import unusedImports from 'eslint-plugin-unused-imports'
+
+export default defineConfig([
+  eslint.configs.recommended,
+  tseslint.configs.recommended,
+  electronConfigPrettier,
+  eslintReact.configs['recommended-typescript'],
+  reactHooks.configs['recommended-latest'],
+  {
+    plugins: {
+      'simple-import-sort': simpleImportSort,
+      'unused-imports': unusedImports
+    },
+    rules: {
+      '@typescript-eslint/explicit-function-return-type': 'off',
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-non-null-asserted-optional-chain': 'off',
+      'simple-import-sort/imports': 'error',
+      'simple-import-sort/exports': 'error',
+      'unused-imports/no-unused-imports': 'error',
+      '@eslint-react/no-prop-types': 'error',
+      'prettier/prettier': ['error', { endOfLine: 'auto' }]
+    }
+  },
+  // Configuration for ensuring compatibility with the original ESLint(8.x) rules
+  ...[
+    {
+      rules: {
+        '@typescript-eslint/no-require-imports': 'off',
+        '@typescript-eslint/no-unused-vars': ['error', { caughtErrors: 'none' }],
+        '@typescript-eslint/no-unused-expressions': 'off',
+        '@typescript-eslint/no-empty-object-type': 'off',
+        '@eslint-react/hooks-extra/no-direct-set-state-in-use-effect': 'off',
+        '@eslint-react/web-api/no-leaked-event-listener': 'off',
+        '@eslint-react/web-api/no-leaked-timeout': 'off',
+        '@eslint-react/no-unknown-property': 'off',
+        '@eslint-react/no-nested-component-definitions': 'off',
+        '@eslint-react/dom/no-dangerously-set-innerhtml': 'off',
+        '@eslint-react/no-array-index-key': 'off',
+        '@eslint-react/no-unstable-default-props': 'off',
+        '@eslint-react/no-unstable-context-value': 'off',
+        '@eslint-react/hooks-extra/prefer-use-state-lazy-initialization': 'off',
+        '@eslint-react/hooks-extra/no-unnecessary-use-prefix': 'off',
+        '@eslint-react/no-children-to-array': 'off'
+      }
+    }
+  ],
+  {
+    ignores: [
+      'node_modules/**',
+      'build/**',
+      'dist/**',
+      'out/**',
+      'local/**',
+      '.yarn/**',
+      '.gitignore',
+      'scripts/cloudflare-worker.js',
+      'src/main/integration/nutstore/sso/lib/**'
+    ]
+  }
+])

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "1.1.4",
+  "version": "1.1.17",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",
@@ -50,56 +50,64 @@
     "prepare": "husky"
   },
   "dependencies": {
-    "@agentic/exa": "^7.3.3",
-    "@agentic/searxng": "^7.3.3",
-    "@agentic/tavily": "^7.3.3",
-    "@electron-toolkit/preload": "^3.0.0",
+    "@cherrystudio/embedjs": "^0.1.28",
+    "@cherrystudio/embedjs-libsql": "^0.1.28",
+    "@cherrystudio/embedjs-loader-csv": "^0.1.28",
+    "@cherrystudio/embedjs-loader-image": "^0.1.28",
+    "@cherrystudio/embedjs-loader-markdown": "^0.1.28",
+    "@cherrystudio/embedjs-loader-msoffice": "^0.1.28",
+    "@cherrystudio/embedjs-loader-pdf": "^0.1.28",
+    "@cherrystudio/embedjs-loader-sitemap": "^0.1.28",
+    "@cherrystudio/embedjs-loader-web": "^0.1.28",
+    "@cherrystudio/embedjs-loader-xml": "^0.1.28",
+    "@cherrystudio/embedjs-openai": "^0.1.28",
     "@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",
+    "@google/generative-ai": "^0.24.0",
+    "@langchain/community": "^0.3.36",
     "@notionhq/client": "^2.2.15",
     "@tryfabric/martian": "^1.2.4",
     "@types/react-infinite-scroll-component": "^5.0.0",
+    "@xyflow/react": "^12.4.4",
     "adm-zip": "^0.5.16",
-    "apache-arrow": "^18.1.0",
     "docx": "^9.0.2",
     "electron-log": "^5.1.5",
     "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",
+    "fast-xml-parser": "^5.0.9",
     "fetch-socks": "^1.3.2",
     "fs-extra": "^11.2.0",
     "markdown-it": "^14.1.0",
     "officeparser": "^4.1.1",
-    "p-queue": "^8.1.0",
-    "tokenx": "^0.4.1",
+    "proxy-agent": "^6.5.0",
+    "tar": "^7.4.3",
     "undici": "^7.4.0",
-    "webdav": "4.11.4",
+    "webdav": "^5.8.0",
     "zipread": "^1.3.3"
   },
   "devDependencies": {
+    "@agentic/exa": "^7.3.3",
+    "@agentic/searxng": "^7.3.3",
+    "@agentic/tavily": "^7.3.3",
+    "@ant-design/v5-patch-for-react-19": "^1.0.3",
     "@anthropic-ai/sdk": "^0.38.0",
-    "@electron-toolkit/eslint-config-prettier": "^2.0.0",
-    "@electron-toolkit/eslint-config-ts": "^1.0.1",
+    "@electron-toolkit/eslint-config-prettier": "^3.0.0",
+    "@electron-toolkit/eslint-config-ts": "^3.0.0",
+    "@electron-toolkit/preload": "^3.0.0",
     "@electron-toolkit/tsconfig": "^1.0.1",
+    "@emotion/is-prop-valid": "^1.3.1",
+    "@eslint-react/eslint-plugin": "^1.36.1",
+    "@eslint/js": "^9.22.0",
+    "@google/genai": "^0.4.0",
     "@hello-pangea/dnd": "^16.6.0",
     "@kangfenmao/keyv-storage": "^0.1.0",
-    "@llm-tools/embedjs-loader-image": "^0.1.28",
+    "@modelcontextprotocol/sdk": "^1.8.0",
+    "@notionhq/client": "^2.2.15",
     "@reduxjs/toolkit": "^2.2.5",
     "@tavily/core": "patch:@tavily/core@npm%3A0.3.1#~/.yarn/patches/@tavily-core-npm-0.3.1-fe69bf2bea.patch",
+    "@tryfabric/martian": "^1.2.4",
     "@types/adm-zip": "^0",
     "@types/fs-extra": "^11",
     "@types/lodash": "^4.17.5",
@@ -107,8 +115,8 @@
     "@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": "^19.0.12",
+    "@types/react-dom": "^19.0.4",
     "@types/react-infinite-scroll-component": "^5.0.0",
     "@types/tinycolor2": "^1",
     "@vitejs/plugin-react": "^4.2.1",
@@ -128,21 +136,23 @@
     "electron-vite": "^2.3.0",
     "emittery": "^1.0.3",
     "emoji-picker-element": "^1.22.1",
-    "eslint": "^8.56.0",
-    "eslint-plugin-react": "^7.34.3",
-    "eslint-plugin-react-hooks": "^4.6.2",
+    "eslint": "^9.22.0",
+    "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
-    "eslint-plugin-unused-imports": "^4.0.0",
+    "eslint-plugin-unused-imports": "^4.1.4",
     "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",
+    "npx-scope-finder": "^1.2.0",
     "openai": "patch:openai@npm%3A4.77.3#~/.yarn/patches/openai-npm-4.77.3-59c6d42e7a.patch",
+    "p-queue": "^8.1.0",
     "prettier": "^3.5.3",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "rc-virtual-list": "^3.18.5",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "react-hotkeys-hook": "^4.6.1",
     "react-i18next": "^14.1.2",
     "react-infinite-scroll-component": "^6.1.0",
@@ -156,6 +166,7 @@
     "rehype-katex": "^7.0.1",
     "rehype-mathjax": "^7.0.0",
     "rehype-raw": "^7.0.0",
+    "remark-cjk-friendly": "^1.1.0",
     "remark-gfm": "^4.0.0",
     "remark-math": "^6.0.0",
     "rollup-plugin-visualizer": "^5.12.0",
@@ -164,19 +175,17 @@
     "string-width": "^7.2.0",
     "styled-components": "^6.1.11",
     "tinycolor2": "^1.6.0",
+    "tokenx": "^0.4.1",
     "typescript": "^5.6.2",
     "uuid": "^10.0.0",
     "vite": "^5.0.12"
   },
-  "peerDependencies": {
-    "react": "^17.0.0 || ^18.0.0",
-    "react-dom": "^17.0.0 || ^18.0.0"
-  },
   "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"
+    "openai@npm:^4.77.0": "patch:openai@npm%3A4.77.3#~/.yarn/patches/openai-npm-4.77.3-59c6d42e7a.patch",
+    "pkce-challenge@npm:^4.1.0": "patch:pkce-challenge@npm%3A4.1.0#~/.yarn/patches/pkce-challenge-npm-4.1.0-fbc51695a3.patch"
   },
   "packageManager": "yarn@4.6.0",
   "lint-staged": {

packages/shared/config/constant.ts

@@ -88,7 +88,7 @@ export const textExts = [
   '.ctp', // CakePHP 视图文件
   '.cfm', // ColdFusion 标记语言文件
   '.cfc', // ColdFusion 组件文件
-  '.m', // Objective-C 源文件
+  '.m', // Objective-C 或 MATLAB 源文件
   '.mm', // Objective-C++ 源文件
   '.gradle', // Gradle 构建文件
   '.groovy', // Gradle 构建文件
@@ -103,7 +103,35 @@ export const textExts = [
   '.cxx', // C++ 源文件
   '.cppm', // C++20 模块接口文件
   '.ipp', // 模板实现文件
-  '.ixx' // C++20 模块实现文件
+  '.ixx', // C++20 模块实现文件
+  '.f90', // Fortran 90 源文件
+  '.f', // Fortran 固定格式源代码文件
+  '.f03', // Fortran 2003+ 源代码文件
+  '.ahk', // AutoHotKey 语言文件
+  '.tcl', // Tcl 脚本
+  '.do', // Questa 或 Modelsim Tcl 脚本
+  '.v', // Verilog 源文件
+  '.sv', // SystemVerilog 源文件
+  '.svh', // SystemVerilog 头文件
+  '.vhd', // VHDL 源文件
+  '.vhdl', // VHDL 源文件
+  '.lef', // Library Exchange Format
+  '.def', // Design Exchange Format
+  '.edif', // Electronic Design Interchange Format
+  '.sdf', // Standard Delay Format
+  '.sdc', // Synopsys Design Constraints
+  '.xdc', // Xilinx Design Constraints
+  '.rpt', // 报告文件
+  '.lisp', // Lisp 脚本
+  '.il', // Cadence SKILL 脚本
+  '.ils', // Cadence SKILL++ 脚本
+  '.sp', // SPICE netlist 文件
+  '.spi', // SPICE netlist 文件
+  '.cir', // SPICE netlist 文件
+  '.net', // SPICE netlist 文件
+  '.scs', // Spectre netlist 文件
+  '.asc', // LTspice netlist schematic 文件
+  '.tf' // Technology File
 ]
 
 export const ZOOM_SHORTCUTS = [

packages/shared/config/nutstore.ts

@@ -0,0 +1 @@
+export const NUTSTORE_HOST = 'https://dav.jianguoyun.com/dav'

resources/scripts/download.js

@@ -0,0 +1,35 @@
+const https = require('https')
+const fs = require('fs')
+
+/**
+ * Downloads a file from a URL with redirect handling
+ * @param {string} url The URL to download from
+ * @param {string} destinationPath The path to save the file to
+ * @returns {Promise<void>} Promise that resolves when download is complete
+ */
+async function downloadWithRedirects(url, destinationPath) {
+  return new Promise((resolve, reject) => {
+    const request = (url) => {
+      https
+        .get(url, (response) => {
+          if (response.statusCode == 301 || response.statusCode == 302) {
+            request(response.headers.location)
+            return
+          }
+          if (response.statusCode !== 200) {
+            reject(new Error(`Download failed: ${response.statusCode} ${response.statusMessage}`))
+            return
+          }
+          const file = fs.createWriteStream(destinationPath)
+          response.pipe(file)
+          file.on('finish', () => resolve())
+        })
+        .on('error', (err) => {
+          reject(err)
+        })
+    }
+    request(url)
+  })
+}
+
+module.exports = { downloadWithRedirects }

resources/scripts/install-bun.js

@@ -0,0 +1,171 @@
+const fs = require('fs')
+const path = require('path')
+const os = require('os')
+const { execSync } = require('child_process')
+const AdmZip = require('adm-zip')
+const { downloadWithRedirects } = require('./download')
+
+// Base URL for downloading bun binaries
+const BUN_RELEASE_BASE_URL = 'https://github.com/oven-sh/bun/releases/download'
+const DEFAULT_BUN_VERSION = '1.2.5' // Default fallback version
+
+// Mapping of platform+arch to binary package name
+const BUN_PACKAGES = {
+  'darwin-arm64': 'bun-darwin-aarch64.zip',
+  'darwin-x64': 'bun-darwin-x64.zip',
+  'win32-x64': 'bun-windows-x64.zip',
+  'win32-x64-baseline': 'bun-windows-x64-baseline.zip',
+  'linux-x64': 'bun-linux-x64.zip',
+  'linux-x64-baseline': 'bun-linux-x64-baseline.zip',
+  'linux-arm64': 'bun-linux-aarch64.zip',
+  // MUSL variants
+  'linux-musl-x64': 'bun-linux-x64-musl.zip',
+  'linux-musl-x64-baseline': 'bun-linux-x64-musl-baseline.zip',
+  'linux-musl-arm64': 'bun-linux-aarch64-musl.zip'
+}
+
+/**
+ * Downloads and extracts the bun binary for the specified platform and architecture
+ * @param {string} platform Platform to download for (e.g., 'darwin', 'win32', 'linux')
+ * @param {string} arch Architecture to download for (e.g., 'x64', 'arm64')
+ * @param {string} version Version of bun to download
+ * @param {boolean} isMusl Whether to use MUSL variant for Linux
+ * @param {boolean} isBaseline Whether to use baseline variant
+ */
+async function downloadBunBinary(platform, arch, version = DEFAULT_BUN_VERSION, isMusl = false, isBaseline = false) {
+  let platformKey = isMusl ? `${platform}-musl-${arch}` : `${platform}-${arch}`
+  if (isBaseline) {
+    platformKey += '-baseline'
+  }
+  const packageName = BUN_PACKAGES[platformKey]
+
+  if (!packageName) {
+    console.error(`No binary available for ${platformKey}`)
+    return false
+  }
+
+  // Create output directory structure
+  const binDir = path.join(os.homedir(), '.cherrystudio', 'bin')
+  // Ensure directories exist
+  fs.mkdirSync(binDir, { recursive: true })
+
+  // Download URL for the specific binary
+  const downloadUrl = `${BUN_RELEASE_BASE_URL}/bun-v${version}/${packageName}`
+  const tempdir = os.tmpdir()
+  // Create a temporary file for the downloaded binary
+  const tempFilename = path.join(tempdir, packageName)
+
+  try {
+    console.log(`Downloading bun ${version} for ${platformKey}...`)
+    console.log(`URL: ${downloadUrl}`)
+
+    // Use the new download function
+    await downloadWithRedirects(downloadUrl, tempFilename)
+
+    // Extract the zip file using adm-zip
+    console.log(`Extracting ${packageName} to ${binDir}...`)
+    const zip = new AdmZip(tempFilename)
+    zip.extractAllTo(tempdir, true)
+
+    // Move files using Node.js fs
+    const sourceDir = path.join(tempdir, packageName.split('.')[0])
+    const files = fs.readdirSync(sourceDir)
+
+    for (const file of files) {
+      const sourcePath = path.join(sourceDir, file)
+      const destPath = path.join(binDir, file)
+
+      fs.copyFileSync(sourcePath, destPath)
+      fs.unlinkSync(sourcePath)
+
+      // Set executable permissions for non-Windows platforms
+      if (platform !== 'win32') {
+        try {
+          // 755 permission: rwxr-xr-x
+          fs.chmodSync(destPath, '755')
+        } catch (error) {
+          console.warn(`Warning: Failed to set executable permissions: ${error.message}`)
+        }
+      }
+    }
+
+    // Clean up
+    fs.unlinkSync(tempFilename)
+    fs.rmSync(sourceDir, { recursive: true })
+
+    console.log(`Successfully installed bun ${version} for ${platformKey}`)
+    return true
+  } catch (error) {
+    console.error(`Error installing bun for ${platformKey}: ${error.message}`)
+    // Clean up temporary file if it exists
+    if (fs.existsSync(tempFilename)) {
+      fs.unlinkSync(tempFilename)
+    }
+
+    // Check if binDir is empty and remove it if so
+    try {
+      const files = fs.readdirSync(binDir)
+      if (files.length === 0) {
+        fs.rmSync(binDir, { recursive: true })
+        console.log(`Removed empty directory: ${binDir}`)
+      }
+    } catch (cleanupError) {
+      console.warn(`Warning: Failed to clean up directory: ${cleanupError.message}`)
+    }
+
+    return false
+  }
+}
+
+/**
+ * Detects current platform and architecture
+ */
+function detectPlatformAndArch() {
+  const platform = os.platform()
+  const arch = os.arch()
+  const isMusl = platform === 'linux' && detectIsMusl()
+  const isBaseline = platform === 'win32'
+
+  return { platform, arch, isMusl, isBaseline }
+}
+
+/**
+ * Attempts to detect if running on MUSL libc
+ */
+function detectIsMusl() {
+  try {
+    // Simple check for Alpine Linux which uses MUSL
+    const output = execSync('cat /etc/os-release').toString()
+    return output.toLowerCase().includes('alpine')
+  } catch (error) {
+    return false
+  }
+}
+
+/**
+ * Main function to install bun
+ */
+async function installBun() {
+  // Get the latest version if no specific version is provided
+  const version = DEFAULT_BUN_VERSION
+  console.log(`Using bun version: ${version}`)
+
+  const { platform, arch, isMusl, isBaseline } = detectPlatformAndArch()
+
+  console.log(
+    `Installing bun ${version} for ${platform}-${arch}${isMusl ? ' (MUSL)' : ''}${isBaseline ? ' (baseline)' : ''}...`
+  )
+
+  await downloadBunBinary(platform, arch, version, isMusl, isBaseline)
+}
+
+// Run the installation
+installBun()
+  .then(() => {
+    console.log('Installation successful')
+    process.exit(0)
+  })
+  .catch((error) => {
+    console.error('Installation failed:', error)
+    process.exit(1)
+  })

resources/scripts/install-uv.js

@@ -0,0 +1,181 @@
+const fs = require('fs')
+const path = require('path')
+const os = require('os')
+const { execSync } = require('child_process')
+const tar = require('tar')
+const AdmZip = require('adm-zip')
+const { downloadWithRedirects } = require('./download')
+
+// Base URL for downloading uv binaries
+const UV_RELEASE_BASE_URL = 'https://github.com/astral-sh/uv/releases/download'
+const DEFAULT_UV_VERSION = '0.6.6'
+
+// Mapping of platform+arch to binary package name
+const UV_PACKAGES = {
+  'darwin-arm64': 'uv-aarch64-apple-darwin.tar.gz',
+  'darwin-x64': 'uv-x86_64-apple-darwin.tar.gz',
+  'win32-arm64': 'uv-aarch64-pc-windows-msvc.zip',
+  'win32-ia32': 'uv-i686-pc-windows-msvc.zip',
+  'win32-x64': 'uv-x86_64-pc-windows-msvc.zip',
+  'linux-arm64': 'uv-aarch64-unknown-linux-gnu.tar.gz',
+  'linux-ia32': 'uv-i686-unknown-linux-gnu.tar.gz',
+  'linux-ppc64': 'uv-powerpc64-unknown-linux-gnu.tar.gz',
+  'linux-ppc64le': 'uv-powerpc64le-unknown-linux-gnu.tar.gz',
+  'linux-s390x': 'uv-s390x-unknown-linux-gnu.tar.gz',
+  'linux-x64': 'uv-x86_64-unknown-linux-gnu.tar.gz',
+  'linux-armv7l': 'uv-armv7-unknown-linux-gnueabihf.tar.gz',
+  // MUSL variants
+  'linux-musl-arm64': 'uv-aarch64-unknown-linux-musl.tar.gz',
+  'linux-musl-ia32': 'uv-i686-unknown-linux-musl.tar.gz',
+  'linux-musl-x64': 'uv-x86_64-unknown-linux-musl.tar.gz',
+  'linux-musl-armv6l': 'uv-arm-unknown-linux-musleabihf.tar.gz',
+  'linux-musl-armv7l': 'uv-armv7-unknown-linux-musleabihf.tar.gz'
+}
+
+/**
+ * Downloads and extracts the uv binary for the specified platform and architecture
+ * @param {string} platform Platform to download for (e.g., 'darwin', 'win32', 'linux')
+ * @param {string} arch Architecture to download for (e.g., 'x64', 'arm64')
+ * @param {string} version Version of uv to download
+ * @param {boolean} isMusl Whether to use MUSL variant for Linux
+ */
+async function downloadUvBinary(platform, arch, version = DEFAULT_UV_VERSION, isMusl = false) {
+  const platformKey = isMusl ? `${platform}-musl-${arch}` : `${platform}-${arch}`
+  const packageName = UV_PACKAGES[platformKey]
+
+  if (!packageName) {
+    console.error(`No binary available for ${platformKey}`)
+    return false
+  }
+
+  // Create output directory structure
+  const binDir = path.join(os.homedir(), '.cherrystudio', 'bin')
+  // Ensure directories exist
+  fs.mkdirSync(binDir, { recursive: true })
+
+  // Download URL for the specific binary
+  const downloadUrl = `${UV_RELEASE_BASE_URL}/${version}/${packageName}`
+  const tempdir = os.tmpdir()
+  const tempFilename = path.join(tempdir, packageName)
+
+  try {
+    console.log(`Downloading uv ${version} for ${platformKey}...`)
+    console.log(`URL: ${downloadUrl}`)
+
+    await downloadWithRedirects(downloadUrl, tempFilename)
+
+    console.log(`Extracting ${packageName} to ${binDir}...`)
+
+    // 根据文件扩展名选择解压方法
+    if (packageName.endsWith('.zip')) {
+      // 使用 adm-zip 处理 zip 文件
+      const zip = new AdmZip(tempFilename)
+      zip.extractAllTo(binDir, true)
+      fs.unlinkSync(tempFilename)
+      console.log(`Successfully installed uv ${version} for ${platform}-${arch}`)
+      return true
+    } else {
+      // tar.gz 文件的处理保持不变
+      await tar.x({
+        file: tempFilename,
+        cwd: tempdir,
+        z: true
+      })
+
+      // Move files using Node.js fs
+      const sourceDir = path.join(tempdir, packageName.split('.')[0])
+      const files = fs.readdirSync(sourceDir)
+      for (const file of files) {
+        const sourcePath = path.join(sourceDir, file)
+        const destPath = path.join(binDir, file)
+        fs.copyFileSync(sourcePath, destPath)
+        fs.unlinkSync(sourcePath)
+
+        // Set executable permissions for non-Windows platforms
+        if (platform !== 'win32') {
+          try {
+            fs.chmodSync(destPath, '755')
+          } catch (error) {
+            console.warn(`Warning: Failed to set executable permissions: ${error.message}`)
+          }
+        }
+      }
+
+      // Clean up
+      fs.unlinkSync(tempFilename)
+      fs.rmSync(sourceDir, { recursive: true })
+    }
+
+    console.log(`Successfully installed uv ${version} for ${platform}-${arch}`)
+    return true
+  } catch (error) {
+    console.error(`Error installing uv for ${platformKey}: ${error.message}`)
+
+    if (fs.existsSync(tempFilename)) {
+      fs.unlinkSync(tempFilename)
+    }
+
+    // Check if binDir is empty and remove it if so
+    try {
+      const files = fs.readdirSync(binDir)
+      if (files.length === 0) {
+        fs.rmSync(binDir, { recursive: true })
+        console.log(`Removed empty directory: ${binDir}`)
+      }
+    } catch (cleanupError) {
+      console.warn(`Warning: Failed to clean up directory: ${cleanupError.message}`)
+    }
+
+    return false
+  }
+}
+
+/**
+ * Detects current platform and architecture
+ */
+function detectPlatformAndArch() {
+  const platform = os.platform()
+  const arch = os.arch()
+  const isMusl = platform === 'linux' && detectIsMusl()
+
+  return { platform, arch, isMusl }
+}
+
+/**
+ * Attempts to detect if running on MUSL libc
+ */
+function detectIsMusl() {
+  try {
+    // Simple check for Alpine Linux which uses MUSL
+    const output = execSync('cat /etc/os-release').toString()
+    return output.toLowerCase().includes('alpine')
+  } catch (error) {
+    return false
+  }
+}
+
+/**
+ * Main function to install uv
+ */
+async function installUv() {
+  // Get the latest version if no specific version is provided
+  const version = DEFAULT_UV_VERSION
+  console.log(`Using uv version: ${version}`)
+
+  const { platform, arch, isMusl } = detectPlatformAndArch()
+
+  console.log(`Installing uv ${version} for ${platform}-${arch}${isMusl ? ' (MUSL)' : ''}...`)
+
+  await downloadUvBinary(platform, arch, version, isMusl)
+}
+
+// Run the installation
+installUv()
+  .then(() => {
+    console.log('Installation successful')
+    process.exit(0)
+  })
+  .catch((error) => {
+    console.error('Installation failed:', error)
+    process.exit(1)
+  })

scripts/update-i18n.ts

@@ -0,0 +1,130 @@
+/**
+ * OCOOL_API_KEY=sk-abcxxxxxxxxxxxxxxxxxxxxxxx123 ts-node scripts/update-i18n.ts
+ */
+
+// OCOOL API KEY
+const OCOOL_API_KEY = process.env.OCOOL_API_KEY
+
+const INDEX = [
+  //         语言的名称          代码            用来翻译的模型
+  { name: 'France', code: 'fr-fr', model: 'qwen2.5-32b-instruct' },
+  { name: 'Spanish', code: 'es-es', model: 'qwen2.5-32b-instruct' },
+  { name: 'Portuguese', code: 'pt-pt', model: 'qwen2.5-72b-instruct' },
+  { name: 'Greek', code: 'el-gr', model: 'qwen-turbo' }
+]
+
+const fs = require('fs')
+import OpenAI from 'openai'
+
+const zh = JSON.parse(fs.readFileSync('src/renderer/src/i18n/locales/zh-cn.json', 'utf8')) as object
+
+const openai = new OpenAI({
+  apiKey: OCOOL_API_KEY,
+  baseURL: 'https://one.ocoolai.com/v1'
+})
+
+// 递归遍历翻译
+async function translate(zh: object, obj: object, target: string, model: string, updateFile) {
+  const texts: { [key: string]: string } = {}
+  for (const e in zh) {
+    if (typeof zh[e] == 'object') {
+      // 遍历下一层
+      if (!obj[e] || typeof obj[e] != 'object') obj[e] = {}
+      await translate(zh[e], obj[e], target, model, updateFile)
+    } else {
+      // 加入到本层待翻译列表
+      if (!obj[e] || typeof obj[e] != 'string') {
+        texts[e] = zh[e]
+      }
+    }
+  }
+  if (Object.keys(texts).length > 0) {
+    const completion = await openai.chat.completions.create({
+      model: model,
+      response_format: { type: 'json_object' },
+      messages: [
+        {
+          role: 'user',
+          content: `
+You are a robot specifically designed for translation tasks. As a model that has been extensively fine-tuned on Russian language corpora, you are proficient in using the Russian language.
+Now, please output the translation based on the input content. The input will include both Chinese and English key values, and you should output the corresponding key values in the Russian language.
+When translating, ensure that no key value is omitted, and maintain the accuracy and fluency of the translation. Pay attention to the capitalization rules in the output to match the source text, and especially pay attention to whether to capitalize the first letter of each word except for prepositions. For strings containing \`{{value}}\`, ensure that the format is not disrupted.
+Output in JSON.
+######################################################
+INPUT
+######################################################
+${JSON.stringify({
+  confirm: '确定要备份数据吗？',
+  select_model: '选择模型',
+  title: '文件',
+  deeply_thought: '已深度思考（用时 {{secounds}} 秒）'
+})}
+######################################################
+MAKE SURE TO OUTPUT IN Russian. DO NOT OUTPUT IN UNSPECIFIED LANGUAGE.
+######################################################
+                `
+        },
+        {
+          role: 'assistant',
+          content: JSON.stringify({
+            confirm: 'Подтвердите резервное копирование данных?',
+            select_model: 'Выберите Модель',
+            title: 'Файл',
+            deeply_thought: 'Глубоко продумано (заняло {{seconds}} секунд)'
+          })
+        },
+        {
+          role: 'user',
+          content: `
+You are a robot specifically designed for translation tasks. As a model that has been extensively fine-tuned on ${target} language corpora, you are proficient in using the ${target} language.
+Now, please output the translation based on the input content. The input will include both Chinese and English key values, and you should output the corresponding key values in the ${target} language.
+When translating, ensure that no key value is omitted, and maintain the accuracy and fluency of the translation. Pay attention to the capitalization rules in the output to match the source text, and especially pay attention to whether to capitalize the first letter of each word except for prepositions. For strings containing \`{{value}}\`, ensure that the format is not disrupted.
+Output in JSON.
+######################################################
+INPUT
+######################################################
+${JSON.stringify(texts)}
+######################################################
+MAKE SURE TO OUTPUT IN ${target}. DO NOT OUTPUT IN UNSPECIFIED LANGUAGE.
+######################################################
+                `
+        }
+      ]
+    })
+    // 添加翻译后的键值，并打印错译漏译内容
+    try {
+      const result = JSON.parse(completion.choices[0].message.content!)
+      for (const e in texts) {
+        if (result[e] && typeof result[e] === 'string') {
+          obj[e] = result[e]
+        } else {
+          console.log('[warning]', `missing value "${e}" in ${target} translation`)
+        }
+      }
+    } catch (e) {
+      console.log('[error]', e)
+      for (const e in texts) {
+        console.log('[warning]', `missing value "${e}" in ${target} translation`)
+      }
+    }
+  }
+  // 删除多余的键值
+  for (const e in obj) {
+    if (!zh[e]) {
+      delete obj[e]
+    }
+  }
+  // 更新文件
+  updateFile()
+}
+
+;(async () => {
+  for (const { name, code, model } of INDEX) {
+    const obj = fs.existsSync(`src/renderer/src/i18n/translate/${code}.json`)
+      ? JSON.parse(fs.readFileSync(`src/renderer/src/i18n/translate/${code}.json`, 'utf8'))
+      : {}
+    await translate(zh, obj, name, model, () => {
+      fs.writeFileSync(`src/renderer/src/i18n/translate/${code}.json`, JSON.stringify(obj, null, 2), 'utf8')
+    })
+  }
+})()

src/main/constant.ts

@@ -1,3 +1,4 @@
 export const isMac = process.platform === 'darwin'
 export const isWin = process.platform === 'win32'
 export const isLinux = process.platform === 'linux'
+export const isDev = process.env.NODE_ENV === 'development'

src/main/embeddings/Embeddings.ts

@@ -0,0 +1,24 @@
+import type { BaseEmbeddings } from '@cherrystudio/embedjs-interfaces'
+import { KnowledgeBaseParams } from '@types'
+
+import EmbeddingsFactory from './EmbeddingsFactory'
+
+export default class Embeddings {
+  private sdk: BaseEmbeddings
+  constructor({ model, apiKey, apiVersion, baseURL, dimensions }: KnowledgeBaseParams) {
+    this.sdk = EmbeddingsFactory.create({ model, apiKey, apiVersion, baseURL, dimensions } as KnowledgeBaseParams)
+  }
+  public async init(): Promise<void> {
+    return this.sdk.init()
+  }
+  public async getDimensions(): Promise<number> {
+    return this.sdk.getDimensions()
+  }
+  public async embedDocuments(texts: string[]): Promise<number[][]> {
+    return this.sdk.embedDocuments(texts)
+  }
+
+  public async embedQuery(text: string): Promise<number[]> {
+    return this.sdk.embedQuery(text)
+  }
+}

src/main/embeddings/EmbeddingsFactory.ts

@@ -0,0 +1,38 @@
+import type { BaseEmbeddings } from '@cherrystudio/embedjs-interfaces'
+import { OpenAiEmbeddings } from '@cherrystudio/embedjs-openai'
+import { AzureOpenAiEmbeddings } from '@cherrystudio/embedjs-openai/src/azure-openai-embeddings'
+import { getInstanceName } from '@main/utils'
+import { KnowledgeBaseParams } from '@types'
+
+import VoyageEmbeddings from './VoyageEmbeddings'
+
+export default class EmbeddingsFactory {
+  static create({ model, apiKey, apiVersion, baseURL, dimensions }: KnowledgeBaseParams): BaseEmbeddings {
+    const batchSize = 10
+    if (model.includes('voyage')) {
+      return new VoyageEmbeddings({
+        modelName: model,
+        apiKey,
+        outputDimension: dimensions,
+        batchSize: 8
+      })
+    }
+    if (apiVersion !== undefined) {
+      return new AzureOpenAiEmbeddings({
+        azureOpenAIApiKey: apiKey,
+        azureOpenAIApiVersion: apiVersion,
+        azureOpenAIApiDeploymentName: model,
+        azureOpenAIApiInstanceName: getInstanceName(baseURL),
+        dimensions,
+        batchSize
+      })
+    }
+    return new OpenAiEmbeddings({
+      model,
+      apiKey,
+      dimensions,
+      batchSize,
+      configuration: { baseURL }
+    })
+  }
+}

src/main/embeddings/VoyageEmbeddings.ts

@@ -0,0 +1,30 @@
+import { BaseEmbeddings } from '@cherrystudio/embedjs-interfaces'
+import { VoyageEmbeddings as _VoyageEmbeddings } from '@langchain/community/embeddings/voyage'
+
+export default class VoyageEmbeddings extends BaseEmbeddings {
+  private model: _VoyageEmbeddings
+  constructor(private readonly configuration?: ConstructorParameters<typeof _VoyageEmbeddings>[0]) {
+    super()
+    if (!this.configuration) this.configuration = {}
+    if (!this.configuration.modelName) this.configuration.modelName = 'voyage-3'
+
+    if (!this.configuration.outputDimension) {
+      throw new Error('You need to pass in the optional dimensions parameter for this model')
+    }
+    this.model = new _VoyageEmbeddings(this.configuration)
+  }
+  override async getDimensions(): Promise<number> {
+    if (!this.configuration?.outputDimension) {
+      throw new Error('You need to pass in the optional dimensions parameter for this model')
+    }
+    return this.configuration?.outputDimension
+  }
+
+  override async embedDocuments(texts: string[]): Promise<number[][]> {
+    return this.model.embedDocuments(texts)
+  }
+
+  override async embedQuery(text: string): Promise<number[]> {
+    return this.model.embedQuery(text)
+  }
+}

src/main/index.ts

@@ -1,9 +1,11 @@
 import { electronApp, optimizer } from '@electron-toolkit/utils'
 import { replaceDevtoolsFont } from '@main/utils/windowUtil'
-import { app } from 'electron'
-import installExtension, { REDUX_DEVTOOLS } from 'electron-devtools-installer'
+import { app, ipcMain } from 'electron'
+import installExtension, { REACT_DEVELOPER_TOOLS, REDUX_DEVTOOLS } from 'electron-devtools-installer'
 
 import { registerIpc } from './ipc'
+import { configManager } from './services/ConfigManager'
+import { CHERRY_STUDIO_PROTOCOL, handleProtocolUrl, registerProtocolClient } from './services/ProtocolClient'
 import { registerShortcuts } from './services/ShortcutService'
 import { TrayService } from './services/TrayService'
 import { windowService } from './services/WindowService'
@@ -21,6 +23,12 @@ if (!app.requestSingleInstanceLock()) {
     // Set app user model id for windows
     electronApp.setAppUserModelId(import.meta.env.VITE_MAIN_BUNDLE_ID || 'com.kangfenmao.CherryStudio')
 
+    // Mac: Hide dock icon before window creation when launch to tray is set
+    const isLaunchToTray = configManager.getLaunchToTray()
+    if (isLaunchToTray) {
+      app.dock?.hide()
+    }
+
     const mainWindow = windowService.createMainWindow()
     new TrayService()
 
@@ -40,15 +48,39 @@ if (!app.requestSingleInstanceLock()) {
     replaceDevtoolsFont(mainWindow)
 
     if (process.env.NODE_ENV === 'development') {
-      installExtension(REDUX_DEVTOOLS)
+      installExtension([REDUX_DEVTOOLS, REACT_DEVELOPER_TOOLS])
         .then((name) => console.log(`Added Extension:  ${name}`))
         .catch((err) => console.log('An error occurred: ', err))
     }
+    ipcMain.handle('system:getDeviceType', () => {
+      return process.platform === 'darwin' ? 'mac' : process.platform === 'win32' ? 'windows' : 'linux'
+    })
+  })
+
+  registerProtocolClient(app)
+
+  // macOS specific: handle protocol when app is already running
+  app.on('open-url', (event, url) => {
+    event.preventDefault()
+    handleProtocolUrl(url)
+  })
+
+  registerProtocolClient(app)
+
+  // macOS specific: handle protocol when app is already running
+  app.on('open-url', (event, url) => {
+    event.preventDefault()
+    handleProtocolUrl(url)
   })
 
   // Listen for second instance
-  app.on('second-instance', () => {
+  app.on('second-instance', (_event, argv) => {
     windowService.showMainWindow()
+
+    // Protocol handler for Windows/Linux
+    // The commandLine is an array of strings where the last item might be the URL
+    const url = argv.find((arg) => arg.startsWith(CHERRY_STUDIO_PROTOCOL + '://'))
+    if (url) handleProtocolUrl(url)
   })
 
   app.on('browser-window-created', (_, window) => {

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

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

src/main/ipc.ts

@@ -1,6 +1,8 @@
 import fs from 'node:fs'
 
-import { MCPServer, Shortcut, ThemeMode } from '@types'
+import { isMac, isWin } from '@main/constant'
+import { getBinaryPath, isBinaryExists, runInstallScript } from '@main/utils/process'
+import { Shortcut, ThemeMode } from '@types'
 import { BrowserWindow, ipcMain, session, shell } from 'electron'
 import log from 'electron-log'
 
@@ -8,12 +10,15 @@ import { titleBarOverlayDark, titleBarOverlayLight } from './config'
 import AppUpdater from './services/AppUpdater'
 import BackupManager from './services/BackupManager'
 import { configManager } from './services/ConfigManager'
+import CopilotService from './services/CopilotService'
 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 mcpService from './services/MCPService'
+import * as NutstoreService from './services/NutstoreService'
+import ObsidianVaultService from './services/ObsidianVaultService'
 import { ProxyConfig, proxyManager } from './services/ProxyManager'
 import { registerShortcuts, unregisterAllShortcuts } from './services/ShortcutService'
 import { TrayService } from './services/TrayService'
@@ -26,7 +31,7 @@ import { compress, decompress } from './utils/zip'
 const fileManager = new FileStorage()
 const backupManager = new BackupManager()
 const exportService = new ExportService(fileManager)
-const mcpService = new MCPService()
+const obsidianVaultService = new ObsidianVaultService()
 
 export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   const appUpdater = new AppUpdater(mainWindow)
@@ -42,8 +47,16 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   }))
 
   ipcMain.handle('app:proxy', async (_, proxy: string) => {
-    const proxyConfig: ProxyConfig =
-      proxy === 'system' ? { mode: 'system' } : proxy ? { mode: 'custom', url: proxy } : { mode: 'none' }
+    let proxyConfig: ProxyConfig
+
+    if (proxy === 'system') {
+      proxyConfig = { mode: 'system' }
+    } else if (proxy) {
+      proxyConfig = { mode: 'custom', url: proxy }
+    } else {
+      proxyConfig = { mode: 'none' }
+    }
+
     await proxyManager.configureProxy(proxyConfig)
   })
 
@@ -58,11 +71,30 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     configManager.setLanguage(language)
   })
 
+  // launch on boot
+  ipcMain.handle('app:set-launch-on-boot', (_, openAtLogin: boolean) => {
+    // Set login item settings for windows and mac
+    // linux is not supported because it requires more file operations
+    if (isWin || isMac) {
+      app.setLoginItemSettings({ openAtLogin })
+    }
+  })
+
+  // launch to tray
+  ipcMain.handle('app:set-launch-to-tray', (_, isActive: boolean) => {
+    configManager.setLaunchToTray(isActive)
+  })
+
   // tray
   ipcMain.handle('app:set-tray', (_, isActive: boolean) => {
     configManager.setTray(isActive)
   })
 
+  // to tray on close
+  ipcMain.handle('app:set-tray-on-close', (_, isActive: boolean) => {
+    configManager.setTrayOnClose(isActive)
+  })
+
   ipcMain.handle('app:restart-tray', () => TrayService.getInstance().restartTray())
 
   ipcMain.handle('config:set', (_, key: string, value: any) => {
@@ -74,8 +106,21 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   })
 
   // theme
-  ipcMain.handle('app:set-theme', (_, theme: ThemeMode) => {
+  ipcMain.handle('app:set-theme', (event, theme: ThemeMode) => {
+    if (theme === configManager.getTheme()) return
+
     configManager.setTheme(theme)
+
+    // should sync theme change to all windows
+    const senderWindowId = event.sender.id
+    const windows = BrowserWindow.getAllWindows()
+    // 向其他窗口广播主题变化
+    windows.forEach((win) => {
+      if (win.webContents.id !== senderWindowId) {
+        win.webContents.send('theme:change', theme)
+      }
+    })
+
     mainWindow?.setTitleBarOverlay &&
       mainWindow.setTitleBarOverlay(theme === 'dark' ? titleBarOverlayDark : titleBarOverlayLight)
   })
@@ -120,6 +165,9 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle('backup:restore', backupManager.restore)
   ipcMain.handle('backup:backupToWebdav', backupManager.backupToWebdav)
   ipcMain.handle('backup:restoreFromWebdav', backupManager.restoreFromWebdav)
+  ipcMain.handle('backup:listWebdavFiles', backupManager.listWebdavFiles)
+  ipcMain.handle('backup:checkConnection', backupManager.checkConnection)
+  ipcMain.handle('backup:createDirectory', backupManager.createDirectory)
 
   // file
   ipcMain.handle('file:open', fileManager.open)
@@ -180,6 +228,7 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle('knowledge-base:add', KnowledgeService.add)
   ipcMain.handle('knowledge-base:remove', KnowledgeService.remove)
   ipcMain.handle('knowledge-base:search', KnowledgeService.search)
+  ipcMain.handle('knowledge-base:rerank', KnowledgeService.rerank)
 
   // window
   ipcMain.handle('window:set-minimum-size', (_, width: number, height: number) => {
@@ -206,6 +255,7 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle('miniwindow:hide', () => windowService.hideMiniWindow())
   ipcMain.handle('miniwindow:close', () => windowService.closeMiniWindow())
   ipcMain.handle('miniwindow:toggle', () => windowService.toggleMiniWindow())
+  ipcMain.handle('miniwindow:set-pin', (_, isPinned) => windowService.setPinMiniWindow(isPinned))
 
   // aes
   ipcMain.handle('aes:encrypt', (_, text: string, secretKey: string, iv: string) => encrypt(text, secretKey, iv))
@@ -214,29 +264,39 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   )
 
   // 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 })
-  )
+  ipcMain.handle('mcp:remove-server', mcpService.removeServer)
+  ipcMain.handle('mcp:restart-server', mcpService.restartServer)
+  ipcMain.handle('mcp:stop-server', mcpService.stopServer)
+  ipcMain.handle('mcp:list-tools', mcpService.listTools)
+  ipcMain.handle('mcp:call-tool', mcpService.callTool)
+  ipcMain.handle('mcp:get-install-info', mcpService.getInstallInfo)
 
-  // 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('app:is-binary-exist', (_, name: string) => isBinaryExists(name))
+  ipcMain.handle('app:get-binary-path', (_, name: string) => getBinaryPath(name))
+  ipcMain.handle('app:install-uv-binary', () => runInstallScript('install-uv.js'))
+  ipcMain.handle('app:install-bun-binary', () => runInstallScript('install-bun.js'))
 
-  ipcMain.handle('mcp:cleanup', async () => mcpService.cleanup())
+  //copilot
+  ipcMain.handle('copilot:get-auth-message', CopilotService.getAuthMessage)
+  ipcMain.handle('copilot:get-copilot-token', CopilotService.getCopilotToken)
+  ipcMain.handle('copilot:save-copilot-token', CopilotService.saveCopilotToken)
+  ipcMain.handle('copilot:get-token', CopilotService.getToken)
+  ipcMain.handle('copilot:logout', CopilotService.logout)
+  ipcMain.handle('copilot:get-user', CopilotService.getUser)
 
-  // Listen for changes in MCP servers and notify renderer
-  mcpService.on('servers-updated', (servers) => {
-    mainWindow?.webContents.send('mcp:servers-updated', servers)
+  // Obsidian service
+  ipcMain.handle('obsidian:get-vaults', () => {
+    return obsidianVaultService.getVaults()
   })
 
-  // Clean up MCP services when app quits
-  app.on('before-quit', () => mcpService.cleanup())
+  ipcMain.handle('obsidian:get-files', (_event, vaultName) => {
+    return obsidianVaultService.getFilesByVaultName(vaultName)
+  })
+
+  // nutstore
+  ipcMain.handle('nutstore:get-sso-url', NutstoreService.getNutstoreSSOUrl)
+  ipcMain.handle('nutstore:decrypt-token', (_, token: string) => NutstoreService.decryptToken(token))
+  ipcMain.handle('nutstore:get-directory-contents', (_, token: string, path: string) =>
+    NutstoreService.getDirectoryContents(token, path)
+  )
 }

src/main/loader/draftsExportLoader.ts

@@ -1,6 +1,6 @@
 import * as fs from 'node:fs'
 
-import { JsonLoader } from '@llm-tools/embedjs'
+import { JsonLoader } from '@cherrystudio/embedjs'
 
 /**
  * Drafts 应用导出的笔记文件加载器

src/main/loader/epubLoader.ts

@@ -1,6 +1,6 @@
+import { BaseLoader } from '@cherrystudio/embedjs-interfaces'
+import { cleanString } from '@cherrystudio/embedjs-utils'
 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'

src/main/loader/index.ts

@@ -1,8 +1,8 @@
 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 { JsonLoader, LocalPathLoader, RAGApplication, TextLoader } from '@cherrystudio/embedjs'
+import type { AddLoaderReturn } from '@cherrystudio/embedjs-interfaces'
+import { WebLoader } from '@cherrystudio/embedjs-loader-web'
 import { LoaderReturn } from '@shared/config/types'
 import { FileType, KnowledgeBaseParams } from '@types'
 import Logger from 'electron-log'

src/main/loader/odLoader.ts

@@ -1,6 +1,6 @@
+import { BaseLoader } from '@cherrystudio/embedjs-interfaces'
+import { cleanString } from '@cherrystudio/embedjs-utils'
 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'
 

src/main/reranker/BaseReranker.ts

@@ -0,0 +1,31 @@
+import type { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
+import { KnowledgeBaseParams } from '@types'
+
+export default abstract class BaseReranker {
+  protected base: KnowledgeBaseParams
+  constructor(base: KnowledgeBaseParams) {
+    if (!base.rerankModel) {
+      throw new Error('Rerank model is required')
+    }
+    this.base = base
+  }
+  abstract rerank(query: string, searchResults: ExtractChunkData[]): Promise<ExtractChunkData[]>
+
+  public defaultHeaders() {
+    return {
+      Authorization: `Bearer ${this.base.rerankApiKey}`,
+      'Content-Type': 'application/json'
+    }
+  }
+
+  public formatErrorMessage(url: string, error: any, requestBody: any) {
+    const errorDetails = {
+      url: url,
+      message: error.message,
+      status: error.response?.status,
+      statusText: error.response?.statusText,
+      requestBody: requestBody
+    }
+    return JSON.stringify(errorDetails, null, 2)
+  }
+}

src/main/reranker/DefaultReranker.ts

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

src/main/reranker/JinaReranker.ts

@@ -0,0 +1,56 @@
+import { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
+import { KnowledgeBaseParams } from '@types'
+import axios from 'axios'
+
+import BaseReranker from './BaseReranker'
+
+export default class JinaReranker extends BaseReranker {
+  constructor(base: KnowledgeBaseParams) {
+    super(base)
+  }
+
+  public rerank = async (query: string, searchResults: ExtractChunkData[]): Promise<ExtractChunkData[]> => {
+    let baseURL = this.base?.rerankBaseURL?.endsWith('/')
+      ? this.base.rerankBaseURL.slice(0, -1)
+      : this.base.rerankBaseURL
+
+    // 必须携带/v1，否则会404
+    if (baseURL && !baseURL.endsWith('/v1')) {
+      baseURL = `${baseURL}/v1`
+    }
+
+    const url = `${baseURL}/rerank`
+
+    const requestBody = {
+      model: this.base.rerankModel,
+      query,
+      documents: searchResults.map((doc) => doc.pageContent),
+      top_n: this.base.topN
+    }
+
+    try {
+      const { data } = await axios.post(url, requestBody, { headers: this.defaultHeaders() })
+
+      const rerankResults = data.results
+      console.log(rerankResults)
+      const resultMap = new Map(rerankResults.map((result: any) => [result.index, result.relevance_score || 0]))
+      return searchResults
+        .map((doc: ExtractChunkData, index: number) => {
+          const score = resultMap.get(index)
+          if (score === undefined) return undefined
+
+          return {
+            ...doc,
+            score
+          }
+        })
+        .filter((doc): doc is ExtractChunkData => doc !== undefined)
+        .sort((a, b) => b.score - a.score)
+    } catch (error: any) {
+      const errorDetails = this.formatErrorMessage(url, error, requestBody)
+
+      console.error('Jina Reranker API Error:', errorDetails)
+      throw new Error(`重排序请求失败: ${error.message}\n请求详情: ${errorDetails}`)
+    }
+  }
+}

src/main/reranker/Reranker.ts

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

src/main/reranker/RerankerFactory.ts

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

src/main/reranker/SiliconFlowReranker.ts

@@ -0,0 +1,58 @@
+import type { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
+import { KnowledgeBaseParams } from '@types'
+import axios from 'axios'
+
+import BaseReranker from './BaseReranker'
+
+export default class SiliconFlowReranker extends BaseReranker {
+  constructor(base: KnowledgeBaseParams) {
+    super(base)
+  }
+
+  public rerank = async (query: string, searchResults: ExtractChunkData[]): Promise<ExtractChunkData[]> => {
+    let baseURL = this.base?.rerankBaseURL?.endsWith('/')
+      ? this.base.rerankBaseURL.slice(0, -1)
+      : this.base.rerankBaseURL
+
+    // 必须携带/v1，否则会404
+    if (baseURL && !baseURL.endsWith('/v1')) {
+      baseURL = `${baseURL}/v1`
+    }
+
+    const url = `${baseURL}/rerank`
+
+    const requestBody = {
+      model: this.base.rerankModel,
+      query,
+      documents: searchResults.map((doc) => doc.pageContent),
+      top_n: this.base.topN,
+      max_chunks_per_doc: this.base.chunkSize,
+      overlap_tokens: this.base.chunkOverlap
+    }
+
+    try {
+      const { data } = await axios.post(url, requestBody, { headers: this.defaultHeaders() })
+
+      const rerankResults = data.results
+      const resultMap = new Map(rerankResults.map((result: any) => [result.index, result.relevance_score || 0]))
+
+      return searchResults
+        .map((doc: ExtractChunkData, index: number) => {
+          const score = resultMap.get(index)
+          if (score === undefined) return undefined
+
+          return {
+            ...doc,
+            score
+          }
+        })
+        .filter((doc): doc is ExtractChunkData => doc !== undefined)
+        .sort((a, b) => b.score - a.score)
+    } catch (error: any) {
+      const errorDetails = this.formatErrorMessage(url, error, requestBody)
+
+      console.error('SiliconFlow Reranker API 错误:', errorDetails)
+      throw new Error(`重排序请求失败: ${error.message}\n请求详情: ${errorDetails}`)
+    }
+  }
+}

src/main/reranker/VoyageReranker.ts

@@ -0,0 +1,62 @@
+import { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
+import { KnowledgeBaseParams } from '@types'
+import axios from 'axios'
+
+import BaseReranker from './BaseReranker'
+
+export default class VoyageReranker extends BaseReranker {
+  constructor(base: KnowledgeBaseParams) {
+    super(base)
+  }
+
+  public rerank = async (query: string, searchResults: ExtractChunkData[]): Promise<ExtractChunkData[]> => {
+    let baseURL = this.base?.rerankBaseURL?.endsWith('/')
+      ? this.base.rerankBaseURL.slice(0, -1)
+      : this.base.rerankBaseURL
+
+    if (baseURL && !baseURL.endsWith('/v1')) {
+      baseURL = `${baseURL}/v1`
+    }
+
+    const url = `${baseURL}/rerank`
+
+    const requestBody = {
+      model: this.base.rerankModel,
+      query,
+      documents: searchResults.map((doc) => doc.pageContent),
+      top_k: this.base.topN,
+      return_documents: false,
+      truncation: true
+    }
+
+    try {
+      const { data } = await axios.post(url, requestBody, {
+        headers: {
+          ...this.defaultHeaders()
+        }
+      })
+
+      const rerankResults = data.data
+
+      const resultMap = new Map(rerankResults.map((result: any) => [result.index, result.relevance_score || 0]))
+
+      return searchResults
+        .map((doc: ExtractChunkData, index: number) => {
+          const score = resultMap.get(index)
+          if (score === undefined) return undefined
+
+          return {
+            ...doc,
+            score
+          }
+        })
+        .filter((doc): doc is ExtractChunkData => doc !== undefined)
+        .sort((a, b) => b.score - a.score)
+    } catch (error: any) {
+      const errorDetails = this.formatErrorMessage(url, error, requestBody)
+
+      console.error('Voyage Reranker API Error:', errorDetails)
+      throw new Error(`重排序请求失败: ${error.message}\n请求详情: ${errorDetails}`)
+    }
+  }
+}

src/main/services/BackupManager.ts

@@ -5,6 +5,7 @@ import { app } from 'electron'
 import Logger from 'electron-log'
 import * as fs from 'fs-extra'
 import * as path from 'path'
+import { createClient, CreateDirectoryOptions, FileStat } from 'webdav'
 
 import WebDav from './WebDav'
 import { windowService } from './WindowService'
@@ -14,10 +15,12 @@ class BackupManager {
   private backupDir = path.join(app.getPath('temp'), 'cherry-studio', 'backup')
 
   constructor() {
+    this.checkConnection = this.checkConnection.bind(this)
     this.backup = this.backup.bind(this)
     this.restore = this.restore.bind(this)
     this.backupToWebdav = this.backupToWebdav.bind(this)
     this.restoreFromWebdav = this.restoreFromWebdav.bind(this)
+    this.listWebdavFiles = this.listWebdavFiles.bind(this)
   }
 
   private async setWritableRecursive(dirPath: string): Promise<void> {
@@ -84,9 +87,16 @@ class BackupManager {
       await fs.ensureDir(this.tempDir)
       onProgress({ stage: 'preparing', progress: 0, total: 100 })
 
-      // 将 data 写入临时文件
+      // 使用流的方式写入 data.json
       const tempDataPath = path.join(this.tempDir, 'data.json')
-      await fs.writeFile(tempDataPath, data)
+      await new Promise<void>((resolve, reject) => {
+        const writeStream = fs.createWriteStream(tempDataPath)
+        writeStream.write(data)
+        writeStream.end()
+
+        writeStream.on('finish', () => resolve())
+        writeStream.on('error', (error) => reject(error))
+      })
       onProgress({ stage: 'writing_data', progress: 20, total: 100 })
 
       // 复制 Data 目录到临时目录
@@ -117,10 +127,10 @@ class BackupManager {
       await fs.remove(this.tempDir)
       onProgress({ stage: 'completed', progress: 100, total: 100 })
 
-      Logger.log('Backup completed successfully')
+      Logger.log('[BackupManager] Backup completed successfully')
       return backupedFilePath
     } catch (error) {
-      Logger.error('Backup failed:', error)
+      Logger.error('[BackupManager] Backup failed:', error)
       throw error
     }
   }
@@ -186,7 +196,7 @@ class BackupManager {
   }
 
   async backupToWebdav(_: Electron.IpcMainInvokeEvent, data: string, webdavConfig: WebDavConfig) {
-    const filename = 'cherry-studio.backup.zip'
+    const filename = webdavConfig.fileName || 'cherry-studio.backup.zip'
     const backupedFilePath = await this.backup(_, filename, data)
     const webdavClient = new WebDav(webdavConfig)
     return await webdavClient.putFileContents(filename, fs.createReadStream(backupedFilePath), {
@@ -195,8 +205,9 @@ class BackupManager {
   }
 
   async restoreFromWebdav(_: Electron.IpcMainInvokeEvent, webdavConfig: WebDavConfig) {
-    const filename = 'cherry-studio.backup.zip'
+    const filename = webdavConfig.fileName || 'cherry-studio.backup.zip'
     const webdavClient = new WebDav(webdavConfig)
+    try {
       const retrievedFile = await webdavClient.getFileContents(filename)
       const backupedFilePath = path.join(this.backupDir, filename)
 
@@ -204,9 +215,45 @@ class BackupManager {
         fs.mkdirSync(this.backupDir, { recursive: true })
       }
 
-    await fs.writeFileSync(backupedFilePath, retrievedFile as Buffer)
+      // 使用流的方式写入文件
+      await new Promise<void>((resolve, reject) => {
+        const writeStream = fs.createWriteStream(backupedFilePath)
+        writeStream.write(retrievedFile as Buffer)
+        writeStream.end()
+
+        writeStream.on('finish', () => resolve())
+        writeStream.on('error', (error) => reject(error))
+      })
 
       return await this.restore(_, backupedFilePath)
+    } catch (error: any) {
+      Logger.error('[backup] Failed to restore from WebDAV:', error)
+      throw new Error(error.message || 'Failed to restore backup file')
+    }
+  }
+
+  listWebdavFiles = async (_: Electron.IpcMainInvokeEvent, config: WebDavConfig) => {
+    try {
+      const client = createClient(config.webdavHost, {
+        username: config.webdavUser,
+        password: config.webdavPass
+      })
+
+      const response = await client.getDirectoryContents(config.webdavPath)
+      const files = Array.isArray(response) ? response : response.data
+
+      return files
+        .filter((file: FileStat) => file.type === 'file' && file.basename.endsWith('.zip'))
+        .map((file: FileStat) => ({
+          fileName: file.basename,
+          modifiedTime: file.lastmod,
+          size: file.size
+        }))
+        .sort((a, b) => new Date(b.modifiedTime).getTime() - new Date(a.modifiedTime).getTime())
+    } catch (error: any) {
+      Logger.error('Failed to list WebDAV files:', error)
+      throw new Error(error.message || 'Failed to list backup files')
+    }
   }
 
   private async getDirSize(dirPath: string): Promise<number> {
@@ -246,6 +293,21 @@ class BackupManager {
       }
     }
   }
+
+  async checkConnection(_: Electron.IpcMainInvokeEvent, webdavConfig: WebDavConfig) {
+    const webdavClient = new WebDav(webdavConfig)
+    return await webdavClient.checkConnection()
+  }
+
+  async createDirectory(
+    _: Electron.IpcMainInvokeEvent,
+    webdavConfig: WebDavConfig,
+    path: string,
+    options?: CreateDirectoryOptions
+  ) {
+    const webdavClient = new WebDav(webdavConfig)
+    return await webdavClient.createDirectory(path, options)
+  }
 }
 
 export default BackupManager

src/main/services/ClipboardMonitor.ts

@@ -98,7 +98,7 @@ export default class ClipboardMonitor {
   private handleTextSelected(text: string) {
     if (!text) return
 
-    console.debug('[ClipboardMonitor] handleTextSelected', text)
+    console.log('[ClipboardMonitor] handleTextSelected', text)
 
     windowService.setLastSelectedText(text)
 

src/main/services/ConfigManager.ts

@@ -30,6 +30,14 @@ export class ConfigManager {
     this.store.set('theme', theme)
   }
 
+  getLaunchToTray(): boolean {
+    return !!this.store.get('launchToTray', false)
+  }
+
+  setLaunchToTray(value: boolean) {
+    this.store.set('launchToTray', value)
+  }
+
   getTray(): boolean {
     return !!this.store.get('tray', true)
   }
@@ -39,6 +47,14 @@ export class ConfigManager {
     this.notifySubscribers('tray', value)
   }
 
+  getTrayOnClose(): boolean {
+    return !!this.store.get('trayOnClose', true)
+  }
+
+  setTrayOnClose(value: boolean) {
+    this.store.set('trayOnClose', value)
+  }
+
   getZoomFactor(): number {
     return this.store.get('zoomFactor', 1) as number
   }

src/main/services/CopilotService.ts

@@ -0,0 +1,247 @@
+import axios, { AxiosRequestConfig } from 'axios'
+import { app, safeStorage } from 'electron'
+import fs from 'fs/promises'
+import path from 'path'
+
+// 配置常量，集中管理
+const CONFIG = {
+  GITHUB_CLIENT_ID: 'Iv1.b507a08c87ecfe98',
+  POLLING: {
+    MAX_ATTEMPTS: 8,
+    INITIAL_DELAY_MS: 1000,
+    MAX_DELAY_MS: 16000 // 最大延迟16秒
+  },
+  DEFAULT_HEADERS: {
+    accept: 'application/json',
+    'editor-version': 'Neovim/0.6.1',
+    'editor-plugin-version': 'copilot.vim/1.16.0',
+    'content-type': 'application/json',
+    'user-agent': 'GithubCopilot/1.155.0',
+    'accept-encoding': 'gzip,deflate,br'
+  },
+  // API端点集中管理
+  API_URLS: {
+    GITHUB_USER: 'https://api.github.com/user',
+    GITHUB_DEVICE_CODE: 'https://github.com/login/device/code',
+    GITHUB_ACCESS_TOKEN: 'https://github.com/login/oauth/access_token',
+    COPILOT_TOKEN: 'https://api.github.com/copilot_internal/v2/token'
+  }
+}
+
+// 接口定义移到顶部，便于查阅
+interface UserResponse {
+  login: string
+  avatar: string
+}
+
+interface AuthResponse {
+  device_code: string
+  user_code: string
+  verification_uri: string
+}
+
+interface TokenResponse {
+  access_token: string
+}
+
+interface CopilotTokenResponse {
+  token: string
+}
+
+// 自定义错误类，统一错误处理
+class CopilotServiceError extends Error {
+  constructor(
+    message: string,
+    public readonly cause?: unknown
+  ) {
+    super(message)
+    this.name = 'CopilotServiceError'
+  }
+}
+
+class CopilotService {
+  private readonly tokenFilePath: string
+  private headers: Record<string, string>
+
+  constructor() {
+    this.tokenFilePath = path.join(app.getPath('userData'), '.copilot_token')
+    this.headers = { ...CONFIG.DEFAULT_HEADERS }
+  }
+
+  /**
+   * 设置自定义请求头
+   */
+  private updateHeaders = (headers?: Record<string, string>): void => {
+    if (headers && Object.keys(headers).length > 0) {
+      this.headers = { ...headers }
+    }
+  }
+
+  /**
+   * 获取GitHub登录信息
+   */
+  public getUser = async (_: Electron.IpcMainInvokeEvent, token: string): Promise<UserResponse> => {
+    try {
+      const config: AxiosRequestConfig = {
+        headers: {
+          Connection: 'keep-alive',
+          'user-agent': 'Visual Studio Code (desktop)',
+          'Sec-Fetch-Site': 'none',
+          'Sec-Fetch-Mode': 'no-cors',
+          'Sec-Fetch-Dest': 'empty',
+          authorization: `token ${token}`
+        }
+      }
+
+      const response = await axios.get(CONFIG.API_URLS.GITHUB_USER, config)
+      return {
+        login: response.data.login,
+        avatar: response.data.avatar_url
+      }
+    } catch (error) {
+      console.error('Failed to get user information:', error)
+      throw new CopilotServiceError('无法获取GitHub用户信息', error)
+    }
+  }
+
+  /**
+   * 获取GitHub设备授权信息
+   */
+  public getAuthMessage = async (
+    _: Electron.IpcMainInvokeEvent,
+    headers?: Record<string, string>
+  ): Promise<AuthResponse> => {
+    try {
+      this.updateHeaders(headers)
+
+      const response = await axios.post<AuthResponse>(
+        CONFIG.API_URLS.GITHUB_DEVICE_CODE,
+        {
+          client_id: CONFIG.GITHUB_CLIENT_ID,
+          scope: 'read:user'
+        },
+        { headers: this.headers }
+      )
+
+      return response.data
+    } catch (error) {
+      console.error('Failed to get auth message:', error)
+      throw new CopilotServiceError('无法获取GitHub授权信息', error)
+    }
+  }
+
+  /**
+   * 使用设备码获取访问令牌 - 优化轮询逻辑
+   */
+  public getCopilotToken = async (
+    _: Electron.IpcMainInvokeEvent,
+    device_code: string,
+    headers?: Record<string, string>
+  ): Promise<TokenResponse> => {
+    this.updateHeaders(headers)
+
+    let currentDelay = CONFIG.POLLING.INITIAL_DELAY_MS
+
+    for (let attempt = 0; attempt < CONFIG.POLLING.MAX_ATTEMPTS; attempt++) {
+      await this.delay(currentDelay)
+
+      try {
+        const response = await axios.post<TokenResponse>(
+          CONFIG.API_URLS.GITHUB_ACCESS_TOKEN,
+          {
+            client_id: CONFIG.GITHUB_CLIENT_ID,
+            device_code,
+            grant_type: 'urn:ietf:params:oauth:grant-type:device_code'
+          },
+          { headers: this.headers }
+        )
+
+        const { access_token } = response.data
+        if (access_token) {
+          return { access_token }
+        }
+      } catch (error) {
+        // 指数退避策略
+        currentDelay = Math.min(currentDelay * 2, CONFIG.POLLING.MAX_DELAY_MS)
+
+        // 仅在最后一次尝试失败时记录详细错误
+        const isLastAttempt = attempt === CONFIG.POLLING.MAX_ATTEMPTS - 1
+        if (isLastAttempt) {
+          console.error(`Token polling failed after ${CONFIG.POLLING.MAX_ATTEMPTS} attempts:`, error)
+        }
+      }
+    }
+
+    throw new CopilotServiceError('获取访问令牌超时，请重试')
+  }
+
+  /**
+   * 保存Copilot令牌到本地文件
+   */
+  public saveCopilotToken = async (_: Electron.IpcMainInvokeEvent, token: string): Promise<void> => {
+    try {
+      const encryptedToken = safeStorage.encryptString(token)
+      await fs.writeFile(this.tokenFilePath, encryptedToken)
+    } catch (error) {
+      console.error('Failed to save token:', error)
+      throw new CopilotServiceError('无法保存访问令牌', error)
+    }
+  }
+
+  /**
+   * 从本地文件读取令牌并获取Copilot令牌
+   */
+  public getToken = async (
+    _: Electron.IpcMainInvokeEvent,
+    headers?: Record<string, string>
+  ): Promise<CopilotTokenResponse> => {
+    try {
+      this.updateHeaders(headers)
+
+      const encryptedToken = await fs.readFile(this.tokenFilePath)
+      const access_token = safeStorage.decryptString(Buffer.from(encryptedToken))
+
+      const config: AxiosRequestConfig = {
+        headers: {
+          ...this.headers,
+          authorization: `token ${access_token}`
+        }
+      }
+
+      const response = await axios.get<CopilotTokenResponse>(CONFIG.API_URLS.COPILOT_TOKEN, config)
+
+      return response.data
+    } catch (error) {
+      console.error('Failed to get Copilot token:', error)
+      throw new CopilotServiceError('无法获取Copilot令牌，请重新授权', error)
+    }
+  }
+
+  /**
+   * 退出登录，删除本地token文件
+   */
+  public logout = async (): Promise<void> => {
+    try {
+      try {
+        await fs.access(this.tokenFilePath)
+        await fs.unlink(this.tokenFilePath)
+        console.log('Successfully logged out from Copilot')
+      } catch (error) {
+        // 文件不存在不是错误，只是记录一下
+        console.log('Token file not found, nothing to delete')
+      }
+    } catch (error) {
+      console.error('Failed to logout:', error)
+      throw new CopilotServiceError('无法完成退出登录操作', error)
+    }
+  }
+
+  /**
+   * 辅助方法：延迟执行
+   */
+  private delay = (ms: number): Promise<void> => {
+    return new Promise((resolve) => setTimeout(resolve, ms))
+  }
+}
+
+export default new CopilotService()

src/main/services/GeminiService.ts

@@ -3,14 +3,12 @@ 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',
@@ -31,7 +29,6 @@ export class GeminiService {
     file: FileType,
     apiKey: string
   ): Promise<FileMetadataResponse | undefined> {
-    proxyManager.setGlobalProxy()
     const fileManager = new GoogleAIFileManager(apiKey)
 
     const cachedResponse = CacheService.get<any>(GeminiService.FILE_LIST_CACHE_KEY)
@@ -55,13 +52,11 @@ export class GeminiService {
   }
 
   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

@@ -16,16 +16,15 @@
 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 { LibSqlDb } from '@llm-tools/embedjs-libsql'
-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 { RAGApplication, RAGApplicationBuilder, TextLoader } from '@cherrystudio/embedjs'
+import type { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
+import { LibSqlDb } from '@cherrystudio/embedjs-libsql'
+import { SitemapLoader } from '@cherrystudio/embedjs-loader-sitemap'
+import { WebLoader } from '@cherrystudio/embedjs-loader-web'
+import Embeddings from '@main/embeddings/Embeddings'
 import { addFileLoader } from '@main/loader'
-import { proxyManager } from '@main/services/ProxyManager'
+import Reranker from '@main/reranker/Reranker'
 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'
@@ -114,30 +113,20 @@ class KnowledgeService {
     baseURL,
     dimensions
   }: KnowledgeBaseParams): Promise<RAGApplication> => {
-    const batchSize = 10
-    return new RAGApplicationBuilder()
+    let ragApplication: RAGApplication
+    const embeddings = new Embeddings({ model, apiKey, apiVersion, baseURL, dimensions } as KnowledgeBaseParams)
+    try {
+      ragApplication = await new RAGApplicationBuilder()
         .setModel('NO_MODEL')
-      .setEmbeddingModel(
-        apiVersion
-          ? new AzureOpenAiEmbeddings({
-              azureOpenAIApiKey: apiKey,
-              azureOpenAIApiVersion: apiVersion,
-              azureOpenAIApiDeploymentName: model,
-              azureOpenAIApiInstanceName: getInstanceName(baseURL),
-              configuration: { httpAgent: proxyManager.getProxyAgent() },
-              dimensions,
-              batchSize
-            })
-          : new OpenAiEmbeddings({
-              model,
-              apiKey,
-              configuration: { baseURL, httpAgent: proxyManager.getProxyAgent() },
-              dimensions,
-              batchSize
-            })
-      )
+        .setEmbeddingModel(embeddings)
         .setVectorDatabase(new LibSqlDb({ path: path.join(this.storageDir, id) }))
         .build()
+    } catch (e) {
+      Logger.error(e)
+      throw new Error(`Failed to create RAGApplication: ${e}`)
+    }
+
+    return ragApplication
   }
 
   public create = async (_: Electron.IpcMainInvokeEvent, base: KnowledgeBaseParams): Promise<void> => {
@@ -334,7 +323,6 @@ class KnowledgeService {
   ): 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)
@@ -426,7 +414,6 @@ class KnowledgeService {
   }
 
   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 }
@@ -470,7 +457,7 @@ class KnowledgeService {
     { uniqueId, uniqueIds, base }: { uniqueId: string; uniqueIds: string[]; base: KnowledgeBaseParams }
   ): Promise<void> => {
     const ragApplication = await this.getRagApplication(base)
-    console.debug(`[ KnowledgeService Remove Item UniqueId: ${uniqueId}]`)
+    console.log(`[ KnowledgeService Remove Item UniqueId: ${uniqueId}]`)
     for (const id of uniqueIds) {
       await ragApplication.deleteLoader(id)
     }
@@ -483,6 +470,16 @@ class KnowledgeService {
     const ragApplication = await this.getRagApplication(base)
     return await ragApplication.search(search)
   }
+
+  public rerank = async (
+    _: Electron.IpcMainInvokeEvent,
+    { search, base, results }: { search: string; base: KnowledgeBaseParams; results: ExtractChunkData[] }
+  ): Promise<ExtractChunkData[]> => {
+    if (results.length === 0) {
+      return results
+    }
+    return await new Reranker(base).rerank(search, results)
+  }
 }
 
 export default new KnowledgeService()

src/main/services/MCPService.ts

@@ -1,497 +1,228 @@
+import os from 'node:os'
+import path from 'node:path'
+
 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 { makeSureDirExists } from '@main/utils'
+import { getBinaryName, getBinaryPath } from '@main/utils/process'
+import { Client } from '@modelcontextprotocol/sdk/client/index.js'
+import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js'
+import { getDefaultEnvironment, StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'
+import { nanoid } from '@reduxjs/toolkit'
 import { MCPServer, MCPTool } from '@types'
-import log from 'electron-log'
-import { EventEmitter } from 'events'
-import { v4 as uuidv4 } from 'uuid'
+import { app } from 'electron'
+import Logger from 'electron-log'
 
-import { windowService } from './WindowService'
+import { CacheService } from './CacheService'
 
-/**
- * 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
+class McpService {
+  private clients: Map<string, Client> = new Map()
 
-  // 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
+  private getServerKey(server: MCPServer): string {
+    return JSON.stringify({
+      baseUrl: server.baseUrl,
+      command: server.command,
+      args: server.args,
+      registryUrl: server.registryUrl,
+      env: server.env,
+      id: server.id
     })
   }
 
-  /**
-   * 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
+  constructor() {
+    this.initClient = this.initClient.bind(this)
+    this.listTools = this.listTools.bind(this)
+    this.callTool = this.callTool.bind(this)
+    this.closeClient = this.closeClient.bind(this)
+    this.removeServer = this.removeServer.bind(this)
+    this.restartServer = this.restartServer.bind(this)
+    this.stopServer = this.stopServer.bind(this)
   }
 
-    // Initialize if not already initialized
-    if (!this.initialized) {
-      this.init().catch(this.logError('Failed to initialize MCP service'))
-    }
-  }
+  async initClient(server: MCPServer): Promise<Client> {
+    const serverKey = this.getServerKey(server)
 
-  /**
-   * 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)
+    // Check if we already have a client for this server configuration
+    const existingClient = this.clients.get(serverKey)
+    if (existingClient) {
+      // Check if the existing client is still connected
+      const pingResult = await existingClient.ping()
+      Logger.info(`[MCP] Ping result for ${server.name}:`, pingResult)
+      // If the ping fails, remove the client from the cache
+      // and create a new one
+      if (!pingResult) {
+        this.clients.delete(serverKey)
       } 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)
+        return existingClient
       }
     }
 
-  /**
-   * Activate an MCP server
-   */
-  public async activate(server: MCPServer): Promise<void> {
-    await this.ensureInitialized()
+    // Create new client instance for each connection
+    const client = new Client({ name: 'Cherry Studio', version: app.getVersion() }, { capabilities: {} })
 
-    const { name, baseUrl, command, args, env } = server
-
-    // Skip if already running
-    if (this.clients[name]) {
-      log.info(`[MCP] Server ${name} is already running`)
-      return
-    }
+    const args = [...(server.args || [])]
 
     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
+      if (server.baseUrl) {
+        transport = new SSEClientTransport(new URL(server.baseUrl))
+      } else if (server.command) {
+        let cmd = server.command
+
+        if (server.command === 'npx' || server.command === 'bun' || server.command === 'bunx') {
+          cmd = await getBinaryPath('bun')
+          Logger.info(`[MCP] Using command: ${cmd}`)
+
+          // add -x to args if args exist
+          if (args && args.length > 0) {
+            if (!args.includes('-y')) {
+              !args.includes('-y') && args.unshift('-y')
+            }
+            if (!args.includes('x')) {
+              args.unshift('x')
+            }
+          }
+          if (server.registryUrl) {
+            server.env = {
+              ...server.env,
+              NPM_CONFIG_REGISTRY: server.registryUrl
             }
 
-        transport = new this.stdioTransport!({
+            // if the server name is mcp-auto-install, use the mcp-registry.json file in the bin directory
+            if (server.name === 'mcp-auto-install') {
+              const binPath = await getBinaryPath()
+              makeSureDirExists(binPath)
+              server.env.MCP_REGISTRY_PATH = path.join(binPath, 'mcp-registry.json')
+            }
+          }
+        } else if (server.command === 'uvx' || server.command === 'uv') {
+          cmd = await getBinaryPath(server.command)
+          if (server.registryUrl) {
+            server.env = {
+              ...server.env,
+              UV_DEFAULT_INDEX: server.registryUrl,
+              PIP_INDEX_URL: server.registryUrl
+            }
+          }
+        }
+
+        Logger.info(`[MCP] Starting server with command: ${cmd} ${args ? args.join(' ') : ''}`)
+        // Logger.info(`[MCP] Environment variables for server:`, server.env)
+
+        transport = new StdioClientTransport({
           command: cmd,
           args,
-          stderr: 'pipe',
           env: {
+            ...getDefaultEnvironment(),
             PATH: this.getEnhancedPath(process.env.PATH || ''),
-            ...env
+            ...server.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 })
+      // Store the new client in the cache
+      this.clients.set(serverKey, client)
 
-      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
+      Logger.info(`[MCP] Activated server: ${server.name}`)
+      return client
+    } catch (error: any) {
+      Logger.error(`[MCP] Error activating server ${server.name}:`, error)
       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
+  async closeClient(serverKey: string) {
+    const client = this.clients.get(serverKey)
+    if (client) {
+      // Remove the client from the cache
+      await client.close()
+      Logger.info(`[MCP] Closed server: ${serverKey}`)
+      this.clients.delete(serverKey)
+      CacheService.remove(`mcp:list_tool:${serverKey}`)
+      Logger.info(`[MCP] Cleared cache for server: ${serverKey}`)
+    } else {
+      Logger.warn(`[MCP] No client found for server: ${serverKey}`)
     }
   }
 
-  /**
-   * 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)
+  async stopServer(_: Electron.IpcMainInvokeEvent, server: MCPServer) {
+    const serverKey = this.getServerKey(server)
+    Logger.info(`[MCP] Stopping server: ${server.name}`)
+    await this.closeClient(serverKey)
   }
 
-      // 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}`)
+  async removeServer(_: Electron.IpcMainInvokeEvent, server: MCPServer) {
+    const serverKey = this.getServerKey(server)
+    const existingClient = this.clients.get(serverKey)
+    if (existingClient) {
+      await this.closeClient(serverKey)
     }
   }
 
-      log.info(`[MCP] Total tools listed: ${allTools.length}`)
-      return allTools
-    } catch (error) {
-      this.logError('Error listing tools:')
-      return []
-    }
+  async restartServer(_: Electron.IpcMainInvokeEvent, server: MCPServer) {
+    Logger.info(`[MCP] Restarting server: ${server.name}`)
+    const serverKey = this.getServerKey(server)
+    await this.closeClient(serverKey)
+    await this.initClient(server)
   }
 
-  /**
-   * 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`)
+  async listTools(_: Electron.IpcMainInvokeEvent, server: MCPServer) {
+    const client = await this.initClient(server)
+    const serverKey = this.getServerKey(server)
+    const cacheKey = `mcp:list_tool:${serverKey}`
+    if (CacheService.has(cacheKey)) {
+      Logger.info(`[MCP] Tools from ${server.name} loaded from cache`)
+      const cachedTools = CacheService.get<MCPTool[]>(cacheKey)
+      if (cachedTools && cachedTools.length > 0) {
+        return cachedTools
       }
-
-    const { tools } = await this.clients[serverName].listTools()
-    return tools.map((tool: any) => ({
+    }
+    Logger.info(`[MCP] Listing tools for server: ${server.name}`)
+    const { tools } = await client.listTools()
+    const serverTools: MCPTool[] = []
+    tools.map((tool: any) => {
+      const serverTool: MCPTool = {
         ...tool,
-      serverName,
-      id: 'f' + uuidv4().replace(/-/g, '')
-    }))
+        id: `f${nanoid()}`,
+        serverId: server.id,
+        serverName: server.name
+      }
+      serverTools.push(serverTool)
+    })
+    CacheService.set(cacheKey, serverTools, 5 * 60 * 1000)
+    return serverTools
   }
 
   /**
    * 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)
-
+  public async callTool(
+    _: Electron.IpcMainInvokeEvent,
+    { server, name, args }: { server: MCPServer; name: string; args: any }
+  ): Promise<any> {
     try {
-      return await this.clients[client].callTool({
-        name,
-        arguments: args
-      })
+      Logger.info('[MCP] Calling:', server.name, name, args)
+      const client = await this.initClient(server)
+      const result = await client.callTool({ name, arguments: args })
+      return result
     } catch (error) {
-      log.error(`[MCP] Error calling tool ${name} on ${client}:`, error)
+      Logger.error(`[MCP] Error calling tool ${name} on ${server.name}:`, 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`)
+  public async getInstallInfo() {
+    const dir = path.join(os.homedir(), '.cherrystudio', 'bin')
+    const uvName = await getBinaryName('uv')
+    const bunName = await getBinaryName('bun')
+    const uvPath = path.join(dir, uvName)
+    const bunPath = path.join(dir, bunName)
+    return { dir, uvPath, bunPath }
   }
 
   /**
@@ -519,6 +250,7 @@ export default class MCPService extends EventEmitter {
         `${homeDir}/.npm-global/bin`,
         `${homeDir}/.yarn/bin`,
         `${homeDir}/.cargo/bin`,
+        `${homeDir}/.cherrystudio/bin`,
         '/opt/local/bin'
       )
     }
@@ -532,12 +264,18 @@ export default class MCPService extends EventEmitter {
         `${homeDir}/.npm-global/bin`,
         `${homeDir}/.yarn/bin`,
         `${homeDir}/.cargo/bin`,
+        `${homeDir}/.cherrystudio/bin`,
         '/snap/bin'
       )
     }
 
     if (isWin) {
-      newPaths.push(`${process.env.APPDATA}\\npm`, `${homeDir}\\AppData\\Local\\Yarn\\bin`, `${homeDir}\\.cargo\\bin`)
+      newPaths.push(
+        `${process.env.APPDATA}\\npm`,
+        `${homeDir}\\AppData\\Local\\Yarn\\bin`,
+        `${homeDir}\\.cargo\\bin`,
+        `${homeDir}\\.cherrystudio\\bin`
+      )
     }
 
     // 只添加不存在的路径
@@ -551,3 +289,5 @@ export default class MCPService extends EventEmitter {
     return Array.from(existingPaths).join(pathSeparator)
   }
 }
+
+export default new McpService()

src/main/services/NutstoreService.ts

@@ -0,0 +1,134 @@
+import path from 'node:path'
+
+import { NUTSTORE_HOST } from '@shared/config/nutstore'
+import { XMLParser } from 'fast-xml-parser'
+import { isNil, partial } from 'lodash'
+import { type FileStat } from 'webdav'
+
+interface OAuthResponse {
+  username: string
+  userid: string
+  access_token: string
+}
+
+interface WebDAVResponse {
+  multistatus: {
+    response: Array<{
+      href: string
+      propstat: {
+        prop: {
+          displayname: string
+          resourcetype: { collection?: any }
+          getlastmodified?: string
+          getcontentlength?: string
+          getcontenttype?: string
+        }
+        status: string
+      }
+    }>
+  }
+}
+
+export async function getNutstoreSSOUrl() {
+  const { createOAuthUrl } = await import('../integration/nutstore/sso/lib')
+
+  const url = createOAuthUrl({
+    app: 'cherrystudio'
+  })
+  return url
+}
+
+export async function decryptToken(token: string) {
+  const { decrypt } = await import('../integration/nutstore/sso/lib')
+  try {
+    const decrypted = decrypt('cherrystudio', token)
+    return JSON.parse(decrypted) as OAuthResponse
+  } catch (error) {
+    console.error('解密失败:', error)
+    return null
+  }
+}
+
+export async function getDirectoryContents(token: string, target: string): Promise<FileStat[]> {
+  const contents: FileStat[] = []
+  if (!target.startsWith('/')) {
+    target = '/' + target
+  }
+
+  let currentUrl = `${NUTSTORE_HOST}${target}`
+
+  while (true) {
+    const response = await fetch(currentUrl, {
+      method: 'PROPFIND',
+      headers: {
+        Authorization: `Basic ${token}`,
+        'Content-Type': 'application/xml',
+        Depth: '1'
+      },
+      body: `<?xml version="1.0" encoding="utf-8"?>
+        <propfind xmlns="DAV:">
+          <prop>
+            <displayname/>
+            <resourcetype/>
+            <getlastmodified/>
+            <getcontentlength/>
+            <getcontenttype/>
+          </prop>
+        </propfind>`
+    })
+
+    const text = await response.text()
+
+    const result = parseXml<WebDAVResponse>(text)
+    const items = Array.isArray(result.multistatus.response)
+      ? result.multistatus.response
+      : [result.multistatus.response]
+
+    // 跳过第一个条目（当前目录）
+    contents.push(...items.slice(1).map(partial(convertToFileStat, '/dav')))
+
+    const linkHeader = response.headers['link'] || response.headers['Link']
+    if (!linkHeader) {
+      break
+    }
+
+    const nextLink = extractNextLink(linkHeader)
+    if (!nextLink) {
+      break
+    }
+
+    currentUrl = decodeURI(nextLink)
+  }
+
+  return contents
+}
+
+function extractNextLink(linkHeader: string): string | null {
+  const matches = linkHeader.match(/<([^>]+)>;\s*rel="next"/)
+  return matches ? matches[1] : null
+}
+
+function convertToFileStat(serverBase: string, item: WebDAVResponse['multistatus']['response'][number]): FileStat {
+  const props = item.propstat.prop
+  const isDir = !isNil(props.resourcetype?.collection)
+  const href = decodeURIComponent(item.href)
+  const filename = serverBase === '/' ? href : path.posix.join('/', href.replace(serverBase, ''))
+
+  return {
+    filename: filename.endsWith('/') ? filename.slice(0, -1) : filename,
+    basename: path.basename(filename),
+    lastmod: props.getlastmodified || '',
+    size: props.getcontentlength ? parseInt(props.getcontentlength, 10) : 0,
+    type: isDir ? 'directory' : 'file',
+    etag: null,
+    mime: props.getcontenttype
+  }
+}
+
+function parseXml<T>(xml: string) {
+  const parser = new XMLParser({
+    attributeNamePrefix: '',
+    removeNSPrefix: true
+  })
+  return parser.parse(xml) as T
+}

src/main/services/ObsidianVaultService.ts

@@ -0,0 +1,167 @@
+import { app } from 'electron'
+import fs from 'fs'
+import path from 'path'
+
+interface VaultInfo {
+  path: string
+  name: string
+}
+
+interface FileInfo {
+  path: string
+  type: 'folder' | 'markdown'
+  name: string
+}
+
+class ObsidianVaultService {
+  private obsidianConfigPath: string
+
+  constructor() {
+    // 根据操作系统获取Obsidian配置文件路径
+    if (process.platform === 'win32') {
+      this.obsidianConfigPath = path.join(app.getPath('appData'), 'obsidian', 'obsidian.json')
+    } else if (process.platform === 'darwin') {
+      this.obsidianConfigPath = path.join(
+        app.getPath('home'),
+        'Library',
+        'Application Support',
+        'obsidian',
+        'obsidian.json'
+      )
+    } else {
+      // Linux
+      this.obsidianConfigPath = path.join(app.getPath('home'), '.config', 'obsidian', 'obsidian.json')
+    }
+  }
+
+  /**
+   * 获取所有的Obsidian Vault
+   */
+  getVaults(): VaultInfo[] {
+    try {
+      if (!fs.existsSync(this.obsidianConfigPath)) {
+        return []
+      }
+
+      const configContent = fs.readFileSync(this.obsidianConfigPath, 'utf8')
+      const config = JSON.parse(configContent)
+
+      if (!config.vaults) {
+        return []
+      }
+
+      return Object.entries(config.vaults).map(([, vault]: [string, any]) => ({
+        path: vault.path,
+        name: vault.name || path.basename(vault.path)
+      }))
+    } catch (error) {
+      console.error('获取Obsidian Vault失败:', error)
+      return []
+    }
+  }
+
+  /**
+   * 获取Vault中的文件夹和Markdown文件结构
+   */
+  getVaultStructure(vaultPath: string): FileInfo[] {
+    const results: FileInfo[] = []
+
+    try {
+      // 检查vault路径是否存在
+      if (!fs.existsSync(vaultPath)) {
+        console.error('Vault路径不存在:', vaultPath)
+        return []
+      }
+
+      // 检查是否是目录
+      const stats = fs.statSync(vaultPath)
+      if (!stats.isDirectory()) {
+        console.error('Vault路径不是一个目录:', vaultPath)
+        return []
+      }
+
+      this.traverseDirectory(vaultPath, '', results)
+    } catch (error) {
+      console.error('读取Vault文件夹结构失败:', error)
+    }
+
+    return results
+  }
+
+  /**
+   * 递归遍历目录获取所有文件夹和Markdown文件
+   */
+  private traverseDirectory(dirPath: string, relativePath: string, results: FileInfo[]) {
+    try {
+      // 首先添加当前文件夹
+      if (relativePath) {
+        results.push({
+          path: relativePath,
+          type: 'folder',
+          name: path.basename(relativePath)
+        })
+      }
+
+      // 确保目录存在且可访问
+      if (!fs.existsSync(dirPath)) {
+        console.error('目录不存在:', dirPath)
+        return
+      }
+
+      let items
+      try {
+        items = fs.readdirSync(dirPath, { withFileTypes: true })
+      } catch (err) {
+        console.error(`无法读取目录 ${dirPath}:`, err)
+        return
+      }
+
+      for (const item of items) {
+        // 忽略以.开头的隐藏文件夹和文件
+        if (item.name.startsWith('.')) {
+          continue
+        }
+
+        const newRelativePath = relativePath ? `${relativePath}/${item.name}` : item.name
+        const fullPath = path.join(dirPath, item.name)
+
+        if (item.isDirectory()) {
+          this.traverseDirectory(fullPath, newRelativePath, results)
+        } else if (item.isFile() && item.name.endsWith('.md')) {
+          // 收集.md文件
+          results.push({
+            path: newRelativePath,
+            type: 'markdown',
+            name: item.name
+          })
+        }
+      }
+    } catch (error) {
+      console.error(`遍历目录出错 ${dirPath}:`, error)
+    }
+  }
+
+  /**
+   * 获取指定Vault的文件夹和Markdown文件结构
+   * @param vaultName vault名称
+   */
+  getFilesByVaultName(vaultName: string): FileInfo[] {
+    try {
+      const vaults = this.getVaults()
+      const vault = vaults.find((v) => v.name === vaultName)
+
+      if (!vault) {
+        console.error('未找到指定名称的Vault:', vaultName)
+        return []
+      }
+
+      console.log('获取Vault文件结构:', vault.name, vault.path)
+      return this.getVaultStructure(vault.path)
+    } catch (error) {
+      console.error('获取Vault文件结构时发生错误:', error)
+      return []
+    }
+  }
+}
+
+export default ObsidianVaultService

src/main/services/ProtocolClient.ts

@@ -0,0 +1,34 @@
+import { windowService } from './WindowService'
+
+export const CHERRY_STUDIO_PROTOCOL = 'cherrystudio'
+
+export function registerProtocolClient(app: Electron.App) {
+  if (process.defaultApp) {
+    if (process.argv.length >= 2) {
+      app.setAsDefaultProtocolClient(CHERRY_STUDIO_PROTOCOL, process.execPath, [process.argv[1]])
+    }
+  }
+
+  app.setAsDefaultProtocolClient('cherrystudio')
+}
+
+export function handleProtocolUrl(url: string) {
+  if (!url) return
+  // Process the URL that was used to open the app
+  // The url will be in the format: cherrystudio://data?param1=value1&param2=value2
+  console.log('Received URL:', url)
+
+  // Parse the URL and extract parameters
+  const urlObj = new URL(url)
+  const params = new URLSearchParams(urlObj.search)
+
+  // You can send the data to your renderer process
+  const mainWindow = windowService.getMainWindow()
+
+  if (mainWindow && !mainWindow.isDestroyed()) {
+    mainWindow.webContents.send('protocol-data', {
+      url,
+      params: Object.fromEntries(params.entries())
+    })
+  }
+}

src/main/services/ProxyManager.ts

@@ -1,25 +1,23 @@
 import { ProxyConfig as _ProxyConfig, session } from 'electron'
 import { socksDispatcher } from 'fetch-socks'
-import { HttpsProxyAgent } from 'https-proxy-agent'
+import { ProxyAgent as GeneralProxyAgent } from 'proxy-agent'
 import { ProxyAgent, setGlobalDispatcher } from 'undici'
 
 type ProxyMode = 'system' | 'custom' | 'none'
 
 export interface ProxyConfig {
   mode: ProxyMode
-  url?: string | null
+  url?: string
 }
 
 export class ProxyManager {
   private config: ProxyConfig
-  private proxyAgent: HttpsProxyAgent | null = null
-  private proxyUrl: string | null = null
+  private proxyAgent: GeneralProxyAgent | null = null
   private systemProxyInterval: NodeJS.Timeout | null = null
 
   constructor() {
     this.config = {
-      mode: 'none',
-      url: ''
+      mode: 'none'
     }
   }
 
@@ -51,7 +49,7 @@ export class ProxyManager {
       if (this.config.mode === 'system') {
         await this.setSystemProxy()
         this.monitorSystemProxy()
-      } else if (this.config.mode == 'custom') {
+      } else if (this.config.mode === 'custom') {
         await this.setCustomProxy()
       } else {
         await this.clearProxy()
@@ -73,11 +71,13 @@ export class ProxyManager {
   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)
+      const proxyString = await session.defaultSession.resolveProxy('https://dummy.com')
+      const [protocol, address] = proxyString.split(';')[0].split(' ')
+      const url = protocol === 'PROXY' ? `http://${address}` : null
+      if (url && url !== this.config.url) {
+        this.config.url = url.toLowerCase()
+        this.setEnvironment(this.config.url)
+        this.proxyAgent = new GeneralProxyAgent()
       }
     } catch (error) {
       console.error('Failed to set system proxy:', error)
@@ -88,10 +88,9 @@ export class ProxyManager {
   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 })
+        this.setEnvironment(this.config.url)
+        this.proxyAgent = new GeneralProxyAgent()
+        await this.setSessionsProxy({ proxyRules: this.config.url })
       }
     } catch (error) {
       console.error('Failed to set custom proxy:', error)
@@ -99,47 +98,34 @@ export class ProxyManager {
     }
   }
 
-  private async clearProxy(): Promise<void> {
+  private clearEnvironment(): void {
     delete process.env.HTTP_PROXY
     delete process.env.HTTPS_PROXY
-    await this.setSessionsProxy({})
+    delete process.env.grpc_proxy
+    delete process.env.http_proxy
+    delete process.env.https_proxy
+  }
+
+  private async clearProxy(): Promise<void> {
+    this.clearEnvironment()
+    await this.setSessionsProxy({ mode: 'direct' })
     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 {
+  getProxyAgent(): GeneralProxyAgent | null {
     return this.proxyAgent
   }
 
-  getProxyUrl(): string | null {
-    return this.proxyUrl
+  getProxyUrl(): string {
+    return this.config.url || ''
   }
 
   setGlobalProxy() {
-    const proxyUrl = this.proxyUrl
+    const proxyUrl = this.config.url
     if (proxyUrl) {
-      const [protocol, host, port] = proxyUrl.split(':')
+      const [protocol, address] = proxyUrl.split('://')
+      const [host, port] = address.split(':')
       if (!protocol.includes('socks')) {
         setGlobalDispatcher(new ProxyAgent(proxyUrl))
       } else {

src/main/services/ShortcutService.ts

@@ -8,6 +8,9 @@ import { windowService } from './WindowService'
 let showAppAccelerator: string | null = null
 let showMiniWindowAccelerator: string | null = null
 
+// store the focus and blur handlers for each window to unregister them later
+const windowOnHandlers = new Map<BrowserWindow, { onFocusHandler: () => void; onBlurHandler: () => void }>()
+
 function getShortcutHandler(shortcut: Shortcut) {
   switch (shortcut.key) {
     case 'zoom_in':
@@ -20,17 +23,8 @@ function getShortcutHandler(shortcut: Shortcut) {
         configManager.setZoomFactor(1)
       }
     case 'show_app':
-      return (window: BrowserWindow) => {
-        if (window.isVisible()) {
-          if (window.isFocused()) {
-            window.hide()
-          } else {
-            window.focus()
-          }
-        } else {
-          window.show()
-          window.focus()
-        }
+      return () => {
+        windowService.toggleMainWindow()
       }
     case 'mini_window':
       return () => {
@@ -113,10 +107,19 @@ const convertShortcutRecordedByKeyboardEventKeyValueToElectronGlobalShortcutForm
 
 export function registerShortcuts(window: BrowserWindow) {
   window.once('ready-to-show', () => {
-    window.webContents.setZoomFactor(configManager.getZoomFactor())
+    if (configManager.getLaunchToTray()) {
+      registerOnlyUniversalShortcuts()
+    }
   })
 
-  const register = () => {
+  //only for clearer code
+  const registerOnlyUniversalShortcuts = () => {
+    register(true)
+  }
+
+  //onlyUniversalShortcuts is used to register shortcuts that are not window specific, like show_app & mini_window
+  //onlyUniversalShortcuts is needed when we launch to tray
+  const register = (onlyUniversalShortcuts: boolean = false) => {
     if (window.isDestroyed()) return
 
     const shortcuts = configManager.getShortcuts()
@@ -128,44 +131,55 @@ export function registerShortcuts(window: BrowserWindow) {
           return
         }
 
-        const handler = getShortcutHandler(shortcut)
+        //if not enabled, exit early from the process.
+        if (!shortcut.enabled) {
+          return
+        }
 
+        // only register universal shortcuts when needed
+        if (onlyUniversalShortcuts && !['show_app', 'mini_window'].includes(shortcut.key)) {
+          return
+        }
+
+        const handler = getShortcutHandler(shortcut)
         if (!handler) {
           return
         }
 
-        const accelerator = formatShortcutKey(shortcut.shortcut)
-
-        if (shortcut.key === 'show_app' && shortcut.enabled) {
-          showAppAccelerator = accelerator
-        }
-
-        if (shortcut.key === 'mini_window' && shortcut.enabled) {
-          showMiniWindowAccelerator = accelerator
-        }
-
-        if (shortcut.key.includes('zoom')) {
         switch (shortcut.key) {
-            case 'zoom_in':
-              globalShortcut.register('CommandOrControl+=', () => shortcut.enabled && handler(window))
-              globalShortcut.register('CommandOrControl+numadd', () => shortcut.enabled && handler(window))
-              return
-            case 'zoom_out':
-              globalShortcut.register('CommandOrControl+-', () => shortcut.enabled && handler(window))
-              globalShortcut.register('CommandOrControl+numsub', () => shortcut.enabled && handler(window))
-              return
-            case 'zoom_reset':
-              globalShortcut.register('CommandOrControl+0', () => shortcut.enabled && handler(window))
+          case 'show_app':
+            showAppAccelerator = formatShortcutKey(shortcut.shortcut)
+            break
+
+          case 'mini_window':
+            //available only when QuickAssistant enabled
+            if (!configManager.getEnableQuickAssistant()) {
               return
             }
+            showMiniWindowAccelerator = formatShortcutKey(shortcut.shortcut)
+            break
+
+          //the following ZOOMs will register shortcuts seperately, so will return
+          case 'zoom_in':
+            globalShortcut.register('CommandOrControl+=', () => handler(window))
+            globalShortcut.register('CommandOrControl+numadd', () => handler(window))
+            return
+
+          case 'zoom_out':
+            globalShortcut.register('CommandOrControl+-', () => handler(window))
+            globalShortcut.register('CommandOrControl+numsub', () => handler(window))
+            return
+
+          case 'zoom_reset':
+            globalShortcut.register('CommandOrControl+0', () => handler(window))
+            return
         }
 
-        if (shortcut.enabled) {
         const accelerator = convertShortcutRecordedByKeyboardEventKeyValueToElectronGlobalShortcutFormat(
           shortcut.shortcut
         )
+
         globalShortcut.register(accelerator, () => handler(window))
-        }
       } catch (error) {
         Logger.error(`[ShortcutService] Failed to register shortcut ${shortcut.key}`)
       }
@@ -196,8 +210,16 @@ export function registerShortcuts(window: BrowserWindow) {
     }
   }
 
-  window.on('focus', () => register())
-  window.on('blur', () => unregister())
+  // only register the event handlers once
+  if (undefined === windowOnHandlers.get(window)) {
+    // pass register() directly to listener, the func will receive Event as argument, it's not expected
+    const registerHandler = () => {
+      register()
+    }
+    window.on('focus', registerHandler)
+    window.on('blur', unregister)
+    windowOnHandlers.set(window, { onFocusHandler: registerHandler, onBlurHandler: unregister })
+  }
 
   if (!window.isDestroyed() && window.isFocused()) {
     register()
@@ -208,6 +230,11 @@ export function unregisterAllShortcuts() {
   try {
     showAppAccelerator = null
     showMiniWindowAccelerator = null
+    windowOnHandlers.forEach((handlers, window) => {
+      window.off('focus', handlers.onFocusHandler)
+      window.off('blur', handlers.onBlurHandler)
+    })
+    windowOnHandlers.clear()
     globalShortcut.unregisterAll()
   } catch (error) {
     Logger.error('[ShortcutService] Failed to unregister all shortcuts')

src/main/services/WebDav.ts

@@ -1,28 +1,31 @@
-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'
+import {
+  BufferLike,
+  createClient,
+  CreateDirectoryOptions,
+  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)
     this.getFileContents = this.getFileContents.bind(this)
+    this.createDirectory = this.createDirectory.bind(this)
   }
 
   public putFileContents = async (
@@ -69,4 +72,30 @@ export default class WebDav {
       throw error
     }
   }
+
+  public checkConnection = async () => {
+    if (!this.instance) {
+      throw new Error('WebDAV client not initialized')
+    }
+
+    try {
+      return await this.instance.exists('/')
+    } catch (error) {
+      Logger.error('[WebDAV] Error checking connection:', error)
+      throw error
+    }
+  }
+
+  public createDirectory = async (path: string, options?: CreateDirectoryOptions) => {
+    if (!this.instance) {
+      throw new Error('WebDAV client not initialized')
+    }
+
+    try {
+      return await this.instance.createDirectory(path, options)
+    } catch (error) {
+      Logger.error('[WebDAV] Error creating directory on WebDAV:', error)
+      throw error
+    }
+  }
 }

src/main/services/WindowService.ts

@@ -1,5 +1,5 @@
 import { is } from '@electron-toolkit/utils'
-import { isLinux, isWin } from '@main/constant'
+import { isDev, isLinux, isMac, isWin } from '@main/constant'
 import { getFilesDir } from '@main/utils/file'
 import { app, BrowserWindow, ipcMain, Menu, MenuItem, shell } from 'electron'
 import Logger from 'electron-log'
@@ -15,7 +15,11 @@ export class WindowService {
   private static instance: WindowService | null = null
   private mainWindow: BrowserWindow | null = null
   private miniWindow: BrowserWindow | null = null
+  private isPinnedMiniWindow: boolean = false
   private wasFullScreen: boolean = false
+  //hacky-fix: store the focused status of mainWindow before miniWindow shows
+  //to restore the focus status when miniWindow hides
+  private wasMainWindowFocused: boolean = false
   private selectionMenuWindow: BrowserWindow | null = null
   private lastSelectedText: string = ''
   private contextMenu: Menu | null = null
@@ -30,6 +34,7 @@ export class WindowService {
   public createMainWindow(): BrowserWindow {
     if (this.mainWindow && !this.mainWindow.isDestroyed()) {
       this.mainWindow.show()
+      this.mainWindow.focus()
       return this.mainWindow
     }
 
@@ -39,8 +44,6 @@ export class WindowService {
     })
 
     const theme = configManager.getTheme()
-    const isMac = process.platform === 'darwin'
-    const isLinux = process.platform === 'linux'
 
     this.mainWindow = new BrowserWindow({
       x: mainWindowState.x,
@@ -58,7 +61,7 @@ export class WindowService {
       titleBarOverlay: theme === 'dark' ? titleBarOverlayDark : titleBarOverlayLight,
       backgroundColor: isMac ? undefined : theme === 'dark' ? '#181818' : '#FFFFFF',
       trafficLightPosition: { x: 8, y: 12 },
-      ...(process.platform === 'linux' ? { icon } : {}),
+      ...(isLinux ? { icon } : {}),
       webPreferences: {
         preload: join(__dirname, '../preload/index.js'),
         sandbox: false,
@@ -70,6 +73,12 @@ export class WindowService {
 
     this.setupMainWindow(this.mainWindow, mainWindowState)
 
+    //preload miniWindow to resolve series of issues about miniWindow in Mac
+    const enableQuickAssistant = configManager.getEnableQuickAssistant()
+    if (enableQuickAssistant && !this.miniWindow) {
+      this.miniWindow = this.createMiniWindow(true)
+    }
+
     return this.mainWindow
   }
 
@@ -128,6 +137,13 @@ export class WindowService {
       this.contextMenu?.popup()
     })
 
+    // Dangerous API
+    if (isDev) {
+      mainWindow.webContents.on('will-attach-webview', (_, webPreferences) => {
+        webPreferences.preload = join(__dirname, '../preload/index.js')
+      })
+    }
+
     // Handle webview context menu
     mainWindow.webContents.on('did-attach-webview', (_, webContents) => {
       webContents.on('context-menu', () => {
@@ -138,7 +154,15 @@ export class WindowService {
 
   private setupWindowEvents(mainWindow: BrowserWindow) {
     mainWindow.once('ready-to-show', () => {
+      mainWindow.webContents.setZoomFactor(configManager.getZoomFactor())
+
+      // show window only when laucn to tray not set
+      const isLaunchToTray = configManager.getLaunchToTray()
+      if (!isLaunchToTray) {
+        //[mac]hacky-fix: miniWindow set visibleOnFullScreen:true will cause dock icon disappeared
+        app.dock?.show()
         mainWindow.show()
+      }
     })
 
     // 处理全屏相关事件
@@ -152,6 +176,25 @@ export class WindowService {
       mainWindow.webContents.send('fullscreen-status-changed', false)
     })
 
+    // set the zoom factor again when the window is going to resize
+    //
+    // this is a workaround for the known bug that
+    // the zoom factor is reset to cached value when window is resized after routing to other page
+    // see: https://github.com/electron/electron/issues/10572
+    //
+    mainWindow.on('will-resize', () => {
+      mainWindow.webContents.setZoomFactor(configManager.getZoomFactor())
+    })
+
+    // ARCH: as `will-resize` is only for Win & Mac,
+    // linux has the same problem, use `resize` listener instead
+    // but `resize` will fliker the ui
+    if (isLinux) {
+      mainWindow.on('resize', () => {
+        mainWindow.webContents.setZoomFactor(configManager.getZoomFactor())
+      })
+    }
+
     // 添加Escape键退出全屏的支持
     mainWindow.webContents.on('before-input-event', (event, input) => {
       // 当按下Escape键且窗口处于全屏状态时退出全屏
@@ -247,12 +290,20 @@ export class WindowService {
         return app.quit()
       }
 
-      // 没有开启托盘，且是Windows或Linux系统，直接退出
-      const notInTray = !configManager.getTray()
-      if ((isWin || isLinux) && notInTray) {
+      // 托盘及关闭行为设置
+      const isShowTray = configManager.getTray()
+      const isTrayOnClose = configManager.getTrayOnClose()
+
+      // 没有开启托盘，或者开启了托盘，但设置了直接关闭，应执行直接退出
+      if (!isShowTray || (isShowTray && !isTrayOnClose)) {
+        // 如果是Windows或Linux，直接退出
+        // mac按照系统默认行为，不退出
+        if (isWin || isLinux) {
           return app.quit()
         }
+      }
 
+      //上述逻辑以下，是“开启托盘+设置关闭时最小化到托盘”的情况
       // 如果是Windows或Linux，且处于全屏状态，则退出应用
       if (this.wasFullScreen) {
         if (isWin || isLinux) {
@@ -263,8 +314,12 @@ export class WindowService {
           return
         }
       }
+
       event.preventDefault()
       mainWindow.hide()
+
+      //for mac users, should hide dock icon if close to tray
+      app.dock?.hide()
     })
 
     mainWindow.on('closed', () => {
@@ -286,45 +341,51 @@ export class WindowService {
     if (this.mainWindow && !this.mainWindow.isDestroyed()) {
       if (this.mainWindow.isMinimized()) {
         this.mainWindow.restore()
+        return
       }
+      //[macOS] Known Issue
+      // setVisibleOnAllWorkspaces true/false will NOT bring window to current desktop in Mac (works fine with Windows)
+      // AppleScript may be a solution, but it's not worth
+      this.mainWindow.setVisibleOnAllWorkspaces(true)
       this.mainWindow.show()
       this.mainWindow.focus()
+      this.mainWindow.setVisibleOnAllWorkspaces(false)
     } else {
       this.mainWindow = this.createMainWindow()
+    }
+  }
+
+  public toggleMainWindow() {
+    // should not toggle main window when in full screen
+    if (this.wasFullScreen) {
+      return
+    }
+
+    if (this.mainWindow && !this.mainWindow.isDestroyed() && this.mainWindow.isVisible()) {
+      if (this.mainWindow.isFocused()) {
+        // if tray is enabled, hide the main window, else do nothing
+        if (configManager.getTray()) {
+          this.mainWindow.hide()
+          app.dock?.hide()
+        }
+      } else {
         this.mainWindow.focus()
       }
-  }
-
-  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()
+    this.showMainWindow()
   }
 
-    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'
-
+  public createMiniWindow(isPreload: boolean = false): BrowserWindow {
     this.miniWindow = new BrowserWindow({
-      width: 500,
-      height: 520,
-      show: true,
+      width: 550,
+      height: 400,
+      minWidth: 350,
+      minHeight: 380,
+      maxWidth: 1024,
+      maxHeight: 768,
+      show: false,
       autoHideMenuBar: true,
       transparent: isMac,
       vibrancy: 'under-window',
@@ -332,8 +393,13 @@ export class WindowService {
       center: true,
       frame: false,
       alwaysOnTop: true,
-      resizable: false,
+      resizable: true,
       useContentSize: true,
+      ...(isMac ? { type: 'panel' } : {}),
+      skipTaskbar: true,
+      minimizable: false,
+      maximizable: false,
+      fullscreenable: false,
       webPreferences: {
         preload: join(__dirname, '../preload/index.js'),
         sandbox: false,
@@ -342,8 +408,25 @@ export class WindowService {
       }
     })
 
+    //miniWindow should show in current desktop
+    this.miniWindow?.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true })
+    //make miniWindow always on top of fullscreen apps with level set
+    this.miniWindow.setAlwaysOnTop(true, 'screen-saver', 1)
+
+    this.miniWindow.on('ready-to-show', () => {
+      if (isPreload) {
+        return
+      }
+
+      this.wasMainWindowFocused = this.mainWindow?.isFocused() || false
+      this.miniWindow?.center()
+      this.miniWindow?.show()
+    })
+
     this.miniWindow.on('blur', () => {
-      this.miniWindow?.hide()
+      if (!this.isPinnedMiniWindow) {
+        this.hideMiniWindow()
+      }
     })
 
     this.miniWindow.on('closed', () => {
@@ -369,9 +452,48 @@ export class WindowService {
         hash: '#/mini'
       })
     }
+
+    return this.miniWindow
+  }
+
+  public showMiniWindow() {
+    const enableQuickAssistant = configManager.getEnableQuickAssistant()
+
+    if (!enableQuickAssistant) {
+      return
+    }
+
+    if (this.selectionMenuWindow && !this.selectionMenuWindow.isDestroyed()) {
+      this.selectionMenuWindow.hide()
+    }
+
+    if (this.miniWindow && !this.miniWindow.isDestroyed()) {
+      this.wasMainWindowFocused = this.mainWindow?.isFocused() || false
+
+      if (this.miniWindow.isMinimized()) {
+        this.miniWindow.restore()
+      }
+      this.miniWindow.show()
+      return
+    }
+
+    this.miniWindow = this.createMiniWindow()
   }
 
   public hideMiniWindow() {
+    //hacky-fix:[mac/win] previous window(not self-app) should be focused again after miniWindow hide
+    if (isWin) {
+      this.miniWindow?.minimize()
+      this.miniWindow?.hide()
+      return
+    } else if (isMac) {
+      this.miniWindow?.hide()
+      if (!this.wasMainWindowFocused) {
+        app.hide()
+      }
+      return
+    }
+
     this.miniWindow?.hide()
   }
 
@@ -380,11 +502,16 @@ export class WindowService {
   }
 
   public toggleMiniWindow() {
-    if (this.miniWindow) {
-      this.miniWindow.isVisible() ? this.miniWindow.hide() : this.miniWindow.show()
-    } else {
+    if (this.miniWindow && !this.miniWindow.isDestroyed() && this.miniWindow.isVisible()) {
+      this.hideMiniWindow()
+      return
+    }
+
     this.showMiniWindow()
   }
+
+  public setPinMiniWindow(isPinned) {
+    this.isPinnedMiniWindow = isPinned
   }
 
   public showSelectionMenu(bounds: { x: number; y: number }) {
@@ -395,7 +522,6 @@ export class WindowService {
     }
 
     const theme = configManager.getTheme()
-    const isMac = process.platform === 'darwin'
 
     this.selectionMenuWindow = new BrowserWindow({
       width: 280,

src/main/utils/index.ts

@@ -42,3 +42,13 @@ export function dumpPersistState() {
   }
   return JSON.stringify(persistState)
 }
+
+export const runAsyncFunction = async (fn: () => void) => {
+  await fn()
+}
+
+export function makeSureDirExists(dir: string) {
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true })
+  }
+}

src/main/utils/process.ts

@@ -0,0 +1,59 @@
+import { spawn } from 'child_process'
+import log from 'electron-log'
+import fs from 'fs'
+import os from 'os'
+import path from 'path'
+
+import { getResourcePath } from '.'
+
+export function runInstallScript(scriptPath: string): Promise<void> {
+  return new Promise<void>((resolve, reject) => {
+    const installScriptPath = path.join(getResourcePath(), 'scripts', scriptPath)
+    log.info(`Running script at: ${installScriptPath}`)
+
+    const nodeProcess = spawn(process.execPath, [installScriptPath], {
+      env: { ...process.env, ELECTRON_RUN_AS_NODE: '1' }
+    })
+
+    nodeProcess.stdout.on('data', (data) => {
+      log.info(`Script output: ${data}`)
+    })
+
+    nodeProcess.stderr.on('data', (data) => {
+      log.error(`Script error: ${data}`)
+    })
+
+    nodeProcess.on('close', (code) => {
+      if (code === 0) {
+        log.info('Script completed successfully')
+        resolve()
+      } else {
+        log.error(`Script exited with code ${code}`)
+        reject(new Error(`Process exited with code ${code}`))
+      }
+    })
+  })
+}
+
+export async function getBinaryName(name: string): Promise<string> {
+  if (process.platform === 'win32') {
+    return `${name}.exe`
+  }
+  return name
+}
+
+export async function getBinaryPath(name?: string): Promise<string> {
+  if (!name) {
+    return path.join(os.homedir(), '.cherrystudio', 'bin')
+  }
+
+  const binaryName = await getBinaryName(name)
+  const binariesDir = path.join(os.homedir(), '.cherrystudio', 'bin')
+  const binariesDirExists = await fs.existsSync(binariesDir)
+  return binariesDirExists ? path.join(binariesDir, binaryName) : binaryName
+}
+
+export async function isBinaryExists(name: string): Promise<boolean> {
+  const cmd = await getBinaryPath(name)
+  return await fs.existsSync(cmd)
+}

src/preload/index.d.ts

@@ -1,12 +1,17 @@
+import { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
 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 type { OpenDialogOptions } from 'electron'
 import type { UpdateInfo } from 'electron-updater'
-import { Readable } from 'stream'
+
+interface BackupFile {
+  fileName: string
+  modifiedTime: string
+  size: number
+}
 
 declare global {
   interface Window {
@@ -18,12 +23,18 @@ declare global {
       openWebsite: (url: string) => void
       setProxy: (proxy: string | undefined) => void
       setLanguage: (theme: LanguageVarious) => void
+      setLaunchOnBoot: (isActive: boolean) => void
+      setLaunchToTray: (isActive: boolean) => void
       setTray: (isActive: boolean) => void
+      setTrayOnClose: (isActive: boolean) => void
       restartTray: () => void
       setTheme: (theme: 'light' | 'dark') => void
       minApp: (options: { url: string; windowOptions?: Electron.BrowserWindowConstructorOptions }) => void
       reload: () => void
       clearCache: () => Promise<{ success: boolean; error?: string }>
+      system: {
+        getDeviceType: () => Promise<'mac' | 'windows' | 'linux'>
+      }
       zip: {
         compress: (text: string) => Promise<Buffer>
         decompress: (text: Buffer) => Promise<string>
@@ -33,6 +44,9 @@ declare global {
         restore: (backupPath: string) => Promise<string>
         backupToWebdav: (data: string, webdavConfig: WebDavConfig) => Promise<boolean>
         restoreFromWebdav: (webdavConfig: WebDavConfig) => Promise<string>
+        listWebdavFiles: (webdavConfig: WebDavConfig) => Promise<BackupFile[]>
+        checkConnection: (webdavConfig: WebDavConfig) => Promise<boolean>
+        createDirectory: (webdavConfig: WebDavConfig, path: string, options?: CreateDirectoryOptions) => Promise<void>
       }
       file: {
         select: (options?: OpenDialogOptions) => Promise<FileType[] | null>
@@ -68,8 +82,8 @@ declare global {
         update: (shortcuts: Shortcut[]) => Promise<void>
       }
       knowledgeBase: {
-        create: ({ id, model, apiKey, baseURL }: KnowledgeBaseParams) => Promise<void>
-        reset: ({ base }: { base: KnowledgeBaseParams }) => Promise<void>
+        create: (base: KnowledgeBaseParams) => Promise<void>
+        reset: (base: KnowledgeBaseParams) => Promise<void>
         delete: (id: string) => Promise<void>
         add: ({
           base,
@@ -90,6 +104,15 @@ declare global {
           base: KnowledgeBaseParams
         }) => Promise<void>
         search: ({ search, base }: { search: string; base: KnowledgeBaseParams }) => Promise<ExtractChunkData[]>
+        rerank: ({
+          search,
+          base,
+          results
+        }: {
+          search: string
+          base: KnowledgeBaseParams
+          results: ExtractChunkData[]
+        }) => Promise<ExtractChunkData[]>
       }
       window: {
         setMinimumSize: (width: number, height: number) => Promise<void>
@@ -114,6 +137,7 @@ declare global {
         hide: () => Promise<void>
         close: () => Promise<void>
         toggle: () => Promise<void>
+        setPin: (isPinned: boolean) => Promise<void>
       }
       aes: {
         encrypt: (text: string, secretKey: string, iv: string) => Promise<{ iv: string; encryptedData: string }>
@@ -123,17 +147,34 @@ declare global {
         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>
+        removeServer: (server: MCPServer) => Promise<void>
+        restartServer: (server: MCPServer) => Promise<void>
+        stopServer: (server: MCPServer) => Promise<void>
+        listTools: (server: MCPServer) => Promise<MCPTool[]>
+        callTool: ({ server, name, args }: { server: MCPServer; name: string; args: any }) => Promise<any>
+        getInstallInfo: () => Promise<{ dir: string; uvPath: string; bunPath: string }>
+      }
+      copilot: {
+        getAuthMessage: (
+          headers?: Record<string, string>
+        ) => Promise<{ device_code: string; user_code: string; verification_uri: string }>
+        getCopilotToken: (device_code: string, headers?: Record<string, string>) => Promise<{ access_token: string }>
+        saveCopilotToken: (access_token: string) => Promise<void>
+        getToken: (headers?: Record<string, string>) => Promise<{ token: string }>
+        logout: () => Promise<void>
+        getUser: (token: string) => Promise<{ login: string; avatar: string }>
+      }
+      isBinaryExist: (name: string) => Promise<boolean>
+      getBinaryPath: (name: string) => Promise<string>
+      installUVBinary: () => Promise<void>
+      installBunBinary: () => Promise<void>
+      protocol: {
+        onReceiveData: (callback: (data: { url: string; params: any }) => void) => () => void
+      }
+      nutstore: {
+        getSSOUrl: () => Promise<string>
+        decryptToken: (token: string) => Promise<{ username: string; access_token: string }>
+        getDirectoryContents: (token: string, path: string) => Promise<any>
       }
     }
   }

src/preload/index.ts

@@ -1,6 +1,8 @@
+import type { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
 import { electronAPI } from '@electron-toolkit/preload'
 import { FileType, KnowledgeBaseParams, KnowledgeItem, MCPServer, Shortcut, WebDavConfig } from '@types'
 import { contextBridge, ipcRenderer, OpenDialogOptions, shell } from 'electron'
+import { CreateDirectoryOptions } from 'webdav'
 
 // Custom APIs for renderer
 const api = {
@@ -10,12 +12,18 @@ const api = {
   checkForUpdate: () => ipcRenderer.invoke('app:check-for-update'),
   showUpdateDialog: () => ipcRenderer.invoke('app:show-update-dialog'),
   setLanguage: (lang: string) => ipcRenderer.invoke('app:set-language', lang),
+  setLaunchOnBoot: (isActive: boolean) => ipcRenderer.invoke('app:set-launch-on-boot', isActive),
+  setLaunchToTray: (isActive: boolean) => ipcRenderer.invoke('app:set-launch-to-tray', isActive),
   setTray: (isActive: boolean) => ipcRenderer.invoke('app:set-tray', isActive),
+  setTrayOnClose: (isActive: boolean) => ipcRenderer.invoke('app:set-tray-on-close', 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),
   clearCache: () => ipcRenderer.invoke('app:clear-cache'),
+  system: {
+    getDeviceType: () => ipcRenderer.invoke('system:getDeviceType')
+  },
   zip: {
     compress: (text: string) => ipcRenderer.invoke('zip:compress', text),
     decompress: (text: Buffer) => ipcRenderer.invoke('zip:decompress', text)
@@ -26,7 +34,11 @@ const api = {
     restore: (backupPath: string) => ipcRenderer.invoke('backup:restore', backupPath),
     backupToWebdav: (data: string, webdavConfig: WebDavConfig) =>
       ipcRenderer.invoke('backup:backupToWebdav', data, webdavConfig),
-    restoreFromWebdav: (webdavConfig: WebDavConfig) => ipcRenderer.invoke('backup:restoreFromWebdav', webdavConfig)
+    restoreFromWebdav: (webdavConfig: WebDavConfig) => ipcRenderer.invoke('backup:restoreFromWebdav', webdavConfig),
+    listWebdavFiles: (webdavConfig: WebDavConfig) => ipcRenderer.invoke('backup:listWebdavFiles', webdavConfig),
+    checkConnection: (webdavConfig: WebDavConfig) => ipcRenderer.invoke('backup:checkConnection', webdavConfig),
+    createDirectory: (webdavConfig: WebDavConfig, path: string, options?: CreateDirectoryOptions) =>
+      ipcRenderer.invoke('backup:createDirectory', webdavConfig, path, options)
   },
   file: {
     select: (options?: OpenDialogOptions) => ipcRenderer.invoke('file:select', options),
@@ -59,9 +71,8 @@ const api = {
     update: (shortcuts: Shortcut[]) => ipcRenderer.invoke('shortcuts:update', shortcuts)
   },
   knowledgeBase: {
-    create: ({ id, model, apiKey, baseURL }: KnowledgeBaseParams) =>
-      ipcRenderer.invoke('knowledge-base:create', { id, model, apiKey, baseURL }),
-    reset: ({ base }: { base: KnowledgeBaseParams }) => ipcRenderer.invoke('knowledge-base:reset', { base }),
+    create: (base: KnowledgeBaseParams) => ipcRenderer.invoke('knowledge-base:create', base),
+    reset: (base: KnowledgeBaseParams) => ipcRenderer.invoke('knowledge-base:reset', base),
     delete: (id: string) => ipcRenderer.invoke('knowledge-base:delete', id),
     add: ({
       base,
@@ -75,7 +86,9 @@ const api = {
     remove: ({ uniqueId, uniqueIds, base }: { uniqueId: string; uniqueIds: string[]; base: KnowledgeBaseParams }) =>
       ipcRenderer.invoke('knowledge-base:remove', { uniqueId, uniqueIds, base }),
     search: ({ search, base }: { search: string; base: KnowledgeBaseParams }) =>
-      ipcRenderer.invoke('knowledge-base:search', { search, base })
+      ipcRenderer.invoke('knowledge-base:search', { search, base }),
+    rerank: ({ search, base, results }: { search: string; base: KnowledgeBaseParams; results: ExtractChunkData[] }) =>
+      ipcRenderer.invoke('knowledge-base:rerank', { search, base, results })
   },
   window: {
     setMinimumSize: (width: number, height: number) => ipcRenderer.invoke('window:set-minimum-size', width, height),
@@ -99,7 +112,8 @@ const api = {
     show: () => ipcRenderer.invoke('miniwindow:show'),
     hide: () => ipcRenderer.invoke('miniwindow:hide'),
     close: () => ipcRenderer.invoke('miniwindow:close'),
-    toggle: () => ipcRenderer.invoke('miniwindow:toggle')
+    toggle: () => ipcRenderer.invoke('miniwindow:toggle'),
+    setPin: (isPinned: boolean) => ipcRenderer.invoke('miniwindow:set-pin', isPinned)
   },
   aes: {
     encrypt: (text: string, secretKey: string, iv: string) => ipcRenderer.invoke('aes:encrypt', text, secretKey, iv),
@@ -107,18 +121,48 @@ const api = {
       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')
+    removeServer: (server: MCPServer) => ipcRenderer.invoke('mcp:remove-server', server),
+    restartServer: (server: MCPServer) => ipcRenderer.invoke('mcp:restart-server', server),
+    stopServer: (server: MCPServer) => ipcRenderer.invoke('mcp:stop-server', server),
+    listTools: (server: MCPServer) => ipcRenderer.invoke('mcp:list-tools', server),
+    callTool: ({ server, name, args }: { server: MCPServer; name: string; args: any }) =>
+      ipcRenderer.invoke('mcp:call-tool', { server, name, args }),
+    getInstallInfo: () => ipcRenderer.invoke('mcp:get-install-info')
   },
   shell: {
     openExternal: shell.openExternal
+  },
+  copilot: {
+    getAuthMessage: (headers?: Record<string, string>) => ipcRenderer.invoke('copilot:get-auth-message', headers),
+    getCopilotToken: (device_code: string, headers?: Record<string, string>) =>
+      ipcRenderer.invoke('copilot:get-copilot-token', device_code, headers),
+    saveCopilotToken: (access_token: string) => ipcRenderer.invoke('copilot:save-copilot-token', access_token),
+    getToken: (headers?: Record<string, string>) => ipcRenderer.invoke('copilot:get-token', headers),
+    logout: () => ipcRenderer.invoke('copilot:logout'),
+    getUser: (token: string) => ipcRenderer.invoke('copilot:get-user', token)
+  },
+
+  // Binary related APIs
+  isBinaryExist: (name: string) => ipcRenderer.invoke('app:is-binary-exist', name),
+  getBinaryPath: (name: string) => ipcRenderer.invoke('app:get-binary-path', name),
+  installUVBinary: () => ipcRenderer.invoke('app:install-uv-binary'),
+  installBunBinary: () => ipcRenderer.invoke('app:install-bun-binary'),
+  protocol: {
+    onReceiveData: (callback: (data: { url: string; params: any }) => void) => {
+      const listener = (_event: Electron.IpcRendererEvent, data: { url: string; params: any }) => {
+        callback(data)
+      }
+      ipcRenderer.on('protocol-data', listener)
+      return () => {
+        ipcRenderer.off('protocol-data', listener)
+      }
+    }
+  },
+  nutstore: {
+    getSSOUrl: () => ipcRenderer.invoke('nutstore:get-sso-url'),
+    decryptToken: (token: string) => ipcRenderer.invoke('nutstore:decrypt-token', token),
+    getDirectoryContents: (token: string, path: string) =>
+      ipcRenderer.invoke('nutstore:get-directory-contents', token, path)
   }
 }
 
@@ -129,6 +173,11 @@ if (process.contextIsolated) {
   try {
     contextBridge.exposeInMainWorld('electron', electronAPI)
     contextBridge.exposeInMainWorld('api', api)
+    contextBridge.exposeInMainWorld('obsidian', {
+      getVaults: () => ipcRenderer.invoke('obsidian:get-vaults'),
+      getFolders: (vaultName: string) => ipcRenderer.invoke('obsidian:get-files', vaultName),
+      getFiles: (vaultName: string) => ipcRenderer.invoke('obsidian:get-files', vaultName)
+    })
   } catch (error) {
     console.error(error)
   }

src/renderer/index.html

@@ -39,5 +39,4 @@
   <script type="module" src="/src/init.ts"></script>
   <script type="module" src="/src/main.tsx"></script>
 </body>
-
 </html>

src/renderer/src/App.tsx

@@ -21,7 +21,7 @@ import PaintingsPage from './pages/paintings/PaintingsPage'
 import SettingsPage from './pages/settings/SettingsPage'
 import TranslatePage from './pages/translate/TranslatePage'
 
-function App(): JSX.Element {
+function App(): React.ReactElement {
   return (
     <Provider store={store}>
       <StyleSheetManager>

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=1742184675192') format('woff2');
 }
 
 .iconfont {
@@ -11,6 +11,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-obsidian:before {
+  content: '\e677';
+}
+
 .icon-notion:before {
   content: '\e690';
 }

src/renderer/src/assets/styles/animation.scss

@@ -0,0 +1,18 @@
+@keyframes animation-pulse {
+  0% {
+    box-shadow: 0 0 0 0 rgba(var(--pulse-color), 0.5);
+  }
+  70% {
+    box-shadow: 0 0 0 var(--pulse-size) rgba(var(--pulse-color), 0);
+  }
+  100% {
+    box-shadow: 0 0 0 0 rgba(var(--pulse-color), 0);
+  }
+}
+
+// 电磁波扩散效果
+.animation-pulse {
+  --pulse-color: 59, 130, 246;
+  --pulse-size: 8px;
+  animation: animation-pulse 1.5s infinite;
+}

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

@@ -192,3 +192,10 @@
     }
   }
 }
+
+.ant-dropdown-menu .ant-dropdown-menu-sub {
+  max-height: 350px;
+  width: max-content;
+  overflow-y: auto;
+  overflow-x: hidden;
+}

src/renderer/src/assets/styles/container.scss

@@ -3,5 +3,4 @@
   border-top: 0.5px solid var(--color-border);
   border-top-left-radius: 10px;
   border-left: 0.5px solid var(--color-border);
-  box-shadow: -2px 0px 20px -4px rgba(0, 0, 0, 0.06);
 }

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

@@ -2,6 +2,7 @@
 @use './ant.scss';
 @use './scrollbar.scss';
 @use './container.scss';
+@use './animation.scss';
 @import '../fonts/icon-fonts/iconfont.css';
 @import '../fonts/ubuntu/ubuntu.css';
 
@@ -10,7 +11,7 @@
   --color-white-soft: rgba(255, 255, 255, 0.8);
   --color-white-mute: rgba(255, 255, 255, 0.94);
 
-  --color-black: #151515;
+  --color-black: #181818;
   --color-black-soft: #222222;
   --color-black-mute: #333333;
 
@@ -18,7 +19,7 @@
   --color-gray-2: #414853;
   --color-gray-3: #32363f;
 
-  --color-text-1: rgba(255, 255, 245, 0.86);
+  --color-text-1: rgba(255, 255, 245, 0.9);
   --color-text-2: rgba(235, 235, 245, 0.6);
   --color-text-3: rgba(235, 235, 245, 0.38);
 
@@ -35,9 +36,9 @@
   --color-text: var(--color-text-1);
   --color-icon: #ffffff99;
   --color-icon-white: #ffffff;
-  --color-border: #ffffff22;
-  --color-border-soft: #ffffff11;
-  --color-border-mute: #ffffff11;
+  --color-border: #ffffff15;
+  --color-border-soft: #ffffff10;
+  --color-border-mute: #ffffff05;
   --color-error: #f44336;
   --color-link: #1677ff;
   --color-code-background: #323232;
@@ -50,8 +51,8 @@
   --color-reference-text: #ffffff;
   --color-reference-background: #0b0e12;
 
-  --navbar-background-mac: rgba(30, 30, 30, 0.6);
-  --navbar-background: rgba(30, 30, 30);
+  --navbar-background-mac: rgba(20, 20, 20, 0.55);
+  --navbar-background: #1f1f1f;
 
   --navbar-height: 40px;
   --sidebar-width: 50px;
@@ -70,6 +71,13 @@
   --list-item-border-radius: 16px;
 }
 
+body {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
 body[theme-mode='light'] {
   --color-white: #ffffff;
   --color-white-soft: #f2f2f2;
@@ -100,9 +108,9 @@ body[theme-mode='light'] {
   --color-text: var(--color-text-1);
   --color-icon: #00000099;
   --color-icon-white: #000000;
-  --color-border: #00000028;
-  --color-border-soft: #00000020;
-  --color-border-mute: #00000010;
+  --color-border: #00000015;
+  --color-border-soft: #00000010;
+  --color-border-mute: #00000005;
   --color-error: #f44336;
   --color-link: #1677ff;
   --color-code-background: #e3e3e3;
@@ -115,8 +123,8 @@ body[theme-mode='light'] {
   --color-reference-text: #000000;
   --color-reference-background: #f1f7ff;
 
-  --navbar-background-mac: rgba(255, 255, 255, 0.6);
-  --navbar-background: rgba(255, 255, 255);
+  --navbar-background-mac: rgba(255, 255, 255, 0.55);
+  --navbar-background: rgba(244, 244, 244);
 
   --chat-background: #f3f3f3;
   --chat-background-user: #95ec69;
@@ -151,14 +159,29 @@ body {
   font-size: 14px;
   line-height: 1.6;
   overflow: hidden;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans',
-    'Helvetica Neue', sans-serif;
+  font-family:
+    -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue',
+    sans-serif;
   text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   transition: background-color 0.3s linear;
 }
 
+input,
+textarea,
+[contenteditable='true'],
+.markdown,
+#messages,
+.selectable,
+pre,
+code {
+  -webkit-user-select: text !important;
+  -moz-user-select: text !important;
+  -ms-user-select: text !important;
+  user-select: text !important;
+}
+
 a {
   -webkit-user-drag: none;
 }

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

@@ -294,3 +294,11 @@
 emoji-picker {
   --border-size: 0;
 }
+
+.katex-display{
+  overflow-x: auto;
+  overflow-y: hidden;
+}
+mjx-container{
+  overflow-x: auto;
+}

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

@@ -8,9 +8,10 @@ interface Props {
   model: Model
   size: number
   props?: AvatarProps
+  className?: string
 }
 
-const ModelAvatar: FC<Props> = ({ model, size, props }) => {
+const ModelAvatar: FC<Props> = ({ model, size, props, className }) => {
   return (
     <Avatar
       src={getModelLogo(model?.id || '')}
@@ -23,7 +24,8 @@ const ModelAvatar: FC<Props> = ({ model, size, props }) => {
         alignItems: 'center',
         justifyContent: 'center'
       }}
-      {...props}>
+      {...props}
+      className={className}>
       {first(model?.name)}
     </Avatar>
   )

src/renderer/src/components/CustomCollapse.tsx

@@ -0,0 +1,43 @@
+import { Collapse } from 'antd'
+import { FC, memo } from 'react'
+
+interface CustomCollapseProps {
+  label: React.ReactNode
+  extra: React.ReactNode
+  children: React.ReactNode
+}
+
+const CustomCollapse: FC<CustomCollapseProps> = ({ label, extra, children }) => {
+  const CollapseStyle = {
+    background: 'transparent',
+    border: '0.5px solid var(--color-border)'
+  }
+  const CollapseItemStyles = {
+    header: {
+      padding: '8px 16px',
+      alignItems: 'center',
+      justifyContent: 'space-between'
+    },
+    body: {
+      borderTop: '0.5px solid var(--color-border)'
+    }
+  }
+  return (
+    <Collapse
+      bordered={false}
+      style={CollapseStyle}
+      defaultActiveKey={['1']}
+      items={[
+        {
+          styles: CollapseItemStyles,
+          key: '1',
+          label,
+          extra,
+          children
+        }
+      ]}
+    />
+  )
+}
+
+export default memo(CustomCollapse)

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

@@ -9,6 +9,7 @@ import {
   ResponderProvided
 } from '@hello-pangea/dnd'
 import { droppableReorder } from '@renderer/utils'
+import VirtualList from 'rc-virtual-list'
 import { FC } from 'react'
 
 interface Props<T> {
@@ -47,7 +48,8 @@ const DragableList: FC<Props<any>> = ({
       <Droppable droppableId="droppable" {...droppableProps}>
         {(provided) => (
           <div {...provided.droppableProps} ref={provided.innerRef} style={style}>
-            {list.map((item, index) => {
+            <VirtualList data={list} itemKey="id">
+              {(item, index) => {
                 const id = item.id || item
                 return (
                   <Draggable key={`draggable_${id}_${index}`} draggableId={id} index={index}>
@@ -66,7 +68,8 @@ const DragableList: FC<Props<any>> = ({
                     )}
                   </Draggable>
                 )
-            })}
+              }}
+            </VirtualList>
             {provided.placeholder}
           </div>
         )}

src/renderer/src/components/Icons/FallbackFavicon.tsx

@@ -52,7 +52,6 @@ const FallbackFavicon: React.FC<FallbackFaviconProps> = ({ hostname, alt }) => {
           if (error.name === 'AbortError') {
             throw error
           }
-          console.debug(`Failed to fetch favicon from ${url}:`, error)
           return null // Return null for failed requests
         })
     )
@@ -79,7 +78,7 @@ const FallbackFavicon: React.FC<FallbackFaviconProps> = ({ hostname, alt }) => {
         setFaviconState({ status: 'loaded', src: url })
       })
       .catch((error) => {
-        console.debug('All favicon requests failed:', error)
+        console.log('All favicon requests failed:', error)
         setFaviconState({ status: 'loaded', src: faviconUrls[0] })
       })
 

src/renderer/src/components/Icons/NutstoreIcons.tsx

@@ -0,0 +1,50 @@
+import styled from 'styled-components'
+
+const IconSpan = styled.span`
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+`
+
+export function NutstoreIcon(props: React.SVGProps<SVGSVGElement>) {
+  return (
+    <IconSpan>
+      <svg
+        {...props}
+        width="16px"
+        height="16px"
+        viewBox="0 0 20 20"
+        version="1.1"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlnsXlink="http://www.w3.org/1999/xlink">
+        <title>线性单坚果</title>
+        <g id="线性单坚果" stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
+          <path
+            d="M10.1590439,0.886175571 C10.1753674,0.890326544 10.291709,0.910777855 10.428428,0.935202765 L10.6388345,0.973279488 C10.7074276,0.985937901 10.77116,0.998048871 10.8200766,1.00807156 C11.2437905,1.09488771 11.6662387,1.21011472 12.1133986,1.37210166 C13.2580363,1.78675499 14.3714894,2.43940777 15.4224927,3.39703693 L15.621,3.584 L15.6351722,3.57092562 C16.53166,2.76294504 17.6751418,2.31986999 18.4291849,2.58060734 L18.5580792,2.63399481 C18.9455012,2.81584984 19.2328582,3.16284846 19.437028,3.61729231 C19.5709871,3.91546021 19.6526725,4.21929758 19.6985752,4.50662941 C19.7148596,4.80478115 19.5904581,5.0358501 19.4098118,5.1582622 C19.3815042,5.17858714 19.3523426,5.19648783 19.3224017,5.21197531 C19.1152073,5.31915066 18.9086763,5.30466603 18.6939183,5.22086872 C18.6620576,5.20843687 18.6328325,5.19564599 18.6006654,5.18105502 C18.4394695,5.11546938 18.2846309,5.06753532 18.1365915,5.04232952 C17.7415971,4.96197402 17.3578102,5.06378907 17.051656,5.32621284 L17.046624,5.33098744 L17.1856424,5.55157847 C18.0964209,7.0577136 18.6880009,8.98631362 18.5914984,10.988329 L18.5672508,11.3423168 C18.518886,12.3590196 18.336046,13.2889191 17.9959883,14.1391815 C17.4227031,15.6418626 16.5311196,16.5912538 15.4105898,16.2529712 L15.278,16.207 C15.204042,16.2889459 15.1247235,16.3618831 15.0410669,16.4278107 L14.9126231,16.5212291 C13.2906651,17.9150353 10.9315401,19.0281897 7.99389616,19.2 L7.17106258,19.2 C3.43360072,19.2 1.02132454,17.63803 0.534391412,16.0333683 L0.513,15.954 L0.504265285,15.9449232 C-0.110228462,15.1972878 0.264421351,10.4760569 2.09599684,6.99794495 L2.22026541,6.76796973 C2.29571954,6.63016882 2.43695112,6.39220857 2.63659846,6.08729923 C2.9688861,5.57981633 3.34471126,5.07232148 3.75709487,4.59788661 C4.2749895,4.0020645 4.81413532,3.50121679 5.3386949,3.15177019 C5.36355777,3.12648036 5.4278064,3.07827062 5.50910569,3.02364741 L5.559,2.991 L5.5530361,2.96941337 C5.48899059,2.69876461 5.47862138,2.4784725 5.54146387,2.2521942 L5.58811106,2.11525813 C5.68308256,1.86409186 5.94349142,1.57994703 6.25873284,1.38755406 C6.58654657,1.18748816 7.23187921,0.95895859 7.69473739,0.883035787 C8.37505518,0.763266442 9.38159553,0.78076773 10.1590439,0.886175571 Z M6.59801776,3.85068129 C6.46732353,3.85068129 6.2240354,3.97828097 6.07844768,4.1001814 C5.59811888,4.42589962 5.12194443,4.87010868 4.65860433,5.40361803 C4.52372819,5.55892011 4.37448327,5.74624534 4.22515758,5.94252901 L4.04684241,6.18089332 C3.57610889,6.82012555 3.16307203,7.45661922 3.27592159,7.33459023 C1.39280393,10.7336939 1.18786427,14.1190682 1.66513528,15.5784041 C1.72944314,15.8645824 2.24255786,16.4352772 2.98506717,16.8902532 C4.03558482,17.5339627 5.43381914,17.9303112 7.15636912,17.9630362 L7.95282724,17.9633776 C10.5671194,17.8104156 12.6011819,16.8513512 14.1270746,15.5866906 L14.2005419,15.5269075 L14.2189125,15.5136158 C14.591184,15.2751975 14.6855045,14.9945722 14.5299888,14.3127204 C14.1480256,12.8500475 13.2023047,10.9705228 11.4802274,8.76564869 C10.6761315,7.73569508 9.84271439,6.77270459 8.9812637,5.88185595 C8.26651717,5.13999817 7.48191474,4.46126051 6.65303256,3.86947602 C6.6343697,3.85523851 6.62003281,3.85068129 6.59801776,3.85068129 Z M8.0520431,2.14478343 C7.34750556,2.24716005 6.81392621,2.48276912 6.75769294,2.58286729 C6.75315545,2.59094425 6.75172186,2.59912409 6.75788522,2.63367631 L6.761,2.653 C6.92447955,2.67441039 7.07755879,2.72514333 7.22081781,2.80306173 L7.36053304,2.88992896 C8.25106173,3.52400396 9.08393795,4.2496146 9.84209216,5.05104835 C10.7498631,5.98954517 11.620838,6.99715009 12.4127624,8.02643665 C14.2357617,10.3660968 15.255676,12.4067536 15.6810213,14.0171728 C15.7810435,14.3986973 15.8140553,14.7531702 15.7838468,15.0855202 L15.779624,15.1139874 L15.7923351,15.1170186 C16.0195271,15.1453183 16.2337261,14.9383655 16.4514,14.5090146 L16.5168229,14.3735502 C16.5998938,14.1934825 16.8522658,13.5389313 16.8131724,13.6336744 L16.800624,13.6629874 L16.8933423,13.4088509 C17.1021765,12.7846983 17.2487406,12.0003637 17.2861365,11.2776414 C17.4525549,9.34169753 16.8847303,7.51332101 15.9618076,5.9792161 C15.8725231,5.8278532 15.7620551,5.66138642 15.6942132,5.57820575 C14.7595226,4.31701776 13.5999579,3.42705248 12.3136888,2.84260842 C11.4827868,2.46507019 10.794487,2.2853603 10.1559862,2.18983638 C9.43796126,2.09113972 8.59553714,2.05880421 8.0520431,2.14478343 Z M16.4823653,4.32067121 L16.364,4.418 L16.393,4.454 L16.5100007,4.3621392 C17.0306065,3.97118443 17.6106194,3.7900296 18.1665334,3.88918284 L18.233,3.904 L18.2063581,3.87419362 C18.1376794,3.79892884 18.0675642,3.72412847 18.0165076,3.68190508 L17.972563,3.65173005 C17.800955,3.56958653 17.0606024,3.86572493 16.4823653,4.32067121 Z"
+            id="形状结合"
+            fill="currentColor"
+            fillRule="nonzero"></path>
+        </g>
+      </svg>
+    </IconSpan>
+  )
+}
+
+export function FolderIcon(props: React.SVGProps<SVGSVGElement>) {
+  return (
+    <IconSpan>
+      <svg width="16px" height="16px" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" {...props}>
+        <title>folder</title>
+        <path
+          d="M396.5,185.7l22.7,27.2a36.1,36.1,0,0,0,27.7,12.7H906.8c29.4,0,53.2,22.8,53.2,50.9V800.1c0,28.1-23.8,50.9-53.2,50.9H117.2C87.8,851,64,828.2,64,800.1V223.9c0-28.1,23.8-50.9,53.2-50.9H368.8A36.1,36.1,0,0,1,396.5,185.7Z"
+          style={{ fill: '#9fddff' }}
+        />
+        <path
+          d="M64,342.5V797.8c0,29.4,24,53.2,53.6,53.2H906.4c29.6,0,53.6-23.8,53.6-53.2V342.5Z"
+          style={{ fill: '#74c6ff' }}
+        />
+      </svg>
+    </IconSpan>
+  )
+}

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

@@ -8,7 +8,7 @@ const ReasoningIcon: FC<React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement
 
   return (
     <Container>
-      <Tooltip title={t('models.reasoning')} placement="top">
+      <Tooltip title={t('models.type.reasoning')} placement="top">
         <Icon className="iconfont icon-thinking" {...(props as any)} />
       </Tooltip>
     </Container>

src/renderer/src/components/Icons/ToolsCallingIcon.tsx

@@ -23,7 +23,7 @@ const Container = styled.div`
 `
 
 const Icon = styled(ToolOutlined)`
-  color: #d97757;
+  color: var(--color-primary);
   font-size: 15px;
   margin-right: 6px;
 `

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

@@ -9,7 +9,7 @@ const VisionIcon: FC<React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>,
 
   return (
     <Container>
-      <Tooltip title={t('models.vision')} placement="top">
+      <Tooltip title={t('models.type.vision')} placement="top">
         <Icon {...(props as any)} />
       </Tooltip>
     </Container>

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

@@ -9,7 +9,7 @@ const WebSearchIcon: FC<React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement
 
   return (
     <Container>
-      <Tooltip title={t('models.websearch')} placement="top">
+      <Tooltip title={t('models.type.websearch')} placement="top">
         <Icon {...(props as any)} />
       </Tooltip>
     </Container>

src/renderer/src/components/IndicatorLight.tsx

@@ -4,15 +4,25 @@ import styled from 'styled-components'
 
 interface IndicatorLightProps {
   color: string
+  size?: number
+  shadow?: boolean
+  style?: React.CSSProperties
+  animation?: boolean
 }
 
-const Light = styled.div<{ color: string }>`
-  width: 8px;
-  height: 8px;
+const Light = styled.div<{
+  color: string
+  size: number
+  shadow?: boolean
+  style?: React.CSSProperties
+  animation?: boolean
+}>`
+  width: ${({ size }) => size}px;
+  height: ${({ size }) => size}px;
   border-radius: 50%;
   background-color: ${({ color }) => color};
-  box-shadow: 0 0 6px ${({ color }) => color};
-  animation: pulse 2s infinite;
+  box-shadow: ${({ shadow, color }) => (shadow ? `0 0 6px ${color}` : 'none')};
+  animation: ${({ animation }) => (animation ? 'pulse 2s infinite' : 'none')};
 
   @keyframes pulse {
     0% {
@@ -27,9 +37,9 @@ const Light = styled.div<{ color: string }>`
   }
 `
 
-const IndicatorLight: React.FC<IndicatorLightProps> = ({ color }) => {
+const IndicatorLight: React.FC<IndicatorLightProps> = ({ color, size = 8, shadow = true, style, animation = true }) => {
   const actualColor = color === 'green' ? '#22c55e' : color
-  return <Light color={actualColor} />
+  return <Light color={actualColor} size={size} shadow={shadow} style={style} animation={animation} />
 }
 
 export default IndicatorLight

src/renderer/src/components/ListItem/index.tsx

@@ -8,17 +8,20 @@ interface ListItemProps {
   subtitle?: string
   titleStyle?: React.CSSProperties
   onClick?: () => void
+  rightContent?: ReactNode
+  style?: React.CSSProperties
 }
 
-const ListItem = ({ active, icon, title, subtitle, titleStyle, onClick }: ListItemProps) => {
+const ListItem = ({ active, icon, title, subtitle, titleStyle, onClick, rightContent, style }: ListItemProps) => {
   return (
-    <ListItemContainer className={active ? 'active' : ''} onClick={onClick}>
+    <ListItemContainer className={active ? 'active' : ''} onClick={onClick} style={style}>
       <ListItemContent>
         {icon && <IconWrapper>{icon}</IconWrapper>}
         <TextContainer>
           <TitleText style={titleStyle}>{title}</TitleText>
           {subtitle && <SubtitleText>{subtitle}</SubtitleText>}
         </TextContainer>
+        {rightContent && <RightContentWrapper>{rightContent}</RightContentWrapper>}
       </ListItemContent>
     </ListItemContainer>
   )
@@ -55,6 +58,9 @@ const ListItemContent = styled.div`
 `
 
 const IconWrapper = styled.span`
+  display: flex;
+  align-items: center;
+  justify-content: center;
   margin-right: 8px;
 `
 
@@ -81,4 +87,8 @@ const SubtitleText = styled.div`
   color: var(--color-text-3);
 `
 
+const RightContentWrapper = styled.div`
+  margin-left: auto;
+`
+
 export default ListItem

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

@@ -0,0 +1,429 @@
+import {
+  CloseOutlined,
+  CodeOutlined,
+  CopyOutlined,
+  ExportOutlined,
+  MinusOutlined,
+  PushpinOutlined,
+  ReloadOutlined
+} from '@ant-design/icons'
+import { isMac, isWindows } from '@renderer/config/constant'
+import { DEFAULT_MIN_APPS } from '@renderer/config/minapps'
+import { useBridge } from '@renderer/hooks/useBridge'
+import { useMinappPopup } from '@renderer/hooks/useMinappPopup'
+import { useMinapps } from '@renderer/hooks/useMinapps'
+import { useRuntime } from '@renderer/hooks/useRuntime'
+import { MinAppType } from '@renderer/types'
+import { delay } from '@renderer/utils'
+import { Avatar, Drawer, Tooltip } from 'antd'
+import { WebviewTag } from 'electron'
+import { useEffect, useMemo, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import BeatLoader from 'react-spinners/BeatLoader'
+import styled from 'styled-components'
+
+import WebviewContainer from './WebviewContainer'
+
+interface AppExtraInfo {
+  canPinned: boolean
+  isPinned: boolean
+  canOpenExternalLink: boolean
+}
+
+type AppInfo = MinAppType & AppExtraInfo
+
+/** The main container for MinApp popup */
+const MinappPopupContainer: React.FC = () => {
+  const { openedKeepAliveMinapps, openedOneOffMinapp, currentMinappId, minappShow } = useRuntime()
+  const { closeMinapp, hideMinappPopup } = useMinappPopup()
+  const { pinned, updatePinnedMinapps } = useMinapps()
+  const { t } = useTranslation()
+
+  /** control the drawer open or close */
+  const [isPopupShow, setIsPopupShow] = useState(true)
+  /** whether the current minapp is ready */
+  const [isReady, setIsReady] = useState(false)
+  /** the current REAL url of the minapp
+   * different from the app preset url, because user may navigate in minapp */
+  const [currentUrl, setCurrentUrl] = useState<string | null>(null)
+
+  /** store the last minapp id and show status */
+  const lastMinappId = useRef<string | null>(null)
+  const lastMinappShow = useRef<boolean>(false)
+
+  /** store the webview refs, one of the key to make them keepalive */
+  const webviewRefs = useRef<Map<string, WebviewTag | null>>(new Map())
+  /** indicate whether the webview has loaded  */
+  const webviewLoadedRefs = useRef<Map<string, boolean>>(new Map())
+
+  const isInDevelopment = process.env.NODE_ENV === 'development'
+
+  useBridge()
+
+  /** set the popup display status */
+  useEffect(() => {
+    if (minappShow) {
+      // init the current url
+      if (currentMinappId && currentAppInfo) {
+        setCurrentUrl(currentAppInfo.url)
+      }
+
+      setIsPopupShow(true)
+
+      if (webviewLoadedRefs.current.get(currentMinappId)) {
+        setIsReady(true)
+        /** the case that open the minapp from sidebar */
+      } else if (lastMinappId.current !== currentMinappId && lastMinappShow.current === minappShow) {
+        setIsReady(false)
+      }
+    } else {
+      setIsPopupShow(false)
+      setIsReady(false)
+    }
+
+    return () => {
+      /** renew the last minapp id and show status */
+      lastMinappId.current = currentMinappId
+      lastMinappShow.current = minappShow
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [minappShow, currentMinappId])
+
+  useEffect(() => {
+    if (!webviewRefs.current) return
+
+    /** set the webview display status
+     * DO NOT use the state to set the display status,
+     * to AVOID the re-render of the webview container
+     */
+    webviewRefs.current.forEach((webviewRef, appid) => {
+      if (!webviewRef) return
+      webviewRef.style.display = appid === currentMinappId ? 'inline-flex' : 'none'
+    })
+
+    //delete the extra webviewLoadedRefs
+    webviewLoadedRefs.current.forEach((_, appid) => {
+      if (!webviewRefs.current.has(appid)) {
+        webviewLoadedRefs.current.delete(appid)
+      }
+    })
+  }, [currentMinappId])
+
+  /** only the keepalive minapp can be minimized */
+  const canMinimize = !(openedOneOffMinapp && openedOneOffMinapp.id == currentMinappId)
+
+  /** combine the openedKeepAliveMinapps and openedOneOffMinapp */
+  const combinedApps = useMemo(() => {
+    return [...openedKeepAliveMinapps, ...(openedOneOffMinapp ? [openedOneOffMinapp] : [])]
+  }, [openedKeepAliveMinapps, openedOneOffMinapp])
+
+  /** get the extra info of the apps */
+  const appsExtraInfo = useMemo(() => {
+    return combinedApps.reduce(
+      (acc, app) => ({
+        ...acc,
+        [app.id]: {
+          canPinned: DEFAULT_MIN_APPS.some((item) => item.id === app.id),
+          isPinned: pinned.some((item) => item.id === app.id),
+          canOpenExternalLink: app.url.startsWith('http://') || app.url.startsWith('https://')
+        }
+      }),
+      {} as Record<string, AppExtraInfo>
+    )
+  }, [combinedApps, pinned])
+
+  /** get the current app info with extra info */
+  let currentAppInfo: AppInfo | null = null
+  if (currentMinappId) {
+    const currentApp = combinedApps.find((item) => item.id === currentMinappId) as MinAppType
+    currentAppInfo = { ...currentApp, ...appsExtraInfo[currentApp.id] }
+  }
+
+  /** will close the popup and delete the webview */
+  const handlePopupClose = async (appid: string) => {
+    setIsPopupShow(false)
+    await delay(0.3)
+    webviewLoadedRefs.current.delete(appid)
+    closeMinapp(appid)
+  }
+
+  /** will hide the popup and remain the webviews */
+  const handlePopupMinimize = async () => {
+    setIsPopupShow(false)
+    await delay(0.3)
+    hideMinappPopup()
+  }
+
+  /** the callback function to set the webviews ref */
+  const handleWebviewSetRef = (appid: string, element: WebviewTag | null) => {
+    webviewRefs.current.set(appid, element)
+
+    if (!webviewRefs.current.has(appid)) {
+      webviewRefs.current.set(appid, null)
+      return
+    }
+
+    if (element) {
+      webviewRefs.current.set(appid, element)
+    } else {
+      webviewRefs.current.delete(appid)
+    }
+  }
+
+  /** the callback function to set the webviews loaded indicator */
+  const handleWebviewLoaded = (appid: string) => {
+    webviewLoadedRefs.current.set(appid, true)
+    if (appid == currentMinappId) {
+      setTimeout(() => setIsReady(true), 200)
+    }
+  }
+
+  /** the callback function to handle the webview navigate to new url */
+  const handleWebviewNavigate = (appid: string, url: string) => {
+    if (appid === currentMinappId) {
+      setCurrentUrl(url)
+    }
+  }
+
+  /** will open the devtools of the minapp */
+  const handleOpenDevTools = (appid: string) => {
+    const webview = webviewRefs.current.get(appid)
+    if (webview) {
+      webview.openDevTools()
+    }
+  }
+
+  /** only reload the original url */
+  const handleReload = (appid: string) => {
+    const webview = webviewRefs.current.get(appid)
+    if (webview) {
+      const url = combinedApps.find((item) => item.id === appid)?.url
+      if (url) {
+        webview.src = url
+      }
+    }
+  }
+
+  /** open the giving url in browser */
+  const handleOpenLink = (url: string) => {
+    window.api.openWebsite(url)
+  }
+
+  /** toggle the pin status of the minapp */
+  const handleTogglePin = (appid: string) => {
+    const app = combinedApps.find((item) => item.id === appid)
+    if (!app) return
+
+    const newPinned = appsExtraInfo[appid].isPinned ? pinned.filter((item) => item.id !== appid) : [...pinned, app]
+    updatePinnedMinapps(newPinned)
+  }
+
+  /** Title bar of the popup */
+  const Title = ({ appInfo, url }: { appInfo: AppInfo | null; url: string | null }) => {
+    if (!appInfo) return null
+
+    const handleCopyUrl = (event: any, url: string) => {
+      //don't show app-wide context menu
+      event.preventDefault()
+      navigator.clipboard
+        .writeText(url)
+        .then(() => {
+          window.message.success('URL ' + t('message.copy.success'))
+        })
+        .catch(() => {
+          window.message.error('URL ' + t('message.copy.failed'))
+        })
+    }
+
+    return (
+      <TitleContainer style={{ justifyContent: 'space-between' }}>
+        <Tooltip
+          title={
+            <TitleTextTooltip>
+              {url ?? appInfo.url} <br />
+              <CopyOutlined className="icon-copy" />
+              {t('minapp.popup.rightclick_copyurl')}
+            </TitleTextTooltip>
+          }
+          mouseEnterDelay={0.8}
+          placement="rightBottom"
+          styles={{
+            root: {
+              maxWidth: '400px'
+            }
+          }}>
+          <TitleText onContextMenu={(e) => handleCopyUrl(e, url ?? appInfo.url)}>{appInfo.name}</TitleText>
+        </Tooltip>
+        <ButtonsGroup className={isWindows ? 'windows' : ''}>
+          <Tooltip title={t('minapp.popup.refresh')} mouseEnterDelay={0.8} placement="bottom">
+            <Button onClick={() => handleReload(appInfo.id)}>
+              <ReloadOutlined />
+            </Button>
+          </Tooltip>
+          {appInfo.canPinned && (
+            <Tooltip
+              title={appInfo.isPinned ? t('minapp.sidebar.remove.title') : t('minapp.sidebar.add.title')}
+              mouseEnterDelay={0.8}
+              placement="bottom">
+              <Button onClick={() => handleTogglePin(appInfo.id)} className={appInfo.isPinned ? 'pinned' : ''}>
+                <PushpinOutlined style={{ fontSize: 16 }} />
+              </Button>
+            </Tooltip>
+          )}
+          {appInfo.canOpenExternalLink && (
+            <Tooltip title={t('minapp.popup.openExternal')} mouseEnterDelay={0.8} placement="bottom">
+              <Button onClick={() => handleOpenLink(url ?? appInfo.url)}>
+                <ExportOutlined />
+              </Button>
+            </Tooltip>
+          )}
+          {isInDevelopment && (
+            <Tooltip title={t('minapp.popup.devtools')} mouseEnterDelay={0.8} placement="bottom">
+              <Button onClick={() => handleOpenDevTools(appInfo.id)}>
+                <CodeOutlined />
+              </Button>
+            </Tooltip>
+          )}
+          {canMinimize && (
+            <Tooltip title={t('minapp.popup.minimize')} mouseEnterDelay={0.8} placement="bottom">
+              <Button onClick={() => handlePopupMinimize()}>
+                <MinusOutlined />
+              </Button>
+            </Tooltip>
+          )}
+          <Tooltip title={t('minapp.popup.close')} mouseEnterDelay={0.8} placement="bottom">
+            <Button onClick={() => handlePopupClose(appInfo.id)}>
+              <CloseOutlined />
+            </Button>
+          </Tooltip>
+        </ButtonsGroup>
+      </TitleContainer>
+    )
+  }
+
+  /** group the webview containers with Memo, one of the key to make them keepalive */
+  const WebviewContainerGroup = useMemo(() => {
+    return combinedApps.map((app) => (
+      <WebviewContainer
+        key={app.id}
+        appid={app.id}
+        url={app.url}
+        onSetRefCallback={handleWebviewSetRef}
+        onLoadedCallback={handleWebviewLoaded}
+        onNavigateCallback={handleWebviewNavigate}
+      />
+    ))
+
+    // because the combinedApps is enough
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [combinedApps])
+
+  return (
+    <Drawer
+      title={<Title appInfo={currentAppInfo} url={currentUrl} />}
+      placement="bottom"
+      onClose={handlePopupMinimize}
+      open={isPopupShow}
+      destroyOnClose={false}
+      mask={false}
+      rootClassName="minapp-drawer"
+      maskClassName="minapp-mask"
+      height={'100%'}
+      maskClosable={false}
+      closeIcon={null}
+      style={{ marginLeft: 'var(--sidebar-width)' }}>
+      {!isReady && (
+        <EmptyView>
+          <Avatar
+            src={currentAppInfo?.logo}
+            size={80}
+            style={{ border: '1px solid var(--color-border)', marginTop: -150 }}
+          />
+          <BeatLoader color="var(--color-text-2)" size="10px" style={{ marginTop: 15 }} />
+        </EmptyView>
+      )}
+      {WebviewContainerGroup}
+    </Drawer>
+  )
+}
+
+const TitleContainer = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding-left: ${isMac ? '20px' : '10px'};
+  padding-right: 10px;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: transparent;
+`
+
+const TitleText = styled.div`
+  font-weight: bold;
+  font-size: 14px;
+  color: var(--color-text-1);
+  margin-right: 10px;
+  -webkit-app-region: no-drag;
+`
+
+const TitleTextTooltip = styled.span`
+  font-size: 0.8rem;
+
+  .icon-copy {
+    font-size: 0.7rem;
+    padding-right: 5px;
+  }
+`
+
+const ButtonsGroup = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 5px;
+  -webkit-app-region: no-drag;
+  &.windows {
+    margin-right: ${isWindows ? '130px' : 0};
+    background-color: var(--color-background-mute);
+    border-radius: 50px;
+    padding: 0 3px;
+    overflow: hidden;
+  }
+`
+
+const Button = styled.div`
+  cursor: pointer;
+  width: 30px;
+  height: 30px;
+  border-radius: 5px;
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+  align-items: center;
+  color: var(--color-text-2);
+  transition: all 0.2s ease;
+  font-size: 14px;
+  &:hover {
+    color: var(--color-text-1);
+    background-color: var(--color-background-mute);
+  }
+  &.pinned {
+    color: var(--color-primary);
+    background-color: var(--color-primary-bg);
+  }
+`
+
+const EmptyView = styled.div`
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+  background-color: var(--color-background);
+`
+
+export default MinappPopupContainer

src/renderer/src/components/MinApp/TopViewMinappContainer.tsx

@@ -0,0 +1,11 @@
+import MinappPopupContainer from '@renderer/components/MinApp/MinappPopupContainer'
+import { useRuntime } from '@renderer/hooks/useRuntime'
+
+const TopViewMinappContainer = () => {
+  const { openedKeepAliveMinapps, openedOneOffMinapp } = useRuntime()
+  const isCreate = openedKeepAliveMinapps.length > 0 || openedOneOffMinapp !== null
+
+  return <>{isCreate && <MinappPopupContainer />}</>
+}
+
+export default TopViewMinappContainer

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

@@ -0,0 +1,92 @@
+import { WebviewTag } from 'electron'
+import { memo, useEffect, useRef } from 'react'
+
+/**
+ * WebviewContainer is a component that renders a webview element.
+ * It is used in the MinAppPopupContainer component.
+ * The webcontent can be remain in memory
+ */
+const WebviewContainer = memo(
+  ({
+    appid,
+    url,
+    onSetRefCallback,
+    onLoadedCallback,
+    onNavigateCallback
+  }: {
+    appid: string
+    url: string
+    onSetRefCallback: (appid: string, element: WebviewTag | null) => void
+    onLoadedCallback: (appid: string) => void
+    onNavigateCallback: (appid: string, url: string) => void
+  }) => {
+    const webviewRef = useRef<WebviewTag | null>(null)
+
+    const setRef = (appid: string) => {
+      onSetRefCallback(appid, null)
+
+      return (element: WebviewTag | null) => {
+        onSetRefCallback(appid, element)
+        if (element) {
+          webviewRef.current = element
+        } else {
+          webviewRef.current = null
+        }
+      }
+    }
+
+    useEffect(() => {
+      if (!webviewRef.current) return
+
+      const handleNewWindow = (event: any) => {
+        event.preventDefault()
+        if (webviewRef.current?.loadURL) {
+          webviewRef.current.loadURL(event.url)
+        }
+      }
+
+      const handleLoaded = () => {
+        onLoadedCallback(appid)
+      }
+
+      const handleNavigate = (event: any) => {
+        onNavigateCallback(appid, event.url)
+      }
+
+      webviewRef.current.addEventListener('new-window', handleNewWindow)
+      webviewRef.current.addEventListener('did-finish-load', handleLoaded)
+      webviewRef.current.addEventListener('did-navigate-in-page', handleNavigate)
+
+      // we set the url when the webview is ready
+      webviewRef.current.src = url
+
+      return () => {
+        webviewRef.current?.removeEventListener('new-window', handleNewWindow)
+        webviewRef.current?.removeEventListener('did-finish-load', handleLoaded)
+        webviewRef.current?.removeEventListener('did-navigate-in-page', handleNavigate)
+      }
+      // because the appid and url are enough, no need to add onLoadedCallback
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [appid, url])
+
+    return (
+      <webview
+        key={appid}
+        ref={setRef(appid)}
+        style={WebviewStyle}
+        allowpopups={'true' as any}
+        partition="persist:webview"
+        nodeintegration={'true' as any}
+      />
+    )
+  }
+)
+
+const WebviewStyle: React.CSSProperties = {
+  width: 'calc(100vw - var(--sidebar-width))',
+  height: 'calc(100vh - var(--navbar-height))',
+  backgroundColor: 'white',
+  display: 'inline-flex'
+}
+
+export default WebviewContainer

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

@@ -1,279 +0,0 @@
-/* eslint-disable react/no-unknown-property */
-import { CloseOutlined, CodeOutlined, ExportOutlined, PushpinOutlined, ReloadOutlined } from '@ant-design/icons'
-import { isMac, isWindows } from '@renderer/config/constant'
-import { AppLogo } from '@renderer/config/env'
-import { DEFAULT_MIN_APPS } from '@renderer/config/minapps'
-import { useBridge } from '@renderer/hooks/useBridge'
-import { useMinapps } from '@renderer/hooks/useMinapps'
-import store from '@renderer/store'
-import { setMinappShow } from '@renderer/store/runtime'
-import { MinAppType } from '@renderer/types'
-import { delay } from '@renderer/utils'
-import { Avatar, Drawer } from 'antd'
-import { WebviewTag } from 'electron'
-import { useEffect, useRef, useState } from 'react'
-import BeatLoader from 'react-spinners/BeatLoader'
-import styled from 'styled-components'
-
-import { TopView } from '../TopView'
-
-interface Props {
-  app: MinAppType
-  resolve: (data: any) => void
-}
-
-const PopupContainer: React.FC<Props> = ({ app, resolve }) => {
-  const { pinned, updatePinnedMinapps } = useMinapps()
-  const isPinned = pinned.some((p) => p.id === app.id)
-  const [open, setOpen] = useState(true)
-  const [opened, setOpened] = useState(false)
-  const [isReady, setIsReady] = useState(false)
-  const webviewRef = useRef<WebviewTag | null>(null)
-
-  useBridge()
-
-  const canOpenExternalLink = app.url.startsWith('http://') || app.url.startsWith('https://')
-  const canPinned = DEFAULT_MIN_APPS.some((i) => i.id === app?.id)
-
-  const onClose = async (_delay = 0.3) => {
-    setOpen(false)
-    await delay(_delay)
-    resolve({})
-  }
-
-  MinApp.onClose = onClose
-  const openDevTools = () => {
-    if (webviewRef.current) {
-      webviewRef.current.openDevTools()
-    }
-  }
-  const onReload = () => {
-    if (webviewRef.current) {
-      webviewRef.current.src = app.url
-    }
-  }
-
-  const onOpenLink = () => {
-    if (webviewRef.current) {
-      const currentUrl = webviewRef.current.getURL()
-      window.api.openWebsite(currentUrl)
-    }
-  }
-
-  const onTogglePin = () => {
-    const newPinned = isPinned ? pinned.filter((item) => item.id !== app.id) : [...pinned, app]
-    updatePinnedMinapps(newPinned)
-  }
-  const isInDevelopment = process.env.NODE_ENV === 'development'
-  const Title = () => {
-    return (
-      <TitleContainer style={{ justifyContent: 'space-between' }}>
-        <TitleText>{app.name}</TitleText>
-        <ButtonsGroup className={isWindows ? 'windows' : ''}>
-          <Button onClick={onReload}>
-            <ReloadOutlined />
-          </Button>
-          {canPinned && (
-            <Button onClick={onTogglePin} className={isPinned ? 'pinned' : ''}>
-              <PushpinOutlined style={{ fontSize: 16 }} />
-            </Button>
-          )}
-          {canOpenExternalLink && (
-            <Button onClick={onOpenLink}>
-              <ExportOutlined />
-            </Button>
-          )}
-          {isInDevelopment && (
-            <Button onClick={openDevTools}>
-              <CodeOutlined />
-            </Button>
-          )}
-          <Button onClick={() => onClose()}>
-            <CloseOutlined />
-          </Button>
-        </ButtonsGroup>
-      </TitleContainer>
-    )
-  }
-
-  useEffect(() => {
-    const webview = webviewRef.current
-
-    if (webview) {
-      const handleNewWindow = (event: any) => {
-        event.preventDefault()
-        if (webview.loadURL) {
-          webview.loadURL(event.url)
-        }
-      }
-
-      const onLoaded = () => setIsReady(true)
-
-      webview.addEventListener('new-window', handleNewWindow)
-      webview.addEventListener('did-finish-load', onLoaded)
-
-      return () => {
-        webview.removeEventListener('new-window', handleNewWindow)
-        webview.removeEventListener('did-finish-load', onLoaded)
-      }
-    }
-
-    return () => {}
-  }, [opened])
-
-  useEffect(() => {
-    setTimeout(() => setOpened(true), 350)
-  }, [])
-
-  return (
-    <Drawer
-      title={<Title />}
-      placement="bottom"
-      onClose={() => onClose()}
-      open={open}
-      mask={true}
-      rootClassName="minapp-drawer"
-      maskClassName="minapp-mask"
-      height={'100%'}
-      maskClosable={false}
-      closeIcon={null}
-      style={{ marginLeft: 'var(--sidebar-width)' }}>
-      {!isReady && (
-        <EmptyView>
-          <Avatar src={app.logo} size={80} style={{ border: '1px solid var(--color-border)', marginTop: -150 }} />
-          <BeatLoader color="var(--color-text-2)" size="10" style={{ marginTop: 15 }} />
-        </EmptyView>
-      )}
-      {opened && (
-        <webview
-          src={app.url}
-          ref={webviewRef}
-          style={WebviewStyle}
-          allowpopups={'true' as any}
-          partition="persist:webview"
-        />
-      )}
-    </Drawer>
-  )
-}
-
-const WebviewStyle: React.CSSProperties = {
-  width: 'calc(100vw - var(--sidebar-width))',
-  height: 'calc(100vh - var(--navbar-height))',
-  backgroundColor: 'white',
-  display: 'inline-flex'
-}
-
-const TitleContainer = styled.div`
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  padding-left: ${isMac ? '20px' : '10px'};
-  padding-right: 10px;
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-`
-
-const TitleText = styled.div`
-  font-weight: bold;
-  font-size: 14px;
-  color: var(--color-text-1);
-  margin-right: 10px;
-  user-select: none;
-`
-
-const ButtonsGroup = styled.div`
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  gap: 5px;
-  -webkit-app-region: no-drag;
-  &.windows {
-    margin-right: ${isWindows ? '130px' : 0};
-    background-color: var(--color-background-mute);
-    border-radius: 50px;
-    padding: 0 3px;
-    overflow: hidden;
-  }
-`
-
-const Button = styled.div`
-  cursor: pointer;
-  width: 30px;
-  height: 30px;
-  border-radius: 5px;
-  display: flex;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  color: var(--color-text-2);
-  transition: all 0.2s ease;
-  font-size: 14px;
-  &:hover {
-    color: var(--color-text-1);
-    background-color: var(--color-background-mute);
-  }
-  &.pinned {
-    color: var(--color-primary);
-    background-color: var(--color-primary-bg);
-  }
-`
-
-const EmptyView = styled.div`
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  width: 100%;
-  height: 100%;
-  background-color: var(--color-background);
-`
-
-export default class MinApp {
-  static topviewId = 0
-  static onClose = () => {}
-  static app: MinAppType | null = null
-
-  static async start(app: MinAppType) {
-    if (app?.id && MinApp.app?.id === app?.id) {
-      return
-    }
-
-    if (MinApp.app) {
-      // @ts-ignore delay params
-      await MinApp.onClose(0)
-      await delay(0)
-    }
-
-    if (!app.logo) {
-      app.logo = AppLogo
-    }
-
-    MinApp.app = app
-    store.dispatch(setMinappShow(true))
-
-    return new Promise<any>((resolve) => {
-      TopView.show(
-        <PopupContainer
-          app={app}
-          resolve={(v) => {
-            resolve(v)
-            this.close()
-          }}
-        />,
-        'MinApp'
-      )
-    })
-  }
-
-  static close() {
-    TopView.hide('MinApp')
-    store.dispatch(setMinappShow(false))
-    MinApp.app = null
-    MinApp.onClose = () => {}
-  }
-}

src/renderer/src/components/ModelTags.tsx

@@ -2,6 +2,7 @@ import {
   isEmbeddingModel,
   isFunctionCallingModel,
   isReasoningModel,
+  isRerankModel,
   isVisionModel,
   isWebSearchModel
 } from '@renderer/config/models'
@@ -32,8 +33,9 @@ const ModelTags: FC<ModelTagsProps> = ({ model, showFree = true, showReasoning =
       {isWebSearchModel(model) && <WebSearchIcon />}
       {showReasoning && isReasoningModel(model) && <ReasoningIcon />}
       {showToolsCalling && isFunctionCallingModel(model) && <ToolsCallingIcon />}
-      {isEmbeddingModel(model) && <Tag color="orange">{t('models.embedding')}</Tag>}
-      {showFree && isFreeModel(model) && <Tag color="green">{t('models.free')}</Tag>}
+      {isEmbeddingModel(model) && <Tag color="orange">{t('models.type.embedding')}</Tag>}
+      {showFree && isFreeModel(model) && <Tag color="green">{t('models.type.free')}</Tag>}
+      {isRerankModel(model) && <Tag color="geekblue">{t('models.type.rerank')}</Tag>}
     </Container>
   )
 }

src/renderer/src/components/NutstorePathSelector.tsx

@@ -0,0 +1,250 @@
+import { FolderIcon as NutstoreFolderIcon } from '@renderer/components/Icons/NutstoreIcons'
+import { Button, Input } from 'antd'
+import { useCallback, useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import styled from 'styled-components'
+
+import { HStack } from './Layout'
+
+interface NewFolderProps {
+  onConfirm: (name: string) => void
+  onCancel: () => void
+  className?: string
+}
+
+const NewFolderContainer = styled.div`
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 0 4px;
+`
+
+const FolderIcon = styled(NutstoreFolderIcon)`
+  width: 40px;
+  height: 40px;
+`
+
+function NewFolder(props: NewFolderProps) {
+  const { onConfirm, onCancel } = props
+  const [name, setName] = useState('')
+  const { t } = useTranslation()
+
+  return (
+    <NewFolderContainer>
+      <FolderIcon className={props.className}></FolderIcon>
+      <Input type="text" style={{ flex: 1 }} autoFocus value={name} onChange={(e) => setName(e.target.value)} />
+      <Button type="primary" size="small" onClick={() => onConfirm(name)}>
+        {t('settings.data.nutstore.new_folder.button.confirm')}
+      </Button>
+      <Button type="default" size="small" onClick={() => onCancel()}>
+        {t('settings.data.nutstore.new_folder.button.cancel')}
+      </Button>
+    </NewFolderContainer>
+  )
+}
+
+interface FolderProps {
+  name: string
+  path: string
+  onClick: (path: string) => void
+}
+
+const FolderContainer = styled.div`
+  display: flex;
+  gap: 8px;
+  align-items: center;
+  max-width: 100%;
+  padding: 0 4px;
+
+  &:hover {
+    background-color: var(--color-background-soft);
+  }
+
+  .nutstore-pathname {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    flex: 1;
+  }
+`
+
+function Folder(props: FolderProps) {
+  return (
+    <FolderContainer onClick={() => props.onClick(props.path)}>
+      <FolderIcon></FolderIcon>
+      <span className="nutstore-pathname">{props.name}</span>
+    </FolderContainer>
+  )
+}
+
+interface FileListProps {
+  path: string
+  fs: Nutstore.Fs
+  onClick: (file: Nutstore.FileStat) => void
+}
+
+function FileList(props: FileListProps) {
+  const [files, setFiles] = useState<Nutstore.FileStat[]>([])
+
+  const folders = files.filter((file) => file.isDir).sort((a, b) => a.basename.localeCompare(b.basename, ['zh']))
+
+  useEffect(() => {
+    async function fetchFiles() {
+      try {
+        const items = await props.fs.ls(props.path)
+        setFiles(items)
+      } catch (error) {
+        if (error instanceof Error) {
+          console.error(error)
+          window.modal.error({
+            content: error.message,
+            centered: true
+          })
+        }
+      }
+    }
+    fetchFiles()
+  }, [props.path, props.fs])
+
+  return (
+    <>
+      {folders.map((folder) => (
+        <Folder key={folder.path} name={folder.basename} path={folder.path} onClick={() => props.onClick(folder)} />
+      ))}
+    </>
+  )
+}
+
+const SingleFileListContainer = styled.div`
+  height: 300px;
+  overflow: hidden;
+  .scroll-container {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    overflow-y: auto;
+    scrollbar-width: none;
+    &::-webkit-scrollbar {
+      display: none;
+    }
+  }
+
+  .new-folder {
+    margin-top: 4px;
+  }
+`
+
+const Container = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+  .nutstore-current-path-container {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    .nutstore-current-path {
+      word-break: break-all;
+    }
+  }
+
+  .nutstore-path-operater {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+`
+
+interface Props {
+  fs: Nutstore.Fs
+  onConfirm: (path: string) => void
+  onCancel: () => void
+}
+
+export function NutstorePathSelector(props: Props) {
+  const { t } = useTranslation()
+
+  const [stack, setStack] = useState<string[]>(['/'])
+  const [showNewFolder, setShowNewFolder] = useState(false)
+
+  const cwd = stack.at(-1)
+
+  const enter = useCallback((path: string) => {
+    setStack((prev) => [...prev, path])
+  }, [])
+
+  const pop = useCallback(() => {
+    setStack((prev) => (prev.length > 1 ? prev.slice(0, -1) : prev))
+  }, [])
+
+  const handleNewFolder = useCallback(
+    async (name: string) => {
+      const target = (cwd ?? '/') + (cwd && cwd !== '/' ? '/' : '') + name
+      await props.fs.mkdirs(target)
+      setShowNewFolder(false)
+      enter(target)
+    },
+    [cwd, props.fs, enter]
+  )
+
+  return (
+    <>
+      <Container>
+        <SingleFileListContainer>
+          <div className="scroll-container">
+            {showNewFolder && (
+              <NewFolder className="new-folder" onConfirm={handleNewFolder} onCancel={() => setShowNewFolder(false)} />
+            )}
+            <FileList path={cwd ?? ''} fs={props.fs} onClick={(f) => enter(f.path)} />
+          </div>
+        </SingleFileListContainer>
+        <div className="nutstore-current-path-container">
+          <span>{t('settings.data.nutstore.pathSelector.currentPath')}</span>
+          <span className="nutstore-current-path">{cwd ?? '/'}</span>
+        </div>
+      </Container>
+      <NustorePathSelectorFooter
+        returnPrev={pop}
+        mkdir={() => setShowNewFolder(true)}
+        cancel={props.onCancel}
+        confirm={() => props.onConfirm(cwd ?? '')}
+      />
+    </>
+  )
+}
+
+const FooterContainer = styled(HStack)`
+  background: transparent;
+  margin-top: 12px;
+  padding: 0;
+  border-top: none;
+  border-radius: 0;
+`
+
+interface FooterProps {
+  returnPrev: () => void
+  mkdir: () => void
+  cancel: () => void
+  confirm: () => void
+}
+
+export function NustorePathSelectorFooter(props: FooterProps) {
+  const { t } = useTranslation()
+  return (
+    <FooterContainer justifyContent="space-between">
+      <HStack gap={8} alignItems="center">
+        <Button onClick={props.returnPrev}>{t('settings.data.nutstore.pathSelector.return')}</Button>
+        <Button size="small" type="link" onClick={props.mkdir}>
+          {t('settings.data.nutstore.new_folder.button')}
+        </Button>
+      </HStack>
+      <HStack gap={8} alignItems="center">
+        <Button type="default" onClick={props.cancel}>
+          {t('settings.data.nutstore.new_folder.button.cancel')}
+        </Button>
+        <Button type="primary" onClick={props.confirm}>
+          {t('backup.confirm.button')}
+        </Button>
+      </HStack>
+    </FooterContainer>
+  )
+}

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

@@ -9,28 +9,27 @@ interface Props extends ButtonProps {
   onSuccess?: (key: string) => void
 }
 
-const OAuthButton: FC<Props> = ({ provider, ...props }) => {
+const OAuthButton: FC<Props> = ({ provider, onSuccess, ...buttonProps }) => {
   const { t } = useTranslation()
-
   const onAuth = () => {
-    const onSuccess = (key: string) => {
+    const handleSuccess = (key: string) => {
       if (key.trim()) {
-        props.onSuccess?.(key)
+        onSuccess?.(key)
         window.message.success({ content: t('auth.get_key_success'), key: 'auth-success' })
       }
     }
 
     if (provider.id === 'silicon') {
-      oauthWithSiliconFlow(onSuccess)
+      oauthWithSiliconFlow(handleSuccess)
     }
 
     if (provider.id === 'aihubmix') {
-      oauthWithAihubmix(onSuccess)
+      oauthWithAihubmix(handleSuccess)
     }
   }
 
   return (
-    <Button onClick={onAuth} {...props}>
+    <Button onClick={onAuth} {...buttonProps}>
       {t('auth.get_key')}
     </Button>
   )

src/renderer/src/components/ObsidianExportDialog.tsx

@@ -0,0 +1,403 @@
+import i18n from '@renderer/i18n'
+import store from '@renderer/store'
+import { exportMarkdownToObsidian } from '@renderer/utils/export'
+import { Alert, Empty, Form, Input, Modal, Select, Spin, TreeSelect } from 'antd'
+import React, { useEffect, useState } from 'react'
+
+const { Option } = Select
+
+interface ObsidianExportDialogProps {
+  title: string
+  markdown: string
+  open: boolean
+  onClose: (success: boolean) => void
+  obsidianTags: string | null
+  processingMethod: string | '3' //默认新增（存在就覆盖）
+}
+
+interface FileInfo {
+  path: string
+  type: 'folder' | 'markdown'
+  name: string
+}
+
+// 转换文件信息数组为树形结构
+const convertToTreeData = (files: FileInfo[]) => {
+  const treeData: any[] = [
+    {
+      title: i18n.t('chat.topics.export.obsidian_root_directory'),
+      value: '',
+      isLeaf: false,
+      selectable: true
+    }
+  ]
+
+  // 记录已创建的节点路径
+  const pathMap: Record<string, any> = {
+    '': treeData[0]
+  }
+
+  // 先按类型分组，确保先处理文件夹
+  const folders = files.filter((file) => file.type === 'folder')
+  const mdFiles = files.filter((file) => file.type === 'markdown')
+
+  // 按路径排序，确保父文件夹先被创建
+  const sortedFolders = [...folders].sort((a, b) => a.path.split('/').length - b.path.split('/').length)
+
+  // 先处理所有文件夹，构建目录结构
+  for (const folder of sortedFolders) {
+    const parts = folder.path.split('/')
+    let currentPath = ''
+    let parentPath = ''
+
+    // 遍历文件夹路径的每一部分，确保创建完整路径
+    for (let i = 0; i < parts.length; i++) {
+      const part = parts[i]
+
+      // 构建当前路径
+      currentPath = currentPath ? `${currentPath}/${part}` : part
+
+      // 如果这个路径节点还没创建
+      if (!pathMap[currentPath]) {
+        const node = {
+          title: part,
+          value: currentPath,
+          key: currentPath,
+          isLeaf: false,
+          selectable: true,
+          children: []
+        }
+
+        // 获取父节点，将当前节点添加到父节点的children中
+        const parentNode = pathMap[parentPath]
+        if (parentNode) {
+          if (!parentNode.children) {
+            parentNode.children = []
+          }
+          parentNode.children.push(node)
+        }
+
+        pathMap[currentPath] = node
+      }
+
+      // 更新父路径为当前路径，为下一级做准备
+      parentPath = currentPath
+    }
+  }
+
+  // 然后处理md文件
+  for (const file of mdFiles) {
+    const fullPath = file.path
+    const dirPath = fullPath.substring(0, fullPath.lastIndexOf('/'))
+    const fileName = file.name
+
+    // 获取父文件夹节点
+    const parentNode = pathMap[dirPath] || pathMap['']
+
+    // 创建文件节点
+    const fileNode = {
+      title: fileName,
+      value: fullPath,
+      isLeaf: true,
+      selectable: true,
+      icon: <span style={{ marginRight: 4 }}>📄</span>
+    }
+
+    // 添加到父节点
+    if (!parentNode.children) {
+      parentNode.children = []
+    }
+    parentNode.children.push(fileNode)
+  }
+
+  return treeData
+}
+
+const ObsidianExportDialog: React.FC<ObsidianExportDialogProps> = ({
+  title,
+  markdown,
+  open,
+  onClose,
+  obsidianTags,
+  processingMethod
+}) => {
+  const defaultObsidianVault = store.getState().settings.defaultObsidianVault
+  const [state, setState] = useState({
+    title,
+    tags: obsidianTags || '',
+    createdAt: new Date().toISOString().split('T')[0],
+    source: 'Cherry Studio',
+    processingMethod: processingMethod,
+    folder: ''
+  })
+
+  const [vaults, setVaults] = useState<Array<{ path: string; name: string }>>([])
+  const [files, setFiles] = useState<FileInfo[]>([])
+  const [fileTreeData, setFileTreeData] = useState<any[]>([])
+  const [selectedVault, setSelectedVault] = useState<string>('')
+  const [loading, setLoading] = useState<boolean>(false)
+  const [error, setError] = useState<string | null>(null)
+
+  // 处理文件数据转为树形结构
+  useEffect(() => {
+    if (files.length > 0) {
+      const treeData = convertToTreeData(files)
+      setFileTreeData(treeData)
+    } else {
+      setFileTreeData([
+        {
+          title: i18n.t('chat.topics.export.obsidian_root_directory'),
+          value: '',
+          isLeaf: false,
+          selectable: true
+        }
+      ])
+    }
+  }, [files])
+
+  // 组件加载时获取Vault列表
+  useEffect(() => {
+    const fetchVaults = async () => {
+      try {
+        setLoading(true)
+        setError(null)
+        const vaultsData = await window.obsidian.getVaults()
+
+        if (vaultsData.length === 0) {
+          setError(i18n.t('chat.topics.export.obsidian_no_vaults'))
+          setLoading(false)
+          return
+        }
+
+        setVaults(vaultsData)
+
+        // 如果没有选择的vault，使用默认值或第一个
+        const vaultToUse = defaultObsidianVault || vaultsData[0]?.name
+        if (vaultToUse) {
+          setSelectedVault(vaultToUse)
+
+          // 获取选中vault的文件和文件夹
+          const filesData = await window.obsidian.getFiles(vaultToUse)
+          setFiles(filesData)
+        }
+      } catch (error) {
+        console.error('获取Obsidian Vault失败:', error)
+        setError(i18n.t('chat.topics.export.obsidian_fetch_error'))
+      } finally {
+        setLoading(false)
+      }
+    }
+
+    fetchVaults()
+  }, [defaultObsidianVault])
+
+  // 当选择的vault变化时，获取其文件和文件夹
+  useEffect(() => {
+    if (selectedVault) {
+      const fetchFiles = async () => {
+        try {
+          setLoading(true)
+          setError(null)
+          const filesData = await window.obsidian.getFiles(selectedVault)
+          setFiles(filesData)
+        } catch (error) {
+          console.error('获取Obsidian文件失败:', error)
+          setError(i18n.t('chat.topics.export.obsidian_fetch_folders_error'))
+        } finally {
+          setLoading(false)
+        }
+      }
+
+      fetchFiles()
+    }
+  }, [selectedVault])
+
+  const handleOk = async () => {
+    if (!selectedVault) {
+      setError(i18n.t('chat.topics.export.obsidian_no_vault_selected'))
+      return
+    }
+
+    //构建content 并复制到粘贴板
+    let content = ''
+    if (state.processingMethod !== '3') {
+      content = `\n---\n${markdown}`
+    } else {
+      content = `---
+      \ntitle: ${state.title}
+      \ncreated: ${state.createdAt}
+      \nsource: ${state.source}
+      \ntags: ${state.tags}
+      \n---\n${markdown}`
+    }
+    if (content === '') {
+      window.message.error(i18n.t('chat.topics.export.obsidian_export_failed'))
+      return
+    }
+
+    await navigator.clipboard.writeText(content)
+
+    // 导出到Obsidian
+    exportMarkdownToObsidian({
+      ...state,
+      folder: state.folder,
+      vault: selectedVault
+    })
+
+    onClose(true)
+  }
+
+  const handleCancel = () => {
+    onClose(false)
+  }
+
+  const handleChange = (key: string, value: any) => {
+    setState((prevState) => ({ ...prevState, [key]: value }))
+  }
+
+  const handleVaultChange = (value: string) => {
+    setSelectedVault(value)
+    // 文件夹会通过useEffect自动获取
+    setState((prevState) => ({
+      ...prevState,
+      folder: ''
+    }))
+  }
+
+  // 处理文件选择
+  const handleFileSelect = (value: string) => {
+    // 更新folder值
+    handleChange('folder', value)
+
+    // 检查是否选中md文件
+    if (value) {
+      const selectedFile = files.find((file) => file.path === value)
+      if (selectedFile) {
+        if (selectedFile.type === 'markdown') {
+          // 如果是md文件，自动设置标题为文件名并设置处理方式为1(追加)
+          const fileName = selectedFile.name
+          const titleWithoutExt = fileName.endsWith('.md') ? fileName.substring(0, fileName.length - 3) : fileName
+          handleChange('title', titleWithoutExt)
+          handleChange('processingMethod', '1')
+        } else {
+          // 如果是文件夹，自动设置标题为话题名并设置处理方式为3(新建)
+          handleChange('processingMethod', '3')
+          handleChange('title', title)
+        }
+      }
+    }
+  }
+
+  return (
+    <Modal
+      title={i18n.t('chat.topics.export.obsidian_atributes')}
+      open={open}
+      onOk={handleOk}
+      onCancel={handleCancel}
+      width={600}
+      closable
+      maskClosable
+      centered
+      okButtonProps={{
+        type: 'primary',
+        disabled: vaults.length === 0 || loading || !!error
+      }}
+      okText={i18n.t('chat.topics.export.obsidian_btn')}>
+      {error && <Alert message={error} type="error" showIcon style={{ marginBottom: 16 }} />}
+
+      <Form layout="horizontal" labelCol={{ span: 6 }} wrapperCol={{ span: 18 }} labelAlign="left">
+        <Form.Item label={i18n.t('chat.topics.export.obsidian_title')}>
+          <Input
+            value={state.title}
+            onChange={(e) => handleChange('title', e.target.value)}
+            placeholder={i18n.t('chat.topics.export.obsidian_title_placeholder')}
+          />
+        </Form.Item>
+
+        <Form.Item label={i18n.t('chat.topics.export.obsidian_vault')}>
+          {vaults.length > 0 ? (
+            <Select
+              loading={loading}
+              value={selectedVault}
+              onChange={handleVaultChange}
+              placeholder={i18n.t('chat.topics.export.obsidian_vault_placeholder')}
+              style={{ width: '100%' }}>
+              {vaults.map((vault) => (
+                <Option key={vault.name} value={vault.name}>
+                  {vault.name}
+                </Option>
+              ))}
+            </Select>
+          ) : (
+            <Empty
+              description={
+                loading
+                  ? i18n.t('chat.topics.export.obsidian_loading')
+                  : i18n.t('chat.topics.export.obsidian_no_vaults')
+              }
+              image={Empty.PRESENTED_IMAGE_SIMPLE}
+            />
+          )}
+        </Form.Item>
+
+        <Form.Item label={i18n.t('chat.topics.export.obsidian_path')}>
+          <Spin spinning={loading}>
+            {selectedVault ? (
+              <TreeSelect
+                value={state.folder}
+                onChange={handleFileSelect}
+                placeholder={i18n.t('chat.topics.export.obsidian_path_placeholder')}
+                style={{ width: '100%' }}
+                showSearch
+                dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
+                treeDefaultExpandAll={false}
+                treeNodeFilterProp="title"
+                treeData={fileTreeData}></TreeSelect>
+            ) : (
+              <Empty
+                description={i18n.t('chat.topics.export.obsidian_select_vault_first')}
+                image={Empty.PRESENTED_IMAGE_SIMPLE}
+              />
+            )}
+          </Spin>
+        </Form.Item>
+
+        <Form.Item label={i18n.t('chat.topics.export.obsidian_tags')}>
+          <Input
+            value={state.tags}
+            onChange={(e) => handleChange('tags', e.target.value)}
+            placeholder={i18n.t('chat.topics.export.obsidian_tags_placeholder')}
+          />
+        </Form.Item>
+        <Form.Item label={i18n.t('chat.topics.export.obsidian_created')}>
+          <Input
+            value={state.createdAt}
+            onChange={(e) => handleChange('createdAt', e.target.value)}
+            placeholder={i18n.t('chat.topics.export.obsidian_created_placeholder')}
+          />
+        </Form.Item>
+        <Form.Item label={i18n.t('chat.topics.export.obsidian_source')}>
+          <Input
+            value={state.source}
+            onChange={(e) => handleChange('source', e.target.value)}
+            placeholder={i18n.t('chat.topics.export.obsidian_source_placeholder')}
+          />
+        </Form.Item>
+
+        <Form.Item label={i18n.t('chat.topics.export.obsidian_operate')}>
+          <Select
+            value={state.processingMethod}
+            onChange={(value) => handleChange('processingMethod', value)}
+            placeholder={i18n.t('chat.topics.export.obsidian_operate_placeholder')}
+            allowClear>
+            <Option value="1">{i18n.t('chat.topics.export.obsidian_operate_append')}</Option>
+            <Option value="2">{i18n.t('chat.topics.export.obsidian_operate_prepend')}</Option>
+            <Option value="3">{i18n.t('chat.topics.export.obsidian_operate_new_or_overwrite')}</Option>
+          </Select>
+        </Form.Item>
+      </Form>
+    </Modal>
+  )
+}
+
+export default ObsidianExportDialog

src/renderer/src/components/Popups/AddAssistantPopup.tsx

@@ -9,7 +9,7 @@ import { Agent, Assistant } from '@renderer/types'
 import { uuid } from '@renderer/utils'
 import { Divider, Input, InputRef, Modal, Tag } from 'antd'
 import { take } from 'lodash'
-import { useEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
@@ -29,6 +29,9 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
   const { assistants, addAssistant } = useAssistants()
   const inputRef = useRef<InputRef>(null)
   const systemAgents = useSystemAgents()
+  const loadingRef = useRef(false)
+  const [selectedIndex, setSelectedIndex] = useState(0)
+  const containerRef = useRef<HTMLDivElement>(null)
 
   const agents = useMemo(() => {
     const allAgents = [...userAgents, ...systemAgents] as Agent[]
@@ -51,7 +54,18 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
     return filtered
   }, [assistants, defaultAssistant, searchText, systemAgents, userAgents])
 
-  const onCreateAssistant = async (agent: Agent) => {
+  // 重置选中索引当搜索或列表内容变更时
+  useEffect(() => {
+    setSelectedIndex(0)
+  }, [agents.length, searchText])
+
+  const onCreateAssistant = useCallback(
+    async (agent: Agent) => {
+      if (loadingRef.current) {
+        return
+      }
+
+      loadingRef.current = true
       let assistant: Assistant
 
       if (agent.id === 'default') {
@@ -64,7 +78,56 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
       setTimeout(() => EventEmitter.emit(EVENT_NAMES.SHOW_ASSISTANTS), 0)
       resolve(assistant)
       setOpen(false)
+    },
+    [resolve, addAssistant, setOpen]
+  ) // 添加函数内使用的依赖项
+  // 键盘导航处理
+  useEffect(() => {
+    if (!open) return
+
+    const handleKeyDown = (e: KeyboardEvent) => {
+      const displayedAgents = take(agents, 100)
+
+      switch (e.key) {
+        case 'ArrowDown':
+          e.preventDefault()
+          setSelectedIndex((prev) => (prev >= displayedAgents.length - 1 ? 0 : prev + 1))
+          break
+        case 'ArrowUp':
+          e.preventDefault()
+          setSelectedIndex((prev) => (prev <= 0 ? displayedAgents.length - 1 : prev - 1))
+          break
+        case 'Enter':
+          // 如果焦点在输入框且有搜索内容，则默认选择第一项
+          if (document.activeElement === inputRef.current?.input && searchText.trim()) {
+            e.preventDefault()
+            onCreateAssistant(displayedAgents[selectedIndex])
           }
+          // 否则选择当前选中项
+          else if (selectedIndex >= 0 && selectedIndex < displayedAgents.length) {
+            e.preventDefault()
+            onCreateAssistant(displayedAgents[selectedIndex])
+          }
+          break
+      }
+    }
+
+    window.addEventListener('keydown', handleKeyDown)
+    return () => window.removeEventListener('keydown', handleKeyDown)
+  }, [open, selectedIndex, agents, searchText, onCreateAssistant])
+
+  // 确保选中项在可视区域
+  useEffect(() => {
+    if (containerRef.current) {
+      const agentItems = containerRef.current.querySelectorAll('.agent-item')
+      if (agentItems[selectedIndex]) {
+        agentItems[selectedIndex].scrollIntoView({
+          behavior: 'smooth',
+          block: 'nearest'
+        })
+      }
+    }
+  }, [selectedIndex])
 
   const onCancel = () => {
     setOpen(false)
@@ -115,12 +178,13 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
         />
       </HStack>
       <Divider style={{ margin: 0, borderBlockStartWidth: 0.5 }} />
-      <Container>
-        {take(agents, 100).map((agent) => (
+      <Container ref={containerRef}>
+        {take(agents, 100).map((agent, index) => (
           <AgentItem
             key={agent.id}
             onClick={() => onCreateAssistant(agent)}
-            className={agent.id === 'default' ? 'default' : ''}>
+            className={`agent-item ${agent.id === 'default' ? 'default' : ''} ${index === selectedIndex ? 'keyboard-selected' : ''}`}
+            onMouseEnter={() => setSelectedIndex(index)}>
             <HStack
               alignItems="center"
               gap={5}
@@ -155,9 +219,14 @@ const AgentItem = styled.div`
   margin-bottom: 8px;
   cursor: pointer;
   overflow: hidden;
+  border: 1px solid transparent;
   &.default {
     background-color: var(--color-background-mute);
   }
+  &.keyboard-selected {
+    background-color: var(--color-background-mute);
+    border: 1px solid var(--color-primary);
+  }
   .anticon {
     font-size: 16px;
     color: var(--color-icon);

src/renderer/src/components/Popups/NutsorePathPopup.tsx

@@ -0,0 +1,60 @@
+import { Modal } from 'antd'
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { NutstorePathSelector } from '../NutstorePathSelector'
+import { TopView } from '../TopView'
+
+interface Props {
+  fs: Nutstore.Fs
+  resolve: (data: string | null) => void
+}
+
+const PopupContainer: React.FC<Props> = ({ resolve, fs }) => {
+  const [open, setOpen] = useState(true)
+  const { t } = useTranslation()
+
+  const onCancel = () => {
+    setOpen(false)
+  }
+
+  const onClose = () => {
+    resolve(null)
+  }
+
+  return (
+    <Modal
+      open={open}
+      title={t('settings.data.nutstore.pathSelector.title')}
+      transitionName="ant-move-down"
+      afterClose={onClose}
+      onCancel={onClose}
+      footer={null}
+      centered>
+      <NutstorePathSelector fs={fs} onConfirm={resolve} onCancel={onCancel} />
+    </Modal>
+  )
+}
+
+const TopViewKey = 'NutstorePathPopup'
+
+export default class NutstorePathPopup {
+  static topviewId = 0
+  static hide() {
+    TopView.hide(TopViewKey)
+  }
+  static show(fs: Nutstore.Fs) {
+    return new Promise<any>((resolve) => {
+      TopView.show(
+        <PopupContainer
+          fs={fs}
+          resolve={(v) => {
+            resolve(v)
+            TopView.hide(TopViewKey)
+          }}
+        />,
+        TopViewKey
+      )
+    })
+  }
+}