refactor: remove unused import comment in TranslatePage

- Introduce TargetLangs type to manage target and alter languages
- Replace local state with preference-based language management
- Simplify language selection logic in ActionTranslate component
- Remove deprecated database storage for language pairs

.github/CODEOWNERS

@@ -1,5 +1,4 @@
 /src/renderer/src/store/ @0xfullex
-/src/renderer/src/databases/ @0xfullex
 /src/main/services/ConfigManager.ts @0xfullex
 /packages/shared/IpcChannel.ts @0xfullex
 /src/main/ipc.ts @0xfullex
@@ -10,4 +9,3 @@
 /src/renderer/src/data/ @0xfullex
 
 /packages/ui/ @MyPrototypeWhat
-

.github/issue-checker.yml

@@ -0,0 +1,252 @@
+default-mode:
+  add:
+  remove: [pull_request_target, issues]
+
+labels:
+  # <!-- [Ss]kip `LABEL` --> 跳过一个 label
+  # <!-- [Rr]emove `LABEL` --> 去掉一个 label
+
+  # skips and removes
+  - name: skip all
+    content:
+    regexes: '[Ss]kip (?:[Aa]ll |)[Ll]abels?'
+  - name: remove all
+    content:
+    regexes: '[Rr]emove (?:[Aa]ll |)[Ll]abels?'
+
+  - name: skip kind/bug
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)kind/bug(?:`|)'
+  - name: remove kind/bug
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)kind/bug(?:`|)'
+
+  - name: skip kind/enhancement
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)kind/enhancement(?:`|)'
+  - name: remove kind/enhancement
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)kind/enhancement(?:`|)'
+
+  - name: skip kind/question
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)kind/question(?:`|)'
+  - name: remove kind/question
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)kind/question(?:`|)'
+
+  - name: skip area/Connectivity
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)area/Connectivity(?:`|)'
+  - name: remove area/Connectivity
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)area/Connectivity(?:`|)'
+
+  - name: skip area/UI/UX
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)area/UI/UX(?:`|)'
+  - name: remove area/UI/UX
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)area/UI/UX(?:`|)'
+
+  - name: skip kind/documentation
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)kind/documentation(?:`|)'
+  - name: remove kind/documentation
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)kind/documentation(?:`|)'
+
+  - name: skip client:linux
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)client:linux(?:`|)'
+  - name: remove client:linux
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)client:linux(?:`|)'
+
+  - name: skip client:mac
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)client:mac(?:`|)'
+  - name: remove client:mac
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)client:mac(?:`|)'
+
+  - name: skip client:win
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)client:win(?:`|)'
+  - name: remove client:win
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)client:win(?:`|)'
+
+  - name: skip sig/Assistant
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)sig/Assistant(?:`|)'
+  - name: remove sig/Assistant
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)sig/Assistant(?:`|)'
+
+  - name: skip sig/Data
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)sig/Data(?:`|)'
+  - name: remove sig/Data
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)sig/Data(?:`|)'
+
+  - name: skip sig/MCP
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)sig/MCP(?:`|)'
+  - name: remove sig/MCP
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)sig/MCP(?:`|)'
+
+  - name: skip sig/RAG
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)sig/RAG(?:`|)'
+  - name: remove sig/RAG
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)sig/RAG(?:`|)'
+
+  - name: skip lgtm
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)lgtm(?:`|)'
+  - name: remove lgtm
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)lgtm(?:`|)'
+
+  - name: skip License
+    content:
+    regexes: '[Ss]kip (?:[Ll]abels? |)(?:`|)License(?:`|)'
+  - name: remove License
+    content:
+    regexes: '[Rr]emove (?:[Ll]abels? |)(?:`|)License(?:`|)'
+
+  # `Dev Team`
+  - name: Dev Team
+    mode:
+      add: [pull_request_target, issues]
+    author_association:
+      - COLLABORATOR
+
+  # Area labels
+  - name: area/Connectivity
+    content: area/Connectivity
+    regexes: '代理|[Pp]roxy'
+    skip-if:
+      - skip all
+      - skip area/Connectivity
+    remove-if:
+      - remove all
+      - remove area/Connectivity
+
+  - name: area/UI/UX
+    content: area/UI/UX
+    regexes: '界面|[Uu][Ii]|重叠|按钮|图标|组件|渲染|菜单|栏目|头像|主题|样式|[Cc][Ss][Ss]'
+    skip-if:
+      - skip all
+      - skip area/UI/UX
+    remove-if:
+      - remove all
+      - remove area/UI/UX
+
+  # Kind labels
+  - name: kind/documentation
+    content: kind/documentation
+    regexes: '文档|教程|[Dd]oc(s|umentation)|[Rr]eadme'
+    skip-if:
+      - skip all
+      - skip kind/documentation
+    remove-if:
+      - remove all
+      - remove kind/documentation
+
+  # Client labels
+  - name: client:linux
+    content: client:linux
+    regexes: '(?:[Ll]inux|[Uu]buntu|[Dd]ebian)'
+    skip-if:
+      - skip all
+      - skip client:linux
+    remove-if:
+      - remove all
+      - remove client:linux
+
+  - name: client:mac
+    content: client:mac
+    regexes: '(?:[Mm]ac|[Mm]acOS|[Oo]SX)'
+    skip-if:
+      - skip all
+      - skip client:mac
+    remove-if:
+      - remove all
+      - remove client:mac
+
+  - name: client:win
+    content: client:win
+    regexes: '(?:[Ww]in|[Ww]indows)'
+    skip-if:
+      - skip all
+      - skip client:win
+    remove-if:
+      - remove all
+      - remove client:win
+
+  # SIG labels
+  - name: sig/Assistant
+    content: sig/Assistant
+    regexes: '快捷助手|[Aa]ssistant'
+    skip-if:
+      - skip all
+      - skip sig/Assistant
+    remove-if:
+      - remove all
+      - remove sig/Assistant
+
+  - name: sig/Data
+    content: sig/Data
+    regexes: '[Ww]ebdav|坚果云|备份|同步|数据|Obsidian|Notion|Joplin|思源'
+    skip-if:
+      - skip all
+      - skip sig/Data
+    remove-if:
+      - remove all
+      - remove sig/Data
+
+  - name: sig/MCP
+    content: sig/MCP
+    regexes: '[Mm][Cc][Pp]'
+    skip-if:
+      - skip all
+      - skip sig/MCP
+    remove-if:
+      - remove all
+      - remove sig/MCP
+
+  - name: sig/RAG
+    content: sig/RAG
+    regexes: '知识库|[Rr][Aa][Gg]'
+    skip-if:
+      - skip all
+      - skip sig/RAG
+    remove-if:
+      - remove all
+      - remove sig/RAG
+
+  # Other labels
+  - name: lgtm
+    content: lgtm
+    regexes: '(?:[Ll][Gg][Tt][Mm]|[Ll]ooks [Gg]ood [Tt]o [Mm]e)'
+    skip-if:
+      - skip all
+      - skip lgtm
+    remove-if:
+      - remove all
+      - remove lgtm
+
+  - name: License
+    content: License
+    regexes: '(?:[Ll]icense|[Cc]opyright|[Mm][Ii][Tt]|[Aa]pache)'
+    skip-if:
+      - skip all
+      - skip License
+    remove-if:
+      - remove all
+      - remove License

.github/pull_request_template.md

@@ -3,18 +3,6 @@
 1. Consider creating this PR as draft: https://github.com/CherryHQ/cherry-studio/blob/main/CONTRIBUTING.md
 -->
 
-<!--
-
-⚠️ Important: Redux/IndexedDB Data-Changing Feature PRs Temporarily On Hold ⚠️
-
-Please note: For our current development cycle, we are not accepting feature Pull Requests that introduce changes to Redux data models or IndexedDB schemas.
-
-While we value your contributions, PRs of this nature will be blocked without merge. We welcome all other contributions (bug fixes, perf enhancements, docs, etc.). Thank you!
-
-Once version 2.0.0 is released, we will resume reviewing feature PRs.
-
--->
-
 ### What this PR does
 
 Before this PR:

.github/workflows/auto-i18n.yml

@@ -1,10 +1,9 @@
 name: Auto I18N
 
 env:
-  TRANSLATION_API_KEY: ${{ secrets.TRANSLATE_API_KEY }}
-  TRANSLATION_MODEL: ${{ vars.AUTO_I18N_MODEL || 'deepseek/deepseek-v3.1'}}
-  TRANSLATION_BASE_URL: ${{ vars.AUTO_I18N_BASE_URL || 'https://api.ppinfra.com/openai'}}
-  TRANSLATION_BASE_LOCALE: ${{ vars.AUTO_I18N_BASE_LOCALE || 'en-us'}}
+  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:
@@ -14,7 +13,7 @@ on:
 jobs:
   auto-i18n:
     runs-on: ubuntu-latest
-    if: github.event_name == 'workflow_dispatch' || github.event.pull_request.head.repo.full_name == 'CherryHQ/cherry-studio'
+    if: github.event.pull_request.head.repo.full_name == 'CherryHQ/cherry-studio'
     name: Auto I18N
     permissions:
       contents: write
@@ -30,21 +29,20 @@ jobs:
         uses: actions/setup-node@v5
         with:
           node-version: 20
-          package-manager-cache: false
 
       - name: 📦 Install dependencies in isolated directory
         run: |
           # 在临时目录安装依赖
           mkdir -p /tmp/translation-deps
           cd /tmp/translation-deps
-          echo '{"dependencies": {"@cherrystudio/openai": "^6.5.0", "cli-progress": "^3.12.0", "tsx": "^4.20.3", "@biomejs/biome": "2.2.4"}}' > package.json
+          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/sync-i18n.ts && npx tsx scripts/auto-translate-i18n.ts
+        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/

.github/workflows/claude-translator.yml

@@ -45,7 +45,7 @@ jobs:
           # See: https://github.com/anthropics/claude-code-action/blob/main/docs/security.md
           github_token: ${{ secrets.TOKEN_GITHUB_WRITE }}
           allowed_non_write_users: "*"
-          anthropic_api_key: ${{ secrets.CLAUDE_TRANSLATOR_APIKEY }}
+          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 中的以下四种事件：
@@ -108,5 +108,3 @@ jobs:
 
             使用以下命令获取完整信息：
             gh issue view ${{ github.event.issue.number }} --json title,body,comments
-        env:
-          ANTHROPIC_BASE_URL: ${{ secrets.CLAUDE_TRANSLATOR_BASEURL }}

.github/workflows/delete-branch.yml

@@ -13,7 +13,6 @@ jobs:
     steps:
       - name: Delete merged branch
         uses: actions/github-script@v8
-        continue-on-error: true
         with:
           script: |
             github.rest.git.deleteRef({

.github/workflows/github-issue-tracker.yml

@@ -1,187 +0,0 @@
-name: GitHub Issue Tracker with Feishu Notification
-
-on:
-  issues:
-    types: [opened]
-  schedule:
-    # Run every day at 8:30 Beijing Time (00:30 UTC)
-    - cron: '30 0 * * *'
-  workflow_dispatch:
-
-jobs:
-  process-new-issue:
-    if: github.event_name == 'issues'
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      contents: read
-      id-token: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Check Beijing Time
-        id: check_time
-        run: |
-          # Get current time in Beijing timezone (UTC+8)
-          BEIJING_HOUR=$(TZ='Asia/Shanghai' date +%H)
-          BEIJING_MINUTE=$(TZ='Asia/Shanghai' date +%M)
-
-          echo "Beijing Time: ${BEIJING_HOUR}:${BEIJING_MINUTE}"
-
-          # Check if time is between 00:00 and 08:30
-          if [ $BEIJING_HOUR -lt 8 ] || ([ $BEIJING_HOUR -eq 8 ] && [ $BEIJING_MINUTE -le 30 ]); then
-            echo "should_delay=true" >> $GITHUB_OUTPUT
-            echo "⏰ Issue created during quiet hours (00:00-08:30 Beijing Time)"
-            echo "Will schedule notification for 08:30"
-          else
-            echo "should_delay=false" >> $GITHUB_OUTPUT
-            echo "✅ Issue created during active hours, will notify immediately"
-          fi
-
-      - name: Add pending label if in quiet hours
-        if: steps.check_time.outputs.should_delay == 'true'
-        uses: actions/github-script@v7
-        with:
-          script: |
-            github.rest.issues.addLabels({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-              labels: ['pending-feishu-notification']
-            });
-
-      - name: Setup Node.js
-        if: steps.check_time.outputs.should_delay == 'false'
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-
-      - name: Process issue with Claude
-        if: steps.check_time.outputs.should_delay == 'false'
-        uses: anthropics/claude-code-action@main
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          allowed_non_write_users: "*"
-          anthropic_api_key: ${{ secrets.CLAUDE_TRANSLATOR_APIKEY }}
-          claude_args: "--allowed-tools Bash(gh issue:*),Bash(node scripts/feishu-notify.js)"
-          prompt: |
-            你是一个GitHub Issue自动化处理助手。请完成以下任务：
-
-            ## 当前Issue信息
-            - Issue编号：#${{ github.event.issue.number }}
-            - 标题：${{ github.event.issue.title }}
-            - 作者：${{ github.event.issue.user.login }}
-            - URL：${{ github.event.issue.html_url }}
-            - 内容：${{ github.event.issue.body }}
-            - 标签：${{ join(github.event.issue.labels.*.name, ', ') }}
-
-            ## 任务步骤
-
-            1. **分析并总结issue**
-               用中文（简体）提供简洁的总结（2-3句话），包括：
-               - 问题的主要内容
-               - 核心诉求
-               - 重要的技术细节
-
-            2. **发送飞书通知**
-               使用以下命令发送飞书通知（注意：ISSUE_SUMMARY需要用引号包裹）：
-               ```bash
-               ISSUE_URL="${{ github.event.issue.html_url }}" \
-               ISSUE_NUMBER="${{ github.event.issue.number }}" \
-               ISSUE_TITLE="${{ github.event.issue.title }}" \
-               ISSUE_AUTHOR="${{ github.event.issue.user.login }}" \
-               ISSUE_LABELS="${{ join(github.event.issue.labels.*.name, ',') }}" \
-               ISSUE_SUMMARY="<你生成的中文总结>" \
-               node scripts/feishu-notify.js
-               ```
-
-            ## 注意事项
-            - 总结必须使用简体中文
-            - ISSUE_SUMMARY 在传递给 node 命令时需要正确转义特殊字符
-            - 如果issue内容为空，也要提供一个简短的说明
-
-            请开始执行任务！
-        env:
-          ANTHROPIC_BASE_URL: ${{ secrets.CLAUDE_TRANSLATOR_BASEURL }}
-          FEISHU_WEBHOOK_URL: ${{ secrets.FEISHU_WEBHOOK_URL }}
-          FEISHU_WEBHOOK_SECRET: ${{ secrets.FEISHU_WEBHOOK_SECRET }}
-
-  process-pending-issues:
-    if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      contents: read
-      id-token: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-
-      - name: Process pending issues with Claude
-        uses: anthropics/claude-code-action@main
-        with:
-          anthropic_api_key: ${{ secrets.CLAUDE_TRANSLATOR_APIKEY }}
-          allowed_non_write_users: "*"
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          claude_args: "--allowed-tools Bash(gh issue:*),Bash(gh api:*),Bash(node scripts/feishu-notify.js)"
-          prompt: |
-            你是一个GitHub Issue自动化处理助手。请完成以下任务：
-
-            ## 任务说明
-            处理所有待发送飞书通知的GitHub Issues（标记为 `pending-feishu-notification` 的issues）
-
-            ## 步骤
-
-            1. **获取待处理的issues**
-               使用以下命令获取所有带 `pending-feishu-notification` 标签的issues：
-               ```bash
-               gh api repos/${{ github.repository }}/issues?labels=pending-feishu-notification&state=open
-               ```
-
-            2. **总结每个issue**
-               对于每个找到的issue，用中文提供简洁的总结（2-3句话），包括：
-               - 问题的主要内容
-               - 核心诉求
-               - 重要的技术细节
-
-            3. **发送飞书通知**
-               对于每个issue，使用以下命令发送飞书通知：
-               ```bash
-               ISSUE_URL="<issue的html_url>" \
-               ISSUE_NUMBER="<issue编号>" \
-               ISSUE_TITLE="<issue标题>" \
-               ISSUE_AUTHOR="<issue作者>" \
-               ISSUE_LABELS="<逗号分隔的标签列表，排除pending-feishu-notification>" \
-               ISSUE_SUMMARY="<你生成的中文总结>" \
-               node scripts/feishu-notify.js
-               ```
-
-            4. **移除标签**
-               成功发送后，使用以下命令移除 `pending-feishu-notification` 标签：
-               ```bash
-               gh api -X DELETE repos/${{ github.repository }}/issues/<issue编号>/labels/pending-feishu-notification
-               ```
-
-            ## 环境变量
-            - Repository: ${{ github.repository }}
-            - Feishu webhook URL和密钥已在环境变量中配置好
-
-            ## 注意事项
-            - 如果没有待处理的issues，输出提示信息后直接结束
-            - 处理多个issues时，每个issue之间等待2-3秒，避免API限流
-            - 如果某个issue处理失败，继续处理下一个，不要中断整个流程
-            - 所有总结必须使用中文（简体中文）
-
-            请开始执行任务！
-        env:
-          ANTHROPIC_BASE_URL: ${{ secrets.CLAUDE_TRANSLATOR_BASEURL }}
-          FEISHU_WEBHOOK_URL: ${{ secrets.FEISHU_WEBHOOK_URL }}
-          FEISHU_WEBHOOK_SECRET: ${{ secrets.FEISHU_WEBHOOK_SECRET }}

.github/workflows/issue-checker.yml

@@ -0,0 +1,25 @@
+name: 'Issue Checker'
+
+on:
+  issues:
+    types: [opened, edited]
+  pull_request_target:
+    types: [opened, edited]
+  issue_comment:
+    types: [created, edited]
+
+permissions:
+  contents: read
+  issues: write
+  pull-requests: write
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: MaaAssistantArknights/issue-checker@v1.14
+        with:
+          repo-token: '${{ secrets.GITHUB_TOKEN }}'
+          configuration-path: .github/issue-checker.yml
+          not-before: 2022-08-05T00:00:00Z
+          include-title: 1

.github/workflows/issue-management.yml

@@ -29,10 +29,8 @@ jobs:
           days-before-close: 0 # Close immediately after stale
           stale-issue-label: 'inactive'
           close-issue-label: 'closed:no-response'
-          exempt-all-milestones: true
-          exempt-all-assignees: true
           stale-issue-message: |
-            This issue has been labeled as needing more information and has been inactive for ${{ env.daysBeforeStale }} days.
+            This issue has been labeled as needing more information and has been inactive for ${{ env.daysBeforeStale }} days. 
             It will be closed now due to lack of additional information.
 
             该问题被标记为"需要更多信息"且已经 ${{ env.daysBeforeStale }} 天没有任何活动，将立即关闭。
@@ -48,8 +46,6 @@ jobs:
           days-before-stale: ${{ env.daysBeforeStale }}
           days-before-close: ${{ env.daysBeforeClose }}
           stale-issue-label: 'inactive'
-          exempt-all-milestones: true
-          exempt-all-assignees: true
           stale-issue-message: |
             This issue has been inactive for a prolonged period and will be closed automatically in ${{ env.daysBeforeClose }} days.
             该问题已长时间处于闲置状态，${{ env.daysBeforeClose }} 天后将自动关闭。

.yarn/patches/@ai-sdk-huggingface-npm-0.0.4-8080836bc1.patch

@@ -1,131 +0,0 @@
-diff --git a/dist/index.mjs b/dist/index.mjs
-index b3f018730a93639aad7c203f15fb1aeb766c73f4..ade2a43d66e9184799d072153df61ef7be4ea110 100644
---- a/dist/index.mjs
-+++ b/dist/index.mjs
-@@ -296,7 +296,14 @@ var HuggingFaceResponsesLanguageModel = class {
-       metadata: huggingfaceOptions == null ? void 0 : huggingfaceOptions.metadata,
-       instructions: huggingfaceOptions == null ? void 0 : huggingfaceOptions.instructions,
-       ...preparedTools && { tools: preparedTools },
--      ...preparedToolChoice && { tool_choice: preparedToolChoice }
-+      ...preparedToolChoice && { tool_choice: preparedToolChoice },
-+      ...(huggingfaceOptions?.reasoningEffort != null && {
-+        reasoning: {
-+          ...(huggingfaceOptions?.reasoningEffort != null && {
-+            effort: huggingfaceOptions.reasoningEffort,
-+          }),
-+        },
-+      }),
-     };
-     return { args: baseArgs, warnings };
-   }
-@@ -365,6 +372,20 @@ var HuggingFaceResponsesLanguageModel = class {
-           }
-           break;
-         }
-+        case 'reasoning': {
-+          for (const contentPart of part.content) {
-+            content.push({
-+              type: 'reasoning',
-+              text: contentPart.text,
-+              providerMetadata: {
-+                huggingface: {
-+                  itemId: part.id,
-+                },
-+              },
-+            });
-+          }
-+          break;
-+        }
-         case "mcp_call": {
-           content.push({
-             type: "tool-call",
-@@ -519,6 +540,11 @@ var HuggingFaceResponsesLanguageModel = class {
-                   id: value.item.call_id,
-                   toolName: value.item.name
-                 });
-+              } else if (value.item.type === 'reasoning') {
-+                controller.enqueue({
-+                  type: 'reasoning-start',
-+                  id: value.item.id,
-+                });
-               }
-               return;
-             }
-@@ -570,6 +596,22 @@ var HuggingFaceResponsesLanguageModel = class {
-               });
-               return;
-             }
-+            if (isReasoningDeltaChunk(value)) {
-+              controller.enqueue({
-+                type: 'reasoning-delta',
-+                id: value.item_id,
-+                delta: value.delta,
-+              });
-+              return;
-+            }
-+
-+            if (isReasoningEndChunk(value)) {
-+              controller.enqueue({
-+                type: 'reasoning-end',
-+                id: value.item_id,
-+              });
-+              return;
-+            }
-           },
-           flush(controller) {
-             controller.enqueue({
-@@ -593,7 +635,8 @@ var HuggingFaceResponsesLanguageModel = class {
- var huggingfaceResponsesProviderOptionsSchema = z2.object({
-   metadata: z2.record(z2.string(), z2.string()).optional(),
-   instructions: z2.string().optional(),
--  strictJsonSchema: z2.boolean().optional()
-+  strictJsonSchema: z2.boolean().optional(),
-+  reasoningEffort: z2.string().optional(),
- });
- var huggingfaceResponsesResponseSchema = z2.object({
-   id: z2.string(),
-@@ -727,12 +770,31 @@ var responseCreatedChunkSchema = z2.object({
-     model: z2.string()
-   })
- });
-+var reasoningTextDeltaChunkSchema = z2.object({
-+  type: z2.literal('response.reasoning_text.delta'),
-+  item_id: z2.string(),
-+  output_index: z2.number(),
-+  content_index: z2.number(),
-+  delta: z2.string(),
-+  sequence_number: z2.number(),
-+});
-+
-+var reasoningTextEndChunkSchema = z2.object({
-+  type: z2.literal('response.reasoning_text.done'),
-+  item_id: z2.string(),
-+  output_index: z2.number(),
-+  content_index: z2.number(),
-+  text: z2.string(),
-+  sequence_number: z2.number(),
-+});
- var huggingfaceResponsesChunkSchema = z2.union([
-   responseOutputItemAddedSchema,
-   responseOutputItemDoneSchema,
-   textDeltaChunkSchema,
-   responseCompletedChunkSchema,
-   responseCreatedChunkSchema,
-+  reasoningTextDeltaChunkSchema,
-+  reasoningTextEndChunkSchema,
-   z2.object({ type: z2.string() }).loose()
-   // fallback for unknown chunks
- ]);
-@@ -751,6 +813,12 @@ function isResponseCompletedChunk(chunk) {
- function isResponseCreatedChunk(chunk) {
-   return chunk.type === "response.created";
- }
-+function isReasoningDeltaChunk(chunk) {
-+  return chunk.type === 'response.reasoning_text.delta';
-+}
-+function isReasoningEndChunk(chunk) {
-+  return chunk.type === 'response.reasoning_text.done';
-+}
- 
- // src/huggingface-provider.ts
- function createHuggingFace(options = {}) {

.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.1-d937b73fed.patch

@@ -1,24 +1,24 @@
 diff --git a/sdk.mjs b/sdk.mjs
-index 10162e5b1624f8ce667768943347a6e41089ad2f..32568ae08946590e382270c88d85fba81187568e 100755
+index 461e9a2ba246778261108a682762ffcf26f7224e..44bd667d9f591969d36a105ba5eb8b478c738dd8 100644
 --- a/sdk.mjs
 +++ b/sdk.mjs
-@@ -6213,7 +6213,7 @@ function createAbortController(maxListeners = DEFAULT_MAX_LISTENERS) {
+@@ -6215,7 +6215,7 @@ function createAbortController(maxListeners = DEFAULT_MAX_LISTENERS) {
  }
- 
+
  // ../src/transport/ProcessTransport.ts
 -import { spawn } from "child_process";
 +import { fork } from "child_process";
  import { createInterface } from "readline";
- 
+
  // ../src/utils/fsOperations.ts
-@@ -6487,14 +6487,11 @@ class ProcessTransport {
+@@ -6473,14 +6473,11 @@ class ProcessTransport {
          const errorMessage = isNativeBinary(pathToClaudeCodeExecutable) ? `Claude Code native binary not found at ${pathToClaudeCodeExecutable}. Please ensure Claude Code is installed via native installer or specify a valid path with options.pathToClaudeCodeExecutable.` : `Claude Code executable not found at ${pathToClaudeCodeExecutable}. Is options.pathToClaudeCodeExecutable set?`;
          throw new ReferenceError(errorMessage);
        }
 -      const isNative = isNativeBinary(pathToClaudeCodeExecutable);
 -      const spawnCommand = isNative ? pathToClaudeCodeExecutable : executable;
--      const spawnArgs = isNative ? [...executableArgs, ...args] : [...executableArgs, pathToClaudeCodeExecutable, ...args];
--      this.logForDebugging(isNative ? `Spawning Claude Code native binary: ${spawnCommand} ${spawnArgs.join(" ")}` : `Spawning Claude Code process: ${spawnCommand} ${spawnArgs.join(" ")}`);
+-      const spawnArgs = isNative ? args : [...executableArgs, pathToClaudeCodeExecutable, ...args];
+-      this.logForDebugging(isNative ? `Spawning Claude Code native binary: ${pathToClaudeCodeExecutable} ${args.join(" ")}` : `Spawning Claude Code process: ${executable} ${[...executableArgs, pathToClaudeCodeExecutable, ...args].join(" ")}`);
 +      this.logForDebugging(`Forking Claude Code Node.js process: ${pathToClaudeCodeExecutable} ${args.join(" ")}`);
        const stderrMode = env.DEBUG || stderr ? "pipe" : "ignore";
 -      this.child = spawn(spawnCommand, spawnArgs, {

CLAUDE.md

@@ -10,9 +10,8 @@ This file provides guidance to AI coding assistants when working with code in th
 - **Build with HeroUI**: Use HeroUI for every new UI component; never add `antd` or `styled-components`.
 - **Log centrally**: Route all logging through `loggerService` with the right context—no `console.log`.
 - **Research via subagent**: Lean on `subagent` for external docs, APIs, news, and references.
-- **Always propose before executing**: Before making any changes, clearly explain your planned approach and wait for explicit user approval to ensure alignment and prevent unwanted modifications.
-- **Write conventional commits with emoji**: Commit small, focused changes using emoji-prefixed Conventional Commit messages (e.g., `✨ feat:`, `🐛 fix:`, `♻️ refactor:`, `
-📝 docs:`).
+- **Seek review**: Ask a human developer to review substantial changes before merging.
+- **Commit in rhythm**: Keep commits small, conventional, and emoji-tagged.
 
 ## Development Commands
 

CONTRIBUTING.md

@@ -65,28 +65,7 @@ The Test Plan aims to provide users with a more stable application experience an
 ### Other Suggestions
 
 - **Contact Developers**: Before submitting a PR, you can contact the developers first to discuss or get help.
-
-## Important Contribution Guidelines & Focus Areas
-
-Please review the following critical information before submitting your Pull Request:
-
-### Temporary Restriction on Data-Changing Feature PRs 🚫
-
-**Currently, we are NOT accepting feature Pull Requests that introduce changes to our Redux data models or IndexedDB schemas.**
-
-Our core team is currently focused on significant architectural updates that involve these data structures. To ensure stability and focus during this period, contributions of this nature will be temporarily managed internally.
-
-*   **PRs that require changes to Redux state shape or IndexedDB schemas will be closed.**
-*   **This restriction is temporary and will be lifted with the release of `v2.0.0`.** You can track the progress of `v2.0.0` and its related discussions on issue [#10162](https://github.com/YOUR_ORG/YOUR_REPO/issues/10162) (please replace with your actual repo link).
-
-We highly encourage contributions for:
-*   Bug fixes 🐞
-*   Performance improvements 🚀
-*   Documentation updates 📚
-*   Features that **do not** alter Redux data models or IndexedDB schemas (e.g., UI enhancements, new components, minor refactors). ✨
-
-We appreciate your understanding and continued support during this important development phase. Thank you!
-
+- **Become a Core Developer**: If you contribute to the project consistently, congratulations, you can become a core developer and gain project membership status. Please check our [Membership Guide](https://github.com/CherryHQ/community/blob/main/docs/membership.en.md).
 
 ## Contact Us
 

LICENSE

@@ -1,661 +1,42 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
+**Licensing**
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+This project employs a **User-Segmented Dual Licensing** model.
 
-                            Preamble
+**Core Principle:**
 
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
+* **Individual Users and Organizations with 10 or Fewer Individuals:** Governed by default under the **GNU Affero General Public License v3.0 (AGPLv3)**.  
+* **Organizations with More Than 10 Individuals:** **Must** obtain a **Commercial License**.
 
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
+Definition: "10 or Fewer Individuals"  
+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.
 
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
+---
 
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
+**1. Open Source License: AGPLv3 - For Individuals and Organizations of 10 or Fewer**
 
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
+* 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 **AGPLv3**. The full text of the AGPLv3 can be found in the LICENSE file at [https://www.gnu.org/licenses/agpl-3.0.html](https://www.gnu.org/licenses/agpl-3.0.html).  
+* **Core Obligation:** 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 **complete corresponding source code** 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).  
+* Please read and understand the full terms of the AGPLv3 carefully before use.
 
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
+**2. Commercial License - For Organizations with More Than 10 Individuals, or Users Needing to Avoid AGPLv3 Obligations**
 
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
+* **Mandatory Requirement:** If your organization does **not** meet the "10 or Fewer Individuals" definition above (i.e., 11 or more individuals can access, use, or benefit from the software), you **must** contact us to obtain and execute a Commercial License to use Cherry Studio.  
+* **Voluntary Option:** Even if your organization meets the "10 or Fewer Individuals" condition, if your intended use case **cannot comply with the terms of the AGPLv3** (particularly the obligations regarding **source code disclosure**), or if you require specific commercial terms **not offered** by the AGPLv3 (such as warranties, indemnities, or freedom from copyleft restrictions), you also **must** contact us to obtain and execute a Commercial License.  
+* **Common scenarios requiring a Commercial License include (but are not limited to):**  
+  * Your organization has more than 10 individuals who can access, use, or benefit from the software.  
+  * (Regardless of organization size) You wish to distribute a modified version of Cherry Studio but **do not want** to disclose the source code of your modifications under AGPLv3.  
+  * (Regardless of organization size) You wish to provide a network service (SaaS) based on a modified version of Cherry Studio but **do not want** to provide the modified source code to users of the service under AGPLv3.  
+  * (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.  
+* The Commercial License grants you rights exempting you from AGPLv3 obligations (like source code disclosure) and may include additional commercial assurances.  
+* **Obtaining a Commercial License:** Please contact the Cherry Studio development team via email at **bd@cherry-ai.com** to discuss commercial licensing options.
 
-  The precise terms and conditions for copying, distribution and
-modification follow.
+**3. Contributions**
 
-                       TERMS AND CONDITIONS
+* We welcome community contributions to Cherry Studio. All contributions submitted to this project are considered to be offered under the **AGPLv3** license.  
+* 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).  
+* You also understand and agree that your contribution may be included in distributions of Cherry Studio offered under our commercial license.
 
-  0. Definitions.
+**4. Other Terms**
 
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
+* The specific terms and conditions of the Commercial License are governed by the formal commercial license agreement signed by both parties.  
+* 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).

README.md

@@ -37,7 +37,7 @@
 <p align="center">English | <a href="./docs/README.zh.md">中文</a> | <a href="https://cherry-ai.com">Official Site</a> | <a href="https://docs.cherry-ai.com/cherry-studio-wen-dang/en-us">Documents</a> | <a href="./docs/dev.md">Development</a> | <a href="https://github.com/CherryHQ/cherry-studio/issues">Feedback</a><br></p>
 
 <div align="center">
-
+  
 [![][deepwiki-shield]][deepwiki-link]
 [![][twitter-shield]][twitter-link]
 [![][discord-shield]][discord-link]
@@ -45,7 +45,7 @@
 
 </div>
 <div align="center">
-
+  
 [![][github-release-shield]][github-release-link]
 [![][github-nightly-shield]][github-nightly-link]
 [![][github-contributors-shield]][github-contributors-link]
@@ -141,7 +141,6 @@ We're actively working on the following features and improvements:
 - iOS App (Phase 1)
 - Multi-Window support
 - Window Pinning functionality
-- Intel AI PC (Core Ultra) Support
 
 4. 🔌 **Advanced Features**
 
@@ -248,10 +247,10 @@ The Enterprise Edition addresses core challenges in team collaboration by centra
 
 | Feature           | Community Edition                          | Enterprise Edition                                                                                                                      |
 | :---------------- | :----------------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------- |
-| **Open Source**   | ✅ Yes                                      | ⭕️ Partially released to customers                                                                                                       |
+| **Open Source**   | ✅ Yes                                     | ⭕️ Partially released to customers                                                                                                      |
 | **Cost**          | Free for Personal Use / Commercial License | Buyout / Subscription Fee                                                                                                               |
 | **Admin Backend** | —                                          | ● Centralized **Model** Access<br>● **Employee** Management<br>● Shared **Knowledge Base**<br>● **Access** Control<br>● **Data** Backup |
-| **Server**        | —                                          | ✅ Dedicated Private Deployment                                                                                                          |
+| **Server**        | —                                          | ✅ Dedicated Private Deployment                                                                                                         |
 
 ## Get the Enterprise Edition
 
@@ -287,14 +286,6 @@ We believe the Enterprise Edition will become your team's AI productivity engine
  </picture>
 </a>
 
-# 📜 License
-
-The Cherry Studio Community Edition is governed by the standard GNU Affero General Public License v3.0 (AGPL-3.0), available at https://www.gnu.org/licenses/agpl-3.0.html.
-
-Use of the Cherry Studio Community Edition for commercial purposes is permitted, subject to full compliance with the terms and conditions of the AGPL-3.0 license.
-
-Should you require a commercial license that provides an exemption from the AGPL-3.0 requirements, please contact us at bd@cherry-ai.com.
-
 <!-- Links & Images -->
 
 [deepwiki-shield]: https://img.shields.io/badge/Deepwiki-CherryHQ-0088CC?logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNy45MyAzMiI+PHBhdGggZD0iTTE5LjMzIDE0LjEyYy42Ny0uMzkgMS41LS4zOSAyLjE4IDBsMS43NCAxYy4wNi4wMy4xMS4wNi4xOC4wN2guMDRjLjA2LjAzLjEyLjAzLjE4LjAzaC4wMmMuMDYgMCAuMTEgMCAuMTctLjAyaC4wM2MuMDYtLjAyLjEyLS4wNS4xNy0uMDhoLjAybDMuNDgtMi4wMWMuMjUtLjE0LjQtLjQxLjQtLjdWOC40YS44MS44MSAwIDAgMC0uNC0uN2wtMy40OC0yLjAxYS44My44MyAwIDAgMC0uODEgMEwxOS43NyA3LjdoLS4wMWwtLjE1LjEyLS4wMi4wMnMtLjA3LjA5LS4xLjE0VjhhLjQuNCAwIDAgMC0uMDguMTd2LjA0Yy0uMDMuMDYtLjAzLjEyLS4wMy4xOXYyLjAxYzAgLjc4LS40MSAxLjQ5LTEuMDkgMS44OC0uNjcuMzktMS41LjM5LTIuMTggMGwtMS43NC0xYS42LjYgMCAwIDAtLjIxLS4wOGMtLjA2LS4wMS0uMTItLjAyLS4xOC0uMDJoLS4wM2MtLjA2IDAtLjExLjAxLS4xNy4wMmgtLjAzYy0uMDYuMDItLjEyLjA0LS4xNy4wN2gtLjAybC0zLjQ3IDIuMDFjLS4yNS4xNC0uNC40MS0uNC43VjE4YzAgLjI5LjE1LjU1LjQuN2wzLjQ4IDIuMDFoLjAyYy4wNi4wNC4xMS4wNi4xNy4wOGguMDNjLjA1LjAyLjExLjAzLjE3LjAzaC4wMmMuMDYgMCAuMTIgMCAuMTgtLjAyaC4wNGMuMDYtLjAzLjEyLS4wNS4xOC0uMDhsMS43NC0xYy42Ny0uMzkgMS41LS4zOSAyLjE3IDBzMS4wOSAxLjExIDEuMDkgMS44OHYyLjAxYzAgLjA3IDAgLjEzLjAyLjE5di4wNGMuMDMuMDYuMDUuMTIuMDguMTd2LjAycy4wOC4wOS4xMi4xM2wuMDIuMDJzLjA5LjA4LjE1LjExYzAgMCAuMDEgMCAuMDEuMDFsMy40OCAyLjAxYy4yNS4xNC41Ni4xNC44MSAwbDMuNDgtMi4wMWMuMjUtLjE0LjQtLjQxLjQtLjd2LTQuMDFhLjgxLjgxIDAgMCAwLS40LS43bC0zLjQ4LTIuMDFoLS4wMmMtLjA1LS4wNC0uMTEtLjA2LS4xNy0uMDhoLS4wM2EuNS41IDAgMCAwLS4xNy0uMDNoLS4wM2MtLjA2IDAtLjEyIDAtLjE4LjAyLS4wNy4wMi0uMTUuMDUtLjIxLjA4bC0xLjc0IDFjLS42Ny4zOS0xLjUuMzktMi4xNyAwYTIuMTkgMi4xOSAwIDAgMS0xLjA5LTEuODhjMC0uNzguNDItMS40OSAxLjA5LTEuODhaIiBzdHlsZT0iZmlsbDojNWRiZjlkIi8+PHBhdGggZD0ibS40IDEzLjExIDMuNDcgMi4wMWMuMjUuMTQuNTYuMTQuOCAwbDMuNDctMi4wMWguMDFsLjE1LS4xMi4wMi0uMDJzLjA3LS4wOS4xLS4xNGwuMDItLjAyYy4wMy0uMDUuMDUtLjExLjA3LS4xN3YtLjA0Yy4wMy0uMDYuMDMtLjEyLjAzLS4xOVYxMC40YzAtLjc4LjQyLTEuNDkgMS4wOS0xLjg4czEuNS0uMzkgMi4xOCAwbDEuNzQgMWMuMDcuMDQuMTQuMDcuMjEuMDguMDYuMDEuMTIuMDIuMTguMDJoLjAzYy4wNiAwIC4xMS0uMDEuMTctLjAyaC4wM2MuMDYtLjAyLjEyLS4wNC4xNy0uMDdoLjAybDMuNDctMi4wMmMuMjUtLjE0LjQtLjQxLjQtLjd2LTRhLjgxLjgxIDAgMCAwLS40LS43bC0zLjQ2LTJhLjgzLjgzIDAgMCAwLS44MSAwbC0zLjQ4IDIuMDFoLS4wMWwtLjE1LjEyLS4wMi4wMi0uMS4xMy0uMDIuMDJjLS4wMy4wNS0uMDUuMTEtLjA3LjE3di4wNGMtLjAzLjA2LS4wMy4xMi0uMDMuMTl2Mi4wMWMwIC43OC0uNDIgMS40OS0xLjA5IDEuODhzLTEuNS4zOS0yLjE4IDBsLTEuNzQtMWEuNi42IDAgMCAwLS4yMS0uMDhjLS4wNi0uMDEtLjEyLS4wMi0uMTgtLjAyaC0uMDNjLS4wNiAwLS4xMS4wMS0uMTcuMDJoLS4wM2MtLjA2LjAyLS4xMi4wNS0uMTcuMDhoLS4wMkwuNCA3LjcxYy0uMjUuMTQtLjQuNDEtLjQuNjl2NC4wMWMwIC4yOS4xNS41Ni40LjciIHN0eWxlPSJmaWxsOiM0NDY4YzQiLz48cGF0aCBkPSJtMTcuODQgMjQuNDgtMy40OC0yLjAxaC0uMDJjLS4wNS0uMDQtLjExLS4wNi0uMTctLjA4aC0uMDNhLjUuNSAwIDAgMC0uMTctLjAzaC0uMDNjLS4wNiAwLS4xMiAwLS4xOC4wMmgtLjA0Yy0uMDYuMDMtLjEyLjA1LS4xOC4wOGwtMS43NCAxYy0uNjcuMzktMS41LjM5LTIuMTggMGEyLjE5IDIuMTkgMCAwIDEtMS4wOS0xLjg4di0yLjAxYzAtLjA2IDAtLjEzLS4wMi0uMTl2LS4wNGMtLjAzLS4wNi0uMDUtLjExLS4wOC0uMTdsLS4wMi0uMDJzLS4wNi0uMDktLjEtLjEzTDguMjkgMTlzLS4wOS0uMDgtLjE1LS4xMWgtLjAxbC0zLjQ3LTIuMDJhLjgzLjgzIDAgMCAwLS44MSAwTC4zNyAxOC44OGEuODcuODcgMCAwIDAtLjM3LjcxdjQuMDFjMCAuMjkuMTUuNTUuNC43bDMuNDcgMi4wMWguMDJjLjA1LjA0LjExLjA2LjE3LjA4aC4wM2MuMDUuMDIuMTEuMDMuMTYuMDNoLjAzYy4wNiAwIC4xMiAwIC4xOC0uMDJoLjA0Yy4wNi0uMDMuMTItLjA1LjE4LS4wOGwxLjc0LTFjLjY3LS4zOSAxLjUtLjM5IDIuMTcgMHMxLjA5IDEuMTEgMS4wOSAxLjg4djIuMDFjMCAuMDcgMCAuMTMuMDIuMTl2LjA0Yy4wMy4wNi4wNS4xMS4wOC4xN2wuMDIuMDJzLjA2LjA5LjEuMTRsLjAyLjAycy4wOS4wOC4xNS4xMWguMDFsMy40OCAyLjAyYy4yNS4xNC41Ni4xNC44MSAwbDMuNDgtMi4wMWMuMjUtLjE0LjQtLjQxLjQtLjdWMjUuMmEuODEuODEgMCAwIDAtLjQtLjdaIiBzdHlsZT0iZmlsbDojNDI5M2Q5Ii8+PC9zdmc+

biome.jsonc

@@ -21,11 +21,7 @@
       "quoteStyle": "single"
     }
   },
-  "files": {
-    "ignoreUnknown": false,
-    "includes": ["**"],
-    "maxSize": 2097152
-  },
+  "files": { "ignoreUnknown": false },
   "formatter": {
     "attributePosition": "auto",
     "bracketSameLine": false,

docs/CONTRIBUTING.zh.md

@@ -69,28 +69,7 @@ git commit --signoff -m "Your commit message"
 ### 其他建议
 
 - **联系开发者**：在提交 PR 之前，您可以先和开发者进行联系，共同探讨或者获取帮助。
-
-## 重要贡献指南与关注点
-
-在提交 Pull Request 之前，请务必阅读以下关键信息：
-
-### 🚫 暂时限制涉及数据更改的功能性 PR
-
-**目前，我们不接受涉及 Redux 数据模型或 IndexedDB schema 变更的功能性 Pull Request。**
-
-我们的核心团队目前正专注于涉及这些数据结构的关键架构更新和基础工作。为确保在此期间的稳定性与专注，此类贡献将暂时由内部进行管理。
-
-*   **需要更改 Redux 状态结构或 IndexedDB schema 的 PR 将会被关闭。**
-*   **此限制是临时性的，并将在 `v2.0.0` 版本发布后解除。** 您可以通过 Issue [#10162](https://github.com/YOUR_ORG/YOUR_REPO/issues/10162) (请替换为您的实际仓库链接) 跟踪 `v2.0.0` 的进展及相关讨论。
-
-我们非常鼓励以下类型的贡献：
-*   错误修复 🐞
-*   性能改进 🚀
-*   文档更新 📚
-*   不改变 Redux 数据模型或 IndexedDB schema 的功能（例如，UI 增强、新组件、小型重构）。✨
-
-感谢您在此重要开发阶段的理解与持续支持。谢谢！
-
+- **成为核心开发者**：如果您能够稳定为项目贡献，恭喜您可以成为项目核心开发者，获取到项目成员身份。请查看我们的[成员指南](https://github.com/CherryHQ/community/blob/main/membership.md)
 
 ## 联系我们
 

electron-builder.yml

@@ -9,7 +9,6 @@ electronLanguages:
   - zh_CN # for macOS
   - zh_TW # for macOS
   - en # for macOS
-  - de
 directories:
   buildResources: build
 
@@ -67,10 +66,6 @@ asarUnpack:
 extraResources:
   - from: "migrations/sqlite-drizzle"
     to: "migrations/sqlite-drizzle"
-  # copy from node_modules/claude-code-plugins/plugins to resources/data/claude-code-pluginso
-  - from: "./node_modules/claude-code-plugins/plugins/"
-    to: "claude-code-plugins"
-
 win:
   executableName: Cherry Studio
   artifactName: ${productName}-${version}-${arch}-setup.${ext}
@@ -133,61 +128,21 @@ afterSign: scripts/notarize.js
 artifactBuildCompleted: scripts/artifact-build-completed.js
 releaseInfo:
   releaseNotes: |
-    <!--LANG:en-->
-    What's New in v1.7.0-beta.2
+    What's New in v1.6.3
 
-    New Features:
-    - Session Settings: Manage session-specific settings and model configurations independently
-    - Notes Full-Text Search: Search across all notes with match highlighting
-    - Built-in DiDi MCP Server: Integration with DiDi ride-hailing services (China only)
-    - Intel OV OCR: Hardware-accelerated OCR using Intel NPU
-    - Auto-start API Server: Automatically starts when agents exist
-
-    Improvements:
-    - Agent model selection now requires explicit user choice
-    - Added Mistral AI provider support
-    - Added NewAPI generic provider support
-    - Improved navbar layout consistency across different modes
-    - Enhanced chat component responsiveness
-    - Better code block display on small screens
-    - Updated OVMS to 2025.3 official release
-    - Added Greek language support
+    Features:
+    - Notes: Add spell-check control, automatic table line wrapping, export functionality, and LLM-based renaming
+    - UI: Expand topic rename clickable area, add middle-click tab closing, remove redundant scrollbars, fix message menubar overflow
+    - Editor: Add read-only extension support, make TextFilePreview read-only but copyable
+    - Models: Update support for DeepSeek v3.2, Claude 4.5, GLM 4.6, Gemini regex, and vision models
+    - Code Tools: Add GitHub Copilot CLI integration
 
     Bug Fixes:
-    - Fixed GitHub Copilot gpt-5-codex streaming issues
-    - Fixed assistant creation failures
-    - Fixed translate auto-copy functionality
-    - Fixed miniapps external link opening
-    - Fixed message layout and overflow issues
-    - Fixed API key parsing to preserve spaces
-    - Fixed agent display in different navbar layouts
+    - Fix migration for missing providers
+    - Fix forked topic retaining old name after rename
+    - Restore first token latency reporting in metrics
+    - Fix UI scrollbar and overflow issues
 
-    <!--LANG:zh-CN-->
-    v1.7.0-beta.2 新特性
-
-    新功能:
-    - 会话设置：独立管理会话特定的设置和模型配置
-    - 笔记全文搜索：跨所有笔记搜索并高亮匹配内容
-    - 内置滴滴 MCP 服务器：集成滴滴打车服务(仅限中国地区)
-    - Intel OV OCR：使用 Intel NPU 的硬件加速 OCR
-    - 自动启动 API 服务器：当存在 Agent 时自动启动
-
-    改进:
-    - Agent 模型选择现在需要用户显式选择
-    - 添加 Mistral AI 提供商支持
-    - 添加 NewAPI 通用提供商支持
-    - 改进不同模式下的导航栏布局一致性
-    - 增强聊天组件响应式设计
-    - 优化小屏幕代码块显示
-    - 更新 OVMS 至 2025.3 正式版
-    - 添加希腊语支持
-
-    问题修复:
-    - 修复 GitHub Copilot gpt-5-codex 流式传输问题
-    - 修复助手创建失败
-    - 修复翻译自动复制功能
-    - 修复小程序外部链接打开
-    - 修复消息布局和溢出问题
-    - 修复 API 密钥解析以保留空格
-    - 修复不同导航栏布局中的 Agent 显示
-    <!--LANG:END-->
+    Technical Updates:
+    - Upgrade to Electron 37.6.0
+    - Update dependencies across packages

package.json

@@ -81,16 +81,13 @@
     "release:aicore": "yarn workspace @cherrystudio/ai-core version patch --immediate && yarn workspace @cherrystudio/ai-core npm publish --access public"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "patch:@anthropic-ai/claude-agent-sdk@npm%3A0.1.25#~/.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.25-08bbabb5d3.patch",
+    "@anthropic-ai/claude-agent-sdk": "patch:@anthropic-ai/claude-agent-sdk@npm%3A0.1.1#~/.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.1-d937b73fed.patch",
     "@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",
-    "gray-matter": "^4.0.3",
-    "js-yaml": "^4.1.0",
     "jsdom": "26.1.0",
     "node-stream-zip": "^1.15.0",
     "officeparser": "^4.2.0",
@@ -98,7 +95,6 @@
     "selection-hook": "^1.0.12",
     "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"
   },
@@ -108,7 +104,6 @@
     "@agentic/tavily": "^7.3.3",
     "@ai-sdk/amazon-bedrock": "^3.0.35",
     "@ai-sdk/google-vertex": "^3.0.40",
-    "@ai-sdk/huggingface": "patch:@ai-sdk/huggingface@npm%3A0.0.4#~/.yarn/patches/@ai-sdk-huggingface-npm-0.0.4-8080836bc1.patch",
     "@ai-sdk/mistral": "^2.0.19",
     "@ai-sdk/perplexity": "^2.0.13",
     "@ant-design/v5-patch-for-react-19": "^1.0.3",
@@ -132,7 +127,6 @@
     "@cherrystudio/embedjs-ollama": "^0.1.31",
     "@cherrystudio/embedjs-openai": "^0.1.31",
     "@cherrystudio/extension-table-plus": "workspace:^",
-    "@cherrystudio/openai": "^6.5.0",
     "@cherrystudio/ui": "workspace:*",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/modifiers": "^9.0.0",
@@ -154,14 +148,14 @@
     "@modelcontextprotocol/sdk": "^1.17.5",
     "@mozilla/readability": "^0.6.0",
     "@notionhq/client": "^2.2.15",
-    "@openrouter/ai-sdk-provider": "^1.2.0",
+    "@openrouter/ai-sdk-provider": "^1.1.2",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "2.0.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.200.0",
     "@opentelemetry/sdk-trace-base": "^2.0.0",
     "@opentelemetry/sdk-trace-node": "^2.0.0",
     "@opentelemetry/sdk-trace-web": "^2.0.0",
-    "@opeoginni/github-copilot-openai-compatible": "0.1.19",
+    "@opeoginni/github-copilot-openai-compatible": "0.1.18",
     "@playwright/test": "^1.52.0",
     "@radix-ui/react-context-menu": "^2.2.16",
     "@reduxjs/toolkit": "^2.2.5",
@@ -200,7 +194,6 @@
     "@types/fs-extra": "^11",
     "@types/he": "^1",
     "@types/html-to-text": "^9",
-    "@types/js-yaml": "^4.0.9",
     "@types/lodash": "^4.17.5",
     "@types/markdown-it": "^14",
     "@types/md5": "^2.3.5",
@@ -240,7 +233,6 @@
     "check-disk-space": "3.4.0",
     "cheerio": "^1.1.2",
     "chokidar": "^4.0.3",
-    "claude-code-plugins": "1.0.1",
     "cli-progress": "^3.12.0",
     "clsx": "^2.1.1",
     "code-inspector-plugin": "^0.20.14",
@@ -256,13 +248,13 @@
     "dotenv-cli": "^7.4.2",
     "drizzle-kit": "^0.31.4",
     "drizzle-orm": "^0.44.5",
-    "electron": "38.4.0",
+    "electron": "37.6.0",
     "electron-builder": "26.0.15",
     "electron-devtools-installer": "^3.2.0",
     "electron-reload": "^2.0.0-alpha.1",
     "electron-store": "^8.2.0",
     "electron-updater": "6.6.4",
-    "electron-vite": "4.0.1",
+    "electron-vite": "4.0.0",
     "electron-window-state": "^5.0.3",
     "emittery": "^1.0.3",
     "emoji-picker-element": "^1.22.1",
@@ -273,6 +265,7 @@
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-unused-imports": "^4.1.4",
+    "express": "^5.1.0",
     "express-validator": "^7.2.1",
     "fast-diff": "^1.3.0",
     "fast-xml-parser": "^5.2.0",
@@ -289,7 +282,6 @@
     "husky": "^9.1.7",
     "i18next": "^23.11.5",
     "iconv-lite": "^0.6.3",
-    "ipaddr.js": "^2.2.0",
     "isbinaryfile": "5.0.4",
     "jaison": "^2.0.2",
     "jest-styled-components": "^7.2.0",
@@ -306,15 +298,16 @@
     "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.22.0",
     "oxlint-tsgolint": "^0.2.0",
     "p-queue": "^8.1.0",
     "pdf-lib": "^1.17.1",
     "pdf-parse": "^1.1.1",
-    "playwright": "^1.55.1",
+    "playwright": "^1.52.0",
     "proxy-agent": "^6.5.0",
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0",
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
     "react-error-boundary": "^6.0.0",
     "react-hotkeys-hook": "^4.6.1",
     "react-i18next": "^14.1.2",
@@ -346,6 +339,7 @@
     "string-width": "^7.2.0",
     "striptags": "^3.2.0",
     "styled-components": "^6.1.11",
+    "swagger-ui-express": "^5.0.1",
     "swr": "^2.3.6",
     "tailwindcss": "^4.1.13",
     "tar": "^7.4.3",
@@ -358,7 +352,7 @@
     "undici": "6.21.2",
     "unified": "^11.0.5",
     "uuid": "^13.0.0",
-    "vite": "npm:rolldown-vite@7.1.5",
+    "vite": "npm:rolldown-vite@latest",
     "vitest": "^3.2.4",
     "webdav": "^5.8.0",
     "winston": "^3.17.0",
@@ -385,22 +379,15 @@
     "file-stream-rotator@npm:^0.6.1": "patch:file-stream-rotator@npm%3A0.6.1#~/.yarn/patches/file-stream-rotator-npm-0.6.1-eab45fb13d.patch",
     "libsql@npm:^0.4.4": "patch:libsql@npm%3A0.4.7#~/.yarn/patches/libsql-npm-0.4.7-444e260fb1.patch",
     "node-abi": "4.12.0",
-    "openai@npm:^4.77.0": "npm:@cherrystudio/openai@6.5.0",
-    "openai@npm:^4.87.3": "npm:@cherrystudio/openai@6.5.0",
+    "openai@npm:^4.77.0": "patch:openai@npm%3A5.12.2#~/.yarn/patches/openai-npm-5.12.2-30b075401c.patch",
+    "openai@npm:^4.87.3": "patch:openai@npm%3A5.12.2#~/.yarn/patches/openai-npm-5.12.2-30b075401c.patch",
     "pdf-parse@npm:1.1.1": "patch:pdf-parse@npm%3A1.1.1#~/.yarn/patches/pdf-parse-npm-1.1.1-04a6109b2a.patch",
     "pkce-challenge@npm:^4.1.0": "patch:pkce-challenge@npm%3A4.1.0#~/.yarn/patches/pkce-challenge-npm-4.1.0-fbc51695a3.patch",
     "tar-fs": "^2.1.4",
     "undici": "6.21.2",
-    "vite": "npm:rolldown-vite@7.1.5",
+    "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.20": "patch:@ai-sdk/google@npm%3A2.0.20#~/.yarn/patches/@ai-sdk-google-npm-2.0.20-b9102f9d54.patch",
-    "@img/sharp-darwin-arm64": "0.34.3",
-    "@img/sharp-darwin-x64": "0.34.3",
-    "@img/sharp-linux-arm": "0.34.3",
-    "@img/sharp-linux-arm64": "0.34.3",
-    "@img/sharp-linux-x64": "0.34.3",
-    "@img/sharp-win32-x64": "0.34.3",
-    "openai@npm:5.12.2": "npm:@cherrystudio/openai@6.5.0"
+    "@ai-sdk/google@npm:2.0.20": "patch:@ai-sdk/google@npm%3A2.0.20#~/.yarn/patches/@ai-sdk-google-npm-2.0.20-b9102f9d54.patch"
   },
   "packageManager": "yarn@4.9.1",
   "lint-staged": {

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

@@ -7,7 +7,6 @@ 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 { createHuggingFace } from '@ai-sdk/huggingface'
 import { createOpenAI, type OpenAIProviderSettings } from '@ai-sdk/openai'
 import { createOpenAICompatible } from '@ai-sdk/openai-compatible'
 import type { LanguageModelV2 } from '@ai-sdk/provider'
@@ -30,8 +29,7 @@ export const baseProviderIds = [
   'azure',
   'azure-responses',
   'deepseek',
-  'openrouter',
-  'huggingface'
+  'openrouter'
 ] as const
 
 /**
@@ -135,12 +133,6 @@ export const baseProviders = [
     name: 'OpenRouter',
     creator: createOpenRouter,
     supportsImageGeneration: true
-  },
-  {
-    id: 'huggingface',
-    name: 'HuggingFace',
-    creator: createHuggingFace,
-    supportsImageGeneration: true
   }
 ] as const satisfies BaseProvider[]
 

packages/shared/IpcChannel.ts

@@ -96,10 +96,6 @@ export enum IpcChannel {
   AgentMessage_PersistExchange = 'agent-message:persist-exchange',
   AgentMessage_GetHistory = 'agent-message:get-history',
 
-  AgentToolPermission_Request = 'agent-tool-permission:request',
-  AgentToolPermission_Response = 'agent-tool-permission:response',
-  AgentToolPermission_Result = 'agent-tool-permission:result',
-
   //copilot
   Copilot_GetAuthMessage = 'copilot:get-auth-message',
   Copilot_GetCopilotToken = 'copilot:get-copilot-token',
@@ -142,7 +138,6 @@ export enum IpcChannel {
   Windows_Close = 'window:close',
   Windows_IsMaximized = 'window:is-maximized',
   Windows_MaximizedChanged = 'window:maximized-changed',
-  Windows_NavigateToAbout = 'window:navigate-to-about',
 
   KnowledgeBase_Create = 'knowledge-base:create',
   KnowledgeBase_Reset = 'knowledge-base:reset',
@@ -204,9 +199,7 @@ export enum IpcChannel {
 
   Export_Word = 'export:word',
 
-  Shortcuts_GetAll = 'shortcuts:getAll',
   Shortcuts_Update = 'shortcuts:update',
-  Shortcuts_Updated = 'shortcuts:updated',
 
   // backup
   Backup_Backup = 'backup:backup',
@@ -356,7 +349,6 @@ export enum IpcChannel {
   ApiServer_Stop = 'api-server:stop',
   ApiServer_Restart = 'api-server:restart',
   ApiServer_GetStatus = 'api-server:get-status',
-  // NOTE: This api is not be used.
   ApiServer_GetConfig = 'api-server:get-config',
 
   // Anthropic OAuth
@@ -376,7 +368,6 @@ export enum IpcChannel {
 
   // OCR
   OCR_ocr = 'ocr:ocr',
-  OCR_ListProviders = 'ocr:list-providers',
 
   // OVMS
   Ovms_AddModel = 'ovms:add-model',
@@ -388,14 +379,5 @@ export enum IpcChannel {
   Ovms_StopOVMS = 'ovms:stop-ovms',
 
   // CherryAI
-  Cherryai_GetSignature = 'cherryai:get-signature',
-
-  // Claude Code Plugins
-  ClaudeCodePlugin_ListAvailable = 'claudeCodePlugin:list-available',
-  ClaudeCodePlugin_Install = 'claudeCodePlugin:install',
-  ClaudeCodePlugin_Uninstall = 'claudeCodePlugin:uninstall',
-  ClaudeCodePlugin_ListInstalled = 'claudeCodePlugin:list-installed',
-  ClaudeCodePlugin_InvalidateCache = 'claudeCodePlugin:invalidate-cache',
-  ClaudeCodePlugin_ReadContent = 'claudeCodePlugin:read-content',
-  ClaudeCodePlugin_WriteContent = 'claudeCodePlugin:write-content'
+  Cherryai_GetSignature = 'cherryai:get-signature'
 }

packages/shared/data/cache/cacheSchemas.ts

@@ -1,3 +1,5 @@
+import type { TranslateLanguageCode } from '@types'
+
 import type * as CacheValueTypes from './cacheValueTypes'
 
 /**
@@ -27,6 +29,15 @@ export type UseCacheSchema = {
   'topic.renaming': string[]
   'topic.newly_renamed': string[]
 
+  // Translate state
+  'translate.lang.source': TranslateLanguageCode | 'auto'
+  'translate.lang.target': TranslateLanguageCode
+  'translate.input': string
+  'translate.output': string
+  'translate.detecting': boolean
+  'translate.translating': CacheValueTypes.CacheTranslating
+  'translate.bidirectional': CacheValueTypes.CacheTranslateBidirectional
+
   // Test keys (for dataRefactorTest window)
   // TODO: remove after testing
   'test-hook-memory-1': string
@@ -72,6 +83,19 @@ export const DefaultUseCache: UseCacheSchema = {
   'topic.renaming': [],
   'topic.newly_renamed': [],
 
+  // Translate state
+  'translate.lang.source': 'auto',
+  'translate.lang.target': 'zh-cn',
+  'translate.input': '',
+  'translate.output': '',
+  'translate.detecting': false,
+  'translate.translating': { isTranslating: false, abortKey: null },
+  'translate.bidirectional': {
+    enabled: false,
+    origin: 'en-us',
+    target: 'zh-cn'
+  },
+
   // Test keys (for dataRefactorTest window)
   // TODO: remove after testing
   'test-hook-memory-1': 'default-memory-value',

packages/shared/data/cache/cacheValueTypes.ts

@@ -1,4 +1,4 @@
-import type { MinAppType, Topic, WebSearchStatus } from '@types'
+import type { MinAppType, Topic, TranslateLanguageCode, WebSearchStatus } from '@types'
 import type { UpdateInfo } from 'builder-util-runtime'
 
 export type CacheAppUpdateState = {
@@ -16,3 +16,17 @@ export type CacheActiveSearches = Record<string, WebSearchStatus>
 // The actual type checking will be done at runtime by the cache system
 export type CacheMinAppType = MinAppType
 export type CacheTopic = Topic
+export type CacheTranslating =
+  | {
+      isTranslating: true
+      abortKey: string
+    }
+  | {
+      isTranslating: false
+      abortKey: null
+    }
+export type CacheTranslateBidirectional = {
+  enabled: boolean
+  origin: TranslateLanguageCode
+  target: TranslateLanguageCode
+}

packages/shared/data/preference/preferenceSchemas.ts

@@ -11,23 +11,12 @@
 
 import { TRANSLATE_PROMPT } from '@shared/config/prompts'
 import * as PreferenceTypes from '@shared/data/preference/preferenceTypes'
-import { shortcutDefinitions } from '@shared/shortcuts/definitions'
 
 /* eslint @typescript-eslint/member-ordering: ["error", {
   "interfaces": { "order": "alphabetically" },
   "typeLiterals": { "order": "alphabetically" }
 }] */
 
-const defaultShortcutPreferences: PreferenceTypes.ShortcutPreferencesValue = Object.fromEntries(
-  shortcutDefinitions.map((definition) => [
-    definition.name,
-    {
-      enabled: definition.defaultEnabled,
-      key: [...definition.defaultKey]
-    }
-  ])
-)
-
 export interface PreferenceSchemas {
   default: {
     // redux/settings/enableDeveloperMode
@@ -388,8 +377,6 @@ export interface PreferenceSchemas {
     'shortcut.chat.search_message': Record<string, unknown>
     // redux/shortcuts/shortcuts.toggle_new_context
     'shortcut.chat.toggle_new_context': Record<string, unknown>
-    // unified shortcut overrides
-    'shortcut.preferences': PreferenceTypes.ShortcutPreferencesValue
     // redux/shortcuts/shortcuts.selection_assistant_select_text
     'shortcut.selection.get_text': Record<string, unknown>
     // redux/shortcuts/shortcuts.selection_assistant_toggle
@@ -408,6 +395,14 @@ export interface PreferenceSchemas {
     'topic.tab.show': boolean
     // redux/settings/showTopicTime
     'topic.tab.show_time': boolean
+    // redux/translate/settings
+    'translate.settings.auto_copy': boolean
+    // indexedDB/translate
+    'translate.settings.auto_detection_method': PreferenceTypes.AutoDetectionMethod
+    'translate.settings.enable_markdown': boolean
+    'translate.settings.scroll_sync': boolean
+    // new preference
+    'translate.settings.target_langs': PreferenceTypes.TargetLangs
     // redux/settings/customCss
     'ui.custom_css': string
     // redux/settings/navbarPosition
@@ -658,7 +653,6 @@ export const DefaultPreferences: PreferenceSchemas = {
       key: ['CommandOrControl', 'K'],
       system: false
     },
-    'shortcut.preferences': defaultShortcutPreferences,
     'shortcut.selection.get_text': { editable: true, enabled: false, key: [], system: true },
     'shortcut.selection.toggle_enabled': { editable: true, enabled: false, key: [], system: true },
     'shortcut.topic.new': { editable: true, enabled: true, key: ['CommandOrControl', 'N'], system: false },
@@ -668,6 +662,14 @@ export const DefaultPreferences: PreferenceSchemas = {
     'topic.tab.pin_to_top': false,
     'topic.tab.show': true,
     'topic.tab.show_time': false,
+    'translate.settings.auto_copy': false,
+    'translate.settings.auto_detection_method': 'franc',
+    'translate.settings.enable_markdown': false,
+    'translate.settings.scroll_sync': false,
+    'translate.settings.target_langs': {
+      alter: 'zh-cn',
+      target: 'en-us'
+    },
     'ui.custom_css': '',
     'ui.navbar.position': 'top',
     'ui.sidebar.icons.invisible': [],

packages/shared/data/preference/preferenceTypes.ts

@@ -1,4 +1,5 @@
-import type { ShortcutPreferenceMap } from '@shared/shortcuts/types'
+import type { TranslateLanguageCode } from '@types'
+import * as z from 'zod'
 
 import type { PreferenceSchemas } from './preferenceSchemas'
 
@@ -16,8 +17,6 @@ export type PreferenceShortcutType = {
   system: boolean
 }
 
-export type ShortcutPreferencesValue = ShortcutPreferenceMap
-
 export enum SelectionTriggerMode {
   Selected = 'selected',
   Ctrlkey = 'ctrlkey',
@@ -49,17 +48,7 @@ export enum ThemeMode {
 }
 
 /** 有限的UI语言 */
-export type LanguageVarious =
-  | 'zh-CN'
-  | 'zh-TW'
-  | 'el-GR'
-  | 'en-US'
-  | 'es-ES'
-  | 'fr-FR'
-  | 'ja-JP'
-  | 'pt-PT'
-  | 'ru-RU'
-  | 'de-DE'
+export type LanguageVarious = 'zh-CN' | 'zh-TW' | 'el-GR' | 'en-US' | 'es-ES' | 'fr-FR' | 'ja-JP' | 'pt-PT' | 'ru-RU'
 
 export type WindowStyle = 'transparent' | 'opaque'
 
@@ -99,3 +88,13 @@ export type ChatMessageNavigationMode = 'none' | 'buttons' | 'anchor'
 export type MultiModelMessageStyle = 'horizontal' | 'vertical' | 'fold' | 'grid'
 
 export type MultiModelGridPopoverTrigger = 'hover' | 'click'
+
+const AutoDetectionMethodSchema = z.enum(['franc', 'llm', 'auto'])
+export type AutoDetectionMethod = z.infer<typeof AutoDetectionMethodSchema>
+export const isAutoDetectionMethod = (method: string): method is AutoDetectionMethod => {
+  return AutoDetectionMethodSchema.safeParse(method).success
+}
+export type TargetLangs = {
+  target: TranslateLanguageCode
+  alter: TranslateLanguageCode
+}

packages/shared/shortcuts/definitions.ts

@@ -1,175 +0,0 @@
-import type { ShortcutDefinition } from './types'
-
-export const shortcutDefinitions: ShortcutDefinition[] = [
-  {
-    name: 'show_app',
-    defaultKey: [],
-    defaultEnabled: true,
-    description: 'Show or hide the main window',
-    scope: 'main',
-    editable: true,
-    system: true
-  },
-  {
-    name: 'show_mini_window',
-    defaultKey: ['CommandOrControl', 'E'],
-    defaultEnabled: false,
-    description: 'Show or hide the mini window',
-    scope: 'main',
-    editable: true,
-    system: true
-  },
-  {
-    name: 'selection_assistant_toggle',
-    defaultKey: [],
-    defaultEnabled: false,
-    description: 'Enable or disable the selection assistant',
-    scope: 'main',
-    editable: true,
-    system: true
-  },
-  {
-    name: 'selection_assistant_select_text',
-    defaultKey: [],
-    defaultEnabled: false,
-    description: 'Trigger selection assistant text capture',
-    scope: 'main',
-    editable: true,
-    system: true
-  },
-  {
-    name: 'zoom_in',
-    defaultKey: ['CommandOrControl', '='],
-    defaultEnabled: true,
-    description: 'Zoom in',
-    scope: 'main',
-    editable: false,
-    system: true
-  },
-  {
-    name: 'zoom_out',
-    defaultKey: ['CommandOrControl', '-'],
-    defaultEnabled: true,
-    description: 'Zoom out',
-    scope: 'main',
-    editable: false,
-    system: true
-  },
-  {
-    name: 'zoom_reset',
-    defaultKey: ['CommandOrControl', '0'],
-    defaultEnabled: true,
-    description: 'Reset zoom',
-    scope: 'main',
-    editable: false,
-    system: true
-  },
-  {
-    name: 'show_settings',
-    defaultKey: ['CommandOrControl', ','],
-    defaultEnabled: true,
-    description: 'Open settings',
-    scope: 'renderer',
-    editable: false,
-    system: true
-  },
-  {
-    name: 'new_topic',
-    defaultKey: ['CommandOrControl', 'N'],
-    defaultEnabled: true,
-    description: 'Start a new chat topic',
-    scope: 'renderer',
-    editable: true,
-    system: false
-  },
-  {
-    name: 'rename_topic',
-    defaultKey: ['CommandOrControl', 'T'],
-    defaultEnabled: false,
-    description: 'Rename current topic',
-    scope: 'renderer',
-    editable: true,
-    system: false
-  },
-  {
-    name: 'toggle_show_assistants',
-    defaultKey: ['CommandOrControl', '['],
-    defaultEnabled: true,
-    description: 'Toggle assistant sidebar',
-    scope: 'renderer',
-    editable: true,
-    system: false
-  },
-  {
-    name: 'toggle_show_topics',
-    defaultKey: ['CommandOrControl', ']'],
-    defaultEnabled: true,
-    description: 'Toggle topic sidebar',
-    scope: 'renderer',
-    editable: true,
-    system: false
-  },
-  {
-    name: 'copy_last_message',
-    defaultKey: ['CommandOrControl', 'Shift', 'C'],
-    defaultEnabled: false,
-    description: 'Copy the last assistant reply',
-    scope: 'renderer',
-    editable: true,
-    system: false
-  },
-  {
-    name: 'edit_last_user_message',
-    defaultKey: ['CommandOrControl', 'Shift', 'E'],
-    defaultEnabled: false,
-    description: 'Edit the last user message',
-    scope: 'renderer',
-    editable: true,
-    system: false
-  },
-  {
-    name: 'search_message_in_chat',
-    defaultKey: ['CommandOrControl', 'F'],
-    defaultEnabled: true,
-    description: 'Search messages in current chat',
-    scope: 'renderer',
-    editable: true,
-    system: false
-  },
-  {
-    name: 'search_message',
-    defaultKey: ['CommandOrControl', 'Shift', 'F'],
-    defaultEnabled: true,
-    description: 'Search messages globally',
-    scope: 'renderer',
-    editable: true,
-    system: false
-  },
-  {
-    name: 'clear_topic',
-    defaultKey: ['CommandOrControl', 'L'],
-    defaultEnabled: true,
-    description: 'Clear current topic',
-    scope: 'renderer',
-    editable: true,
-    system: false
-  },
-  {
-    name: 'toggle_new_context',
-    defaultKey: ['CommandOrControl', 'K'],
-    defaultEnabled: true,
-    description: 'Toggle new context mode',
-    scope: 'renderer',
-    editable: true,
-    system: false
-  },
-  {
-    name: 'exit_fullscreen',
-    defaultKey: ['Escape'],
-    defaultEnabled: true,
-    description: 'Exit fullscreen mode',
-    scope: 'renderer',
-    editable: false,
-    system: true
-  }
-]

packages/shared/shortcuts/types.ts

@@ -1,25 +0,0 @@
-export type ShortcutScope = 'main' | 'renderer'
-
-export interface ShortcutDefinition {
-  name: string
-  defaultKey: string[]
-  defaultEnabled: boolean
-  description: string
-  scope: ShortcutScope
-  editable: boolean
-  system: boolean
-}
-
-export interface ShortcutPreferenceEntry {
-  key?: string[]
-  enabled?: boolean
-}
-
-export type ShortcutPreferenceMap = Record<string, ShortcutPreferenceEntry>
-
-export type HydratedShortcut = ShortcutDefinition & {
-  key: string[]
-  enabled: boolean
-}
-
-export type HydratedShortcutMap = Record<string, HydratedShortcut>

packages/ui/MIGRATION_STATUS.md

@@ -1,151 +1,152 @@
-# UI Component Library Migration Status
+# UI 组件库迁移状态
 
-## Usage Example
+## 使用示例
 
 ```typescript
-// Import components from @cherrystudio/ui
-import { Spinner, DividerWithText, InfoTooltip } from '@cherrystudio/ui'
+// 从 @cherrystudio/ui 导入组件
+import { Spinner, DividerWithText, InfoTooltip, CustomTag } from '@cherrystudio/ui'
 
-// Use in components
+// 在组件中使用
 function MyComponent() {
   return (
     <div>
       <Spinner size={24} />
-      <DividerWithText text="Divider Text" />
-      <InfoTooltip content="Tooltip message" />
+      <DividerWithText text="分隔文本" />
+      <InfoTooltip content="提示信息" />
+      <CustomTag color="var(--color-primary)">标签</CustomTag>
     </div>
   )
 }
 ```
 
-## Directory Structure
+## 目录结构说明
 
 ```text
 @packages/ui/
 ├── src/
-│   ├── components/         # Main components directory
-│   │   ├── base/           # Basic components (buttons, inputs, labels, etc.)
-│   │   ├── display/        # Display components (cards, lists, tables, etc.)
-│   │   ├── layout/         # Layout components (containers, grids, spacing, etc.)
-│   │   ├── icons/          # Icon components
-│   │   ├── interactive/    # Interactive components (modals, tooltips, dropdowns, etc.)
-│   │   └── composite/      # Composite components (made from multiple base components)
-│   ├── hooks/              # Custom React Hooks
-│   └── types/              # TypeScript type definitions
+│   ├── components/         # 组件主目录
+│   │   ├── base/           # 基础组件（按钮、输入框、标签等）
+│   │   ├── display/        # 显示组件（卡片、列表、表格等）
+│   │   ├── layout/         # 布局组件（容器、网格、间距等）
+│   │   ├── icons/          # 图标组件
+│   │   ├── interactive/    # 交互组件（弹窗、提示、下拉等）
+│   │   └── composite/      # 复合组件（多个基础组件组合而成）
+│   ├── hooks/              # 自定义 React Hooks
+│   └── types/              # TypeScript 类型定义
 ```
 
-### Component Classification Guide
+### 组件分类指南
 
-When submitting PRs, please place components in the correct directory based on their function:
+提交 PR 时，请根据组件功能将其放入正确的目录：
 
-- **base**: Most basic UI elements like buttons, inputs, switches, labels, etc.
-- **display**: Components for displaying content like cards, lists, tables, tabs, etc.
-- **layout**: Components for page layout like containers, grid systems, dividers, etc.
-- **icons**: All icon-related components
-- **interactive**: Components requiring user interaction like modals, drawers, tooltips, dropdowns, etc.
-- **composite**: Composite components made from multiple base components
+- **base**: 最基础的 UI 元素，如按钮、输入框、开关、标签等
+- **display**: 用于展示内容的组件，如卡片、列表、表格、标签页等
+- **layout**: 用于页面布局的组件，如容器、网格系统、分隔符等
+- **icons**: 所有图标相关的组件
+- **interactive**: 需要用户交互的组件，如模态框、抽屉、提示框、下拉菜单等
+- **composite**: 复合组件，由多个基础组件组合而成
 
-## Migration Overview
+## 迁移概览
 
-- **Total Components**: 236
-- **Migrated**: 34
-- **Refactored**: 18
-- **Pending Migration**: 184
+- **总组件数**: 236
+- **已迁移**: 34
+- **已重构**: 18
+- **待迁移**: 184
 
-## Component Status Table
+## 组件状态表
 
-| Category          | Component Name            | Migration Status | Refactoring Status | Description                                                                                                                                                                    |
-| ----------------- | ------------------------- | ---------------- | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| **base**          |                           |                  |                    | Base components                                                                                                                                                                |
-|                   | CopyButton                | ✅                | ✅                  | Copy button                                                                                                                                                                    |
-|                   | CustomTag                 | ✅                | ✅                  | Custom tag                                                                                                                                                                     |
-|                   | DividerWithText           | ✅                | ✅                  | Divider with text                                                                                                                                                              |
-|                   | EmojiIcon                 | ✅                | ✅                  | Emoji icon                                                                                                                                                                     |
-|                   | ErrorBoundary             | ✅                | ✅                  | Error boundary (decoupled via props)                                                                                                                                           |
-|                   | StatusTag                 | ✅                | ✅                  | Unified status tag (merged ErrorTag, SuccessTag, WarnTag, InfoTag)                                                                                                             |
-|                   | IndicatorLight            | ✅                | ✅                  | Indicator light                                                                                                                                                                |
-|                   | Spinner                   | ✅                | ✅                  | Loading spinner                                                                                                                                                                |
-|                   | TextBadge                 | ✅                | ✅                  | Text badge                                                                                                                                                                     |
-|                   | CustomCollapse            | ✅                | ✅                  | Custom collapse panel                                                                                                                                                          |
-| **display**       |                           |                  |                    | Display components                                                                                                                                                             |
-|                   | Ellipsis                  | ✅                | ✅                  | Text ellipsis                                                                                                                                                                  |
-|                   | ExpandableText            | ✅                | ✅                  | Expandable text                                                                                                                                                                |
-|                   | ThinkingEffect            | ✅                | ✅                  | Thinking effect animation                                                                                                                                                      |
-|                   | EmojiAvatar               | ✅                | ✅                  | Emoji avatar                                                                                                                                                                   |
-|                   | ListItem                  | ✅                | ✅                  | List item                                                                                                                                                                      |
-|                   | MaxContextCount           | ✅                | ✅                  | Max context count display                                                                                                                                                      |
-|                   | ProviderAvatar            | ✅                | ✅                  | Provider avatar                                                                                                                                                                |
-|                   | CodeViewer                | ❌                | ❌                  | Code viewer (external deps)                                                                                                                                                    |
-|                   | OGCard                    | ❌                | ❌                  | OG card                                                                                                                                                                        |
-|                   | MarkdownShadowDOMRenderer | ❌                | ❌                  | Markdown renderer                                                                                                                                                              |
-|                   | Preview/*                 | ❌                | ❌                  | Preview components                                                                                                                                                             |
-| **layout**        |                           |                  |                    | Layout components                                                                                                                                                              |
-|                   | HorizontalScrollContainer | ✅                | ❌                  | Horizontal scroll container                                                                                                                                                    |
-|                   | Scrollbar                 | ✅                | ❌                  | Scrollbar                                                                                                                                                                      |
-|                   | Layout/*                  | ✅                | ✅                  | Layout components                                                                                                                                                              |
-|                   | Tab/*                     | ❌                | ❌                  | Tab (Redux dependency)                                                                                                                                                         |
-|                   | TopView                   | ❌                | ❌                  | Top view (window.api dependency)                                                                                                                                               |
-| **icons**         |                           |                  |                    | Icon components                                                                                                                                                                |
-|                   | Icon                      | ✅                | ✅                  | Icon factory function and predefined icons (merged CopyIcon, DeleteIcon, EditIcon, RefreshIcon, ResetIcon, ToolIcon, VisionIcon, WebSearchIcon, WrapIcon, UnWrapIcon, OcrIcon) |
-|                   | FileIcons                 | ✅                | ❌                  | File icons (FileSvgIcon, FilePngIcon)                                                                                                                                          |
-|                   | ReasoningIcon             | ✅                | ❌                  | Reasoning icon                                                                                                                                                                 |
-|                   | SvgSpinners180Ring        | ✅                | ❌                  | Spinner loading icon                                                                                                                                                           |
-|                   | ToolsCallingIcon          | ✅                | ❌                  | Tools calling icon                                                                                                                                                             |
-| **interactive**   |                           |                  |                    | Interactive components                                                                                                                                                         |
-|                   | InfoTooltip               | ✅                | ❌                  | Info tooltip                                                                                                                                                                   |
-|                   | HelpTooltip               | ✅                | ❌                  | Help tooltip                                                                                                                                                                   |
-|                   | WarnTooltip               | ✅                | ❌                  | Warning tooltip                                                                                                                                                                |
-|                   | EditableNumber            | ✅                | ❌                  | Editable number                                                                                                                                                                |
-|                   | InfoPopover               | ✅                | ❌                  | Info popover                                                                                                                                                                   |
-|                   | CollapsibleSearchBar      | ✅                | ❌                  | Collapsible search bar                                                                                                                                                         |
-|                   | ImageToolButton           | ✅                | ❌                  | Image tool button                                                                                                                                                              |
-|                   | DraggableList             | ✅                | ❌                  | Draggable list                                                                                                                                                                 |
-|                   | CodeEditor                | ✅                | ❌                  | Code editor                                                                                                                                                                    |
-|                   | EmojiPicker               | ❌                | ❌                  | Emoji picker (useTheme dependency)                                                                                                                                             |
-|                   | Selector                  | ✅                | ❌                  | Selector (i18n dependency)                                                                                                                                                     |
-|                   | ModelSelector             | ❌                | ❌                  | Model selector (Redux dependency)                                                                                                                                              |
-|                   | LanguageSelect            | ❌                | ❌                  | Language select                                                                                                                                                                |
-|                   | TranslateButton           | ❌                | ❌                  | Translate button (window.api dependency)                                                                                                                                       |
-| **composite**     |                           |                  |                    | Composite components                                                                                                                                                           |
-|                   | -                         | -                | -                  | No composite components yet                                                                                                                                                    |
-| **Uncategorized** |                           |                  |                    | Components needing categorization                                                                                                                                              |
-|                   | Popups/* (16+ files)      | ❌                | ❌                  | Popup components (business coupled)                                                                                                                                            |
-|                   | RichEditor/* (30+ files)  | ❌                | ❌                  | Rich text editor                                                                                                                                                               |
-|                   | MarkdownEditor/*          | ❌                | ❌                  | Markdown editor                                                                                                                                                                |
-|                   | MinApp/*                  | ❌                | ❌                  | Mini app (Redux dependency)                                                                                                                                                    |
-|                   | Avatar/*                  | ❌                | ❌                  | Avatar components                                                                                                                                                              |
-|                   | ActionTools/*             | ❌                | ❌                  | Action tools                                                                                                                                                                   |
-|                   | CodeBlockView/*           | ❌                | ❌                  | Code block view (window.api dependency)                                                                                                                                        |
-|                   | ContextMenu               | ❌                | ❌                  | Context menu (Electron API)                                                                                                                                                    |
-|                   | WindowControls            | ❌                | ❌                  | Window controls (Electron API)                                                                                                                                                 |
-|                   | ErrorBoundary             | ❌                | ❌                  | Error boundary (window.api dependency)                                                                                                                                         |
+| Category        | Component Name            | Migration Status | Refactoring Status | Description                                                                                                                                                   |
+| --------------- | ------------------------- | ---------------- | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **base**        |                           |                  |                    | 基础组件                                                                                                                                                      |
+|                 | CopyButton                | ✅                | ✅                  | 复制按钮                                                                                                                                                      |
+|                 | CustomTag                 | ✅                | ✅                  | 自定义标签                                                                                                                                                    |
+|                 | DividerWithText           | ✅                | ✅                  | 带文本的分隔线                                                                                                                                                |
+|                 | EmojiIcon                 | ✅                | ✅                  | 表情图标                                                                                                                                                      |
+|                 | ErrorBoundary             | ✅                | ✅                  | 错误边界 (通过 props 解耦)                                                                                                                                    |
+|                 | StatusTag                 | ✅                | ✅                  | 统一状态标签（合并了 ErrorTag、SuccessTag、WarnTag、InfoTag）                                                                                                 |
+|                 | IndicatorLight            | ✅                | ✅                  | 指示灯                                                                                                                                                        |
+|                 | Spinner                   | ✅                | ✅                  | 加载动画                                                                                                                                                      |
+|                 | TextBadge                 | ✅                | ✅                  | 文本徽标                                                                                                                                                      |
+|                 | CustomCollapse            | ✅                | ✅                  | 自定义折叠面板                                                                                                                                                |
+| **display**     |                           |                  |                    | 显示组件                                                                                                                                                      |
+|                 | Ellipsis                  | ✅                | ✅                  | 文本省略                                                                                                                                                      |
+|                 | ExpandableText            | ✅                | ✅                  | 可展开文本                                                                                                                                                    |
+|                 | ThinkingEffect            | ✅                | ✅                  | 思考效果动画                                                                                                                                                  |
+|                 | EmojiAvatar               | ✅                | ✅                  | 表情头像                                                                                                                                                      |
+|                 | ListItem                  | ✅                | ✅                  | 列表项                                                                                                                                                        |
+|                 | MaxContextCount           | ✅                | ✅                  | 最大上下文数显示                                                                                                                                              |
+|                 | ProviderAvatar            | ✅                | ✅                  | 提供者头像                                                                                                                                                    |
+|                 | CodeViewer                | ❌                | ❌                  | 代码查看器 (外部依赖)                                                                                                                                         |
+|                 | OGCard                    | ❌                | ❌                  | OG 卡片                                                                                                                                                       |
+|                 | MarkdownShadowDOMRenderer | ❌                | ❌                  | Markdown 渲染器                                                                                                                                               |
+|                 | Preview/*                 | ❌                | ❌                  | 预览组件                                                                                                                                                      |
+| **layout**      |                           |                  |                    | 布局组件                                                                                                                                                      |
+|                 | HorizontalScrollContainer | ✅                | ❌                  | 水平滚动容器                                                                                                                                                  |
+|                 | Scrollbar                 | ✅                | ❌                  | 滚动条                                                                                                                                                        |
+|                 | Layout/*                  | ✅                | ✅                  | 布局组件                                                                                                                                                      |
+|                 | Tab/*                     | ❌                | ❌                  | 标签页 (Redux 依赖)                                                                                                                                           |
+|                 | TopView                   | ❌                | ❌                  | 顶部视图 (window.api 依赖)                                                                                                                                    |
+| **icons**       |                           |                  |                    | 图标组件                                                                                                                                                      |
+|                 | Icon                      | ✅                | ✅                  | 图标工厂函数和预定义图标（合并了 CopyIcon、DeleteIcon、EditIcon、RefreshIcon、ResetIcon、ToolIcon、VisionIcon、WebSearchIcon、WrapIcon、UnWrapIcon、OcrIcon） |
+|                 | FileIcons                 | ✅                | ❌                  | 文件图标 (FileSvgIcon、FilePngIcon)                                                                                                                           |
+|                 | ReasoningIcon             | ✅                | ❌                  | 推理图标                                                                                                                                                      |
+|                 | SvgSpinners180Ring        | ✅                | ❌                  | 旋转加载图标                                                                                                                                                  |
+|                 | ToolsCallingIcon          | ✅                | ❌                  | 工具调用图标                                                                                                                                                  |
+| **interactive** |                           |                  |                    | 交互组件                                                                                                                                                      |
+|                 | InfoTooltip               | ✅                | ❌                  | 信息提示                                                                                                                                                      |
+|                 | HelpTooltip               | ✅                | ❌                  | 帮助提示                                                                                                                                                      |
+|                 | WarnTooltip               | ✅                | ❌                  | 警告提示                                                                                                                                                      |
+|                 | EditableNumber            | ✅                | ❌                  | 可编辑数字                                                                                                                                                    |
+|                 | InfoPopover               | ✅                | ❌                  | 信息弹出框                                                                                                                                                    |
+|                 | CollapsibleSearchBar      | ✅                | ❌                  | 可折叠搜索栏                                                                                                                                                  |
+|                 | ImageToolButton           | ✅                | ❌                  | 图片工具按钮                                                                                                                                                  |
+|                 | DraggableList             | ✅                | ❌                  | 可拖拽列表                                                                                                                                                    |
+|                 | CodeEditor                | ✅                | ❌                  | 代码编辑器                                                                                                                                                    |
+|                 | EmojiPicker               | ❌                | ❌                  | 表情选择器 (useTheme 依赖)                                                                                                                                    |
+|                 | Selector                  | ✅                | ❌                  | 选择器 (i18n 依赖)                                                                                                                                            |
+|                 | ModelSelector             | ❌                | ❌                  | 模型选择器 (Redux 依赖)                                                                                                                                       |
+|                 | LanguageSelect            | ❌                | ❌                  | 语言选择                                                                                                                                                      |
+|                 | TranslateButton           | ❌                | ❌                  | 翻译按钮 (window.api 依赖)                                                                                                                                    |
+| **composite**   |                           |                  |                    | 复合组件                                                                                                                                                      |
+|                 | -                         | -                | -                  | 暂无复合组件                                                                                                                                                  |
+| **未分类**      |                           |                  |                    | 需要分类的组件                                                                                                                                                |
+|                 | Popups/* (16+ 文件)       | ❌                | ❌                  | 弹窗组件 (业务耦合)                                                                                                                                           |
+|                 | RichEditor/* (30+ 文件)   | ❌                | ❌                  | 富文本编辑器                                                                                                                                                  |
+|                 | MarkdownEditor/*          | ❌                | ❌                  | Markdown 编辑器                                                                                                                                               |
+|                 | MinApp/*                  | ❌                | ❌                  | 迷你应用 (Redux 依赖)                                                                                                                                         |
+|                 | Avatar/*                  | ❌                | ❌                  | 头像组件                                                                                                                                                      |
+|                 | ActionTools/*             | ❌                | ❌                  | 操作工具                                                                                                                                                      |
+|                 | CodeBlockView/*           | ❌                | ❌                  | 代码块视图 (window.api 依赖)                                                                                                                                  |
+|                 | ContextMenu               | ❌                | ❌                  | 右键菜单 (Electron API)                                                                                                                                       |
+|                 | WindowControls            | ❌                | ❌                  | 窗口控制 (Electron API)                                                                                                                                       |
+|                 | ErrorBoundary             | ❌                | ❌                  | 错误边界 (window.api 依赖)                                                                                                                                    |
 
-## Migration Steps
+## 迁移步骤
 
-### Phase 1: Copy Migration (Current Phase)
+### 第一阶段：复制迁移（当前阶段）
 
-- Copy components as-is to @packages/ui
-- Retain original dependencies (antd, styled-components, etc.)
-- Add original path comment at file top
+- 将组件原样复制到 @packages/ui
+- 保留原有依赖（antd、styled-components 等）
+- 在文件顶部添加原路径注释
 
-### Phase 2: Refactor and Optimize
+### 第二阶段：重构优化
 
-- Remove antd dependencies, replace with HeroUI
-- Remove styled-components, replace with Tailwind CSS
-- Optimize component APIs and type definitions
+- 移除 antd 依赖，替换为 HeroUI
+- 移除 styled-components，替换为 Tailwind CSS
+- 优化组件 API 和类型定义
 
-## Notes
+## 注意事项
 
-1. **Do NOT migrate** components with these dependencies (can be migrated after decoupling):
-   - window.api calls
-   - Redux (useSelector, useDispatch, etc.)
-   - Other external data sources
+1. **不迁移**包含以下依赖的组件（解耦后可迁移）：
+   - window.api 调用
+   - Redux（useSelector、useDispatch 等）
+   - 其他外部数据源
 
-2. **Can migrate** but need decoupling later:
-   - Components using i18n (change i18n to props)
-   - Components using antd (replace with HeroUI later)
+2. **可迁移**但需要后续解耦的组件：
+   - 使用 i18n 的组件（将 i18n 改为 props 传入）
+   - 使用 antd 的组件（后续替换为 HeroUI）
 
-3. **Submission Guidelines**:
-   - Each PR should focus on one category of components
-   - Ensure all migrated components are exported
-   - Update migration status in this document
+3. **提交规范**：
+   - 每次 PR 专注于一个类别的组件
+   - 确保所有迁移的组件都有导出
+   - 更新此文档的迁移状态

packages/ui/MIGRATION_STATUS_EN.md

@@ -0,0 +1,151 @@
+# UI Component Library Migration Status
+
+## Usage Example
+
+```typescript
+// Import components from @cherrystudio/ui
+import { Spinner, DividerWithText, InfoTooltip } from '@cherrystudio/ui'
+
+// Use in components
+function MyComponent() {
+  return (
+    <div>
+      <Spinner size={24} />
+      <DividerWithText text="Divider Text" />
+      <InfoTooltip content="Tooltip message" />
+    </div>
+  )
+}
+```
+
+## Directory Structure
+
+```text
+@packages/ui/
+├── src/
+│   ├── components/         # Main components directory
+│   │   ├── base/           # Basic components (buttons, inputs, labels, etc.)
+│   │   ├── display/        # Display components (cards, lists, tables, etc.)
+│   │   ├── layout/         # Layout components (containers, grids, spacing, etc.)
+│   │   ├── icons/          # Icon components
+│   │   ├── interactive/    # Interactive components (modals, tooltips, dropdowns, etc.)
+│   │   └── composite/      # Composite components (made from multiple base components)
+│   ├── hooks/              # Custom React Hooks
+│   └── types/              # TypeScript type definitions
+```
+
+### Component Classification Guide
+
+When submitting PRs, please place components in the correct directory based on their function:
+
+- **base**: Most basic UI elements like buttons, inputs, switches, labels, etc.
+- **display**: Components for displaying content like cards, lists, tables, tabs, etc.
+- **layout**: Components for page layout like containers, grid systems, dividers, etc.
+- **icons**: All icon-related components
+- **interactive**: Components requiring user interaction like modals, drawers, tooltips, dropdowns, etc.
+- **composite**: Composite components made from multiple base components
+
+## Migration Overview
+
+- **Total Components**: 236
+- **Migrated**: 34
+- **Refactored**: 18
+- **Pending Migration**: 184
+
+## Component Status Table
+
+| Category          | Component Name            | Migration Status | Refactoring Status | Description                                                                                                                                                                    |
+| ----------------- | ------------------------- | ---------------- | ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| **base**          |                           |                  |                    | Base components                                                                                                                                                                |
+|                   | CopyButton                | ✅                | ✅                  | Copy button                                                                                                                                                                    |
+|                   | CustomTag                 | ✅                | ✅                  | Custom tag                                                                                                                                                                     |
+|                   | DividerWithText           | ✅                | ✅                  | Divider with text                                                                                                                                                              |
+|                   | EmojiIcon                 | ✅                | ✅                  | Emoji icon                                                                                                                                                                     |
+|                   | ErrorBoundary             | ✅                | ✅                  | Error boundary (decoupled via props)                                                                                                                                           |
+|                   | StatusTag                 | ✅                | ✅                  | Unified status tag (merged ErrorTag, SuccessTag, WarnTag, InfoTag)                                                                                                             |
+|                   | IndicatorLight            | ✅                | ✅                  | Indicator light                                                                                                                                                                |
+|                   | Spinner                   | ✅                | ✅                  | Loading spinner                                                                                                                                                                |
+|                   | TextBadge                 | ✅                | ✅                  | Text badge                                                                                                                                                                     |
+|                   | CustomCollapse            | ✅                | ✅                  | Custom collapse panel                                                                                                                                                          |
+| **display**       |                           |                  |                    | Display components                                                                                                                                                             |
+|                   | Ellipsis                  | ✅                | ✅                  | Text ellipsis                                                                                                                                                                  |
+|                   | ExpandableText            | ✅                | ✅                  | Expandable text                                                                                                                                                                |
+|                   | ThinkingEffect            | ✅                | ✅                  | Thinking effect animation                                                                                                                                                      |
+|                   | EmojiAvatar               | ✅                | ✅                  | Emoji avatar                                                                                                                                                                   |
+|                   | ListItem                  | ✅                | ✅                  | List item                                                                                                                                                                      |
+|                   | MaxContextCount           | ✅                | ✅                  | Max context count display                                                                                                                                                      |
+|                   | ProviderAvatar            | ✅                | ✅                  | Provider avatar                                                                                                                                                                |
+|                   | CodeViewer                | ❌                | ❌                  | Code viewer (external deps)                                                                                                                                                    |
+|                   | OGCard                    | ❌                | ❌                  | OG card                                                                                                                                                                        |
+|                   | MarkdownShadowDOMRenderer | ❌                | ❌                  | Markdown renderer                                                                                                                                                              |
+|                   | Preview/*                 | ❌                | ❌                  | Preview components                                                                                                                                                             |
+| **layout**        |                           |                  |                    | Layout components                                                                                                                                                              |
+|                   | HorizontalScrollContainer | ✅                | ❌                  | Horizontal scroll container                                                                                                                                                    |
+|                   | Scrollbar                 | ✅                | ❌                  | Scrollbar                                                                                                                                                                      |
+|                   | Layout/*                  | ✅                | ✅                  | Layout components                                                                                                                                                              |
+|                   | Tab/*                     | ❌                | ❌                  | Tab (Redux dependency)                                                                                                                                                         |
+|                   | TopView                   | ❌                | ❌                  | Top view (window.api dependency)                                                                                                                                               |
+| **icons**         |                           |                  |                    | Icon components                                                                                                                                                                |
+|                   | Icon                      | ✅                | ✅                  | Icon factory function and predefined icons (merged CopyIcon, DeleteIcon, EditIcon, RefreshIcon, ResetIcon, ToolIcon, VisionIcon, WebSearchIcon, WrapIcon, UnWrapIcon, OcrIcon) |
+|                   | FileIcons                 | ✅                | ❌                  | File icons (FileSvgIcon, FilePngIcon)                                                                                                                                          |
+|                   | ReasoningIcon             | ✅                | ❌                  | Reasoning icon                                                                                                                                                                 |
+|                   | SvgSpinners180Ring        | ✅                | ❌                  | Spinner loading icon                                                                                                                                                           |
+|                   | ToolsCallingIcon          | ✅                | ❌                  | Tools calling icon                                                                                                                                                             |
+| **interactive**   |                           |                  |                    | Interactive components                                                                                                                                                         |
+|                   | InfoTooltip               | ✅                | ❌                  | Info tooltip                                                                                                                                                                   |
+|                   | HelpTooltip               | ✅                | ❌                  | Help tooltip                                                                                                                                                                   |
+|                   | WarnTooltip               | ✅                | ❌                  | Warning tooltip                                                                                                                                                                |
+|                   | EditableNumber            | ✅                | ❌                  | Editable number                                                                                                                                                                |
+|                   | InfoPopover               | ✅                | ❌                  | Info popover                                                                                                                                                                   |
+|                   | CollapsibleSearchBar      | ✅                | ❌                  | Collapsible search bar                                                                                                                                                         |
+|                   | ImageToolButton           | ✅                | ❌                  | Image tool button                                                                                                                                                              |
+|                   | DraggableList             | ✅                | ❌                  | Draggable list                                                                                                                                                                 |
+|                   | CodeEditor                | ✅                | ❌                  | Code editor                                                                                                                                                                    |
+|                   | EmojiPicker               | ❌                | ❌                  | Emoji picker (useTheme dependency)                                                                                                                                             |
+|                   | Selector                  | ✅                | ❌                  | Selector (i18n dependency)                                                                                                                                                     |
+|                   | ModelSelector             | ❌                | ❌                  | Model selector (Redux dependency)                                                                                                                                              |
+|                   | LanguageSelect            | ❌                | ❌                  | Language select                                                                                                                                                                |
+|                   | TranslateButton           | ❌                | ❌                  | Translate button (window.api dependency)                                                                                                                                       |
+| **composite**     |                           |                  |                    | Composite components                                                                                                                                                           |
+|                   | -                         | -                | -                  | No composite components yet                                                                                                                                                    |
+| **Uncategorized** |                           |                  |                    | Components needing categorization                                                                                                                                              |
+|                   | Popups/* (16+ files)      | ❌                | ❌                  | Popup components (business coupled)                                                                                                                                            |
+|                   | RichEditor/* (30+ files)  | ❌                | ❌                  | Rich text editor                                                                                                                                                               |
+|                   | MarkdownEditor/*          | ❌                | ❌                  | Markdown editor                                                                                                                                                                |
+|                   | MinApp/*                  | ❌                | ❌                  | Mini app (Redux dependency)                                                                                                                                                    |
+|                   | Avatar/*                  | ❌                | ❌                  | Avatar components                                                                                                                                                              |
+|                   | ActionTools/*             | ❌                | ❌                  | Action tools                                                                                                                                                                   |
+|                   | CodeBlockView/*           | ❌                | ❌                  | Code block view (window.api dependency)                                                                                                                                        |
+|                   | ContextMenu               | ❌                | ❌                  | Context menu (Electron API)                                                                                                                                                    |
+|                   | WindowControls            | ❌                | ❌                  | Window controls (Electron API)                                                                                                                                                 |
+|                   | ErrorBoundary             | ❌                | ❌                  | Error boundary (window.api dependency)                                                                                                                                         |
+
+## Migration Steps
+
+### Phase 1: Copy Migration (Current Phase)
+
+- Copy components as-is to @packages/ui
+- Retain original dependencies (antd, styled-components, etc.)
+- Add original path comment at file top
+
+### Phase 2: Refactor and Optimize
+
+- Remove antd dependencies, replace with HeroUI
+- Remove styled-components, replace with Tailwind CSS
+- Optimize component APIs and type definitions
+
+## Notes
+
+1. **Do NOT migrate** components with these dependencies (can be migrated after decoupling):
+   - window.api calls
+   - Redux (useSelector, useDispatch, etc.)
+   - Other external data sources
+
+2. **Can migrate** but need decoupling later:
+   - Components using i18n (change i18n to props)
+   - Components using antd (replace with HeroUI later)
+
+3. **Submission Guidelines**:
+   - Each PR should focus on one category of components
+   - Ensure all migrated components are exported
+   - Update migration status in this document

packages/ui/components.json

@@ -1,11 +1,11 @@
 {
   "$schema": "https://ui.shadcn.com/schema.json",
   "aliases": {
-    "components": "@cherrystudio/ui/components",
-    "hooks": "@cherrystudio/ui/hooks",
-    "lib": "@cherrystudio/ui/lib",
-    "ui": "@cherrystudio/ui/components/primitives",
-    "utils": "@cherrystudio/ui/utils"
+    "components": "@/components",
+    "hooks": "@/hooks",
+    "lib": "@/lib",
+    "ui": "@/components/ui",
+    "utils": "@/utils"
   },
   "iconLibrary": "lucide",
   "rsc": false,

packages/ui/package.json

@@ -49,7 +49,6 @@
     "@dnd-kit/utilities": "^3.2.2",
     "@radix-ui/react-dialog": "^1.1.15",
     "@radix-ui/react-popover": "^1.1.15",
-    "@radix-ui/react-radio-group": "^1.3.8",
     "@radix-ui/react-slot": "^1.2.3",
     "@radix-ui/react-use-controllable-state": "^1.2.2",
     "class-variance-authority": "^0.7.1",

packages/ui/src/components/base/Avatar/EmojiAvatar.tsx

@@ -1,7 +1,6 @@
+import { cn } from '@heroui/react'
 import React, { memo } from 'react'
 
-import { cn } from '../../../utils'
-
 interface EmojiAvatarProps {
   children: string
   size?: number

packages/ui/src/components/base/Avatar/index.tsx

@@ -1,7 +1,6 @@
 import type { AvatarProps as HeroUIAvatarProps } from '@heroui/react'
-import { Avatar as HeroUIAvatar, AvatarGroup as HeroUIAvatarGroup } from '@heroui/react'
+import { Avatar as HeroUIAvatar, AvatarGroup as HeroUIAvatarGroup, cn } from '@heroui/react'
 
-import { cn } from '../../../utils'
 import EmojiAvatar from './EmojiAvatar'
 
 export interface AvatarProps extends Omit<HeroUIAvatarProps, 'size'> {

packages/ui/src/components/base/Button/index.tsx

@@ -0,0 +1,12 @@
+import type { ButtonProps as HeroUIButtonProps } from '@heroui/react'
+import { Button as HeroUIButton } from '@heroui/react'
+
+export interface ButtonProps extends HeroUIButtonProps {}
+
+const Button = ({ ...props }: ButtonProps) => {
+  return <HeroUIButton {...props} />
+}
+
+Button.displayName = 'Button'
+
+export default Button

packages/ui/src/components/base/CopyButton/index.tsx

@@ -1,9 +1,8 @@
 // Original path: src/renderer/src/components/CopyButton.tsx
+import { Tooltip } from '@heroui/react'
 import { Copy } from 'lucide-react'
 import type { FC } from 'react'
 
-import { Tooltip } from './tooltip'
-
 interface CopyButtonProps {
   tooltip?: string
   label?: string

packages/ui/src/components/base/CustomCollapse/index.tsx

@@ -0,0 +1,46 @@
+import { Accordion, AccordionItem, type AccordionItemProps, type AccordionProps } from '@heroui/react'
+import type { FC } from 'react'
+import { memo } from 'react'
+
+// 重新导出 HeroUI 的组件，方便直接使用
+export { Accordion, AccordionItem } from '@heroui/react'
+
+interface CustomCollapseProps {
+  children: React.ReactNode
+  accordionProps?: Omit<AccordionProps, 'children'>
+  accordionItemProps?: Omit<AccordionItemProps, 'children'>
+}
+
+const CustomCollapse: FC<CustomCollapseProps> = ({ children, accordionProps = {}, accordionItemProps = {} }) => {
+  // 解构 Accordion 的 props
+  const {
+    defaultExpandedKeys = ['1'],
+    variant = 'bordered',
+    className = '',
+    isDisabled = false,
+    ...restAccordionProps
+  } = accordionProps
+
+  // 解构 AccordionItem 的 props
+  const { title = 'Collapse Panel', ...restAccordionItemProps } = accordionItemProps
+
+  return (
+    <Accordion
+      defaultExpandedKeys={defaultExpandedKeys}
+      variant={variant}
+      className={className}
+      isDisabled={isDisabled}
+      selectionMode="multiple"
+      {...restAccordionProps}>
+      <AccordionItem
+        key="1"
+        aria-label={typeof title === 'string' ? title : 'collapse-item'}
+        title={title}
+        {...restAccordionItemProps}>
+        {children}
+      </AccordionItem>
+    </Accordion>
+  )
+}
+
+export default memo(CustomCollapse)

packages/ui/src/components/base/CustomTag/index.tsx

@@ -1,10 +1,9 @@
 // Original path: src/renderer/src/components/Tags/CustomTag.tsx
+import { Tooltip } from '@heroui/react'
 import { X } from 'lucide-react'
 import type { CSSProperties, FC, MouseEventHandler } from 'react'
 import { memo, useMemo } from 'react'
 
-import { Tooltip } from './tooltip'
-
 export interface CustomTagProps {
   icon?: React.ReactNode
   children?: React.ReactNode | string

packages/ui/src/components/base/ErrorBoundary/index.tsx

@@ -1,10 +1,10 @@
 // Original path: src/renderer/src/components/ErrorBoundary.tsx
+import { Button } from '@heroui/react'
 import { AlertTriangle } from 'lucide-react'
 import type { ComponentType, ReactNode } from 'react'
 import type { FallbackProps } from 'react-error-boundary'
 import { ErrorBoundary } from 'react-error-boundary'
 
-import { Button } from '../button'
 import { formatErrorMessage } from './utils'
 
 interface CustomFallbackProps extends FallbackProps {
@@ -35,12 +35,12 @@ const DefaultFallback: ComponentType<CustomFallbackProps> = (props: CustomFallba
             <p className="text-red-700 dark:text-red-300 text-sm mb-3">{formatErrorMessage(error)}</p>
             <div className="flex gap-2">
               {onDebugClick && (
-                <Button size="sm" variant="destructive" onClick={onDebugClick}>
+                <Button size="sm" variant="flat" color="danger" onPress={onDebugClick}>
                   {debugButtonText}
                 </Button>
               )}
               {onReloadClick && (
-                <Button size="sm" variant="destructive" onClick={onReloadClick}>
+                <Button size="sm" variant="flat" color="danger" onPress={onReloadClick}>
                   {reloadButtonText}
                 </Button>
               )}

packages/ui/src/components/base/Selector/README.md

@@ -0,0 +1,333 @@
+# Selector 组件
+
+基于 HeroUI Select 封装的下拉选择组件，简化了 Set 和 Selection 的转换逻辑。
+
+## 核心特性
+
+- ✅ **类型安全**: 单选和多选自动推断回调类型
+- ✅ **智能转换**: 自动处理 `Set<Key>` 和原始值的转换
+- ✅ **HeroUI 风格**: 保持与 HeroUI 生态一致的 API
+- ✅ **支持数字和字符串**: 泛型支持，自动识别值类型
+
+## 基础用法
+
+### 单选模式（默认）
+
+```tsx
+import { Selector } from '@cherrystudio/ui'
+import { useState } from 'react'
+
+function Example() {
+  const [language, setLanguage] = useState('zh-CN')
+
+  const languageOptions = [
+    { label: '中文', value: 'zh-CN' },
+    { label: 'English', value: 'en-US' },
+    { label: '日本語', value: 'ja-JP' }
+  ]
+
+  return (
+    <Selector
+      selectedKeys={language}
+      onSelectionChange={(value) => {
+        // value 类型自动推断为 string
+        setLanguage(value)
+      }}
+      items={languageOptions}
+      placeholder="选择语言"
+    />
+  )
+}
+```
+
+### 多选模式
+
+```tsx
+import { Selector } from '@cherrystudio/ui'
+import { useState } from 'react'
+
+function Example() {
+  const [languages, setLanguages] = useState(['zh-CN', 'en-US'])
+
+  const languageOptions = [
+    { label: '中文', value: 'zh-CN' },
+    { label: 'English', value: 'en-US' },
+    { label: '日本語', value: 'ja-JP' },
+    { label: 'Français', value: 'fr-FR' }
+  ]
+
+  return (
+    <Selector
+      selectionMode="multiple"
+      selectedKeys={languages}
+      onSelectionChange={(values) => {
+        // values 类型自动推断为 string[]
+        setLanguages(values)
+      }}
+      items={languageOptions}
+      placeholder="选择语言"
+    />
+  )
+}
+```
+
+### 数字类型值
+
+```tsx
+import { Selector } from '@cherrystudio/ui'
+
+function Example() {
+  const [priority, setPriority] = useState<number>(1)
+
+  const priorityOptions = [
+    { label: '低', value: 1 },
+    { label: '中', value: 2 },
+    { label: '高', value: 3 }
+  ]
+
+  return (
+    <Selector<number>
+      selectedKeys={priority}
+      onSelectionChange={(value) => {
+        // value 类型为 number
+        setPriority(value)
+      }}
+      items={priorityOptions}
+    />
+  )
+}
+```
+
+### 禁用选项
+
+```tsx
+const options = [
+  { label: '选项 1', value: '1' },
+  { label: '选项 2 (禁用)', value: '2', disabled: true },
+  { label: '选项 3', value: '3' }
+]
+
+<Selector
+  selectedKeys="1"
+  onSelectionChange={handleChange}
+  items={options}
+/>
+```
+
+### 自定义 Label
+
+```tsx
+import { Flex } from '@cherrystudio/ui'
+
+const options = [
+  {
+    label: (
+      <Flex className="items-center gap-2">
+        <span>🇨🇳</span>
+        <span>中文</span>
+      </Flex>
+    ),
+    value: 'zh-CN'
+  },
+  {
+    label: (
+      <Flex className="items-center gap-2">
+        <span>🇺🇸</span>
+        <span>English</span>
+      </Flex>
+    ),
+    value: 'en-US'
+  }
+]
+
+<Selector
+  selectedKeys="zh-CN"
+  onSelectionChange={handleChange}
+  items={options}
+/>
+```
+
+## API
+
+### SelectorProps
+
+| 属性 | 类型 | 默认值 | 说明 |
+|------|------|--------|------|
+| `items` | `SelectorItem<V>[]` | - | 必填，选项列表 |
+| `selectedKeys` | `V` \| `V[]` | - | 受控的选中值（单选为单个值，多选为数组） |
+| `onSelectionChange` | `(key: V) => void` \| `(keys: V[]) => void` | - | 选择变化回调（类型根据 selectionMode 自动推断） |
+| `selectionMode` | `'single'` \| `'multiple'` | `'single'` | 选择模式 |
+| `placeholder` | `string` | - | 占位文本 |
+| `disabled` | `boolean` | `false` | 是否禁用 |
+| `isRequired` | `boolean` | `false` | 是否必填 |
+| `label` | `ReactNode` | - | 标签文本 |
+| `description` | `ReactNode` | - | 描述文本 |
+| `errorMessage` | `ReactNode` | - | 错误提示 |
+| ...rest | `SelectProps` | - | 其他 HeroUI Select 属性 |
+
+### SelectorItem
+
+```tsx
+interface SelectorItem<V = string | number> {
+  label: string | ReactNode  // 显示文本或自定义内容
+  value: V                   // 选项值
+  disabled?: boolean         // 是否禁用
+  [key: string]: any         // 其他自定义属性
+}
+```
+
+## 类型安全
+
+组件使用 TypeScript 条件类型，根据 `selectionMode` 自动推断回调类型：
+
+```tsx
+// 单选模式
+<Selector
+  selectionMode="single"  // 或省略（默认单选）
+  selectedKeys={value}    // 类型: V
+  onSelectionChange={(v) => ...}  // v 类型: V
+/>
+
+// 多选模式
+<Selector
+  selectionMode="multiple"
+  selectedKeys={values}   // 类型: V[]
+  onSelectionChange={(vs) => ...}  // vs 类型: V[]
+/>
+```
+
+## 与 HeroUI Select 的区别
+
+| 特性 | HeroUI Select | Selector (本组件) |
+|------|---------------|------------------|
+| `selectedKeys` | `Set<Key> \| 'all'` | `V` \| `V[]` (自动转换) |
+| `onSelectionChange` | `(keys: Selection) => void` | `(key: V) => void` \| `(keys: V[]) => void` |
+| 单选回调 | 返回 `Set` (需手动提取) | 直接返回单个值 |
+| 多选回调 | 返回 `Set` (需转数组) | 直接返回数组 |
+| 类型推断 | 无 | 根据 selectionMode 自动推断 |
+
+## 最佳实践
+
+### 1. 显式声明 selectionMode
+
+虽然单选是默认模式，但建议显式声明以提高代码可读性：
+
+```tsx
+// ✅ 推荐
+<Selector selectionMode="single" ... />
+
+// ⚠️ 可以但不够清晰
+<Selector ... />
+```
+
+### 2. 使用泛型指定值类型
+
+当值类型为数字或联合类型时，使用泛型获得更好的类型提示：
+
+```tsx
+// ✅ 推荐
+<Selector<number> selectedKeys={priority} ... />
+
+// ✅ 推荐（联合类型）
+type Status = 'pending' | 'approved' | 'rejected'
+<Selector<Status> selectedKeys={status} ... />
+```
+
+### 3. 避免在渲染时创建 items
+
+```tsx
+// ❌ 不推荐（每次渲染都创建新数组）
+<Selector items={[{ label: 'A', value: '1' }]} />
+
+// ✅ 推荐（在组件外或使用 useMemo）
+const items = [{ label: 'A', value: '1' }]
+<Selector items={items} />
+```
+
+## 迁移指南
+
+### 从 antd Select 迁移
+
+```tsx
+// antd Select
+import { Select } from 'antd'
+
+<Select
+  value={value}
+  onChange={(value) => onChange(value)}
+  options={[
+    { label: 'A', value: '1' },
+    { label: 'B', value: '2' }
+  ]}
+/>
+
+// 迁移到 Selector
+import { Selector } from '@cherrystudio/ui'
+
+<Selector
+  selectedKeys={value}           // value → selectedKeys
+  onSelectionChange={(value) => onChange(value)}  // onChange → onSelectionChange
+  items={[                       // options → items
+    { label: 'A', value: '1' },
+    { label: 'B', value: '2' }
+  ]}
+/>
+```
+
+### 从旧版 Selector 迁移
+
+```tsx
+// 旧版 Selector (返回数组)
+<Selector
+  onSelectionChange={(values) => {
+    const value = values[0]  // 需要手动提取
+    onChange(value)
+  }}
+/>
+
+// 新版 Selector (直接返回值)
+<Selector
+  selectionMode="single"
+  onSelectionChange={(value) => {
+    onChange(value)  // 直接使用
+  }}
+/>
+```
+
+## 常见问题
+
+### Q: 为什么单选模式下还需要 selectedKeys 而不是 selectedKey？
+
+A: 为了保持与 HeroUI API 命名的一致性，同时简化组件实现。组件内部会自动处理单个值和 Set 的转换。
+
+### Q: 如何清空选择？
+
+```tsx
+// 单选模式
+<Selector
+  selectedKeys={value}
+  onSelectionChange={setValue}
+  isClearable  // 添加清空按钮
+/>
+
+// 或手动设置为 undefined
+setValue(undefined)
+```
+
+### Q: 支持异步加载选项吗？
+
+支持，配合 `isLoading` 属性使用：
+
+```tsx
+const [items, setItems] = useState([])
+const [loading, setLoading] = useState(true)
+
+useEffect(() => {
+  fetchItems().then(data => {
+    setItems(data)
+    setLoading(false)
+  })
+}, [])
+
+<Selector items={items} isLoading={loading} />
+```

packages/ui/src/components/base/StatusTag/index.tsx

@@ -0,0 +1,53 @@
+import type { LucideIcon } from 'lucide-react'
+import { AlertTriangleIcon, CheckIcon, CircleXIcon, InfoIcon } from 'lucide-react'
+import React from 'react'
+
+import CustomTag from '../CustomTag'
+
+export type StatusType = 'success' | 'error' | 'warning' | 'info'
+
+export interface StatusTagProps {
+  type: StatusType
+  message: string
+  iconSize?: number
+  icon?: React.ReactNode
+  color?: string
+  className?: string
+}
+
+const statusConfig: Record<StatusType, { Icon: LucideIcon; color: string }> = {
+  success: { Icon: CheckIcon, color: '#10B981' }, // green-500
+  error: { Icon: CircleXIcon, color: '#EF4444' }, // red-500
+  warning: { Icon: AlertTriangleIcon, color: '#F59E0B' }, // amber-500
+  info: { Icon: InfoIcon, color: '#3B82F6' } // blue-500
+}
+
+export const StatusTag: React.FC<StatusTagProps> = ({ type, message, iconSize = 14, icon, color, className }) => {
+  const config = statusConfig[type]
+  const Icon = config.Icon
+  const finalColor = color || config.color
+  const finalIcon = icon || <Icon size={iconSize} color={finalColor} />
+
+  return (
+    <CustomTag icon={finalIcon} color={finalColor} className={className}>
+      {message}
+    </CustomTag>
+  )
+}
+
+// 保留原有的导出以保持向后兼容
+export const SuccessTag = ({ iconSize, message }: { iconSize?: number; message: string }) => (
+  <StatusTag type="success" iconSize={iconSize} message={message} />
+)
+
+export const ErrorTag = ({ iconSize, message }: { iconSize?: number; message: string }) => (
+  <StatusTag type="error" iconSize={iconSize} message={message} />
+)
+
+export const WarnTag = ({ iconSize, message }: { iconSize?: number; message: string }) => (
+  <StatusTag type="warning" iconSize={iconSize} message={message} />
+)
+
+export const InfoTag = ({ iconSize, message }: { iconSize?: number; message: string }) => (
+  <StatusTag type="info" iconSize={iconSize} message={message} />
+)

packages/ui/src/components/base/TextBadge/index.tsx

@@ -0,0 +1,20 @@
+// Original: src/renderer/src/components/TextBadge.tsx
+import type { FC } from 'react'
+
+interface TextBadgeProps {
+  text: string
+  style?: React.CSSProperties
+  className?: string
+}
+
+const TextBadge: FC<TextBadgeProps> = ({ text, style, className = '' }) => {
+  return (
+    <span
+      className={`text-xs text-blue-600 dark:text-blue-400 bg-blue-100 dark:bg-blue-900/30 px-1.5 py-0.5 rounded font-medium ${className}`}
+      style={style}>
+      {text}
+    </span>
+  )
+}
+
+export default TextBadge

packages/ui/src/components/base/Toast/index.ts

@@ -1,6 +1,7 @@
-import type { RequireSome } from '@cherrystudio/ui/types'
 import { addToast, closeAll, closeToast, getToastQueue, isToastClosing } from '@heroui/toast'
 
+import type { RequireSome } from '@/types'
+
 type AddToastProps = Parameters<typeof addToast>[0]
 type ToastPropsColored = Omit<AddToastProps, 'color'>
 

packages/ui/src/components/index.ts

@@ -1,26 +1,33 @@
-// Primitive Components
-export { Avatar, AvatarGroup, type AvatarProps, EmojiAvatar } from './primitives/Avatar'
-export { default as CopyButton } from './primitives/copyButton'
-export { default as CustomTag } from './primitives/customTag'
-export { default as DividerWithText } from './primitives/dividerWithText'
-export { default as EmojiIcon } from './primitives/emojiIcon'
-export type { CustomFallbackProps, ErrorBoundaryCustomizedProps } from './primitives/ErrorBoundary'
-export { ErrorBoundary } from './primitives/ErrorBoundary'
-export { default as IndicatorLight } from './primitives/indicatorLight'
-export { default as Spinner } from './primitives/spinner'
-export { DescriptionSwitch, Switch } from './primitives/switch'
-export { getToastUtilities, type ToastUtilities } from './primitives/toast'
-export { Tooltip, type TooltipProps } from './primitives/tooltip'
+// Base Components
+export { Avatar, AvatarGroup, type AvatarProps, EmojiAvatar } from './base/Avatar'
+export { default as Button, type ButtonProps } from './base/Button'
+export { default as CopyButton } from './base/CopyButton'
+export { default as CustomCollapse } from './base/CustomCollapse'
+export { default as CustomTag } from './base/CustomTag'
+export { default as DividerWithText } from './base/DividerWithText'
+export { default as EmojiIcon } from './base/EmojiIcon'
+export type { CustomFallbackProps, ErrorBoundaryCustomizedProps } from './base/ErrorBoundary'
+export { ErrorBoundary } from './base/ErrorBoundary'
+export { default as IndicatorLight } from './base/IndicatorLight'
+export { default as Spinner } from './base/Spinner'
+export type { StatusTagProps, StatusType } from './base/StatusTag'
+export { ErrorTag, InfoTag, StatusTag, SuccessTag, WarnTag } from './base/StatusTag'
+export { DescriptionSwitch, Switch } from './base/Switch'
+export { default as TextBadge } from './base/TextBadge'
+export { getToastUtilities, type ToastUtilities } from './base/Toast'
+export { Tooltip, type TooltipProps } from './base/Tooltip'
 
-// Composite Components
-export { default as Ellipsis } from './composites/Ellipsis'
-export { default as ExpandableText } from './composites/ExpandableText'
-export { Box, Center, ColFlex, Flex, RowFlex, SpaceBetweenRowFlex } from './composites/Flex'
-export { default as HorizontalScrollContainer } from './composites/HorizontalScrollContainer'
-export { default as ListItem } from './composites/ListItem'
-export { default as MaxContextCount } from './composites/MaxContextCount'
-export { default as Scrollbar } from './composites/Scrollbar'
-export { default as ThinkingEffect } from './composites/ThinkingEffect'
+// Display Components
+export { default as Ellipsis } from './display/Ellipsis'
+export { default as ExpandableText } from './display/ExpandableText'
+export { default as ListItem } from './display/ListItem'
+export { default as MaxContextCount } from './display/MaxContextCount'
+export { default as ThinkingEffect } from './display/ThinkingEffect'
+
+// Layout Components
+export { Box, Center, ColFlex, Flex, RowFlex, SpaceBetweenRowFlex } from './layout/Flex'
+export { default as HorizontalScrollContainer } from './layout/HorizontalScrollContainer'
+export { default as Scrollbar } from './layout/Scrollbar'
 
 // Icon Components
 export { FilePngIcon, FileSvgIcon } from './icons/FileIcons'
@@ -42,9 +49,11 @@ export {
 export { default as SvgSpinners180Ring } from './icons/SvgSpinners180Ring'
 export { default as ToolsCallingIcon } from './icons/ToolsCallingIcon'
 
-/* Selector Components */
-export { default as Selector } from './primitives/Selector'
-export { default as SearchableSelector } from './primitives/Selector/SearchableSelector'
+/* Interactive Components */
+
+// Selector / SearchableSelector
+export { default as Selector } from './base/Selector'
+export { default as SearchableSelector } from './base/Selector/SearchableSelector'
 export type {
   MultipleSearchableSelectorProps,
   MultipleSelectorProps,
@@ -54,9 +63,7 @@ export type {
   SelectorProps,
   SingleSearchableSelectorProps,
   SingleSelectorProps
-} from './primitives/Selector/types'
-
-/* Additional Composite Components */
+} from './base/Selector/types'
 // CodeEditor
 export {
   default as CodeEditor,
@@ -65,25 +72,21 @@ export {
   type CodeMirrorTheme,
   getCmThemeByName,
   getCmThemeNames
-} from './composites/CodeEditor'
+} from './interactive/CodeEditor'
 // CollapsibleSearchBar
-export { default as CollapsibleSearchBar } from './composites/CollapsibleSearchBar'
+export { default as CollapsibleSearchBar } from './interactive/CollapsibleSearchBar'
 // DraggableList
-export { DraggableList, useDraggableReorder } from './composites/DraggableList'
+export { DraggableList, useDraggableReorder } from './interactive/DraggableList'
 // EditableNumber
-export type { EditableNumberProps } from './composites/EditableNumber'
-export { default as EditableNumber } from './composites/EditableNumber'
+export type { EditableNumberProps } from './interactive/EditableNumber'
+// EditableNumber
+export { default as EditableNumber } from './interactive/EditableNumber'
 // Tooltip variants
-export { HelpTooltip, type IconTooltipProps, InfoTooltip, WarnTooltip } from './composites/IconTooltips'
+export { HelpTooltip, type IconTooltipProps, InfoTooltip, WarnTooltip } from './interactive/IconTooltips'
 // ImageToolButton
-export { default as ImageToolButton } from './composites/ImageToolButton'
+export { default as ImageToolButton } from './interactive/ImageToolButton'
 // Sortable
-export { Sortable } from './composites/Sortable'
+export { Sortable } from './interactive/Sortable'
 
-/* Shadcn Primitive Components */
-export * from './primitives/button'
-export * from './primitives/command'
-export * from './primitives/dialog'
-export * from './primitives/popover'
-export * from './primitives/radioGroup'
-export * from './primitives/shadcn-io/dropzone'
+// Composite Components (复合组件)
+// 暂无复合组件

packages/ui/src/components/interactive/CollapsibleSearchBar/index.tsx

@@ -5,7 +5,7 @@ import { Search } from 'lucide-react'
 import { motion } from 'motion/react'
 import React, { memo, useCallback, useEffect, useRef, useState } from 'react'
 
-import { Tooltip } from '../../primitives/tooltip'
+import { Tooltip } from '../../base/Tooltip'
 
 interface CollapsibleSearchBarProps {
   onSearch: (text: string) => void

packages/ui/src/components/interactive/DraggableList/virtual-list.tsx

@@ -9,7 +9,7 @@ import { DragDropContext, Draggable, Droppable } from '@hello-pangea/dnd'
 import { type ScrollToOptions, useVirtualizer, type VirtualItem } from '@tanstack/react-virtual'
 import { type Key, memo, useCallback, useImperativeHandle, useRef } from 'react'
 
-import Scrollbar from '../Scrollbar'
+import Scrollbar from '../../layout/Scrollbar'
 import { droppableReorder } from './sort'
 
 export interface DraggableVirtualListRef {

packages/ui/src/components/interactive/IconTooltips/HelpTooltip.tsx

@@ -1,7 +1,7 @@
 // Original path: src/renderer/src/components/TooltipIcons/HelpTooltip.tsx
 import { HelpCircle } from 'lucide-react'
 
-import { Tooltip } from '../../primitives/tooltip'
+import { Tooltip } from '../../base/Tooltip'
 import type { IconTooltipProps } from './types'
 
 export const HelpTooltip = ({ iconProps, ...rest }: IconTooltipProps) => {

packages/ui/src/components/interactive/IconTooltips/InfoTooltip.tsx

@@ -1,7 +1,7 @@
 // Original: src/renderer/src/components/TooltipIcons/InfoTooltip.tsx
 import { Info } from 'lucide-react'
 
-import { Tooltip } from '../../primitives/tooltip'
+import { Tooltip } from '../../base/Tooltip'
 import type { IconTooltipProps } from './types'
 
 export const InfoTooltip = ({ iconProps, ...rest }: IconTooltipProps) => {

packages/ui/src/components/interactive/IconTooltips/WarnTooltip.tsx

@@ -1,7 +1,7 @@
 // Original path: src/renderer/src/components/TooltipIcons/WarnTooltip.tsx
 import { AlertTriangle } from 'lucide-react'
 
-import { Tooltip } from '../../primitives/tooltip'
+import { Tooltip } from '../../base/Tooltip'
 import type { IconTooltipProps } from './types'
 
 export const WarnTooltip = ({ iconProps, ...rest }: IconTooltipProps) => {

packages/ui/src/components/interactive/IconTooltips/types.ts

@@ -1,6 +1,6 @@
 import type { LucideProps } from 'lucide-react'
 
-import type { TooltipProps } from '../../primitives/tooltip'
+import type { TooltipProps } from '../../base/Tooltip'
 
 export interface IconTooltipProps extends TooltipProps {
   iconProps?: LucideProps

packages/ui/src/components/interactive/ImageToolButton/index.tsx

@@ -1,8 +1,8 @@
 // Original path: src/renderer/src/components/Preview/ImageToolButton.tsx
 import { memo } from 'react'
 
-import { Button } from '../../primitives/button'
-import { Tooltip } from '../../primitives/tooltip'
+import Button from '../../base/Button'
+import { Tooltip } from '../../base/Tooltip'
 
 interface ImageToolButtonProps {
   tooltip: string
@@ -13,7 +13,7 @@ interface ImageToolButtonProps {
 const ImageToolButton = ({ tooltip, icon, onPress }: ImageToolButtonProps) => {
   return (
     <Tooltip content={tooltip} delay={500} closeDelay={0}>
-      <Button size="icon" className="rounded-full" onClick={onPress} aria-label={tooltip}>
+      <Button radius="full" isIconOnly onPress={onPress} aria-label={tooltip}>
         {icon}
       </Button>
     </Tooltip>

packages/ui/src/components/primitives/radioGroup.tsx

@@ -1,28 +0,0 @@
-import { cn } from '@cherrystudio/ui/utils/index'
-import * as RadioGroupPrimitive from '@radix-ui/react-radio-group'
-import { CircleIcon } from 'lucide-react'
-import * as React from 'react'
-
-function RadioGroup({ className, ...props }: React.ComponentProps<typeof RadioGroupPrimitive.Root>) {
-  return <RadioGroupPrimitive.Root data-slot="radio-group" className={cn('grid gap-3', className)} {...props} />
-}
-
-function RadioGroupItem({ className, ...props }: React.ComponentProps<typeof RadioGroupPrimitive.Item>) {
-  return (
-    <RadioGroupPrimitive.Item
-      data-slot="radio-group-item"
-      className={cn(
-        'border-input text-primary focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 aspect-square size-4 shrink-0 rounded-full border shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50',
-        className
-      )}
-      {...props}>
-      <RadioGroupPrimitive.Indicator
-        data-slot="radio-group-indicator"
-        className="relative flex items-center justify-center">
-        <CircleIcon className="fill-primary absolute top-1/2 left-1/2 size-2 -translate-x-1/2 -translate-y-1/2" />
-      </RadioGroupPrimitive.Indicator>
-    </RadioGroupPrimitive.Item>
-  )
-}
-
-export { RadioGroup, RadioGroupItem }

packages/ui/src/components/ui/button.tsx

@@ -1,8 +1,9 @@
-import { cn } from '@cherrystudio/ui/utils/index'
 import { Slot } from '@radix-ui/react-slot'
 import { cva, type VariantProps } from 'class-variance-authority'
 import * as React from 'react'
 
+import { cn } from '@/utils/index'
+
 const buttonVariants = cva(
   "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px] aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
   {

packages/ui/src/components/ui/command.tsx

@@ -1,15 +1,10 @@
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle
-} from '@cherrystudio/ui/components/primitives/dialog'
-import { cn } from '@cherrystudio/ui/utils'
 import { Command as CommandPrimitive } from 'cmdk'
 import { SearchIcon } from 'lucide-react'
 import * as React from 'react'
 
+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog'
+import { cn } from '@/utils/index'
+
 function Command({ className, ...props }: React.ComponentProps<typeof CommandPrimitive>) {
   return (
     <CommandPrimitive

packages/ui/src/components/ui/dialog.tsx

@@ -1,8 +1,9 @@
-import { cn } from '@cherrystudio/ui/utils/index'
 import * as DialogPrimitive from '@radix-ui/react-dialog'
 import { XIcon } from 'lucide-react'
 import * as React from 'react'
 
+import { cn } from '@/utils/index'
+
 function Dialog({ ...props }: React.ComponentProps<typeof DialogPrimitive.Root>) {
   return <DialogPrimitive.Root data-slot="dialog" {...props} />
 }

packages/ui/src/components/ui/popover.tsx

@@ -1,9 +1,10 @@
 'use client'
 
-import { cn } from '@cherrystudio/ui/utils'
 import * as PopoverPrimitive from '@radix-ui/react-popover'
 import * as React from 'react'
 
+import { cn } from '@/utils/index'
+
 function Popover({ ...props }: React.ComponentProps<typeof PopoverPrimitive.Root>) {
   return <PopoverPrimitive.Root data-slot="popover" {...props} />
 }

packages/ui/src/components/ui/shadcn-io/dropzone/index.tsx

@@ -1,13 +1,14 @@
 'use client'
 
-import { Button } from '@cherrystudio/ui/components/primitives/button'
-import { cn } from '@cherrystudio/ui/utils/index'
 import { UploadIcon } from 'lucide-react'
 import type { ReactNode } from 'react'
 import { createContext, use } from 'react'
 import type { DropEvent, DropzoneOptions, FileRejection } from 'react-dropzone'
 import { useDropzone } from 'react-dropzone'
 
+import { Button } from '@/components/ui/button'
+import { cn } from '@/utils/index'
+
 type DropzoneContextType = {
   src?: File[]
   accept?: DropzoneOptions['accept']

packages/ui/stories/components/base/Button.stories.tsx

@@ -3,7 +3,7 @@ import type { Meta, StoryObj } from '@storybook/react'
 import { Button } from '../../../src/components'
 
 const meta: Meta<typeof Button> = {
-  title: 'Components/Primitives/Button',
+  title: 'Components/Base/Button',
   component: Button,
   parameters: {
     layout: 'centered'
@@ -12,16 +12,30 @@ const meta: Meta<typeof Button> = {
   argTypes: {
     variant: {
       control: { type: 'select' },
-      options: ['default', 'destructive', 'outline', 'secondary', 'ghost', 'link']
+      options: ['solid', 'bordered', 'light', 'flat', 'faded', 'shadow', 'ghost']
+    },
+    color: {
+      control: { type: 'select' },
+      options: ['default', 'primary', 'secondary', 'success', 'warning', 'danger']
     },
     size: {
       control: { type: 'select' },
-      options: ['default', 'sm', 'lg', 'icon', 'icon-sm', 'icon-lg']
+      options: ['sm', 'md', 'lg']
     },
-    disabled: {
+    radius: {
+      control: { type: 'select' },
+      options: ['none', 'sm', 'md', 'lg', 'full']
+    },
+    isDisabled: {
       control: { type: 'boolean' }
     },
-    asChild: {
+    isLoading: {
+      control: { type: 'boolean' }
+    },
+    fullWidth: {
+      control: { type: 'boolean' }
+    },
+    isIconOnly: {
       control: { type: 'boolean' }
     }
   }
@@ -41,12 +55,27 @@ export const Default: Story = {
 export const Variants: Story = {
   render: () => (
     <div className="flex gap-2 flex-wrap">
-      <Button variant="default">Default</Button>
-      <Button variant="secondary">Secondary</Button>
-      <Button variant="destructive">Destructive</Button>
-      <Button variant="outline">Outline</Button>
+      <Button variant="solid">Solid</Button>
+      <Button variant="bordered">Bordered</Button>
+      <Button variant="light">Light</Button>
+      <Button variant="flat">Flat</Button>
+      <Button variant="faded">Faded</Button>
+      <Button variant="shadow">Shadow</Button>
       <Button variant="ghost">Ghost</Button>
-      <Button variant="link">Link</Button>
+    </div>
+  )
+}
+
+// 不同颜色
+export const Colors: Story = {
+  render: () => (
+    <div className="flex gap-2 flex-wrap">
+      <Button color="default">Default</Button>
+      <Button color="primary">Primary</Button>
+      <Button color="secondary">Secondary</Button>
+      <Button color="success">Success</Button>
+      <Button color="warning">Warning</Button>
+      <Button color="danger">Danger</Button>
     </div>
   )
 }
@@ -54,21 +83,23 @@ export const Variants: Story = {
 // 不同尺寸
 export const Sizes: Story = {
   render: () => (
-    <div className="flex gap-2 items-center flex-wrap">
+    <div className="flex gap-2 items-center">
       <Button size="sm">Small</Button>
-      <Button size="default">Default</Button>
+      <Button size="md">Medium</Button>
       <Button size="lg">Large</Button>
     </div>
   )
 }
 
-// 图标按钮
-export const IconButtons: Story = {
+// 不同圆角
+export const Radius: Story = {
   render: () => (
-    <div className="flex gap-2 items-center flex-wrap">
-      <Button size="icon-sm">🔍</Button>
-      <Button size="icon">🔍</Button>
-      <Button size="icon-lg">🔍</Button>
+    <div className="flex gap-2 flex-wrap">
+      <Button radius="none">None</Button>
+      <Button radius="sm">Small</Button>
+      <Button radius="md">Medium</Button>
+      <Button radius="lg">Large</Button>
+      <Button radius="full">Full</Button>
     </div>
   )
 }
@@ -78,7 +109,8 @@ export const States: Story = {
   render: () => (
     <div className="flex gap-2 flex-wrap">
       <Button>Normal</Button>
-      <Button disabled>Disabled</Button>
+      <Button isDisabled>Disabled</Button>
+      <Button isLoading>Loading</Button>
     </div>
   )
 }
@@ -87,15 +119,9 @@ export const States: Story = {
 export const WithIcons: Story = {
   render: () => (
     <div className="flex gap-2 flex-wrap">
-      <Button>
-        <span className="mr-2">📧</span>
-        Email
-      </Button>
-      <Button>
-        Next
-        <span className="ml-2">→</span>
-      </Button>
-      <Button size="icon">🔍</Button>
+      <Button startContent={<span>📧</span>}>Email</Button>
+      <Button endContent={<span>→</span>}>Next</Button>
+      <Button isIconOnly>🔍</Button>
     </div>
   )
 }
@@ -104,7 +130,9 @@ export const WithIcons: Story = {
 export const FullWidth: Story = {
   render: () => (
     <div className="w-96">
-      <Button className="w-full">Full Width Button</Button>
+      <Button fullWidth color="primary">
+        Full Width Button
+      </Button>
     </div>
   )
 }
@@ -113,45 +141,10 @@ export const FullWidth: Story = {
 export const Interactive: Story = {
   render: () => (
     <div className="flex gap-2 flex-wrap">
-      <Button onClick={() => alert('Button clicked!')}>Click Me</Button>
-      <Button onClick={() => console.log('Primary action')} variant="default">
+      <Button onPress={() => alert('Button pressed!')}>Click Me</Button>
+      <Button onPress={() => console.log('Primary action')} color="primary" variant="solid">
         Primary Action
       </Button>
     </div>
   )
 }
-
-// 组合示例
-export const Combinations: Story = {
-  render: () => (
-    <div className="flex flex-col gap-4">
-      <div className="flex gap-2 flex-wrap">
-        <Button variant="default" size="sm">
-          Small Default
-        </Button>
-        <Button variant="destructive" size="sm">
-          Small Destructive
-        </Button>
-        <Button variant="outline" size="sm">
-          Small Outline
-        </Button>
-      </div>
-      <div className="flex gap-2 flex-wrap">
-        <Button variant="default">Default</Button>
-        <Button variant="destructive">Destructive</Button>
-        <Button variant="outline">Outline</Button>
-      </div>
-      <div className="flex gap-2 flex-wrap">
-        <Button variant="default" size="lg">
-          Large Default
-        </Button>
-        <Button variant="destructive" size="lg">
-          Large Destructive
-        </Button>
-        <Button variant="outline" size="lg">
-          Large Outline
-        </Button>
-      </div>
-    </div>
-  )
-}

packages/ui/stories/components/base/CopyButton.stories.tsx

@@ -1,6 +1,6 @@
 import type { Meta, StoryObj } from '@storybook/react'
 
-import CopyButton from '../../../src/components/primitives/copyButton'
+import CopyButton from '../../../src/components/base/CopyButton'
 
 const meta: Meta<typeof CopyButton> = {
   title: 'Base/CopyButton',

packages/ui/stories/components/base/CustomCollapse.stories.tsx

@@ -0,0 +1,459 @@
+import { Button } from '@heroui/react'
+import type { Meta, StoryObj } from '@storybook/react'
+import { AlertTriangle, CreditCard, Info, Monitor, Settings, Shield } from 'lucide-react'
+import { useState } from 'react'
+
+import CustomCollapse, { Accordion, AccordionItem } from '../../../src/components/base/CustomCollapse'
+
+const meta: Meta<typeof CustomCollapse> = {
+  title: 'Base/CustomCollapse',
+  component: CustomCollapse,
+  parameters: {
+    layout: 'padded'
+  },
+  tags: ['autodocs'],
+  argTypes: {
+    children: {
+      control: false,
+      description: '面板内容'
+    },
+    accordionProps: {
+      control: false,
+      description: 'Accordion 组件的属性'
+    },
+    accordionItemProps: {
+      control: false,
+      description: 'AccordionItem 组件的属性'
+    }
+  }
+}
+
+export default meta
+type Story = StoryObj<typeof meta>
+
+// 基础用法
+export const Default: Story = {
+  args: {
+    accordionItemProps: {
+      title: '默认折叠面板'
+    },
+    children: (
+      <div className="p-4">
+        <p>这是折叠面板的内容。</p>
+        <p>可以包含任何内容，包括文本、图片、表单等。</p>
+      </div>
+    )
+  }
+}
+
+// 带副标题
+export const WithSubtitle: Story = {
+  args: {
+    accordionProps: {
+      defaultExpandedKeys: ['1']
+    },
+    accordionItemProps: {
+      title: '带副标题的折叠面板',
+      subtitle: <span className="text-sm text-gray-500">这是副标题内容</span>
+    },
+    children: (
+      <div className="p-4">
+        <p>面板内容</p>
+        <p>可以在 subtitle 属性中设置副标题</p>
+      </div>
+    )
+  }
+}
+
+// HeroUI 样式变体
+export const VariantLight: Story = {
+  args: {
+    accordionProps: {
+      variant: 'light'
+    },
+    accordionItemProps: {
+      title: 'Light 变体'
+    },
+    children: (
+      <div className="p-4">
+        <p>这是 HeroUI 的 Light 变体样式。</p>
+      </div>
+    )
+  }
+}
+
+export const VariantShadow: Story = {
+  args: {
+    accordionProps: {
+      variant: 'shadow',
+      className: 'p-2'
+    },
+    accordionItemProps: {
+      title: 'Shadow 变体',
+      subtitle: '带阴影的面板样式'
+    },
+    children: (
+      <div className="p-4">
+        <p>这是 HeroUI 的 Shadow 变体样式。</p>
+      </div>
+    )
+  }
+}
+
+export const VariantBordered: Story = {
+  args: {
+    accordionProps: {
+      variant: 'bordered'
+    },
+    accordionItemProps: {
+      title: 'Bordered 变体（默认）'
+    },
+    children: (
+      <div className="p-4">
+        <p>这是 HeroUI 的 Bordered 变体样式。</p>
+      </div>
+    )
+  }
+}
+
+export const VariantSplitted: Story = {
+  args: {
+    accordionProps: {
+      variant: 'splitted'
+    },
+    accordionItemProps: {
+      title: 'Splitted 变体'
+    },
+    children: (
+      <div className="p-4">
+        <p>这是 HeroUI 的 Splitted 变体样式。</p>
+      </div>
+    )
+  }
+}
+
+// 富内容标题
+export const RichLabel: Story = {
+  args: {
+    accordionItemProps: {
+      title: (
+        <div className="flex items-center gap-2">
+          <Settings className="text-default-500" size={20} />
+          <span>设置面板</span>
+        </div>
+      )
+    },
+    children: (
+      <div className="p-4">
+        <div className="space-y-3">
+          <div className="flex items-center justify-between">
+            <span>通知设置</span>
+            <Button size="sm" variant="flat">
+              开启
+            </Button>
+          </div>
+          <div className="flex items-center justify-between">
+            <span>自动更新</span>
+            <Button size="sm" variant="flat">
+              关闭
+            </Button>
+          </div>
+        </div>
+      </div>
+    )
+  }
+}
+
+// 带警告提示
+export const WithWarning: Story = {
+  args: {
+    accordionItemProps: {
+      title: (
+        <div className="flex items-center gap-2">
+          <Monitor className="text-primary" size={20} />
+          <span>连接的设备</span>
+        </div>
+      ),
+      subtitle: (
+        <p className="flex">
+          2个问题需要<span className="text-primary ml-1">立即修复</span>
+        </p>
+      )
+    },
+    children: (
+      <div className="p-4">
+        <p className="text-small">检测到以下设备连接异常：</p>
+        <ul className="list-disc list-inside mt-2 text-small space-y-1">
+          <li>外部显示器连接不稳定</li>
+          <li>蓝牙键盘配对失败</li>
+        </ul>
+      </div>
+    )
+  }
+}
+
+// 禁用状态
+export const Disabled: Story = {
+  args: {
+    accordionProps: {
+      isDisabled: true,
+      defaultExpandedKeys: ['1']
+    },
+    accordionItemProps: {
+      title: '禁用的折叠面板'
+    },
+    children: (
+      <div className="p-4">
+        <p>这个面板被禁用了，无法操作。</p>
+      </div>
+    )
+  }
+}
+
+// 受控模式
+export const ControlledMode: Story = {
+  render: function ControlledMode() {
+    const [selectedKeys, setSelectedKeys] = useState<Set<string>>(new Set(['1']))
+
+    return (
+      <div className="space-y-4">
+        <div className="flex gap-2">
+          <Button size="sm" onPress={() => setSelectedKeys(new Set(['1']))} color="primary">
+            展开
+          </Button>
+          <Button size="sm" onPress={() => setSelectedKeys(new Set())} color="default">
+            收起
+          </Button>
+        </div>
+        <CustomCollapse
+          accordionProps={{
+            selectedKeys,
+            onSelectionChange: (keys) => {
+              if (keys !== 'all') {
+                setSelectedKeys(keys as Set<string>)
+              }
+            }
+          }}
+          accordionItemProps={{
+            title: '受控的折叠面板'
+          }}>
+          <div className="p-4">
+            <p>这是一个受控的折叠面板</p>
+            <p>通过按钮控制展开和收起状态</p>
+          </div>
+        </CustomCollapse>
+        <div className="text-sm text-gray-600">当前状态：{selectedKeys.size > 0 ? '展开' : '收起'}</div>
+      </div>
+    )
+  }
+}
+
+// 多个单面板组合
+export const MultipleSinglePanels: Story = {
+  render: () => (
+    <div className="space-y-4">
+      <CustomCollapse accordionProps={{ defaultExpandedKeys: ['1'] }} accordionItemProps={{ title: '第一个面板' }}>
+        <div className="p-4">
+          <p>第一个面板的内容</p>
+        </div>
+      </CustomCollapse>
+      <CustomCollapse
+        accordionItemProps={{
+          title: '第二个面板',
+          subtitle: '带副标题'
+        }}>
+        <div className="p-4">
+          <p>第二个面板的内容</p>
+        </div>
+      </CustomCollapse>
+      <CustomCollapse accordionProps={{ isDisabled: true }} accordionItemProps={{ title: '第三个面板（禁用）' }}>
+        <div className="p-4">
+          <p>这个面板被禁用了</p>
+        </div>
+      </CustomCollapse>
+    </div>
+  )
+}
+
+// 使用原生 HeroUI Accordion 的多面板示例
+export const NativeAccordionMultiple: Story = {
+  render: () => (
+    <div className="max-w-lg">
+      <h3 className="text-lg font-medium mb-4">原生 HeroUI Accordion 多面板</h3>
+      <Accordion variant="shadow" className="p-2 flex flex-col gap-1" defaultExpandedKeys={['1']}>
+        <AccordionItem
+          key="1"
+          title="连接的设备"
+          startContent={<Monitor className="text-primary" size={20} />}
+          subtitle={
+            <p className="flex">
+              2个问题需要<span className="text-primary ml-1">立即修复</span>
+            </p>
+          }>
+          <div className="p-4">
+            <p className="text-small">设备连接状态监控</p>
+          </div>
+        </AccordionItem>
+        <AccordionItem
+          key="2"
+          title="应用权限"
+          startContent={<Shield className="text-default-500" size={20} />}
+          subtitle="3个应用有读取权限">
+          <div className="p-4">
+            <p className="text-small">管理应用的系统权限设置</p>
+          </div>
+        </AccordionItem>
+        <AccordionItem
+          key="3"
+          title="待办任务"
+          startContent={<Info className="text-warning" size={20} />}
+          subtitle={<span className="text-warning">请完善您的个人资料</span>}>
+          <div className="p-4">
+            <p className="text-small">您还有一些信息需要完善</p>
+          </div>
+        </AccordionItem>
+        <AccordionItem
+          key="4"
+          title={
+            <p className="flex gap-1 items-center">
+              卡片已过期
+              <span className="text-default-400 text-small">*4812</span>
+            </p>
+          }
+          startContent={<CreditCard className="text-danger" size={20} />}
+          subtitle={<span className="text-danger">请立即更新</span>}>
+          <div className="p-4">
+            <p className="text-small text-danger">您的信用卡已过期，请更新支付信息</p>
+          </div>
+        </AccordionItem>
+      </Accordion>
+    </div>
+  )
+}
+
+// 富内容面板
+export const RichContent: Story = {
+  args: {
+    accordionItemProps: {
+      title: (
+        <div className="flex items-center justify-between w-full">
+          <div className="flex items-center gap-2">
+            <Info className="text-default-500" size={20} />
+            <span>详细信息</span>
+          </div>
+          <div className="flex gap-2" onClick={(e) => e.stopPropagation()}>
+            <Button size="sm" variant="flat" color="primary">
+              保存
+            </Button>
+            <Button size="sm" variant="flat">
+              取消
+            </Button>
+          </div>
+        </div>
+      )
+    },
+    children: (
+      <div className="p-4 space-y-4">
+        <div>
+          <h4 className="font-medium mb-2">基本信息</h4>
+          <div className="grid grid-cols-2 gap-4">
+            <div>
+              <label className="block text-sm font-medium mb-1">名称</label>
+              <input
+                type="text"
+                className="w-full px-3 py-2 border border-gray-300 rounded-md"
+                placeholder="请输入名称"
+              />
+            </div>
+            <div>
+              <label className="block text-sm font-medium mb-1">类型</label>
+              <select className="w-full px-3 py-2 border border-gray-300 rounded-md">
+                <option>选择类型</option>
+                <option>类型 A</option>
+                <option>类型 B</option>
+              </select>
+            </div>
+          </div>
+        </div>
+        <div>
+          <label className="block text-sm font-medium mb-1">描述</label>
+          <textarea className="w-full px-3 py-2 border border-gray-300 rounded-md" rows={3} placeholder="请输入描述" />
+        </div>
+      </div>
+    )
+  }
+}
+
+// 自定义样式
+export const CustomStyles: Story = {
+  args: {
+    accordionProps: {
+      style: {
+        backgroundColor: 'rgba(255, 193, 7, 0.1)',
+        borderColor: 'var(--color-warning)'
+      }
+    },
+    accordionItemProps: {
+      title: (
+        <div className="flex items-center gap-2">
+          <AlertTriangle className="text-warning" size={16} />
+          <span>警告面板</span>
+        </div>
+      )
+    },
+    children: (
+      <div className="p-4 bg-warning-50 dark:bg-warning-900/20">
+        <p className="text-warning-800 dark:text-warning-200">这是一个带有自定义样式的警告面板。</p>
+      </div>
+    )
+  }
+}
+
+// 原生 HeroUI Accordion 多面板受控模式
+export const NativeAccordionControlled: Story = {
+  render: function NativeAccordionControlled() {
+    const [activeKeys, setActiveKeys] = useState<Set<string>>(new Set(['1']))
+
+    return (
+      <div className="space-y-4">
+        <div className="flex gap-2">
+          <Button size="sm" onPress={() => setActiveKeys(new Set(['1', '2', '3']))} color="primary">
+            全部展开
+          </Button>
+          <Button size="sm" onPress={() => setActiveKeys(new Set())} color="default">
+            全部收起
+          </Button>
+          <Button size="sm" onPress={() => setActiveKeys(new Set(['2']))} color="default">
+            只展开第二个
+          </Button>
+        </div>
+        <Accordion
+          selectedKeys={activeKeys}
+          onSelectionChange={(keys) => {
+            if (keys !== 'all') {
+              setActiveKeys(keys as Set<string>)
+            }
+          }}>
+          <AccordionItem key="1" title="受控面板 1">
+            <div className="p-4">
+              <p>第一个面板的内容</p>
+            </div>
+          </AccordionItem>
+          <AccordionItem key="2" title="受控面板 2">
+            <div className="p-4">
+              <p>第二个面板的内容</p>
+            </div>
+          </AccordionItem>
+          <AccordionItem key="3" title="受控面板 3">
+            <div className="p-4">
+              <p>第三个面板的内容</p>
+            </div>
+          </AccordionItem>
+        </Accordion>
+        <div className="text-sm text-gray-600">
+          当前展开的面板：{activeKeys.size > 0 ? Array.from(activeKeys).join(', ') : '无'}
+        </div>
+      </div>
+    )
+  }
+}

packages/ui/stories/components/base/CustomTag.stories.tsx

@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from '@storybook/react-vite'
 import { AlertTriangleIcon, StarIcon } from 'lucide-react'
 import { action } from 'storybook/actions'
 
-import CustomTag from '../../../src/components/primitives/customTag'
+import CustomTag from '../../../src/components/base/CustomTag'
 
 const meta: Meta<typeof CustomTag> = {
   title: 'Base/CustomTag',

packages/ui/stories/components/base/DividerWithText.stories.tsx

@@ -1,6 +1,6 @@
 import type { Meta, StoryObj } from '@storybook/react'
 
-import DividerWithText from '../../../src/components/primitives/dividerWithText'
+import DividerWithText from '../../../src/components/base/DividerWithText'
 
 const meta: Meta<typeof DividerWithText> = {
   title: 'Base/DividerWithText',