fix(models): include GPT5.2 series in verbosity check (#12003)

* fix: disable reasoning mode for translation to improve efficiency

- 修改 getDefaultTranslateAssistant 函数，将默认推理选项设置为 'none'
- 避免 PR #11942 引入的 'default' 选项导致翻译重新启用思考模式
- 显著提升翻译速度和性能
- 符合翻译场景不需要复杂推理的业务逻辑

* fix(AssistantService): adjust reasoning effort

Set reasoning effort to 'none' only if supported by model, otherwise use 'default'.

---------

Co-authored-by: icarus <eurfelux@gmail.com>

.github/workflows/auto-i18n.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: 🐈‍⬛ Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -54,7 +54,7 @@ jobs:
           yarn install
 
       - name: 🏃‍♀️ Translate
-        run: yarn sync:i18n && yarn auto:i18n
+        run: yarn i18n:sync && yarn i18n:translate
 
       - name: 🔍 Format
         run: yarn format

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

@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 1
 

.github/workflows/claude-translator.yml

@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 1
 

.github/workflows/claude.yml

@@ -37,7 +37,7 @@ jobs:
       actions: read # Required for Claude to read CI results on PRs
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 1
 

.github/workflows/dispatch-docs-update.yml

@@ -19,7 +19,7 @@ jobs:
           echo "tag=${{ github.event.release.tag_name }}" >> $GITHUB_OUTPUT
 
       - name: Dispatch update-download-version workflow to cherry-studio-docs
-        uses: peter-evans/repository-dispatch@v3
+        uses: peter-evans/repository-dispatch@v4
         with:
           token: ${{ secrets.REPO_DISPATCH_TOKEN }}
           repository: CherryHQ/cherry-studio-docs

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

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Check Beijing Time
         id: check_time
@@ -42,7 +42,7 @@ jobs:
 
       - name: Add pending label if in quiet hours
         if: steps.check_time.outputs.should_delay == 'true'
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             github.rest.issues.addLabels({
@@ -118,7 +118,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
         uses: actions/setup-node@v6

.github/workflows/nightly-build.yml

@@ -51,7 +51,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: main
 

.github/workflows/pr-ci.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Install Node.js
         uses: actions/setup-node@v6
@@ -58,7 +58,7 @@ jobs:
         run: yarn typecheck
 
       - name: i18n Check
-        run: yarn check:i18n
+        run: yarn i18n:check
 
       - name: Test
         run: yarn test

.github/workflows/release.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 

.github/workflows/sync-to-gitcode.yml

@@ -0,0 +1,305 @@
+name: Sync Release to GitCode
+
+on:
+  release:
+    types: [published]
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Release tag (e.g. v1.0.0)'
+        required: true
+      clean:
+        description: 'Clean node_modules before build'
+        type: boolean
+        default: false
+
+permissions:
+  contents: read
+
+jobs:
+  build-and-sync-to-gitcode:
+    runs-on: [self-hosted, windows-signing]
+    steps:
+      - name: Get tag name
+        id: get-tag
+        shell: bash
+        run: |
+          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
+            echo "tag=${{ github.event.inputs.tag }}" >> $GITHUB_OUTPUT
+          else
+            echo "tag=${{ github.event.release.tag_name }}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Check out Git repository
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          ref: ${{ steps.get-tag.outputs.tag }}
+
+      - name: Set package.json version
+        shell: bash
+        run: |
+          TAG="${{ steps.get-tag.outputs.tag }}"
+          VERSION="${TAG#v}"
+          npm version "$VERSION" --no-git-tag-version --allow-same-version
+
+      - name: Install Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: 22
+
+      - name: Install corepack
+        shell: bash
+        run: corepack enable && corepack prepare yarn@4.9.1 --activate
+
+      - name: Clean node_modules
+        if: ${{ github.event.inputs.clean == 'true' }}
+        shell: bash
+        run: rm -rf node_modules
+
+      - name: Install Dependencies
+        shell: bash
+        run: yarn install
+
+      - name: Build Windows with code signing
+        shell: bash
+        run: yarn build:win
+        env:
+          WIN_SIGN: true
+          CHERRY_CERT_PATH: ${{ secrets.CHERRY_CERT_PATH }}
+          CHERRY_CERT_KEY: ${{ secrets.CHERRY_CERT_KEY }}
+          CHERRY_CERT_CSP: ${{ secrets.CHERRY_CERT_CSP }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NODE_OPTIONS: --max-old-space-size=8192
+          MAIN_VITE_CHERRYAI_CLIENT_SECRET: ${{ secrets.MAIN_VITE_CHERRYAI_CLIENT_SECRET }}
+          MAIN_VITE_MINERU_API_KEY: ${{ secrets.MAIN_VITE_MINERU_API_KEY }}
+          RENDERER_VITE_AIHUBMIX_SECRET: ${{ secrets.RENDERER_VITE_AIHUBMIX_SECRET }}
+          RENDERER_VITE_PPIO_APP_SECRET: ${{ secrets.RENDERER_VITE_PPIO_APP_SECRET }}
+
+      - name: List built Windows artifacts
+        shell: bash
+        run: |
+          echo "Built Windows artifacts:"
+          ls -la dist/*.exe dist/*.blockmap dist/latest*.yml
+
+      - name: Download GitHub release assets
+        shell: bash
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAG_NAME: ${{ steps.get-tag.outputs.tag }}
+        run: |
+          echo "Downloading release assets for $TAG_NAME..."
+          mkdir -p release-assets
+          cd release-assets
+
+          # Download all assets from the release
+          gh release download "$TAG_NAME" \
+            --repo "${{ github.repository }}" \
+            --pattern "*" \
+            --skip-existing
+
+          echo "Downloaded GitHub release assets:"
+          ls -la
+
+      - name: Replace Windows files with signed versions
+        shell: bash
+        run: |
+          echo "Replacing Windows files with signed versions..."
+
+          # Verify signed files exist first
+          if ! ls dist/*.exe 1>/dev/null 2>&1; then
+            echo "ERROR: No signed .exe files found in dist/"
+            exit 1
+          fi
+
+          # Remove unsigned Windows files from downloaded assets
+          # *.exe, *.exe.blockmap, latest.yml (Windows only)
+          rm -f release-assets/*.exe release-assets/*.exe.blockmap release-assets/latest.yml 2>/dev/null || true
+
+          # Copy signed Windows files with error checking
+          cp dist/*.exe release-assets/ || { echo "ERROR: Failed to copy .exe files"; exit 1; }
+          cp dist/*.exe.blockmap release-assets/ || { echo "ERROR: Failed to copy .blockmap files"; exit 1; }
+          cp dist/latest.yml release-assets/ || { echo "ERROR: Failed to copy latest.yml"; exit 1; }
+
+          echo "Final release assets:"
+          ls -la release-assets/
+
+      - name: Get release info
+        id: release-info
+        shell: bash
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAG_NAME: ${{ steps.get-tag.outputs.tag }}
+          LANG: C.UTF-8
+          LC_ALL: C.UTF-8
+        run: |
+          # Always use gh cli to avoid special character issues
+          RELEASE_NAME=$(gh release view "$TAG_NAME" --repo "${{ github.repository }}" --json name -q '.name')
+          # Use delimiter to safely handle special characters in release name
+          {
+            echo 'name<<EOF'
+            echo "$RELEASE_NAME"
+            echo 'EOF'
+          } >> $GITHUB_OUTPUT
+          # Extract releaseNotes from electron-builder.yml (from releaseNotes: | to end of file, remove 4-space indent)
+          sed -n '/releaseNotes: |/,$ { /releaseNotes: |/d; s/^    //; p }' electron-builder.yml > release_body.txt
+
+      - name: Create GitCode release and upload files
+        shell: bash
+        env:
+          GITCODE_TOKEN: ${{ secrets.GITCODE_TOKEN }}
+          GITCODE_OWNER: ${{ vars.GITCODE_OWNER }}
+          GITCODE_REPO: ${{ vars.GITCODE_REPO }}
+          GITCODE_API_URL: ${{ vars.GITCODE_API_URL }}
+          TAG_NAME: ${{ steps.get-tag.outputs.tag }}
+          RELEASE_NAME: ${{ steps.release-info.outputs.name }}
+          LANG: C.UTF-8
+          LC_ALL: C.UTF-8
+        run: |
+          # Validate required environment variables
+          if [ -z "$GITCODE_TOKEN" ]; then
+            echo "ERROR: GITCODE_TOKEN is not set"
+            exit 1
+          fi
+          if [ -z "$GITCODE_OWNER" ]; then
+            echo "ERROR: GITCODE_OWNER is not set"
+            exit 1
+          fi
+          if [ -z "$GITCODE_REPO" ]; then
+            echo "ERROR: GITCODE_REPO is not set"
+            exit 1
+          fi
+
+          API_URL="${GITCODE_API_URL:-https://api.gitcode.com/api/v5}"
+
+          echo "Creating GitCode release..."
+          echo "Tag: $TAG_NAME"
+          echo "Repo: $GITCODE_OWNER/$GITCODE_REPO"
+
+          # Step 1: Create release
+          # Use --rawfile to read body directly from file, avoiding shell variable encoding issues
+          jq -n \
+            --arg tag "$TAG_NAME" \
+            --arg name "$RELEASE_NAME" \
+            --rawfile body release_body.txt \
+            '{
+              tag_name: $tag,
+              name: $name,
+              body: $body,
+              target_commitish: "main"
+            }' > /tmp/release_payload.json
+
+          RELEASE_RESPONSE=$(curl -s -w "\n%{http_code}" -X POST \
+            --connect-timeout 30 --max-time 60 \
+            "${API_URL}/repos/${GITCODE_OWNER}/${GITCODE_REPO}/releases" \
+            -H "Content-Type: application/json; charset=utf-8" \
+            -H "Authorization: Bearer ${GITCODE_TOKEN}" \
+            --data-binary "@/tmp/release_payload.json")
+
+          HTTP_CODE=$(echo "$RELEASE_RESPONSE" | tail -n1)
+          RESPONSE_BODY=$(echo "$RELEASE_RESPONSE" | sed '$d')
+
+          if [ "$HTTP_CODE" -ge 200 ] && [ "$HTTP_CODE" -lt 300 ]; then
+            echo "Release created successfully"
+          else
+            echo "Warning: Release creation returned HTTP $HTTP_CODE"
+            echo "$RESPONSE_BODY"
+            exit 1
+          fi
+
+          # Step 2: Upload files to release
+          echo "Uploading files to GitCode release..."
+
+          # Function to upload a single file with retry
+          upload_file() {
+            local file="$1"
+            local filename=$(basename "$file")
+            local max_retries=3
+            local retry=0
+            local curl_status=0
+
+            echo "Uploading: $filename"
+
+            # URL encode the filename
+            encoded_filename=$(printf '%s' "$filename" | jq -sRr @uri)
+
+            while [ $retry -lt $max_retries ]; do
+              # Get upload URL
+              curl_status=0
+              UPLOAD_INFO=$(curl -s --connect-timeout 30 --max-time 60 \
+                -H "Authorization: Bearer ${GITCODE_TOKEN}" \
+                "${API_URL}/repos/${GITCODE_OWNER}/${GITCODE_REPO}/releases/${TAG_NAME}/upload_url?file_name=${encoded_filename}") || curl_status=$?
+
+              if [ $curl_status -eq 0 ]; then
+                UPLOAD_URL=$(echo "$UPLOAD_INFO" | jq -r '.url // empty')
+
+                if [ -n "$UPLOAD_URL" ]; then
+                  # Write headers to temp file to avoid shell escaping issues
+                  echo "$UPLOAD_INFO" | jq -r '.headers | to_entries[] | "header = \"" + .key + ": " + .value + "\""' > /tmp/upload_headers.txt
+
+                  # Upload file using PUT with headers from file
+                  curl_status=0
+                  UPLOAD_RESPONSE=$(curl -s -w "\n%{http_code}" -X PUT \
+                    -K /tmp/upload_headers.txt \
+                    --data-binary "@${file}" \
+                    "$UPLOAD_URL") || curl_status=$?
+
+                  if [ $curl_status -eq 0 ]; then
+                    HTTP_CODE=$(echo "$UPLOAD_RESPONSE" | tail -n1)
+                    RESPONSE_BODY=$(echo "$UPLOAD_RESPONSE" | sed '$d')
+
+                    if [ "$HTTP_CODE" -ge 200 ] && [ "$HTTP_CODE" -lt 300 ]; then
+                      echo "  Uploaded: $filename"
+                      return 0
+                    else
+                      echo "  Failed (HTTP $HTTP_CODE), retry $((retry + 1))/$max_retries"
+                      echo "  Response: $RESPONSE_BODY"
+                    fi
+                  else
+                    echo "  Upload request failed (curl exit $curl_status), retry $((retry + 1))/$max_retries"
+                  fi
+                else
+                  echo "  Failed to get upload URL, retry $((retry + 1))/$max_retries"
+                  echo "  Response: $UPLOAD_INFO"
+                fi
+              else
+                echo "  Failed to get upload URL (curl exit $curl_status), retry $((retry + 1))/$max_retries"
+                echo "  Response: $UPLOAD_INFO"
+              fi
+
+              retry=$((retry + 1))
+              [ $retry -lt $max_retries ] && sleep 3
+            done
+
+            echo "  Failed: $filename after $max_retries retries"
+            exit 1
+          }
+
+          # Upload non-yml/json files first
+          for file in release-assets/*; do
+            if [ -f "$file" ]; then
+              filename=$(basename "$file")
+              if [[ ! "$filename" =~ \.(yml|yaml|json)$ ]]; then
+                upload_file "$file"
+              fi
+            fi
+          done
+
+          # Upload yml/json files last
+          for file in release-assets/*; do
+            if [ -f "$file" ]; then
+              filename=$(basename "$file")
+              if [[ "$filename" =~ \.(yml|yaml|json)$ ]]; then
+                upload_file "$file"
+              fi
+            fi
+          done
+
+          echo "GitCode release sync completed!"
+
+      - name: Cleanup temp files
+        if: always()
+        shell: bash
+        run: |
+          rm -f /tmp/release_payload.json /tmp/upload_headers.txt release_body.txt
+          rm -rf release-assets/

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

@@ -19,10 +19,9 @@ on:
 
 permissions:
   contents: write
-  pull-requests: write
 
 jobs:
-  propose-update:
+  update-config:
     runs-on: ubuntu-latest
     if: github.event_name == 'workflow_dispatch' || (github.event_name == 'release' && github.event.release.draft == false)
 
@@ -135,7 +134,7 @@ jobs:
 
       - name: Checkout default branch
         if: steps.check.outputs.should_run == 'true'
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ github.event.repository.default_branch }}
           path: main
@@ -143,7 +142,7 @@ jobs:
 
       - name: Checkout x-files/app-upgrade-config branch
         if: steps.check.outputs.should_run == 'true'
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: x-files/app-upgrade-config
           path: cs
@@ -187,25 +186,20 @@ jobs:
             echo "changed=true" >> "$GITHUB_OUTPUT"
           fi
 
-      - name: Create pull request
+      - name: Commit and push changes
         if: steps.check.outputs.should_run == 'true' && steps.diff.outputs.changed == 'true'
-        uses: peter-evans/create-pull-request@v7
+        working-directory: cs
-        with:
+        run: |
-          path: cs
+          git config user.name "github-actions[bot]"
-          base: x-files/app-upgrade-config
+          git config user.email "github-actions[bot]@users.noreply.github.com"
-          branch: chore/update-app-upgrade-config/${{ steps.meta.outputs.safe_tag }}
+          git add app-upgrade-config.json
-          commit-message: "🤖 chore: sync app-upgrade-config for ${{ steps.meta.outputs.tag }}"
+          git commit -m "chore: sync app-upgrade-config for ${{ steps.meta.outputs.tag }}" -m "Automated update triggered by \`${{ steps.meta.outputs.trigger }}\`.
-          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 }}`
+          - Source tag: \`${{ steps.meta.outputs.tag }}\`
-            - Pre-release: `${{ steps.meta.outputs.prerelease }}`
+          - Pre-release: \`${{ steps.meta.outputs.prerelease }}\`
-            - Latest: `${{ steps.meta.outputs.latest }}`
+          - Latest: \`${{ steps.meta.outputs.latest }}\`
-            - Workflow run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+          - Workflow run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-          labels: |
+          git push origin x-files/app-upgrade-config
-            automation
-            app-upgrade
 
       - name: No changes detected
         if: steps.check.outputs.should_run == 'true' && steps.diff.outputs.changed != 'true'

.oxlintrc.json

@@ -11,6 +11,7 @@
     "dist/**",
     "out/**",
     "local/**",
+    "tests/**",
     ".yarn/**",
     ".gitignore",
     "scripts/cloudflare-worker.js",

.yarn/patches/@ai-sdk-google-npm-2.0.49-84720f41bd.patch

@@ -1,8 +1,8 @@
 diff --git a/dist/index.js b/dist/index.js
-index dc7b74ba55337c491cdf1ab3e39ca68cc4187884..ace8c90591288e42c2957e93c9bf7984f1b22444 100644
+index d004b415c5841a1969705823614f395265ea5a8a..6b1e0dad4610b0424393ecc12e9114723bbe316b 100644
 --- a/dist/index.js
 +++ b/dist/index.js
-@@ -472,7 +472,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
+@@ -474,7 +474,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
  
  // src/get-model-path.ts
  function getModelPath(modelId) {
@@ -12,10 +12,10 @@ index dc7b74ba55337c491cdf1ab3e39ca68cc4187884..ace8c90591288e42c2957e93c9bf7984
  
  // src/google-generative-ai-options.ts
 diff --git a/dist/index.mjs b/dist/index.mjs
-index 8390439c38cb7eaeb52080862cd6f4c58509e67c..a7647f2e11700dff7e1c8d4ae8f99d3637010733 100644
+index 1780dd2391b7f42224a0b8048c723d2f81222c44..1f12ed14399d6902107ce9b435d7d8e6cc61e06b 100644
 --- a/dist/index.mjs
 +++ b/dist/index.mjs
-@@ -478,7 +478,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
+@@ -480,7 +480,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
  
  // src/get-model-path.ts
  function getModelPath(modelId) {
@@ -24,3 +24,14 @@ index 8390439c38cb7eaeb52080862cd6f4c58509e67c..a7647f2e11700dff7e1c8d4ae8f99d36
  }
  
  // src/google-generative-ai-options.ts
+@@ -1909,8 +1909,7 @@ function createGoogleGenerativeAI(options = {}) {
+ }
+ var google = createGoogleGenerativeAI();
+ export {
+-  VERSION,
+   createGoogleGenerativeAI,
+-  google
++  google, VERSION
+ };
+ //# sourceMappingURL=index.mjs.map
+\ No newline at end of file

.yarn/patches/@ai-sdk-openai-npm-2.0.85-27483d1d6a.patch

@@ -1,8 +1,8 @@
 diff --git a/dist/index.js b/dist/index.js
-index 7481f3b3511078068d87d03855b568b20bb86971..8ac5ec28d2f7ad1b3b0d3f8da945c75674e59637 100644
+index 130094d194ea1e8e7d3027d07d82465741192124..4d13dcee8c962ca9ee8f1c3d748f8ffe6a3cfb47 100644
 --- a/dist/index.js
 +++ b/dist/index.js
-@@ -274,6 +274,7 @@ var openaiChatResponseSchema = (0, import_provider_utils3.lazyValidator)(
+@@ -290,6 +290,7 @@ var openaiChatResponseSchema = (0, import_provider_utils3.lazyValidator)(
            message: import_v42.z.object({
              role: import_v42.z.literal("assistant").nullish(),
              content: import_v42.z.string().nullish(),
@@ -10,7 +10,7 @@ index 7481f3b3511078068d87d03855b568b20bb86971..8ac5ec28d2f7ad1b3b0d3f8da945c756
              tool_calls: import_v42.z.array(
                import_v42.z.object({
                  id: import_v42.z.string().nullish(),
-@@ -340,6 +341,7 @@ var openaiChatChunkSchema = (0, import_provider_utils3.lazyValidator)(
+@@ -356,6 +357,7 @@ var openaiChatChunkSchema = (0, import_provider_utils3.lazyValidator)(
              delta: import_v42.z.object({
                role: import_v42.z.enum(["assistant"]).nullish(),
                content: import_v42.z.string().nullish(),
@@ -18,7 +18,7 @@ index 7481f3b3511078068d87d03855b568b20bb86971..8ac5ec28d2f7ad1b3b0d3f8da945c756
                tool_calls: import_v42.z.array(
                  import_v42.z.object({
                    index: import_v42.z.number(),
-@@ -795,6 +797,13 @@ var OpenAIChatLanguageModel = class {
+@@ -814,6 +816,13 @@ var OpenAIChatLanguageModel = class {
      if (text != null && text.length > 0) {
        content.push({ type: "text", text });
      }
@@ -32,7 +32,7 @@ index 7481f3b3511078068d87d03855b568b20bb86971..8ac5ec28d2f7ad1b3b0d3f8da945c756
      for (const toolCall of (_a = choice.message.tool_calls) != null ? _a : []) {
        content.push({
          type: "tool-call",
-@@ -876,6 +885,7 @@ var OpenAIChatLanguageModel = class {
+@@ -895,6 +904,7 @@ var OpenAIChatLanguageModel = class {
      };
      let metadataExtracted = false;
      let isActiveText = false;
@@ -40,7 +40,7 @@ index 7481f3b3511078068d87d03855b568b20bb86971..8ac5ec28d2f7ad1b3b0d3f8da945c756
      const providerMetadata = { openai: {} };
      return {
        stream: response.pipeThrough(
-@@ -933,6 +943,21 @@ var OpenAIChatLanguageModel = class {
+@@ -952,6 +962,21 @@ var OpenAIChatLanguageModel = class {
                return;
              }
              const delta = choice.delta;
@@ -62,7 +62,7 @@ index 7481f3b3511078068d87d03855b568b20bb86971..8ac5ec28d2f7ad1b3b0d3f8da945c756
              if (delta.content != null) {
                if (!isActiveText) {
                  controller.enqueue({ type: "text-start", id: "0" });
-@@ -1045,6 +1070,9 @@ var OpenAIChatLanguageModel = class {
+@@ -1064,6 +1089,9 @@ var OpenAIChatLanguageModel = class {
              }
            },
            flush(controller) {

.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.62-23ae56f8c8.patch

@@ -1,8 +1,8 @@
 diff --git a/sdk.mjs b/sdk.mjs
-index 8cc6aaf0b25bcdf3c579ec95cde12d419fcb2a71..3b3b8beaea5ad2bbac26a15f792058306d0b059f 100755
+index dea7766a3432a1e809f12d6daba4f2834a219689..e0b02ef73da177ba32b903887d7bbbeaa08cc6d3 100755
 --- a/sdk.mjs
 +++ b/sdk.mjs
-@@ -6213,7 +6213,7 @@ function createAbortController(maxListeners = DEFAULT_MAX_LISTENERS) {
+@@ -6250,7 +6250,7 @@ function createAbortController(maxListeners = DEFAULT_MAX_LISTENERS) {
  }
  
  // ../src/transport/ProcessTransport.ts
@@ -11,16 +11,20 @@ index 8cc6aaf0b25bcdf3c579ec95cde12d419fcb2a71..3b3b8beaea5ad2bbac26a15f79205830
  import { createInterface } from "readline";
  
  // ../src/utils/fsOperations.ts
-@@ -6505,14 +6505,11 @@ class ProcessTransport {
+@@ -6644,18 +6644,11 @@ class ProcessTransport {
          const errorMessage = isNativeBinary(pathToClaudeCodeExecutable) ? `Claude Code native binary not found at ${pathToClaudeCodeExecutable}. Please ensure Claude Code is installed via native installer or specify a valid path with options.pathToClaudeCodeExecutable.` : `Claude Code executable not found at ${pathToClaudeCodeExecutable}. Is options.pathToClaudeCodeExecutable set?`;
          throw new ReferenceError(errorMessage);
        }
 -      const isNative = isNativeBinary(pathToClaudeCodeExecutable);
 -      const spawnCommand = isNative ? pathToClaudeCodeExecutable : executable;
 -      const spawnArgs = isNative ? [...executableArgs, ...args] : [...executableArgs, pathToClaudeCodeExecutable, ...args];
--      this.logForDebugging(isNative ? `Spawning Claude Code native binary: ${spawnCommand} ${spawnArgs.join(" ")}` : `Spawning Claude Code process: ${spawnCommand} ${spawnArgs.join(" ")}`);
+-      const spawnMessage = isNative ? `Spawning Claude Code native binary: ${spawnCommand} ${spawnArgs.join(" ")}` : `Spawning Claude Code process: ${spawnCommand} ${spawnArgs.join(" ")}`;
-+      this.logForDebugging(`Forking Claude Code Node.js process: ${pathToClaudeCodeExecutable} ${args.join(" ")}`);
+-      logForSdkDebugging(spawnMessage);
-       const stderrMode = env.DEBUG || stderr ? "pipe" : "ignore";
+-      if (stderr) {
+-        stderr(spawnMessage);
+-      }
++      logForSdkDebugging(`Forking Claude Code Node.js process: ${pathToClaudeCodeExecutable} ${args.join(" ")}`);
+       const stderrMode = env.DEBUG_CLAUDE_AGENT_SDK || stderr ? "pipe" : "ignore";
 -      this.child = spawn(spawnCommand, spawnArgs, {
 +      this.child = fork(pathToClaudeCodeExecutable, args, {
          cwd,

.yarn/patches/ollama-ai-provider-v2-npm-1.5.5-8bef249af9.patch

@@ -0,0 +1,145 @@
+diff --git a/dist/index.d.ts b/dist/index.d.ts
+index 8dd9b498050dbecd8dd6b901acf1aa8ca38a49af..ed644349c9d38fe2a66b2fb44214f7c18eb97f89 100644
+--- a/dist/index.d.ts
++++ b/dist/index.d.ts
+@@ -4,7 +4,7 @@ import { z } from 'zod/v4';
+
+ type OllamaChatModelId = "athene-v2" | "athene-v2:72b" | "aya-expanse" | "aya-expanse:8b" | "aya-expanse:32b" | "codegemma" | "codegemma:2b" | "codegemma:7b" | "codellama" | "codellama:7b" | "codellama:13b" | "codellama:34b" | "codellama:70b" | "codellama:code" | "codellama:python" | "command-r" | "command-r:35b" | "command-r-plus" | "command-r-plus:104b" | "command-r7b" | "command-r7b:7b" | "deepseek-r1" | "deepseek-r1:1.5b" | "deepseek-r1:7b" | "deepseek-r1:8b" | "deepseek-r1:14b" | "deepseek-r1:32b" | "deepseek-r1:70b" | "deepseek-r1:671b" | "deepseek-coder-v2" | "deepseek-coder-v2:16b" | "deepseek-coder-v2:236b" | "deepseek-v3" | "deepseek-v3:671b" | "devstral" | "devstral:24b" | "dolphin3" | "dolphin3:8b" | "exaone3.5" | "exaone3.5:2.4b" | "exaone3.5:7.8b" | "exaone3.5:32b" | "falcon2" | "falcon2:11b" | "falcon3" | "falcon3:1b" | "falcon3:3b" | "falcon3:7b" | "falcon3:10b" | "firefunction-v2" | "firefunction-v2:70b" | "gemma" | "gemma:2b" | "gemma:7b" | "gemma2" | "gemma2:2b" | "gemma2:9b" | "gemma2:27b" | "gemma3" | "gemma3:1b" | "gemma3:4b" | "gemma3:12b" | "gemma3:27b" | "granite3-dense" | "granite3-dense:2b" | "granite3-dense:8b" | "granite3-guardian" | "granite3-guardian:2b" | "granite3-guardian:8b" | "granite3-moe" | "granite3-moe:1b" | "granite3-moe:3b" | "granite3.1-dense" | "granite3.1-dense:2b" | "granite3.1-dense:8b" | "granite3.1-moe" | "granite3.1-moe:1b" | "granite3.1-moe:3b" | "llama2" | "llama2:7b" | "llama2:13b" | "llama2:70b" | "llama3" | "llama3:8b" | "llama3:70b" | "llama3-chatqa" | "llama3-chatqa:8b" | "llama3-chatqa:70b" | "llama3-gradient" | "llama3-gradient:8b" | "llama3-gradient:70b" | "llama3.1" | "llama3.1:8b" | "llama3.1:70b" | "llama3.1:405b" | "llama3.2" | "llama3.2:1b" | "llama3.2:3b" | "llama3.2-vision" | "llama3.2-vision:11b" | "llama3.2-vision:90b" | "llama3.3" | "llama3.3:70b" | "llama4" | "llama4:16x17b" | "llama4:128x17b" | "llama-guard3" | "llama-guard3:1b" | "llama-guard3:8b" | "llava" | "llava:7b" | "llava:13b" | "llava:34b" | "llava-llama3" | "llava-llama3:8b" | "llava-phi3" | "llava-phi3:3.8b" | "marco-o1" | "marco-o1:7b" | "mistral" | "mistral:7b" | "mistral-large" | "mistral-large:123b" | "mistral-nemo" | "mistral-nemo:12b" | "mistral-small" | "mistral-small:22b" | "mixtral" | "mixtral:8x7b" | "mixtral:8x22b" | "moondream" | "moondream:1.8b" | "openhermes" | "openhermes:v2.5" | "nemotron" | "nemotron:70b" | "nemotron-mini" | "nemotron-mini:4b" | "olmo" | "olmo:7b" | "olmo:13b" | "opencoder" | "opencoder:1.5b" | "opencoder:8b" | "phi3" | "phi3:3.8b" | "phi3:14b" | "phi3.5" | "phi3.5:3.8b" | "phi4" | "phi4:14b" | "qwen" | "qwen:7b" | "qwen:14b" | "qwen:32b" | "qwen:72b" | "qwen:110b" | "qwen2" | "qwen2:0.5b" | "qwen2:1.5b" | "qwen2:7b" | "qwen2:72b" | "qwen2.5" | "qwen2.5:0.5b" | "qwen2.5:1.5b" | "qwen2.5:3b" | "qwen2.5:7b" | "qwen2.5:14b" | "qwen2.5:32b" | "qwen2.5:72b" | "qwen2.5-coder" | "qwen2.5-coder:0.5b" | "qwen2.5-coder:1.5b" | "qwen2.5-coder:3b" | "qwen2.5-coder:7b" | "qwen2.5-coder:14b" | "qwen2.5-coder:32b" | "qwen3" | "qwen3:0.6b" | "qwen3:1.7b" | "qwen3:4b" | "qwen3:8b" | "qwen3:14b" | "qwen3:30b" | "qwen3:32b" | "qwen3:235b" | "qwq" | "qwq:32b" | "sailor2" | "sailor2:1b" | "sailor2:8b" | "sailor2:20b" | "shieldgemma" | "shieldgemma:2b" | "shieldgemma:9b" | "shieldgemma:27b" | "smallthinker" | "smallthinker:3b" | "smollm" | "smollm:135m" | "smollm:360m" | "smollm:1.7b" | "tinyllama" | "tinyllama:1.1b" | "tulu3" | "tulu3:8b" | "tulu3:70b" | (string & {});
+ declare const ollamaProviderOptions: z.ZodObject<{
+-    think: z.ZodOptional<z.ZodBoolean>;
++    think: z.ZodOptional<z.ZodUnion<[z.ZodBoolean, z.ZodEnum<['low', 'medium', 'high']>]>>;
+     options: z.ZodOptional<z.ZodObject<{
+         num_ctx: z.ZodOptional<z.ZodNumber>;
+         repeat_last_n: z.ZodOptional<z.ZodNumber>;
+@@ -27,9 +27,11 @@ interface OllamaCompletionSettings {
+      * the model's thinking from the model's output. When disabled, the model will not think
+      * and directly output the content.
+      *
++     * For gpt-oss models, you can also use 'low', 'medium', or 'high' to control the depth of thinking.
++     *
+      * Only supported by certain models like DeepSeek R1 and Qwen 3.
+      */
+-    think?: boolean;
++    think?: boolean | 'low' | 'medium' | 'high';
+     /**
+      * Echo back the prompt in addition to the completion.
+      */
+@@ -146,7 +148,7 @@ declare const ollamaEmbeddingProviderOptions: z.ZodObject<{
+ type OllamaEmbeddingProviderOptions = z.infer<typeof ollamaEmbeddingProviderOptions>;
+
+ declare const ollamaCompletionProviderOptions: z.ZodObject<{
+-    think: z.ZodOptional<z.ZodBoolean>;
++    think: z.ZodOptional<z.ZodUnion<[z.ZodBoolean, z.ZodEnum<['low', 'medium', 'high']>]>>;
+     user: z.ZodOptional<z.ZodString>;
+     suffix: z.ZodOptional<z.ZodString>;
+     echo: z.ZodOptional<z.ZodBoolean>;
+diff --git a/dist/index.js b/dist/index.js
+index 35b5142ce8476ce2549ed7c2ec48e7d8c46c90d9..2ef64dc9a4c2be043e6af608241a6a8309a5a69f 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -158,7 +158,7 @@ function getResponseMetadata({
+
+ // src/completion/ollama-completion-language-model.ts
+ var ollamaCompletionProviderOptions = import_v42.z.object({
+-  think: import_v42.z.boolean().optional(),
++  think: import_v42.z.union([import_v42.z.boolean(), import_v42.z.enum(['low', 'medium', 'high'])]).optional(),
+   user: import_v42.z.string().optional(),
+   suffix: import_v42.z.string().optional(),
+   echo: import_v42.z.boolean().optional()
+@@ -662,7 +662,7 @@ function convertToOllamaChatMessages({
+         const images = content.filter((part) => part.type === "file" && part.mediaType.startsWith("image/")).map((part) => part.data);
+         messages.push({
+           role: "user",
+-          content: userText.length > 0 ? userText : [],
++          content: userText.length > 0 ? userText : '',
+           images: images.length > 0 ? images : void 0
+         });
+         break;
+@@ -813,9 +813,11 @@ var ollamaProviderOptions = import_v44.z.object({
+    * the model's thinking from the model's output. When disabled, the model will not think
+    * and directly output the content.
+    *
++   * For gpt-oss models, you can also use 'low', 'medium', or 'high' to control the depth of thinking.
++   *
+    * Only supported by certain models like DeepSeek R1 and Qwen 3.
+    */
+-  think: import_v44.z.boolean().optional(),
++  think: import_v44.z.union([import_v44.z.boolean(), import_v44.z.enum(['low', 'medium', 'high'])]).optional(),
+   options: import_v44.z.object({
+     num_ctx: import_v44.z.number().optional(),
+     repeat_last_n: import_v44.z.number().optional(),
+@@ -929,14 +931,16 @@ var OllamaRequestBuilder = class {
+         prompt,
+         systemMessageMode: "system"
+       }),
+-      temperature,
+-      top_p: topP,
+       max_output_tokens: maxOutputTokens,
+       ...(responseFormat == null ? void 0 : responseFormat.type) === "json" && {
+         format: responseFormat.schema != null ? responseFormat.schema : "json"
+       },
+       think: (_a = ollamaOptions == null ? void 0 : ollamaOptions.think) != null ? _a : false,
+-      options: (_b = ollamaOptions == null ? void 0 : ollamaOptions.options) != null ? _b : void 0
++      options: {
++        ...temperature !== void 0 && { temperature },
++        ...topP !== void 0 && { top_p: topP },
++        ...((_b = ollamaOptions == null ? void 0 : ollamaOptions.options) != null ? _b : {})
++      }
+     };
+   }
+ };
+diff --git a/dist/index.mjs b/dist/index.mjs
+index e2a634a78d80ac9542f2cc4f96cf2291094b10cf..67b23efce3c1cf4f026693d3ff9246988a3ef26e 100644
+--- a/dist/index.mjs
++++ b/dist/index.mjs
+@@ -144,7 +144,7 @@ function getResponseMetadata({
+
+ // src/completion/ollama-completion-language-model.ts
+ var ollamaCompletionProviderOptions = z2.object({
+-  think: z2.boolean().optional(),
++  think: z2.union([z2.boolean(), z2.enum(['low', 'medium', 'high'])]).optional(),
+   user: z2.string().optional(),
+   suffix: z2.string().optional(),
+   echo: z2.boolean().optional()
+@@ -662,7 +662,7 @@ function convertToOllamaChatMessages({
+         const images = content.filter((part) => part.type === "file" && part.mediaType.startsWith("image/")).map((part) => part.data);
+         messages.push({
+           role: "user",
+-          content: userText.length > 0 ? userText : [],
++          content: userText.length > 0 ? userText : '',
+           images: images.length > 0 ? images : void 0
+         });
+         break;
+@@ -815,9 +815,11 @@ var ollamaProviderOptions = z4.object({
+    * the model's thinking from the model's output. When disabled, the model will not think
+    * and directly output the content.
+    *
++   * For gpt-oss models, you can also use 'low', 'medium', or 'high' to control the depth of thinking.
++   *
+    * Only supported by certain models like DeepSeek R1 and Qwen 3.
+    */
+-  think: z4.boolean().optional(),
++  think: z4.union([z4.boolean(), z4.enum(['low', 'medium', 'high'])]).optional(),
+   options: z4.object({
+     num_ctx: z4.number().optional(),
+     repeat_last_n: z4.number().optional(),
+@@ -931,14 +933,16 @@ var OllamaRequestBuilder = class {
+         prompt,
+         systemMessageMode: "system"
+       }),
+-      temperature,
+-      top_p: topP,
+       max_output_tokens: maxOutputTokens,
+       ...(responseFormat == null ? void 0 : responseFormat.type) === "json" && {
+         format: responseFormat.schema != null ? responseFormat.schema : "json"
+       },
+       think: (_a = ollamaOptions == null ? void 0 : ollamaOptions.think) != null ? _a : false,
+-      options: (_b = ollamaOptions == null ? void 0 : ollamaOptions.options) != null ? _b : void 0
++      options: {
++        ...temperature !== void 0 && { temperature },
++        ...topP !== void 0 && { top_p: topP },
++        ...((_b = ollamaOptions == null ? void 0 : ollamaOptions.options) != null ? _b : {})
++      }
+     };
+   }
+ };

CLAUDE.md

@@ -10,15 +10,25 @@ This file provides guidance to AI coding assistants when working with code in th
 - **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.
+- **Lint, test, and format before completion**: Coding tasks are only complete after running `yarn lint`, `yarn test`, and `yarn format` successfully.
 - **Write conventional commits**: Commit small, focused changes using Conventional Commit messages (e.g., `feat:`, `fix:`, `refactor:`, `docs:`).
 
+## Pull Request Workflow (CRITICAL)
+
+When creating a Pull Request, you MUST:
+
+1. **Read the PR template first**: Always read `.github/pull_request_template.md` before creating the PR
+2. **Follow ALL template sections**: Structure the `--body` parameter to include every section from the template
+3. **Never skip sections**: Include all sections even if marking them as N/A or "None"
+4. **Use proper formatting**: Match the template's markdown structure exactly (headings, checkboxes, code blocks)
+
 ## Development Commands
 
 - **Install**: `yarn install` - Install all project dependencies
 - **Development**: `yarn dev` - Runs Electron app in development mode with hot reload
 - **Debug**: `yarn debug` - Starts with debugging enabled, use `chrome://inspect` to attach debugger
 - **Build Check**: `yarn build:check` - **REQUIRED** before commits (lint + test + typecheck)
-  - If having i18n sort issues, run `yarn sync:i18n` first to sync template
+  - If having i18n sort issues, run `yarn i18n:sync` first to sync template
   - If having formatting issues, run `yarn format` first
 - **Test**: `yarn test` - Run all tests (Vitest) across main and renderer processes
 - **Single Test**:
@@ -30,20 +40,23 @@ This file provides guidance to AI coding assistants when working with code in th
 ## Project Architecture
 
 ### Electron Structure
+
 - **Main Process** (`src/main/`): Node.js backend with services (MCP, Knowledge, Storage, etc.)
 - **Renderer Process** (`src/renderer/`): React UI with Redux state management
 - **Preload Scripts** (`src/preload/`): Secure IPC bridge
 
 ### Key Components
+
 - **AI Core** (`src/renderer/src/aiCore/`): Middleware pipeline for multiple AI providers.
 - **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.
 
 ### Logging
+
 ```typescript
-import { loggerService } from '@logger'
+import { loggerService } from "@logger";
-const logger = loggerService.withContext('moduleName')
+const logger = loggerService.withContext("moduleName");
 // Renderer: loggerService.initWindowSource('windowName') first
-logger.info('message', CONTEXT)
+logger.info("message", CONTEXT);
 ```

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-[中文](docs/CONTRIBUTING.zh.md) | [English](CONTRIBUTING.md)
+[中文](docs/zh/guides/contributing.md) | [English](CONTRIBUTING.md)
 
 # Cherry Studio Contributor Guide
 
@@ -32,7 +32,7 @@ To help you get familiar with the codebase, we recommend tackling issues tagged
 
 ### Testing
 
-Features without tests are considered non-existent. To ensure code is truly effective, relevant processes should be covered by unit tests and functional tests. Therefore, when considering contributions, please also consider testability. All tests can be run locally without dependency on CI. Please refer to the "Testing" section in the [Developer Guide](docs/dev.md).
+Features without tests are considered non-existent. To ensure code is truly effective, relevant processes should be covered by unit tests and functional tests. Therefore, when considering contributions, please also consider testability. All tests can be run locally without dependency on CI. Please refer to the "Testing" section in the [Developer Guide](docs/zh/guides/development.md).
 
 ### Automated Testing for Pull Requests
 
@@ -60,7 +60,7 @@ Maintainers are here to help you implement your use case within a reasonable tim
 
 ### Participating in the Test Plan
 
-The Test Plan aims to provide users with a more stable application experience and faster iteration speed. For details, please refer to the [Test Plan](docs/testplan-en.md).
+The Test Plan aims to provide users with a more stable application experience and faster iteration speed. For details, please refer to the [Test Plan](docs/en/guides/test-plan.md).
 
 ### Other Suggestions
 

README.md

@@ -34,7 +34,7 @@
   </a>
 </h1>
 
-<p align="center">English | <a href="./docs/README.zh.md">中文</a> | <a href="https://cherry-ai.com">Official Site</a> | <a href="https://docs.cherry-ai.com/cherry-studio-wen-dang/en-us">Documents</a> | <a href="./docs/dev.md">Development</a> | <a href="https://github.com/CherryHQ/cherry-studio/issues">Feedback</a><br></p>
+<p align="center">English | <a href="./docs/zh/README.md">中文</a> | <a href="https://cherry-ai.com">Official Site</a> | <a href="https://docs.cherry-ai.com/cherry-studio-wen-dang/en-us">Documents</a> | <a href="./docs/en/guides/development.md">Development</a> | <a href="https://github.com/CherryHQ/cherry-studio/issues">Feedback</a><br></p>
 
 <div align="center">
 
@@ -67,7 +67,7 @@ Cherry Studio is a desktop client that supports multiple LLM providers, availabl
 
 👏 Join [Telegram Group](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/wez8HtpxqQ) | [QQ Group(575014769)](https://qm.qq.com/q/lo0D4qVZKi)
 
-❤️ Like Cherry Studio? Give it a star 🌟 or [Sponsor](docs/sponsor.md) to support the development!
+❤️ Like Cherry Studio? Give it a star 🌟 or [Sponsor](docs/zh/guides/sponsor.md) to support the development!
 
 # 🌠 Screenshot
 
@@ -175,7 +175,7 @@ We welcome contributions to Cherry Studio! Here are some ways you can contribute
 6. **Community Engagement**: Join discussions and help users.
 7. **Promote Usage**: Spread the word about Cherry Studio.
 
-Refer to the [Branching Strategy](docs/branching-strategy-en.md) for contribution guidelines
+Refer to the [Branching Strategy](docs/en/guides/branching-strategy.md) for contribution guidelines
 
 ## Getting Started
 

biome.jsonc

@@ -23,7 +23,7 @@
   },
   "files": {
     "ignoreUnknown": false,
-    "includes": ["**", "!**/.claude/**", "!**/.vscode/**"],
+    "includes": ["**", "!**/.claude/**", "!**/.vscode/**", "!**/.conductor/**"],
     "maxSize": 2097152
   },
   "formatter": {

build/nsis-installer.nsh

@@ -12,8 +12,13 @@
 
 ; https://github.com/electron-userland/electron-builder/issues/1122
 !ifndef BUILD_UNINSTALLER
+  ; Check VC++ Redistributable based on architecture stored in $1
   Function checkVCRedist
+    ${If} $1 == "arm64"
+      ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\ARM64" "Installed"
+    ${Else}
       ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Installed"
+    ${EndIf}
   FunctionEnd
 
   Function checkArchitectureCompatibility
@@ -97,29 +102,47 @@
 
   Call checkVCRedist
   ${If} $0 != "1"
-    MessageBox MB_YESNO "\
+    ; VC++ is required - install automatically since declining would abort anyway
-      NOTE: ${PRODUCT_NAME} requires $\r$\n\
+    ; Select download URL based on system architecture (stored in $1)
-      'Microsoft Visual C++ Redistributable'$\r$\n\
+    ${If} $1 == "arm64"
-      to function properly.$\r$\n$\r$\n\
+      StrCpy $2 "https://aka.ms/vs/17/release/vc_redist.arm64.exe"
-      Download and install now?" /SD IDYES IDYES InstallVCRedist IDNO DontInstall
+      StrCpy $3 "$TEMP\vc_redist.arm64.exe"
-    InstallVCRedist:
+    ${Else}
-      inetc::get /CAPTION " " /BANNER "Downloading Microsoft Visual C++ Redistributable..." "https://aka.ms/vs/17/release/vc_redist.x64.exe" "$TEMP\vc_redist.x64.exe"
+      StrCpy $2 "https://aka.ms/vs/17/release/vc_redist.x64.exe"
-      ExecWait "$TEMP\vc_redist.x64.exe /install /norestart"
+      StrCpy $3 "$TEMP\vc_redist.x64.exe"
-      ;IfErrors InstallError ContinueInstall ; vc_redist exit code is unreliable :(
-      Call checkVCRedist
-      ${If} $0 == "1"
-        Goto ContinueInstall
     ${EndIf}
 
-    ;InstallError:
+    inetc::get /CAPTION " " /BANNER "Downloading Microsoft Visual C++ Redistributable..." \
-      MessageBox MB_ICONSTOP "\
+      $2 $3 /END
-        There was an unexpected error installing$\r$\n\
+    Pop $0  ; Get download status from inetc::get
-        Microsoft Visual C++ Redistributable.$\r$\n\
+    ${If} $0 != "OK"
-        The installation of ${PRODUCT_NAME} cannot continue."
+      MessageBox MB_ICONSTOP|MB_YESNO "\
-    DontInstall:
+        Failed to download Microsoft Visual C++ Redistributable.$\r$\n$\r$\n\
+        Error: $0$\r$\n$\r$\n\
+        Would you like to open the download page in your browser?$\r$\n\
+        $2" IDYES openDownloadUrl IDNO skipDownloadUrl
+      openDownloadUrl:
+        ExecShell "open" $2
+      skipDownloadUrl:
       Abort
     ${EndIf}
-  ContinueInstall:
+
+    ExecWait "$3 /install /quiet /norestart"
+    ; Note: vc_redist exit code is unreliable, verify via registry check instead
+
+    Call checkVCRedist
+    ${If} $0 != "1"
+      MessageBox MB_ICONSTOP|MB_YESNO "\
+        Microsoft Visual C++ Redistributable installation failed.$\r$\n$\r$\n\
+        Would you like to open the download page in your browser?$\r$\n\
+        $2$\r$\n$\r$\n\
+        The installation of ${PRODUCT_NAME} cannot continue." IDYES openInstallUrl IDNO skipInstallUrl
+      openInstallUrl:
+        ExecShell "open" $2
+      skipInstallUrl:
+      Abort
+    ${EndIf}
+  ${EndIf}
     Pop $4
     Pop $3
     Pop $2

docs/README.md

@@ -0,0 +1,81 @@
+# Cherry Studio Documentation / 文档
+
+This directory contains the project documentation in multiple languages.
+
+本目录包含多语言项目文档。
+
+---
+
+## Languages / 语言
+
+- **[中文文档](./zh/README.md)** - Chinese Documentation
+- **English Documentation** - See sections below
+
+---
+
+## English Documentation
+
+### Guides
+
+| Document | Description |
+|----------|-------------|
+| [Development Setup](./en/guides/development.md) | Development environment setup |
+| [Branching Strategy](./en/guides/branching-strategy.md) | Git branching workflow |
+| [i18n Guide](./en/guides/i18n.md) | Internationalization guide |
+| [Logging Guide](./en/guides/logging.md) | How to use the logger service |
+| [Test Plan](./en/guides/test-plan.md) | Test plan and release channels |
+
+### References
+
+| Document | Description |
+|----------|-------------|
+| [App Upgrade Config](./en/references/app-upgrade.md) | Application upgrade configuration |
+| [CodeBlockView Component](./en/references/components/code-block-view.md) | Code block view component |
+| [Image Preview Components](./en/references/components/image-preview.md) | Image preview components |
+
+---
+
+## 中文文档
+
+### 指南 (Guides)
+
+| 文档 | 说明 |
+|------|------|
+| [开发环境设置](./zh/guides/development.md) | 开发环境配置 |
+| [贡献指南](./zh/guides/contributing.md) | 如何贡献代码 |
+| [分支策略](./zh/guides/branching-strategy.md) | Git 分支工作流 |
+| [测试计划](./zh/guides/test-plan.md) | 测试计划和发布通道 |
+| [国际化指南](./zh/guides/i18n.md) | 国际化开发指南 |
+| [日志使用指南](./zh/guides/logging.md) | 如何使用日志服务 |
+| [中间件开发](./zh/guides/middleware.md) | 如何编写中间件 |
+| [记忆功能](./zh/guides/memory.md) | 记忆功能使用指南 |
+| [赞助信息](./zh/guides/sponsor.md) | 赞助相关信息 |
+
+### 参考 (References)
+
+| 文档 | 说明 |
+|------|------|
+| [消息系统](./zh/references/message-system.md) | 消息系统架构和 API |
+| [数据库结构](./zh/references/database.md) | 数据库表结构 |
+| [服务](./zh/references/services.md) | 服务层文档 (KnowledgeService) |
+| [代码执行](./zh/references/code-execution.md) | 代码执行功能 |
+| [应用升级配置](./zh/references/app-upgrade.md) | 应用升级配置 |
+| [CodeBlockView 组件](./zh/references/components/code-block-view.md) | 代码块视图组件 |
+| [图像预览组件](./zh/references/components/image-preview.md) | 图像预览组件 |
+
+---
+
+## Missing Translations / 缺少翻译
+
+The following documents are only available in Chinese and need English translations:
+
+以下文档仅有中文版本，需要英文翻译：
+
+- `guides/contributing.md`
+- `guides/memory.md`
+- `guides/middleware.md`
+- `guides/sponsor.md`
+- `references/message-system.md`
+- `references/database.md`
+- `references/services.md`
+- `references/code-execution.md`

docs/en/guides/branching-strategy.md

@@ -16,7 +16,7 @@ Cherry Studio implements a structured branching strategy to maintain code qualit
   - Only accepts documentation updates and bug fixes
   - Thoroughly tested before production deployment
 
-For details about the `testplan` branch used in the Test Plan, please refer to the [Test Plan](testplan-en.md).
+For details about the `testplan` branch used in the Test Plan, please refer to the [Test Plan](./test-plan.md).
 
 ## Contributing Branches
 

docs/en/guides/i18n.md

@@ -18,11 +18,11 @@ The plugin has already been configured in the project — simply install it to g
 
 ### Demo
 
-![demo-1](./.assets.how-to-i18n/demo-1.png)
+![demo-1](../../assets/images/i18n/demo-1.png)
 
-![demo-2](./.assets.how-to-i18n/demo-2.png)
+![demo-2](../../assets/images/i18n/demo-2.png)
 
-![demo-3](./.assets.how-to-i18n/demo-3.png)
+![demo-3](../../assets/images/i18n/demo-3.png)
 
 ## i18n Conventions
 
@@ -71,7 +71,7 @@ Tools like i18n Ally cannot parse dynamic content within template strings, resul
 
 ```javascript
 // Not recommended - Plugin cannot resolve
-const message = t(`fruits.${fruit}`)
+const message = t(`fruits.${fruit}`);
 ```
 
 #### 2. **No Real-time Rendering in Editor**
@@ -91,14 +91,14 @@ For example:
 ```ts
 // src/renderer/src/i18n/label.ts
 const themeModeKeyMap = {
-  dark: 'settings.theme.dark',
+  dark: "settings.theme.dark",
-  light: 'settings.theme.light',
+  light: "settings.theme.light",
-  system: 'settings.theme.system'
+  system: "settings.theme.system",
-} as const
+} as const;
 
 export const getThemeModeLabel = (key: string): string => {
-  return themeModeKeyMap[key] ? t(themeModeKeyMap[key]) : key
+  return themeModeKeyMap[key] ? t(themeModeKeyMap[key]) : key;
-}
+};
 ```
 
 By avoiding template strings, you gain better developer experience, more reliable translation checks, and a more maintainable codebase.
@@ -107,7 +107,7 @@ By avoiding template strings, you gain better developer experience, more reliabl
 
 The project includes several scripts to automate i18n-related tasks:
 
-### `check:i18n` - Validate i18n Structure
+### `i18n:check` - Validate i18n Structure
 
 This script checks:
 
@@ -116,10 +116,10 @@ This script checks:
 - Whether keys are properly sorted
 
 ```bash
-yarn check:i18n
+yarn i18n:check
 ```
 
-### `sync:i18n` - Synchronize JSON Structure and Sort Order
+### `i18n:sync` - Synchronize JSON Structure and Sort Order
 
 This script uses `zh-cn.json` as the source of truth to sync structure across all language files, including:
 
@@ -128,14 +128,14 @@ This script uses `zh-cn.json` as the source of truth to sync structure across al
 3. Sorting keys automatically
 
 ```bash
-yarn sync:i18n
+yarn i18n:sync
 ```
 
-### `auto:i18n` - Automatically Translate Pending Texts
+### `i18n:translate` - Automatically Translate Pending Texts
 
 This script fills in texts marked as `[to be translated]` using machine translation.
 
-Typically, after adding new texts in `zh-cn.json`, run `sync:i18n`, then `auto:i18n` to complete translations.
+Typically, after adding new texts in `zh-cn.json`, run `i18n:sync`, then `i18n:translate` to complete translations.
 
 Before using this script, set the required environment variables:
 
@@ -148,30 +148,20 @@ MODEL="qwen-plus-latest"
 Alternatively, add these variables directly to your `.env` file.
 
 ```bash
-yarn auto:i18n
+yarn i18n:translate
-```
-
-### `update:i18n` - Object-level Translation Update
-
-Updates translations in language files under `src/renderer/src/i18n/translate` at the object level, preserving existing translations and only updating new content.
-
-**Not recommended** — prefer `auto:i18n` for translation tasks.
-
-```bash
-yarn update:i18n
 ```
 
 ### Workflow
 
 1. During development, first add the required text in `zh-cn.json`
 2. Confirm it displays correctly in the Chinese environment
-3. Run `yarn sync:i18n` to propagate the keys to other language files
+3. Run `yarn i18n:sync` to propagate the keys to other language files
-4. Run `yarn auto:i18n` to perform machine translation
+4. Run `yarn i18n:translate` to perform machine translation
 5. Grab a coffee and let the magic happen!
 
 ## Best Practices
 
 1. **Use Chinese as Source Language**: All development starts in Chinese, then translates to other languages.
-2. **Run Check Script Before Commit**: Use `yarn check:i18n` to catch i18n issues early.
+2. **Run Check Script Before Commit**: Use `yarn i18n:check` to catch i18n issues early.
 3. **Translate in Small Increments**: Avoid accumulating a large backlog of untranslated content.
 4. **Keep Keys Semantically Clear**: Keys should clearly express their purpose, e.g., `user.profile.avatar.upload.error`

docs/en/guides/test-plan.md

@@ -19,7 +19,7 @@ Users are welcome to submit issues or provide feedback through other channels fo
 
 ### Participating in the Test Plan
 
-Developers should submit `PRs` according to the [Contributor Guide](../CONTRIBUTING.md) (and ensure the target branch is `main`). The repository maintainers will evaluate whether the `PR` should be included in the Test Plan based on factors such as the impact of the feature on the application, its importance, and whether broader testing is needed.
+Developers should submit `PRs` according to the [Contributor Guide](../../CONTRIBUTING.md) (and ensure the target branch is `main`). The repository maintainers will evaluate whether the `PR` should be included in the Test Plan based on factors such as the impact of the feature on the application, its importance, and whether broader testing is needed.
 
 If the `PR` is added to the Test Plan, the repository maintainers will:
 

docs/en/references/components/code-block-view.md

@@ -85,7 +85,7 @@ Main responsibilities:
 - **SvgPreview**: SVG image preview
 - **GraphvizPreview**: Graphviz diagram preview
 
-All special view components share a common architecture for consistent user experience and functionality. For detailed information about these components and their implementation, see [Image Preview Components Documentation](./ImagePreview-en.md).
+All special view components share a common architecture for consistent user experience and functionality. For detailed information about these components and their implementation, see [Image Preview Components Documentation](./image-preview.md).
 
 #### StatusBar
 

docs/en/references/components/image-preview.md

@@ -192,4 +192,4 @@ Image Preview Components integrate seamlessly with CodeBlockView:
 - Shared state management
 - Responsive layout adaptation
 
-For more information about the overall CodeBlockView architecture, see [CodeBlockView Documentation](./CodeBlockView-en.md).
+For more information about the overall CodeBlockView architecture, see [CodeBlockView Documentation](./code-block-view.md).

docs/technical/Message.md

@@ -1,3 +0,0 @@
-# 消息的生命周期
-
-![image](./message-lifecycle.png)

docs/technical/db.settings.md

@@ -1,11 +0,0 @@
-# 数据库设置字段
-
-此文档包含部分字段的数据类型说明。
-
-## 字段
-
-| 字段名                         | 类型                           | 说明         |
-| ------------------------------ | ------------------------------ | ------------ |
-| `translate:target:language`    | `LanguageCode`                 | 翻译目标语言 |
-| `translate:source:language`    | `LanguageCode`                 | 翻译源语言   |
-| `translate:bidirectional:pair` | `[LanguageCode, LanguageCode]` | 双向翻译对   |

docs/technical/how-to-use-messageBlock.md

@@ -1,127 +0,0 @@
-# messageBlock.ts 使用指南
-
-该文件定义了用于管理应用程序中所有 `MessageBlock` 实体的 Redux Slice。它使用 Redux Toolkit 的 `createSlice` 和 `createEntityAdapter` 来高效地处理规范化的状态，并提供了一系列 actions 和 selectors 用于与消息块数据交互。
-
-## 核心目标
-
-- **状态管理**: 集中管理所有 `MessageBlock` 的状态。`MessageBlock` 代表消息中的不同内容单元（如文本、代码、图片、引用等）。
-- **规范化**: 使用 `createEntityAdapter` 将 `MessageBlock` 数据存储在规范化的结构中（`{ ids: [], entities: {} }`），这有助于提高性能和简化更新逻辑。
-- **可预测性**: 提供明确的 actions 来修改状态，并通过 selectors 安全地访问状态。
-
-## 关键概念
-
-- **Slice (`createSlice`)**: Redux Toolkit 的核心 API，用于创建包含 reducer 逻辑、action creators 和初始状态的 Redux 模块。
-- **Entity Adapter (`createEntityAdapter`)**: Redux Toolkit 提供的工具，用于简化对规范化数据的 CRUD（创建、读取、更新、删除）操作。它会自动生成 reducer 函数和 selectors。
-- **Selectors**: 用于从 Redux store 中派生和计算数据的函数。Selectors 可以被记忆化（memoized），以提高性能。
-
-## State 结构
-
-`messageBlocks` slice 的状态结构由 `createEntityAdapter` 定义，大致如下：
-
-```typescript
-{
-  ids: string[]; // 存储所有 MessageBlock ID 的有序列表
-  entities: { [id: string]: MessageBlock }; // 按 ID 存储 MessageBlock 对象的字典
-  loadingState: 'idle' | 'loading' | 'succeeded' | 'failed'; // (可选) 其他状态，如加载状态
-  error: string | null; // (可选) 错误信息
-}
-```
-
-## Actions
-
-该 slice 导出以下 actions (由 `createSlice` 和 `createEntityAdapter` 自动生成或自定义)：
-
-- **`upsertOneBlock(payload: MessageBlock)`**:
-
-  - 添加一个新的 `MessageBlock` 或更新一个已存在的 `MessageBlock`。如果 payload 中的 `id` 已存在，则执行更新；否则执行插入。
-
-- **`upsertManyBlocks(payload: MessageBlock[])`**:
-
-  - 添加或更新多个 `MessageBlock`。常用于批量加载数据（例如，加载一个 Topic 的所有消息块）。
-
-- **`removeOneBlock(payload: string)`**:
-
-  - 根据提供的 `id` (payload) 移除单个 `MessageBlock`。
-
-- **`removeManyBlocks(payload: string[])`**:
-
-  - 根据提供的 `id` 数组 (payload) 移除多个 `MessageBlock`。常用于删除消息或清空 Topic 时清理相关的块。
-
-- **`removeAllBlocks()`**:
-
-  - 移除 state 中的所有 `MessageBlock` 实体。
-
-- **`updateOneBlock(payload: { id: string; changes: Partial<MessageBlock> })`**:
-
-  - 更新一个已存在的 `MessageBlock`。`payload` 需要包含块的 `id` 和一个包含要更改的字段的 `changes` 对象。
-
-- **`setMessageBlocksLoading(payload: 'idle' | 'loading')`**:
-
-  - (自定义) 设置 `loadingState` 属性。
-
-- **`setMessageBlocksError(payload: string)`**:
-  - (自定义) 设置 `loadingState` 为 `'failed'` 并记录错误信息。
-
-**使用示例 (在 Thunk 或其他 Dispatch 的地方):**
-
-```typescript
-import { upsertOneBlock, removeManyBlocks, updateOneBlock } from './messageBlock'
-import store from './store' // 假设这是你的 Redux store 实例
-
-// 添加或更新一个块
-const newBlock: MessageBlock = {
-  /* ... block data ... */
-}
-store.dispatch(upsertOneBlock(newBlock))
-
-// 更新一个块的内容
-store.dispatch(updateOneBlock({ id: blockId, changes: { content: 'New content' } }))
-
-// 删除多个块
-const blockIdsToRemove = ['id1', 'id2']
-store.dispatch(removeManyBlocks(blockIdsToRemove))
-```
-
-## Selectors
-
-该 slice 导出由 `createEntityAdapter` 生成的基础 selectors，并通过 `messageBlocksSelectors` 对象访问：
-
-- **`messageBlocksSelectors.selectIds(state: RootState): string[]`**: 返回包含所有块 ID 的数组。
-- **`messageBlocksSelectors.selectEntities(state: RootState): { [id: string]: MessageBlock }`**: 返回块 ID 到块对象的映射字典。
-- **`messageBlocksSelectors.selectAll(state: RootState): MessageBlock[]`**: 返回包含所有块对象的数组。
-- **`messageBlocksSelectors.selectTotal(state: RootState): number`**: 返回块的总数。
-- **`messageBlocksSelectors.selectById(state: RootState, id: string): MessageBlock | undefined`**: 根据 ID 返回单个块对象，如果找不到则返回 `undefined`。
-
-**此外，还提供了一个自定义的、记忆化的 selector：**
-
-- **`selectFormattedCitationsByBlockId(state: RootState, blockId: string | undefined): Citation[]`**:
-  - 接收一个 `blockId`。
-  - 如果该 ID 对应的块是 `CITATION` 类型，则提取并格式化其包含的引用信息（来自网页搜索、知识库等），进行去重和重新编号，最后返回一个 `Citation[]` 数组，用于在 UI 中显示。
-  - 如果块不存在或类型不匹配，返回空数组 `[]`。
-  - 这个 selector 封装了处理不同引用来源（Gemini, OpenAI, OpenRouter, Zhipu 等）的复杂逻辑。
-
-**使用示例 (在 React 组件或 `useSelector` 中):**
-
-```typescript
-import { useSelector } from 'react-redux'
-import { messageBlocksSelectors, selectFormattedCitationsByBlockId } from './messageBlock'
-import type { RootState } from './store'
-
-// 获取所有块
-const allBlocks = useSelector(messageBlocksSelectors.selectAll)
-
-// 获取特定 ID 的块
-const specificBlock = useSelector((state: RootState) => messageBlocksSelectors.selectById(state, someBlockId))
-
-// 获取特定引用块格式化后的引用列表
-const formattedCitations = useSelector((state: RootState) => selectFormattedCitationsByBlockId(state, citationBlockId))
-
-// 在组件中使用引用数据
-// {formattedCitations.map(citation => ...)}
-```
-
-## 集成
-
-`messageBlock.ts` slice 通常与 `messageThunk.ts` 中的 Thunks 紧密协作。Thunks 负责处理异步逻辑（如 API 调用、数据库操作），并在需要时 dispatch `messageBlock` slice 的 actions 来更新状态。例如，当 `messageThunk` 接收到流式响应时，它会 dispatch `upsertOneBlock` 或 `updateOneBlock` 来实时更新对应的 `MessageBlock`。同样，删除消息的 Thunk 会 dispatch `removeManyBlocks`。
-
-理解 `messageBlock.ts` 的职责是管理**状态本身**，而 `messageThunk.ts` 负责**触发状态变更**的异步流程，这对于维护清晰的应用架构至关重要。

docs/technical/how-to-use-messageThunk.md

@@ -1,105 +0,0 @@
-# messageThunk.ts 使用指南
-
-该文件包含用于管理应用程序中消息流、处理助手交互以及同步 Redux 状态与 IndexedDB 数据库的核心 Thunk Action Creators。主要围绕 `Message` 和 `MessageBlock` 对象进行操作。
-
-## 核心功能
-
-1.  **发送/接收消息**: 处理用户消息的发送，触发助手响应，并流式处理返回的数据，将其解析为不同的 `MessageBlock`。
-2.  **状态管理**: 确保 Redux store 中的消息和消息块状态与 IndexedDB 中的持久化数据保持一致。
-3.  **消息操作**: 提供删除、重发、重新生成、编辑后重发、追加响应、克隆等消息生命周期管理功能。
-4.  **Block 处理**: 动态创建、更新和保存各种类型的 `MessageBlock`（文本、思考过程、工具调用、引用、图片、错误、翻译等）。
-
-## 主要 Thunks
-
-以下是一些关键的 Thunk 函数及其用途：
-
-1.  **`sendMessage(userMessage, userMessageBlocks, assistant, topicId)`**
-
-    - **用途**: 发送一条新的用户消息。
-    - **流程**:
-      - 保存用户消息 (`userMessage`) 及其块 (`userMessageBlocks`) 到 Redux 和 DB。
-      - 检查 `@mentions` 以确定是单模型响应还是多模型响应。
-      - 创建助手消息(们)的存根 (Stub)。
-      - 将存根添加到 Redux 和 DB。
-      - 将核心处理逻辑 `fetchAndProcessAssistantResponseImpl` 添加到该 `topicId` 的队列中以获取实际响应。
-    - **Block 相关**: 主要处理用户消息的初始 `MessageBlock` 保存。
-
-2.  **`fetchAndProcessAssistantResponseImpl(dispatch, getState, topicId, assistant, assistantMessage)`**
-
-    - **用途**: (内部函数) 获取并处理单个助手响应的核心逻辑，被 `sendMessage`, `resend...`, `regenerate...`, `append...` 等调用。
-    - **流程**:
-      - 设置 Topic 加载状态。
-      - 准备上下文消息。
-      - 调用 `fetchChatCompletion` API 服务。
-      - 使用 `createStreamProcessor` 处理流式响应。
-      - 通过各种回调 (`onTextChunk`, `onThinkingChunk`, `onToolCallComplete`, `onImageGenerated`, `onError`, `onComplete` 等) 处理不同类型的事件。
-    - **Block 相关**:
-      - 根据流事件创建初始 `UNKNOWN` 块。
-      - 实时创建和更新 `MAIN_TEXT` 和 `THINKING` 块，使用 `throttledBlockUpdate` 和 `throttledBlockDbUpdate` 进行节流更新。
-      - 创建 `TOOL`, `CITATION`, `IMAGE`, `ERROR` 等类型的块。
-      - 在事件完成时（如 `onTextComplete`, `onToolCallComplete`）将块状态标记为 `SUCCESS` 或 `ERROR`，并使用 `saveUpdatedBlockToDB` 保存最终状态。
-      - 使用 `handleBlockTransition` 管理非流式块（如 `TOOL`, `CITATION`）的添加和状态更新。
-
-3.  **`loadTopicMessagesThunk(topicId, forceReload)`**
-
-    - **用途**: 从数据库加载指定主题的所有消息及其关联的 `MessageBlock`。
-    - **流程**:
-      - 从 DB 获取 `Topic` 及其 `messages` 列表。
-      - 根据消息 ID 列表从 DB 获取所有相关的 `MessageBlock`。
-      - 使用 `upsertManyBlocks` 将块更新到 Redux。
-      - 将消息更新到 Redux。
-    - **Block 相关**: 负责将持久化的 `MessageBlock` 加载到 Redux 状态。
-
-4.  **删除 Thunks**
-
-    - `deleteSingleMessageThunk(topicId, messageId)`: 删除单个消息及其所有 `MessageBlock`。
-    - `deleteMessageGroupThunk(topicId, askId)`: 删除一个用户消息及其所有相关的助手响应消息和它们的所有 `MessageBlock`。
-    - `clearTopicMessagesThunk(topicId)`: 清空主题下的所有消息及其所有 `MessageBlock`。
-    - **Block 相关**: 从 Redux 和 DB 中移除指定的 `MessageBlock`。
-
-5.  **重发/重新生成 Thunks**
-
-    - `resendMessageThunk(topicId, userMessageToResend, assistant)`: 重发用户消息。会重置（清空 Block 并标记为 PENDING）所有与该用户消息关联的助手响应，然后重新请求生成。
-    - `resendUserMessageWithEditThunk(topicId, originalMessage, mainTextBlockId, editedContent, assistant)`: 用户编辑消息内容后重发。先更新用户消息的 `MAIN_TEXT` 块内容，然后调用 `resendMessageThunk`。
-    - `regenerateAssistantResponseThunk(topicId, assistantMessageToRegenerate, assistant)`: 重新生成单个助手响应。重置该助手消息（清空 Block 并标记为 PENDING），然后重新请求生成。
-    - **Block 相关**: 删除旧的 `MessageBlock`，并在重新生成过程中创建新的 `MessageBlock`。
-
-6.  **`appendAssistantResponseThunk(topicId, existingAssistantMessageId, newModel, assistant)`**
-
-    - **用途**: 在已有的对话上下文中，针对同一个用户问题，使用新选择的模型追加一个新的助手响应。
-    - **流程**:
-      - 找到现有助手消息以获取原始 `askId`。
-      - 创建使用 `newModel` 的新助手消息存根（使用相同的 `askId`）。
-      - 添加新存根到 Redux 和 DB。
-      - 将 `fetchAndProcessAssistantResponseImpl` 添加到队列以生成新响应。
-    - **Block 相关**: 为新的助手响应创建全新的 `MessageBlock`。
-
-7.  **`cloneMessagesToNewTopicThunk(sourceTopicId, branchPointIndex, newTopic)`**
-
-    - **用途**: 将源主题的部分消息（及其 Block）克隆到一个**已存在**的新主题中。
-    - **流程**:
-      - 复制指定索引前的消息。
-      - 为所有克隆的消息和 Block 生成新的 UUID。
-      - 正确映射克隆消息之间的 `askId` 关系。
-      - 复制 `MessageBlock` 内容，更新其 `messageId` 指向新的消息 ID。
-      - 更新文件引用计数（如果 Block 是文件或图片）。
-      - 将克隆的消息和 Block 保存到新主题的 Redux 状态和 DB 中。
-    - **Block 相关**: 创建 `MessageBlock` 的副本，并更新其 ID 和 `messageId`。
-
-8.  **`initiateTranslationThunk(messageId, topicId, targetLanguage, sourceBlockId?, sourceLanguage?)`**
-    - **用途**: 为指定消息启动翻译流程，创建一个初始的 `TRANSLATION` 类型的 `MessageBlock`。
-    - **流程**:
-      - 创建一个状态为 `STREAMING` 的 `TranslationMessageBlock`。
-      - 将其添加到 Redux 和 DB。
-      - 更新原消息的 `blocks` 列表以包含新的翻译块 ID。
-    - **Block 相关**: 创建并保存一个占位的 `TranslationMessageBlock`。实际翻译内容的获取和填充需要后续步骤。
-
-## 内部机制和注意事项
-
-- **数据库交互**: 通过 `saveMessageAndBlocksToDB`, `updateExistingMessageAndBlocksInDB`, `saveUpdatesToDB`, `saveUpdatedBlockToDB`, `throttledBlockDbUpdate` 等辅助函数与 IndexedDB (`db`) 交互，确保数据持久化。
-- **状态同步**: Thunks 负责协调 Redux Store 和 IndexedDB 之间的数据一致性。
-- **队列 (`getTopicQueue`)**: 使用 `AsyncQueue` 确保对同一主题的操作（尤其是 API 请求）按顺序执行，避免竞态条件。
-- **节流 (`throttle`)**: 对流式响应中频繁的 Block 更新（文本、思考）使用 `lodash.throttle` 优化性能，减少 Redux dispatch 和 DB 写入次数。
-- **错误处理**: `fetchAndProcessAssistantResponseImpl` 内的回调函数（特别是 `onError`）处理流处理和 API 调用中可能出现的错误，并创建 `ERROR` 类型的 `MessageBlock`。
-
-开发者在使用这些 Thunks 时，通常需要提供 `dispatch`, `getState` (由 Redux Thunk 中间件注入)，以及如 `topicId`, `assistant` 配置对象, 相关的 `Message` 或 `MessageBlock` 对象/ID 等参数。理解每个 Thunk 的职责和它如何影响消息及块的状态至关重要。

docs/technical/how-to-use-useMessageOperations.md

@@ -1,156 +0,0 @@
-# useMessageOperations.ts 使用指南
-
-该文件定义了一个名为 `useMessageOperations` 的自定义 React Hook。这个 Hook 的主要目的是为 React 组件提供一个便捷的接口，用于执行与特定主题（Topic）相关的各种消息操作。它封装了调用 Redux Thunks (`messageThunk.ts`) 和 Actions (`newMessage.ts`, `messageBlock.ts`) 的逻辑，简化了组件与消息数据交互的代码。
-
-## 核心目标
-
-- **封装**: 将复杂的消息操作逻辑（如删除、重发、重新生成、编辑、翻译等）封装在易于使用的函数中。
-- **简化**: 让组件可以直接调用这些操作函数，而无需直接与 Redux `dispatch` 或 Thunks 交互。
-- **上下文关联**: 所有操作都与传入的 `topic` 对象相关联，确保操作作用于正确的主题。
-
-## 如何使用
-
-在你的 React 函数组件中，导入并调用 `useMessageOperations` Hook，并传入当前活动的 `Topic` 对象。
-
-```typescript
-import React from 'react';
-import { useMessageOperations } from '@renderer/hooks/useMessageOperations';
-import type { Topic, Message, Assistant, Model } from '@renderer/types';
-
-interface MyComponentProps {
-  currentTopic: Topic;
-  currentAssistant: Assistant;
-}
-
-function MyComponent({ currentTopic, currentAssistant }: MyComponentProps) {
-  const {
-    deleteMessage,
-    resendMessage,
-    regenerateAssistantMessage,
-    appendAssistantResponse,
-    getTranslationUpdater,
-    createTopicBranch,
-    // ... 其他操作函数
-  } = useMessageOperations(currentTopic);
-
-  const handleDelete = (messageId: string) => {
-    deleteMessage(messageId);
-  };
-
-  const handleResend = (message: Message) => {
-    resendMessage(message, currentAssistant);
-  };
-
-  const handleAppend = (existingMsg: Message, newModel: Model) => {
-    appendAssistantResponse(existingMsg, newModel, currentAssistant);
-  }
-
-  // ... 在组件中使用其他操作函数
-
-  return (
-    <div>
-      {/* Component UI */}
-      <button onClick={() => handleDelete('some-message-id')}>Delete Message</button>
-      {/* ... */}
-    </div>
-  );
-}
-```
-
-## 返回值
-
-`useMessageOperations(topic)` Hook 返回一个包含以下函数和值的对象：
-
-- **`deleteMessage(id: string)`**:
-
-  - 删除指定 `id` 的单个消息。
-  - 内部调用 `deleteSingleMessageThunk`。
-
-- **`deleteGroupMessages(askId: string)`**:
-
-  - 删除与指定 `askId` 相关联的一组消息（通常是用户提问及其所有助手回答）。
-  - 内部调用 `deleteMessageGroupThunk`。
-
-- **`editMessage(messageId: string, updates: Partial<Message>)`**:
-
-  - 更新指定 `messageId` 的消息的部分属性。
-  - **注意**: 目前主要用于更新 Redux 状态
-  - 内部调用 `newMessagesActions.updateMessage`。
-
-- **`resendMessage(message: Message, assistant: Assistant)`**:
-
-  - 重新发送指定的用户消息 (`message`)，这将触发其所有关联助手响应的重新生成。
-  - 内部调用 `resendMessageThunk`。
-
-- **`resendUserMessageWithEdit(message: Message, editedContent: string, assistant: Assistant)`**:
-
-  - 在用户消息的主要文本块被编辑后，重新发送该消息。
-  - 会先查找消息的 `MAIN_TEXT` 块 ID，然后调用 `resendUserMessageWithEditThunk`。
-
-- **`clearTopicMessages(_topicId?: string)`**:
-
-  - 清除当前主题（或可选的指定 `_topicId`）下的所有消息。
-  - 内部调用 `clearTopicMessagesThunk`。
-
-- **`createNewContext()`**:
-
-  - 发出一个全局事件 (`EVENT_NAMES.NEW_CONTEXT`)，通常用于通知 UI 清空显示，准备新的上下文。不直接修改 Redux 状态。
-
-- **`displayCount`**:
-
-  - (非操作函数) 从 Redux store 中获取当前的 `displayCount` 值。
-
-- **`pauseMessages()`**:
-
-  - 尝试中止当前主题中正在进行的消息生成（状态为 `processing` 或 `pending`）。
-  - 通过查找相关的 `askId` 并调用 `abortCompletion` 来实现。
-  - 同时会 dispatch `setTopicLoading` action 将加载状态设为 `false`。
-
-- **`resumeMessage(message: Message, assistant: Assistant)`**:
-
-  - 恢复/重新发送一个用户消息。目前实现为直接调用 `resendMessage`。
-
-- **`regenerateAssistantMessage(message: Message, assistant: Assistant)`**:
-
-  - 重新生成指定的**助手**消息 (`message`) 的响应。
-  - 内部调用 `regenerateAssistantResponseThunk`。
-
-- **`appendAssistantResponse(existingAssistantMessage: Message, newModel: Model, assistant: Assistant)`**:
-
-  - 针对 `existingAssistantMessage` 所回复的**同一用户提问**，使用 `newModel` 追加一个新的助手响应。
-  - 内部调用 `appendAssistantResponseThunk`。
-
-- **`getTranslationUpdater(messageId: string, targetLanguage: string, sourceBlockId?: string, sourceLanguage?: string)`**:
-
-  - **用途**: 获取一个用于逐步更新翻译块内容的函数。
-  - **流程**:
-    1.  内部调用 `initiateTranslationThunk` 来创建或获取一个 `TRANSLATION` 类型的 `MessageBlock`，并获取其 `blockId`。
-    2.  返回一个**异步更新函数**。
-  - **返回的更新函数 `(accumulatedText: string, isComplete?: boolean) => void`**:
-    - 接收累积的翻译文本和完成状态。
-    - 调用 `updateOneBlock` 更新 Redux 中的翻译块内容和状态 (`STREAMING` 或 `SUCCESS`)。
-    - 调用 `throttledBlockDbUpdate` 将更新（节流地）保存到数据库。
-  - 如果初始化失败（Thunk 返回 `undefined`），则此函数返回 `null`。
-
-- **`createTopicBranch(sourceTopicId: string, branchPointIndex: number, newTopic: Topic)`**:
-  - 创建一个主题分支，将 `sourceTopicId` 主题中 `branchPointIndex` 索引之前的消息克隆到 `newTopic` 中。
-  - **注意**: `newTopic` 对象必须是调用此函数**之前**已经创建并添加到 Redux 和数据库中的。
-  - 内部调用 `cloneMessagesToNewTopicThunk`。
-
-## 依赖
-
-- **`topic: Topic`**: 必须传入当前操作上下文的主题对象。Hook 返回的操作函数将始终作用于这个主题的 `topic.id`。
-- **Redux `dispatch`**: Hook 内部使用 `useAppDispatch` 获取 `dispatch` 函数来调用 actions 和 thunks。
-
-## 相关 Hooks
-
-在同一文件中还定义了两个辅助 Hook：
-
-- **`useTopicMessages(topic: Topic)`**:
-
-  - 使用 `selectMessagesForTopic` selector 来获取并返回指定主题的消息列表。
-
-- **`useTopicLoading(topic: Topic)`**:
-  - 使用 `selectNewTopicLoading` selector 来获取并返回指定主题的加载状态。
-
-这些 Hook 可以与 `useMessageOperations` 结合使用，方便地在组件中获取消息数据、加载状态，并执行相关操作。

docs/zh/README.md

@@ -34,7 +34,7 @@
   </a>
 </h1>
 <p align="center">
-  <a href="https://github.com/CherryHQ/cherry-studio">English</a> | 中文 | <a href="https://cherry-ai.com">官方网站</a> | <a href="https://docs.cherry-ai.com/cherry-studio-wen-dang/zh-cn">文档</a> | <a href="./dev.md">开发</a> | <a href="https://github.com/CherryHQ/cherry-studio/issues">反馈</a><br>
+  <a href="https://github.com/CherryHQ/cherry-studio">English</a> | 中文 | <a href="https://cherry-ai.com">官方网站</a> | <a href="https://docs.cherry-ai.com/cherry-studio-wen-dang/zh-cn">文档</a> | <a href="./guides/development.md">开发</a> | <a href="https://github.com/CherryHQ/cherry-studio/issues">反馈</a><br>
 </p>
 
 <!-- 题头徽章组合 -->
@@ -70,7 +70,7 @@ Cherry Studio 是一款支持多个大语言模型（LLM）服务商的桌面客
 
 👏 欢迎加入 [Telegram 群组](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/wez8HtpxqQ) | [QQ群(575014769)](https://qm.qq.com/q/lo0D4qVZKi)
 
-❤️ 喜欢 Cherry Studio? 点亮小星星 🌟 或 [赞助开发者](sponsor.md)! ❤️
+❤️ 喜欢 Cherry Studio? 点亮小星星 🌟 或 [赞助开发者](./guides/sponsor.md)! ❤️
 
 # 📖 使用教程
 
@@ -181,7 +181,7 @@ https://docs.cherry-ai.com
 6. **社区参与**：加入讨论并帮助用户
 7. **推广使用**：宣传 Cherry Studio
 
-参考[分支策略](branching-strategy-zh.md)了解贡献指南
+参考[分支策略](./guides/branching-strategy.md)了解贡献指南
 
 ## 入门
 
@@ -190,7 +190,7 @@ https://docs.cherry-ai.com
 3. **提交更改**：提交并推送您的更改
 4. **打开 Pull Request**：描述您的更改和原因
 
-有关更详细的指南，请参阅我们的 [贡献指南](CONTRIBUTING.zh.md)
+有关更详细的指南，请参阅我们的 [贡献指南](./guides/contributing.md)
 
 感谢您的支持和贡献！
 

docs/zh/guides/branching-strategy.md

@@ -16,7 +16,7 @@ Cherry Studio 采用结构化的分支策略来维护代码质量并简化开发
   - 只接受文档更新和 bug 修复
   - 经过完整测试后可以发布到生产环境
 
-关于测试计划所使用的`testplan`分支，请查阅[测试计划](testplan-zh.md)。
+关于测试计划所使用的`testplan`分支，请查阅[测试计划](./test-plan.md)。
 
 ## 贡献分支
 

docs/zh/guides/contributing.md

@@ -1,6 +1,6 @@
 # Cherry Studio 贡献者指南
 
-[**English**](../CONTRIBUTING.md) | [**中文**](CONTRIBUTING.zh.md)
+[**English**](../../../CONTRIBUTING.md) | **中文**
 
 欢迎来到 Cherry Studio 的贡献者社区！我们致力于将 Cherry Studio 打造成一个长期提供价值的项目，并希望邀请更多的开发者加入我们的行列。无论您是经验丰富的开发者还是刚刚起步的初学者，您的贡献都将帮助我们更好地服务用户，提升软件质量。
 
@@ -24,7 +24,7 @@
 
 ## 开始之前
 
-请确保阅读了[行为准则](../CODE_OF_CONDUCT.md)和[LICENSE](../LICENSE)。
+请确保阅读了[行为准则](../../../CODE_OF_CONDUCT.md)和[LICENSE](../../../LICENSE)。
 
 ## 开始贡献
 
@@ -32,7 +32,7 @@
 
 ### 测试
 
-未经测试的功能等同于不存在。为确保代码真正有效，应通过单元测试和功能测试覆盖相关流程。因此，在考虑贡献时，也请考虑可测试性。所有测试均可本地运行，无需依赖 CI。请参阅[开发者指南](dev.md#test)中的“Test”部分。
+未经测试的功能等同于不存在。为确保代码真正有效，应通过单元测试和功能测试覆盖相关流程。因此，在考虑贡献时，也请考虑可测试性。所有测试均可本地运行，无需依赖 CI。请参阅[开发者指南](./development.md#test)中的"Test"部分。
 
 ### 拉取请求的自动化测试
 
@@ -60,11 +60,11 @@ git commit --signoff -m "Your commit message"
 
 ### 获取代码审查/合并
 
-维护者在此帮助您在合理时间内实现您的用例。他们会尽力在合理时间内审查您的代码并提供建设性反馈。但如果您在审查过程中受阻，或认为您的 Pull Request 未得到应有的关注，请通过 Issue 中的评论或者[社群](README.zh.md#-community)联系我们
+维护者在此帮助您在合理时间内实现您的用例。他们会尽力在合理时间内审查您的代码并提供建设性反馈。但如果您在审查过程中受阻，或认为您的 Pull Request 未得到应有的关注，请通过 Issue 中的评论或者[社群](../README.md#-community)联系我们
 
 ### 参与测试计划
 
-测试计划旨在为用户提供更稳定的应用体验和更快的迭代速度，详细情况请参阅[测试计划](testplan-zh.md)。
+测试计划旨在为用户提供更稳定的应用体验和更快的迭代速度，详细情况请参阅[测试计划](./test-plan.md)。
 
 ### 其他建议
 

docs/zh/guides/development.md

@@ -0,0 +1,73 @@
+# 🖥️ Develop
+
+## IDE Setup
+
+- Editor: [Cursor](https://www.cursor.com/), etc. Any VS Code compatible editor.
+- Linter: [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
+- Formatter: [Biome](https://marketplace.visualstudio.com/items?itemName=biomejs.biome)
+
+## Project Setup
+
+### Install
+
+```bash
+yarn
+```
+
+### Development
+
+### Setup Node.js
+
+Download and install [Node.js v22.x.x](https://nodejs.org/en/download)
+
+### Setup Yarn
+
+```bash
+corepack enable
+corepack prepare yarn@4.9.1 --activate
+```
+
+### Install Dependencies
+
+```bash
+yarn install
+```
+
+### ENV
+
+```bash
+copy .env.example .env
+```
+
+### Start
+
+```bash
+yarn dev
+```
+
+### Debug
+
+```bash
+yarn debug
+```
+
+Then input chrome://inspect in browser
+
+### Test
+
+```bash
+yarn test
+```
+
+### Build
+
+```bash
+# For windows
+$ yarn build:win
+
+# For macOS
+$ yarn build:mac
+
+# For Linux
+$ yarn build:linux
+```

docs/zh/guides/i18n.md

@@ -1,31 +1,31 @@
 # 如何优雅地做好 i18n
 
-## 使用i18n ally插件提升开发体验
+## 使用 i18n ally 插件提升开发体验
 
-i18n ally是一个强大的VSCode插件，它能在开发阶段提供实时反馈，帮助开发者更早发现文案缺失和错译问题。
+i18n ally 是一个强大的 VSCode 插件，它能在开发阶段提供实时反馈，帮助开发者更早发现文案缺失和错译问题。
 
 项目中已经配置好了插件设置，直接安装即可。
 
 ### 开发时优势
 
 - **实时预览**：翻译文案会直接显示在编辑器中
-- **错误检测**：自动追踪标记出缺失的翻译或未使用的key
+- **错误检测**：自动追踪标记出缺失的翻译或未使用的 key
-- **快速跳转**：可通过key直接跳转到定义处（Ctrl/Cmd + click)
+- **快速跳转**：可通过 key 直接跳转到定义处（Ctrl/Cmd + click)
-- **自动补全**：输入i18n key时提供自动补全建议
+- **自动补全**：输入 i18n key 时提供自动补全建议
 
 ### 效果展示
 
-![demo-1](./.assets.how-to-i18n/demo-1.png)
+![demo-1](../../assets/images/i18n/demo-1.png)
 
-![demo-2](./.assets.how-to-i18n/demo-2.png)
+![demo-2](../../assets/images/i18n/demo-2.png)
 
-![demo-3](./.assets.how-to-i18n/demo-3.png)
+![demo-3](../../assets/images/i18n/demo-3.png)
 
 ## i18n 约定
 
-### **绝对避免使用flat格式**
+### **绝对避免使用 flat 格式**
 
-绝对避免使用flat格式，如`"add.button.tip": "添加"`。应采用清晰的嵌套结构：
+绝对避免使用 flat 格式，如`"add.button.tip": "添加"`。应采用清晰的嵌套结构：
 
 ```json
 // 错误示例 - flat结构
@@ -52,14 +52,14 @@ i18n ally是一个强大的VSCode插件，它能在开发阶段提供实时反
 #### 为什么要使用嵌套结构
 
 1. **自然分组**：通过对象结构天然能将相关上下文的文案分到一个组别中
-2. **插件要求**：i18n ally 插件需要嵌套或flat格式其一的文件才能正常分析
+2. **插件要求**：i18n ally 插件需要嵌套或 flat 格式其一的文件才能正常分析
 
 ### **避免在`t()`中使用模板字符串**
 
-**强烈建议避免使用模板字符串**进行动态插值。虽然模板字符串在JavaScript开发中非常方便，但在国际化场景下会带来一系列问题。
+**强烈建议避免使用模板字符串**进行动态插值。虽然模板字符串在 JavaScript 开发中非常方便，但在国际化场景下会带来一系列问题。
 
 1. **插件无法跟踪**
-   i18n ally等工具无法解析模板字符串中的动态内容，导致：
+   i18n ally 等工具无法解析模板字符串中的动态内容，导致：
 
    - 无法正确显示实时预览
    - 无法检测翻译缺失
@@ -67,11 +67,11 @@ i18n ally是一个强大的VSCode插件，它能在开发阶段提供实时反
 
    ```javascript
    // 不推荐 - 插件无法解析
-   const message = t(`fruits.${fruit}`)
+   const message = t(`fruits.${fruit}`);
    ```
 
 2. **编辑器无法实时渲染**
-   在IDE中，模板字符串会显示为原始代码而非最终翻译结果，降低了开发体验。
+   在 IDE 中，模板字符串会显示为原始代码而非最终翻译结果，降低了开发体验。
 
 3. **更难以维护**
    由于插件无法跟踪这样的文案，编辑器中也无法渲染，开发者必须人工确认语言文件中是否存在相应的文案。
@@ -85,36 +85,36 @@ i18n ally是一个强大的VSCode插件，它能在开发阶段提供实时反
 ```ts
 // src/renderer/src/i18n/label.ts
 const themeModeKeyMap = {
-  dark: 'settings.theme.dark',
+  dark: "settings.theme.dark",
-  light: 'settings.theme.light',
+  light: "settings.theme.light",
-  system: 'settings.theme.system'
+  system: "settings.theme.system",
-} as const
+} as const;
 
 export const getThemeModeLabel = (key: string): string => {
-  return themeModeKeyMap[key] ? t(themeModeKeyMap[key]) : key
+  return themeModeKeyMap[key] ? t(themeModeKeyMap[key]) : key;
-}
+};
 ```
 
 通过避免模板字符串，可以获得更好的开发体验、更可靠的翻译检查以及更易维护的代码库。
 
 ## 自动化脚本
 
-项目中有一系列脚本来自动化i18n相关任务：
+项目中有一系列脚本来自动化 i18n 相关任务：
 
-### `check:i18n` - 检查i18n结构
+### `i18n:check` - 检查 i18n 结构
 
 此脚本会检查：
 
 - 所有语言文件是否为嵌套结构
-- 是否存在缺失的key
+- 是否存在缺失的 key
-- 是否存在多余的key
+- 是否存在多余的 key
 - 是否已经有序
 
 ```bash
-yarn check:i18n
+yarn i18n:check
 ```
 
-### `sync:i18n` - 同步json结构与排序
+### `i18n:sync` - 同步 json 结构与排序
 
 此脚本以`zh-cn.json`文件为基准，将结构同步到其他语言文件，包括：
 
@@ -123,14 +123,14 @@ yarn check:i18n
 3. 自动排序
 
 ```bash
-yarn sync:i18n
+yarn i18n:sync
 ```
 
-### `auto:i18n` - 自动翻译待翻译文本
+### `i18n:translate` - 自动翻译待翻译文本
 
 次脚本自动将标记为待翻译的文本通过机器翻译填充。
 
-通常，在`zh-cn.json`中添加所需文案后，执行`sync:i18n`即可自动完成翻译。
+通常，在`zh-cn.json`中添加所需文案后，执行`i18n:sync`即可自动完成翻译。
 
 使用该脚本前，需要配置环境变量，例如：
 
@@ -143,29 +143,19 @@ MODEL="qwen-plus-latest"
 你也可以通过直接编辑`.env`文件来添加环境变量。
 
 ```bash
-yarn auto:i18n
+yarn i18n:translate
-```
-
-### `update:i18n` - 对象级别翻译更新
-
-对`src/renderer/src/i18n/translate`中的语言文件进行对象级别的翻译更新，保留已有翻译，只更新新增内容。
-
-**不建议**使用该脚本，更推荐使用`auto:i18n`进行翻译。
-
-```bash
-yarn update:i18n
 ```
 
 ### 工作流
 
 1. 开发阶段，先在`zh-cn.json`中添加所需文案
-2. 确认在中文环境下显示无误后，使用`yarn sync:i18n`将文案同步到其他语言文件
+2. 确认在中文环境下显示无误后，使用`yarn i18n:sync`将文案同步到其他语言文件
-3. 使用`yarn auto:i18n`进行自动翻译
+3. 使用`yarn i18n:translate`进行自动翻译
 4. 喝杯咖啡，等翻译完成吧！
 
 ## 最佳实践
 
 1. **以中文为源语言**：所有开发首先使用中文，再翻译为其他语言
-2. **提交前运行检查脚本**：使用`yarn check:i18n`检查i18n是否有问题
+2. **提交前运行检查脚本**：使用`yarn i18n:check`检查 i18n 是否有问题
 3. **小步提交翻译**：避免积累大量未翻译文本
-4. **保持key语义明确**：key应能清晰表达其用途，如`user.profile.avatar.upload.error`
+4. **保持 key 语义明确**：key 应能清晰表达其用途，如`user.profile.avatar.upload.error`

docs/zh/guides/test-plan.md

@@ -19,7 +19,7 @@
 
 ### 参与测试计划
 
-开发者按照[贡献者指南](CONTRIBUTING.zh.md)要求正常提交`PR`（并注意提交target为`main`）。仓库维护者会综合考虑（例如该功能对应用的影响程度，功能的重要性，是否需要更广泛的测试等），决定该`PR`是否应加入测试计划。
+开发者按照[贡献者指南](./contributing.md)要求正常提交`PR`（并注意提交target为`main`）。仓库维护者会综合考虑（例如该功能对应用的影响程度，功能的重要性，是否需要更广泛的测试等），决定该`PR`是否应加入测试计划。
 
 若该`PR`加入测试计划，仓库维护者会做如下操作：
 

docs/zh/references/components/code-block-view.md

@@ -85,7 +85,7 @@ graph TD
 - **SvgPreview**: SVG 图像预览
 - **GraphvizPreview**: Graphviz 图表预览
 
-所有特殊视图组件共享通用架构，以确保一致的用户体验和功能。有关这些组件及其实现的详细信息，请参阅 [图像预览组件文档](./ImagePreview-zh.md)。
+所有特殊视图组件共享通用架构，以确保一致的用户体验和功能。有关这些组件及其实现的详细信息，请参阅[图像预览组件文档](./image-preview.md)。
 
 #### StatusBar 状态栏
 

docs/zh/references/components/image-preview.md

@@ -192,4 +192,4 @@ const { containerRef, error, isLoading, triggerRender, cancelRender, clearError,
 - 共享状态管理
 - 响应式布局适应
 
-有关整体 CodeBlockView 架构的更多信息，请参阅 [CodeBlockView 文档](./CodeBlockView-zh.md)。
+有关整体 CodeBlockView 架构的更多信息，请参阅 [CodeBlockView 文档](./code-block-view.md)。

docs/zh/references/database.md

@@ -1,6 +1,24 @@
-# `translate_languages` 表技术文档
+# 数据库参考文档
 
-## 📄 概述
+本文档介绍 Cherry Studio 的数据库结构，包括设置字段和翻译语言表。
+
+---
+
+## 设置字段 (settings)
+
+此部分包含设置相关字段的数据类型说明。
+
+### 翻译相关字段
+
+| 字段名                         | 类型                           | 说明         |
+| ------------------------------ | ------------------------------ | ------------ |
+| `translate:target:language`    | `LanguageCode`                 | 翻译目标语言 |
+| `translate:source:language`    | `LanguageCode`                 | 翻译源语言   |
+| `translate:bidirectional:pair` | `[LanguageCode, LanguageCode]` | 双向翻译对   |
+
+---
+
+## 翻译语言表 (translate_languages)
 
 `translate_languages` 记录用户自定义的的语言类型（`Language`）。
 

docs/zh/references/message-system.md

@@ -0,0 +1,404 @@
+# 消息系统
+
+本文档介绍 Cherry Studio 的消息系统架构，包括消息生命周期、状态管理和操作接口。
+
+## 消息的生命周期
+
+![消息生命周期](../../assets/images/message-lifecycle.png)
+
+---
+
+# messageBlock.ts 使用指南
+
+该文件定义了用于管理应用程序中所有 `MessageBlock` 实体的 Redux Slice。它使用 Redux Toolkit 的 `createSlice` 和 `createEntityAdapter` 来高效地处理规范化的状态，并提供了一系列 actions 和 selectors 用于与消息块数据交互。
+
+## 核心目标
+
+- **状态管理**: 集中管理所有 `MessageBlock` 的状态。`MessageBlock` 代表消息中的不同内容单元（如文本、代码、图片、引用等）。
+- **规范化**: 使用 `createEntityAdapter` 将 `MessageBlock` 数据存储在规范化的结构中（`{ ids: [], entities: {} }`），这有助于提高性能和简化更新逻辑。
+- **可预测性**: 提供明确的 actions 来修改状态，并通过 selectors 安全地访问状态。
+
+## 关键概念
+
+- **Slice (`createSlice`)**: Redux Toolkit 的核心 API，用于创建包含 reducer 逻辑、action creators 和初始状态的 Redux 模块。
+- **Entity Adapter (`createEntityAdapter`)**: Redux Toolkit 提供的工具，用于简化对规范化数据的 CRUD（创建、读取、更新、删除）操作。它会自动生成 reducer 函数和 selectors。
+- **Selectors**: 用于从 Redux store 中派生和计算数据的函数。Selectors 可以被记忆化（memoized），以提高性能。
+
+## State 结构
+
+`messageBlocks` slice 的状态结构由 `createEntityAdapter` 定义，大致如下：
+
+```typescript
+{
+  ids: string[]; // 存储所有 MessageBlock ID 的有序列表
+  entities: { [id: string]: MessageBlock }; // 按 ID 存储 MessageBlock 对象的字典
+  loadingState: 'idle' | 'loading' | 'succeeded' | 'failed'; // (可选) 其他状态，如加载状态
+  error: string | null; // (可选) 错误信息
+}
+```
+
+## Actions
+
+该 slice 导出以下 actions (由 `createSlice` 和 `createEntityAdapter` 自动生成或自定义)：
+
+- **`upsertOneBlock(payload: MessageBlock)`**:
+
+  - 添加一个新的 `MessageBlock` 或更新一个已存在的 `MessageBlock`。如果 payload 中的 `id` 已存在，则执行更新；否则执行插入。
+
+- **`upsertManyBlocks(payload: MessageBlock[])`**:
+
+  - 添加或更新多个 `MessageBlock`。常用于批量加载数据（例如，加载一个 Topic 的所有消息块）。
+
+- **`removeOneBlock(payload: string)`**:
+
+  - 根据提供的 `id` (payload) 移除单个 `MessageBlock`。
+
+- **`removeManyBlocks(payload: string[])`**:
+
+  - 根据提供的 `id` 数组 (payload) 移除多个 `MessageBlock`。常用于删除消息或清空 Topic 时清理相关的块。
+
+- **`removeAllBlocks()`**:
+
+  - 移除 state 中的所有 `MessageBlock` 实体。
+
+- **`updateOneBlock(payload: { id: string; changes: Partial<MessageBlock> })`**:
+
+  - 更新一个已存在的 `MessageBlock`。`payload` 需要包含块的 `id` 和一个包含要更改的字段的 `changes` 对象。
+
+- **`setMessageBlocksLoading(payload: 'idle' | 'loading')`**:
+
+  - (自定义) 设置 `loadingState` 属性。
+
+- **`setMessageBlocksError(payload: string)`**:
+  - (自定义) 设置 `loadingState` 为 `'failed'` 并记录错误信息。
+
+**使用示例 (在 Thunk 或其他 Dispatch 的地方):**
+
+```typescript
+import { upsertOneBlock, removeManyBlocks, updateOneBlock } from './messageBlock'
+import store from './store' // 假设这是你的 Redux store 实例
+
+// 添加或更新一个块
+const newBlock: MessageBlock = {
+  /* ... block data ... */
+}
+store.dispatch(upsertOneBlock(newBlock))
+
+// 更新一个块的内容
+store.dispatch(updateOneBlock({ id: blockId, changes: { content: 'New content' } }))
+
+// 删除多个块
+const blockIdsToRemove = ['id1', 'id2']
+store.dispatch(removeManyBlocks(blockIdsToRemove))
+```
+
+## Selectors
+
+该 slice 导出由 `createEntityAdapter` 生成的基础 selectors，并通过 `messageBlocksSelectors` 对象访问：
+
+- **`messageBlocksSelectors.selectIds(state: RootState): string[]`**: 返回包含所有块 ID 的数组。
+- **`messageBlocksSelectors.selectEntities(state: RootState): { [id: string]: MessageBlock }`**: 返回块 ID 到块对象的映射字典。
+- **`messageBlocksSelectors.selectAll(state: RootState): MessageBlock[]`**: 返回包含所有块对象的数组。
+- **`messageBlocksSelectors.selectTotal(state: RootState): number`**: 返回块的总数。
+- **`messageBlocksSelectors.selectById(state: RootState, id: string): MessageBlock | undefined`**: 根据 ID 返回单个块对象，如果找不到则返回 `undefined`。
+
+**此外，还提供了一个自定义的、记忆化的 selector：**
+
+- **`selectFormattedCitationsByBlockId(state: RootState, blockId: string | undefined): Citation[]`**:
+  - 接收一个 `blockId`。
+  - 如果该 ID 对应的块是 `CITATION` 类型，则提取并格式化其包含的引用信息（来自网页搜索、知识库等），进行去重和重新编号，最后返回一个 `Citation[]` 数组，用于在 UI 中显示。
+  - 如果块不存在或类型不匹配，返回空数组 `[]`。
+  - 这个 selector 封装了处理不同引用来源（Gemini, OpenAI, OpenRouter, Zhipu 等）的复杂逻辑。
+
+**使用示例 (在 React 组件或 `useSelector` 中):**
+
+```typescript
+import { useSelector } from 'react-redux'
+import { messageBlocksSelectors, selectFormattedCitationsByBlockId } from './messageBlock'
+import type { RootState } from './store'
+
+// 获取所有块
+const allBlocks = useSelector(messageBlocksSelectors.selectAll)
+
+// 获取特定 ID 的块
+const specificBlock = useSelector((state: RootState) => messageBlocksSelectors.selectById(state, someBlockId))
+
+// 获取特定引用块格式化后的引用列表
+const formattedCitations = useSelector((state: RootState) => selectFormattedCitationsByBlockId(state, citationBlockId))
+
+// 在组件中使用引用数据
+// {formattedCitations.map(citation => ...)}
+```
+
+## 集成
+
+`messageBlock.ts` slice 通常与 `messageThunk.ts` 中的 Thunks 紧密协作。Thunks 负责处理异步逻辑（如 API 调用、数据库操作），并在需要时 dispatch `messageBlock` slice 的 actions 来更新状态。例如，当 `messageThunk` 接收到流式响应时，它会 dispatch `upsertOneBlock` 或 `updateOneBlock` 来实时更新对应的 `MessageBlock`。同样，删除消息的 Thunk 会 dispatch `removeManyBlocks`。
+
+理解 `messageBlock.ts` 的职责是管理**状态本身**，而 `messageThunk.ts` 负责**触发状态变更**的异步流程，这对于维护清晰的应用架构至关重要。
+
+---
+
+# messageThunk.ts 使用指南
+
+该文件包含用于管理应用程序中消息流、处理助手交互以及同步 Redux 状态与 IndexedDB 数据库的核心 Thunk Action Creators。主要围绕 `Message` 和 `MessageBlock` 对象进行操作。
+
+## 核心功能
+
+1.  **发送/接收消息**: 处理用户消息的发送，触发助手响应，并流式处理返回的数据，将其解析为不同的 `MessageBlock`。
+2.  **状态管理**: 确保 Redux store 中的消息和消息块状态与 IndexedDB 中的持久化数据保持一致。
+3.  **消息操作**: 提供删除、重发、重新生成、编辑后重发、追加响应、克隆等消息生命周期管理功能。
+4.  **Block 处理**: 动态创建、更新和保存各种类型的 `MessageBlock`（文本、思考过程、工具调用、引用、图片、错误、翻译等）。
+
+## 主要 Thunks
+
+以下是一些关键的 Thunk 函数及其用途：
+
+1.  **`sendMessage(userMessage, userMessageBlocks, assistant, topicId)`**
+
+    - **用途**: 发送一条新的用户消息。
+    - **流程**:
+      - 保存用户消息 (`userMessage`) 及其块 (`userMessageBlocks`) 到 Redux 和 DB。
+      - 检查 `@mentions` 以确定是单模型响应还是多模型响应。
+      - 创建助手消息(们)的存根 (Stub)。
+      - 将存根添加到 Redux 和 DB。
+      - 将核心处理逻辑 `fetchAndProcessAssistantResponseImpl` 添加到该 `topicId` 的队列中以获取实际响应。
+    - **Block 相关**: 主要处理用户消息的初始 `MessageBlock` 保存。
+
+2.  **`fetchAndProcessAssistantResponseImpl(dispatch, getState, topicId, assistant, assistantMessage)`**
+
+    - **用途**: (内部函数) 获取并处理单个助手响应的核心逻辑，被 `sendMessage`, `resend...`, `regenerate...`, `append...` 等调用。
+    - **流程**:
+      - 设置 Topic 加载状态。
+      - 准备上下文消息。
+      - 调用 `fetchChatCompletion` API 服务。
+      - 使用 `createStreamProcessor` 处理流式响应。
+      - 通过各种回调 (`onTextChunk`, `onThinkingChunk`, `onToolCallComplete`, `onImageGenerated`, `onError`, `onComplete` 等) 处理不同类型的事件。
+    - **Block 相关**:
+      - 根据流事件创建初始 `UNKNOWN` 块。
+      - 实时创建和更新 `MAIN_TEXT` 和 `THINKING` 块，使用 `throttledBlockUpdate` 和 `throttledBlockDbUpdate` 进行节流更新。
+      - 创建 `TOOL`, `CITATION`, `IMAGE`, `ERROR` 等类型的块。
+      - 在事件完成时（如 `onTextComplete`, `onToolCallComplete`）将块状态标记为 `SUCCESS` 或 `ERROR`，并使用 `saveUpdatedBlockToDB` 保存最终状态。
+      - 使用 `handleBlockTransition` 管理非流式块（如 `TOOL`, `CITATION`）的添加和状态更新。
+
+3.  **`loadTopicMessagesThunk(topicId, forceReload)`**
+
+    - **用途**: 从数据库加载指定主题的所有消息及其关联的 `MessageBlock`。
+    - **流程**:
+      - 从 DB 获取 `Topic` 及其 `messages` 列表。
+      - 根据消息 ID 列表从 DB 获取所有相关的 `MessageBlock`。
+      - 使用 `upsertManyBlocks` 将块更新到 Redux。
+      - 将消息更新到 Redux。
+    - **Block 相关**: 负责将持久化的 `MessageBlock` 加载到 Redux 状态。
+
+4.  **删除 Thunks**
+
+    - `deleteSingleMessageThunk(topicId, messageId)`: 删除单个消息及其所有 `MessageBlock`。
+    - `deleteMessageGroupThunk(topicId, askId)`: 删除一个用户消息及其所有相关的助手响应消息和它们的所有 `MessageBlock`。
+    - `clearTopicMessagesThunk(topicId)`: 清空主题下的所有消息及其所有 `MessageBlock`。
+    - **Block 相关**: 从 Redux 和 DB 中移除指定的 `MessageBlock`。
+
+5.  **重发/重新生成 Thunks**
+
+    - `resendMessageThunk(topicId, userMessageToResend, assistant)`: 重发用户消息。会重置（清空 Block 并标记为 PENDING）所有与该用户消息关联的助手响应，然后重新请求生成。
+    - `resendUserMessageWithEditThunk(topicId, originalMessage, mainTextBlockId, editedContent, assistant)`: 用户编辑消息内容后重发。先更新用户消息的 `MAIN_TEXT` 块内容，然后调用 `resendMessageThunk`。
+    - `regenerateAssistantResponseThunk(topicId, assistantMessageToRegenerate, assistant)`: 重新生成单个助手响应。重置该助手消息（清空 Block 并标记为 PENDING），然后重新请求生成。
+    - **Block 相关**: 删除旧的 `MessageBlock`，并在重新生成过程中创建新的 `MessageBlock`。
+
+6.  **`appendAssistantResponseThunk(topicId, existingAssistantMessageId, newModel, assistant)`**
+
+    - **用途**: 在已有的对话上下文中，针对同一个用户问题，使用新选择的模型追加一个新的助手响应。
+    - **流程**:
+      - 找到现有助手消息以获取原始 `askId`。
+      - 创建使用 `newModel` 的新助手消息存根（使用相同的 `askId`）。
+      - 添加新存根到 Redux 和 DB。
+      - 将 `fetchAndProcessAssistantResponseImpl` 添加到队列以生成新响应。
+    - **Block 相关**: 为新的助手响应创建全新的 `MessageBlock`。
+
+7.  **`cloneMessagesToNewTopicThunk(sourceTopicId, branchPointIndex, newTopic)`**
+
+    - **用途**: 将源主题的部分消息（及其 Block）克隆到一个**已存在**的新主题中。
+    - **流程**:
+      - 复制指定索引前的消息。
+      - 为所有克隆的消息和 Block 生成新的 UUID。
+      - 正确映射克隆消息之间的 `askId` 关系。
+      - 复制 `MessageBlock` 内容，更新其 `messageId` 指向新的消息 ID。
+      - 更新文件引用计数（如果 Block 是文件或图片）。
+      - 将克隆的消息和 Block 保存到新主题的 Redux 状态和 DB 中。
+    - **Block 相关**: 创建 `MessageBlock` 的副本，并更新其 ID 和 `messageId`。
+
+8.  **`initiateTranslationThunk(messageId, topicId, targetLanguage, sourceBlockId?, sourceLanguage?)`**
+    - **用途**: 为指定消息启动翻译流程，创建一个初始的 `TRANSLATION` 类型的 `MessageBlock`。
+    - **流程**:
+      - 创建一个状态为 `STREAMING` 的 `TranslationMessageBlock`。
+      - 将其添加到 Redux 和 DB。
+      - 更新原消息的 `blocks` 列表以包含新的翻译块 ID。
+    - **Block 相关**: 创建并保存一个占位的 `TranslationMessageBlock`。实际翻译内容的获取和填充需要后续步骤。
+
+## 内部机制和注意事项
+
+- **数据库交互**: 通过 `saveMessageAndBlocksToDB`, `updateExistingMessageAndBlocksInDB`, `saveUpdatesToDB`, `saveUpdatedBlockToDB`, `throttledBlockDbUpdate` 等辅助函数与 IndexedDB (`db`) 交互，确保数据持久化。
+- **状态同步**: Thunks 负责协调 Redux Store 和 IndexedDB 之间的数据一致性。
+- **队列 (`getTopicQueue`)**: 使用 `AsyncQueue` 确保对同一主题的操作（尤其是 API 请求）按顺序执行，避免竞态条件。
+- **节流 (`throttle`)**: 对流式响应中频繁的 Block 更新（文本、思考）使用 `lodash.throttle` 优化性能，减少 Redux dispatch 和 DB 写入次数。
+- **错误处理**: `fetchAndProcessAssistantResponseImpl` 内的回调函数（特别是 `onError`）处理流处理和 API 调用中可能出现的错误，并创建 `ERROR` 类型的 `MessageBlock`。
+
+开发者在使用这些 Thunks 时，通常需要提供 `dispatch`, `getState` (由 Redux Thunk 中间件注入)，以及如 `topicId`, `assistant` 配置对象, 相关的 `Message` 或 `MessageBlock` 对象/ID 等参数。理解每个 Thunk 的职责和它如何影响消息及块的状态至关重要。
+
+---
+
+# useMessageOperations.ts 使用指南
+
+该文件定义了一个名为 `useMessageOperations` 的自定义 React Hook。这个 Hook 的主要目的是为 React 组件提供一个便捷的接口，用于执行与特定主题（Topic）相关的各种消息操作。它封装了调用 Redux Thunks (`messageThunk.ts`) 和 Actions (`newMessage.ts`, `messageBlock.ts`) 的逻辑，简化了组件与消息数据交互的代码。
+
+## 核心目标
+
+- **封装**: 将复杂的消息操作逻辑（如删除、重发、重新生成、编辑、翻译等）封装在易于使用的函数中。
+- **简化**: 让组件可以直接调用这些操作函数，而无需直接与 Redux `dispatch` 或 Thunks 交互。
+- **上下文关联**: 所有操作都与传入的 `topic` 对象相关联，确保操作作用于正确的主题。
+
+## 如何使用
+
+在你的 React 函数组件中，导入并调用 `useMessageOperations` Hook，并传入当前活动的 `Topic` 对象。
+
+```typescript
+import React from 'react';
+import { useMessageOperations } from '@renderer/hooks/useMessageOperations';
+import type { Topic, Message, Assistant, Model } from '@renderer/types';
+
+interface MyComponentProps {
+  currentTopic: Topic;
+  currentAssistant: Assistant;
+}
+
+function MyComponent({ currentTopic, currentAssistant }: MyComponentProps) {
+  const {
+    deleteMessage,
+    resendMessage,
+    regenerateAssistantMessage,
+    appendAssistantResponse,
+    getTranslationUpdater,
+    createTopicBranch,
+    // ... 其他操作函数
+  } = useMessageOperations(currentTopic);
+
+  const handleDelete = (messageId: string) => {
+    deleteMessage(messageId);
+  };
+
+  const handleResend = (message: Message) => {
+    resendMessage(message, currentAssistant);
+  };
+
+  const handleAppend = (existingMsg: Message, newModel: Model) => {
+    appendAssistantResponse(existingMsg, newModel, currentAssistant);
+  }
+
+  // ... 在组件中使用其他操作函数
+
+  return (
+    <div>
+      {/* Component UI */}
+      <button onClick={() => handleDelete('some-message-id')}>Delete Message</button>
+      {/* ... */}
+    </div>
+  );
+}
+```
+
+## 返回值
+
+`useMessageOperations(topic)` Hook 返回一个包含以下函数和值的对象：
+
+- **`deleteMessage(id: string)`**:
+
+  - 删除指定 `id` 的单个消息。
+  - 内部调用 `deleteSingleMessageThunk`。
+
+- **`deleteGroupMessages(askId: string)`**:
+
+  - 删除与指定 `askId` 相关联的一组消息（通常是用户提问及其所有助手回答）。
+  - 内部调用 `deleteMessageGroupThunk`。
+
+- **`editMessage(messageId: string, updates: Partial<Message>)`**:
+
+  - 更新指定 `messageId` 的消息的部分属性。
+  - **注意**: 目前主要用于更新 Redux 状态
+  - 内部调用 `newMessagesActions.updateMessage`。
+
+- **`resendMessage(message: Message, assistant: Assistant)`**:
+
+  - 重新发送指定的用户消息 (`message`)，这将触发其所有关联助手响应的重新生成。
+  - 内部调用 `resendMessageThunk`。
+
+- **`resendUserMessageWithEdit(message: Message, editedContent: string, assistant: Assistant)`**:
+
+  - 在用户消息的主要文本块被编辑后，重新发送该消息。
+  - 会先查找消息的 `MAIN_TEXT` 块 ID，然后调用 `resendUserMessageWithEditThunk`。
+
+- **`clearTopicMessages(_topicId?: string)`**:
+
+  - 清除当前主题（或可选的指定 `_topicId`）下的所有消息。
+  - 内部调用 `clearTopicMessagesThunk`。
+
+- **`createNewContext()`**:
+
+  - 发出一个全局事件 (`EVENT_NAMES.NEW_CONTEXT`)，通常用于通知 UI 清空显示，准备新的上下文。不直接修改 Redux 状态。
+
+- **`displayCount`**:
+
+  - (非操作函数) 从 Redux store 中获取当前的 `displayCount` 值。
+
+- **`pauseMessages()`**:
+
+  - 尝试中止当前主题中正在进行的消息生成（状态为 `processing` 或 `pending`）。
+  - 通过查找相关的 `askId` 并调用 `abortCompletion` 来实现。
+  - 同时会 dispatch `setTopicLoading` action 将加载状态设为 `false`。
+
+- **`resumeMessage(message: Message, assistant: Assistant)`**:
+
+  - 恢复/重新发送一个用户消息。目前实现为直接调用 `resendMessage`。
+
+- **`regenerateAssistantMessage(message: Message, assistant: Assistant)`**:
+
+  - 重新生成指定的**助手**消息 (`message`) 的响应。
+  - 内部调用 `regenerateAssistantResponseThunk`。
+
+- **`appendAssistantResponse(existingAssistantMessage: Message, newModel: Model, assistant: Assistant)`**:
+
+  - 针对 `existingAssistantMessage` 所回复的**同一用户提问**，使用 `newModel` 追加一个新的助手响应。
+  - 内部调用 `appendAssistantResponseThunk`。
+
+- **`getTranslationUpdater(messageId: string, targetLanguage: string, sourceBlockId?: string, sourceLanguage?: string)`**:
+
+  - **用途**: 获取一个用于逐步更新翻译块内容的函数。
+  - **流程**:
+    1.  内部调用 `initiateTranslationThunk` 来创建或获取一个 `TRANSLATION` 类型的 `MessageBlock`，并获取其 `blockId`。
+    2.  返回一个**异步更新函数**。
+  - **返回的更新函数 `(accumulatedText: string, isComplete?: boolean) => void`**:
+    - 接收累积的翻译文本和完成状态。
+    - 调用 `updateOneBlock` 更新 Redux 中的翻译块内容和状态 (`STREAMING` 或 `SUCCESS`)。
+    - 调用 `throttledBlockDbUpdate` 将更新（节流地）保存到数据库。
+  - 如果初始化失败（Thunk 返回 `undefined`），则此函数返回 `null`。
+
+- **`createTopicBranch(sourceTopicId: string, branchPointIndex: number, newTopic: Topic)`**:
+  - 创建一个主题分支，将 `sourceTopicId` 主题中 `branchPointIndex` 索引之前的消息克隆到 `newTopic` 中。
+  - **注意**: `newTopic` 对象必须是调用此函数**之前**已经创建并添加到 Redux 和数据库中的。
+  - 内部调用 `cloneMessagesToNewTopicThunk`。
+
+## 依赖
+
+- **`topic: Topic`**: 必须传入当前操作上下文的主题对象。Hook 返回的操作函数将始终作用于这个主题的 `topic.id`。
+- **Redux `dispatch`**: Hook 内部使用 `useAppDispatch` 获取 `dispatch` 函数来调用 actions 和 thunks。
+
+## 相关 Hooks
+
+在同一文件中还定义了两个辅助 Hook：
+
+- **`useTopicMessages(topic: Topic)`**:
+
+  - 使用 `selectMessagesForTopic` selector 来获取并返回指定主题的消息列表。
+
+- **`useTopicLoading(topic: Topic)`**:
+  - 使用 `selectNewTopicLoading` selector 来获取并返回指定主题的加载状态。
+
+这些 Hook 可以与 `useMessageOperations` 结合使用，方便地在组件中获取消息数据、加载状态，并执行相关操作。

electron-builder.yml

@@ -134,66 +134,38 @@ artifactBuildCompleted: scripts/artifact-build-completed.js
 releaseInfo:
   releaseNotes: |
     <!--LANG:en-->
-    What's New in v1.7.0-rc.2
+    Cherry Studio 1.7.6 - New Models & MCP Enhancements
 
-    ✨ New Features:
+    This release adds support for new AI models and includes a new MCP server for memory management.
-    - 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
 
-    🐛 Important Bug Fixes:
+    ✨ New Features
-    - Error Handling: Improved error display in AiSdkToChunkAdapter
+    - [Models] Add support for Xiaomi MiMo model
-    - Database: Optimized DatabaseManager and fixed libsql crash issues
+    - [Models] Add support for Gemini 3 Flash and Pro model detection
-    - Memory: Fixed EventEmitter memory leak in useApiServer hook
+    - [Models] Add support for Volcengine Doubao-Seed-1.8 model
-    - Messages: Fixed adjacent user messages appearing when assistant message contains error only
+    - [MCP] Add Nowledge Mem builtin MCP server for memory management
-    - Tools: Fixed missing execution state for approved tool permissions
+    - [Settings] Add default reasoning effort option to resolve confusion between undefined and none
-    - 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
 
-    ⚡ Improvements:
+    🐛 Bug Fixes
-    - SDK: Updated Google and OpenAI SDKs with new features
+    - [Azure] Restore deployment-based URLs for non-v1 apiVersion
-    - UI: Simplified knowledge base creation modal and agent creation form
+    - [Translation] Disable reasoning mode for translation to improve efficiency
-    - Tools: Replaced renderToolContent function with ToolContent component
+    - [Image] Update API path for image generation requests in OpenAIBaseClient
-    - Architecture: Namespace tool call IDs with session ID to prevent conflicts
+    - [Windows] Auto-discover and persist Git Bash path on Windows for scoop users
-    - Config: AI SDK configuration refactoring
 
     <!--LANG:zh-CN-->
-    v1.7.0-rc.2 新特性
+    Cherry Studio 1.7.6 - 新模型与 MCP 增强
 
-    ✨ 新功能:
+    本次更新添加了多个新 AI 模型支持，并新增记忆管理 MCP 服务器。
-    - AI 模型：新增 Gemini 3、Gemini 3 Pro 图像预览支持，以及 GPT-5.1
-    - 导入：ChatGPT 对话导入功能
-    - Agent：Windows Agent 的 Git Bash 检测和要求检查
-    - 搜索：支持本地语言 emoji 搜索（CLDR 数据格式）
-    - 提供商：cherryin provider 的端点类型支持
-    - 调试：启用本地崩溃 mini dump 文件，方便诊断
 
-    🐛 重要修复:
+    ✨ 新功能
-    - 错误处理：改进 AiSdkToChunkAdapter 的错误显示
+    - [模型] 添加小米 MiMo 模型支持
-    - 数据库：优化 DatabaseManager 并修复 libsql 崩溃问题
+    - [模型] 添加 Gemini 3 Flash 和 Pro 模型检测支持
-    - 内存：修复 useApiServer hook 中的 EventEmitter 内存泄漏
+    - [模型] 添加火山引擎 Doubao-Seed-1.8 模型支持
-    - 消息：修复当助手消息仅包含错误时相邻用户消息出现的问题
+    - [MCP] 新增 Nowledge Mem 内置 MCP 服务器，用于记忆管理
-    - 工具：修复批准工具权限缺少执行状态的问题
+    - [设置] 添加默认推理强度选项，解决 undefined 和 none 之间的混淆
-    - 文件处理：修复 open-mineru 处理非英文文件名时的"无此文件"错误
-    - PDF：修复 mineru PDF 验证和 403 错误
-    - 图片：修复 base64 图片保存问题
-    - 搜索：修复 URL 上下文和网络搜索功能
-    - 模型：为 GPT-5 模型添加 verbosity 参数支持
-    - UI：改进 todo 工具状态图标可见性和颜色
-    - 提供商：修复 vercel ai-gateway 和 gitcode 更新配置的 api-host
 
-    ⚡ 改进:
+    🐛 问题修复
-    - SDK：更新 Google 和 OpenAI SDK，新增功能和修复
+    - [Azure] 修复非 v1 apiVersion 的部署 URL 问题
-    - UI：简化知识库创建模态框和 agent 创建表单
+    - [翻译] 禁用翻译时的推理模式以提高效率
-    - 工具：用 ToolContent 组件替换 renderToolContent 函数，提升可读性
+    - [图像] 更新 OpenAIBaseClient 中图像生成请求的 API 路径
-    - 架构：用会话 ID 命名工具调用 ID 以防止冲突
+    - [Windows] 自动发现并保存 Windows scoop 用户的 Git Bash 路径
-    - 配置：AI SDK 配置重构
     <!--LANG:END-->

eslint.config.mjs

@@ -58,8 +58,10 @@ export default defineConfig([
       'dist/**',
       'out/**',
       'local/**',
+      'tests/**',
       '.yarn/**',
       '.gitignore',
+      '.conductor/**',
       'scripts/cloudflare-worker.js',
       'src/main/integration/nutstore/sso/lib/**',
       'src/main/integration/cherryai/index.js',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "1.7.0-rc.1",
+  "version": "1.7.6",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",
@@ -53,15 +53,16 @@
     "typecheck": "concurrently -n \"node,web\" -c \"cyan,magenta\" \"npm run typecheck:node\" \"npm run typecheck:web\"",
     "typecheck:node": "tsgo --noEmit -p tsconfig.node.json --composite false",
     "typecheck:web": "tsgo --noEmit -p tsconfig.web.json --composite false",
-    "check:i18n": "dotenv -e .env -- tsx scripts/check-i18n.ts",
+    "i18n:check": "dotenv -e .env -- tsx scripts/check-i18n.ts",
-    "sync:i18n": "dotenv -e .env -- tsx scripts/sync-i18n.ts",
+    "i18n:sync": "dotenv -e .env -- tsx scripts/sync-i18n.ts",
-    "update:i18n": "dotenv -e .env -- tsx scripts/update-i18n.ts",
+    "i18n:translate": "dotenv -e .env -- tsx scripts/auto-translate-i18n.ts",
-    "auto:i18n": "dotenv -e .env -- tsx scripts/auto-translate-i18n.ts",
+    "i18n:all": "yarn i18n:check && yarn i18n:sync && yarn i18n:translate",
     "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",
+    "test:aicore": "vitest run --project aiCore",
     "test:update": "yarn test:renderer --update",
     "test:coverage": "vitest run --coverage --silent",
     "test:ui": "vitest --ui",
@@ -69,7 +70,7 @@
     "test:e2e": "yarn playwright test",
     "test:lint": "oxlint --deny-warnings && eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --cache",
     "test:scripts": "vitest scripts",
-    "lint": "oxlint --fix && eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --cache && yarn typecheck && yarn check:i18n && yarn format:check",
+    "lint": "oxlint --fix && eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --cache && yarn typecheck && yarn i18n:check && yarn format:check",
     "format": "biome format --write && biome lint --write",
     "format:check": "biome format && biome lint",
     "prepare": "git config blame.ignoreRevsFile .git-blame-ignore-revs && husky",
@@ -80,7 +81,7 @@
     "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.30#~/.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.30-b50a299674.patch",
+    "@anthropic-ai/claude-agent-sdk": "patch:@anthropic-ai/claude-agent-sdk@npm%3A0.1.62#~/.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.62-23ae56f8c8.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",
@@ -109,15 +110,15 @@
     "@agentic/exa": "^7.3.3",
     "@agentic/searxng": "^7.3.3",
     "@agentic/tavily": "^7.3.3",
-    "@ai-sdk/amazon-bedrock": "^3.0.56",
+    "@ai-sdk/amazon-bedrock": "^3.0.61",
-    "@ai-sdk/anthropic": "^2.0.45",
+    "@ai-sdk/anthropic": "^2.0.49",
     "@ai-sdk/cerebras": "^1.0.31",
-    "@ai-sdk/gateway": "^2.0.13",
+    "@ai-sdk/gateway": "^2.0.15",
-    "@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": "patch:@ai-sdk/google@npm%3A2.0.49#~/.yarn/patches/@ai-sdk-google-npm-2.0.49-84720f41bd.patch",
-    "@ai-sdk/google-vertex": "^3.0.72",
+    "@ai-sdk/google-vertex": "^3.0.94",
     "@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/openai": "patch:@ai-sdk/openai@npm%3A2.0.85#~/.yarn/patches/@ai-sdk-openai-npm-2.0.85-27483d1d6a.patch",
     "@ai-sdk/perplexity": "^2.0.20",
     "@ai-sdk/test-server": "^0.0.1",
     "@ant-design/v5-patch-for-react-19": "^1.0.3",
@@ -141,7 +142,7 @@
     "@cherrystudio/embedjs-ollama": "^0.1.31",
     "@cherrystudio/embedjs-openai": "^0.1.31",
     "@cherrystudio/extension-table-plus": "workspace:^",
-    "@cherrystudio/openai": "^6.9.0",
+    "@cherrystudio/openai": "^6.12.0",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/modifiers": "^9.0.0",
     "@dnd-kit/sortable": "^10.0.0",
@@ -161,18 +162,18 @@
     "@langchain/core": "patch:@langchain/core@npm%3A1.0.2#~/.yarn/patches/@langchain-core-npm-1.0.2-183ef83fe4.patch",
     "@langchain/openai": "patch:@langchain/openai@npm%3A1.0.0#~/.yarn/patches/@langchain-openai-npm-1.0.0-474d0ad9d4.patch",
     "@mistralai/mistralai": "^1.7.5",
-    "@modelcontextprotocol/sdk": "^1.17.5",
+    "@modelcontextprotocol/sdk": "^1.23.0",
     "@mozilla/readability": "^0.6.0",
     "@notionhq/client": "^2.2.15",
-    "@openrouter/ai-sdk-provider": "^1.2.5",
+    "@openrouter/ai-sdk-provider": "^1.2.8",
     "@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.21",
+    "@opeoginni/github-copilot-openai-compatible": "^0.1.21",
-    "@playwright/test": "^1.52.0",
+    "@playwright/test": "^1.55.1",
     "@radix-ui/react-context-menu": "^2.2.16",
     "@reduxjs/toolkit": "^2.2.5",
     "@shikijs/markdown-it": "^3.12.0",
@@ -206,6 +207,7 @@
     "@types/content-type": "^1.1.9",
     "@types/cors": "^2.8.19",
     "@types/diff": "^7",
+    "@types/dotenv": "^8.2.3",
     "@types/express": "^5",
     "@types/fs-extra": "^11",
     "@types/he": "^1",
@@ -217,8 +219,8 @@
     "@types/mime-types": "^3",
     "@types/node": "^22.17.1",
     "@types/pako": "^1.0.2",
-    "@types/react": "^19.0.12",
+    "@types/react": "^19.2.7",
-    "@types/react-dom": "^19.0.4",
+    "@types/react-dom": "^19.2.3",
     "@types/react-infinite-scroll-component": "^5.0.0",
     "@types/react-transition-group": "^4.4.12",
     "@types/react-window": "^1",
@@ -316,12 +318,12 @@
     "motion": "^12.10.5",
     "notion-helper": "^1.3.22",
     "npx-scope-finder": "^1.2.0",
+    "ollama-ai-provider-v2": "patch:ollama-ai-provider-v2@npm%3A1.5.5#~/.yarn/patches/ollama-ai-provider-v2-npm-1.5.5-8bef249af9.patch",
     "oxlint": "^1.22.0",
     "oxlint-tsgolint": "^0.2.0",
     "p-queue": "^8.1.0",
     "pdf-lib": "^1.17.1",
     "pdf-parse": "^1.1.1",
-    "playwright": "^1.55.1",
     "proxy-agent": "^6.5.0",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
@@ -412,12 +414,10 @@
     "@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",
-    "@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.85#~/.yarn/patches/@ai-sdk-openai-npm-2.0.85-27483d1d6a.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/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-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@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/google@npm:2.0.49": "patch:@ai-sdk/google@npm%3A2.0.49#~/.yarn/patches/@ai-sdk-google-npm-2.0.49-84720f41bd.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/package.json

@@ -41,6 +41,7 @@
     "ai": "^5.0.26"
   },
   "dependencies": {
+    "@ai-sdk/openai-compatible": "^1.0.28",
     "@ai-sdk/provider": "^2.0.0",
     "@ai-sdk/provider-utils": "^3.0.17"
   },

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

@@ -2,7 +2,6 @@ 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,
@@ -10,6 +9,7 @@ import {
   OpenAISpeechModel,
   OpenAITranscriptionModel
 } from '@ai-sdk/openai/internal'
+import { OpenAICompatibleChatLanguageModel } from '@ai-sdk/openai-compatible'
 import {
   type EmbeddingModelV2,
   type ImageModelV2,
@@ -69,6 +69,7 @@ export interface CherryInProviderSettings {
   headers?: HeadersInput
   /**
    * Optional endpoint type to distinguish different endpoint behaviors.
+   * "image-generation" is also openai endpoint, but specifically for image generation.
    */
   endpointType?: 'openai' | 'openai-response' | 'anthropic' | 'gemini' | 'image-generation' | 'jina-rerank'
 }
@@ -117,7 +118,7 @@ const createCustomFetch = (originalFetch?: any) => {
     return originalFetch ? originalFetch(url, options) : fetch(url, options)
   }
 }
-class CherryInOpenAIChatLanguageModel extends OpenAIChatLanguageModel {
+class CherryInOpenAIChatLanguageModel extends OpenAICompatibleChatLanguageModel {
   constructor(modelId: string, settings: any) {
     super(modelId, {
       ...settings,

packages/aiCore/package.json

@@ -39,13 +39,13 @@
     "ai": "^5.0.26"
   },
   "dependencies": {
-    "@ai-sdk/anthropic": "^2.0.45",
+    "@ai-sdk/anthropic": "^2.0.49",
-    "@ai-sdk/azure": "^2.0.73",
+    "@ai-sdk/azure": "^2.0.87",
-    "@ai-sdk/deepseek": "^1.0.29",
+    "@ai-sdk/deepseek": "^1.0.31",
     "@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.17",
-    "@ai-sdk/xai": "^2.0.34",
+    "@ai-sdk/xai": "^2.0.36",
     "zod": "^4.1.5"
   },
   "devDependencies": {

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

@@ -3,12 +3,13 @@
  * Provides realistic mock responses for all provider types
  */
 
-import { jsonSchema, type ModelMessage, type Tool } from 'ai'
+import type { ModelMessage, Tool } from 'ai'
+import { jsonSchema } from 'ai'
 
 /**
  * Standard test messages for all scenarios
  */
-export const testMessages = {
+export const testMessages: Record<string, ModelMessage[]> = {
   simple: [{ role: 'user' as const, content: 'Hello, how are you?' }],
 
   conversation: [
@@ -45,7 +46,7 @@ export const testMessages = {
     { 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
@@ -138,68 +139,17 @@ export const testTools: Record<string, Tool> = {
   }
 }
 
-/**
- * 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
+ * Note: AI SDK v5 uses inputTokens/outputTokens instead of promptTokens/completionTokens
  */
 export const mockCompleteResponses = {
   simple: {
     text: 'This is a simple response.',
     finishReason: 'stop' as const,
     usage: {
-      promptTokens: 15,
+      inputTokens: 15,
-      completionTokens: 8,
+      outputTokens: 8,
       totalTokens: 23
     }
   },
@@ -215,8 +165,8 @@ export const mockCompleteResponses = {
     ],
     finishReason: 'tool-calls' as const,
     usage: {
-      promptTokens: 25,
+      inputTokens: 25,
-      completionTokens: 12,
+      outputTokens: 12,
       totalTokens: 37
     }
   },
@@ -225,14 +175,15 @@ export const mockCompleteResponses = {
     text: 'Response with warnings.',
     finishReason: 'stop' as const,
     usage: {
-      promptTokens: 10,
+      inputTokens: 10,
-      completionTokens: 5,
+      outputTokens: 5,
       totalTokens: 15
     },
     warnings: [
       {
         type: 'unsupported-setting' as const,
-        message: 'Temperature parameter not supported for this model'
+        setting: 'temperature',
+        details: 'Temperature parameter not supported for this model'
       }
     ]
   }
@@ -285,47 +236,3 @@ export const mockImageResponses = {
     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__/mocks/ai-sdk-provider.ts

@@ -0,0 +1,35 @@
+/**
+ * Mock for @cherrystudio/ai-sdk-provider
+ * This mock is used in tests to avoid importing the actual package
+ */
+
+export type CherryInProviderSettings = {
+  apiKey?: string
+  baseURL?: string
+}
+
+// oxlint-disable-next-line no-unused-vars
+export const createCherryIn = (_options?: CherryInProviderSettings) => ({
+  // oxlint-disable-next-line no-unused-vars
+  languageModel: (_modelId: string) => ({
+    specificationVersion: 'v1',
+    provider: 'cherryin',
+    modelId: 'mock-model',
+    doGenerate: async () => ({ text: 'mock response' }),
+    doStream: async () => ({ stream: (async function* () {})() })
+  }),
+  // oxlint-disable-next-line no-unused-vars
+  chat: (_modelId: string) => ({
+    specificationVersion: 'v1',
+    provider: 'cherryin-chat',
+    modelId: 'mock-model',
+    doGenerate: async () => ({ text: 'mock response' }),
+    doStream: async () => ({ stream: (async function* () {})() })
+  }),
+  // oxlint-disable-next-line no-unused-vars
+  textEmbeddingModel: (_modelId: string) => ({
+    specificationVersion: 'v1',
+    provider: 'cherryin',
+    modelId: 'mock-embedding-model'
+  })
+})

packages/aiCore/src/__tests__/setup.ts

@@ -0,0 +1,9 @@
+/**
+ * Vitest Setup File
+ * Global test configuration and mocks for @cherrystudio/ai-core package
+ */
+
+// Mock Vite SSR helper to avoid Node environment errors
+;(globalThis as any).__vite_ssr_exportName__ = (_name: string, value: any) => value
+
+// Note: @cherrystudio/ai-sdk-provider is mocked via alias in vitest.config.ts

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

@@ -0,0 +1,109 @@
+import { describe, expect, it } from 'vitest'
+
+import { createOpenAIOptions, createOpenRouterOptions, mergeProviderOptions } from '../factory'
+
+describe('mergeProviderOptions', () => {
+  it('deep merges provider options for the same provider', () => {
+    const reasoningOptions = createOpenRouterOptions({
+      reasoning: {
+        enabled: true,
+        effort: 'medium'
+      }
+    })
+    const webSearchOptions = createOpenRouterOptions({
+      plugins: [{ id: 'web', max_results: 5 }]
+    })
+
+    const merged = mergeProviderOptions(reasoningOptions, webSearchOptions)
+
+    expect(merged.openrouter).toEqual({
+      reasoning: {
+        enabled: true,
+        effort: 'medium'
+      },
+      plugins: [{ id: 'web', max_results: 5 }]
+    })
+  })
+
+  it('preserves options from other providers while merging', () => {
+    const openRouter = createOpenRouterOptions({
+      reasoning: { enabled: true }
+    })
+    const openAI = createOpenAIOptions({
+      reasoningEffort: 'low'
+    })
+    const merged = mergeProviderOptions(openRouter, openAI)
+
+    expect(merged.openrouter).toEqual({ reasoning: { enabled: true } })
+    expect(merged.openai).toEqual({ reasoningEffort: 'low' })
+  })
+
+  it('overwrites primitive values with later values', () => {
+    const first = createOpenAIOptions({
+      reasoningEffort: 'low',
+      user: 'user-123'
+    })
+    const second = createOpenAIOptions({
+      reasoningEffort: 'high',
+      maxToolCalls: 5
+    })
+
+    const merged = mergeProviderOptions(first, second)
+
+    expect(merged.openai).toEqual({
+      reasoningEffort: 'high', // overwritten by second
+      user: 'user-123', // preserved from first
+      maxToolCalls: 5 // added from second
+    })
+  })
+
+  it('overwrites arrays with later values instead of merging', () => {
+    const first = createOpenRouterOptions({
+      models: ['gpt-4', 'gpt-3.5-turbo']
+    })
+    const second = createOpenRouterOptions({
+      models: ['claude-3-opus', 'claude-3-sonnet']
+    })
+
+    const merged = mergeProviderOptions(first, second)
+
+    // Array is completely replaced, not merged
+    expect(merged.openrouter?.models).toEqual(['claude-3-opus', 'claude-3-sonnet'])
+  })
+
+  it('deeply merges nested objects while overwriting primitives', () => {
+    const first = createOpenRouterOptions({
+      reasoning: {
+        enabled: true,
+        effort: 'low'
+      },
+      user: 'user-123'
+    })
+    const second = createOpenRouterOptions({
+      reasoning: {
+        effort: 'high',
+        max_tokens: 500
+      },
+      user: 'user-456'
+    })
+
+    const merged = mergeProviderOptions(first, second)
+
+    expect(merged.openrouter).toEqual({
+      reasoning: {
+        enabled: true, // preserved from first
+        effort: 'high', // overwritten by second
+        max_tokens: 500 // added from second
+      },
+      user: 'user-456' // overwritten by second
+    })
+  })
+
+  it('replaces arrays instead of merging them', () => {
+    const first = createOpenRouterOptions({ plugins: [{ id: 'old' }] })
+    const second = createOpenRouterOptions({ plugins: [{ id: 'new' }] })
+    const merged = mergeProviderOptions(first, second)
+    // @ts-expect-error type-check for openrouter options is skipped. see function signature of createOpenRouterOptions
+    expect(merged.openrouter?.plugins).toEqual([{ id: 'new' }])
+  })
+})

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

@@ -26,13 +26,65 @@ export function createGenericProviderOptions<T extends string>(
   return { [provider]: options } as Record<T, Record<string, any>>
 }
 
+type PlainObject = Record<string, any>
+
+const isPlainObject = (value: unknown): value is PlainObject => {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+function deepMergeObjects<T extends PlainObject>(target: T, source: PlainObject): T {
+  const result: PlainObject = { ...target }
+  Object.entries(source).forEach(([key, value]) => {
+    if (isPlainObject(value) && isPlainObject(result[key])) {
+      result[key] = deepMergeObjects(result[key], value)
+    } else {
+      result[key] = value
+    }
+  })
+  return result as T
+}
+
 /**
- * 合并多个供应商的options
+ * Deep-merge multiple provider-specific options.
- * @param optionsMap 包含多个供应商选项的对象
+ * Nested objects are recursively merged; primitive values are overwritten.
- * @returns 合并后的TypedProviderOptions
+ *
+ * When the same key appears in multiple options:
+ * - If both values are plain objects: they are deeply merged (recursive merge)
+ * - If values are primitives/arrays: the later value overwrites the earlier one
+ *
+ * @example
+ * mergeProviderOptions(
+ *   { openrouter: { reasoning: { enabled: true, effort: 'low' }, user: 'user-123' } },
+ *   { openrouter: { reasoning: { effort: 'high', max_tokens: 500 }, models: ['gpt-4'] } }
+ * )
+ * // Result: {
+ * //   openrouter: {
+ * //     reasoning: { enabled: true, effort: 'high', max_tokens: 500 },
+ * //     user: 'user-123',
+ * //     models: ['gpt-4']
+ * //   }
+ * // }
+ *
+ * @param optionsMap Objects containing options for multiple providers
+ * @returns Fully merged TypedProviderOptions
  */
 export function mergeProviderOptions(...optionsMap: Partial<TypedProviderOptions>[]): TypedProviderOptions {
-  return Object.assign({}, ...optionsMap)
+  return optionsMap.reduce<TypedProviderOptions>((acc, options) => {
+    if (!options) {
+      return acc
+    }
+    Object.entries(options).forEach(([providerId, providerOptions]) => {
+      if (!providerOptions) {
+        return
+      }
+      if (acc[providerId]) {
+        acc[providerId] = deepMergeObjects(acc[providerId] as PlainObject, providerOptions as PlainObject)
+      } else {
+        acc[providerId] = providerOptions as any
+      }
+    })
+    return acc
+  }, {} as TypedProviderOptions)
 }
 
 /**

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

@@ -62,7 +62,7 @@ export class StreamEventManager {
     const recursiveResult = await context.recursiveCall(recursiveParams)
 
     if (recursiveResult && recursiveResult.fullStream) {
-      await this.pipeRecursiveStream(controller, recursiveResult.fullStream, context)
+      await this.pipeRecursiveStream(controller, recursiveResult.fullStream)
     } else {
       console.warn('[MCP Prompt] No fullstream found in recursive result:', recursiveResult)
     }
@@ -74,11 +74,7 @@ export class StreamEventManager {
   /**
    * 将递归流的数据传递到当前流
    */
-  private async pipeRecursiveStream(
+  private async pipeRecursiveStream(controller: StreamController, recursiveStream: ReadableStream): Promise<void> {
-    controller: StreamController,
-    recursiveStream: ReadableStream,
-    context?: AiRequestContext
-  ): Promise<void> {
     const reader = recursiveStream.getReader()
     try {
       while (true) {
@@ -86,18 +82,14 @@ export class StreamEventManager {
         if (done) {
           break
         }
-        if (value.type === 'finish') {
+        if (value.type === 'start') {
-          // 迭代的流不发finish，但需要累加其 usage
+          continue
-          if (value.usage && context?.accumulatedUsage) {
-            this.accumulateUsage(context.accumulatedUsage, value.usage)
         }
+
+        if (value.type === 'finish') {
           break
         }
-        // 对于 finish-step 类型，累加其 usage
+
-        if (value.type === 'finish-step' && value.usage && context?.accumulatedUsage) {
-          this.accumulateUsage(context.accumulatedUsage, value.usage)
-        }
-        // 将递归流的数据传递到当前流
         controller.enqueue(value)
       }
     } finally {
@@ -135,10 +127,8 @@ export class StreamEventManager {
     // 构建新的对话消息
     const newMessages: ModelMessage[] = [
       ...(context.originalParams.messages || []),
-      {
+      // 只有当 textBuffer 有内容时才添加 assistant 消息，避免空消息导致 API 错误
-        role: 'assistant',
+      ...(textBuffer ? [{ role: 'assistant' as const, content: textBuffer }] : []),
-        content: textBuffer
-      },
       {
         role: 'user',
         content: toolResultsText
@@ -161,7 +151,7 @@ export class StreamEventManager {
   /**
    * 累加 usage 数据
    */
-  private accumulateUsage(target: any, source: any): void {
+  accumulateUsage(target: any, source: any): void {
     if (!target || !source) return
 
     // 累加各种 token 类型

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

@@ -411,7 +411,10 @@ export const createPromptToolUsePlugin = (config: PromptToolUseConfig = {}) => {
               }
             }
 
-            // 如果没有执行工具调用，直接传递原始finish-step事件
+            // 如果没有执行工具调用，累加 usage 后透传 finish-step 事件
+            if (chunk.usage && context.accumulatedUsage) {
+              streamEventManager.accumulateUsage(context.accumulatedUsage, chunk.usage)
+            }
             controller.enqueue(chunk)
 
             // 清理状态

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

@@ -6,6 +6,7 @@ import { type Tool } from 'ai'
 
 import { createOpenRouterOptions, createXaiOptions, mergeProviderOptions } from '../../../options'
 import type { ProviderOptionsMap } from '../../../options/types'
+import type { AiRequestContext } from '../../'
 import type { OpenRouterSearchConfig } from './openrouter'
 
 /**
@@ -35,7 +36,6 @@ export interface WebSearchPluginConfig {
   anthropic?: AnthropicSearchConfig
   xai?: ProviderOptionsMap['xai']['searchParameters']
   google?: GoogleSearchConfig
-  'google-vertex'?: GoogleSearchConfig
   openrouter?: OpenRouterSearchConfig
 }
 
@@ -44,7 +44,6 @@ export interface WebSearchPluginConfig {
  */
 export const DEFAULT_WEB_SEARCH_CONFIG: WebSearchPluginConfig = {
   google: {},
-  'google-vertex': {},
   openai: {},
   'openai-chat': {},
   xai: {
@@ -97,55 +96,84 @@ export type WebSearchToolInputSchema = {
   'openai-chat': InferToolInput<OpenAIChatWebSearchTool>
 }
 
-export const switchWebSearchTool = (providerId: string, config: WebSearchPluginConfig, params: any) => {
+/**
-  switch (providerId) {
+ * Helper function to ensure params.tools object exists
-    case 'openai': {
+ */
-      if (config.openai) {
+const ensureToolsObject = (params: any) => {
   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) {
+ * Helper function to apply tool-based web search configuration
-        if (!params.tools) params.tools = {}
+ */
-        params.tools.web_search = anthropic.tools.webSearch_20250305(config.anthropic)
+const applyToolBasedSearch = (params: any, toolName: string, toolInstance: any) => {
-      }
+  ensureToolsObject(params)
-      break
+  params.tools[toolName] = toolInstance
-    }
+}
 
-    case 'google': {
+/**
-      // case 'google-vertex':
+ * Helper function to apply provider options-based web search configuration
-      if (!params.tools) params.tools = {}
+ */
-      params.tools.web_search = google.tools.googleSearch(config.google || {})
+const applyProviderOptionsSearch = (params: any, searchOptions: any) => {
-      break
-    }
-
-    case 'xai': {
-      if (config.xai) {
-        const searchOptions = createXaiOptions({
-          searchParameters: { ...config.xai, mode: 'on' }
-        })
   params.providerOptions = mergeProviderOptions(params.providerOptions, searchOptions)
+}
+
+export const switchWebSearchTool = (config: WebSearchPluginConfig, params: any, context?: AiRequestContext) => {
+  const providerId = context?.providerId
+
+  // Provider-specific configuration map
+  const providerHandlers: Record<string, () => void> = {
+    openai: () => {
+      const cfg = config.openai ?? DEFAULT_WEB_SEARCH_CONFIG.openai
+      applyToolBasedSearch(params, 'web_search', openai.tools.webSearch(cfg))
+    },
+    'openai-chat': () => {
+      const cfg = (config['openai-chat'] ?? DEFAULT_WEB_SEARCH_CONFIG['openai-chat']) as OpenAISearchPreviewConfig
+      applyToolBasedSearch(params, 'web_search_preview', openai.tools.webSearchPreview(cfg))
+    },
+    anthropic: () => {
+      const cfg = config.anthropic ?? DEFAULT_WEB_SEARCH_CONFIG.anthropic
+      applyToolBasedSearch(params, 'web_search', anthropic.tools.webSearch_20250305(cfg))
+    },
+    google: () => {
+      const cfg = (config.google ?? DEFAULT_WEB_SEARCH_CONFIG.google) as GoogleSearchConfig
+      applyToolBasedSearch(params, 'web_search', google.tools.googleSearch(cfg))
+    },
+    xai: () => {
+      const cfg = config.xai ?? DEFAULT_WEB_SEARCH_CONFIG.xai
+      const searchOptions = createXaiOptions({ searchParameters: { ...cfg, mode: 'on' } })
+      applyProviderOptionsSearch(params, searchOptions)
+    },
+    openrouter: () => {
+      const cfg = (config.openrouter ?? DEFAULT_WEB_SEARCH_CONFIG.openrouter) as OpenRouterSearchConfig
+      const searchOptions = createOpenRouterOptions(cfg)
+      applyProviderOptionsSearch(params, searchOptions)
     }
-      break
   }
 
-    case 'openrouter': {
+  // Try provider-specific handler first
-      if (config.openrouter) {
+  const handler = providerId && providerHandlers[providerId]
-        const searchOptions = createOpenRouterOptions(config.openrouter)
+  if (handler) {
-        params.providerOptions = mergeProviderOptions(params.providerOptions, searchOptions)
+    handler()
+    return params
   }
+
+  // Fallback: apply based on available config keys (prioritized order)
+  const fallbackOrder: Array<keyof WebSearchPluginConfig> = [
+    'openai',
+    'openai-chat',
+    'anthropic',
+    'google',
+    'xai',
+    'openrouter'
+  ]
+
+  for (const key of fallbackOrder) {
+    if (config[key]) {
+      providerHandlers[key]()
       break
     }
   }
+
   return params
 }

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

@@ -4,7 +4,6 @@
  */
 
 import { definePlugin } from '../../'
-import type { AiRequestContext } from '../../types'
 import type { WebSearchPluginConfig } from './helper'
 import { DEFAULT_WEB_SEARCH_CONFIG, switchWebSearchTool } from './helper'
 
@@ -18,15 +17,22 @@ export const webSearchPlugin = (config: WebSearchPluginConfig = DEFAULT_WEB_SEAR
     name: 'webSearch',
     enforce: 'pre',
 
-    transformParams: async (params: any, context: AiRequestContext) => {
+    transformParams: async (params: any, context) => {
-      const { providerId } = context
+      let { providerId } = context
-      switchWebSearchTool(providerId, config, params)
 
+      // For cherryin providers, extract the actual provider from the model's provider string
+      // Expected format: "cherryin.{actualProvider}" (e.g., "cherryin.gemini")
       if (providerId === 'cherryin' || providerId === 'cherryin-chat') {
-        // cherryin.gemini
+        const provider = params.model?.provider
-        const _providerId = params.model.provider.split('.')[1]
+        if (provider && typeof provider === 'string' && provider.includes('.')) {
-        switchWebSearchTool(_providerId, config, params)
+          const extractedProviderId = provider.split('.')[1]
+          if (extractedProviderId) {
+            providerId = extractedProviderId
           }
+        }
+      }
+
+      switchWebSearchTool(config, params, { ...context, providerId })
       return params
     }
   })

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

@@ -19,15 +19,20 @@ describe('Provider Schemas', () => {
       expect(Array.isArray(baseProviders)).toBe(true)
       expect(baseProviders.length).toBeGreaterThan(0)
 
+      // These are the actual base providers defined in schemas.ts
       const expectedIds = [
         'openai',
-        'openai-responses',
+        'openai-chat',
         'openai-compatible',
         'anthropic',
         'google',
         'xai',
         'azure',
-        'deepseek'
+        'azure-responses',
+        'deepseek',
+        'openrouter',
+        'cherryin',
+        'cherryin-chat'
       ]
       const actualIds = baseProviders.map((p) => p.id)
       expectedIds.forEach((id) => {

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

@@ -232,11 +232,13 @@ describe('RuntimeExecutor.generateImage', () => {
 
       expect(pluginCallOrder).toEqual(['onRequestStart', 'transformParams', 'transformResult', 'onRequestEnd'])
 
+      // transformParams receives params without model (model is handled separately)
+      // and context with core fields + dynamic fields (requestId, startTime, etc.)
       expect(testPlugin.transformParams).toHaveBeenCalledWith(
-        { prompt: 'A test image' },
+        expect.objectContaining({ prompt: 'A test image' }),
         expect.objectContaining({
           providerId: 'openai',
-          modelId: 'dall-e-3'
+          model: 'dall-e-3'
         })
       )
 
@@ -273,11 +275,12 @@ describe('RuntimeExecutor.generateImage', () => {
 
       await executorWithPlugin.generateImage({ model: 'dall-e-3', prompt: 'A test image' })
 
+      // resolveModel receives model id and context with core fields
       expect(modelResolutionPlugin.resolveModel).toHaveBeenCalledWith(
         'dall-e-3',
         expect.objectContaining({
           providerId: 'openai',
-          modelId: 'dall-e-3'
+          model: 'dall-e-3'
         })
       )
 
@@ -339,12 +342,11 @@ describe('RuntimeExecutor.generateImage', () => {
         .generateImage({ model: 'invalid-model', prompt: 'A test image' })
         .catch((error) => error)
 
-      expect(thrownError).toBeInstanceOf(ImageGenerationError)
+      // Error is thrown from pluginEngine directly as ImageModelResolutionError
-      expect(thrownError.message).toContain('Failed to generate image:')
+      expect(thrownError).toBeInstanceOf(ImageModelResolutionError)
+      expect(thrownError.message).toContain('Failed to resolve image model: invalid-model')
       expect(thrownError.providerId).toBe('openai')
       expect(thrownError.modelId).toBe('invalid-model')
-      expect(thrownError.cause).toBeInstanceOf(ImageModelResolutionError)
-      expect(thrownError.cause.message).toContain('Failed to resolve image model: invalid-model')
     })
 
     it('should handle ImageModelResolutionError without provider', async () => {
@@ -362,8 +364,9 @@ describe('RuntimeExecutor.generateImage', () => {
       const apiError = new Error('API request failed')
       vi.mocked(aiGenerateImage).mockRejectedValue(apiError)
 
+      // Error propagates directly from pluginEngine without wrapping
       await expect(executor.generateImage({ model: 'dall-e-3', prompt: 'A test image' })).rejects.toThrow(
-        'Failed to generate image:'
+        'API request failed'
       )
     })
 
@@ -376,8 +379,9 @@ describe('RuntimeExecutor.generateImage', () => {
       vi.mocked(aiGenerateImage).mockRejectedValue(noImageError)
       vi.mocked(NoImageGeneratedError.isInstance).mockReturnValue(true)
 
+      // Error propagates directly from pluginEngine
       await expect(executor.generateImage({ model: 'dall-e-3', prompt: 'A test image' })).rejects.toThrow(
-        'Failed to generate image:'
+        'No image generated'
       )
     })
 
@@ -398,15 +402,17 @@ describe('RuntimeExecutor.generateImage', () => {
         [errorPlugin]
       )
 
+      // Error propagates directly from pluginEngine
       await expect(executorWithPlugin.generateImage({ model: 'dall-e-3', prompt: 'A test image' })).rejects.toThrow(
-        'Failed to generate image:'
+        'Generation failed'
       )
 
+      // onError receives the original error and context with core fields
       expect(errorPlugin.onError).toHaveBeenCalledWith(
         error,
         expect.objectContaining({
           providerId: 'openai',
-          modelId: 'dall-e-3'
+          model: 'dall-e-3'
         })
       )
     })
@@ -419,9 +425,10 @@ describe('RuntimeExecutor.generateImage', () => {
       const abortController = new AbortController()
       setTimeout(() => abortController.abort(), 10)
 
+      // Error propagates directly from pluginEngine
       await expect(
         executor.generateImage({ model: 'dall-e-3', prompt: 'A test image', abortSignal: abortController.signal })
-      ).rejects.toThrow('Failed to generate image:')
+      ).rejects.toThrow('Operation was aborted')
     })
   })
 

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

@@ -17,10 +17,14 @@ import type { AiPlugin } from '../../plugins'
 import { globalRegistryManagement } from '../../providers/RegistryManagement'
 import { RuntimeExecutor } from '../executor'
 
-// Mock AI SDK
+// Mock AI SDK - use importOriginal to keep jsonSchema and other non-mocked exports
-vi.mock('ai', () => ({
+vi.mock('ai', async (importOriginal) => {
+  const actual = (await importOriginal()) as Record<string, unknown>
+  return {
+    ...actual,
     generateText: vi.fn()
-}))
+  }
+})
 
 vi.mock('../../providers/RegistryManagement', () => ({
   globalRegistryManagement: {
@@ -409,11 +413,12 @@ describe('RuntimeExecutor.generateText', () => {
         })
       ).rejects.toThrow('Generation failed')
 
+      // onError receives the original error and context with core fields
       expect(errorPlugin.onError).toHaveBeenCalledWith(
         error,
         expect.objectContaining({
           providerId: 'openai',
-          modelId: 'gpt-4'
+          model: 'gpt-4'
         })
       )
     })

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

@@ -11,10 +11,14 @@ import type { AiPlugin } from '../../plugins'
 import { globalRegistryManagement } from '../../providers/RegistryManagement'
 import { RuntimeExecutor } from '../executor'
 
-// Mock AI SDK
+// Mock AI SDK - use importOriginal to keep jsonSchema and other non-mocked exports
-vi.mock('ai', () => ({
+vi.mock('ai', async (importOriginal) => {
+  const actual = (await importOriginal()) as Record<string, unknown>
+  return {
+    ...actual,
     streamText: vi.fn()
-}))
+  }
+})
 
 vi.mock('../../providers/RegistryManagement', () => ({
   globalRegistryManagement: {
@@ -153,7 +157,7 @@ describe('RuntimeExecutor.streamText', () => {
   describe('Max Tokens Parameter', () => {
     const maxTokensValues = [10, 50, 100, 500, 1000, 2000, 4000]
 
-    it.each(maxTokensValues)('should support maxTokens=%s', async (maxTokens) => {
+    it.each(maxTokensValues)('should support maxOutputTokens=%s', async (maxOutputTokens) => {
       const mockStream = {
         textStream: (async function* () {
           yield 'Response'
@@ -168,12 +172,13 @@ describe('RuntimeExecutor.streamText', () => {
       await executor.streamText({
         model: 'gpt-4',
         messages: testMessages.simple,
-        maxOutputTokens: maxTokens
+        maxOutputTokens
       })
 
+      // Parameters are passed through without transformation
       expect(streamText).toHaveBeenCalledWith(
         expect.objectContaining({
-          maxTokens
+          maxOutputTokens
         })
       )
     })
@@ -513,11 +518,12 @@ describe('RuntimeExecutor.streamText', () => {
         })
       ).rejects.toThrow('Stream error')
 
+      // onError receives the original error and context with core fields
       expect(errorPlugin.onError).toHaveBeenCalledWith(
         error,
         expect.objectContaining({
           providerId: 'openai',
-          modelId: 'gpt-4'
+          model: 'gpt-4'
         })
       )
     })

packages/aiCore/vitest.config.ts

@@ -1,12 +1,20 @@
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
 import { defineConfig } from 'vitest/config'
 
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
+
 export default defineConfig({
   test: {
-    globals: true
+    globals: true,
+    setupFiles: [path.resolve(__dirname, './src/__tests__/setup.ts')]
   },
   resolve: {
     alias: {
-      '@': './src'
+      '@': path.resolve(__dirname, './src'),
+      // Mock external packages that may not be available in test environment
+      '@cherrystudio/ai-sdk-provider': path.resolve(__dirname, './src/__tests__/mocks/ai-sdk-provider.ts')
     }
   },
   esbuild: {

packages/shared/IpcChannel.ts

@@ -55,6 +55,8 @@ export enum IpcChannel {
   Webview_SetOpenLinkExternal = 'webview:set-open-link-external',
   Webview_SetSpellCheckEnabled = 'webview:set-spell-check-enabled',
   Webview_SearchHotkey = 'webview:search-hotkey',
+  Webview_PrintToPDF = 'webview:print-to-pdf',
+  Webview_SaveAsHTML = 'webview:save-as-html',
 
   // Open
   Open_Path = 'open:path',
@@ -90,6 +92,8 @@ export enum IpcChannel {
   Mcp_AbortTool = 'mcp:abort-tool',
   Mcp_GetServerVersion = 'mcp:get-server-version',
   Mcp_Progress = 'mcp:progress',
+  Mcp_GetServerLogs = 'mcp:get-server-logs',
+  Mcp_ServerLog = 'mcp:server-log',
   // Python
   Python_Execute = 'python:execute',
 
@@ -196,6 +200,9 @@ export enum IpcChannel {
   File_ValidateNotesDirectory = 'file:validateNotesDirectory',
   File_StartWatcher = 'file:startWatcher',
   File_StopWatcher = 'file:stopWatcher',
+  File_PauseWatcher = 'file:pauseWatcher',
+  File_ResumeWatcher = 'file:resumeWatcher',
+  File_BatchUploadMarkdown = 'file:batchUploadMarkdown',
   File_ShowInFolder = 'file:showInFolder',
 
   // file service
@@ -236,6 +243,9 @@ export enum IpcChannel {
   System_GetHostname = 'system:getHostname',
   System_GetCpuName = 'system:getCpuName',
   System_CheckGitBash = 'system:checkGitBash',
+  System_GetGitBashPath = 'system:getGitBashPath',
+  System_GetGitBashPathInfo = 'system:getGitBashPathInfo',
+  System_SetGitBashPath = 'system:setGitBashPath',
 
   // DevTools
   System_ToggleDevTools = 'system:toggleDevTools',
@@ -290,6 +300,8 @@ export enum IpcChannel {
   Selection_ActionWindowClose = 'selection:action-window-close',
   Selection_ActionWindowMinimize = 'selection:action-window-minimize',
   Selection_ActionWindowPin = 'selection:action-window-pin',
+  // [Windows only] Electron bug workaround - can be removed once https://github.com/electron/electron/issues/48554 is fixed
+  Selection_ActionWindowResize = 'selection:action-window-resize',
   Selection_ProcessAction = 'selection:process-action',
   Selection_UpdateActionData = 'selection:update-action-data',
 

packages/shared/config/constant.ts

@@ -7,6 +7,11 @@ export const documentExts = ['.pdf', '.doc', '.docx', '.pptx', '.xlsx', '.odt',
 export const thirdPartyApplicationExts = ['.draftsExport']
 export const bookExts = ['.epub']
 
+export const API_SERVER_DEFAULTS = {
+  HOST: '127.0.0.1',
+  PORT: 23333
+}
+
 /**
  * A flat array of all file extensions known by the linguist database.
  * This is the primary source for identifying code files.
@@ -483,3 +488,11 @@ export const MACOS_TERMINALS_WITH_COMMANDS: TerminalConfigWithCommand[] = [
 
 // resources/scripts should be maintained manually
 export const HOME_CHERRY_DIR = '.cherrystudio'
+
+// Git Bash path configuration types
+export type GitBashPathSource = 'manual' | 'auto'
+
+export interface GitBashPathInfo {
+  path: string | null
+  source: GitBashPathSource | null
+}

packages/shared/config/providers.ts

@@ -0,0 +1,48 @@
+/**
+ * @fileoverview Shared provider configuration for Claude Code and Anthropic API compatibility
+ *
+ * This module defines which models from specific providers support the Anthropic API endpoint.
+ * Used by both the Code Tools page and the Anthropic SDK client.
+ */
+
+/**
+ * Silicon provider models that support Anthropic API endpoint.
+ * These models can be used with Claude Code via the Anthropic-compatible API.
+ *
+ * @see https://docs.siliconflow.cn/cn/api-reference/chat-completions/messages
+ */
+export const SILICON_ANTHROPIC_COMPATIBLE_MODELS: readonly string[] = [
+  // DeepSeek V3.1 series
+  'Pro/deepseek-ai/DeepSeek-V3.1-Terminus',
+  'deepseek-ai/DeepSeek-V3.1',
+  'Pro/deepseek-ai/DeepSeek-V3.1',
+  // DeepSeek V3 series
+  'deepseek-ai/DeepSeek-V3',
+  'Pro/deepseek-ai/DeepSeek-V3',
+  // Moonshot/Kimi series
+  'moonshotai/Kimi-K2-Instruct-0905',
+  'Pro/moonshotai/Kimi-K2-Instruct-0905',
+  'moonshotai/Kimi-Dev-72B',
+  // Baidu ERNIE
+  'baidu/ERNIE-4.5-300B-A47B'
+]
+
+/**
+ * Creates a Set for efficient lookup of silicon Anthropic-compatible model IDs.
+ */
+const SILICON_ANTHROPIC_COMPATIBLE_MODEL_SET = new Set(SILICON_ANTHROPIC_COMPATIBLE_MODELS)
+
+/**
+ * Checks if a model ID is compatible with Anthropic API on Silicon provider.
+ *
+ * @param modelId - The model ID to check
+ * @returns true if the model supports Anthropic API endpoint
+ */
+export function isSiliconAnthropicCompatibleModel(modelId: string): boolean {
+  return SILICON_ANTHROPIC_COMPATIBLE_MODEL_SET.has(modelId)
+}
+
+/**
+ * Silicon provider's Anthropic API host URL.
+ */
+export const SILICON_ANTHROPIC_API_HOST = 'https://api.siliconflow.cn'

packages/shared/config/types.ts

@@ -10,7 +10,7 @@ export type LoaderReturn = {
   messageSource?: 'preprocess' | 'embedding' | 'validation'
 }
 
-export type FileChangeEventType = 'add' | 'change' | 'unlink' | 'addDir' | 'unlinkDir'
+export type FileChangeEventType = 'add' | 'change' | 'unlink' | 'addDir' | 'unlinkDir' | 'refresh'
 
 export type FileChangeEvent = {
   eventType: FileChangeEventType
@@ -23,6 +23,14 @@ export type MCPProgressEvent = {
   progress: number // 0-1 range
 }
 
+export type MCPServerLogEntry = {
+  timestamp: number
+  level: 'debug' | 'info' | 'warn' | 'error' | 'stderr' | 'stdout'
+  message: string
+  data?: any
+  source?: string
+}
+
 export type WebviewKeyEvent = {
   webviewId: number
   key: string

playwright.config.ts

@@ -1,42 +1,64 @@
-import { defineConfig, devices } from '@playwright/test'
+import { defineConfig } from '@playwright/test'
 
 /**
- * See https://playwright.dev/docs/test-configuration.
+ * Playwright configuration for Electron e2e testing.
+ * See https://playwright.dev/docs/test-configuration
  */
 export default defineConfig({
-  // Look for test files, relative to this configuration file.
+  // Look for test files in the specs directory
-  testDir: './tests/e2e',
+  testDir: './tests/e2e/specs',
-  /* Run tests in files in parallel */
-  fullyParallel: true,
-  /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
-  /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
-  /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : undefined,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: 'html',
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    // baseURL: 'http://localhost:3000',
 
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+  // Global timeout for each test
-    trace: 'on-first-retry'
+  timeout: 60000,
+
+  // Assertion timeout
+  expect: {
+    timeout: 10000
   },
 
-  /* Configure projects for major browsers */
+  // Electron apps should run tests sequentially to avoid conflicts
+  fullyParallel: false,
+  workers: 1,
+
+  // Fail the build on CI if you accidentally left test.only in the source code
+  forbidOnly: !!process.env.CI,
+
+  // Retry on CI only
+  retries: process.env.CI ? 2 : 0,
+
+  // Reporter configuration
+  reporter: [['html', { outputFolder: 'playwright-report' }], ['list']],
+
+  // Global setup and teardown
+  globalSetup: './tests/e2e/global-setup.ts',
+  globalTeardown: './tests/e2e/global-teardown.ts',
+
+  // Output directory for test artifacts
+  outputDir: './test-results',
+
+  // Shared settings for all tests
+  use: {
+    // Collect trace when retrying the failed test
+    trace: 'retain-on-failure',
+
+    // Take screenshot only on failure
+    screenshot: 'only-on-failure',
+
+    // Record video only on failure
+    video: 'retain-on-failure',
+
+    // Action timeout
+    actionTimeout: 15000,
+
+    // Navigation timeout
+    navigationTimeout: 30000
+  },
+
+  // Single project for Electron testing
   projects: [
     {
-      name: 'chromium',
+      name: 'electron',
-      use: { ...devices['Desktop Chrome'] }
+      testMatch: '**/*.spec.ts'
     }
   ]
-
-  /* Run your local dev server before starting the tests */
-  // webServer: {
-  //   command: 'npm run start',
-  //   url: 'http://localhost:3000',
-  //   reuseExistingServer: !process.env.CI,
-  // },
 })

resources/scripts/install-ovms.js

@@ -11,7 +11,7 @@ const OVMS_EX_URL = 'https://gitcode.com/gcw_ggDjjkY3/kjfile/releases/download/d
 
 /**
  * error code:
- * 101: Unsupported CPU (not Intel Ultra)
+ * 101: Unsupported CPU (not Intel)
  * 102: Unsupported platform (not Windows)
  * 103: Download failed
  * 104: Installation failed
@@ -213,8 +213,8 @@ async function installOvms() {
   console.log(`CPU Name: ${cpuName}`)
 
   // Check if CPU name contains "Ultra"
-  if (!cpuName.toLowerCase().includes('intel') || !cpuName.toLowerCase().includes('ultra')) {
+  if (!cpuName.toLowerCase().includes('intel')) {
-    console.error('OVMS installation requires an Intel(R) Core(TM) Ultra CPU.')
+    console.error('OVMS installation requires an Intel CPU.')
     return 101
   }
 

scripts/auto-translate-i18n.ts

@@ -50,7 +50,7 @@ Usage Instructions:
    - pt-pt (Portuguese)
 
 Run Command:
-yarn auto:i18n
+yarn i18n:translate
 
 Performance Optimization Recommendations:
 - For stable API services: MAX_CONCURRENT_TRANSLATIONS=8, TRANSLATION_DELAY_MS=50

scripts/check-i18n.ts

@@ -145,7 +145,7 @@ export function main() {
     console.log('i18n 检查已通过')
   } catch (e) {
     console.error(e)
-    throw new Error(`检查未通过。尝试运行 yarn sync:i18n 以解决问题。`)
+    throw new Error(`检查未通过。尝试运行 yarn i18n:sync 以解决问题。`)
   }
 }
 

scripts/feishu-notify.js

@@ -91,23 +91,6 @@ function createIssueCard(issueData) {
 
   return {
     elements: [
-      {
-        tag: 'div',
-        text: {
-          tag: 'lark_md',
-          content: `**🐛 New GitHub Issue #${issueNumber}**`
-        }
-      },
-      {
-        tag: 'hr'
-      },
-      {
-        tag: 'div',
-        text: {
-          tag: 'lark_md',
-          content: `**📝 Title:** ${issueTitle}`
-        }
-      },
       {
         tag: 'div',
         text: {
@@ -158,7 +141,7 @@ function createIssueCard(issueData) {
       template: 'blue',
       title: {
         tag: 'plain_text',
-        content: '🆕 Cherry Studio - New Issue'
+        content: `#${issueNumber} - ${issueTitle}`
       }
     }
   }

scripts/win-sign.js

@@ -5,9 +5,17 @@ exports.default = async function (configuration) {
     const { path } = configuration
     if (configuration.path) {
       try {
+        const certPath = process.env.CHERRY_CERT_PATH
+        const keyContainer = process.env.CHERRY_CERT_KEY
+        const csp = process.env.CHERRY_CERT_CSP
+
+        if (!certPath || !keyContainer || !csp) {
+          throw new Error('CHERRY_CERT_PATH, CHERRY_CERT_KEY or CHERRY_CERT_CSP is not set')
+        }
+
         console.log('Start code signing...')
         console.log('Signing file:', path)
-        const signCommand = `signtool sign /tr http://timestamp.comodoca.com /td sha256 /fd sha256 /a /v "${path}"`
+        const signCommand = `signtool sign /tr http://timestamp.comodoca.com /td sha256 /fd sha256 /v /f "${certPath}" /csp "${csp}" /k "${keyContainer}" "${path}"`
         execSync(signCommand, { stdio: 'inherit' })
         console.log('Code signing completed')
       } catch (error) {

src/main/apiServer/config.ts

@@ -1,3 +1,4 @@
+import { API_SERVER_DEFAULTS } from '@shared/config/constant'
 import type { ApiServerConfig } from '@types'
 import { v4 as uuidv4 } from 'uuid'
 
@@ -6,9 +7,6 @@ import { reduxService } from '../services/ReduxService'
 
 const logger = loggerService.withContext('ApiServerConfig')
 
-const defaultHost = 'localhost'
-const defaultPort = 23333
-
 class ConfigManager {
   private _config: ApiServerConfig | null = null
 
@@ -30,8 +28,8 @@ class ConfigManager {
       }
       this._config = {
         enabled: serverSettings?.enabled ?? false,
-        port: serverSettings?.port ?? defaultPort,
+        port: serverSettings?.port ?? API_SERVER_DEFAULTS.PORT,
-        host: defaultHost,
+        host: serverSettings?.host ?? API_SERVER_DEFAULTS.HOST,
         apiKey: apiKey
       }
       return this._config
@@ -39,8 +37,8 @@ class ConfigManager {
       logger.warn('Failed to load config from Redux, using defaults', { error })
       this._config = {
         enabled: false,
-        port: defaultPort,
+        port: API_SERVER_DEFAULTS.PORT,
-        host: defaultHost,
+        host: API_SERVER_DEFAULTS.HOST,
         apiKey: this.generateApiKey()
       }
       return this._config

src/main/apiServer/middleware/openapi.ts

@@ -20,8 +20,8 @@ const swaggerOptions: swaggerJSDoc.Options = {
     },
     servers: [
       {
-        url: 'http://localhost:23333',
+        url: '/',
-        description: 'Local development server'
+        description: 'Current server'
       }
     ],
     components: {

src/main/apiServer/utils/index.ts

@@ -1,6 +1,7 @@
 import { CacheService } from '@main/services/CacheService'
 import { loggerService } from '@main/services/LoggerService'
 import { reduxService } from '@main/services/ReduxService'
+import { isSiliconAnthropicCompatibleModel } from '@shared/config/providers'
 import type { ApiModel, Model, Provider } from '@types'
 
 const logger = loggerService.withContext('ApiServerUtils')
@@ -287,6 +288,8 @@ export const getProviderAnthropicModelChecker = (providerId: string): ((m: Model
       return (m: Model) => m.endpoint_type === 'anthropic'
     case 'aihubmix':
       return (m: Model) => m.id.includes('claude')
+    case 'silicon':
+      return (m: Model) => isSiliconAnthropicCompatibleModel(m.id)
     default:
       // allow all models when checker not configured
       return () => true

src/main/index.ts

@@ -19,8 +19,8 @@ import { agentService } from './services/agents'
 import { apiServerService } from './services/ApiServerService'
 import { appMenuService } from './services/AppMenuService'
 import { configManager } from './services/ConfigManager'
-import mcpService from './services/MCPService'
 import { nodeTraceService } from './services/NodeTraceService'
+import mcpService from './services/MCPService'
 import powerMonitorService from './services/PowerMonitorService'
 import {
   CHERRY_STUDIO_PROTOCOL,

src/main/ipc.ts

@@ -6,7 +6,14 @@ import { loggerService } from '@logger'
 import { isLinux, isMac, isPortable, isWin } from '@main/constant'
 import { generateSignature } from '@main/integration/cherryai'
 import anthropicService from '@main/services/AnthropicService'
-import { getBinaryPath, isBinaryExists, runInstallScript } from '@main/utils/process'
+import {
+  autoDiscoverGitBash,
+  getBinaryPath,
+  getGitBashPathInfo,
+  isBinaryExists,
+  runInstallScript,
+  validateGitBashPath
+} from '@main/utils/process'
 import { handleZoomFactor } from '@main/utils/zoom'
 import type { SpanEntity, TokenUsage } from '@mcp-trace/trace-core'
 import type { UpgradeChannel } from '@shared/config/constant'
@@ -35,7 +42,7 @@ import appService from './services/AppService'
 import AppUpdater from './services/AppUpdater'
 import BackupManager from './services/BackupManager'
 import { codeToolsService } from './services/CodeToolsService'
-import { configManager } from './services/ConfigManager'
+import { ConfigKeys, configManager } from './services/ConfigManager'
 import CopilotService from './services/CopilotService'
 import DxtService from './services/DxtService'
 import { ExportService } from './services/ExportService'
@@ -499,38 +506,60 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     }
 
     try {
-      // Check common Git Bash installation paths
+      // Use autoDiscoverGitBash to handle auto-discovery and persistence
-      const commonPaths = [
+      const bashPath = autoDiscoverGitBash()
-        path.join(process.env.ProgramFiles || 'C:\\Program Files', 'Git', 'bin', 'bash.exe'),
+      if (bashPath) {
-        path.join(process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'Git', 'bin', 'bash.exe'),
+        logger.info('Git Bash is available', { path: bashPath })
-        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
+      logger.warn('Git Bash not found. Please install Git for Windows from https://git-scm.com/downloads/win')
-      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)
+      logger.error('Unexpected error checking Git Bash', error as Error)
       return false
     }
   })
+
+  ipcMain.handle(IpcChannel.System_GetGitBashPath, () => {
+    if (!isWin) {
+      return null
+    }
+
+    const customPath = configManager.get(ConfigKeys.GitBashPath) as string | undefined
+    return customPath ?? null
+  })
+
+  // Returns { path, source } where source is 'manual' | 'auto' | null
+  ipcMain.handle(IpcChannel.System_GetGitBashPathInfo, () => {
+    return getGitBashPathInfo()
+  })
+
+  ipcMain.handle(IpcChannel.System_SetGitBashPath, (_, newPath: string | null) => {
+    if (!isWin) {
+      return false
+    }
+
+    if (!newPath) {
+      // Clear manual setting and re-run auto-discovery
+      configManager.set(ConfigKeys.GitBashPath, null)
+      configManager.set(ConfigKeys.GitBashPathSource, null)
+      // Re-run auto-discovery to restore auto-discovered path if available
+      autoDiscoverGitBash()
+      return true
+    }
+
+    const validated = validateGitBashPath(newPath)
+    if (!validated) {
+      return false
+    }
+
+    // Set path with 'manual' source
+    configManager.set(ConfigKeys.GitBashPath, validated)
+    configManager.set(ConfigKeys.GitBashPathSource, 'manual')
+    return true
+  })
+
   ipcMain.handle(IpcChannel.System_ToggleDevTools, (e) => {
     const win = BrowserWindow.fromWebContents(e.sender)
     win && win.webContents.toggleDevTools()
@@ -595,6 +624,9 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.File_ValidateNotesDirectory, fileManager.validateNotesDirectory.bind(fileManager))
   ipcMain.handle(IpcChannel.File_StartWatcher, fileManager.startFileWatcher.bind(fileManager))
   ipcMain.handle(IpcChannel.File_StopWatcher, fileManager.stopFileWatcher.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_PauseWatcher, fileManager.pauseFileWatcher.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_ResumeWatcher, fileManager.resumeFileWatcher.bind(fileManager))
+  ipcMain.handle(IpcChannel.File_BatchUploadMarkdown, fileManager.batchUploadMarkdownFiles.bind(fileManager))
   ipcMain.handle(IpcChannel.File_ShowInFolder, fileManager.showInFolder.bind(fileManager))
 
   // file service
@@ -780,6 +812,7 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.Mcp_CheckConnectivity, mcpService.checkMcpConnectivity)
   ipcMain.handle(IpcChannel.Mcp_AbortTool, mcpService.abortTool)
   ipcMain.handle(IpcChannel.Mcp_GetServerVersion, mcpService.getServerVersion)
+  ipcMain.handle(IpcChannel.Mcp_GetServerLogs, mcpService.getServerLogs)
 
   // DXT upload handler
   ipcMain.handle(IpcChannel.Mcp_UploadDxt, async (event, fileBuffer: ArrayBuffer, fileName: string) => {
@@ -858,6 +891,17 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     webview.session.setSpellCheckerEnabled(isEnable)
   })
 
+  // Webview print and save handlers
+  ipcMain.handle(IpcChannel.Webview_PrintToPDF, async (_, webviewId: number) => {
+    const { printWebviewToPDF } = await import('./services/WebviewService')
+    return await printWebviewToPDF(webviewId)
+  })
+
+  ipcMain.handle(IpcChannel.Webview_SaveAsHTML, async (_, webviewId: number) => {
+    const { saveWebviewAsHTML } = await import('./services/WebviewService')
+    return await saveWebviewAsHTML(webviewId)
+  })
+
   // store sync
   storeSyncService.registerIpcHandler()
 

src/main/knowledge/embedjs/embeddings/EmbeddingsFactory.ts

@@ -19,19 +19,9 @@ export default class EmbeddingsFactory {
       })
     }
     if (provider === 'ollama') {
-      if (baseURL.includes('v1/')) {
       return new OllamaEmbeddings({
         model: model,
-          baseUrl: baseURL.replace('v1/', ''),
+        baseUrl: baseURL.replace(/\/api$/, ''),
-          requestOptions: {
-            // @ts-ignore expected
-            'encoding-format': 'float'
-          }
-        })
-      }
-      return new OllamaEmbeddings({
-        model: model,
-        baseUrl: baseURL,
         requestOptions: {
           // @ts-ignore expected
           'encoding-format': 'float'

src/main/mcpServers/__tests__/browser.test.ts

@@ -0,0 +1,134 @@
+import { describe, expect, it, vi } from 'vitest'
+
+vi.mock('electron', () => {
+  const sendCommand = vi.fn(async (command: string, params?: { expression?: string }) => {
+    if (command === 'Runtime.evaluate') {
+      if (params?.expression === 'document.documentElement.outerHTML') {
+        return { result: { value: '<html><body><h1>Test</h1><p>Content</p></body></html>' } }
+      }
+      if (params?.expression === 'document.body.innerText') {
+        return { result: { value: 'Test\nContent' } }
+      }
+      return { result: { value: 'ok' } }
+    }
+    return {}
+  })
+
+  const debuggerObj = {
+    isAttached: vi.fn(() => true),
+    attach: vi.fn(),
+    detach: vi.fn(),
+    sendCommand
+  }
+
+  const webContents = {
+    debugger: debuggerObj,
+    setUserAgent: vi.fn(),
+    getURL: vi.fn(() => 'https://example.com/'),
+    getTitle: vi.fn(async () => 'Example Title'),
+    once: vi.fn(),
+    removeListener: vi.fn(),
+    on: vi.fn()
+  }
+
+  const loadURL = vi.fn(async () => {})
+
+  const windows: any[] = []
+
+  class MockBrowserWindow {
+    private destroyed = false
+    public webContents = webContents
+    public loadURL = loadURL
+    public isDestroyed = vi.fn(() => this.destroyed)
+    public close = vi.fn(() => {
+      this.destroyed = true
+    })
+    public destroy = vi.fn(() => {
+      this.destroyed = true
+    })
+    public on = vi.fn()
+
+    constructor() {
+      windows.push(this)
+    }
+  }
+
+  const app = {
+    isReady: vi.fn(() => true),
+    whenReady: vi.fn(async () => {}),
+    on: vi.fn()
+  }
+
+  return {
+    BrowserWindow: MockBrowserWindow as any,
+    app,
+    __mockDebugger: debuggerObj,
+    __mockSendCommand: sendCommand,
+    __mockLoadURL: loadURL,
+    __mockWindows: windows
+  }
+})
+
+import * as electron from 'electron'
+const { __mockWindows } = electron as typeof electron & { __mockWindows: any[] }
+
+import { CdpBrowserController } from '../browser'
+
+describe('CdpBrowserController', () => {
+  it('executes single-line code via Runtime.evaluate', async () => {
+    const controller = new CdpBrowserController()
+    const result = await controller.execute('1+1')
+    expect(result).toBe('ok')
+  })
+
+  it('opens a URL (hidden) and returns current page info', async () => {
+    const controller = new CdpBrowserController()
+    const result = await controller.open('https://foo.bar/', 5000, false)
+    expect(result.currentUrl).toBe('https://example.com/')
+    expect(result.title).toBe('Example Title')
+  })
+
+  it('opens a URL (visible) when show=true', async () => {
+    const controller = new CdpBrowserController()
+    const result = await controller.open('https://foo.bar/', 5000, true, 'session-a')
+    expect(result.currentUrl).toBe('https://example.com/')
+    expect(result.title).toBe('Example Title')
+  })
+
+  it('reuses session for execute and supports multiline', async () => {
+    const controller = new CdpBrowserController()
+    await controller.open('https://foo.bar/', 5000, false, 'session-b')
+    const result = await controller.execute('const a=1; const b=2; a+b;', 5000, 'session-b')
+    expect(result).toBe('ok')
+  })
+
+  it('evicts least recently used session when exceeding maxSessions', async () => {
+    const controller = new CdpBrowserController({ maxSessions: 2, idleTimeoutMs: 1000 * 60 })
+    await controller.open('https://foo.bar/', 5000, false, 's1')
+    await controller.open('https://foo.bar/', 5000, false, 's2')
+    await controller.open('https://foo.bar/', 5000, false, 's3')
+    const destroyedCount = __mockWindows.filter(
+      (w: any) => w.destroy.mock.calls.length > 0 || w.close.mock.calls.length > 0
+    ).length
+    expect(destroyedCount).toBeGreaterThanOrEqual(1)
+  })
+
+  it('fetches URL and returns html format', async () => {
+    const controller = new CdpBrowserController()
+    const result = await controller.fetch('https://example.com/', 'html')
+    expect(result).toBe('<html><body><h1>Test</h1><p>Content</p></body></html>')
+  })
+
+  it('fetches URL and returns txt format', async () => {
+    const controller = new CdpBrowserController()
+    const result = await controller.fetch('https://example.com/', 'txt')
+    expect(result).toBe('Test\nContent')
+  })
+
+  it('fetches URL and returns markdown format (default)', async () => {
+    const controller = new CdpBrowserController()
+    const result = await controller.fetch('https://example.com/')
+    expect(typeof result).toBe('string')
+    expect(result).toContain('Test')
+  })
+})

src/main/mcpServers/browser/controller.ts

@@ -0,0 +1,307 @@
+import { app, BrowserWindow } from 'electron'
+import TurndownService from 'turndown'
+
+import { logger, userAgent } from './types'
+
+/**
+ * Controller for managing browser windows via Chrome DevTools Protocol (CDP).
+ * Supports multiple sessions with LRU eviction and idle timeout cleanup.
+ */
+export class CdpBrowserController {
+  private windows: Map<string, { win: BrowserWindow; lastActive: number }> = new Map()
+  private readonly maxSessions: number
+  private readonly idleTimeoutMs: number
+
+  constructor(options?: { maxSessions?: number; idleTimeoutMs?: number }) {
+    this.maxSessions = options?.maxSessions ?? 5
+    this.idleTimeoutMs = options?.idleTimeoutMs ?? 5 * 60 * 1000
+  }
+
+  private async ensureAppReady() {
+    if (!app.isReady()) {
+      await app.whenReady()
+    }
+  }
+
+  private touch(sessionId: string) {
+    const entry = this.windows.get(sessionId)
+    if (entry) entry.lastActive = Date.now()
+  }
+
+  private closeWindow(win: BrowserWindow, sessionId: string) {
+    try {
+      if (!win.isDestroyed()) {
+        if (win.webContents.debugger.isAttached()) {
+          win.webContents.debugger.detach()
+        }
+        win.close()
+      }
+    } catch (error) {
+      logger.warn('Error closing window', { error, sessionId })
+    }
+  }
+
+  private async ensureDebuggerAttached(dbg: Electron.Debugger, sessionId: string) {
+    if (!dbg.isAttached()) {
+      try {
+        logger.info('Attaching debugger', { sessionId })
+        dbg.attach('1.3')
+        await dbg.sendCommand('Page.enable')
+        await dbg.sendCommand('Runtime.enable')
+        logger.info('Debugger attached and domains enabled')
+      } catch (error) {
+        logger.error('Failed to attach debugger', { error })
+        throw error
+      }
+    }
+  }
+
+  private sweepIdle() {
+    const now = Date.now()
+    for (const [id, entry] of this.windows.entries()) {
+      if (now - entry.lastActive > this.idleTimeoutMs) {
+        this.closeWindow(entry.win, id)
+        this.windows.delete(id)
+      }
+    }
+  }
+
+  private evictIfNeeded(newSessionId: string) {
+    if (this.windows.size < this.maxSessions) return
+    let lruId: string | null = null
+    let lruTime = Number.POSITIVE_INFINITY
+    for (const [id, entry] of this.windows.entries()) {
+      if (id === newSessionId) continue
+      if (entry.lastActive < lruTime) {
+        lruTime = entry.lastActive
+        lruId = id
+      }
+    }
+    if (lruId) {
+      const entry = this.windows.get(lruId)
+      if (entry) {
+        this.closeWindow(entry.win, lruId)
+      }
+      this.windows.delete(lruId)
+      logger.info('Evicted session to respect maxSessions', { evicted: lruId })
+    }
+  }
+
+  private async getWindow(sessionId = 'default', forceNew = false, show = false): Promise<BrowserWindow> {
+    await this.ensureAppReady()
+
+    this.sweepIdle()
+
+    const existing = this.windows.get(sessionId)
+    if (existing && !existing.win.isDestroyed() && !forceNew) {
+      this.touch(sessionId)
+      return existing.win
+    }
+
+    if (existing && !existing.win.isDestroyed() && forceNew) {
+      try {
+        if (existing.win.webContents.debugger.isAttached()) {
+          existing.win.webContents.debugger.detach()
+        }
+      } catch (error) {
+        logger.warn('Error detaching debugger before recreate', { error, sessionId })
+      }
+      existing.win.destroy()
+      this.windows.delete(sessionId)
+    }
+
+    this.evictIfNeeded(sessionId)
+
+    const win = new BrowserWindow({
+      show,
+      webPreferences: {
+        contextIsolation: true,
+        sandbox: true,
+        nodeIntegration: false,
+        devTools: true
+      }
+    })
+
+    // Use a standard Chrome UA to avoid some anti-bot blocks
+    win.webContents.setUserAgent(userAgent)
+
+    // Log navigation lifecycle to help diagnose slow loads
+    win.webContents.on('did-start-loading', () => logger.info(`did-start-loading`, { sessionId }))
+    win.webContents.on('dom-ready', () => logger.info(`dom-ready`, { sessionId }))
+    win.webContents.on('did-finish-load', () => logger.info(`did-finish-load`, { sessionId }))
+    win.webContents.on('did-fail-load', (_e, code, desc) => logger.warn('Navigation failed', { code, desc }))
+
+    win.on('closed', () => {
+      this.windows.delete(sessionId)
+    })
+
+    this.windows.set(sessionId, { win, lastActive: Date.now() })
+    return win
+  }
+
+  /**
+   * Opens a URL in a browser window and waits for navigation to complete.
+   * @param url - The URL to navigate to
+   * @param timeout - Navigation timeout in milliseconds (default: 10000)
+   * @param show - Whether to show the browser window (default: false)
+   * @param sessionId - Session identifier for window reuse (default: 'default')
+   * @returns Object containing the current URL and page title after navigation
+   */
+  public async open(url: string, timeout = 10000, show = false, sessionId = 'default') {
+    const win = await this.getWindow(sessionId, true, show)
+    logger.info('Loading URL', { url, sessionId })
+    const { webContents } = win
+    this.touch(sessionId)
+
+    // Track resolution state to prevent multiple handlers from firing
+    let resolved = false
+    let onFinish: () => void
+    let onDomReady: () => void
+    let onFail: (_event: Electron.Event, code: number, desc: string) => void
+
+    // Define cleanup outside Promise to ensure it's callable in finally block,
+    // preventing memory leaks when timeout occurs before navigation completes
+    const cleanup = () => {
+      webContents.removeListener('did-finish-load', onFinish)
+      webContents.removeListener('did-fail-load', onFail)
+      webContents.removeListener('dom-ready', onDomReady)
+    }
+
+    const loadPromise = new Promise<void>((resolve, reject) => {
+      onFinish = () => {
+        if (resolved) return
+        resolved = true
+        cleanup()
+        resolve()
+      }
+      onDomReady = () => {
+        if (resolved) return
+        resolved = true
+        cleanup()
+        resolve()
+      }
+      onFail = (_event: Electron.Event, code: number, desc: string) => {
+        if (resolved) return
+        resolved = true
+        cleanup()
+        reject(new Error(`Navigation failed (${code}): ${desc}`))
+      }
+      webContents.once('did-finish-load', onFinish)
+      webContents.once('dom-ready', onDomReady)
+      webContents.once('did-fail-load', onFail)
+    })
+
+    const timeoutPromise = new Promise<void>((_, reject) => {
+      setTimeout(() => reject(new Error('Navigation timed out')), timeout)
+    })
+
+    try {
+      await Promise.race([win.loadURL(url), loadPromise, timeoutPromise])
+    } finally {
+      // Always cleanup listeners to prevent memory leaks on timeout
+      cleanup()
+    }
+
+    const currentUrl = webContents.getURL()
+    const title = await webContents.getTitle()
+    return { currentUrl, title }
+  }
+
+  public async execute(code: string, timeout = 5000, sessionId = 'default') {
+    const win = await this.getWindow(sessionId)
+    this.touch(sessionId)
+    const dbg = win.webContents.debugger
+
+    await this.ensureDebuggerAttached(dbg, sessionId)
+
+    const evalPromise = dbg.sendCommand('Runtime.evaluate', {
+      expression: code,
+      awaitPromise: true,
+      returnByValue: true
+    })
+
+    const result = await Promise.race([
+      evalPromise,
+      new Promise((_, reject) => setTimeout(() => reject(new Error('Execution timed out')), timeout))
+    ])
+
+    const evalResult = result as any
+
+    if (evalResult?.exceptionDetails) {
+      const message = evalResult.exceptionDetails.exception?.description || 'Unknown script error'
+      logger.warn('Runtime.evaluate raised exception', { message })
+      throw new Error(message)
+    }
+
+    const value = evalResult?.result?.value ?? evalResult?.result?.description ?? null
+    return value
+  }
+
+  public async reset(sessionId?: string) {
+    if (sessionId) {
+      const entry = this.windows.get(sessionId)
+      if (entry) {
+        this.closeWindow(entry.win, sessionId)
+      }
+      this.windows.delete(sessionId)
+      logger.info('Browser CDP context reset', { sessionId })
+      return
+    }
+
+    for (const [id, entry] of this.windows.entries()) {
+      this.closeWindow(entry.win, id)
+      this.windows.delete(id)
+    }
+    logger.info('Browser CDP context reset (all sessions)')
+  }
+
+  /**
+   * Fetches a URL and returns content in the specified format.
+   * @param url - The URL to fetch
+   * @param format - Output format: 'html', 'txt', 'markdown', or 'json' (default: 'markdown')
+   * @param timeout - Navigation timeout in milliseconds (default: 10000)
+   * @param sessionId - Session identifier (default: 'default')
+   * @returns Content in the requested format. For 'json', returns parsed object or { data: rawContent } if parsing fails
+   */
+  public async fetch(
+    url: string,
+    format: 'html' | 'txt' | 'markdown' | 'json' = 'markdown',
+    timeout = 10000,
+    sessionId = 'default'
+  ) {
+    await this.open(url, timeout, false, sessionId)
+
+    const win = await this.getWindow(sessionId)
+    const dbg = win.webContents.debugger
+
+    await this.ensureDebuggerAttached(dbg, sessionId)
+
+    let expression: string
+    if (format === 'json' || format === 'txt') {
+      expression = 'document.body.innerText'
+    } else {
+      expression = 'document.documentElement.outerHTML'
+    }
+
+    const result = (await dbg.sendCommand('Runtime.evaluate', {
+      expression,
+      returnByValue: true
+    })) as { result?: { value?: string } }
+
+    const content = result?.result?.value ?? ''
+
+    if (format === 'markdown') {
+      const turndownService = new TurndownService()
+      return turndownService.turndown(content)
+    }
+    if (format === 'json') {
+      // Attempt to parse as JSON; if content is not valid JSON, wrap it in a data object
+      try {
+        return JSON.parse(content)
+      } catch {
+        return { data: content }
+      }
+    }
+    return content
+  }
+}

src/main/mcpServers/browser/index.ts

@@ -0,0 +1,3 @@
+export { CdpBrowserController } from './controller'
+export { BrowserServer } from './server'
+export { BrowserServer as default } from './server'

src/main/mcpServers/browser/server.ts

@@ -0,0 +1,50 @@
+import type { Server } from '@modelcontextprotocol/sdk/server/index.js'
+import { Server as MCServer } from '@modelcontextprotocol/sdk/server/index.js'
+import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
+import { app } from 'electron'
+
+import { CdpBrowserController } from './controller'
+import { toolDefinitions, toolHandlers } from './tools'
+
+export class BrowserServer {
+  public server: Server
+  private controller = new CdpBrowserController()
+
+  constructor() {
+    const server = new MCServer(
+      {
+        name: '@cherry/browser',
+        version: '0.1.0'
+      },
+      {
+        capabilities: {
+          resources: {},
+          tools: {}
+        }
+      }
+    )
+
+    server.setRequestHandler(ListToolsRequestSchema, async () => {
+      return {
+        tools: toolDefinitions
+      }
+    })
+
+    server.setRequestHandler(CallToolRequestSchema, async (request) => {
+      const { name, arguments: args } = request.params
+      const handler = toolHandlers[name]
+      if (!handler) {
+        throw new Error('Tool not found')
+      }
+      return handler(this.controller, args)
+    })
+
+    app.on('before-quit', () => {
+      void this.controller.reset()
+    })
+
+    this.server = server
+  }
+}
+
+export default BrowserServer

src/main/mcpServers/browser/tools/execute.ts

@@ -0,0 +1,48 @@
+import * as z from 'zod'
+
+import type { CdpBrowserController } from '../controller'
+import { errorResponse, successResponse } from './utils'
+
+export const ExecuteSchema = z.object({
+  code: z
+    .string()
+    .describe(
+      'JavaScript evaluated via Chrome DevTools Runtime.evaluate. Keep it short; prefer one-line with semicolons for multiple statements.'
+    ),
+  timeout: z.number().default(5000).describe('Timeout in milliseconds for code execution (default: 5000ms)'),
+  sessionId: z.string().optional().describe('Session identifier to target a specific page (default: default)')
+})
+
+export const executeToolDefinition = {
+  name: 'execute',
+  description:
+    'Run JavaScript in the current page via Runtime.evaluate. Prefer short, single-line snippets; use semicolons for multiple statements.',
+  inputSchema: {
+    type: 'object',
+    properties: {
+      code: {
+        type: 'string',
+        description: 'One-line JS to evaluate in page context'
+      },
+      timeout: {
+        type: 'number',
+        description: 'Timeout in milliseconds (default 5000)'
+      },
+      sessionId: {
+        type: 'string',
+        description: 'Session identifier; targets a specific page (default: default)'
+      }
+    },
+    required: ['code']
+  }
+}
+
+export async function handleExecute(controller: CdpBrowserController, args: unknown) {
+  const { code, timeout, sessionId } = ExecuteSchema.parse(args)
+  try {
+    const value = await controller.execute(code, timeout, sessionId ?? 'default')
+    return successResponse(typeof value === 'string' ? value : JSON.stringify(value))
+  } catch (error) {
+    return errorResponse(error as Error)
+  }
+}

src/main/mcpServers/browser/tools/fetch.ts

@@ -0,0 +1,49 @@
+import * as z from 'zod'
+
+import type { CdpBrowserController } from '../controller'
+import { errorResponse, successResponse } from './utils'
+
+export const FetchSchema = z.object({
+  url: z.url().describe('URL to fetch'),
+  format: z.enum(['html', 'txt', 'markdown', 'json']).default('markdown').describe('Output format (default: markdown)'),
+  timeout: z.number().optional().describe('Timeout in milliseconds for navigation (default: 10000)'),
+  sessionId: z.string().optional().describe('Session identifier (default: default)')
+})
+
+export const fetchToolDefinition = {
+  name: 'fetch',
+  description: 'Fetch a URL using the browser and return content in specified format (html, txt, markdown, json)',
+  inputSchema: {
+    type: 'object',
+    properties: {
+      url: {
+        type: 'string',
+        description: 'URL to fetch'
+      },
+      format: {
+        type: 'string',
+        enum: ['html', 'txt', 'markdown', 'json'],
+        description: 'Output format (default: markdown)'
+      },
+      timeout: {
+        type: 'number',
+        description: 'Navigation timeout in milliseconds (default: 10000)'
+      },
+      sessionId: {
+        type: 'string',
+        description: 'Session identifier (default: default)'
+      }
+    },
+    required: ['url']
+  }
+}
+
+export async function handleFetch(controller: CdpBrowserController, args: unknown) {
+  const { url, format, timeout, sessionId } = FetchSchema.parse(args)
+  try {
+    const content = await controller.fetch(url, format, timeout ?? 10000, sessionId ?? 'default')
+    return successResponse(typeof content === 'string' ? content : JSON.stringify(content))
+  } catch (error) {
+    return errorResponse(error as Error)
+  }
+}

src/main/mcpServers/browser/tools/index.ts

@@ -0,0 +1,25 @@
+export { ExecuteSchema, executeToolDefinition, handleExecute } from './execute'
+export { FetchSchema, fetchToolDefinition, handleFetch } from './fetch'
+export { handleOpen, OpenSchema, openToolDefinition } from './open'
+export { handleReset, resetToolDefinition } from './reset'
+
+import type { CdpBrowserController } from '../controller'
+import { executeToolDefinition, handleExecute } from './execute'
+import { fetchToolDefinition, handleFetch } from './fetch'
+import { handleOpen, openToolDefinition } from './open'
+import { handleReset, resetToolDefinition } from './reset'
+
+export const toolDefinitions = [openToolDefinition, executeToolDefinition, resetToolDefinition, fetchToolDefinition]
+
+export const toolHandlers: Record<
+  string,
+  (
+    controller: CdpBrowserController,
+    args: unknown
+  ) => Promise<{ content: { type: string; text: string }[]; isError: boolean }>
+> = {
+  open: handleOpen,
+  execute: handleExecute,
+  reset: handleReset,
+  fetch: handleFetch
+}

src/main/mcpServers/browser/tools/open.ts

@@ -0,0 +1,47 @@
+import * as z from 'zod'
+
+import type { CdpBrowserController } from '../controller'
+import { successResponse } from './utils'
+
+export const OpenSchema = z.object({
+  url: z.url().describe('URL to open in the controlled Electron window'),
+  timeout: z.number().optional().describe('Timeout in milliseconds for navigation (default: 10000)'),
+  show: z.boolean().optional().describe('Whether to show the browser window (default: false)'),
+  sessionId: z
+    .string()
+    .optional()
+    .describe('Session identifier; separate sessions keep separate pages (default: default)')
+})
+
+export const openToolDefinition = {
+  name: 'open',
+  description: 'Open a URL in a hidden Electron window controlled via Chrome DevTools Protocol',
+  inputSchema: {
+    type: 'object',
+    properties: {
+      url: {
+        type: 'string',
+        description: 'URL to load'
+      },
+      timeout: {
+        type: 'number',
+        description: 'Navigation timeout in milliseconds (default 10000)'
+      },
+      show: {
+        type: 'boolean',
+        description: 'Whether to show the browser window (default false)'
+      },
+      sessionId: {
+        type: 'string',
+        description: 'Session identifier; separate sessions keep separate pages (default: default)'
+      }
+    },
+    required: ['url']
+  }
+}
+
+export async function handleOpen(controller: CdpBrowserController, args: unknown) {
+  const { url, timeout, show, sessionId } = OpenSchema.parse(args)
+  const res = await controller.open(url, timeout ?? 10000, show ?? false, sessionId ?? 'default')
+  return successResponse(JSON.stringify(res))
+}