refactor: reorganize routing and clean up unused components in Discover and MCP Servers pages

- Introduced a new routers.ts file to centralize routing logic for the Discover page.
- Updated DiscoverContent to utilize dynamic routing based on the new routers configuration.
- Removed commented-out routes and unnecessary imports from various components.
- Simplified navigation logic in MCP Servers pages by adjusting route paths.
- Cleaned up Navbar components in multiple pages for better maintainability.

.github/dependabot.yml

@@ -0,0 +1,86 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 7
+    target-branch: "main"
+    commit-message:
+      prefix: "chore"
+      include: "scope"
+    groups:
+      # 核心框架
+      core-framework:
+        patterns:
+          - "react"
+          - "react-dom"
+          - "electron"
+          - "typescript"
+          - "@types/react*"
+          - "@types/node"
+        update-types:
+          - "minor"
+          - "patch"
+
+      # Electron 生态和构建工具
+      electron-build:
+        patterns:
+          - "electron-*"
+          - "@electron*"
+          - "vite"
+          - "@vitejs/*"
+          - "dotenv-cli"
+          - "rollup-plugin-*"
+          - "@swc/*"
+        update-types:
+          - "minor"
+          - "patch"
+
+      # 测试工具
+      testing-tools:
+        patterns:
+          - "vitest"
+          - "@vitest/*"
+          - "playwright"
+          - "@playwright/*"
+          - "eslint*"
+          - "@eslint*"
+          - "prettier"
+          - "husky"
+          - "lint-staged"
+        update-types:
+          - "minor"
+          - "patch"
+
+      # CherryStudio 自定义包
+      cherrystudio-packages:
+        patterns:
+          - "@cherrystudio/*"
+        update-types:
+          - "minor"
+          - "patch"
+
+      # 兜底其他 dependencies
+      other-dependencies:
+        dependency-type: "production"
+
+      # 兜底其他 devDependencies
+      other-dev-dependencies:
+        dependency-type: "development"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 3
+    commit-message:
+      prefix: "ci"
+      include: "scope"
+    groups:
+      github-actions:
+        patterns:
+          - "*"
+        update-types:
+          - "minor"
+          - "patch"

.github/workflows/issue-management.yml

@@ -54,5 +54,5 @@ jobs:
           days-before-pr-close: -1 # Completely disable closing for PRs
 
           # Temporary to reduce the huge issues number
-          operations-per-run: 100
+          operations-per-run: 1000
           debug-only: false

.github/workflows/nightly-build.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v4
         with:
-          ref: develop
+          ref: main
 
       - name: Install Node.js
         uses: actions/setup-node@v4

.github/workflows/release.yml

@@ -113,5 +113,40 @@ jobs:
           allowUpdates: true
           makeLatest: false
           tag: ${{ steps.get-tag.outputs.tag }}
-          artifacts: 'dist/*.exe,dist/*.zip,dist/*.dmg,dist/*.AppImage,dist/*.snap,dist/*.deb,dist/*.rpm,dist/*.tar.gz,dist/latest*.yml,dist/*.blockmap'
+          artifacts: 'dist/*.exe,dist/*.zip,dist/*.dmg,dist/*.AppImage,dist/*.snap,dist/*.deb,dist/*.rpm,dist/*.tar.gz,dist/latest*.yml,dist/rc*.yml,dist/*.blockmap'
           token: ${{ secrets.GITHUB_TOKEN }}
+
+  dispatch-docs-update:
+    needs: release
+    if: success() && github.repository == 'CherryHQ/cherry-studio' # 确保所有构建成功且在主仓库中运行
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get release tag
+        id: get-tag
+        shell: bash
+        run: |
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            echo "tag=${{ github.event.inputs.tag }}" >> $GITHUB_OUTPUT
+          else
+            echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Check if tag is pre-release
+        id: check-tag
+        shell: bash
+        run: |
+          TAG="${{ steps.get-tag.outputs.tag }}"
+          if [[ "$TAG" == *"rc"* || "$TAG" == *"pre-release"* ]]; then
+            echo "is_pre_release=true" >> $GITHUB_OUTPUT
+          else
+            echo "is_pre_release=false" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Dispatch update-download-version workflow to cherry-studio-docs
+        if: steps.check-tag.outputs.is_pre_release == 'false'
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ secrets.REPO_DISPATCH_TOKEN }}
+          repository: CherryHQ/cherry-studio-docs
+          event-type: update-download-version
+          client-payload: '{"version": "${{ steps.get-tag.outputs.tag }}"}'

.gitignore

@@ -45,9 +45,15 @@ stats.html
 local
 .aider*
 .cursorrules
-.cursor/rules
+.cursor/*
 
-# test
+# vitest
 coverage
 .vitest-cache
 vitest.config.*.timestamp-*
+
+# playwright
+playwright-report
+test-results
+
+YOUR_MEMORY_FILE_PATH

.prettierrc

@@ -4,5 +4,8 @@
   "printWidth": 120,
   "trailingComma": "none",
   "endOfLine": "lf",
-  "bracketSameLine": true
+  "bracketSameLine": true,
+  "tailwindStylesheet": "./src/renderer/src/assets/styles/tailwind.css",
+  "tailwindFunctions": ["clsx"],
+  "plugins": ["prettier-plugin-tailwindcss"],
 }

.yarn/patches/@langchain-core-npm-0.3.44-41d5c3cb0a.patch

@@ -0,0 +1,71 @@
+diff --git a/dist/utils/tiktoken.cjs b/dist/utils/tiktoken.cjs
+index 973b0d0e75aeaf8de579419af31b879b32975413..f23c7caa8b9dc8bd404132725346a4786f6b278b 100644
+--- a/dist/utils/tiktoken.cjs
++++ b/dist/utils/tiktoken.cjs
+@@ -1,25 +1,14 @@
+ "use strict";
+ Object.defineProperty(exports, "__esModule", { value: true });
+ exports.encodingForModel = exports.getEncoding = void 0;
+-const lite_1 = require("js-tiktoken/lite");
+ const async_caller_js_1 = require("./async_caller.cjs");
+ const cache = {};
+ const caller = /* #__PURE__ */ new async_caller_js_1.AsyncCaller({});
+ async function getEncoding(encoding) {
+-    if (!(encoding in cache)) {
+-        cache[encoding] = caller
+-            .fetch(`https://tiktoken.pages.dev/js/${encoding}.json`)
+-            .then((res) => res.json())
+-            .then((data) => new lite_1.Tiktoken(data))
+-            .catch((e) => {
+-            delete cache[encoding];
+-            throw e;
+-        });
+-    }
+-    return await cache[encoding];
++    throw new Error("TikToken Not implemented");
+ }
+ exports.getEncoding = getEncoding;
+ async function encodingForModel(model) {
+-    return getEncoding((0, lite_1.getEncodingNameForModel)(model));
++    throw new Error("TikToken Not implemented");
+ }
+ exports.encodingForModel = encodingForModel;
+diff --git a/dist/utils/tiktoken.js b/dist/utils/tiktoken.js
+index 8e41ee6f00f2f9c7fa2c59fa2b2f4297634b97aa..aa5f314a6349ad0d1c5aea8631a56aad099176e0 100644
+--- a/dist/utils/tiktoken.js
++++ b/dist/utils/tiktoken.js
+@@ -1,20 +1,9 @@
+-import { Tiktoken, getEncodingNameForModel, } from "js-tiktoken/lite";
+ import { AsyncCaller } from "./async_caller.js";
+ const cache = {};
+ const caller = /* #__PURE__ */ new AsyncCaller({});
+ export async function getEncoding(encoding) {
+-    if (!(encoding in cache)) {
+-        cache[encoding] = caller
+-            .fetch(`https://tiktoken.pages.dev/js/${encoding}.json`)
+-            .then((res) => res.json())
+-            .then((data) => new Tiktoken(data))
+-            .catch((e) => {
+-            delete cache[encoding];
+-            throw e;
+-        });
+-    }
+-    return await cache[encoding];
++    throw new Error("TikToken Not implemented");
+ }
+ export async function encodingForModel(model) {
+-    return getEncoding(getEncodingNameForModel(model));
++    throw new Error("TikToken Not implemented");
+ }
+diff --git a/package.json b/package.json
+index 36072aecf700fca1bc49832a19be832eca726103..90b8922fba1c3d1b26f78477c891b07816d6238a 100644
+--- a/package.json
++++ b/package.json
+@@ -37,7 +37,6 @@
+     "ansi-styles": "^5.0.0",
+     "camelcase": "6",
+     "decamelize": "1.2.0",
+-    "js-tiktoken": "^1.0.12",
+     "langsmith": ">=0.2.8 <0.4.0",
+     "mustache": "^4.2.0",
+     "p-queue": "^6.6.2",

.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch

@@ -0,0 +1,159 @@
+diff --git a/out/macPackager.js b/out/macPackager.js
+index 852f6c4d16f86a7bb8a78bf1ed5a14647a279aa1..60e7f5f16a844541eb1909b215fcda1811e924b8 100644
+--- a/out/macPackager.js
++++ b/out/macPackager.js
+@@ -423,7 +423,7 @@ class MacPackager extends platformPackager_1.PlatformPackager {
+         }
+         appPlist.CFBundleName = appInfo.productName;
+         appPlist.CFBundleDisplayName = appInfo.productName;
+-        const minimumSystemVersion = this.platformSpecificBuildOptions.minimumSystemVersion;
++        const minimumSystemVersion = this.platformSpecificBuildOptions.LSMinimumSystemVersion;
+         if (minimumSystemVersion != null) {
+             appPlist.LSMinimumSystemVersion = minimumSystemVersion;
+         }
+diff --git a/out/publish/updateInfoBuilder.js b/out/publish/updateInfoBuilder.js
+index 7924c5b47d01f8dfccccb8f46658015fa66da1f7..1a1588923c3939ae1297b87931ba83f0ebc052d8 100644
+--- a/out/publish/updateInfoBuilder.js
++++ b/out/publish/updateInfoBuilder.js
+@@ -133,6 +133,7 @@ async function createUpdateInfo(version, event, releaseInfo) {
+     const customUpdateInfo = event.updateInfo;
+     const url = path.basename(event.file);
+     const sha512 = (customUpdateInfo == null ? null : customUpdateInfo.sha512) || (await (0, hash_1.hashFile)(event.file));
++    const minimumSystemVersion = customUpdateInfo == null ? null : customUpdateInfo.minimumSystemVersion;
+     const files = [{ url, sha512 }];
+     const result = {
+         // @ts-ignore
+@@ -143,9 +144,13 @@ async function createUpdateInfo(version, event, releaseInfo) {
+         path: url /* backward compatibility, electron-updater 1.x - electron-updater 2.15.0 */,
+         // @ts-ignore
+         sha512 /* backward compatibility, electron-updater 1.x - electron-updater 2.15.0 */,
++        minimumSystemVersion,
+         ...releaseInfo,
+     };
+     if (customUpdateInfo != null) {
++        if (customUpdateInfo.minimumSystemVersion) {
++            delete customUpdateInfo.minimumSystemVersion;
++        }
+         // file info or nsis web installer packages info
+         Object.assign("sha512" in customUpdateInfo ? files[0] : result, customUpdateInfo);
+     }
+diff --git a/out/targets/ArchiveTarget.js b/out/targets/ArchiveTarget.js
+index e1f52a5fa86fff6643b2e57eaf2af318d541f865..47cc347f154a24b365e70ae5e1f6d309f3582ed0 100644
+--- a/out/targets/ArchiveTarget.js
++++ b/out/targets/ArchiveTarget.js
+@@ -69,6 +69,9 @@ class ArchiveTarget extends core_1.Target {
+                     }
+                 }
+             }
++            if (updateInfo != null && this.packager.platformSpecificBuildOptions.minimumSystemVersion) {
++                updateInfo.minimumSystemVersion = this.packager.platformSpecificBuildOptions.minimumSystemVersion;
++            }
+             await packager.info.emitArtifactBuildCompleted({
+                 updateInfo,
+                 file: artifactPath,
+diff --git a/out/targets/nsis/NsisTarget.js b/out/targets/nsis/NsisTarget.js
+index e8bd7bb46c8a54b3f55cf3a853ef924195271e01..f956e9f3fe9eb903c78aef3502553b01de4b89b1 100644
+--- a/out/targets/nsis/NsisTarget.js
++++ b/out/targets/nsis/NsisTarget.js
+@@ -305,6 +305,9 @@ class NsisTarget extends core_1.Target {
+             if (updateInfo != null && isPerMachine && (oneClick || options.packElevateHelper)) {
+                 updateInfo.isAdminRightsRequired = true;
+             }
++            if (updateInfo != null && this.packager.platformSpecificBuildOptions.minimumSystemVersion) {
++                updateInfo.minimumSystemVersion = this.packager.platformSpecificBuildOptions.minimumSystemVersion;
++            }
+             await packager.info.emitArtifactBuildCompleted({
+                 file: installerPath,
+                 updateInfo,
+diff --git a/scheme.json b/scheme.json
+index 433e2efc9cef156ff5444f0c4520362ed2ef9ea7..a89c7a9b0b608fef67902c49106a43ebd0fa8b61 100644
+--- a/scheme.json
++++ b/scheme.json
+@@ -1975,6 +1975,13 @@
+           ],
+           "description": "The mime types in addition to specified in the file associations. Use it if you don't want to register a new mime type, but reuse existing."
+         },
++        "minimumSystemVersion": {
++          "description": "The minimum os kernel version required to install the application.",
++          "type": [
++            "null",
++            "string"
++          ]
++        },
+         "packageCategory": {
+           "description": "backward compatibility + to allow specify fpm-only category for all possible fpm targets in one place",
+           "type": [
+@@ -2327,6 +2334,13 @@
+     "MacConfiguration": {
+       "additionalProperties": false,
+       "properties": {
++        "LSMinimumSystemVersion": {
++          "description": "The minimum version of macOS required for the app to run. Corresponds to `LSMinimumSystemVersion`.",
++          "type": [
++            "null",
++            "string"
++          ]
++        },
+         "additionalArguments": {
+           "anyOf": [
+             {
+@@ -2737,7 +2751,7 @@
+           "type": "boolean"
+         },
+         "minimumSystemVersion": {
+-          "description": "The minimum version of macOS required for the app to run. Corresponds to `LSMinimumSystemVersion`.",
++          "description": "The minimum os kernel version required to install the application.",
+           "type": [
+             "null",
+             "string"
+@@ -2959,6 +2973,13 @@
+     "MasConfiguration": {
+       "additionalProperties": false,
+       "properties": {
++        "LSMinimumSystemVersion": {
++          "description": "The minimum version of macOS required for the app to run. Corresponds to `LSMinimumSystemVersion`.",
++          "type": [
++            "null",
++            "string"
++          ]
++        },
+         "additionalArguments": {
+           "anyOf": [
+             {
+@@ -3369,7 +3390,7 @@
+           "type": "boolean"
+         },
+         "minimumSystemVersion": {
+-          "description": "The minimum version of macOS required for the app to run. Corresponds to `LSMinimumSystemVersion`.",
++          "description": "The minimum os kernel version required to install the application.",
+           "type": [
+             "null",
+             "string"
+@@ -6507,6 +6528,13 @@
+             "string"
+           ]
+         },
++        "minimumSystemVersion": {
++          "description": "The minimum os kernel version required to install the application.",
++          "type": [
++            "null",
++            "string"
++          ]
++        },
+         "protocols": {
+           "anyOf": [
+             {
+@@ -7376,6 +7404,13 @@
+       ],
+       "description": "MAS (Mac Application Store) development options (`mas-dev` target)."
+     },
++    "minimumSystemVersion": {
++      "description": "The minimum os kernel version required to install the application.",
++      "type": [
++        "null",
++        "string"
++      ]
++    },
+     "msi": {
+       "anyOf": [
+         {

.yarn/patches/openai-npm-4.96.0-0665b05cb9.patch

@@ -1,85 +0,0 @@
-diff --git a/core.js b/core.js
-index 862d66101f441fb4f47dfc8cff5e2d39e1f5a11e..6464bebbf696c39d35f0368f061ea4236225c162 100644
---- a/core.js
-+++ b/core.js
-@@ -159,7 +159,7 @@ class APIClient {
-             Accept: 'application/json',
-             'Content-Type': 'application/json',
-             'User-Agent': this.getUserAgent(),
--            ...getPlatformHeaders(),
-+            // ...getPlatformHeaders(),
-             ...this.authHeaders(opts),
-         };
-     }
-diff --git a/core.mjs b/core.mjs
-index 05dbc6cfde51589a2b100d4e4b5b3c1a33b32b89..789fbb4985eb952a0349b779fa83b1a068af6e7e 100644
---- a/core.mjs
-+++ b/core.mjs
-@@ -152,7 +152,7 @@ export class APIClient {
-             Accept: 'application/json',
-             'Content-Type': 'application/json',
-             'User-Agent': this.getUserAgent(),
--            ...getPlatformHeaders(),
-+            // ...getPlatformHeaders(),
-             ...this.authHeaders(opts),
-         };
-     }
-diff --git a/error.mjs b/error.mjs
-index 7d19f5578040afa004bc887aab1725e8703d2bac..59ec725b6142299a62798ac4bdedb63ba7d9932c 100644
---- a/error.mjs
-+++ b/error.mjs
-@@ -36,7 +36,7 @@ export class APIError extends OpenAIError {
-         if (!status || !headers) {
-             return new APIConnectionError({ message, cause: castToError(errorResponse) });
-         }
--        const error = errorResponse?.['error'];
-+        const error = errorResponse?.['error'] || errorResponse;
-         if (status === 400) {
-             return new BadRequestError(status, error, message, headers);
-         }
-diff --git a/resources/embeddings.js b/resources/embeddings.js
-index aae578404cb2d09a39ac33fc416f1c215c45eecd..25c54b05bdae64d5c3b36fbb30dc7c8221b14034 100644
---- a/resources/embeddings.js
-+++ b/resources/embeddings.js
-@@ -36,6 +36,9 @@ class Embeddings extends resource_1.APIResource {
-         // No encoding_format specified, defaulting to base64 for performance reasons
-         // See https://github.com/openai/openai-node/pull/1312
-         let encoding_format = hasUserProvidedEncodingFormat ? body.encoding_format : 'base64';
-+        if (body.model.includes('jina')) {
-+            encoding_format = undefined;
-+        }
-         if (hasUserProvidedEncodingFormat) {
-             Core.debug('Request', 'User defined encoding_format:', body.encoding_format);
-         }
-@@ -47,7 +50,7 @@ class Embeddings extends resource_1.APIResource {
-             ...options,
-         });
-         // if the user specified an encoding_format, return the response as-is
--        if (hasUserProvidedEncodingFormat) {
-+        if (hasUserProvidedEncodingFormat || body.model.includes('jina')) {
-             return response;
-         }
-         // in this stage, we are sure the user did not specify an encoding_format
-diff --git a/resources/embeddings.mjs b/resources/embeddings.mjs
-index 0df3c6cc79a520e54acb4c2b5f77c43b774035ff..aa488b8a11b2c413c0a663d9a6059d286d7b5faf 100644
---- a/resources/embeddings.mjs
-+++ b/resources/embeddings.mjs
-@@ -10,6 +10,9 @@ export class Embeddings extends APIResource {
-         // No encoding_format specified, defaulting to base64 for performance reasons
-         // See https://github.com/openai/openai-node/pull/1312
-         let encoding_format = hasUserProvidedEncodingFormat ? body.encoding_format : 'base64';
-+        if (body.model.includes('jina')) {
-+            encoding_format = undefined;
-+        }
-         if (hasUserProvidedEncodingFormat) {
-             Core.debug('Request', 'User defined encoding_format:', body.encoding_format);
-         }
-@@ -21,7 +24,7 @@ export class Embeddings extends APIResource {
-             ...options,
-         });
-         // if the user specified an encoding_format, return the response as-is
--        if (hasUserProvidedEncodingFormat) {
-+        if (hasUserProvidedEncodingFormat || body.model.includes('jina')) {
-             return response;
-         }
-         // in this stage, we are sure the user did not specify an encoding_format

.yarn/patches/openai-npm-5.1.0-0e7b3ccb07.patch

@@ -0,0 +1,279 @@
+diff --git a/client.js b/client.js
+index 33b4ff6309d5f29187dab4e285d07dac20340bab..8f568637ee9e4677585931fb0284c8165a933f69 100644
+--- a/client.js
++++ b/client.js
+@@ -433,7 +433,7 @@ class OpenAI {
+                 'User-Agent': this.getUserAgent(),
+                 'X-Stainless-Retry-Count': String(retryCount),
+                 ...(options.timeout ? { 'X-Stainless-Timeout': String(Math.trunc(options.timeout / 1000)) } : {}),
+-                ...(0, detect_platform_1.getPlatformHeaders)(),
++                // ...(0, detect_platform_1.getPlatformHeaders)(),
+                 'OpenAI-Organization': this.organization,
+                 'OpenAI-Project': this.project,
+             },
+diff --git a/client.mjs b/client.mjs
+index c34c18213073540ebb296ea540b1d1ad39527906..1ce1a98256d7e90e26ca963582f235b23e996e73 100644
+--- a/client.mjs
++++ b/client.mjs
+@@ -430,7 +430,7 @@ export class OpenAI {
+                 'User-Agent': this.getUserAgent(),
+                 'X-Stainless-Retry-Count': String(retryCount),
+                 ...(options.timeout ? { 'X-Stainless-Timeout': String(Math.trunc(options.timeout / 1000)) } : {}),
+-                ...getPlatformHeaders(),
++                // ...getPlatformHeaders(),
+                 'OpenAI-Organization': this.organization,
+                 'OpenAI-Project': this.project,
+             },
+diff --git a/core/error.js b/core/error.js
+index a12d9d9ccd242050161adeb0f82e1b98d9e78e20..fe3a5462480558bc426deea147f864f12b36f9bd 100644
+--- a/core/error.js
++++ b/core/error.js
+@@ -40,7 +40,7 @@ class APIError extends OpenAIError {
+         if (!status || !headers) {
+             return new APIConnectionError({ message, cause: (0, errors_1.castToError)(errorResponse) });
+         }
+-        const error = errorResponse?.['error'];
++        const error = errorResponse?.['error'] || errorResponse;
+         if (status === 400) {
+             return new BadRequestError(status, error, message, headers);
+         }
+diff --git a/core/error.mjs b/core/error.mjs
+index 83cefbaffeb8c657536347322d8de9516af479a2..63334b7972ec04882aa4a0800c1ead5982345045 100644
+--- a/core/error.mjs
++++ b/core/error.mjs
+@@ -36,7 +36,7 @@ export class APIError extends OpenAIError {
+         if (!status || !headers) {
+             return new APIConnectionError({ message, cause: castToError(errorResponse) });
+         }
+-        const error = errorResponse?.['error'];
++        const error = errorResponse?.['error'] || errorResponse;
+         if (status === 400) {
+             return new BadRequestError(status, error, message, headers);
+         }
+diff --git a/resources/embeddings.js b/resources/embeddings.js
+index 2404264d4ba0204322548945ebb7eab3bea82173..8f1bc45cc45e0797d50989d96b51147b90ae6790 100644
+--- a/resources/embeddings.js
++++ b/resources/embeddings.js
+@@ -5,52 +5,64 @@ exports.Embeddings = void 0;
+ const resource_1 = require("../core/resource.js");
+ const utils_1 = require("../internal/utils.js");
+ class Embeddings extends resource_1.APIResource {
+-    /**
+-     * Creates an embedding vector representing the input text.
+-     *
+-     * @example
+-     * ```ts
+-     * const createEmbeddingResponse =
+-     *   await client.embeddings.create({
+-     *     input: 'The quick brown fox jumped over the lazy dog',
+-     *     model: 'text-embedding-3-small',
+-     *   });
+-     * ```
+-     */
+-    create(body, options) {
+-        const hasUserProvidedEncodingFormat = !!body.encoding_format;
+-        // No encoding_format specified, defaulting to base64 for performance reasons
+-        // See https://github.com/openai/openai-node/pull/1312
+-        let encoding_format = hasUserProvidedEncodingFormat ? body.encoding_format : 'base64';
+-        if (hasUserProvidedEncodingFormat) {
+-            (0, utils_1.loggerFor)(this._client).debug('embeddings/user defined encoding_format:', body.encoding_format);
+-        }
+-        const response = this._client.post('/embeddings', {
+-            body: {
+-                ...body,
+-                encoding_format: encoding_format,
+-            },
+-            ...options,
+-        });
+-        // if the user specified an encoding_format, return the response as-is
+-        if (hasUserProvidedEncodingFormat) {
+-            return response;
+-        }
+-        // in this stage, we are sure the user did not specify an encoding_format
+-        // and we defaulted to base64 for performance reasons
+-        // we are sure then that the response is base64 encoded, let's decode it
+-        // the returned result will be a float32 array since this is OpenAI API's default encoding
+-        (0, utils_1.loggerFor)(this._client).debug('embeddings/decoding base64 embeddings from base64');
+-        return response._thenUnwrap((response) => {
+-            if (response && response.data) {
+-                response.data.forEach((embeddingBase64Obj) => {
+-                    const embeddingBase64Str = embeddingBase64Obj.embedding;
+-                    embeddingBase64Obj.embedding = (0, utils_1.toFloat32Array)(embeddingBase64Str);
+-                });
+-            }
+-            return response;
+-        });
+-    }
++	/**
++	 * Creates an embedding vector representing the input text.
++	 *
++	 * @example
++	 * ```ts
++	 * const createEmbeddingResponse =
++	 *   await client.embeddings.create({
++	 *     input: 'The quick brown fox jumped over the lazy dog',
++	 *     model: 'text-embedding-3-small',
++	 *   });
++	 * ```
++	 */
++	create(body, options) {
++		const hasUserProvidedEncodingFormat = !!body.encoding_format;
++		// No encoding_format specified, defaulting to base64 for performance reasons
++		// See https://github.com/openai/openai-node/pull/1312
++		let encoding_format = hasUserProvidedEncodingFormat
++			? body.encoding_format
++			: "base64";
++		if (body.model.includes("jina")) {
++			encoding_format = undefined;
++		}
++		if (hasUserProvidedEncodingFormat) {
++			(0, utils_1.loggerFor)(this._client).debug(
++				"embeddings/user defined encoding_format:",
++				body.encoding_format
++			);
++		}
++		const response = this._client.post("/embeddings", {
++			body: {
++				...body,
++				encoding_format: encoding_format,
++			},
++			...options,
++		});
++		// if the user specified an encoding_format, return the response as-is
++		if (hasUserProvidedEncodingFormat || body.model.includes("jina")) {
++			return response;
++		}
++		// in this stage, we are sure the user did not specify an encoding_format
++		// and we defaulted to base64 for performance reasons
++		// we are sure then that the response is base64 encoded, let's decode it
++		// the returned result will be a float32 array since this is OpenAI API's default encoding
++		(0, utils_1.loggerFor)(this._client).debug(
++			"embeddings/decoding base64 embeddings from base64"
++		);
++		return response._thenUnwrap((response) => {
++			if (response && response.data) {
++				response.data.forEach((embeddingBase64Obj) => {
++					const embeddingBase64Str = embeddingBase64Obj.embedding;
++					embeddingBase64Obj.embedding = (0, utils_1.toFloat32Array)(
++						embeddingBase64Str
++					);
++				});
++			}
++			return response;
++		});
++	}
+ }
+ exports.Embeddings = Embeddings;
+ //# sourceMappingURL=embeddings.js.map
+diff --git a/resources/embeddings.mjs b/resources/embeddings.mjs
+index 19dcaef578c194a89759c4360073cfd4f7dd2cbf..0284e9cc615c900eff508eb595f7360a74bd9200 100644
+--- a/resources/embeddings.mjs
++++ b/resources/embeddings.mjs
+@@ -2,51 +2,61 @@
+ import { APIResource } from "../core/resource.mjs";
+ import { loggerFor, toFloat32Array } from "../internal/utils.mjs";
+ export class Embeddings extends APIResource {
+-    /**
+-     * Creates an embedding vector representing the input text.
+-     *
+-     * @example
+-     * ```ts
+-     * const createEmbeddingResponse =
+-     *   await client.embeddings.create({
+-     *     input: 'The quick brown fox jumped over the lazy dog',
+-     *     model: 'text-embedding-3-small',
+-     *   });
+-     * ```
+-     */
+-    create(body, options) {
+-        const hasUserProvidedEncodingFormat = !!body.encoding_format;
+-        // No encoding_format specified, defaulting to base64 for performance reasons
+-        // See https://github.com/openai/openai-node/pull/1312
+-        let encoding_format = hasUserProvidedEncodingFormat ? body.encoding_format : 'base64';
+-        if (hasUserProvidedEncodingFormat) {
+-            loggerFor(this._client).debug('embeddings/user defined encoding_format:', body.encoding_format);
+-        }
+-        const response = this._client.post('/embeddings', {
+-            body: {
+-                ...body,
+-                encoding_format: encoding_format,
+-            },
+-            ...options,
+-        });
+-        // if the user specified an encoding_format, return the response as-is
+-        if (hasUserProvidedEncodingFormat) {
+-            return response;
+-        }
+-        // in this stage, we are sure the user did not specify an encoding_format
+-        // and we defaulted to base64 for performance reasons
+-        // we are sure then that the response is base64 encoded, let's decode it
+-        // the returned result will be a float32 array since this is OpenAI API's default encoding
+-        loggerFor(this._client).debug('embeddings/decoding base64 embeddings from base64');
+-        return response._thenUnwrap((response) => {
+-            if (response && response.data) {
+-                response.data.forEach((embeddingBase64Obj) => {
+-                    const embeddingBase64Str = embeddingBase64Obj.embedding;
+-                    embeddingBase64Obj.embedding = toFloat32Array(embeddingBase64Str);
+-                });
+-            }
+-            return response;
+-        });
+-    }
++	/**
++	 * Creates an embedding vector representing the input text.
++	 *
++	 * @example
++	 * ```ts
++	 * const createEmbeddingResponse =
++	 *   await client.embeddings.create({
++	 *     input: 'The quick brown fox jumped over the lazy dog',
++	 *     model: 'text-embedding-3-small',
++	 *   });
++	 * ```
++	 */
++	create(body, options) {
++		const hasUserProvidedEncodingFormat = !!body.encoding_format;
++		// No encoding_format specified, defaulting to base64 for performance reasons
++		// See https://github.com/openai/openai-node/pull/1312
++		let encoding_format = hasUserProvidedEncodingFormat
++			? body.encoding_format
++			: "base64";
++		if (body.model.includes("jina")) {
++			encoding_format = undefined;
++		}
++		if (hasUserProvidedEncodingFormat) {
++			loggerFor(this._client).debug(
++				"embeddings/user defined encoding_format:",
++				body.encoding_format
++			);
++		}
++		const response = this._client.post("/embeddings", {
++			body: {
++				...body,
++				encoding_format: encoding_format,
++			},
++			...options,
++		});
++		// if the user specified an encoding_format, return the response as-is
++		if (hasUserProvidedEncodingFormat || body.model.includes("jina")) {
++			return response;
++		}
++		// in this stage, we are sure the user did not specify an encoding_format
++		// and we defaulted to base64 for performance reasons
++		// we are sure then that the response is base64 encoded, let's decode it
++		// the returned result will be a float32 array since this is OpenAI API's default encoding
++		loggerFor(this._client).debug(
++			"embeddings/decoding base64 embeddings from base64"
++		);
++		return response._thenUnwrap((response) => {
++			if (response && response.data) {
++				response.data.forEach((embeddingBase64Obj) => {
++					const embeddingBase64Str = embeddingBase64Obj.embedding;
++					embeddingBase64Obj.embedding = toFloat32Array(embeddingBase64Str);
++				});
++			}
++			return response;
++		});
++	}
+ }
+ //# sourceMappingURL=embeddings.mjs.map

.yarnrc.yml

@@ -4,4 +4,4 @@ httpTimeout: 300000
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.6.0.cjs
+yarnPath: .yarn/releases/yarn-4.9.1.cjs

README.md

@@ -3,10 +3,42 @@
     <img src="https://github.com/CherryHQ/cherry-studio/blob/main/build/icon.png?raw=true" width="150" height="150" alt="banner" /><br>
   </a>
 </h1>
-  <p align="center">English | <a href="./docs/README.zh.md">中文</a> | <a href="./docs/README.ja.md">日本語</a><br></p>
+  <p align="center">English | <a href="./docs/README.zh.md">中文</a> | <a href="./docs/README.ja.md">日本語</a> | <a href="https://cherry-ai.com">Official Site</a> | <a href="https://docs.cherry-ai.com/cherry-studio-wen-dang/en-us">Documents</a> | <a href="./docs/dev.md">Development</a> | <a href="https://github.com/CherryHQ/cherry-studio/issues">Feedback</a><br></p>
+
+<!-- 题头徽章组合 -->
+
 <div align="center">
+
+[![][deepwiki-shield]][deepwiki-link]
+[![][twitter-shield]][twitter-link]
+[![][discord-shield]][discord-link]
+[![][telegram-shield]][telegram-link]
+
+</div>
+
+<!-- 项目统计徽章 -->
+
+<div align="center">
+
+[![][github-stars-shield]][github-stars-link]
+[![][github-forks-shield]][github-forks-link]
+[![][github-release-shield]][github-release-link]
+[![][github-contributors-shield]][github-contributors-link]
+
+</div>
+
+<div align="center">
+
+[![][license-shield]][license-link]
+[![][commercial-shield]][commercial-link]
+[![][sponsor-shield]][sponsor-link]
+
+</div>
+
+<div align="center">
+ <a href="https://hellogithub.com/repository/1605492e1e2a4df3be07abfa4578dd37" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=1605492e1e2a4df3be07abfa4578dd37" alt="Featured｜HelloGitHub" style="width: 200px; height: 43px;" width="200" height="43" /></a>
  <a href="https://trendshift.io/repositories/11772" target="_blank"><img src="https://trendshift.io/api/badge/repositories/11772" alt="kangfenmao%2Fcherry-studio | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
- <a href="https://www.producthunt.com/posts/cherry-studio?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cherry&#0045;studio" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=496640&theme=light" alt="Cherry&#0032;Studio - AI&#0032;Chatbots&#0044;&#0032;AI&#0032;Desktop&#0032;Client | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+ <a href="https://www.producthunt.com/posts/cherry-studio?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cherry&#0045;studio" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=496640&theme=light" alt="Cherry&#0032;Studio - AI&#0032;Chatbots&#0044;&#0032;AI&#0032;Desktop&#0032;Client | Product Hunt" style="width: 200px; height: 43px;" width="200" height="43" /></a>
 </div>
 
 # 🍒 Cherry Studio
@@ -17,15 +49,13 @@ Cherry Studio is a desktop client that supports for multiple LLM providers, avai
 
 ❤️ Like Cherry Studio? Give it a star 🌟 or [Sponsor](docs/sponsor.md) to support the development!
 
-# 📖 Guide
-
-<https://docs.cherry-ai.com>
-
 # 🌠 Screenshot
 
-![](https://github.com/user-attachments/assets/082efa42-c4df-4863-a9cb-80435cecce0f)
-![](https://github.com/user-attachments/assets/f8411a65-c51f-47d3-9273-62ae384cc6f1)
-![](https://github.com/user-attachments/assets/0d235b3e-65ae-45ab-987f-8dbe003c52be)
+![](https://github.com/user-attachments/assets/36dddb2c-e0fb-4a5f-9411-91447bab6e18)
+
+![](https://github.com/user-attachments/assets/f549e8a0-2385-40b4-b52b-2039e39f2930)
+
+![](https://github.com/user-attachments/assets/58e0237c-4d36-40de-b428-53051d982026)
 
 # 🌟 Key Features
 
@@ -65,20 +95,42 @@ Cherry Studio is a desktop client that supports for multiple LLM providers, avai
 - 📝 Complete Markdown Rendering
 - 🤲 Easy Content Sharing
 
-# 📝 TODO
+# 📝 Roadmap
 
-- [x] Quick popup (read clipboard, quick question, explain, translate, summarize)
-- [x] Comparison of multi-model answers
-- [x] Support login using SSO provided by service providers
-- [x] All models support networking
-- [x] Launch of the first official version
-- [x] Bug fixes and improvements (In progress...)
-- [ ] Plugin functionality (JavaScript)
-- [ ] Browser extension (highlight text to translate, summarize, add to knowledge base)
-- [ ] iOS & Android client
-- [ ] AI notes
-- [ ] Voice input and output (AI call)
-- [ ] Data backup supports custom backup content
+We're actively working on the following features and improvements:
+
+1. 🎯 **Core Features**
+
+- Selection Assistant - Smart content selection enhancement
+- Deep Research - Advanced research capabilities
+- Memory System - Global context awareness
+- Document Preprocessing - Improved document handling
+- MCP Marketplace - Model Context Protocol ecosystem
+
+2. 🗂 **Knowledge Management**
+
+- Notes and Collections
+- Dynamic Canvas visualization
+- OCR capabilities
+- TTS (Text-to-Speech) support
+
+3. 📱 **Platform Support**
+
+- HarmonyOS Edition (PC)
+- Android App (Phase 1)
+- iOS App (Phase 1)
+- Multi-Window support
+- Window Pinning functionality
+
+4. 🔌 **Advanced Features**
+
+- Plugin System
+- ASR (Automatic Speech Recognition)
+- Assistant and Topic Interaction Refactoring
+
+Track our progress and contribute on our [project board](https://github.com/orgs/CherryHQ/projects/7).
+
+Want to influence our roadmap? Join our [GitHub Discussions](https://github.com/CherryHQ/cherry-studio/discussions) to share your ideas and feedback!
 
 # 🌈 Theme
 
@@ -90,14 +142,6 @@ Cherry Studio is a desktop client that supports for multiple LLM providers, avai
 
 Welcome PR for more themes
 
-# 🖥️ Develop
-
-Refer to the [development documentation](docs/dev.md)
-
-Refer to the [Architecture overview documentation](https://deepwiki.com/CherryHQ/cherry-studio)
-
-Refer to the [Branching Strategy](docs/branching-strategy.md) for contribution guidelines
-
 # 🤝 Contributing
 
 We welcome contributions to Cherry Studio! Here are some ways you can contribute:
@@ -110,6 +154,8 @@ We welcome contributions to Cherry Studio! Here are some ways you can contribute
 6. **Community Engagement**: Join discussions and help users.
 7. **Promote Usage**: Spread the word about Cherry Studio.
 
+Refer to the [Branching Strategy](docs/branching-strategy-en.md) for contribution guidelines
+
 ## Getting Started
 
 1. **Fork the Repository**: Fork and clone it to your local machine.
@@ -121,7 +167,7 @@ For more detailed guidelines, please refer to our [Contributing Guide](./CONTRIB
 
 Thank you for your support and contributions!
 
-## Related Projects
+# 🔗 Related Projects
 
 - [one-api](https://github.com/songquanpeng/one-api):LLM API management and distribution system, supporting mainstream models like OpenAI, Azure, and Anthropic. Features unified API interface, suitable for key management and secondary distribution.
 
@@ -134,22 +180,34 @@ Thank you for your support and contributions!
 </a>
 <br /><br />
 
-# 🌐 Community
-
-[Telegram](https://t.me/CherryStudioAI) | [Email](mailto:support@cherry-ai.com) | [Twitter](https://x.com/kangfenmao)
-
-# ☕ Sponsor
-
-[Buy Me a Coffee](docs/sponsor.md)
-
-# 📃 License
-
-[LICENSE](./LICENSE)
-
-# ✉️ Contact
-
-<yinsenho@cherry-ai.com>
-
 # ⭐️ Star History
 
-[![Star History Chart](https://api.star-history.com/svg?repos=kangfenmao/cherry-studio&type=Timeline)](https://star-history.com/#kangfenmao/cherry-studio&Timeline)
+[![Star History Chart](https://api.star-history.com/svg?repos=CherryHQ/cherry-studio&type=Timeline)](https://star-history.com/#CherryHQ/cherry-studio&Timeline)
+
+<!-- Links & Images -->
+[deepwiki-shield]: https://img.shields.io/badge/Deepwiki-CherryHQ-0088CC?style=plastic
+[deepwiki-link]: https://deepwiki.com/CherryHQ/cherry-studio
+[twitter-shield]: https://img.shields.io/badge/Twitter-CherryStudioApp-0088CC?style=plastic&logo=x
+[twitter-link]: https://twitter.com/CherryStudioApp
+[discord-shield]: https://img.shields.io/badge/Discord-@CherryStudio-0088CC?style=plastic&logo=discord
+[discord-link]: https://discord.gg/wez8HtpxqQ
+[telegram-shield]: https://img.shields.io/badge/Telegram-@CherryStudioAI-0088CC?style=plastic&logo=telegram
+[telegram-link]: https://t.me/CherryStudioAI
+
+<!-- Links & Images -->
+[github-stars-shield]: https://img.shields.io/github/stars/CherryHQ/cherry-studio?style=social
+[github-stars-link]: https://github.com/CherryHQ/cherry-studio/stargazers
+[github-forks-shield]: https://img.shields.io/github/forks/CherryHQ/cherry-studio?style=social
+[github-forks-link]: https://github.com/CherryHQ/cherry-studio/network
+[github-release-shield]: https://img.shields.io/github/v/release/CherryHQ/cherry-studio
+[github-release-link]: https://github.com/CherryHQ/cherry-studio/releases
+[github-contributors-shield]: https://img.shields.io/github/contributors/CherryHQ/cherry-studio
+[github-contributors-link]: https://github.com/CherryHQ/cherry-studio/graphs/contributors
+
+<!-- Links & Images -->
+[license-shield]: https://img.shields.io/badge/License-AGPLv3-important.svg?style=plastic&logo=gnu
+[license-link]: https://www.gnu.org/licenses/agpl-3.0
+[commercial-shield]: https://img.shields.io/badge/License-Contact-white.svg?style=plastic&logoColor=white&logo=telegram&color=blue
+[commercial-link]: mailto:license@cherry-ai.com?subject=Commercial%20License%20Inquiry
+[sponsor-shield]: https://img.shields.io/badge/Sponsor-FF6699.svg?style=plastic&logo=githubsponsors&logoColor=white
+[sponsor-link]: https://github.com/CherryHQ/cherry-studio/blob/main/docs/sponsor.md

components.json

@@ -0,0 +1,21 @@
+{
+  "$schema": "https://ui.shadcn.com/schema.json",
+  "style": "new-york",
+  "rsc": false,
+  "tsx": true,
+  "tailwind": {
+    "config": "",
+    "css": "src/renderer/src/assets/styles/tailwind.css",
+    "baseColor": "zinc",
+    "cssVariables": true,
+    "prefix": ""
+  },
+  "aliases": {
+    "components": "@renderer/ui/third-party",
+    "utils": "@renderer/utils",
+    "ui": "@renderer/ui",
+    "lib": "@renderer/lib",
+    "hooks": "@renderer/hooks"
+  },
+  "iconLibrary": "lucide"
+}

docs/README.ja.md

@@ -1,32 +1,63 @@
 <h1 align="center">
   <a href="https://github.com/CherryHQ/cherry-studio/releases">
-    <img src="https://github.com/CherryHQ/cherry-studio/blob/main/build/icon.png?raw=true" width="150" height="150" alt="banner" />
+    <img src="https://github.com/CherryHQ/cherry-studio/blob/main/build/icon.png?raw=true" width="150" height="150" alt="banner" /><br>
   </a>
 </h1>
 <p align="center">
-  <a href="https://github.com/CherryHQ/cherry-studio">English</a> | <a href="./README.zh.md">中文</a> | 日本語 <br>
+  <a href="https://github.com/CherryHQ/cherry-studio">English</a> | <a href="./README.zh.md">中文</a> | 日本語 | <a href="https://cherry-ai.com">公式サイト</a> | <a href="https://docs.cherry-ai.com/cherry-studio-wen-dang/ja">ドキュメント</a> | <a href="./dev.md">開発</a> | <a href="https://github.com/CherryHQ/cherry-studio/issues">フィードバック</a><br>
 </p>
+
+<!-- バッジコレクション -->
+
 <div align="center">
- <a href="https://trendshift.io/repositories/11772" target="_blank"><img src="https://trendshift.io/api/badge/repositories/11772" alt="kangfenmao%2Fcherry-studio | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
- <a href="https://www.producthunt.com/posts/cherry-studio?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cherry&#0045;studio" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=496640&theme=light" alt="Cherry&#0032;Studio - AI&#0032;Chatbots&#0044;&#0032;AI&#0032;Desktop&#0032;Client | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+
+[![][deepwiki-shield]][deepwiki-link]
+[![][twitter-shield]][twitter-link]
+[![][discord-shield]][discord-link]
+[![][telegram-shield]][telegram-link]
+
 </div>
+
+<!-- プロジェクト統計 -->
+
+<div align="center">
+
+[![][github-stars-shield]][github-stars-link]
+[![][github-forks-shield]][github-forks-link]
+[![][github-release-shield]][github-release-link]
+[![][github-contributors-shield]][github-contributors-link]
+
+</div>
+
+<div align="center">
+
+[![][license-shield]][license-link]
+[![][commercial-shield]][commercial-link]
+[![][sponsor-shield]][sponsor-link]
+
+</div>
+
+<div align="center">
+ <a href="https://hellogithub.com/repository/1605492e1e2a4df3be07abfa4578dd37" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=1605492e1e2a4df3be07abfa4578dd37" alt="Featured｜HelloGitHub" style="width: 200px; height: 43px;" width="200" height="43" /></a>
+ <a href="https://trendshift.io/repositories/11772" target="_blank"><img src="https://trendshift.io/api/badge/repositories/11772" alt="kangfenmao%2Fcherry-studio | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+ <a href="https://www.producthunt.com/posts/cherry-studio?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cherry&#0045;studio" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=496640&theme=light" alt="Cherry&#0032;Studio - AI&#0032;Chatbots&#0044;&#0032;AI&#0032;Desktop&#0032;Client | Product Hunt" style="width: 200px; height: 43px;" width="200" height="43" /></a>
+</div>
+
 # 🍒 Cherry Studio
 
 Cherry Studio は、複数の LLM プロバイダーをサポートするデスクトップクライアントで、Windows、Mac、Linux で利用可能です。
 
 👏 [Telegram](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/wez8HtpxqQ) | [QQグループ(575014769)](https://qm.qq.com/q/lo0D4qVZKi)
 
-❤️ Cherry Studio をお気に入りにしましたか？小さな星をつけてください 🌟 または [スポンサー](sponsor.md) をして開発をサポートしてください！❤️
-
-# 📖 ガイド
-
-https://docs.cherry-ai.com
+❤️ Cherry Studio をお気に入りにしましたか？小さな星をつけてください 🌟 または [スポンサー](sponsor.md) をして開発をサポートしてください！
 
 # 🌠 スクリーンショット
 
-![](https://github.com/user-attachments/assets/082efa42-c4df-4863-a9cb-80435cecce0f)
-![](https://github.com/user-attachments/assets/f8411a65-c51f-47d3-9273-62ae384cc6f1)
-![](https://github.com/user-attachments/assets/0d235b3e-65ae-45ab-987f-8dbe003c52be)
+![](https://github.com/user-attachments/assets/36dddb2c-e0fb-4a5f-9411-91447bab6e18)
+
+![](https://github.com/user-attachments/assets/f549e8a0-2385-40b4-b52b-2039e39f2930)
+
+![](https://github.com/user-attachments/assets/58e0237c-4d36-40de-b428-53051d982026)
 
 # 🌟 主な機能
 
@@ -56,7 +87,7 @@ https://docs.cherry-ai.com
 - 🔤 AI による翻訳機能
 - 🎯 ドラッグ＆ドロップによる整理
 - 🔌 ミニプログラム対応
-- ⚙️ MCP（モデルコンテキストプロトコル） サービス
+- ⚙️ MCP（モデルコンテキストプロトコル）サービス
 
 5. **優れたユーザー体験**：
 
@@ -66,84 +97,119 @@ https://docs.cherry-ai.com
 - 📝 完全な Markdown レンダリング
 - 🤲 簡単な共有機能
 
-# 📝 TODO
+# 📝 開発計画
 
-- [x] クイックポップアップ（クリップボードの読み取り、簡単な質問、説明、翻訳、要約）
-- [x] 複数モデルの回答の比較
-- [x] サービスプロバイダーが提供する SSO を使用したログインをサポート
-- [x] すべてのモデルがネットワークをサポート
-- [x] 最初の公式バージョンのリリース
-- [ ] 錯誤修復と改善 (開発中...)
-- [ ] プラグイン機能（JavaScript）
-- [ ] ブラウザ拡張機能（テキストをハイライトして翻訳、要約、ナレッジベースに追加）
-- [ ] iOS & Android クライアント
-- [ ] AIノート
-- [ ] 音声入出力（AI コール）
-- [ ] データバックアップはカスタムバックアップコンテンツをサポート
+以下の機能と改善に積極的に取り組んでいます：
+
+1. 🎯 **コア機能**
+
+- 選択アシスタント - スマートな内容選択の強化
+- ディープリサーチ - 高度な研究能力
+- メモリーシステム - グローバルコンテキスト認識
+- ドキュメント前処理 - 文書処理の改善
+- MCP マーケットプレイス - モデルコンテキストプロトコルエコシステム
+
+2. 🗂 **ナレッジ管理**
+
+- ノートとコレクション
+- ダイナミックキャンバス可視化
+- OCR 機能
+- TTS（テキスト読み上げ）サポート
+
+3. 📱 **プラットフォーム対応**
+
+- HarmonyOS エディション
+- Android アプリ（フェーズ1）
+- iOS アプリ（フェーズ1）
+- マルチウィンドウ対応
+- ウィンドウピン留め機能
+
+4. 🔌 **高度な機能**
+
+- プラグインシステム
+- ASR（音声認識）
+- アシスタントとトピックの対話機能リファクタリング
+
+[プロジェクトボード](https://github.com/orgs/CherryHQ/projects/7)で進捗を確認し、貢献することができます。
+
+開発計画に影響を与えたいですか？[GitHub ディスカッション](https://github.com/CherryHQ/cherry-studio/discussions)に参加して、アイデアやフィードバックを共有してください！
 
 # 🌈 テーマ
 
-- テーマギャラリー: https://cherrycss.com
-- Aero テーマ: https://github.com/hakadao/CherryStudio-Aero
-- PaperMaterial テーマ: https://github.com/rainoffallingstar/CherryStudio-PaperMaterial
-- Claude テーマ: https://github.com/bjl101501/CherryStudio-Claudestyle-dynamic
-- メープルネオンテーマ: https://github.com/BoningtonChen/CherryStudio_themes
+- テーマギャラリー：https://cherrycss.com
+- Aero テーマ：https://github.com/hakadao/CherryStudio-Aero
+- PaperMaterial テーマ：https://github.com/rainoffallingstar/CherryStudio-PaperMaterial
+- Claude テーマ：https://github.com/bjl101501/CherryStudio-Claudestyle-dynamic
+- メープルネオンテーマ：https://github.com/BoningtonChen/CherryStudio_themes
 
-より多くのテーマのPRを歓迎します
-
-# 🖥️ 開発
-
-参考[開発ドキュメント](dev.md)
+より多くのテーマの PR を歓迎します
 
 # 🤝 貢献
 
 Cherry Studio への貢献を歓迎します！以下の方法で貢献できます：
 
-1. **コードの貢献**：新機能を開発するか、既存のコードを最適化します。
-2. **バグの修正**：見つけたバグを修正します。
-3. **問題の管理**：GitHub の問題を管理するのを手伝います。
-4. **製品デザイン**：デザインの議論に参加します。
-5. **ドキュメントの作成**：ユーザーマニュアルやガイドを改善します。
-6. **コミュニティの参加**：ディスカッションに参加し、ユーザーを支援します。
-7. **使用の促進**：Cherry Studio を広めます。
+1. **コードの貢献**：新機能を開発するか、既存のコードを最適化します
+2. **バグの修正**：見つけたバグを修正します
+3. **問題の管理**：GitHub の問題を管理するのを手伝います
+4. **製品デザイン**：デザインの議論に参加します
+5. **ドキュメントの作成**：ユーザーマニュアルやガイドを改善します
+6. **コミュニティの参加**：ディスカッションに参加し、ユーザーを支援します
+7. **使用の促進**：Cherry Studio を広めます
+
+[ブランチ戦略](branching-strategy-en.md)を参照して貢献ガイドラインを確認してください
 
 ## 始め方
 
-1. **リポジトリをフォーク**：フォークしてローカルマシンにクローンします。
-2. **ブランチを作成**：変更のためのブランチを作成します。
-3. **変更を提出**：変更をコミットしてプッシュします。
-4. **プルリクエストを開く**：変更内容と理由を説明します。
+1. **リポジトリをフォーク**：フォークしてローカルマシンにクローンします
+2. **ブランチを作成**：変更のためのブランチを作成します
+3. **変更を提出**：変更をコミットしてプッシュします
+4. **プルリクエストを開く**：変更内容と理由を説明します
 
 詳細なガイドラインについては、[貢献ガイド](../CONTRIBUTING.md)をご覧ください。
 
 ご支援と貢献に感謝します！
 
-## 関連頁版
+# 🔗 関連プロジェクト
 
 - [one-api](https://github.com/songquanpeng/one-api)：LLM API の管理・配信システム。OpenAI、Azure、Anthropic などの主要モデルに対応し、統一 API インターフェースを提供。API キー管理と再配布に利用可能。
 
+- [ublacklist](https://github.com/iorate/ublacklist)：Google 検索結果から特定のサイトを非表示にします
+
 # 🚀 コントリビューター
 
 <a href="https://github.com/CherryHQ/cherry-studio/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=kangfenmao/cherry-studio" />
+  <img src="https://contrib.rocks/image?repo=CherryHQ/cherry-studio" />
 </a>
-
-# コミュニティ
-
-[Telegram](https://t.me/CherryStudioAI) | [Email](mailto:support@cherry-ai.com) | [Twitter](https://x.com/kangfenmao)
-
-# スポンサー
-
-[Buy Me a Coffee](sponsor.md)
-
-# 📃 ライセンス
-
-[LICENSE](../LICENSE)
-
-# ✉️ お問い合わせ
-
-yinsenho@cherry-ai.com
+<br /><br />
 
 # ⭐️ スター履歴
 
-[![Star History Chart](https://api.star-history.com/svg?repos=kangfenmao/cherry-studio&type=Timeline)](https://star-history.com/#kangfenmao/cherry-studio&Timeline)
+[![Star History Chart](https://api.star-history.com/svg?repos=CherryHQ/cherry-studio&type=Timeline)](https://star-history.com/#CherryHQ/cherry-studio&Timeline)
+
+<!-- リンクと画像 -->
+[deepwiki-shield]: https://img.shields.io/badge/Deepwiki-CherryHQ-0088CC?style=plastic
+[deepwiki-link]: https://deepwiki.com/CherryHQ/cherry-studio
+[twitter-shield]: https://img.shields.io/badge/Twitter-CherryStudioApp-0088CC?style=plastic&logo=x
+[twitter-link]: https://twitter.com/CherryStudioApp
+[discord-shield]: https://img.shields.io/badge/Discord-@CherryStudio-0088CC?style=plastic&logo=discord
+[discord-link]: https://discord.gg/wez8HtpxqQ
+[telegram-shield]: https://img.shields.io/badge/Telegram-@CherryStudioAI-0088CC?style=plastic&logo=telegram
+[telegram-link]: https://t.me/CherryStudioAI
+
+<!-- プロジェクト統計 -->
+[github-stars-shield]: https://img.shields.io/github/stars/CherryHQ/cherry-studio?style=social
+[github-stars-link]: https://github.com/CherryHQ/cherry-studio/stargazers
+[github-forks-shield]: https://img.shields.io/github/forks/CherryHQ/cherry-studio?style=social
+[github-forks-link]: https://github.com/CherryHQ/cherry-studio/network
+[github-release-shield]: https://img.shields.io/github/v/release/CherryHQ/cherry-studio
+[github-release-link]: https://github.com/CherryHQ/cherry-studio/releases
+[github-contributors-shield]: https://img.shields.io/github/contributors/CherryHQ/cherry-studio
+[github-contributors-link]: https://github.com/CherryHQ/cherry-studio/graphs/contributors
+
+<!-- ライセンスとスポンサー -->
+[license-shield]: https://img.shields.io/badge/License-AGPLv3-important.svg?style=plastic&logo=gnu
+[license-link]: https://www.gnu.org/licenses/agpl-3.0
+[commercial-shield]: https://img.shields.io/badge/商用ライセンス-お問い合わせ-white.svg?style=plastic&logoColor=white&logo=telegram&color=blue
+[commercial-link]: mailto:license@cherry-ai.com?subject=商業ライセンスについて
+[sponsor-shield]: https://img.shields.io/badge/スポンサー-FF6699.svg?style=plastic&logo=githubsponsors&logoColor=white
+[sponsor-link]: https://github.com/CherryHQ/cherry-studio/blob/main/docs/sponsor.md

docs/README.zh.md

@@ -1,13 +1,46 @@
 <h1 align="center">
   <a href="https://github.com/CherryHQ/cherry-studio/releases">
-    <img src="https://github.com/CherryHQ/cherry-studio/blob/main/build/icon.png?raw=true" width="150" height="150" alt="banner" />
+    <img src="https://github.com/CherryHQ/cherry-studio/blob/main/build/icon.png?raw=true" width="150" height="150" alt="banner" /><br>
   </a>
 </h1>
 <p align="center">
-  <a href="https://github.com/CherryHQ/cherry-studio">English</a> | 中文 | <a href="./README.ja.md">日本語</a><br></p>
+  <a href="https://github.com/CherryHQ/cherry-studio">English</a> | 中文 | <a href="./README.ja.md">日本語</a> | <a href="https://cherry-ai.com">官方网站</a> | <a href="https://docs.cherry-ai.com/cherry-studio-wen-dang/zh-cn">文档</a> | <a href="./dev.md">开发</a> | <a href="https://github.com/CherryHQ/cherry-studio/issues">反馈</a><br>
+</p>
+
+<!-- 题头徽章组合 -->
+
 <div align="center">
+
+[![][deepwiki-shield]][deepwiki-link]
+[![][twitter-shield]][twitter-link]
+[![][discord-shield]][discord-link]
+[![][telegram-shield]][telegram-link]
+
+</div>
+
+<!-- 项目统计徽章 -->
+
+<div align="center">
+
+[![][github-stars-shield]][github-stars-link]
+[![][github-forks-shield]][github-forks-link]
+[![][github-release-shield]][github-release-link]
+[![][github-contributors-shield]][github-contributors-link]
+
+</div>
+
+<div align="center">
+
+[![][license-shield]][license-link]
+[![][commercial-shield]][commercial-link]
+[![][sponsor-shield]][sponsor-link]
+
+</div>
+
+<div align="center">
+ <a href="https://hellogithub.com/repository/1605492e1e2a4df3be07abfa4578dd37" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=1605492e1e2a4df3be07abfa4578dd37" alt="Featured｜HelloGitHub" style="width: 200px; height: 43px;" width="200" height="43" /></a>
  <a href="https://trendshift.io/repositories/11772" target="_blank"><img src="https://trendshift.io/api/badge/repositories/11772" alt="kangfenmao%2Fcherry-studio | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
- <a href="https://www.producthunt.com/posts/cherry-studio?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cherry&#0045;studio" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=496640&theme=light" alt="Cherry&#0032;Studio - AI&#0032;Chatbots&#0044;&#0032;AI&#0032;Desktop&#0032;Client | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+ <a href="https://www.producthunt.com/posts/cherry-studio?embed=true&utm_source=badge-featured&utm_medium=badge&utm_souce=badge-cherry&#0045;studio" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=496640&theme=light" alt="Cherry&#0032;Studio - AI&#0032;Chatbots&#0044;&#0032;AI&#0032;Desktop&#0032;Client | Product Hunt" style="width: 200px; height: 43px;" width="200" height="43" /></a>
 </div>
 
 # 🍒 Cherry Studio
@@ -18,15 +51,25 @@ Cherry Studio 是一款支持多个大语言模型（LLM）服务商的桌面客
 
 ❤️ 喜欢 Cherry Studio? 点亮小星星 🌟 或 [赞助开发者](sponsor.md)! ❤️
 
+# GitCode✖️Cherry Studio【新源力】贡献挑战赛
+
+<p align="center">
+  <a href="https://gitcode.com/CherryHQ/cherry-studio/discussion/2">
+    <img src="https://raw.gitcode.com/user-images/assets/5007375/8d8d7559-1141-4691-b90f-d154558c6896/cherry-studio-gitcode.jpg" width="100%" alt="banner" />
+  </a>
+</p>
+
 # 📖 使用教程
 
 https://docs.cherry-ai.com
 
 # 🌠 界面
 
-![](https://github.com/user-attachments/assets/082efa42-c4df-4863-a9cb-80435cecce0f)
-![](https://github.com/user-attachments/assets/f8411a65-c51f-47d3-9273-62ae384cc6f1)
-![](https://github.com/user-attachments/assets/0d235b3e-65ae-45ab-987f-8dbe003c52be)
+![](https://github.com/user-attachments/assets/36dddb2c-e0fb-4a5f-9411-91447bab6e18)
+
+![](https://github.com/user-attachments/assets/f549e8a0-2385-40b4-b52b-2039e39f2930)
+
+![](https://github.com/user-attachments/assets/58e0237c-4d36-40de-b428-53051d982026)
 
 # 🌟 主要特性
 
@@ -66,85 +109,119 @@ https://docs.cherry-ai.com
 - 📝 完整的 Markdown 渲染
 - 🤲 便捷的内容分享功能
 
-# 📝 待辦事項
+# 📝 开发计划
 
-- [x] 快捷弹窗（读取剪贴板、快速提问、解释、翻译、总结）
-- [x] 多模型回答对比
-- [x] 支持使用服务供应商提供的 SSO 进行登入
-- [x] 全部模型支持连网（开发中...）
-- [x] 推出第一个正式版
-- [x] 错误修复和改进（开发中...）
-- [ ] 插件功能（JavaScript）
-- [ ] 浏览器插件（划词翻译、总结、新增至知识库）
-- [ ] iOS & Android 客户端
-- [ ] AI 笔记
-- [ ] 语音输入输出（AI 通话）
-- [ ] 数据备份支持自定义备份内容
+我们正在积极开发以下功能和改进：
+
+1. 🎯 **核心功能**
+
+- 选择助手 - 智能内容选择增强
+- 深度研究 - 高级研究能力
+- 全局记忆 - 全局上下文感知
+- 文档预处理 - 改进文档处理能力
+- MCP 市场 - 模型上下文协议生态系统
+
+2. 🗂 **知识管理**
+
+- 笔记与收藏功能
+- 动态画布可视化
+- OCR 光学字符识别
+- TTS 文本转语音支持
+
+3. 📱 **平台支持**
+
+- 鸿蒙版本 (PC)
+- Android 应用（第一期）
+- iOS 应用（第一期）
+- 多窗口支持
+- 窗口置顶功能
+
+4. 🔌 **高级特性**
+
+- 插件系统
+- ASR 语音识别
+- 助手与话题交互重构
+
+在我们的[项目面板](https://github.com/orgs/CherryHQ/projects/7)上跟踪进展并参与贡献。
+
+想要影响开发计划？欢迎加入我们的 [GitHub 讨论区](https://github.com/CherryHQ/cherry-studio/discussions) 分享您的想法和反馈！
 
 # 🌈 主题
 
 - 主题库：https://cherrycss.com
 - Aero 主题：https://github.com/hakadao/CherryStudio-Aero
-- PaperMaterial 主题: https://github.com/rainoffallingstar/CherryStudio-PaperMaterial
-- 仿Claude 主题: https://github.com/bjl101501/CherryStudio-Claudestyle-dynamic
-- 霓虹枫叶字体主题: https://github.com/BoningtonChen/CherryStudio_themes
+- PaperMaterial 主题：https://github.com/rainoffallingstar/CherryStudio-PaperMaterial
+- 仿 Claude 主题：https://github.com/bjl101501/CherryStudio-Claudestyle-dynamic
+- 霓虹枫叶主题：https://github.com/BoningtonChen/CherryStudio_themes
 
 欢迎 PR 更多主题
 
-# 🖥️ 开发
-
-参考[开发文档](dev.md)
-
 # 🤝 贡献
 
 我们欢迎对 Cherry Studio 的贡献！您可以通过以下方式贡献：
 
-1. **贡献代码**：开发新功能或优化现有代码。
-2. **修复错误**：提交您发现的错误修复。
-3. **维护问题**：帮助管理 GitHub 问题。
-4. **产品设计**：参与设计讨论。
-5. **撰写文档**：改进用户手册和指南。
-6. **社区参与**：加入讨论并帮助用户。
-7. **推广使用**：宣传 Cherry Studio。
+1. **贡献代码**：开发新功能或优化现有代码
+2. **修复错误**：提交您发现的错误修复
+3. **维护问题**：帮助管理 GitHub 问题
+4. **产品设计**：参与设计讨论
+5. **撰写文档**：改进用户手册和指南
+6. **社区参与**：加入讨论并帮助用户
+7. **推广使用**：宣传 Cherry Studio
+
+参考[分支策略](branching-strategy-zh.md)了解贡献指南
 
 ## 入门
 
-1. **Fork 仓库**：Fork 并克隆到您的本地机器。
-2. **创建分支**：为您的更改创建分支。
-3. **提交更改**：提交并推送您的更改。
-4. **打开 Pull Request**：描述您的更改和原因。
+1. **Fork 仓库**：Fork 并克隆到您的本地机器
+2. **创建分支**：为您的更改创建分支
+3. **提交更改**：提交并推送您的更改
+4. **打开 Pull Request**：描述您的更改和原因
 
-有关更详细的指南，请参阅我们的 [贡献指南](./CONTRIBUTING.zh.md)。
+有关更详细的指南，请参阅我们的 [贡献指南](./CONTRIBUTING.zh.md)
 
 感谢您的支持和贡献！
 
-## 相关项目
+# 🔗 相关项目
 
 - [one-api](https://github.com/songquanpeng/one-api)：LLM API 管理及分发系统，支持 OpenAI、Azure、Anthropic 等主流模型，统一 API 接口，可用于密钥管理与二次分发。
 
+- [ublacklist](https://github.com/iorate/ublacklist)：屏蔽特定网站在 Google 搜索结果中显示
+
 # 🚀 贡献者
 
 <a href="https://github.com/CherryHQ/cherry-studio/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=kangfenmao/cherry-studio" />
+  <img src="https://contrib.rocks/image?repo=CherryHQ/cherry-studio" />
 </a>
 <br /><br />
 
-# 🌐 社区
-
-[Telegram](https://t.me/CherryStudioAI) | [Email](mailto:support@cherry-ai.com) | [Twitter](https://x.com/kangfenmao)
-
-# ☕ 赞助
-
-[微信赞赏码](sponsor.md)
-
-# 📃 许可证
-
-[LICENSE](../LICENSE)
-
-# ✉️ 联系我们
-
-yinsenho@cherry-ai.com
-
 # ⭐️ Star 记录
 
-[![Star History Chart](https://api.star-history.com/svg?repos=kangfenmao/cherry-studio&type=Timeline)](https://star-history.com/#kangfenmao/cherry-studio&Timeline)
+[![Star History Chart](https://api.star-history.com/svg?repos=CherryHQ/cherry-studio&type=Timeline)](https://star-history.com/#CherryHQ/cherry-studio&Timeline)
+
+<!-- Links & Images -->
+[deepwiki-shield]: https://img.shields.io/badge/Deepwiki-CherryHQ-0088CC?style=plastic
+[deepwiki-link]: https://deepwiki.com/CherryHQ/cherry-studio
+[twitter-shield]: https://img.shields.io/badge/Twitter-CherryStudioApp-0088CC?style=plastic&logo=x
+[twitter-link]: https://twitter.com/CherryStudioApp
+[discord-shield]: https://img.shields.io/badge/Discord-@CherryStudio-0088CC?style=plastic&logo=discord
+[discord-link]: https://discord.gg/wez8HtpxqQ
+[telegram-shield]: https://img.shields.io/badge/Telegram-@CherryStudioAI-0088CC?style=plastic&logo=telegram
+[telegram-link]: https://t.me/CherryStudioAI
+
+<!-- 项目统计徽章 -->
+[github-stars-shield]: https://img.shields.io/github/stars/CherryHQ/cherry-studio?style=social
+[github-stars-link]: https://github.com/CherryHQ/cherry-studio/stargazers
+[github-forks-shield]: https://img.shields.io/github/forks/CherryHQ/cherry-studio?style=social
+[github-forks-link]: https://github.com/CherryHQ/cherry-studio/network
+[github-release-shield]: https://img.shields.io/github/v/release/CherryHQ/cherry-studio
+[github-release-link]: https://github.com/CherryHQ/cherry-studio/releases
+[github-contributors-shield]: https://img.shields.io/github/contributors/CherryHQ/cherry-studio
+[github-contributors-link]: https://github.com/CherryHQ/cherry-studio/graphs/contributors
+
+<!-- 许可和赞助徽章 -->
+[license-shield]: https://img.shields.io/badge/License-AGPLv3-important.svg?style=plastic&logo=gnu
+[license-link]: https://www.gnu.org/licenses/agpl-3.0
+[commercial-shield]: https://img.shields.io/badge/商用授权-联系-white.svg?style=plastic&logoColor=white&logo=telegram&color=blue
+[commercial-link]: mailto:license@cherry-ai.com?subject=商业授权咨询
+[sponsor-shield]: https://img.shields.io/badge/赞助支持-FF6699.svg?style=plastic&logo=githubsponsors&logoColor=white
+[sponsor-link]: https://github.com/CherryHQ/cherry-studio/blob/main/docs/sponsor.md

docs/branching-strategy-en.md

@@ -0,0 +1,71 @@
+# 🌿 Branching Strategy
+
+Cherry Studio implements a structured branching strategy to maintain code quality and streamline the development process.
+
+## Main Branches
+
+- `main`: Main development branch
+
+  - Contains the latest development code
+  - Direct commits are not allowed - changes must come through pull requests
+  - Code may contain features in development and might not be fully stable
+
+- `release/*`: Release branches
+  - Created from `main` branch
+  - Contains stable code ready for release
+  - Only accepts documentation updates and bug fixes
+  - Thoroughly tested before production deployment
+
+## Contributing Branches
+
+When contributing to Cherry Studio, please follow these guidelines:
+
+1. **Feature Branches:**
+
+   - Create from `main` branch
+   - Naming format: `feature/issue-number-brief-description`
+   - Submit PR back to `main`
+
+2. **Bug Fix Branches:**
+
+   - Create from `main` branch
+   - Naming format: `fix/issue-number-brief-description`
+   - Submit PR back to `main`
+
+3. **Documentation Branches:**
+
+   - Create from `main` branch
+   - Naming format: `docs/brief-description`
+   - Submit PR back to `main`
+
+4. **Hotfix Branches:**
+
+   - Create from `main` branch
+   - Naming format: `hotfix/issue-number-brief-description`
+   - Submit PR to both `main` and relevant `release` branches
+
+5. **Release Branches:**
+   - Create from `main` branch
+   - Naming format: `release/version-number`
+   - Used for final preparation work before version release
+   - Only accepts bug fixes and documentation updates
+   - After testing and preparation, merge back to `main` and tag with version
+
+## Workflow Diagram
+
+![](https://github.com/user-attachments/assets/61db64a2-fab1-4a16-8253-0c64c9df1a63)
+
+## Pull Request Guidelines
+
+- All PRs should be submitted to the `main` branch unless fixing a critical production issue
+- Ensure your branch is up to date with the latest `main` changes before submitting
+- Include relevant issue numbers in your PR description
+- Make sure all tests pass and code meets our quality standards
+- Add before/after screenshots if you add a new feature or modify a UI component
+
+## Version Tag Management
+
+- Major releases: v1.0.0, v2.0.0, etc.
+- Feature releases: v1.1.0, v1.2.0, etc.
+- Patch releases: v1.0.1, v1.0.2, etc.
+- Hotfix releases: v1.0.1-hotfix, etc.

docs/branching-strategy-zh.md

@@ -0,0 +1,71 @@
+# 🌿 分支策略
+
+Cherry Studio 采用结构化的分支策略来维护代码质量并简化开发流程。
+
+## 主要分支
+
+- `main`：主开发分支
+
+  - 包含最新的开发代码
+  - 禁止直接提交 - 所有更改必须通过拉取请求（Pull Request）
+  - 此分支上的代码可能包含正在开发的功能，不一定完全稳定
+
+- `release/*`：发布分支
+  - 从 `main` 分支创建
+  - 包含准备发布的稳定代码
+  - 只接受文档更新和 bug 修复
+  - 经过完整测试后可以发布到生产环境
+
+## 贡献分支
+
+在为 Cherry Studio 贡献代码时，请遵循以下准则：
+
+1. **功能开发分支：**
+
+   - 从 `main` 分支创建
+   - 命名格式：`feature/issue-number-brief-description`
+   - 完成后提交 PR 到 `main` 分支
+
+2. **Bug 修复分支：**
+
+   - 从 `main` 分支创建
+   - 命名格式：`fix/issue-number-brief-description`
+   - 完成后提交 PR 到 `main` 分支
+
+3. **文档更新分支：**
+
+   - 从 `main` 分支创建
+   - 命名格式：`docs/brief-description`
+   - 完成后提交 PR 到 `main` 分支
+
+4. **紧急修复分支：**
+
+   - 从 `main` 分支创建
+   - 命名格式：`hotfix/issue-number-brief-description`
+   - 完成后需要同时合并到 `main` 和相关的 `release` 分支
+
+5. **发布分支：**
+   - 从 `main` 分支创建
+   - 命名格式：`release/version-number`
+   - 用于版本发布前的最终准备工作
+   - 只允许合并 bug 修复和文档更新
+   - 完成测试和准备工作后，将代码合并回 `main` 分支并打上版本标签
+
+## 工作流程
+
+![](https://github.com/user-attachments/assets/61db64a2-fab1-4a16-8253-0c64c9df1a63)
+
+## 拉取请求（PR）指南
+
+- 除非是修复生产环境的关键问题，否则所有 PR 都应该提交到 `main` 分支
+- 提交 PR 前确保你的分支已经同步了最新的 `main` 分支内容
+- 在 PR 描述中包含相关的 issue 编号
+- 确保所有测试通过，且代码符合我们的质量标准
+- 如果你添加了新功能或修改了 UI 组件，请附上更改前后的截图
+
+## 版本标签管理
+
+- 主要版本发布：v1.0.0、v2.0.0 等
+- 功能更新发布：v1.1.0、v1.2.0 等
+- 补丁修复发布：v1.0.1、v1.0.2 等
+- 紧急修复发布：v1.0.1-hotfix 等

docs/branching-strategy.md

@@ -1,52 +0,0 @@
-# 🌿 Branching Strategy
-
-Cherry Studio follows a structured branching strategy to maintain code quality and streamline the development process:
-
-## Main Branches
-
-- `main`: Production-ready branch containing stable releases
-
-  - All code here is thoroughly tested and ready for production
-  - Direct commits are not allowed - changes must come through pull requests
-  - Each merge to main represents a new release
-
-- `develop` (default): Primary development branch
-  - Contains the latest delivered development changes for the next release
-  - Relatively stable but may contain features in progress
-  - This is the default branch for development
-
-## Contributing Branches
-
-When contributing to Cherry Studio, please follow these guidelines:
-
-1. **For bug fixes:**
-
-   - Create a branch from `develop`
-   - Name format: `fix/issue-number-brief-description`
-   - Submit pull request back to `develop`
-
-2. **For new features:**
-
-   - Create a branch from `develop`
-   - Name format: `feature/issue-number-brief-description`
-   - Submit pull request back to `develop`
-
-3. **For documentation:**
-
-   - Create a branch from `develop`
-   - Name format: `docs/brief-description`
-   - Submit pull request back to `develop`
-
-4. **For critical hotfixes:**
-   - Create a branch from `main`
-   - Name format: `hotfix/issue-number-brief-description`
-   - Submit pull request to both `main` and `develop`
-
-## Pull Request Guidelines
-
-- Always create pull requests against the `develop` branch unless fixing a critical production issue
-- Ensure your branch is up to date with the latest `develop` changes before submitting
-- Include relevant issue numbers in your PR description
-- Make sure all tests pass and code meets our quality standards
-- Critical hotfixes may be submitted against `main` but must also be merged into `develop`
-- Add a photo to show what is different if you add a new feature or modify a component in the UI.

docs/dev.md

@@ -37,6 +37,14 @@ yarn install
 yarn dev
 ```
 
+### Debug
+
+```bash
+yarn debug
+```
+
+Then input chrome://inspect in browser
+
 ### Test
 
 ```bash

electron-builder.yml

@@ -12,30 +12,43 @@ electronLanguages:
 directories:
   buildResources: build
 files:
-  - '!{.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}'
+  - '**/*'
+  - '!**/{.vscode,.yarn,.yarn-lock,.github,.cursorrules,.prettierrc}'
+  - '!electron.vite.config.{js,ts,mjs,cjs}}'
+  - '!**/{.eslintignore,.eslintrc.js,.eslintrc.json,.eslintcache,root.eslint.config.js,eslint.config.js,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,eslint.config.mjs,dev-app-update.yml,CHANGELOG.md,README.md}'
+  - '!**/{.env,.env.*,.npmrc,pnpm-lock.yaml}'
+  - '!**/{tsconfig.json,tsconfig.tsbuildinfo,tsconfig.node.json,tsconfig.web.json}'
+  - '!**/{.editorconfig,.jekyll-metadata}'
   - '!src'
   - '!scripts'
   - '!local'
   - '!docs'
   - '!packages'
+  - '!.swc'
+  - '!.bin'
+  - '!._*'
+  - '!*.log'
   - '!stats.html'
   - '!*.md'
+  - '!**/*.{iml,o,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,xproj}'
   - '!**/*.{map,ts,tsx,jsx,less,scss,sass,css.d.ts,d.cts,d.mts,md,markdown,yaml,yml}'
-  - '!**/{test,tests,__tests__,coverage}/**'
+  - '!**/{test,tests,__tests__,powered-test,coverage}/**'
+  - '!**/{example,examples}/**'
   - '!**/*.{spec,test}.{js,jsx,ts,tsx}'
   - '!**/*.min.*.map'
   - '!**/*.d.ts'
-  - '!**/{.DS_Store,Thumbs.db}'
-  - '!**/{LICENSE,LICENSE.txt,LICENSE-MIT.txt,*.LICENSE.txt,NOTICE.txt,README.md,CHANGELOG.md}'
+  - '!**/dist/es6/**'
+  - '!**/dist/demo/**'
+  - '!**/amd/**'
+  - '!**/{.DS_Store,Thumbs.db,thumbs.db,__pycache__}'
+  - '!**/{LICENSE,license,LICENSE.*,*.LICENSE.txt,NOTICE.txt,README.md,readme.md,CHANGELOG.md}'
   - '!node_modules/rollup-plugin-visualizer'
   - '!node_modules/js-tiktoken'
   - '!node_modules/@tavily/core/node_modules/js-tiktoken'
   - '!node_modules/pdf-parse/lib/pdf.js/{v1.9.426,v1.10.88,v2.0.550}'
   - '!node_modules/mammoth/{mammoth.browser.js,mammoth.browser.min.js}'
+  - '!node_modules/selection-hook/prebuilds/**/*' # we rebuild .node, don't use prebuilds
+  - '!**/*.{h,iobj,ipdb,tlog,recipe,vcxproj,vcxproj.filters}' # filter .node build files
 asarUnpack:
   - resources/**
   - '**/*.{metal,exp,lib}'
@@ -45,6 +58,9 @@ win:
   target:
     - target: nsis
     - target: portable
+  signtoolOptions:
+    sign: scripts/win-sign.js
+  verifyUpdateCodeSignature: false
 nsis:
   artifactName: ${productName}-${version}-${arch}-setup.${ext}
   shortcutName: ${productName}
@@ -61,6 +77,7 @@ mac:
   entitlementsInherit: build/entitlements.mac.plist
   notarize: false
   artifactName: ${productName}-${version}-${arch}.${ext}
+  minimumSystemVersion: '20.1.0' # 最低支持 macOS 11.0
   extendInfo:
     - NSCameraUsageDescription: Application requests access to the device's camera.
     - NSMicrophoneUsageDescription: Application requests access to the device's microphone.
@@ -90,10 +107,8 @@ afterSign: scripts/notarize.js
 artifactBuildCompleted: scripts/artifact-build-completed.js
 releaseInfo:
   releaseNotes: |
-    ⚠️ 注意：升级前请备份数据，否则将无法降级
-    重构消息结构，支持不同类型消息按时间顺序显示
-    智能体支持导入和导出
-    快捷面板增加网络搜索引擎选择
-    显示设置增加缩放控制按钮
-    支持添加自定义小程序
-    性能优化和错误修复
+    新增划词助手
+    助手支持分组
+    支持主题颜色切换
+    划词助手支持应用过滤
+    翻译模块功能改进

electron.vite.config.ts

@@ -9,25 +9,7 @@ const visualizerPlugin = (type: 'renderer' | 'main') => {
 
 export default defineConfig({
   main: {
-    plugins: [
-      externalizeDepsPlugin({
-        exclude: [
-          '@cherrystudio/embedjs',
-          '@cherrystudio/embedjs-openai',
-          '@cherrystudio/embedjs-loader-web',
-          '@cherrystudio/embedjs-loader-markdown',
-          '@cherrystudio/embedjs-loader-msoffice',
-          '@cherrystudio/embedjs-loader-xml',
-          '@cherrystudio/embedjs-loader-pdf',
-          '@cherrystudio/embedjs-loader-sitemap',
-          '@cherrystudio/embedjs-libsql',
-          '@cherrystudio/embedjs-loader-image',
-          'p-queue',
-          'webdav'
-        ]
-      }),
-      ...visualizerPlugin('main')
-    ],
+    plugins: [externalizeDepsPlugin(), ...visualizerPlugin('main')],
     resolve: {
       alias: {
         '@main': resolve('src/main'),
@@ -37,8 +19,12 @@ export default defineConfig({
     },
     build: {
       rollupOptions: {
-        external: ['@libsql/client']
-      }
+        external: ['@libsql/client', 'bufferutil', 'utf-8-validate']
+      },
+      sourcemap: process.env.NODE_ENV === 'development'
+    },
+    optimizeDeps: {
+      noDiscovery: process.env.NODE_ENV === 'development'
     }
   },
   preload: {
@@ -47,10 +33,14 @@ export default defineConfig({
       alias: {
         '@shared': resolve('packages/shared')
       }
+    },
+    build: {
+      sourcemap: process.env.NODE_ENV === 'development'
     }
   },
   renderer: {
     plugins: [
+      (async () => (await import('@tailwindcss/vite')).default())(),
       react({
         plugins: [
           [
@@ -73,13 +63,18 @@ export default defineConfig({
       }
     },
     optimizeDeps: {
-      exclude: []
+      exclude: ['pyodide']
+    },
+    worker: {
+      format: 'es'
     },
     build: {
       rollupOptions: {
         input: {
           index: resolve(__dirname, 'src/renderer/index.html'),
-          miniWindow: resolve(__dirname, 'src/renderer/miniWindow.html')
+          miniWindow: resolve(__dirname, 'src/renderer/miniWindow.html'),
+          selectionToolbar: resolve(__dirname, 'src/renderer/selectionToolbar.html'),
+          selectionAction: resolve(__dirname, 'src/renderer/selectionAction.html')
         }
       }
     }

eslint.config.mjs

@@ -62,7 +62,8 @@ export default defineConfig([
       '.yarn/**',
       '.gitignore',
       'scripts/cloudflare-worker.js',
-      'src/main/integration/nutstore/sso/lib/**'
+      'src/main/integration/nutstore/sso/lib/**',
+      'src/renderer/src/ui/**'
     ]
   }
 ])

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "1.3.5",
+  "version": "1.4.1",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",
@@ -20,8 +20,9 @@
   "scripts": {
     "start": "electron-vite preview",
     "dev": "electron-vite dev",
+    "debug": "electron-vite -- --inspect --sourcemap --remote-debugging-port=9222",
     "build": "npm run typecheck && electron-vite build",
-    "build:check": "yarn test && yarn typecheck && yarn check:i18n",
+    "build:check": "yarn typecheck && yarn check:i18n && yarn test",
     "build:unpack": "dotenv npm run build && electron-builder --dir",
     "build:win": "dotenv npm run build && electron-builder --win --x64 --arm64",
     "build:win:x64": "dotenv npm run build && electron-builder --win --x64",
@@ -37,23 +38,23 @@
     "publish": "yarn build:check && yarn release patch push",
     "pulish:artifacts": "cd packages/artifacts && npm publish && cd -",
     "generate:agents": "yarn workspace @cherry-studio/database agents",
-    "generate:icons": "electron-icon-builder --input=./build/logo.png --output=build",
     "analyze:renderer": "VISUALIZER_RENDERER=true yarn build",
     "analyze:main": "VISUALIZER_MAIN=true yarn build",
     "typecheck": "npm run typecheck:node && npm run typecheck:web",
     "typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
     "typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",
     "check:i18n": "node scripts/check-i18n.js",
-    "test": "yarn test:renderer",
-    "test:coverage": "yarn test:renderer:coverage",
-    "test:node": "npx -y tsx --test src/**/*.test.ts",
-    "test:renderer": "vitest run",
-    "test:renderer:ui": "vitest --ui",
-    "test:renderer:coverage": "vitest run --coverage",
+    "test": "vitest run --silent",
+    "test:main": "vitest run --project main",
+    "test:renderer": "vitest run --project renderer",
+    "test:update": "yarn test:renderer --update",
+    "test:coverage": "vitest run --coverage --silent",
+    "test:ui": "vitest --ui",
+    "test:watch": "vitest",
+    "test:e2e": "yarn playwright test",
     "test:lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts",
     "format": "prettier --write .",
     "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
-    "postinstall": "electron-builder install-app-deps",
     "prepare": "husky"
   },
   "dependencies": {
@@ -69,14 +70,12 @@
     "@cherrystudio/embedjs-loader-xml": "^0.1.31",
     "@cherrystudio/embedjs-openai": "^0.1.31",
     "@electron-toolkit/utils": "^3.0.0",
-    "@electron/notarize": "^2.5.0",
     "@langchain/community": "^0.3.36",
     "@strongtz/win32-arm64-msvc": "^0.4.7",
     "@tanstack/react-query": "^5.27.0",
     "@types/react-infinite-scroll-component": "^5.0.0",
     "archiver": "^7.0.1",
     "async-mutex": "^0.5.0",
-    "color": "^5.0.0",
     "diff": "^7.0.0",
     "docx": "^9.0.2",
     "electron-log": "^5.1.5",
@@ -85,22 +84,18 @@
     "electron-window-state": "^5.0.3",
     "epub": "patch:epub@npm%3A1.3.0#~/.yarn/patches/epub-npm-1.3.0-8325494ffe.patch",
     "fast-xml-parser": "^5.2.0",
-    "fetch-socks": "^1.3.2",
+    "franc-min": "^6.2.0",
     "fs-extra": "^11.2.0",
-    "got-scraping": "^4.1.1",
     "jsdom": "^26.0.0",
     "markdown-it": "^14.1.0",
     "node-stream-zip": "^1.15.0",
     "officeparser": "^4.1.1",
     "os-proxy-config": "^1.1.2",
     "proxy-agent": "^6.5.0",
-    "rc-virtual-list": "^3.18.6",
-    "react-window": "^1.8.11",
+    "selection-hook": "^0.9.22",
     "tar": "^7.4.3",
     "turndown": "^7.2.0",
-    "turndown-plugin-gfm": "^1.0.2",
     "webdav": "^5.8.0",
-    "ws": "^8.18.1",
     "zipread": "^1.3.3"
   },
   "devDependencies": {
@@ -113,22 +108,33 @@
     "@electron-toolkit/eslint-config-ts": "^3.0.0",
     "@electron-toolkit/preload": "^3.0.0",
     "@electron-toolkit/tsconfig": "^1.0.1",
+    "@electron/notarize": "^2.5.0",
     "@emotion/is-prop-valid": "^1.3.1",
     "@eslint-react/eslint-plugin": "^1.36.1",
     "@eslint/js": "^9.22.0",
-    "@google/genai": "^0.13.0",
+    "@google/genai": "^1.0.1",
     "@hello-pangea/dnd": "^16.6.0",
-    "@iconify-json/svg-spinners": "^1.2.2",
     "@kangfenmao/keyv-storage": "^0.1.0",
-    "@modelcontextprotocol/sdk": "^1.10.2",
+    "@modelcontextprotocol/sdk": "^1.11.4",
     "@mozilla/readability": "^0.6.0",
     "@notionhq/client": "^2.2.15",
+    "@playwright/test": "^1.52.0",
+    "@radix-ui/react-collapsible": "^1.1.10",
+    "@radix-ui/react-dialog": "^1.1.13",
+    "@radix-ui/react-dropdown-menu": "^2.1.14",
+    "@radix-ui/react-separator": "^1.1.6",
+    "@radix-ui/react-slot": "^1.2.2",
+    "@radix-ui/react-tabs": "^1.1.11",
+    "@radix-ui/react-tooltip": "^1.2.6",
     "@reduxjs/toolkit": "^2.2.5",
-    "@shikijs/markdown-it": "^3.2.2",
-    "@swc/plugin-styled-components": "^7.1.3",
+    "@shikijs/markdown-it": "^3.4.2",
+    "@swc/plugin-styled-components": "^7.1.5",
+    "@tailwindcss/vite": "^4.1.5",
     "@tavily/core": "patch:@tavily/core@npm%3A0.3.1#~/.yarn/patches/@tavily-core-npm-0.3.1-fe69bf2bea.patch",
+    "@testing-library/dom": "^10.4.0",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^16.3.0",
     "@tryfabric/martian": "^1.2.4",
-    "@types/adm-zip": "^0",
     "@types/diff": "^7",
     "@types/fs-extra": "^11",
     "@types/lodash": "^4.17.5",
@@ -141,44 +147,55 @@
     "@types/react-infinite-scroll-component": "^5.0.0",
     "@types/react-window": "^1",
     "@types/tinycolor2": "^1",
-    "@types/ws": "^8",
+    "@uiw/codemirror-extensions-langs": "^4.23.12",
+    "@uiw/codemirror-themes-all": "^4.23.12",
+    "@uiw/react-codemirror": "^4.23.12",
     "@vitejs/plugin-react-swc": "^3.9.0",
-    "@vitest/coverage-v8": "^3.1.1",
-    "@vitest/ui": "^3.1.1",
+    "@vitest/browser": "^3.1.4",
+    "@vitest/coverage-v8": "^3.1.4",
+    "@vitest/ui": "^3.1.4",
+    "@vitest/web-worker": "^3.1.4",
     "@xyflow/react": "^12.4.4",
     "antd": "^5.22.5",
-    "applescript": "^1.0.0",
     "axios": "^1.7.3",
-    "babel-plugin-styled-components": "^2.1.4",
     "browser-image-compression": "^2.0.2",
+    "class-variance-authority": "^0.7.1",
+    "clsx": "^2.1.1",
+    "color": "^5.0.0",
     "dayjs": "^1.11.11",
     "dexie": "^4.0.8",
     "dexie-react-hooks": "^1.1.7",
     "dotenv-cli": "^7.4.2",
-    "electron": "31.7.6",
+    "electron": "35.4.0",
     "electron-builder": "26.0.15",
     "electron-devtools-installer": "^3.2.0",
-    "electron-icon-builder": "^2.0.1",
-    "electron-vite": "^2.3.0",
+    "electron-vite": "^3.1.0",
     "emittery": "^1.0.3",
     "emoji-picker-element": "^1.22.1",
     "eslint": "^9.22.0",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-unused-imports": "^4.1.4",
+    "fast-diff": "^1.3.0",
     "html-to-image": "^1.11.13",
     "husky": "^9.1.7",
     "i18next": "^23.11.5",
+    "jest-styled-components": "^7.2.0",
     "lint-staged": "^15.5.0",
     "lodash": "^4.17.21",
     "lru-cache": "^11.1.0",
-    "lucide-react": "^0.487.0",
+    "lucide-react": "^0.511.0",
+    "mermaid": "^11.6.0",
     "mime": "^4.0.4",
-    "motion": "^12.10.5",
+    "motion": "^12.12.1",
+    "next-themes": "^0.4.6",
     "npx-scope-finder": "^1.2.0",
-    "openai": "patch:openai@npm%3A4.96.0#~/.yarn/patches/openai-npm-4.96.0-0665b05cb9.patch",
+    "openai": "patch:openai@npm%3A5.1.0#~/.yarn/patches/openai-npm-5.1.0-0e7b3ccb07.patch",
     "p-queue": "^8.1.0",
+    "playwright": "^1.52.0",
     "prettier": "^3.5.3",
+    "prettier-plugin-tailwindcss": "^0.6.11",
+    "rc-virtual-list": "^3.18.6",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "react-hotkeys-hook": "^4.6.1",
@@ -189,6 +206,7 @@
     "react-router": "6",
     "react-router-dom": "6",
     "react-spinners": "^0.14.1",
+    "react-window": "^1.8.11",
     "redux": "^5.0.1",
     "redux-persist": "^6.0.0",
     "rehype-katex": "^7.0.1",
@@ -198,31 +216,35 @@
     "remark-gfm": "^4.0.0",
     "remark-math": "^6.0.0",
     "rollup-plugin-visualizer": "^5.12.0",
-    "sass": "^1.77.2",
-    "shiki": "^3.2.2",
+    "sass": "^1.88.0",
+    "shiki": "^3.4.2",
+    "sonner": "^2.0.3",
     "string-width": "^7.2.0",
     "styled-components": "^6.1.11",
+    "tailwind-merge": "^3.2.0",
+    "tailwindcss": "^4.1.5",
     "tiny-pinyin": "^1.3.2",
-    "tinycolor2": "^1.6.0",
     "tokenx": "^0.4.1",
+    "tw-animate-css": "^1.2.9",
     "typescript": "^5.6.2",
+    "usehooks-ts": "^3.1.1",
     "uuid": "^10.0.0",
     "vite": "6.2.6",
-    "vitest": "^3.1.1"
+    "vitest": "^3.1.4"
   },
   "resolutions": {
     "pdf-parse@npm:1.1.1": "patch:pdf-parse@npm%3A1.1.1#~/.yarn/patches/pdf-parse-npm-1.1.1-04a6109b2a.patch",
     "@langchain/openai@npm:^0.3.16": "patch:@langchain/openai@npm%3A0.3.16#~/.yarn/patches/@langchain-openai-npm-0.3.16-e525b59526.patch",
     "@langchain/openai@npm:>=0.1.0 <0.4.0": "patch:@langchain/openai@npm%3A0.3.16#~/.yarn/patches/@langchain-openai-npm-0.3.16-e525b59526.patch",
-    "node-gyp": "^9.1.0",
     "libsql@npm:^0.4.4": "patch:libsql@npm%3A0.4.7#~/.yarn/patches/libsql-npm-0.4.7-444e260fb1.patch",
-    "openai@npm:^4.77.0": "patch:openai@npm%3A4.96.0#~/.yarn/patches/openai-npm-4.96.0-0665b05cb9.patch",
+    "openai@npm:^4.77.0": "patch:openai@npm%3A5.1.0#~/.yarn/patches/openai-npm-5.1.0-0e7b3ccb07.patch",
     "pkce-challenge@npm:^4.1.0": "patch:pkce-challenge@npm%3A4.1.0#~/.yarn/patches/pkce-challenge-npm-4.1.0-fbc51695a3.patch",
     "app-builder-lib@npm:26.0.13": "patch:app-builder-lib@npm%3A26.0.13#~/.yarn/patches/app-builder-lib-npm-26.0.13-a064c9e1d0.patch",
-    "shiki": "3.2.2",
-    "openai@npm:^4.87.3": "patch:openai@npm%3A4.96.0#~/.yarn/patches/openai-npm-4.96.0-0665b05cb9.patch"
+    "openai@npm:^4.87.3": "patch:openai@npm%3A5.1.0#~/.yarn/patches/openai-npm-5.1.0-0e7b3ccb07.patch",
+    "app-builder-lib@npm:26.0.15": "patch:app-builder-lib@npm%3A26.0.15#~/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch",
+    "@langchain/core@npm:^0.3.26": "patch:@langchain/core@npm%3A0.3.44#~/.yarn/patches/@langchain-core-npm-0.3.44-41d5c3cb0a.patch"
   },
-  "packageManager": "yarn@4.6.0",
+  "packageManager": "yarn@4.9.1",
   "lint-staged": {
     "*.{js,jsx,ts,tsx,cjs,mjs,cts,mts}": [
       "prettier --write",

packages/shared/IpcChannel.ts

@@ -11,9 +11,9 @@ export enum IpcChannel {
   App_SetLaunchToTray = 'app:set-launch-to-tray',
   App_SetTray = 'app:set-tray',
   App_SetTrayOnClose = 'app:set-tray-on-close',
-  App_RestartTray = 'app:restart-tray',
   App_SetTheme = 'app:set-theme',
   App_SetAutoUpdate = 'app:set-auto-update',
+  App_SetFeedUrl = 'app:set-feed-url',
   App_HandleZoomFactor = 'app:handle-zoom-factor',
 
   App_IsBinaryExist = 'app:is-binary-exist',
@@ -21,6 +21,11 @@ export enum IpcChannel {
   App_InstallUvBinary = 'app:install-uv-binary',
   App_InstallBunBinary = 'app:install-bun-binary',
 
+  App_QuoteToMain = 'app:quote-to-main',
+
+  Notification_Send = 'notification:send',
+  Notification_OnClick = 'notification:on-click',
+
   Webview_SetOpenLinkExternal = 'webview:set-open-link-external',
 
   // Open
@@ -52,6 +57,7 @@ export enum IpcChannel {
   Mcp_GetInstallInfo = 'mcp:get-install-info',
   Mcp_ServersChanged = 'mcp:servers-changed',
   Mcp_ServersUpdated = 'mcp:servers-updated',
+  Mcp_CheckConnectivity = 'mcp:check-connectivity',
 
   //copilot
   Copilot_GetAuthMessage = 'copilot:get-auth-message',
@@ -107,6 +113,7 @@ export enum IpcChannel {
   File_WriteWithId = 'file:writeWithId',
   File_SaveImage = 'file:saveImage',
   File_Base64Image = 'file:base64Image',
+  File_SaveBase64Image = 'file:saveBase64Image',
   File_Download = 'file:download',
   File_Copy = 'file:copy',
   File_BinaryImage = 'file:binaryImage',
@@ -140,7 +147,7 @@ export enum IpcChannel {
 
   // events
   BackupProgress = 'backup-progress',
-  ThemeChange = 'theme:change',
+  ThemeUpdated = 'theme:updated',
   UpdateDownloadedCancelled = 'update-downloaded-cancelled',
   RestoreProgress = 'restore-progress',
   UpdateError = 'update-error',
@@ -169,5 +176,26 @@ export enum IpcChannel {
   StoreSync_Subscribe = 'store-sync:subscribe',
   StoreSync_Unsubscribe = 'store-sync:unsubscribe',
   StoreSync_OnUpdate = 'store-sync:on-update',
-  StoreSync_BroadcastSync = 'store-sync:broadcast-sync'
+  StoreSync_BroadcastSync = 'store-sync:broadcast-sync',
+
+  // Provider
+  Provider_AddKey = 'provider:add-key',
+
+  //Selection Assistant
+  Selection_TextSelected = 'selection:text-selected',
+  Selection_ToolbarHide = 'selection:toolbar-hide',
+  Selection_ToolbarVisibilityChange = 'selection:toolbar-visibility-change',
+  Selection_ToolbarDetermineSize = 'selection:toolbar-determine-size',
+  Selection_WriteToClipboard = 'selection:write-to-clipboard',
+  Selection_SetEnabled = 'selection:set-enabled',
+  Selection_SetTriggerMode = 'selection:set-trigger-mode',
+  Selection_SetFilterMode = 'selection:set-filter-mode',
+  Selection_SetFilterList = 'selection:set-filter-list',
+  Selection_SetFollowToolbar = 'selection:set-follow-toolbar',
+  Selection_SetRemeberWinSize = 'selection:set-remeber-win-size',
+  Selection_ActionWindowClose = 'selection:action-window-close',
+  Selection_ActionWindowMinimize = 'selection:action-window-minimize',
+  Selection_ActionWindowPin = 'selection:action-window-pin',
+  Selection_ProcessAction = 'selection:process-action',
+  Selection_UpdateActionData = 'selection:update-action-data'
 }

packages/shared/config/constant.ts

@@ -4,135 +4,368 @@ export const audioExts = ['.mp3', '.wav', '.ogg', '.flac', '.aac']
 export const documentExts = ['.pdf', '.docx', '.pptx', '.xlsx', '.odt', '.odp', '.ods']
 export const thirdPartyApplicationExts = ['.draftsExport']
 export const bookExts = ['.epub']
-export const textExts = [
-  '.txt', // 普通文本文件
-  '.md', // Markdown 文件
-  '.mdx', // Markdown 文件
-  '.html', // HTML 文件
-  '.htm', // HTML 文件的另一种扩展名
-  '.xml', // XML 文件
-  '.json', // JSON 文件
-  '.yaml', // YAML 文件
-  '.yml', // YAML 文件的另一种扩展名
-  '.csv', // 逗号分隔值文件
-  '.tsv', // 制表符分隔值文件
-  '.ini', // 配置文件
-  '.log', // 日志文件
-  '.rtf', // 富文本格式文件
-  '.org', // org-mode 文件
-  '.wiki', // VimWiki 文件
-  '.tex', // LaTeX 文件
-  '.bib', // BibTeX 文件
-  '.srt', // 字幕文件
-  '.xhtml', // XHTML 文件
-  '.nfo', // 信息文件（主要用于场景发布）
-  '.conf', // 配置文件
-  '.config', // 配置文件
-  '.env', // 环境变量文件
-  '.rst', // reStructuredText 文件
-  '.php', // PHP 脚本文件，包含嵌入的 HTML
-  '.js', // JavaScript 文件（部分是文本，部分可能包含代码）
-  '.ts', // TypeScript 文件
-  '.jsp', // JavaServer Pages 文件
-  '.aspx', // ASP.NET 文件
-  '.bat', // Windows 批处理文件
-  '.sh', // Unix/Linux Shell 脚本文件
-  '.py', // Python 脚本文件
-  '.ipynb', // Jupyter 笔记本格式
-  '.rb', // Ruby 脚本文件
-  '.pl', // Perl 脚本文件
-  '.sql', // SQL 脚本文件
-  '.css', // Cascading Style Sheets 文件
-  '.less', // Less CSS 预处理器文件
-  '.scss', // Sass CSS 预处理器文件
-  '.sass', // Sass 文件
-  '.styl', // Stylus CSS 预处理器文件
-  '.coffee', // CoffeeScript 文件
-  '.ino', // Arduino 代码文件
-  '.asm', // Assembly 语言文件
-  '.go', // Go 语言文件
-  '.scala', // Scala 语言文件
-  '.swift', // Swift 语言文件
-  '.kt', // Kotlin 语言文件
-  '.rs', // Rust 语言文件
-  '.lua', // Lua 语言文件
-  '.groovy', // Groovy 语言文件
-  '.dart', // Dart 语言文件
-  '.hs', // Haskell 语言文件
-  '.clj', // Clojure 语言文件
-  '.cljs', // ClojureScript 语言文件
-  '.elm', // Elm 语言文件
-  '.erl', // Erlang 语言文件
-  '.ex', // Elixir 语言文件
-  '.exs', // Elixir 脚本文件
-  '.pug', // Pug (formerly Jade) 模板文件
-  '.haml', // Haml 模板文件
-  '.slim', // Slim 模板文件
-  '.tpl', // 模板文件（通用）
-  '.ejs', // Embedded JavaScript 模板文件
-  '.hbs', // Handlebars 模板文件
-  '.mustache', // Mustache 模板文件
-  '.jade', // Jade 模板文件 (已重命名为 Pug)
-  '.twig', // Twig 模板文件
-  '.blade', // Blade 模板文件 (Laravel)
-  '.vue', // Vue.js 单文件组件
-  '.jsx', // React JSX 文件
-  '.tsx', // React TSX 文件
-  '.graphql', // GraphQL 查询语言文件
-  '.gql', // GraphQL 查询语言文件
-  '.proto', // Protocol Buffers 文件
-  '.thrift', // Thrift 文件
-  '.toml', // TOML 配置文件
-  '.edn', // Clojure 数据表示文件
-  '.cake', // CakePHP 配置文件
-  '.ctp', // CakePHP 视图文件
-  '.cfm', // ColdFusion 标记语言文件
-  '.cfc', // ColdFusion 组件文件
-  '.m', // Objective-C 或 MATLAB 源文件
-  '.mm', // Objective-C++ 源文件
-  '.gradle', // Gradle 构建文件
-  '.groovy', // Gradle 构建文件
-  '.kts', // Kotlin Script 文件
-  '.java', // Java 代码文件
-  '.cs', // C# 代码文件
-  '.cpp', // C++ 代码文件
-  '.c', // C++ 代码文件
-  '.h', // C++ 头文件
-  '.hpp', // C++ 头文件
-  '.cc', // C++ 源文件
-  '.cxx', // C++ 源文件
-  '.cppm', // C++20 模块接口文件
-  '.ipp', // 模板实现文件
-  '.ixx', // C++20 模块实现文件
-  '.f90', // Fortran 90 源文件
-  '.f', // Fortran 固定格式源代码文件
-  '.f03', // Fortran 2003+ 源代码文件
-  '.ahk', // AutoHotKey 语言文件
-  '.tcl', // Tcl 脚本
-  '.do', // Questa 或 Modelsim Tcl 脚本
-  '.v', // Verilog 源文件
-  '.sv', // SystemVerilog 源文件
-  '.svh', // SystemVerilog 头文件
-  '.vhd', // VHDL 源文件
-  '.vhdl', // VHDL 源文件
-  '.lef', // Library Exchange Format
-  '.def', // Design Exchange Format
-  '.edif', // Electronic Design Interchange Format
-  '.sdf', // Standard Delay Format
-  '.sdc', // Synopsys Design Constraints
-  '.xdc', // Xilinx Design Constraints
-  '.rpt', // 报告文件
-  '.lisp', // Lisp 脚本
-  '.il', // Cadence SKILL 脚本
-  '.ils', // Cadence SKILL++ 脚本
-  '.sp', // SPICE netlist 文件
-  '.spi', // SPICE netlist 文件
-  '.cir', // SPICE netlist 文件
-  '.net', // SPICE netlist 文件
-  '.scs', // Spectre netlist 文件
-  '.asc', // LTspice netlist schematic 文件
-  '.tf' // Technology File
-]
+const textExtsByCategory = new Map([
+  [
+    'language',
+    [
+      '.js',
+      '.mjs',
+      '.cjs',
+      '.ts',
+      '.jsx',
+      '.tsx', // JavaScript/TypeScript
+      '.py', // Python
+      '.java', // Java
+      '.cs', // C#
+      '.cpp',
+      '.c',
+      '.h',
+      '.hpp',
+      '.cc',
+      '.cxx',
+      '.cppm',
+      '.ipp',
+      '.ixx', // C/C++
+      '.php', // PHP
+      '.rb', // Ruby
+      '.pl', // Perl
+      '.go', // Go
+      '.rs', // Rust
+      '.swift', // Swift
+      '.kt',
+      '.kts', // Kotlin
+      '.scala', // Scala
+      '.lua', // Lua
+      '.groovy', // Groovy
+      '.dart', // Dart
+      '.hs', // Haskell
+      '.clj',
+      '.cljs', // Clojure
+      '.elm', // Elm
+      '.erl', // Erlang
+      '.ex',
+      '.exs', // Elixir
+      '.ml',
+      '.mli', // OCaml
+      '.fs', // F#
+      '.r',
+      '.R', // R
+      '.sol', // Solidity
+      '.awk', // AWK
+      '.cob', // COBOL
+      '.asm',
+      '.s', // Assembly
+      '.lisp',
+      '.lsp', // Lisp
+      '.coffee', // CoffeeScript
+      '.ino', // Arduino
+      '.jl', // Julia
+      '.nim', // Nim
+      '.zig', // Zig
+      '.d', // D语言
+      '.pas', // Pascal
+      '.vb', // Visual Basic
+      '.rkt', // Racket
+      '.scm', // Scheme
+      '.hx', // Haxe
+      '.as', // ActionScript
+      '.pde', // Processing
+      '.f90',
+      '.f',
+      '.f03',
+      '.for',
+      '.f95', // Fortran
+      '.adb',
+      '.ads', // Ada
+      '.pro', // Prolog
+      '.m',
+      '.mm', // Objective-C/MATLAB
+      '.rpy', // Ren'Py
+      '.ets', // OpenHarmony,
+      '.uniswap', // DeFi
+      '.vy', // Vyper
+      '.shader',
+      '.glsl',
+      '.frag',
+      '.vert',
+      '.gd' // Godot
+    ]
+  ],
+  [
+    'script',
+    [
+      '.sh', // Shell
+      '.bat',
+      '.cmd', // Windows批处理
+      '.ps1', // PowerShell
+      '.tcl',
+      '.do', // Tcl
+      '.ahk', // AutoHotkey
+      '.zsh', // Zsh
+      '.fish', // Fish shell
+      '.csh', // C shell
+      '.vbs', // VBScript
+      '.applescript', // AppleScript
+      '.au3', // AutoIt
+      '.bash',
+      '.nu'
+    ]
+  ],
+  [
+    'style',
+    [
+      '.css', // CSS
+      '.less', // Less
+      '.scss',
+      '.sass', // Sass
+      '.styl', // Stylus
+      '.pcss', // PostCSS
+      '.postcss' // PostCSS
+    ]
+  ],
+  [
+    'template',
+    [
+      '.vue', // Vue.js
+      '.pug',
+      '.jade', // Pug/Jade
+      '.haml', // Haml
+      '.slim', // Slim
+      '.tpl', // 通用模板
+      '.ejs', // EJS
+      '.hbs', // Handlebars
+      '.mustache', // Mustache
+      '.twig', // Twig
+      '.blade', // Blade (Laravel)
+      '.liquid', // Liquid
+      '.jinja',
+      '.jinja2',
+      '.j2', // Jinja
+      '.erb', // ERB
+      '.vm', // Velocity
+      '.ftl', // FreeMarker
+      '.svelte', // Svelte
+      '.astro' // Astro
+    ]
+  ],
+  [
+    'config',
+    [
+      '.ini', // INI配置
+      '.conf',
+      '.config', // 通用配置
+      '.env', // 环境变量
+      '.toml', // TOML
+      '.cfg', // 通用配置
+      '.properties', // Java属性
+      '.desktop', // Linux桌面文件
+      '.service', // systemd服务
+      '.rc',
+      '.bashrc',
+      '.zshrc', // Shell配置
+      '.fishrc', // Fish shell配置
+      '.vimrc', // Vim配置
+      '.htaccess', // Apache配置
+      '.robots', // robots.txt
+      '.editorconfig', // EditorConfig
+      '.eslintrc', // ESLint
+      '.prettierrc', // Prettier
+      '.babelrc', // Babel
+      '.npmrc', // npm
+      '.dockerignore', // Docker ignore
+      '.npmignore',
+      '.yarnrc',
+      '.prettierignore',
+      '.eslintignore',
+      '.browserslistrc',
+      '.json5',
+      '.tfvars'
+    ]
+  ],
+  [
+    'document',
+    [
+      '.txt',
+      '.text', // 纯文本
+      '.md',
+      '.mdx', // Markdown
+      '.html',
+      '.htm',
+      '.xhtml', // HTML
+      '.xml', // XML
+      '.org', // Org-mode
+      '.wiki', // Wiki
+      '.tex',
+      '.bib', // LaTeX
+      '.rst', // reStructuredText
+      '.rtf', // 富文本
+      '.nfo', // 信息文件
+      '.adoc',
+      '.asciidoc', // AsciiDoc
+      '.pod', // Perl文档
+      '.1',
+      '.2',
+      '.3',
+      '.4',
+      '.5',
+      '.6',
+      '.7',
+      '.8',
+      '.9', // man页面
+      '.man', // man页面
+      '.texi',
+      '.texinfo', // Texinfo
+      '.readme',
+      '.me', // README
+      '.changelog', // 变更日志
+      '.license', // 许可证
+      '.authors', // 作者文件
+      '.po',
+      '.pot'
+    ]
+  ],
+  [
+    'data',
+    [
+      '.json', // JSON
+      '.jsonc', // JSON with comments
+      '.yaml',
+      '.yml', // YAML
+      '.csv',
+      '.tsv', // 分隔值文件
+      '.edn', // Clojure数据
+      '.jsonl',
+      '.ndjson', // 换行分隔JSON
+      '.geojson', // GeoJSON
+      '.gpx', // GPS Exchange
+      '.kml', // Keyhole Markup
+      '.rss',
+      '.atom', // Feed格式
+      '.vcf', // vCard
+      '.ics', // iCalendar
+      '.ldif', // LDAP数据交换
+      '.pbtxt',
+      '.map'
+    ]
+  ],
+  [
+    'build',
+    [
+      '.gradle', // Gradle
+      '.make',
+      '.mk', // Make
+      '.cmake', // CMake
+      '.sbt', // SBT
+      '.rake', // Rake
+      '.spec', // RPM spec
+      '.pom',
+      '.build', // Meson
+      '.bazel' // Bazel
+    ]
+  ],
+  [
+    'database',
+    [
+      '.sql', // SQL
+      '.ddl',
+      '.dml', // DDL/DML
+      '.plsql', // PL/SQL
+      '.psql', // PostgreSQL
+      '.cypher', // Cypher
+      '.sparql' // SPARQL
+    ]
+  ],
+  [
+    'web',
+    [
+      '.graphql',
+      '.gql', // GraphQL
+      '.proto', // Protocol Buffers
+      '.thrift', // Thrift
+      '.wsdl', // WSDL
+      '.raml', // RAML
+      '.swagger',
+      '.openapi' // API文档
+    ]
+  ],
+  [
+    'version',
+    [
+      '.gitignore', // Git ignore
+      '.gitattributes', // Git attributes
+      '.gitconfig', // Git config
+      '.hgignore', // Mercurial ignore
+      '.bzrignore', // Bazaar ignore
+      '.svnignore', // SVN ignore
+      '.githistory' // Git history
+    ]
+  ],
+  [
+    'subtitle',
+    [
+      '.srt',
+      '.sub',
+      '.ass' // 字幕格式
+    ]
+  ],
+  [
+    'log',
+    [
+      '.log',
+      '.rpt' // 日志和报告 (移除了.out，因为通常是二进制可执行文件)
+    ]
+  ],
+  [
+    'eda',
+    [
+      '.v',
+      '.sv',
+      '.svh', // Verilog/SystemVerilog
+      '.vhd',
+      '.vhdl', // VHDL
+      '.lef',
+      '.def', // LEF/DEF
+      '.edif', // EDIF
+      '.sdf', // SDF
+      '.sdc',
+      '.xdc', // 约束文件
+      '.sp',
+      '.spi',
+      '.cir',
+      '.net', // SPICE
+      '.scs', // Spectre
+      '.asc', // LTspice
+      '.tf', // Technology File
+      '.il',
+      '.ils' // SKILL
+    ]
+  ],
+  [
+    'game',
+    [
+      '.mtl', // Material Template Library
+      '.x3d', // X3D文件
+      '.gltf', // glTF JSON
+      '.prefab', // Unity预制体 (YAML格式)
+      '.meta' // Unity元数据文件 (YAML格式)
+    ]
+  ],
+  [
+    'other',
+    [
+      '.mcfunction', // Minecraft函数
+      '.jsp', // JSP
+      '.aspx', // ASP.NET
+      '.ipynb', // Jupyter Notebook
+      '.cake',
+      '.ctp', // CakePHP
+      '.cfm',
+      '.cfc' // ColdFusion
+    ]
+  ]
+])
+
+export const textExts = Array.from(textExtsByCategory.values()).flat()
 
 export const ZOOM_LEVELS = [0.25, 0.33, 0.5, 0.67, 0.75, 0.8, 0.9, 1, 1.1, 1.25, 1.5, 1.75, 2, 2.5, 3, 4, 5]
 
@@ -170,3 +403,8 @@ export const KB = 1024
 export const MB = 1024 * KB
 export const GB = 1024 * MB
 export const defaultLanguage = 'en-US'
+
+export enum FeedUrl {
+  PRODUCTION = 'https://releases.cherry-ai.com',
+  EARLY_ACCESS = 'https://github.com/CherryHQ/cherry-studio/releases/latest/download'
+}

playwright.config.ts

@@ -0,0 +1,42 @@
+import { defineConfig, devices } from '@playwright/test'
+
+/**
+ * See https://playwright.dev/docs/test-configuration.
+ */
+export default defineConfig({
+  // Look for test files, relative to this configuration file.
+  testDir: './tests/e2e',
+  /* Run tests in files in parallel */
+  fullyParallel: true,
+  /* Fail the build on CI if you accidentally left test.only in the source code. */
+  forbidOnly: !!process.env.CI,
+  /* Retry on CI only */
+  retries: process.env.CI ? 2 : 0,
+  /* Opt out of parallel tests on CI. */
+  workers: process.env.CI ? 1 : undefined,
+  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+  reporter: 'html',
+  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+  use: {
+    /* Base URL to use in actions like `await page.goto('/')`. */
+    // baseURL: 'http://localhost:3000',
+
+    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+    trace: 'on-first-retry'
+  },
+
+  /* Configure projects for major browsers */
+  projects: [
+    {
+      name: 'chromium',
+      use: { ...devices['Desktop Chrome'] }
+    }
+  ]
+
+  /* Run your local dev server before starting the tests */
+  // webServer: {
+  //   command: 'npm run start',
+  //   url: 'http://localhost:3000',
+  //   reuseExistingServer: !process.env.CI,
+  // },
+})

resources/scripts/install-bun.js

@@ -15,6 +15,8 @@ const BUN_PACKAGES = {
   'darwin-x64': 'bun-darwin-x64.zip',
   'win32-x64': 'bun-windows-x64.zip',
   'win32-x64-baseline': 'bun-windows-x64-baseline.zip',
+  'win32-arm64': 'bun-windows-x64.zip',
+  'win32-arm64-baseline': 'bun-windows-x64-baseline.zip',
   'linux-x64': 'bun-linux-x64.zip',
   'linux-x64-baseline': 'bun-linux-x64-baseline.zip',
   'linux-arm64': 'bun-linux-aarch64.zip',

scripts/win-sign.js

@@ -0,0 +1,19 @@
+const { execSync } = require('child_process')
+
+exports.default = async function (configuration) {
+  if (process.env.WIN_SIGN) {
+    const { path } = configuration
+    if (configuration.path) {
+      try {
+        console.log('Start code signing...')
+        console.log('Signing file:', path)
+        const signCommand = `signtool sign /tr http://timestamp.comodoca.com /td sha256 /fd sha256 /a /v "${path}"`
+        execSync(signCommand, { stdio: 'inherit' })
+        console.log('Code signing completed')
+      } catch (error) {
+        console.error('Code signing failed:', error)
+        throw error
+      }
+    }
+  }
+}

src/main/config.ts

@@ -11,13 +11,13 @@ if (isDev) {
 export const DATA_PATH = getDataPath()
 
 export const titleBarOverlayDark = {
-  height: 40,
+  height: 42,
   color: 'rgba(255,255,255,0)',
   symbolColor: '#fff'
 }
 
 export const titleBarOverlayLight = {
-  height: 40,
+  height: 42,
   color: 'rgba(255,255,255,0)',
   symbolColor: '#000'
 }

src/main/configs/SelectionConfig.ts

@@ -0,0 +1,58 @@
+interface IFilterList {
+  WINDOWS: string[]
+  MAC?: string[]
+}
+
+interface IFinetunedList {
+  EXCLUDE_CLIPBOARD_CURSOR_DETECT: IFilterList
+  INCLUDE_CLIPBOARD_DELAY_READ: IFilterList
+}
+
+/*************************************************************************
+ * 注意：请不要修改此配置，除非你非常清楚其含义、影响和行为的目的
+ * Note: Do not modify this configuration unless you fully understand its meaning, implications, and intended behavior.
+ * -----------------------------------------------------------------------
+ * A predefined application filter list to include commonly used software
+ * that does not require text selection but may conflict with it, and disable them in advance.
+ * Only available in the selected mode.
+ *
+ * Specification: must be all lowercase, need to accurately find the actual running program name
+ *************************************************************************/
+export const SELECTION_PREDEFINED_BLACKLIST: IFilterList = {
+  WINDOWS: [
+    'explorer.exe',
+    // Screenshot
+    'snipaste.exe',
+    'pixpin.exe',
+    'sharex.exe',
+    // Office
+    'excel.exe',
+    'powerpnt.exe',
+    // Image Editor
+    'photoshop.exe',
+    'illustrator.exe',
+    // Video Editor
+    'adobe premiere pro.exe',
+    'afterfx.exe',
+    // Audio Editor
+    'adobe audition.exe',
+    // 3D Editor
+    'blender.exe',
+    '3dsmax.exe',
+    'maya.exe',
+    // CAD
+    'acad.exe',
+    'sldworks.exe',
+    // Remote Desktop
+    'mstsc.exe'
+  ]
+}
+
+export const SELECTION_FINETUNED_LIST: IFinetunedList = {
+  EXCLUDE_CLIPBOARD_CURSOR_DETECT: {
+    WINDOWS: ['acrobat.exe', 'wps.exe', 'cajviewer.exe']
+  },
+  INCLUDE_CLIPBOARD_DELAY_READ: {
+    WINDOWS: ['acrobat.exe', 'wps.exe', 'cajviewer.exe', 'foxitphantom.exe']
+  }
+}

src/main/embeddings/EmbeddingsFactory.ts

@@ -23,14 +23,14 @@ export default class EmbeddingsFactory {
         azureOpenAIApiVersion: apiVersion,
         azureOpenAIApiDeploymentName: model,
         azureOpenAIApiInstanceName: getInstanceName(baseURL),
-        // dimensions,
+        dimensions,
         batchSize
       })
     }
     return new OpenAiEmbeddings({
       model,
       apiKey,
-      // dimensions,
+      dimensions,
       batchSize,
       configuration: { baseURL }
     })

src/main/index.ts

@@ -2,12 +2,11 @@ import '@main/config'
 
 import { electronApp, optimizer } from '@electron-toolkit/utils'
 import { replaceDevtoolsFont } from '@main/utils/windowUtil'
-import { IpcChannel } from '@shared/IpcChannel'
-import { app, BrowserWindow, ipcMain } from 'electron'
+import { app } from 'electron'
 import installExtension, { REACT_DEVELOPER_TOOLS, REDUX_DEVTOOLS } from 'electron-devtools-installer'
 import Logger from 'electron-log'
 
-import { isDev, isMac, isWin } from './constant'
+import { isDev, isWin } from './constant'
 import { registerIpc } from './ipc'
 import { configManager } from './services/ConfigManager'
 import mcpService from './services/MCPService'
@@ -17,6 +16,7 @@ import {
   registerProtocolClient,
   setupAppImageDeepLink
 } from './services/ProtocolClient'
+import selectionService, { initSelectionService } from './services/SelectionService'
 import { registerShortcuts } from './services/ShortcutService'
 import { TrayService } from './services/TrayService'
 import { windowService } from './services/WindowService'
@@ -24,6 +24,16 @@ import { setUserDataDir } from './utils/file'
 
 Logger.initialize()
 
+/**
+ * Disable chromium's window animations
+ * main purpose for this is to avoid the transparent window flashing when it is shown
+ * (especially on Windows for SelectionAssistant Toolbar)
+ * Know Issue: https://github.com/electron/electron/issues/12130#issuecomment-627198990
+ */
+if (isWin) {
+  app.commandLine.appendSwitch('wm-window-animations-disabled')
+}
+
 // in production mode, handle uncaught exception and unhandled rejection globally
 if (!isDev) {
   // handle uncaught exception
@@ -85,18 +95,9 @@ if (!app.requestSingleInstanceLock()) {
         .then((name) => console.log(`Added Extension:  ${name}`))
         .catch((err) => console.log('An error occurred: ', err))
     }
-    ipcMain.handle(IpcChannel.System_GetDeviceType, () => {
-      return isMac ? 'mac' : isWin ? 'windows' : 'linux'
-    })
 
-    ipcMain.handle(IpcChannel.System_GetHostname, () => {
-      return require('os').hostname()
-    })
-
-    ipcMain.handle(IpcChannel.System_ToggleDevTools, (e) => {
-      const win = BrowserWindow.fromWebContents(e.sender)
-      win && win.webContents.toggleDevTools()
-    })
+    //start selection assistant service
+    initSelectionService()
   })
 
   registerProtocolClient(app)
@@ -123,6 +124,11 @@ if (!app.requestSingleInstanceLock()) {
 
   app.on('before-quit', () => {
     app.isQuitting = true
+
+    // quit selection service
+    if (selectionService) {
+      selectionService.quit()
+    }
   })
 
   app.on('will-quit', async () => {

src/main/ipc.ts

@@ -6,10 +6,10 @@ import { getBinaryPath, isBinaryExists, runInstallScript } from '@main/utils/pro
 import { handleZoomFactor } from '@main/utils/zoom'
 import { IpcChannel } from '@shared/IpcChannel'
 import { Shortcut, ThemeMode } from '@types'
-import { BrowserWindow, ipcMain, nativeTheme, session, shell } from 'electron'
+import { BrowserWindow, ipcMain, session, shell } from 'electron'
 import log from 'electron-log'
+import { Notification } from 'src/renderer/src/types/notification'
 
-import { titleBarOverlayDark, titleBarOverlayLight } from './config'
 import AppUpdater from './services/AppUpdater'
 import BackupManager from './services/BackupManager'
 import { configManager } from './services/ConfigManager'
@@ -17,22 +17,24 @@ import CopilotService from './services/CopilotService'
 import { ExportService } from './services/ExportService'
 import FileService from './services/FileService'
 import FileStorage from './services/FileStorage'
-import { GeminiService } from './services/GeminiService'
 import KnowledgeService from './services/KnowledgeService'
 import mcpService from './services/MCPService'
+import NotificationService from './services/NotificationService'
 import * as NutstoreService from './services/NutstoreService'
 import ObsidianVaultService from './services/ObsidianVaultService'
 import { ProxyConfig, proxyManager } from './services/ProxyManager'
 import { searchService } from './services/SearchService'
+import { SelectionService } from './services/SelectionService'
 import { registerShortcuts, unregisterAllShortcuts } from './services/ShortcutService'
 import storeSyncService from './services/StoreSyncService'
-import { TrayService } from './services/TrayService'
+import { themeService } from './services/ThemeService'
 import { setOpenLinkExternal } from './services/WebviewService'
 import { windowService } from './services/WindowService'
 import { calculateDirectorySize, getResourcePath } from './utils'
 import { decrypt, encrypt } from './utils/aes'
 import { getCacheDir, getConfigDir, getFilesDir } from './utils/file'
 import { compress, decompress } from './utils/zip'
+import { FeedUrl } from '@shared/config/constant'
 
 const fileManager = new FileStorage()
 const backupManager = new BackupManager()
@@ -41,6 +43,7 @@ const obsidianVaultService = new ObsidianVaultService()
 
 export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   const appUpdater = new AppUpdater(mainWindow)
+  const notificationService = new NotificationService(mainWindow)
 
   ipcMain.handle(IpcChannel.App_Info, () => ({
     version: app.getVersion(),
@@ -110,10 +113,12 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     configManager.setAutoUpdate(isActive)
   })
 
-  ipcMain.handle(IpcChannel.App_RestartTray, () => TrayService.getInstance().restartTray())
+  ipcMain.handle(IpcChannel.App_SetFeedUrl, (_, feedUrl: FeedUrl) => {
+    appUpdater.setFeedUrl(feedUrl)
+  })
 
-  ipcMain.handle(IpcChannel.Config_Set, (_, key: string, value: any) => {
-    configManager.set(key, value)
+  ipcMain.handle(IpcChannel.Config_Set, (_, key: string, value: any, isNotify: boolean = false) => {
+    configManager.set(key, value, isNotify)
   })
 
   ipcMain.handle(IpcChannel.Config_Get, (_, key: string) => {
@@ -122,34 +127,7 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
 
   // theme
   ipcMain.handle(IpcChannel.App_SetTheme, (_, theme: ThemeMode) => {
-    const updateTitleBarOverlay = () => {
-      if (!mainWindow?.setTitleBarOverlay) return
-      const isDark = nativeTheme.shouldUseDarkColors
-      mainWindow.setTitleBarOverlay(isDark ? titleBarOverlayDark : titleBarOverlayLight)
-    }
-
-    const broadcastThemeChange = () => {
-      const isDark = nativeTheme.shouldUseDarkColors
-      const effectiveTheme = isDark ? ThemeMode.dark : ThemeMode.light
-      BrowserWindow.getAllWindows().forEach((win) => win.webContents.send(IpcChannel.ThemeChange, effectiveTheme))
-    }
-
-    const notifyThemeChange = () => {
-      updateTitleBarOverlay()
-      broadcastThemeChange()
-    }
-
-    if (theme === ThemeMode.auto) {
-      nativeTheme.themeSource = 'system'
-      nativeTheme.on('updated', notifyThemeChange)
-    } else {
-      nativeTheme.themeSource = theme
-      nativeTheme.off('updated', notifyThemeChange)
-    }
-
-    updateTitleBarOverlay()
-    configManager.setTheme(theme)
-    notifyThemeChange()
+    themeService.setTheme(theme)
   })
 
   ipcMain.handle(IpcChannel.App_HandleZoomFactor, (_, delta: number, reset: boolean = false) => {
@@ -197,13 +175,29 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
 
   // check for update
   ipcMain.handle(IpcChannel.App_CheckForUpdate, async () => {
-    await appUpdater.checkForUpdates()
+    return await appUpdater.checkForUpdates()
+  })
+
+  // notification
+  ipcMain.handle(IpcChannel.Notification_Send, async (_, notification: Notification) => {
+    await notificationService.sendNotification(notification)
+  })
+  ipcMain.handle(IpcChannel.Notification_OnClick, (_, notification: Notification) => {
+    mainWindow.webContents.send('notification-click', notification)
   })
 
   // zip
   ipcMain.handle(IpcChannel.Zip_Compress, (_, text: string) => compress(text))
   ipcMain.handle(IpcChannel.Zip_Decompress, (_, text: Buffer) => decompress(text))
 
+  // system
+  ipcMain.handle(IpcChannel.System_GetDeviceType, () => (isMac ? 'mac' : isWin ? 'windows' : 'linux'))
+  ipcMain.handle(IpcChannel.System_GetHostname, () => require('os').hostname())
+  ipcMain.handle(IpcChannel.System_ToggleDevTools, (e) => {
+    const win = BrowserWindow.fromWebContents(e.sender)
+    win && win.webContents.toggleDevTools()
+  })
+
   // backup
   ipcMain.handle(IpcChannel.Backup_Backup, backupManager.backup)
   ipcMain.handle(IpcChannel.Backup_Restore, backupManager.restore)
@@ -230,6 +224,7 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.File_WriteWithId, fileManager.writeFileWithId)
   ipcMain.handle(IpcChannel.File_SaveImage, fileManager.saveImage)
   ipcMain.handle(IpcChannel.File_Base64Image, fileManager.base64Image)
+  ipcMain.handle(IpcChannel.File_SaveBase64Image, fileManager.saveBase64Image)
   ipcMain.handle(IpcChannel.File_Base64File, fileManager.base64File)
   ipcMain.handle(IpcChannel.File_Download, fileManager.downloadFile)
   ipcMain.handle(IpcChannel.File_Copy, fileManager.copyFile)
@@ -278,13 +273,6 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     }
   })
 
-  // gemini
-  ipcMain.handle(IpcChannel.Gemini_UploadFile, GeminiService.uploadFile)
-  ipcMain.handle(IpcChannel.Gemini_Base64File, GeminiService.base64File)
-  ipcMain.handle(IpcChannel.Gemini_RetrieveFile, GeminiService.retrieveFile)
-  ipcMain.handle(IpcChannel.Gemini_ListFiles, GeminiService.listFiles)
-  ipcMain.handle(IpcChannel.Gemini_DeleteFile, GeminiService.deleteFile)
-
   // mini window
   ipcMain.handle(IpcChannel.MiniWindow_Show, () => windowService.showMiniWindow())
   ipcMain.handle(IpcChannel.MiniWindow_Hide, () => windowService.hideMiniWindow())
@@ -311,6 +299,7 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.Mcp_ListResources, mcpService.listResources)
   ipcMain.handle(IpcChannel.Mcp_GetResource, mcpService.getResource)
   ipcMain.handle(IpcChannel.Mcp_GetInstallInfo, mcpService.getInstallInfo)
+  ipcMain.handle(IpcChannel.Mcp_CheckConnectivity, mcpService.checkMcpConnectivity)
 
   ipcMain.handle(IpcChannel.App_IsBinaryExist, (_, name: string) => isBinaryExists(name))
   ipcMain.handle(IpcChannel.App_GetBinaryPath, (_, name: string) => getBinaryPath(name))
@@ -359,4 +348,9 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
 
   // store sync
   storeSyncService.registerIpcHandler()
+
+  // selection assistant
+  SelectionService.registerIpcHandler()
+
+  ipcMain.handle(IpcChannel.App_QuoteToMain, (_, text: string) => windowService.quoteToMainWindow(text))
 }

src/main/reranker/BaseReranker.ts

@@ -38,7 +38,7 @@ export default abstract class BaseReranker {
   protected getRerankRequestBody(query: string, searchResults: ExtractChunkData[]) {
     const provider = this.base.rerankModelProvider
     const documents = searchResults.map((doc) => doc.pageContent)
-    const topN = this.base.topN || 10
+    const topN = this.base.documentCount
 
     if (provider === 'voyageai') {
       return {

src/main/services/AppUpdater.ts

@@ -1,5 +1,7 @@
 import { isWin } from '@main/constant'
+import { locales } from '@main/utils/locales'
 import { IpcChannel } from '@shared/IpcChannel'
+import { FeedUrl } from '@shared/config/constant'
 import { UpdateInfo } from 'builder-util-runtime'
 import { app, BrowserWindow, dialog } from 'electron'
 import logger from 'electron-log'
@@ -19,6 +21,7 @@ export default class AppUpdater {
     autoUpdater.forceDevUpdateConfig = !app.isPackaged
     autoUpdater.autoDownload = configManager.getAutoUpdate()
     autoUpdater.autoInstallOnAppQuit = configManager.getAutoUpdate()
+    autoUpdater.setFeedURL(configManager.getFeedUrl())
 
     // 检测下载错误
     autoUpdater.on('error', (error) => {
@@ -61,6 +64,11 @@ export default class AppUpdater {
     autoUpdater.autoInstallOnAppQuit = isActive
   }
 
+  public setFeedUrl(feedUrl: FeedUrl) {
+    autoUpdater.setFeedURL(feedUrl)
+    configManager.setFeedUrl(feedUrl)
+  }
+
   public async checkForUpdates() {
     if (isWin && 'PORTABLE_EXECUTABLE_DIR' in process.env) {
       return {
@@ -94,15 +102,22 @@ export default class AppUpdater {
     if (!this.releaseInfo) {
       return
     }
+    const locale = locales[configManager.getLanguage()]
+    const { update: updateLocale } = locale.translation
+
+    let detail = this.formatReleaseNotes(this.releaseInfo.releaseNotes)
+    if (detail === '') {
+      detail = updateLocale.noReleaseNotes
+    }
 
     dialog
       .showMessageBox({
         type: 'info',
-        title: '安装更新',
+        title: updateLocale.title,
         icon,
-        message: `新版本 ${this.releaseInfo.version} 已准备就绪`,
-        detail: this.formatReleaseNotes(this.releaseInfo.releaseNotes),
-        buttons: ['稍后安装', '立即安装'],
+        message: updateLocale.message.replace('{{version}}', this.releaseInfo.version),
+        detail,
+        buttons: [updateLocale.later, updateLocale.install],
         defaultId: 1,
         cancelId: 0
       })
@@ -118,7 +133,7 @@ export default class AppUpdater {
 
   private formatReleaseNotes(releaseNotes: string | ReleaseNoteInfo[] | null | undefined): string {
     if (!releaseNotes) {
-      return '暂无更新说明'
+      return ''
     }
 
     if (typeof releaseNotes === 'string') {

src/main/services/BackupManager.ts

@@ -7,7 +7,7 @@ import Logger from 'electron-log'
 import * as fs from 'fs-extra'
 import StreamZip from 'node-stream-zip'
 import * as path from 'path'
-import { createClient, CreateDirectoryOptions, FileStat } from 'webdav'
+import { CreateDirectoryOptions, FileStat } from 'webdav'
 
 import WebDav from './WebDav'
 import { windowService } from './WindowService'
@@ -77,7 +77,8 @@ class BackupManager {
     _: Electron.IpcMainInvokeEvent,
     fileName: string,
     data: string,
-    destinationPath: string = this.backupDir
+    destinationPath: string = this.backupDir,
+    skipBackupFile: boolean = false
   ): Promise<string> {
     const mainWindow = windowService.getMainWindow()
 
@@ -104,23 +105,30 @@ class BackupManager {
 
       onProgress({ stage: 'writing_data', progress: 20, total: 100 })
 
-      // 复制 Data 目录到临时目录
-      const sourcePath = path.join(app.getPath('userData'), 'Data')
-      const tempDataDir = path.join(this.tempDir, 'Data')
+      Logger.log('[BackupManager IPC] ', skipBackupFile)
 
-      // 获取源目录总大小
-      const totalSize = await this.getDirSize(sourcePath)
-      let copiedSize = 0
+      if (!skipBackupFile) {
+        // 复制 Data 目录到临时目录
+        const sourcePath = path.join(app.getPath('userData'), 'Data')
+        const tempDataDir = path.join(this.tempDir, 'Data')
 
-      // 使用流式复制
-      await this.copyDirWithProgress(sourcePath, tempDataDir, (size) => {
-        copiedSize += size
-        const progress = Math.min(50, Math.floor((copiedSize / totalSize) * 50))
-        onProgress({ stage: 'copying_files', progress, total: 100 })
-      })
+        // 获取源目录总大小
+        const totalSize = await this.getDirSize(sourcePath)
+        let copiedSize = 0
 
-      await this.setWritableRecursive(tempDataDir)
-      onProgress({ stage: 'preparing_compression', progress: 50, total: 100 })
+        // 使用流式复制
+        await this.copyDirWithProgress(sourcePath, tempDataDir, (size) => {
+          copiedSize += size
+          const progress = Math.min(50, Math.floor((copiedSize / totalSize) * 50))
+          onProgress({ stage: 'copying_files', progress, total: 100 })
+        })
+
+        await this.setWritableRecursive(tempDataDir)
+        onProgress({ stage: 'preparing_compression', progress: 50, total: 100 })
+      } else {
+        Logger.log('[BackupManager] Skip the backup of the file')
+        await fs.promises.mkdir(path.join(this.tempDir, 'Data')) // 不创建空 Data 目录会导致 restore 失败
+      }
 
       // 创建输出文件流
       const backupedFilePath = path.join(destinationPath, fileName)
@@ -247,19 +255,26 @@ class BackupManager {
       const sourcePath = path.join(this.tempDir, 'Data')
       const destPath = path.join(app.getPath('userData'), 'Data')
 
-      // 获取源目录总大小
-      const totalSize = await this.getDirSize(sourcePath)
-      let copiedSize = 0
+      const dataExists = await fs.pathExists(sourcePath)
+      const dataFiles = dataExists ? await fs.readdir(sourcePath) : []
 
-      await this.setWritableRecursive(destPath)
-      await fs.remove(destPath)
+      if (dataExists && dataFiles.length > 0) {
+        // 获取源目录总大小
+        const totalSize = await this.getDirSize(sourcePath)
+        let copiedSize = 0
 
-      // 使用流式复制
-      await this.copyDirWithProgress(sourcePath, destPath, (size) => {
-        copiedSize += size
-        const progress = Math.min(85, 35 + Math.floor((copiedSize / totalSize) * 50))
-        onProgress({ stage: 'copying_files', progress, total: 100 })
-      })
+        await this.setWritableRecursive(destPath)
+        await fs.remove(destPath)
+
+        // 使用流式复制
+        await this.copyDirWithProgress(sourcePath, destPath, (size) => {
+          copiedSize += size
+          const progress = Math.min(85, 35 + Math.floor((copiedSize / totalSize) * 50))
+          onProgress({ stage: 'copying_files', progress, total: 100 })
+        })
+      } else {
+        Logger.log('[backup] skipBackupFile is true, skip restoring Data directory')
+      }
 
       Logger.log('[backup] step 4: clean up temp directory')
       // 清理临时目录
@@ -279,11 +294,13 @@ class BackupManager {
 
   async backupToWebdav(_: Electron.IpcMainInvokeEvent, data: string, webdavConfig: WebDavConfig) {
     const filename = webdavConfig.fileName || 'cherry-studio.backup.zip'
-    const backupedFilePath = await this.backup(_, filename, data)
+    const backupedFilePath = await this.backup(_, filename, data, undefined, webdavConfig.skipBackupFile)
+    const contentLength = (await fs.stat(backupedFilePath)).size
     const webdavClient = new WebDav(webdavConfig)
     try {
       const result = await webdavClient.putFileContents(filename, fs.createReadStream(backupedFilePath), {
-        overwrite: true
+        overwrite: true,
+        contentLength
       })
       // 上传成功后删除本地备份文件
       await fs.remove(backupedFilePath)
@@ -325,12 +342,8 @@ class BackupManager {
 
   listWebdavFiles = async (_: Electron.IpcMainInvokeEvent, config: WebDavConfig) => {
     try {
-      const client = createClient(config.webdavHost, {
-        username: config.webdavUser,
-        password: config.webdavPass
-      })
-
-      const response = await client.getDirectoryContents(config.webdavPath)
+      const client = new WebDav(config)
+      const response = await client.getDirectoryContents()
       const files = Array.isArray(response) ? response : response.data
 
       return files

src/main/services/ConfigManager.ts

@@ -1,11 +1,11 @@
-import { defaultLanguage, ZOOM_SHORTCUTS } from '@shared/config/constant'
+import { defaultLanguage, FeedUrl, ZOOM_SHORTCUTS } from '@shared/config/constant'
 import { LanguageVarious, Shortcut, ThemeMode } from '@types'
 import { app } from 'electron'
 import Store from 'electron-store'
 
 import { locales } from '../utils/locales'
 
-enum ConfigKeys {
+export enum ConfigKeys {
   Language = 'language',
   Theme = 'theme',
   LaunchToTray = 'launchToTray',
@@ -16,7 +16,14 @@ enum ConfigKeys {
   ClickTrayToShowQuickAssistant = 'clickTrayToShowQuickAssistant',
   EnableQuickAssistant = 'enableQuickAssistant',
   AutoUpdate = 'autoUpdate',
-  EnableDataCollection = 'enableDataCollection'
+  FeedUrl = 'feedUrl',
+  EnableDataCollection = 'enableDataCollection',
+  SelectionAssistantEnabled = 'selectionAssistantEnabled',
+  SelectionAssistantTriggerMode = 'selectionAssistantTriggerMode',
+  SelectionAssistantFollowToolbar = 'selectionAssistantFollowToolbar',
+  SelectionAssistantRemeberWinSize = 'selectionAssistantRemeberWinSize',
+  SelectionAssistantFilterMode = 'selectionAssistantFilterMode',
+  SelectionAssistantFilterList = 'selectionAssistantFilterList'
 }
 
 export class ConfigManager {
@@ -32,12 +39,12 @@ export class ConfigManager {
     return this.get(ConfigKeys.Language, locale) as LanguageVarious
   }
 
-  setLanguage(theme: LanguageVarious) {
-    this.set(ConfigKeys.Language, theme)
+  setLanguage(lang: LanguageVarious) {
+    this.setAndNotify(ConfigKeys.Language, lang)
   }
 
   getTheme(): ThemeMode {
-    return this.get(ConfigKeys.Theme, ThemeMode.auto)
+    return this.get(ConfigKeys.Theme, ThemeMode.system)
   }
 
   setTheme(theme: ThemeMode) {
@@ -57,12 +64,11 @@ export class ConfigManager {
   }
 
   setTray(value: boolean) {
-    this.set(ConfigKeys.Tray, value)
-    this.notifySubscribers(ConfigKeys.Tray, value)
+    this.setAndNotify(ConfigKeys.Tray, value)
   }
 
   getTrayOnClose(): boolean {
-    return !!this.get(ConfigKeys.TrayOnClose, false)
+    return !!this.get(ConfigKeys.TrayOnClose, true)
   }
 
   setTrayOnClose(value: boolean) {
@@ -74,8 +80,7 @@ export class ConfigManager {
   }
 
   setZoomFactor(factor: number) {
-    this.set(ConfigKeys.ZoomFactor, factor)
-    this.notifySubscribers(ConfigKeys.ZoomFactor, factor)
+    this.setAndNotify(ConfigKeys.ZoomFactor, factor)
   }
 
   subscribe<T>(key: string, callback: (newValue: T) => void) {
@@ -107,11 +112,10 @@ export class ConfigManager {
   }
 
   setShortcuts(shortcuts: Shortcut[]) {
-    this.set(
+    this.setAndNotify(
       ConfigKeys.Shortcuts,
       shortcuts.filter((shortcut) => shortcut.system)
     )
-    this.notifySubscribers(ConfigKeys.Shortcuts, shortcuts)
   }
 
   getClickTrayToShowQuickAssistant(): boolean {
@@ -127,7 +131,7 @@ export class ConfigManager {
   }
 
   setEnableQuickAssistant(value: boolean) {
-    this.set(ConfigKeys.EnableQuickAssistant, value)
+    this.setAndNotify(ConfigKeys.EnableQuickAssistant, value)
   }
 
   getAutoUpdate(): boolean {
@@ -138,6 +142,14 @@ export class ConfigManager {
     this.set(ConfigKeys.AutoUpdate, value)
   }
 
+  getFeedUrl(): string {
+    return this.get<string>(ConfigKeys.FeedUrl, FeedUrl.PRODUCTION)
+  }
+
+  setFeedUrl(value: FeedUrl) {
+    this.set(ConfigKeys.FeedUrl, value)
+  }
+
   getEnableDataCollection(): boolean {
     return this.get<boolean>(ConfigKeys.EnableDataCollection, true)
   }
@@ -146,8 +158,64 @@ export class ConfigManager {
     this.set(ConfigKeys.EnableDataCollection, value)
   }
 
-  set(key: string, value: unknown) {
+  // Selection Assistant: is enabled the selection assistant
+  getSelectionAssistantEnabled(): boolean {
+    return this.get<boolean>(ConfigKeys.SelectionAssistantEnabled, false)
+  }
+
+  setSelectionAssistantEnabled(value: boolean) {
+    this.setAndNotify(ConfigKeys.SelectionAssistantEnabled, value)
+  }
+
+  // Selection Assistant: trigger mode (selected, ctrlkey)
+  getSelectionAssistantTriggerMode(): string {
+    return this.get<string>(ConfigKeys.SelectionAssistantTriggerMode, 'selected')
+  }
+
+  setSelectionAssistantTriggerMode(value: string) {
+    this.setAndNotify(ConfigKeys.SelectionAssistantTriggerMode, value)
+  }
+
+  // Selection Assistant: if action window position follow toolbar
+  getSelectionAssistantFollowToolbar(): boolean {
+    return this.get<boolean>(ConfigKeys.SelectionAssistantFollowToolbar, true)
+  }
+
+  setSelectionAssistantFollowToolbar(value: boolean) {
+    this.setAndNotify(ConfigKeys.SelectionAssistantFollowToolbar, value)
+  }
+
+  getSelectionAssistantRemeberWinSize(): boolean {
+    return this.get<boolean>(ConfigKeys.SelectionAssistantRemeberWinSize, false)
+  }
+
+  setSelectionAssistantRemeberWinSize(value: boolean) {
+    this.setAndNotify(ConfigKeys.SelectionAssistantRemeberWinSize, value)
+  }
+
+  getSelectionAssistantFilterMode(): string {
+    return this.get<string>(ConfigKeys.SelectionAssistantFilterMode, 'default')
+  }
+
+  setSelectionAssistantFilterMode(value: string) {
+    this.setAndNotify(ConfigKeys.SelectionAssistantFilterMode, value)
+  }
+
+  getSelectionAssistantFilterList(): string[] {
+    return this.get<string[]>(ConfigKeys.SelectionAssistantFilterList, [])
+  }
+
+  setSelectionAssistantFilterList(value: string[]) {
+    this.setAndNotify(ConfigKeys.SelectionAssistantFilterList, value)
+  }
+
+  setAndNotify(key: string, value: unknown) {
+    this.set(key, value, true)
+  }
+
+  set(key: string, value: unknown, isNotify: boolean = false) {
     this.store.set(key, value)
+    isNotify && this.notifySubscribers(key, value)
   }
 
   get<T>(key: string, defaultValue?: T) {

src/main/services/ExportService.ts

@@ -47,6 +47,8 @@ export class ExportService {
       let linkText = ''
       let linkUrl = ''
       let insideLink = false
+      let boldStack = 0 // 跟踪嵌套的粗体标记
+      let italicStack = 0 // 跟踪嵌套的斜体标记
 
       for (let i = 0; i < tokens.length; i++) {
         const token = tokens[i]
@@ -82,17 +84,37 @@ export class ExportService {
               insideLink = false
             }
             break
+          case 'strong_open':
+            boldStack++
+            break
+          case 'strong_close':
+            boldStack--
+            break
+          case 'em_open':
+            italicStack++
+            break
+          case 'em_close':
+            italicStack--
+            break
           case 'text':
-            runs.push(new TextRun({ text: token.content, bold: isHeaderRow }))
-            break
-          case 'strong':
-            runs.push(new TextRun({ text: token.content, bold: true }))
-            break
-          case 'em':
-            runs.push(new TextRun({ text: token.content, italics: true }))
+            runs.push(
+              new TextRun({
+                text: token.content,
+                bold: isHeaderRow || boldStack > 0,
+                italics: italicStack > 0
+              })
+            )
             break
           case 'code_inline':
-            runs.push(new TextRun({ text: token.content, font: 'Consolas', size: 20 }))
+            runs.push(
+              new TextRun({
+                text: token.content,
+                font: 'Consolas',
+                size: 20,
+                bold: isHeaderRow || boldStack > 0,
+                italics: italicStack > 0
+              })
+            )
             break
         }
       }

src/main/services/FileService.ts

@@ -1,7 +1,9 @@
-import fs from 'node:fs'
+import fs from 'fs/promises'
 
 export default class FileService {
-  public static async readFile(_: Electron.IpcMainInvokeEvent, path: string) {
-    return fs.readFileSync(path, 'utf8')
+  public static async readFile(_: Electron.IpcMainInvokeEvent, pathOrUrl: string, encoding?: BufferEncoding) {
+    const path = pathOrUrl.startsWith('file://') ? new URL(pathOrUrl) : pathOrUrl
+    if (encoding) return fs.readFile(path, { encoding })
+    return fs.readFile(path)
   }
 }

src/main/services/FileStorage.ts

@@ -268,6 +268,51 @@ class FileStorage {
     }
   }
 
+  public saveBase64Image = async (_: Electron.IpcMainInvokeEvent, base64Data: string): Promise<FileType> => {
+    try {
+      if (!base64Data) {
+        throw new Error('Base64 data is required')
+      }
+
+      // 移除 base64 头部信息（如果存在）
+      const base64String = base64Data.replace(/^data:.*;base64,/, '')
+      const buffer = Buffer.from(base64String, 'base64')
+      const uuid = uuidv4()
+      const ext = '.png'
+      const destPath = path.join(this.storageDir, uuid + ext)
+
+      logger.info('[FileStorage] Saving base64 image:', {
+        storageDir: this.storageDir,
+        destPath,
+        bufferSize: buffer.length
+      })
+
+      // 确保目录存在
+      if (!fs.existsSync(this.storageDir)) {
+        fs.mkdirSync(this.storageDir, { recursive: true })
+      }
+
+      await fs.promises.writeFile(destPath, buffer)
+
+      const fileMetadata: FileType = {
+        id: uuid,
+        origin_name: uuid + ext,
+        name: uuid + ext,
+        path: destPath,
+        created_at: new Date().toISOString(),
+        size: buffer.length,
+        ext: ext.slice(1),
+        type: getFileType(ext),
+        count: 1
+      }
+
+      return fileMetadata
+    } catch (error) {
+      logger.error('[FileStorage] Failed to save base64 image:', error)
+      throw error
+    }
+  }
+
   public base64File = async (_: Electron.IpcMainInvokeEvent, id: string): Promise<{ data: string; mime: string }> => {
     const filePath = path.join(this.storageDir, id)
     const buffer = await fs.promises.readFile(filePath)
@@ -328,7 +373,7 @@ class FileStorage {
     fileName: string,
     content: string,
     options?: SaveDialogOptions
-  ): Promise<string | null> => {
+  ): Promise<string> => {
     try {
       const result: SaveDialogReturnValue = await dialog.showSaveDialog({
         title: '保存文件',
@@ -336,14 +381,18 @@ class FileStorage {
         ...options
       })
 
+      if (result.canceled) {
+        return Promise.reject(new Error('User canceled the save dialog'))
+      }
+
       if (!result.canceled && result.filePath) {
         await writeFileSync(result.filePath, content, { encoding: 'utf-8' })
       }
 
       return result.filePath
-    } catch (err) {
+    } catch (err: any) {
       logger.error('[IPC - Error]', 'An error occurred saving the file:', err)
-      return null
+      return Promise.reject('An error occurred saving the file: ' + err?.message)
     }
   }
 
@@ -382,7 +431,11 @@ class FileStorage {
     }
   }
 
-  public downloadFile = async (_: Electron.IpcMainInvokeEvent, url: string): Promise<FileType> => {
+  public downloadFile = async (
+    _: Electron.IpcMainInvokeEvent,
+    url: string,
+    isUseContentType?: boolean
+  ): Promise<FileType> => {
     try {
       const response = await fetch(url)
       if (!response.ok) {
@@ -407,7 +460,7 @@ class FileStorage {
       }
 
       // 如果文件名没有后缀，根据Content-Type添加后缀
-      if (!filename.includes('.')) {
+      if (isUseContentType || !filename.includes('.')) {
         const contentType = response.headers.get('Content-Type')
         const ext = this.getExtensionFromMimeType(contentType)
         filename += ext

src/main/services/GeminiService.ts

@@ -1,68 +0,0 @@
-import { File, FileState, GoogleGenAI, Pager } from '@google/genai'
-import { FileType } from '@types'
-import fs from 'fs'
-
-import { CacheService } from './CacheService'
-
-export class GeminiService {
-  private static readonly FILE_LIST_CACHE_KEY = 'gemini_file_list'
-  private static readonly CACHE_DURATION = 3000
-
-  static async uploadFile(_: Electron.IpcMainInvokeEvent, file: FileType, apiKey: string): Promise<File> {
-    const sdk = new GoogleGenAI({ vertexai: false, apiKey })
-    return await sdk.files.upload({
-      file: file.path,
-      config: {
-        mimeType: 'application/pdf',
-        name: file.id,
-        displayName: file.origin_name
-      }
-    })
-  }
-
-  static async base64File(_: Electron.IpcMainInvokeEvent, file: FileType) {
-    return {
-      data: Buffer.from(fs.readFileSync(file.path)).toString('base64'),
-      mimeType: 'application/pdf'
-    }
-  }
-
-  static async retrieveFile(_: Electron.IpcMainInvokeEvent, file: FileType, apiKey: string): Promise<File | undefined> {
-    const sdk = new GoogleGenAI({ vertexai: false, apiKey })
-    const cachedResponse = CacheService.get<any>(GeminiService.FILE_LIST_CACHE_KEY)
-    if (cachedResponse) {
-      return GeminiService.processResponse(cachedResponse, file)
-    }
-
-    const response = await sdk.files.list()
-    CacheService.set(GeminiService.FILE_LIST_CACHE_KEY, response, GeminiService.CACHE_DURATION)
-
-    return GeminiService.processResponse(response, file)
-  }
-
-  private static async processResponse(response: Pager<File>, file: FileType) {
-    for await (const f of response) {
-      if (f.state === FileState.ACTIVE) {
-        if (f.displayName === file.origin_name && Number(f.sizeBytes) === file.size) {
-          return f
-        }
-      }
-    }
-
-    return undefined
-  }
-
-  static async listFiles(_: Electron.IpcMainInvokeEvent, apiKey: string): Promise<File[]> {
-    const sdk = new GoogleGenAI({ vertexai: false, apiKey })
-    const files: File[] = []
-    for await (const f of await sdk.files.list()) {
-      files.push(f)
-    }
-    return files
-  }
-
-  static async deleteFile(_: Electron.IpcMainInvokeEvent, fileId: string, apiKey: string) {
-    const sdk = new GoogleGenAI({ vertexai: false, apiKey })
-    await sdk.files.delete({ name: fileId })
-  }
-}

src/main/services/MCPService.ts

@@ -4,6 +4,7 @@ import path from 'node:path'
 
 import { createInMemoryMCPServer } from '@main/mcpServers/factory'
 import { makeSureDirExists } from '@main/utils'
+import { buildFunctionCallToolName } from '@main/utils/mcp'
 import { getBinaryName, getBinaryPath } from '@main/utils/process'
 import { Client } from '@modelcontextprotocol/sdk/client/index.js'
 import { SSEClientTransport, SSEClientTransportOptions } from '@modelcontextprotocol/sdk/client/sse.js'
@@ -69,17 +70,7 @@ function withCache<T extends unknown[], R>(
 
 class McpService {
   private clients: Map<string, Client> = new Map()
-
-  private getServerKey(server: MCPServer): string {
-    return JSON.stringify({
-      baseUrl: server.baseUrl,
-      command: server.command,
-      args: server.args,
-      registryUrl: server.registryUrl,
-      env: server.env,
-      id: server.id
-    })
-  }
+  private pendingClients: Map<string, Promise<Client>> = new Map()
 
   constructor() {
     this.initClient = this.initClient.bind(this)
@@ -96,9 +87,26 @@ class McpService {
     this.cleanup = this.cleanup.bind(this)
   }
 
+  private getServerKey(server: MCPServer): string {
+    return JSON.stringify({
+      baseUrl: server.baseUrl,
+      command: server.command,
+      args: Array.isArray(server.args) ? server.args : [],
+      registryUrl: server.registryUrl,
+      env: server.env,
+      id: server.id
+    })
+  }
+
   async initClient(server: MCPServer): Promise<Client> {
     const serverKey = this.getServerKey(server)
 
+    // If there's a pending initialization, wait for it
+    const pendingClient = this.pendingClients.get(serverKey)
+    if (pendingClient) {
+      return pendingClient
+    }
+
     // Check if we already have a client for this server configuration
     const existingClient = this.clients.get(serverKey)
     if (existingClient) {
@@ -113,209 +121,232 @@ class McpService {
         } else {
           return existingClient
         }
-      } catch (error) {
-        Logger.error(`[MCP] Error pinging server ${server.name}:`, error)
+      } catch (error: any) {
+        Logger.error(`[MCP] Error pinging server ${server.name}:`, error?.message)
         this.clients.delete(serverKey)
       }
     }
-    // Create new client instance for each connection
-    const client = new Client({ name: 'Cherry Studio', version: app.getVersion() }, { capabilities: {} })
 
-    const args = [...(server.args || [])]
+    // Create a promise for the initialization process
+    const initPromise = (async () => {
+      try {
+        // Create new client instance for each connection
+        const client = new Client({ name: 'Cherry Studio', version: app.getVersion() }, { capabilities: {} })
 
-    // let transport: StdioClientTransport | SSEClientTransport | InMemoryTransport | StreamableHTTPClientTransport
-    const authProvider = new McpOAuthClientProvider({
-      serverUrlHash: crypto
-        .createHash('md5')
-        .update(server.baseUrl || '')
-        .digest('hex')
-    })
+        const args = [...(server.args || [])]
 
-    const initTransport = async (): Promise<
-      StdioClientTransport | SSEClientTransport | InMemoryTransport | StreamableHTTPClientTransport
-    > => {
-      // Create appropriate transport based on configuration
-      if (server.type === 'inMemory') {
-        Logger.info(`[MCP] Using in-memory transport for server: ${server.name}`)
-        const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair()
-        // start the in-memory server with the given name and environment variables
-        const inMemoryServer = createInMemoryMCPServer(server.name, args, server.env || {})
-        try {
-          await inMemoryServer.connect(serverTransport)
-          Logger.info(`[MCP] In-memory server started: ${server.name}`)
-        } catch (error: Error | any) {
-          Logger.error(`[MCP] Error starting in-memory server: ${error}`)
-          throw new Error(`Failed to start in-memory server: ${error.message}`)
-        }
-        // set the client transport to the client
-        return clientTransport
-      } else if (server.baseUrl) {
-        if (server.type === 'streamableHttp') {
-          const options: StreamableHTTPClientTransportOptions = {
-            requestInit: {
-              headers: server.headers || {}
-            },
-            authProvider
-          }
-          return new StreamableHTTPClientTransport(new URL(server.baseUrl!), options)
-        } else if (server.type === 'sse') {
-          const options: SSEClientTransportOptions = {
-            eventSourceInit: {
-              fetch: async (url, init) => {
-                const headers = { ...(server.headers || {}), ...(init?.headers || {}) }
+        // let transport: StdioClientTransport | SSEClientTransport | InMemoryTransport | StreamableHTTPClientTransport
+        const authProvider = new McpOAuthClientProvider({
+          serverUrlHash: crypto
+            .createHash('md5')
+            .update(server.baseUrl || '')
+            .digest('hex')
+        })
 
-                // Get tokens from authProvider to make sure using the latest tokens
-                if (authProvider && typeof authProvider.tokens === 'function') {
-                  try {
-                    const tokens = await authProvider.tokens()
-                    if (tokens && tokens.access_token) {
-                      headers['Authorization'] = `Bearer ${tokens.access_token}`
+        const initTransport = async (): Promise<
+          StdioClientTransport | SSEClientTransport | InMemoryTransport | StreamableHTTPClientTransport
+        > => {
+          // Create appropriate transport based on configuration
+          if (server.type === 'inMemory') {
+            Logger.info(`[MCP] Using in-memory transport for server: ${server.name}`)
+            const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair()
+            // start the in-memory server with the given name and environment variables
+            const inMemoryServer = createInMemoryMCPServer(server.name, args, server.env || {})
+            try {
+              await inMemoryServer.connect(serverTransport)
+              Logger.info(`[MCP] In-memory server started: ${server.name}`)
+            } catch (error: Error | any) {
+              Logger.error(`[MCP] Error starting in-memory server: ${error}`)
+              throw new Error(`Failed to start in-memory server: ${error.message}`)
+            }
+            // set the client transport to the client
+            return clientTransport
+          } else if (server.baseUrl) {
+            if (server.type === 'streamableHttp') {
+              const options: StreamableHTTPClientTransportOptions = {
+                requestInit: {
+                  headers: server.headers || {}
+                },
+                authProvider
+              }
+              return new StreamableHTTPClientTransport(new URL(server.baseUrl!), options)
+            } else if (server.type === 'sse') {
+              const options: SSEClientTransportOptions = {
+                eventSourceInit: {
+                  fetch: async (url, init) => {
+                    const headers = { ...(server.headers || {}), ...(init?.headers || {}) }
+
+                    // Get tokens from authProvider to make sure using the latest tokens
+                    if (authProvider && typeof authProvider.tokens === 'function') {
+                      try {
+                        const tokens = await authProvider.tokens()
+                        if (tokens && tokens.access_token) {
+                          headers['Authorization'] = `Bearer ${tokens.access_token}`
+                        }
+                      } catch (error) {
+                        Logger.error('Failed to fetch tokens:', error)
+                      }
                     }
-                  } catch (error) {
-                    Logger.error('Failed to fetch tokens:', error)
+
+                    return fetch(url, { ...init, headers })
                   }
+                },
+                requestInit: {
+                  headers: server.headers || {}
+                },
+                authProvider
+              }
+              return new SSEClientTransport(new URL(server.baseUrl!), options)
+            } else {
+              throw new Error('Invalid server type')
+            }
+          } else if (server.command) {
+            let cmd = server.command
+
+            if (server.command === 'npx') {
+              cmd = await getBinaryPath('bun')
+              Logger.info(`[MCP] Using command: ${cmd}`)
+
+              // add -x to args if args exist
+              if (args && args.length > 0) {
+                if (!args.includes('-y')) {
+                  args.unshift('-y')
+                }
+                if (!args.includes('x')) {
+                  args.unshift('x')
+                }
+              }
+              if (server.registryUrl) {
+                server.env = {
+                  ...server.env,
+                  NPM_CONFIG_REGISTRY: server.registryUrl
                 }
 
-                return fetch(url, { ...init, headers })
+                // if the server name is mcp-auto-install, use the mcp-registry.json file in the bin directory
+                if (server.name.includes('mcp-auto-install')) {
+                  const binPath = await getBinaryPath()
+                  makeSureDirExists(binPath)
+                  server.env.MCP_REGISTRY_PATH = path.join(binPath, '..', 'config', 'mcp-registry.json')
+                }
+              }
+            } else if (server.command === 'uvx' || server.command === 'uv') {
+              cmd = await getBinaryPath(server.command)
+              if (server.registryUrl) {
+                server.env = {
+                  ...server.env,
+                  UV_DEFAULT_INDEX: server.registryUrl,
+                  PIP_INDEX_URL: server.registryUrl
+                }
               }
-            },
-            requestInit: {
-              headers: server.headers || {}
-            },
-            authProvider
-          }
-          return new SSEClientTransport(new URL(server.baseUrl!), options)
-        } else {
-          throw new Error('Invalid server type')
-        }
-      } else if (server.command) {
-        let cmd = server.command
-
-        if (server.command === 'npx') {
-          cmd = await getBinaryPath('bun')
-          Logger.info(`[MCP] Using command: ${cmd}`)
-
-          // add -x to args if args exist
-          if (args && args.length > 0) {
-            if (!args.includes('-y')) {
-              args.unshift('-y')
-            }
-            if (!args.includes('x')) {
-              args.unshift('x')
-            }
-          }
-          if (server.registryUrl) {
-            server.env = {
-              ...server.env,
-              NPM_CONFIG_REGISTRY: server.registryUrl
             }
 
-            // if the server name is mcp-auto-install, use the mcp-registry.json file in the bin directory
-            if (server.name.includes('mcp-auto-install')) {
-              const binPath = await getBinaryPath()
-              makeSureDirExists(binPath)
-              server.env.MCP_REGISTRY_PATH = path.join(binPath, '..', 'config', 'mcp-registry.json')
-            }
-          }
-        } else if (server.command === 'uvx' || server.command === 'uv') {
-          cmd = await getBinaryPath(server.command)
-          if (server.registryUrl) {
-            server.env = {
-              ...server.env,
-              UV_DEFAULT_INDEX: server.registryUrl,
-              PIP_INDEX_URL: server.registryUrl
+            Logger.info(`[MCP] Starting server with command: ${cmd} ${args ? args.join(' ') : ''}`)
+            // Logger.info(`[MCP] Environment variables for server:`, server.env)
+            const loginShellEnv = await this.getLoginShellEnv()
+
+            // Bun not support proxy https://github.com/oven-sh/bun/issues/16812
+            if (cmd.includes('bun')) {
+              this.removeProxyEnv(loginShellEnv)
             }
+
+            const stdioTransport = new StdioClientTransport({
+              command: cmd,
+              args,
+              env: {
+                ...loginShellEnv,
+                ...server.env
+              },
+              stderr: 'pipe'
+            })
+            stdioTransport.stderr?.on('data', (data) =>
+              Logger.info(`[MCP] Stdio stderr for server: ${server.name} `, data.toString())
+            )
+            return stdioTransport
+          } else {
+            throw new Error('Either baseUrl or command must be provided')
           }
         }
 
-        Logger.info(`[MCP] Starting server with command: ${cmd} ${args ? args.join(' ') : ''}`)
-        // Logger.info(`[MCP] Environment variables for server:`, server.env)
-        const loginShellEnv = await this.getLoginShellEnv()
-        const stdioTransport = new StdioClientTransport({
-          command: cmd,
-          args,
-          env: {
-            ...loginShellEnv,
-            ...server.env
-          },
-          stderr: 'pipe'
-        })
-        stdioTransport.stderr?.on('data', (data) =>
-          Logger.info(`[MCP] Stdio stderr for server: ${server.name} `, data.toString())
-        )
-        return stdioTransport
-      } else {
-        throw new Error('Either baseUrl or command must be provided')
-      }
-    }
+        const handleAuth = async (client: Client, transport: SSEClientTransport | StreamableHTTPClientTransport) => {
+          Logger.info(`[MCP] Starting OAuth flow for server: ${server.name}`)
+          // Create an event emitter for the OAuth callback
+          const events = new EventEmitter()
 
-    const handleAuth = async (client: Client, transport: SSEClientTransport | StreamableHTTPClientTransport) => {
-      Logger.info(`[MCP] Starting OAuth flow for server: ${server.name}`)
-      // Create an event emitter for the OAuth callback
-      const events = new EventEmitter()
+          // Create a callback server
+          const callbackServer = new CallBackServer({
+            port: authProvider.config.callbackPort,
+            path: authProvider.config.callbackPath || '/oauth/callback',
+            events
+          })
 
-      // Create a callback server
-      const callbackServer = new CallBackServer({
-        port: authProvider.config.callbackPort,
-        path: authProvider.config.callbackPath || '/oauth/callback',
-        events
-      })
+          // Set a timeout to close the callback server
+          const timeoutId = setTimeout(() => {
+            Logger.warn(`[MCP] OAuth flow timed out for server: ${server.name}`)
+            callbackServer.close()
+          }, 300000) // 5 minutes timeout
 
-      // Set a timeout to close the callback server
-      const timeoutId = setTimeout(() => {
-        Logger.warn(`[MCP] OAuth flow timed out for server: ${server.name}`)
-        callbackServer.close()
-      }, 300000) // 5 minutes timeout
+          try {
+            // Wait for the authorization code
+            const authCode = await callbackServer.waitForAuthCode()
+            Logger.info(`[MCP] Received auth code: ${authCode}`)
 
-      try {
-        // Wait for the authorization code
-        const authCode = await callbackServer.waitForAuthCode()
-        Logger.info(`[MCP] Received auth code: ${authCode}`)
+            // Complete the OAuth flow
+            await transport.finishAuth(authCode)
 
-        // Complete the OAuth flow
-        await transport.finishAuth(authCode)
+            Logger.info(`[MCP] OAuth flow completed for server: ${server.name}`)
 
-        Logger.info(`[MCP] OAuth flow completed for server: ${server.name}`)
+            const newTransport = await initTransport()
+            // Try to connect again
+            await client.connect(newTransport)
 
-        const newTransport = await initTransport()
-        // Try to connect again
-        await client.connect(newTransport)
+            Logger.info(`[MCP] Successfully authenticated with server: ${server.name}`)
+          } catch (oauthError) {
+            Logger.error(`[MCP] OAuth authentication failed for server ${server.name}:`, oauthError)
+            throw new Error(
+              `OAuth authentication failed: ${oauthError instanceof Error ? oauthError.message : String(oauthError)}`
+            )
+          } finally {
+            // Clear the timeout and close the callback server
+            clearTimeout(timeoutId)
+            callbackServer.close()
+          }
+        }
 
-        Logger.info(`[MCP] Successfully authenticated with server: ${server.name}`)
-      } catch (oauthError) {
-        Logger.error(`[MCP] OAuth authentication failed for server ${server.name}:`, oauthError)
-        throw new Error(
-          `OAuth authentication failed: ${oauthError instanceof Error ? oauthError.message : String(oauthError)}`
-        )
+        try {
+          const transport = await initTransport()
+          try {
+            await client.connect(transport)
+          } catch (error: Error | any) {
+            if (
+              error instanceof Error &&
+              (error.name === 'UnauthorizedError' || error.message.includes('Unauthorized'))
+            ) {
+              Logger.info(`[MCP] Authentication required for server: ${server.name}`)
+              await handleAuth(client, transport as SSEClientTransport | StreamableHTTPClientTransport)
+            } else {
+              throw error
+            }
+          }
+
+          // Store the new client in the cache
+          this.clients.set(serverKey, client)
+
+          Logger.info(`[MCP] Activated server: ${server.name}`)
+          return client
+        } catch (error: any) {
+          Logger.error(`[MCP] Error activating server ${server.name}:`, error?.message)
+          throw new Error(`[MCP] Error activating server ${server.name}: ${error.message}`)
+        }
       } finally {
-        // Clear the timeout and close the callback server
-        clearTimeout(timeoutId)
-        callbackServer.close()
+        // Clean up the pending promise when done
+        this.pendingClients.delete(serverKey)
       }
-    }
+    })()
 
-    try {
-      const transport = await initTransport()
-      try {
-        await client.connect(transport)
-      } catch (error: Error | any) {
-        if (error instanceof Error && (error.name === 'UnauthorizedError' || error.message.includes('Unauthorized'))) {
-          Logger.info(`[MCP] Authentication required for server: ${server.name}`)
-          await handleAuth(client, transport as SSEClientTransport | StreamableHTTPClientTransport)
-        } else {
-          throw error
-        }
-      }
+    // Store the pending promise
+    this.pendingClients.set(serverKey, initPromise)
 
-      // Store the new client in the cache
-      this.clients.set(serverKey, client)
-
-      Logger.info(`[MCP] Activated server: ${server.name}`)
-      return client
-    } catch (error: any) {
-      Logger.error(`[MCP] Error activating server ${server.name}:`, error)
-      throw new Error(`[MCP] Error activating server ${server.name}: ${error.message}`)
-    }
+    return initPromise
   }
 
   async closeClient(serverKey: string) {
@@ -357,12 +388,32 @@ class McpService {
     for (const [key] of this.clients) {
       try {
         await this.closeClient(key)
-      } catch (error) {
-        Logger.error(`[MCP] Failed to close client: ${error}`)
+      } catch (error: any) {
+        Logger.error(`[MCP] Failed to close client: ${error?.message}`)
       }
     }
   }
 
+  /**
+   * Check connectivity for an MCP server
+   */
+  public async checkMcpConnectivity(_: Electron.IpcMainInvokeEvent, server: MCPServer): Promise<boolean> {
+    Logger.info(`[MCP] Checking connectivity for server: ${server.name}`)
+    try {
+      const client = await this.initClient(server)
+      // Attempt to list tools as a way to check connectivity
+      await client.listTools()
+      Logger.info(`[MCP] Connectivity check successful for server: ${server.name}`)
+      return true
+    } catch (error) {
+      Logger.error(`[MCP] Connectivity check failed for server: ${server.name}`, error)
+      // Close the client if connectivity check fails to ensure a clean state for the next attempt
+      const serverKey = this.getServerKey(server)
+      await this.closeClient(serverKey)
+      return false
+    }
+  }
+
   private async listToolsImpl(server: MCPServer): Promise<MCPTool[]> {
     Logger.info(`[MCP] Listing tools for server: ${server.name}`)
     const client = await this.initClient(server)
@@ -372,15 +423,15 @@ class McpService {
       tools.map((tool: any) => {
         const serverTool: MCPTool = {
           ...tool,
-          id: `f${nanoid()}`,
+          id: buildFunctionCallToolName(server.name, tool.name),
           serverId: server.id,
           serverName: server.name
         }
         serverTools.push(serverTool)
       })
       return serverTools
-    } catch (error) {
-      Logger.error(`[MCP] Failed to list tools for server: ${server.name}`, error)
+    } catch (error: any) {
+      Logger.error(`[MCP] Failed to list tools for server: ${server.name}`, error?.message)
       return []
     }
   }
@@ -439,8 +490,8 @@ class McpService {
    * List prompts available on an MCP server
    */
   private async listPromptsImpl(server: MCPServer): Promise<MCPPrompt[]> {
-    Logger.info(`[MCP] Listing prompts for server: ${server.name}`)
     const client = await this.initClient(server)
+    Logger.info(`[MCP] Listing prompts for server: ${server.name}`)
     try {
       const { prompts } = await client.listPrompts()
       return prompts.map((prompt: any) => ({
@@ -449,8 +500,11 @@ class McpService {
         serverId: server.id,
         serverName: server.name
       }))
-    } catch (error) {
-      Logger.error(`[MCP] Failed to list prompts for server: ${server.name}`, error)
+    } catch (error: any) {
+      // -32601 is the code for the method not found
+      if (error?.code !== -32601) {
+        Logger.error(`[MCP] Failed to list prompts for server: ${server.name}`, error?.message)
+      }
       return []
     }
   }
@@ -508,19 +562,21 @@ class McpService {
    * List resources available on an MCP server (implementation)
    */
   private async listResourcesImpl(server: MCPServer): Promise<MCPResource[]> {
-    Logger.info(`[MCP] Listing resources for server: ${server.name}`)
     const client = await this.initClient(server)
+    Logger.info(`[MCP] Listing resources for server: ${server.name}`)
     try {
       const result = await client.listResources()
       const resources = result.resources || []
-      const serverResources = (Array.isArray(resources) ? resources : []).map((resource: any) => ({
+      return (Array.isArray(resources) ? resources : []).map((resource: any) => ({
         ...resource,
         serverId: server.id,
         serverName: server.name
       }))
-      return serverResources
-    } catch (error) {
-      Logger.error(`[MCP] Failed to list resources for server: ${server.name}`, error)
+    } catch (error: any) {
+      // -32601 is the code for the method not found
+      if (error?.code !== -32601) {
+        Logger.error(`[MCP] Failed to list resources for server: ${server.name}`, error?.message)
+      }
       return []
     }
   }
@@ -563,7 +619,7 @@ class McpService {
         contents: contents
       }
     } catch (error: Error | any) {
-      Logger.error(`[MCP] Failed to get resource ${uri} from server: ${server.name}`, error)
+      Logger.error(`[MCP] Failed to get resource ${uri} from server: ${server.name}`, error.message)
       throw new Error(`Failed to get resource ${uri} from server: ${server.name}: ${error.message}`)
     }
   }
@@ -600,7 +656,14 @@ class McpService {
       return {}
     }
   })
+
+  private removeProxyEnv(env: Record<string, string>) {
+    delete env.HTTPS_PROXY
+    delete env.HTTP_PROXY
+    delete env.grpc_proxy
+    delete env.http_proxy
+    delete env.https_proxy
+  }
 }
 
-const mcpService = new McpService()
-export default mcpService
+export default new McpService()

src/main/services/NotificationService.ts

@@ -0,0 +1,31 @@
+import { BrowserWindow, Notification as ElectronNotification } from 'electron'
+import { Notification } from 'src/renderer/src/types/notification'
+
+import icon from '../../../build/icon.png?asset'
+
+class NotificationService {
+  private window: BrowserWindow
+
+  constructor(window: BrowserWindow) {
+    // Initialize the service
+    this.window = window
+  }
+
+  public async sendNotification(notification: Notification) {
+    // 使用 Electron Notification API
+    const electronNotification = new ElectronNotification({
+      title: notification.title,
+      body: notification.message,
+      icon: icon
+    })
+
+    electronNotification.on('click', () => {
+      this.window.show()
+      this.window.webContents.send('notification-click', notification)
+    })
+
+    electronNotification.show()
+  }
+}
+
+export default NotificationService

src/main/services/ProtocolClient.ts

@@ -6,6 +6,7 @@ import { promisify } from 'node:util'
 import { app } from 'electron'
 import Logger from 'electron-log'
 
+import { handleProvidersProtocolUrl } from './urlschema/handle-providers'
 import { handleMcpProtocolUrl } from './urlschema/mcp-install'
 import { windowService } from './WindowService'
 
@@ -34,6 +35,9 @@ export function handleProtocolUrl(url: string) {
     case 'mcp':
       handleMcpProtocolUrl(urlObj)
       return
+    case 'providers':
+      handleProvidersProtocolUrl(urlObj)
+      return
   }
 
   // You can send the data to your renderer process

src/main/services/ThemeService.ts

@@ -0,0 +1,48 @@
+import { IpcChannel } from '@shared/IpcChannel'
+import { ThemeMode } from '@types'
+import { BrowserWindow, nativeTheme } from 'electron'
+
+import { titleBarOverlayDark, titleBarOverlayLight } from '../config'
+import { configManager } from './ConfigManager'
+
+class ThemeService {
+  private theme: ThemeMode = ThemeMode.system
+  constructor() {
+    this.theme = configManager.getTheme()
+
+    if (this.theme === ThemeMode.dark || this.theme === ThemeMode.light || this.theme === ThemeMode.system) {
+      nativeTheme.themeSource = this.theme
+    } else {
+      // 兼容旧版本
+      configManager.setTheme(ThemeMode.system)
+      nativeTheme.themeSource = ThemeMode.system
+    }
+    nativeTheme.on('updated', this.themeUpdatadHandler.bind(this))
+  }
+
+  themeUpdatadHandler() {
+    BrowserWindow.getAllWindows().forEach((win) => {
+      if (win && !win.isDestroyed() && win.setTitleBarOverlay) {
+        try {
+          win.setTitleBarOverlay(nativeTheme.shouldUseDarkColors ? titleBarOverlayDark : titleBarOverlayLight)
+        } catch (error) {
+          // don't throw error if setTitleBarOverlay failed
+          // Because it may be called with some windows have some title bar
+        }
+      }
+      win.webContents.send(IpcChannel.ThemeUpdated, nativeTheme.shouldUseDarkColors ? ThemeMode.dark : ThemeMode.light)
+    })
+  }
+
+  setTheme(theme: ThemeMode) {
+    if (theme === this.theme) {
+      return
+    }
+
+    this.theme = theme
+    nativeTheme.themeSource = theme
+    configManager.setTheme(theme)
+  }
+}
+
+export const themeService = new ThemeService()

src/main/services/TrayService.ts

@@ -5,16 +5,17 @@ import { app, Menu, MenuItemConstructorOptions, nativeImage, nativeTheme, Tray }
 import icon from '../../../build/tray_icon.png?asset'
 import iconDark from '../../../build/tray_icon_dark.png?asset'
 import iconLight from '../../../build/tray_icon_light.png?asset'
-import { configManager } from './ConfigManager'
+import { ConfigKeys, configManager } from './ConfigManager'
 import { windowService } from './WindowService'
 
 export class TrayService {
   private static instance: TrayService
   private tray: Tray | null = null
+  private contextMenu: Menu | null = null
 
   constructor() {
+    this.watchConfigChanges()
     this.updateTray()
-    this.watchTrayChanges()
     TrayService.instance = this
   }
 
@@ -43,6 +44,30 @@ export class TrayService {
 
     this.tray = tray
 
+    this.updateContextMenu()
+
+    if (process.platform === 'linux') {
+      this.tray.setContextMenu(this.contextMenu)
+    }
+
+    this.tray.setToolTip('Cherry Studio')
+
+    this.tray.on('right-click', () => {
+      if (this.contextMenu) {
+        this.tray?.popUpContextMenu(this.contextMenu)
+      }
+    })
+
+    this.tray.on('click', () => {
+      if (configManager.getEnableQuickAssistant() && configManager.getClickTrayToShowQuickAssistant()) {
+        windowService.showMiniWindow()
+      } else {
+        windowService.showMainWindow()
+      }
+    })
+  }
+
+  private updateContextMenu() {
     const locale = locales[configManager.getLanguage()]
     const { tray: trayLocale } = locale.translation
 
@@ -64,25 +89,7 @@ export class TrayService {
       }
     ].filter(Boolean) as MenuItemConstructorOptions[]
 
-    const contextMenu = Menu.buildFromTemplate(template)
-
-    if (process.platform === 'linux') {
-      this.tray.setContextMenu(contextMenu)
-    }
-
-    this.tray.setToolTip('Cherry Studio')
-
-    this.tray.on('right-click', () => {
-      this.tray?.popUpContextMenu(contextMenu)
-    })
-
-    this.tray.on('click', () => {
-      if (enableQuickAssistant && configManager.getClickTrayToShowQuickAssistant()) {
-        windowService.showMiniWindow()
-      } else {
-        windowService.showMainWindow()
-      }
-    })
+    this.contextMenu = Menu.buildFromTemplate(template)
   }
 
   private updateTray() {
@@ -94,13 +101,6 @@ export class TrayService {
     }
   }
 
-  public restartTray() {
-    if (configManager.getTray()) {
-      this.destroyTray()
-      this.createTray()
-    }
-  }
-
   private destroyTray() {
     if (this.tray) {
       this.tray.destroy()
@@ -108,8 +108,16 @@ export class TrayService {
     }
   }
 
-  private watchTrayChanges() {
-    configManager.subscribe<boolean>('tray', () => this.updateTray())
+  private watchConfigChanges() {
+    configManager.subscribe(ConfigKeys.Tray, () => this.updateTray())
+
+    configManager.subscribe(ConfigKeys.Language, () => {
+      this.updateContextMenu()
+    })
+
+    configManager.subscribe(ConfigKeys.EnableQuickAssistant, () => {
+      this.updateContextMenu()
+    })
   }
 
   private quit() {

src/main/services/WebDav.ts

@@ -1,5 +1,7 @@
 import { WebDavConfig } from '@types'
 import Logger from 'electron-log'
+import https from 'https'
+import path from 'path'
 import Stream from 'stream'
 import {
   BufferLike,
@@ -14,13 +16,14 @@ export default class WebDav {
   private webdavPath: string
 
   constructor(params: WebDavConfig) {
-    this.webdavPath = params.webdavPath
+    this.webdavPath = params.webdavPath || '/'
 
     this.instance = createClient(params.webdavHost, {
       username: params.webdavUser,
       password: params.webdavPass,
       maxBodyLength: Infinity,
-      maxContentLength: Infinity
+      maxContentLength: Infinity,
+      httpsAgent: new https.Agent({ rejectUnauthorized: false })
     })
 
     this.putFileContents = this.putFileContents.bind(this)
@@ -49,7 +52,7 @@ export default class WebDav {
       throw error
     }
 
-    const remoteFilePath = `${this.webdavPath}/${filename}`
+    const remoteFilePath = path.posix.join(this.webdavPath, filename)
 
     try {
       return await this.instance.putFileContents(remoteFilePath, data, options)
@@ -64,7 +67,7 @@ export default class WebDav {
       throw new Error('WebDAV client not initialized')
     }
 
-    const remoteFilePath = `${this.webdavPath}/${filename}`
+    const remoteFilePath = path.posix.join(this.webdavPath, filename)
 
     try {
       return await this.instance.getFileContents(remoteFilePath, options)
@@ -74,6 +77,19 @@ export default class WebDav {
     }
   }
 
+  public getDirectoryContents = async () => {
+    if (!this.instance) {
+      throw new Error('WebDAV client not initialized')
+    }
+
+    try {
+      return await this.instance.getDirectoryContents(this.webdavPath)
+    } catch (error) {
+      Logger.error('[WebDAV] Error getting directory contents on WebDAV:', error)
+      throw error
+    }
+  }
+
   public checkConnection = async () => {
     if (!this.instance) {
       throw new Error('WebDAV client not initialized')
@@ -105,7 +121,7 @@ export default class WebDav {
       throw new Error('WebDAV client not initialized')
     }
 
-    const remoteFilePath = `${this.webdavPath}/${filename}`
+    const remoteFilePath = path.posix.join(this.webdavPath, filename)
 
     try {
       return await this.instance.deleteFile(remoteFilePath)

src/main/services/WindowService.ts

@@ -1,8 +1,10 @@
+// just import the themeService to ensure the theme is initialized
+import './ThemeService'
+
 import { is } from '@electron-toolkit/utils'
 import { isDev, isLinux, isMac, isWin } from '@main/constant'
 import { getFilesDir } from '@main/utils/file'
 import { IpcChannel } from '@shared/IpcChannel'
-import { ThemeMode } from '@types'
 import { app, BrowserWindow, nativeTheme, shell } from 'electron'
 import Logger from 'electron-log'
 import windowStateKeeper from 'electron-window-state'
@@ -45,13 +47,6 @@ export class WindowService {
       maximize: false
     })
 
-    const theme = configManager.getTheme()
-    if (theme === ThemeMode.auto) {
-      nativeTheme.themeSource = 'system'
-    } else {
-      nativeTheme.themeSource = theme
-    }
-
     this.mainWindow = new BrowserWindow({
       x: mainWindowState.x,
       y: mainWindowState.y,
@@ -61,21 +56,23 @@ export class WindowService {
       minHeight: 600,
       show: false,
       autoHideMenuBar: true,
-      transparent: isMac,
+      transparent: false,
       vibrancy: 'sidebar',
       visualEffectState: 'active',
       titleBarStyle: 'hidden',
       titleBarOverlay: nativeTheme.shouldUseDarkColors ? titleBarOverlayDark : titleBarOverlayLight,
       backgroundColor: isMac ? undefined : nativeTheme.shouldUseDarkColors ? '#181818' : '#FFFFFF',
       darkTheme: nativeTheme.shouldUseDarkColors,
-      trafficLightPosition: { x: 8, y: 12 },
+      trafficLightPosition: { x: 12, y: 12 },
       ...(isLinux ? { icon } : {}),
       webPreferences: {
         preload: join(__dirname, '../preload/index.js'),
         sandbox: false,
         webSecurity: false,
         webviewTag: true,
-        allowRunningInsecureContent: true
+        allowRunningInsecureContent: true,
+        zoomFactor: configManager.getZoomFactor(),
+        backgroundThrottling: false
       }
     })
 
@@ -184,6 +181,12 @@ export class WindowService {
       mainWindow.webContents.setZoomFactor(configManager.getZoomFactor())
     })
 
+    // set the zoom factor again when the window is going to restore
+    // minimize and restore will cause zoom reset
+    mainWindow.on('restore', () => {
+      mainWindow.webContents.setZoomFactor(configManager.getZoomFactor())
+    })
+
     // ARCH: as `will-resize` is only for Win & Mac,
     // linux has the same problem, use `resize` listener instead
     // but `resize` will fliker the ui
@@ -440,7 +443,8 @@ export class WindowService {
         preload: join(__dirname, '../preload/index.js'),
         sandbox: false,
         webSecurity: false,
-        webviewTag: true
+        webviewTag: true,
+        backgroundThrottling: false
       }
     })
 
@@ -540,6 +544,25 @@ export class WindowService {
   public setPinMiniWindow(isPinned) {
     this.isPinnedMiniWindow = isPinned
   }
+
+  /**
+   * 引用文本到主窗口
+   * @param text 原始文本（未格式化）
+   */
+  public quoteToMainWindow(text: string): void {
+    try {
+      this.showMainWindow()
+
+      const mainWindow = this.getMainWindow()
+      if (mainWindow && !mainWindow.isDestroyed()) {
+        setTimeout(() => {
+          mainWindow.webContents.send(IpcChannel.App_QuoteToMain, text)
+        }, 100)
+      }
+    } catch (error) {
+      Logger.error('Failed to quote to main window:', error as Error)
+    }
+  }
 }
 
 export const windowService = WindowService.getInstance()

src/main/services/mcp/oauth/provider.ts

@@ -1,8 +1,12 @@
 import path from 'node:path'
 
 import { getConfigDir } from '@main/utils/file'
-import { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth'
-import { OAuthClientInformation, OAuthClientInformationFull, OAuthTokens } from '@modelcontextprotocol/sdk/shared/auth'
+import { OAuthClientProvider } from '@modelcontextprotocol/sdk/client/auth.js'
+import {
+  OAuthClientInformation,
+  OAuthClientInformationFull,
+  OAuthTokens
+} from '@modelcontextprotocol/sdk/shared/auth.js'
 import Logger from 'electron-log'
 import open from 'open'
 

src/main/services/mcp/shell-env.ts

@@ -47,7 +47,7 @@ function getLoginShellEnvironment(): Promise<Record<string, string>> {
       commandArgs = ['-ilc', shellCommandToGetEnv] // -i for interactive, -l for login, -c to execute command
     }
 
-    Logger.log(`Spawning shell: ${shellPath} with args: ${commandArgs.join(' ')} in ${homeDirectory}`)
+    Logger.log(`[ShellEnv] Spawning shell: ${shellPath} with args: ${commandArgs.join(' ')} in ${homeDirectory}`)
 
     const child = spawn(shellPath, commandArgs, {
       cwd: homeDirectory, // Run the command in the user's home directory
@@ -85,7 +85,7 @@ function getLoginShellEnvironment(): Promise<Record<string, string>> {
         Logger.warn(`Shell process stderr output (even with exit code 0):\n${errorOutput.trim()}`)
       }
 
-      const env = {}
+      const env: Record<string, string> = {}
       const lines = output.split('\n')
 
       lines.forEach((line) => {
@@ -110,6 +110,8 @@ function getLoginShellEnvironment(): Promise<Record<string, string>> {
         Logger.warn('Raw output from shell:\n', output)
       }
 
+      env.PATH = env.Path || env.PATH || ''
+
       resolve(env)
     })
   })

src/main/services/urlschema/handle-providers.ts

@@ -0,0 +1,37 @@
+import { IpcChannel } from '@shared/IpcChannel'
+import Logger from 'electron-log'
+
+import { windowService } from '../WindowService'
+
+export function handleProvidersProtocolUrl(url: URL) {
+  const params = new URLSearchParams(url.search)
+  switch (url.pathname) {
+    case '/api-keys': {
+      // jsonConfig example:
+      // {
+      //   "id": "tokenflux",
+      //   "baseUrl": "https://tokenflux.ai/v1",
+      //   "apiKey": "sk-xxxx"
+      // }
+      // cherrystudio://providers/api-keys?data={base64Encode(JSON.stringify(jsonConfig))}
+      const data = params.get('data')
+      if (data) {
+        const stringify = Buffer.from(data, 'base64').toString('utf8')
+        Logger.info('get api keys from urlschema: ', stringify)
+        const jsonConfig = JSON.parse(stringify)
+        Logger.info('get api keys from urlschema: ', jsonConfig)
+        const mainWindow = windowService.getMainWindow()
+        if (mainWindow && !mainWindow.isDestroyed()) {
+          mainWindow.webContents.send(IpcChannel.Provider_AddKey, jsonConfig)
+          mainWindow.webContents.executeJavaScript(`window.navigate('/settings/provider?id=${jsonConfig.id}')`)
+        }
+      } else {
+        Logger.error('No data found in URL')
+      }
+      break
+    }
+    default:
+      console.error(`Unknown MCP protocol URL: ${url}`)
+      break
+  }
+}

src/main/services/urlschema/mcp-install.ts

@@ -65,7 +65,7 @@ export function handleMcpProtocolUrl(url: URL) {
 
       const mainWindow = windowService.getMainWindow()
       if (mainWindow && !mainWindow.isDestroyed()) {
-        mainWindow.webContents.executeJavaScript("window.navigate('/settings/mcp')")
+        mainWindow.webContents.executeJavaScript("window.navigate('/mcp-servers')")
       }
       break
     }

src/main/utils/__tests__/aes.test.ts

@@ -0,0 +1,71 @@
+import { describe, expect, it } from 'vitest'
+
+import { decrypt, encrypt } from '../aes'
+
+const key = '12345678901234567890123456789012' // 32字节
+const iv = '1234567890abcdef1234567890abcdef' // 32字节hex，实际应16字节hex
+
+function getIv16() {
+  // 取前16字节作为 hex
+  return iv.slice(0, 32)
+}
+
+describe('aes utils', () => {
+  it('should encrypt and decrypt normal string', () => {
+    const text = 'hello world'
+    const { iv: outIv, encryptedData } = encrypt(text, key, getIv16())
+    expect(typeof encryptedData).toBe('string')
+    expect(outIv).toBe(getIv16())
+    const decrypted = decrypt(encryptedData, getIv16(), key)
+    expect(decrypted).toBe(text)
+  })
+
+  it('should support unicode and special chars', () => {
+    const text = '你好，世界！🌟🚀'
+    const { encryptedData } = encrypt(text, key, getIv16())
+    const decrypted = decrypt(encryptedData, getIv16(), key)
+    expect(decrypted).toBe(text)
+  })
+
+  it('should handle empty string', () => {
+    const text = ''
+    const { encryptedData } = encrypt(text, key, getIv16())
+    const decrypted = decrypt(encryptedData, getIv16(), key)
+    expect(decrypted).toBe(text)
+  })
+
+  it('should encrypt and decrypt long string', () => {
+    const text = 'a'.repeat(100_000)
+    const { encryptedData } = encrypt(text, key, getIv16())
+    const decrypted = decrypt(encryptedData, getIv16(), key)
+    expect(decrypted).toBe(text)
+  })
+
+  it('should throw error for wrong key', () => {
+    const text = 'test'
+    const { encryptedData } = encrypt(text, key, getIv16())
+    expect(() => decrypt(encryptedData, getIv16(), 'wrongkeywrongkeywrongkeywrongkey')).toThrow()
+  })
+
+  it('should throw error for wrong iv', () => {
+    const text = 'test'
+    const { encryptedData } = encrypt(text, key, getIv16())
+    expect(() => decrypt(encryptedData, 'abcdefabcdefabcdefabcdefabcdefab', key)).toThrow()
+  })
+
+  it('should throw error for invalid key/iv length', () => {
+    expect(() => encrypt('test', 'shortkey', getIv16())).toThrow()
+    expect(() => encrypt('test', key, 'shortiv')).toThrow()
+  })
+
+  it('should throw error for invalid encrypted data', () => {
+    expect(() => decrypt('nothexdata', getIv16(), key)).toThrow()
+  })
+
+  it('should throw error for non-string input', () => {
+    // @ts-expect-error purposely pass wrong type to test error branch
+    expect(() => encrypt(null, key, getIv16())).toThrow()
+    // @ts-expect-error purposely pass wrong type to test error branch
+    expect(() => decrypt(null, getIv16(), key)).toThrow()
+  })
+})

src/main/utils/__tests__/file.test.ts

@@ -0,0 +1,243 @@
+import * as fs from 'node:fs'
+import os from 'node:os'
+import path from 'node:path'
+
+import { FileTypes } from '@types'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { getAllFiles, getAppConfigDir, getConfigDir, getFilesDir, getFileType, getTempDir } from '../file'
+
+// Mock dependencies
+vi.mock('node:fs')
+vi.mock('node:os')
+vi.mock('node:path')
+vi.mock('uuid', () => ({
+  v4: () => 'mock-uuid'
+}))
+vi.mock('electron', () => ({
+  app: {
+    getPath: vi.fn((key) => {
+      if (key === 'temp') return '/mock/temp'
+      if (key === 'userData') return '/mock/userData'
+      return '/mock/unknown'
+    })
+  }
+}))
+
+describe('file', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+
+    // Mock path.extname
+    vi.mocked(path.extname).mockImplementation((file) => {
+      const parts = file.split('.')
+      return parts.length > 1 ? `.${parts[parts.length - 1]}` : ''
+    })
+
+    // Mock path.basename
+    vi.mocked(path.basename).mockImplementation((file) => {
+      const parts = file.split('/')
+      return parts[parts.length - 1]
+    })
+
+    // Mock path.join
+    vi.mocked(path.join).mockImplementation((...args) => args.join('/'))
+
+    // Mock os.homedir
+    vi.mocked(os.homedir).mockReturnValue('/mock/home')
+  })
+
+  afterEach(() => {
+    vi.resetAllMocks()
+  })
+
+  describe('getFileType', () => {
+    it('should return IMAGE for image extensions', () => {
+      expect(getFileType('.jpg')).toBe(FileTypes.IMAGE)
+      expect(getFileType('.jpeg')).toBe(FileTypes.IMAGE)
+      expect(getFileType('.png')).toBe(FileTypes.IMAGE)
+      expect(getFileType('.gif')).toBe(FileTypes.IMAGE)
+      expect(getFileType('.webp')).toBe(FileTypes.IMAGE)
+      expect(getFileType('.bmp')).toBe(FileTypes.IMAGE)
+    })
+
+    it('should return VIDEO for video extensions', () => {
+      expect(getFileType('.mp4')).toBe(FileTypes.VIDEO)
+      expect(getFileType('.avi')).toBe(FileTypes.VIDEO)
+      expect(getFileType('.mov')).toBe(FileTypes.VIDEO)
+      expect(getFileType('.mkv')).toBe(FileTypes.VIDEO)
+      expect(getFileType('.flv')).toBe(FileTypes.VIDEO)
+    })
+
+    it('should return AUDIO for audio extensions', () => {
+      expect(getFileType('.mp3')).toBe(FileTypes.AUDIO)
+      expect(getFileType('.wav')).toBe(FileTypes.AUDIO)
+      expect(getFileType('.ogg')).toBe(FileTypes.AUDIO)
+      expect(getFileType('.flac')).toBe(FileTypes.AUDIO)
+      expect(getFileType('.aac')).toBe(FileTypes.AUDIO)
+    })
+
+    it('should return TEXT for text extensions', () => {
+      expect(getFileType('.txt')).toBe(FileTypes.TEXT)
+      expect(getFileType('.md')).toBe(FileTypes.TEXT)
+      expect(getFileType('.html')).toBe(FileTypes.TEXT)
+      expect(getFileType('.json')).toBe(FileTypes.TEXT)
+      expect(getFileType('.js')).toBe(FileTypes.TEXT)
+      expect(getFileType('.ts')).toBe(FileTypes.TEXT)
+      expect(getFileType('.css')).toBe(FileTypes.TEXT)
+      expect(getFileType('.java')).toBe(FileTypes.TEXT)
+      expect(getFileType('.py')).toBe(FileTypes.TEXT)
+    })
+
+    it('should return DOCUMENT for document extensions', () => {
+      expect(getFileType('.pdf')).toBe(FileTypes.DOCUMENT)
+      expect(getFileType('.pptx')).toBe(FileTypes.DOCUMENT)
+      expect(getFileType('.docx')).toBe(FileTypes.DOCUMENT)
+      expect(getFileType('.xlsx')).toBe(FileTypes.DOCUMENT)
+      expect(getFileType('.odt')).toBe(FileTypes.DOCUMENT)
+    })
+
+    it('should return OTHER for unknown extensions', () => {
+      expect(getFileType('.unknown')).toBe(FileTypes.OTHER)
+      expect(getFileType('')).toBe(FileTypes.OTHER)
+      expect(getFileType('.')).toBe(FileTypes.OTHER)
+      expect(getFileType('...')).toBe(FileTypes.OTHER)
+      expect(getFileType('.123')).toBe(FileTypes.OTHER)
+    })
+
+    it('should handle case-insensitive extensions', () => {
+      expect(getFileType('.JPG')).toBe(FileTypes.IMAGE)
+      expect(getFileType('.PDF')).toBe(FileTypes.DOCUMENT)
+      expect(getFileType('.Mp3')).toBe(FileTypes.AUDIO)
+      expect(getFileType('.HtMl')).toBe(FileTypes.TEXT)
+      expect(getFileType('.Xlsx')).toBe(FileTypes.DOCUMENT)
+    })
+
+    it('should handle extensions without leading dot', () => {
+      expect(getFileType('jpg')).toBe(FileTypes.OTHER)
+      expect(getFileType('pdf')).toBe(FileTypes.OTHER)
+      expect(getFileType('mp3')).toBe(FileTypes.OTHER)
+    })
+
+    it('should handle extreme cases', () => {
+      expect(getFileType('.averylongfileextensionname')).toBe(FileTypes.OTHER)
+      expect(getFileType('.tar.gz')).toBe(FileTypes.OTHER)
+      expect(getFileType('.文件')).toBe(FileTypes.OTHER)
+      expect(getFileType('.файл')).toBe(FileTypes.OTHER)
+    })
+  })
+
+  describe('getAllFiles', () => {
+    it('should return all valid files recursively', () => {
+      // Mock file system
+      // @ts-ignore - override type for testing
+      vi.spyOn(fs, 'readdirSync').mockImplementation((dirPath) => {
+        if (dirPath === '/test') {
+          return ['file1.txt', 'file2.pdf', 'subdir']
+        } else if (dirPath === '/test/subdir') {
+          return ['file3.md', 'file4.docx']
+        }
+        return []
+      })
+
+      vi.mocked(fs.statSync).mockImplementation((filePath) => {
+        const isDir = String(filePath).endsWith('subdir')
+        return {
+          isDirectory: () => isDir,
+          size: 1024
+        } as fs.Stats
+      })
+
+      const result = getAllFiles('/test')
+
+      expect(result).toHaveLength(4)
+      expect(result[0].id).toBe('mock-uuid')
+      expect(result[0].name).toBe('file1.txt')
+      expect(result[0].type).toBe(FileTypes.TEXT)
+      expect(result[1].name).toBe('file2.pdf')
+      expect(result[1].type).toBe(FileTypes.DOCUMENT)
+    })
+
+    it('should skip hidden files', () => {
+      // @ts-ignore - override type for testing
+      vi.spyOn(fs, 'readdirSync').mockReturnValue(['.hidden', 'visible.txt'])
+      vi.mocked(fs.statSync).mockReturnValue({
+        isDirectory: () => false,
+        size: 1024
+      } as fs.Stats)
+
+      const result = getAllFiles('/test')
+
+      expect(result).toHaveLength(1)
+      expect(result[0].name).toBe('visible.txt')
+    })
+
+    it('should skip unsupported file types', () => {
+      // @ts-ignore - override type for testing
+      vi.spyOn(fs, 'readdirSync').mockReturnValue(['image.jpg', 'video.mp4', 'audio.mp3', 'document.pdf'])
+      vi.mocked(fs.statSync).mockReturnValue({
+        isDirectory: () => false,
+        size: 1024
+      } as fs.Stats)
+
+      const result = getAllFiles('/test')
+
+      // Should only include document.pdf as the others are excluded types
+      expect(result).toHaveLength(1)
+      expect(result[0].name).toBe('document.pdf')
+      expect(result[0].type).toBe(FileTypes.DOCUMENT)
+    })
+
+    it('should return empty array for empty directory', () => {
+      // @ts-ignore - override type for testing
+      vi.spyOn(fs, 'readdirSync').mockReturnValue([])
+
+      const result = getAllFiles('/empty')
+
+      expect(result).toHaveLength(0)
+    })
+
+    it('should handle file system errors', () => {
+      // @ts-ignore - override type for testing
+      vi.spyOn(fs, 'readdirSync').mockImplementation(() => {
+        throw new Error('Directory not found')
+      })
+
+      // Since the function doesn't have error handling, we expect it to propagate
+      expect(() => getAllFiles('/nonexistent')).toThrow('Directory not found')
+    })
+  })
+
+  describe('getTempDir', () => {
+    it('should return correct temp directory path', () => {
+      const tempDir = getTempDir()
+      expect(tempDir).toBe('/mock/temp/CherryStudio')
+    })
+  })
+
+  describe('getFilesDir', () => {
+    it('should return correct files directory path', () => {
+      const filesDir = getFilesDir()
+      expect(filesDir).toBe('/mock/userData/Data/Files')
+    })
+  })
+
+  describe('getConfigDir', () => {
+    it('should return correct config directory path', () => {
+      const configDir = getConfigDir()
+      expect(configDir).toBe('/mock/home/.cherrystudio/config')
+    })
+  })
+
+  describe('getAppConfigDir', () => {
+    it('should return correct app config directory path', () => {
+      const appConfigDir = getAppConfigDir('test-app')
+      expect(appConfigDir).toBe('/mock/home/.cherrystudio/config/test-app')
+    })
+
+    it('should handle empty app name', () => {
+      const appConfigDir = getAppConfigDir('')
+      expect(appConfigDir).toBe('/mock/home/.cherrystudio/config/')
+    })
+  })
+})

src/main/utils/__tests__/zip.test.ts

@@ -0,0 +1,61 @@
+import { describe, expect, it } from 'vitest'
+
+import { compress, decompress } from '../zip'
+
+const jsonStr = JSON.stringify({ foo: 'bar', num: 42, arr: [1, 2, 3] })
+
+// 辅助函数：生成大字符串
+function makeLargeString(size: number) {
+  return 'a'.repeat(size)
+}
+
+describe('zip', () => {
+  describe('compress & decompress', () => {
+    it('should compress and decompress a normal JSON string', async () => {
+      const compressed = await compress(jsonStr)
+      expect(compressed).toBeInstanceOf(Buffer)
+
+      const decompressed = await decompress(compressed)
+      expect(decompressed).toBe(jsonStr)
+    })
+
+    it('should handle empty string', async () => {
+      const compressed = await compress('')
+      expect(compressed).toBeInstanceOf(Buffer)
+      const decompressed = await decompress(compressed)
+      expect(decompressed).toBe('')
+    })
+
+    it('should handle large string', async () => {
+      const largeStr = makeLargeString(100_000)
+      const compressed = await compress(largeStr)
+      expect(compressed).toBeInstanceOf(Buffer)
+      expect(compressed.length).toBeLessThan(largeStr.length)
+      const decompressed = await decompress(compressed)
+      expect(decompressed).toBe(largeStr)
+    })
+
+    it('should throw error when decompressing invalid buffer', async () => {
+      const invalidBuffer = Buffer.from('not a valid gzip', 'utf-8')
+      await expect(decompress(invalidBuffer)).rejects.toThrow()
+    })
+
+    it('should throw error when compress input is not string', async () => {
+      // @ts-expect-error purposely pass wrong type to test error branch
+      await expect(compress(null)).rejects.toThrow()
+      // @ts-expect-error purposely pass wrong type to test error branch
+      await expect(compress(undefined)).rejects.toThrow()
+      // @ts-expect-error purposely pass wrong type to test error branch
+      await expect(compress(123)).rejects.toThrow()
+    })
+
+    it('should throw error when decompress input is not buffer', async () => {
+      // @ts-expect-error purposely pass wrong type to test error branch
+      await expect(decompress(null)).rejects.toThrow()
+      // @ts-expect-error purposely pass wrong type to test error branch
+      await expect(decompress(undefined)).rejects.toThrow()
+      // @ts-expect-error purposely pass wrong type to test error branch
+      await expect(decompress('string')).rejects.toThrow()
+    })
+  })
+})

src/main/utils/mcp.ts

@@ -0,0 +1,34 @@
+export function buildFunctionCallToolName(serverName: string, toolName: string) {
+  const sanitizedServer = serverName.trim().replace(/-/g, '_')
+  const sanitizedTool = toolName.trim().replace(/-/g, '_')
+
+  // Combine server name and tool name
+  let name = sanitizedTool
+  if (!sanitizedTool.includes(sanitizedServer.slice(0, 7))) {
+    name = `${sanitizedServer.slice(0, 7) || ''}-${sanitizedTool || ''}`
+  }
+
+  // Replace invalid characters with underscores or dashes
+  // Keep a-z, A-Z, 0-9, underscores and dashes
+  name = name.replace(/[^a-zA-Z0-9_-]/g, '_')
+
+  // Ensure name starts with a letter or underscore (for valid JavaScript identifier)
+  if (!/^[a-zA-Z]/.test(name)) {
+    name = `tool-${name}`
+  }
+
+  // Remove consecutive underscores/dashes (optional improvement)
+  name = name.replace(/[_-]{2,}/g, '_')
+
+  // Truncate to 63 characters maximum
+  if (name.length > 63) {
+    name = name.slice(0, 63)
+  }
+
+  // Handle edge case: ensure we still have a valid name if truncation left invalid chars at edges
+  if (name.endsWith('_') || name.endsWith('-')) {
+    name = name.slice(0, -1)
+  }
+
+  return name
+}

src/main/utils/windowUtil.ts

@@ -1,5 +1,7 @@
 import { BrowserWindow } from 'electron'
 
+import { isDev, isWin } from '../constant'
+
 function isTilingWindowManager() {
   if (process.platform === 'darwin') {
     return false
@@ -15,31 +17,59 @@ function isTilingWindowManager() {
   return tilingSystems.some((system) => desktopEnv?.includes(system))
 }
 
+//see: https://github.com/electron/electron/issues/42055#issuecomment-2449365647
 export const replaceDevtoolsFont = (browserWindow: BrowserWindow) => {
-  if (process.platform === 'win32') {
+  //only for windows and dev, don't do this in production to avoid performance issues
+  if (isWin && isDev) {
     browserWindow.webContents.on('devtools-opened', () => {
       const css = `
         :root {
             --sys-color-base: var(--ref-palette-neutral100);
-            --source-code-font-family: consolas;
+            --source-code-font-family: consolas !important;
             --source-code-font-size: 12px;
-            --monospace-font-family: consolas;
+            --monospace-font-family: consolas !important;
             --monospace-font-size: 12px;
             --default-font-family: system-ui, sans-serif;
             --default-font-size: 12px;
+            --ref-palette-neutral99: #ffffffff;
         }
-        .-theme-with-dark-background {
+        .theme-with-dark-background {
             --sys-color-base: var(--ref-palette-secondary25);
         }
         body {
-            --default-font-family: system-ui,sans-serif;
-        }`
-
+            --default-font-family: system-ui, sans-serif;
+        }
+    `
       browserWindow.webContents.devToolsWebContents?.executeJavaScript(`
         const overriddenStyle = document.createElement('style');
         overriddenStyle.innerHTML = '${css.replaceAll('\n', ' ')}';
         document.body.append(overriddenStyle);
-        document.body.classList.remove('platform-windows');`)
+        document.querySelectorAll('.platform-windows').forEach(el => el.classList.remove('platform-windows'));
+        addStyleToAutoComplete();
+        const observer = new MutationObserver((mutationList, observer) => {
+            for (const mutation of mutationList) {
+                if (mutation.type === 'childList') {
+                    for (let i = 0; i < mutation.addedNodes.length; i++) {
+                        const item = mutation.addedNodes[i];
+                        if (item.classList.contains('editor-tooltip-host')) {
+                            addStyleToAutoComplete();
+                        }
+                    }
+                }
+            }
+        });
+        observer.observe(document.body, {childList: true});
+        function addStyleToAutoComplete() {
+            document.querySelectorAll('.editor-tooltip-host').forEach(element => {
+                if (element.shadowRoot.querySelectorAll('[data-key="overridden-dev-tools-font"]').length === 0) {
+                    const overriddenStyle = document.createElement('style');
+                    overriddenStyle.setAttribute('data-key', 'overridden-dev-tools-font');
+                    overriddenStyle.innerHTML = '.cm-tooltip-autocomplete ul[role=listbox] {font-family: consolas !important;}';
+                    element.shadowRoot.append(overriddenStyle);
+                }
+            });
+        }
+    `)
     })
   }
 }

src/main/utils/zip.ts

@@ -9,10 +9,10 @@ const gunzipPromise = util.promisify(zlib.gunzip)
 
 /**
  * 压缩字符串
+ * @param {string} str 要压缩的 JSON 字符串
  * @returns {Promise<Buffer>} 压缩后的 Buffer
- * @param str
  */
-export async function compress(str) {
+export async function compress(str: string): Promise<Buffer> {
   try {
     const buffer = Buffer.from(str, 'utf-8')
     return await gzipPromise(buffer)
@@ -27,7 +27,7 @@ export async function compress(str) {
  * @param {Buffer} compressedBuffer - 压缩的 Buffer
  * @returns {Promise<string>} 解压缩后的 JSON 字符串
  */
-export async function decompress(compressedBuffer) {
+export async function decompress(compressedBuffer: Buffer): Promise<string> {
   try {
     const buffer = await gunzipPromise(compressedBuffer)
     return buffer.toString('utf-8')

src/preload/index.ts

@@ -1,10 +1,14 @@
 import type { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
 import { electronAPI } from '@electron-toolkit/preload'
+import { FeedUrl } from '@shared/config/constant'
 import { IpcChannel } from '@shared/IpcChannel'
-import { FileType, KnowledgeBaseParams, KnowledgeItem, MCPServer, Shortcut, WebDavConfig } from '@types'
-import { contextBridge, ipcRenderer, OpenDialogOptions, shell } from 'electron'
+import { FileType, KnowledgeBaseParams, KnowledgeItem, MCPServer, Shortcut, ThemeMode, WebDavConfig } from '@types'
+import { contextBridge, ipcRenderer, OpenDialogOptions, shell, webUtils } from 'electron'
+import { Notification } from 'src/renderer/src/types/notification'
 import { CreateDirectoryOptions } from 'webdav'
 
+import type { ActionItem } from '../renderer/src/types/selectionTypes'
+
 // Custom APIs for renderer
 const api = {
   getAppInfo: () => ipcRenderer.invoke(IpcChannel.App_Info),
@@ -17,14 +21,17 @@ const api = {
   setLaunchToTray: (isActive: boolean) => ipcRenderer.invoke(IpcChannel.App_SetLaunchToTray, isActive),
   setTray: (isActive: boolean) => ipcRenderer.invoke(IpcChannel.App_SetTray, isActive),
   setTrayOnClose: (isActive: boolean) => ipcRenderer.invoke(IpcChannel.App_SetTrayOnClose, isActive),
-  restartTray: () => ipcRenderer.invoke(IpcChannel.App_RestartTray),
-  setTheme: (theme: 'light' | 'dark' | 'auto') => ipcRenderer.invoke(IpcChannel.App_SetTheme, theme),
+  setFeedUrl: (feedUrl: FeedUrl) => ipcRenderer.invoke(IpcChannel.App_SetFeedUrl, feedUrl),
+  setTheme: (theme: ThemeMode) => ipcRenderer.invoke(IpcChannel.App_SetTheme, theme),
   handleZoomFactor: (delta: number, reset: boolean = false) =>
     ipcRenderer.invoke(IpcChannel.App_HandleZoomFactor, delta, reset),
   setAutoUpdate: (isActive: boolean) => ipcRenderer.invoke(IpcChannel.App_SetAutoUpdate, isActive),
   openWebsite: (url: string) => ipcRenderer.invoke(IpcChannel.Open_Website, url),
   getCacheSize: () => ipcRenderer.invoke(IpcChannel.App_GetCacheSize),
   clearCache: () => ipcRenderer.invoke(IpcChannel.App_ClearCache),
+  notification: {
+    send: (notification: Notification) => ipcRenderer.invoke(IpcChannel.Notification_Send, notification)
+  },
   system: {
     getDeviceType: () => ipcRenderer.invoke(IpcChannel.System_GetDeviceType),
     getHostname: () => ipcRenderer.invoke(IpcChannel.System_GetHostname)
@@ -37,8 +44,8 @@ const api = {
     decompress: (text: Buffer) => ipcRenderer.invoke(IpcChannel.Zip_Decompress, text)
   },
   backup: {
-    backup: (fileName: string, data: string, destinationPath?: string) =>
-      ipcRenderer.invoke(IpcChannel.Backup_Backup, fileName, data, destinationPath),
+    backup: (fileName: string, data: string, destinationPath?: string, skipBackupFile?: boolean) =>
+      ipcRenderer.invoke(IpcChannel.Backup_Backup, fileName, data, destinationPath, skipBackupFile),
     restore: (backupPath: string) => ipcRenderer.invoke(IpcChannel.Backup_Restore, backupPath),
     backupToWebdav: (data: string, webdavConfig: WebDavConfig) =>
       ipcRenderer.invoke(IpcChannel.Backup_BackupToWebdav, data, webdavConfig),
@@ -70,13 +77,16 @@ const api = {
     selectFolder: () => ipcRenderer.invoke(IpcChannel.File_SelectFolder),
     saveImage: (name: string, data: string) => ipcRenderer.invoke(IpcChannel.File_SaveImage, name, data),
     base64Image: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_Base64Image, fileId),
-    download: (url: string) => ipcRenderer.invoke(IpcChannel.File_Download, url),
+    saveBase64Image: (data: string) => ipcRenderer.invoke(IpcChannel.File_SaveBase64Image, data),
+    download: (url: string, isUseContentType?: boolean) =>
+      ipcRenderer.invoke(IpcChannel.File_Download, url, isUseContentType),
     copy: (fileId: string, destPath: string) => ipcRenderer.invoke(IpcChannel.File_Copy, fileId, destPath),
     binaryImage: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_BinaryImage, fileId),
-    base64File: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_Base64File, fileId)
+    base64File: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_Base64File, fileId),
+    getPathForFile: (file: File) => webUtils.getPathForFile(file)
   },
   fs: {
-    read: (path: string) => ipcRenderer.invoke(IpcChannel.Fs_Read, path)
+    read: (pathOrUrl: string, encoding?: BufferEncoding) => ipcRenderer.invoke(IpcChannel.Fs_Read, pathOrUrl, encoding)
   },
   export: {
     toWord: (markdown: string, fileName: string) => ipcRenderer.invoke(IpcChannel.Export_Word, markdown, fileName)
@@ -111,14 +121,16 @@ const api = {
     resetMinimumSize: () => ipcRenderer.invoke(IpcChannel.Windows_ResetMinimumSize)
   },
   gemini: {
-    uploadFile: (file: FileType, apiKey: string) => ipcRenderer.invoke(IpcChannel.Gemini_UploadFile, file, apiKey),
+    uploadFile: (file: FileType, { apiKey, baseURL }: { apiKey: string; baseURL: string }) =>
+      ipcRenderer.invoke(IpcChannel.Gemini_UploadFile, file, { apiKey, baseURL }),
     base64File: (file: FileType) => ipcRenderer.invoke(IpcChannel.Gemini_Base64File, file),
     retrieveFile: (file: FileType, apiKey: string) => ipcRenderer.invoke(IpcChannel.Gemini_RetrieveFile, file, apiKey),
     listFiles: (apiKey: string) => ipcRenderer.invoke(IpcChannel.Gemini_ListFiles, apiKey),
     deleteFile: (fileId: string, apiKey: string) => ipcRenderer.invoke(IpcChannel.Gemini_DeleteFile, fileId, apiKey)
   },
   config: {
-    set: (key: string, value: any) => ipcRenderer.invoke(IpcChannel.Config_Set, key, value),
+    set: (key: string, value: any, isNotify: boolean = false) =>
+      ipcRenderer.invoke(IpcChannel.Config_Set, key, value, isNotify),
     get: (key: string) => ipcRenderer.invoke(IpcChannel.Config_Get, key)
   },
   miniWindow: {
@@ -147,7 +159,8 @@ const api = {
     listResources: (server: MCPServer) => ipcRenderer.invoke(IpcChannel.Mcp_ListResources, server),
     getResource: ({ server, uri }: { server: MCPServer; uri: string }) =>
       ipcRenderer.invoke(IpcChannel.Mcp_GetResource, { server, uri }),
-    getInstallInfo: () => ipcRenderer.invoke(IpcChannel.Mcp_GetInstallInfo)
+    getInstallInfo: () => ipcRenderer.invoke(IpcChannel.Mcp_GetInstallInfo),
+    checkMcpConnectivity: (server: any) => ipcRenderer.invoke(IpcChannel.Mcp_CheckConnectivity, server)
   },
   shell: {
     openExternal: (url: string, options?: Electron.OpenExternalOptions) => shell.openExternal(url, options)
@@ -197,7 +210,26 @@ const api = {
     subscribe: () => ipcRenderer.invoke(IpcChannel.StoreSync_Subscribe),
     unsubscribe: () => ipcRenderer.invoke(IpcChannel.StoreSync_Unsubscribe),
     onUpdate: (action: any) => ipcRenderer.invoke(IpcChannel.StoreSync_OnUpdate, action)
-  }
+  },
+  selection: {
+    hideToolbar: () => ipcRenderer.invoke(IpcChannel.Selection_ToolbarHide),
+    writeToClipboard: (text: string) => ipcRenderer.invoke(IpcChannel.Selection_WriteToClipboard, text),
+    determineToolbarSize: (width: number, height: number) =>
+      ipcRenderer.invoke(IpcChannel.Selection_ToolbarDetermineSize, width, height),
+    setEnabled: (enabled: boolean) => ipcRenderer.invoke(IpcChannel.Selection_SetEnabled, enabled),
+    setTriggerMode: (triggerMode: string) => ipcRenderer.invoke(IpcChannel.Selection_SetTriggerMode, triggerMode),
+    setFollowToolbar: (isFollowToolbar: boolean) =>
+      ipcRenderer.invoke(IpcChannel.Selection_SetFollowToolbar, isFollowToolbar),
+    setRemeberWinSize: (isRemeberWinSize: boolean) =>
+      ipcRenderer.invoke(IpcChannel.Selection_SetRemeberWinSize, isRemeberWinSize),
+    setFilterMode: (filterMode: string) => ipcRenderer.invoke(IpcChannel.Selection_SetFilterMode, filterMode),
+    setFilterList: (filterList: string[]) => ipcRenderer.invoke(IpcChannel.Selection_SetFilterList, filterList),
+    processAction: (actionItem: ActionItem) => ipcRenderer.invoke(IpcChannel.Selection_ProcessAction, actionItem),
+    closeActionWindow: () => ipcRenderer.invoke(IpcChannel.Selection_ActionWindowClose),
+    minimizeActionWindow: () => ipcRenderer.invoke(IpcChannel.Selection_ActionWindowMinimize),
+    pinActionWindow: (isPinned: boolean) => ipcRenderer.invoke(IpcChannel.Selection_ActionWindowPin, isPinned)
+  },
+  quoteToMainWindow: (text: string) => ipcRenderer.invoke(IpcChannel.App_QuoteToMain, text)
 }
 
 // Use `contextBridge` APIs to expose Electron APIs to

src/renderer/__tests__/setup.ts

@@ -1,20 +0,0 @@
-import { vi } from 'vitest'
-
-vi.mock('electron-log/renderer', () => {
-  return {
-    default: {
-      info: console.log,
-      error: console.error,
-      warn: console.warn,
-      debug: console.debug,
-      verbose: console.log,
-      silly: console.log,
-      log: console.log,
-      transports: {
-        console: {
-          level: 'info'
-        }
-      }
-    }
-  }
-})

src/renderer/index.html

@@ -5,7 +5,7 @@
   <meta charset="UTF-8" />
   <meta name="viewport" content="initial-scale=1, width=device-width" />
   <meta http-equiv="Content-Security-Policy"
-    content="default-src 'self'; connect-src blob: *; script-src 'self' 'unsafe-eval' *; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' *; font-src 'self' data: *; img-src 'self' data: file: * blob:; frame-src * file:" />
+    content="default-src 'self'; connect-src blob: *; script-src 'self' 'unsafe-eval' 'unsafe-inline' *; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' *; font-src 'self' data: *; img-src 'self' data: file: * blob:; frame-src * file:" />
   <title>Cherry Studio</title>
 
   <style>
@@ -21,7 +21,7 @@
       flex-direction: row;
       justify-content: center;
       align-items: center;
-      display: none;
+      display: flex;
     }
 
     #spinner img {
@@ -36,6 +36,9 @@
   <div id="spinner">
     <img src="/src/assets/images/logo.png" />
   </div>
+  <script>
+    console.time('init')
+  </script>
   <script type="module" src="/src/init.ts"></script>
   <script type="module" src="/src/entryPoint.tsx"></script>
 </body>

src/renderer/selectionAction.html

@@ -0,0 +1,41 @@
+<!doctype html>
+<html lang="zh-CN">
+
+<head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="initial-scale=1, width=device-width" />
+    <meta http-equiv="Content-Security-Policy"
+        content="default-src 'self'; connect-src blob: *; script-src 'self' 'unsafe-eval' *; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' *; font-src 'self' data: *; img-src 'self' data: file: * blob:; frame-src * file:" />
+    <title>Cherry Studio Selection Assistant</title>
+
+</head>
+
+<body>
+    <div id="root"></div>
+    <script type="module" src="/src/windows/selection/action/entryPoint.tsx"></script>
+    <style>
+        html {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
+
+        body {
+            width: 100vw;
+            height: 100vh;
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
+
+        #root {
+            margin: 0;
+            padding: 0;
+            width: 100%;
+            height: 100%;
+            box-sizing: border-box;
+        }
+    </style>
+</body>
+
+</html>

src/renderer/selectionToolbar.html

@@ -0,0 +1,43 @@
+<!doctype html>
+<html lang="zh-CN">
+
+<head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="initial-scale=1, width=device-width" />
+    <meta http-equiv="Content-Security-Policy"
+        content="default-src 'self'; connect-src blob: *; script-src 'self' 'unsafe-eval' *; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' *; font-src 'self' data: *; img-src 'self' data: file: * blob:; frame-src * file:" />
+    <title>Cherry Studio Selection Toolbar</title>
+
+</head>
+
+<body>
+    <div id="root"></div>
+    <script type="module" src="/src/windows/selection/toolbar/entryPoint.tsx"></script>
+    <style>
+        html {
+            margin: 0;
+        }
+
+        body {
+            margin: 0;
+            padding: 0;
+            overflow: hidden;
+            width: 100vw;
+            height: 100vh;
+
+            -webkit-user-select: none;
+            -moz-user-select: none;
+            -ms-user-select: none;
+            user-select: none;
+        }
+
+        #root {
+            margin: 0;
+            padding: 0;
+            width: max-content !important;
+            height: fit-content !important;
+        }
+    </style>
+</body>
+
+</html>

src/renderer/src/App.tsx

@@ -5,21 +5,17 @@ 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 MainSidebar from './components/app/MainSidebar'
 import TopViewContainer from './components/TopView'
 import AntdProvider from './context/AntdProvider'
+import { CodeStyleProvider } from './context/CodeStyleProvider'
+import { NotificationProvider } from './context/NotificationProvider'
 import StyleSheetManager from './context/StyleSheetManager'
-import { SyntaxHighlighterProvider } from './context/SyntaxHighlighterProvider'
 import { ThemeProvider } from './context/ThemeProvider'
 import NavigationHandler from './handler/NavigationHandler'
-import AgentsPage from './pages/agents/AgentsPage'
-import AppsPage from './pages/apps/AppsPage'
-import FilesPage from './pages/files/FilesPage'
+import DiscoverPage from './pages/discover'
 import HomePage from './pages/home/HomePage'
-import KnowledgePage from './pages/knowledge/KnowledgePage'
-import PaintingsRoutePage from './pages/paintings/PaintingsRoutePage'
 import SettingsPage from './pages/settings/SettingsPage'
-import TranslatePage from './pages/translate/TranslatePage'
 
 function App(): React.ReactElement {
   return (
@@ -27,26 +23,30 @@ function App(): React.ReactElement {
       <StyleSheetManager>
         <ThemeProvider>
           <AntdProvider>
-            <SyntaxHighlighterProvider>
-              <PersistGate loading={null} persistor={persistor}>
-                <TopViewContainer>
-                  <HashRouter>
-                    <NavigationHandler />
-                    <Sidebar />
-                    <Routes>
-                      <Route path="/" element={<HomePage />} />
-                      <Route path="/agents" element={<AgentsPage />} />
-                      <Route path="/paintings/*" element={<PaintingsRoutePage />} />
-                      <Route path="/translate" element={<TranslatePage />} />
-                      <Route path="/files" element={<FilesPage />} />
-                      <Route path="/knowledge" element={<KnowledgePage />} />
-                      <Route path="/apps" element={<AppsPage />} />
-                      <Route path="/settings/*" element={<SettingsPage />} />
-                    </Routes>
-                  </HashRouter>
-                </TopViewContainer>
-              </PersistGate>
-            </SyntaxHighlighterProvider>
+            <NotificationProvider>
+              <CodeStyleProvider>
+                <PersistGate loading={null} persistor={persistor}>
+                  <TopViewContainer>
+                    <HashRouter>
+                      <NavigationHandler />
+                      <MainSidebar />
+                      <Routes>
+                        <Route path="/" element={<HomePage />} />
+                        {/* <Route path="/agents" element={<AgentsPage />} /> */}
+                        {/* <Route path="/paintings/*" element={<PaintingsRoutePage />} /> */}
+                        {/* <Route path="/translate" element={<TranslatePage />} /> */}
+                        {/* <Route path="/files" element={<FilesPage />} /> */}
+                        {/* <Route path="/knowledge" element={<KnowledgePage />} /> */}
+                        {/* <Route path="/apps" element={<AppsPage />} /> */}
+                        {/* <Route path="/mcp-servers/*" element={<McpServersPage />} /> */}
+                        <Route path="/settings/*" element={<SettingsPage />} />
+                        <Route path="/discover/*" element={<DiscoverPage />} />
+                      </Routes>
+                    </HashRouter>
+                  </TopViewContainer>
+                </PersistGate>
+              </CodeStyleProvider>
+            </NotificationProvider>
           </AntdProvider>
         </ThemeProvider>
       </StyleSheetManager>

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

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48"><defs><path id="a" d="M44.5 20H24v8.5h11.8C34.7 33.9 30.1 37 24 37c-7.2 0-13-5.8-13-13s5.8-13 13-13c3.1 0 5.9 1.1 8.1 2.9l6.4-6.4C34.6 4.1 29.6 2 24 2 11.8 2 2 11.8 2 24s9.8 22 22 22c11 0 21-8 21-22 0-1.3-.2-2.7-.5-4z"/></defs><clipPath id="b"><use xlink:href="#a" overflow="visible"/></clipPath><path clip-path="url(#b)" fill="#FBBC05" d="M0 37V11l17 13z"/><path clip-path="url(#b)" fill="#EA4335" d="M0 11l17 13 7-6.1L48 14V0H0z"/><path clip-path="url(#b)" fill="#34A853" d="M0 37l30-23 7.9 1L48 0v48H0z"/><path clip-path="url(#b)" fill="#4285F4" d="M48 48L17 24l-4-3 35-10z"/></svg>

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

@@ -17,7 +17,7 @@
 }
 
 .ant-tabs-tab-btn {
-  outline: none;
+  outline: none !important;
 }
 
 .ant-segmented-group {
@@ -25,7 +25,6 @@
 }
 
 .minapp-drawer {
-  max-width: calc(100vw - var(--sidebar-width));
   .ant-drawer-content-wrapper {
     box-shadow: none;
   }
@@ -33,7 +32,7 @@
     position: absolute;
     -webkit-app-region: drag;
     min-height: calc(var(--navbar-height) + 0.5px);
-    width: calc(100vw - var(--sidebar-width));
+    width: 100%;
     margin-top: -0.5px;
     border-bottom: none;
   }
@@ -206,8 +205,14 @@
 
 .ant-collapse {
   border: 1px solid var(--color-border);
+  .ant-color-picker & {
+    border: none;
+  }
 }
 
 .ant-collapse-content {
   border-top: 1px solid var(--color-border) !important;
+  .ant-color-picker & {
+    border-top: none !important;
+  }
 }

src/renderer/src/assets/styles/color.scss

@@ -0,0 +1,142 @@
+:root {
+  --color-white: #ffffff;
+  --color-white-soft: rgba(255, 255, 255, 0.8);
+  --color-white-mute: rgba(255, 255, 255, 0.94);
+
+  --color-black: #181818;
+  --color-black-soft: #222222;
+  --color-black-mute: #333333;
+
+  --color-gray-1: #515c67;
+  --color-gray-2: #414853;
+  --color-gray-3: #32363f;
+
+  --color-text-1: rgba(255, 255, 245, 0.9);
+  --color-text-2: rgba(235, 235, 245, 0.6);
+  --color-text-3: rgba(235, 235, 245, 0.38);
+
+  --color-background: var(--color-black);
+  --color-background-soft: var(--color-black-soft);
+  --color-background-mute: var(--color-black-mute);
+  --color-background-opacity: rgba(34, 34, 34, 0.7);
+  --inner-glow-opacity: 0.3; // For the glassmorphism effect in the dropdown menu
+
+  --color-primary: #00b96b;
+  --color-primary-soft: #00b96b99;
+  --color-primary-mute: #00b96b33;
+
+  --color-text: var(--color-text-1);
+  --color-text-secondary: rgba(235, 235, 245, 0.7);
+  --color-icon: #ffffff99;
+  --color-icon-white: #ffffff;
+  --color-border: #383838;
+  --color-border-soft: #ffffff10;
+  --color-border-mute: #ffffff05;
+  --color-error: #f44336;
+  --color-link: #338cff;
+  --color-code-background: #323232;
+  --color-hover: rgba(40, 40, 40, 1);
+  --color-active: rgba(55, 55, 55, 1);
+  --color-frame-border: #333;
+  --color-group-background: var(--color-background-soft);
+
+  --color-reference: #404040;
+  --color-reference-text: #ffffff;
+  --color-reference-background: #0b0e12;
+
+  --color-list-item: rgba(255, 255, 255, 0.1);
+  --color-list-item-hover: rgba(255, 255, 255, 0.05);
+
+  --modal-background: #1f1f1f;
+
+  --color-highlight: rgba(0, 0, 0, 1);
+  --color-background-highlight: rgba(255, 255, 0, 0.9);
+  --color-background-highlight-accent: rgba(255, 150, 50, 0.9);
+
+  --navbar-background-mac: rgba(20, 20, 20, 0.55);
+  --navbar-background: #1f1f1f;
+
+  --navbar-height: 42px;
+  --sidebar-width: 50px;
+  --status-bar-height: 40px;
+  --input-bar-height: 100px;
+
+  --assistants-width: 275px;
+  --topic-list-width: 275px;
+  --settings-width: 250px;
+  --scrollbar-width: 5px;
+
+  --chat-background: #111111;
+  --chat-background-user: #28b561;
+  --chat-background-assistant: #2c2c2c;
+  --chat-text-user: var(--color-black);
+
+  --list-item-border-radius: 8px;
+  --border-width: 0.5px;
+}
+
+[theme-mode='light'] {
+  --color-white: #ffffff;
+  --color-white-soft: rgba(0, 0, 0, 0.04);
+  --color-white-mute: #eee;
+
+  --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: var(--color-white);
+  --color-background-soft: var(--color-white-soft);
+  --color-background-mute: var(--color-white-mute);
+  --color-background-opacity: rgba(235, 235, 235, 0.7);
+  --inner-glow-opacity: 0.1;
+
+  --color-primary: #00b96b;
+  --color-primary-soft: #00b96b99;
+  --color-primary-mute: #00b96b33;
+
+  --color-text: var(--color-text-1);
+  --color-text-secondary: rgba(0, 0, 0, 0.75);
+  --color-icon: #00000099;
+  --color-icon-white: #000000;
+  --color-border: #00000019;
+  --color-border-soft: #00000010;
+  --color-border-mute: #00000005;
+  --color-error: #f44336;
+  --color-link: #1677ff;
+  --color-code-background: #e3e3e3;
+  --color-hover: var(--color-white-mute);
+  --color-active: var(--color-white-soft);
+  --color-frame-border: #ddd;
+  --color-group-background: var(--color-white);
+
+  --color-reference: #cfe1ff;
+  --color-reference-text: #000000;
+  --color-reference-background: #f1f7ff;
+
+  --color-list-item: rgba(255, 255, 255, 0.9);
+  --color-list-item-hover: rgba(255, 255, 255, 0.5);
+
+  --modal-background: var(--color-white);
+
+  --color-highlight: initial;
+  --color-background-highlight: rgba(255, 255, 0, 0.5);
+  --color-background-highlight-accent: rgba(255, 150, 50, 0.5);
+
+  --navbar-background-mac: rgba(255, 255, 255, 0.55);
+  --navbar-background: rgba(244, 244, 244);
+
+  --chat-background: #f3f3f3;
+  --chat-background-user: #95ec69;
+  --chat-background-assistant: #ffffff;
+  --chat-text-user: var(--color-text);
+
+  --border-width: 0.5px;
+}

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

@@ -1,6 +1,14 @@
 #content-container {
   background-color: var(--color-background);
   border-top: 0.5px solid var(--color-border);
-  border-top-left-radius: 10px;
-  border-left: 0.5px solid var(--color-border);
+}
+
+.group-container {
+  .context-menu-container {
+    width: 100%;
+  }
+}
+
+.context-menu-container {
+  max-width: 100%;
 }

src/renderer/src/assets/styles/font.scss

@@ -0,0 +1,12 @@
+:root {
+  --font-family:
+    Ubuntu, -apple-system, BlinkMacSystemFont, 'Segoe UI', system-ui, Roboto, Oxygen, Cantarell, 'Open Sans',
+    'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
+    'Noto Color Emoji';
+
+  --font-family-serif:
+    serif, -apple-system, BlinkMacSystemFont, 'Segoe UI', system-ui, Ubuntu, Roboto, Oxygen, Cantarell, 'Open Sans',
+    'Helvetica Neue', Arial, 'Noto Sans', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+
+  --code-font-family: 'Cascadia Code', 'Fira Code', 'Consolas', Menlo, Courier, monospace;
+}

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

@@ -1,3 +1,5 @@
+@use './color.scss';
+@use './font.scss';
 @use './markdown.scss';
 @use './ant.scss';
 @use './scrollbar.scss';
@@ -6,141 +8,11 @@
 @import '../fonts/icon-fonts/iconfont.css';
 @import '../fonts/ubuntu/ubuntu.css';
 
-:root {
-  --color-white: #ffffff;
-  --color-white-soft: rgba(255, 255, 255, 0.8);
-  --color-white-mute: rgba(255, 255, 255, 0.94);
-
-  --color-black: #181818;
-  --color-black-soft: #222222;
-  --color-black-mute: #333333;
-
-  --color-gray-1: #515c67;
-  --color-gray-2: #414853;
-  --color-gray-3: #32363f;
-
-  --color-text-1: rgba(255, 255, 245, 0.9);
-  --color-text-2: rgba(235, 235, 245, 0.6);
-  --color-text-3: rgba(235, 235, 245, 0.38);
-
-  --color-background: var(--color-black);
-  --color-background-soft: var(--color-black-soft);
-  --color-background-mute: var(--color-black-mute);
-  --color-background-opacity: rgba(34, 34, 34, 0.7);
-  --inner-glow-opacity: 0.3; // For the glassmorphism effect in the dropdown menu
-
-  --color-primary: #00b96b;
-  --color-primary-soft: #00b96b99;
-  --color-primary-mute: #00b96b33;
-
-  --color-text: var(--color-text-1);
-  --color-icon: #ffffff99;
-  --color-icon-white: #ffffff;
-  --color-border: #ffffff19;
-  --color-border-soft: #ffffff10;
-  --color-border-mute: #ffffff05;
-  --color-error: #f44336;
-  --color-link: #338cff;
-  --color-code-background: #323232;
-  --color-hover: rgba(40, 40, 40, 1);
-  --color-active: rgba(55, 55, 55, 1);
-  --color-frame-border: #333;
-  --color-group-background: var(--color-background-soft);
-
-  --color-reference: #404040;
-  --color-reference-text: #ffffff;
-  --color-reference-background: #0b0e12;
-
-  --modal-background: #1f1f1f;
-
-  --navbar-background-mac: rgba(20, 20, 20, 0.55);
-  --navbar-background: #1f1f1f;
-
-  --navbar-height: 40px;
-  --sidebar-width: 50px;
-  --status-bar-height: 40px;
-  --input-bar-height: 100px;
-
-  --assistants-width: 275px;
-  --topic-list-width: 275px;
-  --settings-width: 250px;
-
-  --chat-background: #111111;
-  --chat-background-user: #28b561;
-  --chat-background-assistant: #2c2c2c;
-  --chat-text-user: var(--color-black);
-
-  --list-item-border-radius: 16px;
-}
-
-body {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-body[theme-mode='light'] {
-  --color-white: #ffffff;
-  --color-white-soft: rgba(0, 0, 0, 0.04);
-  --color-white-mute: #eee;
-
-  --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: var(--color-white);
-  --color-background-soft: var(--color-white-soft);
-  --color-background-mute: var(--color-white-mute);
-  --color-background-opacity: rgba(235, 235, 235, 0.7);
-  --inner-glow-opacity: 0.1;
-
-  --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: #00000019;
-  --color-border-soft: #00000010;
-  --color-border-mute: #00000005;
-  --color-error: #f44336;
-  --color-link: #1677ff;
-  --color-code-background: #e3e3e3;
-  --color-hover: var(--color-white-mute);
-  --color-active: var(--color-white-soft);
-  --color-frame-border: #ddd;
-  --color-group-background: var(--color-white);
-
-  --color-reference: #cfe1ff;
-  --color-reference-text: #000000;
-  --color-reference-background: #f1f7ff;
-
-  --modal-background: var(--color-white);
-
-  --navbar-background-mac: rgba(255, 255, 255, 0.55);
-  --navbar-background: rgba(244, 244, 244);
-
-  --chat-background: #f3f3f3;
-  --chat-background-user: #95ec69;
-  --chat-background-assistant: #ffffff;
-  --chat-text-user: var(--color-text);
-}
-
 *,
 *::before,
 *::after {
   box-sizing: border-box;
-  margin: 0;
+  // margin: 0;
   font-weight: normal;
 }
 
@@ -152,8 +24,18 @@ body[theme-mode='light'] {
   -webkit-tap-highlight-color: transparent;
 }
 
-ul {
-  list-style: none;
+html,
+body,
+#root {
+  height: 100%;
+  width: 100%;
+  margin: 0;
+}
+
+#root {
+  display: flex;
+  flex-direction: row;
+  flex: 1;
 }
 
 body {
@@ -163,13 +45,17 @@ body {
   font-size: 14px;
   line-height: 1.6;
   overflow: hidden;
-  font-family:
-    -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue',
-    sans-serif;
+  font-family: var(--font-family);
   text-rendering: optimizeLegibility;
+  transition: background-color 0.3s linear;
+
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  transition: background-color 0.3s linear;
+
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
 
 input,
@@ -190,20 +76,8 @@ a {
   -webkit-user-drag: none;
 }
 
-html,
-body,
-#root {
-  height: 100%;
-  width: 100%;
-  margin: 0;
-}
-
-#root {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: row;
-  flex: 1;
+ul {
+  list-style: none;
 }
 
 .loader {
@@ -273,11 +147,16 @@ body,
       background-color: var(--color-white-soft);
     }
   }
+  .group-grid-container.horizontal,
+  .group-grid-container.grid {
+    .message-content-container-assistant {
+      padding: 0;
+    }
+  }
   .group-message-wrapper {
     background-color: var(--color-background);
     .message-content-container {
       width: 100%;
-      border: 1px solid var(--color-background-mute);
     }
   }
   .group-menu-bar {
@@ -291,3 +170,12 @@ body,
 .lucide {
   color: var(--color-icon);
 }
+
+span.highlight {
+  background-color: var(--color-background-highlight);
+  color: var(--color-highlight);
+}
+
+span.highlight.selected {
+  background-color: var(--color-background-highlight-accent);
+}

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

@@ -20,10 +20,8 @@
   h5,
   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;
+    font-weight: bold;
+    font-family: var(--font-family);
   }
 
   h1 {
@@ -117,7 +115,7 @@
   }
 
   code {
-    font-family: 'Cascadia Code', 'Fira Code', 'Consolas', monospace;
+    font-family: var(--code-font-family);
   }
 
   pre {
@@ -125,7 +123,9 @@
     overflow-x: auto;
     font-family: 'Fira Code', 'Courier New', Courier, monospace;
     background-color: var(--color-background-mute);
-    &:has(> .mermaid) {
+    &:has(.mermaid),
+    &:has(.plantuml-preview),
+    &:has(.svg-preview) {
       background-color: transparent;
     }
     &:not(pre pre) {
@@ -153,7 +153,7 @@
     padding-left: 1em;
     color: var(--color-text-light);
     border-left: 4px solid var(--color-border);
-    font-family: Georgia, 'Times New Roman', Times, serif;
+    font-family: var(--font-family);
   }
 
   table {
@@ -171,9 +171,7 @@
   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;
+    font-family: var(--font-family);
   }
 
   img {
@@ -301,6 +299,35 @@ emoji-picker {
   overflow-x: auto;
   overflow-y: hidden;
 }
+
 mjx-container {
   overflow-x: auto;
 }
+
+/* CodeMirror 相关样式 */
+.cm-editor {
+  border-radius: 5px;
+
+  &.cm-focused {
+    outline: none;
+  }
+
+  .cm-scroller {
+    font-family: var(--code-font-family);
+    border-radius: 5px;
+
+    .cm-gutters {
+      line-height: 1.6;
+    }
+
+    .cm-content {
+      line-height: 1.6;
+      padding-left: 0.25em;
+    }
+
+    .cm-lineWrapping * {
+      word-wrap: break-word;
+      white-space: pre-wrap;
+    }
+  }
+}

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

@@ -1,15 +1,11 @@
 :root {
   --color-scrollbar-thumb: rgba(255, 255, 255, 0.15);
   --color-scrollbar-thumb-hover: rgba(255, 255, 255, 0.2);
-  --color-scrollbar-thumb-right: rgba(255, 255, 255, 0.18);
-  --color-scrollbar-thumb-right-hover: rgba(255, 255, 255, 0.25);
 }
 
 body[theme-mode='light'] {
   --color-scrollbar-thumb: rgba(0, 0, 0, 0.15);
   --color-scrollbar-thumb-hover: rgba(0, 0, 0, 0.2);
-  --color-scrollbar-thumb-right: rgba(0, 0, 0, 0.18);
-  --color-scrollbar-thumb-right-hover: rgba(0, 0, 0, 0.25);
 }
 
 /* 全局初始化滚动条样式 */
@@ -18,7 +14,8 @@ body[theme-mode='light'] {
   height: 6px;
 }
 
-::-webkit-scrollbar-track {
+::-webkit-scrollbar-track,
+::-webkit-scrollbar-corner {
   background: transparent;
 }
 
@@ -30,7 +27,7 @@ body[theme-mode='light'] {
   }
 }
 
-pre::-webkit-scrollbar-thumb {
+pre:not(.shiki)::-webkit-scrollbar-thumb {
   border-radius: 0;
   background: rgba(0, 0, 0, 0.08);
   &:hover {

src/renderer/src/assets/styles/selection-toolbar.scss

@@ -0,0 +1,26 @@
+@use './font.scss';
+
+html {
+  font-family: var(--font-family);
+}
+
+:root {
+  --color-selection-toolbar-background: rgba(20, 20, 20, 0.95);
+  --color-selection-toolbar-border: rgba(55, 55, 55, 0.5);
+  --color-selection-toolbar-shadow: rgba(50, 50, 50, 0.3);
+
+  --color-selection-toolbar-text: rgba(255, 255, 245, 0.9);
+  --color-selection-toolbar-hover-bg: #222222;
+
+  --color-primary: #00b96b;
+  --color-error: #f44336;
+}
+
+[theme-mode='light'] {
+  --color-selection-toolbar-background: rgba(245, 245, 245, 0.95);
+  --color-selection-toolbar-border: rgba(200, 200, 200, 0.5);
+  --color-selection-toolbar-shadow: rgba(50, 50, 50, 0.3);
+
+  --color-selection-toolbar-text: rgba(0, 0, 0, 1);
+  --color-selection-toolbar-hover-bg: rgba(0, 0, 0, 0.04);
+}

src/renderer/src/assets/styles/tailwind.css

@@ -0,0 +1,146 @@
+@import 'tailwindcss' source('../../../src');
+@import 'tw-animate-css';
+
+@custom-variant dark (&:is(.dark *));
+
+/* 如需自定义:
+1. 清晰地组织自定义 CSS 到相应的层中。
+2. 基础样式（如全局重置、链接样式）放入 base 层；
+3. 可复用的组件样式（如果仍使用 @apply 或原生 CSS 嵌套创建）放入 components 层；
+4. 新的自定义工具类放入 utilities 层。 
+*/
+
+:root {
+  --radius: 0.625rem;
+  --background: oklch(1 0 0);
+  --foreground: oklch(0.141 0.005 285.823);
+  --card: oklch(1 0 0);
+  --card-foreground: oklch(0.141 0.005 285.823);
+  --popover: oklch(1 0 0);
+  --popover-foreground: oklch(0.141 0.005 285.823);
+  --primary: oklch(0.21 0.006 285.885);
+  --primary-foreground: oklch(0.985 0 0);
+  --secondary: oklch(0.967 0.001 286.375);
+  --secondary-foreground: oklch(0.21 0.006 285.885);
+  --muted: oklch(0.967 0.001 286.375);
+  --muted-foreground: oklch(0.552 0.016 285.938);
+  --accent: oklch(0.967 0.001 286.375);
+  --accent-foreground: oklch(0.21 0.006 285.885);
+  --destructive: oklch(0.577 0.245 27.325);
+  --border: oklch(0.92 0.004 286.32);
+  --input: oklch(0.92 0.004 286.32);
+  --ring: oklch(0.705 0.015 286.067);
+  --chart-1: oklch(0.646 0.222 41.116);
+  --chart-2: oklch(0.6 0.118 184.704);
+  --chart-3: oklch(0.398 0.07 227.392);
+  --chart-4: oklch(0.828 0.189 84.429);
+  --chart-5: oklch(0.769 0.188 70.08);
+  --sidebar: oklch(0.985 0 0);
+  --sidebar-foreground: oklch(0.141 0.005 285.823);
+  --sidebar-primary: oklch(0.21 0.006 285.885);
+  --sidebar-primary-foreground: oklch(0.985 0 0);
+  --sidebar-accent: oklch(0.967 0.001 286.375);
+  --sidebar-accent-foreground: oklch(0.21 0.006 285.885);
+  --sidebar-border: oklch(0.92 0.004 286.32);
+  --sidebar-ring: oklch(0.705 0.015 286.067);
+}
+
+.dark {
+  --background: oklch(0.141 0.005 285.823);
+  --foreground: oklch(0.985 0 0);
+  --card: oklch(0.21 0.006 285.885);
+  --card-foreground: oklch(0.985 0 0);
+  --popover: oklch(0.21 0.006 285.885);
+  --popover-foreground: oklch(0.985 0 0);
+  --primary: oklch(0.92 0.004 286.32);
+  --primary-foreground: oklch(0.21 0.006 285.885);
+  --secondary: oklch(0.274 0.006 286.033);
+  --secondary-foreground: oklch(0.985 0 0);
+  --muted: oklch(0.274 0.006 286.033);
+  --muted-foreground: oklch(0.705 0.015 286.067);
+  --accent: oklch(0.274 0.006 286.033);
+  --accent-foreground: oklch(0.985 0 0);
+  --destructive: oklch(0.704 0.191 22.216);
+  --border: oklch(1 0 0 / 10%);
+  --input: oklch(1 0 0 / 15%);
+  --ring: oklch(0.552 0.016 285.938);
+  --chart-1: oklch(0.488 0.243 264.376);
+  --chart-2: oklch(0.696 0.17 162.48);
+  --chart-3: oklch(0.769 0.188 70.08);
+  --chart-4: oklch(0.627 0.265 303.9);
+  --chart-5: oklch(0.645 0.246 16.439);
+  --sidebar: oklch(0.21 0.006 285.885);
+  --sidebar-foreground: oklch(0.985 0 0);
+  --sidebar-primary: oklch(0.488 0.243 264.376);
+  --sidebar-primary-foreground: oklch(0.985 0 0);
+  --sidebar-accent: oklch(0.274 0.006 286.033);
+  --sidebar-accent-foreground: oklch(0.985 0 0);
+  --sidebar-border: oklch(1 0 0 / 10%);
+  --sidebar-ring: oklch(0.552 0.016 285.938);
+}
+
+@theme inline {
+  --color-background: var(--background);
+  --color-foreground: var(--foreground);
+  --color-card: var(--card);
+  --color-card-foreground: var(--card-foreground);
+  --color-popover: var(--popover);
+  --color-popover-foreground: var(--popover-foreground);
+  --color-primary: var(--primary);
+  --color-primary-foreground: var(--primary-foreground);
+  --color-secondary: var(--secondary);
+  --color-secondary-foreground: var(--secondary-foreground);
+  --color-muted: var(--muted);
+  --color-muted-foreground: var(--muted-foreground);
+  --color-accent: var(--accent);
+  --color-accent-foreground: var(--accent-foreground);
+  --color-destructive: var(--destructive);
+  --color-destructive-foreground: var(--destructive-foreground);
+  --color-border: var(--border);
+  --color-input: var(--input);
+  --color-ring: var(--ring);
+  --color-chart-1: var(--chart-1);
+  --color-chart-2: var(--chart-2);
+  --color-chart-3: var(--chart-3);
+  --color-chart-4: var(--chart-4);
+  --color-chart-5: var(--chart-5);
+  --radius-sm: calc(var(--radius) - 4px);
+  --radius-md: calc(var(--radius) - 2px);
+  --radius-lg: var(--radius);
+  --radius-xl: calc(var(--radius) + 4px);
+  --color-sidebar: var(--sidebar);
+  --color-sidebar-foreground: var(--sidebar-foreground);
+  --color-sidebar-primary: var(--sidebar-primary);
+  --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
+  --color-sidebar-accent: var(--sidebar-accent);
+  --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
+  --color-sidebar-border: var(--sidebar-border);
+  --color-sidebar-ring: var(--sidebar-ring);
+  --animate-marquee: marquee var(--duration) infinite linear;
+  --animate-marquee-vertical: marquee-vertical var(--duration) linear infinite;
+  @keyframes marquee {
+    from {
+      transform: translateX(0);
+    }
+    to {
+      transform: translateX(calc(-100% - var(--gap)));
+    }
+  }
+  @keyframes marquee-vertical {
+    from {
+      transform: translateY(0);
+    }
+    to {
+      transform: translateY(calc(-100% - var(--gap)));
+    }
+  }
+}
+
+@layer base {
+  * {
+    @apply border-border outline-ring/50;
+  }
+  body {
+    @apply bg-background text-foreground;
+  }
+}

src/renderer/src/components/Alert/OpenAIAlert.tsx

@@ -0,0 +1,32 @@
+import { Alert } from 'antd'
+import { useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+const LOCALSTORAGE_KEY = 'openai_alert_closed'
+
+const OpenAIAlert = () => {
+  const { t } = useTranslation()
+  const [visible, setVisible] = useState(false)
+
+  useEffect(() => {
+    const closed = localStorage.getItem(LOCALSTORAGE_KEY)
+    setVisible(!closed)
+  }, [])
+
+  if (!visible) return null
+
+  return (
+    <Alert
+      style={{ width: '100%', marginTop: 5, marginBottom: 5 }}
+      message={t('settings.provider.openai.alert')}
+      closable
+      afterClose={() => {
+        localStorage.setItem(LOCALSTORAGE_KEY, '1')
+        setVisible(false)
+      }}
+      type="warning"
+    />
+  )
+}
+
+export default OpenAIAlert

src/renderer/src/components/CodeBlockView/CodePreview.tsx

@@ -0,0 +1,308 @@
+import { CodeTool, TOOL_SPECS, useCodeTool } from '@renderer/components/CodeToolbar'
+import { useCodeStyle } from '@renderer/context/CodeStyleProvider'
+import { useSettings } from '@renderer/hooks/useSettings'
+import { uuid } from '@renderer/utils'
+import { getReactStyleFromToken } from '@renderer/utils/shiki'
+import { ChevronsDownUp, ChevronsUpDown, Text as UnWrapIcon, WrapText as WrapIcon } from 'lucide-react'
+import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { ThemedToken } from 'shiki/core'
+import styled from 'styled-components'
+
+interface CodePreviewProps {
+  children: string
+  language: string
+  setTools?: (value: React.SetStateAction<CodeTool[]>) => void
+}
+
+/**
+ * Shiki 流式代码高亮组件
+ *
+ * - 通过 shiki tokenizer 处理流式响应
+ * - 为了正确执行语法高亮，必须保证流式响应都依次到达 tokenizer，不能跳过
+ */
+const CodePreview = ({ children, language, setTools }: CodePreviewProps) => {
+  const { codeShowLineNumbers, fontSize, codeCollapsible, codeWrappable } = useSettings()
+  const { activeShikiTheme, highlightCodeChunk, cleanupTokenizers } = useCodeStyle()
+  const [isExpanded, setIsExpanded] = useState(!codeCollapsible)
+  const [isUnwrapped, setIsUnwrapped] = useState(!codeWrappable)
+  const [tokenLines, setTokenLines] = useState<ThemedToken[][]>([])
+  const codeContentRef = useRef<HTMLDivElement>(null)
+  const prevCodeLengthRef = useRef(0)
+  const safeCodeStringRef = useRef(children)
+  const highlightQueueRef = useRef<Promise<void>>(Promise.resolve())
+  const callerId = useRef(`${Date.now()}-${uuid()}`).current
+  const shikiThemeRef = useRef(activeShikiTheme)
+
+  const { t } = useTranslation()
+
+  const { registerTool, removeTool } = useCodeTool(setTools)
+
+  // 展开/折叠工具
+  useEffect(() => {
+    registerTool({
+      ...TOOL_SPECS.expand,
+      icon: isExpanded ? <ChevronsDownUp className="icon" /> : <ChevronsUpDown className="icon" />,
+      tooltip: isExpanded ? t('code_block.collapse') : t('code_block.expand'),
+      visible: () => {
+        const scrollHeight = codeContentRef.current?.scrollHeight
+        return codeCollapsible && (scrollHeight ?? 0) > 350
+      },
+      onClick: () => setIsExpanded((prev) => !prev)
+    })
+
+    return () => removeTool(TOOL_SPECS.expand.id)
+  }, [codeCollapsible, isExpanded, registerTool, removeTool, t])
+
+  // 自动换行工具
+  useEffect(() => {
+    registerTool({
+      ...TOOL_SPECS.wrap,
+      icon: isUnwrapped ? <WrapIcon className="icon" /> : <UnWrapIcon className="icon" />,
+      tooltip: isUnwrapped ? t('code_block.wrap.on') : t('code_block.wrap.off'),
+      visible: () => codeWrappable,
+      onClick: () => setIsUnwrapped((prev) => !prev)
+    })
+
+    return () => removeTool(TOOL_SPECS.wrap.id)
+  }, [codeWrappable, isUnwrapped, registerTool, removeTool, t])
+
+  // 更新展开状态
+  useEffect(() => {
+    setIsExpanded(!codeCollapsible)
+  }, [codeCollapsible])
+
+  // 更新换行状态
+  useEffect(() => {
+    setIsUnwrapped(!codeWrappable)
+  }, [codeWrappable])
+
+  // 处理尾部空白字符
+  const safeCodeString = useMemo(() => {
+    return typeof children === 'string' ? children.trimEnd() : ''
+  }, [children])
+
+  const highlightCode = useCallback(async () => {
+    if (!safeCodeString) return
+
+    if (prevCodeLengthRef.current === safeCodeString.length) return
+
+    // 捕获当前状态
+    const startPos = prevCodeLengthRef.current
+    const endPos = safeCodeString.length
+
+    // 添加到处理队列，确保按顺序处理
+    highlightQueueRef.current = highlightQueueRef.current.then(async () => {
+      // FIXME: 长度有问题，或者破坏了流式内容，需要清理 tokenizer 并使用完整代码重新高亮
+      if (prevCodeLengthRef.current > safeCodeString.length || !safeCodeString.startsWith(safeCodeStringRef.current)) {
+        cleanupTokenizers(callerId)
+        prevCodeLengthRef.current = 0
+        safeCodeStringRef.current = ''
+
+        const result = await highlightCodeChunk(safeCodeString, language, callerId)
+        setTokenLines(result.lines)
+
+        prevCodeLengthRef.current = safeCodeString.length
+        safeCodeStringRef.current = safeCodeString
+
+        return
+      }
+
+      // 跳过 race condition，延迟到后续任务
+      if (prevCodeLengthRef.current !== startPos) {
+        return
+      }
+
+      const incrementalCode = safeCodeString.slice(startPos, endPos)
+      const result = await highlightCodeChunk(incrementalCode, language, callerId)
+      setTokenLines((lines) => [...lines.slice(0, Math.max(0, lines.length - result.recall)), ...result.lines])
+      prevCodeLengthRef.current = endPos
+      safeCodeStringRef.current = safeCodeString
+    })
+  }, [callerId, cleanupTokenizers, highlightCodeChunk, language, safeCodeString])
+
+  // 主题变化时强制重新高亮
+  useEffect(() => {
+    if (shikiThemeRef.current !== activeShikiTheme) {
+      prevCodeLengthRef.current++
+      shikiThemeRef.current = activeShikiTheme
+    }
+  }, [activeShikiTheme])
+
+  // 组件卸载时清理资源
+  useEffect(() => {
+    return () => cleanupTokenizers(callerId)
+  }, [callerId, cleanupTokenizers])
+
+  // 触发代码高亮
+  // - 进入视口后触发第一次高亮
+  // - 内容变化后触发之后的高亮
+  useEffect(() => {
+    let isMounted = true
+
+    if (prevCodeLengthRef.current > 0) {
+      setTimeout(highlightCode, 0)
+      return
+    }
+
+    const codeElement = codeContentRef.current
+    if (!codeElement) return
+
+    const observer = new IntersectionObserver(
+      (entries) => {
+        if (entries[0].intersectionRatio > 0 && isMounted) {
+          setTimeout(highlightCode, 0)
+          observer.disconnect()
+        }
+      },
+      {
+        rootMargin: '50px 0px 50px 0px'
+      }
+    )
+
+    observer.observe(codeElement)
+
+    return () => {
+      isMounted = false
+      observer.disconnect()
+    }
+  }, [highlightCode])
+
+  const hasHighlightedCode = useMemo(() => {
+    return tokenLines.length > 0
+  }, [tokenLines.length])
+
+  return (
+    <ContentContainer
+      ref={codeContentRef}
+      $lineNumbers={codeShowLineNumbers}
+      $wrap={codeWrappable && !isUnwrapped}
+      $fadeIn={hasHighlightedCode}
+      style={{
+        fontSize: fontSize - 1,
+        maxHeight: codeCollapsible && !isExpanded ? '350px' : 'none'
+      }}>
+      {hasHighlightedCode ? (
+        <ShikiTokensRenderer language={language} tokenLines={tokenLines} />
+      ) : (
+        <CodePlaceholder>{children}</CodePlaceholder>
+      )}
+    </ContentContainer>
+  )
+}
+
+/**
+ * 渲染 Shiki 高亮后的 tokens
+ *
+ * 独立出来，方便将来做 virtual list
+ */
+const ShikiTokensRenderer: React.FC<{ language: string; tokenLines: ThemedToken[][] }> = memo(
+  ({ language, tokenLines }) => {
+    const { getShikiPreProperties } = useCodeStyle()
+    const rendererRef = useRef<HTMLPreElement>(null)
+
+    // 设置 pre 标签属性
+    useEffect(() => {
+      getShikiPreProperties(language).then((properties) => {
+        const pre = rendererRef.current
+        if (pre) {
+          pre.className = properties.class
+          pre.style.cssText = properties.style
+          pre.tabIndex = properties.tabindex
+        }
+      })
+    }, [language, getShikiPreProperties])
+
+    return (
+      <pre className="shiki" ref={rendererRef}>
+        <code>
+          {tokenLines.map((lineTokens, lineIndex) => (
+            <span key={`line-${lineIndex}`} className="line">
+              {lineTokens.map((token, tokenIndex) => (
+                <span key={`token-${tokenIndex}`} style={getReactStyleFromToken(token)}>
+                  {token.content}
+                </span>
+              ))}
+            </span>
+          ))}
+        </code>
+      </pre>
+    )
+  }
+)
+
+const ContentContainer = styled.div<{
+  $lineNumbers: boolean
+  $wrap: boolean
+  $fadeIn: boolean
+}>`
+  position: relative;
+  overflow: auto;
+  border: 0.5px solid transparent;
+  border-radius: 5px;
+  margin-top: 0;
+
+  .shiki {
+    padding: 1em;
+
+    code {
+      display: flex;
+      flex-direction: column;
+
+      .line {
+        display: block;
+        min-height: 1.3rem;
+        padding-left: ${(props) => (props.$lineNumbers ? '2rem' : '0')};
+
+        * {
+          overflow-wrap: ${(props) => (props.$wrap ? 'break-word' : 'normal')};
+          white-space: ${(props) => (props.$wrap ? 'pre-wrap' : 'pre')};
+        }
+      }
+    }
+  }
+
+  ${(props) =>
+    props.$lineNumbers &&
+    `
+      code {
+        counter-reset: step;
+        counter-increment: step 0;
+        position: relative;
+      }
+
+      code .line::before {
+        content: counter(step);
+        counter-increment: step;
+        width: 1rem;
+        position: absolute;
+        left: 0;
+        text-align: right;
+        opacity: 0.35;
+      }
+    `}
+
+  @keyframes contentFadeIn {
+    from {
+      opacity: 0;
+    }
+    to {
+      opacity: 1;
+    }
+  }
+
+  animation: ${(props) => (props.$fadeIn ? 'contentFadeIn 0.3s ease-in-out forwards' : 'none')};
+`
+
+const CodePlaceholder = styled.div`
+  display: block;
+  opacity: 0.1;
+  white-space: pre-wrap;
+  word-break: break-all;
+  overflow-x: hidden;
+  min-height: 1.3rem;
+`
+
+CodePreview.displayName = 'CodePreview'
+
+export default memo(CodePreview)

src/renderer/src/components/CodeBlockView/HtmlArtifacts.tsx

@@ -1,4 +1,4 @@
-import { DownloadOutlined, ExpandOutlined, LinkOutlined } from '@ant-design/icons'
+import { ExpandOutlined, LinkOutlined } from '@ant-design/icons'
 import { AppLogo } from '@renderer/config/env'
 import { useMinappPopup } from '@renderer/hooks/useMinappPopup'
 import { extractTitle } from '@renderer/utils/formats'
@@ -13,7 +13,6 @@ interface Props {
 
 const Artifacts: FC<Props> = ({ html }) => {
   const { t } = useTranslation()
-  const title = extractTitle(html) || 'Artifacts ' + t('chat.artifacts.button.preview')
   const { openMinapp } = useMinappPopup()
 
   /**
@@ -23,6 +22,7 @@ const Artifacts: FC<Props> = ({ html }) => {
     const path = await window.api.file.create('artifacts-preview.html')
     await window.api.file.write(path, html)
     const filePath = `file://${path}`
+    const title = extractTitle(html) || 'Artifacts ' + t('chat.artifacts.button.preview')
     openMinapp({
       id: 'artifacts-preview',
       name: title,
@@ -46,13 +46,6 @@ const Artifacts: FC<Props> = ({ html }) => {
     }
   }
 
-  /**
-   * 下载文件
-   */
-  const onDownload = () => {
-    window.api.file.save(`${title}.html`, html)
-  }
-
   return (
     <Container>
       <Button icon={<ExpandOutlined />} onClick={handleOpenInApp}>
@@ -62,10 +55,6 @@ const Artifacts: FC<Props> = ({ html }) => {
       <Button icon={<LinkOutlined />} onClick={handleOpenExternal}>
         {t('chat.artifacts.button.openExternal')}
       </Button>
-
-      <Button icon={<DownloadOutlined />} onClick={onDownload}>
-        {t('chat.artifacts.button.download')}
-      </Button>
     </Container>
   )
 }

src/renderer/src/components/CodeBlockView/MermaidPreview.tsx

@@ -0,0 +1,121 @@
+import { nanoid } from '@reduxjs/toolkit'
+import { CodeTool, usePreviewToolHandlers, usePreviewTools } from '@renderer/components/CodeToolbar'
+import SvgSpinners180Ring from '@renderer/components/Icons/SvgSpinners180Ring'
+import { useMermaid } from '@renderer/hooks/useMermaid'
+import { Flex, Spin } from 'antd'
+import { debounce } from 'lodash'
+import React, { memo, startTransition, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import styled from 'styled-components'
+
+interface Props {
+  children: string
+  setTools?: (value: React.SetStateAction<CodeTool[]>) => void
+}
+
+/** 预览 Mermaid 图表
+ * 通过防抖渲染提供比较统一的体验，减少闪烁。
+ * FIXME: 等将来容易判断代码块结束位置时再重构。
+ */
+const MermaidPreview: React.FC<Props> = ({ children, setTools }) => {
+  const { mermaid, isLoading: isLoadingMermaid, error: mermaidError } = useMermaid()
+  const mermaidRef = useRef<HTMLDivElement>(null)
+  const diagramId = useRef<string>(`mermaid-${nanoid(6)}`).current
+  const [error, setError] = useState<string | null>(null)
+  const [isRendering, setIsRendering] = useState(false)
+
+  // 使用通用图像工具
+  const { handleZoom, handleCopyImage, handleDownload } = usePreviewToolHandlers(mermaidRef, {
+    imgSelector: 'svg',
+    prefix: 'mermaid',
+    enableWheelZoom: true
+  })
+
+  // 使用工具栏
+  usePreviewTools({
+    setTools,
+    handleZoom,
+    handleCopyImage,
+    handleDownload
+  })
+
+  // 实际的渲染函数
+  const renderMermaid = useCallback(
+    async (content: string) => {
+      if (!content || !mermaidRef.current) return
+
+      try {
+        setIsRendering(true)
+
+        // 验证语法，提前抛出异常
+        await mermaid.parse(content)
+
+        const { svg } = await mermaid.render(diagramId, content, mermaidRef.current)
+
+        // 避免不可见时产生 undefined 和 NaN
+        const fixedSvg = svg.replace(/translate\(undefined,\s*NaN\)/g, 'translate(0, 0)')
+        mermaidRef.current.innerHTML = fixedSvg
+
+        // 渲染成功，清除错误记录
+        setError(null)
+      } catch (error) {
+        setError((error as Error).message)
+      } finally {
+        setIsRendering(false)
+      }
+    },
+    [diagramId, mermaid]
+  )
+
+  // debounce 渲染
+  const debouncedRender = useMemo(
+    () =>
+      debounce((content: string) => {
+        startTransition(() => renderMermaid(content))
+      }, 300),
+    [renderMermaid]
+  )
+
+  // 触发渲染
+  useEffect(() => {
+    if (isLoadingMermaid) return
+
+    if (children) {
+      setIsRendering(true)
+      debouncedRender(children)
+    } else {
+      debouncedRender.cancel()
+      setIsRendering(false)
+    }
+
+    return () => {
+      debouncedRender.cancel()
+    }
+  }, [children, isLoadingMermaid, debouncedRender])
+
+  const isLoading = isLoadingMermaid || isRendering
+
+  return (
+    <Spin spinning={isLoading} indicator={<SvgSpinners180Ring color="var(--color-text-2)" />}>
+      <Flex vertical style={{ minHeight: isLoading ? '2rem' : 'auto' }}>
+        {(mermaidError || error) && <StyledError>{mermaidError || error}</StyledError>}
+        <StyledMermaid ref={mermaidRef} className="mermaid" />
+      </Flex>
+    </Spin>
+  )
+}
+
+const StyledMermaid = styled.div`
+  overflow: auto;
+`
+
+const StyledError = styled.div`
+  overflow: auto;
+  padding: 16px;
+  color: #ff4d4f;
+  border: 1px solid #ff4d4f;
+  border-radius: 4px;
+  word-wrap: break-word;
+  white-space: pre-wrap;
+`
+
+export default memo(MermaidPreview)

src/renderer/src/components/CodeBlockView/PlantUmlPreview.tsx

@@ -0,0 +1,195 @@
+import { LoadingOutlined } from '@ant-design/icons'
+import { CodeTool, usePreviewToolHandlers, usePreviewTools } from '@renderer/components/CodeToolbar'
+import { Spin } from 'antd'
+import pako from 'pako'
+import React, { memo, useCallback, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import styled from 'styled-components'
+
+const PlantUMLServer = 'https://www.plantuml.com/plantuml'
+function encode64(data: Uint8Array) {
+  let r = ''
+  for (let i = 0; i < data.length; i += 3) {
+    if (i + 2 === data.length) {
+      r += append3bytes(data[i], data[i + 1], 0)
+    } else if (i + 1 === data.length) {
+      r += append3bytes(data[i], 0, 0)
+    } else {
+      r += append3bytes(data[i], data[i + 1], data[i + 2])
+    }
+  }
+  return r
+}
+
+function encode6bit(b: number) {
+  if (b < 10) {
+    return String.fromCharCode(48 + b)
+  }
+  b -= 10
+  if (b < 26) {
+    return String.fromCharCode(65 + b)
+  }
+  b -= 26
+  if (b < 26) {
+    return String.fromCharCode(97 + b)
+  }
+  b -= 26
+  if (b === 0) {
+    return '-'
+  }
+  if (b === 1) {
+    return '_'
+  }
+  return '?'
+}
+
+function append3bytes(b1: number, b2: number, b3: number) {
+  const c1 = b1 >> 2
+  const c2 = ((b1 & 0x3) << 4) | (b2 >> 4)
+  const c3 = ((b2 & 0xf) << 2) | (b3 >> 6)
+  const c4 = b3 & 0x3f
+  let r = ''
+  r += encode6bit(c1 & 0x3f)
+  r += encode6bit(c2 & 0x3f)
+  r += encode6bit(c3 & 0x3f)
+  r += encode6bit(c4 & 0x3f)
+  return r
+}
+/**
+ * https://plantuml.com/zh/code-javascript-synchronous
+ * To use PlantUML image generation, a text diagram description have to be :
+    1. Encoded in UTF-8
+    2. Compressed using Deflate algorithm
+    3. Reencoded in ASCII using a transformation _close_ to base64
+ */
+function encodeDiagram(diagram: string): string {
+  const utf8text = new TextEncoder().encode(diagram)
+  const compressed = pako.deflateRaw(utf8text)
+  return encode64(compressed)
+}
+
+async function downloadUrl(url: string, filename: string) {
+  const response = await fetch(url)
+  if (!response.ok) {
+    window.message.warning({ content: response.statusText, duration: 1.5 })
+    return
+  }
+  const blob = await response.blob()
+  const link = document.createElement('a')
+  link.href = URL.createObjectURL(blob)
+  link.download = filename
+  document.body.appendChild(link)
+  link.click()
+  document.body.removeChild(link)
+  URL.revokeObjectURL(link.href)
+}
+
+type PlantUMLServerImageProps = {
+  format: 'png' | 'svg'
+  diagram: string
+  onClick?: React.MouseEventHandler<HTMLDivElement>
+  className?: string
+}
+
+function getPlantUMLImageUrl(format: 'png' | 'svg', diagram: string, isDark?: boolean) {
+  const encodedDiagram = encodeDiagram(diagram)
+  if (isDark) {
+    return `${PlantUMLServer}/d${format}/${encodedDiagram}`
+  }
+  return `${PlantUMLServer}/${format}/${encodedDiagram}`
+}
+
+const PlantUMLServerImage: React.FC<PlantUMLServerImageProps> = ({ format, diagram, onClick, className }) => {
+  const [loading, setLoading] = useState(true)
+  // FIXME: 黑暗模式背景太黑了，目前让 PlantUML 和 SVG 一样保持白色背景
+  const url = getPlantUMLImageUrl(format, diagram, false)
+  return (
+    <StyledPlantUML onClick={onClick} className={className}>
+      <Spin
+        spinning={loading}
+        indicator={
+          <LoadingOutlined
+            spin
+            style={{
+              fontSize: 32
+            }}
+          />
+        }>
+        <img
+          src={url}
+          onLoad={() => {
+            setLoading(false)
+          }}
+          onError={(e) => {
+            setLoading(false)
+            const target = e.target as HTMLImageElement
+            target.style.opacity = '0.5'
+            target.style.filter = 'blur(2px)'
+          }}
+        />
+      </Spin>
+    </StyledPlantUML>
+  )
+}
+
+interface PlantUMLProps {
+  children: string
+  setTools?: (value: React.SetStateAction<CodeTool[]>) => void
+}
+
+const PlantUmlPreview: React.FC<PlantUMLProps> = ({ children, setTools }) => {
+  const { t } = useTranslation()
+  const containerRef = useRef<HTMLDivElement>(null)
+
+  const encodedDiagram = encodeDiagram(children)
+
+  // 自定义 PlantUML 下载方法
+  const customDownload = useCallback(
+    (format: 'svg' | 'png') => {
+      const timestamp = Date.now()
+      const url = `${PlantUMLServer}/${format}/${encodedDiagram}`
+      const filename = `plantuml-diagram-${timestamp}.${format}`
+      downloadUrl(url, filename).catch(() => {
+        window.message.error(t('code_block.download.failed.network'))
+      })
+    },
+    [encodedDiagram, t]
+  )
+
+  // 使用通用图像工具，提供自定义下载方法
+  const { handleZoom, handleCopyImage } = usePreviewToolHandlers(containerRef, {
+    imgSelector: '.plantuml-preview img',
+    prefix: 'plantuml-diagram',
+    enableWheelZoom: true,
+    customDownloader: customDownload
+  })
+
+  // 使用工具栏
+  usePreviewTools({
+    setTools,
+    handleZoom,
+    handleCopyImage,
+    handleDownload: customDownload
+  })
+
+  return (
+    <div ref={containerRef}>
+      <PlantUMLServerImage format="svg" diagram={children} className="plantuml-preview" />
+    </div>
+  )
+}
+
+const StyledPlantUML = styled.div`
+  max-height: calc(80vh - 100px);
+  text-align: left;
+  overflow-y: auto;
+  background-color: white;
+  img {
+    max-width: 100%;
+    height: auto;
+    min-height: 100px;
+    transition: transform 0.2s ease;
+  }
+`
+
+export default memo(PlantUmlPreview)

src/renderer/src/components/CodeBlockView/StatusBar.tsx

@@ -0,0 +1,22 @@
+import { FC, memo } from 'react'
+import styled from 'styled-components'
+
+interface Props {
+  children: string
+}
+
+const StatusBar: FC<Props> = ({ children }) => {
+  return <Container>{children}</Container>
+}
+
+const Container = styled.div`
+  margin: 10px;
+  display: flex;
+  flex-direction: row;
+  gap: 8px;
+  padding-bottom: 10px;
+  overflow-y: auto;
+  text-wrap: wrap;
+`
+
+export default memo(StatusBar)

src/renderer/src/components/CodeBlockView/SvgPreview.tsx

@@ -0,0 +1,64 @@
+import { CodeTool, usePreviewToolHandlers, usePreviewTools } from '@renderer/components/CodeToolbar'
+import { memo, useEffect, useRef } from 'react'
+
+interface Props {
+  children: string
+  setTools?: (value: React.SetStateAction<CodeTool[]>) => void
+}
+
+/**
+ * 使用 Shadow DOM 渲染 SVG
+ */
+const SvgPreview: React.FC<Props> = ({ children, setTools }) => {
+  const svgContainerRef = useRef<HTMLDivElement>(null)
+
+  useEffect(() => {
+    const container = svgContainerRef.current
+    if (!container) return
+
+    const shadowRoot = container.shadowRoot || container.attachShadow({ mode: 'open' })
+
+    // 添加基础样式
+    const style = document.createElement('style')
+    style.textContent = `
+      :host {
+        padding: 1em;
+        background-color: white;
+        overflow: auto;
+        border: 0.5px solid var(--color-code-background);
+        border-top-left-radius: 0;
+        border-top-right-radius: 0;
+        display: block;
+      }
+      svg {
+        max-width: 100%;
+        height: auto;
+      }
+    `
+
+    // 清空并重新添加内容
+    shadowRoot.innerHTML = ''
+    shadowRoot.appendChild(style)
+
+    const svgContainer = document.createElement('div')
+    svgContainer.innerHTML = children
+    shadowRoot.appendChild(svgContainer)
+  }, [children])
+
+  // 使用通用图像工具
+  const { handleCopyImage, handleDownload } = usePreviewToolHandlers(svgContainerRef, {
+    imgSelector: 'svg',
+    prefix: 'svg-image'
+  })
+
+  // 使用工具栏
+  usePreviewTools({
+    setTools,
+    handleCopyImage,
+    handleDownload
+  })
+
+  return <div ref={svgContainerRef} className="svg-preview" />
+}
+
+export default memo(SvgPreview)

src/renderer/src/components/CodeBlockView/index.tsx

@@ -0,0 +1,295 @@
+import { LoadingOutlined } from '@ant-design/icons'
+import CodeEditor from '@renderer/components/CodeEditor'
+import { CodeTool, CodeToolbar, TOOL_SPECS, useCodeTool } from '@renderer/components/CodeToolbar'
+import { useSettings } from '@renderer/hooks/useSettings'
+import { pyodideService } from '@renderer/services/PyodideService'
+import { extractTitle } from '@renderer/utils/formats'
+import { isValidPlantUML } from '@renderer/utils/markdown'
+import dayjs from 'dayjs'
+import { CirclePlay, CodeXml, Copy, Download, Eye, Square, SquarePen, SquareSplitHorizontal } from 'lucide-react'
+import React, { memo, useCallback, useEffect, useMemo, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import styled from 'styled-components'
+
+import CodePreview from './CodePreview'
+import HtmlArtifacts from './HtmlArtifacts'
+import MermaidPreview from './MermaidPreview'
+import PlantUmlPreview from './PlantUmlPreview'
+import StatusBar from './StatusBar'
+import SvgPreview from './SvgPreview'
+
+type ViewMode = 'source' | 'special' | 'split'
+
+interface Props {
+  children: string
+  language: string
+  onSave?: (newContent: string) => void
+}
+
+/**
+ * 代码块视图
+ *
+ * 视图类型：
+ * - preview: 预览视图，其中非源代码的是特殊视图
+ * - edit: 编辑视图
+ *
+ * 视图模式：
+ * - source: 源代码视图模式
+ * - special: 特殊视图模式（Mermaid、PlantUML、SVG）
+ * - split: 分屏模式（源代码和特殊视图并排显示）
+ *
+ * 顶部 sticky 工具栏：
+ * - quick 工具
+ * - core 工具
+ */
+const CodeBlockView: React.FC<Props> = ({ children, language, onSave }) => {
+  const { t } = useTranslation()
+  const { codeEditor, codeExecution } = useSettings()
+  const [viewMode, setViewMode] = useState<ViewMode>('special')
+  const [isRunning, setIsRunning] = useState(false)
+  const [output, setOutput] = useState('')
+
+  const [tools, setTools] = useState<CodeTool[]>([])
+  const { registerTool, removeTool } = useCodeTool(setTools)
+
+  const isExecutable = useMemo(() => {
+    return codeExecution.enabled && language === 'python'
+  }, [codeExecution.enabled, language])
+
+  const hasSpecialView = useMemo(() => ['mermaid', 'plantuml', 'svg'].includes(language), [language])
+
+  const isInSpecialView = useMemo(() => {
+    return hasSpecialView && viewMode === 'special'
+  }, [hasSpecialView, viewMode])
+
+  const handleCopySource = useCallback(() => {
+    navigator.clipboard.writeText(children)
+    window.message.success({ content: t('code_block.copy.success'), key: 'copy-code' })
+  }, [children, t])
+
+  const handleDownloadSource = useCallback(() => {
+    let fileName = ''
+
+    // 尝试提取标题
+    if (language === 'html' && children.includes('</html>')) {
+      const title = extractTitle(children)
+      if (title) {
+        fileName = `${title}.html`
+      }
+    }
+
+    // 默认使用日期格式命名
+    if (!fileName) {
+      fileName = `${dayjs().format('YYYYMMDDHHmm')}.${language}`
+    }
+
+    window.api.file.save(fileName, children)
+  }, [children, language])
+
+  const handleRunScript = useCallback(() => {
+    setIsRunning(true)
+    setOutput('')
+
+    pyodideService
+      .runScript(children, {}, codeExecution.timeoutMinutes * 60000)
+      .then((formattedOutput) => {
+        setOutput(formattedOutput)
+      })
+      .catch((error) => {
+        console.error('Unexpected error:', error)
+        setOutput(`Unexpected error: ${error.message || 'Unknown error'}`)
+      })
+      .finally(() => {
+        setIsRunning(false)
+      })
+  }, [children, codeExecution.timeoutMinutes])
+
+  useEffect(() => {
+    // 复制按钮
+    registerTool({
+      ...TOOL_SPECS.copy,
+      icon: <Copy className="icon" />,
+      tooltip: t('code_block.copy.source'),
+      onClick: handleCopySource
+    })
+
+    // 下载按钮
+    registerTool({
+      ...TOOL_SPECS.download,
+      icon: <Download className="icon" />,
+      tooltip: t('code_block.download.source'),
+      onClick: handleDownloadSource
+    })
+    return () => {
+      removeTool(TOOL_SPECS.copy.id)
+      removeTool(TOOL_SPECS.download.id)
+    }
+  }, [handleCopySource, handleDownloadSource, registerTool, removeTool, t])
+
+  // 特殊视图的编辑按钮，在分屏模式下不可用
+  useEffect(() => {
+    if (!hasSpecialView || viewMode === 'split') return
+
+    const viewSourceToolSpec = codeEditor.enabled ? TOOL_SPECS.edit : TOOL_SPECS['view-source']
+
+    if (codeEditor.enabled) {
+      registerTool({
+        ...viewSourceToolSpec,
+        icon: viewMode === 'source' ? <Eye className="icon" /> : <SquarePen className="icon" />,
+        tooltip: viewMode === 'source' ? t('code_block.preview') : t('code_block.edit'),
+        onClick: () => setViewMode(viewMode === 'source' ? 'special' : 'source')
+      })
+    } else {
+      registerTool({
+        ...viewSourceToolSpec,
+        icon: viewMode === 'source' ? <Eye className="icon" /> : <CodeXml className="icon" />,
+        tooltip: viewMode === 'source' ? t('code_block.preview') : t('code_block.preview.source'),
+        onClick: () => setViewMode(viewMode === 'source' ? 'special' : 'source')
+      })
+    }
+
+    return () => removeTool(viewSourceToolSpec.id)
+  }, [codeEditor.enabled, hasSpecialView, viewMode, registerTool, removeTool, t])
+
+  // 特殊视图的分屏按钮
+  useEffect(() => {
+    if (!hasSpecialView) return
+
+    registerTool({
+      ...TOOL_SPECS['split-view'],
+      icon: viewMode === 'split' ? <Square className="icon" /> : <SquareSplitHorizontal className="icon" />,
+      tooltip: viewMode === 'split' ? t('code_block.split.restore') : t('code_block.split'),
+      onClick: () => setViewMode(viewMode === 'split' ? 'special' : 'split')
+    })
+
+    return () => removeTool(TOOL_SPECS['split-view'].id)
+  }, [hasSpecialView, viewMode, registerTool, removeTool, t])
+
+  // 运行按钮
+  useEffect(() => {
+    if (!isExecutable) return
+
+    registerTool({
+      ...TOOL_SPECS.run,
+      icon: isRunning ? <LoadingOutlined /> : <CirclePlay className="icon" />,
+      tooltip: t('code_block.run'),
+      onClick: () => !isRunning && handleRunScript()
+    })
+
+    return () => isExecutable && removeTool(TOOL_SPECS.run.id)
+  }, [isExecutable, isRunning, handleRunScript, registerTool, removeTool, t])
+
+  // 源代码视图组件
+  const sourceView = useMemo(() => {
+    if (codeEditor.enabled) {
+      return (
+        <CodeEditor
+          value={children}
+          language={language}
+          onSave={onSave}
+          options={{ stream: true }}
+          setTools={setTools}
+        />
+      )
+    } else {
+      return (
+        <CodePreview language={language} setTools={setTools}>
+          {children}
+        </CodePreview>
+      )
+    }
+  }, [children, codeEditor.enabled, language, onSave, setTools])
+
+  // 特殊视图组件映射
+  const specialView = useMemo(() => {
+    if (language === 'mermaid') {
+      return <MermaidPreview setTools={setTools}>{children}</MermaidPreview>
+    } else if (language === 'plantuml' && isValidPlantUML(children)) {
+      return <PlantUmlPreview setTools={setTools}>{children}</PlantUmlPreview>
+    } else if (language === 'svg') {
+      return <SvgPreview setTools={setTools}>{children}</SvgPreview>
+    }
+    return null
+  }, [children, language])
+
+  const renderHeader = useMemo(() => {
+    const langTag = '<' + language.toUpperCase() + '>'
+    return <CodeHeader $isInSpecialView={isInSpecialView}>{isInSpecialView ? '' : langTag}</CodeHeader>
+  }, [isInSpecialView, language])
+
+  // 根据视图模式和语言选择组件，优先展示特殊视图，fallback是源代码视图
+  const renderContent = useMemo(() => {
+    const showSpecialView = specialView && ['special', 'split'].includes(viewMode)
+    const showSourceView = !specialView || viewMode !== 'special'
+
+    return (
+      <SplitViewWrapper className="split-view-wrapper">
+        {showSpecialView && specialView}
+        {showSourceView && sourceView}
+      </SplitViewWrapper>
+    )
+  }, [specialView, sourceView, viewMode])
+
+  const renderArtifacts = useMemo(() => {
+    if (language === 'html') {
+      return <HtmlArtifacts html={children} />
+    }
+    return null
+  }, [children, language])
+
+  return (
+    <CodeBlockWrapper className="code-block" $isInSpecialView={isInSpecialView}>
+      {renderHeader}
+      <CodeToolbar tools={tools} />
+      {renderContent}
+      {renderArtifacts}
+      {isExecutable && output && <StatusBar>{output}</StatusBar>}
+    </CodeBlockWrapper>
+  )
+}
+
+const CodeBlockWrapper = styled.div<{ $isInSpecialView: boolean }>`
+  position: relative;
+  width: 100%;
+
+  .code-toolbar {
+    background-color: ${(props) => (props.$isInSpecialView ? 'transparent' : 'var(--color-background-mute)')};
+    border-radius: ${(props) => (props.$isInSpecialView ? '0' : '4px')};
+    opacity: 0;
+    transition: opacity 0.2s ease;
+    transform: translateZ(0);
+    will-change: opacity;
+    &.show {
+      opacity: 1;
+    }
+  }
+  &:hover {
+    .code-toolbar {
+      opacity: 1;
+    }
+  }
+`
+
+const CodeHeader = styled.div<{ $isInSpecialView: boolean }>`
+  display: flex;
+  align-items: center;
+  color: var(--color-text);
+  font-size: 14px;
+  font-weight: bold;
+  padding: 0 10px;
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
+  margin-top: ${(props) => (props.$isInSpecialView ? '6px' : '0')};
+  height: ${(props) => (props.$isInSpecialView ? '16px' : '34px')};
+`
+
+const SplitViewWrapper = styled.div`
+  display: flex;
+
+  > * {
+    flex: 1 1 auto;
+    width: 100%;
+  }
+`
+
+export default memo(CodeBlockView)

src/renderer/src/components/CodeEditor/hook.ts

@@ -0,0 +1,65 @@
+import { useCodeStyle } from '@renderer/context/CodeStyleProvider'
+import { Extension } from '@uiw/react-codemirror'
+import { useEffect, useState } from 'react'
+
+let linterPromise: Promise<any> | null = null
+function importLintPackage() {
+  if (!linterPromise) {
+    linterPromise = import('@codemirror/lint').then((mod) => mod.linter)
+  }
+  return linterPromise
+}
+
+// 语言对应的 linter 加载器
+const linterLoaders: Record<string, () => Promise<any>> = {
+  json: async () => {
+    const [linter, jsonParseLinter] = await Promise.all([
+      importLintPackage(),
+      import('@codemirror/lang-json').then((mod) => mod.jsonParseLinter)
+    ])
+    return linter(jsonParseLinter())
+  }
+}
+
+export const useLanguageExtensions = (language: string, lint?: boolean) => {
+  const { languageMap } = useCodeStyle()
+  const [extensions, setExtensions] = useState<Extension[]>([])
+
+  // 加载语言
+  useEffect(() => {
+    let normalizedLang = languageMap[language as keyof typeof languageMap] || language.toLowerCase()
+
+    // 如果语言名包含 `-`，转换为驼峰命名法
+    if (normalizedLang.includes('-')) {
+      normalizedLang = normalizedLang.replace(/-([a-z])/g, (_, char) => char.toUpperCase())
+    }
+
+    import('@uiw/codemirror-extensions-langs')
+      .then(({ loadLanguage }) => {
+        const extension = loadLanguage(normalizedLang as any)
+        if (extension) {
+          setExtensions((prev) => [...prev, extension])
+        }
+      })
+      .catch((error) => {
+        console.debug(`Failed to load language: ${normalizedLang}`, error)
+      })
+  }, [language, languageMap])
+
+  useEffect(() => {
+    if (!lint) return
+
+    const loader = linterLoaders[language]
+    if (loader) {
+      loader()
+        .then((extension) => {
+          setExtensions((prev) => [...prev, extension])
+        })
+        .catch((error) => {
+          console.error(`Failed to load linter for ${language}`, error)
+        })
+    }
+  }, [language, lint])
+
+  return extensions
+}

src/renderer/src/components/CodeEditor/index.tsx

@@ -0,0 +1,274 @@
+import { CodeTool, TOOL_SPECS, useCodeTool } from '@renderer/components/CodeToolbar'
+import { useCodeStyle } from '@renderer/context/CodeStyleProvider'
+import { useSettings } from '@renderer/hooks/useSettings'
+import CodeMirror, { Annotation, BasicSetupOptions, EditorView, Extension, keymap } from '@uiw/react-codemirror'
+import diff from 'fast-diff'
+import {
+  ChevronsDownUp,
+  ChevronsUpDown,
+  Save as SaveIcon,
+  Text as UnWrapIcon,
+  WrapText as WrapIcon
+} from 'lucide-react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { memo } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { useLanguageExtensions } from './hook'
+
+// 标记非用户编辑的变更
+const External = Annotation.define<boolean>()
+
+interface Props {
+  value: string
+  placeholder?: string | HTMLElement
+  language: string
+  onSave?: (newContent: string) => void
+  onChange?: (newContent: string) => void
+  setTools?: (value: React.SetStateAction<CodeTool[]>) => void
+  minHeight?: string
+  maxHeight?: string
+  /** 用于覆写编辑器的某些设置 */
+  options?: {
+    stream?: boolean // 用于流式响应场景，默认 false
+    lint?: boolean
+    collapsible?: boolean
+    wrappable?: boolean
+    keymap?: boolean
+  } & BasicSetupOptions
+  /** 用于追加 extensions */
+  extensions?: Extension[]
+  /** 用于覆写编辑器的样式，会直接传给 CodeMirror 的 style 属性 */
+  style?: React.CSSProperties
+}
+
+/**
+ * 源代码编辑器，基于 CodeMirror，封装了 ReactCodeMirror。
+ *
+ * 目前必须和 CodeToolbar 配合使用。
+ */
+const CodeEditor = ({
+  value,
+  placeholder,
+  language,
+  onSave,
+  onChange,
+  setTools,
+  minHeight,
+  maxHeight,
+  options,
+  extensions,
+  style
+}: Props) => {
+  const {
+    fontSize,
+    codeShowLineNumbers: _lineNumbers,
+    codeCollapsible: _collapsible,
+    codeWrappable: _wrappable,
+    codeEditor
+  } = useSettings()
+  const collapsible = useMemo(() => options?.collapsible ?? _collapsible, [options?.collapsible, _collapsible])
+  const wrappable = useMemo(() => options?.wrappable ?? _wrappable, [options?.wrappable, _wrappable])
+  const enableKeymap = useMemo(() => options?.keymap ?? codeEditor.keymap, [options?.keymap, codeEditor.keymap])
+
+  // 合并 codeEditor 和 options 的 basicSetup，options 优先
+  const customBasicSetup = useMemo(() => {
+    return {
+      lineNumbers: _lineNumbers,
+      ...(codeEditor as BasicSetupOptions),
+      ...(options as BasicSetupOptions)
+    }
+  }, [codeEditor, _lineNumbers, options])
+
+  const { activeCmTheme } = useCodeStyle()
+  const [isExpanded, setIsExpanded] = useState(!collapsible)
+  const [isUnwrapped, setIsUnwrapped] = useState(!wrappable)
+  const initialContent = useRef(options?.stream ? (value ?? '').trimEnd() : (value ?? ''))
+  const [editorReady, setEditorReady] = useState(false)
+  const editorViewRef = useRef<EditorView | null>(null)
+  const { t } = useTranslation()
+
+  const langExtensions = useLanguageExtensions(language, options?.lint)
+
+  const { registerTool, removeTool } = useCodeTool(setTools)
+
+  // 展开/折叠工具
+  useEffect(() => {
+    registerTool({
+      ...TOOL_SPECS.expand,
+      icon: isExpanded ? <ChevronsDownUp className="icon" /> : <ChevronsUpDown className="icon" />,
+      tooltip: isExpanded ? t('code_block.collapse') : t('code_block.expand'),
+      visible: () => {
+        const scrollHeight = editorViewRef?.current?.scrollDOM?.scrollHeight
+        return collapsible && (scrollHeight ?? 0) > 350
+      },
+      onClick: () => setIsExpanded((prev) => !prev)
+    })
+
+    return () => removeTool(TOOL_SPECS.expand.id)
+  }, [collapsible, isExpanded, registerTool, removeTool, t, editorReady])
+
+  // 自动换行工具
+  useEffect(() => {
+    registerTool({
+      ...TOOL_SPECS.wrap,
+      icon: isUnwrapped ? <WrapIcon className="icon" /> : <UnWrapIcon className="icon" />,
+      tooltip: isUnwrapped ? t('code_block.wrap.on') : t('code_block.wrap.off'),
+      visible: () => wrappable,
+      onClick: () => setIsUnwrapped((prev) => !prev)
+    })
+
+    return () => removeTool(TOOL_SPECS.wrap.id)
+  }, [wrappable, isUnwrapped, registerTool, removeTool, t])
+
+  const handleSave = useCallback(() => {
+    const currentDoc = editorViewRef.current?.state.doc.toString() ?? ''
+    onSave?.(currentDoc)
+  }, [onSave])
+
+  // 保存按钮
+  useEffect(() => {
+    registerTool({
+      ...TOOL_SPECS.save,
+      icon: <SaveIcon className="icon" />,
+      tooltip: t('code_block.edit.save'),
+      onClick: handleSave
+    })
+
+    return () => removeTool(TOOL_SPECS.save.id)
+  }, [handleSave, registerTool, removeTool, t])
+
+  // 流式响应过程中计算 changes 来更新 EditorView
+  // 无法处理用户在流式响应过程中编辑代码的情况（应该也不必处理）
+  useEffect(() => {
+    if (!editorViewRef.current) return
+
+    const newContent = options?.stream ? (value ?? '').trimEnd() : (value ?? '')
+    const currentDoc = editorViewRef.current.state.doc.toString()
+
+    const changes = prepareCodeChanges(currentDoc, newContent)
+
+    if (changes && changes.length > 0) {
+      editorViewRef.current.dispatch({
+        changes,
+        annotations: [External.of(true)]
+      })
+    }
+  }, [options?.stream, value])
+
+  useEffect(() => {
+    setIsExpanded(!collapsible)
+  }, [collapsible])
+
+  useEffect(() => {
+    setIsUnwrapped(!wrappable)
+  }, [wrappable])
+
+  // 保存功能的快捷键
+  const saveKeymap = useMemo(() => {
+    return keymap.of([
+      {
+        key: 'Mod-s',
+        run: () => {
+          handleSave()
+          return true
+        },
+        preventDefault: true
+      }
+    ])
+  }, [handleSave])
+
+  const customExtensions = useMemo(() => {
+    return [
+      ...(extensions ?? []),
+      ...langExtensions,
+      ...(isUnwrapped ? [] : [EditorView.lineWrapping]),
+      ...(enableKeymap ? [saveKeymap] : [])
+    ]
+  }, [extensions, langExtensions, isUnwrapped, enableKeymap, saveKeymap])
+
+  return (
+    <CodeMirror
+      // 维持一个稳定值，避免触发 CodeMirror 重置
+      value={initialContent.current}
+      placeholder={placeholder}
+      width="100%"
+      minHeight={minHeight}
+      maxHeight={collapsible && !isExpanded ? (maxHeight ?? '350px') : 'none'}
+      editable={true}
+      // @ts-ignore 强制使用，见 react-codemirror 的 Example.tsx
+      theme={activeCmTheme}
+      extensions={customExtensions}
+      onCreateEditor={(view: EditorView) => {
+        editorViewRef.current = view
+        setEditorReady(true)
+      }}
+      onChange={(value, viewUpdate) => {
+        if (onChange && viewUpdate.docChanged) onChange(value)
+      }}
+      basicSetup={{
+        dropCursor: true,
+        allowMultipleSelections: true,
+        indentOnInput: true,
+        bracketMatching: true,
+        closeBrackets: true,
+        rectangularSelection: true,
+        crosshairCursor: true,
+        highlightActiveLineGutter: false,
+        highlightSelectionMatches: true,
+        closeBracketsKeymap: enableKeymap,
+        searchKeymap: enableKeymap,
+        foldKeymap: enableKeymap,
+        completionKeymap: enableKeymap,
+        lintKeymap: enableKeymap,
+        ...customBasicSetup // override basicSetup
+      }}
+      style={{
+        ...style,
+        fontSize: `${fontSize - 1}px`,
+        border: '0.5px solid transparent',
+        marginTop: 0
+      }}
+    />
+  )
+}
+
+CodeEditor.displayName = 'CodeEditor'
+
+/**
+ * 使用 fast-diff 计算代码变更，再转换为 CodeMirror 的 changes。
+ * 可以处理所有类型的变更，不过流式响应过程中多是插入操作。
+ * @param oldCode 旧的代码内容
+ * @param newCode 新的代码内容
+ * @returns 用于 EditorView.dispatch 的 changes 数组
+ */
+function prepareCodeChanges(oldCode: string, newCode: string) {
+  const diffResult = diff(oldCode, newCode)
+
+  const changes: { from: number; to: number; insert: string }[] = []
+  let offset = 0
+
+  // operation: 1=插入, -1=删除, 0=相等
+  for (const [operation, text] of diffResult) {
+    if (operation === 1) {
+      changes.push({
+        from: offset,
+        to: offset,
+        insert: text
+      })
+    } else if (operation === -1) {
+      changes.push({
+        from: offset,
+        to: offset + text.length,
+        insert: ''
+      })
+      offset += text.length
+    } else {
+      offset += text.length
+    }
+  }
+
+  return changes
+}
+
+export default memo(CodeEditor)

src/renderer/src/components/CodeToolbar/constants.ts

@@ -0,0 +1,76 @@
+import { CodeToolSpec } from './types'
+
+export const TOOL_SPECS: Record<string, CodeToolSpec> = {
+  // Core tools
+  copy: {
+    id: 'copy',
+    type: 'core',
+    order: 11
+  },
+  download: {
+    id: 'download',
+    type: 'core',
+    order: 10
+  },
+  edit: {
+    id: 'edit',
+    type: 'core',
+    order: 12
+  },
+  'view-source': {
+    id: 'view-source',
+    type: 'core',
+    order: 12
+  },
+  save: {
+    id: 'save',
+    type: 'core',
+    order: 13
+  },
+  expand: {
+    id: 'expand',
+    type: 'core',
+    order: 20
+  },
+  // Quick tools
+  'split-view': {
+    id: 'split-view',
+    type: 'quick',
+    order: 10
+  },
+  run: {
+    id: 'run',
+    type: 'quick',
+    order: 11
+  },
+  wrap: {
+    id: 'wrap',
+    type: 'quick',
+    order: 20
+  },
+  'copy-image': {
+    id: 'copy-image',
+    type: 'quick',
+    order: 30
+  },
+  'download-svg': {
+    id: 'download-svg',
+    type: 'quick',
+    order: 31
+  },
+  'download-png': {
+    id: 'download-png',
+    type: 'quick',
+    order: 32
+  },
+  'zoom-in': {
+    id: 'zoom-in',
+    type: 'quick',
+    order: 40
+  },
+  'zoom-out': {
+    id: 'zoom-out',
+    type: 'quick',
+    order: 41
+  }
+}