feat: hide entry for local ai

This reverts commit b0c479190c.

.eslintrc.cjs

@@ -1,5 +1,5 @@
 module.exports = {
-  plugins: ['unused-imports'],
+  plugins: ['unused-imports', 'simple-import-sort'],
   extends: [
     'eslint:recommended',
     'plugin:react/recommended',
@@ -14,12 +14,7 @@ module.exports = {
     'unused-imports/no-unused-imports': 'error',
     '@typescript-eslint/no-non-null-asserted-optional-chain': 'off',
     'react/prop-types': 'off',
-    'sort-imports': [
-      'error',
-      {
-        ignoreCase: true,
-        ignoreDeclarationSort: true
-      }
-    ]
+    'simple-import-sort/imports': 'error',
+    'simple-import-sort/exports': 'error'
   }
 }

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-latest, windows-latest]
+        os: [macos-latest, windows-latest, ubuntu-latest]
 
     steps:
       - name: Check out Git repository
@@ -60,7 +60,7 @@ jobs:
       - name: Release
         uses: softprops/action-gh-release@v2
         with:
-          draft: false
+          draft: true
           files: |
             dist/*.exe
             dist/*.zip

.gitignore

@@ -34,6 +34,9 @@ npm/*/*
 !.yarn/sdks
 !.yarn/versions
 
+# Windows
+Thumbs.db
+
 # Project
 node_modules
 dist
@@ -42,3 +45,6 @@ out
 # ENV
 .env
 .env.*
+
+# Local
+local

.yarn/patches/@electron-notarize-npm-2.3.2-535908a4bd.patch

@@ -0,0 +1,53 @@
+diff --git a/lib/check-signature.js b/lib/check-signature.js
+index 324568af71bcc4372c9f959131ecd24122848c86..677348e0a138ff608b2ac41f592d813b15ee4956 100644
+--- a/lib/check-signature.js
++++ b/lib/check-signature.js
+@@ -41,16 +41,12 @@ const spawn_1 = require("./spawn");
+ const debug_1 = __importDefault(require("debug"));
+ const d = (0, debug_1.default)('electron-notarize');
+ const codesignDisplay = (opts) => __awaiter(void 0, void 0, void 0, function* () {
+-    const result = yield (0, spawn_1.spawn)('codesign', ['-dv', '-vvvv', '--deep', path.basename(opts.appPath)], {
+-        cwd: path.dirname(opts.appPath),
+-    });
++    const result = yield (0, spawn_1.spawn)('codesign', ['-dv', '-vvvv', '--deep', opts.appPath]);
+     return result;
+ });
+ const codesign = (opts) => __awaiter(void 0, void 0, void 0, function* () {
+     d('attempting to check codesign of app:', opts.appPath);
+-    const result = yield (0, spawn_1.spawn)('codesign', ['-vvv', '--deep', '--strict', path.basename(opts.appPath)], {
+-        cwd: path.dirname(opts.appPath),
+-    });
++    const result = yield (0, spawn_1.spawn)('codesign', ['-vvv', '--deep', '--strict', opts.appPath]);
+     return result;
+ });
+ function checkSignatures(opts) {
+diff --git a/lib/notarytool.js b/lib/notarytool.js
+index 1ab090efb2101fc8bee5553445e0349c54474421..a5ddfd922197449fc56078e4a7e9a2ee5d8d207d 100644
+--- a/lib/notarytool.js
++++ b/lib/notarytool.js
+@@ -92,9 +92,7 @@ function notarizeAndWaitForNotaryTool(opts) {
+             else {
+                 filePath = path.resolve(dir, `${path.parse(opts.appPath).name}.zip`);
+                 d('zipping application to:', filePath);
+-                const zipResult = yield (0, spawn_1.spawn)('ditto', ['-c', '-k', '--sequesterRsrc', '--keepParent', path.basename(opts.appPath), filePath], {
+-                    cwd: path.dirname(opts.appPath),
+-                });
++                const zipResult = yield (0, spawn_1.spawn)('ditto', ['-c', '-k', '--sequesterRsrc', '--keepParent', opts.appPath, filePath]);
+                 if (zipResult.code !== 0) {
+                     throw new Error(`Failed to zip application, exited with code: ${zipResult.code}\n\n${zipResult.output}`);
+                 }
+diff --git a/lib/staple.js b/lib/staple.js
+index 47dbd85b2fc279d999b57f47fb8171e1cc674436..f8829e6ac54fcd630a730d12d75acc1591b953b6 100644
+--- a/lib/staple.js
++++ b/lib/staple.js
+@@ -43,9 +43,7 @@ const d = (0, debug_1.default)('electron-notarize:staple');
+ function stapleApp(opts) {
+     return __awaiter(this, void 0, void 0, function* () {
+         d('attempting to staple app:', opts.appPath);
+-        const result = yield (0, spawn_1.spawn)('xcrun', ['stapler', 'staple', '-v', path.basename(opts.appPath)], {
+-            cwd: path.dirname(opts.appPath),
+-        });
++        const result = yield (0, spawn_1.spawn)('xcrun', ['stapler', 'staple', '-v', opts.appPath]);
+         if (result.code !== 0) {
+             throw new Error(`Failed to staple your application with code: ${result.code}\n\n${result.output}`);
+         }

.yarnrc.yml

@@ -1,2 +1,5 @@
-nodeLinker: node-modules
+enableImmutableInstalls: false
+
 httpTimeout: 300000
+
+nodeLinker: node-modules

LICENSE

@@ -1,21 +1,101 @@
-MIT License
+### Cherry Studio 商业许可协议
 
-Copyright (c) 2024 亢奋猫
+---
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+#### 中文版
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+**Cherry Studio 商业许可协议**
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+本协议（以下简称“协议”）由以下双方签订：
+
+- 许可方：王谦（kangfenmao@qq.com）
+- 被许可方：[被许可方名称]
+
+**1. 定义**
+
+- “软件”指 Cherry Studio 软件，网址为 https://cherry-ai.com。
+- “商业用途”指任何以盈利为目的的使用。
+
+**2. 许可**
+
+- 未经许可方明确书面许可，被许可方不得将软件用于商业用途。
+- 未经许可方事先书面同意，被许可方不得将软件全部或部分用于商业用途分发。
+- 未经许可方明确授权，被许可方不得再许可、租赁、销售、出租或以其他方式将软件转让给任何第三方用于商业用途。
+
+**3. 责任限制**
+
+开发者不对因使用本软件而产生的任何直接或间接损失承担责任。用户应自行承担使用本软件的风险。
+
+**4. 许可协议生效日期**
+
+本许可协议自用户首次下载或使用本软件之日起生效。
+
+**5. 许可终止**
+
+如发现用户违反上述条款，开发者有权随时终止本许可，并要求用户停止使用本软件及删除所有相关副本。
+
+**6. 其他**
+
+本协议的解释、效力及争议的解决，均适用中华人民共和国法律。
+
+**7. 联系信息**
+
+- 许可方联系方式：
+  - 手机号：18539907620
+  - 邮箱：kangfenmao@qq.com
+
+**许可方（签字）：**  
+**日期：**
+
+**被许可方（签字）：**  
+**日期：**
+
+---
+
+#### English Version
+
+**Cherry Studio Commercial License Agreement**
+
+This Agreement ("Agreement") is entered into by and between:
+
+- Licensor: Wang Qian (kangfenmao)
+- Licensee: [Licensee Name]
+
+**1. Definitions**
+
+- "Software" refers to the Cherry Studio software, available at https://cherry-ai.com.
+- "Commercial Use" refers to any use for profit.
+
+**2. License**
+
+- The Licensee may not use the Software for Commercial Use without the Licensor's explicit written permission.
+- The Licensee may not distribute the Software in whole or in part for Commercial Use without the Licensor's prior written consent.
+- The Licensee may not sublicense, lease, sell, rent, or otherwise transfer the Software to any third party for Commercial Use without the Licensor's explicit authorization.
+
+**3. Termination of License**
+
+The developer reserves the right to terminate this license at any time if the terms are violated, and may require the user to cease using the software and delete all related copies.
+
+**4. Effective Date of License Agreement**
+
+This license agreement becomes effective from the date the user first downloads or uses the software.
+
+**5. Termination of License**
+
+The developer reserves the right to terminate this license at any time if the terms are violated, and may require the user to cease using the software and delete all related copies.
+
+**6. Miscellaneous**
+
+This Agreement shall be governed by and construed in accordance with the laws of the People's Republic of China.
+
+**7. Contact Information**
+
+- Licensor's Contact Details:
+  - Phone: 18539907620
+  - Email: kangfenmao@qq.com
+
+**Licensor (Signature):**  
+**Date:**
+
+**Licensee (Signature):**  
+**Date:**

README.md

@@ -1,23 +1,27 @@
-# Cherry Studio
+# 🍒 Cherry Studio
 
-Cherry Studio is a desktop client for multiple cutting-edge LLM models, available on Windows, Mac and Linux.
+Cherry Studio is a desktop client that supports for multiple LLM providers, available on Windows, Mac and Linux.
 
-# Screenshot
+# 🌠 Screenshot
 
-![image.png](https://s2.loli.net/2024/07/16/IAVSOorsfFQyGhM.png)
+![](https://github.com/user-attachments/assets/e24d1e7d-126a-4647-bd98-f470bfe26fde)
 
-![image.png](https://s2.loli.net/2024/07/16/IQPz12OajfNoBTV.png)
+![](https://github.com/user-attachments/assets/3f3f0bfa-cb88-4abf-923a-a0859fa3c912)
 
-# Feature
+![](https://github.com/user-attachments/assets/288560c1-d218-437c-87c2-2a5e87b43b93)
 
-1. Supports multiple large language model service providers.
+# 🌟 Features
+
+1. Support for Multiple LLM Providers.
 2. Allows creation of multiple Assistants.
 3. Enables creation of multiple topics.
 4. Allows using multiple models to answer questions in the same conversation.
 5. Supports drag-and-drop sorting.
 6. Code highlighting.
+7. Mermaid chart
+
+# 🖥️ Develop
 
-# Develop
 ## Recommended IDE Setup
 
 - [VSCode](https://code.visualstudio.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
@@ -48,3 +52,11 @@ $ yarn build:mac
 # For Linux
 $ yarn build:linux
 ```
+
+# ⭐️ 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)
+
+# 📃 License
+
+[LICENSE](./LICENSE)

dev-app-update.yml

@@ -1,3 +1,6 @@
-provider: generic
-url: http://127.0.0.1:8080
-updaterCacheDirName: cherry-studio-updater
+# provider: generic
+# url: http://127.0.0.1:8080
+# updaterCacheDirName: cherry-studio-updater
+provider: github
+repo: cherry-studio
+owner: kangfenmao

electron-builder.yml

@@ -3,12 +3,13 @@ productName: Cherry Studio
 directories:
   buildResources: build
 files:
-  - '!**/.vscode/*'
-  - '!src/*'
+  - '!{.vscode,.yarn,.github}'
   - '!electron.vite.config.{js,ts,mjs,cjs}'
   - '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
   - '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
   - '!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}'
+  - '!src/*'
+  - '!local'
 asarUnpack:
   - resources/**
 win:
@@ -40,8 +41,8 @@ dmg:
 linux:
   target:
     - AppImage
-    - snap
-    - deb
+    # - snap
+    # - deb
   maintainer: electronjs.org
   category: Utility
 appImage:
@@ -56,7 +57,5 @@ electronDownload:
 afterSign: scripts/notarize.js
 releaseInfo:
   releaseNotes: |
-    - 修复多语言提示错误
-    - 修复智谱AI默认模型错误问题
-    - 修复 OpenRouter API 检测出错问题
-    - 修复模型提供商多语言翻译错误问题
+    增加应用备份和恢复功能
+    增加更多AI小程序

electron.vite.config.ts

@@ -1,10 +1,15 @@
-import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
 import react from '@vitejs/plugin-react'
+import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
 import { resolve } from 'path'
 
 export default defineConfig({
   main: {
-    plugins: [externalizeDepsPlugin()]
+    plugins: [externalizeDepsPlugin()],
+    resolve: {
+      alias: {
+        ollama: resolve('ollama/src')
+      }
+    }
   },
   preload: {
     plugins: [externalizeDepsPlugin()]
@@ -15,10 +20,6 @@ export default defineConfig({
         '@renderer': resolve('src/renderer/src')
       }
     },
-    plugins: [react()],
-    assetsInclude: ['**/*.md'],
-    server: {
-      host: '0.0.0.0'
-    }
+    plugins: [react()]
   }
 })

package.json

@@ -1,10 +1,16 @@
 {
-  "name": "cherry-studio",
-  "version": "0.2.3",
+  "name": "CherryStudio",
+  "version": "0.6.2",
+  "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",
   "author": "kangfenmao@qq.com",
   "homepage": "https://github.com/kangfenmao/cherry-studio",
+  "workspaces": {
+    "packages": [
+      "local"
+    ]
+  },
   "scripts": {
     "format": "prettier --write .",
     "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
@@ -18,20 +24,24 @@
     "build:unpack": "dotenv npm run build && electron-builder --dir",
     "build:win": "dotenv npm run build && electron-builder --win --publish never",
     "build:mac": "dotenv electron-vite build && electron-builder --mac --publish never",
-    "build:linux": "dotenv electron-vite build && electron-builder --linux --publish never"
+    "build:linux": "dotenv electron-vite build && electron-builder --linux --publish never",
+    "release": "node scripts/version.js",
+    "publish": "yarn release patch push"
   },
   "dependencies": {
     "@electron-toolkit/preload": "^3.0.0",
     "@electron-toolkit/utils": "^3.0.0",
     "electron-log": "^5.1.5",
+    "electron-store": "^8.2.0",
     "electron-updater": "^6.1.7",
     "electron-window-state": "^5.0.3"
   },
   "devDependencies": {
+    "@anthropic-ai/sdk": "^0.24.3",
     "@electron-toolkit/eslint-config-prettier": "^2.0.0",
     "@electron-toolkit/eslint-config-ts": "^1.0.1",
     "@electron-toolkit/tsconfig": "^1.0.1",
-    "@fontsource/inter": "^5.0.18",
+    "@google/generative-ai": "^0.16.0",
     "@hello-pangea/dnd": "^16.6.0",
     "@kangfenmao/keyv-storage": "^0.1.0",
     "@reduxjs/toolkit": "^2.2.5",
@@ -40,20 +50,22 @@
     "@types/react": "^18.2.48",
     "@types/react-dom": "^18.2.18",
     "@vitejs/plugin-react": "^4.2.1",
-    "ahooks": "^3.8.0",
     "antd": "^5.18.3",
+    "axios": "^1.7.3",
     "browser-image-compression": "^2.0.2",
     "dayjs": "^1.11.11",
     "dotenv-cli": "^7.4.2",
-    "electron": "^28.2.0",
+    "electron": "^28.3.3",
     "electron-builder": "^24.9.1",
-    "electron-devtools-installer": "^3.2.0",
     "electron-vite": "^2.0.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-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-unused-imports": "^4.0.0",
+    "gpt-tokens": "^1.3.6",
     "i18next": "^23.11.5",
     "localforage": "^1.10.0",
     "lodash": "^4.17.21",
@@ -66,8 +78,13 @@
     "react-redux": "^9.1.2",
     "react-router": "6",
     "react-router-dom": "6",
+    "react-spinners": "^0.14.1",
     "react-syntax-highlighter": "^15.5.0",
+    "redux": "^5.0.1",
     "redux-persist": "^6.0.0",
+    "rehype-katex": "^7.0.0",
+    "remark-gfm": "^4.0.0",
+    "remark-math": "^6.0.0",
     "sass": "^1.77.2",
     "styled-components": "^6.1.11",
     "typescript": "^5.3.3",
@@ -79,7 +96,8 @@
     "react-dom": "^17.0.0 || ^18.0.0"
   },
   "resolutions": {
-    "@electron/notarize": "2.3.2"
+    "@electron/notarize": "2.3.2",
+    "@electron/notarize@npm:2.2.1": "patch:@electron/notarize@npm%3A2.3.2#~/.yarn/patches/@electron-notarize-npm-2.3.2-535908a4bd.patch"
   },
   "packageManager": "yarn@4.3.1"
 }

resources/graphrag.html

@@ -0,0 +1,68 @@
+<head>
+  <style>
+    body {
+      margin: 0;
+    }
+  </style>
+  <script src="https://unpkg.com/3d-force-graph"></script>
+</head>
+<body>
+  <div id="3d-graph"></div>
+  <script src="./js/bridge.js"></script>
+  <script type="module">
+    import { getQueryParam } from './js/utils.js'
+
+    const apiUrl = getQueryParam('apiUrl')
+    const modelId = getQueryParam('modelId')
+    const jsonUrl = `${apiUrl}/v1/global_graph/${modelId}`
+
+    const infoCard = document.createElement('div')
+    infoCard.style.position = 'fixed'
+    infoCard.style.backgroundColor = 'rgba(255, 255, 255, 0.9)'
+    infoCard.style.padding = '8px'
+    infoCard.style.borderRadius = '4px'
+    infoCard.style.boxShadow = '0 2px 5px rgba(0,0,0,0.2)'
+    infoCard.style.fontSize = '12px'
+    infoCard.style.maxWidth = '200px'
+    infoCard.style.display = 'none'
+    infoCard.style.zIndex = '1000'
+    document.body.appendChild(infoCard)
+
+    document.addEventListener('mousemove', (event) => {
+      infoCard.style.left = `${event.clientX + 10}px`
+      infoCard.style.top = `${event.clientY + 10}px`
+    })
+
+    const elem = document.getElementById('3d-graph')
+    const Graph = ForceGraph3D()(elem)
+      .jsonUrl(jsonUrl)
+      .nodeAutoColorBy((node) => node.properties.type || 'default')
+      .nodeVal((node) => node.properties.degree)
+      .linkWidth((link) => link.properties.weight)
+      .onNodeHover((node) => {
+        if (node) {
+          infoCard.innerHTML = `
+            <div style="font-weight: bold; margin-bottom: 4px; color: #333;">
+              ${node.properties.title}
+            </div>
+            <div style="color: #666;">
+              ${node.properties.description}
+            </div>`
+          infoCard.style.display = 'block'
+        } else {
+          infoCard.style.display = 'none'
+        }
+      })
+      .onNodeClick((node) => {
+        const url = `${apiUrl}/v1/references/${modelId}/entities/${node.properties.human_readable_id}`
+        window.api.minApp({
+          url,
+          windowOptions: {
+            title: node.properties.title,
+            width: 500,
+            height: 800
+          }
+        })
+      })
+  </script>
+</body>

resources/js/bridge.js

@@ -0,0 +1,36 @@
+;(() => {
+  let messageId = 0
+  const pendingCalls = new Map()
+
+  function api(method, ...args) {
+    const id = messageId++
+    return new Promise((resolve, reject) => {
+      pendingCalls.set(id, { resolve, reject })
+      window.parent.postMessage({ id, type: 'api-call', method, args }, '*')
+    })
+  }
+
+  window.addEventListener('message', (event) => {
+    if (event.data.type === 'api-response') {
+      const { id, result, error } = event.data
+      const pendingCall = pendingCalls.get(id)
+      if (pendingCall) {
+        if (error) {
+          pendingCall.reject(new Error(error))
+        } else {
+          pendingCall.resolve(result)
+        }
+        pendingCalls.delete(id)
+      }
+    }
+  })
+
+  window.api = new Proxy(
+    {},
+    {
+      get: (target, prop) => {
+        return (...args) => api(prop, ...args)
+      }
+    }
+  )
+})()

resources/js/utils.js

@@ -0,0 +1,5 @@
+export function getQueryParam(paramName) {
+  const url = new URL(window.location.href)
+  const params = new URLSearchParams(url.search)
+  return params.get(paramName)
+}

scripts/notarize.js

@@ -6,17 +6,21 @@ exports.default = async function notarizing(context) {
     return
   }
 
-  const appName = context.packager.appInfo.productFilename
+  if (!process.env.APPLE_ID || !process.env.APPLE_APP_SPECIFIC_PASSWORD || !process.env.APPLE_TEAM_ID) {
+    console.log('Skipping notarization')
+    return
+  }
 
-  const notarized = await notarize({
-    appPath: `${context.appOutDir}/${appName}.app`,
+  const appName = context.packager.appInfo.productFilename
+  const appPath = `${context.appOutDir}/${appName}.app`
+
+  await notarize({
+    appPath,
     appBundleId: 'com.kangfenmao.CherryStudio',
     appleId: process.env.APPLE_ID,
     appleIdPassword: process.env.APPLE_APP_SPECIFIC_PASSWORD,
     teamId: process.env.APPLE_TEAM_ID
   })
 
-  console.log('Notarized:', notarized)
-
-  return notarized
+  console.log('  • Notarized app:', appPath)
 }

scripts/version.js

@@ -0,0 +1,40 @@
+const { execSync } = require('child_process')
+const fs = require('fs')
+
+// 执行命令并返回输出
+function exec(command) {
+  return execSync(command, { encoding: 'utf8' }).trim()
+}
+
+// 获取命令行参数
+const args = process.argv.slice(2)
+const versionType = args[0] || 'patch'
+const shouldPush = args.includes('push')
+
+// 验证版本类型
+if (!['patch', 'minor', 'major'].includes(versionType)) {
+  console.error('Invalid version type. Use patch, minor, or major.')
+  process.exit(1)
+}
+
+// 更新版本
+exec(`yarn version ${versionType} --immediate`)
+
+// 读取更新后的 package.json 获取新版本号
+const updatedPackageJson = JSON.parse(fs.readFileSync('package.json', 'utf8'))
+const newVersion = updatedPackageJson.version
+
+// Git 操作
+exec('git add .')
+exec(`git commit -m "chore(version): ${newVersion}"`)
+exec(`git tag -a v${newVersion} -m "Version ${newVersion}"`)
+
+console.log(`Version bumped to ${newVersion}`)
+
+if (shouldPush) {
+  console.log('Pushing to remote...')
+  exec('git push && git push --tags')
+  console.log('Pushed to remote.')
+} else {
+  console.log('Changes are committed locally. Use "git push && git push --tags" to push to remote.')
+}

src/main/config.ts

@@ -0,0 +1,15 @@
+import Store from 'electron-store'
+
+export const appConfig = new Store()
+
+export const titleBarOverlayDark = {
+  height: 41,
+  color: '#00000000',
+  symbolColor: '#ffffff'
+}
+
+export const titleBarOverlayLight = {
+  height: 41,
+  color: '#00000000',
+  symbolColor: '#000000'
+}

src/main/index.ts

@@ -1,72 +1,16 @@
-import { electronApp, is, optimizer } from '@electron-toolkit/utils'
-import { app, BrowserWindow, ipcMain, Menu, MenuItem, shell } from 'electron'
-import windowStateKeeper from 'electron-window-state'
-import { join } from 'path'
-import icon from '../../resources/icon.png?asset'
-import installExtension, { REDUX_DEVTOOLS } from 'electron-devtools-installer'
-import AppUpdater from './updater'
+import { electronApp, optimizer } from '@electron-toolkit/utils'
+import { app, BrowserWindow } from 'electron'
 
-function createWindow(): void {
-  // Load the previous state with fallback to defaults
-  const mainWindowState = windowStateKeeper({
-    defaultWidth: 1080,
-    defaultHeight: 670
-  })
-
-  // Create the browser window.
-  const mainWindow = new BrowserWindow({
-    x: mainWindowState.x,
-    y: mainWindowState.y,
-    width: mainWindowState.width,
-    height: mainWindowState.height,
-    minWidth: 1080,
-    minHeight: 500,
-    show: true,
-    autoHideMenuBar: true,
-    titleBarStyle: 'hiddenInset',
-    trafficLightPosition: { x: 8, y: 12 },
-    ...(process.platform === 'linux' ? { icon } : {}),
-    webPreferences: {
-      preload: join(__dirname, '../preload/index.js'),
-      sandbox: false,
-      devTools: !app.isPackaged
-    }
-  })
-
-  mainWindowState.manage(mainWindow)
-
-  mainWindow.webContents.on('context-menu', () => {
-    const menu = new Menu()
-    menu.append(new MenuItem({ label: '复制', role: 'copy', sublabel: '⌘ + C' }))
-    menu.append(new MenuItem({ label: '粘贴', role: 'paste', sublabel: '⌘ + V' }))
-    menu.append(new MenuItem({ label: '剪切', role: 'cut', sublabel: '⌘ + X' }))
-    menu.append(new MenuItem({ type: 'separator' }))
-    menu.append(new MenuItem({ label: '全选', role: 'selectAll', sublabel: '⌘ + A' }))
-    menu.popup()
-  })
-
-  mainWindow.on('ready-to-show', () => {
-    mainWindow.show()
-  })
-
-  mainWindow.webContents.setWindowOpenHandler((details) => {
-    shell.openExternal(details.url)
-    return { action: 'deny' }
-  })
-
-  // HMR for renderer base on electron-vite cli.
-  // Load the remote URL for development or the local html file for production.
-  if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
-    mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL'])
-  } else {
-    mainWindow.loadFile(join(__dirname, '../renderer/index.html'))
-  }
-}
+import { registerIpc } from './ipc'
+import { updateUserDataPath } from './utils/upgrade'
+import { createMainWindow } from './window'
 
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
-app.whenReady().then(() => {
+app.whenReady().then(async () => {
+  await updateUserDataPath()
+
   // Set app user model id for windows
   electronApp.setAppUserModelId('com.kangfenmao.CherryStudio')
 
@@ -77,26 +21,15 @@ app.whenReady().then(() => {
     optimizer.watchWindowShortcuts(window)
   })
 
-  // IPC
-  ipcMain.handle('get-app-info', () => ({
-    version: app.getVersion()
-  }))
-
-  createWindow()
-
   app.on('activate', function () {
     // On macOS it's common to re-create a window in the app when the
     // dock icon is clicked and there are no other windows open.
-    if (BrowserWindow.getAllWindows().length === 0) createWindow()
+    if (BrowserWindow.getAllWindows().length === 0) createMainWindow()
   })
 
-  installExtension(REDUX_DEVTOOLS)
-    .then((name) => console.log(`Added Extension:  ${name}`))
-    .catch((err) => console.log('An error occurred: ', err))
+  const mainWindow = createMainWindow()
 
-  if (app.isPackaged) {
-    setTimeout(() => new AppUpdater(), 3000)
-  }
+  registerIpc(mainWindow, app)
 })
 
 // Quit when all windows are closed, except on macOS. There, it's common

src/main/ipc.ts

@@ -0,0 +1,58 @@
+import { BrowserWindow, ipcMain, session, shell } from 'electron'
+
+import { appConfig, titleBarOverlayDark, titleBarOverlayLight } from './config'
+import AppUpdater from './updater'
+import { openFile, saveFile } from './utils/file'
+import { compress, decompress } from './utils/zip'
+import { createMinappWindow } from './window'
+
+export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
+  const { autoUpdater } = new AppUpdater(mainWindow)
+
+  // IPC
+  ipcMain.handle('get-app-info', () => ({
+    version: app.getVersion(),
+    isPackaged: app.isPackaged,
+    appPath: app.getAppPath()
+  }))
+
+  ipcMain.handle('open-website', (_, url: string) => {
+    shell.openExternal(url)
+  })
+
+  ipcMain.handle('set-proxy', (_, proxy: string) => {
+    session.defaultSession.setProxy(proxy ? { proxyRules: proxy } : {})
+  })
+
+  ipcMain.handle('save-file', saveFile)
+  ipcMain.handle('open-file', openFile)
+  ipcMain.handle('reload', () => mainWindow.reload())
+
+  ipcMain.handle('zip:compress', (_, text: string) => compress(text))
+  ipcMain.handle('zip:decompress', (_, text: Buffer) => decompress(text))
+
+  ipcMain.handle('minapp', (_, args) => {
+    createMinappWindow({
+      url: args.url,
+      parent: mainWindow,
+      windowOptions: {
+        ...mainWindow.getBounds(),
+        ...args.windowOptions
+      }
+    })
+  })
+
+  ipcMain.handle('set-theme', (_, theme: 'light' | 'dark') => {
+    appConfig.set('theme', theme)
+    mainWindow?.setTitleBarOverlay &&
+      mainWindow.setTitleBarOverlay(theme === 'dark' ? titleBarOverlayDark : titleBarOverlayLight)
+  })
+
+  // 触发检查更新(此方法用于被渲染线程调用，例如页面点击检查更新按钮来调用此方法)
+  ipcMain.handle('check-for-update', async () => {
+    return {
+      currentVersion: autoUpdater.currentVersion,
+      update: await autoUpdater.checkForUpdates()
+    }
+  })
+}

src/main/updater.ts

@@ -1,33 +1,25 @@
-import { autoUpdater, UpdateInfo } from 'electron-updater'
+import { BrowserWindow, dialog } from 'electron'
 import logger from 'electron-log'
-import { dialog, ipcMain } from 'electron'
+import { AppUpdater as _AppUpdater, autoUpdater, UpdateInfo } from 'electron-updater'
 
 export default class AppUpdater {
-  constructor() {
+  autoUpdater: _AppUpdater = autoUpdater
+
+  constructor(mainWindow: BrowserWindow) {
     logger.transports.file.level = 'debug'
     autoUpdater.logger = logger
     autoUpdater.forceDevUpdateConfig = true
     autoUpdater.autoDownload = false
-    autoUpdater.checkForUpdates()
-
-    // 触发检查更新(此方法用于被渲染线程调用，例如页面点击检查更新按钮来调用此方法)
-    ipcMain.on('check-for-update', () => {
-      logger.info('触发检查更新')
-      return autoUpdater.checkForUpdates()
-    })
 
     // 检测下载错误
     autoUpdater.on('error', (error) => {
       logger.error('更新异常', error)
-    })
-
-    // 检测是否需要更新
-    autoUpdater.on('checking-for-update', () => {
-      logger.info('正在检查更新……')
+      mainWindow.webContents.send('update-error', error)
     })
 
     autoUpdater.on('update-available', (releaseInfo: UpdateInfo) => {
       autoUpdater.logger?.info('检测到新版本，确认是否下载')
+      mainWindow.webContents.send('update-available', releaseInfo)
       const releaseNotes = releaseInfo.releaseNotes
       let releaseContent = ''
       if (releaseNotes) {
@@ -49,10 +41,12 @@ export default class AppUpdater {
           title: '应用有新的更新',
           detail: releaseContent,
           message: '发现新版本，是否现在更新？',
-          buttons: ['否', '是']
+          buttons: ['下次再说', '更新']
         })
         .then(({ response }) => {
           if (response === 1) {
+            logger.info('用户选择更新，准备下载更新')
+            mainWindow.webContents.send('download-update')
             autoUpdater.downloadUpdate()
           }
         })
@@ -60,12 +54,13 @@ export default class AppUpdater {
 
     // 检测到不需要更新时
     autoUpdater.on('update-not-available', () => {
-      logger.info('现在使用的就是最新版本，不用更新')
+      mainWindow.webContents.send('update-not-available')
     })
 
     // 更新下载进度
     autoUpdater.on('download-progress', (progress) => {
       logger.info('下载进度', progress)
+      mainWindow.webContents.send('download-progress', progress)
     })
 
     // 当需要更新的内容下载完成后
@@ -80,5 +75,7 @@ export default class AppUpdater {
           setImmediate(() => autoUpdater.quitAndInstall())
         })
     })
+
+    this.autoUpdater = autoUpdater
   }
 }

src/main/utils/aes.ts

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

src/main/utils/file.ts

@@ -0,0 +1,55 @@
+import { dialog, OpenDialogOptions, OpenDialogReturnValue, SaveDialogOptions, SaveDialogReturnValue } from 'electron'
+import logger from 'electron-log'
+import { writeFile } from 'fs'
+import { readFile } from 'fs/promises'
+
+export async function saveFile(
+  _: Electron.IpcMainInvokeEvent,
+  fileName: string,
+  content: string,
+  options?: SaveDialogOptions
+): Promise<void> {
+  try {
+    const result: SaveDialogReturnValue = await dialog.showSaveDialog({
+      title: '保存文件',
+      defaultPath: fileName,
+      ...options
+    })
+
+    if (!result.canceled && result.filePath) {
+      writeFile(result.filePath, content, { encoding: 'utf-8' }, (err) => {
+        if (err) {
+          logger.error('[IPC - Error]', 'An error occurred saving the file:', err)
+        }
+      })
+    }
+  } catch (err) {
+    logger.error('[IPC - Error]', 'An error occurred saving the file:', err)
+  }
+}
+
+export async function openFile(
+  _: Electron.IpcMainInvokeEvent,
+  options: OpenDialogOptions
+): Promise<{ fileName: string; content: Buffer } | null> {
+  try {
+    const result: OpenDialogReturnValue = await dialog.showOpenDialog({
+      title: '打开文件',
+      properties: ['openFile'],
+      filters: [{ name: '所有文件', extensions: ['*'] }],
+      ...options
+    })
+
+    if (!result.canceled && result.filePaths.length > 0) {
+      const filePath = result.filePaths[0]
+      const fileName = filePath.split('/').pop() || ''
+      const content = await readFile(filePath)
+      return { fileName, content }
+    }
+
+    return null
+  } catch (err) {
+    logger.error('[IPC - Error]', 'An error occurred opening the file:', err)
+    return null
+  }
+}

src/main/utils/upgrade.ts

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

src/main/utils/zip.ts

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

src/main/window.ts

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

src/preload/index.d.ts

@@ -1,4 +1,5 @@
 import { ElectronAPI } from '@electron-toolkit/preload'
+import type { OpenDialogOptions } from 'electron'
 
 declare global {
   interface Window {
@@ -6,7 +7,19 @@ declare global {
     api: {
       getAppInfo: () => Promise<{
         version: string
+        isPackaged: boolean
+        appPath: string
       }>
+      checkForUpdate: () => void
+      openWebsite: (url: string) => void
+      setProxy: (proxy: string | undefined) => void
+      saveFile: (path: string, content: string | NodeJS.ArrayBufferView, options?: SaveDialogOptions) => void
+      openFile: (options?: OpenDialogOptions) => Promise<{ fileName: string; content: Buffer } | null>
+      setTheme: (theme: 'light' | 'dark') => void
+      minApp: (options: { url: string; windowOptions?: Electron.BrowserWindowConstructorOptions }) => void
+      reload: () => void
+      compress: (text: string) => Promise<Buffer>
+      decompress: (text: Buffer) => Promise<string>
     }
   }
 }

src/preload/index.ts

@@ -1,10 +1,21 @@
-import { contextBridge, ipcRenderer } from 'electron'
 import { electronAPI } from '@electron-toolkit/preload'
+import { contextBridge, ipcRenderer } from 'electron'
 
 // Custom APIs for renderer
 const api = {
   getAppInfo: () => ipcRenderer.invoke('get-app-info'),
-  checkForUpdate: () => ipcRenderer.invoke('check-for-update')
+  checkForUpdate: () => ipcRenderer.invoke('check-for-update'),
+  openWebsite: (url: string) => ipcRenderer.invoke('open-website', url),
+  setProxy: (proxy: string) => ipcRenderer.invoke('set-proxy', proxy),
+  setTheme: (theme: 'light' | 'dark') => ipcRenderer.invoke('set-theme', theme),
+  minApp: (url: string) => ipcRenderer.invoke('minapp', url),
+  openFile: (options?: { decompress: boolean }) => ipcRenderer.invoke('open-file', options),
+  reload: () => ipcRenderer.invoke('reload'),
+  saveFile: (path: string, content: string, options?: { compress: boolean }) => {
+    ipcRenderer.invoke('save-file', path, content, options)
+  },
+  compress: (text: string) => ipcRenderer.invoke('zip:compress', text),
+  decompress: (text: Buffer) => ipcRenderer.invoke('zip:decompress', text)
 }
 
 // Use `contextBridge` APIs to expose Electron APIs to

src/renderer/index.html

@@ -2,15 +2,12 @@
 <html lang="zh-CN">
   <head>
     <meta charset="UTF-8" />
-    <title>Cherry Studio</title>
     <meta name="viewport" content="initial-scale=1, width=device-width" />
-    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
     <meta
       http-equiv="Content-Security-Policy"
-      content="default-src 'self'; connect-src *; script-src 'self'; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' *; font-src 'self' *; img-src 'self' data:" />
+      content="default-src 'self'; connect-src *; script-src 'self' *; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' *; font-src 'self' data: *; img-src 'self' data:; frame-src * file:" />
   </head>
-
-  <body theme-mode="dark">
+  <body>
     <div id="root"></div>
     <script type="module" src="/src/main.tsx"></script>
   </body>

src/renderer/src/App.tsx

@@ -1,34 +1,40 @@
-import '@fontsource/inter'
 import store, { persistor } from '@renderer/store'
-import { ConfigProvider } from 'antd'
 import { Provider } from 'react-redux'
 import { HashRouter, Route, Routes } from 'react-router-dom'
 import { PersistGate } from 'redux-persist/integration/react'
+
 import Sidebar from './components/app/Sidebar'
 import TopViewContainer from './components/TopView'
-import { AntdThemeConfig, getAntdLocale } from './config/antd'
+import AgentsPage from './pages/agents/AgentsPage'
 import AppsPage from './pages/apps/AppsPage'
 import HomePage from './pages/home/HomePage'
 import SettingsPage from './pages/settings/SettingsPage'
+import TranslatePage from './pages/translate/TranslatePage'
+import AntdProvider from './providers/AntdProvider'
+import { ThemeProvider } from './providers/ThemeProvider'
 
 function App(): JSX.Element {
   return (
-    <ConfigProvider theme={AntdThemeConfig} locale={getAntdLocale()}>
-      <Provider store={store}>
-        <PersistGate loading={null} persistor={persistor}>
-          <TopViewContainer>
-            <HashRouter>
-              <Sidebar />
-              <Routes>
-                <Route path="/" element={<HomePage />} />
-                <Route path="/apps" element={<AppsPage />} />
-                <Route path="/settings/*" element={<SettingsPage />} />
-              </Routes>
-            </HashRouter>
-          </TopViewContainer>
-        </PersistGate>
-      </Provider>
-    </ConfigProvider>
+    <Provider store={store}>
+      <ThemeProvider>
+        <AntdProvider>
+          <PersistGate loading={null} persistor={persistor}>
+            <TopViewContainer>
+              <HashRouter>
+                <Sidebar />
+                <Routes>
+                  <Route path="/" element={<HomePage />} />
+                  <Route path="/agents" element={<AgentsPage />} />
+                  <Route path="/translate" element={<TranslatePage />} />
+                  <Route path="/apps" element={<AppsPage />} />
+                  <Route path="/settings/*" element={<SettingsPage />} />
+                </Routes>
+              </HashRouter>
+            </TopViewContainer>
+          </PersistGate>
+        </AntdProvider>
+      </ThemeProvider>
+    </Provider>
   )
 }
 

src/renderer/src/CHANGELOG.en.md

@@ -1,20 +0,0 @@
-# CHANGES LOG
-
-### v0.2.3 - 2024-07-16
-
-1. Fixed multi-language prompt errors
-2. Fixed default model error issues with ZHIPU AI
-3. Fixed OpenRouter API detection error issues
-4. Fixed multi-language translation errors with model providers
-
-### v0.2.2 - 2024-07-15
-
-1. Fix the issue where the default assistant name is empty.
-2. Fix the problem with default language detection during the first installation.
-3. Adjust the changelog style.
-
-### v0.2.1 - 2024-07-15
-
-1. **Feature**: Add new feature for pausing message sending
-2. **Fix**: Resolve incomplete translation issue upon language switch
-3. **Build**: Support for macOS Intel architecture

src/renderer/src/CHANGELOG.zh.md

@@ -1,21 +0,0 @@
-# 更新日志
-
-### v0.2.3 - 2024-07-16
-
-1. 修复多语言提示错误
-2. 修复智谱AI默认模型错误问题
-3. 修复 OpenRouter API 检测出错问题
-4. 修复模型提供商多语言翻译错误问题
-
-### v0.2.2 - 2024-07-15
-
-1. 修复默认助理名称为空的问题
-2. 修复首次安装默认语言检测问题
-3. 更新日志样式微调
-
-### v0.2.1 - 2024-07-15
-
-1. 【功能】新增消息暂停发送功能
-2. 【修复】修复多语言切换不彻底问题
-3. 【构建】支持 macOS Intel 架构  
-

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

@@ -0,0 +1,64 @@
+@font-face {
+  font-family: 'iconfont'; /* Project id 4563475 */
+  src: url('iconfont.woff2?t=1724204739157') format('woff2');
+}
+
+.iconfont {
+  font-family: 'iconfont' !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-business-smart-assistant:before {
+  content: '\e601';
+}
+
+.icon-copy:before {
+  content: '\e6ae';
+}
+
+.icon-ic_send:before {
+  content: '\e795';
+}
+
+.icon-dark1:before {
+  content: '\e72f';
+}
+
+.icon-theme-light:before {
+  content: '\e6b7';
+}
+
+.icon-translate_line:before {
+  content: '\e7de';
+}
+
+.icon-history:before {
+  content: '\e758';
+}
+
+.icon-hidesidebarhoriz:before {
+  content: '\e8eb';
+}
+
+.icon-showsidebarhoriz:before {
+  content: '\e944';
+}
+
+.icon-a-addchat:before {
+  content: '\e658';
+}
+
+.icon-appstore:before {
+  content: '\e792';
+}
+
+.icon-chat:before {
+  content: '\e615';
+}
+
+.icon-setting:before {
+  content: '\e78e';
+}

src/renderer/src/assets/fonts/ubuntu/ubuntu.css

@@ -0,0 +1,55 @@
+@font-face {
+  font-family: 'Ubuntu';
+  src: url('Ubuntu-Regular.ttf') format('truetype');
+  font-weight: normal;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Ubuntu';
+  src: url('Ubuntu-Italic.ttf') format('truetype');
+  font-weight: normal;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: 'Ubuntu';
+  src: url('Ubuntu-Bold.ttf') format('truetype');
+  font-weight: bold;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Ubuntu';
+  src: url('Ubuntu-BoldItalic.ttf') format('truetype');
+  font-weight: bold;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: 'Ubuntu';
+  src: url('Ubuntu-Light.ttf') format('truetype');
+  font-weight: 300;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Ubuntu';
+  src: url('Ubuntu-LightItalic.ttf') format('truetype');
+  font-weight: 300;
+  font-style: italic;
+}
+
+@font-face {
+  font-family: 'Ubuntu';
+  src: url('Ubuntu-Medium.ttf') format('truetype');
+  font-weight: 500;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Ubuntu';
+  src: url('Ubuntu-MediumItalic.ttf') format('truetype');
+  font-weight: 500;
+  font-style: italic;
+}

src/renderer/src/assets/images/models/palm.svg

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Standard_product_icon__x28_1:1_x29_"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="192px" height="192px"
+	 viewBox="0 0 192 192" enable-background="new 0 0 192 192" xml:space="preserve">
+<symbol  id="material_x5F_product_x5F_standard_x5F_icon_x5F_keylines_00000077318920148093339210000006245950728745084294_" viewBox="-96 -96 192 192">
+	<g opacity="0.4">
+		<defs>
+			<path id="SVGID_1_" opacity="0.4" d="M-96,96V-96H96V96H-96z"/>
+		</defs>
+		<clipPath id="SVGID_00000071517564283228984050000017848131202901217410_">
+			<use xlink:href="#SVGID_1_"  overflow="visible"/>
+		</clipPath>
+		<g clip-path="url(#SVGID_00000071517564283228984050000017848131202901217410_)">
+			<g>
+				<path d="M95.75,95.75v-191.5h-191.5v191.5H95.75 M96,96H-96V-96H96V96L96,96z"/>
+			</g>
+			<circle fill="none" stroke="#000000" stroke-width="0.25" stroke-miterlimit="10" cx="0" cy="0" r="64"/>
+		</g>
+		
+			<circle clip-path="url(#SVGID_00000071517564283228984050000017848131202901217410_)" fill="none" stroke="#000000" stroke-width="0.25" stroke-miterlimit="10" cx="0" cy="0" r="88"/>
+		
+			<path clip-path="url(#SVGID_00000071517564283228984050000017848131202901217410_)" fill="none" stroke="#000000" stroke-width="0.25" stroke-miterlimit="10" d="
+			M64,76H-64c-6.6,0-12-5.4-12-12V-64c0-6.6,5.4-12,12-12H64c6.6,0,12,5.4,12,12V64C76,70.6,70.6,76,64,76z"/>
+		
+			<path clip-path="url(#SVGID_00000071517564283228984050000017848131202901217410_)" fill="none" stroke="#000000" stroke-width="0.25" stroke-miterlimit="10" d="
+			M52,88H-52c-6.6,0-12-5.4-12-12V-76c0-6.6,5.4-12,12-12H52c6.6,0,12,5.4,12,12V76C64,82.6,58.6,88,52,88z"/>
+		
+			<path clip-path="url(#SVGID_00000071517564283228984050000017848131202901217410_)" fill="none" stroke="#000000" stroke-width="0.25" stroke-miterlimit="10" d="
+			M76,64H-76c-6.6,0-12-5.4-12-12V-52c0-6.6,5.4-12,12-12H76c6.6,0,12,5.4,12,12V52C88,58.6,82.6,64,76,64z"/>
+	</g>
+</symbol>
+<rect id="bounding_box_1_" display="none" fill="none" width="192" height="192"/>
+<g id="art_layer">
+	<g>
+		<path fill="#F9AB00" d="M96,181.92L96,181.92c6.63,0,12-5.37,12-12v-104H84v104C84,176.55,89.37,181.92,96,181.92z"/>
+		<g>
+			<path fill="#5BB974" d="M143.81,103.87C130.87,90.94,111.54,88.32,96,96l51.37,51.37c2.12,2.12,5.77,1.28,6.67-1.57
+				C158.56,131.49,155.15,115.22,143.81,103.87z"/>
+		</g>
+		<g>
+			<path fill="#129EAF" d="M48.19,103.87C61.13,90.94,80.46,88.32,96,96l-51.37,51.37c-2.12,2.12-5.77,1.28-6.67-1.57
+				C33.44,131.49,36.85,115.22,48.19,103.87z"/>
+		</g>
+		<g>
+			<path fill="#AF5CF7" d="M140,64c-20.44,0-37.79,13.4-44,32h81.24c3.33,0,5.55-3.52,4.04-6.49C173.56,74.36,157.98,64,140,64z"/>
+		</g>
+		<g>
+			<path fill="#FF8BCB" d="M104.49,42.26C90.03,56.72,87.24,78.45,96,96l57.45-57.45c2.36-2.36,1.44-6.42-1.73-7.45
+				C135.54,25.85,117.2,29.55,104.49,42.26z"/>
+		</g>
+		<g>
+			<path fill="#FA7B17" d="M87.51,42.26C101.97,56.72,104.76,78.45,96,96L38.55,38.55c-2.36-2.36-1.44-6.42,1.73-7.45
+				C56.46,25.85,74.8,29.55,87.51,42.26z"/>
+		</g>
+		<g>
+			<g>
+				<path fill="#4285F4" d="M52,64c20.44,0,37.79,13.4,44,32H14.76c-3.33,0-5.55-3.52-4.04-6.49C18.44,74.36,34.02,64,52,64z"/>
+			</g>
+		</g>
+	</g>
+</g>
+<g id="keylines" display="none">
+	
+		<use xlink:href="#material_x5F_product_x5F_standard_x5F_icon_x5F_keylines_00000077318920148093339210000006245950728745084294_"  width="192" height="192" id="material_x5F_product_x5F_standard_x5F_icon_x5F_keylines" x="-96" y="-96" transform="matrix(1 0 0 -1 96 96)" display="inline" overflow="visible"/>
+</g>
+</svg>

src/renderer/src/assets/images/models/yi.svg

@@ -1,7 +0,0 @@
-<svg width="600" height="600" viewBox="0 0 600 600" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="300" cy="300" r="300" fill="white"/>
-<rect x="409.733" y="340.032" width="42.3862" height="151.648" rx="21.1931" fill="#003425"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M422.005 133.354C413.089 125.771 399.714 126.851 392.131 135.768L273.699 275.021C270.643 278.614 268.994 282.932 268.698 287.302C268.532 288.371 268.446 289.466 268.446 290.581V468.603C268.446 480.308 277.934 489.796 289.639 489.796C301.344 489.796 310.832 480.308 310.832 468.603V296.784L424.419 163.228C432.002 154.312 430.921 140.937 422.005 133.354Z" fill="#003425"/>
-<rect x="113.972" y="134.25" width="42.3862" height="174.745" rx="21.1931" transform="rotate(-39.3441 113.972 134.25)" fill="#003425"/>
-<circle cx="460.126" cy="279.278" r="25.9027" fill="#00DD20"/>
-</svg>

src/renderer/src/assets/images/providers/yi.svg

@@ -1,7 +0,0 @@
-<svg width="600" height="600" viewBox="0 0 600 600" fill="none" xmlns="http://www.w3.org/2000/svg">
-<circle cx="300" cy="300" r="300" fill="#003425"/>
-<rect x="409.733" y="340.031" width="42.3862" height="151.648" rx="21.1931" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M422.005 133.354C413.089 125.771 399.714 126.851 392.131 135.767L273.699 275.021C270.643 278.614 268.994 282.932 268.698 287.302C268.532 288.371 268.446 289.466 268.446 290.581V468.603C268.446 480.308 277.934 489.796 289.639 489.796C301.344 489.796 310.832 480.308 310.832 468.603V296.784L424.419 163.228C432.002 154.312 430.921 140.937 422.005 133.354Z" fill="white"/>
-<rect x="113.972" y="134.25" width="42.3862" height="174.745" rx="21.1931" transform="rotate(-39.3441 113.972 134.25)" fill="white"/>
-<circle cx="460.126" cy="279.278" r="25.9027" fill="#00FF25"/>
-</svg>

src/renderer/src/assets/styles/changelog.module.scss

@@ -1,78 +0,0 @@
-$background-color: #121212;
-$text-color: #ffffff;
-$heading-color: #00b96b;
-$link-color: #3498db;
-$code-background: #1e1e1e;
-$code-color: #f0e7db;
-
-.markdown {
-  body {
-    background-color: $background-color;
-    color: $text-color;
-    font-family: Arial, sans-serif;
-    padding: 20px;
-  }
-
-  h1,
-  h2,
-  h3,
-  h4,
-  h5,
-  h6 {
-    color: $heading-color;
-  }
-
-  h1 {
-    font-size: 22px;
-    font-weight: 700;
-  }
-
-  h3 {
-    margin: 10px 0;
-    font-weight: 500;
-    font-family: Arial, sans-serif;
-  }
-
-  a {
-    color: $link-color;
-    text-decoration: none;
-
-    &:hover {
-      text-decoration: underline;
-    }
-  }
-
-  strong {
-    font-weight: bold;
-  }
-
-  pre {
-    background-color: $code-background;
-    padding: 10px;
-    border-radius: 5px;
-    overflow-x: auto;
-  }
-
-  code {
-    background-color: $code-background;
-    color: $code-color;
-    padding: 2px 4px;
-    border-radius: 3px;
-  }
-
-  blockquote {
-    border-left: 4px solid $heading-color;
-    padding-left: 10px;
-    margin-left: 0;
-    color: #b3b3b3;
-  }
-
-  ul,
-  ol {
-    padding-left: 30px;
-  }
-
-  li {
-    margin-bottom: 5px;
-  }
-}

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

@@ -1,10 +1,7 @@
-@import 'https://at.alicdn.com/t/c/font_4563475_hrx8c92awui.css';
 @import './markdown.scss';
-
-// @font-face {
-//   font-family: 'Playwrite';
-//   src: url(../fonts/Playwrite.ttf) format('truetype');
-// }
+@import './scrollbar.scss';
+@import '../fonts/icon-fonts/iconfont.css';
+@import '../fonts/ubuntu/ubuntu.css';
 
 :root {
   --color-white: #ffffff;
@@ -12,7 +9,7 @@
   --color-white-mute: #f2f2f2;
 
   --color-black: #1b1b1f;
-  --color-black-soft: #303030;
+  --color-black-soft: #262626;
   --color-black-mute: #363636;
 
   --color-gray-1: #515c67;
@@ -27,18 +24,74 @@
   --color-background-soft: var(--color-black-soft);
   --color-background-mute: var(--color-black-mute);
 
+  --color-primary: #135200;
+  --color-primary-soft: #13520099;
+  --color-primary-mute: #13520033;
+
   --color-text: var(--color-text-1);
   --color-icon: #ffffff99;
   --color-icon-white: #ffffff;
-  --color-border: #ffffff20;
+  --color-border: #000;
+  --color-border-soft: #ffffff20;
+  --color-error: #f44336;
+  --color-link: #1677ff;
+  --color-code-background: #323232;
+  --color-scrollbar-thumb: rgba(255, 255, 255, 0.15);
+  --color-scrollbar-thumb-hover: rgba(255, 255, 255, 0.3);
+
+  --navbar-background-mac: rgba(30, 30, 30, 0.8);
+  --navbar-background: rgba(30, 30, 30);
+  --input-bar-background: rgba(255, 255, 255, 0.02);
 
   --navbar-height: 42px;
-  --sidebar-width: 55px;
-  --assistants-width: 235px;
-  --topic-list-width: 250px;
-  --settings-width: var(--assistants-width);
+  --sidebar-width: 52px;
   --status-bar-height: 40px;
-  --input-bar-height: 120px;
+  --input-bar-height: 85px;
+
+  --assistants-width: 245px;
+  --topic-list-width: 260px;
+  --settings-width: var(--assistants-width);
+}
+
+body[theme-mode='light'] {
+  --color-white: #ffffff;
+  --color-white-soft: #f8f8f8;
+  --color-white-mute: #efefef;
+
+  --color-black: #1b1b1f;
+  --color-black-soft: #262626;
+  --color-black-mute: #363636;
+
+  --color-gray-1: #8e8e93;
+  --color-gray-2: #aeaeb2;
+  --color-gray-3: #c7c7cc;
+
+  --color-text-1: rgba(0, 0, 0, 1);
+  --color-text-2: rgba(0, 0, 0, 0.6);
+  --color-text-3: rgba(0, 0, 0, 0.38);
+
+  --color-background: #ffffff;
+  --color-background-soft: var(--color-white-soft);
+  --color-background-mute: var(--color-white-mute);
+
+  --color-primary: #00b96b;
+  --color-primary-soft: #00b96b99;
+  --color-primary-mute: #00b96b33;
+
+  --color-text: var(--color-text-1);
+  --color-icon: #00000099;
+  --color-icon-white: #000000;
+  --color-border: #00000028;
+  --color-border-soft: #00000028;
+  --color-error: #f44336;
+  --color-link: #1677ff;
+  --color-code-background: #e3e3e3;
+  --color-scrollbar-thumb: rgba(0, 0, 0, 0.15);
+  --color-scrollbar-thumb-hover: rgba(0, 0, 0, 0.3);
+
+  --navbar-background-mac: rgba(255, 255, 255, 0.75);
+  --navbar-background: rgba(255, 255, 255);
+  --input-bar-background: rgba(0, 0, 0, 0.02);
 }
 
 *,
@@ -49,6 +102,14 @@
   font-weight: normal;
 }
 
+*:focus {
+  outline: none;
+}
+
+* {
+  -webkit-tap-highlight-color: transparent;
+}
+
 ul {
   list-style: none;
 }
@@ -57,23 +118,12 @@ body {
   display: flex;
   min-height: 100vh;
   color: var(--color-text);
-  background: var(--color-background);
+  font-size: 14px;
   line-height: 1.6;
   overflow: hidden;
-  background-size: cover;
-  font-family:
-    Inter,
-    -apple-system,
-    BlinkMacSystemFont,
-    'Segoe UI',
-    Roboto,
-    Oxygen,
-    Ubuntu,
-    Cantarell,
-    'Fira Sans',
-    'Droid Sans',
-    'Helvetica Neue',
-    sans-serif;
+  background: transparent !important;
+  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;
@@ -102,29 +152,55 @@ body,
   resize: none;
 }
 
-/* 全局初始化滚动条样式 */
-::-webkit-scrollbar {
-  width: 5px;
-  height: 5px;
-}
-
-::-webkit-scrollbar-track {
-  background: transparent;
-}
-
-::-webkit-scrollbar-thumb {
-  background: rgba(255, 255, 255, 0.2);
-  border-radius: 10px;
-}
-
-::-webkit-scrollbar-thumb:hover {
-  background: rgba(255, 255, 255, 0.4);
-}
-
-/* Safari 和 Chrome */
-@media screen and (-webkit-min-device-pixel-ratio: 0) {
-  body {
-    scrollbar-width: thin; /* 告诉 FF 用细滚动条 */
-    scrollbar-color: rgba(0, 0, 0, 0.4) rgba(0, 0, 0, 0.1); /* FF 前面色后面色 */
+.chat-nav-dropdown {
+  .ant-dropdown-menu {
+    padding-bottom: 12px;
+  }
+}
+
+.loader {
+  width: 16px;
+  height: 16px;
+  border-radius: 50%;
+  background-color: #000;
+  box-shadow:
+    32px 0 #000,
+    -32px 0 #000;
+  position: relative;
+  animation: flash 0.5s ease-out infinite alternate;
+}
+
+.ant-segmented-group {
+  gap: 4px;
+}
+
+.drag {
+  -webkit-app-region: drag;
+}
+
+.nodrag {
+  -webkit-app-region: no-drag;
+}
+
+.minapp-drawer {
+  .ant-drawer-content-wrapper {
+    box-shadow: none;
+  }
+  .ant-drawer-header {
+    position: absolute;
+    -webkit-app-region: drag;
+    min-height: calc(var(--navbar-height) + 0.5px);
+    background: var(--navbar-background);
+    width: calc(100vw - var(--sidebar-width));
+    border-bottom: 0.5px solid var(--color-border);
+    margin-top: -0.5px;
+  }
+  .ant-drawer-body {
+    padding: 0;
+    margin-top: var(--navbar-height);
+    overflow: hidden;
+  }
+  .minapp-mask {
+    background-color: transparent !important;
   }
 }

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

@@ -1,20 +1,15 @@
 .markdown {
-  color: #fff;
-  font-size: 15px;
+  color: var(--color-text);
   line-height: 1.6;
   user-select: text;
-  margin-top: 4px;
+  word-break: break-word;
 
-  p:first-of-type {
-    margin-top: 0;
-  }
-
-  h1:first-of-type,
-  h2:first-of-type,
-  h3:first-of-type,
-  h4:first-of-type,
-  h5:first-of-type,
-  h6:first-of-type {
+  h1:first-child,
+  h2:first-child,
+  h3:first-child,
+  h4:first-child,
+  h5:first-child,
+  h6:first-child {
     margin-top: 0;
   }
 
@@ -26,62 +21,224 @@
   h6 {
     margin: 1em 0 1em 0;
     font-weight: 800;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans',
+      'Helvetica Neue', sans-serif;
   }
 
   h1 {
     font-size: 2em;
-    color: #fff;
+    border-bottom: 0.5px solid var(--color-border);
+    padding-bottom: 0.3em;
   }
 
   h2 {
     font-size: 1.5em;
-    color: #fff;
+    border-bottom: 0.5px solid var(--color-border);
+    padding-bottom: 0.3em;
   }
 
   h3 {
     font-size: 1.2em;
-    color: #fff;
   }
 
   h4 {
     font-size: 1em;
-    color: #fff;
   }
 
   h5 {
     font-size: 0.9em;
-    color: #fff;
   }
 
   h6 {
     font-size: 0.8em;
-    color: #fff;
   }
 
   p {
     margin: 1em 0;
-    color: #fff;
+    &:last-child {
+      margin-bottom: 5px;
+    }
+
+    &:first-child {
+      margin-top: 0;
+    }
   }
 
   ul,
   ol {
     padding-left: 1.5em;
     margin: 1em 0;
-    color: #ccc;
   }
 
   li {
     margin-bottom: 0.5em;
+    &::marker {
+      color: var(--color-text-3);
+    }
+  }
+
+  li > ul,
+  li > ol {
+    margin: 0.5em 0;
   }
 
   hr {
     border: none;
-    border-top: 1px solid #555;
+    border-top: 0.5px solid var(--color-border);
     margin: 20px 0;
-    background-color: #555;
+    background-color: var(--color-border);
   }
 
   span {
     word-break: break-all;
   }
+
+  code {
+    white-space: pre-wrap !important;
+    font-family: 'Courier New', Courier, monospace;
+  }
+
+  p code {
+    background: var(--color-background-mute);
+    padding: 3px 5px;
+    border-radius: 5px;
+  }
+
+  pre {
+    white-space: pre-wrap !important;
+    padding: 1em 0;
+    border-radius: 5px;
+    overflow-x: auto;
+    font-family: 'Fira Code', 'Courier New', Courier, monospace;
+    pre {
+      margin: 0 !important;
+    }
+    code {
+      background: none;
+      padding: 0;
+      border-radius: 0;
+    }
+  }
+
+  blockquote {
+    margin: 1em 0;
+    padding-left: 1em;
+    color: var(--color-text-light);
+    border-left: 4px solid var(--color-border);
+    font-family: Georgia, 'Times New Roman', Times, serif;
+  }
+
+  table {
+    border-collapse: collapse;
+    margin: 1em 0;
+    width: 100%;
+  }
+
+  th,
+  td {
+    border: 0.5px solid var(--color-border);
+    padding: 0.5em;
+  }
+
+  th {
+    background-color: var(--color-background-mute);
+    font-weight: bold;
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans',
+      'Helvetica Neue', sans-serif;
+  }
+
+  img {
+    max-width: 100%;
+    height: auto;
+  }
+
+  a,
+  .link {
+    color: var(--color-link);
+    text-decoration: none;
+    cursor: pointer;
+
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+
+  strong {
+    font-weight: bold;
+  }
+
+  em {
+    font-style: italic;
+  }
+
+  del {
+    text-decoration: line-through;
+  }
+
+  sup,
+  sub {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline;
+  }
+
+  sup {
+    top: -0.5em;
+  }
+
+  sub {
+    bottom: -0.25em;
+  }
+
+  .footnote-ref {
+    font-size: 0.8em;
+    vertical-align: super;
+    line-height: 0;
+    margin: 0 2px;
+    color: var(--color-primary);
+    text-decoration: none;
+
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+
+  .footnotes {
+    margin-top: 1em;
+    padding-top: 1em;
+    border-top: 1px solid var(--color-border);
+
+    ol {
+      padding-left: 1em;
+    }
+
+    li {
+      font-size: 0.9em;
+      margin-bottom: 0.5em;
+      color: var(--color-text-light);
+
+      p {
+        display: inline;
+        margin: 0;
+      }
+    }
+
+    .footnote-backref {
+      font-size: 0.8em;
+      vertical-align: super;
+      line-height: 0;
+      margin-left: 5px;
+      color: var(--color-primary);
+      text-decoration: none;
+
+      &:hover {
+        text-decoration: underline;
+      }
+    }
+  }
+}
+
+emoji-picker {
+  --border-size: 0;
 }

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

@@ -0,0 +1,16 @@
+/* 全局初始化滚动条样式 */
+::-webkit-scrollbar {
+  width: 3px;
+  height: 3px;
+}
+
+::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+::-webkit-scrollbar-thumb {
+  background: var(--color-scrollbar-thumb);
+  &:hover {
+    background: var(--color-scrollbar-thumb-hover);
+  }
+}

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

@@ -0,0 +1,24 @@
+import { getModelLogo } from '@renderer/config/provider'
+import { Model } from '@renderer/types'
+import { Avatar, AvatarProps } from 'antd'
+import { first } from 'lodash'
+import { FC } from 'react'
+
+interface Props {
+  model: Model
+  size: number
+  props?: AvatarProps
+}
+
+const ModelAvatar: FC<Props> = ({ model, size, props }) => {
+  return (
+    <Avatar
+      src={getModelLogo(model?.id || '')}
+      style={{ width: size, height: size, display: 'flex', alignItems: 'center', justifyContent: 'center' }}
+      {...props}>
+      {first(model?.name)}
+    </Avatar>
+  )
+}
+
+export default ModelAvatar

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

@@ -0,0 +1,49 @@
+import { DragDropContext, Draggable, Droppable, DropResult } from '@hello-pangea/dnd'
+import { droppableReorder } from '@renderer/utils'
+import { FC } from 'react'
+
+interface Props<T> {
+  list: T[]
+  children: (item: T, index: number) => React.ReactNode
+  onUpdate: (list: T[]) => void
+  onDragStart?: () => void
+  onDragEnd?: () => void
+}
+
+const DragableList: FC<Props<any>> = ({ children, list, onDragStart, onUpdate, onDragEnd }) => {
+  const _onDragEnd = (result: DropResult) => {
+    onDragEnd?.()
+    if (result.destination) {
+      const sourceIndex = result.source.index
+      const destIndex = result.destination.index
+      const reorderAgents = droppableReorder(list, sourceIndex, destIndex)
+      onUpdate(reorderAgents)
+    }
+  }
+
+  return (
+    <DragDropContext onDragStart={onDragStart} onDragEnd={_onDragEnd}>
+      <Droppable droppableId="droppable">
+        {(provided) => (
+          <div {...provided.droppableProps} ref={provided.innerRef}>
+            {list.map((item, index) => (
+              <Draggable key={`draggable_${item.id}_${index}`} draggableId={item.id} index={index}>
+                {(provided) => (
+                  <div
+                    ref={provided.innerRef}
+                    {...provided.draggableProps}
+                    {...provided.dragHandleProps}
+                    style={{ ...provided.draggableProps.style, marginBottom: 8 }}>
+                    {children(item, index)}
+                  </div>
+                )}
+              </Draggable>
+            ))}
+          </div>
+        )}
+      </Droppable>
+    </DragDropContext>
+  )
+}
+
+export default DragableList

src/renderer/src/components/EmojiPicker/index.tsx

@@ -0,0 +1,25 @@
+import { useTheme } from '@renderer/providers/ThemeProvider'
+import { FC, useEffect, useRef } from 'react'
+
+interface Props {
+  onEmojiClick: (emoji: string) => void
+}
+
+const EmojiPicker: FC<Props> = ({ onEmojiClick }) => {
+  const { theme } = useTheme()
+  const ref = useRef<HTMLDivElement>(null)
+
+  useEffect(() => {
+    if (ref.current) {
+      ref.current.addEventListener('emoji-click', (event: any) => {
+        event.stopPropagation()
+        onEmojiClick(event.detail.emoji.unicode)
+      })
+    }
+  }, [onEmojiClick])
+
+  // @ts-ignore next-line
+  return <emoji-picker ref={ref} class={theme === 'dark' ? 'dark' : 'light'} style={{ border: 'none' }} />
+}
+
+export default EmojiPicker

src/renderer/src/components/Icons/CopyIcon.tsx

@@ -0,0 +1,7 @@
+import { FC } from 'react'
+
+const CopyIcon: FC<React.DetailedHTMLProps<React.HTMLAttributes<HTMLElement>, HTMLElement>> = (props) => {
+  return <i {...props} className={`iconfont icon-copy ${props.className}`} />
+}
+
+export default CopyIcon

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

@@ -150,11 +150,12 @@ export const BaseTypography = styled(Box)<{
 `
 
 export const TypographyNormal = styled(BaseTypography)`
-  font-family: 'Poppins';
+  font-family: 'Ubuntu';
 `
 
 export const TypographyBold = styled(BaseTypography)`
-  font-family: 'Poppins Bold';
+  font-family: 'Ubuntu';
+  font-weight: bold;
 `
 
 export const Container = styled.main<ContainerProps>`

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

@@ -0,0 +1,162 @@
+import { CloseOutlined, ExportOutlined, ReloadOutlined } from '@ant-design/icons'
+import { isMac, isWindows } from '@renderer/config/constant'
+import { useBridge } from '@renderer/hooks/useBridge'
+import store from '@renderer/store'
+import { setMinappShow } from '@renderer/store/runtime'
+import { MinAppType } from '@renderer/types'
+import { Drawer } from 'antd'
+import { useRef, useState } from 'react'
+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 [open, setOpen] = useState(true)
+  const iframeRef = useRef<HTMLIFrameElement>(null)
+
+  useBridge()
+
+  const canOpenExternalLink = app.url.startsWith('http://') || app.url.startsWith('https://')
+
+  const onClose = () => {
+    setOpen(false)
+    setTimeout(() => resolve({}), 300)
+  }
+
+  const onReload = () => {
+    if (iframeRef.current) {
+      iframeRef.current.src = app.url
+    }
+  }
+
+  const onOpenLink = () => {
+    window.api.openWebsite(app.url)
+  }
+
+  const Title = () => {
+    return (
+      <TitleContainer style={{ justifyContent: 'space-between' }}>
+        <TitleText>{app.name}</TitleText>
+        <ButtonsGroup className={isWindows ? 'windows' : ''}>
+          <Button onClick={onReload}>
+            <ReloadOutlined />
+          </Button>
+          {canOpenExternalLink && (
+            <Button onClick={onOpenLink}>
+              <ExportOutlined />
+            </Button>
+          )}
+          <Button onClick={onClose}>
+            <CloseOutlined />
+          </Button>
+        </ButtonsGroup>
+      </TitleContainer>
+    )
+  }
+
+  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)' }}>
+      <Frame src={app.url} ref={iframeRef} />
+    </Drawer>
+  )
+}
+
+const Frame = styled.iframe`
+  width: calc(100vw - var(--sidebar-width));
+  height: calc(100vh - var(--navbar-height));
+  border: none;
+  background-color: white;
+`
+
+const TitleContainer = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  padding-left: ${isMac ? '20px' : '15px'};
+  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);
+  }
+`
+
+export default class MinApp {
+  static topviewId = 0
+  static close() {
+    TopView.hide('MinApp')
+    store.dispatch(setMinappShow(false))
+  }
+  static start(app: MinAppType) {
+    store.dispatch(setMinappShow(true))
+    return new Promise<any>((resolve) => {
+      TopView.show(
+        <PopupContainer
+          app={app}
+          resolve={(v) => {
+            resolve(v)
+            this.close()
+          }}
+        />,
+        'MinApp'
+      )
+    })
+  }
+}

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

@@ -0,0 +1,135 @@
+import { TopView } from '@renderer/components/TopView'
+import systemAgents from '@renderer/config/agents.json'
+import { useAgents } from '@renderer/hooks/useAgents'
+import { useAssistants, useDefaultAssistant } from '@renderer/hooks/useAssistant'
+import { covertAgentToAssistant } from '@renderer/services/assistant'
+import { Agent, Assistant } from '@renderer/types'
+import { Input, Modal, Tag } from 'antd'
+import { useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import styled from 'styled-components'
+
+interface Props {
+  resolve: (value: Assistant | undefined) => void
+}
+
+const PopupContainer: React.FC<Props> = ({ resolve }) => {
+  const [open, setOpen] = useState(true)
+  const { t } = useTranslation()
+  const { agents: userAgents } = useAgents()
+  const [searchText, setSearchText] = useState('')
+  const { defaultAssistant } = useDefaultAssistant()
+  const { assistants, addAssistant } = useAssistants()
+
+  const defaultAgent: Agent = useMemo(
+    () => ({
+      id: defaultAssistant.id,
+      name: defaultAssistant.name,
+      emoji: defaultAssistant.emoji || '',
+      prompt: defaultAssistant.prompt,
+      group: 'system'
+    }),
+    [defaultAssistant.emoji, defaultAssistant.id, defaultAssistant.name, defaultAssistant.prompt]
+  )
+
+  const agents = useMemo(() => {
+    const allAgents = [...userAgents, ...systemAgents] as Agent[]
+    const list = [defaultAgent, ...allAgents.filter((agent) => !assistants.map((a) => a.id).includes(agent.id))]
+    return searchText
+      ? list.filter((agent) => agent.name.toLowerCase().includes(searchText.trim().toLocaleLowerCase()))
+      : list
+  }, [assistants, defaultAgent, searchText, userAgents])
+
+  const onCreateAssistant = (agent: Agent) => {
+    if (agent.id !== 'default') {
+      if (assistants.map((a) => a.id).includes(String(agent.id))) {
+        return
+      }
+    }
+
+    const assistant = covertAgentToAssistant(agent)
+
+    addAssistant(assistant)
+    resolve(assistant)
+    setOpen(false)
+  }
+
+  const onCancel = () => {
+    setOpen(false)
+  }
+
+  const onClose = async () => {
+    resolve(undefined)
+    AddAssistantPopup.hide()
+  }
+
+  return (
+    <Modal
+      style={{ marginTop: '5vh' }}
+      title={t('chat.add.assistant.title')}
+      open={open}
+      onCancel={onCancel}
+      afterClose={onClose}
+      transitionName=""
+      maskTransitionName=""
+      footer={null}>
+      <Input
+        placeholder={t('common.search')}
+        value={searchText}
+        onChange={(e) => setSearchText(e.target.value)}
+        allowClear
+        autoFocus
+        style={{ marginBottom: 16 }}
+      />
+      <Container>
+        {agents.map((agent) => (
+          <AgentItem key={agent.id} onClick={() => onCreateAssistant(agent)}>
+            {agent.emoji} {agent.name}
+            {agent.group === 'system' && <Tag color="orange">{t('agents.tag.system')}</Tag>}
+            {agent.group === 'user' && <Tag color="green">{t('agents.tag.user')}</Tag>}
+          </AgentItem>
+        ))}
+      </Container>
+    </Modal>
+  )
+}
+
+const Container = styled.div`
+  height: 50vh;
+  overflow-y: auto;
+  &::-webkit-scrollbar {
+    display: none;
+  }
+`
+
+const AgentItem = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 8px;
+  border-radius: 8px;
+  user-select: none;
+  background-color: var(--color-background-soft);
+  margin-bottom: 8px;
+  cursor: pointer;
+  .anticon {
+    font-size: 16px;
+    color: var(--color-icon);
+  }
+  &:hover {
+    background-color: var(--color-background-mute);
+  }
+`
+
+export default class AddAssistantPopup {
+  static topviewId = 0
+  static hide() {
+    TopView.hide('AddAssistantPopup')
+  }
+  static show() {
+    return new Promise<Assistant | undefined>((resolve) => {
+      TopView.show(<PopupContainer resolve={resolve} />, 'AddAssistantPopup')
+    })
+  }
+}

src/renderer/src/components/Popups/AssistantSettingPopup.tsx

@@ -1,11 +1,12 @@
-import { Input, Modal } from 'antd'
-import { useState } from 'react'
-import { TopView } from '../TopView'
-import { Box } from '../Layout'
 import { Assistant } from '@renderer/types'
+import { Input, Modal } from 'antd'
 import TextArea from 'antd/es/input/TextArea'
+import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
+import { Box } from '../Layout'
+import { TopView } from '../TopView'
+
 interface AssistantSettingPopupShowParams {
   assistant: Assistant
 }
@@ -56,18 +57,19 @@ const AssistantSettingPopupContainer: React.FC<Props> = ({ assistant, resolve })
 export default class AssistantSettingPopup {
   static topviewId = 0
   static hide() {
-    TopView.hide(this.topviewId)
+    TopView.hide('AssistantSettingPopup')
   }
   static show(props: AssistantSettingPopupShowParams) {
     return new Promise<Assistant>((resolve) => {
-      this.topviewId = TopView.show(
+      TopView.show(
         <AssistantSettingPopupContainer
           {...props}
           resolve={(v) => {
             resolve(v)
             this.hide()
           }}
-        />
+        />,
+        'AssistantSettingPopup'
       )
     })
   }

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

@@ -1,7 +1,8 @@
 import { Input, InputProps, Modal } from 'antd'
 import { useState } from 'react'
-import { TopView } from '../TopView'
+
 import { Box } from '../Layout'
+import { TopView } from '../TopView'
 
 interface PromptPopupShowParams {
   title: string
@@ -57,18 +58,19 @@ const PromptPopupContainer: React.FC<Props> = ({
 export default class PromptPopup {
   static topviewId = 0
   static hide() {
-    TopView.hide(this.topviewId)
+    TopView.hide('PromptPopup')
   }
   static show(props: PromptPopupShowParams) {
     return new Promise<string>((resolve) => {
-      this.topviewId = TopView.show(
+      TopView.show(
         <PromptPopupContainer
           {...props}
           resolve={(v) => {
             resolve(v)
             this.hide()
           }}
-        />
+        />,
+        'PromptPopup'
       )
     })
   }

src/renderer/src/components/Popups/TemplatePopup.tsx

@@ -1,7 +1,8 @@
 import { Modal } from 'antd'
 import { useState } from 'react'
-import { TopView } from '../TopView'
+
 import { Box } from '../Layout'
+import { TopView } from '../TopView'
 
 interface ShowParams {
   title: string
@@ -36,18 +37,19 @@ const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
 export default class TemplatePopup {
   static topviewId = 0
   static hide() {
-    TopView.hide(this.topviewId)
+    TopView.hide('TemplatePopup')
   }
   static show(props: ShowParams) {
     return new Promise<any>((resolve) => {
-      this.topviewId = TopView.show(
+      TopView.show(
         <PopupContainer
           {...props}
           resolve={(v) => {
             resolve(v)
             this.hide()
           }}
-        />
+        />,
+        'TemplatePopup'
       )
     })
   }

src/renderer/src/components/Popups/UserPopup.tsx

@@ -0,0 +1,108 @@
+import useAvatar from '@renderer/hooks/useAvatar'
+import { useSettings } from '@renderer/hooks/useSettings'
+import LocalStorage from '@renderer/services/storage'
+import { useAppDispatch } from '@renderer/store'
+import { setAvatar } from '@renderer/store/runtime'
+import { setUserName } from '@renderer/store/settings'
+import { compressImage } from '@renderer/utils'
+import { Avatar, Input, Modal, Upload } from 'antd'
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import styled from 'styled-components'
+
+import { Center, HStack } from '../Layout'
+import { TopView } from '../TopView'
+
+interface Props {
+  resolve: (data: any) => void
+}
+
+const PopupContainer: React.FC<Props> = ({ resolve }) => {
+  const [open, setOpen] = useState(true)
+  const { t } = useTranslation()
+  const { userName } = useSettings()
+  const dispatch = useAppDispatch()
+  const avatar = useAvatar()
+
+  const onOk = () => {
+    setOpen(false)
+  }
+
+  const onCancel = () => {
+    setOpen(false)
+  }
+
+  const onClose = () => {
+    resolve({})
+  }
+
+  return (
+    <Modal
+      width="300px"
+      open={open}
+      footer={null}
+      onOk={onOk}
+      onCancel={onCancel}
+      afterClose={onClose}
+      transitionName="ant-move-down">
+      <Center mt="30px">
+        <Upload
+          customRequest={() => {}}
+          accept="image/png, image/jpeg"
+          itemRender={() => null}
+          maxCount={1}
+          onChange={async ({ file }) => {
+            try {
+              const _file = file.originFileObj as File
+              const compressedFile = await compressImage(_file)
+              await LocalStorage.storeImage('avatar', compressedFile)
+              dispatch(setAvatar(await LocalStorage.getImage('avatar')))
+            } catch (error: any) {
+              window.message.error(error.message)
+            }
+          }}>
+          <UserAvatar src={avatar} />
+        </Upload>
+      </Center>
+      <HStack alignItems="center" gap="10px" p="20px">
+        <Input
+          placeholder={t('settings.general.user_name.placeholder')}
+          value={userName}
+          onChange={(e) => dispatch(setUserName(e.target.value))}
+          style={{ flex: 1, textAlign: 'center', width: '100%' }}
+          maxLength={30}
+        />
+      </HStack>
+    </Modal>
+  )
+}
+
+const UserAvatar = styled(Avatar)`
+  cursor: pointer;
+  width: 80px;
+  height: 80px;
+  transition: opacity 0.3s ease;
+  &:hover {
+    opacity: 0.8;
+  }
+`
+
+export default class UserPopup {
+  static topviewId = 0
+  static hide() {
+    TopView.hide('UserPopup')
+  }
+  static show() {
+    return new Promise<any>((resolve) => {
+      TopView.show(
+        <PopupContainer
+          resolve={(v) => {
+            resolve(v)
+            this.hide()
+          }}
+        />,
+        'UserPopup'
+      )
+    })
+  }
+}

src/renderer/src/components/TopView/index.tsx

@@ -1,83 +1,94 @@
-import { useAppInitEffect } from '@renderer/hooks/useAppInitEffect'
+import { useAppInit } from '@renderer/hooks/useAppInit'
 import { message, Modal } from 'antd'
-import { findIndex, pullAt } from 'lodash'
-import React, { useEffect, useState } from 'react'
+import React, { PropsWithChildren, useCallback, useEffect, useRef, useState } from 'react'
+
+import { Box } from '../Layout'
 
-let id = 0
 let onPop = () => {}
-
-let onShow = ({ element, key }: { element: React.FC | React.ReactNode; key: number }) => {
+let onShow = ({ element, id }: { element: React.FC | React.ReactNode; id: string }) => {
   element
-  key
+  id
 }
-
-let onHide = ({ key }: { key: number }) => {
-  key
+let onHide = (id: string) => {
+  id
 }
+let onHideAll = () => {}
 
 interface Props {
   children?: React.ReactNode
 }
 
 type ElementItem = {
-  key: number
+  id: string
   element: React.FC | React.ReactNode
 }
 
 const TopViewContainer: React.FC<Props> = ({ children }) => {
   const [elements, setElements] = useState<ElementItem[]>([])
+  const elementsRef = useRef<ElementItem[]>([])
+  elementsRef.current = elements
+
   const [messageApi, messageContextHolder] = message.useMessage()
   const [modal, modalContextHolder] = Modal.useModal()
 
-  useAppInitEffect()
-
-  onPop = () => {
-    const views = [...elements]
-    views.pop()
-    setElements(views)
-  }
-
-  onShow = ({ element, key }: { element: React.FC | React.ReactNode; key: number }) => {
-    setElements(elements.concat([{ element, key }]))
-  }
-
-  onHide = ({ key }: { key: number }) => {
-    const views = [...elements]
-    pullAt(views, findIndex(views, { key }))
-    setElements(views)
-  }
+  useAppInit()
 
   useEffect(() => {
     window.message = messageApi
     window.modal = modal
   }, [messageApi, modal])
 
+  onPop = () => {
+    const views = [...elementsRef.current]
+    views.pop()
+    elementsRef.current = views
+    setElements(elementsRef.current)
+  }
+
+  onShow = ({ element, id }: ElementItem) => {
+    if (!elementsRef.current.find((el) => el.id === id)) {
+      elementsRef.current = elementsRef.current.concat([{ element, id }])
+      setElements(elementsRef.current)
+    }
+  }
+
+  onHide = (id: string) => {
+    elementsRef.current = elementsRef.current.filter((el) => el.id !== id)
+    setElements(elementsRef.current)
+  }
+
+  onHideAll = () => {
+    setElements([])
+    elementsRef.current = []
+  }
+
+  const FullScreenContainer: React.FC<PropsWithChildren> = useCallback(({ children }) => {
+    return (
+      <Box flex={1} position="absolute" w="100%" h="100%">
+        <Box position="absolute" w="100%" h="100%" onClick={onPop} />
+        {children}
+      </Box>
+    )
+  }, [])
+
   return (
     <>
       {children}
       {messageContextHolder}
       {modalContextHolder}
-      {elements.length > 0 && (
-        <div style={{ display: 'flex', flex: 1, position: 'absolute', width: '100%', height: '100%' }}>
-          <div style={{ position: 'absolute', width: '100%', height: '100%' }} onClick={onPop} />
-          {elements.map(({ element: Element, key }) =>
-            typeof Element === 'function' ? <Element key={`TOPVIEW_${key}`} /> : Element
-          )}
-        </div>
-      )}
+      {elements.map(({ element: Element, id }) => (
+        <FullScreenContainer key={`TOPVIEW_${id}`}>
+          {typeof Element === 'function' ? <Element /> : Element}
+        </FullScreenContainer>
+      ))}
     </>
   )
 }
 
 export const TopView = {
-  show: (element: React.FC | React.ReactNode) => {
-    id = id + 1
-    onShow({ element, key: id })
-    return id
-  },
-  hide: (key: number) => {
-    onHide({ key })
-  },
+  show: (element: React.FC | React.ReactNode, id: string) => onShow({ element, id }),
+  hide: (id: string) => onHide(id),
+  clear: () => onHideAll(),
   pop: onPop
 }
 

src/renderer/src/components/app/Navbar.tsx

@@ -1,10 +1,21 @@
+import { isMac } from '@renderer/config/constant'
+import { useRuntime } from '@renderer/hooks/useStore'
 import { FC, PropsWithChildren } from 'react'
 import styled from 'styled-components'
 
 type Props = PropsWithChildren & JSX.IntrinsicElements['div']
 
+const navbarBackgroundColor = isMac ? 'var(--navbar-background-mac)' : 'var(--navbar-background)'
+
 export const Navbar: FC<Props> = ({ children, ...props }) => {
-  return <NavbarContainer {...props}>{children}</NavbarContainer>
+  const { minappShow } = useRuntime()
+  const backgroundColor = minappShow ? 'var(--navbar-background)' : navbarBackgroundColor
+
+  return (
+    <NavbarContainer {...props} style={{ backgroundColor }}>
+      {children}
+    </NavbarContainer>
+  )
 }
 
 export const NavbarLeft: FC<Props> = ({ children, ...props }) => {
@@ -25,37 +36,36 @@ const NavbarContainer = styled.div`
   flex-direction: row;
   min-height: var(--navbar-height);
   max-height: var(--navbar-height);
+  margin-left: ${isMac ? 'calc(var(--sidebar-width) * -1)' : 0};
+  padding-left: ${isMac ? 'var(--sidebar-width)' : 0};
   border-bottom: 0.5px solid var(--color-border);
+  background-color: ${navbarBackgroundColor};
+  transition: background-color 0.3s ease;
   -webkit-app-region: drag;
-  background-color: #1f1f1f;
-  margin-left: calc(var(--sidebar-width) * -1);
-  padding-left: var(--sidebar-width);
 `
 
 const NavbarLeftContainer = styled.div`
   min-width: var(--assistants-width);
-  border-right: 1px solid var(--color-border);
   padding: 0 10px;
   display: flex;
   flex-direction: row;
   align-items: center;
+  font-weight: bold;
+  color: var(--color-text-1);
 `
 
 const NavbarCenterContainer = styled.div`
   flex: 1;
   display: flex;
   align-items: center;
-  font-size: 14px;
+  padding: 0 ${isMac ? '20px' : '15px'};
   font-weight: bold;
   color: var(--color-text-1);
-  text-align: center;
-  border-right: 1px solid var(--color-border);
-  padding: 0 20px;
 `
 
 const NavbarRightContainer = styled.div`
   min-width: var(--settings-width);
   display: flex;
   align-items: center;
-  padding: 0 16px;
+  padding: 0 12px;
 `

src/renderer/src/components/app/Sidebar.tsx

@@ -1,20 +1,31 @@
-import { FC } from 'react'
-import Logo from '@renderer/assets/images/logo.png'
-import styled from 'styled-components'
-import { Link, useLocation } from 'react-router-dom'
+import { TranslationOutlined } from '@ant-design/icons'
+import { isMac } from '@renderer/config/constant'
+import { AppLogo, isLocalAi } from '@renderer/config/env'
 import useAvatar from '@renderer/hooks/useAvatar'
+import { useRuntime } from '@renderer/hooks/useStore'
+import { Avatar } from 'antd'
+import { FC } from 'react'
+import { Link, useLocation } from 'react-router-dom'
+import styled from 'styled-components'
+
+import UserPopup from '../Popups/UserPopup'
+
+const sidebarBackgroundColor = isMac ? 'var(--navbar-background-mac)' : 'var(--navbar-background)'
 
 const Sidebar: FC = () => {
   const { pathname } = useLocation()
   const avatar = useAvatar()
+  const { minappShow } = useRuntime()
 
   const isRoute = (path: string): string => (pathname === path ? 'active' : '')
 
+  const onEditUser = () => {
+    UserPopup.show()
+  }
+
   return (
-    <Container>
-      <StyledLink to="/">
-        <AvatarImg src={avatar || Logo} draggable={false} />
-      </StyledLink>
+    <Container style={{ backgroundColor: minappShow ? 'var(--navbar-background)' : sidebarBackgroundColor }}>
+      <AvatarImg src={avatar || AppLogo} draggable={false} className="nodrag" onClick={onEditUser} />
       <MainMenus>
         <Menus>
           <StyledLink to="/">
@@ -22,6 +33,16 @@ const Sidebar: FC = () => {
               <i className="iconfont icon-chat"></i>
             </Icon>
           </StyledLink>
+          <StyledLink to="/agents">
+            <Icon className={isRoute('/agents')}>
+              <i className="iconfont icon-business-smart-assistant"></i>
+            </Icon>
+          </StyledLink>
+          <StyledLink to="/translate">
+            <Icon className={isRoute('/translate')}>
+              <TranslationOutlined />
+            </Icon>
+          </StyledLink>
           <StyledLink to="/apps">
             <Icon className={isRoute('/apps')}>
               <i className="iconfont icon-appstore"></i>
@@ -30,7 +51,7 @@ const Sidebar: FC = () => {
         </Menus>
       </MainMenus>
       <Menus>
-        <StyledLink to="/settings/provider">
+        <StyledLink to={isLocalAi ? '/settings/assistant' : '/settings/provider'}>
           <Icon className={pathname.startsWith('/settings') ? 'active' : ''}>
             <i className="iconfont icon-setting"></i>
           </Icon>
@@ -44,22 +65,25 @@ const Container = styled.div`
   display: flex;
   flex-direction: column;
   align-items: center;
-  padding: 12px 0;
+  padding: 8px 0;
+  width: var(--sidebar-width);
   min-width: var(--sidebar-width);
-  min-height: 100%;
+  height: ${isMac ? 'calc(100vh - var(--navbar-height))' : '100vh'};
   -webkit-app-region: drag !important;
-  background-color: #1f1f1f;
   border-right: 0.5px solid var(--color-border);
-  margin-top: var(--navbar-height);
-  padding-bottom: calc(var(--navbar-height) + 6px);
+  margin-top: ${isMac ? 'var(--navbar-height)' : 0};
+  background-color: ${sidebarBackgroundColor};
+  transition: background-color 0.3s ease;
 `
 
-const AvatarImg = styled.img`
-  border-radius: 50%;
+const AvatarImg = styled(Avatar)`
   width: 28px;
   height: 28px;
   background-color: var(--color-background-soft);
-  margin: 5px 0;
+  margin-bottom: ${isMac ? '12px' : '12px'};
+  margin-top: ${isMac ? '5px' : '2px'};
+  border: none;
+  cursor: pointer;
 `
 const MainMenus = styled.div`
   display: flex;
@@ -82,22 +106,28 @@ const Icon = styled.div`
   margin-bottom: 5px;
   transition: background-color 0.2s ease;
   -webkit-app-region: none;
-  .iconfont {
+  .iconfont,
+  .anticon {
     color: var(--color-icon);
     font-size: 20px;
     transition: color 0.2s ease;
     text-decoration: none;
   }
+  .anticon {
+    font-size: 17px;
+  }
   &:hover {
-    background-color: #ffffff30;
+    background-color: var(--color-background-soft);
     cursor: pointer;
-    .iconfont {
+    .iconfont,
+    .anticon {
       color: var(--color-icon-white);
     }
   }
   &.active {
-    background-color: #ffffff20;
-    .iconfont {
+    background-color: var(--color-background-mute);
+    .iconfont,
+    .anticon {
       color: var(--color-icon-white);
     }
   }