Merge branch 'main' into feat/sync_mcprouter

* refactor: migrate showWorkspace setting from global settings to notes module

- Move showWorkspace state from settings store to notes store for better module cohesion
- Add useShowWorkspace hook in useNotesSettings for consistent access pattern
- Add smooth animation for workspace panel show/hide transition
- Relocate save to notes action to message toolbar for better accessibility
- Add migration v146 to handle state migration for existing users

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

* fix: cli lint error

* feat: add open outside menu

* fix: hooks error

* Update useShowWorkspace.ts

* fix: update icon import in NotesSidebarHeader component

- Replaced FilePlus icon with FilePlus2 in the NotesSidebarHeader for consistency with the latest icon set.

---------

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: suyao <sy20010504@gmail.com>

.github/workflows/nightly-build.yml

@@ -51,7 +51,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: main
 
@@ -94,17 +94,18 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get install -y rpm
-          yarn build:npm linux
           yarn build:linux
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
           NODE_OPTIONS: --max-old-space-size=8192
+          MAIN_VITE_CHERRYIN_CLIENT_SECRET: ${{ secrets.MAIN_VITE_CHERRYIN_CLIENT_SECRET }}
+          MAIN_VITE_MINERU_API_KEY: ${{ vars.MAIN_VITE_MINERU_API_KEY }}
+          RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
+          RENDERER_VITE_PPIO_APP_SECRET: ${{ vars.RENDERER_VITE_PPIO_APP_SECRET }}
 
       - name: Build Mac
         if: matrix.os == 'macos-latest'
         run: |
-          yarn build:npm mac
           yarn build:mac
         env:
           CSC_LINK: ${{ secrets.CSC_LINK }}
@@ -112,19 +113,24 @@ jobs:
           APPLE_ID: ${{ vars.APPLE_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ vars.APPLE_APP_SPECIFIC_PASSWORD }}
           APPLE_TEAM_ID: ${{ vars.APPLE_TEAM_ID }}
-          RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NODE_OPTIONS: --max-old-space-size=8192
+          MAIN_VITE_CHERRYIN_CLIENT_SECRET: ${{ secrets.MAIN_VITE_CHERRYIN_CLIENT_SECRET }}
+          MAIN_VITE_MINERU_API_KEY: ${{ vars.MAIN_VITE_MINERU_API_KEY }}
+          RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
+          RENDERER_VITE_PPIO_APP_SECRET: ${{ vars.RENDERER_VITE_PPIO_APP_SECRET }}
 
       - name: Build Windows
         if: matrix.os == 'windows-latest'
         run: |
-          yarn build:npm windows
           yarn build:win
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
           NODE_OPTIONS: --max-old-space-size=8192
+          MAIN_VITE_CHERRYIN_CLIENT_SECRET: ${{ secrets.MAIN_VITE_CHERRYIN_CLIENT_SECRET }}
+          MAIN_VITE_MINERU_API_KEY: ${{ vars.MAIN_VITE_MINERU_API_KEY }}
+          RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
+          RENDERER_VITE_PPIO_APP_SECRET: ${{ vars.RENDERER_VITE_PPIO_APP_SECRET }}
 
       - name: Rename artifacts with nightly format
         shell: bash
@@ -220,7 +226,7 @@ jobs:
         shell: bash
 
       - name: Download all artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           path: all-artifacts
           merge-multiple: false

.github/workflows/pr-ci.yml

@@ -1,5 +1,8 @@
 name: Pull Request CI
 
+permissions:
+  contents: read
+
 on:
   workflow_dispatch:
   pull_request:
@@ -15,7 +18,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install Node.js
         uses: actions/setup-node@v4
@@ -42,8 +45,14 @@ jobs:
       - name: Install Dependencies
         run: yarn install
 
-      - name: Build Check
-        run: yarn build:check
-
       - name: Lint Check
         run: yarn test:lint
+
+      - name: Type Check
+        run: yarn typecheck
+
+      - name: i18n Check
+        run: yarn check:i18n
+
+      - name: Test
+        run: yarn test

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 
@@ -80,12 +80,12 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get install -y rpm
-          yarn build:npm linux
           yarn build:linux
 
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NODE_OPTIONS: --max-old-space-size=8192
+          MAIN_VITE_CHERRYIN_CLIENT_SECRET: ${{ secrets.MAIN_VITE_CHERRYIN_CLIENT_SECRET }}
           MAIN_VITE_MINERU_API_KEY: ${{ vars.MAIN_VITE_MINERU_API_KEY }}
           RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
           RENDERER_VITE_PPIO_APP_SECRET: ${{ vars.RENDERER_VITE_PPIO_APP_SECRET }}
@@ -94,7 +94,6 @@ jobs:
         if: matrix.os == 'macos-latest'
         run: |
           sudo -H pip install setuptools
-          yarn build:npm mac
           yarn build:mac
         env:
           CSC_LINK: ${{ secrets.CSC_LINK }}
@@ -104,6 +103,7 @@ jobs:
           APPLE_TEAM_ID: ${{ vars.APPLE_TEAM_ID }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NODE_OPTIONS: --max-old-space-size=8192
+          MAIN_VITE_CHERRYIN_CLIENT_SECRET: ${{ secrets.MAIN_VITE_CHERRYIN_CLIENT_SECRET }}
           MAIN_VITE_MINERU_API_KEY: ${{ vars.MAIN_VITE_MINERU_API_KEY }}
           RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
           RENDERER_VITE_PPIO_APP_SECRET: ${{ vars.RENDERER_VITE_PPIO_APP_SECRET }}
@@ -111,11 +111,11 @@ jobs:
       - name: Build Windows
         if: matrix.os == 'windows-latest'
         run: |
-          yarn build:npm windows
           yarn build:win
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NODE_OPTIONS: --max-old-space-size=8192
+          MAIN_VITE_CHERRYIN_CLIENT_SECRET: ${{ secrets.MAIN_VITE_CHERRYIN_CLIENT_SECRET }}
           MAIN_VITE_MINERU_API_KEY: ${{ vars.MAIN_VITE_MINERU_API_KEY }}
           RENDERER_VITE_AIHUBMIX_SECRET: ${{ vars.RENDERER_VITE_AIHUBMIX_SECRET }}
           RENDERER_VITE_PPIO_APP_SECRET: ${{ vars.RENDERER_VITE_PPIO_APP_SECRET }}

.gitignore

@@ -60,6 +60,9 @@ coverage
 .vitest-cache
 vitest.config.*.timestamp-*
 
+# TypeScript incremental build
+.tsbuildinfo
+
 # playwright
 playwright-report
 test-results

.prettierignore

@@ -7,3 +7,4 @@ tsconfig.*.json
 CHANGELOG*.md
 agents.json
 src/renderer/src/integration/nutstore/sso/lib
+src/main/integration/cherryin/index.js

.vscode/launch.json

@@ -1,39 +1,40 @@
 {
-  "version": "0.2.0",
+  "compounds": [
+    {
+      "configurations": ["Debug Main Process", "Debug Renderer Process"],
+      "name": "Debug All",
+      "presentation": {
+        "order": 1
+      }
+    }
+  ],
   "configurations": [
     {
-      "name": "Debug Main Process",
-      "type": "node",
-      "request": "launch",
       "cwd": "${workspaceRoot}",
-      "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron-vite",
-      "windows": {
-        "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron-vite.cmd"
-      },
-      "runtimeArgs": ["--inspect", "--sourcemap"],
       "env": {
         "REMOTE_DEBUGGING_PORT": "9222"
+      },
+      "envFile": "${workspaceFolder}/.env",
+      "name": "Debug Main Process",
+      "request": "launch",
+      "runtimeArgs": ["--inspect", "--sourcemap"],
+      "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron-vite",
+      "type": "node",
+      "windows": {
+        "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron-vite.cmd"
       }
     },
     {
       "name": "Debug Renderer Process",
       "port": 9222,
-      "request": "attach",
-      "type": "chrome",
-      "webRoot": "${workspaceFolder}/src/renderer",
-      "timeout": 3000000,
       "presentation": {
         "hidden": true
-      }
+      },
+      "request": "attach",
+      "timeout": 3000000,
+      "type": "chrome",
+      "webRoot": "${workspaceFolder}/src/renderer"
     }
   ],
-  "compounds": [
-    {
-      "name": "Debug All",
-      "configurations": ["Debug Main Process", "Debug Renderer Process"],
-      "presentation": {
-        "order": 1
-      }
-    }
-  ]
+  "version": "0.2.0"
 }

.yarn/patches/@napi-rs-system-ocr-npm-1.0.2-59e7a78e8b.patch

@@ -0,0 +1,30 @@
+diff --git a/index.js b/index.js
+index dc071739e79876dff88e1be06a9168e294222d13..b9df7525c62bdf777e89e732e1b0c81f84d872f2 100644
+--- a/index.js
++++ b/index.js
+@@ -380,7 +380,7 @@ if (!nativeBinding || process.env.NAPI_RS_FORCE_WASI) {
+   }
+ }
+ 
+-if (!nativeBinding) {
++if (!nativeBinding && process.platform !== 'linux') {
+   if (loadErrors.length > 0) {
+     throw new Error(
+       `Cannot find native binding. ` +
+@@ -392,6 +392,13 @@ if (!nativeBinding) {
+   throw new Error(`Failed to load native binding`)
+ }
+ 
+-module.exports = nativeBinding
+-module.exports.OcrAccuracy = nativeBinding.OcrAccuracy
+-module.exports.recognize = nativeBinding.recognize
++if (process.platform === 'linux') {
++  module.exports = {OcrAccuracy: {
++    Fast: 0,
++    Accurate: 1
++  }, recognize: () => Promise.resolve({text: '', confidence: 1.0})}
++}else{
++  module.exports = nativeBinding
++  module.exports.OcrAccuracy = nativeBinding.OcrAccuracy
++  module.exports.recognize = nativeBinding.recognize
++}

.yarn/patches/@tiptap-extension-drag-handle-npm-3.2.0-5a9ebff7c9.patch

@@ -0,0 +1,48 @@
+diff --git a/dist/index.cjs b/dist/index.cjs
+index 8e560a4406c5cc616c11bb9fd5455ac0dcf47fa3..c7cd0d65ddc971bff71e89f610de82cfdaa5a8c7 100644
+--- a/dist/index.cjs
++++ b/dist/index.cjs
+@@ -413,6 +413,19 @@ var DragHandlePlugin = ({
+             }
+             return false;
+           },
++          scroll(view) {
++            if (!element || locked) {
++              return false;
++            }
++            if (view.hasFocus()) {
++              hideHandle();
++              currentNode = null;
++              currentNodePos = -1;
++              onNodeChange == null ? void 0 : onNodeChange({ editor, node: null, pos: -1 });
++              return false;
++            }
++            return false;
++          },
+           mouseleave(_view, e) {
+             if (locked) {
+               return false;
+diff --git a/dist/index.js b/dist/index.js
+index 39e4c3ef9986cd25544d9d3994cf6a9ada74b145..378d9130abbfdd0e1e4f743b5b537743c9ab07d0 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -387,6 +387,19 @@ var DragHandlePlugin = ({
+             }
+             return false;
+           },
++          scroll(view) {
++            if (!element || locked) {
++              return false;
++            }
++            if (view.hasFocus()) {
++              hideHandle();
++              currentNode = null;
++              currentNodePos = -1;
++              onNodeChange == null ? void 0 : onNodeChange({ editor, node: null, pos: -1 });
++              return false;
++            }
++            return false;
++          },
+           mouseleave(_view, e) {
+             if (locked) {
+               return false;

.yarn/patches/tesseract.js-npm-6.0.1-2562a7e46d.patch

@@ -0,0 +1,348 @@
+diff --git a/src/constants/languages.d.ts b/src/constants/languages.d.ts
+new file mode 100644
+index 0000000000000000000000000000000000000000..6a2ba5086187622b8ca8887bcc7406018fba8a89
+--- /dev/null
++++ b/src/constants/languages.d.ts
+@@ -0,0 +1,43 @@
++/**
++ * Languages with existing tesseract traineddata
++ * https://tesseract-ocr.github.io/tessdoc/Data-Files#data-files-for-version-400-november-29-2016
++ */
++
++// Define the language codes as string literals
++type LanguageCode =
++  | 'afr' | 'amh' | 'ara' | 'asm' | 'aze' | 'aze_cyrl' | 'bel' | 'ben' | 'bod' | 'bos'
++  | 'bul' | 'cat' | 'ceb' | 'ces' | 'chi_sim' | 'chi_tra' | 'chr' | 'cym' | 'dan' | 'deu'
++  | 'dzo' | 'ell' | 'eng' | 'enm' | 'epo' | 'est' | 'eus' | 'fas' | 'fin' | 'fra'
++  | 'frk' | 'frm' | 'gle' | 'glg' | 'grc' | 'guj' | 'hat' | 'heb' | 'hin' | 'hrv'
++  | 'hun' | 'iku' | 'ind' | 'isl' | 'ita' | 'ita_old' | 'jav' | 'jpn' | 'kan' | 'kat'
++  | 'kat_old' | 'kaz' | 'khm' | 'kir' | 'kor' | 'kur' | 'lao' | 'lat' | 'lav' | 'lit'
++  | 'mal' | 'mar' | 'mkd' | 'mlt' | 'msa' | 'mya' | 'nep' | 'nld' | 'nor' | 'ori'
++  | 'pan' | 'pol' | 'por' | 'pus' | 'ron' | 'rus' | 'san' | 'sin' | 'slk' | 'slv'
++  | 'spa' | 'spa_old' | 'sqi' | 'srp' | 'srp_latn' | 'swa' | 'swe' | 'syr' | 'tam' | 'tel'
++  | 'tgk' | 'tgl' | 'tha' | 'tir' | 'tur' | 'uig' | 'ukr' | 'urd' | 'uzb' | 'uzb_cyrl'
++  | 'vie' | 'yid';
++
++// Define the language keys as string literals
++type LanguageKey =
++  | 'AFR' | 'AMH' | 'ARA' | 'ASM' | 'AZE' | 'AZE_CYRL' | 'BEL' | 'BEN' | 'BOD' | 'BOS'
++  | 'BUL' | 'CAT' | 'CEB' | 'CES' | 'CHI_SIM' | 'CHI_TRA' | 'CHR' | 'CYM' | 'DAN' | 'DEU'
++  | 'DZO' | 'ELL' | 'ENG' | 'ENM' | 'EPO' | 'EST' | 'EUS' | 'FAS' | 'FIN' | 'FRA'
++  | 'FRK' | 'FRM' | 'GLE' | 'GLG' | 'GRC' | 'GUJ' | 'HAT' | 'HEB' | 'HIN' | 'HRV'
++  | 'HUN' | 'IKU' | 'IND' | 'ISL' | 'ITA' | 'ITA_OLD' | 'JAV' | 'JPN' | 'KAN' | 'KAT'
++  | 'KAT_OLD' | 'KAZ' | 'KHM' | 'KIR' | 'KOR' | 'KUR' | 'LAO' | 'LAT' | 'LAV' | 'LIT'
++  | 'MAL' | 'MAR' | 'MKD' | 'MLT' | 'MSA' | 'MYA' | 'NEP' | 'NLD' | 'NOR' | 'ORI'
++  | 'PAN' | 'POL' | 'POR' | 'PUS' | 'RON' | 'RUS' | 'SAN' | 'SIN' | 'SLK' | 'SLV'
++  | 'SPA' | 'SPA_OLD' | 'SQI' | 'SRP' | 'SRP_LATN' | 'SWA' | 'SWE' | 'SYR' | 'TAM' | 'TEL'
++  | 'TGK' | 'TGL' | 'THA' | 'TIR' | 'TUR' | 'UIG' | 'UKR' | 'URD' | 'UZB' | 'UZB_CYRL'
++  | 'VIE' | 'YID';
++
++// Create a mapped type to ensure each key maps to its specific value
++type LanguagesMap = {
++  [K in LanguageKey]: LanguageCode;
++};
++
++// Declare the exported constant with the specific type
++export const LANGUAGES: LanguagesMap;
++
++// Export the individual types for use in other modules
++export type { LanguageCode, LanguageKey, LanguagesMap };
+\ No newline at end of file
+diff --git a/src/index.d.ts b/src/index.d.ts
+index 1f5a9c8094fe4de7983467f9efb43bdb4de535f2..16dc95cf68663673e37e189b719cb74897b7735f 100644
+--- a/src/index.d.ts
++++ b/src/index.d.ts
+@@ -1,31 +1,74 @@
++// Import the languages types
++import { LanguagesMap } from "./constants/languages";
++
++/// <reference types="node" />
++
+ declare namespace Tesseract {
+-  function createScheduler(): Scheduler
+-  function createWorker(langs?: string | string[] | Lang[], oem?: OEM, options?: Partial<WorkerOptions>, config?: string | Partial<InitOptions>): Promise<Worker>
+-  function setLogging(logging: boolean): void
+-  function recognize(image: ImageLike, langs?: string, options?: Partial<WorkerOptions>): Promise<RecognizeResult>
+-  function detect(image: ImageLike, options?: Partial<WorkerOptions>): any
++  function createScheduler(): Scheduler;
++  function createWorker(
++    langs?: LanguageCode | LanguageCode[] | Lang[],
++    oem?: OEM,
++    options?: Partial<WorkerOptions>,
++    config?: string | Partial<InitOptions>
++  ): Promise<Worker>;
++  function setLogging(logging: boolean): void;
++  function recognize(
++    image: ImageLike,
++    langs?: LanguageCode,
++    options?: Partial<WorkerOptions>
++  ): Promise<RecognizeResult>;
++  function detect(image: ImageLike, options?: Partial<WorkerOptions>): any;
++
++  // Export languages constant
++  const languages: LanguagesMap;
++
++  type LanguageCode = import("./constants/languages").LanguageCode;
++  type LanguageKey = import("./constants/languages").LanguageKey;
+ 
+   interface Scheduler {
+-    addWorker(worker: Worker): string
+-    addJob(action: 'recognize', ...args: Parameters<Worker['recognize']>): Promise<RecognizeResult>
+-    addJob(action: 'detect', ...args: Parameters<Worker['detect']>): Promise<DetectResult>
+-    terminate(): Promise<any>
+-    getQueueLen(): number
+-    getNumWorkers(): number
++    addWorker(worker: Worker): string;
++    addJob(
++      action: "recognize",
++      ...args: Parameters<Worker["recognize"]>
++    ): Promise<RecognizeResult>;
++    addJob(
++      action: "detect",
++      ...args: Parameters<Worker["detect"]>
++    ): Promise<DetectResult>;
++    terminate(): Promise<any>;
++    getQueueLen(): number;
++    getNumWorkers(): number;
+   }
+ 
+   interface Worker {
+-    load(jobId?: string): Promise<ConfigResult>
+-    writeText(path: string, text: string, jobId?: string): Promise<ConfigResult>
+-    readText(path: string, jobId?: string): Promise<ConfigResult>
+-    removeText(path: string, jobId?: string): Promise<ConfigResult>
+-    FS(method: string, args: any[], jobId?: string): Promise<ConfigResult>
+-    reinitialize(langs?: string | Lang[], oem?: OEM, config?: string | Partial<InitOptions>, jobId?: string): Promise<ConfigResult>
+-    setParameters(params: Partial<WorkerParams>, jobId?: string): Promise<ConfigResult>
+-    getImage(type: imageType): string
+-    recognize(image: ImageLike, options?: Partial<RecognizeOptions>, output?: Partial<OutputFormats>, jobId?: string): Promise<RecognizeResult>
+-    detect(image: ImageLike, jobId?: string): Promise<DetectResult>
+-    terminate(jobId?: string): Promise<ConfigResult>
++    load(jobId?: string): Promise<ConfigResult>;
++    writeText(
++      path: string,
++      text: string,
++      jobId?: string
++    ): Promise<ConfigResult>;
++    readText(path: string, jobId?: string): Promise<ConfigResult>;
++    removeText(path: string, jobId?: string): Promise<ConfigResult>;
++    FS(method: string, args: any[], jobId?: string): Promise<ConfigResult>;
++    reinitialize(
++      langs?: string | Lang[],
++      oem?: OEM,
++      config?: string | Partial<InitOptions>,
++      jobId?: string
++    ): Promise<ConfigResult>;
++    setParameters(
++      params: Partial<WorkerParams>,
++      jobId?: string
++    ): Promise<ConfigResult>;
++    getImage(type: imageType): string;
++    recognize(
++      image: ImageLike,
++      options?: Partial<RecognizeOptions>,
++      output?: Partial<OutputFormats>,
++      jobId?: string
++    ): Promise<RecognizeResult>;
++    detect(image: ImageLike, jobId?: string): Promise<DetectResult>;
++    terminate(jobId?: string): Promise<ConfigResult>;
+   }
+ 
+   interface Lang {
+@@ -34,43 +77,43 @@ declare namespace Tesseract {
+   }
+ 
+   interface InitOptions {
+-    load_system_dawg: string
+-    load_freq_dawg: string
+-    load_unambig_dawg: string
+-    load_punc_dawg: string
+-    load_number_dawg: string
+-    load_bigram_dawg: string
+-  }
+-  
+-  type LoggerMessage = {
+-    jobId: string
+-    progress: number
+-    status: string
+-    userJobId: string
+-    workerId: string
++    load_system_dawg: string;
++    load_freq_dawg: string;
++    load_unambig_dawg: string;
++    load_punc_dawg: string;
++    load_number_dawg: string;
++    load_bigram_dawg: string;
+   }
+-  
++
++  type LoggerMessage = {
++    jobId: string;
++    progress: number;
++    status: string;
++    userJobId: string;
++    workerId: string;
++  };
++
+   interface WorkerOptions {
+-    corePath: string
+-    langPath: string
+-    cachePath: string
+-    dataPath: string
+-    workerPath: string
+-    cacheMethod: string
+-    workerBlobURL: boolean
+-    gzip: boolean
+-    legacyLang: boolean
+-    legacyCore: boolean
+-    logger: (arg: LoggerMessage) => void,
+-    errorHandler: (arg: any) => void
++    corePath: string;
++    langPath: string;
++    cachePath: string;
++    dataPath: string;
++    workerPath: string;
++    cacheMethod: string;
++    workerBlobURL: boolean;
++    gzip: boolean;
++    legacyLang: boolean;
++    legacyCore: boolean;
++    logger: (arg: LoggerMessage) => void;
++    errorHandler: (arg: any) => void;
+   }
+   interface WorkerParams {
+-    tessedit_pageseg_mode: PSM
+-    tessedit_char_whitelist: string
+-    tessedit_char_blacklist: string
+-    preserve_interword_spaces: string
+-    user_defined_dpi: string
+-    [propName: string]: any
++    tessedit_pageseg_mode: PSM;
++    tessedit_char_whitelist: string;
++    tessedit_char_blacklist: string;
++    preserve_interword_spaces: string;
++    user_defined_dpi: string;
++    [propName: string]: any;
+   }
+   interface OutputFormats {
+     text: boolean;
+@@ -88,36 +131,36 @@ declare namespace Tesseract {
+     debug: boolean;
+   }
+   interface RecognizeOptions {
+-    rectangle: Rectangle
+-    pdfTitle: string
+-    pdfTextOnly: boolean
+-    rotateAuto: boolean
+-    rotateRadians: number
++    rectangle: Rectangle;
++    pdfTitle: string;
++    pdfTextOnly: boolean;
++    rotateAuto: boolean;
++    rotateRadians: number;
+   }
+   interface ConfigResult {
+-    jobId: string
+-    data: any
++    jobId: string;
++    data: any;
+   }
+   interface RecognizeResult {
+-    jobId: string
+-    data: Page
++    jobId: string;
++    data: Page;
+   }
+   interface DetectResult {
+-    jobId: string
+-    data: DetectData
++    jobId: string;
++    data: DetectData;
+   }
+   interface DetectData {
+-    tesseract_script_id: number | null
+-    script: string | null
+-    script_confidence: number | null
+-    orientation_degrees: number | null
+-    orientation_confidence: number | null
++    tesseract_script_id: number | null;
++    script: string | null;
++    script_confidence: number | null;
++    orientation_degrees: number | null;
++    orientation_confidence: number | null;
+   }
+   interface Rectangle {
+-    left: number
+-    top: number
+-    width: number
+-    height: number
++    left: number;
++    top: number;
++    width: number;
++    height: number;
+   }
+   enum OEM {
+     TESSERACT_ONLY,
+@@ -126,28 +169,36 @@ declare namespace Tesseract {
+     DEFAULT,
+   }
+   enum PSM {
+-    OSD_ONLY = '0',
+-    AUTO_OSD = '1',
+-    AUTO_ONLY = '2',
+-    AUTO = '3',
+-    SINGLE_COLUMN = '4',
+-    SINGLE_BLOCK_VERT_TEXT = '5',
+-    SINGLE_BLOCK = '6',
+-    SINGLE_LINE = '7',
+-    SINGLE_WORD = '8',
+-    CIRCLE_WORD = '9',
+-    SINGLE_CHAR = '10',
+-    SPARSE_TEXT = '11',
+-    SPARSE_TEXT_OSD = '12',
+-    RAW_LINE = '13'
++    OSD_ONLY = "0",
++    AUTO_OSD = "1",
++    AUTO_ONLY = "2",
++    AUTO = "3",
++    SINGLE_COLUMN = "4",
++    SINGLE_BLOCK_VERT_TEXT = "5",
++    SINGLE_BLOCK = "6",
++    SINGLE_LINE = "7",
++    SINGLE_WORD = "8",
++    CIRCLE_WORD = "9",
++    SINGLE_CHAR = "10",
++    SPARSE_TEXT = "11",
++    SPARSE_TEXT_OSD = "12",
++    RAW_LINE = "13",
+   }
+   const enum imageType {
+     COLOR = 0,
+     GREY = 1,
+-    BINARY = 2
++    BINARY = 2,
+   }
+-  type ImageLike = string | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement
+-    | CanvasRenderingContext2D | File | Blob | Buffer | OffscreenCanvas;
++  type ImageLike =
++    | string
++    | HTMLImageElement
++    | HTMLCanvasElement
++    | HTMLVideoElement
++    | CanvasRenderingContext2D
++    | File
++    | Blob
++    | (typeof Buffer extends undefined ? never : Buffer)
++    | OffscreenCanvas;
+   interface Block {
+     paragraphs: Paragraph[];
+     text: string;
+@@ -179,7 +230,7 @@ declare namespace Tesseract {
+     text: string;
+     confidence: number;
+     baseline: Baseline;
+-    rowAttributes: RowAttributes
++    rowAttributes: RowAttributes;
+     bbox: Bbox;
+   }
+   interface Paragraph {

README.md

@@ -57,7 +57,7 @@
 
 <div align="center">
  <a href="https://hellogithub.com/repository/1605492e1e2a4df3be07abfa4578dd37" target="_blank" style="text-decoration: none"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=1605492e1e2a4df3be07abfa4578dd37" alt="Featured｜HelloGitHub"  width="220" height="55" /></a>
- <a href="https://trendshift.io/repositories/11772" target="_blank" style="text-decoration: none"><img src="https://trendshift.io/api/badge/repositories/11772" alt="kangfenmao%2Fcherry-studio | Trendshift" width="220" height="55" /></a>
+ <a href="https://trendshift.io/repositories/14318" target="_blank" style="text-decoration: none"><img src="https://trendshift.io/api/badge/repositories/14318" alt="CherryHQ%2Fcherry-studio | Trendshift" width="220" 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" width="220" height="55" /></a>
 </div>
 

build/entitlements.mac.plist

@@ -8,5 +8,7 @@
     <true/>
     <key>com.apple.security.cs.allow-dyld-environment-variables</key>
     <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
   </dict>
 </plist>

electron-builder.yml

@@ -55,10 +55,14 @@ files:
   - '!node_modules/selection-hook/prebuilds/**/*' # we rebuild .node, don't use prebuilds
   - '!node_modules/selection-hook/node_modules' # we don't need what in the node_modules dir
   - '!node_modules/selection-hook/src' # we don't need source files
+  - '!node_modules/tesseract.js-core/{tesseract-core.js,tesseract-core.wasm,tesseract-core.wasm.js}' # we don't need source files
+  - '!node_modules/tesseract.js-core/{tesseract-core-lstm.js,tesseract-core-lstm.wasm,tesseract-core-lstm.wasm.js}' # we don't need source files
+  - '!node_modules/tesseract.js-core/{tesseract-core-simd-lstm.js,tesseract-core-simd-lstm.wasm,tesseract-core-simd-lstm.wasm.js}' # we don't need source files
   - '!**/*.{h,iobj,ipdb,tlog,recipe,vcxproj,vcxproj.filters,Makefile,*.Makefile}' # filter .node build files
 asarUnpack:
   - resources/**
   - '**/*.{metal,exp,lib}'
+  - 'node_modules/@img/sharp-libvips-*/**'
 win:
   executableName: Cherry Studio
   artifactName: ${productName}-${version}-${arch}-setup.${ext}
@@ -111,14 +115,30 @@ publish:
   url: https://releases.cherry-ai.com
 electronDownload:
   mirror: https://npmmirror.com/mirrors/electron/
+beforePack: scripts/before-pack.js
 afterPack: scripts/after-pack.js
 afterSign: scripts/notarize.js
 artifactBuildCompleted: scripts/artifact-build-completed.js
 releaseInfo:
   releaseNotes: |
-    支持 GPT-5 模型
-    新增代码工具，支持快速启动 Qwen Code, Gemini Cli, Claude Code
-    翻译页面改版，支持更多设置
-    支持保存整个话题到知识库
-    坚果云备份支持设置最大备份数量
-    稳定性改进和错误修复
+    ✨ 重要更新：
+    - 新增笔记模块，支持富文本编辑和管理
+    - 内置 GLM-4.5-Flash 免费模型（由智谱开放平台提供）
+    - 内置 Qwen3-8B 免费模型（由硅基流动提供）
+    - 新增 Nano Banana（Gemini 2.5 Flash Image）模型支持
+    - 新增系统 OCR 功能 (macOS & Windows)
+    - 新增图片 OCR 识别和翻译功能
+    - 模型切换支持通过标签筛选
+    - 翻译功能增强：历史搜索和收藏
+
+    🔧 性能优化：
+    - 优化历史页面搜索性能
+    - 优化拖拽列表组件交互
+    - 升级 Electron 到 37.4.0
+
+    🐛 修复问题：
+    - 修复知识库加密 PDF 文档处理
+    - 修复导航栏在左侧时笔记侧边栏按钮缺失
+    - 修复多个模型兼容性问题
+    - 修复 MCP 相关问题
+    - 其他稳定性改进

electron.vite.config.ts

@@ -4,6 +4,8 @@ import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
 import { resolve } from 'path'
 import { visualizer } from 'rollup-plugin-visualizer'
 
+import pkg from './package.json' assert { type: 'json' }
+
 const visualizerPlugin = (type: 'renderer' | 'main') => {
   return process.env[`VISUALIZER_${type.toUpperCase()}`] ? [visualizer({ open: true })] : []
 }
@@ -26,7 +28,7 @@ export default defineConfig({
     },
     build: {
       rollupOptions: {
-        external: ['@libsql/client', 'bufferutil', 'utf-8-validate'],
+        external: ['bufferutil', 'utf-8-validate', 'electron', ...Object.keys(pkg.dependencies)],
         output: {
           manualChunks: undefined, // 彻底禁用代码分割 - 返回 null 强制单文件打包
           inlineDynamicImports: true // 内联所有动态导入，这是关键配置
@@ -81,7 +83,8 @@ export default defineConfig({
         '@shared': resolve('packages/shared'),
         '@logger': resolve('src/renderer/src/services/LoggerService'),
         '@mcp-trace/trace-core': resolve('packages/mcp-trace/trace-core'),
-        '@mcp-trace/trace-web': resolve('packages/mcp-trace/trace-web')
+        '@mcp-trace/trace-web': resolve('packages/mcp-trace/trace-web'),
+        '@cherrystudio/extension-table-plus': resolve('packages/extension-table-plus/src')
       }
     },
     optimizeDeps: {

eslint.config.mjs

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "1.5.6",
+  "version": "1.5.9",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",
@@ -19,7 +19,8 @@
         "packages/database",
         "packages/mcp-trace/trace-core",
         "packages/mcp-trace/trace-node",
-        "packages/mcp-trace/trace-web"
+        "packages/mcp-trace/trace-web",
+        "packages/extension-table-plus"
       ]
     }
   },
@@ -39,7 +40,6 @@
     "build:linux": "dotenv npm run build && electron-builder --linux --x64 --arm64",
     "build:linux:arm64": "dotenv npm run build && electron-builder --linux --arm64",
     "build:linux:x64": "dotenv npm run build && electron-builder --linux --x64",
-    "build:npm": "node scripts/build-npm.js",
     "release": "node scripts/version.js",
     "publish": "yarn build:check && yarn release patch push",
     "pulish:artifacts": "cd packages/artifacts && npm publish && cd -",
@@ -47,7 +47,7 @@
     "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": "concurrently -n \"node,web\" -c \"cyan,magenta\" \"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": "tsx scripts/check-i18n.ts",
@@ -72,13 +72,16 @@
   "dependencies": {
     "@libsql/client": "0.14.0",
     "@libsql/win32-x64-msvc": "^0.4.7",
+    "@napi-rs/system-ocr": "patch:@napi-rs/system-ocr@npm%3A1.0.2#~/.yarn/patches/@napi-rs-system-ocr-npm-1.0.2-59e7a78e8b.patch",
     "@strongtz/win32-arm64-msvc": "^0.4.7",
     "graceful-fs": "^4.2.11",
     "jsdom": "26.1.0",
     "node-stream-zip": "^1.15.0",
     "officeparser": "^4.2.0",
     "os-proxy-config": "^1.1.2",
-    "selection-hook": "^1.0.8",
+    "selection-hook": "^1.0.11",
+    "sharp": "^0.34.3",
+    "tesseract.js": "patch:tesseract.js@npm%3A6.0.1#~/.yarn/patches/tesseract.js-npm-6.0.1-2562a7e46d.patch",
     "turndown": "7.2.0"
   },
   "devDependencies": {
@@ -103,7 +106,11 @@
     "@cherrystudio/embedjs-loader-xml": "^0.1.31",
     "@cherrystudio/embedjs-ollama": "^0.1.31",
     "@cherrystudio/embedjs-openai": "^0.1.31",
-    "@codemirror/view": "^6.0.0",
+    "@cherrystudio/extension-table-plus": "workspace:^",
+    "@dnd-kit/core": "^6.3.1",
+    "@dnd-kit/modifiers": "^9.0.0",
+    "@dnd-kit/sortable": "^10.0.0",
+    "@dnd-kit/utilities": "^3.2.2",
     "@electron-toolkit/eslint-config-prettier": "^3.0.0",
     "@electron-toolkit/eslint-config-ts": "^3.0.0",
     "@electron-toolkit/preload": "^3.0.0",
@@ -114,7 +121,7 @@
     "@eslint-react/eslint-plugin": "^1.36.1",
     "@eslint/js": "^9.22.0",
     "@google/genai": "patch:@google/genai@npm%3A1.0.1#~/.yarn/patches/@google-genai-npm-1.0.1-e26f0f9af7.patch",
-    "@hello-pangea/dnd": "^16.6.0",
+    "@hello-pangea/dnd": "^18.0.1",
     "@kangfenmao/keyv-storage": "^0.1.0",
     "@langchain/community": "^0.3.36",
     "@langchain/ollama": "^0.2.1",
@@ -130,32 +137,50 @@
     "@opentelemetry/sdk-trace-web": "^2.0.0",
     "@playwright/test": "^1.52.0",
     "@reduxjs/toolkit": "^2.2.5",
-    "@shikijs/markdown-it": "^3.9.1",
+    "@shikijs/markdown-it": "^3.12.0",
     "@swc/plugin-styled-components": "^7.1.5",
-    "@tanstack/react-query": "^5.27.0",
+    "@tanstack/react-query": "^5.85.5",
     "@tanstack/react-virtual": "^3.13.12",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
+    "@tiptap/extension-collaboration": "^3.2.0",
+    "@tiptap/extension-drag-handle": "patch:@tiptap/extension-drag-handle@npm%3A3.2.0#~/.yarn/patches/@tiptap-extension-drag-handle-npm-3.2.0-5a9ebff7c9.patch",
+    "@tiptap/extension-drag-handle-react": "^3.2.0",
+    "@tiptap/extension-image": "^3.2.0",
+    "@tiptap/extension-list": "^3.2.0",
+    "@tiptap/extension-mathematics": "^3.2.0",
+    "@tiptap/extension-mention": "^3.2.0",
+    "@tiptap/extension-node-range": "^3.2.0",
+    "@tiptap/extension-table-of-contents": "^3.2.0",
+    "@tiptap/extension-typography": "^3.2.0",
+    "@tiptap/extension-underline": "^3.2.0",
+    "@tiptap/pm": "^3.2.0",
+    "@tiptap/react": "^3.2.0",
+    "@tiptap/starter-kit": "^3.2.0",
+    "@tiptap/suggestion": "^3.2.0",
+    "@tiptap/y-tiptap": "^3.0.0",
+    "@truto/turndown-plugin-gfm": "^1.0.2",
     "@tryfabric/martian": "^1.2.4",
     "@types/cli-progress": "^3",
-    "@types/diff": "^7",
     "@types/fs-extra": "^11",
+    "@types/he": "^1",
     "@types/lodash": "^4.17.5",
     "@types/markdown-it": "^14",
     "@types/md5": "^2.3.5",
-    "@types/node": "^18.19.9",
+    "@types/node": "^22.17.1",
     "@types/pako": "^1.0.2",
     "@types/react": "^19.0.12",
     "@types/react-dom": "^19.0.4",
     "@types/react-infinite-scroll-component": "^5.0.0",
     "@types/react-transition-group": "^4.4.12",
     "@types/tinycolor2": "^1",
+    "@types/turndown": "^5.0.5",
     "@types/word-extractor": "^1",
-    "@uiw/codemirror-extensions-langs": "^4.23.14",
-    "@uiw/codemirror-themes-all": "^4.23.14",
-    "@uiw/react-codemirror": "^4.23.14",
+    "@uiw/codemirror-extensions-langs": "^4.25.1",
+    "@uiw/codemirror-themes-all": "^4.25.1",
+    "@uiw/react-codemirror": "^4.25.1",
     "@vitejs/plugin-react-swc": "^3.9.0",
     "@vitest/browser": "^3.2.4",
     "@vitest/coverage-v8": "^3.2.4",
@@ -164,23 +189,26 @@
     "@viz-js/lang-dot": "^1.0.5",
     "@viz-js/viz": "^3.14.0",
     "@xyflow/react": "^12.4.4",
-    "antd": "patch:antd@npm%3A5.26.7#~/.yarn/patches/antd-npm-5.26.7-029c5c381a.patch",
+    "antd": "patch:antd@npm%3A5.27.0#~/.yarn/patches/antd-npm-5.27.0-aa91c36546.patch",
     "archiver": "^7.0.1",
     "async-mutex": "^0.5.0",
     "axios": "^1.7.3",
     "browser-image-compression": "^2.0.2",
     "chardet": "^2.1.0",
+    "chokidar": "^4.0.3",
     "cli-progress": "^3.12.0",
     "code-inspector-plugin": "^0.20.14",
     "color": "^5.0.0",
+    "concurrently": "^9.2.1",
     "country-flag-emoji-polyfill": "0.1.8",
     "dayjs": "^1.11.11",
     "dexie": "^4.0.8",
     "dexie-react-hooks": "^1.1.7",
-    "diff": "^7.0.0",
+    "diff": "^8.0.2",
     "docx": "^9.0.2",
+    "dompurify": "^3.2.6",
     "dotenv-cli": "^7.4.2",
-    "electron": "37.2.3",
+    "electron": "37.4.0",
     "electron-builder": "26.0.15",
     "electron-devtools-installer": "^3.2.0",
     "electron-store": "^8.2.0",
@@ -200,20 +228,24 @@
     "franc-min": "^6.2.0",
     "fs-extra": "^11.2.0",
     "google-auth-library": "^9.15.1",
+    "he": "^1.2.0",
+    "html-tags": "^5.1.0",
     "html-to-image": "^1.11.13",
+    "htmlparser2": "^10.0.0",
     "husky": "^9.1.7",
     "i18next": "^23.11.5",
     "iconv-lite": "^0.6.3",
+    "isbinaryfile": "5.0.4",
     "jaison": "^2.0.2",
     "jest-styled-components": "^7.2.0",
-    "linguist-languages": "^8.0.0",
+    "linguist-languages": "^8.1.0",
     "lint-staged": "^15.5.0",
     "lodash": "^4.17.21",
     "lru-cache": "^11.1.0",
     "lucide-react": "^0.525.0",
     "macos-release": "^3.4.0",
     "markdown-it": "^14.1.0",
-    "mermaid": "^11.9.0",
+    "mermaid": "^11.10.1",
     "mime": "^4.0.4",
     "motion": "^12.10.5",
     "notion-helper": "^1.3.22",
@@ -225,9 +257,9 @@
     "prettier": "^3.5.3",
     "prettier-plugin-sort-json": "^4.1.1",
     "proxy-agent": "^6.5.0",
-    "rc-virtual-list": "^3.18.6",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
+    "react-error-boundary": "^6.0.0",
     "react-hotkeys-hook": "^4.6.1",
     "react-i18next": "^14.1.2",
     "react-infinite-scroll-component": "^6.1.0",
@@ -243,7 +275,9 @@
     "reflect-metadata": "0.2.2",
     "rehype-katex": "^7.0.1",
     "rehype-mathjax": "^7.1.0",
+    "rehype-parse": "^9.0.1",
     "rehype-raw": "^7.0.0",
+    "rehype-stringify": "^10.0.1",
     "remark-cjk-friendly": "^1.2.0",
     "remark-gfm": "^4.0.1",
     "remark-github-blockquote-alert": "^2.0.0",
@@ -251,14 +285,16 @@
     "remove-markdown": "^0.6.2",
     "rollup-plugin-visualizer": "^5.12.0",
     "sass": "^1.88.0",
-    "shiki": "^3.9.1",
+    "shiki": "^3.12.0",
     "strict-url-sanitise": "^0.0.1",
     "string-width": "^7.2.0",
+    "striptags": "^3.2.0",
     "styled-components": "^6.1.11",
     "tar": "^7.4.3",
     "tiny-pinyin": "^1.3.2",
     "tokenx": "^1.1.0",
     "tsx": "^4.20.3",
+    "turndown-plugin-gfm": "^1.0.2",
     "typescript": "^5.6.2",
     "undici": "6.21.2",
     "unified": "^11.0.5",
@@ -269,25 +305,31 @@
     "winston": "^3.17.0",
     "winston-daily-rotate-file": "^5.0.0",
     "word-extractor": "^1.0.4",
+    "y-protocols": "^1.0.6",
+    "yjs": "^13.6.27",
     "zipread": "^1.3.3",
     "zod": "^3.25.74"
   },
   "resolutions": {
-    "pdf-parse@npm:1.1.1": "patch:pdf-parse@npm%3A1.1.1#~/.yarn/patches/pdf-parse-npm-1.1.1-04a6109b2a.patch",
+    "@codemirror/language": "6.11.3",
+    "@codemirror/lint": "6.8.5",
+    "@codemirror/view": "6.38.1",
+    "@langchain/core@npm:^0.3.26": "patch:@langchain/core@npm%3A0.3.44#~/.yarn/patches/@langchain-core-npm-0.3.44-41d5c3cb0a.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",
-    "libsql@npm:^0.4.4": "patch:libsql@npm%3A0.4.7#~/.yarn/patches/libsql-npm-0.4.7-444e260fb1.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",
     "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",
-    "node-abi": "4.12.0",
-    "undici": "6.21.2",
-    "vite": "npm:rolldown-vite@latest",
     "atomically@npm:^1.7.0": "patch:atomically@npm%3A1.7.0#~/.yarn/patches/atomically-npm-1.7.0-e742e5293b.patch",
     "file-stream-rotator@npm:^0.6.1": "patch:file-stream-rotator@npm%3A0.6.1#~/.yarn/patches/file-stream-rotator-npm-0.6.1-eab45fb13d.patch",
+    "libsql@npm:^0.4.4": "patch:libsql@npm%3A0.4.7#~/.yarn/patches/libsql-npm-0.4.7-444e260fb1.patch",
+    "node-abi": "4.12.0",
     "openai@npm:^4.77.0": "patch:openai@npm%3A5.12.2#~/.yarn/patches/openai-npm-5.12.2-30b075401c.patch",
-    "openai@npm:^4.87.3": "patch:openai@npm%3A5.12.2#~/.yarn/patches/openai-npm-5.12.2-30b075401c.patch"
+    "openai@npm:^4.87.3": "patch:openai@npm%3A5.12.2#~/.yarn/patches/openai-npm-5.12.2-30b075401c.patch",
+    "pdf-parse@npm:1.1.1": "patch:pdf-parse@npm%3A1.1.1#~/.yarn/patches/pdf-parse-npm-1.1.1-04a6109b2a.patch",
+    "pkce-challenge@npm:^4.1.0": "patch:pkce-challenge@npm%3A4.1.0#~/.yarn/patches/pkce-challenge-npm-4.1.0-fbc51695a3.patch",
+    "undici": "6.21.2",
+    "vite": "npm:rolldown-vite@latest",
+    "tesseract.js@npm:*": "patch:tesseract.js@npm%3A6.0.1#~/.yarn/patches/tesseract.js-npm-6.0.1-2562a7e46d.patch"
   },
   "packageManager": "yarn@4.9.1",
   "lint-staged": {

packages/extension-table-plus/README.md

@@ -0,0 +1,18 @@
+# @tiptap/extension-table
+
+[![Version](https://img.shields.io/npm/v/@tiptap/extension-table.svg?label=version)](https://www.npmjs.com/package/@tiptap/extension-table)
+[![Downloads](https://img.shields.io/npm/dm/@tiptap/extension-table.svg)](https://npmcharts.com/compare/tiptap?minimal=true)
+[![License](https://img.shields.io/npm/l/@tiptap/extension-table.svg)](https://www.npmjs.com/package/@tiptap/extension-table)
+[![Sponsor](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub)](https://github.com/sponsors/ueberdosis)
+
+## Introduction
+
+Tiptap is a headless wrapper around [ProseMirror](https://ProseMirror.net) – a toolkit for building rich text WYSIWYG editors, which is already in use at many well-known companies such as _New York Times_, _The Guardian_ or _Atlassian_.
+
+## Official Documentation
+
+Documentation can be found on the [Tiptap website](https://tiptap.dev).
+
+## License
+
+Tiptap is open sourced software licensed under the [MIT license](https://github.com/ueberdosis/tiptap/blob/main/LICENSE.md).

packages/extension-table-plus/package.json

@@ -0,0 +1,93 @@
+{
+  "name": "@cherrystudio/extension-table-plus",
+  "description": "table extension for tiptap forked from tiptap/extension-table",
+  "version": "3.0.11",
+  "homepage": "https://cherry-ai.com",
+  "keywords": [
+    "tiptap",
+    "tiptap extension"
+  ],
+  "license": "MIT",
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": {
+        "import": "./dist/index.d.ts",
+        "require": "./dist/index.d.cts"
+      },
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    },
+    "./table": {
+      "types": {
+        "import": "./dist/table/index.d.ts",
+        "require": "./dist/table/index.d.cts"
+      },
+      "import": "./dist/table/index.js",
+      "require": "./dist/table/index.cjs"
+    },
+    "./cell": {
+      "types": {
+        "import": "./dist/cell/index.d.ts",
+        "require": "./dist/cell/index.d.cts"
+      },
+      "import": "./dist/cell/index.js",
+      "require": "./dist/cell/index.cjs"
+    },
+    "./header": {
+      "types": {
+        "import": "./dist/header/index.d.ts",
+        "require": "./dist/header/index.d.cts"
+      },
+      "import": "./dist/header/index.js",
+      "require": "./dist/header/index.cjs"
+    },
+    "./kit": {
+      "types": {
+        "import": "./dist/kit/index.d.ts",
+        "require": "./dist/kit/index.d.cts"
+      },
+      "import": "./dist/kit/index.js",
+      "require": "./dist/kit/index.cjs"
+    },
+    "./row": {
+      "types": {
+        "import": "./dist/row/index.d.ts",
+        "require": "./dist/row/index.d.cts"
+      },
+      "import": "./dist/row/index.js",
+      "require": "./dist/row/index.cjs"
+    }
+  },
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "src",
+    "dist"
+  ],
+  "devDependencies": {
+    "@tiptap/core": "^3.2.0",
+    "@tiptap/pm": "^3.2.0",
+    "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",
+    "prettier": "^3.5.3",
+    "tsdown": "^0.13.3"
+  },
+  "peerDependencies": {
+    "@tiptap/core": "^3.0.9",
+    "@tiptap/pm": "^3.0.9"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/CherryHQ/cherry-studio",
+    "directory": "packages/extension-table-plus"
+  },
+  "scripts": {
+    "build": "tsdown",
+    "lint": "prettier ./src/ --write && eslint --fix ./src/"
+  },
+  "packageManager": "yarn@4.9.1"
+}

packages/extension-table-plus/src/cell/index.ts

@@ -0,0 +1 @@
+export * from './table-cell.js'

packages/extension-table-plus/src/cell/table-cell.ts

@@ -0,0 +1,150 @@
+import '../types.js'
+
+import { mergeAttributes, Node } from '@tiptap/core'
+import type { Node as ProseMirrorNode } from '@tiptap/pm/model'
+import type { Selection } from '@tiptap/pm/state'
+import { Plugin, PluginKey } from '@tiptap/pm/state'
+import { CellSelection, TableMap } from '@tiptap/pm/tables'
+import { Decoration, DecorationSet } from '@tiptap/pm/view'
+
+export interface TableCellOptions {
+  /**
+   * The HTML attributes for a table cell node.
+   * @default {}
+   * @example { class: 'foo' }
+   */
+  HTMLAttributes: Record<string, any>
+  /**
+   * Whether nodes can be nested inside a cell.
+   * @default false
+   */
+  allowNestedNodes: boolean
+}
+
+const cellSelectionPluginKey = new PluginKey('cellSelectionStyling')
+
+function isTableNode(node: ProseMirrorNode): boolean {
+  const spec = node.type.spec as { tableRole?: string } | undefined
+  return node.type.name === 'table' || spec?.tableRole === 'table'
+}
+
+function createCellSelectionDecorationSet(doc: ProseMirrorNode, selection: Selection): DecorationSet {
+  if (!(selection instanceof CellSelection)) {
+    return DecorationSet.empty
+  }
+
+  const $anchor = selection.$anchorCell || selection.$anchor
+  let tableNode: ProseMirrorNode | null = null
+  let tablePos = -1
+
+  for (let depth = $anchor.depth; depth > 0; depth--) {
+    const nodeAtDepth = $anchor.node(depth) as ProseMirrorNode
+    if (isTableNode(nodeAtDepth)) {
+      tableNode = nodeAtDepth
+      tablePos = $anchor.before(depth)
+      break
+    }
+  }
+
+  if (!tableNode) {
+    return DecorationSet.empty
+  }
+
+  const map = TableMap.get(tableNode)
+  const tableStart = tablePos + 1
+
+  type Rect = { top: number; bottom: number; left: number; right: number }
+  type Item = { pos: number; node: ProseMirrorNode; rect: Rect }
+
+  const items: Item[] = []
+  let minRow = Number.POSITIVE_INFINITY
+  let maxRow = Number.NEGATIVE_INFINITY
+  let minCol = Number.POSITIVE_INFINITY
+  let maxCol = Number.NEGATIVE_INFINITY
+
+  selection.forEachCell((cell, pos) => {
+    const rect = map.findCell(pos - tableStart)
+    items.push({ pos, node: cell, rect })
+
+    minRow = Math.min(minRow, rect.top)
+    maxRow = Math.max(maxRow, rect.bottom - 1)
+    minCol = Math.min(minCol, rect.left)
+    maxCol = Math.max(maxCol, rect.right - 1)
+  })
+
+  const decorations: Decoration[] = []
+  for (const { pos, node, rect } of items) {
+    const classes: string[] = ['selectedCell']
+    if (rect.top === minRow) classes.push('selection-top')
+    if (rect.bottom - 1 === maxRow) classes.push('selection-bottom')
+    if (rect.left === minCol) classes.push('selection-left')
+    if (rect.right - 1 === maxCol) classes.push('selection-right')
+
+    decorations.push(
+      Decoration.node(pos, pos + node.nodeSize, {
+        class: classes.join(' ')
+      })
+    )
+  }
+
+  return DecorationSet.create(doc, decorations)
+}
+/**
+ * This extension allows you to create table cells.
+ * @see https://www.tiptap.dev/api/nodes/table-cell
+ */
+export const TableCell = Node.create<TableCellOptions>({
+  name: 'tableCell',
+
+  addOptions() {
+    return {
+      HTMLAttributes: {},
+      allowNestedNodes: false
+    }
+  },
+
+  content: '(paragraph | image)+',
+
+  addAttributes() {
+    return {
+      colspan: {
+        default: 1
+      },
+      rowspan: {
+        default: 1
+      },
+      colwidth: {
+        default: null,
+        parseHTML: (element) => {
+          const colwidth = element.getAttribute('colwidth')
+          const value = colwidth ? colwidth.split(',').map((width) => parseInt(width, 10)) : null
+
+          return value
+        }
+      }
+    }
+  },
+
+  tableRole: 'cell',
+
+  isolating: true,
+
+  parseHTML() {
+    return [{ tag: 'td' }]
+  },
+
+  renderHTML({ HTMLAttributes }) {
+    return ['td', mergeAttributes(this.options.HTMLAttributes, HTMLAttributes), 0]
+  },
+
+  addProseMirrorPlugins() {
+    return [
+      new Plugin({
+        key: cellSelectionPluginKey,
+        props: {
+          decorations: ({ doc, selection }) => createCellSelectionDecorationSet(doc as ProseMirrorNode, selection)
+        }
+      })
+    ]
+  }
+})

packages/extension-table-plus/src/header/index.ts

@@ -0,0 +1 @@
+export * from './table-header.js'

packages/extension-table-plus/src/header/table-header.ts

@@ -0,0 +1,60 @@
+import '../types.js'
+
+import { mergeAttributes, Node } from '@tiptap/core'
+
+export interface TableHeaderOptions {
+  /**
+   * The HTML attributes for a table header node.
+   * @default {}
+   * @example { class: 'foo' }
+   */
+  HTMLAttributes: Record<string, any>
+}
+
+/**
+ * This extension allows you to create table headers.
+ * @see https://www.tiptap.dev/api/nodes/table-header
+ */
+export const TableHeader = Node.create<TableHeaderOptions>({
+  name: 'tableHeader',
+
+  addOptions() {
+    return {
+      HTMLAttributes: {}
+    }
+  },
+
+  content: 'paragraph+',
+
+  addAttributes() {
+    return {
+      colspan: {
+        default: 1
+      },
+      rowspan: {
+        default: 1
+      },
+      colwidth: {
+        default: null,
+        parseHTML: (element) => {
+          const colwidth = element.getAttribute('colwidth')
+          const value = colwidth ? colwidth.split(',').map((width) => parseInt(width, 10)) : null
+
+          return value
+        }
+      }
+    }
+  },
+
+  tableRole: 'header_cell',
+
+  isolating: true,
+
+  parseHTML() {
+    return [{ tag: 'th' }]
+  },
+
+  renderHTML({ HTMLAttributes }) {
+    return ['th', mergeAttributes(this.options.HTMLAttributes, HTMLAttributes), 0]
+  }
+})

packages/extension-table-plus/src/index.ts

@@ -0,0 +1,6 @@
+export * from './cell/index.js'
+export * from './header/index.js'
+export * from './kit/index.js'
+export * from './row/index.js'
+export * from './table/index.js'
+export * from './table/TableView.js'

packages/extension-table-plus/src/kit/index.ts

@@ -0,0 +1,64 @@
+import { Extension, Node } from '@tiptap/core'
+
+import type { TableCellOptions } from '../cell/index.js'
+import { TableCell } from '../cell/index.js'
+import type { TableHeaderOptions } from '../header/index.js'
+import { TableHeader } from '../header/index.js'
+import type { TableRowOptions } from '../row/index.js'
+import { TableRow } from '../row/index.js'
+import type { TableOptions } from '../table/index.js'
+import { Table } from '../table/index.js'
+
+export interface TableKitOptions {
+  /**
+   * If set to false, the table extension will not be registered
+   * @example table: false
+   */
+  table: Partial<TableOptions> | false
+  /**
+   * If set to false, the table extension will not be registered
+   * @example tableCell: false
+   */
+  tableCell: Partial<TableCellOptions> | false
+  /**
+   * If set to false, the table extension will not be registered
+   * @example tableHeader: false
+   */
+  tableHeader: Partial<TableHeaderOptions> | false
+  /**
+   * If set to false, the table extension will not be registered
+   * @example tableRow: false
+   */
+  tableRow: Partial<TableRowOptions> | false
+}
+
+/**
+ * The table kit is a collection of table editor extensions.
+ *
+ * It’s a good starting point for building your own table in Tiptap.
+ */
+export const TableKit = Extension.create<TableKitOptions>({
+  name: 'tableKit',
+
+  addExtensions() {
+    const extensions: Node[] = []
+
+    if (this.options.table !== false) {
+      extensions.push(Table.configure(this.options.table))
+    }
+
+    if (this.options.tableCell !== false) {
+      extensions.push(TableCell.configure(this.options.tableCell))
+    }
+
+    if (this.options.tableHeader !== false) {
+      extensions.push(TableHeader.configure(this.options.tableHeader))
+    }
+
+    if (this.options.tableRow !== false) {
+      extensions.push(TableRow.configure(this.options.tableRow))
+    }
+
+    return extensions
+  }
+})

packages/extension-table-plus/src/row/index.ts

@@ -0,0 +1 @@
+export * from './table-row.js'

packages/extension-table-plus/src/row/table-row.ts

@@ -0,0 +1,38 @@
+import '../types.js'
+
+import { mergeAttributes, Node } from '@tiptap/core'
+
+export interface TableRowOptions {
+  /**
+   * The HTML attributes for a table row node.
+   * @default {}
+   * @example { class: 'foo' }
+   */
+  HTMLAttributes: Record<string, any>
+}
+
+/**
+ * This extension allows you to create table rows.
+ * @see https://www.tiptap.dev/api/nodes/table-row
+ */
+export const TableRow = Node.create<TableRowOptions>({
+  name: 'tableRow',
+
+  addOptions() {
+    return {
+      HTMLAttributes: {}
+    }
+  },
+
+  content: '(tableCell | tableHeader)*',
+
+  tableRole: 'row',
+
+  parseHTML() {
+    return [{ tag: 'tr' }]
+  },
+
+  renderHTML({ HTMLAttributes }) {
+    return ['tr', mergeAttributes(this.options.HTMLAttributes, HTMLAttributes), 0]
+  }
+})

packages/extension-table-plus/src/table/TableView.ts

@@ -0,0 +1,558 @@
+import type { Node as ProseMirrorNode } from '@tiptap/pm/model'
+import { TextSelection } from '@tiptap/pm/state'
+import { addColumnAfter, addRowAfter, CellSelection, TableMap } from '@tiptap/pm/tables'
+import type { EditorView, NodeView, ViewMutationRecord } from '@tiptap/pm/view'
+
+import { getColStyleDeclaration } from './utilities/colStyle.js'
+import { getElementBorderWidth } from './utilities/getBorderWidth.js'
+import { isCellSelection } from './utilities/isCellSelection.js'
+import { getCellSelectionBounds } from './utilities/selectionBounds.js'
+
+export function updateColumns(
+  node: ProseMirrorNode,
+  colgroup: HTMLTableColElement, // <colgroup> has the same prototype as <col>
+  table: HTMLTableElement,
+  cellMinWidth: number,
+  overrideCol?: number,
+  overrideValue?: number
+) {
+  let totalWidth = 0
+  let fixedWidth = true
+  let nextDOM = colgroup.firstChild
+  const row = node.firstChild
+
+  if (row !== null) {
+    for (let i = 0, col = 0; i < row.childCount; i += 1) {
+      const { colspan, colwidth } = row.child(i).attrs
+
+      for (let j = 0; j < colspan; j += 1, col += 1) {
+        const hasWidth = overrideCol === col ? overrideValue : ((colwidth && colwidth[j]) as number | undefined)
+        const cssWidth = hasWidth ? `${hasWidth}px` : ''
+
+        totalWidth += hasWidth || cellMinWidth
+
+        if (!hasWidth) {
+          fixedWidth = false
+        }
+
+        if (!nextDOM) {
+          const colElement = document.createElement('col')
+
+          const [propertyKey, propertyValue] = getColStyleDeclaration(cellMinWidth, hasWidth)
+
+          colElement.style.setProperty(propertyKey, propertyValue)
+
+          colgroup.appendChild(colElement)
+        } else {
+          if ((nextDOM as HTMLTableColElement).style.width !== cssWidth) {
+            const [propertyKey, propertyValue] = getColStyleDeclaration(cellMinWidth, hasWidth)
+
+            ;(nextDOM as HTMLTableColElement).style.setProperty(propertyKey, propertyValue)
+          }
+
+          nextDOM = nextDOM.nextSibling
+        }
+      }
+    }
+  }
+
+  while (nextDOM) {
+    const after = nextDOM.nextSibling
+
+    nextDOM.parentNode?.removeChild(nextDOM)
+    nextDOM = after
+  }
+
+  if (fixedWidth) {
+    table.style.width = `${totalWidth}px`
+    table.style.minWidth = ''
+  } else {
+    table.style.width = ''
+    table.style.minWidth = `${totalWidth}px`
+  }
+}
+
+// Callbacks are now handled by a decorations plugin; keep type removed here
+
+type ButtonPosition = { x: number; y: number }
+type RowActionCallback = (args: { rowIndex: number; view: EditorView; position?: ButtonPosition }) => void
+type ColumnActionCallback = (args: { colIndex: number; view: EditorView; position?: ButtonPosition }) => void
+
+export class TableView implements NodeView {
+  node: ProseMirrorNode
+
+  cellMinWidth: number
+
+  dom: HTMLDivElement
+
+  table: HTMLTableElement
+
+  colgroup: HTMLTableColElement
+
+  contentDOM: HTMLTableSectionElement
+
+  view: EditorView
+
+  addRowButton: HTMLButtonElement
+
+  addColumnButton: HTMLButtonElement
+
+  tableContainer: HTMLDivElement
+
+  // Hover add buttons are kept; overlay endpoints absolute on wrapper
+  private selectionChangeDisposer?: () => void
+  private rowEndpoint?: HTMLButtonElement
+  private colEndpoint?: HTMLButtonElement
+  private overlayUpdateRafId: number | null = null
+  private actionCallbacks?: {
+    onRowActionClick?: RowActionCallback
+    onColumnActionClick?: ColumnActionCallback
+  }
+
+  constructor(
+    node: ProseMirrorNode,
+    cellMinWidth: number,
+    view: EditorView,
+    actionCallbacks?: { onRowActionClick?: RowActionCallback; onColumnActionClick?: ColumnActionCallback }
+  ) {
+    this.node = node
+    this.cellMinWidth = cellMinWidth
+    this.view = view
+    this.actionCallbacks = actionCallbacks
+    // selection triggers handled by decorations plugin
+
+    // Create the wrapper with grid layout
+    this.dom = document.createElement('div')
+    this.dom.className = 'tableWrapper'
+
+    // Create table container
+    this.tableContainer = document.createElement('div')
+    this.tableContainer.className = 'table-container'
+
+    this.table = this.tableContainer.appendChild(document.createElement('table'))
+    this.colgroup = this.table.appendChild(document.createElement('colgroup'))
+    updateColumns(node, this.colgroup, this.table, cellMinWidth)
+    this.contentDOM = this.table.appendChild(document.createElement('tbody'))
+
+    this.addRowButton = document.createElement('button')
+    this.addColumnButton = document.createElement('button')
+    this.createHoverButtons()
+
+    this.dom.appendChild(this.tableContainer)
+    this.dom.appendChild(this.addColumnButton)
+    this.dom.appendChild(this.addRowButton)
+
+    this.syncEditableState()
+
+    this.setupEventListeners()
+
+    // create overlay endpoints
+    this.rowEndpoint = document.createElement('button')
+    this.rowEndpoint.className = 'row-action-trigger'
+    this.rowEndpoint.type = 'button'
+    this.rowEndpoint.setAttribute('contenteditable', 'false')
+    this.rowEndpoint.style.position = 'absolute'
+    this.rowEndpoint.style.display = 'none'
+    this.rowEndpoint.tabIndex = -1
+
+    this.colEndpoint = document.createElement('button')
+    this.colEndpoint.className = 'column-action-trigger'
+    this.colEndpoint.type = 'button'
+    this.colEndpoint.setAttribute('contenteditable', 'false')
+    this.colEndpoint.style.position = 'absolute'
+    this.colEndpoint.style.display = 'none'
+    this.colEndpoint.tabIndex = -1
+
+    this.dom.appendChild(this.rowEndpoint)
+    this.dom.appendChild(this.colEndpoint)
+
+    this.bindOverlayHandlers()
+    this.startSelectionWatcher()
+  }
+
+  update(node: ProseMirrorNode) {
+    if (node.type !== this.node.type) {
+      return false
+    }
+
+    this.node = node
+    updateColumns(node, this.colgroup, this.table, this.cellMinWidth)
+
+    // Keep buttons' disabled state in sync during updates
+    this.syncEditableState()
+
+    // Recalculate overlay positions after node/table mutations so triggers follow the updated layout
+    this.scheduleOverlayUpdate()
+
+    return true
+  }
+
+  ignoreMutation(mutation: ViewMutationRecord) {
+    return (
+      (mutation.type === 'attributes' && (mutation.target === this.table || this.colgroup.contains(mutation.target))) ||
+      // Ignore mutations on our action buttons
+      (mutation.target as Element)?.classList?.contains('row-action-trigger') ||
+      (mutation.target as Element)?.classList?.contains('column-action-trigger')
+    )
+  }
+
+  private isEditable(): boolean {
+    // Rely on DOM attribute to avoid depending on EditorView internals
+    return this.view.dom.getAttribute('contenteditable') !== 'false'
+  }
+
+  private syncEditableState() {
+    const editable = this.isEditable()
+    this.addRowButton.toggleAttribute('disabled', !editable)
+    this.addColumnButton.toggleAttribute('disabled', !editable)
+
+    this.addRowButton.style.display = editable ? '' : 'none'
+    this.addColumnButton.style.display = editable ? '' : 'none'
+    this.dom.classList.toggle('is-readonly', !editable)
+  }
+
+  createHoverButtons() {
+    this.addRowButton.className = 'add-row-button'
+    this.addRowButton.type = 'button'
+    this.addRowButton.setAttribute('contenteditable', 'false')
+
+    this.addColumnButton.className = 'add-column-button'
+    this.addColumnButton.type = 'button'
+    this.addColumnButton.setAttribute('contenteditable', 'false')
+  }
+
+  private addTableRowOrColumn(isRow: boolean) {
+    if (!this.isEditable()) return
+
+    this.view.focus()
+
+    // Save current selection info and calculate position in table
+    const { state } = this.view
+    const originalSelection = state.selection
+
+    // Find which cell we're currently in and the relative position within that cell
+    let tablePos = -1
+    let currentCellRow = -1
+    let currentCellCol = -1
+    let relativeOffsetInCell = 0
+
+    state.doc.descendants((node: ProseMirrorNode, pos: number) => {
+      if (node.type.name === 'table' && node === this.node) {
+        tablePos = pos
+        const map = TableMap.get(this.node)
+
+        // Find which cell contains our selection
+        const selectionPos = originalSelection.from
+        for (let row = 0; row < map.height; row++) {
+          for (let col = 0; col < map.width; col++) {
+            const cellIndex = row * map.width + col
+            const cellStart = pos + 1 + map.map[cellIndex]
+            const cellNode = state.doc.nodeAt(cellStart)
+            if (cellNode) {
+              const cellEnd = cellStart + cellNode.nodeSize
+              if (selectionPos >= cellStart && selectionPos < cellEnd) {
+                currentCellRow = row
+                currentCellCol = col
+                relativeOffsetInCell = selectionPos - cellStart
+                return false
+              }
+            }
+          }
+        }
+        return false
+      }
+      return true
+    })
+
+    // Set selection to appropriate position for adding
+    if (isRow) {
+      this.setSelectionToLastRow()
+    } else {
+      this.setSelectionToLastColumn()
+    }
+
+    setTimeout(() => {
+      const { state, dispatch } = this.view
+      const addFunction = isRow ? addRowAfter : addColumnAfter
+
+      if (addFunction(state, dispatch)) {
+        setTimeout(() => {
+          const newState = this.view.state
+
+          // Calculate new position for the same logical cell with same relative offset
+          if (tablePos >= 0 && currentCellRow >= 0 && currentCellCol >= 0) {
+            newState.doc.descendants((node: ProseMirrorNode, pos: number) => {
+              if (node.type.name === 'table' && pos === tablePos) {
+                const newMap = TableMap.get(node)
+                const newCellIndex = currentCellRow * newMap.width + currentCellCol
+                const newCellStart = pos + 1 + newMap.map[newCellIndex]
+                const newCellNode = newState.doc.nodeAt(newCellStart)
+
+                if (newCellNode) {
+                  // Try to maintain the same relative position within the cell
+                  const newCellEnd = newCellStart + newCellNode.nodeSize
+                  const targetPos = Math.min(newCellStart + relativeOffsetInCell, newCellEnd - 1)
+                  const newSelection = TextSelection.create(newState.doc, targetPos)
+                  const newTr = newState.tr.setSelection(newSelection)
+                  this.view.dispatch(newTr)
+                }
+                return false
+              }
+              return true
+            })
+          }
+        }, 10)
+      }
+    }, 10)
+  }
+
+  setupEventListeners() {
+    // Add row button click handler
+    this.addRowButton.addEventListener('click', (e) => {
+      e.preventDefault()
+      e.stopPropagation()
+      this.addTableRowOrColumn(true)
+    })
+
+    // Add column button click handler
+    this.addColumnButton.addEventListener('click', (e) => {
+      e.preventDefault()
+      e.stopPropagation()
+      this.addTableRowOrColumn(false)
+    })
+  }
+
+  private bindOverlayHandlers() {
+    if (!this.rowEndpoint || !this.colEndpoint) return
+    this.rowEndpoint.addEventListener('mousedown', (e) => e.preventDefault())
+    this.colEndpoint.addEventListener('mousedown', (e) => e.preventDefault())
+    this.rowEndpoint.addEventListener('click', (e) => {
+      e.preventDefault()
+      e.stopPropagation()
+      const bounds = getCellSelectionBounds(this.view, this.node)
+      if (!bounds) return
+      this.selectRow(bounds.maxRow)
+      const rect = this.rowEndpoint!.getBoundingClientRect()
+      const position = { x: rect.left + rect.width / 2, y: rect.top + rect.height / 2 }
+      this.actionCallbacks?.onRowActionClick?.({ rowIndex: bounds.maxRow, view: this.view, position })
+      this.scheduleOverlayUpdate()
+    })
+    this.colEndpoint.addEventListener('click', (e) => {
+      e.preventDefault()
+      e.stopPropagation()
+      const bounds = getCellSelectionBounds(this.view, this.node)
+      if (!bounds) return
+      this.selectColumn(bounds.maxCol)
+      const rect = this.colEndpoint!.getBoundingClientRect()
+      const position = { x: rect.left + rect.width / 2, y: rect.top + rect.height / 2 }
+      this.actionCallbacks?.onColumnActionClick?.({ colIndex: bounds.maxCol, view: this.view, position })
+      this.scheduleOverlayUpdate()
+    })
+  }
+
+  private startSelectionWatcher() {
+    const owner = this.view.dom.ownerDocument || document
+    const handler = () => this.scheduleOverlayUpdate()
+    owner.addEventListener('selectionchange', handler)
+    this.selectionChangeDisposer = () => owner.removeEventListener('selectionchange', handler)
+    this.scheduleOverlayUpdate()
+  }
+
+  private scheduleOverlayUpdate() {
+    if (this.overlayUpdateRafId !== null) {
+      cancelAnimationFrame(this.overlayUpdateRafId)
+    }
+    this.overlayUpdateRafId = requestAnimationFrame(() => {
+      this.overlayUpdateRafId = null
+      this.updateOverlayPositions()
+    })
+  }
+
+  private updateOverlayPositions() {
+    if (!this.rowEndpoint || !this.colEndpoint) return
+    const bounds = getCellSelectionBounds(this.view, this.node)
+    if (!bounds) {
+      this.rowEndpoint.style.display = 'none'
+      this.colEndpoint.style.display = 'none'
+      return
+    }
+
+    const { map, tableStart, maxRow, maxCol } = bounds
+
+    const getCellDomAndRect = (row: number, col: number) => {
+      const cellIndex = row * map.width + col
+      const cellPos = tableStart + map.map[cellIndex]
+      const cellDom = this.view.nodeDOM(cellPos) as HTMLElement | null
+      return {
+        dom: cellDom,
+        rect: cellDom?.getBoundingClientRect()
+      }
+    }
+
+    // Position row endpoint (left side)
+    const bottomLeft = getCellDomAndRect(maxRow, 0)
+    const topLeft = getCellDomAndRect(0, 0)
+
+    if (bottomLeft.dom && bottomLeft.rect && topLeft.rect) {
+      const midY = (bottomLeft.rect.top + bottomLeft.rect.bottom) / 2
+      this.rowEndpoint.style.display = 'flex'
+      const borderWidth = getElementBorderWidth(this.rowEndpoint)
+      this.rowEndpoint.style.left = `${bottomLeft.rect.left - topLeft.rect.left - this.rowEndpoint.getBoundingClientRect().width / 2 + borderWidth.left / 2}px`
+      this.rowEndpoint.style.top = `${midY - topLeft.rect.top - this.rowEndpoint.getBoundingClientRect().height / 2}px`
+    } else {
+      this.rowEndpoint.style.display = 'none'
+    }
+
+    // Position column endpoint (top side)
+    const topRight = getCellDomAndRect(0, maxCol)
+    const topLeftForCol = getCellDomAndRect(0, 0)
+
+    if (topRight.dom && topRight.rect && topLeftForCol.rect) {
+      const midX = topRight.rect.left + topRight.rect.width / 2
+      const borderWidth = getElementBorderWidth(this.colEndpoint)
+      this.colEndpoint.style.display = 'flex'
+      this.colEndpoint.style.left = `${midX - topLeftForCol.rect.left - this.colEndpoint.getBoundingClientRect().width / 2}px`
+      this.colEndpoint.style.top = `${topRight.rect.top - topLeftForCol.rect.top - this.colEndpoint.getBoundingClientRect().height / 2 + borderWidth.top / 2}px`
+    } else {
+      this.colEndpoint.style.display = 'none'
+    }
+  }
+
+  setSelectionToTable() {
+    const { state } = this.view
+
+    let tablePos = -1
+    state.doc.descendants((node: ProseMirrorNode, pos: number) => {
+      if (node.type.name === 'table' && node === this.node) {
+        tablePos = pos
+        return false
+      }
+      return true
+    })
+
+    if (tablePos >= 0) {
+      const firstCellPos = tablePos + 3
+      const selection = TextSelection.create(state.doc, firstCellPos)
+      const tr = state.tr.setSelection(selection)
+      this.view.dispatch(tr)
+    }
+  }
+
+  setSelectionToLastRow() {
+    const { state } = this.view
+
+    let tablePos = -1
+    state.doc.descendants((node: ProseMirrorNode, pos: number) => {
+      if (node.type.name === 'table' && node === this.node) {
+        tablePos = pos
+        return false
+      }
+      return true
+    })
+
+    if (tablePos >= 0) {
+      const map = TableMap.get(this.node)
+      const lastRowIndex = map.height - 1
+      const lastRowFirstCell = map.map[lastRowIndex * map.width]
+      const lastRowFirstCellPos = tablePos + 1 + lastRowFirstCell
+
+      const selection = TextSelection.create(state.doc, lastRowFirstCellPos)
+      const tr = state.tr.setSelection(selection)
+      this.view.dispatch(tr)
+    }
+  }
+
+  setSelectionToLastColumn() {
+    const { state } = this.view
+
+    let tablePos = -1
+    state.doc.descendants((node: ProseMirrorNode, pos: number) => {
+      if (node.type.name === 'table' && node === this.node) {
+        tablePos = pos
+        return false
+      }
+      return true
+    })
+
+    if (tablePos >= 0) {
+      const map = TableMap.get(this.node)
+      const lastColumnIndex = map.width - 1
+      const lastColumnFirstCell = map.map[lastColumnIndex]
+      const lastColumnFirstCellPos = tablePos + 1 + lastColumnFirstCell
+
+      const selection = TextSelection.create(state.doc, lastColumnFirstCellPos)
+      const tr = state.tr.setSelection(selection)
+      this.view.dispatch(tr)
+    }
+  }
+
+  // selection triggers moved to decorations plugin
+
+  hasTableCellSelection(): boolean {
+    const selection = this.view.state.selection
+    return isCellSelection(selection)
+  }
+
+  selectRow(rowIndex: number) {
+    const { state, dispatch } = this.view
+
+    // Find the table position
+    let tablePos = -1
+    state.doc.descendants((node: ProseMirrorNode, pos: number) => {
+      if (node.type.name === 'table' && node === this.node) {
+        tablePos = pos
+        return false
+      }
+      return true
+    })
+
+    if (tablePos >= 0) {
+      const map = TableMap.get(this.node)
+      const firstCellInRow = map.map[rowIndex * map.width]
+      const lastCellInRow = map.map[rowIndex * map.width + map.width - 1]
+
+      const firstCellPos = tablePos + 1 + firstCellInRow
+      const lastCellPos = tablePos + 1 + lastCellInRow
+
+      const selection = CellSelection.create(state.doc, firstCellPos, lastCellPos)
+      const tr = state.tr.setSelection(selection)
+      dispatch(tr)
+    }
+  }
+
+  selectColumn(colIndex: number) {
+    const { state, dispatch } = this.view
+
+    // Find the table position
+    let tablePos = -1
+    state.doc.descendants((node: ProseMirrorNode, pos: number) => {
+      if (node.type.name === 'table' && node === this.node) {
+        tablePos = pos
+        return false
+      }
+      return true
+    })
+
+    if (tablePos >= 0) {
+      const map = TableMap.get(this.node)
+      const firstCellInCol = map.map[colIndex]
+      const lastCellInCol = map.map[(map.height - 1) * map.width + colIndex]
+
+      const firstCellPos = tablePos + 1 + firstCellInCol
+      const lastCellPos = tablePos + 1 + lastCellInCol
+
+      const selection = CellSelection.create(state.doc, firstCellPos, lastCellPos)
+      const tr = state.tr.setSelection(selection)
+      dispatch(tr)
+    }
+  }
+
+  destroy() {
+    this.addRowButton?.remove()
+    this.addColumnButton?.remove()
+    if (this.rowEndpoint) this.rowEndpoint.remove()
+    if (this.colEndpoint) this.colEndpoint.remove()
+    if (this.selectionChangeDisposer) this.selectionChangeDisposer()
+    if (this.overlayUpdateRafId !== null) cancelAnimationFrame(this.overlayUpdateRafId)
+  }
+}

packages/extension-table-plus/src/table/index.ts

@@ -0,0 +1,3 @@
+export * from './table.js'
+export * from './utilities/createColGroup.js'
+export * from './utilities/createTable.js'

packages/extension-table-plus/src/table/table.ts

@@ -0,0 +1,486 @@
+import '../types.js'
+
+import { callOrReturn, getExtensionField, mergeAttributes, Node } from '@tiptap/core'
+import type { DOMOutputSpec, Node as ProseMirrorNode } from '@tiptap/pm/model'
+import { TextSelection } from '@tiptap/pm/state'
+import {
+  addColumnAfter,
+  addColumnBefore,
+  addRowAfter,
+  addRowBefore,
+  CellSelection,
+  columnResizing,
+  deleteColumn,
+  deleteRow,
+  deleteTable,
+  fixTables,
+  goToNextCell,
+  mergeCells,
+  setCellAttr,
+  splitCell,
+  tableEditing,
+  toggleHeader,
+  toggleHeaderCell
+} from '@tiptap/pm/tables'
+import { type EditorView, type NodeView } from '@tiptap/pm/view'
+
+import { TableView } from './TableView.js'
+import { createColGroup } from './utilities/createColGroup.js'
+import { createTable } from './utilities/createTable.js'
+import { deleteTableWhenAllCellsSelected } from './utilities/deleteTableWhenAllCellsSelected.js'
+
+export interface TableOptions {
+  /**
+   * HTML attributes for the table element.
+   * @default {}
+   * @example { class: 'foo' }
+   */
+  HTMLAttributes: Record<string, any>
+
+  /**
+   * Enables the resizing of tables.
+   * @default false
+   * @example true
+   */
+  resizable: boolean
+
+  /**
+   * The width of the resize handle.
+   * @default 5
+   * @example 10
+   */
+  handleWidth: number
+
+  /**
+   * The minimum width of a cell.
+   * @default 25
+   * @example 50
+   */
+  cellMinWidth: number
+
+  /**
+   * The node view to render the table.
+   * @default TableView
+   */
+  View: (new (node: ProseMirrorNode, cellMinWidth: number, view: EditorView) => NodeView) | null
+
+  /**
+   * Enables the resizing of the last column.
+   * @default true
+   * @example false
+   */
+  lastColumnResizable: boolean
+
+  /**
+   * Allow table node selection.
+   * @default false
+   * @example true
+   */
+  allowTableNodeSelection: boolean
+
+  /**
+   * Optional callbacks for row/column action triggers
+   */
+  onRowActionClick?: (args: { rowIndex: number; view: EditorView; position?: { x: number; y: number } }) => void
+  onColumnActionClick?: (args: { colIndex: number; view: EditorView; position?: { x: number; y: number } }) => void
+}
+
+declare module '@tiptap/core' {
+  interface Commands<ReturnType> {
+    table: {
+      /**
+       * Insert a table
+       * @param options The table attributes
+       * @returns True if the command was successful, otherwise false
+       * @example editor.commands.insertTable({ rows: 3, cols: 3, withHeaderRow: true })
+       */
+      insertTable: (options?: { rows?: number; cols?: number; withHeaderRow?: boolean }) => ReturnType
+
+      /**
+       * Add a column before the current column
+       * @returns True if the command was successful, otherwise false
+       * @example editor.commands.addColumnBefore()
+       */
+      addColumnBefore: () => ReturnType
+
+      /**
+       * Add a column after the current column
+       * @returns True if the command was successful, otherwise false
+       * @example editor.commands.addColumnAfter()
+       */
+      addColumnAfter: () => ReturnType
+
+      /**
+       * Delete the current column
+       * @returns True if the command was successful, otherwise false
+       * @example editor.commands.deleteColumn()
+       */
+      deleteColumn: () => ReturnType
+
+      /**
+       * Add a row before the current row
+       * @returns True if the command was successful, otherwise false
+       * @example editor.commands.addRowBefore()
+       */
+      addRowBefore: () => ReturnType
+
+      /**
+       * Add a row after the current row
+       * @returns True if the command was successful, otherwise false
+       * @example editor.commands.addRowAfter()
+       */
+      addRowAfter: () => ReturnType
+
+      /**
+       * Delete the current row
+       * @returns True if the command was successful, otherwise false
+       * @example editor.commands.deleteRow()
+       */
+      deleteRow: () => ReturnType
+
+      /**
+       * Delete the current table
+       * @returns True if the command was successful, otherwise false
+       * @example editor.commands.deleteTable()
+       */
+      deleteTable: () => ReturnType
+
+      /**
+       * Merge the currently selected cells
+       * @returns True if the command was successful, otherwise false
+       * @example editor.commands.mergeCells()
+       */
+      mergeCells: () => ReturnType
+
+      /**
+       * Split the currently selected cell
+       * @returns True if the command was successful, otherwise false
+       * @example editor.commands.splitCell()
+       */
+      splitCell: () => ReturnType
+
+      /**
+       * Toggle the header column
+       * @returns True if the command was successful, otherwise false
+       * @example editor.commands.toggleHeaderColumn()
+       */
+      toggleHeaderColumn: () => ReturnType
+
+      /**
+       * Toggle the header row
+       * @returns True if the command was successful, otherwise false
+       * @example editor.commands.toggleHeaderRow()
+       */
+      toggleHeaderRow: () => ReturnType
+
+      /**
+       * Toggle the header cell
+       * @returns True if the command was successful, otherwise false
+       * @example editor.commands.toggleHeaderCell()
+       */
+      toggleHeaderCell: () => ReturnType
+
+      /**
+       * Merge or split the currently selected cells
+       * @returns True if the command was successful, otherwise false
+       * @example editor.commands.mergeOrSplit()
+       */
+      mergeOrSplit: () => ReturnType
+
+      /**
+       * Set a cell attribute
+       * @param name The attribute name
+       * @param value The attribute value
+       * @returns True if the command was successful, otherwise false
+       * @example editor.commands.setCellAttribute('align', 'right')
+       */
+      setCellAttribute: (name: string, value: any) => ReturnType
+
+      /**
+       * Moves the selection to the next cell
+       * @returns True if the command was successful, otherwise false
+       * @example editor.commands.goToNextCell()
+       */
+      goToNextCell: () => ReturnType
+
+      /**
+       * Moves the selection to the previous cell
+       * @returns True if the command was successful, otherwise false
+       * @example editor.commands.goToPreviousCell()
+       */
+      goToPreviousCell: () => ReturnType
+
+      /**
+       * Try to fix the table structure if necessary
+       * @returns True if the command was successful, otherwise false
+       * @example editor.commands.fixTables()
+       */
+      fixTables: () => ReturnType
+
+      /**
+       * Set a cell selection inside the current table
+       * @param position The cell position
+       * @returns True if the command was successful, otherwise false
+       * @example editor.commands.setCellSelection({ anchorCell: 1, headCell: 2 })
+       */
+      setCellSelection: (position: { anchorCell: number; headCell?: number }) => ReturnType
+    }
+  }
+}
+
+/**
+ * This extension allows you to create tables.
+ * @see https://www.tiptap.dev/api/nodes/table
+ */
+export const Table = Node.create<TableOptions>({
+  name: 'table',
+
+  // @ts-ignore - TODO: fix
+  addOptions() {
+    return {
+      HTMLAttributes: {},
+      resizable: false,
+      handleWidth: 5,
+      cellMinWidth: 25,
+      // TODO: fix
+      View: TableView,
+      lastColumnResizable: true,
+      allowTableNodeSelection: false
+    }
+  },
+
+  content: 'tableRow+',
+
+  tableRole: 'table',
+
+  isolating: true,
+
+  group: 'block',
+
+  parseHTML() {
+    return [{ tag: 'table' }]
+  },
+
+  renderHTML({ node, HTMLAttributes }) {
+    const { colgroup, tableWidth, tableMinWidth } = createColGroup(node, this.options.cellMinWidth)
+
+    const table: DOMOutputSpec = [
+      'table',
+      mergeAttributes(this.options.HTMLAttributes, HTMLAttributes, {
+        style: tableWidth ? `width: ${tableWidth}` : `min-width: ${tableMinWidth}`
+      }),
+      colgroup,
+      ['tbody', 0]
+    ]
+
+    return table
+  },
+
+  addCommands() {
+    return {
+      insertTable:
+        ({ rows = 3, cols = 3, withHeaderRow = true } = {}) =>
+        ({ tr, dispatch, editor }) => {
+          // Disallow inserting table inside nested nodes when TableCell option allowNestedNodes is false
+          const tableCellExtension = this.editor.extensionManager.extensions.find((ext) => ext.name === 'tableCell')
+          const allowNestedNodes: boolean = tableCellExtension
+            ? Boolean((tableCellExtension.options as { allowNestedNodes?: boolean }).allowNestedNodes)
+            : false
+
+          if (!allowNestedNodes) {
+            const { $from } = tr.selection
+            // Only allow table insertion at top-level (depth <= 1),
+            // disallow when selection is inside any nested node (list, blockquote, table, etc.)
+            if ($from.depth > 1) {
+              return false
+            }
+          }
+
+          const node = createTable(editor.schema, rows, cols, withHeaderRow)
+
+          if (dispatch) {
+            const offset = tr.selection.from + 1
+
+            tr.replaceSelectionWith(node)
+              .scrollIntoView()
+              .setSelection(TextSelection.near(tr.doc.resolve(offset)))
+          }
+
+          return true
+        },
+      addColumnBefore:
+        () =>
+        ({ state, dispatch }) => {
+          return addColumnBefore(state, dispatch)
+        },
+      addColumnAfter:
+        () =>
+        ({ state, dispatch }) => {
+          return addColumnAfter(state, dispatch)
+        },
+      deleteColumn:
+        () =>
+        ({ state, dispatch }) => {
+          return deleteColumn(state, dispatch)
+        },
+      addRowBefore:
+        () =>
+        ({ state, dispatch }) => {
+          return addRowBefore(state, dispatch)
+        },
+      addRowAfter:
+        () =>
+        ({ state, dispatch }) => {
+          return addRowAfter(state, dispatch)
+        },
+      deleteRow:
+        () =>
+        ({ state, dispatch }) => {
+          return deleteRow(state, dispatch)
+        },
+      deleteTable:
+        () =>
+        ({ state, dispatch }) => {
+          return deleteTable(state, dispatch)
+        },
+      mergeCells:
+        () =>
+        ({ state, dispatch }) => {
+          return mergeCells(state, dispatch)
+        },
+      splitCell:
+        () =>
+        ({ state, dispatch }) => {
+          return splitCell(state, dispatch)
+        },
+      toggleHeaderColumn:
+        () =>
+        ({ state, dispatch }) => {
+          return toggleHeader('column')(state, dispatch)
+        },
+      toggleHeaderRow:
+        () =>
+        ({ state, dispatch }) => {
+          return toggleHeader('row')(state, dispatch)
+        },
+      toggleHeaderCell:
+        () =>
+        ({ state, dispatch }) => {
+          return toggleHeaderCell(state, dispatch)
+        },
+      mergeOrSplit:
+        () =>
+        ({ state, dispatch }) => {
+          if (mergeCells(state, dispatch)) {
+            return true
+          }
+
+          return splitCell(state, dispatch)
+        },
+      setCellAttribute:
+        (name, value) =>
+        ({ state, dispatch }) => {
+          return setCellAttr(name, value)(state, dispatch)
+        },
+      goToNextCell:
+        () =>
+        ({ state, dispatch }) => {
+          return goToNextCell(1)(state, dispatch)
+        },
+      goToPreviousCell:
+        () =>
+        ({ state, dispatch }) => {
+          return goToNextCell(-1)(state, dispatch)
+        },
+      fixTables:
+        () =>
+        ({ state, dispatch }) => {
+          if (dispatch) {
+            fixTables(state)
+          }
+
+          return true
+        },
+      setCellSelection:
+        (position) =>
+        ({ tr, dispatch }) => {
+          if (dispatch) {
+            const selection = CellSelection.create(tr.doc, position.anchorCell, position.headCell)
+
+            // @ts-ignore - TODO: fix
+            tr.setSelection(selection)
+          }
+
+          return true
+        }
+    }
+  },
+
+  addNodeView() {
+    return (props) => {
+      const { node, view } = props
+      const ViewClass = this.options.View || TableView
+      if (ViewClass === TableView) {
+        return new TableView(node, this.options.cellMinWidth, view, {
+          onRowActionClick: this.options.onRowActionClick,
+          onColumnActionClick: this.options.onColumnActionClick
+        })
+      }
+      return new ViewClass(node, this.options.cellMinWidth, view)
+    }
+  },
+
+  addKeyboardShortcuts() {
+    return {
+      Tab: () => {
+        if (this.editor.commands.goToNextCell()) {
+          return true
+        }
+
+        if (!this.editor.can().addRowAfter()) {
+          return false
+        }
+
+        return this.editor.chain().addRowAfter().goToNextCell().run()
+      },
+      'Shift-Tab': () => this.editor.commands.goToPreviousCell(),
+      Backspace: deleteTableWhenAllCellsSelected,
+      'Mod-Backspace': deleteTableWhenAllCellsSelected,
+      Delete: deleteTableWhenAllCellsSelected,
+      'Mod-Delete': deleteTableWhenAllCellsSelected
+    }
+  },
+
+  addProseMirrorPlugins() {
+    const isResizable = this.options.resizable && this.editor.isEditable
+
+    return [
+      ...(isResizable
+        ? [
+            columnResizing({
+              handleWidth: this.options.handleWidth,
+              cellMinWidth: this.options.cellMinWidth,
+              defaultCellMinWidth: this.options.cellMinWidth,
+              View: this.options.View,
+              lastColumnResizable: this.options.lastColumnResizable
+            })
+          ]
+        : []),
+      tableEditing({
+        allowTableNodeSelection: this.options.allowTableNodeSelection
+      })
+    ]
+  },
+
+  extendNodeSchema(extension) {
+    const context = {
+      name: extension.name,
+      options: extension.options,
+      storage: extension.storage
+    }
+
+    return {
+      tableRole: callOrReturn(getExtensionField(extension, 'tableRole', context))
+    }
+  }
+})

packages/extension-table-plus/src/table/utilities/colStyle.ts

@@ -0,0 +1,9 @@
+export function getColStyleDeclaration(minWidth: number, width: number | undefined): [string, string] {
+  if (width) {
+    // apply the stored width unless it is below the configured minimum cell width
+    return ['width', `${Math.max(width, minWidth)}px`]
+  }
+
+  // set the minimum with on the column if it has no stored width
+  return ['min-width', `${minWidth}px`]
+}

packages/extension-table-plus/src/table/utilities/createCell.ts

@@ -0,0 +1,12 @@
+import type { Fragment, Node as ProsemirrorNode, NodeType } from '@tiptap/pm/model'
+
+export function createCell(
+  cellType: NodeType,
+  cellContent?: Fragment | ProsemirrorNode | Array<ProsemirrorNode>
+): ProsemirrorNode | null | undefined {
+  if (cellContent) {
+    return cellType.createChecked(null, cellContent)
+  }
+
+  return cellType.createAndFill()
+}

packages/extension-table-plus/src/table/utilities/createColGroup.ts

@@ -0,0 +1,68 @@
+import type { DOMOutputSpec, Node as ProseMirrorNode } from '@tiptap/pm/model'
+
+import { getColStyleDeclaration } from './colStyle.js'
+
+export type ColGroup =
+  | {
+      colgroup: DOMOutputSpec
+      tableWidth: string
+      tableMinWidth: string
+    }
+  | Record<string, never>
+
+/**
+ * Creates a colgroup element for a table node in ProseMirror.
+ *
+ * @param node - The ProseMirror node representing the table.
+ * @param cellMinWidth - The minimum width of a cell in the table.
+ * @param overrideCol - (Optional) The index of the column to override the width of.
+ * @param overrideValue - (Optional) The width value to use for the overridden column.
+ * @returns An object containing the colgroup element, the total width of the table, and the minimum width of the table.
+ */
+export function createColGroup(node: ProseMirrorNode, cellMinWidth: number): ColGroup
+export function createColGroup(
+  node: ProseMirrorNode,
+  cellMinWidth: number,
+  overrideCol: number,
+  overrideValue: number
+): ColGroup
+export function createColGroup(
+  node: ProseMirrorNode,
+  cellMinWidth: number,
+  overrideCol?: number,
+  overrideValue?: number
+): ColGroup {
+  let totalWidth = 0
+  let fixedWidth = true
+  const cols: DOMOutputSpec[] = []
+  const row = node.firstChild
+
+  if (!row) {
+    return {}
+  }
+
+  for (let i = 0, col = 0; i < row.childCount; i += 1) {
+    const { colspan, colwidth } = row.child(i).attrs
+
+    for (let j = 0; j < colspan; j += 1, col += 1) {
+      const hasWidth = overrideCol === col ? overrideValue : colwidth && (colwidth[j] as number | undefined)
+
+      totalWidth += hasWidth || cellMinWidth
+
+      if (!hasWidth) {
+        fixedWidth = false
+      }
+
+      const [property, value] = getColStyleDeclaration(cellMinWidth, hasWidth)
+
+      cols.push(['col', { style: `${property}: ${value}` }])
+    }
+  }
+
+  const tableWidth = fixedWidth ? `${totalWidth}px` : ''
+  const tableMinWidth = fixedWidth ? '' : `${totalWidth}px`
+
+  const colgroup: DOMOutputSpec = ['colgroup', {}, ...cols]
+
+  return { colgroup, tableWidth, tableMinWidth }
+}

packages/extension-table-plus/src/table/utilities/createTable.ts

@@ -0,0 +1,40 @@
+import type { Fragment, Node as ProsemirrorNode, Schema } from '@tiptap/pm/model'
+
+import { createCell } from './createCell.js'
+import { getTableNodeTypes } from './getTableNodeTypes.js'
+
+export function createTable(
+  schema: Schema,
+  rowsCount: number,
+  colsCount: number,
+  withHeaderRow: boolean,
+  cellContent?: Fragment | ProsemirrorNode | Array<ProsemirrorNode>
+): ProsemirrorNode {
+  const types = getTableNodeTypes(schema)
+  const headerCells: ProsemirrorNode[] = []
+  const cells: ProsemirrorNode[] = []
+
+  for (let index = 0; index < colsCount; index += 1) {
+    const cell = createCell(types.cell, cellContent)
+
+    if (cell) {
+      cells.push(cell)
+    }
+
+    if (withHeaderRow) {
+      const headerCell = createCell(types.header_cell, cellContent)
+
+      if (headerCell) {
+        headerCells.push(headerCell)
+      }
+    }
+  }
+
+  const rows: ProsemirrorNode[] = []
+
+  for (let index = 0; index < rowsCount; index += 1) {
+    rows.push(types.row.createChecked(null, withHeaderRow && index === 0 ? headerCells : cells))
+  }
+
+  return types.table.createChecked(null, rows)
+}

packages/extension-table-plus/src/table/utilities/deleteTableWhenAllCellsSelected.ts

@@ -0,0 +1,38 @@
+import type { KeyboardShortcutCommand } from '@tiptap/core'
+import { findParentNodeClosestToPos } from '@tiptap/core'
+
+import { isCellSelection } from './isCellSelection.js'
+
+export const deleteTableWhenAllCellsSelected: KeyboardShortcutCommand = ({ editor }) => {
+  const { selection } = editor.state
+
+  if (!isCellSelection(selection)) {
+    return false
+  }
+
+  let cellCount = 0
+  const table = findParentNodeClosestToPos(selection.ranges[0].$from, (node) => {
+    return node.type.name === 'table'
+  })
+
+  table?.node.descendants((node) => {
+    if (node.type.name === 'table') {
+      return false
+    }
+
+    if (['tableCell', 'tableHeader'].includes(node.type.name)) {
+      cellCount += 1
+    }
+    return true
+  })
+
+  const allCellsSelected = cellCount === selection.ranges.length
+
+  if (!allCellsSelected) {
+    return false
+  }
+
+  editor.commands.deleteTable()
+
+  return true
+}

packages/extension-table-plus/src/table/utilities/getBorderWidth.ts

@@ -0,0 +1,14 @@
+export function getElementBorderWidth(element: HTMLElement): {
+  top: number
+  right: number
+  bottom: number
+  left: number
+} {
+  const style = window.getComputedStyle(element)
+  return {
+    top: parseFloat(style.borderTopWidth),
+    right: parseFloat(style.borderRightWidth),
+    bottom: parseFloat(style.borderBottomWidth),
+    left: parseFloat(style.borderLeftWidth)
+  }
+}

packages/extension-table-plus/src/table/utilities/getTableNodeTypes.ts

@@ -0,0 +1,21 @@
+import type { NodeType, Schema } from '@tiptap/pm/model'
+
+export function getTableNodeTypes(schema: Schema): { [key: string]: NodeType } {
+  if (schema.cached.tableNodeTypes) {
+    return schema.cached.tableNodeTypes
+  }
+
+  const roles: { [key: string]: NodeType } = {}
+
+  Object.keys(schema.nodes).forEach((type) => {
+    const nodeType = schema.nodes[type]
+
+    if (nodeType.spec.tableRole) {
+      roles[nodeType.spec.tableRole] = nodeType
+    }
+  })
+
+  schema.cached.tableNodeTypes = roles
+
+  return roles
+}

packages/extension-table-plus/src/table/utilities/isCellSelection.ts

@@ -0,0 +1,5 @@
+import { CellSelection } from '@tiptap/pm/tables'
+
+export function isCellSelection(value: unknown): value is CellSelection {
+  return value instanceof CellSelection
+}

packages/extension-table-plus/src/table/utilities/selectionBounds.ts

@@ -0,0 +1,68 @@
+import type { Node as ProseMirrorNode } from '@tiptap/pm/model'
+import { CellSelection, TableMap } from '@tiptap/pm/tables'
+import type { EditorView } from '@tiptap/pm/view'
+
+export interface SelectionBounds {
+  tablePos: number
+  tableStart: number
+  map: ReturnType<typeof TableMap.get>
+  minRow: number
+  maxRow: number
+  minCol: number
+  maxCol: number
+  topLeftPos: number
+  topRightPos: number
+}
+
+/**
+ * Compute logical bounds for current CellSelection inside the provided table node.
+ * Returns null if current selection is not a CellSelection or not within the table node.
+ */
+export function getCellSelectionBounds(view: EditorView, tableNode: ProseMirrorNode): SelectionBounds | null {
+  const selection = view.state.selection
+  if (!(selection instanceof CellSelection)) return null
+
+  const $anchor = selection.$anchorCell || selection.$anchor
+  let tablePos = -1
+  let currentTable: ProseMirrorNode | null = null
+  for (let d = $anchor.depth; d > 0; d--) {
+    const n = $anchor.node(d)
+    const role = (n.type.spec as { tableRole?: string } | undefined)?.tableRole
+    if (n.type.name === 'table' || role === 'table') {
+      tablePos = $anchor.before(d)
+      currentTable = n
+      break
+    }
+  }
+  if (tablePos < 0 || currentTable !== tableNode) return null
+
+  const map = TableMap.get(tableNode)
+  const tableStart = tablePos + 1
+
+  let minRow = Number.POSITIVE_INFINITY
+  let maxRow = Number.NEGATIVE_INFINITY
+  let minCol = Number.POSITIVE_INFINITY
+  let maxCol = Number.NEGATIVE_INFINITY
+  let topLeftPos: number | null = null
+  let topRightPos: number | null = null
+
+  selection.forEachCell((_cell, pos) => {
+    const rect = map.findCell(pos - tableStart)
+    if (rect.top < minRow) minRow = rect.top
+    if (rect.left < minCol) minCol = rect.left
+    if (rect.bottom - 1 > maxRow) maxRow = rect.bottom - 1
+    if (rect.right - 1 > maxCol) maxCol = rect.right - 1
+
+    if (rect.top === minRow && rect.left === minCol) {
+      if (topLeftPos === null || pos < topLeftPos) topLeftPos = pos
+    }
+    if (rect.top === minRow && rect.right - 1 === maxCol) {
+      if (topRightPos === null || pos < topRightPos) topRightPos = pos
+    }
+  })
+
+  if (!isFinite(minRow) || !isFinite(minCol) || topLeftPos == null) return null
+  if (topRightPos == null) topRightPos = topLeftPos
+
+  return { tablePos, tableStart, map, minRow, maxRow, minCol, maxCol, topLeftPos, topRightPos }
+}

packages/extension-table-plus/src/types.ts

@@ -0,0 +1,19 @@
+import type { ParentConfig } from '@tiptap/core'
+
+declare module '@tiptap/core' {
+  interface NodeConfig<Options, Storage> {
+    /**
+     * A string or function to determine the role of the table.
+     * @default 'table'
+     * @example () => 'table'
+     */
+    tableRole?:
+      | string
+      | ((this: {
+          name: string
+          options: Options
+          storage: Storage
+          parent: ParentConfig<NodeConfig<Options>>['tableRole']
+        }) => string)
+  }
+}

packages/extension-table-plus/tsdown.config.ts

@@ -0,0 +1,20 @@
+import { defineConfig } from 'tsdown'
+
+export default defineConfig(
+  [
+    'src/table/index.ts',
+    'src/cell/index.ts',
+    'src/header/index.ts',
+    'src/kit/index.ts',
+    'src/row/index.ts',
+    'src/index.ts'
+  ].map((entry) => ({
+    entry: [entry],
+    tsconfig: '../../tsconfig.build.json',
+    outDir: `dist${entry.replace('src', '').split('/').slice(0, -1).join('/')}`,
+    dts: true,
+    sourcemap: true,
+    format: ['esm', 'cjs'],
+    external: [/^[^./]/]
+  }))
+)

packages/shared/IpcChannel.ts

@@ -35,6 +35,8 @@ export enum IpcChannel {
   App_InstallBunBinary = 'app:install-bun-binary',
   App_LogToMain = 'app:log-to-main',
   App_SaveData = 'app:save-data',
+  App_SetFullScreen = 'app:set-full-screen',
+  App_IsFullScreen = 'app:is-full-screen',
 
   App_MacIsProcessTrusted = 'app:mac-is-process-trusted',
   App_MacRequestProcessTrust = 'app:mac-request-process-trust',
@@ -139,23 +141,39 @@ export enum IpcChannel {
   File_Upload = 'file:upload',
   File_Clear = 'file:clear',
   File_Read = 'file:read',
+  File_ReadExternal = 'file:readExternal',
   File_Delete = 'file:delete',
   File_DeleteDir = 'file:deleteDir',
+  File_DeleteExternalFile = 'file:deleteExternalFile',
+  File_DeleteExternalDir = 'file:deleteExternalDir',
+  File_Move = 'file:move',
+  File_MoveDir = 'file:moveDir',
+  File_Rename = 'file:rename',
+  File_RenameDir = 'file:renameDir',
   File_Get = 'file:get',
   File_SelectFolder = 'file:selectFolder',
   File_CreateTempFile = 'file:createTempFile',
+  File_Mkdir = 'file:mkdir',
   File_Write = 'file:write',
   File_WriteWithId = 'file:writeWithId',
   File_SaveImage = 'file:saveImage',
   File_Base64Image = 'file:base64Image',
   File_SaveBase64Image = 'file:saveBase64Image',
+  File_SavePastedImage = 'file:savePastedImage',
   File_Download = 'file:download',
   File_Copy = 'file:copy',
   File_BinaryImage = 'file:binaryImage',
   File_Base64File = 'file:base64File',
   File_GetPdfInfo = 'file:getPdfInfo',
   Fs_Read = 'fs:read',
+  Fs_ReadText = 'fs:readText',
   File_OpenWithRelativePath = 'file:openWithRelativePath',
+  File_IsTextFile = 'file:isTextFile',
+  File_GetDirectoryStructure = 'file:getDirectoryStructure',
+  File_CheckFileName = 'file:checkFileName',
+  File_ValidateNotesDirectory = 'file:validateNotesDirectory',
+  File_StartWatcher = 'file:startWatcher',
+  File_StopWatcher = 'file:stopWatcher',
 
   // file service
   FileService_Upload = 'file-service:upload',
@@ -279,5 +297,11 @@ export enum IpcChannel {
   TRACE_ADD_STREAM_MESSAGE = 'trace:addStreamMessage',
 
   // CodeTools
-  CodeTools_Run = 'code-tools:run'
+  CodeTools_Run = 'code-tools:run',
+
+  // OCR
+  OCR_ocr = 'ocr:ocr',
+
+  // Cherryin
+  Cherryin_GetSignature = 'cherryin:get-signature'
 }

packages/shared/config/constant.ts

@@ -207,7 +207,14 @@ export const defaultTimeout = 10 * 1000 * 60
 
 export const occupiedDirs = ['logs', 'Network', 'Partitions/webview/Network']
 
-export const MIN_WINDOW_WIDTH = 1080
+export const MIN_WINDOW_WIDTH = 960
 export const SECOND_MIN_WINDOW_WIDTH = 520
 export const MIN_WINDOW_HEIGHT = 600
 export const defaultByPassRules = 'localhost,127.0.0.1,::1'
+
+export enum codeTools {
+  qwenCode = 'qwen-code',
+  claudeCode = 'claude-code',
+  geminiCli = 'gemini-cli',
+  openaiCodex = 'openai-codex'
+}

packages/shared/config/languages.ts

@@ -2020,6 +2020,10 @@ export const languages: Record<string, LanguageData> = {
     extensions: ['.nginx', '.nginxconf', '.vhost'],
     aliases: ['nginx configuration file']
   },
+  Nickel: {
+    type: 'programming',
+    extensions: ['.ncl']
+  },
   Nim: {
     type: 'programming',
     extensions: ['.nim', '.nim.cfg', '.nimble', '.nimrod', '.nims']
@@ -3061,7 +3065,7 @@ export const languages: Record<string, LanguageData> = {
   },
   SWIG: {
     type: 'programming',
-    extensions: ['.i']
+    extensions: ['.i', '.swg', '.swig']
   },
   SystemVerilog: {
     type: 'programming',

packages/shared/config/types.ts

@@ -9,3 +9,11 @@ export type LoaderReturn = {
   message?: string
   messageSource?: 'preprocess' | 'embedding'
 }
+
+export type FileChangeEventType = 'add' | 'change' | 'unlink' | 'addDir' | 'unlinkDir'
+
+export type FileChangeEvent = {
+  eventType: FileChangeEventType
+  filePath: string
+  watchPath: string
+}

resources/data/agents-en.json

@@ -2089,7 +2089,7 @@
       "Design",
       "Education"
     ],
-    "prompt": "I want you to act as a Graphviz DOT generator, an expert to create meaningful diagrams. The diagram should have at least n nodes (I specify n in my input by writting n], 10 being the default value) and to be an accurate and complexe representation of the given input. Each node is indexed by a number to reduce the size of the output, should not include any styling, and with layout=neato, overlap=false, node shape=rectangle] as parameters. The code should be valid, bugless and returned on a single line, without any explanation. Provide a clear and organized diagram, the relationships between the nodes have to make sense for an expert of that input. My first diagram is: \"The water cycle 8]\".\n\n",
+    "prompt": "I want you to act as a Graphviz DOT generator, an expert to create meaningful diagrams. The diagram should have at least n nodes (I specify n in my input by writing n], 10 being the default value) and to be an accurate and complex representation of the given input. Each node is indexed by a number to reduce the size of the output, should not include any styling, and with layout=neato, overlap=false, node shape=rectangle] as parameters. The code should be valid, bugless and returned on a single line, without any explanation. Provide a clear and organized diagram, the relationships between the nodes have to make sense for an expert of that input. My first diagram is: \"The water cycle 8]\".\n\n",
     "description": "Generate meaningful charts."
   },
   {
@@ -2148,7 +2148,7 @@
       "Career",
       "Business"
     ],
-    "prompt": "Please acknowledge my following request. Please respond to me as a product manager. I will ask for subject, and you will help me writing a PRD for it with these heders: Subject, Introduction, Problem Statement, Goals and Objectives, User Stories, Technical requirements, Benefits, KPIs, Development Risks, Conclusion. Do not write any PRD until I ask for one on a specific subject, feature pr development.\n\n",
+    "prompt": "Please acknowledge my following request. Please respond to me as a product manager. I will ask for subject, and you will help me writing a PRD for it with these headers: Subject, Introduction, Problem Statement, Goals and Objectives, User Stories, Technical requirements, Benefits, KPIs, Development Risks, Conclusion. Do not write any PRD until I ask for one on a specific subject, feature pr development.\n\n",
     "description": "Help draft the Product Requirements Document."
   },
   {
@@ -2159,7 +2159,7 @@
       "Entertainment",
       "General"
     ],
-    "prompt": "I want you to act as a drunk person. You will only answer like a very drunk person texting and nothing else. Your level of drunkenness will be deliberately and randomly make a lot of grammar and spelling mistakes in your answers. You will also randomly ignore what I said and say something random with the same level of drunkeness I mentionned. Do not write explanations on replies. My first sentence is \"how are you?",
+    "prompt": "I want you to act as a drunk person. You will only answer like a very drunk person texting and nothing else. Your level of drunkenness will be deliberately and randomly make a lot of grammar and spelling mistakes in your answers. You will also randomly ignore what I said and say something random with the same level of drunkenness I mentioned. Do not write explanations on replies. My first sentence is \"how are you?",
     "description": "Mimic the speech pattern of a drunk person."
   },
   {
@@ -3517,7 +3517,7 @@
       "Tools",
       "Copywriting"
     ],
-    "prompt": "I want you to act as a scientific manuscript matcher. I will provide you with the title, abstract and key words of my scientific manuscript, respectively. Your task is analyzing my title, abstract and key words synthetically to find the most related, reputable journals for potential publication of my research based on an analysis of tens of millions of citation connections in database, such as Web of Science, Pubmed, Scopus, ScienceDirect and so on. You only need to provide me with the 15 most suitable journals. Your reply should include the name of journal, the cooresponding match score (The full score is ten). I want you to reply in text-based excel sheet and sort by matching scores in reverse order.\nMy title is \"XXX\" My abstract is \"XXX\" My key words are \"XXX\"\n\n",
+    "prompt": "I want you to act as a scientific manuscript matcher. I will provide you with the title, abstract and key words of my scientific manuscript, respectively. Your task is analyzing my title, abstract and key words synthetically to find the most related, reputable journals for potential publication of my research based on an analysis of tens of millions of citation connections in database, such as Web of Science, Pubmed, Scopus, ScienceDirect and so on. You only need to provide me with the 15 most suitable journals. Your reply should include the name of journal, the corresponding match score (The full score is ten). I want you to reply in text-based excel sheet and sort by matching scores in reverse order.\nMy title is \"XXX\" My abstract is \"XXX\" My key words are \"XXX\"\n\n",
     "description": ""
   },
   {

scripts/after-pack.js

@@ -1,89 +1,10 @@
-const { Arch } = require('electron-builder')
 const fs = require('fs')
 const path = require('path')
 
 exports.default = async function (context) {
   const platform = context.packager.platform.name
-  const arch = context.arch
-
-  if (platform === 'mac') {
-    const node_modules_path = path.join(
-      context.appOutDir,
-      'Cherry Studio.app',
-      'Contents',
-      'Resources',
-      'app.asar.unpacked',
-      'node_modules'
-    )
-
-    keepPackageNodeFiles(node_modules_path, '@libsql', arch === Arch.arm64 ? ['darwin-arm64'] : ['darwin-x64'])
-  }
-
-  if (platform === 'linux') {
-    const node_modules_path = path.join(context.appOutDir, 'resources', 'app.asar.unpacked', 'node_modules')
-    const _arch = arch === Arch.arm64 ? ['linux-arm64-gnu', 'linux-arm64-musl'] : ['linux-x64-gnu', 'linux-x64-musl']
-    keepPackageNodeFiles(node_modules_path, '@libsql', _arch)
-
-    // 删除 macOS 专用的 OCR 包
-    removeMacOnlyPackages(node_modules_path)
-  }
-
-  if (platform === 'windows') {
-    const node_modules_path = path.join(context.appOutDir, 'resources', 'app.asar.unpacked', 'node_modules')
-    if (arch === Arch.arm64) {
-      keepPackageNodeFiles(node_modules_path, '@strongtz', ['win32-arm64-msvc'])
-      keepPackageNodeFiles(node_modules_path, '@libsql', ['win32-arm64-msvc'])
-    }
-    if (arch === Arch.x64) {
-      keepPackageNodeFiles(node_modules_path, '@strongtz', ['win32-x64-msvc'])
-      keepPackageNodeFiles(node_modules_path, '@libsql', ['win32-x64-msvc'])
-    }
-
-    removeMacOnlyPackages(node_modules_path)
-  }
-
   if (platform === 'windows') {
     fs.rmSync(path.join(context.appOutDir, 'LICENSE.electron.txt'), { force: true })
     fs.rmSync(path.join(context.appOutDir, 'LICENSES.chromium.html'), { force: true })
   }
 }
-
-/**
- * 删除 macOS 专用的包
- * @param {string} nodeModulesPath
- */
-function removeMacOnlyPackages(nodeModulesPath) {
-  const macOnlyPackages = []
-
-  macOnlyPackages.forEach((packageName) => {
-    const packagePath = path.join(nodeModulesPath, packageName)
-    if (fs.existsSync(packagePath)) {
-      fs.rmSync(packagePath, { recursive: true, force: true })
-      console.log(`[After Pack] Removed macOS-only package: ${packageName}`)
-    }
-  })
-}
-
-/**
- * 使用指定架构的 node_modules 文件
- * @param {*} nodeModulesPath
- * @param {*} packageName
- * @param {*} arch
- * @returns
- */
-function keepPackageNodeFiles(nodeModulesPath, packageName, arch) {
-  const modulePath = path.join(nodeModulesPath, packageName)
-
-  if (!fs.existsSync(modulePath)) {
-    console.log(`[After Pack] Directory does not exist: ${modulePath}`)
-    return
-  }
-
-  const dirs = fs.readdirSync(modulePath)
-  dirs
-    .filter((dir) => !arch.includes(dir))
-    .forEach((dir) => {
-      fs.rmSync(path.join(modulePath, dir), { recursive: true, force: true })
-      console.log(`[After Pack] Removed dir: ${dir}`, arch)
-    })
-}

scripts/before-pack.js

@@ -0,0 +1,91 @@
+const { Arch } = require('electron-builder')
+const { downloadNpmPackage } = require('./utils')
+
+// if you want to add new prebuild binaries packages with different architectures, you can add them here
+// please add to allX64 and allArm64 from yarn.lock
+const allArm64 = {
+  '@img/sharp-darwin-arm64': '0.34.3',
+  '@img/sharp-win32-arm64': '0.34.3',
+  '@img/sharp-linux-arm64': '0.34.3',
+
+  '@img/sharp-libvips-darwin-arm64': '1.2.0',
+  '@img/sharp-libvips-linux-arm64': '1.2.0',
+
+  '@libsql/darwin-arm64': '0.4.7',
+  '@libsql/linux-arm64-gnu': '0.4.7',
+  '@strongtz/win32-arm64-msvc': '0.4.7',
+
+  '@napi-rs/system-ocr-darwin-arm64': '1.0.2',
+  '@napi-rs/system-ocr-win32-arm64-msvc': '1.0.2'
+}
+
+const allX64 = {
+  '@img/sharp-darwin-x64': '0.34.3',
+  '@img/sharp-linux-x64': '0.34.3',
+  '@img/sharp-win32-x64': '0.34.3',
+
+  '@img/sharp-libvips-darwin-x64': '1.2.0',
+  '@img/sharp-libvips-linux-x64': '1.2.0',
+
+  '@libsql/darwin-x64': '0.4.7',
+  '@libsql/linux-x64-gnu': '0.4.7',
+  '@libsql/win32-x64-msvc': '0.4.7',
+
+  '@napi-rs/system-ocr-darwin-x64': '1.0.2',
+  '@napi-rs/system-ocr-win32-x64-msvc': '1.0.2'
+}
+
+const platformToArch = {
+  mac: 'darwin',
+  windows: 'win32',
+  linux: 'linux'
+}
+
+exports.default = async function (context) {
+  const arch = context.arch
+  const archType = arch === Arch.arm64 ? 'arm64' : 'x64'
+  const platform = context.packager.platform.name
+
+  const arm64Filters = Object.keys(allArm64).map((f) => '!node_modules/' + f + '/**')
+  const x64Filters = Object.keys(allX64).map((f) => '!node_modules/' + f + '/*')
+
+  const downloadPackages = async (packages) => {
+    console.log('downloading packages ......')
+    const downloadPromises = []
+
+    for (const name of Object.keys(packages)) {
+      if (name.includes(`${platformToArch[platform]}`) && name.includes(`-${archType}`)) {
+        downloadPromises.push(
+          downloadNpmPackage(
+            name,
+            `https://registry.npmjs.org/${name}/-/${name.split('/').pop()}-${packages[name]}.tgz`
+          )
+        )
+      }
+    }
+
+    await Promise.all(downloadPromises)
+  }
+
+  const changeFilters = async (packages, filtersToExclude, filtersToInclude) => {
+    await downloadPackages(packages)
+    // remove filters for the target architecture (allow inclusion)
+
+    let filters = context.packager.config.files[0].filter
+    filters = filters.filter((filter) => !filtersToInclude.includes(filter))
+    // add filters for other architectures (exclude them)
+    filters.push(...filtersToExclude)
+
+    context.packager.config.files[0].filter = filters
+  }
+
+  if (arch === Arch.arm64) {
+    await changeFilters(allArm64, x64Filters, arm64Filters)
+    return
+  }
+
+  if (arch === Arch.x64) {
+    await changeFilters(allX64, arm64Filters, x64Filters)
+    return
+  }
+}

scripts/build-npm.js

@@ -1,44 +0,0 @@
-const { downloadNpmPackage } = require('./utils')
-
-async function downloadNpm(platform) {
-  if (!platform || platform === 'mac') {
-    downloadNpmPackage(
-      '@libsql/darwin-arm64',
-      'https://registry.npmjs.org/@libsql/darwin-arm64/-/darwin-arm64-0.4.7.tgz'
-    )
-    downloadNpmPackage('@libsql/darwin-x64', 'https://registry.npmjs.org/@libsql/darwin-x64/-/darwin-x64-0.4.7.tgz')
-  }
-
-  if (!platform || platform === 'linux') {
-    downloadNpmPackage(
-      '@libsql/linux-arm64-gnu',
-      'https://registry.npmjs.org/@libsql/linux-arm64-gnu/-/linux-arm64-gnu-0.4.7.tgz'
-    )
-    downloadNpmPackage(
-      '@libsql/linux-arm64-musl',
-      'https://registry.npmjs.org/@libsql/linux-arm64-musl/-/linux-arm64-musl-0.4.7.tgz'
-    )
-    downloadNpmPackage(
-      '@libsql/linux-x64-gnu',
-      'https://registry.npmjs.org/@libsql/linux-x64-gnu/-/linux-x64-gnu-0.4.7.tgz'
-    )
-    downloadNpmPackage(
-      '@libsql/linux-x64-musl',
-      'https://registry.npmjs.org/@libsql/linux-x64-musl/-/linux-x64-musl-0.4.7.tgz'
-    )
-  }
-
-  if (!platform || platform === 'windows') {
-    downloadNpmPackage(
-      '@libsql/win32-x64-msvc',
-      'https://registry.npmjs.org/@libsql/win32-x64-msvc/-/win32-x64-msvc-0.4.7.tgz'
-    )
-    downloadNpmPackage(
-      '@strongtz/win32-arm64-msvc',
-      'https://registry.npmjs.org/@strongtz/win32-arm64-msvc/-/win32-arm64-msvc-0.4.7.tgz'
-    )
-  }
-}
-
-const platformArg = process.argv[2]
-downloadNpm(platformArg)

scripts/update-i18n.ts

@@ -66,7 +66,7 @@ ${JSON.stringify({
   confirm: '确定要备份数据吗？',
   select_model: '选择模型',
   title: '文件',
-  deeply_thought: '已深度思考（用时 {{secounds}} 秒）'
+  deeply_thought: '已深度思考（用时 {{seconds}} 秒）'
 })}
 ######################################################
 MAKE SURE TO OUTPUT IN Russian. DO NOT OUTPUT IN UNSPECIFIED LANGUAGE.

scripts/utils.js

@@ -1,12 +1,15 @@
 const fs = require('fs')
 const path = require('path')
 const os = require('os')
+const zlib = require('zlib')
+const tar = require('tar')
+const { pipeline } = require('stream/promises')
 
-function downloadNpmPackage(packageName, url) {
+async function downloadNpmPackage(packageName, url) {
   const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'npm-download-'))
-
   const targetDir = path.join('./node_modules/', packageName)
-  const filename = packageName.replace('/', '-') + '.tgz'
+  const filename = path.join(tempDir, packageName.replace('/', '-') + '.tgz')
+  const extractDir = path.join(tempDir, 'extract')
 
   // Skip if directory already exists
   if (fs.existsSync(targetDir)) {
@@ -16,23 +19,44 @@ function downloadNpmPackage(packageName, url) {
 
   try {
     console.log(`Downloading ${packageName}...`, url)
-    const { execSync } = require('child_process')
-    execSync(`curl --fail -o ${filename} ${url}`)
+
+    // Download file using fetch API
+    const response = await fetch(url)
+    if (!response.ok) {
+      throw new Error(`HTTP error! status: ${response.status}`)
+    }
+
+    const fileStream = fs.createWriteStream(filename)
+    await pipeline(response.body, fileStream)
 
     console.log(`Extracting ${filename}...`)
-    execSync(`tar -xvf ${filename}`)
-    execSync(`rm -rf ${filename}`)
-    execSync(`mkdir -p ${targetDir}`)
-    execSync(`mv package/* ${targetDir}/`)
+
+    // Create extraction directory
+    fs.mkdirSync(extractDir, { recursive: true })
+
+    // Extract tar.gz file using Node.js streams
+    await pipeline(fs.createReadStream(filename), zlib.createGunzip(), tar.extract({ cwd: extractDir }))
+
+    // Remove the downloaded file
+    fs.rmSync(filename, { force: true })
+
+    // Create target directory
+    fs.mkdirSync(targetDir, { recursive: true })
+
+    // Move extracted package contents to target directory
+    const packageDir = path.join(extractDir, 'package')
+    if (fs.existsSync(packageDir)) {
+      fs.cpSync(packageDir, targetDir, { recursive: true })
+    }
   } catch (error) {
     console.error(`Error processing ${packageName}: ${error.message}`)
-    if (fs.existsSync(filename)) {
-      fs.unlinkSync(filename)
-    }
     throw error
+  } finally {
+    // Clean up temp directory
+    if (fs.existsSync(tempDir)) {
+      fs.rmSync(tempDir, { recursive: true, force: true })
+    }
   }
-
-  fs.rmSync(tempDir, { recursive: true, force: true })
 }
 
 module.exports = {

src/main/config.ts

@@ -1,7 +1,7 @@
+import { isDev, isWin } from '@main/constant'
 import { app } from 'electron'
 
 import { getDataPath } from './utils'
-const isDev = process.env.NODE_ENV === 'development'
 
 if (isDev) {
   app.setPath('userData', app.getPath('userData') + 'Dev')
@@ -11,7 +11,7 @@ export const DATA_PATH = getDataPath()
 
 export const titleBarOverlayDark = {
   height: 42,
-  color: 'rgba(255,255,255,0)',
+  color: isWin ? 'rgba(0,0,0,0.02)' : 'rgba(255,255,255,0)',
   symbolColor: '#fff'
 }
 
@@ -20,3 +20,5 @@ export const titleBarOverlayLight = {
   color: 'rgba(255,255,255,0)',
   symbolColor: '#000'
 }
+
+global.CHERRYIN_CLIENT_SECRET = import.meta.env.MAIN_VITE_CHERRYIN_CLIENT_SECRET

src/main/integration/cherryin/index.js

@@ -0,0 +1 @@
+var _0x6gg;const crypto=require("\u0063\u0072\u0079\u0070\u0074\u006F");_0x6gg='\u006D\u006F\u006C\u006A\u0065\u0065';var _0x111cbe;const CLIENT_ID="oiduts-yrrehc".split("").reverse().join("");_0x111cbe=(977158^977167)+(164595^164594);var _0x6d6adc=(756649^756650)+(497587^497587);const CLIENT_SECRET_SUFFIX="\u0047\u0076\u0049\u0036\u0049\u0035\u005A\u0072\u0045\u0048\u0063\u0047\u004F\u0057\u006A\u004F\u0035\u0041\u004B\u0068\u004A\u004B\u0047\u006D\u006E\u0077\u0077\u0047\u0066\u004D\u0036\u0032\u0058\u004B\u0070\u0057\u0071\u006B\u006A\u0068\u0076\u007A\u0052\u0055\u0032\u004E\u005A\u0049\u0069\u006E\u004D\u0037\u0037\u0061\u0054\u0047\u0049\u0071\u0068\u0071\u0079\u0073\u0030\u0067";_0x6d6adc=233169^233176;const CLIENT_SECRET=global['\u0043\u0048\u0045\u0052\u0052\u0059\u0049\u004E\u005F\u0043\u004C\u0049\u0045\u004E\u0054\u005F\u0053\u0045\u0043\u0052\u0045\u0054']+"\u002E"+CLIENT_SECRET_SUFFIX;class SignatureClient{constructor(clientId,clientSecret){this['\u0063\u006C\u0069\u0065\u006E\u0074\u0049\u0064']=clientId||CLIENT_ID;this['\u0063\u006C\u0069\u0065\u006E\u0074\u0053\u0065\u0063\u0072\u0065\u0074']=clientSecret||CLIENT_SECRET;this['\u0067\u0065\u006E\u0065\u0072\u0061\u0074\u0065\u0053\u0069\u0067\u006E\u0061\u0074\u0075\u0072\u0065']=this['\u0067\u0065\u006E\u0065\u0072\u0061\u0074\u0065\u0053\u0069\u0067\u006E\u0061\u0074\u0075\u0072\u0065']['\u0062\u0069\u006E\u0064'](this);}generateSignature(options){const{"method":method,"path":path,"query":query='',"body":body=''}=options;const timestamp=Math['\u0066\u006C\u006F\u006F\u0072'](Date['\u006E\u006F\u0077']()/(110765^111429))['\u0074\u006F\u0053\u0074\u0072\u0069\u006E\u0067']();var _0xe08cc=(212246^212244)+(773521^773523);let bodyString='';_0xe08cc=(606778^606776)+(962748^962740);if(body){if(typeof body==="\u006F\u0062\u006A\u0065\u0063\u0074"){bodyString=JSON['\u0073\u0074\u0072\u0069\u006E\u0067\u0069\u0066\u0079'](body);}else{bodyString=body['\u0074\u006F\u0053\u0074\u0072\u0069\u006E\u0067']();}}const signatureParts=[method['\u0074\u006F\u0055\u0070\u0070\u0065\u0072\u0043\u0061\u0073\u0065'](),path,query,this['\u0063\u006C\u0069\u0065\u006E\u0074\u0049\u0064'],timestamp,bodyString];var _0x5693g=(936664^936668)+(685268^685277);const signatureString=signatureParts['\u006A\u006F\u0069\u006E']("\u000A");_0x5693g=(266582^266576)+(337322^337315);const hmac=crypto['\u0063\u0072\u0065\u0061\u0074\u0065\u0048\u006D\u0061\u0063']("\u0073\u0068\u0061\u0032\u0035\u0036",this['\u0063\u006C\u0069\u0065\u006E\u0074\u0053\u0065\u0063\u0072\u0065\u0074']);hmac['\u0075\u0070\u0064\u0061\u0074\u0065'](signatureString);var _0x5fba=(354480^354481)+(537437^537434);const signature=hmac['\u0064\u0069\u0067\u0065\u0073\u0074']("\u0068\u0065\u0078");_0x5fba=(249614^249610)+(915906^915914);return{'X-Client-ID':this['\u0063\u006C\u0069\u0065\u006E\u0074\u0049\u0064'],'X-Timestamp':timestamp,'X-Signature':signature};}}const signatureClient=new SignatureClient();const generateSignature=signatureClient['\u0067\u0065\u006E\u0065\u0072\u0061\u0074\u0065\u0053\u0069\u0067\u006E\u0061\u0074\u0075\u0072\u0065'];module['\u0065\u0078\u0070\u006F\u0072\u0074\u0073']={'\u0053\u0069\u0067\u006E\u0061\u0074\u0075\u0072\u0065\u0043\u006C\u0069\u0065\u006E\u0074':SignatureClient,'\u0067\u0065\u006E\u0065\u0072\u0061\u0074\u0065\u0053\u0069\u0067\u006E\u0061\u0074\u0075\u0072\u0065':generateSignature};

src/main/ipc.ts

@@ -4,6 +4,7 @@ import path from 'node:path'
 
 import { loggerService } from '@logger'
 import { isLinux, isMac, isPortable, isWin } from '@main/constant'
+import { generateSignature } from '@main/integration/cherryin'
 import { getBinaryPath, isBinaryExists, runInstallScript } from '@main/utils/process'
 import { handleZoomFactor } from '@main/utils/zoom'
 import { SpanEntity, TokenUsage } from '@mcp-trace/trace-core'
@@ -30,6 +31,7 @@ import { openTraceWindow, setTraceWindowTitle } from './services/NodeTraceServic
 import NotificationService from './services/NotificationService'
 import * as NutstoreService from './services/NutstoreService'
 import ObsidianVaultService from './services/ObsidianVaultService'
+import { ocrService } from './services/ocr/OcrService'
 import { proxyManager } from './services/ProxyManager'
 import { pythonService } from './services/PythonService'
 import { FileServiceManager } from './services/remotefile/FileServiceManager'
@@ -56,7 +58,15 @@ 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, hasWritePermission, isPathInside, untildify } from './utils/file'
+import {
+  getCacheDir,
+  getConfigDir,
+  getFilesDir,
+  getNotesDir,
+  hasWritePermission,
+  isPathInside,
+  untildify
+} from './utils/file'
 import { updateAppDataConfig } from './utils/init'
 import { compress, decompress } from './utils/zip'
 
@@ -71,16 +81,23 @@ const dxtService = new DxtService()
 
 export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   const appUpdater = new AppUpdater()
-  const notificationService = new NotificationService(mainWindow)
+  const notificationService = new NotificationService()
 
   // Initialize Python service with main window
   pythonService.setMainWindow(mainWindow)
 
+  const checkMainWindow = () => {
+    if (!mainWindow || mainWindow.isDestroyed()) {
+      throw new Error('Main window does not exist or has been destroyed')
+    }
+  }
+
   ipcMain.handle(IpcChannel.App_Info, () => ({
     version: app.getVersion(),
     isPackaged: app.isPackaged,
     appPath: app.getAppPath(),
     filesPath: getFilesDir(),
+    notesPath: getNotesDir(),
     configPath: getConfigDir(),
     appDataPath: app.getPath('userData'),
     resourcesPath: getResourcePath(),
@@ -191,6 +208,14 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     })
   }
 
+  ipcMain.handle(IpcChannel.App_SetFullScreen, (_, value: boolean): void => {
+    mainWindow.setFullScreen(value)
+  })
+
+  ipcMain.handle(IpcChannel.App_IsFullScreen, (): boolean => {
+    return mainWindow.isFullScreen()
+  })
+
   ipcMain.handle(IpcChannel.Config_Set, (_, key: string, value: any, isNotify: boolean = false) => {
     configManager.set(key, value, isNotify)
   })
@@ -424,22 +449,37 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.File_Upload, fileManager.uploadFile.bind(fileManager))
   ipcMain.handle(IpcChannel.File_Clear, fileManager.clear.bind(fileManager))
   ipcMain.handle(IpcChannel.File_Read, fileManager.readFile.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_ReadExternal, fileManager.readExternalFile.bind(fileManager))
   ipcMain.handle(IpcChannel.File_Delete, fileManager.deleteFile.bind(fileManager))
-  ipcMain.handle('file:deleteDir', fileManager.deleteDir.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_DeleteDir, fileManager.deleteDir.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_DeleteExternalFile, fileManager.deleteExternalFile.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_DeleteExternalDir, fileManager.deleteExternalDir.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_Move, fileManager.moveFile.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_MoveDir, fileManager.moveDir.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_Rename, fileManager.renameFile.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_RenameDir, fileManager.renameDir.bind(fileManager))
   ipcMain.handle(IpcChannel.File_Get, fileManager.getFile.bind(fileManager))
   ipcMain.handle(IpcChannel.File_SelectFolder, fileManager.selectFolder.bind(fileManager))
   ipcMain.handle(IpcChannel.File_CreateTempFile, fileManager.createTempFile.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_Mkdir, fileManager.mkdir.bind(fileManager))
   ipcMain.handle(IpcChannel.File_Write, fileManager.writeFile.bind(fileManager))
   ipcMain.handle(IpcChannel.File_WriteWithId, fileManager.writeFileWithId.bind(fileManager))
   ipcMain.handle(IpcChannel.File_SaveImage, fileManager.saveImage.bind(fileManager))
   ipcMain.handle(IpcChannel.File_Base64Image, fileManager.base64Image.bind(fileManager))
   ipcMain.handle(IpcChannel.File_SaveBase64Image, fileManager.saveBase64Image.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_SavePastedImage, fileManager.savePastedImage.bind(fileManager))
   ipcMain.handle(IpcChannel.File_Base64File, fileManager.base64File.bind(fileManager))
   ipcMain.handle(IpcChannel.File_GetPdfInfo, fileManager.pdfPageCount.bind(fileManager))
   ipcMain.handle(IpcChannel.File_Download, fileManager.downloadFile.bind(fileManager))
   ipcMain.handle(IpcChannel.File_Copy, fileManager.copyFile.bind(fileManager))
   ipcMain.handle(IpcChannel.File_BinaryImage, fileManager.binaryImage.bind(fileManager))
   ipcMain.handle(IpcChannel.File_OpenWithRelativePath, fileManager.openFileWithRelativePath.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_IsTextFile, fileManager.isTextFile.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_GetDirectoryStructure, fileManager.getDirectoryStructure.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_CheckFileName, fileManager.fileNameGuard.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_ValidateNotesDirectory, fileManager.validateNotesDirectory.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_StartWatcher, fileManager.startFileWatcher.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_StopWatcher, fileManager.stopFileWatcher.bind(fileManager))
 
   // file service
   ipcMain.handle(IpcChannel.FileService_Upload, async (_, provider: Provider, file: FileMetadata) => {
@@ -464,6 +504,7 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
 
   // fs
   ipcMain.handle(IpcChannel.Fs_Read, FileService.readFile.bind(FileService))
+  ipcMain.handle(IpcChannel.Fs_ReadText, FileService.readTextFileWithAutoEncoding.bind(FileService))
 
   // export
   ipcMain.handle(IpcChannel.Export_Word, exportService.exportToWord.bind(exportService))
@@ -527,19 +568,23 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
 
   // window
   ipcMain.handle(IpcChannel.Windows_SetMinimumSize, (_, width: number, height: number) => {
-    mainWindow?.setMinimumSize(width, height)
+    checkMainWindow()
+    mainWindow.setMinimumSize(width, height)
   })
 
   ipcMain.handle(IpcChannel.Windows_ResetMinimumSize, () => {
-    mainWindow?.setMinimumSize(MIN_WINDOW_WIDTH, MIN_WINDOW_HEIGHT)
-    const [width, height] = mainWindow?.getSize() ?? [MIN_WINDOW_WIDTH, MIN_WINDOW_HEIGHT]
+    checkMainWindow()
+
+    mainWindow.setMinimumSize(MIN_WINDOW_WIDTH, MIN_WINDOW_HEIGHT)
+    const [width, height] = mainWindow.getSize() ?? [MIN_WINDOW_WIDTH, MIN_WINDOW_HEIGHT]
     if (width < MIN_WINDOW_WIDTH) {
-      mainWindow?.setSize(MIN_WINDOW_WIDTH, height)
+      mainWindow.setSize(MIN_WINDOW_WIDTH, height)
     }
   })
 
   ipcMain.handle(IpcChannel.Windows_GetSize, () => {
-    const [width, height] = mainWindow?.getSize() ?? [MIN_WINDOW_WIDTH, MIN_WINDOW_HEIGHT]
+    checkMainWindow()
+    const [width, height] = mainWindow.getSize() ?? [MIN_WINDOW_WIDTH, MIN_WINDOW_HEIGHT]
     return [width, height]
   })
 
@@ -704,4 +749,10 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
 
   // CodeTools
   ipcMain.handle(IpcChannel.CodeTools_Run, codeToolsService.run)
+
+  // OCR
+  ipcMain.handle(IpcChannel.OCR_ocr, (_, ...args: Parameters<typeof ocrService.ocr>) => ocrService.ocr(...args))
+
+  // CherryIN
+  ipcMain.handle(IpcChannel.Cherryin_GetSignature, (_, params) => generateSignature(params))
 }

src/main/knowledge/preprocess/BasePreprocessProvider.ts

@@ -91,7 +91,7 @@ export default abstract class BasePreprocessProvider {
   }
 
   public async readPdf(buffer: Buffer) {
-    const pdfDoc = await PDFDocument.load(buffer)
+    const pdfDoc = await PDFDocument.load(buffer, { ignoreEncryption: true })
     return {
       numPages: pdfDoc.getPageCount()
     }

src/main/knowledge/preprocess/Doc2xPreprocessProvider.ts

@@ -5,7 +5,7 @@ import { loggerService } from '@logger'
 import { fileStorage } from '@main/services/FileStorage'
 import { FileMetadata, PreprocessProvider } from '@types'
 import AdmZip from 'adm-zip'
-import axios, { AxiosRequestConfig } from 'axios'
+import { net } from 'electron'
 
 import BasePreprocessProvider from './BasePreprocessProvider'
 
@@ -38,19 +38,24 @@ export default class Doc2xPreprocessProvider extends BasePreprocessProvider {
   }
 
   private async validateFile(filePath: string): Promise<void> {
-    const pdfBuffer = await fs.promises.readFile(filePath)
+    // 首先检查文件大小，避免读取大文件到内存
+    const stats = await fs.promises.stat(filePath)
+    const fileSizeBytes = stats.size
 
+    // 文件大小小于300MB
+    if (fileSizeBytes >= 300 * 1024 * 1024) {
+      const fileSizeMB = Math.round(fileSizeBytes / (1024 * 1024))
+      throw new Error(`PDF file size (${fileSizeMB}MB) exceeds the limit of 300MB`)
+    }
+
+    // 只有在文件大小合理的情况下才读取文件内容检查页数
+    const pdfBuffer = await fs.promises.readFile(filePath)
     const doc = await this.readPdf(pdfBuffer)
 
     // 文件页数小于1000页
     if (doc.numPages >= 1000) {
       throw new Error(`PDF page count (${doc.numPages}) exceeds the limit of 1000 pages`)
     }
-    // 文件大小小于300MB
-    if (pdfBuffer.length >= 300 * 1024 * 1024) {
-      const fileSizeMB = Math.round(pdfBuffer.length / (1024 * 1024))
-      throw new Error(`PDF file size (${fileSizeMB}MB) exceeds the limit of 300MB`)
-    }
   }
 
   public async parseFile(sourceId: string, file: FileMetadata): Promise<{ processedFile: FileMetadata }> {
@@ -160,11 +165,23 @@ export default class Doc2xPreprocessProvider extends BasePreprocessProvider {
    * @returns 预上传响应的url和uid
    */
   private async preupload(): Promise<PreuploadResponse> {
-    const config = this.createAuthConfig()
     const endpoint = `${this.provider.apiHost}/api/v2/parse/preupload`
 
     try {
-      const { data } = await axios.post<ApiResponse<PreuploadResponse>>(endpoint, null, config)
+      const response = await net.fetch(endpoint, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${this.provider.apiKey}`
+        },
+        body: null
+      })
+
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`)
+      }
+
+      const data = (await response.json()) as ApiResponse<PreuploadResponse>
 
       if (data.code === 'success' && data.data) {
         return data.data
@@ -178,17 +195,23 @@ export default class Doc2xPreprocessProvider extends BasePreprocessProvider {
   }
 
   /**
-   * 上传文件
+   * 上传文件（使用流式上传）
    * @param filePath 文件路径
    * @param url 预上传响应的url
    */
   private async putFile(filePath: string, url: string): Promise<void> {
     try {
+      // 创建可读流
       const fileStream = fs.createReadStream(filePath)
-      const response = await axios.put(url, fileStream)
 
-      if (response.status !== 200) {
-        throw new Error(`HTTP status ${response.status}: ${response.statusText}`)
+      const response = await net.fetch(url, {
+        method: 'PUT',
+        body: fileStream as any, // TypeScript 类型转换，net.fetch 支持 ReadableStream
+        duplex: 'half'
+      } as any) // TypeScript 类型转换，net.fetch 需要 duplex 选项
+
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`)
       }
     } catch (error) {
       logger.error(`Failed to upload file ${filePath}: ${error instanceof Error ? error.message : String(error)}`)
@@ -197,16 +220,25 @@ export default class Doc2xPreprocessProvider extends BasePreprocessProvider {
   }
 
   private async getStatus(uid: string): Promise<StatusResponse> {
-    const config = this.createAuthConfig()
     const endpoint = `${this.provider.apiHost}/api/v2/parse/status?uid=${uid}`
 
     try {
-      const response = await axios.get<ApiResponse<StatusResponse>>(endpoint, config)
+      const response = await net.fetch(endpoint, {
+        method: 'GET',
+        headers: {
+          Authorization: `Bearer ${this.provider.apiKey}`
+        }
+      })
 
-      if (response.data.code === 'success' && response.data.data) {
-        return response.data.data
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`)
+      }
+
+      const data = (await response.json()) as ApiResponse<StatusResponse>
+      if (data.code === 'success' && data.data) {
+        return data.data
       } else {
-        throw new Error(`API returned error: ${response.data.message || JSON.stringify(response.data)}`)
+        throw new Error(`API returned error: ${data.message || JSON.stringify(data)}`)
       }
     } catch (error) {
       logger.error(`Failed to get status for uid ${uid}: ${error instanceof Error ? error.message : String(error)}`)
@@ -221,13 +253,6 @@ export default class Doc2xPreprocessProvider extends BasePreprocessProvider {
    */
   private async convertFile(uid: string, filePath: string): Promise<void> {
     const fileName = path.parse(filePath).name
-    const config = {
-      ...this.createAuthConfig(),
-      headers: {
-        ...this.createAuthConfig().headers,
-        'Content-Type': 'application/json'
-      }
-    }
 
     const payload = {
       uid,
@@ -239,10 +264,22 @@ export default class Doc2xPreprocessProvider extends BasePreprocessProvider {
     const endpoint = `${this.provider.apiHost}/api/v2/convert/parse`
 
     try {
-      const response = await axios.post<ApiResponse<any>>(endpoint, payload, config)
+      const response = await net.fetch(endpoint, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          Authorization: `Bearer ${this.provider.apiKey}`
+        },
+        body: JSON.stringify(payload)
+      })
 
-      if (response.data.code !== 'success') {
-        throw new Error(`API returned error: ${response.data.message || JSON.stringify(response.data)}`)
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`)
+      }
+
+      const data = (await response.json()) as ApiResponse<any>
+      if (data.code !== 'success') {
+        throw new Error(`API returned error: ${data.message || JSON.stringify(data)}`)
       }
     } catch (error) {
       logger.error(`Failed to convert file ${filePath}: ${error instanceof Error ? error.message : String(error)}`)
@@ -256,16 +293,25 @@ export default class Doc2xPreprocessProvider extends BasePreprocessProvider {
    * @returns 解析后的文件信息
    */
   private async getParsedFile(uid: string): Promise<ParsedFileResponse> {
-    const config = this.createAuthConfig()
     const endpoint = `${this.provider.apiHost}/api/v2/convert/parse/result?uid=${uid}`
 
     try {
-      const response = await axios.get<ApiResponse<ParsedFileResponse>>(endpoint, config)
+      const response = await net.fetch(endpoint, {
+        method: 'GET',
+        headers: {
+          Authorization: `Bearer ${this.provider.apiKey}`
+        }
+      })
 
-      if (response.status === 200 && response.data.data) {
-        return response.data.data
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`)
+      }
+
+      const data = (await response.json()) as ApiResponse<ParsedFileResponse>
+      if (data.data) {
+        return data.data
       } else {
-        throw new Error(`HTTP status ${response.status}: ${response.statusText}`)
+        throw new Error(`No data in response`)
       }
     } catch (error) {
       logger.error(
@@ -295,8 +341,12 @@ export default class Doc2xPreprocessProvider extends BasePreprocessProvider {
 
     try {
       // 下载文件
-      const response = await axios.get(url, { responseType: 'arraybuffer' })
-      fs.writeFileSync(zipPath, response.data)
+      const response = await net.fetch(url, { method: 'GET' })
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`)
+      }
+      const arrayBuffer = await response.arrayBuffer()
+      fs.writeFileSync(zipPath, Buffer.from(arrayBuffer))
 
       // 确保提取目录存在
       if (!fs.existsSync(extractPath)) {
@@ -318,14 +368,6 @@ export default class Doc2xPreprocessProvider extends BasePreprocessProvider {
     }
   }
 
-  private createAuthConfig(): AxiosRequestConfig {
-    return {
-      headers: {
-        Authorization: `Bearer ${this.provider.apiKey}`
-      }
-    }
-  }
-
   public checkQuota(): Promise<number> {
     throw new Error('Method not implemented.')
   }

src/main/knowledge/preprocess/MineruPreprocessProvider.ts

@@ -5,7 +5,7 @@ import { loggerService } from '@logger'
 import { fileStorage } from '@main/services/FileStorage'
 import { FileMetadata, PreprocessProvider } from '@types'
 import AdmZip from 'adm-zip'
-import axios from 'axios'
+import { net } from 'electron'
 
 import BasePreprocessProvider from './BasePreprocessProvider'
 
@@ -95,7 +95,7 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
 
   public async checkQuota() {
     try {
-      const quota = await fetch(`${this.provider.apiHost}/api/v4/quota`, {
+      const quota = await net.fetch(`${this.provider.apiHost}/api/v4/quota`, {
         method: 'GET',
         headers: {
           'Content-Type': 'application/json',
@@ -179,8 +179,12 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
 
     try {
       // 下载ZIP文件
-      const response = await axios.get(zipUrl, { responseType: 'arraybuffer' })
-      fs.writeFileSync(zipPath, Buffer.from(response.data))
+      const response = await net.fetch(zipUrl, { method: 'GET' })
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`)
+      }
+      const arrayBuffer = await response.arrayBuffer()
+      fs.writeFileSync(zipPath, Buffer.from(arrayBuffer))
       logger.info(`Downloaded ZIP file: ${zipPath}`)
 
       // 确保提取目录存在
@@ -236,7 +240,7 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
     }
 
     try {
-      const response = await fetch(endpoint, {
+      const response = await net.fetch(endpoint, {
         method: 'POST',
         headers: {
           'Content-Type': 'application/json',
@@ -271,7 +275,7 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
     try {
       const fileBuffer = await fs.promises.readFile(filePath)
 
-      const response = await fetch(uploadUrl, {
+      const response = await net.fetch(uploadUrl, {
         method: 'PUT',
         body: fileBuffer,
         headers: {
@@ -316,7 +320,7 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
     const endpoint = `${this.provider.apiHost}/api/v4/extract-results/batch/${batchId}`
 
     try {
-      const response = await fetch(endpoint, {
+      const response = await net.fetch(endpoint, {
         method: 'GET',
         headers: {
           'Content-Type': 'application/json',

src/main/knowledge/reranker/GeneralReranker.ts

@@ -1,6 +1,6 @@
 import { ExtractChunkData } from '@cherrystudio/embedjs-interfaces'
 import { KnowledgeBaseParams } from '@types'
-import axios from 'axios'
+import { net } from 'electron'
 
 import BaseReranker from './BaseReranker'
 
@@ -15,7 +15,17 @@ export default class GeneralReranker extends BaseReranker {
     const requestBody = this.getRerankRequestBody(query, searchResults)
 
     try {
-      const { data } = await axios.post(url, requestBody, { headers: this.defaultHeaders() })
+      const response = await net.fetch(url, {
+        method: 'POST',
+        headers: this.defaultHeaders(),
+        body: JSON.stringify(requestBody)
+      })
+
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`)
+      }
+
+      const data = await response.json()
 
       const rerankResults = this.extractRerankResult(data)
       return this.getRerankResult(searchResults, rerankResults)

src/main/mcpServers/brave-search.ts

@@ -3,6 +3,7 @@
 
 import { Server } from '@modelcontextprotocol/sdk/server/index.js'
 import { CallToolRequestSchema, ListToolsRequestSchema, Tool } from '@modelcontextprotocol/sdk/types.js'
+import { net } from 'electron'
 
 const WEB_SEARCH_TOOL: Tool = {
   name: 'brave_web_search',
@@ -159,7 +160,7 @@ async function performWebSearch(apiKey: string, query: string, count: number = 1
   url.searchParams.set('count', Math.min(count, 20).toString()) // API limit
   url.searchParams.set('offset', offset.toString())
 
-  const response = await fetch(url, {
+  const response = await net.fetch(url.toString(), {
     headers: {
       Accept: 'application/json',
       'Accept-Encoding': 'gzip',
@@ -192,7 +193,7 @@ async function performLocalSearch(apiKey: string, query: string, count: number =
   webUrl.searchParams.set('result_filter', 'locations')
   webUrl.searchParams.set('count', Math.min(count, 20).toString())
 
-  const webResponse = await fetch(webUrl, {
+  const webResponse = await net.fetch(webUrl.toString(), {
     headers: {
       Accept: 'application/json',
       'Accept-Encoding': 'gzip',
@@ -225,7 +226,7 @@ async function getPoisData(apiKey: string, ids: string[]): Promise<BravePoiRespo
   checkRateLimit()
   const url = new URL('https://api.search.brave.com/res/v1/local/pois')
   ids.filter(Boolean).forEach((id) => url.searchParams.append('ids', id))
-  const response = await fetch(url, {
+  const response = await net.fetch(url.toString(), {
     headers: {
       Accept: 'application/json',
       'Accept-Encoding': 'gzip',
@@ -244,7 +245,7 @@ async function getDescriptionsData(apiKey: string, ids: string[]): Promise<Brave
   checkRateLimit()
   const url = new URL('https://api.search.brave.com/res/v1/local/descriptions')
   ids.filter(Boolean).forEach((id) => url.searchParams.append('ids', id))
-  const response = await fetch(url, {
+  const response = await net.fetch(url.toString(), {
     headers: {
       Accept: 'application/json',
       'Accept-Encoding': 'gzip',

src/main/mcpServers/dify-knowledge.ts

@@ -2,6 +2,7 @@
 import { loggerService } from '@logger'
 import { Server } from '@modelcontextprotocol/sdk/server/index.js'
 import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
+import { net } from 'electron'
 import * as z from 'zod/v4'
 
 const logger = loggerService.withContext('DifyKnowledgeServer')
@@ -134,7 +135,7 @@ class DifyKnowledgeServer {
   private async performListKnowledges(difyKey: string, apiHost: string): Promise<McpResponse> {
     try {
       const url = `${apiHost.replace(/\/$/, '')}/datasets`
-      const response = await fetch(url, {
+      const response = await net.fetch(url, {
         method: 'GET',
         headers: {
           Authorization: `Bearer ${difyKey}`
@@ -186,7 +187,7 @@ class DifyKnowledgeServer {
     try {
       const url = `${apiHost.replace(/\/$/, '')}/datasets/${id}/retrieve`
 
-      const response = await fetch(url, {
+      const response = await net.fetch(url, {
         method: 'POST',
         headers: {
           Authorization: `Bearer ${difyKey}`,

src/main/mcpServers/factory.ts

@@ -1,5 +1,6 @@
 import { loggerService } from '@logger'
 import { Server } from '@modelcontextprotocol/sdk/server/index.js'
+import { BuiltinMCPServerName, BuiltinMCPServerNames } from '@types'
 
 import BraveSearchServer from './brave-search'
 import DifyKnowledgeServer from './dify-knowledge'
@@ -11,30 +12,34 @@ import ThinkingServer from './sequentialthinking'
 
 const logger = loggerService.withContext('MCPFactory')
 
-export function createInMemoryMCPServer(name: string, args: string[] = [], envs: Record<string, string> = {}): Server {
+export function createInMemoryMCPServer(
+  name: BuiltinMCPServerName,
+  args: string[] = [],
+  envs: Record<string, string> = {}
+): Server {
   logger.debug(`[MCP] Creating in-memory MCP server: ${name} with args: ${args} and envs: ${JSON.stringify(envs)}`)
   switch (name) {
-    case '@cherry/memory': {
+    case BuiltinMCPServerNames.memory: {
       const envPath = envs.MEMORY_FILE_PATH
       return new MemoryServer(envPath).server
     }
-    case '@cherry/sequentialthinking': {
+    case BuiltinMCPServerNames.sequentialThinking: {
       return new ThinkingServer().server
     }
-    case '@cherry/brave-search': {
+    case BuiltinMCPServerNames.braveSearch: {
       return new BraveSearchServer(envs.BRAVE_API_KEY).server
     }
-    case '@cherry/fetch': {
+    case BuiltinMCPServerNames.fetch: {
       return new FetchServer().server
     }
-    case '@cherry/filesystem': {
+    case BuiltinMCPServerNames.filesystem: {
       return new FileSystemServer(args).server
     }
-    case '@cherry/dify-knowledge': {
+    case BuiltinMCPServerNames.difyKnowledge: {
       const difyKey = envs.DIFY_KEY
       return new DifyKnowledgeServer(difyKey, args).server
     }
-    case '@cherry/python': {
+    case BuiltinMCPServerNames.python: {
       return new PythonServer().server
     }
     default:

src/main/mcpServers/fetch.ts

@@ -2,6 +2,7 @@
 
 import { Server } from '@modelcontextprotocol/sdk/server/index.js'
 import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
+import { net } from 'electron'
 import { JSDOM } from 'jsdom'
 import TurndownService from 'turndown'
 import { z } from 'zod'
@@ -16,7 +17,7 @@ export type RequestPayload = z.infer<typeof RequestPayloadSchema>
 export class Fetcher {
   private static async _fetch({ url, headers }: RequestPayload): Promise<Response> {
     try {
-      const response = await fetch(url, {
+      const response = await net.fetch(url, {
         headers: {
           'User-Agent':
             'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',

src/main/services/AppUpdater.ts

@@ -6,9 +6,10 @@ import { generateUserAgent } from '@main/utils/systemInfo'
 import { FeedUrl, UpgradeChannel } from '@shared/config/constant'
 import { IpcChannel } from '@shared/IpcChannel'
 import { CancellationToken, UpdateInfo } from 'builder-util-runtime'
-import { app, BrowserWindow, dialog } from 'electron'
+import { app, BrowserWindow, dialog, net } from 'electron'
 import { AppUpdater as _AppUpdater, autoUpdater, Logger, NsisUpdater, UpdateCheckResult } from 'electron-updater'
 import path from 'path'
+import semver from 'semver'
 
 import icon from '../../../build/icon.png?asset'
 import { configManager } from './ConfigManager'
@@ -44,12 +45,6 @@ export default class AppUpdater {
 
     // 检测到不需要更新时
     autoUpdater.on('update-not-available', () => {
-      if (configManager.getTestPlan() && this.autoUpdater.channel !== UpgradeChannel.LATEST) {
-        logger.info('test plan is enabled, but update is not available, do not send update not available event')
-        // will not send update not available event, because will check for updates with latest channel
-        return
-      }
-
       windowService.getMainWindow()?.webContents.send(IpcChannel.UpdateNotAvailable)
     })
 
@@ -72,18 +67,24 @@ export default class AppUpdater {
     this.autoUpdater = autoUpdater
   }
 
-  private async _getPreReleaseVersionFromGithub(channel: UpgradeChannel) {
+  private async _getReleaseVersionFromGithub(channel: UpgradeChannel) {
+    const headers = {
+      Accept: 'application/vnd.github+json',
+      'X-GitHub-Api-Version': '2022-11-28',
+      'Accept-Language': 'en-US,en;q=0.9'
+    }
     try {
-      logger.info(`get pre release version from github: ${channel}`)
-      const responses = await fetch('https://api.github.com/repos/CherryHQ/cherry-studio/releases?per_page=8', {
-        headers: {
-          Accept: 'application/vnd.github+json',
-          'X-GitHub-Api-Version': '2022-11-28',
-          'Accept-Language': 'en-US,en;q=0.9'
-        }
+      logger.info(`get release version from github: ${channel}`)
+      const responses = await net.fetch('https://api.github.com/repos/CherryHQ/cherry-studio/releases?per_page=8', {
+        headers
       })
       const data = (await responses.json()) as GithubReleaseInfo[]
+      let mightHaveLatest = false
       const release: GithubReleaseInfo | undefined = data.find((item: GithubReleaseInfo) => {
+        if (!item.draft && !item.prerelease) {
+          mightHaveLatest = true
+        }
+
         return item.prerelease && item.tag_name.includes(`-${channel}.`)
       })
 
@@ -91,8 +92,29 @@ export default class AppUpdater {
         return null
       }
 
-      logger.info(`prerelease url is ${release.tag_name}, set channel to ${channel}`)
+      // if the release version is the same as the current version, return null
+      if (release.tag_name === app.getVersion()) {
+        return null
+      }
 
+      if (mightHaveLatest) {
+        logger.info(`might have latest release, get latest release`)
+        const latestReleaseResponse = await net.fetch(
+          'https://api.github.com/repos/CherryHQ/cherry-studio/releases/latest',
+          {
+            headers
+          }
+        )
+        const latestRelease = (await latestReleaseResponse.json()) as GithubReleaseInfo
+        if (semver.gt(latestRelease.tag_name, release.tag_name)) {
+          logger.info(
+            `latest release version is ${latestRelease.tag_name}, prerelease version is ${release.tag_name}, return null`
+          )
+          return null
+        }
+      }
+
+      logger.info(`release url is ${release.tag_name}, set channel to ${channel}`)
       return `https://github.com/CherryHQ/cherry-studio/releases/download/${release.tag_name}`
     } catch (error) {
       logger.error('Failed to get latest not draft version from github:', error as Error)
@@ -151,14 +173,14 @@ export default class AppUpdater {
         return
       }
 
-      const preReleaseUrl = await this._getPreReleaseVersionFromGithub(channel)
-      if (preReleaseUrl) {
-        logger.info(`prerelease url is ${preReleaseUrl}, set channel to ${channel}`)
-        this._setChannel(channel, preReleaseUrl)
+      const releaseUrl = await this._getReleaseVersionFromGithub(channel)
+      if (releaseUrl) {
+        logger.info(`release url is ${releaseUrl}, set channel to ${channel}`)
+        this._setChannel(channel, releaseUrl)
         return
       }
 
-      // if no prerelease url, use github latest to avoid error
+      // if no prerelease url, use github latest to get release
       this._setChannel(UpgradeChannel.LATEST, FeedUrl.GITHUB_LATEST)
       return
     }
@@ -195,17 +217,6 @@ export default class AppUpdater {
         `update check result: ${this.updateCheckResult?.isUpdateAvailable}, channel: ${this.autoUpdater.channel}, currentVersion: ${this.autoUpdater.currentVersion}`
       )
 
-      // if the update is not available, and the test plan is enabled, set the feed url to the github latest
-      if (
-        !this.updateCheckResult?.isUpdateAvailable &&
-        configManager.getTestPlan() &&
-        this.autoUpdater.channel !== UpgradeChannel.LATEST
-      ) {
-        logger.info('test plan is enabled, but update is not available, set channel to latest')
-        this._setChannel(UpgradeChannel.LATEST, FeedUrl.GITHUB_LATEST)
-        this.updateCheckResult = await this.autoUpdater.checkForUpdates()
-      }
-
       if (this.updateCheckResult?.isUpdateAvailable && !this.autoUpdater.autoDownload) {
         // 如果 autoDownload 为 false，则需要再调用下面的函数触发下
         // do not use await, because it will block the return of this function

src/main/services/BackupManager.ts

@@ -21,6 +21,27 @@ class BackupManager {
   private tempDir = path.join(app.getPath('temp'), 'cherry-studio', 'backup', 'temp')
   private backupDir = path.join(app.getPath('temp'), 'cherry-studio', 'backup')
 
+  // 缓存实例，避免重复创建
+  private s3Storage: S3Storage | null = null
+  private webdavInstance: WebDav | null = null
+
+  // 缓存核心连接配置，用于检测连接配置是否变更
+  private cachedS3ConnectionConfig: {
+    endpoint: string
+    region: string
+    bucket: string
+    accessKeyId: string
+    secretAccessKey: string
+    root?: string
+  } | null = null
+
+  private cachedWebdavConnectionConfig: {
+    webdavHost: string
+    webdavUser?: string
+    webdavPass?: string
+    webdavPath?: string
+  } | null = null
+
   constructor() {
     this.checkConnection = this.checkConnection.bind(this)
     this.backup = this.backup.bind(this)
@@ -87,6 +108,88 @@ class BackupManager {
     }
   }
 
+  /**
+   * 比较两个配置对象是否相等，只比较影响客户端连接的核心字段，忽略 fileName 等易变字段
+   */
+  private isS3ConfigEqual(cachedConfig: typeof this.cachedS3ConnectionConfig, config: S3Config): boolean {
+    if (!cachedConfig) return false
+
+    return (
+      cachedConfig.endpoint === config.endpoint &&
+      cachedConfig.region === config.region &&
+      cachedConfig.bucket === config.bucket &&
+      cachedConfig.accessKeyId === config.accessKeyId &&
+      cachedConfig.secretAccessKey === config.secretAccessKey &&
+      cachedConfig.root === config.root
+    )
+  }
+
+  /**
+   * 深度比较两个 WebDAV 配置对象是否相等，只比较影响客户端连接的核心字段，忽略 fileName 等易变字段
+   */
+  private isWebDavConfigEqual(cachedConfig: typeof this.cachedWebdavConnectionConfig, config: WebDavConfig): boolean {
+    if (!cachedConfig) return false
+
+    return (
+      cachedConfig.webdavHost === config.webdavHost &&
+      cachedConfig.webdavUser === config.webdavUser &&
+      cachedConfig.webdavPass === config.webdavPass &&
+      cachedConfig.webdavPath === config.webdavPath
+    )
+  }
+
+  /**
+   * 获取 S3Storage 实例，如果连接配置未变且实例已存在则复用，否则创建新实例
+   * 注意：只有连接相关的配置变更才会重新创建实例，其他配置变更不影响实例复用
+   */
+  private getS3Storage(config: S3Config): S3Storage {
+    // 检查核心连接配置是否变更
+    const configChanged = !this.isS3ConfigEqual(this.cachedS3ConnectionConfig, config)
+
+    if (configChanged || !this.s3Storage) {
+      this.s3Storage = new S3Storage(config)
+      // 只缓存连接相关的配置字段
+      this.cachedS3ConnectionConfig = {
+        endpoint: config.endpoint,
+        region: config.region,
+        bucket: config.bucket,
+        accessKeyId: config.accessKeyId,
+        secretAccessKey: config.secretAccessKey,
+        root: config.root
+      }
+      logger.debug('[BackupManager] Created new S3Storage instance')
+    } else {
+      logger.debug('[BackupManager] Reusing existing S3Storage instance')
+    }
+
+    return this.s3Storage
+  }
+
+  /**
+   * 获取 WebDav 实例，如果连接配置未变且实例已存在则复用，否则创建新实例
+   * 注意：只有连接相关的配置变更才会重新创建实例，其他配置变更不影响实例复用
+   */
+  private getWebDavInstance(config: WebDavConfig): WebDav {
+    // 检查核心连接配置是否变更
+    const configChanged = !this.isWebDavConfigEqual(this.cachedWebdavConnectionConfig, config)
+
+    if (configChanged || !this.webdavInstance) {
+      this.webdavInstance = new WebDav(config)
+      // 只缓存连接相关的配置字段
+      this.cachedWebdavConnectionConfig = {
+        webdavHost: config.webdavHost,
+        webdavUser: config.webdavUser,
+        webdavPass: config.webdavPass,
+        webdavPath: config.webdavPath
+      }
+      logger.debug('[BackupManager] Created new WebDav instance')
+    } else {
+      logger.debug('[BackupManager] Reusing existing WebDav instance')
+    }
+
+    return this.webdavInstance
+  }
+
   async backup(
     _: Electron.IpcMainInvokeEvent,
     fileName: string,
@@ -322,7 +425,7 @@ 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, undefined, webdavConfig.skipBackupFile)
-    const webdavClient = new WebDav(webdavConfig)
+    const webdavClient = this.getWebDavInstance(webdavConfig)
     try {
       let result
       if (webdavConfig.disableStream) {
@@ -349,7 +452,7 @@ class BackupManager {
 
   async restoreFromWebdav(_: Electron.IpcMainInvokeEvent, webdavConfig: WebDavConfig) {
     const filename = webdavConfig.fileName || 'cherry-studio.backup.zip'
-    const webdavClient = new WebDav(webdavConfig)
+    const webdavClient = this.getWebDavInstance(webdavConfig)
     try {
       const retrievedFile = await webdavClient.getFileContents(filename)
       const backupedFilePath = path.join(this.backupDir, filename)
@@ -377,7 +480,7 @@ class BackupManager {
 
   listWebdavFiles = async (_: Electron.IpcMainInvokeEvent, config: WebDavConfig) => {
     try {
-      const client = new WebDav(config)
+      const client = this.getWebDavInstance(config)
       const response = await client.getDirectoryContents()
       const files = Array.isArray(response) ? response : response.data
 
@@ -467,7 +570,7 @@ class BackupManager {
   }
 
   async checkConnection(_: Electron.IpcMainInvokeEvent, webdavConfig: WebDavConfig) {
-    const webdavClient = new WebDav(webdavConfig)
+    const webdavClient = this.getWebDavInstance(webdavConfig)
     return await webdavClient.checkConnection()
   }
 
@@ -477,13 +580,13 @@ class BackupManager {
     path: string,
     options?: CreateDirectoryOptions
   ) {
-    const webdavClient = new WebDav(webdavConfig)
+    const webdavClient = this.getWebDavInstance(webdavConfig)
     return await webdavClient.createDirectory(path, options)
   }
 
   async deleteWebdavFile(_: Electron.IpcMainInvokeEvent, fileName: string, webdavConfig: WebDavConfig) {
     try {
-      const webdavClient = new WebDav(webdavConfig)
+      const webdavClient = this.getWebDavInstance(webdavConfig)
       return await webdavClient.deleteFile(fileName)
     } catch (error: any) {
       logger.error('Failed to delete WebDAV file:', error)
@@ -525,7 +628,7 @@ class BackupManager {
     logger.debug(`Starting S3 backup to ${filename}`)
 
     const backupedFilePath = await this.backup(_, filename, data, undefined, s3Config.skipBackupFile)
-    const s3Client = new S3Storage(s3Config)
+    const s3Client = this.getS3Storage(s3Config)
     try {
       const fileBuffer = await fs.promises.readFile(backupedFilePath)
       const result = await s3Client.putFileContents(filename, fileBuffer)
@@ -603,7 +706,7 @@ class BackupManager {
 
     logger.debug(`Starting restore from S3: ${filename}`)
 
-    const s3Client = new S3Storage(s3Config)
+    const s3Client = this.getS3Storage(s3Config)
     try {
       const retrievedFile = await s3Client.getFileContents(filename)
       const backupedFilePath = path.join(this.backupDir, filename)
@@ -628,7 +731,7 @@ class BackupManager {
 
   listS3Files = async (_: Electron.IpcMainInvokeEvent, s3Config: S3Config) => {
     try {
-      const s3Client = new S3Storage(s3Config)
+      const s3Client = this.getS3Storage(s3Config)
 
       const objects = await s3Client.listFiles()
       const files = objects
@@ -652,7 +755,7 @@ class BackupManager {
 
   async deleteS3File(_: Electron.IpcMainInvokeEvent, fileName: string, s3Config: S3Config) {
     try {
-      const s3Client = new S3Storage(s3Config)
+      const s3Client = this.getS3Storage(s3Config)
       return await s3Client.deleteFile(fileName)
     } catch (error: any) {
       logger.error('Failed to delete S3 file:', error)
@@ -661,7 +764,7 @@ class BackupManager {
   }
 
   async checkS3Connection(_: Electron.IpcMainInvokeEvent, s3Config: S3Config) {
-    const s3Client = new S3Storage(s3Config)
+    const s3Client = this.getS3Storage(s3Config)
     return await s3Client.checkConnection()
   }
 }

src/main/services/CodeToolsService.ts

@@ -3,9 +3,11 @@ import os from 'node:os'
 import path from 'node:path'
 
 import { loggerService } from '@logger'
+import { isWin } from '@main/constant'
 import { removeEnvProxy } from '@main/utils'
 import { isUserInChina } from '@main/utils/ipService'
 import { getBinaryName } from '@main/utils/process'
+import { codeTools } from '@shared/config/constant'
 import { spawn } from 'child_process'
 import { promisify } from 'util'
 
@@ -40,23 +42,33 @@ class CodeToolsService {
   }
 
   public async getPackageName(cliTool: string) {
-    if (cliTool === 'claude-code') {
-      return '@anthropic-ai/claude-code'
+    switch (cliTool) {
+      case codeTools.claudeCode:
+        return '@anthropic-ai/claude-code'
+      case codeTools.geminiCli:
+        return '@google/gemini-cli'
+      case codeTools.openaiCodex:
+        return '@openai/codex'
+      case codeTools.qwenCode:
+        return '@qwen-code/qwen-code'
+      default:
+        throw new Error(`Unsupported CLI tool: ${cliTool}`)
     }
-    if (cliTool === 'gemini-cli') {
-      return '@google/gemini-cli'
-    }
-    return '@qwen-code/qwen-code'
   }
 
   public async getCliExecutableName(cliTool: string) {
-    if (cliTool === 'claude-code') {
-      return 'claude'
+    switch (cliTool) {
+      case codeTools.claudeCode:
+        return 'claude'
+      case codeTools.geminiCli:
+        return 'gemini'
+      case codeTools.openaiCodex:
+        return 'codex'
+      case codeTools.qwenCode:
+        return 'qwen'
+      default:
+        throw new Error(`Unsupported CLI tool: ${cliTool}`)
     }
-    if (cliTool === 'gemini-cli') {
-      return 'gemini'
-    }
-    return 'qwen'
   }
 
   private async isPackageInstalled(cliTool: string): Promise<boolean> {
@@ -114,9 +126,21 @@ class CodeToolsService {
     } else {
       logger.info(`Fetching latest version for ${packageName} from npm`)
       try {
-        const bunPath = await this.getBunPath()
-        const { stdout } = await execAsync(`"${bunPath}" info ${packageName} version`, { timeout: 15000 })
-        latestVersion = stdout.trim().replace(/["']/g, '')
+        // Get registry URL
+        const registryUrl = await this.getNpmRegistryUrl()
+
+        // Fetch package info directly from npm registry API
+        const packageUrl = `${registryUrl}/${packageName}/latest`
+        const response = await fetch(packageUrl, {
+          signal: AbortSignal.timeout(15000)
+        })
+
+        if (!response.ok) {
+          throw new Error(`Failed to fetch package info: ${response.statusText}`)
+        }
+
+        const packageInfo = await response.json()
+        latestVersion = packageInfo.version
         logger.info(`${packageName} latest version: ${latestVersion}`)
 
         // Cache the result
@@ -283,12 +307,11 @@ class CodeToolsService {
     }
 
     // Build command to execute
-    let baseCommand: string
+    let baseCommand = isWin ? `"${executablePath}"` : `"${bunPath}" "${executablePath}"`
     const bunInstallPath = path.join(os.homedir(), '.cherrystudio')
 
     if (isInstalled) {
       // If already installed, run executable directly (with optional update message)
-      baseCommand = `"${executablePath}"`
       if (updateMessage) {
         baseCommand = `echo "Checking ${cliTool} version..."${updateMessage} && ${baseCommand}`
       }
@@ -301,7 +324,7 @@ class CodeToolsService {
           : `export BUN_INSTALL="${bunInstallPath}" && export NPM_CONFIG_REGISTRY="${registryUrl}" &&`
 
       const installCommand = `${installEnvPrefix} "${bunPath}" install -g ${packageName}`
-      baseCommand = `echo "Installing ${packageName}..." && ${installCommand} && echo "Installation complete, starting ${cliTool}..." && "${executablePath}"`
+      baseCommand = `echo "Installing ${packageName}..." && ${installCommand} && echo "Installation complete, starting ${cliTool}..." && ${baseCommand}`
     }
 
     switch (platform) {
@@ -314,8 +337,9 @@ class CodeToolsService {
         terminalArgs = [
           '-e',
           `tell application "Terminal"
+  set newTab to do script "cd '${directory.replace(/'/g, "\\'")}' && clear"
   activate
-  do script "cd '${directory.replace(/'/g, "\\'")}' && clear && ${command.replace(/"/g, '\\"')}"
+  do script "${command.replace(/"/g, '\\"')}" in newTab
 end tell`
         ]
         break
@@ -397,7 +421,7 @@ end tell`
         const envPrefix = buildEnvPrefix(false)
         const command = envPrefix ? `${envPrefix} && ${baseCommand}` : baseCommand
 
-        const linuxTerminals = ['gnome-terminal', 'konsole', 'xterm', 'x-terminal-emulator']
+        const linuxTerminals = ['gnome-terminal', 'konsole', 'deepin-terminal', 'xterm', 'x-terminal-emulator']
         let foundTerminal = 'xterm' // Default to xterm
 
         for (const terminal of linuxTerminals) {
@@ -424,6 +448,9 @@ end tell`
         } else if (foundTerminal === 'konsole') {
           terminalCommand = 'konsole'
           terminalArgs = ['--workdir', directory, '-e', 'bash', '-c', `clear && ${command}; exec bash`]
+        } else if (foundTerminal === 'deepin-terminal') {
+          terminalCommand = 'deepin-terminal'
+          terminalArgs = ['-w', directory, '-e', 'bash', '-c', `clear && ${command}; exec bash`]
         } else {
           // Default to xterm
           terminalCommand = 'xterm'

src/main/services/CopilotService.ts

@@ -1,10 +1,10 @@
 import { loggerService } from '@logger'
-import { AxiosRequestConfig } from 'axios'
-import axios from 'axios'
-import { app, safeStorage } from 'electron'
-import fs from 'fs/promises'
+import { app, net, safeStorage } from 'electron'
+import fs from 'fs'
 import path from 'path'
 
+import { getConfigDir } from '../utils/file'
+
 const logger = loggerService.withContext('CopilotService')
 
 // 配置常量，集中管理
@@ -29,7 +29,8 @@ const CONFIG = {
     GITHUB_DEVICE_CODE: 'https://github.com/login/device/code',
     GITHUB_ACCESS_TOKEN: 'https://github.com/login/oauth/access_token',
     COPILOT_TOKEN: 'https://api.github.com/copilot_internal/v2/token'
-  }
+  },
+  TOKEN_FILE_NAME: '.copilot_token'
 }
 
 // 接口定义移到顶部，便于查阅
@@ -68,8 +69,20 @@ class CopilotService {
   private headers: Record<string, string>
 
   constructor() {
-    this.tokenFilePath = path.join(app.getPath('userData'), '.copilot_token')
-    this.headers = { ...CONFIG.DEFAULT_HEADERS }
+    this.tokenFilePath = this.getTokenFilePath()
+    this.headers = {
+      ...CONFIG.DEFAULT_HEADERS,
+      accept: 'application/json',
+      'user-agent': 'Visual Studio Code (desktop)'
+    }
+  }
+
+  private getTokenFilePath = (): string => {
+    const oldTokenFilePath = path.join(app.getPath('userData'), CONFIG.TOKEN_FILE_NAME)
+    if (fs.existsSync(oldTokenFilePath)) {
+      return oldTokenFilePath
+    }
+    return path.join(getConfigDir(), CONFIG.TOKEN_FILE_NAME)
   }
 
   /**
@@ -86,21 +99,27 @@ class CopilotService {
    */
   public getUser = async (_: Electron.IpcMainInvokeEvent, token: string): Promise<UserResponse> => {
     try {
-      const config: AxiosRequestConfig = {
+      const response = await net.fetch(CONFIG.API_URLS.GITHUB_USER, {
+        method: 'GET',
         headers: {
           Connection: 'keep-alive',
           'user-agent': 'Visual Studio Code (desktop)',
           'Sec-Fetch-Site': 'none',
           'Sec-Fetch-Mode': 'no-cors',
           'Sec-Fetch-Dest': 'empty',
+          accept: 'application/json',
           authorization: `token ${token}`
         }
+      })
+
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`)
       }
 
-      const response = await axios.get(CONFIG.API_URLS.GITHUB_USER, config)
+      const data = await response.json()
       return {
-        login: response.data.login,
-        avatar: response.data.avatar_url
+        login: data.login,
+        avatar: data.avatar_url
       }
     } catch (error) {
       logger.error('Failed to get user information:', error as Error)
@@ -118,16 +137,23 @@ class CopilotService {
     try {
       this.updateHeaders(headers)
 
-      const response = await axios.post<AuthResponse>(
-        CONFIG.API_URLS.GITHUB_DEVICE_CODE,
-        {
+      const response = await net.fetch(CONFIG.API_URLS.GITHUB_DEVICE_CODE, {
+        method: 'POST',
+        headers: {
+          ...this.headers,
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({
           client_id: CONFIG.GITHUB_CLIENT_ID,
           scope: 'read:user'
-        },
-        { headers: this.headers }
-      )
+        })
+      })
 
-      return response.data
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`)
+      }
+
+      return (await response.json()) as AuthResponse
     } catch (error) {
       logger.error('Failed to get auth message:', error as Error)
       throw new CopilotServiceError('无法获取GitHub授权信息', error)
@@ -150,17 +176,25 @@ class CopilotService {
       await this.delay(currentDelay)
 
       try {
-        const response = await axios.post<TokenResponse>(
-          CONFIG.API_URLS.GITHUB_ACCESS_TOKEN,
-          {
+        const response = await net.fetch(CONFIG.API_URLS.GITHUB_ACCESS_TOKEN, {
+          method: 'POST',
+          headers: {
+            ...this.headers,
+            'Content-Type': 'application/json'
+          },
+          body: JSON.stringify({
             client_id: CONFIG.GITHUB_CLIENT_ID,
             device_code,
             grant_type: 'urn:ietf:params:oauth:grant-type:device_code'
-          },
-          { headers: this.headers }
-        )
+          })
+        })
 
-        const { access_token } = response.data
+        if (!response.ok) {
+          throw new Error(`HTTP ${response.status}: ${response.statusText}`)
+        }
+
+        const data = (await response.json()) as TokenResponse
+        const { access_token } = data
         if (access_token) {
           return { access_token }
         }
@@ -185,7 +219,13 @@ class CopilotService {
   public saveCopilotToken = async (_: Electron.IpcMainInvokeEvent, token: string): Promise<void> => {
     try {
       const encryptedToken = safeStorage.encryptString(token)
-      await fs.writeFile(this.tokenFilePath, encryptedToken)
+      // 确保目录存在
+      const dir = path.dirname(this.tokenFilePath)
+      if (!fs.existsSync(dir)) {
+        await fs.promises.mkdir(dir, { recursive: true })
+      }
+
+      await fs.promises.writeFile(this.tokenFilePath, encryptedToken)
     } catch (error) {
       logger.error('Failed to save token:', error as Error)
       throw new CopilotServiceError('无法保存访问令牌', error)
@@ -202,19 +242,22 @@ class CopilotService {
     try {
       this.updateHeaders(headers)
 
-      const encryptedToken = await fs.readFile(this.tokenFilePath)
+      const encryptedToken = await fs.promises.readFile(this.tokenFilePath)
       const access_token = safeStorage.decryptString(Buffer.from(encryptedToken))
 
-      const config: AxiosRequestConfig = {
+      const response = await net.fetch(CONFIG.API_URLS.COPILOT_TOKEN, {
+        method: 'GET',
         headers: {
           ...this.headers,
           authorization: `token ${access_token}`
         }
+      })
+
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status}: ${response.statusText}`)
       }
 
-      const response = await axios.get<CopilotTokenResponse>(CONFIG.API_URLS.COPILOT_TOKEN, config)
-
-      return response.data
+      return (await response.json()) as CopilotTokenResponse
     } catch (error) {
       logger.error('Failed to get Copilot token:', error as Error)
       throw new CopilotServiceError('无法获取Copilot令牌，请重新授权', error)
@@ -227,8 +270,8 @@ class CopilotService {
   public logout = async (): Promise<void> => {
     try {
       try {
-        await fs.access(this.tokenFilePath)
-        await fs.unlink(this.tokenFilePath)
+        await fs.promises.access(this.tokenFilePath)
+        await fs.promises.unlink(this.tokenFilePath)
         logger.debug('Successfully logged out from Copilot')
       } catch (error) {
         // 文件不存在不是错误，只是记录一下

src/main/services/FileStorage.ts

@@ -1,10 +1,22 @@
 import { loggerService } from '@logger'
-import { getFilesDir, getFileType, getTempDir, readTextFileWithAutoEncoding } from '@main/utils/file'
-import { documentExts, imageExts, MB } from '@shared/config/constant'
-import { FileMetadata } from '@types'
+import {
+  checkName,
+  getFilesDir,
+  getFileType,
+  getName,
+  getNotesDir,
+  getTempDir,
+  readTextFileWithAutoEncoding,
+  scanDir
+} from '@main/utils/file'
+import { documentExts, imageExts, KB, MB } from '@shared/config/constant'
+import { FileMetadata, NotesTreeNode } from '@types'
+import chardet from 'chardet'
+import chokidar, { FSWatcher } from 'chokidar'
 import * as crypto from 'crypto'
 import {
   dialog,
+  net,
   OpenDialogOptions,
   OpenDialogReturnValue,
   SaveDialogOptions,
@@ -14,6 +26,7 @@ import {
 import * as fs from 'fs'
 import { writeFileSync } from 'fs'
 import { readFile } from 'fs/promises'
+import { isBinaryFile } from 'isbinaryfile'
 import officeParser from 'officeparser'
 import * as path from 'path'
 import { PDFDocument } from 'pdf-lib'
@@ -23,9 +36,39 @@ import WordExtractor from 'word-extractor'
 
 const logger = loggerService.withContext('FileStorage')
 
+interface FileWatcherConfig {
+  watchExtensions?: string[]
+  ignoredPatterns?: (string | RegExp)[]
+  debounceMs?: number
+  maxDepth?: number
+  usePolling?: boolean
+  retryOnError?: boolean
+  retryDelayMs?: number
+  stabilityThreshold?: number
+  eventChannel?: string
+}
+
+const DEFAULT_WATCHER_CONFIG: Required<FileWatcherConfig> = {
+  watchExtensions: ['.md', '.markdown', '.txt'],
+  ignoredPatterns: [/(^|[/\\])\../, '**/node_modules/**', '**/.git/**', '**/*.tmp', '**/*.temp', '**/.DS_Store'],
+  debounceMs: 1000,
+  maxDepth: 10,
+  usePolling: false,
+  retryOnError: true,
+  retryDelayMs: 5000,
+  stabilityThreshold: 500,
+  eventChannel: 'file-change'
+}
+
 class FileStorage {
   private storageDir = getFilesDir()
+  private notesDir = getNotesDir()
   private tempDir = getTempDir()
+  private watcher?: FSWatcher
+  private watcherSender?: Electron.WebContents
+  private currentWatchPath?: string
+  private debounceTimer?: NodeJS.Timeout
+  private watcherConfig: Required<FileWatcherConfig> = DEFAULT_WATCHER_CONFIG
 
   constructor() {
     this.initStorageDir()
@@ -36,6 +79,9 @@ class FileStorage {
       if (!fs.existsSync(this.storageDir)) {
         fs.mkdirSync(this.storageDir, { recursive: true })
       }
+      if (!fs.existsSync(this.notesDir)) {
+        fs.mkdirSync(this.storageDir, { recursive: true })
+      }
       if (!fs.existsSync(this.tempDir)) {
         fs.mkdirSync(this.tempDir, { recursive: true })
       }
@@ -206,7 +252,7 @@ class FileStorage {
     const ext = path.extname(filePath)
     const fileType = getFileType(ext)
 
-    const fileInfo: FileMetadata = {
+    return {
       id: uuidv4(),
       origin_name: path.basename(filePath),
       name: path.basename(filePath),
@@ -217,8 +263,6 @@ class FileStorage {
       type: fileType,
       count: 1
     }
-
-    return fileInfo
   }
 
   // @TraceProperty({ spanName: 'deleteFile', tag: 'FileStorage' })
@@ -236,6 +280,122 @@ class FileStorage {
     await fs.promises.rm(path.join(this.storageDir, id), { recursive: true })
   }
 
+  public deleteExternalFile = async (_: Electron.IpcMainInvokeEvent, filePath: string): Promise<void> => {
+    try {
+      if (!fs.existsSync(filePath)) {
+        return
+      }
+
+      await fs.promises.rm(filePath, { force: true })
+      logger.debug(`External file deleted successfully: ${filePath}`)
+    } catch (error) {
+      logger.error('Failed to delete external file:', error as Error)
+      throw error
+    }
+  }
+
+  public deleteExternalDir = async (_: Electron.IpcMainInvokeEvent, dirPath: string): Promise<void> => {
+    try {
+      if (!fs.existsSync(dirPath)) {
+        return
+      }
+
+      await fs.promises.rm(dirPath, { recursive: true, force: true })
+      logger.debug(`External directory deleted successfully: ${dirPath}`)
+    } catch (error) {
+      logger.error('Failed to delete external directory:', error as Error)
+      throw error
+    }
+  }
+
+  public moveFile = async (_: Electron.IpcMainInvokeEvent, filePath: string, newPath: string): Promise<void> => {
+    try {
+      if (!fs.existsSync(filePath)) {
+        throw new Error(`Source file does not exist: ${filePath}`)
+      }
+
+      // 确保目标目录存在
+      const destDir = path.dirname(newPath)
+      if (!fs.existsSync(destDir)) {
+        await fs.promises.mkdir(destDir, { recursive: true })
+      }
+
+      // 移动文件
+      await fs.promises.rename(filePath, newPath)
+      logger.debug(`File moved successfully: ${filePath} to ${newPath}`)
+    } catch (error) {
+      logger.error('Move file failed:', error as Error)
+      throw error
+    }
+  }
+
+  public moveDir = async (_: Electron.IpcMainInvokeEvent, dirPath: string, newDirPath: string): Promise<void> => {
+    try {
+      if (!fs.existsSync(dirPath)) {
+        throw new Error(`Source directory does not exist: ${dirPath}`)
+      }
+
+      // 确保目标父目录存在
+      const parentDir = path.dirname(newDirPath)
+      if (!fs.existsSync(parentDir)) {
+        await fs.promises.mkdir(parentDir, { recursive: true })
+      }
+
+      // 移动目录
+      await fs.promises.rename(dirPath, newDirPath)
+      logger.debug(`Directory moved successfully: ${dirPath} to ${newDirPath}`)
+    } catch (error) {
+      logger.error('Move directory failed:', error as Error)
+      throw error
+    }
+  }
+
+  public renameFile = async (_: Electron.IpcMainInvokeEvent, filePath: string, newName: string): Promise<void> => {
+    try {
+      if (!fs.existsSync(filePath)) {
+        throw new Error(`Source file does not exist: ${filePath}`)
+      }
+
+      const dirPath = path.dirname(filePath)
+      const newFilePath = path.join(dirPath, newName + '.md')
+
+      // 如果目标文件已存在，抛出错误
+      if (fs.existsSync(newFilePath)) {
+        throw new Error(`Target file already exists: ${newFilePath}`)
+      }
+
+      // 重命名文件
+      await fs.promises.rename(filePath, newFilePath)
+      logger.debug(`File renamed successfully: ${filePath} to ${newFilePath}`)
+    } catch (error) {
+      logger.error('Rename file failed:', error as Error)
+      throw error
+    }
+  }
+
+  public renameDir = async (_: Electron.IpcMainInvokeEvent, dirPath: string, newName: string): Promise<void> => {
+    try {
+      if (!fs.existsSync(dirPath)) {
+        throw new Error(`Source directory does not exist: ${dirPath}`)
+      }
+
+      const parentDir = path.dirname(dirPath)
+      const newDirPath = path.join(parentDir, newName)
+
+      // 如果目标目录已存在，抛出错误
+      if (fs.existsSync(newDirPath)) {
+        throw new Error(`Target directory already exists: ${newDirPath}`)
+      }
+
+      // 重命名目录
+      await fs.promises.rename(dirPath, newDirPath)
+      logger.debug(`Directory renamed successfully: ${dirPath} to ${newDirPath}`)
+    } catch (error) {
+      logger.error('Rename directory failed:', error as Error)
+      throw error
+    }
+  }
+
   public readFile = async (
     _: Electron.IpcMainInvokeEvent,
     id: string,
@@ -279,6 +439,51 @@ class FileStorage {
     }
   }
 
+  public readExternalFile = async (
+    _: Electron.IpcMainInvokeEvent,
+    filePath: string,
+    detectEncoding: boolean = false
+  ): Promise<string> => {
+    if (!fs.existsSync(filePath)) {
+      throw new Error(`File does not exist: ${filePath}`)
+    }
+
+    const fileExtension = path.extname(filePath)
+
+    if (documentExts.includes(fileExtension)) {
+      const originalCwd = process.cwd()
+      try {
+        chdir(this.tempDir)
+
+        if (fileExtension === '.doc') {
+          const extractor = new WordExtractor()
+          const extracted = await extractor.extract(filePath)
+          chdir(originalCwd)
+          return extracted.getBody()
+        }
+
+        const data = await officeParser.parseOfficeAsync(filePath)
+        chdir(originalCwd)
+        return data
+      } catch (error) {
+        chdir(originalCwd)
+        logger.error('Failed to read file:', error as Error)
+        throw error
+      }
+    }
+
+    try {
+      if (detectEncoding) {
+        return readTextFileWithAutoEncoding(filePath)
+      } else {
+        return fs.readFileSync(filePath, 'utf-8')
+      }
+    } catch (error) {
+      logger.error('Failed to read file:', error as Error)
+      throw new Error(`Failed to read file: ${filePath}.`)
+    }
+  }
+
   public createTempFile = async (_: Electron.IpcMainInvokeEvent, fileName: string): Promise<string> => {
     if (!fs.existsSync(this.tempDir)) {
       fs.mkdirSync(this.tempDir, { recursive: true })
@@ -295,6 +500,32 @@ class FileStorage {
     await fs.promises.writeFile(filePath, data)
   }
 
+  public fileNameGuard = async (
+    _: Electron.IpcMainInvokeEvent,
+    dirPath: string,
+    fileName: string,
+    isFile: boolean
+  ): Promise<{ safeName: string; exists: boolean }> => {
+    const safeName = checkName(fileName)
+    const finalName = getName(dirPath, safeName, isFile)
+    const fullPath = path.join(dirPath, finalName + (isFile ? '.md' : ''))
+    const exists = fs.existsSync(fullPath)
+
+    logger.debug(`File name guard: ${fileName} -> ${finalName}, exists: ${exists}`)
+    return { safeName: finalName, exists }
+  }
+
+  public mkdir = async (_: Electron.IpcMainInvokeEvent, dirPath: string): Promise<string> => {
+    try {
+      logger.debug(`Attempting to create directory: ${dirPath}`)
+      await fs.promises.mkdir(dirPath, { recursive: true })
+      return dirPath
+    } catch (error) {
+      logger.error('Failed to create directory:', error as Error)
+      throw new Error(`Failed to create directory: ${dirPath}. Error: ${(error as Error).message}`)
+    }
+  }
+
   public base64Image = async (
     _: Electron.IpcMainInvokeEvent,
     id: string
@@ -337,7 +568,7 @@ class FileStorage {
 
       await fs.promises.writeFile(destPath, buffer)
 
-      const fileMetadata: FileMetadata = {
+      return {
         id: uuid,
         origin_name: uuid + ext,
         name: uuid + ext,
@@ -348,14 +579,84 @@ class FileStorage {
         type: getFileType(ext),
         count: 1
       }
-
-      return fileMetadata
     } catch (error) {
       logger.error('Failed to save base64 image:', error as Error)
       throw error
     }
   }
 
+  public savePastedImage = async (
+    _: Electron.IpcMainInvokeEvent,
+    imageData: Uint8Array | Buffer,
+    extension?: string
+  ): Promise<FileMetadata> => {
+    try {
+      const uuid = uuidv4()
+      const ext = extension || '.png'
+      const destPath = path.join(this.storageDir, uuid + ext)
+
+      logger.debug('Saving pasted image:', {
+        storageDir: this.storageDir,
+        destPath,
+        bufferSize: imageData.length
+      })
+
+      // 确保目录存在
+      if (!fs.existsSync(this.storageDir)) {
+        fs.mkdirSync(this.storageDir, { recursive: true })
+      }
+
+      // 确保 imageData 是 Buffer
+      const buffer = Buffer.isBuffer(imageData) ? imageData : Buffer.from(imageData)
+
+      // 如果图片大于1MB，进行压缩处理
+      if (buffer.length > MB) {
+        await this.compressImageBuffer(buffer, destPath, ext)
+      } else {
+        await fs.promises.writeFile(destPath, buffer)
+      }
+
+      const stats = await fs.promises.stat(destPath)
+
+      return {
+        id: uuid,
+        origin_name: `pasted_image_${uuid}${ext}`,
+        name: uuid + ext,
+        path: destPath,
+        created_at: new Date().toISOString(),
+        size: stats.size,
+        ext: ext.slice(1),
+        type: getFileType(ext),
+        count: 1
+      }
+    } catch (error) {
+      logger.error('Failed to save pasted image:', error as Error)
+      throw error
+    }
+  }
+
+  private async compressImageBuffer(imageBuffer: Buffer, destPath: string, ext: string): Promise<void> {
+    try {
+      // 创建临时文件
+      const tempPath = path.join(this.tempDir, `temp_${uuidv4()}${ext}`)
+      await fs.promises.writeFile(tempPath, imageBuffer)
+
+      // 使用现有的压缩方法
+      await this.compressImage(tempPath, destPath)
+
+      // 清理临时文件
+      try {
+        await fs.promises.unlink(tempPath)
+      } catch (error) {
+        logger.warn('Failed to cleanup temp file:', error as Error)
+      }
+    } catch (error) {
+      logger.error('Image buffer compression failed, saving original:', error as Error)
+      // 压缩失败时保存原始文件
+      await fs.promises.writeFile(destPath, imageBuffer)
+    }
+  }
+
   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)
@@ -381,7 +682,7 @@ class FileStorage {
 
   public clear = async (): Promise<void> => {
     await fs.promises.rm(this.storageDir, { recursive: true })
-    await this.initStorageDir()
+    this.initStorageDir()
   }
 
   public clearTemp = async (): Promise<void> => {
@@ -429,6 +730,7 @@ class FileStorage {
 
   /**
    * 通过相对路径打开文件，跨设备时使用
+   * @param _
    * @param file
    */
   public openFileWithRelativePath = async (_: Electron.IpcMainInvokeEvent, file: FileMetadata): Promise<void> => {
@@ -440,6 +742,79 @@ class FileStorage {
     }
   }
 
+  public getDirectoryStructure = async (_: Electron.IpcMainInvokeEvent, dirPath: string): Promise<NotesTreeNode[]> => {
+    try {
+      return await scanDir(dirPath)
+    } catch (error) {
+      logger.error('Failed to get directory structure:', error as Error)
+      throw error
+    }
+  }
+
+  public validateNotesDirectory = async (_: Electron.IpcMainInvokeEvent, dirPath: string): Promise<boolean> => {
+    try {
+      if (!dirPath || typeof dirPath !== 'string') {
+        return false
+      }
+
+      // Normalize path
+      const normalizedPath = path.resolve(dirPath)
+
+      // Check if directory exists
+      if (!fs.existsSync(normalizedPath)) {
+        return false
+      }
+
+      // Check if it's actually a directory
+      const stats = fs.statSync(normalizedPath)
+      if (!stats.isDirectory()) {
+        return false
+      }
+
+      // Get app paths to prevent selection of restricted directories
+      const appDataPath = path.resolve(process.env.APPDATA || path.join(require('os').homedir(), '.config'))
+      const filesDir = path.resolve(getFilesDir())
+      const currentNotesDir = path.resolve(getNotesDir())
+
+      // Prevent selecting app data directories
+      if (
+        normalizedPath.startsWith(filesDir) ||
+        normalizedPath.startsWith(appDataPath) ||
+        normalizedPath === currentNotesDir
+      ) {
+        logger.warn(`Invalid directory selection: ${normalizedPath} (app data directory)`)
+        return false
+      }
+
+      // Prevent selecting system root directories
+      const isSystemRoot =
+        process.platform === 'win32'
+          ? /^[a-zA-Z]:[\\/]?$/.test(normalizedPath)
+          : normalizedPath === '/' ||
+            normalizedPath === '/usr' ||
+            normalizedPath === '/etc' ||
+            normalizedPath === '/System'
+
+      if (isSystemRoot) {
+        logger.warn(`Invalid directory selection: ${normalizedPath} (system root directory)`)
+        return false
+      }
+
+      // Check write permissions
+      try {
+        fs.accessSync(normalizedPath, fs.constants.W_OK)
+      } catch (error) {
+        logger.warn(`Directory not writable: ${normalizedPath}`)
+        return false
+      }
+
+      return true
+    } catch (error) {
+      logger.error('Failed to validate notes directory:', error as Error)
+      return false
+    }
+  }
+
   public save = async (
     _: Electron.IpcMainInvokeEvent,
     fileName: string,
@@ -458,7 +833,7 @@ class FileStorage {
       }
 
       if (!result.canceled && result.filePath) {
-        await writeFileSync(result.filePath, content, { encoding: 'utf-8' })
+        writeFileSync(result.filePath, content, { encoding: 'utf-8' })
       }
 
       return result.filePath
@@ -509,7 +884,7 @@ class FileStorage {
     isUseContentType?: boolean
   ): Promise<FileMetadata> => {
     try {
-      const response = await fetch(url)
+      const response = await net.fetch(url)
       if (!response.ok) {
         throw new Error(`HTTP error! status: ${response.status}`)
       }
@@ -549,7 +924,7 @@ class FileStorage {
       const stats = await fs.promises.stat(destPath)
       const fileType = getFileType(ext)
 
-      const fileMetadata: FileMetadata = {
+      return {
         id: uuid,
         origin_name: filename,
         name: uuid + ext,
@@ -560,8 +935,6 @@ class FileStorage {
         type: fileType,
         count: 1
       }
-
-      return fileMetadata
     } catch (error) {
       logger.error('Download file error:', error as Error)
       throw error
@@ -626,9 +999,236 @@ class FileStorage {
     }
   }
 
+  public startFileWatcher = async (
+    event: Electron.IpcMainInvokeEvent,
+    dirPath: string,
+    config?: FileWatcherConfig
+  ): Promise<void> => {
+    try {
+      this.watcherConfig = { ...DEFAULT_WATCHER_CONFIG, ...config }
+
+      if (!dirPath?.trim()) {
+        throw new Error('Directory path is required')
+      }
+
+      const normalizedPath = path.resolve(dirPath.trim())
+
+      if (!fs.existsSync(normalizedPath)) {
+        throw new Error(`Directory does not exist: ${normalizedPath}`)
+      }
+
+      const stats = fs.statSync(normalizedPath)
+      if (!stats.isDirectory()) {
+        throw new Error(`Path is not a directory: ${normalizedPath}`)
+      }
+
+      if (this.currentWatchPath === normalizedPath && this.watcher) {
+        this.watcherSender = event.sender
+        logger.debug('Already watching directory, updated sender', { path: normalizedPath })
+        return
+      }
+
+      await this.stopFileWatcher()
+
+      logger.info('Starting file watcher', {
+        path: normalizedPath,
+        config: {
+          extensions: this.watcherConfig.watchExtensions,
+          debounceMs: this.watcherConfig.debounceMs,
+          maxDepth: this.watcherConfig.maxDepth
+        }
+      })
+
+      this.currentWatchPath = normalizedPath
+      this.watcherSender = event.sender
+
+      const watchOptions = {
+        ignored: this.watcherConfig.ignoredPatterns,
+        persistent: true,
+        ignoreInitial: true,
+        depth: this.watcherConfig.maxDepth,
+        usePolling: this.watcherConfig.usePolling,
+        awaitWriteFinish: {
+          stabilityThreshold: this.watcherConfig.stabilityThreshold,
+          pollInterval: 100
+        },
+        alwaysStat: false,
+        atomic: true
+      }
+
+      this.watcher = chokidar.watch(normalizedPath, watchOptions)
+
+      const handleChange = this.createChangeHandler()
+
+      this.watcher
+        .on('add', (filePath: string) => handleChange('add', filePath))
+        .on('unlink', (filePath: string) => handleChange('unlink', filePath))
+        .on('addDir', (dirPath: string) => handleChange('addDir', dirPath))
+        .on('unlinkDir', (dirPath: string) => handleChange('unlinkDir', dirPath))
+        .on('error', (error: unknown) => {
+          logger.error('File watcher error', { error: error as Error, path: normalizedPath })
+          if (this.watcherConfig.retryOnError) {
+            this.handleWatcherError(error as Error)
+          }
+        })
+        .on('ready', () => {
+          logger.debug('File watcher ready', { path: normalizedPath })
+        })
+
+      logger.info('File watcher started successfully')
+    } catch (error) {
+      logger.error('Failed to start file watcher', error as Error)
+      this.cleanup()
+      throw error
+    }
+  }
+
+  private createChangeHandler() {
+    return (eventType: string, filePath: string) => {
+      if (!this.shouldWatchFile(filePath, eventType)) {
+        return
+      }
+
+      logger.debug('File change detected', { eventType, filePath, path: this.currentWatchPath })
+
+      // 对于目录操作，立即触发同步，不使用防抖
+      if (eventType === 'addDir' || eventType === 'unlinkDir') {
+        logger.debug('Directory operation detected, triggering immediate sync', { eventType, filePath })
+        this.notifyChange(eventType, filePath)
+        return
+      }
+
+      // 对于文件操作，使用防抖机制
+      if (this.debounceTimer) {
+        clearTimeout(this.debounceTimer)
+      }
+
+      this.debounceTimer = setTimeout(() => {
+        this.notifyChange(eventType, filePath)
+        this.debounceTimer = undefined
+      }, this.watcherConfig.debounceMs)
+    }
+  }
+
+  private shouldWatchFile(filePath: string, eventType: string): boolean {
+    if (eventType.includes('Dir')) {
+      return true
+    }
+
+    const ext = path.extname(filePath).toLowerCase()
+    return this.watcherConfig.watchExtensions.includes(ext)
+  }
+
+  private notifyChange(eventType: string, filePath: string) {
+    try {
+      if (!this.watcherSender || this.watcherSender.isDestroyed()) {
+        logger.warn('Sender destroyed, stopping watcher')
+        this.stopFileWatcher()
+        return
+      }
+
+      logger.debug('Sending file change event', {
+        eventType,
+        filePath,
+        channel: this.watcherConfig.eventChannel,
+        senderExists: !!this.watcherSender,
+        senderDestroyed: this.watcherSender.isDestroyed()
+      })
+      this.watcherSender.send(this.watcherConfig.eventChannel, {
+        eventType,
+        filePath,
+        watchPath: this.currentWatchPath
+      })
+      logger.debug('File change event sent successfully')
+    } catch (error) {
+      logger.error('Failed to send notification', error as Error)
+    }
+  }
+
+  private handleWatcherError(error: Error) {
+    const retryableErrors = ['EMFILE', 'ENFILE', 'ENOSPC']
+    const isRetryable = retryableErrors.some((code) => error.message.includes(code))
+
+    if (isRetryable && this.currentWatchPath && this.watcherSender && !this.watcherSender.isDestroyed()) {
+      logger.warn('Attempting restart due to recoverable error', { error: error.message })
+
+      setTimeout(async () => {
+        try {
+          if (this.currentWatchPath && this.watcherSender && !this.watcherSender.isDestroyed()) {
+            const mockEvent = { sender: this.watcherSender } as Electron.IpcMainInvokeEvent
+            await this.startFileWatcher(mockEvent, this.currentWatchPath, this.watcherConfig)
+          }
+        } catch (retryError) {
+          logger.error('Restart failed', retryError as Error)
+        }
+      }, this.watcherConfig.retryDelayMs)
+    }
+  }
+
+  private cleanup() {
+    this.currentWatchPath = undefined
+    this.watcherSender = undefined
+    if (this.debounceTimer) {
+      clearTimeout(this.debounceTimer)
+      this.debounceTimer = undefined
+    }
+  }
+
+  public stopFileWatcher = async (): Promise<void> => {
+    try {
+      if (this.watcher) {
+        logger.info('Stopping file watcher', { path: this.currentWatchPath })
+        await this.watcher.close()
+        this.watcher = undefined
+        logger.debug('File watcher stopped')
+      }
+      this.cleanup()
+    } catch (error) {
+      logger.error('Failed to stop file watcher', error as Error)
+      this.watcher = undefined
+      this.cleanup()
+    }
+  }
+
+  public getWatcherStatus(): { isActive: boolean; watchPath?: string; hasValidSender: boolean } {
+    return {
+      isActive: !!this.watcher,
+      watchPath: this.currentWatchPath,
+      hasValidSender: !!this.watcherSender && !this.watcherSender.isDestroyed()
+    }
+  }
+
   public getFilePathById(file: FileMetadata): string {
     return path.join(this.storageDir, file.id + file.ext)
   }
+
+  public isTextFile = async (_: Electron.IpcMainInvokeEvent, filePath: string): Promise<boolean> => {
+    try {
+      const isBinary = await isBinaryFile(filePath)
+      if (isBinary) {
+        return false
+      }
+
+      const length = 8 * KB
+      const fileHandle = await fs.promises.open(filePath, 'r')
+      const buffer = Buffer.alloc(length)
+      const { bytesRead } = await fileHandle.read(buffer, 0, length, 0)
+      await fileHandle.close()
+
+      const sampleBuffer = buffer.subarray(0, bytesRead)
+      const matches = chardet.analyse(sampleBuffer)
+
+      // 如果检测到的编码置信度较高，认为是文本文件
+      if (matches.length > 0 && matches[0].confidence > 0.8) {
+        return true
+      }
+
+      return false
+    } catch (error) {
+      logger.error('Failed to check if file is text:', error as Error)
+      return false
+    }
+  }
 }
 
 export const fileStorage = new FileStorage()

src/main/services/FileSystemService.ts

@@ -1,3 +1,4 @@
+import { readTextFileWithAutoEncoding } from '@main/utils/file'
 import { TraceMethod } from '@mcp-trace/trace-core'
 import fs from 'fs/promises'
 
@@ -8,4 +9,15 @@ export default class FileService {
     if (encoding) return fs.readFile(path, { encoding })
     return fs.readFile(path)
   }
+
+  /**
+   * 自动识别编码，读取文本文件
+   * @param _ event
+   * @param pathOrUrl
+   * @throws 路径不存在时抛出错误
+   */
+  @TraceMethod({ spanName: 'readTextFileWithAutoEncoding', tag: 'FileService' })
+  public static async readTextFileWithAutoEncoding(_: Electron.IpcMainInvokeEvent, path: string): Promise<string> {
+    return readTextFileWithAutoEncoding(path)
+  }
 }

src/main/services/MCPService.ts

@@ -21,15 +21,23 @@ import {
   CancelledNotificationSchema,
   type GetPromptResult,
   LoggingMessageNotificationSchema,
-  ProgressNotificationSchema,
   PromptListChangedNotificationSchema,
   ResourceListChangedNotificationSchema,
   ResourceUpdatedNotificationSchema,
   ToolListChangedNotificationSchema
 } from '@modelcontextprotocol/sdk/types.js'
 import { nanoid } from '@reduxjs/toolkit'
-import type { GetResourceResponse, MCPCallToolResponse, MCPPrompt, MCPResource, MCPServer, MCPTool } from '@types'
-import { app } from 'electron'
+import {
+  BuiltinMCPServerNames,
+  type GetResourceResponse,
+  isBuiltinMCPServer,
+  type MCPCallToolResponse,
+  type MCPPrompt,
+  type MCPResource,
+  type MCPServer,
+  type MCPTool
+} from '@types'
+import { app, net } from 'electron'
 import { EventEmitter } from 'events'
 import { memoize } from 'lodash'
 import { v4 as uuidv4 } from 'uuid'
@@ -163,7 +171,7 @@ class McpService {
           StdioClientTransport | SSEClientTransport | InMemoryTransport | StreamableHTTPClientTransport
         > => {
           // Create appropriate transport based on configuration
-          if (server.type === 'inMemory') {
+          if (isBuiltinMCPServer(server) && server.name !== BuiltinMCPServerNames.mcpAutoInstall) {
             logger.debug(`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
@@ -205,7 +213,7 @@ class McpService {
                       }
                     }
 
-                    return fetch(url, { ...init, headers })
+                    return net.fetch(typeof url === 'string' ? url : url.toString(), { ...init, headers })
                   }
                 },
                 requestInit: {
@@ -432,15 +440,6 @@ class McpService {
         this.clearResourceCaches(serverKey)
       })
 
-      // Set up progress notification handler
-      client.setNotificationHandler(ProgressNotificationSchema, async (notification) => {
-        logger.debug(`Progress notification received for server: ${server.name}`, notification.params)
-        const mainWindow = windowService.getMainWindow()
-        if (mainWindow) {
-          mainWindow.webContents.send('mcp-progress', notification.params.progress / (notification.params.total || 1))
-        }
-      })
-
       // Set up cancelled notification handler
       client.setNotificationHandler(CancelledNotificationSchema, async (notification) => {
         logger.debug(`Operation cancelled for server: ${server.name}`, notification.params)
@@ -629,6 +628,11 @@ class McpService {
         const result = await client.callTool({ name, arguments: args }, undefined, {
           onprogress: (process) => {
             logger.debug(`Progress: ${process.progress / (process.total || 1)}`)
+            logger.debug(`Progress notification received for server: ${server.name}`, process)
+            const mainWindow = windowService.getMainWindow()
+            if (mainWindow) {
+              mainWindow.webContents.send('mcp-progress', process.progress / (process.total || 1))
+            }
           },
           timeout: server.timeout ? server.timeout * 1000 : 60000, // Default timeout of 1 minute,
           // 需要服务端支持: https://modelcontextprotocol.io/specification/2025-06-18/basic/lifecycle#timeouts

src/main/services/NotificationService.ts

@@ -1,14 +1,9 @@
-import { BrowserWindow, Notification as ElectronNotification } from 'electron'
+import { Notification as ElectronNotification } from 'electron'
 import { Notification } from 'src/renderer/src/types/notification'
 
+import { windowService } from './WindowService'
+
 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({
@@ -17,8 +12,8 @@ class NotificationService {
     })
 
     electronNotification.on('click', () => {
-      this.window.show()
-      this.window.webContents.send('notification-click', notification)
+      windowService.getMainWindow()?.show()
+      windowService.getMainWindow()?.webContents.send('notification-click', notification)
     })
 
     electronNotification.show()

src/main/services/NutstoreService.ts

@@ -2,6 +2,7 @@ import path from 'node:path'
 
 import { loggerService } from '@logger'
 import { NUTSTORE_HOST } from '@shared/config/nutstore'
+import { net } from 'electron'
 import { XMLParser } from 'fast-xml-parser'
 import { isNil, partial } from 'lodash'
 import { type FileStat } from 'webdav'
@@ -62,7 +63,7 @@ export async function getDirectoryContents(token: string, target: string): Promi
   let currentUrl = `${NUTSTORE_HOST}${target}`
 
   while (true) {
-    const response = await fetch(currentUrl, {
+    const response = await net.fetch(currentUrl, {
       method: 'PROPFIND',
       headers: {
         Authorization: `Basic ${token}`,

src/main/services/ObsidianVaultService.ts

@@ -32,7 +32,8 @@ class ObsidianVaultService {
       )
     } else {
       // Linux
-      this.obsidianConfigPath = path.join(app.getPath('home'), '.config', 'obsidian', 'obsidian.json')
+      this.obsidianConfigPath = this.resolveLinuxObsidianConfigPath()
+      logger.debug(`Resolved Obsidian config path (linux): ${this.obsidianConfigPath}`)
     }
   }
 
@@ -164,6 +165,57 @@ class ObsidianVaultService {
       return []
     }
   }
+
+  /**
+   * 在 Linux 下解析 Obsidian 配置文件路径，兼容多种安装方式。
+   * 优先返回第一个存在的路径；若均不存在，则返回 XDG 默认路径。
+   */
+  private resolveLinuxObsidianConfigPath(): string {
+    const home = app.getPath('home')
+    const xdgConfigHome = process.env.XDG_CONFIG_HOME || path.join(home, '.config')
+
+    // 常见目录名与文件名大小写差异做兼容
+    const configDirs = ['obsidian', 'Obsidian']
+    const fileNames = ['obsidian.json', 'Obsidian.json']
+
+    const candidates: string[] = []
+
+    // 1) AppImage/DEB（XDG 标准路径）
+    for (const dir of configDirs) {
+      for (const file of fileNames) {
+        candidates.push(path.join(xdgConfigHome, dir, file))
+      }
+    }
+
+    // 2) Snap 安装：
+    // - 常见：~/snap/obsidian/current/.config/obsidian/obsidian.json
+    // - 兼容：~/snap/obsidian/common/.config/obsidian/obsidian.json
+    for (const dir of configDirs) {
+      for (const file of fileNames) {
+        candidates.push(path.join(home, 'snap', 'obsidian', 'current', '.config', dir, file))
+        candidates.push(path.join(home, 'snap', 'obsidian', 'common', '.config', dir, file))
+      }
+    }
+
+    // 3) Flatpak 安装：~/.var/app/md.obsidian.Obsidian/config/obsidian/obsidian.json
+    for (const dir of configDirs) {
+      for (const file of fileNames) {
+        candidates.push(path.join(home, '.var', 'app', 'md.obsidian.Obsidian', 'config', dir, file))
+      }
+    }
+
+    const existing = candidates.find((p) => {
+      try {
+        return fs.existsSync(p)
+      } catch {
+        return false
+      }
+    })
+
+    if (existing) return existing
+
+    return path.join(xdgConfigHome, 'obsidian', 'obsidian.json')
+  }
 }
 
 export default ObsidianVaultService

src/main/services/ProxyManager.ts

@@ -11,14 +11,42 @@ import { Dispatcher, EnvHttpProxyAgent, getGlobalDispatcher, setGlobalDispatcher
 const logger = loggerService.withContext('ProxyManager')
 let byPassRules: string[] = []
 
-const isByPass = (hostname: string) => {
+const isByPass = (url: string) => {
   if (byPassRules.length === 0) {
     return false
   }
 
-  return byPassRules.includes(hostname)
-}
+  try {
+    const subjectUrlTokens = new URL(url)
+    for (const rule of byPassRules) {
+      const ruleMatch = rule.replace(/^(?<leadingDot>\.)/, '*').match(/^(?<hostname>.+?)(?::(?<port>\d+))?$/)
 
+      if (!ruleMatch || !ruleMatch.groups) {
+        logger.warn('Failed to parse bypass rule:', { rule })
+        continue
+      }
+
+      if (!ruleMatch.groups.hostname) {
+        continue
+      }
+
+      const hostnameIsMatch = subjectUrlTokens.hostname === ruleMatch.groups.hostname
+
+      if (
+        hostnameIsMatch &&
+        (!ruleMatch.groups ||
+          !ruleMatch.groups.port ||
+          (subjectUrlTokens.port && subjectUrlTokens.port === ruleMatch.groups.port))
+      ) {
+        return true
+      }
+    }
+    return false
+  } catch (error) {
+    logger.error('Failed to check bypass:', error as Error)
+    return false
+  }
+}
 class SelectiveDispatcher extends Dispatcher {
   private proxyDispatcher: Dispatcher
   private directDispatcher: Dispatcher
@@ -31,9 +59,7 @@ class SelectiveDispatcher extends Dispatcher {
 
   dispatch(opts: Dispatcher.DispatchOptions, handler: Dispatcher.DispatchHandlers) {
     if (opts.origin) {
-      const url = new URL(opts.origin)
-      // 检查是否为 localhost 或本地地址
-      if (isByPass(url.hostname)) {
+      if (isByPass(opts.origin.toString())) {
         return this.directDispatcher.dispatch(opts, handler)
       }
     }
@@ -93,15 +119,20 @@ export class ProxyManager {
     // Set new interval
     this.systemProxyInterval = setInterval(async () => {
       const currentProxy = await getSystemProxy()
-      if (currentProxy?.proxyUrl.toLowerCase() === this.config?.proxyRules) {
+      if (
+        currentProxy?.proxyUrl.toLowerCase() === this.config?.proxyRules &&
+        currentProxy?.noProxy.join(',').toLowerCase() === this.config?.proxyBypassRules?.toLowerCase()
+      ) {
         return
       }
 
-      logger.info(`system proxy changed: ${currentProxy?.proxyUrl}, this.config.proxyRules: ${this.config.proxyRules}`)
+      logger.info(
+        `system proxy changed: ${currentProxy?.proxyUrl}, this.config.proxyRules: ${this.config.proxyRules}, this.config.proxyBypassRules: ${this.config.proxyBypassRules}`
+      )
       await this.configureProxy({
         mode: 'system',
         proxyRules: currentProxy?.proxyUrl.toLowerCase(),
-        proxyBypassRules: undefined
+        proxyBypassRules: currentProxy?.noProxy.join(',')
       })
     }, 1000 * 60)
   }
@@ -151,6 +182,7 @@ export class ProxyManager {
       delete process.env.grpc_proxy
       delete process.env.http_proxy
       delete process.env.https_proxy
+      delete process.env.no_proxy
 
       delete process.env.SOCKS_PROXY
       delete process.env.ALL_PROXY
@@ -162,6 +194,7 @@ export class ProxyManager {
     process.env.HTTPS_PROXY = url
     process.env.http_proxy = url
     process.env.https_proxy = url
+    process.env.no_proxy = byPassRules.join(',')
 
     if (url.startsWith('socks')) {
       process.env.SOCKS_PROXY = url
@@ -229,8 +262,7 @@ export class ProxyManager {
 
       // filter localhost
       if (url) {
-        const hostname = typeof url === 'string' ? new URL(url).hostname : url.hostname
-        if (isByPass(hostname)) {
+        if (isByPass(url.toString())) {
           return originalMethod(url, options, callback)
         }
       }

src/main/services/SearchService.ts

@@ -1,6 +1,9 @@
 import { is } from '@electron-toolkit/utils'
+import { loggerService } from '@logger'
 import { BrowserWindow } from 'electron'
 
+const logger = loggerService.withContext('SearchService')
+
 export class SearchService {
   private static instance: SearchService | null = null
   private searchWindows: Record<string, BrowserWindow> = {}
@@ -55,6 +58,7 @@ export class SearchService {
 
   public async openUrlInSearchWindow(uid: string, url: string): Promise<any> {
     let window = this.searchWindows[uid]
+    logger.debug(`Searching with URL: ${url}`)
     if (window) {
       await window.loadURL(url)
     } else {

src/main/services/SelectionService.ts

@@ -416,7 +416,6 @@ export class SelectionService {
       hasShadow: false,
       thickFrame: false,
       roundedCorners: true,
-      backgroundMaterial: 'none',
 
       // Platform specific settings
       //   [macOS] DO NOT set focusable to false, it will make other windows bring to front together

src/main/services/ShortcutService.ts

@@ -204,7 +204,7 @@ export function registerShortcuts(window: BrowserWindow) {
             selectionAssistantSelectTextAccelerator = formatShortcutKey(shortcut.shortcut)
             break
 
-          //the following ZOOMs will register shortcuts seperately, so will return
+          //the following ZOOMs will register shortcuts separately, so will return
           case 'zoom_in':
             globalShortcut.register('CommandOrControl+=', () => handler(window))
             globalShortcut.register('CommandOrControl+numadd', () => handler(window))

src/main/services/WebviewService.ts

@@ -10,6 +10,13 @@ export function initSessionUserAgent() {
   const newUA = originUA.replace(/CherryStudio\/\S+\s/, '').replace(/Electron\/\S+\s/, '')
 
   wvSession.setUserAgent(newUA)
+  wvSession.webRequest.onBeforeSendHeaders((details, cb) => {
+    const headers = {
+      ...details.requestHeaders,
+      'User-Agent': newUA
+    }
+    cb({ requestHeaders: headers })
+  })
 }
 
 /**

src/main/services/WindowService.ts

@@ -5,6 +5,7 @@ import { is } from '@electron-toolkit/utils'
 import { loggerService } from '@logger'
 import { isDev, isLinux, isMac, isWin } from '@main/constant'
 import { getFilesDir } from '@main/utils/file'
+import { MIN_WINDOW_HEIGHT, MIN_WINDOW_WIDTH } from '@shared/config/constant'
 import { IpcChannel } from '@shared/IpcChannel'
 import { app, BrowserWindow, nativeTheme, screen, shell } from 'electron'
 import windowStateKeeper from 'electron-window-state'
@@ -47,8 +48,8 @@ export class WindowService {
     }
 
     const mainWindowState = windowStateKeeper({
-      defaultWidth: 960,
-      defaultHeight: 600,
+      defaultWidth: MIN_WINDOW_WIDTH,
+      defaultHeight: MIN_WINDOW_HEIGHT,
       fullScreen: false,
       maximize: false
     })
@@ -58,8 +59,8 @@ export class WindowService {
       y: mainWindowState.y,
       width: mainWindowState.width,
       height: mainWindowState.height,
-      minWidth: 960,
-      minHeight: 600,
+      minWidth: MIN_WINDOW_WIDTH,
+      minHeight: MIN_WINDOW_HEIGHT,
       show: false,
       autoHideMenuBar: true,
       transparent: false,
@@ -223,26 +224,26 @@ export class WindowService {
     })
 
     // 添加Escape键退出全屏的支持
-    mainWindow.webContents.on('before-input-event', (event, input) => {
-      // 当按下Escape键且窗口处于全屏状态时退出全屏
-      if (input.key === 'Escape' && !input.alt && !input.control && !input.meta && !input.shift) {
-        if (mainWindow.isFullScreen()) {
-          // 获取 shortcuts 配置
-          const shortcuts = configManager.getShortcuts()
-          const exitFullscreenShortcut = shortcuts.find((s) => s.key === 'exit_fullscreen')
-          if (exitFullscreenShortcut == undefined) {
-            mainWindow.setFullScreen(false)
-            return
-          }
-          if (exitFullscreenShortcut?.enabled) {
-            event.preventDefault()
-            mainWindow.setFullScreen(false)
-            return
-          }
-        }
-      }
-      return
-    })
+    // mainWindow.webContents.on('before-input-event', (event, input) => {
+    //   // 当按下Escape键且窗口处于全屏状态时退出全屏
+    //   if (input.key === 'Escape' && !input.alt && !input.control && !input.meta && !input.shift) {
+    //     if (mainWindow.isFullScreen()) {
+    //       // 获取 shortcuts 配置
+    //       const shortcuts = configManager.getShortcuts()
+    //       const exitFullscreenShortcut = shortcuts.find((s) => s.key === 'exit_fullscreen')
+    //       if (exitFullscreenShortcut == undefined) {
+    //         mainWindow.setFullScreen(false)
+    //         return
+    //       }
+    //       if (exitFullscreenShortcut?.enabled) {
+    //         event.preventDefault()
+    //         mainWindow.setFullScreen(false)
+    //         return
+    //       }
+    //     }
+    //   }
+    //   return
+    // })
   }
 
   private setupWebContentsHandlers(mainWindow: BrowserWindow) {
@@ -498,6 +499,8 @@ export class WindowService {
       }
     })
 
+    this.setupWebContentsHandlers(this.miniWindow)
+
     miniWindowState.manage(this.miniWindow)
 
     //miniWindow should show in current desktop
@@ -555,9 +558,9 @@ export class WindowService {
 
       // [Windows] hacky fix
       // the window is minimized only when in Windows platform
-      // because it's a workround for Windows, see `hideMiniWindow()`
+      // because it's a workaround for Windows, see `hideMiniWindow()`
       if (this.miniWindow?.isMinimized()) {
-        // don't let the window being seen before we finish adusting the position across screens
+        // don't let the window being seen before we finish adjusting the position across screens
         this.miniWindow?.setOpacity(0)
         // DO NOT use `restore()` here, Electron has the bug with screens of different scale factor
         // We have to use `show()` here, then set the position and bounds

src/main/services/ocr/OcrService.ts

@@ -0,0 +1,38 @@
+import { loggerService } from '@logger'
+import { isLinux } from '@main/constant'
+import { BuiltinOcrProviderIds, OcrHandler, OcrProvider, OcrResult, SupportedOcrFile } from '@types'
+
+import { systemOcrService } from './builtin/SystemOcrService'
+import { tesseractService } from './builtin/TesseractService'
+
+const logger = loggerService.withContext('OcrService')
+
+export class OcrService {
+  private registry: Map<string, OcrHandler> = new Map()
+
+  register(providerId: string, handler: OcrHandler): void {
+    if (this.registry.has(providerId)) {
+      logger.warn(`Provider ${providerId} has existing handler. Overwrited.`)
+    }
+    this.registry.set(providerId, handler)
+  }
+
+  unregister(providerId: string): void {
+    this.registry.delete(providerId)
+  }
+
+  public async ocr(file: SupportedOcrFile, provider: OcrProvider): Promise<OcrResult> {
+    const handler = this.registry.get(provider.id)
+    if (!handler) {
+      throw new Error(`Provider ${provider.id} is not registered`)
+    }
+    return handler(file, provider.config)
+  }
+}
+
+export const ocrService = new OcrService()
+
+// Register built-in providers
+ocrService.register(BuiltinOcrProviderIds.tesseract, tesseractService.ocr.bind(tesseractService))
+
+!isLinux && ocrService.register(BuiltinOcrProviderIds.system, systemOcrService.ocr.bind(systemOcrService))

src/main/services/ocr/builtin/OcrBaseService.ts

@@ -0,0 +1,5 @@
+import { OcrHandler } from '@types'
+
+export abstract class OcrBaseService {
+  abstract ocr: OcrHandler
+}

src/main/services/ocr/builtin/SystemOcrService.ts

@@ -0,0 +1,39 @@
+import { isLinux, isWin } from '@main/constant'
+import { loadOcrImage } from '@main/utils/ocr'
+import { OcrAccuracy, recognize } from '@napi-rs/system-ocr'
+import {
+  ImageFileMetadata,
+  isImageFileMetadata as isImageFileMetadata,
+  OcrResult,
+  OcrSystemConfig,
+  SupportedOcrFile
+} from '@types'
+
+import { OcrBaseService } from './OcrBaseService'
+
+// const logger = loggerService.withContext('SystemOcrService')
+export class SystemOcrService extends OcrBaseService {
+  constructor() {
+    super()
+  }
+
+  private async ocrImage(file: ImageFileMetadata, options?: OcrSystemConfig): Promise<OcrResult> {
+    if (isLinux) {
+      return { text: '' }
+    }
+    const buffer = await loadOcrImage(file)
+    const langs = isWin ? options?.langs : undefined
+    const result = await recognize(buffer, OcrAccuracy.Accurate, langs)
+    return { text: result.text }
+  }
+
+  public ocr = async (file: SupportedOcrFile, options?: OcrSystemConfig): Promise<OcrResult> => {
+    if (isImageFileMetadata(file)) {
+      return this.ocrImage(file, options)
+    } else {
+      throw new Error('Unsupported file type, currently only image files are supported')
+    }
+  }
+}
+
+export const systemOcrService = new SystemOcrService()

src/main/services/ocr/builtin/TesseractService.ts

@@ -0,0 +1,115 @@
+import { loggerService } from '@logger'
+import { getIpCountry } from '@main/utils/ipService'
+import { loadOcrImage } from '@main/utils/ocr'
+import { MB } from '@shared/config/constant'
+import { ImageFileMetadata, isImageFileMetadata, OcrResult, OcrTesseractConfig, SupportedOcrFile } from '@types'
+import { app } from 'electron'
+import fs from 'fs'
+import { isEqual } from 'lodash'
+import path from 'path'
+import Tesseract, { createWorker, LanguageCode } from 'tesseract.js'
+
+import { OcrBaseService } from './OcrBaseService'
+
+const logger = loggerService.withContext('TesseractService')
+
+// config
+const MB_SIZE_THRESHOLD = 50
+const defaultLangs = ['chi_sim', 'chi_tra', 'eng'] satisfies LanguageCode[]
+enum TesseractLangsDownloadUrl {
+  CN = 'https://gitcode.com/beyondkmp/tessdata-best/releases/download/1.0.0/'
+}
+
+export class TesseractService extends OcrBaseService {
+  private worker: Tesseract.Worker | null = null
+  private previousLangs: OcrTesseractConfig['langs']
+
+  constructor() {
+    super()
+    this.previousLangs = {}
+  }
+
+  async getWorker(options?: OcrTesseractConfig): Promise<Tesseract.Worker> {
+    let langsArray: LanguageCode[]
+    if (options?.langs) {
+      // TODO: use type safe objectKeys
+      langsArray = Object.keys(options.langs) as LanguageCode[]
+      if (langsArray.length === 0) {
+        logger.warn('Empty langs option. Fallback to defaultLangs.')
+        langsArray = defaultLangs
+      }
+    } else {
+      langsArray = defaultLangs
+    }
+    logger.debug('langsArray', langsArray)
+    if (!this.worker || !isEqual(this.previousLangs, langsArray)) {
+      if (this.worker) {
+        await this.dispose()
+      }
+      logger.debug('use langsArray to create worker', langsArray)
+      const langPath = await this._getLangPath()
+      const cachePath = await this._getCacheDir()
+      const promise = new Promise<Tesseract.Worker>((resolve, reject) => {
+        createWorker(langsArray, undefined, {
+          langPath,
+          cachePath,
+          logger: (m) => logger.debug('From worker', m),
+          errorHandler: (e) => {
+            logger.error('Worker Error', e)
+            reject(e)
+          }
+        })
+          .then(resolve)
+          .catch(reject)
+      })
+      this.worker = await promise
+    }
+    return this.worker
+  }
+
+  private async imageOcr(file: ImageFileMetadata, options?: OcrTesseractConfig): Promise<OcrResult> {
+    const worker = await this.getWorker(options)
+    const stat = await fs.promises.stat(file.path)
+    if (stat.size > MB_SIZE_THRESHOLD * MB) {
+      throw new Error(`This image is too large (max ${MB_SIZE_THRESHOLD}MB)`)
+    }
+    const buffer = await loadOcrImage(file)
+    const result = await worker.recognize(buffer)
+    return { text: result.data.text }
+  }
+
+  public ocr = async (file: SupportedOcrFile, options?: OcrTesseractConfig): Promise<OcrResult> => {
+    if (!isImageFileMetadata(file)) {
+      throw new Error('Only image files are supported currently')
+    }
+    return this.imageOcr(file, options)
+  }
+
+  private async _getLangPath(): Promise<string> {
+    const country = await getIpCountry()
+    return country.toLowerCase() === 'cn' ? TesseractLangsDownloadUrl.CN : ''
+  }
+
+  private async _getCacheDir(): Promise<string> {
+    const cacheDir = path.join(app.getPath('userData'), 'tesseract')
+    // use access to check if the directory exists
+    if (
+      !(await fs.promises
+        .access(cacheDir, fs.constants.F_OK)
+        .then(() => true)
+        .catch(() => false))
+    ) {
+      await fs.promises.mkdir(cacheDir, { recursive: true })
+    }
+    return cacheDir
+  }
+
+  async dispose(): Promise<void> {
+    if (this.worker) {
+      await this.worker.terminate()
+      this.worker = null
+    }
+  }
+}
+
+export const tesseractService = new TesseractService()

src/main/utils/file.ts

@@ -5,7 +5,7 @@ import path from 'node:path'
 
 import { loggerService } from '@logger'
 import { audioExts, documentExts, imageExts, MB, textExts, videoExts } from '@shared/config/constant'
-import { FileMetadata, FileTypes } from '@types'
+import { FileMetadata, FileTypes, NotesTreeNode } from '@types'
 import chardet from 'chardet'
 import { app } from 'electron'
 import iconv from 'iconv-lite'
@@ -148,6 +148,15 @@ export function getFilesDir() {
   return path.join(app.getPath('userData'), 'Data', 'Files')
 }
 
+export function getNotesDir() {
+  const notesDir = path.join(app.getPath('userData'), 'Data', 'Notes')
+  if (!fs.existsSync(notesDir)) {
+    fs.mkdirSync(notesDir, { recursive: true })
+    logger.info(`Notes directory created at: ${notesDir}`)
+  }
+  return notesDir
+}
+
 export function getConfigDir() {
   return path.join(os.homedir(), '.cherrystudio', 'config')
 }
@@ -168,6 +177,7 @@ export function getMcpDir() {
  * 读取文件内容并自动检测编码格式进行解码
  * @param filePath - 文件路径
  * @returns 解码后的文件内容
+ * @throws 如果路径不存在抛出错误
  */
 export async function readTextFileWithAutoEncoding(filePath: string): Promise<string> {
   const encoding = (await chardet.detectFile(filePath, { sampleSize: MB })) || 'UTF-8'
@@ -194,3 +204,215 @@ export async function readTextFileWithAutoEncoding(filePath: string): Promise<st
   logger.error(`File ${filePath} failed to decode with all possible encodings, trying UTF-8 encoding`)
   return iconv.decode(data, 'UTF-8')
 }
+
+/**
+ * 递归扫描目录，获取符合条件的文件和目录结构
+ * @param dirPath 当前要扫描的路径
+ * @param depth 当前深度
+ * @param basePath
+ * @returns 文件元数据数组
+ */
+export async function scanDir(dirPath: string, depth = 0, basePath?: string): Promise<NotesTreeNode[]> {
+  const options = {
+    includeFiles: true,
+    includeDirectories: true,
+    fileExtensions: ['.md'],
+    ignoreHiddenFiles: true,
+    recursive: true,
+    maxDepth: 10
+  }
+
+  // 如果是第一次调用，设置basePath为当前目录
+  if (!basePath) {
+    basePath = dirPath
+  }
+
+  if (options.maxDepth !== undefined && depth > options.maxDepth) {
+    return []
+  }
+
+  if (!fs.existsSync(dirPath)) {
+    loggerService.withContext('Utils:File').warn(`Dir not exist: ${dirPath}`)
+    return []
+  }
+
+  const entries = await fs.promises.readdir(dirPath, { withFileTypes: true })
+  const result: NotesTreeNode[] = []
+
+  for (const entry of entries) {
+    if (options.ignoreHiddenFiles && entry.name.startsWith('.')) {
+      continue
+    }
+
+    const entryPath = path.join(dirPath, entry.name)
+
+    const relativePath = path.relative(basePath, entryPath)
+    const treePath = '/' + relativePath.replace(/\\/g, '/')
+
+    if (entry.isDirectory() && options.includeDirectories) {
+      const stats = await fs.promises.stat(entryPath)
+      const dirTreeNode: NotesTreeNode = {
+        id: uuidv4(),
+        name: entry.name,
+        treePath: treePath,
+        externalPath: entryPath,
+        createdAt: stats.birthtime.toISOString(),
+        updatedAt: stats.mtime.toISOString(),
+        type: 'folder',
+        children: [] // 添加 children 属性
+      }
+
+      // 如果启用了递归扫描，则递归调用 scanDir
+      if (options.recursive) {
+        dirTreeNode.children = await scanDir(entryPath, depth + 1, basePath)
+      }
+
+      result.push(dirTreeNode)
+    } else if (entry.isFile() && options.includeFiles) {
+      const ext = path.extname(entry.name).toLowerCase()
+      if (options.fileExtensions.length > 0 && !options.fileExtensions.includes(ext)) {
+        continue
+      }
+
+      const stats = await fs.promises.stat(entryPath)
+      const name = entry.name.endsWith(options.fileExtensions[0])
+        ? entry.name.slice(0, -options.fileExtensions[0].length)
+        : entry.name
+
+      // 对于文件，treePath应该使用不带扩展名的路径
+      const nameWithoutExt = path.basename(entryPath, path.extname(entryPath))
+      const dirRelativePath = path.relative(basePath, path.dirname(entryPath))
+      const fileTreePath = dirRelativePath
+        ? `/${dirRelativePath.replace(/\\/g, '/')}/${nameWithoutExt}`
+        : `/${nameWithoutExt}`
+
+      const fileTreeNode: NotesTreeNode = {
+        id: uuidv4(),
+        name: name,
+        treePath: fileTreePath,
+        externalPath: entryPath,
+        createdAt: stats.birthtime.toISOString(),
+        updatedAt: stats.mtime.toISOString(),
+        type: 'file'
+      }
+      result.push(fileTreeNode)
+    }
+  }
+
+  return result
+}
+
+/**
+ * 文件名唯一性约束
+ * @param baseDir 基础目录
+ * @param fileName 文件名
+ * @param isFile 是否为文件
+ * @returns 唯一的文件名
+ */
+export function getName(baseDir: string, fileName: string, isFile: boolean): string {
+  // 首先清理文件名
+  const baseName = sanitizeFilename(fileName)
+  let candidate = isFile ? baseName + '.md' : baseName
+  let counter = 1
+
+  while (fs.existsSync(path.join(baseDir, candidate))) {
+    candidate = isFile ? `${baseName}${counter}.md` : `${baseName}${counter}`
+    counter++
+  }
+
+  return isFile ? candidate.slice(0, -3) : candidate
+}
+
+/**
+ * 文件名合法性校验
+ * @param fileName 文件名
+ * @param platform 平台，默认为当前运行平台
+ * @returns 验证结果
+ */
+export function validateFileName(fileName: string, platform = process.platform): { valid: boolean; error?: string } {
+  if (!fileName) {
+    return { valid: false, error: 'File name cannot be empty' }
+  }
+
+  // 通用检查
+  if (fileName.length === 0 || fileName.length > 255) {
+    return { valid: false, error: 'File name length must be between 1 and 255 characters' }
+  }
+
+  // 检查 null 字符（所有系统都不允许）
+  if (fileName.includes('\0')) {
+    return { valid: false, error: 'File name cannot contain null characters.' }
+  }
+
+  // Windows 特殊限制
+  if (platform === 'win32') {
+    const winInvalidChars = /[<>:"/\\|?*]/
+    if (winInvalidChars.test(fileName)) {
+      return { valid: false, error: 'File name contains characters not supported by Windows: < > : " / \\ | ? *' }
+    }
+
+    const reservedNames = /^(CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])(\.|$)/i
+    if (reservedNames.test(fileName)) {
+      return { valid: false, error: 'File name is a Windows reserved name.' }
+    }
+
+    if (fileName.endsWith('.') || fileName.endsWith(' ')) {
+      return { valid: false, error: 'File name cannot end with a dot or a space' }
+    }
+  }
+
+  // Unix/Linux/macOS 限制
+  if (platform !== 'win32') {
+    if (fileName.includes('/')) {
+      return { valid: false, error: 'File name cannot contain slashes /' }
+    }
+  }
+
+  // macOS 额外限制
+  if (platform === 'darwin') {
+    if (fileName.includes(':')) {
+      return { valid: false, error: 'macOS filenames cannot contain a colon :' }
+    }
+  }
+
+  return { valid: true }
+}
+
+/**
+ * 文件名合法性检查
+ * @param fileName 文件名
+ * @throws 如果文件名不合法则抛出异常
+ * @returns 合法的文件名
+ */
+export function checkName(fileName: string): string {
+  const validation = validateFileName(fileName)
+  if (!validation.valid) {
+    throw new Error(`Invalid file name: ${fileName}. ${validation.error}`)
+  }
+  return fileName
+}
+
+/**
+ * 清理文件名，替换不合法字符
+ * @param fileName 原始文件名
+ * @param replacement 替换字符，默认为下划线
+ * @returns 清理后的文件名
+ */
+export function sanitizeFilename(fileName: string, replacement = '_'): string {
+  if (!fileName) return ''
+
+  // 移除或替换非法字符
+  let sanitized = fileName
+    // eslint-disable-next-line no-control-regex
+    .replace(/[<>:"/\\|?*\x00-\x1f]/g, replacement) // Windows 非法字符
+    .replace(/^(CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])(\.|$)/i, replacement + '$2') // Windows 保留名
+    .replace(/[\s.]+$/, '') // 移除末尾的空格和点
+    .substring(0, 255) // 限制长度
+
+  // 确保不为空
+  if (!sanitized) {
+    sanitized = 'untitled'
+  }
+
+  return sanitized
+}

src/main/utils/ipService.ts

@@ -1,4 +1,5 @@
 import { loggerService } from '@logger'
+import { net } from 'electron'
 
 const logger = loggerService.withContext('IpService')
 
@@ -12,7 +13,7 @@ export async function getIpCountry(): Promise<string> {
     const controller = new AbortController()
     const timeoutId = setTimeout(() => controller.abort(), 5000)
 
-    const ipinfo = await fetch('https://ipinfo.io/json', {
+    const ipinfo = await net.fetch('https://ipinfo.io/json', {
       signal: controller.signal,
       headers: {
         'User-Agent':

src/main/utils/ocr.ts

@@ -0,0 +1,28 @@
+import { ImageFileMetadata } from '@types'
+import { readFile } from 'fs/promises'
+import sharp from 'sharp'
+
+const preprocessImage = async (buffer: Buffer): Promise<Buffer> => {
+  return sharp(buffer)
+    .grayscale() // 转为灰度
+    .normalize()
+    .sharpen()
+    .png({ quality: 100 })
+    .toBuffer()
+}
+
+/**
+ * 加载并预处理OCR图像
+ * @param file - 图像文件元数据
+ * @returns 预处理后的图像Buffer
+ * @throws {Error} 当文件不存在或无法读取时抛出错误；当图像预处理失败时抛出错误
+ *
+ * 预处理步骤:
+ * 1. 读取图像文件
+ * 2. 转换为灰度图
+ * 3. 后续可扩展其他预处理步骤
+ */
+export const loadOcrImage = async (file: ImageFileMetadata): Promise<Buffer> => {
+  const buffer = await readFile(file.path)
+  return preprocessImage(buffer)
+}

src/preload/index.ts

@@ -4,6 +4,7 @@ import { SpanEntity, TokenUsage } from '@mcp-trace/trace-core'
 import { SpanContext } from '@opentelemetry/api'
 import { UpgradeChannel } from '@shared/config/constant'
 import type { LogLevel, LogSourceWithContext } from '@shared/config/logger'
+import type { FileChangeEvent } from '@shared/config/types'
 import { IpcChannel } from '@shared/IpcChannel'
 import {
   AddMemoryOptions,
@@ -17,9 +18,12 @@ import {
   MemoryConfig,
   MemoryListOptions,
   MemorySearchOptions,
+  OcrProvider,
+  OcrResult,
   Provider,
   S3Config,
   Shortcut,
+  SupportedOcrFile,
   ThemeMode,
   WebDavConfig
 } from '@types'
@@ -76,6 +80,8 @@ const api = {
   clearCache: () => ipcRenderer.invoke(IpcChannel.App_ClearCache),
   logToMain: (source: LogSourceWithContext, level: LogLevel, message: string, data: any[]) =>
     ipcRenderer.invoke(IpcChannel.App_LogToMain, source, level, message, data),
+  setFullScreen: (value: boolean): Promise<void> => ipcRenderer.invoke(IpcChannel.App_SetFullScreen, value),
+  isFullScreen: (): Promise<boolean> => ipcRenderer.invoke(IpcChannel.App_IsFullScreen),
   mac: {
     isProcessTrusted: (): Promise<boolean> => ipcRenderer.invoke(IpcChannel.App_MacIsProcessTrusted),
     requestProcessTrust: (): Promise<boolean> => ipcRenderer.invoke(IpcChannel.App_MacRequestProcessTrust)
@@ -132,47 +138,66 @@ const api = {
     checkS3Connection: (s3Config: S3Config) => ipcRenderer.invoke(IpcChannel.Backup_CheckS3Connection, s3Config)
   },
   file: {
-    select: (options?: OpenDialogOptions) => ipcRenderer.invoke(IpcChannel.File_Select, options),
+    select: (options?: OpenDialogOptions): Promise<FileMetadata[] | null> =>
+      ipcRenderer.invoke(IpcChannel.File_Select, options),
     upload: (file: FileMetadata) => ipcRenderer.invoke(IpcChannel.File_Upload, file),
     delete: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_Delete, fileId),
     deleteDir: (dirPath: string) => ipcRenderer.invoke(IpcChannel.File_DeleteDir, dirPath),
+    deleteExternalFile: (filePath: string) => ipcRenderer.invoke(IpcChannel.File_DeleteExternalFile, filePath),
+    deleteExternalDir: (dirPath: string) => ipcRenderer.invoke(IpcChannel.File_DeleteExternalDir, dirPath),
+    move: (path: string, newPath: string) => ipcRenderer.invoke(IpcChannel.File_Move, path, newPath),
+    moveDir: (dirPath: string, newDirPath: string) => ipcRenderer.invoke(IpcChannel.File_MoveDir, dirPath, newDirPath),
+    rename: (path: string, newName: string) => ipcRenderer.invoke(IpcChannel.File_Rename, path, newName),
+    renameDir: (dirPath: string, newName: string) => ipcRenderer.invoke(IpcChannel.File_RenameDir, dirPath, newName),
     read: (fileId: string, detectEncoding?: boolean) =>
       ipcRenderer.invoke(IpcChannel.File_Read, fileId, detectEncoding),
+    readExternal: (filePath: string, detectEncoding?: boolean) =>
+      ipcRenderer.invoke(IpcChannel.File_ReadExternal, filePath, detectEncoding),
     clear: (spanContext?: SpanContext) => ipcRenderer.invoke(IpcChannel.File_Clear, spanContext),
-    get: (filePath: string) => ipcRenderer.invoke(IpcChannel.File_Get, filePath),
-    /**
-     * 创建一个空的临时文件
-     * @param fileName 文件名
-     * @returns 临时文件路径
-     */
+    get: (filePath: string): Promise<FileMetadata | null> => ipcRenderer.invoke(IpcChannel.File_Get, filePath),
     createTempFile: (fileName: string): Promise<string> => ipcRenderer.invoke(IpcChannel.File_CreateTempFile, fileName),
-    /**
-     * 写入文件
-     * @param filePath 文件路径
-     * @param data 数据
-     */
+    mkdir: (dirPath: string) => ipcRenderer.invoke(IpcChannel.File_Mkdir, dirPath),
     write: (filePath: string, data: Uint8Array | string) => ipcRenderer.invoke(IpcChannel.File_Write, filePath, data),
-
     writeWithId: (id: string, content: string) => ipcRenderer.invoke(IpcChannel.File_WriteWithId, id, content),
     open: (options?: OpenDialogOptions) => ipcRenderer.invoke(IpcChannel.File_Open, options),
     openPath: (path: string) => ipcRenderer.invoke(IpcChannel.File_OpenPath, path),
     save: (path: string, content: string | NodeJS.ArrayBufferView, options?: any) =>
       ipcRenderer.invoke(IpcChannel.File_Save, path, content, options),
-    selectFolder: (spanContext?: SpanContext) => ipcRenderer.invoke(IpcChannel.File_SelectFolder, spanContext),
+    selectFolder: (options?: OpenDialogOptions) => ipcRenderer.invoke(IpcChannel.File_SelectFolder, options),
     saveImage: (name: string, data: string) => ipcRenderer.invoke(IpcChannel.File_SaveImage, name, data),
     binaryImage: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_BinaryImage, fileId),
     base64Image: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_Base64Image, fileId),
     saveBase64Image: (data: string) => ipcRenderer.invoke(IpcChannel.File_SaveBase64Image, data),
+    savePastedImage: (imageData: Uint8Array, extension?: string) =>
+      ipcRenderer.invoke(IpcChannel.File_SavePastedImage, imageData, extension),
     download: (url: string, isUseContentType?: boolean) =>
       ipcRenderer.invoke(IpcChannel.File_Download, url, isUseContentType),
     copy: (fileId: string, destPath: string) => ipcRenderer.invoke(IpcChannel.File_Copy, fileId, destPath),
     base64File: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_Base64File, fileId),
     pdfInfo: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_GetPdfInfo, fileId),
     getPathForFile: (file: File) => webUtils.getPathForFile(file),
-    openFileWithRelativePath: (file: FileMetadata) => ipcRenderer.invoke(IpcChannel.File_OpenWithRelativePath, file)
+    openFileWithRelativePath: (file: FileMetadata) => ipcRenderer.invoke(IpcChannel.File_OpenWithRelativePath, file),
+    isTextFile: (filePath: string): Promise<boolean> => ipcRenderer.invoke(IpcChannel.File_IsTextFile, filePath),
+    getDirectoryStructure: (dirPath: string) => ipcRenderer.invoke(IpcChannel.File_GetDirectoryStructure, dirPath),
+    checkFileName: (dirPath: string, fileName: string, isFile: boolean) =>
+      ipcRenderer.invoke(IpcChannel.File_CheckFileName, dirPath, fileName, isFile),
+    validateNotesDirectory: (dirPath: string) => ipcRenderer.invoke(IpcChannel.File_ValidateNotesDirectory, dirPath),
+    startFileWatcher: (dirPath: string, config?: any) =>
+      ipcRenderer.invoke(IpcChannel.File_StartWatcher, dirPath, config),
+    stopFileWatcher: () => ipcRenderer.invoke(IpcChannel.File_StopWatcher),
+    onFileChange: (callback: (data: FileChangeEvent) => void) => {
+      const listener = (_event: Electron.IpcRendererEvent, data: any) => {
+        if (data && typeof data === 'object') {
+          callback(data)
+        }
+      }
+      ipcRenderer.on('file-change', listener)
+      return () => ipcRenderer.off('file-change', listener)
+    }
   },
   fs: {
-    read: (pathOrUrl: string, encoding?: BufferEncoding) => ipcRenderer.invoke(IpcChannel.Fs_Read, pathOrUrl, encoding)
+    read: (pathOrUrl: string, encoding?: BufferEncoding) => ipcRenderer.invoke(IpcChannel.Fs_Read, pathOrUrl, encoding),
+    readText: (pathOrUrl: string): Promise<string> => ipcRenderer.invoke(IpcChannel.Fs_ReadText, pathOrUrl)
   },
   export: {
     toWord: (markdown: string, fileName: string) => ipcRenderer.invoke(IpcChannel.Export_Word, markdown, fileName)
@@ -295,7 +320,8 @@ const api = {
       return ipcRenderer.invoke(IpcChannel.Mcp_UploadDxt, buffer, file.name)
     },
     abortTool: (callId: string) => ipcRenderer.invoke(IpcChannel.Mcp_AbortTool, callId),
-    getServerVersion: (server: MCPServer) => ipcRenderer.invoke(IpcChannel.Mcp_GetServerVersion, server)
+    getServerVersion: (server: MCPServer): Promise<string | null> =>
+      ipcRenderer.invoke(IpcChannel.Mcp_GetServerVersion, server)
   },
   python: {
     execute: (script: string, context?: Record<string, any>, timeout?: number) =>
@@ -403,6 +429,14 @@ const api = {
       env: Record<string, string>,
       options?: { autoUpdateToLatest?: boolean }
     ) => ipcRenderer.invoke(IpcChannel.CodeTools_Run, cliTool, model, directory, env, options)
+  },
+  ocr: {
+    ocr: (file: SupportedOcrFile, provider: OcrProvider): Promise<OcrResult> =>
+      ipcRenderer.invoke(IpcChannel.OCR_ocr, file, provider)
+  },
+  cherryin: {
+    generateSignature: (params: { method: string; path: string; query: string; body: Record<string, any> }) =>
+      ipcRenderer.invoke(IpcChannel.Cherryin_GetSignature, params)
   }
 }
 

src/renderer/miniWindow.html

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

src/renderer/src/App.tsx

@@ -2,6 +2,7 @@ import '@renderer/databases'
 
 import { loggerService } from '@logger'
 import store, { persistor } from '@renderer/store'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { Provider } from 'react-redux'
 import { PersistGate } from 'redux-persist/integration/react'
 
@@ -15,26 +16,38 @@ import Router from './Router'
 
 const logger = loggerService.withContext('App.tsx')
 
+// 创建 React Query 客户端
+const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      staleTime: 5 * 60 * 1000, // 5 minutes
+      refetchOnWindowFocus: false
+    }
+  }
+})
+
 function App(): React.ReactElement {
   logger.info('App initialized')
 
   return (
     <Provider store={store}>
-      <StyleSheetManager>
-        <ThemeProvider>
-          <AntdProvider>
-            <NotificationProvider>
-              <CodeStyleProvider>
-                <PersistGate loading={null} persistor={persistor}>
-                  <TopViewContainer>
-                    <Router />
-                  </TopViewContainer>
-                </PersistGate>
-              </CodeStyleProvider>
-            </NotificationProvider>
-          </AntdProvider>
-        </ThemeProvider>
-      </StyleSheetManager>
+      <QueryClientProvider client={queryClient}>
+        <StyleSheetManager>
+          <ThemeProvider>
+            <AntdProvider>
+              <NotificationProvider>
+                <CodeStyleProvider>
+                  <PersistGate loading={null} persistor={persistor}>
+                    <TopViewContainer>
+                      <Router />
+                    </TopViewContainer>
+                  </PersistGate>
+                </CodeStyleProvider>
+              </NotificationProvider>
+            </AntdProvider>
+          </ThemeProvider>
+        </StyleSheetManager>
+      </QueryClientProvider>
     </Provider>
   )
 }

src/renderer/src/Router.tsx

@@ -4,6 +4,7 @@ import { FC, useMemo } from 'react'
 import { HashRouter, Route, Routes } from 'react-router-dom'
 
 import Sidebar from './components/app/Sidebar'
+import { ErrorBoundary } from './components/ErrorBoundary'
 import TabsContainer from './components/Tab/TabContainer'
 import NavigationHandler from './handler/NavigationHandler'
 import { useNavbarPosition } from './hooks/useSettings'
@@ -14,6 +15,7 @@ import HomePage from './pages/home/HomePage'
 import KnowledgePage from './pages/knowledge/KnowledgePage'
 import LaunchpadPage from './pages/launchpad/LaunchpadPage'
 import MinAppsPage from './pages/minapps/MinAppsPage'
+import NotesPage from './pages/notes/NotesPage'
 import PaintingsRoutePage from './pages/paintings/PaintingsRoutePage'
 import SettingsPage from './pages/settings/SettingsPage'
 import TranslatePage from './pages/translate/TranslatePage'
@@ -23,18 +25,21 @@ const Router: FC = () => {
 
   const routes = useMemo(() => {
     return (
-      <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={<MinAppsPage />} />
-        <Route path="/code" element={<CodeToolsPage />} />
-        <Route path="/settings/*" element={<SettingsPage />} />
-        <Route path="/launchpad" element={<LaunchpadPage />} />
-      </Routes>
+      <ErrorBoundary>
+        <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="/notes" element={<NotesPage />} />
+          <Route path="/knowledge" element={<KnowledgePage />} />
+          <Route path="/apps" element={<MinAppsPage />} />
+          <Route path="/code" element={<CodeToolsPage />} />
+          <Route path="/settings/*" element={<SettingsPage />} />
+          <Route path="/launchpad" element={<LaunchpadPage />} />
+        </Routes>
+      </ErrorBoundary>
     )
   }, [])
 

src/renderer/src/aiCore/__tests__/index.clientCompatibilityTypes.test.ts

@@ -1,9 +1,9 @@
-import { AihubmixAPIClient } from '@renderer/aiCore/clients/AihubmixAPIClient'
+import { AihubmixAPIClient } from '@renderer/aiCore/clients/aihubmix/AihubmixAPIClient'
 import { AnthropicAPIClient } from '@renderer/aiCore/clients/anthropic/AnthropicAPIClient'
 import { ApiClientFactory } from '@renderer/aiCore/clients/ApiClientFactory'
 import { GeminiAPIClient } from '@renderer/aiCore/clients/gemini/GeminiAPIClient'
 import { VertexAPIClient } from '@renderer/aiCore/clients/gemini/VertexAPIClient'
-import { NewAPIClient } from '@renderer/aiCore/clients/NewAPIClient'
+import { NewAPIClient } from '@renderer/aiCore/clients/newapi/NewAPIClient'
 import { OpenAIAPIClient } from '@renderer/aiCore/clients/openai/OpenAIApiClient'
 import { OpenAIResponseAPIClient } from '@renderer/aiCore/clients/openai/OpenAIResponseAPIClient'
 import { EndpointType, Model, Provider } from '@renderer/types'
@@ -16,6 +16,7 @@ vi.mock('@renderer/config/models', () => ({
       { id: 'gpt-4', name: 'GPT-4' },
       { id: 'gpt-4', name: 'GPT-4' }
     ],
+    zhipu: [],
     silicon: [],
     openai: [],
     anthropic: [],
@@ -32,7 +33,13 @@ vi.mock('@renderer/config/models', () => ({
   isWebSearchModel: vi.fn().mockReturnValue(false),
   findTokenLimit: vi.fn().mockReturnValue(4096),
   isFunctionCallingModel: vi.fn().mockReturnValue(false),
-  DEFAULT_MAX_TOKENS: 4096
+  DEFAULT_MAX_TOKENS: 4096,
+  glm45FlashModel: {
+    id: 'glm-4.5-flash',
+    name: 'GLM-4.5-Flash',
+    provider: 'cherryin',
+    group: 'GLM-4.5'
+  }
 }))
 
 vi.mock('@renderer/services/AssistantService', () => ({

src/renderer/src/aiCore/clients/ApiClientFactory.ts

@@ -1,16 +1,18 @@
 import { loggerService } from '@logger'
 import { Provider } from '@renderer/types'
 
-import { AihubmixAPIClient } from './AihubmixAPIClient'
+import { AihubmixAPIClient } from './aihubmix/AihubmixAPIClient'
 import { AnthropicAPIClient } from './anthropic/AnthropicAPIClient'
 import { AwsBedrockAPIClient } from './aws/AwsBedrockAPIClient'
 import { BaseApiClient } from './BaseApiClient'
+import { CherryinAPIClient } from './cherryin/CherryinAPIClient'
 import { GeminiAPIClient } from './gemini/GeminiAPIClient'
 import { VertexAPIClient } from './gemini/VertexAPIClient'
-import { NewAPIClient } from './NewAPIClient'
+import { NewAPIClient } from './newapi/NewAPIClient'
 import { OpenAIAPIClient } from './openai/OpenAIApiClient'
 import { OpenAIResponseAPIClient } from './openai/OpenAIResponseAPIClient'
 import { PPIOAPIClient } from './ppio/PPIOAPIClient'
+import { ZhipuAPIClient } from './zhipu/ZhipuAPIClient'
 
 const logger = loggerService.withContext('ApiClientFactory')
 
@@ -31,24 +33,36 @@ export class ApiClientFactory {
 
     let instance: BaseApiClient
 
-    // 首先检查特殊的provider id
+    // 首先检查特殊的 Provider ID
+    if (provider.id === 'cherryin') {
+      instance = new CherryinAPIClient(provider) as BaseApiClient
+      return instance
+    }
+
     if (provider.id === 'aihubmix') {
       logger.debug(`Creating AihubmixAPIClient for provider: ${provider.id}`)
       instance = new AihubmixAPIClient(provider) as BaseApiClient
       return instance
     }
+
     if (provider.id === 'new-api') {
       logger.debug(`Creating NewAPIClient for provider: ${provider.id}`)
       instance = new NewAPIClient(provider) as BaseApiClient
       return instance
     }
+
     if (provider.id === 'ppio') {
       logger.debug(`Creating PPIOAPIClient for provider: ${provider.id}`)
       instance = new PPIOAPIClient(provider) as BaseApiClient
       return instance
     }
 
-    // 然后检查标准的provider type
+    if (provider.id === 'zhipu') {
+      instance = new ZhipuAPIClient(provider) as BaseApiClient
+      return instance
+    }
+
+    // 然后检查标准的 Provider Type
     switch (provider.type) {
       case 'openai':
         instance = new OpenAIAPIClient(provider) as BaseApiClient
@@ -78,8 +92,3 @@ export class ApiClientFactory {
     return instance
   }
 }
-
-// 移除这个函数，它已经移动到 utils/index.ts
-// export function isOpenAIProvider(provider: Provider) {
-//   return !['anthropic', 'gemini'].includes(provider.type)
-// }

src/renderer/src/aiCore/clients/__tests__/ApiClientFactory.test.ts

@@ -2,12 +2,13 @@ import { Provider } from '@renderer/types'
 import { isOpenAIProvider } from '@renderer/utils'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-import { AihubmixAPIClient } from '../AihubmixAPIClient'
+import { AihubmixAPIClient } from '../aihubmix/AihubmixAPIClient'
 import { AnthropicAPIClient } from '../anthropic/AnthropicAPIClient'
 import { ApiClientFactory } from '../ApiClientFactory'
+import { AwsBedrockAPIClient } from '../aws/AwsBedrockAPIClient'
 import { GeminiAPIClient } from '../gemini/GeminiAPIClient'
 import { VertexAPIClient } from '../gemini/VertexAPIClient'
-import { NewAPIClient } from '../NewAPIClient'
+import { NewAPIClient } from '../newapi/NewAPIClient'
 import { OpenAIAPIClient } from '../openai/OpenAIApiClient'
 import { OpenAIResponseAPIClient } from '../openai/OpenAIResponseAPIClient'
 import { PPIOAPIClient } from '../ppio/PPIOAPIClient'
@@ -25,7 +26,7 @@ const createTestProvider = (id: string, type: string): Provider => ({
 })
 
 // Mock 所有客户端模块
-vi.mock('../AihubmixAPIClient', () => ({
+vi.mock('../aihubmix/AihubmixAPIClient', () => ({
   AihubmixAPIClient: vi.fn().mockImplementation(() => ({}))
 }))
 vi.mock('../anthropic/AnthropicAPIClient', () => ({
@@ -40,7 +41,7 @@ vi.mock('../gemini/GeminiAPIClient', () => ({
 vi.mock('../gemini/VertexAPIClient', () => ({
   VertexAPIClient: vi.fn().mockImplementation(() => ({}))
 }))
-vi.mock('../NewAPIClient', () => ({
+vi.mock('../newapi/NewAPIClient', () => ({
   NewAPIClient: vi.fn().mockImplementation(() => ({}))
 }))
 vi.mock('../openai/OpenAIApiClient', () => ({
@@ -54,6 +55,19 @@ vi.mock('../openai/OpenAIResponseAPIClient', () => ({
 vi.mock('../ppio/PPIOAPIClient', () => ({
   PPIOAPIClient: vi.fn().mockImplementation(() => ({}))
 }))
+vi.mock('../aws/AwsBedrockAPIClient', () => ({
+  AwsBedrockAPIClient: vi.fn().mockImplementation(() => ({}))
+}))
+
+// Mock the models config to prevent circular dependency issues
+vi.mock('@renderer/config/models', () => ({
+  findTokenLimit: vi.fn(),
+  isReasoningModel: vi.fn(),
+  SYSTEM_MODELS: {
+    silicon: [],
+    defaultModel: []
+  }
+}))
 
 describe('ApiClientFactory', () => {
   beforeEach(() => {
@@ -144,6 +158,15 @@ describe('ApiClientFactory', () => {
       expect(client).toBeDefined()
     })
 
+    it('should create AwsBedrockAPIClient for aws-bedrock type', () => {
+      const provider = createTestProvider('aws-bedrock', 'aws-bedrock')
+
+      const client = ApiClientFactory.create(provider)
+
+      expect(AwsBedrockAPIClient).toHaveBeenCalledWith(provider)
+      expect(client).toBeDefined()
+    })
+
     // 测试默认情况
     it('should create OpenAIAPIClient as default for unknown type', () => {
       const provider = createTestProvider('unknown', 'unknown-type')

src/renderer/src/aiCore/clients/aihubmix/AihubmixAPIClient.ts

@@ -1,12 +1,12 @@
 import { isOpenAILLMModel } from '@renderer/config/models'
 import { Model, Provider } from '@renderer/types'
 
-import { AnthropicAPIClient } from './anthropic/AnthropicAPIClient'
-import { BaseApiClient } from './BaseApiClient'
-import { GeminiAPIClient } from './gemini/GeminiAPIClient'
-import { MixedBaseAPIClient } from './MixedBaseApiClient'
-import { OpenAIAPIClient } from './openai/OpenAIApiClient'
-import { OpenAIResponseAPIClient } from './openai/OpenAIResponseAPIClient'
+import { AnthropicAPIClient } from '../anthropic/AnthropicAPIClient'
+import { BaseApiClient } from '../BaseApiClient'
+import { GeminiAPIClient } from '../gemini/GeminiAPIClient'
+import { MixedBaseAPIClient } from '../MixedBaseApiClient'
+import { OpenAIAPIClient } from '../openai/OpenAIApiClient'
+import { OpenAIResponseAPIClient } from '../openai/OpenAIResponseAPIClient'
 
 /**
  * AihubmixAPIClient - 根据模型类型自动选择合适的ApiClient

src/renderer/src/aiCore/clients/aws/AwsBedrockAPIClient.ts

@@ -2,19 +2,24 @@ import { BedrockClient, ListFoundationModelsCommand, ListInferenceProfilesComman
 import {
   BedrockRuntimeClient,
   ConverseCommand,
-  ConverseStreamCommand,
-  InvokeModelCommand
+  InvokeModelCommand,
+  InvokeModelWithResponseStreamCommand
 } from '@aws-sdk/client-bedrock-runtime'
 import { loggerService } from '@logger'
 import { GenericChunk } from '@renderer/aiCore/middleware/schemas'
 import { DEFAULT_MAX_TOKENS } from '@renderer/config/constant'
+import { findTokenLimit, isReasoningModel } from '@renderer/config/models'
 import {
   getAwsBedrockAccessKeyId,
   getAwsBedrockRegion,
   getAwsBedrockSecretAccessKey
 } from '@renderer/hooks/useAwsBedrock'
+import { getAssistantSettings } from '@renderer/services/AssistantService'
 import { estimateTextTokens } from '@renderer/services/TokenService'
 import {
+  Assistant,
+  EFFORT_RATIO,
+  FileTypes,
   GenerateImageParams,
   MCPCallToolResponse,
   MCPTool,
@@ -23,7 +28,13 @@ import {
   Provider,
   ToolCallResponse
 } from '@renderer/types'
-import { ChunkType, MCPToolCreatedChunk, TextDeltaChunk } from '@renderer/types/chunk'
+import {
+  ChunkType,
+  MCPToolCreatedChunk,
+  TextDeltaChunk,
+  ThinkingDeltaChunk,
+  ThinkingStartChunk
+} from '@renderer/types/chunk'
 import { Message } from '@renderer/types/newMessage'
 import {
   AwsBedrockSdkInstance,
@@ -33,6 +44,7 @@ import {
   AwsBedrockSdkRawOutput,
   AwsBedrockSdkTool,
   AwsBedrockSdkToolCall,
+  AwsBedrockStreamChunk,
   SdkModel
 } from '@renderer/types/sdk'
 import { convertBase64ImageToAwsBedrockFormat } from '@renderer/utils/aws-bedrock-utils'
@@ -42,7 +54,7 @@ import {
   mcpToolCallResponseToAwsBedrockMessage,
   mcpToolsToAwsBedrockTools
 } from '@renderer/utils/mcp-tools'
-import { findImageBlocks } from '@renderer/utils/messageUtils/find'
+import { findFileBlocks, findImageBlocks } from '@renderer/utils/messageUtils/find'
 import { t } from 'i18next'
 
 import { BaseApiClient } from '../BaseApiClient'
@@ -103,46 +115,65 @@ export class AwsBedrockAPIClient extends BaseApiClient<
   override async createCompletions(payload: AwsBedrockSdkParams): Promise<AwsBedrockSdkRawOutput> {
     const sdk = await this.getSdkInstance()
 
-    // 转换消息格式到AWS SDK原生格式
+    // 转换消息格式（用于 InvokeModelWithResponseStreamCommand）
     const awsMessages = payload.messages.map((msg) => ({
       role: msg.role,
       content: msg.content.map((content) => {
         if (content.text) {
-          return { text: content.text }
+          return { type: 'text', text: content.text }
         }
         if (content.image) {
+          // 处理图片数据，将 Uint8Array 或数字数组转换为 base64 字符串
+          let base64Data = ''
+          if (content.image.source.bytes) {
+            if (typeof content.image.source.bytes === 'string') {
+              // 如果已经是字符串，直接使用
+              base64Data = content.image.source.bytes
+            } else {
+              // 如果是数组或 Uint8Array，转换为 base64
+              const uint8Array = new Uint8Array(Object.values(content.image.source.bytes))
+              const binaryString = Array.from(uint8Array)
+                .map((byte) => String.fromCharCode(byte))
+                .join('')
+              base64Data = btoa(binaryString)
+            }
+          }
+
           return {
-            image: {
-              format: content.image.format,
-              source: content.image.source
+            type: 'image',
+            source: {
+              type: 'base64',
+              media_type: `image/${content.image.format}`,
+              data: base64Data
             }
           }
         }
         if (content.toolResult) {
           return {
-            toolResult: {
-              toolUseId: content.toolResult.toolUseId,
-              content: content.toolResult.content,
-              status: content.toolResult.status
-            }
+            type: 'tool_result',
+            tool_use_id: content.toolResult.toolUseId,
+            content: content.toolResult.content
           }
         }
         if (content.toolUse) {
           return {
-            toolUse: {
-              toolUseId: content.toolUse.toolUseId,
-              name: content.toolUse.name,
-              input: content.toolUse.input
-            }
+            type: 'tool_use',
+            id: content.toolUse.toolUseId,
+            name: content.toolUse.name,
+            input: content.toolUse.input
           }
         }
-        // 返回符合AWS SDK ContentBlock类型的对象
-        return { text: 'Unknown content type' }
+        return { type: 'text', text: 'Unknown content type' }
       })
     }))
 
     logger.info('Creating completions with model ID:', { modelId: payload.modelId })
 
+    const excludeKeys = ['modelId', 'messages', 'system', 'maxTokens', 'temperature', 'topP', 'stream', 'tools']
+    const additionalParams = Object.keys(payload)
+      .filter((key) => !excludeKeys.includes(key))
+      .reduce((acc, key) => ({ ...acc, [key]: payload[key] }), {})
+
     const commonParams = {
       modelId: payload.modelId,
       messages: awsMessages as any,
@@ -162,10 +193,18 @@ export class AwsBedrockAPIClient extends BaseApiClient<
 
     try {
       if (payload.stream) {
-        const command = new ConverseStreamCommand(commonParams)
+        // 根据模型类型选择正确的 API 格式
+        const requestBody = this.createRequestBodyForModel(commonParams, additionalParams)
+
+        const command = new InvokeModelWithResponseStreamCommand({
+          modelId: commonParams.modelId,
+          body: JSON.stringify(requestBody),
+          contentType: 'application/json',
+          accept: 'application/json'
+        })
+
         const response = await sdk.client.send(command)
-        // 直接返回AWS Bedrock流式响应的异步迭代器
-        return this.createStreamIterator(response)
+        return this.createInvokeModelStreamIterator(response)
       } else {
         const command = new ConverseCommand(commonParams)
         const response = await sdk.client.send(command)
@@ -177,32 +216,236 @@ export class AwsBedrockAPIClient extends BaseApiClient<
     }
   }
 
-  private async *createStreamIterator(response: any): AsyncIterable<AwsBedrockSdkRawChunk> {
-    try {
-      if (response.stream) {
-        for await (const chunk of response.stream) {
-          logger.debug('AWS Bedrock chunk received:', chunk)
+  /**
+   * 根据模型类型创建请求体
+   */
+  private createRequestBodyForModel(commonParams: any, additionalParams: any): any {
+    const modelId = commonParams.modelId.toLowerCase()
 
-          // AWS Bedrock的流式响应格式转换为标准格式
-          if (chunk.contentBlockDelta?.delta?.text) {
-            yield {
-              contentBlockDelta: {
-                delta: { text: chunk.contentBlockDelta.delta.text }
+    // Claude 系列模型使用 Anthropic API 格式
+    if (modelId.includes('claude')) {
+      return {
+        anthropic_version: 'bedrock-2023-05-31',
+        max_tokens: commonParams.inferenceConfig.maxTokens,
+        temperature: commonParams.inferenceConfig.temperature,
+        top_p: commonParams.inferenceConfig.topP,
+        messages: commonParams.messages,
+        ...(commonParams.system && commonParams.system[0]?.text ? { system: commonParams.system[0].text } : {}),
+        ...(commonParams.toolConfig?.tools ? { tools: commonParams.toolConfig.tools } : {}),
+        ...additionalParams
+      }
+    }
+
+    // OpenAI 系列模型
+    if (modelId.includes('gpt') || modelId.includes('openai')) {
+      const messages: any[] = []
+
+      // 添加系统消息
+      if (commonParams.system && commonParams.system[0]?.text) {
+        messages.push({
+          role: 'system',
+          content: commonParams.system[0].text
+        })
+      }
+
+      // 转换消息格式
+      for (const message of commonParams.messages) {
+        const content: any[] = []
+        for (const part of message.content) {
+          if (part.text) {
+            content.push({ type: 'text', text: part.text })
+          } else if (part.image) {
+            content.push({
+              type: 'image_url',
+              image_url: {
+                url: `data:image/${part.image.format};base64,${part.image.source.bytes}`
+              }
+            })
+          }
+        }
+        messages.push({
+          role: message.role,
+          content: content.length === 1 && content[0].type === 'text' ? content[0].text : content
+        })
+      }
+
+      const baseBody: any = {
+        model: commonParams.modelId,
+        messages: messages,
+        max_tokens: commonParams.inferenceConfig.maxTokens,
+        temperature: commonParams.inferenceConfig.temperature,
+        top_p: commonParams.inferenceConfig.topP,
+        stream: true,
+        ...(commonParams.toolConfig?.tools ? { tools: commonParams.toolConfig.tools } : {})
+      }
+
+      // OpenAI 模型的 thinking 参数格式
+      if (additionalParams.reasoning_effort) {
+        baseBody.reasoning_effort = additionalParams.reasoning_effort
+        delete additionalParams.reasoning_effort
+      }
+
+      return {
+        ...baseBody,
+        ...additionalParams
+      }
+    }
+
+    // Llama 系列模型
+    if (modelId.includes('llama')) {
+      const baseBody: any = {
+        prompt: this.convertMessagesToPrompt(commonParams.messages, commonParams.system),
+        max_gen_len: commonParams.inferenceConfig.maxTokens,
+        temperature: commonParams.inferenceConfig.temperature,
+        top_p: commonParams.inferenceConfig.topP
+      }
+
+      // Llama 模型的 thinking 参数格式
+      if (additionalParams.thinking_mode) {
+        baseBody.thinking_mode = additionalParams.thinking_mode
+        delete additionalParams.thinking_mode
+      }
+
+      return {
+        ...baseBody,
+        ...additionalParams
+      }
+    }
+
+    // Amazon Titan 系列模型
+    if (modelId.includes('titan')) {
+      const textGenerationConfig: any = {
+        maxTokenCount: commonParams.inferenceConfig.maxTokens,
+        temperature: commonParams.inferenceConfig.temperature,
+        topP: commonParams.inferenceConfig.topP
+      }
+
+      // 将 thinking 相关参数添加到 textGenerationConfig 中
+      if (additionalParams.thinking) {
+        textGenerationConfig.thinking = additionalParams.thinking
+        delete additionalParams.thinking
+      }
+
+      return {
+        inputText: this.convertMessagesToPrompt(commonParams.messages, commonParams.system),
+        textGenerationConfig: {
+          ...textGenerationConfig,
+          ...Object.keys(additionalParams).reduce((acc, key) => {
+            if (['thinking_tokens', 'reasoning_mode'].includes(key)) {
+              acc[key] = additionalParams[key]
+              delete additionalParams[key]
+            }
+            return acc
+          }, {} as any)
+        },
+        ...additionalParams
+      }
+    }
+
+    // Cohere Command 系列模型
+    if (modelId.includes('cohere') || modelId.includes('command')) {
+      const baseBody: any = {
+        message: this.convertMessagesToPrompt(commonParams.messages, commonParams.system),
+        max_tokens: commonParams.inferenceConfig.maxTokens,
+        temperature: commonParams.inferenceConfig.temperature,
+        p: commonParams.inferenceConfig.topP
+      }
+
+      // Cohere 模型的 thinking 参数格式
+      if (additionalParams.thinking) {
+        baseBody.thinking = additionalParams.thinking
+        delete additionalParams.thinking
+      }
+      if (additionalParams.reasoning_tokens) {
+        baseBody.reasoning_tokens = additionalParams.reasoning_tokens
+        delete additionalParams.reasoning_tokens
+      }
+
+      return {
+        ...baseBody,
+        ...additionalParams
+      }
+    }
+
+    // 默认使用通用格式
+    const baseBody: any = {
+      prompt: this.convertMessagesToPrompt(commonParams.messages, commonParams.system),
+      max_tokens: commonParams.inferenceConfig.maxTokens,
+      temperature: commonParams.inferenceConfig.temperature,
+      top_p: commonParams.inferenceConfig.topP
+    }
+
+    return {
+      ...baseBody,
+      ...additionalParams
+    }
+  }
+
+  /**
+   * 将消息转换为简单的 prompt 格式
+   */
+  private convertMessagesToPrompt(messages: any[], system?: any[]): string {
+    let prompt = ''
+
+    // 添加系统消息
+    if (system && system[0]?.text) {
+      prompt += `System: ${system[0].text}\n\n`
+    }
+
+    // 添加对话消息
+    for (const message of messages) {
+      const role = message.role === 'assistant' ? 'Assistant' : 'Human'
+      let content = ''
+
+      for (const part of message.content) {
+        if (part.text) {
+          content += part.text
+        } else if (part.image) {
+          content += '[Image]'
+        }
+      }
+
+      prompt += `${role}: ${content}\n\n`
+    }
+
+    prompt += 'Assistant:'
+    return prompt
+  }
+
+  private async *createInvokeModelStreamIterator(response: any): AsyncIterable<AwsBedrockSdkRawChunk> {
+    try {
+      if (response.body) {
+        for await (const event of response.body) {
+          if (event.chunk) {
+            const chunk: AwsBedrockStreamChunk = JSON.parse(new TextDecoder().decode(event.chunk.bytes))
+
+            // 转换为标准格式
+            if (chunk.type === 'content_block_delta') {
+              yield {
+                contentBlockDelta: {
+                  delta: chunk.delta,
+                  contentBlockIndex: chunk.index
+                }
+              }
+            } else if (chunk.type === 'message_start') {
+              yield { messageStart: chunk }
+            } else if (chunk.type === 'message_stop') {
+              yield { messageStop: chunk }
+            } else if (chunk.type === 'content_block_start') {
+              yield {
+                contentBlockStart: {
+                  start: chunk.content_block,
+                  contentBlockIndex: chunk.index
+                }
+              }
+            } else if (chunk.type === 'content_block_stop') {
+              yield {
+                contentBlockStop: {
+                  contentBlockIndex: chunk.index
+                }
               }
             }
           }
-
-          if (chunk.messageStart) {
-            yield { messageStart: chunk.messageStart }
-          }
-
-          if (chunk.messageStop) {
-            yield { messageStop: chunk.messageStop }
-          }
-
-          if (chunk.metadata) {
-            yield { metadata: chunk.metadata }
-          }
         }
       }
     } catch (error) {
@@ -441,6 +684,30 @@ export class AwsBedrockAPIClient extends BaseApiClient<
       }
     }
 
+    // 处理文件内容
+    const fileBlocks = findFileBlocks(message)
+    for (const fileBlock of fileBlocks) {
+      const file = fileBlock.file
+      if (!file) {
+        logger.warn(`No file in the file block. Passed.`, { fileBlock })
+        continue
+      }
+
+      if ([FileTypes.TEXT, FileTypes.DOCUMENT].includes(file.type)) {
+        try {
+          const fileContent = (await window.api.file.read(file.id + file.ext, true)).trim()
+          if (fileContent) {
+            parts.push({
+              text: `${file.origin_name}\n${fileContent}`
+            })
+          }
+        } catch (error) {
+          logger.error('Error reading file content:', error as Error)
+          parts.push({ text: `[File: ${file.origin_name} - Failed to read content]` })
+        }
+      }
+    }
+
     // 如果没有任何内容，添加默认文本而不是空文本
     if (parts.length === 0) {
       parts.push({ text: 'No content provided' })
@@ -485,6 +752,38 @@ export class AwsBedrockAPIClient extends BaseApiClient<
           }
         }
 
+        // 获取推理预算token（对所有支持推理的模型）
+        const budgetTokens = this.getBudgetToken(assistant, model)
+
+        // 构建基础自定义参数
+        const customParams: Record<string, any> =
+          coreRequest.callType === 'chat' ? this.getCustomParameters(assistant) : {}
+
+        // 根据模型类型添加 thinking 参数
+        if (budgetTokens) {
+          const modelId = model.id.toLowerCase()
+
+          if (modelId.includes('claude')) {
+            // Claude 模型使用 Anthropic 格式
+            customParams.thinking = { type: 'enabled', budget_tokens: budgetTokens }
+          } else if (modelId.includes('gpt') || modelId.includes('openai')) {
+            // OpenAI 模型格式
+            customParams.reasoning_effort = assistant?.settings?.reasoning_effort
+          } else if (modelId.includes('llama')) {
+            // Llama 模型格式
+            customParams.thinking_mode = true
+            customParams.thinking_tokens = budgetTokens
+          } else if (modelId.includes('titan')) {
+            // Titan 模型格式
+            customParams.thinking = { enabled: true }
+            customParams.thinking_tokens = budgetTokens
+          } else if (modelId.includes('cohere') || modelId.includes('command')) {
+            // Cohere 模型格式
+            customParams.thinking = { enabled: true }
+            customParams.reasoning_tokens = budgetTokens
+          }
+        }
+
         const payload: AwsBedrockSdkParams = {
           modelId: model.id,
           messages:
@@ -497,9 +796,7 @@ export class AwsBedrockAPIClient extends BaseApiClient<
           topP: this.getTopP(assistant, model),
           stream: streamOutput !== false,
           tools: tools.length > 0 ? tools : undefined,
-          // 只在对话场景下应用自定义参数，避免影响翻译、总结等其他业务逻辑
-          // 注意：用户自定义参数总是应该覆盖其他参数
-          ...(coreRequest.callType === 'chat' ? this.getCustomParameters(assistant) : {})
+          ...customParams
         }
 
         const timeout = this.getTimeout(model)
@@ -511,6 +808,7 @@ export class AwsBedrockAPIClient extends BaseApiClient<
   getResponseChunkTransformer(): ResponseChunkTransformer<AwsBedrockSdkRawChunk> {
     return () => {
       let hasStartedText = false
+      let hasStartedThinking = false
       let accumulatedJson = ''
       const toolCalls: Record<number, AwsBedrockSdkToolCall> = {}
 
@@ -570,6 +868,24 @@ export class AwsBedrockAPIClient extends BaseApiClient<
             } as TextDeltaChunk)
           }
 
+          // 处理thinking增量
+          if (
+            rawChunk.contentBlockDelta?.delta?.type === 'thinking_delta' &&
+            rawChunk.contentBlockDelta?.delta?.thinking
+          ) {
+            if (!hasStartedThinking) {
+              controller.enqueue({
+                type: ChunkType.THINKING_START
+              } as ThinkingStartChunk)
+              hasStartedThinking = true
+            }
+
+            controller.enqueue({
+              type: ChunkType.THINKING_DELTA,
+              text: rawChunk.contentBlockDelta.delta.thinking
+            } as ThinkingDeltaChunk)
+          }
+
           // 处理内容块停止事件 - 参考 Anthropic 的 content_block_stop 处理
           if (rawChunk.contentBlockStop) {
             const blockIndex = rawChunk.contentBlockStop.contentBlockIndex || 0
@@ -708,4 +1024,49 @@ export class AwsBedrockAPIClient extends BaseApiClient<
   extractMessagesFromSdkPayload(sdkPayload: AwsBedrockSdkParams): AwsBedrockSdkMessageParam[] {
     return sdkPayload.messages || []
   }
+
+  /**
+   * 获取 AWS Bedrock 的推理工作量预算token
+   * @param assistant - The assistant
+   * @param model - The model
+   * @returns The budget tokens for reasoning effort
+   */
+  private getBudgetToken(assistant: Assistant, model: Model): number | undefined {
+    try {
+      if (!isReasoningModel(model)) {
+        return undefined
+      }
+
+      const { maxTokens } = getAssistantSettings(assistant)
+      const reasoningEffort = assistant?.settings?.reasoning_effort
+
+      if (reasoningEffort === undefined) {
+        return undefined
+      }
+
+      const effortRatio = EFFORT_RATIO[reasoningEffort]
+      const tokenLimits = findTokenLimit(model.id)
+
+      if (tokenLimits) {
+        // 使用模型特定的 token 限制
+        const budgetTokens = Math.max(
+          1024,
+          Math.floor(
+            Math.min(
+              (tokenLimits.max - tokenLimits.min) * effortRatio + tokenLimits.min,
+              (maxTokens || DEFAULT_MAX_TOKENS) * effortRatio
+            )
+          )
+        )
+        return budgetTokens
+      } else {
+        // 对于没有特定限制的模型，使用简化计算
+        const budgetTokens = Math.max(1024, Math.floor((maxTokens || DEFAULT_MAX_TOKENS) * effortRatio))
+        return budgetTokens
+      }
+    } catch (error) {
+      logger.warn('Failed to calculate budget tokens for reasoning effort:', error as Error)
+      return undefined
+    }
+  }
 }

src/renderer/src/aiCore/clients/cherryin/CherryinAPIClient.ts

@@ -0,0 +1,51 @@
+import { Provider } from '@renderer/types'
+import { OpenAISdkParams, OpenAISdkRawOutput } from '@renderer/types/sdk'
+import OpenAI from 'openai'
+
+import { OpenAIAPIClient } from '../openai/OpenAIApiClient'
+
+export class CherryinAPIClient extends OpenAIAPIClient {
+  constructor(provider: Provider) {
+    super(provider)
+  }
+
+  override async createCompletions(
+    payload: OpenAISdkParams,
+    options?: OpenAI.RequestOptions
+  ): Promise<OpenAISdkRawOutput> {
+    const sdk = await this.getSdkInstance()
+    options = options || {}
+    options.headers = options.headers || {}
+
+    const signature = await window.api.cherryin.generateSignature({
+      method: 'POST',
+      path: '/chat/completions',
+      query: '',
+      body: payload
+    })
+
+    options.headers = {
+      ...options.headers,
+      ...signature
+    }
+
+    // @ts-ignore - SDK参数可能有额外的字段
+    return await sdk.chat.completions.create(payload, options)
+  }
+
+  override getClientCompatibilityType(): string[] {
+    return ['CherryinAPIClient']
+  }
+
+  public async listModels(): Promise<OpenAI.Models.Model[]> {
+    const models = ['glm-4.5-flash', 'Qwen/Qwen3-8B']
+
+    const created = Date.now()
+    return models.map((id) => ({
+      id,
+      owned_by: 'cherryin',
+      object: 'model' as const,
+      created
+    }))
+  }
+}

src/renderer/src/aiCore/clients/gemini/GeminiAPIClient.ts

@@ -52,6 +52,7 @@ import {
   GeminiSdkRawOutput,
   GeminiSdkToolCall
 } from '@renderer/types/sdk'
+import { isToolUseModeFunction } from '@renderer/utils/assistant'
 import {
   geminiFunctionCallToMcpTool,
   isEnabledToolUse,
@@ -428,8 +429,7 @@ export class GeminiAPIClient extends BaseApiClient<
   private getGenerateImageParameter(): Partial<GenerateContentConfig> {
     return {
       systemInstruction: undefined,
-      responseModalities: [Modality.TEXT, Modality.IMAGE],
-      responseMimeType: 'text/plain'
+      responseModalities: [Modality.TEXT, Modality.IMAGE]
     }
   }
 
@@ -476,16 +476,20 @@ export class GeminiAPIClient extends BaseApiClient<
           }
         }
 
-        if (enableWebSearch) {
-          tools.push({
-            googleSearch: {}
-          })
-        }
+        if (tools.length === 0 || !isToolUseModeFunction(assistant)) {
+          if (enableWebSearch) {
+            tools.push({
+              googleSearch: {}
+            })
+          }
 
-        if (enableUrlContext) {
-          tools.push({
-            urlContext: {}
-          })
+          if (enableUrlContext) {
+            tools.push({
+              urlContext: {}
+            })
+          }
+        } else if (enableWebSearch || enableUrlContext) {
+          logger.warn('Native tools cannot be used with function calling for now.')
         }
 
         if (isGemmaModel(model) && assistant.prompt) {

src/renderer/src/aiCore/clients/index.ts

@@ -3,4 +3,6 @@ export * from './BaseApiClient'
 export * from './types'
 
 // Export specific clients from subdirectories
+export * from './anthropic/AnthropicAPIClient'
 export * from './openai/OpenAIApiClient'
+export * from './openai/OpenAIResponseAPIClient'

src/renderer/src/aiCore/clients/newapi/NewAPIClient.ts

@@ -3,12 +3,12 @@ import { isSupportedModel } from '@renderer/config/models'
 import { Model, Provider } from '@renderer/types'
 import { NewApiModel } from '@renderer/types/sdk'
 
-import { AnthropicAPIClient } from './anthropic/AnthropicAPIClient'
-import { BaseApiClient } from './BaseApiClient'
-import { GeminiAPIClient } from './gemini/GeminiAPIClient'
-import { MixedBaseAPIClient } from './MixedBaseApiClient'
-import { OpenAIAPIClient } from './openai/OpenAIApiClient'
-import { OpenAIResponseAPIClient } from './openai/OpenAIResponseAPIClient'
+import { AnthropicAPIClient } from '../anthropic/AnthropicAPIClient'
+import { BaseApiClient } from '../BaseApiClient'
+import { GeminiAPIClient } from '../gemini/GeminiAPIClient'
+import { MixedBaseAPIClient } from '../MixedBaseApiClient'
+import { OpenAIAPIClient } from '../openai/OpenAIApiClient'
+import { OpenAIResponseAPIClient } from '../openai/OpenAIResponseAPIClient'
 
 const logger = loggerService.withContext('NewAPIClient')
 

src/renderer/src/aiCore/clients/openai/OpenAIApiClient.ts

@@ -5,10 +5,15 @@ import {
   GEMINI_FLASH_MODEL_REGEX,
   getOpenAIWebSearchParams,
   getThinkModelType,
+  isClaudeReasoningModel,
+  isDeepSeekHybridInferenceModel,
   isDoubaoThinkingAutoModel,
+  isGeminiReasoningModel,
   isGPT5SeriesModel,
   isGrokReasoningModel,
   isNotSupportSystemMessageModel,
+  isOpenAIOpenWeightModel,
+  isOpenAIReasoningModel,
   isQwenAlwaysThinkModel,
   isQwenMTModel,
   isQwenReasoningModel,
@@ -23,7 +28,8 @@ import {
   isSupportedThinkingTokenQwenModel,
   isSupportedThinkingTokenZhipuModel,
   isVisionModel,
-  MODEL_SUPPORTED_REASONING_EFFORT
+  MODEL_SUPPORTED_REASONING_EFFORT,
+  ZHIPU_RESULT_TOKENS
 } from '@renderer/config/models'
 import {
   isSupportArrayContentProvider,
@@ -39,19 +45,23 @@ import {
   Assistant,
   EFFORT_RATIO,
   FileTypes,
+  isSystemProvider,
+  isTranslateAssistant,
   MCPCallToolResponse,
   MCPTool,
   MCPToolResponse,
   Model,
   OpenAIServiceTier,
   Provider,
+  SystemProviderIds,
   ToolCallResponse,
-  TranslateAssistant,
   WebSearchSource
 } from '@renderer/types'
 import { ChunkType, TextStartChunk, ThinkingStartChunk } from '@renderer/types/chunk'
 import { Message } from '@renderer/types/newMessage'
 import {
+  OpenAIExtraBody,
+  OpenAIModality,
   OpenAISdkMessageParam,
   OpenAISdkParams,
   OpenAISdkRawChunk,
@@ -107,62 +117,60 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
    */
   // Method for reasoning effort, moved from OpenAIProvider
   override getReasoningEffort(assistant: Assistant, model: Model): ReasoningEffortOptionalParams {
-    if (this.provider.id === 'groq') {
+    if (this.provider.id === SystemProviderIds.groq) {
       return {}
     }
 
     if (!isReasoningModel(model)) {
       return {}
     }
+
     const reasoningEffort = assistant?.settings?.reasoning_effort
 
-    // Doubao 思考模式支持
-    if (isSupportedThinkingTokenDoubaoModel(model)) {
-      // reasoningEffort 为空，默认开启 enabled
-      if (!reasoningEffort) {
-        return { thinking: { type: 'disabled' } }
-      }
-      if (reasoningEffort === 'high') {
-        return { thinking: { type: 'enabled' } }
-      }
-      if (reasoningEffort === 'auto' && isDoubaoThinkingAutoModel(model)) {
-        return { thinking: { type: 'auto' } }
-      }
-      // 其他情况不带 thinking 字段
-      return {}
-    }
-
     if (isSupportedThinkingTokenZhipuModel(model)) {
-      if (!reasoningEffort) {
-        return { thinking: { type: 'disabled' } }
-      }
-      return { thinking: { type: 'enabled' } }
+      return { thinking: { type: reasoningEffort ? 'enabled' : 'disabled' } }
     }
 
     if (!reasoningEffort) {
-      if (model.provider === 'openrouter') {
+      // DeepSeek hybrid inference models, v3.1 and maybe more in the future
+      // 不同的 provider 有不同的思考控制方式，在这里统一解决
+      // if (isDeepSeekHybridInferenceModel(model)) {
+      //   // do nothing for now. default to non-think.
+      // }
+
+      // openrouter: use reasoning
+      // openrouter 如果关闭思考，会隐藏思考内容，所以对于总是思考的模型需要特别处理
+      if (model.provider === SystemProviderIds.openrouter) {
         // Don't disable reasoning for Gemini models that support thinking tokens
         if (isSupportedThinkingTokenGeminiModel(model) && !GEMINI_FLASH_MODEL_REGEX.test(model.id)) {
           return {}
         }
         // Don't disable reasoning for models that require it
-        if (isGrokReasoningModel(model)) {
+        if (isGrokReasoningModel(model) || isOpenAIReasoningModel(model)) {
+          return {}
+        }
+        if (isReasoningModel(model) && !isSupportedThinkingTokenModel(model)) {
           return {}
         }
         return { reasoning: { enabled: false, exclude: true } }
       }
 
+      // providers that use enable_thinking
       if (
         isSupportEnableThinkingProvider(this.provider) &&
-        (isSupportedThinkingTokenQwenModel(model) || isSupportedThinkingTokenHunyuanModel(model))
+        (isSupportedThinkingTokenQwenModel(model) ||
+          isSupportedThinkingTokenHunyuanModel(model) ||
+          (this.provider.id === SystemProviderIds.dashscope && isDeepSeekHybridInferenceModel(model)))
       ) {
         return { enable_thinking: false }
       }
 
+      // claude
       if (isSupportedThinkingTokenClaudeModel(model)) {
         return {}
       }
 
+      // gemini
       if (isSupportedThinkingTokenGeminiModel(model)) {
         if (GEMINI_FLASH_MODEL_REGEX.test(model.id)) {
           return {
@@ -191,8 +199,52 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
       (findTokenLimit(model.id)?.max! - findTokenLimit(model.id)?.min!) * effortRatio + findTokenLimit(model.id)?.min!
     )
 
+    // DeepSeek hybrid inference models, v3.1 and maybe more in the future
+    // 不同的 provider 有不同的思考控制方式，在这里统一解决
+    if (isDeepSeekHybridInferenceModel(model)) {
+      if (isSystemProvider(this.provider)) {
+        switch (this.provider.id) {
+          case SystemProviderIds.dashscope:
+            return {
+              enable_thinking: true,
+              incremental_output: true
+            }
+          case SystemProviderIds.doubao:
+            return {
+              thinking: {
+                type: 'enabled' // auto is invalid
+              }
+            }
+          case SystemProviderIds.openrouter:
+            return {
+              reasoning: {
+                enabled: true
+              }
+            }
+          case 'nvidia':
+            return {
+              chat_template_kwargs: {
+                thinking: true
+              }
+            }
+          case SystemProviderIds.silicon:
+          case SystemProviderIds.ppio:
+            return {
+              enable_thinking: true
+            }
+          default:
+            logger.warn(
+              `Use enable_thinking option as fallback for provider ${this.provider.name} since DeepSeek v3.1 thinking control method is unknown`
+            )
+            return {
+              enable_thinking: true
+            }
+        }
+      }
+    }
+
     // OpenRouter models
-    if (model.provider === 'openrouter') {
+    if (model.provider === SystemProviderIds.openrouter) {
       if (isSupportedReasoningEffortModel(model) || isSupportedThinkingTokenModel(model)) {
         return {
           reasoning: {
@@ -202,6 +254,18 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
       }
     }
 
+    // Doubao 思考模式支持
+    if (isSupportedThinkingTokenDoubaoModel(model)) {
+      if (reasoningEffort === 'high') {
+        return { thinking: { type: 'enabled' } }
+      }
+      if (reasoningEffort === 'auto' && isDoubaoThinkingAutoModel(model)) {
+        return { thinking: { type: 'auto' } }
+      }
+      // 其他情况不带 thinking 字段
+      return {}
+    }
+
     // Qwen models
     if (isQwenReasoningModel(model)) {
       const thinkConfig = {
@@ -209,7 +273,7 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
           isQwenAlwaysThinkModel(model) || !isSupportEnableThinkingProvider(this.provider) ? undefined : true,
         thinking_budget: budgetTokens
       }
-      if (this.provider.id === 'dashscope') {
+      if (this.provider.id === SystemProviderIds.dashscope) {
         return {
           ...thinkConfig,
           incremental_output: true
@@ -502,7 +566,7 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
         messages: OpenAISdkMessageParam[]
         metadata: Record<string, any>
       }> => {
-        const { messages, mcpTools, maxTokens, enableWebSearch } = coreRequest
+        const { messages, mcpTools, maxTokens, enableWebSearch, enableGenerateImage } = coreRequest
         let { streamOutput } = coreRequest
 
         // Qwen3商业版（思考模式）、Qwen3开源版、QwQ、QVQ只支持流式输出。
@@ -510,27 +574,33 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
           streamOutput = true
         }
 
-        const extra_body: Record<string, any> = {}
+        const extra_body: OpenAIExtraBody = {}
 
         if (isQwenMTModel(model)) {
-          const targetLanguage = (assistant as TranslateAssistant).targetLanguage
-          extra_body.translation_options = {
-            source_lang: 'auto',
-            target_lang: mapLanguageToQwenMTModel(targetLanguage!)
-          }
-          if (!extra_body.translation_options.target_lang) {
-            throw new Error(t('translate.error.not_supported', { language: targetLanguage?.value }))
+          if (isTranslateAssistant(assistant)) {
+            const targetLanguage = mapLanguageToQwenMTModel(assistant.targetLanguage)
+            if (!targetLanguage) {
+              throw new Error(t('translate.error.not_supported', { language: assistant.targetLanguage.value }))
+            }
+            const translationOptions = {
+              source_lang: 'auto',
+              target_lang: targetLanguage
+            } as const
+            extra_body.translation_options = translationOptions
+          } else {
+            throw new Error(t('translate.error.chat_qwen_mt'))
           }
         }
 
         // 1. 处理系统消息
-        let systemMessage = { role: 'system', content: assistant.prompt || '' }
+        const systemMessage = { role: 'system', content: assistant.prompt || '' }
 
-        if (isSupportedReasoningEffortOpenAIModel(model)) {
-          systemMessage = {
-            role: isSupportDeveloperRoleProvider(this.provider) ? 'developer' : 'system',
-            content: `Formatting re-enabled${systemMessage ? '\n' + systemMessage.content : ''}`
-          }
+        if (
+          isSupportedReasoningEffortOpenAIModel(model) &&
+          isSupportDeveloperRoleProvider(this.provider) &&
+          !isOpenAIOpenWeightModel(model)
+        ) {
+          systemMessage.role = 'developer'
         }
 
         if (model.id.includes('o1-mini') || model.id.includes('o1-preview')) {
@@ -554,24 +624,52 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
             userMessages.push(await this.convertMessageToSdkParam(message, model))
           }
         }
+        if (userMessages.length === 0) {
+          logger.warn('No user message. Some providers may not support.')
+        }
+
+        // poe 需要通过用户消息传递 reasoningEffort
+        const reasoningEffort = this.getReasoningEffort(assistant, model)
 
         const lastUserMsg = userMessages.findLast((m) => m.role === 'user')
-        if (
-          lastUserMsg &&
-          isSupportedThinkingTokenQwenModel(model) &&
-          !isSupportEnableThinkingProvider(this.provider)
-        ) {
-          const postsuffix = '/no_think'
-          const qwenThinkModeEnabled = assistant.settings?.qwenThinkMode === true
-          const currentContent = lastUserMsg.content
+        if (lastUserMsg) {
+          if (isSupportedThinkingTokenQwenModel(model) && !isSupportEnableThinkingProvider(this.provider)) {
+            const qwenThinkModeEnabled = assistant.settings?.qwenThinkMode === true
+            const currentContent = lastUserMsg.content
 
-          lastUserMsg.content = processPostsuffixQwen3Model(currentContent, postsuffix, qwenThinkModeEnabled) as any
+            lastUserMsg.content = processPostsuffixQwen3Model(currentContent, qwenThinkModeEnabled)
+          }
+          if (this.provider.id === SystemProviderIds.poe) {
+            // 如果以后 poe 支持 reasoning_effort 参数了，可以删掉这部分
+            let suffix = ''
+            if (isGPT5SeriesModel(model) && reasoningEffort.reasoning_effort) {
+              suffix = ` --reasoning_effort ${reasoningEffort.reasoning_effort}`
+            } else if (isClaudeReasoningModel(model) && reasoningEffort.thinking?.budget_tokens) {
+              suffix = ` --thinking_budget ${reasoningEffort.thinking.budget_tokens}`
+            } else if (isGeminiReasoningModel(model) && reasoningEffort.extra_body?.google?.thinking_config) {
+              suffix = ` --thinking_budget ${reasoningEffort.extra_body.google.thinking_config.thinking_budget}`
+            }
+            // FIXME: poe 不支持多个text part，上传文本文件的时候用的不是file part而是text part，因此会出问题
+            // 临时解决方案是强制poe用string content，但是其实poe部分支持array
+            if (typeof lastUserMsg.content === 'string') {
+              lastUserMsg.content += suffix
+            }
+          }
         }
 
         // 4. 最终请求消息
         let reqMessages: OpenAISdkMessageParam[]
-        if (!systemMessage.content || isNotSupportSystemMessageModel(model)) {
+        if (!systemMessage.content) {
           reqMessages = [...userMessages]
+        } else if (isNotSupportSystemMessageModel(model)) {
+          // transform into user message
+          const firstUserMsg = userMessages.shift()
+          if (firstUserMsg) {
+            firstUserMsg.content = `System Instruction: \n${systemMessage.content}\n\nUser Message(s):\n${firstUserMsg.content}`
+            reqMessages = [firstUserMsg, ...userMessages]
+          } else {
+            reqMessages = []
+          }
         } else {
           reqMessages = [systemMessage, ...userMessages].filter(Boolean) as OpenAISdkMessageParam[]
         }
@@ -583,13 +681,20 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
         // Note: Some providers like Mistral don't support stream_options
         const shouldIncludeStreamOptions = streamOutput && isSupportStreamOptionsProvider(this.provider)
 
-        const reasoningEffort = this.getReasoningEffort(assistant, model)
-
         // minimal cannot be used with web_search tool
         if (isGPT5SeriesModel(model) && reasoningEffort.reasoning_effort === 'minimal' && enableWebSearch) {
           reasoningEffort.reasoning_effort = 'low'
         }
 
+        const modalities: {
+          modalities?: OpenAIModality[]
+        } = {}
+        // for openrouter generate image
+        // https://openrouter.ai/docs/features/multimodal/image-generation
+        if (enableGenerateImage && this.provider.id === SystemProviderIds.openrouter) {
+          modalities.modalities = ['image', 'text']
+        }
+
         const commonParams: OpenAISdkParams = {
           model: model.id,
           messages:
@@ -602,6 +707,7 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
           tools: tools.length > 0 ? tools : undefined,
           stream: streamOutput,
           ...(shouldIncludeStreamOptions ? { stream_options: { include_usage: true } } : {}),
+          ...modalities,
           // groq 有不同的 service tier 配置，不符合 openai 接口类型
           service_tier: this.getServiceTier(model) as OpenAIServiceTier,
           ...this.getProviderSpecificParameters(assistant, model),
@@ -609,7 +715,7 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
           ...getOpenAIWebSearchParams(model, enableWebSearch),
           // OpenRouter usage tracking
           ...(this.provider.id === 'openrouter' ? { usage: { include: true } } : {}),
-          ...(isQwenMTModel(model) ? extra_body : {}),
+          ...extra_body,
           // 只在对话场景下应用自定义参数，避免影响翻译、总结等其他业务逻辑
           // 注意：用户自定义参数总是应该覆盖其他参数
           ...(coreRequest.callType === 'chat' ? this.getCustomParameters(assistant) : {})
@@ -804,7 +910,9 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
                 (typeof choice.delta.content === 'string' && choice.delta.content !== '') ||
                 (typeof (choice.delta as any).reasoning_content === 'string' &&
                   (choice.delta as any).reasoning_content !== '') ||
-                (typeof (choice.delta as any).reasoning === 'string' && (choice.delta as any).reasoning !== ''))
+                (typeof (choice.delta as any).reasoning === 'string' && (choice.delta as any).reasoning !== '') ||
+                ((choice.delta as OpenAISdkRawContentSource).images &&
+                  Array.isArray((choice.delta as OpenAISdkRawContentSource).images)))
             ) {
               contentSource = choice.delta
             } else if ('message' in choice) {
@@ -882,27 +990,59 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
                 accumulatingText = true
               }
               // logger.silly('enqueue TEXT_DELTA')
-              controller.enqueue({
-                type: ChunkType.TEXT_DELTA,
-                text: contentSource.content
-              })
+              // 处理特殊token
+              // 智谱api的一个chunk中只会输出一个token，因而使用 ===，避免正常内容被误判
+              if (
+                context.provider.id === SystemProviderIds.zhipu &&
+                ZHIPU_RESULT_TOKENS.some((pattern) => contentSource.content === pattern)
+              ) {
+                controller.enqueue({
+                  type: ChunkType.TEXT_DELTA,
+                  text: '**' // strong
+                })
+              } else {
+                controller.enqueue({
+                  type: ChunkType.TEXT_DELTA,
+                  text: contentSource.content
+                })
+              }
             } else {
               accumulatingText = false
             }
 
+            // 处理图片内容 (e.g. from OpenRouter Gemini image generation models)
+            if (contentSource.images && Array.isArray(contentSource.images)) {
+              controller.enqueue({
+                type: ChunkType.IMAGE_CREATED
+              })
+              controller.enqueue({
+                type: ChunkType.IMAGE_COMPLETE,
+                image: {
+                  type: 'base64',
+                  images: contentSource.images.map((image) => image.image_url?.url || '')
+                }
+              })
+            }
+
             // 处理工具调用
             if (contentSource.tool_calls) {
               for (const toolCall of contentSource.tool_calls) {
                 if ('index' in toolCall) {
                   const { id, index, function: fun } = toolCall
                   if (fun?.name) {
-                    toolCalls[index] = {
+                    const toolCallObject = {
                       id: id || '',
                       function: {
                         name: fun.name,
                         arguments: fun.arguments || ''
                       },
-                      type: 'function'
+                      type: 'function' as const
+                    }
+
+                    if (index === -1) {
+                      toolCalls.push(toolCallObject)
+                    } else {
+                      toolCalls[index] = toolCallObject
                     }
                   } else if (fun?.arguments) {
                     if (toolCalls[index] && toolCalls[index].type === 'function' && 'function' in toolCalls[index]) {

src/renderer/src/aiCore/clients/openai/OpenAIResponseAPIClient.ts

@@ -5,6 +5,7 @@ import {
   isGPT5SeriesModel,
   isOpenAIChatCompletionOnlyModel,
   isOpenAILLMModel,
+  isOpenAIOpenWeightModel,
   isSupportedReasoningEffortOpenAIModel,
   isSupportVerbosityModel,
   isVisionModel
@@ -374,12 +375,12 @@ export class OpenAIResponseAPIClient extends OpenAIBaseClient<
           text: assistant.prompt || '',
           type: 'input_text'
         }
-        if (isSupportedReasoningEffortOpenAIModel(model)) {
-          if (isSupportDeveloperRoleProvider(this.provider)) {
-            systemMessage.role = 'developer'
-          } else {
-            systemMessage.role = 'system'
-          }
+        if (
+          isSupportedReasoningEffortOpenAIModel(model) &&
+          isSupportDeveloperRoleProvider(this.provider) &&
+          isOpenAIOpenWeightModel(model)
+        ) {
+          systemMessage.role = 'developer'
         }
 
         // 2. 设置工具