refactor: update ClaudeCodeService initialization to remove config parameter

- Modified the initialization of the Claude code provider in ClaudeCodeService to no longer accept a configuration parameter, simplifying the setup process.
- This change enhances clarity and reduces potential configuration errors during provider instantiation.

.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

@@ -18,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

.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

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

.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;

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

@@ -62,6 +62,7 @@ files:
 asarUnpack:
   - resources/**
   - '**/*.{metal,exp,lib}'
+  - 'node_modules/@img/sharp-libvips-*/**'
 win:
   executableName: Cherry Studio
   artifactName: ${productName}-${version}-${arch}-setup.${ext}
@@ -114,46 +115,18 @@ 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: |
-    🎉 新增功能：
-    - 新增 ErrorBoundary 组件包裹 mini 窗口内容，提升错误处理能力
-    - 新增智谱AI模型支持，扩展AI提供商生态
-    - 新增系统 OCR 功能，支持 MacOS 和 Windows 原生文字识别
-    - 新增文件页面批量删除功能，提升文件管理效率
-    - 新增超链接工具提示功能，增强用户体验
-    - 新增 iframe 截图功能，支持更多内容捕获场景
-    - 新增提示变量替换功能，增强编排服务能力
-    - 新增文本增量累积可配置支持，优化流式响应体验
-    - 新增 AbortController 管理功能，改进请求取消机制
-
-    🔧 优化改进：
-    - 重构翻译服务架构，统一使用新的API接口
-    - 重构语言检测功能，使用通用聊天接口替代专用接口
-    - 重构 provider 注册和模型解析逻辑，提升扩展性
-    - 重构 fetchChatCompletion 参数类型定义，增强类型安全
-    - 重构 provider 列表和 URL Schema 弹窗界面
-    - 增强模型推理控制逻辑，支持更多提供商和模型类型
-    - 优化 MCP 工具可见性控制，根据工具状态动态显示知识图标
-    - 改进日志记录机制，将 console.log 替换为 logger.debug
-    - 升级核心依赖包（mermaid, shiki, tanstack 等）
+    🔧 性能优化：
+    - 优化AI服务连接方式，提升响应速度和稳定性
+    - 改进模型列表获取功能，减少不必要的网络请求
+    - 增强各AI服务商的兼容性和连接可靠性
 
     🐛 问题修复：
-    - 修复 API 检查时的错误处理和取消逻辑
-    - 修复翻译过程中中止控制器的错误处理
-    - 修复 useAssistant hook 导致快捷助手渲染问题
-    - 修复 MCP 标签溢出显示问题
-    - 修复缺失的模型图标显示
-    - 修复 ImageViewer 双重菜单问题，改进图标显示
-    - 修复 Qwen MT 模型翻译功能
-    - 修复 Deepin 系统不使用系统默认终端的问题
-    - 修复备份/恢复进度的国际化显示问题
-    - 修复相关依赖缺失问题
-
-    ⚡ 性能提升：
-    - 优化构建配置，排除不必要的 Tesseract.js 核心文件
-    - 提升代码类型定义复用性，减少重复代码
-    - 优化 provider 配置构建逻辑，提升初始化性能
+    - 修复部分AI服务商连接失败的问题
+    - 修复模型配置加载时的潜在错误
+    - 提升应用整体稳定性和容错能力

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 })] : []
 }
@@ -21,12 +23,15 @@ export default defineConfig({
         '@shared': resolve('packages/shared'),
         '@logger': resolve('src/main/services/LoggerService'),
         '@mcp-trace/trace-core': resolve('packages/mcp-trace/trace-core'),
-        '@mcp-trace/trace-node': resolve('packages/mcp-trace/trace-node')
+        '@mcp-trace/trace-node': resolve('packages/mcp-trace/trace-node'),
+        '@cherrystudio/ai-core/provider': resolve('packages/aiCore/src/core/providers'),
+        '@cherrystudio/ai-core/built-in/plugins': resolve('packages/aiCore/src/core/plugins/built-in'),
+        '@cherrystudio/ai-core': resolve('packages/aiCore/src')
       }
     },
     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 // 内联所有动态导入，这是关键配置
@@ -84,7 +89,8 @@ export default defineConfig({
         '@mcp-trace/trace-web': resolve('packages/mcp-trace/trace-web'),
         '@cherrystudio/ai-core/provider': resolve('packages/aiCore/src/core/providers'),
         '@cherrystudio/ai-core/built-in/plugins': resolve('packages/aiCore/src/core/plugins/built-in'),
-        '@cherrystudio/ai-core': resolve('packages/aiCore/src')
+        '@cherrystudio/ai-core': resolve('packages/aiCore/src'),
+        '@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.6.0-beta.3",
+  "version": "1.6.0-beta.6",
   "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,8 +72,10 @@
   "dependencies": {
     "@libsql/client": "0.14.0",
     "@libsql/win32-x64-msvc": "^0.4.7",
-    "@napi-rs/system-ocr": "^1.0.2",
+    "@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",
+    "ai-sdk-provider-claude-code": "^1.1.3",
+    "express": "^5.1.0",
     "graceful-fs": "^4.2.11",
     "jsdom": "26.1.0",
     "node-stream-zip": "^1.15.0",
@@ -110,6 +112,7 @@
     "@cherrystudio/embedjs-loader-xml": "^0.1.31",
     "@cherrystudio/embedjs-ollama": "^0.1.31",
     "@cherrystudio/embedjs-openai": "^0.1.31",
+    "@cherrystudio/extension-table-plus": "workspace:^",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/modifiers": "^9.0.0",
     "@dnd-kit/sortable": "^10.0.0",
@@ -149,9 +152,28 @@
     "@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/express": "^5.0.3",
     "@types/fs-extra": "^11",
+    "@types/he": "^1",
     "@types/lodash": "^4.17.5",
     "@types/markdown-it": "^14",
     "@types/md5": "^2.3.5",
@@ -162,6 +184,7 @@
     "@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.25.1",
     "@uiw/codemirror-themes-all": "^4.25.1",
@@ -174,24 +197,27 @@
     "@viz-js/lang-dot": "^1.0.5",
     "@viz-js/viz": "^3.14.0",
     "@xyflow/react": "^12.4.4",
-    "ai": "^5.0.26",
+    "ai": "^5.0.29",
     "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": "^8.0.2",
     "docx": "^9.0.2",
+    "dompurify": "^3.2.6",
     "dotenv-cli": "^7.4.2",
-    "electron": "37.3.1",
+    "electron": "37.4.0",
     "electron-builder": "26.0.15",
     "electron-devtools-installer": "^3.2.0",
     "electron-store": "^8.2.0",
@@ -211,7 +237,10 @@
     "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",
@@ -268,11 +297,13 @@
     "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",
@@ -283,6 +314,8 @@
     "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"
   },
@@ -305,7 +338,13 @@
     "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"
+    "tesseract.js@npm:*": "patch:tesseract.js@npm%3A6.0.1#~/.yarn/patches/tesseract.js-npm-6.0.1-2562a7e46d.patch",
+    "@img/sharp-darwin-arm64": "0.34.3",
+    "@img/sharp-darwin-x64": "0.34.3",
+    "@img/sharp-linux-arm": "0.34.3",
+    "@img/sharp-linux-arm64": "0.34.3",
+    "@img/sharp-linux-x64": "0.34.3",
+    "@img/sharp-win32-x64": "0.34.3"
   },
   "packageManager": "yarn@4.9.1",
   "lint-staged": {

packages/aiCore/src/core/providers/__tests__/registry-functionality.test.ts

@@ -99,8 +99,8 @@ describe('Provider Registry 功能测试', () => {
     })
 
     it('能够获取语言模型', () => {
-      // 在没有注册 provider 的情况下，这个函数可能会抛出错误或返回 undefined
-      expect(() => getLanguageModel('non-existent')).not.toThrow()
+      // 在没有注册 provider 的情况下，这个函数应该会抛出错误
+      expect(() => getLanguageModel('non-existent')).toThrow('No providers registered')
     })
   })
 

packages/aiCore/src/core/providers/registry.ts

@@ -93,7 +93,7 @@ initializeBuiltInConfigs()
 export function registerProviderConfig(config: ProviderConfig): boolean {
   try {
     // 验证配置
-    if (!config.id || !config.name) {
+    if (!config || !config.id || !config.name) {
       return false
     }
 

packages/aiCore/src/core/providers/schemas.ts

@@ -4,11 +4,13 @@
 
 import { createAnthropic } from '@ai-sdk/anthropic'
 import { createAzure } from '@ai-sdk/azure'
+import { type AzureOpenAIProviderSettings } from '@ai-sdk/azure'
 import { createDeepSeek } from '@ai-sdk/deepseek'
 import { createGoogleGenerativeAI } from '@ai-sdk/google'
 import { createOpenAI, type OpenAIProviderSettings } from '@ai-sdk/openai'
 import { createOpenAICompatible } from '@ai-sdk/openai-compatible'
 import { createXai } from '@ai-sdk/xai'
+import { customProvider, type Provider } from 'ai'
 import * as z from 'zod'
 
 /**
@@ -16,12 +18,13 @@ import * as z from 'zod'
  */
 export const baseProviderIds = [
   'openai',
-  'openai-responses',
+  'openai-chat',
   'openai-compatible',
   'anthropic',
   'google',
   'xai',
   'azure',
+  'azure-responses',
   'deepseek'
 ] as const
 
@@ -38,7 +41,7 @@ export type BaseProviderId = z.infer<typeof baseProviderIdSchema>
 export const baseProviderSchema = z.object({
   id: baseProviderIdSchema,
   name: z.string(),
-  creator: z.function().args(z.any()).returns(z.any()),
+  creator: z.function().args(z.any()).returns(z.any()) as z.ZodType<(options: any) => Provider>,
   supportsImageGeneration: z.boolean()
 })
 
@@ -56,9 +59,17 @@ export const baseProviders = [
     supportsImageGeneration: true
   },
   {
-    id: 'openai-responses',
-    name: 'OpenAI Responses',
-    creator: (options: OpenAIProviderSettings) => createOpenAI(options).responses,
+    id: 'openai-chat',
+    name: 'OpenAI Chat',
+    creator: (options: OpenAIProviderSettings) => {
+      const provider = createOpenAI(options)
+      return customProvider({
+        fallbackProvider: {
+          ...provider,
+          languageModel: (modelId: string) => provider.chat(modelId)
+        }
+      })
+    },
     supportsImageGeneration: true
   },
   {
@@ -91,6 +102,20 @@ export const baseProviders = [
     creator: createAzure,
     supportsImageGeneration: true
   },
+  {
+    id: 'azure-responses',
+    name: 'Azure OpenAI Responses',
+    creator: (options: AzureOpenAIProviderSettings) => {
+      const provider = createAzure(options)
+      return customProvider({
+        fallbackProvider: {
+          ...provider,
+          languageModel: (modelId: string) => provider.responses(modelId)
+        }
+      })
+    },
+    supportsImageGeneration: true
+  },
   {
     id: 'deepseek',
     name: 'DeepSeek',

packages/aiCore/src/core/runtime/__tests__/generateImage.test.ts

@@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { type AiPlugin } from '../../plugins'
 import { globalRegistryManagement } from '../../providers/RegistryManagement'
-import { ImageGenerationError } from '../errors'
+import { ImageGenerationError, ImageModelResolutionError } from '../errors'
 import { RuntimeExecutor } from '../executor'
 
 // Mock dependencies
@@ -22,7 +22,8 @@ vi.mock('ai', () => ({
 vi.mock('../../providers/RegistryManagement', () => ({
   globalRegistryManagement: {
     imageModel: vi.fn()
-  }
+  },
+  DEFAULT_SEPARATOR: '|'
 }))
 
 describe('RuntimeExecutor.generateImage', () => {
@@ -68,21 +69,16 @@ describe('RuntimeExecutor.generateImage', () => {
       responses: []
     }
 
-    // Setup mocks
+    // Setup mocks to avoid "No providers registered" error
     vi.mocked(globalRegistryManagement.imageModel).mockReturnValue(mockImageModel)
     vi.mocked(aiGenerateImage).mockResolvedValue(mockGenerateImageResult)
-
-    // Reset mock implementation in case it was changed by previous tests
-    vi.mocked(globalRegistryManagement.imageModel).mockImplementation(() => mockImageModel)
   })
 
   describe('Basic functionality', () => {
     it('should generate a single image with minimal parameters', async () => {
-      const result = await executor.generateImage('dall-e-3', {
-        prompt: 'A futuristic cityscape at sunset'
-      })
+      const result = await executor.generateImage({ model: 'dall-e-3', prompt: 'A futuristic cityscape at sunset' })
 
-      expect(globalRegistryManagement.imageModel).toHaveBeenCalledWith('openai:dall-e-3')
+      expect(globalRegistryManagement.imageModel).toHaveBeenCalledWith('openai|dall-e-3')
 
       expect(aiGenerateImage).toHaveBeenCalledWith({
         model: mockImageModel,
@@ -93,7 +89,8 @@ describe('RuntimeExecutor.generateImage', () => {
     })
 
     it('should generate image with pre-created model', async () => {
-      const result = await executor.generateImage(mockImageModel, {
+      const result = await executor.generateImage({
+        model: mockImageModel,
         prompt: 'A beautiful landscape'
       })
 
@@ -107,10 +104,7 @@ describe('RuntimeExecutor.generateImage', () => {
     })
 
     it('should support multiple images generation', async () => {
-      await executor.generateImage('dall-e-3', {
-        prompt: 'A futuristic cityscape',
-        n: 3
-      })
+      await executor.generateImage({ model: 'dall-e-3', prompt: 'A futuristic cityscape', n: 3 })
 
       expect(aiGenerateImage).toHaveBeenCalledWith({
         model: mockImageModel,
@@ -120,10 +114,7 @@ describe('RuntimeExecutor.generateImage', () => {
     })
 
     it('should support size specification', async () => {
-      await executor.generateImage('dall-e-3', {
-        prompt: 'A beautiful sunset',
-        size: '1024x1024'
-      })
+      await executor.generateImage({ model: 'dall-e-3', prompt: 'A beautiful sunset', size: '1024x1024' })
 
       expect(aiGenerateImage).toHaveBeenCalledWith({
         model: mockImageModel,
@@ -133,10 +124,7 @@ describe('RuntimeExecutor.generateImage', () => {
     })
 
     it('should support aspect ratio specification', async () => {
-      await executor.generateImage('dall-e-3', {
-        prompt: 'A mountain landscape',
-        aspectRatio: '16:9'
-      })
+      await executor.generateImage({ model: 'dall-e-3', prompt: 'A mountain landscape', aspectRatio: '16:9' })
 
       expect(aiGenerateImage).toHaveBeenCalledWith({
         model: mockImageModel,
@@ -146,10 +134,7 @@ describe('RuntimeExecutor.generateImage', () => {
     })
 
     it('should support seed for consistent output', async () => {
-      await executor.generateImage('dall-e-3', {
-        prompt: 'A cat in space',
-        seed: 1234567890
-      })
+      await executor.generateImage({ model: 'dall-e-3', prompt: 'A cat in space', seed: 1234567890 })
 
       expect(aiGenerateImage).toHaveBeenCalledWith({
         model: mockImageModel,
@@ -161,10 +146,7 @@ describe('RuntimeExecutor.generateImage', () => {
     it('should support abort signal', async () => {
       const abortController = new AbortController()
 
-      await executor.generateImage('dall-e-3', {
-        prompt: 'A cityscape',
-        abortSignal: abortController.signal
-      })
+      await executor.generateImage({ model: 'dall-e-3', prompt: 'A cityscape', abortSignal: abortController.signal })
 
       expect(aiGenerateImage).toHaveBeenCalledWith({
         model: mockImageModel,
@@ -174,7 +156,8 @@ describe('RuntimeExecutor.generateImage', () => {
     })
 
     it('should support provider-specific options', async () => {
-      await executor.generateImage('dall-e-3', {
+      await executor.generateImage({
+        model: 'dall-e-3',
         prompt: 'A space station',
         providerOptions: {
           openai: {
@@ -197,7 +180,8 @@ describe('RuntimeExecutor.generateImage', () => {
     })
 
     it('should support custom headers', async () => {
-      await executor.generateImage('dall-e-3', {
+      await executor.generateImage({
+        model: 'dall-e-3',
         prompt: 'A robot',
         headers: {
           'X-Custom-Header': 'test-value'
@@ -244,9 +228,7 @@ describe('RuntimeExecutor.generateImage', () => {
         [testPlugin]
       )
 
-      const result = await executorWithPlugin.generateImage('dall-e-3', {
-        prompt: 'A test image'
-      })
+      const result = await executorWithPlugin.generateImage({ model: 'dall-e-3', prompt: 'A test image' })
 
       expect(pluginCallOrder).toEqual(['onRequestStart', 'transformParams', 'transformResult', 'onRequestEnd'])
 
@@ -289,9 +271,7 @@ describe('RuntimeExecutor.generateImage', () => {
         [modelResolutionPlugin]
       )
 
-      await executorWithPlugin.generateImage('dall-e-3', {
-        prompt: 'A test image'
-      })
+      await executorWithPlugin.generateImage({ model: 'dall-e-3', prompt: 'A test image' })
 
       expect(modelResolutionPlugin.resolveModel).toHaveBeenCalledWith(
         'dall-e-3',
@@ -314,6 +294,7 @@ describe('RuntimeExecutor.generateImage', () => {
           if (!context.isRecursiveCall && params.prompt === 'original') {
             // Make a recursive call with modified prompt
             await context.recursiveCall({
+              model: 'dall-e-3',
               prompt: 'modified'
             })
           }
@@ -329,9 +310,7 @@ describe('RuntimeExecutor.generateImage', () => {
         [recursivePlugin]
       )
 
-      await executorWithPlugin.generateImage('dall-e-3', {
-        prompt: 'original'
-      })
+      await executorWithPlugin.generateImage({ model: 'dall-e-3', prompt: 'original' })
 
       expect(recursivePlugin.transformParams).toHaveBeenCalledTimes(2)
       expect(aiGenerateImage).toHaveBeenCalledTimes(2)
@@ -345,22 +324,47 @@ describe('RuntimeExecutor.generateImage', () => {
         throw modelError
       })
 
-      await expect(
-        executor.generateImage('invalid-model', {
-          prompt: 'A test image'
-        })
-      ).rejects.toThrow(ImageGenerationError)
+      await expect(executor.generateImage({ model: 'invalid-model', prompt: 'A test image' })).rejects.toThrow(
+        ImageGenerationError
+      )
+    })
+
+    it('should handle ImageModelResolutionError correctly', async () => {
+      const resolutionError = new ImageModelResolutionError('invalid-model', 'openai', new Error('Model not found'))
+      vi.mocked(globalRegistryManagement.imageModel).mockImplementation(() => {
+        throw resolutionError
+      })
+
+      const thrownError = await executor
+        .generateImage({ model: 'invalid-model', prompt: 'A test image' })
+        .catch((error) => error)
+
+      expect(thrownError).toBeInstanceOf(ImageGenerationError)
+      expect(thrownError.message).toContain('Failed to generate image:')
+      expect(thrownError.providerId).toBe('openai')
+      expect(thrownError.modelId).toBe('invalid-model')
+      expect(thrownError.cause).toBeInstanceOf(ImageModelResolutionError)
+      expect(thrownError.cause.message).toContain('Failed to resolve image model: invalid-model')
+    })
+
+    it('should handle ImageModelResolutionError without provider', async () => {
+      const resolutionError = new ImageModelResolutionError('unknown-model')
+      vi.mocked(globalRegistryManagement.imageModel).mockImplementation(() => {
+        throw resolutionError
+      })
+
+      await expect(executor.generateImage({ model: 'unknown-model', prompt: 'A test image' })).rejects.toThrow(
+        ImageGenerationError
+      )
     })
 
     it('should handle image generation API errors', async () => {
       const apiError = new Error('API request failed')
       vi.mocked(aiGenerateImage).mockRejectedValue(apiError)
 
-      await expect(
-        executor.generateImage('dall-e-3', {
-          prompt: 'A test image'
-        })
-      ).rejects.toThrow('Failed to generate image: API request failed')
+      await expect(executor.generateImage({ model: 'dall-e-3', prompt: 'A test image' })).rejects.toThrow(
+        'Failed to generate image:'
+      )
     })
 
     it('should handle NoImageGeneratedError', async () => {
@@ -372,11 +376,9 @@ describe('RuntimeExecutor.generateImage', () => {
       vi.mocked(aiGenerateImage).mockRejectedValue(noImageError)
       vi.mocked(NoImageGeneratedError.isInstance).mockReturnValue(true)
 
-      await expect(
-        executor.generateImage('dall-e-3', {
-          prompt: 'A test image'
-        })
-      ).rejects.toThrow('Failed to generate image: No image generated')
+      await expect(executor.generateImage({ model: 'dall-e-3', prompt: 'A test image' })).rejects.toThrow(
+        'Failed to generate image:'
+      )
     })
 
     it('should execute onError plugin hook on failure', async () => {
@@ -396,11 +398,9 @@ describe('RuntimeExecutor.generateImage', () => {
         [errorPlugin]
       )
 
-      await expect(
-        executorWithPlugin.generateImage('dall-e-3', {
-          prompt: 'A test image'
-        })
-      ).rejects.toThrow('Failed to generate image: Generation failed')
+      await expect(executorWithPlugin.generateImage({ model: 'dall-e-3', prompt: 'A test image' })).rejects.toThrow(
+        'Failed to generate image:'
+      )
 
       expect(errorPlugin.onError).toHaveBeenCalledWith(
         error,
@@ -420,11 +420,8 @@ describe('RuntimeExecutor.generateImage', () => {
       setTimeout(() => abortController.abort(), 10)
 
       await expect(
-        executor.generateImage('dall-e-3', {
-          prompt: 'A test image',
-          abortSignal: abortController.signal
-        })
-      ).rejects.toThrow('Operation was aborted')
+        executor.generateImage({ model: 'dall-e-3', prompt: 'A test image', abortSignal: abortController.signal })
+      ).rejects.toThrow('Failed to generate image:')
     })
   })
 
@@ -434,11 +431,9 @@ describe('RuntimeExecutor.generateImage', () => {
         apiKey: 'google-key'
       })
 
-      await googleExecutor.generateImage('imagen-3.0-generate-002', {
-        prompt: 'A landscape'
-      })
+      await googleExecutor.generateImage({ model: 'imagen-3.0-generate-002', prompt: 'A landscape' })
 
-      expect(globalRegistryManagement.imageModel).toHaveBeenCalledWith('google:imagen-3.0-generate-002')
+      expect(globalRegistryManagement.imageModel).toHaveBeenCalledWith('google|imagen-3.0-generate-002')
     })
 
     it('should support xAI Grok image models', async () => {
@@ -446,21 +441,15 @@ describe('RuntimeExecutor.generateImage', () => {
         apiKey: 'xai-key'
       })
 
-      await xaiExecutor.generateImage('grok-2-image', {
-        prompt: 'A futuristic robot'
-      })
+      await xaiExecutor.generateImage({ model: 'grok-2-image', prompt: 'A futuristic robot' })
 
-      expect(globalRegistryManagement.imageModel).toHaveBeenCalledWith('xai:grok-2-image')
+      expect(globalRegistryManagement.imageModel).toHaveBeenCalledWith('xai|grok-2-image')
     })
   })
 
   describe('Advanced features', () => {
     it('should support batch image generation with maxImagesPerCall', async () => {
-      await executor.generateImage('dall-e-3', {
-        prompt: 'A test image',
-        n: 10,
-        maxImagesPerCall: 5
-      })
+      await executor.generateImage({ model: 'dall-e-3', prompt: 'A test image', n: 10, maxImagesPerCall: 5 })
 
       expect(aiGenerateImage).toHaveBeenCalledWith({
         model: mockImageModel,
@@ -471,10 +460,7 @@ describe('RuntimeExecutor.generateImage', () => {
     })
 
     it('should support retries with maxRetries', async () => {
-      await executor.generateImage('dall-e-3', {
-        prompt: 'A test image',
-        maxRetries: 3
-      })
+      await executor.generateImage({ model: 'dall-e-3', prompt: 'A test image', maxRetries: 3 })
 
       expect(aiGenerateImage).toHaveBeenCalledWith({
         model: mockImageModel,
@@ -496,7 +482,8 @@ describe('RuntimeExecutor.generateImage', () => {
 
       vi.mocked(aiGenerateImage).mockResolvedValue(resultWithWarnings)
 
-      const result = await executor.generateImage('dall-e-3', {
+      const result = await executor.generateImage({
+        model: 'dall-e-3',
         prompt: 'A test image',
         size: '2048x2048' // Unsupported size
       })
@@ -506,9 +493,7 @@ describe('RuntimeExecutor.generateImage', () => {
     })
 
     it('should provide access to provider metadata', async () => {
-      const result = await executor.generateImage('dall-e-3', {
-        prompt: 'A test image'
-      })
+      const result = await executor.generateImage({ model: 'dall-e-3', prompt: 'A test image' })
 
       expect(result.providerMetadata).toBeDefined()
       expect(result.providerMetadata.openai).toBeDefined()
@@ -528,9 +513,7 @@ describe('RuntimeExecutor.generateImage', () => {
 
       vi.mocked(aiGenerateImage).mockResolvedValue(resultWithMetadata)
 
-      const result = await executor.generateImage('dall-e-3', {
-        prompt: 'A test image'
-      })
+      const result = await executor.generateImage({ model: 'dall-e-3', prompt: 'A test image' })
 
       expect(result.responses).toHaveLength(1)
       expect(result.responses[0].modelId).toBe('dall-e-3')

packages/aiCore/src/core/runtime/executor.ts

@@ -72,42 +72,36 @@ export class RuntimeExecutor<T extends ProviderId = ProviderId> {
   // === 高阶重载：直接使用模型 ===
 
   /**
-   * 流式文本生成 - 使用已创建的模型（高级用法）
+   * 流式文本生成
    */
   async streamText(
-    model: LanguageModel,
-    params: Omit<Parameters<typeof streamText>[0], 'model'>
-  ): Promise<ReturnType<typeof streamText>>
-  async streamText(
-    modelId: string,
-    params: Omit<Parameters<typeof streamText>[0], 'model'>,
-    options?: {
-      middlewares?: LanguageModelV2Middleware[]
-    }
-  ): Promise<ReturnType<typeof streamText>>
-  async streamText(
-    modelOrId: LanguageModel,
-    params: Omit<Parameters<typeof streamText>[0], 'model'>,
+    params: Parameters<typeof streamText>[0],
     options?: {
       middlewares?: LanguageModelV2Middleware[]
     }
   ): Promise<ReturnType<typeof streamText>> {
-    this.pluginEngine.usePlugins([
-      this.createResolveModelPlugin(options?.middlewares),
-      this.createConfigureContextPlugin()
-    ])
+    const { model, ...restParams } = params
+
+    // 根据 model 类型决定插件配置
+    if (typeof model === 'string') {
+      this.pluginEngine.usePlugins([
+        this.createResolveModelPlugin(options?.middlewares),
+        this.createConfigureContextPlugin()
+      ])
+    } else {
+      this.pluginEngine.usePlugins([this.createConfigureContextPlugin()])
+    }
 
-    // 2. 执行插件处理
     return this.pluginEngine.executeStreamWithPlugins(
       'streamText',
-      typeof modelOrId === 'string' ? modelOrId : modelOrId.modelId,
-      params,
-      async (model, transformedParams, streamTransforms) => {
+      model,
+      restParams,
+      async (resolvedModel, transformedParams, streamTransforms) => {
         const experimental_transform =
           params?.experimental_transform ?? (streamTransforms.length > 0 ? streamTransforms : undefined)
 
         const finalParams = {
-          model,
+          model: resolvedModel,
           ...transformedParams,
           experimental_transform
         } as Parameters<typeof streamText>[0]
@@ -120,145 +114,126 @@ export class RuntimeExecutor<T extends ProviderId = ProviderId> {
   // === 其他方法的重载 ===
 
   /**
-   * 生成文本 - 使用已创建的模型
+   * 生成文本
    */
   async generateText(
-    model: LanguageModel,
-    params: Omit<Parameters<typeof generateText>[0], 'model'>
-  ): Promise<ReturnType<typeof generateText>>
-  async generateText(
-    modelId: string,
-    params: Omit<Parameters<typeof generateText>[0], 'model'>,
-    options?: {
-      middlewares?: LanguageModelV2Middleware[]
-    }
-  ): Promise<ReturnType<typeof generateText>>
-  async generateText(
-    modelOrId: LanguageModel | string,
-    params: Omit<Parameters<typeof generateText>[0], 'model'>,
+    params: Parameters<typeof generateText>[0],
     options?: {
       middlewares?: LanguageModelV2Middleware[]
     }
   ): Promise<ReturnType<typeof generateText>> {
-    this.pluginEngine.usePlugins([
-      this.createResolveModelPlugin(options?.middlewares),
-      this.createConfigureContextPlugin()
-    ])
+    const { model, ...restParams } = params
+
+    // 根据 model 类型决定插件配置
+    if (typeof model === 'string') {
+      this.pluginEngine.usePlugins([
+        this.createResolveModelPlugin(options?.middlewares),
+        this.createConfigureContextPlugin()
+      ])
+    } else {
+      this.pluginEngine.usePlugins([this.createConfigureContextPlugin()])
+    }
 
     return this.pluginEngine.executeWithPlugins(
       'generateText',
-      typeof modelOrId === 'string' ? modelOrId : modelOrId.modelId,
-      params,
-      async (model, transformedParams) =>
-        generateText({ model, ...transformedParams } as Parameters<typeof generateText>[0])
+      model,
+      restParams,
+      async (resolvedModel, transformedParams) =>
+        generateText({ model: resolvedModel, ...transformedParams } as Parameters<typeof generateText>[0])
     )
   }
 
   /**
-   * 生成结构化对象 - 使用已创建的模型
+   * 生成结构化对象
    */
   async generateObject(
-    model: LanguageModel,
-    params: Omit<Parameters<typeof generateObject>[0], 'model'>
-  ): Promise<ReturnType<typeof generateObject>>
-  async generateObject(
-    modelOrId: string,
-    params: Omit<Parameters<typeof generateObject>[0], 'model'>,
-    options?: {
-      middlewares?: LanguageModelV2Middleware[]
-    }
-  ): Promise<ReturnType<typeof generateObject>>
-  async generateObject(
-    modelOrId: LanguageModel | string,
-    params: Omit<Parameters<typeof generateObject>[0], 'model'>,
+    params: Parameters<typeof generateObject>[0],
     options?: {
       middlewares?: LanguageModelV2Middleware[]
     }
   ): Promise<ReturnType<typeof generateObject>> {
-    this.pluginEngine.usePlugins([
-      this.createResolveModelPlugin(options?.middlewares),
-      this.createConfigureContextPlugin()
-    ])
+    const { model, ...restParams } = params
+
+    // 根据 model 类型决定插件配置
+    if (typeof model === 'string') {
+      this.pluginEngine.usePlugins([
+        this.createResolveModelPlugin(options?.middlewares),
+        this.createConfigureContextPlugin()
+      ])
+    } else {
+      this.pluginEngine.usePlugins([this.createConfigureContextPlugin()])
+    }
 
     return this.pluginEngine.executeWithPlugins(
       'generateObject',
-      typeof modelOrId === 'string' ? modelOrId : modelOrId.modelId,
-      params,
-      async (model, transformedParams) =>
-        generateObject({ model, ...transformedParams } as Parameters<typeof generateObject>[0])
+      model,
+      restParams,
+      async (resolvedModel, transformedParams) =>
+        generateObject({ model: resolvedModel, ...transformedParams } as Parameters<typeof generateObject>[0])
     )
   }
 
   /**
-   * 流式生成结构化对象 - 使用已创建的模型
+   * 流式生成结构化对象
    */
   async streamObject(
-    model: LanguageModel,
-    params: Omit<Parameters<typeof streamObject>[0], 'model'>
-  ): Promise<ReturnType<typeof streamObject>>
-  async streamObject(
-    modelId: string,
-    params: Omit<Parameters<typeof streamObject>[0], 'model'>,
-    options?: {
-      middlewares?: LanguageModelV2Middleware[]
-    }
-  ): Promise<ReturnType<typeof streamObject>>
-  async streamObject(
-    modelOrId: LanguageModel | string,
-    params: Omit<Parameters<typeof streamObject>[0], 'model'>,
+    params: Parameters<typeof streamObject>[0],
     options?: {
       middlewares?: LanguageModelV2Middleware[]
     }
   ): Promise<ReturnType<typeof streamObject>> {
-    this.pluginEngine.usePlugins([
-      this.createResolveModelPlugin(options?.middlewares),
-      this.createConfigureContextPlugin()
-    ])
+    const { model, ...restParams } = params
+
+    // 根据 model 类型决定插件配置
+    if (typeof model === 'string') {
+      this.pluginEngine.usePlugins([
+        this.createResolveModelPlugin(options?.middlewares),
+        this.createConfigureContextPlugin()
+      ])
+    } else {
+      this.pluginEngine.usePlugins([this.createConfigureContextPlugin()])
+    }
 
     return this.pluginEngine.executeWithPlugins(
       'streamObject',
-      typeof modelOrId === 'string' ? modelOrId : modelOrId.modelId,
-      params,
-      async (model, transformedParams) =>
-        streamObject({ model, ...transformedParams } as Parameters<typeof streamObject>[0])
+      model,
+      restParams,
+      async (resolvedModel, transformedParams) =>
+        streamObject({ model: resolvedModel, ...transformedParams } as Parameters<typeof streamObject>[0])
     )
   }
 
   /**
-   * 生成图像 - 使用已创建的图像模型
+   * 生成图像
    */
   async generateImage(
-    model: ImageModelV2,
-    params: Omit<Parameters<typeof generateImage>[0], 'model'>
-  ): Promise<ReturnType<typeof generateImage>>
-  async generateImage(
-    modelId: string,
-    params: Omit<Parameters<typeof generateImage>[0], 'model'>,
-    options?: {
-      middlewares?: LanguageModelV2Middleware[]
-    }
-  ): Promise<ReturnType<typeof generateImage>>
-  async generateImage(
-    modelOrId: ImageModelV2 | string,
-    params: Omit<Parameters<typeof generateImage>[0], 'model'>
+    params: Omit<Parameters<typeof generateImage>[0], 'model'> & { model: string | ImageModelV2 }
   ): Promise<ReturnType<typeof generateImage>> {
     try {
-      this.pluginEngine.usePlugins([this.createResolveImageModelPlugin(), this.createConfigureContextPlugin()])
+      const { model, ...restParams } = params
+
+      // 根据 model 类型决定插件配置
+      if (typeof model === 'string') {
+        this.pluginEngine.usePlugins([this.createResolveImageModelPlugin(), this.createConfigureContextPlugin()])
+      } else {
+        this.pluginEngine.usePlugins([this.createConfigureContextPlugin()])
+      }
 
       return await this.pluginEngine.executeImageWithPlugins(
         'generateImage',
-        typeof modelOrId === 'string' ? modelOrId : modelOrId.modelId,
-        params,
-        async (model, transformedParams) => {
-          return await generateImage({ model, ...transformedParams })
+        model,
+        restParams,
+        async (resolvedModel, transformedParams) => {
+          return await generateImage({ model: resolvedModel, ...transformedParams })
         }
       )
     } catch (error) {
       if (error instanceof Error) {
+        const modelId = typeof params.model === 'string' ? params.model : params.model.modelId
         throw new ImageGenerationError(
           `Failed to generate image: ${error.message}`,
           this.config.providerId,
-          typeof modelOrId === 'string' ? modelOrId : modelOrId.modelId,
+          modelId,
           error
         )
       }

packages/aiCore/src/core/runtime/index.ts

@@ -46,13 +46,12 @@ export function createOpenAICompatibleExecutor(
 export async function streamText<T extends ProviderId>(
   providerId: T,
   options: ProviderSettingsMap[T] & { mode?: 'chat' | 'responses' },
-  modelId: string,
-  params: Parameters<RuntimeExecutor<T>['streamText']>[1],
+  params: Parameters<RuntimeExecutor<T>['streamText']>[0],
   plugins?: AiPlugin[],
   middlewares?: LanguageModelV2Middleware[]
 ): Promise<ReturnType<RuntimeExecutor<T>['streamText']>> {
   const executor = createExecutor(providerId, options, plugins)
-  return executor.streamText(modelId, params, { middlewares })
+  return executor.streamText(params, { middlewares })
 }
 
 /**
@@ -61,13 +60,12 @@ export async function streamText<T extends ProviderId>(
 export async function generateText<T extends ProviderId>(
   providerId: T,
   options: ProviderSettingsMap[T] & { mode?: 'chat' | 'responses' },
-  modelId: string,
-  params: Parameters<RuntimeExecutor<T>['generateText']>[1],
+  params: Parameters<RuntimeExecutor<T>['generateText']>[0],
   plugins?: AiPlugin[],
   middlewares?: LanguageModelV2Middleware[]
 ): Promise<ReturnType<RuntimeExecutor<T>['generateText']>> {
   const executor = createExecutor(providerId, options, plugins)
-  return executor.generateText(modelId, params, { middlewares })
+  return executor.generateText(params, { middlewares })
 }
 
 /**
@@ -76,13 +74,12 @@ export async function generateText<T extends ProviderId>(
 export async function generateObject<T extends ProviderId>(
   providerId: T,
   options: ProviderSettingsMap[T] & { mode?: 'chat' | 'responses' },
-  modelId: string,
-  params: Parameters<RuntimeExecutor<T>['generateObject']>[1],
+  params: Parameters<RuntimeExecutor<T>['generateObject']>[0],
   plugins?: AiPlugin[],
   middlewares?: LanguageModelV2Middleware[]
 ): Promise<ReturnType<RuntimeExecutor<T>['generateObject']>> {
   const executor = createExecutor(providerId, options, plugins)
-  return executor.generateObject(modelId, params, { middlewares })
+  return executor.generateObject(params, { middlewares })
 }
 
 /**
@@ -91,13 +88,12 @@ export async function generateObject<T extends ProviderId>(
 export async function streamObject<T extends ProviderId>(
   providerId: T,
   options: ProviderSettingsMap[T] & { mode?: 'chat' | 'responses' },
-  modelId: string,
-  params: Parameters<RuntimeExecutor<T>['streamObject']>[1],
+  params: Parameters<RuntimeExecutor<T>['streamObject']>[0],
   plugins?: AiPlugin[],
   middlewares?: LanguageModelV2Middleware[]
 ): Promise<ReturnType<RuntimeExecutor<T>['streamObject']>> {
   const executor = createExecutor(providerId, options, plugins)
-  return executor.streamObject(modelId, params, { middlewares })
+  return executor.streamObject(params, { middlewares })
 }
 
 /**
@@ -106,13 +102,11 @@ export async function streamObject<T extends ProviderId>(
 export async function generateImage<T extends ProviderId>(
   providerId: T,
   options: ProviderSettingsMap[T] & { mode?: 'chat' | 'responses' },
-  modelId: string,
-  params: Parameters<RuntimeExecutor<T>['generateImage']>[1],
-  plugins?: AiPlugin[],
-  middlewares?: LanguageModelV2Middleware[]
+  params: Parameters<RuntimeExecutor<T>['generateImage']>[0],
+  plugins?: AiPlugin[]
 ): Promise<ReturnType<RuntimeExecutor<T>['generateImage']>> {
   const executor = createExecutor(providerId, options, plugins)
-  return executor.generateImage(modelId, params, { middlewares })
+  return executor.generateImage(params)
 }
 
 // === Agent 功能预留 ===

packages/aiCore/src/core/runtime/pluginEngine.ts

@@ -64,11 +64,24 @@ export class PluginEngine<T extends ProviderId = ProviderId> {
    */
   async executeWithPlugins<TParams, TResult>(
     methodName: string,
-    modelId: string,
+    model: LanguageModel,
     params: TParams,
     executor: (model: LanguageModel, transformedParams: TParams) => Promise<TResult>,
     _context?: ReturnType<typeof createContext>
   ): Promise<TResult> {
+    // 统一处理模型解析
+    let resolvedModel: LanguageModel | undefined
+    let modelId: string
+
+    if (typeof model === 'string') {
+      // 字符串：需要通过插件解析
+      modelId = model
+    } else {
+      // 模型对象：直接使用
+      resolvedModel = model
+      modelId = model.modelId
+    }
+
     // 使用正确的createContext创建请求上下文
     const context = _context ? _context : createContext(this.providerId, modelId, params)
 
@@ -76,7 +89,7 @@ export class PluginEngine<T extends ProviderId = ProviderId> {
     context.recursiveCall = async (newParams: any): Promise<TResult> => {
       // 递归调用自身，重新走完整的插件流程
       context.isRecursiveCall = true
-      const result = await this.executeWithPlugins(methodName, modelId, newParams, executor, context)
+      const result = await this.executeWithPlugins(methodName, model, newParams, executor, context)
       context.isRecursiveCall = false
       return result
     }
@@ -88,17 +101,24 @@ export class PluginEngine<T extends ProviderId = ProviderId> {
       // 1. 触发请求开始事件
       await this.pluginManager.executeParallel('onRequestStart', context)
 
-      // 2. 解析模型
-      const model = await this.pluginManager.executeFirst<LanguageModel>('resolveModel', modelId, context)
-      if (!model) {
-        throw new Error(`Failed to resolve model: ${modelId}`)
+      // 2. 解析模型（如果是字符串）
+      if (typeof model === 'string') {
+        const resolved = await this.pluginManager.executeFirst<LanguageModel>('resolveModel', modelId, context)
+        if (!resolved) {
+          throw new Error(`Failed to resolve model: ${modelId}`)
+        }
+        resolvedModel = resolved
+      }
+
+      if (!resolvedModel) {
+        throw new Error(`Model resolution failed: no model available`)
       }
 
       // 3. 转换请求参数
       const transformedParams = await this.pluginManager.executeSequential('transformParams', params, context)
 
       // 4. 执行具体的 API 调用
-      const result = await executor(model, transformedParams)
+      const result = await executor(resolvedModel, transformedParams)
 
       // 5. 转换结果（对于非流式调用）
       const transformedResult = await this.pluginManager.executeSequential('transformResult', result, context)
@@ -120,11 +140,24 @@ export class PluginEngine<T extends ProviderId = ProviderId> {
    */
   async executeImageWithPlugins<TParams, TResult>(
     methodName: string,
-    modelId: string,
+    model: ImageModelV2 | string,
     params: TParams,
     executor: (model: ImageModelV2, transformedParams: TParams) => Promise<TResult>,
     _context?: ReturnType<typeof createContext>
   ): Promise<TResult> {
+    // 统一处理模型解析
+    let resolvedModel: ImageModelV2 | undefined
+    let modelId: string
+
+    if (typeof model === 'string') {
+      // 字符串：需要通过插件解析
+      modelId = model
+    } else {
+      // 模型对象：直接使用
+      resolvedModel = model
+      modelId = model.modelId
+    }
+
     // 使用正确的createContext创建请求上下文
     const context = _context ? _context : createContext(this.providerId, modelId, params)
 
@@ -132,7 +165,7 @@ export class PluginEngine<T extends ProviderId = ProviderId> {
     context.recursiveCall = async (newParams: any): Promise<TResult> => {
       // 递归调用自身，重新走完整的插件流程
       context.isRecursiveCall = true
-      const result = await this.executeImageWithPlugins(methodName, modelId, newParams, executor, context)
+      const result = await this.executeImageWithPlugins(methodName, model, newParams, executor, context)
       context.isRecursiveCall = false
       return result
     }
@@ -144,17 +177,24 @@ export class PluginEngine<T extends ProviderId = ProviderId> {
       // 1. 触发请求开始事件
       await this.pluginManager.executeParallel('onRequestStart', context)
 
-      // 2. 解析模型
-      const model = await this.pluginManager.executeFirst<ImageModelV2>('resolveModel', modelId, context)
-      if (!model) {
-        throw new Error(`Failed to resolve image model: ${modelId}`)
+      // 2. 解析模型（如果是字符串）
+      if (typeof model === 'string') {
+        const resolved = await this.pluginManager.executeFirst<ImageModelV2>('resolveModel', modelId, context)
+        if (!resolved) {
+          throw new Error(`Failed to resolve image model: ${modelId}`)
+        }
+        resolvedModel = resolved
+      }
+
+      if (!resolvedModel) {
+        throw new Error(`Image model resolution failed: no model available`)
       }
 
       // 3. 转换请求参数
       const transformedParams = await this.pluginManager.executeSequential('transformParams', params, context)
 
       // 4. 执行具体的 API 调用
-      const result = await executor(model, transformedParams)
+      const result = await executor(resolvedModel, transformedParams)
 
       // 5. 转换结果
       const transformedResult = await this.pluginManager.executeSequential('transformResult', result, context)
@@ -176,11 +216,24 @@ export class PluginEngine<T extends ProviderId = ProviderId> {
    */
   async executeStreamWithPlugins<TParams, TResult>(
     methodName: string,
-    modelId: string,
+    model: LanguageModel,
     params: TParams,
     executor: (model: LanguageModel, transformedParams: TParams, streamTransforms: any[]) => Promise<TResult>,
     _context?: ReturnType<typeof createContext>
   ): Promise<TResult> {
+    // 统一处理模型解析
+    let resolvedModel: LanguageModel | undefined
+    let modelId: string
+
+    if (typeof model === 'string') {
+      // 字符串：需要通过插件解析
+      modelId = model
+    } else {
+      // 模型对象：直接使用
+      resolvedModel = model
+      modelId = model.modelId
+    }
+
     // 创建请求上下文
     const context = _context ? _context : createContext(this.providerId, modelId, params)
 
@@ -188,7 +241,7 @@ export class PluginEngine<T extends ProviderId = ProviderId> {
     context.recursiveCall = async (newParams: any): Promise<TResult> => {
       // 递归调用自身，重新走完整的插件流程
       context.isRecursiveCall = true
-      const result = await this.executeStreamWithPlugins(methodName, modelId, newParams, executor, context)
+      const result = await this.executeStreamWithPlugins(methodName, model, newParams, executor, context)
       context.isRecursiveCall = false
       return result
     }
@@ -200,11 +253,17 @@ export class PluginEngine<T extends ProviderId = ProviderId> {
       // 1. 触发请求开始事件
       await this.pluginManager.executeParallel('onRequestStart', context)
 
-      // 2. 解析模型
-      const model = await this.pluginManager.executeFirst<LanguageModel>('resolveModel', modelId, context)
+      // 2. 解析模型（如果是字符串）
+      if (typeof model === 'string') {
+        const resolved = await this.pluginManager.executeFirst<LanguageModel>('resolveModel', modelId, context)
+        if (!resolved) {
+          throw new Error(`Failed to resolve model: ${modelId}`)
+        }
+        resolvedModel = resolved
+      }
 
-      if (!model) {
-        throw new Error(`Failed to resolve model: ${modelId}`)
+      if (!resolvedModel) {
+        throw new Error(`Model resolution failed: no model available`)
       }
 
       // 3. 转换请求参数
@@ -214,7 +273,7 @@ export class PluginEngine<T extends ProviderId = ProviderId> {
       const streamTransforms = this.pluginManager.collectStreamTransforms(transformedParams, context)
 
       // 5. 执行流式 API 调用
-      const result = await executor(model, transformedParams, streamTransforms)
+      const result = await executor(resolvedModel, transformedParams, streamTransforms)
 
       const transformedResult = await this.pluginManager.executeSequential('transformResult', result, context)
 

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

@@ -36,6 +36,7 @@ export enum IpcChannel {
   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',
@@ -140,16 +141,25 @@ 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',
@@ -159,6 +169,11 @@ export enum IpcChannel {
   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',
@@ -235,6 +250,7 @@ export enum IpcChannel {
 
   // Provider
   Provider_AddKey = 'provider:add-key',
+  Provider_GetClaudeCodePort = 'provider:get-claude-code-port',
 
   //Selection Assistant
   Selection_TextSelected = 'selection:text-selected',
@@ -285,5 +301,8 @@ export enum IpcChannel {
   CodeTools_Run = 'code-tools:run',
 
   // OCR
-  OCR_ocr = 'ocr:ocr'
+  OCR_ocr = 'ocr:ocr',
+
+  // Cherryin
+  Cherryin_GetSignature = 'cherryin:get-signature'
 }

packages/shared/config/constant.ts

@@ -207,7 +207,7 @@ 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'

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

@@ -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/index.ts

@@ -13,6 +13,7 @@ import installExtension, { REACT_DEVELOPER_TOOLS, REDUX_DEVTOOLS } from 'electro
 
 import { isDev, isLinux, isWin } from './constant'
 import { registerIpc } from './ipc'
+import { claudeCodeService } from './services/ClaudeCodeService'
 import { configManager } from './services/ConfigManager'
 import mcpService from './services/MCPService'
 import { nodeTraceService } from './services/NodeTraceService'
@@ -119,6 +120,14 @@ if (!app.requestSingleInstanceLock()) {
 
     nodeTraceService.init()
 
+    // Start Claude-code HTTP service
+    try {
+      await claudeCodeService.start()
+      logger.info('Claude-code HTTP service started successfully')
+    } catch (error) {
+      logger.error('Failed to start Claude-code HTTP service:', error as Error)
+    }
+
     app.on('activate', function () {
       const mainWindow = windowService.getMainWindow()
       if (!mainWindow || mainWindow.isDestroyed()) {
@@ -193,6 +202,15 @@ if (!app.requestSingleInstanceLock()) {
     } catch (error) {
       logger.warn('Error cleaning up MCP service:', error as Error)
     }
+
+    // Stop Claude-code HTTP service
+    try {
+      await claudeCodeService.stop()
+      logger.info('Claude-code HTTP service stopped')
+    } catch (error) {
+      logger.warn('Error stopping Claude-code HTTP service:', error as Error)
+    }
+
     // finish the logger
     logger.finish()
   })

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,12 +4,14 @@ 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'
 import { MIN_WINDOW_HEIGHT, MIN_WINDOW_WIDTH, UpgradeChannel } from '@shared/config/constant'
 import { IpcChannel } from '@shared/IpcChannel'
 import { FileMetadata, Provider, Shortcut, ThemeMode } from '@types'
+import { claudeCodeService } from './services/ClaudeCodeService'
 import { BrowserWindow, dialog, ipcMain, ProxyConfig, session, shell, systemPreferences, webContents } from 'electron'
 import { Notification } from 'src/renderer/src/types/notification'
 
@@ -57,7 +59,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'
 
@@ -77,11 +87,18 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   // 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(),
@@ -196,6 +213,10 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     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)
   })
@@ -429,16 +450,25 @@ 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))
@@ -446,6 +476,11 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   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) => {
@@ -534,19 +569,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]
   })
 
@@ -714,4 +753,12 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
 
   // OCR
   ipcMain.handle(IpcChannel.OCR_ocr, (_, ...args: Parameters<typeof ocrService.ocr>) => ocrService.ocr(...args))
+
+  // CherryIN
+  ipcMain.handle(IpcChannel.Cherryin_GetSignature, (_, params) => generateSignature(params))
+
+  // Provider
+  ipcMain.handle(IpcChannel.Provider_GetClaudeCodePort, () => {
+    return claudeCodeService.getPort()
+  })
 }

src/main/services/ClaudeCodeService.ts

@@ -0,0 +1,158 @@
+import { createExecutor } from '@cherrystudio/ai-core'
+import { loggerService } from '@logger'
+import { createClaudeCode } from 'ai-sdk-provider-claude-code'
+import express, { Request, Response } from 'express'
+import { Server } from 'http'
+
+const logger = loggerService.withContext('ClaudeCodeService')
+
+export class ClaudeCodeService {
+  private app: express.Application
+  private server: Server | null = null
+  private port: number = 0
+  private claudeCodeProvider: any = null
+
+  constructor() {
+    this.app = express()
+    this.setupMiddleware()
+    this.setupRoutes()
+  }
+
+  private setupMiddleware() {
+    this.app.use(express.json())
+    this.app.use(express.text())
+  }
+
+  private setupRoutes() {
+    // Health check endpoint
+    this.app.get('/health', (_req: Request, res: Response) => {
+      res.json({ status: 'ok', timestamp: new Date().toISOString() })
+    })
+
+    // Initialize claude-code provider
+    this.app.post('/init', async (req: Request, res: Response) => {
+      try {
+        const config = req.body
+        logger.info('Initializing claude-code provider with config', config)
+
+        this.claudeCodeProvider = createClaudeCode()
+
+        res.json({
+          success: true,
+          message: 'Claude-code provider initialized successfully'
+        })
+      } catch (error) {
+        logger.error('Failed to initialize claude-code provider', error as Error)
+        res.status(500).json({
+          success: false,
+          error: (error as Error).message
+        })
+      }
+    })
+
+    // Stream text completion endpoint
+    this.app.post('/completions', async (req: Request, res: Response): Promise<void> => {
+      try {
+        if (!this.claudeCodeProvider) {
+          res.status(400).json({
+            success: false,
+            error: 'Claude-code provider not initialized. Call /init first.'
+          })
+          return
+        }
+
+        const { modelId, params, options } = req.body
+        logger.info('Processing completions request', { modelId, hasParams: !!params })
+
+        // 创建执行器
+        const executor = createExecutor('claude-code', options || {}, [])
+        const model = this.claudeCodeProvider.languageModel('opus')
+
+        // 执行流式文本生成
+        const result = await executor.streamText({
+          ...params,
+          model,
+          abortSignal: new AbortController().signal
+        })
+        console.log('result', result)
+        // 使用 AI SDK 提供的便捷函数处理流式响应
+        result.pipeUIMessageStreamToResponse(res)
+
+        logger.info('Completions request completed successfully')
+      } catch (error) {
+        logger.error('Error in completions endpoint', error as Error)
+        if (!res.headersSent) {
+          res.status(500).json({
+            success: false,
+            error: (error as Error).message
+          })
+        }
+      }
+    })
+  }
+
+  public async start(): Promise<number> {
+    return new Promise((resolve, reject) => {
+      // 尝试使用固定端口，如果失败则使用系统分配端口
+      const preferredPort = 23456
+
+      this.server = this.app.listen(preferredPort, 'localhost', () => {
+        if (this.server?.address()) {
+          this.port = (this.server.address() as any)?.port || 0
+          logger.info(`Claude-code HTTP service started on port ${this.port}`)
+          resolve(this.port)
+        } else {
+          reject(new Error('Failed to start server'))
+        }
+      })
+
+      this.server.on('error', (error: any) => {
+        if (error.code === 'EADDRINUSE') {
+          logger.warn(`Port ${preferredPort} is in use, trying with dynamic port`)
+          // 如果固定端口被占用，使用动态端口
+          this.server = this.app.listen(0, 'localhost', () => {
+            if (this.server?.address()) {
+              this.port = (this.server.address() as any)?.port || 0
+              logger.info(`Claude-code HTTP service started on dynamic port ${this.port}`)
+              resolve(this.port)
+            } else {
+              reject(new Error('Failed to start server'))
+            }
+          })
+
+          this.server.on('error', (dynamicError) => {
+            logger.error('Server error on dynamic port', dynamicError)
+            reject(dynamicError)
+          })
+        } else {
+          logger.error('Server error', error)
+          reject(error)
+        }
+      })
+    })
+  }
+
+  public async stop(): Promise<void> {
+    return new Promise((resolve) => {
+      if (this.server) {
+        this.server.close(() => {
+          logger.info('Claude-code HTTP service stopped')
+          resolve()
+        })
+      } else {
+        resolve()
+      }
+    })
+  }
+
+  public getPort(): number {
+    return this.port
+  }
+
+  public isRunning(): boolean {
+    return this.server !== null && this.server.listening
+  }
+}
+
+// 单例实例
+export const claudeCodeService = new ClaudeCodeService()

src/main/services/CodeToolsService.ts

@@ -323,7 +323,7 @@ class CodeToolsService {
           ? `set "BUN_INSTALL=${bunInstallPath}" && set "NPM_CONFIG_REGISTRY=${registryUrl}" &&`
           : `export BUN_INSTALL="${bunInstallPath}" && export NPM_CONFIG_REGISTRY="${registryUrl}" &&`
 
-      const installCommand = `${installEnvPrefix} ${bunPath} install -g ${packageName}`
+      const installCommand = `${installEnvPrefix} "${bunPath}" install -g ${packageName}`
       baseCommand = `echo "Installing ${packageName}..." && ${installCommand} && echo "Installation complete, starting ${cliTool}..." && ${baseCommand}`
     }
 

src/main/services/FileStorage.ts

@@ -1,8 +1,18 @@
 import { loggerService } from '@logger'
-import { getFilesDir, getFileType, getTempDir, readTextFileWithAutoEncoding } from '@main/utils/file'
+import {
+  checkName,
+  getFilesDir,
+  getFileType,
+  getName,
+  getNotesDir,
+  getTempDir,
+  readTextFileWithAutoEncoding,
+  scanDir
+} from '@main/utils/file'
 import { documentExts, imageExts, KB, MB } from '@shared/config/constant'
-import { FileMetadata } from '@types'
+import { FileMetadata, NotesTreeNode } from '@types'
 import chardet from 'chardet'
+import chokidar, { FSWatcher } from 'chokidar'
 import * as crypto from 'crypto'
 import {
   dialog,
@@ -26,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()
@@ -39,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 })
       }
@@ -209,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),
@@ -220,8 +263,6 @@ class FileStorage {
       type: fileType,
       count: 1
     }
-
-    return fileInfo
   }
 
   // @TraceProperty({ spanName: 'deleteFile', tag: 'FileStorage' })
@@ -239,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,
@@ -282,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 })
@@ -298,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
@@ -340,7 +568,7 @@ class FileStorage {
 
       await fs.promises.writeFile(destPath, buffer)
 
-      const fileMetadata: FileMetadata = {
+      return {
         id: uuid,
         origin_name: uuid + ext,
         name: uuid + ext,
@@ -351,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)
@@ -384,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> => {
@@ -432,6 +730,7 @@ class FileStorage {
 
   /**
    * 通过相对路径打开文件，跨设备时使用
+   * @param _
    * @param file
    */
   public openFileWithRelativePath = async (_: Electron.IpcMainInvokeEvent, file: FileMetadata): Promise<void> => {
@@ -443,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,
@@ -461,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
@@ -552,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,
@@ -563,8 +935,6 @@ class FileStorage {
         type: fileType,
         count: 1
       }
-
-      return fileMetadata
     } catch (error) {
       logger.error('Download file error:', error as Error)
       throw error
@@ -629,6 +999,205 @@ 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)
   }

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/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/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,
@@ -498,6 +499,8 @@ export class WindowService {
       }
     })
 
+    this.setupWebContentsHandlers(this.miniWindow)
+
     miniWindowState.manage(this.miniWindow)
 
     //miniWindow should show in current desktop

src/main/services/ocr/OcrService.ts

@@ -1,4 +1,5 @@
 import { loggerService } from '@logger'
+import { isLinux } from '@main/constant'
 import { BuiltinOcrProviderIds, OcrHandler, OcrProvider, OcrResult, SupportedOcrFile } from '@types'
 
 import { systemOcrService } from './builtin/SystemOcrService'
@@ -33,4 +34,5 @@ export const ocrService = new OcrService()
 
 // Register built-in providers
 ocrService.register(BuiltinOcrProviderIds.tesseract, tesseractService.ocr.bind(tesseractService))
-ocrService.register(BuiltinOcrProviderIds.system, systemOcrService.ocr.bind(systemOcrService))
+
+!isLinux && ocrService.register(BuiltinOcrProviderIds.system, systemOcrService.ocr.bind(systemOcrService))

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

@@ -1,4 +1,4 @@
-import { isMac, isWin } from '@main/constant'
+import { isLinux, isWin } from '@main/constant'
 import { loadOcrImage } from '@main/utils/ocr'
 import { OcrAccuracy, recognize } from '@napi-rs/system-ocr'
 import {
@@ -15,12 +15,12 @@ import { OcrBaseService } from './OcrBaseService'
 export class SystemOcrService extends OcrBaseService {
   constructor() {
     super()
-    if (!isWin && !isMac) {
-      throw new Error('System OCR is only supported on Windows and macOS')
-    }
   }
 
   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)

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')
 }
@@ -195,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/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,
@@ -80,6 +81,7 @@ const api = {
   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)
@@ -141,33 +143,33 @@ const api = {
     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): Promise<FileMetadata | null> => ipcRenderer.invoke(IpcChannel.File_Get, filePath),
-    /**
-     * 创建一个空的临时文件
-     * @param fileName 文件名
-     * @returns 临时文件路径
-     */
     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),
@@ -175,7 +177,23 @@ const api = {
     pdfInfo: (fileId: string) => ipcRenderer.invoke(IpcChannel.File_GetPdfInfo, fileId),
     getPathForFile: (file: File) => webUtils.getPathForFile(file),
     openFileWithRelativePath: (file: FileMetadata) => ipcRenderer.invoke(IpcChannel.File_OpenWithRelativePath, file),
-    isTextFile: (filePath: string): Promise<boolean> => ipcRenderer.invoke(IpcChannel.File_IsTextFile, filePath)
+    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),
@@ -415,6 +433,13 @@ const api = {
   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)
+  },
+  provider: {
+    getClaudeCodePort: () => ipcRenderer.invoke(IpcChannel.Provider_GetClaudeCodePort)
   }
 }
 

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

@@ -15,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'
@@ -31,6 +32,7 @@ const Router: FC = () => {
           <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 />} />

src/renderer/src/aiCore/chunk/AiSdkToChunkAdapter.ts

@@ -53,6 +53,54 @@ export class AiSdkToChunkAdapter {
     return await aiSdkResult.text
   }
 
+  /**
+   * 直接处理单个 chunk 数据
+   * @param chunk AI SDK 的 chunk 数据
+   */
+  async processChunk(response: ReadableStream<TextStreamPart<any>>): Promise<void> {
+    const reader = response.getReader()
+    const final = {
+      text: '',
+      reasoningContent: '',
+      webSearchResults: [],
+      reasoningId: ''
+    }
+    try {
+      let buffer = ''
+      const decoder = new TextDecoder()
+      while (true) {
+        const { done, value } = await reader.read()
+        if (done) break
+
+        const chunk = decoder.decode(value, { stream: true })
+        buffer += chunk
+
+        // 按行处理 SSE 数据
+        const lines = buffer.split('\n')
+        buffer = lines.pop() || '' // 保留最后一行（可能不完整）
+
+        for (const line of lines) {
+          if (line.startsWith('data: ')) {
+            const dataStr = line.slice(6) // 移除 "data: " 前缀
+
+            if (dataStr === '[DONE]') {
+              break
+            }
+            try {
+              const data = JSON.parse(dataStr)
+              this.convertAndEmitChunk(data, final)
+            } catch (parseError) {
+              // 忽略无法解析的数据
+              // logger.debug('Failed to parse streamed data:', parseError as Error, line)
+            }
+          }
+        }
+      }
+    } finally {
+      reader.releaseLock()
+    }
+  }
+
   /**
    * 读取 fullStream 并转换为 Cherry Studio chunks
    * @param fullStream AI SDK 的 fullStream (ReadableStream)
@@ -90,6 +138,7 @@ export class AiSdkToChunkAdapter {
     final: { text: string; reasoningContent: string; webSearchResults: any[]; reasoningId: string }
   ) {
     logger.info(`AI SDK chunk type: ${chunk.type}`, chunk)
+    console.log('final', final)
     switch (chunk.type) {
       // === 文本相关事件 ===
       case 'text-start':
@@ -99,7 +148,7 @@ export class AiSdkToChunkAdapter {
         break
       case 'text-delta':
         if (this.accumulate) {
-          final.text += chunk.text || ''
+          final.text += chunk.delta || ''
         } else {
           final.text = chunk.text || ''
         }
@@ -194,26 +243,27 @@ export class AiSdkToChunkAdapter {
           })
         } else if (final.webSearchResults.length) {
           const providerName = Object.keys(providerMetadata || {})[0]
-          switch (providerName) {
-            case WebSearchSource.OPENAI:
-              this.onChunk({
-                type: ChunkType.LLM_WEB_SEARCH_COMPLETE,
-                llm_web_search: {
-                  results: final.webSearchResults,
-                  source: WebSearchSource.OPENAI_RESPONSE
-                }
-              })
-              break
-            default:
-              this.onChunk({
-                type: ChunkType.LLM_WEB_SEARCH_COMPLETE,
-                llm_web_search: {
-                  results: final.webSearchResults,
-                  source: WebSearchSource.AISDK
-                }
-              })
-              break
+          const sourceMap: Record<string, WebSearchSource> = {
+            [WebSearchSource.OPENAI]: WebSearchSource.OPENAI_RESPONSE,
+            [WebSearchSource.ANTHROPIC]: WebSearchSource.ANTHROPIC,
+            [WebSearchSource.OPENROUTER]: WebSearchSource.OPENROUTER,
+            [WebSearchSource.GEMINI]: WebSearchSource.GEMINI,
+            [WebSearchSource.PERPLEXITY]: WebSearchSource.PERPLEXITY,
+            [WebSearchSource.QWEN]: WebSearchSource.QWEN,
+            [WebSearchSource.HUNYUAN]: WebSearchSource.HUNYUAN,
+            [WebSearchSource.ZHIPU]: WebSearchSource.ZHIPU,
+            [WebSearchSource.GROK]: WebSearchSource.GROK,
+            [WebSearchSource.WEBSEARCH]: WebSearchSource.WEBSEARCH
           }
+          const source = sourceMap[providerName] || WebSearchSource.AISDK
+
+          this.onChunk({
+            type: ChunkType.LLM_WEB_SEARCH_COMPLETE,
+            llm_web_search: {
+              results: final.webSearchResults,
+              source
+            }
+          })
         }
         if (finishReason === 'tool-calls') {
           this.onChunk({ type: ChunkType.LLM_RESPONSE_CREATED })
@@ -231,13 +281,13 @@ export class AiSdkToChunkAdapter {
             text: final.text || '',
             reasoning_content: final.reasoningContent || '',
             usage: {
-              completion_tokens: chunk.totalUsage.outputTokens || 0,
-              prompt_tokens: chunk.totalUsage.inputTokens || 0,
-              total_tokens: chunk.totalUsage.totalTokens || 0
+              completion_tokens: chunk?.totalUsage?.outputTokens || 0,
+              prompt_tokens: chunk?.totalUsage?.inputTokens || 0,
+              total_tokens: chunk?.totalUsage?.totalTokens || 0
             },
-            metrics: chunk.totalUsage
+            metrics: chunk?.totalUsage
               ? {
-                  completion_tokens: chunk.totalUsage.outputTokens || 0,
+                  completion_tokens: chunk?.totalUsage?.outputTokens || 0,
                   time_completion_millsec: 0
                 }
               : undefined
@@ -249,13 +299,13 @@ export class AiSdkToChunkAdapter {
             text: final.text || '',
             reasoning_content: final.reasoningContent || '',
             usage: {
-              completion_tokens: chunk.totalUsage.outputTokens || 0,
-              prompt_tokens: chunk.totalUsage.inputTokens || 0,
-              total_tokens: chunk.totalUsage.totalTokens || 0
+              completion_tokens: chunk?.totalUsage?.outputTokens || 0,
+              prompt_tokens: chunk?.totalUsage?.inputTokens || 0,
+              total_tokens: chunk?.totalUsage?.totalTokens || 0
             },
-            metrics: chunk.totalUsage
+            metrics: chunk?.totalUsage
               ? {
-                  completion_tokens: chunk.totalUsage.outputTokens || 0,
+                  completion_tokens: chunk?.totalUsage?.outputTokens || 0,
                   time_completion_millsec: 0
                 }
               : undefined

src/renderer/src/aiCore/index_new.ts

@@ -7,28 +7,27 @@
  * 2. 暂时保持接口兼容性
  */
 
-import { createExecutor, generateImage } from '@cherrystudio/ai-core'
-import { createAndRegisterProvider } from '@cherrystudio/ai-core/provider'
+import { createExecutor } from '@cherrystudio/ai-core'
 import { loggerService } from '@logger'
-import { isNotSupportedImageSizeModel } from '@renderer/config/models'
 import { getEnableDeveloperMode } from '@renderer/hooks/useSettings'
 import { addSpan, endSpan } from '@renderer/services/SpanManagerService'
 import { StartSpanParams } from '@renderer/trace/types/ModelSpanEntity'
 import type { Assistant, GenerateImageParams, Model, Provider } from '@renderer/types'
-import { ChunkType } from '@renderer/types/chunk'
+import type { AiSdkModel, StreamTextParams } from '@renderer/types/aiCoreTypes'
+import { type ImageModel, type LanguageModel, type Provider as AiSdkProvider, wrapLanguageModel } from 'ai'
 
 import AiSdkToChunkAdapter from './chunk/AiSdkToChunkAdapter'
 import LegacyAiProvider from './legacy/index'
-import { CompletionsResult } from './legacy/middleware/schemas'
+import { CompletionsParams, CompletionsResult } from './legacy/middleware/schemas'
 import { AiSdkMiddlewareConfig, buildAiSdkMiddlewares } from './middleware/AiSdkMiddlewareBuilder'
 import { buildPlugins } from './plugins/PluginBuilder'
+import { createAiSdkProvider } from './provider/factory'
 import {
   getActualProvider,
   isModernSdkSupported,
   prepareSpecialProviderConfig,
   providerToAiSdkConfig
 } from './provider/providerConfig'
-import type { StreamTextParams } from './types'
 
 const logger = loggerService.withContext('ModernAiProvider')
 
@@ -41,17 +40,36 @@ export type ModernAiProviderConfig = AiSdkMiddlewareConfig & {
 
 export default class ModernAiProvider {
   private legacyProvider: LegacyAiProvider
-  private config: ReturnType<typeof providerToAiSdkConfig>
+  private config?: ReturnType<typeof providerToAiSdkConfig>
   private actualProvider: Provider
-  private model: Model
+  private model?: Model
+  private localProvider: Awaited<AiSdkProvider> | null = null
+
+  // 构造函数重载签名
+  constructor(model: Model, provider?: Provider)
+  constructor(provider: Provider)
+  constructor(modelOrProvider: Model | Provider, provider?: Provider)
+  constructor(modelOrProvider: Model | Provider, provider?: Provider) {
+    if (this.isModel(modelOrProvider)) {
+      // 传入的是 Model
+      this.model = modelOrProvider
+      this.actualProvider = provider || getActualProvider(modelOrProvider)
+      // 只保存配置，不预先创建executor
+      this.config = providerToAiSdkConfig(this.actualProvider, modelOrProvider)
+    } else {
+      // 传入的是 Provider
+      this.actualProvider = modelOrProvider
+      // model为可选，某些操作（如fetchModels）不需要model
+    }
 
-  constructor(model: Model, provider?: Provider) {
-    this.actualProvider = provider || getActualProvider(model)
     this.legacyProvider = new LegacyAiProvider(this.actualProvider)
-    this.model = model
+  }
 
-    // 只保存配置，不预先创建executor
-    this.config = providerToAiSdkConfig(this.actualProvider, model)
+  /**
+   * 类型守卫函数：通过 provider 属性区分 Model 和 Provider
+   */
+  private isModel(obj: Model | Provider): obj is Model {
+    return 'provider' in obj && typeof obj.provider === 'string'
   }
 
   public getActualProvider() {
@@ -59,47 +77,93 @@ export default class ModernAiProvider {
   }
 
   public async completions(modelId: string, params: StreamTextParams, config: ModernAiProviderConfig) {
+    // 检查model是否存在
+    if (!this.model) {
+      throw new Error('Model is required for completions. Please use constructor with model parameter.')
+    }
+
+    // 确保配置存在
+    if (!this.config) {
+      this.config = providerToAiSdkConfig(this.actualProvider, this.model)
+    }
+
     // 准备特殊配置
     await prepareSpecialProviderConfig(this.actualProvider, this.config)
 
-    logger.debug('this.config', this.config)
+    // 特殊处理 claude-code provider，通过本地 HTTP 服务器
+    // if (this.config.providerId === 'claude-code') {
+    return await this._completionsViaHttpService(modelId, params, config)
+    // }
+
+    // 提前创建本地 provider 实例
+    if (!this.localProvider) {
+      this.localProvider = await createAiSdkProvider(this.config)
+    }
+
+    // 提前构建中间件
+    const middlewares = buildAiSdkMiddlewares({
+      ...config,
+      provider: this.actualProvider
+    })
+    logger.debug('Built middlewares in completions', {
+      middlewareCount: middlewares.length,
+      isImageGeneration: config.isImageGenerationEndpoint
+    })
+    if (!this.localProvider) {
+      throw new Error('Local provider not created')
+    }
+
+    // 根据endpoint类型创建对应的模型
+    let model: AiSdkModel | undefined
+    if (config.isImageGenerationEndpoint) {
+      model = this.localProvider.imageModel(modelId)
+    } else {
+      model = this.localProvider.languageModel(modelId)
+      // 如果有中间件，应用到语言模型上
+      if (middlewares.length > 0 && typeof model === 'object') {
+        model = wrapLanguageModel({ model, middleware: middlewares })
+      }
+    }
+
     if (config.topicId && getEnableDeveloperMode()) {
       // TypeScript类型窄化：确保topicId是string类型
       const traceConfig = {
         ...config,
         topicId: config.topicId
       }
-      return await this._completionsForTrace(modelId, params, traceConfig)
+      return await this._completionsForTrace(model, params, traceConfig)
     } else {
-      return await this._completions(modelId, params, config)
+      return await this._completionsOrImageGeneration(model, params, config)
     }
   }
 
-  private async _completions(
-    modelId: string,
+  private async _completionsOrImageGeneration(
+    model: AiSdkModel,
     params: StreamTextParams,
     config: ModernAiProviderConfig
   ): Promise<CompletionsResult> {
-    // 初始化 provider 到全局管理器
-    try {
-      await createAndRegisterProvider(this.config.providerId, this.config.options)
-      logger.debug('Provider initialized successfully', {
-        providerId: this.config.providerId,
-        hasOptions: !!this.config.options
-      })
-    } catch (error) {
-      // 如果 provider 已经初始化过，可能会抛出错误，这里可以忽略
-      logger.debug('Provider initialization skipped (may already be initialized)', {
-        providerId: this.config.providerId,
-        error: error instanceof Error ? error.message : String(error)
-      })
-    }
-
     if (config.isImageGenerationEndpoint) {
-      return await this.modernImageGeneration(modelId, params, config)
+      // 使用 legacy 实现处理图像生成（支持图片编辑等高级功能）
+      if (!config.uiMessages) {
+        throw new Error('uiMessages is required for image generation endpoint')
+      }
+
+      const legacyParams: CompletionsParams = {
+        callType: 'chat',
+        messages: config.uiMessages, // 使用原始的 UI 消息格式
+        assistant: config.assistant,
+        streamOutput: config.streamOutput ?? true,
+        onChunk: config.onChunk,
+        topicId: config.topicId,
+        mcpTools: config.mcpTools,
+        enableWebSearch: config.enableWebSearch
+      }
+
+      // 调用 legacy 的 completions，会自动使用 ImageGenerationMiddleware
+      return await this.legacyProvider.completions(legacyParams)
     }
 
-    return await this.modernCompletions(modelId, params, config)
+    return await this.modernCompletions(model as LanguageModel, params, config)
   }
 
   /**
@@ -107,10 +171,11 @@ export default class ModernAiProvider {
    * 类似于legacy的completionsForTrace，确保AI SDK spans在正确的trace上下文中
    */
   private async _completionsForTrace(
-    modelId: string,
+    model: AiSdkModel,
     params: StreamTextParams,
     config: ModernAiProviderConfig & { topicId: string }
   ): Promise<CompletionsResult> {
+    const modelId = this.model!.id
     const traceName = `${this.actualProvider.name}.${modelId}.${config.callType}`
     const traceParams: StartSpanParams = {
       name: traceName,
@@ -136,7 +201,7 @@ export default class ModernAiProvider {
         modelId,
         traceName
       })
-      return await this._completions(modelId, params, config)
+      return await this._completionsOrImageGeneration(model, params, config)
     }
 
     try {
@@ -148,7 +213,7 @@ export default class ModernAiProvider {
         parentSpanCreated: true
       })
 
-      const result = await this._completions(modelId, params, config)
+      const result = await this._completionsOrImageGeneration(model, params, config)
 
       logger.info('Completions finished, ending parent span', {
         spanId: span.spanContext().spanId,
@@ -187,16 +252,90 @@ export default class ModernAiProvider {
   }
 
   /**
-   * 使用现代化AI SDK的completions实现
+   * 通过本地 HTTP 服务器处理 claude-code completions
    */
-  private async modernCompletions(
+  private async _completionsViaHttpService(
     modelId: string,
     params: StreamTextParams,
     config: ModernAiProviderConfig
   ): Promise<CompletionsResult> {
+    logger.info('Starting claude-code completions via HTTP service', {
+      modelId,
+      providerId: this.config!.providerId,
+      topicId: config.topicId,
+      hasOnChunk: !!config.onChunk
+    })
+
+    try {
+      // 初始化 claude-code provider
+      const initResponse = await fetch('http://localhost:' + (await this.getClaudeCodePort()) + '/init', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(this.config!.options)
+      })
+
+      if (!initResponse.ok) {
+        throw new Error(`Failed to initialize claude-code provider: ${initResponse.statusText}`)
+      }
+
+      // 发送 completions 请求
+      const completionsResponse = await fetch('http://localhost:' + (await this.getClaudeCodePort()) + '/completions', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({
+          modelId,
+          params,
+          options: this.config!.options
+        })
+      })
+
+      if (!completionsResponse.ok) {
+        throw new Error(`Failed to get completions: ${completionsResponse.statusText}`)
+      }
+
+      let finalText = ''
+
+      if (config.onChunk && completionsResponse.body) {
+        // 创建 adapter 来处理 chunk 数据
+        const accumulate = this.model!.supported_text_delta !== false
+        const adapter = new AiSdkToChunkAdapter(config.onChunk, config.mcpTools, accumulate)
+        await adapter.processChunk(completionsResponse.body)
+      } else {
+        finalText = await completionsResponse.text()
+      }
+
+      return {
+        getText: () => finalText
+      }
+    } catch (error) {
+      logger.error('Error in claude-code HTTP service completions', error as Error)
+      throw error
+    }
+  }
+
+  /**
+   * 获取 Claude-code HTTP 服务端口
+   */
+  private async getClaudeCodePort(): Promise<number> {
+    return await window.api.provider.getClaudeCodePort()
+  }
+
+  /**
+   * 使用现代化AI SDK的completions实现
+   */
+  private async modernCompletions(
+    model: LanguageModel,
+    params: StreamTextParams,
+    config: ModernAiProviderConfig
+  ): Promise<CompletionsResult> {
+    const modelId = this.model!.id
     logger.info('Starting modernCompletions', {
       modelId,
-      providerId: this.config.providerId,
+      providerId: this.config!.providerId,
       topicId: config.topicId,
       hasOnChunk: !!config.onChunk,
       hasTools: !!params.tools && Object.keys(params.tools).length > 0,
@@ -205,122 +344,50 @@ export default class ModernAiProvider {
 
     // 根据条件构建插件数组
     const plugins = buildPlugins(config)
-    logger.debug('Built plugins for AI SDK', {
-      pluginCount: plugins.length,
-      pluginNames: plugins.map((p) => p.name),
-      providerId: this.config.providerId,
-      topicId: config.topicId
-    })
 
     // 用构建好的插件数组创建executor
-    const executor = createExecutor(this.config.providerId, this.config.options, plugins)
-    logger.debug('Created AI SDK executor', {
-      providerId: this.config.providerId,
-      hasOptions: !!this.config.options,
-      pluginCount: plugins.length
-    })
-
-    // 动态构建中间件数组
-    const middlewares = buildAiSdkMiddlewares(config)
-    logger.debug('Built AI SDK middlewares', {
-      middlewareCount: middlewares.length,
-      topicId: config.topicId
-    })
+    const executor = createExecutor(this.config!.providerId, this.config!.options, plugins)
 
     // 创建带有中间件的执行器
     if (config.onChunk) {
-      // 流式处理 - 使用适配器
-      logger.info('Starting streaming with chunk adapter', {
-        modelId,
-        hasMiddlewares: middlewares.length > 0,
-        middlewareCount: middlewares.length,
-        hasMcpTools: !!config.mcpTools,
-        mcpToolCount: config.mcpTools?.length || 0,
-        topicId: config.topicId
-      })
-
-      const accumulate = this.model.supported_text_delta !== false // true and undefined
+      const accumulate = this.model!.supported_text_delta !== false // true and undefined
       const adapter = new AiSdkToChunkAdapter(config.onChunk, config.mcpTools, accumulate)
 
-      logger.debug('Final params before streamText', {
-        modelId,
-        hasMessages: !!params.messages,
-        messageCount: params.messages?.length || 0,
-        hasTools: !!params.tools && Object.keys(params.tools).length > 0,
-        toolNames: params.tools ? Object.keys(params.tools) : [],
-        hasSystem: !!params.system,
-        topicId: config.topicId
-      })
-
-      const streamResult = await executor.streamText(
-        modelId,
-        { ...params, experimental_context: { onChunk: config.onChunk } },
-        middlewares.length > 0 ? { middlewares } : undefined
-      )
-
-      logger.info('StreamText call successful, processing stream', {
-        modelId,
-        topicId: config.topicId,
-        hasFullStream: !!streamResult.fullStream
+      const streamResult = await executor.streamText({
+        ...params,
+        model,
+        experimental_context: { onChunk: config.onChunk }
       })
 
       const finalText = await adapter.processStream(streamResult)
 
-      logger.info('Stream processing completed', {
-        modelId,
-        topicId: config.topicId,
-        finalTextLength: finalText.length
-      })
-
       return {
         getText: () => finalText
       }
     } else {
-      // 流式处理但没有 onChunk 回调
-      logger.info('Starting streaming without chunk callback', {
-        modelId,
-        hasMiddlewares: middlewares.length > 0,
-        middlewareCount: middlewares.length,
-        topicId: config.topicId
+      const streamResult = await executor.streamText({
+        ...params,
+        model
       })
 
-      const streamResult = await executor.streamText(
-        modelId,
-        params,
-        middlewares.length > 0 ? { middlewares } : undefined
-      )
-
-      logger.info('StreamText call successful, waiting for text', {
-        modelId,
-        topicId: config.topicId
-      })
       // 强制消费流,不然await streamResult.text会阻塞
       await streamResult?.consumeStream()
 
       const finalText = await streamResult.text
 
-      logger.info('Text extraction completed', {
-        modelId,
-        topicId: config.topicId,
-        finalTextLength: finalText.length
-      })
-
       return {
         getText: () => finalText
       }
     }
-    // }
-    // catch (error) {
-    //   console.error('Modern AI SDK error:', error)
-    //   throw error
-    // }
   }
 
   /**
    * 使用现代化 AI SDK 的图像生成实现，支持流式输出
+   * @deprecated 已改为使用 legacy 实现以支持图片编辑等高级功能
    */
+  /*
   private async modernImageGeneration(
-    modelId: string,
+    model: ImageModel,
     params: StreamTextParams,
     config: ModernAiProviderConfig
   ): Promise<CompletionsResult> {
@@ -364,7 +431,11 @@ export default class ModernAiProvider {
       }
 
       // 调用新 AI SDK 的图像生成功能
-      const result = await generateImage(this.config.providerId, this.config.options, modelId, imageParams)
+      const executor = createExecutor(this.config!.providerId, this.config!.options, [])
+      const result = await executor.generateImage({
+        model,
+        ...imageParams
+      })
 
       // 转换结果格式
       const images: string[] = []
@@ -431,6 +502,7 @@ export default class ModernAiProvider {
       throw error
     }
   }
+  */
 
   // 代理其他方法到原有实现
   public async models() {
@@ -445,6 +517,14 @@ export default class ModernAiProvider {
     // 如果支持新的 AI SDK，使用现代化实现
     if (isModernSdkSupported(this.actualProvider)) {
       try {
+        // 确保本地provider已创建
+        if (!this.localProvider) {
+          this.localProvider = await createAiSdkProvider(this.config)
+          if (!this.localProvider) {
+            throw new Error('Local provider not created')
+          }
+        }
+
         const result = await this.modernGenerateImage(params)
         return result
       } catch (error) {
@@ -472,7 +552,11 @@ export default class ModernAiProvider {
       ...(signal && { abortSignal: signal })
     }
 
-    const result = await generateImage(this.config.providerId, this.config.options, model, aiSdkParams)
+    const executor = createExecutor(this.config!.providerId, this.config!.options, [])
+    const result = await executor.generateImage({
+      model: this.localProvider?.imageModel(model) as ImageModel,
+      ...aiSdkParams
+    })
 
     // 转换结果格式
     const images: string[] = []

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

@@ -1,17 +1,18 @@
 import { loggerService } from '@logger'
-import { isVertexAIConfigured } from '@renderer/hooks/useVertexAI'
 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')
 
@@ -32,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
@@ -63,12 +76,6 @@ export class ApiClientFactory {
         break
       case 'vertexai':
         logger.debug(`Creating VertexAPIClient for provider: ${provider.id}`)
-        // 检查 VertexAI 配置
-        if (!isVertexAIConfigured()) {
-          throw new Error(
-            'VertexAI is not configured. Please configure project, location and service account credentials.'
-          )
-        }
         instance = new VertexAPIClient(provider) as BaseApiClient
         break
       case 'anthropic':
@@ -86,8 +93,3 @@ export class ApiClientFactory {
     return instance
   }
 }
-
-// 移除这个函数，它已经移动到 utils/index.ts
-// export function isOpenAIProvider(provider: Provider) {
-//   return !['anthropic', 'gemini'].includes(provider.type)
-// }

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

@@ -2,13 +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'
@@ -26,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', () => ({
@@ -41,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', () => ({
@@ -66,7 +66,8 @@ vi.mock('@renderer/config/models', () => ({
   SYSTEM_MODELS: {
     silicon: [],
     defaultModel: []
-  }
+  },
+  isOpenAIModel: vi.fn(() => false)
 }))
 
 describe('ApiClientFactory', () => {

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

@@ -1,9 +1,9 @@
-import { AihubmixAPIClient } from '@renderer/aiCore/legacy/clients/AihubmixAPIClient'
+import { AihubmixAPIClient } from '@renderer/aiCore/legacy/clients/aihubmix/AihubmixAPIClient'
 import { AnthropicAPIClient } from '@renderer/aiCore/legacy/clients/anthropic/AnthropicAPIClient'
 import { ApiClientFactory } from '@renderer/aiCore/legacy/clients/ApiClientFactory'
 import { GeminiAPIClient } from '@renderer/aiCore/legacy/clients/gemini/GeminiAPIClient'
 import { VertexAPIClient } from '@renderer/aiCore/legacy/clients/gemini/VertexAPIClient'
-import { NewAPIClient } from '@renderer/aiCore/legacy/clients/NewAPIClient'
+import { NewAPIClient } from '@renderer/aiCore/legacy/clients/newapi/NewAPIClient'
 import { OpenAIAPIClient } from '@renderer/aiCore/legacy/clients/openai/OpenAIApiClient'
 import { OpenAIResponseAPIClient } from '@renderer/aiCore/legacy/clients/openai/OpenAIResponseAPIClient'
 import { EndpointType, Model, Provider } from '@renderer/types'
@@ -16,11 +16,13 @@ vi.mock('@renderer/config/models', () => ({
       { id: 'gpt-4', name: 'GPT-4' },
       { id: 'gpt-4', name: 'GPT-4' }
     ],
+    zhipu: [],
     silicon: [],
     openai: [],
     anthropic: [],
     gemini: []
   },
+  isOpenAIModel: vi.fn().mockReturnValue(true),
   isOpenAILLMModel: vi.fn().mockReturnValue(true),
   isOpenAIChatCompletionOnlyModel: vi.fn().mockReturnValue(false),
   isAnthropicLLMModel: vi.fn().mockReturnValue(false),
@@ -32,7 +34,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', () => ({
@@ -73,6 +81,7 @@ vi.mock('@logger', () => ({
   }
 }))
 
+// 到底是谁想出来的在服务层调用 React Hook ?????????
 // Mock additional services and hooks that might be imported
 vi.mock('@renderer/hooks/useVertexAI', () => ({
   getVertexAILocation: vi.fn().mockReturnValue('us-central1'),
@@ -80,7 +89,9 @@ vi.mock('@renderer/hooks/useVertexAI', () => ({
   getVertexAIServiceAccount: vi.fn().mockReturnValue({
     privateKey: 'test-key',
     clientEmail: 'test@example.com'
-  })
+  }),
+  isVertexAIConfigured: vi.fn().mockReturnValue(true),
+  isVertexProvider: vi.fn().mockReturnValue(true)
 }))
 
 vi.mock('@renderer/hooks/useSettings', () => ({
@@ -124,7 +135,7 @@ vi.mock('@google-cloud/vertexai', () => ({
 }))
 
 // Mock the circular dependency between VertexAPIClient and AnthropicVertexClient
-vi.mock('@renderer/aiCore/clients/anthropic/AnthropicVertexClient', () => {
+vi.mock('@renderer/aiCore/legacy/clients/anthropic/AnthropicVertexClient', () => {
   const MockAnthropicVertexClient = vi.fn()
   MockAnthropicVertexClient.prototype.getClientCompatibilityType = vi.fn().mockReturnValue(['AnthropicVertexAPIClient'])
   return {

src/renderer/src/aiCore/legacy/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/legacy/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/legacy/clients/gemini/VertexAPIClient.ts

@@ -1,6 +1,6 @@
 import { GoogleGenAI } from '@google/genai'
 import { loggerService } from '@logger'
-import { createVertexProvider, isVertexProvider } from '@renderer/hooks/useVertexAI'
+import { createVertexProvider, isVertexAIConfigured, isVertexProvider } from '@renderer/hooks/useVertexAI'
 import { Model, Provider, VertexProvider } from '@renderer/types'
 import { isEmpty } from 'lodash'
 
@@ -16,6 +16,10 @@ export class VertexAPIClient extends GeminiAPIClient {
 
   constructor(provider: Provider) {
     super(provider)
+    // 检查 VertexAI 配置
+    if (!isVertexAIConfigured()) {
+      throw new Error('VertexAI is not configured. Please configure project, location and service account credentials.')
+    }
     this.anthropicVertexClient = new AnthropicVertexClient(provider)
     // 如果传入的是普通 Provider，转换为 VertexProvider
     if (isVertexProvider(provider)) {

src/renderer/src/aiCore/legacy/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/legacy/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/legacy/clients/openai/OpenAIApiClient.ts

@@ -60,6 +60,8 @@ import {
 import { ChunkType, TextStartChunk, ThinkingStartChunk } from '@renderer/types/chunk'
 import { Message } from '@renderer/types/newMessage'
 import {
+  OpenAIExtraBody,
+  OpenAIModality,
   OpenAISdkMessageParam,
   OpenAISdkParams,
   OpenAISdkRawChunk,
@@ -122,13 +124,11 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
     if (!isReasoningModel(model)) {
       return {}
     }
+
     const reasoningEffort = assistant?.settings?.reasoning_effort
 
     if (isSupportedThinkingTokenZhipuModel(model)) {
-      if (!reasoningEffort) {
-        return { thinking: { type: 'disabled' } }
-      }
-      return { thinking: { type: 'enabled' } }
+      return { thinking: { type: reasoningEffort ? 'enabled' : 'disabled' } }
     }
 
     if (!reasoningEffort) {
@@ -139,6 +139,7 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
       // }
 
       // 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)) {
@@ -148,6 +149,9 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
         if (isGrokReasoningModel(model) || isOpenAIReasoningModel(model)) {
           return {}
         }
+        if (isReasoningModel(model) && !isSupportedThinkingTokenModel(model)) {
+          return {}
+        }
         return { reasoning: { enabled: false, exclude: true } }
       }
 
@@ -205,10 +209,6 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
               enable_thinking: true,
               incremental_output: true
             }
-          case SystemProviderIds.silicon:
-            return {
-              enable_thinking: true
-            }
           case SystemProviderIds.doubao:
             return {
               thinking: {
@@ -227,10 +227,18 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
                 thinking: true
               }
             }
+          case SystemProviderIds.silicon:
+          case SystemProviderIds.ppio:
+            return {
+              enable_thinking: true
+            }
           default:
             logger.warn(
-              `Skipping thinking options for provider ${this.provider.name} as DeepSeek v3.1 thinking control method is unknown`
+              `Use enable_thinking option as fallback for provider ${this.provider.name} since DeepSeek v3.1 thinking control method is unknown`
             )
+            return {
+              enable_thinking: true
+            }
         }
       }
     }
@@ -558,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只支持流式输出。
@@ -566,18 +574,18 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
           streamOutput = true
         }
 
-        const extra_body: Record<string, any> = {}
+        const extra_body: OpenAIExtraBody = {}
 
         if (isQwenMTModel(model)) {
           if (isTranslateAssistant(assistant)) {
-            const targetLanguage = assistant.targetLanguage
+            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: mapLanguageToQwenMTModel(targetLanguage)
+              target_lang: targetLanguage
             } as const
-            if (!translationOptions.target_lang) {
-              throw new Error(t('translate.error.not_supported', { language: targetLanguage.value }))
-            }
             extra_body.translation_options = translationOptions
           } else {
             throw new Error(t('translate.error.chat_qwen_mt'))
@@ -633,12 +641,18 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
           }
           if (this.provider.id === SystemProviderIds.poe) {
             // 如果以后 poe 支持 reasoning_effort 参数了，可以删掉这部分
+            let suffix = ''
             if (isGPT5SeriesModel(model) && reasoningEffort.reasoning_effort) {
-              lastUserMsg.content += ` --reasoning_effort ${reasoningEffort.reasoning_effort}`
+              suffix = ` --reasoning_effort ${reasoningEffort.reasoning_effort}`
             } else if (isClaudeReasoningModel(model) && reasoningEffort.thinking?.budget_tokens) {
-              lastUserMsg.content += ` --thinking_budget ${reasoningEffort.thinking.budget_tokens}`
+              suffix = ` --thinking_budget ${reasoningEffort.thinking.budget_tokens}`
             } else if (isGeminiReasoningModel(model) && reasoningEffort.extra_body?.google?.thinking_config) {
-              lastUserMsg.content += ` --thinking_budget ${reasoningEffort.extra_body.google.thinking_config.thinking_budget}`
+              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
             }
           }
         }
@@ -672,6 +686,15 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
           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:
@@ -684,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),
@@ -691,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) : {})

src/renderer/src/aiCore/legacy/clients/zhipu/ZhipuAPIClient.ts

@@ -0,0 +1,100 @@
+import { loggerService } from '@logger'
+import { Provider } from '@renderer/types'
+import { GenerateImageParams } from '@renderer/types'
+import OpenAI from 'openai'
+
+import { OpenAIAPIClient } from '../openai/OpenAIApiClient'
+
+const logger = loggerService.withContext('ZhipuAPIClient')
+
+export class ZhipuAPIClient extends OpenAIAPIClient {
+  constructor(provider: Provider) {
+    super(provider)
+  }
+
+  override getClientCompatibilityType(): string[] {
+    return ['ZhipuAPIClient']
+  }
+
+  override async generateImage({
+    model,
+    prompt,
+    negativePrompt,
+    imageSize,
+    batchSize,
+    signal,
+    quality
+  }: GenerateImageParams): Promise<string[]> {
+    const sdk = await this.getSdkInstance()
+
+    // 智谱AI使用不同的参数格式
+    const body: any = {
+      model,
+      prompt
+    }
+
+    // 智谱AI特有的参数格式
+    body.size = imageSize
+    body.n = batchSize
+    if (negativePrompt) {
+      body.negative_prompt = negativePrompt
+    }
+
+    // 只有cogview-4-250304模型支持quality和style参数
+    if (model === 'cogview-4-250304') {
+      if (quality) {
+        body.quality = quality
+      }
+      body.style = 'vivid'
+    }
+
+    try {
+      logger.debug('Calling Zhipu image generation API with params:', body)
+
+      const response = await sdk.images.generate(body, { signal })
+
+      if (response.data && response.data.length > 0) {
+        return response.data.map((image: any) => image.url).filter(Boolean)
+      }
+
+      return []
+    } catch (error) {
+      logger.error('Zhipu image generation failed:', error as Error)
+      throw error
+    }
+  }
+
+  public async listModels(): Promise<OpenAI.Models.Model[]> {
+    const models = [
+      'glm-4.5',
+      'glm-4.5-x',
+      'glm-4.5-air',
+      'glm-4.5-airx',
+      'glm-4.5-flash',
+      'glm-4.5v',
+      'glm-z1-air',
+      'glm-z1-airx',
+      'cogview-3-flash',
+      'cogview-4-250304',
+      'glm-4-long',
+      'glm-4-plus',
+      'glm-4-air-250414',
+      'glm-4-airx',
+      'glm-4-flashx',
+      'glm-4v',
+      'glm-4v-flash',
+      'glm-4v-plus-0111',
+      'glm-4.1v-thinking-flash',
+      'glm-4-alltools',
+      'embedding-3'
+    ]
+
+    const created = Date.now()
+    return models.map((id) => ({
+      id,
+      owned_by: 'zhipu',
+      object: 'model' as const,
+      created
+    }))
+  }
+}

src/renderer/src/aiCore/legacy/index.ts

@@ -9,9 +9,9 @@ import type { GenerateImageParams, Model, Provider } from '@renderer/types'
 import type { RequestOptions, SdkModel } from '@renderer/types/sdk'
 import { isSupportedToolUse } from '@renderer/utils/mcp-tools'
 
-import { AihubmixAPIClient } from './clients/AihubmixAPIClient'
+import { AihubmixAPIClient } from './clients/aihubmix/AihubmixAPIClient'
 import { VertexAPIClient } from './clients/gemini/VertexAPIClient'
-import { NewAPIClient } from './clients/NewAPIClient'
+import { NewAPIClient } from './clients/newapi/NewAPIClient'
 import { OpenAIResponseAPIClient } from './clients/openai/OpenAIResponseAPIClient'
 import { CompletionsMiddlewareBuilder } from './middleware/builder'
 import { MIDDLEWARE_NAME as AbortHandlerMiddlewareName } from './middleware/common/AbortHandlerMiddleware'

src/renderer/src/aiCore/legacy/middleware/common/ErrorHandlerMiddleware.ts

@@ -1,7 +1,9 @@
 import { loggerService } from '@logger'
+import { isZhipuModel } from '@renderer/config/models'
+import store from '@renderer/store'
 import { Chunk } from '@renderer/types/chunk'
 
-import { CompletionsResult } from '../schemas'
+import { CompletionsParams, CompletionsResult } from '../schemas'
 import { CompletionsContext } from '../types'
 import { createErrorChunk } from '../utils'
 
@@ -28,17 +30,22 @@ export const ErrorHandlerMiddleware =
       // 尝试执行下一个中间件
       return await next(ctx, params)
     } catch (error: any) {
-      logger.error('ErrorHandlerMiddleware_error', error)
+      logger.error(error)
+
+      let processedError = error
+      processedError = handleError(error, params)
+
       // 1. 使用通用的工具函数将错误解析为标准格式
-      const errorChunk = createErrorChunk(error)
+      const errorChunk = createErrorChunk(processedError)
+
       // 2. 调用从外部传入的 onError 回调
       if (params.onError) {
-        params.onError(error)
+        params.onError(processedError)
       }
 
       // 3. 根据配置决定是重新抛出错误，还是将其作为流的一部分向下传递
       if (shouldThrow) {
-        throw error
+        throw processedError
       }
 
       // 如果不抛出，则创建一个只包含该错误块的流并向下传递
@@ -57,3 +64,70 @@ export const ErrorHandlerMiddleware =
       }
     }
   }
+
+function handleError(error: any, params: CompletionsParams): any {
+  if (isZhipuModel(params.assistant.model) && error.status && !params.enableGenerateImage) {
+    return handleZhipuError(error)
+  }
+
+  if (error.status === 401 || error.message.includes('401')) {
+    return {
+      ...error,
+      i18nKey: 'chat.no_api_key',
+      providerId: params.assistant?.model?.provider
+    }
+  }
+
+  return error
+}
+
+/**
+ * 处理智谱特定错误
+ * 1. 只有对话功能（enableGenerateImage为false）才使用自定义错误处理
+ * 2. 绘画功能（enableGenerateImage为true）使用通用错误处理
+ */
+function handleZhipuError(error: any): any {
+  const provider = store.getState().llm.providers.find((p) => p.id === 'zhipu')
+  const logger = loggerService.withContext('handleZhipuError')
+
+  // 定义错误模式映射
+  const errorPatterns = [
+    {
+      condition: () => error.status === 401 || /令牌已过期|AuthenticationError|Unauthorized/i.test(error.message),
+      i18nKey: 'chat.no_api_key',
+      providerId: provider?.id
+    },
+    {
+      condition: () => error.error?.code === '1304' || /限额|免费配额|free quota|rate limit/i.test(error.message),
+      i18nKey: 'chat.quota_exceeded',
+      providerId: provider?.id
+    },
+    {
+      condition: () =>
+        (error.status === 429 && error.error?.code === '1113') || /余额不足|insufficient balance/i.test(error.message),
+      i18nKey: 'chat.insufficient_balance',
+      providerId: provider?.id
+    },
+    {
+      condition: () => !provider?.apiKey?.trim(),
+      i18nKey: 'chat.no_api_key',
+      providerId: provider?.id
+    }
+  ]
+
+  // 遍历错误模式，返回第一个匹配的错误
+  for (const pattern of errorPatterns) {
+    if (pattern.condition()) {
+      return {
+        ...error,
+        providerId: pattern.providerId,
+        i18nKey: pattern.i18nKey
+      }
+    }
+  }
+
+  // 如果不是智谱特定错误，返回原始错误
+  logger.debug('🔧 不是智谱特定错误，返回原始错误')
+
+  return error
+}

src/renderer/src/aiCore/middleware/AiSdkMiddlewareBuilder.ts

@@ -1,5 +1,5 @@
 import { loggerService } from '@logger'
-import type { MCPTool, Model, Provider } from '@renderer/types'
+import type { MCPTool, Message, Model, Provider } from '@renderer/types'
 import type { Chunk } from '@renderer/types/chunk'
 import { extractReasoningMiddleware, LanguageModelMiddleware, simulateStreamingMiddleware } from 'ai'
 
@@ -23,6 +23,7 @@ export interface AiSdkMiddlewareConfig {
   enableWebSearch: boolean
   enableGenerateImage: boolean
   mcpTools?: MCPTool[]
+  uiMessages?: Message[]
 }
 
 /**

src/renderer/src/aiCore/prepareParams/fileProcessor.ts

@@ -0,0 +1,192 @@
+/**
+ * 文件处理模块
+ * 处理文件内容提取、文件格式转换、文件上传等逻辑
+ */
+
+import { loggerService } from '@logger'
+import { getProviderByModel } from '@renderer/services/AssistantService'
+import type { FileMetadata, Message, Model } from '@renderer/types'
+import { FileTypes } from '@renderer/types'
+import { FileMessageBlock } from '@renderer/types/newMessage'
+import { findFileBlocks } from '@renderer/utils/messageUtils/find'
+import type { FilePart, TextPart } from 'ai'
+
+import { getAiSdkProviderId } from '../provider/factory'
+import { getFileSizeLimit, supportsImageInput, supportsLargeFileUpload, supportsPdfInput } from './modelCapabilities'
+
+const logger = loggerService.withContext('fileProcessor')
+
+/**
+ * 提取文件内容
+ */
+export async function extractFileContent(message: Message): Promise<string> {
+  const fileBlocks = findFileBlocks(message)
+  if (fileBlocks.length > 0) {
+    const textFileBlocks = fileBlocks.filter(
+      (fb) => fb.file && [FileTypes.TEXT, FileTypes.DOCUMENT].includes(fb.file.type)
+    )
+
+    if (textFileBlocks.length > 0) {
+      let text = ''
+      const divider = '\n\n---\n\n'
+
+      for (const fileBlock of textFileBlocks) {
+        const file = fileBlock.file
+        const fileContent = (await window.api.file.read(file.id + file.ext)).trim()
+        const fileNameRow = 'file: ' + file.origin_name + '\n\n'
+        text = text + fileNameRow + fileContent + divider
+      }
+
+      return text
+    }
+  }
+
+  return ''
+}
+
+/**
+ * 将文件块转换为文本部分
+ */
+export async function convertFileBlockToTextPart(fileBlock: FileMessageBlock): Promise<TextPart | null> {
+  const file = fileBlock.file
+
+  // 处理文本文件
+  if (file.type === FileTypes.TEXT) {
+    try {
+      const fileContent = await window.api.file.read(file.id + file.ext)
+      return {
+        type: 'text',
+        text: `${file.origin_name}\n${fileContent.trim()}`
+      }
+    } catch (error) {
+      logger.warn('Failed to read text file:', error as Error)
+    }
+  }
+
+  // 处理文档文件（PDF、Word、Excel等）- 提取为文本内容
+  if (file.type === FileTypes.DOCUMENT) {
+    try {
+      const fileContent = await window.api.file.read(file.id + file.ext, true) // true表示强制文本提取
+      return {
+        type: 'text',
+        text: `${file.origin_name}\n${fileContent.trim()}`
+      }
+    } catch (error) {
+      logger.warn(`Failed to extract text from document ${file.origin_name}:`, error as Error)
+    }
+  }
+
+  return null
+}
+
+/**
+ * 处理Gemini大文件上传
+ */
+export async function handleGeminiFileUpload(file: FileMetadata, model: Model): Promise<FilePart | null> {
+  try {
+    const provider = getProviderByModel(model)
+
+    // 检查文件是否已经上传过
+    const fileMetadata = await window.api.fileService.retrieve(provider, file.id)
+
+    if (fileMetadata.status === 'success' && fileMetadata.originalFile?.file) {
+      const remoteFile = fileMetadata.originalFile.file as any // 临时类型断言，因为File类型定义可能不完整
+      // 注意：AI SDK的FilePart格式和Gemini原生格式不同，这里需要适配
+      // 暂时返回null让它回退到文本处理，或者需要扩展FilePart支持uri
+      logger.info(`File ${file.origin_name} already uploaded to Gemini with URI: ${remoteFile.uri || 'unknown'}`)
+      return null
+    }
+
+    // 如果文件未上传，执行上传
+    const uploadResult = await window.api.fileService.upload(provider, file)
+    if (uploadResult.originalFile?.file) {
+      const remoteFile = uploadResult.originalFile.file as any // 临时类型断言
+      logger.info(`File ${file.origin_name} uploaded to Gemini with URI: ${remoteFile.uri || 'unknown'}`)
+      // 同样，这里需要处理URI格式的文件引用
+      return null
+    }
+  } catch (error) {
+    logger.error(`Failed to upload file ${file.origin_name} to Gemini:`, error as Error)
+  }
+
+  return null
+}
+
+/**
+ * 将文件块转换为FilePart（用于原生文件支持）
+ */
+export async function convertFileBlockToFilePart(fileBlock: FileMessageBlock, model: Model): Promise<FilePart | null> {
+  const file = fileBlock.file
+  const fileSizeLimit = getFileSizeLimit(model, file.type)
+
+  try {
+    // 处理PDF文档
+    if (file.type === FileTypes.DOCUMENT && file.ext === '.pdf' && supportsPdfInput(model)) {
+      // 检查文件大小限制
+      if (file.size > fileSizeLimit) {
+        // 如果支持大文件上传（如Gemini File API），尝试上传
+        if (supportsLargeFileUpload(model)) {
+          logger.info(`Large PDF file ${file.origin_name} (${file.size} bytes) attempting File API upload`)
+          const uploadResult = await handleGeminiFileUpload(file, model)
+          if (uploadResult) {
+            return uploadResult
+          }
+          // 如果上传失败，回退到文本处理
+          logger.warn(`Failed to upload large PDF ${file.origin_name}, falling back to text extraction`)
+          return null
+        } else {
+          logger.warn(`PDF file ${file.origin_name} exceeds size limit (${file.size} > ${fileSizeLimit})`)
+          return null // 文件过大，回退到文本处理
+        }
+      }
+
+      const base64Data = await window.api.file.base64File(file.id + file.ext)
+      return {
+        type: 'file',
+        data: base64Data.data,
+        mediaType: base64Data.mime,
+        filename: file.origin_name
+      }
+    }
+
+    // 处理图片文件
+    if (file.type === FileTypes.IMAGE && supportsImageInput(model)) {
+      // 检查文件大小
+      if (file.size > fileSizeLimit) {
+        logger.warn(`Image file ${file.origin_name} exceeds size limit (${file.size} > ${fileSizeLimit})`)
+        return null
+      }
+
+      const base64Data = await window.api.file.base64Image(file.id + file.ext)
+
+      // 处理MIME类型，特别是jpg->jpeg的转换（Anthropic要求）
+      let mediaType = base64Data.mime
+      const provider = getProviderByModel(model)
+      const aiSdkId = getAiSdkProviderId(provider)
+
+      if (aiSdkId === 'anthropic' && mediaType === 'image/jpg') {
+        mediaType = 'image/jpeg'
+      }
+
+      return {
+        type: 'file',
+        data: base64Data.base64,
+        mediaType: mediaType,
+        filename: file.origin_name
+      }
+    }
+
+    // 处理其他文档类型（Word、Excel等）
+    if (file.type === FileTypes.DOCUMENT && file.ext !== '.pdf') {
+      // 目前大多数提供商不支持Word等格式的原生处理
+      // 返回null会触发上层调用convertFileBlockToTextPart进行文本提取
+      // 这与Legacy架构中的处理方式一致
+      logger.debug(`Document file ${file.origin_name} with extension ${file.ext} will use text extraction fallback`)
+      return null
+    }
+  } catch (error) {
+    logger.warn(`Failed to process file ${file.origin_name}:`, error as Error)
+  }
+
+  return null
+}

src/renderer/src/aiCore/prepareParams/index.ts

@@ -0,0 +1,22 @@
+/**
+ * AI SDK 参数转换模块 - 统一入口
+ *
+ * 此模块已重构，功能分拆到以下子模块：
+ * - modelParameters.ts: 基础参数处理 (温度、TopP、超时)
+ * - modelCapabilities.ts: 模型能力检查 (PDF、图片、文件支持)
+ * - fileProcessor.ts: 文件处理逻辑 (转换、上传)
+ * - messageConverter.ts: 消息转换核心 (单个消息转换)
+ * - parameterBuilder.ts: 参数构建器 (最终参数组装)
+ */
+
+// 基础参数处理
+export { getTimeout } from './modelParameters'
+
+// 文件处理
+export { extractFileContent } from './fileProcessor'
+
+// 消息转换
+export { convertMessagesToSdkMessages, convertMessageToSdkParam } from './messageConverter'
+
+// 参数构建 (主要API)
+export { buildGenerateTextParams, buildStreamTextParams } from './parameterBuilder'

src/renderer/src/aiCore/prepareParams/messageConverter.ts

@@ -0,0 +1,166 @@
+/**
+ * 消息转换模块
+ * 将 Cherry Studio 消息格式转换为 AI SDK 消息格式
+ */
+
+import { loggerService } from '@logger'
+import { isVisionModel } from '@renderer/config/models'
+import type { Message, Model } from '@renderer/types'
+import { FileMessageBlock, ImageMessageBlock, ThinkingMessageBlock } from '@renderer/types/newMessage'
+import {
+  findFileBlocks,
+  findImageBlocks,
+  findThinkingBlocks,
+  getMainTextContent
+} from '@renderer/utils/messageUtils/find'
+import type { AssistantModelMessage, FilePart, ImagePart, ModelMessage, TextPart, UserModelMessage } from 'ai'
+
+import { convertFileBlockToFilePart, convertFileBlockToTextPart } from './fileProcessor'
+
+const logger = loggerService.withContext('messageConverter')
+
+/**
+ * 转换消息为 AI SDK 参数格式
+ * 基于 OpenAI 格式的通用转换，支持文本、图片和文件
+ */
+export async function convertMessageToSdkParam(
+  message: Message,
+  isVisionModel = false,
+  model?: Model
+): Promise<ModelMessage> {
+  const content = getMainTextContent(message)
+  const fileBlocks = findFileBlocks(message)
+  const imageBlocks = findImageBlocks(message)
+  const reasoningBlocks = findThinkingBlocks(message)
+  if (message.role === 'user' || message.role === 'system') {
+    return convertMessageToUserModelMessage(content, fileBlocks, imageBlocks, isVisionModel, model)
+  } else {
+    return convertMessageToAssistantModelMessage(content, fileBlocks, reasoningBlocks, model)
+  }
+}
+
+/**
+ * 转换为用户模型消息
+ */
+async function convertMessageToUserModelMessage(
+  content: string,
+  fileBlocks: FileMessageBlock[],
+  imageBlocks: ImageMessageBlock[],
+  isVisionModel = false,
+  model?: Model
+): Promise<UserModelMessage> {
+  const parts: Array<TextPart | FilePart | ImagePart> = []
+  if (content) {
+    parts.push({ type: 'text', text: content })
+  }
+
+  // 处理图片（仅在支持视觉的模型中）
+  if (isVisionModel) {
+    for (const imageBlock of imageBlocks) {
+      if (imageBlock.file) {
+        try {
+          const image = await window.api.file.base64Image(imageBlock.file.id + imageBlock.file.ext)
+          parts.push({
+            type: 'image',
+            image: image.base64,
+            mediaType: image.mime
+          })
+        } catch (error) {
+          logger.warn('Failed to load image:', error as Error)
+        }
+      } else if (imageBlock.url) {
+        parts.push({
+          type: 'image',
+          image: imageBlock.url
+        })
+      }
+    }
+  }
+  // 处理文件
+  for (const fileBlock of fileBlocks) {
+    const file = fileBlock.file
+    let processed = false
+
+    // 优先尝试原生文件支持（PDF、图片等）
+    if (model) {
+      const filePart = await convertFileBlockToFilePart(fileBlock, model)
+      if (filePart) {
+        parts.push(filePart)
+        logger.debug(`File ${file.origin_name} processed as native file format`)
+        processed = true
+      }
+    }
+
+    // 如果原生处理失败，回退到文本提取
+    if (!processed) {
+      const textPart = await convertFileBlockToTextPart(fileBlock)
+      if (textPart) {
+        parts.push(textPart)
+        logger.debug(`File ${file.origin_name} processed as text content`)
+      } else {
+        logger.warn(`File ${file.origin_name} could not be processed in any format`)
+      }
+    }
+  }
+
+  return {
+    role: 'user',
+    content: parts
+  }
+}
+
+/**
+ * 转换为助手模型消息
+ */
+async function convertMessageToAssistantModelMessage(
+  content: string,
+  fileBlocks: FileMessageBlock[],
+  thinkingBlocks: ThinkingMessageBlock[],
+  model?: Model
+): Promise<AssistantModelMessage> {
+  const parts: Array<TextPart | FilePart> = []
+  if (content) {
+    parts.push({ type: 'text', text: content })
+  }
+
+  for (const thinkingBlock of thinkingBlocks) {
+    parts.push({ type: 'text', text: thinkingBlock.content })
+  }
+
+  for (const fileBlock of fileBlocks) {
+    // 优先尝试原生文件支持（PDF等）
+    if (model) {
+      const filePart = await convertFileBlockToFilePart(fileBlock, model)
+      if (filePart) {
+        parts.push(filePart)
+        continue
+      }
+    }
+
+    // 回退到文本处理
+    const textPart = await convertFileBlockToTextPart(fileBlock)
+    if (textPart) {
+      parts.push(textPart)
+    }
+  }
+
+  return {
+    role: 'assistant',
+    content: parts
+  }
+}
+
+/**
+ * 转换 Cherry Studio 消息数组为 AI SDK 消息数组
+ */
+export async function convertMessagesToSdkMessages(messages: Message[], model: Model): Promise<ModelMessage[]> {
+  const sdkMessages: ModelMessage[] = []
+  const isVision = isVisionModel(model)
+
+  for (const message of messages) {
+    const sdkMessage = await convertMessageToSdkParam(message, isVision, model)
+    sdkMessages.push(sdkMessage)
+  }
+
+  return sdkMessages
+}

src/renderer/src/aiCore/prepareParams/modelCapabilities.ts

@@ -0,0 +1,73 @@
+/**
+ * 模型能力检查模块
+ * 检查不同模型支持的功能（PDF输入、图片输入、大文件上传等）
+ */
+
+import { isVisionModel } from '@renderer/config/models'
+import { getProviderByModel } from '@renderer/services/AssistantService'
+import type { Model } from '@renderer/types'
+import { FileTypes } from '@renderer/types'
+
+import { getAiSdkProviderId } from '../provider/factory'
+
+/**
+ * 检查模型是否支持原生PDF输入
+ */
+export function supportsPdfInput(model: Model): boolean {
+  // 基于AI SDK文档，这些提供商支持PDF输入
+  const supportedProviders = [
+    'openai',
+    'azure-openai',
+    'anthropic',
+    'google',
+    'google-generative-ai',
+    'google-vertex',
+    'bedrock',
+    'amazon-bedrock'
+  ]
+
+  const provider = getProviderByModel(model)
+  const aiSdkId = getAiSdkProviderId(provider)
+
+  return supportedProviders.some((provider) => aiSdkId === provider)
+}
+
+/**
+ * 检查模型是否支持原生图片输入
+ */
+export function supportsImageInput(model: Model): boolean {
+  return isVisionModel(model)
+}
+
+/**
+ * 检查提供商是否支持大文件上传（如Gemini File API）
+ */
+export function supportsLargeFileUpload(model: Model): boolean {
+  const provider = getProviderByModel(model)
+  const aiSdkId = getAiSdkProviderId(provider)
+
+  // 目前主要是Gemini系列支持大文件上传
+  return ['google', 'google-generative-ai', 'google-vertex'].includes(aiSdkId)
+}
+
+/**
+ * 获取提供商特定的文件大小限制
+ */
+export function getFileSizeLimit(model: Model, fileType: FileTypes): number {
+  const provider = getProviderByModel(model)
+  const aiSdkId = getAiSdkProviderId(provider)
+
+  // Anthropic PDF限制32MB
+  if (aiSdkId === 'anthropic' && fileType === FileTypes.DOCUMENT) {
+    return 32 * 1024 * 1024 // 32MB
+  }
+
+  // Gemini小文件限制20MB（超过此限制会使用File API上传）
+  if (['google', 'google-generative-ai', 'google-vertex'].includes(aiSdkId)) {
+    return 20 * 1024 * 1024 // 20MB
+  }
+
+  // 其他提供商没有明确限制，使用较大的默认值
+  // 这与Legacy架构中的实现一致，让提供商自行处理文件大小
+  return Infinity
+}

src/renderer/src/aiCore/prepareParams/modelParameters.ts

@@ -0,0 +1,51 @@
+/**
+ * 模型基础参数处理模块
+ * 处理温度、TopP、超时等基础参数的获取逻辑
+ */
+
+import {
+  isClaudeReasoningModel,
+  isNotSupportTemperatureAndTopP,
+  isSupportedFlexServiceTier
+} from '@renderer/config/models'
+import { getAssistantSettings } from '@renderer/services/AssistantService'
+import type { Assistant, Model } from '@renderer/types'
+import { defaultTimeout } from '@shared/config/constant'
+
+/**
+ * 获取温度参数
+ */
+export function getTemperature(assistant: Assistant, model: Model): number | undefined {
+  if (assistant.settings?.reasoning_effort && isClaudeReasoningModel(model)) {
+    return undefined
+  }
+  if (isNotSupportTemperatureAndTopP(model)) {
+    return undefined
+  }
+  const assistantSettings = getAssistantSettings(assistant)
+  return assistantSettings?.enableTemperature ? assistantSettings?.temperature : undefined
+}
+
+/**
+ * 获取 TopP 参数
+ */
+export function getTopP(assistant: Assistant, model: Model): number | undefined {
+  if (assistant.settings?.reasoning_effort && isClaudeReasoningModel(model)) {
+    return undefined
+  }
+  if (isNotSupportTemperatureAndTopP(model)) {
+    return undefined
+  }
+  const assistantSettings = getAssistantSettings(assistant)
+  return assistantSettings?.enableTopP ? assistantSettings?.topP : undefined
+}
+
+/**
+ * 获取超时设置
+ */
+export function getTimeout(model: Model): number {
+  if (isSupportedFlexServiceTier(model)) {
+    return 15 * 1000 * 60
+  }
+  return defaultTimeout
+}

src/renderer/src/aiCore/prepareParams/parameterBuilder.ts

@@ -0,0 +1,129 @@
+/**
+ * 参数构建模块
+ * 构建AI SDK的流式和非流式参数
+ */
+
+import { loggerService } from '@logger'
+import {
+  isGenerateImageModel,
+  isOpenRouterBuiltInWebSearchModel,
+  isReasoningModel,
+  isSupportedReasoningEffortModel,
+  isSupportedThinkingTokenModel,
+  isWebSearchModel
+} from '@renderer/config/models'
+import { getAssistantSettings, getDefaultModel } from '@renderer/services/AssistantService'
+import type { Assistant, MCPTool, Provider } from '@renderer/types'
+import type { StreamTextParams } from '@renderer/types/aiCoreTypes'
+import type { ModelMessage } from 'ai'
+import { stepCountIs } from 'ai'
+
+import { setupToolsConfig } from '../utils/mcp'
+import { buildProviderOptions } from '../utils/options'
+import { getTemperature, getTopP } from './modelParameters'
+
+const logger = loggerService.withContext('parameterBuilder')
+
+/**
+ * 构建 AI SDK 流式参数
+ * 这是主要的参数构建函数，整合所有转换逻辑
+ */
+export async function buildStreamTextParams(
+  sdkMessages: StreamTextParams['messages'] = [],
+  assistant: Assistant,
+  provider: Provider,
+  options: {
+    mcpTools?: MCPTool[]
+    webSearchProviderId?: string
+    requestOptions?: {
+      signal?: AbortSignal
+      timeout?: number
+      headers?: Record<string, string>
+    }
+  } = {}
+): Promise<{
+  params: StreamTextParams
+  modelId: string
+  capabilities: {
+    enableReasoning: boolean
+    enableWebSearch: boolean
+    enableGenerateImage: boolean
+    enableUrlContext: boolean
+  }
+}> {
+  const { mcpTools } = options
+
+  const model = assistant.model || getDefaultModel()
+
+  const { maxTokens } = getAssistantSettings(assistant)
+
+  // 这三个变量透传出来，交给下面启用插件/中间件
+  // 也可以在外部构建好再传入buildStreamTextParams
+  // FIXME: qwen3即使关闭思考仍然会导致enableReasoning的结果为true
+  const enableReasoning =
+    ((isSupportedThinkingTokenModel(model) || isSupportedReasoningEffortModel(model)) &&
+      assistant.settings?.reasoning_effort !== undefined) ||
+    (isReasoningModel(model) && (!isSupportedThinkingTokenModel(model) || !isSupportedReasoningEffortModel(model)))
+
+  const enableWebSearch =
+    (assistant.enableWebSearch && isWebSearchModel(model)) ||
+    isOpenRouterBuiltInWebSearchModel(model) ||
+    model.id.includes('sonar') ||
+    false
+
+  const enableUrlContext = assistant.enableUrlContext || false
+
+  const enableGenerateImage = !!(isGenerateImageModel(model) && assistant.enableGenerateImage)
+
+  const tools = setupToolsConfig(mcpTools)
+
+  // if (webSearchProviderId) {
+  //   tools['builtin_web_search'] = webSearchTool(webSearchProviderId)
+  // }
+
+  // 构建真正的 providerOptions
+  const providerOptions = buildProviderOptions(assistant, model, provider, {
+    enableReasoning,
+    enableWebSearch,
+    enableGenerateImage
+  })
+
+  // 构建基础参数
+  const params: StreamTextParams = {
+    messages: sdkMessages,
+    maxOutputTokens: maxTokens,
+    temperature: getTemperature(assistant, model),
+    topP: getTopP(assistant, model),
+    abortSignal: options.requestOptions?.signal,
+    headers: options.requestOptions?.headers,
+    providerOptions,
+    tools,
+    stopWhen: stepCountIs(10),
+    maxRetries: 0
+  }
+  if (assistant.prompt) {
+    params.system = assistant.prompt
+  }
+  logger.debug('params', params)
+  return {
+    params,
+    modelId: model.id,
+    capabilities: { enableReasoning, enableWebSearch, enableGenerateImage, enableUrlContext }
+  }
+}
+
+/**
+ * 构建非流式的 generateText 参数
+ */
+export async function buildGenerateTextParams(
+  messages: ModelMessage[],
+  assistant: Assistant,
+  provider: Provider,
+  options: {
+    mcpTools?: MCPTool[]
+    enableTools?: boolean
+  } = {}
+): Promise<any> {
+  // 复用流式参数的构建逻辑
+  return await buildStreamTextParams(messages, assistant, provider, options)
+}

src/renderer/src/aiCore/provider/config/aihubmix.ts

@@ -4,9 +4,8 @@
 import { isOpenAIModel } from '@renderer/config/models'
 import { Provider } from '@renderer/types'
 
-import { startsWith } from './helper'
-import { provider2Provider } from './helper'
-import type { ModelRule } from './types'
+import { provider2Provider, startsWith } from './helper'
+import type { RuleSet } from './types'
 
 const extraProviderConfig = (provider: Provider) => {
   return {
@@ -18,41 +17,41 @@ const extraProviderConfig = (provider: Provider) => {
   }
 }
 
-const AIHUBMIX_RULES: ModelRule[] = [
-  {
-    name: 'claude',
-    match: startsWith('claude'),
-    provider: (provider: Provider) => {
-      return extraProviderConfig({
-        ...provider,
-        type: 'anthropic'
-      })
+const AIHUBMIX_RULES: RuleSet = {
+  rules: [
+    {
+      match: startsWith('claude'),
+      provider: (provider: Provider) => {
+        return extraProviderConfig({
+          ...provider,
+          type: 'anthropic'
+        })
+      }
+    },
+    {
+      match: (model) =>
+        (startsWith('gemini')(model) || startsWith('imagen')(model)) &&
+        !model.id.endsWith('-nothink') &&
+        !model.id.endsWith('-search'),
+      provider: (provider: Provider) => {
+        return extraProviderConfig({
+          ...provider,
+          type: 'gemini',
+          apiHost: 'https://aihubmix.com/gemini'
+        })
+      }
+    },
+    {
+      match: isOpenAIModel,
+      provider: (provider: Provider) => {
+        return extraProviderConfig({
+          ...provider,
+          type: 'openai-response'
+        })
+      }
     }
-  },
-  {
-    name: 'gemini',
-    match: (model) =>
-      (startsWith('gemini')(model) || startsWith('imagen')(model)) &&
-      !model.id.endsWith('-nothink') &&
-      !model.id.endsWith('-search'),
-    provider: (provider: Provider) => {
-      return extraProviderConfig({
-        ...provider,
-        type: 'gemini',
-        apiHost: 'https://aihubmix.com/gemini'
-      })
-    }
-  },
-  {
-    name: 'openai',
-    match: isOpenAIModel,
-    provider: (provider: Provider) => {
-      return extraProviderConfig({
-        ...provider,
-        type: 'openai-response'
-      })
-    }
-  }
-]
+  ],
+  fallbackRule: (provider: Provider) => provider
+}
 
 export const aihubmixProviderCreator = provider2Provider.bind(null, AIHUBMIX_RULES)

src/renderer/src/aiCore/provider/config/helper.ts

@@ -1,22 +1,22 @@
 import type { Model, Provider } from '@renderer/types'
 
-import type { ModelRule } from './types'
+import type { RuleSet } from './types'
 
 export const startsWith = (prefix: string) => (model: Model) => model.id.toLowerCase().startsWith(prefix.toLowerCase())
 export const endpointIs = (type: string) => (model: Model) => model.endpoint_type === type
 
 /**
- * 解析模型对应的Provider ID
+ * 解析模型对应的Provider
+ * @param ruleSet 规则集对象
  * @param model 模型对象
- * @param rules 匹配规则数组
- * @param fallback 默认fallback的providerId
- * @returns 解析出的providerId
+ * @param provider 原始provider对象
+ * @returns 解析出的provider对象
  */
-export function provider2Provider(rules: ModelRule[], model: Model, provider: Provider): Provider {
-  for (const rule of rules) {
+export function provider2Provider(ruleSet: RuleSet, model: Model, provider: Provider): Provider {
+  for (const rule of ruleSet.rules) {
     if (rule.match(model)) {
       return rule.provider(provider)
     }
   }
-  return provider
+  return ruleSet.fallbackRule(provider)
 }

src/renderer/src/aiCore/provider/config/index.ts

@@ -1,16 +1,3 @@
-// /**
-//  * Provider解析规则模块导出
-//  */
-
-// // 导出类型
-// export type { ModelRule } from './types'
-
-// // 导出匹配函数和解析器
-// export { endpointIs, resolveProvider, startsWith } from './helper'
-
-// // 导出规则集
-// export { AIHUBMIX_RULES } from './aihubmix'
-// export { NEWAPI_RULES } from './newApi'
-
 export { aihubmixProviderCreator } from './aihubmix'
 export { newApiResolverCreator } from './newApi'
+export { vertexAnthropicProviderCreator } from './vertext-anthropic'

src/renderer/src/aiCore/provider/config/newApi.ts

@@ -4,49 +4,48 @@
 import { Provider } from '@renderer/types'
 
 import { endpointIs, provider2Provider } from './helper'
-import type { ModelRule } from './types'
+import type { RuleSet } from './types'
 
-const NEWAPI_RULES: ModelRule[] = [
-  {
-    name: 'anthropic',
-    match: endpointIs('anthropic'),
-    provider: (provider: Provider) => {
-      return {
-        ...provider,
-        type: 'anthropic'
+const NEWAPI_RULES: RuleSet = {
+  rules: [
+    {
+      match: endpointIs('anthropic'),
+      provider: (provider: Provider) => {
+        return {
+          ...provider,
+          type: 'anthropic'
+        }
+      }
+    },
+    {
+      match: endpointIs('gemini'),
+      provider: (provider: Provider) => {
+        return {
+          ...provider,
+          type: 'gemini'
+        }
+      }
+    },
+    {
+      match: endpointIs('openai-response'),
+      provider: (provider: Provider) => {
+        return {
+          ...provider,
+          type: 'openai-response'
+        }
+      }
+    },
+    {
+      match: (model) => endpointIs('openai')(model) || endpointIs('image-generation')(model),
+      provider: (provider: Provider) => {
+        return {
+          ...provider,
+          type: 'openai'
+        }
       }
     }
-  },
-  {
-    name: 'gemini',
-    match: endpointIs('gemini'),
-    provider: (provider: Provider) => {
-      return {
-        ...provider,
-        type: 'gemini'
-      }
-    }
-  },
-  {
-    name: 'openai-response',
-    match: endpointIs('openai-response'),
-    provider: (provider: Provider) => {
-      return {
-        ...provider,
-        type: 'openai-response'
-      }
-    }
-  },
-  {
-    name: 'openai',
-    match: (model) => endpointIs('openai')(model) || endpointIs('image-generation')(model),
-    provider: (provider: Provider) => {
-      return {
-        ...provider,
-        type: 'openai'
-      }
-    }
-  }
-]
+  ],
+  fallbackRule: (provider: Provider) => provider
+}
 
 export const newApiResolverCreator = provider2Provider.bind(null, NEWAPI_RULES)

src/renderer/src/aiCore/provider/config/types.ts

@@ -1,7 +1,9 @@
 import type { Model, Provider } from '@renderer/types'
 
-export interface ModelRule {
-  name: string
-  match: (model: Model) => boolean
-  provider: (provider: Provider) => Provider
+export interface RuleSet {
+  rules: Array<{
+    match: (model: Model) => boolean
+    provider: (provider: Provider) => Provider
+  }>
+  fallbackRule: (provider: Provider) => Provider
 }

src/renderer/src/aiCore/provider/config/vertext-anthropic.ts

@@ -0,0 +1,19 @@
+import type { Provider } from '@renderer/types'
+
+import { provider2Provider, startsWith } from './helper'
+import type { RuleSet } from './types'
+
+const VERTEX_ANTHROPIC_RULES: RuleSet = {
+  rules: [
+    {
+      match: startsWith('claude'),
+      provider: (provider: Provider) => ({
+        ...provider,
+        id: 'google-vertex-anthropic'
+      })
+    }
+  ],
+  fallbackRule: (provider: Provider) => provider
+}
+
+export const vertexAnthropicProviderCreator = provider2Provider.bind(null, VERTEX_ANTHROPIC_RULES)

src/renderer/src/aiCore/provider/factory.ts

@@ -1,6 +1,8 @@
 import { hasProviderConfigByAlias, type ProviderId, resolveProviderConfigId } from '@cherrystudio/ai-core/provider'
+import { createProvider as createProviderCore } from '@cherrystudio/ai-core/provider'
 import { loggerService } from '@logger'
 import { Provider } from '@renderer/types'
+import type { Provider as AiSdkProvider } from 'ai'
 
 import { initializeNewProviders } from './providerInitialization'
 
@@ -70,3 +72,39 @@ export function getAiSdkProviderId(provider: Provider): ProviderId | 'openai-com
   // 3. 最后的fallback（通常会成为openai-compatible）
   return provider.id as ProviderId
 }
+
+export async function createAiSdkProvider(config) {
+  let localProvider: Awaited<AiSdkProvider> | null = null
+  try {
+    // 特殊处理 claude-code provider，通过 IPC 在主线程中创建
+    // if (config.providerId === 'claude-code') {
+    localProvider = await window.api.provider.createClaudeCode()
+    logger.debug('Claude-code provider created via IPC', {
+      providerId: config.providerId,
+      hasOptions: !!config.options
+    })
+    console.log('localProvider', localProvider)
+    return localProvider
+    // }
+
+    if (config.providerId === 'openai' && config.options?.mode === 'chat') {
+      config.providerId = `${config.providerId}-chat`
+    } else if (config.providerId === 'azure' && config.options?.mode === 'responses') {
+      config.providerId = `${config.providerId}-responses`
+    }
+    localProvider = await createProviderCore(config.providerId, config.options)
+
+    logger.debug('Local provider created successfully', {
+      providerId: config.providerId,
+      hasOptions: !!config.options,
+      localProvider: localProvider,
+      options: config.options
+    })
+  } catch (error) {
+    logger.error('Failed to create local provider', error as Error, {
+      providerId: config.providerId
+    })
+    throw error
+  }
+  return localProvider
+}

src/renderer/src/aiCore/provider/providerConfig.ts

@@ -1,33 +1,65 @@
 import {
+  formatPrivateKey,
   hasProviderConfig,
   ProviderConfigFactory,
   type ProviderId,
   type ProviderSettingsMap
 } from '@cherrystudio/ai-core/provider'
 import { isOpenAIChatCompletionOnlyModel } from '@renderer/config/models'
-import { createVertexProvider, isVertexAIConfigured, isVertexProvider } from '@renderer/hooks/useVertexAI'
+import {
+  getAwsBedrockAccessKeyId,
+  getAwsBedrockRegion,
+  getAwsBedrockSecretAccessKey
+} from '@renderer/hooks/useAwsBedrock'
+import { createVertexProvider, isVertexAIConfigured } from '@renderer/hooks/useVertexAI'
 import { getProviderByModel } from '@renderer/services/AssistantService'
 import { loggerService } from '@renderer/services/LoggerService'
 import store from '@renderer/store'
 import type { Model, Provider } from '@renderer/types'
 import { formatApiHost } from '@renderer/utils/api'
-import { cloneDeep } from 'lodash'
+import { cloneDeep, isEmpty } from 'lodash'
 
-import { aihubmixProviderCreator, newApiResolverCreator } from './config'
+import { aihubmixProviderCreator, newApiResolverCreator, vertexAnthropicProviderCreator } from './config'
 import { getAiSdkProviderId } from './factory'
 
 const logger = loggerService.withContext('ProviderConfigProcessor')
 
+/**
+ * 获取轮询的API key
+ * 复用legacy架构的多key轮询逻辑
+ */
+function getRotatedApiKey(provider: Provider): string {
+  const keys = provider.apiKey.split(',').map((key) => key.trim())
+  const keyName = `provider:${provider.id}:last_used_key`
+
+  if (keys.length === 1) {
+    return keys[0]
+  }
+
+  const lastUsedKey = window.keyv.get(keyName)
+  if (!lastUsedKey) {
+    window.keyv.set(keyName, keys[0])
+    return keys[0]
+  }
+
+  const currentIndex = keys.indexOf(lastUsedKey)
+  const nextIndex = (currentIndex + 1) % keys.length
+  const nextKey = keys[nextIndex]
+  window.keyv.set(keyName, nextKey)
+
+  return nextKey
+}
+
 /**
  * 处理特殊provider的转换逻辑
  */
 function handleSpecialProviders(model: Model, provider: Provider): Provider {
-  if (provider.type === 'vertexai' && !isVertexProvider(provider)) {
-    if (!isVertexAIConfigured()) {
-      throw new Error('VertexAI is not configured. Please configure project, location and service account credentials.')
-    }
-    return createVertexProvider(provider)
-  }
+  // if (provider.type === 'vertexai' && !isVertexProvider(provider)) {
+  //   if (!isVertexAIConfigured()) {
+  //     throw new Error('VertexAI is not configured. Please configure project, location and service account credentials.')
+  //   }
+  //   return createVertexProvider(provider)
+  // }
 
   if (provider.id === 'aihubmix') {
     return aihubmixProviderCreator(model, provider)
@@ -35,6 +67,9 @@ function handleSpecialProviders(model: Model, provider: Provider): Provider {
   if (provider.id === 'newapi') {
     return newApiResolverCreator(model, provider)
   }
+  if (provider.id === 'vertexai') {
+    return vertexAnthropicProviderCreator(model, provider)
+  }
   return provider
 }
 
@@ -57,7 +92,6 @@ function formatProviderApiHost(provider: Provider): Provider {
  */
 export function getActualProvider(model: Model): Provider {
   const baseProvider = getProviderByModel(model)
-
   // 按顺序处理各种转换
   let actualProvider = cloneDeep(baseProvider)
   actualProvider = handleSpecialProviders(model, actualProvider)
@@ -83,7 +117,7 @@ export function providerToAiSdkConfig(
   // 构建基础配置
   const baseConfig = {
     baseURL: actualProvider.apiHost,
-    apiKey: actualProvider.apiKey
+    apiKey: getRotatedApiKey(actualProvider)
   }
   // 处理OpenAI模式
   const extraOptions: any = {}
@@ -96,12 +130,21 @@ export function providerToAiSdkConfig(
   // 添加额外headers
   if (actualProvider.extra_headers) {
     extraOptions.headers = actualProvider.extra_headers
+    // copy from openaiBaseClient/openaiResponseApiClient
+    if (aiSdkProviderId === 'openai') {
+      extraOptions.headers = {
+        ...extraOptions.headers,
+        'HTTP-Referer': 'https://cherry-ai.com',
+        'X-Title': 'Cherry Studio',
+        'X-Api-Key': baseConfig.apiKey
+      }
+    }
   }
 
   // copilot
   if (actualProvider.id === 'copilot') {
     extraOptions.headers = {
-      ...extraOptions.extra_headers,
+      ...extraOptions.headers,
       'editor-version': 'vscode/1.97.2',
       'copilot-vision-request': 'true'
     }
@@ -118,6 +161,39 @@ export function providerToAiSdkConfig(
     }
   }
 
+  // bedrock
+  if (aiSdkProviderId === 'bedrock') {
+    extraOptions.region = getAwsBedrockRegion()
+    extraOptions.accessKeyId = getAwsBedrockAccessKeyId()
+    extraOptions.secretAccessKey = getAwsBedrockSecretAccessKey()
+  }
+  // google-vertex
+  if (aiSdkProviderId === 'google-vertex' || aiSdkProviderId === 'google-vertex-anthropic') {
+    if (!isVertexAIConfigured()) {
+      throw new Error('VertexAI is not configured. Please configure project, location and service account credentials.')
+    }
+    const { project, location, googleCredentials } = createVertexProvider(actualProvider)
+    extraOptions.project = project
+    extraOptions.location = location
+    extraOptions.googleCredentials = {
+      ...googleCredentials,
+      privateKey: formatPrivateKey(googleCredentials.privateKey)
+    }
+    // extraOptions.headers = window.api.vertexAI.getAuthHeaders({
+    //   projectId: project,
+    //   serviceAccount: {
+    //     privateKey: googleCredentials.privateKey,
+    //     clientEmail: googleCredentials.clientEmail
+    //   }
+    // })
+    if (baseConfig.baseURL.endsWith('/v1/')) {
+      baseConfig.baseURL = baseConfig.baseURL.slice(0, -4)
+    } else if (baseConfig.baseURL.endsWith('/v1')) {
+      baseConfig.baseURL = baseConfig.baseURL.slice(0, -3)
+    }
+    baseConfig.baseURL = isEmpty(baseConfig.baseURL) ? '' : baseConfig.baseURL
+  }
+
   // 如果AI SDK支持该provider，使用原生配置
   if (hasProviderConfig(aiSdkProviderId) && aiSdkProviderId !== 'openai-compatible') {
     const options = ProviderConfigFactory.fromProvider(aiSdkProviderId, baseConfig, extraOptions)
@@ -168,5 +244,23 @@ export async function prepareSpecialProviderConfig(
     const { token } = await window.api.copilot.getToken(defaultHeaders)
     config.options.apiKey = token
   }
+  if (provider.id === 'cherryin') {
+    config.options.fetch = async (url, options) => {
+      // 在这里对最终参数进行签名
+      const signature = await window.api.cherryin.generateSignature({
+        method: 'POST',
+        path: '/chat/completions',
+        query: '',
+        body: JSON.parse(options.body)
+      })
+      return fetch(url, {
+        ...options,
+        headers: {
+          ...options.headers,
+          ...signature
+        }
+      })
+    }
+  }
   return config
 }