chore(package): bump version to 1.6.0-beta.2

- Commented out unused parameters and code in the KnowledgeSearchTool to improve clarity and maintainability.
- Removed the tool choice assignment in searchOrchestrationPlugin to streamline the logic.
- Updated instructions handling in KnowledgeSearchTool to eliminate unnecessary fields.

.github/CODEOWNERS

@@ -1,4 +0,0 @@
-/src/renderer/src/store/ @0xfullex
-/src/main/services/ConfigManager.ts @0xfullex
-/packages/shared/IpcChannel.ts @0xfullex
-/src/main/ipc.ts @0xfullex

.github/ISSUE_TEMPLATE/#0_bug_report.yml

@@ -0,0 +1,94 @@
+name: 🐛 错误报告 (中文)
+description: 创建一个报告以帮助我们改进
+title: '[错误]: '
+labels: ['BUG']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢您花时间填写此错误报告！
+        在提交此问题之前，请确保您已经了解了[常见问题](https://docs.cherry-ai.com/question-contact/questions)和[知识科普](https://docs.cherry-ai.com/question-contact/knowledge)
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: 提交前检查
+      description: |
+        在提交 Issue 前请确保您已经完成了以下所有步骤
+      options:
+        - label: 我理解 Issue 是用于反馈和解决问题的，而非吐槽评论区，将尽可能提供更多信息帮助问题解决。
+          required: true
+        - label: 我的问题不是 [常见问题](https://github.com/CherryHQ/cherry-studio/issues/3881) 中的内容。
+          required: true
+        - label: 我已经查看了 **置顶 Issue** 并搜索了现有的 [开放Issue](https://github.com/CherryHQ/cherry-studio/issues)和[已关闭Issue](https://github.com/CherryHQ/cherry-studio/issues?q=is%3Aissue%20state%3Aclosed%20)，没有找到类似的问题。
+          required: true
+        - label: 我填写了简短且清晰明确的标题，以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等。
+          required: true
+        - label: 我确认我正在使用最新版本的 Cherry Studio。
+          required: true
+
+  - type: dropdown
+    id: platform
+    attributes:
+      label: 平台
+      description: 您正在使用哪个平台？
+      options:
+        - Windows
+        - macOS
+        - Linux
+    validations:
+      required: true
+
+  - type: input
+    id: version
+    attributes:
+      label: 版本
+      description: 您正在运行的 Cherry Studio 版本是什么？
+      placeholder: 例如 v1.0.0
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: 错误描述
+      description: 描述问题时请尽可能详细。请尽可能提供截图或屏幕录制，以帮助我们更好地理解问题。
+      placeholder: 告诉我们发生了什么...(记得附上截图/录屏，如果适用)
+    validations:
+      required: true
+
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: 重现步骤
+      description: 提供详细的重现步骤，以便于我们的开发人员可以准确地重现问题。请尽可能为每个步骤提供截图或屏幕录制。
+      placeholder: |
+        1. 转到 '...'
+        2. 点击 '....'
+        3. 向下滚动到 '....'
+        4. 看到错误
+
+        记得尽可能为每个步骤附上截图/录屏！
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: 预期行为
+      description: 清晰简洁地描述您期望发生的事情
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: 相关日志输出
+      description: 请复制并粘贴任何相关的日志输出
+      render: shell
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: 附加信息
+      description: 任何能让我们对你所遇到的问题有更多了解的东西

.github/ISSUE_TEMPLATE/#1_feature_request.yml

@@ -0,0 +1,76 @@
+name: 💡 功能建议 (中文)
+description: 为项目提出新的想法
+title: '[功能]: '
+labels: ['feature']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢您花时间提出新的功能建议!
+        在提交此问题之前，请确保您已经了解了[项目规划](https://docs.cherry-ai.com/cherrystudio/planning)和[功能介绍](https://docs.cherry-ai.com/cherrystudio/preview)
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: 提交前检查
+      description: |
+        在提交 Issue 前请确保您已经完成了以下所有步骤
+      options:
+        - label: 我理解 Issue 是用于反馈和解决问题的，而非吐槽评论区，将尽可能提供更多信息帮助问题解决。
+          required: true
+        - label: 我已经查看了置顶 Issue 并搜索了现有的 [开放Issue](https://github.com/CherryHQ/cherry-studio/issues)和[已关闭Issue](https://github.com/CherryHQ/cherry-studio/issues?q=is%3Aissue%20state%3Aclosed%20)，没有找到类似的建议。
+          required: true
+        - label: 我填写了简短且清晰明确的标题，以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是“一个建议”、“卡住了”等。
+          required: true
+        - label: 最新的 Cherry Studio 版本没有实现我所提出的功能。
+          required: true
+
+  - type: dropdown
+    id: platform
+    attributes:
+      label: 平台
+      description: 您正在使用哪个平台？
+      options:
+        - Windows
+        - macOS
+        - Linux
+    validations:
+      required: true
+
+  - type: input
+    id: version
+    attributes:
+      label: 版本
+      description: 您正在运行的 Cherry Studio 版本是什么？
+      placeholder: 例如 v1.0.0
+    validations:
+      required: true
+
+  - type: textarea
+    id: problem
+    attributes:
+      label: 您的功能建议是否与某个问题/issue相关?
+      description: 请简明扼要地描述您遇到的问题
+      placeholder: 我总是感到沮丧,因为...
+    validations:
+      required: true
+
+  - type: textarea
+    id: solution
+    attributes:
+      label: 请描述您希望实现的解决方案
+      description: 请简明扼要地描述您希望发生的情况
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: 请描述您考虑过的其他方案
+      description: 请简明扼要地描述您考虑过的任何其他解决方案或功能
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: 其他补充信息
+      description: 在此添加任何其他与功能建议相关的上下文或截图

.github/ISSUE_TEMPLATE/#2_question.yml

@@ -0,0 +1,77 @@
+name: ❓ 提问 & 讨论 (中文)
+description: 寻求帮助、讨论问题、提出疑问等...
+title: '[讨论]: '
+labels: ['discussion', 'help wanted']
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢您的提问！请尽可能详细地描述您的问题，这样我们才能更好地帮助您。
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Issue 检查清单
+      description: |
+        在提交 Issue 前请确保您已经完成了以下所有步骤
+      options:
+        - label: 我理解 Issue 是用于反馈和解决问题的，而非吐槽评论区，将尽可能提供更多信息帮助问题解决。
+          required: true
+        - label: 我确认自己需要的是提出问题并且讨论问题，而不是 Bug 反馈或需求建议。
+          required: true
+
+  - type: dropdown
+    id: platform
+    attributes:
+      label: 平台
+      description: 您正在使用哪个平台？
+      options:
+        - Windows
+        - macOS
+        - Linux
+    validations:
+      required: true
+
+  - type: input
+    id: version
+    attributes:
+      label: 版本
+      description: 您正在运行的 Cherry Studio 版本是什么？
+      placeholder: 例如 v1.0.0
+    validations:
+      required: true
+
+  - type: textarea
+    id: question
+    attributes:
+      label: 您的问题
+      description: 请详细描述您的问题
+      placeholder: 请尽可能清楚地说明您的问题...
+    validations:
+      required: true
+
+  - type: textarea
+    id: context
+    attributes:
+      label: 相关背景
+      description: 请提供一些背景信息，帮助我们更好地理解您的问题
+      placeholder: 例如：使用场景、已尝试的解决方案等
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: 补充信息
+      description: 任何其他相关的信息、截图或代码示例
+      render: shell
+
+  - type: dropdown
+    id: priority
+    attributes:
+      label: 优先级
+      description: 这个问题对您来说有多紧急？
+      options:
+        - 低 (有空再看)
+        - 中 (希望尽快得到答复)
+        - 高 (阻碍工作进行)
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/#3_others.yml

@@ -0,0 +1,76 @@
+name: 🤔 其他问题 (中文)
+description: 提交不属于错误报告或功能需求的问题
+title: '[其他]: '
+body:
+  - type: markdown
+    attributes:
+      value: |
+        感谢您花时间提出问题！
+        在提交此问题之前，请确保您已经了解了[常见问题](https://docs.cherry-ai.com/question-contact/questions)和[知识科普](https://docs.cherry-ai.com/question-contact/knowledge)
+
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: 提交前检查
+      description: |
+        在提交 Issue 前请确保您已经完成了以下所有步骤
+      options:
+        - label: 我理解 Issue 是用于反馈和解决问题的，而非吐槽评论区，将尽可能提供更多信息帮助问题解决。
+          required: true
+        - label: 我已经查看了置顶 Issue 并搜索了现有的 [开放Issue](https://github.com/CherryHQ/cherry-studio/issues)和[已关闭Issue](https://github.com/CherryHQ/cherry-studio/issues?q=is%3Aissue%20state%3Aclosed%20)，没有找到类似的问题。
+          required: true
+        - label: 我填写了简短且清晰明确的标题，以便开发者在翻阅 Issue 列表时能快速确定大致问题。而不是"一个问题"、"求助"等。
+          required: true
+        - label: 我的问题不属于错误报告或功能需求类别。
+          required: true
+
+  - type: dropdown
+    id: platform
+    attributes:
+      label: 平台
+      description: 您正在使用哪个平台？
+      options:
+        - Windows
+        - macOS
+        - Linux
+    validations:
+      required: true
+
+  - type: input
+    id: version
+    attributes:
+      label: 版本
+      description: 您正在运行的 Cherry Studio 版本是什么？
+      placeholder: 例如 v1.0.0
+    validations:
+      required: true
+
+  - type: textarea
+    id: question
+    attributes:
+      label: 问题描述
+      description: 请详细描述您的问题或疑问
+      placeholder: 我想了解有关...的更多信息
+    validations:
+      required: true
+
+  - type: textarea
+    id: context
+    attributes:
+      label: 相关背景
+      description: 请提供与您的问题相关的任何背景信息或上下文
+      placeholder: 我尝试实现...时遇到了疑问
+    validations:
+      required: true
+
+  - type: textarea
+    id: attempts
+    attributes:
+      label: 您已尝试的方法
+      description: 请描述您为解决问题已经尝试过的方法（如果有）
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: 附加信息
+      description: 任何能让我们对您的问题有更多了解的信息，包括截图或相关链接

.github/workflows/auto-i18n.yml

@@ -1,66 +0,0 @@
-name: Auto I18N
-
-env:
-  API_KEY: ${{ secrets.TRANSLATE_API_KEY }}
-  MODEL: ${{ vars.AUTO_I18N_MODEL || 'deepseek/deepseek-v3.1'}}
-  BASE_URL: ${{ vars.AUTO_I18N_BASE_URL || 'https://api.ppinfra.com/openai'}}
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened]
-  workflow_dispatch:
-
-jobs:
-  auto-i18n:
-    runs-on: ubuntu-latest
-    if: github.event.pull_request.head.repo.full_name == 'CherryHQ/cherry-studio'
-    name: Auto I18N
-    permissions:
-      contents: write
-      pull-requests: write
-
-    steps:
-      - name: 🐈‍⬛ Checkout
-        uses: actions/checkout@v5
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-
-      - name: 📦 Setting Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: 📦 Install dependencies in isolated directory
-        run: |
-          # 在临时目录安装依赖
-          mkdir -p /tmp/translation-deps
-          cd /tmp/translation-deps
-          echo '{"dependencies": {"openai": "^5.12.2", "cli-progress": "^3.12.0", "tsx": "^4.20.3", "@biomejs/biome": "2.2.4"}}' > package.json
-          npm install --no-package-lock
-
-          # 设置 NODE_PATH 让项目能找到这些依赖
-          echo "NODE_PATH=/tmp/translation-deps/node_modules" >> $GITHUB_ENV
-
-      - name: 🏃‍♀️ Translate
-        run: npx tsx scripts/auto-translate-i18n.ts
-
-      - name: 🔍 Format
-        run: cd /tmp/translation-deps && npx biome format --config-path /home/runner/work/cherry-studio/cherry-studio/biome.jsonc --write /home/runner/work/cherry-studio/cherry-studio/src/renderer/src/i18n/
-
-      - name: 🔄 Commit changes
-        run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-          git add .
-          git reset -- package.json yarn.lock  # 不提交 package.json 和 yarn.lock 的更改
-          if git diff --cached --quiet; then
-            echo "No changes to commit"
-          else
-            git commit -m "fix(i18n): Auto update translations for PR #${{ github.event.pull_request.number }}"
-          fi
-
-      - name: 🚀 Push changes
-        uses: ad-m/github-push-action@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.event.pull_request.head.ref }}

.github/workflows/claude-code-review.yml

@@ -1,56 +0,0 @@
-name: Claude Code Review
-
-on:
-  pull_request:
-    types: [opened]
-    # Optional: Only run on specific file changes
-    # paths:
-    #   - "src/**/*.ts"
-    #   - "src/**/*.tsx"
-    #   - "src/**/*.js"
-    #   - "src/**/*.jsx"
-
-jobs:
-  claude-review:
-    # Only trigger code review for PRs from the main repository due to upstream OIDC issues
-    # https://github.com/anthropics/claude-code-action/issues/542
-    if: |
-      (github.event.pull_request.head.repo.full_name == github.repository) &&
-      (github.event.pull_request.draft == false)
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
-      issues: read
-      id-token: write
-      actions: read
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Run Claude Code Review
-        id: claude-review
-        uses: anthropics/claude-code-action@v1
-        with:
-          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-          prompt: |
-            Please review this pull request and provide feedback on:
-            - Code quality and best practices
-            - Potential bugs or issues
-            - Performance considerations
-            - Security concerns
-            - Test coverage
-
-            PR number: ${{ github.event.number }}
-            Repo: ${{ github.repository }}
-
-            Use the repository's CLAUDE.md for guidance on style and conventions. Be constructive and helpful in your feedback.
-
-            Use `gh pr comment` with your Bash tool to leave your review as a comment on the PR.
-
-          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
-          # or https://docs.anthropic.com/en/docs/claude-code/sdk#command-line for available options
-          claude_args: '--allowed-tools "Bash(gh issue view:*),Bash(gh search:*),Bash(gh issue list:*),Bash(gh pr comment:*),Bash(gh pr diff:*),Bash(gh pr view:*),Bash(gh pr list:*)"'

.github/workflows/claude-translator.yml

@@ -1,107 +0,0 @@
-name: Claude Translator
-concurrency:
-  group: translator-${{ github.event.comment.id || github.event.issue.number || github.event.review.id }}
-  cancel-in-progress: false
-
-on:
-  issues:
-    types: [opened]
-  issue_comment:
-    types: [created, edited]
-  pull_request_review:
-    types: [submitted, edited]
-  pull_request_review_comment:
-    types: [created, edited]
-
-jobs:
-  translate:
-    if: |
-      (github.event_name == 'issues') ||
-      (github.event_name == 'issue_comment' && github.event.sender.type != 'Bot') ||
-      (github.event_name == 'pull_request_review' && github.event.sender.type != 'Bot') ||
-      (github.event_name == 'pull_request_review_comment' && github.event.sender.type != 'Bot')
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      issues: write # 编辑issues/comments
-      pull-requests: write
-      id-token: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Run Claude for translation
-        uses: anthropics/claude-code-action@main
-        id: claude
-        with:
-          # Warning: Permissions should have been controlled by workflow permission.
-          # Now `contents: read` is safe for files, but we could make a fine-grained token to control it.
-          # See: https://github.com/anthropics/claude-code-action/blob/main/docs/security.md
-          github_token: ${{ secrets.TOKEN_GITHUB_WRITE }}
-          allowed_non_write_users: "*"
-          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-          claude_args: "--allowed-tools Bash(gh issue:*),Bash(gh api:repos/*/issues:*),Bash(gh api:repos/*/pulls/*/reviews/*),Bash(gh api:repos/*/pulls/comments/*)"
-          prompt: |
-            你是一个多语言翻译助手。你需要响应 GitHub Webhooks 中的以下四种事件：
-
-            - issues
-            - issue_comment
-            - pull_request_review
-            - pull_request_review_comment
-
-            请完成以下任务：
-
-            1. 获取当前事件的完整信息。
-
-               - 如果当前事件是 issues，就获取该 issues 的信息。
-               - 如果当前事件是 issue_comment，就获取该 comment 的信息。
-               - 如果当前事件是 pull_request_review，就获取该 review 的信息。
-               - 如果当前事件是 pull_request_review_comment，就获取该 comment 的信息。
-
-            2. 智能检测内容。
-
-                - 如果获取到的信息是已经遵循格式要求翻译过的内容，则检查翻译内容和原始内容是否匹配。若不匹配，则重新翻译一次令其匹配，并遵循格式要求；
-                - 如果获取到的信息是未翻译过的内容，检查其内容语言。若不是英文，则翻译成英文；
-                - 如果获取到的信息是部分翻译为英文的内容，则将其翻译为英文；
-                - 如果获取到的信息包含了对已翻译内容的引用，则将引用内容清理为仅含英文的内容。引用的内容不能够包含"This xxx was translated by Claude"和"Original Content`等内容。
-                - 如果获取到的信息包含了其他类型的引用，即对非 Claude 翻译的内容的引用，则直接照原样引用，不进行翻译。
-                - 如果获取到的信息是通过邮件回复的内容，则在翻译时应当将邮件内容的引用放到最后。在原始内容和翻译内容中只需要回复的内容本身，不要包含对邮件内容的引用。
-                - 如果获取到的信息本身不需要任何处理，则跳过任务。
-
-            3. 格式要求：
-
-               - 标题：英文翻译（如果非英文）
-               - 内容格式：
-                 > [!NOTE]
-                 > This issue/comment/review was translated by Claude.
-
-                 [翻译内容]
-
-                 ---
-                 <details>
-                 <summary>Original Content</summary>
-                 [原始内容]
-                 </details>
-
-            4. 使用gh工具更新：
-
-               - 根据环境信息中的Event类型选择正确的命令：
-                 - 如果 Event 是 'issues': gh issue edit [ISSUE_NUMBER] --title "[英文标题]" --body "[翻译内容 + 原始内容]"
-                 - 如果 Event 是 'issue_comment': gh api -X PATCH /repos/${{ github.repository }}/issues/comments/${{ github.event.comment.id }} -f body="[翻译内容 + 原始内容]"
-                 - 如果 Event 是 'pull_request_review': gh api -X PUT /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews/${{ github.event.review.id }} -f body="[翻译内容]"
-                 - 如果 Event 是 'pull_request_review_comment': gh api -X PATCH /repos/${{ github.repository }}/pulls/comments/${{ github.event.comment.id }} -f body="[翻译内容 + 原始内容]"
-
-            环境信息：
-            - Event: ${{ github.event_name }}
-            - Issue Number: ${{ github.event.issue.number }}
-            - Repository: ${{ github.repository }}
-            - (Review) Comment ID: ${{ github.event.comment.id || 'N/A' }}
-            - Pull Request Number: ${{ github.event.pull_request.number || 'N/A' }}
-            - Review ID: ${{ github.event.review.id || 'N/A' }}
-
-
-            使用以下命令获取完整信息：
-            gh issue view ${{ github.event.issue.number }} --json title,body,comments

.github/workflows/claude.yml

@@ -1,60 +0,0 @@
-name: Claude Code
-
-on:
-  issue_comment:
-    types: [created]
-  pull_request_review_comment:
-    types: [created]
-  issues:
-    types: [opened]
-  pull_request_review:
-    types: [submitted]
-
-jobs:
-  claude:
-    if: |
-      (github.event_name == 'issue_comment'
-        && contains(github.event.comment.body, '@claude')
-        && contains(fromJSON('["COLLABORATOR","MEMBER","OWNER"]'), github.event.comment.author_association))
-      ||
-      (github.event_name == 'pull_request_review_comment'
-        && contains(github.event.comment.body, '@claude')
-        && contains(fromJSON('["COLLABORATOR","MEMBER","OWNER"]'), github.event.comment.author_association))
-      ||
-      (github.event_name == 'pull_request_review'
-        && contains(github.event.review.body, '@claude')
-        && contains(fromJSON('["COLLABORATOR","MEMBER","OWNER"]'), github.event.review.author_association))
-      ||
-      (github.event_name == 'issues'
-        && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude'))
-        && contains(fromJSON('["COLLABORATOR","MEMBER","OWNER"]'), github.event.issue.author_association))
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: read
-      issues: read
-      id-token: write
-      actions: read # Required for Claude to read CI results on PRs
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Run Claude Code
-        id: claude
-        uses: anthropics/claude-code-action@v1
-        with:
-          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
-
-          # This is an optional setting that allows Claude to read CI results on PRs
-          additional_permissions: |
-            actions: read
-
-          # Optional: Give a custom prompt to Claude. If this is not specified, Claude will perform the instructions specified in the comment that tagged it.
-          # prompt: 'Update the pull request description to include a summary of changes.'
-
-          # Optional: Add claude_args to customize behavior and configuration
-          # See https://github.com/anthropics/claude-code-action/blob/main/docs/usage.md
-          # or https://docs.anthropic.com/en/docs/claude-code/sdk#command-line for available options
-          # claude_args: '--model claude-opus-4-1-20250805 --allowed-tools Bash(gh pr:*)'

.github/workflows/delete-branch.yml

@@ -1,22 +0,0 @@
-name: Delete merged branch
-on:
-  pull_request:
-    types:
-      - closed
-
-jobs:
-  delete-branch:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    if: github.event.pull_request.merged == true && github.event.pull_request.head.repo.full_name == github.repository
-    steps:
-      - name: Delete merged branch
-        uses: actions/github-script@v7
-        with:
-          script: |
-            github.rest.git.deleteRef({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              ref: `heads/${context.payload.pull_request.head.ref}`,
-            })

.github/workflows/nightly-build.yml

@@ -51,7 +51,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
         with:
           ref: main
 
@@ -94,43 +94,37 @@ 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_CHERRYAI_CLIENT_SECRET: ${{ secrets.MAIN_VITE_CHERRYAI_CLIENT_SECRET }}
-          MAIN_VITE_MINERU_API_KEY: ${{ secrets.MAIN_VITE_MINERU_API_KEY }}
-          RENDERER_VITE_AIHUBMIX_SECRET: ${{ secrets.RENDERER_VITE_AIHUBMIX_SECRET }}
-          RENDERER_VITE_PPIO_APP_SECRET: ${{ secrets.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 }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          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_CHERRYAI_CLIENT_SECRET: ${{ secrets.MAIN_VITE_CHERRYAI_CLIENT_SECRET }}
-          MAIN_VITE_MINERU_API_KEY: ${{ secrets.MAIN_VITE_MINERU_API_KEY }}
-          RENDERER_VITE_AIHUBMIX_SECRET: ${{ secrets.RENDERER_VITE_AIHUBMIX_SECRET }}
-          RENDERER_VITE_PPIO_APP_SECRET: ${{ secrets.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_CHERRYAI_CLIENT_SECRET: ${{ secrets.MAIN_VITE_CHERRYAI_CLIENT_SECRET }}
-          MAIN_VITE_MINERU_API_KEY: ${{ secrets.MAIN_VITE_MINERU_API_KEY }}
-          RENDERER_VITE_AIHUBMIX_SECRET: ${{ secrets.RENDERER_VITE_AIHUBMIX_SECRET }}
-          RENDERER_VITE_PPIO_APP_SECRET: ${{ secrets.RENDERER_VITE_PPIO_APP_SECRET }}
 
       - name: Rename artifacts with nightly format
         shell: bash
@@ -226,7 +220,7 @@ jobs:
         shell: bash
 
       - name: Download all artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           path: all-artifacts
           merge-multiple: false

.github/workflows/pr-ci.yml

@@ -9,19 +9,16 @@ on:
     branches:
       - main
       - develop
-      - v2
-    types: [ready_for_review, synchronize, opened]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     env:
       PRCI: true
-    if: github.event.pull_request.draft == false
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
       - name: Install Node.js
         uses: actions/setup-node@v4
@@ -51,9 +48,6 @@ jobs:
       - name: Lint Check
         run: yarn test:lint
 
-      - name: Format Check
-        run: yarn format:check
-
       - name: Type Check
         run: yarn typecheck
 

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -80,45 +80,45 @@ 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_CHERRYAI_CLIENT_SECRET: ${{ secrets.MAIN_VITE_CHERRYAI_CLIENT_SECRET }}
-          MAIN_VITE_MINERU_API_KEY: ${{ secrets.MAIN_VITE_MINERU_API_KEY }}
-          RENDERER_VITE_AIHUBMIX_SECRET: ${{ secrets.RENDERER_VITE_AIHUBMIX_SECRET }}
-          RENDERER_VITE_PPIO_APP_SECRET: ${{ secrets.RENDERER_VITE_PPIO_APP_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: |
           sudo -H pip install setuptools
+          yarn build:npm mac
           yarn build:mac
         env:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          APPLE_ID: ${{ vars.APPLE_ID }}
+          APPLE_APP_SPECIFIC_PASSWORD: ${{ vars.APPLE_APP_SPECIFIC_PASSWORD }}
+          APPLE_TEAM_ID: ${{ vars.APPLE_TEAM_ID }}
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NODE_OPTIONS: --max-old-space-size=8192
-          MAIN_VITE_CHERRYAI_CLIENT_SECRET: ${{ secrets.MAIN_VITE_CHERRYAI_CLIENT_SECRET }}
-          MAIN_VITE_MINERU_API_KEY: ${{ secrets.MAIN_VITE_MINERU_API_KEY }}
-          RENDERER_VITE_AIHUBMIX_SECRET: ${{ secrets.RENDERER_VITE_AIHUBMIX_SECRET }}
-          RENDERER_VITE_PPIO_APP_SECRET: ${{ secrets.RENDERER_VITE_PPIO_APP_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 }}
           NODE_OPTIONS: --max-old-space-size=8192
-          MAIN_VITE_CHERRYAI_CLIENT_SECRET: ${{ secrets.MAIN_VITE_CHERRYAI_CLIENT_SECRET }}
-          MAIN_VITE_MINERU_API_KEY: ${{ secrets.MAIN_VITE_MINERU_API_KEY }}
-          RENDERER_VITE_AIHUBMIX_SECRET: ${{ secrets.RENDERER_VITE_AIHUBMIX_SECRET }}
-          RENDERER_VITE_PPIO_APP_SECRET: ${{ secrets.RENDERER_VITE_PPIO_APP_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: Release
         uses: ncipollo/release-action@v1

.gitignore

@@ -37,7 +37,6 @@ dist
 out
 mcp_server
 stats.html
-.eslintcache
 
 # ENV
 .env
@@ -54,8 +53,6 @@ local
 .qwen/*
 .trae/*
 .claude-code-router/*
-.codebuddy/*
-.zed/*
 CLAUDE.local.md
 
 # vitest
@@ -63,9 +60,6 @@ coverage
 .vitest-cache
 vitest.config.*.timestamp-*
 
-# TypeScript incremental build
-.tsbuildinfo
-
 # playwright
 playwright-report
 test-results

.oxlintrc.json

@@ -1,215 +0,0 @@
-{
-  "$schema": "./node_modules/oxlint/configuration_schema.json",
-  "categories": {},
-  "env": {
-    "es2022": true
-  },
-  "globals": {},
-  "ignorePatterns": [
-    "node_modules/**",
-    "build/**",
-    "dist/**",
-    "out/**",
-    "local/**",
-    ".yarn/**",
-    ".gitignore",
-    "scripts/cloudflare-worker.js",
-    "src/main/integration/nutstore/sso/lib/**",
-    "src/main/integration/cherryai/index.js",
-    "src/main/integration/nutstore/sso/lib/**",
-    "src/renderer/src/ui/**",
-    "packages/**/dist",
-    "eslint.config.mjs"
-  ],
-  "overrides": [
-    // set different env
-    {
-      "env": {
-        "node": true
-      },
-      "files": ["src/main/**", "resources/scripts/**", "scripts/**", "playwright.config.ts", "electron.vite.config.ts"]
-    },
-    {
-      "env": {
-        "browser": true
-      },
-      "files": [
-        "src/renderer/**/*.{ts,tsx}",
-        "packages/aiCore/**",
-        "packages/extension-table-plus/**",
-        "resources/js/**"
-      ]
-    },
-    {
-      "env": {
-        "node": true,
-        "vitest": true
-      },
-      "files": ["**/__tests__/*.test.{ts,tsx}", "tests/**"]
-    },
-    {
-      "env": {
-        "browser": true,
-        "node": true
-      },
-      "files": ["src/preload/**"]
-    }
-  ],
-  // We don't use the React plugin here because its behavior differs slightly from that of ESLint's React plugin.
-  "plugins": ["unicorn", "typescript", "oxc", "import"],
-  "rules": {
-    "constructor-super": "error",
-    "for-direction": "error",
-    "getter-return": "error",
-    "no-array-constructor": "off",
-    // "import/no-cycle": "error", // tons of error, bro
-    "no-async-promise-executor": "error",
-    "no-caller": "warn",
-    "no-case-declarations": "error",
-    "no-class-assign": "error",
-    "no-compare-neg-zero": "error",
-    "no-cond-assign": "error",
-    "no-const-assign": "error",
-    "no-constant-binary-expression": "error",
-    "no-constant-condition": "error",
-    "no-control-regex": "error",
-    "no-debugger": "error",
-    "no-delete-var": "error",
-    "no-dupe-args": "error",
-    "no-dupe-class-members": "error",
-    "no-dupe-else-if": "error",
-    "no-dupe-keys": "error",
-    "no-duplicate-case": "error",
-    "no-empty": "error",
-    "no-empty-character-class": "error",
-    "no-empty-pattern": "error",
-    "no-empty-static-block": "error",
-    "no-eval": "warn",
-    "no-ex-assign": "error",
-    "no-extra-boolean-cast": "error",
-    "no-fallthrough": "warn",
-    "no-func-assign": "error",
-    "no-global-assign": "error",
-    "no-import-assign": "error",
-    "no-invalid-regexp": "error",
-    "no-irregular-whitespace": "error",
-    "no-loss-of-precision": "error",
-    "no-misleading-character-class": "error",
-    "no-new-native-nonconstructor": "error",
-    "no-nonoctal-decimal-escape": "error",
-    "no-obj-calls": "error",
-    "no-octal": "error",
-    "no-prototype-builtins": "error",
-    "no-redeclare": "error",
-    "no-regex-spaces": "error",
-    "no-self-assign": "error",
-    "no-setter-return": "error",
-    "no-shadow-restricted-names": "error",
-    "no-sparse-arrays": "error",
-    "no-this-before-super": "error",
-    "no-unassigned-vars": "warn",
-    "no-undef": "error",
-    "no-unexpected-multiline": "error",
-    "no-unreachable": "error",
-    "no-unsafe-finally": "error",
-    "no-unsafe-negation": "error",
-    "no-unsafe-optional-chaining": "error",
-    "no-unused-expressions": "off", // this rule disallow us to use expression to call function, like `condition && fn()`
-    "no-unused-labels": "error",
-    "no-unused-private-class-members": "error",
-    "no-unused-vars": ["error", { "caughtErrors": "none" }],
-    "no-useless-backreference": "error",
-    "no-useless-catch": "error",
-    "no-useless-escape": "error",
-    "no-useless-rename": "warn",
-    "no-with": "error",
-    "oxc/bad-array-method-on-arguments": "warn",
-    "oxc/bad-char-at-comparison": "warn",
-    "oxc/bad-comparison-sequence": "warn",
-    "oxc/bad-min-max-func": "warn",
-    "oxc/bad-object-literal-comparison": "warn",
-    "oxc/bad-replace-all-arg": "warn",
-    "oxc/const-comparisons": "warn",
-    "oxc/double-comparisons": "warn",
-    "oxc/erasing-op": "warn",
-    "oxc/missing-throw": "warn",
-    "oxc/number-arg-out-of-range": "warn",
-    "oxc/only-used-in-recursion": "off", // manually off bacause of existing warning. may turn it on in the future
-    "oxc/uninvoked-array-callback": "warn",
-    "require-yield": "error",
-    "typescript/await-thenable": "warn",
-    // "typescript/ban-ts-comment": "error",
-    "typescript/no-array-constructor": "error",
-    // "typescript/consistent-type-imports": "error",
-    "typescript/no-array-delete": "warn",
-    "typescript/no-base-to-string": "warn",
-    "typescript/no-duplicate-enum-values": "error",
-    "typescript/no-duplicate-type-constituents": "warn",
-    "typescript/no-empty-object-type": "off",
-    "typescript/no-explicit-any": "off", // not safe but too many errors
-    "typescript/no-extra-non-null-assertion": "error",
-    "typescript/no-floating-promises": "warn",
-    "typescript/no-for-in-array": "warn",
-    "typescript/no-implied-eval": "warn",
-    "typescript/no-meaningless-void-operator": "warn",
-    "typescript/no-misused-new": "error",
-    "typescript/no-misused-spread": "warn",
-    "typescript/no-namespace": "error",
-    "typescript/no-non-null-asserted-optional-chain": "off", // it's off now. but may turn it on.
-    "typescript/no-redundant-type-constituents": "warn",
-    "typescript/no-require-imports": "off",
-    "typescript/no-this-alias": "error",
-    "typescript/no-unnecessary-parameter-property-assignment": "warn",
-    "typescript/no-unnecessary-type-constraint": "error",
-    "typescript/no-unsafe-declaration-merging": "error",
-    "typescript/no-unsafe-function-type": "error",
-    "typescript/no-unsafe-unary-minus": "warn",
-    "typescript/no-useless-empty-export": "warn",
-    "typescript/no-wrapper-object-types": "error",
-    "typescript/prefer-as-const": "error",
-    "typescript/prefer-namespace-keyword": "error",
-    "typescript/require-array-sort-compare": "warn",
-    "typescript/restrict-template-expressions": "warn",
-    "typescript/triple-slash-reference": "error",
-    "typescript/unbound-method": "warn",
-    "unicorn/no-await-in-promise-methods": "warn",
-    "unicorn/no-empty-file": "off", // manually off bacause of existing warning. may turn it on in the future
-    "unicorn/no-invalid-fetch-options": "warn",
-    "unicorn/no-invalid-remove-event-listener": "warn",
-    "unicorn/no-new-array": "off", // manually off bacause of existing warning. may turn it on in the future
-    "unicorn/no-single-promise-in-promise-methods": "warn",
-    "unicorn/no-thenable": "off", // manually off bacause of existing warning. may turn it on in the future
-    "unicorn/no-unnecessary-await": "warn",
-    "unicorn/no-useless-fallback-in-spread": "warn",
-    "unicorn/no-useless-length-check": "warn",
-    "unicorn/no-useless-spread": "off", // manually off bacause of existing warning. may turn it on in the future
-    "unicorn/prefer-set-size": "warn",
-    "unicorn/prefer-string-starts-ends-with": "warn",
-    "use-isnan": "error",
-    "valid-typeof": "error"
-  },
-  "settings": {
-    "jsdoc": {
-      "augmentsExtendsReplacesDocs": false,
-      "exemptDestructuredRootsFromChecks": false,
-      "ignoreInternal": false,
-      "ignorePrivate": false,
-      "ignoreReplacesDocs": true,
-      "implementsReplacesDocs": false,
-      "overrideReplacesDocs": true,
-      "tagNamePreference": {}
-    },
-    "jsx-a11y": {
-      "attributes": {},
-      "components": {},
-      "polymorphicPropName": null
-    },
-    "next": {
-      "rootDir": []
-    },
-    "react": {
-      "formComponents": [],
-      "linkComponents": []
-    }
-  }
-}

.prettierignore

@@ -0,0 +1,10 @@
+out
+dist
+pnpm-lock.yaml
+LICENSE.md
+tsconfig.json
+tsconfig.*.json
+CHANGELOG*.md
+agents.json
+src/renderer/src/integration/nutstore/sso/lib
+AGENT.md

.prettierrc

@@ -0,0 +1,11 @@
+{
+  "bracketSameLine": true,
+  "endOfLine": "lf",
+  "jsonRecursiveSort": true,
+  "jsonSortOrder": "{\"*\": \"lexical\"}",
+  "plugins": ["prettier-plugin-sort-json"],
+  "printWidth": 120,
+  "semi": false,
+  "singleQuote": true,
+  "trailingComma": "none"
+}

.vscode/extensions.json

@@ -1,11 +1,8 @@
 {
   "recommendations": [
     "dbaeumer.vscode-eslint",
+    "esbenp.prettier-vscode",
     "editorconfig.editorconfig",
-    "lokalise.i18n-ally",
-    "bradlc.vscode-tailwindcss",
-    "vitest.explorer",
-    "oxc.oxc-vscode",
-    "biomejs.biome"
+    "lokalise.i18n-ally"
   ]
 }

.vscode/settings.json

@@ -1,38 +1,33 @@
 {
   "[css]": {
-    "editor.defaultFormatter": "biomejs.biome"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[javascript]": {
-    "editor.defaultFormatter": "biomejs.biome"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[json]": {
-    "editor.defaultFormatter": "biomejs.biome"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[jsonc]": {
-    "editor.defaultFormatter": "biomejs.biome"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[markdown]": {
     "files.trimTrailingWhitespace": false
   },
   "[scss]": {
-    "editor.defaultFormatter": "biomejs.biome"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[typescript]": {
-    "editor.defaultFormatter": "biomejs.biome"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[typescriptreact]": {
-    "editor.defaultFormatter": "biomejs.biome"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "editor.codeActionsOnSave": {
-    "source.fixAll.biome": "explicit",
     "source.fixAll.eslint": "explicit",
-    "source.fixAll.oxc": "explicit",
     "source.organizeImports": "never"
   },
   "editor.formatOnSave": true,
-  "files.associations": {
-    "*.css": "tailwindcss"
-  },
   "files.eol": "\n",
   "i18n-ally.displayLanguage": "zh-cn",
   "i18n-ally.enabledFrameworks": ["react-i18next", "i18next"],

.yarn/patches/@ai-sdk-google-npm-2.0.14-376d8b03cc.patch

@@ -1,13 +0,0 @@
-diff --git a/dist/index.mjs b/dist/index.mjs
-index 110f37ec18c98b1d55ae2b73cc716194e6f9094d..17e109b7778cbebb904f1919e768d21a2833d965 100644
---- a/dist/index.mjs
-+++ b/dist/index.mjs
-@@ -448,7 +448,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
- 
- // src/get-model-path.ts
- function getModelPath(modelId) {
--  return modelId.includes("/") ? modelId : `models/${modelId}`;
-+  return modelId?.includes("models/") ? modelId : `models/${modelId}`;
- }
- 
- // src/google-generative-ai-options.ts

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

@@ -1,30 +0,0 @@
-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

@@ -1,48 +0,0 @@
-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;

.yarnrc.yml

@@ -5,5 +5,3 @@ httpTimeout: 300000
 nodeLinker: node-modules
 
 yarnPath: .yarn/releases/yarn-4.9.1.cjs
-npmRegistryServer: https://registry.npmjs.org
-npmPublishRegistry: https://registry.npmjs.org

CLAUDE.md

@@ -9,7 +9,6 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 - **Prerequisites**: Node.js v22.x.x or higher, Yarn 4.9.1
 - **Setup Yarn**: `corepack enable && corepack prepare yarn@4.9.1 --activate`
 - **Install Dependencies**: `yarn install`
-- **Add New Dependencies**: `yarn add -D` for renderer-specific dependencies, `yarn add` for others.
 
 ### Development
 
@@ -22,7 +21,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 - **Run E2E Tests**: `yarn test:e2e` - Playwright end-to-end tests
 - **Type Check**: `yarn typecheck` - Checks TypeScript for both node and web
 - **Lint**: `yarn lint` - ESLint with auto-fix
-- **Format**: `yarn format` - Biome formatting
+- **Format**: `yarn format` - Prettier formatting
 
 ### Build & Release
 
@@ -93,12 +92,6 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
 - **Multi-language Support**: i18n with dynamic loading
 - **Theme System**: Light/dark themes with custom CSS variables
 
-### UI Design
-
-The project is in the process of migrating from antd & styled-components to HeroUI. Please use HeroUI to build UI components. The use of antd and styled-components is prohibited.
-
-HeroUI Docs: https://www.heroui.com/docs/guide/introduction
-
 ## Logging Standards
 
 ### Usage

LICENSE

@@ -1,3 +1,48 @@
+**许可协议 (Licensing)**
+
+本项目采用**区分用户的双重许可 (User-Segmented Dual Licensing)** 模式。
+
+**核心原则：**
+
+* **个人用户 和 10人及以下企业/组织:** 默认适用 **GNU Affero 通用公共许可证 v3.0 (AGPLv3)**。  
+* **超过10人的企业/组织:** **必须** 获取 **商业许可证 (Commercial License)**。
+
+定义：“10人及以下”  
+指在您的组织（包括公司、非营利组织、政府机构、教育机构等任何实体）中，能够访问、使用或以任何方式直接或间接受益于本软件（Cherry Studio）功能的个人总数不超过10人。这包括但不限于开发者、测试人员、运营人员、最终用户、通过集成系统间接使用者等。
+
+---
+
+**1. 开源许可证 (Open Source License): AGPLv3 - 适用于个人及10人及以下组织**
+
+* 如果您是个人用户，或者您的组织满足上述“10人及以下”的定义，您可以在 **AGPLv3** 的条款下自由使用、修改和分发 Cherry Studio。AGPLv3 的完整文本可以访问 [https://www.gnu.org/licenses/agpl-3.0.html](https://www.gnu.org/licenses/agpl-3.0.html) 获取。  
+* **核心义务：** AGPLv3 的一个关键要求是，如果您修改了 Cherry Studio 并通过网络提供服务，或者分发了修改后的版本，您必须以 AGPLv3 许可证向接收者提供相应的**完整源代码**。即使您符合“10人及以下”的标准，如果您希望避免此源代码公开义务，您也需要考虑获取商业许可证（见下文）。  
+* 使用前请务必仔细阅读并理解 AGPLv3 的所有条款。
+
+**2. 商业许可证 (Commercial License) - 适用于超过10人的组织，或希望规避 AGPLv3 义务的用户**
+
+* **强制要求：** 如果您的组织**不**满足上述“10人及以下”的定义（即有11人或更多人可以访问、使用或受益于本软件），您**必须**联系我们获取并签署一份商业许可证才能使用 Cherry Studio。  
+* **自愿选择：** 即使您的组织满足“10人及以下”的条件，但如果您的使用场景**无法满足 AGPLv3 的条款要求**（特别是关于**源代码公开**的义务），或者您需要 AGPLv3 **未提供**的特定商业条款（如保证、赔偿、无 Copyleft 限制等），您也**必须**联系我们获取并签署一份商业许可证。  
+* **需要商业许可证的常见情况包括（但不限于）：**  
+  * 您的组织规模超过10人。  
+  * （无论组织规模）您希望分发修改过的 Cherry Studio 版本，但**不希望**根据 AGPLv3 公开您修改部分的源代码。  
+  * （无论组织规模）您希望基于修改过的 Cherry Studio 提供网络服务（SaaS），但**不希望**根据 AGPLv3 向服务使用者提供修改后的源代码。  
+  * （无论组织规模）您的公司政策、客户合同或项目要求不允许使用 AGPLv3 许可的软件，或要求闭源分发及保密。  
+* 商业许可证将为您提供豁免 AGPLv3 义务（如源代码公开）的权利，并可能包含额外的商业保障条款。  
+* **获取商业许可：** 请通过邮箱 **bd@cherry-ai.com** 联系 Cherry Studio 开发团队洽谈商业授权事宜。
+
+**3. 贡献 (Contributions)**
+
+* 我们欢迎社区对 Cherry Studio 的贡献。所有向本项目提交的贡献都将被视为在 **AGPLv3** 许可证下提供。  
+* 通过向本项目提交贡献（例如通过 Pull Request），即表示您同意您的代码以 AGPLv3 许可证授权给本项目及所有后续使用者（无论这些使用者最终遵循 AGPLv3 还是商业许可）。  
+* 您也理解并同意，您的贡献可能会被包含在根据商业许可证分发的 Cherry Studio 版本中。
+
+**4. 其他条款 (Other Terms)**
+
+* 关于商业许可证的具体条款和条件，以双方签署的正式商业许可协议为准。  
+* 项目维护者保留根据需要更新本许可政策（包括用户规模定义和阈值）的权利。相关更新将通过项目官方渠道（如代码仓库、官方网站）进行通知。
+
+---
+
 **Licensing**
 
 This project employs a **User-Segmented Dual Licensing** model.

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/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://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://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>
 
@@ -82,7 +82,7 @@ Cherry Studio is a desktop client that supports multiple LLM providers, availabl
 1. **Diverse LLM Provider Support**:
 
 - ☁️ Major LLM Cloud Services: OpenAI, Gemini, Anthropic, and more
-- 🔗 AI Web Service Integration: Claude, Perplexity, Poe, and others
+- 🔗 AI Web Service Integration: Claude, Peplexity, Poe, and others
 - 💻 Local Model Support with Ollama, LM Studio
 
 2. **AI Assistants & Conversations**:

biome.jsonc

@@ -1,97 +0,0 @@
-{
-  "$schema": "https://biomejs.dev/schemas/2.2.4/schema.json",
-  "assist": {
-    // to sort json
-    "actions": {
-      "source": {
-        "organizeImports": "on",
-        "useSortedKeys": {
-          "level": "on",
-          "options": {
-            "sortOrder": "lexicographic"
-          }
-        }
-      }
-    },
-    "enabled": true,
-    "includes": ["**/*.json", "!*.json", "!**/package.json"]
-  },
-  "css": {
-    "formatter": {
-      "quoteStyle": "single"
-    }
-  },
-  "files": { "ignoreUnknown": false },
-  "formatter": {
-    "attributePosition": "auto",
-    "bracketSameLine": false,
-    "bracketSpacing": true,
-    "enabled": true,
-    "expand": "auto",
-    "formatWithErrors": true,
-    "includes": [
-      "**",
-      "!out/**",
-      "!**/dist/**",
-      "!build/**",
-      "!.yarn/**",
-      "!.github/**",
-      "!.husky/**",
-      "!.vscode/**",
-      "!*.yaml",
-      "!*.yml",
-      "!*.mjs",
-      "!*.cjs",
-      "!*.md",
-      "!*.json",
-      "!src/main/integration/**",
-      "!**/tailwind.css",
-      "!**/package.json"
-    ],
-    "indentStyle": "space",
-    "indentWidth": 2,
-    "lineEnding": "lf",
-    "lineWidth": 120,
-    "useEditorconfig": true
-  },
-  "html": { "formatter": { "selfCloseVoidElements": "always" } },
-  "javascript": {
-    "formatter": {
-      "arrowParentheses": "always",
-      "attributePosition": "auto",
-      // To minimize changes in this PR as much as possible, it's set to true. However, setting it to false would make it more convenient to add attributes at the end.
-      "bracketSameLine": true,
-      "bracketSpacing": true,
-      "jsxQuoteStyle": "double",
-      "quoteProperties": "asNeeded",
-      "quoteStyle": "single",
-      "semicolons": "asNeeded",
-      "trailingCommas": "none"
-    }
-  },
-  "json": {
-    "parser": {
-      "allowComments": true
-    }
-  },
-  "linter": {
-    "enabled": true,
-    "includes": ["!**/tailwind.css", "src/renderer/**/*.{tsx,ts}"],
-    // only enable sorted tailwind css rule. used as formatter instead of linter
-    "rules": {
-      "nursery": {
-        // to sort tailwind css classes
-        "useSortedClasses": {
-          "fix": "safe",
-          "level": "warn",
-          "options": {
-            "functions": ["cn"]
-          }
-        }
-      },
-      "recommended": false,
-      "suspicious": "off"
-    }
-  },
-  "vcs": { "clientKind": "git", "enabled": false, "useIgnoreFile": false }
-}

build/entitlements.mac.plist

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

components.json

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

docs/README.zh.md

@@ -13,7 +13,7 @@
         <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=fr">Français</a></p>
         <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=de">Deutsch</a></p>
         <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=es">Español</a></p>
-        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=it">Italiano</a></p>
+        <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=it">Itapano</a></p>
         <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=ru">Русский</a></p>
         <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=pt">Português</a></p>
         <p><a href="https://openaitx.github.io/view.html?user=CherryHQ&project=cherry-studio&lang=nl">Nederlands</a></p>
@@ -89,7 +89,7 @@ https://docs.cherry-ai.com
 1. **多样化 LLM 服务支持**：
 
 - ☁️ 支持主流 LLM 云服务：OpenAI、Gemini、Anthropic、硅基流动等
-- 🔗 集成流行 AI Web 服务：Claude、Perplexity、Poe、腾讯元宝、知乎直答等
+- 🔗 集成流行 AI Web 服务：Claude、Peplexity、Poe、腾讯元宝、知乎直答等
 - 💻 支持 Ollama、LM Studio 本地模型部署
 
 2. **智能助手与对话**：

docs/dev.md

@@ -2,9 +2,7 @@
 
 ## IDE Setup
 
-- Editor: [Cursor](https://www.cursor.com/), etc. Any VS Code compatible editor.
-- Linter: [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
-- Formatter: [Biome](https://marketplace.visualstudio.com/items?itemName=biomejs.biome)
+[Cursor](https://www.cursor.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
 
 ## Project Setup
 

docs/technical/db.translate_languages.md

@@ -8,9 +8,9 @@
 
 | 字段名     | 类型   | 是否主键 | 索引 | 说明                                                                     |
 | ---------- | ------ | -------- | ---- | ------------------------------------------------------------------------ |
-| `id`       | string | ✅ 是    | ✅   | 唯一标识符，主键                                                         |
-| `langCode` | string | ❌ 否    | ✅   | 语言代码（如：`zh-cn`, `en-us`, `ja-jp` 等，均为小写），支持普通索引查询 |
-| `value`    | string | ❌ 否    | ❌   | 语言的名称，用户输入                                                     |
-| `emoji`    | string | ❌ 否    | ❌   | 语言的emoji，用户输入                                                    |
+| `id`       | string | ✅ 是     | ✅    | 唯一标识符，主键                                                         |
+| `langCode` | string | ❌ 否     | ✅    | 语言代码（如：`zh-cn`, `en-us`, `ja-jp` 等，均为小写），支持普通索引查询 |
+| `value`    | string | ❌ 否     | ❌    | 语言的名称，用户输入                                                     |
+| `emoji`    | string | ❌ 否     | ❌    | 语言的emoji，用户输入                                                    |
 
 > `langCode` 虽非主键，但在业务层应当避免重复插入相同语言代码。

electron-builder.yml

@@ -17,52 +17,48 @@ protocols:
     schemes:
       - cherrystudio
 files:
-  - "**/*"
-  - "!**/{.vscode,.yarn,.yarn-lock,.github,.cursorrules,.prettierrc}"
-  - "!electron.vite.config.{js,ts,mjs,cjs}}"
-  - "!**/{.eslintignore,.eslintrc.js,.eslintrc.json,.eslintcache,root.eslint.config.js,eslint.config.js,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,eslint.config.mjs,dev-app-update.yml,CHANGELOG.md,README.md,biome.jsonc}"
-  - "!**/{.env,.env.*,.npmrc,pnpm-lock.yaml}"
-  - "!**/{tsconfig.json,tsconfig.tsbuildinfo,tsconfig.node.json,tsconfig.web.json}"
-  - "!**/{.editorconfig,.jekyll-metadata}"
-  - "!src"
-  - "!scripts"
-  - "!local"
-  - "!docs"
-  - "!packages"
-  - "!.swc"
-  - "!.bin"
-  - "!._*"
-  - "!*.log"
-  - "!stats.html"
-  - "!*.md"
-  - "!**/*.{iml,o,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,xproj}"
-  - "!**/*.{map,ts,tsx,jsx,less,scss,sass,css.d.ts,d.cts,d.mts,md,markdown,yaml,yml}"
-  - "!**/{test,tests,__tests__,powered-test,coverage}/**"
-  - "!**/{example,examples}/**"
-  - "!**/*.{spec,test}.{js,jsx,ts,tsx}"
-  - "!**/*.min.*.map"
-  - "!**/*.d.ts"
-  - "!**/dist/es6/**"
-  - "!**/dist/demo/**"
-  - "!**/amd/**"
-  - "!**/{.DS_Store,Thumbs.db,thumbs.db,__pycache__}"
-  - "!**/{LICENSE,license,LICENSE.*,*.LICENSE.txt,NOTICE.txt,README.md,readme.md,CHANGELOG.md}"
-  - "!node_modules/rollup-plugin-visualizer"
-  - "!node_modules/js-tiktoken"
-  - "!node_modules/@tavily/core/node_modules/js-tiktoken"
-  - "!node_modules/pdf-parse/lib/pdf.js/{v1.9.426,v1.10.88,v2.0.550}"
-  - "!node_modules/mammoth/{mammoth.browser.js,mammoth.browser.min.js}"
-  - "!node_modules/selection-hook/prebuilds/**/*" # we rebuild .node, don't use prebuilds
-  - "!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
+  - '**/*'
+  - '!**/{.vscode,.yarn,.yarn-lock,.github,.cursorrules,.prettierrc}'
+  - '!electron.vite.config.{js,ts,mjs,cjs}}'
+  - '!**/{.eslintignore,.eslintrc.js,.eslintrc.json,.eslintcache,root.eslint.config.js,eslint.config.js,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,eslint.config.mjs,dev-app-update.yml,CHANGELOG.md,README.md}'
+  - '!**/{.env,.env.*,.npmrc,pnpm-lock.yaml}'
+  - '!**/{tsconfig.json,tsconfig.tsbuildinfo,tsconfig.node.json,tsconfig.web.json}'
+  - '!**/{.editorconfig,.jekyll-metadata}'
+  - '!src'
+  - '!scripts'
+  - '!local'
+  - '!docs'
+  - '!packages'
+  - '!.swc'
+  - '!.bin'
+  - '!._*'
+  - '!*.log'
+  - '!stats.html'
+  - '!*.md'
+  - '!**/*.{iml,o,hprof,orig,pyc,pyo,rbc,swp,csproj,sln,xproj}'
+  - '!**/*.{map,ts,tsx,jsx,less,scss,sass,css.d.ts,d.cts,d.mts,md,markdown,yaml,yml}'
+  - '!**/{test,tests,__tests__,powered-test,coverage}/**'
+  - '!**/{example,examples}/**'
+  - '!**/*.{spec,test}.{js,jsx,ts,tsx}'
+  - '!**/*.min.*.map'
+  - '!**/*.d.ts'
+  - '!**/dist/es6/**'
+  - '!**/dist/demo/**'
+  - '!**/amd/**'
+  - '!**/{.DS_Store,Thumbs.db,thumbs.db,__pycache__}'
+  - '!**/{LICENSE,license,LICENSE.*,*.LICENSE.txt,NOTICE.txt,README.md,readme.md,CHANGELOG.md}'
+  - '!node_modules/rollup-plugin-visualizer'
+  - '!node_modules/js-tiktoken'
+  - '!node_modules/@tavily/core/node_modules/js-tiktoken'
+  - '!node_modules/pdf-parse/lib/pdf.js/{v1.9.426,v1.10.88,v2.0.550}'
+  - '!node_modules/mammoth/{mammoth.browser.js,mammoth.browser.min.js}'
+  - '!node_modules/selection-hook/prebuilds/**/*' # we rebuild .node, don't use prebuilds
+  - '!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
+  - '!**/*.{h,iobj,ipdb,tlog,recipe,vcxproj,vcxproj.filters,Makefile,*.Makefile}' # filter .node build files
 asarUnpack:
   - resources/**
-  - "**/*.{metal,exp,lib}"
-  - "node_modules/@img/sharp-libvips-*/**"
+  - '**/*.{metal,exp,lib}'
 win:
   executableName: Cherry Studio
   artifactName: ${productName}-${version}-${arch}-setup.${ext}
@@ -88,7 +84,7 @@ mac:
   entitlementsInherit: build/entitlements.mac.plist
   notarize: false
   artifactName: ${productName}-${version}-${arch}.${ext}
-  minimumSystemVersion: "20.1.0" # 最低支持 macOS 11.0
+  minimumSystemVersion: '20.1.0' # 最低支持 macOS 11.0
   extendInfo:
     - NSCameraUsageDescription: Application requests access to the device's camera.
     - NSMicrophoneUsageDescription: Application requests access to the device's microphone.
@@ -110,22 +106,36 @@ linux:
       StartupWMClass: CherryStudio
   mimeTypes:
     - x-scheme-handler/cherrystudio
-rpm:
-  # Workaround for electron build issue on rpm package:
-  # https://github.com/electron/forge/issues/3594
-  fpm: ["--rpm-rpmbuild-define=_build_id_links none"]
 publish:
   provider: generic
   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: |
-    Optimized note-taking feature, now able to quickly rename by modifying the title
-    Fixed issue where CherryAI free model could not be used
-    Fixed issue where VertexAI proxy address could not be called normally
-    Fixed issue where built-in tools from service providers could not be called normally
+    🎉 新增功能：
+    - 新增错误详情模态框，提供完整的错误信息展示和复制功能
+    - 新增错误详情的多语言支持（英语、日语、俄语、中文简繁体）
+
+    🔧 优化改进：
+    - 升级 AI Core 到 v1.0.0-alpha.11，重构模型解析逻辑
+    - 增强温度和 TopP 参数处理，特别针对 Claude 推理努力模型优化
+    - 改进提供商配置管理，简化 OpenAI 模式处理和服务层级设置
+    - 优化 MCP 工具可见性，增强提示工具支持
+    - 重构错误序列化机制，提升类型安全性
+    - 优化补全方法，支持开发者模式下的追踪功能
+    - 改进提供商初始化逻辑，支持动态注册新的 AI 提供商
+
+    🐛 问题修复：
+    - 修复错误处理回调中的类型安全问题，使用 AISDKError 类型
+    - 修复提供商初始化和配置相关问题
+    - 移除过时的模型解析函数，清理废弃代码
+    - 修复 Gemini 集成中的提供商配置缺失问题
+
+    ⚡ 性能提升：
+    - 提升模型参数处理效率，优化温度和 TopP 计算逻辑
+    - 优化提供商配置加载和初始化性能
+    - 改进错误处理性能，减少不必要的错误格式化开销

electron.vite.config.ts

@@ -4,10 +4,6 @@ import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
 import { resolve } from 'path'
 import { visualizer } from 'rollup-plugin-visualizer'
 
-// assert not supported by biome
-// import pkg from './package.json' assert { type: 'json' }
-import pkg from './package.json'
-
 const visualizerPlugin = (type: 'renderer' | 'main') => {
   return process.env[`VISUALIZER_${type.toUpperCase()}`] ? [visualizer({ open: true })] : []
 }
@@ -30,14 +26,10 @@ export default defineConfig({
     },
     build: {
       rollupOptions: {
-        external: ['bufferutil', 'utf-8-validate', 'electron', ...Object.keys(pkg.dependencies)],
+        external: ['@libsql/client', 'bufferutil', 'utf-8-validate'],
         output: {
           manualChunks: undefined, // 彻底禁用代码分割 - 返回 null 强制单文件打包
           inlineDynamicImports: true // 内联所有动态导入，这是关键配置
-        },
-        onwarn(warning, warn) {
-          if (warning.code === 'COMMONJS_VARIABLE_IN_ESM') return
-          warn(warning)
         }
       },
       sourcemap: isDev
@@ -66,7 +58,6 @@ export default defineConfig({
   },
   renderer: {
     plugins: [
-      (async () => (await import('@tailwindcss/vite')).default())(),
       react({
         tsDecorators: true,
         plugins: [
@@ -93,8 +84,7 @@ export default defineConfig({
         '@mcp-trace/trace-web': resolve('packages/mcp-trace/trace-web'),
         '@cherrystudio/ai-core/provider': resolve('packages/aiCore/src/core/providers'),
         '@cherrystudio/ai-core/built-in/plugins': resolve('packages/aiCore/src/core/plugins/built-in'),
-        '@cherrystudio/ai-core': resolve('packages/aiCore/src'),
-        '@cherrystudio/extension-table-plus': resolve('packages/extension-table-plus/src')
+        '@cherrystudio/ai-core': resolve('packages/aiCore/src')
       }
     },
     optimizeDeps: {
@@ -115,10 +105,6 @@ export default defineConfig({
           selectionToolbar: resolve(__dirname, 'src/renderer/selectionToolbar.html'),
           selectionAction: resolve(__dirname, 'src/renderer/selectionAction.html'),
           traceWindow: resolve(__dirname, 'src/renderer/traceWindow.html')
-        },
-        onwarn(warning, warn) {
-          if (warning.code === 'COMMONJS_VARIABLE_IN_ESM') return
-          warn(warning)
         }
       }
     },

eslint.config.mjs

@@ -1,8 +1,8 @@
+import electronConfigPrettier from '@electron-toolkit/eslint-config-prettier'
 import tseslint from '@electron-toolkit/eslint-config-ts'
 import eslint from '@eslint/js'
 import eslintReact from '@eslint-react/eslint-plugin'
 import { defineConfig } from 'eslint/config'
-import oxlint from 'eslint-plugin-oxlint'
 import reactHooks from 'eslint-plugin-react-hooks'
 import simpleImportSort from 'eslint-plugin-simple-import-sort'
 import unusedImports from 'eslint-plugin-unused-imports'
@@ -10,6 +10,7 @@ import unusedImports from 'eslint-plugin-unused-imports'
 export default defineConfig([
   eslint.configs.recommended,
   tseslint.configs.recommended,
+  electronConfigPrettier,
   eslintReact.configs['recommended-typescript'],
   reactHooks.configs['recommended-latest'],
   {
@@ -25,6 +26,7 @@ export default defineConfig([
       'simple-import-sort/exports': 'error',
       'unused-imports/no-unused-imports': 'error',
       '@eslint-react/no-prop-types': 'error',
+      'prettier/prettier': ['error']
     }
   },
   // Configuration for ensuring compatibility with the original ESLint(8.x) rules
@@ -48,31 +50,10 @@ export default defineConfig([
       '@eslint-react/no-children-to-array': 'off'
     }
   },
-  {
-    ignores: [
-      'node_modules/**',
-      'build/**',
-      'dist/**',
-      'out/**',
-      'local/**',
-      '.yarn/**',
-      '.gitignore',
-      'scripts/cloudflare-worker.js',
-      'src/main/integration/nutstore/sso/lib/**',
-      'src/main/integration/cherryai/index.js',
-      'src/main/integration/nutstore/sso/lib/**',
-      'src/renderer/src/ui/**',
-      'packages/**/dist'
-    ]
-  },
-  // turn off oxlint supported rules.
-  ...oxlint.configs['flat/eslint'],
-  ...oxlint.configs['flat/typescript'],
-  ...oxlint.configs['flat/unicorn'],
   {
     // LoggerService Custom Rules - only apply to src directory
     files: ['src/**/*.{ts,tsx,js,jsx}'],
-    ignores: ['src/**/__tests__/**', 'src/**/__mocks__/**', 'src/**/*.test.*', 'src/preload/**'],
+    ignores: ['src/**/__tests__/**', 'src/**/__mocks__/**', 'src/**/*.test.*'],
     rules: {
       'no-restricted-syntax': [
         process.env.PRCI ? 'error' : 'warn',
@@ -131,4 +112,17 @@ export default defineConfig([
       'i18n/no-template-in-t': 'warn'
     }
   },
+  {
+    ignores: [
+      'node_modules/**',
+      'build/**',
+      'dist/**',
+      'out/**',
+      'local/**',
+      '.yarn/**',
+      '.gitignore',
+      'scripts/cloudflare-worker.js',
+      'src/main/integration/nutstore/sso/lib/**'
+    ]
+  }
 ])

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "1.6.2",
+  "version": "1.6.0-beta.2",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",
@@ -19,8 +19,7 @@
         "packages/database",
         "packages/mcp-trace/trace-core",
         "packages/mcp-trace/trace-node",
-        "packages/mcp-trace/trace-web",
-        "packages/extension-table-plus"
+        "packages/mcp-trace/trace-web"
       ]
     }
   },
@@ -40,6 +39,7 @@
     "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,9 +47,9 @@
     "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": "concurrently -n \"node,web\" -c \"cyan,magenta\" \"npm run typecheck:node\" \"npm run typecheck:web\"",
-    "typecheck:node": "tsgo --noEmit -p tsconfig.node.json --composite false",
-    "typecheck:web": "tsgo --noEmit -p tsconfig.web.json --composite false",
+    "typecheck": "npm run typecheck:node && npm run typecheck:web",
+    "typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
+    "typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",
     "check:i18n": "tsx scripts/check-i18n.ts",
     "sync:i18n": "tsx scripts/sync-i18n.ts",
     "update:i18n": "dotenv -e .env -- tsx scripts/update-i18n.ts",
@@ -63,33 +63,23 @@
     "test:ui": "vitest --ui",
     "test:watch": "vitest",
     "test:e2e": "yarn playwright test",
-    "test:lint": "oxlint --deny-warnings && eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --cache",
+    "test:lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts",
     "test:scripts": "vitest scripts",
-    "lint": "oxlint --fix && eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --cache && yarn typecheck && yarn check:i18n",
-    "format": "biome format --write && biome lint --write",
-    "format:check": "biome format && biome lint",
-    "prepare": "git config blame.ignoreRevsFile .git-blame-ignore-revs && husky",
-    "claude": "dotenv -e .env -- claude",
-    "release:aicore:alpha": "yarn workspace @cherrystudio/ai-core version prerelease --immediate && yarn workspace @cherrystudio/ai-core npm publish --tag alpha --access public",
-    "release:aicore:beta": "yarn workspace @cherrystudio/ai-core version prerelease --immediate && yarn workspace @cherrystudio/ai-core npm publish --tag beta --access public",
-    "release:aicore": "yarn workspace @cherrystudio/ai-core version patch --immediate && yarn workspace @cherrystudio/ai-core npm publish --access public"
+    "format": "prettier --write .",
+    "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix && yarn typecheck && yarn check:i18n",
+    "prepare": "git config blame.ignoreRevsFile .git-blame-ignore-revs && husky"
   },
   "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",
-    "express": "^5.1.0",
-    "font-list": "^2.0.0",
     "graceful-fs": "^4.2.11",
     "jsdom": "26.1.0",
     "node-stream-zip": "^1.15.0",
     "officeparser": "^4.2.0",
     "os-proxy-config": "^1.1.2",
-    "selection-hook": "^1.0.12",
+    "selection-hook": "^1.0.11",
     "sharp": "^0.34.3",
-    "swagger-jsdoc": "^6.2.8",
-    "swagger-ui-express": "^5.0.1",
     "tesseract.js": "patch:tesseract.js@npm%3A6.0.1#~/.yarn/patches/tesseract.js-npm-6.0.1-2562a7e46d.patch",
     "turndown": "7.2.0"
   },
@@ -97,18 +87,16 @@
     "@agentic/exa": "^7.3.3",
     "@agentic/searxng": "^7.3.3",
     "@agentic/tavily": "^7.3.3",
-    "@ai-sdk/amazon-bedrock": "^3.0.29",
-    "@ai-sdk/google-vertex": "^3.0.33",
-    "@ai-sdk/mistral": "^2.0.17",
-    "@ai-sdk/perplexity": "^2.0.11",
+    "@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",
-    "@biomejs/biome": "2.2.4",
-    "@cherrystudio/ai-core": "workspace:^1.0.0-alpha.18",
+    "@cherrystudio/ai-core": "workspace:*",
     "@cherrystudio/embedjs": "^0.1.31",
     "@cherrystudio/embedjs-libsql": "^0.1.31",
     "@cherrystudio/embedjs-loader-csv": "^0.1.31",
@@ -121,11 +109,11 @@
     "@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",
     "@dnd-kit/utilities": "^3.2.2",
+    "@electron-toolkit/eslint-config-prettier": "^3.0.0",
     "@electron-toolkit/eslint-config-ts": "^3.0.0",
     "@electron-toolkit/preload": "^3.0.0",
     "@electron-toolkit/tsconfig": "^1.0.1",
@@ -135,12 +123,12 @@
     "@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": "^18.0.1",
-    "@heroui/react": "^2.8.3",
+    "@hello-pangea/dnd": "^16.6.0",
     "@kangfenmao/keyv-storage": "^0.1.0",
-    "@langchain/community": "^0.3.50",
+    "@langchain/community": "^0.3.36",
+    "@langchain/ollama": "^0.2.1",
     "@mistralai/mistralai": "^1.7.5",
-    "@modelcontextprotocol/sdk": "^1.17.5",
+    "@modelcontextprotocol/sdk": "^1.17.0",
     "@mozilla/readability": "^0.6.0",
     "@notionhq/client": "^2.2.15",
     "@openrouter/ai-sdk-provider": "^1.1.2",
@@ -152,58 +140,29 @@
     "@opentelemetry/sdk-trace-web": "^2.0.0",
     "@playwright/test": "^1.52.0",
     "@reduxjs/toolkit": "^2.2.5",
-    "@shikijs/markdown-it": "^3.12.0",
+    "@shikijs/markdown-it": "^3.9.1",
     "@swc/plugin-styled-components": "^8.0.4",
-    "@tailwindcss/vite": "^4.1.13",
-    "@tanstack/react-query": "^5.85.5",
+    "@tanstack/react-query": "^5.27.0",
     "@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/content-type": "^1.1.9",
-    "@types/cors": "^2.8.19",
     "@types/diff": "^7",
-    "@types/express": "^5",
     "@types/fs-extra": "^11",
-    "@types/he": "^1",
-    "@types/html-to-text": "^9",
     "@types/lodash": "^4.17.5",
     "@types/markdown-it": "^14",
     "@types/md5": "^2.3.5",
-    "@types/mime-types": "^3",
     "@types/node": "^22.17.1",
     "@types/pako": "^1.0.2",
     "@types/react": "^19.0.12",
     "@types/react-dom": "^19.0.4",
     "@types/react-infinite-scroll-component": "^5.0.0",
     "@types/react-transition-group": "^4.4.12",
-    "@types/react-window": "^1",
-    "@types/swagger-jsdoc": "^6",
-    "@types/swagger-ui-express": "^4.1.8",
     "@types/tinycolor2": "^1",
-    "@types/turndown": "^5.0.5",
     "@types/word-extractor": "^1",
-    "@typescript/native-preview": "latest",
     "@uiw/codemirror-extensions-langs": "^4.25.1",
     "@uiw/codemirror-themes-all": "^4.25.1",
     "@uiw/react-codemirror": "^4.25.1",
@@ -215,30 +174,24 @@
     "@viz-js/lang-dot": "^1.0.5",
     "@viz-js/viz": "^3.14.0",
     "@xyflow/react": "^12.4.4",
-    "ai": "^5.0.59",
+    "ai": "^5.0.26",
     "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",
-    "check-disk-space": "3.4.0",
-    "cheerio": "^1.1.2",
-    "chokidar": "^4.0.3",
     "cli-progress": "^3.12.0",
-    "clsx": "^2.1.1",
     "code-inspector-plugin": "^0.20.14",
     "color": "^5.0.0",
-    "concurrently": "^9.2.1",
     "country-flag-emoji-polyfill": "0.1.8",
     "dayjs": "^1.11.11",
     "dexie": "^4.0.8",
     "dexie-react-hooks": "^1.1.7",
-    "diff": "^8.0.2",
+    "diff": "^7.0.0",
     "docx": "^9.0.2",
-    "dompurify": "^3.2.6",
     "dotenv-cli": "^7.4.2",
-    "electron": "37.4.0",
+    "electron": "37.3.1",
     "electron-builder": "26.0.15",
     "electron-devtools-installer": "^3.2.0",
     "electron-store": "^8.2.0",
@@ -249,48 +202,40 @@
     "emoji-picker-element": "^1.22.1",
     "epub": "patch:epub@npm%3A1.3.0#~/.yarn/patches/epub-npm-1.3.0-8325494ffe.patch",
     "eslint": "^9.22.0",
-    "eslint-plugin-oxlint": "^1.15.0",
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-unused-imports": "^4.1.4",
     "fast-diff": "^1.3.0",
     "fast-xml-parser": "^5.2.0",
     "fetch-socks": "1.3.2",
-    "framer-motion": "^12.23.12",
     "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",
-    "html-to-text": "^9.0.5",
-    "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.1.0",
+    "linguist-languages": "^8.0.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.10.1",
+    "mermaid": "^11.9.0",
     "mime": "^4.0.4",
-    "mime-types": "^3.0.1",
     "motion": "^12.10.5",
     "notion-helper": "^1.3.22",
     "npx-scope-finder": "^1.2.0",
     "openai": "patch:openai@npm%3A5.12.2#~/.yarn/patches/openai-npm-5.12.2-30b075401c.patch",
-    "oxlint": "^1.15.0",
-    "oxlint-tsgolint": "^0.2.0",
     "p-queue": "^8.1.0",
     "pdf-lib": "^1.17.1",
-    "pdf-parse": "^1.1.1",
     "playwright": "^1.52.0",
+    "prettier": "^3.5.3",
+    "prettier-plugin-sort-json": "^4.1.1",
     "proxy-agent": "^6.5.0",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
@@ -300,7 +245,6 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-json-view": "^1.21.3",
     "react-markdown": "^10.1.0",
-    "react-player": "^3.3.1",
     "react-redux": "^9.1.2",
     "react-router": "6",
     "react-router-dom": "6",
@@ -320,19 +264,16 @@
     "remark-math": "^6.0.0",
     "remove-markdown": "^0.6.2",
     "rollup-plugin-visualizer": "^5.12.0",
-    "shiki": "^3.12.0",
+    "sass": "^1.88.0",
+    "shiki": "^3.9.1",
     "strict-url-sanitise": "^0.0.1",
     "string-width": "^7.2.0",
-    "striptags": "^3.2.0",
     "styled-components": "^6.1.11",
-    "tailwindcss": "^4.1.13",
     "tar": "^7.4.3",
     "tiny-pinyin": "^1.3.2",
     "tokenx": "^1.1.0",
     "tsx": "^4.20.3",
-    "turndown-plugin-gfm": "^1.0.2",
-    "tw-animate-css": "^1.3.8",
-    "typescript": "~5.8.2",
+    "typescript": "^5.6.2",
     "undici": "6.21.2",
     "unified": "^11.0.5",
     "uuid": "^10.0.0",
@@ -342,12 +283,8 @@
     "winston": "^3.17.0",
     "winston-daily-rotate-file": "^5.0.0",
     "word-extractor": "^1.0.4",
-    "y-protocols": "^1.0.6",
-    "yaml": "^2.8.1",
-    "yjs": "^13.6.27",
-    "youtubei.js": "^15.0.1",
     "zipread": "^1.3.3",
-    "zod": "^4.1.5"
+    "zod": "^3.25.74"
   },
   "resolutions": {
     "@codemirror/language": "6.11.3",
@@ -368,17 +305,16 @@
     "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",
-    "@ai-sdk/google@npm:2.0.14": "patch:@ai-sdk/google@npm%3A2.0.14#~/.yarn/patches/@ai-sdk-google-npm-2.0.14-376d8b03cc.patch"
+    "tesseract.js@npm:*": "patch:tesseract.js@npm%3A6.0.1#~/.yarn/patches/tesseract.js-npm-6.0.1-2562a7e46d.patch"
   },
   "packageManager": "yarn@4.9.1",
   "lint-staged": {
     "*.{js,jsx,ts,tsx,cjs,mjs,cts,mts}": [
-      "biome format --write --no-errors-on-unmatched",
+      "prettier --write",
       "eslint --fix"
     ],
-    "*.{json,yml,yaml,css,html}": [
-      "biome format --write --no-errors-on-unmatched"
+    "*.{json,yml,yaml,css,scss,html}": [
+      "prettier --write"
     ]
   }
 }

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

@@ -1,6 +1,6 @@
 {
   "name": "@cherrystudio/ai-core",
-  "version": "1.0.1",
+  "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",
@@ -36,15 +36,16 @@
     "ai": "^5.0.26"
   },
   "dependencies": {
-    "@ai-sdk/anthropic": "^2.0.22",
-    "@ai-sdk/azure": "^2.0.42",
-    "@ai-sdk/deepseek": "^1.0.20",
-    "@ai-sdk/openai": "^2.0.42",
-    "@ai-sdk/openai-compatible": "^1.0.19",
+    "@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.10",
-    "@ai-sdk/xai": "^2.0.23",
-    "zod": "^4.1.5"
+    "@ai-sdk/provider-utils": "^3.0.4",
+    "@ai-sdk/xai": "^2.0.9",
+    "zod": "^3.25.0"
   },
   "devDependencies": {
     "tsdown": "^0.12.9",

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

@@ -28,8 +28,8 @@ export class ModelResolver {
     let finalProviderId = fallbackProviderId
     let model: LanguageModelV2
     // 🎯 处理 OpenAI 模式选择逻辑 (从 ModelCreator 迁移)
-    if ((fallbackProviderId === 'openai' || fallbackProviderId === 'azure') && providerOptions?.mode === 'chat') {
-      finalProviderId = `${fallbackProviderId}-chat`
+    if (fallbackProviderId === 'openai' && providerOptions?.mode === 'chat') {
+      finalProviderId = 'openai-chat'
     }
 
     // 检查是否是命名空间格式

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

@@ -59,7 +59,7 @@ export function createGoogleOptions(options: ExtractProviderOptions<'google'>) {
 /**
  * 创建OpenRouter供应商选项的便捷函数
  */
-export function createOpenRouterOptions(options: ExtractProviderOptions<'openrouter'> | Record<string, any>) {
+export function createOpenRouterOptions(options: ExtractProviderOptions<'openrouter'>) {
   return createProviderOptions('openrouter', options)
 }
 

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

@@ -2,8 +2,9 @@ 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 XaiProviderOptions } from '@ai-sdk/xai'
-import { type OpenRouterProviderOptions } from '@openrouter/ai-sdk-provider'
+
+import { type OpenRouterProviderOptions } from './openrouter'
+import { type XaiProviderOptions } from './xai'
 
 export type ProviderOptions<T extends keyof SharedV2ProviderMetadata> = SharedV2ProviderMetadata[T]
 

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/built-in/googleToolsPlugin/index.ts

@@ -1,38 +0,0 @@
-import { google } from '@ai-sdk/google'
-
-import { definePlugin } from '../../'
-import type { AiRequestContext } from '../../types'
-
-const toolNameMap = {
-  googleSearch: 'google_search',
-  urlContext: 'url_context',
-  codeExecution: 'code_execution'
-} as const
-
-type ToolConfigKey = keyof typeof toolNameMap
-type ToolConfig = { googleSearch?: boolean; urlContext?: boolean; codeExecution?: boolean }
-
-export const googleToolsPlugin = (config?: ToolConfig) =>
-  definePlugin({
-    name: 'googleToolsPlugin',
-    transformParams: <T>(params: T, context: AiRequestContext): T => {
-      const { providerId } = context
-      if (providerId === 'google' && config) {
-        if (typeof params === 'object' && params !== null) {
-          const typedParams = params as T & { tools?: Record<string, unknown> }
-
-          if (!typedParams.tools) {
-            typedParams.tools = {}
-          }
-          // 使用类型安全的方式遍历配置
-          ;(Object.keys(config) as ToolConfigKey[]).forEach((key) => {
-            if (config[key] && key in toolNameMap && key in google.tools) {
-              const toolName = toolNameMap[key]
-              typedParams.tools![toolName] = google.tools[key]({})
-            }
-          })
-        }
-      }
-      return params
-    }
-  })

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

@@ -4,12 +4,7 @@
  */
 export const BUILT_IN_PLUGIN_PREFIX = 'built-in:'
 
-export { googleToolsPlugin } from './googleToolsPlugin'
 export { createLoggingPlugin } from './logging'
 export { createPromptToolUsePlugin } from './toolUsePlugin/promptToolUsePlugin'
-export type {
-  PromptToolUseConfig,
-  ToolUseRequestContext,
-  ToolUseResult
-} from './toolUsePlugin/type'
-export { webSearchPlugin, type WebSearchPluginConfig } from './webSearchPlugin'
+export type { PromptToolUseConfig, ToolUseRequestContext, ToolUseResult } from './toolUsePlugin/type'
+export { webSearchPlugin } from './webSearchPlugin'

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

@@ -27,20 +27,10 @@ export class StreamEventManager {
   /**
    * 发送步骤完成事件
    */
-  sendStepFinishEvent(
-    controller: StreamController,
-    chunk: any,
-    context: AiRequestContext,
-    finishReason: string = 'stop'
-  ): void {
-    // 累加当前步骤的 usage
-    if (chunk.usage && context.accumulatedUsage) {
-      this.accumulateUsage(context.accumulatedUsage, chunk.usage)
-    }
-
+  sendStepFinishEvent(controller: StreamController, chunk: any): void {
     controller.enqueue({
       type: 'finish-step',
-      finishReason,
+      finishReason: 'stop',
       response: chunk.response,
       usage: chunk.usage,
       providerMetadata: chunk.providerMetadata
@@ -53,32 +43,28 @@ export class StreamEventManager {
   async handleRecursiveCall(
     controller: StreamController,
     recursiveParams: any,
-    context: AiRequestContext
+    context: AiRequestContext,
+    stepId: string
   ): Promise<void> {
-    // try {
-    // 重置工具执行状态，准备处理新的步骤
-    context.hasExecutedToolsInCurrentStep = false
+    try {
+      console.log('[MCP Prompt] Starting recursive call after tool execution...')
 
-    const recursiveResult = await context.recursiveCall(recursiveParams)
+      const recursiveResult = await context.recursiveCall(recursiveParams)
 
-    if (recursiveResult && recursiveResult.fullStream) {
-      await this.pipeRecursiveStream(controller, recursiveResult.fullStream, context)
-    } else {
-      console.warn('[MCP Prompt] No fullstream found in recursive result:', recursiveResult)
+      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)
     }
-    // } catch (error) {
-    //   this.handleRecursiveCallError(controller, error, stepId)
-    // }
   }
 
   /**
    * 将递归流的数据传递到当前流
    */
-  private async pipeRecursiveStream(
-    controller: StreamController,
-    recursiveStream: ReadableStream,
-    context?: AiRequestContext
-  ): Promise<void> {
+  private async pipeRecursiveStream(controller: StreamController, recursiveStream: ReadableStream): Promise<void> {
     const reader = recursiveStream.getReader()
     try {
       while (true) {
@@ -87,16 +73,9 @@ export class StreamEventManager {
           break
         }
         if (value.type === 'finish') {
-          // 迭代的流不发finish，但需要累加其 usage
-          if (value.usage && context?.accumulatedUsage) {
-            this.accumulateUsage(context.accumulatedUsage, value.usage)
-          }
+          // 迭代的流不发finish
           break
         }
-        // 对于 finish-step 类型，累加其 usage
-        if (value.type === 'finish-step' && value.usage && context?.accumulatedUsage) {
-          this.accumulateUsage(context.accumulatedUsage, value.usage)
-        }
         // 将递归流的数据传递到当前流
         controller.enqueue(value)
       }
@@ -108,25 +87,25 @@ export class StreamEventManager {
   /**
    * 处理递归调用错误
    */
-  // private handleRecursiveCallError(controller: StreamController, error: unknown): void {
-  //   console.error('[MCP Prompt] Recursive call failed:', error)
+  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'
-  //     }
-  //   })
+    // 使用 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[工具执行后递归调用失败，继续对话...]'
-  //   // })
-  // }
+    // 继续发送文本增量，保持流的连续性
+    controller.enqueue({
+      type: 'text-delta',
+      id: stepId,
+      text: '\n\n[工具执行后递归调用失败，继续对话...]'
+    })
+  }
 
   /**
    * 构建递归调用的参数
@@ -157,18 +136,4 @@ export class StreamEventManager {
 
     return recursiveParams
   }
-
-  /**
-   * 累加 usage 数据
-   */
-  private accumulateUsage(target: any, source: any): void {
-    if (!target || !source) return
-
-    // 累加各种 token 类型
-    target.inputTokens = (target.inputTokens || 0) + (source.inputTokens || 0)
-    target.outputTokens = (target.outputTokens || 0) + (source.outputTokens || 0)
-    target.totalTokens = (target.totalTokens || 0) + (source.totalTokens || 0)
-    target.reasoningTokens = (target.reasoningTokens || 0) + (source.reasoningTokens || 0)
-    target.cachedInputTokens = (target.cachedInputTokens || 0) + (source.cachedInputTokens || 0)
-  }
 }

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

@@ -4,7 +4,7 @@
  * 负责工具的执行、结果格式化和相关事件发送
  * 从 promptToolUsePlugin.ts 中提取出来以降低复杂度
  */
-import type { ToolSet, TypedToolError } from 'ai'
+import type { ToolSet } from 'ai'
 
 import type { ToolUseResult } from './type'
 
@@ -38,6 +38,7 @@ export class ToolExecutor {
     controller: StreamController
   ): Promise<ExecutedResult[]> {
     const executedResults: ExecutedResult[] = []
+
     for (const toolUse of toolUses) {
       try {
         const tool = tools[toolUse.toolName]
@@ -45,12 +46,17 @@ export class ToolExecutor {
           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: toolUse.arguments
+          input: tool.inputSchema
         })
 
         const result = await tool.execute(toolUse.arguments, {
@@ -105,46 +111,45 @@ export class ToolExecutor {
   /**
    * 发送工具调用开始相关事件
    */
-  // private sendToolStartEvents(controller: StreamController, toolUse: ToolUseResult): void {
-  //   // 发送 tool-input-start 事件
-  //   controller.enqueue({
-  //     type: 'tool-input-start',
-  //     id: toolUse.id,
-  //     toolName: toolUse.toolName
-  //   })
-  // }
+  private sendToolStartEvents(controller: StreamController, toolUse: ToolUseResult): void {
+    // 发送 tool-input-start 事件
+    controller.enqueue({
+      type: 'tool-input-start',
+      id: toolUse.id,
+      toolName: toolUse.toolName
+    })
+  }
 
   /**
    * 处理工具执行错误
    */
-  private handleToolError<T extends ToolSet>(
+  private handleToolError(
     toolUse: ToolUseResult,
     error: unknown,
     controller: StreamController
+    // _tools: ToolSet
   ): ExecutedResult {
     // 使用 AI SDK 标准错误格式
-    const toolError: TypedToolError<T> = {
-      type: 'tool-error',
-      toolCallId: toolUse.id,
-      toolName: toolUse.toolName,
-      input: toolUse.arguments,
-      error
-    }
-
-    controller.enqueue(toolError)
-
-    // 发送标准错误事件
-    // controller.enqueue({
+    // const toolError: TypedToolError<typeof _tools> = {
     //   type: 'tool-error',
     //   toolCallId: toolUse.id,
-    //   error: error instanceof Error ? error.message : String(error),
-    //   input: toolUse.arguments
-    // })
+    //   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,
+      result: error instanceof Error ? error.message : String(error),
       isError: true
     }
   }

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

@@ -8,19 +8,9 @@ import type { TextStreamPart, ToolSet } from 'ai'
 import { definePlugin } from '../../index'
 import type { AiRequestContext } from '../../types'
 import { StreamEventManager } from './StreamEventManager'
-import { type TagConfig, TagExtractor } from './tagExtraction'
 import { ToolExecutor } from './ToolExecutor'
 import { PromptToolUseConfig, ToolUseResult } from './type'
 
-/**
- * 工具使用标签配置
- */
-const TOOL_USE_TAG_CONFIG: TagConfig = {
-  openingTag: '<tool_use>',
-  closingTag: '</tool_use>',
-  separator: '\n'
-}
-
 /**
  * 默认系统提示符模板（提取自 Cherry Studio）
  */
@@ -156,10 +146,8 @@ Assistant: The population of Shanghai is 26 million, while Guangzhou has a popul
 /**
  * 构建可用工具部分（提取自 Cherry Studio）
  */
-function buildAvailableTools(tools: ToolSet): string | null {
+function buildAvailableTools(tools: ToolSet): string {
   const availableTools = Object.keys(tools)
-  if (availableTools.length === 0) return null
-  const result = availableTools
     .map((toolName: string) => {
       const tool = tools[toolName]
       return `
@@ -174,7 +162,7 @@ function buildAvailableTools(tools: ToolSet): string | null {
     })
     .join('\n')
   return `<tools>
-${result}
+${availableTools}
 </tools>`
 }
 
@@ -183,7 +171,6 @@ ${result}
  */
 function defaultBuildSystemPrompt(userSystemPrompt: string, tools: ToolSet): string {
   const availableTools = buildAvailableTools(tools)
-  if (availableTools === null) return userSystemPrompt
 
   const fullPrompt = DEFAULT_SYSTEM_PROMPT.replace('{{ TOOL_USE_EXAMPLES }}', DEFAULT_TOOL_USE_EXAMPLES)
     .replace('{{ AVAILABLE_TOOLS }}', availableTools)
@@ -261,76 +248,40 @@ export const createPromptToolUsePlugin = (config: PromptToolUseConfig = {}) => {
         return params
       }
 
-      // 分离 provider-defined 和其他类型的工具
-      const providerDefinedTools: ToolSet = {}
-      const promptTools: ToolSet = {}
+      context.mcpTools = params.tools
+      console.log('tools stored in context', params.tools)
 
-      for (const [toolName, tool] of Object.entries(params.tools as ToolSet)) {
-        if (tool.type === 'provider-defined') {
-          // provider-defined 类型的工具保留在 tools 参数中
-          providerDefinedTools[toolName] = tool
-        } else {
-          // 其他工具转换为 prompt 模式
-          promptTools[toolName] = tool
-        }
-      }
-
-      // 只有当有非 provider-defined 工具时才保存到 context
-      if (Object.keys(promptTools).length > 0) {
-        context.mcpTools = promptTools
-      }
-
-      // 构建系统提示符（只包含非 provider-defined 工具）
+      // 构建系统提示符
       const userSystemPrompt = typeof params.system === 'string' ? params.system : ''
-      const systemPrompt = buildSystemPrompt(userSystemPrompt, promptTools)
+      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)
       }
 
-      // 保留 provider-defined tools，移除其他 tools
+      // 移除 tools，改为 prompt 模式
       const transformedParams = {
         ...params,
         ...(systemMessage ? { system: systemMessage } : {}),
-        tools: Object.keys(providerDefinedTools).length > 0 ? providerDefinedTools : undefined
+        tools: undefined
       }
       context.originalParams = transformedParams
+      console.log('transformedParams', transformedParams)
       return transformedParams
     },
     transformStream: (_: any, context: AiRequestContext) => () => {
       let textBuffer = ''
-      // let stepId = ''
+      let stepId = ''
 
-      // 如果没有需要 prompt 模式处理的工具，直接返回原始流
       if (!context.mcpTools) {
-        return new TransformStream()
+        throw new Error('No tools available')
       }
 
-      // 从 context 中获取或初始化 usage 累加器
-      if (!context.accumulatedUsage) {
-        context.accumulatedUsage = {
-          inputTokens: 0,
-          outputTokens: 0,
-          totalTokens: 0,
-          reasoningTokens: 0,
-          cachedInputTokens: 0
-        }
-      }
-
-      // 创建工具执行器、流事件管理器和标签提取器
+      // 创建工具执行器和流事件管理器
       const toolExecutor = new ToolExecutor()
       const streamEventManager = new StreamEventManager()
-      const tagExtractor = new TagExtractor(TOOL_USE_TAG_CONFIG)
-
-      // 在context中初始化工具执行状态，避免递归调用时状态丢失
-      if (!context.hasExecutedToolsInCurrentStep) {
-        context.hasExecutedToolsInCurrentStep = false
-      }
-
-      // 用于hold text-start事件，直到确认有非工具标签内容
-      let pendingTextStart: TextStreamPart<TOOLS> | null = null
-      let hasStartedText = false
 
       type TOOLS = NonNullable<typeof context.mcpTools>
       return new TransformStream<TextStreamPart<TOOLS>, TextStreamPart<TOOLS>>({
@@ -338,106 +289,83 @@ export const createPromptToolUsePlugin = (config: PromptToolUseConfig = {}) => {
           chunk: TextStreamPart<TOOLS>,
           controller: TransformStreamDefaultController<TextStreamPart<TOOLS>>
         ) {
-          // Hold住text-start事件，直到确认有非工具标签内容
-          if ((chunk as any).type === 'text-start') {
-            pendingTextStart = chunk
-            return
-          }
-
-          // text-delta阶段：收集文本内容并过滤工具标签
+          // 收集文本内容
           if (chunk.type === 'text-delta') {
             textBuffer += chunk.text || ''
-            // stepId = chunk.id || ''
-
-            // 使用TagExtractor过滤工具标签，只传递非标签内容到UI层
-            const extractionResults = tagExtractor.processText(chunk.text || '')
-
-            for (const result of extractionResults) {
-              // 只传递非标签内容到UI层
-              if (!result.isTagContent && result.content) {
-                // 如果还没有发送text-start且有pending的text-start，先发送它
-                if (!hasStartedText && pendingTextStart) {
-                  controller.enqueue(pendingTextStart)
-                  hasStartedText = true
-                  pendingTextStart = null
-                }
-
-                const filteredChunk = {
-                  ...chunk,
-                  text: result.content
-                }
-                controller.enqueue(filteredChunk)
-              }
-            }
-            return
-          }
-
-          if (chunk.type === 'text-end') {
-            // 只有当已经发送了text-start时才发送text-end
-            if (hasStartedText) {
-              controller.enqueue(chunk)
-            }
-            return
-          }
-
-          if (chunk.type === 'finish-step') {
-            // 统一在finish-step阶段检查并执行工具调用
-            const tools = context.mcpTools
-            if (tools && Object.keys(tools).length > 0 && !context.hasExecutedToolsInCurrentStep) {
-              // 解析完整的textBuffer来检测工具调用
-              const { results: parsedTools } = parseToolUse(textBuffer, tools)
-              const validToolUses = parsedTools.filter((t) => t.status === 'pending')
-
-              if (validToolUses.length > 0) {
-                context.hasExecutedToolsInCurrentStep = true
-
-                // 执行工具调用（不需要手动发送 start-step，外部流已经处理）
-                const executedResults = await toolExecutor.executeTools(validToolUses, tools, controller)
-
-                // 发送步骤完成事件，使用 tool-calls 作为 finishReason
-                streamEventManager.sendStepFinishEvent(controller, chunk, context, 'tool-calls')
-
-                // 处理递归调用
-                const toolResultsText = toolExecutor.formatToolResults(executedResults)
-                const recursiveParams = streamEventManager.buildRecursiveParams(
-                  context,
-                  textBuffer,
-                  toolResultsText,
-                  tools
-                )
-
-                await streamEventManager.handleRecursiveCall(controller, recursiveParams, context)
-                return
-              }
-            }
-
-            // 如果没有执行工具调用，直接传递原始finish-step事件
+            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
           }
 
-          // 处理 finish 类型，使用累加后的 totalUsage
-          if (chunk.type === 'finish') {
-            controller.enqueue({
-              ...chunk,
-              totalUsage: context.accumulatedUsage
-            })
-            return
-          }
-
-          // 对于其他类型的事件，直接传递（不包括text-start，已在上面处理）
-          if ((chunk as any).type !== 'text-start') {
-            controller.enqueue(chunk)
-          }
+          // 对于其他类型的事件，直接传递
+          controller.enqueue(chunk)
         },
 
         flush() {
-          // 清理pending状态
-          pendingTextStart = null
-          hasStartedText = false
+          // 流结束时的清理工作
+          console.log('[MCP Prompt] Stream ended, cleaning up...')
         }
       })
     }

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

@@ -1,19 +1,15 @@
 import { anthropic } from '@ai-sdk/anthropic'
 import { google } from '@ai-sdk/google'
 import { openai } from '@ai-sdk/openai'
-import { InferToolInput, InferToolOutput } from 'ai'
 
 import { ProviderOptionsMap } from '../../../options/types'
-import { OpenRouterSearchConfig } from './openrouter'
 
 /**
  * 从 AI SDK 的工具函数中提取参数类型，以确保类型安全。
  */
-export type OpenAISearchConfig = NonNullable<Parameters<typeof openai.tools.webSearch>[0]>
-export type OpenAISearchPreviewConfig = NonNullable<Parameters<typeof openai.tools.webSearchPreview>[0]>
-export type AnthropicSearchConfig = NonNullable<Parameters<typeof anthropic.tools.webSearch_20250305>[0]>
-export type GoogleSearchConfig = NonNullable<Parameters<typeof google.tools.googleSearch>[0]>
-export type XAISearchConfig = NonNullable<ProviderOptionsMap['xai']['searchParameters']>
+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]
 
 /**
  * 插件初始化时接收的完整配置对象
@@ -22,12 +18,10 @@ export type XAISearchConfig = NonNullable<ProviderOptionsMap['xai']['searchParam
  */
 export interface WebSearchPluginConfig {
   openai?: OpenAISearchConfig
-  'openai-chat'?: OpenAISearchPreviewConfig
   anthropic?: AnthropicSearchConfig
   xai?: ProviderOptionsMap['xai']['searchParameters']
   google?: GoogleSearchConfig
   'google-vertex'?: GoogleSearchConfig
-  openrouter?: OpenRouterSearchConfig
 }
 
 /**
@@ -37,7 +31,6 @@ export const DEFAULT_WEB_SEARCH_CONFIG: WebSearchPluginConfig = {
   google: {},
   'google-vertex': {},
   openai: {},
-  'openai-chat': {},
   xai: {
     mode: 'on',
     returnCitations: true,
@@ -46,44 +39,29 @@ export const DEFAULT_WEB_SEARCH_CONFIG: WebSearchPluginConfig = {
   },
   anthropic: {
     maxUses: 5
-  },
-  openrouter: {
-    plugins: [
-      {
-        id: 'web',
-        max_results: 5
-      }
-    ]
   }
 }
 
 export type WebSearchToolOutputSchema = {
   // Anthropic 工具 - 手动定义
-  anthropic: InferToolOutput<ReturnType<typeof anthropic.tools.webSearch_20250305>>
+  anthropicWebSearch: Array<{
+    url: string
+    title: string
+    pageAge: string | null
+    encryptedContent: string
+    type: string
+  }>
 
   // OpenAI 工具 - 基于实际输出
-  // TODO: 上游定义不规范,是unknown
-  // openai: InferToolOutput<ReturnType<typeof openai.tools.webSearch>>
-  openai: {
-    status: 'completed' | 'failed'
-  }
-  'openai-chat': {
+  openaiWebSearch: {
     status: 'completed' | 'failed'
   }
+
   // Google 工具
-  // TODO: 上游定义不规范,是unknown
-  // google: InferToolOutput<ReturnType<typeof google.tools.googleSearch>>
-  google: {
+  googleSearch: {
     webSearchQueries?: string[]
     groundingChunks?: Array<{
       web?: { uri: string; title: string }
     }>
   }
 }
-
-export type WebSearchToolInputSchema = {
-  anthropic: InferToolInput<ReturnType<typeof anthropic.tools.webSearch_20250305>>
-  openai: InferToolInput<ReturnType<typeof openai.tools.webSearch>>
-  google: InferToolInput<ReturnType<typeof google.tools.googleSearch>>
-  'openai-chat': InferToolInput<ReturnType<typeof openai.tools.webSearchPreview>>
-}

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

@@ -6,7 +6,7 @@ import { anthropic } from '@ai-sdk/anthropic'
 import { google } from '@ai-sdk/google'
 import { openai } from '@ai-sdk/openai'
 
-import { createOpenRouterOptions, createXaiOptions, mergeProviderOptions } from '../../../options'
+import { createXaiOptions, mergeProviderOptions } from '../../../options'
 import { definePlugin } from '../../'
 import type { AiRequestContext } from '../../types'
 import { DEFAULT_WEB_SEARCH_CONFIG, WebSearchPluginConfig } from './helper'
@@ -27,14 +27,7 @@ export const webSearchPlugin = (config: WebSearchPluginConfig = DEFAULT_WEB_SEAR
         case 'openai': {
           if (config.openai) {
             if (!params.tools) params.tools = {}
-            params.tools.web_search = openai.tools.webSearch(config.openai)
-          }
-          break
-        }
-        case 'openai-chat': {
-          if (config['openai-chat']) {
-            if (!params.tools) params.tools = {}
-            params.tools.web_search_preview = openai.tools.webSearchPreview(config['openai-chat'])
+            params.tools.web_search_preview = openai.tools.webSearchPreview(config.openai)
           }
           break
         }
@@ -63,14 +56,6 @@ export const webSearchPlugin = (config: WebSearchPluginConfig = DEFAULT_WEB_SEAR
           }
           break
         }
-
-        case 'openrouter': {
-          if (config.openrouter) {
-            const searchOptions = createOpenRouterOptions(config.openrouter)
-            params.providerOptions = mergeProviderOptions(params.providerOptions, searchOptions)
-          }
-          break
-        }
       }
 
       return params

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

@@ -1,26 +0,0 @@
-export type OpenRouterSearchConfig = {
-  plugins?: Array<{
-    id: 'web'
-    /**
-     * Maximum number of search results to include (default: 5)
-     */
-    max_results?: number
-    /**
-     * Custom search prompt to guide the search query
-     */
-    search_prompt?: string
-  }>
-  /**
-   * Built-in web search options for models that support native web search
-   */
-  web_search_options?: {
-    /**
-     * Maximum number of search results to include
-     */
-    max_results?: number
-    /**
-     * Custom search prompt to guide the search query
-     */
-    search_prompt?: string
-  }
-}

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

@@ -1,8 +1,5 @@
 // 核心类型和接口
 export type { AiPlugin, AiRequestContext, HookResult, PluginManagerConfig } from './types'
-import type { ImageModelV2 } from '@ai-sdk/provider'
-import type { LanguageModel } from 'ai'
-
 import type { ProviderId } from '../providers'
 import type { AiPlugin, AiRequestContext } from './types'
 
@@ -12,16 +9,16 @@ export { PluginManager } from './manager'
 // 工具函数
 export function createContext<T extends ProviderId>(
   providerId: T,
-  model: LanguageModel | ImageModelV2,
+  modelId: string,
   originalParams: any
 ): AiRequestContext {
   return {
     providerId,
-    model,
+    modelId,
     originalParams,
     metadata: {},
     startTime: Date.now(),
-    requestId: `${providerId}-${typeof model === 'string' ? model : model?.modelId}-${Date.now()}-${Math.random().toString(36).slice(2)}`,
+    requestId: `${providerId}-${modelId}-${Date.now()}-${Math.random().toString(36).slice(2)}`,
     // 占位
     recursiveCall: () => Promise.resolve(null)
   }

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

@@ -14,7 +14,7 @@ export type RecursiveCallFn = (newParams: any) => Promise<any>
  */
 export interface AiRequestContext {
   providerId: ProviderId
-  model: LanguageModel | ImageModelV2
+  modelId: string
   originalParams: any
   metadata: Record<string, any>
   startTime: number

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

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

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

@@ -93,7 +93,7 @@ initializeBuiltInConfigs()
 export function registerProviderConfig(config: ProviderConfig): boolean {
   try {
     // 验证配置
-    if (!config || !config.id || !config.name) {
+    if (!config.id || !config.name) {
       return false
     }
 
@@ -176,7 +176,7 @@ export function registerProvider(providerId: string, provider: any): boolean {
     // 处理特殊provider逻辑
     if (providerId === 'openai') {
       // 注册默认 openai
-      globalRegistryManagement.registerProvider(providerId, provider, aliases)
+      globalRegistryManagement.registerProvider('openai', provider, aliases)
 
       // 创建并注册 openai-chat 变体
       const openaiChatProvider = customProvider({
@@ -185,17 +185,7 @@ export function registerProvider(providerId: string, provider: any): boolean {
           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)
+      globalRegistryManagement.registerProvider('openai-chat', openaiChatProvider)
     } else {
       // 其他provider直接注册
       globalRegistryManagement.registerProvider(providerId, provider, aliases)

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

@@ -4,53 +4,12 @@
 
 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 { LanguageModelV2 } from '@ai-sdk/provider'
 import { createXai } from '@ai-sdk/xai'
-import { createOpenRouter } from '@openrouter/ai-sdk-provider'
-import { customProvider, Provider } from 'ai'
-import { z } from 'zod'
-
-/**
- * 基础 Provider IDs
- */
-export const baseProviderIds = [
-  'openai',
-  'openai-chat',
-  'openai-compatible',
-  'anthropic',
-  'google',
-  'xai',
-  'azure',
-  'azure-responses',
-  'deepseek',
-  'openrouter'
-] as const
-
-/**
- * 基础 Provider ID Schema
- */
-export const baseProviderIdSchema = z.enum(baseProviderIds)
-
-/**
- * 基础 Provider ID
- */
-export type BaseProviderId = z.infer<typeof baseProviderIdSchema>
-
-export const isBaseProvider = (id: ProviderId): id is BaseProviderId => {
-  return baseProviderIdSchema.safeParse(id).success
-}
-
-type BaseProvider = {
-  id: BaseProviderId
-  name: string
-  creator: (options: any) => Provider | LanguageModelV2
-  supportsImageGeneration: boolean
-}
+import * as z from 'zod'
 
 /**
  * 基础 Providers 定义
@@ -64,17 +23,9 @@ export const baseProviders = [
     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)
-        }
-      })
-    },
+    id: 'openai-responses',
+    name: 'OpenAI Responses',
+    creator: (options: OpenAIProviderSettings) => createOpenAI(options).responses,
     supportsImageGeneration: true
   },
   {
@@ -107,33 +58,24 @@ export const baseProviders = [
     creator: createAzure,
     supportsImageGeneration: true
   },
-  {
-    id: 'azure-responses',
-    name: 'Azure OpenAI Responses',
-    creator: (options: AzureOpenAIProviderSettings) => {
-      const provider = createAzure(options)
-      return customProvider({
-        fallbackProvider: {
-          ...provider,
-          languageModel: (modelId: string) => provider.responses(modelId)
-        }
-      })
-    },
-    supportsImageGeneration: true
-  },
   {
     id: 'deepseek',
     name: 'DeepSeek',
     creator: createDeepSeek,
     supportsImageGeneration: false
-  },
-  {
-    id: 'openrouter',
-    name: 'OpenRouter',
-    creator: createOpenRouter,
-    supportsImageGeneration: true
   }
-] as const satisfies BaseProvider[]
+] as const
+
+/**
+ * 基础 Provider IDs
+ * 从 baseProviders 动态生成
+ */
+export const baseProviderIds = baseProviders.map((p) => p.id) as unknown as readonly [string, ...string[]]
+
+/**
+ * 基础 Provider ID Schema
+ */
+export const baseProviderIdSchema = z.enum(baseProviderIds)
 
 /**
  * 用户自定义 Provider ID Schema
@@ -159,12 +101,7 @@ export const providerConfigSchema = z
   .object({
     id: customProviderIdSchema, // 只允许自定义ID
     name: z.string().min(1),
-    creator: z
-      .function({
-        input: z.any(),
-        output: z.any()
-      })
-      .optional(),
+    creator: z.function().optional(),
     import: z.function().optional(),
     creatorFunctionName: z.string().optional(),
     supportsImageGeneration: z.boolean().default(false),
@@ -180,6 +117,7 @@ export const providerConfigSchema = z
  * Provider ID 类型 - 基于 zod schema 推导
  */
 export type ProviderId = z.infer<typeof providerIdSchema>
+export type BaseProviderId = z.infer<typeof baseProviderIdSchema>
 export type CustomProviderId = z.infer<typeof customProviderIdSchema>
 
 /**

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

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

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

@@ -4,12 +4,12 @@
  */
 import { ImageModelV2, LanguageModelV2, LanguageModelV2Middleware } from '@ai-sdk/provider'
 import {
-  experimental_generateImage as _generateImage,
-  generateObject as _generateObject,
-  generateText as _generateText,
+  experimental_generateImage as generateImage,
+  generateObject,
+  generateText,
   LanguageModel,
-  streamObject as _streamObject,
-  streamText as _streamText
+  streamObject,
+  streamText
 } from 'ai'
 
 import { globalModelResolver } from '../models'
@@ -18,14 +18,7 @@ import { type AiPlugin, type AiRequestContext, definePlugin } from '../plugins'
 import { type ProviderId } from '../providers'
 import { ImageGenerationError, ImageModelResolutionError } from './errors'
 import { PluginEngine } from './pluginEngine'
-import type {
-  generateImageParams,
-  generateObjectParams,
-  generateTextParams,
-  RuntimeConfig,
-  streamObjectParams,
-  streamTextParams
-} from './types'
+import { type RuntimeConfig } from './types'
 
 export class RuntimeExecutor<T extends ProviderId = ProviderId> {
   public pluginEngine: PluginEngine<T>
@@ -79,38 +72,47 @@ export class RuntimeExecutor<T extends ProviderId = ProviderId> {
   // === 高阶重载：直接使用模型 ===
 
   /**
-   * 流式文本生成
+   * 流式文本生成 - 使用已创建的模型（高级用法）
    */
   async streamText(
-    params: streamTextParams,
+    model: LanguageModel,
+    params: Omit<Parameters<typeof streamText>[0], 'model'>
+  ): Promise<ReturnType<typeof streamText>>
+  async streamText(
+    modelId: string,
+    params: Omit<Parameters<typeof streamText>[0], 'model'>,
     options?: {
       middlewares?: LanguageModelV2Middleware[]
     }
-  ): Promise<ReturnType<typeof _streamText>> {
-    const { model } = params
-
-    // 根据 model 类型决定插件配置
-    if (typeof model === 'string') {
-      this.pluginEngine.usePlugins([
-        this.createResolveModelPlugin(options?.middlewares),
-        this.createConfigureContextPlugin()
-      ])
-    } else {
-      this.pluginEngine.usePlugins([this.createConfigureContextPlugin()])
+  ): Promise<ReturnType<typeof streamText>>
+  async streamText(
+    modelOrId: LanguageModel,
+    params: Omit<Parameters<typeof streamText>[0], 'model'>,
+    options?: {
+      middlewares?: LanguageModelV2Middleware[]
     }
+  ): Promise<ReturnType<typeof streamText>> {
+    this.pluginEngine.usePlugins([
+      this.createResolveModelPlugin(options?.middlewares),
+      this.createConfigureContextPlugin()
+    ])
 
+    // 2. 执行插件处理
     return this.pluginEngine.executeStreamWithPlugins(
       'streamText',
+      typeof modelOrId === 'string' ? modelOrId : modelOrId.modelId,
       params,
-      (resolvedModel, transformedParams, streamTransforms) => {
+      async (model, transformedParams, streamTransforms) => {
         const experimental_transform =
           params?.experimental_transform ?? (streamTransforms.length > 0 ? streamTransforms : undefined)
 
-        return _streamText({
+        const finalParams = {
+          model,
           ...transformedParams,
-          model: resolvedModel,
           experimental_transform
-        })
+        } as Parameters<typeof streamText>[0]
+
+        return await streamText(finalParams)
       }
     )
   }
@@ -118,111 +120,145 @@ export class RuntimeExecutor<T extends ProviderId = ProviderId> {
   // === 其他方法的重载 ===
 
   /**
-   * 生成文本
+   * 生成文本 - 使用已创建的模型
    */
   async generateText(
-    params: generateTextParams,
+    model: LanguageModel,
+    params: Omit<Parameters<typeof generateText>[0], 'model'>
+  ): Promise<ReturnType<typeof generateText>>
+  async generateText(
+    modelId: string,
+    params: Omit<Parameters<typeof generateText>[0], 'model'>,
     options?: {
       middlewares?: LanguageModelV2Middleware[]
     }
-  ): Promise<ReturnType<typeof _generateText>> {
-    const { model } = params
-
-    // 根据 model 类型决定插件配置
-    if (typeof model === 'string') {
-      this.pluginEngine.usePlugins([
-        this.createResolveModelPlugin(options?.middlewares),
-        this.createConfigureContextPlugin()
-      ])
-    } else {
-      this.pluginEngine.usePlugins([this.createConfigureContextPlugin()])
+  ): Promise<ReturnType<typeof generateText>>
+  async generateText(
+    modelOrId: LanguageModel | string,
+    params: Omit<Parameters<typeof generateText>[0], 'model'>,
+    options?: {
+      middlewares?: LanguageModelV2Middleware[]
     }
+  ): Promise<ReturnType<typeof generateText>> {
+    this.pluginEngine.usePlugins([
+      this.createResolveModelPlugin(options?.middlewares),
+      this.createConfigureContextPlugin()
+    ])
 
-    return this.pluginEngine.executeWithPlugins<Parameters<typeof _generateText>[0], ReturnType<typeof _generateText>>(
+    return this.pluginEngine.executeWithPlugins(
       'generateText',
+      typeof modelOrId === 'string' ? modelOrId : modelOrId.modelId,
       params,
-      (resolvedModel, transformedParams) => _generateText({ ...transformedParams, model: resolvedModel })
+      async (model, transformedParams) =>
+        generateText({ model, ...transformedParams } as Parameters<typeof generateText>[0])
     )
   }
 
   /**
-   * 生成结构化对象
+   * 生成结构化对象 - 使用已创建的模型
    */
   async generateObject(
-    params: generateObjectParams,
+    model: LanguageModel,
+    params: Omit<Parameters<typeof generateObject>[0], 'model'>
+  ): Promise<ReturnType<typeof generateObject>>
+  async generateObject(
+    modelOrId: string,
+    params: Omit<Parameters<typeof generateObject>[0], 'model'>,
     options?: {
       middlewares?: LanguageModelV2Middleware[]
     }
-  ): Promise<ReturnType<typeof _generateObject>> {
-    const { model } = params
-
-    // 根据 model 类型决定插件配置
-    if (typeof model === 'string') {
-      this.pluginEngine.usePlugins([
-        this.createResolveModelPlugin(options?.middlewares),
-        this.createConfigureContextPlugin()
-      ])
-    } else {
-      this.pluginEngine.usePlugins([this.createConfigureContextPlugin()])
+  ): Promise<ReturnType<typeof generateObject>>
+  async generateObject(
+    modelOrId: LanguageModel | string,
+    params: Omit<Parameters<typeof generateObject>[0], 'model'>,
+    options?: {
+      middlewares?: LanguageModelV2Middleware[]
     }
+  ): Promise<ReturnType<typeof generateObject>> {
+    this.pluginEngine.usePlugins([
+      this.createResolveModelPlugin(options?.middlewares),
+      this.createConfigureContextPlugin()
+    ])
 
-    return this.pluginEngine.executeWithPlugins<generateObjectParams, ReturnType<typeof _generateObject>>(
+    return this.pluginEngine.executeWithPlugins(
       'generateObject',
+      typeof modelOrId === 'string' ? modelOrId : modelOrId.modelId,
       params,
-      async (resolvedModel, transformedParams) => _generateObject({ ...transformedParams, model: resolvedModel })
+      async (model, transformedParams) =>
+        generateObject({ model, ...transformedParams } as Parameters<typeof generateObject>[0])
     )
   }
 
   /**
-   * 流式生成结构化对象
+   * 流式生成结构化对象 - 使用已创建的模型
    */
-  streamObject(
-    params: streamObjectParams,
+  async streamObject(
+    model: LanguageModel,
+    params: Omit<Parameters<typeof streamObject>[0], 'model'>
+  ): Promise<ReturnType<typeof streamObject>>
+  async streamObject(
+    modelId: string,
+    params: Omit<Parameters<typeof streamObject>[0], 'model'>,
     options?: {
       middlewares?: LanguageModelV2Middleware[]
     }
-  ): Promise<ReturnType<typeof _streamObject>> {
-    const { model } = params
-
-    // 根据 model 类型决定插件配置
-    if (typeof model === 'string') {
-      this.pluginEngine.usePlugins([
-        this.createResolveModelPlugin(options?.middlewares),
-        this.createConfigureContextPlugin()
-      ])
-    } else {
-      this.pluginEngine.usePlugins([this.createConfigureContextPlugin()])
+  ): Promise<ReturnType<typeof streamObject>>
+  async streamObject(
+    modelOrId: LanguageModel | string,
+    params: Omit<Parameters<typeof streamObject>[0], 'model'>,
+    options?: {
+      middlewares?: LanguageModelV2Middleware[]
     }
+  ): Promise<ReturnType<typeof streamObject>> {
+    this.pluginEngine.usePlugins([
+      this.createResolveModelPlugin(options?.middlewares),
+      this.createConfigureContextPlugin()
+    ])
 
-    return this.pluginEngine.executeStreamWithPlugins('streamObject', params, (resolvedModel, transformedParams) =>
-      _streamObject({ ...transformedParams, model: resolvedModel })
+    return this.pluginEngine.executeWithPlugins(
+      'streamObject',
+      typeof modelOrId === 'string' ? modelOrId : modelOrId.modelId,
+      params,
+      async (model, transformedParams) =>
+        streamObject({ model, ...transformedParams } as Parameters<typeof streamObject>[0])
     )
   }
 
   /**
-   * 生成图像
+   * 生成图像 - 使用已创建的图像模型
    */
-  generateImage(params: generateImageParams): Promise<ReturnType<typeof _generateImage>> {
+  async generateImage(
+    model: ImageModelV2,
+    params: Omit<Parameters<typeof generateImage>[0], 'model'>
+  ): Promise<ReturnType<typeof generateImage>>
+  async generateImage(
+    modelId: string,
+    params: Omit<Parameters<typeof generateImage>[0], 'model'>,
+    options?: {
+      middlewares?: LanguageModelV2Middleware[]
+    }
+  ): Promise<ReturnType<typeof generateImage>>
+  async generateImage(
+    modelOrId: ImageModelV2 | string,
+    params: Omit<Parameters<typeof generateImage>[0], 'model'>
+  ): Promise<ReturnType<typeof generateImage>> {
     try {
-      const { model } = params
+      this.pluginEngine.usePlugins([this.createResolveImageModelPlugin(), this.createConfigureContextPlugin()])
 
-      // 根据 model 类型决定插件配置
-      if (typeof model === 'string') {
-        this.pluginEngine.usePlugins([this.createResolveImageModelPlugin(), this.createConfigureContextPlugin()])
-      } else {
-        this.pluginEngine.usePlugins([this.createConfigureContextPlugin()])
-      }
-
-      return this.pluginEngine.executeImageWithPlugins('generateImage', params, (resolvedModel, transformedParams) =>
-        _generateImage({ ...transformedParams, model: resolvedModel })
+      return await this.pluginEngine.executeImageWithPlugins(
+        'generateImage',
+        typeof modelOrId === 'string' ? modelOrId : modelOrId.modelId,
+        params,
+        async (model, transformedParams) => {
+          return await generateImage({ model, ...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,
+          typeof modelOrId === 'string' ? modelOrId : modelOrId.modelId,
           error
         )
       }

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

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

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

@@ -1,6 +1,6 @@
 /* eslint-disable @eslint-react/naming-convention/context-name */
 import { ImageModelV2 } from '@ai-sdk/provider'
-import { experimental_generateImage, generateObject, generateText, LanguageModel, streamObject, streamText } from 'ai'
+import { LanguageModel } from 'ai'
 
 import { type AiPlugin, createContext, PluginManager } from '../plugins'
 import { type ProviderId } from '../providers/types'
@@ -62,36 +62,21 @@ export class PluginEngine<T extends ProviderId = ProviderId> {
    * 执行带插件的操作（非流式）
    * 提供给AiExecutor使用
    */
-  async executeWithPlugins<
-    TParams extends Parameters<typeof generateText | typeof generateObject>[0],
-    TResult extends ReturnType<typeof generateText | typeof generateObject>
-  >(
+  async executeWithPlugins<TParams, TResult>(
     methodName: string,
+    modelId: string,
     params: TParams,
-    executor: (model: LanguageModel, transformedParams: TParams) => TResult,
+    executor: (model: LanguageModel, transformedParams: TParams) => Promise<TResult>,
     _context?: ReturnType<typeof createContext>
   ): Promise<TResult> {
-    // 统一处理模型解析
-    let resolvedModel: LanguageModel | undefined
-    let modelId: string
-    const { model } = params
-    if (typeof model === 'string') {
-      // 字符串：需要通过插件解析
-      modelId = model
-    } else {
-      // 模型对象：直接使用
-      resolvedModel = model
-      modelId = model.modelId
-    }
-
     // 使用正确的createContext创建请求上下文
-    const context = _context ? _context : createContext(this.providerId, model, params)
+    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, newParams, executor, context)
+      const result = await this.executeWithPlugins(methodName, modelId, newParams, executor, context)
       context.isRecursiveCall = false
       return result
     }
@@ -103,24 +88,17 @@ export class PluginEngine<T extends ProviderId = ProviderId> {
       // 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`)
+      // 2. 解析模型
+      const model = await this.pluginManager.executeFirst<LanguageModel>('resolveModel', modelId, context)
+      if (!model) {
+        throw new Error(`Failed to resolve model: ${modelId}`)
       }
 
       // 3. 转换请求参数
       const transformedParams = await this.pluginManager.executeSequential('transformParams', params, context)
 
       // 4. 执行具体的 API 调用
-      const result = await executor(resolvedModel, transformedParams)
+      const result = await executor(model, transformedParams)
 
       // 5. 转换结果（对于非流式调用）
       const transformedResult = await this.pluginManager.executeSequential('transformResult', result, context)
@@ -140,36 +118,21 @@ export class PluginEngine<T extends ProviderId = ProviderId> {
    * 执行带插件的图像生成操作
    * 提供给AiExecutor使用
    */
-  async executeImageWithPlugins<
-    TParams extends Omit<Parameters<typeof experimental_generateImage>[0], 'model'> & { model: string | ImageModelV2 },
-    TResult extends ReturnType<typeof experimental_generateImage>
-  >(
+  async executeImageWithPlugins<TParams, TResult>(
     methodName: string,
+    modelId: string,
     params: TParams,
-    executor: (model: ImageModelV2, transformedParams: TParams) => TResult,
+    executor: (model: ImageModelV2, transformedParams: TParams) => Promise<TResult>,
     _context?: ReturnType<typeof createContext>
   ): Promise<TResult> {
-    // 统一处理模型解析
-    let resolvedModel: ImageModelV2 | undefined
-    let modelId: string
-    const { model } = params
-    if (typeof model === 'string') {
-      // 字符串：需要通过插件解析
-      modelId = model
-    } else {
-      // 模型对象：直接使用
-      resolvedModel = model
-      modelId = model.modelId
-    }
-
     // 使用正确的createContext创建请求上下文
-    const context = _context ? _context : createContext(this.providerId, model, params)
+    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, newParams, executor, context)
+      const result = await this.executeImageWithPlugins(methodName, modelId, newParams, executor, context)
       context.isRecursiveCall = false
       return result
     }
@@ -181,24 +144,17 @@ export class PluginEngine<T extends ProviderId = ProviderId> {
       // 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`)
+      // 2. 解析模型
+      const model = await this.pluginManager.executeFirst<ImageModelV2>('resolveModel', modelId, context)
+      if (!model) {
+        throw new Error(`Failed to resolve image model: ${modelId}`)
       }
 
       // 3. 转换请求参数
       const transformedParams = await this.pluginManager.executeSequential('transformParams', params, context)
 
       // 4. 执行具体的 API 调用
-      const result = await executor(resolvedModel, transformedParams)
+      const result = await executor(model, transformedParams)
 
       // 5. 转换结果
       const transformedResult = await this.pluginManager.executeSequential('transformResult', result, context)
@@ -218,36 +174,21 @@ export class PluginEngine<T extends ProviderId = ProviderId> {
    * 执行流式调用的通用逻辑（支持流转换器）
    * 提供给AiExecutor使用
    */
-  async executeStreamWithPlugins<
-    TParams extends Parameters<typeof streamText | typeof streamObject>[0],
-    TResult extends ReturnType<typeof streamText | typeof streamObject>
-  >(
+  async executeStreamWithPlugins<TParams, TResult>(
     methodName: string,
+    modelId: string,
     params: TParams,
-    executor: (model: LanguageModel, transformedParams: TParams, streamTransforms: any[]) => TResult,
+    executor: (model: LanguageModel, transformedParams: TParams, streamTransforms: any[]) => Promise<TResult>,
     _context?: ReturnType<typeof createContext>
   ): Promise<TResult> {
-    // 统一处理模型解析
-    let resolvedModel: LanguageModel | undefined
-    let modelId: string
-    const { model } = params
-    if (typeof model === 'string') {
-      // 字符串：需要通过插件解析
-      modelId = model
-    } else {
-      // 模型对象：直接使用
-      resolvedModel = model
-      modelId = model.modelId
-    }
-
     // 创建请求上下文
-    const context = _context ? _context : createContext(this.providerId, model, params)
+    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, newParams, executor, context)
+      const result = await this.executeStreamWithPlugins(methodName, modelId, newParams, executor, context)
       context.isRecursiveCall = false
       return result
     }
@@ -259,17 +200,11 @@ export class PluginEngine<T extends ProviderId = ProviderId> {
       // 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
-      }
+      // 2. 解析模型
+      const model = await this.pluginManager.executeFirst<LanguageModel>('resolveModel', modelId, context)
 
-      if (!resolvedModel) {
-        throw new Error(`Model resolution failed: no model available`)
+      if (!model) {
+        throw new Error(`Failed to resolve model: ${modelId}`)
       }
 
       // 3. 转换请求参数
@@ -279,7 +214,7 @@ export class PluginEngine<T extends ProviderId = ProviderId> {
       const streamTransforms = this.pluginManager.collectStreamTransforms(transformedParams, context)
 
       // 5. 执行流式 API 调用
-      const result = await executor(resolvedModel, transformedParams, streamTransforms)
+      const result = await executor(model, transformedParams, streamTransforms)
 
       const transformedResult = await this.pluginManager.executeSequential('transformResult', result, context)
 

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

@@ -1,9 +1,6 @@
 /**
  * Runtime 层类型定义
  */
-import { ImageModelV2 } from '@ai-sdk/provider'
-import { experimental_generateImage, generateObject, generateText, streamObject, streamText } from 'ai'
-
 import { type ModelConfig } from '../models/types'
 import { type AiPlugin } from '../plugins'
 import { type ProviderId } from '../providers/types'
@@ -16,11 +13,3 @@ export interface RuntimeConfig<T extends ProviderId = ProviderId> {
   providerSettings: ModelConfig<T>['providerSettings'] & { mode?: 'chat' | 'responses' }
   plugins?: AiPlugin[]
 }
-
-export type generateImageParams = Omit<Parameters<typeof experimental_generateImage>[0], 'model'> & {
-  model: string | ImageModelV2
-}
-export type generateObjectParams = Parameters<typeof generateObject>[0]
-export type generateTextParams = Parameters<typeof generateText>[0]
-export type streamObjectParams = Parameters<typeof streamObject>[0]
-export type streamTextParams = Parameters<typeof streamText>[0]

packages/aiCore/tsconfig.json

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

packages/extension-table-plus/README.md

@@ -1,18 +0,0 @@
-# @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

@@ -1,93 +0,0 @@
-{
-  "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": {
-    "@biomejs/biome": "2.2.4",
-    "@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",
-    "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": "biome format ./src/ --write && eslint --fix ./src/"
-  },
-  "packageManager": "yarn@4.9.1"
-}

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

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

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

@@ -1,150 +0,0 @@
-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

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

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

@@ -1,60 +0,0 @@
-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

@@ -1,6 +0,0 @@
-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

@@ -1,64 +0,0 @@
-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

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

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

@@ -1,38 +0,0 @@
-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

@@ -1,558 +0,0 @@
-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

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

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

@@ -1,486 +0,0 @@
-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

@@ -1,9 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,68 +0,0 @@
-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

@@ -1,40 +0,0 @@
-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

@@ -1,38 +0,0 @@
-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

@@ -1,14 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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

@@ -1,5 +0,0 @@
-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

@@ -1,68 +0,0 @@
-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

@@ -1,19 +0,0 @@
-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

@@ -1,20 +0,0 @@
-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

@@ -8,7 +8,6 @@ export enum IpcChannel {
   App_ShowUpdateDialog = 'app:show-update-dialog',
   App_CheckForUpdate = 'app:check-for-update',
   App_Reload = 'app:reload',
-  App_Quit = 'app:quit',
   App_Info = 'app:info',
   App_Proxy = 'app:proxy',
   App_SetLaunchToTray = 'app:set-launch-to-tray',
@@ -34,13 +33,9 @@ export enum IpcChannel {
   App_GetBinaryPath = 'app:get-binary-path',
   App_InstallUvBinary = 'app:install-uv-binary',
   App_InstallBunBinary = 'app:install-bun-binary',
-  App_InstallOvmsBinary = 'app:install-ovms-binary',
   App_LogToMain = 'app:log-to-main',
   App_SaveData = 'app:save-data',
-  App_GetDiskInfo = 'app:get-disk-info',
   App_SetFullScreen = 'app:set-full-screen',
-  App_IsFullScreen = 'app:is-full-screen',
-  App_GetSystemFonts = 'app:get-system-fonts',
 
   App_MacIsProcessTrusted = 'app:mac-is-process-trusted',
   App_MacRequestProcessTrust = 'app:mac-request-process-trust',
@@ -87,7 +82,7 @@ export enum IpcChannel {
   Mcp_UploadDxt = 'mcp:upload-dxt',
   Mcp_AbortTool = 'mcp:abort-tool',
   Mcp_GetServerVersion = 'mcp:get-server-version',
-  Mcp_Progress = 'mcp:progress',
+
   // Python
   Python_Execute = 'python:execute',
 
@@ -127,12 +122,6 @@ export enum IpcChannel {
   Windows_SetMinimumSize = 'window:set-minimum-size',
   Windows_Resize = 'window:resize',
   Windows_GetSize = 'window:get-size',
-  Windows_Minimize = 'window:minimize',
-  Windows_Maximize = 'window:maximize',
-  Windows_Unmaximize = 'window:unmaximize',
-  Windows_Close = 'window:close',
-  Windows_IsMaximized = 'window:is-maximized',
-  Windows_MaximizedChanged = 'window:maximized-changed',
 
   KnowledgeBase_Create = 'knowledge-base:create',
   KnowledgeBase_Reset = 'knowledge-base:reset',
@@ -151,25 +140,16 @@ 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',
@@ -179,11 +159,6 @@ 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',
@@ -221,7 +196,6 @@ export enum IpcChannel {
   // system
   System_GetDeviceType = 'system:getDeviceType',
   System_GetHostname = 'system:getHostname',
-  System_GetCpuName = 'system:getCpuName',
 
   // DevTools
   System_ToggleDevTools = 'system:toggleDevTools',
@@ -307,40 +281,9 @@ export enum IpcChannel {
   TRACE_CLEAN_LOCAL_DATA = 'trace:cleanLocalData',
   TRACE_ADD_STREAM_MESSAGE = 'trace:addStreamMessage',
 
-  // API Server
-  ApiServer_Start = 'api-server:start',
-  ApiServer_Stop = 'api-server:stop',
-  ApiServer_Restart = 'api-server:restart',
-  ApiServer_GetStatus = 'api-server:get-status',
-  ApiServer_GetConfig = 'api-server:get-config',
-
-  // Anthropic OAuth
-  Anthropic_StartOAuthFlow = 'anthropic:start-oauth-flow',
-  Anthropic_CompleteOAuthWithCode = 'anthropic:complete-oauth-with-code',
-  Anthropic_CancelOAuthFlow = 'anthropic:cancel-oauth-flow',
-  Anthropic_GetAccessToken = 'anthropic:get-access-token',
-  Anthropic_HasCredentials = 'anthropic:has-credentials',
-  Anthropic_ClearCredentials = 'anthropic:clear-credentials',
-
   // CodeTools
   CodeTools_Run = 'code-tools:run',
-  CodeTools_GetAvailableTerminals = 'code-tools:get-available-terminals',
-  CodeTools_SetCustomTerminalPath = 'code-tools:set-custom-terminal-path',
-  CodeTools_GetCustomTerminalPath = 'code-tools:get-custom-terminal-path',
-  CodeTools_RemoveCustomTerminalPath = 'code-tools:remove-custom-terminal-path',
 
   // OCR
-  OCR_ocr = 'ocr:ocr',
-
-  // OVMS
-  Ovms_AddModel = 'ovms:add-model',
-  Ovms_StopAddModel = 'ovms:stop-addmodel',
-  Ovms_GetModels = 'ovms:get-models',
-  Ovms_IsRunning = 'ovms:is-running',
-  Ovms_GetStatus = 'ovms:get-status',
-  Ovms_RunOVMS = 'ovms:run-ovms',
-  Ovms_StopOVMS = 'ovms:stop-ovms',
-
-  // CherryAI
-  Cherryai_GetSignature = 'cherryai:get-signature'
+  OCR_ocr = 'ocr:ocr'
 }

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 = 960
+export const MIN_WINDOW_WIDTH = 1080
 export const SECOND_MIN_WINDOW_WIDTH = 520
 export const MIN_WINDOW_HEIGHT = 600
 export const defaultByPassRules = 'localhost,127.0.0.1,::1'
@@ -216,257 +216,5 @@ export enum codeTools {
   qwenCode = 'qwen-code',
   claudeCode = 'claude-code',
   geminiCli = 'gemini-cli',
-  openaiCodex = 'openai-codex',
-  iFlowCli = 'iflow-cli',
-  githubCopilotCli = 'github-copilot-cli'
+  openaiCodex = 'openai-codex'
 }
-
-export enum terminalApps {
-  systemDefault = 'Terminal',
-  iterm2 = 'iTerm2',
-  kitty = 'kitty',
-  alacritty = 'Alacritty',
-  wezterm = 'WezTerm',
-  ghostty = 'Ghostty',
-  tabby = 'Tabby',
-  // Windows terminals
-  windowsTerminal = 'WindowsTerminal',
-  powershell = 'PowerShell',
-  cmd = 'CMD',
-  wsl = 'WSL'
-}
-
-export interface TerminalConfig {
-  id: string
-  name: string
-  bundleId?: string
-  customPath?: string // For user-configured terminal paths on Windows
-}
-
-export interface TerminalConfigWithCommand extends TerminalConfig {
-  command: (directory: string, fullCommand: string) => { command: string; args: string[] }
-}
-
-export const MACOS_TERMINALS: TerminalConfig[] = [
-  {
-    id: terminalApps.systemDefault,
-    name: 'Terminal',
-    bundleId: 'com.apple.Terminal'
-  },
-  {
-    id: terminalApps.iterm2,
-    name: 'iTerm2',
-    bundleId: 'com.googlecode.iterm2'
-  },
-  {
-    id: terminalApps.kitty,
-    name: 'kitty',
-    bundleId: 'net.kovidgoyal.kitty'
-  },
-  {
-    id: terminalApps.alacritty,
-    name: 'Alacritty',
-    bundleId: 'org.alacritty'
-  },
-  {
-    id: terminalApps.wezterm,
-    name: 'WezTerm',
-    bundleId: 'com.github.wez.wezterm'
-  },
-  {
-    id: terminalApps.ghostty,
-    name: 'Ghostty',
-    bundleId: 'com.mitchellh.ghostty'
-  },
-  {
-    id: terminalApps.tabby,
-    name: 'Tabby',
-    bundleId: 'org.tabby'
-  }
-]
-
-export const WINDOWS_TERMINALS: TerminalConfig[] = [
-  {
-    id: terminalApps.cmd,
-    name: 'Command Prompt'
-  },
-  {
-    id: terminalApps.powershell,
-    name: 'PowerShell'
-  },
-  {
-    id: terminalApps.windowsTerminal,
-    name: 'Windows Terminal'
-  },
-  {
-    id: terminalApps.wsl,
-    name: 'WSL (Ubuntu/Debian)'
-  },
-  {
-    id: terminalApps.alacritty,
-    name: 'Alacritty'
-  },
-  {
-    id: terminalApps.wezterm,
-    name: 'WezTerm'
-  }
-]
-
-export const WINDOWS_TERMINALS_WITH_COMMANDS: TerminalConfigWithCommand[] = [
-  {
-    id: terminalApps.cmd,
-    name: 'Command Prompt',
-    command: (_: string, fullCommand: string) => ({
-      command: 'cmd',
-      args: ['/c', 'start', 'cmd', '/k', fullCommand]
-    })
-  },
-  {
-    id: terminalApps.powershell,
-    name: 'PowerShell',
-    command: (_: string, fullCommand: string) => ({
-      command: 'cmd',
-      args: ['/c', 'start', 'powershell', '-NoExit', '-Command', `& '${fullCommand}'`]
-    })
-  },
-  {
-    id: terminalApps.windowsTerminal,
-    name: 'Windows Terminal',
-    command: (_: string, fullCommand: string) => ({
-      command: 'wt',
-      args: ['cmd', '/k', fullCommand]
-    })
-  },
-  {
-    id: terminalApps.wsl,
-    name: 'WSL (Ubuntu/Debian)',
-    command: (_: string, fullCommand: string) => {
-      // Start WSL in a new window and execute the batch file from within WSL using cmd.exe
-      // The batch file will run in Windows context but output will be in WSL terminal
-      return {
-        command: 'cmd',
-        args: ['/c', 'start', 'wsl', '-e', 'bash', '-c', `cmd.exe /c '${fullCommand}' ; exec bash`]
-      }
-    }
-  },
-  {
-    id: terminalApps.alacritty,
-    name: 'Alacritty',
-    customPath: '', // Will be set by user in settings
-    command: (_: string, fullCommand: string) => ({
-      command: 'alacritty', // Will be replaced with customPath if set
-      args: ['-e', 'cmd', '/k', fullCommand]
-    })
-  },
-  {
-    id: terminalApps.wezterm,
-    name: 'WezTerm',
-    customPath: '', // Will be set by user in settings
-    command: (_: string, fullCommand: string) => ({
-      command: 'wezterm', // Will be replaced with customPath if set
-      args: ['start', 'cmd', '/k', fullCommand]
-    })
-  }
-]
-
-// Helper function to escape strings for AppleScript
-const escapeForAppleScript = (str: string): string => {
-  // In AppleScript strings, backslashes and double quotes need to be escaped
-  // When passed through osascript -e with single quotes, we need:
-  // 1. Backslash: \ -> \\
-  // 2. Double quote: " -> \"
-  return str
-    .replace(/\\/g, '\\\\') // Escape backslashes first
-    .replace(/"/g, '\\"') // Then escape double quotes
-}
-
-export const MACOS_TERMINALS_WITH_COMMANDS: TerminalConfigWithCommand[] = [
-  {
-    id: terminalApps.systemDefault,
-    name: 'Terminal',
-    bundleId: 'com.apple.Terminal',
-    command: (_directory: string, fullCommand: string) => ({
-      command: 'sh',
-      args: [
-        '-c',
-        `open -na Terminal && sleep 0.5 && osascript -e 'tell application "Terminal" to activate' -e 'tell application "Terminal" to do script "${escapeForAppleScript(fullCommand)}" in front window'`
-      ]
-    })
-  },
-  {
-    id: terminalApps.iterm2,
-    name: 'iTerm2',
-    bundleId: 'com.googlecode.iterm2',
-    command: (_directory: string, fullCommand: string) => ({
-      command: 'sh',
-      args: [
-        '-c',
-        `open -na iTerm && sleep 0.8 && osascript -e 'on waitUntilRunning()\n  repeat 50 times\n    tell application "System Events"\n      if (exists process "iTerm2") then exit repeat\n    end tell\n    delay 0.1\n  end repeat\nend waitUntilRunning\n\nwaitUntilRunning()\n\ntell application "iTerm2"\n  if (count of windows) = 0 then\n    create window with default profile\n    delay 0.3\n  else\n    tell current window\n      create tab with default profile\n    end tell\n    delay 0.3\n  end if\n  tell current session of current window to write text "${escapeForAppleScript(fullCommand)}"\n  activate\nend tell'`
-      ]
-    })
-  },
-  {
-    id: terminalApps.kitty,
-    name: 'kitty',
-    bundleId: 'net.kovidgoyal.kitty',
-    command: (_directory: string, fullCommand: string) => ({
-      command: 'sh',
-      args: [
-        '-c',
-        `cd "${_directory}" && open -na kitty --args --directory="${_directory}" sh -c "${fullCommand.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}; exec \\$SHELL" && sleep 0.5 && osascript -e 'tell application "kitty" to activate'`
-      ]
-    })
-  },
-  {
-    id: terminalApps.alacritty,
-    name: 'Alacritty',
-    bundleId: 'org.alacritty',
-    command: (_directory: string, fullCommand: string) => ({
-      command: 'sh',
-      args: [
-        '-c',
-        `open -na Alacritty --args --working-directory "${_directory}" -e sh -c "${fullCommand.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}; exec \\$SHELL" && sleep 0.5 && osascript -e 'tell application "Alacritty" to activate'`
-      ]
-    })
-  },
-  {
-    id: terminalApps.wezterm,
-    name: 'WezTerm',
-    bundleId: 'com.github.wez.wezterm',
-    command: (_directory: string, fullCommand: string) => ({
-      command: 'sh',
-      args: [
-        '-c',
-        `open -na WezTerm --args start --new-tab --cwd "${_directory}" -- sh -c "${fullCommand.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}; exec \\$SHELL" && sleep 0.5 && osascript -e 'tell application "WezTerm" to activate'`
-      ]
-    })
-  },
-  {
-    id: terminalApps.ghostty,
-    name: 'Ghostty',
-    bundleId: 'com.mitchellh.ghostty',
-    command: (_directory: string, fullCommand: string) => ({
-      command: 'sh',
-      args: [
-        '-c',
-        `cd "${_directory}" && open -na Ghostty --args --working-directory="${_directory}" -e sh -c "${fullCommand.replace(/\\/g, '\\\\').replace(/"/g, '\\"')}; exec \\$SHELL" && sleep 0.5 && osascript -e 'tell application "Ghostty" to activate'`
-      ]
-    })
-  },
-  {
-    id: terminalApps.tabby,
-    name: 'Tabby',
-    bundleId: 'org.tabby',
-    command: (_directory: string, fullCommand: string) => ({
-      command: 'sh',
-      args: [
-        '-c',
-        `if pgrep -x "Tabby" > /dev/null; then
-          open -na Tabby --args open && sleep 0.3
-        else
-          open -na Tabby --args open && sleep 2
-        fi && osascript -e 'tell application "Tabby" to activate' -e 'set the clipboard to "${escapeForAppleScript(fullCommand)}"' -e 'tell application "System Events" to tell process "Tabby" to keystroke "v" using {command down}' -e 'tell application "System Events" to key code 36'`
-      ]
-    })
-  }
-]

packages/shared/config/languages.ts

@@ -2020,10 +2020,6 @@ 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']
@@ -3065,7 +3061,7 @@ export const languages: Record<string, LanguageData> = {
   },
   SWIG: {
     type: 'programming',
-    extensions: ['.i', '.swg', '.swig']
+    extensions: ['.i']
   },
   SystemVerilog: {
     type: 'programming',

packages/shared/config/types.ts

@@ -7,18 +7,5 @@ export type LoaderReturn = {
   loaderType: string
   status?: ProcessingStatus
   message?: string
-  messageSource?: 'preprocess' | 'embedding' | 'validation'
-}
-
-export type FileChangeEventType = 'add' | 'change' | 'unlink' | 'addDir' | 'unlinkDir'
-
-export type FileChangeEvent = {
-  eventType: FileChangeEventType
-  filePath: string
-  watchPath: string
-}
-
-export type MCPProgressEvent = {
-  callId: string
-  progress: number // 0-1 range
+  messageSource?: 'preprocess' | 'embedding'
 }

packages/shared/utils.ts

@@ -1,6 +0,0 @@
-export const defaultAppHeaders = () => {
-  return {
-    'HTTP-Referer': 'https://cherry-ai.com',
-    'X-Title': 'Cherry Studio'
-  }
-}

resources/cherry-studio/license.html

@@ -1,274 +1,199 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="zh-CN">
-  <head>
-    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>许可协议 | License Agreement</title>
-    <script src="https://cdn.tailwindcss.com"></script>
-  </head>
 
-  <body class="bg-gray-50">
-    <div class="mx-auto max-w-4xl px-4 py-8">
-      <!-- 中文版本 -->
-      <div class="mb-12">
-        <h1 class="mb-8 text-3xl font-bold text-gray-900">许可协议</h1>
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>许可协议 | License Agreement</title>
+  <script src="https://cdn.tailwindcss.com"></script>
+</head>
 
-        <p class="mb-6 text-gray-700">
-          本项目采用<strong>区分用户的双重许可 (User-Segmented Dual Licensing)</strong> 模式。
+<body class="bg-gray-50">
+  <div class="max-w-4xl mx-auto px-4 py-8">
+    <!-- 中文版本 -->
+    <div class="mb-12">
+      <h1 class="text-3xl font-bold mb-8 text-gray-900">许可协议</h1>
+
+      <p class="mb-6 text-gray-700">本项目采用<strong>区分用户的双重许可 (User-Segmented Dual Licensing)</strong> 模式。</p>
+
+      <section class="mb-8">
+        <h2 class="text-xl font-semibold mb-4 text-gray-900">核心原则</h2>
+        <ul class="list-disc pl-6 space-y-2 text-gray-700">
+          <li><strong>个人用户 和 10人及以下企业/组织:</strong> 默认适用 <strong>GNU Affero 通用公共许可证 v3.0 (AGPLv3)</strong>。</li>
+          <li><strong>超过10人的企业/组织:</strong> <strong>必须</strong> 获取 <strong>商业许可证 (Commercial License)</strong>。</li>
+        </ul>
+      </section>
+
+      <section class="mb-8">
+        <h2 class="text-xl font-semibold mb-4 text-gray-900">定义："10人及以下"</h2>
+        <p class="text-gray-700">
+          指在您的组织（包括公司、非营利组织、政府机构、教育机构等任何实体）中，能够访问、使用或以任何方式直接或间接受益于本软件（Cherry
+          Studio）功能的个人总数不超过10人。这包括但不限于开发者、测试人员、运营人员、最终用户、通过集成系统间接使用者等。
         </p>
+      </section>
 
-        <section class="mb-8">
-          <h2 class="mb-4 text-xl font-semibold text-gray-900">核心原则</h2>
-          <ul class="list-disc space-y-2 pl-6 text-gray-700">
-            <li>
-              <strong>个人用户 和 10人及以下企业/组织:</strong> 默认适用
-              <strong>GNU Affero 通用公共许可证 v3.0 (AGPLv3)</strong>。
-            </li>
-            <li>
-              <strong>超过10人的企业/组织:</strong> <strong>必须</strong> 获取
-              <strong>商业许可证 (Commercial License)</strong>。
-            </li>
-          </ul>
-        </section>
+      <section class="mb-8">
+        <h2 class="text-xl font-semibold mb-4 text-gray-900">1. 开源许可证 (Open Source License): AGPLv3 - 适用于个人及10人及以下组织
+        </h2>
+        <ul class="list-disc pl-6 space-y-2 text-gray-700">
+          <li>如果您是个人用户，或者您的组织满足上述"10人及以下"的定义，您可以在 <strong>AGPLv3</strong> 的条款下自由使用、修改和分发 Cherry Studio。AGPLv3 的完整文本可以访问
+            <a href="https://www.gnu.org/licenses/agpl-3.0.html"
+              class="text-blue-600 hover:underline">https://www.gnu.org/licenses/agpl-3.0.html</a> 获取。
+          </li>
+          <li><strong>核心义务：</strong> AGPLv3 的一个关键要求是，如果您修改了 Cherry Studio 并通过网络提供服务，或者分发了修改后的版本，您必须以 AGPLv3
+            许可证向接收者提供相应的<strong>完整源代码</strong>。即使您符合"10人及以下"的标准，如果您希望避免此源代码公开义务，您也需要考虑获取商业许可证（见下文）。</li>
+          <li>使用前请务必仔细阅读并理解 AGPLv3 的所有条款。</li>
+        </ul>
+      </section>
 
-        <section class="mb-8">
-          <h2 class="mb-4 text-xl font-semibold text-gray-900">定义："10人及以下"</h2>
-          <p class="text-gray-700">
-            指在您的组织（包括公司、非营利组织、政府机构、教育机构等任何实体）中，能够访问、使用或以任何方式直接或间接受益于本软件（Cherry
-            Studio）功能的个人总数不超过10人。这包括但不限于开发者、测试人员、运营人员、最终用户、通过集成系统间接使用者等。
-          </p>
-        </section>
+      <section class="mb-8">
+        <h2 class="text-xl font-semibold mb-4 text-gray-900">2. 商业许可证 (Commercial License) - 适用于超过10人的组织，或希望规避 AGPLv3
+          义务的用户</h2>
+        <ul class="list-disc pl-6 space-y-2 text-gray-700">
+          <li><strong>强制要求：</strong>
+            如果您的组织<strong>不</strong>满足上述"10人及以下"的定义（即有11人或更多人可以访问、使用或受益于本软件），您<strong>必须</strong>联系我们获取并签署一份商业许可证才能使用
+            Cherry Studio。</li>
+          <li><strong>自愿选择：</strong> 即使您的组织满足"10人及以下"的条件，但如果您的使用场景<strong>无法满足 AGPLv3
+              的条款要求</strong>（特别是关于<strong>源代码公开</strong>的义务），或者您需要 AGPLv3 <strong>未提供</strong>的特定商业条款（如保证、赔偿、无 Copyleft
+            限制等），您也<strong>必须</strong>联系我们获取并签署一份商业许可证。</li>
+          <li><strong>需要商业许可证的常见情况包括（但不限于）：</strong>
+            <ul class="list-disc pl-6 mt-2 space-y-1">
+              <li>您的组织规模超过10人。</li>
+              <li>（无论组织规模）您希望分发修改过的 Cherry Studio 版本，但<strong>不希望</strong>根据 AGPLv3 公开您修改部分的源代码。</li>
+              <li>（无论组织规模）您希望基于修改过的 Cherry Studio 提供网络服务（SaaS），但<strong>不希望</strong>根据 AGPLv3 向服务使用者提供修改后的源代码。</li>
+              <li>（无论组织规模）您的公司政策、客户合同或项目要求不允许使用 AGPLv3 许可的软件，或要求闭源分发及保密。</li>
+            </ul>
+          </li>
+          <li><strong>获取商业许可：</strong> 请通过邮箱 <a href="mailto:bd@cherry-ai.com"
+              class="text-blue-600 hover:underline">bd@cherry-ai.com</a> 联系 Cherry Studio 开发团队洽谈商业授权事宜。</li>
+        </ul>
+      </section>
 
-        <section class="mb-8">
-          <h2 class="mb-4 text-xl font-semibold text-gray-900">
-            1. 开源许可证 (Open Source License): AGPLv3 - 适用于个人及10人及以下组织
-          </h2>
-          <ul class="list-disc space-y-2 pl-6 text-gray-700">
-            <li>
-              如果您是个人用户，或者您的组织满足上述"10人及以下"的定义，您可以在
-              <strong>AGPLv3</strong> 的条款下自由使用、修改和分发 Cherry Studio。AGPLv3 的完整文本可以访问
-              <a href="https://www.gnu.org/licenses/agpl-3.0.html" class="text-blue-600 hover:underline"
-                >https://www.gnu.org/licenses/agpl-3.0.html</a
-              >
-              获取。
-            </li>
-            <li>
-              <strong>核心义务：</strong> AGPLv3 的一个关键要求是，如果您修改了 Cherry Studio
-              并通过网络提供服务，或者分发了修改后的版本，您必须以 AGPLv3
-              许可证向接收者提供相应的<strong>完整源代码</strong>。即使您符合"10人及以下"的标准，如果您希望避免此源代码公开义务，您也需要考虑获取商业许可证（见下文）。
-            </li>
-            <li>使用前请务必仔细阅读并理解 AGPLv3 的所有条款。</li>
-          </ul>
-        </section>
+      <section class="mb-8">
+        <h2 class="text-xl font-semibold mb-4 text-gray-900">3. 贡献 (Contributions)</h2>
+        <ul class="list-disc pl-6 space-y-2 text-gray-700">
+          <li>我们欢迎社区对 Cherry Studio 的贡献。所有向本项目提交的贡献都将被视为在 <strong>AGPLv3</strong> 许可证下提供。</li>
+          <li>通过向本项目提交贡献（例如通过 Pull Request），即表示您同意您的代码以 AGPLv3 许可证授权给本项目及所有后续使用者（无论这些使用者最终遵循 AGPLv3 还是商业许可）。</li>
+          <li>您也理解并同意，您的贡献可能会被包含在根据商业许可证分发的 Cherry Studio 版本中。</li>
+        </ul>
+      </section>
 
-        <section class="mb-8">
-          <h2 class="mb-4 text-xl font-semibold text-gray-900">
-            2. 商业许可证 (Commercial License) - 适用于超过10人的组织，或希望规避 AGPLv3 义务的用户
-          </h2>
-          <ul class="list-disc space-y-2 pl-6 text-gray-700">
-            <li>
-              <strong>强制要求：</strong>
-              如果您的组织<strong>不</strong>满足上述"10人及以下"的定义（即有11人或更多人可以访问、使用或受益于本软件），您<strong>必须</strong>联系我们获取并签署一份商业许可证才能使用
-              Cherry Studio。
-            </li>
-            <li>
-              <strong>自愿选择：</strong> 即使您的组织满足"10人及以下"的条件，但如果您的使用场景<strong
-                >无法满足 AGPLv3 的条款要求</strong
-              >（特别是关于<strong>源代码公开</strong>的义务），或者您需要 AGPLv3
-              <strong>未提供</strong>的特定商业条款（如保证、赔偿、无 Copyleft
-              限制等），您也<strong>必须</strong>联系我们获取并签署一份商业许可证。
-            </li>
-            <li>
-              <strong>需要商业许可证的常见情况包括（但不限于）：</strong>
-              <ul class="mt-2 list-disc space-y-1 pl-6">
-                <li>您的组织规模超过10人。</li>
-                <li>
-                  （无论组织规模）您希望分发修改过的 Cherry Studio 版本，但<strong>不希望</strong>根据 AGPLv3
-                  公开您修改部分的源代码。
-                </li>
-                <li>
-                  （无论组织规模）您希望基于修改过的 Cherry Studio 提供网络服务（SaaS），但<strong>不希望</strong>根据
-                  AGPLv3 向服务使用者提供修改后的源代码。
-                </li>
-                <li>
-                  （无论组织规模）您的公司政策、客户合同或项目要求不允许使用 AGPLv3 许可的软件，或要求闭源分发及保密。
-                </li>
-              </ul>
-            </li>
-            <li>
-              <strong>获取商业许可：</strong> 请通过邮箱
-              <a href="mailto:bd@cherry-ai.com" class="text-blue-600 hover:underline">bd@cherry-ai.com</a> 联系 Cherry
-              Studio 开发团队洽谈商业授权事宜。
-            </li>
-          </ul>
-        </section>
-
-        <section class="mb-8">
-          <h2 class="mb-4 text-xl font-semibold text-gray-900">3. 贡献 (Contributions)</h2>
-          <ul class="list-disc space-y-2 pl-6 text-gray-700">
-            <li>
-              我们欢迎社区对 Cherry Studio 的贡献。所有向本项目提交的贡献都将被视为在
-              <strong>AGPLv3</strong> 许可证下提供。
-            </li>
-            <li>
-              通过向本项目提交贡献（例如通过 Pull Request），即表示您同意您的代码以 AGPLv3
-              许可证授权给本项目及所有后续使用者（无论这些使用者最终遵循 AGPLv3 还是商业许可）。
-            </li>
-            <li>您也理解并同意，您的贡献可能会被包含在根据商业许可证分发的 Cherry Studio 版本中。</li>
-          </ul>
-        </section>
-
-        <section class="mb-8">
-          <h2 class="mb-4 text-xl font-semibold text-gray-900">4. 其他条款 (Other Terms)</h2>
-          <ul class="list-disc space-y-2 pl-6 text-gray-700">
-            <li>关于商业许可证的具体条款和条件，以双方签署的正式商业许可协议为准。</li>
-            <li>
-              项目维护者保留根据需要更新本许可政策（包括用户规模定义和阈值）的权利。相关更新将通过项目官方渠道（如代码仓库、官方网站）进行通知。
-            </li>
-          </ul>
-        </section>
-      </div>
-
-      <hr class="my-12 border-gray-300" />
-
-      <!-- English Version -->
-      <div>
-        <h1 class="mb-8 text-3xl font-bold text-gray-900">Licensing</h1>
-
-        <p class="mb-6 text-gray-700">This project employs a <strong>User-Segmented Dual Licensing</strong> model.</p>
-
-        <section class="mb-8">
-          <h2 class="mb-4 text-xl font-semibold text-gray-900">Core Principle</h2>
-          <ul class="list-disc space-y-2 pl-6 text-gray-700">
-            <li>
-              <strong>Individual Users and Organizations with 10 or Fewer Individuals:</strong> Governed by default
-              under the <strong>GNU Affero General Public License v3.0 (AGPLv3)</strong>.
-            </li>
-            <li>
-              <strong>Organizations with More Than 10 Individuals:</strong> <strong>Must</strong> obtain a
-              <strong>Commercial License</strong>.
-            </li>
-          </ul>
-        </section>
-
-        <section class="mb-8">
-          <h2 class="mb-4 text-xl font-semibold text-gray-900">Definition: "10 or Fewer Individuals"</h2>
-          <p class="text-gray-700">
-            Refers to any organization (including companies, non-profits, government agencies, educational institutions,
-            etc.) where the total number of individuals who can access, use, or in any way directly or indirectly
-            benefit from the functionality of this software (Cherry Studio) does not exceed 10. This includes, but is
-            not limited to, developers, testers, operations staff, end-users, and indirect users via integrated systems.
-          </p>
-        </section>
-
-        <section class="mb-8">
-          <h2 class="mb-4 text-xl font-semibold text-gray-900">
-            1. Open Source License: AGPLv3 - For Individuals and Organizations of 10 or Fewer
-          </h2>
-          <ul class="list-disc space-y-2 pl-6 text-gray-700">
-            <li>
-              If you are an individual user, or if your organization meets the "10 or Fewer Individuals" definition
-              above, you are free to use, modify, and distribute Cherry Studio under the terms of the
-              <strong>AGPLv3</strong>. The full text of the AGPLv3 can be found at
-              <a href="https://www.gnu.org/licenses/agpl-3.0.html" class="text-blue-600 hover:underline"
-                >https://www.gnu.org/licenses/agpl-3.0.html</a
-              >.
-            </li>
-            <li>
-              <strong>Core Obligation:</strong> A key requirement of the AGPLv3 is that if you modify Cherry Studio and
-              make it available over a network, or distribute the modified version, you must provide the
-              <strong>complete corresponding source code</strong> under the AGPLv3 license to the recipients. Even if
-              you qualify under the "10 or Fewer Individuals" rule, if you wish to avoid this source code disclosure
-              obligation, you will need to obtain a Commercial License (see below).
-            </li>
-            <li>Please read and understand the full terms of the AGPLv3 carefully before use.</li>
-          </ul>
-        </section>
-
-        <section class="mb-8">
-          <h2 class="mb-4 text-xl font-semibold text-gray-900">
-            2. Commercial License - For Organizations with More Than 10 Individuals, or Users Needing to Avoid AGPLv3
-            Obligations
-          </h2>
-          <ul class="list-disc space-y-2 pl-6 text-gray-700">
-            <li>
-              <strong>Mandatory Requirement:</strong> If your organization does <strong>not</strong> meet the "10 or
-              Fewer Individuals" definition above (i.e., 11 or more individuals can access, use, or benefit from the
-              software), you <strong>must</strong> contact us to obtain and execute a Commercial License to use Cherry
-              Studio.
-            </li>
-            <li>
-              <strong>Voluntary Option:</strong> Even if your organization meets the "10 or Fewer Individuals"
-              condition, if your intended use case
-              <strong>cannot comply with the terms of the AGPLv3</strong> (particularly the obligations regarding
-              <strong>source code disclosure</strong>), or if you require specific commercial terms
-              <strong>not offered</strong> by the AGPLv3 (such as warranties, indemnities, or freedom from copyleft
-              restrictions), you also <strong>must</strong> contact us to obtain and execute a Commercial License.
-            </li>
-            <li>
-              <strong>Common scenarios requiring a Commercial License include (but are not limited to):</strong>
-              <ul class="mt-2 list-disc space-y-1 pl-6">
-                <li>
-                  Your organization has more than 10 individuals who can access, use, or benefit from the software.
-                </li>
-                <li>
-                  (Regardless of organization size) You wish to distribute a modified version of Cherry Studio but
-                  <strong>do not want</strong> to disclose the source code of your modifications under AGPLv3.
-                </li>
-                <li>
-                  (Regardless of organization size) You wish to provide a network service (SaaS) based on a modified
-                  version of Cherry Studio but <strong>do not want</strong> to provide the modified source code to users
-                  of the service under AGPLv3.
-                </li>
-                <li>
-                  (Regardless of organization size) Your corporate policies, client contracts, or project requirements
-                  prohibit the use of AGPLv3-licensed software or mandate closed-source distribution and
-                  confidentiality.
-                </li>
-              </ul>
-            </li>
-            <li>
-              <strong>Obtaining a Commercial License:</strong> Please contact the Cherry Studio development team via
-              email at <a href="mailto:bd@cherry-ai.com" class="text-blue-600 hover:underline">bd@cherry-ai.com</a> to
-              discuss commercial licensing options.
-            </li>
-          </ul>
-        </section>
-
-        <section class="mb-8">
-          <h2 class="mb-4 text-xl font-semibold text-gray-900">3. Contributions</h2>
-          <ul class="list-disc space-y-2 pl-6 text-gray-700">
-            <li>
-              We welcome community contributions to Cherry Studio. All contributions submitted to this project are
-              considered to be offered under the <strong>AGPLv3</strong> license.
-            </li>
-            <li>
-              By submitting a contribution to this project (e.g., via a Pull Request), you agree to license your code
-              under the AGPLv3 to the project and all its downstream users (regardless of whether those users ultimately
-              operate under AGPLv3 or a Commercial License).
-            </li>
-            <li>
-              You also understand and agree that your contribution may be included in distributions of Cherry Studio
-              offered under our commercial license.
-            </li>
-          </ul>
-        </section>
-
-        <section class="mb-8">
-          <h2 class="mb-4 text-xl font-semibold text-gray-900">4. Other Terms</h2>
-          <ul class="list-disc space-y-2 pl-6 text-gray-700">
-            <li>
-              The specific terms and conditions of the Commercial License are governed by the formal commercial license
-              agreement signed by both parties.
-            </li>
-            <li>
-              The project maintainers reserve the right to update this licensing policy (including the definition and
-              threshold for user count) as needed. Updates will be communicated through official project channels (e.g.,
-              code repository, official website).
-            </li>
-          </ul>
-        </section>
-      </div>
+      <section class="mb-8">
+        <h2 class="text-xl font-semibold mb-4 text-gray-900">4. 其他条款 (Other Terms)</h2>
+        <ul class="list-disc pl-6 space-y-2 text-gray-700">
+          <li>关于商业许可证的具体条款和条件，以双方签署的正式商业许可协议为准。</li>
+          <li>项目维护者保留根据需要更新本许可政策（包括用户规模定义和阈值）的权利。相关更新将通过项目官方渠道（如代码仓库、官方网站）进行通知。</li>
+        </ul>
+      </section>
     </div>
-  </body>
-</html>
+
+    <hr class="my-12 border-gray-300">
+
+    <!-- English Version -->
+    <div>
+      <h1 class="text-3xl font-bold mb-8 text-gray-900">Licensing</h1>
+
+      <p class="mb-6 text-gray-700">This project employs a <strong>User-Segmented Dual Licensing</strong> model.</p>
+
+      <section class="mb-8">
+        <h2 class="text-xl font-semibold mb-4 text-gray-900">Core Principle</h2>
+        <ul class="list-disc pl-6 space-y-2 text-gray-700">
+          <li><strong>Individual Users and Organizations with 10 or Fewer Individuals:</strong> Governed by default
+            under the <strong>GNU Affero General Public License v3.0 (AGPLv3)</strong>.</li>
+          <li><strong>Organizations with More Than 10 Individuals:</strong> <strong>Must</strong> obtain a
+            <strong>Commercial License</strong>.
+          </li>
+        </ul>
+      </section>
+
+      <section class="mb-8">
+        <h2 class="text-xl font-semibold mb-4 text-gray-900">Definition: "10 or Fewer Individuals"</h2>
+        <p class="text-gray-700">
+          Refers to any organization (including companies, non-profits, government agencies, educational institutions,
+          etc.) where the total number of individuals who can access, use, or in any way directly or indirectly benefit
+          from the functionality of this software (Cherry Studio) does not exceed 10. This includes, but is not limited
+          to, developers, testers, operations staff, end-users, and indirect users via integrated systems.
+        </p>
+      </section>
+
+      <section class="mb-8">
+        <h2 class="text-xl font-semibold mb-4 text-gray-900">1. Open Source License: AGPLv3 - For Individuals and
+          Organizations of 10 or Fewer</h2>
+        <ul class="list-disc pl-6 space-y-2 text-gray-700">
+          <li>If you are an individual user, or if your organization meets the "10 or Fewer Individuals" definition
+            above, you are free to use, modify, and distribute Cherry Studio under the terms of the
+            <strong>AGPLv3</strong>. The full text of the AGPLv3 can be found at <a
+              href="https://www.gnu.org/licenses/agpl-3.0.html"
+              class="text-blue-600 hover:underline">https://www.gnu.org/licenses/agpl-3.0.html</a>.
+          </li>
+          <li><strong>Core Obligation:</strong> A key requirement of the AGPLv3 is that if you modify Cherry Studio and
+            make it available over a network, or distribute the modified version, you must provide the <strong>complete
+              corresponding source code</strong> under the AGPLv3 license to the recipients. Even if you qualify under
+            the "10 or Fewer Individuals" rule, if you wish to avoid this source code disclosure obligation, you will
+            need to obtain a Commercial License (see below).</li>
+          <li>Please read and understand the full terms of the AGPLv3 carefully before use.</li>
+        </ul>
+      </section>
+
+      <section class="mb-8">
+        <h2 class="text-xl font-semibold mb-4 text-gray-900">2. Commercial License - For Organizations with More Than 10
+          Individuals, or Users Needing to Avoid AGPLv3 Obligations</h2>
+        <ul class="list-disc pl-6 space-y-2 text-gray-700">
+          <li><strong>Mandatory Requirement:</strong> If your organization does <strong>not</strong> meet the "10 or
+            Fewer Individuals" definition above (i.e., 11 or more individuals can access, use, or benefit from the
+            software), you <strong>must</strong> contact us to obtain and execute a Commercial License to use Cherry
+            Studio.</li>
+          <li><strong>Voluntary Option:</strong> Even if your organization meets the "10 or Fewer Individuals"
+            condition, if your intended use case <strong>cannot comply with the terms of the AGPLv3</strong>
+            (particularly the obligations regarding <strong>source code disclosure</strong>), or if you require specific
+            commercial terms <strong>not offered</strong> by the AGPLv3 (such as warranties, indemnities, or freedom
+            from copyleft restrictions), you also <strong>must</strong> contact us to obtain and execute a Commercial
+            License.</li>
+          <li><strong>Common scenarios requiring a Commercial License include (but are not limited to):</strong>
+            <ul class="list-disc pl-6 mt-2 space-y-1">
+              <li>Your organization has more than 10 individuals who can access, use, or benefit from the software.</li>
+              <li>(Regardless of organization size) You wish to distribute a modified version of Cherry Studio but
+                <strong>do not want</strong> to disclose the source code of your modifications under AGPLv3.
+              </li>
+              <li>(Regardless of organization size) You wish to provide a network service (SaaS) based on a modified
+                version of Cherry Studio but <strong>do not want</strong> to provide the modified source code to users
+                of the service under AGPLv3.</li>
+              <li>(Regardless of organization size) Your corporate policies, client contracts, or project requirements
+                prohibit the use of AGPLv3-licensed software or mandate closed-source distribution and confidentiality.
+              </li>
+            </ul>
+          </li>
+          <li><strong>Obtaining a Commercial License:</strong> Please contact the Cherry Studio development team via
+            email at <a href="mailto:bd@cherry-ai.com" class="text-blue-600 hover:underline">bd@cherry-ai.com</a> to
+            discuss commercial licensing options.</li>
+        </ul>
+      </section>
+
+      <section class="mb-8">
+        <h2 class="text-xl font-semibold mb-4 text-gray-900">3. Contributions</h2>
+        <ul class="list-disc pl-6 space-y-2 text-gray-700">
+          <li>We welcome community contributions to Cherry Studio. All contributions submitted to this project are
+            considered to be offered under the <strong>AGPLv3</strong> license.</li>
+          <li>By submitting a contribution to this project (e.g., via a Pull Request), you agree to license your code
+            under the AGPLv3 to the project and all its downstream users (regardless of whether those users ultimately
+            operate under AGPLv3 or a Commercial License).</li>
+          <li>You also understand and agree that your contribution may be included in distributions of Cherry Studio
+            offered under our commercial license.</li>
+        </ul>
+      </section>
+
+      <section class="mb-8">
+        <h2 class="text-xl font-semibold mb-4 text-gray-900">4. Other Terms</h2>
+        <ul class="list-disc pl-6 space-y-2 text-gray-700">
+          <li>The specific terms and conditions of the Commercial License are governed by the formal commercial license
+            agreement signed by both parties.</li>
+          <li>The project maintainers reserve the right to update this licensing policy (including the definition and
+            threshold for user count) as needed. Updates will be communicated through official project channels (e.g.,
+            code repository, official website).</li>
+        </ul>
+      </section>
+    </div>
+  </div>
+</body>
+
+</html>

resources/cherry-studio/privacy-en.html

@@ -1,252 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Privacy Policy</title>
-    <style>
-        * {
-            margin: 0;
-            padding: 0;
-            box-sizing: border-box;
-        }
-
-        body {
-            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Helvetica Neue', Arial, sans-serif;
-            line-height: 1.6;
-            color: #333;
-            background: transparent;
-            margin: 0 auto;
-        }
-
-        body.dark {
-            background: transparent;
-            color: rgba(255, 255, 255, 0.85);
-        }
-
-        h1 {
-            font-size: 24px;
-            font-weight: 600;
-            margin-bottom: 20px;
-            color: #1a1a1a;
-        }
-
-        body.dark h1 {
-            color: rgba(255, 255, 255, 0.95);
-        }
-
-        h2 {
-            font-size: 18px;
-            font-weight: 600;
-            margin-top: 24px;
-            margin-bottom: 12px;
-            color: #2c2c2c;
-        }
-
-        body.dark h2 {
-            color: rgba(255, 255, 255, 0.9);
-        }
-
-        p {
-            margin: 12px 0;
-            line-height: 1.8;
-        }
-
-        body.dark p {
-            color: rgba(255, 255, 255, 0.8);
-        }
-
-        ul {
-            margin: 12px 0;
-            padding-left: 24px;
-        }
-
-        li {
-            margin: 6px 0;
-            line-height: 1.6;
-        }
-
-        body.dark li {
-            color: rgba(255, 255, 255, 0.75);
-        }
-
-        a {
-            color: #0066cc;
-            text-decoration: none;
-        }
-
-        a:hover {
-            text-decoration: underline;
-        }
-
-        body.dark a {
-            color: #4da6ff;
-        }
-
-        .footer {
-            margin-top: 40px;
-            padding-top: 20px;
-            border-top: 1px solid #e0e0e0;
-            font-size: 13px;
-            color: #666;
-        }
-
-        body.dark .footer {
-            border-top-color: rgba(255, 255, 255, 0.1);
-            color: rgba(255, 255, 255, 0.5);
-        }
-
-        .content-wrapper {
-            max-height: calc(100vh - 40px);
-            overflow-y: auto;
-            padding-right: 10px;
-            background: transparent;
-        }
-
-        /* Scrollbar styles - Light mode */
-        ::-webkit-scrollbar {
-            width: 8px;
-            height: 8px;
-        }
-
-        ::-webkit-scrollbar-track {
-            background: rgba(0, 0, 0, 0.05);
-            border-radius: 4px;
-        }
-
-        ::-webkit-scrollbar-thumb {
-            background: rgba(0, 0, 0, 0.2);
-            border-radius: 4px;
-        }
-
-        ::-webkit-scrollbar-thumb:hover {
-            background: rgba(0, 0, 0, 0.3);
-        }
-
-        /* Scrollbar styles - Dark mode */
-        body.dark ::-webkit-scrollbar-track {
-            background: rgba(255, 255, 255, 0.05);
-        }
-
-        body.dark ::-webkit-scrollbar-thumb {
-            background: rgba(255, 255, 255, 0.2);
-        }
-
-        body.dark ::-webkit-scrollbar-thumb:hover {
-            background: rgba(255, 255, 255, 0.3);
-        }
-    </style>
-    <script>
-        // Detect theme
-        document.addEventListener('DOMContentLoaded', function () {
-            const urlParams = new URLSearchParams(window.location.search);
-            const theme = urlParams.get('theme');
-            if (theme === 'dark') {
-                document.documentElement.classList.add('dark');
-                document.body.classList.add('dark');
-            }
-        });
-    </script>
-</head>
-
-<body>
-    <div class="content-wrapper">
-        <h1>Privacy Policy</h1>
-
-        <p>
-            Welcome to Cherry Studio (hereinafter referred to as "the Software" or "we"). We highly value your privacy
-            protection. This Privacy Policy explains how we process and protect your personal information and data.
-            Please read and understand this policy carefully before using the Software:
-        </p>
-
-        <h2>1. Information We Collect</h2>
-        <p>To optimize user experience and improve software quality, we may only collect the following anonymous,
-            non-personal information:</p>
-        <ul>
-            <li>Software version information</li>
-            <li>Activity and usage frequency of software features</li>
-            <li>Anonymous crash and error log information</li>
-        </ul>
-        <p>The above information is completely anonymous, does not involve any personal identity data, and cannot be
-            linked to your personal information.</p>
-
-        <h2>2. Information We Do Not Collect</h2>
-        <p>To maximize the protection of your privacy and security, we explicitly commit that we:</p>
-        <ul>
-            <li>Will not collect, save, transmit, or process model service API Key information you enter into the
-                Software</li>
-            <li>Will not collect, save, transmit, or process any conversation data generated during your use of the
-                Software, including but not limited to chat content, instruction information, knowledge base
-                information, vector data, and other custom content</li>
-            <li>Will not collect, save, transmit, or process any sensitive information that can identify personal
-                identity</li>
-        </ul>
-
-        <h2>3. Data Interaction Description</h2>
-        <p>
-            The Software uses API Keys from third-party model service providers that you apply for and configure
-            yourself to complete model calls and conversation functions. The model services you use (such as large
-            models, API interfaces, etc.) are directly provided by third-party providers of your choice. We do not
-            intervene, monitor, or interfere with the data transmission process.
-        </p>
-        <p>
-            Data interactions between you and third-party model services are governed by the privacy policies and user
-            agreements of third-party service providers. We recommend that you fully understand the privacy terms of
-            relevant service providers before use.
-        </p>
-
-        <h2>4. Local Data Security Protection</h2>
-        <p>The Software is a localized application, and all data is stored on your local device by default. We have
-            taken the following measures to ensure data security:</p>
-        <ul>
-            <li>Conversation records, configuration information, and other data are only saved on your local device</li>
-            <li>Data import/export functions are provided to facilitate your independent management and backup of data
-            </li>
-            <li>Your local data will not be uploaded to any server or cloud storage</li>
-        </ul>
-
-        <h2>5. Third-Party Services</h2>
-        <p>
-            When using the Software, you may access third-party services (such as AI model APIs, translation services,
-            etc.). The use of these third-party services is governed by their respective terms of service and privacy
-            policies. We strongly recommend that you carefully read and understand the relevant terms before use.
-        </p>
-
-        <h2>6. User Rights</h2>
-        <p>You have complete control over your data:</p>
-        <ul>
-            <li>You can view, modify, and delete all locally stored data at any time</li>
-            <li>You can choose whether to enable specific features or services</li>
-            <li>You can stop using the Software and delete all related data at any time</li>
-        </ul>
-
-        <h2>7. Children's Privacy Protection</h2>
-        <p>The Software is not intended for minors under 18 years of age. If you are a minor, please use the Software
-            under the guidance of a guardian.</p>
-
-        <h2>8. Privacy Policy Updates</h2>
-        <p>
-            We may update this Privacy Policy based on legal requirements or changes in product features. The updated
-            policy will be published in the Software and you will be notified before it takes effect. If you do not
-            agree with the updated terms, you can choose to stop using the Software.
-        </p>
-
-        <h2>9. Contact Us</h2>
-        <p>If you have any questions, suggestions, or complaints about this Privacy Policy, please contact us through
-            the following methods:</p>
-        <ul>
-            <li>
-                GitHub: <a href="https://github.com/CherryHQ/cherry-studio" target="_blank"
-                    rel="noopener noreferrer">https://github.com/CherryHQ/cherry-studio</a>
-            </li>
-            <li>Email: support@cherry-ai.com</li>
-        </ul>
-
-        <div class="footer">
-            Last Updated: December 2024
-        </div>
-    </div>
-</body>
-
-</html>

resources/cherry-studio/privacy-zh.html

@@ -1,230 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>隐私协议</title>
-    <style>
-        * {
-            margin: 0;
-            padding: 0;
-            box-sizing: border-box;
-        }
-
-        body {
-            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Helvetica Neue', Arial, sans-serif;
-            line-height: 1.6;
-            color: #333;
-            background: transparent;
-            margin: 0 auto;
-        }
-
-        body.dark {
-            background: transparent;
-            color: rgba(255, 255, 255, 0.85);
-        }
-
-        h1 {
-            font-size: 24px;
-            font-weight: 600;
-            margin-bottom: 20px;
-            color: #1a1a1a;
-        }
-
-        body.dark h1 {
-            color: rgba(255, 255, 255, 0.95);
-        }
-
-        h2 {
-            font-size: 18px;
-            font-weight: 600;
-            margin-top: 24px;
-            margin-bottom: 12px;
-            color: #2c2c2c;
-        }
-
-        body.dark h2 {
-            color: rgba(255, 255, 255, 0.9);
-        }
-
-        p {
-            margin: 12px 0;
-            line-height: 1.8;
-        }
-
-        body.dark p {
-            color: rgba(255, 255, 255, 0.8);
-        }
-
-        ul {
-            margin: 12px 0;
-            padding-left: 24px;
-        }
-
-        li {
-            margin: 6px 0;
-            line-height: 1.6;
-        }
-
-        body.dark li {
-            color: rgba(255, 255, 255, 0.75);
-        }
-
-        a {
-            color: #0066cc;
-            text-decoration: none;
-        }
-
-        a:hover {
-            text-decoration: underline;
-        }
-
-        body.dark a {
-            color: #4da6ff;
-        }
-
-        .footer {
-            margin-top: 40px;
-            padding-top: 20px;
-            border-top: 1px solid #e0e0e0;
-            font-size: 13px;
-            color: #666;
-        }
-
-        body.dark .footer {
-            border-top-color: rgba(255, 255, 255, 0.1);
-            color: rgba(255, 255, 255, 0.5);
-        }
-
-        .content-wrapper {
-            overflow-y: auto;
-            padding-right: 10px;
-            background: transparent;
-        }
-
-        /* 滚动条样式 - 亮色模式 */
-        ::-webkit-scrollbar {
-            width: 8px;
-            height: 8px;
-        }
-
-        ::-webkit-scrollbar-track {
-            background: rgba(0, 0, 0, 0.05);
-            border-radius: 4px;
-        }
-
-        ::-webkit-scrollbar-thumb {
-            background: rgba(0, 0, 0, 0.2);
-            border-radius: 4px;
-        }
-
-        ::-webkit-scrollbar-thumb:hover {
-            background: rgba(0, 0, 0, 0.3);
-        }
-
-        /* 滚动条样式 - 暗色模式 */
-        body.dark ::-webkit-scrollbar-track {
-            background: rgba(255, 255, 255, 0.05);
-        }
-
-        body.dark ::-webkit-scrollbar-thumb {
-            background: rgba(255, 255, 255, 0.2);
-        }
-
-        body.dark ::-webkit-scrollbar-thumb:hover {
-            background: rgba(255, 255, 255, 0.3);
-        }
-    </style>
-    <script>
-        // 检测主题
-        document.addEventListener('DOMContentLoaded', function () {
-            const urlParams = new URLSearchParams(window.location.search);
-            const theme = urlParams.get('theme');
-            if (theme === 'dark') {
-                document.documentElement.classList.add('dark');
-                document.body.classList.add('dark');
-            }
-        });
-    </script>
-</head>
-
-<body>
-    <div class="content-wrapper">
-        <h1>隐私协议</h1>
-
-        <p>
-            欢迎使用 Cherry Studio（以下简称"本软件"或"我们"）。我们高度重视您的隐私保护，本隐私协议将说明我们如何处理与保护您的个人信息和数据。请在使用本软件前仔细阅读并理解本协议：
-        </p>
-
-        <h2>一、我们收集的信息范围</h2>
-        <p>为了优化用户体验和提升软件质量，我们仅可能会匿名收集以下非个人化信息：</p>
-        <ul>
-            <li>软件版本信息；</li>
-            <li>软件功能的活跃度、使用频次；</li>
-            <li>匿名的崩溃、错误日志信息；</li>
-        </ul>
-        <p>上述信息完全匿名，不会涉及任何个人身份数据，也无法关联到您的个人信息。</p>
-
-        <h2>二、我们不会收集的任何信息</h2>
-        <p>为了最大限度保护您的隐私安全，我们明确承诺：</p>
-        <ul>
-            <li>不会收集、保存、传输或处理您输入到本软件中的模型服务 API Key 信息；</li>
-            <li>不会收集、保存、传输或处理您在使用本软件过程中产生的任何对话数据，包括但不限于聊天内容、指令信息、知识库信息、向量数据及其他自定义内容；</li>
-            <li>不会收集、保存、传输或处理任何可识别个人身份的敏感信息。</li>
-        </ul>
-
-        <h2>三、数据交互说明</h2>
-        <p>
-            本软件采用您自行申请并配置的第三方模型服务提供商的 API Key，以完成相关模型的调用与对话功能。您使用的模型服务（例如大模型、API 接口等）由您选择的第三方提供商直接提供，我们不会介入、监控或干扰数据传输过程。
-        </p>
-        <p>
-            您与第三方模型服务之间的数据交互受第三方服务提供商的隐私政策和用户协议约束，我们建议您在使用前充分了解相关服务商的隐私条款。
-        </p>
-
-        <h2>四、本地数据的安全保护</h2>
-        <p>本软件为本地化应用程序，所有数据默认存储在您的本地设备上。我们采取了以下措施保障数据安全：</p>
-        <ul>
-            <li>对话记录、配置信息等数据仅保存在您的本地设备中；</li>
-            <li>提供数据导入/导出功能，方便您自主管理和备份数据；</li>
-            <li>不会将您的本地数据上传至任何服务器或云端存储。</li>
-        </ul>
-
-        <h2>五、第三方服务</h2>
-        <p>
-            在使用本软件过程中，您可能会接入第三方服务（如 AI 模型 API、翻译服务等）。这些第三方服务的使用受其各自的服务条款和隐私政策约束。我们强烈建议您在使用前仔细阅读并理解相关条款。
-        </p>
-
-        <h2>六、用户权利</h2>
-        <p>您对自己的数据拥有完全的控制权：</p>
-        <ul>
-            <li>您可以随时查看、修改、删除本地存储的所有数据；</li>
-            <li>您可以选择是否启用特定功能或服务；</li>
-            <li>您可以随时停止使用本软件并删除所有相关数据。</li>
-        </ul>
-
-        <h2>七、儿童隐私保护</h2>
-        <p>本软件不面向 18 岁以下的未成年人提供服务。如果您是未成年人，请在监护人的指导下使用本软件。</p>
-
-        <h2>八、隐私政策的更新</h2>
-        <p>
-            我们可能会根据法律法规要求或产品功能的变化更新本隐私协议。更新后的协议将在软件中发布，并在生效前通知您。如果您不同意更新后的条款，您可以选择停止使用本软件。
-        </p>
-
-        <h2>九、联系我们</h2>
-        <p>如果您对本隐私协议有任何疑问、建议或投诉，请通过以下方式联系我们：</p>
-        <ul>
-            <li>
-                GitHub: <a href="https://github.com/CherryHQ/cherry-studio" target="_blank"
-                    rel="noopener noreferrer">https://github.com/CherryHQ/cherry-studio</a>
-            </li>
-            <li>Email: support@cherry-ai.com</li>
-        </ul>
-
-        <div class="footer">
-            最后更新日期：2024年12月
-        </div>
-    </div>
-</body>
-
-</html>

resources/cherry-studio/releases.html

@@ -12,18 +12,18 @@
 
   <body id="app">
     <div :class="isDark ? 'dark-bg' : 'bg'" class="min-h-screen">
-      <div class="mx-auto max-w-3xl px-4 py-12">
-        <h1 class="mb-8 text-3xl font-bold" :class="isDark ? 'text-white' : 'text-gray-900'">Release Timeline</h1>
+      <div class="max-w-3xl mx-auto py-12 px-4">
+        <h1 class="text-3xl font-bold mb-8" :class="isDark ? 'text-white' : 'text-gray-900'">Release Timeline</h1>
 
         <!-- Loading状态 -->
-        <div v-if="loading" class="py-8 text-center">
+        <div v-if="loading" class="text-center py-8">
           <div
-            class="inline-block h-8 w-8 animate-spin rounded-full border-4"
+            class="inline-block animate-spin rounded-full h-8 w-8 border-4"
             :class="isDark ? 'border-gray-700 border-t-blue-500' : 'border-gray-300 border-t-blue-500'"></div>
         </div>
 
         <!-- Error 状态 -->
-        <div v-else-if="error" class="py-8 text-center text-red-500">{{ error }}</div>
+        <div v-else-if="error" class="text-red-500 text-center py-8">{{ error }}</div>
 
         <!-- Release 列表 -->
         <div v-else class="space-y-8">
@@ -32,21 +32,21 @@
             :key="release.id"
             class="relative pl-8"
             :class="isDark ? 'border-l-2 border-gray-700' : 'border-l-2 border-gray-200'">
-            <div class="absolute top-0 -left-2 h-4 w-4 rounded-full bg-green-500"></div>
+            <div class="absolute -left-2 top-0 w-4 h-4 rounded-full bg-green-500"></div>
             <div
-              class="rounded-lg p-6 shadow-sm transition-shadow"
+              class="rounded-lg shadow-sm p-6 transition-shadow"
               :class="isDark ? 'bg-black hover:shadow-md hover:shadow-black' : 'bg-white hover:shadow-md'">
-              <div class="mb-4 flex items-start justify-between">
+              <div class="flex items-start justify-between mb-4">
                 <div>
                   <h2 class="text-xl font-semibold" :class="isDark ? 'text-white' : 'text-gray-900'">
                     {{ release.name || release.tag_name }}
                   </h2>
-                  <p class="mt-1 text-sm" :class="isDark ? 'text-gray-400' : 'text-gray-500'">
+                  <p class="text-sm mt-1" :class="isDark ? 'text-gray-400' : 'text-gray-500'">
                     {{ formatDate(release.published_at) }}
                   </p>
                 </div>
                 <span
-                  class="inline-flex items-center rounded-full px-3 py-1 text-sm font-medium"
+                  class="inline-flex items-center px-3 py-1 rounded-full text-sm font-medium"
                   :class="isDark ? 'bg-green-900 text-green-200' : 'bg-green-100 text-green-800'">
                   {{ release.tag_name }}
                 </span>

resources/scripts/download.js

@@ -1,7 +1,5 @@
 const https = require('https')
 const fs = require('fs')
-const path = require('path')
-const { execSync } = require('child_process')
 
 /**
  * Downloads a file from a URL with redirect handling
@@ -34,39 +32,4 @@ async function downloadWithRedirects(url, destinationPath) {
   })
 }
 
-/**
- * Downloads a file using PowerShell Invoke-WebRequest command
- * @param {string} url The URL to download from
- * @param {string} destinationPath The path to save the file to
- * @returns {Promise<boolean>} Promise that resolves to true if download succeeds
- */
-async function downloadWithPowerShell(url, destinationPath) {
-  return new Promise((resolve, reject) => {
-    try {
-      // Only support windows platform for PowerShell download
-      if (process.platform !== 'win32') {
-        return reject(new Error('PowerShell download is only supported on Windows'))
-      }
-
-      const outputDir = path.dirname(destinationPath)
-      fs.mkdirSync(outputDir, { recursive: true })
-
-      // PowerShell command to download the file with progress disabled for faster download
-      const psCommand = `powershell -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest '${url}' -OutFile '${destinationPath}'"`
-
-      console.log(`Downloading with PowerShell: ${url}`)
-      execSync(psCommand, { stdio: 'inherit' })
-
-      if (fs.existsSync(destinationPath)) {
-        console.log(`Download completed: ${destinationPath}`)
-        resolve(true)
-      } else {
-        reject(new Error('Download failed: File not found after download'))
-      }
-    } catch (error) {
-      reject(new Error(`PowerShell download failed: ${error.message}`))
-    }
-  })
-}
-
-module.exports = { downloadWithRedirects, downloadWithPowerShell }
+module.exports = { downloadWithRedirects }

resources/scripts/install-ovms.js

@@ -1,177 +0,0 @@
-const fs = require('fs')
-const path = require('path')
-const os = require('os')
-const { execSync } = require('child_process')
-const { downloadWithPowerShell } = require('./download')
-
-// Base URL for downloading OVMS binaries
-const OVMS_PKG_NAME = 'ovms250911.zip'
-const OVMS_RELEASE_BASE_URL = [`https://gitcode.com/gcw_ggDjjkY3/kjfile/releases/download/download/${OVMS_PKG_NAME}`]
-
-/**
- * Downloads and extracts the OVMS binary for the specified platform
- */
-async function downloadOvmsBinary() {
-  // Create output directory structure - OVMS goes into its own subdirectory
-  const csDir = path.join(os.homedir(), '.cherrystudio')
-
-  // Ensure directories exist
-  fs.mkdirSync(csDir, { recursive: true })
-
-  const csOvmsDir = path.join(csDir, 'ovms')
-  // Delete existing OVMS directory if it exists
-  if (fs.existsSync(csOvmsDir)) {
-    fs.rmSync(csOvmsDir, { recursive: true })
-  }
-
-  const tempdir = os.tmpdir()
-  const tempFilename = path.join(tempdir, 'ovms.zip')
-
-  // Try each URL until one succeeds
-  let downloadSuccess = false
-  let lastError = null
-
-  for (let i = 0; i < OVMS_RELEASE_BASE_URL.length; i++) {
-    const downloadUrl = OVMS_RELEASE_BASE_URL[i]
-    console.log(`Attempting download from URL ${i + 1}/${OVMS_RELEASE_BASE_URL.length}: ${downloadUrl}`)
-
-    try {
-      console.log(`Downloading OVMS from ${downloadUrl} to ${tempFilename}...`)
-
-      // Try PowerShell download first, fallback to Node.js download if it fails
-      await downloadWithPowerShell(downloadUrl, tempFilename)
-
-      // If we get here, download was successful
-      downloadSuccess = true
-      console.log(`Successfully downloaded from: ${downloadUrl}`)
-      break
-    } catch (error) {
-      console.warn(`Download failed from ${downloadUrl}: ${error.message}`)
-      lastError = error
-
-      // Clean up failed download file if it exists
-      if (fs.existsSync(tempFilename)) {
-        try {
-          fs.unlinkSync(tempFilename)
-        } catch (cleanupError) {
-          console.warn(`Failed to clean up temporary file: ${cleanupError.message}`)
-        }
-      }
-
-      // Continue to next URL if this one failed
-      if (i < OVMS_RELEASE_BASE_URL.length - 1) {
-        console.log(`Trying next URL...`)
-      }
-    }
-  }
-
-  // Check if any download succeeded
-  if (!downloadSuccess) {
-    console.error(`All download URLs failed. Last error: ${lastError?.message || 'Unknown error'}`)
-    return 103
-  }
-
-  try {
-    console.log(`Extracting to ${csDir}...`)
-
-    // Use tar.exe to extract the ZIP file
-    console.log(`Extracting OVMS to ${csDir}...`)
-    execSync(`tar -xf ${tempFilename} -C ${csDir}`, { stdio: 'inherit' })
-    console.log(`OVMS extracted to ${csDir}`)
-
-    // Clean up temporary file
-    fs.unlinkSync(tempFilename)
-    console.log(`Installation directory: ${csDir}`)
-  } catch (error) {
-    console.error(`Error installing OVMS: ${error.message}`)
-    if (fs.existsSync(tempFilename)) {
-      fs.unlinkSync(tempFilename)
-    }
-
-    // Check if ovmsDir is empty and remove it if so
-    try {
-      const ovmsDir = path.join(csDir, 'ovms')
-      const files = fs.readdirSync(ovmsDir)
-      if (files.length === 0) {
-        fs.rmSync(ovmsDir, { recursive: true })
-        console.log(`Removed empty directory: ${ovmsDir}`)
-      }
-    } catch (cleanupError) {
-      console.warn(`Warning: Failed to clean up directory: ${cleanupError.message}`)
-      return 105
-    }
-
-    return 104
-  }
-
-  return 0
-}
-
-/**
- * Get the CPU Name and ID
- */
-function getCpuInfo() {
-  const cpuInfo = {
-    name: '',
-    id: ''
-  }
-
-  // Use PowerShell to get CPU information
-  try {
-    const psCommand = `powershell -Command "Get-CimInstance -ClassName Win32_Processor | Select-Object Name, DeviceID | ConvertTo-Json"`
-    const psOutput = execSync(psCommand).toString()
-    const cpuData = JSON.parse(psOutput)
-
-    if (Array.isArray(cpuData)) {
-      cpuInfo.name = cpuData[0].Name || ''
-      cpuInfo.id = cpuData[0].DeviceID || ''
-    } else {
-      cpuInfo.name = cpuData.Name || ''
-      cpuInfo.id = cpuData.DeviceID || ''
-    }
-  } catch (error) {
-    console.error(`Failed to get CPU info: ${error.message}`)
-  }
-
-  return cpuInfo
-}
-
-/**
- * Main function to install OVMS
- */
-async function installOvms() {
-  const platform = os.platform()
-  console.log(`Detected platform: ${platform}`)
-
-  const cpuName = getCpuInfo().name
-  console.log(`CPU Name: ${cpuName}`)
-
-  // Check if CPU name contains "Ultra"
-  if (!cpuName.toLowerCase().includes('intel') || !cpuName.toLowerCase().includes('ultra')) {
-    console.error('OVMS installation requires an Intel(R) Core(TM) Ultra CPU.')
-    return 101
-  }
-
-  // only support windows
-  if (platform !== 'win32') {
-    console.error('OVMS installation is only supported on Windows.')
-    return 102
-  }
-
-  return await downloadOvmsBinary()
-}
-
-// Run the installation
-installOvms()
-  .then((retcode) => {
-    if (retcode === 0) {
-      console.log('OVMS installation successful')
-    } else {
-      console.error('OVMS installation failed')
-    }
-    process.exit(retcode)
-  })
-  .catch((error) => {
-    console.error('OVMS installation failed:', error)
-    process.exit(100)
-  })