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

@@ -7,3 +7,5 @@ tsconfig.*.json
 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

@@ -55,10 +55,14 @@ files:
   - '!node_modules/selection-hook/prebuilds/**/*' # we rebuild .node, don't use prebuilds
   - '!node_modules/selection-hook/node_modules' # we don't need what in the node_modules dir
   - '!node_modules/selection-hook/src' # we don't need source files
+  - '!node_modules/tesseract.js-core/{tesseract-core.js,tesseract-core.wasm,tesseract-core.wasm.js}' # we don't need source files
+  - '!node_modules/tesseract.js-core/{tesseract-core-lstm.js,tesseract-core-lstm.wasm,tesseract-core-lstm.wasm.js}' # we don't need source files
+  - '!node_modules/tesseract.js-core/{tesseract-core-simd-lstm.js,tesseract-core-simd-lstm.wasm,tesseract-core-simd-lstm.wasm.js}' # we don't need source files
   - '!**/*.{h,iobj,ipdb,tlog,recipe,vcxproj,vcxproj.filters,Makefile,*.Makefile}' # filter .node build files
 asarUnpack:
   - resources/**
   - '**/*.{metal,exp,lib}'
+  - 'node_modules/@img/sharp-libvips-*/**'
 win:
   executableName: Cherry Studio
   artifactName: ${productName}-${version}-${arch}-setup.${ext}
@@ -111,16 +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: |
-    输入框快捷菜单增加清除按钮
-    侧边栏增加代码工具入口，代码工具增加环境变量设置
-    小程序增加多语言显示
-    优化 MCP 服务器列表
-    新增 Web 搜索图标
-    优化 SVG 预览，优化 HTML 内容样式
-    修复知识库文档预处理失败问题
-    稳定性改进和错误修复
+    🔧 性能优化：
+    - 优化AI服务连接方式，提升响应速度和稳定性
+    - 改进模型列表获取功能，减少不必要的网络请求
+    - 增强各AI服务商的兼容性和连接可靠性
+
+    🐛 问题修复：
+    - 修复部分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 // 内联所有动态导入，这是关键配置
@@ -81,7 +86,11 @@ export default defineConfig({
         '@shared': resolve('packages/shared'),
         '@logger': resolve('src/renderer/src/services/LoggerService'),
         '@mcp-trace/trace-core': resolve('packages/mcp-trace/trace-core'),
-        '@mcp-trace/trace-web': resolve('packages/mcp-trace/trace-web')
+        '@mcp-trace/trace-web': resolve('packages/mcp-trace/trace-web'),
+        '@cherrystudio/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/extension-table-plus': resolve('packages/extension-table-plus/src')
       }
     },
     optimizeDeps: {

eslint.config.mjs

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "1.5.7-rc.2",
+  "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,7 +72,10 @@
   "dependencies": {
     "@libsql/client": "0.14.0",
     "@libsql/win32-x64-msvc": "^0.4.7",
+    "@napi-rs/system-ocr": "patch:@napi-rs/system-ocr@npm%3A1.0.2#~/.yarn/patches/@napi-rs-system-ocr-npm-1.0.2-59e7a78e8b.patch",
     "@strongtz/win32-arm64-msvc": "^0.4.7",
+    "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",
@@ -87,12 +90,16 @@
     "@agentic/exa": "^7.3.3",
     "@agentic/searxng": "^7.3.3",
     "@agentic/tavily": "^7.3.3",
+    "@ai-sdk/amazon-bedrock": "^3.0.0",
+    "@ai-sdk/google-vertex": "^3.0.0",
+    "@ai-sdk/mistral": "^2.0.0",
     "@ant-design/v5-patch-for-react-19": "^1.0.3",
     "@anthropic-ai/sdk": "^0.41.0",
     "@anthropic-ai/vertex-sdk": "patch:@anthropic-ai/vertex-sdk@npm%3A0.11.4#~/.yarn/patches/@anthropic-ai-vertex-sdk-npm-0.11.4-c19cb41edb.patch",
     "@aws-sdk/client-bedrock": "^3.840.0",
     "@aws-sdk/client-bedrock-runtime": "^3.840.0",
     "@aws-sdk/client-s3": "^3.840.0",
+    "@cherrystudio/ai-core": "workspace:*",
     "@cherrystudio/embedjs": "^0.1.31",
     "@cherrystudio/embedjs-libsql": "^0.1.31",
     "@cherrystudio/embedjs-loader-csv": "^0.1.31",
@@ -105,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",
@@ -119,7 +127,7 @@
     "@eslint-react/eslint-plugin": "^1.36.1",
     "@eslint/js": "^9.22.0",
     "@google/genai": "patch:@google/genai@npm%3A1.0.1#~/.yarn/patches/@google-genai-npm-1.0.1-e26f0f9af7.patch",
-    "@hello-pangea/dnd": "^16.6.0",
+    "@hello-pangea/dnd": "^18.0.1",
     "@kangfenmao/keyv-storage": "^0.1.0",
     "@langchain/community": "^0.3.36",
     "@langchain/ollama": "^0.2.1",
@@ -127,6 +135,7 @@
     "@modelcontextprotocol/sdk": "^1.17.0",
     "@mozilla/readability": "^0.6.0",
     "@notionhq/client": "^2.2.15",
+    "@openrouter/ai-sdk-provider": "^1.1.2",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "2.0.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.200.0",
@@ -135,18 +144,36 @@
     "@opentelemetry/sdk-trace-web": "^2.0.0",
     "@playwright/test": "^1.52.0",
     "@reduxjs/toolkit": "^2.2.5",
-    "@shikijs/markdown-it": "^3.9.1",
-    "@swc/plugin-styled-components": "^7.1.5",
-    "@tanstack/react-query": "^5.27.0",
+    "@shikijs/markdown-it": "^3.12.0",
+    "@swc/plugin-styled-components": "^8.0.4",
+    "@tanstack/react-query": "^5.85.5",
     "@tanstack/react-virtual": "^3.13.12",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.6.1",
+    "@tiptap/extension-collaboration": "^3.2.0",
+    "@tiptap/extension-drag-handle": "patch:@tiptap/extension-drag-handle@npm%3A3.2.0#~/.yarn/patches/@tiptap-extension-drag-handle-npm-3.2.0-5a9ebff7c9.patch",
+    "@tiptap/extension-drag-handle-react": "^3.2.0",
+    "@tiptap/extension-image": "^3.2.0",
+    "@tiptap/extension-list": "^3.2.0",
+    "@tiptap/extension-mathematics": "^3.2.0",
+    "@tiptap/extension-mention": "^3.2.0",
+    "@tiptap/extension-node-range": "^3.2.0",
+    "@tiptap/extension-table-of-contents": "^3.2.0",
+    "@tiptap/extension-typography": "^3.2.0",
+    "@tiptap/extension-underline": "^3.2.0",
+    "@tiptap/pm": "^3.2.0",
+    "@tiptap/react": "^3.2.0",
+    "@tiptap/starter-kit": "^3.2.0",
+    "@tiptap/suggestion": "^3.2.0",
+    "@tiptap/y-tiptap": "^3.0.0",
+    "@truto/turndown-plugin-gfm": "^1.0.2",
     "@tryfabric/martian": "^1.2.4",
     "@types/cli-progress": "^3",
-    "@types/diff": "^7",
+    "@types/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",
@@ -157,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",
@@ -169,23 +197,27 @@
     "@viz-js/lang-dot": "^1.0.5",
     "@viz-js/viz": "^3.14.0",
     "@xyflow/react": "^12.4.4",
+    "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": "^7.0.0",
+    "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",
@@ -205,21 +237,24 @@
     "franc-min": "^6.2.0",
     "fs-extra": "^11.2.0",
     "google-auth-library": "^9.15.1",
+    "he": "^1.2.0",
+    "html-tags": "^5.1.0",
     "html-to-image": "^1.11.13",
+    "htmlparser2": "^10.0.0",
     "husky": "^9.1.7",
     "i18next": "^23.11.5",
     "iconv-lite": "^0.6.3",
     "isbinaryfile": "5.0.4",
     "jaison": "^2.0.2",
     "jest-styled-components": "^7.2.0",
-    "linguist-languages": "^8.0.0",
+    "linguist-languages": "^8.1.0",
     "lint-staged": "^15.5.0",
     "lodash": "^4.17.21",
     "lru-cache": "^11.1.0",
     "lucide-react": "^0.525.0",
     "macos-release": "^3.4.0",
     "markdown-it": "^14.1.0",
-    "mermaid": "^11.9.0",
+    "mermaid": "^11.10.1",
     "mime": "^4.0.4",
     "motion": "^12.10.5",
     "notion-helper": "^1.3.22",
@@ -259,14 +294,16 @@
     "remove-markdown": "^0.6.2",
     "rollup-plugin-visualizer": "^5.12.0",
     "sass": "^1.88.0",
-    "shiki": "^3.9.1",
+    "shiki": "^3.12.0",
     "strict-url-sanitise": "^0.0.1",
     "string-width": "^7.2.0",
+    "striptags": "^3.2.0",
     "styled-components": "^6.1.11",
     "tar": "^7.4.3",
     "tiny-pinyin": "^1.3.2",
     "tokenx": "^1.1.0",
     "tsx": "^4.20.3",
+    "turndown-plugin-gfm": "^1.0.2",
     "typescript": "^5.6.2",
     "undici": "6.21.2",
     "unified": "^11.0.5",
@@ -277,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"
   },
@@ -299,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": {
@@ -307,7 +352,7 @@
       "prettier --write",
       "eslint --fix"
     ],
-    "*.{json,md,yml,yaml,css,scss,html}": [
+    "*.{json,yml,yaml,css,scss,html}": [
       "prettier --write"
     ]
   }

packages/aiCore/AI_SDK_ARCHITECTURE.md

@@ -0,0 +1,514 @@
+# AI Core 基于 Vercel AI SDK 的技术架构
+
+## 1. 架构设计理念
+
+### 1.1 设计目标
+
+- **简化分层**：`models`（模型层）→ `runtime`（运行时层），清晰的职责分离
+- **统一接口**：使用 Vercel AI SDK 统一不同 AI Provider 的接口差异
+- **动态导入**：通过动态导入实现按需加载，减少打包体积
+- **最小包装**：直接使用 AI SDK 的类型和接口，避免重复定义
+- **插件系统**：基于钩子的通用插件架构，支持请求全生命周期扩展
+- **类型安全**：利用 TypeScript 和 AI SDK 的类型系统确保类型安全
+- **轻量级**：专注核心功能，保持包的轻量和高效
+- **包级独立**：作为独立包管理，便于复用和维护
+- **Agent就绪**：为将来集成 OpenAI Agents SDK 预留扩展空间
+
+### 1.2 核心优势
+
+- **标准化**：AI SDK 提供统一的模型接口，减少适配工作
+- **简化设计**：函数式API，避免过度抽象
+- **更好的开发体验**：完整的 TypeScript 支持和丰富的生态系统
+- **性能优化**：AI SDK 内置优化和最佳实践
+- **模块化设计**：独立包结构，支持跨项目复用
+- **可扩展插件**：通用的流转换和参数处理插件系统
+- **面向未来**：为 OpenAI Agents SDK 集成做好准备
+
+## 2. 整体架构图
+
+```mermaid
+graph TD
+    subgraph "用户应用 (如 Cherry Studio)"
+        UI["用户界面"]
+        Components["应用组件"]
+    end
+
+    subgraph "packages/aiCore (AI Core 包)"
+        subgraph "Runtime Layer (运行时层)"
+            RuntimeExecutor["RuntimeExecutor (运行时执行器)"]
+            PluginEngine["PluginEngine (插件引擎)"]
+            RuntimeAPI["Runtime API (便捷函数)"]
+        end
+
+        subgraph "Models Layer (模型层)"
+            ModelFactory["createModel() (模型工厂)"]
+            ProviderCreator["ProviderCreator (提供商创建器)"]
+        end
+
+        subgraph "Core Systems (核心系统)"
+            subgraph "Plugins (插件)"
+                PluginManager["PluginManager (插件管理)"]
+                BuiltInPlugins["Built-in Plugins (内置插件)"]
+                StreamTransforms["Stream Transforms (流转换)"]
+            end
+
+            subgraph "Middleware (中间件)"
+                MiddlewareWrapper["wrapModelWithMiddlewares() (中间件包装)"]
+            end
+
+            subgraph "Providers (提供商)"
+                Registry["Provider Registry (注册表)"]
+                Factory["Provider Factory (工厂)"]
+            end
+        end
+    end
+
+    subgraph "Vercel AI SDK"
+        AICore["ai (核心库)"]
+        OpenAI["@ai-sdk/openai"]
+        Anthropic["@ai-sdk/anthropic"]
+        Google["@ai-sdk/google"]
+        XAI["@ai-sdk/xai"]
+        Others["其他 19+ Providers"]
+    end
+
+    subgraph "Future: OpenAI Agents SDK"
+        AgentSDK["@openai/agents (未来集成)"]
+        AgentExtensions["Agent Extensions (预留)"]
+    end
+
+    UI --> RuntimeAPI
+    Components --> RuntimeExecutor
+    RuntimeAPI --> RuntimeExecutor
+    RuntimeExecutor --> PluginEngine
+    RuntimeExecutor --> ModelFactory
+    PluginEngine --> PluginManager
+    ModelFactory --> ProviderCreator
+    ModelFactory --> MiddlewareWrapper
+    ProviderCreator --> Registry
+    Registry --> Factory
+    Factory --> OpenAI
+    Factory --> Anthropic
+    Factory --> Google
+    Factory --> XAI
+    Factory --> Others
+
+    RuntimeExecutor --> AICore
+    AICore --> streamText
+    AICore --> generateText
+    AICore --> streamObject
+    AICore --> generateObject
+
+    PluginManager --> StreamTransforms
+    PluginManager --> BuiltInPlugins
+
+    %% 未来集成路径
+    RuntimeExecutor -.-> AgentSDK
+    AgentSDK -.-> AgentExtensions
+```
+
+## 3. 包结构设计
+
+### 3.1 新架构文件结构
+
+```
+packages/aiCore/
+├── src/
+│   ├── core/                        # 核心层 - 内部实现
+│   │   ├── models/                  # 模型层 - 模型创建和配置
+│   │   │   ├── factory.ts           # 模型工厂函数 ✅
+│   │   │   ├── ModelCreator.ts      # 模型创建器 ✅
+│   │   │   ├── ConfigManager.ts     # 配置管理器 ✅
+│   │   │   ├── types.ts             # 模型类型定义 ✅
+│   │   │   └── index.ts             # 模型层导出 ✅
+│   │   ├── runtime/                 # 运行时层 - 执行和用户API
+│   │   │   ├── executor.ts          # 运行时执行器 ✅
+│   │   │   ├── pluginEngine.ts      # 插件引擎 ✅
+│   │   │   ├── types.ts             # 运行时类型定义 ✅
+│   │   │   └── index.ts             # 运行时导出 ✅
+│   │   ├── middleware/              # 中间件系统
+│   │   │   ├── wrapper.ts           # 模型包装器 ✅
+│   │   │   ├── manager.ts           # 中间件管理器 ✅
+│   │   │   ├── types.ts             # 中间件类型 ✅
+│   │   │   └── index.ts             # 中间件导出 ✅
+│   │   ├── plugins/                 # 插件系统
+│   │   │   ├── types.ts             # 插件类型定义 ✅
+│   │   │   ├── manager.ts           # 插件管理器 ✅
+│   │   │   ├── built-in/            # 内置插件 ✅
+│   │   │   │   ├── logging.ts       # 日志插件 ✅
+│   │   │   │   ├── webSearchPlugin/ # 网络搜索插件 ✅
+│   │   │   │   ├── toolUsePlugin/   # 工具使用插件 ✅
+│   │   │   │   └── index.ts         # 内置插件导出 ✅
+│   │   │   ├── README.md            # 插件文档 ✅
+│   │   │   └── index.ts             # 插件导出 ✅
+│   │   ├── providers/               # 提供商管理
+│   │   │   ├── registry.ts          # 提供商注册表 ✅
+│   │   │   ├── factory.ts           # 提供商工厂 ✅
+│   │   │   ├── creator.ts           # 提供商创建器 ✅
+│   │   │   ├── types.ts             # 提供商类型 ✅
+│   │   │   ├── utils.ts             # 工具函数 ✅
+│   │   │   └── index.ts             # 提供商导出 ✅
+│   │   ├── options/                 # 配置选项
+│   │   │   ├── factory.ts           # 选项工厂 ✅
+│   │   │   ├── types.ts             # 选项类型 ✅
+│   │   │   ├── xai.ts               # xAI 选项 ✅
+│   │   │   ├── openrouter.ts        # OpenRouter 选项 ✅
+│   │   │   ├── examples.ts          # 示例配置 ✅
+│   │   │   └── index.ts             # 选项导出 ✅
+│   │   └── index.ts                 # 核心层导出 ✅
+│   ├── types.ts                     # 全局类型定义 ✅
+│   └── index.ts                     # 包主入口文件 ✅
+├── package.json                     # 包配置文件 ✅
+├── tsconfig.json                    # TypeScript 配置 ✅
+├── README.md                        # 包说明文档 ✅
+└── AI_SDK_ARCHITECTURE.md           # 本文档 ✅
+```
+
+## 4. 架构分层详解
+
+### 4.1 Models Layer (模型层)
+
+**职责**：统一的模型创建和配置管理
+
+**核心文件**：
+
+- `factory.ts`: 模型工厂函数 (`createModel`, `createModels`)
+- `ProviderCreator.ts`: 底层提供商创建和模型实例化
+- `types.ts`: 模型配置类型定义
+
+**设计特点**：
+
+- 函数式设计，避免不必要的类抽象
+- 统一的模型配置接口
+- 自动处理中间件应用
+- 支持批量模型创建
+
+**核心API**：
+
+```typescript
+// 模型配置接口
+export interface ModelConfig {
+  providerId: ProviderId
+  modelId: string
+  options: ProviderSettingsMap[ProviderId]
+  middlewares?: LanguageModelV1Middleware[]
+}
+
+// 核心模型创建函数
+export async function createModel(config: ModelConfig): Promise<LanguageModel>
+export async function createModels(configs: ModelConfig[]): Promise<LanguageModel[]>
+```
+
+### 4.2 Runtime Layer (运行时层)
+
+**职责**：运行时执行器和用户面向的API接口
+
+**核心组件**：
+
+- `executor.ts`: 运行时执行器类
+- `plugin-engine.ts`: 插件引擎（原PluginEnabledAiClient）
+- `index.ts`: 便捷函数和工厂方法
+
+**设计特点**：
+
+- 提供三种使用方式：类实例、静态工厂、函数式调用
+- 自动集成模型创建和插件处理
+- 完整的类型安全支持
+- 为 OpenAI Agents SDK 预留扩展接口
+
+**核心API**：
+
+```typescript
+// 运行时执行器
+export class RuntimeExecutor<T extends ProviderId = ProviderId> {
+  static create<T extends ProviderId>(
+    providerId: T,
+    options: ProviderSettingsMap[T],
+    plugins?: AiPlugin[]
+  ): RuntimeExecutor<T>
+
+  async streamText(modelId: string, params: StreamTextParams): Promise<StreamTextResult>
+  async generateText(modelId: string, params: GenerateTextParams): Promise<GenerateTextResult>
+  async streamObject(modelId: string, params: StreamObjectParams): Promise<StreamObjectResult>
+  async generateObject(modelId: string, params: GenerateObjectParams): Promise<GenerateObjectResult>
+}
+
+// 便捷函数式API
+export async function streamText<T extends ProviderId>(
+  providerId: T,
+  options: ProviderSettingsMap[T],
+  modelId: string,
+  params: StreamTextParams,
+  plugins?: AiPlugin[]
+): Promise<StreamTextResult>
+```
+
+### 4.3 Plugin System (插件系统)
+
+**职责**：可扩展的插件架构
+
+**核心组件**：
+
+- `PluginManager`: 插件生命周期管理
+- `built-in/`: 内置插件集合
+- 流转换收集和应用
+
+**设计特点**：
+
+- 借鉴 Rollup 的钩子分类设计
+- 支持流转换 (`experimental_transform`)
+- 内置常用插件（日志、计数等）
+- 完整的生命周期钩子
+
+**插件接口**：
+
+```typescript
+export interface AiPlugin {
+  name: string
+  enforce?: 'pre' | 'post'
+
+  // 【First】首个钩子 - 只执行第一个返回值的插件
+  resolveModel?: (modelId: string, context: AiRequestContext) => string | null | Promise<string | null>
+  loadTemplate?: (templateName: string, context: AiRequestContext) => any | null | Promise<any | null>
+
+  // 【Sequential】串行钩子 - 链式执行，支持数据转换
+  transformParams?: (params: any, context: AiRequestContext) => any | Promise<any>
+  transformResult?: (result: any, context: AiRequestContext) => any | Promise<any>
+
+  // 【Parallel】并行钩子 - 不依赖顺序，用于副作用
+  onRequestStart?: (context: AiRequestContext) => void | Promise<void>
+  onRequestEnd?: (context: AiRequestContext, result: any) => void | Promise<void>
+  onError?: (error: Error, context: AiRequestContext) => void | Promise<void>
+
+  // 【Stream】流处理
+  transformStream?: () => TransformStream
+}
+```
+
+### 4.4 Middleware System (中间件系统)
+
+**职责**：AI SDK原生中间件支持
+
+**核心组件**：
+
+- `ModelWrapper.ts`: 模型包装函数
+
+**设计哲学**：
+
+- 直接使用AI SDK的 `wrapLanguageModel`
+- 与插件系统分离，职责明确
+- 函数式设计，简化使用
+
+```typescript
+export function wrapModelWithMiddlewares(model: LanguageModel, middlewares: LanguageModelV1Middleware[]): LanguageModel
+```
+
+### 4.5 Provider System (提供商系统)
+
+**职责**：AI Provider注册表和动态导入
+
+**核心组件**：
+
+- `registry.ts`: 19+ Provider配置和类型
+- `factory.ts`: Provider配置工厂
+
+**支持的Providers**：
+
+- OpenAI, Anthropic, Google, XAI
+- Azure OpenAI, Amazon Bedrock, Google Vertex
+- Groq, Together.ai, Fireworks, DeepSeek
+- 等19+ AI SDK官方支持的providers
+
+## 5. 使用方式
+
+### 5.1 函数式调用 (推荐 - 简单场景)
+
+```typescript
+import { streamText, generateText } from '@cherrystudio/ai-core/runtime'
+
+// 直接函数调用
+const stream = await streamText(
+  'anthropic',
+  { apiKey: 'your-api-key' },
+  'claude-3',
+  { messages: [{ role: 'user', content: 'Hello!' }] },
+  [loggingPlugin]
+)
+```
+
+### 5.2 执行器实例 (推荐 - 复杂场景)
+
+```typescript
+import { createExecutor } from '@cherrystudio/ai-core/runtime'
+
+// 创建可复用的执行器
+const executor = createExecutor('openai', { apiKey: 'your-api-key' }, [plugin1, plugin2])
+
+// 多次使用
+const stream = await executor.streamText('gpt-4', {
+  messages: [{ role: 'user', content: 'Hello!' }]
+})
+
+const result = await executor.generateText('gpt-4', {
+  messages: [{ role: 'user', content: 'How are you?' }]
+})
+```
+
+### 5.3 静态工厂方法
+
+```typescript
+import { RuntimeExecutor } from '@cherrystudio/ai-core/runtime'
+
+// 静态创建
+const executor = RuntimeExecutor.create('anthropic', { apiKey: 'your-api-key' })
+await executor.streamText('claude-3', { messages: [...] })
+```
+
+### 5.4 直接模型创建 (高级用法)
+
+```typescript
+import { createModel } from '@cherrystudio/ai-core/models'
+import { streamText } from 'ai'
+
+// 直接创建模型使用
+const model = await createModel({
+  providerId: 'openai',
+  modelId: 'gpt-4',
+  options: { apiKey: 'your-api-key' },
+  middlewares: [middleware1, middleware2]
+})
+
+// 直接使用 AI SDK
+const result = await streamText({ model, messages: [...] })
+```
+
+## 6. 为 OpenAI Agents SDK 预留的设计
+
+### 6.1 架构兼容性
+
+当前架构完全兼容 OpenAI Agents SDK 的集成需求：
+
+```typescript
+// 当前的模型创建
+const model = await createModel({
+  providerId: 'anthropic',
+  modelId: 'claude-3',
+  options: { apiKey: 'xxx' }
+})
+
+// 将来可以直接用于 OpenAI Agents SDK
+import { Agent, run } from '@openai/agents'
+
+const agent = new Agent({
+  model, // ✅ 直接兼容 LanguageModel 接口
+  name: 'Assistant',
+  instructions: '...',
+  tools: [tool1, tool2]
+})
+
+const result = await run(agent, 'user input')
+```
+
+### 6.2 预留的扩展点
+
+1. **runtime/agents/** 目录预留
+2. **AgentExecutor** 类预留
+3. **Agent工具转换插件** 预留
+4. **多Agent编排** 预留
+
+### 6.3 未来架构扩展
+
+```
+packages/aiCore/src/core/
+├── runtime/
+│   ├── agents/              # 🚀 未来添加
+│   │   ├── AgentExecutor.ts
+│   │   ├── WorkflowManager.ts
+│   │   └── ConversationManager.ts
+│   ├── executor.ts
+│   └── index.ts
+```
+
+## 7. 架构优势
+
+### 7.1 简化设计
+
+- **移除过度抽象**：删除了orchestration层和creation层的复杂包装
+- **函数式优先**：models层使用函数而非类
+- **直接明了**：runtime层直接提供用户API
+
+### 7.2 职责清晰
+
+- **Models**: 专注模型创建和配置
+- **Runtime**: 专注执行和用户API
+- **Plugins**: 专注扩展功能
+- **Providers**: 专注AI Provider管理
+
+### 7.3 类型安全
+
+- 完整的 TypeScript 支持
+- AI SDK 类型的直接复用
+- 避免类型重复定义
+
+### 7.4 灵活使用
+
+- 三种使用模式满足不同需求
+- 从简单函数调用到复杂执行器
+- 支持直接AI SDK使用
+
+### 7.5 面向未来
+
+- 为 OpenAI Agents SDK 集成做好准备
+- 清晰的扩展点和架构边界
+- 模块化设计便于功能添加
+
+## 8. 技术决策记录
+
+### 8.1 为什么选择简化的两层架构？
+
+- **职责分离**：models专注创建，runtime专注执行
+- **模块化**：每层都有清晰的边界和职责
+- **扩展性**：为Agent功能预留了清晰的扩展空间
+
+### 8.2 为什么选择函数式设计？
+
+- **简洁性**：避免不必要的类设计
+- **性能**：减少对象创建开销
+- **易用性**：函数调用更直观
+
+### 8.3 为什么分离插件和中间件？
+
+- **职责明确**: 插件处理应用特定需求
+- **原生支持**: 中间件使用AI SDK原生功能
+- **灵活性**: 两套系统可以独立演进
+
+## 9. 总结
+
+AI Core架构实现了：
+
+### 9.1 核心特点
+
+- ✅ **简化架构**: 2层核心架构，职责清晰
+- ✅ **函数式设计**: models层完全函数化
+- ✅ **类型安全**: 统一的类型定义和AI SDK类型复用
+- ✅ **插件扩展**: 强大的插件系统
+- ✅ **多种使用方式**: 满足不同复杂度需求
+- ✅ **Agent就绪**: 为OpenAI Agents SDK集成做好准备
+
+### 9.2 核心价值
+
+- **统一接口**: 一套API支持19+ AI providers
+- **灵活使用**: 函数式、实例式、静态工厂式
+- **强类型**: 完整的TypeScript支持
+- **可扩展**: 插件和中间件双重扩展能力
+- **高性能**: 最小化包装，直接使用AI SDK
+- **面向未来**: Agent SDK集成架构就绪
+
+### 9.3 未来发展
+
+这个架构提供了：
+
+- **优秀的开发体验**: 简洁的API和清晰的使用模式
+- **强大的扩展能力**: 为Agent功能预留了完整的架构空间
+- **良好的维护性**: 职责分离明确，代码易于维护
+- **广泛的适用性**: 既适合简单调用也适合复杂应用

packages/aiCore/README.md

@@ -0,0 +1,433 @@
+# @cherrystudio/ai-core
+
+Cherry Studio AI Core 是一个基于 Vercel AI SDK 的统一 AI Provider 接口包，为 AI 应用提供强大的抽象层和插件化架构。
+
+## ✨ 核心亮点
+
+### 🏗️ 优雅的架构设计
+
+- **简化分层**：`models`（模型层）→ `runtime`（运行时层），清晰的职责分离
+- **函数式优先**：避免过度抽象，提供简洁直观的 API
+- **类型安全**：完整的 TypeScript 支持，直接复用 AI SDK 类型系统
+- **最小包装**：直接使用 AI SDK 的接口，避免重复定义和性能损耗
+
+### 🔌 强大的插件系统
+
+- **生命周期钩子**：支持请求全生命周期的扩展点
+- **流转换支持**：基于 AI SDK 的 `experimental_transform` 实现流处理
+- **插件分类**：First、Sequential、Parallel 三种钩子类型，满足不同场景
+- **内置插件**：webSearch、logging、toolUse 等开箱即用的功能
+
+### 🌐 统一多 Provider 接口
+
+- **扩展注册**：支持自定义 Provider 注册，无限扩展能力
+- **配置统一**：统一的配置接口，简化多 Provider 管理
+
+### 🚀 多种使用方式
+
+- **函数式调用**：适合简单场景的直接函数调用
+- **执行器实例**：适合复杂场景的可复用执行器
+- **静态工厂**：便捷的静态创建方法
+- **原生兼容**：完全兼容 AI SDK 原生 Provider Registry
+
+### 🔮 面向未来
+
+- **Agent 就绪**：为 OpenAI Agents SDK 集成预留架构空间
+- **模块化设计**：独立包结构，支持跨项目复用
+- **渐进式迁移**：可以逐步从现有 AI SDK 代码迁移
+
+## 特性
+
+- 🚀 统一的 AI Provider 接口
+- 🔄 动态导入支持
+- 🛠️ TypeScript 支持
+- 📦 强大的插件系统
+- 🌍 内置webSearch(Openai,Google,Anthropic,xAI)
+- 🎯 多种使用模式（函数式/实例式/静态工厂）
+- 🔌 可扩展的 Provider 注册系统
+- 🧩 完整的中间件支持
+- 📊 插件统计和调试功能
+
+## 支持的 Providers
+
+基于 [AI SDK 官方支持的 providers](https://ai-sdk.dev/providers/ai-sdk-providers)：
+
+**核心 Providers（内置支持）:**
+
+- OpenAI
+- Anthropic
+- Google Generative AI
+- OpenAI-Compatible
+- xAI (Grok)
+- Azure OpenAI
+- DeepSeek
+
+**扩展 Providers（通过注册API支持）:**
+
+- Google Vertex AI
+- ...
+- 自定义 Provider
+
+## 安装
+
+```bash
+npm install @cherrystudio/ai-core ai
+```
+
+### React Native
+
+如果你在 React Native 项目中使用此包，需要在 `metro.config.js` 中添加以下配置：
+
+```javascript
+// metro.config.js
+const { getDefaultConfig } = require('expo/metro-config')
+
+const config = getDefaultConfig(__dirname)
+
+// 添加对 @cherrystudio/ai-core 的支持
+config.resolver.resolverMainFields = ['react-native', 'browser', 'main']
+config.resolver.platforms = ['ios', 'android', 'native', 'web']
+
+module.exports = config
+```
+
+还需要安装你要使用的 AI SDK provider:
+
+```bash
+npm install @ai-sdk/openai @ai-sdk/anthropic @ai-sdk/google
+```
+
+## 使用示例
+
+### 基础用法
+
+```typescript
+import { AiCore } from '@cherrystudio/ai-core'
+
+// 创建 OpenAI executor
+const executor = AiCore.create('openai', {
+  apiKey: 'your-api-key'
+})
+
+// 流式生成
+const result = await executor.streamText('gpt-4', {
+  messages: [{ role: 'user', content: 'Hello!' }]
+})
+
+// 非流式生成
+const response = await executor.generateText('gpt-4', {
+  messages: [{ role: 'user', content: 'Hello!' }]
+})
+```
+
+### 便捷函数
+
+```typescript
+import { createOpenAIExecutor } from '@cherrystudio/ai-core'
+
+// 快速创建 OpenAI executor
+const executor = createOpenAIExecutor({
+  apiKey: 'your-api-key'
+})
+
+// 使用 executor
+const result = await executor.streamText('gpt-4', {
+  messages: [{ role: 'user', content: 'Hello!' }]
+})
+```
+
+### 多 Provider 支持
+
+```typescript
+import { AiCore } from '@cherrystudio/ai-core'
+
+// 支持多种 AI providers
+const openaiExecutor = AiCore.create('openai', { apiKey: 'openai-key' })
+const anthropicExecutor = AiCore.create('anthropic', { apiKey: 'anthropic-key' })
+const googleExecutor = AiCore.create('google', { apiKey: 'google-key' })
+const xaiExecutor = AiCore.create('xai', { apiKey: 'xai-key' })
+```
+
+### 扩展 Provider 注册
+
+对于非内置的 providers，可以通过注册 API 扩展支持：
+
+```typescript
+import { registerProvider, AiCore } from '@cherrystudio/ai-core'
+
+// 方式一：导入并注册第三方 provider
+import { createGroq } from '@ai-sdk/groq'
+
+registerProvider({
+  id: 'groq',
+  name: 'Groq',
+  creator: createGroq,
+  supportsImageGeneration: false
+})
+
+// 现在可以使用 Groq
+const groqExecutor = AiCore.create('groq', { apiKey: 'groq-key' })
+
+// 方式二：动态导入方式注册
+registerProvider({
+  id: 'mistral',
+  name: 'Mistral AI',
+  import: () => import('@ai-sdk/mistral'),
+  creatorFunctionName: 'createMistral'
+})
+
+const mistralExecutor = AiCore.create('mistral', { apiKey: 'mistral-key' })
+```
+
+## 🔌 插件系统
+
+AI Core 提供了强大的插件系统，支持请求全生命周期的扩展。
+
+### 内置插件
+
+#### webSearchPlugin - 网络搜索插件
+
+为不同 AI Provider 提供统一的网络搜索能力：
+
+```typescript
+import { webSearchPlugin } from '@cherrystudio/ai-core/built-in/plugins'
+
+const executor = AiCore.create('openai', { apiKey: 'your-key' }, [
+  webSearchPlugin({
+    openai: {
+      /* OpenAI 搜索配置 */
+    },
+    anthropic: { maxUses: 5 },
+    google: {
+      /* Google 搜索配置 */
+    },
+    xai: {
+      mode: 'on',
+      returnCitations: true,
+      maxSearchResults: 5,
+      sources: [{ type: 'web' }, { type: 'x' }, { type: 'news' }]
+    }
+  })
+])
+```
+
+#### loggingPlugin - 日志插件
+
+提供详细的请求日志记录：
+
+```typescript
+import { createLoggingPlugin } from '@cherrystudio/ai-core/built-in/plugins'
+
+const executor = AiCore.create('openai', { apiKey: 'your-key' }, [
+  createLoggingPlugin({
+    logLevel: 'info',
+    includeParams: true,
+    includeResult: false
+  })
+])
+```
+
+#### promptToolUsePlugin - 提示工具使用插件
+
+为不支持原生 Function Call 的模型提供 prompt 方式的工具调用：
+
+```typescript
+import { createPromptToolUsePlugin } from '@cherrystudio/ai-core/built-in/plugins'
+
+// 对于不支持 function call 的模型
+const executor = AiCore.create(
+  'providerId',
+  {
+    apiKey: 'your-key',
+    baseURL: 'https://your-model-endpoint'
+  },
+  [
+    createPromptToolUsePlugin({
+      enabled: true,
+      // 可选：自定义系统提示符构建
+      buildSystemPrompt: (userPrompt, tools) => {
+        return `${userPrompt}\n\nAvailable tools: ${Object.keys(tools).join(', ')}`
+      }
+    })
+  ]
+)
+```
+
+### 自定义插件
+
+创建自定义插件非常简单：
+
+```typescript
+import { definePlugin } from '@cherrystudio/ai-core'
+
+const customPlugin = definePlugin({
+  name: 'custom-plugin',
+  enforce: 'pre', // 'pre' | 'post' | undefined
+
+  // 在请求开始时记录日志
+  onRequestStart: async (context) => {
+    console.log(`Starting request for model: ${context.modelId}`)
+  },
+
+  // 转换请求参数
+  transformParams: async (params, context) => {
+    // 添加自定义系统消息
+    if (params.messages) {
+      params.messages.unshift({
+        role: 'system',
+        content: 'You are a helpful assistant.'
+      })
+    }
+    return params
+  },
+
+  // 处理响应结果
+  transformResult: async (result, context) => {
+    // 添加元数据
+    if (result.text) {
+      result.metadata = {
+        processedAt: new Date().toISOString(),
+        modelId: context.modelId
+      }
+    }
+    return result
+  }
+})
+
+// 使用自定义插件
+const executor = AiCore.create('openai', { apiKey: 'your-key' }, [customPlugin])
+```
+
+### 使用 AI SDK 原生 Provider 注册表
+
+> https://ai-sdk.dev/docs/reference/ai-sdk-core/provider-registry
+
+除了使用内建的 provider 管理，你还可以使用 AI SDK 原生的 `createProviderRegistry` 来构建自己的 provider 注册表。
+
+#### 基本用法示例
+
+```typescript
+import { createClient } from '@cherrystudio/ai-core'
+import { createProviderRegistry } from 'ai'
+import { createOpenAI } from '@ai-sdk/openai'
+import { anthropic } from '@ai-sdk/anthropic'
+
+// 1. 创建 AI SDK 原生注册表
+export const registry = createProviderRegistry({
+  // register provider with prefix and default setup:
+  anthropic,
+
+  // register provider with prefix and custom setup:
+  openai: createOpenAI({
+    apiKey: process.env.OPENAI_API_KEY
+  })
+})
+
+// 2. 创建client,'openai'可以传空或者传providerId(内建的provider)
+const client = PluginEnabledAiClient.create('openai', {
+  apiKey: process.env.OPENAI_API_KEY
+})
+
+// 3. 方式1：使用内建逻辑（传统方式）
+const result1 = await client.streamText('gpt-4', {
+  messages: [{ role: 'user', content: 'Hello with built-in logic!' }]
+})
+
+// 4. 方式2：使用自定义注册表（灵活方式）
+const result2 = await client.streamText({
+  model: registry.languageModel('openai:gpt-4'),
+  messages: [{ role: 'user', content: 'Hello with custom registry!' }]
+})
+
+// 5. 支持的重载方法
+await client.generateObject({
+  model: registry.languageModel('openai:gpt-4'),
+  schema: z.object({ name: z.string() }),
+  messages: [{ role: 'user', content: 'Generate a user' }]
+})
+
+await client.streamObject({
+  model: registry.languageModel('anthropic:claude-3-opus-20240229'),
+  schema: z.object({ items: z.array(z.string()) }),
+  messages: [{ role: 'user', content: 'Generate a list' }]
+})
+```
+
+#### 与插件系统配合使用
+
+更强大的是，你还可以将自定义注册表与 Cherry Studio 的插件系统结合使用：
+
+```typescript
+import { PluginEnabledAiClient } from '@cherrystudio/ai-core'
+import { createProviderRegistry } from 'ai'
+import { createOpenAI } from '@ai-sdk/openai'
+import { anthropic } from '@ai-sdk/anthropic'
+
+// 1. 创建带插件的客户端
+const client = PluginEnabledAiClient.create(
+  'openai',
+  {
+    apiKey: process.env.OPENAI_API_KEY
+  },
+  [LoggingPlugin, RetryPlugin]
+)
+
+// 2. 创建自定义注册表
+const registry = createProviderRegistry({
+  openai: createOpenAI({ apiKey: process.env.OPENAI_API_KEY }),
+  anthropic: anthropic({ apiKey: process.env.ANTHROPIC_API_KEY })
+})
+
+// 3. 方式1：使用内建逻辑 + 完整插件系统
+await client.streamText('gpt-4', {
+  messages: [{ role: 'user', content: 'Hello with plugins!' }]
+})
+
+// 4. 方式2：使用自定义注册表 + 有限插件支持
+await client.streamText({
+  model: registry.languageModel('anthropic:claude-3-opus-20240229'),
+  messages: [{ role: 'user', content: 'Hello from Claude!' }]
+})
+
+// 5. 支持的方法
+await client.generateObject({
+  model: registry.languageModel('openai:gpt-4'),
+  schema: z.object({ name: z.string() }),
+  messages: [{ role: 'user', content: 'Generate a user' }]
+})
+
+await client.streamObject({
+  model: registry.languageModel('openai:gpt-4'),
+  schema: z.object({ items: z.array(z.string()) }),
+  messages: [{ role: 'user', content: 'Generate a list' }]
+})
+```
+
+#### 混合使用的优势
+
+- **灵活性**：可以根据需要选择使用内建逻辑或自定义注册表
+- **兼容性**：完全兼容 AI SDK 的 `createProviderRegistry` API
+- **渐进式**：可以逐步迁移现有代码，无需一次性重构
+- **插件支持**：自定义注册表仍可享受插件系统的部分功能
+- **最佳实践**：结合两种方式的优点，既有动态加载的性能优势，又有统一注册表的便利性
+
+## 📚 相关资源
+
+- [Vercel AI SDK 文档](https://ai-sdk.dev/)
+- [Cherry Studio 项目](https://github.com/CherryHQ/cherry-studio)
+- [AI SDK Providers](https://ai-sdk.dev/providers/ai-sdk-providers)
+
+## 未来版本
+
+- 🔮 多 Agent 编排
+- 🔮 可视化插件配置
+- 🔮 实时监控和分析
+- 🔮 云端插件同步
+
+## 📄 License
+
+MIT License - 详见 [LICENSE](https://github.com/CherryHQ/cherry-studio/blob/main/LICENSE) 文件
+
+---
+
+**Cherry Studio AI Core** - 让 AI 开发更简单、更强大、更灵活 🚀

packages/aiCore/examples/hub-provider-usage.ts

@@ -0,0 +1,103 @@
+/**
+ * Hub Provider 使用示例
+ *
+ * 演示如何使用简化后的Hub Provider功能来路由到多个底层provider
+ */
+
+import { createHubProvider, initializeProvider, providerRegistry } from '../src/index'
+
+async function demonstrateHubProvider() {
+  try {
+    // 1. 初始化底层providers
+    console.log('📦 初始化底层providers...')
+
+    initializeProvider('openai', {
+      apiKey: process.env.OPENAI_API_KEY || 'sk-test-key'
+    })
+
+    initializeProvider('anthropic', {
+      apiKey: process.env.ANTHROPIC_API_KEY || 'sk-ant-test-key'
+    })
+
+    // 2. 创建Hub Provider（自动包含所有已初始化的providers）
+    console.log('🌐 创建Hub Provider...')
+
+    const aihubmixProvider = createHubProvider({
+      hubId: 'aihubmix',
+      debug: true
+    })
+
+    // 3. 注册Hub Provider
+    providerRegistry.registerProvider('aihubmix', aihubmixProvider)
+
+    console.log('✅ Hub Provider "aihubmix" 注册成功')
+
+    // 4. 使用Hub Provider访问不同的模型
+    console.log('\n🚀 使用Hub模型...')
+
+    // 通过Hub路由到OpenAI
+    const openaiModel = providerRegistry.languageModel('aihubmix:openai:gpt-4')
+    console.log('✓ OpenAI模型已获取:', openaiModel.modelId)
+
+    // 通过Hub路由到Anthropic
+    const anthropicModel = providerRegistry.languageModel('aihubmix:anthropic:claude-3.5-sonnet')
+    console.log('✓ Anthropic模型已获取:', anthropicModel.modelId)
+
+    // 5. 演示错误处理
+    console.log('\n❌ 演示错误处理...')
+
+    try {
+      // 尝试访问未初始化的provider
+      providerRegistry.languageModel('aihubmix:google:gemini-pro')
+    } catch (error) {
+      console.log('预期错误:', error.message)
+    }
+
+    try {
+      // 尝试使用错误的模型ID格式
+      providerRegistry.languageModel('aihubmix:invalid-format')
+    } catch (error) {
+      console.log('预期错误:', error.message)
+    }
+
+    // 6. 多个Hub Provider示例
+    console.log('\n🔄 创建多个Hub Provider...')
+
+    const localHubProvider = createHubProvider({
+      hubId: 'local-ai'
+    })
+
+    providerRegistry.registerProvider('local-ai', localHubProvider)
+    console.log('✅ Hub Provider "local-ai" 注册成功')
+
+    console.log('\n🎉 Hub Provider演示完成！')
+  } catch (error) {
+    console.error('💥 演示过程中发生错误:', error)
+  }
+}
+
+// 演示简化的使用方式
+function simplifiedUsageExample() {
+  console.log('\n📝 简化使用示例:')
+  console.log(`
+// 1. 初始化providers
+initializeProvider('openai', { apiKey: 'sk-xxx' })
+initializeProvider('anthropic', { apiKey: 'sk-ant-xxx' })
+
+// 2. 创建并注册Hub Provider
+const hubProvider = createHubProvider({ hubId: 'aihubmix' })
+providerRegistry.registerProvider('aihubmix', hubProvider)
+
+// 3. 直接使用
+const model1 = providerRegistry.languageModel('aihubmix:openai:gpt-4')
+const model2 = providerRegistry.languageModel('aihubmix:anthropic:claude-3.5-sonnet')
+`)
+}
+
+// 运行演示
+if (require.main === module) {
+  demonstrateHubProvider()
+  simplifiedUsageExample()
+}
+
+export { demonstrateHubProvider, simplifiedUsageExample }

packages/aiCore/examples/image-generation.ts

@@ -0,0 +1,167 @@
+/**
+ * Image Generation Example
+ * 演示如何使用 aiCore 的文生图功能
+ */
+
+import { createExecutor, generateImage } from '../src/index'
+
+async function main() {
+  // 方式1: 使用执行器实例
+  console.log('📸 创建 OpenAI 图像生成执行器...')
+  const executor = createExecutor('openai', {
+    apiKey: process.env.OPENAI_API_KEY!
+  })
+
+  try {
+    console.log('🎨 使用执行器生成图像...')
+    const result1 = await executor.generateImage('dall-e-3', {
+      prompt: 'A futuristic cityscape at sunset with flying cars',
+      size: '1024x1024',
+      n: 1
+    })
+
+    console.log('✅ 图像生成成功!')
+    console.log('📊 结果:', {
+      imagesCount: result1.images.length,
+      mediaType: result1.image.mediaType,
+      hasBase64: !!result1.image.base64,
+      providerMetadata: result1.providerMetadata
+    })
+  } catch (error) {
+    console.error('❌ 执行器生成失败:', error)
+  }
+
+  // 方式2: 使用直接调用 API
+  try {
+    console.log('🎨 使用直接 API 生成图像...')
+    const result2 = await generateImage('openai', { apiKey: process.env.OPENAI_API_KEY! }, 'dall-e-3', {
+      prompt: 'A magical forest with glowing mushrooms and fairy lights',
+      aspectRatio: '16:9',
+      providerOptions: {
+        openai: {
+          quality: 'hd',
+          style: 'vivid'
+        }
+      }
+    })
+
+    console.log('✅ 直接 API 生成成功!')
+    console.log('📊 结果:', {
+      imagesCount: result2.images.length,
+      mediaType: result2.image.mediaType,
+      hasBase64: !!result2.image.base64
+    })
+  } catch (error) {
+    console.error('❌ 直接 API 生成失败:', error)
+  }
+
+  // 方式3: 支持其他提供商 (Google Imagen)
+  if (process.env.GOOGLE_API_KEY) {
+    try {
+      console.log('🎨 使用 Google Imagen 生成图像...')
+      const googleExecutor = createExecutor('google', {
+        apiKey: process.env.GOOGLE_API_KEY!
+      })
+
+      const result3 = await googleExecutor.generateImage('imagen-3.0-generate-002', {
+        prompt: 'A serene mountain lake at dawn with mist rising from the water',
+        aspectRatio: '1:1'
+      })
+
+      console.log('✅ Google Imagen 生成成功!')
+      console.log('📊 结果:', {
+        imagesCount: result3.images.length,
+        mediaType: result3.image.mediaType,
+        hasBase64: !!result3.image.base64
+      })
+    } catch (error) {
+      console.error('❌ Google Imagen 生成失败:', error)
+    }
+  }
+
+  // 方式4: 支持插件系统
+  const pluginExample = async () => {
+    console.log('🔌 演示插件系统...')
+
+    // 创建一个示例插件，用于修改提示词
+    const promptEnhancerPlugin = {
+      name: 'prompt-enhancer',
+      transformParams: async (params: any) => {
+        console.log('🔧 插件: 增强提示词...')
+        return {
+          ...params,
+          prompt: `${params.prompt}, highly detailed, cinematic lighting, 4K resolution`
+        }
+      },
+      transformResult: async (result: any) => {
+        console.log('🔧 插件: 处理结果...')
+        return {
+          ...result,
+          enhanced: true
+        }
+      }
+    }
+
+    const executorWithPlugin = createExecutor(
+      'openai',
+      {
+        apiKey: process.env.OPENAI_API_KEY!
+      },
+      [promptEnhancerPlugin]
+    )
+
+    try {
+      const result4 = await executorWithPlugin.generateImage('dall-e-3', {
+        prompt: 'A cute robot playing in a garden'
+      })
+
+      console.log('✅ 插件系统生成成功!')
+      console.log('📊 结果:', {
+        imagesCount: result4.images.length,
+        enhanced: (result4 as any).enhanced,
+        mediaType: result4.image.mediaType
+      })
+    } catch (error) {
+      console.error('❌ 插件系统生成失败:', error)
+    }
+  }
+
+  await pluginExample()
+}
+
+// 错误处理演示
+async function errorHandlingExample() {
+  console.log('⚠️  演示错误处理...')
+
+  try {
+    const executor = createExecutor('openai', {
+      apiKey: 'invalid-key'
+    })
+
+    await executor.generateImage('dall-e-3', {
+      prompt: 'Test image'
+    })
+  } catch (error: any) {
+    console.log('✅ 成功捕获错误:', error.constructor.name)
+    console.log('📋 错误信息:', error.message)
+    console.log('🏷️  提供商ID:', error.providerId)
+    console.log('🏷️  模型ID:', error.modelId)
+  }
+}
+
+// 运行示例
+if (require.main === module) {
+  main()
+    .then(() => {
+      console.log('🎉 所有示例完成!')
+      return errorHandlingExample()
+    })
+    .then(() => {
+      console.log('🎯 示例程序结束')
+      process.exit(0)
+    })
+    .catch((error) => {
+      console.error('💥 程序执行出错:', error)
+      process.exit(1)
+    })
+}

packages/aiCore/package.json

@@ -0,0 +1,85 @@
+{
+  "name": "@cherrystudio/ai-core",
+  "version": "1.0.0-alpha.11",
+  "description": "Cherry Studio AI Core - Unified AI Provider Interface Based on Vercel AI SDK",
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "types": "dist/index.d.ts",
+  "react-native": "dist/index.js",
+  "scripts": {
+    "build": "tsdown",
+    "dev": "tsc -w",
+    "clean": "rm -rf dist",
+    "test": "vitest run",
+    "test:watch": "vitest"
+  },
+  "keywords": [
+    "ai",
+    "sdk",
+    "openai",
+    "anthropic",
+    "google",
+    "cherry-studio",
+    "vercel-ai-sdk"
+  ],
+  "author": "Cherry Studio",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/CherryHQ/cherry-studio.git"
+  },
+  "bugs": {
+    "url": "https://github.com/CherryHQ/cherry-studio/issues"
+  },
+  "homepage": "https://github.com/CherryHQ/cherry-studio#readme",
+  "peerDependencies": {
+    "ai": "^5.0.26"
+  },
+  "dependencies": {
+    "@ai-sdk/anthropic": "^2.0.5",
+    "@ai-sdk/azure": "^2.0.16",
+    "@ai-sdk/deepseek": "^1.0.9",
+    "@ai-sdk/google": "^2.0.7",
+    "@ai-sdk/openai": "^2.0.19",
+    "@ai-sdk/openai-compatible": "^1.0.9",
+    "@ai-sdk/provider": "^2.0.0",
+    "@ai-sdk/provider-utils": "^3.0.4",
+    "@ai-sdk/xai": "^2.0.9",
+    "zod": "^3.25.0"
+  },
+  "devDependencies": {
+    "tsdown": "^0.12.9",
+    "typescript": "^5.0.0",
+    "vitest": "^3.2.4"
+  },
+  "sideEffects": false,
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "files": [
+    "dist"
+  ],
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "react-native": "./dist/index.js",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.js",
+      "default": "./dist/index.js"
+    },
+    "./built-in/plugins": {
+      "types": "./dist/built-in/plugins/index.d.ts",
+      "react-native": "./dist/built-in/plugins/index.js",
+      "import": "./dist/built-in/plugins/index.mjs",
+      "require": "./dist/built-in/plugins/index.js",
+      "default": "./dist/built-in/plugins/index.js"
+    },
+    "./provider": {
+      "types": "./dist/provider/index.d.ts",
+      "react-native": "./dist/provider/index.js",
+      "import": "./dist/provider/index.mjs",
+      "require": "./dist/provider/index.js",
+      "default": "./dist/provider/index.js"
+    }
+  }
+}

packages/aiCore/setupVitest.ts

@@ -0,0 +1,2 @@
+// 模拟 Vite SSR helper，避免 Node 环境找不到时报错
+;(globalThis as any).__vite_ssr_exportName__ = (name: string, value: any) => value

packages/aiCore/src/core/README.MD

@@ -0,0 +1,3 @@
+# @cherryStudio-aiCore
+
+Core

packages/aiCore/src/core/index.ts

@@ -0,0 +1,17 @@
+/**
+ * Core 模块导出
+ * 内部核心功能，供其他模块使用，不直接面向最终调用者
+ */
+
+// 中间件系统
+export type { NamedMiddleware } from './middleware'
+export { createMiddlewares, wrapModelWithMiddlewares } from './middleware'
+
+// 创建管理
+export { globalModelResolver, ModelResolver } from './models'
+export type { ModelConfig as ModelConfigType } from './models/types'
+
+// 执行管理
+export type { ToolUseRequestContext } from './plugins/built-in/toolUsePlugin/type'
+export { createExecutor, createOpenAICompatibleExecutor } from './runtime'
+export type { RuntimeConfig } from './runtime/types'

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

@@ -0,0 +1,8 @@
+/**
+ * Middleware 模块导出
+ * 提供通用的中间件管理能力
+ */
+
+export { createMiddlewares } from './manager'
+export type { NamedMiddleware } from './types'
+export { wrapModelWithMiddlewares } from './wrapper'

packages/aiCore/src/core/middleware/manager.ts

@@ -0,0 +1,16 @@
+/**
+ * 中间件管理器
+ * 专注于 AI SDK 中间件的管理，与插件系统分离
+ */
+import { LanguageModelV2Middleware } from '@ai-sdk/provider'
+
+/**
+ * 创建中间件列表
+ * 合并用户提供的中间件
+ */
+export function createMiddlewares(userMiddlewares: LanguageModelV2Middleware[] = []): LanguageModelV2Middleware[] {
+  // 未来可以在这里添加默认的中间件
+  const defaultMiddlewares: LanguageModelV2Middleware[] = []
+
+  return [...defaultMiddlewares, ...userMiddlewares]
+}

packages/aiCore/src/core/middleware/types.ts

@@ -0,0 +1,12 @@
+/**
+ * 中间件系统类型定义
+ */
+import { LanguageModelV2Middleware } from '@ai-sdk/provider'
+
+/**
+ * 具名中间件接口
+ */
+export interface NamedMiddleware {
+  name: string
+  middleware: LanguageModelV2Middleware
+}

packages/aiCore/src/core/middleware/wrapper.ts

@@ -0,0 +1,23 @@
+/**
+ * 模型包装工具函数
+ * 用于将中间件应用到LanguageModel上
+ */
+import { LanguageModelV2, LanguageModelV2Middleware } from '@ai-sdk/provider'
+import { wrapLanguageModel } from 'ai'
+
+/**
+ * 使用中间件包装模型
+ */
+export function wrapModelWithMiddlewares(
+  model: LanguageModelV2,
+  middlewares: LanguageModelV2Middleware[]
+): LanguageModelV2 {
+  if (middlewares.length === 0) {
+    return model
+  }
+
+  return wrapLanguageModel({
+    model,
+    middleware: middlewares
+  })
+}

packages/aiCore/src/core/models/ModelResolver.ts

@@ -0,0 +1,125 @@
+/**
+ * 模型解析器 - models模块的核心
+ * 负责将modelId解析为AI SDK的LanguageModel实例
+ * 支持传统格式和命名空间格式
+ * 集成了来自 ModelCreator 的特殊处理逻辑
+ */
+
+import { EmbeddingModelV2, ImageModelV2, LanguageModelV2, LanguageModelV2Middleware } from '@ai-sdk/provider'
+
+import { wrapModelWithMiddlewares } from '../middleware/wrapper'
+import { DEFAULT_SEPARATOR, globalRegistryManagement } from '../providers/RegistryManagement'
+
+export class ModelResolver {
+  /**
+   * 核心方法：解析任意格式的modelId为语言模型
+   *
+   * @param modelId 模型ID，支持 'gpt-4' 和 'anthropic>claude-3' 两种格式
+   * @param fallbackProviderId 当modelId为传统格式时使用的providerId
+   * @param providerOptions provider配置选项（用于OpenAI模式选择等）
+   * @param middlewares 中间件数组，会应用到最终模型上
+   */
+  async resolveLanguageModel(
+    modelId: string,
+    fallbackProviderId: string,
+    providerOptions?: any,
+    middlewares?: LanguageModelV2Middleware[]
+  ): Promise<LanguageModelV2> {
+    let finalProviderId = fallbackProviderId
+    let model: LanguageModelV2
+    // 🎯 处理 OpenAI 模式选择逻辑 (从 ModelCreator 迁移)
+    if ((fallbackProviderId === 'openai' || fallbackProviderId === 'azure') && providerOptions?.mode === 'chat') {
+      finalProviderId = `${fallbackProviderId}-chat`
+    }
+
+    // 检查是否是命名空间格式
+    if (modelId.includes(DEFAULT_SEPARATOR)) {
+      model = this.resolveNamespacedModel(modelId)
+    } else {
+      // 传统格式：使用处理后的 providerId + modelId
+      model = this.resolveTraditionalModel(finalProviderId, modelId)
+    }
+
+    // 🎯 应用中间件（如果有）
+    if (middlewares && middlewares.length > 0) {
+      model = wrapModelWithMiddlewares(model, middlewares)
+    }
+
+    return model
+  }
+
+  /**
+   * 解析文本嵌入模型
+   */
+  async resolveTextEmbeddingModel(modelId: string, fallbackProviderId: string): Promise<EmbeddingModelV2<string>> {
+    if (modelId.includes(DEFAULT_SEPARATOR)) {
+      return this.resolveNamespacedEmbeddingModel(modelId)
+    }
+
+    return this.resolveTraditionalEmbeddingModel(fallbackProviderId, modelId)
+  }
+
+  /**
+   * 解析图像模型
+   */
+  async resolveImageModel(modelId: string, fallbackProviderId: string): Promise<ImageModelV2> {
+    if (modelId.includes(DEFAULT_SEPARATOR)) {
+      return this.resolveNamespacedImageModel(modelId)
+    }
+
+    return this.resolveTraditionalImageModel(fallbackProviderId, modelId)
+  }
+
+  /**
+   * 解析命名空间格式的语言模型
+   * aihubmix:anthropic:claude-3 -> globalRegistryManagement.languageModel('aihubmix:anthropic:claude-3')
+   */
+  private resolveNamespacedModel(modelId: string): LanguageModelV2 {
+    return globalRegistryManagement.languageModel(modelId as any)
+  }
+
+  /**
+   * 解析传统格式的语言模型
+   * providerId: 'openai', modelId: 'gpt-4' -> globalRegistryManagement.languageModel('openai:gpt-4')
+   */
+  private resolveTraditionalModel(providerId: string, modelId: string): LanguageModelV2 {
+    const fullModelId = `${providerId}${DEFAULT_SEPARATOR}${modelId}`
+    console.log('fullModelId', fullModelId)
+    return globalRegistryManagement.languageModel(fullModelId as any)
+  }
+
+  /**
+   * 解析命名空间格式的嵌入模型
+   */
+  private resolveNamespacedEmbeddingModel(modelId: string): EmbeddingModelV2<string> {
+    return globalRegistryManagement.textEmbeddingModel(modelId as any)
+  }
+
+  /**
+   * 解析传统格式的嵌入模型
+   */
+  private resolveTraditionalEmbeddingModel(providerId: string, modelId: string): EmbeddingModelV2<string> {
+    const fullModelId = `${providerId}${DEFAULT_SEPARATOR}${modelId}`
+    return globalRegistryManagement.textEmbeddingModel(fullModelId as any)
+  }
+
+  /**
+   * 解析命名空间格式的图像模型
+   */
+  private resolveNamespacedImageModel(modelId: string): ImageModelV2 {
+    return globalRegistryManagement.imageModel(modelId as any)
+  }
+
+  /**
+   * 解析传统格式的图像模型
+   */
+  private resolveTraditionalImageModel(providerId: string, modelId: string): ImageModelV2 {
+    const fullModelId = `${providerId}${DEFAULT_SEPARATOR}${modelId}`
+    return globalRegistryManagement.imageModel(fullModelId as any)
+  }
+}
+
+/**
+ * 全局模型解析器实例
+ */
+export const globalModelResolver = new ModelResolver()

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

@@ -0,0 +1,9 @@
+/**
+ * Models 模块统一导出 - 简化版
+ */
+
+// 核心模型解析器
+export { globalModelResolver, ModelResolver } from './ModelResolver'
+
+// 保留的类型定义（可能被其他地方使用）
+export type { ModelConfig as ModelConfigType } from './types'

packages/aiCore/src/core/models/types.ts

@@ -0,0 +1,15 @@
+/**
+ * Creation 模块类型定义
+ */
+import { LanguageModelV2Middleware } from '@ai-sdk/provider'
+
+import type { ProviderId, ProviderSettingsMap } from '../providers/types'
+
+export interface ModelConfig<T extends ProviderId = ProviderId> {
+  providerId: T
+  modelId: string
+  providerSettings: ProviderSettingsMap[T] & { mode?: 'chat' | 'responses' }
+  middlewares?: LanguageModelV2Middleware[]
+  // 额外模型参数
+  extraModelConfig?: Record<string, any>
+}

packages/aiCore/src/core/options/examples.ts

@@ -0,0 +1,87 @@
+import { streamText } from 'ai'
+
+import {
+  createAnthropicOptions,
+  createGenericProviderOptions,
+  createGoogleOptions,
+  createOpenAIOptions,
+  mergeProviderOptions
+} from './factory'
+
+// 示例1: 使用已知供应商的严格类型约束
+export function exampleOpenAIWithOptions() {
+  const openaiOptions = createOpenAIOptions({
+    reasoningEffort: 'medium'
+  })
+
+  // 这里会有类型检查，确保选项符合OpenAI的设置
+  return streamText({
+    model: {} as any, // 实际使用时替换为真实模型
+    prompt: 'Hello',
+    providerOptions: openaiOptions
+  })
+}
+
+// 示例2: 使用Anthropic供应商选项
+export function exampleAnthropicWithOptions() {
+  const anthropicOptions = createAnthropicOptions({
+    thinking: {
+      type: 'enabled',
+      budgetTokens: 1000
+    }
+  })
+
+  return streamText({
+    model: {} as any,
+    prompt: 'Hello',
+    providerOptions: anthropicOptions
+  })
+}
+
+// 示例3: 使用Google供应商选项
+export function exampleGoogleWithOptions() {
+  const googleOptions = createGoogleOptions({
+    thinkingConfig: {
+      includeThoughts: true,
+      thinkingBudget: 1000
+    }
+  })
+
+  return streamText({
+    model: {} as any,
+    prompt: 'Hello',
+    providerOptions: googleOptions
+  })
+}
+
+// 示例4: 使用未知供应商（通用类型）
+export function exampleUnknownProviderWithOptions() {
+  const customProviderOptions = createGenericProviderOptions('custom-provider', {
+    temperature: 0.7,
+    customSetting: 'value',
+    anotherOption: true
+  })
+
+  return streamText({
+    model: {} as any,
+    prompt: 'Hello',
+    providerOptions: customProviderOptions
+  })
+}
+
+// 示例5: 合并多个供应商选项
+export function exampleMergedOptions() {
+  const openaiOptions = createOpenAIOptions({})
+
+  const customOptions = createGenericProviderOptions('custom', {
+    customParam: 'value'
+  })
+
+  const mergedOptions = mergeProviderOptions(openaiOptions, customOptions)
+
+  return streamText({
+    model: {} as any,
+    prompt: 'Hello',
+    providerOptions: mergedOptions
+  })
+}

packages/aiCore/src/core/options/factory.ts

@@ -0,0 +1,71 @@
+import { ExtractProviderOptions, ProviderOptionsMap, TypedProviderOptions } from './types'
+
+/**
+ * 创建特定供应商的选项
+ * @param provider 供应商名称
+ * @param options 供应商特定的选项
+ * @returns 格式化的provider options
+ */
+export function createProviderOptions<T extends keyof ProviderOptionsMap>(
+  provider: T,
+  options: ExtractProviderOptions<T>
+): Record<T, ExtractProviderOptions<T>> {
+  return { [provider]: options } as Record<T, ExtractProviderOptions<T>>
+}
+
+/**
+ * 创建任意供应商的选项（包括未知供应商）
+ * @param provider 供应商名称
+ * @param options 供应商选项
+ * @returns 格式化的provider options
+ */
+export function createGenericProviderOptions<T extends string>(
+  provider: T,
+  options: Record<string, any>
+): Record<T, Record<string, any>> {
+  return { [provider]: options } as Record<T, Record<string, any>>
+}
+
+/**
+ * 合并多个供应商的options
+ * @param optionsMap 包含多个供应商选项的对象
+ * @returns 合并后的TypedProviderOptions
+ */
+export function mergeProviderOptions(...optionsMap: Partial<TypedProviderOptions>[]): TypedProviderOptions {
+  return Object.assign({}, ...optionsMap)
+}
+
+/**
+ * 创建OpenAI供应商选项的便捷函数
+ */
+export function createOpenAIOptions(options: ExtractProviderOptions<'openai'>) {
+  return createProviderOptions('openai', options)
+}
+
+/**
+ * 创建Anthropic供应商选项的便捷函数
+ */
+export function createAnthropicOptions(options: ExtractProviderOptions<'anthropic'>) {
+  return createProviderOptions('anthropic', options)
+}
+
+/**
+ * 创建Google供应商选项的便捷函数
+ */
+export function createGoogleOptions(options: ExtractProviderOptions<'google'>) {
+  return createProviderOptions('google', options)
+}
+
+/**
+ * 创建OpenRouter供应商选项的便捷函数
+ */
+export function createOpenRouterOptions(options: ExtractProviderOptions<'openrouter'>) {
+  return createProviderOptions('openrouter', options)
+}
+
+/**
+ * 创建XAI供应商选项的便捷函数
+ */
+export function createXaiOptions(options: ExtractProviderOptions<'xai'>) {
+  return createProviderOptions('xai', options)
+}

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

@@ -0,0 +1,2 @@
+export * from './factory'
+export * from './types'

packages/aiCore/src/core/options/openrouter.ts

@@ -0,0 +1,38 @@
+export type OpenRouterProviderOptions = {
+  models?: string[]
+
+  /**
+   * https://openrouter.ai/docs/use-cases/reasoning-tokens
+   * One of `max_tokens` or `effort` is required.
+   * If `exclude` is true, reasoning will be removed from the response. Default is false.
+   */
+  reasoning?: {
+    exclude?: boolean
+  } & (
+    | {
+        max_tokens: number
+      }
+    | {
+        effort: 'high' | 'medium' | 'low'
+      }
+  )
+
+  /**
+   * A unique identifier representing your end-user, which can
+   * help OpenRouter to monitor and detect abuse.
+   */
+  user?: string
+
+  extraBody?: Record<string, unknown>
+
+  /**
+   * Enable usage accounting to get detailed token usage information.
+   * https://openrouter.ai/docs/use-cases/usage-accounting
+   */
+  usage?: {
+    /**
+     * When true, includes token usage information in the response.
+     */
+    include: boolean
+  }
+}

packages/aiCore/src/core/options/types.ts

@@ -0,0 +1,33 @@
+import { type AnthropicProviderOptions } from '@ai-sdk/anthropic'
+import { type GoogleGenerativeAIProviderOptions } from '@ai-sdk/google'
+import { type OpenAIResponsesProviderOptions } from '@ai-sdk/openai'
+import { type SharedV2ProviderMetadata } from '@ai-sdk/provider'
+
+import { type OpenRouterProviderOptions } from './openrouter'
+import { type XaiProviderOptions } from './xai'
+
+export type ProviderOptions<T extends keyof SharedV2ProviderMetadata> = SharedV2ProviderMetadata[T]
+
+/**
+ * 供应商选项类型，如果map中没有，说明没有约束
+ */
+export type ProviderOptionsMap = {
+  openai: OpenAIResponsesProviderOptions
+  anthropic: AnthropicProviderOptions
+  google: GoogleGenerativeAIProviderOptions
+  openrouter: OpenRouterProviderOptions
+  xai: XaiProviderOptions
+}
+
+// 工具类型，用于从ProviderOptionsMap中提取特定供应商的选项类型
+export type ExtractProviderOptions<T extends keyof ProviderOptionsMap> = ProviderOptionsMap[T]
+
+/**
+ * 类型安全的ProviderOptions
+ * 对于已知供应商使用严格类型，对于未知供应商允许任意Record<string, JSONValue>
+ */
+export type TypedProviderOptions = {
+  [K in keyof ProviderOptionsMap]?: ProviderOptionsMap[K]
+} & {
+  [K in string]?: Record<string, any>
+} & SharedV2ProviderMetadata

packages/aiCore/src/core/options/xai.ts

@@ -0,0 +1,86 @@
+// copy from @ai-sdk/xai/xai-chat-options.ts
+// 如果@ai-sdk/xai暴露出了xaiProviderOptions就删除这个文件
+
+import * as z from 'zod/v4'
+
+const webSourceSchema = z.object({
+  type: z.literal('web'),
+  country: z.string().length(2).optional(),
+  excludedWebsites: z.array(z.string()).max(5).optional(),
+  allowedWebsites: z.array(z.string()).max(5).optional(),
+  safeSearch: z.boolean().optional()
+})
+
+const xSourceSchema = z.object({
+  type: z.literal('x'),
+  xHandles: z.array(z.string()).optional()
+})
+
+const newsSourceSchema = z.object({
+  type: z.literal('news'),
+  country: z.string().length(2).optional(),
+  excludedWebsites: z.array(z.string()).max(5).optional(),
+  safeSearch: z.boolean().optional()
+})
+
+const rssSourceSchema = z.object({
+  type: z.literal('rss'),
+  links: z.array(z.url()).max(1) // currently only supports one RSS link
+})
+
+const searchSourceSchema = z.discriminatedUnion('type', [
+  webSourceSchema,
+  xSourceSchema,
+  newsSourceSchema,
+  rssSourceSchema
+])
+
+export const xaiProviderOptions = z.object({
+  /**
+   * reasoning effort for reasoning models
+   * only supported by grok-3-mini and grok-3-mini-fast models
+   */
+  reasoningEffort: z.enum(['low', 'high']).optional(),
+
+  searchParameters: z
+    .object({
+      /**
+       * search mode preference
+       * - "off": disables search completely
+       * - "auto": model decides whether to search (default)
+       * - "on": always enables search
+       */
+      mode: z.enum(['off', 'auto', 'on']),
+
+      /**
+       * whether to return citations in the response
+       * defaults to true
+       */
+      returnCitations: z.boolean().optional(),
+
+      /**
+       * start date for search data (ISO8601 format: YYYY-MM-DD)
+       */
+      fromDate: z.string().optional(),
+
+      /**
+       * end date for search data (ISO8601 format: YYYY-MM-DD)
+       */
+      toDate: z.string().optional(),
+
+      /**
+       * maximum number of search results to consider
+       * defaults to 20
+       */
+      maxSearchResults: z.number().min(1).max(50).optional(),
+
+      /**
+       * data sources to search from
+       * defaults to ["web", "x"] if not specified
+       */
+      sources: z.array(searchSourceSchema).optional()
+    })
+    .optional()
+})
+
+export type XaiProviderOptions = z.infer<typeof xaiProviderOptions>

packages/aiCore/src/core/plugins/README.md

@@ -0,0 +1,257 @@
+# AI Core 插件系统
+
+支持四种钩子类型：**First**、**Sequential**、**Parallel** 和 **Stream**。
+
+## 🎯 设计理念
+
+- **语义清晰**：不同钩子有不同的执行语义
+- **类型安全**：TypeScript 完整支持
+- **性能优化**：First 短路、Parallel 并发、Sequential 链式
+- **易于扩展**：`enforce` 排序 + 功能分类
+
+## 📋 钩子类型
+
+### 🥇 First 钩子 - 首个有效结果
+
+```typescript
+// 只执行第一个返回值的插件，用于解析和查找
+resolveModel?: (modelId: string, context: AiRequestContext) => string | null
+loadTemplate?: (templateName: string, context: AiRequestContext) => any | null
+```
+
+### 🔄 Sequential 钩子 - 链式数据转换
+
+```typescript
+// 按顺序链式执行，每个插件可以修改数据
+transformParams?: (params: any, context: AiRequestContext) => any
+transformResult?: (result: any, context: AiRequestContext) => any
+```
+
+### ⚡ Parallel 钩子 - 并行副作用
+
+```typescript
+// 并发执行，用于日志、监控等副作用
+onRequestStart?: (context: AiRequestContext) => void
+onRequestEnd?: (context: AiRequestContext, result: any) => void
+onError?: (error: Error, context: AiRequestContext) => void
+```
+
+### 🌊 Stream 钩子 - 流处理
+
+```typescript
+// 直接使用 AI SDK 的 TransformStream
+transformStream?: () => (options) => TransformStream<TextStreamPart, TextStreamPart>
+```
+
+## 🚀 快速开始
+
+### 基础用法
+
+```typescript
+import { PluginManager, createContext, definePlugin } from '@cherrystudio/ai-core/middleware'
+
+// 创建插件管理器
+const pluginManager = new PluginManager()
+
+// 添加插件
+pluginManager.use({
+  name: 'my-plugin',
+  async transformParams(params, context) {
+    return { ...params, temperature: 0.7 }
+  }
+})
+
+// 使用插件
+const context = createContext('openai', 'gpt-4', { messages: [] })
+const transformedParams = await pluginManager.executeSequential(
+  'transformParams',
+  { messages: [{ role: 'user', content: 'Hello' }] },
+  context
+)
+```
+
+### 完整示例
+
+```typescript
+import {
+  PluginManager,
+  ModelAliasPlugin,
+  LoggingPlugin,
+  ParamsValidationPlugin,
+  createContext
+} from '@cherrystudio/ai-core/middleware'
+
+// 创建插件管理器
+const manager = new PluginManager([
+  ModelAliasPlugin, // 模型别名解析
+  ParamsValidationPlugin, // 参数验证
+  LoggingPlugin // 日志记录
+])
+
+// AI 请求流程
+async function aiRequest(providerId: string, modelId: string, params: any) {
+  const context = createContext(providerId, modelId, params)
+
+  try {
+    // 1. 【并行】触发请求开始事件
+    await manager.executeParallel('onRequestStart', context)
+
+    // 2. 【首个】解析模型别名
+    const resolvedModel = await manager.executeFirst('resolveModel', modelId, context)
+    context.modelId = resolvedModel || modelId
+
+    // 3. 【串行】转换请求参数
+    const transformedParams = await manager.executeSequential('transformParams', params, context)
+
+    // 4. 【流处理】收集流转换器（AI SDK 原生支持数组）
+    const streamTransforms = manager.collectStreamTransforms()
+
+    // 5. 调用 AI SDK（这里省略具体实现）
+    const result = await callAiSdk(transformedParams, streamTransforms)
+
+    // 6. 【串行】转换响应结果
+    const transformedResult = await manager.executeSequential('transformResult', result, context)
+
+    // 7. 【并行】触发请求完成事件
+    await manager.executeParallel('onRequestEnd', context, transformedResult)
+
+    return transformedResult
+  } catch (error) {
+    // 8. 【并行】触发错误事件
+    await manager.executeParallel('onError', context, undefined, error)
+    throw error
+  }
+}
+```
+
+## 🔧 自定义插件
+
+### 模型别名插件
+
+```typescript
+const ModelAliasPlugin = definePlugin({
+  name: 'model-alias',
+  enforce: 'pre', // 最先执行
+
+  async resolveModel(modelId) {
+    const aliases = {
+      gpt4: 'gpt-4-turbo-preview',
+      claude: 'claude-3-sonnet-20240229'
+    }
+    return aliases[modelId] || null
+  }
+})
+```
+
+### 参数验证插件
+
+```typescript
+const ValidationPlugin = definePlugin({
+  name: 'validation',
+
+  async transformParams(params) {
+    if (!params.messages) {
+      throw new Error('messages is required')
+    }
+
+    return {
+      ...params,
+      temperature: params.temperature ?? 0.7,
+      max_tokens: params.max_tokens ?? 4096
+    }
+  }
+})
+```
+
+### 监控插件
+
+```typescript
+const MonitoringPlugin = definePlugin({
+  name: 'monitoring',
+  enforce: 'post', // 最后执行
+
+  async onRequestEnd(context, result) {
+    const duration = Date.now() - context.startTime
+    console.log(`请求耗时: ${duration}ms`)
+  }
+})
+```
+
+### 内容过滤插件
+
+```typescript
+const FilterPlugin = definePlugin({
+  name: 'content-filter',
+
+  transformStream() {
+    return () =>
+      new TransformStream({
+        transform(chunk, controller) {
+          if (chunk.type === 'text-delta') {
+            const filtered = chunk.textDelta.replace(/敏感词/g, '***')
+            controller.enqueue({ ...chunk, textDelta: filtered })
+          } else {
+            controller.enqueue(chunk)
+          }
+        }
+      })
+  }
+})
+```
+
+## 📊 执行顺序
+
+### 插件排序
+
+```
+enforce: 'pre' → normal → enforce: 'post'
+```
+
+### 钩子执行流程
+
+```mermaid
+graph TD
+    A[请求开始] --> B[onRequestStart 并行执行]
+    B --> C[resolveModel 首个有效]
+    C --> D[loadTemplate 首个有效]
+    D --> E[transformParams 串行执行]
+    E --> F[collectStreamTransforms]
+    F --> G[AI SDK 调用]
+    G --> H[transformResult 串行执行]
+    H --> I[onRequestEnd 并行执行]
+
+    G --> J[异常处理]
+    J --> K[onError 并行执行]
+```
+
+## 💡 最佳实践
+
+1. **功能单一**：每个插件专注一个功能
+2. **幂等性**：插件应该是幂等的，重复执行不会产生副作用
+3. **错误处理**：插件内部处理异常，不要让异常向上传播
+4. **性能优化**：使用合适的钩子类型（First vs Sequential vs Parallel）
+5. **命名规范**：使用语义化的插件名称
+
+## 🔍 调试工具
+
+```typescript
+// 查看插件统计信息
+const stats = manager.getStats()
+console.log('插件统计:', stats)
+
+// 查看所有插件
+const plugins = manager.getPlugins()
+console.log(
+  '已注册插件:',
+  plugins.map((p) => p.name)
+)
+```
+
+## ⚡ 性能优势
+
+- **First 钩子**：一旦找到结果立即停止，避免无效计算
+- **Parallel 钩子**：真正并发执行，不阻塞主流程
+- **Sequential 钩子**：保证数据转换的顺序性
+- **Stream 钩子**：直接集成 AI SDK，零开销
+
+这个设计兼顾了简洁性和强大功能，为 AI Core 提供了灵活而高效的扩展机制。

packages/aiCore/src/core/plugins/built-in/index.ts

@@ -0,0 +1,10 @@
+/**
+ * 内置插件命名空间
+ * 所有内置插件都以 'built-in:' 为前缀
+ */
+export const BUILT_IN_PLUGIN_PREFIX = 'built-in:'
+
+export { createLoggingPlugin } from './logging'
+export { createPromptToolUsePlugin } from './toolUsePlugin/promptToolUsePlugin'
+export type { PromptToolUseConfig, ToolUseRequestContext, ToolUseResult } from './toolUsePlugin/type'
+export { webSearchPlugin } from './webSearchPlugin'

packages/aiCore/src/core/plugins/built-in/logging.ts

@@ -0,0 +1,86 @@
+/**
+ * 内置插件：日志记录
+ * 记录AI调用的关键信息，支持性能监控和调试
+ */
+import { definePlugin } from '../index'
+import type { AiRequestContext } from '../types'
+
+export interface LoggingConfig {
+  // 日志级别
+  level?: 'debug' | 'info' | 'warn' | 'error'
+  // 是否记录参数
+  logParams?: boolean
+  // 是否记录结果
+  logResult?: boolean
+  // 是否记录性能数据
+  logPerformance?: boolean
+  // 自定义日志函数
+  logger?: (level: string, message: string, data?: any) => void
+}
+
+/**
+ * 创建日志插件
+ */
+export function createLoggingPlugin(config: LoggingConfig = {}) {
+  const { level = 'info', logParams = true, logResult = false, logPerformance = true, logger = console.log } = config
+
+  const startTimes = new Map<string, number>()
+
+  return definePlugin({
+    name: 'built-in:logging',
+
+    onRequestStart: (context: AiRequestContext) => {
+      const requestId = context.requestId
+      startTimes.set(requestId, Date.now())
+
+      logger(level, `🚀 AI Request Started`, {
+        requestId,
+        providerId: context.providerId,
+        modelId: context.modelId,
+        originalParams: logParams ? context.originalParams : '[hidden]'
+      })
+    },
+
+    onRequestEnd: (context: AiRequestContext, result: any) => {
+      const requestId = context.requestId
+      const startTime = startTimes.get(requestId)
+      const duration = startTime ? Date.now() - startTime : undefined
+      startTimes.delete(requestId)
+
+      const logData: any = {
+        requestId,
+        providerId: context.providerId,
+        modelId: context.modelId
+      }
+
+      if (logPerformance && duration) {
+        logData.duration = `${duration}ms`
+      }
+
+      if (logResult) {
+        logData.result = result
+      }
+
+      logger(level, `✅ AI Request Completed`, logData)
+    },
+
+    onError: (error: Error, context: AiRequestContext) => {
+      const requestId = context.requestId
+      const startTime = startTimes.get(requestId)
+      const duration = startTime ? Date.now() - startTime : undefined
+      startTimes.delete(requestId)
+
+      logger('error', `❌ AI Request Failed`, {
+        requestId,
+        providerId: context.providerId,
+        modelId: context.modelId,
+        duration: duration ? `${duration}ms` : undefined,
+        error: {
+          name: error.name,
+          message: error.message,
+          stack: error.stack
+        }
+      })
+    }
+  })
+}

packages/aiCore/src/core/plugins/built-in/toolUsePlugin/StreamEventManager.ts

@@ -0,0 +1,139 @@
+/**
+ * 流事件管理器
+ *
+ * 负责处理 AI SDK 流事件的发送和管理
+ * 从 promptToolUsePlugin.ts 中提取出来以降低复杂度
+ */
+import type { ModelMessage } from 'ai'
+
+import type { AiRequestContext } from '../../types'
+import type { StreamController } from './ToolExecutor'
+
+/**
+ * 流事件管理器类
+ */
+export class StreamEventManager {
+  /**
+   * 发送工具调用步骤开始事件
+   */
+  sendStepStartEvent(controller: StreamController): void {
+    controller.enqueue({
+      type: 'start-step',
+      request: {},
+      warnings: []
+    })
+  }
+
+  /**
+   * 发送步骤完成事件
+   */
+  sendStepFinishEvent(controller: StreamController, chunk: any): void {
+    controller.enqueue({
+      type: 'finish-step',
+      finishReason: 'stop',
+      response: chunk.response,
+      usage: chunk.usage,
+      providerMetadata: chunk.providerMetadata
+    })
+  }
+
+  /**
+   * 处理递归调用并将结果流接入当前流
+   */
+  async handleRecursiveCall(
+    controller: StreamController,
+    recursiveParams: any,
+    context: AiRequestContext,
+    stepId: string
+  ): Promise<void> {
+    try {
+      console.log('[MCP Prompt] Starting recursive call after tool execution...')
+
+      const recursiveResult = await context.recursiveCall(recursiveParams)
+
+      if (recursiveResult && recursiveResult.fullStream) {
+        await this.pipeRecursiveStream(controller, recursiveResult.fullStream)
+      } else {
+        console.warn('[MCP Prompt] No fullstream found in recursive result:', recursiveResult)
+      }
+    } catch (error) {
+      this.handleRecursiveCallError(controller, error, stepId)
+    }
+  }
+
+  /**
+   * 将递归流的数据传递到当前流
+   */
+  private async pipeRecursiveStream(controller: StreamController, recursiveStream: ReadableStream): Promise<void> {
+    const reader = recursiveStream.getReader()
+    try {
+      while (true) {
+        const { done, value } = await reader.read()
+        if (done) {
+          break
+        }
+        if (value.type === 'finish') {
+          // 迭代的流不发finish
+          break
+        }
+        // 将递归流的数据传递到当前流
+        controller.enqueue(value)
+      }
+    } finally {
+      reader.releaseLock()
+    }
+  }
+
+  /**
+   * 处理递归调用错误
+   */
+  private handleRecursiveCallError(controller: StreamController, error: unknown, stepId: string): void {
+    console.error('[MCP Prompt] Recursive call failed:', error)
+
+    // 使用 AI SDK 标准错误格式，但不中断流
+    controller.enqueue({
+      type: 'error',
+      error: {
+        message: error instanceof Error ? error.message : String(error),
+        name: error instanceof Error ? error.name : 'RecursiveCallError'
+      }
+    })
+
+    // 继续发送文本增量，保持流的连续性
+    controller.enqueue({
+      type: 'text-delta',
+      id: stepId,
+      text: '\n\n[工具执行后递归调用失败，继续对话...]'
+    })
+  }
+
+  /**
+   * 构建递归调用的参数
+   */
+  buildRecursiveParams(context: AiRequestContext, textBuffer: string, toolResultsText: string, tools: any): any {
+    // 构建新的对话消息
+    const newMessages: ModelMessage[] = [
+      ...(context.originalParams.messages || []),
+      {
+        role: 'assistant',
+        content: textBuffer
+      },
+      {
+        role: 'user',
+        content: toolResultsText
+      }
+    ]
+
+    // 递归调用，继续对话，重新传递 tools
+    const recursiveParams = {
+      ...context.originalParams,
+      messages: newMessages,
+      tools: tools
+    }
+
+    // 更新上下文中的消息
+    context.originalParams.messages = newMessages
+
+    return recursiveParams
+  }
+}

packages/aiCore/src/core/plugins/built-in/toolUsePlugin/ToolExecutor.ts

@@ -0,0 +1,156 @@
+/**
+ * 工具执行器
+ *
+ * 负责工具的执行、结果格式化和相关事件发送
+ * 从 promptToolUsePlugin.ts 中提取出来以降低复杂度
+ */
+import type { ToolSet } from 'ai'
+
+import type { ToolUseResult } from './type'
+
+/**
+ * 工具执行结果
+ */
+export interface ExecutedResult {
+  toolCallId: string
+  toolName: string
+  result: any
+  isError?: boolean
+}
+
+/**
+ * 流控制器类型（从 AI SDK 提取）
+ */
+export interface StreamController {
+  enqueue(chunk: any): void
+}
+
+/**
+ * 工具执行器类
+ */
+export class ToolExecutor {
+  /**
+   * 执行多个工具调用
+   */
+  async executeTools(
+    toolUses: ToolUseResult[],
+    tools: ToolSet,
+    controller: StreamController
+  ): Promise<ExecutedResult[]> {
+    const executedResults: ExecutedResult[] = []
+
+    for (const toolUse of toolUses) {
+      try {
+        const tool = tools[toolUse.toolName]
+        if (!tool || typeof tool.execute !== 'function') {
+          throw new Error(`Tool "${toolUse.toolName}" has no execute method`)
+        }
+
+        // 发送工具调用开始事件
+        this.sendToolStartEvents(controller, toolUse)
+
+        console.log(`[MCP Prompt Stream] Executing tool: ${toolUse.toolName}`, toolUse.arguments)
+
+        // 发送 tool-call 事件
+        controller.enqueue({
+          type: 'tool-call',
+          toolCallId: toolUse.id,
+          toolName: toolUse.toolName,
+          input: tool.inputSchema
+        })
+
+        const result = await tool.execute(toolUse.arguments, {
+          toolCallId: toolUse.id,
+          messages: [],
+          abortSignal: new AbortController().signal
+        })
+
+        // 发送 tool-result 事件
+        controller.enqueue({
+          type: 'tool-result',
+          toolCallId: toolUse.id,
+          toolName: toolUse.toolName,
+          input: toolUse.arguments,
+          output: result
+        })
+
+        executedResults.push({
+          toolCallId: toolUse.id,
+          toolName: toolUse.toolName,
+          result,
+          isError: false
+        })
+      } catch (error) {
+        console.error(`[MCP Prompt Stream] Tool execution failed: ${toolUse.toolName}`, error)
+
+        // 处理错误情况
+        const errorResult = this.handleToolError(toolUse, error, controller)
+        executedResults.push(errorResult)
+      }
+    }
+
+    return executedResults
+  }
+
+  /**
+   * 格式化工具结果为 Cherry Studio 标准格式
+   */
+  formatToolResults(executedResults: ExecutedResult[]): string {
+    return executedResults
+      .map((tr) => {
+        if (!tr.isError) {
+          return `<tool_use_result>\n  <name>${tr.toolName}</name>\n  <result>${JSON.stringify(tr.result)}</result>\n</tool_use_result>`
+        } else {
+          const error = tr.result || 'Unknown error'
+          return `<tool_use_result>\n  <name>${tr.toolName}</name>\n  <error>${error}</error>\n</tool_use_result>`
+        }
+      })
+      .join('\n\n')
+  }
+
+  /**
+   * 发送工具调用开始相关事件
+   */
+  private sendToolStartEvents(controller: StreamController, toolUse: ToolUseResult): void {
+    // 发送 tool-input-start 事件
+    controller.enqueue({
+      type: 'tool-input-start',
+      id: toolUse.id,
+      toolName: toolUse.toolName
+    })
+  }
+
+  /**
+   * 处理工具执行错误
+   */
+  private handleToolError(
+    toolUse: ToolUseResult,
+    error: unknown,
+    controller: StreamController
+    // _tools: ToolSet
+  ): ExecutedResult {
+    // 使用 AI SDK 标准错误格式
+    // const toolError: TypedToolError<typeof _tools> = {
+    //   type: 'tool-error',
+    //   toolCallId: toolUse.id,
+    //   toolName: toolUse.toolName,
+    //   input: toolUse.arguments,
+    //   error: error instanceof Error ? error.message : String(error)
+    // }
+
+    // controller.enqueue(toolError)
+
+    // 发送标准错误事件
+    controller.enqueue({
+      type: 'error',
+      error: error instanceof Error ? error.message : String(error)
+    })
+
+    return {
+      toolCallId: toolUse.id,
+      toolName: toolUse.toolName,
+      result: error instanceof Error ? error.message : String(error),
+      isError: true
+    }
+  }
+}

packages/aiCore/src/core/plugins/built-in/toolUsePlugin/promptToolUsePlugin.ts

@@ -0,0 +1,373 @@
+/**
+ * 内置插件：MCP Prompt 模式
+ * 为不支持原生 Function Call 的模型提供 prompt 方式的工具调用
+ * 内置默认逻辑，支持自定义覆盖
+ */
+import type { TextStreamPart, ToolSet } from 'ai'
+
+import { definePlugin } from '../../index'
+import type { AiRequestContext } from '../../types'
+import { StreamEventManager } from './StreamEventManager'
+import { ToolExecutor } from './ToolExecutor'
+import { PromptToolUseConfig, ToolUseResult } from './type'
+
+/**
+ * 默认系统提示符模板（提取自 Cherry Studio）
+ */
+const DEFAULT_SYSTEM_PROMPT = `In this environment you have access to a set of tools you can use to answer the user's question. \\
+You can use one tool per message, and will receive the result of that tool use in the user's response. You use tools step-by-step to accomplish a given task, with each tool use informed by the result of the previous tool use.
+
+## Tool Use Formatting
+
+Tool use is formatted using XML-style tags. The tool name is enclosed in opening and closing tags, and each parameter is similarly enclosed within its own set of tags. Here's the structure:
+
+<tool_use>
+  <name>{tool_name}</name>
+  <arguments>{json_arguments}</arguments>
+</tool_use>
+
+The tool name should be the exact name of the tool you are using, and the arguments should be a JSON object containing the parameters required by that tool. For example:
+<tool_use>
+  <name>python_interpreter</name>
+  <arguments>{"code": "5 + 3 + 1294.678"}</arguments>
+</tool_use>
+
+The user will respond with the result of the tool use, which should be formatted as follows:
+
+<tool_use_result>
+  <name>{tool_name}</name>
+  <result>{result}</result>
+</tool_use_result>
+
+The result should be a string, which can represent a file or any other output type. You can use this result as input for the next action.
+For example, if the result of the tool use is an image file, you can use it in the next action like this:
+
+<tool_use>
+  <name>image_transformer</name>
+  <arguments>{"image": "image_1.jpg"}</arguments>
+</tool_use>
+
+Always adhere to this format for the tool use to ensure proper parsing and execution.
+
+## Tool Use Examples
+{{ TOOL_USE_EXAMPLES }}
+
+## Tool Use Available Tools
+Above example were using notional tools that might not exist for you. You only have access to these tools:
+{{ AVAILABLE_TOOLS }}
+
+## Tool Use Rules
+Here are the rules you should always follow to solve your task:
+1. Always use the right arguments for the tools. Never use variable names as the action arguments, use the value instead.
+2. Call a tool only when needed: do not call the search agent if you do not need information, try to solve the task yourself.
+3. If no tool call is needed, just answer the question directly.
+4. Never re-do a tool call that you previously did with the exact same parameters.
+5. For tool use, MAKE SURE use XML tag format as shown in the examples above. Do not use any other format.
+
+# User Instructions
+{{ USER_SYSTEM_PROMPT }}
+
+Now Begin! If you solve the task correctly, you will receive a reward of $1,000,000.`
+
+/**
+ * 默认工具使用示例（提取自 Cherry Studio）
+ */
+const DEFAULT_TOOL_USE_EXAMPLES = `
+Here are a few examples using notional tools:
+---
+User: Generate an image of the oldest person in this document.
+
+A: I can use the document_qa tool to find out who the oldest person is in the document.
+<tool_use>
+  <name>document_qa</name>
+  <arguments>{"document": "document.pdf", "question": "Who is the oldest person mentioned?"}</arguments>
+</tool_use>
+
+User: <tool_use_result>
+  <name>document_qa</name>
+  <result>John Doe, a 55 year old lumberjack living in Newfoundland.</result>
+</tool_use_result>
+
+A: I can use the image_generator tool to create a portrait of John Doe.
+<tool_use>
+  <name>image_generator</name>
+  <arguments>{"prompt": "A portrait of John Doe, a 55-year-old man living in Canada."}</arguments>
+</tool_use>
+
+User: <tool_use_result>
+  <name>image_generator</name>
+  <result>image.png</result>
+</tool_use_result>
+
+A: the image is generated as image.png
+
+---
+User: "What is the result of the following operation: 5 + 3 + 1294.678?"
+
+A: I can use the python_interpreter tool to calculate the result of the operation.
+<tool_use>
+  <name>python_interpreter</name>
+  <arguments>{"code": "5 + 3 + 1294.678"}</arguments>
+</tool_use>
+
+User: <tool_use_result>
+  <name>python_interpreter</name>
+  <result>1302.678</result>
+</tool_use_result>
+
+A: The result of the operation is 1302.678.
+
+---
+User: "Which city has the highest population , Guangzhou or Shanghai?"
+
+A: I can use the search tool to find the population of Guangzhou.
+<tool_use>
+  <name>search</name>
+  <arguments>{"query": "Population Guangzhou"}</arguments>
+</tool_use>
+
+User: <tool_use_result>
+  <name>search</name>
+  <result>Guangzhou has a population of 15 million inhabitants as of 2021.</result>
+</tool_use_result>
+
+A: I can use the search tool to find the population of Shanghai.
+<tool_use>
+  <name>search</name>
+  <arguments>{"query": "Population Shanghai"}</arguments>
+</tool_use>
+
+User: <tool_use_result>
+  <name>search</name>
+  <result>26 million (2019)</result>
+</tool_use_result>
+Assistant: The population of Shanghai is 26 million, while Guangzhou has a population of 15 million. Therefore, Shanghai has the highest population.`
+
+/**
+ * 构建可用工具部分（提取自 Cherry Studio）
+ */
+function buildAvailableTools(tools: ToolSet): string {
+  const availableTools = Object.keys(tools)
+    .map((toolName: string) => {
+      const tool = tools[toolName]
+      return `
+<tool>
+  <name>${toolName}</name>
+  <description>${tool.description || ''}</description>
+  <arguments>
+    ${tool.inputSchema ? JSON.stringify(tool.inputSchema) : ''}
+  </arguments>
+</tool>
+`
+    })
+    .join('\n')
+  return `<tools>
+${availableTools}
+</tools>`
+}
+
+/**
+ * 默认的系统提示符构建函数（提取自 Cherry Studio）
+ */
+function defaultBuildSystemPrompt(userSystemPrompt: string, tools: ToolSet): string {
+  const availableTools = buildAvailableTools(tools)
+
+  const fullPrompt = DEFAULT_SYSTEM_PROMPT.replace('{{ TOOL_USE_EXAMPLES }}', DEFAULT_TOOL_USE_EXAMPLES)
+    .replace('{{ AVAILABLE_TOOLS }}', availableTools)
+    .replace('{{ USER_SYSTEM_PROMPT }}', userSystemPrompt || '')
+
+  return fullPrompt
+}
+
+/**
+ * 默认工具解析函数（提取自 Cherry Studio）
+ * 解析 XML 格式的工具调用
+ */
+function defaultParseToolUse(content: string, tools: ToolSet): { results: ToolUseResult[]; content: string } {
+  if (!content || !tools || Object.keys(tools).length === 0) {
+    return { results: [], content: content }
+  }
+
+  // 支持两种格式：
+  // 1. 完整的 <tool_use></tool_use> 标签包围的内容
+  // 2. 只有内部内容（从 TagExtractor 提取出来的）
+
+  let contentToProcess = content
+  // 如果内容不包含 <tool_use> 标签，说明是从 TagExtractor 提取的内部内容，需要包装
+  if (!content.includes('<tool_use>')) {
+    contentToProcess = `<tool_use>\n${content}\n</tool_use>`
+  }
+
+  const toolUsePattern =
+    /<tool_use>([\s\S]*?)<name>([\s\S]*?)<\/name>([\s\S]*?)<arguments>([\s\S]*?)<\/arguments>([\s\S]*?)<\/tool_use>/g
+  const results: ToolUseResult[] = []
+  let match
+  let idx = 0
+
+  // Find all tool use blocks
+  while ((match = toolUsePattern.exec(contentToProcess)) !== null) {
+    const fullMatch = match[0]
+    const toolName = match[2].trim()
+    const toolArgs = match[4].trim()
+
+    // Try to parse the arguments as JSON
+    let parsedArgs
+    try {
+      parsedArgs = JSON.parse(toolArgs)
+    } catch (error) {
+      // If parsing fails, use the string as is
+      parsedArgs = toolArgs
+    }
+
+    // Find the corresponding tool
+    const tool = tools[toolName]
+    if (!tool) {
+      console.warn(`Tool "${toolName}" not found in available tools`)
+      continue
+    }
+
+    // Add to results array
+    results.push({
+      id: `${toolName}-${idx++}`, // Unique ID for each tool use
+      toolName: toolName,
+      arguments: parsedArgs,
+      status: 'pending'
+    })
+    contentToProcess = contentToProcess.replace(fullMatch, '')
+  }
+  return { results, content: contentToProcess }
+}
+
+export const createPromptToolUsePlugin = (config: PromptToolUseConfig = {}) => {
+  const { enabled = true, buildSystemPrompt = defaultBuildSystemPrompt, parseToolUse = defaultParseToolUse } = config
+
+  return definePlugin({
+    name: 'built-in:prompt-tool-use',
+    transformParams: (params: any, context: AiRequestContext) => {
+      if (!enabled || !params.tools || typeof params.tools !== 'object') {
+        return params
+      }
+
+      context.mcpTools = params.tools
+      console.log('tools stored in context', params.tools)
+
+      // 构建系统提示符
+      const userSystemPrompt = typeof params.system === 'string' ? params.system : ''
+      const systemPrompt = buildSystemPrompt(userSystemPrompt, params.tools)
+      let systemMessage: string | null = systemPrompt
+      console.log('config.context', context)
+      if (config.createSystemMessage) {
+        // 🎯 如果用户提供了自定义处理函数，使用它
+        systemMessage = config.createSystemMessage(systemPrompt, params, context)
+      }
+
+      // 移除 tools，改为 prompt 模式
+      const transformedParams = {
+        ...params,
+        ...(systemMessage ? { system: systemMessage } : {}),
+        tools: undefined
+      }
+      context.originalParams = transformedParams
+      console.log('transformedParams', transformedParams)
+      return transformedParams
+    },
+    transformStream: (_: any, context: AiRequestContext) => () => {
+      let textBuffer = ''
+      let stepId = ''
+
+      if (!context.mcpTools) {
+        throw new Error('No tools available')
+      }
+
+      // 创建工具执行器和流事件管理器
+      const toolExecutor = new ToolExecutor()
+      const streamEventManager = new StreamEventManager()
+
+      type TOOLS = NonNullable<typeof context.mcpTools>
+      return new TransformStream<TextStreamPart<TOOLS>, TextStreamPart<TOOLS>>({
+        async transform(
+          chunk: TextStreamPart<TOOLS>,
+          controller: TransformStreamDefaultController<TextStreamPart<TOOLS>>
+        ) {
+          // 收集文本内容
+          if (chunk.type === 'text-delta') {
+            textBuffer += chunk.text || ''
+            stepId = chunk.id || ''
+            controller.enqueue(chunk)
+            return
+          }
+
+          if (chunk.type === 'text-end' || chunk.type === 'finish-step') {
+            const tools = context.mcpTools
+            if (!tools || Object.keys(tools).length === 0) {
+              controller.enqueue(chunk)
+              return
+            }
+
+            // 解析工具调用
+            const { results: parsedTools, content: parsedContent } = parseToolUse(textBuffer, tools)
+            const validToolUses = parsedTools.filter((t) => t.status === 'pending')
+
+            // 如果没有有效的工具调用，直接传递原始事件
+            if (validToolUses.length === 0) {
+              controller.enqueue(chunk)
+              return
+            }
+
+            if (chunk.type === 'text-end') {
+              controller.enqueue({
+                type: 'text-end',
+                id: stepId,
+                providerMetadata: {
+                  text: {
+                    value: parsedContent
+                  }
+                }
+              })
+              return
+            }
+
+            controller.enqueue({
+              ...chunk,
+              finishReason: 'tool-calls'
+            })
+
+            // 发送步骤开始事件
+            streamEventManager.sendStepStartEvent(controller)
+
+            // 执行工具调用
+            const executedResults = await toolExecutor.executeTools(validToolUses, tools, controller)
+
+            // 发送步骤完成事件
+            streamEventManager.sendStepFinishEvent(controller, chunk)
+
+            // 处理递归调用
+            if (validToolUses.length > 0) {
+              const toolResultsText = toolExecutor.formatToolResults(executedResults)
+              const recursiveParams = streamEventManager.buildRecursiveParams(
+                context,
+                textBuffer,
+                toolResultsText,
+                tools
+              )
+
+              await streamEventManager.handleRecursiveCall(controller, recursiveParams, context, stepId)
+            }
+
+            // 清理状态
+            textBuffer = ''
+            return
+          }
+
+          // 对于其他类型的事件，直接传递
+          controller.enqueue(chunk)
+        },
+
+        flush() {
+          // 流结束时的清理工作
+          console.log('[MCP Prompt] Stream ended, cleaning up...')
+        }
+      })
+    }
+  })
+}

packages/aiCore/src/core/plugins/built-in/toolUsePlugin/tagExtraction.ts

@@ -0,0 +1,196 @@
+// Copied from https://github.com/vercel/ai/blob/main/packages/ai/core/util/get-potential-start-index.ts
+
+/**
+ * Returns the index of the start of the searchedText in the text, or null if it
+ * is not found.
+ */
+export function getPotentialStartIndex(text: string, searchedText: string): number | null {
+  // Return null immediately if searchedText is empty.
+  if (searchedText.length === 0) {
+    return null
+  }
+
+  // Check if the searchedText exists as a direct substring of text.
+  const directIndex = text.indexOf(searchedText)
+  if (directIndex !== -1) {
+    return directIndex
+  }
+
+  // Otherwise, look for the largest suffix of "text" that matches
+  // a prefix of "searchedText". We go from the end of text inward.
+  for (let i = text.length - 1; i >= 0; i--) {
+    const suffix = text.substring(i)
+    if (searchedText.startsWith(suffix)) {
+      return i
+    }
+  }
+
+  return null
+}
+
+export interface TagConfig {
+  openingTag: string
+  closingTag: string
+  separator?: string
+}
+
+export interface TagExtractionState {
+  textBuffer: string
+  isInsideTag: boolean
+  isFirstTag: boolean
+  isFirstText: boolean
+  afterSwitch: boolean
+  accumulatedTagContent: string
+  hasTagContent: boolean
+}
+
+export interface TagExtractionResult {
+  content: string
+  isTagContent: boolean
+  complete: boolean
+  tagContentExtracted?: string
+}
+
+/**
+ * 通用标签提取处理器
+ * 可以处理各种形式的标签对，如 <think>...</think>, <tool_use>...</tool_use> 等
+ */
+export class TagExtractor {
+  private config: TagConfig
+  private state: TagExtractionState
+
+  constructor(config: TagConfig) {
+    this.config = config
+    this.state = {
+      textBuffer: '',
+      isInsideTag: false,
+      isFirstTag: true,
+      isFirstText: true,
+      afterSwitch: false,
+      accumulatedTagContent: '',
+      hasTagContent: false
+    }
+  }
+
+  /**
+   * 处理文本块，返回处理结果
+   */
+  processText(newText: string): TagExtractionResult[] {
+    this.state.textBuffer += newText
+    const results: TagExtractionResult[] = []
+
+    // 处理标签提取逻辑
+    while (true) {
+      const nextTag = this.state.isInsideTag ? this.config.closingTag : this.config.openingTag
+      const startIndex = getPotentialStartIndex(this.state.textBuffer, nextTag)
+
+      if (startIndex == null) {
+        const content = this.state.textBuffer
+        if (content.length > 0) {
+          results.push({
+            content: this.addPrefix(content),
+            isTagContent: this.state.isInsideTag,
+            complete: false
+          })
+
+          if (this.state.isInsideTag) {
+            this.state.accumulatedTagContent += this.addPrefix(content)
+            this.state.hasTagContent = true
+          }
+        }
+        this.state.textBuffer = ''
+        break
+      }
+
+      // 处理标签前的内容
+      const contentBeforeTag = this.state.textBuffer.slice(0, startIndex)
+      if (contentBeforeTag.length > 0) {
+        results.push({
+          content: this.addPrefix(contentBeforeTag),
+          isTagContent: this.state.isInsideTag,
+          complete: false
+        })
+
+        if (this.state.isInsideTag) {
+          this.state.accumulatedTagContent += this.addPrefix(contentBeforeTag)
+          this.state.hasTagContent = true
+        }
+      }
+
+      const foundFullMatch = startIndex + nextTag.length <= this.state.textBuffer.length
+
+      if (foundFullMatch) {
+        // 如果找到完整的标签
+        this.state.textBuffer = this.state.textBuffer.slice(startIndex + nextTag.length)
+
+        // 如果刚刚结束一个标签内容，生成完整的标签内容结果
+        if (this.state.isInsideTag && this.state.hasTagContent) {
+          results.push({
+            content: '',
+            isTagContent: false,
+            complete: true,
+            tagContentExtracted: this.state.accumulatedTagContent
+          })
+          this.state.accumulatedTagContent = ''
+          this.state.hasTagContent = false
+        }
+
+        this.state.isInsideTag = !this.state.isInsideTag
+        this.state.afterSwitch = true
+
+        if (this.state.isInsideTag) {
+          this.state.isFirstTag = false
+        } else {
+          this.state.isFirstText = false
+        }
+      } else {
+        this.state.textBuffer = this.state.textBuffer.slice(startIndex)
+        break
+      }
+    }
+
+    return results
+  }
+
+  /**
+   * 完成处理，返回任何剩余的标签内容
+   */
+  finalize(): TagExtractionResult | null {
+    if (this.state.hasTagContent && this.state.accumulatedTagContent) {
+      const result = {
+        content: '',
+        isTagContent: false,
+        complete: true,
+        tagContentExtracted: this.state.accumulatedTagContent
+      }
+      this.state.accumulatedTagContent = ''
+      this.state.hasTagContent = false
+      return result
+    }
+    return null
+  }
+
+  private addPrefix(text: string): string {
+    const needsPrefix =
+      this.state.afterSwitch && (this.state.isInsideTag ? !this.state.isFirstTag : !this.state.isFirstText)
+
+    const prefix = needsPrefix && this.config.separator ? this.config.separator : ''
+    this.state.afterSwitch = false
+    return prefix + text
+  }
+
+  /**
+   * 重置状态
+   */
+  reset(): void {
+    this.state = {
+      textBuffer: '',
+      isInsideTag: false,
+      isFirstTag: true,
+      isFirstText: true,
+      afterSwitch: false,
+      accumulatedTagContent: '',
+      hasTagContent: false
+    }
+  }
+}

packages/aiCore/src/core/plugins/built-in/toolUsePlugin/type.ts

@@ -0,0 +1,33 @@
+import { ToolSet } from 'ai'
+
+import { AiRequestContext } from '../..'
+
+/**
+ * 解析结果类型
+ * 表示从AI响应中解析出的工具使用意图
+ */
+export interface ToolUseResult {
+  id: string
+  toolName: string
+  arguments: any
+  status: 'pending' | 'invoking' | 'done' | 'error'
+}
+
+export interface BaseToolUsePluginConfig {
+  enabled?: boolean
+}
+
+export interface PromptToolUseConfig extends BaseToolUsePluginConfig {
+  // 自定义系统提示符构建函数（可选，有默认实现）
+  buildSystemPrompt?: (userSystemPrompt: string, tools: ToolSet) => string
+  // 自定义工具解析函数（可选，有默认实现）
+  parseToolUse?: (content: string, tools: ToolSet) => { results: ToolUseResult[]; content: string }
+  createSystemMessage?: (systemPrompt: string, originalParams: any, context: AiRequestContext) => string | null
+}
+
+/**
+ * 扩展的 AI 请求上下文，支持 MCP 工具存储
+ */
+export interface ToolUseRequestContext extends AiRequestContext {
+  mcpTools: ToolSet
+}

packages/aiCore/src/core/plugins/built-in/webSearchPlugin/helper.ts

@@ -0,0 +1,67 @@
+import { anthropic } from '@ai-sdk/anthropic'
+import { google } from '@ai-sdk/google'
+import { openai } from '@ai-sdk/openai'
+
+import { ProviderOptionsMap } from '../../../options/types'
+
+/**
+ * 从 AI SDK 的工具函数中提取参数类型，以确保类型安全。
+ */
+type OpenAISearchConfig = Parameters<typeof openai.tools.webSearchPreview>[0]
+type AnthropicSearchConfig = Parameters<typeof anthropic.tools.webSearch_20250305>[0]
+type GoogleSearchConfig = Parameters<typeof google.tools.googleSearch>[0]
+
+/**
+ * 插件初始化时接收的完整配置对象
+ *
+ * 其结构与 ProviderOptions 保持一致，方便上游统一管理配置
+ */
+export interface WebSearchPluginConfig {
+  openai?: OpenAISearchConfig
+  anthropic?: AnthropicSearchConfig
+  xai?: ProviderOptionsMap['xai']['searchParameters']
+  google?: GoogleSearchConfig
+  'google-vertex'?: GoogleSearchConfig
+}
+
+/**
+ * 插件的默认配置
+ */
+export const DEFAULT_WEB_SEARCH_CONFIG: WebSearchPluginConfig = {
+  google: {},
+  'google-vertex': {},
+  openai: {},
+  xai: {
+    mode: 'on',
+    returnCitations: true,
+    maxSearchResults: 5,
+    sources: [{ type: 'web' }, { type: 'x' }, { type: 'news' }]
+  },
+  anthropic: {
+    maxUses: 5
+  }
+}
+
+export type WebSearchToolOutputSchema = {
+  // Anthropic 工具 - 手动定义
+  anthropicWebSearch: Array<{
+    url: string
+    title: string
+    pageAge: string | null
+    encryptedContent: string
+    type: string
+  }>
+
+  // OpenAI 工具 - 基于实际输出
+  openaiWebSearch: {
+    status: 'completed' | 'failed'
+  }
+
+  // Google 工具
+  googleSearch: {
+    webSearchQueries?: string[]
+    groundingChunks?: Array<{
+      web?: { uri: string; title: string }
+    }>
+  }
+}

packages/aiCore/src/core/plugins/built-in/webSearchPlugin/index.ts

@@ -0,0 +1,69 @@
+/**
+ * Web Search Plugin
+ * 提供统一的网络搜索能力，支持多个 AI Provider
+ */
+import { anthropic } from '@ai-sdk/anthropic'
+import { google } from '@ai-sdk/google'
+import { openai } from '@ai-sdk/openai'
+
+import { createXaiOptions, mergeProviderOptions } from '../../../options'
+import { definePlugin } from '../../'
+import type { AiRequestContext } from '../../types'
+import { DEFAULT_WEB_SEARCH_CONFIG, WebSearchPluginConfig } from './helper'
+
+/**
+ * 网络搜索插件
+ *
+ * @param config - 在插件初始化时传入的静态配置
+ */
+export const webSearchPlugin = (config: WebSearchPluginConfig = DEFAULT_WEB_SEARCH_CONFIG) =>
+  definePlugin({
+    name: 'webSearch',
+    enforce: 'pre',
+
+    transformParams: async (params: any, context: AiRequestContext) => {
+      const { providerId } = context
+      switch (providerId) {
+        case 'openai': {
+          if (config.openai) {
+            if (!params.tools) params.tools = {}
+            params.tools.web_search_preview = openai.tools.webSearchPreview(config.openai)
+          }
+          break
+        }
+
+        case 'anthropic': {
+          if (config.anthropic) {
+            if (!params.tools) params.tools = {}
+            params.tools.web_search = anthropic.tools.webSearch_20250305(config.anthropic)
+          }
+          break
+        }
+
+        case 'google': {
+          // case 'google-vertex':
+          if (!params.tools) params.tools = {}
+          params.tools.web_search = google.tools.googleSearch(config.google || {})
+          break
+        }
+
+        case 'xai': {
+          if (config.xai) {
+            const searchOptions = createXaiOptions({
+              searchParameters: { ...config.xai, mode: 'on' }
+            })
+            params.providerOptions = mergeProviderOptions(params.providerOptions, searchOptions)
+          }
+          break
+        }
+      }
+
+      return params
+    }
+  })
+
+// 导出类型定义供开发者使用
+export type { WebSearchPluginConfig, WebSearchToolOutputSchema } from './helper'
+
+// 默认导出
+export default webSearchPlugin

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

@@ -0,0 +1,32 @@
+// 核心类型和接口
+export type { AiPlugin, AiRequestContext, HookResult, PluginManagerConfig } from './types'
+import type { ProviderId } from '../providers'
+import type { AiPlugin, AiRequestContext } from './types'
+
+// 插件管理器
+export { PluginManager } from './manager'
+
+// 工具函数
+export function createContext<T extends ProviderId>(
+  providerId: T,
+  modelId: string,
+  originalParams: any
+): AiRequestContext {
+  return {
+    providerId,
+    modelId,
+    originalParams,
+    metadata: {},
+    startTime: Date.now(),
+    requestId: `${providerId}-${modelId}-${Date.now()}-${Math.random().toString(36).slice(2)}`,
+    // 占位
+    recursiveCall: () => Promise.resolve(null)
+  }
+}
+
+// 插件构建器 - 便于创建插件
+export function definePlugin(plugin: AiPlugin): AiPlugin
+export function definePlugin<T extends (...args: any[]) => AiPlugin>(pluginFactory: T): T
+export function definePlugin(plugin: AiPlugin | ((...args: any[]) => AiPlugin)) {
+  return plugin
+}

packages/aiCore/src/core/plugins/manager.ts

@@ -0,0 +1,184 @@
+import { AiPlugin, AiRequestContext } from './types'
+
+/**
+ * 插件管理器
+ */
+export class PluginManager {
+  private plugins: AiPlugin[] = []
+
+  constructor(plugins: AiPlugin[] = []) {
+    this.plugins = this.sortPlugins(plugins)
+  }
+
+  /**
+   * 添加插件
+   */
+  use(plugin: AiPlugin): this {
+    this.plugins = this.sortPlugins([...this.plugins, plugin])
+    return this
+  }
+
+  /**
+   * 移除插件
+   */
+  remove(pluginName: string): this {
+    this.plugins = this.plugins.filter((p) => p.name !== pluginName)
+    return this
+  }
+
+  /**
+   * 插件排序：pre -> normal -> post
+   */
+  private sortPlugins(plugins: AiPlugin[]): AiPlugin[] {
+    const pre: AiPlugin[] = []
+    const normal: AiPlugin[] = []
+    const post: AiPlugin[] = []
+
+    plugins.forEach((plugin) => {
+      if (plugin.enforce === 'pre') {
+        pre.push(plugin)
+      } else if (plugin.enforce === 'post') {
+        post.push(plugin)
+      } else {
+        normal.push(plugin)
+      }
+    })
+
+    return [...pre, ...normal, ...post]
+  }
+
+  /**
+   * 执行 First 钩子 - 返回第一个有效结果
+   */
+  async executeFirst<T>(
+    hookName: 'resolveModel' | 'loadTemplate',
+    arg: any,
+    context: AiRequestContext
+  ): Promise<T | null> {
+    for (const plugin of this.plugins) {
+      const hook = plugin[hookName]
+      if (hook) {
+        const result = await hook(arg, context)
+        if (result !== null && result !== undefined) {
+          return result as T
+        }
+      }
+    }
+    return null
+  }
+
+  /**
+   * 执行 Sequential 钩子 - 链式数据转换
+   */
+  async executeSequential<T>(
+    hookName: 'transformParams' | 'transformResult',
+    initialValue: T,
+    context: AiRequestContext
+  ): Promise<T> {
+    let result = initialValue
+
+    for (const plugin of this.plugins) {
+      const hook = plugin[hookName]
+      if (hook) {
+        result = await hook<T>(result, context)
+      }
+    }
+
+    return result
+  }
+
+  /**
+   * 执行 ConfigureContext 钩子 - 串行配置上下文
+   */
+  async executeConfigureContext(context: AiRequestContext): Promise<void> {
+    for (const plugin of this.plugins) {
+      const hook = plugin.configureContext
+      if (hook) {
+        await hook(context)
+      }
+    }
+  }
+
+  /**
+   * 执行 Parallel 钩子 - 并行副作用
+   */
+  async executeParallel(
+    hookName: 'onRequestStart' | 'onRequestEnd' | 'onError',
+    context: AiRequestContext,
+    result?: any,
+    error?: Error
+  ): Promise<void> {
+    const promises = this.plugins
+      .map((plugin) => {
+        const hook = plugin[hookName]
+        if (!hook) return null
+
+        if (hookName === 'onError' && error) {
+          return (hook as any)(error, context)
+        } else if (hookName === 'onRequestEnd' && result !== undefined) {
+          return (hook as any)(context, result)
+        } else if (hookName === 'onRequestStart') {
+          return (hook as any)(context)
+        }
+        return null
+      })
+      .filter(Boolean)
+
+    // 使用 Promise.all 而不是 allSettled，让插件错误能够抛出
+    await Promise.all(promises)
+  }
+
+  /**
+   * 收集所有流转换器（返回数组，AI SDK 原生支持）
+   */
+  collectStreamTransforms(params: any, context: AiRequestContext) {
+    return this.plugins
+      .filter((plugin) => plugin.transformStream)
+      .map((plugin) => plugin.transformStream?.(params, context))
+  }
+
+  /**
+   * 获取所有插件信息
+   */
+  getPlugins(): AiPlugin[] {
+    return [...this.plugins]
+  }
+
+  /**
+   * 获取插件统计信息
+   */
+  getStats() {
+    const stats = {
+      total: this.plugins.length,
+      pre: 0,
+      normal: 0,
+      post: 0,
+      hooks: {
+        resolveModel: 0,
+        loadTemplate: 0,
+        transformParams: 0,
+        transformResult: 0,
+        onRequestStart: 0,
+        onRequestEnd: 0,
+        onError: 0,
+        transformStream: 0
+      }
+    }
+
+    this.plugins.forEach((plugin) => {
+      // 统计 enforce 类型
+      if (plugin.enforce === 'pre') stats.pre++
+      else if (plugin.enforce === 'post') stats.post++
+      else stats.normal++
+
+      // 统计钩子数量
+      Object.keys(stats.hooks).forEach((hookName) => {
+        if (plugin[hookName as keyof AiPlugin]) {
+          stats.hooks[hookName as keyof typeof stats.hooks]++
+        }
+      })
+    })
+
+    return stats
+  }
+}

packages/aiCore/src/core/plugins/types.ts

@@ -0,0 +1,79 @@
+import type { ImageModelV2 } from '@ai-sdk/provider'
+import type { LanguageModel, TextStreamPart, ToolSet } from 'ai'
+
+import { type ProviderId } from '../providers/types'
+
+/**
+ * 递归调用函数类型
+ * 使用 any 是因为递归调用时参数和返回类型可能完全不同
+ */
+export type RecursiveCallFn = (newParams: any) => Promise<any>
+
+/**
+ * AI 请求上下文
+ */
+export interface AiRequestContext {
+  providerId: ProviderId
+  modelId: string
+  originalParams: any
+  metadata: Record<string, any>
+  startTime: number
+  requestId: string
+  recursiveCall: RecursiveCallFn
+  isRecursiveCall?: boolean
+  mcpTools?: ToolSet
+  [key: string]: any
+}
+
+/**
+ * 钩子分类
+ */
+export interface AiPlugin {
+  name: string
+  enforce?: 'pre' | 'post'
+
+  // 【First】首个钩子 - 只执行第一个返回值的插件
+  resolveModel?: (
+    modelId: string,
+    context: AiRequestContext
+  ) => Promise<LanguageModel | ImageModelV2 | null> | LanguageModel | ImageModelV2 | null
+  loadTemplate?: (templateName: string, context: AiRequestContext) => any | null | Promise<any | null>
+
+  // 【Sequential】串行钩子 - 链式执行，支持数据转换
+  configureContext?: (context: AiRequestContext) => void | Promise<void>
+  transformParams?: <T>(params: T, context: AiRequestContext) => T | Promise<T>
+  transformResult?: <T>(result: T, context: AiRequestContext) => T | Promise<T>
+
+  // 【Parallel】并行钩子 - 不依赖顺序，用于副作用
+  onRequestStart?: (context: AiRequestContext) => void | Promise<void>
+  onRequestEnd?: (context: AiRequestContext, result: any) => void | Promise<void>
+  onError?: (error: Error, context: AiRequestContext) => void | Promise<void>
+
+  // 【Stream】流处理 - 直接使用 AI SDK
+  transformStream?: (
+    params: any,
+    context: AiRequestContext
+  ) => <TOOLS extends ToolSet>(options?: {
+    tools: TOOLS
+    stopStream: () => void
+  }) => TransformStream<TextStreamPart<TOOLS>, TextStreamPart<TOOLS>>
+
+  // AI SDK 原生中间件
+  // aiSdkMiddlewares?: LanguageModelV1Middleware[]
+}
+
+/**
+ * 插件管理器配置
+ */
+export interface PluginManagerConfig {
+  plugins: AiPlugin[]
+  context: Partial<AiRequestContext>
+}
+
+/**
+ * 钩子执行结果
+ */
+export interface HookResult<T = any> {
+  value: T
+  stop?: boolean
+}

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

@@ -0,0 +1,101 @@
+/**
+ * Hub Provider - 支持路由到多个底层provider
+ *
+ * 支持格式: hubId:providerId:modelId
+ * 例如: aihubmix:anthropic:claude-3.5-sonnet
+ */
+
+import { ProviderV2 } from '@ai-sdk/provider'
+import { customProvider } from 'ai'
+
+import { globalRegistryManagement } from './RegistryManagement'
+import type { AiSdkMethodName, AiSdkModelReturn, AiSdkModelType } from './types'
+
+export interface HubProviderConfig {
+  /** Hub的唯一标识符 */
+  hubId: string
+  /** 是否启用调试日志 */
+  debug?: boolean
+}
+
+export class HubProviderError extends Error {
+  constructor(
+    message: string,
+    public readonly hubId: string,
+    public readonly providerId?: string,
+    public readonly originalError?: Error
+  ) {
+    super(message)
+    this.name = 'HubProviderError'
+  }
+}
+
+/**
+ * 解析Hub模型ID
+ */
+function parseHubModelId(modelId: string): { provider: string; actualModelId: string } {
+  const parts = modelId.split(':')
+  if (parts.length !== 2) {
+    throw new HubProviderError(`Invalid hub model ID format. Expected "provider:modelId", got: ${modelId}`, 'unknown')
+  }
+  return {
+    provider: parts[0],
+    actualModelId: parts[1]
+  }
+}
+
+/**
+ * 创建Hub Provider
+ */
+export function createHubProvider(config: HubProviderConfig): ProviderV2 {
+  const { hubId } = config
+
+  function getTargetProvider(providerId: string): ProviderV2 {
+    // 从全局注册表获取provider实例
+    try {
+      const provider = globalRegistryManagement.getProvider(providerId)
+      if (!provider) {
+        throw new HubProviderError(
+          `Provider "${providerId}" is not initialized. Please call initializeProvider("${providerId}", options) first.`,
+          hubId,
+          providerId
+        )
+      }
+      return provider
+    } catch (error) {
+      throw new HubProviderError(
+        `Failed to get provider "${providerId}": ${error instanceof Error ? error.message : 'Unknown error'}`,
+        hubId,
+        providerId,
+        error instanceof Error ? error : undefined
+      )
+    }
+  }
+
+  function resolveModel<T extends AiSdkModelType>(
+    modelId: string,
+    modelType: T,
+    methodName: AiSdkMethodName<T>
+  ): AiSdkModelReturn<T> {
+    const { provider, actualModelId } = parseHubModelId(modelId)
+    const targetProvider = getTargetProvider(provider)
+
+    const fn = targetProvider[methodName] as (id: string) => AiSdkModelReturn<T>
+
+    if (!fn) {
+      throw new HubProviderError(`Provider "${provider}" does not support ${modelType}`, hubId, provider)
+    }
+
+    return fn(actualModelId)
+  }
+
+  return customProvider({
+    fallbackProvider: {
+      languageModel: (modelId: string) => resolveModel(modelId, 'text', 'languageModel'),
+      textEmbeddingModel: (modelId: string) => resolveModel(modelId, 'embedding', 'textEmbeddingModel'),
+      imageModel: (modelId: string) => resolveModel(modelId, 'image', 'imageModel'),
+      transcriptionModel: (modelId: string) => resolveModel(modelId, 'transcription', 'transcriptionModel'),
+      speechModel: (modelId: string) => resolveModel(modelId, 'speech', 'speechModel')
+    }
+  })
+}

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

@@ -0,0 +1,221 @@
+/**
+ * Provider 注册表管理器
+ * 纯粹的管理功能：存储、检索已配置好的 provider 实例
+ * 基于 AI SDK 原生的 createProviderRegistry
+ */
+
+import { EmbeddingModelV2, ImageModelV2, LanguageModelV2, ProviderV2 } from '@ai-sdk/provider'
+import { createProviderRegistry, type ProviderRegistryProvider } from 'ai'
+
+type PROVIDERS = Record<string, ProviderV2>
+
+export const DEFAULT_SEPARATOR = '|'
+
+// export type MODEL_ID = `${string}${typeof DEFAULT_SEPARATOR}${string}`
+
+export class RegistryManagement<SEPARATOR extends string = typeof DEFAULT_SEPARATOR> {
+  private providers: PROVIDERS = {}
+  private aliases: Set<string> = new Set() // 记录哪些key是别名
+  private separator: SEPARATOR
+  private registry: ProviderRegistryProvider<PROVIDERS, SEPARATOR> | null = null
+
+  constructor(options: { separator: SEPARATOR } = { separator: DEFAULT_SEPARATOR as SEPARATOR }) {
+    this.separator = options.separator
+  }
+
+  /**
+   * 注册已配置好的 provider 实例
+   */
+  registerProvider(id: string, provider: ProviderV2, aliases?: string[]): this {
+    // 注册主provider
+    this.providers[id] = provider
+
+    // 注册别名（都指向同一个provider实例）
+    if (aliases) {
+      aliases.forEach((alias) => {
+        this.providers[alias] = provider // 直接存储引用
+        this.aliases.add(alias) // 标记为别名
+      })
+    }
+
+    this.rebuildRegistry()
+    return this
+  }
+
+  /**
+   * 获取已注册的provider实例
+   */
+  getProvider(id: string): ProviderV2 | undefined {
+    return this.providers[id]
+  }
+
+  /**
+   * 批量注册 providers
+   */
+  registerProviders(providers: Record<string, ProviderV2>): this {
+    Object.assign(this.providers, providers)
+    this.rebuildRegistry()
+    return this
+  }
+
+  /**
+   * 移除 provider（同时清理相关别名）
+   */
+  unregisterProvider(id: string): this {
+    const provider = this.providers[id]
+    if (!provider) return this
+
+    // 如果移除的是真实ID，需要清理所有指向它的别名
+    if (!this.aliases.has(id)) {
+      // 找到所有指向此provider的别名并删除
+      const aliasesToRemove: string[] = []
+      this.aliases.forEach((alias) => {
+        if (this.providers[alias] === provider) {
+          aliasesToRemove.push(alias)
+        }
+      })
+
+      aliasesToRemove.forEach((alias) => {
+        delete this.providers[alias]
+        this.aliases.delete(alias)
+      })
+    } else {
+      // 如果移除的是别名，只删除别名记录
+      this.aliases.delete(id)
+    }
+
+    delete this.providers[id]
+    this.rebuildRegistry()
+    return this
+  }
+
+  /**
+   * 立即重建 registry - 每次变更都重建
+   */
+  private rebuildRegistry(): void {
+    if (Object.keys(this.providers).length === 0) {
+      this.registry = null
+      return
+    }
+
+    this.registry = createProviderRegistry<PROVIDERS, SEPARATOR>(this.providers, {
+      separator: this.separator
+    })
+  }
+
+  /**
+   * 获取语言模型 - AI SDK 原生方法
+   */
+  languageModel(id: `${string}${SEPARATOR}${string}`): LanguageModelV2 {
+    if (!this.registry) {
+      throw new Error('No providers registered')
+    }
+    return this.registry.languageModel(id)
+  }
+
+  /**
+   * 获取文本嵌入模型 - AI SDK 原生方法
+   */
+  textEmbeddingModel(id: `${string}${SEPARATOR}${string}`): EmbeddingModelV2<string> {
+    if (!this.registry) {
+      throw new Error('No providers registered')
+    }
+    return this.registry.textEmbeddingModel(id)
+  }
+
+  /**
+   * 获取图像模型 - AI SDK 原生方法
+   */
+  imageModel(id: `${string}${SEPARATOR}${string}`): ImageModelV2 {
+    if (!this.registry) {
+      throw new Error('No providers registered')
+    }
+    return this.registry.imageModel(id)
+  }
+
+  /**
+   * 获取转录模型 - AI SDK 原生方法
+   */
+  transcriptionModel(id: `${string}${SEPARATOR}${string}`): any {
+    if (!this.registry) {
+      throw new Error('No providers registered')
+    }
+    return this.registry.transcriptionModel(id)
+  }
+
+  /**
+   * 获取语音模型 - AI SDK 原生方法
+   */
+  speechModel(id: `${string}${SEPARATOR}${string}`): any {
+    if (!this.registry) {
+      throw new Error('No providers registered')
+    }
+    return this.registry.speechModel(id)
+  }
+
+  /**
+   * 获取已注册的 provider 列表
+   */
+  getRegisteredProviders(): string[] {
+    return Object.keys(this.providers)
+  }
+
+  /**
+   * 检查是否有已注册的 providers
+   */
+  hasProviders(): boolean {
+    return Object.keys(this.providers).length > 0
+  }
+
+  /**
+   * 清除所有 providers
+   */
+  clear(): this {
+    this.providers = {}
+    this.aliases.clear()
+    this.registry = null
+    return this
+  }
+
+  /**
+   * 解析真实的Provider ID（供getAiSdkProviderId使用）
+   * 如果传入的是别名，返回真实的Provider ID
+   * 如果传入的是真实ID，直接返回
+   */
+  resolveProviderId(id: string): string {
+    if (!this.aliases.has(id)) return id // 不是别名，直接返回
+
+    // 是别名，找到真实ID
+    const targetProvider = this.providers[id]
+    for (const [realId, provider] of Object.entries(this.providers)) {
+      if (provider === targetProvider && !this.aliases.has(realId)) {
+        return realId
+      }
+    }
+    return id
+  }
+
+  /**
+   * 检查是否为别名
+   */
+  isAlias(id: string): boolean {
+    return this.aliases.has(id)
+  }
+
+  /**
+   * 获取所有别名映射关系
+   */
+  getAllAliases(): Record<string, string> {
+    const result: Record<string, string> = {}
+    this.aliases.forEach((alias) => {
+      result[alias] = this.resolveProviderId(alias)
+    })
+    return result
+  }
+}
+
+/**
+ * 全局注册表管理器实例
+ * 使用 | 作为分隔符，因为 : 会和 :free 等suffix冲突
+ */
+export const globalRegistryManagement = new RegistryManagement()

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

@@ -0,0 +1,632 @@
+/**
+ * 测试真正的 AiProviderRegistry 功能
+ */
+
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+// 模拟 AI SDK
+vi.mock('@ai-sdk/openai', () => ({
+  createOpenAI: vi.fn(() => ({ name: 'openai-mock' }))
+}))
+
+vi.mock('@ai-sdk/anthropic', () => ({
+  createAnthropic: vi.fn(() => ({ name: 'anthropic-mock' }))
+}))
+
+vi.mock('@ai-sdk/azure', () => ({
+  createAzure: vi.fn(() => ({ name: 'azure-mock' }))
+}))
+
+vi.mock('@ai-sdk/deepseek', () => ({
+  createDeepSeek: vi.fn(() => ({ name: 'deepseek-mock' }))
+}))
+
+vi.mock('@ai-sdk/google', () => ({
+  createGoogleGenerativeAI: vi.fn(() => ({ name: 'google-mock' }))
+}))
+
+vi.mock('@ai-sdk/openai-compatible', () => ({
+  createOpenAICompatible: vi.fn(() => ({ name: 'openai-compatible-mock' }))
+}))
+
+vi.mock('@ai-sdk/xai', () => ({
+  createXai: vi.fn(() => ({ name: 'xai-mock' }))
+}))
+
+import {
+  cleanup,
+  clearAllProviders,
+  createAndRegisterProvider,
+  createProvider,
+  getAllProviderConfigAliases,
+  getAllProviderConfigs,
+  getInitializedProviders,
+  getLanguageModel,
+  getProviderConfig,
+  getProviderConfigByAlias,
+  getSupportedProviders,
+  hasInitializedProviders,
+  hasProviderConfig,
+  hasProviderConfigByAlias,
+  isProviderConfigAlias,
+  ProviderInitializationError,
+  providerRegistry,
+  registerMultipleProviderConfigs,
+  registerProvider,
+  registerProviderConfig,
+  resolveProviderConfigId
+} from '../registry'
+import type { ProviderConfig } from '../schemas'
+
+describe('Provider Registry 功能测试', () => {
+  beforeEach(() => {
+    // 清理状态
+    cleanup()
+  })
+
+  describe('基础功能', () => {
+    it('能够获取支持的 providers 列表', () => {
+      const providers = getSupportedProviders()
+      expect(Array.isArray(providers)).toBe(true)
+      expect(providers.length).toBeGreaterThan(0)
+
+      // 检查返回的数据结构
+      providers.forEach((provider) => {
+        expect(provider).toHaveProperty('id')
+        expect(provider).toHaveProperty('name')
+        expect(typeof provider.id).toBe('string')
+        expect(typeof provider.name).toBe('string')
+      })
+
+      // 包含基础 providers
+      const providerIds = providers.map((p) => p.id)
+      expect(providerIds).toContain('openai')
+      expect(providerIds).toContain('anthropic')
+      expect(providerIds).toContain('google')
+    })
+
+    it('能够获取已初始化的 providers', () => {
+      // 初始状态下没有已初始化的 providers
+      expect(getInitializedProviders()).toEqual([])
+      expect(hasInitializedProviders()).toBe(false)
+    })
+
+    it('能够访问全局注册管理器', () => {
+      expect(providerRegistry).toBeDefined()
+      expect(typeof providerRegistry.clear).toBe('function')
+      expect(typeof providerRegistry.getRegisteredProviders).toBe('function')
+      expect(typeof providerRegistry.hasProviders).toBe('function')
+    })
+
+    it('能够获取语言模型', () => {
+      // 在没有注册 provider 的情况下，这个函数应该会抛出错误
+      expect(() => getLanguageModel('non-existent')).toThrow('No providers registered')
+    })
+  })
+
+  describe('Provider 配置注册', () => {
+    it('能够注册自定义 provider 配置', () => {
+      const config: ProviderConfig = {
+        id: 'custom-provider',
+        name: 'Custom Provider',
+        creator: vi.fn(() => ({ name: 'custom' })),
+        supportsImageGeneration: false
+      }
+
+      const success = registerProviderConfig(config)
+      expect(success).toBe(true)
+
+      expect(hasProviderConfig('custom-provider')).toBe(true)
+      expect(getProviderConfig('custom-provider')).toEqual(config)
+    })
+
+    it('能够注册带别名的 provider 配置', () => {
+      const config: ProviderConfig = {
+        id: 'custom-provider-with-aliases',
+        name: 'Custom Provider with Aliases',
+        creator: vi.fn(() => ({ name: 'custom-aliased' })),
+        supportsImageGeneration: false,
+        aliases: ['alias-1', 'alias-2']
+      }
+
+      const success = registerProviderConfig(config)
+      expect(success).toBe(true)
+
+      expect(hasProviderConfigByAlias('alias-1')).toBe(true)
+      expect(hasProviderConfigByAlias('alias-2')).toBe(true)
+      expect(getProviderConfigByAlias('alias-1')).toEqual(config)
+      expect(resolveProviderConfigId('alias-1')).toBe('custom-provider-with-aliases')
+    })
+
+    it('拒绝无效的配置', () => {
+      // 缺少必要字段
+      const invalidConfig = {
+        id: 'invalid-provider'
+        // 缺少 name, creator 等
+      }
+
+      const success = registerProviderConfig(invalidConfig as any)
+      expect(success).toBe(false)
+    })
+
+    it('能够批量注册 provider 配置', () => {
+      const configs: ProviderConfig[] = [
+        {
+          id: 'provider-1',
+          name: 'Provider 1',
+          creator: vi.fn(() => ({ name: 'provider-1' })),
+          supportsImageGeneration: false
+        },
+        {
+          id: 'provider-2',
+          name: 'Provider 2',
+          creator: vi.fn(() => ({ name: 'provider-2' })),
+          supportsImageGeneration: true
+        },
+        {
+          id: '', // 无效配置
+          name: 'Invalid Provider',
+          creator: vi.fn(() => ({ name: 'invalid' })),
+          supportsImageGeneration: false
+        } as any
+      ]
+
+      const successCount = registerMultipleProviderConfigs(configs)
+      expect(successCount).toBe(2) // 只有前两个成功
+
+      expect(hasProviderConfig('provider-1')).toBe(true)
+      expect(hasProviderConfig('provider-2')).toBe(true)
+      expect(hasProviderConfig('')).toBe(false)
+    })
+
+    it('能够获取所有配置和别名信息', () => {
+      // 注册一些配置
+      registerProviderConfig({
+        id: 'test-provider',
+        name: 'Test Provider',
+        creator: vi.fn(),
+        supportsImageGeneration: false,
+        aliases: ['test-alias']
+      })
+
+      const allConfigs = getAllProviderConfigs()
+      expect(Array.isArray(allConfigs)).toBe(true)
+      expect(allConfigs.some((config) => config.id === 'test-provider')).toBe(true)
+
+      const aliases = getAllProviderConfigAliases()
+      expect(aliases['test-alias']).toBe('test-provider')
+      expect(isProviderConfigAlias('test-alias')).toBe(true)
+    })
+  })
+
+  describe('Provider 创建和注册', () => {
+    it('能够创建 provider 实例', async () => {
+      const config: ProviderConfig = {
+        id: 'test-create-provider',
+        name: 'Test Create Provider',
+        creator: vi.fn(() => ({ name: 'test-created' })),
+        supportsImageGeneration: false
+      }
+
+      // 先注册配置
+      registerProviderConfig(config)
+
+      // 创建 provider 实例
+      const provider = await createProvider('test-create-provider', { apiKey: 'test' })
+      expect(provider).toBeDefined()
+      expect(config.creator).toHaveBeenCalledWith({ apiKey: 'test' })
+    })
+
+    it('能够注册 provider 到全局管理器', () => {
+      const mockProvider = { name: 'mock-provider' }
+      const config: ProviderConfig = {
+        id: 'test-register-provider',
+        name: 'Test Register Provider',
+        creator: vi.fn(() => mockProvider),
+        supportsImageGeneration: false
+      }
+
+      // 先注册配置
+      registerProviderConfig(config)
+
+      // 注册 provider 到全局管理器
+      const success = registerProvider('test-register-provider', mockProvider)
+      expect(success).toBe(true)
+
+      // 验证注册成功
+      const registeredProviders = getInitializedProviders()
+      expect(registeredProviders).toContain('test-register-provider')
+      expect(hasInitializedProviders()).toBe(true)
+    })
+
+    it('能够一步完成创建和注册', async () => {
+      const config: ProviderConfig = {
+        id: 'test-create-and-register',
+        name: 'Test Create and Register',
+        creator: vi.fn(() => ({ name: 'test-both' })),
+        supportsImageGeneration: false
+      }
+
+      // 先注册配置
+      registerProviderConfig(config)
+
+      // 一步完成创建和注册
+      const success = await createAndRegisterProvider('test-create-and-register', { apiKey: 'test' })
+      expect(success).toBe(true)
+
+      // 验证注册成功
+      const registeredProviders = getInitializedProviders()
+      expect(registeredProviders).toContain('test-create-and-register')
+    })
+  })
+
+  describe('Registry 管理', () => {
+    it('能够清理所有配置和注册的 providers', () => {
+      // 注册一些配置
+      registerProviderConfig({
+        id: 'temp-provider',
+        name: 'Temp Provider',
+        creator: vi.fn(() => ({ name: 'temp' })),
+        supportsImageGeneration: false
+      })
+
+      expect(hasProviderConfig('temp-provider')).toBe(true)
+
+      // 清理
+      cleanup()
+
+      expect(hasProviderConfig('temp-provider')).toBe(false)
+      // 但基础配置应该重新加载
+      expect(hasProviderConfig('openai')).toBe(true) // 基础 providers 会重新初始化
+    })
+
+    it('能够单独清理已注册的 providers', () => {
+      // 清理所有 providers
+      clearAllProviders()
+
+      expect(getInitializedProviders()).toEqual([])
+      expect(hasInitializedProviders()).toBe(false)
+    })
+
+    it('ProviderInitializationError 错误类工作正常', () => {
+      const error = new ProviderInitializationError('Test error', 'test-provider')
+      expect(error.message).toBe('Test error')
+      expect(error.providerId).toBe('test-provider')
+      expect(error.name).toBe('ProviderInitializationError')
+    })
+  })
+
+  describe('错误处理', () => {
+    it('优雅处理空配置', () => {
+      const success = registerProviderConfig(null as any)
+      expect(success).toBe(false)
+    })
+
+    it('优雅处理未定义配置', () => {
+      const success = registerProviderConfig(undefined as any)
+      expect(success).toBe(false)
+    })
+
+    it('处理空字符串 ID', () => {
+      const config = {
+        id: '',
+        name: 'Empty ID Provider',
+        creator: vi.fn(() => ({ name: 'empty' })),
+        supportsImageGeneration: false
+      }
+
+      const success = registerProviderConfig(config)
+      expect(success).toBe(false)
+    })
+
+    it('处理创建不存在配置的 provider', async () => {
+      await expect(createProvider('non-existent-provider', {})).rejects.toThrow(
+        'ProviderConfig not found for id: non-existent-provider'
+      )
+    })
+
+    it('处理注册不存在配置的 provider', () => {
+      const mockProvider = { name: 'mock' }
+      const success = registerProvider('non-existent-provider', mockProvider)
+      expect(success).toBe(false)
+    })
+
+    it('处理获取不存在配置的情况', () => {
+      expect(getProviderConfig('non-existent')).toBeUndefined()
+      expect(getProviderConfigByAlias('non-existent-alias')).toBeUndefined()
+      expect(hasProviderConfig('non-existent')).toBe(false)
+      expect(hasProviderConfigByAlias('non-existent-alias')).toBe(false)
+    })
+
+    it('处理批量注册时的部分失败', () => {
+      const mixedConfigs: ProviderConfig[] = [
+        {
+          id: 'valid-provider-1',
+          name: 'Valid Provider 1',
+          creator: vi.fn(() => ({ name: 'valid-1' })),
+          supportsImageGeneration: false
+        },
+        {
+          id: '', // 无效配置
+          name: 'Invalid Provider',
+          creator: vi.fn(() => ({ name: 'invalid' })),
+          supportsImageGeneration: false
+        } as any,
+        {
+          id: 'valid-provider-2',
+          name: 'Valid Provider 2',
+          creator: vi.fn(() => ({ name: 'valid-2' })),
+          supportsImageGeneration: true
+        }
+      ]
+
+      const successCount = registerMultipleProviderConfigs(mixedConfigs)
+      expect(successCount).toBe(2) // 只有两个有效配置成功
+
+      expect(hasProviderConfig('valid-provider-1')).toBe(true)
+      expect(hasProviderConfig('valid-provider-2')).toBe(true)
+      expect(hasProviderConfig('')).toBe(false)
+    })
+
+    it('处理动态导入失败的情况', async () => {
+      const config: ProviderConfig = {
+        id: 'import-test-provider',
+        name: 'Import Test Provider',
+        import: vi.fn().mockRejectedValue(new Error('Import failed')),
+        creatorFunctionName: 'createTest',
+        supportsImageGeneration: false
+      }
+
+      registerProviderConfig(config)
+
+      await expect(createProvider('import-test-provider', {})).rejects.toThrow('Import failed')
+    })
+  })
+
+  describe('集成测试', () => {
+    it('正确处理复杂的配置、创建、注册和清理场景', async () => {
+      // 初始状态验证
+      const initialConfigs = getAllProviderConfigs()
+      expect(initialConfigs.length).toBeGreaterThan(0) // 有基础配置
+      expect(getInitializedProviders()).toEqual([])
+
+      // 注册多个带别名的 provider 配置
+      const configs: ProviderConfig[] = [
+        {
+          id: 'integration-provider-1',
+          name: 'Integration Provider 1',
+          creator: vi.fn(() => ({ name: 'integration-1' })),
+          supportsImageGeneration: false,
+          aliases: ['alias-1', 'short-name-1']
+        },
+        {
+          id: 'integration-provider-2',
+          name: 'Integration Provider 2',
+          creator: vi.fn(() => ({ name: 'integration-2' })),
+          supportsImageGeneration: true,
+          aliases: ['alias-2', 'short-name-2']
+        }
+      ]
+
+      const successCount = registerMultipleProviderConfigs(configs)
+      expect(successCount).toBe(2)
+
+      // 验证配置注册成功
+      expect(hasProviderConfig('integration-provider-1')).toBe(true)
+      expect(hasProviderConfig('integration-provider-2')).toBe(true)
+      expect(hasProviderConfigByAlias('alias-1')).toBe(true)
+      expect(hasProviderConfigByAlias('alias-2')).toBe(true)
+
+      // 验证别名映射
+      const aliases = getAllProviderConfigAliases()
+      expect(aliases['alias-1']).toBe('integration-provider-1')
+      expect(aliases['alias-2']).toBe('integration-provider-2')
+
+      // 创建和注册 providers
+      const success1 = await createAndRegisterProvider('integration-provider-1', { apiKey: 'test1' })
+      const success2 = await createAndRegisterProvider('integration-provider-2', { apiKey: 'test2' })
+      expect(success1).toBe(true)
+      expect(success2).toBe(true)
+
+      // 验证注册成功
+      const registeredProviders = getInitializedProviders()
+      expect(registeredProviders).toContain('integration-provider-1')
+      expect(registeredProviders).toContain('integration-provider-2')
+      expect(hasInitializedProviders()).toBe(true)
+
+      // 清理
+      cleanup()
+
+      // 验证清理后的状态
+      expect(getInitializedProviders()).toEqual([])
+      expect(hasProviderConfig('integration-provider-1')).toBe(false)
+      expect(hasProviderConfig('integration-provider-2')).toBe(false)
+      expect(getAllProviderConfigAliases()).toEqual({})
+
+      // 基础配置应该重新加载
+      expect(hasProviderConfig('openai')).toBe(true)
+    })
+
+    it('正确处理动态导入配置的 provider', async () => {
+      const mockModule = { createCustomProvider: vi.fn(() => ({ name: 'custom-dynamic' })) }
+      const dynamicImportConfig: ProviderConfig = {
+        id: 'dynamic-import-provider',
+        name: 'Dynamic Import Provider',
+        import: vi.fn().mockResolvedValue(mockModule),
+        creatorFunctionName: 'createCustomProvider',
+        supportsImageGeneration: false
+      }
+
+      // 注册配置
+      const configSuccess = registerProviderConfig(dynamicImportConfig)
+      expect(configSuccess).toBe(true)
+
+      // 创建和注册 provider
+      const registerSuccess = await createAndRegisterProvider('dynamic-import-provider', { apiKey: 'test' })
+      expect(registerSuccess).toBe(true)
+
+      // 验证导入函数被调用
+      expect(dynamicImportConfig.import).toHaveBeenCalled()
+      expect(mockModule.createCustomProvider).toHaveBeenCalledWith({ apiKey: 'test' })
+
+      // 验证注册成功
+      expect(getInitializedProviders()).toContain('dynamic-import-provider')
+    })
+
+    it('正确处理大量配置的注册和管理', () => {
+      const largeConfigList: ProviderConfig[] = []
+
+      // 生成50个配置
+      for (let i = 0; i < 50; i++) {
+        largeConfigList.push({
+          id: `bulk-provider-${i}`,
+          name: `Bulk Provider ${i}`,
+          creator: vi.fn(() => ({ name: `bulk-${i}` })),
+          supportsImageGeneration: i % 2 === 0, // 偶数支持图像生成
+          aliases: [`alias-${i}`, `short-${i}`]
+        })
+      }
+
+      const successCount = registerMultipleProviderConfigs(largeConfigList)
+      expect(successCount).toBe(50)
+
+      // 验证所有配置都被正确注册
+      const allConfigs = getAllProviderConfigs()
+      expect(allConfigs.filter((config) => config.id.startsWith('bulk-provider-')).length).toBe(50)
+
+      // 验证别名数量
+      const aliases = getAllProviderConfigAliases()
+      const bulkAliases = Object.keys(aliases).filter(
+        (alias) => alias.startsWith('alias-') || alias.startsWith('short-')
+      )
+      expect(bulkAliases.length).toBe(100) // 每个 provider 有2个别名
+
+      // 随机验证几个配置
+      expect(hasProviderConfig('bulk-provider-0')).toBe(true)
+      expect(hasProviderConfig('bulk-provider-25')).toBe(true)
+      expect(hasProviderConfig('bulk-provider-49')).toBe(true)
+
+      // 验证别名工作正常
+      expect(resolveProviderConfigId('alias-25')).toBe('bulk-provider-25')
+      expect(isProviderConfigAlias('short-30')).toBe(true)
+
+      // 清理能正确处理大量数据
+      cleanup()
+      const cleanupAliases = getAllProviderConfigAliases()
+      expect(
+        Object.keys(cleanupAliases).filter((alias) => alias.startsWith('alias-') || alias.startsWith('short-'))
+      ).toEqual([])
+    })
+  })
+
+  describe('边界测试', () => {
+    it('处理包含特殊字符的 provider IDs', () => {
+      const specialCharsConfigs: ProviderConfig[] = [
+        {
+          id: 'provider-with-dashes',
+          name: 'Provider With Dashes',
+          creator: vi.fn(() => ({ name: 'dashes' })),
+          supportsImageGeneration: false
+        },
+        {
+          id: 'provider_with_underscores',
+          name: 'Provider With Underscores',
+          creator: vi.fn(() => ({ name: 'underscores' })),
+          supportsImageGeneration: false
+        },
+        {
+          id: 'provider.with.dots',
+          name: 'Provider With Dots',
+          creator: vi.fn(() => ({ name: 'dots' })),
+          supportsImageGeneration: false
+        }
+      ]
+
+      const successCount = registerMultipleProviderConfigs(specialCharsConfigs)
+      expect(successCount).toBeGreaterThan(0) // 至少有一些成功
+
+      // 验证支持的特殊字符格式
+      if (hasProviderConfig('provider-with-dashes')) {
+        expect(getProviderConfig('provider-with-dashes')).toBeDefined()
+      }
+      if (hasProviderConfig('provider_with_underscores')) {
+        expect(getProviderConfig('provider_with_underscores')).toBeDefined()
+      }
+    })
+
+    it('处理空的批量注册', () => {
+      const successCount = registerMultipleProviderConfigs([])
+      expect(successCount).toBe(0)
+
+      // 确保没有额外的配置被添加
+      const configsBefore = getAllProviderConfigs().length
+      expect(configsBefore).toBeGreaterThan(0) // 应该有基础配置
+    })
+
+    it('处理重复的配置注册', () => {
+      const config: ProviderConfig = {
+        id: 'duplicate-test-provider',
+        name: 'Duplicate Test Provider',
+        creator: vi.fn(() => ({ name: 'duplicate' })),
+        supportsImageGeneration: false
+      }
+
+      // 第一次注册成功
+      expect(registerProviderConfig(config)).toBe(true)
+      expect(hasProviderConfig('duplicate-test-provider')).toBe(true)
+
+      // 重复注册相同的配置（允许覆盖）
+      const updatedConfig: ProviderConfig = {
+        ...config,
+        name: 'Updated Duplicate Test Provider'
+      }
+      expect(registerProviderConfig(updatedConfig)).toBe(true)
+      expect(hasProviderConfig('duplicate-test-provider')).toBe(true)
+
+      // 验证配置被更新
+      const retrievedConfig = getProviderConfig('duplicate-test-provider')
+      expect(retrievedConfig?.name).toBe('Updated Duplicate Test Provider')
+    })
+
+    it('处理极长的 ID 和名称', () => {
+      const longId = 'very-long-provider-id-' + 'x'.repeat(100)
+      const longName = 'Very Long Provider Name ' + 'Y'.repeat(100)
+
+      const config: ProviderConfig = {
+        id: longId,
+        name: longName,
+        creator: vi.fn(() => ({ name: 'long-test' })),
+        supportsImageGeneration: false
+      }
+
+      const success = registerProviderConfig(config)
+      expect(success).toBe(true)
+      expect(hasProviderConfig(longId)).toBe(true)
+
+      const retrievedConfig = getProviderConfig(longId)
+      expect(retrievedConfig?.name).toBe(longName)
+    })
+
+    it('处理大量别名的配置', () => {
+      const manyAliases = Array.from({ length: 50 }, (_, i) => `alias-${i}`)
+
+      const config: ProviderConfig = {
+        id: 'provider-with-many-aliases',
+        name: 'Provider With Many Aliases',
+        creator: vi.fn(() => ({ name: 'many-aliases' })),
+        supportsImageGeneration: false,
+        aliases: manyAliases
+      }
+
+      const success = registerProviderConfig(config)
+      expect(success).toBe(true)
+
+      // 验证所有别名都能正确解析
+      manyAliases.forEach((alias) => {
+        expect(hasProviderConfigByAlias(alias)).toBe(true)
+        expect(resolveProviderConfigId(alias)).toBe('provider-with-many-aliases')
+        expect(isProviderConfigAlias(alias)).toBe(true)
+      })
+    })
+  })
+})

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

@@ -0,0 +1,264 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import {
+  type BaseProviderId,
+  baseProviderIds,
+  baseProviderIdSchema,
+  baseProviders,
+  type CustomProviderId,
+  customProviderIdSchema,
+  providerConfigSchema,
+  type ProviderId,
+  providerIdSchema
+} from '../schemas'
+
+describe('Provider Schemas', () => {
+  describe('baseProviders', () => {
+    it('包含所有预期的基础 providers', () => {
+      expect(baseProviders).toBeDefined()
+      expect(Array.isArray(baseProviders)).toBe(true)
+      expect(baseProviders.length).toBeGreaterThan(0)
+
+      const expectedIds = [
+        'openai',
+        'openai-responses',
+        'openai-compatible',
+        'anthropic',
+        'google',
+        'xai',
+        'azure',
+        'deepseek'
+      ]
+      const actualIds = baseProviders.map((p) => p.id)
+      expectedIds.forEach((id) => {
+        expect(actualIds).toContain(id)
+      })
+    })
+
+    it('每个基础 provider 有必要的属性', () => {
+      baseProviders.forEach((provider) => {
+        expect(provider).toHaveProperty('id')
+        expect(provider).toHaveProperty('name')
+        expect(provider).toHaveProperty('creator')
+        expect(provider).toHaveProperty('supportsImageGeneration')
+
+        expect(typeof provider.id).toBe('string')
+        expect(typeof provider.name).toBe('string')
+        expect(typeof provider.creator).toBe('function')
+        expect(typeof provider.supportsImageGeneration).toBe('boolean')
+      })
+    })
+
+    it('provider ID 是唯一的', () => {
+      const ids = baseProviders.map((p) => p.id)
+      const uniqueIds = [...new Set(ids)]
+      expect(ids).toEqual(uniqueIds)
+    })
+  })
+
+  describe('baseProviderIds', () => {
+    it('正确提取所有基础 provider IDs', () => {
+      expect(baseProviderIds).toBeDefined()
+      expect(Array.isArray(baseProviderIds)).toBe(true)
+      expect(baseProviderIds.length).toBe(baseProviders.length)
+
+      baseProviders.forEach((provider) => {
+        expect(baseProviderIds).toContain(provider.id)
+      })
+    })
+  })
+
+  describe('baseProviderIdSchema', () => {
+    it('验证有效的基础 provider IDs', () => {
+      baseProviderIds.forEach((id) => {
+        expect(baseProviderIdSchema.safeParse(id).success).toBe(true)
+      })
+    })
+
+    it('拒绝无效的基础 provider IDs', () => {
+      const invalidIds = ['invalid', 'not-exists', '']
+      invalidIds.forEach((id) => {
+        expect(baseProviderIdSchema.safeParse(id).success).toBe(false)
+      })
+    })
+  })
+
+  describe('customProviderIdSchema', () => {
+    it('接受有效的自定义 provider IDs', () => {
+      const validIds = ['custom-provider', 'my-ai-service', 'company-llm-v2']
+      validIds.forEach((id) => {
+        expect(customProviderIdSchema.safeParse(id).success).toBe(true)
+      })
+    })
+
+    it('拒绝与基础 provider IDs 冲突的 IDs', () => {
+      baseProviderIds.forEach((id) => {
+        expect(customProviderIdSchema.safeParse(id).success).toBe(false)
+      })
+    })
+
+    it('拒绝空字符串', () => {
+      expect(customProviderIdSchema.safeParse('').success).toBe(false)
+    })
+  })
+
+  describe('providerIdSchema', () => {
+    it('接受基础 provider IDs', () => {
+      baseProviderIds.forEach((id) => {
+        expect(providerIdSchema.safeParse(id).success).toBe(true)
+      })
+    })
+
+    it('接受有效的自定义 provider IDs', () => {
+      const validCustomIds = ['custom-provider', 'my-ai-service']
+      validCustomIds.forEach((id) => {
+        expect(providerIdSchema.safeParse(id).success).toBe(true)
+      })
+    })
+
+    it('拒绝无效的 IDs', () => {
+      const invalidIds = ['', undefined, null, 123]
+      invalidIds.forEach((id) => {
+        expect(providerIdSchema.safeParse(id).success).toBe(false)
+      })
+    })
+  })
+
+  describe('providerConfigSchema', () => {
+    it('验证带有 creator 的有效配置', () => {
+      const validConfig = {
+        id: 'custom-provider',
+        name: 'Custom Provider',
+        creator: vi.fn(),
+        supportsImageGeneration: true
+      }
+      expect(providerConfigSchema.safeParse(validConfig).success).toBe(true)
+    })
+
+    it('验证带有 import 配置的有效配置', () => {
+      const validConfig = {
+        id: 'custom-provider',
+        name: 'Custom Provider',
+        import: vi.fn(),
+        creatorFunctionName: 'createCustom',
+        supportsImageGeneration: false
+      }
+      expect(providerConfigSchema.safeParse(validConfig).success).toBe(true)
+    })
+
+    it('拒绝既没有 creator 也没有 import 配置的配置', () => {
+      const invalidConfig = {
+        id: 'invalid',
+        name: 'Invalid Provider',
+        supportsImageGeneration: false
+      }
+      expect(providerConfigSchema.safeParse(invalidConfig).success).toBe(false)
+    })
+
+    it('为 supportsImageGeneration 设置默认值', () => {
+      const config = {
+        id: 'test',
+        name: 'Test',
+        creator: vi.fn()
+      }
+      const result = providerConfigSchema.safeParse(config)
+      expect(result.success).toBe(true)
+      if (result.success) {
+        expect(result.data.supportsImageGeneration).toBe(false)
+      }
+    })
+
+    it('拒绝使用基础 provider ID 的配置', () => {
+      const invalidConfig = {
+        id: 'openai', // 基础 provider ID
+        name: 'Should Fail',
+        creator: vi.fn()
+      }
+      expect(providerConfigSchema.safeParse(invalidConfig).success).toBe(false)
+    })
+
+    it('拒绝缺少必需字段的配置', () => {
+      const invalidConfigs = [
+        { name: 'Missing ID', creator: vi.fn() },
+        { id: 'missing-name', creator: vi.fn() },
+        { id: '', name: 'Empty ID', creator: vi.fn() },
+        { id: 'valid-custom', name: '', creator: vi.fn() }
+      ]
+
+      invalidConfigs.forEach((config) => {
+        expect(providerConfigSchema.safeParse(config).success).toBe(false)
+      })
+    })
+  })
+
+  describe('Schema 验证功能', () => {
+    it('baseProviderIdSchema 正确验证基础 provider IDs', () => {
+      baseProviderIds.forEach((id) => {
+        expect(baseProviderIdSchema.safeParse(id).success).toBe(true)
+      })
+
+      expect(baseProviderIdSchema.safeParse('invalid-id').success).toBe(false)
+    })
+
+    it('customProviderIdSchema 正确验证自定义 provider IDs', () => {
+      const customIds = ['custom-provider', 'my-service', 'company-llm']
+      customIds.forEach((id) => {
+        expect(customProviderIdSchema.safeParse(id).success).toBe(true)
+      })
+
+      // 拒绝基础 provider IDs
+      baseProviderIds.forEach((id) => {
+        expect(customProviderIdSchema.safeParse(id).success).toBe(false)
+      })
+    })
+
+    it('providerIdSchema 接受基础和自定义 provider IDs', () => {
+      // 基础 IDs
+      baseProviderIds.forEach((id) => {
+        expect(providerIdSchema.safeParse(id).success).toBe(true)
+      })
+
+      // 自定义 IDs
+      const customIds = ['custom-provider', 'my-service']
+      customIds.forEach((id) => {
+        expect(providerIdSchema.safeParse(id).success).toBe(true)
+      })
+    })
+
+    it('providerConfigSchema 验证完整的 provider 配置', () => {
+      const validConfig = {
+        id: 'custom-provider',
+        name: 'Custom Provider',
+        creator: vi.fn(),
+        supportsImageGeneration: true
+      }
+      expect(providerConfigSchema.safeParse(validConfig).success).toBe(true)
+
+      const invalidConfig = {
+        id: 'openai', // 不允许基础 provider ID
+        name: 'OpenAI',
+        creator: vi.fn()
+      }
+      expect(providerConfigSchema.safeParse(invalidConfig).success).toBe(false)
+    })
+  })
+
+  describe('类型推导', () => {
+    it('BaseProviderId 类型正确', () => {
+      const id: BaseProviderId = 'openai'
+      expect(baseProviderIds).toContain(id)
+    })
+
+    it('CustomProviderId 类型是字符串', () => {
+      const id: CustomProviderId = 'custom-provider'
+      expect(typeof id).toBe('string')
+    })
+
+    it('ProviderId 类型支持基础和自定义 IDs', () => {
+      const baseId: ProviderId = 'openai'
+      const customId: ProviderId = 'custom-provider'
+      expect(typeof baseId).toBe('string')
+      expect(typeof customId).toBe('string')
+    })
+  })
+})

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

@@ -0,0 +1,291 @@
+/**
+ * AI Provider 配置工厂
+ * 提供类型安全的 Provider 配置构建器
+ */
+
+import type { ProviderId, ProviderSettingsMap } from './types'
+
+/**
+ * 通用配置基础类型，包含所有 Provider 共有的属性
+ */
+export interface BaseProviderConfig {
+  apiKey?: string
+  baseURL?: string
+  timeout?: number
+  headers?: Record<string, string>
+  fetch?: typeof globalThis.fetch
+}
+
+/**
+ * 完整的配置类型，结合基础配置、AI SDK 配置和特定 Provider 配置
+ */
+type CompleteProviderConfig<T extends ProviderId> = BaseProviderConfig & Partial<ProviderSettingsMap[T]>
+
+type ConfigHandler<T extends ProviderId> = (
+  builder: ProviderConfigBuilder<T>,
+  provider: CompleteProviderConfig<T>
+) => void
+
+const configHandlers: {
+  [K in ProviderId]?: ConfigHandler<K>
+} = {
+  azure: (builder, provider) => {
+    const azureBuilder = builder as ProviderConfigBuilder<'azure'>
+    const azureProvider = provider as CompleteProviderConfig<'azure'>
+    azureBuilder.withAzureConfig({
+      apiVersion: azureProvider.apiVersion,
+      resourceName: azureProvider.resourceName
+    })
+  }
+}
+
+export class ProviderConfigBuilder<T extends ProviderId = ProviderId> {
+  private config: CompleteProviderConfig<T> = {} as CompleteProviderConfig<T>
+
+  constructor(private providerId: T) {}
+
+  /**
+   * 设置 API Key
+   */
+  withApiKey(apiKey: string): this
+  withApiKey(apiKey: string, options: T extends 'openai' ? { organization?: string; project?: string } : never): this
+  withApiKey(apiKey: string, options?: any): this {
+    this.config.apiKey = apiKey
+
+    // 类型安全的 OpenAI 特定配置
+    if (this.providerId === 'openai' && options) {
+      const openaiConfig = this.config as CompleteProviderConfig<'openai'>
+      if (options.organization) {
+        openaiConfig.organization = options.organization
+      }
+      if (options.project) {
+        openaiConfig.project = options.project
+      }
+    }
+
+    return this
+  }
+
+  /**
+   * 设置基础 URL
+   */
+  withBaseURL(baseURL: string) {
+    this.config.baseURL = baseURL
+    return this
+  }
+
+  /**
+   * 设置请求配置
+   */
+  withRequestConfig(options: { headers?: Record<string, string>; fetch?: typeof fetch }): this {
+    if (options.headers) {
+      this.config.headers = { ...this.config.headers, ...options.headers }
+    }
+    if (options.fetch) {
+      this.config.fetch = options.fetch
+    }
+    return this
+  }
+
+  /**
+   * Azure OpenAI 特定配置
+   */
+  withAzureConfig(options: { apiVersion?: string; resourceName?: string }): T extends 'azure' ? this : never
+  withAzureConfig(options: any): any {
+    if (this.providerId === 'azure') {
+      const azureConfig = this.config as CompleteProviderConfig<'azure'>
+      if (options.apiVersion) {
+        azureConfig.apiVersion = options.apiVersion
+      }
+      if (options.resourceName) {
+        azureConfig.resourceName = options.resourceName
+      }
+    }
+    return this
+  }
+
+  /**
+   * 设置自定义参数
+   */
+  withCustomParams(params: Record<string, any>) {
+    Object.assign(this.config, params)
+    return this
+  }
+
+  /**
+   * 构建最终配置
+   */
+  build(): ProviderSettingsMap[T] {
+    return this.config as ProviderSettingsMap[T]
+  }
+}
+
+/**
+ * Provider 配置工厂
+ * 提供便捷的配置创建方法
+ */
+export class ProviderConfigFactory {
+  /**
+   * 创建配置构建器
+   */
+  static builder<T extends ProviderId>(providerId: T): ProviderConfigBuilder<T> {
+    return new ProviderConfigBuilder(providerId)
+  }
+
+  /**
+   * 从通用Provider对象创建配置 - 使用更优雅的处理器模式
+   */
+  static fromProvider<T extends ProviderId>(
+    providerId: T,
+    provider: CompleteProviderConfig<T>,
+    options?: {
+      headers?: Record<string, string>
+      [key: string]: any
+    }
+  ): ProviderSettingsMap[T] {
+    const builder = new ProviderConfigBuilder<T>(providerId)
+
+    // 设置基本配置
+    if (provider.apiKey) {
+      builder.withApiKey(provider.apiKey)
+    }
+
+    if (provider.baseURL) {
+      builder.withBaseURL(provider.baseURL)
+    }
+
+    // 设置请求配置
+    if (options?.headers) {
+      builder.withRequestConfig({
+        headers: options.headers
+      })
+    }
+
+    // 使用配置处理器模式 - 更加优雅和可扩展
+    const handler = configHandlers[providerId]
+    if (handler) {
+      handler(builder, provider)
+    }
+
+    // 添加其他自定义参数
+    if (options) {
+      const customOptions = { ...options }
+      delete customOptions.headers // 已经处理过了
+      if (Object.keys(customOptions).length > 0) {
+        builder.withCustomParams(customOptions)
+      }
+    }
+
+    return builder.build()
+  }
+
+  /**
+   * 快速创建 OpenAI 配置
+   */
+  static createOpenAI(
+    apiKey: string,
+    options?: {
+      baseURL?: string
+      organization?: string
+      project?: string
+    }
+  ) {
+    const builder = this.builder('openai')
+
+    // 使用类型安全的重载
+    if (options?.organization || options?.project) {
+      builder.withApiKey(apiKey, {
+        organization: options.organization,
+        project: options.project
+      })
+    } else {
+      builder.withApiKey(apiKey)
+    }
+
+    return builder.withBaseURL(options?.baseURL || 'https://api.openai.com').build()
+  }
+
+  /**
+   * 快速创建 Anthropic 配置
+   */
+  static createAnthropic(
+    apiKey: string,
+    options?: {
+      baseURL?: string
+    }
+  ) {
+    return this.builder('anthropic')
+      .withApiKey(apiKey)
+      .withBaseURL(options?.baseURL || 'https://api.anthropic.com')
+      .build()
+  }
+
+  /**
+   * 快速创建 Azure OpenAI 配置
+   */
+  static createAzureOpenAI(
+    apiKey: string,
+    options: {
+      baseURL: string
+      apiVersion?: string
+      resourceName?: string
+    }
+  ) {
+    return this.builder('azure')
+      .withApiKey(apiKey)
+      .withBaseURL(options.baseURL)
+      .withAzureConfig({
+        apiVersion: options.apiVersion,
+        resourceName: options.resourceName
+      })
+      .build()
+  }
+
+  /**
+   * 快速创建 Google 配置
+   */
+  static createGoogle(
+    apiKey: string,
+    options?: {
+      baseURL?: string
+      projectId?: string
+      location?: string
+    }
+  ) {
+    return this.builder('google')
+      .withApiKey(apiKey)
+      .withBaseURL(options?.baseURL || 'https://generativelanguage.googleapis.com')
+      .build()
+  }
+
+  /**
+   * 快速创建 Vertex AI 配置
+   */
+  static createVertexAI() {
+    // credentials: {
+    //   clientEmail: string
+    //   privateKey: string
+    // },
+    // options?: {
+    //   project?: string
+    //   location?: string
+    // }
+    // return this.builder('google-vertex')
+    //   .withGoogleCredentials(credentials)
+    //   .withGoogleVertexConfig({
+    //     project: options?.project,
+    //     location: options?.location
+    //   })
+    //   .build()
+  }
+
+  static createOpenAICompatible(baseURL: string, apiKey: string) {
+    return this.builder('openai-compatible').withBaseURL(baseURL).withApiKey(apiKey).build()
+  }
+}
+
+/**
+ * 便捷的配置创建函数
+ */
+export const createProviderConfig = ProviderConfigFactory.fromProvider
+export const providerConfigBuilder = ProviderConfigFactory.builder

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

@@ -0,0 +1,83 @@
+/**
+ * Providers 模块统一导出 - 独立Provider包
+ */
+
+// ==================== 核心管理器 ====================
+
+// Provider 注册表管理器
+export { globalRegistryManagement, RegistryManagement } from './RegistryManagement'
+
+// Provider 核心功能
+export {
+  // 状态管理
+  cleanup,
+  clearAllProviders,
+  createAndRegisterProvider,
+  createProvider,
+  getAllProviderConfigAliases,
+  getAllProviderConfigs,
+  getImageModel,
+  // 工具函数
+  getInitializedProviders,
+  getLanguageModel,
+  getProviderConfig,
+  getProviderConfigByAlias,
+  getSupportedProviders,
+  getTextEmbeddingModel,
+  hasInitializedProviders,
+  // 工具函数
+  hasProviderConfig,
+  // 别名支持
+  hasProviderConfigByAlias,
+  isProviderConfigAlias,
+  // 错误类型
+  ProviderInitializationError,
+  // 全局访问
+  providerRegistry,
+  registerMultipleProviderConfigs,
+  registerProvider,
+  // 统一Provider系统
+  registerProviderConfig,
+  resolveProviderConfigId
+} from './registry'
+
+// ==================== 基础数据和类型 ====================
+
+// 基础Provider数据源
+export { baseProviderIds, baseProviders } from './schemas'
+
+// 类型定义和Schema
+export type {
+  BaseProviderId,
+  CustomProviderId,
+  DynamicProviderRegistration,
+  ProviderConfig,
+  ProviderId
+} from './schemas' // 从 schemas 导出的类型
+export { baseProviderIdSchema, customProviderIdSchema, providerConfigSchema, providerIdSchema } from './schemas' // Schema 导出
+export type {
+  DynamicProviderRegistry,
+  ExtensibleProviderSettingsMap,
+  ProviderError,
+  ProviderSettingsMap,
+  ProviderTypeRegistrar
+} from './types'
+
+// ==================== 工具函数 ====================
+
+// Provider配置工厂
+export {
+  type BaseProviderConfig,
+  createProviderConfig,
+  ProviderConfigBuilder,
+  providerConfigBuilder,
+  ProviderConfigFactory
+} from './factory'
+
+// 工具函数
+export { formatPrivateKey } from './utils'
+
+// ==================== 扩展功能 ====================
+
+// Hub Provider 功能
+export { createHubProvider, type HubProviderConfig, HubProviderError } from './HubProvider'

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

@@ -0,0 +1,320 @@
+/**
+ * Provider 初始化器
+ * 负责根据配置创建 providers 并注册到全局管理器
+ * 集成了来自 ModelCreator 的特殊处理逻辑
+ */
+
+import { customProvider } from 'ai'
+
+import { globalRegistryManagement } from './RegistryManagement'
+import { baseProviders, type ProviderConfig } from './schemas'
+
+/**
+ * Provider 初始化错误类型
+ */
+class ProviderInitializationError extends Error {
+  constructor(
+    message: string,
+    public providerId?: string,
+    public cause?: Error
+  ) {
+    super(message)
+    this.name = 'ProviderInitializationError'
+  }
+}
+
+// ==================== 全局管理器导出 ====================
+
+export { globalRegistryManagement as providerRegistry }
+
+// ==================== 便捷访问方法 ====================
+
+export const getLanguageModel = (id: string) => globalRegistryManagement.languageModel(id as any)
+export const getTextEmbeddingModel = (id: string) => globalRegistryManagement.textEmbeddingModel(id as any)
+export const getImageModel = (id: string) => globalRegistryManagement.imageModel(id as any)
+
+// ==================== 工具函数 ====================
+
+/**
+ * 获取支持的 Providers 列表
+ */
+export function getSupportedProviders(): Array<{
+  id: string
+  name: string
+}> {
+  return baseProviders.map((provider) => ({
+    id: provider.id,
+    name: provider.name
+  }))
+}
+
+/**
+ * 获取所有已初始化的 providers
+ */
+export function getInitializedProviders(): string[] {
+  return globalRegistryManagement.getRegisteredProviders()
+}
+
+/**
+ * 检查是否有任何已初始化的 providers
+ */
+export function hasInitializedProviders(): boolean {
+  return globalRegistryManagement.hasProviders()
+}
+
+// ==================== 统一Provider配置系统 ====================
+
+// 全局Provider配置存储
+const providerConfigs = new Map<string, ProviderConfig>()
+// 全局ProviderConfig别名映射 - 借鉴RegistryManagement模式
+const providerConfigAliases = new Map<string, string>() // alias -> realId
+
+/**
+ * 初始化内置配置 - 将baseProviders转换为统一格式
+ */
+function initializeBuiltInConfigs(): void {
+  baseProviders.forEach((provider) => {
+    const config: ProviderConfig = {
+      id: provider.id,
+      name: provider.name,
+      creator: provider.creator as any, // 类型转换以兼容多种creator签名
+      supportsImageGeneration: provider.supportsImageGeneration || false
+    }
+    providerConfigs.set(provider.id, config)
+  })
+}
+
+// 启动时自动注册内置配置
+initializeBuiltInConfigs()
+
+/**
+ * 步骤1: 注册Provider配置 - 仅存储配置，不执行创建
+ */
+export function registerProviderConfig(config: ProviderConfig): boolean {
+  try {
+    // 验证配置
+    if (!config || !config.id || !config.name) {
+      return false
+    }
+
+    // 检查是否与已有配置冲突（包括内置配置）
+    if (providerConfigs.has(config.id)) {
+      console.warn(`ProviderConfig "${config.id}" already exists, will override`)
+    }
+
+    // 存储配置（内置和用户配置统一处理）
+    providerConfigs.set(config.id, config)
+
+    //  处理别名
+    if (config.aliases && config.aliases.length > 0) {
+      config.aliases.forEach((alias) => {
+        if (providerConfigAliases.has(alias)) {
+          console.warn(`ProviderConfig alias "${alias}" already exists, will override`)
+        }
+        providerConfigAliases.set(alias, config.id)
+      })
+    }
+
+    return true
+  } catch (error) {
+    console.error(`Failed to register ProviderConfig:`, error)
+    return false
+  }
+}
+
+/**
+ * 步骤2: 创建Provider - 根据配置执行实际创建
+ */
+export async function createProvider(providerId: string, options: any): Promise<any> {
+  //  支持通过别名查找配置
+  const config = getProviderConfigByAlias(providerId)
+
+  if (!config) {
+    throw new Error(`ProviderConfig not found for id: ${providerId}`)
+  }
+
+  try {
+    let creator: (options: any) => any
+
+    if (config.creator) {
+      // 方式1: 直接执行 creator
+      creator = config.creator
+    } else if (config.import && config.creatorFunctionName) {
+      // 方式2: 动态导入并执行
+      const module = await config.import()
+      creator = (module as any)[config.creatorFunctionName]
+
+      if (!creator || typeof creator !== 'function') {
+        throw new Error(`Creator function "${config.creatorFunctionName}" not found in imported module`)
+      }
+    } else {
+      throw new Error('No valid creator method provided in ProviderConfig')
+    }
+
+    // 使用真实配置创建provider实例
+    return creator(options)
+  } catch (error) {
+    console.error(`Failed to create provider "${providerId}":`, error)
+    throw error
+  }
+}
+
+/**
+ * 步骤3: 注册Provider到全局管理器
+ */
+export function registerProvider(providerId: string, provider: any): boolean {
+  try {
+    const config = providerConfigs.get(providerId)
+    if (!config) {
+      console.error(`ProviderConfig not found for id: ${providerId}`)
+      return false
+    }
+
+    // 获取aliases配置
+    const aliases = config.aliases
+
+    // 处理特殊provider逻辑
+    if (providerId === 'openai') {
+      // 注册默认 openai
+      globalRegistryManagement.registerProvider(providerId, provider, aliases)
+
+      // 创建并注册 openai-chat 变体
+      const openaiChatProvider = customProvider({
+        fallbackProvider: {
+          ...provider,
+          languageModel: (modelId: string) => provider.chat(modelId)
+        }
+      })
+      globalRegistryManagement.registerProvider(`${providerId}-chat`, openaiChatProvider)
+    } else if (providerId === 'azure') {
+      globalRegistryManagement.registerProvider(`${providerId}-chat`, provider, aliases)
+      // 跟上面相反,creator产出的默认会调用chat
+      const azureResponsesProvider = customProvider({
+        fallbackProvider: {
+          ...provider,
+          languageModel: (modelId: string) => provider.responses(modelId)
+        }
+      })
+      globalRegistryManagement.registerProvider(providerId, azureResponsesProvider)
+    } else {
+      // 其他provider直接注册
+      globalRegistryManagement.registerProvider(providerId, provider, aliases)
+    }
+
+    return true
+  } catch (error) {
+    console.error(`Failed to register provider "${providerId}" to global registry:`, error)
+    return false
+  }
+}
+
+/**
+ * 便捷函数: 一次性完成创建+注册
+ */
+export async function createAndRegisterProvider(providerId: string, options: any): Promise<boolean> {
+  try {
+    // 步骤2: 创建provider
+    const provider = await createProvider(providerId, options)
+
+    // 步骤3: 注册到全局管理器
+    return registerProvider(providerId, provider)
+  } catch (error) {
+    console.error(`Failed to create and register provider "${providerId}":`, error)
+    return false
+  }
+}
+
+/**
+ * 批量注册Provider配置
+ */
+export function registerMultipleProviderConfigs(configs: ProviderConfig[]): number {
+  let successCount = 0
+  configs.forEach((config) => {
+    if (registerProviderConfig(config)) {
+      successCount++
+    }
+  })
+  return successCount
+}
+
+/**
+ * 检查是否有对应的Provider配置
+ */
+export function hasProviderConfig(providerId: string): boolean {
+  return providerConfigs.has(providerId)
+}
+
+/**
+ * 通过别名或ID检查是否有对应的Provider配置
+ */
+export function hasProviderConfigByAlias(aliasOrId: string): boolean {
+  const realId = resolveProviderConfigId(aliasOrId)
+  return providerConfigs.has(realId)
+}
+
+/**
+ * 获取所有Provider配置
+ */
+export function getAllProviderConfigs(): ProviderConfig[] {
+  return Array.from(providerConfigs.values())
+}
+
+/**
+ * 根据ID获取Provider配置
+ */
+export function getProviderConfig(providerId: string): ProviderConfig | undefined {
+  return providerConfigs.get(providerId)
+}
+
+/**
+ * 通过别名或ID获取Provider配置
+ */
+export function getProviderConfigByAlias(aliasOrId: string): ProviderConfig | undefined {
+  // 先检查是否为别名，如果是则解析为真实ID
+  const realId = providerConfigAliases.get(aliasOrId) || aliasOrId
+  return providerConfigs.get(realId)
+}
+
+/**
+ * 解析真实的ProviderConfig ID（去别名化）
+ */
+export function resolveProviderConfigId(aliasOrId: string): string {
+  return providerConfigAliases.get(aliasOrId) || aliasOrId
+}
+
+/**
+ * 检查是否为ProviderConfig别名
+ */
+export function isProviderConfigAlias(id: string): boolean {
+  return providerConfigAliases.has(id)
+}
+
+/**
+ * 获取所有ProviderConfig别名映射关系
+ */
+export function getAllProviderConfigAliases(): Record<string, string> {
+  const result: Record<string, string> = {}
+  providerConfigAliases.forEach((realId, alias) => {
+    result[alias] = realId
+  })
+  return result
+}
+
+/**
+ * 清理所有Provider配置和已注册的providers
+ */
+export function cleanup(): void {
+  providerConfigs.clear()
+  providerConfigAliases.clear() //  清理别名映射
+  globalRegistryManagement.clear()
+  // 重新初始化内置配置
+  initializeBuiltInConfigs()
+}
+
+export function clearAllProviders(): void {
+  globalRegistryManagement.clear()
+}
+
+// ==================== 导出错误类型 ====================
+
+export { ProviderInitializationError }

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

@@ -0,0 +1,178 @@
+/**
+ * Provider Config 定义
+ */
+
+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'
+
+/**
+ * 基础 Provider IDs
+ */
+export const baseProviderIds = [
+  'openai',
+  'openai-chat',
+  'openai-compatible',
+  'anthropic',
+  'google',
+  'xai',
+  'azure',
+  'azure-responses',
+  'deepseek'
+] as const
+
+/**
+ * 基础 Provider ID Schema
+ */
+export const baseProviderIdSchema = z.enum(baseProviderIds)
+
+/**
+ * 基础 Provider ID
+ */
+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()) as z.ZodType<(options: any) => Provider>,
+  supportsImageGeneration: z.boolean()
+})
+
+export type BaseProvider = z.infer<typeof baseProviderSchema>
+
+/**
+ * 基础 Providers 定义
+ * 作为唯一数据源，避免重复维护
+ */
+export const baseProviders = [
+  {
+    id: 'openai',
+    name: 'OpenAI',
+    creator: createOpenAI,
+    supportsImageGeneration: true
+  },
+  {
+    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
+  },
+  {
+    id: 'openai-compatible',
+    name: 'OpenAI Compatible',
+    creator: createOpenAICompatible,
+    supportsImageGeneration: true
+  },
+  {
+    id: 'anthropic',
+    name: 'Anthropic',
+    creator: createAnthropic,
+    supportsImageGeneration: false
+  },
+  {
+    id: 'google',
+    name: 'Google Generative AI',
+    creator: createGoogleGenerativeAI,
+    supportsImageGeneration: true
+  },
+  {
+    id: 'xai',
+    name: 'xAI (Grok)',
+    creator: createXai,
+    supportsImageGeneration: true
+  },
+  {
+    id: 'azure',
+    name: 'Azure OpenAI',
+    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',
+    creator: createDeepSeek,
+    supportsImageGeneration: false
+  }
+] as const satisfies BaseProvider[]
+
+/**
+ * 用户自定义 Provider ID Schema
+ * 允许任意字符串，但排除基础 provider IDs 以避免冲突
+ */
+export const customProviderIdSchema = z
+  .string()
+  .min(1)
+  .refine((id) => !baseProviderIds.includes(id as any), {
+    message: 'Custom provider ID cannot conflict with base provider IDs'
+  })
+
+/**
+ * Provider ID Schema - 支持基础和自定义
+ */
+export const providerIdSchema = z.union([baseProviderIdSchema, customProviderIdSchema])
+
+/**
+ * Provider 配置 Schema
+ * 用于Provider的配置验证
+ */
+export const providerConfigSchema = z
+  .object({
+    id: customProviderIdSchema, // 只允许自定义ID
+    name: z.string().min(1),
+    creator: z.function().optional(),
+    import: z.function().optional(),
+    creatorFunctionName: z.string().optional(),
+    supportsImageGeneration: z.boolean().default(false),
+    imageCreator: z.function().optional(),
+    validateOptions: z.function().optional(),
+    aliases: z.array(z.string()).optional()
+  })
+  .refine((data) => data.creator || (data.import && data.creatorFunctionName), {
+    message: 'Must provide either creator function or import configuration'
+  })
+
+/**
+ * Provider ID 类型 - 基于 zod schema 推导
+ */
+export type ProviderId = z.infer<typeof providerIdSchema>
+export type CustomProviderId = z.infer<typeof customProviderIdSchema>
+
+/**
+ * Provider 配置类型
+ */
+export type ProviderConfig = z.infer<typeof providerConfigSchema>
+
+/**
+ * 兼容性类型别名
+ * @deprecated 使用 ProviderConfig 替代
+ */
+export type DynamicProviderRegistration = ProviderConfig

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

@@ -0,0 +1,96 @@
+import { type AnthropicProviderSettings } from '@ai-sdk/anthropic'
+import { type AzureOpenAIProviderSettings } from '@ai-sdk/azure'
+import { type DeepSeekProviderSettings } from '@ai-sdk/deepseek'
+import { type GoogleGenerativeAIProviderSettings } from '@ai-sdk/google'
+import { type OpenAIProviderSettings } from '@ai-sdk/openai'
+import { type OpenAICompatibleProviderSettings } from '@ai-sdk/openai-compatible'
+import {
+  EmbeddingModelV2 as EmbeddingModel,
+  ImageModelV2 as ImageModel,
+  LanguageModelV2 as LanguageModel,
+  ProviderV2,
+  SpeechModelV2 as SpeechModel,
+  TranscriptionModelV2 as TranscriptionModel
+} from '@ai-sdk/provider'
+import { type XaiProviderSettings } from '@ai-sdk/xai'
+
+// 导入基于 Zod 的 ProviderId 类型
+import { type ProviderId as ZodProviderId } from './schemas'
+
+export interface ExtensibleProviderSettingsMap {
+  // 基础的静态providers
+  openai: OpenAIProviderSettings
+  'openai-responses': OpenAIProviderSettings
+  'openai-compatible': OpenAICompatibleProviderSettings
+  anthropic: AnthropicProviderSettings
+  google: GoogleGenerativeAIProviderSettings
+  xai: XaiProviderSettings
+  azure: AzureOpenAIProviderSettings
+  deepseek: DeepSeekProviderSettings
+}
+
+// 动态扩展的provider类型注册表
+export interface DynamicProviderRegistry {
+  [key: string]: any
+}
+
+// 合并基础和动态provider类型
+export type ProviderSettingsMap = ExtensibleProviderSettingsMap & DynamicProviderRegistry
+
+// 错误类型
+export class ProviderError extends Error {
+  constructor(
+    message: string,
+    public providerId: string,
+    public code?: string,
+    public cause?: Error
+  ) {
+    super(message)
+    this.name = 'ProviderError'
+  }
+}
+
+// 动态ProviderId类型 - 基于 Zod Schema，支持运行时扩展和验证
+export type ProviderId = ZodProviderId
+
+export interface ProviderTypeRegistrar {
+  registerProviderType<T extends string, S>(providerId: T, settingsType: S): void
+  getProviderSettings<T extends string>(providerId: T): any
+}
+
+// 重新导出所有类型供外部使用
+export type {
+  AnthropicProviderSettings,
+  AzureOpenAIProviderSettings,
+  DeepSeekProviderSettings,
+  GoogleGenerativeAIProviderSettings,
+  OpenAICompatibleProviderSettings,
+  OpenAIProviderSettings,
+  XaiProviderSettings
+}
+
+export type AiSdkModel = LanguageModel | ImageModel | EmbeddingModel<string> | TranscriptionModel | SpeechModel
+
+export type AiSdkModelType = 'text' | 'image' | 'embedding' | 'transcription' | 'speech'
+
+export const METHOD_MAP = {
+  text: 'languageModel',
+  image: 'imageModel',
+  embedding: 'textEmbeddingModel',
+  transcription: 'transcriptionModel',
+  speech: 'speechModel'
+} as const satisfies Record<AiSdkModelType, keyof ProviderV2>
+
+export type AiSdkModelMethodMap = Record<AiSdkModelType, keyof ProviderV2>
+
+export type AiSdkModelReturnMap = {
+  text: LanguageModel
+  image: ImageModel
+  embedding: EmbeddingModel<string>
+  transcription: TranscriptionModel
+  speech: SpeechModel
+}
+
+export type AiSdkMethodName<T extends AiSdkModelType> = (typeof METHOD_MAP)[T]
+
+export type AiSdkModelReturn<T extends AiSdkModelType> = AiSdkModelReturnMap[T]

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

@@ -0,0 +1,86 @@
+/**
+ * 格式化私钥，确保它包含正确的PEM头部和尾部
+ */
+export function formatPrivateKey(privateKey: string): string {
+  if (!privateKey || typeof privateKey !== 'string') {
+    throw new Error('Private key must be a non-empty string')
+  }
+
+  // 先处理 JSON 字符串中的转义换行符
+  const key = privateKey.replace(/\\n/g, '\n')
+
+  // 检查是否已经是正确格式的 PEM 私钥
+  const hasBeginMarker = key.includes('-----BEGIN PRIVATE KEY-----')
+  const hasEndMarker = key.includes('-----END PRIVATE KEY-----')
+
+  if (hasBeginMarker && hasEndMarker) {
+    // 已经是 PEM 格式，但可能格式不规范，重新格式化
+    return normalizePemFormat(key)
+  }
+
+  // 如果没有完整的 PEM 头尾，尝试重新构建
+  return reconstructPemKey(key)
+}
+
+/**
+ * 标准化 PEM 格式
+ */
+function normalizePemFormat(pemKey: string): string {
+  // 分离头部、内容和尾部
+  const lines = pemKey
+    .split('\n')
+    .map((line) => line.trim())
+    .filter((line) => line.length > 0)
+
+  let keyContent = ''
+  let foundBegin = false
+  let foundEnd = false
+
+  for (const line of lines) {
+    if (line === '-----BEGIN PRIVATE KEY-----') {
+      foundBegin = true
+      continue
+    }
+    if (line === '-----END PRIVATE KEY-----') {
+      foundEnd = true
+      break
+    }
+    if (foundBegin && !foundEnd) {
+      keyContent += line
+    }
+  }
+
+  if (!foundBegin || !foundEnd || !keyContent) {
+    throw new Error('Invalid PEM format: missing BEGIN/END markers or key content')
+  }
+
+  // 重新格式化为 64 字符一行
+  const formattedContent = keyContent.match(/.{1,64}/g)?.join('\n') || keyContent
+
+  return `-----BEGIN PRIVATE KEY-----\n${formattedContent}\n-----END PRIVATE KEY-----`
+}
+
+/**
+ * 重新构建 PEM 私钥
+ */
+function reconstructPemKey(key: string): string {
+  // 移除所有空白字符和可能存在的不完整头尾
+  let cleanKey = key.replace(/\s+/g, '')
+  cleanKey = cleanKey.replace(/-----BEGIN[^-]*-----/g, '')
+  cleanKey = cleanKey.replace(/-----END[^-]*-----/g, '')
+
+  // 确保私钥内容不为空
+  if (!cleanKey) {
+    throw new Error('Private key content is empty after cleaning')
+  }
+
+  // 验证是否是有效的 Base64 字符
+  if (!/^[A-Za-z0-9+/=]+$/.test(cleanKey)) {
+    throw new Error('Private key contains invalid characters (not valid Base64)')
+  }
+
+  // 格式化为 64 字符一行
+  const formattedKey = cleanKey.match(/.{1,64}/g)?.join('\n') || cleanKey
+
+  return `-----BEGIN PRIVATE KEY-----\n${formattedKey}\n-----END PRIVATE KEY-----`
+}

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

@@ -0,0 +1,523 @@
+import { ImageModelV2 } from '@ai-sdk/provider'
+import { experimental_generateImage as aiGenerateImage, NoImageGeneratedError } from 'ai'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { type AiPlugin } from '../../plugins'
+import { globalRegistryManagement } from '../../providers/RegistryManagement'
+import { ImageGenerationError, ImageModelResolutionError } from '../errors'
+import { RuntimeExecutor } from '../executor'
+
+// Mock dependencies
+vi.mock('ai', () => ({
+  experimental_generateImage: vi.fn(),
+  NoImageGeneratedError: class NoImageGeneratedError extends Error {
+    static isInstance = vi.fn()
+    constructor() {
+      super('No image generated')
+      this.name = 'NoImageGeneratedError'
+    }
+  }
+}))
+
+vi.mock('../../providers/RegistryManagement', () => ({
+  globalRegistryManagement: {
+    imageModel: vi.fn()
+  },
+  DEFAULT_SEPARATOR: '|'
+}))
+
+describe('RuntimeExecutor.generateImage', () => {
+  let executor: RuntimeExecutor<'openai'>
+  let mockImageModel: ImageModelV2
+  let mockGenerateImageResult: any
+
+  beforeEach(() => {
+    // Reset all mocks
+    vi.clearAllMocks()
+
+    // Create executor instance
+    executor = RuntimeExecutor.create('openai', {
+      apiKey: 'test-key'
+    })
+
+    // Mock image model
+    mockImageModel = {
+      modelId: 'dall-e-3',
+      provider: 'openai'
+    } as ImageModelV2
+
+    // Mock generateImage result
+    mockGenerateImageResult = {
+      image: {
+        base64: 'base64-encoded-image-data',
+        uint8Array: new Uint8Array([1, 2, 3]),
+        mediaType: 'image/png'
+      },
+      images: [
+        {
+          base64: 'base64-encoded-image-data',
+          uint8Array: new Uint8Array([1, 2, 3]),
+          mediaType: 'image/png'
+        }
+      ],
+      warnings: [],
+      providerMetadata: {
+        openai: {
+          images: [{ revisedPrompt: 'A detailed prompt' }]
+        }
+      },
+      responses: []
+    }
+
+    // Setup mocks to avoid "No providers registered" error
+    vi.mocked(globalRegistryManagement.imageModel).mockReturnValue(mockImageModel)
+    vi.mocked(aiGenerateImage).mockResolvedValue(mockGenerateImageResult)
+  })
+
+  describe('Basic functionality', () => {
+    it('should generate a single image with minimal parameters', async () => {
+      const result = await executor.generateImage({ model: 'dall-e-3', prompt: 'A futuristic cityscape at sunset' })
+
+      expect(globalRegistryManagement.imageModel).toHaveBeenCalledWith('openai|dall-e-3')
+
+      expect(aiGenerateImage).toHaveBeenCalledWith({
+        model: mockImageModel,
+        prompt: 'A futuristic cityscape at sunset'
+      })
+
+      expect(result).toEqual(mockGenerateImageResult)
+    })
+
+    it('should generate image with pre-created model', async () => {
+      const result = await executor.generateImage({
+        model: mockImageModel,
+        prompt: 'A beautiful landscape'
+      })
+
+      // Note: globalRegistryManagement.imageModel may still be called due to resolveImageModel logic
+      expect(aiGenerateImage).toHaveBeenCalledWith({
+        model: mockImageModel,
+        prompt: 'A beautiful landscape'
+      })
+
+      expect(result).toEqual(mockGenerateImageResult)
+    })
+
+    it('should support multiple images generation', async () => {
+      await executor.generateImage({ model: 'dall-e-3', prompt: 'A futuristic cityscape', n: 3 })
+
+      expect(aiGenerateImage).toHaveBeenCalledWith({
+        model: mockImageModel,
+        prompt: 'A futuristic cityscape',
+        n: 3
+      })
+    })
+
+    it('should support size specification', async () => {
+      await executor.generateImage({ model: 'dall-e-3', prompt: 'A beautiful sunset', size: '1024x1024' })
+
+      expect(aiGenerateImage).toHaveBeenCalledWith({
+        model: mockImageModel,
+        prompt: 'A beautiful sunset',
+        size: '1024x1024'
+      })
+    })
+
+    it('should support aspect ratio specification', async () => {
+      await executor.generateImage({ model: 'dall-e-3', prompt: 'A mountain landscape', aspectRatio: '16:9' })
+
+      expect(aiGenerateImage).toHaveBeenCalledWith({
+        model: mockImageModel,
+        prompt: 'A mountain landscape',
+        aspectRatio: '16:9'
+      })
+    })
+
+    it('should support seed for consistent output', async () => {
+      await executor.generateImage({ model: 'dall-e-3', prompt: 'A cat in space', seed: 1234567890 })
+
+      expect(aiGenerateImage).toHaveBeenCalledWith({
+        model: mockImageModel,
+        prompt: 'A cat in space',
+        seed: 1234567890
+      })
+    })
+
+    it('should support abort signal', async () => {
+      const abortController = new AbortController()
+
+      await executor.generateImage({ model: 'dall-e-3', prompt: 'A cityscape', abortSignal: abortController.signal })
+
+      expect(aiGenerateImage).toHaveBeenCalledWith({
+        model: mockImageModel,
+        prompt: 'A cityscape',
+        abortSignal: abortController.signal
+      })
+    })
+
+    it('should support provider-specific options', async () => {
+      await executor.generateImage({
+        model: 'dall-e-3',
+        prompt: 'A space station',
+        providerOptions: {
+          openai: {
+            quality: 'hd',
+            style: 'vivid'
+          }
+        }
+      })
+
+      expect(aiGenerateImage).toHaveBeenCalledWith({
+        model: mockImageModel,
+        prompt: 'A space station',
+        providerOptions: {
+          openai: {
+            quality: 'hd',
+            style: 'vivid'
+          }
+        }
+      })
+    })
+
+    it('should support custom headers', async () => {
+      await executor.generateImage({
+        model: 'dall-e-3',
+        prompt: 'A robot',
+        headers: {
+          'X-Custom-Header': 'test-value'
+        }
+      })
+
+      expect(aiGenerateImage).toHaveBeenCalledWith({
+        model: mockImageModel,
+        prompt: 'A robot',
+        headers: {
+          'X-Custom-Header': 'test-value'
+        }
+      })
+    })
+  })
+
+  describe('Plugin integration', () => {
+    it('should execute plugins in correct order', async () => {
+      const pluginCallOrder: string[] = []
+
+      const testPlugin: AiPlugin = {
+        name: 'test-plugin',
+        onRequestStart: vi.fn(async () => {
+          pluginCallOrder.push('onRequestStart')
+        }),
+        transformParams: vi.fn(async (params) => {
+          pluginCallOrder.push('transformParams')
+          return { ...params, size: '512x512' }
+        }),
+        transformResult: vi.fn(async (result) => {
+          pluginCallOrder.push('transformResult')
+          return { ...result, processed: true }
+        }),
+        onRequestEnd: vi.fn(async () => {
+          pluginCallOrder.push('onRequestEnd')
+        })
+      }
+
+      const executorWithPlugin = RuntimeExecutor.create(
+        'openai',
+        {
+          apiKey: 'test-key'
+        },
+        [testPlugin]
+      )
+
+      const result = await executorWithPlugin.generateImage({ model: 'dall-e-3', prompt: 'A test image' })
+
+      expect(pluginCallOrder).toEqual(['onRequestStart', 'transformParams', 'transformResult', 'onRequestEnd'])
+
+      expect(testPlugin.transformParams).toHaveBeenCalledWith(
+        { prompt: 'A test image' },
+        expect.objectContaining({
+          providerId: 'openai',
+          modelId: 'dall-e-3'
+        })
+      )
+
+      expect(aiGenerateImage).toHaveBeenCalledWith({
+        model: mockImageModel,
+        prompt: 'A test image',
+        size: '512x512' // Should be transformed by plugin
+      })
+
+      expect(result).toEqual({
+        ...mockGenerateImageResult,
+        processed: true // Should be transformed by plugin
+      })
+    })
+
+    it('should handle model resolution through plugins', async () => {
+      const customImageModel = {
+        modelId: 'custom-model',
+        provider: 'openai'
+      } as ImageModelV2
+
+      const modelResolutionPlugin: AiPlugin = {
+        name: 'model-resolver',
+        resolveModel: vi.fn(async () => customImageModel)
+      }
+
+      const executorWithPlugin = RuntimeExecutor.create(
+        'openai',
+        {
+          apiKey: 'test-key'
+        },
+        [modelResolutionPlugin]
+      )
+
+      await executorWithPlugin.generateImage({ model: 'dall-e-3', prompt: 'A test image' })
+
+      expect(modelResolutionPlugin.resolveModel).toHaveBeenCalledWith(
+        'dall-e-3',
+        expect.objectContaining({
+          providerId: 'openai',
+          modelId: 'dall-e-3'
+        })
+      )
+
+      expect(aiGenerateImage).toHaveBeenCalledWith({
+        model: customImageModel,
+        prompt: 'A test image'
+      })
+    })
+
+    it('should support recursive calls from plugins', async () => {
+      const recursivePlugin: AiPlugin = {
+        name: 'recursive-plugin',
+        transformParams: vi.fn(async (params, context) => {
+          if (!context.isRecursiveCall && params.prompt === 'original') {
+            // Make a recursive call with modified prompt
+            await context.recursiveCall({
+              model: 'dall-e-3',
+              prompt: 'modified'
+            })
+          }
+          return params
+        })
+      }
+
+      const executorWithPlugin = RuntimeExecutor.create(
+        'openai',
+        {
+          apiKey: 'test-key'
+        },
+        [recursivePlugin]
+      )
+
+      await executorWithPlugin.generateImage({ model: 'dall-e-3', prompt: 'original' })
+
+      expect(recursivePlugin.transformParams).toHaveBeenCalledTimes(2)
+      expect(aiGenerateImage).toHaveBeenCalledTimes(2)
+    })
+  })
+
+  describe('Error handling', () => {
+    it('should handle model creation errors', async () => {
+      const modelError = new Error('Failed to get image model')
+      vi.mocked(globalRegistryManagement.imageModel).mockImplementation(() => {
+        throw modelError
+      })
+
+      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({ model: 'dall-e-3', prompt: 'A test image' })).rejects.toThrow(
+        'Failed to generate image:'
+      )
+    })
+
+    it('should handle NoImageGeneratedError', async () => {
+      const noImageError = new NoImageGeneratedError({
+        cause: new Error('No image generated'),
+        responses: []
+      })
+
+      vi.mocked(aiGenerateImage).mockRejectedValue(noImageError)
+      vi.mocked(NoImageGeneratedError.isInstance).mockReturnValue(true)
+
+      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 () => {
+      const error = new Error('Generation failed')
+      vi.mocked(aiGenerateImage).mockRejectedValue(error)
+
+      const errorPlugin: AiPlugin = {
+        name: 'error-handler',
+        onError: vi.fn()
+      }
+
+      const executorWithPlugin = RuntimeExecutor.create(
+        'openai',
+        {
+          apiKey: 'test-key'
+        },
+        [errorPlugin]
+      )
+
+      await expect(executorWithPlugin.generateImage({ model: 'dall-e-3', prompt: 'A test image' })).rejects.toThrow(
+        'Failed to generate image:'
+      )
+
+      expect(errorPlugin.onError).toHaveBeenCalledWith(
+        error,
+        expect.objectContaining({
+          providerId: 'openai',
+          modelId: 'dall-e-3'
+        })
+      )
+    })
+
+    it('should handle abort signal timeout', async () => {
+      const abortError = new Error('Operation was aborted')
+      abortError.name = 'AbortError'
+      vi.mocked(aiGenerateImage).mockRejectedValue(abortError)
+
+      const abortController = new AbortController()
+      setTimeout(() => abortController.abort(), 10)
+
+      await expect(
+        executor.generateImage({ model: 'dall-e-3', prompt: 'A test image', abortSignal: abortController.signal })
+      ).rejects.toThrow('Failed to generate image:')
+    })
+  })
+
+  describe('Multiple providers support', () => {
+    it('should work with different providers', async () => {
+      const googleExecutor = RuntimeExecutor.create('google', {
+        apiKey: 'google-key'
+      })
+
+      await googleExecutor.generateImage({ model: 'imagen-3.0-generate-002', prompt: 'A landscape' })
+
+      expect(globalRegistryManagement.imageModel).toHaveBeenCalledWith('google|imagen-3.0-generate-002')
+    })
+
+    it('should support xAI Grok image models', async () => {
+      const xaiExecutor = RuntimeExecutor.create('xai', {
+        apiKey: 'xai-key'
+      })
+
+      await xaiExecutor.generateImage({ model: 'grok-2-image', prompt: 'A futuristic robot' })
+
+      expect(globalRegistryManagement.imageModel).toHaveBeenCalledWith('xai|grok-2-image')
+    })
+  })
+
+  describe('Advanced features', () => {
+    it('should support batch image generation with maxImagesPerCall', async () => {
+      await executor.generateImage({ model: 'dall-e-3', prompt: 'A test image', n: 10, maxImagesPerCall: 5 })
+
+      expect(aiGenerateImage).toHaveBeenCalledWith({
+        model: mockImageModel,
+        prompt: 'A test image',
+        n: 10,
+        maxImagesPerCall: 5
+      })
+    })
+
+    it('should support retries with maxRetries', async () => {
+      await executor.generateImage({ model: 'dall-e-3', prompt: 'A test image', maxRetries: 3 })
+
+      expect(aiGenerateImage).toHaveBeenCalledWith({
+        model: mockImageModel,
+        prompt: 'A test image',
+        maxRetries: 3
+      })
+    })
+
+    it('should handle warnings from the model', async () => {
+      const resultWithWarnings = {
+        ...mockGenerateImageResult,
+        warnings: [
+          {
+            type: 'unsupported-setting',
+            message: 'Size parameter not supported for this model'
+          }
+        ]
+      }
+
+      vi.mocked(aiGenerateImage).mockResolvedValue(resultWithWarnings)
+
+      const result = await executor.generateImage({
+        model: 'dall-e-3',
+        prompt: 'A test image',
+        size: '2048x2048' // Unsupported size
+      })
+
+      expect(result.warnings).toHaveLength(1)
+      expect(result.warnings[0].type).toBe('unsupported-setting')
+    })
+
+    it('should provide access to provider metadata', async () => {
+      const result = await executor.generateImage({ model: 'dall-e-3', prompt: 'A test image' })
+
+      expect(result.providerMetadata).toBeDefined()
+      expect(result.providerMetadata.openai).toBeDefined()
+    })
+
+    it('should provide response metadata', async () => {
+      const resultWithMetadata = {
+        ...mockGenerateImageResult,
+        responses: [
+          {
+            timestamp: new Date(),
+            modelId: 'dall-e-3',
+            headers: { 'x-request-id': 'test-123' }
+          }
+        ]
+      }
+
+      vi.mocked(aiGenerateImage).mockResolvedValue(resultWithMetadata)
+
+      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')
+      expect(result.responses[0].headers).toEqual({ 'x-request-id': 'test-123' })
+    })
+  })
+})

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

@@ -0,0 +1,38 @@
+/**
+ * Error classes for runtime operations
+ */
+
+/**
+ * Error thrown when image generation fails
+ */
+export class ImageGenerationError extends Error {
+  constructor(
+    message: string,
+    public providerId?: string,
+    public modelId?: string,
+    public cause?: Error
+  ) {
+    super(message)
+    this.name = 'ImageGenerationError'
+
+    // Maintain proper stack trace (for V8 engines)
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, ImageGenerationError)
+    }
+  }
+}
+
+/**
+ * Error thrown when model resolution fails during image generation
+ */
+export class ImageModelResolutionError extends ImageGenerationError {
+  constructor(modelId: string, providerId?: string, cause?: Error) {
+    super(
+      `Failed to resolve image model: ${modelId}${providerId ? ` for provider: ${providerId}` : ''}`,
+      providerId,
+      modelId,
+      cause
+    )
+    this.name = 'ImageModelResolutionError'
+  }
+}

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

@@ -0,0 +1,321 @@
+/**
+ * 运行时执行器
+ * 专注于插件化的AI调用处理
+ */
+import { ImageModelV2, LanguageModelV2, LanguageModelV2Middleware } from '@ai-sdk/provider'
+import {
+  experimental_generateImage as generateImage,
+  generateObject,
+  generateText,
+  LanguageModel,
+  streamObject,
+  streamText
+} from 'ai'
+
+import { globalModelResolver } from '../models'
+import { type ModelConfig } from '../models/types'
+import { type AiPlugin, type AiRequestContext, definePlugin } from '../plugins'
+import { type ProviderId } from '../providers'
+import { ImageGenerationError, ImageModelResolutionError } from './errors'
+import { PluginEngine } from './pluginEngine'
+import { type RuntimeConfig } from './types'
+
+export class RuntimeExecutor<T extends ProviderId = ProviderId> {
+  public pluginEngine: PluginEngine<T>
+  // private options: ProviderSettingsMap[T]
+  private config: RuntimeConfig<T>
+
+  constructor(config: RuntimeConfig<T>) {
+    // if (!isProviderSupported(config.providerId)) {
+    //   throw new Error(`Unsupported provider: ${config.providerId}`)
+    // }
+
+    // 存储options供后续使用
+    // this.options = config.options
+    this.config = config
+    // 创建插件客户端
+    this.pluginEngine = new PluginEngine(config.providerId, config.plugins || [])
+  }
+
+  private createResolveModelPlugin(middlewares?: LanguageModelV2Middleware[]) {
+    return definePlugin({
+      name: '_internal_resolveModel',
+      enforce: 'post',
+
+      resolveModel: async (modelId: string) => {
+        // 注意：extraModelConfig 暂时不支持，已在新架构中移除
+        return await this.resolveModel(modelId, middlewares)
+      }
+    })
+  }
+
+  private createResolveImageModelPlugin() {
+    return definePlugin({
+      name: '_internal_resolveImageModel',
+      enforce: 'post',
+
+      resolveModel: async (modelId: string) => {
+        return await this.resolveImageModel(modelId)
+      }
+    })
+  }
+
+  private createConfigureContextPlugin() {
+    return definePlugin({
+      name: '_internal_configureContext',
+      configureContext: async (context: AiRequestContext) => {
+        context.executor = this
+      }
+    })
+  }
+
+  // === 高阶重载：直接使用模型 ===
+
+  /**
+   * 流式文本生成
+   */
+  async streamText(
+    params: Parameters<typeof streamText>[0],
+    options?: {
+      middlewares?: LanguageModelV2Middleware[]
+    }
+  ): Promise<ReturnType<typeof streamText>> {
+    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.executeStreamWithPlugins(
+      'streamText',
+      model,
+      restParams,
+      async (resolvedModel, transformedParams, streamTransforms) => {
+        const experimental_transform =
+          params?.experimental_transform ?? (streamTransforms.length > 0 ? streamTransforms : undefined)
+
+        const finalParams = {
+          model: resolvedModel,
+          ...transformedParams,
+          experimental_transform
+        } as Parameters<typeof streamText>[0]
+
+        return await streamText(finalParams)
+      }
+    )
+  }
+
+  // === 其他方法的重载 ===
+
+  /**
+   * 生成文本
+   */
+  async generateText(
+    params: Parameters<typeof generateText>[0],
+    options?: {
+      middlewares?: LanguageModelV2Middleware[]
+    }
+  ): Promise<ReturnType<typeof generateText>> {
+    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',
+      model,
+      restParams,
+      async (resolvedModel, transformedParams) =>
+        generateText({ model: resolvedModel, ...transformedParams } as Parameters<typeof generateText>[0])
+    )
+  }
+
+  /**
+   * 生成结构化对象
+   */
+  async generateObject(
+    params: Parameters<typeof generateObject>[0],
+    options?: {
+      middlewares?: LanguageModelV2Middleware[]
+    }
+  ): Promise<ReturnType<typeof generateObject>> {
+    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',
+      model,
+      restParams,
+      async (resolvedModel, transformedParams) =>
+        generateObject({ model: resolvedModel, ...transformedParams } as Parameters<typeof generateObject>[0])
+    )
+  }
+
+  /**
+   * 流式生成结构化对象
+   */
+  async streamObject(
+    params: Parameters<typeof streamObject>[0],
+    options?: {
+      middlewares?: LanguageModelV2Middleware[]
+    }
+  ): Promise<ReturnType<typeof streamObject>> {
+    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',
+      model,
+      restParams,
+      async (resolvedModel, transformedParams) =>
+        streamObject({ model: resolvedModel, ...transformedParams } as Parameters<typeof streamObject>[0])
+    )
+  }
+
+  /**
+   * 生成图像
+   */
+  async generateImage(
+    params: Omit<Parameters<typeof generateImage>[0], 'model'> & { model: string | ImageModelV2 }
+  ): Promise<ReturnType<typeof generateImage>> {
+    try {
+      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',
+        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,
+          modelId,
+          error
+        )
+      }
+      throw error
+    }
+  }
+
+  // === 辅助方法 ===
+
+  /**
+   * 解析模型：如果是字符串则创建模型，如果是模型则直接返回
+   */
+  private async resolveModel(
+    modelOrId: LanguageModel,
+    middlewares?: LanguageModelV2Middleware[]
+  ): Promise<LanguageModelV2> {
+    if (typeof modelOrId === 'string') {
+      // 🎯 字符串modelId，使用新的ModelResolver解析，传递完整参数
+      return await globalModelResolver.resolveLanguageModel(
+        modelOrId, // 支持 'gpt-4' 和 'aihubmix:anthropic:claude-3.5-sonnet'
+        this.config.providerId, // fallback provider
+        this.config.providerSettings, // provider options
+        middlewares // 中间件数组
+      )
+    } else {
+      // 已经是模型，直接返回
+      return modelOrId
+    }
+  }
+
+  /**
+   * 解析图像模型：如果是字符串则创建图像模型，如果是模型则直接返回
+   */
+  private async resolveImageModel(modelOrId: ImageModelV2 | string): Promise<ImageModelV2> {
+    try {
+      if (typeof modelOrId === 'string') {
+        // 字符串modelId，使用新的ModelResolver解析
+        return await globalModelResolver.resolveImageModel(
+          modelOrId, // 支持 'dall-e-3' 和 'aihubmix:openai:dall-e-3'
+          this.config.providerId // fallback provider
+        )
+      } else {
+        // 已经是模型，直接返回
+        return modelOrId
+      }
+    } catch (error) {
+      throw new ImageModelResolutionError(
+        typeof modelOrId === 'string' ? modelOrId : modelOrId.modelId,
+        this.config.providerId,
+        error instanceof Error ? error : undefined
+      )
+    }
+  }
+
+  // === 静态工厂方法 ===
+
+  /**
+   * 创建执行器 - 支持已知provider的类型安全
+   */
+  static create<T extends ProviderId>(
+    providerId: T,
+    options: ModelConfig<T>['providerSettings'],
+    plugins?: AiPlugin[]
+  ): RuntimeExecutor<T> {
+    return new RuntimeExecutor({
+      providerId,
+      providerSettings: options,
+      plugins
+    })
+  }
+
+  /**
+   * 创建OpenAI Compatible执行器
+   */
+  static createOpenAICompatible(
+    options: ModelConfig<'openai-compatible'>['providerSettings'],
+    plugins: AiPlugin[] = []
+  ): RuntimeExecutor<'openai-compatible'> {
+    return new RuntimeExecutor({
+      providerId: 'openai-compatible',
+      providerSettings: options,
+      plugins
+    })
+  }
+}

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

@@ -0,0 +1,117 @@
+/**
+ * Runtime 模块导出
+ * 专注于运行时插件化AI调用处理
+ */
+
+// 主要的运行时执行器
+export { RuntimeExecutor } from './executor'
+
+// 导出类型
+export type { RuntimeConfig } from './types'
+
+// === 便捷工厂函数 ===
+
+import { LanguageModelV2Middleware } from '@ai-sdk/provider'
+
+import { type AiPlugin } from '../plugins'
+import { type ProviderId, type ProviderSettingsMap } from '../providers/types'
+import { RuntimeExecutor } from './executor'
+
+/**
+ * 创建运行时执行器 - 支持类型安全的已知provider
+ */
+export function createExecutor<T extends ProviderId>(
+  providerId: T,
+  options: ProviderSettingsMap[T] & { mode?: 'chat' | 'responses' },
+  plugins?: AiPlugin[]
+): RuntimeExecutor<T> {
+  return RuntimeExecutor.create(providerId, options, plugins)
+}
+
+/**
+ * 创建OpenAI Compatible执行器
+ */
+export function createOpenAICompatibleExecutor(
+  options: ProviderSettingsMap['openai-compatible'] & { mode?: 'chat' | 'responses' },
+  plugins: AiPlugin[] = []
+): RuntimeExecutor<'openai-compatible'> {
+  return RuntimeExecutor.createOpenAICompatible(options, plugins)
+}
+
+// === 直接调用API（无需创建executor实例）===
+
+/**
+ * 直接流式文本生成 - 支持middlewares
+ */
+export async function streamText<T extends ProviderId>(
+  providerId: T,
+  options: ProviderSettingsMap[T] & { mode?: 'chat' | 'responses' },
+  params: Parameters<RuntimeExecutor<T>['streamText']>[0],
+  plugins?: AiPlugin[],
+  middlewares?: LanguageModelV2Middleware[]
+): Promise<ReturnType<RuntimeExecutor<T>['streamText']>> {
+  const executor = createExecutor(providerId, options, plugins)
+  return executor.streamText(params, { middlewares })
+}
+
+/**
+ * 直接生成文本 - 支持middlewares
+ */
+export async function generateText<T extends ProviderId>(
+  providerId: T,
+  options: ProviderSettingsMap[T] & { mode?: 'chat' | 'responses' },
+  params: Parameters<RuntimeExecutor<T>['generateText']>[0],
+  plugins?: AiPlugin[],
+  middlewares?: LanguageModelV2Middleware[]
+): Promise<ReturnType<RuntimeExecutor<T>['generateText']>> {
+  const executor = createExecutor(providerId, options, plugins)
+  return executor.generateText(params, { middlewares })
+}
+
+/**
+ * 直接生成结构化对象 - 支持middlewares
+ */
+export async function generateObject<T extends ProviderId>(
+  providerId: T,
+  options: ProviderSettingsMap[T] & { mode?: 'chat' | 'responses' },
+  params: Parameters<RuntimeExecutor<T>['generateObject']>[0],
+  plugins?: AiPlugin[],
+  middlewares?: LanguageModelV2Middleware[]
+): Promise<ReturnType<RuntimeExecutor<T>['generateObject']>> {
+  const executor = createExecutor(providerId, options, plugins)
+  return executor.generateObject(params, { middlewares })
+}
+
+/**
+ * 直接流式生成结构化对象 - 支持middlewares
+ */
+export async function streamObject<T extends ProviderId>(
+  providerId: T,
+  options: ProviderSettingsMap[T] & { mode?: 'chat' | 'responses' },
+  params: Parameters<RuntimeExecutor<T>['streamObject']>[0],
+  plugins?: AiPlugin[],
+  middlewares?: LanguageModelV2Middleware[]
+): Promise<ReturnType<RuntimeExecutor<T>['streamObject']>> {
+  const executor = createExecutor(providerId, options, plugins)
+  return executor.streamObject(params, { middlewares })
+}
+
+/**
+ * 直接生成图像 - 支持middlewares
+ */
+export async function generateImage<T extends ProviderId>(
+  providerId: T,
+  options: ProviderSettingsMap[T] & { mode?: 'chat' | 'responses' },
+  params: Parameters<RuntimeExecutor<T>['generateImage']>[0],
+  plugins?: AiPlugin[]
+): Promise<ReturnType<RuntimeExecutor<T>['generateImage']>> {
+  const executor = createExecutor(providerId, options, plugins)
+  return executor.generateImage(params)
+}
+
+// === Agent 功能预留 ===
+// 未来将在 ../agents/ 文件夹中添加：
+// - AgentExecutor.ts
+// - WorkflowManager.ts
+// - ConversationManager.ts
+// 并在此处导出相关API

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

@@ -0,0 +1,290 @@
+/* eslint-disable @eslint-react/naming-convention/context-name */
+import { ImageModelV2 } from '@ai-sdk/provider'
+import { LanguageModel } from 'ai'
+
+import { type AiPlugin, createContext, PluginManager } from '../plugins'
+import { type ProviderId } from '../providers/types'
+
+/**
+ * 插件增强的 AI 客户端
+ * 专注于插件处理，不暴露用户API
+ */
+export class PluginEngine<T extends ProviderId = ProviderId> {
+  private pluginManager: PluginManager
+
+  constructor(
+    private readonly providerId: T,
+    // private readonly options: ProviderSettingsMap[T],
+    plugins: AiPlugin[] = []
+  ) {
+    this.pluginManager = new PluginManager(plugins)
+  }
+
+  /**
+   * 添加插件
+   */
+  use(plugin: AiPlugin): this {
+    this.pluginManager.use(plugin)
+    return this
+  }
+
+  /**
+   * 批量添加插件
+   */
+  usePlugins(plugins: AiPlugin[]): this {
+    plugins.forEach((plugin) => this.use(plugin))
+    return this
+  }
+
+  /**
+   * 移除插件
+   */
+  removePlugin(pluginName: string): this {
+    this.pluginManager.remove(pluginName)
+    return this
+  }
+
+  /**
+   * 获取插件统计
+   */
+  getPluginStats() {
+    return this.pluginManager.getStats()
+  }
+
+  /**
+   * 获取所有插件
+   */
+  getPlugins() {
+    return this.pluginManager.getPlugins()
+  }
+
+  /**
+   * 执行带插件的操作（非流式）
+   * 提供给AiExecutor使用
+   */
+  async executeWithPlugins<TParams, TResult>(
+    methodName: 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)
+
+    // 🔥 为上下文添加递归调用能力
+    context.recursiveCall = async (newParams: any): Promise<TResult> => {
+      // 递归调用自身，重新走完整的插件流程
+      context.isRecursiveCall = true
+      const result = await this.executeWithPlugins(methodName, model, newParams, executor, context)
+      context.isRecursiveCall = false
+      return result
+    }
+
+    try {
+      // 0. 配置上下文
+      await this.pluginManager.executeConfigureContext(context)
+
+      // 1. 触发请求开始事件
+      await this.pluginManager.executeParallel('onRequestStart', 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 (!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(resolvedModel, transformedParams)
+
+      // 5. 转换结果（对于非流式调用）
+      const transformedResult = await this.pluginManager.executeSequential('transformResult', result, context)
+
+      // 6. 触发完成事件
+      await this.pluginManager.executeParallel('onRequestEnd', context, transformedResult)
+
+      return transformedResult
+    } catch (error) {
+      // 7. 触发错误事件
+      await this.pluginManager.executeParallel('onError', context, undefined, error as Error)
+      throw error
+    }
+  }
+
+  /**
+   * 执行带插件的图像生成操作
+   * 提供给AiExecutor使用
+   */
+  async executeImageWithPlugins<TParams, TResult>(
+    methodName: 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)
+
+    // 🔥 为上下文添加递归调用能力
+    context.recursiveCall = async (newParams: any): Promise<TResult> => {
+      // 递归调用自身，重新走完整的插件流程
+      context.isRecursiveCall = true
+      const result = await this.executeImageWithPlugins(methodName, model, newParams, executor, context)
+      context.isRecursiveCall = false
+      return result
+    }
+
+    try {
+      // 0. 配置上下文
+      await this.pluginManager.executeConfigureContext(context)
+
+      // 1. 触发请求开始事件
+      await this.pluginManager.executeParallel('onRequestStart', context)
+
+      // 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(resolvedModel, transformedParams)
+
+      // 5. 转换结果
+      const transformedResult = await this.pluginManager.executeSequential('transformResult', result, context)
+
+      // 6. 触发完成事件
+      await this.pluginManager.executeParallel('onRequestEnd', context, transformedResult)
+
+      return transformedResult
+    } catch (error) {
+      // 7. 触发错误事件
+      await this.pluginManager.executeParallel('onError', context, undefined, error as Error)
+      throw error
+    }
+  }
+
+  /**
+   * 执行流式调用的通用逻辑（支持流转换器）
+   * 提供给AiExecutor使用
+   */
+  async executeStreamWithPlugins<TParams, TResult>(
+    methodName: 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)
+
+    // 🔥 为上下文添加递归调用能力
+    context.recursiveCall = async (newParams: any): Promise<TResult> => {
+      // 递归调用自身，重新走完整的插件流程
+      context.isRecursiveCall = true
+      const result = await this.executeStreamWithPlugins(methodName, model, newParams, executor, context)
+      context.isRecursiveCall = false
+      return result
+    }
+
+    try {
+      // 0. 配置上下文
+      await this.pluginManager.executeConfigureContext(context)
+
+      // 1. 触发请求开始事件
+      await this.pluginManager.executeParallel('onRequestStart', 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 (!resolvedModel) {
+        throw new Error(`Model resolution failed: no model available`)
+      }
+
+      // 3. 转换请求参数
+      const transformedParams = await this.pluginManager.executeSequential('transformParams', params, context)
+
+      // 4. 收集流转换器
+      const streamTransforms = this.pluginManager.collectStreamTransforms(transformedParams, context)
+
+      // 5. 执行流式 API 调用
+      const result = await executor(resolvedModel, transformedParams, streamTransforms)
+
+      const transformedResult = await this.pluginManager.executeSequential('transformResult', result, context)
+
+      // 6. 触发完成事件（注意：对于流式调用，这里触发的是开始流式响应的事件）
+      await this.pluginManager.executeParallel('onRequestEnd', context, transformedResult)
+
+      return transformedResult
+    } catch (error) {
+      // 7. 触发错误事件
+      await this.pluginManager.executeParallel('onError', context, undefined, error as Error)
+      throw error
+    }
+  }
+}

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

@@ -0,0 +1,15 @@
+/**
+ * Runtime 层类型定义
+ */
+import { type ModelConfig } from '../models/types'
+import { type AiPlugin } from '../plugins'
+import { type ProviderId } from '../providers/types'
+
+/**
+ * 运行时执行器配置
+ */
+export interface RuntimeConfig<T extends ProviderId = ProviderId> {
+  providerId: T
+  providerSettings: ModelConfig<T>['providerSettings'] & { mode?: 'chat' | 'responses' }
+  plugins?: AiPlugin[]
+}

packages/aiCore/src/index.ts

@@ -0,0 +1,46 @@
+/**
+ * Cherry Studio AI Core Package
+ * 基于 Vercel AI SDK 的统一 AI Provider 接口
+ */
+
+// 导入内部使用的类和函数
+
+// ==================== 主要用户接口 ====================
+export {
+  createExecutor,
+  createOpenAICompatibleExecutor,
+  generateImage,
+  generateObject,
+  generateText,
+  streamText
+} from './core/runtime'
+
+// ==================== 高级API ====================
+export { globalModelResolver as modelResolver } from './core/models'
+
+// ==================== 插件系统 ====================
+export type { AiPlugin, AiRequestContext, HookResult, PluginManagerConfig } from './core/plugins'
+export { createContext, definePlugin, PluginManager } from './core/plugins'
+// export { createPromptToolUsePlugin, webSearchPlugin } from './core/plugins/built-in'
+export { PluginEngine } from './core/runtime/pluginEngine'
+
+// ==================== AI SDK 常用类型导出 ====================
+// 直接导出 AI SDK 的常用类型，方便使用
+export type { LanguageModelV2Middleware, LanguageModelV2StreamPart } from '@ai-sdk/provider'
+export type { ToolCall } from '@ai-sdk/provider-utils'
+export type { ReasoningPart } from '@ai-sdk/provider-utils'
+
+// ==================== 选项 ====================
+export {
+  createAnthropicOptions,
+  createGoogleOptions,
+  createOpenAIOptions,
+  type ExtractProviderOptions,
+  mergeProviderOptions,
+  type ProviderOptionsMap,
+  type TypedProviderOptions
+} from './core/options'
+
+// ==================== 包信息 ====================
+export const AI_CORE_VERSION = '1.0.0'
+export const AI_CORE_NAME = '@cherrystudio/ai-core'

packages/aiCore/src/types.ts

@@ -0,0 +1,2 @@
+// 重新导出插件类型
+export type { AiPlugin, AiRequestContext, HookResult, PluginManagerConfig } from './core/plugins/types'

packages/aiCore/tsconfig.json

@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "target": "ES2020",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "declaration": true,
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "strict": true,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+    "resolveJsonModule": true,
+    "allowSyntheticDefaultImports": true,
+    "noEmitOnError": false,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true
+  },
+  "include": [
+    "src/**/*"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist"
+  ]
+} 

packages/aiCore/tsdown.config.ts

@@ -0,0 +1,14 @@
+import { defineConfig } from 'tsdown'
+
+export default defineConfig({
+  entry: {
+    index: 'src/index.ts',
+    'built-in/plugins/index': 'src/core/plugins/built-in/index.ts',
+    'provider/index': 'src/core/providers/index.ts'
+  },
+  outDir: 'dist',
+  format: ['esm', 'cjs'],
+  clean: true,
+  dts: true,
+  tsconfig: 'tsconfig.json'
+})

packages/aiCore/vitest.config.ts

@@ -0,0 +1,15 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    globals: true
+  },
+  resolve: {
+    alias: {
+      '@': './src'
+    }
+  },
+  esbuild: {
+    target: 'node18'
+  }
+})

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/languages.ts

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

packages/shared/config/types.ts

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

resources/data/agents-en.json

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

scripts/after-pack.js

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

scripts/before-pack.js

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