diff --git a/.github/workflows/auto-i18n.yml b/.github/workflows/auto-i18n.yml
index ea9f05ae03..7537c4d4a3 100644
--- a/.github/workflows/auto-i18n.yml
+++ b/.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
@@ -73,7 +73,7 @@ jobs:
 
       - name: 🚀 Create Pull Request if changes exist
         if: steps.git_status.outputs.has_changes == 'true'
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v8
         with:
           token: ${{ secrets.GITHUB_TOKEN }} # Use the built-in GITHUB_TOKEN for bot actions
           commit-message: "feat(bot): Weekly automated script run"
diff --git a/.github/workflows/claude-code-review.yml b/.github/workflows/claude-code-review.yml
index cc6d28817f..cc24438768 100644
--- a/.github/workflows/claude-code-review.yml
+++ b/.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
 
diff --git a/.github/workflows/claude-translator.yml b/.github/workflows/claude-translator.yml
index 23f359021d..71c2e0b87f 100644
--- a/.github/workflows/claude-translator.yml
+++ b/.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
 
diff --git a/.github/workflows/claude.yml b/.github/workflows/claude.yml
index 82c7b4393b..be018fb5bb 100644
--- a/.github/workflows/claude.yml
+++ b/.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
 
diff --git a/.github/workflows/github-issue-tracker.yml b/.github/workflows/github-issue-tracker.yml
index 32bd393145..a628f9f13c 100644
--- a/.github/workflows/github-issue-tracker.yml
+++ b/.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
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index 523a670064..eb28b91c63 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.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
 
diff --git a/.github/workflows/pr-ci.yml b/.github/workflows/pr-ci.yml
index aa273cc56e..1f7bf7d784 100644
--- a/.github/workflows/pr-ci.yml
+++ b/.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
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8bbb46ee67..4488b1b9d3 100644
--- a/.github/workflows/release.yml
+++ b/.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
 
diff --git a/.github/workflows/sync-to-gitcode.yml b/.github/workflows/sync-to-gitcode.yml
new file mode 100644
index 0000000000..53ecae445b
--- /dev/null
+++ b/.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/
diff --git a/.github/workflows/update-app-upgrade-config.yml b/.github/workflows/update-app-upgrade-config.yml
index 7470bb0b6c..8b0b198008 100644
--- a/.github/workflows/update-app-upgrade-config.yml
+++ b/.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
-        with:
-          path: cs
-          base: x-files/app-upgrade-config
-          branch: chore/update-app-upgrade-config/${{ steps.meta.outputs.safe_tag }}
-          commit-message: "🤖 chore: sync app-upgrade-config for ${{ steps.meta.outputs.tag }}"
-          title: "chore: update app-upgrade-config for ${{ steps.meta.outputs.tag }}"
-          body: |
-            Automated update triggered by `${{ steps.meta.outputs.trigger }}`.
+        working-directory: cs
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add app-upgrade-config.json
+          git commit -m "chore: sync app-upgrade-config for ${{ steps.meta.outputs.tag }}" -m "Automated update triggered by \`${{ steps.meta.outputs.trigger }}\`.
 
-            - Source tag: `${{ steps.meta.outputs.tag }}`
-            - Pre-release: `${{ steps.meta.outputs.prerelease }}`
-            - Latest: `${{ steps.meta.outputs.latest }}`
-            - Workflow run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
-          labels: |
-            automation
-            app-upgrade
+          - Source tag: \`${{ steps.meta.outputs.tag }}\`
+          - Pre-release: \`${{ steps.meta.outputs.prerelease }}\`
+          - Latest: \`${{ steps.meta.outputs.latest }}\`
+          - Workflow run: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          git push origin x-files/app-upgrade-config
 
       - name: No changes detected
         if: steps.check.outputs.should_run == 'true' && steps.diff.outputs.changed != 'true'
diff --git a/.yarn/patches/@ai-sdk-google-npm-2.0.43-689ed559b3.patch b/.yarn/patches/@ai-sdk-google-npm-2.0.49-84720f41bd.patch
similarity index 64%
rename from .yarn/patches/@ai-sdk-google-npm-2.0.43-689ed559b3.patch
rename to .yarn/patches/@ai-sdk-google-npm-2.0.49-84720f41bd.patch
index 3015e702ed..67403a6575 100644
--- a/.yarn/patches/@ai-sdk-google-npm-2.0.43-689ed559b3.patch
+++ b/.yarn/patches/@ai-sdk-google-npm-2.0.49-84720f41bd.patch
@@ -1,5 +1,5 @@
 diff --git a/dist/index.js b/dist/index.js
-index 51ce7e423934fb717cb90245cdfcdb3dae6780e6..0f7f7009e2f41a79a8669d38c8a44867bbff5e1f 100644
+index d004b415c5841a1969705823614f395265ea5a8a..6b1e0dad4610b0424393ecc12e9114723bbe316b 100644
 --- a/dist/index.js
 +++ b/dist/index.js
 @@ -474,7 +474,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
@@ -12,7 +12,7 @@ index 51ce7e423934fb717cb90245cdfcdb3dae6780e6..0f7f7009e2f41a79a8669d38c8a44867
  
  // src/google-generative-ai-options.ts
 diff --git a/dist/index.mjs b/dist/index.mjs
-index f4b77e35c0cbfece85a3ef0d4f4e67aa6dde6271..8d2fecf8155a226006a0bde72b00b6036d4014b6 100644
+index 1780dd2391b7f42224a0b8048c723d2f81222c44..1f12ed14399d6902107ce9b435d7d8e6cc61e06b 100644
 --- a/dist/index.mjs
 +++ b/dist/index.mjs
 @@ -480,7 +480,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
@@ -24,3 +24,14 @@ index f4b77e35c0cbfece85a3ef0d4f4e67aa6dde6271..8d2fecf8155a226006a0bde72b00b603
  }
  
  // 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
diff --git a/.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.27-06f74278cf.patch b/.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.27-06f74278cf.patch
deleted file mode 100644
index 2a13c33a78..0000000000
--- a/.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.27-06f74278cf.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-diff --git a/dist/index.js b/dist/index.js
-index 73045a7d38faafdc7f7d2cd79d7ff0e2b031056b..8d948c9ac4ea4b474db9ef3c5491961e7fcf9a07 100644
---- a/dist/index.js
-+++ b/dist/index.js
-@@ -421,6 +421,17 @@ var OpenAICompatibleChatLanguageModel = class {
-         text: reasoning
-       });
-     }
-+    if (choice.message.images) {
-+      for (const image of choice.message.images) {
-+        const match1 = image.image_url.url.match(/^data:([^;]+)/)
-+        const match2 = image.image_url.url.match(/^data:[^;]*;base64,(.+)$/);
-+        content.push({
-+          type: 'file',
-+          mediaType: match1 ? (match1[1] ?? 'image/jpeg') : 'image/jpeg',
-+          data: match2 ? match2[1] : image.image_url.url,
-+        });
-+      }
-+    }
-     if (choice.message.tool_calls != null) {
-       for (const toolCall of choice.message.tool_calls) {
-         content.push({
-@@ -598,6 +609,17 @@ var OpenAICompatibleChatLanguageModel = class {
-                 delta: delta.content
-               });
-             }
-+            if (delta.images) {
-+              for (const image of delta.images) {
-+                const match1 = image.image_url.url.match(/^data:([^;]+)/)
-+                const match2 = image.image_url.url.match(/^data:[^;]*;base64,(.+)$/);
-+                controller.enqueue({
-+                  type: 'file',
-+                  mediaType: match1 ? (match1[1] ?? 'image/jpeg') : 'image/jpeg',
-+                  data: match2 ? match2[1] : image.image_url.url,
-+                });
-+              }
-+            }
-             if (delta.tool_calls != null) {
-               for (const toolCallDelta of delta.tool_calls) {
-                 const index = toolCallDelta.index;
-@@ -765,6 +787,14 @@ var OpenAICompatibleChatResponseSchema = import_v43.z.object({
-               arguments: import_v43.z.string()
-             })
-           })
-+        ).nullish(),
-+        images: import_v43.z.array(
-+          import_v43.z.object({
-+            type: import_v43.z.literal('image_url'),
-+            image_url: import_v43.z.object({
-+              url: import_v43.z.string(),
-+            })
-+          })
-         ).nullish()
-       }),
-       finish_reason: import_v43.z.string().nullish()
-@@ -795,6 +825,14 @@ var createOpenAICompatibleChatChunkSchema = (errorSchema) => import_v43.z.union(
-                 arguments: import_v43.z.string().nullish()
-               })
-             })
-+          ).nullish(),
-+          images: import_v43.z.array(
-+            import_v43.z.object({
-+              type: import_v43.z.literal('image_url'),
-+              image_url: import_v43.z.object({
-+                url: import_v43.z.string(),
-+              })
-+            })
-           ).nullish()
-         }).nullish(),
-         finish_reason: import_v43.z.string().nullish()
-diff --git a/dist/index.mjs b/dist/index.mjs
-index 1c2b9560bbfbfe10cb01af080aeeed4ff59db29c..2c8ddc4fc9bfc5e7e06cfca105d197a08864c427 100644
---- a/dist/index.mjs
-+++ b/dist/index.mjs
-@@ -405,6 +405,17 @@ var OpenAICompatibleChatLanguageModel = class {
-         text: reasoning
-       });
-     }
-+    if (choice.message.images) {
-+      for (const image of choice.message.images) {
-+        const match1 = image.image_url.url.match(/^data:([^;]+)/)
-+        const match2 = image.image_url.url.match(/^data:[^;]*;base64,(.+)$/);
-+        content.push({
-+          type: 'file',
-+          mediaType: match1 ? (match1[1] ?? 'image/jpeg') : 'image/jpeg',
-+          data: match2 ? match2[1] : image.image_url.url,
-+        });
-+      }
-+    }
-     if (choice.message.tool_calls != null) {
-       for (const toolCall of choice.message.tool_calls) {
-         content.push({
-@@ -582,6 +593,17 @@ var OpenAICompatibleChatLanguageModel = class {
-                 delta: delta.content
-               });
-             }
-+            if (delta.images) {
-+              for (const image of delta.images) {
-+                const match1 = image.image_url.url.match(/^data:([^;]+)/)
-+                const match2 = image.image_url.url.match(/^data:[^;]*;base64,(.+)$/);
-+                controller.enqueue({
-+                  type: 'file',
-+                  mediaType: match1 ? (match1[1] ?? 'image/jpeg') : 'image/jpeg',
-+                  data: match2 ? match2[1] : image.image_url.url,
-+                });
-+              }
-+            }
-             if (delta.tool_calls != null) {
-               for (const toolCallDelta of delta.tool_calls) {
-                 const index = toolCallDelta.index;
-@@ -749,6 +771,14 @@ var OpenAICompatibleChatResponseSchema = z3.object({
-               arguments: z3.string()
-             })
-           })
-+        ).nullish(),
-+        images: z3.array(
-+          z3.object({
-+            type: z3.literal('image_url'),
-+            image_url: z3.object({
-+              url: z3.string(),
-+            })
-+          })
-         ).nullish()
-       }),
-       finish_reason: z3.string().nullish()
-@@ -779,6 +809,14 @@ var createOpenAICompatibleChatChunkSchema = (errorSchema) => z3.union([
-                 arguments: z3.string().nullish()
-               })
-             })
-+          ).nullish(),
-+          images: z3.array(
-+            z3.object({
-+              type: z3.literal('image_url'),
-+              image_url: z3.object({
-+                url: z3.string(),
-+              })
-+            })
-           ).nullish()
-         }).nullish(),
-         finish_reason: z3.string().nullish()
diff --git a/.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.28-5705188855.patch b/.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.28-5705188855.patch
new file mode 100644
index 0000000000..3178ffee5e
--- /dev/null
+++ b/.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.28-5705188855.patch
@@ -0,0 +1,266 @@
+diff --git a/dist/index.d.ts b/dist/index.d.ts
+index 48e2f6263c6ee4c75d7e5c28733e64f6ebe92200..00d0729c4a3cbf9a48e8e1e962c7e2b256b75eba 100644
+--- a/dist/index.d.ts
++++ b/dist/index.d.ts
+@@ -7,6 +7,7 @@ declare const openaiCompatibleProviderOptions: z.ZodObject<{
+     user: z.ZodOptional<z.ZodString>;
+     reasoningEffort: z.ZodOptional<z.ZodString>;
+     textVerbosity: z.ZodOptional<z.ZodString>;
++    sendReasoning: z.ZodOptional<z.ZodBoolean>;
+ }, z.core.$strip>;
+ type OpenAICompatibleProviderOptions = z.infer<typeof openaiCompatibleProviderOptions>;
+
+diff --git a/dist/index.js b/dist/index.js
+index da237bb35b7fa8e24b37cd861ee73dfc51cdfc72..b3060fbaf010e30b64df55302807828e5bfe0f9a 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -41,7 +41,7 @@ function getOpenAIMetadata(message) {
+   var _a, _b;
+   return (_b = (_a = message == null ? void 0 : message.providerOptions) == null ? void 0 : _a.openaiCompatible) != null ? _b : {};
+ }
+-function convertToOpenAICompatibleChatMessages(prompt) {
++function convertToOpenAICompatibleChatMessages({prompt, options}) {
+   const messages = [];
+   for (const { role, content, ...message } of prompt) {
+     const metadata = getOpenAIMetadata({ ...message });
+@@ -91,6 +91,7 @@ function convertToOpenAICompatibleChatMessages(prompt) {
+       }
+       case "assistant": {
+         let text = "";
++        let reasoning_text = "";
+         const toolCalls = [];
+         for (const part of content) {
+           const partMetadata = getOpenAIMetadata(part);
+@@ -99,6 +100,12 @@ function convertToOpenAICompatibleChatMessages(prompt) {
+               text += part.text;
+               break;
+             }
++            case "reasoning": {
++              if (options.sendReasoning) {
++                reasoning_text += part.text;
++              }
++              break;
++            }
+             case "tool-call": {
+               toolCalls.push({
+                 id: part.toolCallId,
+@@ -116,6 +123,7 @@ function convertToOpenAICompatibleChatMessages(prompt) {
+         messages.push({
+           role: "assistant",
+           content: text,
++          reasoning_content: reasoning_text || undefined,
+           tool_calls: toolCalls.length > 0 ? toolCalls : void 0,
+           ...metadata
+         });
+@@ -200,7 +208,8 @@ var openaiCompatibleProviderOptions = import_v4.z.object({
+   /**
+    * Controls the verbosity of the generated text. Defaults to `medium`.
+    */
+-  textVerbosity: import_v4.z.string().optional()
++  textVerbosity: import_v4.z.string().optional(),
++  sendReasoning: import_v4.z.boolean().optional()
+ });
+
+ // src/openai-compatible-error.ts
+@@ -378,7 +387,7 @@ var OpenAICompatibleChatLanguageModel = class {
+         reasoning_effort: compatibleOptions.reasoningEffort,
+         verbosity: compatibleOptions.textVerbosity,
+         // messages:
+-        messages: convertToOpenAICompatibleChatMessages(prompt),
++        messages: convertToOpenAICompatibleChatMessages({prompt, options: compatibleOptions}),
+         // tools:
+         tools: openaiTools,
+         tool_choice: openaiToolChoice
+@@ -421,6 +430,17 @@ var OpenAICompatibleChatLanguageModel = class {
+         text: reasoning
+       });
+     }
++    if (choice.message.images) {
++      for (const image of choice.message.images) {
++        const match1 = image.image_url.url.match(/^data:([^;]+)/)
++        const match2 = image.image_url.url.match(/^data:[^;]*;base64,(.+)$/);
++        content.push({
++          type: 'file',
++          mediaType: match1 ? (match1[1] ?? 'image/jpeg') : 'image/jpeg',
++          data: match2 ? match2[1] : image.image_url.url,
++        });
++      }
++    }
+     if (choice.message.tool_calls != null) {
+       for (const toolCall of choice.message.tool_calls) {
+         content.push({
+@@ -598,6 +618,17 @@ var OpenAICompatibleChatLanguageModel = class {
+                 delta: delta.content
+               });
+             }
++            if (delta.images) {
++              for (const image of delta.images) {
++                const match1 = image.image_url.url.match(/^data:([^;]+)/)
++                const match2 = image.image_url.url.match(/^data:[^;]*;base64,(.+)$/);
++                controller.enqueue({
++                  type: 'file',
++                  mediaType: match1 ? (match1[1] ?? 'image/jpeg') : 'image/jpeg',
++                  data: match2 ? match2[1] : image.image_url.url,
++                });
++              }
++            }
+             if (delta.tool_calls != null) {
+               for (const toolCallDelta of delta.tool_calls) {
+                 const index = toolCallDelta.index;
+@@ -765,6 +796,14 @@ var OpenAICompatibleChatResponseSchema = import_v43.z.object({
+               arguments: import_v43.z.string()
+             })
+           })
++        ).nullish(),
++        images: import_v43.z.array(
++          import_v43.z.object({
++            type: import_v43.z.literal('image_url'),
++            image_url: import_v43.z.object({
++              url: import_v43.z.string(),
++            })
++          })
+         ).nullish()
+       }),
+       finish_reason: import_v43.z.string().nullish()
+@@ -795,6 +834,14 @@ var createOpenAICompatibleChatChunkSchema = (errorSchema) => import_v43.z.union(
+                 arguments: import_v43.z.string().nullish()
+               })
+             })
++          ).nullish(),
++          images: import_v43.z.array(
++            import_v43.z.object({
++              type: import_v43.z.literal('image_url'),
++              image_url: import_v43.z.object({
++                url: import_v43.z.string(),
++              })
++            })
+           ).nullish()
+         }).nullish(),
+         finish_reason: import_v43.z.string().nullish()
+diff --git a/dist/index.mjs b/dist/index.mjs
+index a809a7aa0e148bfd43e01dd7b018568b151c8ad5..565b605eeacd9830b2b0e817e58ad0c5700264de 100644
+--- a/dist/index.mjs
++++ b/dist/index.mjs
+@@ -23,7 +23,7 @@ function getOpenAIMetadata(message) {
+   var _a, _b;
+   return (_b = (_a = message == null ? void 0 : message.providerOptions) == null ? void 0 : _a.openaiCompatible) != null ? _b : {};
+ }
+-function convertToOpenAICompatibleChatMessages(prompt) {
++function convertToOpenAICompatibleChatMessages({prompt, options}) {
+   const messages = [];
+   for (const { role, content, ...message } of prompt) {
+     const metadata = getOpenAIMetadata({ ...message });
+@@ -73,6 +73,7 @@ function convertToOpenAICompatibleChatMessages(prompt) {
+       }
+       case "assistant": {
+         let text = "";
++        let reasoning_text = "";
+         const toolCalls = [];
+         for (const part of content) {
+           const partMetadata = getOpenAIMetadata(part);
+@@ -81,6 +82,12 @@ function convertToOpenAICompatibleChatMessages(prompt) {
+               text += part.text;
+               break;
+             }
++            case "reasoning": {
++              if (options.sendReasoning) {
++                reasoning_text += part.text;
++              }
++              break;
++            }
+             case "tool-call": {
+               toolCalls.push({
+                 id: part.toolCallId,
+@@ -98,6 +105,7 @@ function convertToOpenAICompatibleChatMessages(prompt) {
+         messages.push({
+           role: "assistant",
+           content: text,
++          reasoning_content: reasoning_text || undefined,
+           tool_calls: toolCalls.length > 0 ? toolCalls : void 0,
+           ...metadata
+         });
+@@ -182,7 +190,8 @@ var openaiCompatibleProviderOptions = z.object({
+   /**
+    * Controls the verbosity of the generated text. Defaults to `medium`.
+    */
+-  textVerbosity: z.string().optional()
++  textVerbosity: z.string().optional(),
++  sendReasoning: z.boolean().optional()
+ });
+
+ // src/openai-compatible-error.ts
+@@ -362,7 +371,7 @@ var OpenAICompatibleChatLanguageModel = class {
+         reasoning_effort: compatibleOptions.reasoningEffort,
+         verbosity: compatibleOptions.textVerbosity,
+         // messages:
+-        messages: convertToOpenAICompatibleChatMessages(prompt),
++        messages: convertToOpenAICompatibleChatMessages({prompt, options: compatibleOptions}),
+         // tools:
+         tools: openaiTools,
+         tool_choice: openaiToolChoice
+@@ -405,6 +414,17 @@ var OpenAICompatibleChatLanguageModel = class {
+         text: reasoning
+       });
+     }
++    if (choice.message.images) {
++      for (const image of choice.message.images) {
++        const match1 = image.image_url.url.match(/^data:([^;]+)/)
++        const match2 = image.image_url.url.match(/^data:[^;]*;base64,(.+)$/);
++        content.push({
++          type: 'file',
++          mediaType: match1 ? (match1[1] ?? 'image/jpeg') : 'image/jpeg',
++          data: match2 ? match2[1] : image.image_url.url,
++        });
++      }
++    }
+     if (choice.message.tool_calls != null) {
+       for (const toolCall of choice.message.tool_calls) {
+         content.push({
+@@ -582,6 +602,17 @@ var OpenAICompatibleChatLanguageModel = class {
+                 delta: delta.content
+               });
+             }
++            if (delta.images) {
++              for (const image of delta.images) {
++                const match1 = image.image_url.url.match(/^data:([^;]+)/)
++                const match2 = image.image_url.url.match(/^data:[^;]*;base64,(.+)$/);
++                controller.enqueue({
++                  type: 'file',
++                  mediaType: match1 ? (match1[1] ?? 'image/jpeg') : 'image/jpeg',
++                  data: match2 ? match2[1] : image.image_url.url,
++                });
++              }
++            }
+             if (delta.tool_calls != null) {
+               for (const toolCallDelta of delta.tool_calls) {
+                 const index = toolCallDelta.index;
+@@ -749,6 +780,14 @@ var OpenAICompatibleChatResponseSchema = z3.object({
+               arguments: z3.string()
+             })
+           })
++        ).nullish(),
++        images: z3.array(
++          z3.object({
++            type: z3.literal('image_url'),
++            image_url: z3.object({
++              url: z3.string(),
++            })
++          })
+         ).nullish()
+       }),
+       finish_reason: z3.string().nullish()
+@@ -779,6 +818,14 @@ var createOpenAICompatibleChatChunkSchema = (errorSchema) => z3.union([
+                 arguments: z3.string().nullish()
+               })
+             })
++          ).nullish(),
++          images: z3.array(
++            z3.object({
++              type: z3.literal('image_url'),
++              image_url: z3.object({
++                url: z3.string(),
++              })
++            })
+           ).nullish()
+         }).nullish(),
+         finish_reason: z3.string().nullish()
diff --git a/.yarn/patches/@ai-sdk-openai-npm-2.0.72-234e68da87.patch b/.yarn/patches/@ai-sdk-openai-npm-2.0.85-27483d1d6a.patch
similarity index 84%
rename from .yarn/patches/@ai-sdk-openai-npm-2.0.72-234e68da87.patch
rename to .yarn/patches/@ai-sdk-openai-npm-2.0.85-27483d1d6a.patch
index 973ddc62ac..6fbe30e080 100644
--- a/.yarn/patches/@ai-sdk-openai-npm-2.0.72-234e68da87.patch
+++ b/.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 bf900591bf2847a3253fe441aad24c06da19c6c1..c1d9bb6fefa2df1383339324073db0a70ea2b5a2 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 bf900591bf2847a3253fe441aad24c06da19c6c1..c1d9bb6fefa2df1383339324073db0a7
              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 bf900591bf2847a3253fe441aad24c06da19c6c1..c1d9bb6fefa2df1383339324073db0a7
                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 bf900591bf2847a3253fe441aad24c06da19c6c1..c1d9bb6fefa2df1383339324073db0a7
      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 bf900591bf2847a3253fe441aad24c06da19c6c1..c1d9bb6fefa2df1383339324073db0a7
      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 bf900591bf2847a3253fe441aad24c06da19c6c1..c1d9bb6fefa2df1383339324073db0a7
              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) {
diff --git a/.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.53-4b77f4cf29.patch b/.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.62-23ae56f8c8.patch
similarity index 92%
rename from .yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.53-4b77f4cf29.patch
rename to .yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.62-23ae56f8c8.patch
index 4481b58f32..62ab767576 100644
--- a/.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.53-4b77f4cf29.patch
+++ b/.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.62-23ae56f8c8.patch
@@ -1,5 +1,5 @@
 diff --git a/sdk.mjs b/sdk.mjs
-index bf429a344b7d59f70aead16b639f949b07688a81..f77d50cc5d3fb04292cb3ac7fa7085d02dcc628f 100755
+index dea7766a3432a1e809f12d6daba4f2834a219689..e0b02ef73da177ba32b903887d7bbbeaa08cc6d3 100755
 --- a/sdk.mjs
 +++ b/sdk.mjs
 @@ -6250,7 +6250,7 @@ function createAbortController(maxListeners = DEFAULT_MAX_LISTENERS) {
@@ -11,7 +11,7 @@ index bf429a344b7d59f70aead16b639f949b07688a81..f77d50cc5d3fb04292cb3ac7fa7085d0
  import { createInterface } from "readline";
  
  // ../src/utils/fsOperations.ts
-@@ -6619,18 +6619,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);
        }
diff --git a/.yarn/patches/ollama-ai-provider-v2-npm-1.5.5-8bef249af9.patch b/.yarn/patches/ollama-ai-provider-v2-npm-1.5.5-8bef249af9.patch
new file mode 100644
index 0000000000..c306bef6e5
--- /dev/null
+++ b/.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.ZodLiteral<"low">, z.ZodLiteral<"medium">, z.ZodLiteral<"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.ZodLiteral<"low">, z.ZodLiteral<"medium">, z.ZodLiteral<"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.literal('low'), import_v42.z.literal('medium'), import_v42.z.literal('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.literal('low'), import_v44.z.literal('medium'), import_v44.z.literal('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.literal('low'), z2.literal('medium'), z2.literal('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.literal('low'), z4.literal('medium'), z4.literal('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 : {})
++      }
+     };
+   }
+ };
diff --git a/CLAUDE.md b/CLAUDE.md
index c96fc0e403..c68187db93 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -28,7 +28,7 @@ When creating a Pull Request, you MUST:
 - **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**:
@@ -40,20 +40,23 @@ When creating a Pull Request, you MUST:
 ## 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'
-const logger = loggerService.withContext('moduleName')
+import { loggerService } from "@logger";
+const logger = loggerService.withContext("moduleName");
 // Renderer: loggerService.initWindowSource('windowName') first
-logger.info('message', CONTEXT)
+logger.info("message", CONTEXT);
 ```
diff --git a/README.md b/README.md
index f790c10cbd..781e9299e5 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@
   </a>
 </h1>
 
-<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>
+<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/docs/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">
 
@@ -242,12 +242,12 @@ The Enterprise Edition addresses core challenges in team collaboration by centra
 
 ## Version Comparison
 
-| Feature           | Community Edition                          | Enterprise Edition                                                                                                                      |
-| :---------------- | :----------------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------- |
-| **Open Source**   | ✅ Yes                                      | ⭕️ Partially released to customers                                                                                                       |
+| Feature           | Community Edition                                                                    | Enterprise Edition                                                                                                                      |
+| :---------------- | :----------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------- |
+| **Open Source**   | ✅ Yes                                                                               | ⭕️ Partially released to customers                                                                                                      |
 | **Cost**          | [AGPL-3.0 License](https://github.com/CherryHQ/cherry-studio?tab=AGPL-3.0-1-ov-file) | Buyout / Subscription Fee                                                                                                               |
-| **Admin Backend** | —                                          | ● Centralized **Model** Access<br>● **Employee** Management<br>● Shared **Knowledge Base**<br>● **Access** Control<br>● **Data** Backup |
-| **Server**        | —                                          | ✅ Dedicated Private Deployment                                                                                                          |
+| **Admin Backend** | —                                                                                    | ● Centralized **Model** Access<br>● **Employee** Management<br>● Shared **Knowledge Base**<br>● **Access** Control<br>● **Data** Backup |
+| **Server**        | —                                                                                    | ✅ Dedicated Private Deployment                                                                                                         |
 
 ## Get the Enterprise Edition
 
@@ -275,7 +275,7 @@ We believe the Enterprise Edition will become your team's AI productivity engine
 
 # 📊 GitHub Stats
 
-![Stats](https://repobeats.axiom.co/api/embed/a693f2e5f773eed620f70031e974552156c7f397.svg 'Repobeats analytics image')
+![Stats](https://repobeats.axiom.co/api/embed/a693f2e5f773eed620f70031e974552156c7f397.svg "Repobeats analytics image")
 
 # ⭐️ Star History
 
diff --git a/biome.jsonc b/biome.jsonc
index 705b1e01f3..6f925f5af2 100644
--- a/biome.jsonc
+++ b/biome.jsonc
@@ -23,7 +23,7 @@
   },
   "files": {
     "ignoreUnknown": false,
-    "includes": ["**", "!**/.claude/**", "!**/.vscode/**"],
+    "includes": ["**", "!**/.claude/**", "!**/.vscode/**", "!**/.conductor/**"],
     "maxSize": 2097152
   },
   "formatter": {
diff --git a/build/nsis-installer.nsh b/build/nsis-installer.nsh
index 769ccaaa19..e644e18f3d 100644
--- a/build/nsis-installer.nsh
+++ b/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
-    ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Installed"
+    ${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 "\
-      NOTE: ${PRODUCT_NAME} requires $\r$\n\
-      'Microsoft Visual C++ Redistributable'$\r$\n\
-      to function properly.$\r$\n$\r$\n\
-      Download and install now?" /SD IDYES IDYES InstallVCRedist IDNO DontInstall
-    InstallVCRedist:
-      inetc::get /CAPTION " " /BANNER "Downloading Microsoft Visual C++ Redistributable..." "https://aka.ms/vs/17/release/vc_redist.x64.exe" "$TEMP\vc_redist.x64.exe"
-      ExecWait "$TEMP\vc_redist.x64.exe /install /norestart"
-      ;IfErrors InstallError ContinueInstall ; vc_redist exit code is unreliable :(
-      Call checkVCRedist
-      ${If} $0 == "1"
-        Goto ContinueInstall
-      ${EndIf}
+    ; VC++ is required - install automatically since declining would abort anyway
+    ; Select download URL based on system architecture (stored in $1)
+    ${If} $1 == "arm64"
+      StrCpy $2 "https://aka.ms/vs/17/release/vc_redist.arm64.exe"
+      StrCpy $3 "$TEMP\vc_redist.arm64.exe"
+    ${Else}
+      StrCpy $2 "https://aka.ms/vs/17/release/vc_redist.x64.exe"
+      StrCpy $3 "$TEMP\vc_redist.x64.exe"
+    ${EndIf}
 
-    ;InstallError:
-      MessageBox MB_ICONSTOP "\
-        There was an unexpected error installing$\r$\n\
-        Microsoft Visual C++ Redistributable.$\r$\n\
-        The installation of ${PRODUCT_NAME} cannot continue."
-    DontInstall:
+    inetc::get /CAPTION " " /BANNER "Downloading Microsoft Visual C++ Redistributable..." \
+      $2 $3 /END
+    Pop $0  ; Get download status from inetc::get
+    ${If} $0 != "OK"
+      MessageBox MB_ICONSTOP|MB_YESNO "\
+        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}
+
+    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}
-  ContinueInstall:
     Pop $4
     Pop $3
     Pop $2
diff --git a/docs/en/guides/development.md b/docs/en/guides/development.md
index fe67742768..032a515f61 100644
--- a/docs/en/guides/development.md
+++ b/docs/en/guides/development.md
@@ -36,7 +36,7 @@ yarn install
 ### ENV
 
 ```bash
-copy .env.example .env
+cp .env.example .env
 ```
 
 ### Start
diff --git a/docs/en/guides/i18n.md b/docs/en/guides/i18n.md
index a3284e3ab9..7fccfde695 100644
--- a/docs/en/guides/i18n.md
+++ b/docs/en/guides/i18n.md
@@ -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',
-  light: 'settings.theme.light',
-  system: 'settings.theme.system'
-} as const
+  dark: "settings.theme.dark",
+  light: "settings.theme.light",
+  system: "settings.theme.system",
+} 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
-```
-
-### `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
+yarn i18n:translate
 ```
 
 ### 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
-4. Run `yarn auto:i18n` to perform machine translation
+3. Run `yarn i18n:sync` to propagate the keys to other language files
+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`
diff --git a/docs/en/references/fuzzy-search.md b/docs/en/references/fuzzy-search.md
new file mode 100644
index 0000000000..11c2002cb9
--- /dev/null
+++ b/docs/en/references/fuzzy-search.md
@@ -0,0 +1,129 @@
+# Fuzzy Search for File List
+
+This document describes the fuzzy search implementation for file listing in Cherry Studio.
+
+## Overview
+
+The fuzzy search feature allows users to find files by typing partial or approximate file names/paths. It uses a two-tier file filtering strategy (ripgrep glob pre-filtering with greedy substring fallback) combined with subsequence-based scoring for optimal performance and flexibility.
+
+## Features
+
+- **Ripgrep Glob Pre-filtering**: Primary filtering using glob patterns for fast native-level filtering
+- **Greedy Substring Matching**: Fallback file filtering strategy when ripgrep glob pre-filtering returns no results
+- **Subsequence-based Segment Scoring**: During scoring, path segments gain additional weight when query characters appear in order
+- **Relevance Scoring**: Results are sorted by a relevance score derived from multiple factors
+
+## Matching Strategies
+
+### 1. Ripgrep Glob Pre-filtering (Primary)
+
+The query is converted to a glob pattern for ripgrep to do initial filtering:
+
+```
+Query: "updater"
+Glob:  "*u*p*d*a*t*e*r*"
+```
+
+This leverages ripgrep's native performance for the initial file filtering.
+
+### 2. Greedy Substring Matching (Fallback)
+
+When the glob pre-filter returns no results, the system falls back to greedy substring matching. This allows more flexible matching:
+
+```
+Query: "updatercontroller"
+File:  "packages/update/src/node/updateController.ts"
+
+Matching process:
+1. Find "update" (longest match from start)
+2. Remaining "rcontroller" → find "r" then "controller"
+3. All parts matched → Success
+```
+
+## Scoring Algorithm
+
+Results are ranked by a relevance score based on named constants defined in `FileStorage.ts`:
+
+| Constant | Value | Description |
+|----------|-------|-------------|
+| `SCORE_FILENAME_STARTS` | 100 | Filename starts with query (highest priority) |
+| `SCORE_FILENAME_CONTAINS` | 80 | Filename contains exact query substring |
+| `SCORE_SEGMENT_MATCH` | 60 | Per path segment that matches query |
+| `SCORE_WORD_BOUNDARY` | 20 | Query matches start of a word |
+| `SCORE_CONSECUTIVE_CHAR` | 15 | Per consecutive character match |
+| `PATH_LENGTH_PENALTY_FACTOR` | 4 | Logarithmic penalty for longer paths |
+
+### Scoring Strategy
+
+The scoring prioritizes:
+1. **Filename matches** (highest): Files where the query appears in the filename are most relevant
+2. **Path segment matches**: Multiple matching segments indicate stronger relevance
+3. **Word boundaries**: Matching at word starts (e.g., "upd" matching "update") is preferred
+4. **Consecutive matches**: Longer consecutive character sequences score higher
+5. **Path length**: Shorter paths are preferred (logarithmic penalty prevents long paths from dominating)
+
+### Example Scoring
+
+For query `updater`:
+
+| File | Score Factors |
+|------|---------------|
+| `RCUpdater.js` | Short path + filename contains "updater" |
+| `updateController.ts` | Multiple segment matches |
+| `UpdaterHelper.plist` | Long path penalty |
+
+## Configuration
+
+### DirectoryListOptions
+
+```typescript
+interface DirectoryListOptions {
+  recursive?: boolean      // Default: true
+  maxDepth?: number        // Default: 10
+  includeHidden?: boolean  // Default: false
+  includeFiles?: boolean   // Default: true
+  includeDirectories?: boolean // Default: true
+  maxEntries?: number      // Default: 20
+  searchPattern?: string   // Default: '.'
+  fuzzy?: boolean          // Default: true
+}
+```
+
+## Usage
+
+```typescript
+// Basic fuzzy search
+const files = await window.api.file.listDirectory(dirPath, {
+  searchPattern: 'updater',
+  fuzzy: true,
+  maxEntries: 20
+})
+
+// Disable fuzzy search (exact glob matching)
+const files = await window.api.file.listDirectory(dirPath, {
+  searchPattern: 'update',
+  fuzzy: false
+})
+```
+
+## Performance Considerations
+
+1. **Ripgrep Pre-filtering**: Most queries are handled by ripgrep's native glob matching, which is extremely fast
+2. **Fallback Only When Needed**: Greedy substring matching (which loads all files) only runs when glob matching returns empty results
+3. **Result Limiting**: Only top 20 results are returned by default
+4. **Excluded Directories**: Common large directories are automatically excluded:
+   - `node_modules`
+   - `.git`
+   - `dist`, `build`
+   - `.next`, `.nuxt`
+   - `coverage`, `.cache`
+
+## Implementation Details
+
+The implementation is located in `src/main/services/FileStorage.ts`:
+
+- `queryToGlobPattern()`: Converts query to ripgrep glob pattern
+- `isFuzzyMatch()`: Subsequence matching algorithm
+- `isGreedySubstringMatch()`: Greedy substring matching fallback
+- `getFuzzyMatchScore()`: Calculates relevance score
+- `listDirectoryWithRipgrep()`: Main search orchestration
diff --git a/docs/zh/README.md b/docs/zh/README.md
index f8a1f1ab8c..c4adeb4901 100644
--- a/docs/zh/README.md
+++ b/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="./guides/development.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">文档</a> | <a href="./guides/development.md">开发</a> | <a href="https://github.com/CherryHQ/cherry-studio/issues">反馈</a><br>
 </p>
 
 <!-- 题头徽章组合 -->
@@ -281,7 +281,7 @@ https://docs.cherry-ai.com
 
 # 📊 GitHub 统计
 
-![Stats](https://repobeats.axiom.co/api/embed/a693f2e5f773eed620f70031e974552156c7f397.svg 'Repobeats analytics image')
+![Stats](https://repobeats.axiom.co/api/embed/a693f2e5f773eed620f70031e974552156c7f397.svg "Repobeats analytics image")
 
 # ⭐️ Star 记录
 
diff --git a/docs/zh/guides/development.md b/docs/zh/guides/development.md
index fe67742768..032a515f61 100644
--- a/docs/zh/guides/development.md
+++ b/docs/zh/guides/development.md
@@ -36,7 +36,7 @@ yarn install
 ### ENV
 
 ```bash
-copy .env.example .env
+cp .env.example .env
 ```
 
 ### Start
diff --git a/docs/zh/guides/i18n.md b/docs/zh/guides/i18n.md
index 82624d35c8..c8a8ccc66b 100644
--- a/docs/zh/guides/i18n.md
+++ b/docs/zh/guides/i18n.md
@@ -1,17 +1,17 @@
 # 如何优雅地做好 i18n
 
-## 使用i18n ally插件提升开发体验
+## 使用 i18n ally 插件提升开发体验
 
-i18n ally是一个强大的VSCode插件，它能在开发阶段提供实时反馈，帮助开发者更早发现文案缺失和错译问题。
+i18n ally 是一个强大的 VSCode 插件，它能在开发阶段提供实时反馈，帮助开发者更早发现文案缺失和错译问题。
 
 项目中已经配置好了插件设置，直接安装即可。
 
 ### 开发时优势
 
 - **实时预览**：翻译文案会直接显示在编辑器中
-- **错误检测**：自动追踪标记出缺失的翻译或未使用的key
-- **快速跳转**：可通过key直接跳转到定义处（Ctrl/Cmd + click)
-- **自动补全**：输入i18n key时提供自动补全建议
+- **错误检测**：自动追踪标记出缺失的翻译或未使用的 key
+- **快速跳转**：可通过 key 直接跳转到定义处（Ctrl/Cmd + click)
+- **自动补全**：输入 i18n key 时提供自动补全建议
 
 ### 效果展示
 
@@ -23,9 +23,9 @@ i18n ally是一个强大的VSCode插件，它能在开发阶段提供实时反
 
 ## 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',
-  light: 'settings.theme.light',
-  system: 'settings.theme.system'
-} as const
+  dark: "settings.theme.dark",
+  light: "settings.theme.light",
+  system: "settings.theme.system",
+} 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
-```
-
-### `update:i18n` - 对象级别翻译更新
-
-对`src/renderer/src/i18n/translate`中的语言文件进行对象级别的翻译更新，保留已有翻译，只更新新增内容。
-
-**不建议**使用该脚本，更推荐使用`auto:i18n`进行翻译。
-
-```bash
-yarn update:i18n
+yarn i18n:translate
 ```
 
 ### 工作流
 
 1. 开发阶段，先在`zh-cn.json`中添加所需文案
-2. 确认在中文环境下显示无误后，使用`yarn sync:i18n`将文案同步到其他语言文件
-3. 使用`yarn auto:i18n`进行自动翻译
+2. 确认在中文环境下显示无误后，使用`yarn i18n:sync`将文案同步到其他语言文件
+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`
diff --git a/docs/zh/references/fuzzy-search.md b/docs/zh/references/fuzzy-search.md
new file mode 100644
index 0000000000..d28d189928
--- /dev/null
+++ b/docs/zh/references/fuzzy-search.md
@@ -0,0 +1,129 @@
+# 文件列表模糊搜索
+
+本文档描述了 Cherry Studio 中文件列表的模糊搜索实现。
+
+## 概述
+
+模糊搜索功能允许用户通过输入部分或近似的文件名/路径来查找文件。它使用两层文件过滤策略（ripgrep glob 预过滤 + 贪婪子串匹配回退），结合基于子序列的评分，以获得最佳性能和灵活性。
+
+## 功能特性
+
+- **Ripgrep Glob 预过滤**：使用 glob 模式进行快速原生级过滤的主要过滤策略
+- **贪婪子串匹配**：当 ripgrep glob 预过滤无结果时的回退文件过滤策略
+- **基于子序列的段评分**：评分时，当查询字符按顺序出现时，路径段获得额外权重
+- **相关性评分**：结果按多因素相关性分数排序
+
+## 匹配策略
+
+### 1. Ripgrep Glob 预过滤（主要）
+
+查询被转换为 glob 模式供 ripgrep 进行初始过滤：
+
+```
+查询: "updater"
+Glob: "*u*p*d*a*t*e*r*"
+```
+
+这利用了 ripgrep 的原生性能进行初始文件过滤。
+
+### 2. 贪婪子串匹配（回退）
+
+当 glob 预过滤无结果时，系统回退到贪婪子串匹配。这允许更灵活的匹配：
+
+```
+查询: "updatercontroller"
+文件: "packages/update/src/node/updateController.ts"
+
+匹配过程:
+1. 找到 "update"（从开头的最长匹配）
+2. 剩余 "rcontroller" → 找到 "r" 然后 "controller"
+3. 所有部分都匹配 → 成功
+```
+
+## 评分算法
+
+结果根据 `FileStorage.ts` 中定义的命名常量进行相关性分数排名：
+
+| 常量 | 值 | 描述 |
+|------|-----|------|
+| `SCORE_FILENAME_STARTS` | 100 | 文件名以查询开头（最高优先级）|
+| `SCORE_FILENAME_CONTAINS` | 80 | 文件名包含精确查询子串 |
+| `SCORE_SEGMENT_MATCH` | 60 | 每个匹配查询的路径段 |
+| `SCORE_WORD_BOUNDARY` | 20 | 查询匹配单词开头 |
+| `SCORE_CONSECUTIVE_CHAR` | 15 | 每个连续字符匹配 |
+| `PATH_LENGTH_PENALTY_FACTOR` | 4 | 较长路径的对数惩罚 |
+
+### 评分策略
+
+评分优先级：
+1. **文件名匹配**（最高）：查询出现在文件名中的文件最相关
+2. **路径段匹配**：多个匹配段表示更强的相关性
+3. **词边界**：在单词开头匹配（如 "upd" 匹配 "update"）更优先
+4. **连续匹配**：更长的连续字符序列得分更高
+5. **路径长度**：较短路径更优先（对数惩罚防止长路径主导评分）
+
+### 评分示例
+
+对于查询 `updater`：
+
+| 文件 | 评分因素 |
+|------|----------|
+| `RCUpdater.js` | 短路径 + 文件名包含 "updater" |
+| `updateController.ts` | 多个路径段匹配 |
+| `UpdaterHelper.plist` | 长路径惩罚 |
+
+## 配置
+
+### DirectoryListOptions
+
+```typescript
+interface DirectoryListOptions {
+  recursive?: boolean      // 默认: true
+  maxDepth?: number        // 默认: 10
+  includeHidden?: boolean  // 默认: false
+  includeFiles?: boolean   // 默认: true
+  includeDirectories?: boolean // 默认: true
+  maxEntries?: number      // 默认: 20
+  searchPattern?: string   // 默认: '.'
+  fuzzy?: boolean          // 默认: true
+}
+```
+
+## 使用方法
+
+```typescript
+// 基本模糊搜索
+const files = await window.api.file.listDirectory(dirPath, {
+  searchPattern: 'updater',
+  fuzzy: true,
+  maxEntries: 20
+})
+
+// 禁用模糊搜索（精确 glob 匹配）
+const files = await window.api.file.listDirectory(dirPath, {
+  searchPattern: 'update',
+  fuzzy: false
+})
+```
+
+## 性能考虑
+
+1. **Ripgrep 预过滤**：大多数查询由 ripgrep 的原生 glob 匹配处理，速度极快
+2. **仅在需要时回退**：贪婪子串匹配（加载所有文件）仅在 glob 匹配返回空结果时运行
+3. **结果限制**：默认只返回前 20 个结果
+4. **排除目录**：自动排除常见的大型目录：
+   - `node_modules`
+   - `.git`
+   - `dist`、`build`
+   - `.next`、`.nuxt`
+   - `coverage`、`.cache`
+
+## 实现细节
+
+实现位于 `src/main/services/FileStorage.ts`：
+
+- `queryToGlobPattern()`：将查询转换为 ripgrep glob 模式
+- `isFuzzyMatch()`：子序列匹配算法
+- `isGreedySubstringMatch()`：贪婪子串匹配回退
+- `getFuzzyMatchScore()`：计算相关性分数
+- `listDirectoryWithRipgrep()`：主搜索协调
diff --git a/docs/zh/references/lan-transfer-protocol.md b/docs/zh/references/lan-transfer-protocol.md
new file mode 100644
index 0000000000..a4c01a23c5
--- /dev/null
+++ b/docs/zh/references/lan-transfer-protocol.md
@@ -0,0 +1,850 @@
+# Cherry Studio 局域网传输协议规范
+
+> 版本: 1.0
+> 最后更新: 2025-12
+
+本文档定义了 Cherry Studio 桌面客户端（Electron）与移动端（Expo）之间的局域网文件传输协议。
+
+---
+
+## 目录
+
+1. [协议概述](#1-协议概述)
+2. [服务发现（Bonjour/mDNS）](#2-服务发现bonjourmdns)
+3. [TCP 连接与握手](#3-tcp-连接与握手)
+4. [消息格式规范](#4-消息格式规范)
+5. [文件传输协议](#5-文件传输协议)
+6. [心跳与连接保活](#6-心跳与连接保活)
+7. [错误处理](#7-错误处理)
+8. [常量与配置](#8-常量与配置)
+9. [完整时序图](#9-完整时序图)
+10. [移动端实现指南](#10-移动端实现指南)
+
+---
+
+## 1. 协议概述
+
+### 1.1 架构角色
+
+| 角色                 | 平台            | 职责                         |
+| -------------------- | --------------- | ---------------------------- |
+| **Client（客户端）** | Electron 桌面端 | 扫描服务、发起连接、发送文件 |
+| **Server（服务端）** | Expo 移动端     | 发布服务、接受连接、接收文件 |
+
+### 1.2 协议栈（v1）
+
+```
+┌─────────────────────────────────────┐
+│     应用层（文件传输）                │
+├─────────────────────────────────────┤
+│     消息层（控制: JSON \n）           │
+│             （数据: 二进制帧）        │
+├─────────────────────────────────────┤
+│     传输层（TCP）                    │
+├─────────────────────────────────────┤
+│     发现层（Bonjour/mDNS）           │
+└─────────────────────────────────────┘
+```
+
+### 1.3 通信流程概览
+
+```
+1. 服务发现 → 移动端发布 mDNS 服务，桌面端扫描发现
+2. TCP 握手 → 建立连接，交换设备信息（`version=1`）
+3. 文件传输 → 控制消息使用 JSON，`file_chunk` 使用二进制帧分块传输
+4. 连接保活 → ping/pong 心跳
+```
+
+---
+
+## 2. 服务发现（Bonjour/mDNS）
+
+### 2.1 服务类型
+
+| 属性         | 值                   |
+| ------------ | -------------------- |
+| 服务类型     | `cherrystudio`       |
+| 协议         | `tcp`                |
+| 完整服务标识 | `_cherrystudio._tcp` |
+
+### 2.2 服务发布（移动端）
+
+移动端需要通过 mDNS/Bonjour 发布服务：
+
+```typescript
+// 服务发布参数
+{
+  name: "Cherry Studio Mobile",    // 设备名称
+  type: "cherrystudio",            // 服务类型
+  protocol: "tcp",                 // 协议
+  port: 53317,                     // TCP 监听端口
+  txt: {                           // TXT 记录（可选）
+    version: "1",
+    platform: "ios"                // 或 "android"
+  }
+}
+```
+
+### 2.3 服务发现（桌面端）
+
+桌面端扫描并解析服务信息：
+
+```typescript
+// 发现的服务信息结构
+type LocalTransferPeer = {
+  id: string; // 唯一标识符
+  name: string; // 设备名称
+  host?: string; // 主机名
+  fqdn?: string; // 完全限定域名
+  port?: number; // TCP 端口
+  type?: string; // 服务类型
+  protocol?: "tcp" | "udp"; // 协议
+  addresses: string[]; // IP 地址列表
+  txt?: Record<string, string>; // TXT 记录
+  updatedAt: number; // 发现时间戳
+};
+```
+
+### 2.4 IP 地址选择策略
+
+当服务有多个 IP 地址时，优先选择 IPv4：
+
+```typescript
+// 优先选择 IPv4 地址
+const preferredAddress = addresses.find((addr) => isIPv4(addr)) || addresses[0];
+```
+
+---
+
+## 3. TCP 连接与握手
+
+### 3.1 连接建立
+
+1. 客户端使用发现的 `host:port` 建立 TCP 连接
+2. 连接成功后立即发送握手消息
+3. 等待服务端响应握手确认
+
+### 3.2 握手消息（协议版本 v1）
+
+#### Client → Server: `handshake`
+
+```typescript
+type LanTransferHandshakeMessage = {
+  type: "handshake";
+  deviceName: string; // 设备名称
+  version: string; // 协议版本，当前为 "1"
+  platform?: string; // 平台：'darwin' | 'win32' | 'linux'
+  appVersion?: string; // 应用版本
+};
+```
+
+**示例：**
+
+```json
+{
+  "type": "handshake",
+  "deviceName": "Cherry Studio 1.7.2",
+  "version": "1",
+  "platform": "darwin",
+  "appVersion": "1.7.2"
+}
+```
+
+### 4. 消息格式规范（混合协议）
+
+v1 使用"控制 JSON + 二进制数据帧"的混合协议（流式传输模式，无 per-chunk ACK）：
+
+- **控制消息**（握手、心跳、file_start/ack、file_end、file_complete）：UTF-8 JSON，`\n` 分隔
+- **数据消息**（`file_chunk`）：二进制帧，使用 Magic + 总长度做分帧，不经 Base64
+
+### 4.1 控制消息编码（JSON + `\n`）
+
+| 属性       | 规范         |
+| ---------- | ------------ |
+| 编码格式   | UTF-8        |
+| 序列化格式 | JSON         |
+| 消息分隔符 | `\n`（0x0A） |
+
+```typescript
+function sendControlMessage(socket: Socket, message: object): void {
+  socket.write(`${JSON.stringify(message)}\n`);
+}
+```
+
+### 4.2 `file_chunk` 二进制帧格式
+
+为解决 TCP 分包/粘包并消除 Base64 开销，`file_chunk` 采用带总长度的二进制帧：
+
+```
+┌──────────┬──────────┬────────┬───────────────┬──────────────┬────────────┬───────────┐
+│ Magic    │ TotalLen │ Type   │ TransferId Len│ TransferId   │ ChunkIdx   │ Data      │
+│ 0x43 0x53│ (4B BE)  │ 0x01   │ (2B BE)       │ (UTF-8)      │ (4B BE)    │ (raw)     │
+└──────────┴──────────┴────────┴───────────────┴──────────────┴────────────┴───────────┘
+```
+
+| 字段           | 大小 | 说明                                        |
+| -------------- | ---- | ------------------------------------------- |
+| Magic          | 2B   | 常量 `0x43 0x53` ("CS"), 用于区分 JSON 消息 |
+| TotalLen       | 4B   | Big-endian，帧总长度（不含 Magic/TotalLen） |
+| Type           | 1B   | `0x01` 代表 `file_chunk`                    |
+| TransferId Len | 2B   | Big-endian，transferId 字符串长度           |
+| TransferId     | nB   | UTF-8 transferId（长度由上一字段给出）      |
+| ChunkIdx       | 4B   | Big-endian，块索引，从 0 开始               |
+| Data           | mB   | 原始文件二进制数据（未编码）                |
+
+> 计算帧总长度：`TotalLen = 1 + 2 + transferIdLen + 4 + dataLen`（即 Type~Data 的长度和）。
+
+### 4.3 消息解析策略
+
+1. 读取 socket 数据到缓冲区；
+2. 若前两字节为 `0x43 0x53` → 按二进制帧解析：
+   - 至少需要 6 字节头（Magic + TotalLen），不足则等待更多数据
+   - 读取 `TotalLen` 判断帧整体长度，缓冲区不足则继续等待
+   - 解析 Type/TransferId/ChunkIdx/Data，并传入文件接收逻辑
+3. 否则若首字节为 `{` → 按 JSON + `\n` 解析控制消息
+4. 其它数据丢弃 1 字节并继续循环，避免阻塞。
+
+### 4.4 消息类型汇总（v1）
+
+| 类型             | 方向            | 编码     | 用途                    |
+| ---------------- | --------------- | -------- | ----------------------- |
+| `handshake`      | Client → Server | JSON+\n  | 握手请求（version=1）   |
+| `handshake_ack`  | Server → Client | JSON+\n  | 握手响应                |
+| `ping`           | Client → Server | JSON+\n  | 心跳请求                |
+| `pong`           | Server → Client | JSON+\n  | 心跳响应                |
+| `file_start`     | Client → Server | JSON+\n  | 开始文件传输            |
+| `file_start_ack` | Server → Client | JSON+\n  | 文件传输确认            |
+| `file_chunk`     | Client → Server | 二进制帧 | 文件数据块（无 Base64，流式无 per-chunk ACK） |
+| `file_end`       | Client → Server | JSON+\n  | 文件传输结束            |
+| `file_complete`  | Server → Client | JSON+\n  | 传输完成结果            |
+
+```
+{"type":"message_type",...其他字段...}\n
+```
+
+---
+
+## 5. 文件传输协议
+
+### 5.1 传输流程
+
+```
+Client (Sender)                     Server (Receiver)
+     |                                    |
+     |──── 1. file_start ────────────────>|
+     |      (文件元数据)                   |
+     |                                    |
+     |<─── 2. file_start_ack ─────────────|
+     |      (接受/拒绝)                    |
+     |                                    |
+     |══════ 循环发送数据块（流式，无 ACK） ═════|
+     |                                    |
+     |──── 3. file_chunk [0] ────────────>|
+     |                                    |
+     |──── 3. file_chunk [1] ────────────>|
+     |                                    |
+     |      ... 重复直到所有块发送完成 ...  |
+     |                                    |
+     |══════════════════════════════════════
+     |                                    |
+     |──── 5. file_end ──────────────────>|
+     |      (所有块已发送)                 |
+     |                                    |
+     |<─── 6. file_complete ──────────────|
+     |      (最终结果)                     |
+```
+
+### 5.2 消息定义
+
+#### 5.2.1 `file_start` - 开始传输
+
+**方向：** Client → Server
+
+```typescript
+type LanTransferFileStartMessage = {
+  type: "file_start";
+  transferId: string; // UUID，唯一传输标识
+  fileName: string; // 文件名（含扩展名）
+  fileSize: number; // 文件总字节数
+  mimeType: string; // MIME 类型
+  checksum: string; // 整个文件的 SHA-256 哈希（hex）
+  totalChunks: number; // 总数据块数
+  chunkSize: number; // 每块大小（字节）
+};
+```
+
+**示例：**
+
+```json
+{
+  "type": "file_start",
+  "transferId": "550e8400-e29b-41d4-a716-446655440000",
+  "fileName": "backup.zip",
+  "fileSize": 524288000,
+  "mimeType": "application/zip",
+  "checksum": "a1b2c3d4e5f6789012345678901234567890abcdef1234567890abcdef123456",
+  "totalChunks": 8192,
+  "chunkSize": 65536
+}
+```
+
+#### 5.2.2 `file_start_ack` - 传输确认
+
+**方向：** Server → Client
+
+```typescript
+type LanTransferFileStartAckMessage = {
+  type: "file_start_ack";
+  transferId: string; // 对应的传输 ID
+  accepted: boolean; // 是否接受传输
+  message?: string; // 拒绝原因
+};
+```
+
+**接受示例：**
+
+```json
+{
+  "type": "file_start_ack",
+  "transferId": "550e8400-e29b-41d4-a716-446655440000",
+  "accepted": true
+}
+```
+
+**拒绝示例：**
+
+```json
+{
+  "type": "file_start_ack",
+  "transferId": "550e8400-e29b-41d4-a716-446655440000",
+  "accepted": false,
+  "message": "Insufficient storage space"
+}
+```
+
+#### 5.2.3 `file_chunk` - 数据块
+
+**方向：** Client → Server（**二进制帧**，见 4.2）
+
+- 不再使用 JSON/`\n`，也不再使用 Base64
+- 帧结构：`Magic` + `TotalLen` + `Type` + `TransferId` + `ChunkIdx` + `Data`
+- `Type` 固定 `0x01`，`Data` 为原始文件二进制数据
+- 传输完整性依赖 `file_start.checksum`（全文件 SHA-256）；分块校验和可选，不在帧中发送
+
+#### 5.2.4 `file_chunk_ack` - 数据块确认（v1 流式不使用）
+
+v1 采用流式传输，不发送 per-chunk ACK。本节类型仅保留作为向后兼容参考，实际不会发送。
+
+#### 5.2.5 `file_end` - 传输结束
+
+**方向：** Client → Server
+
+```typescript
+type LanTransferFileEndMessage = {
+  type: "file_end";
+  transferId: string; // 传输 ID
+};
+```
+
+**示例：**
+
+```json
+{
+  "type": "file_end",
+  "transferId": "550e8400-e29b-41d4-a716-446655440000"
+}
+```
+
+#### 5.2.6 `file_complete` - 传输完成
+
+**方向：** Server → Client
+
+```typescript
+type LanTransferFileCompleteMessage = {
+  type: "file_complete";
+  transferId: string; // 传输 ID
+  success: boolean; // 是否成功
+  filePath?: string; // 保存路径（成功时）
+  error?: string; // 错误信息（失败时）
+};
+```
+
+**成功示例：**
+
+```json
+{
+  "type": "file_complete",
+  "transferId": "550e8400-e29b-41d4-a716-446655440000",
+  "success": true,
+  "filePath": "/storage/emulated/0/Documents/backup.zip"
+}
+```
+
+**失败示例：**
+
+```json
+{
+  "type": "file_complete",
+  "transferId": "550e8400-e29b-41d4-a716-446655440000",
+  "success": false,
+  "error": "File checksum verification failed"
+}
+```
+
+### 5.3 校验和算法
+
+#### 整个文件校验和（保持不变）
+
+```typescript
+async function calculateFileChecksum(filePath: string): Promise<string> {
+  const hash = crypto.createHash("sha256");
+  const stream = fs.createReadStream(filePath);
+
+  for await (const chunk of stream) {
+    hash.update(chunk);
+  }
+
+  return hash.digest("hex");
+}
+```
+
+#### 数据块校验和
+
+v1 默认 **不传输分块校验和**，依赖最终文件 checksum。若需要，可在应用层自定义（非协议字段）。
+
+### 5.4 校验流程
+
+**发送端（Client）：**
+
+1. 发送前计算整个文件的 SHA-256 → `file_start.checksum`
+2. 分块直接发送原始二进制（无 Base64）
+
+**接收端（Server）：**
+
+1. 收到 `file_chunk` 后直接使用二进制数据
+2. 边收边落盘并增量计算 SHA-256（推荐）
+3. 所有块接收完成后，计算/完成增量哈希，得到最终 SHA-256
+4. 与 `file_start.checksum` 比对，结果写入 `file_complete`
+
+### 5.5 数据块大小计算
+
+```typescript
+const CHUNK_SIZE = 512 * 1024; // 512KB
+
+const totalChunks = Math.ceil(fileSize / CHUNK_SIZE);
+
+// 最后一个块可能小于 CHUNK_SIZE
+const lastChunkSize = fileSize % CHUNK_SIZE || CHUNK_SIZE;
+```
+
+---
+
+## 6. 心跳与连接保活
+
+### 6.1 心跳消息
+
+#### `ping`
+
+**方向：** Client → Server
+
+```typescript
+type LanTransferPingMessage = {
+  type: "ping";
+  payload?: string; // 可选载荷
+};
+```
+
+```json
+{
+  "type": "ping",
+  "payload": "heartbeat"
+}
+```
+
+#### `pong`
+
+**方向：** Server → Client
+
+```typescript
+type LanTransferPongMessage = {
+  type: "pong";
+  received: boolean; // 确认收到
+  payload?: string; // 回传 ping 的载荷
+};
+```
+
+```json
+{
+  "type": "pong",
+  "received": true,
+  "payload": "heartbeat"
+}
+```
+
+### 6.2 心跳策略
+
+- 握手成功后立即发送一次 `ping` 验证连接
+- 可选：定期发送心跳保持连接活跃
+- `pong` 应返回 `ping` 中的 `payload`（可选）
+
+---
+
+## 7. 错误处理
+
+### 7.1 超时配置
+
+| 操作       | 超时时间 | 说明                  |
+| ---------- | -------- | --------------------- |
+| TCP 连接   | 10 秒    | 连接建立超时          |
+| 握手等待   | 10 秒    | 等待 `handshake_ack`  |
+| 传输完成   | 60 秒    | 等待 `file_complete`  |
+
+### 7.2 错误场景处理
+
+| 场景            | Client 处理        | Server 处理            |
+| --------------- | ------------------ | ---------------------- |
+| TCP 连接失败    | 通知 UI，允许重试  | -                      |
+| 握手超时        | 断开连接，通知 UI  | 关闭 socket            |
+| 握手被拒绝      | 显示拒绝原因       | -                      |
+| 数据块处理失败  | 中止传输，清理状态 | 清理临时文件           |
+| 连接意外断开    | 清理状态，通知 UI  | 清理临时文件           |
+| 存储空间不足    | -                  | 发送 `accepted: false` |
+
+### 7.3 资源清理
+
+**Client 端：**
+
+```typescript
+function cleanup(): void {
+  // 1. 销毁文件读取流
+  if (readStream) {
+    readStream.destroy();
+  }
+  // 2. 清理传输状态
+  activeTransfer = undefined;
+  // 3. 关闭 socket（如需要）
+  socket?.destroy();
+}
+```
+
+**Server 端：**
+
+```typescript
+function cleanup(): void {
+  // 1. 关闭文件写入流
+  if (writeStream) {
+    writeStream.end();
+  }
+  // 2. 删除未完成的临时文件
+  if (tempFilePath) {
+    fs.unlinkSync(tempFilePath);
+  }
+  // 3. 清理传输状态
+  activeTransfer = undefined;
+}
+```
+
+---
+
+## 8. 常量与配置
+
+### 8.1 协议常量
+
+```typescript
+// 协议版本（v1 = 控制 JSON + 二进制 chunk + 流式传输）
+export const LAN_TRANSFER_PROTOCOL_VERSION = "1";
+
+// 服务发现
+export const LAN_TRANSFER_SERVICE_TYPE = "cherrystudio";
+export const LAN_TRANSFER_SERVICE_FULL_NAME = "_cherrystudio._tcp";
+
+// TCP 端口
+export const LAN_TRANSFER_TCP_PORT = 53317;
+
+// 文件传输（与二进制帧一致）
+export const LAN_TRANSFER_CHUNK_SIZE = 512 * 1024; // 512KB
+export const LAN_TRANSFER_GLOBAL_TIMEOUT_MS = 10 * 60 * 1000; // 10 分钟
+
+// 超时设置
+export const LAN_TRANSFER_HANDSHAKE_TIMEOUT_MS = 10_000; // 10秒
+export const LAN_TRANSFER_CHUNK_TIMEOUT_MS = 30_000; // 30秒
+export const LAN_TRANSFER_COMPLETE_TIMEOUT_MS = 60_000; // 60秒
+```
+
+### 8.2 支持的文件类型
+
+当前仅支持 ZIP 文件：
+
+```typescript
+export const LAN_TRANSFER_ALLOWED_EXTENSIONS = [".zip"];
+export const LAN_TRANSFER_ALLOWED_MIME_TYPES = [
+  "application/zip",
+  "application/x-zip-compressed",
+];
+```
+
+---
+
+## 9. 完整时序图
+
+### 9.1 完整传输流程（v1，流式传输）
+
+```
+┌─────────┐                           ┌─────────┐                           ┌─────────┐
+│ Renderer│                           │  Main   │                           │ Mobile  │
+│  (UI)   │                           │ Process │                           │ Server  │
+└────┬────┘                           └────┬────┘                           └────┬────┘
+     │                                     │                                     │
+     │  ════════════ 服务发现阶段 ════════════                                   │
+     │                                     │                                     │
+     │ startScan()                         │                                     │
+     │────────────────────────────────────>│                                     │
+     │                                     │ mDNS browse                         │
+     │                                     │ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─ ─>│
+     │                                     │                                     │
+     │                                     │<─ ─ ─ service discovered ─ ─ ─ ─ ─ ─│
+     │                                     │                                     │
+     │<────── onServicesUpdated ───────────│                                     │
+     │                                     │                                     │
+     │  ════════════ 握手连接阶段 ════════════                                   │
+     │                                     │                                     │
+     │ connect(peer)                       │                                     │
+     │────────────────────────────────────>│                                     │
+     │                                     │──────── TCP Connect ───────────────>│
+     │                                     │                                     │
+     │                                     │──────── handshake ─────────────────>│
+     │                                     │                                     │
+     │                                     │<─────── handshake_ack ──────────────│
+     │                                     │                                     │
+     │                                     │──────── ping ──────────────────────>│
+     │                                     │<─────── pong ───────────────────────│
+     │                                     │                                     │
+     │<────── connect result ──────────────│                                     │
+     │                                     │                                     │
+     │  ════════════ 文件传输阶段 ════════════                                   │
+     │                                     │                                     │
+     │ sendFile(path)                      │                                     │
+     │────────────────────────────────────>│                                     │
+     │                                     │──────── file_start ────────────────>│
+     │                                     │                                     │
+     │                                     │<─────── file_start_ack ─────────────│
+     │                                     │                                     │
+     │                                     │                                     │
+     │                                     │══════ 循环发送数据块 ═══════════════│
+     │                                     │                                     │
+     │                                     │──────── file_chunk[0] (binary) ────>│
+     │<────── progress event ──────────────│                                     │
+     │                                     │                                     │
+     │                                     │──────── file_chunk[1] (binary) ────>│
+     │<────── progress event ──────────────│                                     │
+     │                                     │                                     │
+     │                                     │         ... 重复 ...                │
+     │                                     │                                     │
+     │                                     │══════════════════════════════════════│
+     │                                     │                                     │
+     │                                     │──────── file_end ──────────────────>│
+     │                                     │                                     │
+     │                                     │<─────── file_complete ──────────────│
+     │                                     │                                     │
+     │<────── complete event ──────────────│                                     │
+     │<────── sendFile result ─────────────│                                     │
+     │                                     │                                     │
+```
+
+---
+
+## 10. 移动端实现指南（v1 要点）
+
+### 10.1 必须实现的功能
+
+1. **mDNS 服务发布**
+
+   - 发布 `_cherrystudio._tcp` 服务
+   - 提供 TCP 端口号 `53317`
+   - 可选：TXT 记录（版本、平台信息）
+
+2. **TCP 服务端**
+
+   - 监听指定端口
+   - 支持单连接或多连接
+
+3. **消息解析**
+
+   - 控制消息：UTF-8 + `\n` JSON
+   - 数据消息：二进制帧（Magic+TotalLen 分帧）
+
+4. **握手处理**
+
+   - 验证 `handshake` 消息
+   - 发送 `handshake_ack` 响应
+   - 响应 `ping` 消息
+
+5. **文件接收（流式模式）**
+   - 解析 `file_start`，准备接收
+   - 接收 `file_chunk` 二进制帧，直接写入文件/缓冲并增量哈希
+   - v1 不发送 per-chunk ACK（流式传输）
+   - 处理 `file_end`，完成增量哈希并校验 checksum
+   - 发送 `file_complete` 结果
+
+### 10.2 推荐的库
+
+**React Native / Expo：**
+
+- mDNS: `react-native-zeroconf` 或 `@homielab/react-native-bonjour`
+- TCP: `react-native-tcp-socket`
+- Crypto: `expo-crypto` 或 `react-native-quick-crypto`
+
+### 10.3 接收端伪代码
+
+```typescript
+class FileReceiver {
+  private transfer?: {
+    id: string;
+    fileName: string;
+    fileSize: number;
+    checksum: string;
+    totalChunks: number;
+    receivedChunks: number;
+    tempPath: string;
+    // v1: 边收边写文件，避免大文件 OOM
+    // stream: FileSystem writable stream (平台相关封装)
+  };
+
+  handleMessage(message: any) {
+    switch (message.type) {
+      case "handshake":
+        this.handleHandshake(message);
+        break;
+      case "ping":
+        this.sendPong(message);
+        break;
+      case "file_start":
+        this.handleFileStart(message);
+        break;
+      // v1: file_chunk 为二进制帧，不再走 JSON 分支
+      case "file_end":
+        this.handleFileEnd(message);
+        break;
+    }
+  }
+
+  handleFileStart(msg: LanTransferFileStartMessage) {
+    // 1. 检查存储空间
+    // 2. 创建临时文件
+    // 3. 初始化传输状态
+    // 4. 发送 file_start_ack
+  }
+
+  // v1: 二进制帧处理在 socket data 流中解析，随后调用 handleBinaryFileChunk
+  handleBinaryFileChunk(transferId: string, chunkIndex: number, data: Buffer) {
+    // 直接使用二进制数据，按 chunkSize/lastChunk 计算长度
+    // 写入文件流并更新增量 SHA-256
+    this.transfer.receivedChunks++;
+    // v1: 流式传输，不发送 per-chunk ACK
+  }
+
+  handleFileEnd(msg: LanTransferFileEndMessage) {
+    // 1. 合并所有数据块
+    // 2. 验证完整文件 checksum
+    // 3. 写入最终位置
+    // 4. 发送 file_complete
+  }
+}
+```
+
+---
+
+## 附录 A：TypeScript 类型定义
+
+完整的类型定义位于 `packages/shared/config/types.ts`：
+
+```typescript
+// 握手消息
+export interface LanTransferHandshakeMessage {
+  type: "handshake";
+  deviceName: string;
+  version: string;
+  platform?: string;
+  appVersion?: string;
+}
+
+export interface LanTransferHandshakeAckMessage {
+  type: "handshake_ack";
+  accepted: boolean;
+  message?: string;
+}
+
+// 心跳消息
+export interface LanTransferPingMessage {
+  type: "ping";
+  payload?: string;
+}
+
+export interface LanTransferPongMessage {
+  type: "pong";
+  received: boolean;
+  payload?: string;
+}
+
+// 文件传输消息 (Client -> Server)
+export interface LanTransferFileStartMessage {
+  type: "file_start";
+  transferId: string;
+  fileName: string;
+  fileSize: number;
+  mimeType: string;
+  checksum: string;
+  totalChunks: number;
+  chunkSize: number;
+}
+
+export interface LanTransferFileChunkMessage {
+  type: "file_chunk";
+  transferId: string;
+  chunkIndex: number;
+  data: string; // Base64 encoded (v1: 二进制帧模式下不使用)
+}
+
+export interface LanTransferFileEndMessage {
+  type: "file_end";
+  transferId: string;
+}
+
+// 文件传输响应消息 (Server -> Client)
+export interface LanTransferFileStartAckMessage {
+  type: "file_start_ack";
+  transferId: string;
+  accepted: boolean;
+  message?: string;
+}
+
+// v1 流式不发送 per-chunk ACK，以下类型仅用于向后兼容参考
+export interface LanTransferFileChunkAckMessage {
+  type: "file_chunk_ack";
+  transferId: string;
+  chunkIndex: number;
+  received: boolean;
+  error?: string;
+}
+
+export interface LanTransferFileCompleteMessage {
+  type: "file_complete";
+  transferId: string;
+  success: boolean;
+  filePath?: string;
+  error?: string;
+}
+
+// 常量
+export const LAN_TRANSFER_TCP_PORT = 53317;
+export const LAN_TRANSFER_CHUNK_SIZE = 512 * 1024;
+export const LAN_TRANSFER_CHUNK_TIMEOUT_MS = 30_000;
+```
+
+---
+
+## 附录 B：版本历史
+
+| 版本 | 日期    | 变更                                     |
+| ---- | ------- | ---------------------------------------- |
+| 1.0  | 2025-12 | 初始发布版本，支持二进制帧格式与流式传输 |
diff --git a/electron-builder.yml b/electron-builder.yml
index 5e63e7231d..bf7b7b4e91 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -134,108 +134,44 @@ artifactBuildCompleted: scripts/artifact-build-completed.js
 releaseInfo:
   releaseNotes: |
     <!--LANG:en-->
-    A New Era of Intelligence with Cherry Studio 1.7.1
+    Cherry Studio 1.7.9 - New Features & Bug Fixes
 
-    Today we're releasing Cherry Studio 1.7.1 — our most ambitious update yet, introducing Agent: autonomous AI that thinks, plans, and acts.
+    ✨ New Features
+    - [Agent] Add 302.AI provider support
+    - [Browser] Browser data now persists and supports multiple tabs
+    - [Language] Add Romanian language support
+    - [Search] Add fuzzy search for file list
+    - [Models] Add latest Zhipu models
+    - [Image] Improve text-to-image functionality
 
-    For years, AI assistants have been reactive — waiting for your commands, responding to your questions. With Agent, we're changing that. Now, AI can truly work alongside you: understanding complex goals, breaking them into steps, and executing them independently.
-
-    This is what we've been building toward. And it's just the beginning.
-
-    🤖 Meet Agent
-    Imagine having a brilliant colleague who never sleeps. Give Agent a goal — write a report, analyze data, refactor code — and watch it work. It reasons through problems, breaks them into steps, calls the right tools, and adapts when things change.
-
-    - **Think → Plan → Act**: From goal to execution, fully autonomous
-    - **Deep Reasoning**: Multi-turn thinking that solves real problems
-    - **Tool Mastery**: File operations, web search, code execution, and more
-    - **Skill Plugins**: Extend with custom commands and capabilities
-    - **You Stay in Control**: Real-time approval for sensitive actions
-    - **Full Visibility**: Every thought, every decision, fully transparent
-
-    🌐 Expanding Ecosystem
-    - **New Providers**: HuggingFace, Mistral, CherryIN, AI Gateway, Intel OVMS, Didi MCP
-    - **New Models**: Claude 4.5 Haiku, DeepSeek v3.2, GLM-4.6, Doubao, Ling series
-    - **MCP Integration**: Alibaba Cloud, ModelScope, Higress, MCP.so, TokenFlux and more
-
-    📚 Smarter Knowledge Base
-    - **OpenMinerU**: Self-hosted document processing
-    - **Full-Text Search**: Find anything instantly across your notes
-    - **Enhanced Tool Selection**: Smarter configuration for better AI assistance
-
-    📝 Notes, Reimagined
-    - Full-text search with highlighted results
-    - AI-powered smart rename
-    - Export as image
-    - Auto-wrap for tables
-
-    🖼️ Image & OCR
-    - Intel OVMS painting capabilities
-    - Intel OpenVINO NPU-accelerated OCR
-
-    🌍 Now in 10+ Languages
-    - Added German support
-    - Enhanced internationalization
-
-    ⚡ Faster & More Polished
-    - Electron 38 upgrade
-    - New MCP management interface
-    - Dozens of UI refinements
-
-    ❤️ Fully Open Source
-    Commercial restrictions removed. Cherry Studio now follows standard AGPL v3 — free for teams of any size.
-
-    The Agent Era is here. We can't wait to see what you'll create.
+    🐛 Bug Fixes
+    - [Mac] Fix mini window unexpected closing issue
+    - [Preview] Fix HTML preview controls not working in fullscreen
+    - [Translate] Fix translation duplicate execution issue
+    - [Zoom] Fix page zoom reset issue during navigation
+    - [Agent] Fix crash when switching between agent and assistant
+    - [Agent] Fix navigation in agent mode
+    - [Copy] Fix markdown copy button issue
+    - [Windows] Fix compatibility issues on non-Windows systems
 
     <!--LANG:zh-CN-->
-    Cherry Studio 1.7.1：开启智能新纪元
+    Cherry Studio 1.7.9 - 新功能与问题修复
 
-    今天，我们正式发布 Cherry Studio 1.7.1 —— 迄今最具雄心的版本，带来全新的 Agent：能够自主思考、规划和行动的 AI。
+    ✨ 新功能
+    - [Agent] 新增 302.AI 服务商支持
+    - [浏览器] 浏览器数据现在可以保存，支持多标签页
+    - [语言] 新增罗马尼亚语支持
+    - [搜索] 文件列表新增模糊搜索功能
+    - [模型] 新增最新智谱模型
+    - [图片] 优化文生图功能
 
-    多年来，AI 助手一直是被动的——等待你的指令，回应你的问题。Agent 改变了这一切。现在，AI 能够真正与你并肩工作：理解复杂目标，将其拆解为步骤，并独立执行。
-
-    这是我们一直在构建的未来。而这，仅仅是开始。
-
-    🤖 认识 Agent
-    想象一位永不疲倦的得力伙伴。给 Agent 一个目标——撰写报告、分析数据、重构代码——然后看它工作。它会推理问题、拆解步骤、调用工具，并在情况变化时灵活应对。
-
-    - **思考 → 规划 → 行动**：从目标到执行，全程自主
-    - **深度推理**：多轮思考，解决真实问题
-    - **工具大师**：文件操作、网络搜索、代码执行，样样精通
-    - **技能插件**：自定义命令，无限扩展
-    - **你掌控全局**：敏感操作，实时审批
-    - **完全透明**：每一步思考，每一个决策，清晰可见
-
-    🌐 生态持续壮大
-    - **新增服务商**：Hugging Face、Mistral、Perplexity、SophNet、AI Gateway、Cerebras AI
-    - **新增模型**：Gemini 3、Gemini 3 Pro（支持图像预览）、GPT-5.1、Claude Opus 4.5
-    - **MCP 集成**：百炼、魔搭、Higress、MCP.so、TokenFlux 等平台
-
-    📚 更智能的知识库
-    - **OpenMinerU**：本地自部署文档处理
-    - **全文搜索**：笔记内容一搜即达
-    - **增强工具选择**：更智能的配置，更好的 AI 协助
-
-    📝 笔记，焕然一新
-    - 全文搜索，结果高亮
-    - AI 智能重命名
-    - 导出为图片
-    - 表格自动换行
-
-    🖼️ 图像与 OCR
-    - Intel OVMS 绘图能力
-    - Intel OpenVINO NPU 加速 OCR
-
-    🌍 支持 10+ 种语言
-    - 新增德语支持
-    - 全面增强国际化
-
-    ⚡ 更快、更精致
-    - 升级 Electron 38
-    - 新的 MCP 管理界面
-    - 数十处 UI 细节打磨
-
-    ❤️ 完全开源
-    商用限制已移除。Cherry Studio 现遵循标准 AGPL v3 协议——任意规模团队均可自由使用。
-
-    Agent 纪元已至。期待你的创造。
+    🐛 问题修复
+    - [Mac] 修复迷你窗口意外关闭的问题
+    - [预览] 修复全屏模式下 HTML 预览控件无法使用的问题
+    - [翻译] 修复翻译重复执行的问题
+    - [缩放] 修复页面导航时缩放被重置的问题
+    - [智能体] 修复在智能体和助手间切换时崩溃的问题
+    - [智能体] 修复智能体模式下的导航问题
+    - [复制] 修复 Markdown 复制按钮问题
+    - [兼容性] 修复非 Windows 系统的兼容性问题
     <!--LANG:END-->
diff --git a/electron.vite.config.ts b/electron.vite.config.ts
index 172d48ca9a..89c0cf2f9b 100644
--- a/electron.vite.config.ts
+++ b/electron.vite.config.ts
@@ -1,6 +1,6 @@
 import react from '@vitejs/plugin-react-swc'
 import { CodeInspectorPlugin } from 'code-inspector-plugin'
-import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
+import { defineConfig } from 'electron-vite'
 import { resolve } from 'path'
 import { visualizer } from 'rollup-plugin-visualizer'
 
@@ -17,7 +17,7 @@ const isProd = process.env.NODE_ENV === 'production'
 
 export default defineConfig({
   main: {
-    plugins: [externalizeDepsPlugin(), ...visualizerPlugin('main')],
+    plugins: [...visualizerPlugin('main')],
     resolve: {
       alias: {
         '@main': resolve('src/main'),
@@ -51,8 +51,7 @@ export default defineConfig({
     plugins: [
       react({
         tsDecorators: true
-      }),
-      externalizeDepsPlugin()
+      })
     ],
     resolve: {
       alias: {
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 64fdefa1dc..9eb20d1238 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -61,6 +61,7 @@ export default defineConfig([
       'tests/**',
       '.yarn/**',
       '.gitignore',
+      '.conductor/**',
       'scripts/cloudflare-worker.js',
       'src/main/integration/nutstore/sso/lib/**',
       'src/main/integration/cherryai/index.js',
diff --git a/package.json b/package.json
index fd5eb0151d..6dddf4fd4a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "1.7.1",
+  "version": "1.7.9",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",
@@ -27,6 +27,7 @@
   "scripts": {
     "start": "electron-vite preview",
     "dev": "dotenv electron-vite dev",
+    "dev:watch": "dotenv electron-vite dev -- -w",
     "debug": "electron-vite -- --inspect --sourcemap --remote-debugging-port=9222",
     "build": "npm run typecheck && electron-vite build",
     "build:check": "yarn lint && yarn test",
@@ -53,10 +54,10 @@
     "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",
-    "sync:i18n": "dotenv -e .env -- tsx scripts/sync-i18n.ts",
-    "update:i18n": "dotenv -e .env -- tsx scripts/update-i18n.ts",
-    "auto:i18n": "dotenv -e .env -- tsx scripts/auto-translate-i18n.ts",
+    "i18n:check": "dotenv -e .env -- tsx scripts/check-i18n.ts",
+    "i18n:sync": "dotenv -e .env -- tsx scripts/sync-i18n.ts",
+    "i18n:translate": "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",
@@ -70,7 +71,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",
@@ -81,12 +82,13 @@
     "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.53#~/.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.53-4b77f4cf29.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",
     "@paymoapp/electron-shutdown-handler": "^1.1.2",
     "@strongtz/win32-arm64-msvc": "^0.4.7",
+    "bonjour-service": "^1.3.0",
     "emoji-picker-element-data": "^1",
     "express": "^5.1.0",
     "font-list": "^2.0.0",
@@ -97,10 +99,8 @@
     "node-stream-zip": "^1.15.0",
     "officeparser": "^4.2.0",
     "os-proxy-config": "^1.1.2",
-    "qrcode.react": "^4.2.0",
     "selection-hook": "^1.0.12",
     "sharp": "^0.34.3",
-    "socket.io": "^4.8.1",
     "swagger-jsdoc": "^6.2.8",
     "swagger-ui-express": "^5.0.1",
     "tesseract.js": "patch:tesseract.js@npm%3A6.0.1#~/.yarn/patches/tesseract.js-npm-6.0.1-2562a7e46d.patch",
@@ -114,11 +114,11 @@
     "@ai-sdk/anthropic": "^2.0.49",
     "@ai-sdk/cerebras": "^1.0.31",
     "@ai-sdk/gateway": "^2.0.15",
-    "@ai-sdk/google": "patch:@ai-sdk/google@npm%3A2.0.43#~/.yarn/patches/@ai-sdk-google-npm-2.0.43-689ed559b3.patch",
-    "@ai-sdk/google-vertex": "^3.0.79",
+    "@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.94",
     "@ai-sdk/huggingface": "^0.0.10",
     "@ai-sdk/mistral": "^2.0.24",
-    "@ai-sdk/openai": "patch:@ai-sdk/openai@npm%3A2.0.72#~/.yarn/patches/@ai-sdk-openai-npm-2.0.72-234e68da87.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",
@@ -142,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",
@@ -274,7 +274,7 @@
     "electron-reload": "^2.0.0-alpha.1",
     "electron-store": "^8.2.0",
     "electron-updater": "patch:electron-updater@npm%3A6.7.0#~/.yarn/patches/electron-updater-npm-6.7.0-47b11bb0d4.patch",
-    "electron-vite": "4.0.1",
+    "electron-vite": "5.0.0",
     "electron-window-state": "^5.0.3",
     "emittery": "^1.0.3",
     "emoji-picker-element": "^1.22.1",
@@ -318,7 +318,7 @@
     "motion": "^12.10.5",
     "notion-helper": "^1.3.22",
     "npx-scope-finder": "^1.2.0",
-    "ollama-ai-provider-v2": "^1.5.5",
+    "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",
@@ -371,7 +371,7 @@
     "undici": "6.21.2",
     "unified": "^11.0.5",
     "uuid": "^13.0.0",
-    "vite": "npm:rolldown-vite@7.1.5",
+    "vite": "npm:rolldown-vite@7.3.0",
     "vitest": "^3.2.4",
     "webdav": "^5.8.0",
     "winston": "^3.17.0",
@@ -401,7 +401,7 @@
     "pkce-challenge@npm:^4.1.0": "patch:pkce-challenge@npm%3A4.1.0#~/.yarn/patches/pkce-challenge-npm-4.1.0-fbc51695a3.patch",
     "tar-fs": "^2.1.4",
     "undici": "6.21.2",
-    "vite": "npm:rolldown-vite@7.1.5",
+    "vite": "npm:rolldown-vite@7.3.0",
     "tesseract.js@npm:*": "patch:tesseract.js@npm%3A6.0.1#~/.yarn/patches/tesseract.js-npm-6.0.1-2562a7e46d.patch",
     "@ai-sdk/openai@npm:^2.0.52": "patch:@ai-sdk/openai@npm%3A2.0.52#~/.yarn/patches/@ai-sdk-openai-npm-2.0.52-b36d949c76.patch",
     "@img/sharp-darwin-arm64": "0.34.3",
@@ -414,9 +414,12 @@
     "@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.42": "patch:@ai-sdk/openai@npm%3A2.0.72#~/.yarn/patches/@ai-sdk-openai-npm-2.0.72-234e68da87.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/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-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/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.28#~/.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.28-5705188855.patch",
+    "@ai-sdk/openai-compatible@npm:^1.0.19": "patch:@ai-sdk/openai-compatible@npm%3A1.0.28#~/.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.28-5705188855.patch"
   },
   "packageManager": "yarn@4.9.1",
   "lint-staged": {
diff --git a/packages/ai-sdk-provider/package.json b/packages/ai-sdk-provider/package.json
index 25864f3b1f..e635f93aeb 100644
--- a/packages/ai-sdk-provider/package.json
+++ b/packages/ai-sdk-provider/package.json
@@ -41,7 +41,7 @@
     "ai": "^5.0.26"
   },
   "dependencies": {
-    "@ai-sdk/openai-compatible": "^1.0.28",
+    "@ai-sdk/openai-compatible": "patch:@ai-sdk/openai-compatible@npm%3A1.0.28#~/.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.28-5705188855.patch",
     "@ai-sdk/provider": "^2.0.0",
     "@ai-sdk/provider-utils": "^3.0.17"
   },
diff --git a/packages/aiCore/package.json b/packages/aiCore/package.json
index a648dcf3c7..e73a843b1d 100644
--- a/packages/aiCore/package.json
+++ b/packages/aiCore/package.json
@@ -40,9 +40,9 @@
   },
   "dependencies": {
     "@ai-sdk/anthropic": "^2.0.49",
-    "@ai-sdk/azure": "^2.0.74",
+    "@ai-sdk/azure": "^2.0.87",
     "@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/openai-compatible": "patch:@ai-sdk/openai-compatible@npm%3A1.0.28#~/.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.28-5705188855.patch",
     "@ai-sdk/provider": "^2.0.0",
     "@ai-sdk/provider-utils": "^3.0.17",
     "@ai-sdk/xai": "^2.0.36",
diff --git a/packages/aiCore/src/core/plugins/built-in/toolUsePlugin/StreamEventManager.ts b/packages/aiCore/src/core/plugins/built-in/toolUsePlugin/StreamEventManager.ts
index 59a425712c..c30c2015f6 100644
--- a/packages/aiCore/src/core/plugins/built-in/toolUsePlugin/StreamEventManager.ts
+++ b/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(
-    controller: StreamController,
-    recursiveStream: ReadableStream,
-    context?: AiRequestContext
-  ): Promise<void> {
+  private async pipeRecursiveStream(controller: StreamController, recursiveStream: ReadableStream): Promise<void> {
     const reader = recursiveStream.getReader()
     try {
       while (true) {
@@ -86,18 +82,14 @@ export class StreamEventManager {
         if (done) {
           break
         }
+        if (value.type === 'start') {
+          continue
+        }
+
         if (value.type === 'finish') {
-          // 迭代的流不发finish，但需要累加其 usage
-          if (value.usage && context?.accumulatedUsage) {
-            this.accumulateUsage(context.accumulatedUsage, value.usage)
-          }
           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 || []),
-      {
-        role: 'assistant',
-        content: textBuffer
-      },
+      // 只有当 textBuffer 有内容时才添加 assistant 消息，避免空消息导致 API 错误
+      ...(textBuffer ? [{ role: 'assistant' as const, 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 类型
diff --git a/packages/aiCore/src/core/plugins/built-in/toolUsePlugin/promptToolUsePlugin.ts b/packages/aiCore/src/core/plugins/built-in/toolUsePlugin/promptToolUsePlugin.ts
index 274fdcee5c..224cee05ae 100644
--- a/packages/aiCore/src/core/plugins/built-in/toolUsePlugin/promptToolUsePlugin.ts
+++ b/packages/aiCore/src/core/plugins/built-in/toolUsePlugin/promptToolUsePlugin.ts
@@ -22,10 +22,10 @@ const TOOL_USE_TAG_CONFIG: TagConfig = {
 }
 
 /**
- * 默认系统提示符模板（提取自 Cherry Studio）
+ * 默认系统提示符模板
  */
-const DEFAULT_SYSTEM_PROMPT = `In this environment you have access to a set of tools you can use to answer the user's question. \\
-You can use one tool per message, and will receive the result of that tool use in the user's response. You use tools step-by-step to accomplish a given task, with each tool use informed by the result of the previous tool use.
+export const DEFAULT_SYSTEM_PROMPT = `In this environment you have access to a set of tools you can use to answer the user's question. \
+You can use one or more tools per message, and will receive the result of that tool use in the user's response. You use tools step-by-step to accomplish a given task, with each tool use informed by the result of the previous tool use.
 
 ## Tool Use Formatting
 
@@ -74,10 +74,13 @@ Here are the rules you should always follow to solve your task:
 4. Never re-do a tool call that you previously did with the exact same parameters.
 5. For tool use, MAKE SURE use XML tag format as shown in the examples above. Do not use any other format.
 
+## Response rules
+
+Respond in the language of the user's query, unless the user instructions specify additional requirements for the language to be used.
+
 # User Instructions
 {{ USER_SYSTEM_PROMPT }}
-
-Now Begin! If you solve the task correctly, you will receive a reward of $1,000,000.`
+`
 
 /**
  * 默认工具使用示例（提取自 Cherry Studio）
@@ -411,7 +414,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)
 
             // 清理状态
diff --git a/packages/aiCore/src/core/plugins/built-in/webSearchPlugin/helper.ts b/packages/aiCore/src/core/plugins/built-in/webSearchPlugin/helper.ts
index 61e6f49b81..6e313bdd27 100644
--- a/packages/aiCore/src/core/plugins/built-in/webSearchPlugin/helper.ts
+++ b/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'
 
 /**
@@ -95,28 +96,84 @@ export type WebSearchToolInputSchema = {
   'openai-chat': InferToolInput<OpenAIChatWebSearchTool>
 }
 
-export const switchWebSearchTool = (config: WebSearchPluginConfig, params: any) => {
-  if (config.openai) {
-    if (!params.tools) params.tools = {}
-    params.tools.web_search = openai.tools.webSearch(config.openai)
-  } else if (config['openai-chat']) {
-    if (!params.tools) params.tools = {}
-    params.tools.web_search_preview = openai.tools.webSearchPreview(config['openai-chat'])
-  } else if (config.anthropic) {
-    if (!params.tools) params.tools = {}
-    params.tools.web_search = anthropic.tools.webSearch_20250305(config.anthropic)
-  } else if (config.google) {
-    // case 'google-vertex':
-    if (!params.tools) params.tools = {}
-    params.tools.web_search = google.tools.googleSearch(config.google || {})
-  } else if (config.xai) {
-    const searchOptions = createXaiOptions({
-      searchParameters: { ...config.xai, mode: 'on' }
-    })
-    params.providerOptions = mergeProviderOptions(params.providerOptions, searchOptions)
-  } else if (config.openrouter) {
-    const searchOptions = createOpenRouterOptions(config.openrouter)
-    params.providerOptions = mergeProviderOptions(params.providerOptions, searchOptions)
+/**
+ * Helper function to ensure params.tools object exists
+ */
+const ensureToolsObject = (params: any) => {
+  if (!params.tools) params.tools = {}
+}
+
+/**
+ * Helper function to apply tool-based web search configuration
+ */
+const applyToolBasedSearch = (params: any, toolName: string, toolInstance: any) => {
+  ensureToolsObject(params)
+  params.tools[toolName] = toolInstance
+}
+
+/**
+ * Helper function to apply provider options-based web search configuration
+ */
+const applyProviderOptionsSearch = (params: any, searchOptions: any) => {
+  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)
+    }
   }
+
+  // Try provider-specific handler first
+  const handler = providerId && providerHandlers[providerId]
+  if (handler) {
+    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
 }
diff --git a/packages/aiCore/src/core/plugins/built-in/webSearchPlugin/index.ts b/packages/aiCore/src/core/plugins/built-in/webSearchPlugin/index.ts
index a46df7dd4c..e02fd179fe 100644
--- a/packages/aiCore/src/core/plugins/built-in/webSearchPlugin/index.ts
+++ b/packages/aiCore/src/core/plugins/built-in/webSearchPlugin/index.ts
@@ -17,8 +17,22 @@ export const webSearchPlugin = (config: WebSearchPluginConfig = DEFAULT_WEB_SEAR
     name: 'webSearch',
     enforce: 'pre',
 
-    transformParams: async (params: any) => {
-      switchWebSearchTool(config, params)
+    transformParams: async (params: any, context) => {
+      let { providerId } = context
+
+      // 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') {
+        const provider = params.model?.provider
+        if (provider && typeof provider === 'string' && provider.includes('.')) {
+          const extractedProviderId = provider.split('.')[1]
+          if (extractedProviderId) {
+            providerId = extractedProviderId
+          }
+        }
+      }
+
+      switchWebSearchTool(config, params, { ...context, providerId })
       return params
     }
   })
diff --git a/packages/shared/IpcChannel.ts b/packages/shared/IpcChannel.ts
index 27d208a2a8..7771d4d87a 100644
--- a/packages/shared/IpcChannel.ts
+++ b/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',
 
@@ -232,6 +236,8 @@ export enum IpcChannel {
   Backup_ListS3Files = 'backup:listS3Files',
   Backup_DeleteS3File = 'backup:deleteS3File',
   Backup_CheckS3Connection = 'backup:checkS3Connection',
+  Backup_CreateLanTransferBackup = 'backup:createLanTransferBackup',
+  Backup_DeleteTempBackup = 'backup:deleteTempBackup',
 
   // zip
   Zip_Compress = 'zip:compress',
@@ -242,6 +248,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',
@@ -296,6 +305,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',
 
@@ -310,6 +321,7 @@ export enum IpcChannel {
   Memory_DeleteUser = 'memory:delete-user',
   Memory_DeleteAllMemoriesForUser = 'memory:delete-all-memories-for-user',
   Memory_GetUsersList = 'memory:get-users-list',
+  Memory_MigrateMemoryDb = 'memory:migrate-memory-db',
 
   // TRACE
   TRACE_SAVE_DATA = 'trace:saveData',
@@ -355,6 +367,7 @@ export enum IpcChannel {
   OCR_ListProviders = 'ocr:list-providers',
 
   // OVMS
+  Ovms_IsSupported = 'ovms:is-supported',
   Ovms_AddModel = 'ovms:add-model',
   Ovms_StopAddModel = 'ovms:stop-addmodel',
   Ovms_GetModels = 'ovms:get-models',
@@ -375,10 +388,14 @@ export enum IpcChannel {
   ClaudeCodePlugin_ReadContent = 'claudeCodePlugin:read-content',
   ClaudeCodePlugin_WriteContent = 'claudeCodePlugin:write-content',
 
-  // WebSocket
-  WebSocket_Start = 'webSocket:start',
-  WebSocket_Stop = 'webSocket:stop',
-  WebSocket_Status = 'webSocket:status',
-  WebSocket_SendFile = 'webSocket:send-file',
-  WebSocket_GetAllCandidates = 'webSocket:get-all-candidates'
+  // Local Transfer
+  LocalTransfer_ListServices = 'local-transfer:list',
+  LocalTransfer_StartScan = 'local-transfer:start-scan',
+  LocalTransfer_StopScan = 'local-transfer:stop-scan',
+  LocalTransfer_ServicesUpdated = 'local-transfer:services-updated',
+  LocalTransfer_Connect = 'local-transfer:connect',
+  LocalTransfer_Disconnect = 'local-transfer:disconnect',
+  LocalTransfer_ClientEvent = 'local-transfer:client-event',
+  LocalTransfer_SendFile = 'local-transfer:send-file',
+  LocalTransfer_CancelTransfer = 'local-transfer:cancel-transfer'
 }
diff --git a/packages/shared/anthropic/index.ts b/packages/shared/anthropic/index.ts
index bff143d118..b9e9cb8846 100644
--- a/packages/shared/anthropic/index.ts
+++ b/packages/shared/anthropic/index.ts
@@ -88,16 +88,11 @@ export function getSdkClient(
       }
     })
   }
-  let baseURL =
+  const baseURL =
     provider.type === 'anthropic'
       ? provider.apiHost
       : (provider.anthropicApiHost && provider.anthropicApiHost.trim()) || provider.apiHost
 
-  // Anthropic SDK automatically appends /v1 to all endpoints (like /v1/messages, /v1/models)
-  // We need to strip api version from baseURL to avoid duplication (e.g., /v3/v1/models)
-  // formatProviderApiHost adds /v1 for AI SDK compatibility, but Anthropic SDK needs it removed
-  baseURL = baseURL.replace(/\/v\d+(?:alpha|beta)?(?=\/|$)/i, '')
-
   logger.debug('Anthropic API baseURL', { baseURL, providerId: provider.id })
 
   if (provider.id === 'aihubmix') {
diff --git a/packages/shared/config/constant.ts b/packages/shared/config/constant.ts
index 1e02ce7706..af0191f4fa 100644
--- a/packages/shared/config/constant.ts
+++ b/packages/shared/config/constant.ts
@@ -488,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
+}
diff --git a/packages/shared/config/types.ts b/packages/shared/config/types.ts
index 8fba6399f8..56f746b0d5 100644
--- a/packages/shared/config/types.ts
+++ b/packages/shared/config/types.ts
@@ -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
@@ -44,3 +52,196 @@ export interface WebSocketCandidatesResponse {
   interface: string
   priority: number
 }
+
+export type LocalTransferPeer = {
+  id: string
+  name: string
+  host?: string
+  fqdn?: string
+  port?: number
+  type?: string
+  protocol?: 'tcp' | 'udp'
+  addresses: string[]
+  txt?: Record<string, string>
+  updatedAt: number
+}
+
+export type LocalTransferState = {
+  services: LocalTransferPeer[]
+  isScanning: boolean
+  lastScanStartedAt?: number
+  lastUpdatedAt: number
+  lastError?: string
+}
+
+export type LanHandshakeRequestMessage = {
+  type: 'handshake'
+  deviceName: string
+  version: string
+  platform?: string
+  appVersion?: string
+}
+
+export type LanHandshakeAckMessage = {
+  type: 'handshake_ack'
+  accepted: boolean
+  message?: string
+}
+
+export type LocalTransferConnectPayload = {
+  peerId: string
+  metadata?: Record<string, string>
+  timeoutMs?: number
+}
+
+export type LanClientEvent =
+  | {
+      type: 'ping_sent'
+      payload: string
+      timestamp: number
+      peerId?: string
+      peerName?: string
+    }
+  | {
+      type: 'pong'
+      payload?: string
+      received?: boolean
+      timestamp: number
+      peerId?: string
+      peerName?: string
+    }
+  | {
+      type: 'socket_closed'
+      reason?: string
+      timestamp: number
+      peerId?: string
+      peerName?: string
+    }
+  | {
+      type: 'error'
+      message: string
+      timestamp: number
+      peerId?: string
+      peerName?: string
+    }
+  | {
+      type: 'file_transfer_progress'
+      transferId: string
+      fileName: string
+      bytesSent: number
+      totalBytes: number
+      chunkIndex: number
+      totalChunks: number
+      progress: number // 0-100
+      speed: number // bytes/sec
+      timestamp: number
+      peerId?: string
+      peerName?: string
+    }
+  | {
+      type: 'file_transfer_complete'
+      transferId: string
+      fileName: string
+      success: boolean
+      filePath?: string
+      error?: string
+      timestamp: number
+      peerId?: string
+      peerName?: string
+    }
+
+// =============================================================================
+// LAN File Transfer Protocol Types
+// =============================================================================
+
+// Constants for file transfer
+export const LAN_TRANSFER_TCP_PORT = 53317
+export const LAN_TRANSFER_CHUNK_SIZE = 512 * 1024 // 512KB
+export const LAN_TRANSFER_MAX_FILE_SIZE = 500 * 1024 * 1024 // 500MB
+export const LAN_TRANSFER_COMPLETE_TIMEOUT_MS = 60_000 // 60s - wait for file_complete after file_end
+export const LAN_TRANSFER_GLOBAL_TIMEOUT_MS = 10 * 60 * 1000 // 10 minutes - global transfer timeout
+
+// Binary protocol constants (v1)
+export const LAN_TRANSFER_PROTOCOL_VERSION = '1'
+export const LAN_BINARY_FRAME_MAGIC = 0x4353 // "CS" as uint16
+export const LAN_BINARY_TYPE_FILE_CHUNK = 0x01
+
+// Messages from Electron (Client/Sender) to Mobile (Server/Receiver)
+
+/** Request to start file transfer */
+export type LanFileStartMessage = {
+  type: 'file_start'
+  transferId: string
+  fileName: string
+  fileSize: number
+  mimeType: string // 'application/zip'
+  checksum: string // SHA-256 of entire file
+  totalChunks: number
+  chunkSize: number
+}
+
+/**
+ * File chunk data (JSON format)
+ * @deprecated Use binary frame format in protocol v1. This type is kept for reference only.
+ */
+export type LanFileChunkMessage = {
+  type: 'file_chunk'
+  transferId: string
+  chunkIndex: number
+  data: string // Base64 encoded
+  chunkChecksum: string // SHA-256 of this chunk
+}
+
+/** Notification that all chunks have been sent */
+export type LanFileEndMessage = {
+  type: 'file_end'
+  transferId: string
+}
+
+/** Request to cancel file transfer */
+export type LanFileCancelMessage = {
+  type: 'file_cancel'
+  transferId: string
+  reason?: string
+}
+
+// Messages from Mobile (Server/Receiver) to Electron (Client/Sender)
+
+/** Acknowledgment of file transfer request */
+export type LanFileStartAckMessage = {
+  type: 'file_start_ack'
+  transferId: string
+  accepted: boolean
+  message?: string // Rejection reason
+}
+
+/**
+ * Acknowledgment of file chunk received
+ * @deprecated Protocol v1 uses streaming mode without per-chunk acknowledgment.
+ * This type is kept for backward compatibility reference only.
+ */
+export type LanFileChunkAckMessage = {
+  type: 'file_chunk_ack'
+  transferId: string
+  chunkIndex: number
+  received: boolean
+  message?: string
+}
+
+/** Final result of file transfer */
+export type LanFileCompleteMessage = {
+  type: 'file_complete'
+  transferId: string
+  success: boolean
+  filePath?: string // Path where file was saved on mobile
+  error?: string
+  // Enhanced error diagnostics
+  errorCode?: 'CHECKSUM_MISMATCH' | 'INCOMPLETE_TRANSFER' | 'DISK_ERROR' | 'CANCELLED'
+  receivedChunks?: number
+  receivedBytes?: number
+}
+
+/** Payload for sending a file via IPC */
+export type LanFileSendPayload = {
+  filePath: string
+}
diff --git a/packages/shared/utils.ts b/packages/shared/utils.ts
index a14f78958d..7e90624aba 100644
--- a/packages/shared/utils.ts
+++ b/packages/shared/utils.ts
@@ -35,3 +35,56 @@ export const defaultAppHeaders = () => {
 //     return value
 //   }
 // }
+
+/**
+ * Extracts the trailing API version segment from a URL path.
+ *
+ * This function extracts API version patterns (e.g., `v1`, `v2beta`) from the end of a URL.
+ * Only versions at the end of the path are extracted, not versions in the middle.
+ * The returned version string does not include leading or trailing slashes.
+ *
+ * @param {string} url - The URL string to parse.
+ * @returns {string | undefined} The trailing API version found (e.g., 'v1', 'v2beta'), or undefined if none found.
+ *
+ * @example
+ * getTrailingApiVersion('https://api.example.com/v1') // 'v1'
+ * getTrailingApiVersion('https://api.example.com/v2beta/') // 'v2beta'
+ * getTrailingApiVersion('https://api.example.com/v1/chat') // undefined (version not at end)
+ * getTrailingApiVersion('https://gateway.ai.cloudflare.com/v1/xxx/v1beta') // 'v1beta'
+ * getTrailingApiVersion('https://api.example.com') // undefined
+ */
+export function getTrailingApiVersion(url: string): string | undefined {
+  const match = url.match(TRAILING_VERSION_REGEX)
+
+  if (match) {
+    // Extract version without leading slash and trailing slash
+    return match[0].replace(/^\//, '').replace(/\/$/, '')
+  }
+
+  return undefined
+}
+
+/**
+ * Matches an API version at the end of a URL (with optional trailing slash).
+ * Used to detect and extract versions only from the trailing position.
+ */
+const TRAILING_VERSION_REGEX = /\/v\d+(?:alpha|beta)?\/?$/i
+
+/**
+ * Removes the trailing API version segment from a URL path.
+ *
+ * This function removes API version patterns (e.g., `/v1`, `/v2beta`) from the end of a URL.
+ * Only versions at the end of the path are removed, not versions in the middle.
+ *
+ * @param {string} url - The URL string to process.
+ * @returns {string} The URL with the trailing API version removed, or the original URL if no trailing version found.
+ *
+ * @example
+ * withoutTrailingApiVersion('https://api.example.com/v1') // 'https://api.example.com'
+ * withoutTrailingApiVersion('https://api.example.com/v2beta/') // 'https://api.example.com'
+ * withoutTrailingApiVersion('https://api.example.com/v1/chat') // 'https://api.example.com/v1/chat' (no change)
+ * withoutTrailingApiVersion('https://api.example.com') // 'https://api.example.com'
+ */
+export function withoutTrailingApiVersion(url: string): string {
+  return url.replace(TRAILING_VERSION_REGEX, '')
+}
diff --git a/resources/scripts/install-ovms.js b/resources/scripts/install-ovms.js
index e4a5cf0444..8ccd522b01 100644
--- a/resources/scripts/install-ovms.js
+++ b/resources/scripts/install-ovms.js
@@ -6,12 +6,12 @@ const { downloadWithPowerShell } = require('./download')
 
 // Base URL for downloading OVMS binaries
 const OVMS_RELEASE_BASE_URL =
-  'https://storage.openvinotoolkit.org/repositories/openvino_model_server/packages/2025.3.0/ovms_windows_python_on.zip'
-const OVMS_EX_URL = 'https://gitcode.com/gcw_ggDjjkY3/kjfile/releases/download/download/ovms_25.3_ex.zip'
+  'https://storage.openvinotoolkit.org/repositories/openvino_model_server/packages/2025.4.1/ovms_windows_python_on.zip'
+const OVMS_EX_URL = 'https://gitcode.com/gcw_ggDjjkY3/kjfile/releases/download/download/ovms_25.4_ex.zip'
 
 /**
  * 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')) {
-    console.error('OVMS installation requires an Intel(R) Core(TM) Ultra CPU.')
+  if (!cpuName.toLowerCase().includes('intel')) {
+    console.error('OVMS installation requires an Intel CPU.')
     return 101
   }
 
diff --git a/scripts/auto-translate-i18n.ts b/scripts/auto-translate-i18n.ts
index 7a1bea6f35..41bb14a0a1 100644
--- a/scripts/auto-translate-i18n.ts
+++ b/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
@@ -152,7 +152,8 @@ const languageMap = {
   'es-es': 'Spanish',
   'fr-fr': 'French',
   'pt-pt': 'Portuguese',
-  'de-de': 'German'
+  'de-de': 'German',
+  'ro-ro': 'Romanian'
 }
 
 const PROMPT = `
diff --git a/scripts/check-i18n.ts b/scripts/check-i18n.ts
index 5735474106..ac1adc3de8 100644
--- a/scripts/check-i18n.ts
+++ b/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 以解决问题。`)
   }
 }
 
diff --git a/scripts/win-sign.js b/scripts/win-sign.js
index f9b37c3aed..cdbfe11e17 100644
--- a/scripts/win-sign.js
+++ b/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) {
diff --git a/src/main/index.ts b/src/main/index.ts
index 56750e6b61..536485a490 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -19,7 +19,9 @@ import { agentService } from './services/agents'
 import { apiServerService } from './services/ApiServerService'
 import { appMenuService } from './services/AppMenuService'
 import { configManager } from './services/ConfigManager'
+import { lanTransferClientService } from './services/lanTransfer'
 import mcpService from './services/MCPService'
+import { localTransferService } from './services/LocalTransferService'
 import { nodeTraceService } from './services/NodeTraceService'
 import powerMonitorService from './services/PowerMonitorService'
 import {
@@ -35,6 +37,7 @@ import { versionService } from './services/VersionService'
 import { windowService } from './services/WindowService'
 import { initWebviewHotkeys } from './services/WebviewService'
 import { runAsyncFunction } from './utils'
+import { isOvmsSupported } from './services/OvmsManager'
 
 const logger = loggerService.withContext('MainEntry')
 
@@ -155,7 +158,8 @@ if (!app.requestSingleInstanceLock()) {
 
     registerShortcuts(mainWindow)
 
-    registerIpc(mainWindow, app)
+    await registerIpc(mainWindow, app)
+    localTransferService.startDiscovery({ resetList: true })
 
     replaceDevtoolsFont(mainWindow)
 
@@ -237,16 +241,29 @@ if (!app.requestSingleInstanceLock()) {
     if (selectionService) {
       selectionService.quit()
     }
+
+    lanTransferClientService.dispose()
+    localTransferService.dispose()
   })
 
   app.on('will-quit', async () => {
     // 简单的资源清理，不阻塞退出流程
+    if (isOvmsSupported) {
+      const { ovmsManager } = await import('./services/OvmsManager')
+      if (ovmsManager) {
+        await ovmsManager.stopOvms()
+      } else {
+        logger.warn('Unexpected behavior: undefined ovmsManager, but OVMS should be supported.')
+      }
+    }
+
     try {
       await mcpService.cleanup()
       await apiServerService.stop()
     } catch (error) {
       logger.warn('Error cleaning up MCP service:', error as Error)
     }
+
     // finish the logger
     logger.finish()
   })
diff --git a/src/main/ipc.ts b/src/main/ipc.ts
index 3b7736a6d2..e9cd17dd13 100644
--- a/src/main/ipc.ts
+++ b/src/main/ipc.ts
@@ -6,11 +6,19 @@ 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 { findGitBash, 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'
 import { MIN_WINDOW_HEIGHT, MIN_WINDOW_WIDTH } from '@shared/config/constant'
+import type { LocalTransferConnectPayload } from '@shared/config/types'
 import { IpcChannel } from '@shared/IpcChannel'
 import type { PluginError } from '@types'
 import type {
@@ -35,13 +43,15 @@ 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'
 import { fileStorage as fileManager } from './services/FileStorage'
 import FileService from './services/FileSystemService'
 import KnowledgeService from './services/KnowledgeService'
+import { lanTransferClientService } from './services/lanTransfer'
+import { localTransferService } from './services/LocalTransferService'
 import mcpService from './services/MCPService'
 import MemoryService from './services/memory/MemoryService'
 import { openTraceWindow, setTraceWindowTitle } from './services/NodeTraceService'
@@ -49,7 +59,7 @@ import NotificationService from './services/NotificationService'
 import * as NutstoreService from './services/NutstoreService'
 import ObsidianVaultService from './services/ObsidianVaultService'
 import { ocrService } from './services/ocr/OcrService'
-import OvmsManager from './services/OvmsManager'
+import { isOvmsSupported } from './services/OvmsManager'
 import powerMonitorService from './services/PowerMonitorService'
 import { proxyManager } from './services/ProxyManager'
 import { pythonService } from './services/PythonService'
@@ -73,7 +83,6 @@ import {
 import storeSyncService from './services/StoreSyncService'
 import { themeService } from './services/ThemeService'
 import VertexAIService from './services/VertexAIService'
-import WebSocketService from './services/WebSocketService'
 import { setOpenLinkExternal } from './services/WebviewService'
 import { windowService } from './services/WindowService'
 import { calculateDirectorySize, getResourcePath } from './utils'
@@ -88,6 +97,7 @@ import {
   untildify
 } from './utils/file'
 import { updateAppDataConfig } from './utils/init'
+import { getCpuName, getDeviceType, getHostname } from './utils/system'
 import { compress, decompress } from './utils/zip'
 
 const logger = loggerService.withContext('IPC')
@@ -98,7 +108,6 @@ const obsidianVaultService = new ObsidianVaultService()
 const vertexAIService = VertexAIService.getInstance()
 const memoryService = MemoryService.getInstance()
 const dxtService = new DxtService()
-const ovmsManager = new OvmsManager()
 const pluginService = PluginService.getInstance()
 
 function normalizeError(error: unknown): Error {
@@ -112,7 +121,7 @@ function extractPluginError(error: unknown): PluginError | null {
   return null
 }
 
-export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
+export async function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   const appUpdater = new AppUpdater()
   const notificationService = new NotificationService()
 
@@ -490,17 +499,17 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.Zip_Decompress, (_, text: Buffer) => decompress(text))
 
   // system
-  ipcMain.handle(IpcChannel.System_GetDeviceType, () => (isMac ? 'mac' : isWin ? 'windows' : 'linux'))
-  ipcMain.handle(IpcChannel.System_GetHostname, () => require('os').hostname())
-  ipcMain.handle(IpcChannel.System_GetCpuName, () => require('os').cpus()[0].model)
+  ipcMain.handle(IpcChannel.System_GetDeviceType, getDeviceType)
+  ipcMain.handle(IpcChannel.System_GetHostname, getHostname)
+  ipcMain.handle(IpcChannel.System_GetCpuName, getCpuName)
   ipcMain.handle(IpcChannel.System_CheckGitBash, () => {
     if (!isWin) {
       return true // Non-Windows systems don't need Git Bash
     }
 
     try {
-      const bashPath = findGitBash()
-
+      // Use autoDiscoverGitBash to handle auto-discovery and persistence
+      const bashPath = autoDiscoverGitBash()
       if (bashPath) {
         logger.info('Git Bash is available', { path: bashPath })
         return true
@@ -513,6 +522,46 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
       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()
@@ -536,6 +585,8 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.Backup_ListS3Files, backupManager.listS3Files.bind(backupManager))
   ipcMain.handle(IpcChannel.Backup_DeleteS3File, backupManager.deleteS3File.bind(backupManager))
   ipcMain.handle(IpcChannel.Backup_CheckS3Connection, backupManager.checkS3Connection.bind(backupManager))
+  ipcMain.handle(IpcChannel.Backup_CreateLanTransferBackup, backupManager.createLanTransferBackup.bind(backupManager))
+  ipcMain.handle(IpcChannel.Backup_DeleteTempBackup, backupManager.deleteTempBackup.bind(backupManager))
 
   // file
   ipcMain.handle(IpcChannel.File_Open, fileManager.open.bind(fileManager))
@@ -638,36 +689,19 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.KnowledgeBase_Check_Quota, KnowledgeService.checkQuota.bind(KnowledgeService))
 
   // memory
-  ipcMain.handle(IpcChannel.Memory_Add, async (_, messages, config) => {
-    return await memoryService.add(messages, config)
-  })
-  ipcMain.handle(IpcChannel.Memory_Search, async (_, query, config) => {
-    return await memoryService.search(query, config)
-  })
-  ipcMain.handle(IpcChannel.Memory_List, async (_, config) => {
-    return await memoryService.list(config)
-  })
-  ipcMain.handle(IpcChannel.Memory_Delete, async (_, id) => {
-    return await memoryService.delete(id)
-  })
-  ipcMain.handle(IpcChannel.Memory_Update, async (_, id, memory, metadata) => {
-    return await memoryService.update(id, memory, metadata)
-  })
-  ipcMain.handle(IpcChannel.Memory_Get, async (_, memoryId) => {
-    return await memoryService.get(memoryId)
-  })
-  ipcMain.handle(IpcChannel.Memory_SetConfig, async (_, config) => {
-    memoryService.setConfig(config)
-  })
-  ipcMain.handle(IpcChannel.Memory_DeleteUser, async (_, userId) => {
-    return await memoryService.deleteUser(userId)
-  })
-  ipcMain.handle(IpcChannel.Memory_DeleteAllMemoriesForUser, async (_, userId) => {
-    return await memoryService.deleteAllMemoriesForUser(userId)
-  })
-  ipcMain.handle(IpcChannel.Memory_GetUsersList, async () => {
-    return await memoryService.getUsersList()
-  })
+  ipcMain.handle(IpcChannel.Memory_Add, (_, messages, config) => memoryService.add(messages, config))
+  ipcMain.handle(IpcChannel.Memory_Search, (_, query, config) => memoryService.search(query, config))
+  ipcMain.handle(IpcChannel.Memory_List, (_, config) => memoryService.list(config))
+  ipcMain.handle(IpcChannel.Memory_Delete, (_, id) => memoryService.delete(id))
+  ipcMain.handle(IpcChannel.Memory_Update, (_, id, memory, metadata) => memoryService.update(id, memory, metadata))
+  ipcMain.handle(IpcChannel.Memory_Get, (_, memoryId) => memoryService.get(memoryId))
+  ipcMain.handle(IpcChannel.Memory_SetConfig, (_, config) => memoryService.setConfig(config))
+  ipcMain.handle(IpcChannel.Memory_DeleteUser, (_, userId) => memoryService.deleteUser(userId))
+  ipcMain.handle(IpcChannel.Memory_DeleteAllMemoriesForUser, (_, userId) =>
+    memoryService.deleteAllMemoriesForUser(userId)
+  )
+  ipcMain.handle(IpcChannel.Memory_GetUsersList, () => memoryService.getUsersList())
+  ipcMain.handle(IpcChannel.Memory_MigrateMemoryDb, () => memoryService.migrateMemoryDb())
 
   // window
   ipcMain.handle(IpcChannel.Windows_SetMinimumSize, (_, width: number, height: number) => {
@@ -768,6 +802,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) => {
@@ -826,8 +861,8 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   )
 
   // search window
-  ipcMain.handle(IpcChannel.SearchWindow_Open, async (_, uid: string) => {
-    await searchService.openSearchWindow(uid)
+  ipcMain.handle(IpcChannel.SearchWindow_Open, async (_, uid: string, show?: boolean) => {
+    await searchService.openSearchWindow(uid, show)
   })
   ipcMain.handle(IpcChannel.SearchWindow_Close, async (_, uid: string) => {
     await searchService.closeSearchWindow(uid)
@@ -846,6 +881,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()
 
@@ -932,15 +978,36 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.OCR_ListProviders, () => ocrService.listProviderIds())
 
   // OVMS
-  ipcMain.handle(IpcChannel.Ovms_AddModel, (_, modelName: string, modelId: string, modelSource: string, task: string) =>
-    ovmsManager.addModel(modelName, modelId, modelSource, task)
-  )
-  ipcMain.handle(IpcChannel.Ovms_StopAddModel, () => ovmsManager.stopAddModel())
-  ipcMain.handle(IpcChannel.Ovms_GetModels, () => ovmsManager.getModels())
-  ipcMain.handle(IpcChannel.Ovms_IsRunning, () => ovmsManager.initializeOvms())
-  ipcMain.handle(IpcChannel.Ovms_GetStatus, () => ovmsManager.getOvmsStatus())
-  ipcMain.handle(IpcChannel.Ovms_RunOVMS, () => ovmsManager.runOvms())
-  ipcMain.handle(IpcChannel.Ovms_StopOVMS, () => ovmsManager.stopOvms())
+  ipcMain.handle(IpcChannel.Ovms_IsSupported, () => isOvmsSupported)
+  if (isOvmsSupported) {
+    const { ovmsManager } = await import('./services/OvmsManager')
+    if (ovmsManager) {
+      ipcMain.handle(
+        IpcChannel.Ovms_AddModel,
+        (_, modelName: string, modelId: string, modelSource: string, task: string) =>
+          ovmsManager.addModel(modelName, modelId, modelSource, task)
+      )
+      ipcMain.handle(IpcChannel.Ovms_StopAddModel, () => ovmsManager.stopAddModel())
+      ipcMain.handle(IpcChannel.Ovms_GetModels, () => ovmsManager.getModels())
+      ipcMain.handle(IpcChannel.Ovms_IsRunning, () => ovmsManager.initializeOvms())
+      ipcMain.handle(IpcChannel.Ovms_GetStatus, () => ovmsManager.getOvmsStatus())
+      ipcMain.handle(IpcChannel.Ovms_RunOVMS, () => ovmsManager.runOvms())
+      ipcMain.handle(IpcChannel.Ovms_StopOVMS, () => ovmsManager.stopOvms())
+    } else {
+      logger.error('Unexpected behavior: undefined ovmsManager, but OVMS should be supported.')
+    }
+  } else {
+    const fallback = () => {
+      throw new Error('OVMS is only supported on Windows with intel CPU.')
+    }
+    ipcMain.handle(IpcChannel.Ovms_AddModel, fallback)
+    ipcMain.handle(IpcChannel.Ovms_StopAddModel, fallback)
+    ipcMain.handle(IpcChannel.Ovms_GetModels, fallback)
+    ipcMain.handle(IpcChannel.Ovms_IsRunning, fallback)
+    ipcMain.handle(IpcChannel.Ovms_GetStatus, fallback)
+    ipcMain.handle(IpcChannel.Ovms_RunOVMS, fallback)
+    ipcMain.handle(IpcChannel.Ovms_StopOVMS, fallback)
+  }
 
   // CherryAI
   ipcMain.handle(IpcChannel.Cherryai_GetSignature, (_, params) => generateSignature(params))
@@ -997,12 +1064,18 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     } catch (error) {
       const pluginError = extractPluginError(error)
       if (pluginError) {
-        logger.error('Failed to list installed plugins', { agentId, error: pluginError })
+        logger.error('Failed to list installed plugins', {
+          agentId,
+          error: pluginError
+        })
         return { success: false, error: pluginError }
       }
 
       const err = normalizeError(error)
-      logger.error('Failed to list installed plugins', { agentId, error: err })
+      logger.error('Failed to list installed plugins', {
+        agentId,
+        error: err
+      })
       return {
         success: false,
         error: {
@@ -1058,12 +1131,17 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
     }
   })
 
-  // WebSocket
-  ipcMain.handle(IpcChannel.WebSocket_Start, WebSocketService.start)
-  ipcMain.handle(IpcChannel.WebSocket_Stop, WebSocketService.stop)
-  ipcMain.handle(IpcChannel.WebSocket_Status, WebSocketService.getStatus)
-  ipcMain.handle(IpcChannel.WebSocket_SendFile, WebSocketService.sendFile)
-  ipcMain.handle(IpcChannel.WebSocket_GetAllCandidates, WebSocketService.getAllCandidates)
+  ipcMain.handle(IpcChannel.LocalTransfer_ListServices, () => localTransferService.getState())
+  ipcMain.handle(IpcChannel.LocalTransfer_StartScan, () => localTransferService.startDiscovery({ resetList: true }))
+  ipcMain.handle(IpcChannel.LocalTransfer_StopScan, () => localTransferService.stopDiscovery())
+  ipcMain.handle(IpcChannel.LocalTransfer_Connect, (_, payload: LocalTransferConnectPayload) =>
+    lanTransferClientService.connectAndHandshake(payload)
+  )
+  ipcMain.handle(IpcChannel.LocalTransfer_Disconnect, () => lanTransferClientService.disconnect())
+  ipcMain.handle(IpcChannel.LocalTransfer_SendFile, (_, payload: { filePath: string }) =>
+    lanTransferClientService.sendFile(payload.filePath)
+  )
+  ipcMain.handle(IpcChannel.LocalTransfer_CancelTransfer, () => lanTransferClientService.cancelTransfer())
 
   ipcMain.handle(IpcChannel.APP_CrashRenderProcess, () => {
     mainWindow.webContents.forcefullyCrashRenderer()
diff --git a/src/main/mcpServers/__tests__/browser.test.ts b/src/main/mcpServers/__tests__/browser.test.ts
new file mode 100644
index 0000000000..800d03d7c5
--- /dev/null
+++ b/src/main/mcpServers/__tests__/browser.test.ts
@@ -0,0 +1,372 @@
+import { describe, expect, it, vi } from 'vitest'
+
+vi.mock('node:fs', () => ({
+  default: {
+    existsSync: vi.fn(() => false),
+    mkdirSync: vi.fn()
+  },
+  existsSync: vi.fn(() => false),
+  mkdirSync: vi.fn()
+}))
+
+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 createWebContents = () => ({
+    debugger: debuggerObj,
+    setUserAgent: vi.fn(),
+    getURL: vi.fn(() => 'https://example.com/'),
+    getTitle: vi.fn(async () => 'Example Title'),
+    loadURL: vi.fn(async () => {}),
+    once: vi.fn(),
+    removeListener: vi.fn(),
+    on: vi.fn(),
+    isDestroyed: vi.fn(() => false),
+    canGoBack: vi.fn(() => false),
+    canGoForward: vi.fn(() => false),
+    goBack: vi.fn(),
+    goForward: vi.fn(),
+    reload: vi.fn(),
+    executeJavaScript: vi.fn(async () => null),
+    setWindowOpenHandler: vi.fn()
+  })
+
+  const windows: any[] = []
+  const views: any[] = []
+
+  class MockBrowserWindow {
+    private destroyed = false
+    public webContents = createWebContents()
+    public isDestroyed = vi.fn(() => this.destroyed)
+    public close = vi.fn(() => {
+      this.destroyed = true
+    })
+    public destroy = vi.fn(() => {
+      this.destroyed = true
+    })
+    public on = vi.fn()
+    public setBrowserView = vi.fn()
+    public addBrowserView = vi.fn()
+    public removeBrowserView = vi.fn()
+    public getContentSize = vi.fn(() => [1200, 800])
+    public show = vi.fn()
+
+    constructor() {
+      windows.push(this)
+    }
+  }
+
+  class MockBrowserView {
+    public webContents = createWebContents()
+    public setBounds = vi.fn()
+    public setAutoResize = vi.fn()
+    public destroy = vi.fn()
+
+    constructor() {
+      views.push(this)
+    }
+  }
+
+  const app = {
+    isReady: vi.fn(() => true),
+    whenReady: vi.fn(async () => {}),
+    on: vi.fn(),
+    getPath: vi.fn((key: string) => {
+      if (key === 'userData') return '/mock/userData'
+      if (key === 'temp') return '/tmp'
+      return '/mock/unknown'
+    }),
+    getAppPath: vi.fn(() => '/mock/app'),
+    setPath: vi.fn()
+  }
+
+  const nativeTheme = {
+    on: vi.fn(),
+    shouldUseDarkColors: false
+  }
+
+  return {
+    BrowserWindow: MockBrowserWindow as any,
+    BrowserView: MockBrowserView as any,
+    app,
+    nativeTheme,
+    __mockDebugger: debuggerObj,
+    __mockSendCommand: sendCommand,
+    __mockWindows: windows,
+    __mockViews: views
+  }
+})
+
+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 in normal mode 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 in private mode', async () => {
+    const controller = new CdpBrowserController()
+    const result = await controller.open('https://foo.bar/', 5000, true)
+    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)
+    const result = await controller.execute('const a=1; const b=2; a+b;', 5000, false)
+    expect(result).toBe('ok')
+  })
+
+  it('normal and private modes are isolated', async () => {
+    const controller = new CdpBrowserController()
+    await controller.open('https://foo.bar/', 5000, false)
+    await controller.open('https://foo.bar/', 5000, true)
+    const normalResult = await controller.execute('1+1', 5000, false)
+    const privateResult = await controller.execute('1+1', 5000, true)
+    expect(normalResult).toBe('ok')
+    expect(privateResult).toBe('ok')
+  })
+
+  it('fetches URL and returns html format with tabId', async () => {
+    const controller = new CdpBrowserController()
+    const result = await controller.fetch('https://example.com/', 'html')
+    expect(result.tabId).toBeDefined()
+    expect(result.content).toBe('<html><body><h1>Test</h1><p>Content</p></body></html>')
+  })
+
+  it('fetches URL and returns txt format with tabId', async () => {
+    const controller = new CdpBrowserController()
+    const result = await controller.fetch('https://example.com/', 'txt')
+    expect(result.tabId).toBeDefined()
+    expect(result.content).toBe('Test\nContent')
+  })
+
+  it('fetches URL and returns markdown format (default) with tabId', async () => {
+    const controller = new CdpBrowserController()
+    const result = await controller.fetch('https://example.com/')
+    expect(result.tabId).toBeDefined()
+    expect(typeof result.content).toBe('string')
+    expect(result.content).toContain('Test')
+  })
+
+  it('fetches URL in private mode with tabId', async () => {
+    const controller = new CdpBrowserController()
+    const result = await controller.fetch('https://example.com/', 'html', 10000, true)
+    expect(result.tabId).toBeDefined()
+    expect(result.content).toBe('<html><body><h1>Test</h1><p>Content</p></body></html>')
+  })
+
+  describe('Multi-tab support', () => {
+    it('creates new tab with newTab parameter', async () => {
+      const controller = new CdpBrowserController()
+      const result1 = await controller.open('https://site1.com/', 5000, false, true)
+      const result2 = await controller.open('https://site2.com/', 5000, false, true)
+
+      expect(result1.tabId).toBeDefined()
+      expect(result2.tabId).toBeDefined()
+      expect(result1.tabId).not.toBe(result2.tabId)
+    })
+
+    it('reuses same tab without newTab parameter', async () => {
+      const controller = new CdpBrowserController()
+      const result1 = await controller.open('https://site1.com/', 5000, false)
+      const result2 = await controller.open('https://site2.com/', 5000, false)
+
+      expect(result1.tabId).toBe(result2.tabId)
+    })
+
+    it('fetches in new tab with newTab parameter', async () => {
+      const controller = new CdpBrowserController()
+      await controller.open('https://example.com/', 5000, false)
+      const tabs = await controller.listTabs(false)
+      const initialTabCount = tabs.length
+
+      await controller.fetch('https://other.com/', 'html', 10000, false, true)
+      const tabsAfter = await controller.listTabs(false)
+
+      expect(tabsAfter.length).toBe(initialTabCount + 1)
+    })
+  })
+
+  describe('Tab management', () => {
+    it('lists tabs in a window', async () => {
+      const controller = new CdpBrowserController()
+      await controller.open('https://example.com/', 5000, false)
+
+      const tabs = await controller.listTabs(false)
+      expect(tabs.length).toBeGreaterThan(0)
+      expect(tabs[0].tabId).toBeDefined()
+    })
+
+    it('lists tabs separately for normal and private modes', async () => {
+      const controller = new CdpBrowserController()
+      await controller.open('https://example.com/', 5000, false)
+      await controller.open('https://example.com/', 5000, true)
+
+      const normalTabs = await controller.listTabs(false)
+      const privateTabs = await controller.listTabs(true)
+
+      expect(normalTabs.length).toBe(1)
+      expect(privateTabs.length).toBe(1)
+      expect(normalTabs[0].tabId).not.toBe(privateTabs[0].tabId)
+    })
+
+    it('closes specific tab', async () => {
+      const controller = new CdpBrowserController()
+      const result1 = await controller.open('https://site1.com/', 5000, false, true)
+      await controller.open('https://site2.com/', 5000, false, true)
+
+      const tabsBefore = await controller.listTabs(false)
+      expect(tabsBefore.length).toBe(2)
+
+      await controller.closeTab(false, result1.tabId)
+
+      const tabsAfter = await controller.listTabs(false)
+      expect(tabsAfter.length).toBe(1)
+      expect(tabsAfter.find((t) => t.tabId === result1.tabId)).toBeUndefined()
+    })
+
+    it('switches active tab', async () => {
+      const controller = new CdpBrowserController()
+      const result1 = await controller.open('https://site1.com/', 5000, false, true)
+      const result2 = await controller.open('https://site2.com/', 5000, false, true)
+
+      await controller.switchTab(false, result1.tabId)
+      await controller.switchTab(false, result2.tabId)
+    })
+
+    it('throws error when switching to non-existent tab', async () => {
+      const controller = new CdpBrowserController()
+      await controller.open('https://example.com/', 5000, false)
+
+      await expect(controller.switchTab(false, 'non-existent-tab')).rejects.toThrow('Tab non-existent-tab not found')
+    })
+  })
+
+  describe('Reset behavior', () => {
+    it('resets specific tab only', async () => {
+      const controller = new CdpBrowserController()
+      const result1 = await controller.open('https://site1.com/', 5000, false, true)
+      await controller.open('https://site2.com/', 5000, false, true)
+
+      await controller.reset(false, result1.tabId)
+
+      const tabs = await controller.listTabs(false)
+      expect(tabs.length).toBe(1)
+    })
+
+    it('resets specific window only', async () => {
+      const controller = new CdpBrowserController()
+      await controller.open('https://example.com/', 5000, false)
+      await controller.open('https://example.com/', 5000, true)
+
+      await controller.reset(false)
+
+      const normalTabs = await controller.listTabs(false)
+      const privateTabs = await controller.listTabs(true)
+
+      expect(normalTabs.length).toBe(0)
+      expect(privateTabs.length).toBe(1)
+    })
+
+    it('resets all windows', async () => {
+      const controller = new CdpBrowserController()
+      await controller.open('https://example.com/', 5000, false)
+      await controller.open('https://example.com/', 5000, true)
+
+      await controller.reset()
+
+      const normalTabs = await controller.listTabs(false)
+      const privateTabs = await controller.listTabs(true)
+
+      expect(normalTabs.length).toBe(0)
+      expect(privateTabs.length).toBe(0)
+    })
+  })
+
+  describe('showWindow parameter', () => {
+    it('passes showWindow parameter through open', async () => {
+      const controller = new CdpBrowserController()
+      const result = await controller.open('https://example.com/', 5000, false, false, true)
+      expect(result.currentUrl).toBe('https://example.com/')
+      expect(result.tabId).toBeDefined()
+    })
+
+    it('passes showWindow parameter through fetch', async () => {
+      const controller = new CdpBrowserController()
+      const result = await controller.fetch('https://example.com/', 'html', 10000, false, false, true)
+      expect(result.tabId).toBeDefined()
+      expect(result.content).toBe('<html><body><h1>Test</h1><p>Content</p></body></html>')
+    })
+
+    it('passes showWindow parameter through createTab', async () => {
+      const controller = new CdpBrowserController()
+      const { tabId, view } = await controller.createTab(false, true)
+      expect(tabId).toBeDefined()
+      expect(view).toBeDefined()
+    })
+
+    it('shows existing window when showWindow=true on subsequent calls', async () => {
+      const controller = new CdpBrowserController()
+      // First call creates window
+      await controller.open('https://example.com/', 5000, false, false, false)
+      // Second call with showWindow=true should show existing window
+      const result = await controller.open('https://example.com/', 5000, false, false, true)
+      expect(result.currentUrl).toBe('https://example.com/')
+    })
+  })
+
+  describe('Window limits and eviction', () => {
+    it('respects maxWindows limit', async () => {
+      const controller = new CdpBrowserController({ maxWindows: 1 })
+      await controller.open('https://example.com/', 5000, false)
+      await controller.open('https://example.com/', 5000, true)
+
+      const normalTabs = await controller.listTabs(false)
+      const privateTabs = await controller.listTabs(true)
+
+      expect(privateTabs.length).toBe(1)
+      expect(normalTabs.length).toBe(0)
+    })
+
+    it('cleans up idle windows on next access', async () => {
+      const controller = new CdpBrowserController({ idleTimeoutMs: 1 })
+      await controller.open('https://example.com/', 5000, false)
+
+      await new Promise((r) => setTimeout(r, 10))
+
+      await controller.open('https://example.com/', 5000, true)
+
+      const normalTabs = await controller.listTabs(false)
+      expect(normalTabs.length).toBe(0)
+    })
+  })
+})
diff --git a/src/main/mcpServers/browser/README.md b/src/main/mcpServers/browser/README.md
new file mode 100644
index 0000000000..27d1307782
--- /dev/null
+++ b/src/main/mcpServers/browser/README.md
@@ -0,0 +1,177 @@
+# Browser MCP Server
+
+A Model Context Protocol (MCP) server for controlling browser windows via Chrome DevTools Protocol (CDP).
+
+## Features
+
+### ✨ User Data Persistence
+- **Normal mode (default)**: Cookies, localStorage, and sessionStorage persist across browser restarts
+- **Private mode**: Ephemeral browsing - no data persists (like incognito mode)
+
+### 🔄 Window Management
+- Two browsing modes: normal (persistent) and private (ephemeral)
+- Lazy idle timeout cleanup (cleaned on next window access)
+- Maximum window limits to prevent resource exhaustion
+
+> **Note**: Normal mode uses a global `persist:default` partition shared by all clients. This means login sessions and stored data are accessible to any code using the MCP server.
+
+## Architecture
+
+### How It Works
+```
+Normal Mode (BrowserWindow)
+├─ Persistent Storage (partition: persist:default) ← Global, shared across all clients
+└─ Tabs (BrowserView) ← created via newTab or automatically
+
+Private Mode (BrowserWindow)
+├─ Ephemeral Storage (partition: private) ← No disk persistence
+└─ Tabs (BrowserView) ← created via newTab or automatically
+```
+
+- **One Window Per Mode**: Normal and private modes each have their own window
+- **Multi-Tab Support**: Use `newTab: true` for parallel URL requests
+- **Storage Isolation**: Normal and private modes have completely separate storage
+
+## Available Tools
+
+### `open`
+Open a URL in a browser window. Optionally return page content.
+```json
+{
+  "url": "https://example.com",
+  "format": "markdown",
+  "timeout": 10000,
+  "privateMode": false,
+  "newTab": false,
+  "showWindow": false
+}
+```
+- `format`: If set (`html`, `txt`, `markdown`, `json`), returns page content in that format along with tabId. If not set, just opens the page and returns navigation info.
+- `newTab`: Set to `true` to open in a new tab (required for parallel requests)
+- `showWindow`: Set to `true` to display the browser window (useful for debugging)
+- Returns (without format): `{ currentUrl, title, tabId }`
+- Returns (with format): `{ tabId, content }` where content is in the specified format
+
+### `execute`
+Execute JavaScript code in the page context.
+```json
+{
+  "code": "document.title",
+  "timeout": 5000,
+  "privateMode": false,
+  "tabId": "optional-tab-id"
+}
+```
+- `tabId`: Target a specific tab (from `open` response)
+
+### `reset`
+Reset browser windows and tabs.
+```json
+{
+  "privateMode": false,
+  "tabId": "optional-tab-id"
+}
+```
+- Omit all parameters to close all windows
+- Set `privateMode` to close a specific window
+- Set both `privateMode` and `tabId` to close a specific tab only
+
+## Usage Examples
+
+### Basic Navigation
+```typescript
+// Open a URL in normal mode (data persists)
+await controller.open('https://example.com')
+```
+
+### Fetch Page Content
+```typescript
+// Open URL and get content as markdown
+await open({ url: 'https://example.com', format: 'markdown' })
+
+// Open URL and get raw HTML
+await open({ url: 'https://example.com', format: 'html' })
+```
+
+### Multi-Tab / Parallel Requests
+```typescript
+// Open multiple URLs in parallel using newTab
+const [page1, page2] = await Promise.all([
+  controller.open('https://site1.com', 10000, false, true),  // newTab: true
+  controller.open('https://site2.com', 10000, false, true)   // newTab: true
+])
+
+// Execute on specific tab
+await controller.execute('document.title', 5000, false, page1.tabId)
+
+// Close specific tab when done
+await controller.reset(false, page1.tabId)
+```
+
+### Private Browsing
+```typescript
+// Open a URL in private mode (no data persistence)
+await controller.open('https://example.com', 10000, true)
+
+// Cookies and localStorage won't persist after reset
+```
+
+### Data Persistence (Normal Mode)
+```typescript
+// Set data
+await controller.open('https://example.com', 10000, false)
+await controller.execute('localStorage.setItem("key", "value")', 5000, false)
+
+// Close window
+await controller.reset(false)
+
+// Reopen - data persists!
+await controller.open('https://example.com', 10000, false)
+const value = await controller.execute('localStorage.getItem("key")', 5000, false)
+// Returns: "value"
+```
+
+### No Persistence (Private Mode)
+```typescript
+// Set data in private mode
+await controller.open('https://example.com', 10000, true)
+await controller.execute('localStorage.setItem("key", "value")', 5000, true)
+
+// Close private window
+await controller.reset(true)
+
+// Reopen - data is gone!
+await controller.open('https://example.com', 10000, true)
+const value = await controller.execute('localStorage.getItem("key")', 5000, true)
+// Returns: null
+```
+
+## Configuration
+
+```typescript
+const controller = new CdpBrowserController({
+  maxWindows: 5,               // Maximum concurrent windows
+  idleTimeoutMs: 5 * 60 * 1000 // 5 minutes idle timeout (lazy cleanup)
+})
+```
+
+> **Note on Idle Timeout**: Idle windows are cleaned up lazily when the next window is created or accessed, not on a background timer.
+
+## Best Practices
+
+1. **Use Normal Mode for Authentication**: When you need to stay logged in across sessions
+2. **Use Private Mode for Sensitive Operations**: When you don't want data to persist
+3. **Use `newTab: true` for Parallel Requests**: Avoid race conditions when fetching multiple URLs
+4. **Resource Cleanup**: Call `reset()` when done, or `reset(privateMode, tabId)` to close specific tabs
+5. **Error Handling**: All tool handlers return error responses on failure
+6. **Timeout Configuration**: Adjust timeouts based on page complexity
+
+## Technical Details
+
+- **CDP Version**: 1.3
+- **User Agent**: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:145.0) Gecko/20100101 Firefox/145.0
+- **Storage**: 
+  - Normal mode: `persist:default` (disk-persisted, global)
+  - Private mode: `private` (memory only)
+- **Window Size**: 1200x800 (default)
+- **Visibility**: Windows hidden by default (use `showWindow: true` to display)
diff --git a/src/main/mcpServers/browser/constants.ts b/src/main/mcpServers/browser/constants.ts
new file mode 100644
index 0000000000..2b10943f8e
--- /dev/null
+++ b/src/main/mcpServers/browser/constants.ts
@@ -0,0 +1,3 @@
+export const TAB_BAR_HEIGHT = 92 // Height for Chrome-style tab bar (42px) + address bar (50px)
+export const SESSION_KEY_DEFAULT = 'default'
+export const SESSION_KEY_PRIVATE = 'private'
diff --git a/src/main/mcpServers/browser/controller.ts b/src/main/mcpServers/browser/controller.ts
new file mode 100644
index 0000000000..9e0f5220ca
--- /dev/null
+++ b/src/main/mcpServers/browser/controller.ts
@@ -0,0 +1,909 @@
+import { titleBarOverlayDark, titleBarOverlayLight } from '@main/config'
+import { isMac } from '@main/constant'
+import { randomUUID } from 'crypto'
+import { app, BrowserView, BrowserWindow, nativeTheme } from 'electron'
+import TurndownService from 'turndown'
+
+import { SESSION_KEY_DEFAULT, SESSION_KEY_PRIVATE, TAB_BAR_HEIGHT } from './constants'
+import { TAB_BAR_HTML } from './tabbar-html'
+import { logger, type TabInfo, userAgent, type WindowInfo } from './types'
+
+/**
+ * Controller for managing browser windows via Chrome DevTools Protocol (CDP).
+ * Supports two modes: normal (persistent) and private (ephemeral).
+ * Normal mode persists user data (cookies, localStorage, etc.) globally across all clients.
+ * Private mode is ephemeral - data is cleared when the window closes.
+ */
+export class CdpBrowserController {
+  private windows: Map<string, WindowInfo> = new Map()
+  private readonly maxWindows: number
+  private readonly idleTimeoutMs: number
+  private readonly turndownService: TurndownService
+
+  constructor(options?: { maxWindows?: number; idleTimeoutMs?: number }) {
+    this.maxWindows = options?.maxWindows ?? 5
+    this.idleTimeoutMs = options?.idleTimeoutMs ?? 5 * 60 * 1000
+    this.turndownService = new TurndownService()
+
+    // Listen for theme changes and update all tab bars
+    nativeTheme.on('updated', () => {
+      const isDark = nativeTheme.shouldUseDarkColors
+      for (const windowInfo of this.windows.values()) {
+        if (windowInfo.tabBarView && !windowInfo.tabBarView.webContents.isDestroyed()) {
+          windowInfo.tabBarView.webContents.executeJavaScript(`window.setTheme(${isDark})`).catch(() => {
+            // Ignore errors if tab bar is not ready
+          })
+        }
+      }
+    })
+  }
+
+  private getWindowKey(privateMode: boolean): string {
+    return privateMode ? SESSION_KEY_PRIVATE : SESSION_KEY_DEFAULT
+  }
+
+  private getPartition(privateMode: boolean): string {
+    return privateMode ? SESSION_KEY_PRIVATE : `persist:${SESSION_KEY_DEFAULT}`
+  }
+
+  private async ensureAppReady() {
+    if (!app.isReady()) {
+      await app.whenReady()
+    }
+  }
+
+  private touchWindow(windowKey: string) {
+    const windowInfo = this.windows.get(windowKey)
+    if (windowInfo) windowInfo.lastActive = Date.now()
+  }
+
+  private touchTab(windowKey: string, tabId: string) {
+    const windowInfo = this.windows.get(windowKey)
+    if (windowInfo) {
+      const tab = windowInfo.tabs.get(tabId)
+      if (tab) tab.lastActive = Date.now()
+      windowInfo.lastActive = Date.now()
+    }
+  }
+
+  private closeTabInternal(windowInfo: WindowInfo, tabId: string) {
+    try {
+      const tab = windowInfo.tabs.get(tabId)
+      if (!tab) return
+
+      if (!tab.view.webContents.isDestroyed()) {
+        if (tab.view.webContents.debugger.isAttached()) {
+          tab.view.webContents.debugger.detach()
+        }
+      }
+
+      // Remove view from window
+      if (!windowInfo.window.isDestroyed()) {
+        windowInfo.window.removeBrowserView(tab.view)
+      }
+
+      // Destroy the view using safe cast
+      const viewWithDestroy = tab.view as BrowserView & { destroy?: () => void }
+      if (viewWithDestroy.destroy) {
+        viewWithDestroy.destroy()
+      }
+    } catch (error) {
+      logger.warn('Error closing tab', { error, windowKey: windowInfo.windowKey, tabId })
+    }
+  }
+
+  private async ensureDebuggerAttached(dbg: Electron.Debugger, sessionKey: string) {
+    if (!dbg.isAttached()) {
+      try {
+        logger.info('Attaching debugger', { sessionKey })
+        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()
+    const windowKeys = Array.from(this.windows.keys())
+    for (const windowKey of windowKeys) {
+      const windowInfo = this.windows.get(windowKey)
+      if (!windowInfo) continue
+      if (now - windowInfo.lastActive > this.idleTimeoutMs) {
+        const tabIds = Array.from(windowInfo.tabs.keys())
+        for (const tabId of tabIds) {
+          this.closeTabInternal(windowInfo, tabId)
+        }
+        if (!windowInfo.window.isDestroyed()) {
+          windowInfo.window.close()
+        }
+        this.windows.delete(windowKey)
+      }
+    }
+  }
+
+  private evictIfNeeded(newWindowKey: string) {
+    if (this.windows.size < this.maxWindows) return
+    let lruKey: string | null = null
+    let lruTime = Number.POSITIVE_INFINITY
+    for (const [key, windowInfo] of this.windows.entries()) {
+      if (key === newWindowKey) continue
+      if (windowInfo.lastActive < lruTime) {
+        lruTime = windowInfo.lastActive
+        lruKey = key
+      }
+    }
+    if (lruKey) {
+      const windowInfo = this.windows.get(lruKey)
+      if (windowInfo) {
+        for (const [tabId] of windowInfo.tabs.entries()) {
+          this.closeTabInternal(windowInfo, tabId)
+        }
+        if (!windowInfo.window.isDestroyed()) {
+          windowInfo.window.close()
+        }
+      }
+      this.windows.delete(lruKey)
+      logger.info('Evicted window to respect maxWindows', { evicted: lruKey })
+    }
+  }
+
+  private sendTabBarUpdate(windowInfo: WindowInfo) {
+    if (!windowInfo.tabBarView || !windowInfo.tabBarView.webContents || windowInfo.tabBarView.webContents.isDestroyed())
+      return
+
+    const tabs = Array.from(windowInfo.tabs.values()).map((tab) => ({
+      id: tab.id,
+      title: tab.title || 'New Tab',
+      url: tab.url,
+      isActive: tab.id === windowInfo.activeTabId
+    }))
+
+    let activeUrl = ''
+    let canGoBack = false
+    let canGoForward = false
+
+    if (windowInfo.activeTabId) {
+      const activeTab = windowInfo.tabs.get(windowInfo.activeTabId)
+      if (activeTab && !activeTab.view.webContents.isDestroyed()) {
+        activeUrl = activeTab.view.webContents.getURL()
+        canGoBack = activeTab.view.webContents.canGoBack()
+        canGoForward = activeTab.view.webContents.canGoForward()
+      }
+    }
+
+    const script = `window.updateTabs(${JSON.stringify(tabs)}, ${JSON.stringify(activeUrl)}, ${canGoBack}, ${canGoForward})`
+    windowInfo.tabBarView.webContents.executeJavaScript(script).catch((error) => {
+      logger.debug('Tab bar update failed', { error, windowKey: windowInfo.windowKey })
+    })
+  }
+
+  private handleNavigateAction(windowInfo: WindowInfo, url: string) {
+    if (!windowInfo.activeTabId) return
+    const activeTab = windowInfo.tabs.get(windowInfo.activeTabId)
+    if (!activeTab || activeTab.view.webContents.isDestroyed()) return
+
+    let finalUrl = url.trim()
+    if (!/^https?:\/\//i.test(finalUrl)) {
+      if (/^[a-zA-Z0-9][a-zA-Z0-9-]*\.[a-zA-Z]{2,}/.test(finalUrl) || finalUrl.includes('.')) {
+        finalUrl = 'https://' + finalUrl
+      } else {
+        finalUrl = 'https://www.google.com/search?q=' + encodeURIComponent(finalUrl)
+      }
+    }
+
+    activeTab.view.webContents.loadURL(finalUrl).catch((error) => {
+      logger.warn('Navigation failed in tab bar', { error, url: finalUrl, tabId: windowInfo.activeTabId })
+    })
+  }
+
+  private handleBackAction(windowInfo: WindowInfo) {
+    if (!windowInfo.activeTabId) return
+    const activeTab = windowInfo.tabs.get(windowInfo.activeTabId)
+    if (!activeTab || activeTab.view.webContents.isDestroyed()) return
+
+    if (activeTab.view.webContents.canGoBack()) {
+      activeTab.view.webContents.goBack()
+    }
+  }
+
+  private handleForwardAction(windowInfo: WindowInfo) {
+    if (!windowInfo.activeTabId) return
+    const activeTab = windowInfo.tabs.get(windowInfo.activeTabId)
+    if (!activeTab || activeTab.view.webContents.isDestroyed()) return
+
+    if (activeTab.view.webContents.canGoForward()) {
+      activeTab.view.webContents.goForward()
+    }
+  }
+
+  private handleRefreshAction(windowInfo: WindowInfo) {
+    if (!windowInfo.activeTabId) return
+    const activeTab = windowInfo.tabs.get(windowInfo.activeTabId)
+    if (!activeTab || activeTab.view.webContents.isDestroyed()) return
+
+    activeTab.view.webContents.reload()
+  }
+
+  private setupTabBarMessageHandler(windowInfo: WindowInfo) {
+    if (!windowInfo.tabBarView) return
+
+    windowInfo.tabBarView.webContents.on('console-message', (_event, _level, message) => {
+      try {
+        const parsed = JSON.parse(message)
+        if (parsed?.channel === 'tabbar-action' && parsed?.payload) {
+          this.handleTabBarAction(windowInfo, parsed.payload)
+        }
+      } catch {
+        // Not a JSON message, ignore
+      }
+    })
+
+    windowInfo.tabBarView.webContents
+      .executeJavaScript(`
+      (function() {
+        window.addEventListener('message', function(e) {
+          if (e.data && e.data.channel === 'tabbar-action') {
+            console.log(JSON.stringify(e.data));
+          }
+        });
+      })();
+    `)
+      .catch((error) => {
+        logger.debug('Tab bar message handler setup failed', { error, windowKey: windowInfo.windowKey })
+      })
+  }
+
+  private handleTabBarAction(windowInfo: WindowInfo, action: { type: string; tabId?: string; url?: string }) {
+    if (action.type === 'switch' && action.tabId) {
+      this.switchTab(windowInfo.privateMode, action.tabId).catch((error) => {
+        logger.warn('Tab switch failed', { error, tabId: action.tabId, windowKey: windowInfo.windowKey })
+      })
+    } else if (action.type === 'close' && action.tabId) {
+      this.closeTab(windowInfo.privateMode, action.tabId).catch((error) => {
+        logger.warn('Tab close failed', { error, tabId: action.tabId, windowKey: windowInfo.windowKey })
+      })
+    } else if (action.type === 'new') {
+      this.createTab(windowInfo.privateMode, true)
+        .then(({ tabId }) => this.switchTab(windowInfo.privateMode, tabId))
+        .catch((error) => {
+          logger.warn('New tab creation failed', { error, windowKey: windowInfo.windowKey })
+        })
+    } else if (action.type === 'navigate' && action.url) {
+      this.handleNavigateAction(windowInfo, action.url)
+    } else if (action.type === 'back') {
+      this.handleBackAction(windowInfo)
+    } else if (action.type === 'forward') {
+      this.handleForwardAction(windowInfo)
+    } else if (action.type === 'refresh') {
+      this.handleRefreshAction(windowInfo)
+    } else if (action.type === 'window-minimize') {
+      if (!windowInfo.window.isDestroyed()) {
+        windowInfo.window.minimize()
+      }
+    } else if (action.type === 'window-maximize') {
+      if (!windowInfo.window.isDestroyed()) {
+        if (windowInfo.window.isMaximized()) {
+          windowInfo.window.unmaximize()
+        } else {
+          windowInfo.window.maximize()
+        }
+      }
+    } else if (action.type === 'window-close') {
+      if (!windowInfo.window.isDestroyed()) {
+        windowInfo.window.close()
+      }
+    }
+  }
+
+  private createTabBarView(windowInfo: WindowInfo): BrowserView {
+    const tabBarView = new BrowserView({
+      webPreferences: {
+        contextIsolation: false,
+        sandbox: false,
+        nodeIntegration: false
+      }
+    })
+
+    windowInfo.window.addBrowserView(tabBarView)
+    const [width] = windowInfo.window.getContentSize()
+    tabBarView.setBounds({ x: 0, y: 0, width, height: TAB_BAR_HEIGHT })
+    tabBarView.setAutoResize({ width: true, height: false })
+    tabBarView.webContents.loadURL(`data:text/html;charset=utf-8,${encodeURIComponent(TAB_BAR_HTML)}`)
+
+    tabBarView.webContents.on('did-finish-load', () => {
+      // Initialize platform for proper styling
+      const platform = isMac ? 'mac' : process.platform === 'win32' ? 'win' : 'linux'
+      tabBarView.webContents.executeJavaScript(`window.initPlatform('${platform}')`).catch((error) => {
+        logger.debug('Platform init failed', { error, windowKey: windowInfo.windowKey })
+      })
+      // Initialize theme
+      const isDark = nativeTheme.shouldUseDarkColors
+      tabBarView.webContents.executeJavaScript(`window.setTheme(${isDark})`).catch((error) => {
+        logger.debug('Theme init failed', { error, windowKey: windowInfo.windowKey })
+      })
+      this.setupTabBarMessageHandler(windowInfo)
+      this.sendTabBarUpdate(windowInfo)
+    })
+
+    return tabBarView
+  }
+
+  private async createBrowserWindow(
+    windowKey: string,
+    privateMode: boolean,
+    showWindow = false
+  ): Promise<BrowserWindow> {
+    await this.ensureAppReady()
+
+    const partition = this.getPartition(privateMode)
+
+    const win = new BrowserWindow({
+      show: showWindow,
+      width: 1200,
+      height: 800,
+      ...(isMac
+        ? {
+            titleBarStyle: 'hidden',
+            titleBarOverlay: nativeTheme.shouldUseDarkColors ? titleBarOverlayDark : titleBarOverlayLight,
+            trafficLightPosition: { x: 8, y: 13 }
+          }
+        : {
+            frame: false // Frameless window for Windows and Linux
+          }),
+      webPreferences: {
+        contextIsolation: true,
+        sandbox: true,
+        nodeIntegration: false,
+        devTools: true,
+        partition
+      }
+    })
+
+    win.on('closed', () => {
+      const windowInfo = this.windows.get(windowKey)
+      if (windowInfo) {
+        const tabIds = Array.from(windowInfo.tabs.keys())
+        for (const tabId of tabIds) {
+          this.closeTabInternal(windowInfo, tabId)
+        }
+        this.windows.delete(windowKey)
+      }
+    })
+
+    return win
+  }
+
+  private async getOrCreateWindow(privateMode: boolean, showWindow = false): Promise<WindowInfo> {
+    await this.ensureAppReady()
+    this.sweepIdle()
+
+    const windowKey = this.getWindowKey(privateMode)
+
+    let windowInfo = this.windows.get(windowKey)
+    if (!windowInfo) {
+      this.evictIfNeeded(windowKey)
+      const window = await this.createBrowserWindow(windowKey, privateMode, showWindow)
+      windowInfo = {
+        windowKey,
+        privateMode,
+        window,
+        tabs: new Map(),
+        activeTabId: null,
+        lastActive: Date.now(),
+        tabBarView: undefined
+      }
+      this.windows.set(windowKey, windowInfo)
+      const tabBarView = this.createTabBarView(windowInfo)
+      windowInfo.tabBarView = tabBarView
+
+      // Register resize listener once per window (not per tab)
+      // Capture windowKey to look up fresh windowInfo on each resize
+      windowInfo.window.on('resize', () => {
+        const info = this.windows.get(windowKey)
+        if (info) this.updateViewBounds(info)
+      })
+
+      logger.info('Created new window', { windowKey, privateMode })
+    } else if (showWindow && !windowInfo.window.isDestroyed()) {
+      windowInfo.window.show()
+    }
+
+    this.touchWindow(windowKey)
+    return windowInfo
+  }
+
+  private updateViewBounds(windowInfo: WindowInfo) {
+    if (windowInfo.window.isDestroyed()) return
+
+    const [width, height] = windowInfo.window.getContentSize()
+
+    // Update tab bar bounds
+    if (windowInfo.tabBarView && !windowInfo.tabBarView.webContents.isDestroyed()) {
+      windowInfo.tabBarView.setBounds({ x: 0, y: 0, width, height: TAB_BAR_HEIGHT })
+    }
+
+    // Update active tab view bounds
+    if (windowInfo.activeTabId) {
+      const activeTab = windowInfo.tabs.get(windowInfo.activeTabId)
+      if (activeTab && !activeTab.view.webContents.isDestroyed()) {
+        activeTab.view.setBounds({
+          x: 0,
+          y: TAB_BAR_HEIGHT,
+          width,
+          height: Math.max(0, height - TAB_BAR_HEIGHT)
+        })
+      }
+    }
+  }
+
+  /**
+   * Creates a new tab in the window
+   * @param privateMode - If true, uses private browsing mode (default: false)
+   * @param showWindow - If true, shows the browser window (default: false)
+   * @returns Tab ID and view
+   */
+  public async createTab(privateMode = false, showWindow = false): Promise<{ tabId: string; view: BrowserView }> {
+    const windowInfo = await this.getOrCreateWindow(privateMode, showWindow)
+    const tabId = randomUUID()
+    const partition = this.getPartition(privateMode)
+
+    const view = new BrowserView({
+      webPreferences: {
+        contextIsolation: true,
+        sandbox: true,
+        nodeIntegration: false,
+        devTools: true,
+        partition
+      }
+    })
+
+    view.webContents.setUserAgent(userAgent)
+
+    const windowKey = windowInfo.windowKey
+    view.webContents.on('did-start-loading', () => logger.info(`did-start-loading`, { windowKey, tabId }))
+    view.webContents.on('dom-ready', () => logger.info(`dom-ready`, { windowKey, tabId }))
+    view.webContents.on('did-finish-load', () => logger.info(`did-finish-load`, { windowKey, tabId }))
+    view.webContents.on('did-fail-load', (_e, code, desc) => logger.warn('Navigation failed', { code, desc }))
+
+    view.webContents.on('destroyed', () => {
+      windowInfo.tabs.delete(tabId)
+      if (windowInfo.activeTabId === tabId) {
+        windowInfo.activeTabId = windowInfo.tabs.keys().next().value ?? null
+        if (windowInfo.activeTabId) {
+          const newActiveTab = windowInfo.tabs.get(windowInfo.activeTabId)
+          if (newActiveTab && !windowInfo.window.isDestroyed()) {
+            windowInfo.window.addBrowserView(newActiveTab.view)
+            this.updateViewBounds(windowInfo)
+          }
+        }
+      }
+      this.sendTabBarUpdate(windowInfo)
+    })
+
+    view.webContents.on('page-title-updated', (_event, title) => {
+      tabInfo.title = title
+      this.sendTabBarUpdate(windowInfo)
+    })
+
+    view.webContents.on('did-navigate', (_event, url) => {
+      tabInfo.url = url
+      this.sendTabBarUpdate(windowInfo)
+    })
+
+    view.webContents.on('did-navigate-in-page', (_event, url) => {
+      tabInfo.url = url
+      this.sendTabBarUpdate(windowInfo)
+    })
+
+    // Handle new window requests (e.g., target="_blank" links) - open in new tab instead
+    view.webContents.setWindowOpenHandler(({ url }) => {
+      // Create a new tab and navigate to the URL
+      this.createTab(privateMode, true)
+        .then(({ tabId: newTabId }) => {
+          return this.switchTab(privateMode, newTabId).then(() => {
+            const newTab = windowInfo.tabs.get(newTabId)
+            if (newTab && !newTab.view.webContents.isDestroyed()) {
+              newTab.view.webContents.loadURL(url)
+            }
+          })
+        })
+        .catch((error) => {
+          logger.warn('Failed to open link in new tab', { error, url })
+        })
+      return { action: 'deny' }
+    })
+
+    const tabInfo: TabInfo = {
+      id: tabId,
+      view,
+      url: '',
+      title: '',
+      lastActive: Date.now()
+    }
+
+    windowInfo.tabs.set(tabId, tabInfo)
+
+    // Set as active tab and add to window
+    if (!windowInfo.activeTabId || windowInfo.tabs.size === 1) {
+      windowInfo.activeTabId = tabId
+      windowInfo.window.addBrowserView(view)
+      this.updateViewBounds(windowInfo)
+    }
+
+    this.sendTabBarUpdate(windowInfo)
+    logger.info('Created new tab', { windowKey, tabId, privateMode })
+    return { tabId, view }
+  }
+
+  /**
+   * Gets an existing tab or creates a new one
+   * @param privateMode - Whether to use private browsing mode
+   * @param tabId - Optional specific tab ID to use
+   * @param newTab - If true, always create a new tab (useful for parallel requests)
+   * @param showWindow - If true, shows the browser window (default: false)
+   */
+  private async getTab(
+    privateMode: boolean,
+    tabId?: string,
+    newTab?: boolean,
+    showWindow = false
+  ): Promise<{ tabId: string; tab: TabInfo }> {
+    const windowInfo = await this.getOrCreateWindow(privateMode, showWindow)
+
+    // If newTab is requested, create a fresh tab
+    if (newTab) {
+      const { tabId: freshTabId } = await this.createTab(privateMode, showWindow)
+      const tab = windowInfo.tabs.get(freshTabId)
+      if (!tab) {
+        throw new Error(`Tab ${freshTabId} was created but not found - it may have been closed`)
+      }
+      return { tabId: freshTabId, tab }
+    }
+
+    if (tabId) {
+      const tab = windowInfo.tabs.get(tabId)
+      if (tab && !tab.view.webContents.isDestroyed()) {
+        this.touchTab(windowInfo.windowKey, tabId)
+        return { tabId, tab }
+      }
+    }
+
+    // Use active tab or create new one
+    if (windowInfo.activeTabId) {
+      const activeTab = windowInfo.tabs.get(windowInfo.activeTabId)
+      if (activeTab && !activeTab.view.webContents.isDestroyed()) {
+        this.touchTab(windowInfo.windowKey, windowInfo.activeTabId)
+        return { tabId: windowInfo.activeTabId, tab: activeTab }
+      }
+    }
+
+    // Create new tab
+    const { tabId: newTabId } = await this.createTab(privateMode, showWindow)
+    const tab = windowInfo.tabs.get(newTabId)
+    if (!tab) {
+      throw new Error(`Tab ${newTabId} was created but not found - it may have been closed`)
+    }
+    return { tabId: newTabId, tab }
+  }
+
+  /**
+   * 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 privateMode - If true, uses private browsing mode (default: false)
+   * @param newTab - If true, always creates a new tab (useful for parallel requests)
+   * @param showWindow - If true, shows the browser window (default: false)
+   * @returns Object containing the current URL, page title, and tab ID after navigation
+   */
+  public async open(url: string, timeout = 10000, privateMode = false, newTab = false, showWindow = false) {
+    const { tabId: actualTabId, tab } = await this.getTab(privateMode, undefined, newTab, showWindow)
+    const view = tab.view
+    const windowKey = this.getWindowKey(privateMode)
+
+    logger.info('Loading URL', { url, windowKey, tabId: actualTabId, privateMode })
+    const { webContents } = view
+    this.touchTab(windowKey, actualTabId)
+
+    let resolved = false
+    let timeoutHandle: ReturnType<typeof setTimeout> | undefined
+    let onFinish: () => void
+    let onDomReady: () => void
+    let onFail: (_event: Electron.Event, code: number, desc: string) => void
+
+    const cleanup = () => {
+      if (timeoutHandle) clearTimeout(timeoutHandle)
+      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) => {
+      timeoutHandle = setTimeout(() => reject(new Error('Navigation timed out')), timeout)
+    })
+
+    try {
+      await Promise.race([view.webContents.loadURL(url), loadPromise, timeoutPromise])
+    } finally {
+      cleanup()
+    }
+
+    const currentUrl = webContents.getURL()
+    const title = await webContents.getTitle()
+
+    // Update tab info
+    tab.url = currentUrl
+    tab.title = title
+
+    return { currentUrl, title, tabId: actualTabId }
+  }
+
+  /**
+   * Executes JavaScript code in the page context using Chrome DevTools Protocol.
+   * @param code - JavaScript code to evaluate in the page
+   * @param timeout - Execution timeout in milliseconds (default: 5000)
+   * @param privateMode - If true, targets the private browsing window (default: false)
+   * @param tabId - Optional specific tab ID to target; if omitted, uses the active tab
+   * @returns The result value from the evaluated code, or null if no value returned
+   */
+  public async execute(code: string, timeout = 5000, privateMode = false, tabId?: string) {
+    const { tabId: actualTabId, tab } = await this.getTab(privateMode, tabId)
+    const windowKey = this.getWindowKey(privateMode)
+    this.touchTab(windowKey, actualTabId)
+    const dbg = tab.view.webContents.debugger
+
+    await this.ensureDebuggerAttached(dbg, windowKey)
+
+    let timeoutHandle: ReturnType<typeof setTimeout> | undefined
+    const evalPromise = dbg.sendCommand('Runtime.evaluate', {
+      expression: code,
+      awaitPromise: true,
+      returnByValue: true
+    })
+
+    try {
+      const result = await Promise.race([
+        evalPromise,
+        new Promise((_, reject) => {
+          timeoutHandle = 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
+    } finally {
+      if (timeoutHandle) clearTimeout(timeoutHandle)
+    }
+  }
+
+  public async reset(privateMode?: boolean, tabId?: string) {
+    if (privateMode !== undefined && tabId) {
+      const windowKey = this.getWindowKey(privateMode)
+      const windowInfo = this.windows.get(windowKey)
+      if (windowInfo) {
+        this.closeTabInternal(windowInfo, tabId)
+        windowInfo.tabs.delete(tabId)
+
+        // If no tabs left, close the window
+        if (windowInfo.tabs.size === 0) {
+          if (!windowInfo.window.isDestroyed()) {
+            windowInfo.window.close()
+          }
+          this.windows.delete(windowKey)
+          logger.info('Browser CDP window closed (last tab closed)', { windowKey, tabId })
+          return
+        }
+
+        if (windowInfo.activeTabId === tabId) {
+          windowInfo.activeTabId = windowInfo.tabs.keys().next().value ?? null
+          if (windowInfo.activeTabId) {
+            const newActiveTab = windowInfo.tabs.get(windowInfo.activeTabId)
+            if (newActiveTab && !windowInfo.window.isDestroyed()) {
+              windowInfo.window.addBrowserView(newActiveTab.view)
+              this.updateViewBounds(windowInfo)
+            }
+          }
+        }
+        this.sendTabBarUpdate(windowInfo)
+      }
+      logger.info('Browser CDP tab reset', { windowKey, tabId })
+      return
+    }
+
+    if (privateMode !== undefined) {
+      const windowKey = this.getWindowKey(privateMode)
+      const windowInfo = this.windows.get(windowKey)
+      if (windowInfo) {
+        const tabIds = Array.from(windowInfo.tabs.keys())
+        for (const tid of tabIds) {
+          this.closeTabInternal(windowInfo, tid)
+        }
+        if (!windowInfo.window.isDestroyed()) {
+          windowInfo.window.close()
+        }
+      }
+      this.windows.delete(windowKey)
+      logger.info('Browser CDP window reset', { windowKey, privateMode })
+      return
+    }
+
+    const allWindowInfos = Array.from(this.windows.values())
+    for (const windowInfo of allWindowInfos) {
+      const tabIds = Array.from(windowInfo.tabs.keys())
+      for (const tid of tabIds) {
+        this.closeTabInternal(windowInfo, tid)
+      }
+      if (!windowInfo.window.isDestroyed()) {
+        windowInfo.window.close()
+      }
+    }
+    this.windows.clear()
+    logger.info('Browser CDP context reset (all windows)')
+  }
+
+  /**
+   * 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 privateMode - If true, uses private browsing mode (default: false)
+   * @param newTab - If true, always creates a new tab (useful for parallel requests)
+   * @param showWindow - If true, shows the browser window (default: false)
+   * @returns Object with tabId and content in the requested format. For 'json', content is parsed object or { data: rawContent } if parsing fails
+   */
+  public async fetch(
+    url: string,
+    format: 'html' | 'txt' | 'markdown' | 'json' = 'markdown',
+    timeout = 10000,
+    privateMode = false,
+    newTab = false,
+    showWindow = false
+  ): Promise<{ tabId: string; content: string | object }> {
+    const { tabId } = await this.open(url, timeout, privateMode, newTab, showWindow)
+
+    const { tab } = await this.getTab(privateMode, tabId, false, showWindow)
+    const dbg = tab.view.webContents.debugger
+    const windowKey = this.getWindowKey(privateMode)
+
+    await this.ensureDebuggerAttached(dbg, windowKey)
+
+    let expression: string
+    if (format === 'json' || format === 'txt') {
+      expression = 'document.body.innerText'
+    } else {
+      expression = 'document.documentElement.outerHTML'
+    }
+
+    let timeoutHandle: ReturnType<typeof setTimeout> | undefined
+    try {
+      const result = (await Promise.race([
+        dbg.sendCommand('Runtime.evaluate', {
+          expression,
+          returnByValue: true
+        }),
+        new Promise<never>((_, reject) => {
+          timeoutHandle = setTimeout(() => reject(new Error('Fetch content timed out')), timeout)
+        })
+      ])) as { result?: { value?: string } }
+
+      const rawContent = result?.result?.value ?? ''
+
+      let content: string | object
+      if (format === 'markdown') {
+        content = this.turndownService.turndown(rawContent)
+      } else if (format === 'json') {
+        try {
+          content = JSON.parse(rawContent)
+        } catch (parseError) {
+          logger.warn('JSON parse failed, returning raw content', {
+            url,
+            contentLength: rawContent.length,
+            error: parseError
+          })
+          content = { data: rawContent }
+        }
+      } else {
+        content = rawContent
+      }
+
+      return { tabId, content }
+    } finally {
+      if (timeoutHandle) clearTimeout(timeoutHandle)
+    }
+  }
+
+  /**
+   * Lists all tabs in a window
+   * @param privateMode - If true, lists tabs from private window (default: false)
+   */
+  public async listTabs(privateMode = false): Promise<Array<{ tabId: string; url: string; title: string }>> {
+    const windowKey = this.getWindowKey(privateMode)
+    const windowInfo = this.windows.get(windowKey)
+    if (!windowInfo) return []
+
+    return Array.from(windowInfo.tabs.values()).map((tab) => ({
+      tabId: tab.id,
+      url: tab.url,
+      title: tab.title
+    }))
+  }
+
+  /**
+   * Closes a specific tab
+   * @param privateMode - If true, closes tab from private window (default: false)
+   * @param tabId - Tab identifier to close
+   */
+  public async closeTab(privateMode: boolean, tabId: string) {
+    await this.reset(privateMode, tabId)
+  }
+
+  /**
+   * Switches the active tab
+   * @param privateMode - If true, switches tab in private window (default: false)
+   * @param tabId - Tab identifier to switch to
+   */
+  public async switchTab(privateMode: boolean, tabId: string) {
+    const windowKey = this.getWindowKey(privateMode)
+    const windowInfo = this.windows.get(windowKey)
+    if (!windowInfo) throw new Error(`Window not found for ${privateMode ? 'private' : 'normal'} mode`)
+
+    const tab = windowInfo.tabs.get(tabId)
+    if (!tab) throw new Error(`Tab ${tabId} not found`)
+
+    // Remove previous active tab view (but NOT the tabBarView)
+    if (windowInfo.activeTabId && windowInfo.activeTabId !== tabId) {
+      const prevTab = windowInfo.tabs.get(windowInfo.activeTabId)
+      if (prevTab && !windowInfo.window.isDestroyed()) {
+        windowInfo.window.removeBrowserView(prevTab.view)
+      }
+    }
+
+    windowInfo.activeTabId = tabId
+
+    // Add the new active tab view
+    if (!windowInfo.window.isDestroyed()) {
+      windowInfo.window.addBrowserView(tab.view)
+      this.updateViewBounds(windowInfo)
+    }
+
+    this.touchTab(windowKey, tabId)
+    this.sendTabBarUpdate(windowInfo)
+    logger.info('Switched active tab', { windowKey, tabId, privateMode })
+  }
+}
diff --git a/src/main/mcpServers/browser/index.ts b/src/main/mcpServers/browser/index.ts
new file mode 100644
index 0000000000..fbdb0a0f6e
--- /dev/null
+++ b/src/main/mcpServers/browser/index.ts
@@ -0,0 +1,3 @@
+export { CdpBrowserController } from './controller'
+export { BrowserServer } from './server'
+export { BrowserServer as default } from './server'
diff --git a/src/main/mcpServers/browser/server.ts b/src/main/mcpServers/browser/server.ts
new file mode 100644
index 0000000000..3e889a7b66
--- /dev/null
+++ b/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
diff --git a/src/main/mcpServers/browser/tabbar-html.ts b/src/main/mcpServers/browser/tabbar-html.ts
new file mode 100644
index 0000000000..4a1bec0e0d
--- /dev/null
+++ b/src/main/mcpServers/browser/tabbar-html.ts
@@ -0,0 +1,567 @@
+export const TAB_BAR_HTML = `<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="UTF-8">
+  <style>
+    * { margin: 0; padding: 0; box-sizing: border-box; }
+    html, body {
+      height: 100%;
+      overflow: hidden;
+      font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+      font-size: 12px;
+      user-select: none;
+    }
+
+    /* Light theme (default) */
+    :root {
+      --bg-tabrow: #dee1e6;
+      --bg-toolbar: #fff;
+      --bg-tab-hover: rgba(0,0,0,0.04);
+      --bg-tab-active: #fff;
+      --bg-url: #f1f3f4;
+      --bg-url-focus: #fff;
+      --bg-btn-hover: rgba(0,0,0,0.08);
+      --bg-favicon: #9aa0a6;
+      --color-text: #5f6368;
+      --color-text-active: #202124;
+      --color-separator: #c4c7cc;
+      --shadow-url-focus: 0 1px 6px rgba(32,33,36,0.28);
+      --window-close-hover: #e81123;
+    }
+
+    /* Dark theme */
+    body.theme-dark {
+      --bg-tabrow: #202124;
+      --bg-toolbar: #292a2d;
+      --bg-tab-hover: rgba(255,255,255,0.06);
+      --bg-tab-active: #292a2d;
+      --bg-url: #35363a;
+      --bg-url-focus: #202124;
+      --bg-btn-hover: rgba(255,255,255,0.1);
+      --bg-favicon: #5f6368;
+      --color-text: #9aa0a6;
+      --color-text-active: #e8eaed;
+      --color-separator: #3c3d41;
+      --shadow-url-focus: 0 1px 6px rgba(0,0,0,0.5);
+      --window-close-hover: #e81123;
+    }
+
+    body {
+      background: var(--bg-tabrow);
+      display: flex;
+      flex-direction: column;
+      position: relative;
+    }
+    body.platform-mac { --traffic-light-width: 70px; --window-controls-width: 0px; }
+    body.platform-win, body.platform-linux { --traffic-light-width: 0px; --window-controls-width: 138px; }
+
+    /* Chrome-style tab row */
+    #tab-row {
+      display: flex;
+      align-items: flex-end;
+      padding: 8px 8px 0 8px;
+      padding-left: calc(8px + var(--traffic-light-width, 0px));
+      padding-right: calc(8px + var(--window-controls-width, 0px));
+      height: 42px;
+      flex-shrink: 0;
+      -webkit-app-region: drag;
+      background: var(--bg-tabrow);
+      position: relative;
+      z-index: 1;
+    }
+
+    #tabs-container {
+      display: flex;
+      align-items: flex-end;
+      height: 34px;
+      flex: 1;
+      min-width: 0;
+      overflow: hidden;
+    }
+
+    /* New tab button - inside tabs container, right after last tab */
+    #new-tab-btn {
+      width: 28px;
+      height: 28px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 50%;
+      cursor: pointer;
+      margin-left: 4px;
+      margin-bottom: 3px;
+      -webkit-app-region: no-drag;
+      flex-shrink: 0;
+    }
+    #new-tab-btn:hover { background: var(--bg-btn-hover); }
+    #new-tab-btn svg { width: 18px; height: 18px; fill: var(--color-text); }
+
+    /* Chrome-style tabs - shrink instead of scroll */
+    .tab {
+      position: relative;
+      display: flex;
+      align-items: center;
+      height: 34px;
+      min-width: 36px;
+      max-width: 240px;
+      flex: 1 1 240px;
+      padding: 0 6px;
+      background: transparent;
+      cursor: pointer;
+      -webkit-app-region: no-drag;
+      border-radius: 8px 8px 0 0;
+      transition: background 0.1s;
+    }
+    /* When tab is narrow, hide title, show favicon by default, show close on hover */
+    .tab.narrow .tab-title { display: none; }
+    .tab.narrow { justify-content: center; padding: 0; }
+    .tab.narrow .tab-favicon { margin-right: 0; }
+    .tab.narrow .tab-close { position: absolute; margin-left: 0; }
+    /* On narrow tab hover, hide favicon and show close button */
+    .tab.narrow:hover .tab-favicon { display: none; }
+    .tab.narrow:hover .tab-close { opacity: 1; }
+    /* Separator line using pseudo-element */
+    .tab::after {
+      content: '';
+      position: absolute;
+      right: 0;
+      top: 8px;
+      bottom: 8px;
+      width: 1px;
+      background: var(--color-separator);
+      pointer-events: none;
+    }
+    /* Hide separator for last tab */
+    .tab:last-of-type::after { display: none; }
+    /* Hide separator when tab is hovered (right side) */
+    .tab:hover::after { display: none; }
+    /* Hide separator on tab before hovered tab (left side of hovered) - managed by JS .before-hover class */
+    .tab.before-hover::after { display: none; }
+    /* Hide separator for active tab and its neighbors */
+    .tab.active::after { display: none; }
+    /* Hide separator on tab before active (left side of active) - managed by JS .before-active class */
+    .tab.before-active::after { display: none; }
+
+    .tab:hover { background: var(--bg-tab-hover); }
+    .tab.active {
+      background: var(--bg-tab-active);
+      z-index: 1;
+    }
+
+    /* Tab favicon placeholder */
+    .tab-favicon {
+      width: 16px;
+      height: 16px;
+      margin-right: 8px;
+      border-radius: 2px;
+      background: var(--bg-favicon);
+      flex-shrink: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+    .tab-favicon svg { width: 12px; height: 12px; fill: #fff; }
+    body.theme-dark .tab-favicon svg { fill: #9aa0a6; }
+
+    .tab-title {
+      flex: 1;
+      min-width: 0;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      color: var(--color-text);
+      font-size: 12px;
+      font-weight: 400;
+    }
+    .tab.active .tab-title { color: var(--color-text-active); }
+
+    .tab-close {
+      width: 24px;
+      height: 24px;
+      border-radius: 50%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-left: 4px;
+      opacity: 0;
+      transition: opacity 0.1s, background 0.1s;
+      flex-shrink: 0;
+    }
+    .tab:hover .tab-close { opacity: 1; }
+    .tab-close:hover { background: var(--bg-btn-hover); }
+    .tab-close svg { width: 16px; height: 16px; fill: var(--color-text); }
+    .tab-close:hover svg { fill: var(--color-text-active); }
+
+    /* Chrome-style address bar */
+    #address-bar {
+      display: flex;
+      align-items: center;
+      padding: 6px 16px 8px 8px;
+      gap: 4px;
+      background: var(--bg-toolbar);
+      -webkit-app-region: drag;
+    }
+    .nav-btn {
+      width: 32px;
+      height: 32px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 50%;
+      cursor: pointer;
+      background: transparent;
+      border: none;
+      flex-shrink: 0;
+      -webkit-app-region: no-drag;
+    }
+    .nav-btn:hover { background: var(--bg-btn-hover); }
+    .nav-btn:disabled { opacity: 0.3; cursor: default; }
+    .nav-btn:disabled:hover { background: transparent; }
+    .nav-btn svg { width: 20px; height: 20px; fill: var(--color-text); }
+
+    #url-container {
+      flex: 1;
+      display: flex;
+      align-items: center;
+      background: var(--bg-url);
+      border-radius: 24px;
+      padding: 0 16px;
+      height: 36px;
+      -webkit-app-region: no-drag;
+      transition: background 0.2s, box-shadow 0.2s;
+    }
+    #url-container:focus-within {
+      background: var(--bg-url-focus);
+      box-shadow: var(--shadow-url-focus);
+    }
+    #url-input {
+      flex: 1;
+      background: transparent;
+      border: none;
+      outline: none;
+      color: var(--color-text-active);
+      font-size: 14px;
+      font-family: inherit;
+    }
+    #url-input::placeholder { color: var(--color-text); }
+    #url-input::-webkit-input-placeholder { color: var(--color-text); }
+
+    /* Window controls for Windows/Linux - use inline-flex inside tab-row instead of fixed position */
+    #window-controls {
+      display: none;
+      height: 42px;
+      margin-left: auto;
+      margin-right: calc(-8px - var(--window-controls-width, 0px));
+      margin-top: -8px;
+      -webkit-app-region: no-drag;
+    }
+    body.platform-win #window-controls,
+    body.platform-linux #window-controls { display: flex; }
+    .window-control-btn {
+      width: 46px;
+      height: 42px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      background: transparent;
+      border: none;
+      cursor: pointer;
+      transition: background 0.1s;
+      -webkit-app-region: no-drag;
+    }
+    .window-control-btn:hover { background: var(--bg-btn-hover); }
+    .window-control-btn.close:hover { background: var(--window-close-hover); }
+    .window-control-btn svg { width: 10px; height: 10px; color: var(--color-text); fill: var(--color-text); stroke: var(--color-text); }
+    .window-control-btn:hover svg { color: var(--color-text-active); fill: var(--color-text-active); stroke: var(--color-text-active); }
+    .window-control-btn.close:hover svg { color: #fff; fill: #fff; stroke: #fff; }
+  </style>
+</head>
+<body>
+  <div id="tab-row">
+    <div id="tabs-container">
+      <div id="new-tab-btn" title="New tab">
+        <svg viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
+      </div>
+    </div>
+    <!-- Window controls for Windows/Linux - inside tab-row to avoid drag region issues -->
+    <div id="window-controls">
+      <button class="window-control-btn" id="minimize-btn" title="Minimize">
+        <svg viewBox="0 0 10 1"><rect width="10" height="1"/></svg>
+      </button>
+      <button class="window-control-btn" id="maximize-btn" title="Maximize">
+        <svg viewBox="0 0 10 10"><rect x="0.5" y="0.5" width="9" height="9" fill="none" stroke="currentColor" stroke-width="1.2"/></svg>
+      </button>
+      <button class="window-control-btn close" id="close-btn" title="Close">
+        <svg viewBox="0 0 10 10"><path d="M0 0L10 10M10 0L0 10" stroke="currentColor" stroke-width="1.2"/></svg>
+      </button>
+    </div>
+  </div>
+  <div id="address-bar">
+    <button class="nav-btn" id="back-btn" title="Back" disabled>
+      <svg viewBox="0 0 24 24"><path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z"/></svg>
+    </button>
+    <button class="nav-btn" id="forward-btn" title="Forward" disabled>
+      <svg viewBox="0 0 24 24"><path d="M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z"/></svg>
+    </button>
+    <button class="nav-btn" id="refresh-btn" title="Refresh">
+      <svg viewBox="0 0 24 24"><path d="M17.65 6.35A7.958 7.958 0 0012 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08A5.99 5.99 0 0112 18c-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z"/></svg>
+    </button>
+    <div id="url-container">
+      <input type="text" id="url-input" placeholder="Search or enter URL" spellcheck="false" />
+    </div>
+  </div>
+  <script>
+    const tabsContainer = document.getElementById('tabs-container');
+    const urlInput = document.getElementById('url-input');
+    const backBtn = document.getElementById('back-btn');
+    const forwardBtn = document.getElementById('forward-btn');
+    const refreshBtn = document.getElementById('refresh-btn');
+
+    window.currentUrl = '';
+    window.canGoBack = false;
+    window.canGoForward = false;
+
+    // Helper function to update before-active class for separator hiding
+    function updateBeforeActiveClass() {
+      var tabs = tabsContainer.querySelectorAll('.tab');
+      tabs.forEach(function(tab, index) {
+        tab.classList.remove('before-active');
+        if (index < tabs.length - 1 && tabs[index + 1].classList.contains('active')) {
+          tab.classList.add('before-active');
+        }
+      });
+    }
+
+    // Helper function to update narrow class based on tab width
+    function updateNarrowClass() {
+      var tabs = tabsContainer.querySelectorAll('.tab');
+      tabs.forEach(function(tab) {
+        if (tab.offsetWidth < 72) {
+          tab.classList.add('narrow');
+        } else {
+          tab.classList.remove('narrow');
+        }
+      });
+    }
+
+    var newTabBtnHtml = '<div id="new-tab-btn" title="New tab"><svg viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg></div>';
+
+    // Track if we're in "closing mode" where tab widths should be fixed
+    var closingModeTimeout = null;
+    var isInClosingMode = false;
+
+    function enterClosingMode() {
+      isInClosingMode = true;
+      // Clear any existing timeout
+      if (closingModeTimeout) {
+        clearTimeout(closingModeTimeout);
+      }
+      // Set timeout to exit closing mode after 1 second of no activity
+      closingModeTimeout = setTimeout(function() {
+        exitClosingMode();
+      }, 1000);
+    }
+
+    function exitClosingMode() {
+      isInClosingMode = false;
+      if (closingModeTimeout) {
+        clearTimeout(closingModeTimeout);
+        closingModeTimeout = null;
+      }
+      // Remove fixed widths from tabs
+      var tabs = tabsContainer.querySelectorAll('.tab');
+      tabs.forEach(function(tab) {
+        tab.style.flex = '';
+        tab.style.width = '';
+      });
+    }
+
+    // Exit closing mode when mouse leaves the tab row
+    document.getElementById('tab-row').addEventListener('mouseleave', function() {
+      if (isInClosingMode) {
+        exitClosingMode();
+      }
+    });
+
+    window.updateTabs = function(tabs, activeUrl, canGoBack, canGoForward) {
+      // Capture current tab widths before update if in closing mode
+      var previousWidths = {};
+      if (isInClosingMode) {
+        var existingTabs = tabsContainer.querySelectorAll('.tab');
+        existingTabs.forEach(function(tab) {
+          previousWidths[tab.dataset.id] = tab.offsetWidth;
+        });
+      }
+
+      if (!tabs || tabs.length === 0) {
+        // Window will be closed by main process when last tab is closed
+        // Just clear the UI in case this is called before window closes
+        tabsContainer.innerHTML = newTabBtnHtml;
+        urlInput.value = '';
+        document.getElementById('new-tab-btn').addEventListener('click', function() {
+          sendAction({ type: 'new' });
+        });
+        return;
+      }
+      tabsContainer.innerHTML = tabs.map(function(tab) {
+        var cls = 'tab' + (tab.isActive ? ' active' : '');
+        var title = (tab.title || 'New Tab').replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;');
+        var url = (tab.url || '').replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;');
+        return '<div class="' + cls + '" data-id="' + tab.id + '" title="' + url + '">' +
+          '<div class="tab-favicon"><svg viewBox="0 0 24 24"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-1 17.93c-3.95-.49-7-3.85-7-7.93 0-.62.08-1.21.21-1.79L9 15v1c0 1.1.9 2 2 2v1.93zm6.9-2.54c-.26-.81-1-1.39-1.9-1.39h-1v-3c0-.55-.45-1-1-1H8v-2h2c.55 0 1-.45 1-1V7h2c1.1 0 2-.9 2-2v-.41c2.93 1.19 5 4.06 5 7.41 0 2.08-.8 3.97-2.1 5.39z"/></svg></div>' +
+          '<span class="tab-title">' + title + '</span>' +
+          '<div class="tab-close" data-id="' + tab.id + '">' +
+            '<svg viewBox="0 0 24 24"><path d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/></svg>' +
+          '</div>' +
+        '</div>';
+      }).join('') + newTabBtnHtml;
+
+      // Re-attach event listener for new tab button
+      document.getElementById('new-tab-btn').addEventListener('click', function() {
+        sendAction({ type: 'new' });
+      });
+
+      // If in closing mode, fix the widths of remaining tabs
+      if (isInClosingMode) {
+        var newTabs = tabsContainer.querySelectorAll('.tab');
+        newTabs.forEach(function(tab) {
+          var prevWidth = previousWidths[tab.dataset.id];
+          if (prevWidth) {
+            tab.style.flex = '0 0 ' + prevWidth + 'px';
+            tab.style.width = prevWidth + 'px';
+          }
+        });
+      }
+
+      // Update before-active class for proper separator hiding
+      updateBeforeActiveClass();
+      // Update narrow class based on tab width
+      updateNarrowClass();
+
+      if (activeUrl !== undefined) {
+        window.currentUrl = activeUrl || '';
+        if (document.activeElement !== urlInput) {
+          urlInput.value = window.currentUrl;
+        }
+      }
+
+      if (canGoBack !== undefined) {
+        window.canGoBack = canGoBack;
+        backBtn.disabled = !canGoBack;
+      }
+      if (canGoForward !== undefined) {
+        window.canGoForward = canGoForward;
+        forwardBtn.disabled = !canGoForward;
+      }
+    };
+
+    function sendAction(action) {
+      window.postMessage({ channel: 'tabbar-action', payload: action }, '*');
+    }
+
+    tabsContainer.addEventListener('click', function(e) {
+      var closeBtn = e.target.closest('.tab-close');
+      if (closeBtn) {
+        e.stopPropagation();
+        enterClosingMode();
+        sendAction({ type: 'close', tabId: closeBtn.dataset.id });
+        return;
+      }
+      var tab = e.target.closest('.tab');
+      if (tab) {
+        sendAction({ type: 'switch', tabId: tab.dataset.id });
+      }
+    });
+
+    tabsContainer.addEventListener('auxclick', function(e) {
+      if (e.button === 1) {
+        var tab = e.target.closest('.tab');
+        if (tab) {
+          enterClosingMode();
+          sendAction({ type: 'close', tabId: tab.dataset.id });
+        }
+      }
+    });
+
+    // Handle hover state for separator hiding (left side of hovered tab)
+    tabsContainer.addEventListener('mouseover', function(e) {
+      var tab = e.target.closest('.tab');
+      // Clear all before-hover classes first
+      tabsContainer.querySelectorAll('.before-hover').forEach(function(t) {
+        t.classList.remove('before-hover');
+      });
+      if (tab) {
+        var prev = tab.previousElementSibling;
+        if (prev && prev.classList.contains('tab')) {
+          prev.classList.add('before-hover');
+        }
+      }
+    });
+
+    tabsContainer.addEventListener('mouseleave', function() {
+      tabsContainer.querySelectorAll('.before-hover').forEach(function(t) {
+        t.classList.remove('before-hover');
+      });
+    });
+
+    urlInput.addEventListener('keydown', function(e) {
+      if (e.key === 'Enter') {
+        var url = urlInput.value.trim();
+        if (url) {
+          sendAction({ type: 'navigate', url: url });
+        }
+      }
+    });
+
+    urlInput.addEventListener('focus', function() {
+      urlInput.select();
+    });
+
+    backBtn.addEventListener('click', function() {
+      if (window.canGoBack) {
+        sendAction({ type: 'back' });
+      }
+    });
+
+    forwardBtn.addEventListener('click', function() {
+      if (window.canGoForward) {
+        sendAction({ type: 'forward' });
+      }
+    });
+
+    refreshBtn.addEventListener('click', function() {
+      sendAction({ type: 'refresh' });
+    });
+
+    // Window controls for Windows/Linux
+    document.getElementById('minimize-btn').addEventListener('click', function() {
+      sendAction({ type: 'window-minimize' });
+    });
+    document.getElementById('maximize-btn').addEventListener('click', function() {
+      sendAction({ type: 'window-maximize' });
+    });
+    document.getElementById('close-btn').addEventListener('click', function() {
+      sendAction({ type: 'window-close' });
+    });
+
+    // Platform initialization - called from main process
+    window.initPlatform = function(platform) {
+      document.body.classList.add('platform-' + platform);
+    };
+
+    // Theme initialization - called from main process
+    window.setTheme = function(isDark) {
+      if (isDark) {
+        document.body.classList.add('theme-dark');
+      } else {
+        document.body.classList.remove('theme-dark');
+      }
+    };
+
+    // Update narrow class on window resize
+    window.addEventListener('resize', function() {
+      updateNarrowClass();
+    });
+  </script>
+</body>
+</html>`
diff --git a/src/main/mcpServers/browser/tools/execute.ts b/src/main/mcpServers/browser/tools/execute.ts
new file mode 100644
index 0000000000..09cd79f2d1
--- /dev/null
+++ b/src/main/mcpServers/browser/tools/execute.ts
@@ -0,0 +1,52 @@
+import * as z from 'zod'
+
+import type { CdpBrowserController } from '../controller'
+import { logger } from '../types'
+import { errorResponse, successResponse } from './utils'
+
+export const ExecuteSchema = z.object({
+  code: z.string().describe('JavaScript code to run in page context'),
+  timeout: z.number().default(5000).describe('Execution timeout in ms (default: 5000)'),
+  privateMode: z.boolean().optional().describe('Target private session (default: false)'),
+  tabId: z.string().optional().describe('Target specific tab by ID')
+})
+
+export const executeToolDefinition = {
+  name: 'execute',
+  description:
+    'Run JavaScript in the currently open page. Use after open to: click elements, fill forms, extract content (document.body.innerText), or interact with the page. The page must be opened first with open or fetch.',
+  inputSchema: {
+    type: 'object',
+    properties: {
+      code: {
+        type: 'string',
+        description:
+          'JavaScript to evaluate. Examples: document.body.innerText (get text), document.querySelector("button").click() (click), document.title (get title)'
+      },
+      timeout: {
+        type: 'number',
+        description: 'Execution timeout in ms (default: 5000)'
+      },
+      privateMode: {
+        type: 'boolean',
+        description: 'Target private session (default: false)'
+      },
+      tabId: {
+        type: 'string',
+        description: 'Target specific tab by ID (from open response)'
+      }
+    },
+    required: ['code']
+  }
+}
+
+export async function handleExecute(controller: CdpBrowserController, args: unknown) {
+  const { code, timeout, privateMode, tabId } = ExecuteSchema.parse(args)
+  try {
+    const value = await controller.execute(code, timeout, privateMode ?? false, tabId)
+    return successResponse(typeof value === 'string' ? value : JSON.stringify(value))
+  } catch (error) {
+    logger.error('Execute failed', { error, code: code.slice(0, 100), privateMode, tabId })
+    return errorResponse(error as Error)
+  }
+}
diff --git a/src/main/mcpServers/browser/tools/index.ts b/src/main/mcpServers/browser/tools/index.ts
new file mode 100644
index 0000000000..5ba6fcae6d
--- /dev/null
+++ b/src/main/mcpServers/browser/tools/index.ts
@@ -0,0 +1,22 @@
+export { ExecuteSchema, executeToolDefinition, handleExecute } from './execute'
+export { handleOpen, OpenSchema, openToolDefinition } from './open'
+export { handleReset, resetToolDefinition } from './reset'
+
+import type { CdpBrowserController } from '../controller'
+import { executeToolDefinition, handleExecute } from './execute'
+import { handleOpen, openToolDefinition } from './open'
+import { handleReset, resetToolDefinition } from './reset'
+
+export const toolDefinitions = [openToolDefinition, executeToolDefinition, resetToolDefinition]
+
+export const toolHandlers: Record<
+  string,
+  (
+    controller: CdpBrowserController,
+    args: unknown
+  ) => Promise<{ content: { type: string; text: string }[]; isError: boolean }>
+> = {
+  open: handleOpen,
+  execute: handleExecute,
+  reset: handleReset
+}
diff --git a/src/main/mcpServers/browser/tools/open.ts b/src/main/mcpServers/browser/tools/open.ts
new file mode 100644
index 0000000000..6ea9ec9e48
--- /dev/null
+++ b/src/main/mcpServers/browser/tools/open.ts
@@ -0,0 +1,81 @@
+import * as z from 'zod'
+
+import type { CdpBrowserController } from '../controller'
+import { logger } from '../types'
+import { errorResponse, successResponse } from './utils'
+
+export const OpenSchema = z.object({
+  url: z.url().describe('URL to navigate to'),
+  format: z
+    .enum(['html', 'txt', 'markdown', 'json'])
+    .optional()
+    .describe('If set, return page content in this format. If not set, just open the page and return tabId.'),
+  timeout: z.number().optional().describe('Navigation timeout in ms (default: 10000)'),
+  privateMode: z.boolean().optional().describe('Use incognito mode, no data persisted (default: false)'),
+  newTab: z.boolean().optional().describe('Open in new tab, required for parallel requests (default: false)'),
+  showWindow: z.boolean().optional().default(true).describe('Show browser window (default: true)')
+})
+
+export const openToolDefinition = {
+  name: 'open',
+  description:
+    'Navigate to a URL in a browser window. If format is specified, returns { tabId, content } with page content in that format. Otherwise, returns { currentUrl, title, tabId } for subsequent operations with execute tool. Set newTab=true when opening multiple URLs in parallel.',
+  inputSchema: {
+    type: 'object',
+    properties: {
+      url: {
+        type: 'string',
+        description: 'URL to navigate to'
+      },
+      format: {
+        type: 'string',
+        enum: ['html', 'txt', 'markdown', 'json'],
+        description: 'If set, return page content in this format. If not set, just open the page and return tabId.'
+      },
+      timeout: {
+        type: 'number',
+        description: 'Navigation timeout in ms (default: 10000)'
+      },
+      privateMode: {
+        type: 'boolean',
+        description: 'Use incognito mode, no data persisted (default: false)'
+      },
+      newTab: {
+        type: 'boolean',
+        description: 'Open in new tab, required for parallel requests (default: false)'
+      },
+      showWindow: {
+        type: 'boolean',
+        description: 'Show browser window (default: true)'
+      }
+    },
+    required: ['url']
+  }
+}
+
+export async function handleOpen(controller: CdpBrowserController, args: unknown) {
+  try {
+    const { url, format, timeout, privateMode, newTab, showWindow } = OpenSchema.parse(args)
+
+    if (format) {
+      const { tabId, content } = await controller.fetch(
+        url,
+        format,
+        timeout ?? 10000,
+        privateMode ?? false,
+        newTab ?? false,
+        showWindow
+      )
+      return successResponse(JSON.stringify({ tabId, content }))
+    } else {
+      const res = await controller.open(url, timeout ?? 10000, privateMode ?? false, newTab ?? false, showWindow)
+      return successResponse(JSON.stringify(res))
+    }
+  } catch (error) {
+    logger.error('Open failed', {
+      error,
+      url: args && typeof args === 'object' && 'url' in args ? args.url : undefined
+    })
+    return errorResponse(error instanceof Error ? error : String(error))
+  }
+}
diff --git a/src/main/mcpServers/browser/tools/reset.ts b/src/main/mcpServers/browser/tools/reset.ts
new file mode 100644
index 0000000000..fe67b74b1d
--- /dev/null
+++ b/src/main/mcpServers/browser/tools/reset.ts
@@ -0,0 +1,43 @@
+import * as z from 'zod'
+
+import type { CdpBrowserController } from '../controller'
+import { logger } from '../types'
+import { errorResponse, successResponse } from './utils'
+
+export const ResetSchema = z.object({
+  privateMode: z.boolean().optional().describe('true=private window, false=normal window, omit=all windows'),
+  tabId: z.string().optional().describe('Close specific tab only (requires privateMode)')
+})
+
+export const resetToolDefinition = {
+  name: 'reset',
+  description:
+    'Close browser windows and clear state. Call when done browsing to free resources. Omit all parameters to close everything.',
+  inputSchema: {
+    type: 'object',
+    properties: {
+      privateMode: {
+        type: 'boolean',
+        description: 'true=reset private window only, false=reset normal window only, omit=reset all'
+      },
+      tabId: {
+        type: 'string',
+        description: 'Close specific tab only (requires privateMode to be set)'
+      }
+    }
+  }
+}
+
+export async function handleReset(controller: CdpBrowserController, args: unknown) {
+  try {
+    const { privateMode, tabId } = ResetSchema.parse(args)
+    await controller.reset(privateMode, tabId)
+    return successResponse('reset')
+  } catch (error) {
+    logger.error('Reset failed', {
+      error,
+      privateMode: args && typeof args === 'object' && 'privateMode' in args ? args.privateMode : undefined
+    })
+    return errorResponse(error instanceof Error ? error : String(error))
+  }
+}
diff --git a/src/main/mcpServers/browser/tools/utils.ts b/src/main/mcpServers/browser/tools/utils.ts
new file mode 100644
index 0000000000..f5272ac81c
--- /dev/null
+++ b/src/main/mcpServers/browser/tools/utils.ts
@@ -0,0 +1,14 @@
+export function successResponse(text: string) {
+  return {
+    content: [{ type: 'text', text }],
+    isError: false
+  }
+}
+
+export function errorResponse(error: Error | string) {
+  const message = error instanceof Error ? error.message : error
+  return {
+    content: [{ type: 'text', text: message }],
+    isError: true
+  }
+}
diff --git a/src/main/mcpServers/browser/types.ts b/src/main/mcpServers/browser/types.ts
new file mode 100644
index 0000000000..a59fe59665
--- /dev/null
+++ b/src/main/mcpServers/browser/types.ts
@@ -0,0 +1,24 @@
+import { loggerService } from '@logger'
+import type { BrowserView, BrowserWindow } from 'electron'
+
+export const logger = loggerService.withContext('MCPBrowserCDP')
+export const userAgent =
+  'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36'
+
+export interface TabInfo {
+  id: string
+  view: BrowserView
+  url: string
+  title: string
+  lastActive: number
+}
+
+export interface WindowInfo {
+  windowKey: string
+  privateMode: boolean
+  window: BrowserWindow
+  tabs: Map<string, TabInfo>
+  activeTabId: string | null
+  lastActive: number
+  tabBarView?: BrowserView
+}
diff --git a/src/main/mcpServers/factory.ts b/src/main/mcpServers/factory.ts
index 2323701e49..909901c1c8 100644
--- a/src/main/mcpServers/factory.ts
+++ b/src/main/mcpServers/factory.ts
@@ -4,6 +4,7 @@ import type { BuiltinMCPServerName } from '@types'
 import { BuiltinMCPServerNames } from '@types'
 
 import BraveSearchServer from './brave-search'
+import BrowserServer from './browser'
 import DiDiMcpServer from './didi-mcp'
 import DifyKnowledgeServer from './dify-knowledge'
 import FetchServer from './fetch'
@@ -35,7 +36,7 @@ export function createInMemoryMCPServer(
       return new FetchServer().server
     }
     case BuiltinMCPServerNames.filesystem: {
-      return new FileSystemServer(args).server
+      return new FileSystemServer(envs.WORKSPACE_ROOT).server
     }
     case BuiltinMCPServerNames.difyKnowledge: {
       const difyKey = envs.DIFY_KEY
@@ -48,6 +49,9 @@ export function createInMemoryMCPServer(
       const apiKey = envs.DIDI_API_KEY
       return new DiDiMcpServer(apiKey).server
     }
+    case BuiltinMCPServerNames.browser: {
+      return new BrowserServer().server
+    }
     default:
       throw new Error(`Unknown in-memory MCP server: ${name}`)
   }
diff --git a/src/main/mcpServers/filesystem.ts b/src/main/mcpServers/filesystem.ts
deleted file mode 100644
index ba10783881..0000000000
--- a/src/main/mcpServers/filesystem.ts
+++ /dev/null
@@ -1,652 +0,0 @@
-// port https://github.com/modelcontextprotocol/servers/blob/main/src/filesystem/index.ts
-
-import { loggerService } from '@logger'
-import { Server } from '@modelcontextprotocol/sdk/server/index.js'
-import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
-import { createTwoFilesPatch } from 'diff'
-import fs from 'fs/promises'
-import { minimatch } from 'minimatch'
-import os from 'os'
-import path from 'path'
-import * as z from 'zod'
-
-const logger = loggerService.withContext('MCP:FileSystemServer')
-
-// Normalize all paths consistently
-function normalizePath(p: string): string {
-  return path.normalize(p)
-}
-
-function expandHome(filepath: string): string {
-  if (filepath.startsWith('~/') || filepath === '~') {
-    return path.join(os.homedir(), filepath.slice(1))
-  }
-  return filepath
-}
-
-// Security utilities
-async function validatePath(allowedDirectories: string[], requestedPath: string): Promise<string> {
-  const expandedPath = expandHome(requestedPath)
-  const absolute = path.isAbsolute(expandedPath)
-    ? path.resolve(expandedPath)
-    : path.resolve(process.cwd(), expandedPath)
-
-  const normalizedRequested = normalizePath(absolute)
-
-  // Check if path is within allowed directories
-  const isAllowed = allowedDirectories.some((dir) => normalizedRequested.startsWith(dir))
-  if (!isAllowed) {
-    throw new Error(
-      `Access denied - path outside allowed directories: ${absolute} not in ${allowedDirectories.join(', ')}`
-    )
-  }
-
-  // Handle symlinks by checking their real path
-  try {
-    const realPath = await fs.realpath(absolute)
-    const normalizedReal = normalizePath(realPath)
-    const isRealPathAllowed = allowedDirectories.some((dir) => normalizedReal.startsWith(dir))
-    if (!isRealPathAllowed) {
-      throw new Error('Access denied - symlink target outside allowed directories')
-    }
-    return realPath
-  } catch (error) {
-    // For new files that don't exist yet, verify parent directory
-    const parentDir = path.dirname(absolute)
-    try {
-      const realParentPath = await fs.realpath(parentDir)
-      const normalizedParent = normalizePath(realParentPath)
-      const isParentAllowed = allowedDirectories.some((dir) => normalizedParent.startsWith(dir))
-      if (!isParentAllowed) {
-        throw new Error('Access denied - parent directory outside allowed directories')
-      }
-      return absolute
-    } catch {
-      throw new Error(`Parent directory does not exist: ${parentDir}`)
-    }
-  }
-}
-
-// Schema definitions
-const ReadFileArgsSchema = z.object({
-  path: z.string()
-})
-
-const ReadMultipleFilesArgsSchema = z.object({
-  paths: z.array(z.string())
-})
-
-const WriteFileArgsSchema = z.object({
-  path: z.string(),
-  content: z.string()
-})
-
-const EditOperation = z.object({
-  oldText: z.string().describe('Text to search for - must match exactly'),
-  newText: z.string().describe('Text to replace with')
-})
-
-const EditFileArgsSchema = z.object({
-  path: z.string(),
-  edits: z.array(EditOperation),
-  dryRun: z.boolean().default(false).describe('Preview changes using git-style diff format')
-})
-
-const CreateDirectoryArgsSchema = z.object({
-  path: z.string()
-})
-
-const ListDirectoryArgsSchema = z.object({
-  path: z.string()
-})
-
-const DirectoryTreeArgsSchema = z.object({
-  path: z.string()
-})
-
-const MoveFileArgsSchema = z.object({
-  source: z.string(),
-  destination: z.string()
-})
-
-const SearchFilesArgsSchema = z.object({
-  path: z.string(),
-  pattern: z.string(),
-  excludePatterns: z.array(z.string()).optional().default([])
-})
-
-const GetFileInfoArgsSchema = z.object({
-  path: z.string()
-})
-
-interface FileInfo {
-  size: number
-  created: Date
-  modified: Date
-  accessed: Date
-  isDirectory: boolean
-  isFile: boolean
-  permissions: string
-}
-
-// Tool implementations
-async function getFileStats(filePath: string): Promise<FileInfo> {
-  const stats = await fs.stat(filePath)
-  return {
-    size: stats.size,
-    created: stats.birthtime,
-    modified: stats.mtime,
-    accessed: stats.atime,
-    isDirectory: stats.isDirectory(),
-    isFile: stats.isFile(),
-    permissions: stats.mode.toString(8).slice(-3)
-  }
-}
-
-async function searchFiles(
-  allowedDirectories: string[],
-  rootPath: string,
-  pattern: string,
-  excludePatterns: string[] = []
-): Promise<string[]> {
-  const results: string[] = []
-
-  async function search(currentPath: string) {
-    const entries = await fs.readdir(currentPath, { withFileTypes: true })
-
-    for (const entry of entries) {
-      const fullPath = path.join(currentPath, entry.name)
-
-      try {
-        // Validate each path before processing
-        await validatePath(allowedDirectories, fullPath)
-
-        // Check if path matches any exclude pattern
-        const relativePath = path.relative(rootPath, fullPath)
-        const shouldExclude = excludePatterns.some((pattern) => {
-          const globPattern = pattern.includes('*') ? pattern : `**/${pattern}/**`
-          return minimatch(relativePath, globPattern, { dot: true })
-        })
-
-        if (shouldExclude) {
-          continue
-        }
-
-        if (entry.name.toLowerCase().includes(pattern.toLowerCase())) {
-          results.push(fullPath)
-        }
-
-        if (entry.isDirectory()) {
-          await search(fullPath)
-        }
-      } catch (error) {
-        // Skip invalid paths during search
-      }
-    }
-  }
-
-  await search(rootPath)
-  return results
-}
-
-// file editing and diffing utilities
-function normalizeLineEndings(text: string): string {
-  return text.replace(/\r\n/g, '\n')
-}
-
-function createUnifiedDiff(originalContent: string, newContent: string, filepath: string = 'file'): string {
-  // Ensure consistent line endings for diff
-  const normalizedOriginal = normalizeLineEndings(originalContent)
-  const normalizedNew = normalizeLineEndings(newContent)
-
-  return createTwoFilesPatch(filepath, filepath, normalizedOriginal, normalizedNew, 'original', 'modified')
-}
-
-async function applyFileEdits(
-  filePath: string,
-  edits: Array<{ oldText: string; newText: string }>,
-  dryRun = false
-): Promise<string> {
-  // Read file content and normalize line endings
-  const content = normalizeLineEndings(await fs.readFile(filePath, 'utf-8'))
-
-  // Apply edits sequentially
-  let modifiedContent = content
-  for (const edit of edits) {
-    const normalizedOld = normalizeLineEndings(edit.oldText)
-    const normalizedNew = normalizeLineEndings(edit.newText)
-
-    // If exact match exists, use it
-    if (modifiedContent.includes(normalizedOld)) {
-      modifiedContent = modifiedContent.replace(normalizedOld, normalizedNew)
-      continue
-    }
-
-    // Otherwise, try line-by-line matching with flexibility for whitespace
-    const oldLines = normalizedOld.split('\n')
-    const contentLines = modifiedContent.split('\n')
-    let matchFound = false
-
-    for (let i = 0; i <= contentLines.length - oldLines.length; i++) {
-      const potentialMatch = contentLines.slice(i, i + oldLines.length)
-
-      // Compare lines with normalized whitespace
-      const isMatch = oldLines.every((oldLine, j) => {
-        const contentLine = potentialMatch[j]
-        return oldLine.trim() === contentLine.trim()
-      })
-
-      if (isMatch) {
-        // Preserve original indentation of first line
-        const originalIndent = contentLines[i].match(/^\s*/)?.[0] || ''
-        const newLines = normalizedNew.split('\n').map((line, j) => {
-          if (j === 0) return originalIndent + line.trimStart()
-          // For subsequent lines, try to preserve relative indentation
-          const oldIndent = oldLines[j]?.match(/^\s*/)?.[0] || ''
-          const newIndent = line.match(/^\s*/)?.[0] || ''
-          if (oldIndent && newIndent) {
-            const relativeIndent = newIndent.length - oldIndent.length
-            return originalIndent + ' '.repeat(Math.max(0, relativeIndent)) + line.trimStart()
-          }
-          return line
-        })
-
-        contentLines.splice(i, oldLines.length, ...newLines)
-        modifiedContent = contentLines.join('\n')
-        matchFound = true
-        break
-      }
-    }
-
-    if (!matchFound) {
-      throw new Error(`Could not find exact match for edit:\n${edit.oldText}`)
-    }
-  }
-
-  // Create unified diff
-  const diff = createUnifiedDiff(content, modifiedContent, filePath)
-
-  // Format diff with appropriate number of backticks
-  let numBackticks = 3
-  while (diff.includes('`'.repeat(numBackticks))) {
-    numBackticks++
-  }
-  const formattedDiff = `${'`'.repeat(numBackticks)}diff\n${diff}${'`'.repeat(numBackticks)}\n\n`
-
-  if (!dryRun) {
-    await fs.writeFile(filePath, modifiedContent, 'utf-8')
-  }
-
-  return formattedDiff
-}
-
-class FileSystemServer {
-  public server: Server
-  private allowedDirectories: string[]
-  constructor(allowedDirs: string[]) {
-    if (!Array.isArray(allowedDirs) || allowedDirs.length === 0) {
-      throw new Error('No allowed directories provided, please specify at least one directory in args')
-    }
-
-    this.allowedDirectories = allowedDirs.map((dir) => normalizePath(path.resolve(expandHome(dir))))
-
-    // Validate that all directories exist and are accessible
-    this.validateDirs().catch((error) => {
-      logger.error('Error validating allowed directories:', error)
-      throw new Error(`Error validating allowed directories: ${error}`)
-    })
-
-    this.server = new Server(
-      {
-        name: 'secure-filesystem-server',
-        version: '0.2.0'
-      },
-      {
-        capabilities: {
-          tools: {}
-        }
-      }
-    )
-    this.initialize()
-  }
-
-  async validateDirs() {
-    // Validate that all directories exist and are accessible
-    await Promise.all(
-      this.allowedDirectories.map(async (dir) => {
-        try {
-          const stats = await fs.stat(expandHome(dir))
-          if (!stats.isDirectory()) {
-            logger.error(`Error: ${dir} is not a directory`)
-            throw new Error(`Error: ${dir} is not a directory`)
-          }
-        } catch (error: any) {
-          logger.error(`Error accessing directory ${dir}:`, error)
-          throw new Error(`Error accessing directory ${dir}:`, error)
-        }
-      })
-    )
-  }
-
-  initialize() {
-    // Tool handlers
-    this.server.setRequestHandler(ListToolsRequestSchema, async () => {
-      return {
-        tools: [
-          {
-            name: 'read_file',
-            description:
-              'Read the complete contents of a file from the file system. ' +
-              'Handles various text encodings and provides detailed error messages ' +
-              'if the file cannot be read. Use this tool when you need to examine ' +
-              'the contents of a single file. Only works within allowed directories.',
-            inputSchema: z.toJSONSchema(ReadFileArgsSchema)
-          },
-          {
-            name: 'read_multiple_files',
-            description:
-              'Read the contents of multiple files simultaneously. This is more ' +
-              'efficient than reading files one by one when you need to analyze ' +
-              "or compare multiple files. Each file's content is returned with its " +
-              "path as a reference. Failed reads for individual files won't stop " +
-              'the entire operation. Only works within allowed directories.',
-            inputSchema: z.toJSONSchema(ReadMultipleFilesArgsSchema)
-          },
-          {
-            name: 'write_file',
-            description:
-              'Create a new file or completely overwrite an existing file with new content. ' +
-              'Use with caution as it will overwrite existing files without warning. ' +
-              'Handles text content with proper encoding. Only works within allowed directories.',
-            inputSchema: z.toJSONSchema(WriteFileArgsSchema)
-          },
-          {
-            name: 'edit_file',
-            description:
-              'Make line-based edits to a text file. Each edit replaces exact line sequences ' +
-              'with new content. Returns a git-style diff showing the changes made. ' +
-              'Only works within allowed directories.',
-            inputSchema: z.toJSONSchema(EditFileArgsSchema)
-          },
-          {
-            name: 'create_directory',
-            description:
-              'Create a new directory or ensure a directory exists. Can create multiple ' +
-              'nested directories in one operation. If the directory already exists, ' +
-              'this operation will succeed silently. Perfect for setting up directory ' +
-              'structures for projects or ensuring required paths exist. Only works within allowed directories.',
-            inputSchema: z.toJSONSchema(CreateDirectoryArgsSchema)
-          },
-          {
-            name: 'list_directory',
-            description:
-              'Get a detailed listing of all files and directories in a specified path. ' +
-              'Results clearly distinguish between files and directories with [FILE] and [DIR] ' +
-              'prefixes. This tool is essential for understanding directory structure and ' +
-              'finding specific files within a directory. Only works within allowed directories.',
-            inputSchema: z.toJSONSchema(ListDirectoryArgsSchema)
-          },
-          {
-            name: 'directory_tree',
-            description:
-              'Get a recursive tree view of files and directories as a JSON structure. ' +
-              "Each entry includes 'name', 'type' (file/directory), and 'children' for directories. " +
-              'Files have no children array, while directories always have a children array (which may be empty). ' +
-              'The output is formatted with 2-space indentation for readability. Only works within allowed directories.',
-            inputSchema: z.toJSONSchema(DirectoryTreeArgsSchema)
-          },
-          {
-            name: 'move_file',
-            description:
-              'Move or rename files and directories. Can move files between directories ' +
-              'and rename them in a single operation. If the destination exists, the ' +
-              'operation will fail. Works across different directories and can be used ' +
-              'for simple renaming within the same directory. Both source and destination must be within allowed directories.',
-            inputSchema: z.toJSONSchema(MoveFileArgsSchema)
-          },
-          {
-            name: 'search_files',
-            description:
-              'Recursively search for files and directories matching a pattern. ' +
-              'Searches through all subdirectories from the starting path. The search ' +
-              'is case-insensitive and matches partial names. Returns full paths to all ' +
-              "matching items. Great for finding files when you don't know their exact location. " +
-              'Only searches within allowed directories.',
-            inputSchema: z.toJSONSchema(SearchFilesArgsSchema)
-          },
-          {
-            name: 'get_file_info',
-            description:
-              'Retrieve detailed metadata about a file or directory. Returns comprehensive ' +
-              'information including size, creation time, last modified time, permissions, ' +
-              'and type. This tool is perfect for understanding file characteristics ' +
-              'without reading the actual content. Only works within allowed directories.',
-            inputSchema: z.toJSONSchema(GetFileInfoArgsSchema)
-          },
-          {
-            name: 'list_allowed_directories',
-            description:
-              'Returns the list of directories that this server is allowed to access. ' +
-              'Use this to understand which directories are available before trying to access files.',
-            inputSchema: {
-              type: 'object',
-              properties: {},
-              required: []
-            }
-          }
-        ]
-      }
-    })
-
-    this.server.setRequestHandler(CallToolRequestSchema, async (request) => {
-      try {
-        const { name, arguments: args } = request.params
-
-        switch (name) {
-          case 'read_file': {
-            const parsed = ReadFileArgsSchema.safeParse(args)
-            if (!parsed.success) {
-              throw new Error(`Invalid arguments for read_file: ${parsed.error}`)
-            }
-            const validPath = await validatePath(this.allowedDirectories, parsed.data.path)
-            const content = await fs.readFile(validPath, 'utf-8')
-            return {
-              content: [{ type: 'text', text: content }]
-            }
-          }
-
-          case 'read_multiple_files': {
-            const parsed = ReadMultipleFilesArgsSchema.safeParse(args)
-            if (!parsed.success) {
-              throw new Error(`Invalid arguments for read_multiple_files: ${parsed.error}`)
-            }
-            const results = await Promise.all(
-              parsed.data.paths.map(async (filePath: string) => {
-                try {
-                  const validPath = await validatePath(this.allowedDirectories, filePath)
-                  const content = await fs.readFile(validPath, 'utf-8')
-                  return `${filePath}:\n${content}\n`
-                } catch (error) {
-                  const errorMessage = error instanceof Error ? error.message : String(error)
-                  return `${filePath}: Error - ${errorMessage}`
-                }
-              })
-            )
-            return {
-              content: [{ type: 'text', text: results.join('\n---\n') }]
-            }
-          }
-
-          case 'write_file': {
-            const parsed = WriteFileArgsSchema.safeParse(args)
-            if (!parsed.success) {
-              throw new Error(`Invalid arguments for write_file: ${parsed.error}`)
-            }
-            const validPath = await validatePath(this.allowedDirectories, parsed.data.path)
-            await fs.writeFile(validPath, parsed.data.content, 'utf-8')
-            return {
-              content: [{ type: 'text', text: `Successfully wrote to ${parsed.data.path}` }]
-            }
-          }
-
-          case 'edit_file': {
-            const parsed = EditFileArgsSchema.safeParse(args)
-            if (!parsed.success) {
-              throw new Error(`Invalid arguments for edit_file: ${parsed.error}`)
-            }
-            const validPath = await validatePath(this.allowedDirectories, parsed.data.path)
-            const result = await applyFileEdits(validPath, parsed.data.edits, parsed.data.dryRun)
-            return {
-              content: [{ type: 'text', text: result }]
-            }
-          }
-
-          case 'create_directory': {
-            const parsed = CreateDirectoryArgsSchema.safeParse(args)
-            if (!parsed.success) {
-              throw new Error(`Invalid arguments for create_directory: ${parsed.error}`)
-            }
-            const validPath = await validatePath(this.allowedDirectories, parsed.data.path)
-            await fs.mkdir(validPath, { recursive: true })
-            return {
-              content: [{ type: 'text', text: `Successfully created directory ${parsed.data.path}` }]
-            }
-          }
-
-          case 'list_directory': {
-            const parsed = ListDirectoryArgsSchema.safeParse(args)
-            if (!parsed.success) {
-              throw new Error(`Invalid arguments for list_directory: ${parsed.error}`)
-            }
-            const validPath = await validatePath(this.allowedDirectories, parsed.data.path)
-            const entries = await fs.readdir(validPath, { withFileTypes: true })
-            const formatted = entries
-              .map((entry) => `${entry.isDirectory() ? '[DIR]' : '[FILE]'} ${entry.name}`)
-              .join('\n')
-            return {
-              content: [{ type: 'text', text: formatted }]
-            }
-          }
-
-          case 'directory_tree': {
-            const parsed = DirectoryTreeArgsSchema.safeParse(args)
-            if (!parsed.success) {
-              throw new Error(`Invalid arguments for directory_tree: ${parsed.error}`)
-            }
-
-            interface TreeEntry {
-              name: string
-              type: 'file' | 'directory'
-              children?: TreeEntry[]
-            }
-
-            async function buildTree(allowedDirectories: string[], currentPath: string): Promise<TreeEntry[]> {
-              const validPath = await validatePath(allowedDirectories, currentPath)
-              const entries = await fs.readdir(validPath, { withFileTypes: true })
-              const result: TreeEntry[] = []
-
-              for (const entry of entries) {
-                const entryData: TreeEntry = {
-                  name: entry.name,
-                  type: entry.isDirectory() ? 'directory' : 'file'
-                }
-
-                if (entry.isDirectory()) {
-                  const subPath = path.join(currentPath, entry.name)
-                  entryData.children = await buildTree(allowedDirectories, subPath)
-                }
-
-                result.push(entryData)
-              }
-
-              return result
-            }
-
-            const treeData = await buildTree(this.allowedDirectories, parsed.data.path)
-            return {
-              content: [
-                {
-                  type: 'text',
-                  text: JSON.stringify(treeData, null, 2)
-                }
-              ]
-            }
-          }
-
-          case 'move_file': {
-            const parsed = MoveFileArgsSchema.safeParse(args)
-            if (!parsed.success) {
-              throw new Error(`Invalid arguments for move_file: ${parsed.error}`)
-            }
-            const validSourcePath = await validatePath(this.allowedDirectories, parsed.data.source)
-            const validDestPath = await validatePath(this.allowedDirectories, parsed.data.destination)
-            await fs.rename(validSourcePath, validDestPath)
-            return {
-              content: [
-                { type: 'text', text: `Successfully moved ${parsed.data.source} to ${parsed.data.destination}` }
-              ]
-            }
-          }
-
-          case 'search_files': {
-            const parsed = SearchFilesArgsSchema.safeParse(args)
-            if (!parsed.success) {
-              throw new Error(`Invalid arguments for search_files: ${parsed.error}`)
-            }
-            const validPath = await validatePath(this.allowedDirectories, parsed.data.path)
-            const results = await searchFiles(
-              this.allowedDirectories,
-              validPath,
-              parsed.data.pattern,
-              parsed.data.excludePatterns
-            )
-            return {
-              content: [{ type: 'text', text: results.length > 0 ? results.join('\n') : 'No matches found' }]
-            }
-          }
-
-          case 'get_file_info': {
-            const parsed = GetFileInfoArgsSchema.safeParse(args)
-            if (!parsed.success) {
-              throw new Error(`Invalid arguments for get_file_info: ${parsed.error}`)
-            }
-            const validPath = await validatePath(this.allowedDirectories, parsed.data.path)
-            const info = await getFileStats(validPath)
-            return {
-              content: [
-                {
-                  type: 'text',
-                  text: Object.entries(info)
-                    .map(([key, value]) => `${key}: ${value}`)
-                    .join('\n')
-                }
-              ]
-            }
-          }
-
-          case 'list_allowed_directories': {
-            return {
-              content: [
-                {
-                  type: 'text',
-                  text: `Allowed directories:\n${this.allowedDirectories.join('\n')}`
-                }
-              ]
-            }
-          }
-
-          default:
-            throw new Error(`Unknown tool: ${name}`)
-        }
-      } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error)
-        return {
-          content: [{ type: 'text', text: `Error: ${errorMessage}` }],
-          isError: true
-        }
-      }
-    })
-  }
-}
-
-export default FileSystemServer
diff --git a/src/main/mcpServers/filesystem/index.ts b/src/main/mcpServers/filesystem/index.ts
new file mode 100644
index 0000000000..cec4c31cdf
--- /dev/null
+++ b/src/main/mcpServers/filesystem/index.ts
@@ -0,0 +1,2 @@
+// Re-export FileSystemServer to maintain existing import pattern
+export { default, FileSystemServer } from './server'
diff --git a/src/main/mcpServers/filesystem/server.ts b/src/main/mcpServers/filesystem/server.ts
new file mode 100644
index 0000000000..164ba0c9c4
--- /dev/null
+++ b/src/main/mcpServers/filesystem/server.ts
@@ -0,0 +1,118 @@
+import { Server } from '@modelcontextprotocol/sdk/server/index.js'
+import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
+import { app } from 'electron'
+import fs from 'fs/promises'
+import path from 'path'
+
+import {
+  deleteToolDefinition,
+  editToolDefinition,
+  globToolDefinition,
+  grepToolDefinition,
+  handleDeleteTool,
+  handleEditTool,
+  handleGlobTool,
+  handleGrepTool,
+  handleLsTool,
+  handleReadTool,
+  handleWriteTool,
+  lsToolDefinition,
+  readToolDefinition,
+  writeToolDefinition
+} from './tools'
+import { logger } from './types'
+
+export class FileSystemServer {
+  public server: Server
+  private baseDir: string
+
+  constructor(baseDir?: string) {
+    if (baseDir && path.isAbsolute(baseDir)) {
+      this.baseDir = baseDir
+      logger.info(`Using provided baseDir for filesystem MCP: ${baseDir}`)
+    } else {
+      const userData = app.getPath('userData')
+      this.baseDir = path.join(userData, 'Data', 'Workspace')
+      logger.info(`Using default workspace for filesystem MCP baseDir: ${this.baseDir}`)
+    }
+
+    this.server = new Server(
+      {
+        name: 'filesystem-server',
+        version: '2.0.0'
+      },
+      {
+        capabilities: {
+          tools: {}
+        }
+      }
+    )
+
+    this.initialize()
+  }
+
+  async initialize() {
+    try {
+      await fs.mkdir(this.baseDir, { recursive: true })
+    } catch (error) {
+      logger.error('Failed to create filesystem MCP baseDir', { error, baseDir: this.baseDir })
+    }
+
+    // Register tool list handler
+    this.server.setRequestHandler(ListToolsRequestSchema, async () => {
+      return {
+        tools: [
+          globToolDefinition,
+          lsToolDefinition,
+          grepToolDefinition,
+          readToolDefinition,
+          editToolDefinition,
+          writeToolDefinition,
+          deleteToolDefinition
+        ]
+      }
+    })
+
+    // Register tool call handler
+    this.server.setRequestHandler(CallToolRequestSchema, async (request) => {
+      try {
+        const { name, arguments: args } = request.params
+
+        switch (name) {
+          case 'glob':
+            return await handleGlobTool(args, this.baseDir)
+
+          case 'ls':
+            return await handleLsTool(args, this.baseDir)
+
+          case 'grep':
+            return await handleGrepTool(args, this.baseDir)
+
+          case 'read':
+            return await handleReadTool(args, this.baseDir)
+
+          case 'edit':
+            return await handleEditTool(args, this.baseDir)
+
+          case 'write':
+            return await handleWriteTool(args, this.baseDir)
+
+          case 'delete':
+            return await handleDeleteTool(args, this.baseDir)
+
+          default:
+            throw new Error(`Unknown tool: ${name}`)
+        }
+      } catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error)
+        logger.error(`Tool execution error for ${request.params.name}:`, { error })
+        return {
+          content: [{ type: 'text', text: `Error: ${errorMessage}` }],
+          isError: true
+        }
+      }
+    })
+  }
+}
+
+export default FileSystemServer
diff --git a/src/main/mcpServers/filesystem/tools/delete.ts b/src/main/mcpServers/filesystem/tools/delete.ts
new file mode 100644
index 0000000000..83becc4f17
--- /dev/null
+++ b/src/main/mcpServers/filesystem/tools/delete.ts
@@ -0,0 +1,93 @@
+import fs from 'fs/promises'
+import path from 'path'
+import * as z from 'zod'
+
+import { logger, validatePath } from '../types'
+
+// Schema definition
+export const DeleteToolSchema = z.object({
+  path: z.string().describe('The path to the file or directory to delete'),
+  recursive: z.boolean().optional().describe('For directories, whether to delete recursively (default: false)')
+})
+
+// Tool definition with detailed description
+export const deleteToolDefinition = {
+  name: 'delete',
+  description: `Deletes a file or directory from the filesystem.
+
+CAUTION: This operation cannot be undone!
+
+- For files: simply provide the path
+- For empty directories: provide the path
+- For non-empty directories: set recursive=true
+- The path must be an absolute path, not a relative path
+- Always verify the path before deleting to avoid data loss`,
+  inputSchema: z.toJSONSchema(DeleteToolSchema)
+}
+
+// Handler implementation
+export async function handleDeleteTool(args: unknown, baseDir: string) {
+  const parsed = DeleteToolSchema.safeParse(args)
+  if (!parsed.success) {
+    throw new Error(`Invalid arguments for delete: ${parsed.error}`)
+  }
+
+  const targetPath = parsed.data.path
+  const validPath = await validatePath(targetPath, baseDir)
+  const recursive = parsed.data.recursive || false
+
+  // Check if path exists and get stats
+  let stats
+  try {
+    stats = await fs.stat(validPath)
+  } catch (error: any) {
+    if (error.code === 'ENOENT') {
+      throw new Error(`Path not found: ${targetPath}`)
+    }
+    throw error
+  }
+
+  const isDirectory = stats.isDirectory()
+  const relativePath = path.relative(baseDir, validPath)
+
+  // Perform deletion
+  try {
+    if (isDirectory) {
+      if (recursive) {
+        // Delete directory recursively
+        await fs.rm(validPath, { recursive: true, force: true })
+      } else {
+        // Try to delete empty directory
+        await fs.rmdir(validPath)
+      }
+    } else {
+      // Delete file
+      await fs.unlink(validPath)
+    }
+  } catch (error: any) {
+    if (error.code === 'ENOTEMPTY') {
+      throw new Error(`Directory not empty: ${targetPath}. Use recursive=true to delete non-empty directories.`)
+    }
+    throw new Error(`Failed to delete: ${error.message}`)
+  }
+
+  // Log the operation
+  logger.info('Path deleted', {
+    path: validPath,
+    type: isDirectory ? 'directory' : 'file',
+    recursive: isDirectory ? recursive : undefined
+  })
+
+  // Format output
+  const itemType = isDirectory ? 'Directory' : 'File'
+  const recursiveNote = isDirectory && recursive ? ' (recursive)' : ''
+
+  return {
+    content: [
+      {
+        type: 'text',
+        text: `${itemType} deleted${recursiveNote}: ${relativePath}`
+      }
+    ]
+  }
+}
diff --git a/src/main/mcpServers/filesystem/tools/edit.ts b/src/main/mcpServers/filesystem/tools/edit.ts
new file mode 100644
index 0000000000..c1a0e637ce
--- /dev/null
+++ b/src/main/mcpServers/filesystem/tools/edit.ts
@@ -0,0 +1,130 @@
+import fs from 'fs/promises'
+import path from 'path'
+import * as z from 'zod'
+
+import { logger, replaceWithFuzzyMatch, validatePath } from '../types'
+
+// Schema definition
+export const EditToolSchema = z.object({
+  file_path: z.string().describe('The path to the file to modify'),
+  old_string: z.string().describe('The text to replace'),
+  new_string: z.string().describe('The text to replace it with'),
+  replace_all: z.boolean().optional().default(false).describe('Replace all occurrences of old_string (default false)')
+})
+
+// Tool definition with detailed description
+export const editToolDefinition = {
+  name: 'edit',
+  description: `Performs exact string replacements in files.
+
+- You must use the 'read' tool at least once before editing
+- The file_path must be an absolute path, not a relative path
+- Preserve exact indentation from read output (after the line number prefix)
+- Never include line number prefixes in old_string or new_string
+- ALWAYS prefer editing existing files over creating new ones
+- The edit will FAIL if old_string is not found in the file
+- The edit will FAIL if old_string appears multiple times (provide more context or use replace_all)
+- The edit will FAIL if old_string equals new_string
+- Use replace_all to rename variables or replace all occurrences`,
+  inputSchema: z.toJSONSchema(EditToolSchema)
+}
+
+// Handler implementation
+export async function handleEditTool(args: unknown, baseDir: string) {
+  const parsed = EditToolSchema.safeParse(args)
+  if (!parsed.success) {
+    throw new Error(`Invalid arguments for edit: ${parsed.error}`)
+  }
+
+  const { file_path: filePath, old_string: oldString, new_string: newString, replace_all: replaceAll } = parsed.data
+
+  // Validate path
+  const validPath = await validatePath(filePath, baseDir)
+
+  // Check if file exists
+  try {
+    const stats = await fs.stat(validPath)
+    if (!stats.isFile()) {
+      throw new Error(`Path is not a file: ${filePath}`)
+    }
+  } catch (error: any) {
+    if (error.code === 'ENOENT') {
+      // If old_string is empty, this is a create new file operation
+      if (oldString === '') {
+        // Create parent directory if needed
+        const parentDir = path.dirname(validPath)
+        await fs.mkdir(parentDir, { recursive: true })
+
+        // Write the new content
+        await fs.writeFile(validPath, newString, 'utf-8')
+
+        logger.info('File created', { path: validPath })
+
+        const relativePath = path.relative(baseDir, validPath)
+        return {
+          content: [
+            {
+              type: 'text',
+              text: `Created new file: ${relativePath}\nLines: ${newString.split('\n').length}`
+            }
+          ]
+        }
+      }
+      throw new Error(`File not found: ${filePath}`)
+    }
+    throw error
+  }
+
+  // Read current content
+  const content = await fs.readFile(validPath, 'utf-8')
+
+  // Handle special case: old_string is empty (create file with content)
+  if (oldString === '') {
+    await fs.writeFile(validPath, newString, 'utf-8')
+
+    logger.info('File overwritten', { path: validPath })
+
+    const relativePath = path.relative(baseDir, validPath)
+    return {
+      content: [
+        {
+          type: 'text',
+          text: `Overwrote file: ${relativePath}\nLines: ${newString.split('\n').length}`
+        }
+      ]
+    }
+  }
+
+  // Perform the replacement with fuzzy matching
+  const newContent = replaceWithFuzzyMatch(content, oldString, newString, replaceAll)
+
+  // Write the modified content
+  await fs.writeFile(validPath, newContent, 'utf-8')
+
+  logger.info('File edited', {
+    path: validPath,
+    replaceAll
+  })
+
+  // Generate a simple diff summary
+  const oldLines = content.split('\n').length
+  const newLines = newContent.split('\n').length
+  const lineDiff = newLines - oldLines
+
+  const relativePath = path.relative(baseDir, validPath)
+  let diffSummary = `Edited: ${relativePath}`
+  if (lineDiff > 0) {
+    diffSummary += `\n+${lineDiff} lines`
+  } else if (lineDiff < 0) {
+    diffSummary += `\n${lineDiff} lines`
+  }
+
+  return {
+    content: [
+      {
+        type: 'text',
+        text: diffSummary
+      }
+    ]
+  }
+}
diff --git a/src/main/mcpServers/filesystem/tools/glob.ts b/src/main/mcpServers/filesystem/tools/glob.ts
new file mode 100644
index 0000000000..d6a6b4a757
--- /dev/null
+++ b/src/main/mcpServers/filesystem/tools/glob.ts
@@ -0,0 +1,149 @@
+import fs from 'fs/promises'
+import path from 'path'
+import * as z from 'zod'
+
+import type { FileInfo } from '../types'
+import { logger, MAX_FILES_LIMIT, runRipgrep, validatePath } from '../types'
+
+// Schema definition
+export const GlobToolSchema = z.object({
+  pattern: z.string().describe('The glob pattern to match files against'),
+  path: z
+    .string()
+    .optional()
+    .describe('The directory to search in (must be absolute path). Defaults to the base directory')
+})
+
+// Tool definition with detailed description
+export const globToolDefinition = {
+  name: 'glob',
+  description: `Fast file pattern matching tool that works with any codebase size.
+
+- Supports glob patterns like "**/*.js" or "src/**/*.ts"
+- Returns matching absolute file paths sorted by modification time (newest first)
+- Use this when you need to find files by name patterns
+- Patterns without "/" (e.g., "*.txt") match files at ANY depth in the directory tree
+- Patterns with "/" (e.g., "src/*.ts") match relative to the search path
+- Pattern syntax: * (any chars), ** (any path), {a,b} (alternatives), ? (single char)
+- Results are limited to 100 files
+- The path parameter must be an absolute path if specified
+- If path is not specified, defaults to the base directory
+- IMPORTANT: Omit the path field for the default directory (don't use "undefined" or "null")`,
+  inputSchema: z.toJSONSchema(GlobToolSchema)
+}
+
+// Handler implementation
+export async function handleGlobTool(args: unknown, baseDir: string) {
+  const parsed = GlobToolSchema.safeParse(args)
+  if (!parsed.success) {
+    throw new Error(`Invalid arguments for glob: ${parsed.error}`)
+  }
+
+  const searchPath = parsed.data.path || baseDir
+  const validPath = await validatePath(searchPath, baseDir)
+
+  // Verify the search directory exists
+  try {
+    const stats = await fs.stat(validPath)
+    if (!stats.isDirectory()) {
+      throw new Error(`Path is not a directory: ${validPath}`)
+    }
+  } catch (error: unknown) {
+    if (error && typeof error === 'object' && 'code' in error && error.code === 'ENOENT') {
+      throw new Error(`Directory not found: ${validPath}`)
+    }
+    throw error
+  }
+
+  // Validate pattern
+  const pattern = parsed.data.pattern.trim()
+  if (!pattern) {
+    throw new Error('Pattern cannot be empty')
+  }
+
+  const files: FileInfo[] = []
+  let truncated = false
+
+  // Build ripgrep arguments for file listing using --glob=pattern format
+  const rgArgs: string[] = [
+    '--files',
+    '--follow',
+    '--hidden',
+    `--glob=${pattern}`,
+    '--glob=!.git/*',
+    '--glob=!node_modules/*',
+    '--glob=!dist/*',
+    '--glob=!build/*',
+    '--glob=!__pycache__/*',
+    validPath
+  ]
+
+  // Use ripgrep for file listing
+  logger.debug('Running ripgrep with args', { rgArgs })
+  const rgResult = await runRipgrep(rgArgs)
+  logger.debug('Ripgrep result', {
+    ok: rgResult.ok,
+    exitCode: rgResult.exitCode,
+    stdoutLength: rgResult.stdout.length,
+    stdoutPreview: rgResult.stdout.slice(0, 500)
+  })
+
+  // Process results if we have stdout content
+  // Exit code 2 can indicate partial errors (e.g., permission denied on some dirs) but still have valid results
+  if (rgResult.ok && rgResult.stdout.length > 0) {
+    const lines = rgResult.stdout.split('\n').filter(Boolean)
+    logger.debug('Parsed lines from ripgrep', { lineCount: lines.length, lines })
+
+    for (const line of lines) {
+      if (files.length >= MAX_FILES_LIMIT) {
+        truncated = true
+        break
+      }
+
+      const filePath = line.trim()
+      if (!filePath) continue
+
+      const absolutePath = path.isAbsolute(filePath) ? filePath : path.resolve(validPath, filePath)
+
+      try {
+        const stats = await fs.stat(absolutePath)
+        files.push({
+          path: absolutePath,
+          type: 'file', // ripgrep --files only returns files
+          size: stats.size,
+          modified: stats.mtime
+        })
+      } catch (error) {
+        logger.debug('Failed to stat file from ripgrep output, skipping', { file: absolutePath, error })
+      }
+    }
+  }
+
+  // Sort by modification time (newest first)
+  files.sort((a, b) => {
+    const aTime = a.modified ? a.modified.getTime() : 0
+    const bTime = b.modified ? b.modified.getTime() : 0
+    return bTime - aTime
+  })
+
+  // Format output - always use absolute paths
+  const output: string[] = []
+  if (files.length === 0) {
+    output.push(`No files found matching pattern "${parsed.data.pattern}" in ${validPath}`)
+  } else {
+    output.push(...files.map((f) => f.path))
+    if (truncated) {
+      output.push('')
+      output.push(`(Results truncated to ${MAX_FILES_LIMIT} files. Consider using a more specific pattern.)`)
+    }
+  }
+
+  return {
+    content: [
+      {
+        type: 'text',
+        text: output.join('\n')
+      }
+    ]
+  }
+}
diff --git a/src/main/mcpServers/filesystem/tools/grep.ts b/src/main/mcpServers/filesystem/tools/grep.ts
new file mode 100644
index 0000000000..d822db9d88
--- /dev/null
+++ b/src/main/mcpServers/filesystem/tools/grep.ts
@@ -0,0 +1,266 @@
+import fs from 'fs/promises'
+import path from 'path'
+import * as z from 'zod'
+
+import type { GrepMatch } from '../types'
+import { isBinaryFile, MAX_GREP_MATCHES, MAX_LINE_LENGTH, runRipgrep, validatePath } from '../types'
+
+// Schema definition
+export const GrepToolSchema = z.object({
+  pattern: z.string().describe('The regex pattern to search for in file contents'),
+  path: z
+    .string()
+    .optional()
+    .describe('The directory to search in (must be absolute path). Defaults to the base directory'),
+  include: z.string().optional().describe('File pattern to include in the search (e.g. "*.js", "*.{ts,tsx}")')
+})
+
+// Tool definition with detailed description
+export const grepToolDefinition = {
+  name: 'grep',
+  description: `Fast content search tool that works with any codebase size.
+
+- Searches file contents using regular expressions
+- Supports full regex syntax (e.g., "log.*Error", "function\\s+\\w+")
+- Filter files by pattern with include (e.g., "*.js", "*.{ts,tsx}")
+- Returns absolute file paths and line numbers with matching content
+- Results are limited to 100 matches
+- Binary files are automatically skipped
+- Common directories (node_modules, .git, dist) are excluded
+- The path parameter must be an absolute path if specified
+- If path is not specified, defaults to the base directory`,
+  inputSchema: z.toJSONSchema(GrepToolSchema)
+}
+
+// Handler implementation
+export async function handleGrepTool(args: unknown, baseDir: string) {
+  const parsed = GrepToolSchema.safeParse(args)
+  if (!parsed.success) {
+    throw new Error(`Invalid arguments for grep: ${parsed.error}`)
+  }
+
+  const data = parsed.data
+
+  if (!data.pattern) {
+    throw new Error('Pattern is required for grep')
+  }
+
+  const searchPath = data.path || baseDir
+  const validPath = await validatePath(searchPath, baseDir)
+
+  const matches: GrepMatch[] = []
+  let truncated = false
+  let regex: RegExp
+
+  // Build ripgrep arguments
+  const rgArgs: string[] = [
+    '--no-heading',
+    '--line-number',
+    '--color',
+    'never',
+    '--ignore-case',
+    '--glob',
+    '!.git/**',
+    '--glob',
+    '!node_modules/**',
+    '--glob',
+    '!dist/**',
+    '--glob',
+    '!build/**',
+    '--glob',
+    '!__pycache__/**'
+  ]
+
+  if (data.include) {
+    for (const pat of data.include
+      .split(',')
+      .map((p) => p.trim())
+      .filter(Boolean)) {
+      rgArgs.push('--glob', pat)
+    }
+  }
+
+  rgArgs.push(data.pattern)
+  rgArgs.push(validPath)
+
+  try {
+    regex = new RegExp(data.pattern, 'gi')
+  } catch (error) {
+    throw new Error(`Invalid regex pattern: ${data.pattern}`)
+  }
+
+  async function searchFile(filePath: string): Promise<void> {
+    if (matches.length >= MAX_GREP_MATCHES) {
+      truncated = true
+      return
+    }
+
+    try {
+      // Skip binary files
+      if (await isBinaryFile(filePath)) {
+        return
+      }
+
+      const content = await fs.readFile(filePath, 'utf-8')
+      const lines = content.split('\n')
+
+      lines.forEach((line, index) => {
+        if (matches.length >= MAX_GREP_MATCHES) {
+          truncated = true
+          return
+        }
+
+        if (regex.test(line)) {
+          // Truncate long lines
+          const truncatedLine = line.length > MAX_LINE_LENGTH ? line.substring(0, MAX_LINE_LENGTH) + '...' : line
+
+          matches.push({
+            file: filePath,
+            line: index + 1,
+            content: truncatedLine.trim()
+          })
+        }
+      })
+    } catch (error) {
+      // Skip files we can't read
+    }
+  }
+
+  async function searchDirectory(dir: string): Promise<void> {
+    if (matches.length >= MAX_GREP_MATCHES) {
+      truncated = true
+      return
+    }
+
+    try {
+      const entries = await fs.readdir(dir, { withFileTypes: true })
+
+      for (const entry of entries) {
+        if (matches.length >= MAX_GREP_MATCHES) {
+          truncated = true
+          break
+        }
+
+        const fullPath = path.join(dir, entry.name)
+
+        // Skip common ignore patterns
+        if (entry.name.startsWith('.') && entry.name !== '.env.example') {
+          continue
+        }
+        if (['node_modules', 'dist', 'build', '__pycache__', '.git'].includes(entry.name)) {
+          continue
+        }
+
+        if (entry.isFile()) {
+          // Check if file matches include pattern
+          if (data.include) {
+            const includePatterns = data.include.split(',').map((p) => p.trim())
+            const fileName = path.basename(fullPath)
+            const matchesInclude = includePatterns.some((pattern) => {
+              // Simple glob pattern matching
+              const regexPattern = pattern
+                .replace(/\*/g, '.*')
+                .replace(/\?/g, '.')
+                .replace(/\{([^}]+)\}/g, (_, group) => `(${group.split(',').join('|')})`)
+              return new RegExp(`^${regexPattern}$`).test(fileName)
+            })
+            if (!matchesInclude) {
+              continue
+            }
+          }
+
+          await searchFile(fullPath)
+        } else if (entry.isDirectory()) {
+          await searchDirectory(fullPath)
+        }
+      }
+    } catch (error) {
+      // Skip directories we can't read
+    }
+  }
+
+  // Perform the search
+  let usedRipgrep = false
+  try {
+    const rgResult = await runRipgrep(rgArgs)
+    if (rgResult.ok && rgResult.exitCode !== null && rgResult.exitCode !== 2) {
+      usedRipgrep = true
+      const lines = rgResult.stdout.split('\n').filter(Boolean)
+      for (const line of lines) {
+        if (matches.length >= MAX_GREP_MATCHES) {
+          truncated = true
+          break
+        }
+
+        const firstColon = line.indexOf(':')
+        const secondColon = line.indexOf(':', firstColon + 1)
+        if (firstColon === -1 || secondColon === -1) continue
+
+        const filePart = line.slice(0, firstColon)
+        const linePart = line.slice(firstColon + 1, secondColon)
+        const contentPart = line.slice(secondColon + 1)
+        const lineNum = Number.parseInt(linePart, 10)
+        if (!Number.isFinite(lineNum)) continue
+
+        const absoluteFilePath = path.isAbsolute(filePart) ? filePart : path.resolve(baseDir, filePart)
+        const truncatedLine =
+          contentPart.length > MAX_LINE_LENGTH ? contentPart.substring(0, MAX_LINE_LENGTH) + '...' : contentPart
+
+        matches.push({
+          file: absoluteFilePath,
+          line: lineNum,
+          content: truncatedLine.trim()
+        })
+      }
+    }
+  } catch {
+    usedRipgrep = false
+  }
+
+  if (!usedRipgrep) {
+    const stats = await fs.stat(validPath)
+    if (stats.isFile()) {
+      await searchFile(validPath)
+    } else {
+      await searchDirectory(validPath)
+    }
+  }
+
+  // Format output
+  const output: string[] = []
+
+  if (matches.length === 0) {
+    output.push('No matches found')
+  } else {
+    // Group matches by file
+    const fileGroups = new Map<string, GrepMatch[]>()
+    matches.forEach((match) => {
+      if (!fileGroups.has(match.file)) {
+        fileGroups.set(match.file, [])
+      }
+      fileGroups.get(match.file)!.push(match)
+    })
+
+    // Format grouped matches - always use absolute paths
+    fileGroups.forEach((fileMatches, filePath) => {
+      output.push(`\n${filePath}:`)
+      fileMatches.forEach((match) => {
+        output.push(`  ${match.line}: ${match.content}`)
+      })
+    })
+
+    if (truncated) {
+      output.push('')
+      output.push(`(Results truncated to ${MAX_GREP_MATCHES} matches. Consider using a more specific pattern or path.)`)
+    }
+  }
+
+  return {
+    content: [
+      {
+        type: 'text',
+        text: output.join('\n')
+      }
+    ]
+  }
+}
diff --git a/src/main/mcpServers/filesystem/tools/index.ts b/src/main/mcpServers/filesystem/tools/index.ts
new file mode 100644
index 0000000000..2e02d613c4
--- /dev/null
+++ b/src/main/mcpServers/filesystem/tools/index.ts
@@ -0,0 +1,8 @@
+// Export all tool definitions and handlers
+export { deleteToolDefinition, handleDeleteTool } from './delete'
+export { editToolDefinition, handleEditTool } from './edit'
+export { globToolDefinition, handleGlobTool } from './glob'
+export { grepToolDefinition, handleGrepTool } from './grep'
+export { handleLsTool, lsToolDefinition } from './ls'
+export { handleReadTool, readToolDefinition } from './read'
+export { handleWriteTool, writeToolDefinition } from './write'
diff --git a/src/main/mcpServers/filesystem/tools/ls.ts b/src/main/mcpServers/filesystem/tools/ls.ts
new file mode 100644
index 0000000000..22672c9fb9
--- /dev/null
+++ b/src/main/mcpServers/filesystem/tools/ls.ts
@@ -0,0 +1,150 @@
+import fs from 'fs/promises'
+import path from 'path'
+import * as z from 'zod'
+
+import { MAX_FILES_LIMIT, validatePath } from '../types'
+
+// Schema definition
+export const LsToolSchema = z.object({
+  path: z.string().optional().describe('The directory to list (must be absolute path). Defaults to the base directory'),
+  recursive: z.boolean().optional().describe('Whether to list directories recursively (default: false)')
+})
+
+// Tool definition with detailed description
+export const lsToolDefinition = {
+  name: 'ls',
+  description: `Lists files and directories in a specified path.
+
+- Returns a tree-like structure with icons (📁 directories, 📄 files)
+- Shows the absolute directory path in the header
+- Entries are sorted alphabetically with directories first
+- Can list recursively with recursive=true (up to 5 levels deep)
+- Common directories (node_modules, dist, .git) are excluded
+- Hidden files (starting with .) are excluded except .env.example
+- Results are limited to 100 entries
+- The path parameter must be an absolute path if specified
+- If path is not specified, defaults to the base directory`,
+  inputSchema: z.toJSONSchema(LsToolSchema)
+}
+
+// Handler implementation
+export async function handleLsTool(args: unknown, baseDir: string) {
+  const parsed = LsToolSchema.safeParse(args)
+  if (!parsed.success) {
+    throw new Error(`Invalid arguments for ls: ${parsed.error}`)
+  }
+
+  const targetPath = parsed.data.path || baseDir
+  const validPath = await validatePath(targetPath, baseDir)
+  const recursive = parsed.data.recursive || false
+
+  interface TreeNode {
+    name: string
+    type: 'file' | 'directory'
+    children?: TreeNode[]
+  }
+
+  let fileCount = 0
+  let truncated = false
+
+  async function buildTree(dirPath: string, depth: number = 0): Promise<TreeNode[]> {
+    if (fileCount >= MAX_FILES_LIMIT) {
+      truncated = true
+      return []
+    }
+
+    try {
+      const entries = await fs.readdir(dirPath, { withFileTypes: true })
+      const nodes: TreeNode[] = []
+
+      // Sort entries: directories first, then files, alphabetically
+      entries.sort((a, b) => {
+        if (a.isDirectory() && !b.isDirectory()) return -1
+        if (!a.isDirectory() && b.isDirectory()) return 1
+        return a.name.localeCompare(b.name)
+      })
+
+      for (const entry of entries) {
+        if (fileCount >= MAX_FILES_LIMIT) {
+          truncated = true
+          break
+        }
+
+        // Skip hidden files and common ignore patterns
+        if (entry.name.startsWith('.') && entry.name !== '.env.example') {
+          continue
+        }
+        if (['node_modules', 'dist', 'build', '__pycache__'].includes(entry.name)) {
+          continue
+        }
+
+        fileCount++
+        const node: TreeNode = {
+          name: entry.name,
+          type: entry.isDirectory() ? 'directory' : 'file'
+        }
+
+        if (entry.isDirectory() && recursive && depth < 5) {
+          // Limit depth to prevent infinite recursion
+          const childPath = path.join(dirPath, entry.name)
+          node.children = await buildTree(childPath, depth + 1)
+        }
+
+        nodes.push(node)
+      }
+
+      return nodes
+    } catch (error) {
+      return []
+    }
+  }
+
+  // Build the tree
+  const tree = await buildTree(validPath)
+
+  // Format as text output
+  function formatTree(nodes: TreeNode[], prefix: string = ''): string[] {
+    const lines: string[] = []
+
+    nodes.forEach((node, index) => {
+      const isLastNode = index === nodes.length - 1
+      const connector = isLastNode ? '└── ' : '├── '
+      const icon = node.type === 'directory' ? '📁 ' : '📄 '
+
+      lines.push(prefix + connector + icon + node.name)
+
+      if (node.children && node.children.length > 0) {
+        const childPrefix = prefix + (isLastNode ? '    ' : '│   ')
+        lines.push(...formatTree(node.children, childPrefix))
+      }
+    })
+
+    return lines
+  }
+
+  // Generate output
+  const output: string[] = []
+  output.push(`Directory: ${validPath}`)
+  output.push('')
+
+  if (tree.length === 0) {
+    output.push('(empty directory)')
+  } else {
+    const treeLines = formatTree(tree, '')
+    output.push(...treeLines)
+
+    if (truncated) {
+      output.push('')
+      output.push(`(Results truncated to ${MAX_FILES_LIMIT} files. Consider listing a more specific directory.)`)
+    }
+  }
+
+  return {
+    content: [
+      {
+        type: 'text',
+        text: output.join('\n')
+      }
+    ]
+  }
+}
diff --git a/src/main/mcpServers/filesystem/tools/read.ts b/src/main/mcpServers/filesystem/tools/read.ts
new file mode 100644
index 0000000000..460c88dda4
--- /dev/null
+++ b/src/main/mcpServers/filesystem/tools/read.ts
@@ -0,0 +1,101 @@
+import fs from 'fs/promises'
+import path from 'path'
+import * as z from 'zod'
+
+import { DEFAULT_READ_LIMIT, isBinaryFile, MAX_LINE_LENGTH, validatePath } from '../types'
+
+// Schema definition
+export const ReadToolSchema = z.object({
+  file_path: z.string().describe('The path to the file to read'),
+  offset: z.number().optional().describe('The line number to start reading from (1-based)'),
+  limit: z.number().optional().describe('The number of lines to read (defaults to 2000)')
+})
+
+// Tool definition with detailed description
+export const readToolDefinition = {
+  name: 'read',
+  description: `Reads a file from the local filesystem.
+
+- Assumes this tool can read all files on the machine
+- The file_path parameter must be an absolute path, not a relative path
+- By default, reads up to 2000 lines starting from the beginning
+- You can optionally specify a line offset and limit for long files
+- Any lines longer than 2000 characters will be truncated
+- Results are returned with line numbers starting at 1
+- Binary files are detected and rejected with an error
+- Empty files return a warning`,
+  inputSchema: z.toJSONSchema(ReadToolSchema)
+}
+
+// Handler implementation
+export async function handleReadTool(args: unknown, baseDir: string) {
+  const parsed = ReadToolSchema.safeParse(args)
+  if (!parsed.success) {
+    throw new Error(`Invalid arguments for read: ${parsed.error}`)
+  }
+
+  const filePath = parsed.data.file_path
+  const validPath = await validatePath(filePath, baseDir)
+
+  // Check if file exists
+  try {
+    const stats = await fs.stat(validPath)
+    if (!stats.isFile()) {
+      throw new Error(`Path is not a file: ${filePath}`)
+    }
+  } catch (error: any) {
+    if (error.code === 'ENOENT') {
+      throw new Error(`File not found: ${filePath}`)
+    }
+    throw error
+  }
+
+  // Check if file is binary
+  if (await isBinaryFile(validPath)) {
+    throw new Error(`Cannot read binary file: ${filePath}`)
+  }
+
+  // Read file content
+  const content = await fs.readFile(validPath, 'utf-8')
+  const lines = content.split('\n')
+
+  // Apply offset and limit
+  const offset = (parsed.data.offset || 1) - 1 // Convert to 0-based
+  const limit = parsed.data.limit || DEFAULT_READ_LIMIT
+
+  if (offset < 0 || offset >= lines.length) {
+    throw new Error(`Invalid offset: ${offset + 1}. File has ${lines.length} lines.`)
+  }
+
+  const selectedLines = lines.slice(offset, offset + limit)
+
+  // Format output with line numbers and truncate long lines
+  const output: string[] = []
+  const relativePath = path.relative(baseDir, validPath)
+
+  output.push(`File: ${relativePath}`)
+  if (offset > 0 || limit < lines.length) {
+    output.push(`Lines ${offset + 1} to ${Math.min(offset + limit, lines.length)} of ${lines.length}`)
+  }
+  output.push('')
+
+  selectedLines.forEach((line, index) => {
+    const lineNumber = offset + index + 1
+    const truncatedLine = line.length > MAX_LINE_LENGTH ? line.substring(0, MAX_LINE_LENGTH) + '...' : line
+    output.push(`${lineNumber.toString().padStart(6)}\t${truncatedLine}`)
+  })
+
+  if (offset + limit < lines.length) {
+    output.push('')
+    output.push(`(${lines.length - (offset + limit)} more lines not shown)`)
+  }
+
+  return {
+    content: [
+      {
+        type: 'text',
+        text: output.join('\n')
+      }
+    ]
+  }
+}
diff --git a/src/main/mcpServers/filesystem/tools/write.ts b/src/main/mcpServers/filesystem/tools/write.ts
new file mode 100644
index 0000000000..2898f2f874
--- /dev/null
+++ b/src/main/mcpServers/filesystem/tools/write.ts
@@ -0,0 +1,83 @@
+import fs from 'fs/promises'
+import path from 'path'
+import * as z from 'zod'
+
+import { logger, validatePath } from '../types'
+
+// Schema definition
+export const WriteToolSchema = z.object({
+  file_path: z.string().describe('The path to the file to write'),
+  content: z.string().describe('The content to write to the file')
+})
+
+// Tool definition with detailed description
+export const writeToolDefinition = {
+  name: 'write',
+  description: `Writes a file to the local filesystem.
+
+- This tool will overwrite the existing file if one exists at the path
+- You MUST use the read tool first to understand what you're overwriting
+- ALWAYS prefer using the 'edit' tool for existing files
+- NEVER proactively create documentation files unless explicitly requested
+- Parent directories will be created automatically if they don't exist
+- The file_path must be an absolute path, not a relative path`,
+  inputSchema: z.toJSONSchema(WriteToolSchema)
+}
+
+// Handler implementation
+export async function handleWriteTool(args: unknown, baseDir: string) {
+  const parsed = WriteToolSchema.safeParse(args)
+  if (!parsed.success) {
+    throw new Error(`Invalid arguments for write: ${parsed.error}`)
+  }
+
+  const filePath = parsed.data.file_path
+  const validPath = await validatePath(filePath, baseDir)
+
+  // Create parent directory if it doesn't exist
+  const parentDir = path.dirname(validPath)
+  try {
+    await fs.mkdir(parentDir, { recursive: true })
+  } catch (error: any) {
+    if (error.code !== 'EEXIST') {
+      throw new Error(`Failed to create parent directory: ${error.message}`)
+    }
+  }
+
+  // Check if file exists (for logging)
+  let isOverwrite = false
+  try {
+    await fs.stat(validPath)
+    isOverwrite = true
+  } catch {
+    // File doesn't exist, that's fine
+  }
+
+  // Write the file
+  try {
+    await fs.writeFile(validPath, parsed.data.content, 'utf-8')
+  } catch (error: any) {
+    throw new Error(`Failed to write file: ${error.message}`)
+  }
+
+  // Log the operation
+  logger.info('File written', {
+    path: validPath,
+    overwrite: isOverwrite,
+    size: parsed.data.content.length
+  })
+
+  // Format output
+  const relativePath = path.relative(baseDir, validPath)
+  const action = isOverwrite ? 'Updated' : 'Created'
+  const lines = parsed.data.content.split('\n').length
+
+  return {
+    content: [
+      {
+        type: 'text',
+        text: `${action} file: ${relativePath}\n` + `Size: ${parsed.data.content.length} bytes\n` + `Lines: ${lines}`
+      }
+    ]
+  }
+}
diff --git a/src/main/mcpServers/filesystem/types.ts b/src/main/mcpServers/filesystem/types.ts
new file mode 100644
index 0000000000..922fe0b23a
--- /dev/null
+++ b/src/main/mcpServers/filesystem/types.ts
@@ -0,0 +1,627 @@
+import { loggerService } from '@logger'
+import { isMac, isWin } from '@main/constant'
+import { spawn } from 'child_process'
+import fs from 'fs/promises'
+import os from 'os'
+import path from 'path'
+
+export const logger = loggerService.withContext('MCP:FileSystemServer')
+
+// Constants
+export const MAX_LINE_LENGTH = 2000
+export const DEFAULT_READ_LIMIT = 2000
+export const MAX_FILES_LIMIT = 100
+export const MAX_GREP_MATCHES = 100
+
+// Common types
+export interface FileInfo {
+  path: string
+  type: 'file' | 'directory'
+  size?: number
+  modified?: Date
+}
+
+export interface GrepMatch {
+  file: string
+  line: number
+  content: string
+}
+
+// Utility functions for path handling
+export function normalizePath(p: string): string {
+  return path.normalize(p)
+}
+
+export function expandHome(filepath: string): string {
+  if (filepath.startsWith('~/') || filepath === '~') {
+    return path.join(os.homedir(), filepath.slice(1))
+  }
+  return filepath
+}
+
+// Security validation
+export async function validatePath(requestedPath: string, baseDir?: string): Promise<string> {
+  const expandedPath = expandHome(requestedPath)
+  const root = baseDir ?? process.cwd()
+  const absolute = path.isAbsolute(expandedPath) ? path.resolve(expandedPath) : path.resolve(root, expandedPath)
+
+  // Handle symlinks by checking their real path
+  try {
+    const realPath = await fs.realpath(absolute)
+    return normalizePath(realPath)
+  } catch (error) {
+    // For new files that don't exist yet, verify parent directory
+    const parentDir = path.dirname(absolute)
+    try {
+      const realParentPath = await fs.realpath(parentDir)
+      normalizePath(realParentPath)
+      return normalizePath(absolute)
+    } catch {
+      return normalizePath(absolute)
+    }
+  }
+}
+
+// ============================================================================
+// Edit Tool Utilities - Fuzzy matching replacers from opencode
+// ============================================================================
+
+export type Replacer = (content: string, find: string) => Generator<string, void, unknown>
+
+// Similarity thresholds for block anchor fallback matching
+const SINGLE_CANDIDATE_SIMILARITY_THRESHOLD = 0.0
+const MULTIPLE_CANDIDATES_SIMILARITY_THRESHOLD = 0.3
+
+/**
+ * Levenshtein distance algorithm implementation
+ */
+function levenshtein(a: string, b: string): number {
+  if (a === '' || b === '') {
+    return Math.max(a.length, b.length)
+  }
+  const matrix = Array.from({ length: a.length + 1 }, (_, i) =>
+    Array.from({ length: b.length + 1 }, (_, j) => (i === 0 ? j : j === 0 ? i : 0))
+  )
+
+  for (let i = 1; i <= a.length; i++) {
+    for (let j = 1; j <= b.length; j++) {
+      const cost = a[i - 1] === b[j - 1] ? 0 : 1
+      matrix[i][j] = Math.min(matrix[i - 1][j] + 1, matrix[i][j - 1] + 1, matrix[i - 1][j - 1] + cost)
+    }
+  }
+  return matrix[a.length][b.length]
+}
+
+export const SimpleReplacer: Replacer = function* (_content, find) {
+  yield find
+}
+
+export const LineTrimmedReplacer: Replacer = function* (content, find) {
+  const originalLines = content.split('\n')
+  const searchLines = find.split('\n')
+
+  if (searchLines[searchLines.length - 1] === '') {
+    searchLines.pop()
+  }
+
+  for (let i = 0; i <= originalLines.length - searchLines.length; i++) {
+    let matches = true
+
+    for (let j = 0; j < searchLines.length; j++) {
+      const originalTrimmed = originalLines[i + j].trim()
+      const searchTrimmed = searchLines[j].trim()
+
+      if (originalTrimmed !== searchTrimmed) {
+        matches = false
+        break
+      }
+    }
+
+    if (matches) {
+      let matchStartIndex = 0
+      for (let k = 0; k < i; k++) {
+        matchStartIndex += originalLines[k].length + 1
+      }
+
+      let matchEndIndex = matchStartIndex
+      for (let k = 0; k < searchLines.length; k++) {
+        matchEndIndex += originalLines[i + k].length
+        if (k < searchLines.length - 1) {
+          matchEndIndex += 1
+        }
+      }
+
+      yield content.substring(matchStartIndex, matchEndIndex)
+    }
+  }
+}
+
+export const BlockAnchorReplacer: Replacer = function* (content, find) {
+  const originalLines = content.split('\n')
+  const searchLines = find.split('\n')
+
+  if (searchLines.length < 3) {
+    return
+  }
+
+  if (searchLines[searchLines.length - 1] === '') {
+    searchLines.pop()
+  }
+
+  const firstLineSearch = searchLines[0].trim()
+  const lastLineSearch = searchLines[searchLines.length - 1].trim()
+  const searchBlockSize = searchLines.length
+
+  const candidates: Array<{ startLine: number; endLine: number }> = []
+  for (let i = 0; i < originalLines.length; i++) {
+    if (originalLines[i].trim() !== firstLineSearch) {
+      continue
+    }
+
+    for (let j = i + 2; j < originalLines.length; j++) {
+      if (originalLines[j].trim() === lastLineSearch) {
+        candidates.push({ startLine: i, endLine: j })
+        break
+      }
+    }
+  }
+
+  if (candidates.length === 0) {
+    return
+  }
+
+  if (candidates.length === 1) {
+    const { startLine, endLine } = candidates[0]
+    const actualBlockSize = endLine - startLine + 1
+
+    let similarity = 0
+    const linesToCheck = Math.min(searchBlockSize - 2, actualBlockSize - 2)
+
+    if (linesToCheck > 0) {
+      for (let j = 1; j < searchBlockSize - 1 && j < actualBlockSize - 1; j++) {
+        const originalLine = originalLines[startLine + j].trim()
+        const searchLine = searchLines[j].trim()
+        const maxLen = Math.max(originalLine.length, searchLine.length)
+        if (maxLen === 0) {
+          continue
+        }
+        const distance = levenshtein(originalLine, searchLine)
+        similarity += (1 - distance / maxLen) / linesToCheck
+
+        if (similarity >= SINGLE_CANDIDATE_SIMILARITY_THRESHOLD) {
+          break
+        }
+      }
+    } else {
+      similarity = 1.0
+    }
+
+    if (similarity >= SINGLE_CANDIDATE_SIMILARITY_THRESHOLD) {
+      let matchStartIndex = 0
+      for (let k = 0; k < startLine; k++) {
+        matchStartIndex += originalLines[k].length + 1
+      }
+      let matchEndIndex = matchStartIndex
+      for (let k = startLine; k <= endLine; k++) {
+        matchEndIndex += originalLines[k].length
+        if (k < endLine) {
+          matchEndIndex += 1
+        }
+      }
+      yield content.substring(matchStartIndex, matchEndIndex)
+    }
+    return
+  }
+
+  let bestMatch: { startLine: number; endLine: number } | null = null
+  let maxSimilarity = -1
+
+  for (const candidate of candidates) {
+    const { startLine, endLine } = candidate
+    const actualBlockSize = endLine - startLine + 1
+
+    let similarity = 0
+    const linesToCheck = Math.min(searchBlockSize - 2, actualBlockSize - 2)
+
+    if (linesToCheck > 0) {
+      for (let j = 1; j < searchBlockSize - 1 && j < actualBlockSize - 1; j++) {
+        const originalLine = originalLines[startLine + j].trim()
+        const searchLine = searchLines[j].trim()
+        const maxLen = Math.max(originalLine.length, searchLine.length)
+        if (maxLen === 0) {
+          continue
+        }
+        const distance = levenshtein(originalLine, searchLine)
+        similarity += 1 - distance / maxLen
+      }
+      similarity /= linesToCheck
+    } else {
+      similarity = 1.0
+    }
+
+    if (similarity > maxSimilarity) {
+      maxSimilarity = similarity
+      bestMatch = candidate
+    }
+  }
+
+  if (maxSimilarity >= MULTIPLE_CANDIDATES_SIMILARITY_THRESHOLD && bestMatch) {
+    const { startLine, endLine } = bestMatch
+    let matchStartIndex = 0
+    for (let k = 0; k < startLine; k++) {
+      matchStartIndex += originalLines[k].length + 1
+    }
+    let matchEndIndex = matchStartIndex
+    for (let k = startLine; k <= endLine; k++) {
+      matchEndIndex += originalLines[k].length
+      if (k < endLine) {
+        matchEndIndex += 1
+      }
+    }
+    yield content.substring(matchStartIndex, matchEndIndex)
+  }
+}
+
+export const WhitespaceNormalizedReplacer: Replacer = function* (content, find) {
+  const normalizeWhitespace = (text: string) => text.replace(/\s+/g, ' ').trim()
+  const normalizedFind = normalizeWhitespace(find)
+
+  const lines = content.split('\n')
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i]
+    if (normalizeWhitespace(line) === normalizedFind) {
+      yield line
+    } else {
+      const normalizedLine = normalizeWhitespace(line)
+      if (normalizedLine.includes(normalizedFind)) {
+        const words = find.trim().split(/\s+/)
+        if (words.length > 0) {
+          const pattern = words.map((word) => word.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')).join('\\s+')
+          try {
+            const regex = new RegExp(pattern)
+            const match = line.match(regex)
+            if (match) {
+              yield match[0]
+            }
+          } catch {
+            // Invalid regex pattern, skip
+          }
+        }
+      }
+    }
+  }
+
+  const findLines = find.split('\n')
+  if (findLines.length > 1) {
+    for (let i = 0; i <= lines.length - findLines.length; i++) {
+      const block = lines.slice(i, i + findLines.length)
+      if (normalizeWhitespace(block.join('\n')) === normalizedFind) {
+        yield block.join('\n')
+      }
+    }
+  }
+}
+
+export const IndentationFlexibleReplacer: Replacer = function* (content, find) {
+  const removeIndentation = (text: string) => {
+    const lines = text.split('\n')
+    const nonEmptyLines = lines.filter((line) => line.trim().length > 0)
+    if (nonEmptyLines.length === 0) return text
+
+    const minIndent = Math.min(
+      ...nonEmptyLines.map((line) => {
+        const match = line.match(/^(\s*)/)
+        return match ? match[1].length : 0
+      })
+    )
+
+    return lines.map((line) => (line.trim().length === 0 ? line : line.slice(minIndent))).join('\n')
+  }
+
+  const normalizedFind = removeIndentation(find)
+  const contentLines = content.split('\n')
+  const findLines = find.split('\n')
+
+  for (let i = 0; i <= contentLines.length - findLines.length; i++) {
+    const block = contentLines.slice(i, i + findLines.length).join('\n')
+    if (removeIndentation(block) === normalizedFind) {
+      yield block
+    }
+  }
+}
+
+export const EscapeNormalizedReplacer: Replacer = function* (content, find) {
+  const unescapeString = (str: string): string => {
+    return str.replace(/\\(n|t|r|'|"|`|\\|\n|\$)/g, (match, capturedChar) => {
+      switch (capturedChar) {
+        case 'n':
+          return '\n'
+        case 't':
+          return '\t'
+        case 'r':
+          return '\r'
+        case "'":
+          return "'"
+        case '"':
+          return '"'
+        case '`':
+          return '`'
+        case '\\':
+          return '\\'
+        case '\n':
+          return '\n'
+        case '$':
+          return '$'
+        default:
+          return match
+      }
+    })
+  }
+
+  const unescapedFind = unescapeString(find)
+
+  if (content.includes(unescapedFind)) {
+    yield unescapedFind
+  }
+
+  const lines = content.split('\n')
+  const findLines = unescapedFind.split('\n')
+
+  for (let i = 0; i <= lines.length - findLines.length; i++) {
+    const block = lines.slice(i, i + findLines.length).join('\n')
+    const unescapedBlock = unescapeString(block)
+
+    if (unescapedBlock === unescapedFind) {
+      yield block
+    }
+  }
+}
+
+export const TrimmedBoundaryReplacer: Replacer = function* (content, find) {
+  const trimmedFind = find.trim()
+
+  if (trimmedFind === find) {
+    return
+  }
+
+  if (content.includes(trimmedFind)) {
+    yield trimmedFind
+  }
+
+  const lines = content.split('\n')
+  const findLines = find.split('\n')
+
+  for (let i = 0; i <= lines.length - findLines.length; i++) {
+    const block = lines.slice(i, i + findLines.length).join('\n')
+
+    if (block.trim() === trimmedFind) {
+      yield block
+    }
+  }
+}
+
+export const ContextAwareReplacer: Replacer = function* (content, find) {
+  const findLines = find.split('\n')
+  if (findLines.length < 3) {
+    return
+  }
+
+  if (findLines[findLines.length - 1] === '') {
+    findLines.pop()
+  }
+
+  const contentLines = content.split('\n')
+
+  const firstLine = findLines[0].trim()
+  const lastLine = findLines[findLines.length - 1].trim()
+
+  for (let i = 0; i < contentLines.length; i++) {
+    if (contentLines[i].trim() !== firstLine) continue
+
+    for (let j = i + 2; j < contentLines.length; j++) {
+      if (contentLines[j].trim() === lastLine) {
+        const blockLines = contentLines.slice(i, j + 1)
+        const block = blockLines.join('\n')
+
+        if (blockLines.length === findLines.length) {
+          let matchingLines = 0
+          let totalNonEmptyLines = 0
+
+          for (let k = 1; k < blockLines.length - 1; k++) {
+            const blockLine = blockLines[k].trim()
+            const findLine = findLines[k].trim()
+
+            if (blockLine.length > 0 || findLine.length > 0) {
+              totalNonEmptyLines++
+              if (blockLine === findLine) {
+                matchingLines++
+              }
+            }
+          }
+
+          if (totalNonEmptyLines === 0 || matchingLines / totalNonEmptyLines >= 0.5) {
+            yield block
+            break
+          }
+        }
+        break
+      }
+    }
+  }
+}
+
+export const MultiOccurrenceReplacer: Replacer = function* (content, find) {
+  let startIndex = 0
+
+  while (true) {
+    const index = content.indexOf(find, startIndex)
+    if (index === -1) break
+
+    yield find
+    startIndex = index + find.length
+  }
+}
+
+/**
+ * All replacers in order of specificity
+ */
+export const ALL_REPLACERS: Replacer[] = [
+  SimpleReplacer,
+  LineTrimmedReplacer,
+  BlockAnchorReplacer,
+  WhitespaceNormalizedReplacer,
+  IndentationFlexibleReplacer,
+  EscapeNormalizedReplacer,
+  TrimmedBoundaryReplacer,
+  ContextAwareReplacer,
+  MultiOccurrenceReplacer
+]
+
+/**
+ * Replace oldString with newString in content using fuzzy matching
+ */
+export function replaceWithFuzzyMatch(
+  content: string,
+  oldString: string,
+  newString: string,
+  replaceAll = false
+): string {
+  if (oldString === newString) {
+    throw new Error('old_string and new_string must be different')
+  }
+
+  let notFound = true
+
+  for (const replacer of ALL_REPLACERS) {
+    for (const search of replacer(content, oldString)) {
+      const index = content.indexOf(search)
+      if (index === -1) continue
+      notFound = false
+      if (replaceAll) {
+        return content.replaceAll(search, newString)
+      }
+      const lastIndex = content.lastIndexOf(search)
+      if (index !== lastIndex) continue
+      return content.substring(0, index) + newString + content.substring(index + search.length)
+    }
+  }
+
+  if (notFound) {
+    throw new Error('old_string not found in content')
+  }
+  throw new Error(
+    'Found multiple matches for old_string. Provide more surrounding lines in old_string to identify the correct match.'
+  )
+}
+
+// ============================================================================
+// Binary File Detection
+// ============================================================================
+
+// Check if a file is likely binary
+export async function isBinaryFile(filePath: string): Promise<boolean> {
+  try {
+    const buffer = Buffer.alloc(4096)
+    const fd = await fs.open(filePath, 'r')
+    const { bytesRead } = await fd.read(buffer, 0, buffer.length, 0)
+    await fd.close()
+
+    if (bytesRead === 0) return false
+
+    const view = buffer.subarray(0, bytesRead)
+
+    let zeroBytes = 0
+    let evenZeros = 0
+    let oddZeros = 0
+    let nonPrintable = 0
+
+    for (let i = 0; i < view.length; i++) {
+      const b = view[i]
+
+      if (b === 0) {
+        zeroBytes++
+        if (i % 2 === 0) evenZeros++
+        else oddZeros++
+        continue
+      }
+
+      // treat common whitespace as printable
+      if (b === 9 || b === 10 || b === 13) continue
+
+      // basic ASCII printable range
+      if (b >= 32 && b <= 126) continue
+
+      // bytes >= 128 are likely part of UTF-8 sequences; count as printable
+      if (b >= 128) continue
+
+      nonPrintable++
+    }
+
+    // If there are lots of null bytes, it's probably binary unless it looks like UTF-16 text.
+    if (zeroBytes > 0) {
+      const evenSlots = Math.ceil(view.length / 2)
+      const oddSlots = Math.floor(view.length / 2)
+      const evenZeroRatio = evenSlots > 0 ? evenZeros / evenSlots : 0
+      const oddZeroRatio = oddSlots > 0 ? oddZeros / oddSlots : 0
+
+      // UTF-16LE/BE tends to have zeros on every other byte.
+      if (evenZeroRatio > 0.7 || oddZeroRatio > 0.7) return false
+
+      if (zeroBytes / view.length > 0.05) return true
+    }
+
+    // Heuristic: too many non-printable bytes => binary.
+    return nonPrintable / view.length > 0.3
+  } catch {
+    return false
+  }
+}
+
+// ============================================================================
+// Ripgrep Utilities
+// ============================================================================
+
+export interface RipgrepResult {
+  ok: boolean
+  stdout: string
+  exitCode: number | null
+}
+
+export function getRipgrepAddonPath(): string {
+  const pkgJsonPath = require.resolve('@anthropic-ai/claude-agent-sdk/package.json')
+  const pkgRoot = path.dirname(pkgJsonPath)
+  const platform = isMac ? 'darwin' : isWin ? 'win32' : 'linux'
+  const arch = process.arch === 'arm64' ? 'arm64' : 'x64'
+  return path.join(pkgRoot, 'vendor', 'ripgrep', `${arch}-${platform}`, 'ripgrep.node')
+}
+
+export async function runRipgrep(args: string[]): Promise<RipgrepResult> {
+  const addonPath = getRipgrepAddonPath()
+  const childScript = `const { ripgrepMain } = require(process.env.RIPGREP_ADDON_PATH); process.exit(ripgrepMain(process.argv.slice(1)));`
+
+  return new Promise((resolve) => {
+    const child = spawn(process.execPath, ['--eval', childScript, 'rg', ...args], {
+      cwd: process.cwd(),
+      env: {
+        ...process.env,
+        ELECTRON_RUN_AS_NODE: '1',
+        RIPGREP_ADDON_PATH: addonPath
+      },
+      stdio: ['ignore', 'pipe', 'pipe']
+    })
+
+    let stdout = ''
+
+    child.stdout?.on('data', (chunk) => {
+      stdout += chunk.toString('utf-8')
+    })
+
+    child.on('error', () => {
+      resolve({ ok: false, stdout: '', exitCode: null })
+    })
+
+    child.on('close', (code) => {
+      resolve({ ok: true, stdout, exitCode: code })
+    })
+  })
+}
diff --git a/src/main/services/BackupManager.ts b/src/main/services/BackupManager.ts
index f331254fdf..e08bbd4d7b 100644
--- a/src/main/services/BackupManager.ts
+++ b/src/main/services/BackupManager.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { loggerService } from '@logger'
 import { IpcChannel } from '@shared/IpcChannel'
 import type { WebDavConfig } from '@types'
@@ -767,6 +783,56 @@ class BackupManager {
     const s3Client = this.getS3Storage(s3Config)
     return await s3Client.checkConnection()
   }
+
+  /**
+   * Create a temporary backup for LAN transfer
+   * Creates a lightweight backup (skipBackupFile=true) in the temp directory
+   * Returns the path to the created ZIP file
+   */
+  async createLanTransferBackup(_: Electron.IpcMainInvokeEvent, data: string): Promise<string> {
+    const timestamp = new Date()
+      .toISOString()
+      .replace(/[-:T.Z]/g, '')
+      .slice(0, 12)
+    const fileName = `cherry-studio.${timestamp}.zip`
+    const tempPath = path.join(app.getPath('temp'), 'cherry-studio', 'lan-transfer')
+
+    // Ensure temp directory exists
+    await fs.ensureDir(tempPath)
+
+    // Create backup with skipBackupFile=true (no Data folder)
+    const backupedFilePath = await this.backup(_, fileName, data, tempPath, true)
+
+    logger.info(`[BackupManager] Created LAN transfer backup at: ${backupedFilePath}`)
+    return backupedFilePath
+  }
+
+  /**
+   * Delete a temporary backup file after LAN transfer completes
+   */
+  async deleteTempBackup(_: Electron.IpcMainInvokeEvent, filePath: string): Promise<boolean> {
+    try {
+      // Security check: only allow deletion within temp directory
+      const tempBase = path.normalize(path.join(app.getPath('temp'), 'cherry-studio', 'lan-transfer'))
+      const resolvedPath = path.normalize(path.resolve(filePath))
+
+      // Use normalized paths with trailing separator to prevent prefix attacks (e.g., /temp-evil)
+      if (!resolvedPath.startsWith(tempBase + path.sep) && resolvedPath !== tempBase) {
+        logger.warn(`[BackupManager] Attempted to delete file outside temp directory: ${filePath}`)
+        return false
+      }
+
+      if (await fs.pathExists(resolvedPath)) {
+        await fs.remove(resolvedPath)
+        logger.info(`[BackupManager] Deleted temp backup: ${resolvedPath}`)
+        return true
+      }
+      return false
+    } catch (error) {
+      logger.error('[BackupManager] Failed to delete temp backup:', error as Error)
+      return false
+    }
+  }
 }
 
 export default BackupManager
diff --git a/src/main/services/CacheService.ts b/src/main/services/CacheService.ts
index d2984a9984..4f2e2f8b20 100644
--- a/src/main/services/CacheService.ts
+++ b/src/main/services/CacheService.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 interface CacheItem<T> {
   data: T
   timestamp: number
diff --git a/src/main/services/ConfigManager.ts b/src/main/services/ConfigManager.ts
index 61e285ac1b..98537c85a1 100644
--- a/src/main/services/ConfigManager.ts
+++ b/src/main/services/ConfigManager.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { UpgradeChannel } from '@shared/config/constant'
 import { defaultLanguage, ZOOM_SHORTCUTS } from '@shared/config/constant'
 import type { LanguageVarious, Shortcut } from '@types'
@@ -31,7 +47,9 @@ export enum ConfigKeys {
   DisableHardwareAcceleration = 'disableHardwareAcceleration',
   Proxy = 'proxy',
   EnableDeveloperMode = 'enableDeveloperMode',
-  ClientId = 'clientId'
+  ClientId = 'clientId',
+  GitBashPath = 'gitBashPath',
+  GitBashPathSource = 'gitBashPathSource' // 'manual' | 'auto' | null
 }
 
 export class ConfigManager {
diff --git a/src/main/services/FileStorage.ts b/src/main/services/FileStorage.ts
index 95bf7da7e7..c6f67adaae 100644
--- a/src/main/services/FileStorage.ts
+++ b/src/main/services/FileStorage.ts
@@ -3,7 +3,7 @@ import {
   checkName,
   findCommonRoot,
   getFilesDir,
-  getFileType,
+  getFileType as getFileTypeByExt,
   getName,
   getNotesDir,
   getTempDir,
@@ -12,13 +12,13 @@ import {
 } from '@main/utils/file'
 import { documentExts, imageExts, KB, MB } from '@shared/config/constant'
 import type { FileMetadata, NotesTreeNode } from '@types'
+import { FileTypes } from '@types'
 import chardet from 'chardet'
 import type { FSWatcher } from 'chokidar'
 import chokidar from 'chokidar'
 import * as crypto from 'crypto'
 import type { OpenDialogOptions, OpenDialogReturnValue, SaveDialogOptions, SaveDialogReturnValue } from 'electron'
-import { app } from 'electron'
-import { dialog, net, shell } from 'electron'
+import { app, dialog, net, shell } from 'electron'
 import * as fs from 'fs'
 import { writeFileSync } from 'fs'
 import { readFile } from 'fs/promises'
@@ -132,16 +132,18 @@ interface DirectoryListOptions {
   includeDirectories?: boolean
   maxEntries?: number
   searchPattern?: string
+  fuzzy?: boolean
 }
 
 const DEFAULT_DIRECTORY_LIST_OPTIONS: Required<DirectoryListOptions> = {
   recursive: true,
-  maxDepth: 3,
+  maxDepth: 10,
   includeHidden: false,
   includeFiles: true,
   includeDirectories: true,
-  maxEntries: 10,
-  searchPattern: '.'
+  maxEntries: 20,
+  searchPattern: '.',
+  fuzzy: true
 }
 
 class FileStorage {
@@ -165,7 +167,7 @@ class FileStorage {
         fs.mkdirSync(this.storageDir, { recursive: true })
       }
       if (!fs.existsSync(this.notesDir)) {
-        fs.mkdirSync(this.storageDir, { recursive: true })
+        fs.mkdirSync(this.notesDir, { recursive: true })
       }
       if (!fs.existsSync(this.tempDir)) {
         fs.mkdirSync(this.tempDir, { recursive: true })
@@ -187,7 +189,7 @@ class FileStorage {
     })
   }
 
-  findDuplicateFile = async (filePath: string): Promise<FileMetadata | null> => {
+  private findDuplicateFile = async (filePath: string): Promise<FileMetadata | null> => {
     const stats = fs.statSync(filePath)
     logger.debug(`stats: ${stats}, filePath: ${filePath}`)
     const fileSize = stats.size
@@ -206,6 +208,8 @@ class FileStorage {
         if (originalHash === storedHash) {
           const ext = path.extname(file)
           const id = path.basename(file, ext)
+          const type = await this.getFileType(filePath)
+
           return {
             id,
             origin_name: file,
@@ -214,7 +218,7 @@ class FileStorage {
             created_at: storedStats.birthtime.toISOString(),
             size: storedStats.size,
             ext,
-            type: getFileType(ext),
+            type,
             count: 2
           }
         }
@@ -224,6 +228,13 @@ class FileStorage {
     return null
   }
 
+  public getFileType = async (filePath: string): Promise<FileTypes> => {
+    const ext = path.extname(filePath)
+    const fileType = getFileTypeByExt(ext)
+
+    return fileType === FileTypes.OTHER && (await this._isTextFile(filePath)) ? FileTypes.TEXT : fileType
+  }
+
   public selectFile = async (
     _: Electron.IpcMainInvokeEvent,
     options?: OpenDialogOptions
@@ -243,7 +254,7 @@ class FileStorage {
     const fileMetadataPromises = result.filePaths.map(async (filePath) => {
       const stats = fs.statSync(filePath)
       const ext = path.extname(filePath)
-      const fileType = getFileType(ext)
+      const fileType = await this.getFileType(filePath)
 
       return {
         id: uuidv4(),
@@ -309,7 +320,7 @@ class FileStorage {
     }
 
     const stats = await fs.promises.stat(destPath)
-    const fileType = getFileType(ext)
+    const fileType = await this.getFileType(destPath)
 
     const fileMetadata: FileMetadata = {
       id: uuid,
@@ -334,8 +345,7 @@ class FileStorage {
     }
 
     const stats = fs.statSync(filePath)
-    const ext = path.extname(filePath)
-    const fileType = getFileType(ext)
+    const fileType = await this.getFileType(filePath)
 
     return {
       id: uuidv4(),
@@ -344,7 +354,7 @@ class FileStorage {
       path: filePath,
       created_at: stats.birthtime.toISOString(),
       size: stats.size,
-      ext: ext,
+      ext: path.extname(filePath),
       type: fileType,
       count: 1
     }
@@ -692,7 +702,7 @@ class FileStorage {
         created_at: new Date().toISOString(),
         size: buffer.length,
         ext: ext.slice(1),
-        type: getFileType(ext),
+        type: getFileTypeByExt(ext),
         count: 1
       }
     } catch (error) {
@@ -742,7 +752,7 @@ class FileStorage {
         created_at: new Date().toISOString(),
         size: stats.size,
         ext: ext.slice(1),
-        type: getFileType(ext),
+        type: getFileTypeByExt(ext),
         count: 1
       }
     } catch (error) {
@@ -1040,10 +1050,226 @@ class FileStorage {
   }
 
   /**
-   * Search files by content pattern
+   * Fuzzy match: checks if all characters in query appear in text in order (case-insensitive)
+   * Example: "updater" matches "packages/update/src/node/updateController.ts"
    */
-  private async searchByContent(resolvedPath: string, options: Required<DirectoryListOptions>): Promise<string[]> {
-    const args: string[] = ['-l']
+  private isFuzzyMatch(text: string, query: string): boolean {
+    let i = 0 // text index
+    let j = 0 // query index
+    const textLower = text.toLowerCase()
+    const queryLower = query.toLowerCase()
+
+    while (i < textLower.length && j < queryLower.length) {
+      if (textLower[i] === queryLower[j]) {
+        j++
+      }
+      i++
+    }
+    return j === queryLower.length
+  }
+
+  /**
+   * Scoring constants for fuzzy match relevance ranking
+   * Higher values = higher priority in search results
+   */
+  private static readonly SCORE_SEGMENT_MATCH = 60 // Per path segment that matches query
+  private static readonly SCORE_FILENAME_CONTAINS = 80 // Filename contains exact query substring
+  private static readonly SCORE_FILENAME_STARTS = 100 // Filename starts with query (highest priority)
+  private static readonly SCORE_CONSECUTIVE_CHAR = 15 // Per consecutive character match
+  private static readonly SCORE_WORD_BOUNDARY = 20 // Query matches start of a word
+  private static readonly PATH_LENGTH_PENALTY_FACTOR = 4 // Logarithmic penalty multiplier for longer paths
+
+  /**
+   * Calculate fuzzy match score (higher is better)
+   * Scoring factors:
+   * - Consecutive character matches (bonus)
+   * - Match at word boundaries (bonus)
+   * - Shorter path length (bonus)
+   * - Match in filename vs directory (bonus)
+   */
+  private getFuzzyMatchScore(filePath: string, query: string): number {
+    const pathLower = filePath.toLowerCase()
+    const queryLower = query.toLowerCase()
+    const fileName = filePath.split('/').pop() || ''
+    const fileNameLower = fileName.toLowerCase()
+
+    let score = 0
+
+    // Count how many times query-related words appear in path segments
+    const pathSegments = pathLower.split(/[/\\]/)
+    let segmentMatchCount = 0
+    for (const segment of pathSegments) {
+      if (this.isFuzzyMatch(segment, queryLower)) {
+        segmentMatchCount++
+      }
+    }
+    score += segmentMatchCount * FileStorage.SCORE_SEGMENT_MATCH
+
+    // Bonus for filename starting with query (stronger than generic "contains")
+    if (fileNameLower.startsWith(queryLower)) {
+      score += FileStorage.SCORE_FILENAME_STARTS
+    } else if (fileNameLower.includes(queryLower)) {
+      // Bonus for exact substring match in filename (e.g., "updater" in "RCUpdater.js")
+      score += FileStorage.SCORE_FILENAME_CONTAINS
+    }
+
+    // Calculate consecutive match bonus
+    let i = 0
+    let j = 0
+    let consecutiveCount = 0
+    let maxConsecutive = 0
+
+    while (i < pathLower.length && j < queryLower.length) {
+      if (pathLower[i] === queryLower[j]) {
+        consecutiveCount++
+        maxConsecutive = Math.max(maxConsecutive, consecutiveCount)
+        j++
+      } else {
+        consecutiveCount = 0
+      }
+      i++
+    }
+    score += maxConsecutive * FileStorage.SCORE_CONSECUTIVE_CHAR
+
+    // Bonus for word boundary matches (e.g., "upd" matches start of "update")
+    // Only count once to avoid inflating scores for paths with repeated patterns
+    const boundaryPrefix = queryLower.slice(0, Math.min(3, queryLower.length))
+    const words = pathLower.split(/[/\\._-]/)
+    for (const word of words) {
+      if (word.startsWith(boundaryPrefix)) {
+        score += FileStorage.SCORE_WORD_BOUNDARY
+        break
+      }
+    }
+
+    // Penalty for longer paths (prefer shorter, more specific matches)
+    // Use logarithmic scaling to prevent long paths from dominating the score
+    // A 50-char path gets ~-16 penalty, 100-char gets ~-18, 200-char gets ~-21
+    score -= Math.log(filePath.length + 1) * FileStorage.PATH_LENGTH_PENALTY_FACTOR
+
+    return score
+  }
+
+  /**
+   * Convert query to glob pattern for ripgrep pre-filtering
+   * e.g., "updater" -> "*u*p*d*a*t*e*r*"
+   */
+  private queryToGlobPattern(query: string): string {
+    // Escape special glob characters (including ! for negation)
+    const escaped = query.replace(/[[\]{}()*+?.,\\^$|#!]/g, '\\$&')
+    // Convert to fuzzy glob: each char separated by *
+    return '*' + escaped.split('').join('*') + '*'
+  }
+
+  /**
+   * Greedy substring match: check if all characters in query can be matched
+   * by finding consecutive substrings in text (not necessarily single chars)
+   * e.g., "updatercontroller" matches "updateController" by:
+   *   "update" + "r" (from Controller) + "controller"
+   */
+  private isGreedySubstringMatch(text: string, query: string): boolean {
+    const textLower = text.toLowerCase()
+    const queryLower = query.toLowerCase()
+
+    let queryIndex = 0
+    let searchStart = 0
+
+    while (queryIndex < queryLower.length) {
+      // Try to find the longest matching substring starting at queryIndex
+      let bestMatchLen = 0
+      let bestMatchPos = -1
+
+      for (let len = queryLower.length - queryIndex; len >= 1; len--) {
+        const substr = queryLower.slice(queryIndex, queryIndex + len)
+        const foundAt = textLower.indexOf(substr, searchStart)
+        if (foundAt !== -1) {
+          bestMatchLen = len
+          bestMatchPos = foundAt
+          break // Found longest possible match
+        }
+      }
+
+      if (bestMatchLen === 0) {
+        // No substring match found, query cannot be matched
+        return false
+      }
+
+      queryIndex += bestMatchLen
+      searchStart = bestMatchPos + bestMatchLen
+    }
+
+    return true
+  }
+
+  /**
+   * Calculate greedy substring match score (higher is better)
+   * Rewards: fewer match fragments, shorter match span, matches in filename
+   */
+  private getGreedyMatchScore(filePath: string, query: string): number {
+    const textLower = filePath.toLowerCase()
+    const queryLower = query.toLowerCase()
+    const fileName = filePath.split('/').pop() || ''
+    const fileNameLower = fileName.toLowerCase()
+
+    let queryIndex = 0
+    let searchStart = 0
+    let fragmentCount = 0
+    let firstMatchPos = -1
+    let lastMatchEnd = 0
+
+    while (queryIndex < queryLower.length) {
+      let bestMatchLen = 0
+      let bestMatchPos = -1
+
+      for (let len = queryLower.length - queryIndex; len >= 1; len--) {
+        const substr = queryLower.slice(queryIndex, queryIndex + len)
+        const foundAt = textLower.indexOf(substr, searchStart)
+        if (foundAt !== -1) {
+          bestMatchLen = len
+          bestMatchPos = foundAt
+          break
+        }
+      }
+
+      if (bestMatchLen === 0) {
+        return -Infinity // No match
+      }
+
+      fragmentCount++
+      if (firstMatchPos === -1) firstMatchPos = bestMatchPos
+      lastMatchEnd = bestMatchPos + bestMatchLen
+      queryIndex += bestMatchLen
+      searchStart = lastMatchEnd
+    }
+
+    const matchSpan = lastMatchEnd - firstMatchPos
+    let score = 0
+
+    // Fewer fragments = better (single continuous match is best)
+    // Max bonus when fragmentCount=1, decreases as fragments increase
+    score += Math.max(0, 100 - (fragmentCount - 1) * 30)
+
+    // Shorter span relative to query length = better (tighter match)
+    // Perfect match: span equals query length
+    const spanRatio = queryLower.length / matchSpan
+    score += spanRatio * 50
+
+    // Bonus for match in filename
+    if (this.isGreedySubstringMatch(fileNameLower, queryLower)) {
+      score += 80
+    }
+
+    // Penalty for longer paths
+    score -= Math.log(filePath.length + 1) * 4
+
+    return score
+  }
+
+  /**
+   * Build common ripgrep arguments for file listing
+   */
+  private buildRipgrepBaseArgs(options: Required<DirectoryListOptions>, resolvedPath: string): string[] {
+    const args: string[] = ['--files']
 
     // Handle hidden files
     if (!options.includeHidden) {
@@ -1070,82 +1296,74 @@ class FileStorage {
       args.push('--max-depth', options.maxDepth.toString())
     }
 
-    // Handle max count
-    if (options.maxEntries > 0) {
-      args.push('--max-count', options.maxEntries.toString())
-    }
-
-    // Add search pattern (search in content)
-    args.push(options.searchPattern)
-
-    // Add the directory path
     args.push(resolvedPath)
 
-    const { exitCode, output } = await executeRipgrep(args)
-
-    // Exit code 0 means files found, 1 means no files found (still success), 2+ means error
-    if (exitCode >= 2) {
-      throw new Error(`Ripgrep failed with exit code ${exitCode}: ${output}`)
-    }
-
-    // Parse ripgrep output (already sorted by relevance)
-    const results = output
-      .split('\n')
-      .filter((line) => line.trim())
-      .map((line) => line.replace(/\\/g, '/'))
-      .slice(0, options.maxEntries)
-
-    return results
+    return args
   }
 
   private async listDirectoryWithRipgrep(
     resolvedPath: string,
     options: Required<DirectoryListOptions>
   ): Promise<string[]> {
-    const maxEntries = options.maxEntries
+    // Fuzzy search mode: use ripgrep glob for pre-filtering, then score in JS
+    if (options.fuzzy && options.searchPattern && options.searchPattern !== '.') {
+      const args = this.buildRipgrepBaseArgs(options, resolvedPath)
 
-    // Step 1: Search by filename first
+      // Insert glob pattern before the path (last element)
+      const globPattern = this.queryToGlobPattern(options.searchPattern)
+      args.splice(args.length - 1, 0, '--iglob', globPattern)
+
+      const { exitCode, output } = await executeRipgrep(args)
+
+      if (exitCode >= 2) {
+        throw new Error(`Ripgrep failed with exit code ${exitCode}: ${output}`)
+      }
+
+      const filteredFiles = output
+        .split('\n')
+        .filter((line) => line.trim())
+        .map((line) => line.replace(/\\/g, '/'))
+
+      // If fuzzy glob found results, validate fuzzy match, sort and return
+      if (filteredFiles.length > 0) {
+        return filteredFiles
+          .filter((file) => this.isFuzzyMatch(file, options.searchPattern))
+          .map((file) => ({ file, score: this.getFuzzyMatchScore(file, options.searchPattern) }))
+          .sort((a, b) => b.score - a.score)
+          .slice(0, options.maxEntries)
+          .map((item) => item.file)
+      }
+
+      // Fallback: if no results, try greedy substring match on all files
+      logger.debug('Fuzzy glob returned no results, falling back to greedy substring match')
+      const fallbackArgs = this.buildRipgrepBaseArgs(options, resolvedPath)
+
+      const fallbackResult = await executeRipgrep(fallbackArgs)
+
+      if (fallbackResult.exitCode >= 2) {
+        return []
+      }
+
+      const allFiles = fallbackResult.output
+        .split('\n')
+        .filter((line) => line.trim())
+        .map((line) => line.replace(/\\/g, '/'))
+
+      const greedyMatched = allFiles.filter((file) => this.isGreedySubstringMatch(file, options.searchPattern))
+
+      return greedyMatched
+        .map((file) => ({ file, score: this.getGreedyMatchScore(file, options.searchPattern) }))
+        .sort((a, b) => b.score - a.score)
+        .slice(0, options.maxEntries)
+        .map((item) => item.file)
+    }
+
+    // Fallback: search by filename only (non-fuzzy mode)
     logger.debug('Searching by filename pattern', { pattern: options.searchPattern, path: resolvedPath })
     const filenameResults = await this.searchByFilename(resolvedPath, options)
 
     logger.debug('Found matches by filename', { count: filenameResults.length })
-
-    // If we have enough filename matches, return them
-    if (filenameResults.length >= maxEntries) {
-      return filenameResults.slice(0, maxEntries)
-    }
-
-    // Step 2: If filename matches are less than maxEntries, search by content to fill up
-    logger.debug('Filename matches insufficient, searching by content to fill up', {
-      filenameCount: filenameResults.length,
-      needed: maxEntries - filenameResults.length
-    })
-
-    // Adjust maxEntries for content search to get enough results
-    const contentOptions = {
-      ...options,
-      maxEntries: maxEntries - filenameResults.length + 20 // Request extra to account for duplicates
-    }
-
-    const contentResults = await this.searchByContent(resolvedPath, contentOptions)
-
-    logger.debug('Found matches by content', { count: contentResults.length })
-
-    // Combine results: filename matches first, then content matches (deduplicated)
-    const combined = [...filenameResults]
-    const filenameSet = new Set(filenameResults)
-
-    for (const filePath of contentResults) {
-      if (!filenameSet.has(filePath)) {
-        combined.push(filePath)
-        if (combined.length >= maxEntries) {
-          break
-        }
-      }
-    }
-
-    logger.debug('Combined results', { total: combined.length, filenameCount: filenameResults.length })
-    return combined.slice(0, maxEntries)
+    return filenameResults.slice(0, options.maxEntries)
   }
 
   public validateNotesDirectory = async (_: Electron.IpcMainInvokeEvent, dirPath: string): Promise<boolean> => {
@@ -1319,7 +1537,7 @@ class FileStorage {
       await fs.promises.writeFile(destPath, buffer)
 
       const stats = await fs.promises.stat(destPath)
-      const fileType = getFileType(ext)
+      const fileType = await this.getFileType(destPath)
 
       return {
         id: uuid,
@@ -1612,6 +1830,10 @@ class FileStorage {
   }
 
   public isTextFile = async (_: Electron.IpcMainInvokeEvent, filePath: string): Promise<boolean> => {
+    return this._isTextFile(filePath)
+  }
+
+  private _isTextFile = async (filePath: string): Promise<boolean> => {
     try {
       const isBinary = await isBinaryFile(filePath)
       if (isBinary) {
diff --git a/src/main/services/LocalTransferService.ts b/src/main/services/LocalTransferService.ts
new file mode 100644
index 0000000000..bc2743757c
--- /dev/null
+++ b/src/main/services/LocalTransferService.ts
@@ -0,0 +1,207 @@
+import { loggerService } from '@logger'
+import type { LocalTransferPeer, LocalTransferState } from '@shared/config/types'
+import { IpcChannel } from '@shared/IpcChannel'
+import type { Browser, Service } from 'bonjour-service'
+import Bonjour from 'bonjour-service'
+
+import { windowService } from './WindowService'
+
+const SERVICE_TYPE = 'cherrystudio'
+const SERVICE_PROTOCOL = 'tcp' as const
+
+const logger = loggerService.withContext('LocalTransferService')
+
+type StartDiscoveryOptions = {
+  resetList?: boolean
+}
+
+class LocalTransferService {
+  private static instance: LocalTransferService
+  private bonjour: Bonjour | null = null
+  private browser: Browser | null = null
+  private services = new Map<string, LocalTransferPeer>()
+  private isScanning = false
+  private lastScanStartedAt?: number
+  private lastUpdatedAt = Date.now()
+  private lastError?: string
+
+  private constructor() {}
+
+  public static getInstance(): LocalTransferService {
+    if (!LocalTransferService.instance) {
+      LocalTransferService.instance = new LocalTransferService()
+    }
+    return LocalTransferService.instance
+  }
+
+  public startDiscovery(options?: StartDiscoveryOptions): LocalTransferState {
+    if (options?.resetList) {
+      this.services.clear()
+    }
+
+    this.isScanning = true
+    this.lastScanStartedAt = Date.now()
+    this.lastUpdatedAt = Date.now()
+    this.lastError = undefined
+    this.restartBrowser()
+    this.broadcastState()
+    return this.getState()
+  }
+
+  public stopDiscovery(): LocalTransferState {
+    if (this.browser) {
+      try {
+        this.browser.stop()
+      } catch (error) {
+        logger.warn('Failed to stop local transfer browser', error as Error)
+      }
+    }
+    this.isScanning = false
+    this.lastUpdatedAt = Date.now()
+    this.broadcastState()
+    return this.getState()
+  }
+
+  public getState(): LocalTransferState {
+    const services = Array.from(this.services.values()).sort((a, b) => a.name.localeCompare(b.name))
+    return {
+      services,
+      isScanning: this.isScanning,
+      lastScanStartedAt: this.lastScanStartedAt,
+      lastUpdatedAt: this.lastUpdatedAt,
+      lastError: this.lastError
+    }
+  }
+
+  public getPeerById(id: string): LocalTransferPeer | undefined {
+    return this.services.get(id)
+  }
+
+  public dispose(): void {
+    this.stopDiscovery()
+    this.services.clear()
+    this.browser?.removeAllListeners()
+    this.browser = null
+    if (this.bonjour) {
+      try {
+        this.bonjour.destroy()
+      } catch (error) {
+        logger.warn('Failed to destroy Bonjour instance', error as Error)
+      }
+      this.bonjour = null
+    }
+  }
+
+  private getBonjour(): Bonjour {
+    if (!this.bonjour) {
+      this.bonjour = new Bonjour()
+    }
+    return this.bonjour
+  }
+
+  private restartBrowser(): void {
+    // Clean up existing browser
+    if (this.browser) {
+      this.browser.removeAllListeners()
+      try {
+        this.browser.stop()
+      } catch (error) {
+        logger.warn('Error while stopping Bonjour browser', error as Error)
+      }
+      this.browser = null
+    }
+
+    // Destroy and recreate Bonjour instance to prevent socket leaks
+    if (this.bonjour) {
+      try {
+        this.bonjour.destroy()
+      } catch (error) {
+        logger.warn('Error while destroying Bonjour instance', error as Error)
+      }
+      this.bonjour = null
+    }
+
+    const browser = this.getBonjour().find({ type: SERVICE_TYPE, protocol: SERVICE_PROTOCOL })
+    this.browser = browser
+    this.bindBrowserEvents(browser)
+
+    try {
+      browser.start()
+      logger.info('Local transfer discovery started')
+    } catch (error) {
+      const err = error instanceof Error ? error : new Error(String(error))
+      this.lastError = err.message
+      logger.error('Failed to start local transfer discovery', err)
+    }
+  }
+
+  private bindBrowserEvents(browser: Browser) {
+    browser.on('up', (service) => {
+      const peer = this.normalizeService(service)
+      logger.info(`LAN peer detected: ${peer.name} (${peer.addresses.join(', ')})`)
+      this.services.set(peer.id, peer)
+      this.lastUpdatedAt = Date.now()
+      this.broadcastState()
+    })
+
+    browser.on('down', (service) => {
+      const key = this.buildServiceKey(service.fqdn || service.name, service.host, service.port)
+      if (this.services.delete(key)) {
+        logger.info(`LAN peer removed: ${service.name}`)
+        this.lastUpdatedAt = Date.now()
+        this.broadcastState()
+      }
+    })
+
+    browser.on('error', (error) => {
+      const err = error instanceof Error ? error : new Error(String(error))
+      logger.error('Local transfer discovery error', err)
+      this.lastError = err.message
+      this.broadcastState()
+    })
+  }
+
+  private normalizeService(service: Service): LocalTransferPeer {
+    const addressCandidates = [...(service.addresses || []), service.referer?.address].filter(
+      (value): value is string => typeof value === 'string' && value.length > 0
+    )
+    const addresses = Array.from(new Set(addressCandidates))
+    const txtEntries = Object.entries(service.txt || {})
+    const txt =
+      txtEntries.length > 0
+        ? Object.fromEntries(
+            txtEntries.map(([key, value]) => [key, value === undefined || value === null ? '' : String(value)])
+          )
+        : undefined
+
+    const peer: LocalTransferPeer = {
+      id: this.buildServiceKey(service.fqdn || service.name, service.host, service.port),
+      name: service.name,
+      host: service.host,
+      fqdn: service.fqdn,
+      port: service.port,
+      type: service.type,
+      protocol: service.protocol,
+      addresses,
+      txt,
+      updatedAt: Date.now()
+    }
+
+    return peer
+  }
+
+  private buildServiceKey(name?: string, host?: string, port?: number): string {
+    const raw = [name, host, port?.toString()].filter(Boolean).join('-')
+    return raw || `service-${Date.now()}`
+  }
+
+  private broadcastState() {
+    const mainWindow = windowService.getMainWindow()
+    if (!mainWindow || mainWindow.isDestroyed()) {
+      return
+    }
+    mainWindow.webContents.send(IpcChannel.LocalTransfer_ServicesUpdated, this.getState())
+  }
+}
+
+export const localTransferService = LocalTransferService.getInstance()
diff --git a/src/main/services/MCPService.ts b/src/main/services/MCPService.ts
index 3925376226..7d36e6d7e3 100644
--- a/src/main/services/MCPService.ts
+++ b/src/main/services/MCPService.ts
@@ -6,7 +6,7 @@ import { loggerService } from '@logger'
 import { createInMemoryMCPServer } from '@main/mcpServers/factory'
 import { makeSureDirExists, removeEnvProxy } from '@main/utils'
 import { buildFunctionCallToolName } from '@main/utils/mcp'
-import { getBinaryName, getBinaryPath } from '@main/utils/process'
+import { findCommandInShellEnv, getBinaryName, getBinaryPath, isBinaryExists } from '@main/utils/process'
 import getLoginShellEnvironment from '@main/utils/shell-env'
 import { TraceMethod, withSpanFunc } from '@mcp-trace/trace-core'
 import { Client } from '@modelcontextprotocol/sdk/client/index.js'
@@ -33,6 +33,7 @@ import {
 import { nanoid } from '@reduxjs/toolkit'
 import { HOME_CHERRY_DIR } from '@shared/config/constant'
 import type { MCPProgressEvent } from '@shared/config/types'
+import type { MCPServerLogEntry } from '@shared/config/types'
 import { IpcChannel } from '@shared/IpcChannel'
 import { defaultAppHeaders } from '@shared/utils'
 import {
@@ -56,6 +57,7 @@ import { CacheService } from './CacheService'
 import DxtService from './DxtService'
 import { CallBackServer } from './mcp/oauth/callback'
 import { McpOAuthClientProvider } from './mcp/oauth/provider'
+import { ServerLogBuffer } from './mcp/ServerLogBuffer'
 import { windowService } from './WindowService'
 
 // Generic type for caching wrapped functions
@@ -142,6 +144,7 @@ class McpService {
   private pendingClients: Map<string, Promise<Client>> = new Map()
   private dxtService = new DxtService()
   private activeToolCalls: Map<string, AbortController> = new Map()
+  private serverLogs = new ServerLogBuffer(200)
 
   constructor() {
     this.initClient = this.initClient.bind(this)
@@ -159,6 +162,7 @@ class McpService {
     this.cleanup = this.cleanup.bind(this)
     this.checkMcpConnectivity = this.checkMcpConnectivity.bind(this)
     this.getServerVersion = this.getServerVersion.bind(this)
+    this.getServerLogs = this.getServerLogs.bind(this)
   }
 
   private getServerKey(server: MCPServer): string {
@@ -172,6 +176,19 @@ class McpService {
     })
   }
 
+  private emitServerLog(server: MCPServer, entry: MCPServerLogEntry) {
+    const serverKey = this.getServerKey(server)
+    this.serverLogs.append(serverKey, entry)
+    const mainWindow = windowService.getMainWindow()
+    if (mainWindow) {
+      mainWindow.webContents.send(IpcChannel.Mcp_ServerLog, { ...entry, serverId: server.id })
+    }
+  }
+
+  public getServerLogs(_: Electron.IpcMainInvokeEvent, server: MCPServer): MCPServerLogEntry[] {
+    return this.serverLogs.get(this.getServerKey(server))
+  }
+
   async initClient(server: MCPServer): Promise<Client> {
     const serverKey = this.getServerKey(server)
 
@@ -232,6 +249,26 @@ class McpService {
           StdioClientTransport | SSEClientTransport | InMemoryTransport | StreamableHTTPClientTransport
         > => {
           // Create appropriate transport based on configuration
+
+          // Special case for nowledgeMem - uses HTTP transport instead of in-memory
+          if (isBuiltinMCPServer(server) && server.name === BuiltinMCPServerNames.nowledgeMem) {
+            const nowledgeMemUrl = 'http://127.0.0.1:14242/mcp'
+            const options: StreamableHTTPClientTransportOptions = {
+              fetch: async (url, init) => {
+                return net.fetch(typeof url === 'string' ? url : url.toString(), init)
+              },
+              requestInit: {
+                headers: {
+                  ...defaultAppHeaders(),
+                  APP: 'Cherry Studio'
+                }
+              },
+              authProvider
+            }
+            getServerLogger(server).debug(`Using StreamableHTTPClientTransport for ${server.name}`)
+            return new StreamableHTTPClientTransport(new URL(nowledgeMemUrl), options)
+          }
+
           if (isBuiltinMCPServer(server) && server.name !== BuiltinMCPServerNames.mcpAutoInstall) {
             getServerLogger(server).debug(`Using in-memory transport`)
             const [clientTransport, serverTransport] = InMemoryTransport.createLinkedPair()
@@ -281,6 +318,10 @@ class McpService {
           } else if (server.command) {
             let cmd = server.command
 
+            // Get login shell environment first - needed for command detection and server execution
+            // Note: getLoginShellEnvironment() is memoized, so subsequent calls are fast
+            const loginShellEnv = await getLoginShellEnvironment()
+
             // For DXT servers, use resolved configuration with platform overrides and variable substitution
             if (server.dxtPath) {
               const resolvedConfig = this.dxtService.getResolvedMcpConfig(server.dxtPath)
@@ -302,18 +343,45 @@ class McpService {
             }
 
             if (server.command === 'npx') {
-              cmd = await getBinaryPath('bun')
-              getServerLogger(server).debug(`Using command`, { command: cmd })
+              // First, check if npx is available in user's shell environment
+              const npxPath = await findCommandInShellEnv('npx', loginShellEnv)
 
-              // add -x to args if args exist
-              if (args && args.length > 0) {
-                if (!args.includes('-y')) {
-                  args.unshift('-y')
-                }
-                if (!args.includes('x')) {
-                  args.unshift('x')
+              if (npxPath) {
+                // Use system npx
+                cmd = npxPath
+                getServerLogger(server).debug(`Using system npx`, { command: cmd })
+              } else {
+                // System npx not found, try bundled bun as fallback
+                getServerLogger(server).debug(`System npx not found, checking for bundled bun`)
+
+                if (await isBinaryExists('bun')) {
+                  // Fall back to bundled bun
+                  cmd = await getBinaryPath('bun')
+                  getServerLogger(server).info(`Using bundled bun as fallback (npx not found in PATH)`, {
+                    command: cmd
+                  })
+
+                  // Transform args for bun x format
+                  if (args && args.length > 0) {
+                    if (!args.includes('-y')) {
+                      args.unshift('-y')
+                    }
+                    if (!args.includes('x')) {
+                      args.unshift('x')
+                    }
+                  }
+                } else {
+                  // Neither npx nor bun available
+                  throw new Error(
+                    'npx not found in PATH and bundled bun is not available. This may indicate an installation issue.\n' +
+                      'Please either:\n' +
+                      '1. Install Node.js (which includes npx) from https://nodejs.org\n' +
+                      '2. Run the MCP dependencies installer from Settings\n' +
+                      '3. Restart the application if you recently installed Node.js'
+                  )
                 }
               }
+
               if (server.registryUrl) {
                 server.env = {
                   ...server.env,
@@ -328,7 +396,35 @@ class McpService {
                 }
               }
             } else if (server.command === 'uvx' || server.command === 'uv') {
-              cmd = await getBinaryPath(server.command)
+              // First, check if uvx/uv is available in user's shell environment
+              const uvPath = await findCommandInShellEnv(server.command, loginShellEnv)
+
+              if (uvPath) {
+                // Use system uvx/uv
+                cmd = uvPath
+                getServerLogger(server).debug(`Using system ${server.command}`, { command: cmd })
+              } else {
+                // System command not found, try bundled version as fallback
+                getServerLogger(server).debug(`System ${server.command} not found, checking for bundled version`)
+
+                if (await isBinaryExists(server.command)) {
+                  // Fall back to bundled version
+                  cmd = await getBinaryPath(server.command)
+                  getServerLogger(server).info(`Using bundled ${server.command} as fallback (not found in PATH)`, {
+                    command: cmd
+                  })
+                } else {
+                  // Neither system nor bundled available
+                  throw new Error(
+                    `${server.command} not found in PATH and bundled version is not available. This may indicate an installation issue.\n` +
+                      'Please either:\n' +
+                      '1. Install uv from https://github.com/astral-sh/uv\n' +
+                      '2. Run the MCP dependencies installer from Settings\n' +
+                      `3. Restart the application if you recently installed ${server.command}`
+                  )
+                }
+              }
+
               if (server.registryUrl) {
                 server.env = {
                   ...server.env,
@@ -339,8 +435,6 @@ class McpService {
             }
 
             getServerLogger(server).debug(`Starting server`, { command: cmd, args })
-            // Logger.info(`[MCP] Environment variables for server:`, server.env)
-            const loginShellEnv = await getLoginShellEnvironment()
 
             // Bun not support proxy https://github.com/oven-sh/bun/issues/16812
             if (cmd.includes('bun')) {
@@ -366,9 +460,18 @@ class McpService {
             }
 
             const stdioTransport = new StdioClientTransport(transportOptions)
-            stdioTransport.stderr?.on('data', (data) =>
-              getServerLogger(server).debug(`Stdio stderr`, { data: data.toString() })
-            )
+            stdioTransport.stderr?.on('data', (data) => {
+              const msg = data.toString()
+              getServerLogger(server).debug(`Stdio stderr`, { data: msg })
+              this.emitServerLog(server, {
+                timestamp: Date.now(),
+                level: 'stderr',
+                message: msg.trim(),
+                source: 'stdio'
+              })
+            })
+            // StdioClientTransport does not expose stdout as a readable stream for raw logging
+            // (stdout is reserved for JSON-RPC). Avoid attaching a listener that would never fire.
             return stdioTransport
           } else {
             throw new Error('Either baseUrl or command must be provided')
@@ -436,6 +539,13 @@ class McpService {
             }
           }
 
+          this.emitServerLog(server, {
+            timestamp: Date.now(),
+            level: 'info',
+            message: 'Server connected',
+            source: 'client'
+          })
+
           // Store the new client in the cache
           this.clients.set(serverKey, client)
 
@@ -446,9 +556,22 @@ class McpService {
           this.clearServerCache(serverKey)
 
           logger.debug(`Activated server: ${server.name}`)
+          this.emitServerLog(server, {
+            timestamp: Date.now(),
+            level: 'info',
+            message: 'Server activated',
+            source: 'client'
+          })
           return client
         } catch (error) {
           getServerLogger(server).error(`Error activating server ${server.name}`, error as Error)
+          this.emitServerLog(server, {
+            timestamp: Date.now(),
+            level: 'error',
+            message: `Error activating server: ${(error as Error)?.message}`,
+            data: redactSensitive(error),
+            source: 'client'
+          })
           throw error
         }
       } finally {
@@ -506,6 +629,16 @@ class McpService {
       // Set up logging message notification handler
       client.setNotificationHandler(LoggingMessageNotificationSchema, async (notification) => {
         logger.debug(`Message from server ${server.name}:`, notification.params)
+        const msg = notification.params?.message
+        if (msg) {
+          this.emitServerLog(server, {
+            timestamp: Date.now(),
+            level: (notification.params?.level as MCPServerLogEntry['level']) || 'info',
+            message: typeof msg === 'string' ? msg : JSON.stringify(msg),
+            data: redactSensitive(notification.params?.data),
+            source: notification.params?.logger || 'server'
+          })
+        }
       })
 
       getServerLogger(server).debug(`Set up notification handlers`)
@@ -540,6 +673,7 @@ class McpService {
       this.clients.delete(serverKey)
       // Clear all caches for this server
       this.clearServerCache(serverKey)
+      this.serverLogs.remove(serverKey)
     } else {
       logger.warn(`No client found for server`, { serverKey })
     }
@@ -548,6 +682,12 @@ class McpService {
   async stopServer(_: Electron.IpcMainInvokeEvent, server: MCPServer) {
     const serverKey = this.getServerKey(server)
     getServerLogger(server).debug(`Stopping server`)
+    this.emitServerLog(server, {
+      timestamp: Date.now(),
+      level: 'info',
+      message: 'Stopping server',
+      source: 'client'
+    })
     await this.closeClient(serverKey)
   }
 
@@ -574,6 +714,12 @@ class McpService {
   async restartServer(_: Electron.IpcMainInvokeEvent, server: MCPServer) {
     getServerLogger(server).debug(`Restarting server`)
     const serverKey = this.getServerKey(server)
+    this.emitServerLog(server, {
+      timestamp: Date.now(),
+      level: 'info',
+      message: 'Restarting server',
+      source: 'client'
+    })
     await this.closeClient(serverKey)
     // Clear cache before restarting to ensure fresh data
     this.clearServerCache(serverKey)
@@ -606,9 +752,22 @@ class McpService {
       // Attempt to list tools as a way to check connectivity
       await client.listTools()
       getServerLogger(server).debug(`Connectivity check successful`)
+      this.emitServerLog(server, {
+        timestamp: Date.now(),
+        level: 'info',
+        message: 'Connectivity check successful',
+        source: 'connectivity'
+      })
       return true
     } catch (error) {
       getServerLogger(server).error(`Connectivity check failed`, error as Error)
+      this.emitServerLog(server, {
+        timestamp: Date.now(),
+        level: 'error',
+        message: `Connectivity check failed: ${(error as Error).message}`,
+        data: redactSensitive(error),
+        source: 'connectivity'
+      })
       // Close the client if connectivity check fails to ensure a clean state for the next attempt
       const serverKey = this.getServerKey(server)
       await this.closeClient(serverKey)
@@ -626,7 +785,7 @@ class McpService {
           ...tool,
           inputSchema: z.parse(MCPToolInputSchema, tool.inputSchema),
           outputSchema: tool.outputSchema ? z.parse(MCPToolOutputSchema, tool.outputSchema) : undefined,
-          id: buildFunctionCallToolName(server.name, tool.name, server.id),
+          id: buildFunctionCallToolName(server.name, tool.name),
           serverId: server.id,
           serverName: server.name,
           type: 'mcp'
diff --git a/src/main/services/OvmsManager.ts b/src/main/services/OvmsManager.ts
index 3a32d74ecf..67d6d9a9df 100644
--- a/src/main/services/OvmsManager.ts
+++ b/src/main/services/OvmsManager.ts
@@ -3,6 +3,8 @@ import { homedir } from 'node:os'
 import { promisify } from 'node:util'
 
 import { loggerService } from '@logger'
+import { isWin } from '@main/constant'
+import { getCpuName } from '@main/utils/system'
 import { HOME_CHERRY_DIR } from '@shared/config/constant'
 import * as fs from 'fs-extra'
 import * as path from 'path'
@@ -11,6 +13,8 @@ const logger = loggerService.withContext('OvmsManager')
 
 const execAsync = promisify(exec)
 
+export const isOvmsSupported = isWin && getCpuName().toLowerCase().includes('intel')
+
 interface OvmsProcess {
   pid: number
   path: string
@@ -29,6 +33,12 @@ interface OvmsConfig {
 class OvmsManager {
   private ovms: OvmsProcess | null = null
 
+  constructor() {
+    if (!isOvmsSupported) {
+      throw new Error('OVMS Manager is only supported on Windows platform with Intel CPU.')
+    }
+  }
+
   /**
    * Recursively terminate a process and all its child processes
    * @param pid Process ID to terminate
@@ -102,32 +112,10 @@ class OvmsManager {
    */
   public async stopOvms(): Promise<{ success: boolean; message?: string }> {
     try {
-      // Check if OVMS process is running
-      const psCommand = `Get-Process -Name "ovms" -ErrorAction SilentlyContinue | Select-Object Id, Path | ConvertTo-Json`
-      const { stdout } = await execAsync(`powershell -Command "${psCommand}"`)
-
-      if (!stdout.trim()) {
-        logger.info('OVMS process is not running')
-        return { success: true, message: 'OVMS process is not running' }
-      }
-
-      const processes = JSON.parse(stdout)
-      const processList = Array.isArray(processes) ? processes : [processes]
-
-      if (processList.length === 0) {
-        logger.info('OVMS process is not running')
-        return { success: true, message: 'OVMS process is not running' }
-      }
-
-      // Terminate all OVMS processes using terminalProcess
-      for (const process of processList) {
-        const result = await this.terminalProcess(process.Id)
-        if (!result.success) {
-          logger.error(`Failed to terminate OVMS process with PID: ${process.Id}, ${result.message}`)
-          return { success: false, message: `Failed to terminate OVMS process: ${result.message}` }
-        }
-        logger.info(`Terminated OVMS process with PID: ${process.Id}`)
-      }
+      // close the OVMS process
+      await execAsync(
+        `powershell -Command "Get-WmiObject Win32_Process | Where-Object { $_.CommandLine -like 'ovms.exe*' } | ForEach-Object { Stop-Process -Id $_.ProcessId -Force }"`
+      )
 
       // Reset the ovms instance
       this.ovms = null
@@ -584,4 +572,5 @@ class OvmsManager {
   }
 }
 
-export default OvmsManager
+// Export singleton instance
+export const ovmsManager = isOvmsSupported ? new OvmsManager() : undefined
diff --git a/src/main/services/ReduxService.ts b/src/main/services/ReduxService.ts
index cdbaff42bf..8880691a24 100644
--- a/src/main/services/ReduxService.ts
+++ b/src/main/services/ReduxService.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { loggerService } from '@logger'
 import { IpcChannel } from '@shared/IpcChannel'
 import { ipcMain } from 'electron'
diff --git a/src/main/services/SearchService.ts b/src/main/services/SearchService.ts
index 8a4e42099a..6c69f80889 100644
--- a/src/main/services/SearchService.ts
+++ b/src/main/services/SearchService.ts
@@ -14,38 +14,36 @@ export class SearchService {
     return SearchService.instance
   }
 
-  constructor() {
-    // Initialize the service
-  }
-
-  private async createNewSearchWindow(uid: string): Promise<BrowserWindow> {
+  private async createNewSearchWindow(uid: string, show: boolean = false): Promise<BrowserWindow> {
     const newWindow = new BrowserWindow({
-      width: 800,
-      height: 600,
-      show: false,
+      width: 1280,
+      height: 768,
+      show,
       webPreferences: {
         nodeIntegration: true,
         contextIsolation: false,
         devTools: is.dev
       }
     })
-    newWindow.webContents.session.webRequest.onBeforeSendHeaders({ urls: ['*://*/*'] }, (details, callback) => {
-      const headers = {
-        ...details.requestHeaders,
-        'User-Agent':
-          'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36'
-      }
-      callback({ requestHeaders: headers })
-    })
+
     this.searchWindows[uid] = newWindow
-    newWindow.on('closed', () => {
-      delete this.searchWindows[uid]
-    })
+    newWindow.on('closed', () => delete this.searchWindows[uid])
+
+    newWindow.webContents.userAgent =
+      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko)  Safari/537.36'
+
     return newWindow
   }
 
-  public async openSearchWindow(uid: string): Promise<void> {
-    await this.createNewSearchWindow(uid)
+  public async openSearchWindow(uid: string, show: boolean = false): Promise<void> {
+    const existingWindow = this.searchWindows[uid]
+
+    if (existingWindow) {
+      show && existingWindow.show()
+      return
+    }
+
+    await this.createNewSearchWindow(uid, show)
   }
 
   public async closeSearchWindow(uid: string): Promise<void> {
diff --git a/src/main/services/SelectionService.ts b/src/main/services/SelectionService.ts
index a096dfcfd7..629e67401c 100644
--- a/src/main/services/SelectionService.ts
+++ b/src/main/services/SelectionService.ts
@@ -1393,6 +1393,56 @@ export class SelectionService {
     actionWindow.setAlwaysOnTop(isPinned)
   }
 
+  /**
+   * [Windows only] Manual window resize handler
+   *
+   * ELECTRON BUG WORKAROUND:
+   * In Electron, when using `frame: false` + `transparent: true`, the native window
+   * resize functionality is broken on Windows. This is a known Electron bug.
+   * See: https://github.com/electron/electron/issues/48554
+   *
+   * This method can be removed once the Electron bug is fixed.
+   */
+  public resizeActionWindow(actionWindow: BrowserWindow, deltaX: number, deltaY: number, direction: string): void {
+    const bounds = actionWindow.getBounds()
+    const minWidth = 300
+    const minHeight = 200
+
+    let { x, y, width, height } = bounds
+
+    // Handle horizontal resize
+    if (direction.includes('e')) {
+      width = Math.max(minWidth, width + deltaX)
+    }
+    if (direction.includes('w')) {
+      const newWidth = Math.max(minWidth, width - deltaX)
+      if (newWidth !== width) {
+        x = x + (width - newWidth)
+        width = newWidth
+      }
+    }
+
+    // Handle vertical resize
+    if (direction.includes('s')) {
+      height = Math.max(minHeight, height + deltaY)
+    }
+    if (direction.includes('n')) {
+      const newHeight = Math.max(minHeight, height - deltaY)
+      if (newHeight !== height) {
+        y = y + (height - newHeight)
+        height = newHeight
+      }
+    }
+
+    actionWindow.setBounds({ x, y, width, height })
+
+    // [Windows only] Update remembered window size for custom resize
+    // setBounds() may not trigger the 'resized' event, so we need to update manually
+    if (this.isRemeberWinSize) {
+      this.lastActionWindowSize = { width, height }
+    }
+  }
+
   /**
    * Update trigger mode behavior
    * Switches between selection-based and alt-key based triggering
@@ -1510,6 +1560,18 @@ export class SelectionService {
       }
     })
 
+    // [Windows only] Electron bug workaround - can be removed once fixed
+    // See: https://github.com/electron/electron/issues/48554
+    ipcMain.handle(
+      IpcChannel.Selection_ActionWindowResize,
+      (event, deltaX: number, deltaY: number, direction: string) => {
+        const actionWindow = BrowserWindow.fromWebContents(event.sender)
+        if (actionWindow) {
+          selectionService?.resizeActionWindow(actionWindow, deltaX, deltaY, direction)
+        }
+      }
+    )
+
     this.isIpcHandlerRegistered = true
   }
 
diff --git a/src/main/services/ShortcutService.ts b/src/main/services/ShortcutService.ts
index 583dbbd95c..c99e0b5dc0 100644
--- a/src/main/services/ShortcutService.ts
+++ b/src/main/services/ShortcutService.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { loggerService } from '@logger'
 import { handleZoomFactor } from '@main/utils/zoom'
 import type { Shortcut } from '@types'
@@ -35,6 +51,15 @@ function getShortcutHandler(shortcut: Shortcut) {
       }
     case 'mini_window':
       return () => {
+        // 在处理器内部检查QuickAssistant状态，而不是在注册时检查
+        const quickAssistantEnabled = configManager.getEnableQuickAssistant()
+        logger.info(`mini_window shortcut triggered, QuickAssistant enabled: ${quickAssistantEnabled}`)
+
+        if (!quickAssistantEnabled) {
+          logger.warn('QuickAssistant is disabled, ignoring mini_window shortcut trigger')
+          return
+        }
+
         windowService.toggleMiniWindow()
       }
     case 'selection_assistant_toggle':
@@ -190,11 +215,10 @@ export function registerShortcuts(window: BrowserWindow) {
             break
 
           case 'mini_window':
-            //available only when QuickAssistant enabled
-            if (!configManager.getEnableQuickAssistant()) {
-              return
-            }
+            // 移除注册时的条件检查，在处理器内部进行检查
+            logger.info(`Processing mini_window shortcut, enabled: ${shortcut.enabled}`)
             showMiniWindowAccelerator = formatShortcutKey(shortcut.shortcut)
+            logger.debug(`Mini window accelerator set to: ${showMiniWindowAccelerator}`)
             break
 
           case 'selection_assistant_toggle':
diff --git a/src/main/services/StoreSyncService.ts b/src/main/services/StoreSyncService.ts
index 57f07195b6..6013afdd57 100644
--- a/src/main/services/StoreSyncService.ts
+++ b/src/main/services/StoreSyncService.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { IpcChannel } from '@shared/IpcChannel'
 import type { StoreSyncAction } from '@types'
 import { BrowserWindow, ipcMain } from 'electron'
diff --git a/src/main/services/WebSocketService.ts b/src/main/services/WebSocketService.ts
deleted file mode 100644
index e52919e96a..0000000000
--- a/src/main/services/WebSocketService.ts
+++ /dev/null
@@ -1,359 +0,0 @@
-import { loggerService } from '@logger'
-import type { WebSocketCandidatesResponse, WebSocketStatusResponse } from '@shared/config/types'
-import * as fs from 'fs'
-import { networkInterfaces } from 'os'
-import * as path from 'path'
-import type { Socket } from 'socket.io'
-import { Server } from 'socket.io'
-
-import { windowService } from './WindowService'
-
-const logger = loggerService.withContext('WebSocketService')
-
-class WebSocketService {
-  private io: Server | null = null
-  private isStarted = false
-  private port = 7017
-  private connectedClients = new Set<string>()
-
-  private getLocalIpAddress(): string | undefined {
-    const interfaces = networkInterfaces()
-
-    // 按优先级排序的网络接口名称模式
-    const interfacePriority = [
-      // macOS: 以太网/Wi-Fi 优先
-      /^en[0-9]+$/, // en0, en1 (以太网/Wi-Fi)
-      /^(en|eth)[0-9]+$/, // 以太网接口
-      /^wlan[0-9]+$/, // 无线接口
-      // Windows: 以太网/Wi-Fi 优先
-      /^(Ethernet|Wi-Fi|Local Area Connection)/,
-      /^(Wi-Fi|无线网络连接)/,
-      // Linux: 以太网/Wi-Fi 优先
-      /^(eth|enp|wlp|wlan)[0-9]+/,
-      // 虚拟化接口（低优先级）
-      /^bridge[0-9]+$/, // Docker bridge
-      /^veth[0-9]+$/, // Docker veth
-      /^docker[0-9]+/, // Docker interfaces
-      /^br-[0-9a-f]+/, // Docker bridge
-      /^vmnet[0-9]+$/, // VMware
-      /^vboxnet[0-9]+$/, // VirtualBox
-      // VPN 隧道接口（低优先级）
-      /^utun[0-9]+$/, // macOS VPN
-      /^tun[0-9]+$/, // Linux/Unix VPN
-      /^tap[0-9]+$/, // TAP interfaces
-      /^tailscale[0-9]*$/, // Tailscale VPN
-      /^wg[0-9]+$/ // WireGuard VPN
-    ]
-
-    const candidates: Array<{ interface: string; address: string; priority: number }> = []
-
-    for (const [name, ifaces] of Object.entries(interfaces)) {
-      for (const iface of ifaces || []) {
-        if (iface.family === 'IPv4' && !iface.internal) {
-          // 计算接口优先级
-          let priority = 999 // 默认最低优先级
-          for (let i = 0; i < interfacePriority.length; i++) {
-            if (interfacePriority[i].test(name)) {
-              priority = i
-              break
-            }
-          }
-
-          candidates.push({
-            interface: name,
-            address: iface.address,
-            priority
-          })
-        }
-      }
-    }
-
-    if (candidates.length === 0) {
-      logger.warn('无法获取局域网 IP，使用默认 IP: 127.0.0.1')
-      return '127.0.0.1'
-    }
-
-    // 按优先级排序，选择优先级最高的
-    candidates.sort((a, b) => a.priority - b.priority)
-    const best = candidates[0]
-
-    logger.info(`获取局域网 IP: ${best.address} (interface: ${best.interface})`)
-    return best.address
-  }
-
-  public start = async (): Promise<{ success: boolean; port?: number; error?: string }> => {
-    if (this.isStarted && this.io) {
-      return { success: true, port: this.port }
-    }
-
-    try {
-      this.io = new Server(this.port, {
-        cors: {
-          origin: '*',
-          methods: ['GET', 'POST']
-        },
-        transports: ['websocket', 'polling'],
-        allowEIO3: true,
-        pingTimeout: 60000,
-        pingInterval: 25000
-      })
-
-      this.io.on('connection', (socket: Socket) => {
-        this.connectedClients.add(socket.id)
-
-        const mainWindow = windowService.getMainWindow()
-        if (!mainWindow) {
-          logger.error('Main window is null, cannot send connection event')
-        } else {
-          mainWindow.webContents.send('websocket-client-connected', {
-            connected: true,
-            clientId: socket.id
-          })
-          logger.info(`Connection event sent to renderer, total clients: ${this.connectedClients.size}`)
-        }
-
-        socket.on('message', (data) => {
-          logger.info('Received message from mobile:', data)
-          mainWindow?.webContents.send('websocket-message-received', data)
-          socket.emit('message_received', { success: true })
-        })
-
-        socket.on('disconnect', () => {
-          logger.info(`Client disconnected: ${socket.id}`)
-          this.connectedClients.delete(socket.id)
-
-          if (this.connectedClients.size === 0) {
-            mainWindow?.webContents.send('websocket-client-connected', {
-              connected: false,
-              clientId: socket.id
-            })
-          }
-        })
-      })
-
-      // Engine 层面的事件监听
-      this.io.engine.on('connection_error', (err) => {
-        logger.error('Engine connection error:', err)
-      })
-
-      this.io.engine.on('connection', (rawSocket) => {
-        const remoteAddr = rawSocket.request.connection.remoteAddress
-        logger.info(`[Engine] Raw connection from: ${remoteAddr}`)
-        logger.info(`[Engine] Transport: ${rawSocket.transport.name}`)
-
-        rawSocket.on('packet', (packet: { type: string; data?: any }) => {
-          logger.info(
-            `[Engine] ← Packet from ${remoteAddr}: type="${packet.type}"`,
-            packet.data ? { data: packet.data } : {}
-          )
-        })
-
-        rawSocket.on('packetCreate', (packet: { type: string; data?: any }) => {
-          logger.info(`[Engine] → Packet to ${remoteAddr}: type="${packet.type}"`)
-        })
-
-        rawSocket.on('close', (reason: string) => {
-          logger.warn(`[Engine] Connection closed from ${remoteAddr}, reason: ${reason}`)
-        })
-
-        rawSocket.on('error', (error: Error) => {
-          logger.error(`[Engine] Connection error from ${remoteAddr}:`, error)
-        })
-      })
-
-      // Socket.IO 握手失败监听
-      this.io.on('connection_error', (err) => {
-        logger.error('[Socket.IO] Connection error during handshake:', err)
-      })
-
-      this.isStarted = true
-      logger.info(`WebSocket server started on port ${this.port}`)
-
-      return { success: true, port: this.port }
-    } catch (error) {
-      logger.error('Failed to start WebSocket server:', error as Error)
-      return {
-        success: false,
-        error: error instanceof Error ? error.message : 'Unknown error'
-      }
-    }
-  }
-
-  public stop = async (): Promise<{ success: boolean }> => {
-    if (!this.isStarted || !this.io) {
-      return { success: true }
-    }
-
-    try {
-      await new Promise<void>((resolve) => {
-        this.io!.close(() => {
-          resolve()
-        })
-      })
-
-      this.io = null
-      this.isStarted = false
-      this.connectedClients.clear()
-      logger.info('WebSocket server stopped')
-
-      return { success: true }
-    } catch (error) {
-      logger.error('Failed to stop WebSocket server:', error as Error)
-      return { success: false }
-    }
-  }
-
-  public getStatus = async (): Promise<WebSocketStatusResponse> => {
-    return {
-      isRunning: this.isStarted,
-      port: this.isStarted ? this.port : undefined,
-      ip: this.isStarted ? this.getLocalIpAddress() : undefined,
-      clientConnected: this.connectedClients.size > 0
-    }
-  }
-
-  public getAllCandidates = async (): Promise<WebSocketCandidatesResponse[]> => {
-    const interfaces = networkInterfaces()
-
-    // 按优先级排序的网络接口名称模式
-    const interfacePriority = [
-      // macOS: 以太网/Wi-Fi 优先
-      /^en[0-9]+$/, // en0, en1 (以太网/Wi-Fi)
-      /^(en|eth)[0-9]+$/, // 以太网接口
-      /^wlan[0-9]+$/, // 无线接口
-      // Windows: 以太网/Wi-Fi 优先
-      /^(Ethernet|Wi-Fi|Local Area Connection)/,
-      /^(Wi-Fi|无线网络连接)/,
-      // Linux: 以太网/Wi-Fi 优先
-      /^(eth|enp|wlp|wlan)[0-9]+/,
-      // 虚拟化接口（低优先级）
-      /^bridge[0-9]+$/, // Docker bridge
-      /^veth[0-9]+$/, // Docker veth
-      /^docker[0-9]+/, // Docker interfaces
-      /^br-[0-9a-f]+/, // Docker bridge
-      /^vmnet[0-9]+$/, // VMware
-      /^vboxnet[0-9]+$/, // VirtualBox
-      // VPN 隧道接口（低优先级）
-      /^utun[0-9]+$/, // macOS VPN
-      /^tun[0-9]+$/, // Linux/Unix VPN
-      /^tap[0-9]+$/, // TAP interfaces
-      /^tailscale[0-9]*$/, // Tailscale VPN
-      /^wg[0-9]+$/ // WireGuard VPN
-    ]
-
-    const candidates: Array<{ host: string; interface: string; priority: number }> = []
-
-    for (const [name, ifaces] of Object.entries(interfaces)) {
-      for (const iface of ifaces || []) {
-        if (iface.family === 'IPv4' && !iface.internal) {
-          // 计算接口优先级
-          let priority = 999 // 默认最低优先级
-          for (let i = 0; i < interfacePriority.length; i++) {
-            if (interfacePriority[i].test(name)) {
-              priority = i
-              break
-            }
-          }
-
-          candidates.push({
-            host: iface.address,
-            interface: name,
-            priority
-          })
-
-          logger.debug(`Found interface: ${name} -> ${iface.address} (priority: ${priority})`)
-        }
-      }
-    }
-
-    // 按优先级排序返回
-    candidates.sort((a, b) => a.priority - b.priority)
-    logger.info(
-      `Found ${candidates.length} IP candidates: ${candidates.map((c) => `${c.host}(${c.interface})`).join(', ')}`
-    )
-    return candidates
-  }
-
-  public sendFile = async (
-    _: Electron.IpcMainInvokeEvent,
-    filePath: string
-  ): Promise<{ success: boolean; error?: string }> => {
-    if (!this.isStarted || !this.io) {
-      const errorMsg = 'WebSocket server is not running.'
-      logger.error(errorMsg)
-      return { success: false, error: errorMsg }
-    }
-
-    if (this.connectedClients.size === 0) {
-      const errorMsg = 'No client connected.'
-      logger.error(errorMsg)
-      return { success: false, error: errorMsg }
-    }
-
-    const mainWindow = windowService.getMainWindow()
-
-    return new Promise((resolve, reject) => {
-      const stats = fs.statSync(filePath)
-      const totalSize = stats.size
-      const filename = path.basename(filePath)
-      const stream = fs.createReadStream(filePath)
-      let bytesSent = 0
-      const startTime = Date.now()
-
-      logger.info(`Starting file transfer: ${filename} (${this.formatFileSize(totalSize)})`)
-
-      // 向客户端发送文件开始的信号，包含文件名和总大小
-      this.io!.emit('zip-file-start', { filename, totalSize })
-
-      stream.on('data', (chunk) => {
-        bytesSent += chunk.length
-        const progress = (bytesSent / totalSize) * 100
-
-        // 向客户端发送文件块
-        this.io!.emit('zip-file-chunk', chunk)
-
-        // 向渲染进程发送进度更新
-        mainWindow?.webContents.send('file-send-progress', { progress })
-
-        // 每10%记录一次进度
-        if (Math.floor(progress) % 10 === 0) {
-          const elapsed = (Date.now() - startTime) / 1000
-          const speed = elapsed > 0 ? bytesSent / elapsed : 0
-          logger.info(`Transfer progress: ${Math.floor(progress)}% (${this.formatFileSize(speed)}/s)`)
-        }
-      })
-
-      stream.on('end', () => {
-        const totalTime = (Date.now() - startTime) / 1000
-        const avgSpeed = totalTime > 0 ? totalSize / totalTime : 0
-        logger.info(
-          `File transfer completed: ${filename} in ${totalTime.toFixed(1)}s (${this.formatFileSize(avgSpeed)}/s)`
-        )
-
-        // 确保发送100%的进度
-        mainWindow?.webContents.send('file-send-progress', { progress: 100 })
-        // 向客户端发送文件结束的信号
-        this.io!.emit('zip-file-end')
-        resolve({ success: true })
-      })
-
-      stream.on('error', (error) => {
-        logger.error(`File transfer failed: ${filename}`, error)
-        reject({
-          success: false,
-          error: error instanceof Error ? error.message : 'Unknown error'
-        })
-      })
-    })
-  }
-
-  private formatFileSize(bytes: number): string {
-    if (bytes === 0) return '0 B'
-    const k = 1024
-    const sizes = ['B', 'KB', 'MB', 'GB']
-    const i = Math.floor(Math.log(bytes) / Math.log(k))
-    return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i]
-  }
-}
-
-export default new WebSocketService()
diff --git a/src/main/services/WebviewService.ts b/src/main/services/WebviewService.ts
index fb2049de74..7af008bd7a 100644
--- a/src/main/services/WebviewService.ts
+++ b/src/main/services/WebviewService.ts
@@ -1,5 +1,6 @@
 import { IpcChannel } from '@shared/IpcChannel'
-import { app, session, shell, webContents } from 'electron'
+import { app, dialog, session, shell, webContents } from 'electron'
+import { promises as fs } from 'fs'
 
 /**
  * init the useragent of the webview session
@@ -53,11 +54,17 @@ const attachKeyboardHandler = (contents: Electron.WebContents) => {
       return
     }
 
-    const isFindShortcut = (input.control || input.meta) && key === 'f'
-    const isEscape = key === 'escape'
-    const isEnter = key === 'enter'
+    // Helper to check if this is a shortcut we handle
+    const isHandledShortcut = (k: string) => {
+      const isFindShortcut = (input.control || input.meta) && k === 'f'
+      const isPrintShortcut = (input.control || input.meta) && k === 'p'
+      const isSaveShortcut = (input.control || input.meta) && k === 's'
+      const isEscape = k === 'escape'
+      const isEnter = k === 'enter'
+      return isFindShortcut || isPrintShortcut || isSaveShortcut || isEscape || isEnter
+    }
 
-    if (!isFindShortcut && !isEscape && !isEnter) {
+    if (!isHandledShortcut(key)) {
       return
     }
 
@@ -66,11 +73,20 @@ const attachKeyboardHandler = (contents: Electron.WebContents) => {
       return
     }
 
+    const isFindShortcut = (input.control || input.meta) && key === 'f'
+    const isPrintShortcut = (input.control || input.meta) && key === 'p'
+    const isSaveShortcut = (input.control || input.meta) && key === 's'
+
     // Always prevent Cmd/Ctrl+F to override the guest page's native find dialog
     if (isFindShortcut) {
       event.preventDefault()
     }
 
+    // Prevent default print/save dialogs and handle them with custom logic
+    if (isPrintShortcut || isSaveShortcut) {
+      event.preventDefault()
+    }
+
     // Send the hotkey event to the renderer
     // The renderer will decide whether to preventDefault for Escape and Enter
     // based on whether the search bar is visible
@@ -100,3 +116,130 @@ export function initWebviewHotkeys() {
     attachKeyboardHandler(contents)
   })
 }
+
+/**
+ * Print webview content to PDF
+ * @param webviewId The webview webContents id
+ * @returns Path to saved PDF file or null if user cancelled
+ */
+export async function printWebviewToPDF(webviewId: number): Promise<string | null> {
+  const webview = webContents.fromId(webviewId)
+  if (!webview) {
+    throw new Error('Webview not found')
+  }
+
+  try {
+    // Get the page title for default filename
+    const pageTitle = await webview.executeJavaScript('document.title || "webpage"').catch(() => 'webpage')
+    // Sanitize filename by removing invalid characters
+    const sanitizedTitle = pageTitle.replace(/[<>:"/\\|?*]/g, '-').substring(0, 100)
+    const defaultFilename = sanitizedTitle ? `${sanitizedTitle}.pdf` : `webpage-${Date.now()}.pdf`
+
+    // Show save dialog
+    const { canceled, filePath } = await dialog.showSaveDialog({
+      title: 'Save as PDF',
+      defaultPath: defaultFilename,
+      filters: [{ name: 'PDF Files', extensions: ['pdf'] }]
+    })
+
+    if (canceled || !filePath) {
+      return null
+    }
+
+    // Generate PDF with settings to capture full page
+    const pdfData = await webview.printToPDF({
+      margins: {
+        marginType: 'default'
+      },
+      printBackground: true,
+      landscape: false,
+      pageSize: 'A4',
+      preferCSSPageSize: true
+    })
+
+    // Save PDF to file
+    await fs.writeFile(filePath, pdfData)
+
+    return filePath
+  } catch (error) {
+    throw new Error(`Failed to print to PDF: ${(error as Error).message}`)
+  }
+}
+
+/**
+ * Save webview content as HTML
+ * @param webviewId The webview webContents id
+ * @returns Path to saved HTML file or null if user cancelled
+ */
+export async function saveWebviewAsHTML(webviewId: number): Promise<string | null> {
+  const webview = webContents.fromId(webviewId)
+  if (!webview) {
+    throw new Error('Webview not found')
+  }
+
+  try {
+    // Get the page title for default filename
+    const pageTitle = await webview.executeJavaScript('document.title || "webpage"').catch(() => 'webpage')
+    // Sanitize filename by removing invalid characters
+    const sanitizedTitle = pageTitle.replace(/[<>:"/\\|?*]/g, '-').substring(0, 100)
+    const defaultFilename = sanitizedTitle ? `${sanitizedTitle}.html` : `webpage-${Date.now()}.html`
+
+    // Show save dialog
+    const { canceled, filePath } = await dialog.showSaveDialog({
+      title: 'Save as HTML',
+      defaultPath: defaultFilename,
+      filters: [
+        { name: 'HTML Files', extensions: ['html', 'htm'] },
+        { name: 'All Files', extensions: ['*'] }
+      ]
+    })
+
+    if (canceled || !filePath) {
+      return null
+    }
+
+    // Get the HTML content with safe error handling
+    const html = await webview.executeJavaScript(`
+      (() => {
+        try {
+          // Build complete DOCTYPE string if present
+          let doctype = '';
+          if (document.doctype) {
+            const dt = document.doctype;
+            doctype = '<!DOCTYPE ' + (dt.name || 'html');
+
+            // Add PUBLIC identifier if publicId is present
+            if (dt.publicId) {
+              // Escape single quotes in publicId
+              const escapedPublicId = String(dt.publicId).replace(/'/g, "\\'");
+              doctype += " PUBLIC '" + escapedPublicId + "'";
+
+              // Add systemId if present (required when publicId is present)
+              if (dt.systemId) {
+                const escapedSystemId = String(dt.systemId).replace(/'/g, "\\'");
+                doctype += " '" + escapedSystemId + "'";
+              }
+            } else if (dt.systemId) {
+              // SYSTEM identifier (without PUBLIC)
+              const escapedSystemId = String(dt.systemId).replace(/'/g, "\\'");
+              doctype += " SYSTEM '" + escapedSystemId + "'";
+            }
+
+            doctype += '>';
+          }
+          return doctype + (document.documentElement?.outerHTML || '');
+        } catch (error) {
+          // Fallback: just return the HTML without DOCTYPE if there's an error
+          return document.documentElement?.outerHTML || '';
+        }
+      })()
+    `)
+
+    // Save HTML to file
+    await fs.writeFile(filePath, html, 'utf-8')
+
+    return filePath
+  } catch (error) {
+    throw new Error(`Failed to save as HTML: ${(error as Error).message}`)
+  }
+}
diff --git a/src/main/services/WindowService.ts b/src/main/services/WindowService.ts
index 3f96497e63..cda99cc37a 100644
--- a/src/main/services/WindowService.ts
+++ b/src/main/services/WindowService.ts
@@ -255,6 +255,12 @@ export class WindowService {
   }
 
   private setupWebContentsHandlers(mainWindow: BrowserWindow) {
+    // Fix for Electron bug where zoom resets during in-page navigation (route changes)
+    // This complements the resize-based workaround by catching navigation events
+    mainWindow.webContents.on('did-navigate-in-page', () => {
+      mainWindow.webContents.setZoomFactor(configManager.getZoomFactor())
+    })
+
     mainWindow.webContents.on('will-navigate', (event, url) => {
       if (url.includes('localhost:517')) {
         return
@@ -516,7 +522,9 @@ export class WindowService {
     miniWindowState.manage(this.miniWindow)
 
     //miniWindow should show in current desktop
-    this.miniWindow?.setVisibleOnAllWorkspaces(true, { visibleOnFullScreen: true })
+    this.miniWindow?.setVisibleOnAllWorkspaces(true, {
+      visibleOnFullScreen: true
+    })
     //make miniWindow always on top of fullscreen apps with level set
     //[mac] level higher than 'floating' will cover the pinyin input method
     this.miniWindow.setAlwaysOnTop(true, 'floating')
@@ -635,6 +643,11 @@ export class WindowService {
       return
     } else if (isMac) {
       this.miniWindow.hide()
+      const majorVersion = parseInt(process.getSystemVersion().split('.')[0], 10)
+      if (majorVersion >= 26) {
+        // on macOS 26+, the popup of the mimiWindow would not change the focus to previous application.
+        return
+      }
       if (!this.wasMainWindowFocused) {
         app.hide()
       }
diff --git a/src/main/services/__tests__/BackupManager.deleteTempBackup.test.ts b/src/main/services/__tests__/BackupManager.deleteTempBackup.test.ts
new file mode 100644
index 0000000000..062d140eb5
--- /dev/null
+++ b/src/main/services/__tests__/BackupManager.deleteTempBackup.test.ts
@@ -0,0 +1,274 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+// Use vi.hoisted to define mocks that are available during hoisting
+const { mockLogger } = vi.hoisted(() => ({
+  mockLogger: {
+    info: vi.fn(),
+    warn: vi.fn(),
+    error: vi.fn()
+  }
+}))
+
+vi.mock('@logger', () => ({
+  loggerService: {
+    withContext: () => mockLogger
+  }
+}))
+
+vi.mock('electron', () => ({
+  app: {
+    getPath: vi.fn((key: string) => {
+      if (key === 'temp') return '/tmp'
+      if (key === 'userData') return '/mock/userData'
+      return '/mock/unknown'
+    })
+  }
+}))
+
+vi.mock('fs-extra', () => ({
+  default: {
+    pathExists: vi.fn(),
+    remove: vi.fn(),
+    ensureDir: vi.fn(),
+    copy: vi.fn(),
+    readdir: vi.fn(),
+    stat: vi.fn(),
+    readFile: vi.fn(),
+    writeFile: vi.fn(),
+    createWriteStream: vi.fn(),
+    createReadStream: vi.fn()
+  },
+  pathExists: vi.fn(),
+  remove: vi.fn(),
+  ensureDir: vi.fn(),
+  copy: vi.fn(),
+  readdir: vi.fn(),
+  stat: vi.fn(),
+  readFile: vi.fn(),
+  writeFile: vi.fn(),
+  createWriteStream: vi.fn(),
+  createReadStream: vi.fn()
+}))
+
+vi.mock('../WindowService', () => ({
+  windowService: {
+    getMainWindow: vi.fn()
+  }
+}))
+
+vi.mock('../WebDav', () => ({
+  default: vi.fn()
+}))
+
+vi.mock('../S3Storage', () => ({
+  default: vi.fn()
+}))
+
+vi.mock('../../utils', () => ({
+  getDataPath: vi.fn(() => '/mock/data')
+}))
+
+vi.mock('archiver', () => ({
+  default: vi.fn()
+}))
+
+vi.mock('node-stream-zip', () => ({
+  default: vi.fn()
+}))
+
+// Import after mocks
+import * as fs from 'fs-extra'
+
+import BackupManager from '../BackupManager'
+
+describe('BackupManager.deleteTempBackup - Security Tests', () => {
+  let backupManager: BackupManager
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    backupManager = new BackupManager()
+  })
+
+  describe('Normal Operations', () => {
+    it('should delete valid file in allowed directory', async () => {
+      vi.mocked(fs.pathExists).mockResolvedValue(true as never)
+      vi.mocked(fs.remove).mockResolvedValue(undefined as never)
+
+      const validPath = '/tmp/cherry-studio/lan-transfer/backup.zip'
+      const result = await backupManager.deleteTempBackup({} as Electron.IpcMainInvokeEvent, validPath)
+
+      expect(result).toBe(true)
+      expect(fs.remove).toHaveBeenCalledWith(validPath)
+      expect(mockLogger.info).toHaveBeenCalledWith(expect.stringContaining('Deleted temp backup'))
+    })
+
+    it('should delete file in nested subdirectory', async () => {
+      vi.mocked(fs.pathExists).mockResolvedValue(true as never)
+      vi.mocked(fs.remove).mockResolvedValue(undefined as never)
+
+      const nestedPath = '/tmp/cherry-studio/lan-transfer/sub/dir/file.zip'
+      const result = await backupManager.deleteTempBackup({} as Electron.IpcMainInvokeEvent, nestedPath)
+
+      expect(result).toBe(true)
+      expect(fs.remove).toHaveBeenCalledWith(nestedPath)
+    })
+
+    it('should return false when file does not exist', async () => {
+      vi.mocked(fs.pathExists).mockResolvedValue(false as never)
+
+      const missingPath = '/tmp/cherry-studio/lan-transfer/missing.zip'
+      const result = await backupManager.deleteTempBackup({} as Electron.IpcMainInvokeEvent, missingPath)
+
+      expect(result).toBe(false)
+      expect(fs.remove).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('Path Traversal Attacks', () => {
+    it('should block basic directory traversal attack (../../../../etc/passwd)', async () => {
+      const attackPath = '/tmp/cherry-studio/lan-transfer/../../../../etc/passwd'
+      const result = await backupManager.deleteTempBackup({} as Electron.IpcMainInvokeEvent, attackPath)
+
+      expect(result).toBe(false)
+      expect(fs.pathExists).not.toHaveBeenCalled()
+      expect(fs.remove).not.toHaveBeenCalled()
+      expect(mockLogger.warn).toHaveBeenCalledWith(expect.stringContaining('outside temp directory'))
+    })
+
+    it('should block absolute path escape (/etc/passwd)', async () => {
+      const attackPath = '/etc/passwd'
+      const result = await backupManager.deleteTempBackup({} as Electron.IpcMainInvokeEvent, attackPath)
+
+      expect(result).toBe(false)
+      expect(fs.remove).not.toHaveBeenCalled()
+      expect(mockLogger.warn).toHaveBeenCalled()
+    })
+
+    it('should block traversal with multiple slashes', async () => {
+      const attackPath = '/tmp/cherry-studio/lan-transfer/../../../etc/passwd'
+      const result = await backupManager.deleteTempBackup({} as Electron.IpcMainInvokeEvent, attackPath)
+
+      expect(result).toBe(false)
+      expect(fs.remove).not.toHaveBeenCalled()
+    })
+
+    it('should block relative path traversal from current directory', async () => {
+      const attackPath = '../../../etc/passwd'
+      const result = await backupManager.deleteTempBackup({} as Electron.IpcMainInvokeEvent, attackPath)
+
+      expect(result).toBe(false)
+      expect(fs.remove).not.toHaveBeenCalled()
+    })
+
+    it('should block traversal to parent directory', async () => {
+      const attackPath = '/tmp/cherry-studio/lan-transfer/../backup/secret.zip'
+      const result = await backupManager.deleteTempBackup({} as Electron.IpcMainInvokeEvent, attackPath)
+
+      expect(result).toBe(false)
+      expect(fs.remove).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('Prefix Attacks', () => {
+    it('should block similar prefix attack (lan-transfer-evil)', async () => {
+      const attackPath = '/tmp/cherry-studio/lan-transfer-evil/file.zip'
+      const result = await backupManager.deleteTempBackup({} as Electron.IpcMainInvokeEvent, attackPath)
+
+      expect(result).toBe(false)
+      expect(fs.remove).not.toHaveBeenCalled()
+      expect(mockLogger.warn).toHaveBeenCalled()
+    })
+
+    it('should block path without separator (lan-transferx)', async () => {
+      const attackPath = '/tmp/cherry-studio/lan-transferx'
+      const result = await backupManager.deleteTempBackup({} as Electron.IpcMainInvokeEvent, attackPath)
+
+      expect(result).toBe(false)
+      expect(fs.remove).not.toHaveBeenCalled()
+    })
+
+    it('should block different temp directory prefix', async () => {
+      const attackPath = '/tmp-evil/cherry-studio/lan-transfer/file.zip'
+      const result = await backupManager.deleteTempBackup({} as Electron.IpcMainInvokeEvent, attackPath)
+
+      expect(result).toBe(false)
+      expect(fs.remove).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('Error Handling', () => {
+    it('should return false and log error on permission denied', async () => {
+      vi.mocked(fs.pathExists).mockResolvedValue(true as never)
+      vi.mocked(fs.remove).mockRejectedValue(new Error('EACCES: permission denied') as never)
+
+      const validPath = '/tmp/cherry-studio/lan-transfer/file.zip'
+      const result = await backupManager.deleteTempBackup({} as Electron.IpcMainInvokeEvent, validPath)
+
+      expect(result).toBe(false)
+      expect(mockLogger.error).toHaveBeenCalledWith(expect.stringContaining('Failed to delete'), expect.any(Error))
+    })
+
+    it('should return false on fs.pathExists error', async () => {
+      vi.mocked(fs.pathExists).mockRejectedValue(new Error('ENOENT') as never)
+
+      const validPath = '/tmp/cherry-studio/lan-transfer/file.zip'
+      const result = await backupManager.deleteTempBackup({} as Electron.IpcMainInvokeEvent, validPath)
+
+      expect(result).toBe(false)
+      expect(mockLogger.error).toHaveBeenCalled()
+    })
+
+    it('should handle empty path string', async () => {
+      const result = await backupManager.deleteTempBackup({} as Electron.IpcMainInvokeEvent, '')
+
+      expect(result).toBe(false)
+      expect(fs.remove).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('Edge Cases', () => {
+    it('should allow deletion of the temp directory itself', async () => {
+      vi.mocked(fs.pathExists).mockResolvedValue(true as never)
+      vi.mocked(fs.remove).mockResolvedValue(undefined as never)
+
+      const tempDir = '/tmp/cherry-studio/lan-transfer'
+      const result = await backupManager.deleteTempBackup({} as Electron.IpcMainInvokeEvent, tempDir)
+
+      expect(result).toBe(true)
+      expect(fs.remove).toHaveBeenCalledWith(tempDir)
+    })
+
+    it('should handle path with trailing slash', async () => {
+      vi.mocked(fs.pathExists).mockResolvedValue(true as never)
+      vi.mocked(fs.remove).mockResolvedValue(undefined as never)
+
+      const pathWithSlash = '/tmp/cherry-studio/lan-transfer/sub/'
+      const result = await backupManager.deleteTempBackup({} as Electron.IpcMainInvokeEvent, pathWithSlash)
+
+      // path.normalize removes trailing slash
+      expect(result).toBe(true)
+    })
+
+    it('should handle file with special characters in name', async () => {
+      vi.mocked(fs.pathExists).mockResolvedValue(true as never)
+      vi.mocked(fs.remove).mockResolvedValue(undefined as never)
+
+      const specialPath = '/tmp/cherry-studio/lan-transfer/file with spaces & (special).zip'
+      const result = await backupManager.deleteTempBackup({} as Electron.IpcMainInvokeEvent, specialPath)
+
+      expect(result).toBe(true)
+      expect(fs.remove).toHaveBeenCalled()
+    })
+
+    it('should handle path with double slashes', async () => {
+      vi.mocked(fs.pathExists).mockResolvedValue(true as never)
+      vi.mocked(fs.remove).mockResolvedValue(undefined as never)
+
+      const doubleSlashPath = '/tmp/cherry-studio//lan-transfer//file.zip'
+      const result = await backupManager.deleteTempBackup({} as Electron.IpcMainInvokeEvent, doubleSlashPath)
+
+      // path.normalize handles double slashes
+      expect(result).toBe(true)
+    })
+  })
+})
diff --git a/src/main/services/__tests__/LocalTransferService.test.ts b/src/main/services/__tests__/LocalTransferService.test.ts
new file mode 100644
index 0000000000..d00c7c269b
--- /dev/null
+++ b/src/main/services/__tests__/LocalTransferService.test.ts
@@ -0,0 +1,481 @@
+import { EventEmitter } from 'events'
+import { afterEach, beforeEach, describe, expect, it, type Mock, vi } from 'vitest'
+
+// Create mock objects before vi.mock calls
+const mockLogger = {
+  info: vi.fn(),
+  warn: vi.fn(),
+  error: vi.fn()
+}
+
+let mockMainWindow: {
+  isDestroyed: Mock
+  webContents: { send: Mock }
+} | null = null
+
+let mockBrowser: EventEmitter & {
+  start: Mock
+  stop: Mock
+  removeAllListeners: Mock
+}
+
+let mockBonjour: {
+  find: Mock
+  destroy: Mock
+}
+
+// Mock dependencies before importing the service
+vi.mock('@logger', () => ({
+  loggerService: {
+    withContext: () => mockLogger
+  }
+}))
+
+vi.mock('../WindowService', () => ({
+  windowService: {
+    getMainWindow: vi.fn(() => mockMainWindow)
+  }
+}))
+
+vi.mock('bonjour-service', () => ({
+  default: vi.fn(() => mockBonjour)
+}))
+
+describe('LocalTransferService', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    vi.resetModules()
+
+    // Reset mock objects
+    mockMainWindow = {
+      isDestroyed: vi.fn(() => false),
+      webContents: { send: vi.fn() }
+    }
+
+    mockBrowser = Object.assign(new EventEmitter(), {
+      start: vi.fn(),
+      stop: vi.fn(),
+      removeAllListeners: vi.fn()
+    })
+
+    mockBonjour = {
+      find: vi.fn(() => mockBrowser),
+      destroy: vi.fn()
+    }
+  })
+
+  afterEach(() => {
+    vi.resetAllMocks()
+  })
+
+  describe('startDiscovery', () => {
+    it('should set isScanning to true and start browser', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      const state = localTransferService.startDiscovery()
+
+      expect(state.isScanning).toBe(true)
+      expect(state.lastScanStartedAt).toBeDefined()
+      expect(mockBonjour.find).toHaveBeenCalledWith({ type: 'cherrystudio', protocol: 'tcp' })
+      expect(mockBrowser.start).toHaveBeenCalled()
+    })
+
+    it('should clear services when resetList is true', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      // First, start discovery and add a service
+      localTransferService.startDiscovery()
+      mockBrowser.emit('up', {
+        name: 'Test Service',
+        host: 'localhost',
+        port: 12345,
+        addresses: ['192.168.1.100'],
+        fqdn: 'test.local'
+      })
+
+      expect(localTransferService.getState().services).toHaveLength(1)
+
+      // Now restart with resetList
+      const state = localTransferService.startDiscovery({ resetList: true })
+
+      expect(state.services).toHaveLength(0)
+    })
+
+    it('should broadcast state after starting discovery', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      localTransferService.startDiscovery()
+
+      expect(mockMainWindow?.webContents.send).toHaveBeenCalled()
+    })
+
+    it('should handle browser.start() error', async () => {
+      mockBrowser.start.mockImplementation(() => {
+        throw new Error('Failed to start mDNS')
+      })
+
+      const { localTransferService } = await import('../LocalTransferService')
+
+      const state = localTransferService.startDiscovery()
+
+      expect(state.lastError).toBe('Failed to start mDNS')
+      expect(mockLogger.error).toHaveBeenCalled()
+    })
+  })
+
+  describe('stopDiscovery', () => {
+    it('should set isScanning to false and stop browser', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      localTransferService.startDiscovery()
+      const state = localTransferService.stopDiscovery()
+
+      expect(state.isScanning).toBe(false)
+      expect(mockBrowser.stop).toHaveBeenCalled()
+    })
+
+    it('should handle browser.stop() error gracefully', async () => {
+      mockBrowser.stop.mockImplementation(() => {
+        throw new Error('Stop failed')
+      })
+
+      const { localTransferService } = await import('../LocalTransferService')
+
+      localTransferService.startDiscovery()
+
+      // Should not throw
+      expect(() => localTransferService.stopDiscovery()).not.toThrow()
+      expect(mockLogger.warn).toHaveBeenCalled()
+    })
+
+    it('should broadcast state after stopping', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      localTransferService.startDiscovery()
+      vi.clearAllMocks()
+
+      localTransferService.stopDiscovery()
+
+      expect(mockMainWindow?.webContents.send).toHaveBeenCalled()
+    })
+  })
+
+  describe('browser events', () => {
+    it('should add service on "up" event', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      localTransferService.startDiscovery()
+
+      mockBrowser.emit('up', {
+        name: 'Test Service',
+        host: 'localhost',
+        port: 12345,
+        addresses: ['192.168.1.100'],
+        fqdn: 'test.local',
+        type: 'cherrystudio',
+        protocol: 'tcp'
+      })
+
+      const state = localTransferService.getState()
+      expect(state.services).toHaveLength(1)
+      expect(state.services[0].name).toBe('Test Service')
+      expect(state.services[0].port).toBe(12345)
+      expect(state.services[0].addresses).toContain('192.168.1.100')
+    })
+
+    it('should remove service on "down" event', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      localTransferService.startDiscovery()
+
+      // Add service
+      mockBrowser.emit('up', {
+        name: 'Test Service',
+        host: 'localhost',
+        port: 12345,
+        addresses: ['192.168.1.100'],
+        fqdn: 'test.local'
+      })
+
+      expect(localTransferService.getState().services).toHaveLength(1)
+
+      // Remove service
+      mockBrowser.emit('down', {
+        name: 'Test Service',
+        host: 'localhost',
+        port: 12345,
+        fqdn: 'test.local'
+      })
+
+      expect(localTransferService.getState().services).toHaveLength(0)
+      expect(mockLogger.info).toHaveBeenCalledWith(expect.stringContaining('removed'))
+    })
+
+    it('should set lastError on "error" event', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      localTransferService.startDiscovery()
+
+      mockBrowser.emit('error', new Error('Discovery failed'))
+
+      const state = localTransferService.getState()
+      expect(state.lastError).toBe('Discovery failed')
+      expect(mockLogger.error).toHaveBeenCalled()
+    })
+
+    it('should handle non-Error objects in error event', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      localTransferService.startDiscovery()
+
+      mockBrowser.emit('error', 'String error message')
+
+      const state = localTransferService.getState()
+      expect(state.lastError).toBe('String error message')
+    })
+  })
+
+  describe('getState', () => {
+    it('should return sorted services by name', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      localTransferService.startDiscovery()
+
+      mockBrowser.emit('up', {
+        name: 'Zebra Service',
+        host: 'host1',
+        port: 1001,
+        addresses: ['192.168.1.1']
+      })
+
+      mockBrowser.emit('up', {
+        name: 'Alpha Service',
+        host: 'host2',
+        port: 1002,
+        addresses: ['192.168.1.2']
+      })
+
+      const state = localTransferService.getState()
+      expect(state.services[0].name).toBe('Alpha Service')
+      expect(state.services[1].name).toBe('Zebra Service')
+    })
+
+    it('should include all state properties', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      localTransferService.startDiscovery()
+
+      const state = localTransferService.getState()
+
+      expect(state).toHaveProperty('services')
+      expect(state).toHaveProperty('isScanning')
+      expect(state).toHaveProperty('lastScanStartedAt')
+      expect(state).toHaveProperty('lastUpdatedAt')
+    })
+  })
+
+  describe('getPeerById', () => {
+    it('should return peer when exists', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      localTransferService.startDiscovery()
+
+      mockBrowser.emit('up', {
+        name: 'Test Service',
+        host: 'localhost',
+        port: 12345,
+        addresses: ['192.168.1.100'],
+        fqdn: 'test.local'
+      })
+
+      const services = localTransferService.getState().services
+      const peer = localTransferService.getPeerById(services[0].id)
+
+      expect(peer).toBeDefined()
+      expect(peer?.name).toBe('Test Service')
+    })
+
+    it('should return undefined when peer does not exist', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      const peer = localTransferService.getPeerById('non-existent-id')
+
+      expect(peer).toBeUndefined()
+    })
+  })
+
+  describe('normalizeService', () => {
+    it('should deduplicate addresses', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      localTransferService.startDiscovery()
+
+      mockBrowser.emit('up', {
+        name: 'Test Service',
+        host: 'localhost',
+        port: 12345,
+        addresses: ['192.168.1.100', '192.168.1.100', '10.0.0.1'],
+        referer: { address: '192.168.1.100' }
+      })
+
+      const services = localTransferService.getState().services
+      expect(services[0].addresses).toHaveLength(2)
+      expect(services[0].addresses).toContain('192.168.1.100')
+      expect(services[0].addresses).toContain('10.0.0.1')
+    })
+
+    it('should filter empty addresses', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      localTransferService.startDiscovery()
+
+      mockBrowser.emit('up', {
+        name: 'Test Service',
+        host: 'localhost',
+        port: 12345,
+        addresses: ['192.168.1.100', '', null as any]
+      })
+
+      const services = localTransferService.getState().services
+      expect(services[0].addresses).toEqual(['192.168.1.100'])
+    })
+
+    it('should convert txt null/undefined values to empty strings', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      localTransferService.startDiscovery()
+
+      mockBrowser.emit('up', {
+        name: 'Test Service',
+        host: 'localhost',
+        port: 12345,
+        addresses: ['192.168.1.100'],
+        txt: {
+          version: '1.0',
+          nullValue: null,
+          undefinedValue: undefined,
+          numberValue: 42
+        }
+      })
+
+      const services = localTransferService.getState().services
+      expect(services[0].txt).toEqual({
+        version: '1.0',
+        nullValue: '',
+        undefinedValue: '',
+        numberValue: '42'
+      })
+    })
+
+    it('should not include txt when empty', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      localTransferService.startDiscovery()
+
+      mockBrowser.emit('up', {
+        name: 'Test Service',
+        host: 'localhost',
+        port: 12345,
+        addresses: ['192.168.1.100'],
+        txt: {}
+      })
+
+      const services = localTransferService.getState().services
+      expect(services[0].txt).toBeUndefined()
+    })
+  })
+
+  describe('dispose', () => {
+    it('should clean up all resources', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      localTransferService.startDiscovery()
+
+      mockBrowser.emit('up', {
+        name: 'Test Service',
+        host: 'localhost',
+        port: 12345,
+        addresses: ['192.168.1.100']
+      })
+
+      localTransferService.dispose()
+
+      expect(localTransferService.getState().services).toHaveLength(0)
+      expect(localTransferService.getState().isScanning).toBe(false)
+      expect(mockBrowser.removeAllListeners).toHaveBeenCalled()
+      expect(mockBonjour.destroy).toHaveBeenCalled()
+    })
+
+    it('should handle bonjour.destroy() error gracefully', async () => {
+      mockBonjour.destroy.mockImplementation(() => {
+        throw new Error('Destroy failed')
+      })
+
+      const { localTransferService } = await import('../LocalTransferService')
+
+      localTransferService.startDiscovery()
+
+      // Should not throw
+      expect(() => localTransferService.dispose()).not.toThrow()
+      expect(mockLogger.warn).toHaveBeenCalled()
+    })
+
+    it('should be safe to call multiple times', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      localTransferService.startDiscovery()
+
+      expect(() => {
+        localTransferService.dispose()
+        localTransferService.dispose()
+      }).not.toThrow()
+    })
+  })
+
+  describe('broadcastState', () => {
+    it('should not throw when main window is null', async () => {
+      mockMainWindow = null
+
+      const { localTransferService } = await import('../LocalTransferService')
+
+      // Should not throw
+      expect(() => localTransferService.startDiscovery()).not.toThrow()
+    })
+
+    it('should not throw when main window is destroyed', async () => {
+      mockMainWindow = {
+        isDestroyed: vi.fn(() => true),
+        webContents: { send: vi.fn() }
+      }
+
+      const { localTransferService } = await import('../LocalTransferService')
+
+      // Should not throw
+      expect(() => localTransferService.startDiscovery()).not.toThrow()
+      expect(mockMainWindow.webContents.send).not.toHaveBeenCalled()
+    })
+  })
+
+  describe('restartBrowser', () => {
+    it('should destroy old bonjour instance to prevent socket leaks', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      // First start
+      localTransferService.startDiscovery()
+      expect(mockBonjour.destroy).not.toHaveBeenCalled()
+
+      // Restart - should destroy old instance
+      localTransferService.startDiscovery()
+      expect(mockBonjour.destroy).toHaveBeenCalled()
+    })
+
+    it('should remove all listeners from old browser', async () => {
+      const { localTransferService } = await import('../LocalTransferService')
+
+      localTransferService.startDiscovery()
+      localTransferService.startDiscovery()
+
+      expect(mockBrowser.removeAllListeners).toHaveBeenCalled()
+    })
+  })
+})
diff --git a/src/main/services/__tests__/ServerLogBuffer.test.ts b/src/main/services/__tests__/ServerLogBuffer.test.ts
new file mode 100644
index 0000000000..0b7abe91e8
--- /dev/null
+++ b/src/main/services/__tests__/ServerLogBuffer.test.ts
@@ -0,0 +1,29 @@
+import { describe, expect, it } from 'vitest'
+
+import { ServerLogBuffer } from '../mcp/ServerLogBuffer'
+
+describe('ServerLogBuffer', () => {
+  it('keeps a bounded number of entries per server', () => {
+    const buffer = new ServerLogBuffer(3)
+    const key = 'srv'
+
+    buffer.append(key, { timestamp: 1, level: 'info', message: 'a' })
+    buffer.append(key, { timestamp: 2, level: 'info', message: 'b' })
+    buffer.append(key, { timestamp: 3, level: 'info', message: 'c' })
+    buffer.append(key, { timestamp: 4, level: 'info', message: 'd' })
+
+    const logs = buffer.get(key)
+    expect(logs).toHaveLength(3)
+    expect(logs[0].message).toBe('b')
+    expect(logs[2].message).toBe('d')
+  })
+
+  it('isolates entries by server key', () => {
+    const buffer = new ServerLogBuffer(5)
+    buffer.append('one', { timestamp: 1, level: 'info', message: 'a' })
+    buffer.append('two', { timestamp: 2, level: 'info', message: 'b' })
+
+    expect(buffer.get('one')).toHaveLength(1)
+    expect(buffer.get('two')).toHaveLength(1)
+  })
+})
diff --git a/src/main/services/agents/BaseService.ts b/src/main/services/agents/BaseService.ts
index 78bf72a952..e30814bb6f 100644
--- a/src/main/services/agents/BaseService.ts
+++ b/src/main/services/agents/BaseService.ts
@@ -2,6 +2,7 @@ import { loggerService } from '@logger'
 import { mcpApiService } from '@main/apiServer/services/mcp'
 import type { ModelValidationError } from '@main/apiServer/utils'
 import { validateModelId } from '@main/apiServer/utils'
+import { buildFunctionCallToolName } from '@main/utils/mcp'
 import type { AgentType, MCPTool, SlashCommand, Tool } from '@types'
 import { objectKeys } from '@types'
 import fs from 'fs'
@@ -14,6 +15,17 @@ import { builtinSlashCommands } from './services/claudecode/commands'
 import { builtinTools } from './services/claudecode/tools'
 
 const logger = loggerService.withContext('BaseService')
+const MCP_TOOL_ID_PREFIX = 'mcp__'
+const MCP_TOOL_LEGACY_PREFIX = 'mcp_'
+
+const buildMcpToolId = (serverId: string, toolName: string) => `${MCP_TOOL_ID_PREFIX}${serverId}__${toolName}`
+const toLegacyMcpToolId = (toolId: string) => {
+  if (!toolId.startsWith(MCP_TOOL_ID_PREFIX)) {
+    return null
+  }
+  const rawId = toolId.slice(MCP_TOOL_ID_PREFIX.length)
+  return `${MCP_TOOL_LEGACY_PREFIX}${rawId.replace(/__/g, '_')}`
+}
 
 /**
  * Base service class providing shared utilities for all agent-related services.
@@ -35,8 +47,12 @@ export abstract class BaseService {
     'slash_commands'
   ]
 
-  public async listMcpTools(agentType: AgentType, ids?: string[]): Promise<Tool[]> {
+  public async listMcpTools(
+    agentType: AgentType,
+    ids?: string[]
+  ): Promise<{ tools: Tool[]; legacyIdMap: Map<string, string> }> {
     const tools: Tool[] = []
+    const legacyIdMap = new Map<string, string>()
     if (agentType === 'claude-code') {
       tools.push(...builtinTools)
     }
@@ -46,13 +62,21 @@ export abstract class BaseService {
           const server = await mcpApiService.getServerInfo(id)
           if (server) {
             server.tools.forEach((tool: MCPTool) => {
+              const canonicalId = buildFunctionCallToolName(server.name, tool.name)
+              const serverIdBasedId = buildMcpToolId(id, tool.name)
+              const legacyId = toLegacyMcpToolId(serverIdBasedId)
+
               tools.push({
-                id: `mcp_${id}_${tool.name}`,
+                id: canonicalId,
                 name: tool.name,
                 type: 'mcp',
                 description: tool.description || '',
                 requirePermissions: true
               })
+              legacyIdMap.set(serverIdBasedId, canonicalId)
+              if (legacyId) {
+                legacyIdMap.set(legacyId, canonicalId)
+              }
             })
           }
         } catch (error) {
@@ -64,7 +88,53 @@ export abstract class BaseService {
       }
     }
 
-    return tools
+    return { tools, legacyIdMap }
+  }
+
+  /**
+   * Normalize MCP tool IDs in allowed_tools to the current format.
+   *
+   * Legacy formats:
+   * - "mcp__<serverId>__<toolName>" (double underscore separators, server ID based)
+   * - "mcp_<serverId>_<toolName>" (single underscore separators)
+   * Current format: "mcp__<serverName>__<toolName>" (double underscore separators).
+   *
+   * This keeps persisted data compatible without requiring a database migration.
+   */
+  protected normalizeAllowedTools(
+    allowedTools: string[] | undefined,
+    tools: Tool[],
+    legacyIdMap?: Map<string, string>
+  ): string[] | undefined {
+    if (!allowedTools || allowedTools.length === 0) {
+      return allowedTools
+    }
+
+    const resolvedLegacyIdMap = new Map<string, string>()
+
+    if (legacyIdMap) {
+      for (const [legacyId, canonicalId] of legacyIdMap) {
+        resolvedLegacyIdMap.set(legacyId, canonicalId)
+      }
+    }
+
+    for (const tool of tools) {
+      if (tool.type !== 'mcp') {
+        continue
+      }
+      const legacyId = toLegacyMcpToolId(tool.id)
+      if (!legacyId) {
+        continue
+      }
+      resolvedLegacyIdMap.set(legacyId, tool.id)
+    }
+
+    if (resolvedLegacyIdMap.size === 0) {
+      return allowedTools
+    }
+
+    const normalized = allowedTools.map((toolId) => resolvedLegacyIdMap.get(toolId) ?? toolId)
+    return Array.from(new Set(normalized))
   }
 
   public async listSlashCommands(agentType: AgentType): Promise<SlashCommand[]> {
@@ -78,7 +148,7 @@ export abstract class BaseService {
    * Get database instance
    * Automatically waits for initialization to complete
    */
-  protected async getDatabase() {
+  public async getDatabase() {
     const dbManager = await DatabaseManager.getInstance()
     return dbManager.getDatabase()
   }
diff --git a/src/main/services/agents/database/DatabaseManager.ts b/src/main/services/agents/database/DatabaseManager.ts
index f4b13971c7..913f9e4a66 100644
--- a/src/main/services/agents/database/DatabaseManager.ts
+++ b/src/main/services/agents/database/DatabaseManager.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { type Client, createClient } from '@libsql/client'
 import { loggerService } from '@logger'
 import type { LibSQLDatabase } from 'drizzle-orm/libsql'
diff --git a/src/main/services/agents/drizzle.config.ts b/src/main/services/agents/drizzle.config.ts
index e12518c069..7278883c11 100644
--- a/src/main/services/agents/drizzle.config.ts
+++ b/src/main/services/agents/drizzle.config.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 /**
  * Drizzle Kit configuration for agents database
  */
diff --git a/src/main/services/agents/services/AgentService.ts b/src/main/services/agents/services/AgentService.ts
index 2faa87bb45..7542c1935b 100644
--- a/src/main/services/agents/services/AgentService.ts
+++ b/src/main/services/agents/services/AgentService.ts
@@ -89,7 +89,9 @@ export class AgentService extends BaseService {
     }
 
     const agent = this.deserializeJsonFields(result[0]) as GetAgentResponse
-    agent.tools = await this.listMcpTools(agent.type, agent.mcps)
+    const { tools, legacyIdMap } = await this.listMcpTools(agent.type, agent.mcps)
+    agent.tools = tools
+    agent.allowed_tools = this.normalizeAllowedTools(agent.allowed_tools, agent.tools, legacyIdMap)
 
     // Load installed_plugins from cache file instead of database
     const workdir = agent.accessible_paths?.[0]
@@ -134,7 +136,9 @@ export class AgentService extends BaseService {
     const agents = result.map((row) => this.deserializeJsonFields(row)) as GetAgentResponse[]
 
     for (const agent of agents) {
-      agent.tools = await this.listMcpTools(agent.type, agent.mcps)
+      const { tools, legacyIdMap } = await this.listMcpTools(agent.type, agent.mcps)
+      agent.tools = tools
+      agent.allowed_tools = this.normalizeAllowedTools(agent.allowed_tools, agent.tools, legacyIdMap)
     }
 
     return { agents, total: totalResult[0].count }
diff --git a/src/main/services/agents/services/SessionService.ts b/src/main/services/agents/services/SessionService.ts
index d933ef8dd9..90b32bb31c 100644
--- a/src/main/services/agents/services/SessionService.ts
+++ b/src/main/services/agents/services/SessionService.ts
@@ -156,7 +156,9 @@ export class SessionService extends BaseService {
     }
 
     const session = this.deserializeJsonFields(result[0]) as GetAgentSessionResponse
-    session.tools = await this.listMcpTools(session.agent_type, session.mcps)
+    const { tools, legacyIdMap } = await this.listMcpTools(session.agent_type, session.mcps)
+    session.tools = tools
+    session.allowed_tools = this.normalizeAllowedTools(session.allowed_tools, session.tools, legacyIdMap)
 
     // If slash_commands is not in database yet (e.g., first invoke before init message),
     // fall back to builtin + local commands. Otherwise, use the merged commands from database.
@@ -202,6 +204,12 @@ export class SessionService extends BaseService {
 
     const sessions = result.map((row) => this.deserializeJsonFields(row)) as GetAgentSessionResponse[]
 
+    for (const session of sessions) {
+      const { tools, legacyIdMap } = await this.listMcpTools(session.agent_type, session.mcps)
+      session.tools = tools
+      session.allowed_tools = this.normalizeAllowedTools(session.allowed_tools, session.tools, legacyIdMap)
+    }
+
     return { sessions, total }
   }
 
diff --git a/src/main/services/agents/services/claudecode/index.ts b/src/main/services/agents/services/claudecode/index.ts
index e5cefadd68..69266f5a61 100644
--- a/src/main/services/agents/services/claudecode/index.ts
+++ b/src/main/services/agents/services/claudecode/index.ts
@@ -15,7 +15,10 @@ import { query } from '@anthropic-ai/claude-agent-sdk'
 import { loggerService } from '@logger'
 import { config as apiConfigService } from '@main/apiServer/config'
 import { validateModelId } from '@main/apiServer/utils'
+import { isWin } from '@main/constant'
+import { autoDiscoverGitBash } from '@main/utils/process'
 import getLoginShellEnvironment from '@main/utils/shell-env'
+import { withoutTrailingApiVersion } from '@shared/utils'
 import { app } from 'electron'
 
 import type { GetAgentSessionResponse } from '../..'
@@ -107,6 +110,16 @@ class ClaudeCodeService implements AgentServiceInterface {
       Object.entries(loginShellEnv).filter(([key]) => !key.toLowerCase().endsWith('_proxy'))
     ) as Record<string, string>
 
+    // Auto-discover Git Bash path on Windows (already logs internally)
+    const customGitBashPath = isWin ? autoDiscoverGitBash() : null
+
+    // Claude Agent SDK builds the final endpoint as `${ANTHROPIC_BASE_URL}/v1/messages`.
+    // To avoid malformed URLs like `/v1/v1/messages`, we normalize the provider host
+    // by stripping any trailing API version (e.g. `/v1`).
+    const anthropicBaseUrl = withoutTrailingApiVersion(
+      modelInfo.provider.anthropicApiHost?.trim() || modelInfo.provider.apiHost
+    )
+
     const env = {
       ...loginShellEnvWithoutProxies,
       // TODO: fix the proxy api server
@@ -115,7 +128,7 @@ class ClaudeCodeService implements AgentServiceInterface {
       // ANTHROPIC_BASE_URL: `http://${apiConfig.host}:${apiConfig.port}/${modelInfo.provider.id}`,
       ANTHROPIC_API_KEY: modelInfo.provider.apiKey,
       ANTHROPIC_AUTH_TOKEN: modelInfo.provider.apiKey,
-      ANTHROPIC_BASE_URL: modelInfo.provider.anthropicApiHost?.trim() || modelInfo.provider.apiHost,
+      ANTHROPIC_BASE_URL: anthropicBaseUrl,
       ANTHROPIC_MODEL: modelInfo.modelId,
       ANTHROPIC_DEFAULT_OPUS_MODEL: modelInfo.modelId,
       ANTHROPIC_DEFAULT_SONNET_MODEL: modelInfo.modelId,
@@ -126,7 +139,8 @@ class ClaudeCodeService implements AgentServiceInterface {
       // Set CLAUDE_CONFIG_DIR to app's userData directory to avoid path encoding issues
       // on Windows when the username contains non-ASCII characters (e.g., Chinese characters)
       // This prevents the SDK from using the user's home directory which may have encoding problems
-      CLAUDE_CONFIG_DIR: path.join(app.getPath('userData'), '.claude')
+      CLAUDE_CONFIG_DIR: path.join(app.getPath('userData'), '.claude'),
+      ...(customGitBashPath ? { CLAUDE_CODE_GIT_BASH_PATH: customGitBashPath } : {})
     }
 
     const errorChunks: string[] = []
diff --git a/src/main/services/agents/tests/BaseService.test.ts b/src/main/services/agents/tests/BaseService.test.ts
new file mode 100644
index 0000000000..fe2f4e103a
--- /dev/null
+++ b/src/main/services/agents/tests/BaseService.test.ts
@@ -0,0 +1,91 @@
+import type { Tool } from '@types'
+import { describe, expect, it, vi } from 'vitest'
+
+vi.mock('@main/apiServer/services/mcp', () => ({
+  mcpApiService: {
+    getServerInfo: vi.fn()
+  }
+}))
+
+vi.mock('@main/apiServer/utils', () => ({
+  validateModelId: vi.fn()
+}))
+
+import { BaseService } from '../BaseService'
+
+class TestBaseService extends BaseService {
+  public normalize(
+    allowedTools: string[] | undefined,
+    tools: Tool[],
+    legacyIdMap?: Map<string, string>
+  ): string[] | undefined {
+    return this.normalizeAllowedTools(allowedTools, tools, legacyIdMap)
+  }
+}
+
+const buildMcpTool = (id: string): Tool => ({
+  id,
+  name: id,
+  type: 'mcp',
+  description: 'test tool',
+  requirePermissions: true
+})
+
+describe('BaseService.normalizeAllowedTools', () => {
+  const service = new TestBaseService()
+
+  it('returns undefined or empty inputs unchanged', () => {
+    expect(service.normalize(undefined, [])).toBeUndefined()
+    expect(service.normalize([], [])).toEqual([])
+  })
+
+  it('normalizes legacy MCP tool IDs and deduplicates entries', () => {
+    const tools: Tool[] = [
+      buildMcpTool('mcp__server_one__tool_one'),
+      buildMcpTool('mcp__server_two__tool_two'),
+      { id: 'custom_tool', name: 'custom_tool', type: 'custom' }
+    ]
+
+    const legacyIdMap = new Map<string, string>([
+      ['mcp__server-1__tool-one', 'mcp__server_one__tool_one'],
+      ['mcp_server-1_tool-one', 'mcp__server_one__tool_one'],
+      ['mcp__server-2__tool-two', 'mcp__server_two__tool_two']
+    ])
+
+    const allowedTools = [
+      'mcp__server-1__tool-one',
+      'mcp_server-1_tool-one',
+      'mcp_server_one_tool_one',
+      'mcp__server_one__tool_one',
+      'custom_tool',
+      'mcp__server_two__tool_two',
+      'mcp_server_two_tool_two',
+      'mcp__server-2__tool-two'
+    ]
+
+    expect(service.normalize(allowedTools, tools, legacyIdMap)).toEqual([
+      'mcp__server_one__tool_one',
+      'custom_tool',
+      'mcp__server_two__tool_two'
+    ])
+  })
+
+  it('keeps legacy IDs when no matching MCP tool exists', () => {
+    const tools: Tool[] = [buildMcpTool('mcp__server_one__tool_one')]
+    const legacyIdMap = new Map<string, string>([['mcp__server-1__tool-one', 'mcp__server_one__tool_one']])
+
+    const allowedTools = ['mcp__unknown__tool', 'mcp__server_one__tool_one']
+
+    expect(service.normalize(allowedTools, tools, legacyIdMap)).toEqual([
+      'mcp__unknown__tool',
+      'mcp__server_one__tool_one'
+    ])
+  })
+
+  it('returns allowed tools unchanged when no MCP tools are available', () => {
+    const allowedTools = ['custom_tool', 'builtin_tool']
+    const tools: Tool[] = [{ id: 'custom_tool', name: 'custom_tool', type: 'custom' }]
+
+    expect(service.normalize(allowedTools, tools)).toEqual(allowedTools)
+  })
+})
diff --git a/src/main/services/lanTransfer/LanTransferClientService.ts b/src/main/services/lanTransfer/LanTransferClientService.ts
new file mode 100644
index 0000000000..a6da2f1a20
--- /dev/null
+++ b/src/main/services/lanTransfer/LanTransferClientService.ts
@@ -0,0 +1,525 @@
+import * as crypto from 'node:crypto'
+import { createConnection, type Socket } from 'node:net'
+
+import { loggerService } from '@logger'
+import type {
+  LanClientEvent,
+  LanFileCompleteMessage,
+  LanHandshakeAckMessage,
+  LocalTransferConnectPayload,
+  LocalTransferPeer
+} from '@shared/config/types'
+import { LAN_TRANSFER_GLOBAL_TIMEOUT_MS } from '@shared/config/types'
+import { IpcChannel } from '@shared/IpcChannel'
+
+import { localTransferService } from '../LocalTransferService'
+import { windowService } from '../WindowService'
+import {
+  abortTransfer,
+  buildHandshakeMessage,
+  calculateFileChecksum,
+  cleanupTransfer,
+  createDataHandler,
+  createTransferState,
+  formatFileSize,
+  HANDSHAKE_PROTOCOL_VERSION,
+  pickHost,
+  sendFileEnd,
+  sendFileStart,
+  sendTestPing,
+  streamFileChunks,
+  validateFile,
+  waitForFileComplete,
+  waitForFileStartAck
+} from './handlers'
+import { ResponseManager } from './responseManager'
+import type { ActiveFileTransfer, ConnectionContext, FileTransferContext } from './types'
+
+const DEFAULT_HANDSHAKE_TIMEOUT_MS = 10_000
+
+const logger = loggerService.withContext('LanTransferClientService')
+
+/**
+ * LAN Transfer Client Service
+ *
+ * Handles outgoing file transfers to LAN peers via TCP.
+ * Protocol v1 with streaming mode (no per-chunk acknowledgment).
+ */
+class LanTransferClientService {
+  private socket: Socket | null = null
+  private currentPeer?: LocalTransferPeer
+  private dataHandler?: ReturnType<typeof createDataHandler>
+  private responseManager = new ResponseManager()
+  private isConnecting = false
+  private activeTransfer?: ActiveFileTransfer
+  private lastConnectOptions?: LocalTransferConnectPayload
+  private consecutiveJsonErrors = 0
+  private static readonly MAX_CONSECUTIVE_JSON_ERRORS = 3
+  private reconnectPromise: Promise<void> | null = null
+
+  constructor() {
+    this.responseManager.setTimeoutCallback(() => void this.disconnect())
+  }
+
+  /**
+   * Connect to a LAN peer and perform handshake.
+   */
+  public async connectAndHandshake(options: LocalTransferConnectPayload): Promise<LanHandshakeAckMessage> {
+    if (this.isConnecting) {
+      throw new Error('LAN transfer client is busy')
+    }
+
+    const peer = localTransferService.getPeerById(options.peerId)
+    if (!peer) {
+      throw new Error('Selected LAN peer is no longer available')
+    }
+    if (!peer.port) {
+      throw new Error('Selected peer does not expose a TCP port')
+    }
+
+    const host = pickHost(peer)
+    if (!host) {
+      throw new Error('Unable to resolve a reachable host for the peer')
+    }
+
+    await this.disconnect()
+    this.isConnecting = true
+
+    return new Promise<LanHandshakeAckMessage>((resolve, reject) => {
+      const socket = createConnection({ host, port: peer.port as number }, () => {
+        logger.info(`Connected to LAN peer ${peer.name} (${host}:${peer.port})`)
+        socket.setKeepAlive(true, 30_000)
+        this.socket = socket
+        this.currentPeer = peer
+        this.attachSocketListeners(socket)
+
+        this.responseManager.waitForResponse(
+          'handshake_ack',
+          options.timeoutMs ?? DEFAULT_HANDSHAKE_TIMEOUT_MS,
+          (payload) => {
+            const ack = payload as LanHandshakeAckMessage
+            if (!ack.accepted) {
+              const message = ack.message || 'Handshake rejected by remote device'
+              logger.warn(`Handshake rejected by ${peer.name}: ${message}`)
+              this.broadcastClientEvent({
+                type: 'error',
+                message,
+                timestamp: Date.now()
+              })
+              reject(new Error(message))
+              void this.disconnect()
+              return
+            }
+            logger.info(`Handshake accepted by ${peer.name}`)
+            socket.setTimeout(0)
+            this.isConnecting = false
+            this.lastConnectOptions = options
+            sendTestPing(this.createConnectionContext())
+            resolve(ack)
+          },
+          (error) => {
+            this.isConnecting = false
+            reject(error)
+          }
+        )
+
+        const handshakeMessage = buildHandshakeMessage()
+        this.sendControlMessage(handshakeMessage)
+      })
+
+      socket.setTimeout(options.timeoutMs ?? DEFAULT_HANDSHAKE_TIMEOUT_MS, () => {
+        const error = new Error('Handshake timed out')
+        logger.error('LAN transfer socket timeout', error)
+        this.broadcastClientEvent({
+          type: 'error',
+          message: error.message,
+          timestamp: Date.now()
+        })
+        reject(error)
+        socket.destroy(error)
+        void this.disconnect()
+      })
+
+      socket.once('error', (error) => {
+        logger.error('LAN transfer socket error', error as Error)
+        const message = error instanceof Error ? error.message : String(error)
+        this.broadcastClientEvent({
+          type: 'error',
+          message,
+          timestamp: Date.now()
+        })
+        this.isConnecting = false
+        reject(error instanceof Error ? error : new Error(message))
+        void this.disconnect()
+      })
+
+      socket.once('close', () => {
+        logger.info('LAN transfer socket closed')
+        if (this.socket === socket) {
+          this.socket = null
+          this.dataHandler?.resetBuffer()
+          this.responseManager.rejectAll(new Error('LAN transfer socket closed'))
+          this.currentPeer = undefined
+          abortTransfer(this.activeTransfer, new Error('LAN transfer socket closed'))
+        }
+        this.isConnecting = false
+        this.broadcastClientEvent({
+          type: 'socket_closed',
+          reason: 'connection_closed',
+          timestamp: Date.now()
+        })
+      })
+    })
+  }
+
+  /**
+   * Disconnect from the current peer.
+   */
+  public async disconnect(): Promise<void> {
+    const socket = this.socket
+    if (!socket) {
+      return
+    }
+
+    this.socket = null
+    this.dataHandler?.resetBuffer()
+    this.currentPeer = undefined
+    this.responseManager.rejectAll(new Error('LAN transfer socket disconnected'))
+    abortTransfer(this.activeTransfer, new Error('LAN transfer socket disconnected'))
+
+    const DISCONNECT_TIMEOUT_MS = 3000
+    await new Promise<void>((resolve) => {
+      const timeout = setTimeout(() => {
+        logger.warn('Disconnect timeout, forcing cleanup')
+        socket.removeAllListeners()
+        resolve()
+      }, DISCONNECT_TIMEOUT_MS)
+
+      socket.once('close', () => {
+        clearTimeout(timeout)
+        resolve()
+      })
+
+      socket.destroy()
+    })
+  }
+
+  /**
+   * Dispose the service and clean up all resources.
+   */
+  public dispose(): void {
+    this.responseManager.rejectAll(new Error('LAN transfer client disposed'))
+    cleanupTransfer(this.activeTransfer)
+    this.activeTransfer = undefined
+    if (this.socket) {
+      this.socket.destroy()
+      this.socket = null
+    }
+    this.dataHandler?.resetBuffer()
+    this.isConnecting = false
+  }
+
+  /**
+   * Send a ZIP file to the connected peer.
+   */
+  public async sendFile(filePath: string): Promise<LanFileCompleteMessage> {
+    await this.ensureConnection()
+
+    if (this.activeTransfer) {
+      throw new Error('A file transfer is already in progress')
+    }
+
+    // Validate file
+    const { stats, fileName } = await validateFile(filePath)
+
+    // Calculate checksum
+    logger.info('Calculating file checksum...')
+    const checksum = await calculateFileChecksum(filePath)
+    logger.info(`File checksum: ${checksum.substring(0, 16)}...`)
+
+    // Connection can drop while validating/checking file; ensure it is still ready before starting transfer.
+    await this.ensureConnection()
+
+    // Initialize transfer state
+    const transferId = crypto.randomUUID()
+    this.activeTransfer = createTransferState(transferId, fileName, stats.size, checksum)
+
+    logger.info(
+      `Starting file transfer: ${fileName} (${formatFileSize(stats.size)}, ${this.activeTransfer.totalChunks} chunks)`
+    )
+
+    // Global timeout
+    const globalTimeoutError = new Error('Transfer timed out (global timeout exceeded)')
+    const globalTimeoutHandle = setTimeout(() => {
+      logger.warn('Global transfer timeout exceeded, aborting transfer', { transferId, fileName })
+      abortTransfer(this.activeTransfer, globalTimeoutError)
+    }, LAN_TRANSFER_GLOBAL_TIMEOUT_MS)
+
+    try {
+      const result = await this.performFileTransfer(filePath, transferId, fileName)
+      return result
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error)
+      logger.error(`File transfer failed: ${message}`)
+
+      this.broadcastClientEvent({
+        type: 'file_transfer_complete',
+        transferId,
+        fileName,
+        success: false,
+        error: message,
+        timestamp: Date.now()
+      })
+
+      throw error
+    } finally {
+      clearTimeout(globalTimeoutHandle)
+      cleanupTransfer(this.activeTransfer)
+      this.activeTransfer = undefined
+    }
+  }
+
+  /**
+   * Cancel the current file transfer.
+   */
+  public cancelTransfer(): void {
+    if (!this.activeTransfer) {
+      logger.warn('No active transfer to cancel')
+      return
+    }
+
+    const { transferId, fileName } = this.activeTransfer
+    logger.info(`Cancelling file transfer: ${fileName}`)
+
+    this.activeTransfer.isCancelled = true
+
+    try {
+      this.sendControlMessage({
+        type: 'file_cancel',
+        transferId,
+        reason: 'Cancelled by user'
+      })
+    } catch (error) {
+      // Expected when connection is already broken
+      logger.warn('Failed to send cancel message', error as Error)
+    }
+
+    abortTransfer(this.activeTransfer, new Error('Transfer cancelled by user'))
+  }
+
+  // =============================================================================
+  // Private Methods
+  // =============================================================================
+
+  private async ensureConnection(): Promise<void> {
+    // Check socket is valid and writable (not just undestroyed)
+    if (this.socket && !this.socket.destroyed && this.socket.writable && this.currentPeer) {
+      return
+    }
+
+    if (!this.lastConnectOptions) {
+      throw new Error('No active connection. Please connect to a peer first.')
+    }
+
+    // Prevent concurrent reconnection attempts
+    if (this.reconnectPromise) {
+      logger.debug('Waiting for existing reconnection attempt...')
+      await this.reconnectPromise
+      return
+    }
+
+    logger.info('Connection lost, attempting to reconnect...')
+    this.reconnectPromise = this.connectAndHandshake(this.lastConnectOptions)
+      .then(() => {
+        // Handshake succeeded, connection restored
+      })
+      .finally(() => {
+        this.reconnectPromise = null
+      })
+
+    await this.reconnectPromise
+  }
+
+  private async performFileTransfer(
+    filePath: string,
+    transferId: string,
+    fileName: string
+  ): Promise<LanFileCompleteMessage> {
+    const transfer = this.activeTransfer!
+    const ctx = this.createFileTransferContext()
+
+    // Step 1: Send file_start
+    sendFileStart(ctx, transfer)
+
+    // Step 2: Wait for file_start_ack
+    const startAck = await waitForFileStartAck(ctx, transferId, transfer.abortController.signal)
+    if (!startAck.accepted) {
+      throw new Error(startAck.message || 'Transfer rejected by receiver')
+    }
+    logger.info('Received file_start_ack: accepted')
+
+    // Step 3: Stream file chunks
+    await streamFileChunks(this.socket!, filePath, transfer, transfer.abortController.signal, (bytesSent, chunkIndex) =>
+      this.onTransferProgress(transfer, bytesSent, chunkIndex)
+    )
+
+    // Step 4: Send file_end
+    sendFileEnd(ctx, transferId)
+
+    // Step 5: Wait for file_complete
+    const result = await waitForFileComplete(ctx, transferId, transfer.abortController.signal)
+    logger.info(`File transfer ${result.success ? 'completed' : 'failed'}`)
+
+    // Broadcast completion
+    this.broadcastClientEvent({
+      type: 'file_transfer_complete',
+      transferId,
+      fileName,
+      success: result.success,
+      filePath: result.filePath,
+      error: result.error,
+      timestamp: Date.now()
+    })
+
+    return result
+  }
+
+  private onTransferProgress(transfer: ActiveFileTransfer, bytesSent: number, chunkIndex: number): void {
+    const progress = (bytesSent / transfer.fileSize) * 100
+    const elapsed = (Date.now() - transfer.startedAt) / 1000
+    const speed = elapsed > 0 ? bytesSent / elapsed : 0
+
+    this.broadcastClientEvent({
+      type: 'file_transfer_progress',
+      transferId: transfer.transferId,
+      fileName: transfer.fileName,
+      bytesSent,
+      totalBytes: transfer.fileSize,
+      chunkIndex,
+      totalChunks: transfer.totalChunks,
+      progress: Math.round(progress * 100) / 100,
+      speed,
+      timestamp: Date.now()
+    })
+  }
+
+  private attachSocketListeners(socket: Socket): void {
+    this.dataHandler = createDataHandler((line) => this.handleControlLine(line))
+    socket.on('data', (chunk: Buffer) => {
+      try {
+        this.dataHandler?.handleData(chunk)
+      } catch (error) {
+        logger.error('Data handler error', error as Error)
+        void this.disconnect()
+      }
+    })
+  }
+
+  private handleControlLine(line: string): void {
+    let payload: Record<string, unknown>
+    try {
+      payload = JSON.parse(line)
+      this.consecutiveJsonErrors = 0 // Reset on successful parse
+    } catch {
+      this.consecutiveJsonErrors++
+      logger.warn('Received invalid JSON control message', { line, consecutiveErrors: this.consecutiveJsonErrors })
+
+      if (this.consecutiveJsonErrors >= LanTransferClientService.MAX_CONSECUTIVE_JSON_ERRORS) {
+        const message = `Protocol error: ${this.consecutiveJsonErrors} consecutive invalid messages, disconnecting`
+        logger.error(message)
+        this.broadcastClientEvent({
+          type: 'error',
+          message,
+          timestamp: Date.now()
+        })
+        void this.disconnect()
+      }
+      return
+    }
+
+    const type = payload?.type as string | undefined
+    if (!type) {
+      logger.warn('Received control message without type', payload)
+      return
+    }
+
+    // Try to resolve a pending response
+    const transferId = payload?.transferId as string | undefined
+    const chunkIndex = payload?.chunkIndex as number | undefined
+    if (this.responseManager.tryResolve(type, payload, transferId, chunkIndex)) {
+      return
+    }
+
+    logger.info('Received control message', payload)
+
+    if (type === 'pong') {
+      this.broadcastClientEvent({
+        type: 'pong',
+        payload: payload?.payload as string | undefined,
+        received: payload?.received as boolean | undefined,
+        timestamp: Date.now()
+      })
+      return
+    }
+
+    // Ignore late-arriving file transfer messages
+    const fileTransferMessageTypes = ['file_start_ack', 'file_complete']
+    if (fileTransferMessageTypes.includes(type)) {
+      logger.debug('Ignoring late file transfer message', { type, payload })
+      return
+    }
+
+    this.broadcastClientEvent({
+      type: 'error',
+      message: `Unexpected control message type: ${type}`,
+      timestamp: Date.now()
+    })
+  }
+
+  private sendControlMessage(message: Record<string, unknown>): void {
+    if (!this.socket || this.socket.destroyed || !this.socket.writable) {
+      throw new Error('Socket is not connected')
+    }
+    const payload = JSON.stringify(message)
+    this.socket.write(`${payload}\n`)
+  }
+
+  private createConnectionContext(): ConnectionContext {
+    return {
+      socket: this.socket,
+      currentPeer: this.currentPeer,
+      sendControlMessage: (msg) => this.sendControlMessage(msg),
+      broadcastClientEvent: (event) => this.broadcastClientEvent(event)
+    }
+  }
+
+  private createFileTransferContext(): FileTransferContext {
+    return {
+      ...this.createConnectionContext(),
+      activeTransfer: this.activeTransfer,
+      setActiveTransfer: (transfer) => {
+        this.activeTransfer = transfer
+      },
+      waitForResponse: (type, timeoutMs, resolve, reject, transferId, chunkIndex, abortSignal) => {
+        this.responseManager.waitForResponse(type, timeoutMs, resolve, reject, transferId, chunkIndex, abortSignal)
+      }
+    }
+  }
+
+  private broadcastClientEvent(event: LanClientEvent): void {
+    const mainWindow = windowService.getMainWindow()
+    if (!mainWindow || mainWindow.isDestroyed()) {
+      return
+    }
+    mainWindow.webContents.send(IpcChannel.LocalTransfer_ClientEvent, {
+      ...event,
+      peerId: event.peerId ?? this.currentPeer?.id,
+      peerName: event.peerName ?? this.currentPeer?.name
+    })
+  }
+}
+
+export const lanTransferClientService = new LanTransferClientService()
+
+// Re-export for backward compatibility
+export { HANDSHAKE_PROTOCOL_VERSION }
diff --git a/src/main/services/lanTransfer/__tests__/LanTransferClientService.test.ts b/src/main/services/lanTransfer/__tests__/LanTransferClientService.test.ts
new file mode 100644
index 0000000000..16f188aa93
--- /dev/null
+++ b/src/main/services/lanTransfer/__tests__/LanTransferClientService.test.ts
@@ -0,0 +1,133 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+// Mock dependencies before importing the service
+vi.mock('node:net', async (importOriginal) => {
+  const actual = (await importOriginal()) as Record<string, unknown>
+  return {
+    ...actual,
+    createConnection: vi.fn()
+  }
+})
+
+vi.mock('electron', () => ({
+  app: {
+    getName: vi.fn(() => 'Cherry Studio'),
+    getVersion: vi.fn(() => '1.0.0')
+  }
+}))
+
+vi.mock('../../LocalTransferService', () => ({
+  localTransferService: {
+    getPeerById: vi.fn()
+  }
+}))
+
+vi.mock('../../WindowService', () => ({
+  windowService: {
+    getMainWindow: vi.fn(() => ({
+      isDestroyed: () => false,
+      webContents: {
+        send: vi.fn()
+      }
+    }))
+  }
+}))
+
+// Import after mocks
+import { localTransferService } from '../../LocalTransferService'
+
+describe('LanTransferClientService', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    vi.resetModules()
+  })
+
+  afterEach(() => {
+    vi.resetAllMocks()
+  })
+
+  describe('connectAndHandshake - validation', () => {
+    it('should throw error when peer is not found', async () => {
+      vi.mocked(localTransferService.getPeerById).mockReturnValue(undefined)
+
+      const { lanTransferClientService } = await import('../LanTransferClientService')
+
+      await expect(
+        lanTransferClientService.connectAndHandshake({
+          peerId: 'non-existent'
+        })
+      ).rejects.toThrow('Selected LAN peer is no longer available')
+    })
+
+    it('should throw error when peer has no port', async () => {
+      vi.mocked(localTransferService.getPeerById).mockReturnValue({
+        id: 'test-peer',
+        name: 'Test Peer',
+        addresses: ['192.168.1.100'],
+        updatedAt: Date.now()
+      })
+
+      const { lanTransferClientService } = await import('../LanTransferClientService')
+
+      await expect(
+        lanTransferClientService.connectAndHandshake({
+          peerId: 'test-peer'
+        })
+      ).rejects.toThrow('Selected peer does not expose a TCP port')
+    })
+
+    it('should throw error when no reachable host', async () => {
+      vi.mocked(localTransferService.getPeerById).mockReturnValue({
+        id: 'test-peer',
+        name: 'Test Peer',
+        port: 12345,
+        addresses: [],
+        updatedAt: Date.now()
+      })
+
+      const { lanTransferClientService } = await import('../LanTransferClientService')
+
+      await expect(
+        lanTransferClientService.connectAndHandshake({
+          peerId: 'test-peer'
+        })
+      ).rejects.toThrow('Unable to resolve a reachable host for the peer')
+    })
+  })
+
+  describe('cancelTransfer', () => {
+    it('should not throw when no active transfer', async () => {
+      const { lanTransferClientService } = await import('../LanTransferClientService')
+
+      // Should not throw, just log warning
+      expect(() => lanTransferClientService.cancelTransfer()).not.toThrow()
+    })
+  })
+
+  describe('dispose', () => {
+    it('should clean up resources without throwing', async () => {
+      const { lanTransferClientService } = await import('../LanTransferClientService')
+
+      // Should not throw
+      expect(() => lanTransferClientService.dispose()).not.toThrow()
+    })
+  })
+
+  describe('sendFile', () => {
+    it('should throw error when not connected', async () => {
+      const { lanTransferClientService } = await import('../LanTransferClientService')
+
+      await expect(lanTransferClientService.sendFile('/path/to/file.zip')).rejects.toThrow(
+        'No active connection. Please connect to a peer first.'
+      )
+    })
+  })
+
+  describe('HANDSHAKE_PROTOCOL_VERSION', () => {
+    it('should export protocol version', async () => {
+      const { HANDSHAKE_PROTOCOL_VERSION } = await import('../LanTransferClientService')
+
+      expect(HANDSHAKE_PROTOCOL_VERSION).toBe('1')
+    })
+  })
+})
diff --git a/src/main/services/lanTransfer/__tests__/binaryProtocol.test.ts b/src/main/services/lanTransfer/__tests__/binaryProtocol.test.ts
new file mode 100644
index 0000000000..c485a33098
--- /dev/null
+++ b/src/main/services/lanTransfer/__tests__/binaryProtocol.test.ts
@@ -0,0 +1,103 @@
+import { EventEmitter } from 'node:events'
+import type { Socket } from 'node:net'
+
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { BINARY_TYPE_FILE_CHUNK, sendBinaryChunk } from '../binaryProtocol'
+
+describe('binaryProtocol', () => {
+  describe('sendBinaryChunk', () => {
+    let mockSocket: Socket
+    let writtenBuffers: Buffer[]
+
+    beforeEach(() => {
+      writtenBuffers = []
+      mockSocket = Object.assign(new EventEmitter(), {
+        destroyed: false,
+        writable: true,
+        write: vi.fn((buffer: Buffer) => {
+          writtenBuffers.push(Buffer.from(buffer))
+          return true
+        }),
+        cork: vi.fn(),
+        uncork: vi.fn()
+      }) as unknown as Socket
+    })
+
+    it('should send binary chunk with correct frame format', () => {
+      const transferId = 'test-uuid-1234'
+      const chunkIndex = 5
+      const data = Buffer.from('test data chunk')
+
+      const result = sendBinaryChunk(mockSocket, transferId, chunkIndex, data)
+
+      expect(result).toBe(true)
+      expect(mockSocket.cork).toHaveBeenCalled()
+      expect(mockSocket.uncork).toHaveBeenCalled()
+      expect(mockSocket.write).toHaveBeenCalledTimes(2)
+
+      // Verify header structure
+      const header = writtenBuffers[0]
+
+      // Magic bytes "CS"
+      expect(header[0]).toBe(0x43)
+      expect(header[1]).toBe(0x53)
+
+      // Type byte
+      const typeOffset = 2 + 4 // magic + totalLen
+      expect(header[typeOffset]).toBe(BINARY_TYPE_FILE_CHUNK)
+
+      // TransferId length
+      const tidLenOffset = typeOffset + 1
+      const tidLen = header.readUInt16BE(tidLenOffset)
+      expect(tidLen).toBe(Buffer.from(transferId).length)
+
+      // ChunkIndex
+      const chunkIdxOffset = tidLenOffset + 2 + tidLen
+      expect(header.readUInt32BE(chunkIdxOffset)).toBe(chunkIndex)
+
+      // Data buffer
+      expect(writtenBuffers[1].toString()).toBe('test data chunk')
+    })
+
+    it('should return false when socket write returns false (backpressure)', () => {
+      ;(mockSocket.write as ReturnType<typeof vi.fn>).mockReturnValueOnce(false)
+
+      const result = sendBinaryChunk(mockSocket, 'test-id', 0, Buffer.from('data'))
+
+      expect(result).toBe(false)
+    })
+
+    it('should correctly calculate totalLen in frame header', () => {
+      const transferId = 'uuid-1234'
+      const data = Buffer.from('chunk data here')
+
+      sendBinaryChunk(mockSocket, transferId, 0, data)
+
+      const header = writtenBuffers[0]
+      const totalLen = header.readUInt32BE(2) // After magic bytes
+
+      // totalLen = type(1) + tidLen(2) + tid(n) + idx(4) + data(m)
+      const expectedTotalLen = 1 + 2 + Buffer.from(transferId).length + 4 + data.length
+      expect(totalLen).toBe(expectedTotalLen)
+    })
+
+    it('should throw error when socket is not writable', () => {
+      ;(mockSocket as any).writable = false
+
+      expect(() => sendBinaryChunk(mockSocket, 'test-id', 0, Buffer.from('data'))).toThrow('Socket is not writable')
+    })
+
+    it('should throw error when socket is destroyed', () => {
+      ;(mockSocket as any).destroyed = true
+
+      expect(() => sendBinaryChunk(mockSocket, 'test-id', 0, Buffer.from('data'))).toThrow('Socket is not writable')
+    })
+  })
+
+  describe('BINARY_TYPE_FILE_CHUNK', () => {
+    it('should be 0x01', () => {
+      expect(BINARY_TYPE_FILE_CHUNK).toBe(0x01)
+    })
+  })
+})
diff --git a/src/main/services/lanTransfer/__tests__/handlers/connection.test.ts b/src/main/services/lanTransfer/__tests__/handlers/connection.test.ts
new file mode 100644
index 0000000000..3983e538d3
--- /dev/null
+++ b/src/main/services/lanTransfer/__tests__/handlers/connection.test.ts
@@ -0,0 +1,265 @@
+import { EventEmitter } from 'node:events'
+import type { Socket } from 'node:net'
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import {
+  buildHandshakeMessage,
+  createDataHandler,
+  getAbortError,
+  HANDSHAKE_PROTOCOL_VERSION,
+  pickHost,
+  waitForSocketDrain
+} from '../../handlers/connection'
+
+// Mock electron app
+vi.mock('electron', () => ({
+  app: {
+    getName: vi.fn(() => 'Cherry Studio'),
+    getVersion: vi.fn(() => '1.0.0')
+  }
+}))
+
+describe('connection handlers', () => {
+  describe('buildHandshakeMessage', () => {
+    it('should build handshake message with correct structure', () => {
+      const message = buildHandshakeMessage()
+
+      expect(message.type).toBe('handshake')
+      expect(message.deviceName).toBe('Cherry Studio')
+      expect(message.version).toBe(HANDSHAKE_PROTOCOL_VERSION)
+      expect(message.appVersion).toBe('1.0.0')
+      expect(typeof message.platform).toBe('string')
+    })
+
+    it('should use protocol version 1', () => {
+      expect(HANDSHAKE_PROTOCOL_VERSION).toBe('1')
+    })
+  })
+
+  describe('pickHost', () => {
+    it('should prefer IPv4 addresses', () => {
+      const peer = {
+        id: '1',
+        name: 'Test',
+        addresses: ['fe80::1', '192.168.1.100', '::1'],
+        updatedAt: Date.now()
+      }
+
+      expect(pickHost(peer)).toBe('192.168.1.100')
+    })
+
+    it('should fall back to first address if no IPv4', () => {
+      const peer = {
+        id: '1',
+        name: 'Test',
+        addresses: ['fe80::1', '::1'],
+        updatedAt: Date.now()
+      }
+
+      expect(pickHost(peer)).toBe('fe80::1')
+    })
+
+    it('should fall back to host property if no addresses', () => {
+      const peer = {
+        id: '1',
+        name: 'Test',
+        host: 'example.local',
+        addresses: [],
+        updatedAt: Date.now()
+      }
+
+      expect(pickHost(peer)).toBe('example.local')
+    })
+
+    it('should return undefined if no addresses or host', () => {
+      const peer = {
+        id: '1',
+        name: 'Test',
+        addresses: [],
+        updatedAt: Date.now()
+      }
+
+      expect(pickHost(peer)).toBeUndefined()
+    })
+  })
+
+  describe('createDataHandler', () => {
+    it('should parse complete lines from buffer', () => {
+      const lines: string[] = []
+      const handler = createDataHandler((line) => lines.push(line))
+
+      handler.handleData(Buffer.from('{"type":"test"}\n'))
+
+      expect(lines).toEqual(['{"type":"test"}'])
+    })
+
+    it('should handle partial lines across multiple chunks', () => {
+      const lines: string[] = []
+      const handler = createDataHandler((line) => lines.push(line))
+
+      handler.handleData(Buffer.from('{"type":'))
+      handler.handleData(Buffer.from('"test"}\n'))
+
+      expect(lines).toEqual(['{"type":"test"}'])
+    })
+
+    it('should handle multiple lines in single chunk', () => {
+      const lines: string[] = []
+      const handler = createDataHandler((line) => lines.push(line))
+
+      handler.handleData(Buffer.from('{"a":1}\n{"b":2}\n'))
+
+      expect(lines).toEqual(['{"a":1}', '{"b":2}'])
+    })
+
+    it('should reset buffer', () => {
+      const lines: string[] = []
+      const handler = createDataHandler((line) => lines.push(line))
+
+      handler.handleData(Buffer.from('partial'))
+      handler.resetBuffer()
+      handler.handleData(Buffer.from('{"complete":true}\n'))
+
+      expect(lines).toEqual(['{"complete":true}'])
+    })
+
+    it('should trim whitespace from lines', () => {
+      const lines: string[] = []
+      const handler = createDataHandler((line) => lines.push(line))
+
+      handler.handleData(Buffer.from('  {"type":"test"}  \n'))
+
+      expect(lines).toEqual(['{"type":"test"}'])
+    })
+
+    it('should skip empty lines', () => {
+      const lines: string[] = []
+      const handler = createDataHandler((line) => lines.push(line))
+
+      handler.handleData(Buffer.from('\n\n{"type":"test"}\n\n'))
+
+      expect(lines).toEqual(['{"type":"test"}'])
+    })
+
+    it('should throw error when buffer exceeds MAX_LINE_BUFFER_SIZE', () => {
+      const handler = createDataHandler(vi.fn())
+
+      // Create a buffer larger than 1MB (MAX_LINE_BUFFER_SIZE)
+      const largeData = 'x'.repeat(1024 * 1024 + 1)
+
+      expect(() => handler.handleData(Buffer.from(largeData))).toThrow('Control message too large')
+    })
+
+    it('should reset buffer after exceeding MAX_LINE_BUFFER_SIZE', () => {
+      const lines: string[] = []
+      const handler = createDataHandler((line) => lines.push(line))
+
+      // Create a buffer larger than 1MB
+      const largeData = 'x'.repeat(1024 * 1024 + 1)
+
+      try {
+        handler.handleData(Buffer.from(largeData))
+      } catch {
+        // Expected error
+      }
+
+      // Buffer should be reset, so lineBuffer should be empty
+      expect(handler.lineBuffer).toBe('')
+    })
+  })
+
+  describe('waitForSocketDrain', () => {
+    let mockSocket: Socket & EventEmitter
+
+    beforeEach(() => {
+      mockSocket = Object.assign(new EventEmitter(), {
+        destroyed: false,
+        writable: true,
+        write: vi.fn(),
+        off: vi.fn(),
+        removeAllListeners: vi.fn()
+      }) as unknown as Socket & EventEmitter
+    })
+
+    afterEach(() => {
+      vi.resetAllMocks()
+    })
+
+    it('should throw error when abort signal is already aborted', async () => {
+      const abortController = new AbortController()
+      abortController.abort(new Error('Already aborted'))
+
+      await expect(waitForSocketDrain(mockSocket, abortController.signal)).rejects.toThrow('Already aborted')
+    })
+
+    it('should throw error when socket is destroyed', async () => {
+      ;(mockSocket as any).destroyed = true
+      const abortController = new AbortController()
+
+      await expect(waitForSocketDrain(mockSocket, abortController.signal)).rejects.toThrow('Socket is closed')
+    })
+
+    it('should resolve when drain event is emitted', async () => {
+      const abortController = new AbortController()
+
+      const drainPromise = waitForSocketDrain(mockSocket, abortController.signal)
+
+      // Emit drain event after a short delay
+      setImmediate(() => mockSocket.emit('drain'))
+
+      await expect(drainPromise).resolves.toBeUndefined()
+    })
+
+    it('should reject when close event is emitted', async () => {
+      const abortController = new AbortController()
+
+      const drainPromise = waitForSocketDrain(mockSocket, abortController.signal)
+
+      setImmediate(() => mockSocket.emit('close'))
+
+      await expect(drainPromise).rejects.toThrow('Socket closed while waiting for drain')
+    })
+
+    it('should reject when error event is emitted', async () => {
+      const abortController = new AbortController()
+
+      const drainPromise = waitForSocketDrain(mockSocket, abortController.signal)
+
+      setImmediate(() => mockSocket.emit('error', new Error('Network error')))
+
+      await expect(drainPromise).rejects.toThrow('Network error')
+    })
+
+    it('should reject when abort signal is triggered', async () => {
+      const abortController = new AbortController()
+
+      const drainPromise = waitForSocketDrain(mockSocket, abortController.signal)
+
+      setImmediate(() => abortController.abort(new Error('User cancelled')))
+
+      await expect(drainPromise).rejects.toThrow('User cancelled')
+    })
+  })
+
+  describe('getAbortError', () => {
+    it('should return Error reason directly', () => {
+      const originalError = new Error('Original')
+      const signal = { aborted: true, reason: originalError } as AbortSignal
+
+      expect(getAbortError(signal, 'Fallback')).toBe(originalError)
+    })
+
+    it('should create Error from string reason', () => {
+      const signal = { aborted: true, reason: 'String reason' } as AbortSignal
+
+      expect(getAbortError(signal, 'Fallback').message).toBe('String reason')
+    })
+
+    it('should use fallback for empty reason', () => {
+      const signal = { aborted: true, reason: '' } as AbortSignal
+
+      expect(getAbortError(signal, 'Fallback').message).toBe('Fallback')
+    })
+  })
+})
diff --git a/src/main/services/lanTransfer/__tests__/handlers/fileTransfer.test.ts b/src/main/services/lanTransfer/__tests__/handlers/fileTransfer.test.ts
new file mode 100644
index 0000000000..814fd2f5c9
--- /dev/null
+++ b/src/main/services/lanTransfer/__tests__/handlers/fileTransfer.test.ts
@@ -0,0 +1,216 @@
+import { EventEmitter } from 'node:events'
+import type * as fs from 'node:fs'
+import type { Socket } from 'node:net'
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import {
+  abortTransfer,
+  cleanupTransfer,
+  createTransferState,
+  formatFileSize,
+  streamFileChunks
+} from '../../handlers/fileTransfer'
+import type { ActiveFileTransfer } from '../../types'
+
+// Mock binaryProtocol
+vi.mock('../../binaryProtocol', () => ({
+  sendBinaryChunk: vi.fn().mockReturnValue(true)
+}))
+
+// Mock connection handlers
+vi.mock('./connection', () => ({
+  waitForSocketDrain: vi.fn().mockResolvedValue(undefined),
+  getAbortError: vi.fn((signal, fallback) => {
+    const reason = (signal as AbortSignal & { reason?: unknown }).reason
+    if (reason instanceof Error) return reason
+    if (typeof reason === 'string' && reason.length > 0) return new Error(reason)
+    return new Error(fallback)
+  })
+}))
+
+// Note: validateFile and calculateFileChecksum tests are skipped because
+// the test environment has globally mocked node:fs and node:os modules.
+// These functions are tested through integration tests instead.
+
+describe('fileTransfer handlers', () => {
+  describe('createTransferState', () => {
+    it('should create transfer state with correct defaults', () => {
+      const state = createTransferState('uuid-123', 'test.zip', 1024000, 'abc123')
+
+      expect(state.transferId).toBe('uuid-123')
+      expect(state.fileName).toBe('test.zip')
+      expect(state.fileSize).toBe(1024000)
+      expect(state.checksum).toBe('abc123')
+      expect(state.bytesSent).toBe(0)
+      expect(state.currentChunk).toBe(0)
+      expect(state.isCancelled).toBe(false)
+      expect(state.abortController).toBeInstanceOf(AbortController)
+    })
+
+    it('should calculate totalChunks based on chunk size', () => {
+      // 512KB chunk size
+      const state = createTransferState('id', 'test.zip', 1024 * 1024, 'checksum') // 1MB
+
+      expect(state.totalChunks).toBe(2) // 1MB / 512KB = 2
+    })
+  })
+
+  describe('abortTransfer', () => {
+    it('should abort transfer and destroy stream', () => {
+      const mockStream = {
+        destroyed: false,
+        destroy: vi.fn()
+      } as unknown as fs.ReadStream
+
+      const transfer: ActiveFileTransfer = {
+        transferId: 'test',
+        fileName: 'test.zip',
+        fileSize: 1000,
+        checksum: 'abc',
+        totalChunks: 1,
+        chunkSize: 512000,
+        bytesSent: 0,
+        currentChunk: 0,
+        startedAt: Date.now(),
+        stream: mockStream,
+        isCancelled: false,
+        abortController: new AbortController()
+      }
+
+      const error = new Error('Test abort')
+      abortTransfer(transfer, error)
+
+      expect(transfer.isCancelled).toBe(true)
+      expect(transfer.abortController.signal.aborted).toBe(true)
+      expect(mockStream.destroy).toHaveBeenCalledWith(error)
+    })
+
+    it('should handle undefined transfer', () => {
+      expect(() => abortTransfer(undefined, new Error('test'))).not.toThrow()
+    })
+
+    it('should not abort already aborted controller', () => {
+      const transfer: ActiveFileTransfer = {
+        transferId: 'test',
+        fileName: 'test.zip',
+        fileSize: 1000,
+        checksum: 'abc',
+        totalChunks: 1,
+        chunkSize: 512000,
+        bytesSent: 0,
+        currentChunk: 0,
+        startedAt: Date.now(),
+        isCancelled: false,
+        abortController: new AbortController()
+      }
+
+      transfer.abortController.abort()
+
+      // Should not throw when aborting again
+      expect(() => abortTransfer(transfer, new Error('test'))).not.toThrow()
+    })
+  })
+
+  describe('cleanupTransfer', () => {
+    it('should cleanup transfer resources', () => {
+      const mockStream = {
+        destroyed: false,
+        destroy: vi.fn()
+      } as unknown as fs.ReadStream
+
+      const transfer: ActiveFileTransfer = {
+        transferId: 'test',
+        fileName: 'test.zip',
+        fileSize: 1000,
+        checksum: 'abc',
+        totalChunks: 1,
+        chunkSize: 512000,
+        bytesSent: 0,
+        currentChunk: 0,
+        startedAt: Date.now(),
+        stream: mockStream,
+        isCancelled: false,
+        abortController: new AbortController()
+      }
+
+      cleanupTransfer(transfer)
+
+      expect(transfer.abortController.signal.aborted).toBe(true)
+      expect(mockStream.destroy).toHaveBeenCalled()
+    })
+
+    it('should handle undefined transfer', () => {
+      expect(() => cleanupTransfer(undefined)).not.toThrow()
+    })
+  })
+
+  describe('formatFileSize', () => {
+    it('should format 0 bytes', () => {
+      expect(formatFileSize(0)).toBe('0 B')
+    })
+
+    it('should format bytes', () => {
+      expect(formatFileSize(500)).toBe('500 B')
+    })
+
+    it('should format kilobytes', () => {
+      expect(formatFileSize(1024)).toBe('1 KB')
+      expect(formatFileSize(2048)).toBe('2 KB')
+    })
+
+    it('should format megabytes', () => {
+      expect(formatFileSize(1024 * 1024)).toBe('1 MB')
+      expect(formatFileSize(5 * 1024 * 1024)).toBe('5 MB')
+    })
+
+    it('should format gigabytes', () => {
+      expect(formatFileSize(1024 * 1024 * 1024)).toBe('1 GB')
+    })
+
+    it('should format with decimal precision', () => {
+      expect(formatFileSize(1536)).toBe('1.5 KB')
+      expect(formatFileSize(1.5 * 1024 * 1024)).toBe('1.5 MB')
+    })
+  })
+
+  // Note: streamFileChunks tests require careful mocking of fs.createReadStream
+  // which is globally mocked in the test environment. These tests verify the
+  // streaming logic works correctly with mock streams.
+  describe('streamFileChunks', () => {
+    let mockSocket: Socket & EventEmitter
+    let mockProgress: ReturnType<typeof vi.fn>
+
+    beforeEach(() => {
+      vi.clearAllMocks()
+
+      mockSocket = Object.assign(new EventEmitter(), {
+        destroyed: false,
+        writable: true,
+        write: vi.fn().mockReturnValue(true),
+        cork: vi.fn(),
+        uncork: vi.fn()
+      }) as unknown as Socket & EventEmitter
+
+      mockProgress = vi.fn()
+    })
+
+    afterEach(() => {
+      vi.resetAllMocks()
+    })
+
+    it('should throw when abort signal is already aborted', async () => {
+      const transfer = createTransferState('test-id', 'test.zip', 1024, 'checksum')
+      transfer.abortController.abort(new Error('Already cancelled'))
+
+      await expect(
+        streamFileChunks(mockSocket, '/fake/path.zip', transfer, transfer.abortController.signal, mockProgress)
+      ).rejects.toThrow()
+    })
+
+    // Note: Full integration testing of streamFileChunks with actual file streaming
+    // requires a real file system, which cannot be easily mocked in ESM.
+    // The abort signal test above verifies the early abort path.
+    // Additional streaming tests are covered through integration tests.
+  })
+})
diff --git a/src/main/services/lanTransfer/__tests__/responseManager.test.ts b/src/main/services/lanTransfer/__tests__/responseManager.test.ts
new file mode 100644
index 0000000000..170ee2de8c
--- /dev/null
+++ b/src/main/services/lanTransfer/__tests__/responseManager.test.ts
@@ -0,0 +1,177 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { ResponseManager } from '../responseManager'
+
+describe('ResponseManager', () => {
+  let manager: ResponseManager
+
+  beforeEach(() => {
+    vi.useFakeTimers()
+    manager = new ResponseManager()
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  describe('buildResponseKey', () => {
+    it('should build key with type only', () => {
+      expect(manager.buildResponseKey('handshake_ack')).toBe('handshake_ack')
+    })
+
+    it('should build key with type and transferId', () => {
+      expect(manager.buildResponseKey('file_start_ack', 'uuid-123')).toBe('file_start_ack:uuid-123')
+    })
+
+    it('should build key with type, transferId, and chunkIndex', () => {
+      expect(manager.buildResponseKey('file_chunk_ack', 'uuid-123', 5)).toBe('file_chunk_ack:uuid-123:5')
+    })
+  })
+
+  describe('waitForResponse', () => {
+    it('should resolve when tryResolve is called with matching key', async () => {
+      const resolvePromise = new Promise<unknown>((resolve, reject) => {
+        manager.waitForResponse('handshake_ack', 5000, resolve, reject)
+      })
+
+      const payload = { type: 'handshake_ack', accepted: true }
+      const resolved = manager.tryResolve('handshake_ack', payload)
+
+      expect(resolved).toBe(true)
+      await expect(resolvePromise).resolves.toEqual(payload)
+    })
+
+    it('should reject on timeout', async () => {
+      const resolvePromise = new Promise<unknown>((resolve, reject) => {
+        manager.waitForResponse('handshake_ack', 1000, resolve, reject)
+      })
+
+      vi.advanceTimersByTime(1001)
+
+      await expect(resolvePromise).rejects.toThrow('Timeout waiting for handshake_ack')
+    })
+
+    it('should call onTimeout callback when timeout occurs', async () => {
+      const onTimeout = vi.fn()
+      manager.setTimeoutCallback(onTimeout)
+
+      const resolvePromise = new Promise<unknown>((resolve, reject) => {
+        manager.waitForResponse('test', 1000, resolve, reject)
+      })
+
+      vi.advanceTimersByTime(1001)
+
+      await expect(resolvePromise).rejects.toThrow()
+      expect(onTimeout).toHaveBeenCalled()
+    })
+
+    it('should reject when abort signal is triggered', async () => {
+      const abortController = new AbortController()
+
+      const resolvePromise = new Promise<unknown>((resolve, reject) => {
+        manager.waitForResponse('test', 10000, resolve, reject, undefined, undefined, abortController.signal)
+      })
+
+      abortController.abort(new Error('User cancelled'))
+
+      await expect(resolvePromise).rejects.toThrow('User cancelled')
+    })
+
+    it('should replace existing response with same key', async () => {
+      const firstReject = vi.fn()
+      const secondResolve = vi.fn()
+      const secondReject = vi.fn()
+
+      manager.waitForResponse('test', 5000, vi.fn(), firstReject)
+      manager.waitForResponse('test', 5000, secondResolve, secondReject)
+
+      // First should be cleared (no rejection since it's replaced)
+      const payload = { type: 'test' }
+      manager.tryResolve('test', payload)
+
+      expect(secondResolve).toHaveBeenCalledWith(payload)
+    })
+  })
+
+  describe('tryResolve', () => {
+    it('should return false when no matching response', () => {
+      expect(manager.tryResolve('nonexistent', {})).toBe(false)
+    })
+
+    it('should match with transferId', async () => {
+      const resolvePromise = new Promise<unknown>((resolve, reject) => {
+        manager.waitForResponse('file_start_ack', 5000, resolve, reject, 'uuid-123')
+      })
+
+      const payload = { type: 'file_start_ack', transferId: 'uuid-123' }
+      manager.tryResolve('file_start_ack', payload, 'uuid-123')
+
+      await expect(resolvePromise).resolves.toEqual(payload)
+    })
+  })
+
+  describe('rejectAll', () => {
+    it('should reject all pending responses', async () => {
+      const promises = [
+        new Promise<unknown>((resolve, reject) => {
+          manager.waitForResponse('test1', 5000, resolve, reject)
+        }),
+        new Promise<unknown>((resolve, reject) => {
+          manager.waitForResponse('test2', 5000, resolve, reject, 'uuid')
+        })
+      ]
+
+      manager.rejectAll(new Error('Connection closed'))
+
+      await expect(promises[0]).rejects.toThrow('Connection closed')
+      await expect(promises[1]).rejects.toThrow('Connection closed')
+    })
+  })
+
+  describe('clearPendingResponse', () => {
+    it('should clear specific response by key', () => {
+      manager.waitForResponse('test', 5000, vi.fn(), vi.fn())
+
+      manager.clearPendingResponse('test')
+
+      expect(manager.tryResolve('test', {})).toBe(false)
+    })
+
+    it('should clear all responses when no key provided', () => {
+      manager.waitForResponse('test1', 5000, vi.fn(), vi.fn())
+      manager.waitForResponse('test2', 5000, vi.fn(), vi.fn())
+
+      manager.clearPendingResponse()
+
+      expect(manager.tryResolve('test1', {})).toBe(false)
+      expect(manager.tryResolve('test2', {})).toBe(false)
+    })
+  })
+
+  describe('getAbortError', () => {
+    it('should return Error reason directly', () => {
+      const originalError = new Error('Original error')
+      const signal = { aborted: true, reason: originalError } as AbortSignal
+
+      const error = manager.getAbortError(signal, 'Fallback')
+
+      expect(error).toBe(originalError)
+    })
+
+    it('should create Error from string reason', () => {
+      const signal = { aborted: true, reason: 'String reason' } as AbortSignal
+
+      const error = manager.getAbortError(signal, 'Fallback')
+
+      expect(error.message).toBe('String reason')
+    })
+
+    it('should use fallback message when no reason', () => {
+      const signal = { aborted: true } as AbortSignal
+
+      const error = manager.getAbortError(signal, 'Fallback message')
+
+      expect(error.message).toBe('Fallback message')
+    })
+  })
+})
diff --git a/src/main/services/lanTransfer/binaryProtocol.ts b/src/main/services/lanTransfer/binaryProtocol.ts
new file mode 100644
index 0000000000..864a8b95bd
--- /dev/null
+++ b/src/main/services/lanTransfer/binaryProtocol.ts
@@ -0,0 +1,67 @@
+import type { Socket } from 'node:net'
+
+/**
+ * Binary protocol constants (v1)
+ */
+export const BINARY_TYPE_FILE_CHUNK = 0x01
+
+/**
+ * Send file chunk as binary frame (protocol v1 - streaming mode)
+ *
+ * Frame format:
+ * ```
+ * ┌──────────┬──────────┬──────────┬───────────────┬──────────────┬────────────┬───────────┐
+ * │ Magic    │ TotalLen │ Type     │ TransferId Len│ TransferId   │ ChunkIdx   │ Data      │
+ * │ 0x43 0x53│ (4B BE)  │ 0x01     │ (2B BE)       │ (variable)   │ (4B BE)    │ (raw)     │
+ * └──────────┴──────────┴──────────┴───────────────┴──────────────┴────────────┴───────────┘
+ * ```
+ *
+ * @param socket - TCP socket to write to
+ * @param transferId - UUID of the transfer
+ * @param chunkIndex - Index of the chunk (0-based)
+ * @param data - Raw chunk data buffer
+ * @returns true if data was buffered, false if backpressure should be applied
+ */
+export function sendBinaryChunk(socket: Socket, transferId: string, chunkIndex: number, data: Buffer): boolean {
+  if (!socket || socket.destroyed || !socket.writable) {
+    throw new Error('Socket is not writable')
+  }
+
+  const tidBuffer = Buffer.from(transferId, 'utf8')
+  const tidLen = tidBuffer.length
+
+  // totalLen = type(1) + tidLen(2) + tid(n) + idx(4) + data(m)
+  const totalLen = 1 + 2 + tidLen + 4 + data.length
+
+  const header = Buffer.allocUnsafe(2 + 4 + 1 + 2 + tidLen + 4)
+  let offset = 0
+
+  // Magic (2 bytes): "CS"
+  header[offset++] = 0x43
+  header[offset++] = 0x53
+
+  // TotalLen (4 bytes, Big-Endian)
+  header.writeUInt32BE(totalLen, offset)
+  offset += 4
+
+  // Type (1 byte)
+  header[offset++] = BINARY_TYPE_FILE_CHUNK
+
+  // TransferId length (2 bytes, Big-Endian)
+  header.writeUInt16BE(tidLen, offset)
+  offset += 2
+
+  // TransferId (variable)
+  tidBuffer.copy(header, offset)
+  offset += tidLen
+
+  // ChunkIndex (4 bytes, Big-Endian)
+  header.writeUInt32BE(chunkIndex, offset)
+
+  socket.cork()
+  const wroteHeader = socket.write(header)
+  const wroteData = socket.write(data)
+  socket.uncork()
+
+  return wroteHeader && wroteData
+}
diff --git a/src/main/services/lanTransfer/handlers/connection.ts b/src/main/services/lanTransfer/handlers/connection.ts
new file mode 100644
index 0000000000..5a53eeb373
--- /dev/null
+++ b/src/main/services/lanTransfer/handlers/connection.ts
@@ -0,0 +1,162 @@
+import { isIP, type Socket } from 'node:net'
+import { platform } from 'node:os'
+
+import { loggerService } from '@logger'
+import type { LanHandshakeRequestMessage, LocalTransferPeer } from '@shared/config/types'
+import { app } from 'electron'
+
+import type { ConnectionContext } from '../types'
+
+export const HANDSHAKE_PROTOCOL_VERSION = '1'
+
+/** Maximum size for line buffer to prevent memory exhaustion from malicious peers */
+const MAX_LINE_BUFFER_SIZE = 1024 * 1024 // 1MB limit for control messages
+
+const logger = loggerService.withContext('LanTransferConnection')
+
+/**
+ * Build a handshake request message with device info.
+ */
+export function buildHandshakeMessage(): LanHandshakeRequestMessage {
+  return {
+    type: 'handshake',
+    deviceName: app.getName(),
+    version: HANDSHAKE_PROTOCOL_VERSION,
+    platform: platform(),
+    appVersion: app.getVersion()
+  }
+}
+
+/**
+ * Pick the best host address from a peer's available addresses.
+ * Prefers IPv4 addresses over IPv6.
+ */
+export function pickHost(peer: LocalTransferPeer): string | undefined {
+  const preferred = peer.addresses?.find((addr) => isIP(addr) === 4) || peer.addresses?.[0]
+  return preferred || peer.host
+}
+
+/**
+ * Send a test ping message after successful handshake.
+ */
+export function sendTestPing(ctx: ConnectionContext): void {
+  const payload = 'hello world'
+  try {
+    ctx.sendControlMessage({ type: 'ping', payload })
+    logger.info('Sent LAN ping test payload')
+    ctx.broadcastClientEvent({
+      type: 'ping_sent',
+      payload,
+      timestamp: Date.now()
+    })
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error)
+    logger.error('Failed to send LAN test ping', error as Error)
+    ctx.broadcastClientEvent({
+      type: 'error',
+      message,
+      timestamp: Date.now()
+    })
+  }
+}
+
+/**
+ * Attach data listener to socket for receiving control messages.
+ * Returns a function to parse the line buffer.
+ */
+export function createDataHandler(onControlLine: (line: string) => void): {
+  lineBuffer: string
+  handleData: (chunk: Buffer) => void
+  resetBuffer: () => void
+} {
+  let lineBuffer = ''
+
+  return {
+    get lineBuffer() {
+      return lineBuffer
+    },
+    handleData(chunk: Buffer) {
+      lineBuffer += chunk.toString('utf8')
+
+      // Prevent memory exhaustion from malicious peers sending data without newlines
+      if (lineBuffer.length > MAX_LINE_BUFFER_SIZE) {
+        logger.error('Line buffer exceeded maximum size, resetting')
+        lineBuffer = ''
+        throw new Error('Control message too large')
+      }
+
+      let newlineIndex = lineBuffer.indexOf('\n')
+      while (newlineIndex !== -1) {
+        const line = lineBuffer.slice(0, newlineIndex).trim()
+        lineBuffer = lineBuffer.slice(newlineIndex + 1)
+        if (line.length > 0) {
+          onControlLine(line)
+        }
+        newlineIndex = lineBuffer.indexOf('\n')
+      }
+    },
+    resetBuffer() {
+      lineBuffer = ''
+    }
+  }
+}
+
+/**
+ * Wait for socket to drain (backpressure handling).
+ */
+export async function waitForSocketDrain(socket: Socket, abortSignal: AbortSignal): Promise<void> {
+  if (abortSignal.aborted) {
+    throw getAbortError(abortSignal, 'Transfer aborted while waiting for socket drain')
+  }
+  if (socket.destroyed) {
+    throw new Error('Socket is closed')
+  }
+
+  await new Promise<void>((resolve, reject) => {
+    const cleanup = () => {
+      socket.off('drain', onDrain)
+      socket.off('close', onClose)
+      socket.off('error', onError)
+      abortSignal.removeEventListener('abort', onAbort)
+    }
+
+    const onDrain = () => {
+      cleanup()
+      resolve()
+    }
+
+    const onClose = () => {
+      cleanup()
+      reject(new Error('Socket closed while waiting for drain'))
+    }
+
+    const onError = (error: Error) => {
+      cleanup()
+      reject(error)
+    }
+
+    const onAbort = () => {
+      cleanup()
+      reject(getAbortError(abortSignal, 'Transfer aborted while waiting for socket drain'))
+    }
+
+    socket.once('drain', onDrain)
+    socket.once('close', onClose)
+    socket.once('error', onError)
+    abortSignal.addEventListener('abort', onAbort, { once: true })
+  })
+}
+
+/**
+ * Get the error from an abort signal, or create a fallback error.
+ */
+export function getAbortError(signal: AbortSignal, fallbackMessage: string): Error {
+  const reason = (signal as AbortSignal & { reason?: unknown }).reason
+  if (reason instanceof Error) {
+    return reason
+  }
+  if (typeof reason === 'string' && reason.length > 0) {
+    return new Error(reason)
+  }
+  return new Error(fallbackMessage)
+}
diff --git a/src/main/services/lanTransfer/handlers/fileTransfer.ts b/src/main/services/lanTransfer/handlers/fileTransfer.ts
new file mode 100644
index 0000000000..c469a58421
--- /dev/null
+++ b/src/main/services/lanTransfer/handlers/fileTransfer.ts
@@ -0,0 +1,267 @@
+import * as crypto from 'node:crypto'
+import * as fs from 'node:fs'
+import type { Socket } from 'node:net'
+import * as path from 'node:path'
+
+import { loggerService } from '@logger'
+import type {
+  LanFileCompleteMessage,
+  LanFileEndMessage,
+  LanFileStartAckMessage,
+  LanFileStartMessage
+} from '@shared/config/types'
+import {
+  LAN_TRANSFER_CHUNK_SIZE,
+  LAN_TRANSFER_COMPLETE_TIMEOUT_MS,
+  LAN_TRANSFER_MAX_FILE_SIZE
+} from '@shared/config/types'
+
+import { sendBinaryChunk } from '../binaryProtocol'
+import type { ActiveFileTransfer, FileTransferContext } from '../types'
+import { getAbortError, waitForSocketDrain } from './connection'
+
+const DEFAULT_FILE_START_ACK_TIMEOUT_MS = 30_000 // 30s for file_start_ack
+
+const logger = loggerService.withContext('LanTransferFileHandler')
+
+/**
+ * Validate a file for transfer.
+ * Checks existence, type, extension, and size limits.
+ */
+export async function validateFile(filePath: string): Promise<{ stats: fs.Stats; fileName: string }> {
+  let stats: fs.Stats
+  try {
+    stats = await fs.promises.stat(filePath)
+  } catch (error) {
+    const nodeError = error as NodeJS.ErrnoException
+    if (nodeError.code === 'ENOENT') {
+      throw new Error(`File not found: ${filePath}`)
+    } else if (nodeError.code === 'EACCES') {
+      throw new Error(`Permission denied: ${filePath}`)
+    } else if (nodeError.code === 'ENOTDIR') {
+      throw new Error(`Invalid path: ${filePath}`)
+    } else {
+      throw new Error(`Cannot access file: ${filePath} (${nodeError.code || 'unknown error'})`)
+    }
+  }
+
+  if (!stats.isFile()) {
+    throw new Error('Path is not a file')
+  }
+
+  const fileName = path.basename(filePath)
+  const ext = path.extname(fileName).toLowerCase()
+  if (ext !== '.zip') {
+    throw new Error('Only ZIP files are supported')
+  }
+
+  if (stats.size > LAN_TRANSFER_MAX_FILE_SIZE) {
+    throw new Error(`File too large. Maximum size is ${formatFileSize(LAN_TRANSFER_MAX_FILE_SIZE)}`)
+  }
+
+  return { stats, fileName }
+}
+
+/**
+ * Calculate SHA-256 checksum of a file.
+ */
+export async function calculateFileChecksum(filePath: string): Promise<string> {
+  return new Promise((resolve, reject) => {
+    const hash = crypto.createHash('sha256')
+    const stream = fs.createReadStream(filePath)
+    stream.on('data', (data) => hash.update(data))
+    stream.on('end', () => resolve(hash.digest('hex')))
+    stream.on('error', reject)
+  })
+}
+
+/**
+ * Create initial transfer state for a new file transfer.
+ */
+export function createTransferState(
+  transferId: string,
+  fileName: string,
+  fileSize: number,
+  checksum: string
+): ActiveFileTransfer {
+  const chunkSize = LAN_TRANSFER_CHUNK_SIZE
+  const totalChunks = Math.ceil(fileSize / chunkSize)
+
+  return {
+    transferId,
+    fileName,
+    fileSize,
+    checksum,
+    totalChunks,
+    chunkSize,
+    bytesSent: 0,
+    currentChunk: 0,
+    startedAt: Date.now(),
+    isCancelled: false,
+    abortController: new AbortController()
+  }
+}
+
+/**
+ * Send file_start message to receiver.
+ */
+export function sendFileStart(ctx: FileTransferContext, transfer: ActiveFileTransfer): void {
+  const startMessage: LanFileStartMessage = {
+    type: 'file_start',
+    transferId: transfer.transferId,
+    fileName: transfer.fileName,
+    fileSize: transfer.fileSize,
+    mimeType: 'application/zip',
+    checksum: transfer.checksum,
+    totalChunks: transfer.totalChunks,
+    chunkSize: transfer.chunkSize
+  }
+  ctx.sendControlMessage(startMessage)
+  logger.info('Sent file_start message')
+}
+
+/**
+ * Wait for file_start_ack from receiver.
+ */
+export function waitForFileStartAck(
+  ctx: FileTransferContext,
+  transferId: string,
+  abortSignal?: AbortSignal
+): Promise<LanFileStartAckMessage> {
+  return new Promise((resolve, reject) => {
+    ctx.waitForResponse(
+      'file_start_ack',
+      DEFAULT_FILE_START_ACK_TIMEOUT_MS,
+      (payload) => resolve(payload as LanFileStartAckMessage),
+      reject,
+      transferId,
+      undefined,
+      abortSignal
+    )
+  })
+}
+
+/**
+ * Wait for file_complete from receiver after all chunks sent.
+ */
+export function waitForFileComplete(
+  ctx: FileTransferContext,
+  transferId: string,
+  abortSignal?: AbortSignal
+): Promise<LanFileCompleteMessage> {
+  return new Promise((resolve, reject) => {
+    ctx.waitForResponse(
+      'file_complete',
+      LAN_TRANSFER_COMPLETE_TIMEOUT_MS,
+      (payload) => resolve(payload as LanFileCompleteMessage),
+      reject,
+      transferId,
+      undefined,
+      abortSignal
+    )
+  })
+}
+
+/**
+ * Send file_end message to receiver.
+ */
+export function sendFileEnd(ctx: FileTransferContext, transferId: string): void {
+  const endMessage: LanFileEndMessage = {
+    type: 'file_end',
+    transferId
+  }
+  ctx.sendControlMessage(endMessage)
+  logger.info('Sent file_end message')
+}
+
+/**
+ * Stream file chunks to the receiver (v1 streaming mode - no per-chunk acknowledgment).
+ */
+export async function streamFileChunks(
+  socket: Socket,
+  filePath: string,
+  transfer: ActiveFileTransfer,
+  abortSignal: AbortSignal,
+  onProgress: (bytesSent: number, chunkIndex: number) => void
+): Promise<void> {
+  const { chunkSize, transferId } = transfer
+
+  const stream = fs.createReadStream(filePath, { highWaterMark: chunkSize })
+  transfer.stream = stream
+
+  let chunkIndex = 0
+  let bytesSent = 0
+
+  try {
+    for await (const chunk of stream) {
+      if (abortSignal.aborted) {
+        throw getAbortError(abortSignal, 'Transfer aborted')
+      }
+
+      const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk)
+      bytesSent += buffer.length
+
+      // Send chunk as binary frame (v1 streaming) with backpressure handling
+      const canContinue = sendBinaryChunk(socket, transferId, chunkIndex, buffer)
+      if (!canContinue) {
+        await waitForSocketDrain(socket, abortSignal)
+      }
+
+      // Update progress
+      transfer.bytesSent = bytesSent
+      transfer.currentChunk = chunkIndex
+
+      onProgress(bytesSent, chunkIndex)
+      chunkIndex++
+    }
+
+    logger.info(`File streaming completed: ${chunkIndex} chunks sent`)
+  } catch (error) {
+    logger.error('File streaming failed', error as Error)
+    throw error
+  }
+}
+
+/**
+ * Abort an active transfer and clean up resources.
+ */
+export function abortTransfer(transfer: ActiveFileTransfer | undefined, error: Error): void {
+  if (!transfer) {
+    return
+  }
+
+  transfer.isCancelled = true
+  if (!transfer.abortController.signal.aborted) {
+    transfer.abortController.abort(error)
+  }
+  if (transfer.stream && !transfer.stream.destroyed) {
+    transfer.stream.destroy(error)
+  }
+}
+
+/**
+ * Clean up transfer resources without error.
+ */
+export function cleanupTransfer(transfer: ActiveFileTransfer | undefined): void {
+  if (!transfer) {
+    return
+  }
+
+  if (!transfer.abortController.signal.aborted) {
+    transfer.abortController.abort()
+  }
+  if (transfer.stream && !transfer.stream.destroyed) {
+    transfer.stream.destroy()
+  }
+}
+
+/**
+ * Format bytes into human-readable size string.
+ */
+export function formatFileSize(bytes: number): string {
+  if (bytes === 0) return '0 B'
+  const k = 1024
+  const sizes = ['B', 'KB', 'MB', 'GB']
+  const i = Math.floor(Math.log(bytes) / Math.log(k))
+  return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i]
+}
diff --git a/src/main/services/lanTransfer/handlers/index.ts b/src/main/services/lanTransfer/handlers/index.ts
new file mode 100644
index 0000000000..33620d188c
--- /dev/null
+++ b/src/main/services/lanTransfer/handlers/index.ts
@@ -0,0 +1,22 @@
+export {
+  buildHandshakeMessage,
+  createDataHandler,
+  getAbortError,
+  HANDSHAKE_PROTOCOL_VERSION,
+  pickHost,
+  sendTestPing,
+  waitForSocketDrain
+} from './connection'
+export {
+  abortTransfer,
+  calculateFileChecksum,
+  cleanupTransfer,
+  createTransferState,
+  formatFileSize,
+  sendFileEnd,
+  sendFileStart,
+  streamFileChunks,
+  validateFile,
+  waitForFileComplete,
+  waitForFileStartAck
+} from './fileTransfer'
diff --git a/src/main/services/lanTransfer/index.ts b/src/main/services/lanTransfer/index.ts
new file mode 100644
index 0000000000..12f3c38afc
--- /dev/null
+++ b/src/main/services/lanTransfer/index.ts
@@ -0,0 +1,21 @@
+/**
+ * LAN Transfer Client Module
+ *
+ * Protocol: v1.0 (streaming mode)
+ *
+ * Features:
+ * - Binary frame format for file chunks (no base64 overhead)
+ * - Streaming mode (no per-chunk acknowledgment)
+ * - JSON messages for control flow (handshake, file_start, file_end, etc.)
+ * - Global timeout protection
+ * - Backpressure handling
+ *
+ * Binary Frame Format:
+ * ┌──────────┬──────────┬──────────┬───────────────┬──────────────┬────────────┬───────────┐
+ * │ Magic    │ TotalLen │ Type     │ TransferId Len│ TransferId   │ ChunkIdx   │ Data      │
+ * │ 0x43 0x53│ (4B BE)  │ 0x01     │ (2B BE)       │ (variable)   │ (4B BE)    │ (raw)     │
+ * └──────────┴──────────┴──────────┴───────────────┴──────────────┴────────────┴───────────┘
+ */
+
+export { HANDSHAKE_PROTOCOL_VERSION, lanTransferClientService } from './LanTransferClientService'
+export type { ActiveFileTransfer, ConnectionContext, FileTransferContext, PendingResponse } from './types'
diff --git a/src/main/services/lanTransfer/responseManager.ts b/src/main/services/lanTransfer/responseManager.ts
new file mode 100644
index 0000000000..74d5196dba
--- /dev/null
+++ b/src/main/services/lanTransfer/responseManager.ts
@@ -0,0 +1,144 @@
+import type { PendingResponse } from './types'
+
+/**
+ * Manages pending response handlers for awaiting control messages.
+ * Handles timeouts, abort signals, and cleanup.
+ */
+export class ResponseManager {
+  private pendingResponses = new Map<string, PendingResponse>()
+  private onTimeout?: () => void
+
+  /**
+   * Set a callback to be called when a response times out.
+   * Typically used to trigger disconnect on timeout.
+   */
+  setTimeoutCallback(callback: () => void): void {
+    this.onTimeout = callback
+  }
+
+  /**
+   * Build a composite key for identifying pending responses.
+   */
+  buildResponseKey(type: string, transferId?: string, chunkIndex?: number): string {
+    const parts = [type]
+    if (transferId !== undefined) parts.push(transferId)
+    if (chunkIndex !== undefined) parts.push(String(chunkIndex))
+    return parts.join(':')
+  }
+
+  /**
+   * Register a response listener with timeout and optional abort signal.
+   */
+  waitForResponse(
+    type: string,
+    timeoutMs: number,
+    resolve: (payload: unknown) => void,
+    reject: (error: Error) => void,
+    transferId?: string,
+    chunkIndex?: number,
+    abortSignal?: AbortSignal
+  ): void {
+    const responseKey = this.buildResponseKey(type, transferId, chunkIndex)
+
+    // Clear any existing response with the same key
+    this.clearPendingResponse(responseKey)
+
+    const timeoutHandle = setTimeout(() => {
+      this.clearPendingResponse(responseKey)
+      const error = new Error(`Timeout waiting for ${type}`)
+      reject(error)
+      this.onTimeout?.()
+    }, timeoutMs)
+
+    const pending: PendingResponse = {
+      type,
+      transferId,
+      chunkIndex,
+      resolve,
+      reject,
+      timeoutHandle,
+      abortSignal
+    }
+
+    if (abortSignal) {
+      const abortListener = () => {
+        this.clearPendingResponse(responseKey)
+        reject(this.getAbortError(abortSignal, `Aborted while waiting for ${type}`))
+      }
+      pending.abortListener = abortListener
+      abortSignal.addEventListener('abort', abortListener, { once: true })
+    }
+
+    this.pendingResponses.set(responseKey, pending)
+  }
+
+  /**
+   * Try to resolve a pending response by type and optional identifiers.
+   * Returns true if a matching response was found and resolved.
+   */
+  tryResolve(type: string, payload: unknown, transferId?: string, chunkIndex?: number): boolean {
+    const responseKey = this.buildResponseKey(type, transferId, chunkIndex)
+    const pendingResponse = this.pendingResponses.get(responseKey)
+
+    if (pendingResponse) {
+      const resolver = pendingResponse.resolve
+      this.clearPendingResponse(responseKey)
+      resolver(payload)
+      return true
+    }
+
+    return false
+  }
+
+  /**
+   * Clear a single pending response by key, or all responses if no key provided.
+   */
+  clearPendingResponse(key?: string): void {
+    if (key) {
+      const pending = this.pendingResponses.get(key)
+      if (pending?.timeoutHandle) {
+        clearTimeout(pending.timeoutHandle)
+      }
+      if (pending?.abortSignal && pending.abortListener) {
+        pending.abortSignal.removeEventListener('abort', pending.abortListener)
+      }
+      this.pendingResponses.delete(key)
+    } else {
+      // Clear all pending responses
+      for (const pending of this.pendingResponses.values()) {
+        if (pending.timeoutHandle) {
+          clearTimeout(pending.timeoutHandle)
+        }
+        if (pending.abortSignal && pending.abortListener) {
+          pending.abortSignal.removeEventListener('abort', pending.abortListener)
+        }
+      }
+      this.pendingResponses.clear()
+    }
+  }
+
+  /**
+   * Reject all pending responses with the given error.
+   */
+  rejectAll(error: Error): void {
+    for (const key of Array.from(this.pendingResponses.keys())) {
+      const pending = this.pendingResponses.get(key)
+      this.clearPendingResponse(key)
+      pending?.reject(error)
+    }
+  }
+
+  /**
+   * Get the abort error from an abort signal, or create a fallback error.
+   */
+  getAbortError(signal: AbortSignal, fallbackMessage: string): Error {
+    const reason = (signal as AbortSignal & { reason?: unknown }).reason
+    if (reason instanceof Error) {
+      return reason
+    }
+    if (typeof reason === 'string' && reason.length > 0) {
+      return new Error(reason)
+    }
+    return new Error(fallbackMessage)
+  }
+}
diff --git a/src/main/services/lanTransfer/types.ts b/src/main/services/lanTransfer/types.ts
new file mode 100644
index 0000000000..52be660af3
--- /dev/null
+++ b/src/main/services/lanTransfer/types.ts
@@ -0,0 +1,65 @@
+import type * as fs from 'node:fs'
+import type { Socket } from 'node:net'
+
+import type { LanClientEvent, LocalTransferPeer } from '@shared/config/types'
+
+/**
+ * Pending response handler for awaiting control messages
+ */
+export type PendingResponse = {
+  type: string
+  transferId?: string
+  chunkIndex?: number
+  resolve: (payload: unknown) => void
+  reject: (error: Error) => void
+  timeoutHandle?: NodeJS.Timeout
+  abortSignal?: AbortSignal
+  abortListener?: () => void
+}
+
+/**
+ * Active file transfer state tracking
+ */
+export type ActiveFileTransfer = {
+  transferId: string
+  fileName: string
+  fileSize: number
+  checksum: string
+  totalChunks: number
+  chunkSize: number
+  bytesSent: number
+  currentChunk: number
+  startedAt: number
+  stream?: fs.ReadStream
+  isCancelled: boolean
+  abortController: AbortController
+}
+
+/**
+ * Context interface for connection handlers
+ * Provides access to service methods without circular dependencies
+ */
+export type ConnectionContext = {
+  socket: Socket | null
+  currentPeer?: LocalTransferPeer
+  sendControlMessage: (message: Record<string, unknown>) => void
+  broadcastClientEvent: (event: LanClientEvent) => void
+}
+
+/**
+ * Context interface for file transfer handlers
+ * Extends connection context with transfer-specific methods
+ */
+export type FileTransferContext = ConnectionContext & {
+  activeTransfer?: ActiveFileTransfer
+  setActiveTransfer: (transfer: ActiveFileTransfer | undefined) => void
+  waitForResponse: (
+    type: string,
+    timeoutMs: number,
+    resolve: (payload: unknown) => void,
+    reject: (error: Error) => void,
+    transferId?: string,
+    chunkIndex?: number,
+    abortSignal?: AbortSignal
+  ) => void
+}
diff --git a/src/main/services/mcp/ServerLogBuffer.ts b/src/main/services/mcp/ServerLogBuffer.ts
new file mode 100644
index 0000000000..01c45f373f
--- /dev/null
+++ b/src/main/services/mcp/ServerLogBuffer.ts
@@ -0,0 +1,36 @@
+export type MCPServerLogEntry = {
+  timestamp: number
+  level: 'debug' | 'info' | 'warn' | 'error' | 'stderr' | 'stdout'
+  message: string
+  data?: any
+  source?: string
+}
+
+/**
+ * Lightweight ring buffer for per-server MCP logs.
+ */
+export class ServerLogBuffer {
+  private maxEntries: number
+  private logs: Map<string, MCPServerLogEntry[]> = new Map()
+
+  constructor(maxEntries = 200) {
+    this.maxEntries = maxEntries
+  }
+
+  append(serverKey: string, entry: MCPServerLogEntry) {
+    const list = this.logs.get(serverKey) ?? []
+    list.push(entry)
+    if (list.length > this.maxEntries) {
+      list.splice(0, list.length - this.maxEntries)
+    }
+    this.logs.set(serverKey, list)
+  }
+
+  get(serverKey: string): MCPServerLogEntry[] {
+    return [...(this.logs.get(serverKey) ?? [])]
+  }
+
+  remove(serverKey: string) {
+    this.logs.delete(serverKey)
+  }
+}
diff --git a/src/main/services/mcp/oauth/callback.ts b/src/main/services/mcp/oauth/callback.ts
index c13ecd5c07..7da7544585 100644
--- a/src/main/services/mcp/oauth/callback.ts
+++ b/src/main/services/mcp/oauth/callback.ts
@@ -128,8 +128,8 @@ export class CallBackServer {
     })
 
     return new Promise<http.Server>((resolve, reject) => {
-      server.listen(port, () => {
-        logger.info(`OAuth callback server listening on port ${port}`)
+      server.listen(port, '127.0.0.1', () => {
+        logger.info(`OAuth callback server listening on 127.0.0.1:${port}`)
         resolve(server)
       })
 
diff --git a/src/main/services/memory/MemoryService.ts b/src/main/services/memory/MemoryService.ts
index 3466e2c3c6..101dd54294 100644
--- a/src/main/services/memory/MemoryService.ts
+++ b/src/main/services/memory/MemoryService.ts
@@ -1,7 +1,9 @@
 import type { Client } from '@libsql/client'
 import { createClient } from '@libsql/client'
 import { loggerService } from '@logger'
+import { DATA_PATH } from '@main/config'
 import Embeddings from '@main/knowledge/embedjs/embeddings/Embeddings'
+import { makeSureDirExists } from '@main/utils'
 import type {
   AddMemoryOptions,
   AssistantMessage,
@@ -13,6 +15,7 @@ import type {
 } from '@types'
 import crypto from 'crypto'
 import { app } from 'electron'
+import fs from 'fs'
 import path from 'path'
 
 import { MemoryQueries } from './queries'
@@ -71,6 +74,21 @@ export class MemoryService {
     return MemoryService.instance
   }
 
+  /**
+   * Migrate the memory database from the old path to the new path
+   * If the old memory database exists, rename it to the new path
+   */
+  public migrateMemoryDb(): void {
+    const oldMemoryDbPath = path.join(app.getPath('userData'), 'memories.db')
+    const memoryDbPath = path.join(DATA_PATH, 'Memory', 'memories.db')
+
+    makeSureDirExists(path.dirname(memoryDbPath))
+
+    if (fs.existsSync(oldMemoryDbPath)) {
+      fs.renameSync(oldMemoryDbPath, memoryDbPath)
+    }
+  }
+
   /**
    * Initialize the database connection and create tables
    */
@@ -80,11 +98,12 @@ export class MemoryService {
     }
 
     try {
-      const userDataPath = app.getPath('userData')
-      const dbPath = path.join(userDataPath, 'memories.db')
+      const memoryDbPath = path.join(DATA_PATH, 'Memory', 'memories.db')
+
+      makeSureDirExists(path.dirname(memoryDbPath))
 
       this.db = createClient({
-        url: `file:${dbPath}`,
+        url: `file:${memoryDbPath}`,
         intMode: 'number'
       })
 
@@ -168,12 +187,13 @@ export class MemoryService {
 
             // Generate embedding if model is configured
             let embedding: number[] | null = null
-            const embedderApiClient = this.config?.embedderApiClient
-            if (embedderApiClient) {
+            const embeddingModel = this.config?.embeddingModel
+
+            if (embeddingModel) {
               try {
                 embedding = await this.generateEmbedding(trimmedMemory)
                 logger.debug(
-                  `Generated embedding for restored memory with dimension: ${embedding.length} (target: ${this.config?.embedderDimensions || MemoryService.UNIFIED_DIMENSION})`
+                  `Generated embedding for restored memory with dimension: ${embedding.length} (target: ${this.config?.embeddingDimensions || MemoryService.UNIFIED_DIMENSION})`
                 )
               } catch (error) {
                 logger.error('Failed to generate embedding for restored memory:', error as Error)
@@ -211,11 +231,11 @@ export class MemoryService {
 
         // Generate embedding if model is configured
         let embedding: number[] | null = null
-        if (this.config?.embedderApiClient) {
+        if (this.config?.embeddingModel) {
           try {
             embedding = await this.generateEmbedding(trimmedMemory)
             logger.debug(
-              `Generated embedding with dimension: ${embedding.length} (target: ${this.config?.embedderDimensions || MemoryService.UNIFIED_DIMENSION})`
+              `Generated embedding with dimension: ${embedding.length} (target: ${this.config?.embeddingDimensions || MemoryService.UNIFIED_DIMENSION})`
             )
 
             // Check for similar memories using vector similarity
@@ -300,7 +320,7 @@ export class MemoryService {
 
     try {
       // If we have an embedder model configured, use vector search
-      if (this.config?.embedderApiClient) {
+      if (this.config?.embeddingModel) {
         try {
           const queryEmbedding = await this.generateEmbedding(query)
           return await this.hybridSearch(query, queryEmbedding, { limit, userId, agentId, filters })
@@ -497,11 +517,11 @@ export class MemoryService {
 
       // Generate new embedding if model is configured
       let embedding: number[] | null = null
-      if (this.config?.embedderApiClient) {
+      if (this.config?.embeddingModel) {
         try {
           embedding = await this.generateEmbedding(memory)
           logger.debug(
-            `Updated embedding with dimension: ${embedding.length} (target: ${this.config?.embedderDimensions || MemoryService.UNIFIED_DIMENSION})`
+            `Updated embedding with dimension: ${embedding.length} (target: ${this.config?.embeddingDimensions || MemoryService.UNIFIED_DIMENSION})`
           )
         } catch (error) {
           logger.error('Failed to generate embedding for update:', error as Error)
@@ -710,21 +730,22 @@ export class MemoryService {
    * Generate embedding for text
    */
   private async generateEmbedding(text: string): Promise<number[]> {
-    if (!this.config?.embedderApiClient) {
+    if (!this.config?.embeddingModel) {
       throw new Error('Embedder model not configured')
     }
 
     try {
       // Initialize embeddings instance if needed
       if (!this.embeddings) {
-        if (!this.config.embedderApiClient) {
+        if (!this.config.embeddingApiClient) {
           throw new Error('Embedder provider not configured')
         }
 
         this.embeddings = new Embeddings({
-          embedApiClient: this.config.embedderApiClient,
-          dimensions: this.config.embedderDimensions
+          embedApiClient: this.config.embeddingApiClient,
+          dimensions: this.config.embeddingDimensions
         })
+
         await this.embeddings.init()
       }
 
diff --git a/src/main/utils/__tests__/mcp.test.ts b/src/main/utils/__tests__/mcp.test.ts
index b1a35f925e..706a44bc84 100644
--- a/src/main/utils/__tests__/mcp.test.ts
+++ b/src/main/utils/__tests__/mcp.test.ts
@@ -3,194 +3,223 @@ import { describe, expect, it } from 'vitest'
 import { buildFunctionCallToolName } from '../mcp'
 
 describe('buildFunctionCallToolName', () => {
-  describe('basic functionality', () => {
-    it('should combine server name and tool name', () => {
+  describe('basic format', () => {
+    it('should return format mcp__{server}__{tool}', () => {
       const result = buildFunctionCallToolName('github', 'search_issues')
-      expect(result).toContain('github')
-      expect(result).toContain('search')
+      expect(result).toBe('mcp__github__search_issues')
     })
 
-    it('should sanitize names by replacing dashes with underscores', () => {
-      const result = buildFunctionCallToolName('my-server', 'my-tool')
-      // Input dashes are replaced, but the separator between server and tool is a dash
-      expect(result).toBe('my_serv-my_tool')
-      expect(result).toContain('_')
-    })
-
-    it('should handle empty server names gracefully', () => {
-      const result = buildFunctionCallToolName('', 'tool')
-      expect(result).toBeTruthy()
+    it('should handle simple server and tool names', () => {
+      expect(buildFunctionCallToolName('fetch', 'get_page')).toBe('mcp__fetch__get_page')
+      expect(buildFunctionCallToolName('database', 'query')).toBe('mcp__database__query')
+      expect(buildFunctionCallToolName('cherry_studio', 'search')).toBe('mcp__cherry_studio__search')
     })
   })
 
-  describe('uniqueness with serverId', () => {
-    it('should generate different IDs for same server name but different serverIds', () => {
-      const serverId1 = 'server-id-123456'
-      const serverId2 = 'server-id-789012'
-      const serverName = 'github'
-      const toolName = 'search_repos'
-
-      const result1 = buildFunctionCallToolName(serverName, toolName, serverId1)
-      const result2 = buildFunctionCallToolName(serverName, toolName, serverId2)
-
-      expect(result1).not.toBe(result2)
-      expect(result1).toContain('123456')
-      expect(result2).toContain('789012')
+  describe('valid JavaScript identifier', () => {
+    it('should always start with mcp__ prefix (valid JS identifier start)', () => {
+      const result = buildFunctionCallToolName('123server', '456tool')
+      expect(result).toMatch(/^mcp__/)
+      expect(result).toBe('mcp__123server__456tool')
     })
 
-    it('should generate same ID when serverId is not provided', () => {
+    it('should only contain alphanumeric chars and underscores', () => {
+      const result = buildFunctionCallToolName('my-server', 'my-tool')
+      expect(result).toBe('mcp__my_server__my_tool')
+      expect(result).toMatch(/^[a-zA-Z][a-zA-Z0-9_]*$/)
+    })
+
+    it('should be a valid JavaScript identifier', () => {
+      const testCases = [
+        ['github', 'create_issue'],
+        ['my-server', 'fetch-data'],
+        ['test@server', 'tool#name'],
+        ['server.name', 'tool.action'],
+        ['123abc', 'def456']
+      ]
+
+      for (const [server, tool] of testCases) {
+        const result = buildFunctionCallToolName(server, tool)
+        // Valid JS identifiers match this pattern
+        expect(result).toMatch(/^[a-zA-Z_][a-zA-Z0-9_]*$/)
+      }
+    })
+  })
+
+  describe('character sanitization', () => {
+    it('should replace dashes with underscores', () => {
+      const result = buildFunctionCallToolName('my-server', 'my-tool-name')
+      expect(result).toBe('mcp__my_server__my_tool_name')
+    })
+
+    it('should replace special characters with underscores', () => {
+      const result = buildFunctionCallToolName('test@server!', 'tool#name$')
+      expect(result).toBe('mcp__test_server__tool_name')
+    })
+
+    it('should replace dots with underscores', () => {
+      const result = buildFunctionCallToolName('server.name', 'tool.action')
+      expect(result).toBe('mcp__server_name__tool_action')
+    })
+
+    it('should replace spaces with underscores', () => {
+      const result = buildFunctionCallToolName('my server', 'my tool')
+      expect(result).toBe('mcp__my_server__my_tool')
+    })
+
+    it('should collapse consecutive underscores', () => {
+      const result = buildFunctionCallToolName('my--server', 'my___tool')
+      expect(result).toBe('mcp__my_server__my_tool')
+      expect(result).not.toMatch(/_{3,}/)
+    })
+
+    it('should trim leading and trailing underscores from parts', () => {
+      const result = buildFunctionCallToolName('_server_', '_tool_')
+      expect(result).toBe('mcp__server__tool')
+    })
+
+    it('should handle names with only special characters', () => {
+      const result = buildFunctionCallToolName('---', '###')
+      expect(result).toBe('mcp____')
+    })
+  })
+
+  describe('length constraints', () => {
+    it('should not exceed 63 characters', () => {
+      const longServerName = 'a'.repeat(50)
+      const longToolName = 'b'.repeat(50)
+      const result = buildFunctionCallToolName(longServerName, longToolName)
+
+      expect(result.length).toBeLessThanOrEqual(63)
+    })
+
+    it('should truncate server name to max 20 chars', () => {
+      const longServerName = 'abcdefghijklmnopqrstuvwxyz' // 26 chars
+      const result = buildFunctionCallToolName(longServerName, 'tool')
+
+      expect(result).toBe('mcp__abcdefghijklmnopqrst__tool')
+      expect(result).toContain('abcdefghijklmnopqrst') // First 20 chars
+      expect(result).not.toContain('uvwxyz') // Truncated
+    })
+
+    it('should truncate tool name to max 35 chars', () => {
+      const longToolName = 'a'.repeat(40)
+      const result = buildFunctionCallToolName('server', longToolName)
+
+      const expectedTool = 'a'.repeat(35)
+      expect(result).toBe(`mcp__server__${expectedTool}`)
+    })
+
+    it('should not end with underscores after truncation', () => {
+      // Create a name that would end with underscores after truncation
+      const longServerName = 'a'.repeat(20)
+      const longToolName = 'b'.repeat(35) + '___extra'
+      const result = buildFunctionCallToolName(longServerName, longToolName)
+
+      expect(result).not.toMatch(/_+$/)
+      expect(result.length).toBeLessThanOrEqual(63)
+    })
+
+    it('should handle max length edge case exactly', () => {
+      // mcp__ (5) + server (20) + __ (2) + tool (35) = 62 chars
+      const server = 'a'.repeat(20)
+      const tool = 'b'.repeat(35)
+      const result = buildFunctionCallToolName(server, tool)
+
+      expect(result.length).toBe(62)
+      expect(result).toBe(`mcp__${'a'.repeat(20)}__${'b'.repeat(35)}`)
+    })
+  })
+
+  describe('edge cases', () => {
+    it('should handle empty server name', () => {
+      const result = buildFunctionCallToolName('', 'tool')
+      expect(result).toBe('mcp____tool')
+    })
+
+    it('should handle empty tool name', () => {
+      const result = buildFunctionCallToolName('server', '')
+      expect(result).toBe('mcp__server__')
+    })
+
+    it('should handle both empty names', () => {
+      const result = buildFunctionCallToolName('', '')
+      expect(result).toBe('mcp____')
+    })
+
+    it('should handle whitespace-only names', () => {
+      const result = buildFunctionCallToolName('   ', '   ')
+      expect(result).toBe('mcp____')
+    })
+
+    it('should trim whitespace from names', () => {
+      const result = buildFunctionCallToolName('  server  ', '  tool  ')
+      expect(result).toBe('mcp__server__tool')
+    })
+
+    it('should handle unicode characters', () => {
+      const result = buildFunctionCallToolName('服务器', '工具')
+      // Unicode chars are replaced with underscores, then collapsed
+      expect(result).toMatch(/^mcp__/)
+    })
+
+    it('should handle mixed case', () => {
+      const result = buildFunctionCallToolName('MyServer', 'MyTool')
+      expect(result).toBe('mcp__MyServer__MyTool')
+    })
+  })
+
+  describe('deterministic output', () => {
+    it('should produce consistent results for same input', () => {
       const serverName = 'github'
       const toolName = 'search_repos'
 
       const result1 = buildFunctionCallToolName(serverName, toolName)
       const result2 = buildFunctionCallToolName(serverName, toolName)
+      const result3 = buildFunctionCallToolName(serverName, toolName)
 
       expect(result1).toBe(result2)
+      expect(result2).toBe(result3)
     })
 
-    it('should include serverId suffix when provided', () => {
-      const serverId = 'abc123def456'
-      const result = buildFunctionCallToolName('server', 'tool', serverId)
+    it('should produce different results for different inputs', () => {
+      const result1 = buildFunctionCallToolName('server1', 'tool')
+      const result2 = buildFunctionCallToolName('server2', 'tool')
+      const result3 = buildFunctionCallToolName('server', 'tool1')
+      const result4 = buildFunctionCallToolName('server', 'tool2')
 
-      // Should include last 6 chars of serverId
-      expect(result).toContain('ef456')
-    })
-  })
-
-  describe('character sanitization', () => {
-    it('should replace invalid characters with underscores', () => {
-      const result = buildFunctionCallToolName('test@server', 'tool#name')
-      expect(result).not.toMatch(/[@#]/)
-      expect(result).toMatch(/^[a-zA-Z0-9_-]+$/)
-    })
-
-    it('should ensure name starts with a letter', () => {
-      const result = buildFunctionCallToolName('123server', '456tool')
-      expect(result).toMatch(/^[a-zA-Z]/)
-    })
-
-    it('should handle consecutive underscores/dashes', () => {
-      const result = buildFunctionCallToolName('my--server', 'my__tool')
-      expect(result).not.toMatch(/[_-]{2,}/)
-    })
-  })
-
-  describe('length constraints', () => {
-    it('should truncate names longer than 63 characters', () => {
-      const longServerName = 'a'.repeat(50)
-      const longToolName = 'b'.repeat(50)
-      const result = buildFunctionCallToolName(longServerName, longToolName, 'id123456')
-
-      expect(result.length).toBeLessThanOrEqual(63)
-    })
-
-    it('should not end with underscore or dash after truncation', () => {
-      const longServerName = 'a'.repeat(50)
-      const longToolName = 'b'.repeat(50)
-      const result = buildFunctionCallToolName(longServerName, longToolName, 'id123456')
-
-      expect(result).not.toMatch(/[_-]$/)
-    })
-
-    it('should preserve serverId suffix even with long server/tool names', () => {
-      const longServerName = 'a'.repeat(50)
-      const longToolName = 'b'.repeat(50)
-      const serverId = 'server-id-xyz789'
-
-      const result = buildFunctionCallToolName(longServerName, longToolName, serverId)
-
-      // The suffix should be preserved and not truncated
-      expect(result).toContain('xyz789')
-      expect(result.length).toBeLessThanOrEqual(63)
-    })
-
-    it('should ensure two long-named servers with different IDs produce different results', () => {
-      const longServerName = 'a'.repeat(50)
-      const longToolName = 'b'.repeat(50)
-      const serverId1 = 'server-id-abc123'
-      const serverId2 = 'server-id-def456'
-
-      const result1 = buildFunctionCallToolName(longServerName, longToolName, serverId1)
-      const result2 = buildFunctionCallToolName(longServerName, longToolName, serverId2)
-
-      // Both should be within limit
-      expect(result1.length).toBeLessThanOrEqual(63)
-      expect(result2.length).toBeLessThanOrEqual(63)
-
-      // They should be different due to preserved suffix
       expect(result1).not.toBe(result2)
-    })
-  })
-
-  describe('edge cases with serverId', () => {
-    it('should handle serverId with only non-alphanumeric characters', () => {
-      const serverId = '------' // All dashes
-      const result = buildFunctionCallToolName('server', 'tool', serverId)
-
-      // Should still produce a valid unique suffix via fallback hash
-      expect(result).toBeTruthy()
-      expect(result.length).toBeLessThanOrEqual(63)
-      expect(result).toMatch(/^[a-zA-Z][a-zA-Z0-9_-]*$/)
-      // Should have a suffix (underscore followed by something)
-      expect(result).toMatch(/_[a-z0-9]+$/)
-    })
-
-    it('should produce different results for different non-alphanumeric serverIds', () => {
-      const serverId1 = '------'
-      const serverId2 = '!!!!!!'
-
-      const result1 = buildFunctionCallToolName('server', 'tool', serverId1)
-      const result2 = buildFunctionCallToolName('server', 'tool', serverId2)
-
-      // Should be different because the hash fallback produces different values
-      expect(result1).not.toBe(result2)
-    })
-
-    it('should handle empty string serverId differently from undefined', () => {
-      const resultWithEmpty = buildFunctionCallToolName('server', 'tool', '')
-      const resultWithUndefined = buildFunctionCallToolName('server', 'tool', undefined)
-
-      // Empty string is falsy, so both should behave the same (no suffix)
-      expect(resultWithEmpty).toBe(resultWithUndefined)
-    })
-
-    it('should handle serverId with mixed alphanumeric and special chars', () => {
-      const serverId = 'ab@#cd' // Mixed chars, last 6 chars contain some alphanumeric
-      const result = buildFunctionCallToolName('server', 'tool', serverId)
-
-      // Should extract alphanumeric chars: 'abcd' from 'ab@#cd'
-      expect(result).toContain('abcd')
+      expect(result3).not.toBe(result4)
     })
   })
 
   describe('real-world scenarios', () => {
-    it('should handle GitHub MCP server instances correctly', () => {
-      const serverName = 'github'
-      const toolName = 'search_repositories'
-
-      const githubComId = 'server-github-com-abc123'
-      const gheId = 'server-ghe-internal-xyz789'
-
-      const tool1 = buildFunctionCallToolName(serverName, toolName, githubComId)
-      const tool2 = buildFunctionCallToolName(serverName, toolName, gheId)
-
-      // Should be different
-      expect(tool1).not.toBe(tool2)
-
-      // Both should be valid identifiers
-      expect(tool1).toMatch(/^[a-zA-Z][a-zA-Z0-9_-]*$/)
-      expect(tool2).toMatch(/^[a-zA-Z][a-zA-Z0-9_-]*$/)
-
-      // Both should be <= 63 chars
-      expect(tool1.length).toBeLessThanOrEqual(63)
-      expect(tool2.length).toBeLessThanOrEqual(63)
+    it('should handle GitHub MCP server', () => {
+      expect(buildFunctionCallToolName('github', 'create_issue')).toBe('mcp__github__create_issue')
+      expect(buildFunctionCallToolName('github', 'search_repositories')).toBe('mcp__github__search_repositories')
+      expect(buildFunctionCallToolName('github', 'get_pull_request')).toBe('mcp__github__get_pull_request')
     })
 
-    it('should handle tool names that already include server name prefix', () => {
-      const result = buildFunctionCallToolName('github', 'github_search_repos')
-      expect(result).toBeTruthy()
-      // Should not double the server name
-      expect(result.split('github').length - 1).toBeLessThanOrEqual(2)
+    it('should handle filesystem MCP server', () => {
+      expect(buildFunctionCallToolName('filesystem', 'read_file')).toBe('mcp__filesystem__read_file')
+      expect(buildFunctionCallToolName('filesystem', 'write_file')).toBe('mcp__filesystem__write_file')
+      expect(buildFunctionCallToolName('filesystem', 'list_directory')).toBe('mcp__filesystem__list_directory')
+    })
+
+    it('should handle hyphenated server names (common in npm packages)', () => {
+      expect(buildFunctionCallToolName('cherry-fetch', 'get_page')).toBe('mcp__cherry_fetch__get_page')
+      expect(buildFunctionCallToolName('mcp-server-github', 'search')).toBe('mcp__mcp_server_github__search')
+    })
+
+    it('should handle scoped npm package style names', () => {
+      const result = buildFunctionCallToolName('@anthropic/mcp-server', 'chat')
+      expect(result).toBe('mcp__anthropic_mcp_server__chat')
+    })
+
+    it('should handle tools with long descriptive names', () => {
+      const result = buildFunctionCallToolName('github', 'search_repositories_by_language_and_stars')
+      expect(result.length).toBeLessThanOrEqual(63)
+      expect(result).toMatch(/^mcp__github__search_repositories_by_lan/)
     })
   })
 })
diff --git a/src/main/utils/__tests__/process.test.ts b/src/main/utils/__tests__/process.test.ts
index 45c0f8b42b..373a66c48f 100644
--- a/src/main/utils/__tests__/process.test.ts
+++ b/src/main/utils/__tests__/process.test.ts
@@ -1,9 +1,28 @@
-import { execFileSync } from 'child_process'
+import { configManager } from '@main/services/ConfigManager'
+import { execFileSync, spawn } from 'child_process'
+import { EventEmitter } from 'events'
 import fs from 'fs'
 import path from 'path'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-import { findExecutable, findGitBash } from '../process'
+import {
+  autoDiscoverGitBash,
+  findCommandInShellEnv,
+  findExecutable,
+  findGitBash,
+  validateGitBashPath
+} from '../process'
+
+// Mock configManager
+vi.mock('@main/services/ConfigManager', () => ({
+  ConfigKeys: {
+    GitBashPath: 'gitBashPath'
+  },
+  configManager: {
+    get: vi.fn(),
+    set: vi.fn()
+  }
+}))
 
 // Mock dependencies
 vi.mock('child_process')
@@ -289,7 +308,133 @@ describe.skipIf(process.platform !== 'win32')('process utilities', () => {
     })
   })
 
+  describe('validateGitBashPath', () => {
+    it('returns null when path is null', () => {
+      const result = validateGitBashPath(null)
+
+      expect(result).toBeNull()
+    })
+
+    it('returns null when path is undefined', () => {
+      const result = validateGitBashPath(undefined)
+
+      expect(result).toBeNull()
+    })
+
+    it('returns normalized path when valid bash.exe exists', () => {
+      const customPath = 'C:\\PortableGit\\bin\\bash.exe'
+      vi.mocked(fs.existsSync).mockImplementation((p) => p === 'C:\\PortableGit\\bin\\bash.exe')
+
+      const result = validateGitBashPath(customPath)
+
+      expect(result).toBe('C:\\PortableGit\\bin\\bash.exe')
+    })
+
+    it('returns null when file does not exist', () => {
+      vi.mocked(fs.existsSync).mockReturnValue(false)
+
+      const result = validateGitBashPath('C:\\missing\\bash.exe')
+
+      expect(result).toBeNull()
+    })
+
+    it('returns null when path is not bash.exe', () => {
+      const customPath = 'C:\\PortableGit\\bin\\git.exe'
+      vi.mocked(fs.existsSync).mockReturnValue(true)
+
+      const result = validateGitBashPath(customPath)
+
+      expect(result).toBeNull()
+    })
+  })
+
   describe('findGitBash', () => {
+    describe('customPath parameter', () => {
+      beforeEach(() => {
+        delete process.env.CLAUDE_CODE_GIT_BASH_PATH
+      })
+
+      it('uses customPath when valid', () => {
+        const customPath = 'C:\\CustomGit\\bin\\bash.exe'
+        vi.mocked(fs.existsSync).mockImplementation((p) => p === customPath)
+
+        const result = findGitBash(customPath)
+
+        expect(result).toBe(customPath)
+        expect(execFileSync).not.toHaveBeenCalled()
+      })
+
+      it('falls back when customPath is invalid', () => {
+        const customPath = 'C:\\Invalid\\bash.exe'
+        const gitPath = 'C:\\Program Files\\Git\\cmd\\git.exe'
+        const bashPath = 'C:\\Program Files\\Git\\bin\\bash.exe'
+
+        vi.mocked(fs.existsSync).mockImplementation((p) => {
+          if (p === customPath) return false
+          if (p === gitPath) return true
+          if (p === bashPath) return true
+          return false
+        })
+
+        vi.mocked(execFileSync).mockReturnValue(gitPath)
+
+        const result = findGitBash(customPath)
+
+        expect(result).toBe(bashPath)
+      })
+
+      it('prioritizes customPath over env override', () => {
+        const customPath = 'C:\\CustomGit\\bin\\bash.exe'
+        const envPath = 'C:\\EnvGit\\bin\\bash.exe'
+        process.env.CLAUDE_CODE_GIT_BASH_PATH = envPath
+
+        vi.mocked(fs.existsSync).mockImplementation((p) => p === customPath || p === envPath)
+
+        const result = findGitBash(customPath)
+
+        expect(result).toBe(customPath)
+      })
+    })
+
+    describe('env override', () => {
+      beforeEach(() => {
+        delete process.env.CLAUDE_CODE_GIT_BASH_PATH
+      })
+
+      it('uses CLAUDE_CODE_GIT_BASH_PATH when valid', () => {
+        const envPath = 'C:\\OverrideGit\\bin\\bash.exe'
+        process.env.CLAUDE_CODE_GIT_BASH_PATH = envPath
+
+        vi.mocked(fs.existsSync).mockImplementation((p) => p === envPath)
+
+        const result = findGitBash()
+
+        expect(result).toBe(envPath)
+        expect(execFileSync).not.toHaveBeenCalled()
+      })
+
+      it('falls back when CLAUDE_CODE_GIT_BASH_PATH is invalid', () => {
+        const envPath = 'C:\\Invalid\\bash.exe'
+        const gitPath = 'C:\\Program Files\\Git\\cmd\\git.exe'
+        const bashPath = 'C:\\Program Files\\Git\\bin\\bash.exe'
+
+        process.env.CLAUDE_CODE_GIT_BASH_PATH = envPath
+
+        vi.mocked(fs.existsSync).mockImplementation((p) => {
+          if (p === envPath) return false
+          if (p === gitPath) return true
+          if (p === bashPath) return true
+          return false
+        })
+
+        vi.mocked(execFileSync).mockReturnValue(gitPath)
+
+        const result = findGitBash()
+
+        expect(result).toBe(bashPath)
+      })
+    })
+
     describe('git.exe path derivation', () => {
       it('should derive bash.exe from standard Git installation (Git/cmd/git.exe)', () => {
         const gitPath = 'C:\\Program Files\\Git\\cmd\\git.exe'
@@ -569,4 +714,525 @@ describe.skipIf(process.platform !== 'win32')('process utilities', () => {
       })
     })
   })
+
+  describe('autoDiscoverGitBash', () => {
+    const originalEnvVar = process.env.CLAUDE_CODE_GIT_BASH_PATH
+
+    beforeEach(() => {
+      vi.mocked(configManager.get).mockReset()
+      vi.mocked(configManager.set).mockReset()
+      delete process.env.CLAUDE_CODE_GIT_BASH_PATH
+    })
+
+    afterEach(() => {
+      // Restore original environment variable
+      if (originalEnvVar !== undefined) {
+        process.env.CLAUDE_CODE_GIT_BASH_PATH = originalEnvVar
+      } else {
+        delete process.env.CLAUDE_CODE_GIT_BASH_PATH
+      }
+    })
+
+    /**
+     * Helper to mock fs.existsSync with a set of valid paths
+     */
+    const mockExistingPaths = (...validPaths: string[]) => {
+      vi.mocked(fs.existsSync).mockImplementation((p) => validPaths.includes(p as string))
+    }
+
+    describe('with no existing config path', () => {
+      it('should discover and persist Git Bash path when not configured', () => {
+        const bashPath = 'C:\\Program Files\\Git\\bin\\bash.exe'
+        const gitPath = 'C:\\Program Files\\Git\\cmd\\git.exe'
+
+        vi.mocked(configManager.get).mockReturnValue(undefined)
+        process.env.ProgramFiles = 'C:\\Program Files'
+        mockExistingPaths(gitPath, bashPath)
+
+        const result = autoDiscoverGitBash()
+
+        expect(result).toBe(bashPath)
+        expect(configManager.set).toHaveBeenCalledWith('gitBashPath', bashPath)
+      })
+
+      it('should return null and not persist when Git Bash is not found', () => {
+        vi.mocked(configManager.get).mockReturnValue(undefined)
+        vi.mocked(fs.existsSync).mockReturnValue(false)
+        vi.mocked(execFileSync).mockImplementation(() => {
+          throw new Error('Not found')
+        })
+
+        const result = autoDiscoverGitBash()
+
+        expect(result).toBeNull()
+        expect(configManager.set).not.toHaveBeenCalled()
+      })
+    })
+
+    describe('environment variable precedence', () => {
+      it('should use env var over valid config path', () => {
+        const envPath = 'C:\\EnvGit\\bin\\bash.exe'
+        const configPath = 'C:\\ConfigGit\\bin\\bash.exe'
+
+        process.env.CLAUDE_CODE_GIT_BASH_PATH = envPath
+        vi.mocked(configManager.get).mockReturnValue(configPath)
+        mockExistingPaths(envPath, configPath)
+
+        const result = autoDiscoverGitBash()
+
+        // Env var should take precedence
+        expect(result).toBe(envPath)
+        // Should not persist env var path (it's a runtime override)
+        expect(configManager.set).not.toHaveBeenCalled()
+      })
+
+      it('should fall back to config path when env var is invalid', () => {
+        const envPath = 'C:\\Invalid\\bash.exe'
+        const configPath = 'C:\\ConfigGit\\bin\\bash.exe'
+
+        process.env.CLAUDE_CODE_GIT_BASH_PATH = envPath
+        vi.mocked(configManager.get).mockReturnValue(configPath)
+        // Env path is invalid (doesn't exist), only config path exists
+        mockExistingPaths(configPath)
+
+        const result = autoDiscoverGitBash()
+
+        // Should fall back to config path
+        expect(result).toBe(configPath)
+        expect(configManager.set).not.toHaveBeenCalled()
+      })
+
+      it('should fall back to auto-discovery when both env var and config are invalid', () => {
+        const envPath = 'C:\\InvalidEnv\\bash.exe'
+        const configPath = 'C:\\InvalidConfig\\bash.exe'
+        const discoveredPath = 'C:\\Program Files\\Git\\bin\\bash.exe'
+        const gitPath = 'C:\\Program Files\\Git\\cmd\\git.exe'
+
+        process.env.CLAUDE_CODE_GIT_BASH_PATH = envPath
+        process.env.ProgramFiles = 'C:\\Program Files'
+        vi.mocked(configManager.get).mockReturnValue(configPath)
+        // Both env and config paths are invalid, only standard Git exists
+        mockExistingPaths(gitPath, discoveredPath)
+
+        const result = autoDiscoverGitBash()
+
+        expect(result).toBe(discoveredPath)
+        expect(configManager.set).toHaveBeenCalledWith('gitBashPath', discoveredPath)
+      })
+    })
+
+    describe('with valid existing config path', () => {
+      it('should validate and return existing path without re-discovering', () => {
+        const existingPath = 'C:\\CustomGit\\bin\\bash.exe'
+
+        vi.mocked(configManager.get).mockReturnValue(existingPath)
+        mockExistingPaths(existingPath)
+
+        const result = autoDiscoverGitBash()
+
+        expect(result).toBe(existingPath)
+        // Should not call findGitBash or persist again
+        expect(configManager.set).not.toHaveBeenCalled()
+        // Should not call execFileSync (which findGitBash would use for discovery)
+        expect(execFileSync).not.toHaveBeenCalled()
+      })
+
+      it('should not override existing valid config with auto-discovery', () => {
+        const existingPath = 'C:\\CustomGit\\bin\\bash.exe'
+        const discoveredPath = 'C:\\Program Files\\Git\\bin\\bash.exe'
+
+        vi.mocked(configManager.get).mockReturnValue(existingPath)
+        mockExistingPaths(existingPath, discoveredPath)
+
+        const result = autoDiscoverGitBash()
+
+        expect(result).toBe(existingPath)
+        expect(configManager.set).not.toHaveBeenCalled()
+      })
+    })
+
+    describe('with invalid existing config path', () => {
+      it('should attempt auto-discovery when existing path does not exist', () => {
+        const existingPath = 'C:\\NonExistent\\bin\\bash.exe'
+        const discoveredPath = 'C:\\Program Files\\Git\\bin\\bash.exe'
+        const gitPath = 'C:\\Program Files\\Git\\cmd\\git.exe'
+
+        vi.mocked(configManager.get).mockReturnValue(existingPath)
+        process.env.ProgramFiles = 'C:\\Program Files'
+        // Invalid path doesn't exist, but Git is installed at standard location
+        mockExistingPaths(gitPath, discoveredPath)
+
+        const result = autoDiscoverGitBash()
+
+        // Should discover and return the new path
+        expect(result).toBe(discoveredPath)
+        // Should persist the discovered path (overwrites invalid)
+        expect(configManager.set).toHaveBeenCalledWith('gitBashPath', discoveredPath)
+      })
+
+      it('should attempt auto-discovery when existing path is not bash.exe', () => {
+        const existingPath = 'C:\\CustomGit\\bin\\git.exe'
+        const discoveredPath = 'C:\\Program Files\\Git\\bin\\bash.exe'
+        const gitPath = 'C:\\Program Files\\Git\\cmd\\git.exe'
+
+        vi.mocked(configManager.get).mockReturnValue(existingPath)
+        process.env.ProgramFiles = 'C:\\Program Files'
+        // Invalid path exists but is not bash.exe (validation will fail)
+        // Git is installed at standard location
+        mockExistingPaths(existingPath, gitPath, discoveredPath)
+
+        const result = autoDiscoverGitBash()
+
+        // Should discover and return the new path
+        expect(result).toBe(discoveredPath)
+        // Should persist the discovered path (overwrites invalid)
+        expect(configManager.set).toHaveBeenCalledWith('gitBashPath', discoveredPath)
+      })
+
+      it('should return null when existing path is invalid and discovery fails', () => {
+        const existingPath = 'C:\\NonExistent\\bin\\bash.exe'
+
+        vi.mocked(configManager.get).mockReturnValue(existingPath)
+        vi.mocked(fs.existsSync).mockReturnValue(false)
+        vi.mocked(execFileSync).mockImplementation(() => {
+          throw new Error('Not found')
+        })
+
+        const result = autoDiscoverGitBash()
+
+        // Both validation and discovery failed
+        expect(result).toBeNull()
+        // Should not persist when discovery fails
+        expect(configManager.set).not.toHaveBeenCalled()
+      })
+    })
+
+    describe('config persistence verification', () => {
+      it('should persist discovered path with correct config key', () => {
+        const bashPath = 'C:\\Program Files\\Git\\bin\\bash.exe'
+        const gitPath = 'C:\\Program Files\\Git\\cmd\\git.exe'
+
+        vi.mocked(configManager.get).mockReturnValue(undefined)
+        process.env.ProgramFiles = 'C:\\Program Files'
+        mockExistingPaths(gitPath, bashPath)
+
+        autoDiscoverGitBash()
+
+        // Verify the exact call to configManager.set
+        expect(configManager.set).toHaveBeenCalledTimes(1)
+        expect(configManager.set).toHaveBeenCalledWith('gitBashPath', bashPath)
+      })
+
+      it('should persist on each discovery when config remains undefined', () => {
+        const bashPath = 'C:\\Program Files\\Git\\bin\\bash.exe'
+        const gitPath = 'C:\\Program Files\\Git\\cmd\\git.exe'
+
+        vi.mocked(configManager.get).mockReturnValue(undefined)
+        process.env.ProgramFiles = 'C:\\Program Files'
+        mockExistingPaths(gitPath, bashPath)
+
+        autoDiscoverGitBash()
+        autoDiscoverGitBash()
+
+        // Each call discovers and persists since config remains undefined (mocked)
+        expect(configManager.set).toHaveBeenCalledTimes(2)
+      })
+    })
+
+    describe('real-world scenarios', () => {
+      it('should discover and persist standard Git for Windows installation', () => {
+        const gitPath = 'C:\\Program Files\\Git\\cmd\\git.exe'
+        const bashPath = 'C:\\Program Files\\Git\\bin\\bash.exe'
+
+        vi.mocked(configManager.get).mockReturnValue(undefined)
+        process.env.ProgramFiles = 'C:\\Program Files'
+        mockExistingPaths(gitPath, bashPath)
+
+        const result = autoDiscoverGitBash()
+
+        expect(result).toBe(bashPath)
+        expect(configManager.set).toHaveBeenCalledWith('gitBashPath', bashPath)
+      })
+
+      it('should discover portable Git via where.exe and persist', () => {
+        const gitPath = 'D:\\PortableApps\\Git\\bin\\git.exe'
+        const bashPath = 'D:\\PortableApps\\Git\\bin\\bash.exe'
+
+        vi.mocked(configManager.get).mockReturnValue(undefined)
+
+        vi.mocked(fs.existsSync).mockImplementation((p) => {
+          const pathStr = p?.toString() || ''
+          // Common git paths don't exist
+          if (pathStr.includes('Program Files\\Git\\cmd\\git.exe')) return false
+          if (pathStr.includes('Program Files (x86)\\Git\\cmd\\git.exe')) return false
+          // Portable bash path exists
+          if (pathStr === bashPath) return true
+          return false
+        })
+
+        vi.mocked(execFileSync).mockReturnValue(gitPath)
+
+        const result = autoDiscoverGitBash()
+
+        expect(result).toBe(bashPath)
+        expect(configManager.set).toHaveBeenCalledWith('gitBashPath', bashPath)
+      })
+
+      it('should respect user-configured path over auto-discovery', () => {
+        const userConfiguredPath = 'D:\\MyGit\\bin\\bash.exe'
+        const systemPath = 'C:\\Program Files\\Git\\bin\\bash.exe'
+
+        vi.mocked(configManager.get).mockReturnValue(userConfiguredPath)
+        mockExistingPaths(userConfiguredPath, systemPath)
+
+        const result = autoDiscoverGitBash()
+
+        expect(result).toBe(userConfiguredPath)
+        expect(configManager.set).not.toHaveBeenCalled()
+        // Verify findGitBash was not called for discovery
+        expect(execFileSync).not.toHaveBeenCalled()
+      })
+    })
+  })
+})
+
+/**
+ * Helper to create a mock child process for spawn
+ */
+function createMockChildProcess() {
+  const mockChild = new EventEmitter() as EventEmitter & {
+    stdout: EventEmitter
+    stderr: EventEmitter
+    kill: ReturnType<typeof vi.fn>
+  }
+  mockChild.stdout = new EventEmitter()
+  mockChild.stderr = new EventEmitter()
+  mockChild.kill = vi.fn()
+  return mockChild
+}
+
+describe('findCommandInShellEnv', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    // Reset path.isAbsolute to real implementation for these tests
+    vi.mocked(path.isAbsolute).mockImplementation((p) => p.startsWith('/') || /^[A-Z]:/i.test(p))
+  })
+
+  describe('command name validation', () => {
+    it('should reject empty command name', async () => {
+      const result = await findCommandInShellEnv('', {})
+      expect(result).toBeNull()
+      expect(spawn).not.toHaveBeenCalled()
+    })
+
+    it('should reject command names with shell metacharacters', async () => {
+      const maliciousCommands = [
+        'npx; rm -rf /',
+        'npx && malicious',
+        'npx | cat /etc/passwd',
+        'npx`whoami`',
+        '$(whoami)',
+        'npx\nmalicious'
+      ]
+
+      for (const cmd of maliciousCommands) {
+        const result = await findCommandInShellEnv(cmd, {})
+        expect(result).toBeNull()
+        expect(spawn).not.toHaveBeenCalled()
+      }
+    })
+
+    it('should reject command names starting with hyphen', async () => {
+      const result = await findCommandInShellEnv('-npx', {})
+      expect(result).toBeNull()
+      expect(spawn).not.toHaveBeenCalled()
+    })
+
+    it('should reject path traversal attempts', async () => {
+      const pathTraversalCommands = ['../npx', '../../malicious', 'foo/bar', 'foo\\bar']
+
+      for (const cmd of pathTraversalCommands) {
+        const result = await findCommandInShellEnv(cmd, {})
+        expect(result).toBeNull()
+        expect(spawn).not.toHaveBeenCalled()
+      }
+    })
+
+    it('should reject command names exceeding max length', async () => {
+      const longCommand = 'a'.repeat(129)
+      const result = await findCommandInShellEnv(longCommand, {})
+      expect(result).toBeNull()
+      expect(spawn).not.toHaveBeenCalled()
+    })
+
+    it('should accept valid command names', async () => {
+      const mockChild = createMockChildProcess()
+      vi.mocked(spawn).mockReturnValue(mockChild as never)
+
+      // Don't await - just start the call
+      const resultPromise = findCommandInShellEnv('npx', { PATH: '/usr/bin' })
+
+      // Simulate command not found
+      mockChild.emit('close', 1)
+
+      const result = await resultPromise
+      expect(result).toBeNull()
+      expect(spawn).toHaveBeenCalled()
+    })
+
+    it('should accept command names with underscores and hyphens', async () => {
+      const mockChild = createMockChildProcess()
+      vi.mocked(spawn).mockReturnValue(mockChild as never)
+
+      const resultPromise = findCommandInShellEnv('my_command-name', { PATH: '/usr/bin' })
+      mockChild.emit('close', 1)
+
+      await resultPromise
+      expect(spawn).toHaveBeenCalled()
+    })
+
+    it('should accept command names at max length (128 chars)', async () => {
+      const mockChild = createMockChildProcess()
+      vi.mocked(spawn).mockReturnValue(mockChild as never)
+
+      const maxLengthCommand = 'a'.repeat(128)
+      const resultPromise = findCommandInShellEnv(maxLengthCommand, { PATH: '/usr/bin' })
+      mockChild.emit('close', 1)
+
+      await resultPromise
+      expect(spawn).toHaveBeenCalled()
+    })
+  })
+
+  describe.skipIf(process.platform === 'win32')('Unix/macOS behavior', () => {
+    it('should find command and return absolute path', async () => {
+      const mockChild = createMockChildProcess()
+      vi.mocked(spawn).mockReturnValue(mockChild as never)
+
+      const resultPromise = findCommandInShellEnv('npx', { PATH: '/usr/bin' })
+
+      // Simulate successful command -v output
+      mockChild.stdout.emit('data', '/usr/local/bin/npx\n')
+      mockChild.emit('close', 0)
+
+      const result = await resultPromise
+      expect(result).toBe('/usr/local/bin/npx')
+      expect(spawn).toHaveBeenCalledWith('/bin/sh', ['-c', 'command -v "$1"', '--', 'npx'], expect.any(Object))
+    })
+
+    it('should return null for non-absolute paths (aliases/builtins)', async () => {
+      const mockChild = createMockChildProcess()
+      vi.mocked(spawn).mockReturnValue(mockChild as never)
+
+      const resultPromise = findCommandInShellEnv('cd', { PATH: '/usr/bin' })
+
+      // Simulate builtin output (just command name)
+      mockChild.stdout.emit('data', 'cd\n')
+      mockChild.emit('close', 0)
+
+      const result = await resultPromise
+      expect(result).toBeNull()
+    })
+
+    it('should return null when command not found', async () => {
+      const mockChild = createMockChildProcess()
+      vi.mocked(spawn).mockReturnValue(mockChild as never)
+
+      const resultPromise = findCommandInShellEnv('nonexistent', { PATH: '/usr/bin' })
+
+      // Simulate command not found (exit code 1)
+      mockChild.emit('close', 1)
+
+      const result = await resultPromise
+      expect(result).toBeNull()
+    })
+
+    it('should handle spawn errors gracefully', async () => {
+      const mockChild = createMockChildProcess()
+      vi.mocked(spawn).mockReturnValue(mockChild as never)
+
+      const resultPromise = findCommandInShellEnv('npx', { PATH: '/usr/bin' })
+
+      // Simulate spawn error
+      mockChild.emit('error', new Error('spawn failed'))
+
+      const result = await resultPromise
+      expect(result).toBeNull()
+    })
+
+    it('should handle timeout gracefully', async () => {
+      vi.useFakeTimers()
+      const mockChild = createMockChildProcess()
+      vi.mocked(spawn).mockReturnValue(mockChild as never)
+
+      const resultPromise = findCommandInShellEnv('npx', { PATH: '/usr/bin' })
+
+      // Fast-forward past timeout (5000ms)
+      vi.advanceTimersByTime(6000)
+
+      const result = await resultPromise
+      expect(result).toBeNull()
+      expect(mockChild.kill).toHaveBeenCalledWith('SIGKILL')
+
+      vi.useRealTimers()
+    })
+  })
+
+  describe.skipIf(process.platform !== 'win32')('Windows behavior', () => {
+    it('should find .exe files via where command', async () => {
+      const mockChild = createMockChildProcess()
+      vi.mocked(spawn).mockReturnValue(mockChild as never)
+
+      const resultPromise = findCommandInShellEnv('npx', { PATH: 'C:\\nodejs' })
+
+      // Simulate where output
+      mockChild.stdout.emit('data', 'C:\\Program Files\\nodejs\\npx.exe\r\n')
+      mockChild.emit('close', 0)
+
+      const result = await resultPromise
+      expect(result).toBe('C:\\Program Files\\nodejs\\npx.exe')
+      expect(spawn).toHaveBeenCalledWith('where', ['npx'], expect.any(Object))
+    })
+
+    it('should reject .cmd files on Windows', async () => {
+      const mockChild = createMockChildProcess()
+      vi.mocked(spawn).mockReturnValue(mockChild as never)
+
+      const resultPromise = findCommandInShellEnv('npx', { PATH: 'C:\\nodejs' })
+
+      // Simulate where output with only .cmd file
+      mockChild.stdout.emit('data', 'C:\\Program Files\\nodejs\\npx.cmd\r\n')
+      mockChild.emit('close', 0)
+
+      const result = await resultPromise
+      expect(result).toBeNull()
+    })
+
+    it('should prefer .exe over .cmd when both exist', async () => {
+      const mockChild = createMockChildProcess()
+      vi.mocked(spawn).mockReturnValue(mockChild as never)
+
+      const resultPromise = findCommandInShellEnv('npx', { PATH: 'C:\\nodejs' })
+
+      // Simulate where output with both .cmd and .exe
+      mockChild.stdout.emit('data', 'C:\\Program Files\\nodejs\\npx.cmd\r\nC:\\Program Files\\nodejs\\npx.exe\r\n')
+      mockChild.emit('close', 0)
+
+      const result = await resultPromise
+      expect(result).toBe('C:\\Program Files\\nodejs\\npx.exe')
+    })
+
+    it('should handle spawn errors gracefully', async () => {
+      const mockChild = createMockChildProcess()
+      vi.mocked(spawn).mockReturnValue(mockChild as never)
+
+      const resultPromise = findCommandInShellEnv('npx', { PATH: 'C:\\nodejs' })
+
+      // Simulate spawn error
+      mockChild.emit('error', new Error('spawn failed'))
+
+      const result = await resultPromise
+      expect(result).toBeNull()
+    })
+  })
 })
diff --git a/src/main/utils/locales.ts b/src/main/utils/locales.ts
index b41cba7c75..afaf48b20f 100644
--- a/src/main/utils/locales.ts
+++ b/src/main/utils/locales.ts
@@ -8,6 +8,7 @@ import esES from '../../renderer/src/i18n/translate/es-es.json'
 import frFR from '../../renderer/src/i18n/translate/fr-fr.json'
 import JaJP from '../../renderer/src/i18n/translate/ja-jp.json'
 import ptPT from '../../renderer/src/i18n/translate/pt-pt.json'
+import roRO from '../../renderer/src/i18n/translate/ro-ro.json'
 import RuRu from '../../renderer/src/i18n/translate/ru-ru.json'
 
 const locales = Object.fromEntries(
@@ -21,7 +22,8 @@ const locales = Object.fromEntries(
     ['el-GR', elGR],
     ['es-ES', esES],
     ['fr-FR', frFR],
-    ['pt-PT', ptPT]
+    ['pt-PT', ptPT],
+    ['ro-RO', roRO]
   ].map(([locale, translation]) => [locale, { translation }])
 )
 
diff --git a/src/main/utils/mcp.ts b/src/main/utils/mcp.ts
index cfa700f2e6..34eb0e63e7 100644
--- a/src/main/utils/mcp.ts
+++ b/src/main/utils/mcp.ts
@@ -1,56 +1,28 @@
-export function buildFunctionCallToolName(serverName: string, toolName: string, serverId?: string) {
-  const sanitizedServer = serverName.trim().replace(/-/g, '_')
-  const sanitizedTool = toolName.trim().replace(/-/g, '_')
+/**
+ * Builds a valid JavaScript function name for MCP tool calls.
+ * Format: mcp__{server_name}__{tool_name}
+ *
+ * @param serverName - The MCP server name
+ * @param toolName - The tool name from the server
+ * @returns A valid JS identifier in format mcp__{server}__{tool}, max 63 chars
+ */
+export function buildFunctionCallToolName(serverName: string, toolName: string): string {
+  // Sanitize to valid JS identifier chars (alphanumeric + underscore only)
+  const sanitize = (str: string): string =>
+    str
+      .trim()
+      .replace(/[^a-zA-Z0-9]/g, '_') // Replace all non-alphanumeric with underscore
+      .replace(/_{2,}/g, '_') // Collapse multiple underscores
+      .replace(/^_+|_+$/g, '') // Trim leading/trailing underscores
 
-  // Calculate suffix first to reserve space for it
-  // Suffix format: "_" + 6 alphanumeric chars = 7 chars total
-  let serverIdSuffix = ''
-  if (serverId) {
-    // Take the last 6 characters of the serverId for brevity
-    serverIdSuffix = serverId.slice(-6).replace(/[^a-zA-Z0-9]/g, '')
+  const server = sanitize(serverName).slice(0, 20) // Keep server name short
+  const tool = sanitize(toolName).slice(0, 35) // More room for tool name
 
-    // Fallback: if suffix becomes empty (all non-alphanumeric chars), use a simple hash
-    if (!serverIdSuffix) {
-      const hash = serverId.split('').reduce((acc, char) => acc + char.charCodeAt(0), 0)
-      serverIdSuffix = hash.toString(36).slice(-6) || 'x'
-    }
-  }
+  let name = `mcp__${server}__${tool}`
 
-  // Reserve space for suffix when calculating max base name length
-  const SUFFIX_LENGTH = serverIdSuffix ? serverIdSuffix.length + 1 : 0 // +1 for underscore
-  const MAX_BASE_LENGTH = 63 - SUFFIX_LENGTH
-
-  // Combine server name and tool name
-  let name = sanitizedTool
-  if (!sanitizedTool.includes(sanitizedServer.slice(0, 7))) {
-    name = `${sanitizedServer.slice(0, 7) || ''}-${sanitizedTool || ''}`
-  }
-
-  // Replace invalid characters with underscores or dashes
-  // Keep a-z, A-Z, 0-9, underscores and dashes
-  name = name.replace(/[^a-zA-Z0-9_-]/g, '_')
-
-  // Ensure name starts with a letter or underscore (for valid JavaScript identifier)
-  if (!/^[a-zA-Z]/.test(name)) {
-    name = `tool-${name}`
-  }
-
-  // Remove consecutive underscores/dashes (optional improvement)
-  name = name.replace(/[_-]{2,}/g, '_')
-
-  // Truncate base name BEFORE adding suffix to ensure suffix is never cut off
-  if (name.length > MAX_BASE_LENGTH) {
-    name = name.slice(0, MAX_BASE_LENGTH)
-  }
-
-  // Handle edge case: ensure we still have a valid name if truncation left invalid chars at edges
-  if (name.endsWith('_') || name.endsWith('-')) {
-    name = name.slice(0, -1)
-  }
-
-  // Now append the suffix - it will always fit within 63 chars
-  if (serverIdSuffix) {
-    name = `${name}_${serverIdSuffix}`
+  // Ensure max 63 chars and clean trailing underscores
+  if (name.length > 63) {
+    name = name.slice(0, 63).replace(/_+$/, '')
   }
 
   return name
diff --git a/src/main/utils/process.ts b/src/main/utils/process.ts
index b59a37a048..7c928949fe 100644
--- a/src/main/utils/process.ts
+++ b/src/main/utils/process.ts
@@ -1,4 +1,5 @@
 import { loggerService } from '@logger'
+import type { GitBashPathInfo, GitBashPathSource } from '@shared/config/constant'
 import { HOME_CHERRY_DIR } from '@shared/config/constant'
 import { execFileSync, spawn } from 'child_process'
 import fs from 'fs'
@@ -6,6 +7,7 @@ import os from 'os'
 import path from 'path'
 
 import { isWin } from '../constant'
+import { ConfigKeys, configManager } from '../services/ConfigManager'
 import { getResourcePath } from '.'
 
 const logger = loggerService.withContext('Utils:Process')
@@ -59,7 +61,146 @@ export async function getBinaryPath(name?: string): Promise<string> {
 
 export async function isBinaryExists(name: string): Promise<boolean> {
   const cmd = await getBinaryPath(name)
-  return await fs.existsSync(cmd)
+  return fs.existsSync(cmd)
+}
+
+// Timeout for command lookup operations (in milliseconds)
+const COMMAND_LOOKUP_TIMEOUT_MS = 5000
+
+// Regex to validate command names - must start with alphanumeric or underscore, max 128 chars
+const VALID_COMMAND_NAME_REGEX = /^[a-zA-Z0-9_][a-zA-Z0-9_-]{0,127}$/
+
+// Maximum output size to prevent buffer overflow (10KB)
+const MAX_OUTPUT_SIZE = 10240
+
+/**
+ * Check if a command is available in the user's login shell environment
+ * @param command - Command name to check (e.g., 'npx', 'uvx')
+ * @param loginShellEnv - The login shell environment from getLoginShellEnvironment()
+ * @returns Full path to the command if found, null otherwise
+ */
+export async function findCommandInShellEnv(
+  command: string,
+  loginShellEnv: Record<string, string>
+): Promise<string | null> {
+  // Validate command name to prevent command injection
+  if (!VALID_COMMAND_NAME_REGEX.test(command)) {
+    logger.warn(`Invalid command name '${command}' - must only contain alphanumeric characters, underscore, or hyphen`)
+    return null
+  }
+
+  return new Promise((resolve) => {
+    let resolved = false
+
+    const safeResolve = (value: string | null) => {
+      if (resolved) return
+      resolved = true
+      resolve(value)
+    }
+
+    if (isWin) {
+      // On Windows, use 'where' command
+      const child = spawn('where', [command], {
+        env: loginShellEnv,
+        stdio: ['ignore', 'pipe', 'pipe']
+      })
+
+      let output = ''
+      const timeoutId = setTimeout(() => {
+        if (resolved) return
+        child.kill('SIGKILL')
+        logger.debug(`Timeout checking command '${command}' on Windows`)
+        safeResolve(null)
+      }, COMMAND_LOOKUP_TIMEOUT_MS)
+
+      child.stdout.on('data', (data) => {
+        if (output.length < MAX_OUTPUT_SIZE) {
+          output += data.toString()
+        }
+      })
+
+      child.on('close', (code) => {
+        clearTimeout(timeoutId)
+        if (resolved) return
+
+        if (code === 0 && output.trim()) {
+          const paths = output.trim().split(/\r?\n/)
+          // Only accept .exe files on Windows - .cmd/.bat files cannot be executed
+          // with spawn({ shell: false }) which is used by MCP SDK's StdioClientTransport
+          const exePath = paths.find((p) => p.toLowerCase().endsWith('.exe'))
+          if (exePath) {
+            logger.debug(`Found command '${command}' at: ${exePath}`)
+            safeResolve(exePath)
+          } else {
+            logger.debug(`Command '${command}' found but not as .exe (${paths[0]}), treating as not found`)
+            safeResolve(null)
+          }
+        } else {
+          logger.debug(`Command '${command}' not found in shell environment`)
+          safeResolve(null)
+        }
+      })
+
+      child.on('error', (error) => {
+        clearTimeout(timeoutId)
+        if (resolved) return
+        logger.warn(`Error checking command '${command}':`, { error, platform: 'windows' })
+        safeResolve(null)
+      })
+    } else {
+      // Unix/Linux/macOS: use 'command -v' which is POSIX standard
+      // Use /bin/sh for reliability - it's POSIX compliant and always available
+      // This avoids issues with user's custom shell (csh, fish, etc.)
+      // SECURITY: Use positional parameter $1 to prevent command injection
+      const child = spawn('/bin/sh', ['-c', 'command -v "$1"', '--', command], {
+        env: loginShellEnv,
+        stdio: ['ignore', 'pipe', 'pipe']
+      })
+
+      let output = ''
+      const timeoutId = setTimeout(() => {
+        if (resolved) return
+        child.kill('SIGKILL')
+        logger.debug(`Timeout checking command '${command}'`)
+        safeResolve(null)
+      }, COMMAND_LOOKUP_TIMEOUT_MS)
+
+      child.stdout.on('data', (data) => {
+        if (output.length < MAX_OUTPUT_SIZE) {
+          output += data.toString()
+        }
+      })
+
+      child.on('close', (code) => {
+        clearTimeout(timeoutId)
+        if (resolved) return
+
+        if (code === 0 && output.trim()) {
+          const commandPath = output.trim().split('\n')[0]
+
+          // Validate the output is an absolute path (not an alias, function, or builtin)
+          // command -v can return just the command name for aliases/builtins
+          if (path.isAbsolute(commandPath)) {
+            logger.debug(`Found command '${command}' at: ${commandPath}`)
+            safeResolve(commandPath)
+          } else {
+            logger.debug(`Command '${command}' resolved to non-path '${commandPath}', treating as not found`)
+            safeResolve(null)
+          }
+        } else {
+          logger.debug(`Command '${command}' not found in shell environment`)
+          safeResolve(null)
+        }
+      })
+
+      child.on('error', (error) => {
+        clearTimeout(timeoutId)
+        if (resolved) return
+        logger.warn(`Error checking command '${command}':`, { error, platform: 'unix' })
+        safeResolve(null)
+      })
+    }
+  })
 }
 
 /**
@@ -131,15 +272,37 @@ export function findExecutable(name: string): string | null {
 
 /**
  * Find Git Bash executable on Windows
+ * @param customPath - Optional custom path from config
  * @returns Full path to bash.exe or null if not found
  */
-export function findGitBash(): string | null {
+export function findGitBash(customPath?: string | null): string | null {
   // Git Bash is Windows-only
   if (!isWin) {
     return null
   }
 
-  // 1. Find git.exe and derive bash.exe path
+  // 1. Check custom path from config first
+  if (customPath) {
+    const validated = validateGitBashPath(customPath)
+    if (validated) {
+      logger.debug('Using custom Git Bash path from config', { path: validated })
+      return validated
+    }
+    logger.warn('Custom Git Bash path provided but invalid', { path: customPath })
+  }
+
+  // 2. Check environment variable override
+  const envOverride = process.env.CLAUDE_CODE_GIT_BASH_PATH
+  if (envOverride) {
+    const validated = validateGitBashPath(envOverride)
+    if (validated) {
+      logger.debug('Using CLAUDE_CODE_GIT_BASH_PATH override for bash.exe', { path: validated })
+      return validated
+    }
+    logger.warn('CLAUDE_CODE_GIT_BASH_PATH provided but path is invalid', { path: envOverride })
+  }
+
+  // 3. Find git.exe and derive bash.exe path
   const gitPath = findExecutable('git')
   if (gitPath) {
     // Try multiple possible locations for bash.exe relative to git.exe
@@ -164,7 +327,7 @@ export function findGitBash(): string | null {
     })
   }
 
-  // 2. Fallback: check common Git Bash paths directly
+  // 4. Fallback: check common Git Bash paths directly
   const commonBashPaths = [
     path.join(process.env.ProgramFiles || 'C:\\Program Files', 'Git', 'bin', 'bash.exe'),
     path.join(process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'Git', 'bin', 'bash.exe'),
@@ -181,3 +344,99 @@ export function findGitBash(): string | null {
   logger.debug('Git Bash not found - checked git derivation and common paths')
   return null
 }
+
+export function validateGitBashPath(customPath?: string | null): string | null {
+  if (!customPath) {
+    return null
+  }
+
+  const resolved = path.resolve(customPath)
+
+  if (!fs.existsSync(resolved)) {
+    logger.warn('Custom Git Bash path does not exist', { path: resolved })
+    return null
+  }
+
+  const isExe = resolved.toLowerCase().endsWith('bash.exe')
+  if (!isExe) {
+    logger.warn('Custom Git Bash path is not bash.exe', { path: resolved })
+    return null
+  }
+
+  logger.debug('Validated custom Git Bash path', { path: resolved })
+  return resolved
+}
+
+/**
+ * Auto-discover and persist Git Bash path if not already configured
+ * Only called when Git Bash is actually needed
+ *
+ * Precedence order:
+ * 1. CLAUDE_CODE_GIT_BASH_PATH environment variable (highest - runtime override)
+ * 2. Configured path from settings (manual or auto)
+ * 3. Auto-discovery via findGitBash (only if no valid config exists)
+ */
+export function autoDiscoverGitBash(): string | null {
+  if (!isWin) {
+    return null
+  }
+
+  // 1. Check environment variable override first (highest priority)
+  const envOverride = process.env.CLAUDE_CODE_GIT_BASH_PATH
+  if (envOverride) {
+    const validated = validateGitBashPath(envOverride)
+    if (validated) {
+      logger.debug('Using CLAUDE_CODE_GIT_BASH_PATH override', { path: validated })
+      return validated
+    }
+    logger.warn('CLAUDE_CODE_GIT_BASH_PATH provided but path is invalid', { path: envOverride })
+  }
+
+  // 2. Check if a path is already configured
+  const existingPath = configManager.get<string | undefined>(ConfigKeys.GitBashPath)
+  const existingSource = configManager.get<GitBashPathSource | undefined>(ConfigKeys.GitBashPathSource)
+
+  if (existingPath) {
+    const validated = validateGitBashPath(existingPath)
+    if (validated) {
+      return validated
+    }
+    // Existing path is invalid, try to auto-discover
+    logger.warn('Existing Git Bash path is invalid, attempting auto-discovery', {
+      path: existingPath,
+      source: existingSource
+    })
+  }
+
+  // 3. Try to find Git Bash via auto-discovery
+  const discoveredPath = findGitBash()
+  if (discoveredPath) {
+    // Persist the discovered path with 'auto' source
+    configManager.set(ConfigKeys.GitBashPath, discoveredPath)
+    configManager.set(ConfigKeys.GitBashPathSource, 'auto')
+    logger.info('Auto-discovered Git Bash path', { path: discoveredPath })
+  }
+
+  return discoveredPath
+}
+
+/**
+ * Get Git Bash path info including source
+ * If no path is configured, triggers auto-discovery first
+ */
+export function getGitBashPathInfo(): GitBashPathInfo {
+  if (!isWin) {
+    return { path: null, source: null }
+  }
+
+  let path = configManager.get<string | null>(ConfigKeys.GitBashPath) ?? null
+  let source = configManager.get<GitBashPathSource | null>(ConfigKeys.GitBashPathSource) ?? null
+
+  // If no path configured, trigger auto-discovery (handles upgrade from old versions)
+  if (!path) {
+    path = autoDiscoverGitBash()
+    source = path ? 'auto' : null
+  }
+
+  return { path, source }
+}
diff --git a/src/main/utils/system.ts b/src/main/utils/system.ts
new file mode 100644
index 0000000000..2cd9e4bf22
--- /dev/null
+++ b/src/main/utils/system.ts
@@ -0,0 +1,19 @@
+import os from 'node:os'
+
+import { isMac, isWin } from '@main/constant'
+
+export const getDeviceType = () => (isMac ? 'mac' : isWin ? 'windows' : 'linux')
+
+export const getHostname = () => os.hostname()
+
+export const getCpuName = () => {
+  try {
+    const cpus = os.cpus()
+    if (!cpus || cpus.length === 0 || !cpus[0].model) {
+      return 'Unknown CPU'
+    }
+    return cpus[0].model
+  } catch {
+    return 'Unknown CPU'
+  }
+}
diff --git a/src/preload/index.ts b/src/preload/index.ts
index 0a3b141110..b27ecc68d4 100644
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -2,9 +2,18 @@ import type { PermissionUpdate } from '@anthropic-ai/claude-agent-sdk'
 import { electronAPI } from '@electron-toolkit/preload'
 import type { SpanEntity, TokenUsage } from '@mcp-trace/trace-core'
 import type { SpanContext } from '@opentelemetry/api'
-import type { TerminalConfig, UpgradeChannel } from '@shared/config/constant'
+import type { GitBashPathInfo, TerminalConfig, UpgradeChannel } from '@shared/config/constant'
 import type { LogLevel, LogSourceWithContext } from '@shared/config/logger'
-import type { FileChangeEvent, WebviewKeyEvent } from '@shared/config/types'
+import type {
+  FileChangeEvent,
+  LanClientEvent,
+  LanFileCompleteMessage,
+  LanHandshakeAckMessage,
+  LocalTransferConnectPayload,
+  LocalTransferState,
+  WebviewKeyEvent
+} from '@shared/config/types'
+import type { MCPServerLogEntry } from '@shared/config/types'
 import { IpcChannel } from '@shared/IpcChannel'
 import type { Notification } from '@types'
 import type {
@@ -123,7 +132,11 @@ const api = {
     getDeviceType: () => ipcRenderer.invoke(IpcChannel.System_GetDeviceType),
     getHostname: () => ipcRenderer.invoke(IpcChannel.System_GetHostname),
     getCpuName: () => ipcRenderer.invoke(IpcChannel.System_GetCpuName),
-    checkGitBash: (): Promise<boolean> => ipcRenderer.invoke(IpcChannel.System_CheckGitBash)
+    checkGitBash: (): Promise<boolean> => ipcRenderer.invoke(IpcChannel.System_CheckGitBash),
+    getGitBashPath: (): Promise<string | null> => ipcRenderer.invoke(IpcChannel.System_GetGitBashPath),
+    getGitBashPathInfo: (): Promise<GitBashPathInfo> => ipcRenderer.invoke(IpcChannel.System_GetGitBashPathInfo),
+    setGitBashPath: (newPath: string | null): Promise<boolean> =>
+      ipcRenderer.invoke(IpcChannel.System_SetGitBashPath, newPath)
   },
   devTools: {
     toggle: () => ipcRenderer.invoke(IpcChannel.System_ToggleDevTools)
@@ -167,7 +180,11 @@ const api = {
     listS3Files: (s3Config: S3Config) => ipcRenderer.invoke(IpcChannel.Backup_ListS3Files, s3Config),
     deleteS3File: (fileName: string, s3Config: S3Config) =>
       ipcRenderer.invoke(IpcChannel.Backup_DeleteS3File, fileName, s3Config),
-    checkS3Connection: (s3Config: S3Config) => ipcRenderer.invoke(IpcChannel.Backup_CheckS3Connection, s3Config)
+    checkS3Connection: (s3Config: S3Config) => ipcRenderer.invoke(IpcChannel.Backup_CheckS3Connection, s3Config),
+    createLanTransferBackup: (data: string): Promise<string> =>
+      ipcRenderer.invoke(IpcChannel.Backup_CreateLanTransferBackup, data),
+    deleteTempBackup: (filePath: string): Promise<boolean> =>
+      ipcRenderer.invoke(IpcChannel.Backup_DeleteTempBackup, filePath)
   },
   file: {
     select: (options?: OpenDialogOptions): Promise<FileMetadata[] | null> =>
@@ -338,7 +355,8 @@ const api = {
     deleteUser: (userId: string) => ipcRenderer.invoke(IpcChannel.Memory_DeleteUser, userId),
     deleteAllMemoriesForUser: (userId: string) =>
       ipcRenderer.invoke(IpcChannel.Memory_DeleteAllMemoriesForUser, userId),
-    getUsersList: () => ipcRenderer.invoke(IpcChannel.Memory_GetUsersList)
+    getUsersList: () => ipcRenderer.invoke(IpcChannel.Memory_GetUsersList),
+    migrateMemoryDb: () => ipcRenderer.invoke(IpcChannel.Memory_MigrateMemoryDb)
   },
   window: {
     setMinimumSize: (width: number, height: number) =>
@@ -367,6 +385,7 @@ const api = {
       ipcRenderer.invoke(IpcChannel.VertexAI_ClearAuthCache, projectId, clientEmail)
   },
   ovms: {
+    isSupported: (): Promise<boolean> => ipcRenderer.invoke(IpcChannel.Ovms_IsSupported),
     addModel: (modelName: string, modelId: string, modelSource: string, task: string) =>
       ipcRenderer.invoke(IpcChannel.Ovms_AddModel, modelName, modelId, modelSource, task),
     stopAddModel: () => ipcRenderer.invoke(IpcChannel.Ovms_StopAddModel),
@@ -417,7 +436,16 @@ const api = {
     },
     abortTool: (callId: string) => ipcRenderer.invoke(IpcChannel.Mcp_AbortTool, callId),
     getServerVersion: (server: MCPServer): Promise<string | null> =>
-      ipcRenderer.invoke(IpcChannel.Mcp_GetServerVersion, server)
+      ipcRenderer.invoke(IpcChannel.Mcp_GetServerVersion, server),
+    getServerLogs: (server: MCPServer): Promise<MCPServerLogEntry[]> =>
+      ipcRenderer.invoke(IpcChannel.Mcp_GetServerLogs, server),
+    onServerLog: (callback: (log: MCPServerLogEntry & { serverId?: string }) => void) => {
+      const listener = (_event: Electron.IpcRendererEvent, log: MCPServerLogEntry & { serverId?: string }) => {
+        callback(log)
+      }
+      ipcRenderer.on(IpcChannel.Mcp_ServerLog, listener)
+      return () => ipcRenderer.off(IpcChannel.Mcp_ServerLog, listener)
+    }
   },
   python: {
     execute: (script: string, context?: Record<string, any>, timeout?: number) =>
@@ -460,7 +488,7 @@ const api = {
       ipcRenderer.invoke(IpcChannel.Nutstore_GetDirectoryContents, token, path)
   },
   searchService: {
-    openSearchWindow: (uid: string) => ipcRenderer.invoke(IpcChannel.SearchWindow_Open, uid),
+    openSearchWindow: (uid: string, show?: boolean) => ipcRenderer.invoke(IpcChannel.SearchWindow_Open, uid, show),
     closeSearchWindow: (uid: string) => ipcRenderer.invoke(IpcChannel.SearchWindow_Close, uid),
     openUrlInSearchWindow: (uid: string, url: string) => ipcRenderer.invoke(IpcChannel.SearchWindow_OpenUrl, uid, url)
   },
@@ -469,6 +497,8 @@ const api = {
       ipcRenderer.invoke(IpcChannel.Webview_SetOpenLinkExternal, webviewId, isExternal),
     setSpellCheckEnabled: (webviewId: number, isEnable: boolean) =>
       ipcRenderer.invoke(IpcChannel.Webview_SetSpellCheckEnabled, webviewId, isEnable),
+    printToPDF: (webviewId: number) => ipcRenderer.invoke(IpcChannel.Webview_PrintToPDF, webviewId),
+    saveAsHTML: (webviewId: number) => ipcRenderer.invoke(IpcChannel.Webview_SaveAsHTML, webviewId),
     onFindShortcut: (callback: (payload: WebviewKeyEvent) => void) => {
       const listener = (_event: Electron.IpcRendererEvent, payload: WebviewKeyEvent) => {
         callback(payload)
@@ -501,7 +531,10 @@ const api = {
       ipcRenderer.invoke(IpcChannel.Selection_ProcessAction, actionItem, isFullScreen),
     closeActionWindow: () => ipcRenderer.invoke(IpcChannel.Selection_ActionWindowClose),
     minimizeActionWindow: () => ipcRenderer.invoke(IpcChannel.Selection_ActionWindowMinimize),
-    pinActionWindow: (isPinned: boolean) => ipcRenderer.invoke(IpcChannel.Selection_ActionWindowPin, isPinned)
+    pinActionWindow: (isPinned: boolean) => ipcRenderer.invoke(IpcChannel.Selection_ActionWindowPin, isPinned),
+    // [Windows only] Electron bug workaround - can be removed once https://github.com/electron/electron/issues/48554 is fixed
+    resizeActionWindow: (deltaX: number, deltaY: number, direction: string) =>
+      ipcRenderer.invoke(IpcChannel.Selection_ActionWindowResize, deltaX, deltaY, direction)
   },
   agentTools: {
     respondToPermission: (payload: {
@@ -615,12 +648,32 @@ const api = {
     writeContent: (options: WritePluginContentOptions): Promise<PluginResult<void>> =>
       ipcRenderer.invoke(IpcChannel.ClaudeCodePlugin_WriteContent, options)
   },
-  webSocket: {
-    start: () => ipcRenderer.invoke(IpcChannel.WebSocket_Start),
-    stop: () => ipcRenderer.invoke(IpcChannel.WebSocket_Stop),
-    status: () => ipcRenderer.invoke(IpcChannel.WebSocket_Status),
-    sendFile: (filePath: string) => ipcRenderer.invoke(IpcChannel.WebSocket_SendFile, filePath),
-    getAllCandidates: () => ipcRenderer.invoke(IpcChannel.WebSocket_GetAllCandidates)
+  localTransfer: {
+    getState: (): Promise<LocalTransferState> => ipcRenderer.invoke(IpcChannel.LocalTransfer_ListServices),
+    startScan: (): Promise<LocalTransferState> => ipcRenderer.invoke(IpcChannel.LocalTransfer_StartScan),
+    stopScan: (): Promise<LocalTransferState> => ipcRenderer.invoke(IpcChannel.LocalTransfer_StopScan),
+    connect: (payload: LocalTransferConnectPayload): Promise<LanHandshakeAckMessage> =>
+      ipcRenderer.invoke(IpcChannel.LocalTransfer_Connect, payload),
+    disconnect: (): Promise<void> => ipcRenderer.invoke(IpcChannel.LocalTransfer_Disconnect),
+    onServicesUpdated: (callback: (state: LocalTransferState) => void): (() => void) => {
+      const channel = IpcChannel.LocalTransfer_ServicesUpdated
+      const listener = (_: Electron.IpcRendererEvent, state: LocalTransferState) => callback(state)
+      ipcRenderer.on(channel, listener)
+      return () => {
+        ipcRenderer.removeListener(channel, listener)
+      }
+    },
+    onClientEvent: (callback: (event: LanClientEvent) => void): (() => void) => {
+      const channel = IpcChannel.LocalTransfer_ClientEvent
+      const listener = (_: Electron.IpcRendererEvent, event: LanClientEvent) => callback(event)
+      ipcRenderer.on(channel, listener)
+      return () => {
+        ipcRenderer.removeListener(channel, listener)
+      }
+    },
+    sendFile: (filePath: string): Promise<LanFileCompleteMessage> =>
+      ipcRenderer.invoke(IpcChannel.LocalTransfer_SendFile, { filePath }),
+    cancelTransfer: (): Promise<void> => ipcRenderer.invoke(IpcChannel.LocalTransfer_CancelTransfer)
   }
 }
 
diff --git a/src/renderer/src/aiCore/chunk/AiSdkToChunkAdapter.ts b/src/renderer/src/aiCore/chunk/AiSdkToChunkAdapter.ts
index 5de2ac3453..5d418de08b 100644
--- a/src/renderer/src/aiCore/chunk/AiSdkToChunkAdapter.ts
+++ b/src/renderer/src/aiCore/chunk/AiSdkToChunkAdapter.ts
@@ -120,6 +120,21 @@ export class AiSdkToChunkAdapter {
     }
   }
 
+  /**
+   * 如果有累积的思考内容，发送 THINKING_COMPLETE chunk 并清空
+   * @param final 包含 reasoningContent 的状态对象
+   * @returns 是否发送了 THINKING_COMPLETE chunk
+   */
+  private emitThinkingCompleteIfNeeded(final: { reasoningContent: string; [key: string]: any }) {
+    if (final.reasoningContent) {
+      this.onChunk({
+        type: ChunkType.THINKING_COMPLETE,
+        text: final.reasoningContent
+      })
+      final.reasoningContent = ''
+    }
+  }
+
   /**
    * 转换 AI SDK chunk 为 Cherry Studio chunk 并调用回调
    * @param chunk AI SDK 的 chunk 数据
@@ -145,6 +160,9 @@ export class AiSdkToChunkAdapter {
       }
       // === 文本相关事件 ===
       case 'text-start':
+        // 如果有未完成的思考内容，先生成 THINKING_COMPLETE
+        // 这处理了某些提供商不发送 reasoning-end 事件的情况
+        this.emitThinkingCompleteIfNeeded(final)
         this.onChunk({
           type: ChunkType.TEXT_START
         })
@@ -215,11 +233,7 @@ export class AiSdkToChunkAdapter {
         })
         break
       case 'reasoning-end':
-        this.onChunk({
-          type: ChunkType.THINKING_COMPLETE,
-          text: final.reasoningContent || ''
-        })
-        final.reasoningContent = ''
+        this.emitThinkingCompleteIfNeeded(final)
         break
 
       // === 工具调用相关事件（原始 AI SDK 事件，如果没有被中间件处理） ===
diff --git a/src/renderer/src/aiCore/index_new.ts b/src/renderer/src/aiCore/index_new.ts
index 4379547a3c..5c84a7254e 100644
--- a/src/renderer/src/aiCore/index_new.ts
+++ b/src/renderer/src/aiCore/index_new.ts
@@ -91,7 +91,9 @@ export default class ModernAiProvider {
     if (this.isModel(modelOrProvider)) {
       // 传入的是 Model
       this.model = modelOrProvider
-      this.actualProvider = provider ? adaptProvider({ provider }) : getActualProvider(modelOrProvider)
+      this.actualProvider = provider
+        ? adaptProvider({ provider, model: modelOrProvider })
+        : getActualProvider(modelOrProvider)
       // 只保存配置，不预先创建executor
       this.config = providerToAiSdkConfig(this.actualProvider, modelOrProvider)
     } else {
diff --git a/src/renderer/src/aiCore/legacy/clients/BaseApiClient.ts b/src/renderer/src/aiCore/legacy/clients/BaseApiClient.ts
index 92f24b4abe..5d435b9074 100644
--- a/src/renderer/src/aiCore/legacy/clients/BaseApiClient.ts
+++ b/src/renderer/src/aiCore/legacy/clients/BaseApiClient.ts
@@ -2,9 +2,10 @@ import { loggerService } from '@logger'
 import {
   getModelSupportedVerbosity,
   isFunctionCallingModel,
-  isNotSupportTemperatureAndTopP,
   isOpenAIModel,
-  isSupportFlexServiceTierModel
+  isSupportFlexServiceTierModel,
+  isSupportTemperatureModel,
+  isSupportTopPModel
 } from '@renderer/config/models'
 import { REFERENCE_PROMPT } from '@renderer/config/prompts'
 import { getLMStudioKeepAliveTime } from '@renderer/hooks/useLMStudio'
@@ -200,7 +201,7 @@ export abstract class BaseApiClient<
   }
 
   public getTemperature(assistant: Assistant, model: Model): number | undefined {
-    if (isNotSupportTemperatureAndTopP(model)) {
+    if (!isSupportTemperatureModel(model)) {
       return undefined
     }
     const assistantSettings = getAssistantSettings(assistant)
@@ -208,7 +209,7 @@ export abstract class BaseApiClient<
   }
 
   public getTopP(assistant: Assistant, model: Model): number | undefined {
-    if (isNotSupportTemperatureAndTopP(model)) {
+    if (!isSupportTopPModel(model)) {
       return undefined
     }
     const assistantSettings = getAssistantSettings(assistant)
diff --git a/src/renderer/src/aiCore/legacy/clients/__tests__/OpenAIBaseClient.azureEndpoint.test.ts b/src/renderer/src/aiCore/legacy/clients/__tests__/OpenAIBaseClient.azureEndpoint.test.ts
new file mode 100644
index 0000000000..e3b2ef2676
--- /dev/null
+++ b/src/renderer/src/aiCore/legacy/clients/__tests__/OpenAIBaseClient.azureEndpoint.test.ts
@@ -0,0 +1,38 @@
+import { describe, expect, it } from 'vitest'
+
+import { normalizeAzureOpenAIEndpoint } from '../openai/azureOpenAIEndpoint'
+
+describe('normalizeAzureOpenAIEndpoint', () => {
+  it.each([
+    {
+      apiHost: 'https://example.openai.azure.com/openai',
+      expectedEndpoint: 'https://example.openai.azure.com'
+    },
+    {
+      apiHost: 'https://example.openai.azure.com/openai/',
+      expectedEndpoint: 'https://example.openai.azure.com'
+    },
+    {
+      apiHost: 'https://example.openai.azure.com/openai/v1',
+      expectedEndpoint: 'https://example.openai.azure.com'
+    },
+    {
+      apiHost: 'https://example.openai.azure.com/openai/v1/',
+      expectedEndpoint: 'https://example.openai.azure.com'
+    },
+    {
+      apiHost: 'https://example.openai.azure.com',
+      expectedEndpoint: 'https://example.openai.azure.com'
+    },
+    {
+      apiHost: 'https://example.openai.azure.com/',
+      expectedEndpoint: 'https://example.openai.azure.com'
+    },
+    {
+      apiHost: 'https://example.openai.azure.com/OPENAI/V1',
+      expectedEndpoint: 'https://example.openai.azure.com'
+    }
+  ])('strips trailing /openai from $apiHost', ({ apiHost, expectedEndpoint }) => {
+    expect(normalizeAzureOpenAIEndpoint(apiHost)).toBe(expectedEndpoint)
+  })
+})
diff --git a/src/renderer/src/aiCore/legacy/clients/anthropic/AnthropicAPIClient.ts b/src/renderer/src/aiCore/legacy/clients/anthropic/AnthropicAPIClient.ts
index 15f3cf1007..9b63b77ddf 100644
--- a/src/renderer/src/aiCore/legacy/clients/anthropic/AnthropicAPIClient.ts
+++ b/src/renderer/src/aiCore/legacy/clients/anthropic/AnthropicAPIClient.ts
@@ -124,7 +124,8 @@ export class AnthropicAPIClient extends BaseApiClient<
 
   override async listModels(): Promise<Anthropic.ModelInfo[]> {
     const sdk = (await this.getSdkInstance()) as Anthropic
-    const response = await sdk.models.list()
+    // prevent auto appended /v1. It's included in baseUrl.
+    const response = await sdk.models.list({ path: '/models' })
     return response.data
   }
 
diff --git a/src/renderer/src/aiCore/legacy/clients/gemini/GeminiAPIClient.ts b/src/renderer/src/aiCore/legacy/clients/gemini/GeminiAPIClient.ts
index 9c930a33ec..d7f14326f6 100644
--- a/src/renderer/src/aiCore/legacy/clients/gemini/GeminiAPIClient.ts
+++ b/src/renderer/src/aiCore/legacy/clients/gemini/GeminiAPIClient.ts
@@ -46,7 +46,6 @@ import type {
   GeminiSdkRawOutput,
   GeminiSdkToolCall
 } from '@renderer/types/sdk'
-import { getTrailingApiVersion, withoutTrailingApiVersion } from '@renderer/utils'
 import { isToolUseModeFunction } from '@renderer/utils/assistant'
 import {
   geminiFunctionCallToMcpTool,
@@ -56,6 +55,7 @@ import {
 } from '@renderer/utils/mcp-tools'
 import { findFileBlocks, findImageBlocks, getMainTextContent } from '@renderer/utils/messageUtils/find'
 import { defaultTimeout, MB } from '@shared/config/constant'
+import { getTrailingApiVersion, withoutTrailingApiVersion } from '@shared/utils'
 import { t } from 'i18next'
 
 import type { GenericChunk } from '../../middleware/schemas'
@@ -173,13 +173,15 @@ export class GeminiAPIClient extends BaseApiClient<
       return this.sdkInstance
     }
 
+    const apiVersion = this.getApiVersion()
+
     this.sdkInstance = new GoogleGenAI({
       vertexai: false,
       apiKey: this.apiKey,
-      apiVersion: this.getApiVersion(),
+      apiVersion,
       httpOptions: {
         baseUrl: this.getBaseURL(),
-        apiVersion: this.getApiVersion(),
+        apiVersion,
         headers: {
           ...this.provider.extra_headers
         }
@@ -200,7 +202,7 @@ export class GeminiAPIClient extends BaseApiClient<
       return trailingVersion
     }
 
-    return 'v1beta'
+    return ''
   }
 
   /**
diff --git a/src/renderer/src/aiCore/legacy/clients/openai/OpenAIApiClient.ts b/src/renderer/src/aiCore/legacy/clients/openai/OpenAIApiClient.ts
index cfc9087545..73a5bed4fe 100644
--- a/src/renderer/src/aiCore/legacy/clients/openai/OpenAIApiClient.ts
+++ b/src/renderer/src/aiCore/legacy/clients/openai/OpenAIApiClient.ts
@@ -10,7 +10,7 @@ import { DEFAULT_MAX_TOKENS } from '@renderer/config/constant'
 import {
   findTokenLimit,
   GEMINI_FLASH_MODEL_REGEX,
-  getThinkModelType,
+  getModelSupportedReasoningEffortOptions,
   isDeepSeekHybridInferenceModel,
   isDoubaoThinkingAutoModel,
   isGPT5SeriesModel,
@@ -33,7 +33,6 @@ import {
   isSupportedThinkingTokenQwenModel,
   isSupportedThinkingTokenZhipuModel,
   isVisionModel,
-  MODEL_SUPPORTED_REASONING_EFFORT,
   ZHIPU_RESULT_TOKENS
 } from '@renderer/config/models'
 import { mapLanguageToQwenMTModel } from '@renderer/config/translate'
@@ -143,6 +142,10 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
       return { thinking: { type: reasoningEffort ? 'enabled' : 'disabled' } }
     }
 
+    if (reasoningEffort === 'default') {
+      return {}
+    }
+
     if (!reasoningEffort) {
       // DeepSeek hybrid inference models, v3.1 and maybe more in the future
       // 不同的 provider 有不同的思考控制方式，在这里统一解决
@@ -304,16 +307,15 @@ export class OpenAIAPIClient extends OpenAIBaseClient<
     // Grok models/Perplexity models/OpenAI models
     if (isSupportedReasoningEffortModel(model)) {
       // 检查模型是否支持所选选项
-      const modelType = getThinkModelType(model)
-      const supportedOptions = MODEL_SUPPORTED_REASONING_EFFORT[modelType]
-      if (supportedOptions.includes(reasoningEffort)) {
+      const supportedOptions = getModelSupportedReasoningEffortOptions(model)?.filter((option) => option !== 'default')
+      if (supportedOptions?.includes(reasoningEffort)) {
         return {
           reasoning_effort: reasoningEffort
         }
       } else {
         // 如果不支持，fallback到第一个支持的值
         return {
-          reasoning_effort: supportedOptions[0]
+          reasoning_effort: supportedOptions?.[0]
         }
       }
     }
diff --git a/src/renderer/src/aiCore/legacy/clients/openai/OpenAIBaseClient.ts b/src/renderer/src/aiCore/legacy/clients/openai/OpenAIBaseClient.ts
index dc97e74a3c..efc3f4f7ce 100644
--- a/src/renderer/src/aiCore/legacy/clients/openai/OpenAIBaseClient.ts
+++ b/src/renderer/src/aiCore/legacy/clients/openai/OpenAIBaseClient.ts
@@ -25,10 +25,11 @@ import type {
   OpenAISdkRawOutput,
   ReasoningEffortOptionalParams
 } from '@renderer/types/sdk'
-import { formatApiHost, withoutTrailingSlash } from '@renderer/utils/api'
+import { withoutTrailingSlash } from '@renderer/utils/api'
 import { isOllamaProvider } from '@renderer/utils/provider'
 
 import { BaseApiClient } from '../BaseApiClient'
+import { normalizeAzureOpenAIEndpoint } from './azureOpenAIEndpoint'
 
 const logger = loggerService.withContext('OpenAIBaseClient')
 
@@ -49,8 +50,9 @@ export abstract class OpenAIBaseClient<
   }
 
   // 仅适用于openai
-  override getBaseURL(isSupportedAPIVerion: boolean = true): string {
-    return formatApiHost(this.provider.apiHost, isSupportedAPIVerion)
+  override getBaseURL(): string {
+    // apiHost is formatted when called by AiProvider
+    return this.provider.apiHost
   }
 
   override async generateImage({
@@ -68,7 +70,7 @@ export abstract class OpenAIBaseClient<
     const sdk = await this.getSdkInstance()
     const response = (await sdk.request({
       method: 'post',
-      path: '/images/generations',
+      path: '/v1/images/generations',
       signal,
       body: {
         model,
@@ -87,7 +89,11 @@ export abstract class OpenAIBaseClient<
   }
 
   override async getEmbeddingDimensions(model: Model): Promise<number> {
-    const sdk = await this.getSdkInstance()
+    let sdk: OpenAI = await this.getSdkInstance()
+    if (isOllamaProvider(this.provider)) {
+      const embedBaseUrl = `${this.provider.apiHost.replace(/(\/(api|v1))\/?$/, '')}/v1`
+      sdk = sdk.withOptions({ baseURL: embedBaseUrl })
+    }
 
     const data = await sdk.embeddings.create({
       model: model.id,
@@ -100,6 +106,17 @@ export abstract class OpenAIBaseClient<
   override async listModels(): Promise<OpenAI.Models.Model[]> {
     try {
       const sdk = await this.getSdkInstance()
+      if (this.provider.id === 'openrouter') {
+        // https://openrouter.ai/docs/api/api-reference/embeddings/list-embeddings-models
+        const embedBaseUrl = 'https://openrouter.ai/api/v1/embeddings'
+        const embedSdk = sdk.withOptions({ baseURL: embedBaseUrl })
+        const modelPromise = sdk.models.list()
+        const embedModelPromise = embedSdk.models.list()
+        const [modelResponse, embedModelResponse] = await Promise.all([modelPromise, embedModelPromise])
+        const models = [...modelResponse.data, ...embedModelResponse.data]
+        const uniqueModels = Array.from(new Map(models.map((model) => [model.id, model])).values())
+        return uniqueModels.filter(isSupportedModel)
+      }
       if (this.provider.id === 'github') {
         // GitHub Models 其 models 和 chat completions 两个接口的 baseUrl 不一样
         const baseUrl = 'https://models.github.ai/catalog/'
@@ -118,7 +135,7 @@ export abstract class OpenAIBaseClient<
       }
 
       if (isOllamaProvider(this.provider)) {
-        const baseUrl = withoutTrailingSlash(this.getBaseURL(false))
+        const baseUrl = withoutTrailingSlash(this.getBaseURL())
           .replace(/\/v1$/, '')
           .replace(/\/api$/, '')
         const response = await fetch(`${baseUrl}/api/tags`, {
@@ -173,6 +190,7 @@ export abstract class OpenAIBaseClient<
 
     let apiKeyForSdkInstance = this.apiKey
     let baseURLForSdkInstance = this.getBaseURL()
+    logger.debug('baseURLForSdkInstance', { baseURLForSdkInstance })
     let headersForSdkInstance = {
       ...this.defaultHeaders(),
       ...this.provider.extra_headers
@@ -184,7 +202,7 @@ export abstract class OpenAIBaseClient<
       // this.provider.apiKey不允许修改
       // this.provider.apiKey = token
       apiKeyForSdkInstance = token
-      baseURLForSdkInstance = this.getBaseURL(false)
+      baseURLForSdkInstance = this.getBaseURL()
       headersForSdkInstance = {
         ...headersForSdkInstance,
         ...COPILOT_DEFAULT_HEADERS
@@ -196,7 +214,7 @@ export abstract class OpenAIBaseClient<
         dangerouslyAllowBrowser: true,
         apiKey: apiKeyForSdkInstance,
         apiVersion: this.provider.apiVersion,
-        endpoint: this.provider.apiHost
+        endpoint: normalizeAzureOpenAIEndpoint(this.provider.apiHost)
       }) as TSdkInstance
     } else {
       this.sdkInstance = new OpenAI({
diff --git a/src/renderer/src/aiCore/legacy/clients/openai/OpenAIResponseAPIClient.ts b/src/renderer/src/aiCore/legacy/clients/openai/OpenAIResponseAPIClient.ts
index 8356826e26..b4f63e2bce 100644
--- a/src/renderer/src/aiCore/legacy/clients/openai/OpenAIResponseAPIClient.ts
+++ b/src/renderer/src/aiCore/legacy/clients/openai/OpenAIResponseAPIClient.ts
@@ -122,6 +122,7 @@ export class OpenAIResponseAPIClient extends OpenAIBaseClient<
     if (this.sdkInstance) {
       return this.sdkInstance
     }
+    const baseUrl = this.getBaseURL()
 
     if (this.provider.id === 'azure-openai' || this.provider.type === 'azure-openai') {
       return new AzureOpenAI({
@@ -134,7 +135,7 @@ export class OpenAIResponseAPIClient extends OpenAIBaseClient<
       return new OpenAI({
         dangerouslyAllowBrowser: true,
         apiKey: this.apiKey,
-        baseURL: this.getBaseURL(),
+        baseURL: baseUrl,
         defaultHeaders: {
           ...this.defaultHeaders(),
           ...this.provider.extra_headers
diff --git a/src/renderer/src/aiCore/legacy/clients/openai/azureOpenAIEndpoint.ts b/src/renderer/src/aiCore/legacy/clients/openai/azureOpenAIEndpoint.ts
new file mode 100644
index 0000000000..777dbe74d7
--- /dev/null
+++ b/src/renderer/src/aiCore/legacy/clients/openai/azureOpenAIEndpoint.ts
@@ -0,0 +1,4 @@
+export function normalizeAzureOpenAIEndpoint(apiHost: string): string {
+  const normalizedHost = apiHost.replace(/\/+$/, '')
+  return normalizedHost.replace(/\/openai(?:\/v1)?$/i, '')
+}
diff --git a/src/renderer/src/aiCore/legacy/clients/ovms/OVMSClient.ts b/src/renderer/src/aiCore/legacy/clients/ovms/OVMSClient.ts
index 02ac6de091..4936b693ee 100644
--- a/src/renderer/src/aiCore/legacy/clients/ovms/OVMSClient.ts
+++ b/src/renderer/src/aiCore/legacy/clients/ovms/OVMSClient.ts
@@ -3,7 +3,8 @@ import { loggerService } from '@logger'
 import { isSupportedModel } from '@renderer/config/models'
 import type { Provider } from '@renderer/types'
 import { objectKeys } from '@renderer/types'
-import { formatApiHost, withoutTrailingApiVersion } from '@renderer/utils'
+import { formatApiHost } from '@renderer/utils'
+import { withoutTrailingApiVersion } from '@shared/utils'
 
 import { OpenAIAPIClient } from '../openai/OpenAIApiClient'
 
diff --git a/src/renderer/src/aiCore/legacy/clients/zhipu/ZhipuAPIClient.ts b/src/renderer/src/aiCore/legacy/clients/zhipu/ZhipuAPIClient.ts
index ea6c141e31..9c590996f1 100644
--- a/src/renderer/src/aiCore/legacy/clients/zhipu/ZhipuAPIClient.ts
+++ b/src/renderer/src/aiCore/legacy/clients/zhipu/ZhipuAPIClient.ts
@@ -66,6 +66,11 @@ export class ZhipuAPIClient extends OpenAIAPIClient {
 
   public async listModels(): Promise<OpenAI.Models.Model[]> {
     const models = [
+      'glm-4.7',
+      'glm-4.6',
+      'glm-4.6v',
+      'glm-4.6v-flash',
+      'glm-4.6v-flashx',
       'glm-4.5',
       'glm-4.5-x',
       'glm-4.5-air',
diff --git a/src/renderer/src/aiCore/legacy/index.ts b/src/renderer/src/aiCore/legacy/index.ts
index da6cdb6726..7c5f5211d9 100644
--- a/src/renderer/src/aiCore/legacy/index.ts
+++ b/src/renderer/src/aiCore/legacy/index.ts
@@ -2,7 +2,6 @@ import { loggerService } from '@logger'
 import { ApiClientFactory } from '@renderer/aiCore/legacy/clients/ApiClientFactory'
 import type { BaseApiClient } from '@renderer/aiCore/legacy/clients/BaseApiClient'
 import { isDedicatedImageGenerationModel, isFunctionCallingModel } from '@renderer/config/models'
-import { getProviderByModel } from '@renderer/services/AssistantService'
 import { withSpanResult } from '@renderer/services/SpanManagerService'
 import type { StartSpanParams } from '@renderer/trace/types/ModelSpanEntity'
 import type { GenerateImageParams, Model, Provider } from '@renderer/types'
@@ -160,9 +159,6 @@ export default class AiProvider {
   public async getEmbeddingDimensions(model: Model): Promise<number> {
     try {
       // Use the SDK instance to test embedding capabilities
-      if (this.apiClient instanceof OpenAIResponseAPIClient && getProviderByModel(model).type === 'azure-openai') {
-        this.apiClient = this.apiClient.getClient(model) as BaseApiClient
-      }
       const dimensions = await this.apiClient.getEmbeddingDimensions(model)
       return dimensions
     } catch (error) {
diff --git a/src/renderer/src/aiCore/middleware/AiSdkMiddlewareBuilder.ts b/src/renderer/src/aiCore/middleware/AiSdkMiddlewareBuilder.ts
index 10a4d59384..b2a796bd33 100644
--- a/src/renderer/src/aiCore/middleware/AiSdkMiddlewareBuilder.ts
+++ b/src/renderer/src/aiCore/middleware/AiSdkMiddlewareBuilder.ts
@@ -7,7 +7,6 @@ import type { Chunk } from '@renderer/types/chunk'
 import { isOllamaProvider, isSupportEnableThinkingProvider } from '@renderer/utils/provider'
 import type { LanguageModelMiddleware } from 'ai'
 import { extractReasoningMiddleware, simulateStreamingMiddleware } from 'ai'
-import { isEmpty } from 'lodash'
 
 import { getAiSdkProviderId } from '../provider/factory'
 import { isOpenRouterGeminiGenerateImageModel } from '../utils/image'
@@ -16,7 +15,6 @@ import { openrouterGenerateImageMiddleware } from './openrouterGenerateImageMidd
 import { openrouterReasoningMiddleware } from './openrouterReasoningMiddleware'
 import { qwenThinkingMiddleware } from './qwenThinkingMiddleware'
 import { skipGeminiThoughtSignatureMiddleware } from './skipGeminiThoughtSignatureMiddleware'
-import { toolChoiceMiddleware } from './toolChoiceMiddleware'
 
 const logger = loggerService.withContext('AiSdkMiddlewareBuilder')
 
@@ -136,15 +134,6 @@ export class AiSdkMiddlewareBuilder {
 export function buildAiSdkMiddlewares(config: AiSdkMiddlewareConfig): LanguageModelMiddleware[] {
   const builder = new AiSdkMiddlewareBuilder()
 
-  // 0. 知识库强制调用中间件（必须在最前面，确保第一轮强制调用知识库）
-  if (!isEmpty(config.assistant?.knowledge_bases?.map((base) => base.id)) && config.knowledgeRecognition !== 'on') {
-    builder.add({
-      name: 'force-knowledge-first',
-      middleware: toolChoiceMiddleware('builtin_knowledge_search')
-    })
-    logger.debug('Added toolChoice middleware to force knowledge base search on first round')
-  }
-
   // 1. 根据provider添加特定中间件
   if (config.provider) {
     addProviderSpecificMiddlewares(builder, config)
diff --git a/src/renderer/src/aiCore/plugins/searchOrchestrationPlugin.ts b/src/renderer/src/aiCore/plugins/searchOrchestrationPlugin.ts
index 6be577f194..5b095a4461 100644
--- a/src/renderer/src/aiCore/plugins/searchOrchestrationPlugin.ts
+++ b/src/renderer/src/aiCore/plugins/searchOrchestrationPlugin.ts
@@ -31,7 +31,7 @@ import { webSearchToolWithPreExtractedKeywords } from '../tools/WebSearchTool'
 
 const logger = loggerService.withContext('SearchOrchestrationPlugin')
 
-const getMessageContent = (message: ModelMessage) => {
+export const getMessageContent = (message: ModelMessage) => {
   if (typeof message.content === 'string') return message.content
   return message.content.reduce((acc, part) => {
     if (part.type === 'text') {
@@ -266,14 +266,14 @@ export const searchOrchestrationPlugin = (assistant: Assistant, topicId: string)
         // 判断是否需要各种搜索
         const knowledgeBaseIds = assistant.knowledge_bases?.map((base) => base.id)
         const hasKnowledgeBase = !isEmpty(knowledgeBaseIds)
-        const knowledgeRecognition = assistant.knowledgeRecognition || 'on'
+        const knowledgeRecognition = assistant.knowledgeRecognition || 'off'
         const globalMemoryEnabled = selectGlobalMemoryEnabled(store.getState())
         const shouldWebSearch = !!assistant.webSearchProviderId
         const shouldKnowledgeSearch = hasKnowledgeBase && knowledgeRecognition === 'on'
         const shouldMemorySearch = globalMemoryEnabled && assistant.enableMemory
 
         // 执行意图分析
-        if (shouldWebSearch || hasKnowledgeBase) {
+        if (shouldWebSearch || shouldKnowledgeSearch) {
           const analysisResult = await analyzeSearchIntent(lastUserMessage, assistant, {
             shouldWebSearch,
             shouldKnowledgeSearch,
@@ -330,41 +330,25 @@ export const searchOrchestrationPlugin = (assistant: Assistant, topicId: string)
         // 📚 知识库搜索工具配置
         const knowledgeBaseIds = assistant.knowledge_bases?.map((base) => base.id)
         const hasKnowledgeBase = !isEmpty(knowledgeBaseIds)
-        const knowledgeRecognition = assistant.knowledgeRecognition || 'on'
+        const knowledgeRecognition = assistant.knowledgeRecognition || 'off'
+        const shouldKnowledgeSearch = hasKnowledgeBase && knowledgeRecognition === 'on'
 
-        if (hasKnowledgeBase) {
-          if (knowledgeRecognition === 'off') {
-            // off 模式：直接添加知识库搜索工具，使用用户消息作为搜索关键词
+        if (shouldKnowledgeSearch) {
+          // on 模式：根据意图识别结果决定是否添加工具
+          const needsKnowledgeSearch =
+            analysisResult?.knowledge &&
+            analysisResult.knowledge.question &&
+            analysisResult.knowledge.question[0] !== 'not_needed'
+
+          if (needsKnowledgeSearch && analysisResult.knowledge) {
+            // logger.info('📚 Adding knowledge search tool (intent-based)')
             const userMessage = userMessages[context.requestId]
-            const fallbackKeywords = {
-              question: [getMessageContent(userMessage) || 'search'],
-              rewrite: getMessageContent(userMessage) || 'search'
-            }
-            // logger.info('📚 Adding knowledge search tool (force mode)')
             params.tools['builtin_knowledge_search'] = knowledgeSearchTool(
               assistant,
-              fallbackKeywords,
+              analysisResult.knowledge,
               getMessageContent(userMessage),
               topicId
             )
-            // params.toolChoice = { type: 'tool', toolName: 'builtin_knowledge_search' }
-          } else {
-            // on 模式：根据意图识别结果决定是否添加工具
-            const needsKnowledgeSearch =
-              analysisResult?.knowledge &&
-              analysisResult.knowledge.question &&
-              analysisResult.knowledge.question[0] !== 'not_needed'
-
-            if (needsKnowledgeSearch && analysisResult.knowledge) {
-              // logger.info('📚 Adding knowledge search tool (intent-based)')
-              const userMessage = userMessages[context.requestId]
-              params.tools['builtin_knowledge_search'] = knowledgeSearchTool(
-                assistant,
-                analysisResult.knowledge,
-                getMessageContent(userMessage),
-                topicId
-              )
-            }
           }
         }
 
diff --git a/src/renderer/src/aiCore/prepareParams/__tests__/message-converter.test.ts b/src/renderer/src/aiCore/prepareParams/__tests__/message-converter.test.ts
index 2433192cd0..2a69f3bcef 100644
--- a/src/renderer/src/aiCore/prepareParams/__tests__/message-converter.test.ts
+++ b/src/renderer/src/aiCore/prepareParams/__tests__/message-converter.test.ts
@@ -109,6 +109,20 @@ const createImageBlock = (
   ...overrides
 })
 
+const createThinkingBlock = (
+  messageId: string,
+  overrides: Partial<Omit<ThinkingMessageBlock, 'type' | 'messageId'>> = {}
+): ThinkingMessageBlock => ({
+  id: overrides.id ?? `thinking-block-${++blockCounter}`,
+  messageId,
+  type: MessageBlockType.THINKING,
+  createdAt: overrides.createdAt ?? new Date(2024, 0, 1, 0, 0, blockCounter).toISOString(),
+  status: overrides.status ?? MessageBlockStatus.SUCCESS,
+  content: overrides.content ?? 'Let me think...',
+  thinking_millsec: overrides.thinking_millsec ?? 1000,
+  ...overrides
+})
+
 describe('messageConverter', () => {
   beforeEach(() => {
     convertFileBlockToFilePartMock.mockReset()
@@ -137,6 +151,73 @@ describe('messageConverter', () => {
       })
     })
 
+    it('extracts base64 data from data URLs and preserves mediaType', async () => {
+      const model = createModel()
+      const message = createMessage('user')
+      message.__mockContent = 'Check this image'
+      message.__mockImageBlocks = [createImageBlock(message.id, { url: 'data:image/png;base64,iVBORw0KGgoAAAANS' })]
+
+      const result = await convertMessageToSdkParam(message, true, model)
+
+      expect(result).toEqual({
+        role: 'user',
+        content: [
+          { type: 'text', text: 'Check this image' },
+          { type: 'image', image: 'iVBORw0KGgoAAAANS', mediaType: 'image/png' }
+        ]
+      })
+    })
+
+    it('handles data URLs without mediaType gracefully', async () => {
+      const model = createModel()
+      const message = createMessage('user')
+      message.__mockContent = 'Check this'
+      message.__mockImageBlocks = [createImageBlock(message.id, { url: 'data:;base64,AAABBBCCC' })]
+
+      const result = await convertMessageToSdkParam(message, true, model)
+
+      expect(result).toEqual({
+        role: 'user',
+        content: [
+          { type: 'text', text: 'Check this' },
+          { type: 'image', image: 'AAABBBCCC' }
+        ]
+      })
+    })
+
+    it('skips malformed data URLs without comma separator', async () => {
+      const model = createModel()
+      const message = createMessage('user')
+      message.__mockContent = 'Malformed data url'
+      message.__mockImageBlocks = [createImageBlock(message.id, { url: 'data:image/pngAAABBB' })]
+
+      const result = await convertMessageToSdkParam(message, true, model)
+
+      expect(result).toEqual({
+        role: 'user',
+        content: [
+          { type: 'text', text: 'Malformed data url' }
+          // Malformed data URL is excluded from the content
+        ]
+      })
+    })
+
+    it('handles multiple large base64 images without stack overflow', async () => {
+      const model = createModel()
+      const message = createMessage('user')
+      // Create large base64 strings (~500KB each) to simulate real-world large images
+      const largeBase64 = 'A'.repeat(500_000)
+      message.__mockContent = 'Check these images'
+      message.__mockImageBlocks = [
+        createImageBlock(message.id, { url: `data:image/png;base64,${largeBase64}` }),
+        createImageBlock(message.id, { url: `data:image/png;base64,${largeBase64}` }),
+        createImageBlock(message.id, { url: `data:image/png;base64,${largeBase64}` })
+      ]
+
+      // Should not throw RangeError: Maximum call stack size exceeded
+      await expect(convertMessageToSdkParam(message, true, model)).resolves.toBeDefined()
+    })
+
     it('returns file instructions as a system message when native uploads succeed', async () => {
       const model = createModel()
       const message = createMessage('user')
@@ -162,10 +243,27 @@ describe('messageConverter', () => {
         }
       ])
     })
+
+    it('includes reasoning parts for assistant messages with thinking blocks', async () => {
+      const model = createModel()
+      const message = createMessage('assistant')
+      message.__mockContent = 'Here is my answer'
+      message.__mockThinkingBlocks = [createThinkingBlock(message.id, { content: 'Let me think...' })]
+
+      const result = await convertMessageToSdkParam(message, false, model)
+
+      expect(result).toEqual({
+        role: 'assistant',
+        content: [
+          { type: 'text', text: 'Here is my answer' },
+          { type: 'reasoning', text: 'Let me think...' }
+        ]
+      })
+    })
   })
 
   describe('convertMessagesToSdkMessages', () => {
-    it('appends assistant images to the final user message for image enhancement models', async () => {
+    it('collapses to [system?, user(image)] for image enhancement models', async () => {
       const model = createModel({ id: 'qwen-image-edit', name: 'Qwen Image Edit', provider: 'qwen', group: 'qwen' })
       const initialUser = createMessage('user')
       initialUser.__mockContent = 'Start editing'
@@ -180,14 +278,6 @@ describe('messageConverter', () => {
       const result = await convertMessagesToSdkMessages([initialUser, assistant, finalUser], model)
 
       expect(result).toEqual([
-        {
-          role: 'user',
-          content: [{ type: 'text', text: 'Start editing' }]
-        },
-        {
-          role: 'assistant',
-          content: [{ type: 'text', text: 'Here is the current preview' }]
-        },
         {
           role: 'user',
           content: [
@@ -198,7 +288,7 @@ describe('messageConverter', () => {
       ])
     })
 
-    it('preserves preceding system instructions when building enhancement payloads', async () => {
+    it('preserves system messages and collapses others for enhancement payloads', async () => {
       const model = createModel({ id: 'qwen-image-edit', name: 'Qwen Image Edit', provider: 'qwen', group: 'qwen' })
       const fileUser = createMessage('user')
       fileUser.__mockContent = 'Use this document as inspiration'
@@ -221,11 +311,6 @@ describe('messageConverter', () => {
 
       expect(result).toEqual([
         { role: 'system', content: 'fileid://reference' },
-        { role: 'user', content: [{ type: 'text', text: 'Use this document as inspiration' }] },
-        {
-          role: 'assistant',
-          content: [{ type: 'text', text: 'Generated previews ready' }]
-        },
         {
           role: 'user',
           content: [
@@ -235,5 +320,120 @@ describe('messageConverter', () => {
         }
       ])
     })
+
+    it('handles no previous assistant message with images', async () => {
+      const model = createModel({ id: 'qwen-image-edit', name: 'Qwen Image Edit', provider: 'qwen', group: 'qwen' })
+      const user1 = createMessage('user')
+      user1.__mockContent = 'Start'
+
+      const user2 = createMessage('user')
+      user2.__mockContent = 'Continue without images'
+
+      const result = await convertMessagesToSdkMessages([user1, user2], model)
+
+      expect(result).toEqual([
+        {
+          role: 'user',
+          content: [{ type: 'text', text: 'Continue without images' }]
+        }
+      ])
+    })
+
+    it('handles assistant message without images', async () => {
+      const model = createModel({ id: 'qwen-image-edit', name: 'Qwen Image Edit', provider: 'qwen', group: 'qwen' })
+      const user1 = createMessage('user')
+      user1.__mockContent = 'Start'
+
+      const assistant = createMessage('assistant')
+      assistant.__mockContent = 'Text only response'
+      assistant.__mockImageBlocks = []
+
+      const user2 = createMessage('user')
+      user2.__mockContent = 'Follow up'
+
+      const result = await convertMessagesToSdkMessages([user1, assistant, user2], model)
+
+      expect(result).toEqual([
+        {
+          role: 'user',
+          content: [{ type: 'text', text: 'Follow up' }]
+        }
+      ])
+    })
+
+    it('handles multiple assistant messages by using the most recent one', async () => {
+      const model = createModel({ id: 'qwen-image-edit', name: 'Qwen Image Edit', provider: 'qwen', group: 'qwen' })
+      const user1 = createMessage('user')
+      user1.__mockContent = 'Start'
+
+      const assistant1 = createMessage('assistant')
+      assistant1.__mockContent = 'First response'
+      assistant1.__mockImageBlocks = [createImageBlock(assistant1.id, { url: 'https://example.com/old.png' })]
+
+      const user2 = createMessage('user')
+      user2.__mockContent = 'Continue'
+
+      const assistant2 = createMessage('assistant')
+      assistant2.__mockContent = 'Second response'
+      assistant2.__mockImageBlocks = [createImageBlock(assistant2.id, { url: 'https://example.com/new.png' })]
+
+      const user3 = createMessage('user')
+      user3.__mockContent = 'Final request'
+
+      const result = await convertMessagesToSdkMessages([user1, assistant1, user2, assistant2, user3], model)
+
+      expect(result).toEqual([
+        {
+          role: 'user',
+          content: [
+            { type: 'text', text: 'Final request' },
+            { type: 'image', image: 'https://example.com/new.png' }
+          ]
+        }
+      ])
+    })
+
+    it('handles conversation ending with assistant message', async () => {
+      const model = createModel({ id: 'qwen-image-edit', name: 'Qwen Image Edit', provider: 'qwen', group: 'qwen' })
+      const user = createMessage('user')
+      user.__mockContent = 'Start'
+
+      const assistant = createMessage('assistant')
+      assistant.__mockContent = 'Response with image'
+      assistant.__mockImageBlocks = [createImageBlock(assistant.id, { url: 'https://example.com/image.png' })]
+
+      const result = await convertMessagesToSdkMessages([user, assistant], model)
+
+      // The user message is the last user message, but since the assistant comes after,
+      // there's no "previous" assistant message (search starts from messages.length-2 backwards)
+      expect(result).toEqual([
+        {
+          role: 'user',
+          content: [{ type: 'text', text: 'Start' }]
+        }
+      ])
+    })
+
+    it('handles empty content in last user message', async () => {
+      const model = createModel({ id: 'qwen-image-edit', name: 'Qwen Image Edit', provider: 'qwen', group: 'qwen' })
+      const user1 = createMessage('user')
+      user1.__mockContent = 'Start'
+
+      const assistant = createMessage('assistant')
+      assistant.__mockContent = 'Here is the preview'
+      assistant.__mockImageBlocks = [createImageBlock(assistant.id, { url: 'https://example.com/preview.png' })]
+
+      const user2 = createMessage('user')
+      user2.__mockContent = ''
+
+      const result = await convertMessagesToSdkMessages([user1, assistant, user2], model)
+
+      expect(result).toEqual([
+        {
+          role: 'user',
+          content: [{ type: 'image', image: 'https://example.com/preview.png' }]
+        }
+      ])
+    })
   })
 })
diff --git a/src/renderer/src/aiCore/prepareParams/__tests__/model-parameters.test.ts b/src/renderer/src/aiCore/prepareParams/__tests__/model-parameters.test.ts
index 70b4ac84b7..a4f345e3e5 100644
--- a/src/renderer/src/aiCore/prepareParams/__tests__/model-parameters.test.ts
+++ b/src/renderer/src/aiCore/prepareParams/__tests__/model-parameters.test.ts
@@ -18,7 +18,7 @@ vi.mock('@renderer/services/AssistantService', () => ({
     toolUseMode: assistant.settings?.toolUseMode ?? 'prompt',
     defaultModel: assistant.defaultModel,
     customParameters: assistant.settings?.customParameters ?? [],
-    reasoning_effort: assistant.settings?.reasoning_effort,
+    reasoning_effort: assistant.settings?.reasoning_effort ?? 'default',
     reasoning_effort_cache: assistant.settings?.reasoning_effort_cache,
     qwenThinkMode: assistant.settings?.qwenThinkMode
   })
diff --git a/src/renderer/src/aiCore/prepareParams/messageConverter.ts b/src/renderer/src/aiCore/prepareParams/messageConverter.ts
index b0c432ef85..c3798c1f43 100644
--- a/src/renderer/src/aiCore/prepareParams/messageConverter.ts
+++ b/src/renderer/src/aiCore/prepareParams/messageConverter.ts
@@ -3,10 +3,12 @@
  * 将 Cherry Studio 消息格式转换为 AI SDK 消息格式
  */
 
+import type { ReasoningPart } from '@ai-sdk/provider-utils'
 import { loggerService } from '@logger'
 import { isImageEnhancementModel, isVisionModel } from '@renderer/config/models'
 import type { Message, Model } from '@renderer/types'
 import type { FileMessageBlock, ImageMessageBlock, ThinkingMessageBlock } from '@renderer/types/newMessage'
+import { parseDataUrlMediaType } from '@renderer/utils/image'
 import {
   findFileBlocks,
   findImageBlocks,
@@ -59,23 +61,29 @@ async function convertImageBlockToImagePart(imageBlocks: ImageMessageBlock[]): P
           mediaType: image.mime
         })
       } catch (error) {
-        logger.warn('Failed to load image:', error as Error)
+        logger.error('Failed to load image file, image will be excluded from message:', {
+          fileId: imageBlock.file.id,
+          fileName: imageBlock.file.origin_name,
+          error: error as Error
+        })
       }
     } else if (imageBlock.url) {
-      const isBase64 = imageBlock.url.startsWith('data:')
-      if (isBase64) {
-        const base64 = imageBlock.url.match(/^data:[^;]*;base64,(.+)$/)![1]
-        const mimeMatch = imageBlock.url.match(/^data:([^;]+)/)
-        parts.push({
-          type: 'image',
-          image: base64,
-          mediaType: mimeMatch ? mimeMatch[1] : 'image/png'
-        })
+      const url = imageBlock.url
+      const isDataUrl = url.startsWith('data:')
+      if (isDataUrl) {
+        const { mediaType } = parseDataUrlMediaType(url)
+        const commaIndex = url.indexOf(',')
+        if (commaIndex === -1) {
+          logger.error('Malformed data URL detected (missing comma separator), image will be excluded:', {
+            urlPrefix: url.slice(0, 50) + '...'
+          })
+          continue
+        }
+        const base64Data = url.slice(commaIndex + 1)
+        parts.push({ type: 'image', image: base64Data, ...(mediaType ? { mediaType } : {}) })
       } else {
-        parts.push({
-          type: 'image',
-          image: imageBlock.url
-        })
+        // For remote URLs we keep payload minimal to match existing expectations.
+        parts.push({ type: 'image', image: url })
       }
     }
   }
@@ -156,13 +164,13 @@ async function convertMessageToAssistantModelMessage(
   thinkingBlocks: ThinkingMessageBlock[],
   model?: Model
 ): Promise<AssistantModelMessage> {
-  const parts: Array<TextPart | FilePart> = []
+  const parts: Array<TextPart | ReasoningPart | FilePart> = []
   if (content) {
     parts.push({ type: 'text', text: content })
   }
 
   for (const thinkingBlock of thinkingBlocks) {
-    parts.push({ type: 'text', text: thinkingBlock.content })
+    parts.push({ type: 'reasoning', text: thinkingBlock.content })
   }
 
   for (const fileBlock of fileBlocks) {
@@ -194,17 +202,20 @@ async function convertMessageToAssistantModelMessage(
  * This function processes messages and transforms them into the format required by the SDK.
  * It handles special cases for vision models and image enhancement models.
  *
- * @param messages - Array of messages to convert. Must contain at least 3 messages when using image enhancement models for special handling.
+ * @param messages - Array of messages to convert.
  * @param model - The model configuration that determines conversion behavior
  *
  * @returns A promise that resolves to an array of SDK-compatible model messages
  *
  * @remarks
- * For image enhancement models with 3+ messages:
- * - Examines the last 2 messages to find an assistant message containing image blocks
- * - If found, extracts images from the assistant message and appends them to the last user message content
- * - Returns all converted messages (not just the last two) with the images merged into the user message
- * - Typical pattern: [system?, assistant(image), user] -> [system?, assistant, user(image)]
+ * For image enhancement models:
+ * - Collapses the conversation into [system?, user(image)] format
+ * - Searches backwards through all messages to find the most recent assistant message with images
+ * - Preserves all system messages (including ones generated from file uploads like 'fileid://...')
+ * - Extracts the last user message content and merges images from the previous assistant message
+ * - Returns only the collapsed messages: system messages (if any) followed by a single user message
+ * - If no user message is found, returns only system messages
+ * - Typical pattern: [system?, user, assistant(image), user] -> [system?, user(image)]
  *
  * For other models:
  * - Returns all converted messages in order without special image handling
@@ -220,25 +231,66 @@ export async function convertMessagesToSdkMessages(messages: Message[], model: M
     sdkMessages.push(...(Array.isArray(sdkMessage) ? sdkMessage : [sdkMessage]))
   }
   // Special handling for image enhancement models
-  // Only merge images into the user message
-  // [system?, assistant(image), user] -> [system?, assistant, user(image)]
-  if (isImageEnhancementModel(model) && messages.length >= 3) {
-    const needUpdatedMessages = messages.slice(-2)
-    const assistantMessage = needUpdatedMessages.find((m) => m.role === 'assistant')
-    const userSdkMessage = sdkMessages[sdkMessages.length - 1]
+  // Target behavior: Collapse the conversation into [system?, user(image)].
+  // Explanation of why we don't simply use slice:
+  // 1) We need to preserve all system messages: During the convertMessageToSdkParam process, native file uploads may insert `system(fileid://...)`.
+  // Directly slicing the original messages or already converted sdkMessages could easily result in missing these system instructions.
+  // Therefore, we first perform a full conversion and then aggregate the system messages afterward.
+  // 2) The conversion process may split messages: A single user message might be broken into two SDK messages—[system, user].
+  // Slicing either side could lead to obtaining semantically incorrect fragments (e.g., only the split-out system message).
+  // 3) The “previous assistant message” is not necessarily the second-to-last one: There might be system messages or other message blocks inserted in between,
+  // making a simple slice(-2) assumption too rigid. Here, we trace back from the end of the original messages to locate the most recent assistant message, which better aligns with business semantics.
+  // 4) This is a “collapse” rather than a simple “slice”: Ultimately, we need to synthesize a new user message
+  // (with text from the last user message and images from the previous assistant message). Using slice can only extract subarrays,
+  // which still require reassembly; constructing directly according to the target structure is clearer and more reliable.
+  if (isImageEnhancementModel(model)) {
+    // Collect all system messages (including ones generated from file uploads)
+    const systemMessages = sdkMessages.filter((m): m is SystemModelMessage => m.role === 'system')
 
-    if (assistantMessage && userSdkMessage?.role === 'user') {
-      const imageBlocks = findImageBlocks(assistantMessage)
-      const imageParts = await convertImageBlockToImagePart(imageBlocks)
+    // Find the last user message (SDK converted)
+    const lastUserSdkIndex = (() => {
+      for (let i = sdkMessages.length - 1; i >= 0; i--) {
+        if (sdkMessages[i].role === 'user') return i
+      }
+      return -1
+    })()
 
-      if (imageParts.length > 0) {
-        if (typeof userSdkMessage.content === 'string') {
-          userSdkMessage.content = [{ type: 'text', text: userSdkMessage.content }, ...imageParts]
-        } else if (Array.isArray(userSdkMessage.content)) {
-          userSdkMessage.content.push(...imageParts)
-        }
+    const lastUserSdk = lastUserSdkIndex >= 0 ? (sdkMessages[lastUserSdkIndex] as UserModelMessage) : null
+
+    // Find the nearest preceding assistant message in original messages
+    let prevAssistant: Message | null = null
+    for (let i = messages.length - 2; i >= 0; i--) {
+      if (messages[i].role === 'assistant') {
+        prevAssistant = messages[i]
+        break
       }
     }
+
+    // Build the final user content parts
+    let finalUserParts: Array<TextPart | FilePart | ImagePart> = []
+    if (lastUserSdk) {
+      if (typeof lastUserSdk.content === 'string') {
+        finalUserParts.push({ type: 'text', text: lastUserSdk.content })
+      } else if (Array.isArray(lastUserSdk.content)) {
+        finalUserParts = [...lastUserSdk.content]
+      }
+    }
+
+    // Append images from the previous assistant message if any
+    if (prevAssistant) {
+      const imageBlocks = findImageBlocks(prevAssistant)
+      const imageParts = await convertImageBlockToImagePart(imageBlocks)
+      if (imageParts.length > 0) {
+        finalUserParts.push(...imageParts)
+      }
+    }
+
+    // If we couldn't find a last user message, fall back to returning collected system messages only
+    if (!lastUserSdk) {
+      return systemMessages
+    }
+
+    return [...systemMessages, { role: 'user', content: finalUserParts }]
   }
 
   return sdkMessages
diff --git a/src/renderer/src/aiCore/prepareParams/modelParameters.ts b/src/renderer/src/aiCore/prepareParams/modelParameters.ts
index 8a1d53a754..58b4834f53 100644
--- a/src/renderer/src/aiCore/prepareParams/modelParameters.ts
+++ b/src/renderer/src/aiCore/prepareParams/modelParameters.ts
@@ -4,60 +4,90 @@
  */
 
 import {
-  isClaude45ReasoningModel,
   isClaudeReasoningModel,
   isMaxTemperatureOneModel,
-  isNotSupportTemperatureAndTopP,
   isSupportedFlexServiceTier,
-  isSupportedThinkingTokenClaudeModel
+  isSupportedThinkingTokenClaudeModel,
+  isSupportTemperatureModel,
+  isSupportTopPModel,
+  isTemperatureTopPMutuallyExclusiveModel
 } from '@renderer/config/models'
-import { getAssistantSettings, getProviderByModel } from '@renderer/services/AssistantService'
+import {
+  DEFAULT_ASSISTANT_SETTINGS,
+  getAssistantSettings,
+  getProviderByModel
+} from '@renderer/services/AssistantService'
 import type { Assistant, Model } from '@renderer/types'
 import { defaultTimeout } from '@shared/config/constant'
 
 import { getAnthropicThinkingBudget } from '../utils/reasoning'
 
 /**
- * Claude 4.5 推理模型:
- * - 只启用 temperature → 使用 temperature
- * - 只启用 top_p → 使用 top_p
- * - 同时启用 → temperature 生效,top_p 被忽略
- * - 都不启用 → 都不使用
- * 获取温度参数
+ * Retrieves the temperature parameter, adapting it based on assistant.settings and model capabilities.
+ * - Disabled for Claude reasoning models when reasoning effort is set.
+ * - Disabled for models that do not support temperature.
+ * - Disabled for Claude 4.5 reasoning models when TopP is enabled and temperature is disabled.
+ * Otherwise, returns the temperature value if the assistant has temperature enabled.
+
  */
 export function getTemperature(assistant: Assistant, model: Model): number | undefined {
   if (assistant.settings?.reasoning_effort && isClaudeReasoningModel(model)) {
     return undefined
   }
+
+  if (!isSupportTemperatureModel(model, assistant)) {
+    return undefined
+  }
+
   if (
-    isNotSupportTemperatureAndTopP(model) ||
-    (isClaude45ReasoningModel(model) && assistant.settings?.enableTopP && !assistant.settings?.enableTemperature)
+    isTemperatureTopPMutuallyExclusiveModel(model) &&
+    assistant.settings?.enableTopP &&
+    !assistant.settings?.enableTemperature
   ) {
     return undefined
   }
+
+  return getTemperatureValue(assistant, model)
+}
+
+function getTemperatureValue(assistant: Assistant, model: Model): number | undefined {
   const assistantSettings = getAssistantSettings(assistant)
   let temperature = assistantSettings?.temperature
   if (temperature && isMaxTemperatureOneModel(model)) {
     temperature = Math.min(1, temperature)
   }
-  return assistantSettings?.enableTemperature ? temperature : undefined
+
+  // FIXME: assistant.settings.enableTemperature should be always a boolean value.
+  const enableTemperature = assistantSettings?.enableTemperature ?? DEFAULT_ASSISTANT_SETTINGS.enableTemperature
+  return enableTemperature ? temperature : undefined
 }
 
 /**
- * 获取 TopP 参数
+ * Retrieves the TopP parameter, adapting it based on assistant.settings and model capabilities.
+ * - Disabled for Claude reasoning models when reasoning effort is set.
+ * - Disabled for models that do not support TopP.
+ * - Disabled for Claude 4.5 reasoning models when temperature is explicitly enabled.
+ * Otherwise, returns the TopP value if the assistant has TopP enabled.
  */
 export function getTopP(assistant: Assistant, model: Model): number | undefined {
   if (assistant.settings?.reasoning_effort && isClaudeReasoningModel(model)) {
     return undefined
   }
-  if (
-    isNotSupportTemperatureAndTopP(model) ||
-    (isClaude45ReasoningModel(model) && assistant.settings?.enableTemperature)
-  ) {
+  if (!isSupportTopPModel(model, assistant)) {
     return undefined
   }
+  if (isTemperatureTopPMutuallyExclusiveModel(model) && assistant.settings?.enableTemperature) {
+    return undefined
+  }
+
+  return getTopPValue(assistant)
+}
+
+function getTopPValue(assistant: Assistant): number | undefined {
   const assistantSettings = getAssistantSettings(assistant)
-  return assistantSettings?.enableTopP ? assistantSettings?.topP : undefined
+  // FIXME: assistant.settings.enableTopP should be always a boolean value.
+  const enableTopP = assistantSettings.enableTopP ?? DEFAULT_ASSISTANT_SETTINGS.enableTopP
+  return enableTopP ? assistantSettings?.topP : undefined
 }
 
 /**
diff --git a/src/renderer/src/aiCore/prepareParams/parameterBuilder.ts b/src/renderer/src/aiCore/prepareParams/parameterBuilder.ts
index cba7fcdb10..52234c5f1f 100644
--- a/src/renderer/src/aiCore/prepareParams/parameterBuilder.ts
+++ b/src/renderer/src/aiCore/prepareParams/parameterBuilder.ts
@@ -21,6 +21,7 @@ import {
   isGrokModel,
   isOpenAIModel,
   isOpenRouterBuiltInWebSearchModel,
+  isPureGenerateImageModel,
   isSupportedReasoningEffortModel,
   isSupportedThinkingTokenModel,
   isWebSearchModel
@@ -33,7 +34,7 @@ import { type Assistant, type MCPTool, type Provider, SystemProviderIds } from '
 import type { StreamTextParams } from '@renderer/types/aiCoreTypes'
 import { mapRegexToPatterns } from '@renderer/utils/blacklistMatchPattern'
 import { replacePromptVariables } from '@renderer/utils/prompt'
-import { isAIGatewayProvider, isAwsBedrockProvider } from '@renderer/utils/provider'
+import { isAIGatewayProvider, isAwsBedrockProvider, isSupportUrlContextProvider } from '@renderer/utils/provider'
 import type { ModelMessage, Tool } from 'ai'
 import { stepCountIs } from 'ai'
 
@@ -118,7 +119,13 @@ export async function buildStreamTextParams(
       isOpenRouterBuiltInWebSearchModel(model) ||
       model.id.includes('sonar'))
 
-  const enableUrlContext = assistant.enableUrlContext || false
+  // Validate provider and model support to prevent stale state from triggering urlContext
+  const enableUrlContext = !!(
+    assistant.enableUrlContext &&
+    isSupportUrlContextProvider(provider) &&
+    !isPureGenerateImageModel(model) &&
+    (isGeminiModel(model) || isAnthropicModel(model))
+  )
 
   const enableGenerateImage = !!(isGenerateImageModel(model) && assistant.enableGenerateImage)
 
diff --git a/src/renderer/src/aiCore/provider/__tests__/providerConfig.test.ts b/src/renderer/src/aiCore/provider/__tests__/providerConfig.test.ts
index 43d3cc52b8..b1d8e34fcd 100644
--- a/src/renderer/src/aiCore/provider/__tests__/providerConfig.test.ts
+++ b/src/renderer/src/aiCore/provider/__tests__/providerConfig.test.ts
@@ -42,7 +42,8 @@ vi.mock('@renderer/utils/api', () => ({
   routeToEndpoint: vi.fn((host) => ({
     baseURL: host,
     endpoint: '/chat/completions'
-  }))
+  })),
+  isWithTrailingSharp: vi.fn((host) => host?.endsWith('#') || false)
 }))
 
 vi.mock('@renderer/utils/provider', async (importOriginal) => {
@@ -78,7 +79,7 @@ vi.mock('@renderer/services/AssistantService', () => ({
 import { getProviderByModel } from '@renderer/services/AssistantService'
 import type { Model, Provider } from '@renderer/types'
 import { formatApiHost } from '@renderer/utils/api'
-import { isCherryAIProvider, isPerplexityProvider } from '@renderer/utils/provider'
+import { isAzureOpenAIProvider, isCherryAIProvider, isPerplexityProvider } from '@renderer/utils/provider'
 
 import { COPILOT_DEFAULT_HEADERS, COPILOT_EDITOR_VERSION, isCopilotResponsesModel } from '../constants'
 import { getActualProvider, providerToAiSdkConfig } from '../providerConfig'
@@ -132,6 +133,17 @@ const createPerplexityProvider = (): Provider => ({
   isSystem: false
 })
 
+const createAzureProvider = (apiVersion: string): Provider => ({
+  id: 'azure-openai',
+  type: 'azure-openai',
+  name: 'Azure OpenAI',
+  apiKey: 'test-key',
+  apiHost: 'https://example.openai.azure.com/openai',
+  apiVersion,
+  models: [],
+  isSystem: true
+})
+
 describe('Copilot responses routing', () => {
   beforeEach(() => {
     ;(globalThis as any).window = {
@@ -227,12 +239,19 @@ describe('CherryAI provider configuration', () => {
     // Mock the functions to simulate non-CherryAI provider
     vi.mocked(isCherryAIProvider).mockReturnValue(false)
     vi.mocked(getProviderByModel).mockReturnValue(provider)
+    // Mock isWithTrailingSharp to return false for this test
+    vi.mocked(formatApiHost as any).mockImplementation((host, isSupportedAPIVersion = true) => {
+      if (isSupportedAPIVersion === false) {
+        return host
+      }
+      return `${host}/v1`
+    })
 
     // Call getActualProvider
     const actualProvider = getActualProvider(model)
 
-    // Verify that formatApiHost was called with default parameters (true)
-    expect(formatApiHost).toHaveBeenCalledWith('https://api.openai.com')
+    // Verify that formatApiHost was called with appendApiVersion parameter
+    expect(formatApiHost).toHaveBeenCalledWith('https://api.openai.com', true)
     expect(actualProvider.apiHost).toBe('https://api.openai.com/v1')
   })
 
@@ -303,12 +322,19 @@ describe('Perplexity provider configuration', () => {
     vi.mocked(isCherryAIProvider).mockReturnValue(false)
     vi.mocked(isPerplexityProvider).mockReturnValue(false)
     vi.mocked(getProviderByModel).mockReturnValue(provider)
+    // Mock isWithTrailingSharp to return false for this test
+    vi.mocked(formatApiHost as any).mockImplementation((host, isSupportedAPIVersion = true) => {
+      if (isSupportedAPIVersion === false) {
+        return host
+      }
+      return `${host}/v1`
+    })
 
     // Call getActualProvider
     const actualProvider = getActualProvider(model)
 
-    // Verify that formatApiHost was called with default parameters (true)
-    expect(formatApiHost).toHaveBeenCalledWith('https://api.openai.com')
+    // Verify that formatApiHost was called with appendApiVersion parameter
+    expect(formatApiHost).toHaveBeenCalledWith('https://api.openai.com', true)
     expect(actualProvider.apiHost).toBe('https://api.openai.com/v1')
   })
 
@@ -489,3 +515,46 @@ describe('Stream options includeUsage configuration', () => {
     expect(config.providerId).toBe('github-copilot-openai-compatible')
   })
 })
+
+describe('Azure OpenAI traditional API routing', () => {
+  beforeEach(() => {
+    ;(globalThis as any).window = {
+      ...(globalThis as any).window,
+      keyv: createWindowKeyv()
+    }
+    mockGetState.mockReturnValue({
+      settings: {
+        openAI: {
+          streamOptions: {
+            includeUsage: undefined
+          }
+        }
+      }
+    })
+
+    vi.mocked(isAzureOpenAIProvider).mockImplementation((provider) => provider.type === 'azure-openai')
+  })
+
+  it('uses deployment-based URLs when apiVersion is a date version', () => {
+    const provider = createAzureProvider('2024-02-15-preview')
+    const config = providerToAiSdkConfig(provider, createModel('gpt-4o', 'GPT-4o', provider.id))
+
+    expect(config.providerId).toBe('azure')
+    expect(config.options.apiVersion).toBe('2024-02-15-preview')
+    expect(config.options.useDeploymentBasedUrls).toBe(true)
+  })
+
+  it('does not force deployment-based URLs for apiVersion v1/preview', () => {
+    const v1Provider = createAzureProvider('v1')
+    const v1Config = providerToAiSdkConfig(v1Provider, createModel('gpt-4o', 'GPT-4o', v1Provider.id))
+    expect(v1Config.providerId).toBe('azure-responses')
+    expect(v1Config.options.apiVersion).toBe('v1')
+    expect(v1Config.options.useDeploymentBasedUrls).toBeUndefined()
+
+    const previewProvider = createAzureProvider('preview')
+    const previewConfig = providerToAiSdkConfig(previewProvider, createModel('gpt-4o', 'GPT-4o', previewProvider.id))
+    expect(previewConfig.providerId).toBe('azure-responses')
+    expect(previewConfig.options.apiVersion).toBe('preview')
+    expect(previewConfig.options.useDeploymentBasedUrls).toBeUndefined()
+  })
+})
diff --git a/src/renderer/src/aiCore/provider/factory.ts b/src/renderer/src/aiCore/provider/factory.ts
index ff100051b7..d18aa02eeb 100644
--- a/src/renderer/src/aiCore/provider/factory.ts
+++ b/src/renderer/src/aiCore/provider/factory.ts
@@ -31,7 +31,8 @@ const STATIC_PROVIDER_MAPPING: Record<string, ProviderId> = {
   'azure-openai': 'azure', // Azure OpenAI -> azure
   'openai-response': 'openai', // OpenAI Responses -> openai
   grok: 'xai', // Grok -> xai
-  copilot: 'github-copilot-openai-compatible'
+  copilot: 'github-copilot-openai-compatible',
+  tokenflux: 'openrouter' // TokenFlux -> openrouter (fully compatible)
 }
 
 /**
diff --git a/src/renderer/src/aiCore/provider/providerConfig.ts b/src/renderer/src/aiCore/provider/providerConfig.ts
index 99e4fbd1c9..0ad15ea895 100644
--- a/src/renderer/src/aiCore/provider/providerConfig.ts
+++ b/src/renderer/src/aiCore/provider/providerConfig.ts
@@ -9,6 +9,7 @@ import {
 } from '@renderer/hooks/useAwsBedrock'
 import { createVertexProvider, isVertexAIConfigured } from '@renderer/hooks/useVertexAI'
 import { getProviderByModel } from '@renderer/services/AssistantService'
+import { getProviderById } from '@renderer/services/ProviderService'
 import store from '@renderer/store'
 import { isSystemProvider, type Model, type Provider, SystemProviderIds } from '@renderer/types'
 import type { OpenAICompletionsStreamOptions } from '@renderer/types/aiCoreTypes'
@@ -17,6 +18,7 @@ import {
   formatAzureOpenAIApiHost,
   formatOllamaApiHost,
   formatVertexApiHost,
+  isWithTrailingSharp,
   routeToEndpoint
 } from '@renderer/utils/api'
 import {
@@ -30,6 +32,7 @@ import {
   isSupportStreamOptionsProvider,
   isVertexProvider
 } from '@renderer/utils/provider'
+import { defaultAppHeaders } from '@shared/utils'
 import { cloneDeep, isEmpty } from 'lodash'
 
 import type { AiSdkConfig } from '../types'
@@ -69,14 +72,15 @@ function handleSpecialProviders(model: Model, provider: Provider): Provider {
  */
 export function formatProviderApiHost(provider: Provider): Provider {
   const formatted = { ...provider }
+  const appendApiVersion = !isWithTrailingSharp(provider.apiHost)
   if (formatted.anthropicApiHost) {
-    formatted.anthropicApiHost = formatApiHost(formatted.anthropicApiHost)
+    formatted.anthropicApiHost = formatApiHost(formatted.anthropicApiHost, appendApiVersion)
   }
 
   if (isAnthropicProvider(provider)) {
     const baseHost = formatted.anthropicApiHost || formatted.apiHost
     // AI SDK needs /v1 in baseURL, Anthropic SDK will strip it in getSdkClient
-    formatted.apiHost = formatApiHost(baseHost)
+    formatted.apiHost = formatApiHost(baseHost, appendApiVersion)
     if (!formatted.anthropicApiHost) {
       formatted.anthropicApiHost = formatted.apiHost
     }
@@ -85,7 +89,7 @@ export function formatProviderApiHost(provider: Provider): Provider {
   } else if (isOllamaProvider(formatted)) {
     formatted.apiHost = formatOllamaApiHost(formatted.apiHost)
   } else if (isGeminiProvider(formatted)) {
-    formatted.apiHost = formatApiHost(formatted.apiHost, true, 'v1beta')
+    formatted.apiHost = formatApiHost(formatted.apiHost, appendApiVersion, 'v1beta')
   } else if (isAzureOpenAIProvider(formatted)) {
     formatted.apiHost = formatAzureOpenAIApiHost(formatted.apiHost)
   } else if (isVertexProvider(formatted)) {
@@ -95,7 +99,7 @@ export function formatProviderApiHost(provider: Provider): Provider {
   } else if (isPerplexityProvider(formatted)) {
     formatted.apiHost = formatApiHost(formatted.apiHost, false)
   } else {
-    formatted.apiHost = formatApiHost(formatted.apiHost)
+    formatted.apiHost = formatApiHost(formatted.apiHost, appendApiVersion)
   }
   return formatted
 }
@@ -194,18 +198,13 @@ export function providerToAiSdkConfig(actualProvider: Provider, model: Model): A
     extraOptions.mode = 'chat'
   }
 
-  // 添加额外headers
-  if (actualProvider.extra_headers) {
-    extraOptions.headers = actualProvider.extra_headers
-    // copy from openaiBaseClient/openaiResponseApiClient
-    if (aiSdkProviderId === 'openai') {
-      extraOptions.headers = {
-        ...extraOptions.headers,
-        'HTTP-Referer': 'https://cherry-ai.com',
-        'X-Title': 'Cherry Studio',
-        'X-Api-Key': baseConfig.apiKey
-      }
-    }
+  extraOptions.headers = {
+    ...defaultAppHeaders(),
+    ...actualProvider.extra_headers
+  }
+
+  if (aiSdkProviderId === 'openai') {
+    extraOptions.headers['X-Api-Key'] = baseConfig.apiKey
   }
   // azure
   // https://learn.microsoft.com/en-us/azure/ai-foundry/openai/latest
@@ -215,6 +214,15 @@ export function providerToAiSdkConfig(actualProvider: Provider, model: Model): A
   } else if (aiSdkProviderId === 'azure') {
     extraOptions.mode = 'chat'
   }
+  if (isAzureOpenAIProvider(actualProvider)) {
+    const apiVersion = actualProvider.apiVersion?.trim()
+    if (apiVersion) {
+      extraOptions.apiVersion = apiVersion
+      if (!['preview', 'v1'].includes(apiVersion)) {
+        extraOptions.useDeploymentBasedUrls = true
+      }
+    }
+  }
 
   // bedrock
   if (aiSdkProviderId === 'bedrock') {
@@ -248,6 +256,12 @@ export function providerToAiSdkConfig(actualProvider: Provider, model: Model): A
     if (model.endpoint_type) {
       extraOptions.endpointType = model.endpoint_type
     }
+    // CherryIN API Host
+    const cherryinProvider = getProviderById(SystemProviderIds.cherryin)
+    if (cherryinProvider) {
+      extraOptions.anthropicBaseURL = cherryinProvider.anthropicApiHost + '/v1'
+      extraOptions.geminiBaseURL = cherryinProvider.apiHost + '/v1beta/models'
+    }
   }
 
   if (hasProviderConfig(aiSdkProviderId) && aiSdkProviderId !== 'openai-compatible') {
diff --git a/src/renderer/src/aiCore/tools/MemorySearchTool.ts b/src/renderer/src/aiCore/tools/MemorySearchTool.ts
index 20064dd1b2..5028f2eb4d 100644
--- a/src/renderer/src/aiCore/tools/MemorySearchTool.ts
+++ b/src/renderer/src/aiCore/tools/MemorySearchTool.ts
@@ -24,7 +24,8 @@ export const memorySearchTool = () => {
       }
 
       const memoryConfig = selectMemoryConfig(store.getState())
-      if (!memoryConfig.llmApiClient || !memoryConfig.embedderApiClient) {
+
+      if (!memoryConfig.llmModel || !memoryConfig.embeddingModel) {
         return []
       }
 
diff --git a/src/renderer/src/aiCore/utils/__tests__/options.test.ts b/src/renderer/src/aiCore/utils/__tests__/options.test.ts
index 9eeeac725b..a6c9a6c95c 100644
--- a/src/renderer/src/aiCore/utils/__tests__/options.test.ts
+++ b/src/renderer/src/aiCore/utils/__tests__/options.test.ts
@@ -464,7 +464,8 @@ describe('options utils', () => {
             custom_param: 'custom_value',
             another_param: 123,
             serviceTier: undefined,
-            textVerbosity: undefined
+            textVerbosity: undefined,
+            store: false
           }
         })
       })
diff --git a/src/renderer/src/aiCore/utils/__tests__/reasoning.test.ts b/src/renderer/src/aiCore/utils/__tests__/reasoning.test.ts
index 36253e5c1d..df7d69d0c2 100644
--- a/src/renderer/src/aiCore/utils/__tests__/reasoning.test.ts
+++ b/src/renderer/src/aiCore/utils/__tests__/reasoning.test.ts
@@ -11,6 +11,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import {
   getAnthropicReasoningParams,
+  getAnthropicThinkingBudget,
   getBedrockReasoningParams,
   getCustomParameters,
   getGeminiReasoningParams,
@@ -89,7 +90,8 @@ vi.mock('@renderer/config/models', async (importOriginal) => {
     isQwenAlwaysThinkModel: vi.fn(() => false),
     isSupportedThinkingTokenHunyuanModel: vi.fn(() => false),
     isSupportedThinkingTokenModel: vi.fn(() => false),
-    isGPT51SeriesModel: vi.fn(() => false)
+    isGPT51SeriesModel: vi.fn(() => false),
+    findTokenLimit: vi.fn(actual.findTokenLimit)
   }
 })
 
@@ -596,7 +598,7 @@ describe('reasoning utils', () => {
       expect(result).toEqual({})
     })
 
-    it('should return disabled thinking when no reasoning effort', async () => {
+    it('should return disabled thinking when reasoning effort is none', async () => {
       const { isReasoningModel, isSupportedThinkingTokenClaudeModel } = await import('@renderer/config/models')
 
       vi.mocked(isReasoningModel).mockReturnValue(true)
@@ -611,7 +613,9 @@ describe('reasoning utils', () => {
       const assistant: Assistant = {
         id: 'test',
         name: 'Test',
-        settings: {}
+        settings: {
+          reasoning_effort: 'none'
+        }
       } as Assistant
 
       const result = getAnthropicReasoningParams(assistant, model)
@@ -647,7 +651,7 @@ describe('reasoning utils', () => {
       expect(result).toEqual({
         thinking: {
           type: 'enabled',
-          budgetTokens: 2048
+          budgetTokens: 4096
         }
       })
     })
@@ -675,7 +679,7 @@ describe('reasoning utils', () => {
       expect(result).toEqual({})
     })
 
-    it('should disable thinking for Flash models without reasoning effort', async () => {
+    it('should disable thinking for Flash models when reasoning effort is none', async () => {
       const { isReasoningModel, isSupportedThinkingTokenGeminiModel } = await import('@renderer/config/models')
 
       vi.mocked(isReasoningModel).mockReturnValue(true)
@@ -690,7 +694,9 @@ describe('reasoning utils', () => {
       const assistant: Assistant = {
         id: 'test',
         name: 'Test',
-        settings: {}
+        settings: {
+          reasoning_effort: 'none'
+        }
       } as Assistant
 
       const result = getGeminiReasoningParams(assistant, model)
@@ -725,7 +731,7 @@ describe('reasoning utils', () => {
       const result = getGeminiReasoningParams(assistant, model)
       expect(result).toEqual({
         thinkingConfig: {
-          thinkingBudget: 16448,
+          thinkingBudget: expect.any(Number),
           includeThoughts: true
         }
       })
@@ -754,7 +760,8 @@ describe('reasoning utils', () => {
       const result = getGeminiReasoningParams(assistant, model)
       expect(result).toEqual({
         thinkingConfig: {
-          includeThoughts: true
+          includeThoughts: true,
+          thinkingBudget: -1
         }
       })
     })
@@ -888,7 +895,7 @@ describe('reasoning utils', () => {
       expect(result).toEqual({
         reasoningConfig: {
           type: 'enabled',
-          budgetTokens: 2048
+          budgetTokens: 4096
         }
       })
     })
@@ -989,4 +996,89 @@ describe('reasoning utils', () => {
       })
     })
   })
+
+  describe('getAnthropicThinkingBudget', () => {
+    it('should return undefined when reasoningEffort is undefined', async () => {
+      const result = getAnthropicThinkingBudget(4096, undefined, 'claude-3-7-sonnet')
+      expect(result).toBeUndefined()
+    })
+
+    it('should return undefined when reasoningEffort is none', async () => {
+      const result = getAnthropicThinkingBudget(4096, 'none', 'claude-3-7-sonnet')
+      expect(result).toBeUndefined()
+    })
+
+    it('should return undefined when tokenLimit is not found', async () => {
+      const { findTokenLimit } = await import('@renderer/config/models')
+      vi.mocked(findTokenLimit).mockReturnValue(undefined)
+
+      const result = getAnthropicThinkingBudget(4096, 'medium', 'unknown-model')
+      expect(result).toBeUndefined()
+    })
+
+    it('should calculate budget correctly when maxTokens is provided', async () => {
+      const { findTokenLimit } = await import('@renderer/config/models')
+      vi.mocked(findTokenLimit).mockReturnValue({ min: 1024, max: 32768 })
+
+      const result = getAnthropicThinkingBudget(4096, 'medium', 'claude-3-7-sonnet')
+      // EFFORT_RATIO['medium'] = 0.5
+      // budget = Math.floor((32768 - 1024) * 0.5 + 1024)
+      // = Math.floor(31744 * 0.5 + 1024) = Math.floor(15872 + 1024) = 16896
+      // budgetTokens = Math.min(16896, 4096) = 4096
+      // result = Math.max(1024, 4096) = 4096
+      expect(result).toBe(4096)
+    })
+
+    it('should use tokenLimit.max when maxTokens is undefined', async () => {
+      const { findTokenLimit } = await import('@renderer/config/models')
+      vi.mocked(findTokenLimit).mockReturnValue({ min: 1024, max: 32768 })
+
+      const result = getAnthropicThinkingBudget(undefined, 'medium', 'claude-3-7-sonnet')
+      // When maxTokens is undefined, budget is not constrained by maxTokens
+      // EFFORT_RATIO['medium'] = 0.5
+      // budget = Math.floor((32768 - 1024) * 0.5 + 1024)
+      // = Math.floor(31744 * 0.5 + 1024) = Math.floor(15872 + 1024) = 16896
+      // result = Math.max(1024, 16896) = 16896
+      expect(result).toBe(16896)
+    })
+
+    it('should enforce minimum budget of 1024', async () => {
+      const { findTokenLimit } = await import('@renderer/config/models')
+      vi.mocked(findTokenLimit).mockReturnValue({ min: 100, max: 1000 })
+
+      const result = getAnthropicThinkingBudget(500, 'low', 'claude-3-7-sonnet')
+      // EFFORT_RATIO['low'] = 0.05
+      // budget = Math.floor((1000 - 100) * 0.05 + 100)
+      // = Math.floor(900 * 0.05 + 100) = Math.floor(45 + 100) = 145
+      // budgetTokens = Math.min(145, 500) = 145
+      // result = Math.max(1024, 145) = 1024
+      expect(result).toBe(1024)
+    })
+
+    it('should respect effort ratio for high reasoning effort', async () => {
+      const { findTokenLimit } = await import('@renderer/config/models')
+      vi.mocked(findTokenLimit).mockReturnValue({ min: 1024, max: 32768 })
+
+      const result = getAnthropicThinkingBudget(8192, 'high', 'claude-3-7-sonnet')
+      // EFFORT_RATIO['high'] = 0.8
+      // budget = Math.floor((32768 - 1024) * 0.8 + 1024)
+      // = Math.floor(31744 * 0.8 + 1024) = Math.floor(25395.2 + 1024) = 26419
+      // budgetTokens = Math.min(26419, 8192) = 8192
+      // result = Math.max(1024, 8192) = 8192
+      expect(result).toBe(8192)
+    })
+
+    it('should use full token limit when maxTokens is undefined and reasoning effort is high', async () => {
+      const { findTokenLimit } = await import('@renderer/config/models')
+      vi.mocked(findTokenLimit).mockReturnValue({ min: 1024, max: 32768 })
+
+      const result = getAnthropicThinkingBudget(undefined, 'high', 'claude-3-7-sonnet')
+      // When maxTokens is undefined, budget is not constrained by maxTokens
+      // EFFORT_RATIO['high'] = 0.8
+      // budget = Math.floor((32768 - 1024) * 0.8 + 1024)
+      // = Math.floor(31744 * 0.8 + 1024) = Math.floor(25395.2 + 1024) = 26419
+      // result = Math.max(1024, 26419) = 26419
+      expect(result).toBe(26419)
+    })
+  })
 })
diff --git a/src/renderer/src/aiCore/utils/__tests__/websearch.test.ts b/src/renderer/src/aiCore/utils/__tests__/websearch.test.ts
index fa5e3c3b36..5c95a664aa 100644
--- a/src/renderer/src/aiCore/utils/__tests__/websearch.test.ts
+++ b/src/renderer/src/aiCore/utils/__tests__/websearch.test.ts
@@ -259,7 +259,7 @@ describe('websearch utils', () => {
 
         expect(result).toEqual({
           xai: {
-            maxSearchResults: 50,
+            maxSearchResults: 30,
             returnCitations: true,
             sources: [{ type: 'web', excludedWebsites: [] }, { type: 'news' }, { type: 'x' }],
             mode: 'on'
diff --git a/src/renderer/src/aiCore/utils/options.ts b/src/renderer/src/aiCore/utils/options.ts
index 8ec46c9df2..8dc7a10af9 100644
--- a/src/renderer/src/aiCore/utils/options.ts
+++ b/src/renderer/src/aiCore/utils/options.ts
@@ -10,7 +10,9 @@ import {
   isAnthropicModel,
   isGeminiModel,
   isGrokModel,
+  isInterleavedThinkingModel,
   isOpenAIModel,
+  isOpenAIOpenWeightModel,
   isQwenMTModel,
   isSupportFlexServiceTierModel,
   isSupportVerbosityModel
@@ -244,7 +246,7 @@ export function buildProviderOptions(
           providerSpecificOptions = buildOpenAIProviderOptions(assistant, model, capabilities, serviceTier)
           break
         case SystemProviderIds.ollama:
-          providerSpecificOptions = buildOllamaProviderOptions(assistant, capabilities)
+          providerSpecificOptions = buildOllamaProviderOptions(assistant, model, capabilities)
           break
         case SystemProviderIds.gateway:
           providerSpecificOptions = buildAIGatewayOptions(assistant, model, capabilities, serviceTier, textVerbosity)
@@ -395,10 +397,12 @@ function buildOpenAIProviderOptions(
     }
   }
 
+  // TODO: 支持配置是否在服务端持久化
   providerOptions = {
     ...providerOptions,
     serviceTier,
-    textVerbosity
+    textVerbosity,
+    store: false
   }
 
   return {
@@ -564,6 +568,7 @@ function buildBedrockProviderOptions(
 
 function buildOllamaProviderOptions(
   assistant: Assistant,
+  model: Model,
   capabilities: {
     enableReasoning: boolean
     enableWebSearch: boolean
@@ -574,7 +579,14 @@ function buildOllamaProviderOptions(
   const providerOptions: OllamaCompletionProviderOptions = {}
   const reasoningEffort = assistant.settings?.reasoning_effort
   if (enableReasoning) {
-    providerOptions.think = !['none', undefined].includes(reasoningEffort)
+    if (isOpenAIOpenWeightModel(model)) {
+      // For gpt-oss models, Ollama accepts: 'low' | 'medium' | 'high'
+      if (reasoningEffort === 'low' || reasoningEffort === 'medium' || reasoningEffort === 'high') {
+        providerOptions.think = reasoningEffort
+      }
+    } else {
+      providerOptions.think = !['none', undefined].includes(reasoningEffort)
+    }
   }
   return {
     ollama: providerOptions
@@ -594,7 +606,7 @@ function buildGenericProviderOptions(
     enableGenerateImage: boolean
   }
 ): Record<string, any> {
-  const { enableWebSearch } = capabilities
+  const { enableWebSearch, enableReasoning } = capabilities
   let providerOptions: Record<string, any> = {}
 
   const reasoningParams = getReasoningEffort(assistant, model)
@@ -602,6 +614,14 @@ function buildGenericProviderOptions(
     ...providerOptions,
     ...reasoningParams
   }
+  if (enableReasoning) {
+    if (isInterleavedThinkingModel(model)) {
+      providerOptions = {
+        ...providerOptions,
+        sendReasoning: true
+      }
+    }
+  }
 
   if (enableWebSearch) {
     const webSearchParams = getWebSearchParams(model)
diff --git a/src/renderer/src/aiCore/utils/reasoning.ts b/src/renderer/src/aiCore/utils/reasoning.ts
index 1e74db24df..ab8a0b7983 100644
--- a/src/renderer/src/aiCore/utils/reasoning.ts
+++ b/src/renderer/src/aiCore/utils/reasoning.ts
@@ -8,16 +8,16 @@ import { DEFAULT_MAX_TOKENS } from '@renderer/config/constant'
 import {
   findTokenLimit,
   GEMINI_FLASH_MODEL_REGEX,
-  getThinkModelType,
+  getModelSupportedReasoningEffortOptions,
   isDeepSeekHybridInferenceModel,
+  isDoubaoSeed18Model,
   isDoubaoSeedAfter251015,
   isDoubaoThinkingAutoModel,
   isGemini3ThinkingTokenModel,
-  isGPT5SeriesModel,
-  isGPT51SeriesModel,
   isGrok4FastReasoningModel,
   isOpenAIDeepResearchModel,
   isOpenAIModel,
+  isOpenAIReasoningModel,
   isQwenAlwaysThinkModel,
   isQwenReasoningModel,
   isReasoningModel,
@@ -28,14 +28,15 @@ import {
   isSupportedThinkingTokenDoubaoModel,
   isSupportedThinkingTokenGeminiModel,
   isSupportedThinkingTokenHunyuanModel,
+  isSupportedThinkingTokenMiMoModel,
   isSupportedThinkingTokenModel,
   isSupportedThinkingTokenQwenModel,
   isSupportedThinkingTokenZhipuModel,
-  MODEL_SUPPORTED_REASONING_EFFORT
+  isSupportNoneReasoningEffortModel
 } from '@renderer/config/models'
 import { getStoreSetting } from '@renderer/hooks/useSettings'
 import { getAssistantSettings, getProviderByModel } from '@renderer/services/AssistantService'
-import type { Assistant, Model } from '@renderer/types'
+import type { Assistant, Model, ReasoningEffortOption } from '@renderer/types'
 import { EFFORT_RATIO, isSystemProvider, SystemProviderIds } from '@renderer/types'
 import type { OpenAIReasoningSummary } from '@renderer/types/aiCoreTypes'
 import type { ReasoningEffortOptionalParams } from '@renderer/types/sdk'
@@ -65,7 +66,7 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin
   // reasoningEffort is not set, no extra reasoning setting
   // Generally, for every model which supports reasoning control, the reasoning effort won't be undefined.
   // It's for some reasoning models that don't support reasoning control, such as deepseek reasoner.
-  if (!reasoningEffort) {
+  if (!reasoningEffort || reasoningEffort === 'default') {
     return {}
   }
 
@@ -73,9 +74,7 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin
   if (reasoningEffort === 'none') {
     // openrouter: use reasoning
     if (model.provider === SystemProviderIds.openrouter) {
-      // 'none' is not an available value for effort for now.
-      // I think they should resolve this issue soon, so I'll just go ahead and use this value.
-      if (isGPT51SeriesModel(model) && reasoningEffort === 'none') {
+      if (isSupportNoneReasoningEffortModel(model) && reasoningEffort === 'none') {
         return { reasoning: { effort: 'none' } }
       }
       return { reasoning: { enabled: false, exclude: true } }
@@ -119,8 +118,8 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin
       return { thinking: { type: 'disabled' } }
     }
 
-    // Specially for GPT-5.1. Suppose this is a OpenAI Compatible provider
-    if (isGPT51SeriesModel(model)) {
+    // GPT 5.1, GPT 5.2, or newer
+    if (isSupportNoneReasoningEffortModel(model)) {
       return {
         reasoningEffort: 'none'
       }
@@ -134,8 +133,7 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin
   // https://creator.poe.com/docs/external-applications/openai-compatible-api#additional-considerations
   // Poe provider - supports custom bot parameters via extra_body
   if (provider.id === SystemProviderIds.poe) {
-    // GPT-5 series models use reasoning_effort parameter in extra_body
-    if (isGPT5SeriesModel(model) || isGPT51SeriesModel(model)) {
+    if (isOpenAIReasoningModel(model)) {
       return {
         extra_body: {
           reasoning_effort: reasoningEffort === 'auto' ? 'medium' : reasoningEffort
@@ -331,16 +329,15 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin
   // Grok models/Perplexity models/OpenAI models, use reasoning_effort
   if (isSupportedReasoningEffortModel(model)) {
     // 检查模型是否支持所选选项
-    const modelType = getThinkModelType(model)
-    const supportedOptions = MODEL_SUPPORTED_REASONING_EFFORT[modelType]
-    if (supportedOptions.includes(reasoningEffort)) {
+    const supportedOptions = getModelSupportedReasoningEffortOptions(model)?.filter((option) => option !== 'default')
+    if (supportedOptions?.includes(reasoningEffort)) {
       return {
         reasoningEffort
       }
     } else {
       // 如果不支持，fallback到第一个支持的值
       return {
-        reasoningEffort: supportedOptions[0]
+        reasoningEffort: supportedOptions?.[0]
       }
     }
   }
@@ -392,7 +389,7 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin
 
   // Use thinking, doubao, zhipu, etc.
   if (isSupportedThinkingTokenDoubaoModel(model)) {
-    if (isDoubaoSeedAfter251015(model)) {
+    if (isDoubaoSeedAfter251015(model) || isDoubaoSeed18Model(model)) {
       return { reasoningEffort }
     }
     if (reasoningEffort === 'high') {
@@ -411,6 +408,12 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin
     return { thinking: { type: 'enabled' } }
   }
 
+  if (isSupportedThinkingTokenMiMoModel(model)) {
+    return {
+      thinking: { type: 'enabled' }
+    }
+  }
+
   // Default case: no special thinking settings
   return {}
 }
@@ -430,7 +433,7 @@ export function getOpenAIReasoningParams(
 
   let reasoningEffort = assistant?.settings?.reasoning_effort
 
-  if (!reasoningEffort) {
+  if (!reasoningEffort || reasoningEffort === 'default') {
     return {}
   }
 
@@ -482,16 +485,14 @@ export function getAnthropicThinkingBudget(
     return undefined
   }
 
-  const budgetTokens = Math.max(
-    1024,
-    Math.floor(
-      Math.min(
-        (tokenLimit.max - tokenLimit.min) * effortRatio + tokenLimit.min,
-        (maxTokens || DEFAULT_MAX_TOKENS) * effortRatio
-      )
-    )
-  )
-  return budgetTokens
+  const budget = Math.floor((tokenLimit.max - tokenLimit.min) * effortRatio + tokenLimit.min)
+
+  let budgetTokens = budget
+  if (maxTokens !== undefined) {
+    budgetTokens = Math.min(budget, maxTokens)
+  }
+
+  return Math.max(1024, budgetTokens)
 }
 
 /**
@@ -508,7 +509,11 @@ export function getAnthropicReasoningParams(
 
   const reasoningEffort = assistant?.settings?.reasoning_effort
 
-  if (reasoningEffort === undefined || reasoningEffort === 'none') {
+  if (!reasoningEffort || reasoningEffort === 'default') {
+    return {}
+  }
+
+  if (reasoningEffort === 'none') {
     return {
       thinking: {
         type: 'disabled'
@@ -532,20 +537,25 @@ export function getAnthropicReasoningParams(
   return {}
 }
 
-// type GoogleThinkingLevel = NonNullable<GoogleGenerativeAIProviderOptions['thinkingConfig']>['thinkingLevel']
+type GoogleThinkingLevel = NonNullable<GoogleGenerativeAIProviderOptions['thinkingConfig']>['thinkingLevel']
 
-// function mapToGeminiThinkingLevel(reasoningEffort: ReasoningEffortOption): GoogelThinkingLevel {
-//   switch (reasoningEffort) {
-//     case 'low':
-//       return 'low'
-//     case 'medium':
-//       return 'medium'
-//     case 'high':
-//       return 'high'
-//     default:
-//       return 'medium'
-//   }
-// }
+function mapToGeminiThinkingLevel(reasoningEffort: ReasoningEffortOption): GoogleThinkingLevel {
+  switch (reasoningEffort) {
+    case 'default':
+      return undefined
+    case 'minimal':
+      return 'minimal'
+    case 'low':
+      return 'low'
+    case 'medium':
+      return 'medium'
+    case 'high':
+      return 'high'
+    default:
+      logger.warn('Unknown thinking level for Gemini. Fallback to medium instead.', { reasoningEffort })
+      return 'medium'
+  }
+}
 
 /**
  * 获取 Gemini 推理参数
@@ -563,6 +573,10 @@ export function getGeminiReasoningParams(
 
   const reasoningEffort = assistant?.settings?.reasoning_effort
 
+  if (!reasoningEffort || reasoningEffort === 'default') {
+    return {}
+  }
+
   // Gemini 推理参数
   if (isSupportedThinkingTokenGeminiModel(model)) {
     if (reasoningEffort === undefined || reasoningEffort === 'none') {
@@ -574,21 +588,22 @@ export function getGeminiReasoningParams(
       }
     }
 
-    // TODO: 很多中转还不支持
     // https://ai.google.dev/gemini-api/docs/gemini-3?thinking=high#new_api_features_in_gemini_3
-    // if (isGemini3ThinkingTokenModel(model)) {
-    //   return {
-    //     thinkingConfig: {
-    //       thinkingLevel: mapToGeminiThinkingLevel(reasoningEffort)
-    //     }
-    //   }
-    // }
+    if (isGemini3ThinkingTokenModel(model)) {
+      return {
+        thinkingConfig: {
+          includeThoughts: true,
+          thinkingLevel: mapToGeminiThinkingLevel(reasoningEffort)
+        }
+      }
+    }
 
     const effortRatio = EFFORT_RATIO[reasoningEffort]
 
     if (effortRatio > 1) {
       return {
         thinkingConfig: {
+          thinkingBudget: -1,
           includeThoughts: true
         }
       }
@@ -622,10 +637,6 @@ export function getXAIReasoningParams(assistant: Assistant, model: Model): Pick<
 
   const { reasoning_effort: reasoningEffort } = getAssistantSettings(assistant)
 
-  if (!reasoningEffort || reasoningEffort === 'none') {
-    return {}
-  }
-
   switch (reasoningEffort) {
     case 'auto':
     case 'minimal':
@@ -634,6 +645,12 @@ export function getXAIReasoningParams(assistant: Assistant, model: Model): Pick<
     case 'low':
     case 'high':
       return { reasoningEffort }
+    case 'xhigh':
+      return { reasoningEffort: 'high' }
+    case 'default':
+    case 'none':
+    default:
+      return {}
   }
 }
 
@@ -650,7 +667,7 @@ export function getBedrockReasoningParams(
 
   const reasoningEffort = assistant?.settings?.reasoning_effort
 
-  if (reasoningEffort === undefined) {
+  if (reasoningEffort === undefined || reasoningEffort === 'default') {
     return {}
   }
 
diff --git a/src/renderer/src/aiCore/utils/websearch.ts b/src/renderer/src/aiCore/utils/websearch.ts
index 127636a50b..14a99139be 100644
--- a/src/renderer/src/aiCore/utils/websearch.ts
+++ b/src/renderer/src/aiCore/utils/websearch.ts
@@ -9,6 +9,8 @@ import type { CherryWebSearchConfig } from '@renderer/store/websearch'
 import type { Model } from '@renderer/types'
 import { mapRegexToPatterns } from '@renderer/utils/blacklistMatchPattern'
 
+const X_AI_MAX_SEARCH_RESULT = 30
+
 export function getWebSearchParams(model: Model): Record<string, any> {
   if (model.provider === 'hunyuan') {
     return { enable_enhancement: true, citation: true, search_info: true }
@@ -82,7 +84,7 @@ export function buildProviderBuiltinWebSearchConfig(
       const excludeDomains = mapRegexToPatterns(webSearchConfig.excludeDomains)
       return {
         xai: {
-          maxSearchResults: webSearchConfig.maxResults,
+          maxSearchResults: Math.min(webSearchConfig.maxResults, X_AI_MAX_SEARCH_RESULT),
           returnCitations: true,
           sources: [
             {
diff --git a/src/renderer/src/assets/images/apps/aistudio.png b/src/renderer/src/assets/images/apps/aistudio.png
new file mode 100644
index 0000000000..c7cb2adebe
Binary files /dev/null and b/src/renderer/src/assets/images/apps/aistudio.png differ
diff --git a/src/renderer/src/assets/images/apps/aistudio.svg b/src/renderer/src/assets/images/apps/aistudio.svg
deleted file mode 100644
index 2c08015593..0000000000
--- a/src/renderer/src/assets/images/apps/aistudio.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="256" height="256" rx="32" fill="#0057CE"/>
-<mask id="path-2-inside-1_4113_89308" fill="white">
-<path d="M169.6 131.626C173.075 129.641 176.32 128.241 180.1 126.943C183.74 125.695 187.444 124.664 191.186 123.735C194.915 122.806 198.682 122.017 202.449 121.228C206.216 120.439 209.958 119.675 213.598 118.314C231.429 111.619 242.221 93.6357 239.612 74.9396C237.003 56.2435 221.692 41.8237 202.691 40.1564C194.062 39.4055 185.726 41.4164 178.013 44.9418C170.326 48.4545 163.288 53.4435 157.166 59.158C144.795 70.676 135.657 85.4649 130.083 101.208C124.47 117.054 122.37 134.095 123.694 150.806C124.356 159.129 125.883 167.504 128.326 175.509C130.719 183.362 134.181 191.469 138.839 198.342C136.828 185.475 138.559 172.175 143.917 160.262C149.262 148.375 158.121 138.193 169.6 131.626Z"/>
-</mask>
-<path d="M169.6 131.626C173.075 129.641 176.32 128.241 180.1 126.943C183.74 125.695 187.444 124.664 191.186 123.735C194.915 122.806 198.682 122.017 202.449 121.228C206.216 120.439 209.958 119.675 213.598 118.314C231.429 111.619 242.221 93.6357 239.612 74.9396C237.003 56.2435 221.692 41.8237 202.691 40.1564C194.062 39.4055 185.726 41.4164 178.013 44.9418C170.326 48.4545 163.288 53.4435 157.166 59.158C144.795 70.676 135.657 85.4649 130.083 101.208C124.47 117.054 122.37 134.095 123.694 150.806C124.356 159.129 125.883 167.504 128.326 175.509C130.719 183.362 134.181 191.469 138.839 198.342C136.828 185.475 138.559 172.175 143.917 160.262C149.262 148.375 158.121 138.193 169.6 131.626Z" fill="white" stroke="white" stroke-width="32" mask="url(#path-2-inside-1_4113_89308)"/>
-<path d="M162.246 150.4C161.915 153.913 163.073 157.464 165.542 160.06C168.011 162.657 171.499 164.031 174.668 165.253C178.13 166.577 181.12 167.658 184.353 169.529C187.433 171.311 190.157 173.526 192.435 176.262C201.802 187.449 200.937 203.867 190.462 214.049C179.988 224.23 163.379 224.778 152.243 215.321C149.404 212.903 146.884 209.798 144.81 206.756C141.654 186.52 147.775 165.317 162.246 150.4Z" fill="white"/>
-<mask id="path-4-outside-2_4113_89308" maskUnits="userSpaceOnUse" x="136" y="138.4" width="71" height="92" fill="black">
-<rect fill="white" x="136" y="138.4" width="71" height="92"/>
-<path d="M162.246 150.4C165.542 153.666 163.073 157.464 165.542 160.06C168.011 162.657 171.499 164.031 174.668 165.253C178.13 166.577 181.12 167.658 184.353 169.529C187.433 171.311 190.157 173.526 192.435 176.262C201.802 187.449 200.937 203.867 190.462 214.049C179.988 224.23 163.379 224.778 152.243 215.321C149.404 212.903 146.884 209.798 144.81 206.756C141.654 186.52 147.775 165.317 162.246 150.4Z"/>
-</mask>
-<path d="M162.246 150.4C165.542 153.666 163.073 157.464 165.542 160.06C168.011 162.657 171.499 164.031 174.668 165.253C178.13 166.577 181.12 167.658 184.353 169.529C187.433 171.311 190.157 173.526 192.435 176.262C201.802 187.449 200.937 203.867 190.462 214.049C179.988 224.23 163.379 224.778 152.243 215.321C149.404 212.903 146.884 209.798 144.81 206.756C141.654 186.52 147.775 165.317 162.246 150.4Z" stroke="#0057CE" stroke-width="16" mask="url(#path-4-outside-2_4113_89308)"/>
-<mask id="path-5-inside-3_4113_89308" fill="white">
-<path d="M50.4113 61.9063C63.3547 61.8935 75.9164 69.008 85.0163 76.9879C94.6761 85.4641 102.16 96.2567 107.085 107.991C112.036 119.789 114.416 132.542 114.327 145.282C114.238 157.665 111.769 171.079 106.296 182.394C105.774 167.821 100.123 153.885 90.3107 143.003C88.5926 141.107 86.7981 139.389 84.6599 137.938C82.5218 136.487 80.2691 135.418 77.8382 134.565C73.1164 132.911 67.7838 132.134 62.8711 131.6C57.8057 131.04 52.7149 130.709 47.6622 129.971C42.4695 129.207 37.8114 128.087 33.1787 125.427C19.688 117.715 13.1463 102.009 17.1808 87.1441C21.2153 72.2661 34.846 61.919 50.4113 61.9063Z"/>
-</mask>
-<path d="M50.4113 61.9063C63.3547 61.8935 75.9164 69.008 85.0163 76.9879C94.6761 85.4641 102.16 96.2567 107.085 107.991C112.036 119.789 114.416 132.542 114.327 145.282C114.238 157.665 111.769 171.079 106.296 182.394C105.774 167.821 100.123 153.885 90.3107 143.003C88.5926 141.107 86.7981 139.389 84.6599 137.938C82.5218 136.487 80.2691 135.418 77.8382 134.565C73.1164 132.911 67.7838 132.134 62.8711 131.6C57.8057 131.04 52.7149 130.709 47.6622 129.971C42.4695 129.207 37.8114 128.087 33.1787 125.427C19.688 117.715 13.1463 102.009 17.1808 87.1441C21.2153 72.2661 34.846 61.919 50.4113 61.9063Z" fill="white" stroke="white" stroke-width="32" mask="url(#path-5-inside-3_4113_89308)"/>
-<mask id="path-6-inside-4_4113_89308" fill="white">
-<path d="M82.5802 149.38C81.3584 148.03 80.0857 146.745 78.673 145.6C80.4294 148.578 80.6075 151.95 79.8694 155.196C79.1312 158.429 77.5021 161.419 75.4403 163.99C73.3149 166.625 70.8204 168.725 68.1095 170.71C65.7423 172.441 62.2932 174.656 60.1551 176.73C53.8679 182.839 52.5824 192.384 57.0369 199.893C61.4914 207.415 70.5277 210.979 78.9912 208.535C83.662 207.186 87.6202 204.144 90.7638 200.67C93.9455 197.157 96.5291 192.983 98.5655 188.757C98.0437 174.185 92.3928 160.261 82.5802 149.38Z"/>
-</mask>
-<path d="M82.5802 149.38C81.3584 148.03 80.0857 146.745 78.673 145.6C80.4294 148.578 80.6075 151.95 79.8694 155.196C79.1312 158.429 77.5021 161.419 75.4403 163.99C73.3149 166.625 70.8204 168.725 68.1095 170.71C65.7423 172.441 62.2932 174.656 60.1551 176.73C53.8679 182.839 52.5824 192.384 57.0369 199.893C61.4914 207.415 70.5277 210.979 78.9912 208.535C83.662 207.186 87.6202 204.144 90.7638 200.67C93.9455 197.157 96.5291 192.983 98.5655 188.757C98.0437 174.185 92.3928 160.261 82.5802 149.38Z" stroke="white" stroke-width="24" mask="url(#path-6-inside-4_4113_89308)"/>
-<mask id="path-7-outside-5_4113_89308" maskUnits="userSpaceOnUse" x="45.3994" y="138.6" width="62" height="79" fill="black">
-<rect fill="white" x="45.3994" y="138.6" width="62" height="79"/>
-<path d="M82.5802 149.38C81.3584 148.03 80.0857 146.745 78.673 145.6C80.4294 148.578 80.6075 151.95 79.8694 155.196C79.1312 158.429 77.5021 161.419 75.4403 163.99C73.3149 166.625 70.8204 168.725 68.1095 170.71C65.7423 172.441 62.2932 174.656 60.1551 176.73C53.8679 182.839 52.5824 192.384 57.0369 199.893C61.4914 207.415 70.5277 210.979 78.9912 208.535C83.662 207.186 87.6202 204.144 90.7638 200.67C93.9455 197.157 96.5291 192.983 98.5655 188.757C98.0437 174.185 92.3928 160.261 82.5802 149.38Z"/>
-</mask>
-<path d="M82.5802 149.38C81.3584 148.03 80.0857 146.745 78.673 145.6C80.4294 148.578 80.6075 151.95 79.8694 155.196C79.1312 158.429 77.5021 161.419 75.4403 163.99C73.3149 166.625 70.8204 168.725 68.1095 170.71C65.7423 172.441 62.2932 174.656 60.1551 176.73C53.8679 182.839 52.5824 192.384 57.0369 199.893C61.4914 207.415 70.5277 210.979 78.9912 208.535C83.662 207.186 87.6202 204.144 90.7638 200.67C93.9455 197.157 96.5291 192.983 98.5655 188.757C98.0437 174.185 92.3928 160.261 82.5802 149.38Z" fill="white"/>
-<path d="M82.5802 149.38C81.3584 148.03 80.0857 146.745 78.673 145.6C80.4294 148.578 80.6075 151.95 79.8694 155.196C79.1312 158.429 77.5021 161.419 75.4403 163.99C73.3149 166.625 70.8204 168.725 68.1095 170.71C65.7423 172.441 62.2932 174.656 60.1551 176.73C53.8679 182.839 52.5824 192.384 57.0369 199.893C61.4914 207.415 70.5277 210.979 78.9912 208.535C83.662 207.186 87.6202 204.144 90.7638 200.67C93.9455 197.157 96.5291 192.983 98.5655 188.757C98.0437 174.185 92.3928 160.261 82.5802 149.38Z" stroke="#0057CE" stroke-width="16" mask="url(#path-7-outside-5_4113_89308)"/>
-</svg>
diff --git a/src/renderer/src/assets/images/models/mimo.svg b/src/renderer/src/assets/images/models/mimo.svg
new file mode 100644
index 0000000000..82370fece3
--- /dev/null
+++ b/src/renderer/src/assets/images/models/mimo.svg
@@ -0,0 +1,17 @@
+<svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <g transform="translate(10, 42) scale(1.35)">
+    <!-- m -->
+    <path d="M1.2683 15.9987C0.9317 15.998 0.6091 15.8638 0.3713 15.6256C0.1335 15.3873 0 15.0644 0 14.7278V7.165C0.0148 6.83757 0.1554 6.52848 0.3924 6.30203C0.6293 6.07559 0.9445 5.94922 1.2722 5.94922C1.6 5.94922 1.9152 6.07559 2.1521 6.30203C2.3891 6.52848 2.5296 6.83757 2.5445 7.165V14.7278C2.5442 14.895 2.5109 15.0606 2.4466 15.215C2.3822 15.3693 2.2881 15.5095 2.1696 15.6276C2.0511 15.7456 1.9105 15.8391 1.7559 15.9028C1.6012 15.9665 1.4356 15.9991 1.2683 15.9987Z" fill="currentColor"/>
+    <path d="M14.8841 15.9993C14.5468 15.9993 14.2232 15.8655 13.9845 15.6272C13.7457 15.389 13.6112 15.0657 13.6105 14.7284V4.67881L8.9888 9.45281C8.7538 9.69657 8.4315 9.83697 8.0929 9.84312C7.7544 9.84928 7.4272 9.72069 7.1835 9.48563C6.9397 9.25058 6.7993 8.92832 6.7931 8.58976C6.7901 8.42211 6.8201 8.25551 6.8814 8.09947C6.9428 7.94342 7.0342 7.80098 7.1506 7.68028L13.9703 0.661082C14.1463 0.478921 14.3728 0.35354 14.6207 0.301033C14.8685 0.248526 15.1264 0.271291 15.3612 0.366403C15.5961 0.461516 15.7971 0.624637 15.9385 0.834827C16.08 1.04502 16.1554 1.29268 16.1551 1.54603V14.7284C16.1551 15.0655 16.0212 15.3887 15.7828 15.6271C15.5444 15.8654 15.2212 15.9993 14.8841 15.9993Z" fill="currentColor"/>
+    <path d="M8.0748 9.82621C7.9058 9.82749 7.7383 9.79518 7.5818 9.73117C7.4254 9.66716 7.2833 9.57272 7.1636 9.45332L0.3571 2.4315C0.1224 2.18948 -0.0065 1.86414 -0.0014 1.52705C0.0038 1.18996 0.1427 0.868726 0.3847 0.634023C0.6267 0.399319 0.9521 0.270369 1.2892 0.27554C1.6262 0.280711 1.9475 0.419579 2.1822 0.661595L8.9887 7.66767C9.1623 7.84735 9.2792 8.07413 9.3249 8.31977C9.3706 8.56541 9.343 8.81906 9.2456 9.04914C9.1482 9.27922 8.9852 9.47557 8.7771 9.61374C8.5689 9.75191 8.3247 9.8258 8.0748 9.82621Z" fill="currentColor"/>
+    <!-- i -->
+    <path d="M20.3539 15.9997C20.0169 15.9997 19.6936 15.8658 19.4552 15.6274C19.2169 15.3891 19.083 15.0658 19.083 14.7287V1.54636C19.083 1.20928 19.2169 0.886001 19.4552 0.647648C19.6936 0.409296 20.0169 0.275391 20.3539 0.275391C20.691 0.275391 21.0143 0.409296 21.2526 0.647648C21.491 0.886001 21.6249 1.20928 21.6249 1.54636V14.7287C21.6249 14.8956 21.592 15.0609 21.5282 15.2151C21.4643 15.3693 21.3707 15.5094 21.2526 15.6274C21.1346 15.7454 20.9945 15.839 20.8403 15.9029C20.6861 15.9668 20.5208 15.9997 20.3539 15.9997Z" fill="currentColor"/>
+    <!-- m -->
+    <path d="M25.8263 15.9992C25.4893 15.9992 25.166 15.8653 24.9276 15.627C24.6893 15.3886 24.5554 15.0654 24.5554 14.7283V7.1655C24.5554 6.82842 24.6893 6.50514 24.9276 6.26679C25.166 6.02844 25.4893 5.89453 25.8263 5.89453C26.1634 5.89453 26.4867 6.02844 26.7251 6.26679C26.9634 6.50514 27.0973 6.82842 27.0973 7.1655V14.7283C27.0973 15.0654 26.9634 15.3886 26.7251 15.627C26.4867 15.8653 26.1634 15.9992 25.8263 15.9992Z" fill="currentColor"/>
+    <path d="M39.4394 16.0004C39.1023 16.0004 38.779 15.8664 38.5406 15.6281C38.3023 15.3897 38.1684 15.0665 38.1684 14.7294V4.67982L33.5467 9.45382C33.3117 9.69584 32.9901 9.83457 32.6523 9.83949C32.3156 9.84442 31.9894 9.71513 31.7474 9.48008C31.5054 9.24503 31.3674 8.92346 31.3623 8.58613C31.3573 8.24879 31.4863 7.92331 31.7214 7.6813L38.5284 0.662093C38.7044 0.483575 38.9304 0.361405 39.1767 0.311007C39.4233 0.260609 39.6787 0.284243 39.9114 0.378925C40.1437 0.473608 40.3427 0.635093 40.4837 0.842994C40.6247 1.05089 40.7007 1.29589 40.7027 1.54704V14.7294C40.7017 15.0649 40.5687 15.3866 40.3327 15.6246C40.0957 15.8625 39.7747 15.9976 39.4394 16.0004Z" fill="currentColor"/>
+    <path d="M32.6324 9.82618C32.4634 9.82746 32.2964 9.79516 32.1394 9.73115C31.9834 9.66713 31.8414 9.57269 31.7214 9.45329L24.9151 2.43147C24.7921 2.31326 24.6942 2.1715 24.6271 2.01463C24.5601 1.85777 24.5253 1.68901 24.5249 1.51842C24.5244 1.34783 24.5583 1.1789 24.6246 1.02169C24.6908 0.864476 24.788 0.722207 24.9104 0.603357C25.0327 0.484507 25.1778 0.391509 25.3369 0.329905C25.4959 0.268302 25.6658 0.239353 25.8363 0.244785C26.0068 0.250217 26.1745 0.289918 26.3293 0.361522C26.4841 0.433126 26.623 0.535168 26.7375 0.661566L33.5467 7.66764C33.7204 7.84732 33.8374 8.0741 33.8824 8.31974C33.9284 8.56538 33.9014 8.81903 33.8034 9.04911C33.7064 9.27919 33.5434 9.47554 33.3354 9.61371C33.1267 9.75189 32.8824 9.82577 32.6324 9.82618Z" fill="currentColor"/>
+    <!-- o -->
+    <path d="M50.9434 15.9814C49.5534 15.9865 48.1864 15.6287 46.9774 14.9433C45.7674 14.2579 44.7584 13.2687 44.0484 12.0735C43.3384 10.8783 42.9534 9.5185 42.9304 8.12863C42.9074 6.73875 43.2474 5.36692 43.9164 4.1488C44.0844 3.86356 44.3564 3.65487 44.6754 3.56707C44.9944 3.47927 45.3344 3.51928 45.6244 3.67859C45.9144 3.8379 46.1314 4.10397 46.2274 4.42026C46.3244 4.73656 46.2944 5.07816 46.1434 5.3725C45.5764 6.40664 45.3594 7.59693 45.5264 8.76468C45.6924 9.93243 46.2334 11.0147 47.0674 11.8489C47.9014 12.6831 48.9834 13.2244 50.1514 13.3914C51.3184 13.5584 52.5094 13.3421 53.5434 12.7751C53.8384 12.6125 54.1864 12.5738 54.5104 12.6676C54.8344 12.7614 55.1074 12.98 55.2704 13.2753C55.4324 13.5706 55.4714 13.9184 55.3774 14.2422C55.2834 14.566 55.0654 14.8393 54.7694 15.0019C53.5974 15.6455 52.2814 15.9824 50.9434 15.9814Z" fill="currentColor"/>
+    <path d="M56.8104 12.5052C56.5944 12.5044 56.3834 12.4484 56.1954 12.3424C55.9014 12.1795 55.6824 11.9066 55.5894 11.5833C55.4954 11.26 55.5324 10.9126 55.6944 10.6171C56.2614 9.58297 56.4784 8.39268 56.3114 7.22493C56.1454 6.05718 55.6044 4.97496 54.7704 4.14073C53.9364 3.30649 52.8544 2.76525 51.6864 2.59825C50.5194 2.43125 49.3284 2.64749 48.2944 3.21452C48.1474 3.30059 47.9854 3.3564 47.8164 3.37863C47.6484 3.40087 47.4774 3.38908 47.3134 3.34397C47.1494 3.29886 46.9964 3.22134 46.8624 3.116C46.7294 3.01066 46.6184 2.87964 46.5364 2.73069C46.4544 2.58174 46.4034 2.41788 46.3864 2.24882C46.3684 2.07975 46.3854 1.90891 46.4354 1.7464C46.4854 1.58389 46.5674 1.43301 46.6764 1.3027C46.7854 1.17238 46.9194 1.06527 47.0704 0.987704C48.5874 0.155491 50.3324 -0.162266 52.0454 0.0821474C53.7574 0.326561 55.3454 1.11995 56.5684 2.34319C57.7914 3.56642 58.5844 5.15347 58.8294 6.86604C59.0734 8.5786 58.7554 10.3242 57.9234 11.8408C57.8144 12.0411 57.6534 12.2084 57.4574 12.3253C57.2624 12.4422 57.0384 12.5043 56.8104 12.5052Z" fill="currentColor"/>
+  </g>
+</svg>
diff --git a/src/renderer/src/assets/images/providers/mimo.svg b/src/renderer/src/assets/images/providers/mimo.svg
new file mode 100644
index 0000000000..82370fece3
--- /dev/null
+++ b/src/renderer/src/assets/images/providers/mimo.svg
@@ -0,0 +1,17 @@
+<svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <g transform="translate(10, 42) scale(1.35)">
+    <!-- m -->
+    <path d="M1.2683 15.9987C0.9317 15.998 0.6091 15.8638 0.3713 15.6256C0.1335 15.3873 0 15.0644 0 14.7278V7.165C0.0148 6.83757 0.1554 6.52848 0.3924 6.30203C0.6293 6.07559 0.9445 5.94922 1.2722 5.94922C1.6 5.94922 1.9152 6.07559 2.1521 6.30203C2.3891 6.52848 2.5296 6.83757 2.5445 7.165V14.7278C2.5442 14.895 2.5109 15.0606 2.4466 15.215C2.3822 15.3693 2.2881 15.5095 2.1696 15.6276C2.0511 15.7456 1.9105 15.8391 1.7559 15.9028C1.6012 15.9665 1.4356 15.9991 1.2683 15.9987Z" fill="currentColor"/>
+    <path d="M14.8841 15.9993C14.5468 15.9993 14.2232 15.8655 13.9845 15.6272C13.7457 15.389 13.6112 15.0657 13.6105 14.7284V4.67881L8.9888 9.45281C8.7538 9.69657 8.4315 9.83697 8.0929 9.84312C7.7544 9.84928 7.4272 9.72069 7.1835 9.48563C6.9397 9.25058 6.7993 8.92832 6.7931 8.58976C6.7901 8.42211 6.8201 8.25551 6.8814 8.09947C6.9428 7.94342 7.0342 7.80098 7.1506 7.68028L13.9703 0.661082C14.1463 0.478921 14.3728 0.35354 14.6207 0.301033C14.8685 0.248526 15.1264 0.271291 15.3612 0.366403C15.5961 0.461516 15.7971 0.624637 15.9385 0.834827C16.08 1.04502 16.1554 1.29268 16.1551 1.54603V14.7284C16.1551 15.0655 16.0212 15.3887 15.7828 15.6271C15.5444 15.8654 15.2212 15.9993 14.8841 15.9993Z" fill="currentColor"/>
+    <path d="M8.0748 9.82621C7.9058 9.82749 7.7383 9.79518 7.5818 9.73117C7.4254 9.66716 7.2833 9.57272 7.1636 9.45332L0.3571 2.4315C0.1224 2.18948 -0.0065 1.86414 -0.0014 1.52705C0.0038 1.18996 0.1427 0.868726 0.3847 0.634023C0.6267 0.399319 0.9521 0.270369 1.2892 0.27554C1.6262 0.280711 1.9475 0.419579 2.1822 0.661595L8.9887 7.66767C9.1623 7.84735 9.2792 8.07413 9.3249 8.31977C9.3706 8.56541 9.343 8.81906 9.2456 9.04914C9.1482 9.27922 8.9852 9.47557 8.7771 9.61374C8.5689 9.75191 8.3247 9.8258 8.0748 9.82621Z" fill="currentColor"/>
+    <!-- i -->
+    <path d="M20.3539 15.9997C20.0169 15.9997 19.6936 15.8658 19.4552 15.6274C19.2169 15.3891 19.083 15.0658 19.083 14.7287V1.54636C19.083 1.20928 19.2169 0.886001 19.4552 0.647648C19.6936 0.409296 20.0169 0.275391 20.3539 0.275391C20.691 0.275391 21.0143 0.409296 21.2526 0.647648C21.491 0.886001 21.6249 1.20928 21.6249 1.54636V14.7287C21.6249 14.8956 21.592 15.0609 21.5282 15.2151C21.4643 15.3693 21.3707 15.5094 21.2526 15.6274C21.1346 15.7454 20.9945 15.839 20.8403 15.9029C20.6861 15.9668 20.5208 15.9997 20.3539 15.9997Z" fill="currentColor"/>
+    <!-- m -->
+    <path d="M25.8263 15.9992C25.4893 15.9992 25.166 15.8653 24.9276 15.627C24.6893 15.3886 24.5554 15.0654 24.5554 14.7283V7.1655C24.5554 6.82842 24.6893 6.50514 24.9276 6.26679C25.166 6.02844 25.4893 5.89453 25.8263 5.89453C26.1634 5.89453 26.4867 6.02844 26.7251 6.26679C26.9634 6.50514 27.0973 6.82842 27.0973 7.1655V14.7283C27.0973 15.0654 26.9634 15.3886 26.7251 15.627C26.4867 15.8653 26.1634 15.9992 25.8263 15.9992Z" fill="currentColor"/>
+    <path d="M39.4394 16.0004C39.1023 16.0004 38.779 15.8664 38.5406 15.6281C38.3023 15.3897 38.1684 15.0665 38.1684 14.7294V4.67982L33.5467 9.45382C33.3117 9.69584 32.9901 9.83457 32.6523 9.83949C32.3156 9.84442 31.9894 9.71513 31.7474 9.48008C31.5054 9.24503 31.3674 8.92346 31.3623 8.58613C31.3573 8.24879 31.4863 7.92331 31.7214 7.6813L38.5284 0.662093C38.7044 0.483575 38.9304 0.361405 39.1767 0.311007C39.4233 0.260609 39.6787 0.284243 39.9114 0.378925C40.1437 0.473608 40.3427 0.635093 40.4837 0.842994C40.6247 1.05089 40.7007 1.29589 40.7027 1.54704V14.7294C40.7017 15.0649 40.5687 15.3866 40.3327 15.6246C40.0957 15.8625 39.7747 15.9976 39.4394 16.0004Z" fill="currentColor"/>
+    <path d="M32.6324 9.82618C32.4634 9.82746 32.2964 9.79516 32.1394 9.73115C31.9834 9.66713 31.8414 9.57269 31.7214 9.45329L24.9151 2.43147C24.7921 2.31326 24.6942 2.1715 24.6271 2.01463C24.5601 1.85777 24.5253 1.68901 24.5249 1.51842C24.5244 1.34783 24.5583 1.1789 24.6246 1.02169C24.6908 0.864476 24.788 0.722207 24.9104 0.603357C25.0327 0.484507 25.1778 0.391509 25.3369 0.329905C25.4959 0.268302 25.6658 0.239353 25.8363 0.244785C26.0068 0.250217 26.1745 0.289918 26.3293 0.361522C26.4841 0.433126 26.623 0.535168 26.7375 0.661566L33.5467 7.66764C33.7204 7.84732 33.8374 8.0741 33.8824 8.31974C33.9284 8.56538 33.9014 8.81903 33.8034 9.04911C33.7064 9.27919 33.5434 9.47554 33.3354 9.61371C33.1267 9.75189 32.8824 9.82577 32.6324 9.82618Z" fill="currentColor"/>
+    <!-- o -->
+    <path d="M50.9434 15.9814C49.5534 15.9865 48.1864 15.6287 46.9774 14.9433C45.7674 14.2579 44.7584 13.2687 44.0484 12.0735C43.3384 10.8783 42.9534 9.5185 42.9304 8.12863C42.9074 6.73875 43.2474 5.36692 43.9164 4.1488C44.0844 3.86356 44.3564 3.65487 44.6754 3.56707C44.9944 3.47927 45.3344 3.51928 45.6244 3.67859C45.9144 3.8379 46.1314 4.10397 46.2274 4.42026C46.3244 4.73656 46.2944 5.07816 46.1434 5.3725C45.5764 6.40664 45.3594 7.59693 45.5264 8.76468C45.6924 9.93243 46.2334 11.0147 47.0674 11.8489C47.9014 12.6831 48.9834 13.2244 50.1514 13.3914C51.3184 13.5584 52.5094 13.3421 53.5434 12.7751C53.8384 12.6125 54.1864 12.5738 54.5104 12.6676C54.8344 12.7614 55.1074 12.98 55.2704 13.2753C55.4324 13.5706 55.4714 13.9184 55.3774 14.2422C55.2834 14.566 55.0654 14.8393 54.7694 15.0019C53.5974 15.6455 52.2814 15.9824 50.9434 15.9814Z" fill="currentColor"/>
+    <path d="M56.8104 12.5052C56.5944 12.5044 56.3834 12.4484 56.1954 12.3424C55.9014 12.1795 55.6824 11.9066 55.5894 11.5833C55.4954 11.26 55.5324 10.9126 55.6944 10.6171C56.2614 9.58297 56.4784 8.39268 56.3114 7.22493C56.1454 6.05718 55.6044 4.97496 54.7704 4.14073C53.9364 3.30649 52.8544 2.76525 51.6864 2.59825C50.5194 2.43125 49.3284 2.64749 48.2944 3.21452C48.1474 3.30059 47.9854 3.3564 47.8164 3.37863C47.6484 3.40087 47.4774 3.38908 47.3134 3.34397C47.1494 3.29886 46.9964 3.22134 46.8624 3.116C46.7294 3.01066 46.6184 2.87964 46.5364 2.73069C46.4544 2.58174 46.4034 2.41788 46.3864 2.24882C46.3684 2.07975 46.3854 1.90891 46.4354 1.7464C46.4854 1.58389 46.5674 1.43301 46.6764 1.3027C46.7854 1.17238 46.9194 1.06527 47.0704 0.987704C48.5874 0.155491 50.3324 -0.162266 52.0454 0.0821474C53.7574 0.326561 55.3454 1.11995 56.5684 2.34319C57.7914 3.56642 58.5844 5.15347 58.8294 6.86604C59.0734 8.5786 58.7554 10.3242 57.9234 11.8408C57.8144 12.0411 57.6534 12.2084 57.4574 12.3253C57.2624 12.4422 57.0384 12.5043 56.8104 12.5052Z" fill="currentColor"/>
+  </g>
+</svg>
diff --git a/src/renderer/src/assets/images/search/baidu.svg b/src/renderer/src/assets/images/search/baidu.svg
new file mode 100644
index 0000000000..ead7f89822
--- /dev/null
+++ b/src/renderer/src/assets/images/search/baidu.svg
@@ -0,0 +1 @@
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Baidu</title><path d="M8.859 11.735c1.017-1.71 4.059-3.083 6.202.286 1.579 2.284 4.284 4.397 4.284 4.397s2.027 1.601.73 4.684c-1.24 2.956-5.64 1.607-6.005 1.49l-.024-.009s-1.746-.568-3.776-.112c-2.026.458-3.773.286-3.773.286l-.045-.001c-.328-.01-2.38-.187-3.001-2.968-.675-3.028 2.365-4.687 2.592-4.968.226-.288 1.802-1.37 2.816-3.085zm.986 1.738v2.032h-1.64s-1.64.138-2.213 2.014c-.2 1.252.177 1.99.242 2.148.067.157.596 1.073 1.927 1.342h3.078v-7.514l-1.394-.022zm3.588 2.191l-1.44.024v3.956s.064.985 1.44 1.344h3.541v-5.3h-1.528v3.979h-1.46s-.466-.068-.553-.447v-3.556zM9.82 16.715v3.06H8.58s-.863-.045-1.126-1.049c-.136-.445.02-.959.088-1.16.063-.203.353-.671.951-.85H9.82zm9.525-9.036c2.086 0 2.646 2.06 2.646 2.742 0 .688.284 3.597-2.309 3.655-2.595.057-2.704-1.77-2.704-3.08 0-1.374.277-3.317 2.367-3.317zM4.24 6.08c1.523-.135 2.645 1.55 2.762 2.513.07.625.393 3.486-1.975 4-2.364.515-3.244-2.249-2.984-3.544 0 0 .28-2.797 2.197-2.969zm8.847-1.483c.14-1.31 1.69-3.316 2.931-3.028 1.236.285 2.367 1.944 2.137 3.37-.224 1.428-1.345 3.313-3.095 3.082-1.748-.226-2.143-1.823-1.973-3.424zM9.425 1c1.307 0 2.364 1.519 2.364 3.398 0 1.879-1.057 3.4-2.364 3.4s-2.367-1.521-2.367-3.4C7.058 2.518 8.118 1 9.425 1z" fill="#2932E1" fill-rule="nonzero"></path></svg>
\ No newline at end of file
diff --git a/src/renderer/src/assets/images/search/bing.svg b/src/renderer/src/assets/images/search/bing.svg
new file mode 100644
index 0000000000..b411a4f068
--- /dev/null
+++ b/src/renderer/src/assets/images/search/bing.svg
@@ -0,0 +1 @@
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Bing</title><path d="M11.97 7.569a.92.92 0 00-.805.863c-.013.195-.01.209.43 1.347 1 2.59 1.242 3.214 1.283 3.302.099.213.237.413.41.592.134.138.222.212.37.311.26.176.39.224 1.405.527.989.295 1.529.49 1.994.723.603.302 1.024.644 1.29 1.051.191.292.36.815.434 1.342.029.206.029.661 0 .847a2.491 2.491 0 01-.376 1.026c-.1.151-.065.126.081-.058.415-.52.838-1.408 1.054-2.213a6.728 6.728 0 00.102-3.012 6.626 6.626 0 00-3.291-4.53 104.157 104.157 0 00-1.322-.698l-.254-.133a737.941 737.941 0 01-1.575-.827c-.548-.29-.78-.406-.846-.426a1.376 1.376 0 00-.29-.045l-.093.01z" fill="url(#lobe-icons-bing-fill-0)"></path><path d="M13.164 17.24a4.385 4.385 0 00-.202.125 511.45 511.45 0 00-1.795 1.115 163.087 163.087 0 01-.989.614l-.463.288a99.198 99.198 0 01-1.502.941c-.326.2-.704.334-1.09.387-.18.024-.52.024-.7 0a2.807 2.807 0 01-1.318-.538 3.665 3.665 0 01-.543-.545 2.837 2.837 0 01-.506-1.141 2.161 2.161 0 00-.041-.182c-.008-.008.006.138.032.33.027.199.085.487.147.733.482 1.907 1.85 3.457 3.705 4.195a6.31 6.31 0 001.658.412c.22.025.844.035 1.074.017 1.054-.08 1.972-.393 2.913-.992a325.28 325.28 0 01.937-.596l.384-.244.684-.435.234-.149.009-.005.025-.017.013-.007.172-.11.597-.38c.76-.481.987-.65 1.34-.998.148-.146.37-.394.381-.425.002-.007.042-.068.088-.136a2.49 2.49 0 00.373-1.023 4.181 4.181 0 000-.847 4.336 4.336 0 00-.318-1.137c-.224-.472-.7-.9-1.383-1.245a2.972 2.972 0 00-.406-.181c-.01 0-.646.392-1.413.87a7089.171 7089.171 0 00-1.658 1.031l-.439.274z" fill="url(#lobe-icons-bing-fill-1)" fill-rule="nonzero"></path><path d="M4.003 14.946l.004 3.33.042.193c.134.604.366 1.04.77 1.445a2.701 2.701 0 001.955.814c.536 0 1-.135 1.479-.43l.703-.435.556-.346V8.003c0-2.306-.004-3.675-.012-3.782a2.734 2.734 0 00-.797-1.765c-.145-.144-.268-.24-.637-.496A1780.102 1780.102 0 015.762.362C5.406.115 5.38.098 5.271.059a.943.943 0 00-1.254.696C4.003.818 4 1.659 4 6.223v5.394H4l.003 3.329z" fill="url(#lobe-icons-bing-fill-2)" fill-rule="nonzero"></path><defs><radialGradient cx="93.717%" cy="77.818%" fx="93.717%" fy="77.818%" gradientTransform="scale(-1 -.7146) rotate(49.288 2.035 -2.198)" id="lobe-icons-bing-fill-0" r="143.691%"><stop offset="0%" stop-color="#00CACC"></stop><stop offset="100%" stop-color="#048FCE"></stop></radialGradient><radialGradient cx="13.893%" cy="71.448%" fx="13.893%" fy="71.448%" gradientTransform="scale(.6042 1) rotate(-23.34 .184 .494)" id="lobe-icons-bing-fill-1" r="149.21%"><stop offset="0%" stop-color="#00BBEC"></stop><stop offset="100%" stop-color="#2756A9"></stop></radialGradient><linearGradient id="lobe-icons-bing-fill-2" x1="50%" x2="50%" y1="0%" y2="100%"><stop offset="0%" stop-color="#00BBEC"></stop><stop offset="100%" stop-color="#2756A9"></stop></linearGradient></defs></svg>
\ No newline at end of file
diff --git a/src/renderer/src/assets/images/search/google.svg b/src/renderer/src/assets/images/search/google.svg
new file mode 100644
index 0000000000..e8e0f867bd
--- /dev/null
+++ b/src/renderer/src/assets/images/search/google.svg
@@ -0,0 +1 @@
+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Google</title><path d="M23 12.245c0-.905-.075-1.565-.236-2.25h-10.54v4.083h6.186c-.124 1.014-.797 2.542-2.294 3.569l-.021.136 3.332 2.53.23.022C21.779 18.417 23 15.593 23 12.245z" fill="#4285F4"></path><path d="M12.225 23c3.03 0 5.574-.978 7.433-2.665l-3.542-2.688c-.948.648-2.22 1.1-3.891 1.1a6.745 6.745 0 01-6.386-4.572l-.132.011-3.465 2.628-.045.124C4.043 20.531 7.835 23 12.225 23z" fill="#34A853"></path><path d="M5.84 14.175A6.65 6.65 0 015.463 12c0-.758.138-1.491.361-2.175l-.006-.147-3.508-2.67-.115.054A10.831 10.831 0 001 12c0 1.772.436 3.447 1.197 4.938l3.642-2.763z" fill="#FBBC05"></path><path d="M12.225 5.253c2.108 0 3.529.892 4.34 1.638l3.167-3.031C17.787 2.088 15.255 1 12.225 1 7.834 1 4.043 3.469 2.197 7.062l3.63 2.763a6.77 6.77 0 016.398-4.572z" fill="#EB4335"></path></svg>
\ No newline at end of file
diff --git a/src/renderer/src/components/Avatar/AssistantAvatar.tsx b/src/renderer/src/components/Avatar/AssistantAvatar.tsx
new file mode 100644
index 0000000000..7ab87e633e
--- /dev/null
+++ b/src/renderer/src/components/Avatar/AssistantAvatar.tsx
@@ -0,0 +1,34 @@
+import EmojiIcon from '@renderer/components/EmojiIcon'
+import { useSettings } from '@renderer/hooks/useSettings'
+import { getDefaultModel } from '@renderer/services/AssistantService'
+import type { Assistant } from '@renderer/types'
+import { getLeadingEmoji } from '@renderer/utils'
+import type { FC } from 'react'
+import { useMemo } from 'react'
+
+import ModelAvatar from './ModelAvatar'
+
+interface AssistantAvatarProps {
+  assistant: Assistant
+  size?: number
+  className?: string
+}
+
+const AssistantAvatar: FC<AssistantAvatarProps> = ({ assistant, size = 24, className }) => {
+  const { assistantIconType } = useSettings()
+  const defaultModel = getDefaultModel()
+
+  const assistantName = useMemo(() => assistant.name || '', [assistant.name])
+
+  if (assistantIconType === 'model') {
+    return <ModelAvatar model={assistant.model || defaultModel} size={size} className={className} />
+  }
+
+  if (assistantIconType === 'emoji') {
+    return <EmojiIcon emoji={assistant.emoji || getLeadingEmoji(assistantName)} size={size} className={className} />
+  }
+
+  return null
+}
+
+export default AssistantAvatar
diff --git a/src/renderer/src/components/CodeBlockView/HtmlArtifactsPopup.tsx b/src/renderer/src/components/CodeBlockView/HtmlArtifactsPopup.tsx
index 2cd8171d08..a51b718ecf 100644
--- a/src/renderer/src/components/CodeBlockView/HtmlArtifactsPopup.tsx
+++ b/src/renderer/src/components/CodeBlockView/HtmlArtifactsPopup.tsx
@@ -25,7 +25,7 @@ type ViewMode = 'split' | 'code' | 'preview'
 const HtmlArtifactsPopup: React.FC<HtmlArtifactsPopupProps> = ({ open, title, html, onSave, onClose }) => {
   const { t } = useTranslation()
   const [viewMode, setViewMode] = useState<ViewMode>('split')
-  const [isFullscreen, setIsFullscreen] = useState(false)
+  const [isFullscreen, setIsFullscreen] = useState(true)
   const [saved, setSaved] = useTemporaryValue(false, 2000)
   const codeEditorRef = useRef<CodeEditorHandles>(null)
   const previewFrameRef = useRef<HTMLIFrameElement>(null)
@@ -78,7 +78,7 @@ const HtmlArtifactsPopup: React.FC<HtmlArtifactsPopupProps> = ({ open, title, ht
       </HeaderLeft>
 
       <HeaderCenter>
-        <ViewControls onDoubleClick={(e) => e.stopPropagation()}>
+        <ViewControls onDoubleClick={(e) => e.stopPropagation()} className="nodrag">
           <ViewButton
             size="small"
             type={viewMode === 'split' ? 'primary' : 'default'}
@@ -222,6 +222,7 @@ const HtmlArtifactsPopup: React.FC<HtmlArtifactsPopupProps> = ({ open, title, ht
       afterClose={onClose}
       centered={!isFullscreen}
       destroyOnHidden
+      forceRender={isFullscreen}
       mask={!isFullscreen}
       maskClosable={false}
       width={isFullscreen ? '100vw' : '90vw'}
diff --git a/src/renderer/src/components/ContextMenu/index.tsx b/src/renderer/src/components/ContextMenu/index.tsx
index 719cd14133..8db88955bd 100644
--- a/src/renderer/src/components/ContextMenu/index.tsx
+++ b/src/renderer/src/components/ContextMenu/index.tsx
@@ -6,6 +6,61 @@ interface ContextMenuProps {
   children: React.ReactNode
 }
 
+/**
+ * Extract text content from selection, filtering out line numbers in code viewers.
+ * Preserves all content including plain text and code blocks, only removing line numbers.
+ * This ensures right-click copy in code blocks doesn't include line numbers while preserving indentation.
+ */
+function extractSelectedText(selection: Selection): string {
+  // Validate selection
+  if (selection.rangeCount === 0 || selection.isCollapsed) {
+    return ''
+  }
+
+  const range = selection.getRangeAt(0)
+  const fragment = range.cloneContents()
+
+  // Check if the selection contains code viewer elements
+  const hasLineNumbers = fragment.querySelectorAll('.line-number').length > 0
+
+  // If no line numbers, return the original text (preserves formatting)
+  if (!hasLineNumbers) {
+    return selection.toString()
+  }
+
+  // Remove all line number elements
+  fragment.querySelectorAll('.line-number').forEach((el) => el.remove())
+
+  // Handle all content using optimized TreeWalker with precise node filtering
+  // This approach handles mixed content correctly while improving performance
+  const walker = document.createTreeWalker(fragment, NodeFilter.SHOW_TEXT | NodeFilter.SHOW_ELEMENT, null)
+
+  let result = ''
+  let node = walker.nextNode()
+
+  while (node) {
+    if (node.nodeType === Node.TEXT_NODE) {
+      // Preserve text content including whitespace
+      result += node.textContent
+    } else if (node.nodeType === Node.ELEMENT_NODE) {
+      const element = node as Element
+
+      // Add newline after block elements and code lines to preserve structure
+      if (['H1', 'H2', 'H3', 'H4', 'H5', 'H6'].includes(element.tagName)) {
+        result += '\n'
+      } else if (element.classList.contains('line')) {
+        // Add newline after code lines to preserve code structure
+        result += '\n'
+      }
+    }
+
+    node = walker.nextNode()
+  }
+
+  // Clean up excessive newlines but preserve code structure
+  return result.trim()
+}
+
 // FIXME: Why does this component name look like a generic component but is not customizable at all?
 const ContextMenu: React.FC<ContextMenuProps> = ({ children }) => {
   const { t } = useTranslation()
@@ -45,8 +100,12 @@ const ContextMenu: React.FC<ContextMenuProps> = ({ children }) => {
 
   const onOpenChange = (open: boolean) => {
     if (open) {
-      const selectedText = window.getSelection()?.toString()
-      setSelectedText(selectedText)
+      const selection = window.getSelection()
+      if (!selection || selection.rangeCount === 0 || selection.isCollapsed) {
+        setSelectedText(undefined)
+        return
+      }
+      setSelectedText(extractSelectedText(selection) || undefined)
     }
   }
 
diff --git a/src/renderer/src/components/EmojiPicker/index.tsx b/src/renderer/src/components/EmojiPicker/index.tsx
index 9a4158d469..c0a21e7c3c 100644
--- a/src/renderer/src/components/EmojiPicker/index.tsx
+++ b/src/renderer/src/components/EmojiPicker/index.tsx
@@ -45,6 +45,7 @@ const i18nMap: Record<LanguageVarious, typeof en> = {
   'fr-FR': fr,
   'ja-JP': ja,
   'pt-PT': pt_PT,
+  'ro-RO': en, // No Romanian available, fallback to English
   'ru-RU': ru_RU
 }
 
@@ -60,6 +61,7 @@ const dataSourceMap: Record<LanguageVarious, string> = {
   'fr-FR': dataFR,
   'ja-JP': dataJA,
   'pt-PT': dataPT,
+  'ro-RO': dataEN, // No Romanian CLDR available, fallback to English
   'ru-RU': dataRU
 }
 
@@ -75,6 +77,7 @@ const localeMap: Record<LanguageVarious, string> = {
   'fr-FR': 'fr',
   'ja-JP': 'ja',
   'pt-PT': 'pt',
+  'ro-RO': 'en',
   'ru-RU': 'ru'
 }
 
diff --git a/src/renderer/src/components/Icons/SVGIcon.tsx b/src/renderer/src/components/Icons/SVGIcon.tsx
index ad503f0e38..3f4e98705c 100644
--- a/src/renderer/src/components/Icons/SVGIcon.tsx
+++ b/src/renderer/src/components/Icons/SVGIcon.tsx
@@ -113,6 +113,18 @@ export function MdiLightbulbOn(props: SVGProps<SVGSVGElement>) {
   )
 }
 
+export function MdiLightbulbQuestion(props: SVGProps<SVGSVGElement>) {
+  // {/* Icon from Material Design Icons by Pictogrammers - https://github.com/Templarian/MaterialDesign/blob/master/LICENSE */}
+  return (
+    <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" {...props}>
+      <path
+        fill="currentColor"
+        d="M8 2C11.9 2 15 5.1 15 9C15 11.4 13.8 13.5 12 14.7V17C12 17.6 11.6 18 11 18H5C4.4 18 4 17.6 4 17V14.7C2.2 13.5 1 11.4 1 9C1 5.1 4.1 2 8 2M5 21V20H11V21C11 21.6 10.6 22 10 22H6C5.4 22 5 21.6 5 21M8 4C5.2 4 3 6.2 3 9C3 11.1 4.2 12.8 6 13.6V16H10V13.6C11.8 12.8 13 11.1 13 9C13 6.2 10.8 4 8 4M20.5 14.5V16H19V14.5H20.5M18.5 9.5H17V9C17 7.3 18.3 6 20 6S23 7.3 23 9C23 10 22.5 10.9 21.7 11.4L21.4 11.6C20.8 12 20.5 12.6 20.5 13.3V13.5H19V13.3C19 12.1 19.6 11 20.6 10.4L20.9 10.2C21.3 9.9 21.5 9.5 21.5 9C21.5 8.2 20.8 7.5 20 7.5S18.5 8.2 18.5 9V9.5Z"
+      />
+    </svg>
+  )
+}
+
 export function BingLogo(props: SVGProps<SVGSVGElement>) {
   return (
     <svg
@@ -251,6 +263,23 @@ export function ZhipuLogo(props: SVGProps<SVGSVGElement>) {
     </svg>
   )
 }
+export function McpLogo(props: SVGProps<SVGSVGElement>) {
+  return (
+    <svg
+      fill="currentColor"
+      fillRule="evenodd"
+      height="1em"
+      width="1em"
+      viewBox="0 0 24 24"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}>
+      <title>ModelContextProtocol</title>
+      <path d="M15.688 2.343a2.588 2.588 0 00-3.61 0l-9.626 9.44a.863.863 0 01-1.203 0 .823.823 0 010-1.18l9.626-9.44a4.313 4.313 0 016.016 0 4.116 4.116 0 011.204 3.54 4.3 4.3 0 013.609 1.18l.05.05a4.115 4.115 0 010 5.9l-8.706 8.537a.274.274 0 000 .393l1.788 1.754a.823.823 0 010 1.18.863.863 0 01-1.203 0l-1.788-1.753a1.92 1.92 0 010-2.754l8.706-8.538a2.47 2.47 0 000-3.54l-.05-.049a2.588 2.588 0 00-3.607-.003l-7.172 7.034-.002.002-.098.097a.863.863 0 01-1.204 0 .823.823 0 010-1.18l7.273-7.133a2.47 2.47 0 00-.003-3.537z"></path>
+      <path d="M14.485 4.703a.823.823 0 000-1.18.863.863 0 00-1.204 0l-7.119 6.982a4.115 4.115 0 000 5.9 4.314 4.314 0 006.016 0l7.12-6.982a.823.823 0 000-1.18.863.863 0 00-1.204 0l-7.119 6.982a2.588 2.588 0 01-3.61 0 2.47 2.47 0 010-3.54l7.12-6.982z"></path>
+    </svg>
+  )
+}
+
 export function PoeLogo(props: SVGProps<SVGSVGElement>) {
   return (
     <svg
diff --git a/src/renderer/src/components/ImageViewer.tsx b/src/renderer/src/components/ImageViewer.tsx
index 51df8c95c3..21bcee025f 100644
--- a/src/renderer/src/components/ImageViewer.tsx
+++ b/src/renderer/src/components/ImageViewer.tsx
@@ -14,7 +14,7 @@ import { convertImageToPng } from '@renderer/utils/image'
 import type { ImageProps as AntImageProps } from 'antd'
 import { Dropdown, Image as AntImage, Space } from 'antd'
 import { Base64 } from 'js-base64'
-import { DownloadIcon, ImageIcon } from 'lucide-react'
+import { DownloadIcon } from 'lucide-react'
 import mime from 'mime'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
@@ -73,9 +73,15 @@ const ImageViewer: React.FC<ImageViewerProps> = ({ src, style, ...props }) => {
   const getContextMenuItems = (src: string, size: number = 14) => {
     return [
       {
-        key: 'copy-url',
+        key: 'copy-image',
         label: t('common.copy'),
         icon: <CopyIcon size={size} />,
+        onClick: () => handleCopyImage(src)
+      },
+      {
+        key: 'copy-url',
+        label: t('preview.copy.src'),
+        icon: <CopyIcon size={size} />,
         onClick: () => {
           navigator.clipboard.writeText(src)
           window.toast.success(t('message.copy.success'))
@@ -86,12 +92,6 @@ const ImageViewer: React.FC<ImageViewerProps> = ({ src, style, ...props }) => {
         label: t('common.download'),
         icon: <DownloadIcon size={size} />,
         onClick: () => download(src)
-      },
-      {
-        key: 'copy-image',
-        label: t('preview.copy.image'),
-        icon: <ImageIcon size={size} />,
-        onClick: () => handleCopyImage(src)
       }
     ]
   }
diff --git a/src/renderer/src/components/InputEmbeddingDimension.tsx b/src/renderer/src/components/InputEmbeddingDimension.tsx
index 8e6357a91d..baa316324b 100644
--- a/src/renderer/src/components/InputEmbeddingDimension.tsx
+++ b/src/renderer/src/components/InputEmbeddingDimension.tsx
@@ -1,5 +1,4 @@
 import { loggerService } from '@logger'
-import AiProvider from '@renderer/aiCore'
 import { RefreshIcon } from '@renderer/components/Icons'
 import { useProvider } from '@renderer/hooks/useProvider'
 import type { Model } from '@renderer/types'
@@ -8,6 +7,8 @@ import { Button, InputNumber, Space, Tooltip } from 'antd'
 import { memo, useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
+import AiProviderNew from '../aiCore/index_new'
+
 const logger = loggerService.withContext('DimensionsInput')
 
 interface InputEmbeddingDimensionProps {
@@ -47,7 +48,7 @@ const InputEmbeddingDimension = ({
 
     setLoading(true)
     try {
-      const aiProvider = new AiProvider(provider)
+      const aiProvider = new AiProviderNew(provider)
       const dimension = await aiProvider.getEmbeddingDimensions(model)
       // for controlled input
       if (ref?.current) {
diff --git a/src/renderer/src/components/MinApp/WebviewContainer.tsx b/src/renderer/src/components/MinApp/WebviewContainer.tsx
index 66bb9e554d..dea8243e42 100644
--- a/src/renderer/src/components/MinApp/WebviewContainer.tsx
+++ b/src/renderer/src/components/MinApp/WebviewContainer.tsx
@@ -106,6 +106,51 @@ const WebviewContainer = memo(
       // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [appid, url])
 
+    // Setup keyboard shortcuts handler for print and save
+    useEffect(() => {
+      if (!webviewRef.current) return
+
+      const unsubscribe = window.api?.webview?.onFindShortcut?.(async (payload) => {
+        // Get webviewId when event is triggered
+        const webviewId = webviewRef.current?.getWebContentsId()
+
+        // Only handle events for this webview
+        if (!webviewId || payload.webviewId !== webviewId) return
+
+        const key = payload.key?.toLowerCase()
+        const isModifier = payload.control || payload.meta
+
+        if (!isModifier || !key) return
+
+        try {
+          if (key === 'p') {
+            // Print to PDF
+            logger.info(`Printing webview ${appid} to PDF`)
+            const filePath = await window.api.webview.printToPDF(webviewId)
+            if (filePath) {
+              window.toast?.success?.(`PDF saved to: ${filePath}`)
+              logger.info(`PDF saved to: ${filePath}`)
+            }
+          } else if (key === 's') {
+            // Save as HTML
+            logger.info(`Saving webview ${appid} as HTML`)
+            const filePath = await window.api.webview.saveAsHTML(webviewId)
+            if (filePath) {
+              window.toast?.success?.(`HTML saved to: ${filePath}`)
+              logger.info(`HTML saved to: ${filePath}`)
+            }
+          }
+        } catch (error) {
+          logger.error(`Failed to handle shortcut for webview ${appid}:`, error as Error)
+          window.toast?.error?.(`Failed: ${(error as Error).message}`)
+        }
+      })
+
+      return () => {
+        unsubscribe?.()
+      }
+    }, [appid])
+
     // Update webview settings when they change
     useEffect(() => {
       if (!webviewRef.current) return
diff --git a/src/renderer/src/components/Popups/ExportToPhoneLanPopup.tsx b/src/renderer/src/components/Popups/ExportToPhoneLanPopup.tsx
deleted file mode 100644
index cbe51ac614..0000000000
--- a/src/renderer/src/components/Popups/ExportToPhoneLanPopup.tsx
+++ /dev/null
@@ -1,553 +0,0 @@
-import { loggerService } from '@logger'
-import { AppLogo } from '@renderer/config/env'
-import { SettingHelpText, SettingRow } from '@renderer/pages/settings'
-import type { WebSocketCandidatesResponse } from '@shared/config/types'
-import { Alert, Button, Modal, Progress, Spin } from 'antd'
-import { QRCodeSVG } from 'qrcode.react'
-import { useCallback, useEffect, useMemo, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-
-import { TopView } from '../TopView'
-
-const logger = loggerService.withContext('ExportToPhoneLanPopup')
-
-interface Props {
-  resolve: (data: any) => void
-}
-
-type ConnectionPhase = 'initializing' | 'waiting_qr_scan' | 'connecting' | 'connected' | 'disconnected' | 'error'
-type TransferPhase = 'idle' | 'preparing' | 'sending' | 'completed' | 'error'
-
-const LoadingQRCode: React.FC = () => {
-  const { t } = useTranslation()
-  return (
-    <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '12px' }}>
-      <Spin />
-      <span style={{ fontSize: '14px', color: 'var(--color-text-2)' }}>
-        {t('settings.data.export_to_phone.lan.generating_qr')}
-      </span>
-    </div>
-  )
-}
-
-const ScanQRCode: React.FC<{ qrCodeValue: string }> = ({ qrCodeValue }) => {
-  const { t } = useTranslation()
-  return (
-    <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '12px' }}>
-      <QRCodeSVG
-        marginSize={2}
-        value={qrCodeValue}
-        level="H"
-        size={200}
-        imageSettings={{
-          src: AppLogo,
-          width: 40,
-          height: 40,
-          excavate: true
-        }}
-      />
-      <span style={{ fontSize: '12px', color: 'var(--color-text-2)' }}>
-        {t('settings.data.export_to_phone.lan.scan_qr')}
-      </span>
-    </div>
-  )
-}
-
-const ConnectingAnimation: React.FC = () => {
-  const { t } = useTranslation()
-  return (
-    <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '12px' }}>
-      <div
-        style={{
-          width: '160px',
-          height: '160px',
-          display: 'flex',
-          flexDirection: 'column',
-          alignItems: 'center',
-          justifyContent: 'center',
-          border: '2px dashed var(--color-status-warning)',
-          borderRadius: '12px',
-          backgroundColor: 'var(--color-status-warning)'
-        }}>
-        <Spin size="large" />
-        <span style={{ fontSize: '14px', color: 'var(--color-text)', marginTop: '12px' }}>
-          {t('settings.data.export_to_phone.lan.status.connecting')}
-        </span>
-      </div>
-    </div>
-  )
-}
-
-const ConnectedDisplay: React.FC = () => {
-  const { t } = useTranslation()
-  return (
-    <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '12px' }}>
-      <div
-        style={{
-          width: '160px',
-          height: '160px',
-          display: 'flex',
-          flexDirection: 'column',
-          alignItems: 'center',
-          justifyContent: 'center',
-          border: '2px dashed var(--color-status-success)',
-          borderRadius: '12px',
-          backgroundColor: 'var(--color-status-success)'
-        }}>
-        <span style={{ fontSize: '48px' }}>📱</span>
-        <span style={{ fontSize: '14px', color: 'var(--color-text)', marginTop: '8px' }}>
-          {t('settings.data.export_to_phone.lan.connected')}
-        </span>
-      </div>
-    </div>
-  )
-}
-
-const ErrorQRCode: React.FC<{ error: string | null }> = ({ error }) => {
-  const { t } = useTranslation()
-  return (
-    <div
-      style={{
-        display: 'flex',
-        flexDirection: 'column',
-        alignItems: 'center',
-        gap: '12px',
-        padding: '20px',
-        border: `1px solid var(--color-error)`,
-        borderRadius: '8px',
-        backgroundColor: 'var(--color-error)'
-      }}>
-      <span style={{ fontSize: '48px' }}>⚠️</span>
-      <span style={{ fontSize: '14px', color: 'var(--color-text)' }}>
-        {t('settings.data.export_to_phone.lan.connection_failed')}
-      </span>
-      {error && <span style={{ fontSize: '12px', color: 'var(--color-text-2)' }}>{error}</span>}
-    </div>
-  )
-}
-
-const PopupContainer: React.FC<Props> = ({ resolve }) => {
-  const [isOpen, setIsOpen] = useState(true)
-  const [connectionPhase, setConnectionPhase] = useState<ConnectionPhase>('initializing')
-  const [transferPhase, setTransferPhase] = useState<TransferPhase>('idle')
-  const [qrCodeValue, setQrCodeValue] = useState('')
-  const [selectedFolderPath, setSelectedFolderPath] = useState<string | null>(null)
-  const [sendProgress, setSendProgress] = useState(0)
-  const [error, setError] = useState<string | null>(null)
-  const [autoCloseCountdown, setAutoCloseCountdown] = useState<number | null>(null)
-
-  const { t } = useTranslation()
-
-  // 派生状态
-  const isConnected = connectionPhase === 'connected'
-  const canSend = isConnected && selectedFolderPath && transferPhase === 'idle'
-  const isSending = transferPhase === 'preparing' || transferPhase === 'sending'
-
-  // 状态文本映射
-  const connectionStatusText = useMemo(() => {
-    const statusMap = {
-      initializing: t('settings.data.export_to_phone.lan.status.initializing'),
-      waiting_qr_scan: t('settings.data.export_to_phone.lan.status.waiting_qr_scan'),
-      connecting: t('settings.data.export_to_phone.lan.status.connecting'),
-      connected: t('settings.data.export_to_phone.lan.status.connected'),
-      disconnected: t('settings.data.export_to_phone.lan.status.disconnected'),
-      error: t('settings.data.export_to_phone.lan.status.error')
-    }
-    return statusMap[connectionPhase]
-  }, [connectionPhase, t])
-
-  const transferStatusText = useMemo(() => {
-    const statusMap = {
-      idle: '',
-      preparing: t('settings.data.export_to_phone.lan.status.preparing'),
-      sending: t('settings.data.export_to_phone.lan.status.sending'),
-      completed: t('settings.data.export_to_phone.lan.status.completed'),
-      error: t('settings.data.export_to_phone.lan.status.error')
-    }
-    return statusMap[transferPhase]
-  }, [transferPhase, t])
-
-  // 状态样式映射
-  const connectionStatusStyles = useMemo(() => {
-    const styleMap = {
-      initializing: {
-        bg: 'var(--color-background-mute)',
-        border: 'var(--color-border-mute)'
-      },
-      waiting_qr_scan: {
-        bg: 'var(--color-primary-mute)',
-        border: 'var(--color-primary-soft)'
-      },
-      connecting: { bg: 'var(--color-status-warning)', border: 'var(--color-status-warning)' },
-      connected: {
-        bg: 'var(--color-status-success)',
-        border: 'var(--color-status-success)'
-      },
-      disconnected: { bg: 'var(--color-error)', border: 'var(--color-error)' },
-      error: { bg: 'var(--color-error)', border: 'var(--color-error)' }
-    }
-    return styleMap[connectionPhase]
-  }, [connectionPhase])
-
-  const initWebSocket = useCallback(async () => {
-    try {
-      setConnectionPhase('initializing')
-      await window.api.webSocket.start()
-      const { port, ip } = await window.api.webSocket.status()
-
-      if (ip && port) {
-        const candidatesData = await window.api.webSocket.getAllCandidates()
-
-        const optimizeConnectionInfo = () => {
-          const ipToNumber = (ip: string) => {
-            return ip.split('.').reduce((acc, octet) => (acc << 8) + parseInt(octet), 0)
-          }
-
-          const compressedData = [
-            'CSA',
-            ipToNumber(ip),
-            candidatesData.map((candidate: WebSocketCandidatesResponse) => ipToNumber(candidate.host)),
-            port, // 端口号
-            Date.now() % 86400000
-          ]
-
-          return compressedData
-        }
-
-        const compressedData = optimizeConnectionInfo()
-        const qrCodeValue = JSON.stringify(compressedData)
-        setQrCodeValue(qrCodeValue)
-        setConnectionPhase('waiting_qr_scan')
-      } else {
-        setError(t('settings.data.export_to_phone.lan.error.no_ip'))
-        setConnectionPhase('error')
-      }
-    } catch (error) {
-      setError(
-        `${t('settings.data.export_to_phone.lan.error.init_failed')}: ${error instanceof Error ? error.message : ''}`
-      )
-      setConnectionPhase('error')
-      logger.error('Failed to initialize WebSocket:', error as Error)
-    }
-  }, [t])
-
-  const handleClientConnected = useCallback((_event: any, data: { connected: boolean }) => {
-    logger.info(`Client connection status: ${data.connected ? 'connected' : 'disconnected'}`)
-    if (data.connected) {
-      setConnectionPhase('connected')
-      setError(null)
-    } else {
-      setConnectionPhase('disconnected')
-    }
-  }, [])
-
-  const handleMessageReceived = useCallback((_event: any, data: any) => {
-    logger.info(`Received message from mobile: ${JSON.stringify(data)}`)
-  }, [])
-
-  const handleSendProgress = useCallback(
-    (_event: any, data: { progress: number }) => {
-      const progress = data.progress
-      setSendProgress(progress)
-
-      if (transferPhase === 'preparing' && progress > 0) {
-        setTransferPhase('sending')
-      }
-
-      if (progress >= 100) {
-        setTransferPhase('completed')
-        // 启动 3 秒倒计时自动关闭
-        setAutoCloseCountdown(3)
-      }
-    },
-    [transferPhase]
-  )
-
-  const handleSelectZip = useCallback(async () => {
-    const result = await window.api.file.select()
-    if (result) {
-      setSelectedFolderPath(result[0].path)
-    }
-  }, [])
-
-  const handleSendZip = useCallback(async () => {
-    if (!selectedFolderPath) {
-      setError(t('settings.data.export_to_phone.lan.error.no_file'))
-      return
-    }
-
-    setTransferPhase('preparing')
-    setError(null)
-    setSendProgress(0)
-
-    try {
-      logger.info(`Starting file transfer: ${selectedFolderPath}`)
-      await window.api.webSocket.sendFile(selectedFolderPath)
-    } catch (error) {
-      setError(
-        `${t('settings.data.export_to_phone.lan.error.send_failed')}: ${error instanceof Error ? error.message : ''}`
-      )
-      setTransferPhase('error')
-      logger.error('Failed to send file:', error as Error)
-    }
-  }, [selectedFolderPath, t])
-
-  // 尝试关闭弹窗 - 如果正在传输则显示确认
-  const handleCancel = useCallback(() => {
-    if (isSending) {
-      window.modal.confirm({
-        title: t('settings.data.export_to_phone.lan.confirm_close_title'),
-        content: t('settings.data.export_to_phone.lan.confirm_close_message'),
-        centered: true,
-        okButtonProps: {
-          danger: true
-        },
-        okText: t('settings.data.export_to_phone.lan.force_close'),
-        onOk: () => setIsOpen(false)
-      })
-    } else {
-      setIsOpen(false)
-    }
-  }, [isSending, t])
-
-  // 清理并关闭
-  const handleClose = useCallback(async () => {
-    try {
-      // 主动断开 WebSocket 连接
-      if (isConnected || connectionPhase !== 'disconnected') {
-        logger.info('Closing popup, stopping WebSocket')
-        await window.api.webSocket.stop()
-      }
-    } catch (error) {
-      logger.error('Failed to stop WebSocket on close:', error as Error)
-    }
-    resolve({})
-  }, [resolve, isConnected, connectionPhase])
-
-  useEffect(() => {
-    initWebSocket()
-
-    const removeClientConnectedListener = window.electron.ipcRenderer.on(
-      'websocket-client-connected',
-      handleClientConnected
-    )
-    const removeMessageReceivedListener = window.electron.ipcRenderer.on(
-      'websocket-message-received',
-      handleMessageReceived
-    )
-    const removeSendProgressListener = window.electron.ipcRenderer.on('file-send-progress', handleSendProgress)
-
-    return () => {
-      removeClientConnectedListener()
-      removeMessageReceivedListener()
-      removeSendProgressListener()
-      window.api.webSocket.stop()
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
-
-  // 自动关闭倒计时
-  useEffect(() => {
-    if (autoCloseCountdown === null) return
-
-    if (autoCloseCountdown <= 0) {
-      logger.debug('Auto-closing popup after transfer completion')
-      setIsOpen(false)
-      return
-    }
-
-    const timer = setTimeout(() => {
-      setAutoCloseCountdown(autoCloseCountdown - 1)
-    }, 1000)
-
-    return () => clearTimeout(timer)
-  }, [autoCloseCountdown])
-
-  // 状态指示器组件
-  const StatusIndicator = useCallback(
-    () => (
-      <div
-        style={{
-          display: 'flex',
-          alignItems: 'center',
-          justifyContent: 'center',
-          gap: '8px',
-          padding: '5px 12px',
-          width: '100%',
-          backgroundColor: connectionStatusStyles.bg,
-          border: `1px solid ${connectionStatusStyles.border}`,
-          marginBottom: 10
-        }}>
-        <span style={{ fontSize: '14px', fontWeight: '500', color: 'var(--color-text)' }}>{connectionStatusText}</span>
-      </div>
-    ),
-    [connectionStatusStyles, connectionStatusText]
-  )
-
-  // 二维码显示组件 - 使用显式条件渲染以避免类型不匹配
-  const QRCodeDisplay = useCallback(() => {
-    switch (connectionPhase) {
-      case 'waiting_qr_scan':
-      case 'disconnected':
-        return <ScanQRCode qrCodeValue={qrCodeValue} />
-      case 'initializing':
-        return <LoadingQRCode />
-      case 'connecting':
-        return <ConnectingAnimation />
-      case 'connected':
-        return <ConnectedDisplay />
-      case 'error':
-        return <ErrorQRCode error={error} />
-      default:
-        return null
-    }
-  }, [connectionPhase, qrCodeValue, error])
-
-  // 传输进度组件
-  const TransferProgress = useCallback(() => {
-    if (!isSending && transferPhase !== 'completed') return null
-
-    return (
-      <div style={{ paddingTop: '20px' }}>
-        <div
-          style={{
-            display: 'flex',
-            flexDirection: 'column',
-            gap: '8px',
-            padding: '12px',
-            border: `1px solid var(--color-border)`,
-            borderRadius: '8px',
-            backgroundColor: 'var(--color-background-mute)'
-          }}>
-          <div
-            style={{
-              display: 'flex',
-              justifyContent: 'space-between',
-              alignItems: 'center',
-              fontSize: '14px',
-              fontWeight: '500'
-            }}>
-            <span style={{ color: 'var(--color-text)' }}>
-              {t('settings.data.export_to_phone.lan.transfer_progress')}
-            </span>
-            <span
-              style={{ color: transferPhase === 'completed' ? 'var(--color-status-success)' : 'var(--color-primary)' }}>
-              {transferPhase === 'completed' ? '✅ ' + t('common.completed') : `${Math.round(sendProgress)}%`}
-            </span>
-          </div>
-
-          <Progress
-            percent={Math.round(sendProgress)}
-            status={transferPhase === 'completed' ? 'success' : 'active'}
-            showInfo={false}
-          />
-        </div>
-      </div>
-    )
-  }, [isSending, transferPhase, sendProgress, t])
-
-  const AutoCloseCountdown = useCallback(() => {
-    if (transferPhase !== 'completed' || autoCloseCountdown === null || autoCloseCountdown <= 0) return null
-
-    return (
-      <div
-        style={{
-          fontSize: '12px',
-          color: 'var(--color-text-2)',
-          textAlign: 'center',
-          paddingTop: '4px'
-        }}>
-        {t('settings.data.export_to_phone.lan.auto_close_tip', { seconds: autoCloseCountdown })}
-      </div>
-    )
-  }, [transferPhase, autoCloseCountdown, t])
-
-  // 错误显示组件
-  const ErrorDisplay = useCallback(() => {
-    if (!error || transferPhase !== 'error') return null
-
-    return (
-      <div
-        style={{
-          padding: '12px',
-          border: `1px solid var(--color-error)`,
-          borderRadius: '8px',
-          backgroundColor: 'var(--color-error)',
-          textAlign: 'center'
-        }}>
-        <span style={{ fontSize: '14px', color: 'var(--color-text)' }}>❌ {error}</span>
-      </div>
-    )
-  }, [error, transferPhase])
-
-  return (
-    <Modal
-      open={isOpen}
-      onCancel={handleCancel}
-      afterClose={handleClose}
-      title={t('settings.data.export_to_phone.lan.title')}
-      centered
-      closable={!isSending}
-      maskClosable={false}
-      keyboard={true}
-      footer={null}
-      styles={{ body: { paddingBottom: 10 } }}>
-      <SettingRow>
-        <StatusIndicator />
-      </SettingRow>
-
-      <Alert message={t('settings.data.export_to_phone.lan.content')} type="info" style={{ borderRadius: 0 }} />
-
-      <SettingRow style={{ display: 'flex', justifyContent: 'center', minHeight: '180px', marginBlock: 25 }}>
-        <QRCodeDisplay />
-      </SettingRow>
-
-      <SettingRow style={{ display: 'flex', alignItems: 'center', marginBlock: 10 }}>
-        <div style={{ display: 'flex', gap: 10, justifyContent: 'center', width: '100%' }}>
-          <Button onClick={handleSelectZip} disabled={isSending}>
-            {t('settings.data.export_to_phone.lan.selectZip')}
-          </Button>
-          <Button type="primary" onClick={handleSendZip} disabled={!canSend} loading={isSending}>
-            {transferStatusText || t('settings.data.export_to_phone.lan.sendZip')}
-          </Button>
-        </div>
-      </SettingRow>
-
-      <SettingHelpText
-        style={{
-          overflow: 'hidden',
-          textOverflow: 'ellipsis',
-          whiteSpace: 'nowrap',
-          textAlign: 'center'
-        }}>
-        {selectedFolderPath || t('settings.data.export_to_phone.lan.noZipSelected')}
-      </SettingHelpText>
-
-      <TransferProgress />
-      <AutoCloseCountdown />
-      <ErrorDisplay />
-    </Modal>
-  )
-}
-
-const TopViewKey = 'ExportToPhoneLanPopup'
-
-export default class ExportToPhoneLanPopup {
-  static topviewId = 0
-  static hide() {
-    TopView.hide(TopViewKey)
-  }
-  static show() {
-    return new Promise<any>((resolve) => {
-      TopView.show(
-        <PopupContainer
-          resolve={(v) => {
-            resolve(v)
-            TopView.hide(TopViewKey)
-          }}
-        />,
-        TopViewKey
-      )
-    })
-  }
-}
diff --git a/src/renderer/src/components/Popups/LanTransferPopup/LanDeviceCard.tsx b/src/renderer/src/components/Popups/LanTransferPopup/LanDeviceCard.tsx
new file mode 100644
index 0000000000..db16112e04
--- /dev/null
+++ b/src/renderer/src/components/Popups/LanTransferPopup/LanDeviceCard.tsx
@@ -0,0 +1,97 @@
+import { cn } from '@renderer/utils'
+import type { FC, KeyboardEventHandler } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { ProgressIndicator } from './ProgressIndicator'
+import type { LanDeviceCardProps } from './types'
+
+export const LanDeviceCard: FC<LanDeviceCardProps> = ({
+  service,
+  transferState,
+  isConnected,
+  handshakeInProgress,
+  isDisabled,
+  onSendFile
+}) => {
+  const { t } = useTranslation()
+
+  // Device info
+  const deviceName = service.txt?.modelName || t('common.unknown')
+  const platform = service.txt?.platform
+  const appVersion = service.txt?.appVersion
+  const platformInfo = [platform, appVersion].filter(Boolean).join(' ')
+  const displayTitle = platformInfo ? `${deviceName} (${platformInfo})` : deviceName
+
+  // Address info
+  const primaryAddress = service.addresses?.[0]
+  const addressesWithPort = primaryAddress ? (service.port ? `${primaryAddress}:${service.port}` : primaryAddress) : ''
+
+  // Progress visibility
+  const shouldShowProgress =
+    transferState && ['selecting', 'transferring', 'completed', 'failed'].includes(transferState.status)
+
+  // Status text
+  const statusText = handshakeInProgress
+    ? t('settings.data.export_to_phone.lan.handshake.in_progress')
+    : isConnected
+      ? t('settings.data.export_to_phone.lan.connected')
+      : t('settings.data.export_to_phone.lan.send_file')
+
+  // Event handlers
+  const handleClick = () => {
+    if (isDisabled) return
+    onSendFile(service.id)
+  }
+
+  const handleKeyDown: KeyboardEventHandler<HTMLDivElement> = (event) => {
+    if (event.key === 'Enter' || event.key === ' ') {
+      event.preventDefault()
+      handleClick()
+    }
+  }
+
+  return (
+    <div
+      role="button"
+      tabIndex={0}
+      onClick={handleClick}
+      onKeyDown={handleKeyDown}
+      className={cn(
+        // Base styles
+        'flex cursor-pointer flex-col gap-2 rounded-xl border p-3 outline-none transition-all duration-[120ms]',
+        // Hover state
+        'hover:-translate-y-px hover:border-[var(--color-primary-hover)] hover:shadow-md',
+        // Focus state
+        'focus-visible:border-[var(--color-primary)] focus-visible:shadow-[0_0_0_2px_rgba(24,144,255,0.2)]',
+        // Connected state
+        isConnected
+          ? 'border-[var(--color-primary)] bg-[rgba(24,144,255,0.04)]'
+          : 'border-[var(--color-border)] bg-[var(--color-background)]',
+        // Disabled state
+        isDisabled && 'pointer-events-none translate-y-0 opacity-70 shadow-none'
+      )}>
+      {/* Header */}
+      <div className="flex items-center justify-between gap-2">
+        <div className="flex flex-col gap-1">
+          <div className="break-words font-semibold text-[var(--color-text-1)] text-sm">{displayTitle}</div>
+          <span className="text-[var(--color-text-2)] text-xs">{statusText}</span>
+        </div>
+      </div>
+
+      {/* Meta Row - IP Address */}
+      <div className="flex flex-col gap-1">
+        <span className="text-[11px] text-[var(--color-text-3)] uppercase tracking-[0.03em]">
+          {t('settings.data.export_to_phone.lan.ip_addresses')}
+        </span>
+        <span className="break-words text-[var(--color-text)] text-xs">{addressesWithPort || t('common.unknown')}</span>
+      </div>
+
+      {/* Footer with Progress */}
+      <div className="flex flex-wrap items-center justify-between gap-2 text-[11px] text-[var(--color-text-3)]">
+        {shouldShowProgress && transferState && (
+          <ProgressIndicator transferState={transferState} handshakeInProgress={handshakeInProgress} />
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/Popups/LanTransferPopup/ProgressIndicator.tsx b/src/renderer/src/components/Popups/LanTransferPopup/ProgressIndicator.tsx
new file mode 100644
index 0000000000..b9707b4485
--- /dev/null
+++ b/src/renderer/src/components/Popups/LanTransferPopup/ProgressIndicator.tsx
@@ -0,0 +1,55 @@
+import { cn } from '@renderer/utils'
+import type { FC } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import type { ProgressIndicatorProps } from './types'
+
+export const ProgressIndicator: FC<ProgressIndicatorProps> = ({ transferState, handshakeInProgress }) => {
+  const { t } = useTranslation()
+
+  const progressPercent = Math.min(100, Math.max(0, transferState.progress ?? 0))
+
+  const progressLabel = (() => {
+    if (transferState.status === 'failed') {
+      return transferState.error || t('common.unknown_error')
+    }
+    if (transferState.status === 'selecting') {
+      return handshakeInProgress
+        ? t('settings.data.export_to_phone.lan.handshake.in_progress')
+        : t('settings.data.export_to_phone.lan.status.preparing')
+    }
+    return `${Math.round(progressPercent)}%`
+  })()
+
+  const isFailed = transferState.status === 'failed'
+  const isCompleted = transferState.status === 'completed'
+
+  return (
+    <div className="flex min-w-[180px] flex-1 flex-col gap-1">
+      {/* Label Row */}
+      <div
+        className={cn(
+          'flex items-center justify-between gap-1.5 text-[11px]',
+          isFailed ? 'text-[var(--color-error)]' : 'text-[var(--color-text-2)]'
+        )}>
+        <span className="flex-1 overflow-hidden text-ellipsis whitespace-nowrap">{transferState.fileName}</span>
+        <span className="shrink-0 whitespace-nowrap">{progressLabel}</span>
+      </div>
+
+      {/* Progress Track */}
+      <div className="relative h-1.5 w-full overflow-hidden rounded-full bg-[var(--color-border)]">
+        <div
+          className={cn(
+            'h-full rounded-full transition-[width] duration-[120ms]',
+            isFailed
+              ? 'bg-[var(--color-error)]'
+              : isCompleted
+                ? 'bg-[var(--color-status-success)]'
+                : 'bg-[var(--color-primary)]'
+          )}
+          style={{ width: `${progressPercent}%` }}
+        />
+      </div>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/Popups/LanTransferPopup/hook.ts b/src/renderer/src/components/Popups/LanTransferPopup/hook.ts
new file mode 100644
index 0000000000..6d2ea77527
--- /dev/null
+++ b/src/renderer/src/components/Popups/LanTransferPopup/hook.ts
@@ -0,0 +1,397 @@
+import { loggerService } from '@logger'
+import { getBackupData } from '@renderer/services/BackupService'
+import type { LocalTransferPeer } from '@shared/config/types'
+import { useCallback, useEffect, useMemo, useReducer, useRef } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import type { LanPeerTransferState, LanTransferAction, LanTransferReducerState } from './types'
+
+const logger = loggerService.withContext('useLanTransfer')
+
+// ==========================================
+// Initial State
+// ==========================================
+
+export const initialState: LanTransferReducerState = {
+  open: true,
+  lanState: null,
+  lanHandshakePeerId: null,
+  lastHandshakeResult: null,
+  fileTransferState: {},
+  tempBackupPath: null
+}
+
+// ==========================================
+// Reducer
+// ==========================================
+
+export function lanTransferReducer(state: LanTransferReducerState, action: LanTransferAction): LanTransferReducerState {
+  switch (action.type) {
+    case 'SET_OPEN':
+      return { ...state, open: action.payload }
+
+    case 'SET_LAN_STATE':
+      return { ...state, lanState: action.payload }
+
+    case 'SET_HANDSHAKE_PEER_ID':
+      return { ...state, lanHandshakePeerId: action.payload }
+
+    case 'SET_HANDSHAKE_RESULT':
+      return { ...state, lastHandshakeResult: action.payload }
+
+    case 'SET_TEMP_BACKUP_PATH':
+      return { ...state, tempBackupPath: action.payload }
+
+    case 'UPDATE_TRANSFER_STATE': {
+      const { peerId, state: transferState } = action.payload
+      return {
+        ...state,
+        fileTransferState: {
+          ...state.fileTransferState,
+          [peerId]: {
+            ...(state.fileTransferState[peerId] ?? { progress: 0, status: 'idle' as const }),
+            ...transferState
+          }
+        }
+      }
+    }
+
+    case 'SET_TRANSFER_STATE': {
+      const { peerId, state: transferState } = action.payload
+      return {
+        ...state,
+        fileTransferState: {
+          ...state.fileTransferState,
+          [peerId]: transferState
+        }
+      }
+    }
+
+    case 'CLEANUP_STALE_PEERS': {
+      const activeIds = action.payload
+      const newFileTransferState: Record<string, LanPeerTransferState> = {}
+      for (const id of Object.keys(state.fileTransferState)) {
+        if (activeIds.has(id)) {
+          newFileTransferState[id] = state.fileTransferState[id]
+        }
+      }
+      return {
+        ...state,
+        fileTransferState: newFileTransferState,
+        lastHandshakeResult:
+          state.lastHandshakeResult && activeIds.has(state.lastHandshakeResult.peerId)
+            ? state.lastHandshakeResult
+            : null,
+        lanHandshakePeerId:
+          state.lanHandshakePeerId && activeIds.has(state.lanHandshakePeerId) ? state.lanHandshakePeerId : null
+      }
+    }
+
+    case 'RESET_CONNECTION_STATE':
+      return {
+        ...state,
+        fileTransferState: {},
+        lastHandshakeResult: null,
+        lanHandshakePeerId: null,
+        tempBackupPath: null
+      }
+
+    default:
+      return state
+  }
+}
+
+// ==========================================
+// Hook Return Type
+// ==========================================
+
+export interface UseLanTransferReturn {
+  // State
+  state: LanTransferReducerState
+
+  // Derived values
+  lanDevices: LocalTransferPeer[]
+  isAnyTransferring: boolean
+  lastError: string | undefined
+
+  // Actions
+  handleSendFile: (peerId: string) => Promise<void>
+  handleModalCancel: () => void
+  getTransferState: (peerId: string) => LanPeerTransferState | undefined
+  isConnected: (peerId: string) => boolean
+  isHandshakeInProgress: (peerId: string) => boolean
+
+  // Dispatch (for advanced use)
+  dispatch: React.Dispatch<LanTransferAction>
+}
+
+// ==========================================
+// Hook
+// ==========================================
+
+export function useLanTransfer(): UseLanTransferReturn {
+  const { t } = useTranslation()
+  const [state, dispatch] = useReducer(lanTransferReducer, initialState)
+  const isSendingRef = useRef(false)
+
+  // ==========================================
+  // Derived Values
+  // ==========================================
+
+  const lanDevices = useMemo(() => state.lanState?.services ?? [], [state.lanState])
+
+  const isAnyTransferring = useMemo(
+    () => Object.values(state.fileTransferState).some((s) => s.status === 'transferring' || s.status === 'selecting'),
+    [state.fileTransferState]
+  )
+
+  const lastError = state.lanState?.lastError
+
+  // ==========================================
+  // LAN State Sync
+  // ==========================================
+
+  const syncLanState = useCallback(async () => {
+    if (!window.api?.localTransfer) {
+      logger.warn('Local transfer bridge is unavailable')
+      return
+    }
+    try {
+      const nextState = await window.api.localTransfer.getState()
+      dispatch({ type: 'SET_LAN_STATE', payload: nextState })
+    } catch (error) {
+      logger.error('Failed to sync LAN state', error as Error)
+    }
+  }, [])
+
+  // ==========================================
+  // Send File Handler
+  // ==========================================
+
+  const handleSendFile = useCallback(
+    async (peerId: string) => {
+      if (!window.api?.localTransfer || isSendingRef.current) {
+        return
+      }
+      isSendingRef.current = true
+
+      dispatch({
+        type: 'SET_TRANSFER_STATE',
+        payload: { peerId, state: { progress: 0, status: 'selecting' } }
+      })
+
+      let backupPath: string | null = null
+
+      try {
+        // Step 0: Ensure handshake (connect if needed)
+        if (!state.lastHandshakeResult?.ack.accepted || state.lastHandshakeResult.peerId !== peerId) {
+          dispatch({ type: 'SET_HANDSHAKE_PEER_ID', payload: peerId })
+          try {
+            const ack = await window.api.localTransfer.connect({ peerId })
+            dispatch({
+              type: 'SET_HANDSHAKE_RESULT',
+              payload: { peerId, ack, timestamp: Date.now() }
+            })
+            if (!ack.accepted) {
+              throw new Error(ack.message || t('settings.data.export_to_phone.lan.connection_failed'))
+            }
+          } finally {
+            dispatch({ type: 'SET_HANDSHAKE_PEER_ID', payload: null })
+          }
+        }
+
+        // Step 1: Create temporary backup
+        logger.info('Creating temporary backup for LAN transfer...')
+        const backupData = await getBackupData()
+        backupPath = await window.api.backup.createLanTransferBackup(backupData)
+        dispatch({ type: 'SET_TEMP_BACKUP_PATH', payload: backupPath })
+
+        // Extract filename from path
+        const fileName = backupPath.split(/[/\\]/).pop() || 'backup.zip'
+
+        // Step 2: Set transferring state
+        dispatch({
+          type: 'UPDATE_TRANSFER_STATE',
+          payload: { peerId, state: { fileName, progress: 0, status: 'transferring' } }
+        })
+
+        // Step 3: Send file
+        logger.info(`Sending backup file: ${backupPath}`)
+        const result = await window.api.localTransfer.sendFile(backupPath)
+
+        if (result.success) {
+          dispatch({
+            type: 'UPDATE_TRANSFER_STATE',
+            payload: { peerId, state: { progress: 100, status: 'completed' } }
+          })
+        } else {
+          dispatch({
+            type: 'UPDATE_TRANSFER_STATE',
+            payload: { peerId, state: { status: 'failed', error: result.error } }
+          })
+        }
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error)
+        dispatch({
+          type: 'UPDATE_TRANSFER_STATE',
+          payload: { peerId, state: { status: 'failed', error: message } }
+        })
+        logger.error('Failed to send file', error as Error)
+      } finally {
+        // Step 4: Clean up temp file
+        if (backupPath) {
+          try {
+            await window.api.backup.deleteTempBackup(backupPath)
+            logger.info('Cleaned up temporary backup file')
+          } catch (cleanupError) {
+            logger.warn('Failed to clean up temp backup', cleanupError as Error)
+          }
+          dispatch({ type: 'SET_TEMP_BACKUP_PATH', payload: null })
+        }
+        isSendingRef.current = false
+      }
+    },
+    [state.lastHandshakeResult, t]
+  )
+
+  // ==========================================
+  // Teardown
+  // ==========================================
+
+  // Use ref to track temp backup path for cleanup without causing effect re-runs
+  const tempBackupPathRef = useRef<string | null>(null)
+  tempBackupPathRef.current = state.tempBackupPath
+
+  const teardownLan = useCallback(async () => {
+    if (!window.api?.localTransfer) {
+      return
+    }
+    try {
+      await window.api.localTransfer.cancelTransfer?.()
+    } catch (error) {
+      logger.warn('Failed to cancel LAN transfer on close', error as Error)
+    }
+    try {
+      await window.api.localTransfer.disconnect?.()
+    } catch (error) {
+      logger.warn('Failed to disconnect LAN on close', error as Error)
+    }
+    // Clean up temp backup if exists (use ref to get current value)
+    if (tempBackupPathRef.current) {
+      try {
+        await window.api.backup.deleteTempBackup(tempBackupPathRef.current)
+      } catch (error) {
+        logger.warn('Failed to cleanup temp backup on close', error as Error)
+      }
+    }
+    dispatch({ type: 'RESET_CONNECTION_STATE' })
+  }, []) // No dependencies - uses ref for current value
+
+  const handleModalCancel = useCallback(() => {
+    void teardownLan()
+    dispatch({ type: 'SET_OPEN', payload: false })
+  }, [teardownLan])
+
+  // ==========================================
+  // Effects
+  // ==========================================
+
+  // Initial sync and service listener
+  useEffect(() => {
+    if (!window.api?.localTransfer) {
+      return
+    }
+    syncLanState()
+    const removeListener = window.api.localTransfer.onServicesUpdated((lanState) => {
+      dispatch({ type: 'SET_LAN_STATE', payload: lanState })
+    })
+    return () => {
+      removeListener?.()
+    }
+  }, [syncLanState])
+
+  // Client events listener (progress, completion)
+  useEffect(() => {
+    if (!window.api?.localTransfer) {
+      return
+    }
+    const removeListener = window.api.localTransfer.onClientEvent((event) => {
+      const key = event.peerId ?? 'global'
+
+      if (event.type === 'file_transfer_progress') {
+        dispatch({
+          type: 'UPDATE_TRANSFER_STATE',
+          payload: {
+            peerId: key,
+            state: {
+              transferId: event.transferId,
+              fileName: event.fileName,
+              progress: event.progress,
+              speed: event.speed,
+              status: 'transferring'
+            }
+          }
+        })
+      } else if (event.type === 'file_transfer_complete') {
+        dispatch({
+          type: 'UPDATE_TRANSFER_STATE',
+          payload: {
+            peerId: key,
+            state: {
+              progress: event.success ? 100 : undefined,
+              status: event.success ? 'completed' : 'failed',
+              error: event.error
+            }
+          }
+        })
+      }
+    })
+    return () => {
+      removeListener?.()
+    }
+  }, [])
+
+  // Cleanup stale peers when services change
+  useEffect(() => {
+    const activeIds = new Set(lanDevices.map((s) => s.id))
+    dispatch({ type: 'CLEANUP_STALE_PEERS', payload: activeIds })
+  }, [lanDevices])
+
+  // Cleanup on unmount only (teardownLan is stable with no deps)
+  useEffect(() => {
+    return () => {
+      void teardownLan()
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
+
+  // ==========================================
+  // Helper Functions
+  // ==========================================
+
+  const getTransferState = useCallback((peerId: string) => state.fileTransferState[peerId], [state.fileTransferState])
+
+  const isConnected = useCallback(
+    (peerId: string) =>
+      state.lastHandshakeResult?.peerId === peerId && state.lastHandshakeResult?.ack.accepted === true,
+    [state.lastHandshakeResult]
+  )
+
+  const isHandshakeInProgress = useCallback(
+    (peerId: string) => state.lanHandshakePeerId === peerId,
+    [state.lanHandshakePeerId]
+  )
+
+  return {
+    state,
+    lanDevices,
+    isAnyTransferring,
+    lastError,
+    handleSendFile,
+    handleModalCancel,
+    getTransferState,
+    isConnected,
+    isHandshakeInProgress,
+    dispatch
+  }
+}
diff --git a/src/renderer/src/components/Popups/LanTransferPopup/index.tsx b/src/renderer/src/components/Popups/LanTransferPopup/index.tsx
new file mode 100644
index 0000000000..66455f12a1
--- /dev/null
+++ b/src/renderer/src/components/Popups/LanTransferPopup/index.tsx
@@ -0,0 +1,37 @@
+import { TopView } from '@renderer/components/TopView'
+
+import { getHideCallback, PopupContainer } from './popup'
+import type { PopupResolveData } from './types'
+
+// Re-export types for external use
+export type { LanPeerTransferState } from './types'
+
+const TopViewKey = 'LanTransferPopup'
+
+export default class LanTransferPopup {
+  static topviewId = 0
+
+  static hide() {
+    // Try to use the registered callback for proper cleanup, fallback to TopView.hide
+    const callback = getHideCallback()
+    if (callback) {
+      callback()
+    } else {
+      TopView.hide(TopViewKey)
+    }
+  }
+
+  static show() {
+    return new Promise<PopupResolveData>((resolve) => {
+      TopView.show(
+        <PopupContainer
+          resolve={(v) => {
+            resolve(v)
+            TopView.hide(TopViewKey)
+          }}
+        />,
+        TopViewKey
+      )
+    })
+  }
+}
diff --git a/src/renderer/src/components/Popups/LanTransferPopup/popup.tsx b/src/renderer/src/components/Popups/LanTransferPopup/popup.tsx
new file mode 100644
index 0000000000..34c53a6ad6
--- /dev/null
+++ b/src/renderer/src/components/Popups/LanTransferPopup/popup.tsx
@@ -0,0 +1,88 @@
+import { Modal } from 'antd'
+import { TriangleAlert } from 'lucide-react'
+import type { FC } from 'react'
+import { useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import { useLanTransfer } from './hook'
+import { LanDeviceCard } from './LanDeviceCard'
+import type { PopupContainerProps } from './types'
+
+// Module-level callback for external hide access
+let hideCallback: (() => void) | null = null
+export const setHideCallback = (cb: () => void) => {
+  hideCallback = cb
+}
+export const getHideCallback = () => hideCallback
+
+export const PopupContainer: FC<PopupContainerProps> = ({ resolve }) => {
+  const { t } = useTranslation()
+
+  const {
+    state,
+    lanDevices,
+    isAnyTransferring,
+    lastError,
+    handleSendFile,
+    handleModalCancel,
+    getTransferState,
+    isConnected,
+    isHandshakeInProgress
+  } = useLanTransfer()
+
+  const contentTitle = useMemo(() => t('settings.data.export_to_phone.lan.title'), [t])
+
+  const onClose = () => resolve({})
+
+  // Register hide callback for external access
+  setHideCallback(handleModalCancel)
+
+  return (
+    <Modal
+      open={state.open}
+      onCancel={handleModalCancel}
+      afterClose={onClose}
+      footer={null}
+      centered
+      title={contentTitle}
+      transitionName="animation-move-down">
+      <div className="flex flex-col gap-3">
+        {/* Error Display */}
+        {lastError && <div className="text-[var(--color-error)] text-xs">{lastError}</div>}
+
+        {/* Device List */}
+        <div className="mt-2 flex flex-col gap-3">
+          {lanDevices.length === 0 ? (
+            // Warning when no devices
+            <div className="flex w-full items-center gap-2.5 rounded-[10px] border border-[rgba(255,159,41,0.4)] border-dashed bg-[rgba(255,159,41,0.1)] px-3.5 py-3">
+              <TriangleAlert size={20} className="text-orange-400" />
+              <span className="flex-1 text-[#ff9f29] text-[13px] leading-[1.4]">
+                {t('settings.data.export_to_phone.lan.no_connection_warning')}
+              </span>
+            </div>
+          ) : (
+            // Device cards
+            lanDevices.map((service) => {
+              const transferState = getTransferState(service.id)
+              const connected = isConnected(service.id)
+              const handshakeInProgress = isHandshakeInProgress(service.id)
+              const isCardDisabled = isAnyTransferring || handshakeInProgress
+
+              return (
+                <LanDeviceCard
+                  key={service.id}
+                  service={service}
+                  transferState={transferState}
+                  isConnected={connected}
+                  handshakeInProgress={handshakeInProgress}
+                  isDisabled={isCardDisabled}
+                  onSendFile={handleSendFile}
+                />
+              )
+            })
+          )}
+        </div>
+      </div>
+    </Modal>
+  )
+}
diff --git a/src/renderer/src/components/Popups/LanTransferPopup/types.ts b/src/renderer/src/components/Popups/LanTransferPopup/types.ts
new file mode 100644
index 0000000000..644541bc27
--- /dev/null
+++ b/src/renderer/src/components/Popups/LanTransferPopup/types.ts
@@ -0,0 +1,84 @@
+import type { LanHandshakeAckMessage, LocalTransferPeer, LocalTransferState } from '@shared/config/types'
+
+// ==========================================
+// Transfer Status
+// ==========================================
+
+export type TransferStatus = 'idle' | 'selecting' | 'transferring' | 'completed' | 'failed'
+
+// ==========================================
+// Per-Peer Transfer State
+// ==========================================
+
+export interface LanPeerTransferState {
+  transferId?: string
+  fileName?: string
+  progress: number
+  speed?: number
+  status: TransferStatus
+  error?: string
+}
+
+// ==========================================
+// Handshake Result
+// ==========================================
+
+export type HandshakeResult = {
+  peerId: string
+  ack: LanHandshakeAckMessage
+  timestamp: number
+} | null
+
+// ==========================================
+// Reducer State
+// ==========================================
+
+export interface LanTransferReducerState {
+  open: boolean
+  lanState: LocalTransferState | null
+  lanHandshakePeerId: string | null
+  lastHandshakeResult: HandshakeResult
+  fileTransferState: Record<string, LanPeerTransferState>
+  tempBackupPath: string | null
+}
+
+// ==========================================
+// Reducer Actions
+// ==========================================
+
+export type LanTransferAction =
+  | { type: 'SET_OPEN'; payload: boolean }
+  | { type: 'SET_LAN_STATE'; payload: LocalTransferState | null }
+  | { type: 'SET_HANDSHAKE_PEER_ID'; payload: string | null }
+  | { type: 'SET_HANDSHAKE_RESULT'; payload: HandshakeResult }
+  | { type: 'SET_TEMP_BACKUP_PATH'; payload: string | null }
+  | { type: 'UPDATE_TRANSFER_STATE'; payload: { peerId: string; state: Partial<LanPeerTransferState> } }
+  | { type: 'SET_TRANSFER_STATE'; payload: { peerId: string; state: LanPeerTransferState } }
+  | { type: 'CLEANUP_STALE_PEERS'; payload: Set<string> }
+  | { type: 'RESET_CONNECTION_STATE' }
+
+// ==========================================
+// Component Props
+// ==========================================
+
+export interface LanDeviceCardProps {
+  service: LocalTransferPeer
+  transferState?: LanPeerTransferState
+  isConnected: boolean
+  handshakeInProgress: boolean
+  isDisabled: boolean
+  onSendFile: (peerId: string) => void
+}
+
+export interface ProgressIndicatorProps {
+  transferState: LanPeerTransferState
+  handshakeInProgress: boolean
+}
+
+export interface PopupResolveData {
+  // Empty for now, can be extended
+}
+
+export interface PopupContainerProps {
+  resolve: (data: PopupResolveData) => void
+}
diff --git a/src/renderer/src/components/Popups/UpdateDialogPopup.tsx b/src/renderer/src/components/Popups/UpdateDialogPopup.tsx
index 29afcc0d24..593c882bf5 100644
--- a/src/renderer/src/components/Popups/UpdateDialogPopup.tsx
+++ b/src/renderer/src/components/Popups/UpdateDialogPopup.tsx
@@ -1,6 +1,7 @@
 import { loggerService } from '@logger'
 import { TopView } from '@renderer/components/TopView'
-import { handleSaveData } from '@renderer/store'
+import { handleSaveData, useAppDispatch } from '@renderer/store'
+import { setUpdateState } from '@renderer/store/runtime'
 import { Button, Modal } from 'antd'
 import type { ReleaseNoteInfo, UpdateInfo } from 'builder-util-runtime'
 import { useEffect, useState } from 'react'
@@ -22,6 +23,7 @@ const PopupContainer: React.FC<Props> = ({ releaseInfo, resolve }) => {
   const { t } = useTranslation()
   const [open, setOpen] = useState(true)
   const [isInstalling, setIsInstalling] = useState(false)
+  const dispatch = useAppDispatch()
 
   useEffect(() => {
     if (releaseInfo) {
@@ -50,6 +52,11 @@ const PopupContainer: React.FC<Props> = ({ releaseInfo, resolve }) => {
     resolve({})
   }
 
+  const onIgnore = () => {
+    dispatch(setUpdateState({ ignore: true }))
+    setOpen(false)
+  }
+
   UpdateDialogPopup.hide = onCancel
 
   const releaseNotes = releaseInfo?.releaseNotes
@@ -69,7 +76,7 @@ const PopupContainer: React.FC<Props> = ({ releaseInfo, resolve }) => {
       centered
       width={720}
       footer={[
-        <Button key="later" onClick={onCancel} disabled={isInstalling}>
+        <Button key="later" onClick={onIgnore} disabled={isInstalling}>
           {t('update.later')}
         </Button>,
         <Button key="install" type="primary" onClick={handleInstall} loading={isInstalling}>
diff --git a/src/renderer/src/components/Popups/agent/AgentModal.tsx b/src/renderer/src/components/Popups/agent/AgentModal.tsx
index e72433e88a..25e4b81f18 100644
--- a/src/renderer/src/components/Popups/agent/AgentModal.tsx
+++ b/src/renderer/src/components/Popups/agent/AgentModal.tsx
@@ -1,7 +1,9 @@
 import { loggerService } from '@logger'
 import { ErrorBoundary } from '@renderer/components/ErrorBoundary'
+import { HelpTooltip } from '@renderer/components/TooltipIcons'
 import { TopView } from '@renderer/components/TopView'
 import { permissionModeCards } from '@renderer/config/agent'
+import { isWin } from '@renderer/config/constant'
 import { useAgents } from '@renderer/hooks/agents/useAgents'
 import { useUpdateAgent } from '@renderer/hooks/agents/useUpdateAgent'
 import SelectAgentBaseModelButton from '@renderer/pages/home/components/SelectAgentBaseModelButton'
@@ -15,7 +17,8 @@ import type {
   UpdateAgentForm
 } from '@renderer/types'
 import { AgentConfigurationSchema, isAgentType } from '@renderer/types'
-import { Alert, Button, Input, Modal, Select } from 'antd'
+import type { GitBashPathInfo } from '@shared/config/constant'
+import { Button, Input, Modal, Select } from 'antd'
 import { AlertTriangleIcon } from 'lucide-react'
 import type { ChangeEvent, FormEvent } from 'react'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
@@ -58,7 +61,7 @@ const PopupContainer: React.FC<Props> = ({ agent, afterSubmit, resolve }) => {
   const isEditing = (agent?: AgentWithTools) => agent !== undefined
 
   const [form, setForm] = useState<BaseAgentForm>(() => buildAgentForm(agent))
-  const [hasGitBash, setHasGitBash] = useState<boolean>(true)
+  const [gitBashPathInfo, setGitBashPathInfo] = useState<GitBashPathInfo>({ path: null, source: null })
 
   useEffect(() => {
     if (open) {
@@ -66,25 +69,15 @@ const PopupContainer: React.FC<Props> = ({ agent, afterSubmit, resolve }) => {
     }
   }, [agent, open])
 
-  const checkGitBash = useCallback(
-    async (showToast = false) => {
-      try {
-        const gitBashInstalled = await window.api.system.checkGitBash()
-        setHasGitBash(gitBashInstalled)
-        if (showToast) {
-          if (gitBashInstalled) {
-            window.toast.success(t('agent.gitBash.success', 'Git Bash detected successfully!'))
-          } else {
-            window.toast.error(t('agent.gitBash.notFound', 'Git Bash not found. Please install it first.'))
-          }
-        }
-      } catch (error) {
-        logger.error('Failed to check Git Bash:', error as Error)
-        setHasGitBash(true) // Default to true on error to avoid false warnings
-      }
-    },
-    [t]
-  )
+  const checkGitBash = useCallback(async () => {
+    if (!isWin) return
+    try {
+      const pathInfo = await window.api.system.getGitBashPathInfo()
+      setGitBashPathInfo(pathInfo)
+    } catch (error) {
+      logger.error('Failed to check Git Bash:', error as Error)
+    }
+  }, [])
 
   useEffect(() => {
     checkGitBash()
@@ -92,6 +85,44 @@ const PopupContainer: React.FC<Props> = ({ agent, afterSubmit, resolve }) => {
 
   const selectedPermissionMode = form.configuration?.permission_mode ?? 'default'
 
+  const handlePickGitBash = useCallback(async () => {
+    try {
+      const selected = await window.api.file.select({
+        title: t('agent.gitBash.pick.title', 'Select Git Bash executable'),
+        filters: [{ name: 'Executable', extensions: ['exe'] }],
+        properties: ['openFile']
+      })
+
+      if (!selected || selected.length === 0) {
+        return
+      }
+
+      const pickedPath = selected[0].path
+      const ok = await window.api.system.setGitBashPath(pickedPath)
+      if (!ok) {
+        window.toast.error(
+          t('agent.gitBash.pick.invalidPath', 'Selected file is not a valid Git Bash executable (bash.exe).')
+        )
+        return
+      }
+
+      await checkGitBash()
+    } catch (error) {
+      logger.error('Failed to pick Git Bash path', error as Error)
+      window.toast.error(t('agent.gitBash.pick.failed', 'Failed to set Git Bash path'))
+    }
+  }, [checkGitBash, t])
+
+  const handleResetGitBash = useCallback(async () => {
+    try {
+      // Clear manual setting and re-run auto-discovery
+      await window.api.system.setGitBashPath(null)
+      await checkGitBash()
+    } catch (error) {
+      logger.error('Failed to reset Git Bash path', error as Error)
+    }
+  }, [checkGitBash])
+
   const onPermissionModeChange = useCallback((value: PermissionMode) => {
     setForm((prev) => {
       const parsedConfiguration = AgentConfigurationSchema.parse(prev.configuration ?? {})
@@ -222,6 +253,12 @@ const PopupContainer: React.FC<Props> = ({ agent, afterSubmit, resolve }) => {
         return
       }
 
+      if (isWin && !gitBashPathInfo.path) {
+        window.toast.error(t('agent.gitBash.error.required', 'Git Bash path is required on Windows'))
+        loadingRef.current = false
+        return
+      }
+
       if (isEditing(agent)) {
         if (!agent) {
           loadingRef.current = false
@@ -281,7 +318,8 @@ const PopupContainer: React.FC<Props> = ({ agent, afterSubmit, resolve }) => {
       t,
       updateAgent,
       afterSubmit,
-      addAgent
+      addAgent,
+      gitBashPathInfo.path
     ]
   )
 
@@ -300,36 +338,6 @@ const PopupContainer: React.FC<Props> = ({ agent, afterSubmit, resolve }) => {
         footer={null}>
         <StyledForm onSubmit={onSubmit}>
           <FormContent>
-            {!hasGitBash && (
-              <Alert
-                message={t('agent.gitBash.error.title', 'Git Bash Required')}
-                description={
-                  <div>
-                    <div style={{ marginBottom: 8 }}>
-                      {t(
-                        'agent.gitBash.error.description',
-                        'Git Bash is required to run agents on Windows. The agent cannot function without it. Please install Git for Windows from'
-                      )}{' '}
-                      <a
-                        href="https://git-scm.com/download/win"
-                        onClick={(e) => {
-                          e.preventDefault()
-                          window.api.openWebsite('https://git-scm.com/download/win')
-                        }}
-                        style={{ textDecoration: 'underline' }}>
-                        git-scm.com
-                      </a>
-                    </div>
-                    <Button size="small" onClick={() => checkGitBash(true)}>
-                      {t('agent.gitBash.error.recheck', 'Recheck Git Bash Installation')}
-                    </Button>
-                  </div>
-                }
-                type="error"
-                showIcon
-                style={{ marginBottom: 16 }}
-              />
-            )}
             <FormRow>
               <FormItem style={{ flex: 1 }}>
                 <Label>
@@ -340,9 +348,12 @@ const PopupContainer: React.FC<Props> = ({ agent, afterSubmit, resolve }) => {
             </FormRow>
 
             <FormItem>
-              <Label>
-                {t('common.model')} <RequiredMark>*</RequiredMark>
-              </Label>
+              <div className="flex items-center gap-2">
+                <Label>
+                  {t('common.model')} <RequiredMark>*</RequiredMark>
+                </Label>
+                <HelpTooltip title={t('agent.add.model.tooltip')} />
+              </div>
               <SelectAgentBaseModelButton
                 agentBase={tempAgentBase}
                 onSelect={handleModelSelect}
@@ -360,6 +371,40 @@ const PopupContainer: React.FC<Props> = ({ agent, afterSubmit, resolve }) => {
               />
             </FormItem>
 
+            {isWin && (
+              <FormItem>
+                <div className="flex items-center gap-2">
+                  <Label>
+                    Git Bash <RequiredMark>*</RequiredMark>
+                  </Label>
+                  <HelpTooltip
+                    title={t(
+                      'agent.gitBash.tooltip',
+                      'Git Bash is required to run agents on Windows. Install from git-scm.com if not available.'
+                    )}
+                  />
+                </div>
+                <GitBashInputWrapper>
+                  <Input
+                    value={gitBashPathInfo.path ?? ''}
+                    readOnly
+                    placeholder={t('agent.gitBash.placeholder', 'Select bash.exe path')}
+                  />
+                  <Button size="small" onClick={handlePickGitBash}>
+                    {t('common.select', 'Select')}
+                  </Button>
+                  {gitBashPathInfo.source === 'manual' && (
+                    <Button size="small" onClick={handleResetGitBash}>
+                      {t('common.reset', 'Reset')}
+                    </Button>
+                  )}
+                </GitBashInputWrapper>
+                {gitBashPathInfo.path && gitBashPathInfo.source === 'auto' && (
+                  <SourceHint>{t('agent.gitBash.autoDiscoveredHint', 'Auto-discovered')}</SourceHint>
+                )}
+              </FormItem>
+            )}
+
             <FormItem>
               <Label>
                 {t('agent.settings.tooling.permissionMode.title', 'Permission mode')} <RequiredMark>*</RequiredMark>
@@ -432,7 +477,11 @@ const PopupContainer: React.FC<Props> = ({ agent, afterSubmit, resolve }) => {
 
           <FormFooter>
             <Button onClick={onCancel}>{t('common.close')}</Button>
-            <Button type="primary" htmlType="submit" loading={loadingRef.current} disabled={!hasGitBash}>
+            <Button
+              type="primary"
+              htmlType="submit"
+              loading={loadingRef.current}
+              disabled={isWin && !gitBashPathInfo.path}>
               {isEditing(agent) ? t('common.confirm') : t('common.add')}
             </Button>
           </FormFooter>
@@ -503,6 +552,21 @@ const FormItem = styled.div`
   gap: 8px;
 `
 
+const GitBashInputWrapper = styled.div`
+  display: flex;
+  gap: 8px;
+  align-items: center;
+
+  input {
+    flex: 1;
+  }
+`
+
+const SourceHint = styled.span`
+  font-size: 12px;
+  color: var(--color-text-3);
+`
+
 const Label = styled.label`
   font-size: 14px;
   color: var(--color-text-1);
diff --git a/src/renderer/src/components/Tab/TabContainer.tsx b/src/renderer/src/components/Tab/TabContainer.tsx
index 8fdaf3ac5e..5ac1353be8 100644
--- a/src/renderer/src/components/Tab/TabContainer.tsx
+++ b/src/renderer/src/components/Tab/TabContainer.tsx
@@ -21,7 +21,6 @@ import type { LRUCache } from 'lru-cache'
 import {
   FileSearch,
   Folder,
-  Hammer,
   Home,
   Languages,
   LayoutGrid,
@@ -99,8 +98,6 @@ const getTabIcon = (
       return <NotepadText size={14} />
     case 'knowledge':
       return <FileSearch size={14} />
-    case 'mcp':
-      return <Hammer size={14} />
     case 'files':
       return <Folder size={14} />
     case 'settings':
diff --git a/src/renderer/src/components/__tests__/InputEmbeddingDimension.test.tsx b/src/renderer/src/components/__tests__/InputEmbeddingDimension.test.tsx
index 8377e9c9f8..85ec60e459 100644
--- a/src/renderer/src/components/__tests__/InputEmbeddingDimension.test.tsx
+++ b/src/renderer/src/components/__tests__/InputEmbeddingDimension.test.tsx
@@ -79,7 +79,7 @@ vi.mock('antd', () => {
 })
 
 // Mock dependencies
-vi.mock('@renderer/aiCore', () => ({
+vi.mock('@renderer/aiCore/index_new', () => ({
   default: vi.fn().mockImplementation(() => ({
     getEmbeddingDimensions: mocks.aiCore.getEmbeddingDimensions
   }))
diff --git a/src/renderer/src/components/app/Sidebar.tsx b/src/renderer/src/components/app/Sidebar.tsx
index 56a095f7d3..92451dc935 100644
--- a/src/renderer/src/components/app/Sidebar.tsx
+++ b/src/renderer/src/components/app/Sidebar.tsx
@@ -89,10 +89,7 @@ const Sidebar: FC = () => {
         )}
       </MainMenusContainer>
       <Menus>
-        <Tooltip
-          title={t('settings.theme.title') + ': ' + getThemeModeLabel(settedTheme)}
-          mouseEnterDelay={0.8}
-          placement="right">
+        <Tooltip title={t('settings.theme.title') + ': ' + getThemeModeLabel(settedTheme)} placement="right">
           <Icon theme={theme} onClick={toggleTheme}>
             {settedTheme === ThemeMode.dark ? (
               <Moon size={20} className="icon" />
diff --git a/src/renderer/src/config/minapps.ts b/src/renderer/src/config/minapps.ts
index 81a4a98723..eeefb218d2 100644
--- a/src/renderer/src/config/minapps.ts
+++ b/src/renderer/src/config/minapps.ts
@@ -1,7 +1,7 @@
 import { loggerService } from '@logger'
 import ThreeMinTopAppLogo from '@renderer/assets/images/apps/3mintop.png?url'
 import AbacusLogo from '@renderer/assets/images/apps/abacus.webp?url'
-import AIStudioLogo from '@renderer/assets/images/apps/aistudio.svg?url'
+import AIStudioLogo from '@renderer/assets/images/apps/aistudio.png?url'
 import ApplicationLogo from '@renderer/assets/images/apps/application.png?url'
 import BaiduAiAppLogo from '@renderer/assets/images/apps/baidu-ai.png?url'
 import BaiduAiSearchLogo from '@renderer/assets/images/apps/baidu-ai-search.webp?url'
diff --git a/src/renderer/src/config/models/__tests__/openai.test.ts b/src/renderer/src/config/models/__tests__/openai.test.ts
new file mode 100644
index 0000000000..8c8e8b6671
--- /dev/null
+++ b/src/renderer/src/config/models/__tests__/openai.test.ts
@@ -0,0 +1,139 @@
+import type { Model } from '@renderer/types'
+import { describe, expect, it, vi } from 'vitest'
+
+import { isSupportNoneReasoningEffortModel } from '../openai'
+
+// Mock store and settings to avoid initialization issues
+vi.mock('@renderer/store', () => ({
+  __esModule: true,
+  default: {
+    getState: () => ({
+      llm: { providers: [] },
+      settings: {}
+    })
+  }
+}))
+
+vi.mock('@renderer/hooks/useStore', () => ({
+  getStoreProviders: vi.fn(() => [])
+}))
+
+const createModel = (overrides: Partial<Model> = {}): Model => ({
+  id: 'gpt-4o',
+  name: 'gpt-4o',
+  provider: 'openai',
+  group: 'OpenAI',
+  ...overrides
+})
+
+describe('OpenAI Model Detection', () => {
+  describe('isSupportNoneReasoningEffortModel', () => {
+    describe('should return true for GPT-5.1 and GPT-5.2 reasoning models', () => {
+      it('returns true for GPT-5.1 base model', () => {
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5.1' }))).toBe(true)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'GPT-5.1' }))).toBe(true)
+      })
+
+      it('returns true for GPT-5.1 mini model', () => {
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5.1-mini' }))).toBe(true)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5.1-mini-preview' }))).toBe(true)
+      })
+
+      it('returns true for GPT-5.1 preview model', () => {
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5.1-preview' }))).toBe(true)
+      })
+
+      it('returns true for GPT-5.2 base model', () => {
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5.2' }))).toBe(true)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'GPT-5.2' }))).toBe(true)
+      })
+
+      it('returns true for GPT-5.2 mini model', () => {
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5.2-mini' }))).toBe(true)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5.2-mini-preview' }))).toBe(true)
+      })
+
+      it('returns true for GPT-5.2 preview model', () => {
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5.2-preview' }))).toBe(true)
+      })
+    })
+
+    describe('should return false for pro variants', () => {
+      it('returns false for GPT-5.1-pro models', () => {
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5.1-pro' }))).toBe(false)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'GPT-5.1-Pro' }))).toBe(false)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5.1-pro-preview' }))).toBe(false)
+      })
+
+      it('returns false for GPT-5.2-pro models', () => {
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5.2-pro' }))).toBe(false)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'GPT-5.2-Pro' }))).toBe(false)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5.2-pro-preview' }))).toBe(false)
+      })
+    })
+
+    describe('should return false for chat variants', () => {
+      it('returns false for GPT-5.1-chat models', () => {
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5.1-chat' }))).toBe(false)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'GPT-5.1-Chat' }))).toBe(false)
+      })
+
+      it('returns false for GPT-5.2-chat models', () => {
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5.2-chat' }))).toBe(false)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'GPT-5.2-Chat' }))).toBe(false)
+      })
+    })
+
+    describe('should return false for GPT-5 series (non-5.1/5.2)', () => {
+      it('returns false for GPT-5 base model', () => {
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5' }))).toBe(false)
+      })
+
+      it('returns false for GPT-5 pro model', () => {
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5-pro' }))).toBe(false)
+      })
+
+      it('returns false for GPT-5 preview model', () => {
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5-preview' }))).toBe(false)
+      })
+    })
+
+    describe('should return false for other OpenAI models', () => {
+      it('returns false for GPT-4 models', () => {
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-4o' }))).toBe(false)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-4-turbo' }))).toBe(false)
+      })
+
+      it('returns false for o1 models', () => {
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'o1' }))).toBe(false)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'o1-mini' }))).toBe(false)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'o1-preview' }))).toBe(false)
+      })
+
+      it('returns false for o3 models', () => {
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'o3' }))).toBe(false)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'o3-mini' }))).toBe(false)
+      })
+    })
+
+    describe('edge cases', () => {
+      it('handles models with version suffixes', () => {
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5.1-2025-01-01' }))).toBe(true)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5.2-latest' }))).toBe(true)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'gpt-5.1-pro-2025-01-01' }))).toBe(false)
+      })
+
+      it('handles models with OpenRouter prefixes', () => {
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'openai/gpt-5.1' }))).toBe(true)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'openai/gpt-5.2-mini' }))).toBe(true)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'openai/gpt-5.1-pro' }))).toBe(false)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'openai/gpt-5.1-chat' }))).toBe(false)
+      })
+
+      it('handles mixed case with chat and pro', () => {
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'GPT-5.1-CHAT' }))).toBe(false)
+        expect(isSupportNoneReasoningEffortModel(createModel({ id: 'GPT-5.2-PRO' }))).toBe(false)
+      })
+    })
+  })
+})
diff --git a/src/renderer/src/config/models/__tests__/reasoning.test.ts b/src/renderer/src/config/models/__tests__/reasoning.test.ts
index e8ee19adf6..56f9cd0b60 100644
--- a/src/renderer/src/config/models/__tests__/reasoning.test.ts
+++ b/src/renderer/src/config/models/__tests__/reasoning.test.ts
@@ -5,6 +5,7 @@ import { isEmbeddingModel, isRerankModel } from '../embedding'
 import { isOpenAIReasoningModel, isSupportedReasoningEffortOpenAIModel } from '../openai'
 import {
   findTokenLimit,
+  getModelSupportedReasoningEffortOptions,
   getThinkModelType,
   isClaude4SeriesModel,
   isClaude45ReasoningModel,
@@ -16,6 +17,7 @@ import {
   isGeminiReasoningModel,
   isGrok4FastReasoningModel,
   isHunyuanReasoningModel,
+  isInterleavedThinkingModel,
   isLingReasoningModel,
   isMiniMaxReasoningModel,
   isPerplexityReasoningModel,
@@ -630,7 +632,7 @@ describe('Reasoning option configuration', () => {
 
   it('restricts GPT-5 Pro reasoning to high effort only', () => {
     expect(MODEL_SUPPORTED_REASONING_EFFORT.gpt5pro).toEqual(['high'])
-    expect(MODEL_SUPPORTED_OPTIONS.gpt5pro).toEqual(['high'])
+    expect(MODEL_SUPPORTED_OPTIONS.gpt5pro).toEqual(['default', 'high'])
   })
 })
 
@@ -678,7 +680,12 @@ describe('getThinkModelType - Comprehensive Coverage', () => {
       expect(getThinkModelType(createModel({ id: 'o3' }))).toBe('o')
       expect(getThinkModelType(createModel({ id: 'o3-mini' }))).toBe('o')
       expect(getThinkModelType(createModel({ id: 'o4' }))).toBe('o')
-      expect(getThinkModelType(createModel({ id: 'gpt-oss-reasoning' }))).toBe('o')
+    })
+
+    it('should return gpt_oss for gpt-oss models', () => {
+      expect(getThinkModelType(createModel({ id: 'gpt-oss' }))).toBe('gpt_oss')
+      expect(getThinkModelType(createModel({ id: 'gpt-oss:20b' }))).toBe('gpt_oss')
+      expect(getThinkModelType(createModel({ id: 'gpt-oss-reasoning' }))).toBe('gpt_oss')
     })
   })
 
@@ -694,15 +701,20 @@ describe('getThinkModelType - Comprehensive Coverage', () => {
   })
 
   describe('Gemini models', () => {
-    it('should return gemini for Flash models', () => {
-      expect(getThinkModelType(createModel({ id: 'gemini-2.5-flash-latest' }))).toBe('gemini')
-      expect(getThinkModelType(createModel({ id: 'gemini-flash-latest' }))).toBe('gemini')
-      expect(getThinkModelType(createModel({ id: 'gemini-flash-lite-latest' }))).toBe('gemini')
+    it('should return gemini2_flash for Flash models', () => {
+      expect(getThinkModelType(createModel({ id: 'gemini-2.5-flash-latest' }))).toBe('gemini2_flash')
+    })
+    it('should return gemini3_flash for Gemini 3 Flash models', () => {
+      expect(getThinkModelType(createModel({ id: 'gemini-3-flash-preview' }))).toBe('gemini3_flash')
+      expect(getThinkModelType(createModel({ id: 'gemini-flash-latest' }))).toBe('gemini3_flash')
     })
 
-    it('should return gemini_pro for Pro models', () => {
-      expect(getThinkModelType(createModel({ id: 'gemini-2.5-pro-latest' }))).toBe('gemini_pro')
-      expect(getThinkModelType(createModel({ id: 'gemini-pro-latest' }))).toBe('gemini_pro')
+    it('should return gemini2_pro for Gemini 2.5 Pro models', () => {
+      expect(getThinkModelType(createModel({ id: 'gemini-2.5-pro-latest' }))).toBe('gemini2_pro')
+    })
+    it('should return gemini3_pro for Gemini 3 Pro models', () => {
+      expect(getThinkModelType(createModel({ id: 'gemini-3-pro-preview' }))).toBe('gemini3_pro')
+      expect(getThinkModelType(createModel({ id: 'gemini-pro-latest' }))).toBe('gemini3_pro')
     })
   })
 
@@ -732,6 +744,11 @@ describe('getThinkModelType - Comprehensive Coverage', () => {
       expect(getThinkModelType(createModel({ id: 'doubao-seed-1-6-lite-251015' }))).toBe('doubao_after_251015')
     })
 
+    it('should return doubao_after_251015 for Doubao-Seed-1.8 models', () => {
+      expect(getThinkModelType(createModel({ id: 'doubao-seed-1-8-251215' }))).toBe('doubao_after_251015')
+      expect(getThinkModelType(createModel({ id: 'doubao-seed-1.8' }))).toBe('doubao_after_251015')
+    })
+
     it('should return doubao_no_auto for other Doubao thinking models', () => {
       expect(getThinkModelType(createModel({ id: 'doubao-1.5-thinking-vision-pro' }))).toBe('doubao_no_auto')
     })
@@ -804,7 +821,7 @@ describe('getThinkModelType - Comprehensive Coverage', () => {
             name: 'gemini-2.5-flash-latest'
           })
         )
-      ).toBe('gemini')
+      ).toBe('gemini2_flash')
     })
 
     it('should use id result when id matches', () => {
@@ -829,7 +846,7 @@ describe('getThinkModelType - Comprehensive Coverage', () => {
 
     it('should handle case insensitivity correctly', () => {
       expect(getThinkModelType(createModel({ id: 'GPT-5.1' }))).toBe('gpt5_1')
-      expect(getThinkModelType(createModel({ id: 'Gemini-2.5-Flash-Latest' }))).toBe('gemini')
+      expect(getThinkModelType(createModel({ id: 'Gemini-2.5-Flash-Latest' }))).toBe('gemini2_flash')
       expect(getThinkModelType(createModel({ id: 'DeepSeek-V3.1' }))).toBe('deepseek_hybrid')
     })
 
@@ -849,7 +866,7 @@ describe('getThinkModelType - Comprehensive Coverage', () => {
     it('should handle models with version suffixes', () => {
       expect(getThinkModelType(createModel({ id: 'gpt-5-preview-2024' }))).toBe('gpt5')
       expect(getThinkModelType(createModel({ id: 'o3-mini-2024' }))).toBe('o')
-      expect(getThinkModelType(createModel({ id: 'gemini-2.5-flash-latest-001' }))).toBe('gemini')
+      expect(getThinkModelType(createModel({ id: 'gemini-2.5-flash-latest-001' }))).toBe('gemini2_flash')
     })
 
     it('should prioritize GPT-5.1 over GPT-5 detection', () => {
@@ -862,6 +879,7 @@ describe('getThinkModelType - Comprehensive Coverage', () => {
       // auto > after_251015 > no_auto
       expect(getThinkModelType(createModel({ id: 'doubao-seed-1.6' }))).toBe('doubao')
       expect(getThinkModelType(createModel({ id: 'doubao-seed-1-6-251015' }))).toBe('doubao_after_251015')
+      expect(getThinkModelType(createModel({ id: 'doubao-seed-1-8-251215' }))).toBe('doubao_after_251015')
       expect(getThinkModelType(createModel({ id: 'doubao-1.5-thinking-vision-pro' }))).toBe('doubao_no_auto')
     })
 
@@ -948,6 +966,14 @@ describe('Gemini Models', () => {
           group: ''
         })
       ).toBe(true)
+      expect(
+        isSupportedThinkingTokenGeminiModel({
+          id: 'gemini-3-flash-preview',
+          name: '',
+          provider: '',
+          group: ''
+        })
+      ).toBe(true)
       expect(
         isSupportedThinkingTokenGeminiModel({
           id: 'google/gemini-3-pro-preview',
@@ -989,6 +1015,31 @@ describe('Gemini Models', () => {
           group: ''
         })
       ).toBe(true)
+      // Version with date suffixes
+      expect(
+        isSupportedThinkingTokenGeminiModel({
+          id: 'gemini-3-flash-preview-09-2025',
+          name: '',
+          provider: '',
+          group: ''
+        })
+      ).toBe(true)
+      expect(
+        isSupportedThinkingTokenGeminiModel({
+          id: 'gemini-3-pro-preview-09-2025',
+          name: '',
+          provider: '',
+          group: ''
+        })
+      ).toBe(true)
+      expect(
+        isSupportedThinkingTokenGeminiModel({
+          id: 'gemini-3-flash-exp-1234',
+          name: '',
+          provider: '',
+          group: ''
+        })
+      ).toBe(true)
       // Version with decimals
       expect(
         isSupportedThinkingTokenGeminiModel({
@@ -1008,7 +1059,8 @@ describe('Gemini Models', () => {
       ).toBe(true)
     })
 
-    it('should return true for gemini-3 image models', () => {
+    it('should return true for gemini-3-pro-image models only', () => {
+      // Only gemini-3-pro-image models should return true
       expect(
         isSupportedThinkingTokenGeminiModel({
           id: 'gemini-3-pro-image-preview',
@@ -1016,7 +1068,18 @@ describe('Gemini Models', () => {
           provider: '',
           group: ''
         })
-      ).toBe(false)
+      ).toBe(true)
+      expect(
+        isSupportedThinkingTokenGeminiModel({
+          id: 'gemini-3-pro-image',
+          name: '',
+          provider: '',
+          group: ''
+        })
+      ).toBe(true)
+    })
+
+    it('should return false for other gemini-3 image models', () => {
       expect(
         isSupportedThinkingTokenGeminiModel({
           id: 'gemini-3.0-flash-image-preview',
@@ -1079,6 +1142,22 @@ describe('Gemini Models', () => {
           group: ''
         })
       ).toBe(false)
+      expect(
+        isSupportedThinkingTokenGeminiModel({
+          id: 'gemini-3-flash-preview-tts',
+          name: '',
+          provider: '',
+          group: ''
+        })
+      ).toBe(false)
+      expect(
+        isSupportedThinkingTokenGeminiModel({
+          id: 'gemini-3-pro-tts',
+          name: '',
+          provider: '',
+          group: ''
+        })
+      ).toBe(false)
     })
 
     it('should return false for older gemini models', () => {
@@ -1224,7 +1303,7 @@ describe('Gemini Models', () => {
           provider: '',
           group: ''
         })
-      ).toBe(false)
+      ).toBe(true)
       expect(
         isGeminiReasoningModel({
           id: 'gemini-3.5-flash-image-preview',
@@ -1651,3 +1730,553 @@ describe('isGemini3ThinkingTokenModel', () => {
     ).toBe(false)
   })
 })
+
+describe('getModelSupportedReasoningEffortOptions', () => {
+  describe('Edge cases', () => {
+    it('should return undefined for undefined model', () => {
+      expect(getModelSupportedReasoningEffortOptions(undefined)).toBeUndefined()
+    })
+
+    it('should return undefined for null model', () => {
+      expect(getModelSupportedReasoningEffortOptions(null)).toBeUndefined()
+    })
+
+    it('should return undefined for non-reasoning models', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gpt-4o' }))).toBeUndefined()
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'claude-3-opus' }))).toBeUndefined()
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'random-model' }))).toBeUndefined()
+    })
+  })
+
+  describe('OpenAI models', () => {
+    it('should return correct options for o-series models', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'o3' }))).toEqual([
+        'default',
+        'low',
+        'medium',
+        'high'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'o3-mini' }))).toEqual([
+        'default',
+        'low',
+        'medium',
+        'high'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'o4' }))).toEqual([
+        'default',
+        'low',
+        'medium',
+        'high'
+      ])
+    })
+
+    it('should return correct options for gpt-oss models', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gpt-oss' }))).toEqual([
+        'default',
+        'low',
+        'medium',
+        'high'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gpt-oss:20b' }))).toEqual([
+        'default',
+        'low',
+        'medium',
+        'high'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gpt-oss-reasoning' }))).toEqual([
+        'default',
+        'low',
+        'medium',
+        'high'
+      ])
+    })
+
+    it('should return correct options for deep research models', () => {
+      // Note: Deep research models need to be actual OpenAI reasoning models to be detected
+      // 'sonar-deep-research' from Perplexity is the primary deep research model
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'sonar-deep-research' }))).toEqual([
+        'default',
+        'medium'
+      ])
+    })
+
+    it('should return correct options for GPT-5 models', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gpt-5' }))).toEqual([
+        'default',
+        'minimal',
+        'low',
+        'medium',
+        'high'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gpt-5-preview' }))).toEqual([
+        'default',
+        'minimal',
+        'low',
+        'medium',
+        'high'
+      ])
+    })
+
+    it('should return correct options for GPT-5 Pro models', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gpt-5-pro' }))).toEqual(['default', 'high'])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gpt-5-pro-preview' }))).toEqual([
+        'default',
+        'high'
+      ])
+    })
+
+    it('should return correct options for GPT-5 Codex models', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gpt-5-codex' }))).toEqual([
+        'default',
+        'low',
+        'medium',
+        'high'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gpt-5-codex-mini' }))).toEqual([
+        'default',
+        'low',
+        'medium',
+        'high'
+      ])
+    })
+
+    it('should return correct options for GPT-5.1 models', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gpt-5.1' }))).toEqual([
+        'default',
+        'none',
+        'low',
+        'medium',
+        'high'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gpt-5.1-preview' }))).toEqual([
+        'default',
+        'none',
+        'low',
+        'medium',
+        'high'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gpt-5.1-mini' }))).toEqual([
+        'default',
+        'none',
+        'low',
+        'medium',
+        'high'
+      ])
+    })
+
+    it('should return correct options for GPT-5.1 Codex models', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gpt-5.1-codex' }))).toEqual([
+        'default',
+        'none',
+        'medium',
+        'high'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gpt-5.1-codex-mini' }))).toEqual([
+        'default',
+        'none',
+        'medium',
+        'high'
+      ])
+    })
+  })
+
+  describe('Grok models', () => {
+    it('should return correct options for Grok 3 mini', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'grok-3-mini' }))).toEqual([
+        'default',
+        'low',
+        'high'
+      ])
+    })
+
+    it('should return correct options for Grok 4 Fast', () => {
+      expect(
+        getModelSupportedReasoningEffortOptions(createModel({ id: 'grok-4-fast', provider: 'openrouter' }))
+      ).toEqual(['default', 'none', 'auto'])
+    })
+  })
+
+  describe('Gemini models', () => {
+    it('should return correct options for Gemini Flash models', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gemini-2.5-flash' }))).toEqual([
+        'default',
+        'none',
+        'low',
+        'medium',
+        'high',
+        'auto'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gemini-3-flash-preview' }))).toEqual([
+        'default',
+        'minimal',
+        'low',
+        'medium',
+        'high'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gemini-flash-latest' }))).toEqual([
+        'default',
+        'minimal',
+        'low',
+        'medium',
+        'high'
+      ])
+    })
+
+    it('should return correct options for Gemini Pro models', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gemini-2.5-pro' }))).toEqual([
+        'default',
+        'low',
+        'medium',
+        'high',
+        'auto'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gemini-3-pro-preview' }))).toEqual([
+        'default',
+        'low',
+        'high'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gemini-pro-latest' }))).toEqual([
+        'default',
+        'low',
+        'high'
+      ])
+    })
+
+    it('should return correct options for Gemini 3 models', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gemini-3-flash' }))).toEqual([
+        'default',
+        'minimal',
+        'low',
+        'medium',
+        'high'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'gemini-3-pro-preview' }))).toEqual([
+        'default',
+        'low',
+        'high'
+      ])
+    })
+  })
+
+  describe('Qwen models', () => {
+    it('should return correct options for controllable Qwen models', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'qwen-plus' }))).toEqual([
+        'default',
+        'none',
+        'low',
+        'medium',
+        'high'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'qwen-turbo' }))).toEqual([
+        'default',
+        'none',
+        'low',
+        'medium',
+        'high'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'qwen-flash' }))).toEqual([
+        'default',
+        'none',
+        'low',
+        'medium',
+        'high'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'qwen3-8b' }))).toEqual([
+        'default',
+        'none',
+        'low',
+        'medium',
+        'high'
+      ])
+    })
+
+    it('should return undefined for always-thinking Qwen models', () => {
+      // These models always think and don't support thinking token control
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'qwen3-thinking' }))).toBeUndefined()
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'qwen3-vl-235b-thinking' }))).toBeUndefined()
+    })
+  })
+
+  describe('Doubao models', () => {
+    it('should return correct options for auto-thinking Doubao models', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'doubao-seed-1.6' }))).toEqual([
+        'default',
+        'none',
+        'auto',
+        'high'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'doubao-1-5-thinking-pro-m' }))).toEqual([
+        'default',
+        'none',
+        'auto',
+        'high'
+      ])
+    })
+
+    it('should return correct options for Doubao models after 251015', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'doubao-seed-1-6-251015' }))).toEqual([
+        'default',
+        'minimal',
+        'low',
+        'medium',
+        'high'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'doubao-seed-1-6-lite-251015' }))).toEqual([
+        'default',
+        'minimal',
+        'low',
+        'medium',
+        'high'
+      ])
+    })
+
+    it('should return correct options for other Doubao thinking models', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'doubao-1.5-thinking-vision-pro' }))).toEqual([
+        'default',
+        'none',
+        'high'
+      ])
+    })
+  })
+
+  describe('Other providers', () => {
+    it('should return correct options for Hunyuan models', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'hunyuan-a13b' }))).toEqual([
+        'default',
+        'none',
+        'auto'
+      ])
+    })
+
+    it('should return correct options for Zhipu models', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'glm-4.5' }))).toEqual([
+        'default',
+        'none',
+        'auto'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'glm-4.6' }))).toEqual([
+        'default',
+        'none',
+        'auto'
+      ])
+    })
+
+    it('should return correct options for Perplexity models', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'sonar-deep-research' }))).toEqual([
+        'default',
+        'medium'
+      ])
+    })
+
+    it('should return correct options for DeepSeek hybrid models', () => {
+      expect(
+        getModelSupportedReasoningEffortOptions(createModel({ id: 'deepseek-v3.1', provider: 'deepseek' }))
+      ).toEqual(['default', 'none', 'auto'])
+      expect(
+        getModelSupportedReasoningEffortOptions(createModel({ id: 'deepseek-v3.2', provider: 'openrouter' }))
+      ).toEqual(['default', 'none', 'auto'])
+      expect(
+        getModelSupportedReasoningEffortOptions(createModel({ id: 'deepseek-chat', provider: 'deepseek' }))
+      ).toEqual(['default', 'none', 'auto'])
+    })
+  })
+
+  describe('Name-based fallback', () => {
+    it('should fall back to name when id does not match', () => {
+      // Grok 4 Fast requires openrouter provider to be recognized
+      expect(
+        getModelSupportedReasoningEffortOptions(
+          createModel({
+            id: 'custom-id',
+            name: 'grok-4-fast',
+            provider: 'openrouter'
+          })
+        )
+      ).toEqual(['default', 'none', 'auto'])
+
+      expect(
+        getModelSupportedReasoningEffortOptions(
+          createModel({
+            id: 'custom-id',
+            name: 'gpt-5.1'
+          })
+        )
+      ).toEqual(['default', 'none', 'low', 'medium', 'high'])
+
+      // Qwen models work well for name-based fallback
+      expect(
+        getModelSupportedReasoningEffortOptions(
+          createModel({
+            id: 'custom-id',
+            name: 'qwen-plus'
+          })
+        )
+      ).toEqual(['default', 'none', 'low', 'medium', 'high'])
+    })
+
+    it('should use id result when id matches', () => {
+      expect(
+        getModelSupportedReasoningEffortOptions(
+          createModel({
+            id: 'gpt-5.1',
+            name: 'Different Name'
+          })
+        )
+      ).toEqual(['default', 'none', 'low', 'medium', 'high'])
+
+      expect(
+        getModelSupportedReasoningEffortOptions(
+          createModel({
+            id: 'o3-mini',
+            name: 'Some other name'
+          })
+        )
+      ).toEqual(['default', 'low', 'medium', 'high'])
+    })
+  })
+
+  describe('Case sensitivity', () => {
+    it('should handle case insensitive model IDs', () => {
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'GPT-5.1' }))).toEqual([
+        'default',
+        'none',
+        'low',
+        'medium',
+        'high'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'O3-MINI' }))).toEqual([
+        'default',
+        'low',
+        'medium',
+        'high'
+      ])
+      expect(getModelSupportedReasoningEffortOptions(createModel({ id: 'Gemini-2.5-Flash-Latest' }))).toEqual([
+        'default',
+        'none',
+        'low',
+        'medium',
+        'high',
+        'auto'
+      ])
+    })
+  })
+
+  describe('Integration with MODEL_SUPPORTED_OPTIONS', () => {
+    it('should return values that match MODEL_SUPPORTED_OPTIONS configuration', () => {
+      // Verify that returned values match the configuration
+      const model = createModel({ id: 'o3' })
+      const result = getModelSupportedReasoningEffortOptions(model)
+      expect(result).toEqual(MODEL_SUPPORTED_OPTIONS.o)
+
+      const gpt5Model = createModel({ id: 'gpt-5' })
+      const gpt5Result = getModelSupportedReasoningEffortOptions(gpt5Model)
+      expect(gpt5Result).toEqual(MODEL_SUPPORTED_OPTIONS.gpt5)
+
+      const geminiModel = createModel({ id: 'gemini-2.5-flash-latest' })
+      const geminiResult = getModelSupportedReasoningEffortOptions(geminiModel)
+      expect(geminiResult).toEqual(MODEL_SUPPORTED_OPTIONS.gemini2_flash)
+    })
+  })
+})
+
+describe('isInterleavedThinkingModel', () => {
+  describe('MiniMax models', () => {
+    it('should return true for minimax-m2', () => {
+      expect(isInterleavedThinkingModel(createModel({ id: 'minimax-m2' }))).toBe(true)
+    })
+
+    it('should return true for minimax-m2.1', () => {
+      expect(isInterleavedThinkingModel(createModel({ id: 'minimax-m2.1' }))).toBe(true)
+    })
+
+    it('should return true for minimax-m2 with suffixes', () => {
+      expect(isInterleavedThinkingModel(createModel({ id: 'minimax-m2-pro' }))).toBe(true)
+      expect(isInterleavedThinkingModel(createModel({ id: 'minimax-m2-preview' }))).toBe(true)
+      expect(isInterleavedThinkingModel(createModel({ id: 'minimax-m2-lite' }))).toBe(true)
+      expect(isInterleavedThinkingModel(createModel({ id: 'minimax-m2-ultra-lite' }))).toBe(true)
+    })
+
+    it('should return true for minimax-m2.x with suffixes', () => {
+      expect(isInterleavedThinkingModel(createModel({ id: 'minimax-m2.1-pro' }))).toBe(true)
+      expect(isInterleavedThinkingModel(createModel({ id: 'minimax-m2.2-preview' }))).toBe(true)
+      expect(isInterleavedThinkingModel(createModel({ id: 'minimax-m2.5-lite' }))).toBe(true)
+    })
+
+    it('should return false for non-m2 minimax models', () => {
+      expect(isInterleavedThinkingModel(createModel({ id: 'minimax-m1' }))).toBe(false)
+      expect(isInterleavedThinkingModel(createModel({ id: 'minimax-m3' }))).toBe(false)
+      expect(isInterleavedThinkingModel(createModel({ id: 'minimax-pro' }))).toBe(false)
+    })
+
+    it('should handle case insensitivity', () => {
+      expect(isInterleavedThinkingModel(createModel({ id: 'MiniMax-M2' }))).toBe(true)
+      expect(isInterleavedThinkingModel(createModel({ id: 'MINIMAX-M2.1' }))).toBe(true)
+    })
+  })
+
+  describe('MiMo models', () => {
+    it('should return true for mimo-v2-flash', () => {
+      expect(isInterleavedThinkingModel(createModel({ id: 'mimo-v2-flash' }))).toBe(true)
+    })
+
+    it('should return false for other mimo models', () => {
+      expect(isInterleavedThinkingModel(createModel({ id: 'mimo-v1-flash' }))).toBe(false)
+      expect(isInterleavedThinkingModel(createModel({ id: 'mimo-v2' }))).toBe(false)
+      expect(isInterleavedThinkingModel(createModel({ id: 'mimo-v2-pro' }))).toBe(false)
+      expect(isInterleavedThinkingModel(createModel({ id: 'mimo-flash' }))).toBe(false)
+    })
+
+    it('should handle case insensitivity', () => {
+      expect(isInterleavedThinkingModel(createModel({ id: 'MiMo-V2-Flash' }))).toBe(true)
+      expect(isInterleavedThinkingModel(createModel({ id: 'MIMO-V2-FLASH' }))).toBe(true)
+    })
+  })
+
+  describe('Zhipu GLM models', () => {
+    it('should return true for glm-4.5', () => {
+      expect(isInterleavedThinkingModel(createModel({ id: 'glm-4.5' }))).toBe(true)
+    })
+
+    it('should return true for glm-4.6', () => {
+      expect(isInterleavedThinkingModel(createModel({ id: 'glm-4.6' }))).toBe(true)
+    })
+
+    it('should return true for glm-4.7 and higher versions', () => {
+      expect(isInterleavedThinkingModel(createModel({ id: 'glm-4.7' }))).toBe(true)
+      expect(isInterleavedThinkingModel(createModel({ id: 'glm-4.8' }))).toBe(true)
+      expect(isInterleavedThinkingModel(createModel({ id: 'glm-4.9' }))).toBe(true)
+    })
+
+    it('should return true for glm-4.x with suffixes', () => {
+      expect(isInterleavedThinkingModel(createModel({ id: 'glm-4.5-pro' }))).toBe(true)
+      expect(isInterleavedThinkingModel(createModel({ id: 'glm-4.6-preview' }))).toBe(true)
+      expect(isInterleavedThinkingModel(createModel({ id: 'glm-4.7-lite' }))).toBe(true)
+      expect(isInterleavedThinkingModel(createModel({ id: 'glm-4.8-ultra' }))).toBe(true)
+    })
+
+    it('should return false for glm-4 without decimal version', () => {
+      expect(isInterleavedThinkingModel(createModel({ id: 'glm-4' }))).toBe(false)
+      expect(isInterleavedThinkingModel(createModel({ id: 'glm-4-pro' }))).toBe(false)
+    })
+
+    it('should return false for other glm models', () => {
+      expect(isInterleavedThinkingModel(createModel({ id: 'glm-3.5' }))).toBe(false)
+      expect(isInterleavedThinkingModel(createModel({ id: 'glm-5.0' }))).toBe(false)
+      expect(isInterleavedThinkingModel(createModel({ id: 'glm-zero-preview' }))).toBe(false)
+    })
+
+    it('should handle case insensitivity', () => {
+      expect(isInterleavedThinkingModel(createModel({ id: 'GLM-4.5' }))).toBe(true)
+      expect(isInterleavedThinkingModel(createModel({ id: 'Glm-4.6-Pro' }))).toBe(true)
+    })
+  })
+
+  describe('Non-matching models', () => {
+    it('should return false for unrelated models', () => {
+      expect(isInterleavedThinkingModel(createModel({ id: 'gpt-4' }))).toBe(false)
+      expect(isInterleavedThinkingModel(createModel({ id: 'claude-3-opus' }))).toBe(false)
+      expect(isInterleavedThinkingModel(createModel({ id: 'gemini-pro' }))).toBe(false)
+      expect(isInterleavedThinkingModel(createModel({ id: 'deepseek-v3' }))).toBe(false)
+    })
+  })
+})
diff --git a/src/renderer/src/config/models/__tests__/utils.test.ts b/src/renderer/src/config/models/__tests__/utils.test.ts
index ae4e33875c..602b0737a8 100644
--- a/src/renderer/src/config/models/__tests__/utils.test.ts
+++ b/src/renderer/src/config/models/__tests__/utils.test.ts
@@ -20,16 +20,20 @@ import {
   getModelSupportedVerbosity,
   groupQwenModels,
   isAnthropicModel,
+  isGemini3FlashModel,
+  isGemini3ProModel,
   isGeminiModel,
   isGemmaModel,
   isGenerateImageModels,
   isMaxTemperatureOneModel,
   isNotSupportSystemMessageModel,
-  isNotSupportTemperatureAndTopP,
   isNotSupportTextDeltaModel,
   isSupportedFlexServiceTier,
   isSupportedModel,
   isSupportFlexServiceTierModel,
+  isSupportTemperatureModel,
+  isSupportTopPModel,
+  isTemperatureTopPMutuallyExclusiveModel,
   isVisionModels,
   isZhipuModel
 } from '../utils'
@@ -273,27 +277,104 @@ describe('model utils', () => {
   })
 
   describe('Temperature and top-p support', () => {
-    describe('isNotSupportTemperatureAndTopP', () => {
-      it('returns true for reasoning models', () => {
+    describe('isSupportTemperatureModel', () => {
+      it('returns false for reasoning models (non-open weight)', () => {
         const model = createModel({ id: 'o1' })
         reasoningMock.mockReturnValue(true)
-        expect(isNotSupportTemperatureAndTopP(model)).toBe(true)
+        expect(isSupportTemperatureModel(model)).toBe(false)
       })
 
-      it('returns false for open weight models', () => {
+      it('returns true for open weight models', () => {
         const openWeight = createModel({ id: 'gpt-oss-debug' })
-        expect(isNotSupportTemperatureAndTopP(openWeight)).toBe(false)
+        expect(isSupportTemperatureModel(openWeight)).toBe(true)
       })
 
-      it('returns true for chat-only models without reasoning', () => {
+      it('returns false for chat-only models', () => {
         const chatOnly = createModel({ id: 'o1-preview' })
-        reasoningMock.mockReturnValue(false)
-        expect(isNotSupportTemperatureAndTopP(chatOnly)).toBe(true)
+        expect(isSupportTemperatureModel(chatOnly)).toBe(false)
       })
 
-      it('returns true for Qwen MT models', () => {
+      it('returns false for Qwen MT models', () => {
         const qwenMt = createModel({ id: 'qwen-mt-large', provider: 'aliyun' })
-        expect(isNotSupportTemperatureAndTopP(qwenMt)).toBe(true)
+        expect(isSupportTemperatureModel(qwenMt)).toBe(false)
+      })
+
+      it('returns false for null/undefined models', () => {
+        expect(isSupportTemperatureModel(null)).toBe(false)
+        expect(isSupportTemperatureModel(undefined)).toBe(false)
+      })
+
+      it('returns true for regular GPT models', () => {
+        const model = createModel({ id: 'gpt-4' })
+        expect(isSupportTemperatureModel(model)).toBe(true)
+      })
+    })
+
+    describe('isSupportTopPModel', () => {
+      it('returns false for reasoning models (non-open weight)', () => {
+        const model = createModel({ id: 'o1' })
+        reasoningMock.mockReturnValue(true)
+        expect(isSupportTopPModel(model)).toBe(false)
+      })
+
+      it('returns true for open weight models', () => {
+        const openWeight = createModel({ id: 'gpt-oss-debug' })
+        expect(isSupportTopPModel(openWeight)).toBe(true)
+      })
+
+      it('returns false for chat-only models', () => {
+        const chatOnly = createModel({ id: 'o1-preview' })
+        expect(isSupportTopPModel(chatOnly)).toBe(false)
+      })
+
+      it('returns false for Qwen MT models', () => {
+        const qwenMt = createModel({ id: 'qwen-mt-large', provider: 'aliyun' })
+        expect(isSupportTopPModel(qwenMt)).toBe(false)
+      })
+
+      it('returns false for null/undefined models', () => {
+        expect(isSupportTopPModel(null)).toBe(false)
+        expect(isSupportTopPModel(undefined)).toBe(false)
+      })
+
+      it('returns true for regular GPT models', () => {
+        const model = createModel({ id: 'gpt-4' })
+        expect(isSupportTopPModel(model)).toBe(true)
+      })
+    })
+
+    describe('isTemperatureTopPMutuallyExclusiveModel', () => {
+      it('returns true for Claude 4.5 reasoning models', () => {
+        const claude45Sonnet = createModel({ id: 'claude-sonnet-4.5-20250514' })
+        expect(isTemperatureTopPMutuallyExclusiveModel(claude45Sonnet)).toBe(true)
+
+        const claude45Opus = createModel({ id: 'claude-opus-4.5-20250514' })
+        expect(isTemperatureTopPMutuallyExclusiveModel(claude45Opus)).toBe(true)
+      })
+
+      it('returns false for Claude 4 models', () => {
+        const claude4Sonnet = createModel({ id: 'claude-sonnet-4-20250514' })
+        expect(isTemperatureTopPMutuallyExclusiveModel(claude4Sonnet)).toBe(false)
+      })
+
+      it('returns false for Claude 3.x models', () => {
+        const claude35Sonnet = createModel({ id: 'claude-3-5-sonnet-20241022' })
+        expect(isTemperatureTopPMutuallyExclusiveModel(claude35Sonnet)).toBe(false)
+
+        const claude3Opus = createModel({ id: 'claude-3-opus-20240229' })
+        expect(isTemperatureTopPMutuallyExclusiveModel(claude3Opus)).toBe(false)
+      })
+
+      it('returns false for other AI models', () => {
+        expect(isTemperatureTopPMutuallyExclusiveModel(createModel({ id: 'gpt-4o' }))).toBe(false)
+        expect(isTemperatureTopPMutuallyExclusiveModel(createModel({ id: 'o1' }))).toBe(false)
+        expect(isTemperatureTopPMutuallyExclusiveModel(createModel({ id: 'gemini-2.0-flash' }))).toBe(false)
+        expect(isTemperatureTopPMutuallyExclusiveModel(createModel({ id: 'qwen-max' }))).toBe(false)
+      })
+
+      it('returns false for null/undefined models', () => {
+        expect(isTemperatureTopPMutuallyExclusiveModel(null)).toBe(false)
+        expect(isTemperatureTopPMutuallyExclusiveModel(undefined)).toBe(false)
       })
     })
   })
@@ -353,6 +434,101 @@ describe('model utils', () => {
       })
     })
 
+    describe('isGemini3FlashModel', () => {
+      it('detects gemini-3-flash model', () => {
+        expect(isGemini3FlashModel(createModel({ id: 'gemini-3-flash' }))).toBe(true)
+      })
+
+      it('detects gemini-3-flash-preview model', () => {
+        expect(isGemini3FlashModel(createModel({ id: 'gemini-3-flash-preview' }))).toBe(true)
+      })
+
+      it('detects gemini-3-flash with version suffixes', () => {
+        expect(isGemini3FlashModel(createModel({ id: 'gemini-3-flash-latest' }))).toBe(true)
+        expect(isGemini3FlashModel(createModel({ id: 'gemini-3-flash-preview-09-2025' }))).toBe(true)
+        expect(isGemini3FlashModel(createModel({ id: 'gemini-3-flash-exp-1234' }))).toBe(true)
+      })
+
+      it('detects gemini-flash-latest alias', () => {
+        expect(isGemini3FlashModel(createModel({ id: 'gemini-flash-latest' }))).toBe(true)
+        expect(isGemini3FlashModel(createModel({ id: 'Gemini-Flash-Latest' }))).toBe(true)
+      })
+
+      it('detects gemini-3-flash with uppercase', () => {
+        expect(isGemini3FlashModel(createModel({ id: 'Gemini-3-Flash' }))).toBe(true)
+        expect(isGemini3FlashModel(createModel({ id: 'GEMINI-3-FLASH-PREVIEW' }))).toBe(true)
+      })
+
+      it('excludes gemini-3-flash-image models', () => {
+        expect(isGemini3FlashModel(createModel({ id: 'gemini-3-flash-image-preview' }))).toBe(false)
+        expect(isGemini3FlashModel(createModel({ id: 'gemini-3-flash-image' }))).toBe(false)
+      })
+
+      it('returns false for non-flash gemini-3 models', () => {
+        expect(isGemini3FlashModel(createModel({ id: 'gemini-3-pro' }))).toBe(false)
+        expect(isGemini3FlashModel(createModel({ id: 'gemini-3-pro-preview' }))).toBe(false)
+        expect(isGemini3FlashModel(createModel({ id: 'gemini-3-pro-image-preview' }))).toBe(false)
+      })
+
+      it('returns false for other gemini models', () => {
+        expect(isGemini3FlashModel(createModel({ id: 'gemini-2-flash' }))).toBe(false)
+        expect(isGemini3FlashModel(createModel({ id: 'gemini-2-flash-preview' }))).toBe(false)
+        expect(isGemini3FlashModel(createModel({ id: 'gemini-2.5-flash-preview-09-2025' }))).toBe(false)
+      })
+
+      it('returns false for null/undefined models', () => {
+        expect(isGemini3FlashModel(null)).toBe(false)
+        expect(isGemini3FlashModel(undefined)).toBe(false)
+      })
+    })
+
+    describe('isGemini3ProModel', () => {
+      it('detects gemini-3-pro model', () => {
+        expect(isGemini3ProModel(createModel({ id: 'gemini-3-pro' }))).toBe(true)
+      })
+
+      it('detects gemini-3-pro-preview model', () => {
+        expect(isGemini3ProModel(createModel({ id: 'gemini-3-pro-preview' }))).toBe(true)
+      })
+
+      it('detects gemini-3-pro with version suffixes', () => {
+        expect(isGemini3ProModel(createModel({ id: 'gemini-3-pro-latest' }))).toBe(true)
+        expect(isGemini3ProModel(createModel({ id: 'gemini-3-pro-preview-09-2025' }))).toBe(true)
+        expect(isGemini3ProModel(createModel({ id: 'gemini-3-pro-exp-1234' }))).toBe(true)
+      })
+
+      it('detects gemini-pro-latest alias', () => {
+        expect(isGemini3ProModel(createModel({ id: 'gemini-pro-latest' }))).toBe(true)
+        expect(isGemini3ProModel(createModel({ id: 'Gemini-Pro-Latest' }))).toBe(true)
+      })
+
+      it('detects gemini-3-pro with uppercase', () => {
+        expect(isGemini3ProModel(createModel({ id: 'Gemini-3-Pro' }))).toBe(true)
+        expect(isGemini3ProModel(createModel({ id: 'GEMINI-3-PRO-PREVIEW' }))).toBe(true)
+      })
+
+      it('excludes gemini-3-pro-image models', () => {
+        expect(isGemini3ProModel(createModel({ id: 'gemini-3-pro-image-preview' }))).toBe(false)
+        expect(isGemini3ProModel(createModel({ id: 'gemini-3-pro-image' }))).toBe(false)
+        expect(isGemini3ProModel(createModel({ id: 'gemini-3-pro-image-latest' }))).toBe(false)
+      })
+
+      it('returns false for non-pro gemini-3 models', () => {
+        expect(isGemini3ProModel(createModel({ id: 'gemini-3-flash' }))).toBe(false)
+        expect(isGemini3ProModel(createModel({ id: 'gemini-3-flash-preview' }))).toBe(false)
+      })
+
+      it('returns false for other gemini models', () => {
+        expect(isGemini3ProModel(createModel({ id: 'gemini-2-pro' }))).toBe(false)
+        expect(isGemini3ProModel(createModel({ id: 'gemini-2.5-pro-preview-09-2025' }))).toBe(false)
+      })
+
+      it('returns false for null/undefined models', () => {
+        expect(isGemini3ProModel(null)).toBe(false)
+        expect(isGemini3ProModel(undefined)).toBe(false)
+      })
+    })
+
     describe('isZhipuModel', () => {
       it('detects Zhipu models by provider', () => {
         expect(isZhipuModel(createModel({ provider: 'zhipu' }))).toBe(true)
diff --git a/src/renderer/src/config/models/default.ts b/src/renderer/src/config/models/default.ts
index b0bb00f23c..1223d0c92c 100644
--- a/src/renderer/src/config/models/default.ts
+++ b/src/renderer/src/config/models/default.ts
@@ -240,47 +240,35 @@ export const SYSTEM_MODELS: Record<SystemProviderId | 'defaultModel', Model[]> =
   ],
 
   burncloud: [
-    { id: 'claude-3-7-sonnet-20250219-thinking', provider: 'burncloud', name: 'Claude 3.7 thinking', group: 'Claude' },
-    { id: 'claude-3-7-sonnet-20250219', provider: 'burncloud', name: 'Claude 3.7 Sonnet', group: 'Claude 3.7' },
-    { id: 'claude-3-5-sonnet-20241022', provider: 'burncloud', name: 'Claude 3.5 Sonnet', group: 'Claude 3.5' },
-    { id: 'claude-3-5-haiku-20241022', provider: 'burncloud', name: 'Claude 3.5 Haiku', group: 'Claude 3.5' },
+    { id: 'claude-opus-4-5-20251101', provider: 'burncloud', name: 'Claude 4.5 Opus', group: 'Claude 4.5' },
+    { id: 'claude-sonnet-4-5-20250929', provider: 'burncloud', name: 'Claude 4.5 Sonnet', group: 'Claude 4.5' },
+    { id: 'claude-haiku-4-5-20251001', provider: 'burncloud', name: 'Claude 4.5 Haiku', group: 'Claude 4.5' },
 
-    { id: 'gpt-4.5-preview', provider: 'burncloud', name: 'gpt-4.5-preview', group: 'gpt-4.5' },
-    { id: 'gpt-4o', provider: 'burncloud', name: 'GPT-4o', group: 'GPT 4o' },
-    { id: 'gpt-4o-mini', provider: 'burncloud', name: 'GPT-4o-mini', group: 'GPT 4o' },
-    { id: 'o3', provider: 'burncloud', name: 'GPT-o1-mini', group: 'o1' },
-    { id: 'o3-mini', provider: 'burncloud', name: 'GPT-o1-preview', group: 'o1' },
-    { id: 'o1-mini', provider: 'burncloud', name: 'GPT-o1-mini', group: 'o1' },
+    { id: 'gpt-5', provider: 'burncloud', name: 'GPT 5', group: 'GPT 5' },
+    { id: 'gpt-5.1', provider: 'burncloud', name: 'GPT 5.1', group: 'GPT 5.1' },
 
-    { id: 'gemini-2.5-pro-preview-03-25', provider: 'burncloud', name: 'Gemini 2.5 Preview', group: 'Geminit 2.5' },
-    { id: 'gemini-2.5-pro-exp-03-25', provider: 'burncloud', name: 'Gemini 2.5 Pro Exp', group: 'Geminit 2.5' },
-    { id: 'gemini-2.0-flash-lite', provider: 'burncloud', name: 'Gemini 2.0 Flash Lite', group: 'Geminit 2.0' },
-    { id: 'gemini-2.0-flash-exp', provider: 'burncloud', name: 'Gemini 2.0 Flash Exp', group: 'Geminit 2.0' },
-    { id: 'gemini-2.0-flash', provider: 'burncloud', name: 'Gemini 2.0 Flash', group: 'Geminit 2.0' },
+    { id: 'gemini-2.5-flash', provider: 'burncloud', name: 'Gemini 2.5 Flash', group: 'Gemini 2.5' },
+    { id: 'gemini-2.5-flash-image', provider: 'burncloud', name: 'Gemini 2.5 Flash Image', group: 'Gemini 2.5' },
+    { id: 'gemini-2.5-pro', provider: 'burncloud', name: 'Gemini 2.5 Pro', group: 'Gemini 2.5' },
+    { id: 'gemini-3-pro-preview', provider: 'burncloud', name: 'Gemini 3 Pro Preview', group: 'Gemini 3' },
 
-    { id: 'deepseek-r1', name: 'DeepSeek-R1', provider: 'burncloud', group: 'deepseek-ai' },
-    { id: 'deepseek-v3', name: 'DeepSeek-V3', provider: 'burncloud', group: 'deepseek-ai' }
+    { id: 'deepseek-reasoner', name: 'DeepSeek Reasoner', provider: 'burncloud', group: 'deepseek-ai' },
+    { id: 'deepseek-chat', name: 'DeepSeek Chat', provider: 'burncloud', group: 'deepseek-ai' }
   ],
   ovms: [],
   ollama: [],
   lmstudio: [],
   silicon: [
     {
-      id: 'deepseek-ai/DeepSeek-R1',
-      name: 'deepseek-ai/DeepSeek-R1',
+      id: 'deepseek-ai/DeepSeek-V3.2',
+      name: 'deepseek-ai/DeepSeek-V3.2',
       provider: 'silicon',
       group: 'deepseek-ai'
     },
     {
-      id: 'deepseek-ai/DeepSeek-V3',
-      name: 'deepseek-ai/DeepSeek-V3',
+      id: 'Qwen/Qwen3-8B',
+      name: 'Qwen/Qwen3-8B',
       provider: 'silicon',
-      group: 'deepseek-ai'
-    },
-    {
-      id: 'Qwen/Qwen2.5-7B-Instruct',
-      provider: 'silicon',
-      name: 'Qwen2.5-7B-Instruct',
       group: 'Qwen'
     },
     {
@@ -288,79 +276,31 @@ export const SYSTEM_MODELS: Record<SystemProviderId | 'defaultModel', Model[]> =
       name: 'BAAI/bge-m3',
       provider: 'silicon',
       group: 'BAAI'
-    },
-    {
-      id: 'Qwen/Qwen3-8B',
-      name: 'Qwen/Qwen3-8B',
-      provider: 'silicon',
-      group: 'Qwen'
     }
   ],
   ppio: [
     {
-      id: 'deepseek/deepseek-r1-0528',
+      id: 'deepseek/deepseek-v3.2',
       provider: 'ppio',
-      name: 'DeepSeek R1-0528',
+      name: 'DeepSeek V3.2',
       group: 'deepseek'
     },
     {
-      id: 'deepseek/deepseek-v3-0324',
+      id: 'minimax/minimax-m2',
       provider: 'ppio',
-      name: 'DeepSeek V3-0324',
-      group: 'deepseek'
-    },
-    {
-      id: 'deepseek/deepseek-r1-turbo',
-      provider: 'ppio',
-      name: 'DeepSeek R1 Turbo',
-      group: 'deepseek'
-    },
-    {
-      id: 'deepseek/deepseek-v3-turbo',
-      provider: 'ppio',
-      name: 'DeepSeek V3 Turbo',
-      group: 'deepseek'
-    },
-    {
-      id: 'deepseek/deepseek-r1/community',
-      name: 'DeepSeek: DeepSeek R1 (Community)',
-      provider: 'ppio',
-      group: 'deepseek'
-    },
-    {
-      id: 'deepseek/deepseek-v3/community',
-      name: 'DeepSeek: DeepSeek V3 (Community)',
-      provider: 'ppio',
-      group: 'deepseek'
-    },
-    {
-      id: 'minimaxai/minimax-m1-80k',
-      provider: 'ppio',
-      name: 'MiniMax M1-80K',
+      name: 'MiniMax M2',
       group: 'minimaxai'
     },
     {
-      id: 'qwen/qwen3-235b-a22b-fp8',
+      id: 'qwen/qwen3-235b-a22b-instruct-2507',
       provider: 'ppio',
-      name: 'Qwen3 235B',
+      name: 'Qwen3-235b-a22b-instruct-2507',
       group: 'qwen'
     },
     {
-      id: 'qwen/qwen3-32b-fp8',
+      id: 'qwen/qwen3-vl-235b-a22b-instruct',
       provider: 'ppio',
-      name: 'Qwen3 32B',
-      group: 'qwen'
-    },
-    {
-      id: 'qwen/qwen3-30b-a3b-fp8',
-      provider: 'ppio',
-      name: 'Qwen3 30B',
-      group: 'qwen'
-    },
-    {
-      id: 'qwen/qwen2.5-vl-72b-instruct',
-      provider: 'ppio',
-      name: 'Qwen2.5 VL 72B',
+      name: 'Qwen3-vl-235b-a22b-instruct',
       group: 'qwen'
     },
     {
@@ -378,11 +318,13 @@ export const SYSTEM_MODELS: Record<SystemProviderId | 'defaultModel', Model[]> =
   ],
   alayanew: [],
   openai: [
-    { id: 'gpt-4.5-preview', provider: 'openai', name: ' gpt-4.5-preview', group: 'gpt-4.5' },
-    { id: 'gpt-4o', provider: 'openai', name: ' GPT-4o', group: 'GPT 4o' },
-    { id: 'gpt-4o-mini', provider: 'openai', name: ' GPT-4o-mini', group: 'GPT 4o' },
-    { id: 'o1-mini', provider: 'openai', name: ' o1-mini', group: 'o1' },
-    { id: 'o1-preview', provider: 'openai', name: ' o1-preview', group: 'o1' }
+    { id: 'gpt-5.1', provider: 'openai', name: ' GPT 5.1', group: 'GPT 5.1' },
+    { id: 'gpt-5', provider: 'openai', name: ' GPT 5', group: 'GPT 5' },
+    { id: 'gpt-5-mini', provider: 'openai', name: ' GPT 5 Mini', group: 'GPT 5' },
+    { id: 'gpt-5-nano', provider: 'openai', name: ' GPT 5 Nano', group: 'GPT 5' },
+    { id: 'gpt-5-pro', provider: 'openai', name: ' GPT 5 Pro', group: 'GPT 5' },
+    { id: 'gpt-5-chat', provider: 'openai', name: ' GPT 5 Chat', group: 'GPT 5' },
+    { id: 'gpt-image-1', provider: 'openai', name: ' GPT Image 1', group: 'GPT Image' }
   ],
   'azure-openai': [
     {
@@ -400,96 +342,54 @@ export const SYSTEM_MODELS: Record<SystemProviderId | 'defaultModel', Model[]> =
   ],
   gemini: [
     {
-      id: 'gemini-1.5-flash',
+      id: 'gemini-2.5-flash',
       provider: 'gemini',
-      name: 'Gemini 1.5 Flash',
-      group: 'Gemini 1.5'
+      name: 'Gemini 2.5 Flash',
+      group: 'Gemini 2.5'
     },
     {
-      id: 'gemini-1.5-flash-8b',
+      id: 'gemini-2.5-pro',
       provider: 'gemini',
-      name: 'Gemini 1.5 Flash (8B)',
-      group: 'Gemini 1.5'
-    },
-    {
-      id: 'gemini-1.5-pro',
-      name: 'Gemini 1.5 Pro',
-      provider: 'gemini',
-      group: 'Gemini 1.5'
-    },
-    {
-      id: 'gemini-2.0-flash',
-      provider: 'gemini',
-      name: 'Gemini 2.0 Flash',
-      group: 'Gemini 2.0'
+      name: 'Gemini 2.5 Pro',
+      group: 'Gemini 2.5'
     },
     {
       id: 'gemini-2.5-flash-image-preview',
       provider: 'gemini',
       name: 'Gemini 2.5 Flash Image',
       group: 'Gemini 2.5'
+    },
+    {
+      id: 'gemini-3-pro-image-preview',
+      provider: 'gemini',
+      name: 'Gemini 3 Pro Image Preview',
+      group: 'Gemini 3'
+    },
+    {
+      id: 'gemini-3-pro-preview',
+      provider: 'gemini',
+      name: 'Gemini 3 Pro Preview',
+      group: 'Gemini 3'
     }
   ],
   anthropic: [
     {
-      id: 'claude-haiku-4-5-20251001',
-      provider: 'anthropic',
-      name: 'Claude Haiku 4.5',
-      group: 'Claude 4.5'
-    },
-    {
-      id: 'claude-sonnet-4-5-20250929',
+      id: 'claude-sonnet-4-5',
       provider: 'anthropic',
       name: 'Claude Sonnet 4.5',
       group: 'Claude 4.5'
     },
     {
-      id: 'claude-sonnet-4-20250514',
+      id: 'claude-haiku-4-5',
       provider: 'anthropic',
-      name: 'Claude Sonnet 4',
-      group: 'Claude 4'
+      name: 'Claude Haiku 4.5',
+      group: 'Claude 4.5'
     },
     {
-      id: 'claude-opus-4-20250514',
+      id: 'claude-opus-4-5',
       provider: 'anthropic',
-      name: 'Claude Opus 4',
-      group: 'Claude 4'
-    },
-    {
-      id: 'claude-3-7-sonnet-20250219',
-      provider: 'anthropic',
-      name: 'Claude 3.7 Sonnet',
-      group: 'Claude 3.7'
-    },
-    {
-      id: 'claude-3-5-sonnet-20241022',
-      provider: 'anthropic',
-      name: 'Claude 3.5 Sonnet',
-      group: 'Claude 3.5'
-    },
-    {
-      id: 'claude-3-5-haiku-20241022',
-      provider: 'anthropic',
-      name: 'Claude 3.5 Haiku',
-      group: 'Claude 3.5'
-    },
-    {
-      id: 'claude-3-5-sonnet-20240620',
-      provider: 'anthropic',
-      name: 'Claude 3.5 Sonnet (Legacy)',
-      group: 'Claude 3.5'
-    },
-    {
-      id: 'claude-3-opus-20240229',
-      provider: 'anthropic',
-      name: 'Claude 3 Opus',
-      group: 'Claude 3'
-    },
-    {
-      id: 'claude-3-haiku-20240307',
-      provider: 'anthropic',
-      name: 'Claude 3 Haiku',
-      group: 'Claude 3'
+      name: 'Claude Opus 4.5',
+      group: 'Claude 4.5'
     }
   ],
   deepseek: [
@@ -717,6 +617,30 @@ export const SYSTEM_MODELS: Record<SystemProviderId | 'defaultModel', Model[]> =
       name: 'GLM-4.6',
       group: 'GLM-4.6'
     },
+    {
+      id: 'glm-4.6v',
+      provider: 'zhipu',
+      name: 'GLM-4.6V',
+      group: 'GLM-4.6V'
+    },
+    {
+      id: 'glm-4.6v-flash',
+      provider: 'zhipu',
+      name: 'GLM-4.6V-Flash',
+      group: 'GLM-4.6V'
+    },
+    {
+      id: 'glm-4.6v-flashx',
+      provider: 'zhipu',
+      name: 'GLM-4.6V-FlashX',
+      group: 'GLM-4.6V'
+    },
+    {
+      id: 'glm-4.7',
+      provider: 'zhipu',
+      name: 'GLM-4.7',
+      group: 'GLM-4.7'
+    },
     {
       id: 'glm-4.5',
       provider: 'zhipu',
@@ -846,6 +770,12 @@ export const SYSTEM_MODELS: Record<SystemProviderId | 'defaultModel', Model[]> =
     }
   ],
   doubao: [
+    {
+      id: 'doubao-seed-1-8-251215',
+      provider: 'doubao',
+      name: 'Doubao-Seed-1.8',
+      group: 'Doubao-Seed-1.8'
+    },
     {
       id: 'doubao-1-5-vision-pro-32k-250115',
       provider: 'doubao',
@@ -1015,6 +945,12 @@ export const SYSTEM_MODELS: Record<SystemProviderId | 'defaultModel', Model[]> =
       provider: 'minimax',
       name: 'MiniMax M2 Stable',
       group: 'minimax-m2'
+    },
+    {
+      id: 'MiniMax-M2.1',
+      provider: 'minimax',
+      name: 'MiniMax M2.1',
+      group: 'minimax-m2'
     }
   ],
   hyperbolic: [
@@ -1073,18 +1009,6 @@ export const SYSTEM_MODELS: Record<SystemProviderId | 'defaultModel', Model[]> =
       provider: 'grok',
       name: 'Grok 3 Mini Fast',
       group: 'Grok'
-    },
-    {
-      id: 'grok-2-vision-1212',
-      provider: 'grok',
-      name: 'Grok 2 Vision 1212',
-      group: 'Grok'
-    },
-    {
-      id: 'grok-2-1212',
-      provider: 'grok',
-      name: 'Grok 2 1212',
-      group: 'Grok'
     }
   ],
   mistral: [
@@ -1808,34 +1732,58 @@ export const SYSTEM_MODELS: Record<SystemProviderId | 'defaultModel', Model[]> =
   ],
   aionly: [
     {
-      id: 'claude-opus-4.1',
-      name: 'claude-opus-4.1',
+      id: 'claude-opus-4-5-20251101',
+      name: 'Claude Opus 4.5',
       provider: 'aionly',
-      group: 'claude'
+      group: 'Anthropic'
     },
     {
-      id: 'claude-sonnet4',
-      name: 'claude-sonnet4',
+      id: 'claude-haiku-4-5-20251001',
+      name: 'Claude Haiku 4.5',
       provider: 'aionly',
-      group: 'claude'
+      group: 'Anthropic'
     },
     {
-      id: 'claude-3.5-sonnet-v2',
-      name: 'claude-3.5-sonnet-v2',
+      id: 'claude-sonnet-4-5-20250929',
+      name: 'Claude Sonnet 4.5',
       provider: 'aionly',
-      group: 'claude'
+      group: 'Anthropic'
     },
     {
-      id: 'gpt-4.1',
-      name: 'gpt-4.1',
+      id: 'gpt-5.1',
+      name: 'GPT-5.1',
       provider: 'aionly',
-      group: 'gpt'
+      group: 'OpenAI'
+    },
+    {
+      id: 'gpt-5.1-chat',
+      name: 'GPT-5.1 Chat',
+      provider: 'aionly',
+      group: 'OpenAI'
+    },
+    {
+      id: 'gpt-5-pro',
+      name: 'GPT 5 Pro',
+      provider: 'aionly',
+      group: 'OpenAI'
+    },
+    {
+      id: 'gemini-3-pro-preview',
+      name: 'Gemini 3 Pro Preview',
+      provider: 'aionly',
+      group: 'Google'
+    },
+    {
+      id: 'gemini-2.5-pro',
+      name: 'Gemini 2.5 Pro',
+      provider: 'aionly',
+      group: 'Google'
     },
     {
       id: 'gemini-2.5-flash',
-      name: 'gemini-2.5-flash',
+      name: 'Gemini 2.5 Flash',
       provider: 'aionly',
-      group: 'gemini'
+      group: 'Google'
     }
   ],
   longcat: [
@@ -1873,5 +1821,13 @@ export const SYSTEM_MODELS: Record<SystemProviderId | 'defaultModel', Model[]> =
       provider: 'cerebras',
       group: 'qwen'
     }
+  ],
+  mimo: [
+    {
+      id: 'mimo-v2-flash',
+      name: 'Mimo V2 Flash',
+      provider: 'mimo',
+      group: 'Mimo'
+    }
   ]
 }
diff --git a/src/renderer/src/config/models/logo.ts b/src/renderer/src/config/models/logo.ts
index 64ba94b470..75ad71f662 100644
--- a/src/renderer/src/config/models/logo.ts
+++ b/src/renderer/src/config/models/logo.ts
@@ -103,6 +103,7 @@ import MicrosoftModelLogo from '@renderer/assets/images/models/microsoft.png'
 import MicrosoftModelLogoDark from '@renderer/assets/images/models/microsoft_dark.png'
 import MidjourneyModelLogo from '@renderer/assets/images/models/midjourney.png'
 import MidjourneyModelLogoDark from '@renderer/assets/images/models/midjourney_dark.png'
+import MiMoModelLogo from '@renderer/assets/images/models/mimo.svg'
 import {
   default as MinicpmModelLogo,
   default as MinicpmModelLogoDark
@@ -193,7 +194,7 @@ export function getModelLogoById(modelId: string): string | undefined {
     'gpt-5.1': GPT51ModelLogo,
     'gpt-5': GPT5ModelLogo,
     gpts: isLight ? ChatGPT4ModelLogo : ChatGPT4ModelLogoDark,
-    'gpt-oss(?:-[\\w-]+)': isLight ? ChatGptModelLogo : ChatGptModelLogoDark,
+    'gpt-oss(?::|-[\\w-]+)': isLight ? ChatGptModelLogo : ChatGptModelLogoDark,
     'text-moderation': isLight ? ChatGptModelLogo : ChatGptModelLogoDark,
     'babbage-': isLight ? ChatGptModelLogo : ChatGptModelLogoDark,
     '(sora-|sora_)': isLight ? ChatGptModelLogo : ChatGptModelLogoDark,
@@ -301,7 +302,8 @@ export function getModelLogoById(modelId: string): string | undefined {
     bytedance: BytedanceModelLogo,
     ling: LingModelLogo,
     ring: LingModelLogo,
-    '(V_1|V_1_TURBO|V_2|V_2A|V_2_TURBO|DESCRIBE|UPSCALE)': IdeogramModelLogo
+    '(V_1|V_1_TURBO|V_2|V_2A|V_2_TURBO|DESCRIBE|UPSCALE)': IdeogramModelLogo,
+    mimo: MiMoModelLogo
   } as const satisfies Record<string, string>
 
   for (const key in logoMap) {
diff --git a/src/renderer/src/config/models/openai.ts b/src/renderer/src/config/models/openai.ts
index 4fc223405f..ebad589d53 100644
--- a/src/renderer/src/config/models/openai.ts
+++ b/src/renderer/src/config/models/openai.ts
@@ -35,6 +35,16 @@ export const isGPT5ProModel = (model: Model) => {
   return modelId.includes('gpt-5-pro')
 }
 
+export const isGPT52ProModel = (model: Model) => {
+  const modelId = getLowerBaseModelName(model.id)
+  return modelId.includes('gpt-5.2-pro')
+}
+
+export const isGPT51CodexMaxModel = (model: Model) => {
+  const modelId = getLowerBaseModelName(model.id)
+  return modelId.includes('gpt-5.1-codex-max')
+}
+
 export const isOpenAIOpenWeightModel = (model: Model) => {
   const modelId = getLowerBaseModelName(model.id)
   return modelId.includes('gpt-oss')
@@ -42,7 +52,7 @@ export const isOpenAIOpenWeightModel = (model: Model) => {
 
 export const isGPT5SeriesModel = (model: Model) => {
   const modelId = getLowerBaseModelName(model.id)
-  return modelId.includes('gpt-5') && !modelId.includes('gpt-5.1')
+  return modelId.includes('gpt-5') && !modelId.includes('gpt-5.1') && !modelId.includes('gpt-5.2')
 }
 
 export const isGPT5SeriesReasoningModel = (model: Model) => {
@@ -55,9 +65,44 @@ export const isGPT51SeriesModel = (model: Model) => {
   return modelId.includes('gpt-5.1')
 }
 
+export const isGPT52SeriesModel = (model: Model) => {
+  const modelId = getLowerBaseModelName(model.id)
+  return modelId.includes('gpt-5.2')
+}
+
 export function isSupportVerbosityModel(model: Model): boolean {
   const modelId = getLowerBaseModelName(model.id)
-  return (isGPT5SeriesModel(model) || isGPT51SeriesModel(model)) && !modelId.includes('chat')
+  return (
+    (isGPT5SeriesModel(model) || isGPT51SeriesModel(model) || isGPT52SeriesModel(model)) && !modelId.includes('chat')
+  )
+}
+
+/**
+ * Determines if a model supports the "none" reasoning effort parameter.
+ *
+ * This applies to GPT-5.1 and GPT-5.2 series reasoning models (non-chat, non-pro variants).
+ * These models allow setting reasoning_effort to "none" to skip reasoning steps.
+ *
+ * @param model - The model to check
+ * @returns true if the model supports "none" reasoning effort, false otherwise
+ *
+ * @example
+ * ```ts
+ * // Returns true
+ * isSupportNoneReasoningEffortModel({ id: 'gpt-5.1', provider: 'openai' })
+ * isSupportNoneReasoningEffortModel({ id: 'gpt-5.2-mini', provider: 'openai' })
+ *
+ * // Returns false
+ * isSupportNoneReasoningEffortModel({ id: 'gpt-5.1-pro', provider: 'openai' })
+ * isSupportNoneReasoningEffortModel({ id: 'gpt-5.1-chat', provider: 'openai' })
+ * isSupportNoneReasoningEffortModel({ id: 'gpt-5-pro', provider: 'openai' })
+ * ```
+ */
+export function isSupportNoneReasoningEffortModel(model: Model): boolean {
+  const modelId = getLowerBaseModelName(model.id)
+  return (
+    (isGPT51SeriesModel(model) || isGPT52SeriesModel(model)) && !modelId.includes('chat') && !modelId.includes('pro')
+  )
 }
 
 export function isOpenAIChatCompletionOnlyModel(model: Model): boolean {
@@ -86,7 +131,7 @@ export function isSupportedReasoningEffortOpenAIModel(model: Model): boolean {
     modelId.includes('o3') ||
     modelId.includes('o4') ||
     modelId.includes('gpt-oss') ||
-    ((isGPT5SeriesModel(model) || isGPT51SeriesModel(model)) && !modelId.includes('chat'))
+    ((isGPT5SeriesModel(model) || isGPT51SeriesModel(model) || isGPT52SeriesModel(model)) && !modelId.includes('chat'))
   )
 }
 
diff --git a/src/renderer/src/config/models/reasoning.ts b/src/renderer/src/config/models/reasoning.ts
index c85029db8f..b2b6119b76 100644
--- a/src/renderer/src/config/models/reasoning.ts
+++ b/src/renderer/src/config/models/reasoning.ts
@@ -1,6 +1,7 @@
 import type {
   Model,
   ReasoningEffortConfig,
+  ReasoningEffortOption,
   SystemProviderId,
   ThinkingModelType,
   ThinkingOptionConfig
@@ -11,12 +12,16 @@ import { isEmbeddingModel, isRerankModel } from './embedding'
 import {
   isGPT5ProModel,
   isGPT5SeriesModel,
+  isGPT51CodexMaxModel,
   isGPT51SeriesModel,
+  isGPT52ProModel,
+  isGPT52SeriesModel,
   isOpenAIDeepResearchModel,
+  isOpenAIOpenWeightModel,
   isOpenAIReasoningModel,
   isSupportedReasoningEffortOpenAIModel
 } from './openai'
-import { GEMINI_FLASH_MODEL_REGEX, isGemini3ThinkingTokenModel } from './utils'
+import { GEMINI_FLASH_MODEL_REGEX, isGemini3FlashModel, isGemini3ProModel } from './utils'
 import { isTextToImageModel } from './vision'
 
 // Reasoning models
@@ -25,7 +30,7 @@ export const REASONING_REGEX =
 
 // 模型类型到支持的reasoning_effort的映射表
 // TODO: refactor this. too many identical options
-export const MODEL_SUPPORTED_REASONING_EFFORT: ReasoningEffortConfig = {
+export const MODEL_SUPPORTED_REASONING_EFFORT = {
   default: ['low', 'medium', 'high'] as const,
   o: ['low', 'medium', 'high'] as const,
   openai_deep_research: ['medium'] as const,
@@ -33,47 +38,59 @@ export const MODEL_SUPPORTED_REASONING_EFFORT: ReasoningEffortConfig = {
   gpt5_codex: ['low', 'medium', 'high'] as const,
   gpt5_1: ['none', 'low', 'medium', 'high'] as const,
   gpt5_1_codex: ['none', 'medium', 'high'] as const,
+  gpt5_1_codex_max: ['none', 'medium', 'high', 'xhigh'] as const,
+  gpt5_2: ['none', 'low', 'medium', 'high', 'xhigh'] as const,
   gpt5pro: ['high'] as const,
+  gpt52pro: ['medium', 'high', 'xhigh'] as const,
+  gpt_oss: ['low', 'medium', 'high'] as const,
   grok: ['low', 'high'] as const,
   grok4_fast: ['auto'] as const,
-  gemini: ['low', 'medium', 'high', 'auto'] as const,
-  gemini3: ['low', 'medium', 'high'] as const,
-  gemini_pro: ['low', 'medium', 'high', 'auto'] as const,
+  gemini2_flash: ['low', 'medium', 'high', 'auto'] as const,
+  gemini2_pro: ['low', 'medium', 'high', 'auto'] as const,
+  gemini3_flash: ['minimal', 'low', 'medium', 'high'] as const,
+  gemini3_pro: ['low', 'high'] as const,
   qwen: ['low', 'medium', 'high'] as const,
   qwen_thinking: ['low', 'medium', 'high'] as const,
   doubao: ['auto', 'high'] as const,
   doubao_no_auto: ['high'] as const,
   doubao_after_251015: ['minimal', 'low', 'medium', 'high'] as const,
   hunyuan: ['auto'] as const,
+  mimo: ['auto'] as const,
   zhipu: ['auto'] as const,
   perplexity: ['low', 'medium', 'high'] as const,
   deepseek_hybrid: ['auto'] as const
-} as const
+} as const satisfies ReasoningEffortConfig
 
 // 模型类型到支持选项的映射表
 export const MODEL_SUPPORTED_OPTIONS: ThinkingOptionConfig = {
-  default: ['none', ...MODEL_SUPPORTED_REASONING_EFFORT.default] as const,
-  o: MODEL_SUPPORTED_REASONING_EFFORT.o,
-  openai_deep_research: MODEL_SUPPORTED_REASONING_EFFORT.openai_deep_research,
-  gpt5: [...MODEL_SUPPORTED_REASONING_EFFORT.gpt5] as const,
-  gpt5pro: MODEL_SUPPORTED_REASONING_EFFORT.gpt5pro,
-  gpt5_codex: MODEL_SUPPORTED_REASONING_EFFORT.gpt5_codex,
-  gpt5_1: MODEL_SUPPORTED_REASONING_EFFORT.gpt5_1,
-  gpt5_1_codex: MODEL_SUPPORTED_REASONING_EFFORT.gpt5_1_codex,
-  grok: MODEL_SUPPORTED_REASONING_EFFORT.grok,
-  grok4_fast: ['none', ...MODEL_SUPPORTED_REASONING_EFFORT.grok4_fast] as const,
-  gemini: ['none', ...MODEL_SUPPORTED_REASONING_EFFORT.gemini] as const,
-  gemini_pro: MODEL_SUPPORTED_REASONING_EFFORT.gemini_pro,
-  gemini3: MODEL_SUPPORTED_REASONING_EFFORT.gemini3,
-  qwen: ['none', ...MODEL_SUPPORTED_REASONING_EFFORT.qwen] as const,
-  qwen_thinking: MODEL_SUPPORTED_REASONING_EFFORT.qwen_thinking,
-  doubao: ['none', ...MODEL_SUPPORTED_REASONING_EFFORT.doubao] as const,
-  doubao_no_auto: ['none', ...MODEL_SUPPORTED_REASONING_EFFORT.doubao_no_auto] as const,
-  doubao_after_251015: MODEL_SUPPORTED_REASONING_EFFORT.doubao_after_251015,
-  hunyuan: ['none', ...MODEL_SUPPORTED_REASONING_EFFORT.hunyuan] as const,
-  zhipu: ['none', ...MODEL_SUPPORTED_REASONING_EFFORT.zhipu] as const,
-  perplexity: MODEL_SUPPORTED_REASONING_EFFORT.perplexity,
-  deepseek_hybrid: ['none', ...MODEL_SUPPORTED_REASONING_EFFORT.deepseek_hybrid] as const
+  default: ['default', 'none', ...MODEL_SUPPORTED_REASONING_EFFORT.default] as const,
+  o: ['default', ...MODEL_SUPPORTED_REASONING_EFFORT.o] as const,
+  openai_deep_research: ['default', ...MODEL_SUPPORTED_REASONING_EFFORT.openai_deep_research] as const,
+  gpt5: ['default', ...MODEL_SUPPORTED_REASONING_EFFORT.gpt5] as const,
+  gpt5pro: ['default', ...MODEL_SUPPORTED_REASONING_EFFORT.gpt5pro] as const,
+  gpt5_codex: ['default', ...MODEL_SUPPORTED_REASONING_EFFORT.gpt5_codex] as const,
+  gpt5_1: ['default', ...MODEL_SUPPORTED_REASONING_EFFORT.gpt5_1] as const,
+  gpt5_1_codex: ['default', ...MODEL_SUPPORTED_REASONING_EFFORT.gpt5_1_codex] as const,
+  gpt5_2: ['default', ...MODEL_SUPPORTED_REASONING_EFFORT.gpt5_2] as const,
+  gpt5_1_codex_max: ['default', ...MODEL_SUPPORTED_REASONING_EFFORT.gpt5_1_codex_max] as const,
+  gpt52pro: ['default', ...MODEL_SUPPORTED_REASONING_EFFORT.gpt52pro] as const,
+  gpt_oss: ['default', ...MODEL_SUPPORTED_REASONING_EFFORT.gpt_oss] as const,
+  grok: ['default', ...MODEL_SUPPORTED_REASONING_EFFORT.grok] as const,
+  grok4_fast: ['default', 'none', ...MODEL_SUPPORTED_REASONING_EFFORT.grok4_fast] as const,
+  gemini2_flash: ['default', 'none', ...MODEL_SUPPORTED_REASONING_EFFORT.gemini2_flash] as const,
+  gemini2_pro: ['default', ...MODEL_SUPPORTED_REASONING_EFFORT.gemini2_pro] as const,
+  gemini3_flash: ['default', ...MODEL_SUPPORTED_REASONING_EFFORT.gemini3_flash] as const,
+  gemini3_pro: ['default', ...MODEL_SUPPORTED_REASONING_EFFORT.gemini3_pro] as const,
+  qwen: ['default', 'none', ...MODEL_SUPPORTED_REASONING_EFFORT.qwen] as const,
+  qwen_thinking: ['default', ...MODEL_SUPPORTED_REASONING_EFFORT.qwen_thinking] as const,
+  doubao: ['default', 'none', ...MODEL_SUPPORTED_REASONING_EFFORT.doubao] as const,
+  doubao_no_auto: ['default', 'none', ...MODEL_SUPPORTED_REASONING_EFFORT.doubao_no_auto] as const,
+  doubao_after_251015: ['default', ...MODEL_SUPPORTED_REASONING_EFFORT.doubao_after_251015] as const,
+  mimo: ['default', 'none', ...MODEL_SUPPORTED_REASONING_EFFORT.mimo] as const,
+  hunyuan: ['default', 'none', ...MODEL_SUPPORTED_REASONING_EFFORT.hunyuan] as const,
+  zhipu: ['default', 'none', ...MODEL_SUPPORTED_REASONING_EFFORT.zhipu] as const,
+  perplexity: ['default', ...MODEL_SUPPORTED_REASONING_EFFORT.perplexity] as const,
+  deepseek_hybrid: ['default', 'none', ...MODEL_SUPPORTED_REASONING_EFFORT.deepseek_hybrid] as const
 } as const
 
 const withModelIdAndNameAsId = <T>(model: Model, fn: (model: Model) => T): { idResult: T; nameResult: T } => {
@@ -84,18 +101,26 @@ const withModelIdAndNameAsId = <T>(model: Model, fn: (model: Model) => T): { idR
   }
 }
 
+// TODO: add ut
 const _getThinkModelType = (model: Model): ThinkingModelType => {
   let thinkingModelType: ThinkingModelType = 'default'
   const modelId = getLowerBaseModelName(model.id)
   if (isOpenAIDeepResearchModel(model)) {
     return 'openai_deep_research'
-  }
-  if (isGPT51SeriesModel(model)) {
+  } else if (isGPT51SeriesModel(model)) {
     if (modelId.includes('codex')) {
       thinkingModelType = 'gpt5_1_codex'
+      if (isGPT51CodexMaxModel(model)) {
+        thinkingModelType = 'gpt5_1_codex_max'
+      }
     } else {
       thinkingModelType = 'gpt5_1'
     }
+  } else if (isGPT52SeriesModel(model)) {
+    thinkingModelType = 'gpt5_2'
+    if (isGPT52ProModel(model)) {
+      thinkingModelType = 'gpt52pro'
+    }
   } else if (isGPT5SeriesModel(model)) {
     if (modelId.includes('codex')) {
       thinkingModelType = 'gpt5_codex'
@@ -105,21 +130,25 @@ const _getThinkModelType = (model: Model): ThinkingModelType => {
         thinkingModelType = 'gpt5pro'
       }
     }
+  } else if (isOpenAIOpenWeightModel(model)) {
+    thinkingModelType = 'gpt_oss'
   } else if (isSupportedReasoningEffortOpenAIModel(model)) {
     thinkingModelType = 'o'
   } else if (isGrok4FastReasoningModel(model)) {
     thinkingModelType = 'grok4_fast'
   } else if (isSupportedThinkingTokenGeminiModel(model)) {
-    if (GEMINI_FLASH_MODEL_REGEX.test(model.id)) {
-      thinkingModelType = 'gemini'
+    if (isGemini3FlashModel(model)) {
+      thinkingModelType = 'gemini3_flash'
+    } else if (isGemini3ProModel(model)) {
+      thinkingModelType = 'gemini3_pro'
+    } else if (GEMINI_FLASH_MODEL_REGEX.test(model.id)) {
+      thinkingModelType = 'gemini2_flash'
     } else {
-      thinkingModelType = 'gemini_pro'
+      thinkingModelType = 'gemini2_pro'
     }
-    if (isGemini3ThinkingTokenModel(model)) {
-      thinkingModelType = 'gemini3'
-    }
-  } else if (isSupportedReasoningEffortGrokModel(model)) thinkingModelType = 'grok'
-  else if (isSupportedThinkingTokenQwenModel(model)) {
+  } else if (isSupportedReasoningEffortGrokModel(model)) {
+    thinkingModelType = 'grok'
+  } else if (isSupportedThinkingTokenQwenModel(model)) {
     if (isQwenAlwaysThinkModel(model)) {
       thinkingModelType = 'qwen_thinking'
     }
@@ -127,15 +156,22 @@ const _getThinkModelType = (model: Model): ThinkingModelType => {
   } else if (isSupportedThinkingTokenDoubaoModel(model)) {
     if (isDoubaoThinkingAutoModel(model)) {
       thinkingModelType = 'doubao'
-    } else if (isDoubaoSeedAfter251015(model)) {
+    } else if (isDoubaoSeedAfter251015(model) || isDoubaoSeed18Model(model)) {
       thinkingModelType = 'doubao_after_251015'
     } else {
       thinkingModelType = 'doubao_no_auto'
     }
-  } else if (isSupportedThinkingTokenHunyuanModel(model)) thinkingModelType = 'hunyuan'
-  else if (isSupportedReasoningEffortPerplexityModel(model)) thinkingModelType = 'perplexity'
-  else if (isSupportedThinkingTokenZhipuModel(model)) thinkingModelType = 'zhipu'
-  else if (isDeepSeekHybridInferenceModel(model)) thinkingModelType = 'deepseek_hybrid'
+  } else if (isSupportedThinkingTokenHunyuanModel(model)) {
+    thinkingModelType = 'hunyuan'
+  } else if (isSupportedReasoningEffortPerplexityModel(model)) {
+    thinkingModelType = 'perplexity'
+  } else if (isSupportedThinkingTokenZhipuModel(model)) {
+    thinkingModelType = 'zhipu'
+  } else if (isDeepSeekHybridInferenceModel(model)) {
+    thinkingModelType = 'deepseek_hybrid'
+  } else if (isSupportedThinkingTokenMiMoModel(model)) {
+    thinkingModelType = 'mimo'
+  }
   return thinkingModelType
 }
 
@@ -148,6 +184,72 @@ export const getThinkModelType = (model: Model): ThinkingModelType => {
   }
 }
 
+const _getModelSupportedReasoningEffortOptions = (model: Model): ReasoningEffortOption[] | undefined => {
+  if (!isSupportedReasoningEffortModel(model) && !isSupportedThinkingTokenModel(model)) {
+    return undefined
+  }
+  // use private function to avoid redundant function calling
+  const thinkingType = _getThinkModelType(model)
+  return MODEL_SUPPORTED_OPTIONS[thinkingType]
+}
+
+/**
+ * Gets the supported reasoning effort options for a given model.
+ *
+ * This function determines which reasoning effort levels a model supports based on its type.
+ * It works with models that support either `reasoning_effort` parameter (like OpenAI o-series)
+ * or thinking token control (like Claude, Gemini, Qwen, etc.).
+ *
+ * The function implements a fallback mechanism: it first checks the model's `id`, and if that
+ * doesn't match any known patterns, it falls back to checking the model's `name`.
+ *
+ * @param model - The model to check for reasoning effort support. Can be undefined or null.
+ * @returns An array of supported reasoning effort options, or undefined if:
+ *          - The model is null/undefined
+ *          - The model doesn't support reasoning effort or thinking tokens
+ *
+ *          All reasoning models support the 'default' option (always the first element),
+ *          which represents no additional configuration for thinking behavior.
+ *
+ * @example
+ * // OpenAI o-series models support default, low, medium, high
+ * getModelSupportedReasoningEffortOptions({ id: 'o3-mini', ... })
+ * // Returns: ['default', 'low', 'medium', 'high']
+ * // 'default' = no additional configuration for thinking behavior
+ *
+ * @example
+ * // GPT-5.1 models support default, none, low, medium, high
+ * getModelSupportedReasoningEffortOptions({ id: 'gpt-5.1', ... })
+ * // Returns: ['default', 'none', 'low', 'medium', 'high']
+ * // 'default' = no additional configuration
+ * // 'none' = explicitly disable reasoning
+ *
+ * @example
+ * // Gemini Flash models support default, none, low, medium, high, auto
+ * getModelSupportedReasoningEffortOptions({ id: 'gemini-2.5-flash-latest', ... })
+ * // Returns: ['default', 'none', 'low', 'medium', 'high', 'auto']
+ * // 'default' = no additional configuration
+ * // 'auto' = let the model automatically decide
+ *
+ * @example
+ * // Non-reasoning models return undefined
+ * getModelSupportedReasoningEffortOptions({ id: 'gpt-4o', ... })
+ * // Returns: undefined
+ *
+ * @example
+ * // Name fallback when id doesn't match
+ * getModelSupportedReasoningEffortOptions({ id: 'custom-id', name: 'gpt-5.1', ... })
+ * // Returns: ['default', 'none', 'low', 'medium', 'high']
+ */
+export const getModelSupportedReasoningEffortOptions = (
+  model: Model | undefined | null
+): ReasoningEffortOption[] | undefined => {
+  if (!model) return undefined
+
+  const { idResult, nameResult } = withModelIdAndNameAsId(model, _getModelSupportedReasoningEffortOptions)
+  return idResult ?? nameResult
+}
+
 function _isSupportedThinkingTokenModel(model: Model): boolean {
   // Specifically for DeepSeek V3.1. White list for now
   if (isDeepSeekHybridInferenceModel(model)) {
@@ -178,17 +280,20 @@ function _isSupportedThinkingTokenModel(model: Model): boolean {
     isSupportedThinkingTokenClaudeModel(model) ||
     isSupportedThinkingTokenDoubaoModel(model) ||
     isSupportedThinkingTokenHunyuanModel(model) ||
-    isSupportedThinkingTokenZhipuModel(model)
+    isSupportedThinkingTokenZhipuModel(model) ||
+    isSupportedThinkingTokenMiMoModel(model)
   )
 }
 
 /** 用于判断是否支持控制思考，但不一定以reasoning_effort的方式 */
+// TODO: rename it
 export function isSupportedThinkingTokenModel(model?: Model): boolean {
   if (!model) return false
   const { idResult, nameResult } = withModelIdAndNameAsId(model, _isSupportedThinkingTokenModel)
   return idResult || nameResult
 }
 
+// TODO: it should be merged in isSupportedThinkingTokenModel
 export function isSupportedReasoningEffortModel(model?: Model): boolean {
   if (!model) {
     return false
@@ -277,6 +382,10 @@ export const GEMINI_THINKING_MODEL_REGEX =
 export const isSupportedThinkingTokenGeminiModel = (model: Model): boolean => {
   const modelId = getLowerBaseModelName(model.id, '/')
   if (GEMINI_THINKING_MODEL_REGEX.test(modelId)) {
+    // ref: https://docs.cloud.google.com/vertex-ai/generative-ai/docs/models/gemini/3-pro-image
+    if (modelId.includes('gemini-3-pro-image')) {
+      return true
+    }
     if (modelId.includes('image') || modelId.includes('tts')) {
       return false
     }
@@ -366,7 +475,7 @@ export function isQwenAlwaysThinkModel(model?: Model): boolean {
 
 // Doubao 支持思考模式的模型正则
 export const DOUBAO_THINKING_MODEL_REGEX =
-  /doubao-(?:1[.-]5-thinking-vision-pro|1[.-]5-thinking-pro-m|seed-1[.-]6(?:-flash)?(?!-(?:thinking)(?:-|$)))(?:-[\w-]+)*/i
+  /doubao-(?:1[.-]5-thinking-vision-pro|1[.-]5-thinking-pro-m|seed-1[.-][68](?:-flash)?(?!-(?:thinking)(?:-|$))|seed-code(?:-preview)?(?:-\d+)?)(?:-[\w-]+)*/i
 
 // 支持 auto 的 Doubao 模型 doubao-seed-1.6-xxx doubao-seed-1-6-xxx  doubao-1-5-thinking-pro-m-xxx
 // Auto thinking is no longer supported after version 251015, see https://console.volcengine.com/ark/region:ark+cn-beijing/model/detail?Id=doubao-seed-1-6
@@ -384,6 +493,11 @@ export function isDoubaoSeedAfter251015(model: Model): boolean {
   return result
 }
 
+export function isDoubaoSeed18Model(model: Model): boolean {
+  const pattern = /doubao-seed-1[.-]8(?:-[\w-]+)?/i
+  return pattern.test(model.id) || pattern.test(model.name)
+}
+
 export function isSupportedThinkingTokenDoubaoModel(model?: Model): boolean {
   if (!model) {
     return false
@@ -462,7 +576,12 @@ export const isSupportedReasoningEffortPerplexityModel = (model: Model): boolean
 
 export const isSupportedThinkingTokenZhipuModel = (model: Model): boolean => {
   const modelId = getLowerBaseModelName(model.id, '/')
-  return ['glm-4.5', 'glm-4.6'].some((id) => modelId.includes(id))
+  return ['glm-4.5', 'glm-4.6', 'glm-4.7'].some((id) => modelId.includes(id))
+}
+
+export const isSupportedThinkingTokenMiMoModel = (model: Model): boolean => {
+  const modelId = getLowerBaseModelName(model.id, '/')
+  return ['mimo-v2-flash'].some((id) => modelId.includes(id))
 }
 
 export const isDeepSeekHybridInferenceModel = (model: Model) => {
@@ -503,6 +622,8 @@ export const isZhipuReasoningModel = (model?: Model): boolean => {
   return isSupportedThinkingTokenZhipuModel(model) || modelId.includes('glm-z1')
 }
 
+export const isMiMoReasoningModel = isSupportedThinkingTokenMiMoModel
+
 export const isStepReasoningModel = (model?: Model): boolean => {
   if (!model) {
     return false
@@ -516,7 +637,7 @@ export const isMiniMaxReasoningModel = (model?: Model): boolean => {
     return false
   }
   const modelId = getLowerBaseModelName(model.id, '/')
-  return (['minimax-m1', 'minimax-m2'] as const).some((id) => modelId.includes(id))
+  return (['minimax-m1', 'minimax-m2', 'minimax-m2.1'] as const).some((id) => modelId.includes(id))
 }
 
 export function isReasoningModel(model?: Model): boolean {
@@ -553,6 +674,7 @@ export function isReasoningModel(model?: Model): boolean {
     isDeepSeekHybridInferenceModel(model) ||
     isLingReasoningModel(model) ||
     isMiniMaxReasoningModel(model) ||
+    isMiMoReasoningModel(model) ||
     modelId.includes('magistral') ||
     modelId.includes('pangu-pro-moe') ||
     modelId.includes('seed-oss') ||
@@ -621,3 +743,20 @@ export const findTokenLimit = (modelId: string): { min: number; max: number } |
  */
 export const isFixedReasoningModel = (model: Model) =>
   isReasoningModel(model) && !isSupportedThinkingTokenModel(model) && !isSupportedReasoningEffortModel(model)
+
+// https://platform.minimaxi.com/docs/guides/text-m2-function-call#openai-sdk
+// https://docs.z.ai/guides/capabilities/thinking-mode
+// https://platform.moonshot.cn/docs/guide/use-kimi-k2-thinking-model#%E5%A4%9A%E6%AD%A5%E5%B7%A5%E5%85%B7%E8%B0%83%E7%94%A8
+const INTERLEAVED_THINKING_MODEL_REGEX =
+  /minimax-m2(.(\d+))?(?:-[\w-]+)?|mimo-v2-flash|glm-4.(\d+)(?:-[\w-]+)?|kimi-k2-thinking?$/i
+
+/**
+ * Determines whether the given model supports interleaved thinking.
+ *
+ * @param model - The model object to check.
+ * @returns `true` if the model's ID matches the interleaved thinking model pattern; otherwise, `false`.
+ */
+export const isInterleavedThinkingModel = (model: Model) => {
+  const modelId = getLowerBaseModelName(model.id)
+  return INTERLEAVED_THINKING_MODEL_REGEX.test(modelId)
+}
diff --git a/src/renderer/src/config/models/tooluse.ts b/src/renderer/src/config/models/tooluse.ts
index c30a8eb4ad..2333db94d8 100644
--- a/src/renderer/src/config/models/tooluse.ts
+++ b/src/renderer/src/config/models/tooluse.ts
@@ -22,14 +22,17 @@ export const FUNCTION_CALLING_MODELS = [
   'deepseek',
   'glm-4(?:-[\\w-]+)?',
   'glm-4.5(?:-[\\w-]+)?',
+  'glm-4.7(?:-[\\w-]+)?',
   'learnlm(?:-[\\w-]+)?',
   'gemini(?:-[\\w-]+)?', // 提前排除了gemini的嵌入模型
   'grok-3(?:-[\\w-]+)?',
-  'doubao-seed-1[.-]6(?:-[\\w-]+)?',
+  'doubao-seed-1[.-][68](?:-[\\w-]+)?',
+  'doubao-seed-code(?:-[\\w-]+)?',
   'kimi-k2(?:-[\\w-]+)?',
   'ling-\\w+(?:-[\\w-]+)?',
   'ring-\\w+(?:-[\\w-]+)?',
-  'minimax-m2'
+  'minimax-m2(?:.1)?',
+  'mimo-v2-flash'
 ] as const
 
 const FUNCTION_CALLING_EXCLUDED_MODELS = [
diff --git a/src/renderer/src/config/models/utils.ts b/src/renderer/src/config/models/utils.ts
index 625a5b5c63..12e85326cd 100644
--- a/src/renderer/src/config/models/utils.ts
+++ b/src/renderer/src/config/models/utils.ts
@@ -1,5 +1,6 @@
 import type OpenAI from '@cherrystudio/openai'
 import { isEmbeddingModel, isRerankModel } from '@renderer/config/models/embedding'
+import type { Assistant } from '@renderer/types'
 import { type Model, SystemProviderIds } from '@renderer/types'
 import type { OpenAIVerbosity, ValidOpenAIVerbosity } from '@renderer/types/aiCoreTypes'
 import { getLowerBaseModelName } from '@renderer/utils'
@@ -8,12 +9,14 @@ import {
   isGPT5ProModel,
   isGPT5SeriesModel,
   isGPT51SeriesModel,
+  isGPT52SeriesModel,
   isOpenAIChatCompletionOnlyModel,
   isOpenAIOpenWeightModel,
   isOpenAIReasoningModel,
   isSupportVerbosityModel
 } from './openai'
 import { isQwenMTModel } from './qwen'
+import { isClaude45ReasoningModel } from './reasoning'
 import { isGenerateImageModel, isTextToImageModel, isVisionModel } from './vision'
 export const NOT_SUPPORTED_REGEX = /(?:^tts|whisper|speech)/i
 export const GEMINI_FLASH_MODEL_REGEX = new RegExp('gemini.*-flash.*$', 'i')
@@ -42,20 +45,77 @@ export function isSupportedModel(model: OpenAI.Models.Model): boolean {
   return !NOT_SUPPORTED_REGEX.test(modelId)
 }
 
-export function isNotSupportTemperatureAndTopP(model: Model): boolean {
+/**
+ * Check if the model supports temperature parameter
+ * @param model - The model to check
+ * @returns true if the model supports temperature parameter
+ */
+export function isSupportTemperatureModel(model: Model | undefined | null, assistant?: Assistant): boolean {
   if (!model) {
-    return true
+    return false
   }
 
-  if (
-    (isOpenAIReasoningModel(model) && !isOpenAIOpenWeightModel(model)) ||
-    isOpenAIChatCompletionOnlyModel(model) ||
-    isQwenMTModel(model)
-  ) {
-    return true
+  // OpenAI reasoning models (except open weight) don't support temperature
+  if (isOpenAIReasoningModel(model) && !isOpenAIOpenWeightModel(model)) {
+    if (isGPT52SeriesModel(model) && assistant?.settings?.reasoning_effort === 'none') {
+      return true
+    }
+    return false
   }
 
-  return false
+  // OpenAI chat completion only models don't support temperature
+  if (isOpenAIChatCompletionOnlyModel(model)) {
+    return false
+  }
+
+  // Qwen MT models don't support temperature
+  if (isQwenMTModel(model)) {
+    return false
+  }
+
+  return true
+}
+
+/**
+ * Check if the model supports top_p parameter
+ * @param model - The model to check
+ * @returns true if the model supports top_p parameter
+ */
+export function isSupportTopPModel(model: Model | undefined | null, assistant?: Assistant): boolean {
+  if (!model) {
+    return false
+  }
+
+  // OpenAI reasoning models (except open weight) don't support top_p
+  if (isOpenAIReasoningModel(model) && !isOpenAIOpenWeightModel(model)) {
+    if (isGPT52SeriesModel(model) && assistant?.settings?.reasoning_effort === 'none') {
+      return true
+    }
+    return false
+  }
+
+  // OpenAI chat completion only models don't support top_p
+  if (isOpenAIChatCompletionOnlyModel(model)) {
+    return false
+  }
+
+  // Qwen MT models don't support top_p
+  if (isQwenMTModel(model)) {
+    return false
+  }
+
+  return true
+}
+
+/**
+ * Check if the model enforces mutual exclusivity between temperature and top_p parameters.
+ * Currently only Claude 4.5 reasoning models require this constraint.
+ * @param model - The model to check
+ * @returns true if temperature and top_p are mutually exclusive for this model
+ */
+export function isTemperatureTopPMutuallyExclusiveModel(model: Model | undefined | null): boolean {
+  if (!model) return false
+  return isClaude45ReasoningModel(model)
 }
 
 export function isGemmaModel(model?: Model): boolean {
@@ -207,3 +267,43 @@ export const isGemini3ThinkingTokenModel = (model: Model) => {
   const modelId = getLowerBaseModelName(model.id)
   return isGemini3Model(model) && !modelId.includes('image')
 }
+
+/**
+ * Check if the model is a Gemini 3 Flash model
+ * Matches: gemini-3-flash, gemini-3-flash-preview, gemini-3-flash-preview-09-2025, gemini-flash-latest (alias)
+ * Excludes: gemini-3-flash-image-preview
+ * @param model - The model to check
+ * @returns true if the model is a Gemini 3 Flash model
+ */
+export const isGemini3FlashModel = (model: Model | undefined | null): boolean => {
+  if (!model) {
+    return false
+  }
+  const modelId = getLowerBaseModelName(model.id)
+  // Check for gemini-flash-latest alias (currently points to gemini-3-flash, may change in future)
+  if (modelId === 'gemini-flash-latest') {
+    return true
+  }
+  // Check for gemini-3-flash with optional suffixes, excluding image variants
+  return /gemini-3-flash(?!-image)(?:-[\w-]+)*$/i.test(modelId)
+}
+
+/**
+ * Check if the model is a Gemini 3 Pro model
+ * Matches: gemini-3-pro, gemini-3-pro-preview, gemini-3-pro-preview-09-2025, gemini-pro-latest (alias)
+ * Excludes: gemini-3-pro-image-preview
+ * @param model - The model to check
+ * @returns true if the model is a Gemini 3 Pro model
+ */
+export const isGemini3ProModel = (model: Model | undefined | null): boolean => {
+  if (!model) {
+    return false
+  }
+  const modelId = getLowerBaseModelName(model.id)
+  // Check for gemini-pro-latest alias (currently points to gemini-3-pro, may change in future)
+  if (modelId === 'gemini-pro-latest') {
+    return true
+  }
+  // Check for gemini-3-pro with optional suffixes, excluding image variants
+  return /gemini-3-pro(?!-image)(?:-[\w-]+)*$/i.test(modelId)
+}
diff --git a/src/renderer/src/config/models/vision.ts b/src/renderer/src/config/models/vision.ts
index 81c6a77c80..d93c677638 100644
--- a/src/renderer/src/config/models/vision.ts
+++ b/src/renderer/src/config/models/vision.ts
@@ -45,7 +45,8 @@ const visionAllowedModels = [
   'deepseek-vl(?:[\\w-]+)?',
   'kimi-latest',
   'gemma-3(?:-[\\w-]+)',
-  'doubao-seed-1[.-]6(?:-[\\w-]+)?',
+  'doubao-seed-1[.-][68](?:-[\\w-]+)?',
+  'doubao-seed-code(?:-[\\w-]+)?',
   'kimi-thinking-preview',
   `gemma3(?:[-:\\w]+)?`,
   'kimi-vl-a3b-thinking(?:-[\\w-]+)?',
@@ -74,12 +75,37 @@ const VISION_REGEX = new RegExp(
   'i'
 )
 
-// For middleware to identify models that must use the dedicated Image API
+// All dedicated image generation models (only generate images, no text chat capability)
+// These models need:
+// 1. Route to dedicated image generation API
+// 2. Exclude from reasoning/websearch/tooluse selection
 const DEDICATED_IMAGE_MODELS = [
-  'grok-2-image(?:-[\\w-]+)?',
+  // OpenAI series
   'dall-e(?:-[\\w-]+)?',
-  'gpt-image-1(?:-[\\w-]+)?',
-  'imagen(?:-[\\w-]+)?'
+  'gpt-image(?:-[\\w-]+)?',
+  // xAI
+  'grok-2-image(?:-[\\w-]+)?',
+  // Google
+  'imagen(?:-[\\w-]+)?',
+  // Stable Diffusion series
+  'flux(?:-[\\w-]+)?',
+  'stable-?diffusion(?:-[\\w-]+)?',
+  'stabilityai(?:-[\\w-]+)?',
+  'sd-[\\w-]+',
+  'sdxl(?:-[\\w-]+)?',
+  // zhipu
+  'cogview(?:-[\\w-]+)?',
+  // Alibaba
+  'qwen-image(?:-[\\w-]+)?',
+  // Others
+  'janus(?:-[\\w-]+)?',
+  'midjourney(?:-[\\w-]+)?',
+  'mj-[\\w-]+',
+  'z-image(?:-[\\w-]+)?',
+  'longcat-image(?:-[\\w-]+)?',
+  'hunyuanimage(?:-[\\w-]+)?',
+  'seedream(?:-[\\w-]+)?',
+  'kandinsky(?:-[\\w-]+)?'
 ]
 
 const IMAGE_ENHANCEMENT_MODELS = [
@@ -132,13 +158,23 @@ const GENERATE_IMAGE_MODELS_REGEX = new RegExp(GENERATE_IMAGE_MODELS.join('|'),
 
 const MODERN_GENERATE_IMAGE_MODELS_REGEX = new RegExp(MODERN_IMAGE_MODELS.join('|'), 'i')
 
-export const isDedicatedImageGenerationModel = (model: Model): boolean => {
+/**
+ * Check if the model is a dedicated image generation model
+ * Dedicated image generation models can only generate images, no text chat capability
+ *
+ * These models need:
+ * 1. Route to dedicated image generation API
+ * 2. Exclude from reasoning/websearch/tooluse selection
+ */
+export function isDedicatedImageModel(model: Model): boolean {
   if (!model) return false
-
   const modelId = getLowerBaseModelName(model.id)
   return DEDICATED_IMAGE_MODELS_REGEX.test(modelId)
 }
 
+// Backward compatible aliases
+export const isDedicatedImageGenerationModel = isDedicatedImageModel
+
 export const isAutoEnableImageGenerationModel = (model: Model): boolean => {
   if (!model) return false
 
@@ -194,14 +230,8 @@ export function isPureGenerateImageModel(model: Model): boolean {
   return !OPENAI_TOOL_USE_IMAGE_GENERATION_MODELS.some((m) => modelId.includes(m))
 }
 
-// TODO: refine the regex
-// Text to image models
-const TEXT_TO_IMAGE_REGEX = /flux|diffusion|stabilityai|sd-|dall|cogview|janus|midjourney|mj-|imagen|gpt-image/i
-
-export function isTextToImageModel(model: Model): boolean {
-  const modelId = getLowerBaseModelName(model.id)
-  return TEXT_TO_IMAGE_REGEX.test(modelId)
-}
+// Backward compatible alias - now uses unified dedicated image model detection
+export const isTextToImageModel = isDedicatedImageModel
 
 /**
  * 判断模型是否支持图片增强（包括编辑、增强、修复等）
diff --git a/src/renderer/src/config/prompts.ts b/src/renderer/src/config/prompts.ts
index 926a138f14..815eb7d113 100644
--- a/src/renderer/src/config/prompts.ts
+++ b/src/renderer/src/config/prompts.ts
@@ -306,7 +306,7 @@ export const SEARCH_SUMMARY_PROMPT_KNOWLEDGE_ONLY = `
   **Use user's language to rephrase the question.**
   Follow these guidelines:
   1. If the question is a simple writing task, greeting (e.g., Hi, Hello, How are you), or does not require searching for information (unless the greeting contains a follow-up question), return 'not_needed' in the 'question' XML block. This indicates that no search is required.
-  2. For knowledge, You need rewrite user query into 'rewrite' XML block with one alternative version while preserving the original intent and meaning. Also include the original question in the 'question' block.
+  2. For knowledge, You need rewrite user query into 'rewrite' XML block with one alternative version while preserving the original intent and meaning. Also include the rephrased or decomposed question(s) in the 'question' block.
   3. Always return the rephrased question inside the 'question' XML block.
   4. Always wrap the rephrased question in the appropriate XML blocks: use <knowledge></knowledge> for queries that can be answered from a pre-existing knowledge base. Ensure that the rephrased question is always contained within a <question></question> block inside the wrapper.
   5. *use knowledge to rephrase the question*
diff --git a/src/renderer/src/config/providers.ts b/src/renderer/src/config/providers.ts
index bc32ef3490..f49794aaa7 100644
--- a/src/renderer/src/config/providers.ts
+++ b/src/renderer/src/config/providers.ts
@@ -31,6 +31,7 @@ import JinaProviderLogo from '@renderer/assets/images/providers/jina.png'
 import LanyunProviderLogo from '@renderer/assets/images/providers/lanyun.png'
 import LMStudioProviderLogo from '@renderer/assets/images/providers/lmstudio.png'
 import LongCatProviderLogo from '@renderer/assets/images/providers/longcat.png'
+import MiMoProviderLogo from '@renderer/assets/images/providers/mimo.svg'
 import MinimaxProviderLogo from '@renderer/assets/images/providers/minimax.png'
 import MistralProviderLogo from '@renderer/assets/images/providers/mistral.png'
 import ModelScopeProviderLogo from '@renderer/assets/images/providers/modelscope.png'
@@ -106,7 +107,7 @@ export const SYSTEM_PROVIDERS_CONFIG: Record<SystemProviderId, SystemProvider> =
     type: 'openai',
     apiKey: '',
     apiHost: 'https://aihubmix.com',
-    anthropicApiHost: 'https://aihubmix.com/anthropic',
+    anthropicApiHost: 'https://aihubmix.com',
     models: SYSTEM_MODELS.aihubmix,
     isSystem: true,
     enabled: false
@@ -199,7 +200,8 @@ export const SYSTEM_PROVIDERS_CONFIG: Record<SystemProviderId, SystemProvider> =
     name: 'TokenFlux',
     type: 'openai',
     apiKey: '',
-    apiHost: 'https://tokenflux.ai',
+    apiHost: 'https://api.tokenflux.ai/openai/v1',
+    anthropicApiHost: 'https://api.tokenflux.ai/anthropic',
     models: SYSTEM_MODELS.tokenflux,
     isSystem: true,
     enabled: false
@@ -210,6 +212,7 @@ export const SYSTEM_PROVIDERS_CONFIG: Record<SystemProviderId, SystemProvider> =
     type: 'openai',
     apiKey: '',
     apiHost: 'https://api.302.ai',
+    anthropicApiHost: 'https://api.302.ai',
     models: SYSTEM_MODELS['302ai'],
     isSystem: true,
     enabled: false
@@ -288,7 +291,7 @@ export const SYSTEM_PROVIDERS_CONFIG: Record<SystemProviderId, SystemProvider> =
   ollama: {
     id: 'ollama',
     name: 'Ollama',
-    type: 'openai',
+    type: 'ollama',
     apiKey: '',
     apiHost: 'http://localhost:11434',
     models: SYSTEM_MODELS.ollama,
@@ -695,6 +698,17 @@ export const SYSTEM_PROVIDERS_CONFIG: Record<SystemProviderId, SystemProvider> =
     models: SYSTEM_MODELS.cerebras,
     isSystem: true,
     enabled: false
+  },
+  mimo: {
+    id: 'mimo',
+    name: 'Xiaomi MiMo',
+    type: 'openai',
+    apiKey: '',
+    apiHost: 'https://api.xiaomimimo.com',
+    anthropicApiHost: 'https://api.xiaomimimo.com/anthropic',
+    models: SYSTEM_MODELS.mimo,
+    isSystem: true,
+    enabled: false
   }
 } as const
 
@@ -763,7 +777,8 @@ export const PROVIDER_LOGO_MAP: AtLeast<SystemProviderId, string> = {
   huggingface: HuggingfaceProviderLogo,
   sophnet: SophnetProviderLogo,
   gateway: AIGatewayProviderLogo,
-  cerebras: CerebrasProviderLogo
+  cerebras: CerebrasProviderLogo,
+  mimo: MiMoProviderLogo
 } as const
 
 export function getProviderLogo(providerId: string) {
@@ -1075,7 +1090,7 @@ export const PROVIDER_URLS: Record<SystemProviderId, ProviderUrls> = {
     websites: {
       official: 'https://platform.minimaxi.com/',
       apiKey: 'https://platform.minimaxi.com/user-center/basic-information/interface-key',
-      docs: 'https://platform.minimaxi.com/document/Announcement',
+      docs: 'https://platform.minimaxi.com/docs/api-reference/text-openai-api',
       models: 'https://platform.minimaxi.com/document/Models'
     }
   },
@@ -1434,5 +1449,16 @@ export const PROVIDER_URLS: Record<SystemProviderId, ProviderUrls> = {
       docs: 'https://inference-docs.cerebras.ai/introduction',
       models: 'https://inference-docs.cerebras.ai/models/overview'
     }
+  },
+  mimo: {
+    api: {
+      url: 'https://api.xiaomimimo.com'
+    },
+    websites: {
+      official: 'https://platform.xiaomimimo.com/',
+      apiKey: 'https://platform.xiaomimimo.com/#/console/usage',
+      docs: 'https://platform.xiaomimimo.com/#/docs/welcome',
+      models: 'https://platform.xiaomimimo.com/'
+    }
   }
 }
diff --git a/src/renderer/src/config/webSearchProviders.ts b/src/renderer/src/config/webSearchProviders.ts
index 1ce3297afb..169ae35930 100644
--- a/src/renderer/src/config/webSearchProviders.ts
+++ b/src/renderer/src/config/webSearchProviders.ts
@@ -31,6 +31,11 @@ export const WEB_SEARCH_PROVIDER_CONFIG: Record<WebSearchProviderId, WebSearchPr
       apiKey: 'https://dashboard.exa.ai/api-keys'
     }
   },
+  'exa-mcp': {
+    websites: {
+      official: 'https://exa.ai'
+    }
+  },
   bocha: {
     websites: {
       official: 'https://bochaai.com',
@@ -80,6 +85,11 @@ export const WEB_SEARCH_PROVIDERS: WebSearchProvider[] = [
     apiHost: 'https://api.exa.ai',
     apiKey: ''
   },
+  {
+    id: 'exa-mcp',
+    name: 'ExaMCP',
+    apiHost: 'https://mcp.exa.ai/mcp'
+  },
   {
     id: 'bocha',
     name: 'Bocha',
diff --git a/src/renderer/src/context/AntdProvider.tsx b/src/renderer/src/context/AntdProvider.tsx
index 685b3b0fbd..7fa1fbd79a 100644
--- a/src/renderer/src/context/AntdProvider.tsx
+++ b/src/renderer/src/context/AntdProvider.tsx
@@ -8,6 +8,7 @@ import esES from 'antd/locale/es_ES'
 import frFR from 'antd/locale/fr_FR'
 import jaJP from 'antd/locale/ja_JP'
 import ptPT from 'antd/locale/pt_PT'
+import roRO from 'antd/locale/ro_RO'
 import ruRU from 'antd/locale/ru_RU'
 import zhCN from 'antd/locale/zh_CN'
 import zhTW from 'antd/locale/zh_TW'
@@ -141,6 +142,8 @@ function getAntdLocale(language: LanguageVarious) {
       return frFR
     case 'pt-PT':
       return ptPT
+    case 'ro-RO':
+      return roRO
     default:
       return zhCN
   }
diff --git a/src/renderer/src/databases/index.ts b/src/renderer/src/databases/index.ts
index fc47e37cb7..f70b81673f 100644
--- a/src/renderer/src/databases/index.ts
+++ b/src/renderer/src/databases/index.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type {
   CustomTranslateLanguage,
   FileMetadata,
diff --git a/src/renderer/src/databases/upgrades.ts b/src/renderer/src/databases/upgrades.ts
index 8f952e245b..83e77e7c42 100644
--- a/src/renderer/src/databases/upgrades.ts
+++ b/src/renderer/src/databases/upgrades.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { loggerService } from '@logger'
 import { LanguagesEnum } from '@renderer/config/translate'
 import type { LegacyMessage as OldMessage, Topic, TranslateLanguageCode } from '@renderer/types'
diff --git a/src/renderer/src/hooks/useAppInit.ts b/src/renderer/src/hooks/useAppInit.ts
index 3ee9392ce5..360f8a5e2a 100644
--- a/src/renderer/src/hooks/useAppInit.ts
+++ b/src/renderer/src/hooks/useAppInit.ts
@@ -268,9 +268,7 @@ export function useAppInit() {
   // Update memory service configuration when it changes
   useEffect(() => {
     const memoryService = MemoryService.getInstance()
-    memoryService.updateConfig().catch((error) => {
-      logger.error('Failed to update memory config:', error)
-    })
+    memoryService.updateConfig().catch((error) => logger.error('Failed to update memory config:', error))
   }, [memoryConfig])
 
   useEffect(() => {
diff --git a/src/renderer/src/hooks/useKnowledge.ts b/src/renderer/src/hooks/useKnowledge.ts
index 464195aff3..1553163396 100644
--- a/src/renderer/src/hooks/useKnowledge.ts
+++ b/src/renderer/src/hooks/useKnowledge.ts
@@ -163,6 +163,7 @@ export const useKnowledge = (baseId: string) => {
         processingProgress: 0,
         processingError: '',
         uniqueId: undefined,
+        retryCount: 0,
         updated_at: Date.now()
       })
       checkAllBases()
@@ -182,6 +183,7 @@ export const useKnowledge = (baseId: string) => {
       processingProgress: 0,
       processingError: '',
       uniqueId: undefined,
+      retryCount: 0,
       updated_at: Date.now()
     })
     setTimeout(() => KnowledgeQueue.checkAllBases(), 0)
diff --git a/src/renderer/src/hooks/useSettings.ts b/src/renderer/src/hooks/useSettings.ts
index 55d40e435d..3a3de7f89a 100644
--- a/src/renderer/src/hooks/useSettings.ts
+++ b/src/renderer/src/hooks/useSettings.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import store, { useAppDispatch, useAppSelector } from '@renderer/store'
 import type { AssistantIconType, SendMessageShortcut, SettingsState } from '@renderer/store/settings'
 import {
diff --git a/src/renderer/src/hooks/useShortcuts.ts b/src/renderer/src/hooks/useShortcuts.ts
index ef92a5f970..ea1c0cab67 100644
--- a/src/renderer/src/hooks/useShortcuts.ts
+++ b/src/renderer/src/hooks/useShortcuts.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { isMac, isWin } from '@renderer/config/constant'
 import { useAppSelector } from '@renderer/store'
 import { orderBy } from 'lodash'
diff --git a/src/renderer/src/hooks/useSmoothStream.ts b/src/renderer/src/hooks/useSmoothStream.ts
index 2fffd92b8f..0c96f1b25e 100644
--- a/src/renderer/src/hooks/useSmoothStream.ts
+++ b/src/renderer/src/hooks/useSmoothStream.ts
@@ -7,7 +7,7 @@ interface UseSmoothStreamOptions {
   initialText?: string
 }
 
-const languages = ['en-US', 'de-DE', 'es-ES', 'zh-CN', 'zh-TW', 'ja-JP', 'ru-RU', 'el-GR', 'fr-FR', 'pt-PT']
+const languages = ['en-US', 'de-DE', 'es-ES', 'zh-CN', 'zh-TW', 'ja-JP', 'ru-RU', 'el-GR', 'fr-FR', 'pt-PT', 'ro-RO']
 const segmenter = new Intl.Segmenter(languages)
 
 export const useSmoothStream = ({ onUpdate, streamDone, minDelay = 10, initialText = '' }: UseSmoothStreamOptions) => {
diff --git a/src/renderer/src/hooks/useStore.ts b/src/renderer/src/hooks/useStore.ts
index bb77e1f0da..55720b60e6 100644
--- a/src/renderer/src/hooks/useStore.ts
+++ b/src/renderer/src/hooks/useStore.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { CHERRYAI_PROVIDER } from '@renderer/config/providers'
 import store, { useAppDispatch, useAppSelector } from '@renderer/store'
 import {
diff --git a/src/renderer/src/hooks/useTranslate.ts b/src/renderer/src/hooks/useTranslate.ts
index 6191560d3d..8b4f7147bb 100644
--- a/src/renderer/src/hooks/useTranslate.ts
+++ b/src/renderer/src/hooks/useTranslate.ts
@@ -36,18 +36,16 @@ export default function useTranslate() {
 
   const getLanguageByLangcode = useCallback(
     (langCode: string) => {
-      if (!isLoaded) {
-        logger.verbose('Translate languages are not loaded yet. Return UNKNOWN.')
-        return UNKNOWN
-      }
-
       const result = translateLanguages.find((item) => item.langCode === langCode)
+
       if (result) {
         return result
+      } else if (!isLoaded) {
+        logger.verbose('Translate languages are not loaded yet. Return UNKNOWN.')
       } else {
         logger.warn(`Unknown language ${langCode}`)
-        return UNKNOWN
       }
+      return UNKNOWN
     },
     [isLoaded, translateLanguages]
   )
@@ -63,6 +61,7 @@ export default function useTranslate() {
     prompt,
     settings,
     translateLanguages,
+    isLoaded,
     getLanguageByLangcode,
     updateSettings: handleUpdateSettings
   }
diff --git a/src/renderer/src/i18n/index.ts b/src/renderer/src/i18n/index.ts
index f2e6e7424f..5b8e1cc7ac 100644
--- a/src/renderer/src/i18n/index.ts
+++ b/src/renderer/src/i18n/index.ts
@@ -14,6 +14,7 @@ import esES from './translate/es-es.json'
 import frFR from './translate/fr-fr.json'
 import jaJP from './translate/ja-jp.json'
 import ptPT from './translate/pt-pt.json'
+import roRO from './translate/ro-ro.json'
 import ruRU from './translate/ru-ru.json'
 
 const logger = loggerService.withContext('I18N')
@@ -29,7 +30,8 @@ const resources = Object.fromEntries(
     ['el-GR', elGR],
     ['es-ES', esES],
     ['fr-FR', frFR],
-    ['pt-PT', ptPT]
+    ['pt-PT', ptPT],
+    ['ro-RO', roRO]
   ].map(([locale, translation]) => [locale, { translation }])
 )
 
diff --git a/src/renderer/src/i18n/label.ts b/src/renderer/src/i18n/label.ts
index 7a6ad843d4..2e6f84026e 100644
--- a/src/renderer/src/i18n/label.ts
+++ b/src/renderer/src/i18n/label.ts
@@ -5,7 +5,7 @@
  */
 
 import { loggerService } from '@logger'
-import type { AgentType, BuiltinMCPServerName, BuiltinOcrProviderId, ThinkingOption } from '@renderer/types'
+import type { AgentType, BuiltinMCPServerName, BuiltinOcrProviderId } from '@renderer/types'
 import { BuiltinMCPServerNames } from '@renderer/types'
 
 import i18n from './index'
@@ -88,7 +88,8 @@ const providerKeyMap = {
   huggingface: 'provider.huggingface',
   sophnet: 'provider.sophnet',
   gateway: 'provider.ai-gateway',
-  cerebras: 'provider.cerebras'
+  cerebras: 'provider.cerebras',
+  mimo: 'provider.mimo'
 } as const
 
 /**
@@ -310,19 +311,6 @@ export const getHttpMessageLabel = (key: string): string => {
   return getLabel(httpMessageKeyMap, key)
 }
 
-const reasoningEffortOptionsKeyMap: Record<ThinkingOption, string> = {
-  none: 'assistants.settings.reasoning_effort.off',
-  minimal: 'assistants.settings.reasoning_effort.minimal',
-  high: 'assistants.settings.reasoning_effort.high',
-  low: 'assistants.settings.reasoning_effort.low',
-  medium: 'assistants.settings.reasoning_effort.medium',
-  auto: 'assistants.settings.reasoning_effort.default'
-} as const
-
-export const getReasoningEffortOptionsLabel = (key: string): string => {
-  return getLabel(reasoningEffortOptionsKeyMap, key)
-}
-
 const fileFieldKeyMap = {
   created_at: 'files.created_at',
   size: 'files.size',
@@ -342,7 +330,9 @@ const builtInMcpDescriptionKeyMap: Record<BuiltinMCPServerName, string> = {
   [BuiltinMCPServerNames.filesystem]: 'settings.mcp.builtinServersDescriptions.filesystem',
   [BuiltinMCPServerNames.difyKnowledge]: 'settings.mcp.builtinServersDescriptions.dify_knowledge',
   [BuiltinMCPServerNames.python]: 'settings.mcp.builtinServersDescriptions.python',
-  [BuiltinMCPServerNames.didiMCP]: 'settings.mcp.builtinServersDescriptions.didi_mcp'
+  [BuiltinMCPServerNames.didiMCP]: 'settings.mcp.builtinServersDescriptions.didi_mcp',
+  [BuiltinMCPServerNames.browser]: 'settings.mcp.builtinServersDescriptions.browser',
+  [BuiltinMCPServerNames.nowledgeMem]: 'settings.mcp.builtinServersDescriptions.nowledge_mem'
 } as const
 
 export const getBuiltInMcpServerDescriptionLabel = (key: string): string => {
diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index b7dd0a74cb..995231f225 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -6,6 +6,9 @@
         "failed": "Failed to add a agent",
         "invalid_agent": "Invalid Agent"
       },
+      "model": {
+        "tooltip": "Currently, only models that support Anthropic endpoints are available for the Agent feature."
+      },
       "title": "Add Agent",
       "type": {
         "placeholder": "Select an agent type"
@@ -28,13 +31,31 @@
       }
     },
     "gitBash": {
+      "autoDetected": "Using auto-detected Git Bash",
+      "autoDiscoveredHint": "Auto-discovered",
+      "clear": {
+        "button": "Clear custom path"
+      },
+      "customPath": "Using custom path: {{path}}",
       "error": {
         "description": "Git Bash is required to run agents on Windows. The agent cannot function without it. Please install Git for Windows from",
         "recheck": "Recheck Git Bash Installation",
+        "required": "Git Bash path is required on Windows",
         "title": "Git Bash Required"
       },
+      "found": {
+        "title": "Git Bash configured"
+      },
       "notFound": "Git Bash not found. Please install it first.",
-      "success": "Git Bash detected successfully!"
+      "pick": {
+        "button": "Select Git Bash Path",
+        "failed": "Failed to set Git Bash path",
+        "invalidPath": "Selected file is not a valid Git Bash executable (bash.exe).",
+        "title": "Select Git Bash executable"
+      },
+      "placeholder": "Select bash.exe path",
+      "success": "Git Bash detected successfully!",
+      "tooltip": "Git Bash is required to run agents on Windows. Install from git-scm.com if not available."
     },
     "input": {
       "placeholder": "Enter your message here, send with {{key}} - @ select path, / select command"
@@ -399,6 +420,9 @@
     },
     "delete": {
       "content": "Deleting an assistant will delete all topics and files under the assistant. Are you sure you want to delete it?",
+      "error": {
+        "remain_one": "Not allowed to delete the last one assistant"
+      },
       "title": "Delete Assistant"
     },
     "edit": {
@@ -455,6 +479,7 @@
         "button": "Import",
         "error": {
           "fetch_failed": "Failed to fetch from URL",
+          "file_required": "Please select a file first",
           "invalid_format": "Invalid assistant format: missing required fields",
           "url_required": "Please enter a URL"
         },
@@ -468,6 +493,17 @@
         "url_placeholder": "Enter JSON URL"
       },
       "manage": {
+        "batch_delete": {
+          "button": "Delete",
+          "confirm": "Are you sure you want to delete the selected {{count}} assistants?"
+        },
+        "batch_export": {
+          "button": "Export"
+        },
+        "mode": {
+          "manage": "Manage",
+          "sort": "Sort"
+        },
         "title": "Manage Assistants"
       },
       "my_agents": "My Assistants",
@@ -515,13 +551,23 @@
       "more": "Assistant Settings",
       "prompt": "Prompt Settings",
       "reasoning_effort": {
+        "auto": "Auto",
+        "auto_description": "Flexibly determine reasoning effort",
         "default": "Default",
+        "default_description": "Depend on the model's default behavior, without any configuration.",
         "high": "High",
+        "high_description": "High level reasoning",
         "label": "Reasoning effort",
         "low": "Low",
+        "low_description": "Low level reasoning",
         "medium": "Medium",
+        "medium_description": "Medium level reasoning",
         "minimal": "Minimal",
-        "off": "Off"
+        "minimal_description": "Minimal reasoning",
+        "off": "Off",
+        "off_description": "Disable reasoning",
+        "xhigh": "Extra High",
+        "xhigh_description": "Extra high level reasoning"
       },
       "regular_phrases": {
         "add": "Add Phrase",
@@ -1001,6 +1047,29 @@
         "yuque": "Export to Yuque"
       },
       "list": "Topic List",
+      "manage": {
+        "clear_selection": "Clear Selection",
+        "delete": {
+          "confirm": {
+            "content": "Are you sure you want to delete {{count}} selected topic(s)? This action cannot be undone.",
+            "title": "Delete Topics"
+          },
+          "success": "Deleted {{count}} topic(s)"
+        },
+        "deselect_all": "Deselect All",
+        "error": {
+          "at_least_one": "At least one topic must be kept"
+        },
+        "move": {
+          "button": "Move",
+          "placeholder": "Select target assistant",
+          "success": "Moved {{count}} topic(s)"
+        },
+        "pinned": "Pinned Topics",
+        "selected_count": "{{count}} selected",
+        "title": "Manage Topics",
+        "unpinned": "Unpinned Topics"
+      },
       "move_to": "Move to",
       "new": "New Topic",
       "pin": "Pin Topic",
@@ -1011,6 +1080,10 @@
         "label": "Topic Prompts",
         "tips": "Topic Prompts: Additional supplementary prompts provided for the current topic"
       },
+      "search": {
+        "placeholder": "Search topics...",
+        "title": "Search"
+      },
       "title": "Topics",
       "unpin": "Unpin Topic"
     },
@@ -1182,6 +1255,7 @@
     "saved": "Saved",
     "search": "Search",
     "select": "Select",
+    "select_all": "Select All",
     "selected": "Selected",
     "selectedItems": "Selected {{count}} items",
     "selectedMessages": "Selected {{count}} messages",
@@ -1194,11 +1268,13 @@
       }
     },
     "stop": "Stop",
+    "subscribe": "Subscribe",
     "success": "Success",
     "swap": "Swap",
     "topics": "Topics",
     "unknown": "Unknown",
     "unnamed": "Unnamed",
+    "unsubscribe": "Unsubscribe",
     "update_success": "Update successfully",
     "upload_files": "Upload file",
     "warning": "Warning",
@@ -1693,7 +1769,7 @@
       "import": {
         "error": "Import failed"
       },
-      "imported": "Imported successfully"
+      "imported": "Successfully imported {{count}} assistant(s)"
     },
     "api": {
       "check": {
@@ -2125,6 +2201,7 @@
     "collapse": "Collapse",
     "content_placeholder": "Please enter the note content...",
     "copyContent": "Copy Content",
+    "crossPlatformRestoreWarning": "Cross-platform configuration restored, but notes directory is empty. Please copy your note files to: {{path}}",
     "delete": "delete",
     "delete_confirm": "Are you sure you want to delete this {{type}}?",
     "delete_folder_confirm": "Are you sure you want to delete the folder \"{{name}}\" and all of its contents?",
@@ -2307,7 +2384,7 @@
     "failed": {
       "install": "Install OVMS failed:",
       "install_code_100": "Unknown Error",
-      "install_code_101": "Only supports Intel(R) Core(TM) Ultra CPU",
+      "install_code_101": "Only supports Intel(R) CPU",
       "install_code_102": "Only supports Windows",
       "install_code_103": "Download OVMS runtime failed",
       "install_code_104": "Failed to install OVMS runtime",
@@ -2521,7 +2598,8 @@
   },
   "preview": {
     "copy": {
-      "image": "Copy as image"
+      "image": "Copy as image",
+      "src": "Copy Image Source"
     },
     "dialog": "Open Dialog",
     "label": "Preview",
@@ -2575,6 +2653,7 @@
     "lanyun": "LANYUN",
     "lmstudio": "LM Studio",
     "longcat": "LongCat AI",
+    "mimo": "Xiaomi MiMo",
     "minimax": "MiniMax",
     "mistral": "Mistral",
     "modelscope": "ModelScope",
@@ -3093,6 +3172,7 @@
         "label": "App Data",
         "migration_title": "Data Migration",
         "new_path": "New Path",
+        "open": "Open Directory",
         "original_path": "Original Path",
         "path_change_failed": "Failed to change data directory",
         "path_changed_without_copy": "Path changed successfully",
@@ -3163,24 +3243,43 @@
         },
         "content": "Export some data, including chat logs and settings. Please note that the backup process may take some time. Thank you for your patience.",
         "lan": {
-          "auto_close_tip": "Auto-closing in {{seconds}} seconds...",
-          "confirm_close_message": "File transfer is in progress. Closing will interrupt the transfer. Are you sure you want to force close?",
-          "confirm_close_title": "Confirm Close",
           "connected": "Connected",
           "connection_failed": "Connection failed",
-          "content": "Please ensure your computer and phone are on the same network for LAN transfer. Open the Cherry Studio App to scan this QR code.",
+          "content": "Please ensure your computer and phone are on the same network for LAN transfer.",
+          "device_list_title": "Local network devices",
+          "discovered_devices": "Discovered devices",
           "error": {
+            "file_too_large": "File too large, maximum 500MB supported",
             "init_failed": "Initialization failed",
+            "invalid_file_type": "Only ZIP files are supported",
             "no_file": "No file selected",
             "no_ip": "Unable to get IP address",
+            "not_connected": "Please complete handshake first",
             "send_failed": "Failed to send file"
           },
-          "force_close": "Force Close",
-          "generating_qr": "Generating QR code...",
-          "noZipSelected": "No compressed file selected",
-          "scan_qr": "Please scan QR code with your phone",
-          "selectZip": "Select a compressed file",
-          "sendZip": "Begin data recovery",
+          "file_transfer": {
+            "cancelled": "Transfer cancelled",
+            "failed": "File transfer failed: {{message}}",
+            "progress": "Sending... {{progress}}%",
+            "success": "File sent successfully"
+          },
+          "handshake": {
+            "button": "Handshake",
+            "failed": "Handshake failed: {{message}}",
+            "in_progress": "Handshaking...",
+            "success": "Handshake completed with {{device}}",
+            "test_message_received": "Received pong from {{device}}",
+            "test_message_sent": "Sent hello world test payload"
+          },
+          "idle_hint": "Scan paused. Start scanning to find Cherry Studio peers on your LAN.",
+          "ip_addresses": "IP addresses",
+          "last_seen": "Last seen at {{time}}",
+          "metadata": "Metadata",
+          "no_connection_warning": "Please open LAN Transfer on Cherry Studio mobile",
+          "no_devices": "No LAN peers found yet",
+          "scan_devices": "Scan devices",
+          "scanning_hint": "Scanning your local network for Cherry Studio peers...",
+          "send_file": "Send File",
           "status": {
             "completed": "Transfer completed",
             "connected": "Connected",
@@ -3189,9 +3288,11 @@
             "error": "Connection error",
             "initializing": "Initializing connection...",
             "preparing": "Preparing transfer...",
-            "sending": "Transferring {{progress}}%",
-            "waiting_qr_scan": "Please scan QR code to connect"
+            "sending": "Transferring {{progress}}%"
           },
+          "status_badge_idle": "Idle",
+          "status_badge_scanning": "Scanning",
+          "stop_scan": "Stop scan",
           "title": "LAN transmission",
           "transfer_progress": "Transfer progress"
         },
@@ -3863,6 +3964,7 @@
       "builtinServers": "Builtin Servers",
       "builtinServersDescriptions": {
         "brave_search": "An MCP server implementation integrating the Brave Search API, providing both web and local search functionalities. Requires configuring the BRAVE_API_KEY environment variable",
+        "browser": "Control a headless Electron window via Chrome DevTools Protocol. Tools: open URL, execute single-line JS, reset session.",
         "didi_mcp": "DiDi MCP server providing ride-hailing services including map search, price estimation, order management, and driver tracking. Only available in Mainland China. Requires configuring the DIDI_API_KEY environment variable",
         "dify_knowledge": "Dify's MCP server implementation provides a simple API to interact with Dify. Requires configuring the Dify Key",
         "fetch": "MCP server for retrieving URL web content",
@@ -3870,6 +3972,7 @@
         "mcp_auto_install": "Automatically install MCP service (beta)",
         "memory": "Persistent memory implementation based on a local knowledge graph. This enables the model to remember user-related information across different conversations. Requires configuring the MEMORY_FILE_PATH environment variable.",
         "no": "No description",
+        "nowledge_mem": "Requires Nowledge Mem app running locally. Keeps AI chats, tools, notes, agents, and files in private memory on your computer. Download from https://mem.nowledge.co/",
         "python": "Execute Python code in a secure sandbox environment. Run Python with Pyodide, supporting most standard libraries and scientific computing packages",
         "sequentialthinking": "A MCP server implementation that provides tools for dynamic and reflective problem solving through structured thinking processes"
       },
@@ -3915,6 +4018,7 @@
       "jsonSaveError": "Failed to save JSON configuration.",
       "jsonSaveSuccess": "JSON configuration has been saved.",
       "logoUrl": "Logo URL",
+      "logs": "Logs",
       "longRunning": "Long Running Mode",
       "longRunningTooltip": "When enabled, the server supports long-running tasks. When receiving progress notifications, the timeout will be reset and the maximum execution time will be extended to 10 minutes.",
       "marketplaces": "Marketplaces",
@@ -3934,6 +4038,7 @@
       "name": "Name",
       "newServer": "MCP Server",
       "noDescriptionAvailable": "No description available",
+      "noLogs": "No logs yet",
       "noServers": "No servers configured",
       "not_support": "Model not supported",
       "npx_list": {
@@ -4028,7 +4133,7 @@
       "tagsPlaceholder": "Enter tags",
       "timeout": "Timeout",
       "timeoutTooltip": "Timeout in seconds for requests to this server, default is 60 seconds",
-      "title": "MCP",
+      "title": "MCP Servers",
       "tools": {
         "autoApprove": {
           "label": "Auto Approve",
@@ -4662,6 +4767,12 @@
       },
       "title": "Other Settings",
       "websearch": {
+        "api_key_required": {
+          "content": "{{provider}} requires an API key to work. Would you like to configure it now?",
+          "ok": "Configure",
+          "title": "API Key Required"
+        },
+        "api_providers": "API Providers",
         "apikey": "API key",
         "blacklist": "Blacklist",
         "blacklist_description": "Results from the following websites will not appear in search results",
@@ -4703,7 +4814,15 @@
         },
         "content_limit": "Content length limit",
         "content_limit_tooltip": "Limit the content length of the search results; content that exceeds the limit will be truncated.",
+        "default_provider": "Default Provider",
         "free": "Free",
+        "is_default": "Default",
+        "local_provider": {
+          "hint": "Log in to the website to get better search results and personalize your search settings.",
+          "open_settings": "Open {{provider}} Settings",
+          "settings": "Local Search Settings"
+        },
+        "local_providers": "Local Providers",
         "no_provider_selected": "Please select a search service provider before checking.",
         "overwrite": "Override search service",
         "overwrite_tooltip": "Force use search service instead of LLM",
@@ -4714,6 +4833,7 @@
         "search_provider": "Search service provider",
         "search_provider_placeholder": "Choose a search service provider.",
         "search_with_time": "Search with dates included",
+        "set_as_default": "Set as Default",
         "subscribe": "Blacklist Subscription",
         "subscribe_add": "Add Subscription",
         "subscribe_add_failed": "Failed to add feed source",
diff --git a/src/renderer/src/i18n/locales/zh-cn.json b/src/renderer/src/i18n/locales/zh-cn.json
index 8003d93f59..51eef900bb 100644
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -6,6 +6,9 @@
         "failed": "添加 Agent 失败",
         "invalid_agent": "无效的 Agent"
       },
+      "model": {
+        "tooltip": "目前，只有支持 Anthropic 端点的模型可用于 Agent 功能。"
+      },
       "title": "添加 Agent",
       "type": {
         "placeholder": "选择 Agent 类型"
@@ -28,13 +31,31 @@
       }
     },
     "gitBash": {
+      "autoDetected": "使用自动检测的 Git Bash",
+      "autoDiscoveredHint": "自动发现",
+      "clear": {
+        "button": "清除自定义路径"
+      },
+      "customPath": "使用自定义路径：{{path}}",
       "error": {
         "description": "在 Windows 上运行智能体需要 Git Bash。没有它智能体无法运行。请从以下地址安装 Git for Windows",
         "recheck": "重新检测 Git Bash 安装",
+        "required": "在 Windows 上需要配置 Git Bash 路径",
         "title": "需要 Git Bash"
       },
+      "found": {
+        "title": "已配置 Git Bash"
+      },
       "notFound": "未找到 Git Bash。请先安装。",
-      "success": "成功检测到 Git Bash！"
+      "pick": {
+        "button": "选择 Git Bash 路径",
+        "failed": "设置 Git Bash 路径失败",
+        "invalidPath": "选择的文件不是有效的 Git Bash 可执行文件（bash.exe）。",
+        "title": "选择 Git Bash 可执行文件"
+      },
+      "placeholder": "选择 bash.exe 路径",
+      "success": "成功检测到 Git Bash！",
+      "tooltip": "在 Windows 上运行智能体需要 Git Bash。如果未安装，请从 git-scm.com 下载安装。"
     },
     "input": {
       "placeholder": "在这里输入消息，按 {{key}} 发送 - @ 选择路径， / 选择命令"
@@ -399,6 +420,9 @@
     },
     "delete": {
       "content": "删除助手会删除所有该助手下的话题和文件，确定要继续吗？",
+      "error": {
+        "remain_one": "不允许删除最后一个助手"
+      },
       "title": "删除助手"
     },
     "edit": {
@@ -455,6 +479,7 @@
         "button": "导入",
         "error": {
           "fetch_failed": "从 URL 获取数据失败",
+          "file_required": "请先选择文件",
           "invalid_format": "无效的助手格式：缺少必填字段",
           "url_required": "请输入 URL"
         },
@@ -468,6 +493,17 @@
         "url_placeholder": "输入 JSON URL"
       },
       "manage": {
+        "batch_delete": {
+          "button": "删除",
+          "confirm": "确定要删除选中的 {{count}} 个助手吗？"
+        },
+        "batch_export": {
+          "button": "导出"
+        },
+        "mode": {
+          "manage": "管理",
+          "sort": "排序"
+        },
         "title": "管理助手"
       },
       "my_agents": "我的助手",
@@ -515,13 +551,23 @@
       "more": "助手设置",
       "prompt": "提示词设置",
       "reasoning_effort": {
+        "auto": "自动",
+        "auto_description": "灵活决定推理力度",
         "default": "默认",
+        "default_description": "依赖模型默认行为，不作任何配置",
         "high": "沉思",
+        "high_description": "高强度推理",
         "label": "思维链长度",
         "low": "浮想",
+        "low_description": "低强度推理",
         "medium": "斟酌",
+        "medium_description": "中强度推理",
         "minimal": "微念",
-        "off": "关闭"
+        "minimal_description": "最小程度的推理",
+        "off": "关闭",
+        "off_description": "禁用推理",
+        "xhigh": "穷究",
+        "xhigh_description": "超高强度推理"
       },
       "regular_phrases": {
         "add": "添加短语",
@@ -1001,6 +1047,29 @@
         "yuque": "导出到语雀"
       },
       "list": "话题列表",
+      "manage": {
+        "clear_selection": "取消选择",
+        "delete": {
+          "confirm": {
+            "content": "确定要删除选中的 {{count}} 个话题吗？此操作不可撤销。",
+            "title": "删除话题"
+          },
+          "success": "已删除 {{count}} 个话题"
+        },
+        "deselect_all": "取消全选",
+        "error": {
+          "at_least_one": "至少需要保留一个话题"
+        },
+        "move": {
+          "button": "移动",
+          "placeholder": "选择目标助手",
+          "success": "已移动 {{count}} 个话题"
+        },
+        "pinned": "已固定的话题",
+        "selected_count": "已选择 {{count}} 个",
+        "title": "管理话题",
+        "unpinned": "未固定的话题"
+      },
       "move_to": "移动到",
       "new": "开始新对话",
       "pin": "固定话题",
@@ -1011,6 +1080,10 @@
         "label": "话题提示词",
         "tips": "话题提示词：针对当前话题提供额外的补充提示词"
       },
+      "search": {
+        "placeholder": "搜索话题...",
+        "title": "搜索"
+      },
       "title": "话题",
       "unpin": "取消固定"
     },
@@ -1182,6 +1255,7 @@
     "saved": "已保存",
     "search": "搜索",
     "select": "选择",
+    "select_all": "全选",
     "selected": "已选择",
     "selectedItems": "已选择 {{count}} 项",
     "selectedMessages": "选中 {{count}} 条消息",
@@ -1194,11 +1268,13 @@
       }
     },
     "stop": "停止",
+    "subscribe": "订阅",
     "success": "成功",
     "swap": "交换",
     "topics": "话题",
     "unknown": "未知",
     "unnamed": "未命名",
+    "unsubscribe": "退订",
     "update_success": "更新成功",
     "upload_files": "上传文件",
     "warning": "警告",
@@ -1693,7 +1769,7 @@
       "import": {
         "error": "导入失败"
       },
-      "imported": "导入成功"
+      "imported": "成功导入 {{count}} 个助手"
     },
     "api": {
       "check": {
@@ -2125,6 +2201,7 @@
     "collapse": "收起",
     "content_placeholder": "请输入笔记内容...",
     "copyContent": "复制内容",
+    "crossPlatformRestoreWarning": "检测到从其他设备恢复配置，但笔记目录为空。请将笔记文件复制到: {{path}}",
     "delete": "删除",
     "delete_confirm": "确定要删除这个{{type}}吗？",
     "delete_folder_confirm": "确定要删除文件夹 \"{{name}}\" 及其所有内容吗？",
@@ -2307,7 +2384,7 @@
     "failed": {
       "install": "安装 OVMS 失败:",
       "install_code_100": "未知错误",
-      "install_code_101": "仅支持 Intel(R) Core(TM) Ultra CPU",
+      "install_code_101": "仅支持 Intel(R) CPU",
       "install_code_102": "仅支持 Windows",
       "install_code_103": "下载 OVMS runtime 失败",
       "install_code_104": "安装 OVMS runtime 失败",
@@ -2521,7 +2598,8 @@
   },
   "preview": {
     "copy": {
-      "image": "复制为图片"
+      "image": "复制为图片",
+      "src": "复制图片源"
     },
     "dialog": "打开预览窗口",
     "label": "预览",
@@ -2575,6 +2653,7 @@
     "lanyun": "蓝耘科技",
     "lmstudio": "LM Studio",
     "longcat": "龙猫",
+    "mimo": "Xiaomi MiMo",
     "minimax": "MiniMax",
     "mistral": "Mistral",
     "modelscope": "ModelScope 魔搭",
@@ -3093,6 +3172,7 @@
         "label": "应用数据",
         "migration_title": "数据迁移",
         "new_path": "新路径",
+        "open": "打开目录",
         "original_path": "原始路径",
         "path_change_failed": "数据目录更改失败",
         "path_changed_without_copy": "路径已更改成功",
@@ -3163,24 +3243,43 @@
         },
         "content": "导出部分数据，包括聊天记录、设置。请注意，备份过程可能需要一些时间，感谢您的耐心等待。",
         "lan": {
-          "auto_close_tip": "{{seconds}} 秒后自动关闭...",
-          "confirm_close_message": "文件正在传输中，关闭将中断传输。确定要强制关闭吗？",
-          "confirm_close_title": "确认关闭",
           "connected": "连接成功",
           "connection_failed": "连接失败",
-          "content": "请确保电脑和手机处于同一网络以使用局域网传输。请打开 Cherry Studio App 扫描此二维码。",
+          "content": "请确保电脑和手机处于同一网络以使用局域网传输。",
+          "device_list_title": "局域网设备列表",
+          "discovered_devices": "已发现的设备",
           "error": {
+            "file_too_large": "文件过大，最大支持 500MB",
             "init_failed": "初始化失败",
+            "invalid_file_type": "仅支持 ZIP 文件",
             "no_file": "未选择文件",
             "no_ip": "无法获取 IP 地址",
+            "not_connected": "请先完成握手连接",
             "send_failed": "发送文件失败"
           },
-          "force_close": "强制关闭",
-          "generating_qr": "正在生成二维码...",
-          "noZipSelected": "未选择压缩文件",
-          "scan_qr": "请使用手机扫码连接",
-          "selectZip": "选择压缩文件",
-          "sendZip": "开始恢复数据",
+          "file_transfer": {
+            "cancelled": "传输已取消",
+            "failed": "文件发送失败: {{message}}",
+            "progress": "发送中... {{progress}}%",
+            "success": "文件发送成功"
+          },
+          "handshake": {
+            "button": "握手测试",
+            "failed": "握手失败：{{message}}",
+            "in_progress": "正在握手...",
+            "success": "已与 {{device}} 建立握手",
+            "test_message_received": "已收到 {{device}} 的 pong 响应",
+            "test_message_sent": "已发送 hello world 测试数据"
+          },
+          "idle_hint": "扫描已暂停。开始扫描以发现局域网中的 Cherry Studio 设备。",
+          "ip_addresses": "IP 地址",
+          "last_seen": "最后活动：{{time}}",
+          "metadata": "元数据",
+          "no_connection_warning": "请在 Cherry Studio 移动端打开局域网传输",
+          "no_devices": "尚未发现局域网设备",
+          "scan_devices": "扫描设备",
+          "scanning_hint": "正在扫描局域网中的 Cherry Studio 设备...",
+          "send_file": "发送文件",
           "status": {
             "completed": "传输完成",
             "connected": "连接成功",
@@ -3189,9 +3288,11 @@
             "error": "连接出错",
             "initializing": "正在初始化连接...",
             "preparing": "准备传输中...",
-            "sending": "传输中 {{progress}}%",
-            "waiting_qr_scan": "请扫描二维码连接"
+            "sending": "传输中 {{progress}}%"
           },
+          "status_badge_idle": "空闲",
+          "status_badge_scanning": "扫描中",
+          "stop_scan": "停止扫描",
           "title": "局域网传输",
           "transfer_progress": "传输进度"
         },
@@ -3863,6 +3964,7 @@
       "builtinServers": "内置服务器",
       "builtinServersDescriptions": {
         "brave_search": "一个集成了Brave 搜索 API 的 MCP 服务器实现，提供网页与本地搜索双重功能。需要配置 BRAVE_API_KEY 环境变量",
+        "browser": "通过 Chrome DevTools 协议控制隐藏的 Electron 窗口，支持打开 URL、执行单行 JS、重置会话",
         "didi_mcp": "一个集成了滴滴 MCP 服务器实现，提供网约车服务包括地图搜索、价格预估、订单管理和司机跟踪。仅支持中国大陆地区。需要配置 DIDI_API_KEY 环境变量",
         "dify_knowledge": "Dify 的 MCP 服务器实现，提供了一个简单的 API 来与 Dify 进行交互。需要配置 Dify Key",
         "fetch": "用于获取 URL 网页内容的 MCP 服务器",
@@ -3870,6 +3972,7 @@
         "mcp_auto_install": "自动安装 MCP 服务（测试版）",
         "memory": "基于本地知识图谱的持久性记忆基础实现。这使得模型能够在不同对话间记住用户的相关信息。需要配置 MEMORY_FILE_PATH 环境变量。",
         "no": "无描述",
+        "nowledge_mem": "需要本地运行 Nowledge Mem 应用。将 AI 对话、工具、笔记、智能体和文件保存在本地计算机的私有记忆中。请从 https://mem.nowledge.co/ 下载",
         "python": "在安全的沙盒环境中执行 Python 代码。使用 Pyodide 运行 Python，支持大多数标准库和科学计算包",
         "sequentialthinking": "一个 MCP 服务器实现，提供了通过结构化思维过程进行动态和反思性问题解决的工具"
       },
@@ -3915,6 +4018,7 @@
       "jsonSaveError": "保存 JSON 配置失败",
       "jsonSaveSuccess": "JSON 配置已保存",
       "logoUrl": "标志网址",
+      "logs": "日志",
       "longRunning": "长时间运行模式",
       "longRunningTooltip": "启用后，服务器支持长时间任务，接收到进度通知时会重置超时计时器，并延长最大超时时间至10分钟",
       "marketplaces": "市场",
@@ -3934,6 +4038,7 @@
       "name": "名称",
       "newServer": "MCP 服务器",
       "noDescriptionAvailable": "暂无描述",
+      "noLogs": "暂无日志",
       "noServers": "未配置服务器",
       "not_support": "模型不支持",
       "npx_list": {
@@ -4028,7 +4133,7 @@
       "tagsPlaceholder": "输入标签",
       "timeout": "超时",
       "timeoutTooltip": "对该服务器请求的超时时间（秒），默认为 60 秒",
-      "title": "MCP",
+      "title": "MCP 服务器",
       "tools": {
         "autoApprove": {
           "label": "自动批准",
@@ -4662,6 +4767,12 @@
       },
       "title": "其他设置",
       "websearch": {
+        "api_key_required": {
+          "content": "{{provider}} 需要 API 密钥才能使用。是否现在去配置？",
+          "ok": "去配置",
+          "title": "需要 API 密钥"
+        },
+        "api_providers": "API 服务商",
         "apikey": "API 密钥",
         "blacklist": "黑名单",
         "blacklist_description": "在搜索结果中不会出现以下网站的结果",
@@ -4703,7 +4814,15 @@
         },
         "content_limit": "内容长度限制",
         "content_limit_tooltip": "限制搜索结果的内容长度, 超过限制的内容将被截断",
+        "default_provider": "默认搜索引擎",
         "free": "免费",
+        "is_default": "默认搜索",
+        "local_provider": {
+          "hint": "登录网站可以获得更好的搜索结果，也可以对搜索进行个性化设置。",
+          "open_settings": "打开 {{provider}} 设置",
+          "settings": "本地搜索设置"
+        },
+        "local_providers": "本地搜索",
         "no_provider_selected": "请选择搜索服务商后再检测",
         "overwrite": "覆盖服务商搜索",
         "overwrite_tooltip": "强制使用搜索服务商而不是大语言模型进行搜索",
@@ -4714,6 +4833,7 @@
         "search_provider": "搜索服务商",
         "search_provider_placeholder": "选择一个搜索服务商",
         "search_with_time": "搜索包含日期",
+        "set_as_default": "设为默认",
         "subscribe": "黑名单订阅",
         "subscribe_add": "添加订阅",
         "subscribe_add_failed": "订阅源添加失败",
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index 82c6c943ac..cdc6a77662 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -1,20 +1,23 @@
 {
   "agent": {
     "add": {
-      "description": "調用各種工具處理複雜任務",
+      "description": "呼叫各種工具處理複雜任務",
       "error": {
-        "failed": "無法新增代理人",
+        "failed": "無法新增 Agent",
         "invalid_agent": "無效的 Agent"
       },
-      "title": "新增代理",
+      "model": {
+        "tooltip": "目前，僅支援 Anthropic 端點的模型可供代理功能使用。"
+      },
+      "title": "新增 Agent",
       "type": {
         "placeholder": "選擇 Agent 類型"
       }
     },
     "delete": {
-      "content": "刪除該 Agent 將強制終止並刪除該 Agent 下的所有會話。您確定嗎？",
+      "content": "刪除該 Agent 會強制停止並刪除該 Agent 的所有工作階段。確定要刪除嗎？",
       "error": {
-        "failed": "刪除代理程式失敗"
+        "failed": "刪除 Agent 失敗"
       },
       "title": "刪除 Agent"
     },
@@ -23,30 +26,48 @@
     },
     "get": {
       "error": {
-        "failed": "無法取得代理程式。",
-        "null_id": "代理程式 ID 為空。"
+        "failed": "無法取得 Agent。",
+        "null_id": "Agent ID 為空。"
       }
     },
     "gitBash": {
+      "autoDetected": "使用自動偵測的 Git Bash",
+      "autoDiscoveredHint": "自動發現",
+      "clear": {
+        "button": "清除自訂路徑"
+      },
+      "customPath": "使用自訂路徑：{{path}}",
       "error": {
-        "description": "在 Windows 上執行代理程式需要 Git Bash。沒有它代理程式無法運作。請從以下地址安裝 Git for Windows",
-        "recheck": "重新檢測 Git Bash 安裝",
+        "description": "在 Windows 上執行 Agent 需要 Git Bash。沒有它 Agent 無法運作。請從以下網址安裝 Git for Windows",
+        "recheck": "重新偵測 Git Bash 安裝",
+        "required": "在 Windows 上需要設定 Git Bash 路徑",
         "title": "需要 Git Bash"
       },
+      "found": {
+        "title": "已設定 Git Bash"
+      },
       "notFound": "找不到 Git Bash。請先安裝。",
-      "success": "成功偵測到 Git Bash！"
+      "pick": {
+        "button": "選擇 Git Bash 路徑",
+        "failed": "設定 Git Bash 路徑失敗",
+        "invalidPath": "選擇的檔案不是有效的 Git Bash 可執行檔（bash.exe）。",
+        "title": "選擇 Git Bash 可執行檔"
+      },
+      "placeholder": "選擇 bash.exe 路徑",
+      "success": "成功偵測到 Git Bash！",
+      "tooltip": "在 Windows 上執行 Agent 需要 Git Bash。如未安裝，請從 git-scm.com 下載安裝。"
     },
     "input": {
       "placeholder": "在這裡輸入您的訊息，使用 {{key}} 傳送 - @ 選擇路徑，/ 選擇命令"
     },
     "list": {
       "error": {
-        "failed": "無法列出代理程式。"
+        "failed": "無法列出 Agent。"
       }
     },
     "server": {
       "error": {
-        "not_running": "API 伺服器已啟用，但運行不正常。"
+        "not_running": "API 伺服器已啟用，但運作不正常。"
       }
     },
     "session": {
@@ -61,11 +82,11 @@
         "select_failed": "無法選擇目錄。"
       },
       "add": {
-        "title": "新增會議"
+        "title": "新增工作階段"
       },
       "allowed_tools": {
         "empty": "目前此代理沒有可用的工具。",
-        "helper": "選擇預先授權的工具，未選取的工具在使用時需要手動審批。",
+        "helper": "預先核准的工具可直接執行；未選取的工具在使用前需要手動核准。",
         "label": "預先授權工具",
         "placeholder": "選擇預先授權的工具"
       },
@@ -91,8 +112,8 @@
           "null_id": "工作階段 ID 為空"
         }
       },
-      "label_one": "會議",
-      "label_other": "Sessions",
+      "label_one": "工作階段",
+      "label_other": "工作階段",
       "update": {
         "error": {
           "failed": "無法更新工作階段"
@@ -102,8 +123,8 @@
     "settings": {
       "advance": {
         "maxTurns": {
-          "description": "設定代理自動執行的請求／回覆輪次数。",
-          "helper": "數值越高可自動運行越久；數值越低更容易掌控。",
+          "description": "設定代理自動執行的請求／回覆輪次數。",
+          "helper": "數值越高可自動運作越久；數值越低更容易掌控。",
           "label": "會話輪次上限"
         },
         "permissionMode": {
@@ -175,7 +196,7 @@
         "permissionMode": {
           "acceptEdits": {
             "behavior": "預先授權受信任的檔案系統工具，允許即時執行。",
-            "description": "檔案編輯與檔案系統操作會自動通過核准。",
+            "description": "檔案編輯與檔案系統操作會自動核准。",
             "title": "自動接受檔案編輯"
           },
           "bypassPermissions": {
@@ -203,7 +224,7 @@
           "title": "權限模式"
         },
         "preapproved": {
-          "autoBadge": "模式自動添加",
+          "autoBadge": "模式自動新增",
           "autoDescription": "此工具由目前的權限模式自動預先授權。",
           "empty": "沒有符合篩選條件的工具。",
           "mcpBadge": "MCP 工具",
@@ -219,7 +240,7 @@
           "autoTools": "自動：{{count}}",
           "customTools": "自訂：{{count}}",
           "helper": "設定會自動儲存，可隨時回到上方步驟調整。",
-          "mcp": "MCP：{{count}}",
+          "mcp": "MCP:{{count}}",
           "mode": "模式：{{mode}}"
         },
         "steps": {
@@ -252,9 +273,9 @@
       "aria": {
         "allowRequest": "允許工具請求",
         "denyRequest": "拒絕工具請求",
-        "hideDetails": "隱藏工具詳情",
+        "hideDetails": "隱藏工具詳細資訊",
         "runWithOptions": "帶選項執行",
-        "showDetails": "顯示工具詳情"
+        "showDetails": "顯示工具詳細資訊"
       },
       "button": {
         "cancel": "取消",
@@ -284,22 +305,22 @@
       "waiting": "等待工具權限決定..."
     },
     "type": {
-      "label": "代理類型",
+      "label": "Agent 類型",
       "unknown": "未知類型"
     },
     "update": {
       "error": {
-        "failed": "無法更新代理程式"
+        "failed": "無法更新 Agent"
       }
     },
     "warning": {
-      "enable_server": "啟用 API 伺服器以使用代理程式。"
+      "enable_server": "啟用 API 伺服器以使用 Agent。"
     }
   },
   "apiServer": {
     "actions": {
       "copy": "複製",
-      "regenerate": "重新生成",
+      "regenerate": "重新產生",
       "restart": {
         "button": "重新啟動",
         "tooltip": "重新啟動伺服器"
@@ -311,7 +332,7 @@
       "title": "授權標頭"
     },
     "authHeaderText": "在授權標頭中使用：",
-    "configuration": "配置",
+    "configuration": "設定",
     "description": "透過 OpenAI 相容的 HTTP API 公開 Cherry Studio 的 AI 功能",
     "documentation": {
       "title": "API 文件"
@@ -319,9 +340,9 @@
     "fields": {
       "apiKey": {
         "copyTooltip": "複製 API 金鑰",
-        "description": "用於 API 訪問的安全認證令牌",
+        "description": "用於 API 存取的安全認證權杖",
         "label": "API 金鑰",
-        "placeholder": "API 金鑰將自動生成"
+        "placeholder": "API 金鑰會自動產生"
       },
       "port": {
         "description": "HTTP 伺服器的 TCP 連接埠 (1000-65535)",
@@ -335,7 +356,7 @@
     },
     "messages": {
       "apiKeyCopied": "API 金鑰已複製到剪貼簿",
-      "apiKeyRegenerated": "API 金鑰已重新生成",
+      "apiKeyRegenerated": "API 金鑰已重新產生",
       "notEnabled": "API 伺服器未啟用。",
       "operationFailed": "API 伺服器操作失敗：",
       "restartError": "重新啟動 API 伺服器失敗：",
@@ -399,6 +420,9 @@
     },
     "delete": {
       "content": "刪除助手會刪除所有該助手下的話題和檔案，確定要繼續嗎？",
+      "error": {
+        "remain_one": "不允許刪除最後一個助手"
+      },
       "title": "刪除助手"
     },
     "edit": {
@@ -408,8 +432,8 @@
       "type": "助手圖示"
     },
     "list": {
-      "showByList": "列表展示",
-      "showByTags": "標籤展示"
+      "showByList": "列表顯示",
+      "showByTags": "標籤顯示"
     },
     "presets": {
       "add": {
@@ -433,7 +457,7 @@
           }
         },
         "title": "建立助手",
-        "unsaved_changes_warning": "有未保存的變更，確定要關閉嗎？"
+        "unsaved_changes_warning": "有未儲存的變更，確定要關閉嗎？"
       },
       "delete": {
         "popup": {
@@ -452,15 +476,16 @@
         "agent": "匯出助手"
       },
       "import": {
-        "button": "導入",
+        "button": "匯入",
         "error": {
-          "fetch_failed": "從 URL 獲取資料失敗",
+          "fetch_failed": "從 URL 取得資料失敗",
+          "file_required": "請先選擇一個檔案",
           "invalid_format": "無效的助手格式：缺少必填欄位",
           "url_required": "請輸入 URL"
         },
         "file_filter": "JSON 檔案",
         "select_file": "選擇檔案",
-        "title": "從外部導入",
+        "title": "從外部匯入",
         "type": {
           "file": "檔案",
           "url": "URL"
@@ -468,6 +493,17 @@
         "url_placeholder": "輸入 JSON URL"
       },
       "manage": {
+        "batch_delete": {
+          "button": "批次刪除",
+          "confirm": "確定要刪除所選的 {{count}} 個助手嗎？"
+        },
+        "batch_export": {
+          "button": "匯出"
+        },
+        "mode": {
+          "manage": "管理",
+          "sort": "排序"
+        },
         "title": "管理助手"
       },
       "my_agents": "我的助手",
@@ -475,7 +511,7 @@
         "no_results": "沒有找到相關助手"
       },
       "settings": {
-        "title": "助手配置"
+        "title": "助手設定"
       },
       "sorting": {
         "title": "排序"
@@ -498,10 +534,10 @@
       "knowledge_base": {
         "label": "知識庫設定",
         "recognition": {
-          "label": "調用知識庫",
-          "off": "強制檢索",
+          "label": "呼叫知識庫",
+          "off": "強制查詢",
           "on": "意圖識別",
-          "tip": "助手將調用大語言模型的意圖識別能力，判斷是否需要調用知識庫進行回答，該功能將依賴模型的能力"
+          "tip": "助手會使用大型語言模型的意圖識別能力，判斷是否需要查詢知識庫；此功能仰賴模型能力"
         }
       },
       "mcp": {
@@ -515,34 +551,44 @@
       "more": "助手設定",
       "prompt": "提示詞設定",
       "reasoning_effort": {
+        "auto": "自動",
+        "auto_description": "彈性決定推理投入的心力",
         "default": "預設",
+        "default_description": "依賴模型的預設行為，無需任何配置。",
         "high": "盡力思考",
+        "high_description": "高級推理",
         "label": "思維鏈長度",
         "low": "稍微思考",
+        "low_description": "低階推理",
         "medium": "正常思考",
+        "medium_description": "中等程度推理",
         "minimal": "最少思考",
-        "off": "關閉"
+        "minimal_description": "最少推理",
+        "off": "關閉",
+        "off_description": "禁用推理",
+        "xhigh": "極力思考",
+        "xhigh_description": "超高階推理"
       },
       "regular_phrases": {
-        "add": "添加短语",
+        "add": "新增短語",
         "contentLabel": "內容",
-        "contentPlaceholder": "請輸入短語內容，支持使用變量，然後按 Tab 鍵可以快速定位到變量進行修改。比如：\n幫我規劃從 ${from} 到 ${to} 的行程，然後發送到 ${email}",
-        "delete": "刪除短语",
-        "deleteConfirm": "確定要刪除這個短语嗎？",
-        "edit": "編輯短语",
-        "title": "常用短语",
+        "contentPlaceholder": "請輸入短語內容，支援使用變數，然後按 Tab 鍵可以快速定位到變數進行修改。例如：\n幫我規劃從 ${from} 到 ${to} 的行程，然後傳送到 ${email}",
+        "delete": "刪除短語",
+        "deleteConfirm": "確定要刪除這個短語嗎？",
+        "edit": "編輯短語",
+        "title": "常用短語",
         "titleLabel": "標題",
         "titlePlaceholder": "輸入標題"
       },
       "title": "助手設定",
       "tool_use_mode": {
-        "function": "函數",
-        "label": "工具調用方式",
+        "function": "函式",
+        "label": "工具呼叫方式",
         "prompt": "提示詞"
       }
     },
     "tags": {
-      "add": "添加標籤",
+      "add": "新增標籤",
       "delete": "刪除標籤",
       "deleteConfirm": "確定要刪除這個標籤嗎？",
       "manage": "標籤管理",
@@ -592,7 +638,7 @@
       "all": "顯示全部"
     },
     "update_available": "有可用更新",
-    "whole_word": "全字匹配"
+    "whole_word": "全字比對"
   },
   "chat": {
     "add": {
@@ -636,13 +682,13 @@
     },
     "history": {
       "assistant_node": "助手",
-      "click_to_navigate": "點擊跳轉到對應訊息",
+      "click_to_navigate": "點選以前往對應訊息",
       "coming_soon": "聊天工作流圖表即將上線",
       "no_messages": "沒有找到訊息",
-      "start_conversation": "開始對話以查看聊天流程圖",
+      "start_conversation": "開始對話以檢視聊天流程圖",
       "title": "聊天歷史",
-      "user_node": "用戶",
-      "view_full_content": "查看完整內容"
+      "user_node": "使用者",
+      "view_full_content": "檢視完整內容"
     },
     "input": {
       "activity_directory": {
@@ -671,8 +717,8 @@
       "file_error": "檔案處理錯誤",
       "file_not_supported": "模型不支援此檔案類型",
       "file_not_supported_count": "{{count}} 個檔案不被支援",
-      "generate_image": "生成圖片",
-      "generate_image_not_supported": "模型不支援生成圖片",
+      "generate_image": "產生圖片",
+      "generate_image_not_supported": "模型不支援產生圖片",
       "knowledge_base": "知識庫",
       "new": {
         "context": "清除上下文 {{Command}}"
@@ -686,7 +732,7 @@
       "send": "傳送",
       "settings": "設定",
       "slash_commands": {
-        "description": "代理會話斜線命令",
+        "description": "Agent 工作階段斜線指令",
         "title": "斜線指令"
       },
       "thinking": {
@@ -694,15 +740,15 @@
         "label": "思考",
         "mode": {
           "custom": {
-            "label": "自定義",
-            "tip": "模型最多可以思考的 Token 數。需要考慮模型的上下文限制，否則會報錯"
+            "label": "自訂",
+            "tip": "模型最多可用來思考的 Token 數。請依模型的上下文上限調整，否則可能發生錯誤"
           },
           "default": {
             "label": "預設",
-            "tip": "模型會自動確定思考的 Token 數"
+            "tip": "模型會自動決定思考的 Token 數"
           },
           "tokens": {
-            "tip": "設置思考的 Token 數"
+            "tip": "設定思考的 Token 數"
           }
         }
       },
@@ -717,19 +763,19 @@
       "translating": "翻譯中...",
       "upload": {
         "attachment": "上傳附件",
-        "document": "上傳文件（模型不支援圖片）",
-        "image_or_document": "上傳圖片或文件",
-        "upload_from_local": "上傳本地文件..."
+        "document": "上傳檔案（模型不支援圖片）",
+        "image_or_document": "上傳圖片或檔案",
+        "upload_from_local": "上傳本機檔案..."
       },
       "url_context": "網頁上下文",
       "web_search": {
         "builtin": {
-          "disabled_content": "當前模型不支持網路搜尋功能",
-          "enabled_content": "使用模型內置的網路搜尋功能",
-          "label": "模型內置"
+          "disabled_content": "目前模型不支援網路搜尋功能",
+          "enabled_content": "使用模型內建的網路搜尋功能",
+          "label": "模型內建"
         },
         "button": {
-          "ok": "去設定"
+          "ok": "前往設定"
         },
         "enable": "開啟網路搜尋",
         "enable_content": "需要先在設定中開啟網路搜尋",
@@ -746,10 +792,10 @@
         "parse_tool_call": "無法轉換為有效的工具呼叫格式：{{toolCall}}"
       },
       "warning": {
-        "gemini_web_search": "Gemini 不支援同時使用原生網路搜尋工具與函數呼叫",
-        "multiple_tools": "存在多個匹配的MCP工具，已選擇 {{tool}}",
-        "no_tool": "未匹配到所需的MCP工具 {{tool}}",
-        "url_context": "Gemini 不支援同時使用網頁內容與函數呼叫"
+        "gemini_web_search": "Gemini 不支援同時使用原生網路搜尋工具與函式呼叫",
+        "multiple_tools": "找到多個相符的 MCP 工具，已選擇 {{tool}}",
+        "no_tool": "找不到符合需求的 MCP 工具：{{tool}}",
+        "url_context": "Gemini 不支援同時使用網頁內容與函式呼叫"
       }
     },
     "message": {
@@ -765,25 +811,25 @@
         "model": "切換模型"
       },
       "useful": {
-        "label": "設置為上下文",
+        "label": "設為上下文",
         "tip": "在這組訊息中，該訊息將被選擇加入上下文"
       }
     },
     "multiple": {
       "select": {
-        "empty": "未選中任何訊息",
+        "empty": "未選取任何訊息",
         "label": "多選"
       }
     },
     "navigation": {
-      "bottom": "回到底部",
+      "bottom": "回到底端",
       "close": "關閉",
       "first": "已經是第一條訊息",
       "history": "聊天歷史",
       "last": "已經是最後一條訊息",
       "next": "下一條訊息",
       "prev": "上一條訊息",
-      "top": "回到頂部"
+      "top": "回到頂端"
     },
     "resend": "重新傳送",
     "save": {
@@ -809,8 +855,8 @@
             "title": "檔案"
           },
           "maintext": {
-            "description": "包括主要的文本內容",
-            "title": "主文本"
+            "description": "包括主要的文字內容",
+            "title": "主文字"
           },
           "thinking": {
             "description": "包括模型思考內容",
@@ -840,13 +886,13 @@
             "title": "選擇知識庫"
           },
           "content": {
-            "tip": "已選擇 {{count}} 項內容，文本類型將合併儲存為一個筆記",
+            "tip": "已選擇 {{count}} 項內容，文字類型將合併儲存為一個筆記",
             "title": "選擇要儲存的內容類型"
           }
         },
         "title": "儲存到知識庫"
       },
-      "label": "保存",
+      "label": "儲存",
       "topic": {
         "knowledge": {
           "content": {
@@ -855,21 +901,21 @@
             }
           },
           "empty": {
-            "no_content": "此話題沒有可保存的內容"
+            "no_content": "此話題沒有可儲存的內容"
           },
           "error": {
-            "save_failed": "保存話題失敗，請檢查知識庫設定"
+            "save_failed": "儲存話題失敗，請檢查知識庫設定"
           },
           "loading": "正在分析話題內容...",
           "select": {
             "content": {
-              "label": "選擇要保存的內容類型",
+              "label": "選擇要儲存的內容類型",
               "selected_tip": "已選擇 {{count}} 項內容，來自 {{messages}} 條訊息",
-              "tip": "話題將以包含完整對話上下文的形式保存到知識庫"
+              "tip": "話題將以包含完整對話上下文的形式儲存到知識庫"
             }
           },
-          "success": "話題已成功保存到知識庫（{{count}} 項內容）",
-          "title": "保存話題到知識庫"
+          "success": "話題已成功儲存到知識庫（{{count}} 項內容）",
+          "title": "儲存話題到知識庫"
         }
       }
     },
@@ -879,18 +925,18 @@
       },
       "code_collapsible": "程式碼區塊可折疊",
       "code_editor": {
-        "autocompletion": "自動補全",
-        "fold_gutter": "折疊控件",
-        "highlight_active_line": "高亮當前行",
+        "autocompletion": "自動完成",
+        "fold_gutter": "折疊控制項",
+        "highlight_active_line": "醒目標示目前行",
         "keymap": "快捷鍵",
         "title": "程式碼編輯器"
       },
       "code_execution": {
         "timeout_minutes": {
-          "label": "超時時間",
-          "tip": "程式碼執行超時時間（分鐘）"
+          "label": "逾時時間",
+          "tip": "程式碼執行逾時時間（分鐘）"
         },
-        "tip": "可執行的程式碼塊工具欄中會顯示運行按鈕，注意不要執行危險程式碼！",
+        "tip": "可執行的程式碼區塊工具列中會顯示 [執行] 按鈕，請注意不要執行危險程式碼！",
         "title": "程式碼執行"
       },
       "code_fancy_block": {
@@ -899,7 +945,7 @@
       },
       "code_image_tools": {
         "label": "啟用預覽工具",
-        "tip": "為 mermaid 等程式碼區塊渲染後的圖像啟用預覽工具"
+        "tip": "為 mermaid 等程式碼區塊渲染後的影像啟用預覽工具"
       },
       "code_wrappable": "程式碼區塊可自動換行",
       "context_count": {
@@ -908,10 +954,10 @@
       },
       "max": "不限",
       "max_tokens": {
-        "confirm": "設置最大 Token 數",
-        "confirm_content": "設置單次交互所用的最大 Token 數，會影響返回結果的長度。要根據模型上下文限制來設定，否則會發生錯誤",
+        "confirm": "設定最大 Token 數",
+        "confirm_content": "設定單次互動的最大 Token 數，會影響回應內容的長度。請依模型的上下文上限調整，否則可能發生錯誤",
         "label": "最大 Token 數",
-        "tip": "模型可以生成的最大 Token 數。要根據模型上下文限制來設定，否則會發生錯誤"
+        "tip": "模型可產生的最大 Token 數。請依模型的上下文上限調整，否則可能發生錯誤"
       },
       "reset": "重設",
       "set_as_default": "設為預設助手",
@@ -926,7 +972,7 @@
       },
       "top_p": {
         "label": "Top-P",
-        "tip": "模型生成文字的隨機程度。值越小，AI 生成的內容越單調，也越容易理解；值越大，AI 回覆的詞彙範圍越大，越多樣化"
+        "tip": "模型產生文字的隨機程度。值越小，AI 產生的內容越單調，也越容易理解；值越大，AI 回應的詞彙範圍越大，越多樣化"
       }
     },
     "suggestions": {
@@ -959,23 +1005,23 @@
           "label": "匯出為 Markdown",
           "reason": "匯出為 Markdown (包含思考)"
         },
-        "notes": "導出到筆記",
+        "notes": "匯出到筆記",
         "notion": "匯出到 Notion",
         "obsidian": "匯出到 Obsidian",
-        "obsidian_atributes": "配置筆記屬性",
+        "obsidian_atributes": "設定筆記屬性",
         "obsidian_btn": "確定",
         "obsidian_created": "建立時間",
         "obsidian_created_placeholder": "請選擇建立時間",
         "obsidian_export_failed": "匯出失敗",
         "obsidian_export_success": "匯出成功",
-        "obsidian_fetch_error": "獲取 Obsidian 保管庫失敗",
-        "obsidian_fetch_folders_error": "獲取文件夾結構失敗",
-        "obsidian_loading": "加載中...",
+        "obsidian_fetch_error": "取得 Obsidian 保管庫失敗",
+        "obsidian_fetch_folders_error": "取得資料夾結構失敗",
+        "obsidian_loading": "載入中...",
         "obsidian_no_vault_selected": "請先選擇一個保管庫",
         "obsidian_no_vaults": "未找到 Obsidian 保管庫",
         "obsidian_operate": "處理方式",
         "obsidian_operate_append": "追加",
-        "obsidian_operate_new_or_overwrite": "新建（如果存在就覆蓋）",
+        "obsidian_operate_new_or_overwrite": "新增（若已存在則覆蓋）",
         "obsidian_operate_placeholder": "請選擇處理方式",
         "obsidian_operate_prepend": "前置",
         "obsidian_path": "路徑",
@@ -994,13 +1040,36 @@
         "obsidian_vault_placeholder": "請選擇保管庫名稱",
         "siyuan": "匯出到思源筆記",
         "title": "匯出",
-        "title_naming_failed": "標題生成失敗，使用預設標題",
-        "title_naming_success": "標題生成成功",
-        "wait_for_title_naming": "正在生成標題...",
+        "title_naming_failed": "產生標題失敗，改用預設標題",
+        "title_naming_success": "已成功產生標題",
+        "wait_for_title_naming": "正在產生標題...",
         "word": "匯出為 Word",
         "yuque": "匯出到語雀"
       },
       "list": "話題列表",
+      "manage": {
+        "clear_selection": "取消選擇",
+        "delete": {
+          "confirm": {
+            "content": "確定要刪除選中的 {{count}} 個話題嗎？此操作不可撤銷。",
+            "title": "刪除話題"
+          },
+          "success": "已刪除 {{count}} 個話題"
+        },
+        "deselect_all": "取消全選",
+        "error": {
+          "at_least_one": "至少需要保留一個話題"
+        },
+        "move": {
+          "button": "移動",
+          "placeholder": "選擇目標助手",
+          "success": "已移動 {{count}} 個話題"
+        },
+        "pinned": "已固定的話題",
+        "selected_count": "已選擇 {{count}} 個",
+        "title": "管理話題",
+        "unpinned": "未固定的話題"
+      },
       "move_to": "移動到",
       "new": "開始新對話",
       "pin": "固定話題",
@@ -1011,6 +1080,10 @@
         "label": "話題提示詞",
         "tips": "話題提示詞：針對目前話題提供額外的補充提示詞"
       },
+      "search": {
+        "placeholder": "搜尋話題...",
+        "title": "搜尋"
+      },
       "title": "話題",
       "unpin": "取消固定"
     },
@@ -1023,7 +1096,7 @@
   },
   "code": {
     "auto_update_to_latest": "檢查更新並安裝最新版本",
-    "bun_required_message": "運行 CLI 工具需要安裝 Bun 環境",
+    "bun_required_message": "運作 CLI 工具需要安裝 Bun 環境",
     "cli_tool": "CLI 工具",
     "cli_tool_placeholder": "選擇要使用的 CLI 工具",
     "custom_path": "自訂路徑",
@@ -1031,7 +1104,7 @@
     "custom_path_required": "此終端機需要設定自訂路徑",
     "custom_path_set": "自訂終端機路徑設定成功",
     "description": "快速啟動多個程式碼 CLI 工具，提高開發效率",
-    "env_vars_help": "輸入自定義環境變數（每行一個，格式：KEY=value）",
+    "env_vars_help": "輸入自訂環境變數（每行一個，格式：KEY=value）",
     "environment_variables": "環境變數",
     "folder_placeholder": "選擇工作目錄",
     "install_bun": "安裝 Bun",
@@ -1041,7 +1114,7 @@
       "error": "啟動失敗，請重試",
       "label": "啟動",
       "success": "啟動成功",
-      "validation_error": "請完成所有必填項目：CLI 工具、模型和工作目錄"
+      "validation_error": "請完成所有必填欄位：CLI 工具、模型和工作目錄"
     },
     "launching": "啟動中...",
     "model": "模型",
@@ -1057,11 +1130,11 @@
     "working_directory": "工作目錄"
   },
   "code_block": {
-    "collapse": "折疊",
+    "collapse": "收合",
     "copy": {
       "failed": "複製失敗",
       "label": "複製",
-      "source": "複製源碼",
+      "source": "複製原始碼",
       "success": "已複製"
     },
     "download": {
@@ -1070,26 +1143,26 @@
       },
       "label": "下載",
       "png": "下載 PNG",
-      "source": "下載源碼",
+      "source": "下載原始碼",
       "svg": "下載 SVG"
     },
     "edit": {
       "label": "編輯",
       "save": {
         "failed": {
-          "label": "保存失敗",
-          "message_not_found": "保存失敗，沒有找到對應的消息"
+          "label": "儲存失敗",
+          "message_not_found": "儲存失敗，找不到對應的訊息"
         },
-        "label": "保存修改",
-        "success": "已保存"
+        "label": "儲存變更",
+        "success": "已儲存"
       }
     },
     "expand": "展開",
     "more": "更多",
-    "run": "運行代碼",
+    "run": "執行",
     "split": {
-      "label": "分割視圖",
-      "restore": "取消分割視圖"
+      "label": "分割檢視",
+      "restore": "還原分割檢視"
     },
     "wrap": {
       "off": "停用自動換行",
@@ -1108,19 +1181,19 @@
     "assistant_one": "助手",
     "assistant_other": "助手",
     "avatar": "頭像",
-    "back": "返回",
+    "back": "回上一頁",
     "browse": "瀏覽",
     "cancel": "取消",
     "chat": "聊天",
     "clear": "清除",
     "close": "關閉",
-    "collapse": "折疊",
+    "collapse": "收合",
     "completed": "已完成",
     "confirm": "確認",
     "copied": "已複製",
     "copy": "複製",
     "copy_failed": "複製失敗",
-    "current": "当前",
+    "current": "目前",
     "cut": "剪下",
     "default": "預設",
     "delete": "刪除",
@@ -1128,9 +1201,9 @@
     "delete_failed": "刪除失敗",
     "delete_success": "刪除成功",
     "description": "描述",
-    "detail": "詳情",
+    "detail": "詳細資訊",
     "disabled": "已停用",
-    "docs": "文件",
+    "docs": "說明文件",
     "download": "下載",
     "duplicate": "複製",
     "edit": "編輯",
@@ -1142,7 +1215,7 @@
     },
     "expand": "展開",
     "file": {
-      "not_supported": "不支持的文件類型 {{type}}"
+      "not_supported": "不支援的檔案類型 {{type}}"
     },
     "footnote": "引用內容",
     "footnotes": "引用",
@@ -1154,7 +1227,7 @@
     "invalid_value": "無效值",
     "knowledge_base": "知識庫",
     "language": "語言",
-    "loading": "加載中...",
+    "loading": "載入中...",
     "model": "模型",
     "models": "模型",
     "more": "更多",
@@ -1175,30 +1248,33 @@
     "provider": "供應商",
     "reasoning_content": "已深度思考",
     "refresh": "重新整理",
-    "regenerate": "重新生成",
+    "regenerate": "重新產生",
     "rename": "重新命名",
     "reset": "重設",
     "save": "儲存",
     "saved": "已儲存",
     "search": "搜尋",
     "select": "選擇",
+    "select_all": "全選",
     "selected": "已選擇",
     "selectedItems": "已選擇 {{count}} 項",
-    "selectedMessages": "選中 {{count}} 條訊息",
+    "selectedMessages": "已選取 {{count}} 則訊息",
     "settings": "設定",
     "sort": {
       "pinyin": {
-        "asc": "按拼音升序",
-        "desc": "按拼音降序",
-        "label": "按拼音排序"
+        "asc": "依拼音遞增",
+        "desc": "依拼音遞減",
+        "label": "依拼音排序"
       }
     },
     "stop": "停止",
+    "subscribe": "訂閱",
     "success": "成功",
     "swap": "交換",
     "topics": "話題",
-    "unknown": "Unknown",
+    "unknown": "未知",
     "unnamed": "未命名",
+    "unsubscribe": "取消訂閱",
     "update_success": "更新成功",
     "upload_files": "上傳檔案",
     "warning": "警告",
@@ -1210,60 +1286,60 @@
   "endpoint_type": {
     "anthropic": "Anthropic",
     "gemini": "Gemini",
-    "image-generation": "圖像生成 (OpenAI)",
+    "image-generation": "影像產生（OpenAI）",
     "jina-rerank": "Jina Rerank",
     "openai": "OpenAI",
     "openai-response": "OpenAI-Response"
   },
   "error": {
-    "availableProviders": "可用提供商",
+    "availableProviders": "可用供應商",
     "availableTools": "可用工具",
     "backup": {
       "file_format": "備份檔案格式錯誤"
     },
     "boundary": {
       "default": {
-        "devtools": "打開除錯面板",
+        "devtools": "開啟除錯面板",
         "message": "似乎出現了一些問題...",
         "reload": "重新載入"
       },
-      "details": "詳細信息",
+      "details": "詳細資訊",
       "mcp": {
-        "invalid": "無效的MCP伺服器"
+        "invalid": "無效的 MCP 伺服器"
       }
     },
     "cause": "錯誤原因",
     "chat": {
       "chunk": {
-        "non_json": "返回了無效的資料格式"
+        "non_json": "回傳了無效的資料格式"
       },
-      "insufficient_balance": "請前往 <provider>{{provider}}</provider> 充值",
-      "no_api_key": "您未配置 API 密钥，请前往 <provider>{{provider}}</provider> 获取API密钥",
-      "quota_exceeded": "您今日{{quota}}免费配额已用尽，请前往 <provider>{{provider}}</provider> 获取API密钥，配置API密钥后继续使用",
-      "response": "出現錯誤。如果尚未設定 API 金鑰，請前往設定 > 模型提供者中設定金鑰"
+      "insufficient_balance": "請前往 <provider>{{provider}}</provider> 儲值。",
+      "no_api_key": "尚未設定 API 金鑰，請前往 <provider>{{provider}}</provider> 取得 API 金鑰。",
+      "quota_exceeded": "今日免費配額（{{quota}}）已用盡，請前往 <provider>{{provider}}</provider> 取得 API 金鑰並完成設定後再繼續使用。",
+      "response": "發生錯誤。請確認是否已在「設定 > 供應商」設定 API 金鑰。"
     },
     "content": "內容",
-    "data": "数据",
-    "detail": "錯誤詳情",
-    "details": "詳細信息",
+    "data": "資料",
+    "detail": "錯誤詳細資訊",
+    "details": "詳細資訊",
     "errors": "錯誤",
     "finishReason": "結束原因",
     "functionality": "功能",
     "http": {
       "400": "請求錯誤，請檢查請求參數是否正確。如果修改了模型設定，請重設到預設設定",
       "401": "身份驗證失敗，請檢查 API 金鑰是否正確",
-      "403": "禁止存取，請檢查是否實名認證，或聯絡供應商商問被禁止原因",
-      "404": "模型不存在或者請求路徑錯誤",
+      "403": "禁止存取，請確認帳號是否完成實名認證，或聯絡供應商詢問原因",
+      "404": "模型不存在或請求路徑錯誤",
       "429": "請求過多，請稍後再試",
       "500": "伺服器錯誤，請稍後再試",
       "502": "閘道器錯誤，請稍後再試",
       "503": "服務無法使用，請稍後再試",
-      "504": "閘道器超時，請稍後再試"
+      "504": "閘道器逾時，請稍後再試"
     },
     "lastError": "最後錯誤",
-    "maxEmbeddingsPerCall": "每次調用的最大嵌入",
+    "maxEmbeddingsPerCall": "每次呼叫的最大嵌入",
     "message": "錯誤訊息",
-    "missing_user_message": "無法切換模型回應：原始用戶訊息已被刪除。請發送新訊息以獲得此模型回應。",
+    "missing_user_message": "無法切換模型回應：原始使用者訊息已被刪除。請傳送新訊息以獲得此模型回應。",
     "model": {
       "exists": "模型已存在",
       "not_exists": "模型不存在"
@@ -1274,44 +1350,44 @@
     "no_api_key": "API 金鑰未設定",
     "no_response": "無回應",
     "originalError": "原錯誤",
-    "originalMessage": "原消息",
+    "originalMessage": "原始訊息",
     "parameter": "參數",
     "pause_placeholder": "回應已暫停",
     "prompt": "提示詞",
-    "provider": "提供商",
+    "provider": "供應商",
     "providerId": "提供者 ID",
     "provider_disabled": "模型供應商未啟用",
     "reason": "原因",
     "render": {
-      "description": "消息內容渲染失敗，請檢查消息內容格式是否正確",
+      "description": "訊息內容渲染失敗，請檢查訊息內容格式是否正確",
       "title": "渲染錯誤"
     },
     "requestBody": "請求內容",
-    "requestBodyValues": "请求体",
+    "requestBodyValues": "請求本文參數",
     "requestUrl": "請求路徑",
-    "response": "響應",
-    "responseBody": "响应内容",
-    "responseHeaders": "响应首部",
-    "responses": "響應",
+    "response": "回應",
+    "responseBody": "回應本文",
+    "responseHeaders": "回應標頭",
+    "responses": "回應",
     "role": "角色",
-    "stack": "堆棧信息",
+    "stack": "堆疊追蹤",
     "status": "狀態碼",
     "statusCode": "狀態碼",
-    "statusText": "狀態文本",
-    "text": "文本",
+    "statusText": "狀態文字",
+    "text": "文字",
     "toolInput": "工具輸入",
-    "toolName": "工具名",
+    "toolName": "工具名稱",
     "unknown": "未知錯誤",
     "usage": "用量",
-    "user_message_not_found": "無法找到原始用戶訊息",
+    "user_message_not_found": "無法找到原始使用者訊息",
     "value": "值",
     "values": "值"
   },
   "export": {
     "assistant": "助手",
     "attached_files": "附件",
-    "conversation_details": "會話詳細資訊",
-    "conversation_history": "會話歷史",
+    "conversation_details": "對話詳細資訊",
+    "conversation_history": "對話紀錄",
     "created": "建立時間",
     "last_updated": "最後更新",
     "messages": "訊息數",
@@ -1339,7 +1415,7 @@
     "document": "文件",
     "edit": "編輯",
     "error": {
-      "open_path": "無法開啟路徑: {{path}}"
+      "open_path": "無法開啟路徑：{{path}}"
     },
     "file": "檔案",
     "image": "圖片",
@@ -1380,15 +1456,15 @@
   },
   "html_artifacts": {
     "capture": {
-      "label": "捕獲頁面",
+      "label": "擷取頁面",
       "to_clipboard": "複製到剪貼簿",
-      "to_file": "保存為圖片"
+      "to_file": "儲存為圖片"
     },
     "code": "程式碼",
-    "empty_preview": "無內容可展示",
-    "generating": "生成中",
+    "empty_preview": "沒有內容可顯示",
+    "generating": "產生中",
     "preview": "預覽",
-    "split": "分屏"
+    "split": "分割畫面"
   },
   "import": {
     "chatgpt": {
@@ -1439,7 +1515,7 @@
     "chunk_size_change_warning": "分段大小和重疊大小修改只針對新新增的內容有效",
     "chunk_size_placeholder": "預設值（不建議修改）",
     "chunk_size_too_large": "分段大小不能超過模型上下文限制（{{max_context}}）",
-    "chunk_size_tooltip": "將文件切割分段，每段的大小，不能超過模型上下文限制",
+    "chunk_size_tooltip": "將檔案切割分段，每段大小不得超過模型的上下文上限",
     "clear_selection": "清除選擇",
     "delete": "刪除",
     "delete_confirm": "確定要刪除此知識庫嗎？",
@@ -1447,16 +1523,16 @@
     "dimensions_auto_set": "自動設定嵌入維度",
     "dimensions_default": "模型將使用預設嵌入維度",
     "dimensions_error_invalid": "無效的嵌入維度",
-    "dimensions_set_right": "⚠️ 請確保模型支援所設置的嵌入維度大小",
-    "dimensions_size_placeholder": "留空表示不設置",
+    "dimensions_set_right": "⚠️ 請確認模型支援所設定的嵌入維度大小",
+    "dimensions_size_placeholder": "留空表示不設定",
     "dimensions_size_too_large": "嵌入維度不能超過模型上下文限制（{{max_context}}）",
     "dimensions_size_tooltip": "嵌入維度大小，數值越大消耗的 Token 也越多。留空則不傳遞 dimensions 參數。",
     "directories": "目錄",
     "directory_placeholder": "請輸入目錄路徑",
-    "document_count": "請求文件片段數量",
+    "document_count": "請求檔案片段數量",
     "document_count_default": "預設",
-    "document_count_help": "請求文件片段數量越多，附帶的資訊越多，但需要消耗的 Token 也越多",
-    "drag_file": "拖拽檔案到這裡",
+    "document_count_help": "請求檔案片段數量越多，附帶的資訊越多，但需要消耗的 Token 也越多",
+    "drag_file": "拖曳檔案到這裡",
     "drag_image": "拖曳圖片到這裡",
     "edit_remark": "修改備註",
     "edit_remark_placeholder": "請輸入備註內容",
@@ -1464,7 +1540,7 @@
     "embedding_model_required": "知識庫嵌入模型是必需的",
     "empty": "暫無知識庫",
     "error": {
-      "failed_to_create": "知識庫創建失敗",
+      "failed_to_create": "知識庫建立失敗",
       "failed_to_edit": "知識庫編輯失敗",
       "model_invalid": "未選擇模型",
       "video": {
@@ -1484,7 +1560,7 @@
         "text": "遷移"
       },
       "confirm": {
-        "content": "檢測到嵌入模型或維度有變更，無法直接保存配置，可以執行遷移。知識庫遷移不會刪除舊知識庫，而是建立一個副本之後重新處理所有知識庫條目，可能消耗大量 tokens，請謹慎操作。",
+        "content": "偵測到嵌入模型或維度有變更，無法直接儲存設定，可以執行遷移。知識庫遷移不會刪除舊知識庫，而是建立一個副本後重新處理所有知識庫條目，可能消耗大量 Token，請謹慎操作。",
         "ok": "開始遷移",
         "title": "知識庫遷移"
       },
@@ -1497,7 +1573,7 @@
       "target_model": "目標模型"
     },
     "model_info": "模型資訊",
-    "name_required": "知識庫名稱為必填項目",
+    "name_required": "知識庫名稱為必填欄位",
     "no_bases": "暫無知識庫",
     "no_match": "不符合知識庫內容",
     "no_provider": "知識庫模型供應商遺失，該知識庫將不再支援，請重新建立知識庫",
@@ -1505,7 +1581,7 @@
     "not_support": "知識庫資料庫引擎已更新，該知識庫將不再支援，請重新建立知識庫",
     "notes": "筆記",
     "notes_placeholder": "輸入此知識庫的附加資訊或上下文...",
-    "provider_not_found": "未找到服務商",
+    "provider_not_found": "未找到供應商",
     "quota": "{{name}} 剩餘配額：{{quota}}",
     "quota_empty": "今日{{name}}額度不足，請前往官網申請",
     "quota_infinity": "{{name}} 配額：無限制",
@@ -1514,10 +1590,10 @@
     "search_placeholder": "輸入查詢內容",
     "settings": {
       "preprocessing": "預處理",
-      "preprocessing_tooltip": "預處理上傳的文件",
+      "preprocessing_tooltip": "預處理上傳的檔案",
       "title": "知識庫設定"
     },
-    "sitemap_added": "添加成功",
+    "sitemap_added": "新增成功",
     "sitemap_placeholder": "請輸入網站地圖 URL",
     "sitemaps": "網站",
     "source": "來源",
@@ -1532,15 +1608,15 @@
     "status_preprocess_failed": "預處理失敗",
     "status_processing": "處理中",
     "subtitle_file": "字幕檔案",
-    "threshold": "匹配度閾值",
+    "threshold": "相符度門檻",
     "threshold_placeholder": "未設定",
-    "threshold_too_large_or_small": "閾值不能大於 1 或小於 0",
+    "threshold_too_large_or_small": "門檻值不能大於 1 或小於 0",
     "threshold_tooltip": "用於衡量使用者問題與知識庫內容之間的相關性（0-1）",
     "title": "知識庫",
-    "topN": "返回結果數量",
+    "topN": "回傳結果數量",
     "topN_placeholder": "未設定",
-    "topN_too_large_or_small": "返回結果數量不能大於 30 或小於 1",
-    "topN_tooltip": "返回的匹配結果數量，數值越大，匹配結果越多，但消耗的 Token 也越多",
+    "topN_too_large_or_small": "回傳結果數量不能大於 30 或小於 1",
+    "topN_tooltip": "回傳的相符結果數量，數值越大，相符結果越多，但消耗的 Token 也越多",
     "url_added": "網址已新增",
     "url_placeholder": "請輸入網址，多個網址用換行符號分隔",
     "urls": "網址",
@@ -1572,7 +1648,7 @@
   },
   "launchpad": {
     "apps": "應用",
-    "minapps": "小程序"
+    "minapps": "小程式"
   },
   "lmstudio": {
     "keep_alive_time": {
@@ -1593,10 +1669,10 @@
     "add_user_failed": "新增使用者失敗",
     "all_users": "所有使用者",
     "cannot_delete_default_user": "不能刪除預設使用者",
-    "configure_memory_first": "請先配置記憶設定",
+    "configure_memory_first": "請先設定記憶設定",
     "content": "內容",
     "current_user": "目前使用者",
-    "custom": "自定義",
+    "custom": "自訂",
     "default": "預設",
     "default_user": "預設使用者",
     "delete_confirm": "確定要刪除這條記憶嗎？",
@@ -1628,35 +1704,35 @@
     "loading": "載入記憶中...",
     "loading_memories": "正在載入記憶...",
     "memories_description": "顯示 {{count}} / {{total}} 條記憶",
-    "memories_reset_success": "{{user}} 的所有記憶已成功重置",
+    "memories_reset_success": "{{user}} 的所有記憶已成功重設",
     "memory": "個記憶",
     "memory_content": "記憶內容",
     "memory_placeholder": "輸入記憶內容...",
-    "new_user_id": "新使用者ID",
-    "new_user_id_placeholder": "輸入唯一的使用者ID",
+    "new_user_id": "新使用者 ID",
+    "new_user_id_placeholder": "輸入唯一的使用者 ID",
     "no_matching_memories": "未找到符合的記憶",
     "no_memories": "暫無記憶",
     "no_memories_description": "開始新增您的第一個記憶吧",
-    "not_configured_desc": "請在記憶設定中配置嵌入和LLM模型以啟用記憶功能。",
-    "not_configured_title": "記憶未配置",
+    "not_configured_desc": "請在記憶設定中設定嵌入和 LLM 模型以啟用記憶功能。",
+    "not_configured_title": "記憶未設定",
     "pagination_total": "第 {{start}}-{{end}} 項，共 {{total}} 項",
     "please_enter_memory": "請輸入記憶內容",
     "please_select_embedding_model": "請選擇一個嵌入模型",
-    "please_select_llm_model": "請選擇一個LLM模型",
+    "please_select_llm_model": "請選擇一個 LLM 模型",
     "reset_filters": "重設篩選",
-    "reset_memories": "重置記憶",
+    "reset_memories": "重設記憶",
     "reset_memories_confirm_content": "確定要永久刪除 {{user}} 的所有記憶嗎？此操作無法復原。",
-    "reset_memories_confirm_title": "重置所有記憶",
-    "reset_memories_failed": "重置記憶失敗",
-    "reset_user_memories": "重置使用者記憶",
-    "reset_user_memories_confirm_content": "確定要重置 {{user}} 的所有記憶嗎？",
-    "reset_user_memories_confirm_title": "重置使用者記憶",
-    "reset_user_memories_failed": "重置使用者記憶失敗",
+    "reset_memories_confirm_title": "重設所有記憶",
+    "reset_memories_failed": "重設記憶失敗",
+    "reset_user_memories": "重設使用者記憶",
+    "reset_user_memories_confirm_content": "確定要重設 {{user}} 的所有記憶嗎？",
+    "reset_user_memories_confirm_title": "重設使用者記憶",
+    "reset_user_memories_failed": "重設使用者記憶失敗",
     "score": "分數",
     "search": "搜尋",
     "search_placeholder": "搜尋記憶...",
     "select_embedding_model_placeholder": "選擇嵌入模型",
-    "select_llm_model_placeholder": "選擇LLM模型",
+    "select_llm_model_placeholder": "選擇 LLM 模型",
     "select_user": "選擇使用者",
     "settings": "設定",
     "settings_title": "記憶體設定",
@@ -1674,16 +1750,16 @@
     "user": "使用者",
     "user_created": "使用者 {{user}} 建立並切換成功",
     "user_deleted": "使用者 {{user}} 刪除成功",
-    "user_id": "使用者ID",
-    "user_id_exists": "此使用者ID已存在",
-    "user_id_invalid_chars": "使用者ID只能包含字母、數字、連字符和底線",
-    "user_id_placeholder": "輸入使用者ID（可選）",
-    "user_id_required": "使用者ID為必填欄位",
-    "user_id_reserved": "'default-user' 為保留字，請使用其他ID",
-    "user_id_rules": "使用者ID必须唯一，只能包含字母、數字、連字符(-)和底線(_)",
-    "user_id_too_long": "使用者ID不能超過50個字元",
+    "user_id": "使用者 ID",
+    "user_id_exists": "此使用者 ID 已存在",
+    "user_id_invalid_chars": "使用者 ID 只能包含英文字母、數字、連字號與底線",
+    "user_id_placeholder": "輸入使用者 ID（可選）",
+    "user_id_required": "使用者 ID 為必填欄位",
+    "user_id_reserved": "'default-user' 為保留字，請使用其他 ID",
+    "user_id_rules": "使用者 ID 必須唯一，只能包含英文字母、數字、連字號（-）與底線（_）",
+    "user_id_too_long": "使用者 ID 不能超過 50 個字元",
     "user_management": "使用者管理",
-    "user_memories_reset": "{{user}} 的所有記憶已重置",
+    "user_memories_reset": "{{user}} 的所有記憶已重設",
     "user_switch_failed": "切換使用者失敗",
     "user_switched": "使用者內容已切換至 {{user}}",
     "users": "使用者"
@@ -1702,8 +1778,8 @@
         }
       },
       "connection": {
-        "failed": "連接失敗",
-        "success": "連接成功"
+        "failed": "連線失敗",
+        "success": "連線成功"
       }
     },
     "assistant": {
@@ -1712,8 +1788,8 @@
       }
     },
     "attachments": {
-      "pasted_image": "剪切板圖片",
-      "pasted_text": "剪切板文件"
+      "pasted_image": "剪貼簿圖片",
+      "pasted_text": "剪貼簿檔案"
     },
     "backup": {
       "failed": "備份失敗",
@@ -1723,7 +1799,7 @@
       "success": "備份成功"
     },
     "branch": {
-      "error": "分支创建失败"
+      "error": "分支建立失敗"
     },
     "chat": {
       "completion": {
@@ -1739,7 +1815,7 @@
     },
     "delete": {
       "confirm": {
-        "content": "確認刪除選中的 {{count}} 條訊息嗎？",
+        "content": "確定要刪除選取的 {{count}} 則訊息嗎？",
         "title": "刪除確認"
       },
       "failed": "刪除失敗",
@@ -1755,11 +1831,11 @@
     "empty_url": "無法下載圖片，可能是提示詞包含敏感內容或違禁詞彙",
     "error": {
       "chunk_overlap_too_large": "分段重疊不能大於分段大小",
-      "copy": "复制失败",
+      "copy": "複製失敗",
       "dimension_too_large": "內容尺寸過大",
       "enter": {
         "api": {
-          "host": "請先輸入您的 API 主機地址",
+          "host": "請先輸入您的 API 主機位址",
           "label": "請先輸入您的 API 金鑰"
         },
         "model": "請先選擇一個模型",
@@ -1775,39 +1851,39 @@
         "enter": {
           "model": "請選擇一個模型"
         },
-        "nutstore": "無效的坚果云設定",
-        "nutstore_token": "無效的坚果云 Token",
+        "nutstore": "無效的堅果雲設定",
+        "nutstore_token": "無效的堅果雲 Token",
         "proxy": {
           "url": "無效的代理伺服器 URL"
         },
         "webdav": "無效的 WebDAV 設定"
       },
       "joplin": {
-        "export": "匯出 Joplin 失敗，請保持 Joplin 已運行並檢查連接狀態或檢查設定",
+        "export": "匯出 Joplin 失敗，請確認 Joplin 正在運作，並檢查連線狀態與設定。",
         "no_config": "未設定 Joplin 授權 Token 或 URL"
       },
       "markdown": {
         "export": {
-          "preconf": "導出 Markdown 文件到預先設定的路徑失敗",
-          "specified": "導出 Markdown 文件失敗"
+          "preconf": "匯出 Markdown 檔案到預先設定的路徑失敗",
+          "specified": "匯出 Markdown 檔案失敗"
         }
       },
       "notes": {
-        "export": "導出筆記失敗"
+        "export": "匯出筆記失敗"
       },
       "notion": {
-        "export": "匯出 Notion 錯誤，請檢查連接狀態並對照文件檢查設定",
+        "export": "匯出 Notion 失敗，請檢查連線狀態並參考說明文件確認設定",
         "no_api_key": "未設定 Notion API Key 或 Notion Database ID",
         "no_content": "沒有可匯出至 Notion 的內容"
       },
       "siyuan": {
-        "export": "導出思源筆記失敗，請檢查連接狀態並對照文檔檢查配置",
-        "no_config": "未配置思源筆記 API 地址或令牌"
+        "export": "匯出思源筆記失敗，請檢查連線狀態並參考說明文件確認設定",
+        "no_config": "未設定思源筆記 API 位址或權杖"
       },
       "unknown": "未知錯誤",
       "yuque": {
-        "export": "匯出語雀錯誤，請檢查連接狀態並對照文件檢查設定",
-        "no_config": "未設定語雀 Token 或知識庫 Url"
+        "export": "匯出語雀失敗，請檢查連線狀態並參考說明文件確認設定",
+        "no_config": "未設定語雀 Token 或知識庫 URL"
       }
     },
     "group": {
@@ -1858,15 +1934,15 @@
       },
       "video": {
         "error": {
-          "local_file_missing": "本地視頻檔案路徑不存在",
-          "unsupported_type": "不支援的視頻類型",
-          "youtube_url_missing": "YouTube 視頻連結不存在"
+          "local_file_missing": "本機影片檔案路徑不存在",
+          "unsupported_type": "不支援的影片類型",
+          "youtube_url_missing": "YouTube 影片連結不存在"
         }
       }
     },
     "processing": "正在處理...",
     "regenerate": {
-      "confirm": "重新生成會覆蓋目前訊息"
+      "confirm": "重新產生會覆寫目前訊息"
     },
     "reset": {
       "confirm": {
@@ -1880,8 +1956,8 @@
       }
     },
     "restore": {
-      "failed": "恢復失敗",
-      "success": "恢復成功"
+      "failed": "還原失敗",
+      "success": "還原成功"
     },
     "save": {
       "success": {
@@ -1895,34 +1971,34 @@
       },
       "markdown": {
         "export": {
-          "preconf": "成功導出 Markdown 文件到預先設定的路徑",
-          "specified": "成功導出 Markdown 文件"
+          "preconf": "成功匯出 Markdown 檔案到預先設定的路徑",
+          "specified": "成功匯出 Markdown 檔案"
         }
       },
       "notes": {
-        "export": "成功導出到筆記"
+        "export": "成功匯出到筆記"
       },
       "notion": {
         "export": "成功匯出到 Notion"
       },
       "siyuan": {
-        "export": "導出到思源筆記成功"
+        "export": "成功匯出到思源筆記"
       },
       "yuque": {
         "export": "成功匯出到語雀"
       }
     },
     "switch": {
-      "disabled": "請等待當前回覆完成"
+      "disabled": "請等待目前回覆完成"
     },
     "tools": {
-      "abort_failed": "工具調用中斷失敗",
-      "aborted": "工具調用已中斷",
+      "abort_failed": "工具呼叫中斷失敗",
+      "aborted": "工具呼叫已中斷",
       "autoApproveEnabled": "此工具已啟用自動批准",
       "cancelled": "已取消",
       "completed": "已完成",
       "error": "發生錯誤",
-      "invoking": "調用中",
+      "invoking": "呼叫中",
       "pending": "等待中",
       "preview": "預覽",
       "raw": "原始碼"
@@ -1944,7 +2020,7 @@
     },
     "warning": {
       "rate": {
-        "limit": "發送過於頻繁，請在 {{seconds}} 秒後再嘗試"
+        "limit": "傳送過於頻繁，請在 {{seconds}} 秒後再嘗試"
       }
     },
     "websearch": {
@@ -1952,12 +2028,12 @@
       "fetch_complete": "{{count}} 個搜尋結果",
       "rag": "正在執行 RAG...",
       "rag_complete": "保留 {{countBefore}} 個結果中的 {{countAfter}} 個...",
-      "rag_failed": "RAG 失敗，返回空結果..."
+      "rag_failed": "RAG 失敗，回傳空結果..."
     }
   },
   "minapp": {
-    "add_to_launchpad": "添加到启动台",
-    "add_to_sidebar": "添加到侧边栏",
+    "add_to_launchpad": "新增到啟動台",
+    "add_to_sidebar": "新增到側邊欄",
     "popup": {
       "close": "關閉小工具",
       "devtools": "開發者工具",
@@ -1965,13 +2041,13 @@
       "goForward": "下一頁",
       "minimize": "最小化小工具",
       "openExternal": "在瀏覽器中開啟",
-      "open_link_external_off": "当前：使用預設視窗開啟連結",
-      "open_link_external_on": "当前：在瀏覽器中開啟連結",
+      "open_link_external_off": "目前：使用預設視窗開啟連結",
+      "open_link_external_on": "目前：在瀏覽器中開啟連結",
       "refresh": "重新整理",
       "rightclick_copyurl": "右鍵複製 URL"
     },
-    "remove_from_launchpad": "从启动台移除",
-    "remove_from_sidebar": "从侧边栏移除",
+    "remove_from_launchpad": "從啟動台移除",
+    "remove_from_sidebar": "從側邊欄移除",
     "sidebar": {
       "close": {
         "title": "關閉"
@@ -1983,7 +2059,7 @@
         "title": "隱藏"
       },
       "remove_custom": {
-        "title": "刪除自定義應用"
+        "title": "刪除自訂小工具"
       }
     },
     "title": "小工具"
@@ -1991,28 +2067,28 @@
   "minapps": {
     "ant-ling": "Ant Ling",
     "baichuan": "百小應",
-    "baidu-ai-search": "百度AI搜索",
+    "baidu-ai-search": "百度 AI 搜尋",
     "chatglm": "智譜清言",
-    "dangbei": "當貝AI",
+    "dangbei": "當貝 AI",
     "doubao": "豆包",
     "hailuo": "海螺",
-    "metaso": "秘塔AI搜索",
-    "nami-ai": "納米AI",
-    "nami-ai-search": "納米AI搜索",
+    "metaso": "秘塔 AI 搜尋",
+    "nami-ai": "奈米 AI",
+    "nami-ai-search": "奈米 AI 搜尋",
     "qwen": "通義千問",
     "sensechat": "商量",
-    "stepfun": "階躍AI",
+    "stepfun": "階躍 AI",
     "tencent-yuanbao": "騰訊元寶",
-    "tiangong-ai": "天工AI",
+    "tiangong-ai": "天工 AI",
     "wanzhi": "萬知",
     "wenxin": "文心一言",
-    "wps-copilot": "WPS靈犀",
+    "wps-copilot": "WPS 靈犀",
     "xiaoyi": "小藝",
     "zhihu": "知乎直答"
   },
   "miniwindow": {
     "alert": {
-      "google_login": "提示：如遇到Google登入提示\"不受信任的瀏覽器\"，請先在小程序列表中的Google小程序中完成帳號登入，再在其它小程序使用Google登入"
+      "google_login": "提示：若 Google 登入時顯示「不受信任的瀏覽器」，請先在小程式清單中的 Google 小程式完成帳號登入，再到其他小程式使用 Google 登入。"
     },
     "clipboard": {
       "empty": "剪貼簿為空"
@@ -2027,7 +2103,7 @@
       "backspace_clear": "按 Backspace 清空",
       "copy_last_message": "按 C 鍵複製",
       "esc": "按 ESC {{action}}",
-      "esc_back": "返回",
+      "esc_back": "回傳",
       "esc_close": "關閉視窗",
       "esc_pause": "暫停"
     },
@@ -2038,7 +2114,7 @@
       }
     },
     "tooltip": {
-      "pin": "窗口置頂"
+      "pin": "視窗置頂"
     }
   },
   "models": {
@@ -2051,12 +2127,12 @@
     "embedding_dimensions": "嵌入維度",
     "embedding_model": "嵌入模型",
     "embedding_model_tooltip": "在設定 -> 模型服務中點選管理按鈕新增",
-    "enable_tool_use": "工具調用",
+    "enable_tool_use": "工具呼叫",
     "filter": {
       "by_tag": "按標籤篩選",
       "selected": "已選標籤"
     },
-    "function_calling": "函數調用",
+    "function_calling": "函式呼叫",
     "invalid_model": "無效模型",
     "no_matches": "無可用模型",
     "parameter_name": "參數名稱",
@@ -2081,8 +2157,8 @@
     "reasoning": "推理",
     "rerank_model": "重排模型",
     "rerank_model_not_support_provider": "目前，重新排序模型不支援此提供者（{{provider}}）",
-    "rerank_model_support_provider": "目前重排序模型僅支持部分服務商 ({{provider}})",
-    "rerank_model_tooltip": "在設定 -> 模型服務中點擊管理按鈕添加",
+    "rerank_model_support_provider": "目前重排序模型僅支援部分供應商 ({{provider}})",
+    "rerank_model_tooltip": "在「設定 → 模型服務」點選 [管理] 按鈕新增",
     "search": {
       "placeholder": "搜尋模型...",
       "tooltip": "搜尋模型"
@@ -2112,24 +2188,25 @@
     }
   },
   "navigate": {
-    "provider_settings": "跳轉到服務商設置界面"
+    "provider_settings": "前往供應商設定頁面"
   },
   "notes": {
     "auto_rename": {
-      "empty_note": "筆記為空，無法生成名稱",
-      "failed": "生成筆記名稱失敗",
-      "label": "生成筆記名稱",
-      "success": "筆記名稱生成成功"
+      "empty_note": "筆記為空，無法產生名稱",
+      "failed": "產生筆記名稱失敗",
+      "label": "產生筆記名稱",
+      "success": "已成功產生筆記名稱"
     },
-    "characters": "字符",
-    "collapse": "收起",
+    "characters": "字元",
+    "collapse": "收合",
     "content_placeholder": "請輸入筆記內容...",
     "copyContent": "複製內容",
-    "delete": "删除",
+    "crossPlatformRestoreWarning": "偵測到從其他裝置恢復設定，但筆記目錄為空。請將筆記檔案複製到：{{path}}",
+    "delete": "刪除",
     "delete_confirm": "確定要刪除此 {{type}} 嗎？",
     "delete_folder_confirm": "確定要刪除資料夾 \"{{name}}\" 及其所有內容嗎？",
     "delete_note_confirm": "確定要刪除筆記 \"{{name}}\" 嗎？",
-    "drop_markdown_hint": "拖拽 .md 文件或資料夾到此處導入",
+    "drop_markdown_hint": "拖曳 .md 檔案或資料夾到此處匯入",
     "empty": "暫無筆記",
     "expand": "展開",
     "export_failed": "匯出至知識庫失敗",
@@ -2137,96 +2214,96 @@
     "export_success": "成功匯出至知識庫",
     "failed_to_select_files": "[to be translated]:Failed to select files",
     "failed_to_select_folder": "選擇資料夾失敗",
-    "folder": "文件夹",
-    "new_folder": "新建文件夾",
-    "new_note": "新建筆記",
-    "no_content_to_copy": "沒有內容可複制",
-    "no_file_selected": "請選擇要上傳的文件",
+    "folder": "資料夾",
+    "new_folder": "新增資料夾",
+    "new_note": "新增筆記",
+    "no_content_to_copy": "沒有內容可複製",
+    "no_file_selected": "請選擇要上傳的檔案",
     "no_markdown_files_in_folder": "所選資料夾中沒有 Markdown 檔案",
     "no_valid_files": "沒有上傳有效的檔案",
-    "open_folder": "打開外部文件夾",
-    "open_outside": "從外部打開",
-    "rename": "重命名",
-    "rename_changed": "由於安全策略，文件名已從 {{original}} 更改為 {{final}}",
+    "open_folder": "開啟外部資料夾",
+    "open_outside": "從外部開啟",
+    "rename": "重新命名",
+    "rename_changed": "基於安全性考量，檔名已從 {{original}} 變更為 {{final}}",
     "save": "儲存到筆記",
     "search": {
-      "both": "名稱+內容",
+      "both": "名稱 + 內容",
       "content": "內容",
-      "found_results": "找到 {{count}} 個結果 (名稱: {{nameCount}}, 內容: {{contentCount}})",
-      "more_matches": "個匹配",
-      "searching": "搜索中...",
-      "show_less": "收起"
+      "found_results": "找到 {{count}} 個結果（名稱：{{nameCount}}，內容：{{contentCount}}）",
+      "more_matches": "更多符合結果",
+      "searching": "搜尋中...",
+      "show_less": "收合"
     },
     "select_files_to_upload": "[to be translated]:Select files to upload",
     "select_folder_to_upload": "選擇要上傳的資料夾",
     "settings": {
       "data": {
-        "apply": "應用",
-        "apply_path_failed": "應用路徑失敗",
-        "current_work_directory": "當前工作目錄",
+        "apply": "套用",
+        "apply_path_failed": "套用路徑失敗",
+        "current_work_directory": "目前工作目錄",
         "invalid_directory": "選擇的目錄無效或無權限",
         "path_required": "請選擇工作目錄",
         "path_updated": "工作目錄更新成功",
-        "reset_failed": "重置失敗",
-        "reset_to_default": "重置為默認",
+        "reset_failed": "重設失敗",
+        "reset_to_default": "重設為預設值",
         "select": "選擇",
         "select_directory_failed": "選擇目錄失敗",
-        "title": "數據設置",
-        "work_directory_description": "工作目錄是存儲所有筆記文件的位置。\n更改工作目錄不會移動現有文件，請手動遷移文件。",
+        "title": "資料設定",
+        "work_directory_description": "工作目錄是儲存所有筆記檔案的位置。\n變更工作目錄不會移動現有檔案，請手動移轉檔案。",
         "work_directory_placeholder": "選擇筆記工作目錄"
       },
       "display": {
-        "compress_content": "縮減欄寬",
-        "compress_content_description": "開啟後將限制每行字數，使屏幕顯示的內容減少",
-        "default_font": "默認字體",
-        "font_size": "字體大小",
-        "font_size_description": "調整字體大小以獲得更好的閱讀體驗 (10-30px)",
+        "compress_content": "內容壓縮",
+        "compress_content_description": "啟用後會限制每行字數，減少畫面顯示的內容，但讓長段落更好閱讀。",
+        "default_font": "預設字型",
+        "font_size": "字型大小",
+        "font_size_description": "調整字型大小以獲得更好的閱讀體驗 (10-30px)",
         "font_size_large": "大",
         "font_size_medium": "中",
         "font_size_small": "小",
-        "font_title": "字體設置",
-        "serif_font": "襯線字體",
+        "font_title": "字型設定",
+        "serif_font": "襯線字型",
         "show_table_of_contents": "顯示目錄大綱",
-        "show_table_of_contents_description": "顯示目錄大綱側邊欄，方便文檔內導航",
-        "title": "顯示"
+        "show_table_of_contents_description": "顯示目錄大綱側邊欄，方便在檔案內導覽",
+        "title": "顯示設定"
       },
       "editor": {
         "edit_mode": {
-          "description": "在編輯視圖下，新筆記默認採用的編輯模式",
-          "preview_mode": "實時預覽",
-          "source_mode": "源碼模式",
-          "title": "默認編輯視圖"
+          "description": "在編輯檢視中，新筆記的預設編輯模式",
+          "preview_mode": "即時預覽",
+          "source_mode": "原始碼模式",
+          "title": "預設編輯檢視"
         },
-        "title": "編輯器設置",
+        "title": "編輯器設定",
         "view_mode": {
-          "description": "新筆記默認的視圖模式",
+          "description": "新筆記的預設檢視模式",
           "edit_mode": "編輯模式",
           "read_mode": "閱讀模式",
-          "title": "默認視圖"
+          "title": "預設檢視"
         },
-        "view_mode_description": "設置新標籤頁的默認視圖模式。"
+        "view_mode_description": "設定新標籤頁的預設檢視模式。"
       },
       "title": "更多選項"
     },
     "show_starred": "顯示收藏的筆記",
-    "sort_a2z": "文件名（A-Z）",
+    "sort_a2z": "檔名（A-Z）",
     "sort_created_asc": "建立時間（從舊到新）",
     "sort_created_desc": "建立時間（從新到舊）",
     "sort_updated_asc": "更新時間（從舊到新）",
     "sort_updated_desc": "更新時間（從新到舊）",
-    "sort_z2a": "文件名（Z-A）",
-    "spell_check": "拼寫檢查",
-    "spell_check_tooltip": "啟用/禁用拼寫檢查",
+    "sort_z2a": "檔名（Z-A）",
+    "spell_check": "拼字檢查",
+    "spell_check_tooltip": "啟用/停用拼字檢查",
     "star": "收藏筆記",
     "starred_notes": "收藏的筆記",
     "title": "筆記",
-    "unsaved_changes": "你有未儲存的內容，確定要離開嗎？",
+    "unsaved_changes": "尚有未儲存的內容，確定要離開嗎？",
     "unstar": "取消收藏",
     "untitled_folder": "新資料夾",
     "untitled_note": "無標題筆記",
     "upload": "上傳",
     "upload_failed": "筆記上傳失敗",
-    "upload_files": "上傳文件",
+    "upload_files": "上傳檔案",
     "upload_folder": "上傳資料夾",
     "upload_success": "筆記上傳成功",
     "uploading": "正在上傳",
@@ -2235,14 +2312,14 @@
   "notification": {
     "assistant": "助手回應",
     "knowledge": {
-      "error": "無法將 {{type}} 加入知識庫: {{error}}",
+      "error": "無法將 {{type}} 加入知識庫：{{error}}",
       "success": "成功將 {{type}} 新增至知識庫"
     },
-    "tip": "如果回應成功，則只針對超過30秒的訊息發出提醒"
+    "tip": "如果回應成功，則只針對超過 30 秒的訊息發出提醒"
   },
   "ocr": {
     "builtin": {
-      "system": "系统 OCR"
+      "system": "系統 OCR"
     },
     "error": {
       "provider": {
@@ -2250,17 +2327,17 @@
         "existing": "提供者已存在",
         "get_providers": "取得可用提供者失敗",
         "not_found": "OCR 提供者不存在",
-        "update_failed": "更新配置失敗"
+        "update_failed": "更新設定失敗"
       },
-      "unknown": "OCR過程發生錯誤"
+      "unknown": "OCR 過程發生錯誤"
     },
     "file": {
-      "not_supported": "不支持的文件類型 {{type}}"
+      "not_supported": "不支援的檔案類型 {{type}}"
     },
     "processing": "OCR 處理中...",
     "warning": {
       "provider": {
-        "fallback": "已回退到 {{name}}，這可能導致問題"
+        "fallback": "已改用 {{name}}，這可能導致問題"
       }
     }
   },
@@ -2282,7 +2359,7 @@
       "stop": "停止 OVMS",
       "stopping": "停止中"
     },
-    "description": "<div><p>1. 下載 OV 模型。</p><p>2. 在 'Manager' 中新增模型。</p><p>僅支援 Windows！</p><p>OVMS 安裝路徑: '%USERPROFILE%\\.cherrystudio\\ovms' 。</p><p>請參考 <a href=https://github.com/openvinotoolkit/model_server/blob/c55551763d02825829337b62c2dcef9339706f79/docs/deploying_server_baremetal.md>Intel OVMS 指南</a></p></dev>",
+    "description": "<div><p>1. 下載 OV 模型。</p><p>2. 在 'Manager' 中新增模型。</p><p>僅支援 Windows！</p><p>OVMS 安裝路徑：'%USERPROFILE%\\.cherrystudio\\ovms' 。</p><p>請參考 <a href=https://github.com/openvinotoolkit/model_server/blob/c55551763d02825829337b62c2dcef9339706f79/docs/deploying_server_baremetal.md>Intel OVMS 指南</a></p></dev>",
     "download": {
       "button": "下載",
       "error": "下載失敗",
@@ -2297,25 +2374,25 @@
         "placeholder": "必填，例如 Qwen3-8B-int4-ov",
         "required": "請輸入模型名稱"
       },
-      "model_source": "模型來源:",
-      "model_task": "模型任務:",
+      "model_source": "模型來源：",
+      "model_task": "模型任務：",
       "success": "下載成功",
-      "success_desc": "模型\"{{modelName}}\"-\"{{modelId}}\"下載成功，請前往 OVMS 管理界面添加模型",
+      "success_desc": "模型\"{{modelName}}\"-\"{{modelId}}\"下載成功，請前往 OVMS 管理介面新增模型",
       "tip": "模型正在下載，有時需要幾個小時。請耐心等候...",
       "title": "下載 Intel OpenVINO 模型"
     },
     "failed": {
-      "install": "安裝 OVMS 失敗:",
+      "install": "安裝 OVMS 失敗：",
       "install_code_100": "未知錯誤",
-      "install_code_101": "僅支援 Intel(R) Core(TM) Ultra CPU",
+      "install_code_101": "僅支援 Intel(R) CPU",
       "install_code_102": "僅支援 Windows",
       "install_code_103": "下載 OVMS runtime 失敗",
       "install_code_104": "安裝 OVMS runtime 失敗",
-      "install_code_105": "創建 ovdnd.exe 失敗",
-      "install_code_106": "創建 run.bat 失敗",
+      "install_code_105": "建立 ovdnd.exe 失敗",
+      "install_code_106": "建立 run.bat 失敗",
       "install_code_110": "清理舊 OVMS runtime 失敗",
-      "run": "執行 OVMS 失敗:",
-      "stop": "停止 OVMS 失敗:"
+      "run": "執行 OVMS 失敗：",
+      "stop": "停止 OVMS 失敗："
     },
     "status": {
       "not_installed": "OVMS 未安裝",
@@ -2333,7 +2410,7 @@
       "square": "方形"
     },
     "auto_create_paint": "自動新增圖片",
-    "auto_create_paint_tip": "圖片生成後，會自動新增圖片",
+    "auto_create_paint_tip": "圖片產生後會自動新增圖片",
     "background": "背景",
     "background_options": {
       "auto": "自動",
@@ -2353,31 +2430,31 @@
     },
     "custom_size": "自訂尺寸",
     "edit": {
-      "image_file": "編輯圖像",
-      "magic_prompt_option_tip": "智能優化編輯提示詞",
-      "model_tip": "部分編輯僅支持 V_2 和 V_2_TURBO 版本",
-      "number_images_tip": "生成的編輯結果數量",
+      "image_file": "編輯影像",
+      "magic_prompt_option_tip": "開啟後會自動調整編輯提示詞，以提升效果",
+      "model_tip": "部分編輯僅支援 V_2 和 V_2_TURBO 版本",
+      "number_images_tip": "要產生的編輯結果數量",
       "rendering_speed_tip": "控制渲染速度與品質之間的平衡，僅適用於 V_3 版本",
       "seed_tip": "控制編輯結果的隨機性",
-      "style_type_tip": "編輯後的圖像風格，僅適用於 V_2 及以上版本"
+      "style_type_tip": "編輯後的影像風格，僅適用於 V_2 及以上版本"
     },
     "generate": {
       "height": "高度",
-      "magic_prompt_option_tip": "智能優化生成效果的提示詞",
+      "magic_prompt_option_tip": "開啟後會自動調整提示詞，以提升效果",
       "model_tip": "模型版本：V2 是最新 API 模型，V2A 是高速模型，V_1 是初代模型，_TURBO 是高速處理版",
-      "negative_prompt_tip": "描述不想在圖像中出現的內容",
-      "number_images_tip": "一次生成的圖片數量",
-      "person_generation": "人物生成",
-      "person_generation_tip": "允許模型生成人物圖像",
+      "negative_prompt_tip": "描述不想在影像中出現的內容",
+      "number_images_tip": "一次產生的圖片數量",
+      "person_generation": "產生人物",
+      "person_generation_tip": "允許模型產生人物影像",
       "rendering_speed_tip": "控制渲染速度與品質之間的平衡，僅適用於 V_3 版本",
       "safety_tolerance": "安全耐性",
-      "safety_tolerance_tip": "控制圖像生成的安全耐性，僅適用於 FLUX.1-Kontext-pro 版本",
-      "seed_tip": "控制圖像生成的隨機性，以重現相同的生成結果",
-      "style_type_tip": "圖像生成風格，僅適用於 V_2 及以上版本",
+      "safety_tolerance_tip": "控制影像產生的安全耐性，僅適用於 FLUX.1-Kontext-pro 版本",
+      "seed_tip": "控制影像產生的隨機性，以重現相同結果",
+      "style_type_tip": "產生圖片的風格，僅適用於 V_2 及以上版本",
       "width": "寬度"
     },
-    "generated_image": "生成圖片",
-    "go_to_settings": "去設置",
+    "generated_image": "產生的圖片",
+    "go_to_settings": "前往設定",
     "guidance_scale": "引導比例",
     "guidance_scale_tip": "無分類器指導。控制模型在尋找相關影像時對提示詞的遵循程度",
     "image": {
@@ -2413,10 +2490,10 @@
     },
     "negative_prompt": "反向提示詞",
     "negative_prompt_tip": "描述你不想在圖片中出現的內容",
-    "no_image_generation_model": "暫無可用的圖片生成模型，請先新增模型並設置端點類型為 {{endpoint_type}}",
-    "number_images": "生成數量",
-    "number_images_tip": "一次生成的圖片數量 (1-4)",
-    "paint_course": "教程",
+    "no_image_generation_model": "暫無可用的圖片產生模型，請先新增模型並設定端點類型為 {{endpoint_type}}",
+    "number_images": "張數",
+    "number_images_tip": "一次產生的圖片數量 (1-4)",
+    "paint_course": "教學",
     "per_image": "每張圖片",
     "per_images": "每張圖片",
     "person_generation_options": {
@@ -2428,9 +2505,9 @@
     "prompt_enhancement": "提示詞增強",
     "prompt_enhancement_tip": "開啟後將提示重寫為詳細的、適合模型的版本",
     "prompt_placeholder": "描述你想建立的圖片，例如：一個寧靜的湖泊，夕陽西下，遠處是群山",
-    "prompt_placeholder_edit": "輸入你的圖片描述，文本繪製用 ' 雙引號 ' 包裹",
-    "prompt_placeholder_en": "輸入英文圖片描述，目前僅支持英文提示詞",
-    "proxy_required": "打開代理並開啟”TUN 模式 “查看生成圖片或複製到瀏覽器開啟，後續會支持國內直連",
+    "prompt_placeholder_edit": "輸入你的圖片描述，文字繪製用 ' 雙引號 ' 包裹",
+    "prompt_placeholder_en": "輸入英文圖片描述，目前僅支援英文提示詞",
+    "proxy_required": "請開啟代理並啟用「TUN 模式」，即可查看產生的圖片；也可以複製到瀏覽器開啟。日後將支援免代理直接連線。",
     "quality": "品質",
     "quality_options": {
       "auto": "自動",
@@ -2439,19 +2516,19 @@
       "medium": "中"
     },
     "regenerate": {
-      "confirm": "這將覆蓋已生成的圖片，是否繼續？"
+      "confirm": "這將覆蓋已產生的圖片，是否繼續？"
     },
     "remix": {
       "image_file": "參考圖",
       "image_weight": "參考圖權重",
-      "image_weight_tip": "調整參考圖像的影響程度",
-      "magic_prompt_option_tip": "智能優化重混提示詞",
+      "image_weight_tip": "調整參考影像的影響程度",
+      "magic_prompt_option_tip": "開啟後會自動調整重混提示詞，以提升效果",
       "model_tip": "選擇重混使用的 AI 模型版本",
       "negative_prompt_tip": "描述不想在重混結果中出現的元素",
-      "number_images_tip": "生成的重混結果數量",
+      "number_images_tip": "要產生的重混結果數量",
       "rendering_speed_tip": "控制渲染速度與品質之間的平衡，僅適用於 V_3 版本",
       "seed_tip": "控制重混結果的隨機性",
-      "style_type_tip": "重混後的圖像風格，僅適用於 V_2 及以上版本"
+      "style_type_tip": "重混後的影像風格，僅適用於 V_2 及以上版本"
     },
     "rendering_speed": "渲染速度",
     "rendering_speeds": {
@@ -2459,14 +2536,14 @@
       "quality": "高品質",
       "turbo": "快速"
     },
-    "req_error_model": "獲取模型失敗",
-    "req_error_no_balance": "請檢查令牌的有效性",
+    "req_error_model": "取得模型失敗",
+    "req_error_no_balance": "請檢查權杖的有效性",
     "req_error_text": "伺服器繁忙或提示詞中出現「版權詞」或「敏感詞」，請重試。",
-    "req_error_token": "請檢查令牌的有效性",
+    "req_error_token": "請檢查權杖的有效性",
     "required_field": "必填欄位",
     "seed": "隨機種子",
-    "seed_desc_tip": "相同的種子和提示詞可以生成相似的圖片，設置 -1 每次生成都不一樣",
-    "seed_tip": "相同的種子和提示詞可以生成相似的圖片",
+    "seed_desc_tip": "相同的種子和提示詞可以產生相似的圖片，設定為 -1 時，每次結果都會不同",
+    "seed_tip": "相同的種子和提示詞可以產生相似的圖片",
     "select_model": "選擇模型",
     "style_type": "風格",
     "style_types": {
@@ -2484,10 +2561,10 @@
     "uploaded_input": "已上傳輸入",
     "upscale": {
       "detail": "細節",
-      "detail_tip": "控制放大圖像的細節增強程度",
+      "detail_tip": "控制放大影像的細節增強程度",
       "image_file": "需要放大的圖片",
-      "magic_prompt_option_tip": "智能優化放大提示詞",
-      "number_images_tip": "生成的放大結果數量",
+      "magic_prompt_option_tip": "開啟後會自動調整放大提示詞，以提升效果",
+      "number_images_tip": "要產生的放大結果數量",
       "resemblance": "相似度",
       "resemblance_tip": "控制放大結果與原圖的相似程度",
       "seed_tip": "控制放大結果的隨機性"
@@ -2521,17 +2598,18 @@
   },
   "preview": {
     "copy": {
-      "image": "複製為圖片"
+      "image": "複製為圖片",
+      "src": "複製圖片來源"
     },
-    "dialog": "開啟預覽窗口",
+    "dialog": "開啟預覽視窗",
     "label": "預覽",
     "pan": "移動",
     "pan_down": "下移",
     "pan_left": "左移",
     "pan_right": "右移",
     "pan_up": "上移",
-    "reset": "重置",
-    "source": "查看源碼",
+    "reset": "重設",
+    "source": "檢視原始碼",
     "zoom_in": "放大",
     "zoom_out": "縮小"
   },
@@ -2544,7 +2622,7 @@
     "302ai": "302.AI",
     "ai-gateway": "AI 閘道器",
     "aihubmix": "AiHubMix",
-    "aionly": "唯一AI (AiOnly)",
+    "aionly": "唯一 AI (AiOnly)",
     "alayanew": "Alaya NeW",
     "anthropic": "Anthropic",
     "aws-bedrock": "AWS Bedrock",
@@ -2575,6 +2653,7 @@
     "lanyun": "藍耘",
     "lmstudio": "LM Studio",
     "longcat": "龍貓",
+    "mimo": "小米 MiMo",
     "minimax": "MiniMax",
     "mistral": "Mistral",
     "modelscope": "ModelScope 魔搭",
@@ -2648,20 +2727,20 @@
         "title": "粗體"
       },
       "bulletList": {
-        "description": "建立簡單的項目符號清單",
+        "description": "建立簡單的列點清單",
         "title": "無序清單"
       },
       "calloutInfo": {
-        "description": "添加資訊提示框",
+        "description": "新增資訊提示框",
         "title": "資訊提示框"
       },
       "calloutWarning": {
-        "description": "添加警告提示框",
+        "description": "新增警告提示框",
         "title": "警告提示框"
       },
       "code": {
-        "description": "插入代碼片段",
-        "title": "代碼"
+        "description": "插入程式碼片段",
+        "title": "程式碼"
       },
       "codeBlock": {
         "description": "插入程式碼片段",
@@ -2672,11 +2751,11 @@
         "title": "分欄"
       },
       "date": {
-        "description": "插入當前日期",
+        "description": "插入目前日期",
         "title": "日期"
       },
       "divider": {
-        "description": "添加水平分隔線",
+        "description": "新增水平分隔線",
         "title": "分隔線"
       },
       "hardBreak": {
@@ -2712,7 +2791,7 @@
         "title": "圖片"
       },
       "inlineCode": {
-        "description": "添加行內程式碼",
+        "description": "新增行內程式碼",
         "title": "行內程式碼"
       },
       "inlineMath": {
@@ -2724,7 +2803,7 @@
         "title": "斜體"
       },
       "link": {
-        "description": "添加連結",
+        "description": "新增連結",
         "title": "連結"
       },
       "noCommandsFound": "未找到命令",
@@ -2757,8 +2836,8 @@
         "title": "下劃線"
       },
       "undo": {
-        "description": "撤銷上一步操作",
-        "title": "撤銷"
+        "description": "復原上一步操作",
+        "title": "復原"
       }
     },
     "dragHandle": "拖拽塊",
@@ -2778,7 +2857,7 @@
       "propertyName": "屬性名稱"
     },
     "image": {
-      "placeholder": "添加圖片"
+      "placeholder": "新增圖片"
     },
     "imageUploader": {
       "embedImage": "嵌入圖片",
@@ -2787,29 +2866,29 @@
       "invalidType": "請選擇圖片檔案",
       "invalidUrl": "無效的圖片連結",
       "processing": "正在處理圖片...",
-      "title": "添加圖片",
+      "title": "新增圖片",
       "tooLarge": "圖片大小不能超過 10MB",
       "upload": "上傳",
       "uploadError": "圖片上傳失敗",
       "uploadFile": "上傳檔案",
       "uploadHint": "支援 JPG、PNG、GIF 等格式，最大 10MB",
       "uploadSuccess": "圖片上傳成功",
-      "uploadText": "點擊或拖拽圖片到此處上傳",
+      "uploadText": "點選或拖曳圖片到此處上傳",
       "uploading": "正在上傳圖片",
-      "urlPlaceholder": "貼上圖片連結地址",
-      "urlRequired": "請輸入圖片連結地址"
+      "urlPlaceholder": "貼上圖片連結網址",
+      "urlRequired": "請輸入圖片連結網址"
     },
     "link": {
-      "remove": "移除鏈接",
-      "text": "鏈接標題",
-      "textPlaceholder": "請輸入鏈接標題",
-      "url": "鏈接地址"
+      "remove": "移除連結",
+      "text": "連結標題",
+      "textPlaceholder": "請輸入連結標題",
+      "url": "連結網址"
     },
     "math": {
       "placeholder": "輸入 LaTeX 公式"
     },
-    "placeholder": "輸入'/'調用命令",
-    "plusButton": "點擊在下方添加",
+    "placeholder": "輸入'/'呼叫命令",
+    "plusButton": "點選以在下方新增",
     "toolbar": {
       "blockMath": "數學公式塊",
       "blockquote": "引用",
@@ -2844,13 +2923,13 @@
         "copy": "複製",
         "explain": "解釋",
         "quote": "引用",
-        "refine": "優化",
+        "refine": "潤飾",
         "search": "搜尋",
         "summary": "總結",
         "translate": "翻譯"
       },
       "translate": {
-        "smart_translate_tips": "智能翻譯：內容將優先翻譯為目標語言；內容已是目標語言的，將翻譯為備用語言"
+        "smart_translate_tips": "智慧翻譯：內容將優先翻譯為目標語言；內容已是目標語言時，將翻譯為備用語言"
       },
       "window": {
         "c_copy": "C 複製",
@@ -2862,7 +2941,7 @@
         "original_show": "顯示原文",
         "pin": "置頂",
         "pinned": "已置頂",
-        "r_regenerate": "R 重新生成"
+        "r_regenerate": "R 重新產生"
       }
     },
     "name": "劃詞助手",
@@ -2884,7 +2963,7 @@
       },
       "advanced": {
         "filter_list": {
-          "description": "進階功能，建議有經驗的用戶在了解情況下再進行設置",
+          "description": "進階功能，建議有經驗的使用者在了解情況下再進行設定",
           "title": "篩選名單"
         },
         "filter_mode": {
@@ -2900,12 +2979,12 @@
         "description": "目前僅支援 Windows & macOS",
         "mac_process_trust_hint": {
           "button": {
-            "go_to_settings": "去設定",
-            "open_accessibility_settings": "打開輔助使用設定"
+            "go_to_settings": "前往設定",
+            "open_accessibility_settings": "開啟輔助使用設定"
           },
           "description": {
             "0": "劃詞助手需「<strong>輔助使用權限</strong>」才能正常工作。",
-            "1": "請點擊「<strong>去設定</strong>」，並在稍後彈出的權限請求彈窗中點擊 「<strong>打開系統設定</strong>」 按鈕，然後在之後的應用程式列表中找到 「<strong>Cherry Studio</strong>」，並開啟權限開關。",
+            "1": "請點選「<strong>前往設定</strong>」，並在稍後出現的權限請求對話框中點選「<strong>開啟系統設定</strong>」按鈕，接著在應用程式清單中找到「<strong>Cherry Studio</strong>」，並開啟權限開關。",
             "2": "完成設定後，請再次開啟劃詞助手。"
           },
           "title": "輔助使用權限"
@@ -2916,8 +2995,8 @@
       "filter_modal": {
         "title": "應用篩選名單",
         "user_tips": {
-          "mac": "請輸入應用的 Bundle ID，每行一個，不區分大小寫，可以模糊匹配。例如：com.google.Chrome、com.apple.mail等",
-          "windows": "請輸入應用的執行檔名稱，每行一個，不區分大小寫，可以模糊匹配。例如：chrome.exe、weixin.exe、Cherry Studio.exe等"
+          "mac": "請輸入應用程式的 Bundle ID（每行一個、不區分大小寫，可模糊比對）。例如：com.google.Chrome、com.apple.mail 等",
+          "windows": "請輸入應用程式的執行檔名稱（每行一個、不區分大小寫，可模糊比對）。例如：chrome.exe、weixin.exe、Cherry Studio.exe 等"
         }
       },
       "search_modal": {
@@ -2953,14 +3032,14 @@
           "ctrlkey_note": "劃詞後，再 按住 Ctrl 鍵，才顯示工具列",
           "description": "劃詞後，觸發取詞並顯示工具列的方式",
           "description_note": {
-            "mac": "若使用了快捷鍵或鍵盤映射工具對 ⌘ 鍵進行了重新對應，可能導致部分應用程式無法劃詞。",
+            "mac": "若使用了快捷鍵或鍵盤對映工具對 ⌘ 鍵進行了重新對應，可能導致部分應用程式無法劃詞。",
             "windows": "在某些應用中可能無法透過 Ctrl 鍵劃詞。若使用了 AHK 等工具對 Ctrl 鍵進行了重新對應，可能導致部分應用程式無法劃詞。"
           },
           "selected": "劃詞",
           "selected_note": "劃詞後，立即顯示工具列",
           "shortcut": "快捷鍵",
           "shortcut_link": "前往快捷鍵設定",
-          "shortcut_note": "劃詞後，使用快捷鍵顯示工具列。請在快捷鍵設定頁面中設置取詞快捷鍵並啟用。",
+          "shortcut_note": "劃詞後，使用快捷鍵顯示工具列。請在快捷鍵設定頁面中設定取詞快捷鍵並啟用。",
           "title": "取詞方式"
         }
       },
@@ -2990,7 +3069,7 @@
         "prompt": {
           "copy_placeholder": "複製佔位符",
           "label": "使用者提示詞 (Prompt)",
-          "placeholder": "使用佔位符 {{text}} 代表選取的文字，不填寫時，選取的文字將加到本提示詞的末尾",
+          "placeholder": "使用佔位符 {{text}} 代表選取的文字，不填寫時，選取的文字將加到本提示詞的結尾",
           "placeholder_text": "佔位符",
           "tooltip": "使用者提示詞，作為使用者輸入的補充，不會覆蓋助手的系統提示詞"
         },
@@ -3005,7 +3084,7 @@
           "title": "自動關閉"
         },
         "auto_pin": {
-          "description": "預設將視窗置於頂部",
+          "description": "預設將視窗置於頂端",
           "title": "自動置頂"
         },
         "follow_toolbar": {
@@ -3013,11 +3092,11 @@
           "title": "跟隨工具列"
         },
         "opacity": {
-          "description": "設置視窗的預設透明度，100% 為完全不透明",
+          "description": "設定視窗的預設透明度，100% 為完全不透明",
           "title": "透明度"
         },
         "remember_size": {
-          "description": "應用運行期間，視窗會按上次調整的大小顯示",
+          "description": "應用運作期間，視窗會按上次調整的大小顯示",
           "title": "記住大小"
         },
         "title": "功能視窗"
@@ -3037,7 +3116,7 @@
       },
       "debug": {
         "open": "開啟",
-        "title": "調試面板"
+        "title": "除錯面板"
       },
       "description": "一款為創作者而生的強大 AI 助手",
       "downloading": "正在下載...",
@@ -3084,30 +3163,31 @@
     },
     "data": {
       "app_data": {
-        "copy_data_option": "複製數據，會自動重啟後將原始目錄數據複製到新目錄",
-        "copy_failed": "複製數據失敗",
-        "copy_success": "成功複製數據到新位置",
-        "copy_time_notice": "複製數據將需要一些時間，複製期間不要關閉應用",
-        "copying": "正在複製數據到新位置...",
-        "copying_warning": "數據複製中，不要強制退出應用，複製完成後會自動重啟應用",
-        "label": "應用數據",
-        "migration_title": "數據遷移",
+        "copy_data_option": "複製資料，會在重新啟動後將原始目錄的資料複製到新目錄",
+        "copy_failed": "複製資料失敗",
+        "copy_success": "成功複製資料到新位置",
+        "copy_time_notice": "複製資料需要一些時間，期間請勿關閉應用程式",
+        "copying": "正在複製資料到新位置...",
+        "copying_warning": "資料複製中，請勿強制關閉應用程式；複製完成後會自動重新啟動應用程式",
+        "label": "應用程式資料",
+        "migration_title": "資料移轉",
         "new_path": "新路徑",
+        "open": "開啟目錄",
         "original_path": "原始路徑",
-        "path_change_failed": "數據目錄更改失敗",
+        "path_change_failed": "資料目錄變更失敗",
         "path_changed_without_copy": "路徑已變更成功",
-        "restart_notice": "變更數據目錄後可能需要重啟應用才能生效",
-        "select": "修改目錄",
-        "select_error": "變更數據目錄失敗",
+        "restart_notice": "變更資料目錄後可能需要重新啟動應用程式才能生效",
+        "select": "變更目錄",
+        "select_error": "變更資料目錄失敗",
         "select_error_in_app_path": "新路徑與應用安裝路徑相同，請選擇其他路徑",
         "select_error_root_path": "新路徑不能是根路徑",
         "select_error_same_path": "新路徑與舊路徑相同，請選擇其他路徑",
         "select_error_write_permission": "新路徑沒有寫入權限",
         "select_not_empty_dir": "新路徑不為空",
-        "select_not_empty_dir_content": "新路徑不為空，選擇複製將覆蓋新路徑中的數據，有數據丟失和複製失敗的風險，是否繼續？",
-        "select_success": "數據目錄已變更，應用將重啟以應用變更",
-        "select_title": "變更應用數據目錄",
-        "stop_quit_app_reason": "應用目前正在遷移數據，不能退出"
+        "select_not_empty_dir_content": "新路徑不為空，若選擇複製將覆寫新路徑中的資料，可能導致資料遺失或複製失敗。是否繼續？",
+        "select_success": "資料目錄已變更，應用程式將重新啟動以套用變更",
+        "select_title": "變更應用程式資料目錄",
+        "stop_quit_app_reason": "應用程式目前正在移轉資料，無法關閉"
       },
       "app_knowledge": {
         "button": {
@@ -3123,12 +3203,12 @@
         "label": "應用程式日誌"
       },
       "backup": {
-        "skip_file_data_help": "備份時跳過備份圖片、知識庫等數據文件，僅備份聊天記錄和設置。減少空間佔用，加快備份速度",
+        "skip_file_data_help": "備份時跳過圖片、知識庫等資料檔案，只備份聊天記錄與設定。可減少空間佔用並加快備份速度",
         "skip_file_data_title": "精簡備份"
       },
       "clear_cache": {
         "button": "清除快取",
-        "confirm": "清除快取將刪除應用快取資料，包括小工具資料。此操作不可恢復，是否繼續？",
+        "confirm": "清除快取將刪除應用快取資料，包括小工具資料。此操作無法恢復，是否繼續？",
         "error": "清除快取失敗",
         "success": "快取清除成功",
         "title": "清除快取"
@@ -3137,11 +3217,11 @@
         "title": "資料目錄"
       },
       "divider": {
-        "basic": "基礎數據設定",
+        "basic": "基本資料設定",
         "cloud_storage": "雲備份設定",
         "export_settings": "匯出設定",
         "import_settings": "匯入設定",
-        "third_party": "第三方連接"
+        "third_party": "第三方連結"
       },
       "export_menu": {
         "docx": "匯出為 Word",
@@ -3149,10 +3229,10 @@
         "joplin": "匯出到 Joplin",
         "markdown": "匯出為 Markdown",
         "markdown_reason": "匯出為 Markdown（包含思考）",
-        "notes": "導出到筆記",
+        "notes": "匯出到筆記",
         "notion": "匯出到 Notion",
         "obsidian": "匯出到 Obsidian",
-        "plain_text": "複製為純文本",
+        "plain_text": "複製為純文字",
         "siyuan": "匯出到思源筆記",
         "title": "匯出選單設定",
         "yuque": "匯出到語雀"
@@ -3161,37 +3241,58 @@
         "confirm": {
           "button": "選擇備份檔案"
         },
-        "content": "匯出部分數據，包括聊天記錄、設定。請注意，備份過程可能需要一些時間，感謝您的耐心等候。",
+        "content": "匯出部分資料，包括聊天記錄與設定。請注意，備份過程可能需要一些時間，感謝耐心等候。",
         "lan": {
-          "auto_close_tip": "將於 {{seconds}} 秒後自動關閉...",
-          "confirm_close_message": "檔案傳輸正在進行中。關閉將會中斷傳輸。您確定要強制關閉嗎？",
-          "confirm_close_title": "確認關閉",
           "connected": "已連線",
           "connection_failed": "連線失敗",
-          "content": "請確保電腦和手機處於同一網路以使用區域網路傳輸。請打開 Cherry Studio App 掃描此 QR 碼。",
+          "content": "請確保電腦和手機處於同一網路以使用區域網路傳輸。",
+          "device_list_title": "區域網路裝置",
+          "discovered_devices": "已發現的裝置",
           "error": {
+            "file_too_large": "檔案過大，僅支援最大 500MB",
             "init_failed": "初始化失敗",
+            "invalid_file_type": "僅支援 ZIP 檔案",
             "no_file": "未選擇檔案",
             "no_ip": "無法取得 IP 位址",
+            "not_connected": "請先完成握手",
             "send_failed": "無法傳送檔案"
           },
-          "force_close": "強制關閉",
-          "generating_qr": "正在生成 QR 碼...",
-          "noZipSelected": "未選取壓縮檔案",
-          "scan_qr": "請使用手機掃描QR碼",
-          "selectZip": "選擇壓縮檔案",
-          "sendZip": "開始恢復資料",
+          "file_transfer": {
+            "cancelled": "傳輸已取消",
+            "failed": "檔案傳輸失敗：{{message}}",
+            "progress": "傳送中... {{progress}}%",
+            "success": "檔案傳送成功"
+          },
+          "handshake": {
+            "button": "握手",
+            "failed": "握手失敗：{{message}}",
+            "in_progress": "握手中...",
+            "success": "已與 {{device}} 完成握手",
+            "test_message_received": "收到來自 {{device}} 的 pong",
+            "test_message_sent": "已送出 hello world 測試封包"
+          },
+          "idle_hint": "掃描已暫停。開始掃描以尋找區域網路中的 Cherry Studio 裝置。",
+          "ip_addresses": "IP 位址",
+          "last_seen": "上次看到：{{time}}",
+          "metadata": "中繼資料",
+          "no_connection_warning": "請在 Cherry Studio 行動裝置開啟區域網路傳輸",
+          "no_devices": "尚未找到區域網路節點",
+          "scan_devices": "掃描裝置",
+          "scanning_hint": "正在掃描區域網路中的 Cherry Studio 裝置...",
+          "send_file": "傳送檔案",
           "status": {
-            "completed": "轉帳完成",
+            "completed": "傳輸完成",
             "connected": "已連線",
             "connecting": "連線中...",
             "disconnected": "已斷線",
             "error": "連線錯誤",
             "initializing": "正在初始化連線...",
             "preparing": "正在準備傳輸...",
-            "sending": "傳輸中 {{progress}}%",
-            "waiting_qr_scan": "請掃描QR碼以連接"
+            "sending": "傳輸中 {{progress}}%"
           },
+          "status_badge_idle": "閒置",
+          "status_badge_scanning": "掃描中",
+          "stop_scan": "停止掃描",
           "title": "區域網路傳輸",
           "transfer_progress": "傳輸進度"
         },
@@ -3200,20 +3301,20 @@
       "hour_interval_one": "{{count}} 小時",
       "hour_interval_other": "{{count}} 小時",
       "import_settings": {
-        "button": "匯入 Json 檔案",
-        "chatgpt": "匯入 ChatGPT 數據",
-        "title": "匯入外部應用程式數據"
+        "button": "匯入 JSON 檔案",
+        "chatgpt": "匯入 ChatGPT 資料",
+        "title": "匯入外部應用程式資料"
       },
       "joplin": {
         "check": {
           "button": "檢查",
           "empty_token": "請先輸入 Joplin 授權 Token",
           "empty_url": "請先輸入 Joplin 剪輯服務 URL",
-          "fail": "Joplin 連接驗證失敗",
-          "success": "Joplin 連接驗證成功"
+          "fail": "Joplin 連結驗證失敗",
+          "success": "Joplin 連結驗證成功"
         },
         "export_reasoning": {
-          "help": "啟用後，匯出內容將包含助手生成的思維鏈（思考過程）。",
+          "help": "啟用後，匯出內容將包含助手產生的思維鏈（思考過程）。",
           "title": "匯出時包含思維鏈"
         },
         "help": "在 Joplin 選項中，啟用剪輯服務（無需安裝瀏覽器外掛），確認埠編號，並複製授權 Token",
@@ -3225,7 +3326,7 @@
       },
       "limit": {
         "appDataDiskQuota": "磁碟空間警告",
-        "appDataDiskQuotaDescription": "資料目錄空間即將用盡, 請清理磁碟空間, 否則會丟失數據"
+        "appDataDiskQuotaDescription": "資料目錄空間即將用盡，請清理磁碟空間，否則可能導致資料遺失"
       },
       "local": {
         "autoSync": {
@@ -3233,55 +3334,55 @@
           "off": "關閉"
         },
         "backup": {
-          "button": "本地備份",
+          "button": "本機備份",
           "manager": {
             "columns": {
               "actions": "操作",
-              "fileName": "文件名",
+              "fileName": "檔名",
               "modifiedTime": "修改時間",
               "size": "大小"
             },
             "delete": {
               "confirm": {
-                "multiple": "確定要刪除選中的 {{count}} 個備份文件嗎？此操作無法撤銷。",
-                "single": "確定要刪除備份文件 \"{{fileName}}\" 嗎？此操作無法撤銷。",
+                "multiple": "確定要刪除選取的 {{count}} 個備份檔案嗎？此操作無法復原。",
+                "single": "確定要刪除備份檔案 \"{{fileName}}\" 嗎？此操作無法復原。",
                 "title": "確認刪除"
               },
               "error": "刪除失敗",
-              "selected": "刪除選中",
+              "selected": "刪除選取內容",
               "success": {
-                "multiple": "已刪除 {{count}} 個備份文件",
+                "multiple": "已刪除 {{count}} 個備份檔案",
                 "single": "刪除成功"
               },
               "text": "刪除"
             },
             "fetch": {
-              "error": "獲取備份文件失敗"
+              "error": "無法取得備份檔案"
             },
-            "refresh": "刷新",
+            "refresh": "重新整理",
             "restore": {
-              "error": "恢復失敗",
-              "success": "恢復成功，應用將很快刷新",
-              "text": "恢復"
+              "error": "還原失敗",
+              "success": "還原成功，應用將很快重新整理",
+              "text": "還原"
             },
             "select": {
               "files": {
-                "delete": "請選擇要刪除的備份文件"
+                "delete": "請選擇要刪除的備份檔案"
               }
             },
-            "title": "備份文件管理"
+            "title": "備份檔案管理"
           },
           "modal": {
             "filename": {
-              "placeholder": "請輸入備份文件名"
+              "placeholder": "請輸入備份檔名"
             },
-            "title": "本地備份"
+            "title": "本機備份"
           }
         },
         "directory": {
           "label": "備份目錄",
           "placeholder": "請選擇備份目錄",
-          "select_error_app_data_path": "新路徑不能與應用數據路徑相同",
+          "select_error_app_data_path": "新路徑不能與應用程式資料路徑相同",
           "select_error_in_app_install_path": "新路徑不能與應用安裝路徑相同",
           "select_error_write_permission": "新路徑沒有寫入權限",
           "select_title": "選擇備份目錄"
@@ -3297,15 +3398,15 @@
         "minute_interval_other": "{{count}} 分鐘",
         "noSync": "等待下次備份",
         "restore": {
-          "button": "備份文件管理",
+          "button": "備份檔案管理",
           "confirm": {
-            "content": "從本地備份恢復將覆蓋當前數據，是否繼續？",
-            "title": "確認恢復"
+            "content": "從本機備份還原會覆寫目前資料，是否繼續？",
+            "title": "確認還原"
           }
         },
         "syncError": "備份錯誤",
         "syncStatus": "備份狀態",
-        "title": "本地備份"
+        "title": "本機備份"
       },
       "markdown_export": {
         "exclude_citations": {
@@ -3336,8 +3437,8 @@
       },
       "message_title": {
         "use_topic_naming": {
-          "help": "開啟後，使用快速模型為導出的消息命名標題。該項也會影響所有透過 Markdown 導出的方式",
-          "title": "使用快速模型為導出的消息命名標題"
+          "help": "開啟後，使用快速模型為匯出的訊息命名標題。此設定也會影響所有透過 Markdown 匯出的方式",
+          "title": "使用快速模型為匯出的訊息命名標題"
         }
       },
       "minute_interval_one": "{{count}} 分鐘",
@@ -3349,8 +3450,8 @@
           "button": "檢查",
           "empty_api_key": "未設定 API key",
           "empty_database_id": "未設定 Database ID",
-          "error": "連接異常，請檢查網路及 API key 和 Database ID 是否正確",
-          "fail": "連接失敗，請檢查網路及 API key 和 Database ID 是否正確",
+          "error": "連線異常，請檢查網路及 API key 和 Database ID 是否正確",
+          "fail": "連線失敗，請檢查網路及 API key 和 Database ID 是否正確",
           "success": "連線成功"
         },
         "database_id": "Notion 資料庫 ID",
@@ -3359,7 +3460,7 @@
           "help": "啟用後，匯出到 Notion 時會包含思維鏈內容。",
           "title": "匯出時包含思維鏈"
         },
-        "help": "Notion 設定文件",
+        "help": "Notion 說明文件",
         "page_name_key": "頁面標題欄位名稱",
         "page_name_key_placeholder": "請輸入頁面標題欄位名稱，預設為 Name",
         "title": "Notion 設定"
@@ -3369,57 +3470,57 @@
           "button": "備份到堅果雲",
           "modal": {
             "filename": {
-              "placeholder": "請輸入備份檔案名"
+              "placeholder": "請輸入備份檔名"
             },
             "title": "備份到堅果雲"
           }
         },
         "checkConnection": {
-          "fail": "堅果雲連接失敗",
-          "name": "檢查連接",
-          "success": "已連接堅果雲"
+          "fail": "堅果雲連線失敗",
+          "name": "檢查連線",
+          "success": "已連線至堅果雲"
         },
         "isLogin": "已登入",
         "login": {
           "button": "登入"
         },
         "logout": {
-          "button": "退出登入",
-          "content": "退出後將無法備份至堅果雲和從堅果雲恢復",
-          "title": "確定要退出堅果雲登入？"
+          "button": "登出",
+          "content": "登出後將無法備份到堅果雲或從堅果雲還原。",
+          "title": "確定要登出堅果雲嗎？"
         },
         "new_folder": {
           "button": {
             "cancel": "取消",
             "confirm": "確定",
-            "label": "新建文件夾"
+            "label": "新增資料夾"
           }
         },
         "notLogin": "未登入",
         "path": {
-          "label": "堅果雲存儲路徑",
-          "placeholder": "請輸入堅果雲的存儲路徑"
+          "label": "堅果雲儲存路徑",
+          "placeholder": "請輸入堅果雲儲存路徑"
         },
         "pathSelector": {
-          "currentPath": "當前路徑",
-          "return": "返回",
-          "title": "堅果雲存儲路徑"
+          "currentPath": "目前路徑",
+          "return": "上一層",
+          "title": "堅果雲儲存路徑"
         },
         "restore": {
-          "button": "從堅果雲恢復",
+          "button": "從堅果雲還原",
           "confirm": {
-            "content": "從堅果雲恢復將覆蓋目前資料，是否繼續？",
-            "title": "從堅果雲恢復"
+            "content": "從堅果雲還原會覆寫目前資料，是否繼續？",
+            "title": "從堅果雲還原"
           }
         },
         "title": "堅果雲設定",
-        "username": "堅果雲用戶名"
+        "username": "堅果雲使用者名稱"
       },
       "obsidian": {
         "default_vault": "預設 Obsidian 倉庫",
         "default_vault_export_failed": "匯出失敗",
-        "default_vault_fetch_error": "獲取 Obsidian 倉庫失敗",
-        "default_vault_loading": "正在獲取 Obsidian 倉庫...",
+        "default_vault_fetch_error": "取得 Obsidian 倉庫失敗",
+        "default_vault_loading": "正在取得 Obsidian 倉庫...",
         "default_vault_no_vaults": "未找到 Obsidian 倉庫",
         "default_vault_placeholder": "請選擇預設 Obsidian 倉庫",
         "title": "Obsidian 設定"
@@ -3437,7 +3538,7 @@
         },
         "backup": {
           "button": "立即備份",
-          "error": "S3 備份失敗: {{message}}",
+          "error": "S3 備份失敗：{{message}}",
           "manager": {
             "button": "管理備份"
           },
@@ -3452,7 +3553,7 @@
         },
         "bucket": {
           "label": "儲存桶",
-          "placeholder": "Bucket，例如: example"
+          "placeholder": "Bucket，例如：example"
         },
         "endpoint": {
           "label": "API 位址",
@@ -3471,11 +3572,11 @@
           },
           "delete": {
             "confirm": {
-              "multiple": "確定要刪除選中的 {{count}} 個備份檔案嗎？此操作不可撤銷。",
-              "single": "確定要刪除備份檔案 \"{{fileName}}\" 嗎？此操作不可撤銷。",
+              "multiple": "確定要刪除選中的 {{count}} 個備份檔案嗎？此操作無法復原。",
+              "single": "確定要刪除備份檔案 \"{{fileName}}\" 嗎？此操作無法復原。",
               "title": "確認刪除"
             },
-            "error": "刪除備份檔案失敗: {{message}}",
+            "error": "刪除備份檔案失敗：{{message}}",
             "label": "刪除",
             "selected": "刪除選中 ({{count}})",
             "success": {
@@ -3485,7 +3586,7 @@
           },
           "files": {
             "fetch": {
-              "error": "取得備份檔案清單失敗: {{message}}"
+              "error": "取得備份檔案清單失敗：{{message}}"
             }
           },
           "refresh": "重新整理",
@@ -3501,7 +3602,7 @@
         },
         "region": {
           "label": "區域",
-          "placeholder": "Region，例如: us-east-1"
+          "placeholder": "Region，例如：us-east-1"
         },
         "restore": {
           "config": {
@@ -3509,11 +3610,11 @@
           },
           "confirm": {
             "cancel": "取消",
-            "content": "恢復資料將覆寫當前所有資料，此操作不可撤銷。確定要繼續嗎？",
+            "content": "恢復資料將覆寫目前所有資料，此操作無法復原。確定要繼續嗎？",
             "ok": "確認恢復",
             "title": "確認恢復資料"
           },
-          "error": "資料恢復失敗: {{message}}",
+          "error": "資料恢復失敗：{{message}}",
           "file": {
             "required": "請選擇要恢復的備份檔案"
           },
@@ -3538,38 +3639,38 @@
           "label": "精簡備份"
         },
         "syncStatus": {
-          "error": "同步錯誤: {{message}}",
+          "error": "同步錯誤：{{message}}",
           "label": "同步狀態",
-          "lastSync": "上次同步: {{time}}",
+          "lastSync": "上次同步：{{time}}",
           "noSync": "未同步"
         },
         "title": {
-          "help": "與AWS S3 API相容的物件儲存服務，例如AWS S3、Cloudflare R2、阿里雲OSS、騰訊雲COS等",
+          "help": "與 AWS S3 API 相容的物件儲存服務，例如 AWS S3、Cloudflare R2、阿里雲 OSS、騰訊雲 COS 等",
           "label": "S3 相容儲存",
           "tooltip": "S3 相容儲存設定指南"
         }
       },
       "siyuan": {
-        "api_url": "API 地址",
+        "api_url": "思源筆記 API URL",
         "api_url_placeholder": "例如：http://127.0.0.1:6806",
         "box_id": "筆記本 ID",
         "box_id_placeholder": "請輸入筆記本 ID",
         "check": {
           "button": "檢查",
-          "empty_config": "請填寫 API 地址和令牌",
-          "error": "連接異常，請檢查網絡連接",
-          "fail": "連接失敗，請檢查 API 地址和令牌",
-          "success": "連接成功",
-          "title": "連接檢查"
+          "empty_config": "請填寫 API 位址和權杖",
+          "error": "連線異常，請檢查網路連線",
+          "fail": "連線失敗，請檢查 API 位址和權杖",
+          "success": "連線成功",
+          "title": "連線檢查"
         },
-        "root_path": "文檔根路徑",
+        "root_path": "思源筆記根路徑",
         "root_path_placeholder": "例如：/CherryStudio",
-        "title": "思源筆記配置",
+        "title": "思源筆記設定",
         "token": {
-          "help": "在思源筆記 -> 設置 -> 關於中獲取",
-          "label": "API 令牌"
+          "help": "在思源筆記 → 設定 → 關於中取得",
+          "label": "思源筆記權杖"
         },
-        "token_placeholder": "請輸入思源筆記令牌"
+        "token_placeholder": "請輸入思源筆記權杖"
       },
       "title": "資料設定",
       "webdav": {
@@ -3582,50 +3683,50 @@
           "manager": {
             "columns": {
               "actions": "操作",
-              "fileName": "文件名",
+              "fileName": "檔名",
               "modifiedTime": "修改時間",
               "size": "大小"
             },
             "delete": {
               "confirm": {
-                "multiple": "確定要刪除選中的 {{count}} 個備份文件嗎？此操作不可恢復",
-                "single": "確定要刪除備份文件 \"{{fileName}}\" 嗎？此操作不可恢復",
+                "multiple": "確定要刪除選取的 {{count}} 個備份檔案嗎？此操作無法復原",
+                "single": "確定要刪除備份檔案 \"{{fileName}}\" 嗎？此操作無法復原",
                 "title": "確認刪除"
               },
               "error": "刪除失敗",
-              "selected": "刪除選中",
+              "selected": "刪除選取內容",
               "success": {
-                "multiple": "成功刪除 {{count}} 個備份文件",
+                "multiple": "已刪除 {{count}} 個備份檔案",
                 "single": "刪除成功"
               },
               "text": "刪除"
             },
             "fetch": {
-              "error": "獲取備份文件失敗"
+              "error": "無法取得備份檔案"
             },
-            "refresh": "刷新",
+            "refresh": "重新整理",
             "restore": {
-              "error": "恢復失敗",
-              "success": "恢復成功，應用將在幾秒後刷新",
-              "text": "恢復"
+              "error": "還原失敗",
+              "success": "還原成功，應用程式將在幾秒後重新整理",
+              "text": "還原"
             },
             "select": {
               "files": {
-                "delete": "請選擇要刪除的備份文件"
+                "delete": "請選擇要刪除的備份檔案"
               }
             },
-            "title": "備份數據管理"
+            "title": "備份檔案管理"
           },
           "modal": {
             "filename": {
-              "placeholder": "請輸入備份文件名"
+              "placeholder": "請輸入備份檔名"
             },
             "title": "備份到 WebDAV"
           }
         },
         "disableStream": {
           "help": "開啟後，將檔案載入到記憶體中再上傳，可解決部分 WebDAV 服務不相容 chunked 上傳的問題，但會增加記憶體佔用。",
-          "title": "禁用串流上傳"
+          "title": "停用串流上傳"
         },
         "host": {
           "label": "WebDAV 主機位址",
@@ -3662,8 +3763,8 @@
           "button": "檢查",
           "empty_repo_url": "請先輸入知識庫 URL",
           "empty_token": "請先輸入語雀 Token",
-          "fail": "語雀連接驗證失敗",
-          "success": "語雀連接驗證成功"
+          "fail": "語雀連結驗證失敗",
+          "success": "語雀連結驗證成功"
         },
         "help": "取得語雀 Token",
         "repo_url": "知識庫 URL",
@@ -3675,7 +3776,7 @@
     },
     "developer": {
       "enable_developer_mode": "啟用開發者模式",
-      "help": "啟用開發者模式後，將可以使用調用鏈功能查看模型調用過程的數據流。",
+      "help": "啟用開發者模式後，可使用呼叫鏈功能檢視模型呼叫過程的資料流。",
       "title": "開發者模式"
     },
     "display": {
@@ -3693,23 +3794,23 @@
         "code": "程式碼字型",
         "default": "預設",
         "global": "全域字型",
-        "select": "選擇字體",
+        "select": "選擇字型",
         "title": "字型設定"
       },
       "navbar": {
         "position": {
-          "label": "導航欄位置",
+          "label": "導覽列位置",
           "left": "左側",
-          "top": "頂部"
+          "top": "頂端"
         },
-        "title": "導航欄設定"
+        "title": "導覽列設定"
       },
       "sidebar": {
         "chat": {
           "hiddenMessage": "助手是基礎功能，不支援隱藏"
         },
         "disabled": "隱藏的圖示",
-        "empty": "把要隱藏的功能從左側拖拽到這裡",
+        "empty": "把要隱藏的功能從左側拖曳到這裡",
         "files": {
           "icon": "顯示檔案圖示"
         },
@@ -3744,7 +3845,7 @@
         "title": "自動更新"
       },
       "avatar": {
-        "builtin": "內置頭像",
+        "builtin": "內建頭像",
         "reset": "重設頭像"
       },
       "backup": {
@@ -3772,9 +3873,9 @@
         "beta_version": "測試版本 (Beta)",
         "beta_version_tooltip": "功能可能會隨時變化，錯誤較多，升級較快",
         "rc_version": "預覽版本 (RC)",
-        "rc_version_tooltip": "相對穩定，請務必提前備份數據",
+        "rc_version_tooltip": "相對穩定，請務必提前備份資料",
         "title": "測試計畫",
-        "tooltip": "參與測試計畫，體驗最新功能，但同時也帶來更多風險，請務必提前備份數據",
+        "tooltip": "參與測試計畫，體驗最新功能，但同時也帶來更多風險，請務必提前備份資料",
         "version_channel_not_match": "預覽版和測試版的切換將在下一個正式版發布時生效",
         "version_options": "版本選項"
       },
@@ -3790,10 +3891,10 @@
     },
     "hardware_acceleration": {
       "confirm": {
-        "content": "禁用硬件加速需要重新啟動應用程序才能生效。是否立即重新啟動？",
+        "content": "停用硬體加速需要重新啟動應用程式才能生效。要立即重新啟動嗎？",
         "title": "需要重新啟動"
       },
-      "title": "禁用硬件加速"
+      "title": "停用硬體加速"
     },
     "input": {
       "auto_translate_with_space": "快速敲擊 3 次空格翻譯",
@@ -3815,7 +3916,7 @@
     "launch": {
       "onboot": "開機自動啟動",
       "title": "啟動",
-      "totray": "啟動時最小化到系统匣"
+      "totray": "啟動時最小化到系統匣"
     },
     "math": {
       "engine": {
@@ -3824,58 +3925,60 @@
       },
       "single_dollar": {
         "label": "啟用 $...$",
-        "tip": "渲染單個美元符號 $...$ 包裹的數學公式，默認啟用。"
+        "tip": "渲染單個美元符號 $...$ 包裹的數學公式，預設啟用。"
       },
       "title": "數學公式設定"
     },
     "mcp": {
       "actions": "操作",
       "active": "啟用",
-      "addError": "添加伺服器失敗",
+      "addError": "新增伺服器失敗",
       "addServer": {
-        "create": "快速創建",
+        "create": "快速建立",
         "importFrom": {
           "connectionFailed": "連線失敗",
-          "dxt": "導入 DXT 包",
-          "dxtFile": "DXT 包文件",
-          "dxtHelp": "選擇包含 MCP 服務器的 .dxt 文件",
-          "dxtProcessFailed": "處理 DXT 文件失敗",
+          "dxt": "匯入 DXT 套件",
+          "dxtFile": "DXT 套件檔案",
+          "dxtHelp": "選擇包含 MCP 伺服器的 .dxt 檔案",
+          "dxtProcessFailed": "處理 DXT 檔案失敗",
           "error": {
             "multipleServers": "不能從多個伺服器匯入"
           },
           "invalid": "無效的輸入，請檢查 JSON 格式",
           "json": "從 JSON 匯入",
-          "method": "導入方式",
+          "method": "匯入方式",
           "nameExists": "伺服器已存在：{{name}}",
-          "noDxtFile": "請選擇一個 DXT 文件",
-          "oneServer": "每次只能保存一個 MCP 伺服器配置",
+          "noDxtFile": "請選擇一個 DXT 檔案",
+          "oneServer": "每次只能儲存一個 MCP 伺服器設定",
           "placeholder": "貼上 MCP 伺服器 JSON 設定",
           "selectDxtFile": "選擇 DXT 檔案",
-          "tooltip": "請從 MCP Servers 的介紹頁面複製配置 JSON（優先使用\n NPX 或 UVX 配置），並粘貼到輸入框中"
+          "tooltip": "請從 MCP Servers 的介紹頁面複製設定 JSON（優先使用 NPX 或 UVX 設定），並貼上到輸入框中"
         },
         "label": "新增伺服器"
       },
       "addSuccess": "伺服器新增成功",
-      "advancedSettings": "高級設定",
+      "advancedSettings": "進階設定",
       "args": "參數",
       "argsTooltip": "每個參數佔一行",
-      "baseUrlTooltip": "遠端 URL 地址",
-      "builtinServers": "內置伺服器",
+      "baseUrlTooltip": "遠端 URL 位址",
+      "builtinServers": "內建伺服器",
       "builtinServersDescriptions": {
-        "brave_search": "一個集成了Brave 搜索 API 的 MCP 伺服器實現，提供網頁與本地搜尋雙重功能。需要配置 BRAVE_API_KEY 環境變數",
-        "didi_mcp": "一個集成了滴滴 MCP 伺服器實現，提供網約車服務包括地圖搜尋、價格預估、訂單管理和司機追蹤。僅支援中國大陸地區。需要配置 DIDI_API_KEY 環境變數",
-        "dify_knowledge": "Dify 的 MCP 伺服器實現，提供了一個簡單的 API 來與 Dify 進行互動。需要配置 Dify Key",
-        "fetch": "用於獲取 URL 網頁內容的 MCP 伺服器",
-        "filesystem": "實現文件系統操作的模型上下文協議（MCP）的 Node.js 伺服器。需要配置允許訪問的目錄",
+        "brave_search": "一個整合了 Brave 搜尋 API 的 MCP 伺服器實做，提供網頁與本機搜尋雙重功能。需要設定 BRAVE_API_KEY 環境變數",
+        "browser": "透過 Chrome DevTools Protocol 控制 headless Electron 視窗。工具：開啟 URL、執行單行 JS、重設工作階段。",
+        "didi_mcp": "一個整合了滴滴 MCP 伺服器實做，提供網約車服務包括地圖搜尋、價格預估、訂單管理和司機追蹤。僅支援中國大陸地區。需要設定 DIDI_API_KEY 環境變數",
+        "dify_knowledge": "Dify 的 MCP 伺服器實做，提供了一個簡單的 API 來與 Dify 進行互動。需要設定 Dify Key",
+        "fetch": "用於取得 URL 網頁內容的 MCP 伺服器",
+        "filesystem": "實做文件系統操作的模型上下文協議（MCP）的 Node.js 伺服器。需要設定允許存取的目錄",
         "mcp_auto_install": "自動安裝 MCP 服務（測試版）",
-        "memory": "基於本地知識圖譜的持久性記憶基礎實現。這使得模型能夠在不同對話間記住使用者的相關資訊。需要配置 MEMORY_FILE_PATH 環境變數。",
+        "memory": "基於本機知識圖譜的持久性記憶基礎實做。這使得模型能夠在不同對話間記住使用者的相關資訊。需要設定 MEMORY_FILE_PATH 環境變數。",
         "no": "無描述",
-        "python": "在安全的沙盒環境中執行 Python 代碼。使用 Pyodide 運行 Python，支援大多數標準庫和科學計算套件",
-        "sequentialthinking": "一個 MCP 伺服器實現，提供了透過結構化思維過程進行動態和反思性問題解決的工具"
+        "nowledge_mem": "需要本機執行 Nowledge Mem 應用程式。將 AI 對話、工具、筆記、代理和檔案保存在電腦上的私人記憶體中。請從 https://mem.nowledge.co/ 下載",
+        "python": "在安全的沙盒環境中執行 Python 程式碼。使用 Pyodide 執行 Python，支援大多數標準函式庫和科學計算套件",
+        "sequentialthinking": "一個 MCP 伺服器實做，提供了透過結構化思維過程進行動態和反思性問題解決的工具"
       },
       "command": "指令",
       "config_description": "設定模型上下文協議伺服器",
-      "customRegistryPlaceholder": "請輸入私有倉庫位址，如: https://npm.company.com",
+      "customRegistryPlaceholder": "請輸入私有倉庫位址，如：https://npm.company.com",
       "deleteError": "刪除伺服器失敗",
       "deleteServer": "刪除伺服器",
       "deleteServerConfirm": "確定要刪除此伺服器嗎？",
@@ -3890,17 +3993,17 @@
       "discover": "發現",
       "duplicateName": "已存在相同名稱的伺服器",
       "editJson": "編輯 JSON",
-      "editMcpJson": "編輯 MCP 配置",
+      "editMcpJson": "編輯 MCP 設定",
       "editServer": "編輯伺服器",
       "env": "環境變數",
       "envTooltip": "格式：KEY=value，每行一個",
       "errors": {
-        "32000": "MCP 伺服器啟動失敗，請根據教程檢查參數是否填寫完整",
+        "32000": "MCP 伺服器啟動失敗，請根據教學檢查參數是否填寫完整",
         "toolNotFound": "未找到工具 {{name}}"
       },
       "fetch": {
-        "button": "獲取伺服器",
-        "success": "伺服器獲取成功"
+        "button": "取得伺服器",
+        "success": "伺服器取得成功"
       },
       "findMore": "更多 MCP",
       "headers": "請求標頭",
@@ -3908,58 +4011,60 @@
       "inMemory": "記憶體",
       "install": "安裝",
       "installError": "安裝相依套件失敗",
-      "installHelp": "獲取安裝幫助",
+      "installHelp": "取得安裝幫助",
       "installSuccess": "相依套件安裝成功",
       "jsonFormatError": "JSON 格式錯誤",
-      "jsonModeHint": "編輯 MCP 伺服器配置的 JSON 表示。保存前請確保格式正確",
-      "jsonSaveError": "保存 JSON 配置失敗",
-      "jsonSaveSuccess": "JSON 配置已儲存",
-      "logoUrl": "標誌網址",
-      "longRunning": "長時間運行模式",
-      "longRunningTooltip": "啟用後，伺服器支援長時間任務，接收到進度通知時會重置超時計時器，並延長最大超時時間至10分鐘",
+      "jsonModeHint": "編輯 MCP 伺服器設定的 JSON 表示。儲存前請確認格式正確",
+      "jsonSaveError": "儲存 JSON 設定失敗",
+      "jsonSaveSuccess": "JSON 設定已儲存",
+      "logoUrl": "Logo URL",
+      "logs": "日誌",
+      "longRunning": "長時間運作模式",
+      "longRunningTooltip": "啟用後，伺服器支援長時間任務；收到進度通知時會重設逾時計時器，並將最大逾時時間延長至 10 分鐘",
       "marketplaces": "市場",
-      "missingDependencies": "缺失，請安裝它以繼續",
+      "missingDependencies": "遺失，請安裝它以繼續",
       "more": {
         "awesome": "精選的 MCP 伺服器清單",
         "composio": "Composio MCP 開發工具",
         "glama": "Glama MCP 伺服器目錄",
         "higress": "Higress MCP 伺服器",
         "mcpso": "MCP 伺服器發現平台",
-        "modelscope": "魔搭社區 MCP 伺服器",
+        "modelscope": "魔搭社群 MCP 伺服器",
         "official": "官方 MCP 伺服器集合",
         "pulsemcp": "Pulse MCP 伺服器",
         "smithery": "Smithery MCP 工具",
-        "zhipu": "精選MCP，極速接入"
+        "zhipu": "精選 MCP，極速接入"
       },
       "name": "名稱",
       "newServer": "MCP 伺服器",
       "noDescriptionAvailable": "描述不存在",
+      "noLogs": "暫無日誌",
       "noServers": "未設定伺服器",
       "not_support": "不支援此模型",
       "npx_list": {
         "actions": "操作",
         "description": "描述",
-        "no_packages": "未找到包",
+        "no_packages": "找不到套件",
         "npm": "NPM",
-        "package_name": "包名稱",
-        "scope_placeholder": "輸入 npm 作用域 (例如 @your-org)",
-        "scope_required": "請輸入 npm 作用域",
-        "search": "搜索",
-        "search_error": "搜索失敗",
+        "package_name": "套件名稱",
+        "scope_placeholder": "輸入 npm 作用區域 (例如 @your-org)",
+        "scope_required": "請輸入 npm 作用區域",
+        "search": "搜尋",
+        "search_error": "搜尋失敗",
         "usage": "用法",
         "version": "版本"
       },
       "oauth": {
         "callback": {
-          "message": "您可以關閉此頁面並返回 Cherry Studio",
+          "message": "關閉此頁面後即可回到 Cherry Studio",
           "title": "認證成功"
         }
       },
       "prompts": {
         "arguments": "參數",
         "availablePrompts": "可用提示",
-        "genericError": "獲取提示錯誤",
-        "loadError": "獲取提示失敗",
+        "genericError": "取得提示錯誤",
+        "loadError": "取得提示失敗",
         "noPromptsAvailable": "無可用提示",
         "requiredField": "必填欄位"
       },
@@ -3972,16 +4077,16 @@
       "provider": "提供者",
       "providerPlaceholder": "提供者名稱",
       "providerUrl": "提供者網址",
-      "providers": "提供商",
+      "providers": "供應商",
       "registry": "套件管理源",
       "registryDefault": "預設",
       "registryTooltip": "選擇用於安裝套件的源，以解決預設源的網路問題",
-      "requiresConfig": "需要配置",
+      "requiresConfig": "需要設定",
       "resources": {
         "availableResources": "可用資源",
-        "blob": "二進位數據",
-        "blobInvisible": "隱藏二進位數據",
-        "genericError": "获取资源错误",
+        "blob": "二進位資料",
+        "blobInvisible": "隱藏二進位資料",
+        "genericError": "取得資源錯誤",
         "mimeType": "MIME 類型",
         "noResourcesAvailable": "無可用資源",
         "size": "大小",
@@ -3989,10 +4094,10 @@
         "uri": "URI"
       },
       "search": {
-        "placeholder": "搜索 MCP 伺服器...",
-        "tooltip": "搜索 MCP 伺服器"
+        "placeholder": "搜尋 MCP 伺服器...",
+        "tooltip": "搜尋 MCP 伺服器"
       },
-      "searchNpx": "搜索 MCP",
+      "searchNpx": "搜尋 MCP",
       "serverPlural": "伺服器",
       "serverSingular": "伺服器",
       "servers": "MCP 伺服器",
@@ -4003,17 +4108,17 @@
       "sync": {
         "button": "同步",
         "discoverMcpServers": "發現 MCP 伺服器",
-        "discoverMcpServersDescription": "訪問平台以發現可用的 MCP 伺服器",
+        "discoverMcpServersDescription": "存取平台以發現可用的 MCP 伺服器",
         "error": "同步 MCP 伺服器出錯",
-        "getToken": "獲取 API 令牌",
-        "getTokenDescription": "從您的帳戶獲取個人 API 令牌",
+        "getToken": "取得 API 權杖",
+        "getTokenDescription": "從帳戶取得個人 API 權杖",
         "noServersAvailable": "無可用的 MCP 伺服器",
         "selectProvider": "選擇提供者：",
-        "setToken": "輸入您的令牌",
+        "setToken": "輸入權杖",
         "success": "同步 MCP 伺服器成功",
         "title": "同步伺服器",
-        "tokenPlaceholder": "在此輸入 API 令牌",
-        "tokenRequired": "需要 API 令牌",
+        "tokenPlaceholder": "在此輸入 API 權杖",
+        "tokenRequired": "需要 API 權杖",
         "unauthorized": "同步未授權"
       },
       "system": "系統",
@@ -4026,17 +4131,17 @@
       },
       "tags": "標籤",
       "tagsPlaceholder": "輸入標籤",
-      "timeout": "超時",
-      "timeoutTooltip": "對該伺服器請求的超時時間（秒），預設為 60 秒",
-      "title": "MCP",
+      "timeout": "逾時",
+      "timeoutTooltip": "對該伺服器請求的逾時時間（秒），預設為 60 秒",
+      "title": "MCP 伺服器",
       "tools": {
         "autoApprove": {
-          "label": "自動批准",
+          "label": "自動核准",
           "tooltip": {
-            "confirm": "是否運行該MCP工具？",
-            "disabled": "工具運行前需要手動批准",
-            "enabled": "工具將自動運行而無需批准",
-            "howToEnable": "啟用工具後才能使用自動批准"
+            "confirm": "是否運作該 MCP 工具？",
+            "disabled": "工具運作前需要手動核准",
+            "enabled": "工具將自動運作而無需手動核准",
+            "howToEnable": "啟用工具後才能使用自動核准"
           }
         },
         "availableTools": "可用工具",
@@ -4047,26 +4152,26 @@
           },
           "label": "輸入模式"
         },
-        "loadError": "獲取工具失敗",
+        "loadError": "取得工具失敗",
         "noToolsAvailable": "無可用工具",
-        "run": "運行"
+        "run": "運作"
       },
       "type": "類型",
       "types": {
-        "inMemory": "內置",
+        "inMemory": "記憶體內",
         "sse": "SSE",
         "stdio": "STDIO",
-        "streamableHttp": "流式"
+        "streamableHttp": "串流 HTTP"
       },
       "updateError": "更新伺服器失敗",
       "updateSuccess": "伺服器更新成功",
       "url": "URL",
-      "user": "用戶"
+      "user": "使用者"
     },
     "messages": {
       "divider": {
         "label": "訊息間顯示分隔線",
-        "tooltip": "不適用於氣泡樣式消息"
+        "tooltip": "不適用於氣泡樣式訊息"
       },
       "grid_columns": "訊息網格展示列數",
       "grid_popover_trigger": {
@@ -4076,7 +4181,7 @@
       },
       "input": {
         "confirm_delete_message": "刪除訊息前確認",
-        "confirm_regenerate_message": "重新生成訊息前確認",
+        "confirm_regenerate_message": "重新產生訊息前確認",
         "enable_quick_triggers": "啟用 / 和 @ 觸發快捷選單",
         "paste_long_text_as_file": "將長文字貼上為檔案",
         "paste_long_text_threshold": "長文字長度",
@@ -4092,11 +4197,11 @@
       "navigation": {
         "anchor": "對話錨點",
         "buttons": "上下按鈕",
-        "label": "訊息導航",
+        "label": "訊息導覽",
         "none": "不顯示"
       },
       "prompt": "提示詞顯示",
-      "show_message_outline": "顯示消息大綱",
+      "show_message_outline": "顯示訊息大綱",
       "title": "訊息設定",
       "use_serif_font": "使用襯線字型"
     },
@@ -4104,20 +4209,20 @@
       "api_key": "Mineru 現在每天提供 500 頁的免費配額，且無需輸入金鑰。"
     },
     "miniapps": {
-      "cache_change_notice": "更改將在打開的小程式增減至設定值後生效",
-      "cache_description": "設置同時保持活躍狀態的小程式最大數量",
-      "cache_settings": "緩存設置",
-      "cache_title": "小程式緩存數量",
+      "cache_change_notice": "變更會在開啟的小程式數量調整至設定值後生效",
+      "cache_description": "設定同時保持活躍狀態的小程式最大數量",
+      "cache_settings": "快取設定",
+      "cache_title": "小程式快取數量",
       "custom": {
-        "conflicting_ids": "與預設應用 ID 衝突: {{ids}}",
+        "conflicting_ids": "與預設應用 ID 衝突：{{ids}}",
         "duplicate_ids": "發現重複的 ID: {{ids}}",
-        "edit_description": "編輯自定義小程序配置",
-        "edit_title": "編輯自定義小程序",
+        "edit_description": "編輯自訂小程式設定",
+        "edit_title": "編輯自訂小程式",
         "id": "ID",
         "id_error": "ID 是必填項",
         "id_placeholder": "請輸入 ID",
         "logo": "Logo",
-        "logo_file": "上傳 Logo 文件",
+        "logo_file": "上傳 Logo 檔案",
         "logo_upload_button": "上傳",
         "logo_upload_error": "Logo 上傳失敗",
         "logo_upload_label": "上傳 Logo",
@@ -4126,36 +4231,36 @@
         "logo_url_label": "Logo URL",
         "logo_url_placeholder": "請輸入 Logo URL",
         "name": "名稱",
-        "name_error": "名稱是必填項",
+        "name_error": "名稱為必填欄位",
         "name_placeholder": "請輸入名稱",
-        "placeholder": "請輸入自定義小程序配置（JSON 格式）",
-        "remove_error": "自定義小程序刪除失敗",
-        "remove_success": "自定義小程序刪除成功",
-        "save": "保存",
-        "save_error": "自定義小程序保存失敗",
-        "save_success": "自定義小程序保存成功",
-        "title": "自定義",
+        "placeholder": "請輸入自訂小程式設定（JSON 格式）",
+        "remove_error": "自訂小程式刪除失敗",
+        "remove_success": "自訂小程式刪除成功",
+        "save": "儲存",
+        "save_error": "自訂小程式儲存失敗",
+        "save_success": "自訂小程式儲存成功",
+        "title": "自訂",
         "url": "URL",
         "url_error": "URL 是必填項",
         "url_placeholder": "請輸入 URL"
       },
       "disabled": "隱藏的小程式",
-      "display_title": "小程式顯示設置",
-      "empty": "把要隱藏的小程式從左側拖拽到這裡",
+      "display_title": "小程式顯示設定",
+      "empty": "把要隱藏的小程式從左側拖曳到這裡",
       "open_link_external": {
-        "title": "在瀏覽器中打開新視窗連結"
+        "title": "在瀏覽器中開啟新視窗連結"
       },
-      "reset_tooltip": "重置為預設值",
-      "sidebar_description": "設置側邊欄是否顯示活躍的小程式",
-      "sidebar_title": "側邊欄活躍小程式顯示設置",
-      "title": "小程式設置",
+      "reset_tooltip": "重設為預設值",
+      "sidebar_description": "設定側邊欄是否顯示活躍的小程式",
+      "sidebar_title": "側邊欄活躍小程式顯示設定",
+      "title": "小程式設定",
       "visible": "顯示的小程式"
     },
     "model": "預設模型",
     "models": {
       "add": {
         "add_model": "新增模型",
-        "batch_add_models": "批量新增模型",
+        "batch_add_models": "批次新增模型",
         "endpoint_type": {
           "label": "端點類型",
           "placeholder": "選擇端點類型",
@@ -4181,35 +4286,35 @@
           "tooltip": "例如 GPT-4"
         },
         "supported_text_delta": {
-          "label": "支持增量文本輸出",
-          "tooltip": "模型每次返回文本增量，而不是一次性返回所有文本，預設開啟，如果模型不支持，請關閉"
+          "label": "支援增量文字輸出",
+          "tooltip": "模型每次回傳文字增量，而不是一次性回傳所有文字，預設開啟，如果模型不支援，請關閉"
         }
       },
-      "api_key": "API 密鑰",
+      "api_key": "API 金鑰",
       "base_url": "基礎 URL",
       "check": {
         "all": "所有",
-        "all_models_passed": "所有模型檢查通過",
+        "all_models_passed": "所有模型檢查皆成功",
         "button_caption": "健康檢查",
         "disabled": "關閉",
-        "disclaimer": "健康檢查需要發送請求，請謹慎使用。按次收費的模型可能產生更多費用，請自行承擔。",
+        "disclaimer": "健康檢查需要傳送請求，請謹慎使用。按次收費的模型可能產生更多費用，請自行承擔。",
         "enable_concurrent": "並行檢查",
         "enabled": "開啟",
         "failed": "失敗",
-        "keys_status_count": "通過：{{count_passed}} 個密鑰，失敗：{{count_failed}} 個密鑰",
-        "model_status_failed": "{{count}} 個模型完全無法訪問",
-        "model_status_partial": "其中 {{count}} 個模型用某些密鑰無法訪問",
-        "model_status_passed": "{{count}} 個模型通過健康檢查",
+        "keys_status_count": "成功：{{count_passed}} 個金鑰，失敗：{{count_failed}} 個金鑰",
+        "model_status_failed": "{{count}} 個模型完全無法存取",
+        "model_status_partial": "其中 {{count}} 個模型用某些金鑰無法存取",
+        "model_status_passed": "{{count}} 個模型健康檢查成功",
         "model_status_summary": "{{provider}}: {{summary}}",
-        "no_api_keys": "未找到 API 密鑰，請先添加 API 密鑰",
+        "no_api_keys": "未找到 API 金鑰，請先新增 API 金鑰",
         "no_results": "無結果",
-        "passed": "通過",
-        "select_api_key": "選擇要使用的 API 密鑰：",
+        "passed": "成功",
+        "select_api_key": "選擇要使用的 API 金鑰：",
         "single": "單個",
         "start": "開始",
-        "timeout": "超時",
+        "timeout": "逾時",
         "title": "模型健康檢查",
-        "use_all_keys": "使用密鑰"
+        "use_all_keys": "使用金鑰"
       },
       "default_assistant_model": "預設助手模型",
       "default_assistant_model_description": "建立新助手時使用的模型，如果助手未設定模型，則使用此模型",
@@ -4220,27 +4325,27 @@
           "label": "新增列表中的模型"
         },
         "add_whole_group": "新增整個分組",
-        "refetch_list": "重新獲取模型列表",
+        "refetch_list": "重新取得模型列表",
         "remove_listed": "移除列表中的模型",
         "remove_model": "移除模型",
         "remove_whole_group": "移除整個分組"
       },
       "provider_id": "提供者 ID",
-      "provider_key_add_confirm": "是否要為 {{provider}} 添加 API 密鑰？",
-      "provider_key_add_failed_by_empty_data": "添加提供者 API 密鑰失敗，數據為空",
-      "provider_key_add_failed_by_invalid_data": "添加提供者 API 密鑰失敗，數據格式錯誤",
-      "provider_key_added": "成功為 {{provider}} 添加 API 密鑰",
-      "provider_key_already_exists": "{{provider}} 已存在相同API 密鑰，不會重複添加",
-      "provider_key_confirm_title": "為{{provider}}添加 API 密鑰",
-      "provider_key_no_change": "{{provider}} 的 API 密鑰沒有變化",
-      "provider_key_overridden": "成功更新 {{provider}} 的 API 密鑰",
+      "provider_key_add_confirm": "是否要為 {{provider}} 新增 API 金鑰？",
+      "provider_key_add_failed_by_empty_data": "新增提供者 API 金鑰失敗，資料為空",
+      "provider_key_add_failed_by_invalid_data": "新增提供者 API 金鑰失敗，資料格式錯誤",
+      "provider_key_added": "成功為 {{provider}} 新增 API 金鑰",
+      "provider_key_already_exists": "{{provider}} 已存在相同 API 金鑰，不會重複新增",
+      "provider_key_confirm_title": "為{{provider}}新增 API 金鑰",
+      "provider_key_no_change": "{{provider}} 的 API 金鑰沒有變化",
+      "provider_key_overridden": "成功更新 {{provider}} 的 API 金鑰",
       "provider_key_override_confirm": "{{provider}} 已存在相同 API 金鑰，是否覆蓋？",
       "provider_name": "提供者名稱",
       "quick_assistant_default_tag": "預設",
       "quick_assistant_model": "快捷助手模型",
       "quick_assistant_selection": "選擇助手",
       "quick_model": {
-        "description": "用於執行話題命名、搜尋關鍵字提煉等簡單任務的模型",
+        "description": "用於話題命名、搜尋關鍵字提煉等簡單任務的模型",
         "label": "快速模型",
         "setting_title": "快速模型設定",
         "tooltip": "建議選擇輕量模型，不建議選擇思考模型"
@@ -4265,7 +4370,7 @@
       "label": "更多設定",
       "warn": "風險警告"
     },
-    "no_provider_selected": "未選擇提供商",
+    "no_provider_selected": "未選擇供應商",
     "notification": {
       "assistant": "助手訊息",
       "backup": "備份訊息",
@@ -4306,7 +4411,7 @@
       }
     },
     "privacy": {
-      "enable_privacy_mode": "匿名發送錯誤報告和資料統計",
+      "enable_privacy_mode": "匿名傳送錯誤報告和資料統計",
       "title": "隱私設定"
     },
     "provider": {
@@ -4319,9 +4424,9 @@
         "type": "供應商類型"
       },
       "anthropic": {
-        "apikey": "API 密鑰",
+        "apikey": "API 金鑰",
         "auth_failed": "Anthropic 身份驗證失敗",
-        "auth_method": "认证方式",
+        "auth_method": "認證方式",
         "auth_success": "Anthropic OAuth 認證成功",
         "authenticated": "已認證",
         "authenticating": "正在認證",
@@ -4337,48 +4442,48 @@
         "logout_success": "成功登出 Anthropic",
         "oauth": "網頁 OAuth",
         "start_auth": "開始授權",
-        "submit_code": "完成登錄"
+        "submit_code": "完成登入"
       },
-      "anthropic_api_host": "Anthropic API 主機地址",
+      "anthropic_api_host": "Anthropic API 主機位址",
       "anthropic_api_host_preview": "Anthropic 預覽：{{url}}",
-      "anthropic_api_host_tooltip": "僅在服務商提供 Claude 相容的基礎網址時設定。",
+      "anthropic_api_host_tooltip": "僅在供應商提供 Claude 相容的基礎網址時設定。",
       "api": {
         "key": {
           "check": {
             "latency": "耗時"
           },
           "error": {
-            "duplicate": "API 密鑰已存在",
-            "empty": "API 密鑰不能為空"
+            "duplicate": "API 金鑰已存在",
+            "empty": "API 金鑰不能為空"
           },
           "list": {
-            "open": "打開管理界面",
-            "title": "API 密鑰管理"
+            "open": "開啟管理介面",
+            "title": "API 金鑰管理"
           },
           "new_key": {
-            "placeholder": "輸入一個或多個密鑰"
+            "placeholder": "輸入一個或多個金鑰"
           }
         },
         "options": {
           "array_content": {
-            "help": "該提供商是否支援 message 的 content 欄位為 array 類型",
+            "help": "該供應商是否支援 message 的 content 欄位為 array 類型",
             "label": "支援陣列格式的 message content"
           },
           "developer_role": {
-            "help": "該提供商是否支援 role: \"developer\" 的訊息",
+            "help": "該供應商是否支援 role: \"developer\" 的訊息",
             "label": "支援開發人員訊息"
           },
           "enable_thinking": {
-            "help": "該提供商是否支援透過 enable_thinking 參數控制 Qwen3 等模型的思考",
+            "help": "該供應商是否支援透過 enable_thinking 參數控制 Qwen3 等模型的思考",
             "label": "支援 enable_thinking"
           },
           "label": "API 設定",
           "service_tier": {
-            "help": "該提供商是否支援設定 service_tier 參數。啟用後，可在對話頁面的服務層級設定中調整此參數。（僅限 OpenAI 模型）",
+            "help": "該供應商是否支援設定 service_tier 參數。啟用後，可在對話頁面的服務層級設定中調整此參數。（僅限 OpenAI 模型）",
             "label": "支援 service_tier"
           },
           "stream_options": {
-            "help": "該提供商是否支援 stream_options 參數",
+            "help": "該供應商是否支援 stream_options 參數",
             "label": "支援 stream_options"
           },
           "verbosity": {
@@ -4389,32 +4494,32 @@
         "url": {
           "preview": "預覽：{{url}}",
           "reset": "重設",
-          "tip": "在末尾添加 # 以停用自動附加的 API 版本。"
+          "tip": "在結尾新增 # 以停用自動附加的 API 版本。"
         }
       },
-      "api_host": "API 主機地址",
+      "api_host": "API 主機位址",
       "api_host_no_valid": "API 位址不合法",
       "api_host_preview": "預覽：{{url}}",
-      "api_host_tooltip": "僅在服務商需要自訂的 OpenAI 相容端點時才覆蓋。",
+      "api_host_tooltip": "僅在供應商需要自訂的 OpenAI 相容端點時才覆蓋。",
       "api_key": {
         "label": "API 金鑰",
         "tip": "多個金鑰使用逗號分隔"
       },
       "api_version": "API 版本",
       "aws-bedrock": {
-        "access_key_id": "AWS 存取密鑰 ID",
-        "access_key_id_help": "您的 AWS 存取密鑰 ID，用於存取 AWS Bedrock 服務",
+        "access_key_id": "AWS 存取金鑰 ID",
+        "access_key_id_help": "您的 AWS 存取金鑰 ID，用於存取 AWS Bedrock 服務",
         "api_key": "Bedrock API 金鑰",
         "api_key_help": "您的 AWS Bedrock API 金鑰，用於身份驗證",
         "auth_type": "認證方式",
         "auth_type_api_key": "Bedrock API 金鑰",
         "auth_type_help": "選擇使用 IAM 憑證或 Bedrock API 金鑰進行身份驗證",
         "auth_type_iam": "IAM 憑證",
-        "description": "AWS Bedrock 是亞馬遜提供的全托管基础模型服務，支持多種先進的大語言模型",
+        "description": "AWS Bedrock 是亞馬遜提供的全託管基礎模型服務，支援多種先進的大型語言模型",
         "region": "AWS 區域",
         "region_help": "您的 AWS 服務區域，例如 us-east-1",
-        "secret_access_key": "AWS 存取密鑰",
-        "secret_access_key_help": "您的 AWS 存取密鑰，請妥善保管",
+        "secret_access_key": "AWS 存取金鑰",
+        "secret_access_key_help": "您的 AWS 存取金鑰，請妥善保管",
         "title": "AWS Bedrock 設定"
       },
       "azure": {
@@ -4428,59 +4533,59 @@
           "label": "密碼",
           "tip": "輸入密碼"
         },
-        "tip": "適用於透過伺服器部署的實例（請參閱文檔）。目前僅支援 Basic 方案（RFC7617）",
+        "tip": "適用於透過伺服器部署的執行個體（請參閱文件）。目前僅支援 Basic 方案（RFC7617）",
         "user_name": {
-          "label": "用戶",
+          "label": "使用者",
           "tip": "留空以停用"
         }
       },
       "bills": "費用帳單",
-      "charge": "餘額充值",
+      "charge": "餘額儲值",
       "check": "檢查",
       "check_all_keys": "檢查所有金鑰",
       "check_multiple_keys": "檢查多個 API 金鑰",
       "copilot": {
-        "auth_failed": "Github Copilot 認證失敗",
-        "auth_success": "Github Copilot 認證成功",
+        "auth_failed": "GitHub Copilot 認證失敗",
+        "auth_success": "GitHub Copilot 認證成功",
         "auth_success_title": "認證成功",
         "code_copied": "授權碼已自動複製到剪貼簿",
-        "code_failed": "獲取 Device Code 失敗，請重試",
-        "code_generated_desc": "請將設備代碼複製到下面的瀏覽器連結中",
-        "code_generated_title": "獲取設備代碼",
-        "connect": "連接 Github",
+        "code_failed": "取得裝置碼失敗，請重試",
+        "code_generated_desc": "請將裝置碼複製到下方的瀏覽器連結中",
+        "code_generated_title": "取得裝置碼",
+        "connect": "連線 GitHub",
         "custom_headers": "自訂請求標頭",
-        "description": "您的 Github 帳號需要訂閱 Copilot",
+        "description": "GitHub 帳號需要訂閱 Copilot",
         "description_detail": "GitHub Copilot 是一個基於 AI 的程式碼助手，需要有效的 GitHub Copilot 訂閱才能使用",
         "expand": "展開",
         "headers_description": "自訂請求標頭 (json 格式)",
         "invalid_json": "JSON 格式錯誤",
-        "login": "登入 Github",
-        "logout": "退出 Github",
-        "logout_failed": "退出失敗，請重試",
+        "login": "登入 GitHub",
+        "logout": "登出 GitHub",
+        "logout_failed": "登出失敗，請重試",
         "logout_success": "已成功登出",
         "model_setting": "模型設定",
-        "open_verification_first": "請先點擊上方連結訪問驗證頁面",
+        "open_verification_first": "請先點選上方連結前往驗證頁面",
         "open_verification_page": "開啟授權頁面",
         "rate_limit": "速率限制",
         "start_auth": "開始授權",
         "step_authorize": "開啟授權頁面",
         "step_authorize_desc": "在 GitHub 上完成授權",
-        "step_authorize_detail": "點擊下方按鈕開啟 GitHub 授權頁面，然後輸入複製的授權碼",
+        "step_authorize_detail": "點選下方按鈕開啟 GitHub 授權頁面，然後輸入複製的授權碼",
         "step_connect": "完成連線",
-        "step_connect_desc": "確認連接到 GitHub",
-        "step_connect_detail": "在 GitHub 頁面完成授權後，點擊此按鈕完成連線",
+        "step_connect_desc": "確認已連線至 GitHub",
+        "step_connect_detail": "在 GitHub 頁面完成授權後，點選此按鈕完成連線",
         "step_copy_code": "複製授權碼",
-        "step_copy_code_desc": "複製設備授權碼",
+        "step_copy_code_desc": "複製裝置授權碼",
         "step_copy_code_detail": "授權碼已自動複製，您也可以手動複製",
-        "step_get_code": "獲取授權碼",
-        "step_get_code_desc": "生成設備授權碼"
+        "step_get_code": "取得授權碼",
+        "step_get_code_desc": "產生裝置授權碼"
       },
       "delete": {
         "content": "確定要刪除此提供者嗎？",
         "title": "刪除提供者"
       },
       "dmxapi": {
-        "select_platform": "選擇平臺"
+        "select_platform": "選擇平台"
       },
       "docs_check": "檢查",
       "docs_more_details": "檢視更多細節",
@@ -4496,7 +4601,7 @@
       "oauth": {
         "button": "使用 {{provider}} 帳號登入",
         "description": "本服務由 <website>{{provider}}</website> 提供",
-        "error": "认证失败",
+        "error": "認證失敗",
         "official_website": "官方網站"
       },
       "openai": {
@@ -4508,7 +4613,7 @@
       "search_placeholder": "搜尋模型 ID 或名稱",
       "title": "模型提供者",
       "vertex_ai": {
-        "api_host_help": "Vertex AI 的 API 地址，不建議填寫，通常適用於反向代理",
+        "api_host_help": "Vertex AI 的 API 位址，不建議填寫，通常適用於反向代理",
         "documentation": "檢視官方文件以取得更多設定詳細資訊：",
         "learn_more": "瞭解更多",
         "location": "地區",
@@ -4521,7 +4626,7 @@
           "client_email": "Client Email",
           "client_email_help": "從 Google Cloud Console 下載的 JSON 金鑰檔案中的 client_email 欄位",
           "client_email_placeholder": "輸入服務帳戶 client email",
-          "description": "使用服務帳戶進行身份驗證，適用於 ADC 不可用的環境",
+          "description": "使用服務帳戶進行身份驗證，適用於 ADC 無法使用的環境",
           "incomplete_config": "請先完成服務帳戶設定",
           "private_key": "私密金鑰",
           "private_key_help": "從 Google Cloud Console 下載的 JSON 金鑰檔案中的 private_key 欄位",
@@ -4539,7 +4644,7 @@
         "system": "系統代理伺服器",
         "title": "代理伺服器模式"
       },
-      "tip": "支援模糊匹配（*.test.com，192.168.0.0/16）"
+      "tip": "支援模糊比對（*.test.com，192.168.0.0/16）"
     },
     "quickAssistant": {
       "click_tray_to_show": "點選工具列圖示啟動",
@@ -4563,12 +4668,12 @@
       "add": "新增短語",
       "assistant": "助手提示詞",
       "contentLabel": "內容",
-      "contentPlaceholder": "請輸入短語內容，支持使用變量，然後按 Tab 鍵可以快速定位到變量進行修改。比如：\n幫我規劃從 ${from} 到 ${to} 的行程，然後發送到 ${email}",
+      "contentPlaceholder": "請輸入短語內容，支援使用變數，然後按 Tab 鍵可以快速定位到變數進行修改。例如：\n幫我規劃從 ${from} 到 ${to} 的行程，然後傳送到 ${email}",
       "delete": "刪除短語",
       "deleteConfirm": "刪除後無法復原，是否繼續？",
       "edit": "編輯短語",
-      "global": "全局快速短語",
-      "locationLabel": "添加位置",
+      "global": "全域快速短語",
+      "locationLabel": "新增位置",
       "title": "快捷短語",
       "titleLabel": "標題",
       "titlePlaceholder": "請輸入短語標題"
@@ -4581,7 +4686,7 @@
       "copy_last_message": "複製上一則訊息",
       "edit_last_user_message": "編輯最後一則使用者訊息",
       "enabled": "啟用",
-      "exit_fullscreen": "退出螢幕",
+      "exit_fullscreen": "離開全螢幕",
       "label": "按鍵",
       "mini_window": "快捷助手",
       "new_topic": "新增話題",
@@ -4591,8 +4696,8 @@
       "reset_defaults_confirm": "確定要重設所有快捷鍵嗎？",
       "reset_to_default": "重設為預設",
       "search_message": "搜尋訊息",
-      "search_message_in_chat": "在當前對話中搜尋訊息",
-      "selection_assistant_select_text": "劃詞助手：取词",
+      "search_message_in_chat": "在目前對話中搜尋訊息",
+      "selection_assistant_select_text": "劃詞助手：取詞",
       "selection_assistant_toggle": "開關劃詞助手",
       "show_app": "顯示 / 隱藏應用程式",
       "show_settings": "開啟設定",
@@ -4629,14 +4734,14 @@
         },
         "image": {
           "error": {
-            "provider_not_found": "該提供商不存在"
+            "provider_not_found": "該供應商不存在"
           },
           "system": {
-            "no_need_configure": "MacOS 無需配置"
+            "no_need_configure": "MacOS 無需設定"
           },
           "title": "圖片"
         },
-        "image_provider": "OCR 服務提供商",
+        "image_provider": "OCR 服務供應商",
         "paddleocr": {
           "aistudio_access_token": "星河社群存取權杖",
           "aistudio_url_label": "星河社群",
@@ -4646,7 +4751,7 @@
         },
         "system": {
           "win": {
-            "langs_tooltip": "依賴 Windows 提供服務，您需要在系統中下載語言包來支援相關語言。"
+            "langs_tooltip": "仰賴 Windows 提供的服務，需要在系統中下載語言套件，才能支援相關語言。"
           }
         },
         "tesseract": {
@@ -4662,6 +4767,12 @@
       },
       "title": "其他設定",
       "websearch": {
+        "api_key_required": {
+          "content": "{{provider}} 需要 API 金鑰才能運作。您現在要設定嗎？",
+          "ok": "設定",
+          "title": "需要 API 金鑰"
+        },
+        "api_providers": "API 服務商",
         "apikey": "API 金鑰",
         "blacklist": "黑名單",
         "blacklist_description": "以下網站不會出現在搜尋結果中",
@@ -4674,10 +4785,10 @@
             "limit": {
               "label": "截斷長度",
               "placeholder": "輸入長度",
-              "tooltip": "限制搜尋結果的內容長度，超過限制的內容將被截斷（例如 2000 字符）"
+              "tooltip": "限制搜尋結果的內容長度，超過限制的內容將被截斷（例如 2000 字元）"
             },
             "unit": {
-              "char": "字符",
+              "char": "字元",
               "token": "Token"
             }
           },
@@ -4685,7 +4796,7 @@
             "rag_failed": "RAG 失敗"
           },
           "info": {
-            "dimensions_auto_success": "維度自動獲取成功，維度為 {{dimensions}}"
+            "dimensions_auto_success": "維度自動取得成功，維度為 {{dimensions}}"
           },
           "method": {
             "cutoff": "截斷",
@@ -4695,37 +4806,46 @@
           },
           "rag": {
             "document_count": {
-              "label": "文檔片段數量",
-              "tooltip": "預期從單個搜尋結果中提取的文檔片段數量，實際提取的總數量是這個值乘以搜尋結果數量。"
+              "label": "文件片段數量",
+              "tooltip": "預期從單個搜尋結果中提取的文件片段數量，實際提取的總數量是這個值乘以搜尋結果數量。"
             }
           },
           "title": "搜尋結果壓縮"
         },
         "content_limit": "內容長度限制",
         "content_limit_tooltip": "限制搜尋結果的內容長度；超過限制的內容將被截斷。",
+        "default_provider": "預設搜尋引擎",
         "free": "免費",
-        "no_provider_selected": "請選擇搜尋服務商後再檢查",
+        "is_default": "預設",
+        "local_provider": {
+          "hint": "登入網站以獲得更佳搜尋結果並個人化您的搜尋設定。",
+          "open_settings": "開啟 {{provider}} 設定",
+          "settings": "本地搜尋設定"
+        },
+        "local_providers": "本地搜尋",
+        "no_provider_selected": "請選擇搜尋供應商後再檢查",
         "overwrite": "覆蓋搜尋服務",
         "overwrite_tooltip": "強制使用搜尋服務而不是 LLM",
         "search_max_result": {
           "label": "搜尋結果個數",
           "tooltip": "未開啟搜尋結果壓縮的情況下，數量過大可能會消耗過多 tokens"
         },
-        "search_provider": "搜尋服務商",
-        "search_provider_placeholder": "選擇一個搜尋服務商",
+        "search_provider": "搜尋供應商",
+        "search_provider_placeholder": "選擇一個搜尋供應商",
         "search_with_time": "搜尋包含日期",
+        "set_as_default": "設為預設",
         "subscribe": "黑名單訂閱",
         "subscribe_add": "新增訂閱",
-        "subscribe_add_failed": "订阅源添加失败",
-        "subscribe_add_success": "訂閱源新增成功!",
+        "subscribe_add_failed": "訂閱來源新增失敗",
+        "subscribe_add_success": "訂閱來源新增成功！",
         "subscribe_delete": "刪除",
         "subscribe_name": {
           "label": "替代名稱",
-          "placeholder": "下載的訂閱源沒有名稱時使用的替代名稱。"
+          "placeholder": "下載的訂閱來源沒有名稱時使用的替代名稱。"
         },
         "subscribe_update": "更新",
-        "subscribe_update_failed": "订阅源更新失败",
-        "subscribe_update_success": "订阅源更新成功",
+        "subscribe_update_failed": "訂閱來源更新失敗",
+        "subscribe_update_success": "訂閱來源更新成功",
         "subscribe_url": "訂閱網址",
         "tavily": {
           "api_key": {
@@ -4736,8 +4856,8 @@
           "title": "Tavily"
         },
         "title": "網路搜尋",
-        "url_invalid": "輸入了無效的URL",
-        "url_required": "需要輸入URL"
+        "url_invalid": "輸入了無效的 URL",
+        "url_required": "需要輸入 URL"
       }
     },
     "topic": {
@@ -4758,27 +4878,27 @@
           "title": "刪除自訂語言"
         },
         "error": {
-          "add": "添加失敗",
-          "delete": "删除失败",
+          "add": "新增失敗",
+          "delete": "刪除失敗",
           "langCode": {
             "builtin": "該語言已內建支援",
-            "empty": "語言代碼為空",
+            "empty": "語言代號為空",
             "exists": "該語言已存在",
-            "invalid": "無效的語言代碼"
+            "invalid": "無效的語言代號"
           },
           "update": "更新失敗",
           "value": {
-            "empty": "語言名不能為空",
-            "too_long": "語言名過長"
+            "empty": "語言名稱不能留空",
+            "too_long": "語言名稱過長"
           }
         },
         "langCode": {
-          "help": "[語言+區域]的格式，[2~3位小寫字母]-[2~3位小寫字母]",
-          "label": "語言代碼",
+          "help": "[語言 + 區域] 的格式，[2~3 位小寫字母]-[2~3 位小寫字母]",
+          "label": "語言代號",
           "placeholder": "zh-tw"
         },
         "success": {
-          "add": "添加成功",
+          "add": "新增成功",
           "delete": "刪除成功",
           "update": "更新成功"
         },
@@ -4788,29 +4908,29 @@
           }
         },
         "value": {
-          "help": "1~32個字元",
-          "label": "语言名称",
+          "help": "1~32 個字元",
+          "label": "語言名稱",
           "placeholder": "繁體中文"
         }
       },
-      "prompt": "翻译提示词",
-      "title": "翻译设置"
+      "prompt": "翻譯提示詞",
+      "title": "翻譯設定"
     },
     "tray": {
-      "onclose": "關閉時最小化到系统匣",
-      "show": "顯示系统匣圖示",
-      "title": "系统匣"
+      "onclose": "關閉時最小化到系統匣",
+      "show": "顯示系統匣圖示",
+      "title": "系統匣"
     },
     "zoom": {
-      "reset": "重置",
+      "reset": "重設",
       "title": "縮放"
     }
   },
   "title": {
-    "apps": "小程序",
-    "code": "Code",
-    "files": "文件",
-    "home": "主頁",
+    "apps": "小程式",
+    "code": "程式碼",
+    "files": "檔案",
+    "home": "首頁",
     "knowledge": "知識庫",
     "launchpad": "啟動台",
     "mcp-servers": "MCP 伺服器",
@@ -4822,20 +4942,20 @@
     "translate": "翻譯"
   },
   "trace": {
-    "backList": "返回清單",
+    "backList": "回到清單",
     "edasSupport": "Powered by Alibaba Cloud EDAS",
     "endTime": "結束時間",
     "inputs": "輸入",
     "label": "呼叫鏈",
     "name": "節點名稱",
-    "noTraceList": "沒有找到Trace資訊",
+    "noTraceList": "沒有找到 Trace 資訊",
     "outputs": "輸出",
-    "parentId": "上級Id",
-    "spanDetail": "Span詳情",
+    "parentId": "上級 Id",
+    "spanDetail": "Span 詳細資訊",
     "spendTime": "消耗時間",
     "startTime": "開始時間",
     "tag": "標籤",
-    "tokenUsage": "Token使用量",
+    "tokenUsage": "Token 使用量",
     "traceWindow": "呼叫鏈視窗"
   },
   "translate": {
@@ -4861,48 +4981,48 @@
       "method": {
         "algo": {
           "label": "演算法",
-          "tip": "使用franc進行語言檢測"
+          "tip": "使用 franc 進行語言偵測"
         },
         "auto": {
           "label": "自動",
-          "tip": "自動選擇合適的檢測方法"
+          "tip": "自動選擇合適的偵測方法"
         },
-        "label": "自動檢測方法",
+        "label": "自動偵測方法",
         "llm": {
-          "tip": "使用快速模型進行語言檢測，消耗少量token。"
+          "tip": "使用快速模型進行語言偵測，消耗少量 token。"
         },
         "placeholder": "選擇自動偵測方法",
-        "tip": "自動檢測輸入語言時使用的方法"
+        "tip": "自動偵測輸入語言時使用的方法"
       }
     },
     "detected": {
-      "language": "自動檢測"
+      "language": "自動偵測"
     },
     "empty": "翻譯內容為空",
     "error": {
-      "chat_qwen_mt": "Qwen MT 模型不可在对话中使用，請轉至翻譯頁面",
+      "chat_qwen_mt": "Qwen MT 模型無法在對話中使用，請前往翻譯頁面",
       "detect": {
-        "qwen_mt": "QwenMT模型不能用於語言檢測",
-        "unknown": "檢測到未知語言",
+        "qwen_mt": "QwenMT 模型不能用於語言偵測",
+        "unknown": "偵測到未知語言",
         "update_setting": "設定失敗"
       },
-      "empty": "翻译结果为空内容",
+      "empty": "翻譯結果為空",
       "failed": "翻譯失敗",
-      "invalid_source": "無效的源語言",
+      "invalid_source": "無效的來源語言",
       "not_configured": "翻譯模型未設定",
       "not_supported": "不支援的語言 {{language}}",
       "unknown": "翻譯過程中遇到未知錯誤"
     },
     "exchange": {
-      "label": "交換源語言與目標語言"
+      "label": "交換來源語言與目標語言"
     },
     "files": {
-      "drag_text": "拖放到此处",
+      "drag_text": "拖曳到此處",
       "error": {
         "check_type": "檢查檔案類型時發生錯誤",
-        "multiple": "不允许上传多个文件",
-        "too_large": "文件過大",
-        "unknown": "读取文件内容失败"
+        "multiple": "不允許上傳多個檔案",
+        "too_large": "檔案過大",
+        "unknown": "讀取檔案內容失敗"
       },
       "reading": "讀取檔案內容中..."
     },
@@ -4912,11 +5032,11 @@
       "delete": "刪除翻譯歷史",
       "empty": "翻譯歷史為空",
       "error": {
-        "delete": "删除失败",
-        "save": "保存翻譯歷史失敗"
+        "delete": "刪除失敗",
+        "save": "儲存翻譯歷史失敗"
       },
       "search": {
-        "placeholder": "搜索翻譯歷史"
+        "placeholder": "搜尋翻譯歷史"
       },
       "title": "翻譯歷史"
     },
@@ -4924,14 +5044,14 @@
       "aborted": "翻譯中止"
     },
     "input": {
-      "placeholder": "可粘貼或拖入文字、文字檔案、圖片（支援OCR）"
+      "placeholder": "可貼上或拖曳文字、文字檔案、圖片（支援 OCR）"
     },
     "language": {
-      "not_pair": "源語言與設定的語言不同",
-      "same": "源語言和目標語言相同"
+      "not_pair": "來源語言與設定的語言不同",
+      "same": "來源語言和目標語言相同"
     },
     "menu": {
-      "description": "對當前輸入框內容進行翻譯"
+      "description": "對目前輸入框內容進行翻譯"
     },
     "not": {
       "found": "未找到翻譯內容"
@@ -4943,10 +5063,10 @@
     "settings": {
       "autoCopy": "翻譯完成後自動複製",
       "bidirectional": "雙向翻譯設定",
-      "bidirectional_tip": "開啟後，僅支援在源語言和目標語言之間進行雙向翻譯",
+      "bidirectional_tip": "開啟後，僅支援在來源語言和目標語言之間進行雙向翻譯",
       "model": "模型設定",
       "model_desc": "翻譯服務使用的模型",
-      "model_placeholder": "选择翻译模型",
+      "model_placeholder": "選擇翻譯模型",
       "no_model_warning": "未選擇翻譯模型",
       "preview": "Markdown 預覽",
       "scroll_sync": "滾動同步設定",
@@ -4974,11 +5094,11 @@
     "later": "稍後",
     "message": "新版本 {{version}} 已準備就緒，是否立即安裝？",
     "noReleaseNotes": "暫無更新日誌",
-    "saveDataError": "保存數據失敗，請重試",
+    "saveDataError": "儲存資料失敗，請重試",
     "title": "更新提示"
   },
   "warning": {
-    "missing_provider": "供應商不存在，已回退到預設供應商 {{provider}}。這可能導致問題。"
+    "missing_provider": "供應商不存在，已改用預設供應商 {{provider}}。這可能導致問題。"
   },
   "words": {
     "knowledgeGraph": "知識圖譜",
diff --git a/src/renderer/src/i18n/translate/de-de.json b/src/renderer/src/i18n/translate/de-de.json
index a27480cef3..ddb8a2f5db 100644
--- a/src/renderer/src/i18n/translate/de-de.json
+++ b/src/renderer/src/i18n/translate/de-de.json
@@ -6,6 +6,9 @@
         "failed": "Agent hinzufügen fehlgeschlagen",
         "invalid_agent": "Ungültiger Agent"
       },
+      "model": {
+        "tooltip": "Derzeit sind für die Agent-Funktion nur Modelle verfügbar, die Anthropic-Endpunkte unterstützen."
+      },
       "title": "Agent hinzufügen",
       "type": {
         "placeholder": "Agent-Typ auswählen"
@@ -28,13 +31,31 @@
       }
     },
     "gitBash": {
+      "autoDetected": "Automatisch ermitteltes Git Bash wird verwendet",
+      "autoDiscoveredHint": "Automatisch erkannt",
+      "clear": {
+        "button": "Benutzerdefinierten Pfad löschen"
+      },
+      "customPath": "Benutzerdefinierter Pfad: {{path}}",
       "error": {
         "description": "Git Bash ist erforderlich, um Agents unter Windows auszuführen. Der Agent kann ohne es nicht funktionieren. Bitte installieren Sie Git für Windows von",
         "recheck": "Überprüfe die Git Bash-Installation erneut",
+        "required": "Git Bash-Pfad ist unter Windows erforderlich",
         "title": "Git Bash erforderlich"
       },
+      "found": {
+        "title": "Git Bash konfiguriert"
+      },
       "notFound": "Git Bash nicht gefunden. Bitte installieren Sie es zuerst.",
-      "success": "Git Bash erfolgreich erkannt!"
+      "pick": {
+        "button": "Git Bash Pfad auswählen",
+        "failed": "Git Bash Pfad konnte nicht gesetzt werden",
+        "invalidPath": "Die ausgewählte Datei ist keine gültige Git Bash ausführbare Datei (bash.exe).",
+        "title": "Git Bash ausführbare Datei auswählen"
+      },
+      "placeholder": "Wählen Sie den Pfad zu bash.exe",
+      "success": "Git Bash erfolgreich erkannt!",
+      "tooltip": "Git Bash ist erforderlich, um Agenten unter Windows auszuführen. Installiere es von git-scm.com, falls es nicht verfügbar ist."
     },
     "input": {
       "placeholder": "Gib hier deine Nachricht ein, senden mit {{key}} – @ Pfad auswählen, / Befehl auswählen"
@@ -399,6 +420,9 @@
     },
     "delete": {
       "content": "Das Löschen des Assistenten löscht alle Themen und Dateien unter diesem Assistenten. Möchten Sie fortfahren?",
+      "error": {
+        "remain_one": "Man darf den letzten Assistenten nicht löschen."
+      },
       "title": "Assistent löschen"
     },
     "edit": {
@@ -455,6 +479,7 @@
         "button": "Importieren",
         "error": {
           "fetch_failed": "Daten von URL abrufen fehlgeschlagen",
+          "file_required": "Bitte wählen Sie zuerst eine Datei aus",
           "invalid_format": "Ungültiges Assistentenformat: Pflichtfelder fehlen",
           "url_required": "Bitte geben Sie eine URL ein"
         },
@@ -468,6 +493,17 @@
         "url_placeholder": "JSON-URL eingeben"
       },
       "manage": {
+        "batch_delete": {
+          "button": "Stapel löschen",
+          "confirm": "Sind Sie sicher, dass Sie die ausgewählten {{count}} Assistenten löschen möchten?"
+        },
+        "batch_export": {
+          "button": "Exportieren"
+        },
+        "mode": {
+          "manage": "Verwalten",
+          "sort": "Sortieren"
+        },
         "title": "Assistenten verwalten"
       },
       "my_agents": "Meine Assistenten",
@@ -515,13 +551,23 @@
       "more": "Assistenteneinstellungen",
       "prompt": "Prompt-Einstellungen",
       "reasoning_effort": {
+        "auto": "Auto",
+        "auto_description": "Denkaufwand flexibel bestimmen",
         "default": "Standard",
+        "default_description": "Vom Standardverhalten des Modells abhängen, ohne Konfiguration.",
         "high": "Tiefes Nachdenken",
+        "high_description": "Ganzheitliches Denken",
         "label": "Gedankenkettenlänge",
         "low": "Spontan",
+        "low_description": "Geringfügige Argumentation",
         "medium": "Überlegt",
+        "medium_description": "Denken auf mittlerem Niveau",
         "minimal": "Minimal",
-        "off": "Aus"
+        "minimal_description": "Minimales Denken",
+        "off": "Aus",
+        "off_description": "Denken deaktivieren",
+        "xhigh": "Extra hoch",
+        "xhigh_description": "Extra hohes Denkvermögen"
       },
       "regular_phrases": {
         "add": "Phrase hinzufügen",
@@ -1001,6 +1047,29 @@
         "yuque": "Nach Yuque exportieren"
       },
       "list": "Themenliste",
+      "manage": {
+        "clear_selection": "Auswahl aufheben",
+        "delete": {
+          "confirm": {
+            "content": "Sind Sie sicher, dass Sie {{count}} ausgewähltes Thema bzw. ausgewählte Themen löschen möchten? Diese Aktion kann nicht rückgängig gemacht werden.",
+            "title": "Themen löschen"
+          },
+          "success": "{{count}} Thema/Themen gelöscht"
+        },
+        "deselect_all": "Alle abwählen",
+        "error": {
+          "at_least_one": "Mindestens ein Thema muss beibehalten werden"
+        },
+        "move": {
+          "button": "Bewegen",
+          "placeholder": "Ziel auswählen",
+          "success": "{{count}} Thema(s) verschoben"
+        },
+        "pinned": "Angepinnte Themen",
+        "selected_count": "{{count}} ausgewählt",
+        "title": "Themen verwalten",
+        "unpinned": "Losgelöste Themen"
+      },
       "move_to": "Verschieben nach",
       "new": "Neues Gespräch starten",
       "pin": "Thema anheften",
@@ -1011,6 +1080,10 @@
         "label": "Themen-Prompt",
         "tips": "Themen-Prompt: Bietet zusätzliche ergänzende Prompts für das aktuelle Thema"
       },
+      "search": {
+        "placeholder": "Themen durchsuchen...",
+        "title": "Suche"
+      },
       "title": "Thema",
       "unpin": "Anheften aufheben"
     },
@@ -1182,6 +1255,7 @@
     "saved": "Gespeichert",
     "search": "Suchen",
     "select": "Auswählen",
+    "select_all": "Alle auswählen",
     "selected": "Ausgewählt",
     "selectedItems": "{{count}} Elemente ausgewählt",
     "selectedMessages": "{{count}} Nachrichten ausgewählt",
@@ -1194,11 +1268,13 @@
       }
     },
     "stop": "Stoppen",
+    "subscribe": "Abonnieren",
     "success": "Erfolgreich",
     "swap": "Tauschen",
     "topics": "Themen",
     "unknown": "Unbekannt",
     "unnamed": "Unbenannt",
+    "unsubscribe": "Abmelden",
     "update_success": "Erfolgreich aktualisiert",
     "upload_files": "Dateien hochladen",
     "warning": "Warnung",
@@ -2125,6 +2201,7 @@
     "collapse": "Einklappen",
     "content_placeholder": "Bitte Notizinhalt eingeben...",
     "copyContent": "Inhalt kopieren",
+    "crossPlatformRestoreWarning": "Plattformübergreifende Konfiguration wiederhergestellt, aber das Notizenverzeichnis ist leer. Bitte kopieren Sie Ihre Notizdateien nach: {{path}}",
     "delete": "Löschen",
     "delete_confirm": "Möchten Sie diesen {{type}} wirklich löschen?",
     "delete_folder_confirm": "Möchten Sie Ordner \"{{name}}\" und alle seine Inhalte wirklich löschen?",
@@ -2226,11 +2303,11 @@
     "untitled_note": "Unbenannte Notiz",
     "upload": "[to be translated]:Upload",
     "upload_failed": "Notizen-Upload fehlgeschlagen",
-    "upload_files": "[to be translated]:Upload Files",
-    "upload_folder": "[to be translated]:Upload Folder",
+    "upload_files": "Dateien hochladen",
+    "upload_folder": "Ordner hochladen",
     "upload_success": "Notizen erfolgreich hochgeladen",
     "uploading": "[to be translated]:Uploading",
-    "uploading_files": "[to be translated]:Uploading {{count}} files..."
+    "uploading_files": "Lade {{count}} Dateien hoch..."
   },
   "notification": {
     "assistant": "Assistenten-Antwort",
@@ -2521,7 +2598,8 @@
   },
   "preview": {
     "copy": {
-      "image": "Als Bild kopieren"
+      "image": "Als Bild kopieren",
+      "src": "Bildquelle kopieren"
     },
     "dialog": "Vorschaufenster öffnen",
     "label": "Vorschau",
@@ -2575,6 +2653,7 @@
     "lanyun": "Lanyun Technologie",
     "lmstudio": "LM Studio",
     "longcat": "Meißner Riesenhamster",
+    "mimo": "Xiaomi MiMo",
     "minimax": "MiniMax",
     "mistral": "Mistral",
     "modelscope": "ModelScope",
@@ -3093,6 +3172,7 @@
         "label": "Anwendungsdaten",
         "migration_title": "Datenmigration",
         "new_path": "Neuer Pfad",
+        "open": "Offenes Verzeichnis",
         "original_path": "Ursprünglicher Pfad",
         "path_change_failed": "Datenverzeichnisänderung fehlgeschlagen",
         "path_changed_without_copy": "Pfad erfolgreich geändert",
@@ -3163,24 +3243,43 @@
         },
         "content": "Exportieren Sie einige Daten, einschließlich Chat-Protokollen und Einstellungen. Bitte beachten Sie, dass der Sicherungsvorgang einige Zeit in Anspruch nehmen kann. Vielen Dank für Ihre Geduld.",
         "lan": {
-          "auto_close_tip": "Automatisches Schließen in {{seconds}} Sekunden...",
-          "confirm_close_message": "Dateiübertragung läuft. Beim Schließen wird die Übertragung unterbrochen. Möchten Sie wirklich das Schließen erzwingen?",
-          "confirm_close_title": "Schließen bestätigen",
           "connected": "Verbunden",
           "connection_failed": "Verbindung fehlgeschlagen",
           "content": "Bitte stelle sicher, dass sich dein Computer und dein Telefon im selben Netzwerk befinden, um eine LAN-Übertragung durchzuführen. Öffne die Cherry Studio App, um diesen QR-Code zu scannen.",
+          "device_list_title": "Lokale Netzwerkgeräte",
+          "discovered_devices": "Entdeckte Geräte",
           "error": {
+            "file_too_large": "Datei zu groß, maximal 500 MB unterstützt",
             "init_failed": "Initialisierung fehlgeschlagen",
+            "invalid_file_type": "Nur ZIP-Dateien werden unterstützt",
             "no_file": "Keine Datei ausgewählt",
             "no_ip": "IP-Adresse kann nicht abgerufen werden",
+            "not_connected": "Bitte vervollständigen Sie zuerst das Handshake.",
             "send_failed": "Fehler beim Senden der Datei"
           },
-          "force_close": "Erzwungenes Schließen",
-          "generating_qr": "QR-Code wird generiert...",
-          "noZipSelected": "Keine komprimierte Datei ausgewählt",
-          "scan_qr": "Bitte scannen Sie den QR-Code mit Ihrem Telefon.",
-          "selectZip": "Wählen Sie eine komprimierte Datei",
-          "sendZip": "Datenwiederherstellung beginnen",
+          "file_transfer": {
+            "cancelled": "Überweisung storniert",
+            "failed": "Dateiübertragung fehlgeschlagen: {{message}}",
+            "progress": "Senden... {{progress}}%",
+            "success": "Datei erfolgreich gesendet"
+          },
+          "handshake": {
+            "button": "Handshake",
+            "failed": "Handshake fehlgeschlagen: {{message}}",
+            "in_progress": "Handshake läuft...",
+            "success": "Handshake mit {{device}} abgeschlossen",
+            "test_message_received": "Pong von {{device}} empfangen",
+            "test_message_sent": "Hallo-Welt-Test-Payload gesendet"
+          },
+          "idle_hint": "Scanvorgang pausiert. Starten Sie das Scannen, um Cherry-Studio-Peers in Ihrem LAN zu finden.",
+          "ip_addresses": "IP-Adressen",
+          "last_seen": "Zuletzt gesehen um {{time}}",
+          "metadata": "Metadaten",
+          "no_connection_warning": "Bitte öffne LAN-Transfer in der Cherry Studio Mobile-App.",
+          "no_devices": "Noch keine LAN-Peers gefunden",
+          "scan_devices": "Geräte scannen",
+          "scanning_hint": "Scanne dein lokales Netzwerk nach Cherry-Studio-Peers …",
+          "send_file": "Datei senden",
           "status": {
             "completed": "Übertragung abgeschlossen",
             "connected": "Verbunden",
@@ -3189,9 +3288,11 @@
             "error": "Verbindungsfehler",
             "initializing": "Verbindung wird initialisiert...",
             "preparing": "Übertragung wird vorbereitet...",
-            "sending": "Übertrage {{progress}}%",
-            "waiting_qr_scan": "Bitte QR-Code scannen, um zu verbinden"
+            "sending": "Übertrage {{progress}}%"
           },
+          "status_badge_idle": "Leerlauf",
+          "status_badge_scanning": "Scannen",
+          "stop_scan": "Scanvorgang stoppen",
           "title": "LAN-Übertragung",
           "transfer_progress": "Übertragungsfortschritt"
         },
@@ -3863,6 +3964,7 @@
       "builtinServers": "Integrierter Server",
       "builtinServersDescriptions": {
         "brave_search": "MCP-Server-Implementierung mit Brave-Search-API, die sowohl Web- als auch lokale Suchfunktionen bietet. BRAVE_API_KEY-Umgebungsvariable muss konfiguriert werden",
+        "browser": "Steuert ein headless Electron-Fenster über das Chrome DevTools Protocol. Tools: URL öffnen, einzeiligen JS ausführen, Sitzung zurücksetzen.",
         "didi_mcp": "An integrated Didi MCP server implementation that provides ride-hailing services including map search, price estimation, order management, and driver tracking. Only available in mainland China. Requires the DIDI_API_KEY environment variable to be configured.",
         "dify_knowledge": "MCP-Server-Implementierung von Dify, die einen einfachen API-Zugriff auf Dify bietet. Dify Key muss konfiguriert werden",
         "fetch": "MCP-Server zum Abrufen von Webseiteninhalten",
@@ -3870,6 +3972,7 @@
         "mcp_auto_install": "MCP-Service automatisch installieren (Beta-Version)",
         "memory": "MCP-Server mit persistenter Erinnerungsbasis auf lokalem Wissensgraphen, der Informationen über verschiedene Dialoge hinweg speichert. MEMORY_FILE_PATH-Umgebungsvariable muss konfiguriert werden",
         "no": "Keine Beschreibung",
+        "nowledge_mem": "Erfordert lokal laufende Nowledge Mem App. Speichert KI-Chats, Tools, Notizen, Agenten und Dateien in einem privaten Speicher auf Ihrem Computer. Download unter https://mem.nowledge.co/",
         "python": "Python-Code in einem sicheren Sandbox-Umgebung ausführen. Verwendung von Pyodide für Python, Unterstützung für die meisten Standardbibliotheken und wissenschaftliche Pakete",
         "sequentialthinking": "MCP-Server-Implementierung mit strukturiertem Denkprozess, der dynamische und reflektierende Problemlösungen ermöglicht"
       },
@@ -3915,6 +4018,7 @@
       "jsonSaveError": "JSON-Konfiguration speichern fehlgeschlagen",
       "jsonSaveSuccess": "JSON-Konfiguration erfolgreich gespeichert",
       "logoUrl": "Logo-URL",
+      "logs": "Protokolle",
       "longRunning": "Lang laufender Modus",
       "longRunningTooltip": "Nach Aktivierung unterstützt der Server lange Aufgaben. Wenn ein Fortschrittsbenachrichtigung empfangen wird, wird der Timeout-Timer zurückgesetzt und die maximale Timeout-Zeit auf 10 Minuten verlängert",
       "marketplaces": "Marktplätze",
@@ -3934,6 +4038,7 @@
       "name": "Name",
       "newServer": "MCP-Server",
       "noDescriptionAvailable": "Keine Beschreibung",
+      "noLogs": "Noch keine Protokolle",
       "noServers": "Server nicht konfiguriert",
       "not_support": "Modell nicht unterstützt",
       "npx_list": {
@@ -4028,7 +4133,7 @@
       "tagsPlaceholder": "Tag eingeben",
       "timeout": "Timeout",
       "timeoutTooltip": "Timeout für Anfragen an den Server in Sekunden. Standardmäßig 60 Sekunden.",
-      "title": "MCP",
+      "title": "MCP-Server",
       "tools": {
         "autoApprove": {
           "label": "Automatische Genehmigung",
@@ -4662,6 +4767,12 @@
       },
       "title": "Weitere Einstellungen",
       "websearch": {
+        "api_key_required": {
+          "content": "{{provider}} erfordert einen API-Schlüssel, um zu funktionieren. Möchten Sie ihn jetzt konfigurieren?",
+          "ok": "Konfigurieren",
+          "title": "API-Schlüssel erforderlich"
+        },
+        "api_providers": "API-Anbieter",
         "apikey": "API-Schlüssel",
         "blacklist": "Schwarze Liste",
         "blacklist_description": "Folgende Websites werden nicht in Suchergebnissen angezeigt",
@@ -4703,7 +4814,15 @@
         },
         "content_limit": "Inhaltslängenbegrenzung",
         "content_limit_tooltip": "Begrenzen Sie die Länge der Suchergebnisse, überschreitende Inhalte werden abgeschnitten",
+        "default_provider": "Standardanbieter",
         "free": "Kostenlos",
+        "is_default": "Standard",
+        "local_provider": {
+          "hint": "Melden Sie sich auf der Website an, um bessere Suchergebnisse zu erhalten und Ihre Sucheinstellungen zu personalisieren.",
+          "open_settings": "{{provider}}-Einstellungen öffnen",
+          "settings": "Lokale Sucheinstellungen"
+        },
+        "local_providers": "Lokale Anbieter",
         "no_provider_selected": "Wählen Sie einen Suchanbieter aus, bevor Sie suchen",
         "overwrite": "Suchanbieter statt LLM für Suche erzwingen",
         "overwrite_tooltip": "Suchanbieter statt LLM für Suche erzwingen",
@@ -4714,6 +4833,7 @@
         "search_provider": "Suchanbieter",
         "search_provider_placeholder": "Einen Suchanbieter auswählen",
         "search_with_time": "Suche mit Datum",
+        "set_as_default": "Als Standard festlegen",
         "subscribe": "Schwarze Liste-Abonnement",
         "subscribe_add": "Abonnement hinzufügen",
         "subscribe_add_failed": "Abonnement-Quelle hinzufügen fehlgeschlagen",
diff --git a/src/renderer/src/i18n/translate/el-gr.json b/src/renderer/src/i18n/translate/el-gr.json
index 45003dfad4..1c845ec46a 100644
--- a/src/renderer/src/i18n/translate/el-gr.json
+++ b/src/renderer/src/i18n/translate/el-gr.json
@@ -6,6 +6,9 @@
         "failed": "Αποτυχία προσθήκης πράκτορα",
         "invalid_agent": "Μη έγκυρος Agent"
       },
+      "model": {
+        "tooltip": "Προς το παρόν, μόνο μοντέλα που υποστηρίζουν τελικά σημεία Anthropic είναι διαθέσιμα για τη λειτουργία Agent."
+      },
       "title": "Προσθήκη Agent",
       "type": {
         "placeholder": "Επιλέξτε τύπο Agent"
@@ -28,13 +31,31 @@
       }
     },
     "gitBash": {
+      "autoDetected": "Χρησιμοποιείται αυτόματα εντοπισμένο Git Bash",
+      "autoDiscoveredHint": "Αυτόματα ανακαλυφθέντα",
+      "clear": {
+        "button": "Διαγραφή προσαρμοσμένης διαδρομής"
+      },
+      "customPath": "Χρησιμοποιείται προσαρμοσμένη διαδρομή: {{path}}",
       "error": {
         "description": "Το Git Bash απαιτείται για την εκτέλεση πρακτόρων στα Windows. Ο πράκτορας δεν μπορεί να λειτουργήσει χωρίς αυτό. Παρακαλούμε εγκαταστήστε το Git για Windows από",
         "recheck": "Επανέλεγχος Εγκατάστασης του Git Bash",
+        "required": "Απαιτείται διαδρομή του Git Bash στα Windows",
         "title": "Απαιτείται Git Bash"
       },
+      "found": {
+        "title": "Το Git Bash διαμορφώθηκε"
+      },
       "notFound": "Το Git Bash δεν βρέθηκε. Παρακαλώ εγκαταστήστε το πρώτα.",
-      "success": "Το Git Bash εντοπίστηκε με επιτυχία!"
+      "pick": {
+        "button": "Επιλογή διαδρομής Git Bash",
+        "failed": "Αποτυχία ορισμού διαδρομής Git Bash",
+        "invalidPath": "Το επιλεγμένο αρχείο δεν είναι έγκυρο εκτελέσιμο Git Bash (bash.exe).",
+        "title": "Επιλογή εκτελέσιμου Git Bash"
+      },
+      "placeholder": "Επιλέξτε τη διαδρομή του bash.exe",
+      "success": "Το Git Bash εντοπίστηκε με επιτυχία!",
+      "tooltip": "Το Git Bash απαιτείται για την εκτέλεση πρακτόρων στα Windows. Εγκαταστήστε το από το git-scm.com εάν δεν είναι διαθέσιμο."
     },
     "input": {
       "placeholder": "Εισάγετε το μήνυμά σας εδώ, στείλτε με {{key}} - @ επιλέξτε διαδρομή, / επιλέξτε εντολή"
@@ -399,6 +420,9 @@
     },
     "delete": {
       "content": "Η διαγραφή του βοηθού θα διαγράψει όλα τα θέματα και τα αρχεία που είναι συνδεδεμένα με αυτόν. Είστε σίγουροι πως θέλετε να συνεχίσετε;",
+      "error": {
+        "remain_one": "Δεν επιτρέπεται η διαγραφή του τελευταίου βοηθού"
+      },
       "title": "Διαγραφή βοηθού"
     },
     "edit": {
@@ -455,6 +479,7 @@
         "button": "Εισαγωγή",
         "error": {
           "fetch_failed": "Αποτυχία λήψης δεδομένων από το URL",
+          "file_required": "Παρακαλώ επιλέξτε πρώτα ένα αρχείο",
           "invalid_format": "Μη έγκυρη μορφή βοηθού: λείπουν υποχρεωτικά πεδία",
           "url_required": "Παρακαλώ εισάγετε ένα URL"
         },
@@ -468,6 +493,17 @@
         "url_placeholder": "Εισάγετε JSON URL"
       },
       "manage": {
+        "batch_delete": {
+          "button": "Μαζική Διαγραφή",
+          "confirm": "Είστε βέβαιοι ότι θέλετε να διαγράψετε τους επιλεγμένους {{count}} βοηθούς;"
+        },
+        "batch_export": {
+          "button": "Εξαγωγή"
+        },
+        "mode": {
+          "manage": "Διαχειριστείτε",
+          "sort": "Ταξινόμηση"
+        },
         "title": "Διαχείριση βοηθών"
       },
       "my_agents": "Οι βοηθοί μου",
@@ -515,13 +551,23 @@
       "more": "Ρυθμίσεις Βοηθού",
       "prompt": "Ρυθμίσεις προκαλύμματος",
       "reasoning_effort": {
+        "auto": "Αυτοκίνητο",
+        "auto_description": "Ευέλικτος καθορισμός της προσπάθειας συλλογισμού",
         "default": "Προεπιλογή",
+        "default_description": "Εξαρτηθείτε από την προεπιλεγμένη συμπεριφορά του μοντέλου, χωρίς καμία διαμόρφωση.",
         "high": "Μεγάλο",
+        "high_description": "Υψηλού επιπέδου συλλογισμός",
         "label": "Μήκος λογισμικού αλυσίδας",
         "low": "Μικρό",
+        "low_description": "Χαμηλού επιπέδου συλλογιστική",
         "medium": "Μεσαίο",
+        "medium_description": "Αιτιολόγηση μεσαίου επιπέδου",
         "minimal": "ελάχιστος",
-        "off": "Απενεργοποίηση"
+        "minimal_description": "Ελάχιστος συλλογισμός",
+        "off": "Απενεργοποίηση",
+        "off_description": "Απενεργοποίηση λογικής",
+        "xhigh": "Εξαιρετικά Υψηλή",
+        "xhigh_description": "Εξαιρετικά υψηλού επιπέδου συλλογισμός"
       },
       "regular_phrases": {
         "add": "Προσθήκη φράσης",
@@ -1001,6 +1047,29 @@
         "yuque": "Εξαγωγή στο Yuque"
       },
       "list": "Λίστα θεμάτων",
+      "manage": {
+        "clear_selection": "Καθαρισμός Επιλογής",
+        "delete": {
+          "confirm": {
+            "content": "Είσαι βέβαιος ότι θέλεις να διαγράψεις {{count}} επιλεγμένο(α) θέμα(τα); Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.",
+            "title": "Διαγραφή Θεμάτων"
+          },
+          "success": "Διαγράφηκαν {{count}} θέμα(τα)"
+        },
+        "deselect_all": "Αποεπιλογή όλων",
+        "error": {
+          "at_least_one": "Τουλάχιστον ένα θέμα πρέπει να διατηρηθεί"
+        },
+        "move": {
+          "button": "Μετακίνηση",
+          "placeholder": "Επιλέξτε στόχο",
+          "success": "Μετακινήθηκαν {{count}} θέματα"
+        },
+        "pinned": "Καρφιτσωμένα Θέματα",
+        "selected_count": "{{count}} επιλεγμένα",
+        "title": "Διαχείριση Θεμάτων",
+        "unpinned": "Ξεκαρφωμένα Θέματα"
+      },
       "move_to": "Μετακίνηση στο",
       "new": "Ξεκινήστε νέα συζήτηση",
       "pin": "Σταθερά θέματα",
@@ -1011,6 +1080,10 @@
         "label": "Προσδοκώμενα όρια",
         "tips": "Προσδοκώμενα όρια: προσθέτει επιπλέον επιστημονικές προσθήκες για το παρόν θέμα"
       },
+      "search": {
+        "placeholder": "Αναζήτηση θεμάτων...",
+        "title": "Αναζήτηση"
+      },
       "title": "Θέματα",
       "unpin": "Ξεκαρφίτσωμα"
     },
@@ -1182,6 +1255,7 @@
     "saved": "Αποθηκεύτηκε",
     "search": "Αναζήτηση",
     "select": "Επιλογή",
+    "select_all": "Επιλογή Όλων",
     "selected": "Επιλεγμένο",
     "selectedItems": "Επιλέχθηκαν {{count}} αντικείμενα",
     "selectedMessages": "Επιλέχθηκαν {{count}} μηνύματα",
@@ -1194,11 +1268,13 @@
       }
     },
     "stop": "σταματήστε",
+    "subscribe": "Εγγραφείτε",
     "success": "Επιτυχία",
     "swap": "Εναλλαγή",
     "topics": "Θέματα",
     "unknown": "Άγνωστο",
     "unnamed": "Χωρίς όνομα",
+    "unsubscribe": "Απεγγραφή",
     "update_success": "Επιτυχής ενημέρωση",
     "upload_files": "Ανέβασμα αρχείου",
     "warning": "Προσοχή",
@@ -2125,6 +2201,7 @@
     "collapse": "σύμπτυξη",
     "content_placeholder": "Παρακαλώ εισαγάγετε το περιεχόμενο των σημειώσεων...",
     "copyContent": "αντιγραφή περιεχομένου",
+    "crossPlatformRestoreWarning": "Η διαμόρφωση πολλαπλών πλατφορμών έχει επαναφερθεί, αλλά ο κατάλογος σημειώσεων είναι κενός. Παρακαλώ αντιγράψτε τα αρχεία σημειώσεών σας στο: {{path}}",
     "delete": "διαγραφή",
     "delete_confirm": "Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το {{type}};",
     "delete_folder_confirm": "Θέλετε να διαγράψετε τον φάκελο «{{name}}» και όλο το περιεχόμενό του;",
@@ -2226,11 +2303,11 @@
     "untitled_note": "σημείωση χωρίς τίτλο",
     "upload": "[to be translated]:Upload",
     "upload_failed": "Η σημείωση δεν ανέβηκε",
-    "upload_files": "[to be translated]:Upload Files",
-    "upload_folder": "[to be translated]:Upload Folder",
+    "upload_files": "Ανέβασμα Αρχείων",
+    "upload_folder": "Ανέβασμα Φακέλου",
     "upload_success": "Οι σημειώσεις μεταφορτώθηκαν με επιτυχία",
     "uploading": "[to be translated]:Uploading",
-    "uploading_files": "[to be translated]:Uploading {{count}} files..."
+    "uploading_files": "Ανεβάζονται {{count}} αρχεία..."
   },
   "notification": {
     "assistant": "Απάντηση Βοηθού",
@@ -2521,7 +2598,8 @@
   },
   "preview": {
     "copy": {
-      "image": "Αντιγραφή ως εικόνα"
+      "image": "Αντιγραφή ως εικόνα",
+      "src": "Αντιγραφή πηγής εικόνας"
     },
     "dialog": "Άνοιγμα παραθύρου προεπισκόπησης",
     "label": "Προεπισκόπηση",
@@ -2575,6 +2653,7 @@
     "lanyun": "Λανιούν Τεχνολογία",
     "lmstudio": "LM Studio",
     "longcat": "Τσίρο",
+    "mimo": "Xiaomi MiMo",
     "minimax": "MiniMax",
     "mistral": "Mistral",
     "modelscope": "ModelScope Magpie",
@@ -3093,6 +3172,7 @@
         "label": "Δεδομένα εφαρμογής",
         "migration_title": "Μεταφορά δεδομένων",
         "new_path": "Νέα διαδρομή",
+        "open": "Ανοιχτός Κατάλογος",
         "original_path": "Αρχική διαδρομή",
         "path_change_failed": "Η αλλαγή του καταλόγου δεδομένων απέτυχε",
         "path_changed_without_copy": "Η διαδρομή άλλαξε επιτυχώς",
@@ -3163,24 +3243,43 @@
         },
         "content": "Εξαγωγή μέρους των δεδομένων, συμπεριλαμβανομένων των ιστορικών συνομιλιών και των ρυθμίσεων. Σημειώστε ότι η διαδικασία δημιουργίας αντιγράφων ασφαλείας ενδέχεται να διαρκέσει κάποιο χρονικό διάστημα, ευχαριστούμε για την υπομονή σας.",
         "lan": {
-          "auto_close_tip": "Αυτόματο κλείσιμο σε {{seconds}} δευτερόλεπτα...",
-          "confirm_close_message": "Η μεταφορά αρχείων είναι σε εξέλιξη. Το κλείσιμο θα διακόψει τη μεταφορά. Είστε σίγουροι ότι θέλετε να κλείσετε βίαια;",
-          "confirm_close_title": "Επιβεβαίωση Κλεισίματος",
           "connected": "Συνδεδεμένος",
           "connection_failed": "Η σύνδεση απέτυχε",
           "content": "Βεβαιωθείτε ότι ο υπολογιστής και το κινητό βρίσκονται στο ίδιο δίκτυο για να χρησιμοποιήσετε τη μεταφορά LAN. Ανοίξτε την εφαρμογή Cherry Studio και σαρώστε αυτόν τον κωδικό QR.",
+          "device_list_title": "Τοπικές συσκευές δικτύου",
+          "discovered_devices": "Ανακαλυφθείσες συσκευές",
           "error": {
+            "file_too_large": "Το αρχείο είναι πολύ μεγάλο, υποστηρίζεται μέγιστο μέγεθος 500 MB",
             "init_failed": "Η αρχικοποίηση απέτυχε",
+            "invalid_file_type": "Μόνο αρχεία ZIP υποστηρίζονται",
             "no_file": "Κανένα αρχείο δεν επιλέχθηκε",
             "no_ip": "Αδυναμία λήψης διεύθυνσης IP",
+            "not_connected": "Παρακαλώ ολοκληρώστε πρώτα τη χειραψία",
             "send_failed": "Αποτυχία αποστολής αρχείου"
           },
-          "force_close": "Κλείσιμο με βία",
-          "generating_qr": "Δημιουργία κώδικα QR...",
-          "noZipSelected": "Δεν επιλέχθηκε συμπιεσμένο αρχείο",
-          "scan_qr": "Παρακαλώ σαρώστε τον κωδικό QR με το τηλέφωνό σας",
-          "selectZip": "Επιλέξτε συμπιεσμένο αρχείο",
-          "sendZip": "Έναρξη ανάκτησης δεδομένων",
+          "file_transfer": {
+            "cancelled": "Η μεταφορά ακυρώθηκε",
+            "failed": "Η μεταφορά αρχείου απέτυχε: {{message}}",
+            "progress": "Αποστολή... {{progress}}%",
+            "success": "Το αρχείο εστάλη με επιτυχία"
+          },
+          "handshake": {
+            "button": "Χειραψία",
+            "failed": "Η χειραψία απέτυχε: {{message}}",
+            "in_progress": "Χειραψία...",
+            "success": "Η χειραψία ολοκληρώθηκε με τη συσκευή {{device}}",
+            "test_message_received": "Λήφθηκε pong από {{device}}",
+            "test_message_sent": "Στάλθηκε δοκιμαστικό φορτίο hello world"
+          },
+          "idle_hint": "Η σάρωση διακόπηκε. Ξεκινήστε τη σάρωση για να βρείτε ομότιμους του Cherry Studio στο τοπικό σας δίκτυο.",
+          "ip_addresses": "Διευθύνσεις IP",
+          "last_seen": "Τελευταία φορά εθεάθηκε στις {{time}}",
+          "metadata": "Μεταδεδομένα",
+          "no_connection_warning": "Παρακαλώ ανοίξτε τη μεταφορά LAN στο Cherry Studio mobile",
+          "no_devices": "Δεν βρέθηκαν ακόμα συσκευές LAN",
+          "scan_devices": "Σάρωση συσκευών",
+          "scanning_hint": "Σάρωση του τοπικού σας δικτύου για ομότιμους του Cherry Studio...",
+          "send_file": "Αποστολή Αρχείου",
           "status": {
             "completed": "Η μεταφορά ολοκληρώθηκε",
             "connected": "Συνδεδεμένος",
@@ -3189,9 +3288,11 @@
             "error": "Σφάλμα σύνδεσης",
             "initializing": "Αρχικοποίηση σύνδεσης...",
             "preparing": "Προετοιμασία μεταφοράς...",
-            "sending": "Μεταφορά {{progress}}%",
-            "waiting_qr_scan": "Παρακαλώ σαρώστε τον κωδικό QR για σύνδεση"
+            "sending": "Μεταφορά {{progress}}%"
           },
+          "status_badge_idle": "Αδρανής",
+          "status_badge_scanning": "Σάρωση",
+          "stop_scan": "Διακοπή σάρωσης",
           "title": "Μεταφορά τοπικού δικτύου",
           "transfer_progress": "Πρόοδος μεταφοράς"
         },
@@ -3863,6 +3964,7 @@
       "builtinServers": "Ενσωματωμένοι Διακομιστές",
       "builtinServersDescriptions": {
         "brave_search": "μια εφαρμογή διακομιστή MCP που ενσωματώνει το Brave Search API, παρέχοντας δυνατότητες αναζήτησης στον ιστό και τοπικής αναζήτησης. Απαιτείται η ρύθμιση της μεταβλητής περιβάλλοντος BRAVE_API_KEY",
+        "browser": "Ελέγχει ένα headless παράθυρο Electron μέσω του Chrome DevTools Protocol. Εργαλεία: άνοιγμα URL, εκτέλεση JS μίας γραμμής, επαναφορά συνεδρίας.",
         "didi_mcp": "Διακομιστής DiDi MCP που παρέχει υπηρεσίες μεταφοράς συμπεριλαμβανομένης της αναζήτησης χαρτών, εκτίμησης τιμών, διαχείρισης παραγγελιών και παρακολούθησης οδηγών. Διαθέσιμο μόνο στην ηπειρωτική Κίνα. Απαιτεί διαμόρφωση της μεταβλητής περιβάλλοντος DIDI_API_KEY",
         "dify_knowledge": "Η υλοποίηση του Dify για τον διακομιστή MCP, παρέχει μια απλή API για να αλληλεπιδρά με το Dify. Απαιτείται η ρύθμιση του κλειδιού Dify",
         "fetch": "Εξυπηρετητής MCP για λήψη περιεχομένου ιστοσελίδας URL",
@@ -3870,6 +3972,7 @@
         "mcp_auto_install": "Αυτόματη εγκατάσταση υπηρεσίας MCP (προβολή)",
         "memory": "Βασική υλοποίηση μόνιμης μνήμης με βάση τοπικό γράφημα γνώσης. Αυτό επιτρέπει στο μοντέλο να θυμάται πληροφορίες σχετικές με τον χρήστη ανάμεσα σε διαφορετικές συνομιλίες. Απαιτείται η ρύθμιση της μεταβλητής περιβάλλοντος MEMORY_FILE_PATH.",
         "no": "Χωρίς περιγραφή",
+        "nowledge_mem": "Απαιτεί την εφαρμογή Nowledge Mem να εκτελείται τοπικά. Διατηρεί συνομιλίες με AI, εργαλεία, σημειώσεις, πράκτορες και αρχεία σε ιδιωτική μνήμη στον υπολογιστή σας. Κάντε λήψη από https://mem.nowledge.co/",
         "python": "Εκτελέστε κώδικα Python σε ένα ασφαλές περιβάλλον sandbox. Χρησιμοποιήστε το Pyodide για να εκτελέσετε Python, υποστηρίζοντας την πλειονότητα των βιβλιοθηκών της τυπικής βιβλιοθήκης και των πακέτων επιστημονικού υπολογισμού",
         "sequentialthinking": "ένας εξυπηρετητής MCP που υλοποιείται, παρέχοντας εργαλεία για δυναμική και αναστοχαστική επίλυση προβλημάτων μέσω δομημένων διαδικασιών σκέψης"
       },
@@ -3915,6 +4018,7 @@
       "jsonSaveError": "Αποτυχία αποθήκευσης της διαμορφωτικής ρύθμισης JSON",
       "jsonSaveSuccess": "Η διαμορφωτική ρύθμιση JSON αποθηκεύτηκε επιτυχώς",
       "logoUrl": "URL Λογότυπου",
+      "logs": "Αρχεία καταγραφής",
       "longRunning": "Μακροχρόνια λειτουργία",
       "longRunningTooltip": "Όταν ενεργοποιηθεί, ο διακομιστής υποστηρίζει μακροχρόνιες εργασίες, επαναφέρει το χρονικό όριο μετά από λήψη ειδοποίησης προόδου και επεκτείνει το μέγιστο χρονικό όριο σε 10 λεπτά.",
       "marketplaces": "Αγορές",
@@ -3934,6 +4038,7 @@
       "name": "Όνομα",
       "newServer": "Διακομιστής MCP",
       "noDescriptionAvailable": "Δεν υπάρχει διαθέσιμη περιγραφή",
+      "noLogs": "Δεν υπάρχουν αρχεία καταγραφής ακόμα",
       "noServers": "Δεν έχουν ρυθμιστεί διακομιστές",
       "not_support": "Το μοντέλο δεν υποστηρίζεται",
       "npx_list": {
@@ -4662,6 +4767,12 @@
       },
       "title": "Ρυθμίσεις Εργαλείων",
       "websearch": {
+        "api_key_required": {
+          "content": "Ο {{provider}} απαιτεί κλειδί API για να λειτουργήσει. Θα θέλατε να το διαμορφώσετε τώρα;",
+          "ok": "Ρυθμίστε",
+          "title": "Απαιτείται κλειδί API"
+        },
+        "api_providers": "Πάροχοι API",
         "apikey": "Κλειδί API",
         "blacklist": "Μαύρη Λίστα",
         "blacklist_description": "Τα αποτελέσματα από τους παρακάτω ιστότοπους δεν θα εμφανίζονται στα αποτελέσματα αναζήτησης",
@@ -4703,7 +4814,15 @@
         },
         "content_limit": "Όριο μήκους περιεχομένου",
         "content_limit_tooltip": "Περιορίζει το μήκος του περιεχομένου των αποτελεσμάτων αναζήτησης, το περιεχόμενο πέραν του ορίου θα περικοπεί",
+        "default_provider": "Προεπιλεγμένος Πάροχος",
         "free": "Δωρεάν",
+        "is_default": "Προεπιλογή",
+        "local_provider": {
+          "hint": "Συνδεθείτε στην ιστοσελίδα για να λάβετε καλύτερα αποτελέσματα αναζήτησης και να εξατομικεύσετε τις ρυθμίσεις αναζήτησής σας.",
+          "open_settings": "Άνοιγμα Ρυθμίσεων {{provider}}",
+          "settings": "Ρυθμίσεις τοπικής αναζήτησης"
+        },
+        "local_providers": "Τοπικοί Πάροχοι",
         "no_provider_selected": "Παρακαλώ επιλέξτε πάροχο αναζήτησης πριν τον έλεγχο",
         "overwrite": "Αντικατάσταση αναζήτησης παρόχου",
         "overwrite_tooltip": "Εξαναγκάζει τη χρήση του παρόχου αναζήτησης αντί για μοντέλο μεγάλης γλώσσας για αναζήτηση",
@@ -4714,6 +4833,7 @@
         "search_provider": "Πάροχος αναζήτησης",
         "search_provider_placeholder": "Επιλέξτε έναν πάροχο αναζήτησης",
         "search_with_time": "Αναζήτηση με ημερομηνία",
+        "set_as_default": "Ορισμός ως προεπιλογή",
         "subscribe": "Εγγραφή σε μαύρη λίστα",
         "subscribe_add": "Προσθήκη εγγραφής",
         "subscribe_add_failed": "Η προσθήκη της ροής συνδρομής απέτυχε",
diff --git a/src/renderer/src/i18n/translate/es-es.json b/src/renderer/src/i18n/translate/es-es.json
index 6e94ce89df..a1f2385097 100644
--- a/src/renderer/src/i18n/translate/es-es.json
+++ b/src/renderer/src/i18n/translate/es-es.json
@@ -6,6 +6,9 @@
         "failed": "Error al añadir agente",
         "invalid_agent": "Agent inválido"
       },
+      "model": {
+        "tooltip": "Actualmente, solo los modelos que admiten puntos finales de Anthropic están disponibles para la función Agente."
+      },
       "title": "Agregar Agente",
       "type": {
         "placeholder": "Seleccionar tipo de Agente"
@@ -28,13 +31,31 @@
       }
     },
     "gitBash": {
+      "autoDetected": "Usando Git Bash detectado automáticamente",
+      "autoDiscoveredHint": "Auto-descubierto",
+      "clear": {
+        "button": "Borrar ruta personalizada"
+      },
+      "customPath": "Usando ruta personalizada: {{path}}",
       "error": {
         "description": "Se requiere Git Bash para ejecutar agentes en Windows. El agente no puede funcionar sin él. Instale Git para Windows desde",
         "recheck": "Volver a verificar la instalación de Git Bash",
+        "required": "Se requiere la ruta de Git Bash en Windows",
         "title": "Git Bash Requerido"
       },
+      "found": {
+        "title": "Git Bash configurado"
+      },
       "notFound": "Git Bash no encontrado. Por favor, instálalo primero.",
-      "success": "¡Git Bash detectado con éxito!"
+      "pick": {
+        "button": "Seleccionar ruta de Git Bash",
+        "failed": "No se pudo configurar la ruta de Git Bash",
+        "invalidPath": "El archivo seleccionado no es un ejecutable válido de Git Bash (bash.exe).",
+        "title": "Seleccionar ejecutable de Git Bash"
+      },
+      "placeholder": "Seleccionar la ruta de bash.exe",
+      "success": "¡Git Bash detectado con éxito!",
+      "tooltip": "Se requiere Git Bash para ejecutar agentes en Windows. Instálalo desde git-scm.com si no está disponible."
     },
     "input": {
       "placeholder": "Introduce tu mensaje aquí, envía con {{key}} - @ seleccionar ruta, / seleccionar comando"
@@ -399,6 +420,9 @@
     },
     "delete": {
       "content": "Eliminar el asistente borrará todos los temas y archivos asociados. ¿Está seguro de que desea continuar?",
+      "error": {
+        "remain_one": "No se puede eliminar el último asistente"
+      },
       "title": "Eliminar Asistente"
     },
     "edit": {
@@ -455,6 +479,7 @@
         "button": "Importar",
         "error": {
           "fetch_failed": "Error al obtener datos desde la URL",
+          "file_required": "Por favor, selecciona primero un archivo",
           "invalid_format": "Formato de asistente inválido: faltan campos obligatorios",
           "url_required": "Por favor introduce una URL"
         },
@@ -468,6 +493,17 @@
         "url_placeholder": "Introducir URL JSON"
       },
       "manage": {
+        "batch_delete": {
+          "button": "Eliminación por lotes",
+          "confirm": "¿Estás seguro de que quieres eliminar los {{count}} asistentes seleccionados?"
+        },
+        "batch_export": {
+          "button": "Exportar"
+        },
+        "mode": {
+          "manage": "Gestionar",
+          "sort": "Ordenar"
+        },
         "title": "Gestionar asistentes"
       },
       "my_agents": "Mis asistentes",
@@ -515,13 +551,23 @@
       "more": "Configuración del Asistente",
       "prompt": "Configuración de Palabras Clave",
       "reasoning_effort": {
+        "auto": "Automóvil",
+        "auto_description": "Determinar flexiblemente el esfuerzo de razonamiento",
         "default": "Por defecto",
+        "default_description": "Depender del comportamiento predeterminado del modelo, sin ninguna configuración.",
         "high": "Largo",
+        "high_description": "Razonamiento de alto nivel",
         "label": "Longitud de Cadena de Razonamiento",
         "low": "Corto",
+        "low_description": "Razonamiento de bajo nivel",
         "medium": "Medio",
+        "medium_description": "Razonamiento de nivel medio",
         "minimal": "minimal",
-        "off": "Apagado"
+        "minimal_description": "Razonamiento mínimo",
+        "off": "Apagado",
+        "off_description": "Deshabilitar razonamiento",
+        "xhigh": "Extra Alta",
+        "xhigh_description": "Razonamiento de extra alto nivel"
       },
       "regular_phrases": {
         "add": "Agregar frase",
@@ -1001,6 +1047,29 @@
         "yuque": "Exportar a Yuque"
       },
       "list": "Lista de temas",
+      "manage": {
+        "clear_selection": "Borrar selección",
+        "delete": {
+          "confirm": {
+            "content": "¿Estás seguro de que quieres eliminar {{count}} tema(s) seleccionado(s)? Esta acción no se puede deshacer.",
+            "title": "Eliminar Temas"
+          },
+          "success": "Eliminado(s) {{count}} tema(s)"
+        },
+        "deselect_all": "Deseleccionar todo",
+        "error": {
+          "at_least_one": "Al menos se debe mantener un tema."
+        },
+        "move": {
+          "button": "Mover",
+          "placeholder": "Seleccionar asistente de destino",
+          "success": "Movido(s) {{count}} tema(s)"
+        },
+        "pinned": "Temas Fijados",
+        "selected_count": "{{count}} seleccionado",
+        "title": "Administrar Temas",
+        "unpinned": "Temas no fijados"
+      },
       "move_to": "Mover a",
       "new": "Iniciar nueva conversación",
       "pin": "Fijar tema",
@@ -1011,6 +1080,10 @@
         "label": "Palabras clave del tema",
         "tips": "Palabras clave del tema: proporcionar indicaciones adicionales para el tema actual"
       },
+      "search": {
+        "placeholder": "Buscar temas...",
+        "title": "Buscar"
+      },
       "title": "Tema",
       "unpin": "Quitar fijación"
     },
@@ -1182,6 +1255,7 @@
     "saved": "Guardado",
     "search": "Buscar",
     "select": "Seleccionar",
+    "select_all": "Seleccionar todo",
     "selected": "Seleccionado",
     "selectedItems": "{{count}} elementos seleccionados",
     "selectedMessages": "{{count}} mensajes seleccionados",
@@ -1194,11 +1268,13 @@
       }
     },
     "stop": "Detener",
+    "subscribe": "Suscribirse",
     "success": "Éxito",
     "swap": "Intercambiar",
     "topics": "Temas",
     "unknown": "Desconocido",
     "unnamed": "Sin nombre",
+    "unsubscribe": "Cancelar suscripción",
     "update_success": "Actualización exitosa",
     "upload_files": "Subir archivo",
     "warning": "Advertencia",
@@ -2125,6 +2201,7 @@
     "collapse": "ocultar",
     "content_placeholder": "Introduzca el contenido de la nota...",
     "copyContent": "copiar contenido",
+    "crossPlatformRestoreWarning": "Configuración multiplataforma restaurada, pero el directorio de notas está vacío. Por favor, copia tus archivos de notas en: {{path}}",
     "delete": "eliminar",
     "delete_confirm": "¿Estás seguro de que deseas eliminar este {{type}}?",
     "delete_folder_confirm": "¿Está seguro de que desea eliminar la carpeta \"{{name}}\" y todo su contenido?",
@@ -2226,11 +2303,11 @@
     "untitled_note": "Nota sin título",
     "upload": "[to be translated]:Upload",
     "upload_failed": "Error al cargar la nota",
-    "upload_files": "[to be translated]:Upload Files",
-    "upload_folder": "[to be translated]:Upload Folder",
+    "upload_files": "Subir archivos",
+    "upload_folder": "Carpeta de subida",
     "upload_success": "Nota cargada con éxito",
     "uploading": "[to be translated]:Uploading",
-    "uploading_files": "[to be translated]:Uploading {{count}} files..."
+    "uploading_files": "Subiendo {{count}} archivos..."
   },
   "notification": {
     "assistant": "Respuesta del asistente",
@@ -2521,7 +2598,8 @@
   },
   "preview": {
     "copy": {
-      "image": "Copiar como imagen"
+      "image": "Copiar como imagen",
+      "src": "Copia la fuente de la imagen"
     },
     "dialog": "Abrir la ventana de vista previa",
     "label": "Vista previa",
@@ -2575,6 +2653,7 @@
     "lanyun": "Tecnología Lanyun",
     "lmstudio": "Estudio LM",
     "longcat": "Totoro",
+    "mimo": "Xiaomi MiMo",
     "minimax": "Minimax",
     "mistral": "Mistral",
     "modelscope": "ModelScope Módulo",
@@ -3093,6 +3172,7 @@
         "label": "Datos de la aplicación",
         "migration_title": "Migración de datos",
         "new_path": "Nueva ruta",
+        "open": "Directorio abierto",
         "original_path": "Ruta original",
         "path_change_failed": "Error al cambiar el directorio de datos",
         "path_changed_without_copy": "La ruta se ha cambiado correctamente",
@@ -3163,24 +3243,43 @@
         },
         "content": "Exportar parte de los datos, incluidos los registros de chat y la configuración. Tenga en cuenta que el proceso de copia de seguridad puede tardar un tiempo; gracias por su paciencia.",
         "lan": {
-          "auto_close_tip": "Cierre automático en {{seconds}} segundos...",
-          "confirm_close_message": "La transferencia de archivos está en progreso. Cerrar interrumpirá la transferencia. ¿Estás seguro de que quieres forzar el cierre?",
-          "confirm_close_title": "Confirmar Cierre",
           "connected": "Conectado",
           "connection_failed": "Conexión fallida",
           "content": "Asegúrate de que el ordenador y el móvil estén en la misma red para usar la transferencia por LAN. Abre la aplicación Cherry Studio y escanea este código QR.",
+          "device_list_title": "Dispositivos de red local",
+          "discovered_devices": "Dispositivos descubiertos",
           "error": {
+            "file_too_large": "Archivo demasiado grande, se admite un máximo de 500 MB",
             "init_failed": "Falló la inicialización",
+            "invalid_file_type": "Solo se admiten archivos ZIP",
             "no_file": "Ningún archivo seleccionado",
             "no_ip": "No se puede obtener la dirección IP",
+            "not_connected": "Por favor, completa primero el apretón de manos.",
             "send_failed": "Error al enviar el archivo"
           },
-          "force_close": "Cerrar forzosamente",
-          "generating_qr": "Generando código QR...",
-          "noZipSelected": "No se ha seleccionado ningún archivo comprimido",
-          "scan_qr": "Por favor, escanea el código QR con tu teléfono",
-          "selectZip": "Seleccionar archivo comprimido",
-          "sendZip": "Comenzar la recuperación de datos",
+          "file_transfer": {
+            "cancelled": "Transferencia cancelada",
+            "failed": "Error en la transferencia del archivo: {{message}}",
+            "progress": "Enviando... {{progress}}%",
+            "success": "Archivo enviado con éxito"
+          },
+          "handshake": {
+            "button": "Apretón de manos",
+            "failed": "Error de handshake: {{message}}",
+            "in_progress": "Estrechando manos...",
+            "success": "Handshake completado con {{device}}",
+            "test_message_received": "Recibido pong de {{device}}",
+            "test_message_sent": "Enviado payload de prueba hello world"
+          },
+          "idle_hint": "Escaneo pausado. Inicia el escaneo para encontrar pares de Cherry Studio en tu red local.",
+          "ip_addresses": "Direcciones IP",
+          "last_seen": "Visto por última vez a las {{time}}",
+          "metadata": "Metadatos",
+          "no_connection_warning": "Por favor, abre Transferencia LAN en la aplicación móvil Cherry Studio.",
+          "no_devices": "Aún no se han encontrado pares en LAN",
+          "scan_devices": "Escanear dispositivos",
+          "scanning_hint": "Escaneando tu red local en busca de pares de Cherry Studio...",
+          "send_file": "Enviar archivo",
           "status": {
             "completed": "Transferencia completada",
             "connected": "Conectado",
@@ -3189,9 +3288,11 @@
             "error": "Error de conexión",
             "initializing": "Inicializando conexión...",
             "preparing": "Preparando transferencia...",
-            "sending": "Transfiriendo {{progress}}%",
-            "waiting_qr_scan": "Por favor, escanea el código QR para conectarte"
+            "sending": "Transfiriendo {{progress}}%"
           },
+          "status_badge_idle": "Ocioso",
+          "status_badge_scanning": "Escaneando",
+          "stop_scan": "Detener escaneo",
           "title": "Transferencia de red local",
           "transfer_progress": "Progreso de transferencia"
         },
@@ -3863,6 +3964,7 @@
       "builtinServers": "Servidores integrados",
       "builtinServersDescriptions": {
         "brave_search": "Una implementación de servidor MCP que integra la API de búsqueda de Brave, proporcionando funciones de búsqueda web y búsqueda local. Requiere configurar la variable de entorno BRAVE_API_KEY",
+        "browser": "Controla una ventana Electron headless mediante Chrome DevTools Protocol. Herramientas: abrir URL, ejecutar JS de una línea, reiniciar sesión.",
         "didi_mcp": "Servidor DiDi MCP que proporciona servicios de transporte incluyendo búsqueda de mapas, estimación de precios, gestión de pedidos y seguimiento de conductores. Disponible solo en China Continental. Requiere configurar la variable de entorno DIDI_API_KEY",
         "dify_knowledge": "Implementación del servidor MCP de Dify, que proporciona una API sencilla para interactuar con Dify. Se requiere configurar la clave de Dify.",
         "fetch": "Servidor MCP para obtener el contenido de la página web de una URL",
@@ -3870,6 +3972,7 @@
         "mcp_auto_install": "Instalación automática del servicio MCP (versión beta)",
         "memory": "Implementación básica de memoria persistente basada en un grafo de conocimiento local. Esto permite que el modelo recuerde información relevante del usuario entre diferentes conversaciones. Es necesario configurar la variable de entorno MEMORY_FILE_PATH.",
         "no": "sin descripción",
+        "nowledge_mem": "Requiere que la aplicación Nowledge Mem se ejecute localmente. Mantiene chats de IA, herramientas, notas, agentes y archivos en memoria privada en tu computadora. Descárgala desde https://mem.nowledge.co/",
         "python": "Ejecuta código Python en un entorno sandbox seguro. Usa Pyodide para ejecutar Python, compatible con la mayoría de las bibliotecas estándar y paquetes de cálculo científico.",
         "sequentialthinking": "Una implementación de servidor MCP que proporciona herramientas para la resolución dinámica y reflexiva de problemas mediante un proceso de pensamiento estructurado"
       },
@@ -3915,6 +4018,7 @@
       "jsonSaveError": "Fallo al guardar la configuración JSON",
       "jsonSaveSuccess": "Configuración JSON guardada exitosamente",
       "logoUrl": "URL del logotipo",
+      "logs": "Registros",
       "longRunning": "Modo de ejecución prolongada",
       "longRunningTooltip": "Una vez habilitado, el servidor admite tareas de larga duración, reinicia el temporizador de tiempo de espera al recibir notificaciones de progreso y amplía el tiempo máximo de espera hasta 10 minutos.",
       "marketplaces": "Mercados",
@@ -3934,6 +4038,7 @@
       "name": "Nombre",
       "newServer": "Servidor MCP",
       "noDescriptionAvailable": "Sin descripción disponible por ahora",
+      "noLogs": "Aún no hay registros",
       "noServers": "No se han configurado servidores",
       "not_support": "El modelo no es compatible",
       "npx_list": {
@@ -4028,7 +4133,7 @@
       "tagsPlaceholder": "Ingrese etiquetas",
       "timeout": "Tiempo de espera",
       "timeoutTooltip": "Tiempo de espera (en segundos) para las solicitudes a este servidor; el valor predeterminado es 60 segundos",
-      "title": "Configuración del MCP",
+      "title": "Servidores MCP",
       "tools": {
         "autoApprove": {
           "label": "Aprobación automática",
@@ -4662,6 +4767,12 @@
       },
       "title": "Configuración de Herramientas",
       "websearch": {
+        "api_key_required": {
+          "content": "{{provider}} requiere una clave de API para funcionar. ¿Te gustaría configurarla ahora?",
+          "ok": "Configurar",
+          "title": "Se requiere clave de API"
+        },
+        "api_providers": "Proveedores de API",
         "apikey": "Clave API",
         "blacklist": "Lista negra",
         "blacklist_description": "Los resultados de los siguientes sitios web no aparecerán en los resultados de búsqueda",
@@ -4703,7 +4814,15 @@
         },
         "content_limit": "Límite de longitud del contenido",
         "content_limit_tooltip": "Limita la longitud del contenido en los resultados de búsqueda; el contenido que exceda el límite será truncado",
+        "default_provider": "Proveedor Predeterminado",
         "free": "Gratis",
+        "is_default": "Por defecto",
+        "local_provider": {
+          "hint": "Inicia sesión en el sitio web para obtener mejores resultados de búsqueda y personalizar tu configuración de búsqueda.",
+          "open_settings": "Abrir configuración de {{provider}}",
+          "settings": "Configuración de búsqueda local"
+        },
+        "local_providers": "Proveedores locales",
         "no_provider_selected": "Seleccione un proveedor de búsqueda antes de comprobar",
         "overwrite": "Sobrescribir búsqueda del proveedor",
         "overwrite_tooltip": "Forzar el uso del proveedor de búsqueda en lugar del modelo de lenguaje grande",
@@ -4714,6 +4833,7 @@
         "search_provider": "Proveedor de búsqueda",
         "search_provider_placeholder": "Seleccione un proveedor de búsqueda",
         "search_with_time": "Buscar con fecha",
+        "set_as_default": "Establecer como predeterminado",
         "subscribe": "Suscripción a lista negra",
         "subscribe_add": "Añadir suscripción",
         "subscribe_add_failed": "Error al agregar la fuente de suscripción",
diff --git a/src/renderer/src/i18n/translate/fr-fr.json b/src/renderer/src/i18n/translate/fr-fr.json
index 851fa131c5..fd10189740 100644
--- a/src/renderer/src/i18n/translate/fr-fr.json
+++ b/src/renderer/src/i18n/translate/fr-fr.json
@@ -6,6 +6,9 @@
         "failed": "Échec de l'ajout de l'agent",
         "invalid_agent": "Agent invalide"
       },
+      "model": {
+        "tooltip": "Actuellement, seuls les modèles qui prennent en charge les points de terminaison Anthropic sont disponibles pour la fonctionnalité Agent."
+      },
       "title": "Ajouter un agent",
       "type": {
         "placeholder": "Sélectionner le type d'Agent"
@@ -28,13 +31,31 @@
       }
     },
     "gitBash": {
+      "autoDetected": "Utilisation de Git Bash détecté automatiquement",
+      "autoDiscoveredHint": "Auto-découvert",
+      "clear": {
+        "button": "Effacer le chemin personnalisé"
+      },
+      "customPath": "Utilisation du chemin personnalisé : {{path}}",
       "error": {
         "description": "Git Bash est requis pour exécuter des agents sur Windows. L'agent ne peut pas fonctionner sans. Veuillez installer Git pour Windows depuis",
         "recheck": "Revérifier l'installation de Git Bash",
+        "required": "Le chemin Git Bash est requis sur Windows",
         "title": "Git Bash requis"
       },
-      "notFound": "Git Bash introuvable. Veuillez l’installer d’abord.",
-      "success": "Git Bash détecté avec succès !"
+      "found": {
+        "title": "Git Bash configuré"
+      },
+      "notFound": "Git Bash non trouvé. Veuillez l'installer d'abord.",
+      "pick": {
+        "button": "Sélectionner le chemin Git Bash",
+        "failed": "Échec de la configuration du chemin Git Bash",
+        "invalidPath": "Le fichier sélectionné n'est pas un exécutable Git Bash valide (bash.exe).",
+        "title": "Sélectionner l'exécutable Git Bash"
+      },
+      "placeholder": "Sélectionner le chemin de bash.exe",
+      "success": "Git Bash détecté avec succès !",
+      "tooltip": "Git Bash est nécessaire pour exécuter des agents sur Windows. Installez-le depuis git-scm.com s'il n'est pas disponible."
     },
     "input": {
       "placeholder": "Entrez votre message ici, envoyez avec {{key}} - @ sélectionner le chemin, / sélectionner la commande"
@@ -399,6 +420,9 @@
     },
     "delete": {
       "content": "La suppression de l'aide supprimera tous les sujets et fichiers sous l'aide. Êtes-vous sûr de vouloir la supprimer ?",
+      "error": {
+        "remain_one": "Interdiction de supprimer le dernier assistant"
+      },
       "title": "Supprimer l'Aide"
     },
     "edit": {
@@ -455,6 +479,7 @@
         "button": "Importer",
         "error": {
           "fetch_failed": "Échec de la récupération des données depuis l'URL",
+          "file_required": "Veuillez d'abord sélectionner un fichier",
           "invalid_format": "Format d'assistant invalide : champs obligatoires manquants",
           "url_required": "Veuillez saisir une URL"
         },
@@ -468,6 +493,17 @@
         "url_placeholder": "Saisir l'URL JSON"
       },
       "manage": {
+        "batch_delete": {
+          "button": "Suppression par lot",
+          "confirm": "Êtes-vous sûr de vouloir supprimer les {{count}} assistants sélectionnés ?"
+        },
+        "batch_export": {
+          "button": "Exporter"
+        },
+        "mode": {
+          "manage": "Gérer",
+          "sort": "Trier"
+        },
         "title": "Gérer les assistants"
       },
       "my_agents": "Mes assistants",
@@ -515,13 +551,23 @@
       "more": "Paramètres de l'assistant",
       "prompt": "Paramètres de l'invite",
       "reasoning_effort": {
+        "auto": "Auto",
+        "auto_description": "Déterminer de manière flexible l'effort de raisonnement",
         "default": "Par défaut",
+        "default_description": "Dépendre du comportement par défaut du modèle, sans aucune configuration.",
         "high": "Long",
+        "high_description": "Raisonnement de haut niveau",
         "label": "Longueur de la chaîne de raisonnement",
         "low": "Court",
+        "low_description": "Raisonnement de bas niveau",
         "medium": "Moyen",
+        "medium_description": "Raisonnement de niveau moyen",
         "minimal": "minimal",
-        "off": "Off"
+        "minimal_description": "Réflexion minimale",
+        "off": "Off",
+        "off_description": "Désactiver le raisonnement",
+        "xhigh": "Très élevée",
+        "xhigh_description": "Raisonnement de très haut niveau"
       },
       "regular_phrases": {
         "add": "Добавить фразу",
@@ -1001,6 +1047,29 @@
         "yuque": "Exporter vers Yuque"
       },
       "list": "Liste des sujets",
+      "manage": {
+        "clear_selection": "Effacer la sélection",
+        "delete": {
+          "confirm": {
+            "content": "Êtes-vous sûr de vouloir supprimer {{count}} sujet(s) sélectionné(s) ? Cette action est irréversible.",
+            "title": "Supprimer des sujets"
+          },
+          "success": "Supprimé {{count}} sujet(s)"
+        },
+        "deselect_all": "Tout désélectionner",
+        "error": {
+          "at_least_one": "Au moins un sujet doit être conservé"
+        },
+        "move": {
+          "button": "Déplacer",
+          "placeholder": "Sélectionner la cible",
+          "success": "Déplacé {{count}} sujet(s)"
+        },
+        "pinned": "Sujets épinglés",
+        "selected_count": "{{count}} sélectionné",
+        "title": "Gérer les sujets",
+        "unpinned": "Sujets non épinglés"
+      },
       "move_to": "Déplacer vers",
       "new": "Commencer une nouvelle conversation",
       "pin": "Fixer le sujet",
@@ -1011,6 +1080,10 @@
         "label": "Indicateurs de sujet",
         "tips": "Indicateurs de sujet : fournir des indications supplémentaires pour le sujet actuel"
       },
+      "search": {
+        "placeholder": "Rechercher des sujets...",
+        "title": "Rechercher"
+      },
       "title": "Sujet",
       "unpin": "Annuler le fixage"
     },
@@ -1182,6 +1255,7 @@
     "saved": "enregistré",
     "search": "Rechercher",
     "select": "Sélectionner",
+    "select_all": "Tout sélectionner",
     "selected": "Sélectionné",
     "selectedItems": "{{count}} éléments sélectionnés",
     "selectedMessages": "{{count}} messages sélectionnés",
@@ -1194,11 +1268,13 @@
       }
     },
     "stop": "Arrêter",
+    "subscribe": "S'abonner",
     "success": "Succès",
     "swap": "Échanger",
     "topics": "Sujets",
     "unknown": "Inconnu",
     "unnamed": "Sans nom",
+    "unsubscribe": "Se désabonner",
     "update_success": "Mise à jour réussie",
     "upload_files": "Uploader des fichiers",
     "warning": "Avertissement",
@@ -2125,6 +2201,7 @@
     "collapse": "réduire",
     "content_placeholder": "Veuillez saisir le contenu de la note...",
     "copyContent": "contenu copié",
+    "crossPlatformRestoreWarning": "Configuration multiplateforme restaurée, mais le répertoire des notes est vide. Veuillez copier vos fichiers de notes vers : {{path}}",
     "delete": "supprimer",
     "delete_confirm": "Êtes-vous sûr de vouloir supprimer ce {{type}} ?",
     "delete_folder_confirm": "Êtes-vous sûr de vouloir supprimer le dossier \"{{name}}\" et tout son contenu ?",
@@ -2226,11 +2303,11 @@
     "untitled_note": "Note sans titre",
     "upload": "[to be translated]:Upload",
     "upload_failed": "Échec du téléchargement de la note",
-    "upload_files": "[to be translated]:Upload Files",
-    "upload_folder": "[to be translated]:Upload Folder",
+    "upload_files": "Télécharger des fichiers",
+    "upload_folder": "Puis dossier de téléchargement",
     "upload_success": "Note téléchargée avec succès",
     "uploading": "[to be translated]:Uploading",
-    "uploading_files": "[to be translated]:Uploading {{count}} files..."
+    "uploading_files": "Téléchargement de {{count}} fichiers..."
   },
   "notification": {
     "assistant": "Réponse de l'assistant",
@@ -2521,7 +2598,8 @@
   },
   "preview": {
     "copy": {
-      "image": "Copier en tant qu'image"
+      "image": "Copier en tant qu'image",
+      "src": "Copier la source de l'image"
     },
     "dialog": "Ouvrir la fenêtre d'aperçu",
     "label": "Aperçu",
@@ -2575,6 +2653,7 @@
     "lanyun": "Technologie Lan Yun",
     "lmstudio": "Studio LM",
     "longcat": "Mon voisin Totoro",
+    "mimo": "Xiaomi MiMo",
     "minimax": "MiniMax",
     "mistral": "Mistral",
     "modelscope": "ModelScope MoDa",
@@ -3093,6 +3172,7 @@
         "label": "Données de l'application",
         "migration_title": "Migration des données",
         "new_path": "Nouveau chemin",
+        "open": "Répertoire ouvert",
         "original_path": "Chemin d'origine",
         "path_change_failed": "Échec de la modification du répertoire de données",
         "path_changed_without_copy": "Le chemin a été modifié avec succès",
@@ -3163,24 +3243,43 @@
         },
         "content": "Exporter une partie des données, incluant les historiques de discussion et les paramètres. Veuillez noter que le processus de sauvegarde peut prendre un certain temps ; merci pour votre patience.",
         "lan": {
-          "auto_close_tip": "Fermeture automatique dans {{seconds}} secondes...",
-          "confirm_close_message": "Le transfert de fichier est en cours. Fermer interrompra le transfert. Êtes-vous sûr de vouloir forcer la fermeture ?",
-          "confirm_close_title": "Confirmer la fermeture",
           "connected": "Connecté",
           "connection_failed": "Échec de la connexion",
           "content": "Assurez-vous que l'ordinateur et le téléphone sont connectés au même réseau pour utiliser le transfert en réseau local. Ouvrez l'application Cherry Studio et scannez ce code QR.",
+          "device_list_title": "Périphériques réseau locaux",
+          "discovered_devices": "Appareils découverts",
           "error": {
+            "file_too_large": "Fichier trop volumineux, taille maximale supportée : 500 Mo",
             "init_failed": "Échec de l'initialisation",
+            "invalid_file_type": "Seuls les fichiers ZIP sont pris en charge",
             "no_file": "Aucun fichier sélectionné",
             "no_ip": "Impossible d'obtenir l'adresse IP",
+            "not_connected": "Veuillez d'abord terminer la poignée de main",
             "send_failed": "Échec de l'envoi du fichier"
           },
-          "force_close": "Fermer de force",
-          "generating_qr": "Génération du code QR...",
-          "noZipSelected": "Aucun fichier compressé sélectionné",
-          "scan_qr": "Veuillez scanner le code QR avec votre téléphone",
-          "selectZip": "Sélectionner le fichier compressé",
-          "sendZip": "Commencer la restauration des données",
+          "file_transfer": {
+            "cancelled": "Transfert annulé",
+            "failed": "Le transfert de fichier a échoué : {{message}}",
+            "progress": "Envoi en cours... {{progress}}%",
+            "success": "Fichier envoyé avec succès"
+          },
+          "handshake": {
+            "button": "Poignée de main",
+            "failed": "Échec de la poignée de main : {{message}}",
+            "in_progress": "Établissement de la connexion...",
+            "success": "Poignée de main terminée avec {{device}}",
+            "test_message_received": "Pong reçu de {{device}}",
+            "test_message_sent": "Envoyé la charge utile de test hello world"
+          },
+          "idle_hint": "Analyse en pause. Lancez l’analyse pour détecter les pairs Cherry Studio sur votre réseau local.",
+          "ip_addresses": "Adresses IP",
+          "last_seen": "Vu pour la dernière fois à {{time}}",
+          "metadata": "Métadonnées",
+          "no_connection_warning": "Veuillez ouvrir le transfert LAN sur l'application mobile Cherry Studio.",
+          "no_devices": "Aucun pair LAN trouvé pour l'instant",
+          "scan_devices": "Analyser les appareils",
+          "scanning_hint": "Analyse de votre réseau local à la recherche d’homologues Cherry Studio…",
+          "send_file": "Envoyer le fichier",
           "status": {
             "completed": "Transfert terminé",
             "connected": "Connecté",
@@ -3189,9 +3288,11 @@
             "error": "Erreur de connexion",
             "initializing": "Initialisation de la connexion...",
             "preparing": "Préparation du transfert...",
-            "sending": "Transfert {{progress}} %",
-            "waiting_qr_scan": "Veuillez scanner le code QR pour vous connecter"
+            "sending": "Transfert {{progress}} %"
           },
+          "status_badge_idle": "Inactif",
+          "status_badge_scanning": "Numérisation",
+          "stop_scan": "Arrêter le scan",
           "title": "Transmission en réseau local",
           "transfer_progress": "Progression du transfert"
         },
@@ -3863,6 +3964,7 @@
       "builtinServers": "Serveurs intégrés",
       "builtinServersDescriptions": {
         "brave_search": "Une implémentation de serveur MCP intégrant l'API de recherche Brave, offrant des fonctionnalités de recherche web et locale. Nécessite la configuration de la variable d'environnement BRAVE_API_KEY",
+        "browser": "Contrôle une fenêtre Electron headless via Chrome DevTools Protocol. Outils : ouvrir une URL, exécuter du JS en une ligne, réinitialiser la session.",
         "didi_mcp": "Serveur DiDi MCP fournissant des services de transport incluant la recherche de cartes, l'estimation des prix, la gestion des commandes et le suivi des conducteurs. Disponible uniquement en Chine continentale. Nécessite la configuration de la variable d'environnement DIDI_API_KEY",
         "dify_knowledge": "Implémentation du serveur MCP de Dify, fournissant une API simple pour interagir avec Dify. Nécessite la configuration de la clé Dify",
         "fetch": "serveur MCP utilisé pour récupérer le contenu des pages web URL",
@@ -3870,6 +3972,7 @@
         "mcp_auto_install": "Installation automatique du service MCP (version bêta)",
         "memory": "Implémentation de base de mémoire persistante basée sur un graphe de connaissances local. Cela permet au modèle de se souvenir des informations relatives à l'utilisateur entre différentes conversations. Nécessite la configuration de la variable d'environnement MEMORY_FILE_PATH.",
         "no": "sans description",
+        "nowledge_mem": "Nécessite l’application Nowledge Mem exécutée localement. Conserve les discussions IA, outils, notes, agents et fichiers dans une mémoire privée sur votre ordinateur. Téléchargez depuis https://mem.nowledge.co/",
         "python": "Exécutez du code Python dans un environnement bac à sable sécurisé. Utilisez Pyodide pour exécuter Python, prenant en charge la plupart des bibliothèques standard et des packages de calcul scientifique.",
         "sequentialthinking": "Un serveur MCP qui fournit des outils permettant une résolution dynamique et réflexive des problèmes à travers un processus de pensée structuré"
       },
@@ -3915,6 +4018,7 @@
       "jsonSaveError": "Échec de la sauvegarde de la configuration JSON",
       "jsonSaveSuccess": "Configuration JSON sauvegardée",
       "logoUrl": "Адрес логотипа",
+      "logs": "Journaux",
       "longRunning": "Mode d'exécution prolongée",
       "longRunningTooltip": "Une fois activé, le serveur prend en charge les tâches de longue durée, réinitialise le minuteur de temporisation à la réception des notifications de progression, et prolonge le délai d'expiration maximal à 10 minutes.",
       "marketplaces": "Places de marché",
@@ -3934,6 +4038,7 @@
       "name": "Nom",
       "newServer": "Сервер MCP",
       "noDescriptionAvailable": "Aucune description disponible pour le moment",
+      "noLogs": "Aucun journal pour le moment",
       "noServers": "Aucun serveur configuré",
       "not_support": "Модель не поддерживается",
       "npx_list": {
@@ -4028,7 +4133,7 @@
       "tagsPlaceholder": "Введите теги",
       "timeout": "Таймаут",
       "timeoutTooltip": "Таймаут запроса к серверу (в секундах), по умолчанию 60 секунд",
-      "title": "Paramètres MCP",
+      "title": "Serveurs MCP",
       "tools": {
         "autoApprove": {
           "label": "Approbation automatique",
@@ -4662,6 +4767,12 @@
       },
       "title": "Paramètres des outils",
       "websearch": {
+        "api_key_required": {
+          "content": "{{provider}} nécessite une clé API pour fonctionner. Souhaitez-vous la configurer maintenant ?",
+          "ok": "Configurer",
+          "title": "Clé API requise"
+        },
+        "api_providers": "Fournisseurs d'API",
         "apikey": "Clé API",
         "blacklist": "Liste noire",
         "blacklist_description": "Les résultats provenant des sites suivants n'apparaîtront pas dans les résultats de recherche",
@@ -4703,7 +4814,15 @@
         },
         "content_limit": "Limite de longueur du contenu",
         "content_limit_tooltip": "Limiter la longueur du contenu des résultats de recherche ; le contenu dépassant cette limite sera tronqué",
+        "default_provider": "Fournisseur par défaut",
         "free": "Gratuit",
+        "is_default": "Défaut",
+        "local_provider": {
+          "hint": "Connectez-vous au site Web pour obtenir de meilleurs résultats de recherche et personnaliser vos paramètres de recherche.",
+          "open_settings": "Ouvrir les paramètres de {{provider}}",
+          "settings": "Paramètres de recherche locale"
+        },
+        "local_providers": "Fournisseurs locaux",
         "no_provider_selected": "Veuillez sélectionner un fournisseur de recherche avant de vérifier",
         "overwrite": "Remplacer la recherche du fournisseur",
         "overwrite_tooltip": "Forcer l'utilisation du fournisseur de recherche au lieu du grand modèle linguistique",
@@ -4714,6 +4833,7 @@
         "search_provider": "Fournisseur de recherche",
         "search_provider_placeholder": "Sélectionnez un fournisseur de recherche",
         "search_with_time": "Rechercher avec date",
+        "set_as_default": "Définir par défaut",
         "subscribe": "Abonnement à la liste noire",
         "subscribe_add": "Ajouter un abonnement",
         "subscribe_add_failed": "Échec de l'ajout de la source d'abonnement",
diff --git a/src/renderer/src/i18n/translate/ja-jp.json b/src/renderer/src/i18n/translate/ja-jp.json
index 8745381182..fa577a39f3 100644
--- a/src/renderer/src/i18n/translate/ja-jp.json
+++ b/src/renderer/src/i18n/translate/ja-jp.json
@@ -6,6 +6,9 @@
         "failed": "エージェントの追加に失敗しました",
         "invalid_agent": "無効なエージェント"
       },
+      "model": {
+        "tooltip": "現在、エージェント機能では、Anthropicエンドポイントをサポートするモデルのみが利用可能です。"
+      },
       "title": "エージェントを追加",
       "type": {
         "placeholder": "エージェントタイプを選択"
@@ -28,13 +31,31 @@
       }
     },
     "gitBash": {
+      "autoDetected": "自動検出されたGit Bashを使用中",
+      "autoDiscoveredHint": "自動検出",
+      "clear": {
+        "button": "カスタムパスをクリア"
+      },
+      "customPath": "カスタムパスを使用中: {{path}}",
       "error": {
         "description": "Windowsでエージェントを実行するにはGit Bashが必要です。これがないとエージェントは動作しません。以下からGit for Windowsをインストールしてください。",
         "recheck": "Git Bashのインストールを再確認してください",
+        "required": "WindowsではGit Bashのパスが必要です",
         "title": "Git Bashが必要です"
       },
+      "found": {
+        "title": "Git Bashが設定されました"
+      },
       "notFound": "Git Bash が見つかりません。先にインストールしてください。",
-      "success": "Git Bashが正常に検出されました！"
+      "pick": {
+        "button": "Git Bashパスを選択",
+        "failed": "Git Bashパスの設定に失敗しました",
+        "invalidPath": "選択されたファイルは有効なGit Bash実行ファイル（bash.exe）ではありません。",
+        "title": "Git Bash実行ファイルを選択"
+      },
+      "placeholder": "bash.exeのパスを選択",
+      "success": "Git Bashが正常に検出されました！",
+      "tooltip": "Windowsでエージェントを実行するにはGit Bashが必要です。まだインストールされていない場合は、git-scm.comからインストールしてください。"
     },
     "input": {
       "placeholder": "メッセージをここに入力し、{{key}}で送信 - @でパスを選択、/でコマンドを選択"
@@ -399,6 +420,9 @@
     },
     "delete": {
       "content": "アシスタントを削除すると、そのアシスタントのすべてのトピックとファイルが削除されます。削除しますか？",
+      "error": {
+        "remain_one": "最後の1人のアシスタントは削除できません"
+      },
       "title": "アシスタントを削除"
     },
     "edit": {
@@ -455,6 +479,7 @@
         "button": "インポート",
         "error": {
           "fetch_failed": "URLからのデータ取得に失敗しました",
+          "file_required": "まずファイルを選択してください",
           "invalid_format": "無効なアシスタント形式：必須フィールドが不足しています",
           "url_required": "URLを入力してください"
         },
@@ -468,6 +493,17 @@
         "url_placeholder": "JSON URLを入力"
       },
       "manage": {
+        "batch_delete": {
+          "button": "バッチ削除",
+          "confirm": "選択した{{count}}件のアシスタントを削除してもよろしいですか？"
+        },
+        "batch_export": {
+          "button": "エクスポート"
+        },
+        "mode": {
+          "manage": "管理",
+          "sort": "並べ替え"
+        },
         "title": "アシスタントを管理"
       },
       "my_agents": "マイアシスタント",
@@ -515,13 +551,23 @@
       "more": "アシスタント設定",
       "prompt": "プロンプト設定",
       "reasoning_effort": {
+        "auto": "自動",
+        "auto_description": "推論にかける労力を柔軟に調整する",
         "default": "デフォルト",
+        "default_description": "設定なしで、モデルの既定の動作に依存する。",
         "high": "最大限の思考",
+        "high_description": "高度な推論",
         "label": "思考連鎖の長さ",
         "low": "少しの思考",
+        "low_description": "低レベル推論",
         "medium": "普通の思考",
+        "medium_description": "中レベル推論",
         "minimal": "最小限の思考",
-        "off": "オフ"
+        "minimal_description": "最小限の推論",
+        "off": "オフ",
+        "off_description": "推論を無効にする",
+        "xhigh": "超高",
+        "xhigh_description": "超高度な推論"
       },
       "regular_phrases": {
         "add": "プロンプトを追加",
@@ -1001,6 +1047,29 @@
         "yuque": "語雀にエクスポート"
       },
       "list": "トピックリスト",
+      "manage": {
+        "clear_selection": "選択をクリア",
+        "delete": {
+          "confirm": {
+            "content": "{{count}}件の選択したトピックを削除してもよろしいですか？この操作は元に戻せません。",
+            "title": "トピックを削除"
+          },
+          "success": "{{count}}件のトピックを削除しました"
+        },
+        "deselect_all": "すべての選択を解除",
+        "error": {
+          "at_least_one": "少なくとも1つのトピックは保持されなければなりません"
+        },
+        "move": {
+          "button": "移動",
+          "placeholder": "対象を選択",
+          "success": "{{count}}件のトピックを移動しました"
+        },
+        "pinned": "ピン留めされたトピック",
+        "selected_count": "{{count}} 選択済み",
+        "title": "トピックを管理",
+        "unpinned": "ピン留めされていないトピック"
+      },
       "move_to": "移動先",
       "new": "新しいトピック",
       "pin": "トピックを固定",
@@ -1011,6 +1080,10 @@
         "label": "トピック提示語",
         "tips": "トピック提示語：現在のトピックに対して追加の補足提示語を提供"
       },
+      "search": {
+        "placeholder": "トピックを検索...",
+        "title": "検索"
+      },
       "title": "トピック",
       "unpin": "固定解除"
     },
@@ -1182,6 +1255,7 @@
     "saved": "保存されました",
     "search": "検索",
     "select": "選択",
+    "select_all": "すべて選択",
     "selected": "選択済み",
     "selectedItems": "{{count}}件の項目を選択しました",
     "selectedMessages": "{{count}}件のメッセージを選択しました",
@@ -1194,11 +1268,13 @@
       }
     },
     "stop": "停止",
+    "subscribe": "購読",
     "success": "成功",
     "swap": "交換",
     "topics": "トピック",
     "unknown": "Unknown",
     "unnamed": "無題",
+    "unsubscribe": "配信停止",
     "update_success": "更新成功",
     "upload_files": "ファイルをアップロードする",
     "warning": "警告",
@@ -2125,6 +2201,7 @@
     "collapse": "閉じる",
     "content_placeholder": "メモの内容を入力してください...",
     "copyContent": "コンテンツをコピーします",
+    "crossPlatformRestoreWarning": "クロスプラットフォーム設定は復元されましたが、ノートディレクトリが空です。ノートファイルを次の場所にコピーしてください：{{path}}",
     "delete": "削除",
     "delete_confirm": "この{{type}}を本当に削除しますか？",
     "delete_folder_confirm": "「{{name}}」フォルダーとそのすべての内容を削除してもよろしいですか？",
@@ -2226,11 +2303,11 @@
     "untitled_note": "無題のメモ",
     "upload": "[to be translated]:Upload",
     "upload_failed": "ノートのアップロードに失敗しました",
-    "upload_files": "[to be translated]:Upload Files",
-    "upload_folder": "[to be translated]:Upload Folder",
+    "upload_files": "ファイルをアップロード",
+    "upload_folder": "アップロードフォルダ",
     "upload_success": "ノートのアップロードが成功しました",
     "uploading": "[to be translated]:Uploading",
-    "uploading_files": "[to be translated]:Uploading {{count}} files..."
+    "uploading_files": "{{count}} 個のファイルをアップロード中..."
   },
   "notification": {
     "assistant": "助手回應",
@@ -2521,7 +2598,8 @@
   },
   "preview": {
     "copy": {
-      "image": "画像としてコピー"
+      "image": "画像としてコピー",
+      "src": "画像ソースをコピー"
     },
     "dialog": "ダイアログを開く",
     "label": "プレビュー",
@@ -2575,6 +2653,7 @@
     "lanyun": "LANYUN",
     "lmstudio": "LM Studio",
     "longcat": "トトロ",
+    "mimo": "シャオミ・ミモ",
     "minimax": "MiniMax",
     "mistral": "Mistral",
     "modelscope": "ModelScope",
@@ -3093,6 +3172,7 @@
         "label": "アプリデータ",
         "migration_title": "データ移行",
         "new_path": "新しいパス",
+        "open": "オープンディレクトリ",
         "original_path": "元のパス",
         "path_change_failed": "データディレクトリの変更に失敗しました",
         "path_changed_without_copy": "パスが変更されました。",
@@ -3163,24 +3243,43 @@
         },
         "content": "一部のデータ、チャット履歴や設定をエクスポートします。バックアップには時間がかかる場合がありますので、しばらくお待ちください。",
         "lan": {
-          "auto_close_tip": "{{seconds}}秒後に自動的に閉じます...",
-          "confirm_close_message": "ファイル転送が進行中です。閉じると転送が中断されます。強制終了してもよろしいですか？",
-          "confirm_close_title": "閉じることを確認",
           "connected": "接続済み",
           "connection_failed": "接続に失敗しました",
           "content": "コンピューターとスマートフォンが同じネットワークに接続されていることを確認し、ローカルエリアネットワーク転送を使用してください。Cherry Studioアプリを開き、このQRコードをスキャンしてください。",
+          "device_list_title": "ローカルネットワークデバイス",
+          "discovered_devices": "発見されたデバイス",
           "error": {
+            "file_too_large": "ファイルが大きすぎます。最大500MBまでサポートされています。",
             "init_failed": "初期化に失敗しました",
+            "invalid_file_type": "ZIPファイルのみがサポートされています",
             "no_file": "ファイルが選択されていません",
             "no_ip": "IPアドレスを取得できません",
+            "not_connected": "まずハンドシェイクを完了してください",
             "send_failed": "ファイルの送信に失敗しました"
           },
-          "force_close": "強制終了",
-          "generating_qr": "QRコードを生成中...",
-          "noZipSelected": "圧縮ファイルが選択されていません",
-          "scan_qr": "携帯電話でQRコードをスキャンしてください",
-          "selectZip": "圧縮ファイルを選択",
-          "sendZip": "データの復元を開始します",
+          "file_transfer": {
+            "cancelled": "転送がキャンセルされました",
+            "failed": "ファイル転送に失敗しました: {{message}}",
+            "progress": "送信中... {{progress}}%",
+            "success": "ファイルは正常に送信されました"
+          },
+          "handshake": {
+            "button": "握手",
+            "failed": "ハンドシェイクに失敗しました: {{message}}",
+            "in_progress": "ハンドシェイク中...",
+            "success": "{{device}}とのハンドシェイクが完了しました",
+            "test_message_received": "{{device}}からpongを受信しました",
+            "test_message_sent": "hello world テストペイロードを送信しました"
+          },
+          "idle_hint": "スキャンが一時停止されました。スキャンを開始して、LAN上のCherry Studioピアを検索してください。",
+          "ip_addresses": "IPアドレス",
+          "last_seen": "最後に見たのは{{time}}",
+          "metadata": "メタデータ",
+          "no_connection_warning": "Cherry StudioモバイルでLAN転送を開いてください",
+          "no_devices": "まだLANピアが見つかっていません",
+          "scan_devices": "デバイスをスキャン",
+          "scanning_hint": "ローカルネットワークでCherry Studioのピアをスキャンしています...",
+          "send_file": "ファイルを送信",
           "status": {
             "completed": "転送完了",
             "connected": "接続済み",
@@ -3189,9 +3288,11 @@
             "error": "接続エラー",
             "initializing": "接続を初期化中...",
             "preparing": "転送準備中...",
-            "sending": "転送中 {{progress}}%",
-            "waiting_qr_scan": "QRコードをスキャンして接続してください"
+            "sending": "転送中 {{progress}}%"
           },
+          "status_badge_idle": "アイドル",
+          "status_badge_scanning": "スキャン",
+          "stop_scan": "スキャンを停止",
           "title": "LAN転送",
           "transfer_progress": "転送進行"
         },
@@ -3863,6 +3964,7 @@
       "builtinServers": "組み込みサーバー",
       "builtinServersDescriptions": {
         "brave_search": "Brave検索APIを統合したMCPサーバーの実装で、ウェブ検索とローカル検索の両機能を提供します。BRAVE_API_KEY環境変数の設定が必要です",
+        "browser": "Chrome DevTools Protocolを介してheadless Electronウィンドウを制御します。ツール：URLを開く、単一行JSを実行、セッションをリセット。",
         "didi_mcp": "DiDi MCPサーバーは、地図検索、料金見積もり、注文管理、ドライバー追跡を含むライドシェアサービスを提供します。中国本土でのみ利用可能です。DIDI_API_KEY環境変数の設定が必要です",
         "dify_knowledge": "DifyのMCPサーバー実装は、Difyと対話するためのシンプルなAPIを提供します。Dify Keyの設定が必要です。",
         "fetch": "URLのウェブページコンテンツを取得するためのMCPサーバー",
@@ -3870,6 +3972,7 @@
         "mcp_auto_install": "MCPサービスの自動インストール（ベータ版）",
         "memory": "ローカルのナレッジグラフに基づく永続的なメモリの基本的な実装です。これにより、モデルは異なる会話間でユーザーの関連情報を記憶できるようになります。MEMORY_FILE_PATH 環境変数の設定が必要です。",
         "no": "説明なし",
+        "nowledge_mem": "Nowledge Mem アプリをローカルで実行する必要があります。AI チャット、ツール、ノート、エージェント、ファイルをコンピューター上のプライベートメモリに保存します。https://mem.nowledge.co/ からダウンロードしてください",
         "python": "安全なサンドボックス環境でPythonコードを実行します。Pyodideを使用してPythonを実行し、ほとんどの標準ライブラリと科学計算パッケージをサポートしています。",
         "sequentialthinking": "構造化された思考プロセスを通じて動的かつ反省的な問題解決を行うためのツールを提供するMCPサーバーの実装"
       },
@@ -3915,6 +4018,7 @@
       "jsonSaveError": "JSON設定の保存に失敗しました",
       "jsonSaveSuccess": "JSON設定が保存されました。",
       "logoUrl": "ロゴURL",
+      "logs": "ログ",
       "longRunning": "長時間運行モード",
       "longRunningTooltip": "このオプションを有効にすると、サーバーは長時間のタスクをサポートします。進行状況通知を受信すると、タイムアウトがリセットされ、最大実行時間が10分に延長されます。",
       "marketplaces": "マーケットプレイス",
@@ -3934,6 +4038,7 @@
       "name": "名前",
       "newServer": "MCP サーバー",
       "noDescriptionAvailable": "説明がありません",
+      "noLogs": "ログはまだありません",
       "noServers": "サーバーが設定されていません",
       "not_support": "モデルはサポートされていません",
       "npx_list": {
@@ -4662,6 +4767,12 @@
       },
       "title": "その他の設定",
       "websearch": {
+        "api_key_required": {
+          "content": "{{provider}}はAPIキーが必要です。今すぐ設定しますか？",
+          "ok": "設定",
+          "title": "APIキーが必要"
+        },
+        "api_providers": "APIプロバイダー",
         "apikey": "APIキー",
         "blacklist": "ブラックリスト",
         "blacklist_description": "以下のウェブサイトの結果は検索結果に表示されません",
@@ -4703,7 +4814,15 @@
         },
         "content_limit": "コンテンツ制限",
         "content_limit_tooltip": "検索結果のコンテンツの長さを制限します。制限を超えるコンテンツは切り捨てられます。",
+        "default_provider": "デフォルトプロバイダー",
         "free": "無料",
+        "is_default": "デフォルト",
+        "local_provider": {
+          "hint": "ウェブサイトにログインして、より良い検索結果を得て、検索設定をパーソナライズしてください。",
+          "open_settings": "{{provider}}設定を開く",
+          "settings": "ローカル検索設定"
+        },
+        "local_providers": "地元のプロバイダー",
         "no_provider_selected": "検索サービスプロバイダーを選択してから再確認してください。",
         "overwrite": "検索サービスを上書き",
         "overwrite_tooltip": "LLMの代わりに検索サービスを強制的に使用する",
@@ -4714,6 +4833,7 @@
         "search_provider": "検索サービスプロバイダー",
         "search_provider_placeholder": "検索サービスプロバイダーを選択する",
         "search_with_time": "日付を含む検索",
+        "set_as_default": "既定として設定",
         "subscribe": "ブラックリスト購読",
         "subscribe_add": "購読を追加",
         "subscribe_add_failed": "購読ソースの追加に失敗しました",
diff --git a/src/renderer/src/i18n/translate/pt-pt.json b/src/renderer/src/i18n/translate/pt-pt.json
index 3c07d3cacf..b3f7aa1ce2 100644
--- a/src/renderer/src/i18n/translate/pt-pt.json
+++ b/src/renderer/src/i18n/translate/pt-pt.json
@@ -6,6 +6,9 @@
         "failed": "Falha ao adicionar agente",
         "invalid_agent": "Agent inválido"
       },
+      "model": {
+        "tooltip": "Atualmente, apenas modelos que suportam endpoints da Anthropic estão disponíveis para o recurso Agente."
+      },
       "title": "Adicionar Agente",
       "type": {
         "placeholder": "Selecionar tipo de Agente"
@@ -28,13 +31,31 @@
       }
     },
     "gitBash": {
+      "autoDetected": "Usando Git Bash detectado automaticamente",
+      "autoDiscoveredHint": "Auto-descoberto",
+      "clear": {
+        "button": "Limpar caminho personalizado"
+      },
+      "customPath": "Usando caminho personalizado: {{path}}",
       "error": {
         "description": "O Git Bash é necessário para executar agentes no Windows. O agente não pode funcionar sem ele. Por favor, instale o Git para Windows a partir de",
         "recheck": "Reverificar a Instalação do Git Bash",
+        "required": "O caminho do Git Bash é necessário no Windows",
         "title": "Git Bash Necessário"
       },
+      "found": {
+        "title": "Git Bash configurado"
+      },
       "notFound": "Git Bash não encontrado. Por favor, instale-o primeiro.",
-      "success": "Git Bash detectado com sucesso!"
+      "pick": {
+        "button": "Selecionar caminho do Git Bash",
+        "failed": "Falha ao configurar o caminho do Git Bash",
+        "invalidPath": "O arquivo selecionado não é um executável válido do Git Bash (bash.exe).",
+        "title": "Selecionar executável do Git Bash"
+      },
+      "placeholder": "Selecione o caminho do bash.exe",
+      "success": "Git Bash detectado com sucesso!",
+      "tooltip": "O Git Bash é necessário para executar agentes no Windows. Instale-o a partir de git-scm.com, caso não esteja disponível."
     },
     "input": {
       "placeholder": "Digite sua mensagem aqui, envie com {{key}} - @ selecionar caminho, / selecionar comando"
@@ -399,6 +420,9 @@
     },
     "delete": {
       "content": "Excluir o assistente removerá todos os tópicos e arquivos sob esse assistente. Tem certeza de que deseja continuar?",
+      "error": {
+        "remain_one": "Não é permitido apagar o último assistente."
+      },
       "title": "Excluir Assistente"
     },
     "edit": {
@@ -455,6 +479,7 @@
         "button": "Importar",
         "error": {
           "fetch_failed": "Falha ao obter dados do URL",
+          "file_required": "Por favor, selecione um arquivo primeiro",
           "invalid_format": "Formato de assistente inválido: campos obrigatórios em falta",
           "url_required": "Por favor insere um URL"
         },
@@ -468,6 +493,17 @@
         "url_placeholder": "Inserir URL JSON"
       },
       "manage": {
+        "batch_delete": {
+          "button": "Exclusão em Lote",
+          "confirm": "Tem certeza de que deseja excluir os {{count}} assistentes selecionados?"
+        },
+        "batch_export": {
+          "button": "Exportar"
+        },
+        "mode": {
+          "manage": "Gerenciar",
+          "sort": "Ordenar"
+        },
         "title": "Gerir assistentes"
       },
       "my_agents": "Os meus assistentes",
@@ -515,13 +551,23 @@
       "more": "Configurações do Assistente",
       "prompt": "Configurações de Prompt",
       "reasoning_effort": {
+        "auto": "Automóvel",
+        "auto_description": "Determinar flexivelmente o esforço de raciocínio",
         "default": "Padrão",
+        "default_description": "Depender do comportamento padrão do modelo, sem qualquer configuração.",
         "high": "Longo",
+        "high_description": "Raciocínio de alto nível",
         "label": "Comprimento da Cadeia de Raciocínio",
         "low": "Curto",
+        "low_description": "Raciocínio de baixo nível",
         "medium": "Médio",
+        "medium_description": "Raciocínio de nível médio",
         "minimal": "mínimo",
-        "off": "Desligado"
+        "minimal_description": "Raciocínio mínimo",
+        "off": "Desligado",
+        "off_description": "Desabilitar raciocínio",
+        "xhigh": "Extra Alta",
+        "xhigh_description": "Raciocínio de altíssimo nível"
       },
       "regular_phrases": {
         "add": "Adicionar Frase",
@@ -1001,6 +1047,29 @@
         "yuque": "Exportar para Yuque"
       },
       "list": "Lista de tópicos",
+      "manage": {
+        "clear_selection": "Limpar Seleção",
+        "delete": {
+          "confirm": {
+            "content": "Tem certeza de que deseja excluir {{count}} tópico(s) selecionado(s)? Esta ação não pode ser desfeita.",
+            "title": "Excluir Tópicos"
+          },
+          "success": "Excluído(s) {{count}} tópico(s)"
+        },
+        "deselect_all": "Desmarcar Todos",
+        "error": {
+          "at_least_one": "Pelo menos um tópico deve ser mantido"
+        },
+        "move": {
+          "button": "Mover",
+          "placeholder": "Selecionar assistente de destino",
+          "success": "Movido(s) {{count}} tópico(s)"
+        },
+        "pinned": "Tópicos Fixados",
+        "selected_count": "{{count}} selecionado",
+        "title": "Gerenciar Tópicos",
+        "unpinned": "Tópicos Desafixados"
+      },
       "move_to": "Mover para",
       "new": "Começar nova conversa",
       "pin": "Fixar tópico",
@@ -1011,6 +1080,10 @@
         "label": "Prompt do tópico",
         "tips": "Prompt do tópico: fornecer prompts adicionais para o tópico atual"
       },
+      "search": {
+        "placeholder": "Pesquisar tópicos...",
+        "title": "Pesquisar"
+      },
       "title": "Tópicos",
       "unpin": "Desfixar"
     },
@@ -1182,6 +1255,7 @@
     "saved": "Guardado",
     "search": "Pesquisar",
     "select": "Selecionar",
+    "select_all": "Selecionar Tudo",
     "selected": "Selecionado",
     "selectedItems": "{{count}} itens selecionados",
     "selectedMessages": "{{count}} mensagens selecionadas",
@@ -1194,11 +1268,13 @@
       }
     },
     "stop": "Parar",
+    "subscribe": "Subscrever",
     "success": "Sucesso",
     "swap": "Trocar",
     "topics": "Tópicos",
     "unknown": "Desconhecido",
     "unnamed": "Sem nome",
+    "unsubscribe": "Cancelar inscrição",
     "update_success": "Atualização bem-sucedida",
     "upload_files": "Carregar arquivo",
     "warning": "Aviso",
@@ -2125,6 +2201,7 @@
     "collapse": "[minimizar]",
     "content_placeholder": "Introduza o conteúdo da nota...",
     "copyContent": "copiar conteúdo",
+    "crossPlatformRestoreWarning": "Configuração multiplataforma restaurada, mas o diretório de notas está vazio. Por favor, copie seus arquivos de nota para: {{path}}",
     "delete": "eliminar",
     "delete_confirm": "Tem a certeza de que deseja eliminar este {{type}}?",
     "delete_folder_confirm": "Tem a certeza de que deseja eliminar a pasta \"{{name}}\" e todos os seus conteúdos?",
@@ -2226,11 +2303,11 @@
     "untitled_note": "Nota sem título",
     "upload": "[to be translated]:Upload",
     "upload_failed": "Falha ao carregar a nota",
-    "upload_files": "[to be translated]:Upload Files",
-    "upload_folder": "[to be translated]:Upload Folder",
+    "upload_files": "Carregar Ficheiros",
+    "upload_folder": "Carregar Pasta",
     "upload_success": "Nota carregada com sucesso",
     "uploading": "[to be translated]:Uploading",
-    "uploading_files": "[to be translated]:Uploading {{count}} files..."
+    "uploading_files": "A enviar {{count}} ficheiros..."
   },
   "notification": {
     "assistant": "Resposta do assistente",
@@ -2521,7 +2598,8 @@
   },
   "preview": {
     "copy": {
-      "image": "Copiar como imagem"
+      "image": "Copiar como imagem",
+      "src": "Copiar Origem da Imagem"
     },
     "dialog": "Abrir janela de pré-visualização",
     "label": "Pré-visualização",
@@ -2575,6 +2653,7 @@
     "lanyun": "Lanyun Tecnologia",
     "lmstudio": "Estúdio LM",
     "longcat": "Totoro",
+    "mimo": "Xiaomi MiMo",
     "minimax": "Minimax",
     "mistral": "Mistral",
     "modelscope": "ModelScope MôDá",
@@ -3093,6 +3172,7 @@
         "label": "Dados do aplicativo",
         "migration_title": "Migração de Dados",
         "new_path": "Novo Caminho",
+        "open": "Diretório Aberto",
         "original_path": "Caminho Original",
         "path_change_failed": "Falha ao alterar o diretório de dados",
         "path_changed_without_copy": "O caminho foi alterado com sucesso",
@@ -3163,24 +3243,43 @@
         },
         "content": "Exportar parte dos dados, incluindo registros de conversas e configurações. Observe que o processo de backup pode demorar um pouco; agradecemos sua paciência.",
         "lan": {
-          "auto_close_tip": "Fechando automaticamente em {{seconds}} segundos...",
-          "confirm_close_message": "Transferência de arquivo em andamento. Fechar irá interromper a transferência. Tem certeza de que deseja forçar o fechamento?",
-          "confirm_close_title": "Confirmar Fechamento",
           "connected": "Conectado",
           "connection_failed": "Falha na conexão",
           "content": "Certifique-se de que o computador e o telefone estejam na mesma rede para usar a transferência via LAN. Abra o aplicativo Cherry Studio e escaneie este código QR.",
+          "device_list_title": "Dispositivos de rede local",
+          "discovered_devices": "Dispositivos descobertos",
           "error": {
+            "file_too_large": "Arquivo muito grande, máximo de 500MB suportado",
             "init_failed": "Falha na inicialização",
+            "invalid_file_type": "Apenas arquivos ZIP são suportados",
             "no_file": "Nenhum arquivo selecionado",
             "no_ip": "Incapaz de obter endereço IP",
+            "not_connected": "Por favor, complete primeiro o handshake",
             "send_failed": "Falha ao enviar arquivo"
           },
-          "force_close": "Forçar Fechamento",
-          "generating_qr": "Gerando código QR...",
-          "noZipSelected": "Nenhum arquivo de compressão selecionado",
-          "scan_qr": "Por favor, escaneie o código QR com o seu telefone",
-          "selectZip": "Selecionar arquivo compactado",
-          "sendZip": "Iniciar recuperação de dados",
+          "file_transfer": {
+            "cancelled": "Transferência cancelada",
+            "failed": "Falha na transferência de arquivo: {{message}}",
+            "progress": "Enviando... {{progress}}%",
+            "success": "Arquivo enviado com sucesso"
+          },
+          "handshake": {
+            "button": "Aperto de mão",
+            "failed": "Falha no handshake: {{message}}",
+            "in_progress": "Aperto de mãos...",
+            "success": "Handshake concluído com {{device}}",
+            "test_message_received": "Recebido pong de {{device}}",
+            "test_message_sent": "Enviou payload de teste hello world"
+          },
+          "idle_hint": "Digitalização pausada. Inicie a digitalização para encontrar pares do Cherry Studio na sua rede local.",
+          "ip_addresses": "Endereços IP",
+          "last_seen": "Visto pela última vez às {{time}}",
+          "metadata": "Metadados",
+          "no_connection_warning": "Por favor, abra a Transferência LAN no Cherry Studio mobile",
+          "no_devices": "Ainda não foram encontrados pares de LAN.",
+          "scan_devices": "Escaneie dispositivos",
+          "scanning_hint": "Escaneando sua rede local por pares do Cherry Studio...",
+          "send_file": "Enviar Arquivo",
           "status": {
             "completed": "Transferência concluída",
             "connected": "Conectado",
@@ -3189,9 +3288,11 @@
             "error": "Erro de conexão",
             "initializing": "Inicializando conexão...",
             "preparing": "Preparando transferência...",
-            "sending": "Transferindo {{progress}}%",
-            "waiting_qr_scan": "Por favor, escaneie o código QR para conectar"
+            "sending": "Transferindo {{progress}}%"
           },
+          "status_badge_idle": "Ocioso",
+          "status_badge_scanning": "Digitalização",
+          "stop_scan": "Parar digitalização",
           "title": "transmissão de rede local",
           "transfer_progress": "Progresso da transferência"
         },
@@ -3863,6 +3964,7 @@
       "builtinServers": "Servidores integrados",
       "builtinServersDescriptions": {
         "brave_search": "uma implementação de servidor MCP integrada com a API de pesquisa Brave, fornecendo funcionalidades de pesquisa web e local. Requer a configuração da variável de ambiente BRAVE_API_KEY",
+        "browser": "Controla uma janela Electron headless via Chrome DevTools Protocol. Ferramentas: abrir URL, executar JS de linha única, reiniciar sessão.",
         "didi_mcp": "Servidor DiDi MCP que fornece serviços de transporte incluindo pesquisa de mapas, estimativa de preços, gestão de pedidos e rastreamento de motoristas. Disponível apenas na China Continental. Requer configuração da variável de ambiente DIDI_API_KEY",
         "dify_knowledge": "Implementação do servidor MCP do Dify, que fornece uma API simples para interagir com o Dify. Requer a configuração da chave Dify",
         "fetch": "servidor MCP para obter o conteúdo da página web do URL",
@@ -3870,6 +3972,7 @@
         "mcp_auto_install": "Instalação automática do serviço MCP (beta)",
         "memory": "Implementação base de memória persistente baseada em grafos de conhecimento locais. Isso permite que o modelo lembre informações relevantes do utilizador entre diferentes conversas. É necessário configurar a variável de ambiente MEMORY_FILE_PATH.",
         "no": "sem descrição",
+        "nowledge_mem": "Requer a aplicação Nowledge Mem em execução localmente. Mantém conversas de IA, ferramentas, notas, agentes e ficheiros numa memória privada no seu computador. Transfira de https://mem.nowledge.co/",
         "python": "Executar código Python num ambiente sandbox seguro. Utilizar Pyodide para executar Python, suportando a maioria das bibliotecas padrão e pacotes de computação científica",
         "sequentialthinking": "Uma implementação de servidor MCP que fornece ferramentas para resolução dinâmica e reflexiva de problemas através de um processo de pensamento estruturado"
       },
@@ -3915,6 +4018,7 @@
       "jsonSaveError": "Falha ao salvar configuração JSON",
       "jsonSaveSuccess": "Configuração JSON salva com sucesso",
       "logoUrl": "URL do Logotipo",
+      "logs": "Registros",
       "longRunning": "Modo de execução prolongada",
       "longRunningTooltip": "Quando ativado, o servidor suporta tarefas de longa duração, redefinindo o temporizador de tempo limite ao receber notificações de progresso e estendendo o tempo máximo de tempo limite para 10 minutos.",
       "marketplaces": "Mercados",
@@ -3934,6 +4038,7 @@
       "name": "Nome",
       "newServer": "Servidor MCP",
       "noDescriptionAvailable": "Nenhuma descrição disponível no momento",
+      "noLogs": "Ainda sem registos",
       "noServers": "Nenhum servidor configurado",
       "not_support": "Modelo Não Suportado",
       "npx_list": {
@@ -4662,6 +4767,12 @@
       },
       "title": "Configurações de Ferramentas",
       "websearch": {
+        "api_key_required": {
+          "content": "{{provider}} requer uma chave de API para funcionar. Você gostaria de configurá-la agora?",
+          "ok": "Configurar",
+          "title": "Chave de API Necessária"
+        },
+        "api_providers": "Provedores de API",
         "apikey": "Chave API",
         "blacklist": "Lista Negra",
         "blacklist_description": "Os resultados dos seguintes sites não aparecerão nos resultados de pesquisa",
@@ -4703,7 +4814,15 @@
         },
         "content_limit": "Limite de comprimento do conteúdo",
         "content_limit_tooltip": "Limita o comprimento do conteúdo dos resultados de pesquisa; o conteúdo excedente será truncado",
+        "default_provider": "Provedor Padrão",
         "free": "Grátis",
+        "is_default": "Padrão",
+        "local_provider": {
+          "hint": "Faça login no site para obter melhores resultados de pesquisa e personalizar suas configurações de busca.",
+          "open_settings": "Abrir Configurações do {{provider}}",
+          "settings": "Configurações de Pesquisa Local"
+        },
+        "local_providers": "Fornecedores Locais",
         "no_provider_selected": "Por favor, selecione um provedor de pesquisa antes de verificar",
         "overwrite": "Substituir busca do provedor",
         "overwrite_tooltip": "Força o uso do provedor de pesquisa em vez do modelo de linguagem grande",
@@ -4714,6 +4833,7 @@
         "search_provider": "Provedor de pesquisa",
         "search_provider_placeholder": "Selecione um provedor de pesquisa",
         "search_with_time": "Pesquisar com data",
+        "set_as_default": "Definir como Padrão",
         "subscribe": "Assinatura de lista negra",
         "subscribe_add": "Adicionar assinatura",
         "subscribe_add_failed": "Falha ao adicionar a fonte de subscrição",
diff --git a/src/renderer/src/i18n/translate/ro-ro.json b/src/renderer/src/i18n/translate/ro-ro.json
new file mode 100644
index 0000000000..f95cb7bdeb
--- /dev/null
+++ b/src/renderer/src/i18n/translate/ro-ro.json
@@ -0,0 +1,5102 @@
+{
+  "agent": {
+    "add": {
+      "description": "Gestionează sarcini complexe cu diverse instrumente",
+      "error": {
+        "failed": "Nu s-a putut adăuga un agent",
+        "invalid_agent": "Agent invalid"
+      },
+      "model": {
+        "tooltip": "Momentan, doar modelele care acceptă endpoint-uri Anthropic sunt disponibile pentru funcția Agent."
+      },
+      "title": "Adaugă agent",
+      "type": {
+        "placeholder": "Selectează un tip de agent"
+      }
+    },
+    "delete": {
+      "content": "Ștergerea agentului va opri forțat și va șterge toate sesiunile asociate cu agentul. Ești sigur?",
+      "error": {
+        "failed": "Nu s-a putut șterge agentul"
+      },
+      "title": "Șterge agentul"
+    },
+    "edit": {
+      "title": "Editează agentul"
+    },
+    "get": {
+      "error": {
+        "failed": "Nu s-a putut obține agentul.",
+        "null_id": "ID-ul agentului este nul."
+      }
+    },
+    "gitBash": {
+      "autoDetected": "Se folosește Git Bash detectat automat",
+      "autoDiscoveredHint": "Descoperit automat",
+      "clear": {
+        "button": "Șterge calea personalizată"
+      },
+      "customPath": "Se folosește calea personalizată: {{path}}",
+      "error": {
+        "description": "Git Bash este necesar pentru a rula agenți pe Windows. Agentul nu poate funcționa fără acesta. Te rugăm să instalezi Git pentru Windows de la",
+        "recheck": "Verifică din nou instalarea Git Bash",
+        "required": "Calea Git Bash este necesară pe Windows",
+        "title": "Git Bash este necesar"
+      },
+      "found": {
+        "title": "Git Bash configurat"
+      },
+      "notFound": "Git Bash nu a fost găsit. Te rugăm să-l instalezi mai întâi.",
+      "pick": {
+        "button": "Selectează calea Git Bash",
+        "failed": "Nu s-a putut seta calea Git Bash",
+        "invalidPath": "Fișierul selectat nu este un executabil Git Bash valid (bash.exe).",
+        "title": "Selectează executabilul Git Bash"
+      },
+      "placeholder": "Selectează calea bash.exe",
+      "success": "Git Bash a fost detectat cu succes!",
+      "tooltip": "Git Bash este necesar pentru a rula agenți pe Windows. Instalează-l de pe git-scm.com dacă nu este disponibil."
+    },
+    "input": {
+      "placeholder": "Introdu mesajul aici, trimite cu {{key}} - @ selectează calea, / selectează comanda"
+    },
+    "list": {
+      "error": {
+        "failed": "Nu s-a putut afișa lista de agenți."
+      }
+    },
+    "server": {
+      "error": {
+        "not_running": "Serverul API este activat, dar nu rulează corect."
+      }
+    },
+    "session": {
+      "accessible_paths": {
+        "add": "Adaugă director",
+        "duplicate": "Acest director este deja inclus.",
+        "empty": "Selectează cel puțin un director pe care agentul îl poate accesa.",
+        "error": {
+          "at_least_one": "Te rugăm să selectezi cel puțin un director accesibil."
+        },
+        "label": "Directoare accesibile",
+        "select_failed": "Nu s-a putut selecta directorul."
+      },
+      "add": {
+        "title": "Adaugă o sesiune"
+      },
+      "allowed_tools": {
+        "empty": "Niciun instrument disponibil pentru acest agent.",
+        "helper": "Instrumentele pre-aprobate rulează fără aprobare manuală. Instrumentele neselectate necesită aprobare înainte de utilizare.",
+        "label": "Instrumente pre-aprobate",
+        "placeholder": "Selectează instrumente pre-aprobate"
+      },
+      "create": {
+        "error": {
+          "failed": "Nu s-a putut adăuga o sesiune"
+        }
+      },
+      "delete": {
+        "content": "Ești sigur că vrei să ștergi această sesiune?",
+        "error": {
+          "failed": "Nu s-a putut șterge sesiunea",
+          "last": "Trebuie păstrată cel puțin o sesiune"
+        },
+        "title": "Șterge sesiunea"
+      },
+      "edit": {
+        "title": "Editează sesiunea"
+      },
+      "get": {
+        "error": {
+          "failed": "Nu s-a putut obține sesiunea",
+          "null_id": "ID-ul sesiunii este nul"
+        }
+      },
+      "label_one": "Sesiune",
+      "label_other": "Sesiuni",
+      "update": {
+        "error": {
+          "failed": "Nu s-a putut actualiza sesiunea"
+        }
+      }
+    },
+    "settings": {
+      "advance": {
+        "maxTurns": {
+          "description": "Definește câte cicluri cerere/răspuns poate finaliza automat agentul.",
+          "helper": "Valorile mai mari permit rulări autonome mai lungi; valorile mai mici mențin sesiunile scurte.",
+          "label": "Limită de schimburi în conversație"
+        },
+        "permissionMode": {
+          "description": "Controlează modul în care agentul gestionează acțiunile care necesită aprobare.",
+          "label": "Mod de permisiune",
+          "options": {
+            "acceptEdits": "Acceptă automat editările",
+            "bypassPermissions": "Omite verificările de permisiune",
+            "default": "Implicit (întreabă înainte de a continua)",
+            "plan": "Mod de planificare (necesită aprobarea planului)"
+          },
+          "placeholder": "Alege un comportament pentru permisiuni"
+        },
+        "title": "Setări avansate"
+      },
+      "essential": "Setări esențiale",
+      "plugins": {
+        "available": {
+          "title": "Pluginuri disponibile"
+        },
+        "confirm": {
+          "uninstall": "Ești sigur că vrei să dezinstalezi acest plugin?"
+        },
+        "empty": {
+          "available": "Nu s-au găsit pluginuri care să corespundă filtrelor tale. Încearcă să ajustezi căutarea sau filtrele de categorie."
+        },
+        "error": {
+          "install": "Nu s-a putut instala pluginul",
+          "load": "Nu s-au putut încărca pluginurile",
+          "uninstall": "Nu s-a putut dezinstala pluginul"
+        },
+        "filter": {
+          "all": "Toate categoriile"
+        },
+        "install": "Instalează",
+        "installed": {
+          "empty": "Niciun plugin instalat încă. Răsfoiește pluginurile disponibile pentru a începe.",
+          "title": "Pluginuri instalate"
+        },
+        "installing": "Se instalează...",
+        "results": "{{count}} plugin(uri) găsit(e)",
+        "search": {
+          "placeholder": "Caută pluginuri..."
+        },
+        "success": {
+          "install": "Plugin instalat cu succes",
+          "uninstall": "Plugin dezinstalat cu succes"
+        },
+        "tab": "Pluginuri",
+        "type": {
+          "agent": "Agent",
+          "agents": "Agenți",
+          "all": "Toate",
+          "command": "Comandă",
+          "commands": "Comenzi",
+          "skills": "Abilități"
+        },
+        "uninstall": "Dezinstalează",
+        "uninstalling": "Se dezinstalează..."
+      },
+      "prompt": "Setări prompt",
+      "tooling": {
+        "mcp": {
+          "description": "Conectează servere MCP pentru a debloca instrumente suplimentare pe care le poți aproba mai sus.",
+          "empty": "Nu au fost detectate servere MCP. Adaugă unul din pagina de setări MCP.",
+          "manageHint": "Ai nevoie de configurare avansată? Vizitează Setări → Servere MCP.",
+          "toggle": "Comută {{name}}"
+        },
+        "permissionMode": {
+          "acceptEdits": {
+            "behavior": "Pre-aprobă instrumentele de sistem de fișiere de încredere, astfel încât editările să ruleze imediat.",
+            "description": "Editările de fișiere și operațiunile sistemului de fișiere sunt aprobate automat.",
+            "title": "Acceptă automat editările de fișiere"
+          },
+          "bypassPermissions": {
+            "behavior": "Fiecare instrument este pre-aprobat automat.",
+            "description": "Toate solicitările de permisiune sunt omise — folosește cu precauție.",
+            "title": "Omite verificările de permisiune",
+            "warning": "Folosește cu precauție — toate instrumentele vor rula fără a cere aprobare."
+          },
+          "confirmChange": {
+            "description": "Schimbarea modurilor actualizează instrumentele aprobate automat.",
+            "title": "Schimbi modul de permisiune?"
+          },
+          "default": {
+            "behavior": "Instrumentele doar-pentru-citire sunt pre-aprobate automat.",
+            "description": "Instrumentele doar-pentru-citire sunt pre-aprobate; orice altceva necesită încă permisiune.",
+            "title": "Implicit (întreabă înainte de a continua)"
+          },
+          "helper": "Alege cum gestionează agentul aprobările pentru instrumente.",
+          "placeholder": "Selectează modul de permisiune",
+          "plan": {
+            "behavior": "Setările implicite doar-pentru-citire sunt pre-aprobate, în timp ce execuția rămâne dezactivată.",
+            "description": "Partajează setul implicit de instrumente doar-pentru-citire, dar prezintă un plan înainte de execuție.",
+            "title": "Mod de planificare"
+          },
+          "title": "Mod de permisiune"
+        },
+        "preapproved": {
+          "autoBadge": "Adăugat de mod",
+          "autoDescription": "Acest instrument este aprobat automat de modul de permisiune curent.",
+          "empty": "Niciun instrument nu corespunde filtrelor tale.",
+          "mcpBadge": "Instrument MCP",
+          "requiresApproval": "Necesită aprobare când este dezactivat",
+          "search": "Caută instrumente",
+          "toggle": "Comută {{name}}",
+          "warning": {
+            "description": "Activează doar instrumentele în care ai încredere. Setările implicite ale modului sunt evidențiate automat.",
+            "title": "Instrumentele pre-aprobate rulează fără revizuire manuală."
+          }
+        },
+        "review": {
+          "autoTools": "Auto: {{count}}",
+          "customTools": "Personalizat: {{count}}",
+          "helper": "Modificările se salvează automat. Ajustează pașii de mai sus oricând pentru a regla fin permisiunile.",
+          "mcp": "MCP: {{count}}",
+          "mode": "Mod: {{mode}}"
+        },
+        "steps": {
+          "mcp": {
+            "title": "Servere MCP"
+          },
+          "permissionMode": {
+            "title": "Pasul 1 · Mod de permisiune"
+          },
+          "preapproved": {
+            "title": "Pasul 2 · Instrumente pre-aprobate"
+          },
+          "review": {
+            "title": "Pasul 3 · Revizuire"
+          }
+        },
+        "tab": "Instrumente și permisiuni"
+      },
+      "tools": {
+        "approved": "aprobat",
+        "caution": "Instrumentele pre-aprobate ocolesc revizuirea umană. Activează doar instrumente de încredere.",
+        "description": "Alege ce instrumente pot rula fără aprobare manuală.",
+        "requiresPermission": "Necesită permisiune când nu este pre-aprobat.",
+        "tab": "Instrumente pre-aprobate",
+        "title": "Instrumente pre-aprobate",
+        "toggle": "{{defaultValue}}"
+      }
+    },
+    "toolPermission": {
+      "aria": {
+        "allowRequest": "Permite cererea instrumentului",
+        "denyRequest": "Refuză cererea instrumentului",
+        "hideDetails": "Ascunde detaliile instrumentului",
+        "runWithOptions": "Rulează cu opțiuni suplimentare",
+        "showDetails": "Arată detaliile instrumentului"
+      },
+      "button": {
+        "cancel": "Anulează",
+        "run": "Rulează"
+      },
+      "confirmation": "Ești sigur că vrei să rulezi acest instrument Claude?",
+      "defaultDenyMessage": "Utilizatorul a refuzat permisiunea pentru acest instrument.",
+      "defaultDescription": "Execută cod sau acțiuni de sistem în mediul tău. Asigură-te că comanda pare sigură înainte de a o rula.",
+      "error": {
+        "sendFailed": "Nu s-a putut trimite decizia ta. Te rugăm să încerci din nou."
+      },
+      "executing": "Se execută...",
+      "expired": "Expirat",
+      "inputPreview": "Previzualizare intrare instrument",
+      "pending": "În așteptare ({{seconds}}s)",
+      "permissionExpired": "Cererea de permisiune a expirat. Se așteaptă instrucțiuni noi...",
+      "requiresElevatedPermissions": "Acest instrument necesită permisiuni elevate.",
+      "suggestion": {
+        "permissionUpdateMultiple": "Aprobarea poate actualiza permisiunile mai multor sesiuni dacă ai ales să permiți întotdeauna acest instrument.",
+        "permissionUpdateSingle": "Aprobarea poate actualiza permisiunile sesiunii tale dacă ai ales să permiți întotdeauna acest instrument."
+      },
+      "toast": {
+        "denied": "Cererea instrumentului a fost refuzată.",
+        "timeout": "Cererea instrumentului a expirat înainte de a primi aprobare."
+      },
+      "toolPendingFallback": "Instrument",
+      "waiting": "Se așteaptă decizia privind permisiunea instrumentului..."
+    },
+    "type": {
+      "label": "Tip agent",
+      "unknown": "Tip necunoscut"
+    },
+    "update": {
+      "error": {
+        "failed": "Nu s-a putut actualiza agentul"
+      }
+    },
+    "warning": {
+      "enable_server": "Activează serverul API pentru a folosi agenți."
+    }
+  },
+  "apiServer": {
+    "actions": {
+      "copy": "Copiază",
+      "regenerate": "Regenerează",
+      "restart": {
+        "button": "Repornește",
+        "tooltip": "Repornește serverul"
+      },
+      "start": "Pornește",
+      "stop": "Oprește"
+    },
+    "authHeader": {
+      "title": "Header de autorizare"
+    },
+    "authHeaderText": "Utilizează în header-ul Authorization:",
+    "configuration": "Configurare",
+    "description": "Expune capacitățile AI ale Cherry Studio prin API-uri HTTP compatibile cu OpenAI",
+    "documentation": {
+      "title": "Documentație API"
+    },
+    "fields": {
+      "apiKey": {
+        "copyTooltip": "Copiază cheia API",
+        "description": "Token de autentificare securizat pentru acces API",
+        "label": "Cheie API",
+        "placeholder": "Cheia API va fi generată automat"
+      },
+      "port": {
+        "description": "Numărul portului TCP pentru serverul HTTP (1000-65535)",
+        "helpText": "Oprește serverul pentru a schimba portul",
+        "label": "Port"
+      },
+      "url": {
+        "copyTooltip": "Copiază URL-ul",
+        "label": "URL"
+      }
+    },
+    "messages": {
+      "apiKeyCopied": "Cheia API a fost copiată în clipboard",
+      "apiKeyRegenerated": "Cheia API a fost regenerată",
+      "notEnabled": "Serverul API nu este activat.",
+      "operationFailed": "Operațiunea serverului API a eșuat: ",
+      "restartError": "Nu s-a putut reporni serverul API: ",
+      "restartFailed": "Repornirea serverului API a eșuat: ",
+      "restartSuccess": "Serverul API a repornit cu succes",
+      "startError": "Nu s-a putut porni serverul API: ",
+      "startSuccess": "Serverul API a pornit cu succes",
+      "stopError": "Nu s-a putut opri serverul API: ",
+      "stopSuccess": "Serverul API s-a oprit cu succes",
+      "urlCopied": "URL-ul serverului a fost copiat în clipboard"
+    },
+    "status": {
+      "running": "Rulează",
+      "stopped": "Oprit"
+    },
+    "title": "Server API"
+  },
+  "appMenu": {
+    "about": "Despre",
+    "close": "Închide fereastra",
+    "copy": "Copiază",
+    "cut": "Taie",
+    "delete": "Șterge",
+    "documentation": "Documentație",
+    "edit": "Editare",
+    "feedback": "Feedback",
+    "file": "Fișier",
+    "forceReload": "Reîncărcare forțată",
+    "front": "Adu toate în față",
+    "help": "Ajutor",
+    "hide": "Ascunde",
+    "hideOthers": "Ascunde celelalte",
+    "minimize": "Minimizează",
+    "paste": "Lipește",
+    "quit": "Ieșire",
+    "redo": "Refă",
+    "releases": "Lansări",
+    "reload": "Reîncarcă",
+    "resetZoom": "Dimensiune reală",
+    "selectAll": "Selectează tot",
+    "services": "Servicii",
+    "toggleDevTools": "Comută instrumentele pentru dezvoltatori",
+    "toggleFullscreen": "Comută ecranul complet",
+    "undo": "Anulează",
+    "unhide": "Arată toate",
+    "view": "Vizualizare",
+    "website": "Site web",
+    "window": "Fereastră",
+    "zoom": "Zoom",
+    "zoomIn": "Mărește",
+    "zoomOut": "Micșorează"
+  },
+  "assistants": {
+    "abbr": "Asistenți",
+    "clear": {
+      "content": "Golirea subiectului va șterge toate subiectele și fișierele din asistent. Ești sigur că vrei să continui?",
+      "title": "Șterge subiectele"
+    },
+    "copy": {
+      "title": "Copiază asistentul"
+    },
+    "delete": {
+      "content": "Ștergerea unui asistent va șterge toate subiectele și fișierele din cadrul asistentului. Ești sigur că vrei să-l ștergi?",
+      "error": {
+        "remain_one": "Nu este permisă ștergerea ultimului"
+      },
+      "title": "Șterge asistentul"
+    },
+    "edit": {
+      "title": "Editează asistentul"
+    },
+    "icon": {
+      "type": "Pictogramă asistent"
+    },
+    "list": {
+      "showByList": "Vizualizare listă",
+      "showByTags": "Vizualizare etichete"
+    },
+    "presets": {
+      "add": {
+        "button": "Adaugă la asistent",
+        "knowledge_base": {
+          "label": "Bază de cunoștințe",
+          "placeholder": "Selectează baza de cunoștințe"
+        },
+        "name": {
+          "label": "Nume",
+          "placeholder": "Introdu numele"
+        },
+        "prompt": {
+          "label": "Prompt",
+          "placeholder": "Introdu promptul",
+          "variables": {
+            "tip": {
+              "content": "{{date}}:\tDată\n{{time}}:\tOră\n{{datetime}}:\tDată și oră\n{{system}}:\tSistem de operare\n{{arch}}:\tArhitectură CPU\n{{language}}:\tLimbă\n{{model_name}}:\tNume model\n{{username}}:\tNume utilizator",
+              "title": "Variabile disponibile"
+            }
+          }
+        },
+        "title": "Creează asistent",
+        "unsaved_changes_warning": "Ai modificări nesalvate. Ești sigur că vrei să închizi?"
+      },
+      "delete": {
+        "popup": {
+          "content": "Ești sigur că vrei să ștergi acest asistent?"
+        }
+      },
+      "edit": {
+        "model": {
+          "select": {
+            "title": "Selectează modelul"
+          }
+        },
+        "title": "Editează asistentul"
+      },
+      "export": {
+        "agent": "Exportă asistentul"
+      },
+      "import": {
+        "button": "Importă",
+        "error": {
+          "fetch_failed": "Nu s-a putut prelua de la URL",
+          "file_required": "Te rugăm să selectezi mai întâi un fișier",
+          "invalid_format": "Format asistent invalid: lipsesc câmpuri obligatorii",
+          "url_required": "Te rugăm să introduci un URL"
+        },
+        "file_filter": "Fișiere JSON",
+        "select_file": "Selectează fișierul",
+        "title": "Importă din exterior",
+        "type": {
+          "file": "Fișier",
+          "url": "URL"
+        },
+        "url_placeholder": "Introdu URL JSON"
+      },
+      "manage": {
+        "batch_delete": {
+          "button": "Șterge",
+          "confirm": "Ești sigur că vrei să ștergi cei {{count}} asistenți selectați?"
+        },
+        "batch_export": {
+          "button": "Exportă"
+        },
+        "mode": {
+          "manage": "Gestionează",
+          "sort": "Sortează"
+        },
+        "title": "Gestionează asistenții"
+      },
+      "my_agents": "Asistenții mei",
+      "search": {
+        "no_results": "Niciun rezultat găsit"
+      },
+      "settings": {
+        "title": "Setare asistent"
+      },
+      "sorting": {
+        "title": "Sortare"
+      },
+      "tag": {
+        "agent": "Asistent",
+        "default": "Implicit",
+        "new": "Nou",
+        "system": "Sistem"
+      },
+      "title": "Bibliotecă de asistenți"
+    },
+    "save": {
+      "success": "Salvat cu succes",
+      "title": "Salvează în biblioteca de asistenți"
+    },
+    "search": "Caută asistenți...",
+    "settings": {
+      "default_model": "Model implicit",
+      "knowledge_base": {
+        "label": "Setări bază de cunoștințe",
+        "recognition": {
+          "label": "Folosește baza de cunoștințe",
+          "off": "Forțează căutarea",
+          "on": "Recunoaștere intenție",
+          "tip": "Asistentul va folosi capacitatea de recunoaștere a intenției modelului mare pentru a determina dacă să folosească baza de cunoștințe pentru a răspunde. Această funcție depinde de capacitățile modelului"
+        }
+      },
+      "mcp": {
+        "description": "Servere MCP activate implicit",
+        "enableFirst": "Activează mai întâi acest server în setările MCP",
+        "label": "Servere MCP",
+        "noServersAvailable": "Nu există servere MCP disponibile. Adaugă servere în setări",
+        "title": "Setări MCP"
+      },
+      "model": "Setări model",
+      "more": "Setări asistent",
+      "prompt": "Setări prompt",
+      "reasoning_effort": {
+        "auto": "Auto",
+        "auto_description": "Determină flexibil efortul de raționament",
+        "default": "Implicit",
+        "default_description": "Depinde de comportamentul implicit al modelului, fără nicio configurare.",
+        "high": "Ridicat",
+        "high_description": "Raționament de nivel ridicat",
+        "label": "Efort de raționament",
+        "low": "Scăzut",
+        "low_description": "Raționament de nivel scăzut",
+        "medium": "Mediu",
+        "medium_description": "Raționament de nivel mediu",
+        "minimal": "Minim",
+        "minimal_description": "Raționament minim",
+        "off": "Oprit",
+        "off_description": "Dezactivează raționamentul",
+        "xhigh": "Extra ridicat",
+        "xhigh_description": "Raționament de nivel extra ridicat"
+      },
+      "regular_phrases": {
+        "add": "Adaugă expresie",
+        "contentLabel": "Conținut",
+        "contentPlaceholder": "Te rugăm să introduci conținutul expresiei; poți folosi variabile și poți apăsa Tab pentru a localiza rapid variabila de modificat. De exemplu: \nAjută-mă să planific o rută de la ${from} până la ${to} și trimite-o la ${email}.",
+        "delete": "Șterge expresia",
+        "deleteConfirm": "Ești sigur că vrei să ștergi această expresie?",
+        "edit": "Editează expresia",
+        "title": "Expresie uzuală",
+        "titleLabel": "Titlu",
+        "titlePlaceholder": "Introdu titlul"
+      },
+      "title": "Setări asistent",
+      "tool_use_mode": {
+        "function": "Funcție",
+        "label": "Mod utilizare instrumente",
+        "prompt": "Prompt"
+      }
+    },
+    "tags": {
+      "add": "Adaugă etichetă",
+      "delete": "Șterge eticheta",
+      "deleteConfirm": "Ești sigur că vrei să ștergi această etichetă?",
+      "manage": "Gestionare etichete",
+      "modify": "Modifică eticheta",
+      "none": "Fără etichete",
+      "settings": {
+        "title": "Setări etichete"
+      },
+      "untagged": "Neetichetat"
+    },
+    "title": "Asistenți"
+  },
+  "auth": {
+    "error": "Obținerea automată a cheii API a eșuat, te rugăm să o obții manual",
+    "get_key": "Obține",
+    "get_key_success": "Cheia API a fost obținută automat cu succes",
+    "login": "Autentificare",
+    "oauth_button": "Autentificare cu {{provider}}"
+  },
+  "backup": {
+    "confirm": {
+      "button": "Selectează locația de backup",
+      "label": "Ești sigur că vrei să faci backup la date?"
+    },
+    "content": "Se face backup la toate datele, inclusiv istoricul chat-ului, setările și baza de cunoștințe. Te rugăm să reții că procesul de backup poate dura ceva timp, îți mulțumim pentru răbdare.",
+    "progress": {
+      "completed": "Backup finalizat",
+      "compressing": "Se comprimă fișierele...",
+      "copying_files": "Se copiază fișierele... {{progress}}%",
+      "preparing": "Se pregătește backup-ul...",
+      "preparing_compression": "Se pregătește compresia...",
+      "title": "Progres backup",
+      "writing_data": "Se scriu datele..."
+    },
+    "title": "Backup date"
+  },
+  "button": {
+    "add": "Adaugă",
+    "added": "Adăugat",
+    "case_sensitive": "Sensibil la majuscule",
+    "collapse": "Restrânge",
+    "download": "Descarcă",
+    "includes_user_questions": "Include întrebările tale",
+    "manage": "Gestionează",
+    "select_model": "Selectează modelul",
+    "show": {
+      "all": "Arată tot"
+    },
+    "update_available": "Actualizare disponibilă",
+    "whole_word": "Cuvânt întreg"
+  },
+  "chat": {
+    "add": {
+      "assistant": {
+        "description": "Conversații zilnice și întrebări rapide",
+        "title": "Adaugă asistent"
+      },
+      "option": {
+        "title": "Selectează tipul"
+      },
+      "topic": {
+        "title": "Subiect nou"
+      }
+    },
+    "artifacts": {
+      "button": {
+        "download": "Descarcă",
+        "openExternal": "Deschide în browser extern",
+        "preview": "Previzualizare"
+      },
+      "preview": {
+        "openExternal": {
+          "error": {
+            "content": "Eroare la deschiderea browserului extern."
+          }
+        }
+      }
+    },
+    "assistant": {
+      "search": {
+        "placeholder": "Caută"
+      }
+    },
+    "deeply_thought": "Gândit profund ({{seconds}} secunde)",
+    "default": {
+      "description": "Salut, sunt Asistentul Implicit. Poți începe să discuți cu mine imediat",
+      "name": "Asistent Implicit",
+      "topic": {
+        "name": "Subiect implicit"
+      }
+    },
+    "history": {
+      "assistant_node": "Asistent",
+      "click_to_navigate": "Fă clic pentru a naviga la mesaj",
+      "coming_soon": "Diagrama fluxului de chat va fi disponibilă în curând",
+      "no_messages": "Nu au fost găsite mesaje",
+      "start_conversation": "Începe o conversație pentru a vedea diagrama fluxului de chat",
+      "title": "Istoric chat",
+      "user_node": "Utilizator",
+      "view_full_content": "Vezi conținutul complet"
+    },
+    "input": {
+      "activity_directory": {
+        "description": "Selectează fișierul din directorul de activitate",
+        "loading": "Se încarcă fișierele...",
+        "no_file_found": {
+          "description": "Nu există fișiere disponibile în directoarele accesibile",
+          "label": "Nu a fost găsit niciun fișier"
+        },
+        "title": "Director de activitate"
+      },
+      "auto_resize": "Redimensionare automată înălțime",
+      "clear": {
+        "content": "Vrei să ștergi toate mesajele subiectului curent?",
+        "label": "Șterge {{Command}}",
+        "title": "Ștergi toate mesajele?"
+      },
+      "collapse": "Restrânge",
+      "context_count": {
+        "tip": "Context / Context maxim"
+      },
+      "estimated_tokens": {
+        "tip": "Tokeni estimați"
+      },
+      "expand": "Extinde",
+      "file_error": "Eroare la procesarea fișierului",
+      "file_not_supported": "Modelul nu acceptă acest tip de fișier",
+      "file_not_supported_count": "{{count}} fișiere nu sunt acceptate",
+      "generate_image": "Generează imagine",
+      "generate_image_not_supported": "Modelul nu acceptă generarea de imagini.",
+      "knowledge_base": "Bază de cunoștințe",
+      "new": {
+        "context": "Șterge contextul {{Command}}"
+      },
+      "new_session": "Sesiune nouă {{Command}}",
+      "new_topic": "Subiect nou {{Command}}",
+      "paste_text_file_confirm": "Lipești în bara de introducere?",
+      "pause": "Pauză",
+      "placeholder": "Scrie mesajul tău aici, apasă {{key}} pentru a trimite - @ pentru a selecta modelul, / pentru a include instrumente",
+      "placeholder_without_triggers": "Scrie mesajul tău aici, apasă {{key}} pentru a trimite",
+      "send": "Trimite",
+      "settings": "Setări",
+      "slash_commands": {
+        "description": "Comenzi slash pentru sesiunea agentului",
+        "title": "Comenzi slash"
+      },
+      "thinking": {
+        "budget_exceeds_max": "Bugetul de gândire depășește numărul maxim de tokeni",
+        "label": "Gândire",
+        "mode": {
+          "custom": {
+            "label": "Personalizat",
+            "tip": "Numărul maxim de tokeni pe care modelul îi poate gândi. Trebuie să iei în considerare limita de context a modelului, altfel va fi raportată o eroare"
+          },
+          "default": {
+            "label": "Implicit",
+            "tip": "Modelul va determina automat numărul de tokeni pentru gândire"
+          },
+          "tokens": {
+            "tip": "Setează numărul de tokeni de gândire de utilizat."
+          }
+        }
+      },
+      "tools": {
+        "collapse": "Restrânge",
+        "collapse_in": "Restrânge",
+        "collapse_out": "Elimină din restrângere",
+        "expand": "Extinde"
+      },
+      "topics": " Subiecte ",
+      "translate": "Tradu în {{target_language}}",
+      "translating": "Se traduce...",
+      "upload": {
+        "attachment": "Încarcă atașament",
+        "document": "Încarcă fișier document (modelul nu acceptă imagini)",
+        "image_or_document": "Încarcă imagine sau fișier document",
+        "upload_from_local": "Încarcă fișier local..."
+      },
+      "url_context": "Context URL",
+      "web_search": {
+        "builtin": {
+          "disabled_content": "Modelul curent nu acceptă căutarea web",
+          "enabled_content": "Folosește funcția de căutare web integrată a modelului",
+          "label": "Integrat în model"
+        },
+        "button": {
+          "ok": "Mergi la Setări"
+        },
+        "enable": "Activează căutarea web",
+        "enable_content": "Trebuie să verifici mai întâi conectivitatea căutării web în setări",
+        "label": "Căutare web",
+        "no_web_search": {
+          "description": "Nu activa căutarea web",
+          "label": "Dezactivează căutarea web"
+        },
+        "settings": "Setări căutare web"
+      }
+    },
+    "mcp": {
+      "error": {
+        "parse_tool_call": "Nu se poate converti într-un format valid de apelare a instrumentului: {{toolCall}}"
+      },
+      "warning": {
+        "gemini_web_search": "Gemini nu acceptă utilizarea simultană a instrumentelor native de căutare web și a apelării funcțiilor",
+        "multiple_tools": "Există mai multe instrumente MCP care se potrivesc, a fost selectat {{tool}}",
+        "no_tool": "Nu s-a găsit niciun instrument MCP potrivit pentru {{tool}}",
+        "url_context": "Gemini nu acceptă utilizarea simultană a contextului URL și a apelării funcțiilor"
+      }
+    },
+    "message": {
+      "new": {
+        "branch": {
+          "created": "Ramură nouă creată",
+          "label": "Ramură nouă"
+        },
+        "context": "Context nou"
+      },
+      "quote": "Citează",
+      "regenerate": {
+        "model": "Schimbă modelul"
+      },
+      "useful": {
+        "label": "Setează ca context",
+        "tip": "În acest grup de mesaje, acest mesaj va fi selectat pentru a se alătura contextului"
+      }
+    },
+    "multiple": {
+      "select": {
+        "empty": "Niciun mesaj selectat",
+        "label": "Selecție multiplă"
+      }
+    },
+    "navigation": {
+      "bottom": "Înapoi jos",
+      "close": "Închide",
+      "first": "Deja la primul mesaj",
+      "history": "Istoric chat",
+      "last": "Deja la ultimul mesaj",
+      "next": "Mesajul următor",
+      "prev": "Mesajul anterior",
+      "top": "Înapoi sus"
+    },
+    "resend": "Retrimite",
+    "save": {
+      "file": {
+        "title": "Salvează în fișier local"
+      },
+      "knowledge": {
+        "content": {
+          "citation": {
+            "description": "Include informații de referință din căutarea web și baza de cunoștințe",
+            "title": "Citări"
+          },
+          "code": {
+            "description": "Include blocuri de cod independente",
+            "title": "Blocuri de cod"
+          },
+          "error": {
+            "description": "Include mesaje de eroare din timpul execuției",
+            "title": "Erori"
+          },
+          "file": {
+            "description": "Include fișierele atașate",
+            "title": "Fișiere"
+          },
+          "maintext": {
+            "description": "Include conținutul textului principal",
+            "title": "Text principal"
+          },
+          "thinking": {
+            "description": "Include conținutul raționamentului modelului",
+            "title": "Raționament"
+          },
+          "tool_use": {
+            "description": "Include parametrii apelului instrumentului și rezultatele execuției",
+            "title": "Utilizare instrument"
+          },
+          "translation": {
+            "description": "Include conținutul traducerii",
+            "title": "Traduceri"
+          }
+        },
+        "empty": {
+          "no_content": "Acest mesaj nu are conținut care poate fi salvat",
+          "no_knowledge_base": "Nicio bază de cunoștințe disponibilă, te rugăm să creezi una mai întâi"
+        },
+        "error": {
+          "invalid_base": "Baza de cunoștințe selectată nu este configurată corect",
+          "no_content_selected": "Te rugăm să selectezi cel puțin un tip de conținut",
+          "save_failed": "Salvarea a eșuat, te rugăm să verifici configurația bazei de cunoștințe"
+        },
+        "select": {
+          "base": {
+            "placeholder": "Te rugăm să selectezi o bază de cunoștințe",
+            "title": "Selectează baza de cunoștințe"
+          },
+          "content": {
+            "tip": "S-au selectat {{count}} elemente, tipurile de text vor fi îmbinate și salvate ca o singură notiță",
+            "title": "Selectează tipurile de conținut pentru salvare"
+          }
+        },
+        "title": "Salvează în Baza de cunoștințe"
+      },
+      "label": "Salvează",
+      "topic": {
+        "knowledge": {
+          "content": {
+            "maintext": {
+              "description": "Include titlul subiectului și conținutul textului principal din toate mesajele"
+            }
+          },
+          "empty": {
+            "no_content": "Acest subiect nu are conținut care poate fi salvat"
+          },
+          "error": {
+            "save_failed": "Nu s-a putut salva subiectul, te rugăm să verifici configurația bazei de cunoștințe"
+          },
+          "loading": "Se analizează conținutul subiectului...",
+          "select": {
+            "content": {
+              "label": "Selectează tipurile de conținut pentru salvare",
+              "selected_tip": "S-au selectat {{count}} elemente din {{messages}} mesaje",
+              "tip": "Subiectul va fi salvat în baza de cunoștințe cu contextul complet al conversației"
+            }
+          },
+          "success": "Subiect salvat cu succes în baza de cunoștințe ({{count}} elemente)",
+          "title": "Salvează subiectul în Baza de cunoștințe"
+        }
+      }
+    },
+    "settings": {
+      "code": {
+        "title": "Setări blocuri de cod"
+      },
+      "code_collapsible": "Bloc de cod restrâns",
+      "code_editor": {
+        "autocompletion": "Completare automată",
+        "fold_gutter": "Zonă de pliere",
+        "highlight_active_line": "Evidențiază linia activă",
+        "keymap": "Mapare taste",
+        "title": "Editor de cod"
+      },
+      "code_execution": {
+        "timeout_minutes": {
+          "label": "Expirare",
+          "tip": "Timpul de expirare (minute) al execuției codului"
+        },
+        "tip": "Butonul de rulare va fi afișat în bara de instrumente a blocurilor de cod executabile; te rugăm să nu execuți cod periculos!",
+        "title": "Execuție cod"
+      },
+      "code_fancy_block": {
+        "label": "Bloc de cod stilizat",
+        "tip": "Activează stilul sofisticat pentru blocul de cod, de ex., card html"
+      },
+      "code_image_tools": {
+        "label": "Activează instrumentele de previzualizare",
+        "tip": "Activează instrumentele de previzualizare pentru imaginile randate din blocuri de cod, cum ar fi mermaid"
+      },
+      "code_wrappable": "Încadrare text în blocul de cod",
+      "context_count": {
+        "label": "Context",
+        "tip": "Numărul de mesaje anterioare de păstrat în context."
+      },
+      "max": "Nelimitat",
+      "max_tokens": {
+        "confirm": "Setează tokeni maximi",
+        "confirm_content": "Setează numărul maxim de tokeni pe care modelul îi poate genera. Trebuie să iei în considerare limita de context a modelului, altfel va fi raportată o eroare",
+        "label": "Setează tokeni maximi",
+        "tip": "Numărul maxim de tokeni pe care modelul îi poate genera. Trebuie să iei în considerare limita de context a modelului, altfel va fi raportată o eroare"
+      },
+      "reset": "Resetează",
+      "set_as_default": "Aplică la asistentul implicit",
+      "show_line_numbers": "Arată numerele de linie în cod",
+      "temperature": {
+        "label": "Temperatură",
+        "tip": "Valorile mai mari fac modelul mai creativ și imprevizibil, în timp ce valorile mai mici îl fac mai determinist și precis."
+      },
+      "thought_auto_collapse": {
+        "label": "Restrânge conținutul gândirii",
+        "tip": "Restrânge automat conținutul gândirii după ce gândirea se termină"
+      },
+      "top_p": {
+        "label": "Top-P",
+        "tip": "Valoarea implicită este 1; cu cât valoarea este mai mică, cu atât mai puțină varietate în răspunsuri și mai ușor de înțeles; cu cât valoarea este mai mare, cu atât gama de vocabular a AI-ului este mai largă și mai diversă"
+      }
+    },
+    "suggestions": {
+      "title": "Întrebări sugerate"
+    },
+    "thinking": "Gândire ({{seconds}} secunde)",
+    "topics": {
+      "auto_rename": "Redenumire automată",
+      "clear": {
+        "title": "Șterge mesajele"
+      },
+      "copy": {
+        "image": "Copiază ca imagine",
+        "md": "Copiază ca markdown",
+        "plain_text": "Copiază ca text simplu (elimină Markdown)",
+        "title": "Copiază"
+      },
+      "delete": {
+        "shortcut": "Ține apăsat {{key}} pentru a șterge direct"
+      },
+      "edit": {
+        "placeholder": "Introdu noul nume",
+        "title": "Editează numele",
+        "title_tip": "Sfat: Fă dublu clic pe numele subiectului pentru a-l redenumi direct"
+      },
+      "export": {
+        "image": "Exportă ca imagine",
+        "joplin": "Exportă în Joplin",
+        "md": {
+          "label": "Exportă ca markdown",
+          "reason": "Exportă ca Markdown (cu raționament)"
+        },
+        "notes": "Exportă în Note",
+        "notion": "Exportă în Notion",
+        "obsidian": "Exportă în Obsidian",
+        "obsidian_atributes": "Configurează atributele notiței",
+        "obsidian_btn": "Confirmă",
+        "obsidian_created": "Ora creării",
+        "obsidian_created_placeholder": "Te rugăm să selectezi ora creării",
+        "obsidian_export_failed": "Exportul a eșuat",
+        "obsidian_export_success": "Export reușit",
+        "obsidian_fetch_error": "Nu s-au putut prelua seifurile Obsidian",
+        "obsidian_fetch_folders_error": "Nu s-a putut prelua structura folderelor",
+        "obsidian_loading": "Se încarcă...",
+        "obsidian_no_vault_selected": "Te rugăm să selectezi mai întâi un seif",
+        "obsidian_no_vaults": "Nu s-au găsit seifuri Obsidian",
+        "obsidian_operate": "Metodă de operare",
+        "obsidian_operate_append": "Adaugă la sfârșit",
+        "obsidian_operate_new_or_overwrite": "Creează nou (Suprascrie dacă există)",
+        "obsidian_operate_placeholder": "Te rugăm să selectezi metoda de operare",
+        "obsidian_operate_prepend": "Adaugă la început",
+        "obsidian_path": "Cale",
+        "obsidian_path_placeholder": "Te rugăm să selectezi calea",
+        "obsidian_reasoning": "Include lanțul de raționament",
+        "obsidian_root_directory": "Director rădăcină",
+        "obsidian_select_vault_first": "Te rugăm să selectezi mai întâi un seif",
+        "obsidian_source": "Sursă",
+        "obsidian_source_placeholder": "Te rugăm să introduci sursa",
+        "obsidian_tags": "Etichete",
+        "obsidian_tags_placeholder": "Te rugăm să introduci etichete, separă etichetele multiple prin virgule",
+        "obsidian_title": "Titlu",
+        "obsidian_title_placeholder": "Te rugăm să introduci titlul",
+        "obsidian_title_required": "Titlul nu poate fi gol",
+        "obsidian_vault": "Seif",
+        "obsidian_vault_placeholder": "Te rugăm să selectezi numele seifului",
+        "siyuan": "Exportă în Siyuan Note",
+        "title": "Exportă",
+        "title_naming_failed": "Nu s-a putut genera titlul, se folosește titlul implicit",
+        "title_naming_success": "Titlu generat cu succes",
+        "wait_for_title_naming": "Se generează titlul...",
+        "word": "Exportă ca Word",
+        "yuque": "Exportă în Yuque"
+      },
+      "list": "Listă subiecte",
+      "manage": {
+        "clear_selection": "Șterge selecția",
+        "delete": {
+          "confirm": {
+            "content": "Ești sigur că vrei să ștergi {{count}} subiecte selectate? Această acțiune nu poate fi anulată.",
+            "title": "Șterge subiecte"
+          },
+          "success": "S-au șters {{count}} subiecte"
+        },
+        "deselect_all": "Deselectează tot",
+        "error": {
+          "at_least_one": "Trebuie păstrat cel puțin un subiect"
+        },
+        "move": {
+          "button": "Mută",
+          "placeholder": "Selectează asistentul țintă",
+          "success": "S-au mutat {{count}} subiecte"
+        },
+        "pinned": "Subiecte fixate",
+        "selected_count": "{{count}} selectate",
+        "title": "Gestionează subiectele",
+        "unpinned": "Subiecte nefixate"
+      },
+      "move_to": "Mută la",
+      "new": "Subiect nou",
+      "pin": "Fixează subiectul",
+      "prompt": {
+        "edit": {
+          "title": "Editează prompturile subiectului"
+        },
+        "label": "Prompturi subiect",
+        "tips": "Prompturi subiect: Prompturi suplimentare furnizate pentru subiectul curent"
+      },
+      "search": {
+        "placeholder": "Caută subiecte...",
+        "title": "Caută"
+      },
+      "title": "Subiecte",
+      "unpin": "Detașează subiectul"
+    },
+    "translate": "Tradu",
+    "web_search": {
+      "warning": {
+        "openai": "Efortul minim de raționament al modelului GPT-5 nu acceptă căutarea web."
+      }
+    }
+  },
+  "code": {
+    "auto_update_to_latest": "Actualizează automat la cea mai recentă versiune",
+    "bun_required_message": "Mediul Bun este necesar pentru a rula instrumente CLI",
+    "cli_tool": "Instrument CLI",
+    "cli_tool_placeholder": "Selectează instrumentul CLI de utilizat",
+    "custom_path": "Cale personalizată",
+    "custom_path_error": "Nu s-a putut seta calea personalizată a terminalului",
+    "custom_path_required": "Calea personalizată este necesară pentru acest terminal",
+    "custom_path_set": "Calea personalizată a terminalului a fost setată cu succes",
+    "description": "Lansează rapid mai multe instrumente CLI de cod pentru a îmbunătăți eficiența dezvoltării",
+    "env_vars_help": "Introdu variabile de mediu personalizate (una pe rând, format: CHEIE=valoare)",
+    "environment_variables": "Variabile de mediu",
+    "folder_placeholder": "Selectează directorul de lucru",
+    "install_bun": "Instalează Bun",
+    "installing_bun": "Se instalează...",
+    "launch": {
+      "bun_required": "Te rugăm să instalezi mai întâi mediul Bun înainte de a lansa instrumentele CLI",
+      "error": "Lansarea a eșuat, te rugăm să încerci din nou",
+      "label": "Lansează",
+      "success": "Lansare reușită",
+      "validation_error": "Te rugăm să completezi toate câmpurile obligatorii: instrument CLI, model și director de lucru"
+    },
+    "launching": "Se lansează...",
+    "model": "Model",
+    "model_placeholder": "Selectează modelul de utilizat",
+    "model_required": "Te rugăm să selectezi un model",
+    "select_folder": "Selectează folderul",
+    "set_custom_path": "Setează calea personalizată a terminalului",
+    "supported_providers": "Furnizori acceptați",
+    "terminal": "Terminal",
+    "terminal_placeholder": "Selectează aplicația terminal",
+    "title": "Instrumente de cod",
+    "update_options": "Opțiuni de actualizare",
+    "working_directory": "Director de lucru"
+  },
+  "code_block": {
+    "collapse": "Restrânge",
+    "copy": {
+      "failed": "Copiere eșuată",
+      "label": "Copiază",
+      "source": "Copiază codul sursă",
+      "success": "Copiat"
+    },
+    "download": {
+      "failed": {
+        "network": "Descărcarea a eșuat, te rugăm să verifici rețeaua"
+      },
+      "label": "Descarcă",
+      "png": "Descarcă PNG",
+      "source": "Descarcă codul sursă",
+      "svg": "Descarcă SVG"
+    },
+    "edit": {
+      "label": "Editează",
+      "save": {
+        "failed": {
+          "label": "Salvare eșuată",
+          "message_not_found": "Salvare eșuată, mesajul nu a fost găsit"
+        },
+        "label": "Salvează modificările",
+        "success": "Salvat"
+      }
+    },
+    "expand": "Extinde",
+    "more": "Mai mult",
+    "run": "Rulează",
+    "split": {
+      "label": "Vizualizare divizată",
+      "restore": "Restaurează vizualizarea divizată"
+    },
+    "wrap": {
+      "off": "Nu încadra",
+      "on": "Încadrează"
+    }
+  },
+  "common": {
+    "about": "Despre",
+    "add": "Adaugă",
+    "add_success": "Adăugat cu succes",
+    "advanced_settings": "Setări avansate",
+    "agent_one": "Agent",
+    "agent_other": "Agenți",
+    "and": "și",
+    "assistant": "Agent",
+    "assistant_one": "Asistent",
+    "assistant_other": "Asistenți",
+    "avatar": "Avatar",
+    "back": "Înapoi",
+    "browse": "Răsfoiește",
+    "cancel": "Anulează",
+    "chat": "Chat",
+    "clear": "Golește",
+    "close": "Închide",
+    "collapse": "Restrânge",
+    "completed": "Finalizat",
+    "confirm": "Confirmă",
+    "copied": "Copiat",
+    "copy": "Copiază",
+    "copy_failed": "Copiere eșuată",
+    "current": "Curent",
+    "cut": "Taie",
+    "default": "Implicit",
+    "delete": "Șterge",
+    "delete_confirm": "Ești sigur că vrei să ștergi?",
+    "delete_failed": "Nu s-a putut șterge",
+    "delete_success": "Șters cu succes",
+    "description": "Descriere",
+    "detail": "Detaliu",
+    "disabled": "Dezactivat",
+    "docs": "Documentație",
+    "download": "Descarcă",
+    "duplicate": "Duplică",
+    "edit": "Editează",
+    "enabled": "Activat",
+    "error": "eroare",
+    "errors": {
+      "create_message": "Nu s-a putut crea mesajul",
+      "validation": "Verificarea a eșuat"
+    },
+    "expand": "Extinde",
+    "file": {
+      "not_supported": "Tip de fișier neacceptat {{type}}"
+    },
+    "footnote": "Conținut de referință",
+    "footnotes": "Referințe",
+    "fullscreen": "S-a intrat în modul ecran complet. Apasă F11 pentru a ieși",
+    "go_to_settings": "Mergi la setări",
+    "i_know": "Am înțeles",
+    "ignore": "Ignoră",
+    "inspect": "Inspectează",
+    "invalid_value": "Valoare invalidă",
+    "knowledge_base": "Bază de cunoștințe",
+    "language": "Limbă",
+    "loading": "Se încarcă...",
+    "model": "Model",
+    "models": "Modele",
+    "more": "Mai mult",
+    "name": "Nume",
+    "no_results": "Niciun rezultat",
+    "none": "Nimic",
+    "off": "Oprit",
+    "on": "Pornit",
+    "open": "Deschide",
+    "paste": "Lipește",
+    "placeholders": {
+      "select": {
+        "model": "Selectează un model"
+      }
+    },
+    "preview": "Previzualizare",
+    "prompt": "Prompt",
+    "provider": "Furnizor",
+    "reasoning_content": "Raționament profund",
+    "refresh": "Reîmprospătează",
+    "regenerate": "Regenerează",
+    "rename": "Redenumește",
+    "reset": "Resetează",
+    "save": "Salvează",
+    "saved": "Salvat",
+    "search": "Caută",
+    "select": "Selectează",
+    "select_all": "Selectează tot",
+    "selected": "Selectat",
+    "selectedItems": "{{count}} elemente selectate",
+    "selectedMessages": "{{count}} mesaje selectate",
+    "settings": "Setări",
+    "sort": {
+      "pinyin": {
+        "asc": "Sortează după Pinyin (A-Z)",
+        "desc": "Sortează după Pinyin (Z-A)",
+        "label": "Sortează după Pinyin"
+      }
+    },
+    "stop": "Oprește",
+    "subscribe": "Abonează-te",
+    "success": "Succes",
+    "swap": "Schimbă",
+    "topics": "Subiecte",
+    "unknown": "Necunoscut",
+    "unnamed": "Fără nume",
+    "unsubscribe": "Dezabonează-te",
+    "update_success": "Actualizat cu succes",
+    "upload_files": "Încarcă fișier",
+    "warning": "Avertisment",
+    "you": "Tu"
+  },
+  "docs": {
+    "title": "Documentație"
+  },
+  "endpoint_type": {
+    "anthropic": "Anthropic",
+    "gemini": "Gemini",
+    "image-generation": "Generare imagini (OpenAI)",
+    "jina-rerank": "Jina Rerank",
+    "openai": "OpenAI",
+    "openai-response": "OpenAI-Response"
+  },
+  "error": {
+    "availableProviders": "Furnizori disponibili",
+    "availableTools": "Instrumente disponibile",
+    "backup": {
+      "file_format": "Eroare format fișier backup"
+    },
+    "boundary": {
+      "default": {
+        "devtools": "Deschide panoul de depanare",
+        "message": "Se pare că ceva nu a mers bine...",
+        "reload": "Reîncarcă"
+      },
+      "details": "Detalii",
+      "mcp": {
+        "invalid": "Server MCP invalid"
+      }
+    },
+    "cause": "Cauză eroare",
+    "chat": {
+      "chunk": {
+        "non_json": "S-a returnat un format de date invalid"
+      },
+      "insufficient_balance": "Te rugăm să mergi la <provider>{{provider}}</provider> pentru a reîncărca.",
+      "no_api_key": "Nu ai configurat o cheie API. Te rugăm să mergi la <provider>{{provider}}</provider> pentru a obține o cheie API.",
+      "quota_exceeded": "Cota ta gratuită zilnică {{quota}} a fost epuizată. Te rugăm să mergi la <provider>{{provider}}</provider> pentru a obține o cheie API și configurează cheia API pentru a continua utilizarea.",
+      "response": "Ceva nu a mers bine. Te rugăm să verifici dacă ai setat cheia API în Setări > Furnizori"
+    },
+    "content": "Conținut",
+    "data": "Date",
+    "detail": "Detalii eroare",
+    "details": "Detalii",
+    "errors": "Erori",
+    "finishReason": "Motiv finalizare",
+    "functionality": "Funcționalitate",
+    "http": {
+      "400": "Cererea a eșuat. Te rugăm să verifici dacă parametrii cererii sunt corecți. Dacă ai modificat setările modelului, te rugăm să le resetezi la valorile implicite",
+      "401": "Autentificarea a eșuat. Te rugăm să verifici dacă cheia API este corectă",
+      "403": "Acces refuzat. Te rugăm să verifici dacă contul tău este verificat sau contactează furnizorul de servicii pentru mai multe informații",
+      "404": "Modelul nu a fost găsit sau calea cererii este incorectă",
+      "429": "Prea multe cereri. Te rugăm să încerci din nou mai târziu",
+      "500": "Eroare de server. Te rugăm să încerci din nou mai târziu",
+      "502": "Eroare gateway. Te rugăm să încerci din nou mai târziu",
+      "503": "Serviciu indisponibil. Te rugăm să încerci din nou mai târziu",
+      "504": "Expirare gateway. Te rugăm să încerci din nou mai târziu"
+    },
+    "lastError": "Ultima eroare",
+    "maxEmbeddingsPerCall": "Max Embeddings per apel",
+    "message": "Mesaj de eroare",
+    "missing_user_message": "Nu se poate schimba răspunsul modelului: Mesajul original al utilizatorului a fost șters. Te rugăm să trimiți un mesaj nou pentru a primi un răspuns cu acest model.",
+    "model": {
+      "exists": "Modelul există deja",
+      "not_exists": "Modelul nu există"
+    },
+    "modelId": "ID model",
+    "modelType": "Tip model",
+    "name": "Nume eroare",
+    "no_api_key": "Cheia API nu este configurată",
+    "no_response": "Niciun răspuns",
+    "originalError": "Eroare originală",
+    "originalMessage": "Mesaj original",
+    "parameter": "Parametru",
+    "pause_placeholder": "În pauză",
+    "prompt": "Prompt",
+    "provider": "Furnizor",
+    "providerId": "ID furnizor",
+    "provider_disabled": "Furnizorul modelului nu este activat",
+    "reason": "Motiv",
+    "render": {
+      "description": "Nu s-a putut randa conținutul mesajului. Te rugăm să verifici dacă formatul conținutului mesajului este corect",
+      "title": "Eroare de randare"
+    },
+    "requestBody": "Corp cerere",
+    "requestBodyValues": "Valori corp cerere",
+    "requestUrl": "URL cerere",
+    "response": "Răspuns",
+    "responseBody": "Corp răspuns",
+    "responseHeaders": "Header răspuns",
+    "responses": "Răspunsuri",
+    "role": "Rol",
+    "stack": "Stack Trace",
+    "status": "Cod stare",
+    "statusCode": "Cod stare",
+    "statusText": "Text stare",
+    "text": "Text",
+    "toolInput": "Intrare instrument",
+    "toolName": "Nume instrument",
+    "unknown": "Eroare necunoscută",
+    "usage": "Utilizare",
+    "user_message_not_found": "Nu se poate găsi mesajul original al utilizatorului pentru a retrimite",
+    "value": "Valoare",
+    "values": "Valori"
+  },
+  "export": {
+    "assistant": "Asistent",
+    "attached_files": "Fișiere atașate",
+    "conversation_details": "Detalii conversație",
+    "conversation_history": "Istoric conversație",
+    "created": "Creat",
+    "last_updated": "Ultima actualizare",
+    "messages": "Mesaje",
+    "notion": {
+      "reasoning_truncated": "Lanțul de gândire nu poate fi fragmentat și a fost trunchiat."
+    },
+    "user": "Utilizator"
+  },
+  "files": {
+    "actions": "Acțiuni",
+    "all": "Toate fișierele",
+    "batch_delete": "Ștergere în lot",
+    "batch_operation": "Selectează tot",
+    "count": "fișiere",
+    "created_at": "Creat la",
+    "delete": {
+      "content": "Ștergerea unui fișier va șterge referința acestuia din toate mesajele. Ești sigur că vrei să ștergi acest fișier?",
+      "db_error": "Ștergerea a eșuat",
+      "label": "Șterge",
+      "paintings": {
+        "warning": "Imaginea conține acest fișier, ștergerea nu este posibilă"
+      },
+      "title": "Șterge fișier"
+    },
+    "document": "Document",
+    "edit": "Editează",
+    "error": {
+      "open_path": "Nu s-a putut deschide calea {{path}}"
+    },
+    "file": "Fișier",
+    "image": "Imagine",
+    "name": "Nume",
+    "open": "Deschide",
+    "preview": {
+      "error": "Nu s-a putut deschide fișierul"
+    },
+    "size": "Dimensiune",
+    "text": "Text",
+    "title": "Fișiere",
+    "type": "Tip"
+  },
+  "gpustack": {
+    "keep_alive_time": {
+      "description": "Timpul în minute pentru a menține conexiunea activă; implicit este 5 minute.",
+      "placeholder": "Minute",
+      "title": "Timp menținere conexiune"
+    },
+    "title": "GPUStack"
+  },
+  "history": {
+    "continue_chat": "Continuă conversația",
+    "error": {
+      "topic_not_found": "Subiectul nu a fost găsit"
+    },
+    "locate": {
+      "message": "Localizează mesajul"
+    },
+    "search": {
+      "messages": "Caută în toate mesajele",
+      "placeholder": "Caută subiecte sau mesaje...",
+      "topics": {
+        "empty": "Nu s-au găsit subiecte, apasă Enter pentru a căuta în toate mesajele"
+      }
+    },
+    "title": "Căutare subiecte"
+  },
+  "html_artifacts": {
+    "capture": {
+      "label": "Capturează pagina",
+      "to_clipboard": "Copiază în clipboard",
+      "to_file": "Salvează ca imagine"
+    },
+    "code": "Cod",
+    "empty_preview": "Niciun conținut de afișat",
+    "generating": "Se generează",
+    "preview": "Previzualizare",
+    "split": "Divizat"
+  },
+  "import": {
+    "chatgpt": {
+      "assistant_name": "Import ChatGPT",
+      "button": "Selectează fișierul",
+      "description": "Importă doar textul conversației, nu include imagini și atașamente",
+      "error": {
+        "invalid_json": "Format fișier JSON invalid",
+        "no_conversations": "Nu s-au găsit conversații în fișier",
+        "no_valid_conversations": "Nu există conversații valide de importat",
+        "unknown": "Importul a eșuat, te rugăm să verifici formatul fișierului"
+      },
+      "help": {
+        "step1": "1. Conectează-te la ChatGPT, mergi la Settings > Data controls > Export data",
+        "step2": "2. Așteaptă fișierul de export pe e-mail",
+        "step3": "3. Extrage arhiva descărcată și găsește conversations.json",
+        "title": "Cum export conversațiile ChatGPT?"
+      },
+      "importing": "Se importă conversațiile...",
+      "selecting": "Se selectează fișierul...",
+      "success": "S-au importat cu succes {{topics}} conversații cu {{messages}} mesaje",
+      "title": "Importă conversații ChatGPT",
+      "untitled_conversation": "Conversație fără titlu"
+    },
+    "confirm": {
+      "button": "Selectează fișierul de import",
+      "label": "Ești sigur că vrei să imporți date externe?"
+    },
+    "content": "Selectează fișierul de conversație din aplicația externă pentru import; momentan acceptă doar fișiere în format JSON ChatGPT",
+    "title": "Importă conversații externe"
+  },
+  "knowledge": {
+    "add": {
+      "title": "Adaugă bază de cunoștințe"
+    },
+    "add_directory": "Adaugă director",
+    "add_file": "Adaugă fișier",
+    "add_image": "Adaugă imagine",
+    "add_note": "Adaugă notă",
+    "add_sitemap": "Hartă site",
+    "add_url": "Adaugă URL",
+    "add_video": "Adaugă video",
+    "cancel_index": "Anulează indexarea",
+    "chunk_overlap": "Suprapunere fragmente",
+    "chunk_overlap_placeholder": "Implicit (nu se recomandă modificarea)",
+    "chunk_overlap_tooltip": "Cantitatea de conținut duplicat între fragmentele adiacente, asigurând că fragmentele sunt încă legate contextual, îmbunătățind efectul general al procesării textului lung",
+    "chunk_size": "Dimensiune fragment",
+    "chunk_size_change_warning": "Modificările dimensiunii fragmentului și ale suprapunerii se aplică doar conținutului nou",
+    "chunk_size_placeholder": "Implicit (nu se recomandă modificarea)",
+    "chunk_size_too_large": "Dimensiunea fragmentului nu poate depăși limita de context a modelului ({{max_context}})",
+    "chunk_size_tooltip": "Împarte documentele în fragmente; dimensiunea fiecărui fragment nu trebuie să depășească limita de context a modelului",
+    "clear_selection": "Șterge selecția",
+    "delete": "Șterge",
+    "delete_confirm": "Ești sigur că vrei să ștergi această bază de cunoștințe?",
+    "dimensions": "Dimensiune embedding",
+    "dimensions_auto_set": "Setează automat dimensiunile embedding",
+    "dimensions_default": "Modelul va folosi dimensiunile implicite de embedding",
+    "dimensions_error_invalid": "Dimensiune embedding invalidă",
+    "dimensions_set_right": "⚠️ Te rugăm să te asiguri că modelul acceptă dimensiunea embedding setată",
+    "dimensions_size_placeholder": "Lasă gol pentru a nu transmite dimensiuni",
+    "dimensions_size_too_large": "Dimensiunea embedding nu poate depăși limita de context a modelului ({{max_context}}).",
+    "dimensions_size_tooltip": "Dimensiunea embedding; cu cât valoarea este mai mare, cu atât se vor consuma mai mulți tokeni. Lasă gol pentru a nu transmite parametrul dimensions.",
+    "directories": "Directoare",
+    "directory_placeholder": "Introdu calea directorului",
+    "document_count": "Fragmente de document solicitate",
+    "document_count_default": "Implicit",
+    "document_count_help": "Cu cât sunt solicitate mai multe fragmente de document, cu atât sunt incluse mai multe informații, dar se consumă mai mulți tokeni",
+    "drag_file": "Trage fișierul aici",
+    "drag_image": "Trage imaginea aici",
+    "edit_remark": "Editează observația",
+    "edit_remark_placeholder": "Te rugăm să introduci conținutul observației",
+    "embedding_model": "Model embedding",
+    "embedding_model_required": "Modelul de embedding pentru baza de cunoștințe este necesar",
+    "empty": "Nu a fost găsită nicio bază de cunoștințe",
+    "error": {
+      "failed_to_create": "Crearea bazei de cunoștințe a eșuat",
+      "failed_to_edit": "Editarea bazei de cunoștințe a eșuat",
+      "model_invalid": "Niciun model selectat",
+      "video": {
+        "local_file_missing": "Fișierul video nu a fost găsit",
+        "youtube_url_missing": "URL-ul video YouTube nu a fost găsit"
+      }
+    },
+    "file_hint": "Acceptă {{file_types}}",
+    "image_hint": "Acceptă {{image_types}}",
+    "images": "Imagini",
+    "index_all": "Indexează tot",
+    "index_cancelled": "Indexare anulată",
+    "index_started": "Indexare pornită",
+    "invalid_url": "URL invalid",
+    "migrate": {
+      "button": {
+        "text": "Migrează"
+      },
+      "confirm": {
+        "content": "S-au detectat modificări în modelul sau dimensiunea de embedding; configurarea nu poate fi salvată direct. Migrarea bazei de cunoștințe nu va șterge baza existentă, ci va crea o copie și apoi va reprocesa toate intrările, ceea ce poate consuma un număr mare de tokeni. Te rugăm să procedezi cu precauție.",
+        "ok": "Începe migrarea",
+        "title": "Migrare bază de cunoștințe"
+      },
+      "error": {
+        "failed": "Migrarea a eșuat"
+      },
+      "source_dimensions": "Dimensiuni sursă",
+      "source_model": "Model sursă",
+      "target_dimensions": "Dimensiuni țintă",
+      "target_model": "Model țintă"
+    },
+    "model_info": "Informații model",
+    "name_required": "Numele bazei de cunoștințe este obligatoriu",
+    "no_bases": "Nu există baze de cunoștințe disponibile",
+    "no_match": "Nu s-a găsit conținut potrivit în baza de cunoștințe.",
+    "no_provider": "Furnizorul modelului pentru baza de cunoștințe nu este setat, baza de cunoștințe nu va mai fi acceptată; te rugăm să creezi o nouă bază de cunoștințe",
+    "not_set": "Nesetat",
+    "not_support": "Motorul bazei de date de cunoștințe a fost actualizat, baza de cunoștințe nu va mai fi acceptată; te rugăm să creezi o nouă bază de cunoștințe",
+    "notes": "Note",
+    "notes_placeholder": "Introdu informații suplimentare sau context pentru această bază de cunoștințe...",
+    "provider_not_found": "Furnizorul nu a fost găsit",
+    "quota": "Cotă rămasă {{name}}: {{quota}}",
+    "quota_empty": "Cota de astăzi pentru {{name}} este epuizată, te rugăm să aplici pe site-ul oficial",
+    "quota_infinity": "Cotă {{name}}: Nelimitat",
+    "rename": "Redenumește",
+    "search": "Caută în baza de cunoștințe",
+    "search_placeholder": "Introdu text pentru căutare",
+    "settings": {
+      "preprocessing": "Preprocesare",
+      "preprocessing_tooltip": "Preprocesează fișierele încărcate",
+      "title": "Setări bază de cunoștințe"
+    },
+    "sitemap_added": "Adăugat cu succes",
+    "sitemap_placeholder": "Introdu URL-ul hărții site-ului",
+    "sitemaps": "Site-uri web",
+    "source": "Sursă",
+    "status": "Stare",
+    "status_completed": "Finalizat",
+    "status_embedding_completed": "Embedding finalizat",
+    "status_embedding_failed": "Embedding eșuat",
+    "status_failed": "Eșuat",
+    "status_new": "Adăugat",
+    "status_pending": "În așteptare",
+    "status_preprocess_completed": "Preprocesare finalizată",
+    "status_preprocess_failed": "Preprocesare eșuată",
+    "status_processing": "Se procesează",
+    "subtitle_file": "fișier subtitrare",
+    "threshold": "Prag de potrivire",
+    "threshold_placeholder": "Nesetat",
+    "threshold_too_large_or_small": "Pragul nu poate fi mai mare de 1 sau mai mic de 0",
+    "threshold_tooltip": "Folosit pentru a evalua relevanța dintre întrebarea utilizatorului și conținutul din baza de cunoștințe (0-1)",
+    "title": "Bază de cunoștințe",
+    "topN": "Număr rezultate returnate",
+    "topN_placeholder": "Nesetat",
+    "topN_too_large_or_small": "Numărul de rezultate returnate nu poate fi mai mare de 30 sau mai mic de 1.",
+    "topN_tooltip": "Numărul de rezultate potrivite returnate; cu cât valoarea este mai mare, cu atât mai multe rezultate, dar și mai mulți tokeni consumați.",
+    "url_added": "URL adăugat",
+    "url_placeholder": "Introdu URL, separă URL-urile multiple prin Enter",
+    "urls": "URL-uri",
+    "videos": "video",
+    "videos_file": "fișier video"
+  },
+  "languages": {
+    "arabic": "Arabă",
+    "chinese": "Chineză",
+    "chinese-traditional": "Chineză tradițională",
+    "english": "Engleză",
+    "french": "Franceză",
+    "german": "Germană",
+    "indonesian": "Indoneziană",
+    "italian": "Italiană",
+    "japanese": "Japoneză",
+    "korean": "Coreeană",
+    "malay": "Malaieză",
+    "polish": "Poloneză",
+    "portuguese": "Portugheză",
+    "russian": "Rusă",
+    "spanish": "Spaniolă",
+    "thai": "Thailandeză",
+    "turkish": "Turcă",
+    "ukrainian": "Ucraineană",
+    "unknown": "necunoscut",
+    "urdu": "Urdu",
+    "vietnamese": "Vietnameză"
+  },
+  "launchpad": {
+    "apps": "Aplicații",
+    "minapps": "Mini-aplicații"
+  },
+  "lmstudio": {
+    "keep_alive_time": {
+      "description": "Timpul în minute pentru a menține conexiunea activă; implicit este 5 minute.",
+      "placeholder": "Minute",
+      "title": "Timp menținere conexiune"
+    },
+    "title": "LM Studio"
+  },
+  "memory": {
+    "actions": "Acțiuni",
+    "add_failed": "Nu s-a putut adăuga amintirea",
+    "add_first_memory": "Adaugă prima ta amintire",
+    "add_memory": "Adaugă amintire",
+    "add_new_user": "Adaugă utilizator nou",
+    "add_success": "Amintire adăugată cu succes",
+    "add_user": "Adaugă utilizator",
+    "add_user_failed": "Nu s-a putut adăuga utilizatorul",
+    "all_users": "Toți utilizatorii",
+    "cannot_delete_default_user": "Nu se poate șterge utilizatorul implicit",
+    "configure_memory_first": "Te rugăm să configurezi mai întâi setările de memorie",
+    "content": "Conținut",
+    "current_user": "Utilizator curent",
+    "custom": "Personalizat",
+    "default": "Implicit",
+    "default_user": "Utilizator implicit",
+    "delete_confirm": "Ești sigur că vrei să ștergi această amintire?",
+    "delete_confirm_content": "Ești sigur că vrei să ștergi {{count}} amintiri?",
+    "delete_confirm_single": "Ești sigur că vrei să ștergi această amintire?",
+    "delete_confirm_title": "Șterge amintiri",
+    "delete_failed": "Nu s-a putut șterge amintirea",
+    "delete_selected": "Șterge selectate",
+    "delete_success": "Amintire ștearsă cu succes",
+    "delete_user": "Șterge utilizator",
+    "delete_user_confirm_content": "Ești sigur că vrei să ștergi utilizatorul {{user}} și toate amintirile sale?",
+    "delete_user_confirm_title": "Șterge utilizator",
+    "delete_user_failed": "Nu s-a putut șterge utilizatorul",
+    "description": "Memoria îți permite să stochezi și să gestionezi informații despre interacțiunile tale cu asistentul. Poți adăuga, edita și șterge amintiri, precum și să le filtrezi și să cauți prin ele.",
+    "edit_memory": "Editează amintirea",
+    "embedding_dimensions": "Dimensiuni embedding",
+    "embedding_model": "Model embedding",
+    "enable_global_memory_first": "Te rugăm să activezi mai întâi memoria globală",
+    "end_date": "Data de sfârșit",
+    "global_memory": "Memorie globală",
+    "global_memory_description": "Pentru a folosi funcțiile de memorie, te rugăm să activezi memoria globală în setările asistentului.",
+    "global_memory_disabled_desc": "Pentru a folosi funcțiile de memorie, te rugăm să activezi mai întâi memoria globală în setările asistentului.",
+    "global_memory_disabled_title": "Memorie globală dezactivată",
+    "global_memory_enabled": "Memorie globală activată",
+    "go_to_memory_page": "Mergi la pagina Memorie",
+    "initial_memory_content": "Bun venit! Aceasta este prima ta amintire.",
+    "llm_model": "Model LLM",
+    "load_failed": "Nu s-au putut încărca amintirile",
+    "loading": "Se încarcă amintirile...",
+    "loading_memories": "Se încarcă amintirile...",
+    "memories_description": "Se afișează {{count}} din {{total}} amintiri",
+    "memories_reset_success": "Toate amintirile pentru {{user}} au fost resetate cu succes",
+    "memory": "amintire",
+    "memory_content": "Conținut amintire",
+    "memory_placeholder": "Introdu conținutul amintirii...",
+    "new_user_id": "ID utilizator nou",
+    "new_user_id_placeholder": "Introdu un ID de utilizator unic",
+    "no_matching_memories": "Nu s-au găsit amintiri potrivite",
+    "no_memories": "Încă nu există amintiri",
+    "no_memories_description": "Începe prin a adăuga prima ta amintire",
+    "not_configured_desc": "Te rugăm să configurezi modelele de embedding și LLM în setările de memorie pentru a activa funcționalitatea de memorie.",
+    "not_configured_title": "Memorie neconfigurată",
+    "pagination_total": "{{start}}-{{end}} din {{total}} elemente",
+    "please_enter_memory": "Te rugăm să introduci conținutul amintirii",
+    "please_select_embedding_model": "Te rugăm să selectezi un model de embedding",
+    "please_select_llm_model": "Te rugăm să selectezi un model LLM",
+    "reset_filters": "Resetează filtrele",
+    "reset_memories": "Resetează amintirile",
+    "reset_memories_confirm_content": "Ești sigur că vrei să ștergi definitiv toate amintirile pentru {{user}}? Această acțiune nu poate fi anulată.",
+    "reset_memories_confirm_title": "Resetează toate amintirile",
+    "reset_memories_failed": "Nu s-au putut reseta amintirile",
+    "reset_user_memories": "Resetează amintirile utilizatorului",
+    "reset_user_memories_confirm_content": "Ești sigur că vrei să resetezi toate amintirile pentru {{user}}?",
+    "reset_user_memories_confirm_title": "Resetează amintirile utilizatorului",
+    "reset_user_memories_failed": "Nu s-au putut reseta amintirile utilizatorului",
+    "score": "Scor",
+    "search": "Caută",
+    "search_placeholder": "Caută amintiri...",
+    "select_embedding_model_placeholder": "Selectează model embedding",
+    "select_llm_model_placeholder": "Selectează model LLM",
+    "select_user": "Selectează utilizator",
+    "settings": "Setări",
+    "settings_title": "Setări memorie",
+    "start_date": "Data de început",
+    "statistics": "Statistici",
+    "stored_memories": "Amintiri stocate",
+    "switch_user": "Schimbă utilizatorul",
+    "switch_user_confirm": "Schimbi contextul de utilizator la {{user}}?",
+    "time": "Timp",
+    "title": "Amintiri",
+    "total_memories": "total amintiri",
+    "try_different_filters": "Încearcă să ajustezi criteriile de căutare",
+    "update_failed": "Nu s-a putut actualiza amintirea",
+    "update_success": "Amintire actualizată cu succes",
+    "user": "Utilizator",
+    "user_created": "Utilizatorul {{user}} a fost creat și comutat cu succes",
+    "user_deleted": "Utilizatorul {{user}} a fost șters cu succes",
+    "user_id": "ID utilizator",
+    "user_id_exists": "Acest ID de utilizator există deja",
+    "user_id_invalid_chars": "ID-ul de utilizator poate conține doar litere, cifre, cratime și liniuțe de subliniere",
+    "user_id_placeholder": "Introdu ID utilizator (opțional)",
+    "user_id_required": "ID-ul de utilizator este obligatoriu",
+    "user_id_reserved": "'default-user' este rezervat, te rugăm să folosești un ID diferit",
+    "user_id_rules": "ID-ul de utilizator trebuie să fie unic și să conțină doar litere, cifre, cratime (-) și liniuțe de subliniere (_)",
+    "user_id_too_long": "ID-ul de utilizator nu poate depăși 50 de caractere",
+    "user_management": "Gestionare utilizatori",
+    "user_memories_reset": "Toate amintirile pentru {{user}} au fost resetate",
+    "user_switch_failed": "Nu s-a putut schimba utilizatorul",
+    "user_switched": "Contextul de utilizator a fost schimbat la {{user}}",
+    "users": "utilizatori"
+  },
+  "message": {
+    "agents": {
+      "import": {
+        "error": "Import eșuat"
+      },
+      "imported": "S-au importat cu succes {{count}} asistent/asistenți"
+    },
+    "api": {
+      "check": {
+        "model": {
+          "title": "Selectează modelul de utilizat pentru detectare"
+        }
+      },
+      "connection": {
+        "failed": "Conexiune eșuată",
+        "success": "Conexiune reușită"
+      }
+    },
+    "assistant": {
+      "added": {
+        "content": "Asistent adăugat cu succes"
+      }
+    },
+    "attachments": {
+      "pasted_image": "Imagine lipită",
+      "pasted_text": "Text lipit"
+    },
+    "backup": {
+      "failed": "Backup eșuat",
+      "start": {
+        "success": "Backup început"
+      },
+      "success": "Backup reușit"
+    },
+    "branch": {
+      "error": "Crearea ramurii a eșuat"
+    },
+    "chat": {
+      "completion": {
+        "paused": "Completarea chat-ului a fost pusă în pauză"
+      }
+    },
+    "citation": "{{count}} citări",
+    "citations": "Referințe",
+    "copied": "Copiat!",
+    "copy": {
+      "failed": "Copiere eșuată",
+      "success": "Copiat!"
+    },
+    "delete": {
+      "confirm": {
+        "content": "Ești sigur că vrei să ștergi cele {{count}} mesaje selectate?",
+        "title": "Confirmare ștergere"
+      },
+      "failed": "Ștergere eșuată",
+      "success": "Ștergere reușită"
+    },
+    "dialog": {
+      "failed": "Previzualizare eșuată"
+    },
+    "download": {
+      "failed": "Descărcare eșuată",
+      "success": "Descărcare reușită"
+    },
+    "empty_url": "Nu s-a putut descărca imaginea, posibil din cauza promptului care conține conținut sensibil sau cuvinte interzise",
+    "error": {
+      "chunk_overlap_too_large": "Suprapunerea fragmentelor nu poate fi mai mare decât dimensiunea fragmentului",
+      "copy": "Copiere eșuată",
+      "dimension_too_large": "Dimensiunea conținutului este prea mare",
+      "enter": {
+        "api": {
+          "host": "Te rugăm să introduci mai întâi gazda (host) API",
+          "label": "Te rugăm să introduci mai întâi cheia API"
+        },
+        "model": "Te rugăm să selectezi mai întâi un model",
+        "name": "Te rugăm să introduci numele bazei de cunoștințe"
+      },
+      "fetchTopicName": "Nu s-a putut numi subiectul",
+      "get_embedding_dimensions": "Nu s-au putut obține dimensiunile embedding",
+      "invalid": {
+        "api": {
+          "host": "Gazdă (Host) API invalidă",
+          "label": "Cheie API invalidă"
+        },
+        "enter": {
+          "model": "Te rugăm să selectezi un model"
+        },
+        "nutstore": "Setări Nutstore invalide",
+        "nutstore_token": "Token Nutstore invalid",
+        "proxy": {
+          "url": "URL proxy invalid"
+        },
+        "webdav": "Setări WebDAV invalide"
+      },
+      "joplin": {
+        "export": "Nu s-a putut exporta în Joplin. Te rugăm să menții Joplin rulând și să verifici starea conexiunii sau configurarea",
+        "no_config": "Tokenul de autorizare Joplin sau URL-ul nu sunt configurate"
+      },
+      "markdown": {
+        "export": {
+          "preconf": "Nu s-a putut exporta fișierul Markdown în calea preconfigurată",
+          "specified": "Nu s-a putut exporta fișierul Markdown"
+        }
+      },
+      "notes": {
+        "export": "Nu s-au putut exporta notele"
+      },
+      "notion": {
+        "export": "Nu s-a putut exporta în Notion. Te rugăm să verifici starea conexiunii și configurarea conform documentației",
+        "no_api_key": "ApiKey-ul Notion sau DatabaseID-ul Notion nu sunt configurate",
+        "no_content": "Nu există nimic de exportat în Notion."
+      },
+      "siyuan": {
+        "export": "Nu s-a putut exporta în Siyuan Note, te rugăm să verifici starea conexiunii și configurarea conform documentației",
+        "no_config": "Adresa API Siyuan Note sau tokenul nu sunt configurate"
+      },
+      "unknown": "Eroare necunoscută",
+      "yuque": {
+        "export": "Nu s-a putut exporta în Yuque. Te rugăm să verifici starea conexiunii și configurarea conform documentației",
+        "no_config": "Tokenul Yuque sau Url-ul Yuque nu sunt configurate"
+      }
+    },
+    "group": {
+      "delete": {
+        "content": "Ștergerea unui mesaj de grup va șterge întrebarea utilizatorului și toate răspunsurile asistentului",
+        "title": "Șterge mesajul de grup"
+      },
+      "retry_failed": "Reîncearcă mesajele eșuate"
+    },
+    "ignore": {
+      "knowledge": {
+        "base": "Modul căutare web este activat, se ignoră baza de cunoștințe"
+      }
+    },
+    "loading": {
+      "notion": {
+        "exporting_progress": "Se exportă în Notion...",
+        "preparing": "Se pregătește exportul în Notion..."
+      }
+    },
+    "mention": {
+      "title": "Schimbă răspunsul modelului"
+    },
+    "message": {
+      "code_style": "Stil cod",
+      "compact": {
+        "title": "Conversație compactată"
+      },
+      "delete": {
+        "content": "Ești sigur că vrei să ștergi acest mesaj?",
+        "title": "Șterge mesajul"
+      },
+      "multi_model_style": {
+        "fold": {
+          "compress": "Treci la aspect compact",
+          "expand": "Treci la aspect extins",
+          "label": "Vizualizare pliată"
+        },
+        "grid": "Aspect grilă",
+        "horizontal": "Alăturat",
+        "label": "Stil grup",
+        "vertical": "Vizualizare stivuită"
+      },
+      "style": {
+        "bubble": "Bulă",
+        "label": "Stil mesaj",
+        "plain": "Simplu"
+      },
+      "video": {
+        "error": {
+          "local_file_missing": "Calea fișierului video local nu a fost găsită",
+          "unsupported_type": "Tip video neacceptat",
+          "youtube_url_missing": "URL-ul video YouTube nu a fost găsit"
+        }
+      }
+    },
+    "processing": "Se procesează...",
+    "regenerate": {
+      "confirm": "Regenerarea va înlocui mesajul curent"
+    },
+    "reset": {
+      "confirm": {
+        "content": "Ești sigur că vrei să ștergi toate datele?"
+      },
+      "double": {
+        "confirm": {
+          "content": "Toate datele vor fi pierdute, vrei să continui?",
+          "title": "DATE PIERDUTE !!!"
+        }
+      }
+    },
+    "restore": {
+      "failed": "Restaurare eșuată",
+      "success": "Restaurat cu succes"
+    },
+    "save": {
+      "success": {
+        "title": "Salvat cu succes"
+      }
+    },
+    "searching": "Se caută...",
+    "success": {
+      "joplin": {
+        "export": "Exportat cu succes în Joplin"
+      },
+      "markdown": {
+        "export": {
+          "preconf": "Fișierul Markdown a fost exportat cu succes în calea preconfigurată",
+          "specified": "Fișierul Markdown a fost exportat cu succes"
+        }
+      },
+      "notes": {
+        "export": "Exportat cu succes în note"
+      },
+      "notion": {
+        "export": "Exportat cu succes în Notion"
+      },
+      "siyuan": {
+        "export": "Exportat cu succes în Siyuan Note"
+      },
+      "yuque": {
+        "export": "Exportat cu succes în Yuque"
+      }
+    },
+    "switch": {
+      "disabled": "Te rugăm să aștepți finalizarea răspunsului curent"
+    },
+    "tools": {
+      "abort_failed": "Anularea apelului instrumentului a eșuat",
+      "aborted": "Apelul instrumentului a fost anulat",
+      "autoApproveEnabled": "Aprobare automată activată pentru acest instrument",
+      "cancelled": "Anulat",
+      "completed": "Finalizat",
+      "error": "A apărut o eroare",
+      "invoking": "Se invocă",
+      "pending": "În așteptare",
+      "preview": "Previzualizare",
+      "raw": "Brut"
+    },
+    "topic": {
+      "added": "Subiect nou adăugat"
+    },
+    "upgrade": {
+      "success": {
+        "button": "Repornește",
+        "content": "Te rugăm să repornești aplicația pentru a finaliza actualizarea",
+        "title": "Actualizare reușită"
+      }
+    },
+    "warn": {
+      "export": {
+        "exporting": "Un alt export este în curs. Te rugăm să aștepți finalizarea exportului anterior și apoi să încerci din nou."
+      }
+    },
+    "warning": {
+      "rate": {
+        "limit": "Prea multe cereri. Te rugăm să aștepți {{seconds}} secunde înainte de a încerca din nou."
+      }
+    },
+    "websearch": {
+      "cutoff": "Se trunchiază conținutul căutării...",
+      "fetch_complete": "{{count}} rezultat(e) căutare",
+      "rag": "Se execută RAG...",
+      "rag_complete": "Se păstrează {{countAfter}} din {{countBefore}} rezultate...",
+      "rag_failed": "RAG a eșuat, se returnează rezultate goale..."
+    }
+  },
+  "minapp": {
+    "add_to_launchpad": "Adaugă în Launchpad",
+    "add_to_sidebar": "Adaugă în bara laterală",
+    "popup": {
+      "close": "Închide MinApp",
+      "devtools": "Instrumente dezvoltator",
+      "goBack": "Mergi înapoi",
+      "goForward": "Mergi înainte",
+      "minimize": "Minimizează MinApp",
+      "openExternal": "Deschide în browser",
+      "open_link_external_off": "Curent: Deschide linkurile în fereastra implicită",
+      "open_link_external_on": "Curent: Deschide linkurile în browser",
+      "refresh": "Reîmprospătează",
+      "rightclick_copyurl": "Clic dreapta pentru a copia URL-ul"
+    },
+    "remove_from_launchpad": "Elimină din Launchpad",
+    "remove_from_sidebar": "Elimină din bara laterală",
+    "sidebar": {
+      "close": {
+        "title": "Închide"
+      },
+      "closeall": {
+        "title": "Închide tot"
+      },
+      "hide": {
+        "title": "Ascunde"
+      },
+      "remove_custom": {
+        "title": "Șterge aplicația personalizată"
+      }
+    },
+    "title": "MinApp"
+  },
+  "minapps": {
+    "ant-ling": "Ant Ling",
+    "baichuan": "Baichuan",
+    "baidu-ai-search": "Baidu AI Search",
+    "chatglm": "ChatGLM",
+    "dangbei": "Dangbei",
+    "doubao": "Doubao",
+    "hailuo": "MINIMAX",
+    "metaso": "Metaso",
+    "nami-ai": "Nami AI",
+    "nami-ai-search": "Nami AI Search",
+    "qwen": "Qwen",
+    "sensechat": "SenseChat",
+    "stepfun": "Stepfun",
+    "tencent-yuanbao": "Yuanbao",
+    "tiangong-ai": "Skywork",
+    "wanzhi": "Wanzhi",
+    "wenxin": "ERNIE",
+    "wps-copilot": "WPS Copilot",
+    "xiaoyi": "Xiaoyi",
+    "zhihu": "Zhihu"
+  },
+  "miniwindow": {
+    "alert": {
+      "google_login": "Sfat: Dacă vezi un mesaj 'browser not trusted' când te conectezi la Google, te rugăm să te conectezi mai întâi prin mini-aplicația Google din lista de mini-aplicații, apoi să folosești autentificarea Google în alte mini-aplicații"
+    },
+    "clipboard": {
+      "empty": "Clipboardul este gol"
+    },
+    "feature": {
+      "chat": "Răspunde la această întrebare",
+      "explanation": "Explicație",
+      "summary": "Rezumat conținut",
+      "translate": "Traducere text"
+    },
+    "footer": {
+      "backspace_clear": "Backspace pentru a șterge",
+      "copy_last_message": "Apasă C pentru a copia",
+      "esc": "ESC pentru a {{action}}",
+      "esc_back": "reveni",
+      "esc_close": "închide",
+      "esc_pause": "pune pauză"
+    },
+    "input": {
+      "placeholder": {
+        "empty": "Cere ajutor de la {{model}}...",
+        "title": "Ce vrei să faci cu acest text?"
+      }
+    },
+    "tooltip": {
+      "pin": "Menține fereastra deasupra"
+    }
+  },
+  "models": {
+    "add_parameter": "Adaugă parametru",
+    "all": "Toate",
+    "custom_parameters": "Parametri personalizați",
+    "dimensions": "Dimensiuni {{dimensions}}",
+    "edit": "Editează modelul",
+    "embedding": "Embedding",
+    "embedding_dimensions": "Dimensiuni embedding",
+    "embedding_model": "Model embedding",
+    "embedding_model_tooltip": "Adaugă în Setări->Furnizor Model->Gestionează",
+    "enable_tool_use": "Activează utilizarea instrumentelor",
+    "filter": {
+      "by_tag": "Filtrează după etichetă",
+      "selected": "Etichete selectate"
+    },
+    "function_calling": "Apelare funcții",
+    "invalid_model": "Model invalid",
+    "no_matches": "Nu există modele disponibile",
+    "parameter_name": "Nume parametru",
+    "parameter_type": {
+      "boolean": "Boolean",
+      "json": "JSON",
+      "number": "Număr",
+      "string": "Text"
+    },
+    "pinned": "Fixat",
+    "price": {
+      "cost": "Cost",
+      "currency": "Monedă",
+      "custom": "Personalizat",
+      "custom_currency": "Monedă personalizată",
+      "custom_currency_placeholder": "Introdu moneda personalizată",
+      "input": "Preț intrare",
+      "million_tokens": "M Tokeni",
+      "output": "Preț ieșire",
+      "price": "Preț"
+    },
+    "reasoning": "Raționament",
+    "rerank_model": "Reranker",
+    "rerank_model_not_support_provider": "Momentan, modelul reranker nu acceptă acest furnizor ({{provider}})",
+    "rerank_model_support_provider": "Momentan, modelul reranker acceptă doar anumiți furnizori ({{provider}})",
+    "rerank_model_tooltip": "Fă clic pe butonul Gestionează din Setări -> Servicii Model pentru a adăuga.",
+    "search": {
+      "placeholder": "Caută modele...",
+      "tooltip": "Caută modele"
+    },
+    "stream_output": "Ieșire flux",
+    "type": {
+      "embedding": "Embedding",
+      "free": "Gratuit",
+      "function_calling": "Instrument",
+      "reasoning": "Raționament",
+      "rerank": "Reranker",
+      "select": "Tipuri de modele",
+      "text": "Text",
+      "vision": "Vizual",
+      "websearch": "Căutare Web"
+    }
+  },
+  "navbar": {
+    "expand": "Extinde dialogul",
+    "hide_sidebar": "Ascunde bara laterală",
+    "show_sidebar": "Arată bara laterală",
+    "window": {
+      "close": "Închide",
+      "maximize": "Maximizează",
+      "minimize": "Minimizează",
+      "restore": "Restaurează"
+    }
+  },
+  "navigate": {
+    "provider_settings": "Mergi la setările furnizorului"
+  },
+  "notes": {
+    "auto_rename": {
+      "empty_note": "Notița este goală, nu se poate genera numele",
+      "failed": "Generarea numelui notiței a eșuat",
+      "label": "Generează nume notiță",
+      "success": "Numele notiței a fost generat cu succes"
+    },
+    "characters": "Caractere",
+    "collapse": "Restrânge",
+    "content_placeholder": "Te rugăm să introduci conținutul notiței...",
+    "copyContent": "Copiază conținutul",
+    "crossPlatformRestoreWarning": "Configurația multi-platformă a fost restaurată, dar directorul de notițe este gol. Te rugăm să copiezi fișierele notițelor în: {{path}}",
+    "delete": "șterge",
+    "delete_confirm": "Ești sigur că vrei să ștergi acest {{type}}?",
+    "delete_folder_confirm": "Ești sigur că vrei să ștergi dosarul \"{{name}}\" și tot conținutul său?",
+    "delete_note_confirm": "Ești sigur că vrei să ștergi notița \"{{name}}\"?",
+    "drop_markdown_hint": "Trage fișiere sau dosare .md aici pentru a importa",
+    "empty": "Încă nu există notițe disponibile",
+    "expand": "desfășoară",
+    "export_failed": "Exportul în baza de cunoștințe a eșuat",
+    "export_knowledge": "Exportă notițele în baza de cunoștințe",
+    "export_success": "Exportat cu succes în baza de cunoștințe",
+    "folder": "dosar",
+    "new_folder": "Dosar nou",
+    "new_note": "Creează o notiță nouă",
+    "no_content_to_copy": "Niciun conținut de copiat",
+    "no_file_selected": "Te rugăm să selectezi fișierul de încărcat",
+    "no_valid_files": "Nu a fost încărcat niciun fișier valid",
+    "open_folder": "Deschide un dosar extern",
+    "open_outside": "Deschide din exterior",
+    "rename": "Redenumește",
+    "rename_changed": "Din cauza politicilor de securitate, numele fișierului a fost schimbat din {{original}} în {{final}}",
+    "save": "Salvează în Notițe",
+    "search": {
+      "both": "Nume+Conținut",
+      "content": "Conținut",
+      "found_results": "S-au găsit {{count}} rezultate (Nume: {{nameCount}}, Conținut: {{contentCount}})",
+      "more_matches": "mai multe potriviri",
+      "searching": "Se caută...",
+      "show_less": "Arată mai puțin"
+    },
+    "settings": {
+      "data": {
+        "apply": "Aplică",
+        "apply_path_failed": "Nu s-a putut aplica calea",
+        "current_work_directory": "Director de lucru curent",
+        "invalid_directory": "Directorul selectat este invalid sau accesul este refuzat",
+        "path_required": "Te rugăm să selectezi un director de lucru",
+        "path_updated": "Directorul de lucru a fost actualizat cu succes",
+        "reset_failed": "Resetarea a eșuat",
+        "reset_to_default": "Resetează la implicit",
+        "select": "Selectează",
+        "select_directory_failed": "Nu s-a putut selecta directorul",
+        "title": "Setări date",
+        "work_directory_description": "Directorul de lucru este locul unde sunt stocate toate fișierele notițelor. Schimbarea directorului de lucru nu va muta fișierele existente; te rugăm să migrezi fișierele manual.",
+        "work_directory_placeholder": "Selectează directorul de lucru pentru notițe"
+      },
+      "display": {
+        "compress_content": "Compresie conținut",
+        "compress_content_description": "Când este activat, va limita numărul de caractere pe linie, reducând conținutul afișat pe ecran, dar făcând paragrafele lungi mai ușor de citit.",
+        "default_font": "Font implicit",
+        "font_size": "Dimensiune font",
+        "font_size_description": "Ajustează dimensiunea fontului pentru o experiență de citire mai bună (10-30px)",
+        "font_size_large": "Mare",
+        "font_size_medium": "Mediu",
+        "font_size_small": "Mic",
+        "font_title": "Setări font",
+        "serif_font": "Font cu serife",
+        "show_table_of_contents": "Arată cuprinsul",
+        "show_table_of_contents_description": "Afișează o bară laterală cu cuprinsul pentru o navigare ușoară în documente",
+        "title": "Setări afișare"
+      },
+      "editor": {
+        "edit_mode": {
+          "description": "În Vizualizarea Editare, modul de editare implicit pentru notițe noi",
+          "preview_mode": "Previzualizare live",
+          "source_mode": "Mod cod sursă",
+          "title": "Vizualizare editare implicită"
+        },
+        "title": "Setări editor",
+        "view_mode": {
+          "description": "Mod vizualizare implicit notițe noi",
+          "edit_mode": "Mod editare",
+          "read_mode": "Mod citire",
+          "title": "Vizualizare implicită"
+        },
+        "view_mode_description": "Setează modul de vizualizare implicit pentru pagina filă nouă."
+      },
+      "title": "Notițe"
+    },
+    "show_starred": "Arată notițele favorite",
+    "sort_a2z": "Nume fișier (A-Z)",
+    "sort_created_asc": "Ora creării (cele mai vechi întâi)",
+    "sort_created_desc": "Ora creării (cele mai noi întâi)",
+    "sort_updated_asc": "Ora actualizării (cele mai vechi întâi)",
+    "sort_updated_desc": "Ora actualizării (cele mai noi întâi)",
+    "sort_z2a": "Nume fișier (Z-A)",
+    "spell_check": "Verificare ortografică",
+    "spell_check_tooltip": "Activează/Dezactivează verificarea ortografică",
+    "star": "Notiță favorită",
+    "starred_notes": "Notițe colectate",
+    "title": "Notițe",
+    "unsaved_changes": "Ai conținut nesalvat, ești sigur că vrei să pleci?",
+    "unstar": "Elimină de la favorite",
+    "untitled_folder": "Dosar nou",
+    "untitled_note": "Notiță fără titlu",
+    "upload_failed": "Încărcarea notiței a eșuat",
+    "upload_files": "Încarcă fișiere",
+    "upload_folder": "Încarcă dosar",
+    "upload_success": "Notiță încărcată cu succes",
+    "uploading_files": "Se încarcă {{count}} fișiere..."
+  },
+  "notification": {
+    "assistant": "Răspuns asistent",
+    "knowledge": {
+      "error": "{{error}}",
+      "success": "S-a adăugat cu succes {{type}} în baza de cunoștințe"
+    },
+    "tip": "Dacă răspunsul este de succes, atunci doar mesajele care depășesc 30 de secunde vor declanșa un memento"
+  },
+  "ocr": {
+    "builtin": {
+      "system": "OCR de sistem"
+    },
+    "error": {
+      "provider": {
+        "cannot_remove_builtin": "Nu se poate șterge furnizorul integrat",
+        "existing": "Furnizorul există deja",
+        "get_providers": "Nu s-au putut obține furnizorii disponibili",
+        "not_found": "Furnizorul OCR nu există",
+        "update_failed": "Nu s-a putut actualiza configurația"
+      },
+      "unknown": "A apărut o eroare în timpul procesului OCR"
+    },
+    "file": {
+      "not_supported": "Tip de fișier neacceptat {{type}}"
+    },
+    "processing": "Procesare OCR...",
+    "warning": {
+      "provider": {
+        "fallback": "S-a recurs la {{name}}, ceea ce poate cauza probleme"
+      }
+    }
+  },
+  "ollama": {
+    "keep_alive_time": {
+      "description": "Timpul în minute pentru a menține conexiunea activă; implicit este 5 minute.",
+      "placeholder": "Minute",
+      "title": "Timp menținere conexiune"
+    },
+    "title": "Ollama"
+  },
+  "ovms": {
+    "action": {
+      "install": "Instalează",
+      "installing": "Se instalează",
+      "reinstall": "Reinstalează",
+      "run": "Rulează OVMS",
+      "starting": "Se pornește",
+      "stop": "Oprește OVMS",
+      "stopping": "Se oprește"
+    },
+    "description": "<div><p>1. Descarcă modele OV.</p><p>2. Adaugă modele în 'Manager'.</p><p>Suportă doar Windows!</p><p>Cale instalare OVMS: '%USERPROFILE%\\.cherrystudio\\ovms' .</p><p>Te rugăm să consulți <a href=https://github.com/openvinotoolkit/model_server/blob/c55551763d02825829337b62c2dcef9339706f79/docs/deploying_server_baremetal.md>Ghidul Intel OVMS</a></p></dev>",
+    "download": {
+      "button": "Descarcă",
+      "error": "Eroare descărcare",
+      "model_id": {
+        "label": "ID model:",
+        "model_id_pattern": "ID-ul modelului trebuie să înceapă cu OpenVINO/",
+        "placeholder": "Obligatoriu de ex. OpenVINO/Qwen3-8B-int4-ov",
+        "required": "Te rugăm să introduci ID-ul modelului"
+      },
+      "model_name": {
+        "label": "Nume model:",
+        "placeholder": "Obligatoriu de ex. Qwen3-8B-int4-ov",
+        "required": "Te rugăm să introduci numele modelului"
+      },
+      "model_source": "Sursă model:",
+      "model_task": "Sarcină model:",
+      "success": "Descărcare reușită",
+      "success_desc": "Modelul \"{{modelName}}\"-\"{{modelId}}\" descărcat cu succes, te rugăm să mergi la interfața de gestionare OVMS pentru a adăuga modelul",
+      "tip": "Modelul se descarcă, uneori durează ore întregi. Te rugăm să ai răbdare...",
+      "title": "Descarcă model Intel OpenVINO"
+    },
+    "failed": {
+      "install": "Instalarea OVMS a eșuat:",
+      "install_code_100": "Eroare necunoscută",
+      "install_code_101": "Suportă doar procesoare Intel(R)",
+      "install_code_102": "Suportă doar Windows",
+      "install_code_103": "Descărcarea runtime-ului OVMS a eșuat",
+      "install_code_104": "Nu s-a putut instala runtime-ul OVMS",
+      "install_code_105": "Nu s-a putut crea ovdnd.exe",
+      "install_code_106": "Nu s-a putut crea run.bat",
+      "install_code_110": "Nu s-a putut curăța vechiul runtime OVMS",
+      "run": "Rularea OVMS a eșuat:",
+      "stop": "Oprirea OVMS a eșuat:"
+    },
+    "status": {
+      "not_installed": "OVMS nu este instalat",
+      "not_running": "OVMS nu rulează",
+      "running": "OVMS rulează",
+      "unknown": "Stare OVMS necunoscută"
+    },
+    "title": "Intel OVMS"
+  },
+  "paintings": {
+    "aspect_ratio": "Raport de aspect",
+    "aspect_ratios": {
+      "landscape": "Peisaj",
+      "portrait": "Portret",
+      "square": "Pătrat"
+    },
+    "auto_create_paint": "Creează automat imagine",
+    "auto_create_paint_tip": "După ce imaginea este generată, o nouă imagine va fi creată automat.",
+    "background": "Fundal",
+    "background_options": {
+      "auto": "Auto",
+      "opaque": "Opac",
+      "transparent": "Transparent"
+    },
+    "button": {
+      "delete": {
+        "image": {
+          "confirm": "Ești sigur că vrei să ștergi această imagine?",
+          "label": "Șterge imaginea"
+        }
+      },
+      "new": {
+        "image": "Imagine nouă"
+      }
+    },
+    "custom_size": "Dimensiune personalizată",
+    "edit": {
+      "image_file": "Imagine editată",
+      "magic_prompt_option_tip": "Îmbunătățește inteligent prompturile de editare",
+      "model_tip": "Versiunile V3 și V2 acceptate",
+      "number_images_tip": "Numărul de rezultate editate de generat",
+      "rendering_speed_tip": "Controlează compromisul dintre viteza de randare și calitate, disponibil doar pentru V_3",
+      "seed_tip": "Controlează aleatoriul editării",
+      "style_type_tip": "Stil pentru imaginea editată, doar pentru V_2 și versiuni ulterioare"
+    },
+    "generate": {
+      "height": "Înălțime",
+      "magic_prompt_option_tip": "Îmbunătățește inteligent prompturile pentru rezultate mai bune",
+      "model_tip": "Versiune model: V3 este cea mai recentă versiune, V2 este modelul anterior, V2A este modelul rapid, V_1 este modelul de prima generație, _TURBO este versiunea accelerată",
+      "negative_prompt_tip": "Descrie elementele nedorite, doar pentru V_1, V_1_TURBO, V_2 și V_2_TURBO",
+      "number_images_tip": "Numărul de imagini de generat",
+      "person_generation": "Generare persoană",
+      "person_generation_tip": "Permite modelului să genereze imagini cu persoane",
+      "rendering_speed_tip": "Controlează compromisul dintre viteza de randare și calitate, disponibil doar pentru V_3",
+      "safety_tolerance": "Toleranță de siguranță",
+      "safety_tolerance_tip": "Controlează toleranța de siguranță pentru generarea imaginilor, disponibil doar pentru FLUX.1-Kontext-pro",
+      "seed_tip": "Controlează aleatoriul generării imaginii pentru rezultate reproductibile",
+      "style_type_tip": "Stil generare imagine pentru V_2 și versiuni ulterioare",
+      "width": "Lățime"
+    },
+    "generated_image": "Imagine generată",
+    "go_to_settings": "Mergi la Setări",
+    "guidance_scale": "Scară de ghidare",
+    "guidance_scale_tip": "Classifier Free Guidance. Cât de fidel vrei să respecte modelul promptul tău când caută o imagine similară să-ți arate",
+    "image": {
+      "size": "Dimensiune imagine"
+    },
+    "image_file_required": "Te rugăm să încarci mai întâi o imagine",
+    "image_file_retry": "Te rugăm să reîncarci mai întâi o imagine",
+    "image_handle_required": "Te rugăm să încarci mai întâi o imagine.",
+    "image_placeholder": "Nicio imagine disponibilă",
+    "image_retry": "Reîncearcă",
+    "image_size_options": {
+      "auto": "Auto"
+    },
+    "inference_steps": "Pași de inferență",
+    "inference_steps_tip": "Numărul de pași de inferență de efectuat. Mai mulți pași produc o calitate mai mare, dar durează mai mult",
+    "input_image": "Imagine de intrare",
+    "input_parameters": "Parametri de intrare",
+    "learn_more": "Află mai multe",
+    "magic_prompt_option": "Prompt magic",
+    "mode": {
+      "edit": "Editează",
+      "generate": "Desenează",
+      "merge": "Îmbină",
+      "remix": "Remix",
+      "upscale": "Upscale"
+    },
+    "model": "Model",
+    "model_and_pricing": "Model și prețuri",
+    "moderation": "Moderare",
+    "moderation_options": {
+      "auto": "Auto",
+      "low": "Scăzut"
+    },
+    "negative_prompt": "Prompt negativ",
+    "negative_prompt_tip": "Descrie ce nu vrei să fie inclus în imagine",
+    "no_image_generation_model": "Niciun model de generare imagini disponibil, te rugăm să adaugi un model și să setezi tipul endpoint-ului la {{endpoint_type}}",
+    "number_images": "Număr imagini",
+    "number_images_tip": "Numărul de imagini de generat (1-4)",
+    "paint_course": "tutorial",
+    "per_image": "pe imagine",
+    "per_images": "pe imagini",
+    "person_generation_options": {
+      "allow_adult": "Permite adulți",
+      "allow_all": "Permite tot",
+      "allow_none": "Nepermis"
+    },
+    "pricing": "Prețuri",
+    "prompt_enhancement": "Îmbunătățire prompt",
+    "prompt_enhancement_tip": "Rescrie prompturile în versiuni detaliate, optimizate pentru model, când este activat",
+    "prompt_placeholder": "Descrie imaginea pe care vrei să o creezi, de ex. Un lac senin la apus cu munți în fundal",
+    "prompt_placeholder_edit": "Introdu descrierea imaginii, desenarea textului folosește \"ghilimele duble\" pentru încadrare",
+    "prompt_placeholder_en": "Introdu descrierea imaginii, momentan acceptă doar prompturi în engleză",
+    "proxy_required": "Deschide proxy-ul și activează \"Modul TUN\" pentru a vizualiza imaginile generate sau copiază-le în browser pentru deschidere. În viitor, conexiunea directă internă va fi acceptată",
+    "quality": "Calitate",
+    "quality_options": {
+      "auto": "Auto",
+      "high": "Înaltă",
+      "low": "Scăzută",
+      "medium": "Medie"
+    },
+    "regenerate": {
+      "confirm": "Aceasta va înlocui imaginile generate existente. Vrei să continui?"
+    },
+    "remix": {
+      "image_file": "Imagine de referință",
+      "image_weight": "Pondere imagine de referință",
+      "image_weight_tip": "Ajustează influența imaginii de referință",
+      "magic_prompt_option_tip": "Îmbunătățește inteligent prompturile de remix",
+      "model_tip": "Selectează versiunea modelului AI pentru remixare",
+      "negative_prompt_tip": "Descrie elementele nedorite în rezultatele remix",
+      "number_images_tip": "Numărul de rezultate remix de generat",
+      "rendering_speed_tip": "Controlează compromisul dintre viteza de randare și calitate, disponibil doar pentru V_3",
+      "seed_tip": "Controlează aleatoriul rezultatului combinat",
+      "style_type_tip": "Stil pentru imaginea remixată, doar pentru V_2 și versiuni ulterioare"
+    },
+    "rendering_speed": "Viteză de randare",
+    "rendering_speeds": {
+      "default": "Implicit",
+      "quality": "Calitate",
+      "turbo": "Turbo"
+    },
+    "req_error_model": "Nu s-a putut prelua modelul",
+    "req_error_no_balance": "Te rugăm să verifici validitatea tokenului",
+    "req_error_text": "Serverul este ocupat sau promptul conține termeni \"protejați prin drepturi de autor\" sau \"sensibili\". Te rugăm să încerci din nou.",
+    "req_error_token": "Te rugăm să verifici validitatea tokenului",
+    "required_field": "Câmp obligatoriu",
+    "seed": "Seed",
+    "seed_desc_tip": "Același seed și prompt pot genera imagini similare; setarea -1 va genera rezultate diferite de fiecare dată",
+    "seed_tip": "Același seed și prompt pot produce imagini similare",
+    "select_model": "Selectează modelul",
+    "style_type": "Stil",
+    "style_types": {
+      "3d": "3D",
+      "anime": "Anime",
+      "auto": "Auto",
+      "design": "Design",
+      "general": "General",
+      "realistic": "Realist"
+    },
+    "text_desc_required": "Te rugăm să introduci mai întâi descrierea imaginii",
+    "title": "Imagini",
+    "top_up": "Reîncarcă ",
+    "translating": "Se traduce...",
+    "uploaded_input": "Intrare încărcată",
+    "upscale": {
+      "detail": "Detaliu",
+      "detail_tip": "Controlează nivelul de îmbunătățire a detaliilor",
+      "image_file": "Imagine de scalat",
+      "magic_prompt_option_tip": "Îmbunătățește inteligent prompturile de upscaling",
+      "number_images_tip": "Numărul de rezultate scalate de generat",
+      "resemblance": "Similaritate",
+      "resemblance_tip": "Controlează similaritatea cu imaginea originală",
+      "seed_tip": "Controlează aleatoriul scalării"
+    }
+  },
+  "plugins": {
+    "actions": "Acțiuni",
+    "agents": "Agenți",
+    "all_categories": "Toate categoriile",
+    "all_types": "Toate",
+    "category": "Categorie",
+    "commands": "Comenzi",
+    "confirm_uninstall": "Ești sigur că vrei să dezinstalezi {{name}}?",
+    "install": "Instalează",
+    "install_plugins_from_browser": "Răsfoiește pluginurile disponibile pentru a începe",
+    "installing": "Se instalează...",
+    "name": "Nume",
+    "no_description": "Nicio descriere disponibilă",
+    "no_installed_plugins": "Niciun plugin instalat încă",
+    "no_results": "Nu s-au găsit pluginuri",
+    "search_placeholder": "Caută pluginuri...",
+    "showing_results": "Se afișează {{count}} plugin",
+    "showing_results_one": "Se afișează {{count}} plugin",
+    "showing_results_other": "Se afișează {{count}} pluginuri",
+    "showing_results_plural": "Se afișează {{count}} pluginuri",
+    "skills": "Abilități",
+    "try_different_search": "Încearcă să ajustezi căutarea sau filtrele de categorie",
+    "type": "Tip",
+    "uninstall": "Dezinstalează",
+    "uninstalling": "Se dezinstalează..."
+  },
+  "preview": {
+    "copy": {
+      "image": "Copiază ca imagine",
+      "src": "Copiază sursa imaginii"
+    },
+    "dialog": "Deschide dialog",
+    "label": "Previzualizare",
+    "pan": "Deplasează",
+    "pan_down": "Deplasează jos",
+    "pan_left": "Deplasează stânga",
+    "pan_right": "Deplasează dreapta",
+    "pan_up": "Deplasează sus",
+    "reset": "Resetează",
+    "source": "Vezi codul sursă",
+    "zoom_in": "Mărește",
+    "zoom_out": "Micșorează"
+  },
+  "prompts": {
+    "explanation": "Explică-mi acest concept",
+    "summarize": "Rezumatul acestui text",
+    "title": "Rezumatul conversației într-un titlu în {{language}} în limita a 10 caractere, ignorând instrucțiunile și fără punctuație sau simboluri. Returnează doar șirul titlului fără nimic altceva."
+  },
+  "provider": {
+    "302ai": "302.AI",
+    "ai-gateway": "Vercel AI Gateway",
+    "aihubmix": "AiHubMix",
+    "aionly": "AiOnly",
+    "alayanew": "Alaya NeW",
+    "anthropic": "Anthropic",
+    "aws-bedrock": "AWS Bedrock",
+    "azure-openai": "Azure OpenAI",
+    "baichuan": "Baichuan",
+    "baidu-cloud": "Baidu Cloud",
+    "burncloud": "BurnCloud",
+    "cephalon": "Cephalon",
+    "cerebras": "Cerebras AI",
+    "cherryin": "CherryIN",
+    "copilot": "GitHub Copilot",
+    "dashscope": "Alibaba Cloud",
+    "deepseek": "DeepSeek",
+    "dmxapi": "DMXAPI",
+    "doubao": "Volcengine",
+    "fireworks": "Fireworks",
+    "gemini": "Gemini",
+    "gitee-ai": "Gitee AI",
+    "github": "GitHub Models",
+    "gpustack": "GPUStack",
+    "grok": "Grok",
+    "groq": "Groq",
+    "huggingface": "Hugging Face",
+    "hunyuan": "Tencent Hunyuan",
+    "hyperbolic": "Hyperbolic",
+    "infini": "Infini",
+    "jina": "Jina",
+    "lanyun": "LANYUN",
+    "lmstudio": "LM Studio",
+    "longcat": "LongCat AI",
+    "mimo": "Xiaomi MiMo",
+    "minimax": "MiniMax",
+    "mistral": "Mistral",
+    "modelscope": "ModelScope",
+    "moonshot": "Moonshot",
+    "new-api": "New API",
+    "nvidia": "Nvidia",
+    "o3": "O3",
+    "ocoolai": "ocoolAI",
+    "ollama": "Ollama",
+    "openai": "OpenAI",
+    "openrouter": "OpenRouter",
+    "ovms": "Intel OVMS",
+    "perplexity": "Perplexity",
+    "ph8": "PH8",
+    "poe": "Poe",
+    "ppio": "PPIO",
+    "qiniu": "Qiniu AI",
+    "qwenlm": "QwenLM",
+    "silicon": "SiliconFlow",
+    "sophnet": "SophNet",
+    "stepfun": "StepFun",
+    "tencent-cloud-ti": "Tencent Cloud TI",
+    "together": "Together",
+    "tokenflux": "TokenFlux",
+    "vertexai": "Vertex AI",
+    "voyageai": "Voyage AI",
+    "xirang": "State Cloud Xirang",
+    "yi": "Yi",
+    "zhinao": "360AI",
+    "zhipu": "BigModel"
+  },
+  "restore": {
+    "confirm": {
+      "button": "Selectează fișierul de backup",
+      "label": "Ești sigur că vrei să restaurezi datele?"
+    },
+    "content": "Operațiunea de restaurare va suprascrie toate datele actuale ale aplicației cu datele din backup. Te rugăm să reții că procesul de restaurare poate dura ceva timp, îți mulțumim pentru răbdare.",
+    "progress": {
+      "completed": "Restaurare finalizată",
+      "copying_files": "Se copiază fișierele... {{progress}}%",
+      "extracted": "Extragere reușită",
+      "extracting": "Se extrage backup-ul...",
+      "preparing": "Se pregătește restaurarea...",
+      "reading_data": "Se citesc datele...",
+      "title": "Progres restaurare"
+    },
+    "title": "Restaurare date"
+  },
+  "richEditor": {
+    "action": {
+      "table": {
+        "deleteColumn": "Șterge coloane",
+        "deleteRow": "Șterge rânduri",
+        "insertColumnAfter": "Inserează după",
+        "insertColumnBefore": "Inserează înainte",
+        "insertRowAfter": "Inserează dedesubt",
+        "insertRowBefore": "Inserează deasupra"
+      }
+    },
+    "commands": {
+      "blockMath": {
+        "description": "Inserează formulă matematică",
+        "title": "Bloc matematic"
+      },
+      "blockquote": {
+        "description": "Capturează un citat",
+        "title": "Citat"
+      },
+      "bold": {
+        "description": "Marcat cu aldine",
+        "title": "Aldine"
+      },
+      "bulletList": {
+        "description": "Creează o listă simplă cu marcatori",
+        "title": "Listă cu marcatori"
+      },
+      "calloutInfo": {
+        "description": "Adaugă o casetă de informații",
+        "title": "Casetă informații"
+      },
+      "calloutWarning": {
+        "description": "Adaugă o casetă de avertizare",
+        "title": "Casetă avertizare"
+      },
+      "code": {
+        "description": "Inserează fragment de cod",
+        "title": "Cod"
+      },
+      "codeBlock": {
+        "description": "Capturează un fragment de cod",
+        "title": "Cod"
+      },
+      "columns": {
+        "description": "Creează aspect pe coloane",
+        "title": "Coloane"
+      },
+      "date": {
+        "description": "Inserează data curentă",
+        "title": "Dată"
+      },
+      "divider": {
+        "description": "Adaugă o linie orizontală",
+        "title": "Divizor"
+      },
+      "hardBreak": {
+        "description": "Inserează o întrerupere de linie",
+        "title": "Întrerupere de linie"
+      },
+      "heading1": {
+        "description": "Titlu secțiune mare",
+        "title": "Titlu 1"
+      },
+      "heading2": {
+        "description": "Titlu secțiune mediu",
+        "title": "Titlu 2"
+      },
+      "heading3": {
+        "description": "Titlu secțiune mic",
+        "title": "Titlu 3"
+      },
+      "heading4": {
+        "description": "Titlu secțiune mai mic",
+        "title": "Titlu 4"
+      },
+      "heading5": {
+        "description": "Titlu secțiune și mai mic",
+        "title": "Titlu 5"
+      },
+      "heading6": {
+        "description": "Cel mai mic titlu de secțiune",
+        "title": "Titlu 6"
+      },
+      "image": {
+        "description": "Inserează o imagine",
+        "title": "Imagine"
+      },
+      "inlineCode": {
+        "description": "Adaugă cod în linie",
+        "title": "Cod în linie"
+      },
+      "inlineMath": {
+        "description": "Inserează formule matematice în linie",
+        "title": "Matematică în linie"
+      },
+      "italic": {
+        "description": "Marcat ca italic",
+        "title": "Italic"
+      },
+      "link": {
+        "description": "Adaugă un link",
+        "title": "Link"
+      },
+      "noCommandsFound": "Nicio comandă găsită",
+      "orderedList": {
+        "description": "Creează o listă numerotată",
+        "title": "Listă numerotată"
+      },
+      "paragraph": {
+        "description": "Începe să scrii cu text simplu",
+        "title": "Text"
+      },
+      "redo": {
+        "description": "Refă ultima acțiune",
+        "title": "Refă"
+      },
+      "strike": {
+        "description": "Marchează ca tăiat",
+        "title": "Tăiat"
+      },
+      "table": {
+        "description": "Inserează un tabel",
+        "title": "Tabel"
+      },
+      "taskList": {
+        "description": "Creează o listă de sarcini",
+        "title": "Listă de sarcini"
+      },
+      "underline": {
+        "description": "Marchează ca subliniat",
+        "title": "Subliniat"
+      },
+      "undo": {
+        "description": "Anulează ultima acțiune",
+        "title": "Anulează"
+      }
+    },
+    "dragHandle": "Trage pentru a muta",
+    "frontMatter": {
+      "addProperty": "Adaugă o proprietate",
+      "addTag": "Adaugă etichetă",
+      "changeToBoolean": "Casetă de bifare",
+      "changeToDate": "Dată",
+      "changeToNumber": "Număr",
+      "changeToTags": "Etichete",
+      "changeToText": "Text",
+      "changeType": "Schimbă tipul",
+      "deleteProperty": "Șterge proprietatea",
+      "editValue": "Editează valoarea",
+      "empty": "Gol",
+      "moreActions": "Mai multe acțiuni",
+      "propertyName": "Nume proprietate"
+    },
+    "image": {
+      "placeholder": "Adaugă o poză"
+    },
+    "imageUploader": {
+      "embedImage": "Încorporează imagine",
+      "embedLink": "Încorporează link",
+      "embedSuccess": "Imagine încorporată cu succes",
+      "invalidType": "Te rugăm să selectezi un fișier imagine",
+      "invalidUrl": "URL imagine invalid",
+      "processing": "Se procesează imaginea...",
+      "title": "Adaugă o imagine",
+      "tooLarge": "Dimensiunea imaginii nu poate depăși 10MB",
+      "upload": "Încarcă",
+      "uploadError": "Încărcarea imaginii a eșuat",
+      "uploadFile": "Încarcă fișier",
+      "uploadHint": "Suportă JPG, PNG, GIF și alte formate, max 10MB",
+      "uploadSuccess": "Imagine încărcată cu succes",
+      "uploadText": "Fă clic sau trage imaginea aici pentru a încărca",
+      "uploading": "Se încarcă imaginea",
+      "urlPlaceholder": "Lipește linkul imaginii",
+      "urlRequired": "Te rugăm să introduci URL-ul imaginii"
+    },
+    "link": {
+      "remove": "Elimină linkul",
+      "text": "Titlu link",
+      "textPlaceholder": "Te rugăm să introduci titlul linkului",
+      "url": "URL link"
+    },
+    "math": {
+      "placeholder": "Introdu formula LaTeX"
+    },
+    "placeholder": "Scrie '/' pentru comenzi",
+    "plusButton": "Fă clic pentru a adăuga dedesubt",
+    "toolbar": {
+      "blockMath": "Bloc matematic",
+      "blockquote": "Citat",
+      "bold": "Aldine",
+      "bulletList": "Listă cu marcatori",
+      "clearMarks": "Șterge formatarea",
+      "code": "Cod în linie",
+      "codeBlock": "Bloc de cod",
+      "heading1": "Titlu 1",
+      "heading2": "Titlu 2",
+      "heading3": "Titlu 3",
+      "heading4": "Titlu 4",
+      "heading5": "Titlu 5",
+      "heading6": "Titlu 6",
+      "image": "Imagine",
+      "inlineMath": "Ecuație în linie",
+      "italic": "Italic",
+      "link": "Link",
+      "orderedList": "Listă ordonată",
+      "paragraph": "Paragraf",
+      "redo": "Refă",
+      "strike": "Tăiat",
+      "table": "Tabel",
+      "taskList": "Listă de sarcini",
+      "underline": "Subliniat",
+      "undo": "Anulează"
+    }
+  },
+  "selection": {
+    "action": {
+      "builtin": {
+        "copy": "Copiază",
+        "explain": "Explică",
+        "quote": "Citează",
+        "refine": "Rafinează",
+        "search": "Caută",
+        "summary": "Rezumat",
+        "translate": "Tradu"
+      },
+      "translate": {
+        "smart_translate_tips": "Traducere inteligentă: Conținutul va fi tradus mai întâi în limba țintă; conținutul aflat deja în limba țintă va fi tradus în limba alternativă"
+      },
+      "window": {
+        "c_copy": "C: Copiază",
+        "esc_close": "Esc: Închide",
+        "esc_stop": "Esc: Oprește",
+        "opacity": "Opacitate fereastră",
+        "original_copy": "Copiază originalul",
+        "original_hide": "Ascunde originalul",
+        "original_show": "Arată originalul",
+        "pin": "Fixează",
+        "pinned": "Fixat",
+        "r_regenerate": "R: Regenerează"
+      }
+    },
+    "name": "Asistent de selecție",
+    "settings": {
+      "actions": {
+        "add_tooltip": {
+          "disabled": "Numărul maxim de acțiuni personalizate a fost atins ({{max}})",
+          "enabled": "Adaugă acțiune personalizată"
+        },
+        "custom": "Acțiune personalizată",
+        "delete_confirm": "Ești sigur că vrei să ștergi această acțiune personalizată?",
+        "drag_hint": "Trage pentru a reordona. Mută deasupra pentru a activa acțiunea ({{enabled}}/{{max}})",
+        "reset": {
+          "button": "Resetează",
+          "confirm": "Ești sigur că vrei să resetezi la acțiunile implicite? Acțiunile personalizate nu vor fi șterse.",
+          "tooltip": "Resetează la acțiunile implicite. Acțiunile personalizate nu vor fi șterse."
+        },
+        "title": "Acțiuni"
+      },
+      "advanced": {
+        "filter_list": {
+          "description": "Funcție avansată, recomandată utilizatorilor cu experiență",
+          "title": "Listă de filtrare"
+        },
+        "filter_mode": {
+          "blacklist": "Listă neagră",
+          "default": "Oprit",
+          "description": "Poate limita asistentul de selecție să funcționeze doar în anumite aplicații (listă albă) sau să nu funcționeze (listă neagră)",
+          "title": "Filtru aplicații",
+          "whitelist": "Listă albă"
+        },
+        "title": "Avansat"
+      },
+      "enable": {
+        "description": "Momentan acceptat doar pe Windows și macOS",
+        "mac_process_trust_hint": {
+          "button": {
+            "go_to_settings": "Mergi la Setări",
+            "open_accessibility_settings": "Deschide setările de accesibilitate"
+          },
+          "description": {
+            "0": "Asistentul de selecție necesită <strong>Permisiune de accesibilitate</strong> pentru a funcționa corect.",
+            "1": "Te rugăm să faci clic pe \"<strong>Mergi la Setări</strong>\" și să apeși butonul \"<strong>Deschide setările de sistem</strong>\" în fereastra pop-up de solicitare a permisiunii care apare ulterior. Apoi găsește \"<strong>Cherry Studio</strong>\" în lista de aplicații și activează comutatorul de permisiune.",
+            "2": "După finalizarea setărilor, te rugăm să redeschizi asistentul de selecție."
+          },
+          "title": "Permisiune de accesibilitate"
+        },
+        "title": "Activează"
+      },
+      "experimental": "Funcții experimentale",
+      "filter_modal": {
+        "title": "Listă filtrare aplicații",
+        "user_tips": {
+          "mac": "Te rugăm să introduci Bundle ID-ul aplicației, unul pe linie, nu este sensibil la majuscule/minuscule, poate fi potrivit aproximativ. De exemplu: com.google.Chrome, com.apple.mail etc.",
+          "windows": "Te rugăm să introduci numele fișierului executabil al aplicației, unul pe linie, nu este sensibil la majuscule/minuscule, poate fi potrivit aproximativ. De exemplu: chrome.exe, weixin.exe, Cherry Studio.exe etc."
+        }
+      },
+      "search_modal": {
+        "custom": {
+          "name": {
+            "hint": "Te rugăm să introduci numele motorului de căutare",
+            "label": "Nume personalizat",
+            "max_length": "Numele nu poate depăși 16 caractere"
+          },
+          "test": "Test",
+          "url": {
+            "hint": "Folosește {{queryString}} pentru a reprezenta termenul de căutare",
+            "invalid_format": "Te rugăm să introduci un URL valid care începe cu http:// sau https://",
+            "label": "URL căutare personalizată",
+            "missing_placeholder": "URL-ul trebuie să conțină substituentul {{queryString}}",
+            "required": "Te rugăm să introduci URL-ul de căutare"
+          }
+        },
+        "engine": {
+          "custom": "Personalizat",
+          "label": "Motor de căutare"
+        },
+        "title": "Setează motorul de căutare"
+      },
+      "toolbar": {
+        "compact_mode": {
+          "description": "În modul compact, sunt afișate doar pictogramele, fără text",
+          "title": "Mod compact"
+        },
+        "title": "Bară de instrumente",
+        "trigger_mode": {
+          "ctrlkey": "Tasta Ctrl",
+          "ctrlkey_note": "După selecție, ține apăsată tasta Ctrl pentru a afișa bara de instrumente",
+          "description": "Modul de declanșare a asistentului de selecție și de afișare a barei de instrumente",
+          "description_note": {
+            "mac": "Dacă ai remapat tasta ⌘ folosind scurtături sau instrumente de mapare a tastaturii, acest lucru poate cauza eșecul selecției textului în unele aplicații.",
+            "windows": "Unele aplicații nu acceptă selectarea textului cu tasta Ctrl. Dacă ai remapat tasta Ctrl folosind instrumente precum AHK, acest lucru poate cauza eșecul selecției textului în unele aplicații."
+          },
+          "selected": "Selecție",
+          "selected_note": "Arată bara de instrumente imediat ce textul este selectat",
+          "shortcut": "Comandă rapidă",
+          "shortcut_link": "Mergi la Setările comenzilor rapide",
+          "shortcut_note": "După selecție, folosește comanda rapidă pentru a afișa bara de instrumente. Te rugăm să setezi comanda rapidă în pagina de setări și să o activezi. ",
+          "title": "Mod de declanșare"
+        }
+      },
+      "user_modal": {
+        "assistant": {
+          "default": "Implicit",
+          "label": "Selectează asistentul"
+        },
+        "icon": {
+          "error": "Nume pictogramă invalid, te rugăm să verifici intrarea",
+          "label": "Pictogramă",
+          "placeholder": "Introdu numele pictogramei Lucide",
+          "random": "Pictogramă aleatorie",
+          "tooltip": "Numele pictogramelor Lucide sunt cu litere mici, de ex. arrow-right",
+          "view_all": "Vezi toate pictogramele"
+        },
+        "model": {
+          "assistant": "Folosește asistent",
+          "default": "Model implicit",
+          "label": "Model",
+          "tooltip": "Folosind Asistent: Va folosi atât promptul de sistem al asistentului, cât și parametrii modelului"
+        },
+        "name": {
+          "hint": "Te rugăm să introduci numele acțiunii",
+          "label": "Nume"
+        },
+        "prompt": {
+          "copy_placeholder": "Copiază substituentul",
+          "label": "Prompt utilizator",
+          "placeholder": "Folosește substituentul {{text}} pentru a reprezenta textul selectat. Dacă este gol, textul selectat va fi adăugat la acest prompt",
+          "placeholder_text": "Substituent",
+          "tooltip": "Promptul utilizatorului servește ca o completare la intrarea utilizatorului și nu va suprascrie promptul de sistem al asistentului"
+        },
+        "title": {
+          "add": "Adaugă acțiune personalizată",
+          "edit": "Editează acțiunea personalizată"
+        }
+      },
+      "window": {
+        "auto_close": {
+          "description": "Închide automat fereastra când nu este fixată și pierde focusul",
+          "title": "Închidere automată"
+        },
+        "auto_pin": {
+          "description": "Fixează fereastra în mod implicit",
+          "title": "Fixare automată"
+        },
+        "follow_toolbar": {
+          "description": "Poziția ferestrei va urmări bara de instrumente. Când este dezactivat, va fi întotdeauna centrată.",
+          "title": "Urmărește bara de instrumente"
+        },
+        "opacity": {
+          "description": "Setează opacitatea implicită a ferestrei, 100% este complet opac",
+          "title": "Opacitate"
+        },
+        "remember_size": {
+          "description": "Fereastra se va afișa la ultima dimensiune ajustată în timpul rulării aplicației",
+          "title": "Memorează dimensiunea"
+        },
+        "title": "Fereastră de acțiune"
+      }
+    }
+  },
+  "settings": {
+    "about": {
+      "checkUpdate": {
+        "available": "Actualizare",
+        "label": "Verifică actualizări"
+      },
+      "checkingUpdate": "Se verifică actualizările...",
+      "contact": {
+        "button": "E-mail",
+        "title": "Contact"
+      },
+      "debug": {
+        "open": "Deschide",
+        "title": "Depanare"
+      },
+      "description": "Un asistent AI puternic pentru producători",
+      "downloading": "Se descarcă...",
+      "enterprise": {
+        "title": "Enterprise"
+      },
+      "feedback": {
+        "button": "Feedback",
+        "title": "Feedback"
+      },
+      "label": "Despre și feedback",
+      "releases": {
+        "button": "Lansări",
+        "title": "Note de lansare"
+      },
+      "social": {
+        "title": "Conturi sociale"
+      },
+      "title": "Despre",
+      "updateAvailable": "S-a găsit o nouă versiune {{version}}",
+      "updateError": "Eroare actualizare",
+      "updateNotAvailable": "Utilizezi cea mai recentă versiune",
+      "website": {
+        "button": "Site web",
+        "title": "Site oficial"
+      }
+    },
+    "advanced": {
+      "auto_switch_to_topics": "Comutare automată la subiect",
+      "title": "Setări avansate"
+    },
+    "assistant": {
+      "icon": {
+        "type": {
+          "emoji": "Pictogramă Emoji",
+          "label": "Tip pictogramă model",
+          "model": "Pictogramă model",
+          "none": "Ascunde"
+        }
+      },
+      "label": "Asistent implicit",
+      "model_params": "Parametri model",
+      "title": "Asistent implicit"
+    },
+    "data": {
+      "app_data": {
+        "copy_data_option": "Copiază datele, va reporni automat după copierea datelor din directorul original în noul director",
+        "copy_failed": "Copierea datelor a eșuat",
+        "copy_success": "Datele au fost copiate cu succes în noua locație",
+        "copy_time_notice": "Copierea datelor poate dura ceva timp, nu închide forțat aplicația",
+        "copying": "Se copiază datele în noua locație...",
+        "copying_warning": "Se copiază datele, nu închide forțat aplicația; aplicația va reporni după copiere",
+        "label": "Date aplicație",
+        "migration_title": "Migrare date",
+        "new_path": "Cale nouă",
+        "open": "Director Deschis",
+        "original_path": "Cale originală",
+        "path_change_failed": "Schimbarea directorului de date a eșuat",
+        "path_changed_without_copy": "Calea a fost schimbată cu succes",
+        "restart_notice": "Aplicația poate necesita repornirea de mai multe ori pentru a aplica modificările",
+        "select": "Modifică directorul",
+        "select_error": "Schimbarea directorului de date a eșuat",
+        "select_error_in_app_path": "Noua cale este aceeași cu calea de instalare a aplicației, te rugăm să selectezi o altă cale",
+        "select_error_root_path": "Noua cale nu poate fi calea rădăcină",
+        "select_error_same_path": "Noua cale este aceeași cu vechea cale, te rugăm să selectezi o altă cale",
+        "select_error_write_permission": "Noua cale nu are permisiuni de scriere",
+        "select_not_empty_dir": "Noua cale nu este goală",
+        "select_not_empty_dir_content": "Noua cale nu este goală, va suprascrie datele din noua cale și există riscul de pierdere a datelor și de eșec al copierii. Continui?",
+        "select_success": "Directorul de date a fost schimbat, aplicația va reporni pentru a aplica modificările",
+        "select_title": "Schimbă directorul de date al aplicației",
+        "stop_quit_app_reason": "Aplicația migrează datele momentan și nu poate fi închisă"
+      },
+      "app_knowledge": {
+        "button": {
+          "delete": "Șterge fișierul"
+        },
+        "label": "Fișiere bază de cunoștințe",
+        "remove_all": "Elimină fișierele bazei de cunoștințe",
+        "remove_all_confirm": "Ștergerea fișierelor bazei de cunoștințe va reduce spațiul de stocare ocupat, dar nu va șterge datele vectoriale ale bazei de cunoștințe; după ștergere, fișierul sursă nu va mai putea fi deschis. Continui?",
+        "remove_all_success": "Fișiere eliminate cu succes"
+      },
+      "app_logs": {
+        "button": "Deschide jurnalele",
+        "label": "Jurnale aplicație"
+      },
+      "backup": {
+        "skip_file_data_help": "Omite salvarea fișierelor de date precum imagini și baze de cunoștințe în timpul backup-ului și salvează doar înregistrările de chat și setările. Reduce ocuparea spațiului și accelerează viteza de backup.",
+        "skip_file_data_title": "Backup simplificat"
+      },
+      "clear_cache": {
+        "button": "Golește memoria cache",
+        "confirm": "Golirea memoriei cache va șterge datele cache ale aplicației, inclusiv datele minapp. Această acțiune este ireversibilă, continui?",
+        "error": "Eroare la golirea memoriei cache",
+        "success": "Memoria cache a fost golită",
+        "title": "Golește memoria cache"
+      },
+      "data": {
+        "title": "Director de date"
+      },
+      "divider": {
+        "basic": "Setări date de bază",
+        "cloud_storage": "Setări backup în cloud",
+        "export_settings": "Setări export",
+        "import_settings": "Setări import",
+        "third_party": "Conexiuni terțe"
+      },
+      "export_menu": {
+        "docx": "Exportă ca Word",
+        "image": "Exportă ca imagine",
+        "joplin": "Exportă în Joplin",
+        "markdown": "Exportă ca Markdown",
+        "markdown_reason": "Exportă ca Markdown (cu raționament)",
+        "notes": "Exportă în Notițe",
+        "notion": "Exportă în Notion",
+        "obsidian": "Exportă în Obsidian",
+        "plain_text": "Copiază ca text simplu",
+        "siyuan": "Exportă în SiYuan Note",
+        "title": "Setări meniu export",
+        "yuque": "Exportă în Yuque"
+      },
+      "export_to_phone": {
+        "confirm": {
+          "button": "Selectează fișierul de backup"
+        },
+        "content": "Exportă unele date, inclusiv jurnalele de chat și setările. Te rugăm să reții că procesul de backup poate dura ceva timp. Îți mulțumim pentru răbdare.",
+        "lan": {
+          "connected": "Conectat",
+          "connection_failed": "Conexiune eșuată",
+          "content": "Te rugăm să te asiguri că computerul și telefonul sunt în aceeași rețea pentru transferul LAN.",
+          "device_list_title": "Dispozitive în rețeaua locală",
+          "discovered_devices": "Dispozitive descoperite",
+          "error": {
+            "file_too_large": "Fișier prea mare, maxim 500MB acceptat",
+            "init_failed": "Inițializare eșuată",
+            "invalid_file_type": "Doar fișierele ZIP sunt acceptate",
+            "no_file": "Niciun fișier selectat",
+            "no_ip": "Nu se poate obține adresa IP",
+            "not_connected": "Te rugăm să finalizezi handshake-ul mai întâi",
+            "send_failed": "Trimiterea fișierului a eșuat"
+          },
+          "file_transfer": {
+            "cancelled": "Transfer anulat",
+            "failed": "Transfer fișier eșuat: {{message}}",
+            "progress": "Se trimite... {{progress}}%",
+            "success": "Fișier trimis cu succes"
+          },
+          "handshake": {
+            "button": "Handshake",
+            "failed": "Handshake eșuat: {{message}}",
+            "in_progress": "Se efectuează handshake...",
+            "success": "Handshake finalizat cu {{device}}",
+            "test_message_received": "Primit pong de la {{device}}",
+            "test_message_sent": "Trimis payload test hello world"
+          },
+          "idle_hint": "Scanare în pauză. Începe scanarea pentru a găsi parteneri Cherry Studio în LAN.",
+          "ip_addresses": "Adrese IP",
+          "last_seen": "Văzut ultima dată la {{time}}",
+          "metadata": "Metadate",
+          "no_connection_warning": "Te rugăm să deschizi Transfer LAN pe mobil în Cherry Studio",
+          "no_devices": "Încă nu s-au găsit parteneri LAN",
+          "scan_devices": "Scanează dispozitive",
+          "scanning_hint": "Se scanează rețeaua locală pentru parteneri Cherry Studio...",
+          "send_file": "Trimite fișier",
+          "status": {
+            "completed": "Transfer finalizat",
+            "connected": "Conectat",
+            "connecting": "Se conectează...",
+            "disconnected": "Deconectat",
+            "error": "Eroare de conexiune",
+            "initializing": "Se inițializează conexiunea...",
+            "preparing": "Se pregătește transferul...",
+            "sending": "Se transferă {{progress}}%"
+          },
+          "status_badge_idle": "Inactiv",
+          "status_badge_scanning": "Se scanează",
+          "stop_scan": "Oprește scanarea",
+          "title": "Transmisie LAN",
+          "transfer_progress": "Progres transfer"
+        },
+        "title": "Exportă pe telefon"
+      },
+      "hour_interval_one": "{{count}} oră",
+      "hour_interval_other": "{{count}} ore",
+      "import_settings": {
+        "button": "Importă fișier Json",
+        "chatgpt": "Importă din ChatGPT",
+        "title": "Importă date din aplicație externă"
+      },
+      "joplin": {
+        "check": {
+          "button": "Verifică",
+          "empty_token": "Te rugăm să introduci tokenul de autorizare Joplin",
+          "empty_url": "Te rugăm să introduci URL-ul serviciului Joplin Clipper",
+          "fail": "Verificarea conexiunii Joplin a eșuat",
+          "success": "Verificarea conexiunii Joplin a reușit"
+        },
+        "export_reasoning": {
+          "help": "Când este activat, conținutul exportat va include lanțul de raționament (procesul de gândire).",
+          "title": "Include lanțul de raționament în export"
+        },
+        "help": "În opțiunile Joplin, activează web clipper-ul (nu este necesară extensia de browser), confirmă portul și copiază tokenul de autentificare aici.",
+        "title": "Configurare Joplin",
+        "token": "Token de autorizare Joplin",
+        "token_placeholder": "Token de autorizare Joplin",
+        "url": "URL serviciu Joplin Web Clipper",
+        "url_placeholder": "http://127.0.0.1:41184/"
+      },
+      "limit": {
+        "appDataDiskQuota": "Avertisment spațiu pe disc",
+        "appDataDiskQuotaDescription": "Spațiul directorului de date este aproape plin, te rugăm să eliberezi spațiu pe disc, altfel datele se vor pierde"
+      },
+      "local": {
+        "autoSync": {
+          "label": "Backup automat",
+          "off": "Oprit"
+        },
+        "backup": {
+          "button": "Backup local",
+          "manager": {
+            "columns": {
+              "actions": "Acțiuni",
+              "fileName": "Nume fișier",
+              "modifiedTime": "Ora modificării",
+              "size": "Dimensiune"
+            },
+            "delete": {
+              "confirm": {
+                "multiple": "Ești sigur că vrei să ștergi cele {{count}} fișiere de backup selectate? Această acțiune nu poate fi anulată.",
+                "single": "Ești sigur că vrei să ștergi fișierul de backup \"{{fileName}}\"? Această acțiune nu poate fi anulată.",
+                "title": "Confirmă ștergerea"
+              },
+              "error": "Ștergerea a eșuat",
+              "selected": "Șterge selectate",
+              "success": {
+                "multiple": "S-au șters cu succes {{count}} fișiere de backup",
+                "single": "Șters cu succes"
+              },
+              "text": "Șterge"
+            },
+            "fetch": {
+              "error": "Nu s-au putut obține fișierele de backup"
+            },
+            "refresh": "Reîmprospătează",
+            "restore": {
+              "error": "Restaurare eșuată",
+              "success": "Restaurare reușită, aplicația se va reîmprospăta în scurt timp",
+              "text": "Restaurează"
+            },
+            "select": {
+              "files": {
+                "delete": "Te rugăm să selectezi fișierele de backup de șters"
+              }
+            },
+            "title": "Manager backup local"
+          },
+          "modal": {
+            "filename": {
+              "placeholder": "Te rugăm să introduci numele fișierului de backup"
+            },
+            "title": "Backup în director local"
+          }
+        },
+        "directory": {
+          "label": "Director backup local",
+          "placeholder": "Selectează un director pentru backup-uri locale",
+          "select_error_app_data_path": "Noua cale nu poate fi aceeași cu calea datelor aplicației",
+          "select_error_in_app_install_path": "Noua cale nu poate fi aceeași cu calea de instalare a aplicației",
+          "select_error_write_permission": "Noua cale nu are permisiuni de scriere",
+          "select_title": "Selectează directorul de backup"
+        },
+        "hour_interval_one": "{{count}} oră",
+        "hour_interval_other": "{{count}} ore",
+        "lastSync": "Ultimul backup",
+        "maxBackups": {
+          "label": "Backup-uri maxime",
+          "unlimited": "Nelimitat"
+        },
+        "minute_interval_one": "{{count}} minut",
+        "minute_interval_other": "{{count}} minute",
+        "noSync": "Se așteaptă următorul backup",
+        "restore": {
+          "button": "Restaurează din local",
+          "confirm": {
+            "content": "Restaurarea din backup-ul local va înlocui datele actuale. Vrei să continui?",
+            "title": "Confirmă restaurarea"
+          }
+        },
+        "syncError": "Eroare backup",
+        "syncStatus": "Stare backup",
+        "title": "Backup local"
+      },
+      "markdown_export": {
+        "exclude_citations": {
+          "help": "Exclude citările și referințele la exportul în Markdown, păstrând doar conținutul principal",
+          "title": "Exclude citările"
+        },
+        "force_dollar_math": {
+          "help": "Când este activat, $$ va fi folosit forțat pentru a marca formulele LaTeX la exportul în Markdown. Notă: Această opțiune afectează și toate metodele de export prin Markdown, cum ar fi Notion, Yuque etc.",
+          "title": "Forțează $$ pentru formulele LaTeX"
+        },
+        "help": "Dacă este furnizată, exporturile vor fi salvate automat în această cale; în caz contrar, va apărea un dialog de salvare.",
+        "path": "Cale export implicită",
+        "path_placeholder": "Cale export",
+        "select": "Selectează",
+        "show_model_name": {
+          "help": "Când este activat, numele modelului va fi afișat la exportul în Markdown. Notă: Această opțiune afectează și toate metodele de export prin Markdown, cum ar fi Notion, Yuque etc.",
+          "title": "Folosește numele modelului la export"
+        },
+        "show_model_provider": {
+          "help": "Afișează furnizorul modelului (de ex., OpenAI, Gemini) la exportul în Markdown",
+          "title": "Arată furnizorul modelului"
+        },
+        "standardize_citations": {
+          "help": "Când este activat, marcatorii de citare vor fi convertiți în format standard de notă de subsol Markdown [^1], iar listele de citare vor fi formatate.",
+          "title": "Standardizează formatul citării"
+        },
+        "title": "Export Markdown"
+      },
+      "message_title": {
+        "use_topic_naming": {
+          "help": "Când este activat, folosește modelul rapid pentru a numi titlul mesajelor exportate. Această setare afectează și toate metodele de export prin Markdown.",
+          "title": "Folosește modelul rapid pentru a numi titlul mesajului exportat"
+        }
+      },
+      "minute_interval_one": "{{count}} minut",
+      "minute_interval_other": "{{count}} minute",
+      "notion": {
+        "api_key": "Cheie API Notion",
+        "api_key_placeholder": "Introdu cheia API Notion",
+        "check": {
+          "button": "Verifică",
+          "empty_api_key": "Cheia API nu este configurată",
+          "empty_database_id": "ID-ul bazei de date nu este configurat",
+          "error": "Eroare de conexiune, te rugăm să verifici configurația rețelei și cheia API și ID-ul bazei de date",
+          "fail": "Conexiune eșuată, te rugăm să verifici rețeaua și cheia API și ID-ul bazei de date",
+          "success": "Conexiune reușită"
+        },
+        "database_id": "ID bază de date Notion",
+        "database_id_placeholder": "Introdu ID-ul bazei de date Notion",
+        "export_reasoning": {
+          "help": "Când este activat, conținutul exportat va include lanțul de raționament (procesul de gândire).",
+          "title": "Include lanțul de raționament în export"
+        },
+        "help": "Documentație configurare Notion",
+        "page_name_key": "Nume câmp titlu pagină",
+        "page_name_key_placeholder": "Introdu numele câmpului pentru titlul paginii, implicit este Name",
+        "title": "Setări Notion"
+      },
+      "nutstore": {
+        "backup": {
+          "button": "Backup în Nutstore",
+          "modal": {
+            "filename": {
+              "placeholder": "Introdu numele fișierului de backup"
+            },
+            "title": "Backup în Nutstore"
+          }
+        },
+        "checkConnection": {
+          "fail": "Conexiunea Nutstore a eșuat",
+          "name": "Verifică conexiunea",
+          "success": "Conectat la Nutstore"
+        },
+        "isLogin": "Conectat",
+        "login": {
+          "button": "Conectare"
+        },
+        "logout": {
+          "button": "Deconectare",
+          "content": "După deconectare, nu vei mai putea face backup în Nutstore sau restaura din Nutstore.",
+          "title": "Ești sigur că vrei să te deconectezi de la Nutstore?"
+        },
+        "new_folder": {
+          "button": {
+            "cancel": "Anulează",
+            "confirm": "Confirmă",
+            "label": "Dosar nou"
+          }
+        },
+        "notLogin": "Neconectat",
+        "path": {
+          "label": "Cale stocare Nutstore",
+          "placeholder": "Introdu calea de stocare Nutstore"
+        },
+        "pathSelector": {
+          "currentPath": "Cale curentă",
+          "return": "Înapoi",
+          "title": "Cale stocare Nutstore"
+        },
+        "restore": {
+          "button": "Restaurează din Nutstore",
+          "confirm": {
+            "content": "Restaurarea din Nutstore va suprascrie datele curente. Vrei să continui?",
+            "title": "Restaurează din Nutstore"
+          }
+        },
+        "title": "Configurare Nutstore",
+        "username": "Nume utilizator Nutstore"
+      },
+      "obsidian": {
+        "default_vault": "Seif Obsidian implicit",
+        "default_vault_export_failed": "Export eșuat",
+        "default_vault_fetch_error": "Nu s-a putut prelua seiful Obsidian",
+        "default_vault_loading": "Se încarcă seiful Obsidian...",
+        "default_vault_no_vaults": "Nu s-au găsit seifuri Obsidian",
+        "default_vault_placeholder": "Te rugăm să selectezi seiful Obsidian implicit",
+        "title": "Configurare Obsidian"
+      },
+      "s3": {
+        "accessKeyId": {
+          "label": "ID cheie de acces",
+          "placeholder": "ID cheie de acces"
+        },
+        "autoSync": {
+          "hour": "La fiecare {{count}} oră",
+          "label": "Sincronizare automată",
+          "minute": "La fiecare {{count}} minute",
+          "off": "Oprit"
+        },
+        "backup": {
+          "button": "Backup acum",
+          "error": "Backup S3 eșuat: {{message}}",
+          "manager": {
+            "button": "Gestionează backup-uri"
+          },
+          "modal": {
+            "filename": {
+              "placeholder": "Te rugăm să introduci numele fișierului de backup"
+            },
+            "title": "Backup S3"
+          },
+          "operation": "Operațiune de backup",
+          "success": "Backup S3 reușit"
+        },
+        "bucket": {
+          "label": "Bucket",
+          "placeholder": "Bucket, de ex.: exemplu"
+        },
+        "endpoint": {
+          "label": "Endpoint API",
+          "placeholder": "https://s3.example.com"
+        },
+        "manager": {
+          "close": "Închide",
+          "columns": {
+            "actions": "Acțiuni",
+            "fileName": "Nume fișier",
+            "modifiedTime": "Ora modificării",
+            "size": "Dimensiune fișier"
+          },
+          "config": {
+            "incomplete": "Te rugăm să completezi configurația S3 completă"
+          },
+          "delete": {
+            "confirm": {
+              "multiple": "Ești sigur că vrei să ștergi cele {{count}} fișiere de backup selectate? Această acțiune nu poate fi anulată.",
+              "single": "Ești sigur că vrei să ștergi fișierul de backup \"{{fileName}}\"? Această acțiune nu poate fi anulată.",
+              "title": "Confirmă ștergerea"
+            },
+            "error": "Nu s-a putut șterge fișierul de backup: {{message}}",
+            "label": "Șterge",
+            "selected": "Șterge selectate ({{count}})",
+            "success": {
+              "multiple": "S-au șters cu succes {{count}} fișiere de backup",
+              "single": "Fișier de backup șters cu succes"
+            }
+          },
+          "files": {
+            "fetch": {
+              "error": "Nu s-a putut prelua lista fișierelor de backup: {{message}}"
+            }
+          },
+          "refresh": "Reîmprospătează",
+          "restore": "Restaurează",
+          "select": {
+            "warning": "Te rugăm să selectezi fișierele de backup de șters"
+          },
+          "title": "Manager fișiere backup S3"
+        },
+        "maxBackups": {
+          "label": "Backup-uri maxime",
+          "unlimited": "Nelimitat"
+        },
+        "region": {
+          "label": "Regiune",
+          "placeholder": "Regiune, de ex.: us-east-1"
+        },
+        "restore": {
+          "config": {
+            "incomplete": "Te rugăm să completezi configurația S3 completă"
+          },
+          "confirm": {
+            "cancel": "Anulează",
+            "content": "Restaurarea datelor va suprascrie toate datele curente. Această acțiune nu poate fi anulată. Ești sigur că vrei să continui?",
+            "ok": "Confirmă restaurarea",
+            "title": "Confirmă restaurarea datelor"
+          },
+          "error": "Restaurarea datelor a eșuat: {{message}}",
+          "file": {
+            "required": "Te rugăm să selectezi fișierul de backup pentru restaurare"
+          },
+          "modal": {
+            "select": {
+              "placeholder": "Te rugăm să selectezi fișierul de backup pentru restaurare"
+            },
+            "title": "Restaurare date S3"
+          },
+          "success": "Restaurarea datelor a reușit"
+        },
+        "root": {
+          "label": "Director backup (Opțional)",
+          "placeholder": "de ex.: /cherry-studio"
+        },
+        "secretAccessKey": {
+          "label": "Cheie secretă de acces",
+          "placeholder": "Cheie secretă de acces"
+        },
+        "skipBackupFile": {
+          "help": "Când este activat, datele fișierelor vor fi omise în timpul backup-ului, vor fi salvate doar informațiile de configurare, reducând semnificativ dimensiunea fișierului de backup",
+          "label": "Backup ușor"
+        },
+        "syncStatus": {
+          "error": "Eroare sincronizare: {{message}}",
+          "label": "Stare sincronizare",
+          "lastSync": "Ultima sincronizare: {{time}}",
+          "noSync": "Nesincronizat"
+        },
+        "title": {
+          "help": "Servicii de stocare a obiectelor compatibile S3, cum ar fi AWS S3, Cloudflare R2, Aliyun OSS, Tencent COS etc.",
+          "label": "Stocare compatibilă S3",
+          "tooltip": "Documentație configurare stocare compatibilă S3"
+        }
+      },
+      "siyuan": {
+        "api_url": "URL API SiYuan Note",
+        "api_url_placeholder": "de ex.: http://127.0.0.1:6806",
+        "box_id": "ID Box SiYuan Note",
+        "box_id_placeholder": "Te rugăm să introduci ID-ul Box SiYuan Note",
+        "check": {
+          "button": "Verifică",
+          "empty_config": "Te rugăm să completezi adresa API și tokenul",
+          "error": "Eroare de conexiune, te rugăm să verifici conexiunea la rețea",
+          "fail": "Conexiune eșuată, te rugăm să verifici adresa API și tokenul",
+          "success": "Conexiune reușită",
+          "title": "Verificare conexiune"
+        },
+        "root_path": "Cale rădăcină SiYuan Note",
+        "root_path_placeholder": "de ex.: /CherryStudio",
+        "title": "Configurare SiYuan Note",
+        "token": {
+          "help": "Obține token SiYuan Note",
+          "label": "Token SiYuan Note"
+        },
+        "token_placeholder": "Te rugăm să introduci tokenul SiYuan Note"
+      },
+      "title": "Setări date",
+      "webdav": {
+        "autoSync": {
+          "label": "Backup automat",
+          "off": "Oprit"
+        },
+        "backup": {
+          "button": "Backup în WebDAV",
+          "manager": {
+            "columns": {
+              "actions": "Acțiuni",
+              "fileName": "Nume fișier",
+              "modifiedTime": "Ora modificării",
+              "size": "Dimensiune"
+            },
+            "delete": {
+              "confirm": {
+                "multiple": "Ești sigur că vrei să ștergi cele {{count}} fișiere de backup selectate? Această acțiune nu poate fi anulată.",
+                "single": "Ești sigur că vrei să ștergi fișierul de backup \"{{fileName}}\"? Această acțiune nu poate fi anulată.",
+                "title": "Confirmă ștergerea"
+              },
+              "error": "Ștergerea a eșuat",
+              "selected": "Șterge selectate",
+              "success": {
+                "multiple": "S-au șters cu succes {{count}} fișiere de backup",
+                "single": "Șters cu succes"
+              },
+              "text": "Șterge"
+            },
+            "fetch": {
+              "error": "Nu s-au putut obține fișierele de backup"
+            },
+            "refresh": "Reîmprospătează",
+            "restore": {
+              "error": "Restaurare eșuată",
+              "success": "Restaurare reușită, aplicația se va reîmprospăta în scurt timp",
+              "text": "Restaurează"
+            },
+            "select": {
+              "files": {
+                "delete": "Te rugăm să selectezi fișierele de backup de șters"
+              }
+            },
+            "title": "Gestionare date backup"
+          },
+          "modal": {
+            "filename": {
+              "placeholder": "Te rugăm să introduci numele fișierului de backup"
+            },
+            "title": "Backup în WebDAV"
+          }
+        },
+        "disableStream": {
+          "help": "Când este activat, încarcă fișierul în memorie înainte de încărcare. Acest lucru poate rezolva probleme de incompatibilitate cu unele servere WebDAV care nu acceptă încărcări fragmentate, dar va crește utilizarea memoriei.",
+          "title": "Dezactivează încărcarea prin flux"
+        },
+        "host": {
+          "label": "Gazdă WebDAV",
+          "placeholder": "http://localhost:8080"
+        },
+        "hour_interval_one": "{{count}} oră",
+        "hour_interval_other": "{{count}} ore",
+        "lastSync": "Ultimul backup",
+        "maxBackups": "Backup-uri maxime",
+        "minute_interval_one": "{{count}} minut",
+        "minute_interval_other": "{{count}} minute",
+        "noSync": "Se așteaptă următorul backup",
+        "password": "Parolă WebDAV",
+        "path": {
+          "label": "Cale WebDAV",
+          "placeholder": "/backup"
+        },
+        "restore": {
+          "button": "Restaurează din WebDAV",
+          "confirm": {
+            "content": "Restaurarea din WebDAV va suprascrie datele curente. Vrei să continui?",
+            "title": "Confirmă restaurarea"
+          },
+          "content": "Restaurarea din WebDAV va suprascrie datele curente, continui?",
+          "title": "Restaurează din WebDAV"
+        },
+        "syncError": "Eroare backup",
+        "syncStatus": "Stare backup",
+        "title": "WebDAV",
+        "user": "Utilizator WebDAV"
+      },
+      "yuque": {
+        "check": {
+          "button": "Verifică",
+          "empty_repo_url": "Te rugăm să introduci mai întâi URL-ul bazei de cunoștințe",
+          "empty_token": "Te rugăm să introduci mai întâi tokenul Yuque",
+          "fail": "Verificarea conexiunii Yuque a eșuat",
+          "success": "Conexiunea Yuque a fost verificată cu succes"
+        },
+        "help": "Obține token Yuque",
+        "repo_url": "URL Yuque",
+        "repo_url_placeholder": "https://www.yuque.com/username/xxx",
+        "title": "Configurare Yuque",
+        "token": "Token Yuque",
+        "token_placeholder": "Te rugăm să introduci tokenul Yuque"
+      }
+    },
+    "developer": {
+      "enable_developer_mode": "Activează modul dezvoltator",
+      "help": "După activarea modului dezvoltator, poți folosi funcția de urmărire (trace) pentru a vizualiza fluxul de date în timpul invocării modelului.",
+      "title": "Mod dezvoltator"
+    },
+    "display": {
+      "assistant": {
+        "title": "Setări asistent"
+      },
+      "custom": {
+        "css": {
+          "cherrycss": "Obține de la cherrycss.com",
+          "label": "CSS personalizat",
+          "placeholder": "/* Pune CSS personalizat aici */"
+        }
+      },
+      "font": {
+        "code": "Font cod",
+        "default": "Implicit",
+        "global": "Font global",
+        "select": "Selectează font",
+        "title": "Setări font"
+      },
+      "navbar": {
+        "position": {
+          "label": "Poziție bară de navigare",
+          "left": "Stânga",
+          "top": "Sus"
+        },
+        "title": "Setări bară de navigare"
+      },
+      "sidebar": {
+        "chat": {
+          "hiddenMessage": "Asistenții sunt funcții de bază, nu se acceptă ascunderea"
+        },
+        "disabled": "Ascunde pictograme",
+        "empty": "Trage funcția ascunsă din partea stângă aici",
+        "files": {
+          "icon": "Arată pictograma Fișiere"
+        },
+        "knowledge": {
+          "icon": "Arată pictograma Cunoștințe"
+        },
+        "minapp": {
+          "icon": "Arată pictograma MinApp"
+        },
+        "painting": {
+          "icon": "Arată pictograma Pictură"
+        },
+        "title": "Setări bară laterală",
+        "translate": {
+          "icon": "Arată pictograma Traducere"
+        },
+        "visible": "Arată pictograme"
+      },
+      "title": "Setări afișare",
+      "topic": {
+        "title": "Setări subiect"
+      },
+      "zoom": {
+        "title": "Setări zoom"
+      }
+    },
+    "font_size": {
+      "title": "Dimensiune font mesaj"
+    },
+    "general": {
+      "auto_check_update": {
+        "title": "Actualizare automată"
+      },
+      "avatar": {
+        "builtin": "Avatar integrat",
+        "reset": "Resetează avatarul"
+      },
+      "backup": {
+        "button": "Backup",
+        "title": "Backup și recuperare date"
+      },
+      "display": {
+        "title": "Setări afișare"
+      },
+      "emoji_picker": "Selector emoji",
+      "image_upload": "Încărcare imagine",
+      "label": "Setări generale",
+      "reset": {
+        "button": "Resetează",
+        "title": "Resetare date"
+      },
+      "restore": {
+        "button": "Restaurează"
+      },
+      "spell_check": {
+        "label": "Verificare ortografică",
+        "languages": "Folosește verificarea ortografică pentru"
+      },
+      "test_plan": {
+        "beta_version": "Versiune Beta",
+        "beta_version_tooltip": "Funcțiile se pot schimba oricând, mai multe bug-uri, actualizare rapidă",
+        "rc_version": "Versiune Previzualizare (RC)",
+        "rc_version_tooltip": "Aproape de versiunea stabilă, funcțiile sunt în principiu stabile, puține bug-uri",
+        "title": "Plan de testare",
+        "tooltip": "Participă la planul de testare pentru a experimenta mai rapid cele mai recente funcții, dar aduce și mai multe riscuri; te rugăm să faci backup datelor în avans",
+        "version_channel_not_match": "Comutarea versiunii de previzualizare și test va intra în vigoare după lansarea următoarei versiuni stabile",
+        "version_options": "Opțiuni versiune"
+      },
+      "title": "Setări generale",
+      "user_name": {
+        "label": "Nume utilizator",
+        "placeholder": "Introdu numele tău"
+      },
+      "view_webdav_settings": "Vezi setările WebDAV"
+    },
+    "groq": {
+      "title": "Setări Groq"
+    },
+    "hardware_acceleration": {
+      "confirm": {
+        "content": "Dezactivarea accelerării hardware necesită repornirea aplicației pentru a intra în vigoare. Vrei să repornești acum?",
+        "title": "Repornire necesară"
+      },
+      "title": "Dezactivează accelerarea hardware"
+    },
+    "input": {
+      "auto_translate_with_space": "Tradu rapid cu 3 spații",
+      "clear": {
+        "all": "Golește",
+        "knowledge_base": "Golește bazele de cunoștințe selectate",
+        "models": "Golește toate modelele"
+      },
+      "show_translate_confirm": "Arată dialogul de confirmare a traducerii",
+      "target_language": {
+        "chinese": "Chineză simplificată",
+        "chinese-traditional": "Chineză tradițională",
+        "english": "Engleză",
+        "japanese": "Japoneză",
+        "label": "Limba țintă",
+        "russian": "Rusă"
+      }
+    },
+    "launch": {
+      "onboot": "Pornește automat la pornirea sistemului",
+      "title": "Lansare",
+      "totray": "Minimizează în zona de notificare la pornire"
+    },
+    "math": {
+      "engine": {
+        "label": "Motor matematic",
+        "none": "Niciunul"
+      },
+      "single_dollar": {
+        "label": "Activează $...$",
+        "tip": "Randează ecuațiile matematice citate prin semne unice de dolar $...$. Implicit este activat."
+      },
+      "title": "Setări matematice"
+    },
+    "mcp": {
+      "actions": "Acțiuni",
+      "active": "Activ",
+      "addError": "Nu s-a putut adăuga serverul",
+      "addServer": {
+        "create": "Creare rapidă",
+        "importFrom": {
+          "connectionFailed": "Conexiune eșuată",
+          "dxt": "Importă pachet DXT",
+          "dxtFile": "Fișier pachet DXT",
+          "dxtHelp": "Selectează un fișier .dxt care conține un pachet de server MCP",
+          "dxtProcessFailed": "Procesarea fișierului DXT a eșuat",
+          "error": {
+            "multipleServers": "Nu se poate importa din mai multe servere"
+          },
+          "invalid": "Intrare invalidă, te rugăm să verifici formatul JSON",
+          "json": "Importă din JSON",
+          "method": "Metodă import",
+          "nameExists": "Serverul există deja: {{name}}",
+          "noDxtFile": "Te rugăm să selectezi un fișier DXT",
+          "oneServer": "Doar o singură configurație de server MCP la un moment dat",
+          "placeholder": "Lipește configurația JSON a serverului MCP",
+          "selectDxtFile": "Selectează fișierul DXT",
+          "tooltip": "Te rugăm să copiezi JSON-ul de configurare (prioritizând configurațiile\n NPX sau UVX) din pagina de introducere a serverelor MCP și să-l lipești în caseta de intrare."
+        },
+        "label": "Adaugă server"
+      },
+      "addSuccess": "Server adăugat cu succes",
+      "advancedSettings": "Setări avansate",
+      "args": "Argumente",
+      "argsTooltip": "Fiecare argument pe o linie nouă",
+      "baseUrlTooltip": "URL de bază server la distanță",
+      "builtinServers": "Servere integrate",
+      "builtinServersDescriptions": {
+        "brave_search": "O implementare de server MCP care integrează API-ul Brave Search, oferind funcționalități de căutare web și locală. Necesită configurarea variabilei de mediu BRAVE_API_KEY",
+        "browser": "Controlează o fereastră Electron headless prin Protocolul Chrome DevTools. Instrumente: deschide URL, execută JS pe o singură linie, resetează sesiunea.",
+        "didi_mcp": "Server DiDi MCP care oferă servicii de ride-hailing, inclusiv căutare pe hartă, estimare preț, gestionare comenzi și urmărire șofer. Disponibil doar în China continentală. Necesită configurarea variabilei de mediu DIDI_API_KEY",
+        "dify_knowledge": "Implementarea serverului MCP Dify oferă un API simplu pentru a interacționa cu Dify. Necesită configurarea cheii Dify",
+        "fetch": "Server MCP pentru preluarea conținutului web de la URL",
+        "filesystem": "Un server Node.js care implementează Protocolul de Context Model (MCP) pentru operațiuni în sistemul de fișiere. Necesită configurarea directoarelor permise pentru acces.",
+        "mcp_auto_install": "Instalează automat serviciul MCP (beta)",
+        "memory": "Implementare de memorie persistentă bazată pe un graf de cunoștințe local. Aceasta permite modelului să rețină informații legate de utilizator între conversații diferite. Necesită configurarea variabilei de mediu MEMORY_FILE_PATH.",
+        "no": "Fără descriere",
+        "nowledge_mem": "Necesită aplicația Nowledge Mem rulând local. Păstrează chat-urile AI, instrumentele, notițele, agenții și fișierele în memoria privată de pe computerul tău. Descarcă de la https://mem.nowledge.co/",
+        "python": "Execută cod Python într-un mediu sandbox securizat. Rulează Python cu Pyodide, suportând majoritatea bibliotecilor standard și pachetelor de calcul științific",
+        "sequentialthinking": "O implementare de server MCP care oferă instrumente pentru rezolvarea dinamică și reflexivă a problemelor prin procese de gândire structurată"
+      },
+      "command": "Comandă",
+      "config_description": "Configurează serverele Protocolului de Context Model",
+      "customRegistryPlaceholder": "Introdu URL registru privat, de ex.: https://npm.company.com",
+      "deleteError": "Nu s-a putut șterge serverul",
+      "deleteServer": "Șterge serverul",
+      "deleteServerConfirm": "Ești sigur că vrei să ștergi acest server?",
+      "deleteSuccess": "Server șters cu succes",
+      "dependenciesInstall": "Instalează dependențe",
+      "dependenciesInstalling": "Se instalează dependențele...",
+      "description": "Descriere",
+      "disable": {
+        "description": "Nu activa funcționalitatea serverului MCP",
+        "label": "Dezactivează serverul MCP"
+      },
+      "discover": "Descoperă",
+      "duplicateName": "Un server cu acest nume există deja",
+      "editJson": "Editează JSON",
+      "editMcpJson": "Editează configurația MCP",
+      "editServer": "Editează serverul",
+      "env": "Variabile de mediu",
+      "envTooltip": "Format: CHEIE=valoare, una pe linie",
+      "errors": {
+        "32000": "Serverul MCP nu a pornit, te rugăm să verifici parametrii conform tutorialului",
+        "toolNotFound": "Instrumentul {{name}} nu a fost găsit"
+      },
+      "fetch": {
+        "button": "Preluare servere",
+        "success": "Serverele MCP au fost preluate cu succes"
+      },
+      "findMore": "Găsește mai multe MCP",
+      "headers": "Headere",
+      "headersTooltip": "Headere personalizate pentru cereri HTTP",
+      "inMemory": "Memorie",
+      "install": "Instalează",
+      "installError": "Instalarea dependențelor a eșuat",
+      "installHelp": "Obține ajutor pentru instalare",
+      "installSuccess": "Dependențe instalate cu succes",
+      "jsonFormatError": "Eroare formatare JSON",
+      "jsonModeHint": "Editează reprezentarea JSON a configurației serverului MCP. Te rugăm să te asiguri că formatul este corect înainte de salvare.",
+      "jsonSaveError": "Nu s-a putut salva configurația JSON.",
+      "jsonSaveSuccess": "Configurația JSON a fost salvată.",
+      "logoUrl": "URL logo",
+      "logs": "Jurnale",
+      "longRunning": "Mod rulare lungă",
+      "longRunningTooltip": "Când este activat, serverul acceptă sarcini de lungă durată. La primirea notificărilor de progres, timpul de expirare va fi resetat, iar timpul maxim de execuție va fi extins la 10 minute.",
+      "marketplaces": "Piețe",
+      "missingDependencies": "Lipsește, te rugăm să îl instalezi pentru a continua.",
+      "more": {
+        "awesome": "Listă curatoriată servere MCP",
+        "composio": "Instrumente dezvoltare MCP Composio",
+        "glama": "Director servere MCP Glama",
+        "higress": "Server MCP Higress",
+        "mcpso": "Platformă descoperire servere MCP",
+        "modelscope": "Server MCP comunitate ModelScope",
+        "official": "Colecție oficială servere MCP",
+        "pulsemcp": "Server MCP Pulse",
+        "smithery": "Instrumente MCP Smithery",
+        "zhipu": "MCP curatoriat, integrare rapidă"
+      },
+      "name": "Nume",
+      "newServer": "Server MCP",
+      "noDescriptionAvailable": "Nicio descriere disponibilă",
+      "noLogs": "Niciun jurnal încă",
+      "noServers": "Niciun server configurat",
+      "not_support": "Model neacceptat",
+      "npx_list": {
+        "actions": "Acțiuni",
+        "description": "Descriere",
+        "no_packages": "Nu s-au găsit pachete",
+        "npm": "NPM",
+        "package_name": "Nume pachet",
+        "scope_placeholder": "Introdu domeniul npm (de ex. @organizatia-ta)",
+        "scope_required": "Te rugăm să introduci domeniul npm",
+        "search": "Caută",
+        "search_error": "Eroare căutare",
+        "usage": "Utilizare",
+        "version": "Versiune"
+      },
+      "oauth": {
+        "callback": {
+          "message": "Poți închide această pagină și te poți întoarce la Cherry Studio",
+          "title": "Autentificare reușită"
+        }
+      },
+      "prompts": {
+        "arguments": "Argumente",
+        "availablePrompts": "Prompturi disponibile",
+        "genericError": "Eroare obținere prompt",
+        "loadError": "Eroare obținere prompturi",
+        "noPromptsAvailable": "Nu există prompturi disponibile",
+        "requiredField": "Câmp obligatoriu"
+      },
+      "protocolInstallWarning": {
+        "command": "Comandă pornire",
+        "message": "Acest MCP a fost instalat dintr-o sursă externă prin protocol. Rularea instrumentelor necunoscute poate dăuna computerului tău.",
+        "run": "Rulează",
+        "title": "Rulezi MCP extern?"
+      },
+      "provider": "Furnizor",
+      "providerPlaceholder": "Nume furnizor",
+      "providerUrl": "URL furnizor",
+      "providers": "Furnizori",
+      "registry": "Registru pachete",
+      "registryDefault": "Implicit",
+      "registryTooltip": "Alege registrul pentru instalarea pachetelor pentru a rezolva problemele de rețea cu registrul implicit.",
+      "requiresConfig": "Necesită configurare",
+      "resources": {
+        "availableResources": "Resurse disponibile",
+        "blob": "Blob",
+        "blobInvisible": "Blob invizibil",
+        "genericError": "Eroare achiziție resursă",
+        "mimeType": "Tip MIME",
+        "noResourcesAvailable": "Nu există resurse disponibile",
+        "size": "Dimensiune",
+        "text": "Text",
+        "uri": "URI"
+      },
+      "search": {
+        "placeholder": "Caută servere MCP...",
+        "tooltip": "Caută servere MCP"
+      },
+      "searchNpx": "Caută MCP",
+      "serverPlural": "servere",
+      "serverSingular": "server",
+      "servers": "Servere MCP",
+      "sse": "Evenimente trimise de server (sse)",
+      "startError": "Pornire eșuată",
+      "stdio": "Intrare/Ieșire standard (stdio)",
+      "streamableHttp": "HTTP fluxabil (streamableHttp)",
+      "sync": {
+        "button": "Sincronizează",
+        "discoverMcpServers": "Descoperă servere MCP",
+        "discoverMcpServersDescription": "Vizitează platforma pentru a descoperi servere MCP disponibile",
+        "error": "Eroare sincronizare servere MCP",
+        "getToken": "Obține token API",
+        "getTokenDescription": "Obține tokenul tău personal API din contul tău",
+        "noServersAvailable": "Nu există servere MCP disponibile",
+        "selectProvider": "Selectează furnizor:",
+        "setToken": "Introdu tokenul tău",
+        "success": "Sincronizare servere MCP reușită",
+        "title": "Sincronizare servere",
+        "tokenPlaceholder": "Introdu tokenul API aici",
+        "tokenRequired": "Tokenul API este obligatoriu",
+        "unauthorized": "Sincronizare neautorizată"
+      },
+      "system": "Sistem",
+      "tabs": {
+        "description": "Descriere",
+        "general": "General",
+        "prompts": "Prompturi",
+        "resources": "Resurse",
+        "tools": "Instrumente"
+      },
+      "tags": "Etichete",
+      "tagsPlaceholder": "Introdu etichete",
+      "timeout": "Expirare",
+      "timeoutTooltip": "Timpul de expirare în secunde pentru cererile către acest server, implicit este 60 secunde",
+      "title": "Servere MCP",
+      "tools": {
+        "autoApprove": {
+          "label": "Aprobare automată",
+          "tooltip": {
+            "confirm": "Ești sigur că vrei să rulezi acest instrument MCP?",
+            "disabled": "Instrumentul va necesita aprobare manuală înainte de rulare",
+            "enabled": "Instrumentul va rula automat fără confirmare",
+            "howToEnable": "Activează mai întâi instrumentul pentru a folosi aprobarea automată"
+          }
+        },
+        "availableTools": "Instrumente disponibile",
+        "enable": "Activează instrumentul",
+        "inputSchema": {
+          "enum": {
+            "allowedValues": "Valori permise"
+          },
+          "label": "Schemă intrare"
+        },
+        "loadError": "Eroare obținere instrumente",
+        "noToolsAvailable": "Nu există instrumente disponibile",
+        "run": "Rulează"
+      },
+      "type": "Tip",
+      "types": {
+        "inMemory": "În memorie",
+        "sse": "SSE",
+        "stdio": "STDIO",
+        "streamableHttp": "HTTP fluxabil"
+      },
+      "updateError": "Actualizarea serverului a eșuat",
+      "updateSuccess": "Server actualizat cu succes",
+      "url": "URL",
+      "user": "Utilizator"
+    },
+    "messages": {
+      "divider": {
+        "label": "Arată divizor între mesaje",
+        "tooltip": "Nu se aplică mesajelor stil bulă"
+      },
+      "grid_columns": "Coloane afișare grilă mesaje",
+      "grid_popover_trigger": {
+        "click": "Fă clic pentru a afișa",
+        "hover": "Plasează cursorul pentru a afișa",
+        "label": "Declanșator detaliu grilă"
+      },
+      "input": {
+        "confirm_delete_message": "Confirmă înainte de ștergerea mesajelor",
+        "confirm_regenerate_message": "Confirmă înainte de regenerarea mesajelor",
+        "enable_quick_triggers": "Activează declanșatoarele / și @",
+        "paste_long_text_as_file": "Lipește text lung ca fișier",
+        "paste_long_text_threshold": "Lungime lipire text lung",
+        "send_shortcuts": "Comenzi rapide trimitere",
+        "show_estimated_tokens": "Arată tokeni estimați",
+        "title": "Setări intrare"
+      },
+      "markdown_rendering_input_message": "Randare Markdown mesaj intrare",
+      "metrics": "{{time_first_token_millsec}}ms până la primul token | {{token_speed}} tok/sec",
+      "model": {
+        "title": "Setări model"
+      },
+      "navigation": {
+        "anchor": "Ancoră mesaj",
+        "buttons": "Butoane navigare",
+        "label": "Bară navigare",
+        "none": "Niciunul"
+      },
+      "prompt": "Arată prompt",
+      "show_message_outline": "Arată contur mesaj",
+      "title": "Setări mesaje",
+      "use_serif_font": "Folosește font serif"
+    },
+    "mineru": {
+      "api_key": "Mineru oferă acum o cotă zilnică gratuită de 500 de pagini și nu este nevoie să introduci o cheie."
+    },
+    "miniapps": {
+      "cache_change_notice": "Modificările vor intra în vigoare când numărul de mini-aplicații deschise atinge valoarea setată",
+      "cache_description": "Setează numărul maxim de mini-aplicații active de păstrat în memorie",
+      "cache_settings": "Setări cache",
+      "cache_title": "Limită cache mini-aplicații",
+      "custom": {
+        "conflicting_ids": "ID-uri conflictuale cu aplicațiile implicite: {{ids}}",
+        "duplicate_ids": "ID-uri duplicate găsite: {{ids}}",
+        "edit_description": "Editează configurația mini-aplicației personalizate aici. Fiecare aplicație ar trebui să includă câmpurile id, name, url și logo.",
+        "edit_title": "Editează mini-aplicație personalizată",
+        "id": "ID",
+        "id_error": "ID-ul este obligatoriu.",
+        "id_placeholder": "Introdu ID",
+        "logo": "Logo",
+        "logo_file": "Încarcă fișier logo",
+        "logo_upload_button": "Încarcă",
+        "logo_upload_error": "Încărcarea logo-ului a eșuat.",
+        "logo_upload_label": "Încarcă logo",
+        "logo_upload_success": "Logo încărcat cu succes.",
+        "logo_url": "URL logo",
+        "logo_url_label": "URL logo",
+        "logo_url_placeholder": "Introdu URL logo",
+        "name": "Nume",
+        "name_error": "Numele este obligatoriu.",
+        "name_placeholder": "Introdu nume",
+        "placeholder": "Introdu configurația mini-aplicației personalizate (format JSON)",
+        "remove_error": "Eliminarea mini-aplicației personalizate a eșuat.",
+        "remove_success": "Mini-aplicația personalizată a fost eliminată cu succes.",
+        "save": "Salvează",
+        "save_error": "Salvarea mini-aplicației personalizate a eșuat.",
+        "save_success": "Mini-aplicația personalizată a fost salvată cu succes.",
+        "title": "Personalizat",
+        "url": "URL",
+        "url_error": "URL-ul este obligatoriu.",
+        "url_placeholder": "Introdu URL"
+      },
+      "disabled": "Mini-aplicații ascunse",
+      "display_title": "Setări afișare mini-aplicații",
+      "empty": "Trage mini-aplicațiile din stânga pentru a le ascunde",
+      "open_link_external": {
+        "title": "Deschide linkurile de fereastră nouă în browser"
+      },
+      "reset_tooltip": "Resetează la implicit",
+      "sidebar_description": "Arată mini-aplicațiile active în bara laterală",
+      "sidebar_title": "Afișare mini-aplicații active în bara laterală",
+      "title": "Setări mini-aplicații",
+      "visible": "Mini-aplicații vizibile"
+    },
+    "model": "Model implicit",
+    "models": {
+      "add": {
+        "add_model": "Adaugă model",
+        "batch_add_models": "Adaugă modele în lot",
+        "endpoint_type": {
+          "label": "Tip endpoint",
+          "placeholder": "Selectează tip endpoint",
+          "required": "Te rugăm să selectezi un tip de endpoint",
+          "tooltip": "Selectează formatul tipului de endpoint API"
+        },
+        "group_name": {
+          "label": "Nume grup",
+          "placeholder": "Opțional de ex. ChatGPT",
+          "tooltip": "Opțional de ex. ChatGPT"
+        },
+        "model_id": {
+          "label": "ID model",
+          "placeholder": "Obligatoriu de ex. gpt-3.5-turbo",
+          "select": {
+            "placeholder": "Selectează model"
+          },
+          "tooltip": "Exemplu: gpt-3.5-turbo"
+        },
+        "model_name": {
+          "label": "Nume model",
+          "placeholder": "Opțional de ex. GPT-4",
+          "tooltip": "Opțional de ex. GPT-4"
+        },
+        "supported_text_delta": {
+          "label": "Suportă ieșire text incrementală",
+          "tooltip": "Modelul returnează text incremental, mai degrabă decât tot odată. Activat implicit, dacă modelul nu acceptă acest lucru, te rugăm să dezactivezi această opțiune"
+        }
+      },
+      "api_key": "Cheie API",
+      "base_url": "URL de bază",
+      "check": {
+        "all": "Toate",
+        "all_models_passed": "Verificarea tuturor modelelor a trecut",
+        "button_caption": "Verificare sănătate",
+        "disabled": "Dezactivat",
+        "disclaimer": "Verificarea sănătății necesită trimiterea de cereri, te rugăm să o folosești cu precauție. Modelele care taxează pe cerere pot genera costuri suplimentare, te rugăm să îți asumi responsabilitatea.",
+        "enable_concurrent": "Concurent",
+        "enabled": "Activat",
+        "failed": "Eșuat",
+        "keys_status_count": "Reușite: {{count_passed}} chei, eșuate: {{count_failed}} chei",
+        "model_status_failed": "{{count}} modele complet inaccesibile",
+        "model_status_partial": "{{count}} modele au avut chei inaccesibile",
+        "model_status_passed": "{{count}} modele au trecut verificările de sănătate",
+        "model_status_summary": "{{provider}}: {{summary}}",
+        "no_api_keys": "Nu s-au găsit chei API, te rugăm să adaugi mai întâi chei API.",
+        "no_results": "Niciun rezultat",
+        "passed": "Reușit",
+        "select_api_key": "Selectează cheia API de utilizat:",
+        "single": "Singur",
+        "start": "Start",
+        "timeout": "Expirare",
+        "title": "Verificare sănătate model",
+        "use_all_keys": "Cheie(i)"
+      },
+      "default_assistant_model": "Model asistent implicit",
+      "default_assistant_model_description": "Model folosit la crearea unui nou asistent; dacă asistentul nu este setat, va fi folosit acest model",
+      "empty": "Nu s-au găsit modele",
+      "manage": {
+        "add_listed": {
+          "confirm": "Ești sigur că vrei să adaugi toate modelele la listă?",
+          "label": "Adaugă modele la listă"
+        },
+        "add_whole_group": "Adaugă întregul grup",
+        "refetch_list": "Reîmprospătează lista modelelor",
+        "remove_listed": "Elimină modelele din listă",
+        "remove_model": "Elimină modelul",
+        "remove_whole_group": "Elimină întregul grup"
+      },
+      "provider_id": "ID furnizor",
+      "provider_key_add_confirm": "Vrei să adaugi cheia API pentru {{provider}}?",
+      "provider_key_add_failed_by_empty_data": "Adăugarea cheii API a furnizorului a eșuat, datele sunt goale",
+      "provider_key_add_failed_by_invalid_data": "Adăugarea cheii API a furnizorului a eșuat, eroare format date",
+      "provider_key_added": "S-a adăugat cu succes cheia API pentru {{provider}}",
+      "provider_key_already_exists": "{{provider}} are deja o cheie API ({{existingKey}}). Nu o adăuga din nou.",
+      "provider_key_confirm_title": "Adaugă cheie API furnizor",
+      "provider_key_no_change": "Cheia API pentru {{provider}} nu s-a schimbat",
+      "provider_key_overridden": "S-a actualizat cu succes cheia API pentru {{provider}}",
+      "provider_key_override_confirm": "{{provider}} are deja o cheie API ({{existingKey}}). Vrei să o suprascrii cu noua cheie ({{newKey}})?",
+      "provider_name": "Nume furnizor",
+      "quick_assistant_default_tag": "Implicit",
+      "quick_assistant_model": "Model asistent rapid",
+      "quick_assistant_selection": "Selectează asistent",
+      "quick_model": {
+        "description": "Model folosit pentru sarcini simple, cum ar fi numirea subiectelor și extragerea cuvintelor cheie",
+        "label": "Model rapid",
+        "setting_title": "Configurare model rapid",
+        "tooltip": "Se recomandă alegerea unui model ușor și nu se recomandă alegerea unui model de gândire."
+      },
+      "topic_naming": {
+        "auto": "Numire automată subiect",
+        "label": "Numire subiect",
+        "prompt": "Prompt numire subiect"
+      },
+      "translate_model": "Model traducere",
+      "translate_model_description": "Model folosit pentru serviciul de traducere",
+      "translate_model_prompt_message": "Te rugăm să introduci promptul modelului de traducere",
+      "translate_model_prompt_title": "Prompt model traducere",
+      "use_assistant": "Folosește asistent",
+      "use_model": "Model implicit"
+    },
+    "moresetting": {
+      "check": {
+        "confirm": "Confirmă selecția",
+        "warn": "Te rugăm să fii precaut când selectezi această opțiune. Selecția incorectă poate cauza funcționarea defectuoasă a modelului!"
+      },
+      "label": "Mai multe setări",
+      "warn": "Avertisment de risc"
+    },
+    "no_provider_selected": "Furnizor neselectat",
+    "notification": {
+      "assistant": "Mesaj asistent",
+      "backup": "Mesaj backup",
+      "knowledge_embed": "Mesaj bază de cunoștințe",
+      "title": "Setări notificări"
+    },
+    "openai": {
+      "service_tier": {
+        "auto": "auto",
+        "default": "implicit",
+        "flex": "flex",
+        "on_demand": "la cerere",
+        "priority": "prioritate",
+        "tip": "Specifică nivelul de latență de utilizat pentru procesarea cererii",
+        "title": "Nivel serviciu"
+      },
+      "stream_options": {
+        "include_usage": {
+          "tip": "Dacă utilizarea tokenilor este inclusă (aplicabil doar API-ului OpenAI Chat Completions)",
+          "title": "Include utilizare"
+        }
+      },
+      "summary_text_mode": {
+        "auto": "auto",
+        "concise": "concis",
+        "detailed": "detaliat",
+        "off": "oprit",
+        "tip": "Un rezumat al raționamentului efectuat de model",
+        "title": "Mod rezumat"
+      },
+      "title": "Setări OpenAI",
+      "verbosity": {
+        "high": "Ridicat",
+        "low": "Scăzut",
+        "medium": "Mediu",
+        "tip": "Controlează nivelul de detaliu în ieșirea modelului",
+        "title": "Verbozitate"
+      }
+    },
+    "privacy": {
+      "enable_privacy_mode": "Raportare anonimă a erorilor și statisticilor",
+      "title": "Setări confidențialitate"
+    },
+    "provider": {
+      "add": {
+        "name": {
+          "label": "Nume furnizor",
+          "placeholder": "Exemplu: OpenAI"
+        },
+        "title": "Adaugă furnizor",
+        "type": "Tip furnizor"
+      },
+      "anthropic": {
+        "apikey": "Cheie API",
+        "auth_failed": "Autentificarea Anthropic a eșuat",
+        "auth_method": "Metodă de autentificare",
+        "auth_success": "Autentificare OAuth Anthropic reușită",
+        "authenticated": "Verificat",
+        "authenticating": "Se autentifică",
+        "cancel": "Anulează",
+        "code_error": "Cod de autorizare invalid, te rugăm să încerci din nou",
+        "code_placeholder": "Te rugăm să introduci codul de autorizare afișat în browser",
+        "code_required": "Codul de autorizare nu poate fi gol",
+        "description": "Autentificare OAuth",
+        "description_detail": "Trebuie să te abonezi la Claude Pro sau o versiune superioară pentru a folosi această metodă de autentificare",
+        "enter_auth_code": "Cod de autorizare",
+        "logout": "Deconectare",
+        "logout_failed": "Deconectarea a eșuat, te rugăm să încerci din nou",
+        "logout_success": "Te-ai deconectat cu succes de la Anthropic",
+        "oauth": "Web OAuth",
+        "start_auth": "Începe autorizarea",
+        "submit_code": "Finalizează conectarea"
+      },
+      "anthropic_api_host": "Gazdă API Anthropic",
+      "anthropic_api_host_preview": "Previzualizare Anthropic: {{url}}",
+      "anthropic_api_host_tooltip": "Folosește doar când furnizorul oferă un URL de bază compatibil cu Claude.",
+      "api": {
+        "key": {
+          "check": {
+            "latency": "Latență"
+          },
+          "error": {
+            "duplicate": "Cheia API există deja",
+            "empty": "Cheia API nu poate fi goală"
+          },
+          "list": {
+            "open": "Deschide interfața de gestionare",
+            "title": "Gestionare chei API"
+          },
+          "new_key": {
+            "placeholder": "Introdu una sau mai multe chei"
+          }
+        },
+        "options": {
+          "array_content": {
+            "help": "Furnizorul acceptă ca câmpul content al mesajului să fie de tip array?",
+            "label": "Acceptă conținut mesaj în format array"
+          },
+          "developer_role": {
+            "help": "Furnizorul acceptă mesaje cu rolul: \"developer\"?",
+            "label": "Suportă mesaj dezvoltator"
+          },
+          "enable_thinking": {
+            "help": "Furnizorul acceptă controlul raționamentului modelelor precum Qwen3 prin parametrul enable_thinking?",
+            "label": "Suportă enable_thinking"
+          },
+          "label": "Setări API",
+          "service_tier": {
+            "help": "Dacă furnizorul acceptă configurarea parametrului service_tier. Când este activat, acest parametru poate fi ajustat în setările nivelului de serviciu de pe pagina de chat. (Doar modele OpenAI)",
+            "label": "Suportă service_tier"
+          },
+          "stream_options": {
+            "help": "Furnizorul acceptă parametrul stream_options?",
+            "label": "Suportă stream_options"
+          },
+          "verbosity": {
+            "help": "Dacă furnizorul acceptă parametrul verbosity",
+            "label": "Suportă verbosity"
+          }
+        },
+        "url": {
+          "preview": "Previzualizare: {{url}}",
+          "reset": "Resetează",
+          "tip": "Adaugă # la final pentru a dezactiva versiunea API adăugată automat."
+        }
+      },
+      "api_host": "Gazdă API",
+      "api_host_no_valid": "Adresa API este invalidă",
+      "api_host_preview": "Previzualizare: {{url}}",
+      "api_host_tooltip": "Suprascrie doar când furnizorul tău necesită un endpoint personalizat compatibil cu OpenAI.",
+      "api_key": {
+        "label": "Cheie API",
+        "tip": "Folosește virgule pentru a separa mai multe chei"
+      },
+      "api_version": "Versiune API",
+      "aws-bedrock": {
+        "access_key_id": "ID cheie acces AWS",
+        "access_key_id_help": "ID-ul tău de cheie de acces AWS pentru accesarea serviciilor AWS Bedrock",
+        "api_key": "Cheie API Bedrock",
+        "api_key_help": "Cheia ta API AWS Bedrock pentru autentificare",
+        "auth_type": "Tip autentificare",
+        "auth_type_api_key": "Cheie API Bedrock",
+        "auth_type_help": "Alege între credențiale IAM sau autentificare cu cheie API Bedrock",
+        "auth_type_iam": "Credențiale IAM",
+        "description": "AWS Bedrock este serviciul de modele de fundație complet gestionat de Amazon care acceptă diverse modele lingvistice mari avansate",
+        "region": "Regiune AWS",
+        "region_help": "Regiunea serviciului tău AWS, de ex., us-east-1",
+        "secret_access_key": "Cheie secretă acces AWS",
+        "secret_access_key_help": "Cheia ta secretă de acces AWS, te rugăm să o păstrezi în siguranță",
+        "title": "Configurare AWS Bedrock"
+      },
+      "azure": {
+        "apiversion": {
+          "tip": "Versiunea API a Azure OpenAI, dacă dorești să folosești API-ul de Răspuns, te rugăm să introduci versiunea v1"
+        }
+      },
+      "basic_auth": {
+        "label": "Autentificare HTTP",
+        "password": {
+          "label": "Parolă",
+          "tip": "Introdu parola"
+        },
+        "tip": "Aplicabil instanțelor implementate la distanță (vezi documentația). Momentan, doar schema Basic (RFC 7617) este acceptată.",
+        "user_name": {
+          "label": "Nume utilizator",
+          "tip": "Lasă gol pentru a dezactiva"
+        }
+      },
+      "bills": "Facturi taxe",
+      "charge": "Reîncărcare sold",
+      "check": "Verifică",
+      "check_all_keys": "Verifică toate cheile",
+      "check_multiple_keys": "Verifică chei API multiple",
+      "copilot": {
+        "auth_failed": "Autentificarea Github Copilot a eșuat.",
+        "auth_success": "Autentificarea GitHub Copilot a reușit.",
+        "auth_success_title": "Certificare reușită.",
+        "code_copied": "Codul de autorizare copiat automat în clipboard",
+        "code_failed": "Obținerea Codului Dispozitivului a eșuat, te rugăm să încerci din nou.",
+        "code_generated_desc": "Te rugăm să copiezi codul dispozitivului în linkul de browser de mai jos.",
+        "code_generated_title": "Obține Cod Dispozitiv",
+        "connect": "Conectează la Github",
+        "custom_headers": "Antet cerere personalizat",
+        "description": "Contul tău GitHub trebuie să fie abonat la Copilot.",
+        "description_detail": "GitHub Copilot este un asistent de cod bazat pe AI care necesită un abonament GitHub Copilot valid pentru a fi utilizat",
+        "expand": "Extinde",
+        "headers_description": "Antete cerere personalizate (format JSON)",
+        "invalid_json": "Eroare format JSON",
+        "login": "Conectare la Github",
+        "logout": "Ieșire GitHub",
+        "logout_failed": "Ieșirea a eșuat, te rugăm să încerci din nou.",
+        "logout_success": "Te-ai deconectat cu succes.",
+        "model_setting": "Setări model",
+        "open_verification_first": "Te rugăm să faci clic pe linkul de mai sus pentru a accesa pagina de verificare.",
+        "open_verification_page": "Deschide pagina de autorizare",
+        "rate_limit": "Limitare rată",
+        "start_auth": "Începe autorizarea",
+        "step_authorize": "Deschide pagina de autorizare",
+        "step_authorize_desc": "Completează autorizarea pe GitHub",
+        "step_authorize_detail": "Fă clic pe butonul de mai jos pentru a deschide pagina de autorizare GitHub, apoi introdu codul de autorizare copiat",
+        "step_connect": "Finalizează conexiunea",
+        "step_connect_desc": "Confirmă conexiunea la GitHub",
+        "step_connect_detail": "După finalizarea autorizării pe pagina GitHub, fă clic pe acest buton pentru a finaliza conexiunea",
+        "step_copy_code": "Copiază codul de autorizare",
+        "step_copy_code_desc": "Copiază codul de autorizare al dispozitivului",
+        "step_copy_code_detail": "Codul de autorizare a fost copiat automat, îl poți copia și manual",
+        "step_get_code": "Obține codul de autorizare",
+        "step_get_code_desc": "Generează codul de autorizare al dispozitivului"
+      },
+      "delete": {
+        "content": "Ești sigur că vrei să ștergi acest furnizor?",
+        "title": "Șterge furnizor"
+      },
+      "dmxapi": {
+        "select_platform": "Selectează platforma"
+      },
+      "docs_check": "Verifică",
+      "docs_more_details": "pentru mai multe detalii",
+      "get_api_key": "Obține cheie API",
+      "misc": "Altele",
+      "no_models_for_check": "Nu există modele disponibile pentru verificare (de ex. modele chat)",
+      "not_checked": "Neverificat",
+      "notes": {
+        "markdown_editor_default_value": "Zonă previzualizare",
+        "placeholder": "Introdu conținut Markdown...",
+        "title": "Note model"
+      },
+      "oauth": {
+        "button": "Conectare cu {{provider}}",
+        "description": "Acest serviciu este furnizat de <website>{{provider}}</website>",
+        "error": "Autentificare eșuată",
+        "official_website": "Site oficial"
+      },
+      "openai": {
+        "alert": "Furnizorul OpenAI nu mai acceptă metodele vechi de apelare. Dacă folosești un API terț, te rugăm să creezi un furnizor de servicii nou."
+      },
+      "remove_duplicate_keys": "Elimină cheile duplicate",
+      "remove_invalid_keys": "Elimină cheile invalide",
+      "search": "Caută furnizori...",
+      "search_placeholder": "Caută id sau nume model",
+      "title": "Furnizor model",
+      "vertex_ai": {
+        "api_host_help": "Gazda API pentru Vertex AI, nerecomandat de completat, aplicabil în general pentru reverse proxy",
+        "documentation": "Vezi documentația oficială pentru mai multe detalii de configurare:",
+        "learn_more": "Află mai multe",
+        "location": "Locație",
+        "location_help": "Locația serviciului Vertex AI, de ex., us-central1",
+        "project_id": "ID Proiect",
+        "project_id_help": "ID-ul tău de proiect Google Cloud",
+        "project_id_placeholder": "id-ul-tau-proiect-google-cloud",
+        "service_account": {
+          "auth_success": "Cont de serviciu autentificat cu succes",
+          "client_email": "E-mail client",
+          "client_email_help": "Câmpul client_email din fișierul cheie JSON descărcat din Google Cloud Console",
+          "client_email_placeholder": "Introdu e-mailul clientului Contului de Serviciu",
+          "description": "Folosește Contul de Serviciu pentru autentificare, potrivit pentru mediile unde ADC nu este disponibil",
+          "incomplete_config": "Te rugăm să finalizezi mai întâi configurarea Contului de Serviciu",
+          "private_key": "Cheie privată",
+          "private_key_help": "Câmpul private_key din fișierul cheie JSON descărcat din Google Cloud Console",
+          "private_key_placeholder": "Introdu cheia privată a Contului de Serviciu",
+          "title": "Configurare Cont de Serviciu"
+        }
+      }
+    },
+    "proxy": {
+      "address": "Adresă proxy",
+      "bypass": "Reguli de ocolire",
+      "mode": {
+        "custom": "Proxy personalizat",
+        "none": "Fără proxy",
+        "system": "Proxy sistem",
+        "title": "Mod proxy"
+      },
+      "tip": "Acceptă potrivirea cu wildcard (*.test.com, 192.168.0.0/16)"
+    },
+    "quickAssistant": {
+      "click_tray_to_show": "Fă clic pe pictograma din zona de notificare pentru a începe",
+      "enable_quick_assistant": "Activează Asistentul rapid",
+      "read_clipboard_at_startup": "Citește clipboardul la pornire",
+      "title": "Asistent rapid",
+      "use_shortcut_to_show": "Clic dreapta pe pictograma din zona de notificare sau folosește comenzile rapide pentru a începe"
+    },
+    "quickPanel": {
+      "back": "Înapoi",
+      "close": "Închide",
+      "confirm": "Confirmă",
+      "forward": "Înainte",
+      "multiple": "Selecție multiplă",
+      "noResult": "Niciun rezultat găsit",
+      "page": "Pagină",
+      "select": "Selectează",
+      "title": "Meniu rapid"
+    },
+    "quickPhrase": {
+      "add": "Adaugă expresie",
+      "assistant": "Expresii asistent",
+      "contentLabel": "Conținut",
+      "contentPlaceholder": "Te rugăm să introduci conținutul expresiei, poți folosi variabile și poți apăsa Tab pentru a localiza rapid variabila de modificat. De exemplu: \nAjută-mă să planific o rută de la ${from} la ${to} și trimite-o la ${email}.",
+      "delete": "Șterge expresia",
+      "deleteConfirm": "Expresia nu poate fi recuperată după ștergere, continui?",
+      "edit": "Editează expresia",
+      "global": "Expresii globale",
+      "locationLabel": "Adaugă locație",
+      "title": "Expresii rapide",
+      "titleLabel": "Titlu",
+      "titlePlaceholder": "Te rugăm să introduci titlul expresiei"
+    },
+    "shortcuts": {
+      "action": "Acțiune",
+      "actions": "operațiune",
+      "clear_shortcut": "Șterge comanda rapidă",
+      "clear_topic": "Șterge mesajele",
+      "copy_last_message": "Copiază ultimul mesaj",
+      "edit_last_user_message": "Editează ultimul mesaj al utilizatorului",
+      "enabled": "Activează",
+      "exit_fullscreen": "Ieși din ecran complet",
+      "label": "Tastă",
+      "mini_window": "Asistent rapid",
+      "new_topic": "Subiect nou",
+      "press_shortcut": "Apasă comanda rapidă",
+      "rename_topic": "Redenumește subiectul",
+      "reset_defaults": "Resetează la implicite",
+      "reset_defaults_confirm": "Ești sigur că vrei să resetezi toate comenzile rapide?",
+      "reset_to_default": "Resetează la implicit",
+      "search_message": "Caută mesaj",
+      "search_message_in_chat": "Caută mesaj în chat-ul curent",
+      "selection_assistant_select_text": "Asistent de selecție: Selectează text",
+      "selection_assistant_toggle": "Comută Asistentul de selecție",
+      "show_app": "Arată/Ascunde aplicația",
+      "show_settings": "Deschide setările",
+      "title": "Comenzi rapide de la tastatură",
+      "toggle_new_context": "Șterge contextul",
+      "toggle_show_assistants": "Comută asistenții",
+      "toggle_show_topics": "Comută subiectele",
+      "zoom_in": "Mărește",
+      "zoom_out": "Micșorează",
+      "zoom_reset": "Resetează zoom-ul"
+    },
+    "theme": {
+      "color_primary": "Culoare primară",
+      "dark": "Întunecat",
+      "light": "Luminos",
+      "system": "Sistem",
+      "title": "Temă",
+      "window": {
+        "style": {
+          "opaque": "Fereastră opacă",
+          "title": "Stil fereastră",
+          "transparent": "Fereastră transparentă"
+        }
+      }
+    },
+    "title": "Setări",
+    "tool": {
+      "ocr": {
+        "common": {
+          "langs": "Limbi acceptate"
+        },
+        "error": {
+          "not_system": "OCR-ul de sistem acceptă doar Windows și MacOS"
+        },
+        "image": {
+          "error": {
+            "provider_not_found": "Furnizorul nu există"
+          },
+          "system": {
+            "no_need_configure": "MacOS nu necesită configurare"
+          },
+          "title": "Imagine"
+        },
+        "image_provider": "Furnizor serviciu OCR",
+        "paddleocr": {
+          "aistudio_access_token": "Token de acces Comunitatea AI Studio",
+          "aistudio_url_label": "Comunitatea AI Studio",
+          "api_url": "URL API",
+          "serving_doc_url_label": "Documentație servire PaddleOCR",
+          "tip": "Poți consulta documentația oficială PaddleOCR pentru a implementa un serviciu local sau poți implementa un serviciu cloud pe Comunitatea PaddlePaddle AI Studio. Pentru ultimul caz, te rugăm să furnizezi tokenul de acces al Comunității AI Studio."
+        },
+        "system": {
+          "win": {
+            "langs_tooltip": "Dependent de Windows pentru a furniza servicii, trebuie să descarci pachete lingvistice în sistem pentru a suporta limbile relevante."
+          }
+        },
+        "tesseract": {
+          "langs_tooltip": "Citește documentația pentru a afla ce limbi personalizate sunt acceptate"
+        },
+        "title": "Serviciu OCR"
+      },
+      "preprocess": {
+        "provider": "Furnizor procesare documente",
+        "provider_placeholder": "Alege un furnizor de procesare documente",
+        "title": "Procesare documente",
+        "tooltip": "În Setări -> Instrumente, setează un furnizor de servicii de procesare a documentelor. Procesarea documentelor poate îmbunătăți eficient performanța de recuperare a documentelor cu format complex și a documentelor scanate."
+      },
+      "title": "Alte setări",
+      "websearch": {
+        "api_key_required": {
+          "content": "{{provider}} necesită o cheie API pentru a funcționa. Dorești să o configurezi acum?",
+          "ok": "Configurează",
+          "title": "Cheie API necesară"
+        },
+        "api_providers": "Furnizori API",
+        "apikey": "Cheie API",
+        "blacklist": "Listă neagră",
+        "blacklist_description": "Rezultatele de pe următoarele site-uri web nu vor apărea în rezultatele căutării",
+        "blacklist_tooltip": "Te rugăm să folosești următorul format (separate prin linie nouă)\nPotrivire model: *://*.exemplu.com/*\nExpresie regulată: /exemplu\\.(net|org)/",
+        "check": "Verifică",
+        "check_failed": "Verificare eșuată",
+        "check_success": "Verificare reușită",
+        "compression": {
+          "cutoff": {
+            "limit": {
+              "label": "Limită trunchiere",
+              "placeholder": "Introdu lungimea",
+              "tooltip": "Limitează lungimea conținutului rezultatelor căutării, conținutul care depășește limita va fi trunchiat (de ex., 2000 caractere)"
+            },
+            "unit": {
+              "char": "Caractere",
+              "token": "Token"
+            }
+          },
+          "error": {
+            "rag_failed": "RAG eșuat"
+          },
+          "info": {
+            "dimensions_auto_success": "Dimensiuni obținute automat cu succes, dimensiuni: {{dimensions}}"
+          },
+          "method": {
+            "cutoff": "Trunchiere",
+            "label": "Metodă compresie",
+            "none": "Niciuna",
+            "rag": "RAG"
+          },
+          "rag": {
+            "document_count": {
+              "label": "Număr fragmente document",
+              "tooltip": "Numărul așteptat de fragmente de document de extras din fiecare rezultat al căutării; numărul total real de fragmente extrase este această valoare înmulțită cu numărul de rezultate ale căutării."
+            }
+          },
+          "title": "Compresie rezultate căutare"
+        },
+        "content_limit": "Limită lungime conținut",
+        "content_limit_tooltip": "Limitează lungimea conținutului rezultatelor căutării; conținutul care depășește limita va fi trunchiat.",
+        "default_provider": "Furnizor implicit",
+        "free": "Gratuit",
+        "is_default": "Implicit",
+        "local_provider": {
+          "hint": "Conectează-te la site pentru a obține rezultate mai bune ale căutării și pentru a personaliza setările de căutare.",
+          "open_settings": "Deschide setările {{provider}}",
+          "settings": "Setări căutare locală"
+        },
+        "local_providers": "Furnizori locali",
+        "no_provider_selected": "Te rugăm să selectezi un furnizor de servicii de căutare înainte de a verifica.",
+        "overwrite": "Suprascrie serviciul de căutare",
+        "overwrite_tooltip": "Forțează utilizarea serviciului de căutare în loc de LLM",
+        "search_max_result": {
+          "label": "Număr de rezultate căutare",
+          "tooltip": "Când compresia rezultatelor căutării este dezactivată, numărul de rezultate poate fi prea mare, ceea ce poate duce la tokeni insuficienți"
+        },
+        "search_provider": "Furnizor serviciu căutare",
+        "search_provider_placeholder": "Alege un furnizor de servicii de căutare.",
+        "search_with_time": "Caută cu date incluse",
+        "set_as_default": "Setează ca implicit",
+        "subscribe": "Abonare listă neagră",
+        "subscribe_add": "Adaugă abonament",
+        "subscribe_add_failed": "Adăugarea sursei fluxului a eșuat",
+        "subscribe_add_success": "Flux de abonament adăugat cu succes!",
+        "subscribe_delete": "Șterge",
+        "subscribe_name": {
+          "label": "Nume alternativ",
+          "placeholder": "Nume alternativ folosit când fluxul de abonament descărcat nu are nume."
+        },
+        "subscribe_update": "Actualizează",
+        "subscribe_update_failed": "Actualizarea sursei abonamentului a eșuat",
+        "subscribe_update_success": "Sursa abonamentului a fost actualizată cu succes",
+        "subscribe_url": "Url abonament",
+        "tavily": {
+          "api_key": {
+            "label": "Cheie API Tavily",
+            "placeholder": "Introdu cheia API Tavily"
+          },
+          "description": "Tavily este un motor de căutare adaptat pentru agenți AI, oferind rezultate în timp real, precise, sugestii inteligente de interogare și capacități de cercetare aprofundată.",
+          "title": "Tavily"
+        },
+        "title": "Căutare web",
+        "url_invalid": "S-a introdus un URL invalid",
+        "url_required": "Te rugăm să introduci un URL"
+      }
+    },
+    "topic": {
+      "pin_to_top": "Fixează subiectele sus",
+      "position": {
+        "label": "Poziție subiect",
+        "left": "Stânga",
+        "right": "Dreapta"
+      },
+      "show": {
+        "time": "Arată ora subiectului"
+      }
+    },
+    "translate": {
+      "custom": {
+        "delete": {
+          "description": "Ești sigur că vrei să ștergi?",
+          "title": "Șterge limba personalizată"
+        },
+        "error": {
+          "add": "Adăugarea a eșuat",
+          "delete": "Ștergerea a eșuat",
+          "langCode": {
+            "builtin": "Limba are suport integrat",
+            "empty": "Codul limbii este gol",
+            "exists": "Limba există deja",
+            "invalid": "Cod limbă invalid"
+          },
+          "update": "Actualizarea a eșuat",
+          "value": {
+            "empty": "Numele limbii nu poate fi gol",
+            "too_long": "Numele limbii este prea lung"
+          }
+        },
+        "langCode": {
+          "help": "Format [limbă+regiune], [2-3 litere mici]-[2-3 litere mici]",
+          "label": "Cod limbă",
+          "placeholder": "en-us"
+        },
+        "success": {
+          "add": "Adăugat cu succes",
+          "delete": "Șters cu succes",
+          "update": "Actualizare reușită"
+        },
+        "table": {
+          "action": {
+            "title": "Operațiune"
+          }
+        },
+        "value": {
+          "help": "1~32 caractere",
+          "label": "Nume limbă",
+          "placeholder": "Engleză"
+        }
+      },
+      "prompt": "Prompt traducere",
+      "title": "Setări traducere"
+    },
+    "tray": {
+      "onclose": "Minimizează în zona de notificare la închidere",
+      "show": "Arată pictograma în zona de notificare",
+      "title": "Zonă de notificare"
+    },
+    "zoom": {
+      "reset": "Resetează",
+      "title": "Zoom pagină"
+    }
+  },
+  "title": {
+    "apps": "Aplicații",
+    "code": "Cod",
+    "files": "Fișiere",
+    "home": "Acasă",
+    "knowledge": "Bază de cunoștințe",
+    "launchpad": "Launchpad",
+    "mcp-servers": "Servere MCP",
+    "memories": "Amintiri",
+    "notes": "Notițe",
+    "paintings": "Picturi",
+    "settings": "Setări",
+    "store": "Bibliotecă asistenți",
+    "translate": "Traducere"
+  },
+  "trace": {
+    "backList": "Înapoi la listă",
+    "edasSupport": "Susținut de Alibaba Cloud EDAS",
+    "endTime": "Timp final",
+    "inputs": "Intrări",
+    "label": "Lanț de apelare",
+    "name": "Nume nod",
+    "noTraceList": "Nu s-au găsit informații de urmărire",
+    "outputs": "Ieșiri",
+    "parentId": "ID părinte",
+    "spanDetail": "Detalii interval",
+    "spendTime": "Timp petrecut",
+    "startTime": "Timp de început",
+    "tag": "Etichetă",
+    "tokenUsage": "Utilizare token",
+    "traceWindow": "Fereastră lanț de apelare"
+  },
+  "translate": {
+    "alter_language": "Limbă alternativă",
+    "any": {
+      "language": "Orice limbă"
+    },
+    "button": {
+      "translate": "Tradu"
+    },
+    "close": "Închide",
+    "closed": "Traducere închisă",
+    "complete": "Traducere finalizată",
+    "confirm": {
+      "content": "Traducerea va înlocui textul original, continui?",
+      "title": "Confirmare traducere"
+    },
+    "copied": "Conținutul traducerii copiat",
+    "custom": {
+      "label": "Limbă personalizată"
+    },
+    "detect": {
+      "method": {
+        "algo": {
+          "label": "algoritm",
+          "tip": "Folosește biblioteca franc pentru detectarea limbii"
+        },
+        "auto": {
+          "label": "Automat",
+          "tip": "Selectează automat metoda de detectare potrivită"
+        },
+        "label": "Metodă de detectare automată",
+        "llm": {
+          "tip": "Folosirea modelului rapid pentru detectarea limbii consumă mai puțini tokeni."
+        },
+        "placeholder": "Selectează metoda de detectare automată",
+        "tip": "Metoda folosită la detectarea automată a limbii de intrare"
+      }
+    },
+    "detected": {
+      "language": "Detectare automată"
+    },
+    "empty": "Conținutul traducerii este gol",
+    "error": {
+      "chat_qwen_mt": "Modelul Qwen MT nu poate fi folosit în chat. Te rugăm să mergi la pagina de traducere.",
+      "detect": {
+        "qwen_mt": "Modelul QwenMT nu poate fi folosit pentru detectarea limbii",
+        "unknown": "Limbă necunoscută detectată",
+        "update_setting": "Setarea a eșuat"
+      },
+      "empty": "Rezultatul traducerii este un conținut gol",
+      "failed": "Traducerea a eșuat",
+      "invalid_source": "Limbă sursă invalidă",
+      "not_configured": "Modelul de traducere nu este configurat",
+      "not_supported": "Limbă neacceptată {{language}}",
+      "unknown": "A apărut o eroare necunoscută în timpul traducerii"
+    },
+    "exchange": {
+      "label": "Schimbă limbile sursă și țintă"
+    },
+    "files": {
+      "drag_text": "Trage aici",
+      "error": {
+        "check_type": "A apărut o eroare la verificarea tipului de fișier",
+        "multiple": "Încărcarea mai multor fișiere nu este permisă",
+        "too_large": "Fișier prea mare",
+        "unknown": "Citirea conținutului fișierului a eșuat"
+      },
+      "reading": "Se citește conținutul fișierului..."
+    },
+    "history": {
+      "clear": "Golește istoricul",
+      "clear_description": "Golirea istoricului va șterge tot istoricul traducerilor, continui?",
+      "delete": "Șterge istoricul traducerilor",
+      "empty": "Niciun istoric de traducere",
+      "error": {
+        "delete": "Ștergerea a eșuat",
+        "save": "Salvarea istoricului traducerilor a eșuat"
+      },
+      "search": {
+        "placeholder": "Caută în istoricul traducerilor"
+      },
+      "title": "Istoric traduceri"
+    },
+    "info": {
+      "aborted": "Traducere anulată"
+    },
+    "input": {
+      "placeholder": "Textul, fișierele text sau imaginile (cu suport OCR) pot fi lipite sau trase aici"
+    },
+    "language": {
+      "not_pair": "Limba sursă este diferită de limba setată",
+      "same": "Limbile sursă și țintă sunt aceleași"
+    },
+    "menu": {
+      "description": "Tradu conținutul casetei de intrare curente"
+    },
+    "not": {
+      "found": "Conținutul traducerii nu a fost găsit"
+    },
+    "output": {
+      "placeholder": "Traducere"
+    },
+    "processing": "Traducere în curs...",
+    "settings": {
+      "autoCopy": "Copiază după traducere ",
+      "bidirectional": "Setări traducere bidirecțională",
+      "bidirectional_tip": "Când este activat, este acceptată doar traducerea bidirecțională între limbile sursă și țintă",
+      "model": "Setări model",
+      "model_desc": "Model folosit pentru serviciul de traducere",
+      "model_placeholder": "Selectează modelul de traducere",
+      "no_model_warning": "Niciun model de traducere selectat",
+      "preview": "Previzualizare Markdown",
+      "scroll_sync": "Setări sincronizare derulare",
+      "title": "Setări traducere"
+    },
+    "success": {
+      "custom": {
+        "delete": "Șters cu succes",
+        "update": "Actualizare reușită"
+      }
+    },
+    "target_language": "Limbă țintă",
+    "title": "Traducere",
+    "tooltip": {
+      "newline": "Linie nouă"
+    }
+  },
+  "tray": {
+    "quit": "Ieșire",
+    "show_mini_window": "Asistent rapid",
+    "show_window": "Arată fereastra"
+  },
+  "update": {
+    "install": "Instalează",
+    "later": "Mai târziu",
+    "message": "Noua versiune {{version}} este gata, vrei să o instalezi acum?",
+    "noReleaseNotes": "Nicio notă de lansare",
+    "saveDataError": "Salvarea datelor a eșuat, te rugăm să încerci din nou.",
+    "title": "Actualizare"
+  },
+  "warning": {
+    "missing_provider": "Furnizorul nu există; s-a revenit la furnizorul implicit {{provider}}. Acest lucru poate cauza probleme."
+  },
+  "words": {
+    "knowledgeGraph": "Grafic de cunoștințe",
+    "quit": "Ieșire",
+    "show_window": "Arată fereastra",
+    "visualization": "Vizualizare"
+  }
+}
diff --git a/src/renderer/src/i18n/translate/ru-ru.json b/src/renderer/src/i18n/translate/ru-ru.json
index 1a695c893f..3f00656861 100644
--- a/src/renderer/src/i18n/translate/ru-ru.json
+++ b/src/renderer/src/i18n/translate/ru-ru.json
@@ -6,6 +6,9 @@
         "failed": "Не удалось добавить агента",
         "invalid_agent": "Недействительный агент"
       },
+      "model": {
+        "tooltip": "В настоящее время для функции агента доступны только модели, поддерживающие конечные точки Anthropic."
+      },
       "title": "Добавить агента",
       "type": {
         "placeholder": "Выбор типа агента"
@@ -28,13 +31,31 @@
       }
     },
     "gitBash": {
+      "autoDetected": "Используется автоматически обнаруженный Git Bash",
+      "autoDiscoveredHint": "Автоматически обнаруженный",
+      "clear": {
+        "button": "Очистить пользовательский путь"
+      },
+      "customPath": "Используется пользовательский путь: {{path}}",
       "error": {
         "description": "Для запуска агентов в Windows требуется Git Bash. Без него агент не может работать. Пожалуйста, установите Git для Windows с",
         "recheck": "Повторная проверка установки Git Bash",
+        "required": "Требуется путь к Git Bash в Windows",
         "title": "Требуется Git Bash"
       },
+      "found": {
+        "title": "Git Bash настроен"
+      },
       "notFound": "Git Bash не найден. Пожалуйста, сначала установите его.",
-      "success": "Git Bash успешно обнаружен!"
+      "pick": {
+        "button": "Выбрать путь Git Bash",
+        "failed": "Не удалось настроить путь Git Bash",
+        "invalidPath": "Выбранный файл не является допустимым исполняемым файлом Git Bash (bash.exe).",
+        "title": "Выберите исполняемый файл Git Bash"
+      },
+      "placeholder": "Выберите путь к bash.exe",
+      "success": "Git Bash успешно обнаружен!",
+      "tooltip": "Для запуска агентов в Windows требуется Git Bash. Установите его с сайта git-scm.com, если он отсутствует."
     },
     "input": {
       "placeholder": "Введите ваше сообщение здесь, отправьте с помощью {{key}} — @ выбрать путь, / выбрать команду"
@@ -399,6 +420,9 @@
     },
     "delete": {
       "content": "Удаление ассистента удалит все топики и файлы под ассистентом. Вы уверены, что хотите удалить его?",
+      "error": {
+        "remain_one": "Нельзя удалить последнего помощника"
+      },
       "title": "Удалить ассистента"
     },
     "edit": {
@@ -455,6 +479,7 @@
         "button": "Импортировать",
         "error": {
           "fetch_failed": "Ошибка получения данных с URL",
+          "file_required": "Сначала выберите файл",
           "invalid_format": "Неверный формат помощника: отсутствуют обязательные поля",
           "url_required": "Пожалуйста, введите URL"
         },
@@ -468,6 +493,17 @@
         "url_placeholder": "Введите JSON URL"
       },
       "manage": {
+        "batch_delete": {
+          "button": "Массовое удаление",
+          "confirm": "Вы уверены, что хотите удалить выбранных {{count}} ассистентов?"
+        },
+        "batch_export": {
+          "button": "Экспорт"
+        },
+        "mode": {
+          "manage": "Управлять",
+          "sort": "Сортировать"
+        },
         "title": "Управление помощниками"
       },
       "my_agents": "Мои помощники",
@@ -515,13 +551,23 @@
       "more": "Настройки ассистента",
       "prompt": "Настройки промптов",
       "reasoning_effort": {
+        "auto": "Авто",
+        "auto_description": "Гибко определяйте усилие на рассуждение",
         "default": "По умолчанию",
+        "default_description": "Полагаться на поведение модели по умолчанию, без какой-либо конфигурации.",
         "high": "Стараюсь думать",
+        "high_description": "Высокоуровневое рассуждение",
         "label": "Настройки размышлений",
         "low": "Меньше думать",
+        "low_description": "Низкоуровневое рассуждение",
         "medium": "Среднее",
+        "medium_description": "Средний уровень рассуждения",
         "minimal": "минимальный",
-        "off": "Выключить"
+        "minimal_description": "Минимальное рассуждение",
+        "off": "Выключить",
+        "off_description": "Отключить рассуждение",
+        "xhigh": "Сверхвысокое",
+        "xhigh_description": "Высочайший уровень рассуждений"
       },
       "regular_phrases": {
         "add": "Добавить подсказку",
@@ -1001,6 +1047,29 @@
         "yuque": "Экспорт в Yuque"
       },
       "list": "Список топиков",
+      "manage": {
+        "clear_selection": "Очистить выбор",
+        "delete": {
+          "confirm": {
+            "content": "Вы уверены, что хотите удалить выбранные темы ({{count}})? Это действие нельзя отменить.",
+            "title": "Удалить темы"
+          },
+          "success": "Удалено {{count}} тем(ы)"
+        },
+        "deselect_all": "Снять выделение со всех",
+        "error": {
+          "at_least_one": "Должна быть сохранена хотя бы одна тема"
+        },
+        "move": {
+          "button": "Переместить",
+          "placeholder": "Выберите цель",
+          "success": "Перемещено {{count}} тем(ы)"
+        },
+        "pinned": "Закреплённые темы",
+        "selected_count": "{{count}} выбрано",
+        "title": "Управление темами",
+        "unpinned": "Откреплённые темы"
+      },
       "move_to": "Переместить в",
       "new": "Новый топик",
       "pin": "Закрепленные темы",
@@ -1011,6 +1080,10 @@
         "label": "Тематические подсказки",
         "tips": "Тематические подсказки: Дополнительные подсказки, предоставленные для текущей темы"
       },
+      "search": {
+        "placeholder": "Искать темы...",
+        "title": "Поиск"
+      },
       "title": "Топики",
       "unpin": "Открепленные темы"
     },
@@ -1182,6 +1255,7 @@
     "saved": "Сохранено",
     "search": "Поиск",
     "select": "Выбрать",
+    "select_all": "Выбрать все",
     "selected": "Выбрано",
     "selectedItems": "Выбрано {{count}} элементов",
     "selectedMessages": "Выбрано {{count}} сообщений",
@@ -1194,11 +1268,13 @@
       }
     },
     "stop": "остановить",
+    "subscribe": "Подписаться",
     "success": "Успешно",
     "swap": "Поменять местами",
     "topics": "Топики",
     "unknown": "Неизвестно",
     "unnamed": "Без имени",
+    "unsubscribe": "Отписаться",
     "update_success": "Обновление выполнено успешно",
     "upload_files": "Загрузить файл",
     "warning": "Предупреждение",
@@ -2125,6 +2201,7 @@
     "collapse": "Свернуть",
     "content_placeholder": "Введите содержимое заметки...",
     "copyContent": "Копировать контент",
+    "crossPlatformRestoreWarning": "Кроссплатформенная конфигурация восстановлена, но каталог заметок пуст. Пожалуйста, скопируйте файлы заметок в: {{path}}",
     "delete": "удалить",
     "delete_confirm": "Вы уверены, что хотите удалить этот объект {{type}}?",
     "delete_folder_confirm": "Вы уверены, что хотите удалить папку \"{{name}}\" со всем ее содержимым?",
@@ -2226,11 +2303,11 @@
     "untitled_note": "Незаглавленная заметка",
     "upload": "[to be translated]:Upload",
     "upload_failed": "Не удалось загрузить заметку",
-    "upload_files": "[to be translated]:Upload Files",
-    "upload_folder": "[to be translated]:Upload Folder",
+    "upload_files": "Загрузить файлы",
+    "upload_folder": "Загрузить папку",
     "upload_success": "Заметка успешно загружена",
     "uploading": "[to be translated]:Uploading",
-    "uploading_files": "[to be translated]:Uploading {{count}} files..."
+    "uploading_files": "Загрузка {{count}} файлов..."
   },
   "notification": {
     "assistant": "Ответ ассистента",
@@ -2521,7 +2598,8 @@
   },
   "preview": {
     "copy": {
-      "image": "Скопировать как изображение"
+      "image": "Скопировать как изображение",
+      "src": "Копировать источник изображения"
     },
     "dialog": "Открыть диалог",
     "label": "Предварительный просмотр",
@@ -2575,6 +2653,7 @@
     "lanyun": "LANYUN",
     "lmstudio": "LM Studio",
     "longcat": "Тоторо",
+    "mimo": "Xiaomi MiMo",
     "minimax": "MiniMax",
     "mistral": "Mistral",
     "modelscope": "ModelScope",
@@ -3093,6 +3172,7 @@
         "label": "Данные приложения",
         "migration_title": "Миграция данных",
         "new_path": "Новый путь",
+        "open": "Открыть каталог",
         "original_path": "Исходный путь",
         "path_change_failed": "Сбой изменения каталога данных",
         "path_changed_without_copy": "Путь изменен успешно",
@@ -3163,24 +3243,43 @@
         },
         "content": "Экспорт части данных, включая историю чатов и настройки. Обратите внимание, процесс резервного копирования может занять некоторое время, благодарим за ваше терпение.",
         "lan": {
-          "auto_close_tip": "Автоматическое закрытие через {{seconds}} секунд...",
-          "confirm_close_message": "Передача файла в процессе. Закрытие прервет передачу. Вы уверены, что хотите принудительно закрыть?",
-          "confirm_close_title": "Подтвердить закрытие",
           "connected": "Подключено",
           "connection_failed": "Соединение не удалось",
           "content": "Убедитесь, что компьютер и телефон подключены к одной сети, чтобы использовать локальную передачу. Откройте приложение Cherry Studio и отсканируйте этот QR-код.",
+          "device_list_title": "Устройства локальной сети",
+          "discovered_devices": "Обнаруженные устройства",
           "error": {
+            "file_too_large": "Файл слишком большой, поддерживается максимум 500 МБ.",
             "init_failed": "Инициализация не удалась",
+            "invalid_file_type": "Поддерживаются только ZIP-файлы",
             "no_file": "Файл не выбран",
             "no_ip": "Не удалось получить IP-адрес",
+            "not_connected": "Пожалуйста, сначала завершите рукопожатие",
             "send_failed": "Не удалось отправить файл"
           },
-          "force_close": "Принудительное закрытие",
-          "generating_qr": "Генерация QR-кода...",
-          "noZipSelected": "Архив не выбран",
-          "scan_qr": "Пожалуйста, отсканируйте QR-код с помощью вашего телефона",
-          "selectZip": "Выберите архив",
-          "sendZip": "Начать восстановление данных",
+          "file_transfer": {
+            "cancelled": "Перевод отменён",
+            "failed": "Передача файла не удалась: {{message}}",
+            "progress": "Отправка... {{progress}}%",
+            "success": "Файл успешно отправлен"
+          },
+          "handshake": {
+            "button": "Рукопожатие",
+            "failed": "Сбой рукопожатия: {{message}}",
+            "in_progress": "Рукопожатие...",
+            "success": "Рукопожатие завершено с {{device}}",
+            "test_message_received": "Получен понг от {{device}}",
+            "test_message_sent": "Отправлен тестовый полезный груз \"hello world\""
+          },
+          "idle_hint": "Сканирование приостановлено. Начните сканирование, чтобы найти пиры Cherry Studio в вашей локальной сети.",
+          "ip_addresses": "IP-адреса",
+          "last_seen": "В последний раз был(а) в сети в {{time}}",
+          "metadata": "Метаданные",
+          "no_connection_warning": "Пожалуйста, откройте LAN Transfer в мобильном приложении Cherry Studio",
+          "no_devices": "Пока не найдено участников локальной сети",
+          "scan_devices": "Сканировать устройства",
+          "scanning_hint": "Сканирование локальной сети на наличие узлов Cherry Studio...",
+          "send_file": "Отправить файл",
           "status": {
             "completed": "Перевод завершён",
             "connected": "Подключено",
@@ -3189,9 +3288,11 @@
             "error": "Ошибка подключения",
             "initializing": "Инициализация соединения...",
             "preparing": "Подготовка передачи...",
-            "sending": "Передача {{progress}}%",
-            "waiting_qr_scan": "Пожалуйста, отсканируйте QR-код для подключения"
+            "sending": "Передача {{progress}}%"
           },
+          "status_badge_idle": "Бездействие",
+          "status_badge_scanning": "Сканирование",
+          "stop_scan": "Остановить сканирование",
           "title": "Передача по локальной сети",
           "transfer_progress": "Прогресс передачи"
         },
@@ -3863,6 +3964,7 @@
       "builtinServers": "Встроенные серверы",
       "builtinServersDescriptions": {
         "brave_search": "реализация сервера MCP с интеграцией API поиска Brave, обеспечивающая функции веб-поиска и локального поиска. Требуется настройка переменной среды BRAVE_API_KEY",
+        "browser": "Управление headless-окном Electron через Chrome DevTools Protocol. Инструменты: открытие URL, выполнение однострочного JS, сброс сессии.",
         "didi_mcp": "Сервер DiDi MCP, предоставляющий услуги такси, включая поиск на карте, оценку стоимости, управление заказами и отслеживание водителей. Доступен только в материковом Китае. Требует настройки переменной окружения DIDI_API_KEY",
         "dify_knowledge": "Реализация сервера MCP Dify, предоставляющая простой API для взаимодействия с Dify. Требуется настройка ключа Dify",
         "fetch": "MCP-сервер для получения содержимого веб-страниц по URL",
@@ -3870,6 +3972,7 @@
         "mcp_auto_install": "Автоматическая установка службы MCP (бета-версия)",
         "memory": "реализация постоянной памяти на основе локального графа знаний. Это позволяет модели запоминать информацию о пользователе между различными диалогами. Требуется настроить переменную среды MEMORY_FILE_PATH.",
         "no": "без описания",
+        "nowledge_mem": "Требуется запущенное локально приложение Nowledge Mem. Хранит чаты ИИ, инструменты, заметки, агентов и файлы в приватной памяти на вашем компьютере. Скачать можно на https://mem.nowledge.co/",
         "python": "Выполняйте код Python в безопасной песочнице. Запускайте Python с помощью Pyodide, поддерживается большинство стандартных библиотек и пакетов для научных вычислений",
         "sequentialthinking": "MCP серверная реализация, предоставляющая инструменты для динамического и рефлексивного решения проблем посредством структурированного мыслительного процесса"
       },
@@ -3915,6 +4018,7 @@
       "jsonSaveError": "Не удалось сохранить конфигурацию JSON",
       "jsonSaveSuccess": "JSON конфигурация сохранена",
       "logoUrl": "URL логотипа",
+      "logs": "Журналы",
       "longRunning": "Длительный режим работы",
       "longRunningTooltip": "Включив эту опцию, сервер будет поддерживать длительные задачи. При получении уведомлений о ходе выполнения будет сброшен тайм-аут и максимальное время выполнения будет увеличено до 10 минут.",
       "marketplaces": "Торговые площадки",
@@ -3934,6 +4038,7 @@
       "name": "Имя",
       "newServer": "MCP сервер",
       "noDescriptionAvailable": "Описание отсутствует",
+      "noLogs": "Логов пока нет",
       "noServers": "Серверы не настроены",
       "not_support": "Модель не поддерживается",
       "npx_list": {
@@ -4662,6 +4767,12 @@
       },
       "title": "Другие настройки",
       "websearch": {
+        "api_key_required": {
+          "content": "{{provider}} требует API-ключ для работы. Хотите настроить его сейчас?",
+          "ok": "Настроить",
+          "title": "Требуется ключ API"
+        },
+        "api_providers": "Поставщики API",
         "apikey": "API ключ",
         "blacklist": "Черный список",
         "blacklist_description": "Результаты из следующих веб-сайтов не будут отображаться в результатах поиска",
@@ -4703,7 +4814,15 @@
         },
         "content_limit": "Ограничение длины контента",
         "content_limit_tooltip": "Ограничить длину контента в результатах поиска; контент, превышающий лимит, будет усечен.",
+        "default_provider": "Поставщик по умолчанию",
         "free": "Бесплатно",
+        "is_default": "По умолчанию",
+        "local_provider": {
+          "hint": "Войдите на сайт, чтобы получать более точные результаты поиска и настроить параметры поиска под себя.",
+          "open_settings": "Открыть настройки {{provider}}",
+          "settings": "Настройки локального поиска"
+        },
+        "local_providers": "Местные поставщики",
         "no_provider_selected": "Пожалуйста, выберите поставщика поисковых услуг, затем проверьте.",
         "overwrite": "Переопределить поисковый сервис",
         "overwrite_tooltip": "Принудительно использовать поисковый сервис вместо LLM",
@@ -4714,6 +4833,7 @@
         "search_provider": "поиск сервисного провайдера",
         "search_provider_placeholder": "Выберите поставщика поисковых услуг",
         "search_with_time": "Поиск, содержащий дату",
+        "set_as_default": "Установить по умолчанию",
         "subscribe": "Подписка на черный список",
         "subscribe_add": "Добавить подписку",
         "subscribe_add_failed": "Не удалось добавить источник подписки",
diff --git a/src/renderer/src/pages/code/index.ts b/src/renderer/src/pages/code/index.ts
index dcc9f43534..81f5ddddc3 100644
--- a/src/renderer/src/pages/code/index.ts
+++ b/src/renderer/src/pages/code/index.ts
@@ -34,13 +34,16 @@ export const CLAUDE_OFFICIAL_SUPPORTED_PROVIDERS = [
   'minimax',
   'longcat',
   SystemProviderIds.qiniu,
-  SystemProviderIds.silicon
+  SystemProviderIds.silicon,
+  SystemProviderIds.mimo,
+  SystemProviderIds.openrouter
 ]
 export const CLAUDE_SUPPORTED_PROVIDERS = [
   'aihubmix',
   'dmxapi',
   'new-api',
   'cherryin',
+  '302ai',
   ...CLAUDE_OFFICIAL_SUPPORTED_PROVIDERS
 ]
 export const OPENAI_CODEX_SUPPORTED_PROVIDERS = ['openai', 'openrouter', 'aihubmix', 'new-api', 'cherryin']
@@ -94,6 +97,11 @@ export const getCodeToolsApiBaseUrl = (model: Model, type: EndpointType) => {
       anthropic: {
         api_base_url: 'https://api.minimaxi.com/anthropic'
       }
+    },
+    '302ai': {
+      anthropic: {
+        api_base_url: 'https://api.302.ai'
+      }
     }
   }
 
diff --git a/src/renderer/src/pages/history/components/SearchResults.tsx b/src/renderer/src/pages/history/components/SearchResults.tsx
index e0ffba8b2a..7189e78e5a 100644
--- a/src/renderer/src/pages/history/components/SearchResults.tsx
+++ b/src/renderer/src/pages/history/components/SearchResults.tsx
@@ -17,6 +17,7 @@ type SearchResult = {
   message: Message
   topic: Topic
   content: string
+  snippet: string
 }
 
 interface Props extends React.HTMLAttributes<HTMLDivElement> {
@@ -25,6 +26,158 @@ interface Props extends React.HTMLAttributes<HTMLDivElement> {
   onTopicClick: (topic: Topic) => void
 }
 
+const SEARCH_SNIPPET_CONTEXT_LINES = 1
+const SEARCH_SNIPPET_MAX_LINES = 12
+const SEARCH_SNIPPET_MAX_LINE_LENGTH = 160
+const SEARCH_SNIPPET_LINE_FRAGMENT_RADIUS = 40
+const SEARCH_SNIPPET_MAX_LINE_FRAGMENTS = 3
+
+const stripMarkdownFormatting = (text: string) => {
+  return text
+    .replace(/```(?:[^\n]*\n)?([\s\S]*?)```/g, '$1')
+    .replace(/!\[(.*?)\]\((.*?)\)/g, '$1')
+    .replace(/\[(.*?)\]\((.*?)\)/g, '$1')
+    .replace(/\*\*(.*?)\*\*/g, '$1')
+    .replace(/\*(.*?)\*/g, '$1')
+    .replace(/`(.*?)`/g, '$1')
+    .replace(/#+\s/g, '')
+    .replace(/<[^>]*>/g, '')
+}
+
+const normalizeText = (text: string) => text.replace(/\r\n/g, '\n').replace(/\r/g, '\n')
+
+const escapeRegex = (text: string) => text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+
+const mergeRanges = (ranges: Array<[number, number]>) => {
+  const sorted = ranges.slice().sort((a, b) => a[0] - b[0])
+  const merged: Array<[number, number]> = []
+  for (const range of sorted) {
+    const last = merged[merged.length - 1]
+    if (!last || range[0] > last[1] + 1) {
+      merged.push([range[0], range[1]])
+      continue
+    }
+    last[1] = Math.max(last[1], range[1])
+  }
+  return merged
+}
+
+const buildLineSnippet = (line: string, regexes: RegExp[]) => {
+  if (line.length <= SEARCH_SNIPPET_MAX_LINE_LENGTH) {
+    return line
+  }
+
+  const matchRanges: Array<[number, number]> = []
+  for (const regex of regexes) {
+    regex.lastIndex = 0
+    let match: RegExpExecArray | null
+    while ((match = regex.exec(line)) !== null) {
+      matchRanges.push([match.index, match.index + match[0].length])
+      if (match[0].length === 0) {
+        regex.lastIndex += 1
+      }
+    }
+  }
+
+  if (matchRanges.length === 0) {
+    return `${line.slice(0, SEARCH_SNIPPET_MAX_LINE_LENGTH)}...`
+  }
+
+  const expandedRanges: Array<[number, number]> = matchRanges.map(([start, end]) => [
+    Math.max(0, start - SEARCH_SNIPPET_LINE_FRAGMENT_RADIUS),
+    Math.min(line.length, end + SEARCH_SNIPPET_LINE_FRAGMENT_RADIUS)
+  ])
+  const mergedRanges = mergeRanges(expandedRanges)
+  const limitedRanges = mergedRanges.slice(0, SEARCH_SNIPPET_MAX_LINE_FRAGMENTS)
+
+  let result = limitedRanges.map(([start, end]) => line.slice(start, end)).join(' ... ')
+  // 片段未从行首开始，补前置省略号。
+  if (limitedRanges[0][0] > 0) {
+    result = `...${result}`
+  }
+  // 片段未覆盖到行尾，补后置省略号。
+  if (limitedRanges[limitedRanges.length - 1][1] < line.length) {
+    result = `${result}...`
+  }
+  // 还有未展示的匹配片段，提示省略。
+  if (mergedRanges.length > SEARCH_SNIPPET_MAX_LINE_FRAGMENTS) {
+    result = `${result}...`
+  }
+  // 最终长度超限，强制截断并补省略号。
+  if (result.length > SEARCH_SNIPPET_MAX_LINE_LENGTH) {
+    result = `${result.slice(0, SEARCH_SNIPPET_MAX_LINE_LENGTH)}...`
+  }
+  return result
+}
+
+const buildSearchSnippet = (text: string, terms: string[]) => {
+  const normalized = normalizeText(stripMarkdownFormatting(text))
+  const lines = normalized.split('\n')
+  if (lines.length === 0) {
+    return ''
+  }
+
+  const nonEmptyTerms = terms.filter((term) => term.length > 0)
+  const regexes = nonEmptyTerms.map((term) => new RegExp(escapeRegex(term), 'gi'))
+  const matchedLineIndexes: number[] = []
+
+  if (regexes.length > 0) {
+    for (let i = 0; i < lines.length; i += 1) {
+      const line = lines[i]
+      const isMatch = regexes.some((regex) => {
+        regex.lastIndex = 0
+        return regex.test(line)
+      })
+      if (isMatch) {
+        matchedLineIndexes.push(i)
+      }
+    }
+  }
+
+  const ranges: Array<[number, number]> =
+    matchedLineIndexes.length > 0
+      ? mergeRanges(
+          matchedLineIndexes.map((index) => [
+            Math.max(0, index - SEARCH_SNIPPET_CONTEXT_LINES),
+            Math.min(lines.length - 1, index + SEARCH_SNIPPET_CONTEXT_LINES)
+          ])
+        )
+      : [[0, Math.min(lines.length - 1, SEARCH_SNIPPET_MAX_LINES - 1)]]
+
+  const outputLines: string[] = []
+  let truncated = false
+
+  if (ranges[0][0] > 0) {
+    outputLines.push('...')
+  }
+
+  for (const [start, end] of ranges) {
+    if (outputLines.length >= SEARCH_SNIPPET_MAX_LINES) {
+      truncated = true
+      break
+    }
+    if (outputLines.length > 0 && outputLines[outputLines.length - 1] !== '...') {
+      outputLines.push('...')
+    }
+    for (let i = start; i <= end; i += 1) {
+      if (outputLines.length >= SEARCH_SNIPPET_MAX_LINES) {
+        truncated = true
+        break
+      }
+      outputLines.push(buildLineSnippet(lines[i], regexes))
+    }
+    if (truncated) {
+      break
+    }
+  }
+
+  if ((truncated || ranges[ranges.length - 1][1] < lines.length - 1) && outputLines.at(-1) !== '...') {
+    outputLines.push('...')
+  }
+
+  return outputLines.join('\n')
+}
+
 const SearchResults: FC<Props> = ({ keywords, onMessageClick, onTopicClick, ...props }) => {
   const { handleScroll, containerRef } = useScrollPosition('SearchResults')
   const observerRef = useRef<MutationObserver | null>(null)
@@ -44,17 +197,6 @@ const SearchResults: FC<Props> = ({ keywords, onMessageClick, onTopicClick, ...p
   const [searchStats, setSearchStats] = useState({ count: 0, time: 0 })
   const [isLoading, setIsLoading] = useState(false)
 
-  const removeMarkdown = (text: string) => {
-    return text
-      .replace(/\*\*(.*?)\*\*/g, '$1')
-      .replace(/\*(.*?)\*/g, '$1')
-      .replace(/\[(.*?)\]\((.*?)\)/g, '$1')
-      .replace(/```[\s\S]*?```/g, '')
-      .replace(/`(.*?)`/g, '$1')
-      .replace(/#+\s/g, '')
-      .replace(/<[^>]*>/g, '')
-  }
-
   const onSearch = useCallback(async () => {
     setSearchResults([])
     setIsLoading(true)
@@ -69,13 +211,16 @@ const SearchResults: FC<Props> = ({ keywords, onMessageClick, onTopicClick, ...p
     const startTime = performance.now()
     const newSearchTerms = keywords
       .toLowerCase()
-      .split(' ')
+      .split(/\s+/)
       .filter((term) => term.length > 0)
-    const searchRegexes = newSearchTerms.map((term) => new RegExp(term, 'i'))
+    const searchRegexes = newSearchTerms.map((term) => new RegExp(escapeRegex(term), 'i'))
 
     const blocks = (await db.message_blocks.toArray())
       .filter((block) => block.type === MessageBlockType.MAIN_TEXT)
-      .filter((block) => searchRegexes.some((regex) => regex.test(block.content)))
+      .filter((block) => {
+        const searchableContent = stripMarkdownFormatting(block.content)
+        return searchRegexes.some((regex) => regex.test(searchableContent))
+      })
 
     const messages = topics?.flatMap((topic) => topic.messages)
 
@@ -85,7 +230,12 @@ const SearchResults: FC<Props> = ({ keywords, onMessageClick, onTopicClick, ...p
         if (message) {
           const topic = storeTopicsMap.get(message.topicId)
           if (topic) {
-            return { message, topic, content: block.content }
+            return {
+              message,
+              topic,
+              content: block.content,
+              snippet: buildSearchSnippet(block.content, newSearchTerms)
+            }
           }
         }
         return null
@@ -103,15 +253,17 @@ const SearchResults: FC<Props> = ({ keywords, onMessageClick, onTopicClick, ...p
   }, [keywords, storeTopicsMap, topics])
 
   const highlightText = (text: string) => {
-    let highlightedText = removeMarkdown(text)
-    searchTerms.forEach((term) => {
-      try {
-        const regex = new RegExp(term, 'gi')
-        highlightedText = highlightedText.replace(regex, (match) => `<mark>${match}</mark>`)
-      } catch (error) {
-        //
-      }
-    })
+    const uniqueTerms = Array.from(new Set(searchTerms.filter((term) => term.length > 0)))
+    if (uniqueTerms.length === 0) {
+      return <span dangerouslySetInnerHTML={{ __html: text }} />
+    }
+
+    const pattern = uniqueTerms
+      .sort((a, b) => b.length - a.length)
+      .map((term) => escapeRegex(term))
+      .join('|')
+    const regex = new RegExp(pattern, 'gi')
+    const highlightedText = text.replace(regex, (match) => `<mark>${match}</mark>`)
     return <span dangerouslySetInnerHTML={{ __html: highlightedText }} />
   }
 
@@ -150,7 +302,7 @@ const SearchResults: FC<Props> = ({ keywords, onMessageClick, onTopicClick, ...p
             hideOnSinglePage: true
           }}
           style={{ opacity: isLoading ? 0 : 1 }}
-          renderItem={({ message, topic, content }) => (
+          renderItem={({ message, topic, snippet }) => (
             <List.Item>
               <Title
                 level={5}
@@ -159,7 +311,7 @@ const SearchResults: FC<Props> = ({ keywords, onMessageClick, onTopicClick, ...p
                 {topic.name}
               </Title>
               <div style={{ cursor: 'pointer' }} onClick={() => onMessageClick(message)}>
-                <Text>{highlightText(content)}</Text>
+                <Text style={{ whiteSpace: 'pre-line' }}>{highlightText(snippet)}</Text>
               </div>
               <SearchResultTime>
                 <Text type="secondary">{new Date(message.createdAt).toLocaleString()}</Text>
diff --git a/src/renderer/src/pages/home/Chat.tsx b/src/renderer/src/pages/home/Chat.tsx
index 45cbc45f4d..fb24d55d65 100644
--- a/src/renderer/src/pages/home/Chat.tsx
+++ b/src/renderer/src/pages/home/Chat.tsx
@@ -180,7 +180,8 @@ const Chat: FC<Props> = (props) => {
       <HStack>
         <motion.div
           animate={{
-            marginRight: topicPosition === 'right' && showTopics ? 'var(--assistants-width)' : 0
+            marginRight:
+              topicPosition === 'right' && showTopics ? 'calc(var(--assistants-width) + var(--border-width))' : 0
           }}
           transition={{ duration: 0.3, ease: 'easeInOut' }}
           style={{ flex: 1, display: 'flex', minWidth: 0 }}>
@@ -232,6 +233,7 @@ const Chat: FC<Props> = (props) => {
                     ) : (
                       <AgentSessionMessages agentId={activeAgentId} sessionId={activeSessionId} />
                     )}
+                    {messageNavigation === 'buttons' && <ChatNavigation containerId="messages" />}
                     <AgentSessionInputbar agentId={activeAgentId} sessionId={activeSessionId} />
                   </>
                 )}
diff --git a/src/renderer/src/pages/home/ChatNavbar.tsx b/src/renderer/src/pages/home/ChatNavbar.tsx
index 17b45ad189..1685c7d237 100644
--- a/src/renderer/src/pages/home/ChatNavbar.tsx
+++ b/src/renderer/src/pages/home/ChatNavbar.tsx
@@ -19,6 +19,7 @@ import styled from 'styled-components'
 
 import AssistantsDrawer from './components/AssistantsDrawer'
 import ChatNavbarContent from './components/ChatNavbarContent'
+import SettingsButton from './components/SettingsButton'
 import UpdateAppButton from './components/UpdateAppButton'
 
 interface Props {
@@ -65,14 +66,6 @@ const HeaderNavbar: FC<Props> = ({ activeAssistant, setActiveAssistant, activeTo
     })
   }
 
-  // const handleUpdateModel = useCallback(
-  //   async (model: ApiModel) => {
-  //     if (!activeSession || !activeAgent) return
-  //     return updateModel(activeSession.id, model.id, { showSuccessToast: false })
-  //   },
-  //   [activeAgent, activeSession, updateModel]
-  // )
-
   return (
     <NavbarHeader className="home-navbar" style={{ height: 'var(--navbar-height)' }}>
       <div className="flex h-full min-w-0 flex-1 shrink items-center overflow-auto">
@@ -107,6 +100,7 @@ const HeaderNavbar: FC<Props> = ({ activeAssistant, setActiveAssistant, activeTo
       </div>
       <HStack alignItems="center" gap={8}>
         {isTopNavbar && <UpdateAppButton />}
+        <SettingsButton assistant={assistant} />
         {isTopNavbar && (
           <Tooltip title={t('navbar.expand')} mouseEnterDelay={0.8}>
             <NarrowIcon onClick={handleNarrowModeToggle}>
diff --git a/src/renderer/src/pages/home/Inputbar/InputbarTools.tsx b/src/renderer/src/pages/home/Inputbar/InputbarTools.tsx
index 2dc5ee88a9..1b56b37eb4 100644
--- a/src/renderer/src/pages/home/Inputbar/InputbarTools.tsx
+++ b/src/renderer/src/pages/home/Inputbar/InputbarTools.tsx
@@ -261,9 +261,12 @@ const InputbarTools = ({ scope, assistantId, session }: InputbarToolsNewProps) =
     const sourceId = source.droppableId
     const destinationId = destination.droppableId
 
+    const visibleKeys = visibleTools.map((t) => t.key)
+    const hiddenKeys = hiddenTools.map((t) => t.key)
+
     const newToolOrder: ToolOrderConfig = {
-      visible: [...toolOrder.visible],
-      hidden: [...toolOrder.hidden]
+      visible: [...visibleKeys],
+      hidden: [...hiddenKeys]
     }
 
     const sourceArray = sourceId === 'inputbar-tools-visible' ? 'visible' : 'hidden'
diff --git a/src/renderer/src/pages/home/Inputbar/components/InputbarCore.tsx b/src/renderer/src/pages/home/Inputbar/components/InputbarCore.tsx
index 99a93e537c..7ed182c7f4 100644
--- a/src/renderer/src/pages/home/Inputbar/components/InputbarCore.tsx
+++ b/src/renderer/src/pages/home/Inputbar/components/InputbarCore.tsx
@@ -526,7 +526,8 @@ export const InputbarCore: FC<InputbarCoreProps> = ({
   const handleFocus = useCallback(() => {
     setInputFocus(true)
     dispatch(setSearching(false))
-    if (quickPanel.isVisible && quickPanel.triggerInfo?.type !== 'input') {
+    // Don't close panel in multiple selection mode, or if triggered by input
+    if (quickPanel.isVisible && quickPanel.triggerInfo?.type !== 'input' && !quickPanel.multiple) {
       quickPanel.close()
     }
     PasteService.setLastFocusedComponent('inputbar')
diff --git a/src/renderer/src/pages/home/Inputbar/tools/components/KnowledgeBaseButton.tsx b/src/renderer/src/pages/home/Inputbar/tools/components/KnowledgeBaseButton.tsx
index 76060d1414..087a4f32c4 100644
--- a/src/renderer/src/pages/home/Inputbar/tools/components/KnowledgeBaseButton.tsx
+++ b/src/renderer/src/pages/home/Inputbar/tools/components/KnowledgeBaseButton.tsx
@@ -92,14 +92,6 @@ const KnowledgeBaseButton: FC<Props> = ({ quickPanel, selectedBases, onSelect, d
     }
   }, [openQuickPanel, quickPanelHook])
 
-  // 监听 selectedBases 变化，动态更新已打开的 QuickPanel 列表状态
-  useEffect(() => {
-    if (quickPanelHook.isVisible && quickPanelHook.symbol === QuickPanelReservedSymbol.KnowledgeBase) {
-      // 直接使用重新计算的 baseItems，因为它已经包含了最新的 isSelected 状态
-      quickPanelHook.updateList(baseItems)
-    }
-  }, [selectedBases, quickPanelHook, baseItems])
-
   useEffect(() => {
     const disposeRootMenu = quickPanel.registerRootMenu([
       {
diff --git a/src/renderer/src/pages/home/Inputbar/tools/components/ThinkingButton.tsx b/src/renderer/src/pages/home/Inputbar/tools/components/ThinkingButton.tsx
index 5909189516..10b4656bc0 100644
--- a/src/renderer/src/pages/home/Inputbar/tools/components/ThinkingButton.tsx
+++ b/src/renderer/src/pages/home/Inputbar/tools/components/ThinkingButton.tsx
@@ -5,7 +5,9 @@ import {
   MdiLightbulbOn,
   MdiLightbulbOn30,
   MdiLightbulbOn50,
-  MdiLightbulbOn80
+  MdiLightbulbOn80,
+  MdiLightbulbOn90,
+  MdiLightbulbQuestion
 } from '@renderer/components/Icons/SVGIcon'
 import { QuickPanelReservedSymbol, useQuickPanel } from '@renderer/components/QuickPanel'
 import {
@@ -17,7 +19,6 @@ import {
   MODEL_SUPPORTED_OPTIONS
 } from '@renderer/config/models'
 import { useAssistant } from '@renderer/hooks/useAssistant'
-import { getReasoningEffortOptionsLabel } from '@renderer/i18n/label'
 import type { ToolQuickPanelApi } from '@renderer/pages/home/Inputbar/types'
 import type { Model, ThinkingOption } from '@renderer/types'
 import { Tooltip } from 'antd'
@@ -87,19 +88,48 @@ const ThinkingButton: FC<Props> = ({ quickPanel, model, assistantId }): ReactEle
     [updateAssistantSettings, assistant.enableWebSearch, model, t]
   )
 
+  const reasoningEffortOptionLabelMap = {
+    default: t('assistants.settings.reasoning_effort.default'),
+    none: t('assistants.settings.reasoning_effort.off'),
+    minimal: t('assistants.settings.reasoning_effort.minimal'),
+    high: t('assistants.settings.reasoning_effort.high'),
+    low: t('assistants.settings.reasoning_effort.low'),
+    medium: t('assistants.settings.reasoning_effort.medium'),
+    auto: t('assistants.settings.reasoning_effort.auto'),
+    xhigh: t('assistants.settings.reasoning_effort.xhigh')
+  } as const satisfies Record<ThinkingOption, string>
+
+  const reasoningEffortDescriptionMap = {
+    default: t('assistants.settings.reasoning_effort.default_description'),
+    none: t('assistants.settings.reasoning_effort.off_description'),
+    minimal: t('assistants.settings.reasoning_effort.minimal_description'),
+    low: t('assistants.settings.reasoning_effort.low_description'),
+    medium: t('assistants.settings.reasoning_effort.medium_description'),
+    high: t('assistants.settings.reasoning_effort.high_description'),
+    xhigh: t('assistants.settings.reasoning_effort.xhigh_description'),
+    auto: t('assistants.settings.reasoning_effort.auto_description')
+  } as const satisfies Record<ThinkingOption, string>
+
   const panelItems = useMemo(() => {
     // 使用表中定义的选项创建UI选项
     return supportedOptions.map((option) => ({
       level: option,
-      label: getReasoningEffortOptionsLabel(option),
-      description: '',
-      icon: ThinkingIcon(option),
+      label: reasoningEffortOptionLabelMap[option],
+      description: reasoningEffortDescriptionMap[option],
+      icon: ThinkingIcon({ option }),
       isSelected: currentReasoningEffort === option,
       action: () => onThinkingChange(option)
     }))
-  }, [currentReasoningEffort, supportedOptions, onThinkingChange])
+  }, [
+    supportedOptions,
+    reasoningEffortOptionLabelMap,
+    reasoningEffortDescriptionMap,
+    currentReasoningEffort,
+    onThinkingChange
+  ])
 
-  const isThinkingEnabled = currentReasoningEffort !== undefined && currentReasoningEffort !== 'none'
+  const isThinkingEnabled =
+    currentReasoningEffort !== undefined && currentReasoningEffort !== 'none' && currentReasoningEffort !== 'default'
 
   const disableThinking = useCallback(() => {
     onThinkingChange('none')
@@ -135,7 +165,7 @@ const ThinkingButton: FC<Props> = ({ quickPanel, model, assistantId }): ReactEle
       {
         label: t('assistants.settings.reasoning_effort.label'),
         description: '',
-        icon: ThinkingIcon(currentReasoningEffort),
+        icon: ThinkingIcon({ option: currentReasoningEffort }),
         isMenu: true,
         action: () => openQuickPanel()
       }
@@ -163,37 +193,44 @@ const ThinkingButton: FC<Props> = ({ quickPanel, model, assistantId }): ReactEle
         aria-label={ariaLabel}
         aria-pressed={currentReasoningEffort !== 'none'}
         style={isFixedReasoning ? { cursor: 'default' } : undefined}>
-        {ThinkingIcon(currentReasoningEffort)}
+        {ThinkingIcon({ option: currentReasoningEffort, isFixedReasoning })}
       </ActionIconButton>
     </Tooltip>
   )
 }
 
-const ThinkingIcon = (option?: ThinkingOption) => {
+const ThinkingIcon = (props: { option?: ThinkingOption; isFixedReasoning?: boolean }) => {
   let IconComponent: React.FC<React.SVGProps<SVGSVGElement>> | null = null
-
-  switch (option) {
-    case 'minimal':
-      IconComponent = MdiLightbulbOn30
-      break
-    case 'low':
-      IconComponent = MdiLightbulbOn50
-      break
-    case 'medium':
-      IconComponent = MdiLightbulbOn80
-      break
-    case 'high':
-      IconComponent = MdiLightbulbOn
-      break
-    case 'auto':
-      IconComponent = MdiLightbulbAutoOutline
-      break
-    case 'none':
-      IconComponent = MdiLightbulbOffOutline
-      break
-    default:
-      IconComponent = MdiLightbulbOffOutline
-      break
+  if (props.isFixedReasoning) {
+    IconComponent = MdiLightbulbAutoOutline
+  } else {
+    switch (props.option) {
+      case 'minimal':
+        IconComponent = MdiLightbulbOn30
+        break
+      case 'low':
+        IconComponent = MdiLightbulbOn50
+        break
+      case 'medium':
+        IconComponent = MdiLightbulbOn80
+        break
+      case 'high':
+        IconComponent = MdiLightbulbOn90
+        break
+      case 'xhigh':
+        IconComponent = MdiLightbulbOn
+        break
+      case 'auto':
+        IconComponent = MdiLightbulbAutoOutline
+        break
+      case 'none':
+        IconComponent = MdiLightbulbOffOutline
+        break
+      case 'default':
+      default:
+        IconComponent = MdiLightbulbQuestion
+        break
+    }
   }
 
   return <IconComponent className="icon" width={18} height={18} style={{ marginTop: -2 }} />
diff --git a/src/renderer/src/pages/home/Inputbar/tools/components/useActivityDirectoryPanel.tsx b/src/renderer/src/pages/home/Inputbar/tools/components/useActivityDirectoryPanel.tsx
index b83c00c42d..e15529e66c 100644
--- a/src/renderer/src/pages/home/Inputbar/tools/components/useActivityDirectoryPanel.tsx
+++ b/src/renderer/src/pages/home/Inputbar/tools/components/useActivityDirectoryPanel.tsx
@@ -9,6 +9,7 @@ import { useTranslation } from 'react-i18next'
 
 const logger = loggerService.withContext('useActivityDirectoryPanel')
 const MAX_FILE_RESULTS = 500
+const MAX_SEARCH_RESULTS = 20
 const areFileListsEqual = (prev: string[], next: string[]) => {
   if (prev === next) return true
   if (prev.length !== next.length) return false
@@ -193,11 +194,11 @@ export const useActivityDirectoryPanel = (params: Params, role: 'button' | 'mana
           try {
             const files = await window.api.file.listDirectory(dirPath, {
               recursive: true,
-              maxDepth: 4,
+              maxDepth: 10,
               includeHidden: false,
               includeFiles: true,
               includeDirectories: true,
-              maxEntries: MAX_FILE_RESULTS,
+              maxEntries: MAX_SEARCH_RESULTS,
               searchPattern: searchPattern || '.'
             })
 
diff --git a/src/renderer/src/pages/home/Markdown/Table.tsx b/src/renderer/src/pages/home/Markdown/Table.tsx
index 01f325bd44..a91ce1cc91 100644
--- a/src/renderer/src/pages/home/Markdown/Table.tsx
+++ b/src/renderer/src/pages/home/Markdown/Table.tsx
@@ -4,6 +4,7 @@ import store from '@renderer/store'
 import { messageBlocksSelectors } from '@renderer/store/messageBlock'
 import { Tooltip } from 'antd'
 import { Check } from 'lucide-react'
+import MarkdownIt from 'markdown-it'
 import React, { memo, useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
@@ -22,18 +23,26 @@ const Table: React.FC<Props> = ({ children, node, blockId }) => {
   const { t } = useTranslation()
   const [copied, setCopied] = useTemporaryValue(false, 2000)
 
-  const handleCopyTable = useCallback(() => {
+  const handleCopyTable = useCallback(async () => {
     const tableMarkdown = extractTableMarkdown(blockId ?? '', node?.position)
     if (!tableMarkdown) return
 
-    navigator.clipboard
-      .writeText(tableMarkdown)
-      .then(() => {
-        setCopied(true)
-      })
-      .catch((error) => {
-        window.toast?.error(`${t('message.copy.failed')}: ${error}`)
-      })
+    try {
+      const tableHtml = convertMarkdownTableToHtml(tableMarkdown)
+
+      if (navigator.clipboard && window.ClipboardItem) {
+        const clipboardItem = new ClipboardItem({
+          'text/plain': new Blob([tableMarkdown], { type: 'text/plain' }),
+          'text/html': new Blob([tableHtml], { type: 'text/html' })
+        })
+        await navigator.clipboard.write([clipboardItem])
+      } else {
+        await navigator.clipboard.writeText(tableMarkdown)
+      }
+      setCopied(true)
+    } catch (error) {
+      window.toast?.error(`${t('message.copy.failed')}: ${error}`)
+    }
   }, [blockId, node?.position, setCopied, t])
 
   return (
@@ -60,7 +69,6 @@ export function extractTableMarkdown(blockId: string, position: any): string {
   if (!position || !blockId) return ''
 
   const block = messageBlocksSelectors.selectById(store.getState(), blockId)
-
   if (!block || !('content' in block) || typeof block.content !== 'string') return ''
 
   const { start, end } = position
@@ -71,6 +79,16 @@ export function extractTableMarkdown(blockId: string, position: any): string {
   return tableLines.join('\n').trim()
 }
 
+function convertMarkdownTableToHtml(markdownTable: string): string {
+  const md = new MarkdownIt({
+    html: true,
+    breaks: false,
+    linkify: false
+  })
+
+  return md.render(markdownTable)
+}
+
 const TableWrapper = styled.div`
   position: relative;
 
diff --git a/src/renderer/src/pages/home/Messages/AgentSessionMessages.tsx b/src/renderer/src/pages/home/Messages/AgentSessionMessages.tsx
index 611216919a..7f7900b8c5 100644
--- a/src/renderer/src/pages/home/Messages/AgentSessionMessages.tsx
+++ b/src/renderer/src/pages/home/Messages/AgentSessionMessages.tsx
@@ -2,13 +2,17 @@ import { loggerService } from '@logger'
 import ContextMenu from '@renderer/components/ContextMenu'
 import { useSession } from '@renderer/hooks/agents/useSession'
 import { useTopicMessages } from '@renderer/hooks/useMessageOperations'
+import useScrollPosition from '@renderer/hooks/useScrollPosition'
+import { useSettings } from '@renderer/hooks/useSettings'
+import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
 import { getGroupedMessages } from '@renderer/services/MessagesService'
 import { type Topic, TopicType } from '@renderer/types'
 import { buildAgentSessionTopicId } from '@renderer/utils/agentSession'
 import { Spin } from 'antd'
-import { memo, useMemo } from 'react'
+import { memo, useCallback, useEffect, useMemo, useRef } from 'react'
 import styled from 'styled-components'
 
+import MessageAnchorLine from './MessageAnchorLine'
 import MessageGroup from './MessageGroup'
 import NarrowLayout from './NarrowLayout'
 import PermissionModeDisplay from './PermissionModeDisplay'
@@ -26,6 +30,10 @@ const AgentSessionMessages: React.FC<Props> = ({ agentId, sessionId }) => {
   const sessionTopicId = useMemo(() => buildAgentSessionTopicId(sessionId), [sessionId])
   // Use the same hook as Messages.tsx for consistent behavior
   const messages = useTopicMessages(sessionTopicId)
+  const { messageNavigation } = useSettings()
+  const scrollContainerRef = useRef<HTMLDivElement>(null)
+
+  const { handleScroll: handleScrollPosition } = useScrollPosition(`agent-session-${sessionId}`)
 
   const displayMessages = useMemo(() => {
     if (!messages || messages.length === 0) return []
@@ -60,8 +68,29 @@ const AgentSessionMessages: React.FC<Props> = ({ agentId, sessionId }) => {
     messageCount: messages.length
   })
 
+  // Scroll to bottom function
+  const scrollToBottom = useCallback(() => {
+    if (scrollContainerRef.current) {
+      requestAnimationFrame(() => {
+        if (scrollContainerRef.current) {
+          scrollContainerRef.current.scrollTo({ top: 0 })
+        }
+      })
+    }
+  }, [scrollContainerRef])
+
+  // Listen for send message events to auto-scroll to bottom
+  useEffect(() => {
+    const unsubscribes = [EventEmitter.on(EVENT_NAMES.SEND_MESSAGE, scrollToBottom)]
+    return () => unsubscribes.forEach((unsub) => unsub())
+  }, [scrollToBottom])
+
   return (
-    <MessagesContainer id="messages" className="messages-container">
+    <MessagesContainer
+      id="messages"
+      className="messages-container"
+      ref={scrollContainerRef}
+      onScroll={handleScrollPosition}>
       <NarrowLayout style={{ display: 'flex', flexDirection: 'column-reverse' }}>
         <ContextMenu>
           <ScrollContainer>
@@ -79,6 +108,7 @@ const AgentSessionMessages: React.FC<Props> = ({ agentId, sessionId }) => {
           </ScrollContainer>
         </ContextMenu>
       </NarrowLayout>
+      {messageNavigation === 'anchor' && <MessageAnchorLine messages={displayMessages} />}
     </MessagesContainer>
   )
 }
diff --git a/src/renderer/src/pages/home/Messages/MessageEditor.tsx b/src/renderer/src/pages/home/Messages/MessageEditor.tsx
index e136be1d35..f9546b531f 100644
--- a/src/renderer/src/pages/home/Messages/MessageEditor.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageEditor.tsx
@@ -429,7 +429,7 @@ const FileBlocksContainer = styled.div`
   display: flex;
   flex-wrap: wrap;
   gap: 8px;
-  padding: 0 15px;
+  padding: 0;
   margin: 8px 0;
   background: transparent;
   border-radius: 4px;
diff --git a/src/renderer/src/pages/home/Messages/MessageHeader.tsx b/src/renderer/src/pages/home/Messages/MessageHeader.tsx
index 5f6a696632..bc1b2ab626 100644
--- a/src/renderer/src/pages/home/Messages/MessageHeader.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageHeader.tsx
@@ -83,11 +83,11 @@ const MessageHeader: FC<Props> = memo(({ assistant, model, message, topic, isGro
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [model?.provider, showMinappIcon])
 
-  const hideHeader = isBubbleStyle ? isUserMessage && !isMultiSelectMode : false
-
-  if (hideHeader) {
-    return null
-  }
+  const userNameJustifyContent = useMemo(() => {
+    if (!isBubbleStyle) return 'flex-start'
+    if (isUserMessage && !isMultiSelectMode) return 'flex-end'
+    return 'flex-start'
+  }, [isBubbleStyle, isUserMessage, isMultiSelectMode])
 
   return (
     <Container className="message-header">
@@ -121,7 +121,7 @@ const MessageHeader: FC<Props> = memo(({ assistant, model, message, topic, isGro
         </>
       )}
       <UserWrap>
-        <HStack alignItems="center">
+        <HStack alignItems="center" justifyContent={userNameJustifyContent}>
           <UserName isBubbleStyle={isBubbleStyle} theme={theme}>
             {username}
           </UserName>
diff --git a/src/renderer/src/pages/home/Messages/Messages.tsx b/src/renderer/src/pages/home/Messages/Messages.tsx
index 7e0e03a774..05ee5b8fbb 100644
--- a/src/renderer/src/pages/home/Messages/Messages.tsx
+++ b/src/renderer/src/pages/home/Messages/Messages.tsx
@@ -162,7 +162,7 @@ const Messages: React.FC<MessagesProps> = ({ assistant, topic, setActiveTopic, o
 
           const { message: clearMessage } = getUserMessage({ assistant, topic, type: 'clear' })
           dispatch(newMessagesActions.addMessage({ topicId: topic.id, message: clearMessage }))
-          await saveMessageAndBlocksToDB(clearMessage, [])
+          await saveMessageAndBlocksToDB(topic.id, clearMessage, [])
 
           scrollToBottom()
         } finally {
diff --git a/src/renderer/src/pages/home/Messages/Prompt.tsx b/src/renderer/src/pages/home/Messages/Prompt.tsx
index 1be9770593..0f48d03c20 100644
--- a/src/renderer/src/pages/home/Messages/Prompt.tsx
+++ b/src/renderer/src/pages/home/Messages/Prompt.tsx
@@ -63,7 +63,10 @@ const Prompt: FC<Props> = ({ assistant, topic }) => {
   }
 
   return (
-    <Container className="system-prompt" onClick={() => AssistantSettingsPopup.show({ assistant })} $isDark={isDark}>
+    <Container
+      className="system-prompt"
+      onClick={() => AssistantSettingsPopup.show({ assistant, tab: 'prompt' })}
+      $isDark={isDark}>
       <Text $isVisible={isVisible}>{displayText}</Text>
     </Container>
   )
diff --git a/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx b/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx
index 3c0c9cf802..79d7f64d7a 100644
--- a/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx
+++ b/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx
@@ -9,6 +9,7 @@ import { useTags } from '@renderer/hooks/useTags'
 import type { Assistant, AssistantsSortType, Topic } from '@renderer/types'
 import type { FC } from 'react'
 import { useCallback, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
 import UnifiedAddButton from './components/UnifiedAddButton'
@@ -32,6 +33,7 @@ const AssistantsTab: FC<AssistantsTabProps> = (props) => {
   const { apiServerConfig } = useApiServer()
   const apiServerEnabled = apiServerConfig.enabled
   const { chat } = useRuntime()
+  const { t } = useTranslation()
 
   // Agent related hooks
   const { agents, deleteAgent, isLoading: agentsLoading, error: agentsError } = useAgents()
@@ -75,13 +77,18 @@ const AssistantsTab: FC<AssistantsTabProps> = (props) => {
   const onDeleteAssistant = useCallback(
     (assistant: Assistant) => {
       const remaining = assistants.filter((a) => a.id !== assistant.id)
+      if (remaining.length === 0) {
+        window.toast.error(t('assistants.delete.error.remain_one'))
+        return
+      }
+
       if (assistant.id === activeAssistant?.id) {
         const newActive = remaining[remaining.length - 1]
-        newActive ? setActiveAssistant(newActive) : onCreateDefaultAssistant()
+        setActiveAssistant(newActive)
       }
       removeAssistant(assistant.id)
     },
-    [activeAssistant, assistants, removeAssistant, setActiveAssistant, onCreateDefaultAssistant]
+    [assistants, activeAssistant?.id, removeAssistant, t, setActiveAssistant]
   )
 
   const handleSortByChange = useCallback(
diff --git a/src/renderer/src/pages/home/Tabs/SessionSettingsTab.tsx b/src/renderer/src/pages/home/Tabs/SessionSettingsTab.tsx
deleted file mode 100644
index b138caaf80..0000000000
--- a/src/renderer/src/pages/home/Tabs/SessionSettingsTab.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import type { useUpdateSession } from '@renderer/hooks/agents/useUpdateSession'
-import { SettingDivider } from '@renderer/pages/settings'
-import { SessionSettingsPopup } from '@renderer/pages/settings/AgentSettings'
-import AdvancedSettings from '@renderer/pages/settings/AgentSettings/AdvancedSettings'
-import EssentialSettings from '@renderer/pages/settings/AgentSettings/EssentialSettings'
-import type { GetAgentSessionResponse } from '@renderer/types'
-import { Button } from 'antd'
-import type { FC } from 'react'
-import { useTranslation } from 'react-i18next'
-
-interface Props {
-  session: GetAgentSessionResponse | undefined | null
-  update: ReturnType<typeof useUpdateSession>['updateSession']
-}
-
-const SessionSettingsTab: FC<Props> = ({ session, update }) => {
-  const { t } = useTranslation()
-
-  const onMoreSetting = () => {
-    if (session?.id) {
-      SessionSettingsPopup.show({
-        agentId: session.agent_id,
-        sessionId: session.id
-      })
-    }
-  }
-
-  if (!session) {
-    return null
-  }
-
-  return (
-    <div className="w-[var(--assistants-width)] p-2 px-3 pt-4">
-      <EssentialSettings agentBase={session} update={update} showModelSetting={false} />
-      <SettingDivider />
-      <AdvancedSettings agentBase={session} update={update} />
-      <SettingDivider />
-      <Button size="small" block onClick={onMoreSetting}>
-        {t('settings.moresetting.label')}
-      </Button>
-    </div>
-  )
-}
-
-export default SessionSettingsTab
diff --git a/src/renderer/src/pages/home/Tabs/SettingsTab.tsx b/src/renderer/src/pages/home/Tabs/SettingsTab.tsx
index 014897ce9c..f76971e99d 100644
--- a/src/renderer/src/pages/home/Tabs/SettingsTab.tsx
+++ b/src/renderer/src/pages/home/Tabs/SettingsTab.tsx
@@ -1,24 +1,17 @@
 import EditableNumber from '@renderer/components/EditableNumber'
-import { HStack } from '@renderer/components/Layout'
 import Scrollbar from '@renderer/components/Scrollbar'
 import Selector from '@renderer/components/Selector'
 import { HelpTooltip } from '@renderer/components/TooltipIcons'
-import {
-  DEFAULT_CONTEXTCOUNT,
-  DEFAULT_MAX_TOKENS,
-  DEFAULT_TEMPERATURE,
-  MAX_CONTEXT_COUNT
-} from '@renderer/config/constant'
 import { isOpenAIModel, isSupportVerbosityModel } from '@renderer/config/models'
 import { UNKNOWN } from '@renderer/config/translate'
 import { useCodeStyle } from '@renderer/context/CodeStyleProvider'
 import { useTheme } from '@renderer/context/ThemeProvider'
 import { useAssistant } from '@renderer/hooks/useAssistant'
 import { useProvider } from '@renderer/hooks/useProvider'
+import { useRuntime } from '@renderer/hooks/useRuntime'
 import { useSettings } from '@renderer/hooks/useSettings'
 import useTranslate from '@renderer/hooks/useTranslate'
 import { SettingDivider, SettingRow, SettingRowTitle } from '@renderer/pages/settings'
-import AssistantSettingsPopup from '@renderer/pages/settings/AssistantSettings'
 import { CollapsibleSettingGroup } from '@renderer/pages/settings/SettingGroup'
 import { getDefaultModel } from '@renderer/services/AssistantService'
 import { useAppDispatch } from '@renderer/store'
@@ -52,19 +45,17 @@ import {
   setShowTranslateConfirm,
   setThoughtAutoCollapse
 } from '@renderer/store/settings'
-import type { Assistant, AssistantSettings, CodeStyleVarious, MathEngine } from '@renderer/types'
+import type { Assistant, CodeStyleVarious, MathEngine } from '@renderer/types'
 import { isGroqSystemProvider, ThemeMode } from '@renderer/types'
-import { modalConfirm } from '@renderer/utils'
 import { getSendMessageShortcutLabel } from '@renderer/utils/input'
 import {
   isOpenAICompatibleProvider,
   isSupportServiceTierProvider,
   isSupportVerbosityProvider
 } from '@renderer/utils/provider'
-import { Button, Col, InputNumber, Row, Slider, Switch } from 'antd'
-import { Settings2 } from 'lucide-react'
+import { Col, Row, Slider, Switch } from 'antd'
 import type { FC } from 'react'
-import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
@@ -76,20 +67,15 @@ interface Props {
 }
 
 const SettingsTab: FC<Props> = (props) => {
-  const { assistant, updateAssistantSettings } = useAssistant(props.assistant.id)
+  const { chat } = useRuntime()
+  const { assistant } = useAssistant(props.assistant.id)
   const { provider } = useProvider(assistant.model.provider)
 
   const { messageStyle, fontSize, language } = useSettings()
   const { theme } = useTheme()
   const { themeNames } = useCodeStyle()
 
-  const [temperature, setTemperature] = useState(assistant?.settings?.temperature ?? DEFAULT_TEMPERATURE)
-  const [enableTemperature, setEnableTemperature] = useState(assistant?.settings?.enableTemperature ?? true)
-  const [contextCount, setContextCount] = useState(assistant?.settings?.contextCount ?? DEFAULT_CONTEXTCOUNT)
-  const [enableMaxTokens, setEnableMaxTokens] = useState(assistant?.settings?.enableMaxTokens ?? false)
-  const [maxTokens, setMaxTokens] = useState(assistant?.settings?.maxTokens ?? 0)
   const [fontSizeValue, setFontSizeValue] = useState(fontSize)
-  const [streamOutput, setStreamOutput] = useState(assistant?.settings?.streamOutput)
   const { translateLanguages } = useTranslate()
 
   const { t } = useTranslation()
@@ -128,28 +114,6 @@ const SettingsTab: FC<Props> = (props) => {
     confirmRegenerateMessage
   } = useSettings()
 
-  const onUpdateAssistantSettings = (settings: Partial<AssistantSettings>) => {
-    updateAssistantSettings(settings)
-  }
-
-  const onTemperatureChange = (value) => {
-    if (!isNaN(value as number)) {
-      onUpdateAssistantSettings({ temperature: value })
-    }
-  }
-
-  const onContextCountChange = (value) => {
-    if (!isNaN(value as number)) {
-      onUpdateAssistantSettings({ contextCount: value })
-    }
-  }
-
-  const onMaxTokensChange = (value) => {
-    if (!isNaN(value as number)) {
-      onUpdateAssistantSettings({ maxTokens: value })
-    }
-  }
-
   const codeStyle = useMemo(() => {
     return codeEditor.enabled
       ? theme === ThemeMode.light
@@ -176,15 +140,6 @@ const SettingsTab: FC<Props> = (props) => {
     [dispatch, theme, codeEditor.enabled]
   )
 
-  useEffect(() => {
-    setTemperature(assistant?.settings?.temperature ?? DEFAULT_TEMPERATURE)
-    setEnableTemperature(assistant?.settings?.enableTemperature ?? true)
-    setContextCount(assistant?.settings?.contextCount ?? DEFAULT_CONTEXTCOUNT)
-    setEnableMaxTokens(assistant?.settings?.enableMaxTokens ?? false)
-    setMaxTokens(assistant?.settings?.maxTokens ?? DEFAULT_MAX_TOKENS)
-    setStreamOutput(assistant?.settings?.streamOutput ?? true)
-  }, [assistant])
-
   const model = assistant.model || getDefaultModel()
 
   const showOpenAiSettings =
@@ -193,173 +148,36 @@ const SettingsTab: FC<Props> = (props) => {
     isSupportServiceTierProvider(provider) ||
     (isSupportVerbosityModel(model) && isSupportVerbosityProvider(provider))
 
+  const isTopicSettings = chat.activeTopicOrSession === 'topic'
+
   return (
     <Container className="settings-tab">
-      {props.assistant.id !== 'fake' && (
-        <CollapsibleSettingGroup
-          title={t('assistants.settings.title')}
-          defaultExpanded={true}
-          extra={
-            <HStack alignItems="center" gap={2}>
-              <Button
-                type="text"
-                size="small"
-                icon={<Settings2 size={16} />}
-                onClick={() => AssistantSettingsPopup.show({ assistant, tab: 'model' })}
-              />
-            </HStack>
-          }>
-          <SettingGroup style={{ marginTop: 5 }}>
-            <Row align="middle">
-              <SettingRowTitleSmall>
-                {t('chat.settings.temperature.label')}
-                <HelpTooltip title={t('chat.settings.temperature.tip')} />
-              </SettingRowTitleSmall>
-              <Switch
-                size="small"
-                style={{ marginLeft: 'auto' }}
-                checked={enableTemperature}
-                onChange={(enabled) => {
-                  setEnableTemperature(enabled)
-                  onUpdateAssistantSettings({ enableTemperature: enabled })
-                }}
-              />
-            </Row>
-            {enableTemperature ? (
-              <Row align="middle" gutter={10}>
-                <Col span={23}>
-                  <Slider
-                    min={0}
-                    max={2}
-                    onChange={setTemperature}
-                    onChangeComplete={onTemperatureChange}
-                    value={typeof temperature === 'number' ? temperature : 0}
-                    step={0.1}
-                  />
-                </Col>
-              </Row>
-            ) : (
-              <SettingDivider />
-            )}
-            <Row align="middle" gutter={10} justify="space-between">
-              <SettingRowTitleSmall>
-                {t('chat.settings.context_count.label')}
-                <HelpTooltip title={t('chat.settings.context_count.tip')} />
-              </SettingRowTitleSmall>
-              <Col span={8}>
-                <EditableNumber
-                  min={0}
-                  max={20}
-                  step={1}
-                  value={contextCount}
-                  changeOnBlur
-                  onChange={(value) => {
-                    if (value !== null && value >= 0 && value <= 20) {
-                      setContextCount(value)
-                      onContextCountChange(value)
-                    }
-                  }}
-                  formatter={(value) => (value === MAX_CONTEXT_COUNT ? t('chat.settings.max') : (value ?? ''))}
-                  style={{ width: '100%' }}
-                />
-              </Col>
-            </Row>
-            <Row align="middle" gutter={10}>
-              <Col span={24}>
-                <Slider
-                  min={0}
-                  max={20}
-                  onChange={setContextCount}
-                  onChangeComplete={onContextCountChange}
-                  value={Math.min(contextCount, 20)}
-                  tooltip={{ open: false }}
-                  step={1}
-                  marks={{
-                    0: '0',
-                    10: '10',
-                    20: '20'
-                  }}
-                />
-              </Col>
-            </Row>
-            <SettingDivider />
-            <SettingRow>
-              <SettingRowTitleSmall>{t('models.stream_output')}</SettingRowTitleSmall>
-              <Switch
-                size="small"
-                checked={streamOutput}
-                onChange={(checked) => {
-                  setStreamOutput(checked)
-                  onUpdateAssistantSettings({ streamOutput: checked })
-                }}
-              />
-            </SettingRow>
-            <SettingDivider />
-            <SettingRow>
-              <Row align="middle">
-                <SettingRowTitleSmall>
-                  {t('chat.settings.max_tokens.label')}
-                  <HelpTooltip title={t('chat.settings.max_tokens.tip')} />
-                </SettingRowTitleSmall>
-              </Row>
-              <Switch
-                size="small"
-                checked={enableMaxTokens}
-                onChange={async (enabled) => {
-                  if (enabled) {
-                    const confirmed = await modalConfirm({
-                      title: t('chat.settings.max_tokens.confirm'),
-                      content: t('chat.settings.max_tokens.confirm_content'),
-                      okButtonProps: {
-                        danger: true
-                      }
-                    })
-                    if (!confirmed) return
-                  }
-                  setEnableMaxTokens(enabled)
-                  onUpdateAssistantSettings({ enableMaxTokens: enabled })
-                }}
-              />
-            </SettingRow>
-            {enableMaxTokens && (
-              <Row align="middle" gutter={10} style={{ marginTop: 10 }}>
-                <Col span={24}>
-                  <InputNumber
-                    disabled={!enableMaxTokens}
-                    min={0}
-                    max={10000000}
-                    step={100}
-                    value={typeof maxTokens === 'number' ? maxTokens : 0}
-                    changeOnBlur
-                    onChange={(value) => value && setMaxTokens(value)}
-                    onBlur={() => onMaxTokensChange(maxTokens)}
-                    style={{ width: '100%' }}
-                  />
-                </Col>
-              </Row>
-            )}
-            <SettingDivider />
-          </SettingGroup>
-        </CollapsibleSettingGroup>
-      )}
-      {showOpenAiSettings && (
-        <OpenAISettingsGroup
-          model={model}
-          providerId={provider.id}
-          SettingGroup={SettingGroup}
-          SettingRowTitleSmall={SettingRowTitleSmall}
-        />
-      )}
-      {isGroqSystemProvider(provider) && (
-        <GroqSettingsGroup SettingGroup={SettingGroup} SettingRowTitleSmall={SettingRowTitleSmall} />
+      {isTopicSettings && (
+        <>
+          {showOpenAiSettings && (
+            <OpenAISettingsGroup
+              model={model}
+              providerId={provider.id}
+              SettingGroup={SettingGroup}
+              SettingRowTitleSmall={SettingRowTitleSmall}
+            />
+          )}
+          {isGroqSystemProvider(provider) && (
+            <GroqSettingsGroup SettingGroup={SettingGroup} SettingRowTitleSmall={SettingRowTitleSmall} />
+          )}
+        </>
       )}
       <CollapsibleSettingGroup title={t('settings.messages.title')} defaultExpanded={true}>
         <SettingGroup>
-          <SettingRow>
-            <SettingRowTitleSmall>{t('settings.messages.prompt')}</SettingRowTitleSmall>
-            <Switch size="small" checked={showPrompt} onChange={(checked) => dispatch(setShowPrompt(checked))} />
-          </SettingRow>
-          <SettingDivider />
+          {isTopicSettings && (
+            <>
+              <SettingRow>
+                <SettingRowTitleSmall>{t('settings.messages.prompt')}</SettingRowTitleSmall>
+                <Switch size="small" checked={showPrompt} onChange={(checked) => dispatch(setShowPrompt(checked))} />
+              </SettingRow>
+              <SettingDivider />
+            </>
+          )}
           <SettingRow>
             <SettingRowTitleSmall>{t('settings.messages.use_serif_font')}</SettingRowTitleSmall>
             <Switch
@@ -381,15 +199,19 @@ const SettingsTab: FC<Props> = (props) => {
             />
           </SettingRow>
           <SettingDivider />
-          <SettingRow>
-            <SettingRowTitleSmall>{t('settings.messages.show_message_outline')}</SettingRowTitleSmall>
-            <Switch
-              size="small"
-              checked={showMessageOutline}
-              onChange={(checked) => dispatch(setShowMessageOutline(checked))}
-            />
-          </SettingRow>
-          <SettingDivider />
+          {isTopicSettings && (
+            <>
+              <SettingRow>
+                <SettingRowTitleSmall>{t('settings.messages.show_message_outline')}</SettingRowTitleSmall>
+                <Switch
+                  size="small"
+                  checked={showMessageOutline}
+                  onChange={(checked) => dispatch(setShowMessageOutline(checked))}
+                />
+              </SettingRow>
+              <SettingDivider />
+            </>
+          )}
           <SettingRow>
             <SettingRowTitleSmall>{t('message.message.style.label')}</SettingRowTitleSmall>
             <Selector
@@ -402,20 +224,24 @@ const SettingsTab: FC<Props> = (props) => {
             />
           </SettingRow>
           <SettingDivider />
-          <SettingRow>
-            <SettingRowTitleSmall>{t('message.message.multi_model_style.label')}</SettingRowTitleSmall>
-            <Selector
-              value={multiModelMessageStyle}
-              onChange={(value) => dispatch(setMultiModelMessageStyle(value))}
-              options={[
-                { value: 'fold', label: t('message.message.multi_model_style.fold.label') },
-                { value: 'vertical', label: t('message.message.multi_model_style.vertical') },
-                { value: 'horizontal', label: t('message.message.multi_model_style.horizontal') },
-                { value: 'grid', label: t('message.message.multi_model_style.grid') }
-              ]}
-            />
-          </SettingRow>
-          <SettingDivider />
+          {isTopicSettings && (
+            <>
+              <SettingRow>
+                <SettingRowTitleSmall>{t('message.message.multi_model_style.label')}</SettingRowTitleSmall>
+                <Selector
+                  value={multiModelMessageStyle}
+                  onChange={(value) => dispatch(setMultiModelMessageStyle(value))}
+                  options={[
+                    { value: 'fold', label: t('message.message.multi_model_style.fold.label') },
+                    { value: 'vertical', label: t('message.message.multi_model_style.vertical') },
+                    { value: 'horizontal', label: t('message.message.multi_model_style.horizontal') },
+                    { value: 'grid', label: t('message.message.multi_model_style.grid') }
+                  ]}
+                />
+              </SettingRow>
+              <SettingDivider />
+            </>
+          )}
           <SettingRow>
             <SettingRowTitleSmall>{t('settings.messages.navigation.label')}</SettingRowTitleSmall>
             <Selector
@@ -627,15 +453,19 @@ const SettingsTab: FC<Props> = (props) => {
       </CollapsibleSettingGroup>
       <CollapsibleSettingGroup title={t('settings.messages.input.title')} defaultExpanded={false}>
         <SettingGroup>
-          <SettingRow>
-            <SettingRowTitleSmall>{t('settings.messages.input.show_estimated_tokens')}</SettingRowTitleSmall>
-            <Switch
-              size="small"
-              checked={showInputEstimatedTokens}
-              onChange={(checked) => dispatch(setShowInputEstimatedTokens(checked))}
-            />
-          </SettingRow>
-          <SettingDivider />
+          {isTopicSettings && (
+            <>
+              <SettingRow>
+                <SettingRowTitleSmall>{t('settings.messages.input.show_estimated_tokens')}</SettingRowTitleSmall>
+                <Switch
+                  size="small"
+                  checked={showInputEstimatedTokens}
+                  onChange={(checked) => dispatch(setShowInputEstimatedTokens(checked))}
+                />
+              </SettingRow>
+              <SettingDivider />
+            </>
+          )}
           <SettingRow>
             <SettingRowTitleSmall>{t('settings.messages.input.paste_long_text_as_file')}</SettingRowTitleSmall>
             <Switch
diff --git a/src/renderer/src/pages/home/Tabs/components/AgentItem.tsx b/src/renderer/src/pages/home/Tabs/components/AgentItem.tsx
index b26ab13ba6..08093cf102 100644
--- a/src/renderer/src/pages/home/Tabs/components/AgentItem.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/AgentItem.tsx
@@ -1,5 +1,4 @@
 import { DeleteIcon, EditIcon } from '@renderer/components/Icons'
-import { useSessions } from '@renderer/hooks/agents/useSessions'
 import { useSettings } from '@renderer/hooks/useSettings'
 import AgentSettingsPopup from '@renderer/pages/settings/AgentSettings/AgentSettingsPopup'
 import { AgentLabel } from '@renderer/pages/settings/AgentSettings/shared'
@@ -8,7 +7,7 @@ import type { AgentEntity } from '@renderer/types'
 import { cn } from '@renderer/utils'
 import type { MenuProps } from 'antd'
 import { Dropdown, Tooltip } from 'antd'
-import { Bot } from 'lucide-react'
+import { Bot, MoreVertical } from 'lucide-react'
 import type { FC } from 'react'
 import { memo, useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -24,8 +23,7 @@ interface AgentItemProps {
 
 const AgentItem: FC<AgentItemProps> = ({ agent, isActive, onDelete, onPress }) => {
   const { t } = useTranslation()
-  const { sessions } = useSessions(agent.id)
-  const { clickAssistantToShowTopic, topicPosition } = useSettings()
+  const { clickAssistantToShowTopic, topicPosition, assistantIconType } = useSettings()
 
   const handlePress = useCallback(() => {
     // Show session sidebar if setting is enabled (reusing the assistant setting for consistency)
@@ -37,6 +35,14 @@ const AgentItem: FC<AgentItemProps> = ({ agent, isActive, onDelete, onPress }) =
     onPress()
   }, [clickAssistantToShowTopic, topicPosition, onPress])
 
+  const handleMoreClick = useCallback(
+    (e: React.MouseEvent) => {
+      e.stopPropagation()
+      agent.id && AgentSettingsPopup.show({ agentId: agent.id })
+    },
+    [agent.id]
+  )
+
   const menuItems: MenuProps['items'] = useMemo(
     () => [
       {
@@ -72,14 +78,14 @@ const AgentItem: FC<AgentItemProps> = ({ agent, isActive, onDelete, onPress }) =
       <Container onClick={handlePress} isActive={isActive}>
         <AssistantNameRow className="name" title={agent.name ?? agent.id}>
           <AgentNameWrapper>
-            <AgentLabel agent={agent} />
+            <AgentLabel agent={agent} hideIcon={assistantIconType === 'none'} />
           </AgentNameWrapper>
           {isActive && (
-            <MenuButton>
-              <SessionCount>{sessions.length}</SessionCount>
+            <MenuButton onClick={handleMoreClick}>
+              <MoreVertical size={14} className="text-[var(--color-text-secondary)]" />
             </MenuButton>
           )}
-          {!isActive && <BotIcon />}
+          {!isActive && assistantIconType !== 'none' && <BotIcon />}
         </AssistantNameRow>
       </Container>
     </Dropdown>
@@ -116,7 +122,7 @@ export const AgentNameWrapper: React.FC<React.HTMLAttributes<HTMLDivElement>> =
 export const MenuButton: React.FC<React.HTMLAttributes<HTMLDivElement>> = ({ className, ...props }) => (
   <div
     className={cn(
-      'flex h-5 min-h-5 w-5 flex-row items-center justify-center rounded-full border border-[var(--color-border)] bg-[var(--color-background)]',
+      'flex h-[22px] min-h-[22px] min-w-[22px] flex-row items-center justify-center rounded-[11px] border-[0.5px] border-[var(--color-border)] bg-[var(--color-background)] px-[5px]',
       className
     )}
     {...props}
diff --git a/src/renderer/src/pages/home/Tabs/components/AssistantItem.tsx b/src/renderer/src/pages/home/Tabs/components/AssistantItem.tsx
index b37f95781c..92d5e88dae 100644
--- a/src/renderer/src/pages/home/Tabs/components/AssistantItem.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/AssistantItem.tsx
@@ -1,17 +1,15 @@
-import ModelAvatar from '@renderer/components/Avatar/ModelAvatar'
-import EmojiIcon from '@renderer/components/EmojiIcon'
+import AssistantAvatar from '@renderer/components/Avatar/AssistantAvatar'
 import { CopyIcon, DeleteIcon, EditIcon } from '@renderer/components/Icons'
 import PromptPopup from '@renderer/components/Popups/PromptPopup'
 import { useAssistant, useAssistants } from '@renderer/hooks/useAssistant'
 import { useSettings } from '@renderer/hooks/useSettings'
 import { useTags } from '@renderer/hooks/useTags'
 import AssistantSettingsPopup from '@renderer/pages/settings/AssistantSettings'
-import { getDefaultModel } from '@renderer/services/AssistantService'
 import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
 import { useAppDispatch } from '@renderer/store'
 import { setActiveTopicOrSessionAction } from '@renderer/store/runtime'
 import type { Assistant, AssistantsSortType } from '@renderer/types'
-import { cn, getLeadingEmoji, uuid } from '@renderer/utils'
+import { cn, uuid } from '@renderer/utils'
 import { hasTopicPendingRequests } from '@renderer/utils/queue'
 import type { MenuProps } from 'antd'
 import { Dropdown } from 'antd'
@@ -22,6 +20,7 @@ import {
   ArrowUpAZ,
   BrushCleaning,
   Check,
+  MoreVertical,
   Plus,
   Save,
   Settings2,
@@ -66,8 +65,7 @@ const AssistantItem: FC<AssistantItemProps> = ({
   const { t } = useTranslation()
   const { allTags } = useTags()
   const { removeAllTopics } = useAssistant(assistant.id)
-  const { clickAssistantToShowTopic, topicPosition, assistantIconType, setAssistantIconType } = useSettings()
-  const defaultModel = getDefaultModel()
+  const { clickAssistantToShowTopic, topicPosition, setAssistantIconType } = useSettings()
   const { assistants, updateAssistants } = useAssistants()
 
   const [isPending, setIsPending] = useState(false)
@@ -150,6 +148,14 @@ const AssistantItem: FC<AssistantItemProps> = ({
     [assistant.emoji, assistantName]
   )
 
+  const handleMoreClick = useCallback(
+    (e: React.MouseEvent) => {
+      e.stopPropagation()
+      AssistantSettingsPopup.show({ assistant })
+    },
+    [assistant]
+  )
+
   return (
     <Dropdown
       menu={{ items: menuItems }}
@@ -157,25 +163,16 @@ const AssistantItem: FC<AssistantItemProps> = ({
       popupRender={(menu) => <div onPointerDown={(e) => e.stopPropagation()}>{menu}</div>}>
       <Container onClick={handleSwitch} isActive={isActive}>
         <AssistantNameRow className="name" title={fullAssistantName}>
-          {assistantIconType === 'model' ? (
-            <ModelAvatar
-              model={assistant.model || defaultModel}
-              size={24}
-              className={isPending && !isActive ? 'animation-pulse' : ''}
-            />
-          ) : (
-            assistantIconType === 'emoji' && (
-              <EmojiIcon
-                emoji={assistant.emoji || getLeadingEmoji(assistantName)}
-                className={isPending && !isActive ? 'animation-pulse' : ''}
-              />
-            )
-          )}
+          <AssistantAvatar
+            assistant={assistant}
+            size={24}
+            className={isPending && !isActive ? 'animation-pulse' : ''}
+          />
           <AssistantName className="text-nowrap">{assistantName}</AssistantName>
         </AssistantNameRow>
         {isActive && (
-          <MenuButton onClick={() => EventEmitter.emit(EVENT_NAMES.SWITCH_TOPIC_SIDEBAR)}>
-            <TopicCount className="topics-count">{assistant.topics.length}</TopicCount>
+          <MenuButton onClick={handleMoreClick}>
+            <MoreVertical size={14} className="text-[var(--color-text-secondary)]" />
           </MenuButton>
         )}
       </Container>
@@ -447,19 +444,4 @@ const MenuButton = ({
   </div>
 )
 
-const TopicCount = ({
-  children,
-  className,
-  ...props
-}: PropsWithChildren<{} & React.HTMLAttributes<HTMLDivElement>>) => (
-  <div
-    {...props}
-    className={cn(
-      'flex flex-row items-center justify-center rounded-[10px] text-[10px] text-[var(--color-text)]',
-      className
-    )}>
-    {children}
-  </div>
-)
-
 export default memo(AssistantItem)
diff --git a/src/renderer/src/pages/home/Tabs/components/SessionItem.tsx b/src/renderer/src/pages/home/Tabs/components/SessionItem.tsx
index 2fb9652d46..86f65ad6eb 100644
--- a/src/renderer/src/pages/home/Tabs/components/SessionItem.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/SessionItem.tsx
@@ -232,12 +232,11 @@ const SessionListItem = styled.div`
   }
 
   &.singlealone {
-    border-radius: 0 !important;
     &:hover {
       background-color: var(--color-background-soft);
     }
     &.active {
-      border-left: 2px solid var(--color-primary);
+      background-color: var(--color-background-mute);
       box-shadow: none;
     }
   }
diff --git a/src/renderer/src/pages/home/Tabs/components/Sessions.tsx b/src/renderer/src/pages/home/Tabs/components/Sessions.tsx
index af667b942f..2ec754d23b 100644
--- a/src/renderer/src/pages/home/Tabs/components/Sessions.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/Sessions.tsx
@@ -19,8 +19,6 @@ import styled from 'styled-components'
 import AddButton from './AddButton'
 import SessionItem from './SessionItem'
 
-// const logger = loggerService.withContext('SessionsTab')
-
 interface SessionsProps {
   agentId: string
 }
diff --git a/src/renderer/src/pages/home/Tabs/components/TopicManageMode.tsx b/src/renderer/src/pages/home/Tabs/components/TopicManageMode.tsx
new file mode 100644
index 0000000000..ad75b75e57
--- /dev/null
+++ b/src/renderer/src/pages/home/Tabs/components/TopicManageMode.tsx
@@ -0,0 +1,411 @@
+import AssistantAvatar from '@renderer/components/Avatar/AssistantAvatar'
+import { modelGenerating } from '@renderer/hooks/useRuntime'
+import { TopicManager } from '@renderer/hooks/useTopic'
+import type { Assistant, Topic } from '@renderer/types'
+import { cn } from '@renderer/utils'
+import { Dropdown, Tooltip } from 'antd'
+import { CheckSquare, FolderOpen, Search, Square, Trash2, XIcon } from 'lucide-react'
+import type { FC, PropsWithChildren, Ref } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+export interface TopicManageModeState {
+  isManageMode: boolean
+  selectedIds: Set<string>
+  searchText: string
+  enterManageMode: () => void
+  exitManageMode: () => void
+  toggleSelectTopic: (topicId: string) => void
+  setSelectedIds: React.Dispatch<React.SetStateAction<Set<string>>>
+  setSearchText: React.Dispatch<React.SetStateAction<string>>
+}
+
+/**
+ * Hook for managing topic selection state
+ */
+export function useTopicManageMode(): TopicManageModeState {
+  const [isManageMode, setIsManageMode] = useState(false)
+  const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set())
+  const [searchText, setSearchText] = useState('')
+
+  const enterManageMode = useCallback(() => {
+    setIsManageMode(true)
+    setSelectedIds(new Set())
+    setSearchText('')
+  }, [])
+
+  const exitManageMode = useCallback(() => {
+    setIsManageMode(false)
+    setSelectedIds(new Set())
+    setSearchText('')
+  }, [])
+
+  const toggleSelectTopic = useCallback((topicId: string) => {
+    setSelectedIds((prev) => {
+      const next = new Set(prev)
+      if (next.has(topicId)) {
+        next.delete(topicId)
+      } else {
+        next.add(topicId)
+      }
+      return next
+    })
+  }, [])
+
+  return {
+    isManageMode,
+    selectedIds,
+    searchText,
+    enterManageMode,
+    exitManageMode,
+    toggleSelectTopic,
+    setSelectedIds,
+    setSearchText
+  }
+}
+
+interface TopicManagePanelProps {
+  assistant: Assistant
+  assistants: Assistant[]
+  activeTopic: Topic
+  setActiveTopic: (topic: Topic) => void
+  removeTopic: (topic: Topic) => void
+  moveTopic: (topic: Topic, toAssistant: Assistant) => void
+  manageState: TopicManageModeState
+  filteredTopics: Topic[]
+}
+
+/**
+ * Bottom panel component for topic management mode
+ */
+export const TopicManagePanel: React.FC<TopicManagePanelProps> = ({
+  assistant,
+  assistants,
+  activeTopic,
+  setActiveTopic,
+  removeTopic,
+  moveTopic,
+  manageState,
+  filteredTopics
+}) => {
+  const { t } = useTranslation()
+  const { isManageMode, selectedIds, searchText, exitManageMode, setSelectedIds, setSearchText } = manageState
+  const [isSearchMode, setIsSearchMode] = useState(false)
+  const searchInputRef = useRef<HTMLInputElement>(null)
+
+  // Topics that can be selected (non-pinned, and filtered when in search mode)
+  const selectableTopics = useMemo(() => {
+    const baseTopics = isSearchMode ? filteredTopics : assistant.topics
+    return (baseTopics ?? []).filter((topic) => !topic.pinned)
+  }, [assistant.topics, filteredTopics, isSearchMode])
+
+  // Check if all selectable topics are selected
+  const isAllSelected = useMemo(() => {
+    return selectableTopics.length > 0 && selectableTopics.every((topic) => selectedIds.has(topic.id))
+  }, [selectableTopics, selectedIds])
+
+  // Other assistants for move operation
+  const otherAssistants = useMemo(() => assistants.filter((a) => a.id !== assistant.id), [assistants, assistant.id])
+
+  // Handle select all / deselect all
+  const handleSelectAll = useCallback(() => {
+    if (isAllSelected) {
+      setSelectedIds(new Set())
+    } else {
+      setSelectedIds(new Set(selectableTopics.map((topic) => topic.id)))
+    }
+  }, [isAllSelected, selectableTopics, setSelectedIds])
+
+  // Handle clear selection
+  const handleClearSelection = useCallback(() => {
+    setSelectedIds(new Set())
+  }, [setSelectedIds])
+
+  // Handle delete selected topics
+  const handleDeleteSelected = useCallback(async () => {
+    if (selectedIds.size === 0) return
+
+    const remainingTopics = assistant.topics.filter((topic) => !selectedIds.has(topic.id))
+    if (remainingTopics.length === 0) {
+      window.toast.error(t('chat.topics.manage.error.at_least_one'))
+      return
+    }
+
+    const confirmed = await window.modal.confirm({
+      title: t('chat.topics.manage.delete.confirm.title'),
+      content: t('chat.topics.manage.delete.confirm.content', { count: selectedIds.size }),
+      centered: true,
+      okButtonProps: { danger: true }
+    })
+
+    if (!confirmed) return
+
+    await modelGenerating()
+
+    const deletedCount = selectedIds.size
+    for (const id of selectedIds) {
+      const topic = assistant.topics.find((t) => t.id === id)
+      if (topic) {
+        await TopicManager.removeTopic(id)
+        removeTopic(topic)
+      }
+    }
+
+    // Switch to first remaining topic if current topic was deleted
+    if (selectedIds.has(activeTopic.id)) {
+      setActiveTopic(remainingTopics[0])
+    }
+
+    window.toast.success(t('chat.topics.manage.delete.success', { count: deletedCount }))
+    exitManageMode()
+  }, [selectedIds, assistant.topics, removeTopic, activeTopic.id, setActiveTopic, t, exitManageMode])
+
+  // Handle move selected topics to another assistant
+  const handleMoveSelected = useCallback(
+    async (targetAssistantId: string) => {
+      if (selectedIds.size === 0) return
+
+      const targetAssistant = assistants.find((a) => a.id === targetAssistantId)
+      if (!targetAssistant) return
+
+      const remainingTopics = assistant.topics.filter((topic) => !selectedIds.has(topic.id))
+      if (remainingTopics.length === 0) {
+        window.toast.error(t('chat.topics.manage.error.at_least_one'))
+        return
+      }
+
+      await modelGenerating()
+
+      const movedCount = selectedIds.size
+      for (const id of selectedIds) {
+        const topic = assistant.topics.find((t) => t.id === id)
+        if (topic) {
+          moveTopic(topic, targetAssistant)
+        }
+      }
+
+      // Switch to first remaining topic if current topic was moved
+      if (selectedIds.has(activeTopic.id)) {
+        setActiveTopic(remainingTopics[0])
+      }
+
+      window.toast.success(t('chat.topics.manage.move.success', { count: movedCount }))
+      exitManageMode()
+    },
+    [selectedIds, assistant.topics, assistants, moveTopic, activeTopic.id, setActiveTopic, t, exitManageMode]
+  )
+
+  // Enter search mode
+  const enterSearchMode = useCallback(() => {
+    setIsSearchMode(true)
+  }, [])
+
+  // Exit search mode
+  const exitSearchMode = useCallback(() => {
+    setIsSearchMode(false)
+    setSearchText('')
+  }, [setSearchText])
+
+  // Focus input when entering search mode
+  useEffect(() => {
+    if (isSearchMode && searchInputRef.current) {
+      searchInputRef.current.focus()
+    }
+  }, [isSearchMode])
+
+  // Reset search mode when exiting manage mode
+  useEffect(() => {
+    if (!isManageMode) {
+      setIsSearchMode(false)
+    }
+  }, [isManageMode])
+
+  // Handle search input keydown
+  const handleSearchKeyDown = useCallback(
+    (e: React.KeyboardEvent) => {
+      if (e.key === 'Escape') {
+        exitSearchMode()
+      }
+    },
+    [exitSearchMode]
+  )
+
+  if (!isManageMode) return null
+
+  // Search mode UI
+  if (isSearchMode) {
+    return (
+      <ManagePanel>
+        <ManagePanelContent>
+          <LeftGroup>
+            <Tooltip title={isAllSelected ? t('chat.topics.manage.deselect_all') : t('common.select_all')}>
+              <ManageIconButton onClick={handleSelectAll}>
+                {isAllSelected ? <CheckSquare size={16} /> : <Square size={16} />}
+              </ManageIconButton>
+            </Tooltip>
+            {selectedIds.size > 0 && (
+              <Tooltip title={t('chat.topics.manage.clear_selection')}>
+                <SelectedBadge onClick={handleClearSelection}>{selectedIds.size}</SelectedBadge>
+              </Tooltip>
+            )}
+          </LeftGroup>
+          <SearchInputWrapper>
+            <SearchInput
+              ref={searchInputRef}
+              type="text"
+              placeholder={t('chat.topics.search.placeholder')}
+              value={searchText}
+              onChange={(e) => setSearchText(e.target.value)}
+              onKeyDown={handleSearchKeyDown}
+            />
+          </SearchInputWrapper>
+          <Tooltip title={t('common.close')}>
+            <ManageIconButton onClick={exitSearchMode}>
+              <XIcon size={16} />
+            </ManageIconButton>
+          </Tooltip>
+        </ManagePanelContent>
+      </ManagePanel>
+    )
+  }
+
+  // Normal manage mode UI
+  return (
+    <ManagePanel>
+      <ManagePanelContent>
+        <LeftGroup>
+          <Tooltip title={isAllSelected ? t('chat.topics.manage.deselect_all') : t('common.select_all')}>
+            <ManageIconButton onClick={handleSelectAll}>
+              {isAllSelected ? <CheckSquare size={16} /> : <Square size={16} />}
+            </ManageIconButton>
+          </Tooltip>
+          {selectedIds.size > 0 && (
+            <Tooltip title={t('chat.topics.manage.clear_selection')}>
+              <SelectedBadge onClick={handleClearSelection}>{selectedIds.size}</SelectedBadge>
+            </Tooltip>
+          )}
+        </LeftGroup>
+        <RightGroup>
+          <Tooltip title={t('chat.topics.search.title')}>
+            <ManageIconButton onClick={enterSearchMode}>
+              <Search size={16} />
+            </ManageIconButton>
+          </Tooltip>
+          {otherAssistants.length > 0 && (
+            <Dropdown
+              menu={{
+                items: otherAssistants.map((a) => ({
+                  key: a.id,
+                  label: a.name,
+                  icon: <AssistantAvatar assistant={a} size={18} />,
+                  onClick: () => handleMoveSelected(a.id),
+                  disabled: selectedIds.size === 0
+                }))
+              }}
+              trigger={['click']}
+              disabled={selectedIds.size === 0}>
+              <Tooltip title={t('chat.topics.move_to')}>
+                <ManageIconButton disabled={selectedIds.size === 0}>
+                  <FolderOpen size={16} />
+                </ManageIconButton>
+              </Tooltip>
+            </Dropdown>
+          )}
+          <Tooltip title={t('common.delete')}>
+            <ManageIconButton danger onClick={handleDeleteSelected} disabled={selectedIds.size === 0}>
+              <Trash2 size={16} />
+            </ManageIconButton>
+          </Tooltip>
+          <ManageDivider />
+          <Tooltip title={t('common.cancel')}>
+            <ManageIconButton onClick={exitManageMode}>
+              <XIcon size={16} />
+            </ManageIconButton>
+          </Tooltip>
+        </RightGroup>
+      </ManagePanelContent>
+    </ManagePanel>
+  )
+}
+
+// Tailwind components
+const ManagePanel: FC<PropsWithChildren> = ({ children }) => (
+  <div className="absolute bottom-[15px] left-[12px] z-[100] flex w-[calc(var(--assistants-width)-24px)] flex-row items-center rounded-xl bg-[var(--color-background)] px-3 py-2 shadow-[0_4px_12px_rgba(0,0,0,0.15),0_0_0_1px_var(--color-border)]">
+    {children}
+  </div>
+)
+
+const ManagePanelContent: FC<PropsWithChildren> = ({ children }) => (
+  <div className="flex w-full min-w-0 flex-row items-center gap-1 overflow-hidden">{children}</div>
+)
+
+interface ManageIconButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
+  danger?: boolean
+}
+
+const ManageIconButton: FC<PropsWithChildren<ManageIconButtonProps>> = ({
+  children,
+  className,
+  danger,
+  disabled,
+  ...props
+}) => (
+  <button
+    {...props}
+    type="button"
+    disabled={disabled}
+    className={cn(
+      'flex h-7 w-7 shrink-0 items-center justify-center rounded-full border-none bg-transparent text-[var(--color-text-2)] transition-all duration-200',
+      disabled ? 'cursor-not-allowed opacity-40' : 'cursor-pointer',
+      !disabled && !danger && 'hover:bg-[var(--color-background-mute)] hover:text-[var(--color-text-1)]',
+      danger && 'text-[var(--color-error)]',
+      danger && !disabled && 'hover:bg-[var(--color-error)] hover:text-white [&:hover>svg]:text-white',
+      className
+    )}>
+    {children}
+  </button>
+)
+
+const ManageDivider: FC = () => <div className="mx-1 h-5 w-px bg-[var(--color-border)]" />
+
+const LeftGroup: FC<PropsWithChildren> = ({ children }) => <div className="flex items-center gap-1">{children}</div>
+
+const RightGroup: FC<PropsWithChildren> = ({ children }) => (
+  <div className="ml-auto flex items-center gap-1">{children}</div>
+)
+
+const SelectedBadge: FC<PropsWithChildren<React.HTMLAttributes<HTMLSpanElement>>> = ({
+  children,
+  className,
+  ...props
+}) => (
+  <span
+    {...props}
+    className={cn(
+      'inline-flex h-[18px] min-w-[18px] cursor-pointer items-center justify-center rounded-[9px] bg-[var(--color-primary)] px-[5px] font-medium text-[11px] text-white transition-opacity duration-200 hover:opacity-[0.85]',
+      className
+    )}>
+    {children}
+  </span>
+)
+
+const SearchInputWrapper: FC<PropsWithChildren> = ({ children }) => (
+  <div className="mx-1 flex min-w-0 flex-1 items-center gap-1">{children}</div>
+)
+
+interface SearchInputProps extends React.InputHTMLAttributes<HTMLInputElement> {
+  ref?: Ref<HTMLInputElement>
+}
+
+const SearchInput: FC<SearchInputProps> = ({ className, ref, ...props }) => (
+  <input
+    {...props}
+    ref={ref}
+    className={cn(
+      'h-7 min-w-0 flex-1 border-none bg-transparent p-0 text-[13px] text-[var(--color-text-1)] outline-none placeholder:text-[var(--color-text-3)]',
+      className
+    )}
+  />
+)
+
+export default TopicManagePanel
diff --git a/src/renderer/src/pages/home/Tabs/components/Topics.tsx b/src/renderer/src/pages/home/Tabs/components/Topics.tsx
index c9b4b5ea41..29232e65d9 100644
--- a/src/renderer/src/pages/home/Tabs/components/Topics.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/Topics.tsx
@@ -1,3 +1,4 @@
+import AssistantAvatar from '@renderer/components/Avatar/AssistantAvatar'
 import { DraggableVirtualList } from '@renderer/components/DraggableList'
 import { CopyIcon, DeleteIcon, EditIcon } from '@renderer/components/Icons'
 import ObsidianExportPopup from '@renderer/components/Popups/ObsidianExportPopup'
@@ -37,8 +38,10 @@ import dayjs from 'dayjs'
 import { findIndex } from 'lodash'
 import {
   BrushCleaning,
+  CheckSquare,
   FolderOpen,
   HelpCircle,
+  ListChecks,
   MenuIcon,
   NotebookPen,
   PackagePlus,
@@ -46,6 +49,7 @@ import {
   PinOffIcon,
   Save,
   Sparkles,
+  Square,
   UploadIcon,
   XIcon
 } from 'lucide-react'
@@ -55,6 +59,7 @@ import { useDispatch, useSelector } from 'react-redux'
 import styled from 'styled-components'
 
 import AddButton from './AddButton'
+import { TopicManagePanel, useTopicManageMode } from './TopicManageMode'
 
 interface Props {
   assistant: Assistant
@@ -81,6 +86,10 @@ export const Topics: React.FC<Props> = ({ assistant: _assistant, activeTopic, se
   const deleteTimerRef = useRef<NodeJS.Timeout>(null)
   const [editingTopicId, setEditingTopicId] = useState<string | null>(null)
 
+  // 管理模式状态
+  const manageState = useTopicManageMode()
+  const { isManageMode, selectedIds, searchText, enterManageMode, exitManageMode, toggleSelectTopic } = manageState
+
   const { startEdit, isEditing, inputProps } = useInPlaceEdit({
     onSave: (name: string) => {
       const topic = assistant.topics.find((t) => t.id === editingTopicId)
@@ -437,6 +446,7 @@ export const Topics: React.FC<Props> = ({ assistant: _assistant, activeTopic, se
           .map((a) => ({
             label: a.name,
             key: a.id,
+            icon: <AssistantAvatar assistant={a} size={18} />,
             onClick: () => onMoveTopic(topic, a)
           }))
       })
@@ -492,107 +502,187 @@ export const Topics: React.FC<Props> = ({ assistant: _assistant, activeTopic, se
     return assistant.topics
   }, [assistant.topics, pinTopicsToTop])
 
+  // Filter topics based on search text (only in manage mode)
+  // Supports: case-insensitive, space-separated keywords (all must match)
+  const deferredSearchText = useDeferredValue(searchText)
+  const filteredTopics = useMemo(() => {
+    if (!isManageMode || !deferredSearchText.trim()) {
+      return sortedTopics
+    }
+    // Split by spaces and filter out empty strings
+    const keywords = deferredSearchText
+      .toLowerCase()
+      .split(/\s+/)
+      .filter((k) => k.length > 0)
+    if (keywords.length === 0) {
+      return sortedTopics
+    }
+    // All keywords must match (AND logic)
+    return sortedTopics.filter((topic) => {
+      const lowerName = topic.name.toLowerCase()
+      return keywords.every((keyword) => lowerName.includes(keyword))
+    })
+  }, [sortedTopics, deferredSearchText, isManageMode])
+
   const singlealone = topicPosition === 'right' && position === 'right'
 
   return (
-    <DraggableVirtualList
-      className="topics-tab"
-      list={sortedTopics}
-      onUpdate={updateTopics}
-      style={{ height: '100%', padding: '11px 0 10px 10px' }}
-      itemContainerStyle={{ paddingBottom: '8px' }}
-      header={
-        <>
-          <AddButton onClick={() => EventEmitter.emit(EVENT_NAMES.ADD_NEW_TOPIC)}>
-            {t('chat.add.topic.title')}
-          </AddButton>
-          <div className="my-1"></div>
-        </>
-      }>
-      {(topic) => {
-        const isActive = topic.id === activeTopic?.id
-        const topicName = topic.name.replace('`', '')
-        const topicPrompt = topic.prompt
-        const fullTopicPrompt = t('common.prompt') + ': ' + topicPrompt
-
-        const getTopicNameClassName = () => {
-          if (isRenaming(topic.id)) return 'shimmer'
-          if (isNewlyRenamed(topic.id)) return 'typing'
-          return ''
+    <>
+      <DraggableVirtualList
+        className="topics-tab"
+        list={filteredTopics}
+        onUpdate={updateTopics}
+        style={{ height: '100%', padding: '8px 0 10px 10px', paddingBottom: isManageMode ? 70 : 10 }}
+        itemContainerStyle={{ paddingBottom: '8px' }}
+        header={
+          <HeaderRow>
+            <AddButton onClick={() => EventEmitter.emit(EVENT_NAMES.ADD_NEW_TOPIC)}>
+              {t('chat.add.topic.title')}
+            </AddButton>
+            <Tooltip title={t('chat.topics.manage.title')} mouseEnterDelay={0.5}>
+              <HeaderIconButton
+                onClick={isManageMode ? exitManageMode : enterManageMode}
+                className={isManageMode ? 'active' : ''}>
+                <ListChecks size={14} />
+              </HeaderIconButton>
+            </Tooltip>
+          </HeaderRow>
         }
+        disabled={isManageMode}>
+        {(topic) => {
+          const isActive = topic.id === activeTopic?.id
+          const topicName = topic.name.replace('`', '')
+          const topicPrompt = topic.prompt
+          const fullTopicPrompt = t('common.prompt') + ': ' + topicPrompt
+          const isSelected = selectedIds.has(topic.id)
+          const canSelect = !topic.pinned
 
-        return (
-          <Dropdown menu={{ items: getTopicMenuItems }} trigger={['contextMenu']}>
-            <TopicListItem
-              onContextMenu={() => setTargetTopic(topic)}
-              className={classNames(isActive ? 'active' : '', singlealone ? 'singlealone' : '')}
-              onClick={editingTopicId === topic.id && isEditing ? undefined : () => onSwitchTopic(topic)}
-              style={{
-                borderRadius,
-                cursor: editingTopicId === topic.id && isEditing ? 'default' : 'pointer'
-              }}>
-              {isPending(topic.id) && !isActive && <PendingIndicator />}
-              {isFulfilled(topic.id) && !isActive && <FulfilledIndicator />}
-              <TopicNameContainer>
-                {editingTopicId === topic.id && isEditing ? (
-                  <TopicEditInput {...inputProps} onClick={(e) => e.stopPropagation()} />
-                ) : (
-                  <TopicName
-                    className={getTopicNameClassName()}
-                    title={topicName}
-                    onDoubleClick={() => {
-                      setEditingTopicId(topic.id)
-                      startEdit(topic.name)
-                    }}>
-                    {topicName}
-                  </TopicName>
+          const getTopicNameClassName = () => {
+            if (isRenaming(topic.id)) return 'shimmer'
+            if (isNewlyRenamed(topic.id)) return 'typing'
+            return ''
+          }
+
+          const handleItemClick = () => {
+            if (isManageMode) {
+              if (canSelect) {
+                toggleSelectTopic(topic.id)
+              }
+            } else {
+              onSwitchTopic(topic)
+            }
+          }
+
+          return (
+            <Dropdown menu={{ items: getTopicMenuItems }} trigger={['contextMenu']} disabled={isManageMode}>
+              <TopicListItem
+                onContextMenu={() => setTargetTopic(topic)}
+                className={classNames(
+                  isActive && !isManageMode ? 'active' : '',
+                  singlealone ? 'singlealone' : '',
+                  isManageMode && isSelected ? 'selected' : '',
+                  isManageMode && !canSelect ? 'disabled' : ''
                 )}
-                {!topic.pinned && (
-                  <Tooltip
-                    placement="bottom"
-                    mouseEnterDelay={0.7}
-                    mouseLeaveDelay={0}
-                    title={
-                      <div style={{ fontSize: '12px', opacity: 0.8, fontStyle: 'italic' }}>
-                        {t('chat.topics.delete.shortcut', { key: isMac ? '⌘' : 'Ctrl' })}
-                      </div>
-                    }>
-                    <MenuButton
-                      className="menu"
-                      onClick={(e) => {
-                        if (e.ctrlKey || e.metaKey) {
-                          handleConfirmDelete(topic, e)
-                        } else if (deletingTopicId === topic.id) {
-                          handleConfirmDelete(topic, e)
-                        } else {
-                          handleDeleteClick(topic.id, e)
-                        }
-                      }}>
-                      {deletingTopicId === topic.id ? (
-                        <DeleteIcon size={14} color="var(--color-error)" style={{ pointerEvents: 'none' }} />
+                onClick={editingTopicId === topic.id && isEditing ? undefined : handleItemClick}
+                style={{
+                  borderRadius,
+                  cursor:
+                    editingTopicId === topic.id && isEditing
+                      ? 'default'
+                      : isManageMode && !canSelect
+                        ? 'not-allowed'
+                        : 'pointer'
+                }}>
+                {isPending(topic.id) && !isActive && <PendingIndicator />}
+                {isFulfilled(topic.id) && !isActive && <FulfilledIndicator />}
+                <TopicNameContainer>
+                  {isManageMode && (
+                    <SelectIcon className={!canSelect ? 'disabled' : ''}>
+                      {isSelected ? (
+                        <CheckSquare size={16} color="var(--color-primary)" />
                       ) : (
-                        <XIcon size={14} color="var(--color-text-3)" style={{ pointerEvents: 'none' }} />
+                        <Square size={16} color="var(--color-text-3)" />
                       )}
+                    </SelectIcon>
+                  )}
+                  {editingTopicId === topic.id && isEditing ? (
+                    <TopicEditInput {...inputProps} onClick={(e) => e.stopPropagation()} />
+                  ) : (
+                    <TopicName
+                      className={getTopicNameClassName()}
+                      title={topicName}
+                      onDoubleClick={
+                        isManageMode
+                          ? undefined
+                          : () => {
+                              setEditingTopicId(topic.id)
+                              startEdit(topic.name)
+                            }
+                      }>
+                      {topicName}
+                    </TopicName>
+                  )}
+                  {!topic.pinned && (
+                    <Tooltip
+                      placement="bottom"
+                      mouseEnterDelay={0.7}
+                      mouseLeaveDelay={0}
+                      title={
+                        <div style={{ fontSize: '12px', opacity: 0.8, fontStyle: 'italic' }}>
+                          {t('chat.topics.delete.shortcut', { key: isMac ? '⌘' : 'Ctrl' })}
+                        </div>
+                      }>
+                      <MenuButton
+                        className="menu"
+                        onClick={(e) => {
+                          if (e.ctrlKey || e.metaKey) {
+                            handleConfirmDelete(topic, e)
+                          } else if (deletingTopicId === topic.id) {
+                            handleConfirmDelete(topic, e)
+                          } else {
+                            handleDeleteClick(topic.id, e)
+                          }
+                        }}>
+                        {deletingTopicId === topic.id ? (
+                          <DeleteIcon size={14} color="var(--color-error)" style={{ pointerEvents: 'none' }} />
+                        ) : (
+                          <XIcon size={14} color="var(--color-text-3)" style={{ pointerEvents: 'none' }} />
+                        )}
+                      </MenuButton>
+                    </Tooltip>
+                  )}
+                  {topic.pinned && (
+                    <MenuButton className="pin">
+                      <PinIcon size={14} color="var(--color-text-3)" />
                     </MenuButton>
-                  </Tooltip>
+                  )}
+                </TopicNameContainer>
+                {topicPrompt && (
+                  <TopicPromptText className="prompt" title={fullTopicPrompt}>
+                    {fullTopicPrompt}
+                  </TopicPromptText>
                 )}
-                {topic.pinned && (
-                  <MenuButton className="pin">
-                    <PinIcon size={14} color="var(--color-text-3)" />
-                  </MenuButton>
+                {showTopicTime && (
+                  <TopicTime className="time">{dayjs(topic.createdAt).format('MM/DD HH:mm')}</TopicTime>
                 )}
-              </TopicNameContainer>
-              {topicPrompt && (
-                <TopicPromptText className="prompt" title={fullTopicPrompt}>
-                  {fullTopicPrompt}
-                </TopicPromptText>
-              )}
-              {showTopicTime && <TopicTime className="time">{dayjs(topic.createdAt).format('MM/DD HH:mm')}</TopicTime>}
-            </TopicListItem>
-          </Dropdown>
-        )
-      }}
-    </DraggableVirtualList>
+              </TopicListItem>
+            </Dropdown>
+          )
+        }}
+      </DraggableVirtualList>
+
+      {/* 管理模式底部面板 */}
+      <TopicManagePanel
+        assistant={assistant}
+        assistants={assistants}
+        activeTopic={activeTopic}
+        setActiveTopic={setActiveTopic}
+        removeTopic={removeTopic}
+        moveTopic={moveTopic}
+        manageState={manageState}
+        filteredTopics={filteredTopics}
+      />
+    </>
   )
 }
 
@@ -632,15 +722,23 @@ const TopicListItem = styled.div`
     }
   }
   &.singlealone {
-    border-radius: 0 !important;
     &:hover {
       background-color: var(--color-background-soft);
     }
     &.active {
-      border-left: 2px solid var(--color-primary);
+      background-color: var(--color-background-mute);
       box-shadow: none;
     }
   }
+
+  &.selected {
+    background-color: var(--color-primary-bg);
+    box-shadow: inset 0 0 0 1px var(--color-primary);
+  }
+
+  &.disabled {
+    opacity: 0.5;
+  }
 `
 
 const TopicNameContainer = styled.div`
@@ -649,7 +747,6 @@ const TopicNameContainer = styled.div`
   align-items: center;
   gap: 4px;
   height: 20px;
-  justify-content: space-between;
 `
 
 const TopicName = styled.div`
@@ -660,6 +757,8 @@ const TopicName = styled.div`
   font-size: 13px;
   position: relative;
   will-change: background-position, width;
+  flex: 1;
+  text-align: left;
 
   --color-shimmer-mid: var(--color-text-1);
   --color-shimmer-end: color-mix(in srgb, var(--color-text-1) 25%, transparent);
@@ -766,3 +865,49 @@ const MenuButton = styled.div`
     font-size: 12px;
   }
 `
+
+const HeaderRow = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  gap: 6px;
+  padding-right: 10px;
+  margin-bottom: 5px;
+`
+
+const HeaderIconButton = styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 32px;
+  height: 32px;
+  min-width: 32px;
+  min-height: 32px;
+  border-radius: var(--list-item-border-radius);
+  cursor: pointer;
+  color: var(--color-text-2);
+  transition: all 0.2s;
+
+  &:hover {
+    background-color: var(--color-background-mute);
+    color: var(--color-text-1);
+  }
+
+  &.active {
+    color: var(--color-primary);
+
+    &:hover {
+      background-color: var(--color-background-mute);
+    }
+  }
+`
+
+const SelectIcon = styled.div`
+  display: flex;
+  align-items: center;
+  margin-right: 4px;
+
+  &.disabled {
+    opacity: 0.5;
+  }
+`
diff --git a/src/renderer/src/pages/home/Tabs/index.tsx b/src/renderer/src/pages/home/Tabs/index.tsx
index 7d6a77b50c..4504550a16 100644
--- a/src/renderer/src/pages/home/Tabs/index.tsx
+++ b/src/renderer/src/pages/home/Tabs/index.tsx
@@ -1,8 +1,5 @@
 import AddAssistantPopup from '@renderer/components/Popups/AddAssistantPopup'
-import { useActiveSession } from '@renderer/hooks/agents/useActiveSession'
-import { useUpdateSession } from '@renderer/hooks/agents/useUpdateSession'
 import { useAssistants, useDefaultAssistant } from '@renderer/hooks/useAssistant'
-import { useRuntime } from '@renderer/hooks/useRuntime'
 import { useNavbarPosition, useSettings } from '@renderer/hooks/useSettings'
 import { useShowTopics } from '@renderer/hooks/useStore'
 import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
@@ -10,16 +7,13 @@ import { useAppDispatch } from '@renderer/store'
 import { setActiveAgentId, setActiveTopicOrSessionAction } from '@renderer/store/runtime'
 import type { Assistant, Topic } from '@renderer/types'
 import type { Tab } from '@renderer/types/chat'
-import { classNames, getErrorMessage, uuid } from '@renderer/utils'
-import { Alert, Skeleton } from 'antd'
+import { classNames, uuid } from '@renderer/utils'
 import type { FC } from 'react'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
 import Assistants from './AssistantsTab'
-import SessionSettingsTab from './SessionSettingsTab'
-import Settings from './SettingsTab'
 import Topics from './TopicsTab'
 
 interface Props {
@@ -49,15 +43,8 @@ const HomeTabs: FC<Props> = ({
   const { toggleShowTopics } = useShowTopics()
   const { isLeftNavbar } = useNavbarPosition()
   const { t } = useTranslation()
-  const { chat } = useRuntime()
-  const { activeTopicOrSession, activeAgentId } = chat
-  const { session, isLoading: isSessionLoading, error: sessionError } = useActiveSession()
-  const { updateSession } = useUpdateSession(activeAgentId)
   const dispatch = useAppDispatch()
 
-  const isSessionView = activeTopicOrSession === 'session'
-  const isTopicView = activeTopicOrSession === 'topic'
-
   const [tab, setTab] = useState<Tab>(position === 'left' ? _tab || 'assistants' : 'topic')
   const borderStyle = '0.5px solid var(--color-border)'
   const border =
@@ -96,9 +83,6 @@ const HomeTabs: FC<Props> = ({
       EventEmitter.on(EVENT_NAMES.SHOW_TOPIC_SIDEBAR, (): any => {
         showTab && setTab('topic')
       }),
-      EventEmitter.on(EVENT_NAMES.SHOW_CHAT_SETTINGS, (): any => {
-        showTab && setTab('settings')
-      }),
       EventEmitter.on(EVENT_NAMES.SWITCH_TOPIC_SIDEBAR, () => {
         showTab && setTab('topic')
         if (position === 'left' && topicPosition === 'right') {
@@ -113,7 +97,7 @@ const HomeTabs: FC<Props> = ({
     if (position === 'right' && topicPosition === 'right' && tab === 'assistants') {
       setTab('topic')
     }
-    if (position === 'left' && topicPosition === 'right' && (tab === 'topic' || tab === 'settings')) {
+    if (position === 'left' && topicPosition === 'right' && tab === 'topic') {
       setTab('assistants')
     }
   }, [position, tab, topicPosition, forceToSeeAllTab])
@@ -130,20 +114,6 @@ const HomeTabs: FC<Props> = ({
           <TabItem active={tab === 'topic'} onClick={() => setTab('topic')}>
             {t('common.topics')}
           </TabItem>
-          <TabItem active={tab === 'settings'} onClick={() => setTab('settings')}>
-            {t('settings.title')}
-          </TabItem>
-        </CustomTabs>
-      )}
-
-      {position === 'right' && topicPosition === 'right' && (
-        <CustomTabs>
-          <TabItem active={tab === 'topic'} onClick={() => setTab('topic')}>
-            {t('common.topics')}
-          </TabItem>
-          <TabItem active={tab === 'settings'} onClick={() => setTab('settings')}>
-            {t('settings.title')}
-          </TabItem>
         </CustomTabs>
       )}
 
@@ -164,22 +134,6 @@ const HomeTabs: FC<Props> = ({
             position={position}
           />
         )}
-        {tab === 'settings' && isTopicView && <Settings assistant={activeAssistant} />}
-        {tab === 'settings' && isSessionView && !sessionError && (
-          <Skeleton loading={isSessionLoading} active style={{ height: '100%', padding: '16px' }}>
-            <SessionSettingsTab session={session} update={updateSession} />
-          </Skeleton>
-        )}
-        {tab === 'settings' && isSessionView && sessionError && (
-          <div className="w-[var(--assistants-width)] p-2 px-3 pt-4">
-            <Alert
-              type="error"
-              message={t('agent.session.get.error.failed')}
-              description={getErrorMessage(sessionError)}
-              style={{ padding: '10px 15px' }}
-            />
-          </div>
-        )}
       </TabContent>
     </Container>
   )
@@ -191,6 +145,7 @@ const Container = styled.div`
   width: var(--assistants-width);
   transition: width 0.3s;
   height: calc(100vh - var(--navbar-height));
+  position: relative;
 
   &.right {
     height: calc(100vh - var(--navbar-height));
diff --git a/src/renderer/src/pages/home/components/ChatNavbarContent.tsx b/src/renderer/src/pages/home/components/ChatNavbarContent.tsx
index 5f9d30bd6d..e58b290892 100644
--- a/src/renderer/src/pages/home/components/ChatNavbarContent.tsx
+++ b/src/renderer/src/pages/home/components/ChatNavbarContent.tsx
@@ -1,14 +1,17 @@
+import EmojiIcon from '@renderer/components/EmojiIcon'
 import HorizontalScrollContainer from '@renderer/components/HorizontalScrollContainer'
 import { useActiveAgent } from '@renderer/hooks/agents/useActiveAgent'
 import { useActiveSession } from '@renderer/hooks/agents/useActiveSession'
 import { useUpdateSession } from '@renderer/hooks/agents/useUpdateSession'
 import { useRuntime } from '@renderer/hooks/useRuntime'
+import AssistantSettingsPopup from '@renderer/pages/settings/AssistantSettings'
 import type { AgentEntity, AgentSessionEntity, ApiModel, Assistant } from '@renderer/types'
+import { getLeadingEmoji } from '@renderer/utils'
 import { formatErrorMessageWithPrefix } from '@renderer/utils/error'
 import { t } from 'i18next'
 import { ChevronRight, Folder } from 'lucide-react'
 import type { FC, ReactNode } from 'react'
-import { useCallback } from 'react'
+import { useCallback, useMemo } from 'react'
 import { twMerge } from 'tailwind-merge'
 
 import { AgentSettingsPopup, SessionSettingsPopup } from '../../settings/AgentSettings'
@@ -29,6 +32,8 @@ const ChatNavbarContent: FC<Props> = ({ assistant }) => {
   const { session: activeSession } = useActiveSession()
   const { updateModel } = useUpdateSession(activeAgent?.id ?? null)
 
+  const assistantName = useMemo(() => assistant.name || t('chat.default.name'), [assistant.name])
+
   const handleUpdateModel = useCallback(
     async (model: ApiModel) => {
       if (!activeAgent || !activeSession) return
@@ -39,7 +44,25 @@ const ChatNavbarContent: FC<Props> = ({ assistant }) => {
 
   return (
     <>
-      {activeTopicOrSession === 'topic' && <SelectModelButton assistant={assistant} />}
+      {activeTopicOrSession === 'topic' && (
+        <HorizontalScrollContainer className="ml-2 flex-initial">
+          <div className="flex flex-nowrap items-center gap-2">
+            {/* Assistant Label */}
+            <div
+              className="flex h-full cursor-pointer items-center gap-1.5"
+              onClick={() => AssistantSettingsPopup.show({ assistant })}>
+              <EmojiIcon emoji={assistant.emoji || getLeadingEmoji(assistantName)} size={24} />
+              <span className="max-w-40 truncate text-xs">{assistantName}</span>
+            </div>
+
+            {/* Separator */}
+            <ChevronRight className="h-4 w-4 text-gray-400" />
+
+            {/* Model Button */}
+            <SelectModelButton assistant={assistant} />
+          </div>
+        </HorizontalScrollContainer>
+      )}
       {activeTopicOrSession === 'session' && activeAgent && (
         <HorizontalScrollContainer className="ml-2 flex-initial">
           <div className="flex flex-nowrap items-center gap-2">
diff --git a/src/renderer/src/pages/home/components/SettingsButton.tsx b/src/renderer/src/pages/home/components/SettingsButton.tsx
new file mode 100644
index 0000000000..6adcb2e667
--- /dev/null
+++ b/src/renderer/src/pages/home/components/SettingsButton.tsx
@@ -0,0 +1,38 @@
+import type { Assistant } from '@renderer/types'
+import { Drawer, Tooltip } from 'antd'
+import { t } from 'i18next'
+import { Settings2 } from 'lucide-react'
+import type { FC } from 'react'
+import { useState } from 'react'
+
+import { NavbarIcon } from '../ChatNavbar'
+import HomeSettings from '../Tabs/SettingsTab'
+
+interface Props {
+  assistant: Assistant
+}
+
+const SettingsButton: FC<Props> = ({ assistant }) => {
+  const [settingsOpen, setSettingsOpen] = useState(false)
+
+  return (
+    <>
+      <Tooltip title={t('settings.title')} mouseEnterDelay={0.8}>
+        <NavbarIcon onClick={() => setSettingsOpen(true)}>
+          <Settings2 size={18} />
+        </NavbarIcon>
+      </Tooltip>
+      <Drawer
+        placement="right"
+        open={settingsOpen}
+        onClose={() => setSettingsOpen(false)}
+        width="var(--assistants-width)"
+        closable={false}
+        styles={{ body: { padding: 0, paddingTop: 'var(--navbar-height)' } }}>
+        <HomeSettings assistant={assistant} />
+      </Drawer>
+    </>
+  )
+}
+
+export default SettingsButton
diff --git a/src/renderer/src/pages/home/components/UpdateAppButton.tsx b/src/renderer/src/pages/home/components/UpdateAppButton.tsx
index 72c46c9fa8..b83dcea068 100644
--- a/src/renderer/src/pages/home/components/UpdateAppButton.tsx
+++ b/src/renderer/src/pages/home/components/UpdateAppButton.tsx
@@ -20,6 +20,10 @@ const UpdateAppButton: FC = () => {
     return null
   }
 
+  if (update.ignore) {
+    return null
+  }
+
   const handleOpenUpdateDialog = () => {
     UpdateDialogPopup.show({ releaseInfo: update.info || null })
   }
@@ -30,7 +34,7 @@ const UpdateAppButton: FC = () => {
         className="nodrag"
         onClick={handleOpenUpdateDialog}
         icon={<SyncOutlined />}
-        color="orange"
+        color="primary"
         variant="outlined"
         size="small">
         {t('button.update_available')}
diff --git a/src/renderer/src/pages/notes/HeaderNavbar.tsx b/src/renderer/src/pages/notes/HeaderNavbar.tsx
index e8347178c3..4e4443ce65 100644
--- a/src/renderer/src/pages/notes/HeaderNavbar.tsx
+++ b/src/renderer/src/pages/notes/HeaderNavbar.tsx
@@ -1,6 +1,7 @@
 import { loggerService } from '@logger'
 import { NavbarCenter, NavbarHeader, NavbarRight } from '@renderer/components/app/Navbar'
 import { HStack } from '@renderer/components/Layout'
+import GeneralPopup from '@renderer/components/Popups/GeneralPopup'
 import { useActiveNode } from '@renderer/hooks/useNotesQuery'
 import { useNotesSettings } from '@renderer/hooks/useNotesSettings'
 import { useShowWorkspace } from '@renderer/hooks/useShowWorkspace'
@@ -12,6 +13,7 @@ import { useCallback, useEffect, useRef, useState } from 'react'
 import styled from 'styled-components'
 
 import { menuItems } from './MenuConfig'
+import NotesSettings from './NotesSettings'
 
 const logger = loggerService.withContext('HeaderNavbar')
 
@@ -51,6 +53,16 @@ const HeaderNavbar = ({ notesTree, getCurrentNoteContent, onToggleStar, onExpand
     }
   }, [getCurrentNoteContent])
 
+  const handleShowSettings = useCallback(() => {
+    GeneralPopup.show({
+      title: t('notes.settings.title'),
+      content: <NotesSettings />,
+      footer: null,
+      width: 600,
+      styles: { body: { padding: 0 } }
+    })
+  }, [])
+
   const handleBreadcrumbClick = useCallback(
     (item: { treePath: string; isFolder: boolean }) => {
       if (item.isFolder && onExpandPath) {
@@ -130,6 +142,8 @@ const HeaderNavbar = ({ notesTree, getCurrentNoteContent, onToggleStar, onExpand
       onClick: () => {
         if (item.copyAction) {
           handleCopyContent()
+        } else if (item.showSettingsPopup) {
+          handleShowSettings()
         } else if (item.action) {
           item.action(settings, updateSettings)
         }
@@ -313,7 +327,7 @@ export const StarButton = styled.div`
   transition: all 0.2s ease-in-out;
   cursor: pointer;
   svg {
-    color: inherit;
+    color: var(--color-icon);
   }
 
   &:hover {
diff --git a/src/renderer/src/pages/notes/MenuConfig.tsx b/src/renderer/src/pages/notes/MenuConfig.tsx
index 0f8f2b0128..c157daa417 100644
--- a/src/renderer/src/pages/notes/MenuConfig.tsx
+++ b/src/renderer/src/pages/notes/MenuConfig.tsx
@@ -1,5 +1,5 @@
 import type { NotesSettings } from '@renderer/store/note'
-import { Copy, MonitorSpeaker, Type } from 'lucide-react'
+import { Copy, MonitorSpeaker, Settings, Type } from 'lucide-react'
 import type { ReactNode } from 'react'
 
 export interface MenuItem {
@@ -12,6 +12,7 @@ export interface MenuItem {
   isActive?: (settings: NotesSettings) => boolean
   component?: (settings: NotesSettings, updateSettings: (newSettings: Partial<NotesSettings>) => void) => ReactNode
   copyAction?: boolean
+  showSettingsPopup?: boolean
 }
 
 export const menuItems: MenuItem[] = [
@@ -86,5 +87,16 @@ export const menuItems: MenuItem[] = [
         isActive: (settings) => settings.fontSize === 20
       }
     ]
+  },
+  {
+    key: 'divider-settings',
+    type: 'divider',
+    labelKey: ''
+  },
+  {
+    key: 'more-settings',
+    labelKey: 'settings.moresetting.label',
+    icon: Settings,
+    showSettingsPopup: true
   }
 ]
diff --git a/src/renderer/src/pages/notes/NotesPage.tsx b/src/renderer/src/pages/notes/NotesPage.tsx
index 4e8f6e47a9..59d5496135 100644
--- a/src/renderer/src/pages/notes/NotesPage.tsx
+++ b/src/renderer/src/pages/notes/NotesPage.tsx
@@ -40,6 +40,7 @@ import {
 } from '@renderer/store/note'
 import type { NotesSortType, NotesTreeNode } from '@renderer/types/note'
 import type { FileChangeEvent } from '@shared/config/types'
+import { message } from 'antd'
 import { debounce } from 'lodash'
 import { AnimatePresence, motion } from 'motion/react'
 import type { FC } from 'react'
@@ -279,6 +280,43 @@ const NotesPage: FC = () => {
         updateNotesPath(defaultPath)
         return
       }
+
+      // 验证路径是否有效（处理跨平台恢复场景）
+      try {
+        // 获取当前平台的默认路径
+        const info = await window.api.getAppInfo()
+        const defaultPath = info.notesPath
+
+        // 如果当前路径就是默认路径，跳过验证（默认路径始终有效）
+        if (notesPath === defaultPath) {
+          return
+        }
+
+        const isValid = await window.api.file.validateNotesDirectory(notesPath)
+        if (!isValid) {
+          logger.warn('Invalid notes path detected, resetting to default', { path: notesPath })
+
+          // 重置为默认路径
+          updateNotesPath(defaultPath)
+
+          // 检查默认路径下是否有笔记文件
+          try {
+            const tree = await window.api.file.getDirectoryStructure(defaultPath)
+            if (!tree || tree.length === 0) {
+              // 默认目录为空，提示用户需要迁移文件
+              message.warning({
+                content: t('notes.crossPlatformRestoreWarning', { path: defaultPath }),
+                duration: 10
+              })
+            }
+          } catch (error) {
+            // 目录不存在或读取失败，会由 FileStorage 自动创建
+            logger.debug('Default notes directory will be created', { error })
+          }
+        }
+      } catch (error) {
+        logger.error('Failed to validate notes path:', error as Error)
+      }
     }
 
     initialize()
diff --git a/src/renderer/src/pages/settings/NotesSettings.tsx b/src/renderer/src/pages/notes/NotesSettings.tsx
similarity index 98%
rename from src/renderer/src/pages/settings/NotesSettings.tsx
rename to src/renderer/src/pages/notes/NotesSettings.tsx
index be36c0fe6e..114fd844ba 100644
--- a/src/renderer/src/pages/settings/NotesSettings.tsx
+++ b/src/renderer/src/pages/notes/NotesSettings.tsx
@@ -2,14 +2,6 @@ import { loggerService } from '@logger'
 import Selector from '@renderer/components/Selector'
 import { useTheme } from '@renderer/context/ThemeProvider'
 import { useNotesSettings } from '@renderer/hooks/useNotesSettings'
-import type { EditorView } from '@renderer/types'
-import { Button, Input, message, Slider, Switch } from 'antd'
-import { FolderOpen } from 'lucide-react'
-import type { FC } from 'react'
-import { useEffect, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import styled from 'styled-components'
-
 import {
   SettingContainer,
   SettingDivider,
@@ -18,7 +10,14 @@ import {
   SettingRow,
   SettingRowTitle,
   SettingTitle
-} from '.'
+} from '@renderer/pages/settings'
+import type { EditorView } from '@renderer/types'
+import { Button, Input, message, Slider, Switch } from 'antd'
+import { FolderOpen } from 'lucide-react'
+import type { FC } from 'react'
+import { useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import styled from 'styled-components'
 
 const logger = loggerService.withContext('NotesSettings')
 
@@ -92,7 +91,7 @@ const NotesSettings: FC = () => {
   const isPathChanged = tempPath !== notesPath
 
   return (
-    <SettingContainer theme={theme}>
+    <SettingContainer theme={theme} style={{ background: 'transparent' }}>
       <SettingGroup theme={theme}>
         <SettingTitle>{t('notes.settings.data.title')}</SettingTitle>
         <SettingDivider />
diff --git a/src/renderer/src/pages/notes/NotesSidebar.tsx b/src/renderer/src/pages/notes/NotesSidebar.tsx
index d62bd5b1b5..7d4991f049 100644
--- a/src/renderer/src/pages/notes/NotesSidebar.tsx
+++ b/src/renderer/src/pages/notes/NotesSidebar.tsx
@@ -1,8 +1,8 @@
 import { DynamicVirtualList } from '@renderer/components/VirtualList'
 import { useActiveNode } from '@renderer/hooks/useNotesQuery'
 import NotesSidebarHeader from '@renderer/pages/notes/NotesSidebarHeader'
-import { findNode, findParent } from '@renderer/services/NotesTreeService'
 import { type FileEntryData } from '@renderer/services/NotesService'
+import { findNode, findParent } from '@renderer/services/NotesTreeService'
 import { useAppSelector } from '@renderer/store'
 import { selectSortType } from '@renderer/store/note'
 import type { NotesSortType, NotesTreeNode } from '@renderer/types/note'
diff --git a/src/renderer/src/pages/paintings/DmxapiPage.tsx b/src/renderer/src/pages/paintings/DmxapiPage.tsx
index 560e3857ba..e4f8323655 100644
--- a/src/renderer/src/pages/paintings/DmxapiPage.tsx
+++ b/src/renderer/src/pages/paintings/DmxapiPage.tsx
@@ -140,11 +140,14 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
     let model = ''
     let priceModel = ''
     let image_size = ''
+    let extend_params = {}
+
     for (const provider of Object.keys(modelGroups)) {
       if (modelGroups[provider] && modelGroups[provider].length > 0) {
         model = modelGroups[provider][0].id
         priceModel = modelGroups[provider][0].price
         image_size = modelGroups[provider][0].image_sizes[0].value
+        extend_params = modelGroups[provider][0].extend_params
         break
       }
     }
@@ -153,7 +156,8 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
       model,
       priceModel,
       image_size,
-      modelGroups
+      modelGroups,
+      extend_params
     }
   }
 
@@ -162,7 +166,7 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
 
     const generationMode = params?.generationMode || painting?.generationMode || MODEOPTIONS[0].value
 
-    const { model, priceModel, image_size, modelGroups } = getFirstModelInfo(generationMode)
+    const { model, priceModel, image_size, modelGroups, extend_params } = getFirstModelInfo(generationMode)
 
     return {
       ...DEFAULT_PAINTING,
@@ -173,6 +177,7 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
       modelGroups,
       priceModel,
       image_size,
+      extend_params,
       ...params
     }
   }
@@ -190,7 +195,12 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
   const onSelectModel = (modelId: string) => {
     const model = allModels.find((m) => m.id === modelId)
     if (model) {
-      updatePaintingState({ model: modelId, priceModel: model.price, image_size: model.image_sizes[0].value })
+      updatePaintingState({
+        model: modelId,
+        priceModel: model.price,
+        image_size: model.image_sizes[0].value,
+        extend_params: model.extend_params
+      })
     }
   }
 
@@ -293,7 +303,7 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
 
     clearImages()
 
-    const { model, priceModel, image_size, modelGroups } = getFirstModelInfo(v)
+    const { model, priceModel, image_size, modelGroups, extend_params } = getFirstModelInfo(v)
 
     setModelOptions(modelGroups)
 
@@ -309,9 +319,10 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
       // 否则更新当前painting
       updatePaintingState({
         generationMode: v,
-        model: model,
-        image_size: image_size,
-        priceModel: priceModel
+        model,
+        image_size,
+        priceModel,
+        extend_params
       })
     }
   }
@@ -355,7 +366,8 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
     const params = {
       prompt,
       model: painting.model,
-      n: painting.n
+      n: painting.n,
+      ...painting?.extend_params
     }
 
     const headerExpand = {
@@ -397,7 +409,8 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
     const params = {
       prompt,
       n: painting.n,
-      model: painting.model
+      model: painting.model,
+      ...painting?.extend_params
     }
 
     if (painting.image_size) {
diff --git a/src/renderer/src/pages/paintings/NewApiPage.tsx b/src/renderer/src/pages/paintings/NewApiPage.tsx
index c7240e8458..c69584d63b 100644
--- a/src/renderer/src/pages/paintings/NewApiPage.tsx
+++ b/src/renderer/src/pages/paintings/NewApiPage.tsx
@@ -31,6 +31,8 @@ import { getErrorMessage, uuid } from '@renderer/utils'
 import { isNewApiProvider } from '@renderer/utils/provider'
 import { Avatar, Button, Empty, InputNumber, Segmented, Select, Upload } from 'antd'
 import TextArea from 'antd/es/input/TextArea'
+import type { RcFile } from 'antd/es/upload'
+import type { UploadFile } from 'antd/es/upload/interface'
 import type { FC } from 'react'
 import React from 'react'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
@@ -553,7 +555,31 @@ const NewApiPage: FC<{ Options: string[] }> = ({ Options }) => {
                     maxCount={16}
                     showUploadList={true}
                     listType="picture"
-                    beforeUpload={handleImageUpload}>
+                    beforeUpload={handleImageUpload}
+                    fileList={editImageFiles.map((file, idx): UploadFile<any> => {
+                      const rcFile: RcFile = {
+                        ...file,
+                        uid: String(idx),
+                        lastModifiedDate: file.lastModified ? new Date(file.lastModified) : new Date()
+                      }
+                      return {
+                        uid: rcFile.uid,
+                        name: rcFile.name || `image_${idx + 1}.png`,
+                        status: 'done',
+                        url: URL.createObjectURL(file),
+                        originFileObj: rcFile,
+                        lastModifiedDate: rcFile.lastModifiedDate
+                      }
+                    })}
+                    onRemove={(file) => {
+                      setEditImageFiles((prev) =>
+                        prev.filter((f) => {
+                          const idx = prev.indexOf(f)
+                          return String(idx) !== file.uid
+                        })
+                      )
+                      return true
+                    }}>
                     <ImagePlaceholder>
                       <ImageSizeImage src={IcImageUp} theme={theme} />
                     </ImagePlaceholder>
diff --git a/src/renderer/src/pages/paintings/config/DmxapiConfig.ts b/src/renderer/src/pages/paintings/config/DmxapiConfig.ts
index 7880f6305c..52af9490c8 100644
--- a/src/renderer/src/pages/paintings/config/DmxapiConfig.ts
+++ b/src/renderer/src/pages/paintings/config/DmxapiConfig.ts
@@ -84,7 +84,7 @@ export const MODEOPTIONS = [
 // 获取模型分组数据
 export const GetModelGroup = async (): Promise<DMXApiModelGroups> => {
   try {
-    const response = await fetch('https://dmxapi.cn/cherry_painting_models_v2.json')
+    const response = await fetch('https://dmxapi.cn/cherry_painting_models_v3.json')
 
     if (response.ok) {
       const data = await response.json()
diff --git a/src/renderer/src/pages/settings/AboutSettings.tsx b/src/renderer/src/pages/settings/AboutSettings.tsx
index 3bf02a518d..1765f1fbda 100644
--- a/src/renderer/src/pages/settings/AboutSettings.tsx
+++ b/src/renderer/src/pages/settings/AboutSettings.tsx
@@ -169,9 +169,7 @@ const AboutSettings: FC = () => {
 
   const onOpenDocs = () => {
     const isChinese = i18n.language.startsWith('zh')
-    window.api.openWebsite(
-      isChinese ? 'https://docs.cherry-ai.com/' : 'https://docs.cherry-ai.com/cherry-studio-wen-dang/en-us'
-    )
+    window.api.openWebsite(isChinese ? 'https://docs.cherry-ai.com/' : 'https://docs.cherry-ai.com/docs/en-us')
   }
 
   return (
diff --git a/src/renderer/src/pages/settings/AgentSettings/AccessibleDirsSetting.tsx b/src/renderer/src/pages/settings/AgentSettings/AccessibleDirsSetting.tsx
index eeac1f4993..6a6c8e914c 100644
--- a/src/renderer/src/pages/settings/AgentSettings/AccessibleDirsSetting.tsx
+++ b/src/renderer/src/pages/settings/AgentSettings/AccessibleDirsSetting.tsx
@@ -64,7 +64,7 @@ export const AccessibleDirsSetting = ({ base, update }: AccessibleDirsSettingPro
   return (
     <SettingsItem>
       <SettingsTitle
-        actions={
+        contentAfter={
           <Tooltip title={t('agent.session.accessible_paths.add')}>
             <Button type="text" icon={<Plus size={16} />} shape="circle" onClick={addAccessiblePath} />
           </Tooltip>
diff --git a/src/renderer/src/pages/settings/AgentSettings/AdvancedSettings.tsx b/src/renderer/src/pages/settings/AgentSettings/AdvancedSettings.tsx
index 0e4b401f08..0cadff5912 100644
--- a/src/renderer/src/pages/settings/AgentSettings/AdvancedSettings.tsx
+++ b/src/renderer/src/pages/settings/AgentSettings/AdvancedSettings.tsx
@@ -69,7 +69,7 @@ export const AdvancedSettings: React.FC<AdvancedSettingsProps> = ({ agentBase, u
     <SettingsContainer>
       <SettingsItem divider={false}>
         <SettingsTitle
-          actions={
+          contentAfter={
             <Tooltip title={t('agent.settings.advance.maxTurns.description')} placement="left">
               <Info size={16} className="text-foreground-400" />
             </Tooltip>
diff --git a/src/renderer/src/pages/settings/AgentSettings/AgentSettingsPopup.tsx b/src/renderer/src/pages/settings/AgentSettings/AgentSettingsPopup.tsx
index 84859fbecb..f1507f88f8 100644
--- a/src/renderer/src/pages/settings/AgentSettings/AgentSettingsPopup.tsx
+++ b/src/renderer/src/pages/settings/AgentSettings/AgentSettingsPopup.tsx
@@ -119,7 +119,7 @@ const AgentSettingPopupContainer: React.FC<AgentSettingPopupParams> = ({ tab, ag
       onOk={onOk}
       onCancel={onCancel}
       afterClose={afterClose}
-      maskClosable={false}
+      maskClosable={menu !== 'prompt'}
       footer={null}
       title={<AgentLabel agent={agent} />}
       transitionName="animation-move-down"
diff --git a/src/renderer/src/pages/settings/AgentSettings/ModelSetting.tsx b/src/renderer/src/pages/settings/AgentSettings/ModelSetting.tsx
index 8bf32e76fb..ebe5b47003 100644
--- a/src/renderer/src/pages/settings/AgentSettings/ModelSetting.tsx
+++ b/src/renderer/src/pages/settings/AgentSettings/ModelSetting.tsx
@@ -1,3 +1,4 @@
+import { HelpTooltip } from '@renderer/components/TooltipIcons'
 import SelectAgentBaseModelButton from '@renderer/pages/home/components/SelectAgentBaseModelButton'
 import type { AgentBaseWithId, ApiModel, UpdateAgentFunctionUnion } from '@renderer/types'
 import { useTranslation } from 'react-i18next'
@@ -22,7 +23,9 @@ export const ModelSetting = ({ base, update, isDisabled }: ModelSettingProps) =>
 
   return (
     <SettingsItem inline>
-      <SettingsTitle id="model">{t('common.model')}</SettingsTitle>
+      <SettingsTitle id="model" contentAfter={<HelpTooltip title={t('agent.add.model.tooltip')} />}>
+        {t('common.model')}
+      </SettingsTitle>
       <SelectAgentBaseModelButton
         agentBase={base}
         onSelect={async (model) => {
diff --git a/src/renderer/src/pages/settings/AgentSettings/shared.tsx b/src/renderer/src/pages/settings/AgentSettings/shared.tsx
index 4a74c61a8b..9fefbf192d 100644
--- a/src/renderer/src/pages/settings/AgentSettings/shared.tsx
+++ b/src/renderer/src/pages/settings/AgentSettings/shared.tsx
@@ -10,14 +10,14 @@ import styled from 'styled-components'
 import { SettingDivider } from '..'
 
 export interface SettingsTitleProps extends React.ComponentPropsWithRef<'div'> {
-  actions?: ReactNode
+  contentAfter?: ReactNode
 }
 
-export const SettingsTitle: React.FC<SettingsTitleProps> = ({ children, actions }) => {
+export const SettingsTitle: React.FC<SettingsTitleProps> = ({ children, contentAfter }) => {
   return (
-    <div className={cn(actions ? 'justify-between' : undefined, 'mb-1 flex items-center gap-2')}>
+    <div className={cn(contentAfter ? 'justify-between' : undefined, 'mb-1 flex items-center gap-2')}>
       <span className="flex items-center gap-1 font-bold">{children}</span>
-      {actions !== undefined && actions}
+      {contentAfter !== undefined && contentAfter}
     </div>
   )
 }
@@ -29,14 +29,15 @@ export type AgentLabelProps = {
     avatar?: string
     name?: string
   }
+  hideIcon?: boolean
 }
 
-export const AgentLabel: React.FC<AgentLabelProps> = ({ agent, classNames }) => {
+export const AgentLabel: React.FC<AgentLabelProps> = ({ agent, classNames, hideIcon }) => {
   const emoji = agent?.configuration?.avatar
 
   return (
     <div className={cn('flex w-full items-center gap-2 truncate', classNames?.container)}>
-      <EmojiIcon emoji={emoji || '⭐️'} className={classNames?.avatar} />
+      {!hideIcon && <EmojiIcon emoji={emoji || '⭐️'} className={classNames?.avatar} size={24} />}
       <span className={cn('truncate', 'text-[var(--color-text)]', classNames?.name)}>
         {agent?.name ?? (agent?.type ? getAgentTypeLabel(agent.type) : '')}
       </span>
diff --git a/src/renderer/src/pages/settings/AssistantSettings/AssistantMemorySettings.tsx b/src/renderer/src/pages/settings/AssistantSettings/AssistantMemorySettings.tsx
index 8987d31bcd..c4d579bfbf 100644
--- a/src/renderer/src/pages/settings/AssistantSettings/AssistantMemorySettings.tsx
+++ b/src/renderer/src/pages/settings/AssistantSettings/AssistantMemorySettings.tsx
@@ -1,7 +1,7 @@
 import { InfoCircleOutlined } from '@ant-design/icons'
 import { loggerService } from '@logger'
 import { Box } from '@renderer/components/Layout'
-import MemoriesSettingsModal from '@renderer/pages/memory/settings-modal'
+import MemoriesSettingsModal from '@renderer/pages/settings/MemorySettings/MemorySettingsModal'
 import MemoryService from '@renderer/services/MemoryService'
 import { selectGlobalMemoryEnabled, selectMemoryConfig } from '@renderer/store/memory'
 import type { Assistant, AssistantSettings } from '@renderer/types'
@@ -68,7 +68,7 @@ const AssistantMemorySettings: React.FC<Props> = ({ assistant, updateAssistant,
     window.location.hash = '#/settings/memory'
   }
 
-  const isMemoryConfigured = memoryConfig.embedderApiClient && memoryConfig.llmApiClient
+  const isMemoryConfigured = memoryConfig.embeddingModel && memoryConfig.llmModel
   const isMemoryEnabled = globalMemoryEnabled && isMemoryConfigured
 
   return (
@@ -130,16 +130,16 @@ const AssistantMemorySettings: React.FC<Props> = ({ assistant, updateAssistant,
             <Text strong>{t('memory.stored_memories')}: </Text>
             <Text>{memoryStats.loading ? t('common.loading') : memoryStats.count}</Text>
           </div>
-          {memoryConfig.embedderApiClient && (
+          {memoryConfig.embeddingModel && (
             <div>
               <Text strong>{t('memory.embedding_model')}: </Text>
-              <Text code>{memoryConfig.embedderApiClient.model}</Text>
+              <Text code>{memoryConfig.embeddingModel.id}</Text>
             </div>
           )}
-          {memoryConfig.llmApiClient && (
+          {memoryConfig.llmModel && (
             <div>
               <Text strong>{t('memory.llm_model')}: </Text>
-              <Text code>{memoryConfig.llmApiClient.model}</Text>
+              <Text code>{memoryConfig.llmModel.id}</Text>
             </div>
           )}
         </Space>
diff --git a/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx b/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx
index bc594235a7..b45cecc586 100644
--- a/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx
+++ b/src/renderer/src/pages/settings/AssistantSettings/AssistantModelSettings.tsx
@@ -41,7 +41,7 @@ const AssistantModelSettings: FC<Props> = ({ assistant, updateAssistant, updateA
   const [customParameters, setCustomParameters] = useState<AssistantSettingCustomParameters[]>(
     assistant?.settings?.customParameters ?? []
   )
-  const [enableTemperature, setEnableTemperature] = useState(assistant?.settings?.enableTemperature ?? true)
+  const [enableTemperature, setEnableTemperature] = useState(assistant?.settings?.enableTemperature ?? false)
 
   const customParametersRef = useRef(customParameters)
 
@@ -168,7 +168,7 @@ const AssistantModelSettings: FC<Props> = ({ assistant, updateAssistant, updateA
 
   const onReset = () => {
     setTemperature(DEFAULT_ASSISTANT_SETTINGS.temperature)
-    setEnableTemperature(DEFAULT_ASSISTANT_SETTINGS.enableTemperature ?? true)
+    setEnableTemperature(DEFAULT_ASSISTANT_SETTINGS.enableTemperature ?? false)
     setContextCount(DEFAULT_ASSISTANT_SETTINGS.contextCount)
     setEnableMaxTokens(DEFAULT_ASSISTANT_SETTINGS.enableMaxTokens ?? false)
     setMaxTokens(DEFAULT_ASSISTANT_SETTINGS.maxTokens ?? 0)
diff --git a/src/renderer/src/pages/settings/AssistantSettings/index.tsx b/src/renderer/src/pages/settings/AssistantSettings/index.tsx
index 1c78be4bbc..a7fd0c8dce 100644
--- a/src/renderer/src/pages/settings/AssistantSettings/index.tsx
+++ b/src/renderer/src/pages/settings/AssistantSettings/index.tsx
@@ -37,7 +37,7 @@ interface Props extends AssistantSettingPopupShowParams {
 const AssistantSettingPopupContainer: React.FC<Props> = ({ resolve, tab, ...props }) => {
   const [open, setOpen] = useState(true)
   const { t } = useTranslation()
-  const [menu, setMenu] = useState<AssistantSettingPopupTab>(tab || 'prompt')
+  const [menu, setMenu] = useState<AssistantSettingPopupTab>(tab || 'model')
 
   const _useAssistant = useAssistant(props.assistant.id)
   const _useAgent = useAssistantPreset(props.assistant.id)
@@ -64,14 +64,14 @@ const AssistantSettingPopupContainer: React.FC<Props> = ({ resolve, tab, ...prop
   }
 
   const items = [
-    {
-      key: 'prompt',
-      label: t('assistants.settings.prompt')
-    },
     {
       key: 'model',
       label: t('assistants.settings.model')
     },
+    {
+      key: 'prompt',
+      label: t('assistants.settings.prompt')
+    },
     showKnowledgeIcon && {
       key: 'knowledge_base',
       label: t('assistants.settings.knowledge_base.label')
@@ -96,7 +96,7 @@ const AssistantSettingPopupContainer: React.FC<Props> = ({ resolve, tab, ...prop
       onOk={onOk}
       onCancel={onCancel}
       afterClose={afterClose}
-      maskClosable={false}
+      maskClosable={menu !== 'prompt'}
       footer={null}
       title={assistant.name}
       transitionName="animation-move-down"
@@ -116,22 +116,22 @@ const AssistantSettingPopupContainer: React.FC<Props> = ({ resolve, tab, ...prop
       <HStack>
         <LeftMenu>
           <StyledMenu
-            defaultSelectedKeys={[tab || 'prompt']}
+            defaultSelectedKeys={[tab || 'model']}
             mode="vertical"
             items={items}
             onSelect={({ key }) => setMenu(key as AssistantSettingPopupTab)}
           />
         </LeftMenu>
         <Settings>
-          {menu === 'prompt' && (
-            <AssistantPromptSettings
+          {menu === 'model' && (
+            <AssistantModelSettings
               assistant={assistant}
               updateAssistant={updateAssistant}
               updateAssistantSettings={updateAssistantSettings}
             />
           )}
-          {menu === 'model' && (
-            <AssistantModelSettings
+          {menu === 'prompt' && (
+            <AssistantPromptSettings
               assistant={assistant}
               updateAssistant={updateAssistant}
               updateAssistantSettings={updateAssistantSettings}
diff --git a/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx b/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
index b72db6fd61..20441bd12c 100644
--- a/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
+++ b/src/renderer/src/pages/settings/DataSettings/DataSettings.tsx
@@ -1,17 +1,10 @@
-import {
-  CloudServerOutlined,
-  CloudSyncOutlined,
-  FileSearchOutlined,
-  LoadingOutlined,
-  WifiOutlined,
-  YuqueOutlined
-} from '@ant-design/icons'
+import { CloudServerOutlined, CloudSyncOutlined, LoadingOutlined, WifiOutlined, YuqueOutlined } from '@ant-design/icons'
 import DividerWithText from '@renderer/components/DividerWithText'
 import { NutstoreIcon } from '@renderer/components/Icons/NutstoreIcons'
 import { HStack } from '@renderer/components/Layout'
 import ListItem from '@renderer/components/ListItem'
 import BackupPopup from '@renderer/components/Popups/BackupPopup'
-import ExportToPhoneLanPopup from '@renderer/components/Popups/ExportToPhoneLanPopup'
+import LanTransferPopup from '@renderer/components/Popups/LanTransferPopup'
 import RestorePopup from '@renderer/components/Popups/RestorePopup'
 import { useTheme } from '@renderer/context/ThemeProvider'
 import { useKnowledgeFiles } from '@renderer/hooks/useKnowledgeFiles'
@@ -23,8 +16,8 @@ import { setSkipBackupFile as _setSkipBackupFile } from '@renderer/store/setting
 import type { AppInfo } from '@renderer/types'
 import { formatFileSize } from '@renderer/utils'
 import { occupiedDirs } from '@shared/config/constant'
-import { Button, Progress, Switch, Typography } from 'antd'
-import { FileText, FolderCog, FolderInput, FolderOpen, SaveIcon } from 'lucide-react'
+import { Button, Progress, Switch, Tooltip, Typography } from 'antd'
+import { FileText, FolderCog, FolderInput, FolderOpen, FolderOutput, SaveIcon } from 'lucide-react'
 import type { FC } from 'react'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -628,11 +621,12 @@ const DataSettings: FC = () => {
               <SettingRow>
                 <SettingRowTitle>{t('settings.data.export_to_phone.title')}</SettingRowTitle>
                 <HStack gap="5px" justifyContent="space-between">
-                  <Button onClick={ExportToPhoneLanPopup.show} icon={<WifiOutlined size={14} />}>
+                  <Button onClick={LanTransferPopup.show} icon={<WifiOutlined size={14} />}>
                     {t('settings.data.export_to_phone.lan.title')}
                   </Button>
                 </HStack>
               </SettingRow>
+              <SettingDivider />
             </SettingGroup>
             <SettingGroup theme={theme}>
               <SettingTitle>{t('settings.data.data.title')}</SettingTitle>
@@ -645,9 +639,13 @@ const DataSettings: FC = () => {
                     onClick={() => handleOpenPath(appInfo?.appDataPath)}>
                     {appInfo?.appDataPath}
                   </PathText>
-                  <StyledIcon onClick={() => handleOpenPath(appInfo?.appDataPath)} style={{ flexShrink: 0 }} />
+                  <Tooltip title={t('settings.data.app_data.select')}>
+                    <FolderOutput onClick={handleSelectAppDataPath} style={{ cursor: 'pointer' }} size={16} />
+                  </Tooltip>
                   <HStack gap="5px" style={{ marginLeft: '8px' }}>
-                    <Button onClick={handleSelectAppDataPath}>{t('settings.data.app_data.select')}</Button>
+                    <Button onClick={() => handleOpenPath(appInfo?.appDataPath)}>
+                      {t('settings.data.app_data.open')}
+                    </Button>
                   </HStack>
                 </PathRow>
               </SettingRow>
@@ -658,7 +656,6 @@ const DataSettings: FC = () => {
                   <PathText style={{ color: 'var(--color-text-3)' }} onClick={() => handleOpenPath(appInfo?.logsPath)}>
                     {appInfo?.logsPath}
                   </PathText>
-                  <StyledIcon onClick={() => handleOpenPath(appInfo?.logsPath)} style={{ flexShrink: 0 }} />
                   <HStack gap="5px" style={{ marginLeft: '8px' }}>
                     <Button onClick={() => handleOpenPath(appInfo?.logsPath)}>
                       {t('settings.data.app_logs.button')}
@@ -716,16 +713,6 @@ const Container = styled(HStack)`
   flex: 1;
 `
 
-const StyledIcon = styled(FileSearchOutlined)`
-  color: var(--color-text-2);
-  cursor: pointer;
-  transition: color 0.3s;
-
-  &:hover {
-    color: var(--color-text-1);
-  }
-`
-
 const MenuList = styled.div`
   display: flex;
   flex-direction: column;
diff --git a/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx b/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx
index 49b3b386a9..444fba569f 100644
--- a/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx
+++ b/src/renderer/src/pages/settings/DisplaySettings/DisplaySettings.tsx
@@ -18,7 +18,7 @@ import {
   setSidebarIcons
 } from '@renderer/store/settings'
 import { ThemeMode } from '@renderer/types'
-import { Button, ColorPicker, Segmented, Select, Switch } from 'antd'
+import { Button, ColorPicker, Segmented, Select, Switch, Tooltip } from 'antd'
 import { Minus, Monitor, Moon, Plus, Sun } from 'lucide-react'
 import type { FC } from 'react'
 import { useCallback, useEffect, useMemo, useState } from 'react'
@@ -196,6 +196,21 @@ const DisplaySettings: FC = () => {
     [t]
   )
 
+  const renderFontOption = useCallback(
+    (font: string) => (
+      <Tooltip title={font} placement="left" mouseEnterDelay={0.5}>
+        <div
+          className="truncate"
+          style={{
+            fontFamily: font
+          }}>
+          {font}
+        </div>
+      </Tooltip>
+    ),
+    []
+  )
+
   return (
     <SettingContainer theme={theme}>
       <SettingGroup theme={theme}>
@@ -292,7 +307,7 @@ const DisplaySettings: FC = () => {
           <SettingRowTitle>{t('settings.display.font.global')}</SettingRowTitle>
           <SelectRow>
             <Select
-              style={{ width: 200 }}
+              style={{ width: 280 }}
               placeholder={t('settings.display.font.select')}
               options={[
                 {
@@ -303,7 +318,7 @@ const DisplaySettings: FC = () => {
                   ),
                   value: ''
                 },
-                ...fontList.map((font) => ({ label: <span style={{ fontFamily: font }}>{font}</span>, value: font }))
+                ...fontList.map((font) => ({ label: renderFontOption(font), value: font }))
               ]}
               value={userTheme.userFontFamily || ''}
               onChange={(font) => handleUserFontChange(font)}
@@ -324,7 +339,7 @@ const DisplaySettings: FC = () => {
           <SettingRowTitle>{t('settings.display.font.code')}</SettingRowTitle>
           <SelectRow>
             <Select
-              style={{ width: 200 }}
+              style={{ width: 280 }}
               placeholder={t('settings.display.font.select')}
               options={[
                 {
@@ -335,7 +350,7 @@ const DisplaySettings: FC = () => {
                   ),
                   value: ''
                 },
-                ...fontList.map((font) => ({ label: <span style={{ fontFamily: font }}>{font}</span>, value: font }))
+                ...fontList.map((font) => ({ label: renderFontOption(font), value: font }))
               ]}
               value={userTheme.userCodeFontFamily || ''}
               onChange={(font) => handleUserCodeFontChange(font)}
@@ -480,7 +495,7 @@ const SelectRow = styled.div`
   display: flex;
   align-items: center;
   justify-content: flex-end;
-  width: 300px;
+  width: 380px;
 `
 
 export default DisplaySettings
diff --git a/src/renderer/src/pages/settings/GeneralSettings.tsx b/src/renderer/src/pages/settings/GeneralSettings.tsx
index f759bcbf87..9ce67dc334 100644
--- a/src/renderer/src/pages/settings/GeneralSettings.tsx
+++ b/src/renderer/src/pages/settings/GeneralSettings.tsx
@@ -148,7 +148,8 @@ const GeneralSettings: FC = () => {
     { value: 'el-GR', label: 'Ελληνικά', flag: '🇬🇷' },
     { value: 'es-ES', label: 'Español', flag: '🇪🇸' },
     { value: 'fr-FR', label: 'Français', flag: '🇫🇷' },
-    { value: 'pt-PT', label: 'Português', flag: '🇵🇹' }
+    { value: 'pt-PT', label: 'Português', flag: '🇵🇹' },
+    { value: 'ro-RO', label: 'Română', flag: '🇷🇴' }
   ]
 
   const notificationSettings = useSelector((state: RootState) => state.settings.notification)
diff --git a/src/renderer/src/pages/settings/MCPSettings/BuiltinMCPServerList.tsx b/src/renderer/src/pages/settings/MCPSettings/BuiltinMCPServerList.tsx
index 6ee9f3efca..1fc067b422 100644
--- a/src/renderer/src/pages/settings/MCPSettings/BuiltinMCPServerList.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/BuiltinMCPServerList.tsx
@@ -61,9 +61,14 @@ const BuiltinMCPServerList: FC = () => {
                   {getMcpTypeLabel(server.type ?? 'stdio')}
                 </Tag>
                 {server?.shouldConfig && (
-                  <Tag color="warning" style={{ borderRadius: 20, margin: 0, fontWeight: 500 }}>
-                    {t('settings.mcp.requiresConfig')}
-                  </Tag>
+                  <a
+                    href="https://docs.cherry-ai.com/advanced-basic/mcp/buildin"
+                    target="_blank"
+                    rel="noopener noreferrer">
+                    <Tag color="warning" style={{ borderRadius: 20, margin: 0, fontWeight: 500 }}>
+                      {t('settings.mcp.requiresConfig')}
+                    </Tag>
+                  </a>
                 )}
               </ServerFooter>
             </ServerCard>
diff --git a/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx b/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx
index c48ae8f794..d4fc9aeb36 100644
--- a/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/McpSettings.tsx
@@ -9,8 +9,9 @@ import MCPDescription from '@renderer/pages/settings/MCPSettings/McpDescription'
 import type { MCPPrompt, MCPResource, MCPServer, MCPTool } from '@renderer/types'
 import { parseKeyValueString } from '@renderer/utils/env'
 import { formatMcpError } from '@renderer/utils/error'
+import type { MCPServerLogEntry } from '@shared/config/types'
 import type { TabsProps } from 'antd'
-import { Badge, Button, Flex, Form, Input, Radio, Select, Switch, Tabs } from 'antd'
+import { Badge, Button, Flex, Form, Input, Modal, Radio, Select, Switch, Tabs, Tag, Typography } from 'antd'
 import TextArea from 'antd/es/input/TextArea'
 import { ChevronDown, SaveIcon } from 'lucide-react'
 import React, { useCallback, useEffect, useState } from 'react'
@@ -88,8 +89,11 @@ const McpSettings: React.FC = () => {
 
   const [showAdvanced, setShowAdvanced] = useState(false)
   const [serverVersion, setServerVersion] = useState<string | null>(null)
+  const [logModalOpen, setLogModalOpen] = useState(false)
+  const [logs, setLogs] = useState<(MCPServerLogEntry & { serverId?: string })[]>([])
 
   const { theme } = useTheme()
+  const { Text } = Typography
 
   const navigate = useNavigate()
 
@@ -234,12 +238,43 @@ const McpSettings: React.FC = () => {
     }
   }
 
+  const fetchServerLogs = async () => {
+    try {
+      const history = await window.api.mcp.getServerLogs(server)
+      setLogs(history)
+    } catch (error) {
+      logger.warn('Failed to load server logs', error as Error)
+    }
+  }
+
+  useEffect(() => {
+    const unsubscribe = window.api.mcp.onServerLog((log) => {
+      if (log.serverId && log.serverId !== server.id) return
+      setLogs((prev) => {
+        const merged = [...prev, log]
+        if (merged.length > 200) {
+          return merged.slice(merged.length - 200)
+        }
+        return merged
+      })
+    })
+
+    return () => {
+      unsubscribe?.()
+    }
+  }, [server.id])
+
+  useEffect(() => {
+    setLogs([])
+  }, [server.id])
+
   useEffect(() => {
     if (server.isActive) {
       fetchTools()
       fetchPrompts()
       fetchResources()
       fetchServerVersion()
+      fetchServerLogs()
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [server.id, server.isActive])
@@ -736,6 +771,9 @@ const McpSettings: React.FC = () => {
                 <ServerName className="text-nowrap">{server?.name}</ServerName>
                 {serverVersion && <VersionBadge count={serverVersion} color="blue" />}
               </Flex>
+              <Button size="small" onClick={() => setLogModalOpen(true)}>
+                {t('settings.mcp.logs', 'View Logs')}
+              </Button>
               <Button
                 danger
                 icon={<DeleteIcon size={14} className="lucide-custom" />}
@@ -770,6 +808,37 @@ const McpSettings: React.FC = () => {
           />
         </SettingGroup>
       </SettingContainer>
+
+      <Modal
+        title={t('settings.mcp.logs', 'Server Logs')}
+        open={logModalOpen}
+        onCancel={() => setLogModalOpen(false)}
+        footer={null}
+        width={720}
+        centered
+        transitionName="animation-move-down"
+        bodyStyle={{ maxHeight: '70vh', minHeight: '40vh', overflowY: 'auto' }}
+        afterOpenChange={(open) => {
+          if (open) {
+            fetchServerLogs()
+          }
+        }}>
+        <LogList>
+          {logs.length === 0 && <Text type="secondary">{t('settings.mcp.noLogs', 'No logs yet')}</Text>}
+          {logs.map((log, idx) => (
+            <LogItem key={`${log.timestamp}-${idx}`}>
+              <Flex gap={8} align="baseline">
+                <Timestamp>{new Date(log.timestamp).toLocaleTimeString()}</Timestamp>
+                <Tag color={mapLogLevelColor(log.level)}>{log.level}</Tag>
+                <Text>{log.message}</Text>
+              </Flex>
+              {log.data && (
+                <PreBlock>{typeof log.data === 'string' ? log.data : JSON.stringify(log.data, null, 2)}</PreBlock>
+              )}
+            </LogItem>
+          ))}
+        </LogList>
+      </Modal>
     </Container>
   )
 }
@@ -792,6 +861,54 @@ const AdvancedSettingsButton = styled.div`
   align-items: center;
 `
 
+const LogList = styled(Scrollbar)`
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  padding-bottom: 15px;
+  padding-top: 5px;
+`
+
+const LogItem = styled.div`
+  background: var(--color-background-mute, #1f1f1f);
+  color: var(--color-text-1, #e6e6e6);
+  border-radius: 8px;
+  padding: 10px 12px;
+  border: 1px solid var(--color-border, rgba(255, 255, 255, 0.08));
+`
+
+const Timestamp = styled.span`
+  color: var(--color-text-3, #9aa2b1);
+  font-size: 12px;
+`
+
+const PreBlock = styled.pre`
+  margin: 6px 0 0;
+  padding: 8px;
+  background: var(--color-bg-3, #111418);
+  color: var(--color-text-1, #e6e6e6);
+  border-radius: 6px;
+  font-size: 12px;
+  white-space: pre-wrap;
+  word-break: break-word;
+  border: 1px solid var(--color-border, rgba(255, 255, 255, 0.08));
+`
+
+function mapLogLevelColor(level: MCPServerLogEntry['level']) {
+  switch (level) {
+    case 'error':
+    case 'stderr':
+      return 'red'
+    case 'warn':
+      return 'orange'
+    case 'info':
+    case 'stdout':
+      return 'blue'
+    default:
+      return 'default'
+  }
+}
+
 const VersionBadge = styled(Badge)`
   .ant-badge-count {
     background-color: var(--color-primary);
diff --git a/src/renderer/src/pages/settings/MCPSettings/McpTool.tsx b/src/renderer/src/pages/settings/MCPSettings/McpTool.tsx
index bfd9992dc4..8aa4faf6d8 100644
--- a/src/renderer/src/pages/settings/MCPSettings/McpTool.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/McpTool.tsx
@@ -1,8 +1,9 @@
+import { McpLogo } from '@renderer/components/Icons'
 import type { MCPServer, MCPTool } from '@renderer/types'
 import { isToolAutoApproved } from '@renderer/utils/mcp-tools'
 import { Badge, Descriptions, Empty, Flex, Switch, Table, Tag, Tooltip, Typography } from 'antd'
 import type { ColumnsType } from 'antd/es/table'
-import { Hammer, Info, Zap } from 'lucide-react'
+import { Info, Zap } from 'lucide-react'
 import { useTranslation } from 'react-i18next'
 
 interface MCPToolsSectionProps {
@@ -136,7 +137,7 @@ const MCPToolsSection = ({ tools, server, onToggleTool, onToggleAutoApprove }: M
     {
       title: (
         <Flex align="center" justify="center" gap={4}>
-          <Hammer size={14} color="orange" />
+          <McpLogo width={14} height={14} style={{ opacity: 0.8 }} />
           <Typography.Text strong>{t('settings.mcp.tools.enable')}</Typography.Text>
         </Flex>
       ),
diff --git a/src/renderer/src/pages/settings/MCPSettings/index.tsx b/src/renderer/src/pages/settings/MCPSettings/index.tsx
index 4637cf2e89..5c11b7b261 100644
--- a/src/renderer/src/pages/settings/MCPSettings/index.tsx
+++ b/src/renderer/src/pages/settings/MCPSettings/index.tsx
@@ -6,6 +6,7 @@ import MCPRouterProviderLogo from '@renderer/assets/images/providers/mcprouter.w
 import ModelScopeProviderLogo from '@renderer/assets/images/providers/modelscope.png'
 import TokenFluxProviderLogo from '@renderer/assets/images/providers/tokenflux.png'
 import DividerWithText from '@renderer/components/DividerWithText'
+import { McpLogo } from '@renderer/components/Icons'
 import ListItem from '@renderer/components/ListItem'
 import Scrollbar from '@renderer/components/Scrollbar'
 import { useTheme } from '@renderer/context/ThemeProvider'
@@ -85,7 +86,7 @@ const MCPSettings: FC = () => {
             title={t('settings.mcp.servers', 'MCP Servers')}
             active={activeView === 'servers'}
             onClick={() => navigate('/settings/mcp/servers')}
-            icon={<FolderCog size={18} />}
+            icon={<McpLogo width={18} height={18} style={{ opacity: 0.8 }} />}
             titleStyle={{ fontWeight: 500 }}
           />
           <DividerWithText text={t('settings.mcp.discover', 'Discover')} style={{ margin: '10px 0 8px 0' }} />
diff --git a/src/renderer/src/pages/settings/MemorySettings/MemorySettings.tsx b/src/renderer/src/pages/settings/MemorySettings/MemorySettings.tsx
index ecf8d74b68..6a454c5dd4 100644
--- a/src/renderer/src/pages/settings/MemorySettings/MemorySettings.tsx
+++ b/src/renderer/src/pages/settings/MemorySettings/MemorySettings.tsx
@@ -5,7 +5,6 @@ import { HStack } from '@renderer/components/Layout'
 import TextBadge from '@renderer/components/TextBadge'
 import { useTheme } from '@renderer/context/ThemeProvider'
 import { useModel } from '@renderer/hooks/useModel'
-import MemoriesSettingsModal from '@renderer/pages/memory/settings-modal'
 import MemoryService from '@renderer/services/MemoryService'
 import {
   selectCurrentUserId,
@@ -34,6 +33,7 @@ import {
   SettingTitle
 } from '../index'
 import { DEFAULT_USER_ID } from './constants'
+import MemorySettingsModal from './MemorySettingsModal'
 import UserSelector from './UserSelector'
 
 const logger = loggerService.withContext('MemorySettings')
@@ -154,23 +154,17 @@ const EditMemoryModal: React.FC<EditMemoryModalProps> = ({ visible, memory, onCa
       open={visible}
       onCancel={onCancel}
       width={600}
+      centered
+      transitionName="animation-move-down"
+      okButtonProps={{ loading: loading, title: t('common.save'), onClick: () => form.submit() }}
       styles={{
         header: {
           borderBottom: '0.5px solid var(--color-border)',
-          paddingBottom: 16
-        },
-        body: {
-          paddingTop: 24
+          paddingBottom: 16,
+          borderBottomLeftRadius: 0,
+          borderBottomRightRadius: 0
         }
-      }}
-      footer={[
-        <Button key="cancel" size="large" onClick={onCancel}>
-          {t('common.cancel')}
-        </Button>,
-        <Button key="submit" type="primary" size="large" loading={loading} onClick={() => form.submit()}>
-          {t('common.save')}
-        </Button>
-      ]}>
+      }}>
       <Form form={form} layout="vertical" onFinish={handleSubmit}>
         <Form.Item
           label={t('memory.memory_content')}
@@ -548,10 +542,10 @@ const MemorySettings = () => {
   }
 
   const memoryConfig = useSelector(selectMemoryConfig)
-  const embedderModel = useModel(memoryConfig.embedderApiClient?.model, memoryConfig.embedderApiClient?.provider)
+  const embeddingModel = useModel(memoryConfig.embeddingModel?.id, memoryConfig.embeddingModel?.provider)
 
   const handleGlobalMemoryToggle = async (enabled: boolean) => {
-    if (enabled && !embedderModel) {
+    if (enabled && !embeddingModel) {
       window.keyv.set('memory.wait.settings', true)
       return setSettingsModalVisible(true)
     }
@@ -799,7 +793,7 @@ const MemorySettings = () => {
         existingUsers={[...uniqueUsers, DEFAULT_USER_ID]}
       />
 
-      <MemoriesSettingsModal
+      <MemorySettingsModal
         visible={settingsModalVisible}
         onSubmit={async () => await handleSettingsSubmit()}
         onCancel={handleSettingsCancel}
diff --git a/src/renderer/src/pages/memory/settings-modal.tsx b/src/renderer/src/pages/settings/MemorySettings/MemorySettingsModal.tsx
similarity index 65%
rename from src/renderer/src/pages/memory/settings-modal.tsx
rename to src/renderer/src/pages/settings/MemorySettings/MemorySettingsModal.tsx
index 996baebd1d..680bfbec8e 100644
--- a/src/renderer/src/pages/memory/settings-modal.tsx
+++ b/src/renderer/src/pages/settings/MemorySettings/MemorySettingsModal.tsx
@@ -1,5 +1,4 @@
 import { loggerService } from '@logger'
-import AiProvider from '@renderer/aiCore'
 import InputEmbeddingDimension from '@renderer/components/InputEmbeddingDimension'
 import ModelSelector from '@renderer/components/ModelSelector'
 import { InfoTooltip } from '@renderer/components/TooltipIcons'
@@ -12,12 +11,12 @@ import type { Model } from '@renderer/types'
 import { Flex, Form, Modal } from 'antd'
 import { t } from 'i18next'
 import type { FC } from 'react'
-import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 
-const logger = loggerService.withContext('MemoriesSettingsModal')
+const logger = loggerService.withContext('MemorySettingsModal')
 
-interface MemoriesSettingsModalProps {
+interface MemorySettingsModalProps {
   visible: boolean
   onSubmit: (values: any) => void
   onCancel: () => void
@@ -26,78 +25,61 @@ interface MemoriesSettingsModalProps {
 
 type formValue = {
   llmModel: string
-  embedderModel: string
-  embedderDimensions: number
+  embeddingModel: string
+  embeddingDimensions: number
 }
 
-const MemoriesSettingsModal: FC<MemoriesSettingsModalProps> = ({ visible, onSubmit, onCancel, form }) => {
+const MemorySettingsModal: FC<MemorySettingsModalProps> = ({ visible, onSubmit, onCancel, form }) => {
   const { providers } = useProviders()
   const dispatch = useDispatch()
   const memoryConfig = useSelector(selectMemoryConfig)
   const [loading, setLoading] = useState(false)
 
   // Get all models for lookup
-  const allModels = useMemo(() => providers.flatMap((p) => p.models), [providers])
-  const llmModel = useModel(memoryConfig.llmApiClient?.model, memoryConfig.llmApiClient?.provider)
-  const embedderModel = useModel(memoryConfig.embedderApiClient?.model, memoryConfig.embedderApiClient?.provider)
-
-  const findModelById = useCallback(
-    (id: string | undefined) => (id ? allModels.find((m) => getModelUniqId(m) === id) : undefined),
-    [allModels]
-  )
+  const llmModel = useModel(memoryConfig.llmModel?.id, memoryConfig.llmModel?.provider)
+  const embeddingModel = useModel(memoryConfig.embeddingModel?.id, memoryConfig.embeddingModel?.provider)
 
   // Initialize form with current memory config when modal opens
   useEffect(() => {
     if (visible && memoryConfig) {
       form.setFieldsValue({
         llmModel: getModelUniqId(llmModel),
-        embedderModel: getModelUniqId(embedderModel),
-        embedderDimensions: memoryConfig.embedderDimensions
+        embeddingModel: getModelUniqId(embeddingModel),
+        embeddingDimensions: memoryConfig.embeddingDimensions
         // customFactExtractionPrompt: memoryConfig.customFactExtractionPrompt,
         // customUpdateMemoryPrompt: memoryConfig.customUpdateMemoryPrompt
       })
     }
-  }, [visible, memoryConfig, form, llmModel, embedderModel])
+  }, [embeddingModel, form, llmModel, memoryConfig, visible])
 
   const handleFormSubmit = async (values: formValue) => {
     try {
       // Convert model IDs back to Model objects
-      const llmModel = findModelById(values.llmModel)
-      const llmProvider = providers.find((p) => p.id === llmModel?.provider)
-      const aiLlmProvider = new AiProvider(llmProvider!)
-      const embedderModel = findModelById(values.embedderModel)
-      const embedderProvider = providers.find((p) => p.id === embedderModel?.provider)
-      const aiEmbedderProvider = new AiProvider(embedderProvider!)
-      if (embedderModel) {
+      // values.llmModel and values.embeddingModel are JSON strings from getModelUniqId()
+      // e.g., '{"id":"gpt-4","provider":"openai"}'
+      // We need to find models by comparing with getModelUniqId() result
+      const allModels = providers.flatMap((p) => p.models)
+      const llmModel = allModels.find((m) => getModelUniqId(m) === values.llmModel)
+      const embeddingModel = allModels.find((m) => getModelUniqId(m) === values.embeddingModel)
+
+      if (embeddingModel) {
         setLoading(true)
-        const provider = providers.find((p) => p.id === embedderModel.provider)
+        const provider = providers.find((p) => p.id === embeddingModel.provider)
 
         if (!provider) {
           return
         }
 
         const finalDimensions =
-          typeof values.embedderDimensions === 'string'
-            ? parseInt(values.embedderDimensions)
-            : values.embedderDimensions
+          typeof values.embeddingDimensions === 'string'
+            ? parseInt(values.embeddingDimensions)
+            : values.embeddingDimensions
 
         const updatedConfig = {
           ...memoryConfig,
-          llmApiClient: {
-            model: llmModel?.id ?? '',
-            provider: llmProvider?.id ?? '',
-            apiKey: aiLlmProvider.getApiKey(),
-            baseURL: aiLlmProvider.getBaseURL(),
-            apiVersion: llmProvider?.apiVersion
-          },
-          embedderApiClient: {
-            model: embedderModel?.id ?? '',
-            provider: embedderProvider?.id ?? '',
-            apiKey: aiEmbedderProvider.getApiKey(),
-            baseURL: aiEmbedderProvider.getBaseURL(),
-            apiVersion: embedderProvider?.apiVersion
-          },
-          embedderDimensions: finalDimensions
+          llmModel,
+          embeddingModel,
+          embeddingDimensions: finalDimensions
           // customFactExtractionPrompt: values.customFactExtractionPrompt,
           // customUpdateMemoryPrompt: values.customUpdateMemoryPrompt
         }
@@ -150,7 +132,7 @@ const MemoriesSettingsModal: FC<MemoriesSettingsModalProps> = ({ visible, onSubm
         </Form.Item>
         <Form.Item
           label={t('memory.embedding_model')}
-          name="embedderModel"
+          name="embeddingModel"
           rules={[{ required: true, message: t('memory.please_select_embedding_model') }]}>
           <ModelSelector
             providers={providers}
@@ -160,10 +142,12 @@ const MemoriesSettingsModal: FC<MemoriesSettingsModalProps> = ({ visible, onSubm
         </Form.Item>
         <Form.Item
           noStyle
-          shouldUpdate={(prevValues, currentValues) => prevValues.embedderModel !== currentValues.embedderModel}>
+          shouldUpdate={(prevValues, currentValues) => prevValues.embeddingModel !== currentValues.embeddingModel}>
           {({ getFieldValue }) => {
-            const embedderModelId = getFieldValue('embedderModel')
-            const embedderModel = findModelById(embedderModelId)
+            const embeddingModelId = getFieldValue('embeddingModel')
+            // embeddingModelId is a JSON string from getModelUniqId(), find model by comparing
+            const allModels = providers.flatMap((p) => p.models)
+            const embeddingModel = allModels.find((m) => getModelUniqId(m) === embeddingModelId)
             return (
               <Form.Item
                 label={
@@ -172,7 +156,7 @@ const MemoriesSettingsModal: FC<MemoriesSettingsModalProps> = ({ visible, onSubm
                     <InfoTooltip title={t('knowledge.dimensions_size_tooltip')} />
                   </Flex>
                 }
-                name="embedderDimensions"
+                name="embeddingDimensions"
                 rules={[
                   {
                     validator(_, value) {
@@ -183,7 +167,7 @@ const MemoriesSettingsModal: FC<MemoriesSettingsModalProps> = ({ visible, onSubm
                     }
                   }
                 ]}>
-                <InputEmbeddingDimension model={embedderModel} disabled={!embedderModel} />
+                <InputEmbeddingDimension model={embeddingModel} disabled={!embeddingModel} />
               </Form.Item>
             )
           }}
@@ -199,4 +183,4 @@ const MemoriesSettingsModal: FC<MemoriesSettingsModalProps> = ({ visible, onSubm
   )
 }
 
-export default MemoriesSettingsModal
+export default MemorySettingsModal
diff --git a/src/renderer/src/pages/settings/MemorySettings/UserSelector.tsx b/src/renderer/src/pages/settings/MemorySettings/UserSelector.tsx
index d11318c25f..2521fcad20 100644
--- a/src/renderer/src/pages/settings/MemorySettings/UserSelector.tsx
+++ b/src/renderer/src/pages/settings/MemorySettings/UserSelector.tsx
@@ -1,7 +1,6 @@
-import { HStack } from '@renderer/components/Layout'
-import { Avatar, Button, Select, Space, Tooltip } from 'antd'
+import { Button, Select, Space, Tooltip } from 'antd'
 import { UserRoundPlus } from 'lucide-react'
-import { useCallback, useMemo } from 'react'
+import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 
 import { DEFAULT_USER_ID } from './constants'
@@ -16,39 +15,18 @@ interface UserSelectorProps {
 const UserSelector: React.FC<UserSelectorProps> = ({ currentUser, uniqueUsers, onUserSwitch, onAddUser }) => {
   const { t } = useTranslation()
 
-  const getUserAvatar = useCallback((user: string) => {
-    return user === DEFAULT_USER_ID ? user.slice(0, 1).toUpperCase() : user.slice(0, 2).toUpperCase()
-  }, [])
-
-  const renderLabel = useCallback(
-    (userId: string, userName: string) => {
-      return (
-        <HStack alignItems="center" gap={10}>
-          <Avatar size={20} style={{ background: 'var(--color-primary)' }}>
-            {getUserAvatar(userId)}
-          </Avatar>
-          <span>{userName}</span>
-        </HStack>
-      )
-    },
-    [getUserAvatar]
-  )
-
   const options = useMemo(() => {
     const defaultOption = {
       value: DEFAULT_USER_ID,
-      label: renderLabel(DEFAULT_USER_ID, t('memory.default_user'))
+      label: t('memory.default_user')
     }
 
     const userOptions = uniqueUsers
       .filter((user) => user !== DEFAULT_USER_ID)
-      .map((user) => ({
-        value: user,
-        label: renderLabel(user, user)
-      }))
+      .map((user) => ({ value: user, label: user }))
 
     return [defaultOption, ...userOptions]
-  }, [renderLabel, t, uniqueUsers])
+  }, [t, uniqueUsers])
 
   return (
     <Space.Compact>
diff --git a/src/renderer/src/pages/settings/ModelSettings/DefaultAssistantSettings.tsx b/src/renderer/src/pages/settings/ModelSettings/DefaultAssistantSettings.tsx
index 2b1bed5ebe..0dfb121e94 100644
--- a/src/renderer/src/pages/settings/ModelSettings/DefaultAssistantSettings.tsx
+++ b/src/renderer/src/pages/settings/ModelSettings/DefaultAssistantSettings.tsx
@@ -2,13 +2,15 @@ import { CloseCircleFilled, QuestionCircleOutlined } from '@ant-design/icons'
 import EmojiPicker from '@renderer/components/EmojiPicker'
 import { ResetIcon } from '@renderer/components/Icons'
 import { HStack } from '@renderer/components/Layout'
+import Selector from '@renderer/components/Selector'
 import { TopView } from '@renderer/components/TopView'
-import { DEFAULT_CONTEXTCOUNT, DEFAULT_MAX_TOKENS, DEFAULT_TEMPERATURE } from '@renderer/config/constant'
+import { DEFAULT_CONTEXTCOUNT, DEFAULT_TEMPERATURE } from '@renderer/config/constant'
 import { useTheme } from '@renderer/context/ThemeProvider'
 import { useDefaultAssistant } from '@renderer/hooks/useAssistant'
+import { DEFAULT_ASSISTANT_SETTINGS } from '@renderer/services/AssistantService'
 import type { AssistantSettings as AssistantSettingsType } from '@renderer/types'
 import { getLeadingEmoji, modalConfirm } from '@renderer/utils'
-import { Button, Col, Flex, Input, InputNumber, Modal, Popover, Row, Slider, Switch, Tooltip } from 'antd'
+import { Button, Col, Divider, Flex, Input, InputNumber, Modal, Popover, Row, Slider, Switch, Tooltip } from 'antd'
 import TextArea from 'antd/es/input/TextArea'
 import type { Dispatch, FC, SetStateAction } from 'react'
 import { useState } from 'react'
@@ -20,12 +22,15 @@ import { SettingContainer, SettingRow, SettingSubtitle } from '..'
 const AssistantSettings: FC = () => {
   const { defaultAssistant, updateDefaultAssistant } = useDefaultAssistant()
   const [temperature, setTemperature] = useState(defaultAssistant.settings?.temperature ?? DEFAULT_TEMPERATURE)
-  const [enableTemperature, setEnableTemperature] = useState(defaultAssistant.settings?.enableTemperature ?? true)
+  const [enableTemperature, setEnableTemperature] = useState(defaultAssistant.settings?.enableTemperature ?? false)
   const [contextCount, setContextCount] = useState(defaultAssistant.settings?.contextCount ?? DEFAULT_CONTEXTCOUNT)
   const [enableMaxTokens, setEnableMaxTokens] = useState(defaultAssistant?.settings?.enableMaxTokens ?? false)
   const [maxTokens, setMaxTokens] = useState(defaultAssistant?.settings?.maxTokens ?? 0)
   const [topP, setTopP] = useState(defaultAssistant.settings?.topP ?? 1)
   const [enableTopP, setEnableTopP] = useState(defaultAssistant.settings?.enableTopP ?? false)
+  const [toolUseMode, setToolUseMode] = useState<AssistantSettingsType['toolUseMode']>(
+    defaultAssistant.settings?.toolUseMode ?? 'function'
+  )
   const [emoji, setEmoji] = useState(defaultAssistant.emoji || getLeadingEmoji(defaultAssistant.name) || '')
   const [name, setName] = useState(
     defaultAssistant.name.replace(getLeadingEmoji(defaultAssistant.name) || '', '').trim()
@@ -46,7 +51,8 @@ const AssistantSettings: FC = () => {
         maxTokens: settings.maxTokens ?? maxTokens,
         streamOutput: settings.streamOutput ?? true,
         topP: settings.topP ?? topP,
-        enableTopP: settings.enableTopP ?? enableTopP
+        enableTopP: settings.enableTopP ?? enableTopP,
+        toolUseMode: settings.toolUseMode ?? toolUseMode
       }
     })
   }
@@ -73,19 +79,10 @@ const AssistantSettings: FC = () => {
     setMaxTokens(0)
     setTopP(1)
     setEnableTopP(false)
+    setToolUseMode('function')
     updateDefaultAssistant({
       ...defaultAssistant,
-      settings: {
-        ...defaultAssistant.settings,
-        temperature: DEFAULT_TEMPERATURE,
-        enableTemperature: true,
-        contextCount: DEFAULT_CONTEXTCOUNT,
-        enableMaxTokens: false,
-        maxTokens: DEFAULT_MAX_TOKENS,
-        streamOutput: true,
-        topP: 1,
-        enableTopP: false
-      }
+      settings: { ...DEFAULT_ASSISTANT_SETTINGS }
     })
   }
 
@@ -107,10 +104,9 @@ const AssistantSettings: FC = () => {
 
   return (
     <SettingContainer
-      style={{ height: 'auto', background: 'transparent', padding: `0 0 12px 0`, gap: 12 }}
+      style={{ height: 'auto', background: 'transparent', padding: `0 0 12px 0`, gap: 10 }}
       theme={theme}>
-      <SettingSubtitle style={{ marginTop: 0 }}>{t('common.name')}</SettingSubtitle>
-      <HStack gap={8} alignItems="center">
+      <HStack gap={8} alignItems="center" mt={10}>
         <Popover content={<EmojiPicker onEmojiClick={handleEmojiSelect} />} arrow trigger="click">
           <EmojiButtonWrapper>
             <Button style={{ fontSize: 20, padding: '4px', minWidth: '30px', height: '30px' }}>{emoji}</Button>
@@ -161,6 +157,7 @@ const AssistantSettings: FC = () => {
           <Button type="text" onClick={onReset} icon={<ResetIcon size={16} />} />
         </Tooltip>
       </SettingSubtitle>
+      <Divider style={{ margin: '2px 0' }} />
       <SettingRow>
         <HStack alignItems="center">
           <Label>{t('chat.settings.temperature.label')}</Label>
@@ -178,7 +175,7 @@ const AssistantSettings: FC = () => {
         />
       </SettingRow>
       {enableTemperature && (
-        <Row align="middle" gutter={12}>
+        <Row align="middle" gutter={12} style={{ marginTop: -5, marginBottom: -10 }}>
           <Col span={20}>
             <Slider
               min={0}
@@ -202,6 +199,7 @@ const AssistantSettings: FC = () => {
           </Col>
         </Row>
       )}
+      <Divider style={{ margin: '2px 0' }} />
       <SettingRow>
         <HStack alignItems="center">
           <Label>{t('chat.settings.top_p.label')}</Label>
@@ -219,7 +217,7 @@ const AssistantSettings: FC = () => {
         />
       </SettingRow>
       {enableTopP && (
-        <Row align="middle" gutter={12}>
+        <Row align="middle" gutter={12} style={{ marginTop: -5, marginBottom: -10 }}>
           <Col span={20}>
             <Slider
               min={0}
@@ -236,13 +234,14 @@ const AssistantSettings: FC = () => {
           </Col>
         </Row>
       )}
+      <Divider style={{ margin: '2px 0' }} />
       <Row align="middle">
         <Label>{t('chat.settings.context_count.label')}</Label>
         <Tooltip title={t('chat.settings.context_count.tip')}>
           <QuestionIcon />
         </Tooltip>
       </Row>
-      <Row align="middle" gutter={20}>
+      <Row align="middle" gutter={20} style={{ marginTop: -5, marginBottom: -10 }}>
         <Col span={19}>
           <Slider
             min={0}
@@ -265,6 +264,7 @@ const AssistantSettings: FC = () => {
           />
         </Col>
       </Row>
+      <Divider style={{ margin: '2px 0' }} />
       <Flex justify="space-between" align="center">
         <HStack alignItems="center">
           <Label>{t('chat.settings.max_tokens.label')}</Label>
@@ -308,6 +308,22 @@ const AssistantSettings: FC = () => {
           </Col>
         </Row>
       )}
+      <Divider style={{ margin: '2px 0' }} />
+      <SettingRow>
+        <Label>{t('assistants.settings.tool_use_mode.label')}</Label>
+        <Selector
+          value={toolUseMode}
+          options={[
+            { label: t('assistants.settings.tool_use_mode.prompt'), value: 'prompt' },
+            { label: t('assistants.settings.tool_use_mode.function'), value: 'function' }
+          ]}
+          onChange={(value) => {
+            setToolUseMode(value)
+            onUpdateAssistantSettings({ toolUseMode: value })
+          }}
+          size={14}
+        />
+      </SettingRow>
     </SettingContainer>
   )
 }
diff --git a/src/renderer/src/pages/settings/ProviderSettings/CherryINSettings.tsx b/src/renderer/src/pages/settings/ProviderSettings/CherryINSettings.tsx
new file mode 100644
index 0000000000..15cee1c672
--- /dev/null
+++ b/src/renderer/src/pages/settings/ProviderSettings/CherryINSettings.tsx
@@ -0,0 +1,74 @@
+import { useProvider } from '@renderer/hooks/useProvider'
+import { Select } from 'antd'
+import type { FC } from 'react'
+import { useCallback, useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+
+interface CherryINSettingsProps {
+  providerId: string
+  apiHost: string
+  setApiHost: (host: string) => void
+}
+
+const API_HOST_OPTIONS = [
+  {
+    value: 'https://open.cherryin.cc',
+    labelKey: '加速域名',
+    description: 'open.cherryin.cc'
+  },
+  {
+    value: 'https://open.cherryin.net',
+    labelKey: '国际域名',
+    description: 'open.cherryin.net'
+  },
+  {
+    value: 'https://open.cherryin.ai',
+    labelKey: '备用域名',
+    description: 'open.cherryin.ai'
+  }
+]
+
+const CherryINSettings: FC<CherryINSettingsProps> = ({ providerId, apiHost, setApiHost }) => {
+  const { updateProvider } = useProvider(providerId)
+  const { t } = useTranslation()
+
+  const getCurrentHost = useMemo(() => {
+    const matchedOption = API_HOST_OPTIONS.find((option) => apiHost?.includes(option.value.replace('https://', '')))
+    return matchedOption?.value ?? API_HOST_OPTIONS[0].value
+  }, [apiHost])
+
+  const handleHostChange = useCallback(
+    (value: string) => {
+      setApiHost(value)
+      updateProvider({ apiHost: value, anthropicApiHost: value })
+    },
+    [setApiHost, updateProvider]
+  )
+
+  const options = useMemo(
+    () =>
+      API_HOST_OPTIONS.map((option) => ({
+        value: option.value,
+        label: (
+          <div className="flex flex-col gap-0.5">
+            <span>{option.labelKey}</span>
+            <span className="text-[var(--color-text-3)] text-xs">{t(option.description)}</span>
+          </div>
+        )
+      })),
+    [t]
+  )
+
+  return (
+    <Select
+      value={getCurrentHost}
+      onChange={handleHostChange}
+      options={options}
+      style={{ width: '100%', marginTop: 5 }}
+      optionLabelProp="label"
+      labelRender={(option) => option.value}
+    />
+  )
+}
+
+export default CherryINSettings
diff --git a/src/renderer/src/pages/settings/ProviderSettings/ModelList/DownloadOVMSModelPopup.tsx b/src/renderer/src/pages/settings/ProviderSettings/ModelList/DownloadOVMSModelPopup.tsx
index 518017d5b3..bb39376d3b 100644
--- a/src/renderer/src/pages/settings/ProviderSettings/ModelList/DownloadOVMSModelPopup.tsx
+++ b/src/renderer/src/pages/settings/ProviderSettings/ModelList/DownloadOVMSModelPopup.tsx
@@ -35,6 +35,13 @@ interface PresetModel {
 }
 
 const PRESET_MODELS: PresetModel[] = [
+  {
+    modelId: 'OpenVINO/Qwen3-4B-int4-ov',
+    modelName: 'Qwen3-4B-int4-ov',
+    modelSource: 'https://www.modelscope.cn/models',
+    task: 'text_generation',
+    label: 'Qwen3-4B-int4-ov (Text Generation)'
+  },
   {
     modelId: 'OpenVINO/Qwen3-8B-int4-ov',
     modelName: 'Qwen3-8B-int4-ov',
diff --git a/src/renderer/src/pages/settings/ProviderSettings/ModelList/ModelList.tsx b/src/renderer/src/pages/settings/ProviderSettings/ModelList/ModelList.tsx
index b2455a8ad5..a8eb888813 100644
--- a/src/renderer/src/pages/settings/ProviderSettings/ModelList/ModelList.tsx
+++ b/src/renderer/src/pages/settings/ProviderSettings/ModelList/ModelList.tsx
@@ -49,6 +49,9 @@ const ModelList: React.FC<ModelListProps> = ({ providerId }) => {
   const { t } = useTranslation()
   const { provider, models, removeModel } = useProvider(providerId)
 
+  // 稳定的编辑模型回调，避免内联函数导致子组件 memo 失效
+  const handleEditModel = useCallback((model: Model) => EditModelPopup.show({ provider, model }), [provider])
+
   const providerConfig = PROVIDER_URLS[provider.id]
   const docsWebsite = providerConfig?.websites?.docs
   const modelsWebsite = providerConfig?.websites?.models
@@ -63,6 +66,11 @@ const ModelList: React.FC<ModelListProps> = ({ providerId }) => {
 
   const { isChecking: isHealthChecking, modelStatuses, runHealthCheck } = useHealthCheck(provider, models)
 
+  // 将 modelStatuses 数组转换为 Map，实现 O(1) 查找
+  const modelStatusMap = useMemo(() => {
+    return new Map(modelStatuses.map((status) => [status.model.id, status]))
+  }, [modelStatuses])
+
   const setSearchText = useCallback((text: string) => {
     startTransition(() => {
       _setSearchText(text)
@@ -138,9 +146,9 @@ const ModelList: React.FC<ModelListProps> = ({ providerId }) => {
                 key={group}
                 groupName={group}
                 models={displayedModelGroups[group]}
-                modelStatuses={modelStatuses}
+                modelStatusMap={modelStatusMap}
                 defaultOpen={i <= 5}
-                onEditModel={(model) => EditModelPopup.show({ provider, model })}
+                onEditModel={handleEditModel}
                 onRemoveModel={removeModel}
                 onRemoveGroup={() => displayedModelGroups[group].forEach((model) => removeModel(model))}
               />
diff --git a/src/renderer/src/pages/settings/ProviderSettings/ModelList/ModelListGroup.tsx b/src/renderer/src/pages/settings/ProviderSettings/ModelList/ModelListGroup.tsx
index 0185ef597d..190a49cebd 100644
--- a/src/renderer/src/pages/settings/ProviderSettings/ModelList/ModelListGroup.tsx
+++ b/src/renderer/src/pages/settings/ProviderSettings/ModelList/ModelListGroup.tsx
@@ -15,7 +15,8 @@ const MAX_SCROLLER_HEIGHT = 390
 interface ModelListGroupProps {
   groupName: string
   models: Model[]
-  modelStatuses: ModelWithStatus[]
+  /** 使用 Map 实现 O(1) 查找，替代原来的数组线性搜索 */
+  modelStatusMap: Map<string, ModelWithStatus>
   defaultOpen: boolean
   disabled?: boolean
   onEditModel: (model: Model) => void
@@ -26,7 +27,7 @@ interface ModelListGroupProps {
 const ModelListGroup: React.FC<ModelListGroupProps> = ({
   groupName,
   models,
-  modelStatuses,
+  modelStatusMap,
   defaultOpen,
   disabled,
   onEditModel,
@@ -89,7 +90,7 @@ const ModelListGroup: React.FC<ModelListGroupProps> = ({
           {(model) => (
             <ModelListItem
               model={model}
-              modelStatus={modelStatuses.find((status) => status.model.id === model.id)}
+              modelStatus={modelStatusMap.get(model.id)}
               onEdit={onEditModel}
               onRemove={onRemoveModel}
               disabled={disabled}
diff --git a/src/renderer/src/pages/settings/ProviderSettings/ProviderList.tsx b/src/renderer/src/pages/settings/ProviderSettings/ProviderList.tsx
index 7502e4d806..cc19eea6a6 100644
--- a/src/renderer/src/pages/settings/ProviderSettings/ProviderList.tsx
+++ b/src/renderer/src/pages/settings/ProviderSettings/ProviderList.tsx
@@ -21,6 +21,7 @@ import { startTransition, useCallback, useEffect, useRef, useState } from 'react
 import { useTranslation } from 'react-i18next'
 import { useSearchParams } from 'react-router-dom'
 import styled from 'styled-components'
+import useSWRImmutable from 'swr/immutable'
 
 import AddProviderPopup from './AddProviderPopup'
 import ModelNotesPopup from './ModelNotesPopup'
@@ -30,8 +31,16 @@ import UrlSchemaInfoPopup from './UrlSchemaInfoPopup'
 const logger = loggerService.withContext('ProviderList')
 
 const BUTTON_WRAPPER_HEIGHT = 50
-const systemType = await window.api.system.getDeviceType()
-const cpuName = await window.api.system.getCpuName()
+
+const getIsOvmsSupported = async (): Promise<boolean> => {
+  try {
+    const result = await window.api.ovms.isSupported()
+    return result
+  } catch (e) {
+    logger.warn('Fetching isOvmsSupported failed. Fallback to false.', e as Error)
+    return false
+  }
+}
 
 const ProviderList: FC = () => {
   const [searchParams, setSearchParams] = useSearchParams()
@@ -45,6 +54,8 @@ const ProviderList: FC = () => {
   const [providerLogos, setProviderLogos] = useState<Record<string, string>>({})
   const listRef = useRef<DraggableVirtualListRef>(null)
 
+  const { data: isOvmsSupported } = useSWRImmutable('ovms/isSupported', getIsOvmsSupported)
+
   const setSelectedProvider = useCallback((provider: Provider) => {
     startTransition(() => _setSelectedProvider(provider))
   }, [])
@@ -278,7 +289,8 @@ const ProviderList: FC = () => {
   }
 
   const filteredProviders = providers.filter((provider) => {
-    if (provider.id === 'ovms' && (systemType !== 'windows' || !cpuName.toLowerCase().includes('intel'))) {
+    // don't show it when isOvmsSupported is loading
+    if (provider.id === 'ovms' && !isOvmsSupported) {
       return false
     }
 
diff --git a/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx b/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx
index c3b8904cef..777bc61984 100644
--- a/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx
+++ b/src/renderer/src/pages/settings/ProviderSettings/ProviderSetting.tsx
@@ -10,7 +10,6 @@ import { PROVIDER_URLS } from '@renderer/config/providers'
 import { useTheme } from '@renderer/context/ThemeProvider'
 import { useAllProviders, useProvider, useProviders } from '@renderer/hooks/useProvider'
 import { useTimer } from '@renderer/hooks/useTimer'
-import i18n from '@renderer/i18n'
 import AnthropicSettings from '@renderer/pages/settings/ProviderSettings/AnthropicSettings'
 import { ModelList } from '@renderer/pages/settings/ProviderSettings/ModelList'
 import { checkApi } from '@renderer/services/ApiService'
@@ -53,6 +52,7 @@ import {
 } from '..'
 import ApiOptionsSettingsPopup from './ApiOptionsSettings/ApiOptionsSettingsPopup'
 import AwsBedrockSettings from './AwsBedrockSettings'
+import CherryINSettings from './CherryINSettings'
 import CustomHeaderPopup from './CustomHeaderPopup'
 import DMXAPISettings from './DMXAPISettings'
 import GithubCopilotSettings from './GithubCopilotSettings'
@@ -80,7 +80,10 @@ const ANTHROPIC_COMPATIBLE_PROVIDER_IDS = [
   SystemProviderIds.minimax,
   SystemProviderIds.silicon,
   SystemProviderIds.qiniu,
-  SystemProviderIds.dmxapi
+  SystemProviderIds.dmxapi,
+  SystemProviderIds.mimo,
+  SystemProviderIds.openrouter,
+  SystemProviderIds.tokenflux
 ] as const
 type AnthropicCompatibleProviderId = (typeof ANTHROPIC_COMPATIBLE_PROVIDER_IDS)[number]
 
@@ -99,13 +102,15 @@ const ProviderSetting: FC<Props> = ({ providerId }) => {
   const [anthropicApiHost, setAnthropicHost] = useState<string | undefined>(provider.anthropicApiHost)
   const [apiVersion, setApiVersion] = useState(provider.apiVersion)
   const [activeHostField, setActiveHostField] = useState<HostField>('apiHost')
-  const { t } = useTranslation()
+  const { t, i18n } = useTranslation()
   const { theme } = useTheme()
   const { setTimeoutTimer } = useTimer()
   const dispatch = useAppDispatch()
 
   const isAzureOpenAI = isAzureOpenAIProvider(provider)
   const isDmxapi = provider.id === 'dmxapi'
+  const isCherryIN = provider.id === 'cherryin'
+  const isChineseUser = i18n.language.startsWith('zh')
   const noAPIInputProviders = ['aws-bedrock'] as const satisfies SystemProviderId[]
   const hideApiInput = noAPIInputProviders.some((id) => id === provider.id)
   const noAPIKeyInputProviders = ['copilot', 'vertexai'] as const satisfies SystemProviderId[]
@@ -338,13 +343,16 @@ const ProviderSetting: FC<Props> = ({ providerId }) => {
   }, [provider.anthropicApiHost])
 
   const canConfigureAnthropicHost = useMemo(() => {
+    if (isCherryIN) {
+      return false
+    }
     if (isNewApiProvider(provider)) {
       return true
     }
     return (
       provider.type !== 'anthropic' && isSystemProviderId(provider.id) && isAnthropicCompatibleProviderId(provider.id)
     )
-  }, [provider])
+  }, [isCherryIN, provider])
 
   const anthropicHostPreview = useMemo(() => {
     const rawHost = anthropicApiHost ?? provider.anthropicApiHost
@@ -513,19 +521,23 @@ const ProviderSetting: FC<Props> = ({ providerId }) => {
               </SettingSubtitle>
               {activeHostField === 'apiHost' && (
                 <>
-                  <Space.Compact style={{ width: '100%', marginTop: 5 }}>
-                    <Input
-                      value={apiHost}
-                      placeholder={t('settings.provider.api_host')}
-                      onChange={(e) => setApiHost(e.target.value)}
-                      onBlur={onUpdateApiHost}
-                    />
-                    {isApiHostResettable && (
-                      <Button danger onClick={onReset}>
-                        {t('settings.provider.api.url.reset')}
-                      </Button>
-                    )}
-                  </Space.Compact>
+                  {isCherryIN && isChineseUser ? (
+                    <CherryINSettings providerId={provider.id} apiHost={apiHost} setApiHost={setApiHost} />
+                  ) : (
+                    <Space.Compact style={{ width: '100%', marginTop: 5 }}>
+                      <Input
+                        value={apiHost}
+                        placeholder={t('settings.provider.api_host')}
+                        onChange={(e) => setApiHost(e.target.value)}
+                        onBlur={onUpdateApiHost}
+                      />
+                      {isApiHostResettable && (
+                        <Button danger onClick={onReset}>
+                          {t('settings.provider.api.url.reset')}
+                        </Button>
+                      )}
+                    </Space.Compact>
+                  )}
                   {isVertexProvider(provider) && (
                     <SettingHelpTextRow>
                       <SettingHelpText>{t('settings.provider.vertex_ai.api_host_help')}</SettingHelpText>
diff --git a/src/renderer/src/pages/settings/SelectionAssistantSettings/hooks/useSettingsActionsList.ts b/src/renderer/src/pages/settings/SelectionAssistantSettings/hooks/useSettingsActionsList.ts
index 341ac8f9c6..843fee150b 100644
--- a/src/renderer/src/pages/settings/SelectionAssistantSettings/hooks/useSettingsActionsList.ts
+++ b/src/renderer/src/pages/settings/SelectionAssistantSettings/hooks/useSettingsActionsList.ts
@@ -9,8 +9,8 @@ import { DEFAULT_SEARCH_ENGINES } from '../components/SelectionActionSearchModal
 
 const logger = loggerService.withContext('useSettingsActionsList')
 
-const MAX_CUSTOM_ITEMS = 8
-const MAX_ENABLED_ITEMS = 6
+const MAX_CUSTOM_ITEMS = 10
+const MAX_ENABLED_ITEMS = 8
 
 export const useActionItems = (
   initialItems: ActionItem[] | undefined,
diff --git a/src/renderer/src/pages/settings/SettingsPage.tsx b/src/renderer/src/pages/settings/SettingsPage.tsx
index a14e10973d..f1b1186c43 100644
--- a/src/renderer/src/pages/settings/SettingsPage.tsx
+++ b/src/renderer/src/pages/settings/SettingsPage.tsx
@@ -1,5 +1,5 @@
-import { GlobalOutlined } from '@ant-design/icons'
 import { Navbar, NavbarCenter } from '@renderer/components/app/Navbar'
+import { McpLogo } from '@renderer/components/Icons'
 import Scrollbar from '@renderer/components/Scrollbar'
 import ModelSettings from '@renderer/pages/settings/ModelSettings/ModelSettings'
 import { Divider as AntDivider } from 'antd'
@@ -8,13 +8,12 @@ import {
   Cloud,
   Command,
   FileCode,
-  Hammer,
   HardDrive,
   Info,
   MonitorCog,
-  NotebookPen,
   Package,
   PictureInPicture2,
+  Search,
   Server,
   Settings2,
   TextCursorInput,
@@ -32,7 +31,6 @@ import DocProcessSettings from './DocProcessSettings'
 import GeneralSettings from './GeneralSettings'
 import MCPSettings from './MCPSettings'
 import MemorySettings from './MemorySettings'
-import NotesSettings from './NotesSettings'
 import { ProviderList } from './ProviderSettings'
 import QuickAssistantSettings from './QuickAssistantSettings'
 import QuickPhraseSettings from './QuickPhraseSettings'
@@ -88,19 +86,13 @@ const SettingsPage: FC = () => {
           <Divider />
           <MenuItemLink to="/settings/mcp">
             <MenuItem className={isRoute('/settings/mcp')}>
-              <Hammer size={18} />
+              <McpLogo width={18} height={18} style={{ opacity: 0.8 }} />
               {t('settings.mcp.title')}
             </MenuItem>
           </MenuItemLink>
-          <MenuItemLink to="/settings/notes">
-            <MenuItem className={isRoute('/settings/notes')}>
-              <NotebookPen size={18} />
-              {t('notes.settings.title')}
-            </MenuItem>
-          </MenuItemLink>
           <MenuItemLink to="/settings/websearch">
             <MenuItem className={isRoute('/settings/websearch')}>
-              <GlobalOutlined style={{ fontSize: 18 }} />
+              <Search size={18} />
               {t('settings.tool.websearch.title')}
             </MenuItem>
           </MenuItemLink>
@@ -159,7 +151,7 @@ const SettingsPage: FC = () => {
           <Routes>
             <Route path="provider" element={<ProviderList />} />
             <Route path="model" element={<ModelSettings />} />
-            <Route path="websearch" element={<WebSearchSettings />} />
+            <Route path="websearch/*" element={<WebSearchSettings />} />
             <Route path="api-server" element={<ApiServerSettings />} />
             <Route path="docprocess" element={<DocProcessSettings />} />
             <Route path="quickphrase" element={<QuickPhraseSettings />} />
@@ -171,7 +163,6 @@ const SettingsPage: FC = () => {
             <Route path="quickAssistant" element={<QuickAssistantSettings />} />
             <Route path="selectionAssistant" element={<SelectionAssistantSettings />} />
             <Route path="data" element={<DataSettings />} />
-            <Route path="notes" element={<NotesSettings />} />
             <Route path="about" element={<AboutSettings />} />
           </Routes>
         </SettingContent>
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx b/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx
index 95c0749126..e4db2caf22 100644
--- a/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx
+++ b/src/renderer/src/pages/settings/WebSearchSettings/BasicSettings.tsx
@@ -1,22 +1,138 @@
+import BaiduLogo from '@renderer/assets/images/search/baidu.svg'
+import BingLogo from '@renderer/assets/images/search/bing.svg'
+import BochaLogo from '@renderer/assets/images/search/bocha.webp'
+import ExaLogo from '@renderer/assets/images/search/exa.png'
+import GoogleLogo from '@renderer/assets/images/search/google.svg'
+import SearxngLogo from '@renderer/assets/images/search/searxng.svg'
+import TavilyLogo from '@renderer/assets/images/search/tavily.png'
+import ZhipuLogo from '@renderer/assets/images/search/zhipu.png'
+import Selector from '@renderer/components/Selector'
 import { useTheme } from '@renderer/context/ThemeProvider'
-import { useWebSearchSettings } from '@renderer/hooks/useWebSearchProviders'
+import {
+  useDefaultWebSearchProvider,
+  useWebSearchProviders,
+  useWebSearchSettings
+} from '@renderer/hooks/useWebSearchProviders'
 import { useAppDispatch } from '@renderer/store'
 import { setMaxResult, setSearchWithTime } from '@renderer/store/websearch'
+import type { WebSearchProvider, WebSearchProviderId } from '@renderer/types'
+import { hasObjectKey } from '@renderer/utils'
 import { Slider, Switch, Tooltip } from 'antd'
-import { t } from 'i18next'
 import { Info } from 'lucide-react'
 import type { FC } from 'react'
+import { useTranslation } from 'react-i18next'
+import { useNavigate } from 'react-router'
 
 import { SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '..'
 
+// Provider logos map
+const getProviderLogo = (providerId: WebSearchProviderId): string | undefined => {
+  switch (providerId) {
+    case 'zhipu':
+      return ZhipuLogo
+    case 'tavily':
+      return TavilyLogo
+    case 'searxng':
+      return SearxngLogo
+    case 'exa':
+    case 'exa-mcp':
+      return ExaLogo
+    case 'bocha':
+      return BochaLogo
+    case 'local-google':
+      return GoogleLogo
+    case 'local-bing':
+      return BingLogo
+    case 'local-baidu':
+      return BaiduLogo
+    default:
+      return undefined
+  }
+}
+
 const BasicSettings: FC = () => {
   const { theme } = useTheme()
+  const { t } = useTranslation()
+  const { providers } = useWebSearchProviders()
+  const { provider: defaultProvider, setDefaultProvider } = useDefaultWebSearchProvider()
   const { searchWithTime, maxResults, compressionConfig } = useWebSearchSettings()
+  const navigate = useNavigate()
 
   const dispatch = useAppDispatch()
 
+  const updateSelectedWebSearchProvider = (providerId: string) => {
+    const provider = providers.find((p) => p.id === providerId)
+    if (provider) {
+      // Check if provider needs API key but doesn't have one
+      const needsApiKey = hasObjectKey(provider, 'apiKey')
+      const hasApiKey = provider.apiKey && provider.apiKey.trim() !== ''
+
+      if (needsApiKey && !hasApiKey) {
+        // Don't allow selection, show modal to configure
+        window.modal.confirm({
+          title: t('settings.tool.websearch.api_key_required.title'),
+          content: t('settings.tool.websearch.api_key_required.content', { provider: provider.name }),
+          okText: t('settings.tool.websearch.api_key_required.ok'),
+          cancelText: t('common.cancel'),
+          centered: true,
+          onOk: () => {
+            navigate(`/settings/websearch/provider/${provider.id}`)
+          }
+        })
+        return
+      }
+
+      setDefaultProvider(provider as WebSearchProvider)
+    }
+  }
+
+  // Sort providers: API providers first, then local providers
+  const sortedProviders = [...providers].sort((a, b) => {
+    const aIsLocal = a.id.startsWith('local')
+    const bIsLocal = b.id.startsWith('local')
+    if (aIsLocal && !bIsLocal) return 1
+    if (!aIsLocal && bIsLocal) return -1
+    return 0
+  })
+
+  const renderProviderLabel = (provider: WebSearchProvider) => {
+    const logo = getProviderLogo(provider.id)
+    const needsApiKey = hasObjectKey(provider, 'apiKey')
+
+    return (
+      <div className="flex items-center gap-2">
+        {logo ? (
+          <img src={logo} alt={provider.name} className="h-4 w-4 rounded-sm object-contain" />
+        ) : (
+          <div className="h-4 w-4 rounded-sm bg-[var(--color-background-soft)]" />
+        )}
+        <span>
+          {provider.name}
+          {needsApiKey && ` (${t('settings.tool.websearch.apikey')})`}
+        </span>
+      </div>
+    )
+  }
+
   return (
     <>
+      <SettingGroup theme={theme}>
+        <SettingTitle>{t('settings.tool.websearch.search_provider')}</SettingTitle>
+        <SettingDivider />
+        <SettingRow>
+          <SettingRowTitle>{t('settings.tool.websearch.default_provider')}</SettingRowTitle>
+          <Selector
+            size={14}
+            value={defaultProvider?.id}
+            onChange={(value: string) => updateSelectedWebSearchProvider(value)}
+            placeholder={t('settings.tool.websearch.search_provider_placeholder')}
+            options={sortedProviders.map((p) => ({
+              value: p.id,
+              label: renderProviderLabel(p)
+            }))}
+          />
+        </SettingRow>
+      </SettingGroup>
       <SettingGroup theme={theme} style={{ paddingBottom: 8 }}>
         <SettingTitle>{t('settings.general.title')}</SettingTitle>
         <SettingDivider />
@@ -48,4 +164,5 @@ const BasicSettings: FC = () => {
     </>
   )
 }
+
 export default BasicSettings
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/WebSearchGeneralSettings.tsx b/src/renderer/src/pages/settings/WebSearchSettings/WebSearchGeneralSettings.tsx
new file mode 100644
index 0000000000..0af3fb4332
--- /dev/null
+++ b/src/renderer/src/pages/settings/WebSearchSettings/WebSearchGeneralSettings.tsx
@@ -0,0 +1,21 @@
+import { useTheme } from '@renderer/context/ThemeProvider'
+import type { FC } from 'react'
+
+import { SettingContainer } from '..'
+import BasicSettings from './BasicSettings'
+import BlacklistSettings from './BlacklistSettings'
+import CompressionSettings from './CompressionSettings'
+
+const WebSearchGeneralSettings: FC = () => {
+  const { theme } = useTheme()
+
+  return (
+    <SettingContainer theme={theme}>
+      <BasicSettings />
+      <CompressionSettings />
+      <BlacklistSettings />
+    </SettingContainer>
+  )
+}
+
+export default WebSearchGeneralSettings
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSetting.tsx b/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSetting.tsx
index 438fc053d1..823f6fac81 100644
--- a/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSetting.tsx
+++ b/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSetting.tsx
@@ -1,7 +1,10 @@
 import { CheckOutlined, ExportOutlined, LoadingOutlined } from '@ant-design/icons'
 import { loggerService } from '@logger'
+import BaiduLogo from '@renderer/assets/images/search/baidu.svg'
+import BingLogo from '@renderer/assets/images/search/bing.svg'
 import BochaLogo from '@renderer/assets/images/search/bocha.webp'
 import ExaLogo from '@renderer/assets/images/search/exa.png'
+import GoogleLogo from '@renderer/assets/images/search/google.svg'
 import SearxngLogo from '@renderer/assets/images/search/searxng.svg'
 import TavilyLogo from '@renderer/assets/images/search/tavily.png'
 import ZhipuLogo from '@renderer/assets/images/search/zhipu.png'
@@ -9,7 +12,7 @@ import { HStack } from '@renderer/components/Layout'
 import ApiKeyListPopup from '@renderer/components/Popups/ApiKeyListPopup/popup'
 import { WEB_SEARCH_PROVIDER_CONFIG } from '@renderer/config/webSearchProviders'
 import { useTimer } from '@renderer/hooks/useTimer'
-import { useWebSearchProvider } from '@renderer/hooks/useWebSearchProviders'
+import { useDefaultWebSearchProvider, useWebSearchProvider } from '@renderer/hooks/useWebSearchProviders'
 import WebSearchService from '@renderer/services/WebSearchService'
 import type { WebSearchProviderId } from '@renderer/types'
 import { formatApiKeys, hasObjectKey } from '@renderer/utils'
@@ -30,6 +33,7 @@ interface Props {
 
 const WebSearchProviderSetting: FC<Props> = ({ providerId }) => {
   const { provider, updateProvider } = useWebSearchProvider(providerId)
+  const { provider: defaultProvider, setDefaultProvider } = useDefaultWebSearchProvider()
   const { t } = useTranslation()
   const [apiKey, setApiKey] = useState(provider.apiKey || '')
   const [apiHost, setApiHost] = useState(provider.apiHost || '')
@@ -145,29 +149,83 @@ const WebSearchProviderSetting: FC<Props> = ({ providerId }) => {
       case 'searxng':
         return SearxngLogo
       case 'exa':
+      case 'exa-mcp':
         return ExaLogo
       case 'bocha':
         return BochaLogo
+      case 'local-google':
+        return GoogleLogo
+      case 'local-bing':
+        return BingLogo
+      case 'local-baidu':
+        return BaiduLogo
       default:
         return undefined
     }
   }
 
+  const isLocalProvider = provider.id.startsWith('local')
+
+  const openLocalProviderSettings = async () => {
+    if (officialWebsite) {
+      await window.api.searchService.openSearchWindow(provider.id, true)
+      await window.api.searchService.openUrlInSearchWindow(provider.id, officialWebsite)
+    }
+  }
+
+  const providerLogo = getWebSearchProviderLogo(provider.id)
+
+  // Check if this provider is already the default
+  const isDefault = defaultProvider?.id === provider.id
+
+  // Check if provider needs API key but doesn't have one configured
+  const needsApiKey = hasObjectKey(provider, 'apiKey')
+  const hasApiKey = provider.apiKey && provider.apiKey.trim() !== ''
+  const canSetAsDefault = !isDefault && (!needsApiKey || hasApiKey)
+
+  const handleSetAsDefault = () => {
+    if (canSetAsDefault) {
+      setDefaultProvider(provider)
+    }
+  }
+
   return (
     <>
       <SettingTitle>
-        <Flex align="center" gap={8}>
-          <ProviderLogo src={getWebSearchProviderLogo(provider.id)} />
-          <ProviderName> {provider.name}</ProviderName>
-          {officialWebsite && webSearchProviderConfig?.websites && (
-            <Link target="_blank" href={webSearchProviderConfig.websites.official}>
-              <ExportOutlined style={{ color: 'var(--color-text)', fontSize: '12px' }} />
-            </Link>
-          )}
+        <Flex align="center" justify="space-between" style={{ width: '100%' }}>
+          <Flex align="center" gap={8}>
+            {providerLogo ? (
+              <img src={providerLogo} alt={provider.name} className="h-5 w-5 object-contain" />
+            ) : (
+              <div className="h-5 w-5 rounded bg-[var(--color-background-soft)]" />
+            )}
+            <ProviderName> {provider.name}</ProviderName>
+            {officialWebsite && webSearchProviderConfig?.websites && (
+              <Link target="_blank" href={webSearchProviderConfig.websites.official}>
+                <ExportOutlined style={{ color: 'var(--color-text)', fontSize: '12px' }} />
+              </Link>
+            )}
+          </Flex>
+          <Button type="default" disabled={!canSetAsDefault} onClick={handleSetAsDefault}>
+            {isDefault ? t('settings.tool.websearch.is_default') : t('settings.tool.websearch.set_as_default')}
+          </Button>
         </Flex>
       </SettingTitle>
       <Divider style={{ width: '100%', margin: '10px 0' }} />
-      {hasObjectKey(provider, 'apiKey') && (
+      {isLocalProvider && (
+        <>
+          <SettingSubtitle style={{ marginTop: 5, marginBottom: 10 }}>
+            {t('settings.tool.websearch.local_provider.settings')}
+          </SettingSubtitle>
+          <Button type="primary" onClick={openLocalProviderSettings} icon={<ExportOutlined />}>
+            {t('settings.tool.websearch.local_provider.open_settings', { provider: provider.name })}
+          </Button>
+          <SettingHelpTextRow style={{ marginTop: 10 }}>
+            <SettingHelpText>{t('settings.tool.websearch.local_provider.hint')}</SettingHelpText>
+          </SettingHelpTextRow>
+        </>
+      )}
+      {!isLocalProvider && hasObjectKey(provider, 'apiKey') && (
         <>
           <SettingSubtitle
             style={{
@@ -218,7 +276,7 @@ const WebSearchProviderSetting: FC<Props> = ({ providerId }) => {
           </SettingHelpTextRow>
         </>
       )}
-      {hasObjectKey(provider, 'apiHost') && (
+      {!isLocalProvider && hasObjectKey(provider, 'apiHost') && (
         <>
           <SettingSubtitle style={{ marginTop: 5, marginBottom: 10 }}>
             {t('settings.provider.api_host')}
@@ -233,10 +291,11 @@ const WebSearchProviderSetting: FC<Props> = ({ providerId }) => {
           </Flex>
         </>
       )}
-      {hasObjectKey(provider, 'basicAuthUsername') && (
+      {!isLocalProvider && hasObjectKey(provider, 'basicAuthUsername') && (
         <>
           <SettingDivider style={{ marginTop: 12, marginBottom: 12 }} />
-          <SettingSubtitle style={{ marginTop: 5, marginBottom: 10 }}>
+          <SettingSubtitle
+            style={{ marginTop: 5, marginBottom: 10, display: 'flex', flexDirection: 'row', alignItems: 'center' }}>
             {t('settings.provider.basic_auth.label')}
             <Tooltip title={t('settings.provider.basic_auth.tip')} placement="right">
               <Info size={16} color="var(--color-icon)" style={{ marginLeft: 5, cursor: 'pointer' }} />
@@ -290,10 +349,5 @@ const ProviderName = styled.span`
   font-size: 14px;
   font-weight: 500;
 `
-const ProviderLogo = styled.img`
-  width: 20px;
-  height: 20px;
-  object-fit: contain;
-`
 
 export default WebSearchProviderSetting
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSettings.tsx b/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSettings.tsx
new file mode 100644
index 0000000000..884c43e6b4
--- /dev/null
+++ b/src/renderer/src/pages/settings/WebSearchSettings/WebSearchProviderSettings.tsx
@@ -0,0 +1,26 @@
+import { useTheme } from '@renderer/context/ThemeProvider'
+import type { WebSearchProviderId } from '@renderer/types'
+import type { FC } from 'react'
+import { useParams } from 'react-router'
+
+import { SettingContainer, SettingGroup } from '..'
+import WebSearchProviderSetting from './WebSearchProviderSetting'
+
+const WebSearchProviderSettings: FC = () => {
+  const { providerId } = useParams<{ providerId: string }>()
+  const { theme } = useTheme()
+
+  if (!providerId) {
+    return null
+  }
+
+  return (
+    <SettingContainer theme={theme}>
+      <SettingGroup theme={theme}>
+        <WebSearchProviderSetting providerId={providerId as WebSearchProviderId} />
+      </SettingGroup>
+    </SettingContainer>
+  )
+}
+
+export default WebSearchProviderSettings
diff --git a/src/renderer/src/pages/settings/WebSearchSettings/index.tsx b/src/renderer/src/pages/settings/WebSearchSettings/index.tsx
index 7867cb57e0..a21de63764 100644
--- a/src/renderer/src/pages/settings/WebSearchSettings/index.tsx
+++ b/src/renderer/src/pages/settings/WebSearchSettings/index.tsx
@@ -1,66 +1,195 @@
-import Selector from '@renderer/components/Selector'
-import { useTheme } from '@renderer/context/ThemeProvider'
+import BaiduLogo from '@renderer/assets/images/search/baidu.svg'
+import BingLogo from '@renderer/assets/images/search/bing.svg'
+import BochaLogo from '@renderer/assets/images/search/bocha.webp'
+import ExaLogo from '@renderer/assets/images/search/exa.png'
+import GoogleLogo from '@renderer/assets/images/search/google.svg'
+import SearxngLogo from '@renderer/assets/images/search/searxng.svg'
+import TavilyLogo from '@renderer/assets/images/search/tavily.png'
+import ZhipuLogo from '@renderer/assets/images/search/zhipu.png'
+import DividerWithText from '@renderer/components/DividerWithText'
+import ListItem from '@renderer/components/ListItem'
+import Scrollbar from '@renderer/components/Scrollbar'
 import { useDefaultWebSearchProvider, useWebSearchProviders } from '@renderer/hooks/useWebSearchProviders'
-import type { WebSearchProvider } from '@renderer/types'
+import type { WebSearchProviderId } from '@renderer/types'
 import { hasObjectKey } from '@renderer/utils'
+import { Flex, Tag } from 'antd'
+import { Search } from 'lucide-react'
 import type { FC } from 'react'
-import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import { Navigate, Route, Routes, useLocation, useNavigate } from 'react-router'
+import styled from 'styled-components'
 
-import { SettingContainer, SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '..'
-import BasicSettings from './BasicSettings'
-import BlacklistSettings from './BlacklistSettings'
-import CompressionSettings from './CompressionSettings'
-import WebSearchProviderSetting from './WebSearchProviderSetting'
+import WebSearchGeneralSettings from './WebSearchGeneralSettings'
+import WebSearchProviderSettings from './WebSearchProviderSettings'
 
 const WebSearchSettings: FC = () => {
-  const { providers } = useWebSearchProviders()
-  const { provider: defaultProvider, setDefaultProvider } = useDefaultWebSearchProvider()
   const { t } = useTranslation()
-  const [selectedProvider, setSelectedProvider] = useState<WebSearchProvider | undefined>(defaultProvider)
-  const { theme: themeMode } = useTheme()
+  const { providers } = useWebSearchProviders()
+  const { provider: defaultProvider } = useDefaultWebSearchProvider()
+  const navigate = useNavigate()
+  const location = useLocation()
 
-  const isLocalProvider = selectedProvider?.id.startsWith('local')
+  // Get the currently active view
+  const getActiveView = () => {
+    const path = location.pathname
 
-  function updateSelectedWebSearchProvider(providerId: string) {
-    const provider = providers.find((p) => p.id === providerId)
-    if (!provider) {
-      return
+    if (path === '/settings/websearch/general' || path === '/settings/websearch') {
+      return 'general'
+    }
+
+    // Check if it's a provider page
+    for (const provider of providers) {
+      if (path === `/settings/websearch/provider/${provider.id}`) {
+        return provider.id
+      }
+    }
+
+    return 'general'
+  }
+
+  const activeView = getActiveView()
+
+  // Filter providers that have API settings (apiKey or apiHost)
+  const apiProviders = providers.filter((p) => hasObjectKey(p, 'apiKey') || hasObjectKey(p, 'apiHost'))
+  const localProviders = providers.filter((p) => p.id.startsWith('local'))
+
+  // Provider logos map
+  const getProviderLogo = (providerId: WebSearchProviderId): string | undefined => {
+    switch (providerId) {
+      case 'zhipu':
+        return ZhipuLogo
+      case 'tavily':
+        return TavilyLogo
+      case 'searxng':
+        return SearxngLogo
+      case 'exa':
+      case 'exa-mcp':
+        return ExaLogo
+      case 'bocha':
+        return BochaLogo
+      case 'local-google':
+        return GoogleLogo
+      case 'local-bing':
+        return BingLogo
+      case 'local-baidu':
+        return BaiduLogo
+      default:
+        return undefined
     }
-    setSelectedProvider(provider)
-    setDefaultProvider(provider)
   }
 
   return (
-    <SettingContainer theme={themeMode}>
-      <SettingGroup theme={themeMode}>
-        <SettingTitle>{t('settings.tool.websearch.title')}</SettingTitle>
-        <SettingDivider />
-        <SettingRow>
-          <SettingRowTitle>{t('settings.tool.websearch.search_provider')}</SettingRowTitle>
-          <div style={{ display: 'flex', gap: '8px' }}>
-            <Selector
-              size={14}
-              value={selectedProvider?.id}
-              onChange={(value: string) => updateSelectedWebSearchProvider(value)}
-              placeholder={t('settings.tool.websearch.search_provider_placeholder')}
-              options={providers.map((p) => ({
-                value: p.id,
-                label: `${p.name} (${hasObjectKey(p, 'apiKey') ? t('settings.tool.websearch.apikey') : t('settings.tool.websearch.free')})`
-              }))}
-            />
-          </div>
-        </SettingRow>
-      </SettingGroup>
-      {!isLocalProvider && (
-        <SettingGroup theme={themeMode}>
-          {selectedProvider && <WebSearchProviderSetting providerId={selectedProvider.id} />}
-        </SettingGroup>
-      )}
-      <BasicSettings />
-      <CompressionSettings />
-      <BlacklistSettings />
-    </SettingContainer>
+    <Container>
+      <MainContainer>
+        <MenuList>
+          <ListItem
+            title={t('settings.tool.websearch.title')}
+            active={activeView === 'general'}
+            onClick={() => navigate('/settings/websearch/general')}
+            icon={<Search size={18} />}
+            titleStyle={{ fontWeight: 500 }}
+          />
+          <DividerWithText text={t('settings.tool.websearch.api_providers')} style={{ margin: '10px 0 8px 0' }} />
+          {apiProviders.map((provider) => {
+            const logo = getProviderLogo(provider.id)
+            const isDefault = defaultProvider?.id === provider.id
+            return (
+              <ListItem
+                key={provider.id}
+                title={provider.name}
+                active={activeView === provider.id}
+                onClick={() => navigate(`/settings/websearch/provider/${provider.id}`)}
+                icon={
+                  logo ? (
+                    <img src={logo} alt={provider.name} className="h-5 w-5 rounded object-contain" />
+                  ) : (
+                    <div className="h-5 w-5 rounded bg-[var(--color-background-soft)]" />
+                  )
+                }
+                titleStyle={{ fontWeight: 500 }}
+                rightContent={
+                  isDefault ? (
+                    <Tag color="green" style={{ marginLeft: 'auto', marginRight: 0, borderRadius: 16 }}>
+                      {t('common.default')}
+                    </Tag>
+                  ) : undefined
+                }
+              />
+            )
+          })}
+          {localProviders.length > 0 && (
+            <>
+              <DividerWithText text={t('settings.tool.websearch.local_providers')} style={{ margin: '10px 0 8px 0' }} />
+              {localProviders.map((provider) => {
+                const logo = getProviderLogo(provider.id)
+                const isDefault = defaultProvider?.id === provider.id
+                return (
+                  <ListItem
+                    key={provider.id}
+                    title={provider.name}
+                    active={activeView === provider.id}
+                    onClick={() => navigate(`/settings/websearch/provider/${provider.id}`)}
+                    icon={
+                      logo ? (
+                        <img src={logo} alt={provider.name} className="h-5 w-5 rounded object-contain" />
+                      ) : (
+                        <div className="h-5 w-5 rounded bg-[var(--color-background-soft)]" />
+                      )
+                    }
+                    titleStyle={{ fontWeight: 500 }}
+                    rightContent={
+                      isDefault ? (
+                        <Tag color="green" style={{ marginLeft: 'auto', marginRight: 0, borderRadius: 16 }}>
+                          {t('common.default')}
+                        </Tag>
+                      ) : undefined
+                    }
+                  />
+                )
+              })}
+            </>
+          )}
+        </MenuList>
+        <RightContainer>
+          <Routes>
+            <Route index element={<Navigate to="general" replace />} />
+            <Route path="general" element={<WebSearchGeneralSettings />} />
+            <Route path="provider/:providerId" element={<WebSearchProviderSettings />} />
+          </Routes>
+        </RightContainer>
+      </MainContainer>
+    </Container>
   )
 }
+
+const Container = styled(Flex)`
+  flex: 1;
+`
+
+const MainContainer = styled.div`
+  display: flex;
+  flex: 1;
+  flex-direction: row;
+  width: 100%;
+  height: calc(100vh - var(--navbar-height) - 6px);
+  overflow: hidden;
+`
+
+const MenuList = styled(Scrollbar)`
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+  width: var(--settings-width);
+  padding: 12px;
+  padding-bottom: 48px;
+  border-right: 0.5px solid var(--color-border);
+  height: calc(100vh - var(--navbar-height));
+`
+
+const RightContainer = styled.div`
+  flex: 1;
+  position: relative;
+  display: flex;
+`
+
 export default WebSearchSettings
diff --git a/src/renderer/src/pages/store/assistants/presets/AssistantPresetsPage.tsx b/src/renderer/src/pages/store/assistants/presets/AssistantPresetsPage.tsx
index 91ea8cce75..a56c04b152 100644
--- a/src/renderer/src/pages/store/assistants/presets/AssistantPresetsPage.tsx
+++ b/src/renderer/src/pages/store/assistants/presets/AssistantPresetsPage.tsx
@@ -1,7 +1,6 @@
 import { Navbar, NavbarCenter } from '@renderer/components/app/Navbar'
 import { HStack } from '@renderer/components/Layout'
 import ListItem from '@renderer/components/ListItem'
-import GeneralPopup from '@renderer/components/Popups/GeneralPopup'
 import Scrollbar from '@renderer/components/Scrollbar'
 import CustomTag from '@renderer/components/Tags/CustomTag'
 import { useAssistantPresets } from '@renderer/hooks/useAssistantPresets'
@@ -11,7 +10,7 @@ import type { AssistantPreset } from '@renderer/types'
 import { uuid } from '@renderer/utils'
 import { Button, Empty, Flex, Input } from 'antd'
 import { omit } from 'lodash'
-import { Import, Plus, Rss, Search } from 'lucide-react'
+import { Import, Plus, Search, Settings2 } from 'lucide-react'
 import type { FC } from 'react'
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -23,8 +22,8 @@ import { groupTranslations } from './assistantPresetGroupTranslations'
 import AddAssistantPresetPopup from './components/AddAssistantPresetPopup'
 import AssistantPresetCard from './components/AssistantPresetCard'
 import { AssistantPresetGroupIcon } from './components/AssistantPresetGroupIcon'
-import AssistantsSubscribeUrlSettings from './components/AssistantsSubscribeUrlSettings'
 import ImportAssistantPresetPopup from './components/ImportAssistantPresetPopup'
+import ManageAssistantPresetsPopup from './components/ManageAssistantPresetsPopup'
 
 const AssistantPresetsPage: FC = () => {
   const [search, setSearch] = useState('')
@@ -176,13 +175,8 @@ const AssistantPresetsPage: FC = () => {
     }
   }
 
-  const handleSubscribeSettings = () => {
-    GeneralPopup.show({
-      title: t('assistants.presets.settings.title'),
-      content: <AssistantsSubscribeUrlSettings />,
-      footer: null,
-      width: 600
-    })
+  const handleManageAgents = () => {
+    ManageAssistantPresetsPopup.show()
   }
 
   return (
@@ -287,8 +281,8 @@ const AssistantPresetsPage: FC = () => {
               <Button type="text" onClick={handleImportAgent} icon={<Import size={18} color="var(--color-icon)" />}>
                 {t('assistants.presets.import.title')}
               </Button>
-              <Button type="text" onClick={handleSubscribeSettings} icon={<Rss size={18} color="var(--color-icon)" />}>
-                {t('assistants.presets.settings.title')}
+              <Button type="text" onClick={handleManageAgents} icon={<Settings2 size={18} color="var(--color-icon)" />}>
+                {t('assistants.presets.manage.title')}
               </Button>
               <Button type="text" onClick={handleAddAgent} icon={<Plus size={18} color="var(--color-icon)" />}>
                 {t('assistants.presets.add.title')}
diff --git a/src/renderer/src/pages/store/assistants/presets/assistantPresetGroupTranslations.ts b/src/renderer/src/pages/store/assistants/presets/assistantPresetGroupTranslations.ts
index 953871ab30..7305585be4 100644
--- a/src/renderer/src/pages/store/assistants/presets/assistantPresetGroupTranslations.ts
+++ b/src/renderer/src/pages/store/assistants/presets/assistantPresetGroupTranslations.ts
@@ -11,6 +11,7 @@ export type GroupTranslations = {
     'ru-RU': string
     'ja-JP': string
     'pt-PT': string
+    'ro-RO': string
   }
 }
 
@@ -25,7 +26,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '我的',
     'ru-RU': 'Мои агенты',
     'ja-JP': '私のエージェント',
-    'pt-PT': 'Meus Agentes'
+    'pt-PT': 'Meus Agentes',
+    'ro-RO': 'Mă'
   },
   职业: {
     'el-GR': 'Επαγγελμα',
@@ -37,7 +39,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '職業',
     'ru-RU': 'Карьера',
     'ja-JP': 'キャリア',
-    'pt-PT': 'Profissional'
+    'pt-PT': 'Profissional',
+    'ro-RO': 'Profesional'
   },
   商业: {
     'el-GR': 'Εμπορικός',
@@ -49,7 +52,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '商業',
     'ru-RU': 'Бизнес',
     'ja-JP': 'ビジネス',
-    'pt-PT': 'Negócio'
+    'pt-PT': 'Negócio',
+    'ro-RO': 'Comercial'
   },
   工具: {
     'el-GR': 'Εργαλεία',
@@ -61,7 +65,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '工具',
     'ru-RU': 'Инструменты',
     'ja-JP': 'ツール',
-    'pt-PT': 'Ferramentas'
+    'pt-PT': 'Ferramentas',
+    'ro-RO': 'Utilitare'
   },
   语言: {
     'el-GR': 'Γλώσσα',
@@ -73,7 +78,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '語言',
     'ru-RU': 'Язык',
     'ja-JP': '言語',
-    'pt-PT': 'Idioma'
+    'pt-PT': 'Idioma',
+    'ro-RO': 'Limba'
   },
   办公: {
     'el-GR': 'Γραφείο',
@@ -85,7 +91,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '辦公',
     'ru-RU': 'Офис',
     'ja-JP': 'オフィス',
-    'pt-PT': 'Escritório'
+    'pt-PT': 'Escritório',
+    'ro-RO': 'Oficiu'
   },
   通用: {
     'el-GR': 'Γενικά',
@@ -97,7 +104,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '通用',
     'ru-RU': 'Общее',
     'ja-JP': '一般',
-    'pt-PT': 'Geral'
+    'pt-PT': 'Geral',
+    'ro-RO': 'General'
   },
   写作: {
     'el-GR': 'Γράφημα',
@@ -109,7 +117,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '寫作',
     'ru-RU': 'Письмо',
     'ja-JP': '書き込み',
-    'pt-PT': 'Escrita'
+    'pt-PT': 'Escrita',
+    'ro-RO': 'Scrisoare'
   },
   精选: {
     'el-GR': 'Επιλεγμένο',
@@ -121,7 +130,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '精選',
     'ru-RU': 'Избранное',
     'ja-JP': '特集',
-    'pt-PT': 'Destaque'
+    'pt-PT': 'Destaque',
+    'ro-RO': 'Recomandat'
   },
   编程: {
     'el-GR': 'Προγραμματισμός',
@@ -133,7 +143,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '編程',
     'ru-RU': 'Программирование',
     'ja-JP': 'プログラミング',
-    'pt-PT': 'Programação'
+    'pt-PT': 'Programação',
+    'ro-RO': 'Programare'
   },
   情感: {
     'el-GR': 'Αίσθημα',
@@ -145,7 +156,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '情感',
     'ru-RU': 'Эмоции',
     'ja-JP': '感情',
-    'pt-PT': 'Emoção'
+    'pt-PT': 'Emoção',
+    'ro-RO': 'Emoție'
   },
   教育: {
     'el-GR': 'Εκπαίδευση',
@@ -157,7 +169,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '教育',
     'ru-RU': 'Образование',
     'ja-JP': '教育',
-    'pt-PT': 'Educação'
+    'pt-PT': 'Educação',
+    'ro-RO': 'Educație'
   },
   创意: {
     'el-GR': 'Κreativiteit',
@@ -169,7 +182,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '創意',
     'ru-RU': 'Креатив',
     'ja-JP': 'クリエイティブ',
-    'pt-PT': 'Criativo'
+    'pt-PT': 'Criativo',
+    'ro-RO': 'Creativ'
   },
   学术: {
     'el-GR': 'Ακαδημικός',
@@ -181,7 +195,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '學術',
     'ru-RU': 'Академический',
     'ja-JP': 'アカデミック',
-    'pt-PT': 'Académico'
+    'pt-PT': 'Académico',
+    'ro-RO': 'Academic'
   },
   设计: {
     'el-GR': 'Δημιουργικό',
@@ -193,7 +208,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '設計',
     'ru-RU': 'Дизайн',
     'ja-JP': 'デザイン',
-    'pt-PT': 'Design'
+    'pt-PT': 'Design',
+    'ro-RO': 'Design'
   },
   艺术: {
     'el-GR': 'Τέχνη',
@@ -205,7 +221,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '藝術',
     'ru-RU': 'Искусство',
     'ja-JP': 'アート',
-    'pt-PT': 'Arte'
+    'pt-PT': 'Arte',
+    'ro-RO': 'Art'
   },
   娱乐: {
     'el-GR': 'Αναψυχή',
@@ -217,7 +234,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '娛樂',
     'ru-RU': 'Развлечения',
     'ja-JP': 'エンターテイメント',
-    'pt-PT': 'Entretenimento'
+    'pt-PT': 'Entretenimento',
+    'ro-RO': 'Entertainment'
   },
   生活: {
     'el-GR': 'Ζωή',
@@ -229,7 +247,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '生活',
     'ru-RU': 'Жизнь',
     'ja-JP': '生活',
-    'pt-PT': 'Vida'
+    'pt-PT': 'Vida',
+    'ro-RO': 'Life'
   },
   医疗: {
     'el-GR': 'Υγεία',
@@ -241,7 +260,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '醫療',
     'ru-RU': 'Медицина',
     'ja-JP': '医療',
-    'pt-PT': 'Saúde'
+    'pt-PT': 'Saúde',
+    'ro-RO': 'Medical'
   },
   游戏: {
     'el-GR': 'Παιχνίδια',
@@ -253,7 +273,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '遊戲',
     'ru-RU': 'Игры',
     'ja-JP': 'ゲーム',
-    'pt-PT': 'Jogos'
+    'pt-PT': 'Jogos',
+    'ro-RO': 'Games'
   },
   翻译: {
     'el-GR': 'Γραφήματα',
@@ -265,7 +286,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '翻譯',
     'ru-RU': 'Перевод',
     'ja-JP': '翻訳',
-    'pt-PT': 'Tradução'
+    'pt-PT': 'Tradução',
+    'ro-RO': 'Translation'
   },
   音乐: {
     'el-GR': 'Μουσική',
@@ -277,7 +299,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '音樂',
     'ru-RU': 'Музыка',
     'ja-JP': '音楽',
-    'pt-PT': 'Música'
+    'pt-PT': 'Música',
+    'ro-RO': 'Music'
   },
   点评: {
     'el-GR': 'Αξιολόγηση',
@@ -289,7 +312,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '點評',
     'ru-RU': 'Обзор',
     'ja-JP': 'レビュー',
-    'pt-PT': 'Revisão'
+    'pt-PT': 'Revisão',
+    'ro-RO': 'Review'
   },
   文案: {
     'el-GR': 'Γραφήματα',
@@ -301,7 +325,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '文案',
     'ru-RU': 'Копирайтинг',
     'ja-JP': 'コピーライティング',
-    'pt-PT': 'Escrita'
+    'pt-PT': 'Escrita',
+    'ro-RO': 'Copywriting'
   },
   百科: {
     'el-GR': 'Εγκυκλοπαίδεια',
@@ -313,7 +338,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '百科',
     'ru-RU': 'Энциклопедия',
     'ja-JP': '百科事典',
-    'pt-PT': 'Enciclopédia'
+    'pt-PT': 'Enciclopédia',
+    'ro-RO': 'Encyclopedia'
   },
   健康: {
     'el-GR': 'Υγεία',
@@ -325,7 +351,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '健康',
     'ru-RU': 'Здоровье',
     'ja-JP': '健康',
-    'pt-PT': 'Saúde'
+    'pt-PT': 'Saúde',
+    'ro-RO': 'Health'
   },
   营销: {
     'el-GR': 'Μάρκετινγκ',
@@ -337,7 +364,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '營銷',
     'ru-RU': 'Маркетинг',
     'ja-JP': 'マーケティング',
-    'pt-PT': 'Marketing'
+    'pt-PT': 'Marketing',
+    'ro-RO': 'Marketing'
   },
   科学: {
     'el-GR': 'Επιστήμη',
@@ -349,7 +377,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '科學',
     'ru-RU': 'Наука',
     'ja-JP': '科学',
-    'pt-PT': 'Ciência'
+    'pt-PT': 'Ciência',
+    'ro-RO': 'Science'
   },
   分析: {
     'el-GR': 'Ανάλυση',
@@ -361,7 +390,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '分析',
     'ru-RU': 'Анализ',
     'ja-JP': '分析',
-    'pt-PT': 'Análise'
+    'pt-PT': 'Análise',
+    'ro-RO': 'Analysis'
   },
   法律: {
     'el-GR': 'Νόμος',
@@ -373,7 +403,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '法律',
     'ru-RU': 'Право',
     'ja-JP': '法律',
-    'pt-PT': 'Legal'
+    'pt-PT': 'Legal',
+    'ro-RO': 'Legal'
   },
   咨询: {
     'el-GR': 'Συμβουλή',
@@ -385,7 +416,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '諮詢',
     'ru-RU': 'Консалтинг',
     'ja-JP': 'コンサルティング',
-    'pt-PT': 'Consultoria'
+    'pt-PT': 'Consultoria',
+    'ro-RO': 'Consulting'
   },
   金融: {
     'el-GR': 'Φορολογία',
@@ -397,7 +429,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '金融',
     'ru-RU': 'Финансы',
     'ja-JP': '金融',
-    'pt-PT': 'Finanças'
+    'pt-PT': 'Finanças',
+    'ro-RO': 'Finance'
   },
   旅游: {
     'el-GR': 'Τουρισμός',
@@ -409,7 +442,8 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '旅遊',
     'ru-RU': 'Путешествия',
     'ja-JP': '旅行',
-    'pt-PT': 'Viagens'
+    'pt-PT': 'Viagens',
+    'ro-RO': 'Travel'
   },
   管理: {
     'el-GR': 'Διοίκηση',
@@ -421,6 +455,7 @@ export const groupTranslations: GroupTranslations = {
     'zh-TW': '管理',
     'ru-RU': 'Управление',
     'ja-JP': '管理',
-    'pt-PT': 'Gestão'
+    'pt-PT': 'Gestão',
+    'ro-RO': 'Management'
   }
 }
diff --git a/src/renderer/src/pages/store/assistants/presets/components/AssistantPresetCard.tsx b/src/renderer/src/pages/store/assistants/presets/components/AssistantPresetCard.tsx
index 25b81cf38a..908c0c9f32 100644
--- a/src/renderer/src/pages/store/assistants/presets/components/AssistantPresetCard.tsx
+++ b/src/renderer/src/pages/store/assistants/presets/components/AssistantPresetCard.tsx
@@ -7,7 +7,8 @@ import type { AssistantPreset } from '@renderer/types'
 import { getLeadingEmoji } from '@renderer/utils'
 import { Button, Dropdown } from 'antd'
 import { t } from 'i18next'
-import { ArrowDownAZ, Ellipsis, PlusIcon, SquareArrowOutUpRight } from 'lucide-react'
+import { isArray } from 'lodash'
+import { Ellipsis, PlusIcon, Settings2, SquareArrowOutUpRight } from 'lucide-react'
 import { type FC, memo, useCallback, useEffect, useRef, useState } from 'react'
 import styled from 'styled-components'
 
@@ -76,9 +77,9 @@ const AssistantPresetCard: FC<Props> = ({ preset, onClick, activegroup, getLocal
       }
     },
     {
-      key: 'sort',
-      label: t('assistants.presets.sorting.title'),
-      icon: <ArrowDownAZ size={14} />,
+      key: 'manage',
+      label: t('assistants.presets.manage.title'),
+      icon: <Settings2 size={14} />,
       onClick: (e: any) => {
         e.domEvent.stopPropagation()
         ManageAssistantPresetsPopup.show()
@@ -142,7 +143,7 @@ const AssistantPresetCard: FC<Props> = ({ preset, onClick, activegroup, getLocal
                     {getLocalizedGroupName('我的')}
                   </CustomTag>
                 )}
-                {!!preset.group?.length &&
+                {isArray(preset.group) &&
                   preset.group.map((group) => (
                     <CustomTag key={group} color="#A0A0A0" size={11}>
                       {getLocalizedGroupName(group)}
diff --git a/src/renderer/src/pages/store/assistants/presets/components/AssistantsSubscribeUrlSettings.tsx b/src/renderer/src/pages/store/assistants/presets/components/AssistantsSubscribeUrlSettings.tsx
deleted file mode 100755
index 8ea3b92fde..0000000000
--- a/src/renderer/src/pages/store/assistants/presets/components/AssistantsSubscribeUrlSettings.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { HStack } from '@renderer/components/Layout'
-import { useTheme } from '@renderer/context/ThemeProvider'
-import { useSettings } from '@renderer/hooks/useSettings'
-import { SettingDivider, SettingGroup, SettingRow, SettingRowTitle, SettingTitle } from '@renderer/pages/settings'
-import { useAppDispatch } from '@renderer/store'
-import { setAgentssubscribeUrl } from '@renderer/store/settings'
-import Input from 'antd/es/input/Input'
-import { HelpCircle } from 'lucide-react'
-import type { FC } from 'react'
-import { useTranslation } from 'react-i18next'
-
-const AssistantsSubscribeUrlSettings: FC = () => {
-  const { t } = useTranslation()
-  const { theme } = useTheme()
-  const dispatch = useAppDispatch()
-
-  const { agentssubscribeUrl } = useSettings()
-
-  const handleAgentChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    dispatch(setAgentssubscribeUrl(e.target.value))
-  }
-
-  const handleHelpClick = () => {
-    window.open('https://docs.cherry-ai.com/data-settings/assistants-subscribe', '_blank')
-  }
-
-  return (
-    <SettingGroup theme={theme}>
-      <HStack alignItems="center" gap="8px">
-        <SettingTitle>
-          {t('assistants.presets.tag.agent')}
-          {t('settings.tool.websearch.subscribe_add')}
-        </SettingTitle>
-        <HelpCircle
-          size={16}
-          color="var(--color-icon)"
-          onClick={handleHelpClick}
-          className="hover:!text-[var(--color-primary)] cursor-pointer transition-colors"
-        />
-      </HStack>
-      <SettingDivider />
-      <SettingRow>
-        <SettingRowTitle>{t('settings.tool.websearch.subscribe_url')}</SettingRowTitle>
-        <HStack alignItems="center" gap="5px" style={{ width: 315 }}>
-          <Input
-            type="text"
-            value={agentssubscribeUrl || ''}
-            onChange={handleAgentChange}
-            style={{ width: 315 }}
-            placeholder={t('settings.tool.websearch.subscribe_url')}
-          />
-        </HStack>
-      </SettingRow>
-    </SettingGroup>
-  )
-}
-
-export default AssistantsSubscribeUrlSettings
diff --git a/src/renderer/src/pages/store/assistants/presets/components/ImportAssistantPresetPopup.tsx b/src/renderer/src/pages/store/assistants/presets/components/ImportAssistantPresetPopup.tsx
index 9a76d1d02e..37b7938248 100644
--- a/src/renderer/src/pages/store/assistants/presets/components/ImportAssistantPresetPopup.tsx
+++ b/src/renderer/src/pages/store/assistants/presets/components/ImportAssistantPresetPopup.tsx
@@ -1,11 +1,15 @@
 import { TopView } from '@renderer/components/TopView'
 import { useAssistantPresets } from '@renderer/hooks/useAssistantPresets'
+import { useSettings } from '@renderer/hooks/useSettings'
 import { useTimer } from '@renderer/hooks/useTimer'
 import { getDefaultModel } from '@renderer/services/AssistantService'
 import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
+import { useAppDispatch } from '@renderer/store'
+import { setAgentssubscribeUrl } from '@renderer/store/settings'
 import type { AssistantPreset } from '@renderer/types'
 import { uuid } from '@renderer/utils'
-import { Button, Flex, Form, Input, Modal, Radio } from 'antd'
+import { Button, Divider, Flex, Form, Input, Modal, Radio, Typography } from 'antd'
+import { HelpCircle } from 'lucide-react'
 import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
@@ -20,35 +24,53 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
   const { addAssistantPreset } = useAssistantPresets()
   const [importType, setImportType] = useState<'url' | 'file'>('url')
   const [loading, setLoading] = useState(false)
+  const [subscribeLoading, setSubscribeLoading] = useState(false)
   const { setTimeoutTimer } = useTimer()
+  const dispatch = useAppDispatch()
+  const { agentssubscribeUrl } = useSettings()
+  const [subscribeUrl, setSubscribeUrl] = useState(agentssubscribeUrl || '')
+  const [selectedFile, setSelectedFile] = useState<{ name: string; content: Uint8Array } | null>(null)
+  const [urlValue, setUrlValue] = useState('')
+
+  const isImportDisabled = importType === 'url' ? !urlValue.trim() : !selectedFile
+  const isSubscribed = !!agentssubscribeUrl
+
+  const handleSelectFile = async () => {
+    const result = await window.api.file.open({
+      filters: [{ name: t('assistants.presets.import.file_filter'), extensions: ['json'] }]
+    })
+
+    if (result) {
+      setSelectedFile({ name: result.fileName, content: result.content })
+    }
+  }
+
+  const onFinish = async () => {
+    // Validate before setting loading
+    if (importType === 'url' && !urlValue.trim()) {
+      window.toast.error(t('assistants.presets.import.error.url_required'))
+      return
+    }
+    if (importType === 'file' && !selectedFile) {
+      window.toast.error(t('assistants.presets.import.error.file_required'))
+      return
+    }
 
-  const onFinish = async (values: { url?: string }) => {
     setLoading(true)
     try {
       let presets: AssistantPreset[] = []
 
       if (importType === 'url') {
-        if (!values.url) {
-          throw new Error(t('assistants.presets.import.error.url_required'))
-        }
-        const response = await fetch(values.url)
+        const response = await fetch(urlValue.trim())
         if (!response.ok) {
           throw new Error(t('assistants.presets.import.error.fetch_failed'))
         }
         const data = await response.json()
         presets = Array.isArray(data) ? data : [data]
       } else {
-        const result = await window.api.file.open({
-          filters: [{ name: t('assistants.presets.import.file_filter'), extensions: ['json'] }]
-        })
-
-        if (result) {
-          presets = JSON.parse(new TextDecoder('utf-8').decode(result.content))
-          if (!Array.isArray(presets)) {
-            presets = [presets]
-          }
-        } else {
-          return
+        presets = JSON.parse(new TextDecoder('utf-8').decode(selectedFile!.content))
+        if (!Array.isArray(presets)) {
+          presets = [presets]
         }
       }
 
@@ -74,7 +96,7 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
         addAssistantPreset(newPreset)
       }
 
-      window.toast.success(t('message.agents.imported'))
+      window.toast.success(t('message.agents.imported', { count: presets.length }))
 
       setTimeoutTimer('onFinish', () => EventEmitter.emit(EVENT_NAMES.SHOW_ASSISTANTS), 0)
       setOpen(false)
@@ -88,7 +110,42 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
 
   const onCancel = () => {
     setOpen(false)
-    resolve(null)
+  }
+
+  const handleSubscribeUrlChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    setSubscribeUrl(e.target.value)
+  }
+
+  const handleSubscribe = async () => {
+    // If already subscribed, unsubscribe
+    if (isSubscribed) {
+      dispatch(setAgentssubscribeUrl(''))
+      setSubscribeUrl('')
+      window.location.reload()
+      return
+    }
+
+    if (!subscribeUrl.trim()) {
+      return
+    }
+
+    setSubscribeLoading(true)
+    try {
+      const response = await fetch(subscribeUrl)
+      if (!response.ok) {
+        throw new Error(t('assistants.presets.import.error.fetch_failed'))
+      }
+      dispatch(setAgentssubscribeUrl(subscribeUrl))
+      window.location.reload()
+    } catch (error) {
+      window.toast.error(error instanceof Error ? error.message : t('message.agents.import.error'))
+    } finally {
+      setSubscribeLoading(false)
+    }
+  }
+
+  const handleHelpClick = () => {
+    window.open('https://docs.cherry-ai.com/data-settings/assistants-subscribe', '_blank')
   }
 
   return (
@@ -96,39 +153,79 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
       title={t('assistants.presets.import.title')}
       open={open}
       onCancel={onCancel}
-      maskClosable={false}
-      footer={
-        <Flex justify="end" gap={8}>
-          <Button onClick={onCancel}>{t('common.cancel')}</Button>
-          <Button type="primary" onClick={() => form.submit()} loading={loading}>
-            {t('assistants.presets.import.button')}
-          </Button>
-        </Flex>
-      }
+      afterClose={() => resolve(null)}
+      footer={null}
       transitionName="animation-move-down"
+      styles={{ body: { padding: '16px' } }}
       centered>
       <Form form={form} onFinish={onFinish} layout="vertical">
-        <Form.Item>
-          <Radio.Group value={importType} onChange={(e) => setImportType(e.target.value)}>
-            <Radio.Button value="url">{t('assistants.presets.import.type.url')}</Radio.Button>
-            <Radio.Button value="file">{t('assistants.presets.import.type.file')}</Radio.Button>
-          </Radio.Group>
+        <Form.Item style={{ marginBottom: 0 }}>
+          <Flex align="center" gap={12} style={{ width: '100%' }}>
+            <Radio.Group value={importType} onChange={(e) => setImportType(e.target.value)}>
+              <Radio.Button value="url">{t('assistants.presets.import.type.url')}</Radio.Button>
+              <Radio.Button value="file">{t('assistants.presets.import.type.file')}</Radio.Button>
+            </Radio.Group>
+
+            {importType === 'url' && (
+              <Form.Item
+                name="url"
+                rules={[{ required: true, message: t('assistants.presets.import.error.url_required') }]}
+                style={{ flex: 1, marginBottom: 0 }}>
+                <Input
+                  placeholder={t('assistants.presets.import.url_placeholder')}
+                  value={urlValue}
+                  onChange={(e) => setUrlValue(e.target.value)}
+                />
+              </Form.Item>
+            )}
+
+            {importType === 'file' && (
+              <>
+                <Button onClick={handleSelectFile}>{t('assistants.presets.import.select_file')}</Button>
+                {selectedFile && (
+                  <Typography.Text type="secondary" ellipsis style={{ maxWidth: 200 }}>
+                    {selectedFile.name}
+                  </Typography.Text>
+                )}
+                <div style={{ flex: 1 }} />
+              </>
+            )}
+
+            <Button type="primary" onClick={onFinish} loading={loading} disabled={isImportDisabled}>
+              {t('assistants.presets.import.button')}
+            </Button>
+          </Flex>
         </Form.Item>
-
-        {importType === 'url' && (
-          <Form.Item
-            name="url"
-            rules={[{ required: true, message: t('assistants.presets.import.error.url_required') }]}>
-            <Input placeholder={t('assistants.presets.import.url_placeholder')} />
-          </Form.Item>
-        )}
-
-        {importType === 'file' && (
-          <Form.Item>
-            <Button onClick={() => form.submit()}>{t('assistants.presets.import.select_file')}</Button>
-          </Form.Item>
-        )}
       </Form>
+
+      <Divider style={{ margin: '16px 0' }} />
+
+      <Flex align="center" gap={4}>
+        <Typography.Text strong style={{ flexShrink: 0, fontSize: 16 }}>
+          {t('assistants.presets.tag.agent')}
+          {t('settings.tool.websearch.subscribe_add')}
+        </Typography.Text>
+        <HelpCircle
+          size={16}
+          color="var(--color-icon)"
+          onClick={handleHelpClick}
+          className="hover:!text-[var(--color-primary)] cursor-pointer transition-colors"
+          style={{ flexShrink: 0 }}
+        />
+      </Flex>
+
+      <Flex align="center" gap={12} style={{ marginTop: 10 }}>
+        <Input
+          type="text"
+          value={subscribeUrl}
+          onChange={handleSubscribeUrlChange}
+          style={{ flex: 1 }}
+          placeholder={t('settings.tool.websearch.subscribe_url')}
+        />
+        <Button type="primary" onClick={handleSubscribe} loading={subscribeLoading} disabled={!subscribeUrl.trim()}>
+          {isSubscribed ? t('common.unsubscribe') : t('common.subscribe')}
+        </Button>
+      </Flex>
     </Modal>
   )
 }
diff --git a/src/renderer/src/pages/store/assistants/presets/components/ManageAssistantPresetsPopup.tsx b/src/renderer/src/pages/store/assistants/presets/components/ManageAssistantPresetsPopup.tsx
index 760336849e..961ec24abe 100644
--- a/src/renderer/src/pages/store/assistants/presets/components/ManageAssistantPresetsPopup.tsx
+++ b/src/renderer/src/pages/store/assistants/presets/components/ManageAssistantPresetsPopup.tsx
@@ -1,21 +1,23 @@
-import { MenuOutlined } from '@ant-design/icons'
+import { ExportOutlined, MenuOutlined } from '@ant-design/icons'
 import { DraggableList } from '@renderer/components/DraggableList'
+import { DeleteIcon } from '@renderer/components/Icons'
 import { Box, HStack } from '@renderer/components/Layout'
 import { TopView } from '@renderer/components/TopView'
 import { useAssistantPresets } from '@renderer/hooks/useAssistantPresets'
-import { Empty, Modal } from 'antd'
-import { useEffect, useState } from 'react'
+import type { AssistantPreset } from '@renderer/types'
+import { Button, Checkbox, Empty, Modal, Segmented } from 'antd'
+import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
+type Mode = 'sort' | 'manage'
+
 const PopupContainer: React.FC = () => {
   const [open, setOpen] = useState(true)
   const { t } = useTranslation()
   const { presets, setAssistantPresets } = useAssistantPresets()
-
-  const onOk = () => {
-    setOpen(false)
-  }
+  const [mode, setMode] = useState<Mode>('manage')
+  const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set())
 
   const onCancel = () => {
     setOpen(false)
@@ -25,36 +27,180 @@ const PopupContainer: React.FC = () => {
     ManageAssistantPresetsPopup.hide()
   }
 
-  useEffect(() => {
-    if (presets.length === 0) {
-      setOpen(false)
+  const handleModeChange = (value: Mode) => {
+    setMode(value)
+    setSelectedIds(new Set())
+  }
+
+  const handleSelectAll = () => {
+    if (selectedIds.size === presets.length) {
+      setSelectedIds(new Set())
+    } else {
+      setSelectedIds(new Set(presets.map((p) => p.id)))
     }
-  }, [presets])
+  }
+
+  const handleSelectNext100 = () => {
+    // Find the last selected preset's index
+    let startIndex = 0
+    if (selectedIds.size > 0) {
+      for (let i = presets.length - 1; i >= 0; i--) {
+        if (selectedIds.has(presets[i].id)) {
+          startIndex = i + 1
+          break
+        }
+      }
+    }
+
+    // Select next 100 unselected presets starting from startIndex
+    const newSelected = new Set(selectedIds)
+    let count = 0
+    for (let i = startIndex; i < presets.length && count < 100; i++) {
+      if (!newSelected.has(presets[i].id)) {
+        newSelected.add(presets[i].id)
+        count++
+      }
+    }
+    setSelectedIds(newSelected)
+  }
+
+  const handleSelect = (preset: AssistantPreset) => {
+    const newSelected = new Set(selectedIds)
+    if (newSelected.has(preset.id)) {
+      newSelected.delete(preset.id)
+    } else {
+      newSelected.add(preset.id)
+    }
+    setSelectedIds(newSelected)
+  }
+
+  const handleBatchDelete = () => {
+    if (selectedIds.size === 0) return
+
+    window.modal.confirm({
+      centered: true,
+      content: t('assistants.presets.manage.batch_delete.confirm', { count: selectedIds.size }),
+      onOk: () => {
+        const remainingPresets = presets.filter((p) => !selectedIds.has(p.id))
+        setAssistantPresets(remainingPresets)
+        setSelectedIds(new Set())
+      }
+    })
+  }
+
+  const handleBatchExport = async () => {
+    if (selectedIds.size === 0) return
+
+    const selectedPresets = presets.filter((p) => selectedIds.has(p.id))
+    const exportData = selectedPresets.map((p) => ({
+      name: p.name,
+      emoji: p.emoji,
+      prompt: p.prompt,
+      description: p.description,
+      group: p.group
+    }))
+
+    const fileName = selectedIds.size === 1 ? `${selectedPresets[0].name}.json` : `assistants_${selectedIds.size}.json`
+
+    await window.api.file.save(fileName, JSON.stringify(exportData, null, 2))
+  }
+
+  const isAllSelected = presets.length > 0 && selectedIds.size === presets.length
+  const isIndeterminate = selectedIds.size > 0 && selectedIds.size < presets.length
 
   return (
     <Modal
       title={t('assistants.presets.manage.title')}
       open={open}
-      onOk={onOk}
       onCancel={onCancel}
       afterClose={onClose}
       footer={null}
+      width={600}
       transitionName="animation-move-down"
       centered>
       <Container>
         {presets.length > 0 && (
-          <DraggableList list={presets} onUpdate={setAssistantPresets}>
-            {(item) => (
-              <AgentItem>
-                <Box mr={8}>
-                  {item.emoji} {item.name}
-                </Box>
-                <HStack gap="15px">
-                  <MenuOutlined style={{ cursor: 'move' }} />
+          <>
+            <ActionBar>
+              {mode === 'manage' ? (
+                <HStack alignItems="center">
+                  <Checkbox checked={isAllSelected} indeterminate={isIndeterminate} onChange={handleSelectAll}>
+                    {t('common.select_all')}
+                  </Checkbox>
+                  {presets.length > 100 && selectedIds.size < presets.length && (
+                    <Button type="link" size="small" onClick={handleSelectNext100} style={{ padding: 0 }}>
+                      +100
+                    </Button>
+                  )}
                 </HStack>
-              </AgentItem>
+              ) : (
+                <div />
+              )}
+              <HStack gap="8px" alignItems="center">
+                {mode === 'manage' && (
+                  <>
+                    <Button
+                      type="text"
+                      icon={<ExportOutlined />}
+                      disabled={selectedIds.size === 0}
+                      onClick={handleBatchExport}>
+                      {t('assistants.presets.manage.batch_export.button')} ({selectedIds.size})
+                    </Button>
+                    <Button
+                      danger
+                      type="text"
+                      icon={<DeleteIcon size={14} />}
+                      disabled={selectedIds.size === 0}
+                      onClick={handleBatchDelete}>
+                      {t('assistants.presets.manage.batch_delete.button')} ({selectedIds.size})
+                    </Button>
+                  </>
+                )}
+                <Segmented
+                  size="small"
+                  value={mode}
+                  onChange={(value) => handleModeChange(value as Mode)}
+                  options={[
+                    { label: t('assistants.presets.manage.mode.sort'), value: 'sort' },
+                    { label: t('assistants.presets.manage.mode.manage'), value: 'manage' }
+                  ]}
+                />
+              </HStack>
+            </ActionBar>
+
+            {mode === 'sort' ? (
+              <AgentList>
+                <DraggableList list={presets} onUpdate={setAssistantPresets}>
+                  {(item) => (
+                    <AgentItem>
+                      <Box mr={8}>
+                        {item.emoji} {item.name}
+                      </Box>
+                      <HStack gap="15px">
+                        <MenuOutlined style={{ cursor: 'move' }} />
+                      </HStack>
+                    </AgentItem>
+                  )}
+                </DraggableList>
+              </AgentList>
+            ) : (
+              <AgentList>
+                {presets.map((item) => (
+                  <SelectableAgentItem
+                    key={item.id}
+                    onClick={() => handleSelect(item)}
+                    $selected={selectedIds.has(item.id)}>
+                    <HStack alignItems="center" gap="8px">
+                      <Checkbox checked={selectedIds.has(item.id)} onChange={() => handleSelect(item)} />
+                      <Box>
+                        {item.emoji} {item.name}
+                      </Box>
+                    </HStack>
+                  </SelectableAgentItem>
+                ))}
+              </AgentList>
             )}
-          </DraggableList>
+          </>
         )}
         {presets.length === 0 && <Empty description="" />}
       </Container>
@@ -65,6 +211,21 @@ const PopupContainer: React.FC = () => {
 const Container = styled.div`
   padding: 12px 0;
   height: 50vh;
+  display: flex;
+  flex-direction: column;
+`
+
+const ActionBar = styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 8px 12px;
+  border-bottom: 1px solid var(--color-border);
+  margin-bottom: 12px;
+`
+
+const AgentList = styled.div`
+  flex: 1;
   overflow-y: auto;
   &::-webkit-scrollbar {
     display: none;
@@ -90,6 +251,23 @@ const AgentItem = styled.div`
   }
 `
 
+const SelectableAgentItem = styled.div<{ $selected: boolean }>`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 8px;
+  border-radius: 8px;
+  user-select: none;
+  background-color: ${(props) => (props.$selected ? 'var(--color-primary-mute)' : 'var(--color-background-soft)')};
+  margin-bottom: 8px;
+  cursor: pointer;
+  transition: background-color 0.2s ease;
+  &:hover {
+    background-color: ${(props) => (props.$selected ? 'var(--color-primary-mute)' : 'var(--color-background-mute)')};
+  }
+`
+
 export default class ManageAssistantPresetsPopup {
   static topviewId = 0
   static hide() {
diff --git a/src/renderer/src/pages/translate/TranslatePage.tsx b/src/renderer/src/pages/translate/TranslatePage.tsx
index dd47d41c9b..ce4a4625c1 100644
--- a/src/renderer/src/pages/translate/TranslatePage.tsx
+++ b/src/renderer/src/pages/translate/TranslatePage.tsx
@@ -30,8 +30,7 @@ import {
 } from '@renderer/types'
 import { getFileExtension, isTextFile, runAsyncFunction, uuid } from '@renderer/utils'
 import { abortCompletion } from '@renderer/utils/abortController'
-import { isAbortError } from '@renderer/utils/error'
-import { formatErrorMessage } from '@renderer/utils/error'
+import { formatErrorMessageWithPrefix, isAbortError } from '@renderer/utils/error'
 import { getFilesFromDropEvent, getTextFromDropEvent } from '@renderer/utils/input'
 import {
   createInputScrollHandler,
@@ -181,7 +180,7 @@ const TranslatePage: FC = () => {
             window.toast.info(t('translate.info.aborted'))
           } else {
             logger.error('Failed to translate text', e as Error)
-            window.toast.error(t('translate.error.failed') + ': ' + formatErrorMessage(e))
+            window.toast.error(formatErrorMessageWithPrefix(e, t('translate.error.failed')))
           }
           setTranslating(false)
           return
@@ -202,11 +201,11 @@ const TranslatePage: FC = () => {
           await saveTranslateHistory(text, translated, actualSourceLanguage.langCode, actualTargetLanguage.langCode)
         } catch (e) {
           logger.error('Failed to save translate history', e as Error)
-          window.toast.error(t('translate.history.error.save') + ': ' + formatErrorMessage(e))
+          window.toast.error(formatErrorMessageWithPrefix(e, t('translate.history.error.save')))
         }
       } catch (e) {
         logger.error('Failed to translate', e as Error)
-        window.toast.error(t('translate.error.unknown') + ': ' + formatErrorMessage(e))
+        window.toast.error(formatErrorMessageWithPrefix(e, t('translate.error.unknown')))
       }
     },
     [autoCopy, copy, dispatch, setTimeoutTimer, setTranslatedContent, setTranslating, t, translating]
@@ -266,7 +265,7 @@ const TranslatePage: FC = () => {
       await translate(text, actualSourceLanguage, actualTargetLanguage)
     } catch (error) {
       logger.error('Translation error:', error as Error)
-      window.toast.error(t('translate.error.failed') + ': ' + formatErrorMessage(error))
+      window.toast.error(formatErrorMessageWithPrefix(error, t('translate.error.failed')))
       return
     } finally {
       setTranslating(false)
@@ -427,7 +426,7 @@ const TranslatePage: FC = () => {
       setAutoDetectionMethod(method)
     } catch (e) {
       logger.error('Failed to update auto detection method setting.', e as Error)
-      window.toast.error(t('translate.error.detect.update_setting') + formatErrorMessage(e))
+      window.toast.error(formatErrorMessageWithPrefix(e, t('translate.error.detect.update_setting')))
     }
   }
 
@@ -498,7 +497,7 @@ const TranslatePage: FC = () => {
               isText = await isTextFile(file.path)
             } catch (e) {
               logger.error('Failed to check file type.', e as Error)
-              window.toast.error(t('translate.files.error.check_type') + ': ' + formatErrorMessage(e))
+              window.toast.error(formatErrorMessageWithPrefix(e, t('translate.files.error.check_type')))
               return
             }
           } else {
@@ -530,11 +529,11 @@ const TranslatePage: FC = () => {
             setText(text + result)
           } catch (e) {
             logger.error('Failed to read file.', e as Error)
-            window.toast.error(t('translate.files.error.unknown') + ': ' + formatErrorMessage(e))
+            window.toast.error(formatErrorMessageWithPrefix(e, t('translate.files.error.unknown')))
           }
         } catch (e) {
           logger.error('Failed to read file.', e as Error)
-          window.toast.error(t('translate.files.error.unknown') + ': ' + formatErrorMessage(e))
+          window.toast.error(formatErrorMessageWithPrefix(e, t('translate.files.error.unknown')))
         }
       }
       const promise = _readFile()
@@ -578,7 +577,7 @@ const TranslatePage: FC = () => {
       await processFile(file)
     } catch (e) {
       logger.error('Unknown error when selecting file.', e as Error)
-      window.toast.error(t('translate.files.error.unknown') + ': ' + formatErrorMessage(e))
+      window.toast.error(formatErrorMessageWithPrefix(e, t('translate.files.error.unknown')))
     } finally {
       clearFiles()
       setIsProcessing(false)
diff --git a/src/renderer/src/providers/WebSearchProvider/ExaMcpProvider.ts b/src/renderer/src/providers/WebSearchProvider/ExaMcpProvider.ts
new file mode 100644
index 0000000000..8e04ba0a68
--- /dev/null
+++ b/src/renderer/src/providers/WebSearchProvider/ExaMcpProvider.ts
@@ -0,0 +1,209 @@
+import { loggerService } from '@logger'
+import type { WebSearchState } from '@renderer/store/websearch'
+import type { WebSearchProvider, WebSearchProviderResponse } from '@renderer/types'
+
+import BaseWebSearchProvider from './BaseWebSearchProvider'
+
+const logger = loggerService.withContext('ExaMcpProvider')
+
+interface McpSearchRequest {
+  jsonrpc: string
+  id: number
+  method: string
+  params: {
+    name: string
+    arguments: {
+      query: string
+      numResults?: number
+      livecrawl?: 'fallback' | 'preferred'
+      type?: 'auto' | 'fast' | 'deep'
+    }
+  }
+}
+
+interface McpSearchResponse {
+  jsonrpc: string
+  result: {
+    content: Array<{ type: string; text: string }>
+  }
+}
+
+interface ExaSearchResult {
+  title?: string
+  url?: string
+  text?: string
+  publishedDate?: string
+  author?: string
+}
+
+interface ExaSearchResults {
+  results?: ExaSearchResult[]
+  autopromptString?: string
+}
+
+const DEFAULT_API_HOST = 'https://mcp.exa.ai/mcp'
+const DEFAULT_NUM_RESULTS = 8
+const REQUEST_TIMEOUT_MS = 25000
+
+export default class ExaMcpProvider extends BaseWebSearchProvider {
+  constructor(provider: WebSearchProvider) {
+    super(provider)
+    if (!this.apiHost) {
+      this.apiHost = DEFAULT_API_HOST
+    }
+  }
+
+  public async search(
+    query: string,
+    websearch: WebSearchState,
+    httpOptions?: RequestInit
+  ): Promise<WebSearchProviderResponse> {
+    try {
+      if (!query.trim()) {
+        throw new Error('Search query cannot be empty')
+      }
+
+      const searchRequest: McpSearchRequest = {
+        jsonrpc: '2.0',
+        id: 1,
+        method: 'tools/call',
+        params: {
+          name: 'web_search_exa',
+          arguments: {
+            query,
+            type: 'auto',
+            numResults: websearch.maxResults || DEFAULT_NUM_RESULTS,
+            livecrawl: 'fallback'
+          }
+        }
+      }
+
+      const controller = new AbortController()
+      const timeoutId = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS)
+
+      try {
+        const response = await fetch(this.apiHost!, {
+          method: 'POST',
+          headers: {
+            ...this.defaultHeaders(),
+            accept: 'application/json, text/event-stream',
+            'content-type': 'application/json'
+          },
+          body: JSON.stringify(searchRequest),
+          signal: httpOptions?.signal ? AbortSignal.any([controller.signal, httpOptions.signal]) : controller.signal
+        })
+
+        clearTimeout(timeoutId)
+
+        if (!response.ok) {
+          const errorText = await response.text()
+          throw new Error(`Search error (${response.status}): ${errorText}`)
+        }
+
+        const responseText = await response.text()
+        const searchResults = this.parseResponse(responseText)
+
+        return {
+          query: searchResults.autopromptString || query,
+          results: (searchResults.results || []).slice(0, websearch.maxResults).map((result) => ({
+            title: result.title || 'No title',
+            content: result.text || '',
+            url: result.url || ''
+          }))
+        }
+      } catch (error) {
+        clearTimeout(timeoutId)
+
+        if (error instanceof Error && error.name === 'AbortError') {
+          throw new Error('Search request timed out')
+        }
+
+        throw error
+      }
+    } catch (error) {
+      logger.error('Exa MCP search failed:', error as Error)
+      throw new Error(`Search failed: ${error instanceof Error ? error.message : 'Unknown error'}`)
+    }
+  }
+
+  private parsetextChunk(raw: string): ExaSearchResult[] {
+    const items: ExaSearchResult[] = []
+    for (const chunk of raw.split('\n\n')) {
+      // logger.debug('Parsing chunk:', {"chunks": chunk})
+      // 3. Parse the labeled lines inside the text block
+      const lines = chunk.split('\n')
+      // logger.debug('Lines:', lines);
+      let title = ''
+      let publishedDate = ''
+      let url = ''
+      let fullText = ''
+
+      // We’ll capture everything after the first "Text:" as the article text
+      let textStartIndex = -1
+
+      lines.forEach((line, idx) => {
+        if (line.startsWith('Title:')) {
+          title = line.replace(/^Title:\s*/, '')
+        } else if (line.startsWith('Published Date:')) {
+          publishedDate = line.replace(/^Published Date:\s*/, '')
+        } else if (line.startsWith('URL:')) {
+          url = line.replace(/^URL:\s*/, '')
+        } else if (line.startsWith('Text:') && textStartIndex === -1) {
+          // mark where "Text:" starts
+          textStartIndex = idx
+          // text on the same line after "Text: "
+          fullText = line.replace(/^Text:\s*/, '')
+        }
+      })
+      if (textStartIndex !== -1) {
+        const rest = lines.slice(textStartIndex + 1).join('\n')
+        if (rest.trim().length > 0) {
+          fullText = (fullText ? fullText + '\n' : '') + rest
+        }
+      }
+
+      // If we at least got a title or URL, treat it as a valid article
+      if (title || url || fullText) {
+        items.push({
+          title,
+          publishedDate,
+          url,
+          text: fullText
+        })
+      }
+    }
+    return items
+  }
+
+  private parseResponse(responseText: string): ExaSearchResults {
+    // Parse SSE response format
+    const lines = responseText.split('\n')
+    for (const line of lines) {
+      if (line.startsWith('data: ')) {
+        try {
+          const data: McpSearchResponse = JSON.parse(line.substring(6))
+          if (data.result?.content?.[0]?.text) {
+            // The text content contains stringified JSON with the actual results
+            return { results: this.parsetextChunk(data.result.content[0].text) }
+          }
+        } catch {
+          // Continue to next line if parsing fails
+          logger.warn('Failed to parse SSE line:', { line })
+        }
+      }
+    }
+
+    // Try parsing as direct JSON response (non-SSE)
+    try {
+      const data: McpSearchResponse = JSON.parse(responseText)
+      if (data.result?.content?.[0]?.text) {
+        return { results: this.parsetextChunk(data.result.content[0].text) }
+      }
+    } catch {
+      // Ignore parsing errors
+      logger.warn('Failed to parse direct JSON response:', { responseText })
+    }
+
+    return { results: [] }
+  }
+}
diff --git a/src/renderer/src/providers/WebSearchProvider/WebSearchProviderFactory.ts b/src/renderer/src/providers/WebSearchProvider/WebSearchProviderFactory.ts
index 0b961c23d8..4adface5af 100644
--- a/src/renderer/src/providers/WebSearchProvider/WebSearchProviderFactory.ts
+++ b/src/renderer/src/providers/WebSearchProvider/WebSearchProviderFactory.ts
@@ -3,6 +3,7 @@ import type { WebSearchProvider } from '@renderer/types'
 import type BaseWebSearchProvider from './BaseWebSearchProvider'
 import BochaProvider from './BochaProvider'
 import DefaultProvider from './DefaultProvider'
+import ExaMcpProvider from './ExaMcpProvider'
 import ExaProvider from './ExaProvider'
 import LocalBaiduProvider from './LocalBaiduProvider'
 import LocalBingProvider from './LocalBingProvider'
@@ -24,6 +25,8 @@ export default class WebSearchProviderFactory {
         return new SearxngProvider(provider)
       case 'exa':
         return new ExaProvider(provider)
+      case 'exa-mcp':
+        return new ExaMcpProvider(provider)
       case 'local-google':
         return new LocalGoogleProvider(provider)
       case 'local-baidu':
diff --git a/src/renderer/src/queue/KnowledgeQueue.ts b/src/renderer/src/queue/KnowledgeQueue.ts
index 7b23895b44..e10a7e01b0 100644
--- a/src/renderer/src/queue/KnowledgeQueue.ts
+++ b/src/renderer/src/queue/KnowledgeQueue.ts
@@ -75,7 +75,7 @@ class KnowledgeQueue {
 
       let processableItem = findProcessableItem()
       while (processableItem) {
-        this.processItem(baseId, processableItem).then()
+        await this.processItem(baseId, processableItem)
         processableItem = findProcessableItem()
       }
     } finally {
@@ -99,7 +99,27 @@ class KnowledgeQueue {
     const userId = getStoreSetting('userId')
     try {
       if (item.retryCount && item.retryCount >= this.MAX_RETRIES) {
-        logger.info(`Item ${item.id} has reached max retries, skipping`)
+        const errorMessage = item.processingError
+          ? `Max retries exceeded: ${item.processingError}`
+          : 'Max retries exceeded'
+        logger.warn(`Item ${item.id} has reached max retries, marking as failed`)
+        notificationService.send({
+          id: uuid(),
+          type: 'error',
+          title: t('common.knowledge_base'),
+          message: t('notification.knowledge.error', { error: errorMessage }),
+          silent: false,
+          timestamp: Date.now(),
+          source: 'knowledge'
+        })
+        store.dispatch(
+          updateItemProcessingStatus({
+            baseId,
+            itemId: item.id,
+            status: 'failed',
+            error: errorMessage
+          })
+        )
         return
       }
 
diff --git a/src/renderer/src/services/ApiService.ts b/src/renderer/src/services/ApiService.ts
index 0d9e8cd0bf..0cd57a353a 100644
--- a/src/renderer/src/services/ApiService.ts
+++ b/src/renderer/src/services/ApiService.ts
@@ -22,7 +22,7 @@ import { isPromptToolUse, isSupportedToolUse } from '@renderer/utils/mcp-tools'
 import { findFileBlocks, getMainTextContent } from '@renderer/utils/messageUtils/find'
 import { containsSupportedVariables, replacePromptVariables } from '@renderer/utils/prompt'
 import { NOT_SUPPORT_API_KEY_PROVIDER_TYPES, NOT_SUPPORT_API_KEY_PROVIDERS } from '@renderer/utils/provider'
-import { cloneDeep, isEmpty, takeRight } from 'lodash'
+import { isEmpty, takeRight } from 'lodash'
 
 import type { ModernAiProviderConfig } from '../aiCore/index_new'
 import AiProviderNew from '../aiCore/index_new'
@@ -34,6 +34,10 @@ import {
   getProviderByModel,
   getQuickModel
 } from './AssistantService'
+import { ConversationService } from './ConversationService'
+import { injectUserMessageWithKnowledgeSearchPrompt } from './KnowledgeService'
+import type { BlockManager } from './messageStreaming'
+import type { StreamProcessorCallbacks } from './StreamProcessingService'
 // import { processKnowledgeSearch } from './KnowledgeService'
 // import {
 //   filterContextMessages,
@@ -79,6 +83,59 @@ export async function fetchMcpTools(assistant: Assistant) {
   return mcpTools
 }
 
+/**
+ * 将用户消息转换为LLM可以理解的格式并发送请求
+ * @param request - 包含消息内容和助手信息的请求对象
+ * @param onChunkReceived - 接收流式响应数据的回调函数
+ */
+// 目前先按照函数来写,后续如果有需要到class的地方就改回来
+export async function transformMessagesAndFetch(
+  request: {
+    messages: Message[]
+    assistant: Assistant
+    blockManager: BlockManager
+    assistantMsgId: string
+    callbacks: StreamProcessorCallbacks
+    topicId?: string // 添加 topicId 用于 trace
+    options: {
+      signal?: AbortSignal
+      timeout?: number
+      headers?: Record<string, string>
+    }
+  },
+  onChunkReceived: (chunk: Chunk) => void
+) {
+  const { messages, assistant } = request
+
+  try {
+    const { modelMessages, uiMessages } = await ConversationService.prepareMessagesForModel(messages, assistant)
+
+    // replace prompt variables
+    assistant.prompt = await replacePromptVariables(assistant.prompt, assistant.model?.name)
+
+    // inject knowledge search prompt into model messages
+    await injectUserMessageWithKnowledgeSearchPrompt({
+      modelMessages,
+      assistant,
+      assistantMsgId: request.assistantMsgId,
+      topicId: request.topicId,
+      blockManager: request.blockManager,
+      setCitationBlockId: request.callbacks.setCitationBlockId!
+    })
+
+    await fetchChatCompletion({
+      messages: modelMessages,
+      assistant: assistant,
+      topicId: request.topicId,
+      requestOptions: request.options,
+      uiMessages,
+      onChunkReceived
+    })
+  } catch (error: any) {
+    onChunkReceived({ type: ChunkType.ERROR, error })
+  }
+}
+
 export async function fetchChatCompletion({
   messages,
   prompt,
@@ -99,9 +156,11 @@ export async function fetchChatCompletion({
   })
 
   // Get base provider and apply API key rotation
+  // NOTE: Shallow copy is intentional. Provider objects are not mutated by downstream code.
+  // Nested properties (if any) are never modified after creation.
   const baseProvider = getProviderByModel(assistant.model || getDefaultModel())
   const providerWithRotatedKey = {
-    ...cloneDeep(baseProvider),
+    ...baseProvider,
     apiKey: getRotatedApiKey(baseProvider)
   }
 
@@ -183,8 +242,10 @@ export async function fetchMessagesSummary({ messages, assistant }: { messages:
   }
 
   // Apply API key rotation
+  // NOTE: Shallow copy is intentional. Provider objects are not mutated by downstream code.
+  // Nested properties (if any) are never modified after creation.
   const providerWithRotatedKey = {
-    ...cloneDeep(provider),
+    ...provider,
     apiKey: getRotatedApiKey(provider)
   }
 
@@ -288,8 +349,10 @@ export async function fetchNoteSummary({ content, assistant }: { content: string
   }
 
   // Apply API key rotation
+  // NOTE: Shallow copy is intentional. Provider objects are not mutated by downstream code.
+  // Nested properties (if any) are never modified after creation.
   const providerWithRotatedKey = {
-    ...cloneDeep(provider),
+    ...provider,
     apiKey: getRotatedApiKey(provider)
   }
 
@@ -382,8 +445,10 @@ export async function fetchGenerate({
   }
 
   // Apply API key rotation
+  // NOTE: Shallow copy is intentional. Provider objects are not mutated by downstream code.
+  // Nested properties (if any) are never modified after creation.
   const providerWithRotatedKey = {
-    ...cloneDeep(provider),
+    ...provider,
     apiKey: getRotatedApiKey(provider)
   }
 
@@ -492,8 +557,10 @@ function getRotatedApiKey(provider: Provider): string {
 
 export async function fetchModels(provider: Provider): Promise<Model[]> {
   // Apply API key rotation
+  // NOTE: Shallow copy is intentional. Provider objects are not mutated by downstream code.
+  // Nested properties (if any) are never modified after creation.
   const providerWithRotatedKey = {
-    ...cloneDeep(provider),
+    ...provider,
     apiKey: getRotatedApiKey(provider)
   }
 
diff --git a/src/renderer/src/services/AssistantService.ts b/src/renderer/src/services/AssistantService.ts
index 96881c56b6..97f2a6f179 100644
--- a/src/renderer/src/services/AssistantService.ts
+++ b/src/renderer/src/services/AssistantService.ts
@@ -6,8 +6,8 @@ import {
   MAX_CONTEXT_COUNT,
   UNLIMITED_CONTEXT_COUNT
 } from '@renderer/config/constant'
+import { getModelSupportedReasoningEffortOptions } from '@renderer/config/models'
 import { isQwenMTModel } from '@renderer/config/models/qwen'
-import { CHERRYAI_PROVIDER } from '@renderer/config/providers'
 import { UNKNOWN } from '@renderer/config/translate'
 import { getStoreProviders } from '@renderer/hooks/useStore'
 import i18n from '@renderer/i18n'
@@ -27,20 +27,51 @@ import { uuid } from '@renderer/utils'
 
 const logger = loggerService.withContext('AssistantService')
 
-export const DEFAULT_ASSISTANT_SETTINGS: AssistantSettings = {
-  temperature: DEFAULT_TEMPERATURE,
-  enableTemperature: true,
-  contextCount: DEFAULT_CONTEXTCOUNT,
+/**
+ * Default assistant settings configuration template.
+ *
+ * **Important**: This defines the DEFAULT VALUES for assistant settings, NOT the current settings
+ * of the default assistant. To get the actual settings of the default assistant, use `getDefaultAssistantSettings()`.
+ *
+ * Provides sensible defaults for all assistant settings with a focus on minimal parameter usage:
+ * - **Temperature disabled**: Use provider defaults by default
+ * - **MaxTokens disabled**: Use provider defaults by default
+ * - **TopP disabled**: Use provider defaults by default
+ * - **Streaming enabled**: Provides real-time response for better UX
+ * - **Standard context count**: Balanced memory usage and conversation length
+ */
+export const DEFAULT_ASSISTANT_SETTINGS = {
+  maxTokens: DEFAULT_MAX_TOKENS,
   enableMaxTokens: false,
-  maxTokens: 0,
-  streamOutput: true,
+  temperature: DEFAULT_TEMPERATURE,
+  enableTemperature: false,
   topP: 1,
   enableTopP: false,
+  contextCount: DEFAULT_CONTEXTCOUNT,
+  streamOutput: true,
+  defaultModel: undefined,
+  customParameters: [],
+  reasoning_effort: 'default',
+  reasoning_effort_cache: undefined,
+  qwenThinkMode: undefined,
   // It would gracefully fallback to prompt if not supported by model.
-  toolUseMode: 'function',
-  customParameters: []
-} as const
+  toolUseMode: 'function'
+} as const satisfies AssistantSettings
 
+/**
+ * Creates a temporary default assistant instance.
+ *
+ * **Important**: This creates a NEW temporary assistant instance with DEFAULT_ASSISTANT_SETTINGS,
+ * NOT the actual default assistant from Redux store. This is used as a template for creating
+ * new assistants or as a fallback when no assistant is specified.
+ *
+ * To get the actual default assistant from Redux store (with current user settings), use:
+ * ```typescript
+ * const defaultAssistant = store.getState().assistants.defaultAssistant
+ * ```
+ *
+ * @returns New temporary assistant instance with default settings
+ */
 export function getDefaultAssistant(): Assistant {
   return {
     id: 'default',
@@ -55,7 +86,19 @@ export function getDefaultAssistant(): Assistant {
   }
 }
 
-export function getDefaultTranslateAssistant(targetLanguage: TranslateLanguage, text: string): TranslateAssistant {
+/**
+ * Creates a default translate assistant.
+ *
+ * @param targetLanguage - Target language for translation
+ * @param text - Text to be translated
+ * @param _settings - Optional settings to override default assistant settings
+ * @returns Configured translate assistant
+ */
+export function getDefaultTranslateAssistant(
+  targetLanguage: TranslateLanguage,
+  text: string,
+  _settings?: Partial<AssistantSettings>
+): TranslateAssistant {
   const model = getTranslateModel()
   const assistant: Assistant = getDefaultAssistant()
 
@@ -69,9 +112,13 @@ export function getDefaultTranslateAssistant(targetLanguage: TranslateLanguage,
     throw new Error('Unknown target language')
   }
 
+  const supportedOptions = getModelSupportedReasoningEffortOptions(model)
+  // disable reasoning if it could be disabled, otherwise no configuration
+  const reasoningEffort = supportedOptions?.includes('none') ? 'none' : 'default'
   const settings = {
-    temperature: 0.7
-  }
+    reasoning_effort: reasoningEffort,
+    ..._settings
+  } satisfies Partial<AssistantSettings>
 
   const getTranslateContent = (model: Model, text: string, targetLanguage: TranslateLanguage): string => {
     if (isQwenMTModel(model)) {
@@ -96,6 +143,17 @@ export function getDefaultTranslateAssistant(targetLanguage: TranslateLanguage,
   return translateAssistant
 }
 
+/**
+ * Gets the CURRENT SETTINGS of the default assistant.
+ *
+ * **Important**: This returns the actual current settings of the default assistant (user-configured),
+ * NOT the DEFAULT_ASSISTANT_SETTINGS template. The settings may have been modified by the user
+ * from their initial default values.
+ *
+ * To get the template of default values, use DEFAULT_ASSISTANT_SETTINGS directly.
+ *
+ * @returns Current settings of the default assistant from store state
+ */
 export function getDefaultAssistantSettings() {
   return store.getState().assistants.defaultAssistant.settings
 }
@@ -142,7 +200,7 @@ export function getProviderByModel(model?: Model): Provider {
 
   if (!provider) {
     const defaultProvider = providers.find((p) => p.id === getDefaultModel()?.provider)
-    return defaultProvider || CHERRYAI_PROVIDER || providers[0]
+    return defaultProvider || providers[0]
   }
 
   return provider
@@ -155,6 +213,18 @@ export function getProviderByModelId(modelId?: string) {
   return providers.find((p) => p.models.find((m) => m.id === _modelId)) as Provider
 }
 
+/**
+ * Retrieves and normalizes assistant settings with special transformation handling.
+ *
+ * **Special Transformations:**
+ * 1. **Context Count**: Converts `MAX_CONTEXT_COUNT` to `UNLIMITED_CONTEXT_COUNT` for internal processing
+ * 2. **Max Tokens**: Only returns a value when `enableMaxTokens` is true, otherwise returns `undefined`
+ * 3. **Max Tokens Validation**: Ensures maxTokens > 0, falls back to `DEFAULT_MAX_TOKENS` if invalid
+ * 4. **Fallback Defaults**: Applies system defaults for all undefined/missing settings
+ *
+ * @param assistant - The assistant instance to extract settings from
+ * @returns Normalized assistant settings with all transformations applied
+ */
 export const getAssistantSettings = (assistant: Assistant): AssistantSettings => {
   const contextCount = assistant?.settings?.contextCount ?? DEFAULT_CONTEXTCOUNT
   const getAssistantMaxTokens = () => {
@@ -171,16 +241,16 @@ export const getAssistantSettings = (assistant: Assistant): AssistantSettings =>
   return {
     contextCount: contextCount === MAX_CONTEXT_COUNT ? UNLIMITED_CONTEXT_COUNT : contextCount,
     temperature: assistant?.settings?.temperature ?? DEFAULT_TEMPERATURE,
-    enableTemperature: assistant?.settings?.enableTemperature ?? true,
-    topP: assistant?.settings?.topP ?? 1,
-    enableTopP: assistant?.settings?.enableTopP ?? false,
-    enableMaxTokens: assistant?.settings?.enableMaxTokens ?? false,
+    enableTemperature: assistant?.settings?.enableTemperature ?? DEFAULT_ASSISTANT_SETTINGS.enableTemperature,
+    topP: assistant?.settings?.topP ?? DEFAULT_ASSISTANT_SETTINGS.topP,
+    enableTopP: assistant?.settings?.enableTopP ?? DEFAULT_ASSISTANT_SETTINGS.enableTopP,
+    enableMaxTokens: assistant?.settings?.enableMaxTokens ?? DEFAULT_ASSISTANT_SETTINGS.enableMaxTokens,
     maxTokens: getAssistantMaxTokens(),
-    streamOutput: assistant?.settings?.streamOutput ?? true,
-    toolUseMode: assistant?.settings?.toolUseMode ?? 'function',
-    defaultModel: assistant?.defaultModel ?? undefined,
-    reasoning_effort: assistant?.settings?.reasoning_effort ?? undefined,
-    customParameters: assistant?.settings?.customParameters ?? []
+    streamOutput: assistant?.settings?.streamOutput ?? DEFAULT_ASSISTANT_SETTINGS.streamOutput,
+    toolUseMode: assistant?.settings?.toolUseMode ?? DEFAULT_ASSISTANT_SETTINGS.toolUseMode,
+    defaultModel: assistant?.defaultModel ?? DEFAULT_ASSISTANT_SETTINGS.defaultModel,
+    reasoning_effort: assistant?.settings?.reasoning_effort ?? DEFAULT_ASSISTANT_SETTINGS.reasoning_effort,
+    customParameters: assistant?.settings?.customParameters ?? DEFAULT_ASSISTANT_SETTINGS.customParameters
   }
 }
 
diff --git a/src/renderer/src/services/EventService.ts b/src/renderer/src/services/EventService.ts
index badaaccf07..35636dc016 100644
--- a/src/renderer/src/services/EventService.ts
+++ b/src/renderer/src/services/EventService.ts
@@ -4,8 +4,6 @@ export const EventEmitter = new Emittery()
 
 export const EVENT_NAMES = {
   SEND_MESSAGE: 'SEND_MESSAGE',
-  // APPEND_MESSAGE: 'APPEND_MESSAGE',
-  // RECEIVE_MESSAGE: 'RECEIVE_MESSAGE',
   MESSAGE_COMPLETE: 'MESSAGE_COMPLETE',
   AI_AUTO_RENAME: 'AI_AUTO_RENAME',
   CLEAR_MESSAGES: 'CLEAR_MESSAGES',
@@ -15,7 +13,6 @@ export const EVENT_NAMES = {
   CHAT_COMPLETION_PAUSED: 'CHAT_COMPLETION_PAUSED',
   ESTIMATED_TOKEN_COUNT: 'ESTIMATED_TOKEN_COUNT',
   SHOW_ASSISTANTS: 'SHOW_ASSISTANTS',
-  SHOW_CHAT_SETTINGS: 'SHOW_CHAT_SETTINGS',
   SHOW_TOPIC_SIDEBAR: 'SHOW_TOPIC_SIDEBAR',
   SWITCH_TOPIC_SIDEBAR: 'SWITCH_TOPIC_SIDEBAR',
   NEW_CONTEXT: 'NEW_CONTEXT',
diff --git a/src/renderer/src/services/KnowledgeService.ts b/src/renderer/src/services/KnowledgeService.ts
index e2f2e6fc15..ce9577c68d 100644
--- a/src/renderer/src/services/KnowledgeService.ts
+++ b/src/renderer/src/services/KnowledgeService.ts
@@ -2,10 +2,13 @@ import { loggerService } from '@logger'
 import type { Span } from '@opentelemetry/api'
 import { ModernAiProvider } from '@renderer/aiCore'
 import AiProvider from '@renderer/aiCore/legacy'
+import { getMessageContent } from '@renderer/aiCore/plugins/searchOrchestrationPlugin'
 import { DEFAULT_KNOWLEDGE_DOCUMENT_COUNT, DEFAULT_KNOWLEDGE_THRESHOLD } from '@renderer/config/constant'
 import { getEmbeddingMaxContext } from '@renderer/config/embedings'
+import { REFERENCE_PROMPT } from '@renderer/config/prompts'
 import { addSpan, endSpan } from '@renderer/services/SpanManagerService'
 import store from '@renderer/store'
+import type { Assistant } from '@renderer/types'
 import {
   type FileMetadata,
   type KnowledgeBase,
@@ -16,13 +19,17 @@ import {
 } from '@renderer/types'
 import type { Chunk } from '@renderer/types/chunk'
 import { ChunkType } from '@renderer/types/chunk'
+import { MessageBlockStatus, MessageBlockType } from '@renderer/types/newMessage'
 import { routeToEndpoint } from '@renderer/utils'
 import type { ExtractResults } from '@renderer/utils/extract'
+import { createCitationBlock } from '@renderer/utils/messageUtils/create'
 import { isAzureOpenAIProvider, isGeminiProvider } from '@renderer/utils/provider'
+import type { ModelMessage, UserModelMessage } from 'ai'
 import { isEmpty } from 'lodash'
 
 import { getProviderByModel } from './AssistantService'
 import FileManager from './FileManager'
+import type { BlockManager } from './messageStreaming'
 
 const logger = loggerService.withContext('RendererKnowledgeService')
 
@@ -162,7 +169,7 @@ export const searchKnowledgeBase = async (
 
     const searchResults: KnowledgeSearchResult[] = await window.api.knowledgeBase.search(
       {
-        search: rewrite || query,
+        search: query || rewrite || '',
         base: baseParams
       },
       currentSpan?.spanContext()
@@ -338,3 +345,128 @@ export function processKnowledgeReferences(
     }
   }
 }
+
+export const injectUserMessageWithKnowledgeSearchPrompt = async ({
+  modelMessages,
+  assistant,
+  assistantMsgId,
+  topicId,
+  blockManager,
+  setCitationBlockId
+}: {
+  modelMessages: ModelMessage[]
+  assistant: Assistant
+  assistantMsgId: string
+  topicId?: string
+  blockManager: BlockManager
+  setCitationBlockId: (blockId: string) => void
+}) => {
+  if (assistant.knowledge_bases?.length && modelMessages.length > 0) {
+    const lastUserMessage = modelMessages[modelMessages.length - 1]
+    const isUserMessage = lastUserMessage.role === 'user'
+
+    if (!isUserMessage) {
+      return
+    }
+
+    const knowledgeReferences = await getKnowledgeReferences({
+      assistant,
+      lastUserMessage,
+      topicId: topicId
+    })
+
+    if (knowledgeReferences.length === 0) {
+      return
+    }
+
+    await createKnowledgeReferencesBlock({
+      assistantMsgId,
+      knowledgeReferences,
+      blockManager,
+      setCitationBlockId
+    })
+
+    const question = getMessageContent(lastUserMessage) || ''
+    const references = JSON.stringify(knowledgeReferences, null, 2)
+
+    const knowledgeSearchPrompt = REFERENCE_PROMPT.replace('{question}', question).replace('{references}', references)
+
+    if (typeof lastUserMessage.content === 'string') {
+      lastUserMessage.content = knowledgeSearchPrompt
+    } else if (Array.isArray(lastUserMessage.content)) {
+      const textPart = lastUserMessage.content.find((part) => part.type === 'text')
+      if (textPart) {
+        textPart.text = knowledgeSearchPrompt
+      } else {
+        lastUserMessage.content.push({
+          type: 'text',
+          text: knowledgeSearchPrompt
+        })
+      }
+    }
+  }
+}
+
+export const getKnowledgeReferences = async ({
+  assistant,
+  lastUserMessage,
+  topicId
+}: {
+  assistant: Assistant
+  lastUserMessage: UserModelMessage
+  topicId?: string
+}) => {
+  // 如果助手没有知识库，返回空字符串
+  if (!assistant || isEmpty(assistant.knowledge_bases)) {
+    return []
+  }
+
+  // 获取知识库ID
+  const knowledgeBaseIds = assistant.knowledge_bases?.map((base) => base.id)
+
+  // 获取用户消息内容
+  const question = getMessageContent(lastUserMessage) || ''
+
+  // 获取知识库引用
+  const knowledgeReferences = await processKnowledgeSearch(
+    {
+      knowledge: {
+        question: [question],
+        rewrite: ''
+      }
+    },
+    knowledgeBaseIds,
+    topicId!
+  )
+
+  // 返回提示词
+  return knowledgeReferences
+}
+
+export const createKnowledgeReferencesBlock = async ({
+  assistantMsgId,
+  knowledgeReferences,
+  blockManager,
+  setCitationBlockId
+}: {
+  assistantMsgId: string
+  knowledgeReferences: KnowledgeReference[]
+  blockManager: BlockManager
+  setCitationBlockId: (blockId: string) => void
+}) => {
+  // 创建引用块
+  const citationBlock = createCitationBlock(
+    assistantMsgId,
+    { knowledge: knowledgeReferences },
+    { status: MessageBlockStatus.SUCCESS }
+  )
+
+  // 处理引用块
+  blockManager.handleBlockTransition(citationBlock, MessageBlockType.CITATION)
+
+  // 设置引用块ID
+  setCitationBlockId(citationBlock.id)
+
+  // 返回引用块
+  return citationBlock
+}
diff --git a/src/renderer/src/services/MemoryProcessor.ts b/src/renderer/src/services/MemoryProcessor.ts
index 01ba5eeb77..7e9291cfd9 100644
--- a/src/renderer/src/services/MemoryProcessor.ts
+++ b/src/renderer/src/services/MemoryProcessor.ts
@@ -40,7 +40,7 @@ export class MemoryProcessor {
     try {
       const { memoryConfig } = config
 
-      if (!memoryConfig.llmApiClient) {
+      if (!memoryConfig.llmModel) {
         throw new Error('No LLM model configured for memory processing')
       }
 
@@ -53,8 +53,9 @@ export class MemoryProcessor {
       const responseContent = await fetchGenerate({
         prompt: systemPrompt,
         content: userPrompt,
-        model: getModel(memoryConfig.llmApiClient.model, memoryConfig.llmApiClient.provider)
+        model: getModel(memoryConfig.llmModel.id, memoryConfig.llmModel.provider)
       })
+
       if (!responseContent || responseContent.trim() === '') {
         return []
       }
@@ -100,9 +101,10 @@ export class MemoryProcessor {
 
     const { memoryConfig, assistantId, userId, lastMessageId } = config
 
-    if (!memoryConfig.llmApiClient) {
+    if (!memoryConfig.llmModel) {
       throw new Error('No LLM model configured for memory processing')
     }
+
     const existingMemoriesResult = (window.keyv.get(`memory-search-${lastMessageId}`) as MemoryItem[]) || []
 
     const existingMemories = existingMemoriesResult.map((memory) => ({
@@ -123,7 +125,7 @@ export class MemoryProcessor {
       const responseContent = await fetchGenerate({
         prompt: updateMemorySystemPrompt,
         content: updateMemoryUserPrompt,
-        model: getModel(memoryConfig.llmApiClient.model, memoryConfig.llmApiClient.provider)
+        model: getModel(memoryConfig.llmModel.id, memoryConfig.llmModel.provider)
       })
       if (!responseContent || responseContent.trim() === '') {
         return []
diff --git a/src/renderer/src/services/MemoryService.ts b/src/renderer/src/services/MemoryService.ts
index 8f572194df..d7d575886c 100644
--- a/src/renderer/src/services/MemoryService.ts
+++ b/src/renderer/src/services/MemoryService.ts
@@ -1,14 +1,19 @@
 import { loggerService } from '@logger'
+import { getModel } from '@renderer/hooks/useModel'
 import store from '@renderer/store'
 import { selectMemoryConfig } from '@renderer/store/memory'
 import type {
   AddMemoryOptions,
   AssistantMessage,
+  KnowledgeBase,
   MemoryHistoryItem,
   MemoryListOptions,
   MemorySearchOptions,
   MemorySearchResult
 } from '@types'
+import { now } from 'lodash'
+
+import { getKnowledgeBaseParams } from './KnowledgeService'
 
 const logger = loggerService.withContext('MemoryService')
 
@@ -203,16 +208,24 @@ class MemoryService {
       }
 
       const memoryConfig = selectMemoryConfig(store.getState())
-      const embedderApiClient = memoryConfig.embedderApiClient
-      const llmApiClient = memoryConfig.llmApiClient
+      const embeddingModel = memoryConfig.embeddingModel
 
-      const configWithProviders = {
+      // Get knowledge base params for memory
+      const { embedApiClient: embeddingApiClient } = getKnowledgeBaseParams({
+        id: 'memory',
+        name: 'Memory',
+        model: getModel(embeddingModel?.id, embeddingModel?.provider),
+        dimensions: memoryConfig.embeddingDimensions,
+        items: [],
+        created_at: now(),
+        updated_at: now(),
+        version: 1
+      } as KnowledgeBase)
+
+      return window.api.memory.setConfig({
         ...memoryConfig,
-        embedderApiClient,
-        llmApiClient
-      }
-
-      return window.api.memory.setConfig(configWithProviders)
+        embeddingApiClient
+      })
     } catch (error) {
       logger.warn('Failed to update memory config:', error as Error)
       return
diff --git a/src/renderer/src/services/OrchestrateService.ts b/src/renderer/src/services/OrchestrateService.ts
deleted file mode 100644
index 71f17d6804..0000000000
--- a/src/renderer/src/services/OrchestrateService.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import type { Assistant, Message } from '@renderer/types'
-import type { Chunk } from '@renderer/types/chunk'
-import { ChunkType } from '@renderer/types/chunk'
-import { replacePromptVariables } from '@renderer/utils/prompt'
-
-import { fetchChatCompletion } from './ApiService'
-import { ConversationService } from './ConversationService'
-
-/**
- * The request object for handling a user message.
- */
-export interface OrchestrationRequest {
-  messages: Message[]
-  assistant: Assistant
-  options: {
-    signal?: AbortSignal
-    timeout?: number
-    headers?: Record<string, string>
-  }
-  topicId?: string // 添加 topicId 用于 trace
-}
-
-/**
- * The OrchestrationService is responsible for orchestrating the different services
- * to handle a user's message. It contains the core logic of the application.
- */
-// NOTE：暂时没有用到这个类
-export class OrchestrationService {
-  constructor() {
-    // In the future, this could be a singleton, but for now, a new instance is fine.
-    // this.conversationService = new ConversationService()
-  }
-
-  /**
-   * This is the core method to handle user messages.
-   * It takes the message context and an events object for callbacks,
-   * and orchestrates the call to the LLM.
-   * The logic is moved from `messageThunk.ts`.
-   * @param request The orchestration request containing messages and assistant info.
-   * @param events A set of callbacks to report progress and results to the UI layer.
-   */
-  async transformMessagesAndFetch(request: OrchestrationRequest, onChunkReceived: (chunk: Chunk) => void) {
-    const { messages, assistant } = request
-
-    try {
-      const { modelMessages, uiMessages } = await ConversationService.prepareMessagesForModel(messages, assistant)
-
-      await fetchChatCompletion({
-        messages: modelMessages,
-        assistant: assistant,
-        requestOptions: request.options,
-        onChunkReceived,
-        topicId: request.topicId,
-        uiMessages: uiMessages
-      })
-    } catch (error: any) {
-      onChunkReceived({ type: ChunkType.ERROR, error })
-    }
-  }
-}
-
-/**
- * 将用户消息转换为LLM可以理解的格式并发送请求
- * @param request - 包含消息内容和助手信息的请求对象
- * @param onChunkReceived - 接收流式响应数据的回调函数
- */
-// 目前先按照函数来写,后续如果有需要到class的地方就改回来
-export async function transformMessagesAndFetch(
-  request: OrchestrationRequest,
-  onChunkReceived: (chunk: Chunk) => void
-) {
-  const { messages, assistant } = request
-
-  try {
-    const { modelMessages, uiMessages } = await ConversationService.prepareMessagesForModel(messages, assistant)
-
-    // replace prompt variables
-    assistant.prompt = await replacePromptVariables(assistant.prompt, assistant.model?.name)
-
-    await fetchChatCompletion({
-      messages: modelMessages,
-      assistant: assistant,
-      requestOptions: request.options,
-      onChunkReceived,
-      topicId: request.topicId,
-      uiMessages
-    })
-  } catch (error: any) {
-    onChunkReceived({ type: ChunkType.ERROR, error })
-  }
-}
diff --git a/src/renderer/src/services/StreamProcessingService.ts b/src/renderer/src/services/StreamProcessingService.ts
index 26f52b8037..7e80672d5d 100644
--- a/src/renderer/src/services/StreamProcessingService.ts
+++ b/src/renderer/src/services/StreamProcessingService.ts
@@ -34,6 +34,10 @@ export interface StreamProcessorCallbacks {
   onLLMWebSearchInProgress?: () => void
   // LLM Web search complete
   onLLMWebSearchComplete?: (llmWebSearchResult: WebSearchResponse) => void
+  // Get citation block ID
+  getCitationBlockId?: () => string | null
+  // Set citation block ID
+  setCitationBlockId?: (blockId: string) => void
   // Image generation chunk received
   onImageCreated?: () => void
   onImageDelta?: (imageData: GenerateImageResponse) => void
diff --git a/src/renderer/src/services/TranslateService.ts b/src/renderer/src/services/TranslateService.ts
index a5abb2baee..67e4f66bc3 100644
--- a/src/renderer/src/services/TranslateService.ts
+++ b/src/renderer/src/services/TranslateService.ts
@@ -1,8 +1,10 @@
 import { loggerService } from '@logger'
 import { db } from '@renderer/databases'
 import type {
+  AssistantSettings,
   CustomTranslateLanguage,
   FetchChatCompletionRequestOptions,
+  ReasoningEffortOption,
   TranslateHistory,
   TranslateLanguage,
   TranslateLanguageCode
@@ -20,6 +22,10 @@ import { getDefaultTranslateAssistant } from './AssistantService'
 
 const logger = loggerService.withContext('TranslateService')
 
+type TranslateOptions = {
+  reasoningEffort: ReasoningEffortOption
+}
+
 /**
  * 翻译文本到目标语言
  * @param text - 需要翻译的文本内容
@@ -33,10 +39,14 @@ export const translateText = async (
   text: string,
   targetLanguage: TranslateLanguage,
   onResponse?: (text: string, isComplete: boolean) => void,
-  abortKey?: string
+  abortKey?: string,
+  options?: TranslateOptions
 ) => {
-  let abortError
-  const assistant = getDefaultTranslateAssistant(targetLanguage, text)
+  let error
+  const assistantSettings: Partial<AssistantSettings> | undefined = options
+    ? { reasoning_effort: options?.reasoningEffort }
+    : undefined
+  const assistant = getDefaultTranslateAssistant(targetLanguage, text, assistantSettings)
 
   const signal = abortKey ? readyToAbort(abortKey) : undefined
 
@@ -48,8 +58,8 @@ export const translateText = async (
     } else if (chunk.type === ChunkType.TEXT_COMPLETE) {
       completed = true
     } else if (chunk.type === ChunkType.ERROR) {
+      error = chunk.error
       if (isAbortError(chunk.error)) {
-        abortError = chunk.error
         completed = true
       }
     }
@@ -74,8 +84,8 @@ export const translateText = async (
     }
   }
 
-  if (abortError) {
-    throw abortError
+  if (error !== undefined && !isAbortError(error)) {
+    throw error
   }
 
   const trimmedText = translatedText.trim()
diff --git a/src/renderer/src/services/db/AgentMessageDataSource.ts b/src/renderer/src/services/db/AgentMessageDataSource.ts
index 4ba93d2cd5..7af7a257f8 100644
--- a/src/renderer/src/services/db/AgentMessageDataSource.ts
+++ b/src/renderer/src/services/db/AgentMessageDataSource.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { loggerService } from '@logger'
 import store from '@renderer/store'
 import type { AgentPersistedMessage } from '@renderer/types/agent'
diff --git a/src/renderer/src/services/db/DbService.ts b/src/renderer/src/services/db/DbService.ts
index cff7cb1a45..64ff945958 100644
--- a/src/renderer/src/services/db/DbService.ts
+++ b/src/renderer/src/services/db/DbService.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { loggerService } from '@logger'
 import store from '@renderer/store'
 import type { Message, MessageBlock } from '@renderer/types/newMessage'
diff --git a/src/renderer/src/services/db/DexieMessageDataSource.ts b/src/renderer/src/services/db/DexieMessageDataSource.ts
index cbc015984a..f8bad4476f 100644
--- a/src/renderer/src/services/db/DexieMessageDataSource.ts
+++ b/src/renderer/src/services/db/DexieMessageDataSource.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { loggerService } from '@logger'
 import db from '@renderer/databases'
 import FileManager from '@renderer/services/FileManager'
diff --git a/src/renderer/src/services/db/index.ts b/src/renderer/src/services/db/index.ts
index 9b681dc6c6..a29eeb6c04 100644
--- a/src/renderer/src/services/db/index.ts
+++ b/src/renderer/src/services/db/index.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 /**
  * Unified data access layer for messages
  * Provides a consistent API for accessing messages from different sources
diff --git a/src/renderer/src/services/messageStreaming/callbacks/baseCallbacks.ts b/src/renderer/src/services/messageStreaming/callbacks/baseCallbacks.ts
index b38539acde..4440600416 100644
--- a/src/renderer/src/services/messageStreaming/callbacks/baseCallbacks.ts
+++ b/src/renderer/src/services/messageStreaming/callbacks/baseCallbacks.ts
@@ -4,10 +4,11 @@ import i18n from '@renderer/i18n'
 import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
 import { NotificationService } from '@renderer/services/NotificationService'
 import { estimateMessagesUsage } from '@renderer/services/TokenService'
+import { updateOneBlock } from '@renderer/store/messageBlock'
 import { selectMessagesForTopic } from '@renderer/store/newMessage'
 import { newMessagesActions } from '@renderer/store/newMessage'
 import type { Assistant } from '@renderer/types'
-import type { PlaceholderMessageBlock, Response } from '@renderer/types/newMessage'
+import type { PlaceholderMessageBlock, Response, ThinkingMessageBlock } from '@renderer/types/newMessage'
 import { AssistantMessageStatus, MessageBlockStatus, MessageBlockType } from '@renderer/types/newMessage'
 import { uuid } from '@renderer/utils'
 import { isAbortError, serializeError } from '@renderer/utils/error'
@@ -28,10 +29,20 @@ interface BaseCallbacksDependencies {
   assistantMsgId: string
   saveUpdatesToDB: any
   assistant: Assistant
+  getCurrentThinkingInfo?: () => { blockId: string | null; millsec: number }
 }
 
 export const createBaseCallbacks = (deps: BaseCallbacksDependencies) => {
-  const { blockManager, dispatch, getState, topicId, assistantMsgId, saveUpdatesToDB, assistant } = deps
+  const {
+    blockManager,
+    dispatch,
+    getState,
+    topicId,
+    assistantMsgId,
+    saveUpdatesToDB,
+    assistant,
+    getCurrentThinkingInfo
+  } = deps
 
   const startTime = Date.now()
   const notificationService = NotificationService.getInstance()
@@ -97,13 +108,54 @@ export const createBaseCallbacks = (deps: BaseCallbacksDependencies) => {
       const possibleBlockId = findBlockIdForCompletion()
 
       if (possibleBlockId) {
-        // 更改上一个block的状态为ERROR
-        const changes = {
+        // 更改上一个block的状态为ERROR/PAUSED
+        const changes: Partial<ThinkingMessageBlock> = {
           status: isErrorTypeAbort ? MessageBlockStatus.PAUSED : MessageBlockStatus.ERROR
         }
+        // 如果是 thinking block，保留实际思考时间
+        if (blockManager.lastBlockType === MessageBlockType.THINKING) {
+          const thinkingInfo = getCurrentThinkingInfo?.()
+          if (thinkingInfo?.blockId === possibleBlockId && thinkingInfo?.millsec && thinkingInfo.millsec > 0) {
+            changes.thinking_millsec = thinkingInfo.millsec
+          }
+        }
         blockManager.smartBlockUpdate(possibleBlockId, changes, blockManager.lastBlockType!, true)
       }
 
+      // Fix: 更新所有仍处于 STREAMING 状态的 blocks 为 PAUSED/ERROR
+      // 这修复了停止回复时思考计时器继续运行的问题
+      const currentMessage = getState().messages.entities[assistantMsgId]
+      if (currentMessage) {
+        const allBlockRefs = findAllBlocks(currentMessage)
+        const blockState = getState().messageBlocks
+        // 获取当前思考信息（如果有），用于保留实际思考时间
+        const thinkingInfo = getCurrentThinkingInfo?.()
+        for (const blockRef of allBlockRefs) {
+          const block = blockState.entities[blockRef.id]
+          if (block && block.status === MessageBlockStatus.STREAMING && block.id !== possibleBlockId) {
+            // 构建更新对象
+            const changes: Partial<ThinkingMessageBlock> = {
+              status: isErrorTypeAbort ? MessageBlockStatus.PAUSED : MessageBlockStatus.ERROR
+            }
+            // 如果是 thinking block 且有思考时间信息，保留实际思考时间
+            if (
+              block.type === MessageBlockType.THINKING &&
+              thinkingInfo?.blockId === block.id &&
+              thinkingInfo?.millsec &&
+              thinkingInfo.millsec > 0
+            ) {
+              changes.thinking_millsec = thinkingInfo.millsec
+            }
+            dispatch(
+              updateOneBlock({
+                id: block.id,
+                changes
+              })
+            )
+          }
+        }
+      }
+
       const errorBlock = createErrorBlock(assistantMsgId, serializableError, { status: MessageBlockStatus.SUCCESS })
       await blockManager.handleBlockTransition(errorBlock, MessageBlockType.ERROR)
       const messageErrorUpdate = {
diff --git a/src/renderer/src/services/messageStreaming/callbacks/citationCallbacks.ts b/src/renderer/src/services/messageStreaming/callbacks/citationCallbacks.ts
index 9e99fe7520..3245493636 100644
--- a/src/renderer/src/services/messageStreaming/callbacks/citationCallbacks.ts
+++ b/src/renderer/src/services/messageStreaming/callbacks/citationCallbacks.ts
@@ -121,6 +121,11 @@ export const createCitationCallbacks = (deps: CitationCallbacksDependencies) =>
     },
 
     // 暴露给外部的方法，用于textCallbacks中获取citationBlockId
-    getCitationBlockId: () => citationBlockId
+    getCitationBlockId: () => citationBlockId,
+
+    // 暴露给外部的方法，用于 KnowledgeService 中设置 citationBlockId
+    setCitationBlockId: (blockId: string) => {
+      citationBlockId = blockId
+    }
   }
 }
diff --git a/src/renderer/src/services/messageStreaming/callbacks/index.ts b/src/renderer/src/services/messageStreaming/callbacks/index.ts
index 2bb1d158bb..1587cb936c 100644
--- a/src/renderer/src/services/messageStreaming/callbacks/index.ts
+++ b/src/renderer/src/services/messageStreaming/callbacks/index.ts
@@ -23,6 +23,12 @@ interface CallbacksDependencies {
 export const createCallbacks = (deps: CallbacksDependencies) => {
   const { blockManager, dispatch, getState, topicId, assistantMsgId, saveUpdatesToDB, assistant } = deps
 
+  // 首先创建 thinkingCallbacks ，以便传递 getCurrentThinkingInfo 给 baseCallbacks
+  const thinkingCallbacks = createThinkingCallbacks({
+    blockManager,
+    assistantMsgId
+  })
+
   // 创建基础回调
   const baseCallbacks = createBaseCallbacks({
     blockManager,
@@ -31,13 +37,8 @@ export const createCallbacks = (deps: CallbacksDependencies) => {
     topicId,
     assistantMsgId,
     saveUpdatesToDB,
-    assistant
-  })
-
-  // 创建各类回调
-  const thinkingCallbacks = createThinkingCallbacks({
-    blockManager,
-    assistantMsgId
+    assistant,
+    getCurrentThinkingInfo: thinkingCallbacks.getCurrentThinkingInfo
   })
 
   const toolCallbacks = createToolCallbacks({
diff --git a/src/renderer/src/services/messageStreaming/callbacks/thinkingCallbacks.ts b/src/renderer/src/services/messageStreaming/callbacks/thinkingCallbacks.ts
index aeb160fd02..3c718c4a67 100644
--- a/src/renderer/src/services/messageStreaming/callbacks/thinkingCallbacks.ts
+++ b/src/renderer/src/services/messageStreaming/callbacks/thinkingCallbacks.ts
@@ -19,6 +19,12 @@ export const createThinkingCallbacks = (deps: ThinkingCallbacksDependencies) =>
   let thinking_millsec_now: number = 0
 
   return {
+    // 获取当前思考时间（用于停止回复时保留思考时间）
+    getCurrentThinkingInfo: () => ({
+      blockId: thinkingBlockId,
+      millsec: thinking_millsec_now > 0 ? performance.now() - thinking_millsec_now : 0
+    }),
+
     onThinkingStart: async () => {
       if (blockManager.hasInitialPlaceholder) {
         const changes: Partial<MessageBlock> = {
diff --git a/src/renderer/src/services/models/ModelAdapter.ts b/src/renderer/src/services/models/ModelAdapter.ts
index deea631693..b5a6f238a8 100644
--- a/src/renderer/src/services/models/ModelAdapter.ts
+++ b/src/renderer/src/services/models/ModelAdapter.ts
@@ -45,7 +45,7 @@ function normalizeModels<T>(models: T[], transformer: (entry: T) => Model | null
 }
 
 function adaptSdkModel(provider: Provider, model: SdkModel): Model | null {
-  const id = pickPreferredString([(model as any)?.id, (model as any)?.modelId])
+  const id = pickPreferredString([(model as any)?.id, (model as any)?.modelId, (model as any)?.name])
   const name = pickPreferredString([
     (model as any)?.display_name,
     (model as any)?.displayName,
diff --git a/src/renderer/src/store/assistants.ts b/src/renderer/src/store/assistants.ts
index 51638be9f6..aaac1810ab 100644
--- a/src/renderer/src/store/assistants.ts
+++ b/src/renderer/src/store/assistants.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 // @ts-nocheck
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSelector, createSlice } from '@reduxjs/toolkit'
diff --git a/src/renderer/src/store/backup.ts b/src/renderer/src/store/backup.ts
index fbb3853a12..d2986b11bf 100644
--- a/src/renderer/src/store/backup.ts
+++ b/src/renderer/src/store/backup.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
 
diff --git a/src/renderer/src/store/codeTools.ts b/src/renderer/src/store/codeTools.ts
index 44070a76e4..dc3889abb1 100644
--- a/src/renderer/src/store/codeTools.ts
+++ b/src/renderer/src/store/codeTools.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
 import type { Model } from '@renderer/types'
diff --git a/src/renderer/src/store/copilot.ts b/src/renderer/src/store/copilot.ts
index ab7e50ee84..88f9523e65 100644
--- a/src/renderer/src/store/copilot.ts
+++ b/src/renderer/src/store/copilot.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
 
diff --git a/src/renderer/src/store/index.ts b/src/renderer/src/store/index.ts
index 8d9176be15..4727bdc1e7 100644
--- a/src/renderer/src/store/index.ts
+++ b/src/renderer/src/store/index.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { loggerService } from '@logger'
 import { combineReducers, configureStore } from '@reduxjs/toolkit'
 import { useDispatch, useSelector, useStore } from 'react-redux'
@@ -67,7 +83,7 @@ const persistedReducer = persistReducer(
   {
     key: 'cherry-studio',
     storage,
-    version: 182,
+    version: 192,
     blacklist: ['runtime', 'messages', 'messageBlocks', 'tabs', 'toolPermissions'],
     migrate
   },
diff --git a/src/renderer/src/store/inputTools.ts b/src/renderer/src/store/inputTools.ts
index aad87dba9f..b9d2506523 100644
--- a/src/renderer/src/store/inputTools.ts
+++ b/src/renderer/src/store/inputTools.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
 import type { InputbarScope } from '@renderer/pages/home/Inputbar/types'
diff --git a/src/renderer/src/store/knowledge.ts b/src/renderer/src/store/knowledge.ts
index 6280a99e8d..a6a5026952 100644
--- a/src/renderer/src/store/knowledge.ts
+++ b/src/renderer/src/store/knowledge.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { loggerService } from '@logger'
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
diff --git a/src/renderer/src/store/llm.ts b/src/renderer/src/store/llm.ts
index 15f256382e..7e53f081bd 100644
--- a/src/renderer/src/store/llm.ts
+++ b/src/renderer/src/store/llm.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
 import { isLocalAi } from '@renderer/config/env'
diff --git a/src/renderer/src/store/mcp.ts b/src/renderer/src/store/mcp.ts
index aef38bcbe8..3b94248401 100644
--- a/src/renderer/src/store/mcp.ts
+++ b/src/renderer/src/store/mcp.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { loggerService } from '@logger'
 import { createSlice, nanoid, type PayloadAction } from '@reduxjs/toolkit'
 import { type BuiltinMCPServer, BuiltinMCPServerNames, type MCPConfig, type MCPServer } from '@renderer/types'
@@ -174,6 +190,25 @@ export const builtinMCPServers: BuiltinMCPServer[] = [
     provider: 'CherryAI',
     installSource: 'builtin',
     isTrusted: true
+  },
+  {
+    id: nanoid(),
+    name: BuiltinMCPServerNames.browser,
+    type: 'inMemory',
+    isActive: false,
+    provider: 'CherryAI',
+    installSource: 'builtin',
+    isTrusted: true
+  },
+  {
+    id: nanoid(),
+    name: BuiltinMCPServerNames.nowledgeMem,
+    reference: 'https://mem.nowledge.co/',
+    type: 'inMemory',
+    isActive: false,
+    provider: 'Nowledge',
+    installSource: 'builtin',
+    isTrusted: true
   }
 ] as const
 
diff --git a/src/renderer/src/store/memory.ts b/src/renderer/src/store/memory.ts
index 808f2154af..c4976d874a 100644
--- a/src/renderer/src/store/memory.ts
+++ b/src/renderer/src/store/memory.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { createSlice, type PayloadAction } from '@reduxjs/toolkit'
 import { factExtractionPrompt, updateMemorySystemPrompt } from '@renderer/utils/memory-prompts'
 import type { MemoryConfig } from '@types'
@@ -17,7 +33,7 @@ export interface MemoryState {
 
 // Default memory configuration to avoid undefined errors
 const defaultMemoryConfig: MemoryConfig = {
-  embedderDimensions: 1536,
+  embeddingDimensions: undefined,
   isAutoDimensions: true,
   customFactExtractionPrompt: factExtractionPrompt,
   customUpdateMemoryPrompt: updateMemorySystemPrompt
diff --git a/src/renderer/src/store/messageBlock.ts b/src/renderer/src/store/messageBlock.ts
index ba0e11be0a..c2719cdb13 100644
--- a/src/renderer/src/store/messageBlock.ts
+++ b/src/renderer/src/store/messageBlock.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { WebSearchResultBlock } from '@anthropic-ai/sdk/resources'
 import type OpenAI from '@cherrystudio/openai'
 import type { GroundingMetadata } from '@google/genai'
diff --git a/src/renderer/src/store/migrate.ts b/src/renderer/src/store/migrate.ts
index a80336e697..8719cdb7c1 100644
--- a/src/renderer/src/store/migrate.ts
+++ b/src/renderer/src/store/migrate.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { loggerService } from '@logger'
 import { nanoid } from '@reduxjs/toolkit'
 import {
@@ -18,6 +34,7 @@ import { TRANSLATE_PROMPT } from '@renderer/config/prompts'
 import { SYSTEM_PROVIDERS } from '@renderer/config/providers'
 import { DEFAULT_SIDEBAR_ICONS } from '@renderer/config/sidebar'
 import db from '@renderer/databases'
+import { getModel } from '@renderer/hooks/useModel'
 import i18n from '@renderer/i18n'
 import { DEFAULT_ASSISTANT_SETTINGS } from '@renderer/services/AssistantService'
 import { defaultPreprocessProviders } from '@renderer/store/preprocess'
@@ -2913,31 +2930,6 @@ const migrateConfig = {
       return state
     }
   },
-  '180': (state: RootState) => {
-    try {
-      if (state.settings.apiServer) {
-        state.settings.apiServer.host = API_SERVER_DEFAULTS.HOST
-      }
-      // @ts-expect-error
-      if (state.settings.openAI.summaryText === 'undefined') {
-        state.settings.openAI.summaryText = undefined
-      }
-      // @ts-expect-error
-      if (state.settings.openAI.verbosity === 'undefined') {
-        state.settings.openAI.verbosity = undefined
-      }
-      state.llm.providers.forEach((provider) => {
-        if (provider.id === SystemProviderIds.ollama) {
-          provider.type = 'ollama'
-        }
-      })
-      logger.info('migrate 180 success')
-      return state
-    } catch (error) {
-      logger.error('migrate 180 error', error as Error)
-      return state
-    }
-  },
   '181': (state: RootState) => {
     try {
       state.llm.providers.forEach((provider) => {
@@ -2976,6 +2968,197 @@ const migrateConfig = {
       logger.error('migrate 182 error', error as Error)
       return state
     }
+  },
+  '183': (state: RootState) => {
+    try {
+      state.llm.providers.forEach((provider) => {
+        if (provider.id === SystemProviderIds.cherryin) {
+          provider.apiHost = 'https://open.cherryin.cc'
+          provider.anthropicApiHost = 'https://open.cherryin.cc'
+        }
+      })
+      state.llm.providers = moveProvider(state.llm.providers, SystemProviderIds.poe, 10)
+      logger.info('migrate 183 success')
+      return state
+    } catch (error) {
+      logger.error('migrate 183 error', error as Error)
+      return state
+    }
+  },
+  '184': (state: RootState) => {
+    try {
+      // Add exa-mcp (free) web search provider if not exists
+      const exaMcpExists = state.websearch.providers.some((p) => p.id === 'exa-mcp')
+      if (!exaMcpExists) {
+        // Find the index of 'exa' provider to insert after it
+        const exaIndex = state.websearch.providers.findIndex((p) => p.id === 'exa')
+        const newProvider = {
+          id: 'exa-mcp' as const,
+          name: 'ExaMCP',
+          apiHost: 'https://mcp.exa.ai/mcp'
+        }
+        if (exaIndex !== -1) {
+          state.websearch.providers.splice(exaIndex + 1, 0, newProvider)
+        } else {
+          state.websearch.providers.push(newProvider)
+        }
+      }
+      logger.info('migrate 184 success')
+      return state
+    } catch (error) {
+      logger.error('migrate 184 error', error as Error)
+      return state
+    }
+  },
+  '185': (state: RootState) => {
+    try {
+      // Reset toolUseMode to function for default assistant
+      if (state.assistants.defaultAssistant.settings?.toolUseMode) {
+        state.assistants.defaultAssistant.settings.toolUseMode = 'function'
+      }
+      // Reset toolUseMode to function for assistants
+      state.assistants.assistants.forEach((assistant) => {
+        if (assistant.settings?.toolUseMode === 'prompt') {
+          if (assistant.model && isFunctionCallingModel(assistant.model)) {
+            assistant.settings.toolUseMode = 'function'
+          }
+        }
+      })
+      logger.info('migrate 185 success')
+      return state
+    } catch (error) {
+      logger.error('migrate 185 error', error as Error)
+      return state
+    }
+  },
+  '186': (state: RootState) => {
+    try {
+      if (state.settings.apiServer) {
+        state.settings.apiServer.host = API_SERVER_DEFAULTS.HOST
+      }
+      // @ts-expect-error
+      if (state.settings.openAI.summaryText === 'undefined') {
+        state.settings.openAI.summaryText = undefined
+      }
+      // @ts-expect-error
+      if (state.settings.openAI.verbosity === 'undefined') {
+        state.settings.openAI.verbosity = undefined
+      }
+      state.llm.providers.forEach((provider) => {
+        if (provider.id === SystemProviderIds.ollama) {
+          provider.type = 'ollama'
+        }
+      })
+      logger.info('migrate 186 success')
+      return state
+    } catch (error) {
+      logger.error('migrate 186 error', error as Error)
+      return state
+    }
+  },
+  '187': (state: RootState) => {
+    try {
+      state.assistants.assistants.forEach((assistant) => {
+        if (assistant.settings && assistant.settings.reasoning_effort === undefined) {
+          assistant.settings.reasoning_effort = 'default'
+        }
+      })
+      addProvider(state, 'mimo')
+      logger.info('migrate 187 success')
+      return state
+    } catch (error) {
+      logger.error('migrate 187 error', error as Error)
+      return state
+    }
+  },
+  // 1.7.7
+  '188': (state: RootState) => {
+    try {
+      state.llm.providers.forEach((provider) => {
+        if (provider.id === SystemProviderIds.openrouter) {
+          provider.anthropicApiHost = 'https://openrouter.ai/api'
+        }
+      })
+      logger.info('migrate 188 success')
+      return state
+    } catch (error) {
+      logger.error('migrate 188 error', error as Error)
+      return state
+    }
+  },
+  // 1.7.7
+  '189': (state: RootState) => {
+    try {
+      window.api.memory.migrateMemoryDb()
+      // @ts-ignore
+      const memoryLlmApiClient = state?.memory?.memoryConfig?.llmApiClient
+      // @ts-ignore
+      const memoryEmbeddingApiClient = state?.memory?.memoryConfig?.embedderApiClient
+
+      if (memoryLlmApiClient) {
+        state.memory.memoryConfig.llmModel = getModel(memoryLlmApiClient.model, memoryLlmApiClient.provider)
+        // @ts-ignore
+        delete state.memory.memoryConfig.llmApiClient
+      }
+
+      if (memoryEmbeddingApiClient) {
+        state.memory.memoryConfig.embeddingModel = getModel(
+          memoryEmbeddingApiClient.model,
+          memoryEmbeddingApiClient.provider
+        )
+        // @ts-ignore
+        delete state.memory.memoryConfig.embedderApiClient
+      }
+      return state
+    } catch (error) {
+      logger.error('migrate 189 error', error as Error)
+      return state
+    }
+  },
+  // 1.7.8
+  '190': (state: RootState) => {
+    try {
+      state.llm.providers.forEach((provider) => {
+        if (provider.id === SystemProviderIds.ollama) {
+          provider.type = 'ollama'
+        }
+      })
+      logger.info('migrate 190 success')
+      return state
+    } catch (error) {
+      logger.error('migrate 190 error', error as Error)
+      return state
+    }
+  },
+  '191': (state: RootState) => {
+    try {
+      state.llm.providers.forEach((provider) => {
+        if (provider.id === 'tokenflux') {
+          provider.apiHost = 'https://api.tokenflux.ai/openai/v1'
+          provider.anthropicApiHost = 'https://api.tokenflux.ai/anthropic'
+        }
+      })
+      logger.info('migrate 191 success')
+      return state
+    } catch (error) {
+      logger.error('migrate 191 error', error as Error)
+      return state
+    }
+  },
+  '192': (state: RootState) => {
+    try {
+      state.llm.providers.forEach((provider) => {
+        if (provider.id === '302ai') {
+          provider.anthropicApiHost = 'https://api.302.ai'
+        }
+      })
+      state.settings.readClipboardAtStartup = false
+      logger.info('migrate 192 success')
+      return state
+    } catch (error) {
+      logger.error('migrate 192 error', error as Error)
+      return state
+    }
   }
 }
 
diff --git a/src/renderer/src/store/minapps.ts b/src/renderer/src/store/minapps.ts
index 8ca59a5bd2..ac2a83440b 100644
--- a/src/renderer/src/store/minapps.ts
+++ b/src/renderer/src/store/minapps.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
 import { DEFAULT_MIN_APPS } from '@renderer/config/minapps'
diff --git a/src/renderer/src/store/newMessage.ts b/src/renderer/src/store/newMessage.ts
index cd8c0dde83..918ae3dc5b 100644
--- a/src/renderer/src/store/newMessage.ts
+++ b/src/renderer/src/store/newMessage.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { loggerService } from '@logger'
 import type { EntityState, PayloadAction } from '@reduxjs/toolkit'
 import { createEntityAdapter, createSlice } from '@reduxjs/toolkit'
diff --git a/src/renderer/src/store/note.ts b/src/renderer/src/store/note.ts
index 25347a8764..d571552831 100644
--- a/src/renderer/src/store/note.ts
+++ b/src/renderer/src/store/note.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
 import type { RootState } from '@renderer/store/index'
diff --git a/src/renderer/src/store/nutstore.ts b/src/renderer/src/store/nutstore.ts
index d494ec269f..bb9d426d8e 100644
--- a/src/renderer/src/store/nutstore.ts
+++ b/src/renderer/src/store/nutstore.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
 
diff --git a/src/renderer/src/store/ocr.ts b/src/renderer/src/store/ocr.ts
index 8e997bd6d5..29ee4085b7 100644
--- a/src/renderer/src/store/ocr.ts
+++ b/src/renderer/src/store/ocr.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
 import { BUILTIN_OCR_PROVIDERS, DEFAULT_OCR_PROVIDER } from '@renderer/config/ocr'
diff --git a/src/renderer/src/store/paintings.ts b/src/renderer/src/store/paintings.ts
index e5fc6f59e2..a7b509f531 100644
--- a/src/renderer/src/store/paintings.ts
+++ b/src/renderer/src/store/paintings.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { loggerService } from '@logger'
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
diff --git a/src/renderer/src/store/preprocess.ts b/src/renderer/src/store/preprocess.ts
index 29fc2993b7..8fee31b0ef 100644
--- a/src/renderer/src/store/preprocess.ts
+++ b/src/renderer/src/store/preprocess.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
 import type { PreprocessProvider } from '@renderer/types'
diff --git a/src/renderer/src/store/runtime.ts b/src/renderer/src/store/runtime.ts
index fcb87905f3..66fd161dcd 100644
--- a/src/renderer/src/store/runtime.ts
+++ b/src/renderer/src/store/runtime.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
 import { AppLogo, UserAvatar } from '@renderer/config/env'
@@ -34,6 +50,7 @@ export interface UpdateState {
   downloaded: boolean
   downloadProgress: number
   available: boolean
+  ignore: boolean
 }
 
 export interface RuntimeState {
@@ -79,7 +96,8 @@ const initialState: RuntimeState = {
     downloading: false,
     downloaded: false,
     downloadProgress: 0,
-    available: false
+    available: false,
+    ignore: false
   },
   export: {
     isExporting: false
diff --git a/src/renderer/src/store/selectionStore.ts b/src/renderer/src/store/selectionStore.ts
index fe63ae230e..89f44dd07a 100644
--- a/src/renderer/src/store/selectionStore.ts
+++ b/src/renderer/src/store/selectionStore.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
 import type { ActionItem, FilterMode, SelectionState, TriggerMode } from '@renderer/types/selectionTypes'
diff --git a/src/renderer/src/store/settings.ts b/src/renderer/src/store/settings.ts
index 572f722746..3ba3cc4da8 100644
--- a/src/renderer/src/store/settings.ts
+++ b/src/renderer/src/store/settings.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
 import { DEFAULT_STREAM_OPTIONS_INCLUDE_USAGE, isMac } from '@renderer/config/constant'
diff --git a/src/renderer/src/store/shortcuts.ts b/src/renderer/src/store/shortcuts.ts
index 9b4cc1341a..c8fabf8b04 100644
--- a/src/renderer/src/store/shortcuts.ts
+++ b/src/renderer/src/store/shortcuts.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
 import type { Shortcut } from '@renderer/types'
diff --git a/src/renderer/src/store/tabs.ts b/src/renderer/src/store/tabs.ts
index 87d7342779..c539cf20a0 100644
--- a/src/renderer/src/store/tabs.ts
+++ b/src/renderer/src/store/tabs.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
 
diff --git a/src/renderer/src/store/thunk/knowledgeThunk.ts b/src/renderer/src/store/thunk/knowledgeThunk.ts
index 97c435d169..b353e0af51 100644
--- a/src/renderer/src/store/thunk/knowledgeThunk.ts
+++ b/src/renderer/src/store/thunk/knowledgeThunk.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { loggerService } from '@logger'
 import { db } from '@renderer/databases'
 import { addFiles as addFilesAction, addItem, updateNotes } from '@renderer/store/knowledge'
diff --git a/src/renderer/src/store/thunk/messageThunk.ts b/src/renderer/src/store/thunk/messageThunk.ts
index a70fdf572d..aaa2ffc2c4 100644
--- a/src/renderer/src/store/thunk/messageThunk.ts
+++ b/src/renderer/src/store/thunk/messageThunk.ts
@@ -1,13 +1,29 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import { loggerService } from '@logger'
 import { AiSdkToChunkAdapter } from '@renderer/aiCore/chunk/AiSdkToChunkAdapter'
 import { AgentApiClient } from '@renderer/api/agent'
 import db from '@renderer/databases'
-import { fetchMessagesSummary } from '@renderer/services/ApiService'
+import { fetchMessagesSummary, transformMessagesAndFetch } from '@renderer/services/ApiService'
+import { dbService } from '@renderer/services/db'
 import { DbService } from '@renderer/services/db/DbService'
 import FileManager from '@renderer/services/FileManager'
 import { BlockManager } from '@renderer/services/messageStreaming/BlockManager'
 import { createCallbacks } from '@renderer/services/messageStreaming/callbacks'
-import { transformMessagesAndFetch } from '@renderer/services/OrchestrateService'
 import { endSpan } from '@renderer/services/SpanManagerService'
 import { createStreamProcessor, type StreamProcessorCallbacks } from '@renderer/services/StreamProcessingService'
 import store from '@renderer/store'
@@ -42,18 +58,18 @@ import { mutate } from 'swr'
 import type { AppDispatch, RootState } from '../index'
 import { removeManyBlocks, updateOneBlock, upsertManyBlocks, upsertOneBlock } from '../messageBlock'
 import { newMessagesActions, selectMessagesForTopic } from '../newMessage'
-import {
-  bulkAddBlocksV2,
-  clearMessagesFromDBV2,
-  deleteMessageFromDBV2,
-  deleteMessagesFromDBV2,
-  loadTopicMessagesThunkV2,
-  saveMessageAndBlocksToDBV2,
-  updateBlocksV2,
-  updateFileCountV2,
-  updateMessageV2,
-  updateSingleBlockV2
-} from './messageThunk.v2'
+// import {
+//   bulkAddBlocksV2,
+//   clearMessagesFromDBV2,
+//   deleteMessageFromDBV2,
+//   deleteMessagesFromDBV2,
+//   loadTopicMessagesThunkV2,
+//   saveMessageAndBlocksToDBV2,
+//   updateBlocksV2,
+//   updateFileCountV2,
+//   updateMessageV2,
+//   updateSingleBlockV2
+// } from './messageThunk.v2'
 
 const logger = loggerService.withContext('MessageThunk')
 
@@ -348,9 +364,9 @@ const createAgentMessageStream = async (
   return createSSEReadableStream(response.body, signal)
 }
 // TODO: 后续可以将db操作移到Listener Middleware中
-export const saveMessageAndBlocksToDB = async (message: Message, blocks: MessageBlock[], messageIndex: number = -1) => {
-  return saveMessageAndBlocksToDBV2(message.topicId, message, blocks, messageIndex)
-}
+// export const saveMessageAndBlocksToDB = async (message: Message, blocks: MessageBlock[], messageIndex: number = -1) => {
+//   return saveMessageAndBlocksToDBV2(message.topicId, message, blocks, messageIndex)
+// }
 
 const updateExistingMessageAndBlocksInDB = async (
   updatedMessage: Partial<Message> & Pick<Message, 'id' | 'topicId'>,
@@ -359,7 +375,7 @@ const updateExistingMessageAndBlocksInDB = async (
   try {
     // Always update blocks if provided
     if (updatedBlocks.length > 0) {
-      await updateBlocksV2(updatedBlocks)
+      await updateBlocks(updatedBlocks)
     }
 
     // Check if there are message properties to update beyond id and topicId
@@ -371,7 +387,7 @@ const updateExistingMessageAndBlocksInDB = async (
         return acc
       }, {})
 
-      await updateMessageV2(updatedMessage.topicId, updatedMessage.id, messageUpdatesPayload)
+      await updateMessage(updatedMessage.topicId, updatedMessage.id, messageUpdatesPayload)
 
       store.dispatch(updateTopicUpdatedAt({ topicId: updatedMessage.topicId }))
     }
@@ -417,7 +433,7 @@ const getBlockThrottler = (id: string) => {
       })
 
       blockUpdateRafs.set(id, rafId)
-      await updateSingleBlockV2(id, blockUpdate)
+      await updateSingleBlock(id, blockUpdate)
     }, 150)
 
     blockUpdateThrottlers.set(id, throttler)
@@ -814,6 +830,9 @@ const fetchAndProcessAssistantResponseImpl = async (
         messages: messagesForContext,
         assistant,
         topicId,
+        blockManager,
+        assistantMsgId,
+        callbacks,
         options: {
           signal: abortController.signal,
           timeout: 30000,
@@ -875,7 +894,7 @@ export const sendMessage =
         userMessage.agentSessionId = activeAgentSession.agentSessionId
       }
 
-      await saveMessageAndBlocksToDB(userMessage, userMessageBlocks)
+      await saveMessageAndBlocksToDB(topicId, userMessage, userMessageBlocks)
       dispatch(newMessagesActions.addMessage({ topicId, message: userMessage }))
       if (userMessageBlocks.length > 0) {
         dispatch(upsertManyBlocks(userMessageBlocks))
@@ -893,7 +912,7 @@ export const sendMessage =
         if (activeAgentSession.agentSessionId && !assistantMessage.agentSessionId) {
           assistantMessage.agentSessionId = activeAgentSession.agentSessionId
         }
-        await saveMessageAndBlocksToDB(assistantMessage, [])
+        await saveMessageAndBlocksToDB(topicId, assistantMessage, [])
         dispatch(newMessagesActions.addMessage({ topicId, message: assistantMessage }))
 
         queue.add(async () => {
@@ -916,7 +935,7 @@ export const sendMessage =
             model: assistant.model,
             traceId: userMessage.traceId
           })
-          await saveMessageAndBlocksToDB(assistantMessage, [])
+          await saveMessageAndBlocksToDB(topicId, assistantMessage, [])
           dispatch(newMessagesActions.addMessage({ topicId, message: assistantMessage }))
 
           queue.add(async () => {
@@ -982,11 +1001,11 @@ export const loadAgentSessionMessagesThunk =
  * Loads messages and their blocks for a specific topic from the database
  * and updates the Redux store.
  */
-export const loadTopicMessagesThunk =
-  (topicId: string, forceReload: boolean = false) =>
-  async (dispatch: AppDispatch, getState: () => RootState) => {
-    return loadTopicMessagesThunkV2(topicId, forceReload)(dispatch, getState)
-  }
+// export const loadTopicMessagesThunk =
+//   (topicId: string, forceReload: boolean = false) =>
+//   async (dispatch: AppDispatch, getState: () => RootState) => {
+//     return loadTopicMessagesThunkV2(topicId, forceReload)(dispatch, getState)
+//   }
 
 /**
  * Thunk to delete a single message and its associated blocks.
@@ -1005,7 +1024,7 @@ export const deleteSingleMessageThunk =
     try {
       dispatch(newMessagesActions.removeMessage({ topicId, messageId }))
       cleanupMultipleBlocks(dispatch, blockIdsToDelete)
-      await deleteMessageFromDBV2(topicId, messageId)
+      await deleteMessageFromDB(topicId, messageId)
     } catch (error) {
       logger.error(`[deleteSingleMessage] Failed to delete message ${messageId}:`, error as Error)
     }
@@ -1044,7 +1063,7 @@ export const deleteMessageGroupThunk =
     try {
       dispatch(newMessagesActions.removeMessagesByAskId({ topicId, askId }))
       cleanupMultipleBlocks(dispatch, blockIdsToDelete)
-      await deleteMessagesFromDBV2(topicId, messageIdsToDelete)
+      await deleteMessagesFromDB(topicId, messageIdsToDelete)
     } catch (error) {
       logger.error(`[deleteMessageGroup] Failed to delete messages with askId ${askId}:`, error as Error)
     }
@@ -1069,7 +1088,7 @@ export const clearTopicMessagesThunk =
 
       dispatch(newMessagesActions.clearTopicMessages(topicId))
       cleanupMultipleBlocks(dispatch, blockIdsToDelete)
-      await clearMessagesFromDBV2(topicId)
+      await clearMessagesFromDB(topicId)
     } catch (error) {
       logger.error(`[clearTopicMessagesThunk] Failed to clear messages for topic ${topicId}:`, error as Error)
     }
@@ -1390,7 +1409,7 @@ export const updateTranslationBlockThunk =
       // 更新Redux状态
       dispatch(updateOneBlock({ id: blockId, changes }))
 
-      await updateSingleBlockV2(blockId, changes)
+      await updateSingleBlock(blockId, changes)
       // Logger.log(`[updateTranslationBlockThunk] Successfully updated translation block ${blockId}.`)
     } catch (error) {
       logger.error(`[updateTranslationBlockThunk] Failed to update translation block ${blockId}:`, error as Error)
@@ -1461,7 +1480,7 @@ export const appendAssistantResponseThunk =
       const insertAtIndex = existingMessageIndex !== -1 ? existingMessageIndex + 1 : currentTopicMessageIds.length
 
       // 4. Update Database (Save the stub to the topic's message list)
-      await saveMessageAndBlocksToDB(newAssistantMessageStub, [], insertAtIndex)
+      await saveMessageAndBlocksToDB(topicId, newAssistantMessageStub, [], insertAtIndex)
 
       dispatch(
         newMessagesActions.insertMessageAtIndex({ topicId, message: newAssistantMessageStub, index: insertAtIndex })
@@ -1613,12 +1632,12 @@ export const cloneMessagesToNewTopicThunk =
 
         // Add the NEW blocks
         if (clonedBlocks.length > 0) {
-          await bulkAddBlocksV2(clonedBlocks)
+          await bulkAddBlocks(clonedBlocks)
         }
         // Update file counts
         const uniqueFiles = [...new Map(filesToUpdateCount.map((f) => [f.id, f])).values()]
         for (const file of uniqueFiles) {
-          await updateFileCountV2(file.id, 1, false)
+          await updateFileCount(file.id, 1, false)
         }
       })
 
@@ -1672,11 +1691,11 @@ export const updateMessageAndBlocksThunk =
       }
       // Update message properties if provided
       if (messageUpdates && Object.keys(messageUpdates).length > 0 && messageId) {
-        await updateMessageV2(topicId, messageId, messageUpdates)
+        await updateMessage(topicId, messageId, messageUpdates)
       }
       // Update blocks if provided
       if (blockUpdatesList.length > 0) {
-        await updateBlocksV2(blockUpdatesList)
+        await updateBlocks(blockUpdatesList)
       }
 
       dispatch(updateTopicUpdatedAt({ topicId }))
@@ -1730,3 +1749,197 @@ export const removeBlocksThunk =
       throw error
     }
   }
+
+//以下内容从原 messageThunk.v2.ts 迁移过来，原文件已经删除
+//原因：v2.ts并不是v2数据重构的一部分，而相关命名对v2重构造成重大误解，故两文件合并，以消除误解
+
+/**
+ * Load messages for a topic using unified DbService
+ */
+export const loadTopicMessagesThunk =
+  (topicId: string, forceReload: boolean = false) =>
+  async (dispatch: AppDispatch, getState: () => RootState) => {
+    const state = getState()
+
+    dispatch(newMessagesActions.setCurrentTopicId(topicId))
+
+    // Skip if already cached and not forcing reload
+    if (!forceReload && state.messages.messageIdsByTopic[topicId]) {
+      return
+    }
+
+    try {
+      dispatch(newMessagesActions.setTopicLoading({ topicId, loading: true }))
+
+      // Unified call - no need to check isAgentSessionTopicId
+      const { messages, blocks } = await dbService.fetchMessages(topicId)
+
+      logger.silly('Loaded messages via DbService', {
+        topicId,
+        messageCount: messages.length,
+        blockCount: blocks.length
+      })
+
+      // Update Redux state with fetched data
+      if (blocks.length > 0) {
+        dispatch(upsertManyBlocks(blocks))
+      }
+      dispatch(newMessagesActions.messagesReceived({ topicId, messages }))
+    } catch (error) {
+      logger.error(`Failed to load messages for topic ${topicId}:`, error as Error)
+      // Could dispatch an error action here if needed
+    } finally {
+      dispatch(newMessagesActions.setTopicLoading({ topicId, loading: false }))
+    }
+  }
+
+/**
+ * Get raw topic data using unified DbService
+ * Returns topic with messages array
+ */
+export const getRawTopic = async (topicId: string): Promise<{ id: string; messages: Message[] } | undefined> => {
+  try {
+    const rawTopic = await dbService.getRawTopic(topicId)
+    logger.silly('Retrieved raw topic via DbService', { topicId, found: !!rawTopic })
+    return rawTopic
+  } catch (error) {
+    logger.error('Failed to get raw topic:', { topicId, error })
+    return undefined
+  }
+}
+
+/**
+ * Update file reference count
+ * Only applies to Dexie data source, no-op for agent sessions
+ */
+export const updateFileCount = async (fileId: string, delta: number, deleteIfZero: boolean = false): Promise<void> => {
+  try {
+    // Pass all parameters to dbService, including deleteIfZero
+    await dbService.updateFileCount(fileId, delta, deleteIfZero)
+    logger.silly('Updated file count', { fileId, delta, deleteIfZero })
+  } catch (error) {
+    logger.error('Failed to update file count:', { fileId, delta, error })
+    throw error
+  }
+}
+
+/**
+ * Delete a single message from database
+ */
+export const deleteMessageFromDB = async (topicId: string, messageId: string): Promise<void> => {
+  try {
+    await dbService.deleteMessage(topicId, messageId)
+    logger.silly('Deleted message via DbService', { topicId, messageId })
+  } catch (error) {
+    logger.error('Failed to delete message:', { topicId, messageId, error })
+    throw error
+  }
+}
+
+/**
+ * Delete multiple messages from database
+ */
+export const deleteMessagesFromDB = async (topicId: string, messageIds: string[]): Promise<void> => {
+  try {
+    await dbService.deleteMessages(topicId, messageIds)
+    logger.silly('Deleted messages via DbService', { topicId, count: messageIds.length })
+  } catch (error) {
+    logger.error('Failed to delete messages:', { topicId, messageIds, error })
+    throw error
+  }
+}
+
+/**
+ * Clear all messages from a topic
+ */
+export const clearMessagesFromDB = async (topicId: string): Promise<void> => {
+  try {
+    await dbService.clearMessages(topicId)
+    logger.silly('Cleared all messages via DbService', { topicId })
+  } catch (error) {
+    logger.error('Failed to clear messages:', { topicId, error })
+    throw error
+  }
+}
+
+/**
+ * Save a message and its blocks to database
+ * Uses unified interface, no need for isAgentSessionTopicId check
+ */
+export const saveMessageAndBlocksToDB = async (
+  topicId: string,
+  message: Message,
+  blocks: MessageBlock[],
+  messageIndex: number = -1
+): Promise<void> => {
+  try {
+    const blockIds = blocks.map((block) => block.id)
+    const shouldSyncBlocks =
+      blockIds.length > 0 && (!message.blocks || blockIds.some((id, index) => message.blocks?.[index] !== id))
+
+    const messageWithBlocks = shouldSyncBlocks ? { ...message, blocks: blockIds } : message
+    // Direct call without conditional logic, now with messageIndex
+    await dbService.appendMessage(topicId, messageWithBlocks, blocks, messageIndex)
+    logger.silly('Saved message and blocks via DbService', {
+      topicId,
+      messageId: message.id,
+      blockCount: blocks.length,
+      messageIndex
+    })
+  } catch (error) {
+    logger.error('Failed to save message and blocks:', { topicId, messageId: message.id, error })
+    throw error
+  }
+}
+
+/**
+ * Update a message in the database
+ */
+export const updateMessage = async (topicId: string, messageId: string, updates: Partial<Message>): Promise<void> => {
+  try {
+    await dbService.updateMessage(topicId, messageId, updates)
+    logger.silly('Updated message via DbService', { topicId, messageId })
+  } catch (error) {
+    logger.error('Failed to update message:', { topicId, messageId, error })
+    throw error
+  }
+}
+
+/**
+ * Update a single message block
+ */
+export const updateSingleBlock = async (blockId: string, updates: Partial<MessageBlock>): Promise<void> => {
+  try {
+    await dbService.updateSingleBlock(blockId, updates)
+    logger.silly('Updated single block via DbService', { blockId })
+  } catch (error) {
+    logger.error('Failed to update single block:', { blockId, error })
+    throw error
+  }
+}
+
+/**
+ * Bulk add message blocks (for new blocks)
+ */
+export const bulkAddBlocks = async (blocks: MessageBlock[]): Promise<void> => {
+  try {
+    await dbService.bulkAddBlocks(blocks)
+    logger.silly('Bulk added blocks via DbService', { count: blocks.length })
+  } catch (error) {
+    logger.error('Failed to bulk add blocks:', { count: blocks.length, error })
+    throw error
+  }
+}
+
+/**
+ * Update multiple message blocks (upsert operation)
+ */
+export const updateBlocks = async (blocks: MessageBlock[]): Promise<void> => {
+  try {
+    await dbService.updateBlocks(blocks)
+    logger.silly('Updated blocks via DbService', { count: blocks.length })
+  } catch (error) {
+    logger.error('Failed to update blocks:', { count: blocks.length, error })
+    throw error
+  }
+}
diff --git a/src/renderer/src/store/thunk/messageThunk.v2.ts b/src/renderer/src/store/thunk/messageThunk.v2.ts
deleted file mode 100644
index ec0aed947b..0000000000
--- a/src/renderer/src/store/thunk/messageThunk.v2.ts
+++ /dev/null
@@ -1,233 +0,0 @@
-/**
- * V2 implementations of message thunk functions using the unified DbService
- * These implementations will be gradually rolled out using feature flags
- */
-
-import { loggerService } from '@logger'
-import { dbService } from '@renderer/services/db'
-import type { Message, MessageBlock } from '@renderer/types/newMessage'
-
-import type { AppDispatch, RootState } from '../index'
-import { upsertManyBlocks } from '../messageBlock'
-import { newMessagesActions } from '../newMessage'
-
-const logger = loggerService.withContext('MessageThunkV2')
-
-// =================================================================
-// Phase 2.1 - Batch 1: Read-only operations (lowest risk)
-// =================================================================
-
-/**
- * Load messages for a topic using unified DbService
- * This is the V2 implementation that will replace the original
- */
-export const loadTopicMessagesThunkV2 =
-  (topicId: string, forceReload: boolean = false) =>
-  async (dispatch: AppDispatch, getState: () => RootState) => {
-    const state = getState()
-
-    dispatch(newMessagesActions.setCurrentTopicId(topicId))
-
-    // Skip if already cached and not forcing reload
-    if (!forceReload && state.messages.messageIdsByTopic[topicId]) {
-      return
-    }
-
-    try {
-      dispatch(newMessagesActions.setTopicLoading({ topicId, loading: true }))
-
-      // Unified call - no need to check isAgentSessionTopicId
-      const { messages, blocks } = await dbService.fetchMessages(topicId)
-
-      logger.silly('Loaded messages via DbService', {
-        topicId,
-        messageCount: messages.length,
-        blockCount: blocks.length
-      })
-
-      // Update Redux state with fetched data
-      if (blocks.length > 0) {
-        dispatch(upsertManyBlocks(blocks))
-      }
-      dispatch(newMessagesActions.messagesReceived({ topicId, messages }))
-    } catch (error) {
-      logger.error(`Failed to load messages for topic ${topicId}:`, error as Error)
-      // Could dispatch an error action here if needed
-    } finally {
-      dispatch(newMessagesActions.setTopicLoading({ topicId, loading: false }))
-    }
-  }
-
-/**
- * Get raw topic data using unified DbService
- * Returns topic with messages array
- */
-export const getRawTopicV2 = async (topicId: string): Promise<{ id: string; messages: Message[] } | undefined> => {
-  try {
-    const rawTopic = await dbService.getRawTopic(topicId)
-    logger.silly('Retrieved raw topic via DbService', { topicId, found: !!rawTopic })
-    return rawTopic
-  } catch (error) {
-    logger.error('Failed to get raw topic:', { topicId, error })
-    return undefined
-  }
-}
-
-// =================================================================
-// Phase 2.2 - Batch 2: Helper functions
-// =================================================================
-
-/**
- * Update file reference count
- * Only applies to Dexie data source, no-op for agent sessions
- */
-export const updateFileCountV2 = async (
-  fileId: string,
-  delta: number,
-  deleteIfZero: boolean = false
-): Promise<void> => {
-  try {
-    // Pass all parameters to dbService, including deleteIfZero
-    await dbService.updateFileCount(fileId, delta, deleteIfZero)
-    logger.silly('Updated file count', { fileId, delta, deleteIfZero })
-  } catch (error) {
-    logger.error('Failed to update file count:', { fileId, delta, error })
-    throw error
-  }
-}
-
-// =================================================================
-// Phase 2.3 - Batch 3: Delete operations
-// =================================================================
-
-/**
- * Delete a single message from database
- */
-export const deleteMessageFromDBV2 = async (topicId: string, messageId: string): Promise<void> => {
-  try {
-    await dbService.deleteMessage(topicId, messageId)
-    logger.silly('Deleted message via DbService', { topicId, messageId })
-  } catch (error) {
-    logger.error('Failed to delete message:', { topicId, messageId, error })
-    throw error
-  }
-}
-
-/**
- * Delete multiple messages from database
- */
-export const deleteMessagesFromDBV2 = async (topicId: string, messageIds: string[]): Promise<void> => {
-  try {
-    await dbService.deleteMessages(topicId, messageIds)
-    logger.silly('Deleted messages via DbService', { topicId, count: messageIds.length })
-  } catch (error) {
-    logger.error('Failed to delete messages:', { topicId, messageIds, error })
-    throw error
-  }
-}
-
-/**
- * Clear all messages from a topic
- */
-export const clearMessagesFromDBV2 = async (topicId: string): Promise<void> => {
-  try {
-    await dbService.clearMessages(topicId)
-    logger.silly('Cleared all messages via DbService', { topicId })
-  } catch (error) {
-    logger.error('Failed to clear messages:', { topicId, error })
-    throw error
-  }
-}
-
-// =================================================================
-// Phase 2.4 - Batch 4: Complex write operations
-// =================================================================
-
-/**
- * Save a message and its blocks to database
- * Uses unified interface, no need for isAgentSessionTopicId check
- */
-export const saveMessageAndBlocksToDBV2 = async (
-  topicId: string,
-  message: Message,
-  blocks: MessageBlock[],
-  messageIndex: number = -1
-): Promise<void> => {
-  try {
-    const blockIds = blocks.map((block) => block.id)
-    const shouldSyncBlocks =
-      blockIds.length > 0 && (!message.blocks || blockIds.some((id, index) => message.blocks?.[index] !== id))
-
-    const messageWithBlocks = shouldSyncBlocks ? { ...message, blocks: blockIds } : message
-    // Direct call without conditional logic, now with messageIndex
-    await dbService.appendMessage(topicId, messageWithBlocks, blocks, messageIndex)
-    logger.silly('Saved message and blocks via DbService', {
-      topicId,
-      messageId: message.id,
-      blockCount: blocks.length,
-      messageIndex
-    })
-  } catch (error) {
-    logger.error('Failed to save message and blocks:', { topicId, messageId: message.id, error })
-    throw error
-  }
-}
-
-// Note: sendMessageV2 would be implemented here but it's more complex
-// and would require more of the supporting code from messageThunk.ts
-
-// =================================================================
-// Phase 2.5 - Batch 5: Update operations
-// =================================================================
-
-/**
- * Update a message in the database
- */
-export const updateMessageV2 = async (topicId: string, messageId: string, updates: Partial<Message>): Promise<void> => {
-  try {
-    await dbService.updateMessage(topicId, messageId, updates)
-    logger.silly('Updated message via DbService', { topicId, messageId })
-  } catch (error) {
-    logger.error('Failed to update message:', { topicId, messageId, error })
-    throw error
-  }
-}
-
-/**
- * Update a single message block
- */
-export const updateSingleBlockV2 = async (blockId: string, updates: Partial<MessageBlock>): Promise<void> => {
-  try {
-    await dbService.updateSingleBlock(blockId, updates)
-    logger.silly('Updated single block via DbService', { blockId })
-  } catch (error) {
-    logger.error('Failed to update single block:', { blockId, error })
-    throw error
-  }
-}
-
-/**
- * Bulk add message blocks (for new blocks)
- */
-export const bulkAddBlocksV2 = async (blocks: MessageBlock[]): Promise<void> => {
-  try {
-    await dbService.bulkAddBlocks(blocks)
-    logger.silly('Bulk added blocks via DbService', { count: blocks.length })
-  } catch (error) {
-    logger.error('Failed to bulk add blocks:', { count: blocks.length, error })
-    throw error
-  }
-}
-
-/**
- * Update multiple message blocks (upsert operation)
- */
-export const updateBlocksV2 = async (blocks: MessageBlock[]): Promise<void> => {
-  try {
-    await dbService.updateBlocks(blocks)
-    logger.silly('Updated blocks via DbService', { count: blocks.length })
-  } catch (error) {
-    logger.error('Failed to update blocks:', { count: blocks.length, error })
-    throw error
-  }
-}
diff --git a/src/renderer/src/store/toolPermissions.ts b/src/renderer/src/store/toolPermissions.ts
index cd31b16af8..a283956daa 100644
--- a/src/renderer/src/store/toolPermissions.ts
+++ b/src/renderer/src/store/toolPermissions.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { PermissionUpdate } from '@anthropic-ai/claude-agent-sdk'
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
diff --git a/src/renderer/src/store/translate.ts b/src/renderer/src/store/translate.ts
index 0e4c56e731..752a067739 100644
--- a/src/renderer/src/store/translate.ts
+++ b/src/renderer/src/store/translate.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
 
diff --git a/src/renderer/src/store/websearch.ts b/src/renderer/src/store/websearch.ts
index f166bb1949..a43db4947b 100644
--- a/src/renderer/src/store/websearch.ts
+++ b/src/renderer/src/store/websearch.ts
@@ -1,3 +1,19 @@
+/**
+ * @deprecated Scheduled for removal in v2.0.0
+ * --------------------------------------------------------------------------
+ * ⚠️ NOTICE: V2 DATA&UI REFACTORING (by 0xfullex)
+ * --------------------------------------------------------------------------
+ * STOP: Feature PRs affecting this file are currently BLOCKED.
+ * Only critical bug fixes are accepted during this migration phase.
+ *
+ * This file is being refactored to v2 standards.
+ * Any non-critical changes will conflict with the ongoing work.
+ *
+ * 🔗 Context & Status:
+ * - Contribution Hold: https://github.com/CherryHQ/cherry-studio/issues/10954
+ * - v2 Refactor PR   : https://github.com/CherryHQ/cherry-studio/pull/10162
+ * --------------------------------------------------------------------------
+ */
 import type { PayloadAction } from '@reduxjs/toolkit'
 import { createSlice } from '@reduxjs/toolkit'
 import { WEB_SEARCH_PROVIDERS } from '@renderer/config/webSearchProviders'
diff --git a/src/renderer/src/types/chat.ts b/src/renderer/src/types/chat.ts
index 1e51c23768..75b15fae0c 100644
--- a/src/renderer/src/types/chat.ts
+++ b/src/renderer/src/types/chat.ts
@@ -1,4 +1,4 @@
-export type Tab = 'assistants' | 'topic' | 'settings'
+export type Tab = 'assistants' | 'topic'
 
 export type InputBarToolType =
   | 'new_topic'
diff --git a/src/renderer/src/types/index.ts b/src/renderer/src/types/index.ts
index 128d2be707..388b61d248 100644
--- a/src/renderer/src/types/index.ts
+++ b/src/renderer/src/types/index.ts
@@ -88,24 +88,30 @@ const ThinkModelTypes = [
   'gpt5_1',
   'gpt5_codex',
   'gpt5_1_codex',
+  'gpt5_1_codex_max',
+  'gpt5_2',
   'gpt5pro',
+  'gpt52pro',
+  'gpt_oss',
   'grok',
   'grok4_fast',
-  'gemini',
-  'gemini_pro',
-  'gemini3',
+  'gemini2_flash',
+  'gemini2_pro',
+  'gemini3_flash',
+  'gemini3_pro',
   'qwen',
   'qwen_thinking',
   'doubao',
   'doubao_no_auto',
   'doubao_after_251015',
+  'mimo',
   'hunyuan',
   'zhipu',
   'perplexity',
   'deepseek_hybrid'
 ] as const
 
-export type ReasoningEffortOption = NonNullable<OpenAI.ReasoningEffort> | 'auto'
+export type ReasoningEffortOption = NonNullable<OpenAI.ReasoningEffort> | 'auto' | 'default'
 export type ThinkingOption = ReasoningEffortOption
 export type ThinkingModelType = (typeof ThinkModelTypes)[number]
 export type ThinkingOptionConfig = Record<ThinkingModelType, ThinkingOption[]>
@@ -117,11 +123,14 @@ export function isThinkModelType(type: string): type is ThinkingModelType {
 }
 
 export const EFFORT_RATIO: EffortRatio = {
+  // 'default' is not expected to be used.
+  default: 0,
   none: 0.01,
   minimal: 0.05,
   low: 0.05,
   medium: 0.5,
   high: 0.8,
+  xhigh: 0.9,
   auto: 2
 }
 
@@ -136,12 +145,11 @@ export type AssistantSettings = {
   streamOutput: boolean
   defaultModel?: Model
   customParameters?: AssistantSettingCustomParameters[]
-  reasoning_effort?: ReasoningEffortOption
-  /** 保留上一次使用思考模型时的 reasoning effort, 在从非思考模型切换到思考模型时恢复.
-   *
-   * TODO: 目前 reasoning_effort === undefined 有两个语义，有的场景是显式关闭思考，有的场景是不传参。
-   * 未来应该重构思考控制，将启用/关闭思考和思考选项分离，这样就不用依赖 cache 了。
-   *
+  reasoning_effort: ReasoningEffortOption
+  /**
+   * Preserve the effective reasoning effort (not 'default') from the last use of a thinking model which supports thinking control,
+   * and restore it when switching back from a non-thinking or fixed reasoning model.
+   * FIXME: It should be managed by external cache service instead of being stored in the assistant
    */
   reasoning_effort_cache?: ReasoningEffortOption
   qwenThinkMode?: boolean
@@ -388,6 +396,7 @@ export interface DmxapiPainting extends PaintingParams {
   autoCreate?: boolean
   generationMode?: generationModeType
   priceModel?: string
+  extend_params?: Record<string, unknown>
 }
 
 export interface TokenFluxPainting extends PaintingParams {
@@ -464,6 +473,7 @@ export type LanguageVarious =
   | 'fr-FR'
   | 'ja-JP'
   | 'pt-PT'
+  | 'ro-RO'
   | 'ru-RU'
 
 export type CodeStyleVarious = 'auto' | string
@@ -596,6 +606,7 @@ export const WebSearchProviderIds = {
   tavily: 'tavily',
   searxng: 'searxng',
   exa: 'exa',
+  'exa-mcp': 'exa-mcp',
   bocha: 'bocha',
   'local-google': 'local-google',
   'local-bing': 'local-bing',
@@ -744,7 +755,9 @@ export const BuiltinMCPServerNames = {
   filesystem: '@cherry/filesystem',
   difyKnowledge: '@cherry/dify-knowledge',
   python: '@cherry/python',
-  didiMCP: '@cherry/didi-mcp'
+  didiMCP: '@cherry/didi-mcp',
+  browser: '@cherry/browser',
+  nowledgeMem: '@cherry/nowledge-mem'
 } as const
 
 export type BuiltinMCPServerName = (typeof BuiltinMCPServerNames)[keyof typeof BuiltinMCPServerNames]
@@ -905,17 +918,11 @@ export * from './tool'
 // Memory Service Types
 // ========================================================================
 export interface MemoryConfig {
-  /**
-   * @deprecated use embedderApiClient instead
-   */
-  embedderModel?: Model
-  embedderDimensions?: number
-  /**
-   * @deprecated use llmApiClient instead
-   */
+  embeddingDimensions?: number
+  embeddingModel?: Model
   llmModel?: Model
-  embedderApiClient?: ApiClient
-  llmApiClient?: ApiClient
+  // Dynamically retrieved, not persistently stored
+  embeddingApiClient?: ApiClient
   customFactExtractionPrompt?: string
   customUpdateMemoryPrompt?: string
   /** Indicates whether embedding dimensions are automatically detected */
diff --git a/src/renderer/src/types/provider.ts b/src/renderer/src/types/provider.ts
index 4e3e34760c..edab3a7305 100644
--- a/src/renderer/src/types/provider.ts
+++ b/src/renderer/src/types/provider.ts
@@ -189,7 +189,8 @@ export const SystemProviderIdSchema = z.enum([
   'huggingface',
   'sophnet',
   'gateway',
-  'cerebras'
+  'cerebras',
+  'mimo'
 ])
 
 export type SystemProviderId = z.infer<typeof SystemProviderIdSchema>
@@ -258,7 +259,8 @@ export const SystemProviderIds = {
   longcat: 'longcat',
   huggingface: 'huggingface',
   gateway: 'gateway',
-  cerebras: 'cerebras'
+  cerebras: 'cerebras',
+  mimo: 'mimo'
 } as const satisfies Record<SystemProviderId, SystemProviderId>
 
 type SystemProviderIdTypeMap = typeof SystemProviderIds
diff --git a/src/renderer/src/types/sdk.ts b/src/renderer/src/types/sdk.ts
index 33ea9286aa..083e450549 100644
--- a/src/renderer/src/types/sdk.ts
+++ b/src/renderer/src/types/sdk.ts
@@ -74,13 +74,13 @@ export type RequestOptions = Anthropic.RequestOptions | OpenAI.RequestOptions |
  */
 
 type OpenAIParamsPurified = Omit<OpenAI.Chat.Completions.ChatCompletionCreateParams, 'reasoning_effort' | 'modalities'>
-
+type OpenAIReasoningEffort = NonNullable<OpenAI.ReasoningEffort> | 'auto'
 export type ReasoningEffortOptionalParams = {
   thinking?: { type: 'disabled' | 'enabled' | 'auto'; budget_tokens?: number }
   reasoning?: { max_tokens?: number; exclude?: boolean; effort?: string; enabled?: boolean } | OpenAI.Reasoning
-  reasoningEffort?: OpenAI.Chat.Completions.ChatCompletionCreateParams['reasoning_effort'] | 'none' | 'auto'
+  reasoningEffort?: OpenAIReasoningEffort
   // WARN: This field will be overwrite to undefined by aisdk if the provider is openai-compatible. Use reasoningEffort instead.
-  reasoning_effort?: OpenAI.Chat.Completions.ChatCompletionCreateParams['reasoning_effort'] | 'none' | 'auto'
+  reasoning_effort?: OpenAIReasoningEffort
   enable_thinking?: boolean
   thinking_budget?: number
   incremental_output?: boolean
@@ -100,7 +100,7 @@ export type ReasoningEffortOptionalParams = {
       type: 'enabled' | 'disabled'
     }
     thinking_budget?: number
-    reasoning_effort?: OpenAI.Chat.Completions.ChatCompletionCreateParams['reasoning_effort'] | 'auto'
+    reasoning_effort?: OpenAIReasoningEffort
   }
   disable_reasoning?: boolean
   // Add any other potential reasoning-related keys here if they exist
diff --git a/src/renderer/src/utils/__tests__/api.test.ts b/src/renderer/src/utils/__tests__/api.test.ts
index fe34dcf26e..ad64dc0d73 100644
--- a/src/renderer/src/utils/__tests__/api.test.ts
+++ b/src/renderer/src/utils/__tests__/api.test.ts
@@ -1,5 +1,6 @@
 import store from '@renderer/store'
 import type { VertexProvider } from '@renderer/types'
+import { getTrailingApiVersion, withoutTrailingApiVersion } from '@shared/utils'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import {
@@ -8,13 +9,12 @@ import {
   formatAzureOpenAIApiHost,
   formatOllamaApiHost,
   formatVertexApiHost,
-  getTrailingApiVersion,
   hasAPIVersion,
+  isWithTrailingSharp,
   maskApiKey,
   routeToEndpoint,
   splitApiKeyString,
   validateApiHost,
-  withoutTrailingApiVersion,
   withoutTrailingSharp
 } from '../api'
 
@@ -450,6 +450,43 @@ describe('api', () => {
     it('returns undefined for empty string', () => {
       expect(getTrailingApiVersion('')).toBeUndefined()
     })
+
+    it('returns undefined when URL ends with # regardless of version', () => {
+      expect(getTrailingApiVersion('https://api.example.com/v1#')).toBeUndefined()
+      expect(getTrailingApiVersion('https://api.example.com/v2beta#')).toBeUndefined()
+      expect(getTrailingApiVersion('https://gateway.ai.cloudflare.com/v1#')).toBeUndefined()
+      expect(getTrailingApiVersion('https://api.example.com/service/v1#')).toBeUndefined()
+    })
+
+    it('handles URLs with # and trailing slash correctly', () => {
+      expect(getTrailingApiVersion('https://api.example.com/v1/#')).toBeUndefined()
+      expect(getTrailingApiVersion('https://api.example.com/v2beta/#')).toBeUndefined()
+    })
+
+    it('handles URLs with version followed by # and additional path', () => {
+      expect(getTrailingApiVersion('https://api.example.com/v1#endpoint')).toBeUndefined()
+      expect(getTrailingApiVersion('https://api.example.com/v2beta#chat/completions')).toBeUndefined()
+    })
+
+    it('handles complex URLs with multiple # characters', () => {
+      expect(getTrailingApiVersion('https://api.example.com/v1#path#')).toBeUndefined()
+      expect(getTrailingApiVersion('https://gateway.ai.cloudflare.com/v1/xxx/v2beta#')).toBeUndefined()
+    })
+
+    it('handles URLs ending with # when version is not at the end', () => {
+      expect(getTrailingApiVersion('https://api.example.com/v1/service#')).toBeUndefined()
+      expect(getTrailingApiVersion('https://api.example.com/v1/api/chat#')).toBeUndefined()
+    })
+
+    it('distinguishes between URLs with and without trailing #', () => {
+      // Without # - should extract version
+      expect(getTrailingApiVersion('https://api.example.com/v1')).toBe('v1')
+      expect(getTrailingApiVersion('https://api.example.com/v2beta')).toBe('v2beta')
+
+      // With # - should return undefined
+      expect(getTrailingApiVersion('https://api.example.com/v1#')).toBeUndefined()
+      expect(getTrailingApiVersion('https://api.example.com/v2beta#')).toBeUndefined()
+    })
   })
 
   describe('withoutTrailingApiVersion', () => {
@@ -495,6 +532,70 @@ describe('api', () => {
     })
   })
 
+  describe('isWithTrailingSharp', () => {
+    it('returns true when URL ends with #', () => {
+      expect(isWithTrailingSharp('https://api.example.com#')).toBe(true)
+      expect(isWithTrailingSharp('http://localhost:3000#')).toBe(true)
+      expect(isWithTrailingSharp('#')).toBe(true)
+    })
+
+    it('returns false when URL does not end with #', () => {
+      expect(isWithTrailingSharp('https://api.example.com')).toBe(false)
+      expect(isWithTrailingSharp('http://localhost:3000')).toBe(false)
+      expect(isWithTrailingSharp('')).toBe(false)
+    })
+
+    it('returns false when URL has # in the middle but not at the end', () => {
+      expect(isWithTrailingSharp('https://api.example.com#path')).toBe(false)
+      expect(isWithTrailingSharp('https://api.example.com#section/path')).toBe(false)
+      expect(isWithTrailingSharp('https://api.example.com#path#other')).toBe(false)
+    })
+
+    it('handles URLs with multiple # characters', () => {
+      expect(isWithTrailingSharp('https://api.example.com##')).toBe(true)
+      expect(isWithTrailingSharp('https://api.example.com#path#')).toBe(true)
+      expect(isWithTrailingSharp('https://api.example.com###')).toBe(true)
+    })
+
+    it('handles URLs with trailing whitespace after #', () => {
+      expect(isWithTrailingSharp('https://api.example.com# ')).toBe(false)
+      expect(isWithTrailingSharp('https://api.example.com#\t')).toBe(false)
+      expect(isWithTrailingSharp('https://api.example.com#\n')).toBe(false)
+    })
+
+    it('handles URLs with whitespace before trailing #', () => {
+      expect(isWithTrailingSharp('  https://api.example.com#')).toBe(true)
+      expect(isWithTrailingSharp('\thttps://localhost:3000#')).toBe(true)
+    })
+
+    it('preserves type safety with generic parameter', () => {
+      const url1: string = 'https://api.example.com#'
+      const url2 = 'https://example.com' as const
+
+      expect(isWithTrailingSharp(url1)).toBe(true)
+      expect(isWithTrailingSharp(url2)).toBe(false)
+    })
+
+    it('handles complex real-world URLs', () => {
+      expect(isWithTrailingSharp('https://open.cherryin.net/v1/chat/completions#')).toBe(true)
+      expect(isWithTrailingSharp('https://api.openai.com/v1/engines/gpt-4#')).toBe(true)
+      expect(isWithTrailingSharp('https://gateway.ai.cloudflare.com/v1/xxx/v1beta#')).toBe(true)
+
+      expect(isWithTrailingSharp('https://open.cherryin.net/v1/chat/completions')).toBe(false)
+      expect(isWithTrailingSharp('https://api.openai.com/v1/engines/gpt-4')).toBe(false)
+      expect(isWithTrailingSharp('https://gateway.ai.cloudflare.com/v1/xxx/v1beta')).toBe(false)
+    })
+
+    it('handles edge cases', () => {
+      expect(isWithTrailingSharp('#')).toBe(true)
+      expect(isWithTrailingSharp(' #')).toBe(true)
+      expect(isWithTrailingSharp('# ')).toBe(false)
+      expect(isWithTrailingSharp('path#')).toBe(true)
+      expect(isWithTrailingSharp('/path/with/trailing/#')).toBe(true)
+      expect(isWithTrailingSharp('/path/without/trailing/')).toBe(false)
+    })
+  })
+
   describe('withoutTrailingSharp', () => {
     it('removes trailing # from URL', () => {
       expect(withoutTrailingSharp('https://api.example.com#')).toBe('https://api.example.com')
diff --git a/src/renderer/src/utils/__tests__/image.test.ts b/src/renderer/src/utils/__tests__/image.test.ts
index 0e02957395..3f35e7c737 100644
--- a/src/renderer/src/utils/__tests__/image.test.ts
+++ b/src/renderer/src/utils/__tests__/image.test.ts
@@ -7,7 +7,8 @@ import {
   captureScrollableAsDataURL,
   compressImage,
   convertToBase64,
-  makeSvgSizeAdaptive
+  makeSvgSizeAdaptive,
+  parseDataUrlMediaType
 } from '../image'
 
 // mock 依赖
@@ -201,4 +202,36 @@ describe('utils/image', () => {
       expect(result.outerHTML).toBe(originalOuterHTML)
     })
   })
+
+  describe('parseDataUrlMediaType', () => {
+    it('extracts media type and base64 flag from standard data url', () => {
+      const r = parseDataUrlMediaType('data:image/png;base64,AAA')
+      expect(r.mediaType).toBe('image/png')
+      expect(r.isBase64).toBe(true)
+    })
+
+    it('handles additional parameters in header', () => {
+      const r = parseDataUrlMediaType('data:image/jpeg;name=foo;base64,AAA')
+      expect(r.mediaType).toBe('image/jpeg')
+      expect(r.isBase64).toBe(true)
+    })
+
+    it('returns undefined media type when missing and detects non-base64', () => {
+      const r = parseDataUrlMediaType('data:text/plain,hello')
+      expect(r.mediaType).toBe('text/plain')
+      expect(r.isBase64).toBe(false)
+    })
+
+    it('handles empty mediatype header', () => {
+      const r = parseDataUrlMediaType('data:;base64,AAA')
+      expect(r.mediaType).toBeUndefined()
+      expect(r.isBase64).toBe(true)
+    })
+
+    it('gracefully handles non data urls', () => {
+      const r = parseDataUrlMediaType('https://example.com/x.png')
+      expect(r.mediaType).toBeUndefined()
+      expect(r.isBase64).toBe(false)
+    })
+  })
 })
diff --git a/src/renderer/src/utils/api.ts b/src/renderer/src/utils/api.ts
index 10f31ae5c0..fd470d5406 100644
--- a/src/renderer/src/utils/api.ts
+++ b/src/renderer/src/utils/api.ts
@@ -19,12 +19,6 @@ export function formatApiKeys(value: string): string {
  */
 const VERSION_REGEX_PATTERN = '\\/v\\d+(?:alpha|beta)?(?=\\/|$)'
 
-/**
- * Matches an API version at the end of a URL (with optional trailing slash).
- * Used to detect and extract versions only from the trailing position.
- */
-const TRAILING_VERSION_REGEX = /\/v\d+(?:alpha|beta)?\/?$/i
-
 /**
  * 判断 host 的 path 中是否包含形如版本的字符串（例如 /v1、/v2beta 等），
  *
@@ -62,6 +56,23 @@ export function withoutTrailingSlash<T extends string>(url: T): T {
   return url.replace(/\/$/, '') as T
 }
 
+/**
+ * Checks if a URL string ends with a trailing '#' character.
+ *
+ * @template T - The string type to preserve type safety
+ * @param {T} url - The URL string to check
+ * @returns {boolean} True if the URL ends with '#', false otherwise
+ *
+ * @example
+ * ```ts
+ * isWithTrailingSharp('https://example.com#') // true
+ * isWithTrailingSharp('https://example.com')  // false
+ * ```
+ */
+export function isWithTrailingSharp<T extends string>(url: T): boolean {
+  return url.endsWith('#')
+}
+
 /**
  * Removes the trailing '#' from a URL string if it exists.
  *
@@ -255,50 +266,3 @@ export function splitApiKeyString(keyStr: string): string[] {
     .map((k) => k.replace(/\\,/g, ','))
     .filter((k) => k)
 }
-
-/**
- * Extracts the trailing API version segment from a URL path.
- *
- * This function extracts API version patterns (e.g., `v1`, `v2beta`) from the end of a URL.
- * Only versions at the end of the path are extracted, not versions in the middle.
- * The returned version string does not include leading or trailing slashes.
- *
- * @param {string} url - The URL string to parse.
- * @returns {string | undefined} The trailing API version found (e.g., 'v1', 'v2beta'), or undefined if none found.
- *
- * @example
- * getTrailingApiVersion('https://api.example.com/v1') // 'v1'
- * getTrailingApiVersion('https://api.example.com/v2beta/') // 'v2beta'
- * getTrailingApiVersion('https://api.example.com/v1/chat') // undefined (version not at end)
- * getTrailingApiVersion('https://gateway.ai.cloudflare.com/v1/xxx/v1beta') // 'v1beta'
- * getTrailingApiVersion('https://api.example.com') // undefined
- */
-export function getTrailingApiVersion(url: string): string | undefined {
-  const match = url.match(TRAILING_VERSION_REGEX)
-
-  if (match) {
-    // Extract version without leading slash and trailing slash
-    return match[0].replace(/^\//, '').replace(/\/$/, '')
-  }
-
-  return undefined
-}
-
-/**
- * Removes the trailing API version segment from a URL path.
- *
- * This function removes API version patterns (e.g., `/v1`, `/v2beta`) from the end of a URL.
- * Only versions at the end of the path are removed, not versions in the middle.
- *
- * @param {string} url - The URL string to process.
- * @returns {string} The URL with the trailing API version removed, or the original URL if no trailing version found.
- *
- * @example
- * withoutTrailingApiVersion('https://api.example.com/v1') // 'https://api.example.com'
- * withoutTrailingApiVersion('https://api.example.com/v2beta/') // 'https://api.example.com'
- * withoutTrailingApiVersion('https://api.example.com/v1/chat') // 'https://api.example.com/v1/chat' (no change)
- * withoutTrailingApiVersion('https://api.example.com') // 'https://api.example.com'
- */
-export function withoutTrailingApiVersion(url: string): string {
-  return url.replace(TRAILING_VERSION_REGEX, '')
-}
diff --git a/src/renderer/src/utils/error.ts b/src/renderer/src/utils/error.ts
index d4ea2979e2..ec2e15f6d8 100644
--- a/src/renderer/src/utils/error.ts
+++ b/src/renderer/src/utils/error.ts
@@ -1,3 +1,4 @@
+import { loggerService } from '@logger'
 import type { McpError } from '@modelcontextprotocol/sdk/types.js'
 import type { AgentServerError } from '@renderer/types'
 import { AgentServerErrorSchema } from '@renderer/types'
@@ -20,7 +21,7 @@ import { ZodError } from 'zod'
 import { parseJSON } from './json'
 import { safeSerialize } from './serialize'
 
-// const logger = loggerService.withContext('Utils:error')
+const logger = loggerService.withContext('Utils:error')
 
 export function getErrorDetails(err: any, seen = new WeakSet()): any {
   // Handle circular references
@@ -65,11 +66,16 @@ export function formatErrorMessage(error: unknown): string {
   delete detailedError?.stack
   delete detailedError?.request_id
 
-  const formattedJson = JSON.stringify(detailedError, null, 2)
-    .split('\n')
-    .map((line) => `  ${line}`)
-    .join('\n')
-  return detailedError.message ? detailedError.message : `Error Details:\n${formattedJson}`
+  if (detailedError) {
+    const formattedJson = JSON.stringify(detailedError, null, 2)
+      .split('\n')
+      .map((line) => `  ${line}`)
+      .join('\n')
+    return detailedError.message ? detailedError.message : `Error Details:\n${formattedJson}`
+  } else {
+    logger.warn('Get detailed error failed.')
+    return ''
+  }
 }
 
 export function getErrorMessage(error: unknown): string {
diff --git a/src/renderer/src/utils/image.ts b/src/renderer/src/utils/image.ts
index 3d4824549a..6f8d8c3d18 100644
--- a/src/renderer/src/utils/image.ts
+++ b/src/renderer/src/utils/image.ts
@@ -617,3 +617,23 @@ export const convertImageToPng = async (blob: Blob): Promise<Blob> => {
     img.src = url
   })
 }
+
+/**
+ * Parse media type from a data URL without using heavy regular expressions.
+ *
+ * data:[<mediatype>][;base64],<data>
+ * - mediatype may be empty (defaults to text/plain;charset=US-ASCII per spec)
+ * - we only care about extracting media type and whether it's base64
+ */
+export function parseDataUrlMediaType(url: string): { mediaType?: string; isBase64: boolean } {
+  if (!url.startsWith('data:')) return { isBase64: false }
+  const comma = url.indexOf(',')
+  if (comma === -1) return { isBase64: false }
+  // strip leading 'data:' and take header portion only
+  const header = url.slice(5, comma)
+  const semi = header.indexOf(';')
+  const mediaType = (semi === -1 ? header : header.slice(0, semi)).trim() || undefined
+  // base64 flag may appear anywhere after mediatype in the header
+  const isBase64 = header.indexOf(';base64') !== -1
+  return { mediaType, isBase64 }
+}
diff --git a/src/renderer/src/utils/prompt.ts b/src/renderer/src/utils/prompt.ts
index 5db92d06a5..4e799800a7 100644
--- a/src/renderer/src/utils/prompt.ts
+++ b/src/renderer/src/utils/prompt.ts
@@ -1,64 +1,11 @@
+import { DEFAULT_SYSTEM_PROMPT } from '@cherrystudio/ai-core/built-in/plugins'
 import { loggerService } from '@logger'
 import store from '@renderer/store'
 import type { MCPTool } from '@renderer/types'
 
 const logger = loggerService.withContext('Utils:Prompt')
 
-export const SYSTEM_PROMPT = `In this environment you have access to a set of tools you can use to answer the user's question. \
-You can use one or more tools per message, and will receive the result of that tool use in the user's response. You use tools step-by-step to accomplish a given task, with each tool use informed by the result of the previous tool use.
-
-## Tool Use Formatting
-
-Tool use is formatted using XML-style tags. The tool name is enclosed in opening and closing tags, and each parameter is similarly enclosed within its own set of tags. Here's the structure:
-
-<tool_use>
-  <name>{tool_name}</name>
-  <arguments>{json_arguments}</arguments>
-</tool_use>
-
-The tool name should be the exact name of the tool you are using, and the arguments should be a JSON object containing the parameters required by that tool. For example:
-<tool_use>
-  <name>python_interpreter</name>
-  <arguments>{"code": "5 + 3 + 1294.678"}</arguments>
-</tool_use>
-
-The user will respond with the result of the tool use, which should be formatted as follows:
-
-<tool_use_result>
-  <name>{tool_name}</name>
-  <result>{result}</result>
-</tool_use_result>
-
-The result should be a string, which can represent a file or any other output type. You can use this result as input for the next action.
-For example, if the result of the tool use is an image file, you can use it in the next action like this:
-
-<tool_use>
-  <name>image_transformer</name>
-  <arguments>{"image": "image_1.jpg"}</arguments>
-</tool_use>
-
-Always adhere to this format for the tool use to ensure proper parsing and execution.
-
-## Tool Use Examples
-{{ TOOL_USE_EXAMPLES }}
-
-## Tool Use Available Tools
-Above example were using notional tools that might not exist for you. You only have access to these tools:
-{{ AVAILABLE_TOOLS }}
-
-## Tool Use Rules
-Here are the rules you should always follow to solve your task:
-1. Always use the right arguments for the tools. Never use variable names as the action arguments, use the value instead.
-2. Call a tool only when needed: do not call the search agent if you do not need information, try to solve the task yourself.
-3. If no tool call is needed, just answer the question directly.
-4. Never re-do a tool call that you previously did with the exact same parameters.
-5. For tool use, MARK SURE use XML tag format as shown in the examples above. Do not use any other format.
-
-# User Instructions
-{{ USER_SYSTEM_PROMPT }}
-Response in user query language.
-Now Begin! If you solve the task correctly, you will receive a reward of $1,000,000.
-`
+export { DEFAULT_SYSTEM_PROMPT as SYSTEM_PROMPT }
 
 export const THINK_TOOL_PROMPT = `{{ USER_SYSTEM_PROMPT }}`
 
@@ -258,7 +205,7 @@ export const replacePromptVariables = async (userSystemPrompt: string, modelName
 
 export const buildSystemPromptWithTools = (userSystemPrompt: string, tools?: MCPTool[]): string => {
   if (tools && tools.length > 0) {
-    return SYSTEM_PROMPT.replace('{{ USER_SYSTEM_PROMPT }}', userSystemPrompt || '')
+    return DEFAULT_SYSTEM_PROMPT.replace('{{ USER_SYSTEM_PROMPT }}', userSystemPrompt || '')
       .replace('{{ TOOL_USE_EXAMPLES }}', ToolUseExamples)
       .replace('{{ AVAILABLE_TOOLS }}', AvailableTools(tools))
   }
diff --git a/src/renderer/src/utils/provider.ts b/src/renderer/src/utils/provider.ts
index e36f44ecfe..86544de990 100644
--- a/src/renderer/src/utils/provider.ts
+++ b/src/renderer/src/utils/provider.ts
@@ -58,7 +58,8 @@ export const isSupportStreamOptionsProvider = (provider: Provider) => {
 const NOT_SUPPORT_QWEN3_ENABLE_THINKING_PROVIDER = [
   'ollama',
   'lmstudio',
-  'nvidia'
+  'nvidia',
+  'gpustack'
 ] as const satisfies SystemProviderId[]
 
 /**
diff --git a/src/renderer/src/utils/translate.ts b/src/renderer/src/utils/translate.ts
index 4e01649369..d724bdb35e 100644
--- a/src/renderer/src/utils/translate.ts
+++ b/src/renderer/src/utils/translate.ts
@@ -83,9 +83,7 @@ const detectLanguageByLLM = async (inputText: string): Promise<TranslateLanguage
   const assistant: Assistant = getDefaultAssistant()
 
   assistant.model = model
-  assistant.settings = {
-    temperature: 0.7
-  }
+  assistant.settings = {}
   assistant.prompt = LANG_DETECT_PROMPT.replace('{{list_lang}}', listLangText).replace('{{input}}', text)
 
   const onChunk: (chunk: Chunk) => void = (chunk: Chunk) => {
@@ -257,6 +255,7 @@ export const getTranslateOptions = async () => {
     }))
     return [...builtinLanguages, ...transformedCustomLangs]
   } catch (e) {
+    logger.error('[getTranslateOptions] Failed to get custom languages. Fallback to builtinLanguages', e as Error)
     return builtinLanguages
   }
 }
diff --git a/src/renderer/src/windows/selection/action/SelectionActionApp.tsx b/src/renderer/src/windows/selection/action/SelectionActionApp.tsx
index ab8e94a723..3ecda63a24 100644
--- a/src/renderer/src/windows/selection/action/SelectionActionApp.tsx
+++ b/src/renderer/src/windows/selection/action/SelectionActionApp.tsx
@@ -1,4 +1,4 @@
-import { isMac } from '@renderer/config/constant'
+import { isMac, isWin } from '@renderer/config/constant'
 import { useSelectionAssistant } from '@renderer/hooks/useSelectionAssistant'
 import { useSettings } from '@renderer/hooks/useSettings'
 import i18n from '@renderer/i18n'
@@ -8,11 +8,14 @@ import { IpcChannel } from '@shared/IpcChannel'
 import { Button, Slider, Tooltip } from 'antd'
 import { Droplet, Minus, Pin, X } from 'lucide-react'
 import { DynamicIcon } from 'lucide-react/dynamic'
-import type { FC } from 'react'
+import type { FC, MouseEvent as ReactMouseEvent } from 'react'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
+// [Windows only] Electron bug workaround type - can be removed once https://github.com/electron/electron/issues/48554 is fixed
+type ResizeDirection = 'n' | 's' | 'e' | 'w' | 'ne' | 'nw' | 'se' | 'sw'
+
 import ActionGeneral from './components/ActionGeneral'
 import ActionTranslate from './components/ActionTranslate'
 
@@ -185,11 +188,62 @@ const SelectionActionApp: FC = () => {
     }
   }
 
+  /**
+   * [Windows only] Manual window resize handler
+   *
+   * ELECTRON BUG WORKAROUND:
+   * In Electron, when using `frame: false` + `transparent: true`, the native window
+   * resize functionality is broken on Windows. This is a known Electron bug.
+   * See: https://github.com/electron/electron/issues/48554
+   *
+   * This custom resize implementation can be removed once the Electron bug is fixed.
+   */
+  const handleResizeStart = useCallback((e: ReactMouseEvent, direction: ResizeDirection) => {
+    e.preventDefault()
+    e.stopPropagation()
+
+    let lastX = e.screenX
+    let lastY = e.screenY
+
+    const handleMouseMove = (moveEvent: MouseEvent) => {
+      const deltaX = moveEvent.screenX - lastX
+      const deltaY = moveEvent.screenY - lastY
+
+      if (deltaX !== 0 || deltaY !== 0) {
+        window.api.selection.resizeActionWindow(deltaX, deltaY, direction)
+        lastX = moveEvent.screenX
+        lastY = moveEvent.screenY
+      }
+    }
+
+    const handleMouseUp = () => {
+      window.removeEventListener('mousemove', handleMouseMove)
+      window.removeEventListener('mouseup', handleMouseUp)
+    }
+
+    window.addEventListener('mousemove', handleMouseMove)
+    window.addEventListener('mouseup', handleMouseUp)
+  }, [])
+
   //we don't need to render the component if action is not set
   if (!action) return null
 
   return (
     <WindowFrame $opacity={opacity / 100}>
+      {/* [Windows only] Custom resize handles - Electron bug workaround, can be removed once fixed */}
+      {isWin && (
+        <>
+          <ResizeHandle $direction="n" onMouseDown={(e) => handleResizeStart(e, 'n')} />
+          <ResizeHandle $direction="s" onMouseDown={(e) => handleResizeStart(e, 's')} />
+          <ResizeHandle $direction="e" onMouseDown={(e) => handleResizeStart(e, 'e')} />
+          <ResizeHandle $direction="w" onMouseDown={(e) => handleResizeStart(e, 'w')} />
+          <ResizeHandle $direction="ne" onMouseDown={(e) => handleResizeStart(e, 'ne')} />
+          <ResizeHandle $direction="nw" onMouseDown={(e) => handleResizeStart(e, 'nw')} />
+          <ResizeHandle $direction="se" onMouseDown={(e) => handleResizeStart(e, 'se')} />
+          <ResizeHandle $direction="sw" onMouseDown={(e) => handleResizeStart(e, 'sw')} />
+        </>
+      )}
+
       <TitleBar $isWindowFocus={isWindowFocus} style={isMac ? { paddingLeft: '70px' } : {}}>
         {action.icon && (
           <TitleBarIcon>
@@ -431,4 +485,90 @@ const OpacitySlider = styled.div`
   }
 `
 
+/**
+ * [Windows only] Custom resize handle styled component
+ *
+ * ELECTRON BUG WORKAROUND:
+ * This component can be removed once https://github.com/electron/electron/issues/48554 is fixed.
+ */
+const ResizeHandle = styled.div<{ $direction: ResizeDirection }>`
+  position: absolute;
+  -webkit-app-region: no-drag;
+  z-index: 10;
+
+  ${({ $direction }) => {
+    const edgeSize = '6px'
+    const cornerSize = '12px'
+
+    switch ($direction) {
+      case 'n':
+        return `
+          top: 0;
+          left: ${cornerSize};
+          right: ${cornerSize};
+          height: ${edgeSize};
+          cursor: ns-resize;
+        `
+      case 's':
+        return `
+          bottom: 0;
+          left: ${cornerSize};
+          right: ${cornerSize};
+          height: ${edgeSize};
+          cursor: ns-resize;
+        `
+      case 'e':
+        return `
+          right: 0;
+          top: ${cornerSize};
+          bottom: ${cornerSize};
+          width: ${edgeSize};
+          cursor: ew-resize;
+        `
+      case 'w':
+        return `
+          left: 0;
+          top: ${cornerSize};
+          bottom: ${cornerSize};
+          width: ${edgeSize};
+          cursor: ew-resize;
+        `
+      case 'ne':
+        return `
+          top: 0;
+          right: 0;
+          width: ${cornerSize};
+          height: ${cornerSize};
+          cursor: nesw-resize;
+        `
+      case 'nw':
+        return `
+          top: 0;
+          left: 0;
+          width: ${cornerSize};
+          height: ${cornerSize};
+          cursor: nwse-resize;
+        `
+      case 'se':
+        return `
+          bottom: 0;
+          right: 0;
+          width: ${cornerSize};
+          height: ${cornerSize};
+          cursor: nwse-resize;
+        `
+      case 'sw':
+        return `
+          bottom: 0;
+          left: 0;
+          width: ${cornerSize};
+          height: ${cornerSize};
+          cursor: nesw-resize;
+        `
+      default:
+        return ''
+    }
+  }}
+`
+
 export default SelectionActionApp
diff --git a/src/renderer/src/windows/selection/action/components/ActionTranslate.tsx b/src/renderer/src/windows/selection/action/components/ActionTranslate.tsx
index 5e83071add..b5e0fea689 100644
--- a/src/renderer/src/windows/selection/action/components/ActionTranslate.tsx
+++ b/src/renderer/src/windows/selection/action/components/ActionTranslate.tsx
@@ -11,7 +11,6 @@ import MessageContent from '@renderer/pages/home/Messages/MessageContent'
 import { getDefaultTopic, getDefaultTranslateAssistant } from '@renderer/services/AssistantService'
 import type { Assistant, Topic, TranslateLanguage, TranslateLanguageCode } from '@renderer/types'
 import type { ActionItem } from '@renderer/types/selectionTypes'
-import { runAsyncFunction } from '@renderer/utils'
 import { abortCompletion } from '@renderer/utils/abortController'
 import { detectLanguage } from '@renderer/utils/translate'
 import { Tooltip } from 'antd'
@@ -32,70 +31,102 @@ const logger = loggerService.withContext('ActionTranslate')
 
 const ActionTranslate: FC<Props> = ({ action, scrollToBottom }) => {
   const { t } = useTranslation()
-  const { translateModelPrompt, language } = useSettings()
+  const { language } = useSettings()
+  const { getLanguageByLangcode, isLoaded: isLanguagesLoaded } = useTranslate()
 
-  const [targetLanguage, setTargetLanguage] = useState<TranslateLanguage>(LanguagesEnum.enUS)
-  const [alterLanguage, setAlterLanguage] = useState<TranslateLanguage>(LanguagesEnum.zhCN)
+  const [targetLanguage, setTargetLanguage] = useState<TranslateLanguage>(() => {
+    const lang = getLanguageByLangcode(language)
+    if (lang !== UNKNOWN) {
+      return lang
+    } else {
+      logger.warn('[initialize targetLanguage] Unexpected UNKNOWN. Fallback to zh-CN')
+      return LanguagesEnum.zhCN
+    }
+  })
+
+  const [alterLanguage, setAlterLanguage] = useState<TranslateLanguage>(LanguagesEnum.enUS)
 
   const [error, setError] = useState('')
   const [showOriginal, setShowOriginal] = useState(false)
   const [isContented, setIsContented] = useState(false)
   const [isLoading, setIsLoading] = useState(true)
   const [contentToCopy, setContentToCopy] = useState('')
-  const { getLanguageByLangcode } = useTranslate()
 
   // Use useRef for values that shouldn't trigger re-renders
   const initialized = useRef(false)
   const assistantRef = useRef<Assistant | null>(null)
   const topicRef = useRef<Topic | null>(null)
   const askId = useRef('')
+  const targetLangRef = useRef(targetLanguage)
 
-  useEffect(() => {
-    runAsyncFunction(async () => {
-      const biDirectionLangPair = await db.settings.get({ id: 'translate:bidirectional:pair' })
+  // It's called only in initialization.
+  // It will change target/alter language, so fetchResult will be triggered. Be careful!
+  const updateLanguagePair = useCallback(async () => {
+    // Only called is when languages loaded.
+    // It ensure we could get right language from getLanguageByLangcode.
+    if (!isLanguagesLoaded) {
+      logger.silly('[updateLanguagePair] Languages are not loaded. Skip.')
+      return
+    }
 
-      let targetLang: TranslateLanguage
-      let alterLang: TranslateLanguage
-
-      if (!biDirectionLangPair || !biDirectionLangPair.value[0]) {
-        const lang = getLanguageByLangcode(language)
-        if (lang !== UNKNOWN) {
-          targetLang = lang
-        } else {
-          logger.warn('Fallback to zh-CN')
-          targetLang = LanguagesEnum.zhCN
-        }
-      } else {
-        targetLang = getLanguageByLangcode(biDirectionLangPair.value[0])
-      }
-
-      if (!biDirectionLangPair || !biDirectionLangPair.value[1]) {
-        alterLang = LanguagesEnum.enUS
-      } else {
-        alterLang = getLanguageByLangcode(biDirectionLangPair.value[1])
-      }
+    const biDirectionLangPair = await db.settings.get({ id: 'translate:bidirectional:pair' })
 
+    if (biDirectionLangPair && biDirectionLangPair.value[0]) {
+      const targetLang = getLanguageByLangcode(biDirectionLangPair.value[0])
       setTargetLanguage(targetLang)
-      setAlterLanguage(alterLang)
-    })
-  }, [getLanguageByLangcode, language])
+      targetLangRef.current = targetLang
+    }
 
-  // Initialize values only once when action changes
-  useEffect(() => {
-    if (initialized.current || !action.selectedText) return
-    initialized.current = true
+    if (biDirectionLangPair && biDirectionLangPair.value[1]) {
+      const alterLang = getLanguageByLangcode(biDirectionLangPair.value[1])
+      setAlterLanguage(alterLang)
+    }
+  }, [getLanguageByLangcode, isLanguagesLoaded])
+
+  // Initialize values only once
+  const initialize = useCallback(async () => {
+    if (initialized.current) {
+      logger.silly('[initialize] Already initialized.')
+      return
+    }
+
+    // Only try to initialize when languages loaded, so updateLanguagePair would not fail.
+    if (!isLanguagesLoaded) {
+      logger.silly('[initialize] Languages not loaded. Skip initialization.')
+      return
+    }
+
+    // Edge case
+    if (action.selectedText === undefined) {
+      logger.error('[initialize] No selected text.')
+      return
+    }
+    logger.silly('[initialize] Start initialization.')
+
+    // Initialize language pair.
+    // It will update targetLangRef, so we could get latest target language in the following code
+    await updateLanguagePair()
 
     // Initialize assistant
-    const currentAssistant = getDefaultTranslateAssistant(targetLanguage, action.selectedText)
+    const currentAssistant = getDefaultTranslateAssistant(targetLangRef.current, action.selectedText)
 
     assistantRef.current = currentAssistant
 
     // Initialize topic
     topicRef.current = getDefaultTopic(currentAssistant.id)
-  }, [action, targetLanguage, translateModelPrompt])
+    initialized.current = true
+  }, [action.selectedText, isLanguagesLoaded, updateLanguagePair])
+
+  // Try to initialize when:
+  // 1. action.selectedText change (generally will not)
+  // 2. isLanguagesLoaded change (only initialize when languages loaded)
+  // 3. updateLanguagePair change (depend on translateLanguages and isLanguagesLoaded)
+  useEffect(() => {
+    initialize()
+  }, [initialize])
 
   const fetchResult = useCallback(async () => {
-    if (!assistantRef.current || !topicRef.current || !action.selectedText) return
+    if (!assistantRef.current || !topicRef.current || !action.selectedText || !initialized.current) return
 
     const setAskId = (id: string) => {
       askId.current = id
@@ -141,6 +172,7 @@ const ActionTranslate: FC<Props> = ({ action, scrollToBottom }) => {
 
     const assistant = getDefaultTranslateAssistant(translateLang, action.selectedText)
     assistantRef.current = assistant
+    logger.debug('process once')
     processMessages(assistant, topicRef.current, assistant.content, setAskId, onStream, onFinish, onError)
   }, [action, targetLanguage, alterLanguage, scrollToBottom])
 
@@ -157,7 +189,11 @@ const ActionTranslate: FC<Props> = ({ action, scrollToBottom }) => {
   }, [allMessages])
 
   const handleChangeLanguage = (targetLanguage: TranslateLanguage, alterLanguage: TranslateLanguage) => {
+    if (!initialized.current) {
+      return
+    }
     setTargetLanguage(targetLanguage)
+    targetLangRef.current = targetLanguage
     setAlterLanguage(alterLanguage)
 
     db.settings.put({ id: 'translate:bidirectional:pair', value: [targetLanguage.langCode, alterLanguage.langCode] })
diff --git a/src/renderer/src/windows/selection/toolbar/SelectionToolbar.tsx b/src/renderer/src/windows/selection/toolbar/SelectionToolbar.tsx
index 505a3b8fda..37a56acba5 100644
--- a/src/renderer/src/windows/selection/toolbar/SelectionToolbar.tsx
+++ b/src/renderer/src/windows/selection/toolbar/SelectionToolbar.tsx
@@ -202,6 +202,30 @@ const SelectionToolbar: FC<{ demo?: boolean }> = ({ demo = false }) => {
     }
   }, [customCss, demo])
 
+  /**
+   * Check if text is a valid URI or file path
+   */
+  const isUriOrFilePath = (text: string): boolean => {
+    const trimmed = text.trim()
+    // Must not contain newlines or whitespace
+    if (/\s/.test(trimmed)) {
+      return false
+    }
+    // URI patterns: http://, https://, ftp://, file://, etc.
+    if (/^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//.test(trimmed)) {
+      return true
+    }
+    // Windows absolute path: C:\, D:\, etc.
+    if (/^[a-zA-Z]:[/\\]/.test(trimmed)) {
+      return true
+    }
+    // Unix absolute path: /path/to/file
+    if (/^\/[^/]/.test(trimmed)) {
+      return true
+    }
+    return false
+  }
+
   // copy selected text to clipboard
   const handleCopy = useCallback(async () => {
     if (selectedText.current) {
@@ -219,6 +243,43 @@ const SelectionToolbar: FC<{ demo?: boolean }> = ({ demo = false }) => {
     }
   }, [setTimeoutTimer])
 
+  const handleSearch = useCallback((action: ActionItem) => {
+    if (!action.selectedText) return
+
+    const selectedText = action.selectedText.trim()
+
+    let actionString = ''
+    if (isUriOrFilePath(selectedText)) {
+      actionString = selectedText
+    } else {
+      if (!action.searchEngine) return
+
+      const customUrl = action.searchEngine.split('|')[1]
+      if (!customUrl) return
+
+      actionString = customUrl.replace('{{queryString}}', encodeURIComponent(selectedText))
+    }
+
+    window.api?.openWebsite(actionString)
+    window.api?.selection.hideToolbar()
+  }, [])
+
+  /**
+   * Quote the selected text to the inputbar of the main window
+   */
+  const handleQuote = (action: ActionItem) => {
+    if (action.selectedText) {
+      window.api?.quoteToMainWindow(action.selectedText)
+      window.api?.selection.hideToolbar()
+    }
+  }
+
+  const handleDefaultAction = (action: ActionItem) => {
+    // [macOS] only macOS has the available isFullscreen mode
+    window.api?.selection.processAction(action, isFullScreen.current)
+    window.api?.selection.hideToolbar()
+  }
+
   const handleAction = useCallback(
     (action: ActionItem) => {
       if (demo) return
@@ -241,36 +302,9 @@ const SelectionToolbar: FC<{ demo?: boolean }> = ({ demo = false }) => {
           break
       }
     },
-    [demo, handleCopy]
+    [demo, handleCopy, handleSearch]
   )
 
-  const handleSearch = (action: ActionItem) => {
-    if (!action.searchEngine) return
-
-    const customUrl = action.searchEngine.split('|')[1]
-    if (!customUrl) return
-
-    const searchUrl = customUrl.replace('{{queryString}}', encodeURIComponent(action.selectedText || ''))
-    window.api?.openWebsite(searchUrl)
-    window.api?.selection.hideToolbar()
-  }
-
-  /**
-   * Quote the selected text to the inputbar of the main window
-   */
-  const handleQuote = (action: ActionItem) => {
-    if (action.selectedText) {
-      window.api?.quoteToMainWindow(action.selectedText)
-      window.api?.selection.hideToolbar()
-    }
-  }
-
-  const handleDefaultAction = (action: ActionItem) => {
-    // [macOS] only macOS has the available isFullscreen mode
-    window.api?.selection.processAction(action, isFullScreen.current)
-    window.api?.selection.hideToolbar()
-  }
-
   return (
     <Container>
       <LogoWrapper $draggable={!demo}>
diff --git a/tests/renderer.setup.ts b/tests/renderer.setup.ts
index 9e10e5363a..2f47a8d8ec 100644
--- a/tests/renderer.setup.ts
+++ b/tests/renderer.setup.ts
@@ -1,8 +1,15 @@
 import '@testing-library/jest-dom/vitest'
 
+import { createRequire } from 'node:module'
 import { styleSheetSerializer } from 'jest-styled-components/serializer'
 import { expect, vi } from 'vitest'
 
+const require = createRequire(import.meta.url)
+const bufferModule = require('buffer')
+if (!bufferModule.SlowBuffer) {
+  bufferModule.SlowBuffer = bufferModule.Buffer
+}
+
 expect.addSnapshotSerializer(styleSheetSerializer)
 
 // Mock LoggerService globally for renderer tests
@@ -48,3 +55,29 @@ vi.stubGlobal('api', {
     writeWithId: vi.fn().mockResolvedValue(undefined)
   }
 })
+
+if (typeof globalThis.localStorage === 'undefined' || typeof (globalThis.localStorage as any).getItem !== 'function') {
+  let store = new Map<string, string>()
+
+  const localStorageMock = {
+    getItem: (key: string) => store.get(key) ?? null,
+    setItem: (key: string, value: string) => {
+      store.set(key, String(value))
+    },
+    removeItem: (key: string) => {
+      store.delete(key)
+    },
+    clear: () => {
+      store.clear()
+    },
+    key: (index: number) => Array.from(store.keys())[index] ?? null,
+    get length() {
+      return store.size
+    }
+  }
+
+  vi.stubGlobal('localStorage', localStorageMock)
+  if (typeof window !== 'undefined') {
+    Object.defineProperty(window, 'localStorage', { value: localStorageMock })
+  }
+}
diff --git a/yarn.lock b/yarn.lock
index 105a97f9ce..34a4aa78ff 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -102,16 +102,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ai-sdk/azure@npm:^2.0.74":
-  version: 2.0.74
-  resolution: "@ai-sdk/azure@npm:2.0.74"
+"@ai-sdk/anthropic@npm:2.0.56":
+  version: 2.0.56
+  resolution: "@ai-sdk/anthropic@npm:2.0.56"
   dependencies:
-    "@ai-sdk/openai": "npm:2.0.72"
     "@ai-sdk/provider": "npm:2.0.0"
-    "@ai-sdk/provider-utils": "npm:3.0.17"
+    "@ai-sdk/provider-utils": "npm:3.0.19"
   peerDependencies:
     zod: ^3.25.76 || ^4.1.8
-  checksum: 10c0/dccd1959ef43034a0559cdc862af7f351c0a997a56dbeb68b1c844f67d3ff7920f43890e1d18546600eeaac1c54f0c94943b6ce0b43ba4d44ddc3a829b8a71dd
+  checksum: 10c0/f2b6029c92443f831a2d124420e805d057668003067b1f677a4292d02f27aa3ad533374ea996d77ede7746a42c46fb94a8f2d8c0e7758a4555ea18c8b532052c
+  languageName: node
+  linkType: hard
+
+"@ai-sdk/azure@npm:^2.0.87":
+  version: 2.0.87
+  resolution: "@ai-sdk/azure@npm:2.0.87"
+  dependencies:
+    "@ai-sdk/openai": "npm:2.0.85"
+    "@ai-sdk/provider": "npm:2.0.0"
+    "@ai-sdk/provider-utils": "npm:3.0.19"
+  peerDependencies:
+    zod: ^3.25.76 || ^4.1.8
+  checksum: 10c0/77b0c74966144c3ca715e8357bd36502bd7055edb74a4005d9537cf9175cd9b33df32164a5e3f1925b1d311ed1a4eaf5b8fad6abdb81e1b6c14ba5ea78479f34
   languageName: node
   linkType: hard
 
@@ -166,42 +178,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ai-sdk/google-vertex@npm:^3.0.79":
-  version: 3.0.79
-  resolution: "@ai-sdk/google-vertex@npm:3.0.79"
+"@ai-sdk/google-vertex@npm:^3.0.94":
+  version: 3.0.94
+  resolution: "@ai-sdk/google-vertex@npm:3.0.94"
   dependencies:
-    "@ai-sdk/anthropic": "npm:2.0.49"
-    "@ai-sdk/google": "npm:2.0.43"
+    "@ai-sdk/anthropic": "npm:2.0.56"
+    "@ai-sdk/google": "npm:2.0.49"
     "@ai-sdk/provider": "npm:2.0.0"
-    "@ai-sdk/provider-utils": "npm:3.0.17"
-    google-auth-library: "npm:^9.15.0"
+    "@ai-sdk/provider-utils": "npm:3.0.19"
+    google-auth-library: "npm:^10.5.0"
   peerDependencies:
     zod: ^3.25.76 || ^4.1.8
-  checksum: 10c0/a86949b8d4a855409acdf7dc8d93ad9ea8ccf2bc3849acbe1ecbe4d6d66f06bcb5242f0df8eea24214e78732618b71ec8a019cbbeab16366f9ad3c860c5d8d30
+  checksum: 10c0/68e2ee9e6525a5e43f90304980e64bf2a4227fd3ce74a7bf17e5ace094ea1bca8f8f18a8cc332a492fee4b912568a768f7479a4eed8148b84e7de1adf4104ad0
   languageName: node
   linkType: hard
 
-"@ai-sdk/google@npm:2.0.43":
-  version: 2.0.43
-  resolution: "@ai-sdk/google@npm:2.0.43"
+"@ai-sdk/google@npm:2.0.49":
+  version: 2.0.49
+  resolution: "@ai-sdk/google@npm:2.0.49"
   dependencies:
     "@ai-sdk/provider": "npm:2.0.0"
-    "@ai-sdk/provider-utils": "npm:3.0.17"
+    "@ai-sdk/provider-utils": "npm:3.0.19"
   peerDependencies:
     zod: ^3.25.76 || ^4.1.8
-  checksum: 10c0/5a421a9746cf8cbdf3bb7fb49426453a4fe0e354ea55a0123e628afb7acf9bb19959d512c0f8e6d7dbefbfa7e1cef4502fc146149007258a8eeb57743ac5e9e5
+  checksum: 10c0/f3f8acfcd956edc7d807d22963d5eff0f765418f1f2c7d18615955ccdfcebb4d43cc26ce1f712c6a53572f1d8becc0773311b77b1f1bf1af87d675c5f017d5a4
   languageName: node
   linkType: hard
 
-"@ai-sdk/google@patch:@ai-sdk/google@npm%3A2.0.43#~/.yarn/patches/@ai-sdk-google-npm-2.0.43-689ed559b3.patch":
-  version: 2.0.43
-  resolution: "@ai-sdk/google@patch:@ai-sdk/google@npm%3A2.0.43#~/.yarn/patches/@ai-sdk-google-npm-2.0.43-689ed559b3.patch::version=2.0.43&hash=4dde1e"
+"@ai-sdk/google@patch:@ai-sdk/google@npm%3A2.0.49#~/.yarn/patches/@ai-sdk-google-npm-2.0.49-84720f41bd.patch":
+  version: 2.0.49
+  resolution: "@ai-sdk/google@patch:@ai-sdk/google@npm%3A2.0.49#~/.yarn/patches/@ai-sdk-google-npm-2.0.49-84720f41bd.patch::version=2.0.49&hash=406c25"
   dependencies:
     "@ai-sdk/provider": "npm:2.0.0"
-    "@ai-sdk/provider-utils": "npm:3.0.17"
+    "@ai-sdk/provider-utils": "npm:3.0.19"
   peerDependencies:
     zod: ^3.25.76 || ^4.1.8
-  checksum: 10c0/4cfd17e9c47f2b742d8a0b1ca3532b4dc48753088363b74b01a042f63652174fa9a3fbf655a23f823974c673121dffbd2d192bb0c1bf158da4e2bf498fc76527
+  checksum: 10c0/8d4d881583c2301dce8a4e3066af2ba7d99b30520b6219811f90271c93bf8a07dc23e752fa25ffd0e72c6ec56e97d40d32e04072a362accf7d01a745a2d2a352
   languageName: node
   linkType: hard
 
@@ -230,19 +242,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ai-sdk/openai-compatible@npm:1.0.27, @ai-sdk/openai-compatible@npm:^1.0.19":
-  version: 1.0.27
-  resolution: "@ai-sdk/openai-compatible@npm:1.0.27"
-  dependencies:
-    "@ai-sdk/provider": "npm:2.0.0"
-    "@ai-sdk/provider-utils": "npm:3.0.17"
-  peerDependencies:
-    zod: ^3.25.76 || ^4.1.8
-  checksum: 10c0/9f656e4f2ea4d714dc05be588baafd962b2e0360e9195fef373e745efeb20172698ea87e1033c0c5e1f1aa6e0db76a32629427bc8433eb42bd1a0ee00e04af0c
-  languageName: node
-  linkType: hard
-
-"@ai-sdk/openai-compatible@npm:^1.0.28":
+"@ai-sdk/openai-compatible@npm:1.0.28":
   version: 1.0.28
   resolution: "@ai-sdk/openai-compatible@npm:1.0.28"
   dependencies:
@@ -254,39 +254,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@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":
-  version: 1.0.27
-  resolution: "@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::version=1.0.27&hash=c44b76"
+"@ai-sdk/openai-compatible@patch:@ai-sdk/openai-compatible@npm%3A1.0.28#~/.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.28-5705188855.patch":
+  version: 1.0.28
+  resolution: "@ai-sdk/openai-compatible@patch:@ai-sdk/openai-compatible@npm%3A1.0.28#~/.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.28-5705188855.patch::version=1.0.28&hash=4b4acf"
   dependencies:
     "@ai-sdk/provider": "npm:2.0.0"
-    "@ai-sdk/provider-utils": "npm:3.0.17"
+    "@ai-sdk/provider-utils": "npm:3.0.18"
   peerDependencies:
     zod: ^3.25.76 || ^4.1.8
-  checksum: 10c0/80c8331bc5fc62dc23d99d861bdc76e4eaf8b4b071d0b2bfa42fbd87f50b1bcdfa5ce4a4deaf7026a603a1ba6eaf5c884d87e3c58b4d6515c220121d3f421de5
+  checksum: 10c0/4b1c3473e3e1a9ccf132a6e529d8d3891bc22aeb04883739e1f79b4f58436e3b0c62ac42552b4a901461f5c5ab008ee31e52b13878764eb9c4c41020439ab7e6
   languageName: node
   linkType: hard
 
-"@ai-sdk/openai@npm:2.0.72":
-  version: 2.0.72
-  resolution: "@ai-sdk/openai@npm:2.0.72"
+"@ai-sdk/openai@npm:2.0.85":
+  version: 2.0.85
+  resolution: "@ai-sdk/openai@npm:2.0.85"
   dependencies:
     "@ai-sdk/provider": "npm:2.0.0"
-    "@ai-sdk/provider-utils": "npm:3.0.17"
+    "@ai-sdk/provider-utils": "npm:3.0.19"
   peerDependencies:
     zod: ^3.25.76 || ^4.1.8
-  checksum: 10c0/64fb8b7b2627b16e1fdcb3a7dd8d26f34d054b3f7bba5de6ef579f1c12c91246d0682caa36c5dae5ed2f29b462cc6013a38d9e80234819030fbf1730e7f8da50
+  checksum: 10c0/c8e50de443d939d7a5d7444e1a2ff35357d05dd3add0fca8226b578b199f4ca53c8a9e22c376e88006466b86e39c88d7ceca790a6a866300e3964ad24756d580
   languageName: node
   linkType: hard
 
-"@ai-sdk/openai@patch:@ai-sdk/openai@npm%3A2.0.72#~/.yarn/patches/@ai-sdk-openai-npm-2.0.72-234e68da87.patch":
-  version: 2.0.72
-  resolution: "@ai-sdk/openai@patch:@ai-sdk/openai@npm%3A2.0.72#~/.yarn/patches/@ai-sdk-openai-npm-2.0.72-234e68da87.patch::version=2.0.72&hash=126b76"
+"@ai-sdk/openai@patch:@ai-sdk/openai@npm%3A2.0.85#~/.yarn/patches/@ai-sdk-openai-npm-2.0.85-27483d1d6a.patch":
+  version: 2.0.85
+  resolution: "@ai-sdk/openai@patch:@ai-sdk/openai@npm%3A2.0.85#~/.yarn/patches/@ai-sdk-openai-npm-2.0.85-27483d1d6a.patch::version=2.0.85&hash=81ee54"
   dependencies:
     "@ai-sdk/provider": "npm:2.0.0"
-    "@ai-sdk/provider-utils": "npm:3.0.17"
+    "@ai-sdk/provider-utils": "npm:3.0.19"
   peerDependencies:
     zod: ^3.25.76 || ^4.1.8
-  checksum: 10c0/fec21ab02aff999b487abdd02c32d526580d47cdf83dd74b02f8faf1423b63ab7da3c374b7a98a15bb94fdcb6deb2851381ce0f52b92c9c030dee06ff2dcf71d
+  checksum: 10c0/8fd0e4e63840b0ceb3fbf61b567e3318edfd5c3177b502076fb04b340ef8ea0a6b4cb95e4c6f7634b3bd8661ef0b69828a22b5434542c8e7d3488bff291e99c1
   languageName: node
   linkType: hard
 
@@ -328,6 +328,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@ai-sdk/provider-utils@npm:3.0.19":
+  version: 3.0.19
+  resolution: "@ai-sdk/provider-utils@npm:3.0.19"
+  dependencies:
+    "@ai-sdk/provider": "npm:2.0.0"
+    "@standard-schema/spec": "npm:^1.0.0"
+    eventsource-parser: "npm:^3.0.6"
+  peerDependencies:
+    zod: ^3.25.76 || ^4.1.8
+  checksum: 10c0/e4decb19264067fa1b1642e07d515d25d1509a1a9143f59ccc051e3ca413c9fb1d708e1052a70eaf329ca39ddf6152520cd833dbf8c95d9bf02bbeffae8ea363
+  languageName: node
+  linkType: hard
+
 "@ai-sdk/provider@npm:2.0.0, @ai-sdk/provider@npm:^2.0.0":
   version: 2.0.0
   resolution: "@ai-sdk/provider@npm:2.0.0"
@@ -368,7 +381,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ampproject/remapping@npm:^2.2.0, @ampproject/remapping@npm:^2.3.0":
+"@ampproject/remapping@npm:^2.3.0":
   version: 2.3.0
   resolution: "@ampproject/remapping@npm:2.3.0"
   dependencies:
@@ -503,9 +516,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@anthropic-ai/claude-agent-sdk@npm:0.1.53":
-  version: 0.1.53
-  resolution: "@anthropic-ai/claude-agent-sdk@npm:0.1.53"
+"@anthropic-ai/claude-agent-sdk@npm:0.1.62":
+  version: 0.1.62
+  resolution: "@anthropic-ai/claude-agent-sdk@npm:0.1.62"
   dependencies:
     "@img/sharp-darwin-arm64": "npm:^0.33.5"
     "@img/sharp-darwin-x64": "npm:^0.33.5"
@@ -534,13 +547,13 @@ __metadata:
       optional: true
     "@img/sharp-win32-x64":
       optional: true
-  checksum: 10c0/9b8e444f113e1f6a425d87287c653a5a441836c6100e954fdc33ce9149c8d87ca1a7d495563f4fac583cbaf14946fe18c321eb555b3f0e44a5de8433ba06bdaf
+  checksum: 10c0/bca0978651cd28798cd71a0071618eca37253905841fa0e20ec59f69ac4865e2c6c4e5fec034bc7b85a5748df5c3c37e3193d6adbd1cad73668f112d049390a3
   languageName: node
   linkType: hard
 
-"@anthropic-ai/claude-agent-sdk@patch:@anthropic-ai/claude-agent-sdk@npm%3A0.1.53#~/.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.53-4b77f4cf29.patch":
-  version: 0.1.53
-  resolution: "@anthropic-ai/claude-agent-sdk@patch:@anthropic-ai/claude-agent-sdk@npm%3A0.1.53#~/.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.53-4b77f4cf29.patch::version=0.1.53&hash=b05505"
+"@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":
+  version: 0.1.62
+  resolution: "@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::version=0.1.62&hash=b8fdbe"
   dependencies:
     "@img/sharp-darwin-arm64": "npm:^0.33.5"
     "@img/sharp-darwin-x64": "npm:^0.33.5"
@@ -569,7 +582,7 @@ __metadata:
       optional: true
     "@img/sharp-win32-x64":
       optional: true
-  checksum: 10c0/54abfc37ca1e1617503b1a70d31a165b95cb898e6192637d3ab450be081bc8c89933714d1b150f5c3ef3948b3c481f81b9dfaf45fa1edff745477edf3e3c58e5
+  checksum: 10c0/6c59cfc3d3b7d903d946c5da6e0c2ad6798ae837b67c2a9e679df2803d7577823f8feec26e48fa9f815b9ff19612c66e2682fdd182be0344b60febb6e64ac85e
   languageName: node
   linkType: hard
 
@@ -1511,26 +1524,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.27.7":
-  version: 7.28.0
-  resolution: "@babel/core@npm:7.28.0"
+"@babel/core@npm:^7.28.4":
+  version: 7.28.5
+  resolution: "@babel/core@npm:7.28.5"
   dependencies:
-    "@ampproject/remapping": "npm:^2.2.0"
     "@babel/code-frame": "npm:^7.27.1"
-    "@babel/generator": "npm:^7.28.0"
+    "@babel/generator": "npm:^7.28.5"
     "@babel/helper-compilation-targets": "npm:^7.27.2"
-    "@babel/helper-module-transforms": "npm:^7.27.3"
-    "@babel/helpers": "npm:^7.27.6"
-    "@babel/parser": "npm:^7.28.0"
+    "@babel/helper-module-transforms": "npm:^7.28.3"
+    "@babel/helpers": "npm:^7.28.4"
+    "@babel/parser": "npm:^7.28.5"
     "@babel/template": "npm:^7.27.2"
-    "@babel/traverse": "npm:^7.28.0"
-    "@babel/types": "npm:^7.28.0"
+    "@babel/traverse": "npm:^7.28.5"
+    "@babel/types": "npm:^7.28.5"
+    "@jridgewell/remapping": "npm:^2.3.5"
     convert-source-map: "npm:^2.0.0"
     debug: "npm:^4.1.0"
     gensync: "npm:^1.0.0-beta.2"
     json5: "npm:^2.2.3"
     semver: "npm:^6.3.1"
-  checksum: 10c0/423302e7c721e73b1c096217880272e02020dfb697a55ccca60ad01bba90037015f84d0c20c6ce297cf33a19bb704bc5c2b3d3095f5284dfa592bd1de0b9e8c3
+  checksum: 10c0/535f82238027621da6bdffbdbe896ebad3558b311d6f8abc680637a9859b96edbf929ab010757055381570b29cf66c4a295b5618318d27a4273c0e2033925e72
   languageName: node
   linkType: hard
 
@@ -1547,6 +1560,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/generator@npm:^7.28.5":
+  version: 7.28.5
+  resolution: "@babel/generator@npm:7.28.5"
+  dependencies:
+    "@babel/parser": "npm:^7.28.5"
+    "@babel/types": "npm:^7.28.5"
+    "@jridgewell/gen-mapping": "npm:^0.3.12"
+    "@jridgewell/trace-mapping": "npm:^0.3.28"
+    jsesc: "npm:^3.0.2"
+  checksum: 10c0/9f219fe1d5431b6919f1a5c60db8d5d34fe546c0d8f5a8511b32f847569234ffc8032beb9e7404649a143f54e15224ecb53a3d11b6bb85c3203e573d91fca752
+  languageName: node
+  linkType: hard
+
 "@babel/helper-compilation-targets@npm:^7.27.2":
   version: 7.27.2
   resolution: "@babel/helper-compilation-targets@npm:7.27.2"
@@ -1577,16 +1603,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.27.3":
-  version: 7.27.3
-  resolution: "@babel/helper-module-transforms@npm:7.27.3"
+"@babel/helper-module-transforms@npm:^7.28.3":
+  version: 7.28.3
+  resolution: "@babel/helper-module-transforms@npm:7.28.3"
   dependencies:
     "@babel/helper-module-imports": "npm:^7.27.1"
     "@babel/helper-validator-identifier": "npm:^7.27.1"
-    "@babel/traverse": "npm:^7.27.3"
+    "@babel/traverse": "npm:^7.28.3"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10c0/fccb4f512a13b4c069af51e1b56b20f54024bcf1591e31e978a30f3502567f34f90a80da6a19a6148c249216292a8074a0121f9e52602510ef0f32dbce95ca01
+  checksum: 10c0/549be62515a6d50cd4cfefcab1b005c47f89bd9135a22d602ee6a5e3a01f27571868ada10b75b033569f24dc4a2bb8d04bfa05ee75c16da7ade2d0db1437fcdb
   languageName: node
   linkType: hard
 
@@ -1611,6 +1637,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-validator-identifier@npm:^7.28.5":
+  version: 7.28.5
+  resolution: "@babel/helper-validator-identifier@npm:7.28.5"
+  checksum: 10c0/42aaebed91f739a41f3d80b72752d1f95fd7c72394e8e4bd7cdd88817e0774d80a432451bcba17c2c642c257c483bf1d409dd4548883429ea9493a3bc4ab0847
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-option@npm:^7.27.1":
   version: 7.27.1
   resolution: "@babel/helper-validator-option@npm:7.27.1"
@@ -1618,13 +1651,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.27.6":
-  version: 7.27.6
-  resolution: "@babel/helpers@npm:7.27.6"
+"@babel/helpers@npm:^7.28.4":
+  version: 7.28.4
+  resolution: "@babel/helpers@npm:7.28.4"
   dependencies:
     "@babel/template": "npm:^7.27.2"
-    "@babel/types": "npm:^7.27.6"
-  checksum: 10c0/448bac96ef8b0f21f2294a826df9de6bf4026fd023f8a6bb6c782fe3e61946801ca24381490b8e58d861fee75cd695a1882921afbf1f53b0275ee68c938bd6d3
+    "@babel/types": "npm:^7.28.4"
+  checksum: 10c0/aaa5fb8098926dfed5f223adf2c5e4c7fbba4b911b73dfec2d7d3083f8ba694d201a206db673da2d9b3ae8c01793e795767654558c450c8c14b4c2175b4fcb44
   languageName: node
   linkType: hard
 
@@ -1639,6 +1672,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/parser@npm:^7.28.5":
+  version: 7.28.5
+  resolution: "@babel/parser@npm:7.28.5"
+  dependencies:
+    "@babel/types": "npm:^7.28.5"
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: 10c0/5bbe48bf2c79594ac02b490a41ffde7ef5aa22a9a88ad6bcc78432a6ba8a9d638d531d868bd1f104633f1f6bba9905746e15185b8276a3756c42b765d131b1ef
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-arrow-functions@npm:^7.27.1":
   version: 7.27.1
   resolution: "@babel/plugin-transform-arrow-functions@npm:7.27.1"
@@ -1682,7 +1726,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.27.1, @babel/traverse@npm:^7.27.3, @babel/traverse@npm:^7.28.0":
+"@babel/traverse@npm:^7.27.1":
   version: 7.28.0
   resolution: "@babel/traverse@npm:7.28.0"
   dependencies:
@@ -1697,7 +1741,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.25.4, @babel/types@npm:^7.27.1, @babel/types@npm:^7.27.6, @babel/types@npm:^7.28.0":
+"@babel/traverse@npm:^7.28.3, @babel/traverse@npm:^7.28.5":
+  version: 7.28.5
+  resolution: "@babel/traverse@npm:7.28.5"
+  dependencies:
+    "@babel/code-frame": "npm:^7.27.1"
+    "@babel/generator": "npm:^7.28.5"
+    "@babel/helper-globals": "npm:^7.28.0"
+    "@babel/parser": "npm:^7.28.5"
+    "@babel/template": "npm:^7.27.2"
+    "@babel/types": "npm:^7.28.5"
+    debug: "npm:^4.3.1"
+  checksum: 10c0/f6c4a595993ae2b73f2d4cd9c062f2e232174d293edd4abe1d715bd6281da8d99e47c65857e8d0917d9384c65972f4acdebc6749a7c40a8fcc38b3c7fb3e706f
+  languageName: node
+  linkType: hard
+
+"@babel/types@npm:^7.25.4, @babel/types@npm:^7.27.1, @babel/types@npm:^7.28.0":
   version: 7.28.1
   resolution: "@babel/types@npm:7.28.1"
   dependencies:
@@ -1717,6 +1776,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/types@npm:^7.28.4, @babel/types@npm:^7.28.5":
+  version: 7.28.5
+  resolution: "@babel/types@npm:7.28.5"
+  dependencies:
+    "@babel/helper-string-parser": "npm:^7.27.1"
+    "@babel/helper-validator-identifier": "npm:^7.28.5"
+  checksum: 10c0/a5a483d2100befbf125793640dec26b90b95fd233a94c19573325898a5ce1e52cdfa96e495c7dcc31b5eca5b66ce3e6d4a0f5a4a62daec271455959f208ab08a
+  languageName: node
+  linkType: hard
+
 "@bcoe/v8-coverage@npm:^1.0.2":
   version: 1.0.2
   resolution: "@bcoe/v8-coverage@npm:1.0.2"
@@ -1853,9 +1922,9 @@ __metadata:
   resolution: "@cherrystudio/ai-core@workspace:packages/aiCore"
   dependencies:
     "@ai-sdk/anthropic": "npm:^2.0.49"
-    "@ai-sdk/azure": "npm:^2.0.74"
+    "@ai-sdk/azure": "npm:^2.0.87"
     "@ai-sdk/deepseek": "npm:^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/openai-compatible": "patch:@ai-sdk/openai-compatible@npm%3A1.0.28#~/.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.28-5705188855.patch"
     "@ai-sdk/provider": "npm:^2.0.0"
     "@ai-sdk/provider-utils": "npm:^3.0.17"
     "@ai-sdk/xai": "npm:^2.0.36"
@@ -1875,7 +1944,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@cherrystudio/ai-sdk-provider@workspace:packages/ai-sdk-provider"
   dependencies:
-    "@ai-sdk/openai-compatible": "npm:^1.0.28"
+    "@ai-sdk/openai-compatible": "patch:@ai-sdk/openai-compatible@npm%3A1.0.28#~/.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.28-5705188855.patch"
     "@ai-sdk/provider": "npm:^2.0.0"
     "@ai-sdk/provider-utils": "npm:^3.0.17"
     tsdown: "npm:^0.13.3"
@@ -2110,9 +2179,9 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@cherrystudio/openai@npm:^6.9.0":
-  version: 6.9.0
-  resolution: "@cherrystudio/openai@npm:6.9.0"
+"@cherrystudio/openai@npm:^6.12.0":
+  version: 6.12.0
+  resolution: "@cherrystudio/openai@npm:6.12.0"
   peerDependencies:
     ws: ^8.18.0
     zod: ^3.25 || ^4.0
@@ -2123,7 +2192,7 @@ __metadata:
       optional: true
   bin:
     openai: bin/cli
-  checksum: 10c0/9c51ef33c5b9d08041a115e3d6a8158412a379998a0eae186923d5bdcc808b634c1fef4471a1d499bb8c624b04c075167bc90a1a60a805005c0657ecebbb58d0
+  checksum: 10c0/6831a603141b05508e11ea365279b57311424f9db578028d72d9bae8473e09d5fe12b1fbc0b471cabc0b3adb67339d845b6b8f6f8be4cded0e98e5a6ea25efc8
   languageName: node
   linkType: hard
 
@@ -2874,6 +2943,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@emnapi/core@npm:^1.7.1":
+  version: 1.7.1
+  resolution: "@emnapi/core@npm:1.7.1"
+  dependencies:
+    "@emnapi/wasi-threads": "npm:1.1.0"
+    tslib: "npm:^2.4.0"
+  checksum: 10c0/f3740be23440b439333e3ae3832163f60c96c4e35337f3220ceba88f36ee89a57a871d27c94eb7a9ff98a09911ed9a2089e477ab549f4d30029f8b907f84a351
+  languageName: node
+  linkType: hard
+
 "@emnapi/runtime@npm:^1.4.3, @emnapi/runtime@npm:^1.4.4, @emnapi/runtime@npm:^1.4.5":
   version: 1.4.5
   resolution: "@emnapi/runtime@npm:1.4.5"
@@ -2883,6 +2962,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@emnapi/runtime@npm:^1.7.1":
+  version: 1.7.1
+  resolution: "@emnapi/runtime@npm:1.7.1"
+  dependencies:
+    tslib: "npm:^2.4.0"
+  checksum: 10c0/26b851cd3e93877d8732a985a2ebf5152325bbacc6204ef5336a47359dedcc23faeb08cdfcb8bb389b5401b3e894b882bc1a1e55b4b7c1ed1e67c991a760ddd5
+  languageName: node
+  linkType: hard
+
 "@emnapi/wasi-threads@npm:1.0.4":
   version: 1.0.4
   resolution: "@emnapi/wasi-threads@npm:1.0.4"
@@ -2892,7 +2980,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@emnapi/wasi-threads@npm:^1.0.4":
+"@emnapi/wasi-threads@npm:1.1.0, @emnapi/wasi-threads@npm:^1.0.4":
   version: 1.1.0
   resolution: "@emnapi/wasi-threads@npm:1.1.0"
   dependencies:
@@ -3870,7 +3958,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/remapping@npm:^2.3.4":
+"@jridgewell/remapping@npm:^2.3.4, @jridgewell/remapping@npm:^2.3.5":
   version: 2.3.5
   resolution: "@jridgewell/remapping@npm:2.3.5"
   dependencies:
@@ -4438,6 +4526,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@leichtgewicht/ip-codec@npm:^2.0.1":
+  version: 2.0.5
+  resolution: "@leichtgewicht/ip-codec@npm:2.0.5"
+  checksum: 10c0/14a0112bd59615eef9e3446fea018045720cd3da85a98f801a685a818b0d96ef2a1f7227e8d271def546b2e2a0fe91ef915ba9dc912ab7967d2317b1a051d66b
+  languageName: node
+  linkType: hard
+
 "@lezer/common@npm:^1.0.0, @lezer/common@npm:^1.0.2, @lezer/common@npm:^1.0.3, @lezer/common@npm:^1.1.0, @lezer/common@npm:^1.2.0, @lezer/common@npm:^1.2.1":
   version: 1.2.3
   resolution: "@lezer/common@npm:1.2.3"
@@ -4967,14 +5062,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@napi-rs/wasm-runtime@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "@napi-rs/wasm-runtime@npm:1.0.3"
+"@napi-rs/wasm-runtime@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@napi-rs/wasm-runtime@npm:1.1.0"
   dependencies:
-    "@emnapi/core": "npm:^1.4.5"
-    "@emnapi/runtime": "npm:^1.4.5"
-    "@tybys/wasm-util": "npm:^0.10.0"
-  checksum: 10c0/7918d82477e75931b6e35bb003464382eb93e526362f81a98bf8610407a67b10f4d041931015ad48072c89db547deb7e471dfb91f4ab11ac63a24d8580297f75
+    "@emnapi/core": "npm:^1.7.1"
+    "@emnapi/runtime": "npm:^1.7.1"
+    "@tybys/wasm-util": "npm:^0.10.1"
+  checksum: 10c0/ee351052123bfc635c4cef03ac273a686522394ccd513b1e5b7b3823cecd6abb4a31f23a3a962933192b87eb7b7c3eb3def7748bd410edc66f932d90cf44e9ab
   languageName: node
   linkType: hard
 
@@ -5309,6 +5404,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@oxc-project/runtime@npm:0.101.0":
+  version: 0.101.0
+  resolution: "@oxc-project/runtime@npm:0.101.0"
+  checksum: 10c0/86fd7bb37e94986e7a09bde07a16fa63cebeaada6bcb8963bc07087d54c107d1a128e1c4a5d27b9b593354c092b8976d7653b6700fbb0da0a2b925fb3de4b34c
+  languageName: node
+  linkType: hard
+
 "@oxc-project/runtime@npm:0.71.0":
   version: 0.71.0
   resolution: "@oxc-project/runtime@npm:0.71.0"
@@ -5316,13 +5418,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-project/runtime@npm:=0.82.3":
-  version: 0.82.3
-  resolution: "@oxc-project/runtime@npm:0.82.3"
-  checksum: 10c0/48fd0577a9bd146da7eefea8e61a7c855f8947ef6233fe7db2921e5c1f07d73459d8fb4d2d9e45f4d522d5bb31af8157c96020860154fdf7223a9cb0957e36c0
-  languageName: node
-  linkType: hard
-
 "@oxc-project/types@npm:0.71.0":
   version: 0.71.0
   resolution: "@oxc-project/types@npm:0.71.0"
@@ -5330,10 +5425,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@oxc-project/types@npm:=0.82.3":
-  version: 0.82.3
-  resolution: "@oxc-project/types@npm:0.82.3"
-  checksum: 10c0/17dffc91dc3b726be67b7333d251e811bf4badce8ae77269d1626a107cd7cb673674a3fd6e0f127e40951d630281b9a164fee787a1a0cad12e7372a14b89d7cf
+"@oxc-project/types@npm:=0.101.0":
+  version: 0.101.0
+  resolution: "@oxc-project/types@npm:0.101.0"
+  checksum: 10c0/e4e98da6e34ef0163a652e842e795bda77b703d8282fed4984292ff7b289c4e03d848ed8762e549445e33a142d3883e1013cd9ed43156f6eba34c151b8f599c1
   languageName: node
   linkType: hard
 
@@ -6245,16 +6340,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rolldown/binding-android-arm64@npm:1.0.0-beta.34":
-  version: 1.0.0-beta.34
-  resolution: "@rolldown/binding-android-arm64@npm:1.0.0-beta.34"
+"@rolldown/binding-android-arm64@npm:1.0.0-beta.53":
+  version: 1.0.0-beta.53
+  resolution: "@rolldown/binding-android-arm64@npm:1.0.0-beta.53"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rolldown/binding-darwin-arm64@npm:1.0.0-beta.34":
-  version: 1.0.0-beta.34
-  resolution: "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.34"
+"@rolldown/binding-darwin-arm64@npm:1.0.0-beta.53":
+  version: 1.0.0-beta.53
+  resolution: "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.53"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
@@ -6266,9 +6361,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rolldown/binding-darwin-x64@npm:1.0.0-beta.34":
-  version: 1.0.0-beta.34
-  resolution: "@rolldown/binding-darwin-x64@npm:1.0.0-beta.34"
+"@rolldown/binding-darwin-x64@npm:1.0.0-beta.53":
+  version: 1.0.0-beta.53
+  resolution: "@rolldown/binding-darwin-x64@npm:1.0.0-beta.53"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
@@ -6280,9 +6375,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rolldown/binding-freebsd-x64@npm:1.0.0-beta.34":
-  version: 1.0.0-beta.34
-  resolution: "@rolldown/binding-freebsd-x64@npm:1.0.0-beta.34"
+"@rolldown/binding-freebsd-x64@npm:1.0.0-beta.53":
+  version: 1.0.0-beta.53
+  resolution: "@rolldown/binding-freebsd-x64@npm:1.0.0-beta.53"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
@@ -6294,9 +6389,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.34":
-  version: 1.0.0-beta.34
-  resolution: "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.34"
+"@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.53":
+  version: 1.0.0-beta.53
+  resolution: "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.53"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
@@ -6308,9 +6403,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.34":
-  version: 1.0.0-beta.34
-  resolution: "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.34"
+"@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.53":
+  version: 1.0.0-beta.53
+  resolution: "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.53"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
@@ -6322,9 +6417,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.34":
-  version: 1.0.0-beta.34
-  resolution: "@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.34"
+"@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.53":
+  version: 1.0.0-beta.53
+  resolution: "@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.53"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
@@ -6336,9 +6431,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.34":
-  version: 1.0.0-beta.34
-  resolution: "@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.34"
+"@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.53":
+  version: 1.0.0-beta.53
+  resolution: "@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.53"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
@@ -6350,9 +6445,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.34":
-  version: 1.0.0-beta.34
-  resolution: "@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.34"
+"@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.53":
+  version: 1.0.0-beta.53
+  resolution: "@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.53"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
@@ -6364,18 +6459,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rolldown/binding-openharmony-arm64@npm:1.0.0-beta.34":
-  version: 1.0.0-beta.34
-  resolution: "@rolldown/binding-openharmony-arm64@npm:1.0.0-beta.34"
+"@rolldown/binding-openharmony-arm64@npm:1.0.0-beta.53":
+  version: 1.0.0-beta.53
+  resolution: "@rolldown/binding-openharmony-arm64@npm:1.0.0-beta.53"
   conditions: os=openharmony & cpu=arm64
   languageName: node
   linkType: hard
 
-"@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.34":
-  version: 1.0.0-beta.34
-  resolution: "@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.34"
+"@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.53":
+  version: 1.0.0-beta.53
+  resolution: "@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.53"
   dependencies:
-    "@napi-rs/wasm-runtime": "npm:^1.0.3"
+    "@napi-rs/wasm-runtime": "npm:^1.1.0"
   conditions: cpu=wasm32
   languageName: node
   linkType: hard
@@ -6389,9 +6484,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.34":
-  version: 1.0.0-beta.34
-  resolution: "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.34"
+"@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.53":
+  version: 1.0.0-beta.53
+  resolution: "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.53"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
@@ -6403,13 +6498,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.34":
-  version: 1.0.0-beta.34
-  resolution: "@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.34"
-  conditions: os=win32 & cpu=ia32
-  languageName: node
-  linkType: hard
-
 "@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.9-commit.d91dfb5":
   version: 1.0.0-beta.9-commit.d91dfb5
   resolution: "@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.9-commit.d91dfb5"
@@ -6417,9 +6505,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.34":
-  version: 1.0.0-beta.34
-  resolution: "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.34"
+"@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.53":
+  version: 1.0.0-beta.53
+  resolution: "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.53"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
@@ -6438,10 +6526,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rolldown/pluginutils@npm:1.0.0-beta.34":
-  version: 1.0.0-beta.34
-  resolution: "@rolldown/pluginutils@npm:1.0.0-beta.34"
-  checksum: 10c0/96565287991825ecd90b60607dae908ebfdde233661fc589c98547a75c1fd0282b2e2a7849c3eb0c9941e2fba34667a8d5cdb8d597370815c19c2f29b4c157b4
+"@rolldown/pluginutils@npm:1.0.0-beta.53":
+  version: 1.0.0-beta.53
+  resolution: "@rolldown/pluginutils@npm:1.0.0-beta.53"
+  checksum: 10c0/e8b0a7eb76be22f6f103171f28072de821525a4e400454850516da91a7381957932ff0ce495f227bcb168e86815788b0c1d249ca9e34dca366a82c8825b714ce
   languageName: node
   linkType: hard
 
@@ -7230,13 +7318,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@socket.io/component-emitter@npm:~3.1.0":
-  version: 3.1.2
-  resolution: "@socket.io/component-emitter@npm:3.1.2"
-  checksum: 10c0/c4242bad66f67e6f7b712733d25b43cbb9e19a595c8701c3ad99cbeb5901555f78b095e24852f862fffb43e96f1d8552e62def885ca82ae1bb05da3668fd87d7
-  languageName: node
-  linkType: hard
-
 "@standard-schema/spec@npm:^1.0.0":
   version: 1.0.0
   resolution: "@standard-schema/spec@npm:1.0.0"
@@ -8191,6 +8272,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tybys/wasm-util@npm:^0.10.1":
+  version: 0.10.1
+  resolution: "@tybys/wasm-util@npm:0.10.1"
+  dependencies:
+    tslib: "npm:^2.4.0"
+  checksum: 10c0/b255094f293794c6d2289300c5fbcafbb5532a3aed3a5ffd2f8dc1828e639b88d75f6a376dd8f94347a44813fd7a7149d8463477a9a49525c8b2dcaa38c2d1e8
+  languageName: node
+  linkType: hard
+
 "@types/aria-query@npm:^5.0.1":
   version: 5.0.4
   resolution: "@types/aria-query@npm:5.0.4"
@@ -8254,7 +8344,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/cors@npm:^2.8.12, @types/cors@npm:^2.8.19":
+"@types/cors@npm:^2.8.19":
   version: 2.8.19
   resolution: "@types/cors@npm:2.8.19"
   dependencies:
@@ -8811,15 +8901,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:>=10.0.0":
-  version: 24.3.1
-  resolution: "@types/node@npm:24.3.1"
-  dependencies:
-    undici-types: "npm:~7.10.0"
-  checksum: 10c0/99b86fc32294fcd61136ca1f771026443a1e370e9f284f75e243b29299dd878e18c193deba1ce29a374932db4e30eb80826e1049b9aad02d36f5c30b94b6f928
-  languageName: node
-  linkType: hard
-
 "@types/node@npm:^18.11.18":
   version: 18.19.86
   resolution: "@types/node@npm:18.19.86"
@@ -10038,15 +10119,15 @@ __metadata:
     "@ai-sdk/anthropic": "npm:^2.0.49"
     "@ai-sdk/cerebras": "npm:^1.0.31"
     "@ai-sdk/gateway": "npm:^2.0.15"
-    "@ai-sdk/google": "patch:@ai-sdk/google@npm%3A2.0.43#~/.yarn/patches/@ai-sdk-google-npm-2.0.43-689ed559b3.patch"
-    "@ai-sdk/google-vertex": "npm:^3.0.79"
+    "@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": "npm:^3.0.94"
     "@ai-sdk/huggingface": "npm:^0.0.10"
     "@ai-sdk/mistral": "npm:^2.0.24"
-    "@ai-sdk/openai": "patch:@ai-sdk/openai@npm%3A2.0.72#~/.yarn/patches/@ai-sdk-openai-npm-2.0.72-234e68da87.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": "npm:^2.0.20"
     "@ai-sdk/test-server": "npm:^0.0.1"
     "@ant-design/v5-patch-for-react-19": "npm:^1.0.3"
-    "@anthropic-ai/claude-agent-sdk": "patch:@anthropic-ai/claude-agent-sdk@npm%3A0.1.53#~/.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.53-4b77f4cf29.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"
     "@anthropic-ai/sdk": "npm:^0.41.0"
     "@anthropic-ai/vertex-sdk": "patch:@anthropic-ai/vertex-sdk@npm%3A0.11.4#~/.yarn/patches/@anthropic-ai-vertex-sdk-npm-0.11.4-c19cb41edb.patch"
     "@aws-sdk/client-bedrock": "npm:^3.910.0"
@@ -10067,7 +10148,7 @@ __metadata:
     "@cherrystudio/embedjs-ollama": "npm:^0.1.31"
     "@cherrystudio/embedjs-openai": "npm:^0.1.31"
     "@cherrystudio/extension-table-plus": "workspace:^"
-    "@cherrystudio/openai": "npm:^6.9.0"
+    "@cherrystudio/openai": "npm:^6.12.0"
     "@dnd-kit/core": "npm:^6.3.1"
     "@dnd-kit/modifiers": "npm:^9.0.0"
     "@dnd-kit/sortable": "npm:^10.0.0"
@@ -10177,6 +10258,7 @@ __metadata:
     archiver: "npm:^7.0.1"
     async-mutex: "npm:^0.5.0"
     axios: "npm:^1.7.3"
+    bonjour-service: "npm:^1.3.0"
     browser-image-compression: "npm:^2.0.2"
     chardet: "npm:^2.1.0"
     check-disk-space: "npm:3.4.0"
@@ -10204,7 +10286,7 @@ __metadata:
     electron-reload: "npm:^2.0.0-alpha.1"
     electron-store: "npm:^8.2.0"
     electron-updater: "patch:electron-updater@npm%3A6.7.0#~/.yarn/patches/electron-updater-npm-6.7.0-47b11bb0d4.patch"
-    electron-vite: "npm:4.0.1"
+    electron-vite: "npm:5.0.0"
     electron-window-state: "npm:^5.0.3"
     emittery: "npm:^1.0.3"
     emoji-picker-element: "npm:^1.22.1"
@@ -10257,7 +10339,7 @@ __metadata:
     notion-helper: "npm:^1.3.22"
     npx-scope-finder: "npm:^1.2.0"
     officeparser: "npm:^4.2.0"
-    ollama-ai-provider-v2: "npm:^1.5.5"
+    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"
     os-proxy-config: "npm:^1.1.2"
     oxlint: "npm:^1.22.0"
     oxlint-tsgolint: "npm:^0.2.0"
@@ -10265,7 +10347,6 @@ __metadata:
     pdf-lib: "npm:^1.17.1"
     pdf-parse: "npm:^1.1.1"
     proxy-agent: "npm:^6.5.0"
-    qrcode.react: "npm:^4.2.0"
     react: "npm:^19.2.0"
     react-dom: "npm:^19.2.0"
     react-error-boundary: "npm:^6.0.0"
@@ -10297,7 +10378,6 @@ __metadata:
     selection-hook: "npm:^1.0.12"
     sharp: "npm:^0.34.3"
     shiki: "npm:^3.12.0"
-    socket.io: "npm:^4.8.1"
     strict-url-sanitise: "npm:^0.0.1"
     string-width: "npm:^7.2.0"
     striptags: "npm:^3.2.0"
@@ -10319,7 +10399,7 @@ __metadata:
     undici: "npm:6.21.2"
     unified: "npm:^11.0.5"
     uuid: "npm:^13.0.0"
-    vite: "npm:rolldown-vite@7.1.5"
+    vite: "npm:rolldown-vite@7.3.0"
     vitest: "npm:^3.2.4"
     webdav: "npm:^5.8.0"
     winston: "npm:^3.17.0"
@@ -10360,16 +10440,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"accepts@npm:~1.3.4":
-  version: 1.3.8
-  resolution: "accepts@npm:1.3.8"
-  dependencies:
-    mime-types: "npm:~2.1.34"
-    negotiator: "npm:0.6.3"
-  checksum: 10c0/3a35c5f5586cfb9a21163ca47a5f77ac34fa8ceb5d17d2fa2c0d81f41cbd7f8c6fa52c77e2c039acc0f4d09e71abdc51144246900f6bef5e3c4b333f77d89362
-  languageName: node
-  linkType: hard
-
 "acorn-jsx@npm:^5.3.2":
   version: 5.3.2
   resolution: "acorn-jsx@npm:5.3.2"
@@ -11008,13 +11078,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"base64id@npm:2.0.0, base64id@npm:~2.0.0":
-  version: 2.0.0
-  resolution: "base64id@npm:2.0.0"
-  checksum: 10c0/6919efd237ed44b9988cbfc33eca6f173a10e810ce50292b271a1a421aac7748ef232a64d1e6032b08f19aae48dce6ee8f66c5ae2c9e5066c82b884861d4d453
-  languageName: node
-  linkType: hard
-
 "basic-ftp@npm:^5.0.2":
   version: 5.0.5
   resolution: "basic-ftp@npm:5.0.5"
@@ -11130,6 +11193,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"bonjour-service@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "bonjour-service@npm:1.3.0"
+  dependencies:
+    fast-deep-equal: "npm:^3.1.3"
+    multicast-dns: "npm:^7.2.5"
+  checksum: 10c0/5721fd9f9bb968e9cc16c1e8116d770863dd2329cb1f753231de1515870648c225142b7eefa71f14a5c22bc7b37ddd7fdeb018700f28a8c936d50d4162d433c7
+  languageName: node
+  linkType: hard
+
 "boolbase@npm:^1.0.0":
   version: 1.0.0
   resolution: "boolbase@npm:1.0.0"
@@ -11233,7 +11306,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"buffer-equal-constant-time@npm:1.0.1":
+"buffer-equal-constant-time@npm:^1.0.1":
   version: 1.0.1
   resolution: "buffer-equal-constant-time@npm:1.0.1"
   checksum: 10c0/fb2294e64d23c573d0dd1f1e7a466c3e978fe94a4e0f8183937912ca374619773bef8e2aceb854129d2efecbbc515bbd0cc78d2734a3e3031edb0888531bbc8e
@@ -12241,7 +12314,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cookie@npm:^0.7.1, cookie@npm:~0.7.2":
+"cookie@npm:^0.7.1":
   version: 0.7.2
   resolution: "cookie@npm:0.7.2"
   checksum: 10c0/9596e8ccdbf1a3a88ae02cf5ee80c1c50959423e1022e4e60b91dd87c622af1da309253d8abdb258fb5e3eacb4f08e579dc58b4897b8087574eee0fd35dfa5d2
@@ -12278,7 +12351,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cors@npm:^2.8.5, cors@npm:~2.8.5":
+"cors@npm:^2.8.5":
   version: 2.8.5
   resolution: "cors@npm:2.8.5"
   dependencies:
@@ -12948,18 +13021,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:~4.3.1, debug@npm:~4.3.2, debug@npm:~4.3.4":
-  version: 4.3.7
-  resolution: "debug@npm:4.3.7"
-  dependencies:
-    ms: "npm:^2.1.3"
-  peerDependenciesMeta:
-    supports-color:
-      optional: true
-  checksum: 10c0/1471db19c3b06d485a622d62f65947a19a23fbd0dd73f7fd3eafb697eec5360cde447fb075919987899b1a2096e85d35d4eb5a4de09a57600ac9cf7e6c8e768b
-  languageName: node
-  linkType: hard
-
 "decamelize@npm:1.2.0":
   version: 1.2.0
   resolution: "decamelize@npm:1.2.0"
@@ -13348,6 +13409,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"dns-packet@npm:^5.2.2":
+  version: 5.6.1
+  resolution: "dns-packet@npm:5.6.1"
+  dependencies:
+    "@leichtgewicht/ip-codec": "npm:^2.0.1"
+  checksum: 10c0/8948d3d03063fb68e04a1e386875f8c3bcc398fc375f535f2b438fad8f41bf1afa6f5e70893ba44f4ae884c089247e0a31045722fa6ff0f01d228da103f1811d
+  languageName: node
+  linkType: hard
+
 "doctrine@npm:3.0.0":
   version: 3.0.0
   resolution: "doctrine@npm:3.0.0"
@@ -13780,15 +13850,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-vite@npm:4.0.1":
-  version: 4.0.1
-  resolution: "electron-vite@npm:4.0.1"
+"electron-vite@npm:5.0.0":
+  version: 5.0.0
+  resolution: "electron-vite@npm:5.0.0"
   dependencies:
-    "@babel/core": "npm:^7.27.7"
+    "@babel/core": "npm:^7.28.4"
     "@babel/plugin-transform-arrow-functions": "npm:^7.27.1"
     cac: "npm:^6.7.14"
-    esbuild: "npm:^0.25.5"
-    magic-string: "npm:^0.30.17"
+    esbuild: "npm:^0.25.11"
+    magic-string: "npm:^0.30.19"
     picocolors: "npm:^1.1.1"
   peerDependencies:
     "@swc/core": ^1.0.0
@@ -13798,7 +13868,7 @@ __metadata:
       optional: true
   bin:
     electron-vite: bin/electron-vite.js
-  checksum: 10c0/4e81ac4e4ede6060ffec56ba9b1d5ff95bb263496e62527345e8c79542924c54c54def39de9b466a81ed250b68774792c2106b93274c790b4cd8e7be448f6af8
+  checksum: 10c0/e7797910b23f23f39c12ded92d07d7164c5c6adab294aa13278c1b49ada3b12868b13ace8546d2656db4dbab89978cf8368a659d1ce6a2fb9f1aeddb1c8de557
   languageName: node
   linkType: hard
 
@@ -13916,30 +13986,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"engine.io-parser@npm:~5.2.1":
-  version: 5.2.3
-  resolution: "engine.io-parser@npm:5.2.3"
-  checksum: 10c0/ed4900d8dbef470ab3839ccf3bfa79ee518ea8277c7f1f2759e8c22a48f64e687ea5e474291394d0c94f84054749fd93f3ef0acb51fa2f5f234cc9d9d8e7c536
-  languageName: node
-  linkType: hard
-
-"engine.io@npm:~6.6.0":
-  version: 6.6.4
-  resolution: "engine.io@npm:6.6.4"
-  dependencies:
-    "@types/cors": "npm:^2.8.12"
-    "@types/node": "npm:>=10.0.0"
-    accepts: "npm:~1.3.4"
-    base64id: "npm:2.0.0"
-    cookie: "npm:~0.7.2"
-    cors: "npm:~2.8.5"
-    debug: "npm:~4.3.1"
-    engine.io-parser: "npm:~5.2.1"
-    ws: "npm:~8.17.1"
-  checksum: 10c0/845761163f8ea7962c049df653b75dafb6b3693ad6f59809d4474751d7b0392cbf3dc2730b8a902ff93677a91fd28711d34ab29efd348a8a4b49c6b0724021ab
-  languageName: node
-  linkType: hard
-
 "enhanced-resolve@npm:^5.18.3":
   version: 5.18.3
   resolution: "enhanced-resolve@npm:5.18.3"
@@ -15486,6 +15532,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"gaxios@npm:^7.0.0":
+  version: 7.1.3
+  resolution: "gaxios@npm:7.1.3"
+  dependencies:
+    extend: "npm:^3.0.2"
+    https-proxy-agent: "npm:^7.0.1"
+    node-fetch: "npm:^3.3.2"
+    rimraf: "npm:^5.0.1"
+  checksum: 10c0/a4a1cdf9a392c0c22e9734a40dca5a77a2903f505b939a50f1e68e312458b1289b7993d2f72d011426e89657cae77a3aa9fc62fb140e8ba90a1faa31fdbde4d2
+  languageName: node
+  linkType: hard
+
 "gcp-metadata@npm:^6.1.0":
   version: 6.1.1
   resolution: "gcp-metadata@npm:6.1.1"
@@ -15497,6 +15555,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"gcp-metadata@npm:^8.0.0":
+  version: 8.1.2
+  resolution: "gcp-metadata@npm:8.1.2"
+  dependencies:
+    gaxios: "npm:^7.0.0"
+    google-logging-utils: "npm:^1.0.0"
+    json-bigint: "npm:^1.0.0"
+  checksum: 10c0/15a61231a9410dc11c2828d2c9fdc8b0a939f1af746195c44edc6f2ffea0acab52cef3a7b9828069a36fd5d68bda730f7328a415fe42a01258f6e249dfba6908
+  languageName: node
+  linkType: hard
+
 "gensync@npm:^1.0.0-beta.2":
   version: 1.0.0-beta.2
   resolution: "gensync@npm:1.0.0-beta.2"
@@ -15720,7 +15789,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"google-auth-library@npm:^9.14.2, google-auth-library@npm:^9.15.0, google-auth-library@npm:^9.15.1, google-auth-library@npm:^9.4.2":
+"google-auth-library@npm:^10.5.0":
+  version: 10.5.0
+  resolution: "google-auth-library@npm:10.5.0"
+  dependencies:
+    base64-js: "npm:^1.3.0"
+    ecdsa-sig-formatter: "npm:^1.0.11"
+    gaxios: "npm:^7.0.0"
+    gcp-metadata: "npm:^8.0.0"
+    google-logging-utils: "npm:^1.0.0"
+    gtoken: "npm:^8.0.0"
+    jws: "npm:^4.0.0"
+  checksum: 10c0/49d3931d20b1f4a4d075216bf5518e2b3396dcf441a8f1952611cf3b6080afb1261c3d32009609047ee4a1cc545269a74b4957e6bba9cce840581df309c4b145
+  languageName: node
+  linkType: hard
+
+"google-auth-library@npm:^9.14.2, google-auth-library@npm:^9.15.1, google-auth-library@npm:^9.4.2":
   version: 9.15.1
   resolution: "google-auth-library@npm:9.15.1"
   dependencies:
@@ -15741,6 +15825,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"google-logging-utils@npm:^1.0.0":
+  version: 1.1.3
+  resolution: "google-logging-utils@npm:1.1.3"
+  checksum: 10c0/e65201c7e96543bd1423b9324013736646b9eed60941e0bfa47b9bfd146d2f09cf3df1c99ca60b7d80a726075263ead049ee72de53372cb8458c3bc55c2c1e59
+  languageName: node
+  linkType: hard
+
 "gopd@npm:^1.0.1, gopd@npm:^1.2.0":
   version: 1.2.0
   resolution: "gopd@npm:1.2.0"
@@ -15829,6 +15920,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"gtoken@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "gtoken@npm:8.0.0"
+  dependencies:
+    gaxios: "npm:^7.0.0"
+    jws: "npm:^4.0.0"
+  checksum: 10c0/058538e5bbe081d30ada5f1fd34d3a8194357c2e6ecbf7c8a98daeefbf13f7e06c15649c7dace6a1d4cc3bc6dc5483bd484d6d7adc5852021896d7c05c439f37
+  languageName: node
+  linkType: hard
+
 "hachure-fill@npm:^0.5.2":
   version: 0.5.2
   resolution: "hachure-fill@npm:0.5.2"
@@ -17165,24 +17266,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jwa@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "jwa@npm:2.0.0"
+"jwa@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "jwa@npm:2.0.1"
   dependencies:
-    buffer-equal-constant-time: "npm:1.0.1"
+    buffer-equal-constant-time: "npm:^1.0.1"
     ecdsa-sig-formatter: "npm:1.0.11"
     safe-buffer: "npm:^5.0.1"
-  checksum: 10c0/6baab823b93c038ba1d2a9e531984dcadbc04e9eb98d171f4901b7a40d2be15961a359335de1671d78cb6d987f07cbe5d350d8143255977a889160c4d90fcc3c
+  checksum: 10c0/ab3ebc6598e10dc11419d4ed675c9ca714a387481466b10e8a6f3f65d8d9c9237e2826f2505280a739cf4cbcf511cb288eeec22b5c9c63286fc5a2e4f97e78cf
   languageName: node
   linkType: hard
 
 "jws@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "jws@npm:4.0.0"
+  version: 4.0.1
+  resolution: "jws@npm:4.0.1"
   dependencies:
-    jwa: "npm:^2.0.0"
+    jwa: "npm:^2.0.1"
     safe-buffer: "npm:^5.0.1"
-  checksum: 10c0/f1ca77ea5451e8dc5ee219cb7053b8a4f1254a79cb22417a2e1043c1eb8a569ae118c68f24d72a589e8a3dd1824697f47d6bd4fb4bebb93a3bdf53545e721661
+  checksum: 10c0/6be1ed93023aef570ccc5ea8d162b065840f3ef12f0d1bb3114cade844de7a357d5dc558201d9a65101e70885a6fa56b17462f520e6b0d426195510618a154d0
   languageName: node
   linkType: hard
 
@@ -17549,6 +17650,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lightningcss-android-arm64@npm:1.30.2":
+  version: 1.30.2
+  resolution: "lightningcss-android-arm64@npm:1.30.2"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "lightningcss-darwin-arm64@npm:1.30.1":
   version: 1.30.1
   resolution: "lightningcss-darwin-arm64@npm:1.30.1"
@@ -17556,6 +17664,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lightningcss-darwin-arm64@npm:1.30.2":
+  version: 1.30.2
+  resolution: "lightningcss-darwin-arm64@npm:1.30.2"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "lightningcss-darwin-x64@npm:1.30.1":
   version: 1.30.1
   resolution: "lightningcss-darwin-x64@npm:1.30.1"
@@ -17563,6 +17678,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lightningcss-darwin-x64@npm:1.30.2":
+  version: 1.30.2
+  resolution: "lightningcss-darwin-x64@npm:1.30.2"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
 "lightningcss-freebsd-x64@npm:1.30.1":
   version: 1.30.1
   resolution: "lightningcss-freebsd-x64@npm:1.30.1"
@@ -17570,6 +17692,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lightningcss-freebsd-x64@npm:1.30.2":
+  version: 1.30.2
+  resolution: "lightningcss-freebsd-x64@npm:1.30.2"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
 "lightningcss-linux-arm-gnueabihf@npm:1.30.1":
   version: 1.30.1
   resolution: "lightningcss-linux-arm-gnueabihf@npm:1.30.1"
@@ -17577,6 +17706,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lightningcss-linux-arm-gnueabihf@npm:1.30.2":
+  version: 1.30.2
+  resolution: "lightningcss-linux-arm-gnueabihf@npm:1.30.2"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
 "lightningcss-linux-arm64-gnu@npm:1.30.1":
   version: 1.30.1
   resolution: "lightningcss-linux-arm64-gnu@npm:1.30.1"
@@ -17584,6 +17720,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lightningcss-linux-arm64-gnu@npm:1.30.2":
+  version: 1.30.2
+  resolution: "lightningcss-linux-arm64-gnu@npm:1.30.2"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
 "lightningcss-linux-arm64-musl@npm:1.30.1":
   version: 1.30.1
   resolution: "lightningcss-linux-arm64-musl@npm:1.30.1"
@@ -17591,6 +17734,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lightningcss-linux-arm64-musl@npm:1.30.2":
+  version: 1.30.2
+  resolution: "lightningcss-linux-arm64-musl@npm:1.30.2"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
 "lightningcss-linux-x64-gnu@npm:1.30.1":
   version: 1.30.1
   resolution: "lightningcss-linux-x64-gnu@npm:1.30.1"
@@ -17598,6 +17748,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lightningcss-linux-x64-gnu@npm:1.30.2":
+  version: 1.30.2
+  resolution: "lightningcss-linux-x64-gnu@npm:1.30.2"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
 "lightningcss-linux-x64-musl@npm:1.30.1":
   version: 1.30.1
   resolution: "lightningcss-linux-x64-musl@npm:1.30.1"
@@ -17605,6 +17762,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lightningcss-linux-x64-musl@npm:1.30.2":
+  version: 1.30.2
+  resolution: "lightningcss-linux-x64-musl@npm:1.30.2"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
 "lightningcss-win32-arm64-msvc@npm:1.30.1":
   version: 1.30.1
   resolution: "lightningcss-win32-arm64-msvc@npm:1.30.1"
@@ -17612,6 +17776,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lightningcss-win32-arm64-msvc@npm:1.30.2":
+  version: 1.30.2
+  resolution: "lightningcss-win32-arm64-msvc@npm:1.30.2"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
 "lightningcss-win32-x64-msvc@npm:1.30.1":
   version: 1.30.1
   resolution: "lightningcss-win32-x64-msvc@npm:1.30.1"
@@ -17619,7 +17790,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lightningcss@npm:1.30.1, lightningcss@npm:^1.30.1":
+"lightningcss-win32-x64-msvc@npm:1.30.2":
+  version: 1.30.2
+  resolution: "lightningcss-win32-x64-msvc@npm:1.30.2"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"lightningcss@npm:1.30.1":
   version: 1.30.1
   resolution: "lightningcss@npm:1.30.1"
   dependencies:
@@ -17659,6 +17837,49 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lightningcss@npm:^1.30.2":
+  version: 1.30.2
+  resolution: "lightningcss@npm:1.30.2"
+  dependencies:
+    detect-libc: "npm:^2.0.3"
+    lightningcss-android-arm64: "npm:1.30.2"
+    lightningcss-darwin-arm64: "npm:1.30.2"
+    lightningcss-darwin-x64: "npm:1.30.2"
+    lightningcss-freebsd-x64: "npm:1.30.2"
+    lightningcss-linux-arm-gnueabihf: "npm:1.30.2"
+    lightningcss-linux-arm64-gnu: "npm:1.30.2"
+    lightningcss-linux-arm64-musl: "npm:1.30.2"
+    lightningcss-linux-x64-gnu: "npm:1.30.2"
+    lightningcss-linux-x64-musl: "npm:1.30.2"
+    lightningcss-win32-arm64-msvc: "npm:1.30.2"
+    lightningcss-win32-x64-msvc: "npm:1.30.2"
+  dependenciesMeta:
+    lightningcss-android-arm64:
+      optional: true
+    lightningcss-darwin-arm64:
+      optional: true
+    lightningcss-darwin-x64:
+      optional: true
+    lightningcss-freebsd-x64:
+      optional: true
+    lightningcss-linux-arm-gnueabihf:
+      optional: true
+    lightningcss-linux-arm64-gnu:
+      optional: true
+    lightningcss-linux-arm64-musl:
+      optional: true
+    lightningcss-linux-x64-gnu:
+      optional: true
+    lightningcss-linux-x64-musl:
+      optional: true
+    lightningcss-win32-arm64-msvc:
+      optional: true
+    lightningcss-win32-x64-msvc:
+      optional: true
+  checksum: 10c0/5c0c73a33946dab65908d5cd1325df4efa290efb77f940b60f40448b5ab9a87d3ea665ef9bcf00df4209705050ecf2f7ecc649f44d6dfa5905bb50f15717e78d
+  languageName: node
+  linkType: hard
+
 "lilconfig@npm:^3.1.3":
   version: 3.1.3
   resolution: "lilconfig@npm:3.1.3"
@@ -18022,6 +18243,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"magic-string@npm:^0.30.19":
+  version: 0.30.21
+  resolution: "magic-string@npm:0.30.21"
+  dependencies:
+    "@jridgewell/sourcemap-codec": "npm:^1.5.5"
+  checksum: 10c0/299378e38f9a270069fc62358522ddfb44e94244baa0d6a8980ab2a9b2490a1d03b236b447eee309e17eb3bddfa482c61259d47960eb018a904f0ded52780c4a
+  languageName: node
+  linkType: hard
+
 "magicast@npm:^0.3.5":
   version: 0.3.5
   resolution: "magicast@npm:0.3.5"
@@ -19118,7 +19348,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mime-types@npm:^2.1.12, mime-types@npm:^2.1.35, mime-types@npm:~2.1.34":
+"mime-types@npm:^2.1.12, mime-types@npm:^2.1.35":
   version: 2.1.35
   resolution: "mime-types@npm:2.1.35"
   dependencies:
@@ -19522,6 +19752,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"multicast-dns@npm:^7.2.5":
+  version: 7.2.5
+  resolution: "multicast-dns@npm:7.2.5"
+  dependencies:
+    dns-packet: "npm:^5.2.2"
+    thunky: "npm:^1.0.2"
+  bin:
+    multicast-dns: cli.js
+  checksum: 10c0/5120171d4bdb1577764c5afa96e413353bff530d1b37081cb29cccc747f989eb1baf40574fe8e27060fc1aef72b59c042f72b9b208413de33bcf411343c69057
+  languageName: node
+  linkType: hard
+
 "mustache@npm:^4.2.0":
   version: 4.2.0
   resolution: "mustache@npm:4.2.0"
@@ -19605,13 +19847,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"negotiator@npm:0.6.3":
-  version: 0.6.3
-  resolution: "negotiator@npm:0.6.3"
-  checksum: 10c0/3ec9fd413e7bf071c937ae60d572bc67155262068ed522cf4b3be5edbe6ddf67d095ec03a3a14ebf8fc8e95f8e1d61be4869db0dbb0de696f6b837358bd43fc2
-  languageName: node
-  linkType: hard
-
 "negotiator@npm:^1.0.0":
   version: 1.0.0
   resolution: "negotiator@npm:1.0.0"
@@ -19960,7 +20195,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ollama-ai-provider-v2@npm:^1.5.5":
+"ollama-ai-provider-v2@npm:1.5.5":
   version: 1.5.5
   resolution: "ollama-ai-provider-v2@npm:1.5.5"
   dependencies:
@@ -19972,6 +20207,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"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":
+  version: 1.5.5
+  resolution: "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::version=1.5.5&hash=0aef28"
+  dependencies:
+    "@ai-sdk/provider": "npm:^2.0.0"
+    "@ai-sdk/provider-utils": "npm:^3.0.17"
+  peerDependencies:
+    zod: ^4.0.16
+  checksum: 10c0/32ca1f543ee791ac96061a5f6d8899c00644eeb774b3b951ca1e3e3810b60753acacf8229b2c1ba099b25a01732c54e51e0df44d11f4d90ae201f483d41aa149
+  languageName: node
+  linkType: hard
+
 "ollama@npm:^0.5.12":
   version: 0.5.16
   resolution: "ollama@npm:0.5.16"
@@ -21289,15 +21536,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"qrcode.react@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "qrcode.react@npm:4.2.0"
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-  checksum: 10c0/68c691d130e5fda2f57cee505ed7aea840e7d02033100687b764601f9595e1116e34c13876628a93e1a5c2b85e4efc27d30b2fda72e2050c02f3e1c4e998d248
-  languageName: node
-  linkType: hard
-
 "qs@npm:^6.14.0":
   version: 6.14.0
   resolution: "qs@npm:6.14.0"
@@ -22753,7 +22991,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rimraf@npm:^5.0.10":
+"rimraf@npm:^5.0.1, rimraf@npm:^5.0.10":
   version: 5.0.10
   resolution: "rimraf@npm:5.0.10"
   dependencies:
@@ -22841,28 +23079,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rolldown@npm:1.0.0-beta.34":
-  version: 1.0.0-beta.34
-  resolution: "rolldown@npm:1.0.0-beta.34"
+"rolldown@npm:1.0.0-beta.53":
+  version: 1.0.0-beta.53
+  resolution: "rolldown@npm:1.0.0-beta.53"
   dependencies:
-    "@oxc-project/runtime": "npm:=0.82.3"
-    "@oxc-project/types": "npm:=0.82.3"
-    "@rolldown/binding-android-arm64": "npm:1.0.0-beta.34"
-    "@rolldown/binding-darwin-arm64": "npm:1.0.0-beta.34"
-    "@rolldown/binding-darwin-x64": "npm:1.0.0-beta.34"
-    "@rolldown/binding-freebsd-x64": "npm:1.0.0-beta.34"
-    "@rolldown/binding-linux-arm-gnueabihf": "npm:1.0.0-beta.34"
-    "@rolldown/binding-linux-arm64-gnu": "npm:1.0.0-beta.34"
-    "@rolldown/binding-linux-arm64-musl": "npm:1.0.0-beta.34"
-    "@rolldown/binding-linux-x64-gnu": "npm:1.0.0-beta.34"
-    "@rolldown/binding-linux-x64-musl": "npm:1.0.0-beta.34"
-    "@rolldown/binding-openharmony-arm64": "npm:1.0.0-beta.34"
-    "@rolldown/binding-wasm32-wasi": "npm:1.0.0-beta.34"
-    "@rolldown/binding-win32-arm64-msvc": "npm:1.0.0-beta.34"
-    "@rolldown/binding-win32-ia32-msvc": "npm:1.0.0-beta.34"
-    "@rolldown/binding-win32-x64-msvc": "npm:1.0.0-beta.34"
-    "@rolldown/pluginutils": "npm:1.0.0-beta.34"
-    ansis: "npm:^4.0.0"
+    "@oxc-project/types": "npm:=0.101.0"
+    "@rolldown/binding-android-arm64": "npm:1.0.0-beta.53"
+    "@rolldown/binding-darwin-arm64": "npm:1.0.0-beta.53"
+    "@rolldown/binding-darwin-x64": "npm:1.0.0-beta.53"
+    "@rolldown/binding-freebsd-x64": "npm:1.0.0-beta.53"
+    "@rolldown/binding-linux-arm-gnueabihf": "npm:1.0.0-beta.53"
+    "@rolldown/binding-linux-arm64-gnu": "npm:1.0.0-beta.53"
+    "@rolldown/binding-linux-arm64-musl": "npm:1.0.0-beta.53"
+    "@rolldown/binding-linux-x64-gnu": "npm:1.0.0-beta.53"
+    "@rolldown/binding-linux-x64-musl": "npm:1.0.0-beta.53"
+    "@rolldown/binding-openharmony-arm64": "npm:1.0.0-beta.53"
+    "@rolldown/binding-wasm32-wasi": "npm:1.0.0-beta.53"
+    "@rolldown/binding-win32-arm64-msvc": "npm:1.0.0-beta.53"
+    "@rolldown/binding-win32-x64-msvc": "npm:1.0.0-beta.53"
+    "@rolldown/pluginutils": "npm:1.0.0-beta.53"
   dependenciesMeta:
     "@rolldown/binding-android-arm64":
       optional: true
@@ -22888,13 +23123,11 @@ __metadata:
       optional: true
     "@rolldown/binding-win32-arm64-msvc":
       optional: true
-    "@rolldown/binding-win32-ia32-msvc":
-      optional: true
     "@rolldown/binding-win32-x64-msvc":
       optional: true
   bin:
     rolldown: bin/cli.mjs
-  checksum: 10c0/3fdaa36b3bfcdd6913973ef8d785a7e7eeb8c181626ac0d0b8a75aecca2ba3d536ff29a3f5c003f692d7c422e022d0357d7d564ab4aa67cf128230ca137473e8
+  checksum: 10c0/363109aa38b31254e682e69aa9f199074d98b823b437faac6d05fd1b4a2b73168b9434043a060fecfc25d3e1d441e2d3b757e92621bc1e843a3e916e2b0d3f58
   languageName: node
   linkType: hard
 
@@ -23574,41 +23807,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"socket.io-adapter@npm:~2.5.2":
-  version: 2.5.5
-  resolution: "socket.io-adapter@npm:2.5.5"
-  dependencies:
-    debug: "npm:~4.3.4"
-    ws: "npm:~8.17.1"
-  checksum: 10c0/04a5a2a9c4399d1b6597c2afc4492ab1e73430cc124ab02b09e948eabf341180b3866e2b61b5084cb899beb68a4db7c328c29bda5efb9207671b5cb0bc6de44e
-  languageName: node
-  linkType: hard
-
-"socket.io-parser@npm:~4.2.4":
-  version: 4.2.4
-  resolution: "socket.io-parser@npm:4.2.4"
-  dependencies:
-    "@socket.io/component-emitter": "npm:~3.1.0"
-    debug: "npm:~4.3.1"
-  checksum: 10c0/9383b30358fde4a801ea4ec5e6860915c0389a091321f1c1f41506618b5cf7cd685d0a31c587467a0c4ee99ef98c2b99fb87911f9dfb329716c43b587f29ca48
-  languageName: node
-  linkType: hard
-
-"socket.io@npm:^4.8.1":
-  version: 4.8.1
-  resolution: "socket.io@npm:4.8.1"
-  dependencies:
-    accepts: "npm:~1.3.4"
-    base64id: "npm:~2.0.0"
-    cors: "npm:~2.8.5"
-    debug: "npm:~4.3.2"
-    engine.io: "npm:~6.6.0"
-    socket.io-adapter: "npm:~2.5.2"
-    socket.io-parser: "npm:~4.2.4"
-  checksum: 10c0/acf931a2bb235be96433b71da3d8addc63eeeaa8acabd33dc8d64e12287390a45f1e9f389a73cf7dc336961cd491679741b7a016048325c596835abbcc017ca9
-  languageName: node
-  linkType: hard
-
 "socks-proxy-agent@npm:^8.0.3, socks-proxy-agent@npm:^8.0.5":
   version: 8.0.5
   resolution: "socks-proxy-agent@npm:8.0.5"
@@ -24396,6 +24594,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"thunky@npm:^1.0.2":
+  version: 1.1.0
+  resolution: "thunky@npm:1.1.0"
+  checksum: 10c0/369764f39de1ce1de2ba2fa922db4a3f92e9c7f33bcc9a713241bc1f4a5238b484c17e0d36d1d533c625efb00e9e82c3e45f80b47586945557b45abb890156d2
+  languageName: node
+  linkType: hard
+
 "tiktok-video-element@npm:^0.1.0":
   version: 0.1.1
   resolution: "tiktok-video-element@npm:0.1.1"
@@ -24474,6 +24679,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tinyglobby@npm:^0.2.15":
+  version: 0.2.15
+  resolution: "tinyglobby@npm:0.2.15"
+  dependencies:
+    fdir: "npm:^6.5.0"
+    picomatch: "npm:^4.0.3"
+  checksum: 10c0/869c31490d0d88eedb8305d178d4c75e7463e820df5a9b9d388291daf93e8b1eb5de1dad1c1e139767e4269fe75f3b10d5009b2cc14db96ff98986920a186844
+  languageName: node
+  linkType: hard
+
 "tinypool@npm:^1.1.1":
   version: 1.1.1
   resolution: "tinypool@npm:1.1.1"
@@ -25098,13 +25313,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"undici-types@npm:~7.10.0":
-  version: 7.10.0
-  resolution: "undici-types@npm:7.10.0"
-  checksum: 10c0/8b00ce50e235fe3cc601307f148b5e8fb427092ee3b23e8118ec0a5d7f68eca8cee468c8fc9f15cbb2cf2a3797945ebceb1cbd9732306a1d00e0a9b6afa0f635
-  languageName: node
-  linkType: hard
-
 "undici@npm:6.21.2":
   version: 6.21.2
   resolution: "undici@npm:6.21.2"
@@ -25593,20 +25801,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:rolldown-vite@7.1.5":
-  version: 7.1.5
-  resolution: "rolldown-vite@npm:7.1.5"
+"vite@npm:rolldown-vite@7.3.0":
+  version: 7.3.0
+  resolution: "rolldown-vite@npm:7.3.0"
   dependencies:
+    "@oxc-project/runtime": "npm:0.101.0"
     fdir: "npm:^6.5.0"
     fsevents: "npm:~2.3.3"
-    lightningcss: "npm:^1.30.1"
+    lightningcss: "npm:^1.30.2"
     picomatch: "npm:^4.0.3"
     postcss: "npm:^8.5.6"
-    rolldown: "npm:1.0.0-beta.34"
-    tinyglobby: "npm:^0.2.14"
+    rolldown: "npm:1.0.0-beta.53"
+    tinyglobby: "npm:^0.2.15"
   peerDependencies:
     "@types/node": ^20.19.0 || >=22.12.0
-    esbuild: ^0.25.0
+    esbuild: ^0.27.0
     jiti: ">=1.21.0"
     less: ^4.0.0
     sass: ^1.70.0
@@ -25644,7 +25853,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 10c0/55f6648a8700345700382adac4877208eedcfff5757debba74851227dbc50eae3cc7ccea86bcfda689a9855fbbd2c7e7dd020ffc0c01bfb815dbc6bf65991cbd
+  checksum: 10c0/7098ba9be029e6530baf6a08e786859910e502e14f18a6fdda856b149fe676ff81d5cb069b8b42f3e88e791fff17f77f9f067c26159fb85a7aab4e4b8692bbb2
   languageName: node
   linkType: hard
 
@@ -26132,21 +26341,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:~8.17.1":
-  version: 8.17.1
-  resolution: "ws@npm:8.17.1"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ">=5.0.2"
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: 10c0/f4a49064afae4500be772abdc2211c8518f39e1c959640457dcee15d4488628620625c783902a52af2dd02f68558da2868fd06e6fd0e67ebcd09e6881b1b5bfe
-  languageName: node
-  linkType: hard
-
 "xlsx@https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz":
   version: 0.20.2
   resolution: "xlsx@https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz"