🐛 fix: detect and handle migration tag mismatches

When a migration version exists but with a different tag (e.g., local
migration replaced by upstream), the system now:

- Detects the tag mismatch instead of silently skipping
- Logs a warning about the mismatch
- Re-applies the correct migration
- Uses upsert to update the migration record

This fixes issues where schema changes are skipped because a different
migration with the same version number was previously applied.

.github/CODEOWNERS

@@ -3,3 +3,4 @@
 /src/main/services/ConfigManager.ts @0xfullex
 /packages/shared/IpcChannel.ts @0xfullex
 /src/main/ipc.ts @0xfullex
+/app-upgrade-config.json @kangfenmao

.github/workflows/auto-i18n.yml

@@ -1,4 +1,4 @@
-name: Auto I18N
+name: Auto I18N Weekly
 
 env:
   TRANSLATION_API_KEY: ${{ secrets.TRANSLATE_API_KEY }}
@@ -7,14 +7,15 @@ env:
   TRANSLATION_BASE_LOCALE: ${{ vars.AUTO_I18N_BASE_LOCALE || 'en-us'}}
 
 on:
-  pull_request:
-    types: [opened, synchronize, reopened]
+  schedule:
+    # Runs at 00:00 UTC every Sunday.
+    # This corresponds to 08:00 AM UTC+8 (Beijing time) every Sunday.
+    - cron: "0 0 * * 0"
   workflow_dispatch:
 
 jobs:
   auto-i18n:
     runs-on: ubuntu-latest
-    if: github.event_name == 'workflow_dispatch' || github.event.pull_request.head.repo.full_name == 'CherryHQ/cherry-studio'
     name: Auto I18N
     permissions:
       contents: write
@@ -24,45 +25,69 @@ jobs:
       - name: 🐈‍⬛ Checkout
         uses: actions/checkout@v5
         with:
-          ref: ${{ github.event.pull_request.head.ref }}
+          fetch-depth: 0
 
       - name: 📦 Setting Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 20
-          package-manager-cache: false
+          node-version: 22
 
-      - name: 📦 Install dependencies in isolated directory
+      - name: 📦 Install corepack
+        run: corepack enable && corepack prepare yarn@4.9.1 --activate
+
+      - name: 📂 Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+
+      - name: 💾 Cache yarn dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ${{ steps.yarn-cache-dir-path.outputs.dir }}
+            node_modules
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: 📦 Install dependencies
         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
-          npm install --no-package-lock
-
-          # 设置 NODE_PATH 让项目能找到这些依赖
-          echo "NODE_PATH=/tmp/translation-deps/node_modules" >> $GITHUB_ENV
+          yarn install
 
       - name: 🏃‍♀️ Translate
-        run: npx tsx scripts/sync-i18n.ts && npx tsx scripts/auto-translate-i18n.ts
+        run: yarn sync:i18n && yarn auto:i18n
 
       - 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/
+        run: yarn format
 
-      - name: 🔄 Commit changes
+      - name: 🔍 Check for changes
+        id: git_status
         run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-          git add .
+          # Check if there are any uncommitted changes
           git reset -- package.json yarn.lock  # 不提交 package.json 和 yarn.lock 的更改
-          if git diff --cached --quiet; then
-            echo "No changes to commit"
-          else
-            git commit -m "fix(i18n): Auto update translations for PR #${{ github.event.pull_request.number }}"
-          fi
+          git diff --exit-code --quiet || echo "::set-output name=has_changes::true"
+          git status --porcelain
 
-      - name: 🚀 Push changes
-        uses: ad-m/github-push-action@master
+      - name: 📅 Set current date for PR title
+        id: set_date
+        run: echo "CURRENT_DATE=$(date +'%b %d, %Y')" >> $GITHUB_ENV # e.g., "Jun 06, 2024"
+
+      - name: 🚀 Create Pull Request if changes exist
+        if: steps.git_status.outputs.has_changes == 'true'
+        uses: peter-evans/create-pull-request@v6
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.event.pull_request.head.ref }}
+          token: ${{ secrets.GITHUB_TOKEN }} # Use the built-in GITHUB_TOKEN for bot actions
+          commit-message: "feat(bot): Weekly automated script run"
+          title: "🤖 Weekly Auto I18N Sync: ${{ env.CURRENT_DATE }}"
+          body: |
+            This PR includes changes generated by the weekly auto i18n.
+            Review the changes before merging.
+
+            ---
+            _Generated by the automated weekly workflow_
+          branch: "auto-i18n-weekly-${{ github.run_id }}" # Unique branch name
+          base: "main" # Or 'develop', set your base branch
+          delete-branch: true # Delete the branch after merging or closing the PR
+
+      - name: 📢 Notify if no changes
+        if: steps.git_status.outputs.has_changes != 'true'
+        run: echo "Bot script ran, but no changes were detected. No PR created."

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

@@ -5,7 +5,7 @@ on:
     types: [opened]
   schedule:
     # Run every day at 8:30 Beijing Time (00:30 UTC)
-    - cron: '30 0 * * *'
+    - cron: "30 0 * * *"
   workflow_dispatch:
 
 jobs:
@@ -56,7 +56,7 @@ jobs:
         if: steps.check_time.outputs.should_delay == 'false'
         uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: 22
 
       - name: Process issue with Claude
         if: steps.check_time.outputs.should_delay == 'false'
@@ -123,7 +123,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: 22
 
       - name: Process pending issues with Claude
         uses: anthropics/claude-code-action@main

.github/workflows/nightly-build.yml

@@ -3,7 +3,7 @@ name: Nightly Build
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 17 * * *' # 1:00 BJ Time
+    - cron: "0 17 * * *" # 1:00 BJ Time
 
 permissions:
   contents: write
@@ -58,7 +58,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 22
 
       - name: macos-latest dependencies fix
         if: matrix.os == 'macos-latest'
@@ -66,7 +66,7 @@ jobs:
           brew install python-setuptools
 
       - name: Install corepack
-        run: corepack enable && corepack prepare yarn@4.6.0 --activate
+        run: corepack enable && corepack prepare yarn@4.9.1 --activate
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path

.github/workflows/pr-ci.yml

@@ -26,10 +26,10 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 22
 
       - name: Install corepack
-        run: corepack enable && corepack prepare yarn@4.6.0 --activate
+        run: corepack enable && corepack prepare yarn@4.9.1 --activate
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path

.github/workflows/release.yml

@@ -4,9 +4,9 @@ on:
   workflow_dispatch:
     inputs:
       tag:
-        description: 'Release tag (e.g. v1.0.0)'
+        description: "Release tag (e.g. v1.0.0)"
         required: true
-        default: 'v1.0.0'
+        default: "v1.0.0"
   push:
     tags:
       - v*.*.*
@@ -49,7 +49,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 22
 
       - name: macos-latest dependencies fix
         if: matrix.os == 'macos-latest'
@@ -57,7 +57,7 @@ jobs:
           brew install python-setuptools
 
       - name: Install corepack
-        run: corepack enable && corepack prepare yarn@4.6.0 --activate
+        run: corepack enable && corepack prepare yarn@4.9.1 --activate
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
@@ -127,5 +127,5 @@ jobs:
           allowUpdates: true
           makeLatest: false
           tag: ${{ steps.get-tag.outputs.tag }}
-          artifacts: 'dist/*.exe,dist/*.zip,dist/*.dmg,dist/*.AppImage,dist/*.snap,dist/*.deb,dist/*.rpm,dist/*.tar.gz,dist/latest*.yml,dist/rc*.yml,dist/beta*.yml,dist/*.blockmap'
+          artifacts: "dist/*.exe,dist/*.zip,dist/*.dmg,dist/*.AppImage,dist/*.snap,dist/*.deb,dist/*.rpm,dist/*.tar.gz,dist/latest*.yml,dist/rc*.yml,dist/beta*.yml,dist/*.blockmap"
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/update-app-upgrade-config.yml

@@ -0,0 +1,212 @@
+name: Update App Upgrade Config
+
+on:
+  release:
+    types:
+      - released
+      - prereleased
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: "Release tag (e.g., v1.2.3)"
+        required: true
+        type: string
+      is_prerelease:
+        description: "Mark the tag as a prerelease when running manually"
+        required: false
+        default: false
+        type: boolean
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  propose-update:
+    runs-on: ubuntu-latest
+    if: github.event_name == 'workflow_dispatch' || (github.event_name == 'release' && github.event.release.draft == false)
+
+    steps:
+      - name: Check if should proceed
+        id: check
+        run: |
+          EVENT="${{ github.event_name }}"
+
+          if [ "$EVENT" = "workflow_dispatch" ]; then
+            TAG="${{ github.event.inputs.tag }}"
+          else
+            TAG="${{ github.event.release.tag_name }}"
+          fi
+
+          latest_tag=$(
+            curl -L \
+              -H "Accept: application/vnd.github+json" \
+              -H "Authorization: Bearer ${{ github.token }}" \
+              -H "X-GitHub-Api-Version: 2022-11-28" \
+              https://api.github.com/repos/${{ github.repository }}/releases/latest \
+              | jq -r '.tag_name'
+          )
+
+          if [ "$EVENT" = "workflow_dispatch" ]; then
+            MANUAL_IS_PRERELEASE="${{ github.event.inputs.is_prerelease }}"
+            if [ -z "$MANUAL_IS_PRERELEASE" ]; then
+              MANUAL_IS_PRERELEASE="false"
+            fi
+            if [ "$MANUAL_IS_PRERELEASE" = "true" ]; then
+              if ! echo "$TAG" | grep -E '(-beta([.-][0-9]+)?|-rc([.-][0-9]+)?)' >/dev/null; then
+                echo "Manual prerelease flag set but tag $TAG lacks beta/rc suffix. Skipping." >&2
+                echo "should_run=false" >> "$GITHUB_OUTPUT"
+                echo "is_prerelease=false" >> "$GITHUB_OUTPUT"
+                echo "latest_tag=$latest_tag" >> "$GITHUB_OUTPUT"
+                exit 0
+              fi
+            fi
+            echo "should_run=true" >> "$GITHUB_OUTPUT"
+            echo "is_prerelease=$MANUAL_IS_PRERELEASE" >> "$GITHUB_OUTPUT"
+            echo "latest_tag=$latest_tag" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+
+          IS_PRERELEASE="${{ github.event.release.prerelease }}"
+
+          if [ "$IS_PRERELEASE" = "true" ]; then
+            if ! echo "$TAG" | grep -E '(-beta([.-][0-9]+)?|-rc([.-][0-9]+)?)' >/dev/null; then
+              echo "Release marked as prerelease but tag $TAG lacks beta/rc suffix. Skipping." >&2
+              echo "should_run=false" >> "$GITHUB_OUTPUT"
+              echo "is_prerelease=false" >> "$GITHUB_OUTPUT"
+              echo "latest_tag=$latest_tag" >> "$GITHUB_OUTPUT"
+              exit 0
+            fi
+            echo "should_run=true" >> "$GITHUB_OUTPUT"
+            echo "is_prerelease=true" >> "$GITHUB_OUTPUT"
+            echo "latest_tag=$latest_tag" >> "$GITHUB_OUTPUT"
+            echo "Release is prerelease, proceeding"
+            exit 0
+          fi
+
+          if [[ "${latest_tag}" == "$TAG" ]]; then
+            echo "should_run=true" >> "$GITHUB_OUTPUT"
+            echo "is_prerelease=false" >> "$GITHUB_OUTPUT"
+            echo "latest_tag=$latest_tag" >> "$GITHUB_OUTPUT"
+            echo "Release is latest, proceeding"
+          else
+            echo "should_run=false" >> "$GITHUB_OUTPUT"
+            echo "is_prerelease=false" >> "$GITHUB_OUTPUT"
+            echo "latest_tag=$latest_tag" >> "$GITHUB_OUTPUT"
+            echo "Release is neither prerelease nor latest, skipping"
+          fi
+
+      - name: Prepare metadata
+        id: meta
+        if: steps.check.outputs.should_run == 'true'
+        run: |
+          EVENT="${{ github.event_name }}"
+          LATEST_TAG="${{ steps.check.outputs.latest_tag }}"
+          if [ "$EVENT" = "release" ]; then
+            TAG="${{ github.event.release.tag_name }}"
+            PRE="${{ github.event.release.prerelease }}"
+
+            if [ -n "$LATEST_TAG" ] && [ "$LATEST_TAG" = "$TAG" ]; then
+              LATEST="true"
+            else
+              LATEST="false"
+            fi
+            TRIGGER="release"
+          else
+            TAG="${{ github.event.inputs.tag }}"
+            PRE="${{ github.event.inputs.is_prerelease }}"
+            if [ -z "$PRE" ]; then
+              PRE="false"
+            fi
+            if [ -n "$LATEST_TAG" ] && [ "$LATEST_TAG" = "$TAG" ] && [ "$PRE" != "true" ]; then
+              LATEST="true"
+            else
+              LATEST="false"
+            fi
+            TRIGGER="manual"
+          fi
+
+          SAFE_TAG=$(echo "$TAG" | sed 's/[^A-Za-z0-9._-]/-/g')
+          echo "tag=$TAG" >> "$GITHUB_OUTPUT"
+          echo "safe_tag=$SAFE_TAG" >> "$GITHUB_OUTPUT"
+          echo "prerelease=$PRE" >> "$GITHUB_OUTPUT"
+          echo "latest=$LATEST" >> "$GITHUB_OUTPUT"
+          echo "trigger=$TRIGGER" >> "$GITHUB_OUTPUT"
+
+      - name: Checkout default branch
+        if: steps.check.outputs.should_run == 'true'
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ github.event.repository.default_branch }}
+          path: main
+          fetch-depth: 0
+
+      - name: Checkout x-files/app-upgrade-config branch
+        if: steps.check.outputs.should_run == 'true'
+        uses: actions/checkout@v5
+        with:
+          ref: x-files/app-upgrade-config
+          path: cs
+          fetch-depth: 0
+
+      - name: Setup Node.js
+        if: steps.check.outputs.should_run == 'true'
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
+      - name: Enable Corepack
+        if: steps.check.outputs.should_run == 'true'
+        run: corepack enable && corepack prepare yarn@4.9.1 --activate
+
+      - name: Install dependencies
+        if: steps.check.outputs.should_run == 'true'
+        working-directory: main
+        run: yarn install --immutable
+
+      - name: Update upgrade config
+        if: steps.check.outputs.should_run == 'true'
+        working-directory: main
+        env:
+          RELEASE_TAG: ${{ steps.meta.outputs.tag }}
+          IS_PRERELEASE: ${{ steps.check.outputs.is_prerelease }}
+        run: |
+          yarn tsx scripts/update-app-upgrade-config.ts \
+            --tag "$RELEASE_TAG" \
+            --config ../cs/app-upgrade-config.json \
+            --is-prerelease "$IS_PRERELEASE"
+
+      - name: Detect changes
+        if: steps.check.outputs.should_run == 'true'
+        id: diff
+        working-directory: cs
+        run: |
+          if git diff --quiet -- app-upgrade-config.json; then
+            echo "changed=false" >> "$GITHUB_OUTPUT"
+          else
+            echo "changed=true" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Create pull request
+        if: steps.check.outputs.should_run == 'true' && steps.diff.outputs.changed == 'true'
+        uses: peter-evans/create-pull-request@v7
+        with:
+          path: cs
+          base: x-files/app-upgrade-config
+          branch: chore/update-app-upgrade-config/${{ steps.meta.outputs.safe_tag }}
+          commit-message: "🤖 chore: sync app-upgrade-config for ${{ steps.meta.outputs.tag }}"
+          title: "chore: update app-upgrade-config for ${{ steps.meta.outputs.tag }}"
+          body: |
+            Automated update triggered by `${{ steps.meta.outputs.trigger }}`.
+
+            - Source tag: `${{ steps.meta.outputs.tag }}`
+            - Pre-release: `${{ steps.meta.outputs.prerelease }}`
+            - Latest: `${{ steps.meta.outputs.latest }}`
+            - Workflow run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          labels: |
+            automation
+            app-upgrade
+
+      - name: No changes detected
+        if: steps.check.outputs.should_run == 'true' && steps.diff.outputs.changed != 'true'
+        run: echo "No updates required for x-files/app-upgrade-config/app-upgrade-config.json"

.oxlintrc.json

@@ -22,7 +22,6 @@
     "eslint.config.mjs"
   ],
   "overrides": [
-    // set different env
     {
       "env": {
         "node": true
@@ -36,8 +35,7 @@
       "files": [
         "src/renderer/**/*.{ts,tsx}",
         "packages/aiCore/**",
-        "packages/extension-table-plus/**",
-        "resources/js/**"
+        "packages/extension-table-plus/**"
       ]
     },
     {
@@ -53,76 +51,24 @@
         "node": true
       },
       "files": ["src/preload/**"]
+    },
+    {
+      "files": ["packages/ai-sdk-provider/**"],
+      "globals": {
+        "fetch": "readonly"
+      }
     }
   ],
-  // We don't use the React plugin here because its behavior differs slightly from that of ESLint's React plugin.
   "plugins": ["unicorn", "typescript", "oxc", "import"],
   "rules": {
-    "constructor-super": "error",
-    "for-direction": "error",
-    "getter-return": "error",
     "no-array-constructor": "off",
-    // "import/no-cycle": "error", // tons of error, bro
-    "no-async-promise-executor": "error",
     "no-caller": "warn",
-    "no-case-declarations": "error",
-    "no-class-assign": "error",
-    "no-compare-neg-zero": "error",
-    "no-cond-assign": "error",
-    "no-const-assign": "error",
-    "no-constant-binary-expression": "error",
-    "no-constant-condition": "error",
-    "no-control-regex": "error",
-    "no-debugger": "error",
-    "no-delete-var": "error",
-    "no-dupe-args": "error",
-    "no-dupe-class-members": "error",
-    "no-dupe-else-if": "error",
-    "no-dupe-keys": "error",
-    "no-duplicate-case": "error",
-    "no-empty": "error",
-    "no-empty-character-class": "error",
-    "no-empty-pattern": "error",
-    "no-empty-static-block": "error",
     "no-eval": "warn",
-    "no-ex-assign": "error",
-    "no-extra-boolean-cast": "error",
     "no-fallthrough": "warn",
-    "no-func-assign": "error",
-    "no-global-assign": "error",
-    "no-import-assign": "error",
-    "no-invalid-regexp": "error",
-    "no-irregular-whitespace": "error",
-    "no-loss-of-precision": "error",
-    "no-misleading-character-class": "error",
-    "no-new-native-nonconstructor": "error",
-    "no-nonoctal-decimal-escape": "error",
-    "no-obj-calls": "error",
-    "no-octal": "error",
-    "no-prototype-builtins": "error",
-    "no-redeclare": "error",
-    "no-regex-spaces": "error",
-    "no-self-assign": "error",
-    "no-setter-return": "error",
-    "no-shadow-restricted-names": "error",
-    "no-sparse-arrays": "error",
-    "no-this-before-super": "error",
     "no-unassigned-vars": "warn",
-    "no-undef": "error",
-    "no-unexpected-multiline": "error",
-    "no-unreachable": "error",
-    "no-unsafe-finally": "error",
-    "no-unsafe-negation": "error",
-    "no-unsafe-optional-chaining": "error",
-    "no-unused-expressions": "off", // this rule disallow us to use expression to call function, like `condition && fn()`
-    "no-unused-labels": "error",
-    "no-unused-private-class-members": "error",
+    "no-unused-expressions": "off",
     "no-unused-vars": ["warn", { "caughtErrors": "none" }],
-    "no-useless-backreference": "error",
-    "no-useless-catch": "error",
-    "no-useless-escape": "error",
     "no-useless-rename": "warn",
-    "no-with": "error",
     "oxc/bad-array-method-on-arguments": "warn",
     "oxc/bad-char-at-comparison": "warn",
     "oxc/bad-comparison-sequence": "warn",
@@ -134,19 +80,17 @@
     "oxc/erasing-op": "warn",
     "oxc/missing-throw": "warn",
     "oxc/number-arg-out-of-range": "warn",
-    "oxc/only-used-in-recursion": "off", // manually off bacause of existing warning. may turn it on in the future
+    "oxc/only-used-in-recursion": "off",
     "oxc/uninvoked-array-callback": "warn",
-    "require-yield": "error",
     "typescript/await-thenable": "warn",
-    // "typescript/ban-ts-comment": "error",
-    "typescript/no-array-constructor": "error",
     "typescript/consistent-type-imports": "error",
+    "typescript/no-array-constructor": "error",
     "typescript/no-array-delete": "warn",
     "typescript/no-base-to-string": "warn",
     "typescript/no-duplicate-enum-values": "error",
     "typescript/no-duplicate-type-constituents": "warn",
     "typescript/no-empty-object-type": "off",
-    "typescript/no-explicit-any": "off", // not safe but too many errors
+    "typescript/no-explicit-any": "off",
     "typescript/no-extra-non-null-assertion": "error",
     "typescript/no-floating-promises": "warn",
     "typescript/no-for-in-array": "warn",
@@ -155,7 +99,7 @@
     "typescript/no-misused-new": "error",
     "typescript/no-misused-spread": "warn",
     "typescript/no-namespace": "error",
-    "typescript/no-non-null-asserted-optional-chain": "off", // it's off now. but may turn it on.
+    "typescript/no-non-null-asserted-optional-chain": "off",
     "typescript/no-redundant-type-constituents": "warn",
     "typescript/no-require-imports": "off",
     "typescript/no-this-alias": "error",
@@ -173,20 +117,18 @@
     "typescript/triple-slash-reference": "error",
     "typescript/unbound-method": "warn",
     "unicorn/no-await-in-promise-methods": "warn",
-    "unicorn/no-empty-file": "off", // manually off bacause of existing warning. may turn it on in the future
+    "unicorn/no-empty-file": "off",
     "unicorn/no-invalid-fetch-options": "warn",
     "unicorn/no-invalid-remove-event-listener": "warn",
-    "unicorn/no-new-array": "off", // manually off bacause of existing warning. may turn it on in the future
+    "unicorn/no-new-array": "off",
     "unicorn/no-single-promise-in-promise-methods": "warn",
-    "unicorn/no-thenable": "off", // manually off bacause of existing warning. may turn it on in the future
+    "unicorn/no-thenable": "off",
     "unicorn/no-unnecessary-await": "warn",
     "unicorn/no-useless-fallback-in-spread": "warn",
     "unicorn/no-useless-length-check": "warn",
-    "unicorn/no-useless-spread": "off", // manually off bacause of existing warning. may turn it on in the future
+    "unicorn/no-useless-spread": "off",
     "unicorn/prefer-set-size": "warn",
-    "unicorn/prefer-string-starts-ends-with": "warn",
-    "use-isnan": "error",
-    "valid-typeof": "error"
+    "unicorn/prefer-string-starts-ends-with": "warn"
   },
   "settings": {
     "jsdoc": {

.yarn/patches/@ai-sdk-google-npm-2.0.40-47e0eeee83.patch

@@ -1,8 +1,8 @@
 diff --git a/dist/index.js b/dist/index.js
-index 4cc66d83af1cef39f6447dc62e680251e05ddf9f..eb9819cb674c1808845ceb29936196c4bb355172 100644
+index dc7b74ba55337c491cdf1ab3e39ca68cc4187884..ace8c90591288e42c2957e93c9bf7984f1b22444 100644
 --- a/dist/index.js
 +++ b/dist/index.js
-@@ -471,7 +471,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
+@@ -472,7 +472,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
  
  // src/get-model-path.ts
  function getModelPath(modelId) {
@@ -12,10 +12,10 @@ index 4cc66d83af1cef39f6447dc62e680251e05ddf9f..eb9819cb674c1808845ceb29936196c4
  
  // src/google-generative-ai-options.ts
 diff --git a/dist/index.mjs b/dist/index.mjs
-index a032505ec54e132dc386dde001dc51f710f84c83..5efada51b9a8b56e3f01b35e734908ebe3c37043 100644
+index 8390439c38cb7eaeb52080862cd6f4c58509e67c..a7647f2e11700dff7e1c8d4ae8f99d3637010733 100644
 --- a/dist/index.mjs
 +++ b/dist/index.mjs
-@@ -477,7 +477,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
+@@ -478,7 +478,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
  
  // src/get-model-path.ts
  function getModelPath(modelId) {

.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/@ai-sdk-openai-compatible-npm-1.0.27-06f74278cf.patch

@@ -0,0 +1,140 @@
+diff --git a/dist/index.js b/dist/index.js
+index 73045a7d38faafdc7f7d2cd79d7ff0e2b031056b..8d948c9ac4ea4b474db9ef3c5491961e7fcf9a07 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -421,6 +421,17 @@ var OpenAICompatibleChatLanguageModel = class {
+         text: reasoning
+       });
+     }
++    if (choice.message.images) {
++      for (const image of choice.message.images) {
++        const match1 = image.image_url.url.match(/^data:([^;]+)/)
++        const match2 = image.image_url.url.match(/^data:[^;]*;base64,(.+)$/);
++        content.push({
++          type: 'file',
++          mediaType: match1 ? (match1[1] ?? 'image/jpeg') : 'image/jpeg',
++          data: match2 ? match2[1] : image.image_url.url,
++        });
++      }
++    }
+     if (choice.message.tool_calls != null) {
+       for (const toolCall of choice.message.tool_calls) {
+         content.push({
+@@ -598,6 +609,17 @@ var OpenAICompatibleChatLanguageModel = class {
+                 delta: delta.content
+               });
+             }
++            if (delta.images) {
++              for (const image of delta.images) {
++                const match1 = image.image_url.url.match(/^data:([^;]+)/)
++                const match2 = image.image_url.url.match(/^data:[^;]*;base64,(.+)$/);
++                controller.enqueue({
++                  type: 'file',
++                  mediaType: match1 ? (match1[1] ?? 'image/jpeg') : 'image/jpeg',
++                  data: match2 ? match2[1] : image.image_url.url,
++                });
++              }
++            }
+             if (delta.tool_calls != null) {
+               for (const toolCallDelta of delta.tool_calls) {
+                 const index = toolCallDelta.index;
+@@ -765,6 +787,14 @@ var OpenAICompatibleChatResponseSchema = import_v43.z.object({
+               arguments: import_v43.z.string()
+             })
+           })
++        ).nullish(),
++        images: import_v43.z.array(
++          import_v43.z.object({
++            type: import_v43.z.literal('image_url'),
++            image_url: import_v43.z.object({
++              url: import_v43.z.string(),
++            })
++          })
+         ).nullish()
+       }),
+       finish_reason: import_v43.z.string().nullish()
+@@ -795,6 +825,14 @@ var createOpenAICompatibleChatChunkSchema = (errorSchema) => import_v43.z.union(
+                 arguments: import_v43.z.string().nullish()
+               })
+             })
++          ).nullish(),
++          images: import_v43.z.array(
++            import_v43.z.object({
++              type: import_v43.z.literal('image_url'),
++              image_url: import_v43.z.object({
++                url: import_v43.z.string(),
++              })
++            })
+           ).nullish()
+         }).nullish(),
+         finish_reason: import_v43.z.string().nullish()
+diff --git a/dist/index.mjs b/dist/index.mjs
+index 1c2b9560bbfbfe10cb01af080aeeed4ff59db29c..2c8ddc4fc9bfc5e7e06cfca105d197a08864c427 100644
+--- a/dist/index.mjs
++++ b/dist/index.mjs
+@@ -405,6 +405,17 @@ var OpenAICompatibleChatLanguageModel = class {
+         text: reasoning
+       });
+     }
++    if (choice.message.images) {
++      for (const image of choice.message.images) {
++        const match1 = image.image_url.url.match(/^data:([^;]+)/)
++        const match2 = image.image_url.url.match(/^data:[^;]*;base64,(.+)$/);
++        content.push({
++          type: 'file',
++          mediaType: match1 ? (match1[1] ?? 'image/jpeg') : 'image/jpeg',
++          data: match2 ? match2[1] : image.image_url.url,
++        });
++      }
++    }
+     if (choice.message.tool_calls != null) {
+       for (const toolCall of choice.message.tool_calls) {
+         content.push({
+@@ -582,6 +593,17 @@ var OpenAICompatibleChatLanguageModel = class {
+                 delta: delta.content
+               });
+             }
++            if (delta.images) {
++              for (const image of delta.images) {
++                const match1 = image.image_url.url.match(/^data:([^;]+)/)
++                const match2 = image.image_url.url.match(/^data:[^;]*;base64,(.+)$/);
++                controller.enqueue({
++                  type: 'file',
++                  mediaType: match1 ? (match1[1] ?? 'image/jpeg') : 'image/jpeg',
++                  data: match2 ? match2[1] : image.image_url.url,
++                });
++              }
++            }
+             if (delta.tool_calls != null) {
+               for (const toolCallDelta of delta.tool_calls) {
+                 const index = toolCallDelta.index;
+@@ -749,6 +771,14 @@ var OpenAICompatibleChatResponseSchema = z3.object({
+               arguments: z3.string()
+             })
+           })
++        ).nullish(),
++        images: z3.array(
++          z3.object({
++            type: z3.literal('image_url'),
++            image_url: z3.object({
++              url: z3.string(),
++            })
++          })
+         ).nullish()
+       }),
+       finish_reason: z3.string().nullish()
+@@ -779,6 +809,14 @@ var createOpenAICompatibleChatChunkSchema = (errorSchema) => z3.union([
+                 arguments: z3.string().nullish()
+               })
+             })
++          ).nullish(),
++          images: z3.array(
++            z3.object({
++              type: z3.literal('image_url'),
++              image_url: z3.object({
++                url: z3.string(),
++              })
++            })
+           ).nullish()
+         }).nullish(),
+         finish_reason: z3.string().nullish()

.yarn/patches/@ai-sdk-openai-npm-2.0.71-a88ef00525.patch

@@ -1,5 +1,5 @@
 diff --git a/dist/index.js b/dist/index.js
-index cc6652c4e7f32878a64a2614115bf7eeb3b7c890..76e989017549c89b45d633525efb1f318026d9b2 100644
+index 7481f3b3511078068d87d03855b568b20bb86971..8ac5ec28d2f7ad1b3b0d3f8da945c75674e59637 100644
 --- a/dist/index.js
 +++ b/dist/index.js
 @@ -274,6 +274,7 @@ var openaiChatResponseSchema = (0, import_provider_utils3.lazyValidator)(
@@ -18,30 +18,29 @@ index cc6652c4e7f32878a64a2614115bf7eeb3b7c890..76e989017549c89b45d633525efb1f31
                tool_calls: import_v42.z.array(
                  import_v42.z.object({
                    index: import_v42.z.number(),
-@@ -785,6 +787,14 @@ var OpenAIChatLanguageModel = class {
+@@ -795,6 +797,13 @@ var OpenAIChatLanguageModel = class {
      if (text != null && text.length > 0) {
        content.push({ type: "text", text });
      }
-+    const reasoning =
-+      choice.message.reasoning_content;
++    const reasoning = choice.message.reasoning_content;
 +    if (reasoning != null && reasoning.length > 0) {
 +      content.push({
 +        type: 'reasoning',
-+        text: reasoning,
++        text: reasoning
 +      });
 +    }
      for (const toolCall of (_a = choice.message.tool_calls) != null ? _a : []) {
        content.push({
          type: "tool-call",
-@@ -866,6 +876,7 @@ var OpenAIChatLanguageModel = class {
+@@ -876,6 +885,7 @@ var OpenAIChatLanguageModel = class {
      };
-     let isFirstChunk = true;
+     let metadataExtracted = false;
      let isActiveText = false;
 +    let isActiveReasoning = false;
      const providerMetadata = { openai: {} };
      return {
        stream: response.pipeThrough(
-@@ -920,6 +931,22 @@ var OpenAIChatLanguageModel = class {
+@@ -933,6 +943,21 @@ var OpenAIChatLanguageModel = class {
                return;
              }
              const delta = choice.delta;
@@ -54,7 +53,6 @@ index cc6652c4e7f32878a64a2614115bf7eeb3b7c890..76e989017549c89b45d633525efb1f31
 +                });
 +                isActiveReasoning = true;
 +              }
-+
 +              controller.enqueue({
 +                type: 'reasoning-delta',
 +                id: 'reasoning-0',
@@ -64,7 +62,7 @@ index cc6652c4e7f32878a64a2614115bf7eeb3b7c890..76e989017549c89b45d633525efb1f31
              if (delta.content != null) {
                if (!isActiveText) {
                  controller.enqueue({ type: "text-start", id: "0" });
-@@ -1032,6 +1059,9 @@ var OpenAIChatLanguageModel = class {
+@@ -1045,6 +1070,9 @@ var OpenAIChatLanguageModel = class {
              }
            },
            flush(controller) {

.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.30-b50a299674.patch

@@ -1,5 +1,5 @@
 diff --git a/sdk.mjs b/sdk.mjs
-index 10162e5b1624f8ce667768943347a6e41089ad2f..32568ae08946590e382270c88d85fba81187568e 100755
+index 8cc6aaf0b25bcdf3c579ec95cde12d419fcb2a71..3b3b8beaea5ad2bbac26a15f792058306d0b059f 100755
 --- a/sdk.mjs
 +++ b/sdk.mjs
 @@ -6213,7 +6213,7 @@ function createAbortController(maxListeners = DEFAULT_MAX_LISTENERS) {
@@ -11,7 +11,7 @@ index 10162e5b1624f8ce667768943347a6e41089ad2f..32568ae08946590e382270c88d85fba8
  import { createInterface } from "readline";
  
  // ../src/utils/fsOperations.ts
-@@ -6487,14 +6487,11 @@ class ProcessTransport {
+@@ -6505,14 +6505,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);
        }

.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch

@@ -1,276 +0,0 @@
-diff --git a/out/macPackager.js b/out/macPackager.js
-index 852f6c4d16f86a7bb8a78bf1ed5a14647a279aa1..60e7f5f16a844541eb1909b215fcda1811e924b8 100644
---- a/out/macPackager.js
-+++ b/out/macPackager.js
-@@ -423,7 +423,7 @@ class MacPackager extends platformPackager_1.PlatformPackager {
-         }
-         appPlist.CFBundleName = appInfo.productName;
-         appPlist.CFBundleDisplayName = appInfo.productName;
--        const minimumSystemVersion = this.platformSpecificBuildOptions.minimumSystemVersion;
-+        const minimumSystemVersion = this.platformSpecificBuildOptions.LSMinimumSystemVersion;
-         if (minimumSystemVersion != null) {
-             appPlist.LSMinimumSystemVersion = minimumSystemVersion;
-         }
-diff --git a/out/publish/updateInfoBuilder.js b/out/publish/updateInfoBuilder.js
-index 7924c5b47d01f8dfccccb8f46658015fa66da1f7..1a1588923c3939ae1297b87931ba83f0ebc052d8 100644
---- a/out/publish/updateInfoBuilder.js
-+++ b/out/publish/updateInfoBuilder.js
-@@ -133,6 +133,7 @@ async function createUpdateInfo(version, event, releaseInfo) {
-     const customUpdateInfo = event.updateInfo;
-     const url = path.basename(event.file);
-     const sha512 = (customUpdateInfo == null ? null : customUpdateInfo.sha512) || (await (0, hash_1.hashFile)(event.file));
-+    const minimumSystemVersion = customUpdateInfo == null ? null : customUpdateInfo.minimumSystemVersion;
-     const files = [{ url, sha512 }];
-     const result = {
-         // @ts-ignore
-@@ -143,9 +144,13 @@ async function createUpdateInfo(version, event, releaseInfo) {
-         path: url /* backward compatibility, electron-updater 1.x - electron-updater 2.15.0 */,
-         // @ts-ignore
-         sha512 /* backward compatibility, electron-updater 1.x - electron-updater 2.15.0 */,
-+        minimumSystemVersion,
-         ...releaseInfo,
-     };
-     if (customUpdateInfo != null) {
-+        if (customUpdateInfo.minimumSystemVersion) {
-+            delete customUpdateInfo.minimumSystemVersion;
-+        }
-         // file info or nsis web installer packages info
-         Object.assign("sha512" in customUpdateInfo ? files[0] : result, customUpdateInfo);
-     }
-diff --git a/out/targets/ArchiveTarget.js b/out/targets/ArchiveTarget.js
-index e1f52a5fa86fff6643b2e57eaf2af318d541f865..47cc347f154a24b365e70ae5e1f6d309f3582ed0 100644
---- a/out/targets/ArchiveTarget.js
-+++ b/out/targets/ArchiveTarget.js
-@@ -69,6 +69,9 @@ class ArchiveTarget extends core_1.Target {
-                     }
-                 }
-             }
-+            if (updateInfo != null && this.packager.platformSpecificBuildOptions.minimumSystemVersion) {
-+                updateInfo.minimumSystemVersion = this.packager.platformSpecificBuildOptions.minimumSystemVersion;
-+            }
-             await packager.info.emitArtifactBuildCompleted({
-                 updateInfo,
-                 file: artifactPath,
-diff --git a/out/targets/nsis/NsisTarget.js b/out/targets/nsis/NsisTarget.js
-index e8bd7bb46c8a54b3f55cf3a853ef924195271e01..f956e9f3fe9eb903c78aef3502553b01de4b89b1 100644
---- a/out/targets/nsis/NsisTarget.js
-+++ b/out/targets/nsis/NsisTarget.js
-@@ -305,6 +305,9 @@ class NsisTarget extends core_1.Target {
-             if (updateInfo != null && isPerMachine && (oneClick || options.packElevateHelper)) {
-                 updateInfo.isAdminRightsRequired = true;
-             }
-+            if (updateInfo != null && this.packager.platformSpecificBuildOptions.minimumSystemVersion) {
-+                updateInfo.minimumSystemVersion = this.packager.platformSpecificBuildOptions.minimumSystemVersion;
-+            }
-             await packager.info.emitArtifactBuildCompleted({
-                 file: installerPath,
-                 updateInfo,
-diff --git a/out/util/yarn.js b/out/util/yarn.js
-index 1ee20f8b252a8f28d0c7b103789cf0a9a427aec1..c2878ec54d57da50bf14225e0c70c9c88664eb8a 100644
---- a/out/util/yarn.js
-+++ b/out/util/yarn.js
-@@ -140,6 +140,7 @@ async function rebuild(config, { appDir, projectDir }, options) {
-         arch,
-         platform,
-         buildFromSource,
-+        ignoreModules: config.excludeReBuildModules || undefined,
-         projectRootPath: projectDir,
-         mode: config.nativeRebuilder || "sequential",
-         disablePreGypCopy: true,
-diff --git a/scheme.json b/scheme.json
-index 433e2efc9cef156ff5444f0c4520362ed2ef9ea7..0167441bf928a92f59b5dbe70b2317a74dda74c9 100644
---- a/scheme.json
-+++ b/scheme.json
-@@ -1825,6 +1825,20 @@
-             "string"
-           ]
-         },
-+        "excludeReBuildModules": {
-+          "anyOf": [
-+            {
-+              "items": {
-+                "type": "string"
-+              },
-+              "type": "array"
-+            },
-+            {
-+              "type": "null"
-+            }
-+          ],
-+          "description": "The modules to exclude from the rebuild."
-+        },
-         "executableArgs": {
-           "anyOf": [
-             {
-@@ -1975,6 +1989,13 @@
-           ],
-           "description": "The mime types in addition to specified in the file associations. Use it if you don't want to register a new mime type, but reuse existing."
-         },
-+        "minimumSystemVersion": {
-+          "description": "The minimum os kernel version required to install the application.",
-+          "type": [
-+            "null",
-+            "string"
-+          ]
-+        },
-         "packageCategory": {
-           "description": "backward compatibility + to allow specify fpm-only category for all possible fpm targets in one place",
-           "type": [
-@@ -2327,6 +2348,13 @@
-     "MacConfiguration": {
-       "additionalProperties": false,
-       "properties": {
-+        "LSMinimumSystemVersion": {
-+          "description": "The minimum version of macOS required for the app to run. Corresponds to `LSMinimumSystemVersion`.",
-+          "type": [
-+            "null",
-+            "string"
-+          ]
-+        },
-         "additionalArguments": {
-           "anyOf": [
-             {
-@@ -2527,6 +2555,20 @@
-             "string"
-           ]
-         },
-+        "excludeReBuildModules": {
-+          "anyOf": [
-+            {
-+              "items": {
-+                "type": "string"
-+              },
-+              "type": "array"
-+            },
-+            {
-+              "type": "null"
-+            }
-+          ],
-+          "description": "The modules to exclude from the rebuild."
-+        },
-         "executableName": {
-           "description": "The executable name. Defaults to `productName`.",
-           "type": [
-@@ -2737,7 +2779,7 @@
-           "type": "boolean"
-         },
-         "minimumSystemVersion": {
--          "description": "The minimum version of macOS required for the app to run. Corresponds to `LSMinimumSystemVersion`.",
-+          "description": "The minimum os kernel version required to install the application.",
-           "type": [
-             "null",
-             "string"
-@@ -2959,6 +3001,13 @@
-     "MasConfiguration": {
-       "additionalProperties": false,
-       "properties": {
-+        "LSMinimumSystemVersion": {
-+          "description": "The minimum version of macOS required for the app to run. Corresponds to `LSMinimumSystemVersion`.",
-+          "type": [
-+            "null",
-+            "string"
-+          ]
-+        },
-         "additionalArguments": {
-           "anyOf": [
-             {
-@@ -3159,6 +3208,20 @@
-             "string"
-           ]
-         },
-+        "excludeReBuildModules": {
-+          "anyOf": [
-+            {
-+              "items": {
-+                "type": "string"
-+              },
-+              "type": "array"
-+            },
-+            {
-+              "type": "null"
-+            }
-+          ],
-+          "description": "The modules to exclude from the rebuild."
-+        },
-         "executableName": {
-           "description": "The executable name. Defaults to `productName`.",
-           "type": [
-@@ -3369,7 +3432,7 @@
-           "type": "boolean"
-         },
-         "minimumSystemVersion": {
--          "description": "The minimum version of macOS required for the app to run. Corresponds to `LSMinimumSystemVersion`.",
-+          "description": "The minimum os kernel version required to install the application.",
-           "type": [
-             "null",
-             "string"
-@@ -6381,6 +6444,20 @@
-             "string"
-           ]
-         },
-+        "excludeReBuildModules": {
-+          "anyOf": [
-+            {
-+              "items": {
-+                "type": "string"
-+              },
-+              "type": "array"
-+            },
-+            {
-+              "type": "null"
-+            }
-+          ],
-+          "description": "The modules to exclude from the rebuild."
-+        },
-         "executableName": {
-           "description": "The executable name. Defaults to `productName`.",
-           "type": [
-@@ -6507,6 +6584,13 @@
-             "string"
-           ]
-         },
-+        "minimumSystemVersion": {
-+          "description": "The minimum os kernel version required to install the application.",
-+          "type": [
-+            "null",
-+            "string"
-+          ]
-+        },
-         "protocols": {
-           "anyOf": [
-             {
-@@ -7153,6 +7237,20 @@
-         "string"
-       ]
-     },
-+    "excludeReBuildModules": {
-+      "anyOf": [
-+        {
-+          "items": {
-+            "type": "string"
-+          },
-+          "type": "array"
-+        },
-+        {
-+          "type": "null"
-+        }
-+      ],
-+      "description": "The modules to exclude from the rebuild."
-+    },
-     "executableName": {
-       "description": "The executable name. Defaults to `productName`.",
-       "type": [
-@@ -7376,6 +7474,13 @@
-       ],
-       "description": "MAS (Mac Application Store) development options (`mas-dev` target)."
-     },
-+    "minimumSystemVersion": {
-+      "description": "The minimum os kernel version required to install the application.",
-+      "type": [
-+        "null",
-+        "string"
-+      ]
-+    },
-     "msi": {
-       "anyOf": [
-         {

.yarn/patches/electron-updater-npm-6.7.0-47b11bb0d4.patch

@@ -0,0 +1,14 @@
+diff --git a/out/util.js b/out/util.js
+index 9294ffd6ca8f02c2e0f90c663e7e9cdc02c1ac37..f52107493e2995320ee4efd0eb2a8c9bf03291a2 100644
+--- a/out/util.js
++++ b/out/util.js
+@@ -23,7 +23,8 @@ function newUrlFromBase(pathname, baseUrl, addRandomQueryToAvoidCaching = false)
+         result.search = search;
+     }
+     else if (addRandomQueryToAvoidCaching) {
+-        result.search = `noCache=${Date.now().toString(32)}`;
++        // use no cache header instead
++        // result.search = `noCache=${Date.now().toString(32)}`;
+     }
+     return result;
+ }

CLAUDE.md

@@ -7,12 +7,10 @@ This file provides guidance to AI coding assistants when working with code in th
 - **Keep it clear**: Write code that is easy to read, maintain, and explain.
 - **Match the house style**: Reuse existing patterns, naming, and conventions.
 - **Search smart**: Prefer `ast-grep` for semantic queries; fall back to `rg`/`grep` when needed.
-- **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:`).
+- **Write conventional commits**: Commit small, focused changes using Conventional Commit messages (e.g., `feat:`, `fix:`, `refactor:`, `docs:`).
 
 ## Development Commands
 
@@ -41,7 +39,6 @@ This file provides guidance to AI coding assistants when working with code in th
 - **Services** (`src/main/services/`): MCPService, KnowledgeService, WindowService, etc.
 - **Build System**: Electron-Vite with experimental rolldown-vite, yarn workspaces.
 - **State Management**: Redux Toolkit (`src/renderer/src/store/`) for predictable state.
-- **UI Components**: HeroUI (`@heroui/*`) for all new UI elements.
 
 ### Logging
 ```typescript

README.md

@@ -82,7 +82,7 @@ Cherry Studio is a desktop client that supports multiple LLM providers, availabl
 1. **Diverse LLM Provider Support**:
 
 - ☁️ Major LLM Cloud Services: OpenAI, Gemini, Anthropic, and more
-- 🔗 AI Web Service Integration: Claude, Perplexity, Poe, and others
+- 🔗 AI Web Service Integration: Claude, Perplexity, [Poe](https://poe.com/), and others
 - 💻 Local Model Support with Ollama, LM Studio
 
 2. **AI Assistants & Conversations**:
@@ -238,10 +238,6 @@ The Enterprise Edition addresses core challenges in team collaboration by centra
 
 ## ✨ Online Demo
 
-> 🚧 **Public Beta Notice**
->
-> The Enterprise Edition is currently in its early public beta stage, and we are actively iterating and optimizing its features. We are aware that it may not be perfectly stable yet. If you encounter any issues or have valuable suggestions during your trial, we would be very grateful if you could contact us via email to provide feedback.
-
 **🔗 [Cherry Studio Enterprise](https://www.cherry-ai.com/enterprise)**
 
 ## Version Comparison
@@ -249,7 +245,7 @@ The Enterprise Edition addresses core challenges in team collaboration by centra
 | Feature           | Community Edition                          | Enterprise Edition                                                                                                                      |
 | :---------------- | :----------------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------- |
 | **Open Source**   | ✅ Yes                                      | ⭕️ Partially released to customers                                                                                                       |
-| **Cost**          | Free for Personal Use / Commercial License | Buyout / Subscription Fee                                                                                                               |
+| **Cost**          | [AGPL-3.0 License](https://github.com/CherryHQ/cherry-studio?tab=AGPL-3.0-1-ov-file) | 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                                                                                                          |
 
@@ -262,8 +258,12 @@ We believe the Enterprise Edition will become your team's AI productivity engine
 
 # 🔗 Related Projects
 
+- [new-api](https://github.com/QuantumNous/new-api): The next-generation LLM gateway and AI asset management system supports multiple languages.
+
 - [one-api](https://github.com/songquanpeng/one-api): LLM API management and distribution system supporting mainstream models like OpenAI, Azure, and Anthropic. Features a unified API interface, suitable for key management and secondary distribution.
 
+- [Poe](https://poe.com/): Poe gives you access to the best AI, all in one place. Explore GPT-5, Claude Opus 4.1, DeepSeek-R1, Veo 3, ElevenLabs, and millions of others.
+
 - [ublacklist](https://github.com/iorate/ublacklist): Blocks specific sites from appearing in Google search results
 
 # 🚀 Contributors

app-upgrade-config.json

@@ -0,0 +1,49 @@
+{
+  "lastUpdated": "2025-11-10T08:14:28Z",
+  "versions": {
+    "1.6.7": {
+      "metadata": {
+        "segmentId": "legacy-v1",
+        "segmentType": "legacy"
+      },
+      "minCompatibleVersion": "1.0.0",
+      "description": "Last stable v1.7.x release - required intermediate version for users below v1.7",
+      "channels": {
+        "latest": {
+          "version": "1.6.7",
+          "feedUrls": {
+            "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.6.7",
+            "gitcode": "https://releases.cherry-ai.com"
+          }
+        },
+        "rc": {
+          "version": "1.6.0-rc.5",
+          "feedUrls": {
+            "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.6.0-rc.5",
+            "gitcode": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.6.0-rc.5"
+          }
+        },
+        "beta": {
+          "version": "1.7.0-beta.3",
+          "feedUrls": {
+            "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.7.0-beta.3",
+            "gitcode": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.7.0-beta.3"
+          }
+        }
+      }
+    },
+    "2.0.0": {
+      "metadata": {
+        "segmentId": "gateway-v2",
+        "segmentType": "breaking"
+      },
+      "minCompatibleVersion": "1.7.0",
+      "description": "Major release v2.0 - required intermediate version for v2.x upgrades",
+      "channels": {
+        "latest": null,
+        "rc": null,
+        "beta": null
+      }
+    }
+  }
+}

biome.jsonc

@@ -14,7 +14,7 @@
       }
     },
     "enabled": true,
-    "includes": ["**/*.json", "!*.json", "!**/package.json"]
+    "includes": ["**/*.json", "!*.json", "!**/package.json", "!coverage/**"]
   },
   "css": {
     "formatter": {
@@ -23,7 +23,7 @@
   },
   "files": {
     "ignoreUnknown": false,
-    "includes": ["**", "!**/.claude/**"],
+    "includes": ["**", "!**/.claude/**", "!**/.vscode/**"],
     "maxSize": 2097152
   },
   "formatter": {

components.json

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

config/app-upgrade-segments.json

@@ -0,0 +1,81 @@
+{
+  "segments": [
+    {
+      "id": "legacy-v1",
+      "type": "legacy",
+      "match": {
+        "range": ">=1.0.0 <2.0.0"
+      },
+      "minCompatibleVersion": "1.0.0",
+      "description": "Last stable v1.7.x release - required intermediate version for users below v1.7",
+      "channelTemplates": {
+        "latest": {
+          "feedTemplates": {
+            "github": "https://github.com/CherryHQ/cherry-studio/releases/download/{{tag}}",
+            "gitcode": "https://releases.cherry-ai.com"
+          }
+        },
+        "rc": {
+          "feedTemplates": {
+            "github": "https://github.com/CherryHQ/cherry-studio/releases/download/{{tag}}",
+            "gitcode": "https://github.com/CherryHQ/cherry-studio/releases/download/{{tag}}"
+          }
+        },
+        "beta": {
+          "feedTemplates": {
+            "github": "https://github.com/CherryHQ/cherry-studio/releases/download/{{tag}}",
+            "gitcode": "https://github.com/CherryHQ/cherry-studio/releases/download/{{tag}}"
+          }
+        }
+      }
+    },
+    {
+      "id": "gateway-v2",
+      "type": "breaking",
+      "match": {
+        "exact": ["2.0.0"]
+      },
+      "lockedVersion": "2.0.0",
+      "minCompatibleVersion": "1.7.0",
+      "description": "Major release v2.0 - required intermediate version for v2.x upgrades",
+      "channelTemplates": {
+        "latest": {
+          "feedTemplates": {
+            "github": "https://github.com/CherryHQ/cherry-studio/releases/download/{{tag}}",
+            "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/{{tag}}"
+          }
+        }
+      }
+    },
+    {
+      "id": "current-v2",
+      "type": "latest",
+      "match": {
+        "range": ">=2.0.0 <3.0.0",
+        "excludeExact": ["2.0.0"]
+      },
+      "minCompatibleVersion": "2.0.0",
+      "description": "Current latest v2.x release",
+      "channelTemplates": {
+        "latest": {
+          "feedTemplates": {
+            "github": "https://github.com/CherryHQ/cherry-studio/releases/download/{{tag}}",
+            "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/{{tag}}"
+          }
+        },
+        "rc": {
+          "feedTemplates": {
+            "github": "https://github.com/CherryHQ/cherry-studio/releases/download/{{tag}}",
+            "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/{{tag}}"
+          }
+        },
+        "beta": {
+          "feedTemplates": {
+            "github": "https://github.com/CherryHQ/cherry-studio/releases/download/{{tag}}",
+            "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/{{tag}}"
+          }
+        }
+      }
+    }
+  ]
+}

docs/dev.md

@@ -18,13 +18,13 @@ yarn
 
 ### Setup Node.js
 
-Download and install [Node.js v20.x.x](https://nodejs.org/en/download)
+Download and install [Node.js v22.x.x](https://nodejs.org/en/download)
 
 ### Setup Yarn
 
 ```bash
 corepack enable
-corepack prepare yarn@4.6.0 --activate
+corepack prepare yarn@4.9.1 --activate
 ```
 
 ### Install Dependencies

docs/technical/app-upgrade-config-en.md

@@ -0,0 +1,430 @@
+# Update Configuration System Design Document
+
+## Background
+
+Currently, AppUpdater directly queries the GitHub API to retrieve beta and rc update information. To support users in China, we need to fetch a static JSON configuration file from GitHub/GitCode based on IP geolocation, which contains update URLs for all channels.
+
+## Design Goals
+
+1. Support different configuration sources based on IP geolocation (GitHub/GitCode)
+2. Support version compatibility control (e.g., users below v1.x must upgrade to v1.7.0 before upgrading to v2.0)
+3. Easy to extend, supporting future multi-major-version upgrade paths (v1.6 → v1.7 → v2.0 → v2.8 → v3.0)
+4. Maintain compatibility with existing electron-updater mechanism
+
+## Current Version Strategy
+
+- **v1.7.x** is the last version of the 1.x series
+- Users **below v1.7.0** must first upgrade to v1.7.0 (or higher 1.7.x version)
+- Users **v1.7.0 and above** can directly upgrade to v2.x.x
+
+## Automation Workflow
+
+The `x-files/app-upgrade-config/app-upgrade-config.json` file is synchronized by the [`Update App Upgrade Config`](../../.github/workflows/update-app-upgrade-config.yml) workflow. The workflow runs the [`scripts/update-app-upgrade-config.ts`](../../scripts/update-app-upgrade-config.ts) helper so that every release tag automatically updates the JSON in `x-files/app-upgrade-config`.
+
+### Trigger Conditions
+
+- **Release events (`release: released/prereleased`)**  
+  - Draft releases are ignored.  
+  - When GitHub marks the release as _prerelease_, the tag must include `-beta`/`-rc` (with optional numeric suffix). Otherwise the workflow exits early.  
+  - When GitHub marks the release as stable, the tag must match the latest release returned by the GitHub API. This prevents out-of-order updates when publishing historical tags.  
+  - If the guard clauses pass, the version is tagged as `latest` or `beta/rc` based on its semantic suffix and propagated to the script through the `IS_PRERELEASE` flag.
+- **Manual dispatch (`workflow_dispatch`)**  
+  - Required input: `tag` (e.g., `v2.0.1`). Optional input: `is_prerelease` (defaults to `false`).  
+  - When `is_prerelease=true`, the tag must carry a beta/rc suffix, mirroring the automatic validation.  
+  - Manual runs still download the latest release metadata so that the workflow knows whether the tag represents the newest stable version (for documentation inside the PR body).
+
+### Workflow Steps
+
+1. **Guard + metadata preparation** – the `Check if should proceed` and `Prepare metadata` steps compute the target tag, prerelease flag, whether the tag is the newest release, and a `safe_tag` slug used for branch names. When any rule fails, the workflow stops without touching the config.
+2. **Checkout source branches** – the default branch is checked out into `main/`, while the long-lived `x-files/app-upgrade-config` branch lives in `cs/`. All modifications happen in the latter directory.
+3. **Install toolchain** – Node.js 22, Corepack, and frozen Yarn dependencies are installed inside `main/`.
+4. **Run the update script** – `yarn tsx scripts/update-app-upgrade-config.ts --tag <tag> --config ../cs/app-upgrade-config.json --is-prerelease <flag>` updates the JSON in-place.  
+   - The script normalizes the tag (e.g., strips `v` prefix), detects the release channel (`latest`, `rc`, `beta`), and loads segment rules from `config/app-upgrade-segments.json`.  
+   - It validates that prerelease flags and semantic suffixes agree, enforces locked segments, builds mirror feed URLs, and performs release-availability checks (GitHub HEAD request for every channel; GitCode GET for latest channels, falling back to `https://releases.cherry-ai.com` when gitcode is delayed).  
+   - After updating the relevant channel entry, the script rewrites the config with semver-sort order and a new `lastUpdated` timestamp.
+5. **Detect changes + create PR** – if `cs/app-upgrade-config.json` changed, the workflow opens a PR `chore/update-app-upgrade-config/<safe_tag>` against `x-files/app-upgrade-config` with a commit message `🤖 chore: sync app-upgrade-config for <tag>`. Otherwise it logs that no update is required.
+
+### Manual Trigger Guide
+
+1. Open the Cherry Studio repository on GitHub → **Actions** tab → select **Update App Upgrade Config**.
+2. Click **Run workflow**, choose the default branch (usually `main`), and fill in the `tag` input (e.g., `v2.1.0`).  
+3. Toggle `is_prerelease` only when the tag carries a prerelease suffix (`-beta`, `-rc`). Leave it unchecked for stable releases.  
+4. Start the run and wait for it to finish. Check the generated PR in the `x-files/app-upgrade-config` branch, verify the diff in `app-upgrade-config.json`, and merge once validated.
+
+## JSON Configuration File Format
+
+### File Location
+
+- **GitHub**: `https://raw.githubusercontent.com/CherryHQ/cherry-studio/refs/heads/x-files/app-upgrade-config/app-upgrade-config.json`
+- **GitCode**: `https://gitcode.com/CherryHQ/cherry-studio/raw/x-files/app-upgrade-config/app-upgrade-config.json`
+
+**Note**: Both mirrors provide the same configuration file hosted on the `x-files/app-upgrade-config` branch. The client automatically selects the optimal mirror based on IP geolocation.
+
+### Configuration Structure (Current Implementation)
+
+```json
+{
+  "lastUpdated": "2025-01-05T00:00:00Z",
+  "versions": {
+    "1.6.7": {
+      "minCompatibleVersion": "1.0.0",
+      "description": "Last stable v1.7.x release - required intermediate version for users below v1.7",
+      "channels": {
+        "latest": {
+          "version": "1.6.7",
+          "feedUrls": {
+            "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.6.7",
+            "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/v1.6.7"
+          }
+        },
+        "rc": {
+          "version": "1.6.0-rc.5",
+          "feedUrls": {
+            "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.6.0-rc.5",
+            "gitcode": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.6.0-rc.5"
+          }
+        },
+        "beta": {
+          "version": "1.6.7-beta.3",
+          "feedUrls": {
+            "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.7.0-beta.3",
+            "gitcode": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.7.0-beta.3"
+          }
+        }
+      }
+    },
+    "2.0.0": {
+      "minCompatibleVersion": "1.7.0",
+      "description": "Major release v2.0 - required intermediate version for v2.x upgrades",
+      "channels": {
+        "latest": null,
+        "rc": null,
+        "beta": null
+      }
+    }
+  }
+}
+```
+
+### Future Extension Example
+
+When releasing v3.0, if users need to first upgrade to v2.8, you can add:
+
+```json
+{
+  "2.8.0": {
+    "minCompatibleVersion": "2.0.0",
+    "description": "Stable v2.8 - required for v3 upgrade",
+    "channels": {
+      "latest": {
+        "version": "2.8.0",
+        "feedUrls": {
+          "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v2.8.0",
+          "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/v2.8.0"
+        }
+      },
+      "rc": null,
+      "beta": null
+    }
+  },
+  "3.0.0": {
+    "minCompatibleVersion": "2.8.0",
+    "description": "Major release v3.0",
+    "channels": {
+      "latest": {
+        "version": "3.0.0",
+        "feedUrls": {
+          "github": "https://github.com/CherryHQ/cherry-studio/releases/latest",
+          "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/latest"
+        }
+      },
+      "rc": {
+        "version": "3.0.0-rc.1",
+        "feedUrls": {
+          "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v3.0.0-rc.1",
+          "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/v3.0.0-rc.1"
+        }
+      },
+      "beta": null
+    }
+  }
+}
+```
+
+### Field Descriptions
+
+- `lastUpdated`: Last update time of the configuration file (ISO 8601 format)
+- `versions`: Version configuration object, key is the version number, sorted by semantic versioning
+  - `minCompatibleVersion`: Minimum compatible version that can upgrade to this version
+  - `description`: Version description
+  - `channels`: Update channel configuration
+    - `latest`: Stable release channel
+    - `rc`: Release Candidate channel
+    - `beta`: Beta testing channel
+    - Each channel contains:
+      - `version`: Version number for this channel
+      - `feedUrls`: Multi-mirror URL configuration
+        - `github`: electron-updater feed URL for GitHub mirror
+        - `gitcode`: electron-updater feed URL for GitCode mirror
+  - `metadata`: Stable mapping info for automation
+    - `segmentId`: ID from `config/app-upgrade-segments.json`
+    - `segmentType`: Optional flag (`legacy` | `breaking` | `latest`) for documentation/debugging
+
+## TypeScript Type Definitions
+
+```typescript
+// Mirror enum
+enum UpdateMirror {
+  GITHUB = 'github',
+  GITCODE = 'gitcode'
+}
+
+interface UpdateConfig {
+  lastUpdated: string
+  versions: {
+    [versionKey: string]: VersionConfig
+  }
+}
+
+interface VersionConfig {
+  minCompatibleVersion: string
+  description: string
+  channels: {
+    latest: ChannelConfig | null
+    rc: ChannelConfig | null
+    beta: ChannelConfig | null
+  }
+  metadata?: {
+    segmentId: string
+    segmentType?: 'legacy' | 'breaking' | 'latest'
+  }
+}
+
+interface ChannelConfig {
+  version: string
+  feedUrls: Record<UpdateMirror, string>
+  // Equivalent to:
+  // feedUrls: {
+  //   github: string
+  //   gitcode: string
+  // }
+}
+```
+
+## Segment Metadata & Breaking Markers
+
+- **Segment definitions** now live in `config/app-upgrade-segments.json`. Each segment describes a semantic-version range (or exact matches) plus metadata such as `segmentId`, `segmentType`, `minCompatibleVersion`, and per-channel feed URL templates.
+- Each entry under `versions` carries a `metadata.segmentId`. This acts as the stable key that scripts use to decide which slot to update, even if the actual semantic version string changes.
+- Mark major upgrade gateways (e.g., `2.0.0`) by giving the related segment a `segmentType: "breaking"` and (optionally) `lockedVersion`. This prevents automation from accidentally moving that entry when other 2.x builds ship.
+- Adding another breaking hop (e.g., `3.0.0`) only requires defining a new segment in the JSON file; the automation will pick it up on the next run.
+
+## Automation Workflow
+
+Starting from this change, `.github/workflows/update-app-upgrade-config.yml` listens to GitHub release events (published + prerelease). The workflow:
+
+1. Checks out the default branch (for scripts) and the `x-files/app-upgrade-config` branch (where the config is hosted).
+2. Runs `yarn tsx scripts/update-app-upgrade-config.ts --tag <tag> --config ../cs/app-upgrade-config.json` to regenerate the config directly inside the `x-files/app-upgrade-config` working tree.
+3. If the file changed, it opens a PR against `x-files/app-upgrade-config` via `peter-evans/create-pull-request`, with the generated diff limited to `app-upgrade-config.json`.
+
+You can run the same script locally via `yarn update:upgrade-config --tag v2.1.6 --config ../cs/app-upgrade-config.json` (add `--dry-run` to preview) to reproduce or debug whatever the workflow does. Passing `--skip-release-checks` along with `--dry-run` lets you bypass the release-page existence check (useful when the GitHub/GitCode pages aren’t published yet). Running without `--config` continues to update the copy in your current working directory (main branch) for documentation purposes.
+
+## Version Matching Logic
+
+### Algorithm Flow
+
+1. Get user's current version (`currentVersion`) and requested channel (`requestedChannel`)
+2. Get all version numbers from configuration file, sort in descending order by semantic versioning
+3. Iterate through the sorted version list:
+   - Check if `currentVersion >= minCompatibleVersion`
+   - Check if the requested `channel` exists and is not `null`
+   - If conditions are met, return the channel configuration
+4. If no matching version is found, return `null`
+
+### Pseudocode Implementation
+
+```typescript
+function findCompatibleVersion(
+  currentVersion: string,
+  requestedChannel: UpgradeChannel,
+  config: UpdateConfig
+): ChannelConfig | null {
+  // Get all version numbers and sort in descending order
+  const versions = Object.keys(config.versions).sort(semver.rcompare)
+
+  for (const versionKey of versions) {
+    const versionConfig = config.versions[versionKey]
+    const channelConfig = versionConfig.channels[requestedChannel]
+
+    // Check version compatibility and channel availability
+    if (
+      semver.gte(currentVersion, versionConfig.minCompatibleVersion) &&
+      channelConfig !== null
+    ) {
+      return channelConfig
+    }
+  }
+
+  return null // No compatible version found
+}
+```
+
+## Upgrade Path Examples
+
+### Scenario 1: v1.6.5 User Upgrade (Below 1.7)
+
+- **Current Version**: 1.6.5
+- **Requested Channel**: latest
+- **Match Result**: 1.7.0
+- **Reason**: 1.6.5 >= 0.0.0 (satisfies 1.7.0's minCompatibleVersion), but doesn't satisfy 2.0.0's minCompatibleVersion (1.7.0)
+- **Action**: Prompt user to upgrade to 1.7.0, which is the required intermediate version for v2.x upgrade
+
+### Scenario 2: v1.6.5 User Requests rc/beta
+
+- **Current Version**: 1.6.5
+- **Requested Channel**: rc or beta
+- **Match Result**: 1.7.0 (latest)
+- **Reason**: 1.7.0 version doesn't provide rc/beta channels (values are null)
+- **Action**: Upgrade to 1.7.0 stable version
+
+### Scenario 3: v1.7.0 User Upgrades to Latest
+
+- **Current Version**: 1.7.0
+- **Requested Channel**: latest
+- **Match Result**: 2.0.0
+- **Reason**: 1.7.0 >= 1.7.0 (satisfies 2.0.0's minCompatibleVersion)
+- **Action**: Directly upgrade to 2.0.0 (current latest stable version)
+
+### Scenario 4: v1.7.2 User Upgrades to RC Version
+
+- **Current Version**: 1.7.2
+- **Requested Channel**: rc
+- **Match Result**: 2.0.0-rc.1
+- **Reason**: 1.7.2 >= 1.7.0 (satisfies 2.0.0's minCompatibleVersion), and rc channel exists
+- **Action**: Upgrade to 2.0.0-rc.1
+
+### Scenario 5: v1.7.0 User Upgrades to Beta Version
+
+- **Current Version**: 1.7.0
+- **Requested Channel**: beta
+- **Match Result**: 2.0.0-beta.1
+- **Reason**: 1.7.0 >= 1.7.0, and beta channel exists
+- **Action**: Upgrade to 2.0.0-beta.1
+
+### Scenario 6: v2.5.0 User Upgrade (Future)
+
+Assuming v2.8.0 and v3.0.0 configurations have been added:
+- **Current Version**: 2.5.0
+- **Requested Channel**: latest
+- **Match Result**: 2.8.0
+- **Reason**: 2.5.0 >= 2.0.0 (satisfies 2.8.0's minCompatibleVersion), but doesn't satisfy 3.0.0's requirement
+- **Action**: Prompt user to upgrade to 2.8.0, which is the required intermediate version for v3.x upgrade
+
+## Code Changes
+
+### Main Modifications
+
+1. **New Methods**
+   - `_fetchUpdateConfig(ipCountry: string): Promise<UpdateConfig | null>` - Fetch configuration file based on IP
+   - `_findCompatibleChannel(currentVersion: string, channel: UpgradeChannel, config: UpdateConfig): ChannelConfig | null` - Find compatible channel configuration
+
+2. **Modified Methods**
+   - `_getReleaseVersionFromGithub()` → Remove or refactor to `_getChannelFeedUrl()`
+   - `_setFeedUrl()` - Use new configuration system to replace existing logic
+
+3. **New Type Definitions**
+   - `UpdateConfig`
+   - `VersionConfig`
+   - `ChannelConfig`
+
+### Mirror Selection Logic
+
+The client automatically selects the optimal mirror based on IP geolocation:
+
+```typescript
+private async _setFeedUrl() {
+  const currentVersion = app.getVersion()
+  const testPlan = configManager.getTestPlan()
+  const requestedChannel = testPlan ? this._getTestChannel() : UpgradeChannel.LATEST
+
+  // Determine mirror based on IP country
+  const ipCountry = await getIpCountry()
+  const mirror = ipCountry.toLowerCase() === 'cn' ? 'gitcode' : 'github'
+
+  // Fetch update config
+  const config = await this._fetchUpdateConfig(mirror)
+
+  if (config) {
+    const channelConfig = this._findCompatibleChannel(currentVersion, requestedChannel, config)
+    if (channelConfig) {
+      // Select feed URL from the corresponding mirror
+      const feedUrl = channelConfig.feedUrls[mirror]
+      this._setChannel(requestedChannel, feedUrl)
+      return
+    }
+  }
+
+  // Fallback logic
+  const defaultFeedUrl = mirror === 'gitcode'
+    ? FeedUrl.PRODUCTION
+    : FeedUrl.GITHUB_LATEST
+  this._setChannel(UpgradeChannel.LATEST, defaultFeedUrl)
+}
+
+private async _fetchUpdateConfig(mirror: 'github' | 'gitcode'): Promise<UpdateConfig | null> {
+  const configUrl = mirror === 'gitcode'
+    ? UpdateConfigUrl.GITCODE
+    : UpdateConfigUrl.GITHUB
+
+  try {
+    const response = await net.fetch(configUrl, {
+      headers: {
+        'User-Agent': generateUserAgent(),
+        'Accept': 'application/json',
+        'X-Client-Id': configManager.getClientId()
+      }
+    })
+    return await response.json() as UpdateConfig
+  } catch (error) {
+    logger.error('Failed to fetch update config:', error)
+    return null
+  }
+}
+```
+
+## Fallback and Error Handling Strategy
+
+1. **Configuration file fetch failure**: Log error, return current version, don't offer updates
+2. **No matching version**: Notify user that current version doesn't support automatic upgrade
+3. **Network exception**: Cache last successfully fetched configuration (optional)
+
+## GitHub Release Requirements
+
+To support intermediate version upgrades, the following files need to be retained:
+
+- **v1.7.0 release** and its latest*.yml files (as upgrade target for users below v1.7)
+- Future intermediate versions (e.g., v2.8.0) need to retain corresponding release and latest*.yml files
+- Complete installation packages for each version
+
+### Currently Required Releases
+
+| Version | Purpose | Must Retain |
+|---------|---------|-------------|
+| v1.7.0 | Upgrade target for users below 1.7 | ✅ Yes |
+| v2.0.0-rc.1 | RC testing channel | ❌ Optional |
+| v2.0.0-beta.1 | Beta testing channel | ❌ Optional |
+| latest | Latest stable version (automatic) | ✅ Yes |
+
+## Advantages
+
+1. **Flexibility**: Supports arbitrarily complex upgrade paths
+2. **Extensibility**: Adding new versions only requires adding new entries to the configuration file
+3. **Maintainability**: Configuration is separated from code, allowing upgrade strategy adjustments without releasing new versions
+4. **Multi-source support**: Automatically selects optimal configuration source based on geolocation
+5. **Version control**: Enforces intermediate version upgrades, ensuring data migration and compatibility
+
+## Future Extensions
+
+- Support more granular version range control (e.g., `>=1.5.0 <1.8.0`)
+- Support multi-step upgrade path hints (e.g., notify user needs 1.5 → 1.8 → 2.0)
+- Support A/B testing and gradual rollout
+- Support local caching and expiration strategy for configuration files

docs/technical/app-upgrade-config-zh.md

@@ -0,0 +1,430 @@
+# 更新配置系统设计文档
+
+## 背景
+
+当前 AppUpdater 直接请求 GitHub API 获取 beta 和 rc 的更新信息。为了支持国内用户，需要根据 IP 地理位置，分别从 GitHub/GitCode 获取一个固定的 JSON 配置文件，该文件包含所有渠道的更新地址。
+
+## 设计目标
+
+1. 支持根据 IP 地理位置选择不同的配置源（GitHub/GitCode）
+2. 支持版本兼容性控制（如 v1.x 以下必须先升级到 v1.7.0 才能升级到 v2.0）
+3. 易于扩展，支持未来多个主版本的升级路径（v1.6 → v1.7 → v2.0 → v2.8 → v3.0）
+4. 保持与现有 electron-updater 机制的兼容性
+
+## 当前版本策略
+
+- **v1.7.x** 是 1.x 系列的最后版本
+- **v1.7.0 以下**的用户必须先升级到 v1.7.0（或更高的 1.7.x 版本）
+- **v1.7.0 及以上**的用户可以直接升级到 v2.x.x
+
+## 自动化工作流
+
+`x-files/app-upgrade-config/app-upgrade-config.json` 由 [`Update App Upgrade Config`](../../.github/workflows/update-app-upgrade-config.yml) workflow 自动同步。工作流会调用 [`scripts/update-app-upgrade-config.ts`](../../scripts/update-app-upgrade-config.ts) 脚本，根据指定 tag 更新 `x-files/app-upgrade-config` 分支上的配置文件。
+
+### 触发条件
+
+- **Release 事件（`release: released/prereleased`）**  
+  - Draft release 会被忽略。  
+  - 当 GitHub 将 release 标记为 *prerelease* 时，tag 必须包含 `-beta`/`-rc`（可带序号），否则直接跳过。  
+  - 当 release 标记为稳定版时，tag 必须与 GitHub API 返回的最新稳定版本一致，防止发布历史 tag 时意外挂起工作流。  
+  - 满足上述条件后，工作流会根据语义化版本判断渠道（`latest`/`beta`/`rc`），并通过 `IS_PRERELEASE` 传递给脚本。
+- **手动触发（`workflow_dispatch`）**  
+  - 必填：`tag`（例：`v2.0.1`）；选填：`is_prerelease`（默认 `false`）。  
+  - 当 `is_prerelease=true` 时，同样要求 tag 带有 beta/rc 后缀。  
+  - 手动运行仍会请求 GitHub 最新 release 信息，用于在 PR 说明中标注该 tag 是否是最新稳定版。
+
+### 工作流步骤
+
+1. **检查与元数据准备**：`Check if should proceed` 和 `Prepare metadata` 步骤会计算 tag、prerelease 标志、是否最新版本以及用于分支名的 `safe_tag`。若任意校验失败，工作流立即退出。
+2. **检出分支**：默认分支被检出到 `main/`，长期维护的 `x-files/app-upgrade-config` 分支则在 `cs/` 中，所有改动都发生在 `cs/`。
+3. **安装工具链**：安装 Node.js 22、启用 Corepack，并在 `main/` 目录执行 `yarn install --immutable`。
+4. **运行更新脚本**：执行 `yarn tsx scripts/update-app-upgrade-config.ts --tag <tag> --config ../cs/app-upgrade-config.json --is-prerelease <flag>`。  
+   - 脚本会标准化 tag（去掉 `v` 前缀等）、识别渠道、加载 `config/app-upgrade-segments.json` 中的分段规则。  
+   - 校验 prerelease 标志与语义后缀是否匹配、强制锁定的 segment 是否满足、生成镜像的下载地址，并检查 release 是否已经在 GitHub/GitCode 可用（latest 渠道在 GitCode 不可用时会回退到 `https://releases.cherry-ai.com`）。  
+   - 更新对应的渠道配置后，脚本会按 semver 排序写回 JSON，并刷新 `lastUpdated`。
+5. **检测变更并创建 PR**：若 `cs/app-upgrade-config.json` 有变更，则创建 `chore/update-app-upgrade-config/<safe_tag>` 分支，提交信息为 `🤖 chore: sync app-upgrade-config for <tag>`，并向 `x-files/app-upgrade-config` 提 PR；无变更则输出提示。
+
+### 手动触发指南
+
+1. 进入 Cherry Studio 仓库的 GitHub **Actions** 页面，选择 **Update App Upgrade Config** 工作流。
+2. 点击 **Run workflow**，保持默认分支（通常为 `main`），填写 `tag`（如 `v2.1.0`）。  
+3. 只有在 tag 带 `-beta`/`-rc` 后缀时才勾选 `is_prerelease`，稳定版保持默认。  
+4. 启动运行并等待完成，随后到 `x-files/app-upgrade-config` 分支的 PR 查看 `app-upgrade-config.json` 的变更并在验证后合并。
+
+## JSON 配置文件格式
+
+### 文件位置
+
+- **GitHub**: `https://raw.githubusercontent.com/CherryHQ/cherry-studio/refs/heads/x-files/app-upgrade-config/app-upgrade-config.json`
+- **GitCode**: `https://gitcode.com/CherryHQ/cherry-studio/raw/x-files/app-upgrade-config/app-upgrade-config.json`
+
+**说明**：两个镜像源提供相同的配置文件，统一托管在 `x-files/app-upgrade-config` 分支上。客户端根据 IP 地理位置自动选择最优镜像源。
+
+### 配置结构（当前实际配置）
+
+```json
+{
+  "lastUpdated": "2025-01-05T00:00:00Z",
+  "versions": {
+    "1.6.7": {
+      "minCompatibleVersion": "1.0.0",
+      "description": "Last stable v1.7.x release - required intermediate version for users below v1.7",
+      "channels": {
+        "latest": {
+          "version": "1.6.7",
+          "feedUrls": {
+            "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.6.7",
+            "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/v1.6.7"
+          }
+        },
+        "rc": {
+          "version": "1.6.0-rc.5",
+          "feedUrls": {
+            "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.6.0-rc.5",
+            "gitcode": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.6.0-rc.5"
+          }
+        },
+        "beta": {
+          "version": "1.6.7-beta.3",
+          "feedUrls": {
+            "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.7.0-beta.3",
+            "gitcode": "https://github.com/CherryHQ/cherry-studio/releases/download/v1.7.0-beta.3"
+          }
+        }
+      }
+    },
+    "2.0.0": {
+      "minCompatibleVersion": "1.7.0",
+      "description": "Major release v2.0 - required intermediate version for v2.x upgrades",
+      "channels": {
+        "latest": null,
+        "rc": null,
+        "beta": null
+      }
+    }
+  }
+}
+```
+
+### 未来扩展示例
+
+当需要发布 v3.0 时，如果需要强制用户先升级到 v2.8，可以添加：
+
+```json
+{
+  "2.8.0": {
+    "minCompatibleVersion": "2.0.0",
+    "description": "Stable v2.8 - required for v3 upgrade",
+    "channels": {
+      "latest": {
+        "version": "2.8.0",
+        "feedUrls": {
+          "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v2.8.0",
+          "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/v2.8.0"
+        }
+      },
+      "rc": null,
+      "beta": null
+    }
+  },
+  "3.0.0": {
+    "minCompatibleVersion": "2.8.0",
+    "description": "Major release v3.0",
+    "channels": {
+      "latest": {
+        "version": "3.0.0",
+        "feedUrls": {
+          "github": "https://github.com/CherryHQ/cherry-studio/releases/latest",
+          "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/latest"
+        }
+      },
+      "rc": {
+        "version": "3.0.0-rc.1",
+        "feedUrls": {
+          "github": "https://github.com/CherryHQ/cherry-studio/releases/download/v3.0.0-rc.1",
+          "gitcode": "https://gitcode.com/CherryHQ/cherry-studio/releases/download/v3.0.0-rc.1"
+        }
+      },
+      "beta": null
+    }
+  }
+}
+```
+
+### 字段说明
+
+- `lastUpdated`: 配置文件最后更新时间（ISO 8601 格式）
+- `versions`: 版本配置对象，key 为版本号，按语义化版本排序
+  - `minCompatibleVersion`: 可以升级到此版本的最低兼容版本
+  - `description`: 版本描述
+  - `channels`: 更新渠道配置
+    - `latest`: 稳定版渠道
+    - `rc`: Release Candidate 渠道
+    - `beta`: Beta 测试渠道
+    - 每个渠道包含：
+      - `version`: 该渠道的版本号
+      - `feedUrls`: 多镜像源 URL 配置
+        - `github`: GitHub 镜像源的 electron-updater feed URL
+        - `gitcode`: GitCode 镜像源的 electron-updater feed URL
+  - `metadata`: 自动化匹配所需的稳定标识
+    - `segmentId`: 来自 `config/app-upgrade-segments.json` 的段位 ID
+    - `segmentType`: 可选字段（`legacy` | `breaking` | `latest`），便于文档/调试
+
+## TypeScript 类型定义
+
+```typescript
+// 镜像源枚举
+enum UpdateMirror {
+  GITHUB = 'github',
+  GITCODE = 'gitcode'
+}
+
+interface UpdateConfig {
+  lastUpdated: string
+  versions: {
+    [versionKey: string]: VersionConfig
+  }
+}
+
+interface VersionConfig {
+  minCompatibleVersion: string
+  description: string
+  channels: {
+    latest: ChannelConfig | null
+    rc: ChannelConfig | null
+    beta: ChannelConfig | null
+  }
+  metadata?: {
+    segmentId: string
+    segmentType?: 'legacy' | 'breaking' | 'latest'
+  }
+}
+
+interface ChannelConfig {
+  version: string
+  feedUrls: Record<UpdateMirror, string>
+  // 等同于:
+  // feedUrls: {
+  //   github: string
+  //   gitcode: string
+  // }
+}
+```
+
+## 段位元数据（Break Change 标记）
+
+- 所有段位定义（如 `legacy-v1`、`gateway-v2` 等）集中在 `config/app-upgrade-segments.json`，用于描述匹配范围、`segmentId`、`segmentType`、默认 `minCompatibleVersion/description` 以及各渠道的 URL 模板。
+- `versions` 下的每个节点都会带上 `metadata.segmentId`。自动脚本始终依据该 ID 来定位并更新条目，即便 key 从 `2.1.5` 切换到 `2.1.6` 也不会错位。
+- 如果某段需要锁死在特定版本（例如 `2.0.0` 的 break change），可在段定义中设置 `segmentType: "breaking"` 并提供 `lockedVersion`，脚本在遇到不匹配的 tag 时会短路报错，保证升级路径安全。
+- 面对未来新的断层（例如 `3.0.0`），只需要在段定义里新增一段，自动化即可识别并更新。
+
+## 自动化工作流
+
+`.github/workflows/update-app-upgrade-config.yml` 会在 GitHub Release（包含正常发布与 Pre Release）触发：
+
+1. 同时 Checkout 仓库默认分支（用于脚本）和 `x-files/app-upgrade-config` 分支（真实托管配置的分支）。
+2. 在默认分支目录执行 `yarn tsx scripts/update-app-upgrade-config.ts --tag <tag> --config ../cs/app-upgrade-config.json`，直接重写 `x-files/app-upgrade-config` 分支里的配置文件。
+3. 如果 `app-upgrade-config.json` 有变化，则通过 `peter-evans/create-pull-request` 自动创建一个指向 `x-files/app-upgrade-config` 的 PR，Diff 仅包含该文件。
+
+如需本地调试，可执行 `yarn update:upgrade-config --tag v2.1.6 --config ../cs/app-upgrade-config.json`（加 `--dry-run` 仅打印结果）来复现 CI 行为。若需要暂时跳过 GitHub/GitCode Release 页面是否就绪的校验，可在 `--dry-run` 的同时附加 `--skip-release-checks`。不加 `--config` 时默认更新当前工作目录（通常是 main 分支）下的副本，方便文档/审查。
+
+## 版本匹配逻辑
+
+### 算法流程
+
+1. 获取用户当前版本（`currentVersion`）和请求的渠道（`requestedChannel`）
+2. 获取配置文件中所有版本号，按语义化版本从大到小排序
+3. 遍历排序后的版本列表：
+   - 检查 `currentVersion >= minCompatibleVersion`
+   - 检查请求的 `channel` 是否存在且不为 `null`
+   - 如果满足条件，返回该渠道配置
+4. 如果没有找到匹配版本，返回 `null`
+
+### 伪代码实现
+
+```typescript
+function findCompatibleVersion(
+  currentVersion: string,
+  requestedChannel: UpgradeChannel,
+  config: UpdateConfig
+): ChannelConfig | null {
+  // 获取所有版本号并从大到小排序
+  const versions = Object.keys(config.versions).sort(semver.rcompare)
+
+  for (const versionKey of versions) {
+    const versionConfig = config.versions[versionKey]
+    const channelConfig = versionConfig.channels[requestedChannel]
+
+    // 检查版本兼容性和渠道可用性
+    if (
+      semver.gte(currentVersion, versionConfig.minCompatibleVersion) &&
+      channelConfig !== null
+    ) {
+      return channelConfig
+    }
+  }
+
+  return null // 没有找到兼容版本
+}
+```
+
+## 升级路径示例
+
+### 场景 1: v1.6.5 用户升级（低于 1.7）
+
+- **当前版本**: 1.6.5
+- **请求渠道**: latest
+- **匹配结果**: 1.7.0
+- **原因**: 1.6.5 >= 0.0.0（满足 1.7.0 的 minCompatibleVersion），但不满足 2.0.0 的 minCompatibleVersion (1.7.0)
+- **操作**: 提示用户升级到 1.7.0，这是升级到 v2.x 的必要中间版本
+
+### 场景 2: v1.6.5 用户请求 rc/beta
+
+- **当前版本**: 1.6.5
+- **请求渠道**: rc 或 beta
+- **匹配结果**: 1.7.0 (latest)
+- **原因**: 1.7.0 版本不提供 rc/beta 渠道（值为 null）
+- **操作**: 升级到 1.7.0 稳定版
+
+### 场景 3: v1.7.0 用户升级到最新版
+
+- **当前版本**: 1.7.0
+- **请求渠道**: latest
+- **匹配结果**: 2.0.0
+- **原因**: 1.7.0 >= 1.7.0（满足 2.0.0 的 minCompatibleVersion）
+- **操作**: 直接升级到 2.0.0（当前最新稳定版）
+
+### 场景 4: v1.7.2 用户升级到 RC 版本
+
+- **当前版本**: 1.7.2
+- **请求渠道**: rc
+- **匹配结果**: 2.0.0-rc.1
+- **原因**: 1.7.2 >= 1.7.0（满足 2.0.0 的 minCompatibleVersion），且 rc 渠道存在
+- **操作**: 升级到 2.0.0-rc.1
+
+### 场景 5: v1.7.0 用户升级到 Beta 版本
+
+- **当前版本**: 1.7.0
+- **请求渠道**: beta
+- **匹配结果**: 2.0.0-beta.1
+- **原因**: 1.7.0 >= 1.7.0，且 beta 渠道存在
+- **操作**: 升级到 2.0.0-beta.1
+
+### 场景 6: v2.5.0 用户升级（未来）
+
+假设已添加 v2.8.0 和 v3.0.0 配置：
+- **当前版本**: 2.5.0
+- **请求渠道**: latest
+- **匹配结果**: 2.8.0
+- **原因**: 2.5.0 >= 2.0.0（满足 2.8.0 的 minCompatibleVersion），但不满足 3.0.0 的要求
+- **操作**: 提示用户升级到 2.8.0，这是升级到 v3.x 的必要中间版本
+
+## 代码改动计划
+
+### 主要修改
+
+1. **新增方法**
+   - `_fetchUpdateConfig(ipCountry: string): Promise<UpdateConfig | null>` - 根据 IP 获取配置文件
+   - `_findCompatibleChannel(currentVersion: string, channel: UpgradeChannel, config: UpdateConfig): ChannelConfig | null` - 查找兼容的渠道配置
+
+2. **修改方法**
+   - `_getReleaseVersionFromGithub()` → 移除或重构为 `_getChannelFeedUrl()`
+   - `_setFeedUrl()` - 使用新的配置系统替代现有逻辑
+
+3. **新增类型定义**
+   - `UpdateConfig`
+   - `VersionConfig`
+   - `ChannelConfig`
+
+### 镜像源选择逻辑
+
+客户端根据 IP 地理位置自动选择最优镜像源：
+
+```typescript
+private async _setFeedUrl() {
+  const currentVersion = app.getVersion()
+  const testPlan = configManager.getTestPlan()
+  const requestedChannel = testPlan ? this._getTestChannel() : UpgradeChannel.LATEST
+
+  // 根据 IP 国家确定镜像源
+  const ipCountry = await getIpCountry()
+  const mirror = ipCountry.toLowerCase() === 'cn' ? 'gitcode' : 'github'
+
+  // 获取更新配置
+  const config = await this._fetchUpdateConfig(mirror)
+
+  if (config) {
+    const channelConfig = this._findCompatibleChannel(currentVersion, requestedChannel, config)
+    if (channelConfig) {
+      // 从配置中选择对应镜像源的 URL
+      const feedUrl = channelConfig.feedUrls[mirror]
+      this._setChannel(requestedChannel, feedUrl)
+      return
+    }
+  }
+
+  // Fallback 逻辑
+  const defaultFeedUrl = mirror === 'gitcode'
+    ? FeedUrl.PRODUCTION
+    : FeedUrl.GITHUB_LATEST
+  this._setChannel(UpgradeChannel.LATEST, defaultFeedUrl)
+}
+
+private async _fetchUpdateConfig(mirror: 'github' | 'gitcode'): Promise<UpdateConfig | null> {
+  const configUrl = mirror === 'gitcode'
+    ? UpdateConfigUrl.GITCODE
+    : UpdateConfigUrl.GITHUB
+
+  try {
+    const response = await net.fetch(configUrl, {
+      headers: {
+        'User-Agent': generateUserAgent(),
+        'Accept': 'application/json',
+        'X-Client-Id': configManager.getClientId()
+      }
+    })
+    return await response.json() as UpdateConfig
+  } catch (error) {
+    logger.error('Failed to fetch update config:', error)
+    return null
+  }
+}
+```
+
+## 降级和容错策略
+
+1. **配置文件获取失败**: 记录错误日志，返回当前版本，不提供更新
+2. **没有匹配的版本**: 提示用户当前版本不支持自动升级
+3. **网络异常**: 缓存上次成功获取的配置（可选）
+
+## GitHub Release 要求
+
+为支持中间版本升级，需要保留以下文件：
+
+- **v1.7.0 release** 及其 latest*.yml 文件（作为 v1.7 以下用户的升级目标）
+- 未来如需强制中间版本（如 v2.8.0），需要保留对应的 release 和 latest*.yml 文件
+- 各版本的完整安装包
+
+### 当前需要的 Release
+
+| 版本 | 用途 | 必须保留 |
+|------|------|---------|
+| v1.7.0 | 1.7 以下用户的升级目标 | ✅ 是 |
+| v2.0.0-rc.1 | RC 测试渠道 | ❌ 可选 |
+| v2.0.0-beta.1 | Beta 测试渠道 | ❌ 可选 |
+| latest | 最新稳定版（自动） | ✅ 是 |
+
+## 优势
+
+1. **灵活性**: 支持任意复杂的升级路径
+2. **可扩展性**: 新增版本只需在配置文件中添加新条目
+3. **可维护性**: 配置与代码分离，无需发版即可调整升级策略
+4. **多源支持**: 自动根据地理位置选择最优配置源
+5. **版本控制**: 强制中间版本升级，确保数据迁移和兼容性
+
+## 未来扩展
+
+- 支持更细粒度的版本范围控制（如 `>=1.5.0 <1.8.0`）
+- 支持多步升级路径提示（如提示用户需要 1.5 → 1.8 → 2.0）
+- 支持 A/B 测试和灰度发布
+- 支持配置文件的本地缓存和过期策略

docs/testplan-en.md

@@ -11,6 +11,8 @@ The Test Plan is divided into the RC channel and the Beta channel, with the foll
 
 Users can enable the "Test Plan" and select the version channel in the software's `Settings` > `About`. Please note that the versions in the "Test Plan" cannot guarantee data consistency, so be sure to back up your data before using them.
 
+After enabling the RC channel or Beta channel, if a stable version is released, users will still be upgraded to the stable version.
+
 Users are welcome to submit issues or provide feedback through other channels for any bugs encountered during testing. Your feedback is very important to us.
 
 ## Developer Guide

docs/testplan-zh.md

@@ -11,6 +11,8 @@
 
 用户可以在软件的`设置`-`关于`中，开启“测试计划”并选择版本通道。请注意“测试计划”的版本无法保证数据的一致性，请使用前一定要备份数据。
 
+用户选择RC版通道或Beta版通道后，若发布了正式版，仍旧会升级到正式版。
+
 用户在测试过程中发现的BUG，欢迎提交issue或通过其他渠道反馈。用户的反馈对我们非常重要。
 
 ## 开发者指南

electron-builder.yml

@@ -21,6 +21,8 @@ files:
   - "**/*"
   - "!**/{.vscode,.yarn,.yarn-lock,.github,.cursorrules,.prettierrc}"
   - "!electron.vite.config.{js,ts,mjs,cjs}}"
+  - "!.*"
+  - "!components.json"
   - "!**/{.eslintignore,.eslintrc.js,.eslintrc.json,.eslintcache,root.eslint.config.js,eslint.config.js,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,eslint.config.mjs,dev-app-update.yml,CHANGELOG.md,README.md,biome.jsonc}"
   - "!**/{.env,.env.*,.npmrc,pnpm-lock.yaml}"
   - "!**/{tsconfig.json,tsconfig.tsbuildinfo,tsconfig.node.json,tsconfig.web.json}"
@@ -95,7 +97,6 @@ mac:
   entitlementsInherit: build/entitlements.mac.plist
   notarize: false
   artifactName: ${productName}-${version}-${arch}.${ext}
-  minimumSystemVersion: "20.1.0" # 最低支持 macOS 11.0
   extendInfo:
     - NSCameraUsageDescription: Application requests access to the device's camera.
     - NSMicrophoneUsageDescription: Application requests access to the device's microphone.
@@ -133,128 +134,66 @@ artifactBuildCompleted: scripts/artifact-build-completed.js
 releaseInfo:
   releaseNotes: |
     <!--LANG:en-->
-    What's New in v1.7.0-beta.3
+    What's New in v1.7.0-rc.2
 
-    New Features:
-    - Enhanced Tool Permission System: Real-time tool approval interface with improved UX
-    - Plugin Management System: Support for Claude Agent plugins (agents, commands, skills)
-    - Skill Tool: Add skill execution capabilities for agents
-    - Mobile App Data Restore: Support restoring data to mobile applications
-    - OpenMinerU Preprocessor: Knowledge base now supports open-source MinerU for document processing
-    - HuggingFace Provider: Added HuggingFace as AI provider
-    - Claude Haiku 4.5: Support for the latest Claude Haiku 4.5 model
-    - Ling Series Models: Added support for Ling-1T and related models
-    - Intel OVMS Painting: New painting provider using Intel OpenVINO Model Server
-    - Automatic Update Checks: Implement periodic update checking with configurable intervals
-    - HuggingChat Mini App: New mini app for HuggingChat integration
+    ✨ New Features:
+    - AI Models: Added support for Gemini 3, Gemini 3 Pro with image preview, and GPT-5.1
+    - Import: ChatGPT conversation import feature
+    - Agent: Git Bash detection and requirement check for Windows agents
+    - Search: Native language emoji search with CLDR data format
+    - Provider: Endpoint type support for cherryin provider
+    - Debug: Local crash mini dump file for better diagnostics
 
-    Improvements:
-    - Agent Creation: New agents are now automatically activated upon creation
-    - Lazy Loading: Optimize page load performance with route lazy loading
-    - UI Enhancements: Improved agent item styling and layout consistency
-    - Navigation: Better navbar layout for fullscreen mode on macOS
-    - Settings Tab: Enhanced context slider consistency
-    - Backup Manager: Unified footer layout for local and S3 backup managers
-    - Menu System: Enhanced application menu with improved help section
-    - Proxy Rules: Comprehensive proxy bypass rule matching
-    - German Language: Added German language support
-    - MCP Confirmation: Added confirmation modal when activating protocol-installed MCP servers
-    - Translation: Enhanced translation script with concurrency and validation
-    - Electron & Vite: Updated to Electron 38 and Vite 4.0.1
-    - QR Code Generation: Optimized performance for phone LAN export
-    - Enterprise Settings: Added enterprise section in About settings
-    - Assistant/Agent Popup: Enhanced UI for adding assistants and agents
+    🐛 Important Bug Fixes:
+    - Error Handling: Improved error display in AiSdkToChunkAdapter
+    - Database: Optimized DatabaseManager and fixed libsql crash issues
+    - Memory: Fixed EventEmitter memory leak in useApiServer hook
+    - Messages: Fixed adjacent user messages appearing when assistant message contains error only
+    - Tools: Fixed missing execution state for approved tool permissions
+    - File Processing: Fixed "no such file" error for non-English filenames in open-mineru
+    - PDF: Fixed mineru PDF validation and 403 errors
+    - Images: Fixed base64 image save issues
+    - Search: Fixed URL context and web search capability
+    - Models: Added verbosity parameter support for GPT-5 models
+    - UI: Improved todo tool status icon visibility and colors
+    - Providers: Fixed api-host for vercel ai-gateway and gitcode update config
 
-    Claude Code Tool Improvements:
-    - GlobTool: Now counts lines instead of files in output for better clarity
-    - ReadTool: Automatically removes system reminder tags from output
-    - TodoWriteTool: Improved rendering behavior
-    - Environment Variables: Updated model-related environment variable names
-
-    Bug Fixes:
-    - Fixed session model not being used when sending messages
-    - Fixed tool approval UI and shared workspace plugin inconsistencies
-    - Fixed API server readiness notification to renderer
-    - Fixed grouped items not respecting saved tag order
-    - Fixed assistant/agent activation when creating new ones
-    - Fixed Dashscope Anthropic API host and migrated old configs
-    - Fixed Qwen3 thinking mode control for Ollama
-    - Fixed disappeared MCP button
-    - Fixed create assistant causing blank screen
-    - Fixed up-down button visibility in some cases
-    - Fixed hooks preventing save on composing enter key
-    - Fixed Azure GPT-image-1 and OpenRouter Gemini-image
-    - Fixed Silicon reasoning issues
-    - Fixed topic branch incomplete copy with two-pass ID mapping
-    - Fixed deep research model search context restrictions
-    - Fixed model capability checking logic
-    - Fixed reranker API error response capture
-    - Fixed right-click paste file content into inputbar
-    - Fixed minimax-m2 support in aiCore
-    - Fixed Azure embedding issues
-    - Fixed agent edit modal loading race condition
-    - Fixed debounced save cancellation on file path update
+    ⚡ Improvements:
+    - SDK: Updated Google and OpenAI SDKs with new features
+    - UI: Simplified knowledge base creation modal and agent creation form
+    - Tools: Replaced renderToolContent function with ToolContent component
+    - Architecture: Namespace tool call IDs with session ID to prevent conflicts
+    - Config: AI SDK configuration refactoring
 
     <!--LANG:zh-CN-->
-    v1.7.0-beta.3 新特性
+    v1.7.0-rc.2 新特性
 
-    新功能:
-    - 增强工具权限系统：实时工具审批界面，改进用户体验
-    - 插件管理系统：支持 Claude Agent 插件（agents、commands、skills）
-    - 技能工具：为 Agent 添加技能执行能力
-    - 移动应用数据恢复：支持将数据恢复到移动应用程序
-    - OpenMinerU 预处理器：知识库现支持使用开源 MinerU 处理文档
-    - HuggingFace 提供商：添加 HuggingFace 作为 AI 提供商
-    - Claude Haiku 4.5：支持最新的 Claude Haiku 4.5 模型
-    - Ling 系列模型：添加 Ling-1T 及相关模型支持
-    - Intel OVMS 绘图：使用 Intel OpenVINO 模型服务器的新绘图提供商
-    - 自动更新检查：实现可配置间隔的定期更新检查
-    - HuggingChat 小程序：新增 HuggingChat 集成小程序
+    ✨ 新功能:
+    - AI 模型：新增 Gemini 3、Gemini 3 Pro 图像预览支持，以及 GPT-5.1
+    - 导入：ChatGPT 对话导入功能
+    - Agent：Windows Agent 的 Git Bash 检测和要求检查
+    - 搜索：支持本地语言 emoji 搜索（CLDR 数据格式）
+    - 提供商：cherryin provider 的端点类型支持
+    - 调试：启用本地崩溃 mini dump 文件，方便诊断
 
-    改进:
-    - Agent 创建：新创建的 Agent 现在会自动激活
-    - 懒加载：通过路由懒加载优化页面加载性能
-    - UI 增强：改进 Agent 项目样式和布局一致性
-    - 导航：改进 macOS 全屏模式下的导航栏布局
-    - 设置选项卡：增强上下文滑块一致性
-    - 备份管理器：统一本地和 S3 备份管理器的页脚布局
-    - 菜单系统：增强应用菜单，改进帮助部分
-    - 代理规则：全面的代理绕过规则匹配
-    - 德语支持：添加德语语言支持
-    - MCP 确认：添加激活协议安装的 MCP 服务器时的确认模态框
-    - 翻译：增强翻译脚本的并发和验证功能
-    - Electron & Vite：更新至 Electron 38 和 Vite 4.0.1
-    - 二维码生成：优化手机局域网导出性能
-    - 企业设置：在关于设置中添加企业部分
-    - 助手/Agent 弹窗：增强添加助手和 Agent 的界面
+    🐛 重要修复:
+    - 错误处理：改进 AiSdkToChunkAdapter 的错误显示
+    - 数据库：优化 DatabaseManager 并修复 libsql 崩溃问题
+    - 内存：修复 useApiServer hook 中的 EventEmitter 内存泄漏
+    - 消息：修复当助手消息仅包含错误时相邻用户消息出现的问题
+    - 工具：修复批准工具权限缺少执行状态的问题
+    - 文件处理：修复 open-mineru 处理非英文文件名时的"无此文件"错误
+    - PDF：修复 mineru PDF 验证和 403 错误
+    - 图片：修复 base64 图片保存问题
+    - 搜索：修复 URL 上下文和网络搜索功能
+    - 模型：为 GPT-5 模型添加 verbosity 参数支持
+    - UI：改进 todo 工具状态图标可见性和颜色
+    - 提供商：修复 vercel ai-gateway 和 gitcode 更新配置的 api-host
 
-    Claude Code 工具改进:
-    - GlobTool：现在计算行数而不是文件数，提供更清晰的输出
-    - ReadTool：自动从输出中移除系统提醒标签
-    - TodoWriteTool：改进渲染行为
-    - 环境变量：更新模型相关的环境变量名称
-
-    问题修复:
-    - 修复发送消息时未使用会话模型
-    - 修复工具审批 UI 和共享工作区插件不一致
-    - 修复 API 服务器就绪通知到渲染器
-    - 修复分组项目不遵守已保存标签顺序
-    - 修复创建新的助手/Agent 时的激活问题
-    - 修复 Dashscope Anthropic API 主机并迁移旧配置
-    - 修复 Ollama 的 Qwen3 思考模式控制
-    - 修复 MCP 按钮消失
-    - 修复创建助手导致空白屏幕
-    - 修复某些情况下上下按钮可见性
-    - 修复钩子在输入法输入时阻止保存
-    - 修复 Azure GPT-image-1 和 OpenRouter Gemini-image
-    - 修复 Silicon 推理问题
-    - 修复主题分支不完整复制，采用两阶段 ID 映射
-    - 修复深度研究模型搜索上下文限制
-    - 修复模型能力检查逻辑
-    - 修复 reranker API 错误响应捕获
-    - 修复右键粘贴文件内容到输入栏
-    - 修复 aiCore 中的 minimax-m2 支持
-    - 修复 Azure embedding 问题
-    - 修复 Agent 编辑模态框加载竞态条件
-    - 修复文件路径更新时防抖保存取消问题
+    ⚡ 改进:
+    - SDK：更新 Google 和 OpenAI SDK，新增功能和修复
+    - UI：简化知识库创建模态框和 agent 创建表单
+    - 工具：用 ToolContent 组件替换 renderToolContent 函数，提升可读性
+    - 架构：用会话 ID 命名工具调用 ID 以防止冲突
+    - 配置：AI SDK 配置重构
     <!--LANG:END-->

electron.vite.config.ts

@@ -95,7 +95,8 @@ export default defineConfig({
         '@cherrystudio/ai-core/provider': resolve('packages/aiCore/src/core/providers'),
         '@cherrystudio/ai-core/built-in/plugins': resolve('packages/aiCore/src/core/plugins/built-in'),
         '@cherrystudio/ai-core': resolve('packages/aiCore/src'),
-        '@cherrystudio/extension-table-plus': resolve('packages/extension-table-plus/src')
+        '@cherrystudio/extension-table-plus': resolve('packages/extension-table-plus/src'),
+        '@cherrystudio/ai-sdk-provider': resolve('packages/ai-sdk-provider/src')
       }
     },
     optimizeDeps: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "1.7.0-beta.3",
+  "version": "1.7.0-rc.2",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",
@@ -58,6 +58,7 @@
     "update:i18n": "dotenv -e .env -- tsx scripts/update-i18n.ts",
     "auto:i18n": "dotenv -e .env -- tsx scripts/auto-translate-i18n.ts",
     "update:languages": "tsx scripts/update-languages.ts",
+    "update:upgrade-config": "tsx scripts/update-app-upgrade-config.ts",
     "test": "vitest run --silent",
     "test:main": "vitest run --project main",
     "test:renderer": "vitest run --project renderer",
@@ -73,16 +74,19 @@
     "format:check": "biome format && biome lint",
     "prepare": "git config blame.ignoreRevsFile .git-blame-ignore-revs && husky",
     "claude": "dotenv -e .env -- claude",
-    "release:aicore:alpha": "yarn workspace @cherrystudio/ai-core version prerelease --immediate && yarn workspace @cherrystudio/ai-core npm publish --tag alpha --access public",
-    "release:aicore:beta": "yarn workspace @cherrystudio/ai-core version prerelease --immediate && yarn workspace @cherrystudio/ai-core npm publish --tag beta --access public",
-    "release:aicore": "yarn workspace @cherrystudio/ai-core version patch --immediate && yarn workspace @cherrystudio/ai-core npm publish --access public"
+    "release:aicore:alpha": "yarn workspace @cherrystudio/ai-core version prerelease --preid alpha --immediate && yarn workspace @cherrystudio/ai-core build && yarn workspace @cherrystudio/ai-core npm publish --tag alpha --access public",
+    "release:aicore:beta": "yarn workspace @cherrystudio/ai-core version prerelease --preid beta --immediate && yarn workspace @cherrystudio/ai-core build && yarn workspace @cherrystudio/ai-core npm publish --tag beta --access public",
+    "release:aicore": "yarn workspace @cherrystudio/ai-core version patch --immediate && yarn workspace @cherrystudio/ai-core build && yarn workspace @cherrystudio/ai-core npm publish --access public",
+    "release:ai-sdk-provider": "yarn workspace @cherrystudio/ai-sdk-provider version patch --immediate && yarn workspace @cherrystudio/ai-sdk-provider build && yarn workspace @cherrystudio/ai-sdk-provider 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.30#~/.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.30-b50a299674.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",
+    "@paymoapp/electron-shutdown-handler": "^1.1.2",
     "@strongtz/win32-arm64-msvc": "^0.4.7",
+    "emoji-picker-element-data": "^1",
     "express": "^5.1.0",
     "font-list": "^2.0.0",
     "graceful-fs": "^4.2.11",
@@ -105,19 +109,25 @@
     "@agentic/exa": "^7.3.3",
     "@agentic/searxng": "^7.3.3",
     "@agentic/tavily": "^7.3.3",
-    "@ai-sdk/amazon-bedrock": "^3.0.42",
-    "@ai-sdk/google-vertex": "^3.0.48",
-    "@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",
+    "@ai-sdk/amazon-bedrock": "^3.0.56",
+    "@ai-sdk/anthropic": "^2.0.45",
+    "@ai-sdk/cerebras": "^1.0.31",
+    "@ai-sdk/gateway": "^2.0.13",
+    "@ai-sdk/google": "patch:@ai-sdk/google@npm%3A2.0.40#~/.yarn/patches/@ai-sdk-google-npm-2.0.40-47e0eeee83.patch",
+    "@ai-sdk/google-vertex": "^3.0.72",
+    "@ai-sdk/huggingface": "^0.0.10",
+    "@ai-sdk/mistral": "^2.0.24",
+    "@ai-sdk/openai": "patch:@ai-sdk/openai@npm%3A2.0.71#~/.yarn/patches/@ai-sdk-openai-npm-2.0.71-a88ef00525.patch",
+    "@ai-sdk/perplexity": "^2.0.20",
+    "@ai-sdk/test-server": "^0.0.1",
     "@ant-design/v5-patch-for-react-19": "^1.0.3",
     "@anthropic-ai/sdk": "^0.41.0",
     "@anthropic-ai/vertex-sdk": "patch:@anthropic-ai/vertex-sdk@npm%3A0.11.4#~/.yarn/patches/@anthropic-ai-vertex-sdk-npm-0.11.4-c19cb41edb.patch",
-    "@aws-sdk/client-bedrock": "^3.840.0",
-    "@aws-sdk/client-bedrock-runtime": "^3.840.0",
-    "@aws-sdk/client-s3": "^3.840.0",
+    "@aws-sdk/client-bedrock": "^3.910.0",
+    "@aws-sdk/client-bedrock-runtime": "^3.910.0",
+    "@aws-sdk/client-s3": "^3.910.0",
     "@biomejs/biome": "2.2.4",
-    "@cherrystudio/ai-core": "workspace:^1.0.0-alpha.18",
+    "@cherrystudio/ai-core": "workspace:^1.0.9",
     "@cherrystudio/embedjs": "^0.1.31",
     "@cherrystudio/embedjs-libsql": "^0.1.31",
     "@cherrystudio/embedjs-loader-csv": "^0.1.31",
@@ -131,7 +141,7 @@
     "@cherrystudio/embedjs-ollama": "^0.1.31",
     "@cherrystudio/embedjs-openai": "^0.1.31",
     "@cherrystudio/extension-table-plus": "workspace:^",
-    "@cherrystudio/openai": "^6.5.0",
+    "@cherrystudio/openai": "^6.9.0",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/modifiers": "^9.0.0",
     "@dnd-kit/sortable": "^10.0.0",
@@ -146,7 +156,6 @@
     "@eslint/js": "^9.22.0",
     "@google/genai": "patch:@google/genai@npm%3A1.0.1#~/.yarn/patches/@google-genai-npm-1.0.1-e26f0f9af7.patch",
     "@hello-pangea/dnd": "^18.0.1",
-    "@heroui/react": "^2.8.3",
     "@kangfenmao/keyv-storage": "^0.1.0",
     "@langchain/community": "^1.0.0",
     "@langchain/core": "patch:@langchain/core@npm%3A1.0.2#~/.yarn/patches/@langchain-core-npm-1.0.2-183ef83fe4.patch",
@@ -155,14 +164,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.2.5",
     "@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.21",
     "@playwright/test": "^1.52.0",
     "@radix-ui/react-context-menu": "^2.2.16",
     "@reduxjs/toolkit": "^2.2.5",
@@ -231,7 +240,7 @@
     "@viz-js/lang-dot": "^1.0.5",
     "@viz-js/viz": "^3.14.0",
     "@xyflow/react": "^12.4.4",
-    "ai": "^5.0.76",
+    "ai": "^5.0.98",
     "antd": "patch:antd@npm%3A5.27.0#~/.yarn/patches/antd-npm-5.27.0-aa91c36546.patch",
     "archiver": "^7.0.1",
     "async-mutex": "^0.5.0",
@@ -241,7 +250,7 @@
     "check-disk-space": "3.4.0",
     "cheerio": "^1.1.2",
     "chokidar": "^4.0.3",
-    "claude-code-plugins": "1.0.1",
+    "claude-code-plugins": "1.0.3",
     "cli-progress": "^3.12.0",
     "clsx": "^2.1.1",
     "code-inspector-plugin": "^0.20.14",
@@ -257,12 +266,12 @@
     "dotenv-cli": "^7.4.2",
     "drizzle-kit": "^0.31.4",
     "drizzle-orm": "^0.44.5",
-    "electron": "38.4.0",
-    "electron-builder": "26.0.15",
+    "electron": "38.7.0",
+    "electron-builder": "26.1.0",
     "electron-devtools-installer": "^3.2.0",
     "electron-reload": "^2.0.0-alpha.1",
     "electron-store": "^8.2.0",
-    "electron-updater": "6.6.4",
+    "electron-updater": "patch:electron-updater@npm%3A6.7.0#~/.yarn/patches/electron-updater-npm-6.7.0-47b11bb0d4.patch",
     "electron-vite": "4.0.1",
     "electron-window-state": "^5.0.3",
     "emittery": "^1.0.3",
@@ -348,6 +357,7 @@
     "striptags": "^3.2.0",
     "styled-components": "^6.1.11",
     "swr": "^2.3.6",
+    "tailwind-merge": "^3.3.1",
     "tailwindcss": "^4.1.13",
     "tar": "^7.4.3",
     "tiny-pinyin": "^1.3.2",
@@ -373,17 +383,16 @@
     "zod": "^4.1.5"
   },
   "resolutions": {
+    "@smithy/types": "4.7.1",
     "@codemirror/language": "6.11.3",
     "@codemirror/lint": "6.8.5",
     "@codemirror/view": "6.38.1",
     "@langchain/core@npm:^0.3.26": "patch:@langchain/core@npm%3A1.0.2#~/.yarn/patches/@langchain-core-npm-1.0.2-183ef83fe4.patch",
-    "app-builder-lib@npm:26.0.13": "patch:app-builder-lib@npm%3A26.0.13#~/.yarn/patches/app-builder-lib-npm-26.0.13-a064c9e1d0.patch",
-    "app-builder-lib@npm:26.0.15": "patch:app-builder-lib@npm%3A26.0.15#~/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch",
     "atomically@npm:^1.7.0": "patch:atomically@npm%3A1.7.0#~/.yarn/patches/atomically-npm-1.7.0-e742e5293b.patch",
     "esbuild": "^0.25.0",
     "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",
+    "node-abi": "4.24.0",
     "openai@npm:^4.77.0": "npm:@cherrystudio/openai@6.5.0",
     "openai@npm:^4.87.3": "npm:@cherrystudio/openai@6.5.0",
     "pdf-parse@npm:1.1.1": "patch:pdf-parse@npm%3A1.1.1#~/.yarn/patches/pdf-parse-npm-1.1.1-04a6109b2a.patch",
@@ -392,7 +401,6 @@
     "undici": "6.21.2",
     "vite": "npm:rolldown-vite@7.1.5",
     "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.23": "patch:@ai-sdk/google@npm%3A2.0.23#~/.yarn/patches/@ai-sdk-google-npm-2.0.23-81682e07b0.patch",
     "@ai-sdk/openai@npm:^2.0.52": "patch:@ai-sdk/openai@npm%3A2.0.52#~/.yarn/patches/@ai-sdk-openai-npm-2.0.52-b36d949c76.patch",
     "@img/sharp-darwin-arm64": "0.34.3",
     "@img/sharp-darwin-x64": "0.34.3",
@@ -403,7 +411,13 @@
     "openai@npm:5.12.2": "npm:@cherrystudio/openai@6.5.0",
     "@langchain/openai@npm:>=0.1.0 <0.6.0": "patch:@langchain/openai@npm%3A1.0.0#~/.yarn/patches/@langchain-openai-npm-1.0.0-474d0ad9d4.patch",
     "@langchain/openai@npm:^0.3.16": "patch:@langchain/openai@npm%3A1.0.0#~/.yarn/patches/@langchain-openai-npm-1.0.0-474d0ad9d4.patch",
-    "@langchain/openai@npm:>=0.2.0 <0.7.0": "patch:@langchain/openai@npm%3A1.0.0#~/.yarn/patches/@langchain-openai-npm-1.0.0-474d0ad9d4.patch"
+    "@langchain/openai@npm:>=0.2.0 <0.7.0": "patch:@langchain/openai@npm%3A1.0.0#~/.yarn/patches/@langchain-openai-npm-1.0.0-474d0ad9d4.patch",
+    "@ai-sdk/openai@npm:2.0.64": "patch:@ai-sdk/openai@npm%3A2.0.64#~/.yarn/patches/@ai-sdk-openai-npm-2.0.64-48f99f5bf3.patch",
+    "@ai-sdk/openai@npm:^2.0.42": "patch:@ai-sdk/openai@npm%3A2.0.71#~/.yarn/patches/@ai-sdk-openai-npm-2.0.71-a88ef00525.patch",
+    "@ai-sdk/google@npm:2.0.40": "patch:@ai-sdk/google@npm%3A2.0.40#~/.yarn/patches/@ai-sdk-google-npm-2.0.40-47e0eeee83.patch",
+    "@ai-sdk/openai@npm:2.0.71": "patch:@ai-sdk/openai@npm%3A2.0.71#~/.yarn/patches/@ai-sdk-openai-npm-2.0.71-a88ef00525.patch",
+    "@ai-sdk/openai-compatible@npm:1.0.27": "patch:@ai-sdk/openai-compatible@npm%3A1.0.27#~/.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.27-06f74278cf.patch",
+    "@ai-sdk/openai-compatible@npm:^1.0.19": "patch:@ai-sdk/openai-compatible@npm%3A1.0.27#~/.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.27-06f74278cf.patch"
   },
   "packageManager": "yarn@4.9.1",
   "lint-staged": {

packages/ai-sdk-provider/README.md

@@ -0,0 +1,39 @@
+# @cherrystudio/ai-sdk-provider
+
+CherryIN provider bundle for the [Vercel AI SDK](https://ai-sdk.dev/).  
+It exposes the CherryIN OpenAI-compatible entrypoints and dynamically routes Anthropic and Gemini model ids to their CherryIN upstream equivalents.
+
+## Installation
+
+```bash
+npm install ai @cherrystudio/ai-sdk-provider @ai-sdk/anthropic @ai-sdk/google @ai-sdk/openai
+# or
+yarn add ai @cherrystudio/ai-sdk-provider @ai-sdk/anthropic @ai-sdk/google @ai-sdk/openai
+```
+
+> **Note**: This package requires peer dependencies `ai`, `@ai-sdk/anthropic`, `@ai-sdk/google`, and `@ai-sdk/openai` to be installed.
+
+## Usage
+
+```ts
+import { createCherryIn, cherryIn } from '@cherrystudio/ai-sdk-provider'
+
+const cherryInProvider = createCherryIn({
+  apiKey: process.env.CHERRYIN_API_KEY,
+  // optional overrides:
+  // baseURL: 'https://open.cherryin.net/v1',
+  // anthropicBaseURL: 'https://open.cherryin.net/anthropic',
+  // geminiBaseURL: 'https://open.cherryin.net/gemini/v1beta',
+})
+
+// Chat models will auto-route based on the model id prefix:
+const openaiModel = cherryInProvider.chat('gpt-4o-mini')
+const anthropicModel = cherryInProvider.chat('claude-3-5-sonnet-latest')
+const geminiModel = cherryInProvider.chat('gemini-2.0-pro-exp')
+
+const { text } = await openaiModel.invoke('Hello CherryIN!')
+```
+
+The provider also exposes `completion`, `responses`, `embedding`, `image`, `transcription`, and `speech` helpers aligned with the upstream APIs.
+
+See [AI SDK docs](https://ai-sdk.dev/providers/community-providers/custom-providers) for configuring custom providers.

packages/ai-sdk-provider/package.json

@@ -0,0 +1,64 @@
+{
+  "name": "@cherrystudio/ai-sdk-provider",
+  "version": "0.1.3",
+  "description": "Cherry Studio AI SDK provider bundle with CherryIN routing.",
+  "keywords": [
+    "ai-sdk",
+    "provider",
+    "cherryin",
+    "vercel-ai-sdk",
+    "cherry-studio"
+  ],
+  "author": "Cherry Studio",
+  "license": "MIT",
+  "homepage": "https://github.com/CherryHQ/cherry-studio",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/CherryHQ/cherry-studio.git",
+    "directory": "packages/ai-sdk-provider"
+  },
+  "bugs": {
+    "url": "https://github.com/CherryHQ/cherry-studio/issues"
+  },
+  "type": "module",
+  "main": "dist/index.cjs",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "tsdown",
+    "dev": "tsc -w",
+    "clean": "rm -rf dist",
+    "test": "vitest run",
+    "test:watch": "vitest"
+  },
+  "peerDependencies": {
+    "@ai-sdk/anthropic": "^2.0.29",
+    "@ai-sdk/google": "^2.0.23",
+    "@ai-sdk/openai": "^2.0.64",
+    "ai": "^5.0.26"
+  },
+  "dependencies": {
+    "@ai-sdk/provider": "^2.0.0",
+    "@ai-sdk/provider-utils": "^3.0.17"
+  },
+  "devDependencies": {
+    "tsdown": "^0.13.3",
+    "typescript": "^5.8.2",
+    "vitest": "^3.2.4"
+  },
+  "sideEffects": false,
+  "engines": {
+    "node": ">=18.0.0"
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs",
+      "default": "./dist/index.js"
+    }
+  }
+}

packages/ai-sdk-provider/src/cherryin-provider.ts

@@ -0,0 +1,347 @@
+import { AnthropicMessagesLanguageModel } from '@ai-sdk/anthropic/internal'
+import { GoogleGenerativeAILanguageModel } from '@ai-sdk/google/internal'
+import type { OpenAIProviderSettings } from '@ai-sdk/openai'
+import {
+  OpenAIChatLanguageModel,
+  OpenAICompletionLanguageModel,
+  OpenAIEmbeddingModel,
+  OpenAIImageModel,
+  OpenAIResponsesLanguageModel,
+  OpenAISpeechModel,
+  OpenAITranscriptionModel
+} from '@ai-sdk/openai/internal'
+import {
+  type EmbeddingModelV2,
+  type ImageModelV2,
+  type LanguageModelV2,
+  type ProviderV2,
+  type SpeechModelV2,
+  type TranscriptionModelV2
+} from '@ai-sdk/provider'
+import type { FetchFunction } from '@ai-sdk/provider-utils'
+import { loadApiKey, withoutTrailingSlash } from '@ai-sdk/provider-utils'
+
+export const CHERRYIN_PROVIDER_NAME = 'cherryin' as const
+export const DEFAULT_CHERRYIN_BASE_URL = 'https://open.cherryin.net/v1'
+export const DEFAULT_CHERRYIN_ANTHROPIC_BASE_URL = 'https://open.cherryin.net/v1'
+export const DEFAULT_CHERRYIN_GEMINI_BASE_URL = 'https://open.cherryin.net/v1beta/models'
+
+const ANTHROPIC_PREFIX = /^anthropic\//i
+const GEMINI_PREFIX = /^google\//i
+// const GEMINI_EXCLUDED_SUFFIXES = ['-nothink', '-search']
+
+type HeaderValue = string | undefined
+
+type HeadersInput = Record<string, HeaderValue> | (() => Record<string, HeaderValue>)
+
+export interface CherryInProviderSettings {
+  /**
+   * CherryIN API key.
+   *
+   * If omitted, the provider will read the `CHERRYIN_API_KEY` environment variable.
+   */
+  apiKey?: string
+  /**
+   * Optional custom fetch implementation.
+   */
+  fetch?: FetchFunction
+  /**
+   * Base URL for OpenAI-compatible CherryIN endpoints.
+   *
+   * Defaults to `https://open.cherryin.net/v1`.
+   */
+  baseURL?: string
+  /**
+   * Base URL for Anthropic-compatible endpoints.
+   *
+   * Defaults to `https://open.cherryin.net/anthropic`.
+   */
+  anthropicBaseURL?: string
+  /**
+   * Base URL for Gemini-compatible endpoints.
+   *
+   * Defaults to `https://open.cherryin.net/gemini/v1beta`.
+   */
+  geminiBaseURL?: string
+  /**
+   * Optional static headers applied to every request.
+   */
+  headers?: HeadersInput
+  /**
+   * Optional endpoint type to distinguish different endpoint behaviors.
+   */
+  endpointType?: 'openai' | 'openai-response' | 'anthropic' | 'gemini' | 'image-generation' | 'jina-rerank'
+}
+
+export interface CherryInProvider extends ProviderV2 {
+  (modelId: string, settings?: OpenAIProviderSettings): LanguageModelV2
+  languageModel(modelId: string, settings?: OpenAIProviderSettings): LanguageModelV2
+  chat(modelId: string, settings?: OpenAIProviderSettings): LanguageModelV2
+  responses(modelId: string): LanguageModelV2
+  completion(modelId: string, settings?: OpenAIProviderSettings): LanguageModelV2
+  embedding(modelId: string, settings?: OpenAIProviderSettings): EmbeddingModelV2<string>
+  textEmbedding(modelId: string, settings?: OpenAIProviderSettings): EmbeddingModelV2<string>
+  textEmbeddingModel(modelId: string, settings?: OpenAIProviderSettings): EmbeddingModelV2<string>
+  image(modelId: string, settings?: OpenAIProviderSettings): ImageModelV2
+  imageModel(modelId: string, settings?: OpenAIProviderSettings): ImageModelV2
+  transcription(modelId: string): TranscriptionModelV2
+  transcriptionModel(modelId: string): TranscriptionModelV2
+  speech(modelId: string): SpeechModelV2
+  speechModel(modelId: string): SpeechModelV2
+}
+
+const resolveApiKey = (options: CherryInProviderSettings): string =>
+  loadApiKey({
+    apiKey: options.apiKey,
+    environmentVariableName: 'CHERRYIN_API_KEY',
+    description: 'CherryIN'
+  })
+
+const isAnthropicModel = (modelId: string) => ANTHROPIC_PREFIX.test(modelId)
+const isGeminiModel = (modelId: string) => GEMINI_PREFIX.test(modelId)
+
+const createCustomFetch = (originalFetch?: any) => {
+  return async (url: string, options: any) => {
+    if (options?.body) {
+      try {
+        const body = JSON.parse(options.body)
+        if (body.tools && Array.isArray(body.tools) && body.tools.length === 0 && body.tool_choice) {
+          delete body.tool_choice
+          options.body = JSON.stringify(body)
+        }
+      } catch (error) {
+        // ignore error
+      }
+    }
+
+    return originalFetch ? originalFetch(url, options) : fetch(url, options)
+  }
+}
+class CherryInOpenAIChatLanguageModel extends OpenAIChatLanguageModel {
+  constructor(modelId: string, settings: any) {
+    super(modelId, {
+      ...settings,
+      fetch: createCustomFetch(settings.fetch)
+    })
+  }
+}
+
+const resolveConfiguredHeaders = (headers?: HeadersInput): Record<string, HeaderValue> => {
+  if (typeof headers === 'function') {
+    return { ...headers() }
+  }
+  return headers ? { ...headers } : {}
+}
+
+const toBearerToken = (authorization?: string) => (authorization ? authorization.replace(/^Bearer\s+/i, '') : undefined)
+
+const createJsonHeadersGetter = (options: CherryInProviderSettings): (() => Record<string, HeaderValue>) => {
+  return () => ({
+    Authorization: `Bearer ${resolveApiKey(options)}`,
+    'Content-Type': 'application/json',
+    ...resolveConfiguredHeaders(options.headers)
+  })
+}
+
+const createAuthHeadersGetter = (options: CherryInProviderSettings): (() => Record<string, HeaderValue>) => {
+  return () => ({
+    Authorization: `Bearer ${resolveApiKey(options)}`,
+    ...resolveConfiguredHeaders(options.headers)
+  })
+}
+
+export const createCherryIn = (options: CherryInProviderSettings = {}): CherryInProvider => {
+  const {
+    baseURL = DEFAULT_CHERRYIN_BASE_URL,
+    anthropicBaseURL = DEFAULT_CHERRYIN_ANTHROPIC_BASE_URL,
+    geminiBaseURL = DEFAULT_CHERRYIN_GEMINI_BASE_URL,
+    fetch,
+    endpointType
+  } = options
+
+  const getJsonHeaders = createJsonHeadersGetter(options)
+  const getAuthHeaders = createAuthHeadersGetter(options)
+
+  const url = ({ path }: { path: string; modelId: string }) => `${withoutTrailingSlash(baseURL)}${path}`
+
+  const createAnthropicModel = (modelId: string) =>
+    new AnthropicMessagesLanguageModel(modelId, {
+      provider: `${CHERRYIN_PROVIDER_NAME}.anthropic`,
+      baseURL: anthropicBaseURL,
+      headers: () => {
+        const headers = getJsonHeaders()
+        const apiKey = toBearerToken(headers.Authorization)
+        return {
+          ...headers,
+          'x-api-key': apiKey
+        }
+      },
+      fetch,
+      supportedUrls: () => ({
+        'image/*': [/^https?:\/\/.*$/]
+      })
+    })
+
+  const createGeminiModel = (modelId: string) =>
+    new GoogleGenerativeAILanguageModel(modelId, {
+      provider: `${CHERRYIN_PROVIDER_NAME}.google`,
+      baseURL: geminiBaseURL,
+      headers: () => {
+        const headers = getJsonHeaders()
+        const apiKey = toBearerToken(headers.Authorization)
+        return {
+          ...headers,
+          'x-goog-api-key': apiKey
+        }
+      },
+      fetch,
+      generateId: () => `${CHERRYIN_PROVIDER_NAME}-${Date.now()}`,
+      supportedUrls: () => ({})
+    })
+
+  const createOpenAIChatModel = (modelId: string, settings: OpenAIProviderSettings = {}) =>
+    new CherryInOpenAIChatLanguageModel(modelId, {
+      provider: `${CHERRYIN_PROVIDER_NAME}.openai-chat`,
+      url,
+      headers: () => ({
+        ...getJsonHeaders(),
+        ...settings.headers
+      }),
+      fetch
+    })
+
+  const createChatModelByModelId = (modelId: string, settings: OpenAIProviderSettings = {}) => {
+    if (isAnthropicModel(modelId)) {
+      return createAnthropicModel(modelId)
+    }
+    if (isGeminiModel(modelId)) {
+      return createGeminiModel(modelId)
+    }
+    return new OpenAIResponsesLanguageModel(modelId, {
+      provider: `${CHERRYIN_PROVIDER_NAME}.openai`,
+      url,
+      headers: () => ({
+        ...getJsonHeaders(),
+        ...settings.headers
+      }),
+      fetch
+    })
+  }
+
+  const createChatModel = (modelId: string, settings: OpenAIProviderSettings = {}) => {
+    if (!endpointType) return createChatModelByModelId(modelId, settings)
+    switch (endpointType) {
+      case 'anthropic':
+        return createAnthropicModel(modelId)
+      case 'gemini':
+        return createGeminiModel(modelId)
+      case 'openai':
+        return createOpenAIChatModel(modelId)
+      case 'openai-response':
+      default:
+        return new OpenAIResponsesLanguageModel(modelId, {
+          provider: `${CHERRYIN_PROVIDER_NAME}.openai`,
+          url,
+          headers: () => ({
+            ...getJsonHeaders(),
+            ...settings.headers
+          }),
+          fetch
+        })
+    }
+  }
+
+  const createCompletionModel = (modelId: string, settings: OpenAIProviderSettings = {}) =>
+    new OpenAICompletionLanguageModel(modelId, {
+      provider: `${CHERRYIN_PROVIDER_NAME}.completion`,
+      url,
+      headers: () => ({
+        ...getJsonHeaders(),
+        ...settings.headers
+      }),
+      fetch
+    })
+
+  const createEmbeddingModel = (modelId: string, settings: OpenAIProviderSettings = {}) =>
+    new OpenAIEmbeddingModel(modelId, {
+      provider: `${CHERRYIN_PROVIDER_NAME}.embeddings`,
+      url,
+      headers: () => ({
+        ...getJsonHeaders(),
+        ...settings.headers
+      }),
+      fetch
+    })
+
+  const createResponsesModel = (modelId: string) =>
+    new OpenAIResponsesLanguageModel(modelId, {
+      provider: `${CHERRYIN_PROVIDER_NAME}.responses`,
+      url,
+      headers: () => ({
+        ...getJsonHeaders()
+      }),
+      fetch
+    })
+
+  const createImageModel = (modelId: string, settings: OpenAIProviderSettings = {}) =>
+    new OpenAIImageModel(modelId, {
+      provider: `${CHERRYIN_PROVIDER_NAME}.image`,
+      url,
+      headers: () => ({
+        ...getJsonHeaders(),
+        ...settings.headers
+      }),
+      fetch
+    })
+
+  const createTranscriptionModel = (modelId: string) =>
+    new OpenAITranscriptionModel(modelId, {
+      provider: `${CHERRYIN_PROVIDER_NAME}.transcription`,
+      url,
+      headers: () => ({
+        ...getAuthHeaders()
+      }),
+      fetch
+    })
+
+  const createSpeechModel = (modelId: string) =>
+    new OpenAISpeechModel(modelId, {
+      provider: `${CHERRYIN_PROVIDER_NAME}.speech`,
+      url,
+      headers: () => ({
+        ...getJsonHeaders()
+      }),
+      fetch
+    })
+
+  const provider: CherryInProvider = function (modelId: string, settings?: OpenAIProviderSettings) {
+    if (new.target) {
+      throw new Error('CherryIN provider function cannot be called with the new keyword.')
+    }
+
+    return createChatModel(modelId, settings)
+  }
+
+  provider.languageModel = createChatModel
+  provider.chat = createOpenAIChatModel
+
+  provider.responses = createResponsesModel
+  provider.completion = createCompletionModel
+
+  provider.embedding = createEmbeddingModel
+  provider.textEmbedding = createEmbeddingModel
+  provider.textEmbeddingModel = createEmbeddingModel
+
+  provider.image = createImageModel
+  provider.imageModel = createImageModel
+
+  provider.transcription = createTranscriptionModel
+  provider.transcriptionModel = createTranscriptionModel
+
+  provider.speech = createSpeechModel
+  provider.speechModel = createSpeechModel
+
+  return provider
+}
+
+export const cherryIn = createCherryIn()

packages/ai-sdk-provider/src/index.ts

@@ -0,0 +1 @@
+export * from './cherryin-provider'

packages/ai-sdk-provider/tsconfig.json

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

packages/ai-sdk-provider/tsdown.config.ts

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

packages/aiCore/README.md

@@ -71,7 +71,7 @@ Cherry Studio AI Core 是一个基于 Vercel AI SDK 的统一 AI Provider 接口
 ## 安装
 
 ```bash
-npm install @cherrystudio/ai-core ai
+npm install @cherrystudio/ai-core ai @ai-sdk/google @ai-sdk/openai
 ```
 
 ### React Native

packages/aiCore/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cherrystudio/ai-core",
-  "version": "1.0.1",
+  "version": "1.0.9",
   "description": "Cherry Studio AI Core - Unified AI Provider Interface Based on Vercel AI SDK",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -33,17 +33,19 @@
   },
   "homepage": "https://github.com/CherryHQ/cherry-studio#readme",
   "peerDependencies": {
+    "@ai-sdk/google": "^2.0.36",
+    "@ai-sdk/openai": "^2.0.64",
+    "@cherrystudio/ai-sdk-provider": "^0.1.3",
     "ai": "^5.0.26"
   },
   "dependencies": {
-    "@ai-sdk/anthropic": "^2.0.32",
-    "@ai-sdk/azure": "^2.0.53",
-    "@ai-sdk/deepseek": "^1.0.23",
-    "@ai-sdk/openai": "patch:@ai-sdk/openai@npm%3A2.0.52#~/.yarn/patches/@ai-sdk-openai-npm-2.0.52-b36d949c76.patch",
-    "@ai-sdk/openai-compatible": "^1.0.22",
+    "@ai-sdk/anthropic": "^2.0.45",
+    "@ai-sdk/azure": "^2.0.73",
+    "@ai-sdk/deepseek": "^1.0.29",
+    "@ai-sdk/openai-compatible": "patch:@ai-sdk/openai-compatible@npm%3A1.0.27#~/.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.27-06f74278cf.patch",
     "@ai-sdk/provider": "^2.0.0",
-    "@ai-sdk/provider-utils": "^3.0.12",
-    "@ai-sdk/xai": "^2.0.26",
+    "@ai-sdk/provider-utils": "^3.0.17",
+    "@ai-sdk/xai": "^2.0.34",
     "zod": "^4.1.5"
   },
   "devDependencies": {

packages/aiCore/src/__tests__/fixtures/mock-providers.ts

@@ -0,0 +1,180 @@
+/**
+ * Mock Provider Instances
+ * Provides mock implementations for all supported AI providers
+ */
+
+import type { ImageModelV2, LanguageModelV2 } from '@ai-sdk/provider'
+import { vi } from 'vitest'
+
+/**
+ * Creates a mock language model with customizable behavior
+ */
+export function createMockLanguageModel(overrides?: Partial<LanguageModelV2>): LanguageModelV2 {
+  return {
+    specificationVersion: 'v1',
+    provider: 'mock-provider',
+    modelId: 'mock-model',
+    defaultObjectGenerationMode: 'tool',
+
+    doGenerate: vi.fn().mockResolvedValue({
+      text: 'Mock response text',
+      finishReason: 'stop',
+      usage: {
+        promptTokens: 10,
+        completionTokens: 20,
+        totalTokens: 30
+      },
+      rawCall: { rawPrompt: null, rawSettings: {} },
+      rawResponse: { headers: {} },
+      warnings: []
+    }),
+
+    doStream: vi.fn().mockReturnValue({
+      stream: (async function* () {
+        yield {
+          type: 'text-delta',
+          textDelta: 'Mock '
+        }
+        yield {
+          type: 'text-delta',
+          textDelta: 'streaming '
+        }
+        yield {
+          type: 'text-delta',
+          textDelta: 'response'
+        }
+        yield {
+          type: 'finish',
+          finishReason: 'stop',
+          usage: {
+            promptTokens: 10,
+            completionTokens: 15,
+            totalTokens: 25
+          }
+        }
+      })(),
+      rawCall: { rawPrompt: null, rawSettings: {} },
+      rawResponse: { headers: {} },
+      warnings: []
+    }),
+
+    ...overrides
+  } as LanguageModelV2
+}
+
+/**
+ * Creates a mock image model with customizable behavior
+ */
+export function createMockImageModel(overrides?: Partial<ImageModelV2>): ImageModelV2 {
+  return {
+    specificationVersion: 'v2',
+    provider: 'mock-provider',
+    modelId: 'mock-image-model',
+
+    doGenerate: vi.fn().mockResolvedValue({
+      images: [
+        {
+          base64: 'mock-base64-image-data',
+          uint8Array: new Uint8Array([1, 2, 3, 4, 5]),
+          mimeType: 'image/png'
+        }
+      ],
+      warnings: []
+    }),
+
+    ...overrides
+  } as ImageModelV2
+}
+
+/**
+ * Mock provider configurations for testing
+ */
+export const mockProviderConfigs = {
+  openai: {
+    apiKey: 'sk-test-openai-key-123456789',
+    baseURL: 'https://api.openai.com/v1',
+    organization: 'test-org'
+  },
+
+  anthropic: {
+    apiKey: 'sk-ant-test-key-123456789',
+    baseURL: 'https://api.anthropic.com'
+  },
+
+  google: {
+    apiKey: 'test-google-api-key-123456789',
+    baseURL: 'https://generativelanguage.googleapis.com/v1'
+  },
+
+  xai: {
+    apiKey: 'xai-test-key-123456789',
+    baseURL: 'https://api.x.ai/v1'
+  },
+
+  azure: {
+    apiKey: 'test-azure-key-123456789',
+    resourceName: 'test-resource',
+    deployment: 'test-deployment'
+  },
+
+  deepseek: {
+    apiKey: 'sk-test-deepseek-key-123456789',
+    baseURL: 'https://api.deepseek.com/v1'
+  },
+
+  openrouter: {
+    apiKey: 'sk-or-test-key-123456789',
+    baseURL: 'https://openrouter.ai/api/v1'
+  },
+
+  huggingface: {
+    apiKey: 'hf_test_key_123456789',
+    baseURL: 'https://api-inference.huggingface.co'
+  },
+
+  'openai-compatible': {
+    apiKey: 'test-compatible-key-123456789',
+    baseURL: 'https://api.example.com/v1',
+    name: 'test-provider'
+  },
+
+  'openai-chat': {
+    apiKey: 'sk-test-chat-key-123456789',
+    baseURL: 'https://api.openai.com/v1'
+  }
+} as const
+
+/**
+ * Mock provider instances for testing
+ */
+export const mockProviderInstances = {
+  openai: {
+    name: 'openai-mock',
+    languageModel: createMockLanguageModel({ provider: 'openai', modelId: 'gpt-4' }),
+    imageModel: createMockImageModel({ provider: 'openai', modelId: 'dall-e-3' })
+  },
+
+  anthropic: {
+    name: 'anthropic-mock',
+    languageModel: createMockLanguageModel({ provider: 'anthropic', modelId: 'claude-3-5-sonnet-20241022' })
+  },
+
+  google: {
+    name: 'google-mock',
+    languageModel: createMockLanguageModel({ provider: 'google', modelId: 'gemini-2.0-flash-exp' }),
+    imageModel: createMockImageModel({ provider: 'google', modelId: 'imagen-3.0-generate-001' })
+  },
+
+  xai: {
+    name: 'xai-mock',
+    languageModel: createMockLanguageModel({ provider: 'xai', modelId: 'grok-2-latest' }),
+    imageModel: createMockImageModel({ provider: 'xai', modelId: 'grok-2-image-latest' })
+  },
+
+  deepseek: {
+    name: 'deepseek-mock',
+    languageModel: createMockLanguageModel({ provider: 'deepseek', modelId: 'deepseek-chat' })
+  }
+}
+
+export type ProviderId = keyof typeof mockProviderConfigs

packages/aiCore/src/__tests__/fixtures/mock-responses.ts

@@ -0,0 +1,331 @@
+/**
+ * Mock Responses
+ * Provides realistic mock responses for all provider types
+ */
+
+import { jsonSchema, type ModelMessage, type Tool } from 'ai'
+
+/**
+ * Standard test messages for all scenarios
+ */
+export const testMessages = {
+  simple: [{ role: 'user' as const, content: 'Hello, how are you?' }],
+
+  conversation: [
+    { role: 'user' as const, content: 'What is the capital of France?' },
+    { role: 'assistant' as const, content: 'The capital of France is Paris.' },
+    { role: 'user' as const, content: 'What is its population?' }
+  ],
+
+  withSystem: [
+    { role: 'system' as const, content: 'You are a helpful assistant that provides concise answers.' },
+    { role: 'user' as const, content: 'Explain quantum computing in one sentence.' }
+  ],
+
+  withImages: [
+    {
+      role: 'user' as const,
+      content: [
+        { type: 'text' as const, text: 'What is in this image?' },
+        {
+          type: 'image' as const,
+          image:
+            'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg=='
+        }
+      ]
+    }
+  ],
+
+  toolUse: [{ role: 'user' as const, content: 'What is the weather in San Francisco?' }],
+
+  multiTurn: [
+    { role: 'user' as const, content: 'Can you help me with a math problem?' },
+    { role: 'assistant' as const, content: 'Of course! What math problem would you like help with?' },
+    { role: 'user' as const, content: 'What is 15 * 23?' },
+    { role: 'assistant' as const, content: '15 * 23 = 345' },
+    { role: 'user' as const, content: 'Now divide that by 5' }
+  ]
+} satisfies Record<string, ModelMessage[]>
+
+/**
+ * Standard test tools for tool calling scenarios
+ */
+export const testTools: Record<string, Tool> = {
+  getWeather: {
+    description: 'Get the current weather in a given location',
+    inputSchema: jsonSchema({
+      type: 'object',
+      properties: {
+        location: {
+          type: 'string',
+          description: 'The city and state, e.g. San Francisco, CA'
+        },
+        unit: {
+          type: 'string',
+          enum: ['celsius', 'fahrenheit'],
+          description: 'The temperature unit to use'
+        }
+      },
+      required: ['location']
+    }),
+    execute: async ({ location, unit = 'fahrenheit' }) => {
+      return {
+        location,
+        temperature: unit === 'celsius' ? 22 : 72,
+        unit,
+        condition: 'sunny'
+      }
+    }
+  },
+
+  calculate: {
+    description: 'Perform a mathematical calculation',
+    inputSchema: jsonSchema({
+      type: 'object',
+      properties: {
+        operation: {
+          type: 'string',
+          enum: ['add', 'subtract', 'multiply', 'divide'],
+          description: 'The operation to perform'
+        },
+        a: {
+          type: 'number',
+          description: 'The first number'
+        },
+        b: {
+          type: 'number',
+          description: 'The second number'
+        }
+      },
+      required: ['operation', 'a', 'b']
+    }),
+    execute: async ({ operation, a, b }) => {
+      const operations = {
+        add: (x: number, y: number) => x + y,
+        subtract: (x: number, y: number) => x - y,
+        multiply: (x: number, y: number) => x * y,
+        divide: (x: number, y: number) => x / y
+      }
+      return { result: operations[operation as keyof typeof operations](a, b) }
+    }
+  },
+
+  searchDatabase: {
+    description: 'Search for information in a database',
+    inputSchema: jsonSchema({
+      type: 'object',
+      properties: {
+        query: {
+          type: 'string',
+          description: 'The search query'
+        },
+        limit: {
+          type: 'number',
+          description: 'Maximum number of results to return',
+          default: 10
+        }
+      },
+      required: ['query']
+    }),
+    execute: async ({ query, limit = 10 }) => {
+      return {
+        results: [
+          { id: 1, title: `Result 1 for ${query}`, relevance: 0.95 },
+          { id: 2, title: `Result 2 for ${query}`, relevance: 0.87 }
+        ].slice(0, limit)
+      }
+    }
+  }
+}
+
+/**
+ * Mock streaming chunks for different providers
+ */
+export const mockStreamingChunks = {
+  text: [
+    { type: 'text-delta' as const, textDelta: 'Hello' },
+    { type: 'text-delta' as const, textDelta: ', ' },
+    { type: 'text-delta' as const, textDelta: 'this ' },
+    { type: 'text-delta' as const, textDelta: 'is ' },
+    { type: 'text-delta' as const, textDelta: 'a ' },
+    { type: 'text-delta' as const, textDelta: 'test.' }
+  ],
+
+  withToolCall: [
+    { type: 'text-delta' as const, textDelta: 'Let me check the weather for you.' },
+    {
+      type: 'tool-call-delta' as const,
+      toolCallType: 'function' as const,
+      toolCallId: 'call_123',
+      toolName: 'getWeather',
+      argsTextDelta: '{"location":'
+    },
+    {
+      type: 'tool-call-delta' as const,
+      toolCallType: 'function' as const,
+      toolCallId: 'call_123',
+      toolName: 'getWeather',
+      argsTextDelta: ' "San Francisco, CA"}'
+    },
+    {
+      type: 'tool-call' as const,
+      toolCallType: 'function' as const,
+      toolCallId: 'call_123',
+      toolName: 'getWeather',
+      args: { location: 'San Francisco, CA' }
+    }
+  ],
+
+  withFinish: [
+    { type: 'text-delta' as const, textDelta: 'Complete response.' },
+    {
+      type: 'finish' as const,
+      finishReason: 'stop' as const,
+      usage: {
+        promptTokens: 10,
+        completionTokens: 5,
+        totalTokens: 15
+      }
+    }
+  ]
+}
+
+/**
+ * Mock complete responses for non-streaming scenarios
+ */
+export const mockCompleteResponses = {
+  simple: {
+    text: 'This is a simple response.',
+    finishReason: 'stop' as const,
+    usage: {
+      promptTokens: 15,
+      completionTokens: 8,
+      totalTokens: 23
+    }
+  },
+
+  withToolCalls: {
+    text: 'I will check the weather for you.',
+    toolCalls: [
+      {
+        toolCallId: 'call_456',
+        toolName: 'getWeather',
+        args: { location: 'New York, NY', unit: 'celsius' }
+      }
+    ],
+    finishReason: 'tool-calls' as const,
+    usage: {
+      promptTokens: 25,
+      completionTokens: 12,
+      totalTokens: 37
+    }
+  },
+
+  withWarnings: {
+    text: 'Response with warnings.',
+    finishReason: 'stop' as const,
+    usage: {
+      promptTokens: 10,
+      completionTokens: 5,
+      totalTokens: 15
+    },
+    warnings: [
+      {
+        type: 'unsupported-setting' as const,
+        message: 'Temperature parameter not supported for this model'
+      }
+    ]
+  }
+}
+
+/**
+ * Mock image generation responses
+ */
+export const mockImageResponses = {
+  single: {
+    image: {
+      base64: 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==',
+      uint8Array: new Uint8Array([137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82]),
+      mimeType: 'image/png' as const
+    },
+    warnings: []
+  },
+
+  multiple: {
+    images: [
+      {
+        base64: 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==',
+        uint8Array: new Uint8Array([137, 80, 78, 71]),
+        mimeType: 'image/png' as const
+      },
+      {
+        base64: 'iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAEklEQVR42mNk+M9QzwAEjDAGACCKAgdZ9zImAAAAAElFTkSuQmCC',
+        uint8Array: new Uint8Array([137, 80, 78, 71]),
+        mimeType: 'image/png' as const
+      }
+    ],
+    warnings: []
+  },
+
+  withProviderMetadata: {
+    image: {
+      base64: 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==',
+      uint8Array: new Uint8Array([137, 80, 78, 71]),
+      mimeType: 'image/png' as const
+    },
+    providerMetadata: {
+      openai: {
+        images: [
+          {
+            revisedPrompt: 'A detailed and enhanced version of the original prompt'
+          }
+        ]
+      }
+    },
+    warnings: []
+  }
+}
+
+/**
+ * Mock error responses
+ */
+export const mockErrors = {
+  invalidApiKey: {
+    name: 'APIError',
+    message: 'Invalid API key provided',
+    statusCode: 401
+  },
+
+  rateLimitExceeded: {
+    name: 'RateLimitError',
+    message: 'Rate limit exceeded. Please try again later.',
+    statusCode: 429,
+    headers: {
+      'retry-after': '60'
+    }
+  },
+
+  modelNotFound: {
+    name: 'ModelNotFoundError',
+    message: 'The requested model was not found',
+    statusCode: 404
+  },
+
+  contextLengthExceeded: {
+    name: 'ContextLengthError',
+    message: "This model's maximum context length is 4096 tokens",
+    statusCode: 400
+  },
+
+  timeout: {
+    name: 'TimeoutError',
+    message: 'Request timed out after 30000ms',
+    code: 'ETIMEDOUT'
+  },
+
+  networkError: {
+    name: 'NetworkError',
+    message: 'Network connection failed',
+    code: 'ECONNREFUSED'
+  }
+}

packages/aiCore/src/__tests__/helpers/provider-test-utils.ts

@@ -0,0 +1,329 @@
+/**
+ * Provider-Specific Test Utilities
+ * Helper functions for testing individual providers with all their parameters
+ */
+
+import type { Tool } from 'ai'
+import { expect } from 'vitest'
+
+/**
+ * Provider parameter configurations for comprehensive testing
+ */
+export const providerParameterMatrix = {
+  openai: {
+    models: ['gpt-4', 'gpt-4-turbo', 'gpt-3.5-turbo', 'gpt-4o'],
+    parameters: {
+      temperature: [0, 0.5, 0.7, 1.0, 1.5, 2.0],
+      maxTokens: [100, 500, 1000, 2000, 4000],
+      topP: [0.1, 0.5, 0.9, 1.0],
+      frequencyPenalty: [-2.0, -1.0, 0, 1.0, 2.0],
+      presencePenalty: [-2.0, -1.0, 0, 1.0, 2.0],
+      stop: [undefined, ['stop'], ['STOP', 'END']],
+      seed: [undefined, 12345, 67890],
+      responseFormat: [undefined, { type: 'json_object' as const }],
+      user: [undefined, 'test-user-123']
+    },
+    toolChoice: ['auto', 'required', 'none', { type: 'function' as const, name: 'getWeather' }],
+    parallelToolCalls: [true, false]
+  },
+
+  anthropic: {
+    models: ['claude-3-5-sonnet-20241022', 'claude-3-opus-20240229', 'claude-3-haiku-20240307'],
+    parameters: {
+      temperature: [0, 0.5, 1.0],
+      maxTokens: [100, 1000, 4000, 8000],
+      topP: [0.1, 0.5, 0.9, 1.0],
+      topK: [undefined, 1, 5, 10, 40],
+      stop: [undefined, ['Human:', 'Assistant:']],
+      metadata: [undefined, { userId: 'test-123' }]
+    },
+    toolChoice: ['auto', 'any', { type: 'tool' as const, name: 'getWeather' }]
+  },
+
+  google: {
+    models: ['gemini-2.0-flash-exp', 'gemini-1.5-pro', 'gemini-1.5-flash'],
+    parameters: {
+      temperature: [0, 0.5, 0.9, 1.0],
+      maxTokens: [100, 1000, 2000, 8000],
+      topP: [0.1, 0.5, 0.95, 1.0],
+      topK: [undefined, 1, 16, 40],
+      stopSequences: [undefined, ['END'], ['STOP', 'TERMINATE']]
+    },
+    safetySettings: [
+      undefined,
+      [
+        { category: 'HARM_CATEGORY_HARASSMENT', threshold: 'BLOCK_MEDIUM_AND_ABOVE' },
+        { category: 'HARM_CATEGORY_HATE_SPEECH', threshold: 'BLOCK_ONLY_HIGH' }
+      ]
+    ]
+  },
+
+  xai: {
+    models: ['grok-2-latest', 'grok-2-1212'],
+    parameters: {
+      temperature: [0, 0.5, 1.0, 1.5],
+      maxTokens: [100, 500, 2000, 4000],
+      topP: [0.1, 0.5, 0.9, 1.0],
+      stop: [undefined, ['STOP'], ['END', 'TERMINATE']],
+      seed: [undefined, 12345]
+    }
+  },
+
+  deepseek: {
+    models: ['deepseek-chat', 'deepseek-coder'],
+    parameters: {
+      temperature: [0, 0.5, 1.0],
+      maxTokens: [100, 1000, 4000],
+      topP: [0.1, 0.5, 0.95],
+      frequencyPenalty: [0, 0.5, 1.0],
+      presencePenalty: [0, 0.5, 1.0],
+      stop: [undefined, ['```'], ['END']]
+    }
+  },
+
+  azure: {
+    deployments: ['gpt-4-deployment', 'gpt-35-turbo-deployment'],
+    parameters: {
+      temperature: [0, 0.7, 1.0],
+      maxTokens: [100, 1000, 2000],
+      topP: [0.1, 0.5, 0.95],
+      frequencyPenalty: [0, 1.0],
+      presencePenalty: [0, 1.0],
+      stop: [undefined, ['STOP']]
+    }
+  }
+} as const
+
+/**
+ * Creates test cases for all parameter combinations
+ */
+export function generateParameterTestCases<T extends Record<string, any[]>>(
+  params: T,
+  maxCombinations = 50
+): Array<Partial<{ [K in keyof T]: T[K][number] }>> {
+  const keys = Object.keys(params) as Array<keyof T>
+  const testCases: Array<Partial<{ [K in keyof T]: T[K][number] }>> = []
+
+  // Generate combinations using sampling strategy for large parameter spaces
+  const totalCombinations = keys.reduce((acc, key) => acc * params[key].length, 1)
+
+  if (totalCombinations <= maxCombinations) {
+    // Generate all combinations if total is small
+    generateAllCombinations(params, keys, 0, {}, testCases)
+  } else {
+    // Sample diverse combinations if total is large
+    generateSampledCombinations(params, keys, maxCombinations, testCases)
+  }
+
+  return testCases
+}
+
+function generateAllCombinations<T extends Record<string, any[]>>(
+  params: T,
+  keys: Array<keyof T>,
+  index: number,
+  current: Partial<{ [K in keyof T]: T[K][number] }>,
+  results: Array<Partial<{ [K in keyof T]: T[K][number] }>>
+) {
+  if (index === keys.length) {
+    results.push({ ...current })
+    return
+  }
+
+  const key = keys[index]
+  for (const value of params[key]) {
+    generateAllCombinations(params, keys, index + 1, { ...current, [key]: value }, results)
+  }
+}
+
+function generateSampledCombinations<T extends Record<string, any[]>>(
+  params: T,
+  keys: Array<keyof T>,
+  count: number,
+  results: Array<Partial<{ [K in keyof T]: T[K][number] }>>
+) {
+  // Generate edge cases first (min/max values)
+  const edgeCase1: any = {}
+  const edgeCase2: any = {}
+
+  for (const key of keys) {
+    edgeCase1[key] = params[key][0]
+    edgeCase2[key] = params[key][params[key].length - 1]
+  }
+
+  results.push(edgeCase1, edgeCase2)
+
+  // Generate random combinations for the rest
+  for (let i = results.length; i < count; i++) {
+    const combination: any = {}
+    for (const key of keys) {
+      const values = params[key]
+      combination[key] = values[Math.floor(Math.random() * values.length)]
+    }
+    results.push(combination)
+  }
+}
+
+/**
+ * Validates that all provider-specific parameters are correctly passed through
+ */
+export function validateProviderParams(providerId: string, actualParams: any, expectedParams: any): void {
+  const requiredFields: Record<string, string[]> = {
+    openai: ['model', 'messages'],
+    anthropic: ['model', 'messages'],
+    google: ['model', 'contents'],
+    xai: ['model', 'messages'],
+    deepseek: ['model', 'messages'],
+    azure: ['messages']
+  }
+
+  const fields = requiredFields[providerId] || ['model', 'messages']
+
+  for (const field of fields) {
+    expect(actualParams).toHaveProperty(field)
+  }
+
+  // Validate optional parameters if they were provided
+  const optionalParams = ['temperature', 'max_tokens', 'top_p', 'stop', 'tools']
+
+  for (const param of optionalParams) {
+    if (expectedParams[param] !== undefined) {
+      expect(actualParams[param]).toEqual(expectedParams[param])
+    }
+  }
+}
+
+/**
+ * Creates a comprehensive test suite for a provider
+ */
+// oxlint-disable-next-line no-unused-vars
+export function createProviderTestSuite(_providerId: string) {
+  return {
+    testBasicCompletion: async (executor: any, model: string) => {
+      const result = await executor.generateText({
+        model,
+        messages: [{ role: 'user' as const, content: 'Hello' }]
+      })
+
+      expect(result).toBeDefined()
+      expect(result.text).toBeDefined()
+      expect(typeof result.text).toBe('string')
+    },
+
+    testStreaming: async (executor: any, model: string) => {
+      const chunks: any[] = []
+      const result = await executor.streamText({
+        model,
+        messages: [{ role: 'user' as const, content: 'Hello' }]
+      })
+
+      for await (const chunk of result.textStream) {
+        chunks.push(chunk)
+      }
+
+      expect(chunks.length).toBeGreaterThan(0)
+    },
+
+    testTemperature: async (executor: any, model: string, temperatures: number[]) => {
+      for (const temperature of temperatures) {
+        const result = await executor.generateText({
+          model,
+          messages: [{ role: 'user' as const, content: 'Hello' }],
+          temperature
+        })
+
+        expect(result).toBeDefined()
+      }
+    },
+
+    testMaxTokens: async (executor: any, model: string, maxTokensValues: number[]) => {
+      for (const maxTokens of maxTokensValues) {
+        const result = await executor.generateText({
+          model,
+          messages: [{ role: 'user' as const, content: 'Hello' }],
+          maxTokens
+        })
+
+        expect(result).toBeDefined()
+        if (result.usage?.completionTokens) {
+          expect(result.usage.completionTokens).toBeLessThanOrEqual(maxTokens)
+        }
+      }
+    },
+
+    testToolCalling: async (executor: any, model: string, tools: Record<string, Tool>) => {
+      const result = await executor.generateText({
+        model,
+        messages: [{ role: 'user' as const, content: 'What is the weather in SF?' }],
+        tools
+      })
+
+      expect(result).toBeDefined()
+    },
+
+    testStopSequences: async (executor: any, model: string, stopSequences: string[][]) => {
+      for (const stop of stopSequences) {
+        const result = await executor.generateText({
+          model,
+          messages: [{ role: 'user' as const, content: 'Count to 10' }],
+          stop
+        })
+
+        expect(result).toBeDefined()
+      }
+    }
+  }
+}
+
+/**
+ * Generates test data for vision/multimodal testing
+ */
+export function createVisionTestData() {
+  return {
+    imageUrl: 'https://example.com/test-image.jpg',
+    base64Image:
+      'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==',
+    messages: [
+      {
+        role: 'user' as const,
+        content: [
+          { type: 'text' as const, text: 'What is in this image?' },
+          {
+            type: 'image' as const,
+            image:
+              'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg=='
+          }
+        ]
+      }
+    ]
+  }
+}
+
+/**
+ * Creates mock responses for different finish reasons
+ */
+export function createFinishReasonMocks() {
+  return {
+    stop: {
+      text: 'Complete response.',
+      finishReason: 'stop' as const,
+      usage: { promptTokens: 10, completionTokens: 5, totalTokens: 15 }
+    },
+    length: {
+      text: 'Incomplete response due to',
+      finishReason: 'length' as const,
+      usage: { promptTokens: 10, completionTokens: 100, totalTokens: 110 }
+    },
+    'tool-calls': {
+      text: 'Calling tools',
+      finishReason: 'tool-calls' as const,
+      toolCalls: [{ toolCallId: 'call_1', toolName: 'getWeather', args: { location: 'SF' } }],
+      usage: { promptTokens: 10, completionTokens: 8, totalTokens: 18 }
+    },
+    'content-filter': {
+      text: '',
+      finishReason: 'content-filter' as const,
+      usage: { promptTokens: 10, completionTokens: 0, totalTokens: 10 }
+    }
+  }
+}

packages/aiCore/src/__tests__/helpers/test-utils.ts

@@ -0,0 +1,291 @@
+/**
+ * Test Utilities
+ * Helper functions for testing AI Core functionality
+ */
+
+import { expect, vi } from 'vitest'
+
+import type { ProviderId } from '../fixtures/mock-providers'
+import { createMockImageModel, createMockLanguageModel, mockProviderConfigs } from '../fixtures/mock-providers'
+
+/**
+ * Creates a test provider with streaming support
+ */
+export function createTestStreamingProvider(chunks: any[]) {
+  return createMockLanguageModel({
+    doStream: vi.fn().mockReturnValue({
+      stream: (async function* () {
+        for (const chunk of chunks) {
+          yield chunk
+        }
+      })(),
+      rawCall: { rawPrompt: null, rawSettings: {} },
+      rawResponse: { headers: {} },
+      warnings: []
+    })
+  })
+}
+
+/**
+ * Creates a test provider that throws errors
+ */
+export function createErrorProvider(error: Error) {
+  return createMockLanguageModel({
+    doGenerate: vi.fn().mockRejectedValue(error),
+    doStream: vi.fn().mockImplementation(() => {
+      throw error
+    })
+  })
+}
+
+/**
+ * Collects all chunks from a stream
+ */
+export async function collectStreamChunks<T>(stream: AsyncIterable<T>): Promise<T[]> {
+  const chunks: T[] = []
+  for await (const chunk of stream) {
+    chunks.push(chunk)
+  }
+  return chunks
+}
+
+/**
+ * Waits for a specific number of milliseconds
+ */
+export function wait(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}
+
+/**
+ * Creates a mock abort controller that aborts after a delay
+ */
+export function createDelayedAbortController(delayMs: number): AbortController {
+  const controller = new AbortController()
+  setTimeout(() => controller.abort(), delayMs)
+  return controller
+}
+
+/**
+ * Asserts that a function throws an error with a specific message
+ */
+export async function expectError(fn: () => Promise<any>, expectedMessage?: string | RegExp): Promise<Error> {
+  try {
+    await fn()
+    throw new Error('Expected function to throw an error, but it did not')
+  } catch (error) {
+    if (expectedMessage) {
+      const message = (error as Error).message
+      if (typeof expectedMessage === 'string') {
+        if (!message.includes(expectedMessage)) {
+          throw new Error(`Expected error message to include "${expectedMessage}", but got "${message}"`)
+        }
+      } else {
+        if (!expectedMessage.test(message)) {
+          throw new Error(`Expected error message to match ${expectedMessage}, but got "${message}"`)
+        }
+      }
+    }
+    return error as Error
+  }
+}
+
+/**
+ * Creates a spy function that tracks calls and arguments
+ */
+export function createSpy<T extends (...args: any[]) => any>() {
+  const calls: Array<{ args: Parameters<T>; result?: ReturnType<T>; error?: Error }> = []
+
+  const spy = vi.fn((...args: Parameters<T>) => {
+    try {
+      const result = undefined as ReturnType<T>
+      calls.push({ args, result })
+      return result
+    } catch (error) {
+      calls.push({ args, error: error as Error })
+      throw error
+    }
+  })
+
+  return {
+    fn: spy,
+    calls,
+    getCalls: () => calls,
+    getCallCount: () => calls.length,
+    getLastCall: () => calls[calls.length - 1],
+    reset: () => {
+      calls.length = 0
+      spy.mockClear()
+    }
+  }
+}
+
+/**
+ * Validates provider configuration
+ */
+export function validateProviderConfig(providerId: ProviderId) {
+  const config = mockProviderConfigs[providerId]
+  if (!config) {
+    throw new Error(`No mock configuration found for provider: ${providerId}`)
+  }
+
+  if (!config.apiKey) {
+    throw new Error(`Provider ${providerId} is missing apiKey in mock config`)
+  }
+
+  return config
+}
+
+/**
+ * Creates a test context with common setup
+ */
+export function createTestContext() {
+  const mocks = {
+    languageModel: createMockLanguageModel(),
+    imageModel: createMockImageModel(),
+    providers: new Map<string, any>()
+  }
+
+  const cleanup = () => {
+    mocks.providers.clear()
+    vi.clearAllMocks()
+  }
+
+  return {
+    mocks,
+    cleanup
+  }
+}
+
+/**
+ * Measures execution time of an async function
+ */
+export async function measureTime<T>(fn: () => Promise<T>): Promise<{ result: T; duration: number }> {
+  const start = Date.now()
+  const result = await fn()
+  const duration = Date.now() - start
+  return { result, duration }
+}
+
+/**
+ * Retries a function until it succeeds or max attempts reached
+ */
+export async function retryUntilSuccess<T>(fn: () => Promise<T>, maxAttempts = 3, delayMs = 100): Promise<T> {
+  let lastError: Error | undefined
+
+  for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+    try {
+      return await fn()
+    } catch (error) {
+      lastError = error as Error
+      if (attempt < maxAttempts) {
+        await wait(delayMs)
+      }
+    }
+  }
+
+  throw lastError || new Error('All retry attempts failed')
+}
+
+/**
+ * Creates a mock streaming response that emits chunks at intervals
+ */
+export function createTimedStream<T>(chunks: T[], intervalMs = 10) {
+  return {
+    async *[Symbol.asyncIterator]() {
+      for (const chunk of chunks) {
+        await wait(intervalMs)
+        yield chunk
+      }
+    }
+  }
+}
+
+/**
+ * Asserts that two objects are deeply equal, ignoring specified keys
+ */
+export function assertDeepEqualIgnoring<T extends Record<string, any>>(
+  actual: T,
+  expected: T,
+  ignoreKeys: string[] = []
+): void {
+  const filterKeys = (obj: T): Partial<T> => {
+    const filtered = { ...obj }
+    for (const key of ignoreKeys) {
+      delete filtered[key]
+    }
+    return filtered
+  }
+
+  const filteredActual = filterKeys(actual)
+  const filteredExpected = filterKeys(expected)
+
+  expect(filteredActual).toEqual(filteredExpected)
+}
+
+/**
+ * Creates a provider mock that simulates rate limiting
+ */
+export function createRateLimitedProvider(limitPerSecond: number) {
+  const calls: number[] = []
+
+  return createMockLanguageModel({
+    doGenerate: vi.fn().mockImplementation(async () => {
+      const now = Date.now()
+      calls.push(now)
+
+      // Remove calls older than 1 second
+      const recentCalls = calls.filter((time) => now - time < 1000)
+
+      if (recentCalls.length > limitPerSecond) {
+        throw new Error('Rate limit exceeded')
+      }
+
+      return {
+        text: 'Rate limited response',
+        finishReason: 'stop' as const,
+        usage: { promptTokens: 10, completionTokens: 5, totalTokens: 15 },
+        rawCall: { rawPrompt: null, rawSettings: {} },
+        rawResponse: { headers: {} },
+        warnings: []
+      }
+    })
+  })
+}
+
+/**
+ * Validates streaming response structure
+ */
+export function validateStreamChunk(chunk: any): void {
+  expect(chunk).toBeDefined()
+  expect(chunk).toHaveProperty('type')
+
+  if (chunk.type === 'text-delta') {
+    expect(chunk).toHaveProperty('textDelta')
+    expect(typeof chunk.textDelta).toBe('string')
+  } else if (chunk.type === 'finish') {
+    expect(chunk).toHaveProperty('finishReason')
+    expect(chunk).toHaveProperty('usage')
+  } else if (chunk.type === 'tool-call') {
+    expect(chunk).toHaveProperty('toolCallId')
+    expect(chunk).toHaveProperty('toolName')
+    expect(chunk).toHaveProperty('args')
+  }
+}
+
+/**
+ * Creates a test logger that captures log messages
+ */
+export function createTestLogger() {
+  const logs: Array<{ level: string; message: string; meta?: any }> = []
+
+  return {
+    info: (message: string, meta?: any) => logs.push({ level: 'info', message, meta }),
+    warn: (message: string, meta?: any) => logs.push({ level: 'warn', message, meta }),
+    error: (message: string, meta?: any) => logs.push({ level: 'error', message, meta }),
+    debug: (message: string, meta?: any) => logs.push({ level: 'debug', message, meta }),
+    getLogs: () => logs,
+    clear: () => {
+      logs.length = 0
+    }
+  }
+}

packages/aiCore/src/__tests__/index.ts

@@ -0,0 +1,12 @@
+/**
+ * Test Infrastructure Exports
+ * Central export point for all test utilities, fixtures, and helpers
+ */
+
+// Fixtures
+export * from './fixtures/mock-providers'
+export * from './fixtures/mock-responses'
+
+// Helpers
+export * from './helpers/provider-test-utils'
+export * from './helpers/test-utils'

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

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

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

@@ -1,9 +1,10 @@
-import type { anthropic } from '@ai-sdk/anthropic'
-import type { google } from '@ai-sdk/google'
-import type { openai } from '@ai-sdk/openai'
+import { anthropic } from '@ai-sdk/anthropic'
+import { google } from '@ai-sdk/google'
+import { openai } from '@ai-sdk/openai'
 import type { InferToolInput, InferToolOutput } from 'ai'
 import { type Tool } from 'ai'
 
+import { createOpenRouterOptions, createXaiOptions, mergeProviderOptions } from '../../../options'
 import type { ProviderOptionsMap } from '../../../options/types'
 import type { OpenRouterSearchConfig } from './openrouter'
 
@@ -95,3 +96,56 @@ export type WebSearchToolInputSchema = {
   google: InferToolInput<GoogleWebSearchTool>
   'openai-chat': InferToolInput<OpenAIChatWebSearchTool>
 }
+
+export const switchWebSearchTool = (providerId: string, config: WebSearchPluginConfig, params: any) => {
+  switch (providerId) {
+    case 'openai': {
+      if (config.openai) {
+        if (!params.tools) params.tools = {}
+        params.tools.web_search = openai.tools.webSearch(config.openai)
+      }
+      break
+    }
+    case 'openai-chat': {
+      if (config['openai-chat']) {
+        if (!params.tools) params.tools = {}
+        params.tools.web_search_preview = openai.tools.webSearchPreview(config['openai-chat'])
+      }
+      break
+    }
+
+    case 'anthropic': {
+      if (config.anthropic) {
+        if (!params.tools) params.tools = {}
+        params.tools.web_search = anthropic.tools.webSearch_20250305(config.anthropic)
+      }
+      break
+    }
+
+    case 'google': {
+      // case 'google-vertex':
+      if (!params.tools) params.tools = {}
+      params.tools.web_search = google.tools.googleSearch(config.google || {})
+      break
+    }
+
+    case 'xai': {
+      if (config.xai) {
+        const searchOptions = createXaiOptions({
+          searchParameters: { ...config.xai, mode: 'on' }
+        })
+        params.providerOptions = mergeProviderOptions(params.providerOptions, searchOptions)
+      }
+      break
+    }
+
+    case 'openrouter': {
+      if (config.openrouter) {
+        const searchOptions = createOpenRouterOptions(config.openrouter)
+        params.providerOptions = mergeProviderOptions(params.providerOptions, searchOptions)
+      }
+      break
+    }
+  }
+  return params
+}

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

@@ -2,15 +2,11 @@
  * Web Search Plugin
  * 提供统一的网络搜索能力，支持多个 AI Provider
  */
-import { anthropic } from '@ai-sdk/anthropic'
-import { google } from '@ai-sdk/google'
-import { openai } from '@ai-sdk/openai'
 
-import { createOpenRouterOptions, createXaiOptions, mergeProviderOptions } from '../../../options'
 import { definePlugin } from '../../'
 import type { AiRequestContext } from '../../types'
 import type { WebSearchPluginConfig } from './helper'
-import { DEFAULT_WEB_SEARCH_CONFIG } from './helper'
+import { DEFAULT_WEB_SEARCH_CONFIG, switchWebSearchTool } from './helper'
 
 /**
  * 网络搜索插件
@@ -24,62 +20,19 @@ export const webSearchPlugin = (config: WebSearchPluginConfig = DEFAULT_WEB_SEAR
 
     transformParams: async (params: any, context: AiRequestContext) => {
       const { providerId } = context
-      switch (providerId) {
-        case 'openai': {
-          if (config.openai) {
-            if (!params.tools) params.tools = {}
-            params.tools.web_search = openai.tools.webSearch(config.openai)
-          }
-          break
-        }
-        case 'openai-chat': {
-          if (config['openai-chat']) {
-            if (!params.tools) params.tools = {}
-            params.tools.web_search_preview = openai.tools.webSearchPreview(config['openai-chat'])
-          }
-          break
-        }
+      switchWebSearchTool(providerId, config, params)
 
-        case 'anthropic': {
-          if (config.anthropic) {
-            if (!params.tools) params.tools = {}
-            params.tools.web_search = anthropic.tools.webSearch_20250305(config.anthropic)
-          }
-          break
-        }
-
-        case 'google': {
-          // case 'google-vertex':
-          if (!params.tools) params.tools = {}
-          params.tools.web_search = google.tools.googleSearch(config.google || {})
-          break
-        }
-
-        case 'xai': {
-          if (config.xai) {
-            const searchOptions = createXaiOptions({
-              searchParameters: { ...config.xai, mode: 'on' }
-            })
-            params.providerOptions = mergeProviderOptions(params.providerOptions, searchOptions)
-          }
-          break
-        }
-
-        case 'openrouter': {
-          if (config.openrouter) {
-            const searchOptions = createOpenRouterOptions(config.openrouter)
-            params.providerOptions = mergeProviderOptions(params.providerOptions, searchOptions)
-          }
-          break
-        }
+      if (providerId === 'cherryin' || providerId === 'cherryin-chat') {
+        // cherryin.gemini
+        const _providerId = params.model.provider.split('.')[1]
+        switchWebSearchTool(_providerId, config, params)
       }
-
       return params
     }
   })
 
 // 导出类型定义供开发者使用
-export type { WebSearchPluginConfig, WebSearchToolOutputSchema } from './helper'
+export * from './helper'
 
 // 默认导出
 export default webSearchPlugin

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

@@ -44,7 +44,7 @@ export {
 // ==================== 基础数据和类型 ====================
 
 // 基础Provider数据源
-export { baseProviderIds, baseProviders } from './schemas'
+export { baseProviderIds, baseProviders, isBaseProvider } from './schemas'
 
 // 类型定义和Schema
 export type {

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

@@ -7,11 +7,11 @@ 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'
 import { createXai } from '@ai-sdk/xai'
+import { type CherryInProviderSettings, createCherryIn } from '@cherrystudio/ai-sdk-provider'
 import { createOpenRouter } from '@openrouter/ai-sdk-provider'
 import type { Provider } from 'ai'
 import { customProvider } from 'ai'
@@ -31,7 +31,8 @@ export const baseProviderIds = [
   'azure-responses',
   'deepseek',
   'openrouter',
-  'huggingface'
+  'cherryin',
+  'cherryin-chat'
 ] as const
 
 /**
@@ -137,9 +138,23 @@ export const baseProviders = [
     supportsImageGeneration: true
   },
   {
-    id: 'huggingface',
-    name: 'HuggingFace',
-    creator: createHuggingFace,
+    id: 'cherryin',
+    name: 'CherryIN',
+    creator: createCherryIn,
+    supportsImageGeneration: true
+  },
+  {
+    id: 'cherryin-chat',
+    name: 'CherryIN Chat',
+    creator: (options: CherryInProviderSettings) => {
+      const provider = createCherryIn(options)
+      return customProvider({
+        fallbackProvider: {
+          ...provider,
+          languageModel: (modelId: string) => provider.chat(modelId)
+        }
+      })
+    },
     supportsImageGeneration: true
   }
 ] as const satisfies BaseProvider[]

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

@@ -0,0 +1,499 @@
+/**
+ * RuntimeExecutor.generateText Comprehensive Tests
+ * Tests non-streaming text generation across all providers with various parameters
+ */
+
+import { generateText } from 'ai'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import {
+  createMockLanguageModel,
+  mockCompleteResponses,
+  mockProviderConfigs,
+  testMessages,
+  testTools
+} from '../../../__tests__'
+import type { AiPlugin } from '../../plugins'
+import { globalRegistryManagement } from '../../providers/RegistryManagement'
+import { RuntimeExecutor } from '../executor'
+
+// Mock AI SDK
+vi.mock('ai', () => ({
+  generateText: vi.fn()
+}))
+
+vi.mock('../../providers/RegistryManagement', () => ({
+  globalRegistryManagement: {
+    languageModel: vi.fn()
+  },
+  DEFAULT_SEPARATOR: '|'
+}))
+
+describe('RuntimeExecutor.generateText', () => {
+  let executor: RuntimeExecutor<'openai'>
+  let mockLanguageModel: any
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+
+    executor = RuntimeExecutor.create('openai', mockProviderConfigs.openai)
+
+    mockLanguageModel = createMockLanguageModel({
+      provider: 'openai',
+      modelId: 'gpt-4'
+    })
+
+    vi.mocked(globalRegistryManagement.languageModel).mockReturnValue(mockLanguageModel)
+    vi.mocked(generateText).mockResolvedValue(mockCompleteResponses.simple as any)
+  })
+
+  describe('Basic Functionality', () => {
+    it('should generate text with minimal parameters', async () => {
+      const result = await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.simple
+      })
+
+      expect(generateText).toHaveBeenCalledWith({
+        model: mockLanguageModel,
+        messages: testMessages.simple
+      })
+
+      expect(result.text).toBe('This is a simple response.')
+      expect(result.finishReason).toBe('stop')
+      expect(result.usage).toBeDefined()
+    })
+
+    it('should generate with system messages', async () => {
+      await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.withSystem
+      })
+
+      expect(generateText).toHaveBeenCalledWith({
+        model: mockLanguageModel,
+        messages: testMessages.withSystem
+      })
+    })
+
+    it('should generate with conversation history', async () => {
+      await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.conversation
+      })
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          messages: testMessages.conversation
+        })
+      )
+    })
+  })
+
+  describe('All Parameter Combinations', () => {
+    it('should support all parameters together', async () => {
+      await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        temperature: 0.7,
+        maxOutputTokens: 500,
+        topP: 0.9,
+        frequencyPenalty: 0.5,
+        presencePenalty: 0.3,
+        stopSequences: ['STOP'],
+        seed: 12345
+      })
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          temperature: 0.7,
+          maxOutputTokens: 500,
+          topP: 0.9,
+          frequencyPenalty: 0.5,
+          presencePenalty: 0.3,
+          stopSequences: ['STOP'],
+          seed: 12345
+        })
+      )
+    })
+
+    it('should support partial parameters', async () => {
+      await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        temperature: 0.5,
+        maxOutputTokens: 100
+      })
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          temperature: 0.5,
+          maxOutputTokens: 100
+        })
+      )
+    })
+  })
+
+  describe('Tool Calling', () => {
+    beforeEach(() => {
+      vi.mocked(generateText).mockResolvedValue(mockCompleteResponses.withToolCalls as any)
+    })
+
+    it('should support tool calling', async () => {
+      const result = await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.toolUse,
+        tools: testTools
+      })
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          tools: testTools
+        })
+      )
+
+      expect(result.toolCalls).toBeDefined()
+      expect(result.toolCalls).toHaveLength(1)
+    })
+
+    it('should support toolChoice auto', async () => {
+      await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.toolUse,
+        tools: testTools,
+        toolChoice: 'auto'
+      })
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          toolChoice: 'auto'
+        })
+      )
+    })
+
+    it('should support toolChoice required', async () => {
+      await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.toolUse,
+        tools: testTools,
+        toolChoice: 'required'
+      })
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          toolChoice: 'required'
+        })
+      )
+    })
+
+    it('should support toolChoice none', async () => {
+      vi.mocked(generateText).mockResolvedValue(mockCompleteResponses.simple as any)
+
+      await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        tools: testTools,
+        toolChoice: 'none'
+      })
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          toolChoice: 'none'
+        })
+      )
+    })
+
+    it('should support specific tool selection', async () => {
+      await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.toolUse,
+        tools: testTools,
+        toolChoice: {
+          type: 'tool',
+          toolName: 'getWeather'
+        }
+      })
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          toolChoice: {
+            type: 'tool',
+            toolName: 'getWeather'
+          }
+        })
+      )
+    })
+  })
+
+  describe('Multiple Providers', () => {
+    it('should work with Anthropic provider', async () => {
+      const anthropicExecutor = RuntimeExecutor.create('anthropic', mockProviderConfigs.anthropic)
+
+      const anthropicModel = createMockLanguageModel({
+        provider: 'anthropic',
+        modelId: 'claude-3-5-sonnet-20241022'
+      })
+
+      vi.mocked(globalRegistryManagement.languageModel).mockReturnValue(anthropicModel)
+
+      await anthropicExecutor.generateText({
+        model: 'claude-3-5-sonnet-20241022',
+        messages: testMessages.simple
+      })
+
+      expect(globalRegistryManagement.languageModel).toHaveBeenCalledWith('anthropic|claude-3-5-sonnet-20241022')
+    })
+
+    it('should work with Google provider', async () => {
+      const googleExecutor = RuntimeExecutor.create('google', mockProviderConfigs.google)
+
+      const googleModel = createMockLanguageModel({
+        provider: 'google',
+        modelId: 'gemini-2.0-flash-exp'
+      })
+
+      vi.mocked(globalRegistryManagement.languageModel).mockReturnValue(googleModel)
+
+      await googleExecutor.generateText({
+        model: 'gemini-2.0-flash-exp',
+        messages: testMessages.simple
+      })
+
+      expect(globalRegistryManagement.languageModel).toHaveBeenCalledWith('google|gemini-2.0-flash-exp')
+    })
+
+    it('should work with xAI provider', async () => {
+      const xaiExecutor = RuntimeExecutor.create('xai', mockProviderConfigs.xai)
+
+      const xaiModel = createMockLanguageModel({
+        provider: 'xai',
+        modelId: 'grok-2-latest'
+      })
+
+      vi.mocked(globalRegistryManagement.languageModel).mockReturnValue(xaiModel)
+
+      await xaiExecutor.generateText({
+        model: 'grok-2-latest',
+        messages: testMessages.simple
+      })
+
+      expect(globalRegistryManagement.languageModel).toHaveBeenCalledWith('xai|grok-2-latest')
+    })
+
+    it('should work with DeepSeek provider', async () => {
+      const deepseekExecutor = RuntimeExecutor.create('deepseek', mockProviderConfigs.deepseek)
+
+      const deepseekModel = createMockLanguageModel({
+        provider: 'deepseek',
+        modelId: 'deepseek-chat'
+      })
+
+      vi.mocked(globalRegistryManagement.languageModel).mockReturnValue(deepseekModel)
+
+      await deepseekExecutor.generateText({
+        model: 'deepseek-chat',
+        messages: testMessages.simple
+      })
+
+      expect(globalRegistryManagement.languageModel).toHaveBeenCalledWith('deepseek|deepseek-chat')
+    })
+  })
+
+  describe('Plugin Integration', () => {
+    it('should execute all plugin hooks', async () => {
+      const pluginCalls: string[] = []
+
+      const testPlugin: AiPlugin = {
+        name: 'test-plugin',
+        onRequestStart: vi.fn(async () => {
+          pluginCalls.push('onRequestStart')
+        }),
+        transformParams: vi.fn(async (params) => {
+          pluginCalls.push('transformParams')
+          return { ...params, temperature: 0.8 }
+        }),
+        transformResult: vi.fn(async (result) => {
+          pluginCalls.push('transformResult')
+          return { ...result, text: result.text + ' [modified]' }
+        }),
+        onRequestEnd: vi.fn(async () => {
+          pluginCalls.push('onRequestEnd')
+        })
+      }
+
+      const executorWithPlugin = RuntimeExecutor.create('openai', mockProviderConfigs.openai, [testPlugin])
+
+      const result = await executorWithPlugin.generateText({
+        model: 'gpt-4',
+        messages: testMessages.simple
+      })
+
+      expect(pluginCalls).toEqual(['onRequestStart', 'transformParams', 'transformResult', 'onRequestEnd'])
+
+      // Verify transformed parameters
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          temperature: 0.8
+        })
+      )
+
+      // Verify transformed result
+      expect(result.text).toContain('[modified]')
+    })
+
+    it('should handle multiple plugins in order', async () => {
+      const pluginOrder: string[] = []
+
+      const plugin1: AiPlugin = {
+        name: 'plugin-1',
+        transformParams: vi.fn(async (params) => {
+          pluginOrder.push('plugin-1')
+          return { ...params, temperature: 0.5 }
+        })
+      }
+
+      const plugin2: AiPlugin = {
+        name: 'plugin-2',
+        transformParams: vi.fn(async (params) => {
+          pluginOrder.push('plugin-2')
+          return { ...params, maxTokens: 200 }
+        })
+      }
+
+      const executorWithPlugins = RuntimeExecutor.create('openai', mockProviderConfigs.openai, [plugin1, plugin2])
+
+      await executorWithPlugins.generateText({
+        model: 'gpt-4',
+        messages: testMessages.simple
+      })
+
+      expect(pluginOrder).toEqual(['plugin-1', 'plugin-2'])
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          temperature: 0.5,
+          maxTokens: 200
+        })
+      )
+    })
+  })
+
+  describe('Error Handling', () => {
+    it('should handle API errors', async () => {
+      const error = new Error('API request failed')
+      vi.mocked(generateText).mockRejectedValue(error)
+
+      await expect(
+        executor.generateText({
+          model: 'gpt-4',
+          messages: testMessages.simple
+        })
+      ).rejects.toThrow('API request failed')
+    })
+
+    it('should execute onError plugin hook', async () => {
+      const error = new Error('Generation failed')
+      vi.mocked(generateText).mockRejectedValue(error)
+
+      const errorPlugin: AiPlugin = {
+        name: 'error-handler',
+        onError: vi.fn()
+      }
+
+      const executorWithPlugin = RuntimeExecutor.create('openai', mockProviderConfigs.openai, [errorPlugin])
+
+      await expect(
+        executorWithPlugin.generateText({
+          model: 'gpt-4',
+          messages: testMessages.simple
+        })
+      ).rejects.toThrow('Generation failed')
+
+      expect(errorPlugin.onError).toHaveBeenCalledWith(
+        error,
+        expect.objectContaining({
+          providerId: 'openai',
+          modelId: 'gpt-4'
+        })
+      )
+    })
+
+    it('should handle model not found error', async () => {
+      const error = new Error('Model not found: invalid-model')
+      vi.mocked(globalRegistryManagement.languageModel).mockImplementation(() => {
+        throw error
+      })
+
+      await expect(
+        executor.generateText({
+          model: 'invalid-model',
+          messages: testMessages.simple
+        })
+      ).rejects.toThrow('Model not found')
+    })
+  })
+
+  describe('Usage and Metadata', () => {
+    it('should return usage information', async () => {
+      const result = await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.simple
+      })
+
+      expect(result.usage).toBeDefined()
+      expect(result.usage.inputTokens).toBe(15)
+      expect(result.usage.outputTokens).toBe(8)
+      expect(result.usage.totalTokens).toBe(23)
+    })
+
+    it('should handle warnings', async () => {
+      vi.mocked(generateText).mockResolvedValue(mockCompleteResponses.withWarnings as any)
+
+      const result = await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        temperature: 2.5 // Unsupported value
+      })
+
+      expect(result.warnings).toBeDefined()
+      expect(result.warnings).toHaveLength(1)
+      expect(result.warnings![0].type).toBe('unsupported-setting')
+    })
+  })
+
+  describe('Abort Signal', () => {
+    it('should support abort signal', async () => {
+      const abortController = new AbortController()
+
+      await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        abortSignal: abortController.signal
+      })
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          abortSignal: abortController.signal
+        })
+      )
+    })
+
+    it('should handle aborted request', async () => {
+      const abortError = new Error('Request aborted')
+      abortError.name = 'AbortError'
+
+      vi.mocked(generateText).mockRejectedValue(abortError)
+
+      const abortController = new AbortController()
+      abortController.abort()
+
+      await expect(
+        executor.generateText({
+          model: 'gpt-4',
+          messages: testMessages.simple,
+          abortSignal: abortController.signal
+        })
+      ).rejects.toThrow('Request aborted')
+    })
+  })
+})

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

@@ -0,0 +1,525 @@
+/**
+ * RuntimeExecutor.streamText Comprehensive Tests
+ * Tests streaming text generation across all providers with various parameters
+ */
+
+import { streamText } from 'ai'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { collectStreamChunks, createMockLanguageModel, mockProviderConfigs, testMessages } from '../../../__tests__'
+import type { AiPlugin } from '../../plugins'
+import { globalRegistryManagement } from '../../providers/RegistryManagement'
+import { RuntimeExecutor } from '../executor'
+
+// Mock AI SDK
+vi.mock('ai', () => ({
+  streamText: vi.fn()
+}))
+
+vi.mock('../../providers/RegistryManagement', () => ({
+  globalRegistryManagement: {
+    languageModel: vi.fn()
+  },
+  DEFAULT_SEPARATOR: '|'
+}))
+
+describe('RuntimeExecutor.streamText', () => {
+  let executor: RuntimeExecutor<'openai'>
+  let mockLanguageModel: any
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+
+    executor = RuntimeExecutor.create('openai', mockProviderConfigs.openai)
+
+    mockLanguageModel = createMockLanguageModel({
+      provider: 'openai',
+      modelId: 'gpt-4'
+    })
+
+    vi.mocked(globalRegistryManagement.languageModel).mockReturnValue(mockLanguageModel)
+  })
+
+  describe('Basic Functionality', () => {
+    it('should stream text with minimal parameters', async () => {
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Hello'
+          yield ' '
+          yield 'World'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Hello' }
+          yield { type: 'text-delta', textDelta: ' ' }
+          yield { type: 'text-delta', textDelta: 'World' }
+        })(),
+        usage: Promise.resolve({ promptTokens: 5, completionTokens: 3, totalTokens: 8 })
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      const result = await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.simple
+      })
+
+      expect(streamText).toHaveBeenCalledWith({
+        model: mockLanguageModel,
+        messages: testMessages.simple
+      })
+
+      const chunks = await collectStreamChunks(result.textStream)
+      expect(chunks).toEqual(['Hello', ' ', 'World'])
+    })
+
+    it('should stream with system messages', async () => {
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Response'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Response' }
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.withSystem
+      })
+
+      expect(streamText).toHaveBeenCalledWith({
+        model: mockLanguageModel,
+        messages: testMessages.withSystem
+      })
+    })
+
+    it('should stream multi-turn conversations', async () => {
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Multi-turn response'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Multi-turn response' }
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.multiTurn
+      })
+
+      expect(streamText).toHaveBeenCalled()
+      expect(streamText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          messages: testMessages.multiTurn
+        })
+      )
+    })
+  })
+
+  describe('Temperature Parameter', () => {
+    const temperatures = [0, 0.3, 0.5, 0.7, 0.9, 1.0, 1.5, 2.0]
+
+    it.each(temperatures)('should support temperature=%s', async (temperature) => {
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Response'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Response' }
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        temperature
+      })
+
+      expect(streamText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          temperature
+        })
+      )
+    })
+  })
+
+  describe('Max Tokens Parameter', () => {
+    const maxTokensValues = [10, 50, 100, 500, 1000, 2000, 4000]
+
+    it.each(maxTokensValues)('should support maxTokens=%s', async (maxTokens) => {
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Response'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Response' }
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        maxOutputTokens: maxTokens
+      })
+
+      expect(streamText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          maxTokens
+        })
+      )
+    })
+  })
+
+  describe('Top P Parameter', () => {
+    const topPValues = [0.1, 0.3, 0.5, 0.7, 0.9, 0.95, 1.0]
+
+    it.each(topPValues)('should support topP=%s', async (topP) => {
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Response'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Response' }
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        topP
+      })
+
+      expect(streamText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          topP
+        })
+      )
+    })
+  })
+
+  describe('Frequency and Presence Penalty', () => {
+    it('should support frequency penalty', async () => {
+      const penalties = [-2.0, -1.0, 0, 0.5, 1.0, 1.5, 2.0]
+
+      for (const frequencyPenalty of penalties) {
+        vi.clearAllMocks()
+
+        const mockStream = {
+          textStream: (async function* () {
+            yield 'Response'
+          })(),
+          fullStream: (async function* () {
+            yield { type: 'text-delta', textDelta: 'Response' }
+          })()
+        }
+
+        vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+        await executor.streamText({
+          model: 'gpt-4',
+          messages: testMessages.simple,
+          frequencyPenalty
+        })
+
+        expect(streamText).toHaveBeenCalledWith(
+          expect.objectContaining({
+            frequencyPenalty
+          })
+        )
+      }
+    })
+
+    it('should support presence penalty', async () => {
+      const penalties = [-2.0, -1.0, 0, 0.5, 1.0, 1.5, 2.0]
+
+      for (const presencePenalty of penalties) {
+        vi.clearAllMocks()
+
+        const mockStream = {
+          textStream: (async function* () {
+            yield 'Response'
+          })(),
+          fullStream: (async function* () {
+            yield { type: 'text-delta', textDelta: 'Response' }
+          })()
+        }
+
+        vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+        await executor.streamText({
+          model: 'gpt-4',
+          messages: testMessages.simple,
+          presencePenalty
+        })
+
+        expect(streamText).toHaveBeenCalledWith(
+          expect.objectContaining({
+            presencePenalty
+          })
+        )
+      }
+    })
+
+    it('should support both penalties together', async () => {
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Response'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Response' }
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        frequencyPenalty: 0.5,
+        presencePenalty: 0.5
+      })
+
+      expect(streamText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          frequencyPenalty: 0.5,
+          presencePenalty: 0.5
+        })
+      )
+    })
+  })
+
+  describe('Seed Parameter', () => {
+    it('should support seed for deterministic output', async () => {
+      const seeds = [0, 12345, 67890, 999999]
+
+      for (const seed of seeds) {
+        vi.clearAllMocks()
+
+        const mockStream = {
+          textStream: (async function* () {
+            yield 'Response'
+          })(),
+          fullStream: (async function* () {
+            yield { type: 'text-delta', textDelta: 'Response' }
+          })()
+        }
+
+        vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+        await executor.streamText({
+          model: 'gpt-4',
+          messages: testMessages.simple,
+          seed
+        })
+
+        expect(streamText).toHaveBeenCalledWith(
+          expect.objectContaining({
+            seed
+          })
+        )
+      }
+    })
+  })
+
+  describe('Abort Signal', () => {
+    it('should support abort signal', async () => {
+      const abortController = new AbortController()
+
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Response'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Response' }
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        abortSignal: abortController.signal
+      })
+
+      expect(streamText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          abortSignal: abortController.signal
+        })
+      )
+    })
+
+    it('should handle abort during streaming', async () => {
+      const abortController = new AbortController()
+
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Start'
+          // Simulate abort
+          abortController.abort()
+          throw new Error('Aborted')
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Start' }
+          throw new Error('Aborted')
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      const result = await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        abortSignal: abortController.signal
+      })
+
+      await expect(async () => {
+        // oxlint-disable-next-line no-unused-vars
+        for await (const _chunk of result.textStream) {
+          // Stream should be interrupted
+        }
+      }).rejects.toThrow('Aborted')
+    })
+  })
+
+  describe('Plugin Integration', () => {
+    it('should execute plugins during streaming', async () => {
+      const pluginCalls: string[] = []
+
+      const testPlugin: AiPlugin = {
+        name: 'test-plugin',
+        onRequestStart: vi.fn(async () => {
+          pluginCalls.push('onRequestStart')
+        }),
+        transformParams: vi.fn(async (params) => {
+          pluginCalls.push('transformParams')
+          return { ...params, temperature: 0.5 }
+        }),
+        onRequestEnd: vi.fn(async () => {
+          pluginCalls.push('onRequestEnd')
+        })
+      }
+
+      const executorWithPlugin = RuntimeExecutor.create('openai', mockProviderConfigs.openai, [testPlugin])
+
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Response'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Response' }
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      const result = await executorWithPlugin.streamText({
+        model: 'gpt-4',
+        messages: testMessages.simple
+      })
+
+      // Consume stream
+      // oxlint-disable-next-line no-unused-vars
+      for await (const _chunk of result.textStream) {
+        // Stream chunks
+      }
+
+      expect(pluginCalls).toContain('onRequestStart')
+      expect(pluginCalls).toContain('transformParams')
+
+      // Verify transformed parameters were used
+      expect(streamText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          temperature: 0.5
+        })
+      )
+    })
+  })
+
+  describe('Full Stream with Finish Reason', () => {
+    it('should provide finish reason in full stream', async () => {
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Response'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Response' }
+          yield {
+            type: 'finish',
+            finishReason: 'stop',
+            usage: { promptTokens: 5, completionTokens: 3, totalTokens: 8 }
+          }
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      const result = await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.simple
+      })
+
+      const fullChunks = await collectStreamChunks(result.fullStream)
+
+      expect(fullChunks).toHaveLength(2)
+      expect(fullChunks[0]).toEqual({ type: 'text-delta', textDelta: 'Response' })
+      expect(fullChunks[1]).toEqual({
+        type: 'finish',
+        finishReason: 'stop',
+        usage: { promptTokens: 5, completionTokens: 3, totalTokens: 8 }
+      })
+    })
+  })
+
+  describe('Error Handling', () => {
+    it('should handle streaming errors', async () => {
+      const error = new Error('Streaming failed')
+      vi.mocked(streamText).mockRejectedValue(error)
+
+      await expect(
+        executor.streamText({
+          model: 'gpt-4',
+          messages: testMessages.simple
+        })
+      ).rejects.toThrow('Streaming failed')
+    })
+
+    it('should execute onError plugin hook on failure', async () => {
+      const error = new Error('Stream error')
+      vi.mocked(streamText).mockRejectedValue(error)
+
+      const errorPlugin: AiPlugin = {
+        name: 'error-handler',
+        onError: vi.fn()
+      }
+
+      const executorWithPlugin = RuntimeExecutor.create('openai', mockProviderConfigs.openai, [errorPlugin])
+
+      await expect(
+        executorWithPlugin.streamText({
+          model: 'gpt-4',
+          messages: testMessages.simple
+        })
+      ).rejects.toThrow('Stream error')
+
+      expect(errorPlugin.onError).toHaveBeenCalledWith(
+        error,
+        expect.objectContaining({
+          providerId: 'openai',
+          modelId: 'gpt-4'
+        })
+      )
+    })
+  })
+})

packages/shared/IpcChannel.ts

@@ -41,6 +41,7 @@ export enum IpcChannel {
   App_SetFullScreen = 'app:set-full-screen',
   App_IsFullScreen = 'app:is-full-screen',
   App_GetSystemFonts = 'app:get-system-fonts',
+  APP_CrashRenderProcess = 'app:crash-render-process',
 
   App_MacIsProcessTrusted = 'app:mac-is-process-trusted',
   App_MacRequestProcessTrust = 'app:mac-request-process-trust',
@@ -189,6 +190,7 @@ export enum IpcChannel {
   Fs_ReadText = 'fs:readText',
   File_OpenWithRelativePath = 'file:openWithRelativePath',
   File_IsTextFile = 'file:isTextFile',
+  File_ListDirectory = 'file:listDirectory',
   File_GetDirectoryStructure = 'file:getDirectoryStructure',
   File_CheckFileName = 'file:checkFileName',
   File_ValidateNotesDirectory = 'file:validateNotesDirectory',
@@ -233,6 +235,7 @@ export enum IpcChannel {
   System_GetDeviceType = 'system:getDeviceType',
   System_GetHostname = 'system:getHostname',
   System_GetCpuName = 'system:getCpuName',
+  System_CheckGitBash = 'system:checkGitBash',
 
   // DevTools
   System_ToggleDevTools = 'system:toggleDevTools',

packages/shared/config/constant.ts

@@ -197,12 +197,22 @@ export enum FeedUrl {
   GITHUB_LATEST = 'https://github.com/CherryHQ/cherry-studio/releases/latest/download'
 }
 
+export enum UpdateConfigUrl {
+  GITHUB = 'https://raw.githubusercontent.com/CherryHQ/cherry-studio/refs/heads/x-files/app-upgrade-config/app-upgrade-config.json',
+  GITCODE = 'https://raw.gitcode.com/CherryHQ/cherry-studio/raw/x-files%2Fapp-upgrade-config/app-upgrade-config.json'
+}
+
 export enum UpgradeChannel {
   LATEST = 'latest', // 最新稳定版本
   RC = 'rc', // 公测版本
   BETA = 'beta' // 预览版本
 }
 
+export enum UpdateMirror {
+  GITHUB = 'github',
+  GITCODE = 'gitcode'
+}
+
 export const defaultTimeout = 10 * 1000 * 60
 
 export const occupiedDirs = ['logs', 'Network', 'Partitions/webview/Network']
@@ -470,3 +480,6 @@ export const MACOS_TERMINALS_WITH_COMMANDS: TerminalConfigWithCommand[] = [
     })
   }
 ]
+
+// resources/scripts should be maintained manually
+export const HOME_CHERRY_DIR = '.cherrystudio'

packages/shared/utils.ts

@@ -4,3 +4,34 @@ export const defaultAppHeaders = () => {
     'X-Title': 'Cherry Studio'
   }
 }
+
+// Following two function are not being used for now.
+// I may use them in the future, so just keep them commented. - by eurfelux
+
+/**
+ * Converts an `undefined` value to `null`, otherwise returns the value as-is.
+ * @param value - The value to check
+ * @returns `null` if the input is `undefined`; otherwise the input value
+ */
+
+// export function toNullIfUndefined<T>(value: T | undefined): T | null {
+//   if (value === undefined) {
+//     return null
+//   } else {
+//     return value
+//   }
+// }
+
+/**
+ * Converts a `null` value to `undefined`, otherwise returns the value as-is.
+ * @param value - The value to check
+ * @returns `undefined` if the input is `null`; otherwise the input value
+ */
+
+// export function toUndefinedIfNull<T>(value: T | null): T | undefined {
+//   if (value === null) {
+//     return undefined
+//   } else {
+//     return value
+//   }
+// }

resources/database/drizzle/0002_wealthy_naoko.sql

@@ -0,0 +1 @@
+ALTER TABLE `sessions` ADD `slash_commands` text;

resources/database/drizzle/meta/0002_snapshot.json

@@ -0,0 +1,346 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "0cf3d79e-69bf-4dba-8df4-996b9b67d2e8",
+  "prevId": "dabab6db-a2cd-4e96-b06e-6cb87d445a87",
+  "tables": {
+    "agents": {
+      "name": "agents",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "accessible_paths": {
+          "name": "accessible_paths",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "instructions": {
+          "name": "instructions",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "plan_model": {
+          "name": "plan_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "small_model": {
+          "name": "small_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "mcps": {
+          "name": "mcps",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "allowed_tools": {
+          "name": "allowed_tools",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "configuration": {
+          "name": "configuration",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "session_messages": {
+      "name": "session_messages",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "session_id": {
+          "name": "session_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "agent_session_id": {
+          "name": "agent_session_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "migrations": {
+      "name": "migrations",
+      "columns": {
+        "version": {
+          "name": "version",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "tag": {
+          "name": "tag",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "executed_at": {
+          "name": "executed_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "sessions": {
+      "name": "sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "agent_type": {
+          "name": "agent_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "agent_id": {
+          "name": "agent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "accessible_paths": {
+          "name": "accessible_paths",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "instructions": {
+          "name": "instructions",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "plan_model": {
+          "name": "plan_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "small_model": {
+          "name": "small_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "mcps": {
+          "name": "mcps",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "allowed_tools": {
+          "name": "allowed_tools",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "slash_commands": {
+          "name": "slash_commands",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "configuration": {
+          "name": "configuration",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}

resources/database/drizzle/meta/_journal.json

@@ -15,6 +15,13 @@
       "when": 1758187378775,
       "tag": "0001_woozy_captain_flint",
       "breakpoints": true
+    },
+    {
+      "idx": 2,
+      "version": "6",
+      "when": 1762526423527,
+      "tag": "0002_wealthy_naoko",
+      "breakpoints": true
     }
   ]
 }

resources/js/bridge.js

@@ -1,36 +0,0 @@
-;(() => {
-  let messageId = 0
-  const pendingCalls = new Map()
-
-  function api(method, ...args) {
-    const id = messageId++
-    return new Promise((resolve, reject) => {
-      pendingCalls.set(id, { resolve, reject })
-      window.parent.postMessage({ id, type: 'api-call', method, args }, '*')
-    })
-  }
-
-  window.addEventListener('message', (event) => {
-    if (event.data.type === 'api-response') {
-      const { id, result, error } = event.data
-      const pendingCall = pendingCalls.get(id)
-      if (pendingCall) {
-        if (error) {
-          pendingCall.reject(new Error(error))
-        } else {
-          pendingCall.resolve(result)
-        }
-        pendingCalls.delete(id)
-      }
-    }
-  })
-
-  window.api = new Proxy(
-    {},
-    {
-      get: (target, prop) => {
-        return (...args) => api(prop, ...args)
-      }
-    }
-  )
-})()

resources/js/utils.js

@@ -1,5 +0,0 @@
-export function getQueryParam(paramName) {
-  const url = new URL(window.location.href)
-  const params = new URLSearchParams(url.search)
-  return params.get(paramName)
-}

resources/scripts/install-bun.js

@@ -7,7 +7,7 @@ const { downloadWithRedirects } = require('./download')
 
 // Base URL for downloading bun binaries
 const BUN_RELEASE_BASE_URL = 'https://gitcode.com/CherryHQ/bun/releases/download'
-const DEFAULT_BUN_VERSION = '1.2.17' // Default fallback version
+const DEFAULT_BUN_VERSION = '1.3.1' // Default fallback version
 
 // Mapping of platform+arch to binary package name
 const BUN_PACKAGES = {

resources/scripts/install-uv.js

@@ -7,28 +7,29 @@ const { downloadWithRedirects } = require('./download')
 
 // Base URL for downloading uv binaries
 const UV_RELEASE_BASE_URL = 'https://gitcode.com/CherryHQ/uv/releases/download'
-const DEFAULT_UV_VERSION = '0.7.13'
+const DEFAULT_UV_VERSION = '0.9.5'
 
 // Mapping of platform+arch to binary package name
 const UV_PACKAGES = {
-  'darwin-arm64': 'uv-aarch64-apple-darwin.zip',
-  'darwin-x64': 'uv-x86_64-apple-darwin.zip',
+  'darwin-arm64': 'uv-aarch64-apple-darwin.tar.gz',
+  'darwin-x64': 'uv-x86_64-apple-darwin.tar.gz',
   'win32-arm64': 'uv-aarch64-pc-windows-msvc.zip',
   'win32-ia32': 'uv-i686-pc-windows-msvc.zip',
   'win32-x64': 'uv-x86_64-pc-windows-msvc.zip',
-  'linux-arm64': 'uv-aarch64-unknown-linux-gnu.zip',
-  'linux-ia32': 'uv-i686-unknown-linux-gnu.zip',
-  'linux-ppc64': 'uv-powerpc64-unknown-linux-gnu.zip',
-  'linux-ppc64le': 'uv-powerpc64le-unknown-linux-gnu.zip',
-  'linux-s390x': 'uv-s390x-unknown-linux-gnu.zip',
-  'linux-x64': 'uv-x86_64-unknown-linux-gnu.zip',
-  'linux-armv7l': 'uv-armv7-unknown-linux-gnueabihf.zip',
+  'linux-arm64': 'uv-aarch64-unknown-linux-gnu.tar.gz',
+  'linux-ia32': 'uv-i686-unknown-linux-gnu.tar.gz',
+  'linux-ppc64': 'uv-powerpc64-unknown-linux-gnu.tar.gz',
+  'linux-ppc64le': 'uv-powerpc64le-unknown-linux-gnu.tar.gz',
+  'linux-riscv64': 'uv-riscv64gc-unknown-linux-gnu.tar.gz',
+  'linux-s390x': 'uv-s390x-unknown-linux-gnu.tar.gz',
+  'linux-x64': 'uv-x86_64-unknown-linux-gnu.tar.gz',
+  'linux-armv7l': 'uv-armv7-unknown-linux-gnueabihf.tar.gz',
   // MUSL variants
-  'linux-musl-arm64': 'uv-aarch64-unknown-linux-musl.zip',
-  'linux-musl-ia32': 'uv-i686-unknown-linux-musl.zip',
-  'linux-musl-x64': 'uv-x86_64-unknown-linux-musl.zip',
-  'linux-musl-armv6l': 'uv-arm-unknown-linux-musleabihf.zip',
-  'linux-musl-armv7l': 'uv-armv7-unknown-linux-musleabihf.zip'
+  'linux-musl-arm64': 'uv-aarch64-unknown-linux-musl.tar.gz',
+  'linux-musl-ia32': 'uv-i686-unknown-linux-musl.tar.gz',
+  'linux-musl-x64': 'uv-x86_64-unknown-linux-musl.tar.gz',
+  'linux-musl-armv6l': 'uv-arm-unknown-linux-musleabihf.tar.gz',
+  'linux-musl-armv7l': 'uv-armv7-unknown-linux-musleabihf.tar.gz'
 }
 
 /**
@@ -56,6 +57,7 @@ async function downloadUvBinary(platform, arch, version = DEFAULT_UV_VERSION, is
   const downloadUrl = `${UV_RELEASE_BASE_URL}/${version}/${packageName}`
   const tempdir = os.tmpdir()
   const tempFilename = path.join(tempdir, packageName)
+  const isTarGz = packageName.endsWith('.tar.gz')
 
   try {
     console.log(`Downloading uv ${version} for ${platformKey}...`)
@@ -65,34 +67,58 @@ async function downloadUvBinary(platform, arch, version = DEFAULT_UV_VERSION, is
 
     console.log(`Extracting ${packageName} to ${binDir}...`)
 
-    const zip = new StreamZip.async({ file: tempFilename })
+    if (isTarGz) {
+      // Use tar command to extract tar.gz files (macOS and Linux)
+      const tempExtractDir = path.join(tempdir, `uv-extract-${Date.now()}`)
+      fs.mkdirSync(tempExtractDir, { recursive: true })
 
-    // Get all entries in the zip file
-    const entries = await zip.entries()
+      execSync(`tar -xzf "${tempFilename}" -C "${tempExtractDir}"`, { stdio: 'inherit' })
 
-    // Extract files directly to binDir, flattening the directory structure
-    for (const entry of Object.values(entries)) {
-      if (!entry.isDirectory) {
-        // Get just the filename without path
-        const filename = path.basename(entry.name)
-        const outputPath = path.join(binDir, filename)
-
-        console.log(`Extracting ${entry.name} -> ${filename}`)
-        await zip.extract(entry.name, outputPath)
-        // Make executable files executable on Unix-like systems
-        if (platform !== 'win32') {
-          try {
+      // Find all files in the extracted directory and move them to binDir
+      const findAndMoveFiles = (dir) => {
+        const entries = fs.readdirSync(dir, { withFileTypes: true })
+        for (const entry of entries) {
+          const fullPath = path.join(dir, entry.name)
+          if (entry.isDirectory()) {
+            findAndMoveFiles(fullPath)
+          } else {
+            const filename = path.basename(entry.name)
+            const outputPath = path.join(binDir, filename)
+            fs.copyFileSync(fullPath, outputPath)
+            console.log(`Extracted ${entry.name} -> ${outputPath}`)
+            // Make executable on Unix-like systems
             fs.chmodSync(outputPath, 0o755)
-          } catch (chmodError) {
-            console.error(`Warning: Failed to set executable permissions on ${filename}`)
-            return 102
           }
         }
-        console.log(`Extracted ${entry.name} -> ${outputPath}`)
       }
+
+      findAndMoveFiles(tempExtractDir)
+
+      // Clean up temporary extraction directory
+      fs.rmSync(tempExtractDir, { recursive: true })
+    } else {
+      // Use StreamZip for zip files (Windows)
+      const zip = new StreamZip.async({ file: tempFilename })
+
+      // Get all entries in the zip file
+      const entries = await zip.entries()
+
+      // Extract files directly to binDir, flattening the directory structure
+      for (const entry of Object.values(entries)) {
+        if (!entry.isDirectory) {
+          // Get just the filename without path
+          const filename = path.basename(entry.name)
+          const outputPath = path.join(binDir, filename)
+
+          console.log(`Extracting ${entry.name} -> ${filename}`)
+          await zip.extract(entry.name, outputPath)
+          console.log(`Extracted ${entry.name} -> ${outputPath}`)
+        }
+      }
+
+      await zip.close()
     }
 
-    await zip.close()
     fs.unlinkSync(tempFilename)
     console.log(`Successfully installed uv ${version} for ${platform}-${arch}`)
     return 0

resources/scripts/ipService.js

@@ -1,88 +0,0 @@
-const https = require('https')
-const { loggerService } = require('@logger')
-
-const logger = loggerService.withContext('IpService')
-
-/**
- * 获取用户的IP地址所在国家
- * @returns {Promise<string>} 返回国家代码，默认为'CN'
- */
-async function getIpCountry() {
-  return new Promise((resolve) => {
-    // 添加超时控制
-    const timeout = setTimeout(() => {
-      logger.info('IP Address Check Timeout, default to China Mirror')
-      resolve('CN')
-    }, 5000)
-
-    const options = {
-      hostname: 'ipinfo.io',
-      path: '/json',
-      method: 'GET',
-      headers: {
-        'User-Agent':
-          'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
-        'Accept-Language': 'en-US,en;q=0.9'
-      }
-    }
-
-    const req = https.request(options, (res) => {
-      clearTimeout(timeout)
-      let data = ''
-
-      res.on('data', (chunk) => {
-        data += chunk
-      })
-
-      res.on('end', () => {
-        try {
-          const parsed = JSON.parse(data)
-          const country = parsed.country || 'CN'
-          logger.info(`Detected user IP address country: ${country}`)
-          resolve(country)
-        } catch (error) {
-          logger.error('Failed to parse IP address information:', error.message)
-          resolve('CN')
-        }
-      })
-    })
-
-    req.on('error', (error) => {
-      clearTimeout(timeout)
-      logger.error('Failed to get IP address information:', error.message)
-      resolve('CN')
-    })
-
-    req.end()
-  })
-}
-
-/**
- * 检查用户是否在中国
- * @returns {Promise<boolean>} 如果用户在中国返回true，否则返回false
- */
-async function isUserInChina() {
-  const country = await getIpCountry()
-  return country.toLowerCase() === 'cn'
-}
-
-/**
- * 根据用户位置获取适合的npm镜像URL
- * @returns {Promise<string>} 返回npm镜像URL
- */
-async function getNpmRegistryUrl() {
-  const inChina = await isUserInChina()
-  if (inChina) {
-    logger.info('User in China, using Taobao npm mirror')
-    return 'https://registry.npmmirror.com'
-  } else {
-    logger.info('User not in China, using default npm mirror')
-    return 'https://registry.npmjs.org'
-  }
-}
-
-module.exports = {
-  getIpCountry,
-  isUserInChina,
-  getNpmRegistryUrl
-}

scripts/auto-translate-i18n.ts

@@ -18,8 +18,10 @@ import { sortedObjectByKeys } from './sort'
 // ========== SCRIPT CONFIGURATION AREA - MODIFY SETTINGS HERE ==========
 const SCRIPT_CONFIG = {
   // 🔧 Concurrency Control Configuration
-  MAX_CONCURRENT_TRANSLATIONS: 5, // Max concurrent requests (Make sure the concurrency level does not exceed your provider's limits.)
-  TRANSLATION_DELAY_MS: 100, // Delay between requests to avoid rate limiting (Recommended: 100-500ms, Range: 0-5000ms)
+  MAX_CONCURRENT_TRANSLATIONS: process.env.TRANSLATION_MAX_CONCURRENT_REQUESTS
+    ? parseInt(process.env.TRANSLATION_MAX_CONCURRENT_REQUESTS)
+    : 5, // Max concurrent requests (Make sure the concurrency level does not exceed your provider's limits.)
+  TRANSLATION_DELAY_MS: process.env.TRANSLATION_DELAY_MS ? parseInt(process.env.TRANSLATION_DELAY_MS) : 500, // Delay between requests to avoid rate limiting (Recommended: 100-500ms, Range: 0-5000ms)
 
   // 🔑 API Configuration
   API_KEY: process.env.TRANSLATION_API_KEY || '', // API key from environment variable

scripts/update-app-upgrade-config.ts

@@ -0,0 +1,532 @@
+import fs from 'fs/promises'
+import path from 'path'
+import semver from 'semver'
+
+type UpgradeChannel = 'latest' | 'rc' | 'beta'
+type UpdateMirror = 'github' | 'gitcode'
+
+const CHANNELS: UpgradeChannel[] = ['latest', 'rc', 'beta']
+const MIRRORS: UpdateMirror[] = ['github', 'gitcode']
+const GITHUB_REPO = 'CherryHQ/cherry-studio'
+const GITCODE_REPO = 'CherryHQ/cherry-studio'
+const DEFAULT_FEED_TEMPLATES: Record<UpdateMirror, string> = {
+  github: `https://github.com/${GITHUB_REPO}/releases/download/{{tag}}`,
+  gitcode: `https://gitcode.com/${GITCODE_REPO}/releases/download/{{tag}}`
+}
+const GITCODE_LATEST_FALLBACK = 'https://releases.cherry-ai.com'
+
+interface CliOptions {
+  tag?: string
+  configPath?: string
+  segmentsPath?: string
+  dryRun?: boolean
+  skipReleaseChecks?: boolean
+  isPrerelease?: boolean
+}
+
+interface ChannelTemplateConfig {
+  feedTemplates?: Partial<Record<UpdateMirror, string>>
+}
+
+interface SegmentMatchRule {
+  range?: string
+  exact?: string[]
+  excludeExact?: string[]
+}
+
+interface SegmentDefinition {
+  id: string
+  type: 'legacy' | 'breaking' | 'latest'
+  match: SegmentMatchRule
+  lockedVersion?: string
+  minCompatibleVersion: string
+  description: string
+  channelTemplates?: Partial<Record<UpgradeChannel, ChannelTemplateConfig>>
+}
+
+interface SegmentMetadataFile {
+  segments: SegmentDefinition[]
+}
+
+interface ChannelConfig {
+  version: string
+  feedUrls: Record<UpdateMirror, string>
+}
+
+interface VersionMetadata {
+  segmentId: string
+  segmentType?: string
+}
+
+interface VersionEntry {
+  metadata?: VersionMetadata
+  minCompatibleVersion: string
+  description: string
+  channels: Record<UpgradeChannel, ChannelConfig | null>
+}
+
+interface UpgradeConfigFile {
+  lastUpdated: string
+  versions: Record<string, VersionEntry>
+}
+
+interface ReleaseInfo {
+  tag: string
+  version: string
+  channel: UpgradeChannel
+}
+
+interface UpdateVersionsResult {
+  versions: Record<string, VersionEntry>
+  updated: boolean
+}
+
+const ROOT_DIR = path.resolve(__dirname, '..')
+const DEFAULT_CONFIG_PATH = path.join(ROOT_DIR, 'app-upgrade-config.json')
+const DEFAULT_SEGMENTS_PATH = path.join(ROOT_DIR, 'config/app-upgrade-segments.json')
+
+async function main() {
+  const options = parseArgs()
+  const releaseTag = resolveTag(options)
+  const normalizedVersion = normalizeVersion(releaseTag)
+  const releaseChannel = detectChannel(normalizedVersion)
+  if (!releaseChannel) {
+    console.warn(`[update-app-upgrade-config] Tag ${normalizedVersion} does not map to beta/rc/latest. Skipping.`)
+    return
+  }
+
+  // Validate version format matches prerelease status
+  if (options.isPrerelease !== undefined) {
+    const hasPrereleaseSuffix = releaseChannel === 'beta' || releaseChannel === 'rc'
+
+    if (options.isPrerelease && !hasPrereleaseSuffix) {
+      console.warn(
+        `[update-app-upgrade-config] ⚠️  Release marked as prerelease but version ${normalizedVersion} has no beta/rc suffix. Skipping.`
+      )
+      return
+    }
+
+    if (!options.isPrerelease && hasPrereleaseSuffix) {
+      console.warn(
+        `[update-app-upgrade-config] ⚠️  Release marked as latest but version ${normalizedVersion} has prerelease suffix (${releaseChannel}). Skipping.`
+      )
+      return
+    }
+  }
+
+  const [config, segmentFile] = await Promise.all([
+    readJson<UpgradeConfigFile>(options.configPath ?? DEFAULT_CONFIG_PATH),
+    readJson<SegmentMetadataFile>(options.segmentsPath ?? DEFAULT_SEGMENTS_PATH)
+  ])
+
+  const segment = pickSegment(segmentFile.segments, normalizedVersion)
+  if (!segment) {
+    throw new Error(`Unable to find upgrade segment for version ${normalizedVersion}`)
+  }
+
+  if (segment.lockedVersion && segment.lockedVersion !== normalizedVersion) {
+    throw new Error(`Segment ${segment.id} is locked to ${segment.lockedVersion}, but received ${normalizedVersion}`)
+  }
+
+  const releaseInfo: ReleaseInfo = {
+    tag: formatTag(releaseTag),
+    version: normalizedVersion,
+    channel: releaseChannel
+  }
+
+  const { versions: updatedVersions, updated } = await updateVersions(
+    config.versions,
+    segment,
+    releaseInfo,
+    Boolean(options.skipReleaseChecks)
+  )
+
+  if (!updated) {
+    throw new Error(
+      `[update-app-upgrade-config] Feed URLs are not ready for ${releaseInfo.version} (${releaseInfo.channel}). Try again after the release mirrors finish syncing.`
+    )
+  }
+
+  const updatedConfig: UpgradeConfigFile = {
+    ...config,
+    lastUpdated: new Date().toISOString(),
+    versions: updatedVersions
+  }
+
+  const output = JSON.stringify(updatedConfig, null, 2) + '\n'
+
+  if (options.dryRun) {
+    console.log('Dry run enabled. Generated configuration:\n')
+    console.log(output)
+    return
+  }
+
+  await fs.writeFile(options.configPath ?? DEFAULT_CONFIG_PATH, output, 'utf-8')
+  console.log(
+    `✅ Updated ${path.relative(process.cwd(), options.configPath ?? DEFAULT_CONFIG_PATH)} for ${segment.id} (${releaseInfo.channel}) -> ${releaseInfo.version}`
+  )
+}
+
+function parseArgs(): CliOptions {
+  const args = process.argv.slice(2)
+  const options: CliOptions = {}
+
+  for (let i = 0; i < args.length; i += 1) {
+    const arg = args[i]
+    if (arg === '--tag') {
+      options.tag = args[i + 1]
+      i += 1
+    } else if (arg === '--config') {
+      options.configPath = args[i + 1]
+      i += 1
+    } else if (arg === '--segments') {
+      options.segmentsPath = args[i + 1]
+      i += 1
+    } else if (arg === '--dry-run') {
+      options.dryRun = true
+    } else if (arg === '--skip-release-checks') {
+      options.skipReleaseChecks = true
+    } else if (arg === '--is-prerelease') {
+      options.isPrerelease = args[i + 1] === 'true'
+      i += 1
+    } else if (arg === '--help') {
+      printHelp()
+      process.exit(0)
+    } else {
+      console.warn(`Ignoring unknown argument "${arg}"`)
+    }
+  }
+
+  if (options.skipReleaseChecks && !options.dryRun) {
+    throw new Error('--skip-release-checks can only be used together with --dry-run')
+  }
+
+  return options
+}
+
+function printHelp() {
+  console.log(`Usage: tsx scripts/update-app-upgrade-config.ts [options]
+
+Options:
+  --tag <tag>         Release tag (e.g. v2.1.6). Falls back to GITHUB_REF_NAME/RELEASE_TAG.
+  --config <path>     Path to app-upgrade-config.json.
+  --segments <path>   Path to app-upgrade-segments.json.
+  --is-prerelease <true|false>  Whether this is a prerelease (validates version format).
+  --dry-run           Print the result without writing to disk.
+  --skip-release-checks  Skip release page availability checks (only valid with --dry-run).
+  --help              Show this help message.`)
+}
+
+function resolveTag(options: CliOptions): string {
+  const envTag = process.env.RELEASE_TAG ?? process.env.GITHUB_REF_NAME ?? process.env.TAG_NAME
+  const tag = options.tag ?? envTag
+
+  if (!tag) {
+    throw new Error('A release tag is required. Pass --tag or set RELEASE_TAG/GITHUB_REF_NAME.')
+  }
+
+  return tag
+}
+
+function normalizeVersion(tag: string): string {
+  const cleaned = semver.clean(tag, { loose: true })
+  if (!cleaned) {
+    throw new Error(`Tag "${tag}" is not a valid semantic version`)
+  }
+
+  const valid = semver.valid(cleaned, { loose: true })
+  if (!valid) {
+    throw new Error(`Unable to normalize tag "${tag}" to a valid semantic version`)
+  }
+
+  return valid
+}
+
+function detectChannel(version: string): UpgradeChannel | null {
+  const parsed = semver.parse(version, { loose: true, includePrerelease: true })
+  if (!parsed) {
+    return null
+  }
+
+  if (parsed.prerelease.length === 0) {
+    return 'latest'
+  }
+
+  const label = String(parsed.prerelease[0]).toLowerCase()
+  if (label === 'beta') {
+    return 'beta'
+  }
+  if (label === 'rc') {
+    return 'rc'
+  }
+
+  return null
+}
+
+async function readJson<T>(filePath: string): Promise<T> {
+  const absolute = path.isAbsolute(filePath) ? filePath : path.resolve(filePath)
+  const data = await fs.readFile(absolute, 'utf-8')
+  return JSON.parse(data) as T
+}
+
+function pickSegment(segments: SegmentDefinition[], version: string): SegmentDefinition | null {
+  for (const segment of segments) {
+    if (matchesSegment(segment.match, version)) {
+      return segment
+    }
+  }
+  return null
+}
+
+function matchesSegment(matchRule: SegmentMatchRule, version: string): boolean {
+  if (matchRule.exact && matchRule.exact.includes(version)) {
+    return true
+  }
+
+  if (matchRule.excludeExact && matchRule.excludeExact.includes(version)) {
+    return false
+  }
+
+  if (matchRule.range && !semver.satisfies(version, matchRule.range, { includePrerelease: true })) {
+    return false
+  }
+
+  if (matchRule.exact) {
+    return matchRule.exact.includes(version)
+  }
+
+  return Boolean(matchRule.range)
+}
+
+function formatTag(tag: string): string {
+  if (tag.startsWith('refs/tags/')) {
+    return tag.replace('refs/tags/', '')
+  }
+  return tag
+}
+
+async function updateVersions(
+  versions: Record<string, VersionEntry>,
+  segment: SegmentDefinition,
+  releaseInfo: ReleaseInfo,
+  skipReleaseValidation: boolean
+): Promise<UpdateVersionsResult> {
+  const versionsCopy: Record<string, VersionEntry> = { ...versions }
+  const existingKey = findVersionKeyBySegment(versionsCopy, segment.id)
+  const targetKey = resolveVersionKey(existingKey, segment, releaseInfo)
+  const shouldRename = existingKey && existingKey !== targetKey
+
+  let entry: VersionEntry
+  if (existingKey) {
+    entry = { ...versionsCopy[existingKey], channels: { ...versionsCopy[existingKey].channels } }
+  } else {
+    entry = createEmptyVersionEntry()
+  }
+
+  entry.channels = ensureChannelSlots(entry.channels)
+
+  const channelUpdated = await applyChannelUpdate(entry, segment, releaseInfo, skipReleaseValidation)
+  if (!channelUpdated) {
+    return { versions, updated: false }
+  }
+
+  if (shouldRename && existingKey) {
+    delete versionsCopy[existingKey]
+  }
+
+  entry.metadata = {
+    segmentId: segment.id,
+    segmentType: segment.type
+  }
+  entry.minCompatibleVersion = segment.minCompatibleVersion
+  entry.description = segment.description
+
+  versionsCopy[targetKey] = entry
+  return {
+    versions: sortVersionMap(versionsCopy),
+    updated: true
+  }
+}
+
+function findVersionKeyBySegment(versions: Record<string, VersionEntry>, segmentId: string): string | null {
+  for (const [key, value] of Object.entries(versions)) {
+    if (value.metadata?.segmentId === segmentId) {
+      return key
+    }
+  }
+  return null
+}
+
+function resolveVersionKey(existingKey: string | null, segment: SegmentDefinition, releaseInfo: ReleaseInfo): string {
+  if (segment.lockedVersion) {
+    return segment.lockedVersion
+  }
+
+  if (releaseInfo.channel === 'latest') {
+    return releaseInfo.version
+  }
+
+  if (existingKey) {
+    return existingKey
+  }
+
+  const baseVersion = getBaseVersion(releaseInfo.version)
+  return baseVersion ?? releaseInfo.version
+}
+
+function getBaseVersion(version: string): string | null {
+  const parsed = semver.parse(version, { loose: true, includePrerelease: true })
+  if (!parsed) {
+    return null
+  }
+  return `${parsed.major}.${parsed.minor}.${parsed.patch}`
+}
+
+function createEmptyVersionEntry(): VersionEntry {
+  return {
+    minCompatibleVersion: '',
+    description: '',
+    channels: {
+      latest: null,
+      rc: null,
+      beta: null
+    }
+  }
+}
+
+function ensureChannelSlots(
+  channels: Record<UpgradeChannel, ChannelConfig | null>
+): Record<UpgradeChannel, ChannelConfig | null> {
+  return CHANNELS.reduce(
+    (acc, channel) => {
+      acc[channel] = channels[channel] ?? null
+      return acc
+    },
+    {} as Record<UpgradeChannel, ChannelConfig | null>
+  )
+}
+
+async function applyChannelUpdate(
+  entry: VersionEntry,
+  segment: SegmentDefinition,
+  releaseInfo: ReleaseInfo,
+  skipReleaseValidation: boolean
+): Promise<boolean> {
+  if (!CHANNELS.includes(releaseInfo.channel)) {
+    throw new Error(`Unsupported channel "${releaseInfo.channel}"`)
+  }
+
+  const feedUrls = buildFeedUrls(segment, releaseInfo)
+
+  if (skipReleaseValidation) {
+    console.warn(
+      `[update-app-upgrade-config] Skipping release availability validation for ${releaseInfo.version} (${releaseInfo.channel}).`
+    )
+  } else {
+    const availability = await ensureReleaseAvailability(releaseInfo)
+    if (!availability.github) {
+      return false
+    }
+    if (releaseInfo.channel === 'latest' && !availability.gitcode) {
+      console.warn(
+        `[update-app-upgrade-config] gitcode release page not ready for ${releaseInfo.tag}. Falling back to ${GITCODE_LATEST_FALLBACK}.`
+      )
+      feedUrls.gitcode = GITCODE_LATEST_FALLBACK
+    }
+  }
+
+  entry.channels[releaseInfo.channel] = {
+    version: releaseInfo.version,
+    feedUrls
+  }
+
+  return true
+}
+
+function buildFeedUrls(segment: SegmentDefinition, releaseInfo: ReleaseInfo): Record<UpdateMirror, string> {
+  return MIRRORS.reduce(
+    (acc, mirror) => {
+      const template = resolveFeedTemplate(segment, releaseInfo, mirror)
+      acc[mirror] = applyTemplate(template, releaseInfo)
+      return acc
+    },
+    {} as Record<UpdateMirror, string>
+  )
+}
+
+function resolveFeedTemplate(segment: SegmentDefinition, releaseInfo: ReleaseInfo, mirror: UpdateMirror): string {
+  if (mirror === 'gitcode' && releaseInfo.channel !== 'latest') {
+    return segment.channelTemplates?.[releaseInfo.channel]?.feedTemplates?.github ?? DEFAULT_FEED_TEMPLATES.github
+  }
+
+  return segment.channelTemplates?.[releaseInfo.channel]?.feedTemplates?.[mirror] ?? DEFAULT_FEED_TEMPLATES[mirror]
+}
+
+function applyTemplate(template: string, releaseInfo: ReleaseInfo): string {
+  return template.replace(/{{\s*tag\s*}}/gi, releaseInfo.tag).replace(/{{\s*version\s*}}/gi, releaseInfo.version)
+}
+
+function sortVersionMap(versions: Record<string, VersionEntry>): Record<string, VersionEntry> {
+  const sorted = Object.entries(versions).sort(([a], [b]) => semver.rcompare(a, b))
+  return sorted.reduce(
+    (acc, [version, entry]) => {
+      acc[version] = entry
+      return acc
+    },
+    {} as Record<string, VersionEntry>
+  )
+}
+
+interface ReleaseAvailability {
+  github: boolean
+  gitcode: boolean
+}
+
+async function ensureReleaseAvailability(releaseInfo: ReleaseInfo): Promise<ReleaseAvailability> {
+  const mirrorsToCheck: UpdateMirror[] = releaseInfo.channel === 'latest' ? MIRRORS : ['github']
+  const availability: ReleaseAvailability = {
+    github: false,
+    gitcode: releaseInfo.channel === 'latest' ? false : true
+  }
+
+  for (const mirror of mirrorsToCheck) {
+    const url = getReleasePageUrl(mirror, releaseInfo.tag)
+    try {
+      const response = await fetch(url, {
+        method: mirror === 'github' ? 'HEAD' : 'GET',
+        redirect: 'follow'
+      })
+
+      if (response.ok) {
+        availability[mirror] = true
+      } else {
+        console.warn(
+          `[update-app-upgrade-config] ${mirror} release not available for ${releaseInfo.tag} (status ${response.status}, ${url}).`
+        )
+        availability[mirror] = false
+      }
+    } catch (error) {
+      console.warn(
+        `[update-app-upgrade-config] Failed to verify ${mirror} release page for ${releaseInfo.tag} (${url}). Continuing.`,
+        error
+      )
+      availability[mirror] = false
+    }
+  }
+
+  return availability
+}
+
+function getReleasePageUrl(mirror: UpdateMirror, tag: string): string {
+  if (mirror === 'github') {
+    return `https://github.com/${GITHUB_REPO}/releases/tag/${encodeURIComponent(tag)}`
+  }
+  // Use latest.yml download URL for GitCode to check if release exists
+  // Note: GitCode returns 401 for HEAD requests, so we use GET in ensureReleaseAvailability
+  return `https://gitcode.com/${GITCODE_REPO}/releases/download/${encodeURIComponent(tag)}/latest.yml`
+}
+
+main().catch((error) => {
+  console.error('❌ Failed to update app-upgrade-config:', error)
+  process.exit(1)
+})

src/main/apiServer/middleware/openapi.ts

@@ -171,7 +171,7 @@ const swaggerOptions: swaggerJSDoc.Options = {
       }
     ]
   },
-  apis: ['./src/main/apiServer/routes/*.ts', './src/main/apiServer/app.ts']
+  apis: ['./src/main/apiServer/routes/**/*.ts', './src/main/apiServer/app.ts']
 }
 
 export function setupOpenAPIDocumentation(app: Express) {

src/main/apiServer/routes/models.ts

@@ -104,12 +104,6 @@ const router = express
         logger.warn('No models available from providers', { filter })
       }
 
-      logger.info('Models response ready', {
-        filter,
-        total: response.total,
-        modelIds: response.data.map((m) => m.id)
-      })
-
       return res.json(response satisfies ApiModelsResponse)
     } catch (error: any) {
       logger.error('Error fetching models', { error })

src/main/apiServer/server.ts

@@ -3,7 +3,6 @@ import { createServer } from 'node:http'
 import { loggerService } from '@logger'
 import { IpcChannel } from '@shared/IpcChannel'
 
-import { agentService } from '../services/agents'
 import { windowService } from '../services/WindowService'
 import { app } from './app'
 import { config } from './config'
@@ -32,11 +31,6 @@ export class ApiServer {
     // Load config
     const { port, host } = await config.load()
 
-    // Initialize AgentService
-    logger.info('Initializing AgentService')
-    await agentService.initialize()
-    logger.info('AgentService initialized')
-
     // Create server with Express app
     this.server = createServer(app)
     this.applyServerTimeouts(this.server)

src/main/apiServer/services/models.ts

@@ -32,7 +32,7 @@ export class ModelsService {
 
       for (const model of models) {
         const provider = providers.find((p) => p.id === model.provider)
-        logger.debug(`Processing model ${model.id}`)
+        // logger.debug(`Processing model ${model.id}`)
         if (!provider) {
           logger.debug(`Skipping model ${model.id} . Reason: Provider not found.`)
           continue

src/main/index.ts

@@ -8,7 +8,7 @@ import '@main/config'
 import { loggerService } from '@logger'
 import { electronApp, optimizer } from '@electron-toolkit/utils'
 import { replaceDevtoolsFont } from '@main/utils/windowUtil'
-import { app } from 'electron'
+import { app, crashReporter } from 'electron'
 import installExtension, { REACT_DEVELOPER_TOOLS, REDUX_DEVTOOLS } from 'electron-devtools-installer'
 import { isDev, isLinux, isWin } from './constant'
 
@@ -21,6 +21,7 @@ import { appMenuService } from './services/AppMenuService'
 import { configManager } from './services/ConfigManager'
 import mcpService from './services/MCPService'
 import { nodeTraceService } from './services/NodeTraceService'
+import powerMonitorService from './services/PowerMonitorService'
 import {
   CHERRY_STUDIO_PROTOCOL,
   handleProtocolUrl,
@@ -30,11 +31,21 @@ import {
 import selectionService, { initSelectionService } from './services/SelectionService'
 import { registerShortcuts } from './services/ShortcutService'
 import { TrayService } from './services/TrayService'
+import { versionService } from './services/VersionService'
 import { windowService } from './services/WindowService'
 import { initWebviewHotkeys } from './services/WebviewService'
+import { runAsyncFunction } from './utils'
 
 const logger = loggerService.withContext('MainEntry')
 
+// enable local crash reports
+crashReporter.start({
+  companyName: 'CherryHQ',
+  productName: 'CherryStudio',
+  submitURL: '',
+  uploadToServer: false
+})
+
 /**
  * Disable hardware acceleration if setting is enabled
  */
@@ -110,6 +121,10 @@ if (!app.requestSingleInstanceLock()) {
   // Some APIs can only be used after this event occurs.
 
   app.whenReady().then(async () => {
+    // Record current version for tracking
+    // A preparation for v2 data refactoring
+    versionService.recordCurrentVersion()
+
     initWebviewHotkeys()
     // Set app user model id for windows
     electronApp.setAppUserModelId(import.meta.env.VITE_MAIN_BUNDLE_ID || 'com.kangfenmao.CherryStudio')
@@ -127,6 +142,7 @@ if (!app.requestSingleInstanceLock()) {
     appMenuService?.setupApplicationMenu()
 
     nodeTraceService.init()
+    powerMonitorService.init()
 
     app.on('activate', function () {
       const mainWindow = windowService.getMainWindow()
@@ -155,39 +171,33 @@ if (!app.requestSingleInstanceLock()) {
     //start selection assistant service
     initSelectionService()
 
-    // Initialize Agent Service
-    try {
-      await agentService.initialize()
-      logger.info('Agent service initialized successfully')
-    } catch (error: any) {
-      logger.error('Failed to initialize Agent service:', error)
-    }
+    runAsyncFunction(async () => {
+      // Start API server if enabled or if agents exist
+      try {
+        const config = await apiServerService.getCurrentConfig()
+        logger.info('API server config:', config)
 
-    // Start API server if enabled or if agents exist
-    try {
-      const config = await apiServerService.getCurrentConfig()
-      logger.info('API server config:', config)
-
-      // Check if there are any agents
-      let shouldStart = config.enabled
-      if (!shouldStart) {
-        try {
-          const { total } = await agentService.listAgents({ limit: 1 })
-          if (total > 0) {
-            shouldStart = true
-            logger.info(`Detected ${total} agent(s), auto-starting API server`)
+        // Check if there are any agents
+        let shouldStart = config.enabled
+        if (!shouldStart) {
+          try {
+            const { total } = await agentService.listAgents({ limit: 1 })
+            if (total > 0) {
+              shouldStart = true
+              logger.info(`Detected ${total} agent(s), auto-starting API server`)
+            }
+          } catch (error: any) {
+            logger.warn('Failed to check agent count:', error)
           }
-        } catch (error: any) {
-          logger.warn('Failed to check agent count:', error)
         }
-      }
 
-      if (shouldStart) {
-        await apiServerService.start()
+        if (shouldStart) {
+          await apiServerService.start()
+        }
+      } catch (error: any) {
+        logger.error('Failed to check/start API server:', error)
       }
-    } catch (error: any) {
-      logger.error('Failed to check/start API server:', error)
-    }
+    })
   })
 
   registerProtocolClient(app)

src/main/ipc.ts

@@ -50,6 +50,7 @@ import * as NutstoreService from './services/NutstoreService'
 import ObsidianVaultService from './services/ObsidianVaultService'
 import { ocrService } from './services/ocr/OcrService'
 import OvmsManager from './services/OvmsManager'
+import powerMonitorService from './services/PowerMonitorService'
 import { proxyManager } from './services/ProxyManager'
 import { pythonService } from './services/PythonService'
 import { FileServiceManager } from './services/remotefile/FileServiceManager'
@@ -115,8 +116,17 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   const appUpdater = new AppUpdater()
   const notificationService = new NotificationService()
 
-  // Initialize Python service with main window
-  pythonService.setMainWindow(mainWindow)
+  // Register shutdown handlers
+  powerMonitorService.registerShutdownHandler(() => {
+    appUpdater.setAutoUpdate(false)
+  })
+
+  powerMonitorService.registerShutdownHandler(() => {
+    const mw = windowService.getMainWindow()
+    if (mw && !mw.isDestroyed()) {
+      mw.webContents.send(IpcChannel.App_SaveData)
+    }
+  })
 
   const checkMainWindow = () => {
     if (!mainWindow || mainWindow.isDestroyed()) {
@@ -483,6 +493,44 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.System_GetDeviceType, () => (isMac ? 'mac' : isWin ? 'windows' : 'linux'))
   ipcMain.handle(IpcChannel.System_GetHostname, () => require('os').hostname())
   ipcMain.handle(IpcChannel.System_GetCpuName, () => require('os').cpus()[0].model)
+  ipcMain.handle(IpcChannel.System_CheckGitBash, () => {
+    if (!isWin) {
+      return true // Non-Windows systems don't need Git Bash
+    }
+
+    try {
+      // Check common Git Bash installation paths
+      const commonPaths = [
+        path.join(process.env.ProgramFiles || 'C:\\Program Files', 'Git', 'bin', 'bash.exe'),
+        path.join(process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'Git', 'bin', 'bash.exe'),
+        path.join(process.env.LOCALAPPDATA || '', 'Programs', 'Git', 'bin', 'bash.exe')
+      ]
+
+      // Check if any of the common paths exist
+      for (const bashPath of commonPaths) {
+        if (fs.existsSync(bashPath)) {
+          logger.debug('Git Bash found', { path: bashPath })
+          return true
+        }
+      }
+
+      // Check if git is in PATH
+      const { execSync } = require('child_process')
+      try {
+        execSync('git --version', { stdio: 'ignore' })
+        logger.debug('Git found in PATH')
+        return true
+      } catch {
+        // Git not in PATH
+      }
+
+      logger.debug('Git Bash not found on Windows system')
+      return false
+    } catch (error) {
+      logger.error('Error checking Git Bash', error as Error)
+      return false
+    }
+  })
   ipcMain.handle(IpcChannel.System_ToggleDevTools, (e) => {
     const win = BrowserWindow.fromWebContents(e.sender)
     win && win.webContents.toggleDevTools()
@@ -541,6 +589,7 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.File_BinaryImage, fileManager.binaryImage.bind(fileManager))
   ipcMain.handle(IpcChannel.File_OpenWithRelativePath, fileManager.openFileWithRelativePath.bind(fileManager))
   ipcMain.handle(IpcChannel.File_IsTextFile, fileManager.isTextFile.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_ListDirectory, fileManager.listDirectory.bind(fileManager))
   ipcMain.handle(IpcChannel.File_GetDirectoryStructure, fileManager.getDirectoryStructure.bind(fileManager))
   ipcMain.handle(IpcChannel.File_CheckFileName, fileManager.fileNameGuard.bind(fileManager))
   ipcMain.handle(IpcChannel.File_ValidateNotesDirectory, fileManager.validateNotesDirectory.bind(fileManager))
@@ -1027,4 +1076,8 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.WebSocket_Status, WebSocketService.getStatus)
   ipcMain.handle(IpcChannel.WebSocket_SendFile, WebSocketService.sendFile)
   ipcMain.handle(IpcChannel.WebSocket_GetAllCandidates, WebSocketService.getAllCandidates)
+
+  ipcMain.handle(IpcChannel.APP_CrashRenderProcess, () => {
+    mainWindow.webContents.forcefullyCrashRenderer()
+  })
 }

src/main/knowledge/preprocess/MineruPreprocessProvider.ts

@@ -21,6 +21,7 @@ type ApiResponse<T> = {
 type BatchUploadResponse = {
   batch_id: string
   file_urls: string[]
+  headers?: Record<string, string>[]
 }
 
 type ExtractProgress = {
@@ -55,7 +56,7 @@ type QuotaResponse = {
 export default class MineruPreprocessProvider extends BasePreprocessProvider {
   constructor(provider: PreprocessProvider, userId?: string) {
     super(provider, userId)
-    // todo：免费期结束后删除
+    // TODO: remove after free period ends
     this.provider.apiKey = this.provider.apiKey || import.meta.env.MAIN_VITE_MINERU_API_KEY
   }
 
@@ -68,21 +69,21 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
       logger.info(`MinerU preprocess processing started: ${filePath}`)
       await this.validateFile(filePath)
 
-      // 1. 获取上传URL并上传文件
+      // 1. Get upload URL and upload file
       const batchId = await this.uploadFile(file)
       logger.info(`MinerU file upload completed: batch_id=${batchId}`)
 
-      // 2. 等待处理完成并获取结果
+      // 2. Wait for completion and fetch results
       const extractResult = await this.waitForCompletion(sourceId, batchId, file.origin_name)
       logger.info(`MinerU processing completed for batch: ${batchId}`)
 
-      // 3. 下载并解压文件
+      // 3. Download and extract output
       const { path: outputPath } = await this.downloadAndExtractFile(extractResult.full_zip_url!, file)
 
       // 4. check quota
       const quota = await this.checkQuota()
 
-      // 5. 创建处理后的文件信息
+      // 5. Create processed file metadata
       return {
         processedFile: this.createProcessedFileInfo(file, outputPath),
         quota
@@ -115,23 +116,48 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
   }
 
   private async validateFile(filePath: string): Promise<void> {
+    // Phase 1: check file size (without loading into memory)
+    logger.info(`Validating PDF file: ${filePath}`)
+    const stats = await fs.promises.stat(filePath)
+    const fileSizeBytes = stats.size
+
+    // Ensure file size is under 200MB
+    if (fileSizeBytes >= 200 * 1024 * 1024) {
+      const fileSizeMB = Math.round(fileSizeBytes / (1024 * 1024))
+      throw new Error(`PDF file size (${fileSizeMB}MB) exceeds the limit of 200MB`)
+    }
+
+    // Phase 2: check page count (requires reading file with error handling)
     const pdfBuffer = await fs.promises.readFile(filePath)
 
-    const doc = await this.readPdf(pdfBuffer)
+    try {
+      const doc = await this.readPdf(pdfBuffer)
 
-    // 文件页数小于600页
-    if (doc.numPages >= 600) {
-      throw new Error(`PDF page count (${doc.numPages}) exceeds the limit of 600 pages`)
-    }
-    // 文件大小小于200MB
-    if (pdfBuffer.length >= 200 * 1024 * 1024) {
-      const fileSizeMB = Math.round(pdfBuffer.length / (1024 * 1024))
-      throw new Error(`PDF file size (${fileSizeMB}MB) exceeds the limit of 200MB`)
+      // Ensure page count is under 600 pages
+      if (doc.numPages >= 600) {
+        throw new Error(`PDF page count (${doc.numPages}) exceeds the limit of 600 pages`)
+      }
+
+      logger.info(`PDF validation passed: ${doc.numPages} pages, ${Math.round(fileSizeBytes / (1024 * 1024))}MB`)
+    } catch (error: any) {
+      // If the page limit is exceeded, rethrow immediately
+      if (error.message.includes('exceeds the limit')) {
+        throw error
+      }
+
+      // If PDF parsing fails, log a detailed warning but continue processing
+      logger.warn(
+        `Failed to parse PDF structure (file may be corrupted or use non-standard format). ` +
+          `Skipping page count validation. Will attempt to process with MinerU API. ` +
+          `Error details: ${error.message}. ` +
+          `Suggestion: If processing fails, try repairing the PDF using tools like Adobe Acrobat or online PDF repair services.`
+      )
+      // Do not throw; continue processing
     }
   }
 
   private createProcessedFileInfo(file: FileMetadata, outputPath: string): FileMetadata {
-    // 查找解压后的主要文件
+    // Locate the main extracted file
     let finalPath = ''
     let finalName = file.origin_name.replace('.pdf', '.md')
 
@@ -143,14 +169,14 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
         const originalMdPath = path.join(outputPath, mdFile)
         const newMdPath = path.join(outputPath, finalName)
 
-        // 重命名文件为原始文件名
+        // Rename the file to match the original name
         try {
           fs.renameSync(originalMdPath, newMdPath)
           finalPath = newMdPath
           logger.info(`Renamed markdown file from ${mdFile} to ${finalName}`)
         } catch (renameError) {
           logger.warn(`Failed to rename file ${mdFile} to ${finalName}: ${renameError}`)
-          // 如果重命名失败，使用原文件
+          // If renaming fails, fall back to the original file
           finalPath = originalMdPath
           finalName = mdFile
         }
@@ -178,7 +204,7 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
     logger.info(`Downloading MinerU result to: ${zipPath}`)
 
     try {
-      // 下载ZIP文件
+      // Download the ZIP file
       const response = await net.fetch(zipUrl, { method: 'GET' })
       if (!response.ok) {
         throw new Error(`HTTP ${response.status}: ${response.statusText}`)
@@ -187,17 +213,17 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
       fs.writeFileSync(zipPath, Buffer.from(arrayBuffer))
       logger.info(`Downloaded ZIP file: ${zipPath}`)
 
-      // 确保提取目录存在
+      // Ensure the extraction directory exists
       if (!fs.existsSync(extractPath)) {
         fs.mkdirSync(extractPath, { recursive: true })
       }
 
-      // 解压文件
+      // Extract the ZIP contents
       const zip = new AdmZip(zipPath)
       zip.extractAllTo(extractPath, true)
       logger.info(`Extracted files to: ${extractPath}`)
 
-      // 删除临时ZIP文件
+      // Remove the temporary ZIP file
       fs.unlinkSync(zipPath)
 
       return { path: extractPath }
@@ -209,11 +235,11 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
 
   private async uploadFile(file: FileMetadata): Promise<string> {
     try {
-      // 步骤1: 获取上传URL
-      const { batchId, fileUrls } = await this.getBatchUploadUrls(file)
-      // 步骤2: 上传文件到获取的URL
+      // Step 1: obtain the upload URL
+      const { batchId, fileUrls, uploadHeaders } = await this.getBatchUploadUrls(file)
+      // Step 2: upload the file to the obtained URL
       const filePath = fileStorage.getFilePathById(file)
-      await this.putFileToUrl(filePath, fileUrls[0])
+      await this.putFileToUrl(filePath, fileUrls[0], file.origin_name, uploadHeaders?.[0])
       logger.info(`File uploaded successfully: ${filePath}`, { batchId, fileUrls })
 
       return batchId
@@ -223,7 +249,9 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
     }
   }
 
-  private async getBatchUploadUrls(file: FileMetadata): Promise<{ batchId: string; fileUrls: string[] }> {
+  private async getBatchUploadUrls(
+    file: FileMetadata
+  ): Promise<{ batchId: string; fileUrls: string[]; uploadHeaders?: Record<string, string>[] }> {
     const endpoint = `${this.provider.apiHost}/api/v4/file-urls/batch`
 
     const payload = {
@@ -254,10 +282,11 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
       if (response.ok) {
         const data: ApiResponse<BatchUploadResponse> = await response.json()
         if (data.code === 0 && data.data) {
-          const { batch_id, file_urls } = data.data
+          const { batch_id, file_urls, headers: uploadHeaders } = data.data
           return {
             batchId: batch_id,
-            fileUrls: file_urls
+            fileUrls: file_urls,
+            uploadHeaders
           }
         } else {
           throw new Error(`API returned error: ${data.msg || JSON.stringify(data)}`)
@@ -271,23 +300,28 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
     }
   }
 
-  private async putFileToUrl(filePath: string, uploadUrl: string): Promise<void> {
+  private async putFileToUrl(
+    filePath: string,
+    uploadUrl: string,
+    fileName?: string,
+    headers?: Record<string, string>
+  ): Promise<void> {
     try {
       const fileBuffer = await fs.promises.readFile(filePath)
+      const fileSize = fileBuffer.byteLength
+      const displayName = fileName ?? path.basename(filePath)
 
+      logger.info(`Uploading file to MinerU OSS: ${displayName} (${fileSize} bytes)`)
+
+      // https://mineru.net/apiManage/docs
       const response = await net.fetch(uploadUrl, {
         method: 'PUT',
-        body: fileBuffer,
-        headers: {
-          'Content-Type': 'application/pdf'
-        }
-        // headers: {
-        //   'Content-Length': fileBuffer.length.toString()
-        // }
+        headers,
+        body: new Uint8Array(fileBuffer)
       })
 
       if (!response.ok) {
-        // 克隆 response 以避免消费 body stream
+        // Clone the response to avoid consuming the body stream
         const responseClone = response.clone()
 
         try {
@@ -358,20 +392,20 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
       try {
         const result = await this.getExtractResults(batchId)
 
-        // 查找对应文件的处理结果
+        // Find the corresponding file result
         const fileResult = result.extract_result.find((item) => item.file_name === fileName)
         if (!fileResult) {
           throw new Error(`File ${fileName} not found in batch results`)
         }
 
-        // 检查处理状态
+        // Check the processing state
         if (fileResult.state === 'done' && fileResult.full_zip_url) {
           logger.info(`Processing completed for file: ${fileName}`)
           return fileResult
         } else if (fileResult.state === 'failed') {
           throw new Error(`Processing failed for file: ${fileName}, error: ${fileResult.err_msg}`)
         } else if (fileResult.state === 'running') {
-          // 发送进度更新
+          // Send progress updates
           if (fileResult.extract_progress) {
             const progress = Math.round(
               (fileResult.extract_progress.extracted_pages / fileResult.extract_progress.total_pages) * 100
@@ -379,7 +413,7 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
             await this.sendPreprocessProgress(sourceId, progress)
             logger.info(`File ${fileName} processing progress: ${progress}%`)
           } else {
-            // 如果没有具体进度信息，发送一个通用进度
+            // If no detailed progress information is available, send a generic update
             await this.sendPreprocessProgress(sourceId, 50)
             logger.info(`File ${fileName} is still processing...`)
           }

src/main/knowledge/preprocess/OpenMineruPreprocessProvider.ts

@@ -53,18 +53,43 @@ export default class OpenMineruPreprocessProvider extends BasePreprocessProvider
   }
 
   private async validateFile(filePath: string): Promise<void> {
+    // 第一阶段:检查文件大小(无需读取文件到内存)
+    logger.info(`Validating PDF file: ${filePath}`)
+    const stats = await fs.promises.stat(filePath)
+    const fileSizeBytes = stats.size
+
+    // File size must be less than 200MB
+    if (fileSizeBytes >= 200 * 1024 * 1024) {
+      const fileSizeMB = Math.round(fileSizeBytes / (1024 * 1024))
+      throw new Error(`PDF file size (${fileSizeMB}MB) exceeds the limit of 200MB`)
+    }
+
+    // 第二阶段:检查页数(需要读取文件,带错误处理)
     const pdfBuffer = await fs.promises.readFile(filePath)
 
-    const doc = await this.readPdf(pdfBuffer)
+    try {
+      const doc = await this.readPdf(pdfBuffer)
 
-    // File page count must be less than 600 pages
-    if (doc.numPages >= 600) {
-      throw new Error(`PDF page count (${doc.numPages}) exceeds the limit of 600 pages`)
-    }
-    // File size must be less than 200MB
-    if (pdfBuffer.length >= 200 * 1024 * 1024) {
-      const fileSizeMB = Math.round(pdfBuffer.length / (1024 * 1024))
-      throw new Error(`PDF file size (${fileSizeMB}MB) exceeds the limit of 200MB`)
+      // File page count must be less than 600 pages
+      if (doc.numPages >= 600) {
+        throw new Error(`PDF page count (${doc.numPages}) exceeds the limit of 600 pages`)
+      }
+
+      logger.info(`PDF validation passed: ${doc.numPages} pages, ${Math.round(fileSizeBytes / (1024 * 1024))}MB`)
+    } catch (error: any) {
+      // 如果是页数超限错误,直接抛出
+      if (error.message.includes('exceeds the limit')) {
+        throw error
+      }
+
+      // PDF 解析失败,记录详细警告但允许继续处理
+      logger.warn(
+        `Failed to parse PDF structure (file may be corrupted or use non-standard format). ` +
+          `Skipping page count validation. Will attempt to process with MinerU API. ` +
+          `Error details: ${error.message}. ` +
+          `Suggestion: If processing fails, try repairing the PDF using tools like Adobe Acrobat or online PDF repair services.`
+      )
+      // 不抛出错误,允许继续处理
     }
   }
 
@@ -72,8 +97,8 @@ export default class OpenMineruPreprocessProvider extends BasePreprocessProvider
     // Find the main file after extraction
     let finalPath = ''
     let finalName = file.origin_name.replace('.pdf', '.md')
-    // Find the corresponding folder by file name
-    outputPath = path.join(outputPath, `${file.origin_name.replace('.pdf', '')}`)
+    // Find the corresponding folder by file id
+    outputPath = path.join(outputPath, file.id)
     try {
       const files = fs.readdirSync(outputPath)
 
@@ -125,7 +150,7 @@ export default class OpenMineruPreprocessProvider extends BasePreprocessProvider
     formData.append('return_md', 'true')
     formData.append('response_format_zip', 'true')
     formData.append('files', fileBuffer, {
-      filename: file.origin_name
+      filename: file.name
     })
 
     while (retries < maxRetries) {
@@ -139,7 +164,7 @@ export default class OpenMineruPreprocessProvider extends BasePreprocessProvider
             ...(this.provider.apiKey ? { Authorization: `Bearer ${this.provider.apiKey}` } : {}),
             ...formData.getHeaders()
           },
-          body: formData.getBuffer()
+          body: new Uint8Array(formData.getBuffer())
         })
 
         if (!response.ok) {

src/main/services/AppMenuService.ts

@@ -7,16 +7,33 @@ import { app, Menu, shell } from 'electron'
 
 import { configManager } from './ConfigManager'
 export class AppMenuService {
+  private languageChangeCallback?: (newLanguage: string) => void
+
+  constructor() {
+    // Subscribe to language change events
+    this.languageChangeCallback = () => {
+      this.setupApplicationMenu()
+    }
+    configManager.subscribe('language', this.languageChangeCallback)
+  }
+
+  public destroy(): void {
+    // Clean up subscription to prevent memory leaks
+    if (this.languageChangeCallback) {
+      configManager.unsubscribe('language', this.languageChangeCallback)
+    }
+  }
+
   public setupApplicationMenu(): void {
     const locale = locales[configManager.getLanguage()]
-    const { common } = locale.translation
+    const { appMenu } = locale.translation
 
     const template: MenuItemConstructorOptions[] = [
       {
         label: app.name,
         submenu: [
           {
-            label: common.about + ' ' + app.name,
+            label: appMenu.about + ' ' + app.name,
             click: () => {
               // Emit event to navigate to About page
               const mainWindow = windowService.getMainWindow()
@@ -27,50 +44,78 @@ export class AppMenuService {
             }
           },
           { type: 'separator' },
-          { role: 'services' },
+          { role: 'services', label: appMenu.services },
           { type: 'separator' },
-          { role: 'hide' },
-          { role: 'hideOthers' },
-          { role: 'unhide' },
+          { role: 'hide', label: `${appMenu.hide} ${app.name}` },
+          { role: 'hideOthers', label: appMenu.hideOthers },
+          { role: 'unhide', label: appMenu.unhide },
           { type: 'separator' },
-          { role: 'quit' }
+          { role: 'quit', label: `${appMenu.quit} ${app.name}` }
         ]
       },
       {
-        role: 'fileMenu'
+        label: appMenu.file,
+        submenu: [{ role: 'close', label: appMenu.close }]
       },
       {
-        role: 'editMenu'
+        label: appMenu.edit,
+        submenu: [
+          { role: 'undo', label: appMenu.undo },
+          { role: 'redo', label: appMenu.redo },
+          { type: 'separator' },
+          { role: 'cut', label: appMenu.cut },
+          { role: 'copy', label: appMenu.copy },
+          { role: 'paste', label: appMenu.paste },
+          { role: 'delete', label: appMenu.delete },
+          { role: 'selectAll', label: appMenu.selectAll }
+        ]
       },
       {
-        role: 'viewMenu'
+        label: appMenu.view,
+        submenu: [
+          { role: 'reload', label: appMenu.reload },
+          { role: 'forceReload', label: appMenu.forceReload },
+          { role: 'toggleDevTools', label: appMenu.toggleDevTools },
+          { type: 'separator' },
+          { role: 'resetZoom', label: appMenu.resetZoom },
+          { role: 'zoomIn', label: appMenu.zoomIn },
+          { role: 'zoomOut', label: appMenu.zoomOut },
+          { type: 'separator' },
+          { role: 'togglefullscreen', label: appMenu.toggleFullscreen }
+        ]
       },
       {
-        role: 'windowMenu'
+        label: appMenu.window,
+        submenu: [
+          { role: 'minimize', label: appMenu.minimize },
+          { role: 'zoom', label: appMenu.zoom },
+          { type: 'separator' },
+          { role: 'front', label: appMenu.front }
+        ]
       },
       {
-        role: 'help',
+        label: appMenu.help,
         submenu: [
           {
-            label: 'Website',
+            label: appMenu.website,
             click: () => {
               shell.openExternal('https://cherry-ai.com')
             }
           },
           {
-            label: 'Documentation',
+            label: appMenu.documentation,
             click: () => {
               shell.openExternal('https://cherry-ai.com/docs')
             }
           },
           {
-            label: 'Feedback',
+            label: appMenu.feedback,
             click: () => {
               shell.openExternal('https://github.com/CherryHQ/cherry-studio/issues/new/choose')
             }
           },
           {
-            label: 'Releases',
+            label: appMenu.releases,
             click: () => {
               shell.openExternal('https://github.com/CherryHQ/cherry-studio/releases')
             }

src/main/services/AppUpdater.ts

@@ -2,7 +2,7 @@ import { loggerService } from '@logger'
 import { isWin } from '@main/constant'
 import { getIpCountry } from '@main/utils/ipService'
 import { generateUserAgent } from '@main/utils/systemInfo'
-import { FeedUrl, UpgradeChannel } from '@shared/config/constant'
+import { FeedUrl, UpdateConfigUrl, UpdateMirror, UpgradeChannel } from '@shared/config/constant'
 import { IpcChannel } from '@shared/IpcChannel'
 import type { UpdateInfo } from 'builder-util-runtime'
 import { CancellationToken } from 'builder-util-runtime'
@@ -22,7 +22,29 @@ const LANG_MARKERS = {
   EN_START: '<!--LANG:en-->',
   ZH_CN_START: '<!--LANG:zh-CN-->',
   END: '<!--LANG:END-->'
-} as const
+}
+
+interface UpdateConfig {
+  lastUpdated: string
+  versions: {
+    [versionKey: string]: VersionConfig
+  }
+}
+
+interface VersionConfig {
+  minCompatibleVersion: string
+  description: string
+  channels: {
+    latest: ChannelConfig | null
+    rc: ChannelConfig | null
+    beta: ChannelConfig | null
+  }
+}
+
+interface ChannelConfig {
+  version: string
+  feedUrls: Record<UpdateMirror, string>
+}
 
 export default class AppUpdater {
   autoUpdater: _AppUpdater = autoUpdater
@@ -37,7 +59,9 @@ export default class AppUpdater {
     autoUpdater.requestHeaders = {
       ...autoUpdater.requestHeaders,
       'User-Agent': generateUserAgent(),
-      'X-Client-Id': configManager.getClientId()
+      'X-Client-Id': configManager.getClientId(),
+      // no-cache
+      'Cache-Control': 'no-cache'
     }
 
     autoUpdater.on('error', (error) => {
@@ -75,61 +99,6 @@ export default class AppUpdater {
     this.autoUpdater = autoUpdater
   }
 
-  private async _getReleaseVersionFromGithub(channel: UpgradeChannel) {
-    const headers = {
-      Accept: 'application/vnd.github+json',
-      'X-GitHub-Api-Version': '2022-11-28',
-      'Accept-Language': 'en-US,en;q=0.9'
-    }
-    try {
-      logger.info(`get release version from github: ${channel}`)
-      const responses = await net.fetch('https://api.github.com/repos/CherryHQ/cherry-studio/releases?per_page=8', {
-        headers
-      })
-      const data = (await responses.json()) as GithubReleaseInfo[]
-      let mightHaveLatest = false
-      const release: GithubReleaseInfo | undefined = data.find((item: GithubReleaseInfo) => {
-        if (!item.draft && !item.prerelease) {
-          mightHaveLatest = true
-        }
-
-        return item.prerelease && item.tag_name.includes(`-${channel}.`)
-      })
-
-      if (!release) {
-        return null
-      }
-
-      // if the release version is the same as the current version, return null
-      if (release.tag_name === app.getVersion()) {
-        return null
-      }
-
-      if (mightHaveLatest) {
-        logger.info(`might have latest release, get latest release`)
-        const latestReleaseResponse = await net.fetch(
-          'https://api.github.com/repos/CherryHQ/cherry-studio/releases/latest',
-          {
-            headers
-          }
-        )
-        const latestRelease = (await latestReleaseResponse.json()) as GithubReleaseInfo
-        if (semver.gt(latestRelease.tag_name, release.tag_name)) {
-          logger.info(
-            `latest release version is ${latestRelease.tag_name}, prerelease version is ${release.tag_name}, return null`
-          )
-          return null
-        }
-      }
-
-      logger.info(`release url is ${release.tag_name}, set channel to ${channel}`)
-      return `https://github.com/CherryHQ/cherry-studio/releases/download/${release.tag_name}`
-    } catch (error) {
-      logger.error('Failed to get latest not draft version from github:', error as Error)
-      return null
-    }
-  }
-
   public setAutoUpdate(isActive: boolean) {
     autoUpdater.autoDownload = isActive
     autoUpdater.autoInstallOnAppQuit = isActive
@@ -161,6 +130,88 @@ export default class AppUpdater {
     return UpgradeChannel.LATEST
   }
 
+  /**
+   * Fetch update configuration from GitHub or GitCode based on mirror
+   * @param mirror - Mirror to fetch config from
+   * @returns UpdateConfig object or null if fetch fails
+   */
+  private async _fetchUpdateConfig(mirror: UpdateMirror): Promise<UpdateConfig | null> {
+    const configUrl = mirror === UpdateMirror.GITCODE ? UpdateConfigUrl.GITCODE : UpdateConfigUrl.GITHUB
+
+    try {
+      logger.info(`Fetching update config from ${configUrl} (mirror: ${mirror})`)
+      const response = await net.fetch(configUrl, {
+        headers: {
+          'User-Agent': generateUserAgent(),
+          Accept: 'application/json',
+          'X-Client-Id': configManager.getClientId(),
+          // no-cache
+          'Cache-Control': 'no-cache'
+        }
+      })
+
+      if (!response.ok) {
+        throw new Error(`HTTP error! status: ${response.status}`)
+      }
+
+      const config = (await response.json()) as UpdateConfig
+      logger.info(`Update config fetched successfully, last updated: ${config.lastUpdated}`)
+      return config
+    } catch (error) {
+      logger.error('Failed to fetch update config:', error as Error)
+      return null
+    }
+  }
+
+  /**
+   * Find compatible channel configuration based on current version
+   * @param currentVersion - Current app version
+   * @param requestedChannel - Requested upgrade channel (latest/rc/beta)
+   * @param config - Update configuration object
+   * @returns Object containing ChannelConfig and actual channel if found, null otherwise
+   */
+  private _findCompatibleChannel(
+    currentVersion: string,
+    requestedChannel: UpgradeChannel,
+    config: UpdateConfig
+  ): { config: ChannelConfig; channel: UpgradeChannel } | null {
+    // Get all version keys and sort descending (newest first)
+    const versionKeys = Object.keys(config.versions).sort(semver.rcompare)
+
+    logger.info(
+      `Finding compatible channel for version ${currentVersion}, requested channel: ${requestedChannel}, available versions: ${versionKeys.join(', ')}`
+    )
+
+    for (const versionKey of versionKeys) {
+      const versionConfig = config.versions[versionKey]
+      const channelConfig = versionConfig.channels[requestedChannel]
+      const latestChannelConfig = versionConfig.channels[UpgradeChannel.LATEST]
+
+      // Check version compatibility and channel availability
+      if (semver.gte(currentVersion, versionConfig.minCompatibleVersion) && channelConfig !== null) {
+        logger.info(
+          `Found compatible version: ${versionKey} (minCompatibleVersion: ${versionConfig.minCompatibleVersion}), version: ${channelConfig.version}`
+        )
+
+        if (
+          requestedChannel !== UpgradeChannel.LATEST &&
+          latestChannelConfig &&
+          semver.gte(latestChannelConfig.version, channelConfig.version)
+        ) {
+          logger.info(
+            `latest channel version is greater than the requested channel version: ${latestChannelConfig.version} > ${channelConfig.version}, using latest instead`
+          )
+          return { config: latestChannelConfig, channel: UpgradeChannel.LATEST }
+        }
+
+        return { config: channelConfig, channel: requestedChannel }
+      }
+    }
+
+    logger.warn(`No compatible channel found for version ${currentVersion} and channel ${requestedChannel}`)
+    return null
+  }
+
   private _setChannel(channel: UpgradeChannel, feedUrl: string) {
     this.autoUpdater.channel = channel
     this.autoUpdater.setFeedURL(feedUrl)
@@ -172,33 +223,42 @@ export default class AppUpdater {
   }
 
   private async _setFeedUrl() {
+    const currentVersion = app.getVersion()
     const testPlan = configManager.getTestPlan()
-    if (testPlan) {
-      const channel = this._getTestChannel()
+    const requestedChannel = testPlan ? this._getTestChannel() : UpgradeChannel.LATEST
 
-      if (channel === UpgradeChannel.LATEST) {
-        this._setChannel(UpgradeChannel.LATEST, FeedUrl.GITHUB_LATEST)
-        return
-      }
-
-      const releaseUrl = await this._getReleaseVersionFromGithub(channel)
-      if (releaseUrl) {
-        logger.info(`release url is ${releaseUrl}, set channel to ${channel}`)
-        this._setChannel(channel, releaseUrl)
-        return
-      }
-
-      // if no prerelease url, use github latest to get release
-      this._setChannel(UpgradeChannel.LATEST, FeedUrl.GITHUB_LATEST)
-      return
-    }
-
-    this._setChannel(UpgradeChannel.LATEST, FeedUrl.PRODUCTION)
+    // Determine mirror based on IP country
     const ipCountry = await getIpCountry()
-    logger.info(`ipCountry is ${ipCountry}, set channel to ${UpgradeChannel.LATEST}`)
-    if (ipCountry.toLowerCase() !== 'cn') {
-      this._setChannel(UpgradeChannel.LATEST, FeedUrl.GITHUB_LATEST)
+    const mirror = ipCountry.toLowerCase() === 'cn' ? UpdateMirror.GITCODE : UpdateMirror.GITHUB
+
+    logger.info(
+      `Setting feed URL for version ${currentVersion}, testPlan: ${testPlan}, requested channel: ${requestedChannel}, mirror: ${mirror} (IP country: ${ipCountry})`
+    )
+
+    // Try to fetch update config from remote
+    const config = await this._fetchUpdateConfig(mirror)
+
+    if (config) {
+      // Use new config-based system
+      const result = this._findCompatibleChannel(currentVersion, requestedChannel, config)
+
+      if (result) {
+        const { config: channelConfig, channel: actualChannel } = result
+        const feedUrl = channelConfig.feedUrls[mirror]
+        logger.info(
+          `Using config-based feed URL: ${feedUrl} for channel ${actualChannel} (requested: ${requestedChannel}, mirror: ${mirror})`
+        )
+        this._setChannel(actualChannel, feedUrl)
+        return
+      }
     }
+
+    logger.info('Failed to fetch update config, falling back to default feed URL')
+    // Fallback: use default feed URL based on mirror
+    const defaultFeedUrl = mirror === UpdateMirror.GITCODE ? FeedUrl.PRODUCTION : FeedUrl.GITHUB_LATEST
+
+    logger.info(`Using fallback feed URL: ${defaultFeedUrl}`)
+    this._setChannel(UpgradeChannel.LATEST, defaultFeedUrl)
   }
 
   public cancelDownload() {
@@ -320,8 +380,3 @@ export default class AppUpdater {
     return processedInfo
   }
 }
-interface GithubReleaseInfo {
-  draft: boolean
-  prerelease: boolean
-  tag_name: string
-}

src/main/services/CodeToolsService.ts

@@ -10,6 +10,7 @@ import { getBinaryName } from '@main/utils/process'
 import type { TerminalConfig, TerminalConfigWithCommand } from '@shared/config/constant'
 import {
   codeTools,
+  HOME_CHERRY_DIR,
   MACOS_TERMINALS,
   MACOS_TERMINALS_WITH_COMMANDS,
   terminalApps,
@@ -66,7 +67,7 @@ class CodeToolsService {
   }
 
   public async getBunPath() {
-    const dir = path.join(os.homedir(), '.cherrystudio', 'bin')
+    const dir = path.join(os.homedir(), HOME_CHERRY_DIR, 'bin')
     const bunName = await getBinaryName('bun')
     const bunPath = path.join(dir, bunName)
     return bunPath
@@ -362,7 +363,7 @@ class CodeToolsService {
 
   private async isPackageInstalled(cliTool: string): Promise<boolean> {
     const executableName = await this.getCliExecutableName(cliTool)
-    const binDir = path.join(os.homedir(), '.cherrystudio', 'bin')
+    const binDir = path.join(os.homedir(), HOME_CHERRY_DIR, 'bin')
     const executablePath = path.join(binDir, executableName + (isWin ? '.exe' : ''))
 
     // Ensure bin directory exists
@@ -389,7 +390,7 @@ class CodeToolsService {
       logger.info(`${cliTool} is installed, getting current version`)
       try {
         const executableName = await this.getCliExecutableName(cliTool)
-        const binDir = path.join(os.homedir(), '.cherrystudio', 'bin')
+        const binDir = path.join(os.homedir(), HOME_CHERRY_DIR, 'bin')
         const executablePath = path.join(binDir, executableName + (isWin ? '.exe' : ''))
 
         const { stdout } = await execAsync(`"${executablePath}" --version`, {
@@ -500,7 +501,7 @@ class CodeToolsService {
     try {
       const packageName = await this.getPackageName(cliTool)
       const bunPath = await this.getBunPath()
-      const bunInstallPath = path.join(os.homedir(), '.cherrystudio')
+      const bunInstallPath = path.join(os.homedir(), HOME_CHERRY_DIR)
       const registryUrl = await this.getNpmRegistryUrl()
 
       const installEnvPrefix = isWin
@@ -550,7 +551,7 @@ class CodeToolsService {
     const packageName = await this.getPackageName(cliTool)
     const bunPath = await this.getBunPath()
     const executableName = await this.getCliExecutableName(cliTool)
-    const binDir = path.join(os.homedir(), '.cherrystudio', 'bin')
+    const binDir = path.join(os.homedir(), HOME_CHERRY_DIR, 'bin')
     const executablePath = path.join(binDir, executableName + (isWin ? '.exe' : ''))
 
     logger.debug(`Package name: ${packageName}`)
@@ -652,7 +653,7 @@ class CodeToolsService {
       baseCommand = `${baseCommand} ${configParams}`
     }
 
-    const bunInstallPath = path.join(os.homedir(), '.cherrystudio')
+    const bunInstallPath = path.join(os.homedir(), HOME_CHERRY_DIR)
 
     if (isInstalled) {
       // If already installed, run executable directly (with optional update message)

src/main/services/FileStorage.ts

@@ -16,6 +16,7 @@ import type { FSWatcher } from 'chokidar'
 import chokidar from 'chokidar'
 import * as crypto from 'crypto'
 import type { OpenDialogOptions, OpenDialogReturnValue, SaveDialogOptions, SaveDialogReturnValue } from 'electron'
+import { app } from 'electron'
 import { dialog, net, shell } from 'electron'
 import * as fs from 'fs'
 import { writeFileSync } from 'fs'
@@ -30,6 +31,73 @@ import WordExtractor from 'word-extractor'
 
 const logger = loggerService.withContext('FileStorage')
 
+// Get ripgrep binary path
+const getRipgrepBinaryPath = (): string | null => {
+  try {
+    const arch = process.arch === 'arm64' ? 'arm64' : 'x64'
+    const platform = process.platform === 'darwin' ? 'darwin' : process.platform === 'win32' ? 'win32' : 'linux'
+    let ripgrepBinaryPath = path.join(
+      __dirname,
+      '../../node_modules/@anthropic-ai/claude-agent-sdk/vendor/ripgrep',
+      `${arch}-${platform}`,
+      process.platform === 'win32' ? 'rg.exe' : 'rg'
+    )
+
+    if (app.isPackaged) {
+      ripgrepBinaryPath = ripgrepBinaryPath.replace(/\.asar([\\/])/, '.asar.unpacked$1')
+    }
+
+    if (fs.existsSync(ripgrepBinaryPath)) {
+      return ripgrepBinaryPath
+    }
+    return null
+  } catch (error) {
+    logger.error('Failed to locate ripgrep binary:', error as Error)
+    return null
+  }
+}
+
+/**
+ * Execute ripgrep with captured output
+ */
+function executeRipgrep(args: string[]): Promise<{ exitCode: number; output: string }> {
+  return new Promise((resolve, reject) => {
+    const ripgrepBinaryPath = getRipgrepBinaryPath()
+
+    if (!ripgrepBinaryPath) {
+      reject(new Error('Ripgrep binary not available'))
+      return
+    }
+
+    const { spawn } = require('child_process')
+    const child = spawn(ripgrepBinaryPath, ['--no-config', '--ignore-case', ...args], {
+      stdio: ['pipe', 'pipe', 'pipe']
+    })
+
+    let output = ''
+    let errorOutput = ''
+
+    child.stdout.on('data', (data: Buffer) => {
+      output += data.toString()
+    })
+
+    child.stderr.on('data', (data: Buffer) => {
+      errorOutput += data.toString()
+    })
+
+    child.on('close', (code: number) => {
+      resolve({
+        exitCode: code || 0,
+        output: output || errorOutput
+      })
+    })
+
+    child.on('error', (error: Error) => {
+      reject(error)
+    })
+  })
+}
+
 interface FileWatcherConfig {
   watchExtensions?: string[]
   ignoredPatterns?: (string | RegExp)[]
@@ -54,6 +122,26 @@ const DEFAULT_WATCHER_CONFIG: Required<FileWatcherConfig> = {
   eventChannel: 'file-change'
 }
 
+interface DirectoryListOptions {
+  recursive?: boolean
+  maxDepth?: number
+  includeHidden?: boolean
+  includeFiles?: boolean
+  includeDirectories?: boolean
+  maxEntries?: number
+  searchPattern?: string
+}
+
+const DEFAULT_DIRECTORY_LIST_OPTIONS: Required<DirectoryListOptions> = {
+  recursive: true,
+  maxDepth: 3,
+  includeHidden: false,
+  includeFiles: true,
+  includeDirectories: true,
+  maxEntries: 10,
+  searchPattern: '.'
+}
+
 class FileStorage {
   private storageDir = getFilesDir()
   private notesDir = getNotesDir()
@@ -748,6 +836,284 @@ class FileStorage {
     }
   }
 
+  public listDirectory = async (
+    _: Electron.IpcMainInvokeEvent,
+    dirPath: string,
+    options?: DirectoryListOptions
+  ): Promise<string[]> => {
+    const mergedOptions: Required<DirectoryListOptions> = {
+      ...DEFAULT_DIRECTORY_LIST_OPTIONS,
+      ...options
+    }
+
+    const resolvedPath = path.resolve(dirPath)
+
+    const stat = await fs.promises.stat(resolvedPath).catch((error) => {
+      logger.error(`[IPC - Error] Failed to access directory: ${resolvedPath}`, error as Error)
+      throw error
+    })
+
+    if (!stat.isDirectory()) {
+      throw new Error(`Path is not a directory: ${resolvedPath}`)
+    }
+
+    // Use ripgrep for file listing with relevance-based sorting
+    if (!getRipgrepBinaryPath()) {
+      throw new Error('Ripgrep binary not available')
+    }
+
+    return await this.listDirectoryWithRipgrep(resolvedPath, mergedOptions)
+  }
+
+  /**
+   * Search directories by name pattern
+   */
+  private async searchDirectories(
+    resolvedPath: string,
+    options: Required<DirectoryListOptions>,
+    currentDepth: number = 0
+  ): Promise<string[]> {
+    if (!options.includeDirectories) return []
+    if (!options.recursive && currentDepth > 0) return []
+    if (options.maxDepth > 0 && currentDepth >= options.maxDepth) return []
+
+    const directories: string[] = []
+    const excludedDirs = new Set([
+      'node_modules',
+      '.git',
+      '.idea',
+      '.vscode',
+      'dist',
+      'build',
+      '.next',
+      '.nuxt',
+      'coverage',
+      '.cache'
+    ])
+
+    try {
+      const entries = await fs.promises.readdir(resolvedPath, { withFileTypes: true })
+      const searchPatternLower = options.searchPattern.toLowerCase()
+
+      for (const entry of entries) {
+        if (!entry.isDirectory()) continue
+
+        // Skip hidden directories unless explicitly included
+        if (!options.includeHidden && entry.name.startsWith('.')) continue
+
+        // Skip excluded directories
+        if (excludedDirs.has(entry.name)) continue
+
+        const fullPath = path.join(resolvedPath, entry.name).replace(/\\/g, '/')
+
+        // Check if directory name matches search pattern
+        if (options.searchPattern === '.' || entry.name.toLowerCase().includes(searchPatternLower)) {
+          directories.push(fullPath)
+        }
+
+        // Recursively search subdirectories
+        if (options.recursive && currentDepth < options.maxDepth) {
+          const subDirs = await this.searchDirectories(fullPath, options, currentDepth + 1)
+          directories.push(...subDirs)
+        }
+      }
+    } catch (error) {
+      logger.warn(`Failed to search directories in: ${resolvedPath}`, error as Error)
+    }
+
+    return directories
+  }
+
+  /**
+   * Search files by filename pattern
+   */
+  private async searchByFilename(resolvedPath: string, options: Required<DirectoryListOptions>): Promise<string[]> {
+    const files: string[] = []
+    const directories: string[] = []
+
+    // Search for files using ripgrep
+    if (options.includeFiles) {
+      const args: string[] = ['--files']
+
+      // Handle hidden files
+      if (!options.includeHidden) {
+        args.push('--glob', '!.*')
+      }
+
+      // Use --iglob to let ripgrep filter filenames (case-insensitive)
+      if (options.searchPattern && options.searchPattern !== '.') {
+        args.push('--iglob', `*${options.searchPattern}*`)
+      }
+
+      // Exclude common hidden directories and large directories
+      args.push('-g', '!**/node_modules/**')
+      args.push('-g', '!**/.git/**')
+      args.push('-g', '!**/.idea/**')
+      args.push('-g', '!**/.vscode/**')
+      args.push('-g', '!**/.DS_Store')
+      args.push('-g', '!**/dist/**')
+      args.push('-g', '!**/build/**')
+      args.push('-g', '!**/.next/**')
+      args.push('-g', '!**/.nuxt/**')
+      args.push('-g', '!**/coverage/**')
+      args.push('-g', '!**/.cache/**')
+
+      // Handle max depth
+      if (!options.recursive) {
+        args.push('--max-depth', '1')
+      } else if (options.maxDepth > 0) {
+        args.push('--max-depth', options.maxDepth.toString())
+      }
+
+      // Add the directory path
+      args.push(resolvedPath)
+
+      const { exitCode, output } = await executeRipgrep(args)
+
+      // Exit code 0 means files found, 1 means no files found (still success), 2+ means error
+      if (exitCode >= 2) {
+        throw new Error(`Ripgrep failed with exit code ${exitCode}: ${output}`)
+      }
+
+      // Parse ripgrep output (no need to filter by filename - ripgrep already did it)
+      files.push(
+        ...output
+          .split('\n')
+          .filter((line) => line.trim())
+          .map((line) => line.replace(/\\/g, '/'))
+      )
+    }
+
+    // Search for directories
+    if (options.includeDirectories) {
+      directories.push(...(await this.searchDirectories(resolvedPath, options)))
+    }
+
+    // Combine and sort: directories first (alphabetically), then files (alphabetically)
+    const sortedDirectories = directories.sort((a, b) => {
+      const aName = path.basename(a)
+      const bName = path.basename(b)
+      return aName.localeCompare(bName)
+    })
+
+    const sortedFiles = files.sort((a, b) => {
+      const aName = path.basename(a)
+      const bName = path.basename(b)
+      return aName.localeCompare(bName)
+    })
+
+    return [...sortedDirectories, ...sortedFiles].slice(0, options.maxEntries)
+  }
+
+  /**
+   * Search files by content pattern
+   */
+  private async searchByContent(resolvedPath: string, options: Required<DirectoryListOptions>): Promise<string[]> {
+    const args: string[] = ['-l']
+
+    // Handle hidden files
+    if (!options.includeHidden) {
+      args.push('--glob', '!.*')
+    }
+
+    // Exclude common hidden directories and large directories
+    args.push('-g', '!**/node_modules/**')
+    args.push('-g', '!**/.git/**')
+    args.push('-g', '!**/.idea/**')
+    args.push('-g', '!**/.vscode/**')
+    args.push('-g', '!**/.DS_Store')
+    args.push('-g', '!**/dist/**')
+    args.push('-g', '!**/build/**')
+    args.push('-g', '!**/.next/**')
+    args.push('-g', '!**/.nuxt/**')
+    args.push('-g', '!**/coverage/**')
+    args.push('-g', '!**/.cache/**')
+
+    // Handle max depth
+    if (!options.recursive) {
+      args.push('--max-depth', '1')
+    } else if (options.maxDepth > 0) {
+      args.push('--max-depth', options.maxDepth.toString())
+    }
+
+    // Handle max count
+    if (options.maxEntries > 0) {
+      args.push('--max-count', options.maxEntries.toString())
+    }
+
+    // Add search pattern (search in content)
+    args.push(options.searchPattern)
+
+    // Add the directory path
+    args.push(resolvedPath)
+
+    const { exitCode, output } = await executeRipgrep(args)
+
+    // Exit code 0 means files found, 1 means no files found (still success), 2+ means error
+    if (exitCode >= 2) {
+      throw new Error(`Ripgrep failed with exit code ${exitCode}: ${output}`)
+    }
+
+    // Parse ripgrep output (already sorted by relevance)
+    const results = output
+      .split('\n')
+      .filter((line) => line.trim())
+      .map((line) => line.replace(/\\/g, '/'))
+      .slice(0, options.maxEntries)
+
+    return results
+  }
+
+  private async listDirectoryWithRipgrep(
+    resolvedPath: string,
+    options: Required<DirectoryListOptions>
+  ): Promise<string[]> {
+    const maxEntries = options.maxEntries
+
+    // Step 1: Search by filename first
+    logger.debug('Searching by filename pattern', { pattern: options.searchPattern, path: resolvedPath })
+    const filenameResults = await this.searchByFilename(resolvedPath, options)
+
+    logger.debug('Found matches by filename', { count: filenameResults.length })
+
+    // If we have enough filename matches, return them
+    if (filenameResults.length >= maxEntries) {
+      return filenameResults.slice(0, maxEntries)
+    }
+
+    // Step 2: If filename matches are less than maxEntries, search by content to fill up
+    logger.debug('Filename matches insufficient, searching by content to fill up', {
+      filenameCount: filenameResults.length,
+      needed: maxEntries - filenameResults.length
+    })
+
+    // Adjust maxEntries for content search to get enough results
+    const contentOptions = {
+      ...options,
+      maxEntries: maxEntries - filenameResults.length + 20 // Request extra to account for duplicates
+    }
+
+    const contentResults = await this.searchByContent(resolvedPath, contentOptions)
+
+    logger.debug('Found matches by content', { count: contentResults.length })
+
+    // Combine results: filename matches first, then content matches (deduplicated)
+    const combined = [...filenameResults]
+    const filenameSet = new Set(filenameResults)
+
+    for (const filePath of contentResults) {
+      if (!filenameSet.has(filePath)) {
+        combined.push(filePath)
+        if (combined.length >= maxEntries) {
+          break
+        }
+      }
+    }
+
+    logger.debug('Combined results', { total: combined.length, filenameCount: filenameResults.length })
+    return combined.slice(0, maxEntries)
+  }
+
   public validateNotesDirectory = async (_: Electron.IpcMainInvokeEvent, dirPath: string): Promise<boolean> => {
     try {
       if (!dirPath || typeof dirPath !== 'string') {

src/main/services/MCPService.ts

@@ -30,6 +30,7 @@ import {
   ToolListChangedNotificationSchema
 } from '@modelcontextprotocol/sdk/types.js'
 import { nanoid } from '@reduxjs/toolkit'
+import { HOME_CHERRY_DIR } from '@shared/config/constant'
 import type { MCPProgressEvent } from '@shared/config/types'
 import { IpcChannel } from '@shared/IpcChannel'
 import { defaultAppHeaders } from '@shared/utils'
@@ -715,7 +716,7 @@ class McpService {
   }
 
   public async getInstallInfo() {
-    const dir = path.join(os.homedir(), '.cherrystudio', 'bin')
+    const dir = path.join(os.homedir(), HOME_CHERRY_DIR, 'bin')
     const uvName = await getBinaryName('uv')
     const bunName = await getBinaryName('bun')
     const uvPath = path.join(dir, uvName)

src/main/services/OvmsManager.ts

@@ -3,6 +3,7 @@ import { homedir } from 'node:os'
 import { promisify } from 'node:util'
 
 import { loggerService } from '@logger'
+import { HOME_CHERRY_DIR } from '@shared/config/constant'
 import * as fs from 'fs-extra'
 import * as path from 'path'
 
@@ -145,7 +146,7 @@ class OvmsManager {
    */
   public async runOvms(): Promise<{ success: boolean; message?: string }> {
     const homeDir = homedir()
-    const ovmsDir = path.join(homeDir, '.cherrystudio', 'ovms', 'ovms')
+    const ovmsDir = path.join(homeDir, HOME_CHERRY_DIR, 'ovms', 'ovms')
     const configPath = path.join(ovmsDir, 'models', 'config.json')
     const runBatPath = path.join(ovmsDir, 'run.bat')
 
@@ -195,7 +196,7 @@ class OvmsManager {
    */
   public async getOvmsStatus(): Promise<'not-installed' | 'not-running' | 'running'> {
     const homeDir = homedir()
-    const ovmsPath = path.join(homeDir, '.cherrystudio', 'ovms', 'ovms', 'ovms.exe')
+    const ovmsPath = path.join(homeDir, HOME_CHERRY_DIR, 'ovms', 'ovms', 'ovms.exe')
 
     try {
       // Check if OVMS executable exists
@@ -273,7 +274,7 @@ class OvmsManager {
     }
 
     const homeDir = homedir()
-    const configPath = path.join(homeDir, '.cherrystudio', 'ovms', 'ovms', 'models', 'config.json')
+    const configPath = path.join(homeDir, HOME_CHERRY_DIR, 'ovms', 'ovms', 'models', 'config.json')
     try {
       if (!(await fs.pathExists(configPath))) {
         logger.warn(`Config file does not exist: ${configPath}`)
@@ -304,7 +305,7 @@ class OvmsManager {
 
   private async applyModelPath(modelDirPath: string): Promise<boolean> {
     const homeDir = homedir()
-    const patchDir = path.join(homeDir, '.cherrystudio', 'ovms', 'patch')
+    const patchDir = path.join(homeDir, HOME_CHERRY_DIR, 'ovms', 'patch')
     if (!(await fs.pathExists(patchDir))) {
       return true
     }
@@ -355,7 +356,7 @@ class OvmsManager {
     logger.info(`Adding model: ${modelName} with ID: ${modelId}, Source: ${modelSource}, Task: ${task}`)
 
     const homeDir = homedir()
-    const ovdndDir = path.join(homeDir, '.cherrystudio', 'ovms', 'ovms')
+    const ovdndDir = path.join(homeDir, HOME_CHERRY_DIR, 'ovms', 'ovms')
     const pathModel = path.join(ovdndDir, 'models', modelId)
 
     try {
@@ -468,7 +469,7 @@ class OvmsManager {
    */
   public async checkModelExists(modelId: string): Promise<boolean> {
     const homeDir = homedir()
-    const ovmsDir = path.join(homeDir, '.cherrystudio', 'ovms', 'ovms')
+    const ovmsDir = path.join(homeDir, HOME_CHERRY_DIR, 'ovms', 'ovms')
     const configPath = path.join(ovmsDir, 'models', 'config.json')
 
     try {
@@ -495,7 +496,7 @@ class OvmsManager {
    */
   public async updateModelConfig(modelName: string, modelId: string): Promise<boolean> {
     const homeDir = homedir()
-    const ovmsDir = path.join(homeDir, '.cherrystudio', 'ovms', 'ovms')
+    const ovmsDir = path.join(homeDir, HOME_CHERRY_DIR, 'ovms', 'ovms')
     const configPath = path.join(ovmsDir, 'models', 'config.json')
 
     try {
@@ -548,7 +549,7 @@ class OvmsManager {
    */
   public async getModels(): Promise<ModelConfig[]> {
     const homeDir = homedir()
-    const ovmsDir = path.join(homeDir, '.cherrystudio', 'ovms', 'ovms')
+    const ovmsDir = path.join(homeDir, HOME_CHERRY_DIR, 'ovms', 'ovms')
     const configPath = path.join(ovmsDir, 'models', 'config.json')
 
     try {

src/main/services/PowerMonitorService.ts

@@ -0,0 +1,112 @@
+import { loggerService } from '@logger'
+import { isLinux, isMac, isWin } from '@main/constant'
+import ElectronShutdownHandler from '@paymoapp/electron-shutdown-handler'
+import { BrowserWindow } from 'electron'
+import { powerMonitor } from 'electron'
+
+const logger = loggerService.withContext('PowerMonitorService')
+
+type ShutdownHandler = () => void | Promise<void>
+
+export class PowerMonitorService {
+  private static instance: PowerMonitorService
+  private initialized = false
+  private shutdownHandlers: ShutdownHandler[] = []
+
+  private constructor() {
+    // Private constructor to prevent direct instantiation
+  }
+
+  public static getInstance(): PowerMonitorService {
+    if (!PowerMonitorService.instance) {
+      PowerMonitorService.instance = new PowerMonitorService()
+    }
+    return PowerMonitorService.instance
+  }
+
+  /**
+   * Register a shutdown handler to be called when system shutdown is detected
+   * @param handler - The handler function to be called on shutdown
+   */
+  public registerShutdownHandler(handler: ShutdownHandler): void {
+    this.shutdownHandlers.push(handler)
+    logger.info('Shutdown handler registered', { totalHandlers: this.shutdownHandlers.length })
+  }
+
+  /**
+   * Initialize power monitor to listen for shutdown events
+   */
+  public init(): void {
+    if (this.initialized) {
+      logger.warn('PowerMonitorService already initialized')
+      return
+    }
+
+    if (isWin) {
+      this.initWindowsShutdownHandler()
+    } else if (isMac || isLinux) {
+      this.initElectronPowerMonitor()
+    }
+
+    this.initialized = true
+    logger.info('PowerMonitorService initialized', { platform: process.platform })
+  }
+
+  /**
+   * Execute all registered shutdown handlers
+   */
+  private async executeShutdownHandlers(): Promise<void> {
+    logger.info('Executing shutdown handlers', { count: this.shutdownHandlers.length })
+    for (const handler of this.shutdownHandlers) {
+      try {
+        await handler()
+      } catch (error) {
+        logger.error('Error executing shutdown handler', error as Error)
+      }
+    }
+  }
+
+  /**
+   * Initialize shutdown handler for Windows using @paymoapp/electron-shutdown-handler
+   */
+  private initWindowsShutdownHandler(): void {
+    try {
+      const zeroMemoryWindow = new BrowserWindow({ show: false })
+      // Set the window handle for the shutdown handler
+      ElectronShutdownHandler.setWindowHandle(zeroMemoryWindow.getNativeWindowHandle())
+
+      // Listen for shutdown event
+      ElectronShutdownHandler.on('shutdown', async () => {
+        logger.info('System shutdown event detected (Windows)')
+        // Execute all registered shutdown handlers
+        await this.executeShutdownHandlers()
+        // Release the shutdown block to allow the system to shut down
+        ElectronShutdownHandler.releaseShutdown()
+      })
+
+      logger.info('Windows shutdown handler registered')
+    } catch (error) {
+      logger.error('Failed to initialize Windows shutdown handler', error as Error)
+    }
+  }
+
+  /**
+   * Initialize power monitor for macOS and Linux using Electron's powerMonitor
+   */
+  private initElectronPowerMonitor(): void {
+    try {
+      powerMonitor.on('shutdown', async () => {
+        logger.info('System shutdown event detected', { platform: process.platform })
+        // Execute all registered shutdown handlers
+        await this.executeShutdownHandlers()
+      })
+
+      logger.info('Electron powerMonitor shutdown listener registered')
+    } catch (error) {
+      logger.error('Failed to initialize Electron powerMonitor', error as Error)
+    }
+  }
+}
+
+// Default export as singleton instance
+export default PowerMonitorService.getInstance()

src/main/services/PythonService.ts

@@ -1,8 +1,9 @@
 import { randomUUID } from 'node:crypto'
 
-import type { BrowserWindow } from 'electron'
 import { ipcMain } from 'electron'
 
+import { windowService } from './WindowService'
+
 interface PythonExecutionRequest {
   id: string
   script: string
@@ -21,7 +22,6 @@ interface PythonExecutionResponse {
  */
 export class PythonService {
   private static instance: PythonService | null = null
-  private mainWindow: BrowserWindow | null = null
   private pendingRequests = new Map<string, { resolve: (value: string) => void; reject: (error: Error) => void }>()
 
   private constructor() {
@@ -51,10 +51,6 @@ export class PythonService {
     })
   }
 
-  public setMainWindow(mainWindow: BrowserWindow) {
-    this.mainWindow = mainWindow
-  }
-
   /**
    * Execute Python code by sending request to renderer PyodideService
    */
@@ -63,8 +59,8 @@ export class PythonService {
     context: Record<string, any> = {},
     timeout: number = 60000
   ): Promise<string> {
-    if (!this.mainWindow) {
-      throw new Error('Main window not set in PythonService')
+    if (!windowService.getMainWindow()) {
+      throw new Error('Main window not found')
     }
 
     return new Promise((resolve, reject) => {
@@ -95,7 +91,7 @@ export class PythonService {
 
       // Send request to renderer
       const request: PythonExecutionRequest = { id: requestId, script, context, timeout }
-      this.mainWindow?.webContents.send('python-execution-request', request)
+      windowService.getMainWindow()?.webContents.send('python-execution-request', request)
     })
   }
 }

src/main/services/SpanCacheService.ts

@@ -3,6 +3,7 @@ import type { Attributes, SpanEntity, TokenUsage, TraceCache } from '@mcp-trace/
 import { convertSpanToSpanEntity } from '@mcp-trace/trace-core'
 import { SpanStatusCode } from '@opentelemetry/api'
 import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'
+import { HOME_CHERRY_DIR } from '@shared/config/constant'
 import fs from 'fs/promises'
 import * as os from 'os'
 import * as path from 'path'
@@ -18,7 +19,7 @@ class SpanCacheService implements TraceCache {
   pri
 
   constructor() {
-    this.fileDir = path.join(os.homedir(), '.cherrystudio', 'trace')
+    this.fileDir = path.join(os.homedir(), HOME_CHERRY_DIR, 'trace')
   }
 
   createSpan: (span: ReadableSpan) => void = (span: ReadableSpan) => {

src/main/services/VersionService.ts

@@ -0,0 +1,285 @@
+import { loggerService } from '@logger'
+import { app } from 'electron'
+import fs from 'fs'
+import path from 'path'
+
+const logger = loggerService.withContext('VersionService')
+
+type OS = 'win' | 'mac' | 'linux' | 'unknown'
+type Environment = 'prod' | 'dev'
+type Packaged = 'packaged' | 'unpackaged'
+type Mode = 'install' | 'portable'
+
+/**
+ * Version record stored in version.log
+ */
+interface VersionRecord {
+  version: string
+  os: OS
+  environment: Environment
+  packaged: Packaged
+  mode: Mode
+  timestamp: string
+}
+
+/**
+ * Service for tracking application version history
+ * Stores version information in userData/version.log for data migration and diagnostics
+ */
+class VersionService {
+  private readonly VERSION_LOG_FILE = 'version.log'
+  private versionLogPath: string | null = null
+
+  constructor() {
+    // Lazy initialization of path since app.getPath may not be available during construction
+  }
+
+  /**
+   * Gets the full path to version.log file
+   * @returns {string} Full path to version log file
+   */
+  private getVersionLogPath(): string {
+    if (!this.versionLogPath) {
+      this.versionLogPath = path.join(app.getPath('userData'), this.VERSION_LOG_FILE)
+    }
+    return this.versionLogPath
+  }
+
+  /**
+   * Gets current operating system identifier
+   * @returns {OS} OS identifier
+   */
+  private getCurrentOS(): OS {
+    switch (process.platform) {
+      case 'win32':
+        return 'win'
+      case 'darwin':
+        return 'mac'
+      case 'linux':
+        return 'linux'
+      default:
+        return 'unknown'
+    }
+  }
+
+  /**
+   * Gets current environment (production or development)
+   * @returns {Environment} Environment identifier
+   */
+  private getCurrentEnvironment(): Environment {
+    return import.meta.env.MODE === 'production' ? 'prod' : 'dev'
+  }
+
+  /**
+   * Gets packaging status
+   * @returns {Packaged} Packaging status
+   */
+  private getPackagedStatus(): Packaged {
+    return app.isPackaged ? 'packaged' : 'unpackaged'
+  }
+
+  /**
+   * Gets installation mode (install or portable)
+   * @returns {Mode} Installation mode
+   */
+  private getInstallMode(): Mode {
+    return process.env.PORTABLE_EXECUTABLE_DIR !== undefined ? 'portable' : 'install'
+  }
+
+  /**
+   * Generates version log line for current application state
+   * @returns {string} Pipe-separated version record line
+   */
+  private generateCurrentVersionLine(): string {
+    const version = app.getVersion()
+    const os = this.getCurrentOS()
+    const environment = this.getCurrentEnvironment()
+    const packaged = this.getPackagedStatus()
+    const mode = this.getInstallMode()
+    const timestamp = new Date().toISOString()
+
+    return `${version}|${os}|${environment}|${packaged}|${mode}|${timestamp}`
+  }
+
+  /**
+   * Parses a version log line into a VersionRecord object
+   * @param {string} line - Pipe-separated version record line
+   * @returns {VersionRecord | null} Parsed version record or null if invalid
+   */
+  private parseVersionLine(line: string): VersionRecord | null {
+    try {
+      const parts = line.trim().split('|')
+      if (parts.length !== 6) {
+        return null
+      }
+
+      const [version, os, environment, packaged, mode, timestamp] = parts
+
+      // Validate data
+      if (
+        !version ||
+        !['win', 'mac', 'linux', 'unknown'].includes(os) ||
+        !['prod', 'dev'].includes(environment) ||
+        !['packaged', 'unpackaged'].includes(packaged) ||
+        !['install', 'portable'].includes(mode) ||
+        !timestamp
+      ) {
+        return null
+      }
+
+      return {
+        version,
+        os: os as OS,
+        environment: environment as Environment,
+        packaged: packaged as Packaged,
+        mode: mode as Mode,
+        timestamp
+      }
+    } catch (error) {
+      logger.warn(`Failed to parse version line: ${line}`, error as Error)
+      return null
+    }
+  }
+
+  /**
+   * Reads the last 1KB from version.log and returns all lines
+   * Uses reverse reading from file end to avoid reading the entire file
+   * @returns {string[]} Array of version lines from the last 1KB
+   */
+  private readLastVersionLines(): string[] {
+    const logPath = this.getVersionLogPath()
+
+    try {
+      if (!fs.existsSync(logPath)) {
+        return []
+      }
+
+      const stats = fs.statSync(logPath)
+      const fileSize = stats.size
+
+      if (fileSize === 0) {
+        return []
+      }
+
+      // Read from the end of the file, 1KB is enough to find previous version
+      // Typical line: "1.7.0-beta.3|win|prod|packaged|install|2025-01-15T08:30:00.000Z\n" (~70 bytes)
+      // 1KB can store ~14 lines, which is more than enough
+      const bufferSize = Math.min(1024, fileSize)
+      const buffer = Buffer.alloc(bufferSize)
+
+      const fd = fs.openSync(logPath, 'r')
+      try {
+        const startPosition = Math.max(0, fileSize - bufferSize)
+        fs.readSync(fd, buffer, 0, bufferSize, startPosition)
+
+        const content = buffer.toString('utf-8')
+        const lines = content
+          .trim()
+          .split('\n')
+          .filter((line) => line.trim())
+
+        return lines
+      } finally {
+        fs.closeSync(fd)
+      }
+    } catch (error) {
+      logger.error('Failed to read version log:', error as Error)
+      return []
+    }
+  }
+
+  /**
+   * Appends a version record line to version.log
+   * @param {string} line - Version record line to append
+   */
+  private appendVersionLine(line: string): void {
+    const logPath = this.getVersionLogPath()
+
+    try {
+      fs.appendFileSync(logPath, line + '\n', 'utf-8')
+      logger.debug(`Version recorded: ${line}`)
+    } catch (error) {
+      logger.error('Failed to append version log:', error as Error)
+    }
+  }
+
+  /**
+   * Records the current version on application startup
+   * Only adds a new record if the version has changed since the last run
+   */
+  recordCurrentVersion(): void {
+    try {
+      const currentLine = this.generateCurrentVersionLine()
+      const lines = this.readLastVersionLines()
+
+      // Add new record if this is the first run or version has changed
+      if (lines.length === 0) {
+        logger.info('First run detected, creating version log')
+        this.appendVersionLine(currentLine)
+        return
+      }
+
+      const lastLine = lines[lines.length - 1]
+      const lastRecord = this.parseVersionLine(lastLine)
+      const currentVersion = app.getVersion()
+
+      // Check if any meaningful field has changed (version, os, environment, packaged, mode)
+      const currentOS = this.getCurrentOS()
+      const currentEnvironment = this.getCurrentEnvironment()
+      const currentPackaged = this.getPackagedStatus()
+      const currentMode = this.getInstallMode()
+
+      const hasMeaningfulChange =
+        !lastRecord ||
+        lastRecord.version !== currentVersion ||
+        lastRecord.os !== currentOS ||
+        lastRecord.environment !== currentEnvironment ||
+        lastRecord.packaged !== currentPackaged ||
+        lastRecord.mode !== currentMode
+
+      if (hasMeaningfulChange) {
+        logger.info(`Version information changed, recording new entry`)
+        this.appendVersionLine(currentLine)
+      } else {
+        logger.debug(`Version information not changed, skip recording`)
+      }
+    } catch (error) {
+      logger.error('Failed to record current version:', error as Error)
+    }
+  }
+
+  /**
+   * Gets the previous version record (last record with different version than current)
+   * Reads from the last 1KB of version.log to find the most recent different version
+   * Useful for detecting version upgrades and running migrations
+   * @returns {VersionRecord | null} Previous version record or null if not available
+   */
+  getPreviousVersion(): VersionRecord | null {
+    try {
+      const lines = this.readLastVersionLines()
+      if (lines.length === 0) {
+        return null
+      }
+
+      const currentVersion = app.getVersion()
+
+      // Read from the end backwards to find the first different version
+      for (let i = lines.length - 1; i >= 0; i--) {
+        const record = this.parseVersionLine(lines[i])
+        if (record && record.version !== currentVersion) {
+          return record
+        }
+      }
+
+      return null
+    } catch (error) {
+      logger.error('Failed to get previous version:', error as Error)
+      return null
+    }
+  }
+}
+
+/**
+ * Singleton instance of VersionService
+ */
+export const versionService = new VersionService()

src/main/services/WindowService.ts

@@ -375,13 +375,16 @@ export class WindowService {
 
       mainWindow.hide()
 
-      // TODO: don't hide dock icon when close to tray
-      // will cause the cmd+h behavior not working
-      // after the electron fix the bug, we can restore this code
-      // //for mac users, should hide dock icon if close to tray
-      // if (isMac && isTrayOnClose) {
-      //   app.dock?.hide()
-      // }
+      //for mac users, should hide dock icon if close to tray
+      if (isMac && isTrayOnClose) {
+        app.dock?.hide()
+
+        mainWindow.once('show', () => {
+          //restore the window can hide by cmd+h when the window is shown again
+          // https://github.com/electron/electron/pull/47970
+          app.dock?.show()
+        })
+      }
     })
 
     mainWindow.on('closed', () => {

src/main/services/__tests__/AppUpdater.test.ts

@@ -85,6 +85,9 @@ vi.mock('electron-updater', () => ({
 }))
 
 // Import after mocks
+import { UpdateMirror } from '@shared/config/constant'
+import { app, net } from 'electron'
+
 import AppUpdater from '../AppUpdater'
 import { configManager } from '../ConfigManager'
 
@@ -274,4 +277,711 @@ describe('AppUpdater', () => {
       expect(result.releaseNotes).toBeNull()
     })
   })
+
+  describe('_fetchUpdateConfig', () => {
+    const mockConfig = {
+      lastUpdated: '2025-01-05T00:00:00Z',
+      versions: {
+        '1.6.7': {
+          minCompatibleVersion: '1.0.0',
+          description: 'Test version',
+          channels: {
+            latest: {
+              version: '1.6.7',
+              feedUrls: {
+                github: 'https://github.com/test/v1.6.7',
+                gitcode: 'https://gitcode.com/test/v1.6.7'
+              }
+            },
+            rc: null,
+            beta: null
+          }
+        }
+      }
+    }
+
+    it('should fetch config from GitHub mirror', async () => {
+      vi.mocked(net.fetch).mockResolvedValue({
+        ok: true,
+        json: async () => mockConfig
+      } as any)
+
+      const result = await (appUpdater as any)._fetchUpdateConfig(UpdateMirror.GITHUB)
+
+      expect(result).toEqual(mockConfig)
+      expect(net.fetch).toHaveBeenCalledWith(expect.stringContaining('github'), expect.any(Object))
+    })
+
+    it('should fetch config from GitCode mirror', async () => {
+      vi.mocked(net.fetch).mockResolvedValue({
+        ok: true,
+        json: async () => mockConfig
+      } as any)
+
+      const result = await (appUpdater as any)._fetchUpdateConfig(UpdateMirror.GITCODE)
+
+      expect(result).toEqual(mockConfig)
+      // GitCode URL may vary, just check that fetch was called
+      expect(net.fetch).toHaveBeenCalledWith(expect.any(String), expect.any(Object))
+    })
+
+    it('should return null on HTTP error', async () => {
+      vi.mocked(net.fetch).mockResolvedValue({
+        ok: false,
+        status: 404
+      } as any)
+
+      const result = await (appUpdater as any)._fetchUpdateConfig(UpdateMirror.GITHUB)
+
+      expect(result).toBeNull()
+    })
+
+    it('should return null on network error', async () => {
+      vi.mocked(net.fetch).mockRejectedValue(new Error('Network error'))
+
+      const result = await (appUpdater as any)._fetchUpdateConfig(UpdateMirror.GITHUB)
+
+      expect(result).toBeNull()
+    })
+  })
+
+  describe('_findCompatibleChannel', () => {
+    const mockConfig = {
+      lastUpdated: '2025-01-05T00:00:00Z',
+      versions: {
+        '1.6.7': {
+          minCompatibleVersion: '1.0.0',
+          description: 'v1.6.7',
+          channels: {
+            latest: {
+              version: '1.6.7',
+              feedUrls: {
+                github: 'https://github.com/test/v1.6.7',
+                gitcode: 'https://gitcode.com/test/v1.6.7'
+              }
+            },
+            rc: {
+              version: '1.7.0-rc.1',
+              feedUrls: {
+                github: 'https://github.com/test/v1.7.0-rc.1',
+                gitcode: 'https://gitcode.com/test/v1.7.0-rc.1'
+              }
+            },
+            beta: {
+              version: '1.7.0-beta.3',
+              feedUrls: {
+                github: 'https://github.com/test/v1.7.0-beta.3',
+                gitcode: 'https://gitcode.com/test/v1.7.0-beta.3'
+              }
+            }
+          }
+        },
+        '2.0.0': {
+          minCompatibleVersion: '1.7.0',
+          description: 'v2.0.0',
+          channels: {
+            latest: null,
+            rc: null,
+            beta: null
+          }
+        }
+      }
+    }
+
+    it('should find compatible latest channel', () => {
+      vi.mocked(app.getVersion).mockReturnValue('1.5.0')
+
+      const result = (appUpdater as any)._findCompatibleChannel('1.5.0', 'latest', mockConfig)
+
+      expect(result?.config).toEqual({
+        version: '1.6.7',
+        feedUrls: {
+          github: 'https://github.com/test/v1.6.7',
+          gitcode: 'https://gitcode.com/test/v1.6.7'
+        }
+      })
+      expect(result?.channel).toBe('latest')
+    })
+
+    it('should find compatible rc channel', () => {
+      vi.mocked(app.getVersion).mockReturnValue('1.5.0')
+
+      const result = (appUpdater as any)._findCompatibleChannel('1.5.0', 'rc', mockConfig)
+
+      expect(result?.config).toEqual({
+        version: '1.7.0-rc.1',
+        feedUrls: {
+          github: 'https://github.com/test/v1.7.0-rc.1',
+          gitcode: 'https://gitcode.com/test/v1.7.0-rc.1'
+        }
+      })
+      expect(result?.channel).toBe('rc')
+    })
+
+    it('should find compatible beta channel', () => {
+      vi.mocked(app.getVersion).mockReturnValue('1.5.0')
+
+      const result = (appUpdater as any)._findCompatibleChannel('1.5.0', 'beta', mockConfig)
+
+      expect(result?.config).toEqual({
+        version: '1.7.0-beta.3',
+        feedUrls: {
+          github: 'https://github.com/test/v1.7.0-beta.3',
+          gitcode: 'https://gitcode.com/test/v1.7.0-beta.3'
+        }
+      })
+      expect(result?.channel).toBe('beta')
+    })
+
+    it('should return latest when latest version >= rc version', () => {
+      const configWithNewerLatest = {
+        lastUpdated: '2025-01-05T00:00:00Z',
+        versions: {
+          '1.7.0': {
+            minCompatibleVersion: '1.0.0',
+            description: 'v1.7.0',
+            channels: {
+              latest: {
+                version: '1.7.0',
+                feedUrls: {
+                  github: 'https://github.com/test/v1.7.0',
+                  gitcode: 'https://gitcode.com/test/v1.7.0'
+                }
+              },
+              rc: {
+                version: '1.7.0-rc.1',
+                feedUrls: {
+                  github: 'https://github.com/test/v1.7.0-rc.1',
+                  gitcode: 'https://gitcode.com/test/v1.7.0-rc.1'
+                }
+              },
+              beta: null
+            }
+          }
+        }
+      }
+
+      const result = (appUpdater as any)._findCompatibleChannel('1.6.0', 'rc', configWithNewerLatest)
+
+      // Should return latest instead of rc because 1.7.0 >= 1.7.0-rc.1
+      expect(result?.config).toEqual({
+        version: '1.7.0',
+        feedUrls: {
+          github: 'https://github.com/test/v1.7.0',
+          gitcode: 'https://gitcode.com/test/v1.7.0'
+        }
+      })
+      expect(result?.channel).toBe('latest') // ✅ 返回 latest 频道
+    })
+
+    it('should return latest when latest version >= beta version', () => {
+      const configWithNewerLatest = {
+        lastUpdated: '2025-01-05T00:00:00Z',
+        versions: {
+          '1.7.0': {
+            minCompatibleVersion: '1.0.0',
+            description: 'v1.7.0',
+            channels: {
+              latest: {
+                version: '1.7.0',
+
+                feedUrls: {
+                  github: 'https://github.com/test/v1.7.0',
+
+                  gitcode: 'https://gitcode.com/test/v1.7.0'
+                }
+              },
+              rc: null,
+              beta: {
+                version: '1.6.8-beta.1',
+
+                feedUrls: {
+                  github: 'https://github.com/test/v1.6.8-beta.1',
+
+                  gitcode: 'https://gitcode.com/test/v1.6.8-beta.1'
+                }
+              }
+            }
+          }
+        }
+      }
+
+      const result = (appUpdater as any)._findCompatibleChannel('1.6.0', 'beta', configWithNewerLatest)
+
+      // Should return latest instead of beta because 1.7.0 >= 1.6.8-beta.1
+      expect(result?.config).toEqual({
+        version: '1.7.0',
+
+        feedUrls: {
+          github: 'https://github.com/test/v1.7.0',
+
+          gitcode: 'https://gitcode.com/test/v1.7.0'
+        }
+      })
+    })
+
+    it('should not compare latest with itself when requesting latest channel', () => {
+      const config = {
+        lastUpdated: '2025-01-05T00:00:00Z',
+        versions: {
+          '1.7.0': {
+            minCompatibleVersion: '1.0.0',
+            description: 'v1.7.0',
+            channels: {
+              latest: {
+                version: '1.7.0',
+
+                feedUrls: {
+                  github: 'https://github.com/test/v1.7.0',
+
+                  gitcode: 'https://gitcode.com/test/v1.7.0'
+                }
+              },
+              rc: {
+                version: '1.7.0-rc.1',
+
+                feedUrls: {
+                  github: 'https://github.com/test/v1.7.0-rc.1',
+
+                  gitcode: 'https://gitcode.com/test/v1.7.0-rc.1'
+                }
+              },
+              beta: null
+            }
+          }
+        }
+      }
+
+      const result = (appUpdater as any)._findCompatibleChannel('1.6.0', 'latest', config)
+
+      // Should return latest directly without comparing with itself
+      expect(result?.config).toEqual({
+        version: '1.7.0',
+
+        feedUrls: {
+          github: 'https://github.com/test/v1.7.0',
+
+          gitcode: 'https://gitcode.com/test/v1.7.0'
+        }
+      })
+    })
+
+    it('should return rc when rc version > latest version', () => {
+      const configWithNewerRc = {
+        lastUpdated: '2025-01-05T00:00:00Z',
+        versions: {
+          '1.7.0': {
+            minCompatibleVersion: '1.0.0',
+            description: 'v1.7.0',
+            channels: {
+              latest: {
+                version: '1.6.7',
+
+                feedUrls: {
+                  github: 'https://github.com/test/v1.6.7',
+
+                  gitcode: 'https://gitcode.com/test/v1.6.7'
+                }
+              },
+              rc: {
+                version: '1.7.0-rc.1',
+
+                feedUrls: {
+                  github: 'https://github.com/test/v1.7.0-rc.1',
+
+                  gitcode: 'https://gitcode.com/test/v1.7.0-rc.1'
+                }
+              },
+              beta: null
+            }
+          }
+        }
+      }
+
+      const result = (appUpdater as any)._findCompatibleChannel('1.6.0', 'rc', configWithNewerRc)
+
+      // Should return rc because 1.7.0-rc.1 > 1.6.7
+      expect(result?.config).toEqual({
+        version: '1.7.0-rc.1',
+
+        feedUrls: {
+          github: 'https://github.com/test/v1.7.0-rc.1',
+
+          gitcode: 'https://gitcode.com/test/v1.7.0-rc.1'
+        }
+      })
+    })
+
+    it('should return beta when beta version > latest version', () => {
+      const configWithNewerBeta = {
+        lastUpdated: '2025-01-05T00:00:00Z',
+        versions: {
+          '1.7.0': {
+            minCompatibleVersion: '1.0.0',
+            description: 'v1.7.0',
+            channels: {
+              latest: {
+                version: '1.6.7',
+
+                feedUrls: {
+                  github: 'https://github.com/test/v1.6.7',
+
+                  gitcode: 'https://gitcode.com/test/v1.6.7'
+                }
+              },
+              rc: null,
+              beta: {
+                version: '1.7.0-beta.5',
+
+                feedUrls: {
+                  github: 'https://github.com/test/v1.7.0-beta.5',
+
+                  gitcode: 'https://gitcode.com/test/v1.7.0-beta.5'
+                }
+              }
+            }
+          }
+        }
+      }
+
+      const result = (appUpdater as any)._findCompatibleChannel('1.6.0', 'beta', configWithNewerBeta)
+
+      // Should return beta because 1.7.0-beta.5 > 1.6.7
+      expect(result?.config).toEqual({
+        version: '1.7.0-beta.5',
+
+        feedUrls: {
+          github: 'https://github.com/test/v1.7.0-beta.5',
+
+          gitcode: 'https://gitcode.com/test/v1.7.0-beta.5'
+        }
+      })
+    })
+
+    it('should return lower version when higher version has no compatible channel', () => {
+      vi.mocked(app.getVersion).mockReturnValue('1.8.0')
+
+      const result = (appUpdater as any)._findCompatibleChannel('1.8.0', 'latest', mockConfig)
+
+      // 1.8.0 >= 1.7.0 but 2.0.0 has no latest channel, so return 1.6.7
+      expect(result?.config).toEqual({
+        version: '1.6.7',
+
+        feedUrls: {
+          github: 'https://github.com/test/v1.6.7',
+
+          gitcode: 'https://gitcode.com/test/v1.6.7'
+        }
+      })
+    })
+
+    it('should return null when current version does not meet minCompatibleVersion', () => {
+      vi.mocked(app.getVersion).mockReturnValue('0.9.0')
+
+      const result = (appUpdater as any)._findCompatibleChannel('0.9.0', 'latest', mockConfig)
+
+      // 0.9.0 < 1.0.0 (minCompatibleVersion)
+      expect(result).toBeNull()
+    })
+
+    it('should return lower version rc when higher version has no rc channel', () => {
+      const result = (appUpdater as any)._findCompatibleChannel('1.8.0', 'rc', mockConfig)
+
+      // 1.8.0 >= 1.7.0 but 2.0.0 has no rc channel, so return 1.6.7 rc
+      expect(result?.config).toEqual({
+        version: '1.7.0-rc.1',
+
+        feedUrls: {
+          github: 'https://github.com/test/v1.7.0-rc.1',
+
+          gitcode: 'https://gitcode.com/test/v1.7.0-rc.1'
+        }
+      })
+    })
+
+    it('should return null when no version has the requested channel', () => {
+      const configWithoutRc = {
+        lastUpdated: '2025-01-05T00:00:00Z',
+        versions: {
+          '1.6.7': {
+            minCompatibleVersion: '1.0.0',
+            description: 'v1.6.7',
+            channels: {
+              latest: {
+                version: '1.6.7',
+
+                feedUrls: {
+                  github: 'https://github.com/test/v1.6.7',
+
+                  gitcode: 'https://gitcode.com/test/v1.6.7'
+                }
+              },
+              rc: null,
+              beta: null
+            }
+          }
+        }
+      }
+
+      const result = (appUpdater as any)._findCompatibleChannel('1.5.0', 'rc', configWithoutRc)
+
+      expect(result).toBeNull()
+    })
+  })
+
+  describe('Upgrade Path', () => {
+    const fullConfig = {
+      lastUpdated: '2025-01-05T00:00:00Z',
+      versions: {
+        '1.6.7': {
+          minCompatibleVersion: '1.0.0',
+          description: 'Last v1.x',
+          channels: {
+            latest: {
+              version: '1.6.7',
+
+              feedUrls: {
+                github: 'https://github.com/test/v1.6.7',
+
+                gitcode: 'https://gitcode.com/test/v1.6.7'
+              }
+            },
+            rc: {
+              version: '1.7.0-rc.1',
+
+              feedUrls: {
+                github: 'https://github.com/test/v1.7.0-rc.1',
+
+                gitcode: 'https://gitcode.com/test/v1.7.0-rc.1'
+              }
+            },
+            beta: {
+              version: '1.7.0-beta.3',
+
+              feedUrls: {
+                github: 'https://github.com/test/v1.7.0-beta.3',
+
+                gitcode: 'https://gitcode.com/test/v1.7.0-beta.3'
+              }
+            }
+          }
+        },
+        '2.0.0': {
+          minCompatibleVersion: '1.7.0',
+          description: 'First v2.x',
+          channels: {
+            latest: null,
+            rc: null,
+            beta: null
+          }
+        }
+      }
+    }
+
+    it('should upgrade from 1.6.3 to 1.6.7', () => {
+      const result = (appUpdater as any)._findCompatibleChannel('1.6.3', 'latest', fullConfig)
+
+      expect(result?.config).toEqual({
+        version: '1.6.7',
+
+        feedUrls: {
+          github: 'https://github.com/test/v1.6.7',
+
+          gitcode: 'https://gitcode.com/test/v1.6.7'
+        }
+      })
+    })
+
+    it('should block upgrade from 1.6.7 to 2.0.0 (minCompatibleVersion not met)', () => {
+      const result = (appUpdater as any)._findCompatibleChannel('1.6.7', 'latest', fullConfig)
+
+      // Should return 1.6.7, not 2.0.0, because 1.6.7 < 1.7.0 (minCompatibleVersion of 2.0.0)
+      expect(result?.config).toEqual({
+        version: '1.6.7',
+
+        feedUrls: {
+          github: 'https://github.com/test/v1.6.7',
+
+          gitcode: 'https://gitcode.com/test/v1.6.7'
+        }
+      })
+    })
+
+    it('should allow upgrade from 1.7.0 to 2.0.0', () => {
+      const configWith2x = {
+        ...fullConfig,
+        versions: {
+          ...fullConfig.versions,
+          '2.0.0': {
+            minCompatibleVersion: '1.7.0',
+            description: 'First v2.x',
+            channels: {
+              latest: {
+                version: '2.0.0',
+
+                feedUrls: {
+                  github: 'https://github.com/test/v2.0.0',
+
+                  gitcode: 'https://gitcode.com/test/v2.0.0'
+                }
+              },
+              rc: null,
+              beta: null
+            }
+          }
+        }
+      }
+
+      const result = (appUpdater as any)._findCompatibleChannel('1.7.0', 'latest', configWith2x)
+
+      expect(result?.config).toEqual({
+        version: '2.0.0',
+
+        feedUrls: {
+          github: 'https://github.com/test/v2.0.0',
+
+          gitcode: 'https://gitcode.com/test/v2.0.0'
+        }
+      })
+    })
+  })
+
+  describe('Complete Multi-Step Upgrade Path', () => {
+    const fullUpgradeConfig = {
+      lastUpdated: '2025-01-05T00:00:00Z',
+      versions: {
+        '1.7.5': {
+          minCompatibleVersion: '1.0.0',
+          description: 'Last v1.x stable',
+          channels: {
+            latest: {
+              version: '1.7.5',
+
+              feedUrls: {
+                github: 'https://github.com/test/v1.7.5',
+
+                gitcode: 'https://gitcode.com/test/v1.7.5'
+              }
+            },
+            rc: null,
+            beta: null
+          }
+        },
+        '2.0.0': {
+          minCompatibleVersion: '1.7.0',
+          description: 'First v2.x - intermediate version',
+          channels: {
+            latest: {
+              version: '2.0.0',
+
+              feedUrls: {
+                github: 'https://github.com/test/v2.0.0',
+
+                gitcode: 'https://gitcode.com/test/v2.0.0'
+              }
+            },
+            rc: null,
+            beta: null
+          }
+        },
+        '2.1.6': {
+          minCompatibleVersion: '2.0.0',
+          description: 'Current v2.x stable',
+          channels: {
+            latest: {
+              version: '2.1.6',
+
+              feedUrls: {
+                github: 'https://github.com/test/latest',
+
+                gitcode: 'https://gitcode.com/test/latest'
+              }
+            },
+            rc: null,
+            beta: null
+          }
+        }
+      }
+    }
+
+    it('should upgrade from 1.6.3 to 1.7.5 (step 1)', () => {
+      const result = (appUpdater as any)._findCompatibleChannel('1.6.3', 'latest', fullUpgradeConfig)
+
+      expect(result?.config).toEqual({
+        version: '1.7.5',
+
+        feedUrls: {
+          github: 'https://github.com/test/v1.7.5',
+
+          gitcode: 'https://gitcode.com/test/v1.7.5'
+        }
+      })
+    })
+
+    it('should upgrade from 1.7.5 to 2.0.0 (step 2)', () => {
+      const result = (appUpdater as any)._findCompatibleChannel('1.7.5', 'latest', fullUpgradeConfig)
+
+      expect(result?.config).toEqual({
+        version: '2.0.0',
+
+        feedUrls: {
+          github: 'https://github.com/test/v2.0.0',
+
+          gitcode: 'https://gitcode.com/test/v2.0.0'
+        }
+      })
+    })
+
+    it('should upgrade from 2.0.0 to 2.1.6 (step 3)', () => {
+      const result = (appUpdater as any)._findCompatibleChannel('2.0.0', 'latest', fullUpgradeConfig)
+
+      expect(result?.config).toEqual({
+        version: '2.1.6',
+
+        feedUrls: {
+          github: 'https://github.com/test/latest',
+
+          gitcode: 'https://gitcode.com/test/latest'
+        }
+      })
+    })
+
+    it('should complete full upgrade path: 1.6.3 -> 1.7.5 -> 2.0.0 -> 2.1.6', () => {
+      // Step 1: 1.6.3 -> 1.7.5
+      let currentVersion = '1.6.3'
+      let result = (appUpdater as any)._findCompatibleChannel(currentVersion, 'latest', fullUpgradeConfig)
+      expect(result?.config.version).toBe('1.7.5')
+
+      // Step 2: 1.7.5 -> 2.0.0
+      currentVersion = result?.config.version!
+      result = (appUpdater as any)._findCompatibleChannel(currentVersion, 'latest', fullUpgradeConfig)
+      expect(result?.config.version).toBe('2.0.0')
+
+      // Step 3: 2.0.0 -> 2.1.6
+      currentVersion = result?.config.version!
+      result = (appUpdater as any)._findCompatibleChannel(currentVersion, 'latest', fullUpgradeConfig)
+      expect(result?.config.version).toBe('2.1.6')
+
+      // Final: 2.1.6 is the latest, no more upgrades
+      currentVersion = result?.config.version!
+      result = (appUpdater as any)._findCompatibleChannel(currentVersion, 'latest', fullUpgradeConfig)
+      expect(result?.config.version).toBe('2.1.6')
+    })
+
+    it('should block direct upgrade from 1.6.3 to 2.0.0 (skip intermediate)', () => {
+      const result = (appUpdater as any)._findCompatibleChannel('1.6.3', 'latest', fullUpgradeConfig)
+
+      // Should return 1.7.5, not 2.0.0, because 1.6.3 < 1.7.0 (minCompatibleVersion of 2.0.0)
+      expect(result?.config.version).toBe('1.7.5')
+      expect(result?.config.version).not.toBe('2.0.0')
+    })
+
+    it('should block direct upgrade from 1.7.5 to 2.1.6 (skip intermediate)', () => {
+      const result = (appUpdater as any)._findCompatibleChannel('1.7.5', 'latest', fullUpgradeConfig)
+
+      // Should return 2.0.0, not 2.1.6, because 1.7.5 < 2.0.0 (minCompatibleVersion of 2.1.6)
+      expect(result?.config.version).toBe('2.0.0')
+      expect(result?.config.version).not.toBe('2.1.6')
+    })
+  })
 })

src/main/services/agents/BaseService.ts

@@ -1,17 +1,13 @@
-import { type Client, createClient } from '@libsql/client'
 import { loggerService } from '@logger'
 import { mcpApiService } from '@main/apiServer/services/mcp'
 import type { ModelValidationError } from '@main/apiServer/utils'
 import { validateModelId } from '@main/apiServer/utils'
 import type { AgentType, MCPTool, SlashCommand, Tool } from '@types'
 import { objectKeys } from '@types'
-import { drizzle, type LibSQLDatabase } from 'drizzle-orm/libsql'
 import fs from 'fs'
 import path from 'path'
 
-import { MigrationService } from './database/MigrationService'
-import * as schema from './database/schema'
-import { dbPath } from './drizzle.config'
+import { DatabaseManager } from './database/DatabaseManager'
 import type { AgentModelField } from './errors'
 import { AgentModelValidationError } from './errors'
 import { builtinSlashCommands } from './services/claudecode/commands'
@@ -20,40 +16,24 @@ import { builtinTools } from './services/claudecode/tools'
 const logger = loggerService.withContext('BaseService')
 
 /**
- * Base service class providing shared database connection and utilities
- * for all agent-related services.
+ * Base service class providing shared utilities for all agent-related services.
  *
  * Features:
- * - Programmatic schema management (no CLI dependencies)
- * - Automatic table creation and migration
- * - Schema version tracking and compatibility checks
- * - Transaction-based operations for safety
- * - Development vs production mode handling
- * - Connection retry logic with exponential backoff
+ * - Database access through DatabaseManager singleton
+ * - JSON field serialization/deserialization
+ * - Path validation and creation
+ * - Model validation
+ * - MCP tools and slash commands listing
  */
 export abstract class BaseService {
-  protected static client: Client | null = null
-  protected static db: LibSQLDatabase<typeof schema> | null = null
-  protected static isInitialized = false
-  protected static initializationPromise: Promise<void> | null = null
-  protected jsonFields: string[] = ['tools', 'mcps', 'configuration', 'accessible_paths', 'allowed_tools']
-
-  /**
-   * Initialize database with retry logic and proper error handling
-   */
-  protected static async initialize(): Promise<void> {
-    // Return existing initialization if in progress
-    if (BaseService.initializationPromise) {
-      return BaseService.initializationPromise
-    }
-
-    if (BaseService.isInitialized) {
-      return
-    }
-
-    BaseService.initializationPromise = BaseService.performInitialization()
-    return BaseService.initializationPromise
-  }
+  protected jsonFields: string[] = [
+    'tools',
+    'mcps',
+    'configuration',
+    'accessible_paths',
+    'allowed_tools',
+    'slash_commands'
+  ]
 
   public async listMcpTools(agentType: AgentType, ids?: string[]): Promise<Tool[]> {
     const tools: Tool[] = []
@@ -94,78 +74,13 @@ export abstract class BaseService {
     return []
   }
 
-  private static async performInitialization(): Promise<void> {
-    const maxRetries = 3
-    let lastError: Error
-
-    for (let attempt = 1; attempt <= maxRetries; attempt++) {
-      try {
-        logger.info(`Initializing Agent database at: ${dbPath} (attempt ${attempt}/${maxRetries})`)
-
-        // Ensure the database directory exists
-        const dbDir = path.dirname(dbPath)
-        if (!fs.existsSync(dbDir)) {
-          logger.info(`Creating database directory: ${dbDir}`)
-          fs.mkdirSync(dbDir, { recursive: true })
-        }
-
-        BaseService.client = createClient({
-          url: `file:${dbPath}`
-        })
-
-        BaseService.db = drizzle(BaseService.client, { schema })
-
-        // Run database migrations
-        const migrationService = new MigrationService(BaseService.db, BaseService.client)
-        await migrationService.runMigrations()
-
-        BaseService.isInitialized = true
-        logger.info('Agent database initialized successfully')
-        return
-      } catch (error) {
-        lastError = error as Error
-        logger.warn(`Database initialization attempt ${attempt} failed:`, lastError)
-
-        // Clean up on failure
-        if (BaseService.client) {
-          try {
-            BaseService.client.close()
-          } catch (closeError) {
-            logger.warn('Failed to close client during cleanup:', closeError as Error)
-          }
-        }
-        BaseService.client = null
-        BaseService.db = null
-
-        // Wait before retrying (exponential backoff)
-        if (attempt < maxRetries) {
-          const delay = Math.pow(2, attempt) * 1000 // 2s, 4s, 8s
-          logger.info(`Retrying in ${delay}ms...`)
-          await new Promise((resolve) => setTimeout(resolve, delay))
-        }
-      }
-    }
-
-    // All retries failed
-    BaseService.initializationPromise = null
-    logger.error('Failed to initialize Agent database after all retries:', lastError!)
-    throw lastError!
-  }
-
-  protected ensureInitialized(): void {
-    if (!BaseService.isInitialized || !BaseService.db || !BaseService.client) {
-      throw new Error('Database not initialized. Call initialize() first.')
-    }
-  }
-
-  protected get database(): LibSQLDatabase<typeof schema> {
-    this.ensureInitialized()
-    return BaseService.db!
-  }
-
-  protected get rawClient(): Client {
-    this.ensureInitialized()
-    return BaseService.client!
+  /**
+   * Get database instance
+   * Automatically waits for initialization to complete
+   */
+  protected async getDatabase() {
+    const dbManager = await DatabaseManager.getInstance()
+    return dbManager.getDatabase()
   }
 
   protected serializeJsonFields(data: any): any {
@@ -277,7 +192,7 @@ export abstract class BaseService {
   }
 
   /**
-   * Force re-initialization (for development/testing)
+   * Validate agent model configuration
    */
   protected async validateAgentModels(
     agentType: AgentType,
@@ -318,22 +233,4 @@ export abstract class BaseService {
       }
     }
   }
-
-  static async reinitialize(): Promise<void> {
-    BaseService.isInitialized = false
-    BaseService.initializationPromise = null
-
-    if (BaseService.client) {
-      try {
-        BaseService.client.close()
-      } catch (error) {
-        logger.warn('Failed to close client during reinitialize:', error as Error)
-      }
-    }
-
-    BaseService.client = null
-    BaseService.db = null
-
-    await BaseService.initialize()
-  }
 }

src/main/services/agents/database/DatabaseManager.ts

@@ -0,0 +1,156 @@
+import { type Client, createClient } from '@libsql/client'
+import { loggerService } from '@logger'
+import type { LibSQLDatabase } from 'drizzle-orm/libsql'
+import { drizzle } from 'drizzle-orm/libsql'
+import fs from 'fs'
+import path from 'path'
+
+import { dbPath } from '../drizzle.config'
+import { MigrationService } from './MigrationService'
+import * as schema from './schema'
+
+const logger = loggerService.withContext('DatabaseManager')
+
+/**
+ * Database initialization state
+ */
+enum InitState {
+  INITIALIZING = 'initializing',
+  INITIALIZED = 'initialized',
+  FAILED = 'failed'
+}
+
+/**
+ * DatabaseManager - Singleton class for managing libsql database connections
+ *
+ * Responsibilities:
+ * - Single source of truth for database connection
+ * - Thread-safe initialization with state management
+ * - Automatic migration handling
+ * - Safe connection cleanup
+ * - Error recovery and retry logic
+ * - Windows platform compatibility fixes
+ */
+export class DatabaseManager {
+  private static instance: DatabaseManager | null = null
+
+  private client: Client | null = null
+  private db: LibSQLDatabase<typeof schema> | null = null
+  private state: InitState = InitState.INITIALIZING
+
+  /**
+   * Get the singleton instance (database initialization starts automatically)
+   */
+  public static async getInstance(): Promise<DatabaseManager> {
+    if (DatabaseManager.instance) {
+      return DatabaseManager.instance
+    }
+
+    const instance = new DatabaseManager()
+    await instance.initialize()
+    DatabaseManager.instance = instance
+
+    return instance
+  }
+
+  /**
+   * Perform the actual initialization
+   */
+  public async initialize(): Promise<void> {
+    if (this.state === InitState.INITIALIZED) {
+      return
+    }
+
+    try {
+      logger.info(`Initializing database at: ${dbPath}`)
+
+      // Ensure database directory exists
+      const dbDir = path.dirname(dbPath)
+      if (!fs.existsSync(dbDir)) {
+        logger.info(`Creating database directory: ${dbDir}`)
+        fs.mkdirSync(dbDir, { recursive: true })
+      }
+
+      // Check if database file is corrupted (Windows specific check)
+      if (fs.existsSync(dbPath)) {
+        const stats = fs.statSync(dbPath)
+        if (stats.size === 0) {
+          logger.warn('Database file is empty, removing corrupted file')
+          fs.unlinkSync(dbPath)
+        }
+      }
+
+      // Create client with platform-specific options
+      this.client = createClient({
+        url: `file:${dbPath}`,
+        // intMode: 'number' helps avoid some Windows compatibility issues
+        intMode: 'number'
+      })
+
+      // Create drizzle instance
+      this.db = drizzle(this.client, { schema })
+
+      // Run migrations
+      const migrationService = new MigrationService(this.db, this.client)
+      await migrationService.runMigrations()
+
+      this.state = InitState.INITIALIZED
+      logger.info('Database initialized successfully')
+    } catch (error) {
+      const err = error as Error
+      logger.error('Database initialization failed:', {
+        error: err.message,
+        stack: err.stack
+      })
+
+      // Clean up failed initialization
+      this.cleanupFailedInit()
+
+      // Set failed state
+      this.state = InitState.FAILED
+      throw new Error(`Database initialization failed: ${err.message || 'Unknown error'}`)
+    }
+  }
+
+  /**
+   * Clean up after failed initialization
+   */
+  private cleanupFailedInit(): void {
+    if (this.client) {
+      try {
+        // On Windows, closing a partially initialized client can crash
+        // Wrap in try-catch and ignore errors during cleanup
+        this.client.close()
+      } catch (error) {
+        logger.warn('Failed to close client during cleanup:', error as Error)
+      }
+    }
+    this.client = null
+    this.db = null
+  }
+
+  /**
+   * Get the database instance
+   * Automatically waits for initialization to complete
+   * @throws Error if database initialization failed
+   */
+  public getDatabase(): LibSQLDatabase<typeof schema> {
+    return this.db!
+  }
+
+  /**
+   * Get the raw client (for advanced operations)
+   * Automatically waits for initialization to complete
+   * @throws Error if database initialization failed
+   */
+  public async getClient(): Promise<Client> {
+    return this.client!
+  }
+
+  /**
+   * Check if database is initialized
+   */
+  public isInitialized(): boolean {
+    return this.state === InitState.INITIALIZED
+  }
+}

src/main/services/agents/database/MigrationService.ts

@@ -52,7 +52,7 @@ export class MigrationService {
 
       // Get applied migrations
       const appliedMigrations = hasMigrationsTable ? await this.getAppliedMigrations() : []
-      const appliedVersions = new Set(appliedMigrations.map((m) => Number(m.version)))
+      const appliedByVersion = new Map(appliedMigrations.map((m) => [Number(m.version), m.tag]))
 
       const latestAppliedVersion = appliedMigrations.reduce(
         (max, migration) => Math.max(max, Number(migration.version)),
@@ -62,10 +62,35 @@ export class MigrationService {
 
       logger.info(`Latest applied migration: v${latestAppliedVersion}, latest available: v${latestJournalVersion}`)
 
-      // Find pending migrations (compare journal idx with stored version, which is the same value)
-      const pendingMigrations = journal.entries
-        .filter((entry) => !appliedVersions.has(entry.idx))
-        .sort((a, b) => a.idx - b.idx)
+      // Find pending migrations and tag mismatches
+      const pendingMigrations: MigrationJournal['entries'] = []
+      const mismatchedMigrations: Array<{ entry: MigrationJournal['entries'][0]; appliedTag: string }> = []
+
+      for (const entry of journal.entries) {
+        const appliedTag = appliedByVersion.get(entry.idx)
+        if (appliedTag === undefined) {
+          // Migration not applied yet
+          pendingMigrations.push(entry)
+        } else if (appliedTag !== entry.tag) {
+          // Migration tag mismatch - different migration was applied for this version
+          mismatchedMigrations.push({ entry, appliedTag })
+        }
+      }
+
+      // Handle tag mismatches by re-applying the correct migration
+      if (mismatchedMigrations.length > 0) {
+        for (const { entry, appliedTag } of mismatchedMigrations) {
+          logger.warn(
+            `Migration tag mismatch for version ${entry.idx}: ` +
+              `applied "${appliedTag}", expected "${entry.tag}". Will re-apply correct migration.`
+          )
+          // Add to pending so it gets executed
+          pendingMigrations.push(entry)
+        }
+      }
+
+      // Sort pending migrations by idx
+      pendingMigrations.sort((a, b) => a.idx - b.idx)
 
       if (pendingMigrations.length === 0) {
         logger.info('Database is up to date')
@@ -149,7 +174,14 @@ export class MigrationService {
         throw new Error('Migrations table missing after executing migration; cannot record progress')
       }
 
-      await this.db.insert(migrations).values(newMigration)
+      // Use upsert to handle tag mismatch case (same version, different tag)
+      await this.db
+        .insert(migrations)
+        .values(newMigration)
+        .onConflictDoUpdate({
+          target: migrations.version,
+          set: { tag: migration.tag, executedAt: Date.now() }
+        })
 
       const executionTime = Date.now() - startTime
       logger.info(`Migration ${migration.tag} completed in ${executionTime}ms`)

src/main/services/agents/database/index.ts

@@ -7,8 +7,14 @@
  * Schema evolution is handled by Drizzle Kit migrations.
  */
 
+// Database Manager (Singleton)
+export * from './DatabaseManager'
+
 // Drizzle ORM schemas
 export * from './schema'
 
 // Repository helpers
 export * from './sessionMessageRepository'
+
+// Migration Service
+export * from './MigrationService'

src/main/services/agents/database/schema/sessions.schema.ts

@@ -22,6 +22,7 @@ export const sessionsTable = sqliteTable('sessions', {
 
   mcps: text('mcps'), // JSON array of MCP tool IDs
   allowed_tools: text('allowed_tools'), // JSON array of allowed tool IDs (whitelist)
+  slash_commands: text('slash_commands'), // JSON array of slash command objects from SDK init
 
   configuration: text('configuration'), // JSON, extensible settings
 

src/main/services/agents/database/sessionMessageRepository.ts

@@ -15,26 +15,16 @@ import { sessionMessagesTable } from './schema'
 
 const logger = loggerService.withContext('AgentMessageRepository')
 
-type TxClient = any
-
 export type PersistUserMessageParams = AgentMessageUserPersistPayload & {
   sessionId: string
   agentSessionId?: string
-  tx?: TxClient
 }
 
 export type PersistAssistantMessageParams = AgentMessageAssistantPersistPayload & {
   sessionId: string
   agentSessionId: string
-  tx?: TxClient
 }
 
-type PersistExchangeParams = AgentMessagePersistExchangePayload & {
-  tx?: TxClient
-}
-
-type PersistExchangeResult = AgentMessagePersistExchangeResult
-
 class AgentMessageRepository extends BaseService {
   private static instance: AgentMessageRepository | null = null
 
@@ -87,17 +77,13 @@ class AgentMessageRepository extends BaseService {
     return deserialized
   }
 
-  private getWriter(tx?: TxClient): TxClient {
-    return tx ?? this.database
-  }
-
   private async findExistingMessageRow(
-    writer: TxClient,
     sessionId: string,
     role: string,
     messageId: string
   ): Promise<SessionMessageRow | null> {
-    const candidateRows: SessionMessageRow[] = await writer
+    const database = await this.getDatabase()
+    const candidateRows: SessionMessageRow[] = await database
       .select()
       .from(sessionMessagesTable)
       .where(and(eq(sessionMessagesTable.session_id, sessionId), eq(sessionMessagesTable.role, role)))
@@ -122,10 +108,7 @@ class AgentMessageRepository extends BaseService {
   private async upsertMessage(
     params: PersistUserMessageParams | PersistAssistantMessageParams
   ): Promise<AgentSessionMessageEntity> {
-    await AgentMessageRepository.initialize()
-    this.ensureInitialized()
-
-    const { sessionId, agentSessionId = '', payload, metadata, createdAt, tx } = params
+    const { sessionId, agentSessionId = '', payload, metadata, createdAt } = params
 
     if (!payload?.message?.role) {
       throw new Error('Message payload missing role')
@@ -135,18 +118,18 @@ class AgentMessageRepository extends BaseService {
       throw new Error('Message payload missing id')
     }
 
-    const writer = this.getWriter(tx)
+    const database = await this.getDatabase()
     const now = createdAt ?? payload.message.createdAt ?? new Date().toISOString()
     const serializedPayload = this.serializeMessage(payload)
     const serializedMetadata = this.serializeMetadata(metadata)
 
-    const existingRow = await this.findExistingMessageRow(writer, sessionId, payload.message.role, payload.message.id)
+    const existingRow = await this.findExistingMessageRow(sessionId, payload.message.role, payload.message.id)
 
     if (existingRow) {
       const metadataToPersist = serializedMetadata ?? existingRow.metadata ?? undefined
       const agentSessionToPersist = agentSessionId || existingRow.agent_session_id || ''
 
-      await writer
+      await database
         .update(sessionMessagesTable)
         .set({
           content: serializedPayload,
@@ -175,7 +158,7 @@ class AgentMessageRepository extends BaseService {
       updated_at: now
     }
 
-    const [saved] = await writer.insert(sessionMessagesTable).values(insertData).returning()
+    const [saved] = await database.insert(sessionMessagesTable).values(insertData).returning()
 
     return this.deserialize(saved)
   }
@@ -188,49 +171,38 @@ class AgentMessageRepository extends BaseService {
     return this.upsertMessage(params)
   }
 
-  async persistExchange(params: PersistExchangeParams): Promise<PersistExchangeResult> {
-    await AgentMessageRepository.initialize()
-    this.ensureInitialized()
-
+  async persistExchange(params: AgentMessagePersistExchangePayload): Promise<AgentMessagePersistExchangeResult> {
     const { sessionId, agentSessionId, user, assistant } = params
 
-    const result = await this.database.transaction(async (tx) => {
-      const exchangeResult: PersistExchangeResult = {}
+    const exchangeResult: AgentMessagePersistExchangeResult = {}
 
-      if (user?.payload) {
-        exchangeResult.userMessage = await this.persistUserMessage({
-          sessionId,
-          agentSessionId,
-          payload: user.payload,
-          metadata: user.metadata,
-          createdAt: user.createdAt,
-          tx
-        })
-      }
+    if (user?.payload) {
+      exchangeResult.userMessage = await this.persistUserMessage({
+        sessionId,
+        agentSessionId,
+        payload: user.payload,
+        metadata: user.metadata,
+        createdAt: user.createdAt
+      })
+    }
 
-      if (assistant?.payload) {
-        exchangeResult.assistantMessage = await this.persistAssistantMessage({
-          sessionId,
-          agentSessionId,
-          payload: assistant.payload,
-          metadata: assistant.metadata,
-          createdAt: assistant.createdAt,
-          tx
-        })
-      }
+    if (assistant?.payload) {
+      exchangeResult.assistantMessage = await this.persistAssistantMessage({
+        sessionId,
+        agentSessionId,
+        payload: assistant.payload,
+        metadata: assistant.metadata,
+        createdAt: assistant.createdAt
+      })
+    }
 
-      return exchangeResult
-    })
-
-    return result
+    return exchangeResult
   }
 
   async getSessionHistory(sessionId: string): Promise<AgentPersistedMessage[]> {
-    await AgentMessageRepository.initialize()
-    this.ensureInitialized()
-
     try {
-      const rows = await this.database
+      const database = await this.getDatabase()
+      const rows = await database
         .select()
         .from(sessionMessagesTable)
         .where(eq(sessionMessagesTable.session_id, sessionId))

src/main/services/agents/services/AgentService.ts

@@ -32,14 +32,8 @@ export class AgentService extends BaseService {
     return AgentService.instance
   }
 
-  async initialize(): Promise<void> {
-    await BaseService.initialize()
-  }
-
   // Agent Methods
   async createAgent(req: CreateAgentRequest): Promise<CreateAgentResponse> {
-    this.ensureInitialized()
-
     const id = `agent_${Date.now()}_${Math.random().toString(36).substring(2, 11)}`
     const now = new Date().toISOString()
 
@@ -75,8 +69,9 @@ export class AgentService extends BaseService {
       updated_at: now
     }
 
-    await this.database.insert(agentsTable).values(insertData)
-    const result = await this.database.select().from(agentsTable).where(eq(agentsTable.id, id)).limit(1)
+    const database = await this.getDatabase()
+    await database.insert(agentsTable).values(insertData)
+    const result = await database.select().from(agentsTable).where(eq(agentsTable.id, id)).limit(1)
     if (!result[0]) {
       throw new Error('Failed to create agent')
     }
@@ -86,9 +81,8 @@ export class AgentService extends BaseService {
   }
 
   async getAgent(id: string): Promise<GetAgentResponse | null> {
-    this.ensureInitialized()
-
-    const result = await this.database.select().from(agentsTable).where(eq(agentsTable.id, id)).limit(1)
+    const database = await this.getDatabase()
+    const result = await database.select().from(agentsTable).where(eq(agentsTable.id, id)).limit(1)
 
     if (!result[0]) {
       return null
@@ -118,9 +112,9 @@ export class AgentService extends BaseService {
   }
 
   async listAgents(options: ListOptions = {}): Promise<{ agents: AgentEntity[]; total: number }> {
-    this.ensureInitialized() // Build query with pagination
-
-    const totalResult = await this.database.select({ count: count() }).from(agentsTable)
+    // Build query with pagination
+    const database = await this.getDatabase()
+    const totalResult = await database.select({ count: count() }).from(agentsTable)
 
     const sortBy = options.sortBy || 'created_at'
     const orderBy = options.orderBy || 'desc'
@@ -128,7 +122,7 @@ export class AgentService extends BaseService {
     const sortField = agentsTable[sortBy]
     const orderFn = orderBy === 'asc' ? asc : desc
 
-    const baseQuery = this.database.select().from(agentsTable).orderBy(orderFn(sortField))
+    const baseQuery = database.select().from(agentsTable).orderBy(orderFn(sortField))
 
     const result =
       options.limit !== undefined
@@ -151,8 +145,6 @@ export class AgentService extends BaseService {
     updates: UpdateAgentRequest,
     options: { replace?: boolean } = {}
   ): Promise<UpdateAgentResponse | null> {
-    this.ensureInitialized()
-
     // Check if agent exists
     const existing = await this.getAgent(id)
     if (!existing) {
@@ -195,22 +187,21 @@ export class AgentService extends BaseService {
       }
     }
 
-    await this.database.update(agentsTable).set(updateData).where(eq(agentsTable.id, id))
+    const database = await this.getDatabase()
+    await database.update(agentsTable).set(updateData).where(eq(agentsTable.id, id))
     return await this.getAgent(id)
   }
 
   async deleteAgent(id: string): Promise<boolean> {
-    this.ensureInitialized()
-
-    const result = await this.database.delete(agentsTable).where(eq(agentsTable.id, id))
+    const database = await this.getDatabase()
+    const result = await database.delete(agentsTable).where(eq(agentsTable.id, id))
 
     return result.rowsAffected > 0
   }
 
   async agentExists(id: string): Promise<boolean> {
-    this.ensureInitialized()
-
-    const result = await this.database
+    const database = await this.getDatabase()
+    const result = await database
       .select({ id: agentsTable.id })
       .from(agentsTable)
       .where(eq(agentsTable.id, id))

src/main/services/agents/services/SessionMessageService.ts

@@ -104,14 +104,9 @@ export class SessionMessageService extends BaseService {
     return SessionMessageService.instance
   }
 
-  async initialize(): Promise<void> {
-    await BaseService.initialize()
-  }
-
   async sessionMessageExists(id: number): Promise<boolean> {
-    this.ensureInitialized()
-
-    const result = await this.database
+    const database = await this.getDatabase()
+    const result = await database
       .select({ id: sessionMessagesTable.id })
       .from(sessionMessagesTable)
       .where(eq(sessionMessagesTable.id, id))
@@ -124,10 +119,9 @@ export class SessionMessageService extends BaseService {
     sessionId: string,
     options: ListOptions = {}
   ): Promise<{ messages: AgentSessionMessageEntity[] }> {
-    this.ensureInitialized()
-
     // Get messages with pagination
-    const baseQuery = this.database
+    const database = await this.getDatabase()
+    const baseQuery = database
       .select()
       .from(sessionMessagesTable)
       .where(eq(sessionMessagesTable.session_id, sessionId))
@@ -146,9 +140,8 @@ export class SessionMessageService extends BaseService {
   }
 
   async deleteSessionMessage(sessionId: string, messageId: number): Promise<boolean> {
-    this.ensureInitialized()
-
-    const result = await this.database
+    const database = await this.getDatabase()
+    const result = await database
       .delete(sessionMessagesTable)
       .where(and(eq(sessionMessagesTable.id, messageId), eq(sessionMessagesTable.session_id, sessionId)))
 
@@ -160,8 +153,6 @@ export class SessionMessageService extends BaseService {
     messageData: CreateSessionMessageRequest,
     abortController: AbortController
   ): Promise<SessionStreamResult> {
-    this.ensureInitialized()
-
     return await this.startSessionMessageStream(session, messageData, abortController)
   }
 
@@ -270,10 +261,9 @@ export class SessionMessageService extends BaseService {
   }
 
   private async getLastAgentSessionId(sessionId: string): Promise<string> {
-    this.ensureInitialized()
-
     try {
-      const result = await this.database
+      const database = await this.getDatabase()
+      const result = await database
         .select({ agent_session_id: sessionMessagesTable.agent_session_id })
         .from(sessionMessagesTable)
         .where(and(eq(sessionMessagesTable.session_id, sessionId), not(eq(sessionMessagesTable.agent_session_id, ''))))

src/main/services/agents/services/SessionService.ts

@@ -1,4 +1,5 @@
-import type { UpdateSessionResponse } from '@types'
+import { loggerService } from '@logger'
+import type { SlashCommand, UpdateSessionResponse } from '@types'
 import {
   AgentBaseSchema,
   type AgentEntity,
@@ -13,6 +14,10 @@ import { and, count, desc, eq, type SQL } from 'drizzle-orm'
 import { BaseService } from '../BaseService'
 import { agentsTable, type InsertSessionRow, type SessionRow, sessionsTable } from '../database/schema'
 import type { AgentModelField } from '../errors'
+import { pluginService } from '../plugins/PluginService'
+import { builtinSlashCommands } from './claudecode/commands'
+
+const logger = loggerService.withContext('SessionService')
 
 export class SessionService extends BaseService {
   private static instance: SessionService | null = null
@@ -25,21 +30,62 @@ export class SessionService extends BaseService {
     return SessionService.instance
   }
 
-  async initialize(): Promise<void> {
-    await BaseService.initialize()
+  /**
+   * Override BaseService.listSlashCommands to merge builtin and plugin commands
+   */
+  async listSlashCommands(agentType: string, agentId?: string): Promise<SlashCommand[]> {
+    const commands: SlashCommand[] = []
+
+    // Add builtin slash commands
+    if (agentType === 'claude-code') {
+      commands.push(...builtinSlashCommands)
+    }
+
+    // Add local command plugins from .claude/commands/
+    if (agentId) {
+      try {
+        const installedPlugins = await pluginService.listInstalled(agentId)
+
+        // Filter for command type plugins
+        const commandPlugins = installedPlugins.filter((p) => p.type === 'command')
+
+        // Convert plugin metadata to SlashCommand format
+        for (const plugin of commandPlugins) {
+          const commandName = plugin.metadata.filename.replace(/\.md$/i, '')
+          commands.push({
+            command: `/${commandName}`,
+            description: plugin.metadata.description
+          })
+        }
+
+        logger.info('Listed slash commands', {
+          agentType,
+          agentId,
+          builtinCount: builtinSlashCommands.length,
+          localCount: commandPlugins.length,
+          totalCount: commands.length
+        })
+      } catch (error) {
+        logger.warn('Failed to list local command plugins', {
+          agentId,
+          error: error instanceof Error ? error.message : String(error)
+        })
+      }
+    }
+
+    return commands
   }
 
   async createSession(
     agentId: string,
     req: Partial<CreateSessionRequest> = {}
   ): Promise<GetAgentSessionResponse | null> {
-    this.ensureInitialized()
-
     // Validate agent exists - we'll need to import AgentService for this check
     // For now, we'll skip this validation to avoid circular dependencies
     // The database foreign key constraint will handle this
 
-    const agents = await this.database.select().from(agentsTable).where(eq(agentsTable.id, agentId)).limit(1)
+    const database = await this.getDatabase()
+    const agents = await database.select().from(agentsTable).where(eq(agentsTable.id, agentId)).limit(1)
     if (!agents[0]) {
       throw new Error('Agent not found')
     }
@@ -78,14 +124,16 @@ export class SessionService extends BaseService {
       plan_model: serializedData.plan_model || null,
       small_model: serializedData.small_model || null,
       mcps: serializedData.mcps || null,
+      allowed_tools: serializedData.allowed_tools || null,
       configuration: serializedData.configuration || null,
       created_at: now,
       updated_at: now
     }
 
-    await this.database.insert(sessionsTable).values(insertData)
+    const db = await this.getDatabase()
+    await db.insert(sessionsTable).values(insertData)
 
-    const result = await this.database.select().from(sessionsTable).where(eq(sessionsTable.id, id)).limit(1)
+    const result = await db.select().from(sessionsTable).where(eq(sessionsTable.id, id)).limit(1)
 
     if (!result[0]) {
       throw new Error('Failed to create session')
@@ -96,9 +144,8 @@ export class SessionService extends BaseService {
   }
 
   async getSession(agentId: string, id: string): Promise<GetAgentSessionResponse | null> {
-    this.ensureInitialized()
-
-    const result = await this.database
+    const database = await this.getDatabase()
+    const result = await database
       .select()
       .from(sessionsTable)
       .where(and(eq(sessionsTable.id, id), eq(sessionsTable.agent_id, agentId)))
@@ -110,7 +157,13 @@ export class SessionService extends BaseService {
 
     const session = this.deserializeJsonFields(result[0]) as GetAgentSessionResponse
     session.tools = await this.listMcpTools(session.agent_type, session.mcps)
-    session.slash_commands = await this.listSlashCommands(session.agent_type)
+
+    // If slash_commands is not in database yet (e.g., first invoke before init message),
+    // fall back to builtin + local commands. Otherwise, use the merged commands from database.
+    if (!session.slash_commands || session.slash_commands.length === 0) {
+      session.slash_commands = await this.listSlashCommands(session.agent_type, agentId)
+    }
+
     return session
   }
 
@@ -118,8 +171,6 @@ export class SessionService extends BaseService {
     agentId?: string,
     options: ListOptions = {}
   ): Promise<{ sessions: AgentSessionEntity[]; total: number }> {
-    this.ensureInitialized()
-
     // Build where conditions
     const whereConditions: SQL[] = []
     if (agentId) {
@@ -134,16 +185,13 @@ export class SessionService extends BaseService {
           : undefined
 
     // Get total count
-    const totalResult = await this.database.select({ count: count() }).from(sessionsTable).where(whereClause)
+    const database = await this.getDatabase()
+    const totalResult = await database.select({ count: count() }).from(sessionsTable).where(whereClause)
 
     const total = totalResult[0].count
 
     // Build list query with pagination - sort by updated_at descending (latest first)
-    const baseQuery = this.database
-      .select()
-      .from(sessionsTable)
-      .where(whereClause)
-      .orderBy(desc(sessionsTable.updated_at))
+    const baseQuery = database.select().from(sessionsTable).where(whereClause).orderBy(desc(sessionsTable.updated_at))
 
     const result =
       options.limit !== undefined
@@ -162,8 +210,6 @@ export class SessionService extends BaseService {
     id: string,
     updates: UpdateSessionRequest
   ): Promise<UpdateSessionResponse | null> {
-    this.ensureInitialized()
-
     // Check if session exists
     const existing = await this.getSession(agentId, id)
     if (!existing) {
@@ -204,15 +250,15 @@ export class SessionService extends BaseService {
       }
     }
 
-    await this.database.update(sessionsTable).set(updateData).where(eq(sessionsTable.id, id))
+    const database = await this.getDatabase()
+    await database.update(sessionsTable).set(updateData).where(eq(sessionsTable.id, id))
 
     return await this.getSession(agentId, id)
   }
 
   async deleteSession(agentId: string, id: string): Promise<boolean> {
-    this.ensureInitialized()
-
-    const result = await this.database
+    const database = await this.getDatabase()
+    const result = await database
       .delete(sessionsTable)
       .where(and(eq(sessionsTable.id, id), eq(sessionsTable.agent_id, agentId)))
 
@@ -220,9 +266,8 @@ export class SessionService extends BaseService {
   }
 
   async sessionExists(agentId: string, id: string): Promise<boolean> {
-    this.ensureInitialized()
-
-    const result = await this.database
+    const database = await this.getDatabase()
+    const result = await database
       .select({ id: sessionsTable.id })
       .from(sessionsTable)
       .where(and(eq(sessionsTable.id, id), eq(sessionsTable.agent_id, agentId)))

src/main/services/agents/services/claudecode/__tests__/transform.test.ts

@@ -1,7 +1,7 @@
 import type { SDKMessage } from '@anthropic-ai/claude-agent-sdk'
 import { describe, expect, it } from 'vitest'
 
-import { ClaudeStreamState, transformSDKMessageToStreamParts } from '../transform'
+import { ClaudeStreamState, stripLocalCommandTags, transformSDKMessageToStreamParts } from '../transform'
 
 const baseStreamMetadata = {
   parent_tool_use_id: null,
@@ -10,9 +10,27 @@ const baseStreamMetadata = {
 
 const uuid = (n: number) => `00000000-0000-0000-0000-${n.toString().padStart(12, '0')}`
 
+describe('stripLocalCommandTags', () => {
+  it('removes stdout wrapper while preserving inner text', () => {
+    const input = 'before <local-command-stdout>echo "hi"</local-command-stdout> after'
+    expect(stripLocalCommandTags(input)).toBe('before echo "hi" after')
+  })
+
+  it('strips multiple stdout/stderr blocks and leaves other content intact', () => {
+    const input =
+      '<local-command-stdout>line1</local-command-stdout>\nkeep\n<local-command-stderr>Error</local-command-stderr>'
+    expect(stripLocalCommandTags(input)).toBe('line1\nkeep\nError')
+  })
+
+  it('if no tags present, returns original string', () => {
+    const input = 'just some normal text'
+    expect(stripLocalCommandTags(input)).toBe(input)
+  })
+})
+
 describe('Claude → AiSDK transform', () => {
   it('handles tool call streaming lifecycle', () => {
-    const state = new ClaudeStreamState()
+    const state = new ClaudeStreamState({ agentSessionId: baseStreamMetadata.session_id })
     const parts: ReturnType<typeof transformSDKMessageToStreamParts>[number][] = []
 
     const messages: SDKMessage[] = [
@@ -169,14 +187,119 @@ describe('Claude → AiSDK transform', () => {
       (typeof parts)[number],
       { type: 'tool-result' }
     >
-    expect(toolResult.toolCallId).toBe('tool-1')
+    expect(toolResult.toolCallId).toBe('session-123:tool-1')
     expect(toolResult.toolName).toBe('Bash')
     expect(toolResult.input).toEqual({ command: 'ls' })
     expect(toolResult.output).toBe('ok')
   })
 
+  it('handles tool calls without streaming events (no content_block_start/stop)', () => {
+    const state = new ClaudeStreamState({ agentSessionId: '12344' })
+    const parts: ReturnType<typeof transformSDKMessageToStreamParts>[number][] = []
+
+    const messages: SDKMessage[] = [
+      {
+        ...baseStreamMetadata,
+        type: 'assistant',
+        uuid: uuid(20),
+        message: {
+          id: 'msg-tool-no-stream',
+          type: 'message',
+          role: 'assistant',
+          model: 'claude-test',
+          content: [
+            {
+              type: 'tool_use',
+              id: 'tool-read',
+              name: 'Read',
+              input: { file_path: '/test.txt' }
+            },
+            {
+              type: 'tool_use',
+              id: 'tool-bash',
+              name: 'Bash',
+              input: { command: 'ls -la' }
+            }
+          ],
+          stop_reason: 'tool_use',
+          stop_sequence: null,
+          usage: {
+            input_tokens: 10,
+            output_tokens: 20
+          }
+        }
+      } as unknown as SDKMessage,
+      {
+        ...baseStreamMetadata,
+        type: 'user',
+        uuid: uuid(21),
+        message: {
+          role: 'user',
+          content: [
+            {
+              type: 'tool_result',
+              tool_use_id: 'tool-read',
+              content: 'file contents',
+              is_error: false
+            }
+          ]
+        }
+      } as SDKMessage,
+      {
+        ...baseStreamMetadata,
+        type: 'user',
+        uuid: uuid(22),
+        message: {
+          role: 'user',
+          content: [
+            {
+              type: 'tool_result',
+              tool_use_id: 'tool-bash',
+              content: 'total 42\n...',
+              is_error: false
+            }
+          ]
+        }
+      } as SDKMessage
+    ]
+
+    for (const message of messages) {
+      const transformed = transformSDKMessageToStreamParts(message, state)
+      parts.push(...transformed)
+    }
+
+    const types = parts.map((part) => part.type)
+    expect(types).toEqual(['tool-call', 'tool-call', 'tool-result', 'tool-result'])
+
+    const toolCalls = parts.filter((part) => part.type === 'tool-call') as Extract<
+      (typeof parts)[number],
+      { type: 'tool-call' }
+    >[]
+    expect(toolCalls).toHaveLength(2)
+    expect(toolCalls[0].toolName).toBe('Read')
+    expect(toolCalls[0].toolCallId).toBe('12344:tool-read')
+    expect(toolCalls[1].toolName).toBe('Bash')
+    expect(toolCalls[1].toolCallId).toBe('12344:tool-bash')
+
+    const toolResults = parts.filter((part) => part.type === 'tool-result') as Extract<
+      (typeof parts)[number],
+      { type: 'tool-result' }
+    >[]
+    expect(toolResults).toHaveLength(2)
+    // This is the key assertion - toolName should NOT be 'unknown'
+    expect(toolResults[0].toolName).toBe('Read')
+    expect(toolResults[0].toolCallId).toBe('12344:tool-read')
+    expect(toolResults[0].input).toEqual({ file_path: '/test.txt' })
+    expect(toolResults[0].output).toBe('file contents')
+
+    expect(toolResults[1].toolName).toBe('Bash')
+    expect(toolResults[1].toolCallId).toBe('12344:tool-bash')
+    expect(toolResults[1].input).toEqual({ command: 'ls -la' })
+    expect(toolResults[1].output).toBe('total 42\n...')
+  })
+
   it('handles streaming text completion', () => {
-    const state = new ClaudeStreamState()
+    const state = new ClaudeStreamState({ agentSessionId: baseStreamMetadata.session_id })
     const parts: ReturnType<typeof transformSDKMessageToStreamParts>[number][] = []
 
     const messages: SDKMessage[] = [
@@ -287,4 +410,87 @@ describe('Claude → AiSDK transform', () => {
     expect(finishStep.finishReason).toBe('stop')
     expect(finishStep.usage).toEqual({ inputTokens: 2, outputTokens: 4, totalTokens: 6 })
   })
+
+  it('emits fallback text when Claude sends a snapshot instead of deltas', () => {
+    const state = new ClaudeStreamState({ agentSessionId: '12344' })
+    const parts: ReturnType<typeof transformSDKMessageToStreamParts>[number][] = []
+
+    const messages: SDKMessage[] = [
+      {
+        ...baseStreamMetadata,
+        type: 'stream_event',
+        uuid: uuid(30),
+        event: {
+          type: 'message_start',
+          message: {
+            id: 'msg-fallback',
+            type: 'message',
+            role: 'assistant',
+            model: 'claude-test',
+            content: [],
+            stop_reason: null,
+            stop_sequence: null,
+            usage: {}
+          }
+        }
+      } as unknown as SDKMessage,
+      {
+        ...baseStreamMetadata,
+        type: 'stream_event',
+        uuid: uuid(31),
+        event: {
+          type: 'content_block_start',
+          index: 0,
+          content_block: {
+            type: 'text',
+            text: ''
+          }
+        }
+      } as unknown as SDKMessage,
+      {
+        ...baseStreamMetadata,
+        type: 'assistant',
+        uuid: uuid(32),
+        message: {
+          id: 'msg-fallback-content',
+          type: 'message',
+          role: 'assistant',
+          model: 'claude-test',
+          content: [
+            {
+              type: 'text',
+              text: 'Final answer without streaming deltas.'
+            }
+          ],
+          stop_reason: 'end_turn',
+          stop_sequence: null,
+          usage: {
+            input_tokens: 3,
+            output_tokens: 7
+          }
+        }
+      } as unknown as SDKMessage
+    ]
+
+    for (const message of messages) {
+      const transformed = transformSDKMessageToStreamParts(message, state)
+      parts.push(...transformed)
+    }
+
+    const types = parts.map((part) => part.type)
+    expect(types).toEqual(['start-step', 'text-start', 'text-delta', 'text-end', 'finish-step'])
+
+    const delta = parts.find((part) => part.type === 'text-delta') as Extract<
+      (typeof parts)[number],
+      { type: 'text-delta' }
+    >
+    expect(delta.text).toBe('Final answer without streaming deltas.')
+
+    const finish = parts.find((part) => part.type === 'finish-step') as Extract<
+      (typeof parts)[number],
+      { type: 'finish-step' }
+    >
+    expect(finish.usage).toEqual({ inputTokens: 3, outputTokens: 7, totalTokens: 10 })
+    expect(finish.finishReason).toBe('stop')
+  })
 })

src/main/services/agents/services/claudecode/claude-stream-state.ts

@@ -10,8 +10,21 @@
  * Every Claude turn gets its own instance. `resetStep` should be invoked once the finish event has
  * been emitted to avoid leaking state into the next turn.
  */
+import { loggerService } from '@logger'
 import type { FinishReason, LanguageModelUsage, ProviderMetadata } from 'ai'
 
+/**
+ * Builds a namespaced tool call ID by combining session ID with raw tool call ID.
+ * This ensures tool calls from different sessions don't conflict even if they have
+ * the same raw ID from the SDK.
+ *
+ * @param sessionId - The agent session ID
+ * @param rawToolCallId - The raw tool call ID from SDK (e.g., "WebFetch_0")
+ */
+export function buildNamespacedToolCallId(sessionId: string, rawToolCallId: string): string {
+  return `${sessionId}:${rawToolCallId}`
+}
+
 /**
  * Shared fields for every block that Claude can stream (text, reasoning, tool).
  */
@@ -34,6 +47,7 @@ type ReasoningBlockState = BaseBlockState & {
 type ToolBlockState = BaseBlockState & {
   kind: 'tool'
   toolCallId: string
+  rawToolCallId: string
   toolName: string
   inputBuffer: string
   providerMetadata?: ProviderMetadata
@@ -48,12 +62,17 @@ type PendingUsageState = {
 }
 
 type PendingToolCall = {
+  rawToolCallId: string
   toolCallId: string
   toolName: string
   input: unknown
   providerMetadata?: ProviderMetadata
 }
 
+type ClaudeStreamStateOptions = {
+  agentSessionId: string
+}
+
 /**
  * Tracks the lifecycle of Claude streaming blocks (text, thinking, tool calls)
  * across individual websocket events. The transformer relies on this class to
@@ -61,12 +80,20 @@ type PendingToolCall = {
  * usage/finish metadata once Anthropic closes a message.
  */
 export class ClaudeStreamState {
+  private logger
+  private readonly agentSessionId: string
   private blocksByIndex = new Map<number, BlockState>()
-  private toolIndexById = new Map<string, number>()
+  private toolIndexByNamespacedId = new Map<string, number>()
   private pendingUsage: PendingUsageState = {}
   private pendingToolCalls = new Map<string, PendingToolCall>()
   private stepActive = false
 
+  constructor(options: ClaudeStreamStateOptions) {
+    this.logger = loggerService.withContext('ClaudeStreamState')
+    this.agentSessionId = options.agentSessionId
+    this.logger.silly('ClaudeStreamState', options)
+  }
+
   /** Marks the beginning of a new AiSDK step. */
   beginStep(): void {
     this.stepActive = true
@@ -104,19 +131,21 @@ export class ClaudeStreamState {
   /** Caches tool metadata so subsequent input deltas and results can find it. */
   openToolBlock(
     index: number,
-    params: { toolCallId: string; toolName: string; providerMetadata?: ProviderMetadata }
+    params: { rawToolCallId: string; toolName: string; providerMetadata?: ProviderMetadata }
   ): ToolBlockState {
+    const toolCallId = buildNamespacedToolCallId(this.agentSessionId, params.rawToolCallId)
     const block: ToolBlockState = {
       kind: 'tool',
-      id: params.toolCallId,
+      id: toolCallId,
       index,
-      toolCallId: params.toolCallId,
+      toolCallId,
+      rawToolCallId: params.rawToolCallId,
       toolName: params.toolName,
       inputBuffer: '',
       providerMetadata: params.providerMetadata
     }
     this.blocksByIndex.set(index, block)
-    this.toolIndexById.set(params.toolCallId, index)
+    this.toolIndexByNamespacedId.set(toolCallId, index)
     return block
   }
 
@@ -124,14 +153,32 @@ export class ClaudeStreamState {
     return this.blocksByIndex.get(index)
   }
 
+  getFirstOpenTextBlock(): TextBlockState | undefined {
+    const candidates: TextBlockState[] = []
+    for (const block of this.blocksByIndex.values()) {
+      if (block.kind === 'text') {
+        candidates.push(block)
+      }
+    }
+    if (candidates.length === 0) {
+      return undefined
+    }
+    candidates.sort((a, b) => a.index - b.index)
+    return candidates[0]
+  }
+
   getToolBlockById(toolCallId: string): ToolBlockState | undefined {
-    const index = this.toolIndexById.get(toolCallId)
+    const index = this.toolIndexByNamespacedId.get(toolCallId)
     if (index === undefined) return undefined
     const block = this.blocksByIndex.get(index)
     if (!block || block.kind !== 'tool') return undefined
     return block
   }
 
+  getToolBlockByRawId(rawToolCallId: string): ToolBlockState | undefined {
+    return this.getToolBlockById(buildNamespacedToolCallId(this.agentSessionId, rawToolCallId))
+  }
+
   /** Appends streamed text to a text block, returning the updated state when present. */
   appendTextDelta(index: number, text: string): TextBlockState | undefined {
     const block = this.blocksByIndex.get(index)
@@ -158,10 +205,12 @@ export class ClaudeStreamState {
 
   /** Records a tool call to be consumed once its result arrives from the user. */
   registerToolCall(
-    toolCallId: string,
+    rawToolCallId: string,
     payload: { toolName: string; input: unknown; providerMetadata?: ProviderMetadata }
   ): void {
-    this.pendingToolCalls.set(toolCallId, {
+    const toolCallId = buildNamespacedToolCallId(this.agentSessionId, rawToolCallId)
+    this.pendingToolCalls.set(rawToolCallId, {
+      rawToolCallId,
       toolCallId,
       toolName: payload.toolName,
       input: payload.input,
@@ -170,10 +219,10 @@ export class ClaudeStreamState {
   }
 
   /** Retrieves and clears the buffered tool call metadata for the given id. */
-  consumePendingToolCall(toolCallId: string): PendingToolCall | undefined {
-    const entry = this.pendingToolCalls.get(toolCallId)
+  consumePendingToolCall(rawToolCallId: string): PendingToolCall | undefined {
+    const entry = this.pendingToolCalls.get(rawToolCallId)
     if (entry) {
-      this.pendingToolCalls.delete(toolCallId)
+      this.pendingToolCalls.delete(rawToolCallId)
     }
     return entry
   }
@@ -182,13 +231,13 @@ export class ClaudeStreamState {
    * Persists the final input payload for a tool block once the provider signals
    * completion so that downstream tool results can reference the original call.
    */
-  completeToolBlock(toolCallId: string, input: unknown, providerMetadata?: ProviderMetadata): void {
+  completeToolBlock(toolCallId: string, toolName: string, input: unknown, providerMetadata?: ProviderMetadata): void {
+    const block = this.getToolBlockByRawId(toolCallId)
     this.registerToolCall(toolCallId, {
-      toolName: this.getToolBlockById(toolCallId)?.toolName ?? 'unknown',
+      toolName,
       input,
       providerMetadata
     })
-    const block = this.getToolBlockById(toolCallId)
     if (block) {
       block.resolvedInput = input
     }
@@ -200,7 +249,7 @@ export class ClaudeStreamState {
     if (!block) return undefined
     this.blocksByIndex.delete(index)
     if (block.kind === 'tool') {
-      this.toolIndexById.delete(block.toolCallId)
+      this.toolIndexByNamespacedId.delete(block.toolCallId)
     }
     return block
   }
@@ -227,7 +276,7 @@ export class ClaudeStreamState {
   /** Drops cached block metadata for the currently active message. */
   resetBlocks(): void {
     this.blocksByIndex.clear()
-    this.toolIndexById.clear()
+    this.toolIndexByNamespacedId.clear()
   }
 
   /** Resets the entire step lifecycle after emitting a terminal frame. */
@@ -236,6 +285,10 @@ export class ClaudeStreamState {
     this.resetPendingUsage()
     this.stepActive = false
   }
+
+  getNamespacedToolCallId(rawToolCallId: string): string {
+    return buildNamespacedToolCallId(this.agentSessionId, rawToolCallId)
+  }
 }
 
 export type { PendingToolCall }

src/main/services/agents/services/claudecode/commands.ts

@@ -1,25 +1,12 @@
 import type { SlashCommand } from '@types'
 
 export const builtinSlashCommands: SlashCommand[] = [
-  { command: '/add-dir', description: 'Add additional working directories' },
-  { command: '/agents', description: 'Manage custom AI subagents for specialized tasks' },
-  { command: '/bug', description: 'Report bugs (sends conversation to Anthropic)' },
   { command: '/clear', description: 'Clear conversation history' },
   { command: '/compact', description: 'Compact conversation with optional focus instructions' },
-  { command: '/config', description: 'View/modify configuration' },
-  { command: '/cost', description: 'Show token usage statistics' },
-  { command: '/doctor', description: 'Checks the health of your Claude Code installation' },
-  { command: '/help', description: 'Get usage help' },
-  { command: '/init', description: 'Initialize project with CLAUDE.md guide' },
-  { command: '/login', description: 'Switch Anthropic accounts' },
-  { command: '/logout', description: 'Sign out from your Anthropic account' },
-  { command: '/mcp', description: 'Manage MCP server connections and OAuth authentication' },
-  { command: '/memory', description: 'Edit CLAUDE.md memory files' },
-  { command: '/model', description: 'Select or change the AI model' },
-  { command: '/permissions', description: 'View or update permissions' },
-  { command: '/pr_comments', description: 'View pull request comments' },
-  { command: '/review', description: 'Request code review' },
-  { command: '/status', description: 'View account and system statuses' },
-  { command: '/terminal-setup', description: 'Install Shift+Enter key binding for newlines (iTerm2 and VSCode only)' },
-  { command: '/vim', description: 'Enter vim mode for alternating insert and command modes' }
+  { command: '/context', description: 'Visualize current context usage as a colored grid' },
+  {
+    command: '/cost',
+    description: 'Show token usage statistics (see cost tracking guide for subscription-specific details)'
+  },
+  { command: '/todos', description: 'List current todo items' }
 ]

src/main/services/agents/services/claudecode/index.ts

@@ -2,7 +2,14 @@
 import { EventEmitter } from 'node:events'
 import { createRequire } from 'node:module'
 
-import type { CanUseTool, McpHttpServerConfig, Options, SDKMessage } from '@anthropic-ai/claude-agent-sdk'
+import type {
+  CanUseTool,
+  HookCallback,
+  McpHttpServerConfig,
+  Options,
+  PreToolUseHookInput,
+  SDKMessage
+} from '@anthropic-ai/claude-agent-sdk'
 import { query } from '@anthropic-ai/claude-agent-sdk'
 import { loggerService } from '@logger'
 import { config as apiConfigService } from '@main/apiServer/config'
@@ -12,6 +19,8 @@ import { app } from 'electron'
 
 import type { GetAgentSessionResponse } from '../..'
 import type { AgentServiceInterface, AgentStream, AgentStreamEvent } from '../../interfaces/AgentStreamInterface'
+import { sessionService } from '../SessionService'
+import { buildNamespacedToolCallId } from './claude-stream-state'
 import { promptForToolApproval } from './tool-permissions'
 import { ClaudeStreamState, transformSDKMessageToStreamParts } from './transform'
 
@@ -19,6 +28,7 @@ const require_ = createRequire(import.meta.url)
 const logger = loggerService.withContext('ClaudeCodeService')
 const DEFAULT_AUTO_ALLOW_TOOLS = new Set(['Read', 'Glob', 'Grep'])
 const shouldAutoApproveTools = process.env.CHERRY_AUTO_ALLOW_TOOLS === '1'
+const NO_RESUME_COMMANDS = ['/clear']
 
 type UserInputMessage = {
   type: 'user'
@@ -148,7 +158,67 @@ class ClaudeCodeService implements AgentServiceInterface {
         return { behavior: 'allow', updatedInput: input }
       }
 
-      return promptForToolApproval(toolName, input, options)
+      return promptForToolApproval(toolName, input, {
+        ...options,
+        toolCallId: buildNamespacedToolCallId(session.id, options.toolUseID)
+      })
+    }
+
+    const preToolUseHook: HookCallback = async (input, toolUseID, options) => {
+      // Type guard to ensure we're handling PreToolUse event
+      if (input.hook_event_name !== 'PreToolUse') {
+        return {}
+      }
+
+      const hookInput = input as PreToolUseHookInput
+      const toolName = hookInput.tool_name
+
+      logger.debug('PreToolUse hook triggered', {
+        session_id: hookInput.session_id,
+        tool_name: hookInput.tool_name,
+        tool_use_id: toolUseID,
+        tool_input: hookInput.tool_input,
+        cwd: hookInput.cwd,
+        permission_mode: hookInput.permission_mode,
+        autoAllowTools: autoAllowTools
+      })
+
+      if (options?.signal?.aborted) {
+        logger.debug('PreToolUse hook signal already aborted; skipping tool use', {
+          tool_name: hookInput.tool_name
+        })
+        return {}
+      }
+
+      // handle auto approved tools since it never triggers canUseTool
+      const normalizedToolName = normalizeToolName(toolName)
+      if (toolUseID) {
+        const bypassAll = input.permission_mode === 'bypassPermissions'
+        const autoAllowed = autoAllowTools.has(toolName) || autoAllowTools.has(normalizedToolName)
+        if (bypassAll || autoAllowed) {
+          const namespacedToolCallId = buildNamespacedToolCallId(session.id, toolUseID)
+          logger.debug('handling auto approved tools', {
+            toolName,
+            normalizedToolName,
+            namespacedToolCallId,
+            permission_mode: input.permission_mode,
+            autoAllowTools
+          })
+          const isRecord = (v: unknown): v is Record<string, unknown> => {
+            return !!v && typeof v === 'object' && !Array.isArray(v)
+          }
+          const toolInput = isRecord(input.tool_input) ? input.tool_input : {}
+
+          await promptForToolApproval(toolName, toolInput, {
+            ...options,
+            toolCallId: namespacedToolCallId,
+            autoApprove: true
+          })
+        }
+      }
+
+      // Return to proceed without modification
+      return {}
     }
 
     // Build SDK options from parameters
@@ -174,7 +244,14 @@ class ClaudeCodeService implements AgentServiceInterface {
       permissionMode: session.configuration?.permission_mode,
       maxTurns: session.configuration?.max_turns,
       allowedTools: session.allowed_tools,
-      canUseTool
+      canUseTool,
+      hooks: {
+        PreToolUse: [
+          {
+            hooks: [preToolUseHook]
+          }
+        ]
+      }
     }
 
     if (session.accessible_paths.length > 1) {
@@ -197,7 +274,7 @@ class ClaudeCodeService implements AgentServiceInterface {
       options.strictMcpConfig = true
     }
 
-    if (lastAgentSessionId) {
+    if (lastAgentSessionId && !NO_RESUME_COMMANDS.some((cmd) => prompt.includes(cmd))) {
       options.resume = lastAgentSessionId
       // TODO: use fork session when we support branching sessions
       // options.forkSession = true
@@ -220,7 +297,15 @@ class ClaudeCodeService implements AgentServiceInterface {
 
     // Start async processing on the next tick so listeners can subscribe first
     setImmediate(() => {
-      this.processSDKQuery(userInputStream, closeUserStream, options, aiStream, errorChunks).catch((error) => {
+      this.processSDKQuery(
+        userInputStream,
+        closeUserStream,
+        options,
+        aiStream,
+        errorChunks,
+        session.agent_id,
+        session.id
+      ).catch((error) => {
         logger.error('Unhandled Claude Code stream error', {
           error: error instanceof Error ? { name: error.name, message: error.message } : String(error)
         })
@@ -329,12 +414,14 @@ class ClaudeCodeService implements AgentServiceInterface {
     closePromptStream: () => void,
     options: Options,
     stream: ClaudeCodeStream,
-    errorChunks: string[]
+    errorChunks: string[],
+    agentId: string,
+    sessionId: string
   ): Promise<void> {
     const jsonOutput: SDKMessage[] = []
     let hasCompleted = false
     const startTime = Date.now()
-    const streamState = new ClaudeStreamState()
+    const streamState = new ClaudeStreamState({ agentSessionId: sessionId })
 
     try {
       for await (const message of query({ prompt: promptStream, options })) {
@@ -342,21 +429,60 @@ class ClaudeCodeService implements AgentServiceInterface {
 
         jsonOutput.push(message)
 
-        if (message.type === 'assistant' || message.type === 'user') {
-          logger.silly('claude response', {
-            message,
-            content: JSON.stringify(message.message.content)
-          })
-        } else if (message.type === 'stream_event') {
-          // logger.silly('Claude stream event', {
-          //   message,
-          //   event: JSON.stringify(message.event)
-          // })
-        } else {
-          logger.silly('Claude response', {
-            message,
-            event: JSON.stringify(message)
+        // Handle init message - merge builtin and SDK slash_commands
+        if (message.type === 'system' && message.subtype === 'init') {
+          const sdkSlashCommands = message.slash_commands || []
+          logger.info('Received init message with slash commands', {
+            sessionId,
+            commands: sdkSlashCommands
           })
+
+          try {
+            // Get builtin + local slash commands from BaseService
+            const existingCommands = await sessionService.listSlashCommands('claude-code', agentId)
+
+            // Convert SDK slash_commands (string[]) to SlashCommand[] format
+            // Ensure all commands start with '/'
+            const sdkCommands = sdkSlashCommands.map((cmd) => {
+              const normalizedCmd = cmd.startsWith('/') ? cmd : `/${cmd}`
+              return {
+                command: normalizedCmd,
+                description: undefined
+              }
+            })
+
+            // Merge: existing commands (builtin + local) + SDK commands, deduplicate by command name
+            const commandMap = new Map<string, { command: string; description?: string }>()
+
+            for (const cmd of existingCommands) {
+              commandMap.set(cmd.command, cmd)
+            }
+
+            for (const cmd of sdkCommands) {
+              if (!commandMap.has(cmd.command)) {
+                commandMap.set(cmd.command, cmd)
+              }
+            }
+
+            const mergedCommands = Array.from(commandMap.values())
+
+            // Update session in database
+            await sessionService.updateSession(agentId, sessionId, {
+              slash_commands: mergedCommands
+            })
+
+            logger.info('Updated session with merged slash commands', {
+              sessionId,
+              existingCount: existingCommands.length,
+              sdkCount: sdkCommands.length,
+              totalCount: mergedCommands.length
+            })
+          } catch (error) {
+            logger.error('Failed to update session slash_commands', {
+              sessionId,
+              error: error instanceof Error ? error.message : String(error)
+            })
+          }
         }
 
         const chunks = transformSDKMessageToStreamParts(message, streamState)
@@ -365,10 +491,19 @@ class ClaudeCodeService implements AgentServiceInterface {
             type: 'chunk',
             chunk
           })
+
+          // Close prompt stream when SDK signals completion or error
+          if (chunk.type === 'finish' || chunk.type === 'error') {
+            logger.info('Closing prompt stream as SDK signaled completion', {
+              chunkType: chunk.type,
+              reason: chunk.type === 'finish' ? 'finished' : 'error_occurred'
+            })
+            closePromptStream()
+            logger.info('Prompt stream closed successfully')
+          }
         }
       }
 
-      hasCompleted = true
       const duration = Date.now() - startTime
 
       logger.debug('SDK query completed successfully', {

src/main/services/agents/services/claudecode/tool-permissions.ts

@@ -31,12 +31,14 @@ type PendingPermissionRequest = {
   abortListener?: () => void
   originalInput: Record<string, unknown>
   toolName: string
+  toolCallId?: string
 }
 
 type RendererPermissionRequestPayload = {
   requestId: string
   toolName: string
   toolId: string
+  toolCallId: string
   description?: string
   requiresPermissions: boolean
   input: Record<string, unknown>
@@ -44,6 +46,7 @@ type RendererPermissionRequestPayload = {
   createdAt: number
   expiresAt: number
   suggestions: PermissionUpdate[]
+  autoApprove?: boolean
 }
 
 type RendererPermissionResultPayload = {
@@ -51,6 +54,7 @@ type RendererPermissionResultPayload = {
   behavior: ToolPermissionBehavior
   message?: string
   reason: 'response' | 'timeout' | 'aborted' | 'no-window'
+  toolCallId?: string
 }
 
 const pendingRequests = new Map<string, PendingPermissionRequest>()
@@ -144,7 +148,8 @@ const finalizeRequest = (
     requestId,
     behavior: update.behavior,
     message: update.behavior === 'deny' ? update.message : undefined,
-    reason
+    reason,
+    toolCallId: pending.toolCallId
   }
 
   const dispatched = broadcastToRenderer(IpcChannel.AgentToolPermission_Result, resultPayload)
@@ -206,10 +211,20 @@ const ensureIpcHandlersRegistered = () => {
   })
 }
 
+type PromptForToolApprovalOptions = {
+  signal: AbortSignal
+  suggestions?: PermissionUpdate[]
+  autoApprove?: boolean
+
+  // NOTICE: This ID is namespaced with session ID, not the raw SDK tool call ID.
+  // Format: `${sessionId}:${rawToolCallId}`, e.g., `session_123:WebFetch_0`
+  toolCallId: string
+}
+
 export async function promptForToolApproval(
   toolName: string,
   input: Record<string, unknown>,
-  options?: { signal: AbortSignal; suggestions?: PermissionUpdate[] }
+  options: PromptForToolApprovalOptions
 ): Promise<PermissionResult> {
   if (shouldAutoApproveTools) {
     logger.debug('promptForToolApproval auto-approving tool for test', {
@@ -245,6 +260,7 @@ export async function promptForToolApproval(
   logger.info('Requesting user approval for tool usage', {
     requestId,
     toolName,
+    toolCallId: options.toolCallId,
     description: toolMetadata?.description
   })
 
@@ -252,13 +268,15 @@ export async function promptForToolApproval(
     requestId,
     toolName,
     toolId: toolMetadata?.id ?? toolName,
+    toolCallId: options.toolCallId,
     description: toolMetadata?.description,
     requiresPermissions: toolMetadata?.requirePermissions ?? false,
     input: sanitizedInput,
     inputPreview,
     createdAt,
     expiresAt,
-    suggestions: sanitizedSuggestions
+    suggestions: sanitizedSuggestions,
+    autoApprove: options.autoApprove
   }
 
   const defaultDenyUpdate: PermissionResult = { behavior: 'deny', message: 'Tool request aborted before user decision' }
@@ -266,6 +284,7 @@ export async function promptForToolApproval(
   logger.debug('Registering tool permission request', {
     requestId,
     toolName,
+    toolCallId: options.toolCallId,
     requiresPermissions: requestPayload.requiresPermissions,
     timeoutMs: TOOL_APPROVAL_TIMEOUT_MS,
     suggestionCount: sanitizedSuggestions.length
@@ -273,7 +292,11 @@ export async function promptForToolApproval(
 
   return new Promise<PermissionResult>((resolve) => {
     const timeout = setTimeout(() => {
-      logger.info('User tool permission request timed out', { requestId, toolName })
+      logger.info('User tool permission request timed out', {
+        requestId,
+        toolName,
+        toolCallId: options.toolCallId
+      })
       finalizeRequest(requestId, { behavior: 'deny', message: 'Timed out waiting for approval' }, 'timeout')
     }, TOOL_APPROVAL_TIMEOUT_MS)
 
@@ -282,12 +305,17 @@ export async function promptForToolApproval(
       timeout,
       originalInput: sanitizedInput,
       toolName,
-      signal: options?.signal
+      signal: options?.signal,
+      toolCallId: options.toolCallId
     }
 
     if (options?.signal) {
       const abortListener = () => {
-        logger.info('Tool permission request aborted before user responded', { requestId, toolName })
+        logger.info('Tool permission request aborted before user responded', {
+          requestId,
+          toolName,
+          toolCallId: options.toolCallId
+        })
         finalizeRequest(requestId, defaultDenyUpdate, 'aborted')
       }
 

src/main/services/agents/services/claudecode/transform.ts

@@ -73,13 +73,21 @@ const emptyUsage: LanguageModelUsage = {
  */
 const generateMessageId = (): string => `msg_${uuidv4().replace(/-/g, '')}`
 
+/**
+ * Removes any local command stdout/stderr XML wrappers that should never surface to the UI.
+ */
+export const stripLocalCommandTags = (text: string): string => {
+  return text.replace(/<local-command-(stdout|stderr)>(.*?)<\/local-command-\1>/gs, '$2')
+}
+
 /**
  * Filters out command-* tags from text content to prevent internal command
  * messages from appearing in the user-facing UI.
  * Removes tags like <command-message>...</command-message> and <command-name>...</command-name>
  */
 const filterCommandTags = (text: string): string => {
-  return text.replace(/<command-[^>]+>.*?<\/command-[^>]+>/gs, '').trim()
+  const withoutLocalCommandTags = stripLocalCommandTags(text)
+  return withoutLocalCommandTags.replace(/<command-[^>]+>.*?<\/command-[^>]+>/gs, '').trim()
 }
 
 /**
@@ -102,6 +110,7 @@ const sdkMessageToProviderMetadata = (message: SDKMessage): ProviderMetadata =>
  * blocks across calls so that incremental deltas can be correlated correctly.
  */
 export function transformSDKMessageToStreamParts(sdkMessage: SDKMessage, state: ClaudeStreamState): AgentStreamPart[] {
+  logger.silly('Transforming SDKMessage', { message: JSON.stringify(sdkMessage) })
   switch (sdkMessage.type) {
     case 'assistant':
       return handleAssistantMessage(sdkMessage, state)
@@ -135,7 +144,8 @@ function handleAssistantMessage(
   const isStreamingActive = state.hasActiveStep()
 
   if (typeof content === 'string') {
-    if (!content) {
+    const sanitizedContent = stripLocalCommandTags(content)
+    if (!sanitizedContent) {
       return chunks
     }
 
@@ -157,7 +167,7 @@ function handleAssistantMessage(
     chunks.push({
       type: 'text-delta',
       id: textId,
-      text: content,
+      text: sanitizedContent,
       providerMetadata
     })
     chunks.push({
@@ -176,11 +186,13 @@ function handleAssistantMessage(
 
   for (const block of content) {
     switch (block.type) {
-      case 'text':
-        if (!isStreamingActive) {
-          textBlocks.push(block.text)
+      case 'text': {
+        const sanitizedText = stripLocalCommandTags(block.text)
+        if (sanitizedText) {
+          textBlocks.push(sanitizedText)
         }
         break
+      }
       case 'tool_use':
         handleAssistantToolUse(block as ToolUseContent, providerMetadata, state, chunks)
         break
@@ -190,7 +202,16 @@ function handleAssistantMessage(
     }
   }
 
-  if (!isStreamingActive && textBlocks.length > 0) {
+  if (textBlocks.length === 0) {
+    return chunks
+  }
+
+  const combinedText = textBlocks.join('')
+  if (!combinedText) {
+    return chunks
+  }
+
+  if (!isStreamingActive) {
     const id = message.uuid?.toString() || generateMessageId()
     state.beginStep()
     chunks.push({
@@ -206,7 +227,7 @@ function handleAssistantMessage(
     chunks.push({
       type: 'text-delta',
       id,
-      text: textBlocks.join(''),
+      text: combinedText,
       providerMetadata
     })
     chunks.push({
@@ -217,7 +238,27 @@ function handleAssistantMessage(
     return finalizeNonStreamingStep(message, state, chunks)
   }
 
-  return chunks
+  const existingTextBlock = state.getFirstOpenTextBlock()
+  const fallbackId = existingTextBlock?.id || message.uuid?.toString() || generateMessageId()
+  if (!existingTextBlock) {
+    chunks.push({
+      type: 'text-start',
+      id: fallbackId,
+      providerMetadata
+    })
+  }
+  chunks.push({
+    type: 'text-delta',
+    id: fallbackId,
+    text: combinedText,
+    providerMetadata
+  })
+  chunks.push({
+    type: 'text-end',
+    id: fallbackId,
+    providerMetadata
+  })
+  return finalizeNonStreamingStep(message, state, chunks)
 }
 
 /**
@@ -230,15 +271,16 @@ function handleAssistantToolUse(
   state: ClaudeStreamState,
   chunks: AgentStreamPart[]
 ): void {
+  const toolCallId = state.getNamespacedToolCallId(block.id)
   chunks.push({
     type: 'tool-call',
-    toolCallId: block.id,
+    toolCallId,
     toolName: block.name,
     input: block.input,
     providerExecuted: true,
     providerMetadata
   })
-  state.completeToolBlock(block.id, block.input, providerMetadata)
+  state.completeToolBlock(block.id, block.name, block.input, providerMetadata)
 }
 
 /**
@@ -318,10 +360,11 @@ function handleUserMessage(
     if (block.type === 'tool_result') {
       const toolResult = block as ToolResultContent
       const pendingCall = state.consumePendingToolCall(toolResult.tool_use_id)
+      const toolCallId = pendingCall?.toolCallId ?? state.getNamespacedToolCallId(toolResult.tool_use_id)
       if (toolResult.is_error) {
         chunks.push({
           type: 'tool-error',
-          toolCallId: toolResult.tool_use_id,
+          toolCallId,
           toolName: pendingCall?.toolName ?? 'unknown',
           input: pendingCall?.input,
           error: toolResult.content,
@@ -330,7 +373,7 @@ function handleUserMessage(
       } else {
         chunks.push({
           type: 'tool-result',
-          toolCallId: toolResult.tool_use_id,
+          toolCallId,
           toolName: pendingCall?.toolName ?? 'unknown',
           input: pendingCall?.input,
           output: toolResult.content,
@@ -444,6 +487,9 @@ function handleStreamEvent(
     }
 
     case 'message_stop': {
+      if (!state.hasActiveStep()) {
+        break
+      }
       const pending = state.getPendingUsage()
       chunks.push({
         type: 'finish-step',
@@ -501,7 +547,7 @@ function handleContentBlockStart(
     }
     case 'tool_use': {
       const block = state.openToolBlock(index, {
-        toolCallId: contentBlock.id,
+        rawToolCallId: contentBlock.id,
         toolName: contentBlock.name,
         providerMetadata
       })
@@ -537,6 +583,10 @@ function handleContentBlockDelta(
         logger.warn('Received text_delta for unknown block', { index })
         return
       }
+      block.text = stripLocalCommandTags(block.text)
+      if (!block.text) {
+        break
+      }
       chunks.push({
         type: 'text-delta',
         id: block.id,

src/main/services/mcp/oauth/callback.ts

@@ -1,4 +1,6 @@
 import { loggerService } from '@logger'
+import { configManager } from '@main/services/ConfigManager'
+import { locales } from '@main/utils/locales'
 import type EventEmitter from 'events'
 import http from 'http'
 import { URL } from 'url'
@@ -7,6 +9,36 @@ import type { OAuthCallbackServerOptions } from './types'
 
 const logger = loggerService.withContext('MCP:OAuthCallbackServer')
 
+function getTranslation(key: string): string {
+  const language = configManager.getLanguage()
+  const localeData = locales[language]
+
+  if (!localeData) {
+    logger.warn(`No locale data found for language: ${language}`)
+    return key
+  }
+
+  const translations = localeData.translation as any
+  if (!translations) {
+    logger.warn(`No translations found for language: ${language}`)
+    return key
+  }
+
+  const keys = key.split('.')
+  let value = translations
+
+  for (const k of keys) {
+    if (value && typeof value === 'object' && k in value) {
+      value = value[k]
+    } else {
+      logger.warn(`Translation key not found: ${key} (failed at: ${k})`)
+      return key // fallback to key if translation not found
+    }
+  }
+
+  return typeof value === 'string' ? value : key
+}
+
 export class CallBackServer {
   private server: Promise<http.Server>
   private events: EventEmitter
@@ -28,6 +60,55 @@ export class CallBackServer {
           if (code) {
             // Emit the code event
             this.events.emit('auth-code-received', code)
+            // Send success response to browser
+            const title = getTranslation('settings.mcp.oauth.callback.title')
+            const message = getTranslation('settings.mcp.oauth.callback.message')
+
+            res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' })
+            res.end(`
+              <!DOCTYPE html>
+              <html>
+                <head>
+                  <meta charset="utf-8">
+                  <title>${title}</title>
+                  <style>
+                    body {
+                      font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
+                      display: flex;
+                      justify-content: center;
+                      align-items: center;
+                      height: 100vh;
+                      margin: 0;
+                      background: #ffffff;
+                    }
+                    .container {
+                      text-align: center;
+                      padding: 2rem;
+                    }
+                    h1 {
+                      color: #2d3748;
+                      margin: 0 0 0.5rem 0;
+                      font-size: 24px;
+                      font-weight: 600;
+                    }
+                    p {
+                      color: #718096;
+                      margin: 0;
+                      font-size: 14px;
+                    }
+                  </style>
+                </head>
+                <body>
+                  <div class="container">
+                    <h1>${title}</h1>
+                    <p>${message}</p>
+                  </div>
+                </body>
+              </html>
+            `)
+          } else {
+            res.writeHead(400, { 'Content-Type': 'text/plain' })
+            res.end('Missing authorization code')
           }
         } catch (error) {
           logger.error('Error processing OAuth callback:', error as Error)

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

@@ -1,5 +1,6 @@
 import { loggerService } from '@logger'
 import { isWin } from '@main/constant'
+import { HOME_CHERRY_DIR } from '@shared/config/constant'
 import type { OcrOvConfig, OcrResult, SupportedOcrFile } from '@types'
 import { isImageFileMetadata } from '@types'
 import { exec } from 'child_process'
@@ -13,7 +14,7 @@ import { OcrBaseService } from './OcrBaseService'
 const logger = loggerService.withContext('OvOcrService')
 const execAsync = promisify(exec)
 
-const PATH_BAT_FILE = path.join(os.homedir(), '.cherrystudio', 'ovms', 'ovocr', 'run.npu.bat')
+const PATH_BAT_FILE = path.join(os.homedir(), HOME_CHERRY_DIR, 'ovms', 'ovocr', 'run.npu.bat')
 
 export class OvOcrService extends OcrBaseService {
   constructor() {
@@ -30,7 +31,7 @@ export class OvOcrService extends OcrBaseService {
   }
 
   private getOvOcrPath(): string {
-    return path.join(os.homedir(), '.cherrystudio', 'ovms', 'ovocr')
+    return path.join(os.homedir(), HOME_CHERRY_DIR, 'ovms', 'ovocr')
   }
 
   private getImgDir(): string {

src/main/utils/file.ts

@@ -5,7 +5,7 @@ import os from 'node:os'
 import path from 'node:path'
 
 import { loggerService } from '@logger'
-import { audioExts, documentExts, imageExts, MB, textExts, videoExts } from '@shared/config/constant'
+import { audioExts, documentExts, HOME_CHERRY_DIR, imageExts, MB, textExts, videoExts } from '@shared/config/constant'
 import type { FileMetadata, NotesTreeNode } from '@types'
 import { FileTypes } from '@types'
 import chardet from 'chardet'
@@ -160,7 +160,7 @@ export function getNotesDir() {
 }
 
 export function getConfigDir() {
-  return path.join(os.homedir(), '.cherrystudio', 'config')
+  return path.join(os.homedir(), HOME_CHERRY_DIR, 'config')
 }
 
 export function getCacheDir() {
@@ -172,7 +172,7 @@ export function getAppConfigDir(name: string) {
 }
 
 export function getMcpDir() {
-  return path.join(os.homedir(), '.cherrystudio', 'mcp')
+  return path.join(os.homedir(), HOME_CHERRY_DIR, 'mcp')
 }
 
 /**