fix: Include notes directory in backup when configured outside Data folder

- Parse notes path from backup data during backup process - If notes are outside {userData}/Data, backup them separately to Notes folder - On restore, restore Notes folder to configured location - Handles both default and custom notes paths correctly This ensures users don't lose their notes when using custom paths. Co-authored-by: DeJeune <67425183+DeJeune@users.noreply.github.com>
refactor: Store default notes path as relative for portability
2025-11-12 10:54:27 +00:00 · 2025-11-12 09:20:09 +00:00 · 2025-11-12 09:03:09 +00:00 · 2025-11-12 09:01:28 +00:00 · 2025-11-12 08:53:30 +00:00 · 2025-11-12 13:30:23 +08:00
210 changed files with 7072 additions and 9087 deletions
--- a/.github/workflows/auto-i18n.yml
+++ b/.github/workflows/auto-i18n.yml
@@ -1,4 +1,4 @@
-name: Auto I18N
+name: Auto I18N Weekly

 env:
  TRANSLATION_API_KEY: ${{ secrets.TRANSLATE_API_KEY }}
@@ -7,14 +7,15 @@ env:
  TRANSLATION_BASE_LOCALE: ${{ vars.AUTO_I18N_BASE_LOCALE || 'en-us'}}

 on:
-  pull_request:
-    types: [opened, synchronize, reopened]
+  schedule:
+    # Runs at 00:00 UTC every Sunday.
+    # This corresponds to 08:00 AM UTC+8 (Beijing time) every Sunday.
+    - cron: "0 0 * * 0"
  workflow_dispatch:

 jobs:
  auto-i18n:
    runs-on: ubuntu-latest
-    if: github.event_name == 'workflow_dispatch' || github.event.pull_request.head.repo.full_name == 'CherryHQ/cherry-studio'
    name: Auto I18N
    permissions:
      contents: write
@@ -24,45 +25,69 @@ jobs:
      - name: 🐈‍⬛ Checkout
        uses: actions/checkout@v5
        with:
-          ref: ${{ github.event.pull_request.head.ref }}
+          fetch-depth: 0

      - name: 📦 Setting Node.js
        uses: actions/setup-node@v6
        with:
-          node-version: 20
-          package-manager-cache: false
+          node-version: 22

-      - name: 📦 Install dependencies in isolated directory
+      - name: 📦 Install corepack
+        run: corepack enable && corepack prepare yarn@4.9.1 --activate
+
+      - name: 📂 Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+
+      - name: 💾 Cache yarn dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ${{ steps.yarn-cache-dir-path.outputs.dir }}
+            node_modules
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: 📦 Install dependencies
        run: |
-          # 在临时目录安装依赖
-          mkdir -p /tmp/translation-deps
-          cd /tmp/translation-deps
-          echo '{"dependencies": {"@cherrystudio/openai": "^6.5.0", "cli-progress": "^3.12.0", "tsx": "^4.20.3", "@biomejs/biome": "2.2.4"}}' > package.json
-          npm install --no-package-lock
-
-          # 设置 NODE_PATH 让项目能找到这些依赖
-          echo "NODE_PATH=/tmp/translation-deps/node_modules" >> $GITHUB_ENV
+          yarn install

      - name: 🏃‍♀️ Translate
-        run: npx tsx scripts/sync-i18n.ts && npx tsx scripts/auto-translate-i18n.ts
+        run: yarn sync:i18n && yarn auto:i18n

      - name: 🔍 Format
-        run: cd /tmp/translation-deps && npx biome format --config-path /home/runner/work/cherry-studio/cherry-studio/biome.jsonc --write /home/runner/work/cherry-studio/cherry-studio/src/renderer/src/i18n/
+        run: yarn format

-      - name: 🔄 Commit changes
+      - name: 🔍 Check for changes
+        id: git_status
        run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-          git add .
+          # Check if there are any uncommitted changes
          git reset -- package.json yarn.lock  # 不提交 package.json 和 yarn.lock 的更改
-          if git diff --cached --quiet; then
-            echo "No changes to commit"
-          else
-            git commit -m "fix(i18n): Auto update translations for PR #${{ github.event.pull_request.number }}"
-          fi
+          git diff --exit-code --quiet || echo "::set-output name=has_changes::true"
+          git status --porcelain

-      - name: 🚀 Push changes
-        uses: ad-m/github-push-action@master
+      - name: 📅 Set current date for PR title
+        id: set_date
+        run: echo "CURRENT_DATE=$(date +'%b %d, %Y')" >> $GITHUB_ENV # e.g., "Jun 06, 2024"
+
+      - name: 🚀 Create Pull Request if changes exist
+        if: steps.git_status.outputs.has_changes == 'true'
+        uses: peter-evans/create-pull-request@v6
        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.event.pull_request.head.ref }}
+          token: ${{ secrets.GITHUB_TOKEN }} # Use the built-in GITHUB_TOKEN for bot actions
+          commit-message: "feat(bot): Weekly automated script run"
+          title: "🤖 Weekly Automated Update: ${{ env.CURRENT_DATE }}"
+          body: |
+            This PR includes changes generated by the weekly auto i18n.
+            Review the changes before merging.
+
+            ---
+            _Generated by the automated weekly workflow_
+          branch: "auto-i18n-weekly-${{ github.run_id }}" # Unique branch name
+          base: "main" # Or 'develop', set your base branch
+          delete-branch: true # Delete the branch after merging or closing the PR
+
+      - name: 📢 Notify if no changes
+        if: steps.git_status.outputs.has_changes != 'true'
+        run: echo "Bot script ran, but no changes were detected. No PR created."
--- a/.github/workflows/github-issue-tracker.yml
+++ b/.github/workflows/github-issue-tracker.yml
@@ -5,7 +5,7 @@ on:
    types: [opened]
  schedule:
    # Run every day at 8:30 Beijing Time (00:30 UTC)
-    - cron: '30 0 * * *'
+    - cron: "30 0 * * *"
  workflow_dispatch:

 jobs:
@@ -56,7 +56,7 @@ jobs:
        if: steps.check_time.outputs.should_delay == 'false'
        uses: actions/setup-node@v6
        with:
-          node-version: '20'
+          node-version: 22

      - name: Process issue with Claude
        if: steps.check_time.outputs.should_delay == 'false'
@@ -123,7 +123,7 @@ jobs:
      - name: Setup Node.js
        uses: actions/setup-node@v6
        with:
-          node-version: '20'
+          node-version: 22

      - name: Process pending issues with Claude
        uses: anthropics/claude-code-action@main
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -3,7 +3,7 @@ name: Nightly Build
 on:
  workflow_dispatch:
  schedule:
-    - cron: '0 17 * * *' # 1:00 BJ Time
+    - cron: "0 17 * * *" # 1:00 BJ Time

 permissions:
  contents: write
@@ -58,7 +58,7 @@ jobs:
      - name: Install Node.js
        uses: actions/setup-node@v6
        with:
-          node-version: 20
+          node-version: 22

      - name: macos-latest dependencies fix
        if: matrix.os == 'macos-latest'
@@ -66,7 +66,7 @@ jobs:
          brew install python-setuptools

      - name: Install corepack
-        run: corepack enable && corepack prepare yarn@4.6.0 --activate
+        run: corepack enable && corepack prepare yarn@4.9.1 --activate

      - name: Get yarn cache directory path
        id: yarn-cache-dir-path
--- a/.github/workflows/pr-ci.yml
+++ b/.github/workflows/pr-ci.yml
@@ -26,10 +26,10 @@ jobs:
      - name: Install Node.js
        uses: actions/setup-node@v6
        with:
-          node-version: 20
+          node-version: 22

      - name: Install corepack
-        run: corepack enable && corepack prepare yarn@4.6.0 --activate
+        run: corepack enable && corepack prepare yarn@4.9.1 --activate

      - name: Get yarn cache directory path
        id: yarn-cache-dir-path
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,9 +4,9 @@ on:
  workflow_dispatch:
    inputs:
      tag:
-        description: 'Release tag (e.g. v1.0.0)'
+        description: "Release tag (e.g. v1.0.0)"
        required: true
-        default: 'v1.0.0'
+        default: "v1.0.0"
  push:
    tags:
      - v*.*.*
@@ -49,7 +49,7 @@ jobs:
      - name: Install Node.js
        uses: actions/setup-node@v6
        with:
-          node-version: 20
+          node-version: 22

      - name: macos-latest dependencies fix
        if: matrix.os == 'macos-latest'
@@ -57,7 +57,7 @@ jobs:
          brew install python-setuptools

      - name: Install corepack
-        run: corepack enable && corepack prepare yarn@4.6.0 --activate
+        run: corepack enable && corepack prepare yarn@4.9.1 --activate

      - name: Get yarn cache directory path
        id: yarn-cache-dir-path
@@ -127,5 +127,5 @@ jobs:
          allowUpdates: true
          makeLatest: false
          tag: ${{ steps.get-tag.outputs.tag }}
-          artifacts: 'dist/*.exe,dist/*.zip,dist/*.dmg,dist/*.AppImage,dist/*.snap,dist/*.deb,dist/*.rpm,dist/*.tar.gz,dist/latest*.yml,dist/rc*.yml,dist/beta*.yml,dist/*.blockmap'
+          artifacts: "dist/*.exe,dist/*.zip,dist/*.dmg,dist/*.AppImage,dist/*.snap,dist/*.deb,dist/*.rpm,dist/*.tar.gz,dist/latest*.yml,dist/rc*.yml,dist/beta*.yml,dist/*.blockmap"
          token: ${{ secrets.GITHUB_TOKEN }}
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -22,7 +22,6 @@
    "eslint.config.mjs"
  ],
  "overrides": [
-    // set different env
    {
      "env": {
        "node": true
@@ -36,8 +35,7 @@
      "files": [
        "src/renderer/**/*.{ts,tsx}",
        "packages/aiCore/**",
-        "packages/extension-table-plus/**",
-        "resources/js/**"
+        "packages/extension-table-plus/**"
      ]
    },
    {
@@ -55,74 +53,16 @@
      "files": ["src/preload/**"]
    }
  ],
-  // We don't use the React plugin here because its behavior differs slightly from that of ESLint's React plugin.
  "plugins": ["unicorn", "typescript", "oxc", "import"],
  "rules": {
-    "constructor-super": "error",
-    "for-direction": "error",
-    "getter-return": "error",
    "no-array-constructor": "off",
-    // "import/no-cycle": "error", // tons of error, bro
-    "no-async-promise-executor": "error",
    "no-caller": "warn",
-    "no-case-declarations": "error",
-    "no-class-assign": "error",
-    "no-compare-neg-zero": "error",
-    "no-cond-assign": "error",
-    "no-const-assign": "error",
-    "no-constant-binary-expression": "error",
-    "no-constant-condition": "error",
-    "no-control-regex": "error",
-    "no-debugger": "error",
-    "no-delete-var": "error",
-    "no-dupe-args": "error",
-    "no-dupe-class-members": "error",
-    "no-dupe-else-if": "error",
-    "no-dupe-keys": "error",
-    "no-duplicate-case": "error",
-    "no-empty": "error",
-    "no-empty-character-class": "error",
-    "no-empty-pattern": "error",
-    "no-empty-static-block": "error",
    "no-eval": "warn",
-    "no-ex-assign": "error",
-    "no-extra-boolean-cast": "error",
    "no-fallthrough": "warn",
-    "no-func-assign": "error",
-    "no-global-assign": "error",
-    "no-import-assign": "error",
-    "no-invalid-regexp": "error",
-    "no-irregular-whitespace": "error",
-    "no-loss-of-precision": "error",
-    "no-misleading-character-class": "error",
-    "no-new-native-nonconstructor": "error",
-    "no-nonoctal-decimal-escape": "error",
-    "no-obj-calls": "error",
-    "no-octal": "error",
-    "no-prototype-builtins": "error",
-    "no-redeclare": "error",
-    "no-regex-spaces": "error",
-    "no-self-assign": "error",
-    "no-setter-return": "error",
-    "no-shadow-restricted-names": "error",
-    "no-sparse-arrays": "error",
-    "no-this-before-super": "error",
    "no-unassigned-vars": "warn",
-    "no-undef": "error",
-    "no-unexpected-multiline": "error",
-    "no-unreachable": "error",
-    "no-unsafe-finally": "error",
-    "no-unsafe-negation": "error",
-    "no-unsafe-optional-chaining": "error",
-    "no-unused-expressions": "off", // this rule disallow us to use expression to call function, like `condition && fn()`
-    "no-unused-labels": "error",
-    "no-unused-private-class-members": "error",
+    "no-unused-expressions": "off",
    "no-unused-vars": ["warn", { "caughtErrors": "none" }],
-    "no-useless-backreference": "error",
-    "no-useless-catch": "error",
-    "no-useless-escape": "error",
    "no-useless-rename": "warn",
-    "no-with": "error",
    "oxc/bad-array-method-on-arguments": "warn",
    "oxc/bad-char-at-comparison": "warn",
    "oxc/bad-comparison-sequence": "warn",
@@ -134,19 +74,17 @@
    "oxc/erasing-op": "warn",
    "oxc/missing-throw": "warn",
    "oxc/number-arg-out-of-range": "warn",
-    "oxc/only-used-in-recursion": "off", // manually off bacause of existing warning. may turn it on in the future
+    "oxc/only-used-in-recursion": "off",
    "oxc/uninvoked-array-callback": "warn",
-    "require-yield": "error",
    "typescript/await-thenable": "warn",
-    // "typescript/ban-ts-comment": "error",
-    "typescript/no-array-constructor": "error",
    "typescript/consistent-type-imports": "error",
+    "typescript/no-array-constructor": "error",
    "typescript/no-array-delete": "warn",
    "typescript/no-base-to-string": "warn",
    "typescript/no-duplicate-enum-values": "error",
    "typescript/no-duplicate-type-constituents": "warn",
    "typescript/no-empty-object-type": "off",
-    "typescript/no-explicit-any": "off", // not safe but too many errors
+    "typescript/no-explicit-any": "off",
    "typescript/no-extra-non-null-assertion": "error",
    "typescript/no-floating-promises": "warn",
    "typescript/no-for-in-array": "warn",
@@ -155,7 +93,7 @@
    "typescript/no-misused-new": "error",
    "typescript/no-misused-spread": "warn",
    "typescript/no-namespace": "error",
-    "typescript/no-non-null-asserted-optional-chain": "off", // it's off now. but may turn it on.
+    "typescript/no-non-null-asserted-optional-chain": "off",
    "typescript/no-redundant-type-constituents": "warn",
    "typescript/no-require-imports": "off",
    "typescript/no-this-alias": "error",
@@ -173,20 +111,18 @@
    "typescript/triple-slash-reference": "error",
    "typescript/unbound-method": "warn",
    "unicorn/no-await-in-promise-methods": "warn",
-    "unicorn/no-empty-file": "off", // manually off bacause of existing warning. may turn it on in the future
+    "unicorn/no-empty-file": "off",
    "unicorn/no-invalid-fetch-options": "warn",
    "unicorn/no-invalid-remove-event-listener": "warn",
-    "unicorn/no-new-array": "off", // manually off bacause of existing warning. may turn it on in the future
+    "unicorn/no-new-array": "off",
    "unicorn/no-single-promise-in-promise-methods": "warn",
-    "unicorn/no-thenable": "off", // manually off bacause of existing warning. may turn it on in the future
+    "unicorn/no-thenable": "off",
    "unicorn/no-unnecessary-await": "warn",
    "unicorn/no-useless-fallback-in-spread": "warn",
    "unicorn/no-useless-length-check": "warn",
-    "unicorn/no-useless-spread": "off", // manually off bacause of existing warning. may turn it on in the future
+    "unicorn/no-useless-spread": "off",
    "unicorn/prefer-set-size": "warn",
-    "unicorn/prefer-string-starts-ends-with": "warn",
-    "use-isnan": "error",
-    "valid-typeof": "error"
+    "unicorn/prefer-string-starts-ends-with": "warn"
  },
  "settings": {
    "jsdoc": {
--- a/.yarn/patches/@ai-sdk-google-npm-2.0.30-3b31632362.patch
+++ b/.yarn/patches/@ai-sdk-google-npm-2.0.30-3b31632362.patch
@@ -1,5 +1,5 @@
 diff --git a/dist/index.js b/dist/index.js
-index 4cc66d83af1cef39f6447dc62e680251e05ddf9f..eb9819cb674c1808845ceb29936196c4bb355172 100644
+index cac044aab0255fa72f68b36ecd2c5b12d424c379..ad6ee8ecfc5cbc3ec43ba59a44eda21e8e4d353f 100644
 --- a/dist/index.js
 +++ b/dist/index.js
@@ -471,7 +471,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
@@ -12,7 +12,7 @@ index 4cc66d83af1cef39f6447dc62e680251e05ddf9f..eb9819cb674c1808845ceb29936196c4
 
 // src/google-generative-ai-options.ts
 diff --git a/dist/index.mjs b/dist/index.mjs
-index a032505ec54e132dc386dde001dc51f710f84c83..5efada51b9a8b56e3f01b35e734908ebe3c37043 100644
+index 0793085005d7968638d355f2f1e127939d965165..1c8bf852baf025d56dc35a0691eb95967de7e5c8 100644
 --- a/dist/index.mjs
 +++ b/dist/index.mjs
@@ -477,7 +477,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
--- a/.yarn/patches/@ai-sdk-huggingface-npm-0.0.8-d4d0aaac93.patch
+++ b/.yarn/patches/@ai-sdk-huggingface-npm-0.0.8-d4d0aaac93.patch
--- a/.yarn/patches/@ai-sdk-openai-npm-2.0.64-48f99f5bf3.patch
+++ b/.yarn/patches/@ai-sdk-openai-npm-2.0.64-48f99f5bf3.patch
@@ -1,5 +1,5 @@
 diff --git a/dist/index.js b/dist/index.js
-index cc6652c4e7f32878a64a2614115bf7eeb3b7c890..76e989017549c89b45d633525efb1f318026d9b2 100644
+index 992c85ac6656e51c3471af741583533c5a7bf79f..83c05952a07aebb95fc6c62f9ddb8aa96b52ac0d 100644
 --- a/dist/index.js
 +++ b/dist/index.js
@@ -274,6 +274,7 @@ var openaiChatResponseSchema = (0, import_provider_utils3.lazyValidator)(
@@ -18,30 +18,29 @@ index cc6652c4e7f32878a64a2614115bf7eeb3b7c890..76e989017549c89b45d633525efb1f31
               tool_calls: import_v42.z.array(
                 import_v42.z.object({
                   index: import_v42.z.number(),
-@@ -785,6 +787,14 @@ var OpenAIChatLanguageModel = class {
+@@ -785,6 +787,13 @@ var OpenAIChatLanguageModel = class {
     if (text != null && text.length > 0) {
       content.push({ type: "text", text });
     }
-+    const reasoning =
-+      choice.message.reasoning_content;
+    const reasoning = choice.message.reasoning_content;
 +    if (reasoning != null && reasoning.length > 0) {
 +      content.push({
 +        type: 'reasoning',
-+        text: reasoning,
+        text: reasoning
 +      });
 +    }
     for (const toolCall of (_a = choice.message.tool_calls) != null ? _a : []) {
       content.push({
         type: "tool-call",
-@@ -866,6 +876,7 @@ var OpenAIChatLanguageModel = class {
+@@ -866,6 +875,7 @@ var OpenAIChatLanguageModel = class {
     };
-     let isFirstChunk = true;
+     let metadataExtracted = false;
     let isActiveText = false;
 +    let isActiveReasoning = false;
     const providerMetadata = { openai: {} };
     return {
       stream: response.pipeThrough(
-@@ -920,6 +931,22 @@ var OpenAIChatLanguageModel = class {
+@@ -923,6 +933,21 @@ var OpenAIChatLanguageModel = class {
               return;
             }
             const delta = choice.delta;
@@ -54,7 +53,6 @@ index cc6652c4e7f32878a64a2614115bf7eeb3b7c890..76e989017549c89b45d633525efb1f31
 +                });
 +                isActiveReasoning = true;
 +              }
-+
 +              controller.enqueue({
 +                type: 'reasoning-delta',
 +                id: 'reasoning-0',
@@ -64,7 +62,7 @@ index cc6652c4e7f32878a64a2614115bf7eeb3b7c890..76e989017549c89b45d633525efb1f31
             if (delta.content != null) {
               if (!isActiveText) {
                 controller.enqueue({ type: "text-start", id: "0" });
-@@ -1032,6 +1059,9 @@ var OpenAIChatLanguageModel = class {
+@@ -1035,6 +1060,9 @@ var OpenAIChatLanguageModel = class {
             }
           },
           flush(controller) {
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -7,12 +7,10 @@ This file provides guidance to AI coding assistants when working with code in th
 - **Keep it clear**: Write code that is easy to read, maintain, and explain.
 - **Match the house style**: Reuse existing patterns, naming, and conventions.
 - **Search smart**: Prefer `ast-grep` for semantic queries; fall back to `rg`/`grep` when needed.
- **Build with HeroUI**: Use HeroUI for every new UI component; never add `antd` or `styled-components`.
 - **Log centrally**: Route all logging through `loggerService` with the right context—no `console.log`.
 - **Research via subagent**: Lean on `subagent` for external docs, APIs, news, and references.
 - **Always propose before executing**: Before making any changes, clearly explain your planned approach and wait for explicit user approval to ensure alignment and prevent unwanted modifications.
- **Write conventional commits with emoji**: Commit small, focused changes using emoji-prefixed Conventional Commit messages (e.g., `✨ feat:`, `🐛 fix:`, `♻️ refactor:`, `
-📝 docs:`).
+- **Write conventional commits**: Commit small, focused changes using Conventional Commit messages (e.g., `feat:`, `fix:`, `refactor:`, `docs:`).

 ## Development Commands

@@ -41,7 +39,6 @@ This file provides guidance to AI coding assistants when working with code in th
 - **Services** (`src/main/services/`): MCPService, KnowledgeService, WindowService, etc.
 - **Build System**: Electron-Vite with experimental rolldown-vite, yarn workspaces.
 - **State Management**: Redux Toolkit (`src/renderer/src/store/`) for predictable state.
- **UI Components**: HeroUI (`@heroui/*`) for all new UI elements.

 ### Logging
 ```typescript
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ Cherry Studio is a desktop client that supports multiple LLM providers, availabl
 1. **Diverse LLM Provider Support**:

 - ☁️ Major LLM Cloud Services: OpenAI, Gemini, Anthropic, and more
- 🔗 AI Web Service Integration: Claude, Perplexity, Poe, and others
+- 🔗 AI Web Service Integration: Claude, Perplexity, [Poe](https://poe.com/), and others
 - 💻 Local Model Support with Ollama, LM Studio

 2. **AI Assistants & Conversations**:
@@ -238,10 +238,6 @@ The Enterprise Edition addresses core challenges in team collaboration by centra

 ## ✨ Online Demo

-> 🚧 **Public Beta Notice**
->
-> The Enterprise Edition is currently in its early public beta stage, and we are actively iterating and optimizing its features. We are aware that it may not be perfectly stable yet. If you encounter any issues or have valuable suggestions during your trial, we would be very grateful if you could contact us via email to provide feedback.
-
 **🔗 [Cherry Studio Enterprise](https://www.cherry-ai.com/enterprise)**

 ## Version Comparison
@@ -249,7 +245,7 @@ The Enterprise Edition addresses core challenges in team collaboration by centra
 | Feature           | Community Edition                          | Enterprise Edition                                                                                                                      |
 | :---------------- | :----------------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------- |
 | **Open Source**   | ✅ Yes                                      | ⭕️ Partially released to customers                                                                                                       |
-| **Cost**          | Free for Personal Use / Commercial License | Buyout / Subscription Fee                                                                                                               |
+| **Cost**          | [AGPL-3.0 License](https://github.com/CherryHQ/cherry-studio?tab=AGPL-3.0-1-ov-file) | Buyout / Subscription Fee                                                                                                               |
 | **Admin Backend** | —                                          | ● Centralized **Model** Access<br>● **Employee** Management<br>● Shared **Knowledge Base**<br>● **Access** Control<br>● **Data** Backup |
 | **Server**        | —                                          | ✅ Dedicated Private Deployment                                                                                                          |

@@ -262,8 +258,12 @@ We believe the Enterprise Edition will become your team's AI productivity engine

 # 🔗 Related Projects

+- [new-api](https://github.com/QuantumNous/new-api): The next-generation LLM gateway and AI asset management system supports multiple languages.
+
 - [one-api](https://github.com/songquanpeng/one-api): LLM API management and distribution system supporting mainstream models like OpenAI, Azure, and Anthropic. Features a unified API interface, suitable for key management and secondary distribution.

+- [Poe](https://poe.com/): Poe gives you access to the best AI, all in one place. Explore GPT-5, Claude Opus 4.1, DeepSeek-R1, Veo 3, ElevenLabs, and millions of others.
+
 - [ublacklist](https://github.com/iorate/ublacklist): Blocks specific sites from appearing in Google search results

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

 ### Setup Node.js

-Download and install [Node.js v20.x.x](https://nodejs.org/en/download)
+Download and install [Node.js v22.x.x](https://nodejs.org/en/download)

 ### Setup Yarn

 ```bash
 corepack enable
-corepack prepare yarn@4.6.0 --activate
+corepack prepare yarn@4.9.1 --activate
 ```

 ### Install Dependencies
--- a/docs/testplan-en.md
+++ b/docs/testplan-en.md
@@ -11,6 +11,8 @@ The Test Plan is divided into the RC channel and the Beta channel, with the foll

 Users can enable the "Test Plan" and select the version channel in the software's `Settings` > `About`. Please note that the versions in the "Test Plan" cannot guarantee data consistency, so be sure to back up your data before using them.

+After enabling the RC channel or Beta channel, if a stable version is released, users will still be upgraded to the stable version.
+
 Users are welcome to submit issues or provide feedback through other channels for any bugs encountered during testing. Your feedback is very important to us.

 ## Developer Guide
--- a/docs/testplan-zh.md
+++ b/docs/testplan-zh.md
@@ -11,6 +11,8 @@

 用户可以在软件的`设置`-`关于`中，开启“测试计划”并选择版本通道。请注意“测试计划”的版本无法保证数据的一致性，请使用前一定要备份数据。

+用户选择RC版通道或Beta版通道后，若发布了正式版，仍旧会升级到正式版。
+
 用户在测试过程中发现的BUG，欢迎提交issue或通过其他渠道反馈。用户的反馈对我们非常重要。

 ## 开发者指南
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -21,6 +21,8 @@ files:
  - "**/*"
  - "!**/{.vscode,.yarn,.yarn-lock,.github,.cursorrules,.prettierrc}"
  - "!electron.vite.config.{js,ts,mjs,cjs}}"
+  - "!.*"
+  - "!components.json"
  - "!**/{.eslintignore,.eslintrc.js,.eslintrc.json,.eslintcache,root.eslint.config.js,eslint.config.js,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,eslint.config.mjs,dev-app-update.yml,CHANGELOG.md,README.md,biome.jsonc}"
  - "!**/{.env,.env.*,.npmrc,pnpm-lock.yaml}"
  - "!**/{tsconfig.json,tsconfig.tsbuildinfo,tsconfig.node.json,tsconfig.web.json}"
@@ -133,128 +135,50 @@ artifactBuildCompleted: scripts/artifact-build-completed.js
 releaseInfo:
  releaseNotes: |
    <!--LANG:en-->
-    What's New in v1.7.0-beta.3
+    What's New in v1.7.0-beta.5

    New Features:
-    - Enhanced Tool Permission System: Real-time tool approval interface with improved UX
-    - Plugin Management System: Support for Claude Agent plugins (agents, commands, skills)
-    - Skill Tool: Add skill execution capabilities for agents
-    - Mobile App Data Restore: Support restoring data to mobile applications
-    - OpenMinerU Preprocessor: Knowledge base now supports open-source MinerU for document processing
-    - HuggingFace Provider: Added HuggingFace as AI provider
-    - Claude Haiku 4.5: Support for the latest Claude Haiku 4.5 model
-    - Ling Series Models: Added support for Ling-1T and related models
-    - Intel OVMS Painting: New painting provider using Intel OpenVINO Model Server
-    - Automatic Update Checks: Implement periodic update checking with configurable intervals
-    - HuggingChat Mini App: New mini app for HuggingChat integration
+    - MCPRouter Provider: Added MCPRouter provider integration with token management and server synchronization
+    - MCP Marketplace: Enhanced MCP server discovery and management with multi-provider marketplace support
+    - Agent Permission Mode Display: Visual permission mode cards in empty session states
+    - Assistant Subscription Settings: Added subscription URL management in assistant presets

    Improvements:
-    - Agent Creation: New agents are now automatically activated upon creation
-    - Lazy Loading: Optimize page load performance with route lazy loading
-    - UI Enhancements: Improved agent item styling and layout consistency
-    - Navigation: Better navbar layout for fullscreen mode on macOS
-    - Settings Tab: Enhanced context slider consistency
-    - Backup Manager: Unified footer layout for local and S3 backup managers
-    - Menu System: Enhanced application menu with improved help section
-    - Proxy Rules: Comprehensive proxy bypass rule matching
-    - German Language: Added German language support
-    - MCP Confirmation: Added confirmation modal when activating protocol-installed MCP servers
-    - Translation: Enhanced translation script with concurrency and validation
-    - Electron & Vite: Updated to Electron 38 and Vite 4.0.1
-    - QR Code Generation: Optimized performance for phone LAN export
-    - Enterprise Settings: Added enterprise section in About settings
-    - Assistant/Agent Popup: Enhanced UI for adding assistants and agents
-
-    Claude Code Tool Improvements:
-    - GlobTool: Now counts lines instead of files in output for better clarity
-    - ReadTool: Automatically removes system reminder tags from output
-    - TodoWriteTool: Improved rendering behavior
-    - Environment Variables: Updated model-related environment variable names
+    - UI Optimization: Sidebar tooltip placement improved on macOS to avoid overlapping window controls
+    - MCP Server Logos: Display server logos in Agent settings tooling section
+    - Long Command Handling: Bash command tags now auto-truncate (hover to view full command for commands over 100 chars)
+    - MCP OAuth Callback: Fixed callback page hanging and added multilingual support (10 languages)
+    - Error Display: Improved error block display order for better readability
+    - Plugin Browser: Centered tab alignment for better visual consistency

    Bug Fixes:
-    - Fixed session model not being used when sending messages
-    - Fixed tool approval UI and shared workspace plugin inconsistencies
-    - Fixed API server readiness notification to renderer
-    - Fixed grouped items not respecting saved tag order
-    - Fixed assistant/agent activation when creating new ones
-    - Fixed Dashscope Anthropic API host and migrated old configs
-    - Fixed Qwen3 thinking mode control for Ollama
-    - Fixed disappeared MCP button
-    - Fixed create assistant causing blank screen
-    - Fixed up-down button visibility in some cases
-    - Fixed hooks preventing save on composing enter key
-    - Fixed Azure GPT-image-1 and OpenRouter Gemini-image
-    - Fixed Silicon reasoning issues
-    - Fixed topic branch incomplete copy with two-pass ID mapping
-    - Fixed deep research model search context restrictions
-    - Fixed model capability checking logic
-    - Fixed reranker API error response capture
-    - Fixed right-click paste file content into inputbar
-    - Fixed minimax-m2 support in aiCore
-    - Fixed Azure embedding issues
-    - Fixed agent edit modal loading race condition
-    - Fixed debounced save cancellation on file path update
+    - Fixed Agent sessions not inheriting allowed_tools configuration
+    - Fixed Gemini endpoint thinking budget spelling error
+    - Fixed MCP card description text overflow
+    - Fixed unnecessary message timestamp updates on UI-only state changes
+    - Updated dependencies: Bun to 1.3.1, uv to 0.9.5

    <!--LANG:zh-CN-->
-    v1.7.0-beta.3 新特性
+    v1.7.0-beta.5 新特性

    新功能:
-    - 增强工具权限系统：实时工具审批界面，改进用户体验
-    - 插件管理系统：支持 Claude Agent 插件（agents、commands、skills）
-    - 技能工具：为 Agent 添加技能执行能力
-    - 移动应用数据恢复：支持将数据恢复到移动应用程序
-    - OpenMinerU 预处理器：知识库现支持使用开源 MinerU 处理文档
-    - HuggingFace 提供商：添加 HuggingFace 作为 AI 提供商
-    - Claude Haiku 4.5：支持最新的 Claude Haiku 4.5 模型
-    - Ling 系列模型：添加 Ling-1T 及相关模型支持
-    - Intel OVMS 绘图：使用 Intel OpenVINO 模型服务器的新绘图提供商
-    - 自动更新检查：实现可配置间隔的定期更新检查
-    - HuggingChat 小程序：新增 HuggingChat 集成小程序
+    - MCPRouter 提供商：新增 MCPRouter 提供商集成，支持 token 管理和服务器同步
+    - MCP 市场：增强 MCP 服务器发现和管理功能，支持多提供商市场
+    - Agent 权限模式展示：空会话状态显示可视化权限模式卡片
+    - 助手订阅设置：在助手预设中添加订阅 URL 管理功能

    改进:
-    - Agent 创建：新创建的 Agent 现在会自动激活
-    - 懒加载：通过路由懒加载优化页面加载性能
-    - UI 增强：改进 Agent 项目样式和布局一致性
-    - 导航：改进 macOS 全屏模式下的导航栏布局
-    - 设置选项卡：增强上下文滑块一致性
-    - 备份管理器：统一本地和 S3 备份管理器的页脚布局
-    - 菜单系统：增强应用菜单，改进帮助部分
-    - 代理规则：全面的代理绕过规则匹配
-    - 德语支持：添加德语语言支持
-    - MCP 确认：添加激活协议安装的 MCP 服务器时的确认模态框
-    - 翻译：增强翻译脚本的并发和验证功能
-    - Electron & Vite：更新至 Electron 38 和 Vite 4.0.1
-    - 二维码生成：优化手机局域网导出性能
-    - 企业设置：在关于设置中添加企业部分
-    - 助手/Agent 弹窗：增强添加助手和 Agent 的界面
-
-    Claude Code 工具改进:
-    - GlobTool：现在计算行数而不是文件数，提供更清晰的输出
-    - ReadTool：自动从输出中移除系统提醒标签
-    - TodoWriteTool：改进渲染行为
-    - 环境变量：更新模型相关的环境变量名称
+    - UI 优化：macOS 上侧边栏工具提示位置优化，避免与窗口控制按钮重叠
+    - MCP 服务器标志：在 Agent 设置工具部分显示服务器 logo
+    - 长命令处理：Bash 命令标签自动截断（超过 100 字符时悬停查看完整内容）
+    - MCP OAuth 回调：修复回调页面挂起问题并添加多语言支持（10 种语言）
+    - 错误信息展示：改进错误块显示顺序，提高可读性
+    - 插件浏览器：标签页居中对齐，视觉效果更统一

    问题修复:
-    - 修复发送消息时未使用会话模型
-    - 修复工具审批 UI 和共享工作区插件不一致
-    - 修复 API 服务器就绪通知到渲染器
-    - 修复分组项目不遵守已保存标签顺序
-    - 修复创建新的助手/Agent 时的激活问题
-    - 修复 Dashscope Anthropic API 主机并迁移旧配置
-    - 修复 Ollama 的 Qwen3 思考模式控制
-    - 修复 MCP 按钮消失
-    - 修复创建助手导致空白屏幕
-    - 修复某些情况下上下按钮可见性
-    - 修复钩子在输入法输入时阻止保存
-    - 修复 Azure GPT-image-1 和 OpenRouter Gemini-image
-    - 修复 Silicon 推理问题
-    - 修复主题分支不完整复制，采用两阶段 ID 映射
-    - 修复深度研究模型搜索上下文限制
-    - 修复模型能力检查逻辑
-    - 修复 reranker API 错误响应捕获
-    - 修复右键粘贴文件内容到输入栏
-    - 修复 aiCore 中的 minimax-m2 支持
-    - 修复 Azure embedding 问题
-    - 修复 Agent 编辑模态框加载竞态条件
-    - 修复文件路径更新时防抖保存取消问题
+    - 修复 Agent 会话未继承 allowed_tools 配置
+    - 修复 Gemini 端点 thinking budget 拼写错误
+    - 修复 MCP 卡片描述文本溢出问题
+    - 修复仅 UI 状态变化时消息时间戳不必要的更新
+    - 依赖更新：Bun 升级到 1.3.1，uv 升级到 0.9.5
    <!--LANG:END-->
--- a/package.json
+++ b/package.json
@@ -82,6 +82,7 @@
    "@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",
    "express": "^5.1.0",
    "font-list": "^2.0.0",
@@ -105,17 +106,17 @@
    "@agentic/exa": "^7.3.3",
    "@agentic/searxng": "^7.3.3",
    "@agentic/tavily": "^7.3.3",
-    "@ai-sdk/amazon-bedrock": "^3.0.42",
-    "@ai-sdk/google-vertex": "^3.0.48",
-    "@ai-sdk/huggingface": "patch:@ai-sdk/huggingface@npm%3A0.0.4#~/.yarn/patches/@ai-sdk-huggingface-npm-0.0.4-8080836bc1.patch",
-    "@ai-sdk/mistral": "^2.0.19",
-    "@ai-sdk/perplexity": "^2.0.13",
+    "@ai-sdk/amazon-bedrock": "^3.0.53",
+    "@ai-sdk/google-vertex": "^3.0.61",
+    "@ai-sdk/huggingface": "patch:@ai-sdk/huggingface@npm%3A0.0.8#~/.yarn/patches/@ai-sdk-huggingface-npm-0.0.8-d4d0aaac93.patch",
+    "@ai-sdk/mistral": "^2.0.23",
+    "@ai-sdk/perplexity": "^2.0.17",
    "@ant-design/v5-patch-for-react-19": "^1.0.3",
    "@anthropic-ai/sdk": "^0.41.0",
    "@anthropic-ai/vertex-sdk": "patch:@anthropic-ai/vertex-sdk@npm%3A0.11.4#~/.yarn/patches/@anthropic-ai-vertex-sdk-npm-0.11.4-c19cb41edb.patch",
-    "@aws-sdk/client-bedrock": "^3.840.0",
-    "@aws-sdk/client-bedrock-runtime": "^3.840.0",
-    "@aws-sdk/client-s3": "^3.840.0",
+    "@aws-sdk/client-bedrock": "^3.910.0",
+    "@aws-sdk/client-bedrock-runtime": "^3.910.0",
+    "@aws-sdk/client-s3": "^3.910.0",
    "@biomejs/biome": "2.2.4",
    "@cherrystudio/ai-core": "workspace:^1.0.0-alpha.18",
    "@cherrystudio/embedjs": "^0.1.31",
@@ -146,7 +147,6 @@
    "@eslint/js": "^9.22.0",
    "@google/genai": "patch:@google/genai@npm%3A1.0.1#~/.yarn/patches/@google-genai-npm-1.0.1-e26f0f9af7.patch",
    "@hello-pangea/dnd": "^18.0.1",
-    "@heroui/react": "^2.8.3",
    "@kangfenmao/keyv-storage": "^0.1.0",
    "@langchain/community": "^1.0.0",
    "@langchain/core": "patch:@langchain/core@npm%3A1.0.2#~/.yarn/patches/@langchain-core-npm-1.0.2-183ef83fe4.patch",
@@ -231,7 +231,7 @@
    "@viz-js/lang-dot": "^1.0.5",
    "@viz-js/viz": "^3.14.0",
    "@xyflow/react": "^12.4.4",
-    "ai": "^5.0.76",
+    "ai": "^5.0.90",
    "antd": "patch:antd@npm%3A5.27.0#~/.yarn/patches/antd-npm-5.27.0-aa91c36546.patch",
    "archiver": "^7.0.1",
    "async-mutex": "^0.5.0",
@@ -241,7 +241,7 @@
    "check-disk-space": "3.4.0",
    "cheerio": "^1.1.2",
    "chokidar": "^4.0.3",
-    "claude-code-plugins": "1.0.1",
+    "claude-code-plugins": "1.0.3",
    "cli-progress": "^3.12.0",
    "clsx": "^2.1.1",
    "code-inspector-plugin": "^0.20.14",
@@ -348,6 +348,7 @@
    "striptags": "^3.2.0",
    "styled-components": "^6.1.11",
    "swr": "^2.3.6",
+    "tailwind-merge": "^3.3.1",
    "tailwindcss": "^4.1.13",
    "tar": "^7.4.3",
    "tiny-pinyin": "^1.3.2",
@@ -373,6 +374,7 @@
    "zod": "^4.1.5"
  },
  "resolutions": {
+    "@smithy/types": "4.7.1",
    "@codemirror/language": "6.11.3",
    "@codemirror/lint": "6.8.5",
    "@codemirror/view": "6.38.1",
@@ -403,7 +405,10 @@
    "openai@npm:5.12.2": "npm:@cherrystudio/openai@6.5.0",
    "@langchain/openai@npm:>=0.1.0 <0.6.0": "patch:@langchain/openai@npm%3A1.0.0#~/.yarn/patches/@langchain-openai-npm-1.0.0-474d0ad9d4.patch",
    "@langchain/openai@npm:^0.3.16": "patch:@langchain/openai@npm%3A1.0.0#~/.yarn/patches/@langchain-openai-npm-1.0.0-474d0ad9d4.patch",
-    "@langchain/openai@npm:>=0.2.0 <0.7.0": "patch:@langchain/openai@npm%3A1.0.0#~/.yarn/patches/@langchain-openai-npm-1.0.0-474d0ad9d4.patch"
+    "@langchain/openai@npm:>=0.2.0 <0.7.0": "patch:@langchain/openai@npm%3A1.0.0#~/.yarn/patches/@langchain-openai-npm-1.0.0-474d0ad9d4.patch",
+    "@ai-sdk/google@npm:2.0.30": "patch:@ai-sdk/google@npm%3A2.0.30#~/.yarn/patches/@ai-sdk-google-npm-2.0.30-3b31632362.patch",
+    "@ai-sdk/openai@npm:2.0.64": "patch:@ai-sdk/openai@npm%3A2.0.64#~/.yarn/patches/@ai-sdk-openai-npm-2.0.64-48f99f5bf3.patch",
+    "@ai-sdk/openai@npm:^2.0.42": "patch:@ai-sdk/openai@npm%3A2.0.64#~/.yarn/patches/@ai-sdk-openai-npm-2.0.64-48f99f5bf3.patch"
  },
  "packageManager": "yarn@4.9.1",
  "lint-staged": {
--- a/packages/aiCore/package.json
+++ b/packages/aiCore/package.json
@@ -36,14 +36,14 @@
    "ai": "^5.0.26"
  },
  "dependencies": {
-    "@ai-sdk/anthropic": "^2.0.32",
-    "@ai-sdk/azure": "^2.0.53",
-    "@ai-sdk/deepseek": "^1.0.23",
-    "@ai-sdk/openai": "patch:@ai-sdk/openai@npm%3A2.0.52#~/.yarn/patches/@ai-sdk-openai-npm-2.0.52-b36d949c76.patch",
-    "@ai-sdk/openai-compatible": "^1.0.22",
+    "@ai-sdk/anthropic": "^2.0.43",
+    "@ai-sdk/azure": "^2.0.66",
+    "@ai-sdk/deepseek": "^1.0.27",
+    "@ai-sdk/openai": "patch:@ai-sdk/openai@npm%3A2.0.64#~/.yarn/patches/@ai-sdk-openai-npm-2.0.64-48f99f5bf3.patch",
+    "@ai-sdk/openai-compatible": "^1.0.26",
    "@ai-sdk/provider": "^2.0.0",
-    "@ai-sdk/provider-utils": "^3.0.12",
-    "@ai-sdk/xai": "^2.0.26",
+    "@ai-sdk/provider-utils": "^3.0.16",
+    "@ai-sdk/xai": "^2.0.31",
    "zod": "^4.1.5"
  },
  "devDependencies": {
--- a/packages/shared/IpcChannel.ts
+++ b/packages/shared/IpcChannel.ts
@@ -54,8 +54,6 @@ 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',
--- a/packages/shared/config/constant.ts
+++ b/packages/shared/config/constant.ts
@@ -470,3 +470,6 @@ export const MACOS_TERMINALS_WITH_COMMANDS: TerminalConfigWithCommand[] = [
    })
  }
 ]
+
+// resources/scripts should be maintained manually
+export const HOME_CHERRY_DIR = '.cherrystudio'
--- a/resources/js/bridge.js
+++ b/resources/js/bridge.js
@@ -1,36 +0,0 @@
-;(() => {
-  let messageId = 0
-  const pendingCalls = new Map()
-
-  function api(method, ...args) {
-    const id = messageId++
-    return new Promise((resolve, reject) => {
-      pendingCalls.set(id, { resolve, reject })
-      window.parent.postMessage({ id, type: 'api-call', method, args }, '*')
-    })
-  }
-
-  window.addEventListener('message', (event) => {
-    if (event.data.type === 'api-response') {
-      const { id, result, error } = event.data
-      const pendingCall = pendingCalls.get(id)
-      if (pendingCall) {
-        if (error) {
-          pendingCall.reject(new Error(error))
-        } else {
-          pendingCall.resolve(result)
-        }
-        pendingCalls.delete(id)
-      }
-    }
-  })
-
-  window.api = new Proxy(
-    {},
-    {
-      get: (target, prop) => {
-        return (...args) => api(prop, ...args)
-      }
-    }
-  )
-})()
--- a/resources/js/utils.js
+++ b/resources/js/utils.js
@@ -1,5 +0,0 @@
-export function getQueryParam(paramName) {
-  const url = new URL(window.location.href)
-  const params = new URLSearchParams(url.search)
-  return params.get(paramName)
-}
--- a/resources/scripts/install-bun.js
+++ b/resources/scripts/install-bun.js
@@ -7,7 +7,7 @@ const { downloadWithRedirects } = require('./download')

 // Base URL for downloading bun binaries
 const BUN_RELEASE_BASE_URL = 'https://gitcode.com/CherryHQ/bun/releases/download'
-const DEFAULT_BUN_VERSION = '1.2.17' // Default fallback version
+const DEFAULT_BUN_VERSION = '1.3.1' // Default fallback version

 // Mapping of platform+arch to binary package name
 const BUN_PACKAGES = {
--- a/resources/scripts/install-uv.js
+++ b/resources/scripts/install-uv.js
@@ -7,28 +7,29 @@ const { downloadWithRedirects } = require('./download')

 // Base URL for downloading uv binaries
 const UV_RELEASE_BASE_URL = 'https://gitcode.com/CherryHQ/uv/releases/download'
-const DEFAULT_UV_VERSION = '0.7.13'
+const DEFAULT_UV_VERSION = '0.9.5'

 // Mapping of platform+arch to binary package name
 const UV_PACKAGES = {
-  'darwin-arm64': 'uv-aarch64-apple-darwin.zip',
-  'darwin-x64': 'uv-x86_64-apple-darwin.zip',
+  'darwin-arm64': 'uv-aarch64-apple-darwin.tar.gz',
+  'darwin-x64': 'uv-x86_64-apple-darwin.tar.gz',
  'win32-arm64': 'uv-aarch64-pc-windows-msvc.zip',
  'win32-ia32': 'uv-i686-pc-windows-msvc.zip',
  'win32-x64': 'uv-x86_64-pc-windows-msvc.zip',
-  'linux-arm64': 'uv-aarch64-unknown-linux-gnu.zip',
-  'linux-ia32': 'uv-i686-unknown-linux-gnu.zip',
-  'linux-ppc64': 'uv-powerpc64-unknown-linux-gnu.zip',
-  'linux-ppc64le': 'uv-powerpc64le-unknown-linux-gnu.zip',
-  'linux-s390x': 'uv-s390x-unknown-linux-gnu.zip',
-  'linux-x64': 'uv-x86_64-unknown-linux-gnu.zip',
-  'linux-armv7l': 'uv-armv7-unknown-linux-gnueabihf.zip',
+  'linux-arm64': 'uv-aarch64-unknown-linux-gnu.tar.gz',
+  'linux-ia32': 'uv-i686-unknown-linux-gnu.tar.gz',
+  'linux-ppc64': 'uv-powerpc64-unknown-linux-gnu.tar.gz',
+  'linux-ppc64le': 'uv-powerpc64le-unknown-linux-gnu.tar.gz',
+  'linux-riscv64': 'uv-riscv64gc-unknown-linux-gnu.tar.gz',
+  'linux-s390x': 'uv-s390x-unknown-linux-gnu.tar.gz',
+  'linux-x64': 'uv-x86_64-unknown-linux-gnu.tar.gz',
+  'linux-armv7l': 'uv-armv7-unknown-linux-gnueabihf.tar.gz',
  // MUSL variants
-  'linux-musl-arm64': 'uv-aarch64-unknown-linux-musl.zip',
-  'linux-musl-ia32': 'uv-i686-unknown-linux-musl.zip',
-  'linux-musl-x64': 'uv-x86_64-unknown-linux-musl.zip',
-  'linux-musl-armv6l': 'uv-arm-unknown-linux-musleabihf.zip',
-  'linux-musl-armv7l': 'uv-armv7-unknown-linux-musleabihf.zip'
+  'linux-musl-arm64': 'uv-aarch64-unknown-linux-musl.tar.gz',
+  'linux-musl-ia32': 'uv-i686-unknown-linux-musl.tar.gz',
+  'linux-musl-x64': 'uv-x86_64-unknown-linux-musl.tar.gz',
+  'linux-musl-armv6l': 'uv-arm-unknown-linux-musleabihf.tar.gz',
+  'linux-musl-armv7l': 'uv-armv7-unknown-linux-musleabihf.tar.gz'
 }

 /**
@@ -56,6 +57,7 @@ async function downloadUvBinary(platform, arch, version = DEFAULT_UV_VERSION, is
  const downloadUrl = `${UV_RELEASE_BASE_URL}/${version}/${packageName}`
  const tempdir = os.tmpdir()
  const tempFilename = path.join(tempdir, packageName)
+  const isTarGz = packageName.endsWith('.tar.gz')

  try {
    console.log(`Downloading uv ${version} for ${platformKey}...`)
@@ -65,34 +67,58 @@ async function downloadUvBinary(platform, arch, version = DEFAULT_UV_VERSION, is

    console.log(`Extracting ${packageName} to ${binDir}...`)

-    const zip = new StreamZip.async({ file: tempFilename })
+    if (isTarGz) {
+      // Use tar command to extract tar.gz files (macOS and Linux)
+      const tempExtractDir = path.join(tempdir, `uv-extract-${Date.now()}`)
+      fs.mkdirSync(tempExtractDir, { recursive: true })

-    // Get all entries in the zip file
-    const entries = await zip.entries()
+      execSync(`tar -xzf "${tempFilename}" -C "${tempExtractDir}"`, { stdio: 'inherit' })

-    // Extract files directly to binDir, flattening the directory structure
-    for (const entry of Object.values(entries)) {
-      if (!entry.isDirectory) {
-        // Get just the filename without path
-        const filename = path.basename(entry.name)
-        const outputPath = path.join(binDir, filename)
-
-        console.log(`Extracting ${entry.name} -> ${filename}`)
-        await zip.extract(entry.name, outputPath)
-        // Make executable files executable on Unix-like systems
-        if (platform !== 'win32') {
-          try {
+      // Find all files in the extracted directory and move them to binDir
+      const findAndMoveFiles = (dir) => {
+        const entries = fs.readdirSync(dir, { withFileTypes: true })
+        for (const entry of entries) {
+          const fullPath = path.join(dir, entry.name)
+          if (entry.isDirectory()) {
+            findAndMoveFiles(fullPath)
+          } else {
+            const filename = path.basename(entry.name)
+            const outputPath = path.join(binDir, filename)
+            fs.copyFileSync(fullPath, outputPath)
+            console.log(`Extracted ${entry.name} -> ${outputPath}`)
+            // Make executable on Unix-like systems
            fs.chmodSync(outputPath, 0o755)
-          } catch (chmodError) {
-            console.error(`Warning: Failed to set executable permissions on ${filename}`)
-            return 102
          }
        }
-        console.log(`Extracted ${entry.name} -> ${outputPath}`)
      }
+
+      findAndMoveFiles(tempExtractDir)
+
+      // Clean up temporary extraction directory
+      fs.rmSync(tempExtractDir, { recursive: true })
+    } else {
+      // Use StreamZip for zip files (Windows)
+      const zip = new StreamZip.async({ file: tempFilename })
+
+      // Get all entries in the zip file
+      const entries = await zip.entries()
+
+      // Extract files directly to binDir, flattening the directory structure
+      for (const entry of Object.values(entries)) {
+        if (!entry.isDirectory) {
+          // Get just the filename without path
+          const filename = path.basename(entry.name)
+          const outputPath = path.join(binDir, filename)
+
+          console.log(`Extracting ${entry.name} -> ${filename}`)
+          await zip.extract(entry.name, outputPath)
+          console.log(`Extracted ${entry.name} -> ${outputPath}`)
+        }
+      }
+
+      await zip.close()
    }

-    await zip.close()
    fs.unlinkSync(tempFilename)
    console.log(`Successfully installed uv ${version} for ${platform}-${arch}`)
    return 0
--- a/resources/scripts/ipService.js
+++ b/resources/scripts/ipService.js
@@ -1,88 +0,0 @@
-const https = require('https')
-const { loggerService } = require('@logger')
-
-const logger = loggerService.withContext('IpService')
-
-/**
- * 获取用户的IP地址所在国家
- * @returns {Promise<string>} 返回国家代码，默认为'CN'
- */
-async function getIpCountry() {
-  return new Promise((resolve) => {
-    // 添加超时控制
-    const timeout = setTimeout(() => {
-      logger.info('IP Address Check Timeout, default to China Mirror')
-      resolve('CN')
-    }, 5000)
-
-    const options = {
-      hostname: 'ipinfo.io',
-      path: '/json',
-      method: 'GET',
-      headers: {
-        'User-Agent':
-          'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
-        'Accept-Language': 'en-US,en;q=0.9'
-      }
-    }
-
-    const req = https.request(options, (res) => {
-      clearTimeout(timeout)
-      let data = ''
-
-      res.on('data', (chunk) => {
-        data += chunk
-      })
-
-      res.on('end', () => {
-        try {
-          const parsed = JSON.parse(data)
-          const country = parsed.country || 'CN'
-          logger.info(`Detected user IP address country: ${country}`)
-          resolve(country)
-        } catch (error) {
-          logger.error('Failed to parse IP address information:', error.message)
-          resolve('CN')
-        }
-      })
-    })
-
-    req.on('error', (error) => {
-      clearTimeout(timeout)
-      logger.error('Failed to get IP address information:', error.message)
-      resolve('CN')
-    })
-
-    req.end()
-  })
-}
-
-/**
- * 检查用户是否在中国
- * @returns {Promise<boolean>} 如果用户在中国返回true，否则返回false
- */
-async function isUserInChina() {
-  const country = await getIpCountry()
-  return country.toLowerCase() === 'cn'
-}
-
-/**
- * 根据用户位置获取适合的npm镜像URL
- * @returns {Promise<string>} 返回npm镜像URL
- */
-async function getNpmRegistryUrl() {
-  const inChina = await isUserInChina()
-  if (inChina) {
-    logger.info('User in China, using Taobao npm mirror')
-    return 'https://registry.npmmirror.com'
-  } else {
-    logger.info('User not in China, using default npm mirror')
-    return 'https://registry.npmjs.org'
-  }
-}
-
-module.exports = {
-  getIpCountry,
-  isUserInChina,
-  getNpmRegistryUrl
-}
--- a/scripts/auto-translate-i18n.ts
+++ b/scripts/auto-translate-i18n.ts
@@ -18,8 +18,10 @@ import { sortedObjectByKeys } from './sort'
 // ========== SCRIPT CONFIGURATION AREA - MODIFY SETTINGS HERE ==========
 const SCRIPT_CONFIG = {
  // 🔧 Concurrency Control Configuration
-  MAX_CONCURRENT_TRANSLATIONS: 5, // Max concurrent requests (Make sure the concurrency level does not exceed your provider's limits.)
-  TRANSLATION_DELAY_MS: 100, // Delay between requests to avoid rate limiting (Recommended: 100-500ms, Range: 0-5000ms)
+  MAX_CONCURRENT_TRANSLATIONS: process.env.TRANSLATION_MAX_CONCURRENT_REQUESTS
+    ? parseInt(process.env.TRANSLATION_MAX_CONCURRENT_REQUESTS)
+    : 5, // Max concurrent requests (Make sure the concurrency level does not exceed your provider's limits.)
+  TRANSLATION_DELAY_MS: process.env.TRANSLATION_DELAY_MS ? parseInt(process.env.TRANSLATION_DELAY_MS) : 500, // Delay between requests to avoid rate limiting (Recommended: 100-500ms, Range: 0-5000ms)

  // 🔑 API Configuration
  API_KEY: process.env.TRANSLATION_API_KEY || '', // API key from environment variable
--- a/src/main/apiServer/middleware/openapi.ts
+++ b/src/main/apiServer/middleware/openapi.ts
@@ -171,7 +171,7 @@ const swaggerOptions: swaggerJSDoc.Options = {
      }
    ]
  },
-  apis: ['./src/main/apiServer/routes/*.ts', './src/main/apiServer/app.ts']
+  apis: ['./src/main/apiServer/routes/**/*.ts', './src/main/apiServer/app.ts']
 }

 export function setupOpenAPIDocumentation(app: Express) {
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -21,6 +21,7 @@ import { appMenuService } from './services/AppMenuService'
 import { configManager } from './services/ConfigManager'
 import mcpService from './services/MCPService'
 import { nodeTraceService } from './services/NodeTraceService'
+import powerMonitorService from './services/PowerMonitorService'
 import {
  CHERRY_STUDIO_PROTOCOL,
  handleProtocolUrl,
@@ -30,6 +31,7 @@ import {
 import selectionService, { initSelectionService } from './services/SelectionService'
 import { registerShortcuts } from './services/ShortcutService'
 import { TrayService } from './services/TrayService'
+import { versionService } from './services/VersionService'
 import { windowService } from './services/WindowService'
 import { initWebviewHotkeys } from './services/WebviewService'

@@ -110,6 +112,10 @@ if (!app.requestSingleInstanceLock()) {
  // Some APIs can only be used after this event occurs.

  app.whenReady().then(async () => {
+    // Record current version for tracking
+    // A preparation for v2 data refactoring
+    versionService.recordCurrentVersion()
+
    initWebviewHotkeys()
    // Set app user model id for windows
    electronApp.setAppUserModelId(import.meta.env.VITE_MAIN_BUNDLE_ID || 'com.kangfenmao.CherryStudio')
@@ -127,6 +133,7 @@ if (!app.requestSingleInstanceLock()) {
    appMenuService?.setupApplicationMenu()

    nodeTraceService.init()
+    powerMonitorService.init()

    app.on('activate', function () {
      const mainWindow = windowService.getMainWindow()
--- a/src/main/ipc.ts
+++ b/src/main/ipc.ts
@@ -50,6 +50,7 @@ import * as NutstoreService from './services/NutstoreService'
 import ObsidianVaultService from './services/ObsidianVaultService'
 import { ocrService } from './services/ocr/OcrService'
 import OvmsManager from './services/OvmsManager'
+import powerMonitorService from './services/PowerMonitorService'
 import { proxyManager } from './services/ProxyManager'
 import { pythonService } from './services/PythonService'
 import { FileServiceManager } from './services/remotefile/FileServiceManager'
@@ -115,8 +116,17 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
  const appUpdater = new AppUpdater()
  const notificationService = new NotificationService()

-  // Initialize Python service with main window
-  pythonService.setMainWindow(mainWindow)
+  // Register shutdown handlers
+  powerMonitorService.registerShutdownHandler(() => {
+    appUpdater.setAutoUpdate(false)
+  })
+
+  powerMonitorService.registerShutdownHandler(() => {
+    const mw = windowService.getMainWindow()
+    if (mw && !mw.isDestroyed()) {
+      mw.webContents.send(IpcChannel.App_SaveData)
+    }
+  })

  const checkMainWindow = () => {
    if (!mainWindow || mainWindow.isDestroyed()) {
@@ -809,17 +819,6 @@ 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()

--- a/src/main/knowledge/preprocess/MineruPreprocessProvider.ts
+++ b/src/main/knowledge/preprocess/MineruPreprocessProvider.ts
@@ -275,15 +275,10 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
    try {
      const fileBuffer = await fs.promises.readFile(filePath)

+      // https://mineru.net/apiManage/docs
      const response = await net.fetch(uploadUrl, {
        method: 'PUT',
-        body: fileBuffer,
-        headers: {
-          'Content-Type': 'application/pdf'
-        }
-        // headers: {
-        //   'Content-Length': fileBuffer.length.toString()
-        // }
+        body: fileBuffer
      })

      if (!response.ok) {
--- a/src/main/services/AppMenuService.ts
+++ b/src/main/services/AppMenuService.ts
@@ -7,16 +7,33 @@ import { app, Menu, shell } from 'electron'

 import { configManager } from './ConfigManager'
 export class AppMenuService {
+  private languageChangeCallback?: (newLanguage: string) => void
+
+  constructor() {
+    // Subscribe to language change events
+    this.languageChangeCallback = () => {
+      this.setupApplicationMenu()
+    }
+    configManager.subscribe('language', this.languageChangeCallback)
+  }
+
+  public destroy(): void {
+    // Clean up subscription to prevent memory leaks
+    if (this.languageChangeCallback) {
+      configManager.unsubscribe('language', this.languageChangeCallback)
+    }
+  }
+
  public setupApplicationMenu(): void {
    const locale = locales[configManager.getLanguage()]
-    const { common } = locale.translation
+    const { appMenu } = locale.translation

    const template: MenuItemConstructorOptions[] = [
      {
        label: app.name,
        submenu: [
          {
-            label: common.about + ' ' + app.name,
+            label: appMenu.about + ' ' + app.name,
            click: () => {
              // Emit event to navigate to About page
              const mainWindow = windowService.getMainWindow()
@@ -27,50 +44,78 @@ export class AppMenuService {
            }
          },
          { type: 'separator' },
-          { role: 'services' },
+          { role: 'services', label: appMenu.services },
          { type: 'separator' },
-          { role: 'hide' },
-          { role: 'hideOthers' },
-          { role: 'unhide' },
+          { role: 'hide', label: `${appMenu.hide} ${app.name}` },
+          { role: 'hideOthers', label: appMenu.hideOthers },
+          { role: 'unhide', label: appMenu.unhide },
          { type: 'separator' },
-          { role: 'quit' }
+          { role: 'quit', label: `${appMenu.quit} ${app.name}` }
        ]
      },
      {
-        role: 'fileMenu'
+        label: appMenu.file,
+        submenu: [{ role: 'close', label: appMenu.close }]
      },
      {
-        role: 'editMenu'
+        label: appMenu.edit,
+        submenu: [
+          { role: 'undo', label: appMenu.undo },
+          { role: 'redo', label: appMenu.redo },
+          { type: 'separator' },
+          { role: 'cut', label: appMenu.cut },
+          { role: 'copy', label: appMenu.copy },
+          { role: 'paste', label: appMenu.paste },
+          { role: 'delete', label: appMenu.delete },
+          { role: 'selectAll', label: appMenu.selectAll }
+        ]
      },
      {
-        role: 'viewMenu'
+        label: appMenu.view,
+        submenu: [
+          { role: 'reload', label: appMenu.reload },
+          { role: 'forceReload', label: appMenu.forceReload },
+          { role: 'toggleDevTools', label: appMenu.toggleDevTools },
+          { type: 'separator' },
+          { role: 'resetZoom', label: appMenu.resetZoom },
+          { role: 'zoomIn', label: appMenu.zoomIn },
+          { role: 'zoomOut', label: appMenu.zoomOut },
+          { type: 'separator' },
+          { role: 'togglefullscreen', label: appMenu.toggleFullscreen }
+        ]
      },
      {
-        role: 'windowMenu'
+        label: appMenu.window,
+        submenu: [
+          { role: 'minimize', label: appMenu.minimize },
+          { role: 'zoom', label: appMenu.zoom },
+          { type: 'separator' },
+          { role: 'front', label: appMenu.front }
+        ]
      },
      {
-        role: 'help',
+        label: appMenu.help,
        submenu: [
          {
-            label: 'Website',
+            label: appMenu.website,
            click: () => {
              shell.openExternal('https://cherry-ai.com')
            }
          },
          {
-            label: 'Documentation',
+            label: appMenu.documentation,
            click: () => {
              shell.openExternal('https://cherry-ai.com/docs')
            }
          },
          {
-            label: 'Feedback',
+            label: appMenu.feedback,
            click: () => {
              shell.openExternal('https://github.com/CherryHQ/cherry-studio/issues/new/choose')
            }
          },
          {
-            label: 'Releases',
+            label: appMenu.releases,
            click: () => {
              shell.openExternal('https://github.com/CherryHQ/cherry-studio/releases')
            }
--- a/src/main/services/BackupManager.ts
+++ b/src/main/services/BackupManager.ts
@@ -11,6 +11,7 @@ import * as path from 'path'
 import type { CreateDirectoryOptions, FileStat } from 'webdav'

 import { getDataPath } from '../utils'
+import { expandNotesPath } from '../utils/file'
 import S3Storage from './S3Storage'
 import WebDav from './WebDav'
 import { windowService } from './WindowService'
@@ -240,11 +241,49 @@ class BackupManager {
        // 使用流式复制
        await this.copyDirWithProgress(sourcePath, tempDataDir, (size) => {
          copiedSize += size
-          const progress = Math.min(50, Math.floor((copiedSize / totalSize) * 50))
+          const progress = Math.min(45, Math.floor((copiedSize / totalSize) * 45))
          onProgress({ stage: 'copying_files', progress, total: 100 })
        })

        await this.setWritableRecursive(tempDataDir)
+
+        // 检查并备份 notes 目录（如果配置在 Data 目录外）
+        try {
+          const backupData = JSON.parse(data)
+          const persistData = JSON.parse(backupData.localStorage?.['persist:cherry-studio'] || '{}')
+          const noteState = JSON.parse(persistData.note || '{}')
+          const notesPath = noteState.notesPath
+
+          if (notesPath) {
+            // 展开路径获取绝对路径
+            const expandedNotesPath = expandNotesPath(notesPath)
+            const dataPath = path.join(app.getPath('userData'), 'Data')
+            const normalizedDataPath = path.normalize(dataPath)
+            const normalizedNotesPath = path.normalize(expandedNotesPath)
+
+            // 检查 notes 是否在 Data 目录外
+            const isOutsideData =
+              !normalizedNotesPath.startsWith(normalizedDataPath + path.sep) &&
+              normalizedNotesPath !== normalizedDataPath
+
+            if (isOutsideData && fs.existsSync(expandedNotesPath)) {
+              logger.info(`Backing up notes from external location: ${expandedNotesPath}`)
+              const tempNotesDir = path.join(this.tempDir, 'Notes')
+              await this.copyDirWithProgress(expandedNotesPath, tempNotesDir, (size) => {
+                // Notes backup progress from 45% to 50%
+                copiedSize += size
+                const notesProgress = 45 + Math.min(5, Math.floor((size / totalSize) * 5))
+                onProgress({ stage: 'copying_notes', progress: notesProgress, total: 100 })
+              })
+              await this.setWritableRecursive(tempNotesDir)
+              logger.info('External notes directory backed up successfully')
+            }
+          }
+        } catch (error) {
+          // 如果解析失败或获取 notes 路径失败，继续备份其他内容
+          logger.warn('Failed to parse notes path from backup data, skipping external notes backup', error as Error)
+        }
+
        onProgress({ stage: 'preparing_compression', progress: 50, total: 100 })
      } else {
        logger.debug('Skip the backup of the file')
@@ -399,13 +438,52 @@ class BackupManager {
        // 使用流式复制
        await this.copyDirWithProgress(sourcePath, destPath, (size) => {
          copiedSize += size
-          const progress = Math.min(85, 35 + Math.floor((copiedSize / totalSize) * 50))
+          const progress = Math.min(75, 35 + Math.floor((copiedSize / totalSize) * 40))
          onProgress({ stage: 'copying_files', progress, total: 100 })
        })
      } else {
        logger.debug('skipBackupFile is true, skip restoring Data directory')
      }

+      // 检查并恢复外部 Notes 目录
+      logger.debug('step 3.5: check and restore external Notes directory')
+      const notesBackupPath = path.join(this.tempDir, 'Notes')
+      const notesExists = await fs.pathExists(notesBackupPath)
+
+      if (notesExists) {
+        try {
+          // 从 data.json 中获取 notes 路径配置
+          const backupData = JSON.parse(data)
+          const persistData = JSON.parse(backupData.localStorage?.['persist:cherry-studio'] || '{}')
+          const noteState = JSON.parse(persistData.note || '{}')
+          const notesPath = noteState.notesPath
+
+          if (notesPath) {
+            const expandedNotesPath = expandNotesPath(notesPath)
+            logger.info(`Restoring notes to configured location: ${expandedNotesPath}`)
+
+            // 确保目标目录的父目录存在
+            await fs.ensureDir(path.dirname(expandedNotesPath))
+
+            // 如果目标已存在，先删除
+            if (await fs.pathExists(expandedNotesPath)) {
+              await this.setWritableRecursive(expandedNotesPath)
+              await fs.remove(expandedNotesPath)
+            }
+
+            // 复制 Notes 目录
+            await this.copyDirWithProgress(notesBackupPath, expandedNotesPath, (size) => {
+              const progress = Math.min(85, 75 + Math.floor(size / 1000000))
+              onProgress({ stage: 'copying_notes', progress, total: 100 })
+            })
+
+            logger.info('External notes directory restored successfully')
+          }
+        } catch (error) {
+          logger.warn('Failed to restore external notes directory', error as Error)
+        }
+      }
+
      logger.debug('step 4: clean up temp directory')
      // 清理临时目录
      await this.setWritableRecursive(this.tempDir)
--- a/src/main/services/CodeToolsService.ts
+++ b/src/main/services/CodeToolsService.ts
@@ -10,6 +10,7 @@ import { getBinaryName } from '@main/utils/process'
 import type { TerminalConfig, TerminalConfigWithCommand } from '@shared/config/constant'
 import {
  codeTools,
+  HOME_CHERRY_DIR,
  MACOS_TERMINALS,
  MACOS_TERMINALS_WITH_COMMANDS,
  terminalApps,
@@ -66,7 +67,7 @@ class CodeToolsService {
  }

  public async getBunPath() {
-    const dir = path.join(os.homedir(), '.cherrystudio', 'bin')
+    const dir = path.join(os.homedir(), HOME_CHERRY_DIR, 'bin')
    const bunName = await getBinaryName('bun')
    const bunPath = path.join(dir, bunName)
    return bunPath
@@ -362,7 +363,7 @@ class CodeToolsService {

  private async isPackageInstalled(cliTool: string): Promise<boolean> {
    const executableName = await this.getCliExecutableName(cliTool)
-    const binDir = path.join(os.homedir(), '.cherrystudio', 'bin')
+    const binDir = path.join(os.homedir(), HOME_CHERRY_DIR, 'bin')
    const executablePath = path.join(binDir, executableName + (isWin ? '.exe' : ''))

    // Ensure bin directory exists
@@ -389,7 +390,7 @@ class CodeToolsService {
      logger.info(`${cliTool} is installed, getting current version`)
      try {
        const executableName = await this.getCliExecutableName(cliTool)
-        const binDir = path.join(os.homedir(), '.cherrystudio', 'bin')
+        const binDir = path.join(os.homedir(), HOME_CHERRY_DIR, 'bin')
        const executablePath = path.join(binDir, executableName + (isWin ? '.exe' : ''))

        const { stdout } = await execAsync(`"${executablePath}" --version`, {
@@ -500,7 +501,7 @@ class CodeToolsService {
    try {
      const packageName = await this.getPackageName(cliTool)
      const bunPath = await this.getBunPath()
-      const bunInstallPath = path.join(os.homedir(), '.cherrystudio')
+      const bunInstallPath = path.join(os.homedir(), HOME_CHERRY_DIR)
      const registryUrl = await this.getNpmRegistryUrl()

      const installEnvPrefix = isWin
@@ -550,7 +551,7 @@ class CodeToolsService {
    const packageName = await this.getPackageName(cliTool)
    const bunPath = await this.getBunPath()
    const executableName = await this.getCliExecutableName(cliTool)
-    const binDir = path.join(os.homedir(), '.cherrystudio', 'bin')
+    const binDir = path.join(os.homedir(), HOME_CHERRY_DIR, 'bin')
    const executablePath = path.join(binDir, executableName + (isWin ? '.exe' : ''))

    logger.debug(`Package name: ${packageName}`)
@@ -652,7 +653,7 @@ class CodeToolsService {
      baseCommand = `${baseCommand} ${configParams}`
    }

-    const bunInstallPath = path.join(os.homedir(), '.cherrystudio')
+    const bunInstallPath = path.join(os.homedir(), HOME_CHERRY_DIR)

    if (isInstalled) {
      // If already installed, run executable directly (with optional update message)
--- a/src/main/services/FileStorage.ts
+++ b/src/main/services/FileStorage.ts
@@ -1,10 +1,11 @@
 import { loggerService } from '@logger'
 import {
  checkName,
+  expandNotesPath,
  getFilesDir,
  getFileType,
  getName,
-  getNotesDir,
+  getNotesDirAbsolute,
  getTempDir,
  readTextFileWithAutoEncoding,
  scanDir
@@ -56,7 +57,7 @@ const DEFAULT_WATCHER_CONFIG: Required<FileWatcherConfig> = {

 class FileStorage {
  private storageDir = getFilesDir()
-  private notesDir = getNotesDir()
+  private notesDir = getNotesDirAbsolute()
  private tempDir = getTempDir()
  private watcher?: FSWatcher
  private watcherSender?: Electron.WebContents
@@ -741,7 +742,9 @@ class FileStorage {

  public getDirectoryStructure = async (_: Electron.IpcMainInvokeEvent, dirPath: string): Promise<NotesTreeNode[]> => {
    try {
-      return await scanDir(dirPath)
+      // Expand relative paths before scanning
+      const expandedPath = expandNotesPath(dirPath)
+      return await scanDir(expandedPath)
    } catch (error) {
      logger.error('Failed to get directory structure:', error as Error)
      throw error
@@ -754,8 +757,8 @@ class FileStorage {
        return false
      }

-      // Normalize path
-      const normalizedPath = path.resolve(dirPath)
+      // Expand and normalize path (handles ~, ., and .. paths)
+      const normalizedPath = expandNotesPath(dirPath)

      // Check if directory exists
      if (!fs.existsSync(normalizedPath)) {
@@ -771,7 +774,7 @@ class FileStorage {
      // Get app paths to prevent selection of restricted directories
      const appDataPath = path.resolve(process.env.APPDATA || path.join(require('os').homedir(), '.config'))
      const filesDir = path.resolve(getFilesDir())
-      const currentNotesDir = path.resolve(getNotesDir())
+      const currentNotesDir = getNotesDirAbsolute()

      // Prevent selecting app data directories
      if (
@@ -1008,7 +1011,8 @@ class FileStorage {
        throw new Error('Directory path is required')
      }

-      const normalizedPath = path.resolve(dirPath.trim())
+      // Expand relative paths before watching
+      const normalizedPath = expandNotesPath(dirPath.trim())

      if (!fs.existsSync(normalizedPath)) {
        throw new Error(`Directory does not exist: ${normalizedPath}`)
--- a/src/main/services/MCPService.ts
+++ b/src/main/services/MCPService.ts
@@ -30,6 +30,7 @@ import {
  ToolListChangedNotificationSchema
 } from '@modelcontextprotocol/sdk/types.js'
 import { nanoid } from '@reduxjs/toolkit'
+import { HOME_CHERRY_DIR } from '@shared/config/constant'
 import type { MCPProgressEvent } from '@shared/config/types'
 import { IpcChannel } from '@shared/IpcChannel'
 import { defaultAppHeaders } from '@shared/utils'
@@ -715,7 +716,7 @@ class McpService {
  }

  public async getInstallInfo() {
-    const dir = path.join(os.homedir(), '.cherrystudio', 'bin')
+    const dir = path.join(os.homedir(), HOME_CHERRY_DIR, 'bin')
    const uvName = await getBinaryName('uv')
    const bunName = await getBinaryName('bun')
    const uvPath = path.join(dir, uvName)
--- a/src/main/services/OvmsManager.ts
+++ b/src/main/services/OvmsManager.ts
@@ -3,6 +3,7 @@ import { homedir } from 'node:os'
 import { promisify } from 'node:util'

 import { loggerService } from '@logger'
+import { HOME_CHERRY_DIR } from '@shared/config/constant'
 import * as fs from 'fs-extra'
 import * as path from 'path'

@@ -145,7 +146,7 @@ class OvmsManager {
   */
  public async runOvms(): Promise<{ success: boolean; message?: string }> {
    const homeDir = homedir()
-    const ovmsDir = path.join(homeDir, '.cherrystudio', 'ovms', 'ovms')
+    const ovmsDir = path.join(homeDir, HOME_CHERRY_DIR, 'ovms', 'ovms')
    const configPath = path.join(ovmsDir, 'models', 'config.json')
    const runBatPath = path.join(ovmsDir, 'run.bat')

@@ -195,7 +196,7 @@ class OvmsManager {
   */
  public async getOvmsStatus(): Promise<'not-installed' | 'not-running' | 'running'> {
    const homeDir = homedir()
-    const ovmsPath = path.join(homeDir, '.cherrystudio', 'ovms', 'ovms', 'ovms.exe')
+    const ovmsPath = path.join(homeDir, HOME_CHERRY_DIR, 'ovms', 'ovms', 'ovms.exe')

    try {
      // Check if OVMS executable exists
@@ -273,7 +274,7 @@ class OvmsManager {
    }

    const homeDir = homedir()
-    const configPath = path.join(homeDir, '.cherrystudio', 'ovms', 'ovms', 'models', 'config.json')
+    const configPath = path.join(homeDir, HOME_CHERRY_DIR, 'ovms', 'ovms', 'models', 'config.json')
    try {
      if (!(await fs.pathExists(configPath))) {
        logger.warn(`Config file does not exist: ${configPath}`)
@@ -304,7 +305,7 @@ class OvmsManager {

  private async applyModelPath(modelDirPath: string): Promise<boolean> {
    const homeDir = homedir()
-    const patchDir = path.join(homeDir, '.cherrystudio', 'ovms', 'patch')
+    const patchDir = path.join(homeDir, HOME_CHERRY_DIR, 'ovms', 'patch')
    if (!(await fs.pathExists(patchDir))) {
      return true
    }
@@ -355,7 +356,7 @@ class OvmsManager {
    logger.info(`Adding model: ${modelName} with ID: ${modelId}, Source: ${modelSource}, Task: ${task}`)

    const homeDir = homedir()
-    const ovdndDir = path.join(homeDir, '.cherrystudio', 'ovms', 'ovms')
+    const ovdndDir = path.join(homeDir, HOME_CHERRY_DIR, 'ovms', 'ovms')
    const pathModel = path.join(ovdndDir, 'models', modelId)

    try {
@@ -468,7 +469,7 @@ class OvmsManager {
   */
  public async checkModelExists(modelId: string): Promise<boolean> {
    const homeDir = homedir()
-    const ovmsDir = path.join(homeDir, '.cherrystudio', 'ovms', 'ovms')
+    const ovmsDir = path.join(homeDir, HOME_CHERRY_DIR, 'ovms', 'ovms')
    const configPath = path.join(ovmsDir, 'models', 'config.json')

    try {
@@ -495,7 +496,7 @@ class OvmsManager {
   */
  public async updateModelConfig(modelName: string, modelId: string): Promise<boolean> {
    const homeDir = homedir()
-    const ovmsDir = path.join(homeDir, '.cherrystudio', 'ovms', 'ovms')
+    const ovmsDir = path.join(homeDir, HOME_CHERRY_DIR, 'ovms', 'ovms')
    const configPath = path.join(ovmsDir, 'models', 'config.json')

    try {
@@ -548,7 +549,7 @@ class OvmsManager {
   */
  public async getModels(): Promise<ModelConfig[]> {
    const homeDir = homedir()
-    const ovmsDir = path.join(homeDir, '.cherrystudio', 'ovms', 'ovms')
+    const ovmsDir = path.join(homeDir, HOME_CHERRY_DIR, 'ovms', 'ovms')
    const configPath = path.join(ovmsDir, 'models', 'config.json')

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

-import type { BrowserWindow } from 'electron'
 import { ipcMain } from 'electron'

+import { windowService } from './WindowService'
+
 interface PythonExecutionRequest {
  id: string
  script: string
@@ -21,7 +22,6 @@ interface PythonExecutionResponse {
 */
 export class PythonService {
  private static instance: PythonService | null = null
-  private mainWindow: BrowserWindow | null = null
  private pendingRequests = new Map<string, { resolve: (value: string) => void; reject: (error: Error) => void }>()

  private constructor() {
@@ -51,10 +51,6 @@ export class PythonService {
    })
  }

-  public setMainWindow(mainWindow: BrowserWindow) {
-    this.mainWindow = mainWindow
-  }
-
  /**
   * Execute Python code by sending request to renderer PyodideService
   */
@@ -63,8 +59,8 @@ export class PythonService {
    context: Record<string, any> = {},
    timeout: number = 60000
  ): Promise<string> {
-    if (!this.mainWindow) {
-      throw new Error('Main window not set in PythonService')
+    if (!windowService.getMainWindow()) {
+      throw new Error('Main window not found')
    }

    return new Promise((resolve, reject) => {
@@ -95,7 +91,7 @@ export class PythonService {

      // Send request to renderer
      const request: PythonExecutionRequest = { id: requestId, script, context, timeout }
-      this.mainWindow?.webContents.send('python-execution-request', request)
+      windowService.getMainWindow()?.webContents.send('python-execution-request', request)
    })
  }
 }
--- a/src/main/services/SpanCacheService.ts
+++ b/src/main/services/SpanCacheService.ts
@@ -3,6 +3,7 @@ import type { Attributes, SpanEntity, TokenUsage, TraceCache } from '@mcp-trace/
 import { convertSpanToSpanEntity } from '@mcp-trace/trace-core'
 import { SpanStatusCode } from '@opentelemetry/api'
 import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'
+import { HOME_CHERRY_DIR } from '@shared/config/constant'
 import fs from 'fs/promises'
 import * as os from 'os'
 import * as path from 'path'
@@ -18,7 +19,7 @@ class SpanCacheService implements TraceCache {
  pri

  constructor() {
-    this.fileDir = path.join(os.homedir(), '.cherrystudio', 'trace')
+    this.fileDir = path.join(os.homedir(), HOME_CHERRY_DIR, 'trace')
  }

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

 /**
 * init the useragent of the webview session
@@ -54,17 +53,11 @@ const attachKeyboardHandler = (contents: Electron.WebContents) => {
      return
    }

-    // 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
-    }
+    const isFindShortcut = (input.control || input.meta) && key === 'f'
+    const isEscape = key === 'escape'
+    const isEnter = key === 'enter'

-    if (!isHandledShortcut(key)) {
+    if (!isFindShortcut && !isEscape && !isEnter) {
      return
    }

@@ -73,20 +66,11 @@ 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
@@ -116,129 +100,3 @@ 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({
-      marginsType: 0,
-      printBackground: true,
-      printSelectionOnly: false,
-      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}`)
-  }
-}
--- a/src/main/services/agents/services/SessionService.ts
+++ b/src/main/services/agents/services/SessionService.ts
@@ -78,6 +78,7 @@ export class SessionService extends BaseService {
      plan_model: serializedData.plan_model || null,
      small_model: serializedData.small_model || null,
      mcps: serializedData.mcps || null,
+      allowed_tools: serializedData.allowed_tools || null,
      configuration: serializedData.configuration || null,
      created_at: now,
      updated_at: now
--- a/src/main/services/agents/services/claudecode/index.ts
+++ b/src/main/services/agents/services/claudecode/index.ts
@@ -365,6 +365,16 @@ class ClaudeCodeService implements AgentServiceInterface {
            type: 'chunk',
            chunk
          })
+
+          // Close prompt stream when SDK signals completion or error
+          if (chunk.type === 'finish' || chunk.type === 'error') {
+            logger.info('Closing prompt stream as SDK signaled completion', {
+              chunkType: chunk.type,
+              reason: chunk.type === 'finish' ? 'finished' : 'error_occurred'
+            })
+            closePromptStream()
+            logger.info('Prompt stream closed successfully')
+          }
        }
      }

--- a/src/main/services/mcp/oauth/callback.ts
+++ b/src/main/services/mcp/oauth/callback.ts
@@ -1,4 +1,6 @@
 import { loggerService } from '@logger'
+import { configManager } from '@main/services/ConfigManager'
+import { locales } from '@main/utils/locales'
 import type EventEmitter from 'events'
 import http from 'http'
 import { URL } from 'url'
@@ -7,6 +9,36 @@ import type { OAuthCallbackServerOptions } from './types'

 const logger = loggerService.withContext('MCP:OAuthCallbackServer')

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

-const PATH_BAT_FILE = path.join(os.homedir(), '.cherrystudio', 'ovms', 'ovocr', 'run.npu.bat')
+const PATH_BAT_FILE = path.join(os.homedir(), HOME_CHERRY_DIR, 'ovms', 'ovocr', 'run.npu.bat')

 export class OvOcrService extends OcrBaseService {
  constructor() {
@@ -30,7 +31,7 @@ export class OvOcrService extends OcrBaseService {
  }

  private getOvOcrPath(): string {
-    return path.join(os.homedir(), '.cherrystudio', 'ovms', 'ovocr')
+    return path.join(os.homedir(), HOME_CHERRY_DIR, 'ovms', 'ovocr')
  }

  private getImgDir(): string {
--- a/src/main/utils/tests/file.test.ts
+++ b/src/main/utils/tests/file.test.ts
@@ -10,11 +10,14 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'

 import { readTextFileWithAutoEncoding } from '../file'
 import {
+  expandNotesPath,
  getAllFiles,
  getAppConfigDir,
  getConfigDir,
  getFilesDir,
  getFileType,
+  getNotesDir,
+  getNotesDirAbsolute,
  getTempDir,
  isPathInside,
  untildify
@@ -244,6 +247,20 @@ describe('file', () => {
    })
  })

+  describe('getNotesDir', () => {
+    it('should return relative path for portability', () => {
+      const notesDir = getNotesDir()
+      expect(notesDir).toBe('./Data/Notes')
+    })
+  })
+
+  describe('getNotesDirAbsolute', () => {
+    it('should return absolute notes directory path', () => {
+      const notesDirAbsolute = getNotesDirAbsolute()
+      expect(notesDirAbsolute).toBe('/mock/userData/Data/Notes')
+    })
+  })
+
  describe('getAppConfigDir', () => {
    it('should return correct app config directory path', () => {
      const appConfigDir = getAppConfigDir('test-app')
@@ -331,6 +348,64 @@ describe('file', () => {
    })
  })

+  describe('expandNotesPath', () => {
+    beforeEach(() => {
+      // Mock path.isAbsolute
+      vi.mocked(path.isAbsolute).mockImplementation((p) => {
+        return p.startsWith('/') || /^[A-Za-z]:/.test(p)
+      })
+
+      // Mock path.resolve
+      vi.mocked(path.resolve).mockImplementation((...args) => {
+        const joined = args.join('/')
+        return joined.startsWith('/') ? joined : `/${joined}`
+      })
+
+      // Mock path.normalize
+      vi.mocked(path.normalize).mockImplementation((p) => p.replace(/\/+/g, '/'))
+    })
+
+    it('should expand tilde paths to home directory', () => {
+      const result = expandNotesPath('~/Notes')
+      expect(result).toBe('/mock/home/Notes')
+    })
+
+    it('should expand relative paths using userData as base', () => {
+      const result = expandNotesPath('./Notes')
+      expect(result).toContain('userData')
+    })
+
+    it('should return absolute paths unchanged', () => {
+      const result = expandNotesPath('/absolute/path/Notes')
+      expect(result).toBe('/absolute/path/Notes')
+    })
+
+    it('should handle Windows absolute paths', () => {
+      const result = expandNotesPath('C:\\Users\\Notes')
+      expect(result).toBe('C:\\Users\\Notes')
+    })
+
+    it('should handle empty string', () => {
+      const result = expandNotesPath('')
+      expect(result).toBe('')
+    })
+
+    it('should expand parent directory paths', () => {
+      const result = expandNotesPath('../Notes')
+      expect(result).toContain('userData')
+    })
+
+    it('should use custom base path when provided', () => {
+      const result = expandNotesPath('./Notes', '/custom/base')
+      expect(result).toContain('/custom/base')
+    })
+
+    it('should handle complex relative paths', () => {
+      const result = expandNotesPath('../../Notes')
+      expect(result).toContain('userData')
+    })
+  })
+
  describe('isPathInside', () => {
    beforeEach(() => {
      // Mock path.resolve to simulate path resolution
--- a/src/main/utils/file.ts
+++ b/src/main/utils/file.ts
@@ -5,7 +5,7 @@ import os from 'node:os'
 import path from 'node:path'

 import { loggerService } from '@logger'
-import { audioExts, documentExts, imageExts, MB, textExts, videoExts } from '@shared/config/constant'
+import { audioExts, documentExts, HOME_CHERRY_DIR, imageExts, MB, textExts, videoExts } from '@shared/config/constant'
 import type { FileMetadata, NotesTreeNode } from '@types'
 import { FileTypes } from '@types'
 import chardet from 'chardet'
@@ -38,6 +38,33 @@ export function untildify(pathWithTilde: string) {
  return pathWithTilde
 }

+/**
+ * Expand relative paths to absolute paths.
+ * Handles paths starting with ~, ., or ..
+ * @param pathString - The path to expand
+ * @param basePath - Optional base path for relative paths (defaults to userData directory)
+ * @returns Absolute path
+ */
+export function expandNotesPath(pathString: string, basePath?: string): string {
+  if (!pathString) {
+    return pathString
+  }
+
+  // First handle tilde expansion
+  let expandedPath = untildify(pathString)
+
+  // If it's already an absolute path, return it
+  if (path.isAbsolute(expandedPath)) {
+    return path.normalize(expandedPath)
+  }
+
+  // For relative paths, resolve against the base path (default to userData)
+  const base = basePath || app.getPath('userData')
+  expandedPath = path.resolve(base, expandedPath)
+
+  return path.normalize(expandedPath)
+}
+
 export async function hasWritePermission(dir: string) {
  try {
    logger.info(`Checking write permission for ${dir}`)
@@ -156,11 +183,16 @@ export function getNotesDir() {
    fs.mkdirSync(notesDir, { recursive: true })
    logger.info(`Notes directory created at: ${notesDir}`)
  }
-  return notesDir
+  // Return relative path for better portability across devices
+  return './Data/Notes'
+}
+
+export function getNotesDirAbsolute() {
+  return path.join(app.getPath('userData'), 'Data', 'Notes')
 }

 export function getConfigDir() {
-  return path.join(os.homedir(), '.cherrystudio', 'config')
+  return path.join(os.homedir(), HOME_CHERRY_DIR, 'config')
 }

 export function getCacheDir() {
@@ -172,7 +204,7 @@ export function getAppConfigDir(name: string) {
 }

 export function getMcpDir() {
-  return path.join(os.homedir(), '.cherrystudio', 'mcp')
+  return path.join(os.homedir(), HOME_CHERRY_DIR, 'mcp')
 }

 /**
--- a/src/main/utils/init.ts
+++ b/src/main/utils/init.ts
@@ -3,6 +3,7 @@ import os from 'node:os'
 import path from 'node:path'

 import { isLinux, isPortable, isWin } from '@main/constant'
+import { HOME_CHERRY_DIR } from '@shared/config/constant'
 import { app } from 'electron'

 // Please don't import any other modules which is not node/electron built-in modules
@@ -17,7 +18,7 @@ function hasWritePermission(path: string) {
 }

 function getConfigDir() {
-  return path.join(os.homedir(), '.cherrystudio', 'config')
+  return path.join(os.homedir(), HOME_CHERRY_DIR, 'config')
 }

 export function initAppDataDir() {
--- a/src/main/utils/process.ts
+++ b/src/main/utils/process.ts
@@ -1,4 +1,5 @@
 import { loggerService } from '@logger'
+import { HOME_CHERRY_DIR } from '@shared/config/constant'
 import { spawn } from 'child_process'
 import fs from 'fs'
 import os from 'os'
@@ -46,11 +47,11 @@ export async function getBinaryName(name: string): Promise<string> {

 export async function getBinaryPath(name?: string): Promise<string> {
  if (!name) {
-    return path.join(os.homedir(), '.cherrystudio', 'bin')
+    return path.join(os.homedir(), HOME_CHERRY_DIR, 'bin')
  }

  const binaryName = await getBinaryName(name)
-  const binariesDir = path.join(os.homedir(), '.cherrystudio', 'bin')
+  const binariesDir = path.join(os.homedir(), HOME_CHERRY_DIR, 'bin')
  const binariesDirExists = fs.existsSync(binariesDir)
  return binariesDirExists ? path.join(binariesDir, binaryName) : binaryName
 }
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -406,8 +406,6 @@ 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)
--- a/src/renderer/src/App.tsx
+++ b/src/renderer/src/App.tsx
@@ -6,11 +6,9 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
 import { Provider } from 'react-redux'
 import { PersistGate } from 'redux-persist/integration/react'

-import { ToastPortal } from './components/ToastPortal'
 import TopViewContainer from './components/TopView'
 import AntdProvider from './context/AntdProvider'
 import { CodeStyleProvider } from './context/CodeStyleProvider'
-import { HeroUIProvider } from './context/HeroUIProvider'
 import { NotificationProvider } from './context/NotificationProvider'
 import StyleSheetManager from './context/StyleSheetManager'
 import { ThemeProvider } from './context/ThemeProvider'
@@ -34,24 +32,21 @@ function App(): React.ReactElement {
  return (
    <Provider store={store}>
      <QueryClientProvider client={queryClient}>
-        <HeroUIProvider>
-          <StyleSheetManager>
-            <ThemeProvider>
-              <AntdProvider>
-                <NotificationProvider>
-                  <CodeStyleProvider>
-                    <PersistGate loading={null} persistor={persistor}>
-                      <TopViewContainer>
-                        <Router />
-                      </TopViewContainer>
-                    </PersistGate>
-                  </CodeStyleProvider>
-                </NotificationProvider>
-              </AntdProvider>
-            </ThemeProvider>
-          </StyleSheetManager>
-          <ToastPortal />
-        </HeroUIProvider>
+        <StyleSheetManager>
+          <ThemeProvider>
+            <AntdProvider>
+              <NotificationProvider>
+                <CodeStyleProvider>
+                  <PersistGate loading={null} persistor={persistor}>
+                    <TopViewContainer>
+                      <Router />
+                    </TopViewContainer>
+                  </PersistGate>
+                </CodeStyleProvider>
+              </NotificationProvider>
+            </AntdProvider>
+          </ThemeProvider>
+        </StyleSheetManager>
      </QueryClientProvider>
    </Provider>
  )
--- a/src/renderer/src/aiCore/legacy/clients/aws/AwsBedrockAPIClient.ts
+++ b/src/renderer/src/aiCore/legacy/clients/aws/AwsBedrockAPIClient.ts
@@ -1,6 +1,7 @@
 import { BedrockClient, ListFoundationModelsCommand, ListInferenceProfilesCommand } from '@aws-sdk/client-bedrock'
 import {
  BedrockRuntimeClient,
+  type BedrockRuntimeClientConfig,
  ConverseCommand,
  InvokeModelCommand,
  InvokeModelWithResponseStreamCommand
@@ -11,6 +12,8 @@ import { DEFAULT_MAX_TOKENS } from '@renderer/config/constant'
 import { findTokenLimit, isReasoningModel } from '@renderer/config/models'
 import {
  getAwsBedrockAccessKeyId,
+  getAwsBedrockApiKey,
+  getAwsBedrockAuthType,
  getAwsBedrockRegion,
  getAwsBedrockSecretAccessKey
 } from '@renderer/hooks/useAwsBedrock'
@@ -75,32 +78,48 @@ export class AwsBedrockAPIClient extends BaseApiClient<
    }

    const region = getAwsBedrockRegion()
-    const accessKeyId = getAwsBedrockAccessKeyId()
-    const secretAccessKey = getAwsBedrockSecretAccessKey()
+    const authType = getAwsBedrockAuthType()

    if (!region) {
-      throw new Error('AWS region is required. Please configure AWS-Region in extra headers.')
+      throw new Error('AWS region is required. Please configure AWS region in settings.')
    }

-    if (!accessKeyId || !secretAccessKey) {
-      throw new Error('AWS credentials are required. Please configure AWS-Access-Key-ID and AWS-Secret-Access-Key.')
+    // Build client configuration based on auth type
+    let clientConfig: BedrockRuntimeClientConfig
+
+    if (authType === 'iam') {
+      // IAM credentials authentication
+      const accessKeyId = getAwsBedrockAccessKeyId()
+      const secretAccessKey = getAwsBedrockSecretAccessKey()
+
+      if (!accessKeyId || !secretAccessKey) {
+        throw new Error('AWS credentials are required. Please configure Access Key ID and Secret Access Key.')
+      }
+
+      clientConfig = {
+        region,
+        credentials: {
+          accessKeyId,
+          secretAccessKey
+        }
+      }
+    } else {
+      // API Key authentication
+      const awsBedrockApiKey = getAwsBedrockApiKey()
+
+      if (!awsBedrockApiKey) {
+        throw new Error('AWS Bedrock API Key is required. Please configure API Key in settings.')
+      }
+
+      clientConfig = {
+        region,
+        token: { token: awsBedrockApiKey },
+        authSchemePreference: ['httpBearerAuth']
+      }
    }

-    const client = new BedrockRuntimeClient({
-      region,
-      credentials: {
-        accessKeyId,
-        secretAccessKey
-      }
-    })
-
-    const bedrockClient = new BedrockClient({
-      region,
-      credentials: {
-        accessKeyId,
-        secretAccessKey
-      }
-    })
+    const client = new BedrockRuntimeClient(clientConfig)
+    const bedrockClient = new BedrockClient(clientConfig)

    this.sdkInstance = { client, bedrockClient, region }
    return this.sdkInstance
--- a/src/renderer/src/aiCore/prepareParams/modelCapabilities.ts
+++ b/src/renderer/src/aiCore/prepareParams/modelCapabilities.ts
@@ -85,6 +85,19 @@ export function supportsLargeFileUpload(model: Model): boolean {
  })
 }

+/**
+ * 检查模型是否支持TopP
+ */
+export function supportsTopP(model: Model): boolean {
+  const provider = getProviderByModel(model)
+
+  if (provider?.type === 'anthropic' || model?.endpoint_type === 'anthropic') {
+    return false
+  }
+
+  return true
+}
+
 /**
 * 获取提供商特定的文件大小限制
 */
--- a/src/renderer/src/aiCore/prepareParams/parameterBuilder.ts
+++ b/src/renderer/src/aiCore/prepareParams/parameterBuilder.ts
@@ -34,6 +34,7 @@ import { setupToolsConfig } from '../utils/mcp'
 import { buildProviderOptions } from '../utils/options'
 import { getAnthropicThinkingBudget } from '../utils/reasoning'
 import { buildProviderBuiltinWebSearchConfig } from '../utils/websearch'
+import { supportsTopP } from './modelCapabilities'
 import { getTemperature, getTopP } from './modelParameters'

 const logger = loggerService.withContext('parameterBuilder')
@@ -176,20 +177,27 @@ export async function buildStreamTextParams(
    messages: sdkMessages,
    maxOutputTokens: maxTokens,
    temperature: getTemperature(assistant, model),
-    topP: getTopP(assistant, model),
    abortSignal: options.requestOptions?.signal,
    headers: options.requestOptions?.headers,
    providerOptions,
    stopWhen: stepCountIs(20),
    maxRetries: 0
  }
+
+  if (supportsTopP(model)) {
+    params.topP = getTopP(assistant, model)
+  }
+
  if (tools) {
    params.tools = tools
  }
+
  if (assistant.prompt) {
    params.system = await replacePromptVariables(assistant.prompt, model.name)
  }
+
  logger.debug('params', params)
+
  return {
    params,
    modelId: model.id,
--- a/src/renderer/src/aiCore/provider/tests/providerConfig.test.ts
+++ b/src/renderer/src/aiCore/provider/tests/providerConfig.test.ts
@@ -21,10 +21,45 @@ vi.mock('@renderer/store', () => ({
  }
 }))

+vi.mock('@renderer/utils/api', () => ({
+  formatApiHost: vi.fn((host, isSupportedAPIVersion = true) => {
+    if (isSupportedAPIVersion === false) {
+      return host // Return host as-is when isSupportedAPIVersion is false
+    }
+    return `${host}/v1` // Default behavior when isSupportedAPIVersion is true
+  }),
+  routeToEndpoint: vi.fn((host) => ({
+    baseURL: host,
+    endpoint: '/chat/completions'
+  }))
+}))
+
+vi.mock('@renderer/config/providers', async (importOriginal) => {
+  const actual = (await importOriginal()) as any
+  return {
+    ...actual,
+    isCherryAIProvider: vi.fn(),
+    isPerplexityProvider: vi.fn(),
+    isAnthropicProvider: vi.fn(() => false),
+    isAzureOpenAIProvider: vi.fn(() => false),
+    isGeminiProvider: vi.fn(() => false),
+    isNewApiProvider: vi.fn(() => false)
+  }
+})
+
+vi.mock('@renderer/hooks/useVertexAI', () => ({
+  isVertexProvider: vi.fn(() => false),
+  isVertexAIConfigured: vi.fn(() => false),
+  createVertexProvider: vi.fn()
+}))
+
+import { isCherryAIProvider, isPerplexityProvider } from '@renderer/config/providers'
+import { getProviderByModel } from '@renderer/services/AssistantService'
 import type { Model, Provider } from '@renderer/types'
+import { formatApiHost } from '@renderer/utils/api'

 import { COPILOT_DEFAULT_HEADERS, COPILOT_EDITOR_VERSION, isCopilotResponsesModel } from '../constants'
-import { providerToAiSdkConfig } from '../providerConfig'
+import { getActualProvider, providerToAiSdkConfig } from '../providerConfig'

 const createWindowKeyv = () => {
  const store = new Map<string, string>()
@@ -46,11 +81,31 @@ const createCopilotProvider = (): Provider => ({
  isSystem: true
 })

-const createModel = (id: string, name = id): Model => ({
+const createModel = (id: string, name = id, provider = 'copilot'): Model => ({
  id,
  name,
-  provider: 'copilot',
-  group: 'copilot'
+  provider,
+  group: provider
+})
+
+const createCherryAIProvider = (): Provider => ({
+  id: 'cherryai',
+  type: 'openai',
+  name: 'CherryAI',
+  apiKey: 'test-key',
+  apiHost: 'https://api.cherryai.com',
+  models: [],
+  isSystem: false
+})
+
+const createPerplexityProvider = (): Provider => ({
+  id: 'perplexity',
+  type: 'openai',
+  name: 'Perplexity',
+  apiKey: 'test-key',
+  apiHost: 'https://api.perplexity.ai',
+  models: [],
+  isSystem: false
 })

 describe('Copilot responses routing', () => {
@@ -87,3 +142,134 @@ describe('Copilot responses routing', () => {
    expect(config.options.headers?.['Copilot-Integration-Id']).toBe(COPILOT_DEFAULT_HEADERS['Copilot-Integration-Id'])
  })
 })
+
+describe('CherryAI provider configuration', () => {
+  beforeEach(() => {
+    ;(globalThis as any).window = {
+      ...(globalThis as any).window,
+      keyv: createWindowKeyv()
+    }
+    vi.clearAllMocks()
+  })
+
+  it('formats CherryAI provider apiHost with false parameter', () => {
+    const provider = createCherryAIProvider()
+    const model = createModel('gpt-4', 'GPT-4', 'cherryai')
+
+    // Mock the functions to simulate CherryAI provider detection
+    vi.mocked(isCherryAIProvider).mockReturnValue(true)
+    vi.mocked(getProviderByModel).mockReturnValue(provider)
+
+    // Call getActualProvider which should trigger formatProviderApiHost
+    const actualProvider = getActualProvider(model)
+
+    // Verify that formatApiHost was called with false as the second parameter
+    expect(formatApiHost).toHaveBeenCalledWith('https://api.cherryai.com', false)
+    expect(actualProvider.apiHost).toBe('https://api.cherryai.com')
+  })
+
+  it('does not format non-CherryAI provider with false parameter', () => {
+    const provider = {
+      id: 'openai',
+      type: 'openai',
+      name: 'OpenAI',
+      apiKey: 'test-key',
+      apiHost: 'https://api.openai.com',
+      models: [],
+      isSystem: false
+    } as Provider
+    const model = createModel('gpt-4', 'GPT-4', 'openai')
+
+    // Mock the functions to simulate non-CherryAI provider
+    vi.mocked(isCherryAIProvider).mockReturnValue(false)
+    vi.mocked(getProviderByModel).mockReturnValue(provider)
+
+    // Call getActualProvider
+    const actualProvider = getActualProvider(model)
+
+    // Verify that formatApiHost was called with default parameters (true)
+    expect(formatApiHost).toHaveBeenCalledWith('https://api.openai.com')
+    expect(actualProvider.apiHost).toBe('https://api.openai.com/v1')
+  })
+
+  it('handles CherryAI provider with empty apiHost', () => {
+    const provider = createCherryAIProvider()
+    provider.apiHost = ''
+    const model = createModel('gpt-4', 'GPT-4', 'cherryai')
+
+    vi.mocked(isCherryAIProvider).mockReturnValue(true)
+    vi.mocked(getProviderByModel).mockReturnValue(provider)
+
+    const actualProvider = getActualProvider(model)
+
+    expect(formatApiHost).toHaveBeenCalledWith('', false)
+    expect(actualProvider.apiHost).toBe('')
+  })
+})
+
+describe('Perplexity provider configuration', () => {
+  beforeEach(() => {
+    ;(globalThis as any).window = {
+      ...(globalThis as any).window,
+      keyv: createWindowKeyv()
+    }
+    vi.clearAllMocks()
+  })
+
+  it('formats Perplexity provider apiHost with false parameter', () => {
+    const provider = createPerplexityProvider()
+    const model = createModel('sonar', 'Sonar', 'perplexity')
+
+    // Mock the functions to simulate Perplexity provider detection
+    vi.mocked(isCherryAIProvider).mockReturnValue(false)
+    vi.mocked(isPerplexityProvider).mockReturnValue(true)
+    vi.mocked(getProviderByModel).mockReturnValue(provider)
+
+    // Call getActualProvider which should trigger formatProviderApiHost
+    const actualProvider = getActualProvider(model)
+
+    // Verify that formatApiHost was called with false as the second parameter
+    expect(formatApiHost).toHaveBeenCalledWith('https://api.perplexity.ai', false)
+    expect(actualProvider.apiHost).toBe('https://api.perplexity.ai')
+  })
+
+  it('does not format non-Perplexity provider with false parameter', () => {
+    const provider = {
+      id: 'openai',
+      type: 'openai',
+      name: 'OpenAI',
+      apiKey: 'test-key',
+      apiHost: 'https://api.openai.com',
+      models: [],
+      isSystem: false
+    } as Provider
+    const model = createModel('gpt-4', 'GPT-4', 'openai')
+
+    // Mock the functions to simulate non-Perplexity provider
+    vi.mocked(isCherryAIProvider).mockReturnValue(false)
+    vi.mocked(isPerplexityProvider).mockReturnValue(false)
+    vi.mocked(getProviderByModel).mockReturnValue(provider)
+
+    // Call getActualProvider
+    const actualProvider = getActualProvider(model)
+
+    // Verify that formatApiHost was called with default parameters (true)
+    expect(formatApiHost).toHaveBeenCalledWith('https://api.openai.com')
+    expect(actualProvider.apiHost).toBe('https://api.openai.com/v1')
+  })
+
+  it('handles Perplexity provider with empty apiHost', () => {
+    const provider = createPerplexityProvider()
+    provider.apiHost = ''
+    const model = createModel('sonar', 'Sonar', 'perplexity')
+
+    vi.mocked(isCherryAIProvider).mockReturnValue(false)
+    vi.mocked(isPerplexityProvider).mockReturnValue(true)
+    vi.mocked(getProviderByModel).mockReturnValue(provider)
+
+    const actualProvider = getActualProvider(model)
+
+    expect(formatApiHost).toHaveBeenCalledWith('', false)
+    expect(actualProvider.apiHost).toBe('')
+  })
+})
--- a/src/renderer/src/aiCore/provider/providerConfig.ts
+++ b/src/renderer/src/aiCore/provider/providerConfig.ts
@@ -9,11 +9,15 @@ import { isOpenAIChatCompletionOnlyModel } from '@renderer/config/models'
 import {
  isAnthropicProvider,
  isAzureOpenAIProvider,
+  isCherryAIProvider,
  isGeminiProvider,
-  isNewApiProvider
+  isNewApiProvider,
+  isPerplexityProvider
 } from '@renderer/config/providers'
 import {
  getAwsBedrockAccessKeyId,
+  getAwsBedrockApiKey,
+  getAwsBedrockAuthType,
  getAwsBedrockRegion,
  getAwsBedrockSecretAccessKey
 } from '@renderer/hooks/useAwsBedrock'
@@ -98,6 +102,10 @@ function formatProviderApiHost(provider: Provider): Provider {
    formatted.apiHost = formatAzureOpenAIApiHost(formatted.apiHost)
  } else if (isVertexProvider(formatted)) {
    formatted.apiHost = formatVertexApiHost(formatted)
+  } else if (isCherryAIProvider(formatted)) {
+    formatted.apiHost = formatApiHost(formatted.apiHost, false)
+  } else if (isPerplexityProvider(formatted)) {
+    formatted.apiHost = formatApiHost(formatted.apiHost, false)
  } else {
    formatted.apiHost = formatApiHost(formatted.apiHost)
  }
@@ -192,9 +200,15 @@ export function providerToAiSdkConfig(

  // bedrock
  if (aiSdkProviderId === 'bedrock') {
+    const authType = getAwsBedrockAuthType()
    extraOptions.region = getAwsBedrockRegion()
-    extraOptions.accessKeyId = getAwsBedrockAccessKeyId()
-    extraOptions.secretAccessKey = getAwsBedrockSecretAccessKey()
+
+    if (authType === 'apiKey') {
+      extraOptions.apiKey = getAwsBedrockApiKey()
+    } else {
+      extraOptions.accessKeyId = getAwsBedrockAccessKeyId()
+      extraOptions.secretAccessKey = getAwsBedrockSecretAccessKey()
+    }
  }
  // google-vertex
  if (aiSdkProviderId === 'google-vertex' || aiSdkProviderId === 'google-vertex-anthropic') {
--- a/src/renderer/src/aiCore/utils/options.ts
+++ b/src/renderer/src/aiCore/utils/options.ts
@@ -17,6 +17,7 @@ import { getAiSdkProviderId } from '../provider/factory'
 import { buildGeminiGenerateImageParams } from './image'
 import {
  getAnthropicReasoningParams,
+  getBedrockReasoningParams,
  getCustomParameters,
  getGeminiReasoningParams,
  getOpenAIReasoningParams,
@@ -127,6 +128,9 @@ export function buildProviderOptions(
        case 'google-vertex-anthropic':
          providerSpecificOptions = buildAnthropicProviderOptions(assistant, model, capabilities)
          break
+        case 'bedrock':
+          providerSpecificOptions = buildBedrockProviderOptions(assistant, model, capabilities)
+          break
        default:
          // 对于其他 provider，使用通用的构建逻辑
          providerSpecificOptions = {
@@ -266,6 +270,32 @@ function buildXAIProviderOptions(
  return providerOptions
 }

+/**
+ * Build Bedrock providerOptions
+ */
+function buildBedrockProviderOptions(
+  assistant: Assistant,
+  model: Model,
+  capabilities: {
+    enableReasoning: boolean
+    enableWebSearch: boolean
+    enableGenerateImage: boolean
+  }
+): Record<string, any> {
+  const { enableReasoning } = capabilities
+  let providerOptions: Record<string, any> = {}
+
+  if (enableReasoning) {
+    const reasoningParams = getBedrockReasoningParams(assistant, model)
+    providerOptions = {
+      ...providerOptions,
+      ...reasoningParams
+    }
+  }
+
+  return providerOptions
+}
+
 /**
 * 构建通用的 providerOptions（用于其他 provider）
 */
--- a/src/renderer/src/aiCore/utils/reasoning.ts
+++ b/src/renderer/src/aiCore/utils/reasoning.ts
@@ -418,6 +418,8 @@ export function getAnthropicReasoningParams(assistant: Assistant, model: Model):
 /**
 * 获取 Gemini 推理参数
 * 从 GeminiAPIClient 中提取的逻辑
+ * 注意：Gemini/GCP 端点所使用的 thinkingBudget 等参数应该按照驼峰命名法传递
+ * 而在 Google 官方提供的 OpenAI 兼容端点中则使用蛇形命名法 thinking_budget
 */
 export function getGeminiReasoningParams(assistant: Assistant, model: Model): Record<string, any> {
  if (!isReasoningModel(model)) {
@@ -431,8 +433,8 @@ export function getGeminiReasoningParams(assistant: Assistant, model: Model): Re
    if (reasoningEffort === undefined) {
      return {
        thinkingConfig: {
-          include_thoughts: false,
-          ...(GEMINI_FLASH_MODEL_REGEX.test(model.id) ? { thinking_budget: 0 } : {})
+          includeThoughts: false,
+          ...(GEMINI_FLASH_MODEL_REGEX.test(model.id) ? { thinkingBudget: 0 } : {})
        }
      }
    }
@@ -442,7 +444,7 @@ export function getGeminiReasoningParams(assistant: Assistant, model: Model): Re
    if (effortRatio > 1) {
      return {
        thinkingConfig: {
-          include_thoughts: true
+          includeThoughts: true
        }
      }
    }
@@ -452,8 +454,8 @@ export function getGeminiReasoningParams(assistant: Assistant, model: Model): Re

    return {
      thinkingConfig: {
-        ...(budget > 0 ? { thinking_budget: budget } : {}),
-        include_thoughts: true
+        ...(budget > 0 ? { thinkingBudget: budget } : {}),
+        includeThoughts: true
      }
    }
  }
@@ -485,6 +487,34 @@ export function getXAIReasoningParams(assistant: Assistant, model: Model): Recor
  }
 }

+/**
+ * Get Bedrock reasoning parameters
+ */
+export function getBedrockReasoningParams(assistant: Assistant, model: Model): Record<string, any> {
+  if (!isReasoningModel(model)) {
+    return {}
+  }
+
+  const reasoningEffort = assistant?.settings?.reasoning_effort
+
+  if (reasoningEffort === undefined) {
+    return {}
+  }
+
+  // Only apply thinking budget for Claude reasoning models
+  if (!isSupportedThinkingTokenClaudeModel(model)) {
+    return {}
+  }
+
+  const budgetTokens = getAnthropicThinkingBudget(assistant, model)
+  return {
+    reasoningConfig: {
+      type: 'enabled',
+      budgetTokens: budgetTokens
+    }
+  }
+}
+
 /**
 * 获取自定义参数
 * 从 assistant 设置中提取自定义参数
--- a/src/renderer/src/assets/images/providers/mcprouter.webp
+++ b/src/renderer/src/assets/images/providers/mcprouter.webp
--- a/src/renderer/src/assets/images/providers/sophnet.svg
+++ b/src/renderer/src/assets/images/providers/sophnet.svg
@@ -0,0 +1,13 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="33" height="38" viewBox="0 0 33 38" fill="none">
+<g clip-path="url(#clip0_4321_9943)">
+<path d="M1.51221 6.59813C1.51221 4.09263 3.54331 2.06152 6.04881 2.06152H27.9757C30.4812 2.06152 32.5123 4.09263 32.5123 6.59813C32.5123 9.10362 30.4812 11.1347 27.9757 11.1347H6.04881C3.54331 11.1347 1.51221 9.10362 1.51221 6.59813Z" fill="#6200EE"/>
+<path d="M3.38905 3.56467C5.26076 1.89906 8.12831 2.06615 9.79391 3.93785L22.1493 17.8221C23.8149 19.6938 23.6478 22.5614 21.7761 24.227C19.9044 25.8926 17.0369 25.7255 15.3713 23.8538L3.01586 9.96953C1.35026 8.09782 1.51734 5.23027 3.38905 3.56467Z" fill="#6200EE"/>
+<path d="M1.51221 20.9643C1.51221 18.4588 3.54331 16.4277 6.04881 16.4277H18.9025C21.408 16.4277 23.4391 18.4588 23.4391 20.9643C23.4391 23.4698 21.408 25.5009 18.9025 25.5009H6.04881C3.54331 25.5009 1.51221 23.4698 1.51221 20.9643Z" fill="#6200EE"/>
+<path d="M10.5854 32.3052C10.5854 34.8107 8.55431 36.8418 6.04881 36.8418C3.54331 36.8418 1.51221 34.8107 1.51221 32.3052C1.51221 29.7997 3.54331 27.7686 6.04881 27.7686C8.55431 27.7686 10.5854 29.7997 10.5854 32.3052Z" fill="#BF7AFF"/>
+</g>
+<defs>
+<clipPath id="clip0_4321_9943">
+<rect width="32.5124" height="36.9029" fill="white" transform="translate(0 0.548828)"/>
+</clipPath>
+</defs>
+</svg>
--- a/src/renderer/src/assets/styles/index.css
+++ b/src/renderer/src/assets/styles/index.css
@@ -41,11 +41,11 @@ body,
  margin: 0;
 }

-/* #root {
+#root {
  display: flex;
  flex-direction: row;
  flex: 1;
-} */
+}

 body {
  display: flex;
--- a/src/renderer/src/assets/styles/tailwind.css
+++ b/src/renderer/src/assets/styles/tailwind.css
@@ -1,10 +1,6 @@
@import 'tailwindcss' source('../../../../renderer');
@import 'tw-animate-css';

-/* heroui */
-@plugin '../../hero.ts';
-@source '../../../../../node_modules/@heroui/theme/dist/**/*.{js,ts,jsx,tsx}';
-
@custom-variant dark (&:is(.dark *));

 /* 如需自定义:
@@ -156,11 +152,6 @@
  body {
    @apply bg-background text-foreground;
  }
-
-  /* To disable drag title bar on toast. tailwind css doesn't provide such class name. */
-  .hero-toast {
-    -webkit-app-region: no-drag;
-  }
 }

 :root {
--- a/src/renderer/src/components/ApiModelLabel.tsx
+++ b/src/renderer/src/components/ApiModelLabel.tsx
@@ -1,31 +0,0 @@
-import { Avatar, cn } from '@heroui/react'
-import { getModelLogoById } from '@renderer/config/models'
-import type { ApiModel } from '@renderer/types'
-import React from 'react'
-
-import Ellipsis from './Ellipsis'
-
-export interface ModelLabelProps extends Omit<React.ComponentPropsWithRef<'div'>, 'children'> {
-  model?: ApiModel
-  classNames?: {
-    container?: string
-    avatar?: string
-    modelName?: string
-    divider?: string
-    providerName?: string
-  }
-}
-
-export const ApiModelLabel: React.FC<ModelLabelProps> = ({ model, className, classNames, ...props }) => {
-  return (
-    <div className={cn('flex items-center gap-1', className, classNames?.container)} {...props}>
-      <Avatar
-        src={model ? (getModelLogoById(model.id) ?? getModelLogoById(model.name)) : undefined}
-        className={cn('h-4 w-4', classNames?.avatar)}
-      />
-      <Ellipsis className={classNames?.modelName}>{model?.name}</Ellipsis>
-      <span className={classNames?.divider}> | </span>
-      <Ellipsis className={classNames?.providerName}>{model?.provider_name}</Ellipsis>
-    </div>
-  )
-}
--- a/src/renderer/src/components/Avatar/EmojiAvatarWithPicker.tsx
+++ b/src/renderer/src/components/Avatar/EmojiAvatarWithPicker.tsx
@@ -1,4 +1,4 @@
-import { Button, Popover, PopoverContent, PopoverTrigger } from '@heroui/react'
+import { Button, Popover } from 'antd'
 import React from 'react'

 import EmojiPicker from '../EmojiPicker'
@@ -10,13 +10,10 @@ type Props = {

 export const EmojiAvatarWithPicker: React.FC<Props> = ({ emoji, onPick }) => {
  return (
-    <Popover>
-      <PopoverTrigger>
-        <Button size="sm" startContent={<span className="text-lg">{emoji}</span>} isIconOnly />
-      </PopoverTrigger>
-      <PopoverContent>
-        <EmojiPicker onEmojiClick={onPick}></EmojiPicker>
-      </PopoverContent>
+    <Popover content={<EmojiPicker onEmojiClick={onPick} />} trigger="click">
+      <Button type="text" style={{ width: 32, height: 32, fontSize: 18 }}>
+        {emoji}
+      </Button>
    </Popover>
  )
 }
--- a/src/renderer/src/components/Buttons/ActionIconButton.tsx
+++ b/src/renderer/src/components/Buttons/ActionIconButton.tsx
@@ -1,4 +1,4 @@
-import { cn } from '@heroui/react'
+import { cn } from '@renderer/utils'
 import type { ButtonProps } from 'antd'
 import { Button } from 'antd'
 import React, { memo } from 'react'
--- a/src/renderer/src/components/ConfirmDialog.tsx
+++ b/src/renderer/src/components/ConfirmDialog.tsx
@@ -1,5 +1,5 @@
-import { Button } from '@heroui/react'
-import { CheckIcon, XIcon } from 'lucide-react'
+import { CheckOutlined, CloseOutlined } from '@ant-design/icons'
+import { Button } from 'antd'
 import type { FC } from 'react'
 import { createPortal } from 'react-dom'

@@ -28,12 +28,22 @@ const ConfirmDialog: FC<Props> = ({ x, y, message, onConfirm, onCancel }) => {
        <div className="flex min-w-[160px] items-center rounded-lg border border-[var(--color-border)] bg-[var(--color-background)] p-3 shadow-[0_4px_12px_rgba(0,0,0,0.15)]">
          <div className="mr-2 text-sm leading-[1.4]">{message}</div>
          <div className="flex justify-center gap-2">
-            <Button onPress={onCancel} radius="full" className="h-6 w-6 min-w-0 p-1" color="danger">
-              <XIcon className="text-danger-foreground" size={16} />
-            </Button>
-            <Button onPress={onConfirm} radius="full" className="h-6 w-6 min-w-0 p-1" color="success">
-              <CheckIcon className="text-success-foreground" size={16} />
-            </Button>
+            <Button
+              onClick={onCancel}
+              shape="circle"
+              size="small"
+              danger
+              icon={<CloseOutlined />}
+              style={{ width: 24, height: 24, minWidth: 24 }}
+            />
+            <Button
+              onClick={onConfirm}
+              shape="circle"
+              size="small"
+              type="primary"
+              icon={<CheckOutlined />}
+              style={{ width: 24, height: 24, minWidth: 24, backgroundColor: '#52c41a' }}
+            />
          </div>
        </div>
      </div>
--- a/src/renderer/src/components/ErrorBoundary.tsx
+++ b/src/renderer/src/components/ErrorBoundary.tsx
@@ -1,5 +1,5 @@
-import { Button } from '@heroui/button'
 import { formatErrorMessage } from '@renderer/utils/error'
+import { Button } from 'antd'
 import { Alert, Space } from 'antd'
 import type { ComponentType, ReactNode } from 'react'
 import type { FallbackProps } from 'react-error-boundary'
@@ -24,10 +24,10 @@ const DefaultFallback: ComponentType<FallbackProps> = (props: FallbackProps): Re
        type="error"
        action={
          <Space>
-            <Button size="sm" onPress={debug}>
+            <Button size="small" onClick={debug}>
              {t('error.boundary.default.devtools')}
            </Button>
-            <Button size="sm" onPress={reload}>
+            <Button size="small" onClick={reload}>
              {t('error.boundary.default.reload')}
            </Button>
          </Space>
--- a/src/renderer/src/components/HorizontalScrollContainer/index.tsx
+++ b/src/renderer/src/components/HorizontalScrollContainer/index.tsx
@@ -1,5 +1,5 @@
-import { cn } from '@heroui/react'
 import Scrollbar from '@renderer/components/Scrollbar'
+import { cn } from '@renderer/utils'
 import { ChevronRight } from 'lucide-react'
 import { useEffect, useRef, useState } from 'react'
 import styled from 'styled-components'
--- a/src/renderer/src/components/MinApp/WebviewContainer.tsx
+++ b/src/renderer/src/components/MinApp/WebviewContainer.tsx
@@ -106,51 +106,6 @@ 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
--- a/src/renderer/src/components/Popups/AddAssistantOrAgentPopup.tsx
+++ b/src/renderer/src/components/Popups/AddAssistantOrAgentPopup.tsx
@@ -1,5 +1,5 @@
-import { cn } from '@heroui/react'
 import { TopView } from '@renderer/components/TopView'
+import { cn } from '@renderer/utils'
 import { Modal } from 'antd'
 import { Bot, MessageSquare } from 'lucide-react'
 import { useState } from 'react'
@@ -51,7 +51,7 @@ const PopupContainer: React.FC<Props> = ({ onSelect, resolve }) => {
        <button
          type="button"
          onClick={() => handleSelect('assistant')}
-          className="group flex flex-col items-center gap-3 rounded-lg bg-[var(--color-background-soft)] p-6 transition-all hover:bg-[var(--color-hover)]"
+          className="group flex cursor-pointer flex-col items-center gap-3 rounded-lg bg-[var(--color-background-soft)] p-6 transition-all hover:bg-[var(--color-hover)]"
          onMouseEnter={() => setHoveredOption('assistant')}
          onMouseLeave={() => setHoveredOption(null)}>
          <div className="flex h-12 w-12 items-center justify-center rounded-full bg-[var(--color-list-item)] transition-colors">
@@ -73,7 +73,7 @@ const PopupContainer: React.FC<Props> = ({ onSelect, resolve }) => {
        <button
          onClick={() => handleSelect('agent')}
          type="button"
-          className="group flex flex-col items-center gap-3 rounded-lg bg-[var(--color-background-soft)] p-6 transition-all hover:bg-[var(--color-hover)]"
+          className="group flex cursor-pointer flex-col items-center gap-3 rounded-lg bg-[var(--color-background-soft)] p-6 transition-all hover:bg-[var(--color-hover)]"
          onMouseEnter={() => setHoveredOption('agent')}
          onMouseLeave={() => setHoveredOption(null)}>
          <div className="flex h-12 w-12 items-center justify-center rounded-full bg-[var(--color-list-item)] transition-colors">
--- a/src/renderer/src/components/Popups/ExportToPhoneLanPopup.tsx
+++ b/src/renderer/src/components/Popups/ExportToPhoneLanPopup.tsx
@@ -1,11 +1,8 @@
-import { Button } from '@heroui/button'
-import { Modal, ModalBody, ModalContent, ModalFooter, ModalHeader } from '@heroui/modal'
-import { Progress } from '@heroui/progress'
-import { Spinner } from '@heroui/spinner'
 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'
@@ -25,7 +22,7 @@ const LoadingQRCode: React.FC = () => {
  const { t } = useTranslation()
  return (
    <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', gap: '12px' }}>
-      <Spinner />
+      <Spin />
      <span style={{ fontSize: '14px', color: 'var(--color-text-2)' }}>
        {t('settings.data.export_to_phone.lan.generating_qr')}
      </span>
@@ -44,8 +41,8 @@ const ScanQRCode: React.FC<{ qrCodeValue: string }> = ({ qrCodeValue }) => {
        size={200}
        imageSettings={{
          src: AppLogo,
-          width: 60,
-          height: 60,
+          width: 40,
+          height: 40,
          excavate: true
        }}
      />
@@ -72,7 +69,7 @@ const ConnectingAnimation: React.FC = () => {
          borderRadius: '12px',
          backgroundColor: 'var(--color-status-warning)'
        }}>
-        <Spinner size="lg" color="warning" />
+        <Spin size="large" />
        <span style={{ fontSize: '14px', color: 'var(--color-text)', marginTop: '12px' }}>
          {t('settings.data.export_to_phone.lan.status.connecting')}
        </span>
@@ -137,7 +134,6 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
  const [selectedFolderPath, setSelectedFolderPath] = useState<string | null>(null)
  const [sendProgress, setSendProgress] = useState(0)
  const [error, setError] = useState<string | null>(null)
-  const [showCloseConfirm, setShowCloseConfirm] = useState(false)
  const [autoCloseCountdown, setAutoCloseCountdown] = useState<number | null>(null)

  const { t } = useTranslation()
@@ -299,22 +295,20 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
  // 尝试关闭弹窗 - 如果正在传输则显示确认
  const handleCancel = useCallback(() => {
    if (isSending) {
-      setShowCloseConfirm(true)
+      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])
-
-  // 确认强制关闭
-  const handleForceClose = useCallback(() => {
-    logger.info('Force closing popup during transfer')
-    setIsOpen(false)
-  }, [])
-
-  // 取消关闭确认
-  const handleCancelClose = useCallback(() => {
-    setShowCloseConfirm(false)
-  }, [])
+  }, [isSending, t])

  // 清理并关闭
  const handleClose = useCallback(async () => {
@@ -376,11 +370,13 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
        style={{
          display: 'flex',
          alignItems: 'center',
+          justifyContent: 'center',
          gap: '8px',
-          padding: '8px 12px',
-          borderRadius: '8px',
+          padding: '5px 12px',
+          width: '100%',
          backgroundColor: connectionStatusStyles.bg,
-          border: `1px solid ${connectionStatusStyles.border}`
+          border: `1px solid ${connectionStatusStyles.border}`,
+          marginBottom: 10
        }}>
        <span style={{ fontSize: '14px', fontWeight: '500', color: 'var(--color-text)' }}>{connectionStatusText}</span>
      </div>
@@ -412,7 +408,7 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
    if (!isSending && transferPhase !== 'completed') return null

    return (
-      <div style={{ paddingTop: '8px' }}>
+      <div style={{ paddingTop: '20px' }}>
        <div
          style={{
            display: 'flex',
@@ -441,11 +437,9 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {
          </div>

          <Progress
-            value={Math.round(sendProgress)}
-            size="md"
-            color={transferPhase === 'completed' ? 'success' : 'primary'}
-            showValueLabel={false}
-            aria-label="Send progress"
+            percent={Math.round(sendProgress)}
+            status={transferPhase === 'completed' ? 'success' : 'active'}
+            showInfo={false}
          />
        </div>
      </div>
@@ -488,95 +482,50 @@ const PopupContainer: React.FC<Props> = ({ resolve }) => {

  return (
    <Modal
-      isOpen={isOpen}
-      onOpenChange={(open) => {
-        if (!open) {
-          handleCancel()
-        }
-      }}
-      isDismissable={false}
-      isKeyboardDismissDisabled={false}
-      placement="center"
-      onClose={handleClose}>
-      <ModalContent>
-        {() => (
-          <>
-            <ModalHeader>{t('settings.data.export_to_phone.lan.title')}</ModalHeader>
-            <ModalBody>
-              <SettingRow>
-                <StatusIndicator />
-              </SettingRow>
+      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>

-              <SettingRow>
-                <div>{t('settings.data.export_to_phone.lan.content')}</div>
-              </SettingRow>
+      <Alert message={t('settings.data.export_to_phone.lan.content')} type="info" style={{ borderRadius: 0 }} />

-              <SettingRow style={{ display: 'flex', justifyContent: 'center', minHeight: '180px' }}>
-                <QRCodeDisplay />
-              </SettingRow>
+      <SettingRow style={{ display: 'flex', justifyContent: 'center', minHeight: '180px', marginBlock: 25 }}>
+        <QRCodeDisplay />
+      </SettingRow>

-              <SettingRow style={{ display: 'flex', alignItems: 'center' }}>
-                <div style={{ display: 'flex', gap: 10, justifyContent: 'center', width: '100%' }}>
-                  <Button color="default" variant="flat" onPress={handleSelectZip} isDisabled={isSending}>
-                    {t('settings.data.export_to_phone.lan.selectZip')}
-                  </Button>
-                  <Button color="primary" onPress={handleSendZip} isDisabled={!canSend} isLoading={isSending}>
-                    {transferStatusText || t('settings.data.export_to_phone.lan.sendZip')}
-                  </Button>
-                </div>
-              </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>
+      <SettingHelpText
+        style={{
+          overflow: 'hidden',
+          textOverflow: 'ellipsis',
+          whiteSpace: 'nowrap',
+          textAlign: 'center'
+        }}>
+        {selectedFolderPath || t('settings.data.export_to_phone.lan.noZipSelected')}
+      </SettingHelpText>

-              <TransferProgress />
-              <AutoCloseCountdown />
-              <ErrorDisplay />
-            </ModalBody>
-
-            {showCloseConfirm && (
-              <ModalFooter>
-                <div
-                  style={{
-                    display: 'flex',
-                    flexDirection: 'column',
-                    width: '100%',
-                    gap: '12px',
-                    padding: '8px',
-                    borderRadius: '8px',
-                    backgroundColor: 'var(--color-status-warning)',
-                    border: '1px solid var(--color-status-warning)'
-                  }}>
-                  <div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
-                    <span style={{ fontSize: '20px' }}>⚠️</span>
-                    <span style={{ fontSize: '14px', color: 'var(--color-text)', fontWeight: '500' }}>
-                      {t('settings.data.export_to_phone.lan.confirm_close_title')}
-                    </span>
-                  </div>
-                  <span style={{ fontSize: '13px', color: 'var(--color-text-2)', marginLeft: '28px' }}>
-                    {t('settings.data.export_to_phone.lan.confirm_close_message')}
-                  </span>
-                  <div style={{ display: 'flex', justifyContent: 'flex-end', gap: '8px', marginTop: '4px' }}>
-                    <Button size="sm" color="default" variant="flat" onPress={handleCancelClose}>
-                      {t('common.cancel')}
-                    </Button>
-                    <Button size="sm" color="danger" onPress={handleForceClose}>
-                      {t('settings.data.export_to_phone.lan.force_close')}
-                    </Button>
-                  </div>
-                </div>
-              </ModalFooter>
-            )}
-          </>
-        )}
-      </ModalContent>
+      <TransferProgress />
+      <AutoCloseCountdown />
+      <ErrorDisplay />
    </Modal>
  )
 }
--- a/src/renderer/src/components/Popups/UpdateDialogPopup.tsx
+++ b/src/renderer/src/components/Popups/UpdateDialogPopup.tsx
@@ -0,0 +1,205 @@
+import { loggerService } from '@logger'
+import { TopView } from '@renderer/components/TopView'
+import { handleSaveData } from '@renderer/store'
+import { Button, Modal } from 'antd'
+import type { ReleaseNoteInfo, UpdateInfo } from 'builder-util-runtime'
+import { useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import Markdown from 'react-markdown'
+import styled from 'styled-components'
+
+const logger = loggerService.withContext('UpdateDialog')
+
+interface ShowParams {
+  releaseInfo: UpdateInfo | null
+}
+
+interface Props extends ShowParams {
+  resolve: (data: any) => void
+}
+
+const PopupContainer: React.FC<Props> = ({ releaseInfo, resolve }) => {
+  const { t } = useTranslation()
+  const [open, setOpen] = useState(true)
+  const [isInstalling, setIsInstalling] = useState(false)
+
+  useEffect(() => {
+    if (releaseInfo) {
+      logger.info('Update dialog opened', { version: releaseInfo.version })
+    }
+  }, [releaseInfo])
+
+  const handleInstall = async () => {
+    setIsInstalling(true)
+    try {
+      await handleSaveData()
+      await window.api.quitAndInstall()
+      setOpen(false)
+    } catch (error) {
+      logger.error('Failed to save data before update', error as Error)
+      setIsInstalling(false)
+      window.toast.error(t('update.saveDataError'))
+    }
+  }
+
+  const onCancel = () => {
+    setOpen(false)
+  }
+
+  const onClose = () => {
+    resolve({})
+  }
+
+  UpdateDialogPopup.hide = onCancel
+
+  const releaseNotes = releaseInfo?.releaseNotes
+
+  return (
+    <Modal
+      title={
+        <ModalHeaderWrapper>
+          <h3>{t('update.title')}</h3>
+          <p>{t('update.message').replace('{{version}}', releaseInfo?.version || '')}</p>
+        </ModalHeaderWrapper>
+      }
+      open={open}
+      onCancel={onCancel}
+      afterClose={onClose}
+      transitionName="animation-move-down"
+      centered
+      width={720}
+      footer={[
+        <Button key="later" onClick={onCancel} disabled={isInstalling}>
+          {t('update.later')}
+        </Button>,
+        <Button key="install" type="primary" onClick={handleInstall} loading={isInstalling}>
+          {t('update.install')}
+        </Button>
+      ]}>
+      <ModalBodyWrapper>
+        <ReleaseNotesWrapper className="markdown">
+          <Markdown>
+            {typeof releaseNotes === 'string'
+              ? releaseNotes
+              : Array.isArray(releaseNotes)
+                ? releaseNotes
+                    .map((note: ReleaseNoteInfo) => note.note)
+                    .filter(Boolean)
+                    .join('\n\n')
+                : t('update.noReleaseNotes')}
+          </Markdown>
+        </ReleaseNotesWrapper>
+      </ModalBodyWrapper>
+    </Modal>
+  )
+}
+
+const TopViewKey = 'UpdateDialogPopup'
+
+export default class UpdateDialogPopup {
+  static topviewId = 0
+  static hide() {
+    TopView.hide(TopViewKey)
+  }
+  static show(props: ShowParams) {
+    return new Promise<any>((resolve) => {
+      TopView.show(
+        <PopupContainer
+          {...props}
+          resolve={(v) => {
+            resolve(v)
+            TopView.hide(TopViewKey)
+          }}
+        />,
+        TopViewKey
+      )
+    })
+  }
+}
+
+const ModalHeaderWrapper = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+
+  h3 {
+    margin: 0;
+    font-size: 16px;
+    font-weight: 600;
+    color: var(--color-text-1);
+  }
+
+  p {
+    margin: 0;
+    font-size: 14px;
+    color: var(--color-text-2);
+  }
+`
+
+const ModalBodyWrapper = styled.div`
+  max-height: 450px;
+  overflow-y: auto;
+  padding: 12px 0;
+`
+
+const ReleaseNotesWrapper = styled.div`
+  background-color: var(--color-bg-2);
+  border-radius: 8px;
+
+  p {
+    margin: 0 0 12px 0;
+    color: var(--color-text-2);
+    font-size: 14px;
+    line-height: 1.6;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  h1,
+  h2,
+  h3,
+  h4,
+  h5,
+  h6 {
+    margin: 16px 0 8px 0;
+    color: var(--color-text-1);
+    font-weight: 600;
+
+    &:first-child {
+      margin-top: 0;
+    }
+  }
+
+  ul,
+  ol {
+    margin: 8px 0;
+    padding-left: 24px;
+    color: var(--color-text-2);
+  }
+
+  li {
+    margin: 4px 0;
+  }
+
+  code {
+    padding: 2px 6px;
+    background-color: var(--color-bg-3);
+    border-radius: 4px;
+    font-family: 'Consolas', 'Monaco', monospace;
+    font-size: 13px;
+  }
+
+  pre {
+    padding: 12px;
+    background-color: var(--color-bg-3);
+    border-radius: 6px;
+    overflow-x: auto;
+
+    code {
+      padding: 0;
+      background-color: transparent;
+    }
+  }
+`
--- a/src/renderer/src/components/Popups/agent/AgentModal.tsx
+++ b/src/renderer/src/components/Popups/agent/AgentModal.tsx
@@ -1,44 +1,32 @@
-import type { SelectedItemProps } from '@heroui/react'
-import {
-  Button,
-  Form,
-  Input,
-  Modal,
-  ModalBody,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  Select,
-  SelectItem,
-  Textarea,
-  useDisclosure
-} from '@heroui/react'
 import { loggerService } from '@logger'
-import type { Selection } from '@react-types/shared'
 import ClaudeIcon from '@renderer/assets/images/models/claude.png'
+import { ErrorBoundary } from '@renderer/components/ErrorBoundary'
+import { TopView } from '@renderer/components/TopView'
 import { permissionModeCards } from '@renderer/config/agent'
-import { agentModelFilter, getModelLogoById } from '@renderer/config/models'
 import { useAgents } from '@renderer/hooks/agents/useAgents'
-import { useApiModels } from '@renderer/hooks/agents/useModels'
 import { useUpdateAgent } from '@renderer/hooks/agents/useUpdateAgent'
+import SelectAgentBaseModelButton from '@renderer/pages/home/components/SelectAgentBaseModelButton'
 import type {
  AddAgentForm,
  AgentEntity,
  AgentType,
+  ApiModel,
  BaseAgentForm,
  PermissionMode,
  Tool,
  UpdateAgentForm
 } from '@renderer/types'
 import { AgentConfigurationSchema, isAgentType } from '@renderer/types'
+import { Avatar, 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'
 import { useTranslation } from 'react-i18next'
+import styled from 'styled-components'

-import { ErrorBoundary } from '../../ErrorBoundary'
-import type { BaseOption, ModelOption } from './shared'
-import { Option, renderOption } from './shared'
+import type { BaseOption } from './shared'
+
+const { TextArea } = Input

 const logger = loggerService.withContext('AddAgentPopup')

@@ -48,8 +36,6 @@ interface AgentTypeOption extends BaseOption {
  name: AgentEntity['name']
 }

-type Option = AgentTypeOption | ModelOption
-
 type AgentWithTools = AgentEntity & { tools?: Tool[] }

 const buildAgentForm = (existing?: AgentWithTools): BaseAgentForm => ({
@@ -64,58 +50,37 @@ const buildAgentForm = (existing?: AgentWithTools): BaseAgentForm => ({
  configuration: AgentConfigurationSchema.parse(existing?.configuration ?? {})
 })

-type Props = {
+interface ShowParams {
  agent?: AgentWithTools
-  isOpen: boolean
-  onClose: () => void
  afterSubmit?: (a: AgentEntity) => void
 }

-/**
- * Modal component for creating or editing an agent.
- *
- * Either trigger or isOpen and onClose is given.
- * @param agent - Optional agent entity for editing mode.
- * @param isOpen - Optional controlled modal open state. From useDisclosure.
- * @param onClose - Optional callback when modal closes. From useDisclosure.
- * @returns Modal component for agent creation/editing
- */
-export const AgentModal: React.FC<Props> = ({ agent, isOpen: _isOpen, onClose: _onClose, afterSubmit }) => {
-  const { isOpen, onClose } = useDisclosure({ isOpen: _isOpen, onClose: _onClose })
+interface Props extends ShowParams {
+  resolve: (data: any) => void
+}
+
+const PopupContainer: React.FC<Props> = ({ agent, afterSubmit, resolve }) => {
  const { t } = useTranslation()
+  const [open, setOpen] = useState(true)
  const loadingRef = useRef(false)
-  // const { setTimeoutTimer } = useTimer()
  const { addAgent } = useAgents()
  const { updateAgent } = useUpdateAgent()
-  // hard-coded. We only support anthropic for now.
-  const { models } = useApiModels({ providerType: 'anthropic' })
  const isEditing = (agent?: AgentWithTools) => agent !== undefined

  const [form, setForm] = useState<BaseAgentForm>(() => buildAgentForm(agent))

  useEffect(() => {
-    if (isOpen) {
+    if (open) {
      setForm(buildAgentForm(agent))
    }
-  }, [agent, isOpen])
+  }, [agent, open])

  const selectedPermissionMode = form.configuration?.permission_mode ?? 'default'

-  const onPermissionModeChange = useCallback((keys: Selection) => {
-    if (keys === 'all') {
-      return
-    }
-
-    const [first] = Array.from(keys)
-    if (!first) {
-      return
-    }
-
+  const onPermissionModeChange = useCallback((value: PermissionMode) => {
    setForm((prev) => {
      const parsedConfiguration = AgentConfigurationSchema.parse(prev.configuration ?? {})
-      const nextMode = first as PermissionMode
-
-      if (parsedConfiguration.permission_mode === nextMode) {
+      if (parsedConfiguration.permission_mode === value) {
        if (!prev.configuration) {
          return {
            ...prev,
@@ -129,7 +94,7 @@ export const AgentModal: React.FC<Props> = ({ agent, isOpen: _isOpen, onClose: _
        ...prev,
        configuration: {
          ...parsedConfiguration,
-          permission_mode: nextMode
+          permission_mode: value
        }
      }
    })
@@ -150,55 +115,57 @@ export const AgentModal: React.FC<Props> = ({ agent, isOpen: _isOpen, onClose: _
    []
  )

-  const agentOptions: AgentTypeOption[] = useMemo(
+  const agentOptions = useMemo(
    () =>
-      agentConfig.map(
-        (option) =>
-          ({
-            ...option,
-            rendered: <Option option={option} />
-          }) as const satisfies SelectedItemProps
-      ),
+      agentConfig.map((option) => ({
+        value: option.key,
+        label: (
+          <OptionWrapper>
+            <Avatar src={option.avatar} size={24} />
+            <span>{option.label}</span>
+          </OptionWrapper>
+        )
+      })),
    [agentConfig]
  )

  const onAgentTypeChange = useCallback(
-    (e: ChangeEvent<HTMLSelectElement>) => {
+    (value: AgentType) => {
      const prevConfig = agentConfig.find((config) => config.key === form.type)
      let newName: string | undefined = form.name
      if (prevConfig && prevConfig.name === form.name) {
-        const newConfig = agentConfig.find((config) => config.key === e.target.value)
+        const newConfig = agentConfig.find((config) => config.key === value)
        if (newConfig) {
          newName = newConfig.name
        }
      }
      setForm((prev) => ({
        ...prev,
-        type: e.target.value as AgentType,
+        type: value,
        name: newName
      }))
    },
    [agentConfig, form.name, form.type]
  )

-  const onNameChange = useCallback((name: string) => {
+  const onNameChange = useCallback((e: ChangeEvent<HTMLInputElement>) => {
    setForm((prev) => ({
      ...prev,
-      name
+      name: e.target.value
    }))
  }, [])

-  const onDescChange = useCallback((description: string) => {
+  const onDescChange = useCallback((e: ChangeEvent<HTMLTextAreaElement>) => {
    setForm((prev) => ({
      ...prev,
-      description
+      description: e.target.value
    }))
  }, [])

-  const onInstChange = useCallback((instructions: string) => {
+  const onInstChange = useCallback((e: ChangeEvent<HTMLTextAreaElement>) => {
    setForm((prev) => ({
      ...prev,
-      instructions
+      instructions: e.target.value
    }))
  }, [])

@@ -231,34 +198,36 @@ export const AgentModal: React.FC<Props> = ({ agent, isOpen: _isOpen, onClose: _
    }))
  }, [])

-  const modelOptions = useMemo(() => {
-    // mocked data. not final version
-    return (models ?? [])
-      .filter((m) =>
-        agentModelFilter({
-          id: m.id,
-          provider: m.provider || '',
-          name: m.name,
-          group: ''
-        })
-      )
-      .map((model) => ({
-        type: 'model',
-        key: model.id,
-        label: model.name,
-        avatar: getModelLogoById(model.id),
-        providerId: model.provider,
-        providerName: model.provider_name
-      })) satisfies ModelOption[]
-  }, [models])
+  // Create a temporary agentBase object for SelectAgentBaseModelButton
+  const tempAgentBase: AgentEntity = useMemo(
+    () => ({
+      id: agent?.id ?? 'temp-creating',
+      type: form.type,
+      name: form.name,
+      model: form.model,
+      accessible_paths: form.accessible_paths.length > 0 ? form.accessible_paths : ['/'],
+      allowed_tools: form.allowed_tools ?? [],
+      description: form.description,
+      instructions: form.instructions,
+      configuration: form.configuration,
+      created_at: agent?.created_at ?? new Date().toISOString(),
+      updated_at: agent?.updated_at ?? new Date().toISOString()
+    }),
+    [form, agent?.id, agent?.created_at, agent?.updated_at]
+  )

-  const onModelChange = useCallback((e: ChangeEvent<HTMLSelectElement>) => {
-    setForm((prev) => ({
-      ...prev,
-      model: e.target.value
-    }))
+  const handleModelSelect = useCallback(async (model: ApiModel) => {
+    setForm((prev) => ({ ...prev, model: model.id }))
  }, [])

+  const onCancel = () => {
+    setOpen(false)
+  }
+
+  const onClose = () => {
+    resolve({})
+  }
+
  const onSubmit = useCallback(
    async (e: FormEvent<HTMLFormElement>) => {
      e.preventDefault()
@@ -330,9 +299,7 @@ export const AgentModal: React.FC<Props> = ({ agent, isOpen: _isOpen, onClose: _
        afterSubmit?.(result.data)
      }
      loadingRef.current = false
-
-      // setTimeoutTimer('onCreateAgent', () => EventEmitter.emit(EVENT_NAMES.SHOW_ASSISTANTS), 0)
-      onClose()
+      setOpen(false)
    },
    [
      form.type,
@@ -344,7 +311,6 @@ export const AgentModal: React.FC<Props> = ({ agent, isOpen: _isOpen, onClose: _
      form.allowed_tools,
      form.configuration,
      agent,
-      onClose,
      t,
      updateAgent,
      afterSubmit,
@@ -352,138 +318,312 @@ export const AgentModal: React.FC<Props> = ({ agent, isOpen: _isOpen, onClose: _
    ]
  )

+  AgentModalPopup.hide = onCancel
+
  return (
    <ErrorBoundary>
      <Modal
-        isOpen={isOpen}
-        onClose={onClose}
-        classNames={{
-          base: 'max-h-[90vh]',
-          wrapper: 'overflow-hidden'
-        }}>
-        <ModalContent>
-          {(onClose) => (
-            <>
-              <ModalHeader>{isEditing(agent) ? t('agent.edit.title') : t('agent.add.title')}</ModalHeader>
-              <Form onSubmit={onSubmit} className="min-h-0 w-full shrink overflow-auto">
-                <ModalBody className="min-h-0 w-full flex-1 shrink overflow-auto">
-                  <div className="flex gap-2">
-                    <Select
-                      isRequired
-                      isDisabled={isEditing(agent)}
-                      selectionMode="single"
-                      selectedKeys={[form.type]}
-                      disallowEmptySelection
-                      onChange={onAgentTypeChange}
-                      items={agentOptions}
-                      label={t('agent.type.label')}
-                      placeholder={t('agent.add.type.placeholder')}
-                      renderValue={renderOption}>
-                      {(option) => (
-                        <SelectItem key={option.key} textValue={option.label}>
-                          <Option option={option} />
-                        </SelectItem>
-                      )}
-                    </Select>
-                    <Input isRequired value={form.name} onValueChange={onNameChange} label={t('common.name')} />
-                  </div>
-                  <Select
-                    isRequired
-                    selectionMode="single"
-                    selectedKeys={form.model ? [form.model] : []}
-                    disallowEmptySelection
-                    onChange={onModelChange}
-                    items={modelOptions}
-                    label={t('common.model')}
-                    placeholder={t('common.placeholders.select.model')}
-                    renderValue={renderOption}>
-                    {(option) => (
-                      <SelectItem key={option.key} textValue={option.label}>
-                        <Option option={option} />
-                      </SelectItem>
-                    )}
-                  </Select>
-                  <Select
-                    isRequired
-                    selectionMode="single"
-                    selectedKeys={[selectedPermissionMode]}
-                    onSelectionChange={onPermissionModeChange}
-                    label={t('agent.settings.tooling.permissionMode.title', 'Permission mode')}
-                    placeholder={t('agent.settings.tooling.permissionMode.placeholder', 'Select permission mode')}
-                    description={t(
-                      'agent.settings.tooling.permissionMode.helper',
-                      'Choose how the agent handles tool approvals.'
-                    )}
-                    items={permissionModeCards}>
-                    {(item) => (
-                      <SelectItem key={item.mode} textValue={t(item.titleKey, item.titleFallback)}>
-                        <div className="flex flex-col gap-1">
-                          <span className="font-medium text-sm">{t(item.titleKey, item.titleFallback)}</span>
-                          <span className="text-foreground-500 text-xs">
-                            {t(item.descriptionKey, item.descriptionFallback)}
-                          </span>
-                          <span className="text-foreground-400 text-xs">
-                            {t(item.behaviorKey, item.behaviorFallback)}
-                          </span>
-                          {item.caution ? (
-                            <span className="flex items-center gap-1 text-danger-500 text-xs">
-                              <AlertTriangleIcon size={12} className="text-danger" />
-                              {t(
-                                'agent.settings.tooling.permissionMode.bypassPermissions.warning',
-                                'Use with caution — all tools will run without asking for approval.'
-                              )}
-                            </span>
-                          ) : null}
+        title={isEditing(agent) ? t('agent.edit.title') : t('agent.add.title')}
+        open={open}
+        onCancel={onCancel}
+        afterClose={onClose}
+        transitionName="animation-move-down"
+        centered
+        width={500}
+        footer={null}>
+        <StyledForm onSubmit={onSubmit}>
+          <FormContent>
+            <FormRow>
+              <FormItem style={{ flex: 1 }}>
+                <Label>{t('agent.type.label')}</Label>
+                <Select
+                  value={form.type}
+                  onChange={onAgentTypeChange}
+                  options={agentOptions}
+                  disabled={isEditing(agent)}
+                  style={{ width: '100%' }}
+                />
+              </FormItem>
+              <FormItem style={{ flex: 1 }}>
+                <Label>
+                  {t('common.name')} <RequiredMark>*</RequiredMark>
+                </Label>
+                <Input value={form.name} onChange={onNameChange} required />
+              </FormItem>
+            </FormRow>
+
+            <FormItem>
+              <Label>
+                {t('common.model')} <RequiredMark>*</RequiredMark>
+              </Label>
+              <SelectAgentBaseModelButton
+                agentBase={tempAgentBase}
+                onSelect={handleModelSelect}
+                fontSize={14}
+                avatarSize={24}
+                iconSize={16}
+                buttonStyle={{
+                  padding: '8px 12px',
+                  width: '100%',
+                  border: '1px solid var(--color-border)',
+                  borderRadius: 6,
+                  height: 'auto'
+                }}
+                containerClassName="flex items-center justify-between w-full"
+              />
+            </FormItem>
+
+            <FormItem>
+              <Label>
+                {t('agent.settings.tooling.permissionMode.title', 'Permission mode')} <RequiredMark>*</RequiredMark>
+              </Label>
+              <Select
+                value={selectedPermissionMode}
+                onChange={onPermissionModeChange}
+                style={{ width: '100%' }}
+                placeholder={t('agent.settings.tooling.permissionMode.placeholder', 'Select permission mode')}
+                dropdownStyle={{ minWidth: '500px' }}
+                optionLabelProp="label">
+                {permissionModeCards.map((item) => (
+                  <Select.Option key={item.mode} value={item.mode} label={t(item.titleKey, item.titleFallback)}>
+                    <PermissionOptionWrapper>
+                      <div className="title">{t(item.titleKey, item.titleFallback)}</div>
+                      <div className="description">{t(item.descriptionKey, item.descriptionFallback)}</div>
+                      <div className="behavior">{t(item.behaviorKey, item.behaviorFallback)}</div>
+                      {item.caution && (
+                        <div className="caution">
+                          <AlertTriangleIcon size={12} />
+                          {t(
+                            'agent.settings.tooling.permissionMode.bypassPermissions.warning',
+                            'Use with caution — all tools will run without asking for approval.'
+                          )}
                        </div>
-                      </SelectItem>
-                    )}
-                  </Select>
-                  <div className="space-y-2">
-                    <div className="flex items-center justify-between">
-                      <span className="font-medium text-foreground text-sm">
-                        {t('agent.session.accessible_paths.label')}
-                      </span>
-                      <Button size="sm" variant="flat" onPress={addAccessiblePath}>
-                        {t('agent.session.accessible_paths.add')}
+                      )}
+                    </PermissionOptionWrapper>
+                  </Select.Option>
+                ))}
+              </Select>
+              <HelpText>
+                {t('agent.settings.tooling.permissionMode.helper', 'Choose how the agent handles tool approvals.')}
+              </HelpText>
+            </FormItem>
+
+            <FormItem>
+              <LabelWithButton>
+                <Label>
+                  {t('agent.session.accessible_paths.label')} <RequiredMark>*</RequiredMark>
+                </Label>
+                <Button size="small" onClick={addAccessiblePath}>
+                  {t('agent.session.accessible_paths.add')}
+                </Button>
+              </LabelWithButton>
+              {form.accessible_paths.length > 0 ? (
+                <PathList>
+                  {form.accessible_paths.map((path) => (
+                    <PathItem key={path}>
+                      <PathText title={path}>{path}</PathText>
+                      <Button size="small" danger onClick={() => removeAccessiblePath(path)}>
+                        {t('common.delete')}
                      </Button>
-                    </div>
-                    {form.accessible_paths.length > 0 ? (
-                      <div className="space-y-2">
-                        {form.accessible_paths.map((path) => (
-                          <div
-                            key={path}
-                            className="flex items-center justify-between gap-2 rounded-medium border border-default-200 px-3 py-2">
-                            <span className="truncate text-sm" title={path}>
-                              {path}
-                            </span>
-                            <Button size="sm" variant="light" color="danger" onPress={() => removeAccessiblePath(path)}>
-                              {t('common.delete')}
-                            </Button>
-                          </div>
-                        ))}
-                      </div>
-                    ) : (
-                      <p className="text-foreground-400 text-sm">{t('agent.session.accessible_paths.empty')}</p>
-                    )}
-                  </div>
-                  <Textarea label={t('common.prompt')} value={form.instructions ?? ''} onValueChange={onInstChange} />
-                  <Textarea
-                    label={t('common.description')}
-                    value={form.description ?? ''}
-                    onValueChange={onDescChange}
-                  />
-                </ModalBody>
-                <ModalFooter className="w-full">
-                  <Button onPress={onClose}>{t('common.close')}</Button>
-                  <Button color="primary" type="submit" isLoading={loadingRef.current}>
-                    {isEditing(agent) ? t('common.confirm') : t('common.add')}
-                  </Button>
-                </ModalFooter>
-              </Form>
-            </>
-          )}
-        </ModalContent>
+                    </PathItem>
+                  ))}
+                </PathList>
+              ) : (
+                <EmptyText>{t('agent.session.accessible_paths.empty')}</EmptyText>
+              )}
+            </FormItem>
+
+            <FormItem>
+              <Label>{t('common.prompt')}</Label>
+              <TextArea rows={3} value={form.instructions ?? ''} onChange={onInstChange} />
+            </FormItem>
+
+            <FormItem>
+              <Label>{t('common.description')}</Label>
+              <TextArea rows={2} value={form.description ?? ''} onChange={onDescChange} />
+            </FormItem>
+          </FormContent>
+
+          <FormFooter>
+            <Button onClick={onCancel}>{t('common.close')}</Button>
+            <Button type="primary" htmlType="submit" loading={loadingRef.current}>
+              {isEditing(agent) ? t('common.confirm') : t('common.add')}
+            </Button>
+          </FormFooter>
+        </StyledForm>
      </Modal>
    </ErrorBoundary>
  )
 }
+
+const TopViewKey = 'AgentModalPopup'
+
+export default class AgentModalPopup {
+  static topviewId = 0
+  static hide() {
+    TopView.hide(TopViewKey)
+  }
+  static show(props: ShowParams) {
+    return new Promise<any>((resolve) => {
+      TopView.show(
+        <PopupContainer
+          {...props}
+          resolve={(v) => {
+            resolve(v)
+            TopView.hide(TopViewKey)
+          }}
+        />,
+        TopViewKey
+      )
+    })
+  }
+}
+
+// Keep the old export for backward compatibility during migration
+export const AgentModal = AgentModalPopup
+
+const StyledForm = styled.form`
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+`
+
+const FormContent = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+  max-height: 60vh;
+  overflow-y: auto;
+  padding-right: 8px;
+
+  &::-webkit-scrollbar {
+    width: 6px;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background-color: var(--color-border);
+    border-radius: 3px;
+  }
+`
+
+const FormRow = styled.div`
+  display: flex;
+  gap: 12px;
+`
+
+const FormItem = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+`
+
+const Label = styled.label`
+  font-size: 14px;
+  color: var(--color-text-1);
+  font-weight: 500;
+`
+
+const RequiredMark = styled.span`
+  color: #ff4d4f;
+  margin-left: 4px;
+`
+
+const HelpText = styled.div`
+  font-size: 12px;
+  color: var(--color-text-3);
+`
+
+const LabelWithButton = styled.div`
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+`
+
+const PathList = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+`
+
+const PathItem = styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  padding: 8px 12px;
+  border: 1px solid var(--color-border);
+  border-radius: 6px;
+  background-color: var(--color-bg-1);
+`
+
+const PathText = styled.span`
+  flex: 1;
+  font-size: 13px;
+  color: var(--color-text-2);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+`
+
+const EmptyText = styled.p`
+  font-size: 13px;
+  color: var(--color-text-3);
+  margin: 0;
+`
+
+const FormFooter = styled.div`
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+  padding-top: 16px;
+  border-top: 1px solid var(--color-border);
+`
+
+const OptionWrapper = styled.div`
+  display: flex;
+  align-items: center;
+  gap: 8px;
+`
+
+const PermissionOptionWrapper = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  padding: 8px 0;
+
+  .title {
+    font-size: 14px;
+    font-weight: 600;
+    color: var(--color-text-1);
+    margin-bottom: 2px;
+  }
+
+  .description {
+    font-size: 12px;
+    color: var(--color-text-2);
+    line-height: 1.4;
+  }
+
+  .behavior {
+    font-size: 12px;
+    color: var(--color-text-3);
+    line-height: 1.4;
+  }
+
+  .caution {
+    display: flex;
+    align-items: flex-start;
+    gap: 6px;
+    font-size: 12px;
+    color: #ff4d4f;
+    margin-top: 4px;
+    padding: 6px 8px;
+    background-color: rgba(255, 77, 79, 0.1);
+    border-radius: 4px;
+
+    svg {
+      flex-shrink: 0;
+      margin-top: 2px;
+    }
+  }
+`
--- a/src/renderer/src/components/Popups/agent/SessionModal.tsx
+++ b/src/renderer/src/components/Popups/agent/SessionModal.tsx
@@ -1,320 +0,0 @@
-import {
-  Button,
-  cn,
-  Form,
-  Input,
-  Modal,
-  ModalBody,
-  ModalContent,
-  ModalFooter,
-  ModalHeader,
-  Textarea,
-  useDisclosure
-} from '@heroui/react'
-import { loggerService } from '@logger'
-import type { Selection } from '@react-types/shared'
-import { AllowedToolsSelect } from '@renderer/components/agent'
-import { useAgent } from '@renderer/hooks/agents/useAgent'
-import { useSessions } from '@renderer/hooks/agents/useSessions'
-import { useUpdateSession } from '@renderer/hooks/agents/useUpdateSession'
-import type {
-  AgentEntity,
-  AgentSessionEntity,
-  BaseSessionForm,
-  CreateSessionForm,
-  Tool,
-  UpdateSessionForm
-} from '@renderer/types'
-import type { FormEvent, ReactNode } from 'react'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-
-import { ErrorBoundary } from '../../ErrorBoundary'
-
-const logger = loggerService.withContext('SessionAgentPopup')
-
-type AgentWithTools = AgentEntity & { tools?: Tool[] }
-type SessionWithTools = AgentSessionEntity & { tools?: Tool[] }
-
-const buildSessionForm = (existing?: SessionWithTools, agent?: AgentWithTools): BaseSessionForm => ({
-  name: existing?.name ?? agent?.name ?? 'Claude Code',
-  description: existing?.description ?? agent?.description,
-  instructions: existing?.instructions ?? agent?.instructions,
-  model: existing?.model ?? agent?.model ?? '',
-  accessible_paths: existing?.accessible_paths
-    ? [...existing.accessible_paths]
-    : agent?.accessible_paths
-      ? [...agent.accessible_paths]
-      : [],
-  allowed_tools: existing?.allowed_tools
-    ? [...existing.allowed_tools]
-    : agent?.allowed_tools
-      ? [...agent.allowed_tools]
-      : [],
-  mcps: existing?.mcps ? [...existing.mcps] : agent?.mcps ? [...agent.mcps] : []
-})
-
-interface BaseProps {
-  agentId: string
-  session?: SessionWithTools
-  onSessionCreated?: (session: AgentSessionEntity) => void
-}
-
-interface TriggerProps extends BaseProps {
-  trigger: { content: ReactNode; className?: string }
-  isOpen?: never
-  onClose?: never
-}
-
-interface StateProps extends BaseProps {
-  trigger?: never
-  isOpen: boolean
-  onClose: () => void
-}
-
-type Props = TriggerProps | StateProps
-
-/**
- * Modal component for creating or editing a Session.
- * @deprecated may as a reference when migrating to v2
- *
- * Either trigger or isOpen and onClose is given.
- * @param agentId - The ID of agent which the session is related.
- * @param session - Optional session entity for editing mode.
- * @param trigger - Optional trigger element that opens the modal. It MUST propagate the click event to trigger the modal.
- * @param isOpen - Optional controlled modal open state. From useDisclosure.
- * @param onClose - Optional callback when modal closes. From useDisclosure.
- * @returns Modal component for agent creation/editing
- */
-export const SessionModal: React.FC<Props> = ({
-  agentId,
-  session,
-  trigger,
-  isOpen: _isOpen,
-  onClose: _onClose,
-  onSessionCreated
-}) => {
-  const { isOpen, onClose, onOpen } = useDisclosure({ isOpen: _isOpen, onClose: _onClose })
-  const { t } = useTranslation()
-  const loadingRef = useRef(false)
-  // const { setTimeoutTimer } = useTimer()
-  const { createSession } = useSessions(agentId)
-  const { updateSession } = useUpdateSession(agentId)
-  const { agent } = useAgent(agentId)
-  const isEditing = (session?: AgentSessionEntity) => session !== undefined
-
-  const [form, setForm] = useState<BaseSessionForm>(() => buildSessionForm(session, agent ?? undefined))
-
-  useEffect(() => {
-    if (isOpen) {
-      setForm(buildSessionForm(session, agent ?? undefined))
-    }
-  }, [session, agent, isOpen])
-
-  const availableTools = useMemo(() => session?.tools ?? agent?.tools ?? [], [agent?.tools, session?.tools])
-  const selectedToolKeys = useMemo(() => new Set(form.allowed_tools ?? []), [form.allowed_tools])
-
-  useEffect(() => {
-    if (!availableTools.length) {
-      return
-    }
-
-    setForm((prev) => {
-      const allowed = prev.allowed_tools ?? []
-      const validTools = allowed.filter((id) => availableTools.some((tool) => tool.id === id))
-      if (validTools.length === allowed.length) {
-        return prev
-      }
-      return {
-        ...prev,
-        allowed_tools: validTools
-      }
-    })
-  }, [availableTools])
-
-  const onNameChange = useCallback((name: string) => {
-    setForm((prev) => ({
-      ...prev,
-      name
-    }))
-  }, [])
-
-  const onDescChange = useCallback((description: string) => {
-    setForm((prev) => ({
-      ...prev,
-      description
-    }))
-  }, [])
-
-  const onInstChange = useCallback((instructions: string) => {
-    setForm((prev) => ({
-      ...prev,
-      instructions
-    }))
-  }, [])
-
-  const onAllowedToolsChange = useCallback(
-    (keys: Selection) => {
-      setForm((prev) => {
-        const existing = prev.allowed_tools ?? []
-        if (keys === 'all') {
-          return {
-            ...prev,
-            allowed_tools: availableTools.map((tool) => tool.id)
-          }
-        }
-
-        const next = Array.from(keys).map(String)
-        const filtered = availableTools.length
-          ? next.filter((id) => availableTools.some((tool) => tool.id === id))
-          : next
-
-        if (existing.length === filtered.length && existing.every((id) => filtered.includes(id))) {
-          return prev
-        }
-
-        return {
-          ...prev,
-          allowed_tools: filtered
-        }
-      })
-    },
-    [availableTools]
-  )
-
-  const onSubmit = useCallback(
-    async (e: FormEvent<HTMLFormElement>) => {
-      e.preventDefault()
-      if (loadingRef.current) {
-        return
-      }
-
-      loadingRef.current = true
-
-      // Additional validation check besides native HTML validation to ensure security
-      if (!form.model) {
-        window.toast.error(t('error.model.not_exists'))
-        loadingRef.current = false
-        return
-      }
-
-      if (form.accessible_paths.length === 0) {
-        window.toast.error(t('agent.session.accessible_paths.error.at_least_one'))
-        loadingRef.current = false
-        return
-      }
-
-      try {
-        if (isEditing(session)) {
-          if (!session) {
-            throw new Error('Agent is required for editing mode')
-          }
-
-          const updatePayload = {
-            id: session.id,
-            name: form.name,
-            description: form.description,
-            instructions: form.instructions,
-            model: form.model,
-            accessible_paths: [...form.accessible_paths],
-            allowed_tools: [...(form.allowed_tools ?? [])],
-            mcps: [...(form.mcps ?? [])]
-          } satisfies UpdateSessionForm
-
-          updateSession(updatePayload)
-          logger.debug('Updated agent', updatePayload)
-        } else {
-          const newSession = {
-            name: form.name,
-            description: form.description,
-            instructions: form.instructions,
-            model: form.model,
-            accessible_paths: [...form.accessible_paths],
-            allowed_tools: [...(form.allowed_tools ?? [])],
-            mcps: [...(form.mcps ?? [])]
-          } satisfies CreateSessionForm
-          const createdSession = await createSession(newSession)
-          if (createdSession) {
-            onSessionCreated?.(createdSession)
-          }
-          logger.debug('Added agent', newSession)
-        }
-
-        // setTimeoutTimer('onCreateAgent', () => EventEmitter.emit(EVENT_NAMES.SHOW_ASSISTANTS), 0)
-        onClose()
-      } finally {
-        loadingRef.current = false
-      }
-    },
-    [
-      form.model,
-      form.name,
-      form.description,
-      form.instructions,
-      form.accessible_paths,
-      form.allowed_tools,
-      form.mcps,
-      session,
-      onClose,
-      onSessionCreated,
-      t,
-      updateSession,
-      createSession
-    ]
-  )
-
-  return (
-    <ErrorBoundary>
-      {/* NOTE: Hero UI Modal Pattern: Combine the Button and Modal components into a single
-      encapsulated component. This is because the Modal component needs to bind the onOpen
-      event handler to the Button for proper focus management.
-
-      Or just use external isOpen/onOpen/onClose to control modal state.
-      */}
-
-      {trigger && (
-        <div
-          onClick={(e) => {
-            e.stopPropagation()
-            onOpen()
-          }}
-          className={cn('w-full', trigger.className)}>
-          {trigger.content}
-        </div>
-      )}
-      <Modal isOpen={isOpen} onClose={onClose}>
-        <ModalContent>
-          {(onClose) => (
-            <>
-              <ModalHeader>
-                {isEditing(session) ? t('agent.session.edit.title') : t('agent.session.add.title')}
-              </ModalHeader>
-              <Form onSubmit={onSubmit} className="w-full">
-                <ModalBody className="w-full">
-                  <Input isRequired value={form.name} onValueChange={onNameChange} label={t('common.name')} />
-                  <Textarea
-                    label={t('common.description')}
-                    value={form.description ?? ''}
-                    onValueChange={onDescChange}
-                  />
-                  <AllowedToolsSelect
-                    items={availableTools}
-                    selectedKeys={selectedToolKeys}
-                    onSelectionChange={onAllowedToolsChange}
-                  />
-                  <Textarea label={t('common.prompt')} value={form.instructions ?? ''} onValueChange={onInstChange} />
-                </ModalBody>
-                <ModalFooter className="w-full">
-                  <Button onPress={onClose}>{t('common.close')}</Button>
-                  <Button color="primary" type="submit" isLoading={loadingRef.current}>
-                    {isEditing(session) ? t('common.confirm') : t('common.add')}
-                  </Button>
-                </ModalFooter>
-              </Form>
-            </>
-          )}
-        </ModalContent>
-      </Modal>
-    </ErrorBoundary>
-  )
-}
--- a/src/renderer/src/components/Popups/agent/shared.tsx
+++ b/src/renderer/src/components/Popups/agent/shared.tsx
@@ -1,8 +1,3 @@
-import type { SelectedItemProps, SelectedItems } from '@heroui/react'
-import { Avatar } from '@heroui/react'
-import { getProviderLabel } from '@renderer/i18n/label'
-import { useTranslation } from 'react-i18next'
-
 export interface BaseOption {
  type: 'type' | 'model'
  key: string
@@ -10,43 +5,3 @@ export interface BaseOption {
  // img src
  avatar?: string
 }
-
-export interface ModelOption extends BaseOption {
-  providerId?: string
-  providerName?: string
-}
-
-export function isModelOption(option: BaseOption): option is ModelOption {
-  return option.type === 'model'
-}
-
-export const Item = ({ item }: { item: SelectedItemProps<BaseOption> }) => <Option option={item.data} />
-
-export const renderOption = (items: SelectedItems<BaseOption>) =>
-  items.map((item) => <Item key={item.key} item={item} />)
-
-export const Option = ({ option }: { option?: BaseOption | null }) => {
-  const { t } = useTranslation()
-  if (!option) {
-    return (
-      <div className="flex gap-2">
-        <Avatar name="?" className="h-5 w-5" />
-        {t('common.invalid_value')}
-      </div>
-    )
-  }
-  const providerLabel = (() => {
-    if (!isModelOption(option)) return null
-    if (option.providerName) return option.providerName
-    if (option.providerId) return getProviderLabel(option.providerId)
-    return null
-  })()
-
-  return (
-    <div className="flex gap-2">
-      <Avatar src={option.avatar} className="h-5 w-5" />
-      <span className="truncate">{option.label}</span>
-      {providerLabel ? <span className="truncate text-foreground-500">| {providerLabel}</span> : null}
-    </div>
-  )
-}
--- a/src/renderer/src/components/QuickPanel/types.ts
+++ b/src/renderer/src/components/QuickPanel/types.ts
@@ -64,6 +64,7 @@ export type QuickPanelListItem = {
  isSelected?: boolean
  isMenu?: boolean
  disabled?: boolean
+  hidden?: boolean
  /**
   * 固定显示项：不参与过滤，始终出现在列表顶部。
   * 例如“清除”按钮可设置为 alwaysVisible，从而在有匹配项时始终可见；
--- a/src/renderer/src/components/QuickPanel/view.tsx
+++ b/src/renderer/src/components/QuickPanel/view.tsx
@@ -143,7 +143,8 @@ export const QuickPanelView: React.FC<Props> = ({ setInputText }) => {
    prevSymbolRef.current = ctx.symbol

    // 固定项置顶 + 过滤后的普通项
-    return [...pinnedItems, ...filteredNormalItems]
+    const pinnedFiltered = [...pinnedItems, ...filteredNormalItems]
+    return pinnedFiltered.filter((item) => !item.hidden)
  }, [ctx.isVisible, ctx.symbol, ctx.list, searchText])

  const canForwardAndBackward = useMemo(() => {
--- a/src/renderer/src/components/ToastPortal.tsx
+++ b/src/renderer/src/components/ToastPortal.tsx
@@ -1,32 +0,0 @@
-import { ToastProvider } from '@heroui/toast'
-import { useEffect, useState } from 'react'
-import { createPortal } from 'react-dom'
-
-export const ToastPortal = () => {
-  const [mounted, setMounted] = useState(false)
-
-  useEffect(() => {
-    setMounted(true)
-    return () => setMounted(false)
-  }, [])
-
-  if (!mounted) return null
-
-  return createPortal(
-    <ToastProvider
-      placement="top-center"
-      regionProps={{
-        className: 'z-[1001]'
-      }}
-      toastOffset={20}
-      toastProps={{
-        timeout: 3000,
-        classNames: {
-          // This setting causes the 'hero-toast' class to be applied twice to the toast element. This is weird and I don't know why, but it works.
-          base: 'hero-toast'
-        }
-      }}
-    />,
-    document.body
-  )
-}
--- a/src/renderer/src/components/TopView/index.tsx
+++ b/src/renderer/src/components/TopView/index.tsx
@@ -2,12 +2,12 @@
 import TopViewMinappContainer from '@renderer/components/MinApp/TopViewMinappContainer'
 import { useAppInit } from '@renderer/hooks/useAppInit'
 import { useShortcuts } from '@renderer/hooks/useShortcuts'
-import { Modal } from 'antd'
+import { message, Modal } from 'antd'
 import type { PropsWithChildren } from 'react'
 import React, { useCallback, useEffect, useRef, useState } from 'react'

 import { Box } from '../Layout'
-import { getToastUtilities } from './toast'
+import { getToastUtilities, initMessageApi } from './toast'

 let onPop = () => {}
 let onShow = ({ element, id }: { element: React.FC | React.ReactNode; id: string }) => {
@@ -36,6 +36,7 @@ const TopViewContainer: React.FC<Props> = ({ children }) => {
  elementsRef.current = elements

  const [modal, modalContextHolder] = Modal.useModal()
+  const [messageApi, messageContextHolder] = message.useMessage()
  const { shortcuts } = useShortcuts()
  const enableQuitFullScreen = shortcuts.find((item) => item.key === 'exit_fullscreen')?.enabled

@@ -43,8 +44,9 @@ const TopViewContainer: React.FC<Props> = ({ children }) => {

  useEffect(() => {
    window.modal = modal
+    initMessageApi(messageApi)
    window.toast = getToastUtilities()
-  }, [modal])
+  }, [messageApi, modal])

  onPop = () => {
    const views = [...elementsRef.current]
@@ -97,6 +99,7 @@ const TopViewContainer: React.FC<Props> = ({ children }) => {
  return (
    <>
      {children}
+      {messageContextHolder}
      {modalContextHolder}
      <TopViewMinappContainer />
      {elements.map(({ element: Element, id }) => (
--- a/src/renderer/src/components/TopView/toast.ts
+++ b/src/renderer/src/components/TopView/toast.ts
@@ -1,72 +0,0 @@
-import { addToast, closeAll, closeToast, getToastQueue, isToastClosing } from '@heroui/toast'
-import type { RequireSome } from '@renderer/types'
-
-type AddToastProps = Parameters<typeof addToast>[0]
-type ToastPropsColored = Omit<AddToastProps, 'color'>
-
-const createToast = (color: 'danger' | 'success' | 'warning' | 'default') => {
-  return (arg: ToastPropsColored | string): string | null => {
-    if (typeof arg === 'string') {
-      return addToast({ color, title: arg })
-    } else {
-      return addToast({ color, ...arg })
-    }
-  }
-}
-
-// syntatic sugar, oh yeah
-
-/**
- * Display an error toast notification with red color
- * @param arg - Toast content (string) or toast options object
- * @returns Toast ID or null
- */
-export const error = createToast('danger')
-
-/**
- * Display a success toast notification with green color
- * @param arg - Toast content (string) or toast options object
- * @returns Toast ID or null
- */
-export const success = createToast('success')
-
-/**
- * Display a warning toast notification with yellow color
- * @param arg - Toast content (string) or toast options object
- * @returns Toast ID or null
- */
-export const warning = createToast('warning')
-
-/**
- * Display an info toast notification with default color
- * @param arg - Toast content (string) or toast options object
- * @returns Toast ID or null
- */
-export const info = createToast('default')
-
-/**
- * Display a loading toast notification that resolves with a promise
- * @param args - Toast options object containing a promise to resolve
- * @returns Toast ID or null
- */
-export const loading = (args: RequireSome<AddToastProps, 'promise'>) => {
-  // Disappear immediately by default
-  if (args.timeout === undefined) {
-    args.timeout = 1
-  }
-  return addToast(args)
-}
-
-export const getToastUtilities = () =>
-  ({
-    getToastQueue,
-    addToast,
-    closeToast,
-    closeAll,
-    isToastClosing,
-    error,
-    success,
-    warning,
-    info,
-    loading
-  }) as const
--- a/src/renderer/src/components/TopView/toast.tsx
+++ b/src/renderer/src/components/TopView/toast.tsx
@@ -0,0 +1,231 @@
+import type { RequireSome } from '@renderer/types'
+import { message as antdMessage } from 'antd'
+import type { MessageInstance } from 'antd/es/message/interface'
+import type React from 'react'
+
+// Global message instance for static usage
+let messageApi: MessageInstance | null = null
+
+// Initialize message API - should be called once the App component is mounted
+export const initMessageApi = (api: MessageInstance) => {
+  messageApi = api
+}
+
+// Get message API instance
+const getMessageApi = (): MessageInstance => {
+  if (!messageApi) {
+    // Fallback to static method if hook API is not available
+    return antdMessage
+  }
+  return messageApi
+}
+
+type ToastColor = 'danger' | 'success' | 'warning' | 'default'
+type MessageType = 'error' | 'success' | 'warning' | 'info'
+
+interface ToastConfig {
+  title?: React.ReactNode
+  icon?: React.ReactNode
+  description?: React.ReactNode
+  timeout?: number
+  key?: string | number
+  className?: string
+  style?: React.CSSProperties
+  onClick?: () => void
+  onClose?: () => void
+}
+
+interface LoadingToastConfig extends ToastConfig {
+  promise: Promise<any>
+}
+
+const colorToType = (color: ToastColor): MessageType => {
+  switch (color) {
+    case 'danger':
+      return 'error'
+    case 'success':
+      return 'success'
+    case 'warning':
+      return 'warning'
+    case 'default':
+      return 'info'
+  }
+}
+
+// Toast content component
+const ToastContent: React.FC<{ title?: React.ReactNode; description?: React.ReactNode; icon?: React.ReactNode }> = ({
+  title,
+  description,
+  icon
+}) => {
+  return (
+    <div className="flex flex-col gap-1">
+      {(icon || title) && (
+        <div className="flex items-center gap-2 font-semibold">
+          {icon}
+          {title}
+        </div>
+      )}
+      {description && <div className="text-sm">{description}</div>}
+    </div>
+  )
+}
+
+const createToast = (color: ToastColor) => {
+  return (arg: ToastConfig | string): string | null => {
+    const api = getMessageApi()
+    const type = colorToType(color) as 'error' | 'success' | 'warning' | 'info'
+
+    if (typeof arg === 'string') {
+      // antd message methods return a function to close the message
+      api[type](arg)
+      return null
+    }
+
+    const { title, description, icon, timeout, ...restConfig } = arg
+
+    // Convert timeout from milliseconds to seconds (antd uses seconds)
+    const duration = timeout !== undefined ? timeout / 1000 : 3
+
+    return (
+      (api.open({
+        type: type as 'error' | 'success' | 'warning' | 'info',
+        content: <ToastContent title={title} description={description} icon={icon} />,
+        duration,
+        ...restConfig
+      }) as any) || null
+    )
+  }
+}
+
+/**
+ * Display an error toast notification with red color
+ * @param arg - Toast content (string) or toast options object
+ * @returns Toast ID or null
+ */
+export const error = createToast('danger')
+
+/**
+ * Display a success toast notification with green color
+ * @param arg - Toast content (string) or toast options object
+ * @returns Toast ID or null
+ */
+export const success = createToast('success')
+
+/**
+ * Display a warning toast notification with yellow color
+ * @param arg - Toast content (string) or toast options object
+ * @returns Toast ID or null
+ */
+export const warning = createToast('warning')
+
+/**
+ * Display an info toast notification with default color
+ * @param arg - Toast content (string) or toast options object
+ * @returns Toast ID or null
+ */
+export const info = createToast('default')
+
+/**
+ * Display a loading toast notification that resolves with a promise
+ * @param args - Toast options object containing a promise to resolve
+ */
+export const loading = (args: RequireSome<LoadingToastConfig, 'promise'>): string | null => {
+  const api = getMessageApi()
+  const { title, description, icon, promise, timeout, ...restConfig } = args
+
+  // Generate unique key for this loading message
+  const key = args.key || `loading-${Date.now()}-${Math.random()}`
+
+  // Show loading message
+  api.loading({
+    content: <ToastContent title={title || 'Loading...'} description={description} icon={icon} />,
+    duration: 0, // Don't auto-close
+    key,
+    ...restConfig
+  })
+
+  // Handle promise resolution
+  promise
+    .then((result) => {
+      api.success({
+        content: <ToastContent title={title || 'Success'} description={description} />,
+        duration: timeout !== undefined ? timeout / 1000 : 2,
+        key,
+        ...restConfig
+      })
+      return result
+    })
+    .catch((err) => {
+      api.error({
+        content: (
+          <ToastContent title={title || 'Error'} description={err?.message || description || 'An error occurred'} />
+        ),
+        duration: timeout !== undefined ? timeout / 1000 : 3,
+        key,
+        ...restConfig
+      })
+      throw err
+    })
+
+  return key as string
+}
+
+/**
+ * Add a toast notification
+ * @param config - Toast configuration object
+ * @returns Toast ID or null
+ */
+export const addToast = (config: ToastConfig) => info(config)
+
+/**
+ * Close a specific toast notification by its key
+ * @param key - Toast key (string)
+ */
+export const closeToast = (key: string) => {
+  getMessageApi().destroy(key)
+}
+
+/**
+ * Close all toast notifications
+ */
+export const closeAll = () => {
+  getMessageApi().destroy()
+}
+
+/**
+ * Stub functions for compatibility with previous toast API
+ * These are no-ops since antd message doesn't expose a queue
+ */
+
+/**
+ * @deprecated This function is a no-op stub for backward compatibility only.
+ * Antd message doesn't expose a queue. Do not rely on this function.
+ * @returns Empty toast queue stub
+ */
+export const getToastQueue = (): any => ({ toasts: [] })
+
+/**
+ * @deprecated This function is a no-op stub for backward compatibility only.
+ * Antd message doesn't track closing state. Do not rely on this function.
+ * @param key - Toast key (unused)
+ * @returns Always returns false
+ */
+export const isToastClosing = (key?: string): boolean => {
+  key // unused
+  return false
+}
+
+export const getToastUtilities = () =>
+  ({
+    getToastQueue,
+    addToast,
+    closeToast,
+    closeAll,
+    isToastClosing,
+    error,
+    success,
+    warning,
+    info,
+    loading
+  }) as const
--- a/src/renderer/src/components/UpdateDialog.tsx
+++ b/src/renderer/src/components/UpdateDialog.tsx
@@ -1,101 +0,0 @@
-import { Button, Modal, ModalBody, ModalContent, ModalFooter, ModalHeader, ScrollShadow } from '@heroui/react'
-import { loggerService } from '@logger'
-import { handleSaveData } from '@renderer/store'
-import type { ReleaseNoteInfo, UpdateInfo } from 'builder-util-runtime'
-import React, { useEffect, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import Markdown from 'react-markdown'
-
-const logger = loggerService.withContext('UpdateDialog')
-
-interface UpdateDialogProps {
-  isOpen: boolean
-  onClose: () => void
-  releaseInfo: UpdateInfo | null
-}
-
-const UpdateDialog: React.FC<UpdateDialogProps> = ({ isOpen, onClose, releaseInfo }) => {
-  const { t } = useTranslation()
-  const [isInstalling, setIsInstalling] = useState(false)
-
-  useEffect(() => {
-    if (isOpen && releaseInfo) {
-      logger.info('Update dialog opened', { version: releaseInfo.version })
-    }
-  }, [isOpen, releaseInfo])
-
-  const handleInstall = async () => {
-    setIsInstalling(true)
-    try {
-      await handleSaveData()
-      await window.api.quitAndInstall()
-    } catch (error) {
-      logger.error('Failed to save data before update', error as Error)
-      setIsInstalling(false)
-      window.toast.error(t('update.saveDataError'))
-    }
-  }
-
-  const releaseNotes = releaseInfo?.releaseNotes
-
-  return (
-    <Modal
-      isOpen={isOpen}
-      onClose={onClose}
-      size="2xl"
-      scrollBehavior="inside"
-      classNames={{
-        base: 'max-h-[85vh]',
-        header: 'border-b border-divider',
-        footer: 'border-t border-divider'
-      }}>
-      <ModalContent>
-        {(onModalClose) => (
-          <>
-            <ModalHeader className="flex flex-col gap-1">
-              <h3 className="font-semibold text-lg">{t('update.title')}</h3>
-              <p className="text-default-500 text-small">
-                {t('update.message').replace('{{version}}', releaseInfo?.version || '')}
-              </p>
-            </ModalHeader>
-
-            <ModalBody>
-              <ScrollShadow className="max-h-[450px]" hideScrollBar>
-                <div className="markdown rounded-lg bg-default-50 p-4">
-                  <Markdown>
-                    {typeof releaseNotes === 'string'
-                      ? releaseNotes
-                      : Array.isArray(releaseNotes)
-                        ? releaseNotes
-                            .map((note: ReleaseNoteInfo) => note.note)
-                            .filter(Boolean)
-                            .join('\n\n')
-                        : t('update.noReleaseNotes')}
-                  </Markdown>
-                </div>
-              </ScrollShadow>
-            </ModalBody>
-
-            <ModalFooter>
-              <Button variant="light" onPress={onModalClose} isDisabled={isInstalling}>
-                {t('update.later')}
-              </Button>
-
-              <Button
-                color="primary"
-                onPress={async () => {
-                  await handleInstall()
-                  onModalClose()
-                }}
-                isLoading={isInstalling}>
-                {t('update.install')}
-              </Button>
-            </ModalFooter>
-          </>
-        )}
-      </ModalContent>
-    </Modal>
-  )
-}
-
-export default UpdateDialog
--- a/src/renderer/src/components/agent/AllowedToolsSelect.tsx
+++ b/src/renderer/src/components/agent/AllowedToolsSelect.tsx
@@ -1,55 +0,0 @@
-import type { SelectedItems, SelectProps } from '@heroui/react'
-import { Chip, cn, Select, SelectItem } from '@heroui/react'
-import type { Tool } from '@renderer/types'
-import React, { useCallback } from 'react'
-import { useTranslation } from 'react-i18next'
-
-export interface AllowedToolsSelectProps extends Omit<SelectProps, 'children'> {
-  items: Tool[]
-}
-
-export const AllowedToolsSelect: React.FC<AllowedToolsSelectProps> = (props) => {
-  const { t } = useTranslation()
-  const { items: availableTools, className, ...rest } = props
-
-  const renderSelectedTools = useCallback((items: SelectedItems<Tool>) => {
-    if (!items.length) {
-      return null
-    }
-    return (
-      <div className="flex flex-wrap gap-2">
-        {items.map((item) => (
-          <Chip key={item.key} size="sm" variant="flat" className="max-w-[160px] truncate">
-            {item.data?.name ?? item.textValue ?? item.key}
-          </Chip>
-        ))}
-      </div>
-    )
-  }, [])
-
-  return (
-    <Select
-      aria-label={t('agent.session.allowed_tools.label')}
-      selectionMode="multiple"
-      isMultiline
-      label={t('agent.session.allowed_tools.label')}
-      placeholder={t('agent.session.allowed_tools.placeholder')}
-      description={
-        availableTools.length ? t('agent.session.allowed_tools.helper') : t('agent.session.allowed_tools.empty')
-      }
-      isDisabled={!availableTools.length}
-      items={availableTools}
-      renderValue={renderSelectedTools}
-      className={cn('max-w-xl', className)}
-      {...rest}>
-      {(tool) => (
-        <SelectItem key={tool.id} textValue={tool.name}>
-          <div className="flex flex-col">
-            <span className="font-medium text-sm">{tool.name}</span>
-            {tool.description ? <span className="text-foreground-500 text-xs">{tool.description}</span> : null}
-          </div>
-        </SelectItem>
-      )}
-    </Select>
-  )
-}
--- a/src/renderer/src/components/agent/index.tsx
+++ b/src/renderer/src/components/agent/index.tsx
@@ -1 +0,0 @@
-export { AllowedToolsSelect } from './AllowedToolsSelect'
--- a/src/renderer/src/config/models/default.ts
+++ b/src/renderer/src/config/models/default.ts
@@ -27,6 +27,7 @@ export const SYSTEM_MODELS: Record<SystemProviderId | 'defaultModel', Model[]> =
  ],
  cherryin: [],
  vertexai: [],
+  sophnet: [],
  '302ai': [
    {
      id: 'deepseek-chat',
--- a/src/renderer/src/config/providers.ts
+++ b/src/renderer/src/config/providers.ts
@@ -46,6 +46,7 @@ import Ph8ProviderLogo from '@renderer/assets/images/providers/ph8.png'
 import PPIOProviderLogo from '@renderer/assets/images/providers/ppio.png'
 import QiniuProviderLogo from '@renderer/assets/images/providers/qiniu.webp'
 import SiliconFlowProviderLogo from '@renderer/assets/images/providers/silicon.png'
+import SophnetProviderLogo from '@renderer/assets/images/providers/sophnet.svg'
 import StepProviderLogo from '@renderer/assets/images/providers/step.png'
 import TencentCloudProviderLogo from '@renderer/assets/images/providers/tencent-cloud-ti.png'
 import TogetherProviderLogo from '@renderer/assets/images/providers/together.png'
@@ -246,6 +247,16 @@ export const SYSTEM_PROVIDERS_CONFIG: Record<SystemProviderId, SystemProvider> =
    isSystem: true,
    enabled: false
  },
+  sophnet: {
+    id: 'sophnet',
+    name: 'SophNet',
+    type: 'openai',
+    apiKey: '',
+    apiHost: 'https://www.sophnet.com/api/open-apis/v1',
+    models: [],
+    isSystem: true,
+    enabled: false
+  },
  ppio: {
    id: 'ppio',
    name: 'PPIO',
@@ -729,7 +740,8 @@ export const PROVIDER_LOGO_MAP: AtLeast<SystemProviderId, string> = {
  poe: 'poe', // use svg icon component
  aionly: AiOnlyProviderLogo,
  longcat: LongCatProviderLogo,
-  huggingface: HuggingfaceProviderLogo
+  huggingface: HuggingfaceProviderLogo,
+  sophnet: SophnetProviderLogo
 } as const

 export function getProviderLogo(providerId: string) {
@@ -808,6 +820,17 @@ export const PROVIDER_URLS: Record<SystemProviderId, ProviderUrls> = {
      models: 'https://ai.burncloud.com/pricing'
    }
  },
+  sophnet: {
+    api: {
+      url: 'https://www.sophnet.com/api/open-apis/v1'
+    },
+    websites: {
+      official: 'https://sophnet.com',
+      apiKey: 'https://sophnet.com/#/project/key',
+      docs: 'https://sophnet.com/docs/component/introduce.html',
+      models: 'https://sophnet.com/#/model/list'
+    }
+  },
  ppio: {
    api: {
      url: 'https://api.ppinfra.com/v3/openai'
@@ -1463,6 +1486,14 @@ export const isNewApiProvider = (provider: Provider) => {
  return ['new-api', 'cherryin'].includes(provider.id) || provider.type === 'new-api'
 }

+export function isCherryAIProvider(provider: Provider): boolean {
+  return provider.id === 'cherryai'
+}
+
+export function isPerplexityProvider(provider: Provider): boolean {
+  return provider.id === 'perplexity'
+}
+
 /**
 * 判断是否为 OpenAI 兼容的提供商
 * @param {Provider} provider 提供商对象
@@ -1488,7 +1519,7 @@ export function isGeminiProvider(provider: Provider): boolean {
  return provider.type === 'gemini'
 }

-const NOT_SUPPORT_API_VERSION_PROVIDERS = ['github', 'copilot'] as const satisfies SystemProviderId[]
+const NOT_SUPPORT_API_VERSION_PROVIDERS = ['github', 'copilot', 'perplexity'] as const satisfies SystemProviderId[]

 export const isSupportAPIVersionProvider = (provider: Provider) => {
  if (isSystemProvider(provider)) {
--- a/src/renderer/src/context/HeroUIProvider.tsx
+++ b/src/renderer/src/context/HeroUIProvider.tsx
@@ -1,13 +0,0 @@
-import { HeroUIProvider } from '@heroui/react'
-import { useSettings } from '@renderer/hooks/useSettings'
-
-const AppHeroUIProvider: React.FC<{ children: React.ReactNode }> = ({ children }) => {
-  const { language } = useSettings()
-  return (
-    <HeroUIProvider className="flex h-full w-full flex-1" locale={language}>
-      {children}
-    </HeroUIProvider>
-  )
-}
-
-export { AppHeroUIProvider as HeroUIProvider }
--- a/src/renderer/src/env.d.ts
+++ b/src/renderer/src/env.d.ts
@@ -1,12 +1,22 @@
 /// <reference types="vite/client" />

 import type { PermissionUpdate } from '@anthropic-ai/claude-agent-sdk'
-import type { addToast, closeAll, closeToast, getToastQueue, isToastClosing } from '@heroui/toast'
 import type KeyvStorage from '@kangfenmao/keyv-storage'
 import type { HookAPI } from 'antd/es/modal/useModal'
 import type { NavigateFunction } from 'react-router-dom'

-import type { error, info, loading, success, warning } from './components/TopView/toast'
+import type {
+  addToast,
+  closeAll,
+  closeToast,
+  error,
+  getToastQueue,
+  info,
+  isToastClosing,
+  loading,
+  success,
+  warning
+} from './components/TopView/toast'

 interface ImportMetaEnv {
  VITE_RENDERER_INTEGRATED_MODEL: string
--- a/src/renderer/src/hero.ts
+++ b/src/renderer/src/hero.ts
@@ -1,2 +0,0 @@
-import { heroui } from '@heroui/react'
-export default heroui()
--- a/src/renderer/src/hooks/agents/useAgents.ts
+++ b/src/renderer/src/hooks/agents/useAgents.ts
@@ -41,6 +41,7 @@ export const useAgents = () => {
    // NOTE: We only use the array for now. useUpdateAgent depends on this behavior.
    return result.data
  }, [apiServerConfig.enabled, apiServerRunning, client, t])
+
  const { data, error, isLoading, mutate } = useSWR(swrKey, fetcher)
  const { chat } = useRuntime()
  const { activeAgentId } = chat
--- a/src/renderer/src/hooks/useApiServer.ts
+++ b/src/renderer/src/hooks/useApiServer.ts
@@ -31,21 +31,24 @@ export const useApiServer = () => {
    try {
      const status = await window.api.apiServer.getStatus()
      setApiServerRunning(status.running)
+      if (status.running && !apiServerConfig.enabled) {
+        setApiServerEnabled(true)
+      }
    } catch (error: any) {
      logger.error('Failed to check API server status:', error)
    } finally {
      setApiServerLoading(false)
    }
-  }, [])
+  }, [apiServerConfig.enabled, setApiServerEnabled])

  const startApiServer = useCallback(async () => {
    if (apiServerLoading) return
-
    setApiServerLoading(true)
    try {
      const result = await window.api.apiServer.start()
      if (result.success) {
        setApiServerRunning(true)
+        setApiServerEnabled(true)
        window.toast.success(t('apiServer.messages.startSuccess'))
      } else {
        window.toast.error(t('apiServer.messages.startError') + result.error)
@@ -55,16 +58,16 @@ export const useApiServer = () => {
    } finally {
      setApiServerLoading(false)
    }
-  }, [apiServerLoading, t])
+  }, [apiServerLoading, setApiServerEnabled, t])

  const stopApiServer = useCallback(async () => {
    if (apiServerLoading) return
-
    setApiServerLoading(true)
    try {
      const result = await window.api.apiServer.stop()
      if (result.success) {
        setApiServerRunning(false)
+        setApiServerEnabled(false)
        window.toast.success(t('apiServer.messages.stopSuccess'))
      } else {
        window.toast.error(t('apiServer.messages.stopError') + result.error)
@@ -74,14 +77,14 @@ export const useApiServer = () => {
    } finally {
      setApiServerLoading(false)
    }
-  }, [apiServerLoading, t])
+  }, [apiServerLoading, setApiServerEnabled, t])

  const restartApiServer = useCallback(async () => {
    if (apiServerLoading) return
-
    setApiServerLoading(true)
    try {
      const result = await window.api.apiServer.restart()
+      setApiServerEnabled(result.success)
      if (result.success) {
        await checkApiServerStatus()
        window.toast.success(t('apiServer.messages.restartSuccess'))
@@ -93,7 +96,7 @@ export const useApiServer = () => {
    } finally {
      setApiServerLoading(false)
    }
-  }, [apiServerLoading, checkApiServerStatus, t])
+  }, [apiServerLoading, checkApiServerStatus, setApiServerEnabled, t])

  useEffect(() => {
    checkApiServerStatus()
--- a/src/renderer/src/hooks/useAppInit.ts
+++ b/src/renderer/src/hooks/useAppInit.ts
@@ -221,13 +221,12 @@ export function useAppInit() {
      }
    }

-    window.electron.ipcRenderer.on(IpcChannel.AgentToolPermission_Request, requestListener)
-    window.electron.ipcRenderer.on(IpcChannel.AgentToolPermission_Result, resultListener)
+    const removeListeners = [
+      window.electron.ipcRenderer.on(IpcChannel.AgentToolPermission_Request, requestListener),
+      window.electron.ipcRenderer.on(IpcChannel.AgentToolPermission_Result, resultListener)
+    ]

-    return () => {
-      window.electron?.ipcRenderer.removeListener(IpcChannel.AgentToolPermission_Request, requestListener)
-      window.electron?.ipcRenderer.removeListener(IpcChannel.AgentToolPermission_Result, resultListener)
-    }
+    return () => removeListeners.forEach((removeListener) => removeListener())
  }, [dispatch, t])

  useEffect(() => {
--- a/src/renderer/src/hooks/useAwsBedrock.ts
+++ b/src/renderer/src/hooks/useAwsBedrock.ts
@@ -1,5 +1,12 @@
 import store, { useAppSelector } from '@renderer/store'
-import { setAwsBedrockAccessKeyId, setAwsBedrockRegion, setAwsBedrockSecretAccessKey } from '@renderer/store/llm'
+import {
+  setAwsBedrockAccessKeyId,
+  setAwsBedrockApiKey,
+  setAwsBedrockAuthType,
+  setAwsBedrockRegion,
+  setAwsBedrockSecretAccessKey
+} from '@renderer/store/llm'
+import type { AwsBedrockAuthType } from '@renderer/types'
 import { useDispatch } from 'react-redux'

 export function useAwsBedrockSettings() {
@@ -8,8 +15,10 @@ export function useAwsBedrockSettings() {

  return {
    ...settings,
+    setAuthType: (authType: AwsBedrockAuthType) => dispatch(setAwsBedrockAuthType(authType)),
    setAccessKeyId: (accessKeyId: string) => dispatch(setAwsBedrockAccessKeyId(accessKeyId)),
    setSecretAccessKey: (secretAccessKey: string) => dispatch(setAwsBedrockSecretAccessKey(secretAccessKey)),
+    setApiKey: (apiKey: string) => dispatch(setAwsBedrockApiKey(apiKey)),
    setRegion: (region: string) => dispatch(setAwsBedrockRegion(region))
  }
 }
@@ -18,6 +27,10 @@ export function getAwsBedrockSettings() {
  return store.getState().llm.settings.awsBedrock
 }

+export function getAwsBedrockAuthType() {
+  return store.getState().llm.settings.awsBedrock.authType
+}
+
 export function getAwsBedrockAccessKeyId() {
  return store.getState().llm.settings.awsBedrock.accessKeyId
 }
@@ -26,6 +39,10 @@ export function getAwsBedrockSecretAccessKey() {
  return store.getState().llm.settings.awsBedrock.secretAccessKey
 }

+export function getAwsBedrockApiKey() {
+  return store.getState().llm.settings.awsBedrock.apiKey
+}
+
 export function getAwsBedrockRegion() {
  return store.getState().llm.settings.awsBedrock.region
 }
--- a/src/renderer/src/hooks/useMessageOperations.ts
+++ b/src/renderer/src/hooks/useMessageOperations.ts
@@ -20,11 +20,11 @@ import {
  updateMessageAndBlocksThunk,
  updateTranslationBlockThunk
 } from '@renderer/store/thunk/messageThunk'
-import type { Assistant, Model, Topic, TranslateLanguageCode } from '@renderer/types'
+import { type Assistant, type Model, objectKeys, type Topic, type TranslateLanguageCode } from '@renderer/types'
 import type { Message, MessageBlock } from '@renderer/types/newMessage'
 import { MessageBlockStatus, MessageBlockType } from '@renderer/types/newMessage'
 import { abortCompletion } from '@renderer/utils/abortController'
-import { throttle } from 'lodash'
+import { difference, throttle } from 'lodash'
 import { useCallback } from 'react'

 const logger = loggerService.withContext('UseMessageOperations')
@@ -82,10 +82,12 @@ export function useMessageOperations(topic: Topic) {
        logger.error('[editMessage] Topic prop is not valid.')
        return
      }
-
+      const uiStates = ['multiModelMessageStyle', 'foldSelected'] as const satisfies (keyof Message)[]
+      const extraUpdate = difference(objectKeys(updates), uiStates)
+      const isUiUpdateOnly = extraUpdate.length === 0
      const messageUpdates: Partial<Message> & Pick<Message, 'id'> = {
        id: messageId,
-        updatedAt: new Date().toISOString(),
+        updatedAt: isUiUpdateOnly ? undefined : new Date().toISOString(),
        ...updates
      }

--- a/src/renderer/src/hooks/useUserTheme.ts
+++ b/src/renderer/src/hooks/useUserTheme.ts
@@ -12,19 +12,7 @@ export default function useUserTheme() {
    const colorPrimary = Color(theme.colorPrimary)

    document.body.style.setProperty('--color-primary', colorPrimary.toString())
-    // overwrite hero UI primary color.
    document.body.style.setProperty('--primary', colorPrimary.toString())
-    document.body.style.setProperty('--heroui-primary', colorPrimary.toString())
-    document.body.style.setProperty('--heroui-primary-900', colorPrimary.lighten(0.5).toString())
-    document.body.style.setProperty('--heroui-primary-800', colorPrimary.lighten(0.4).toString())
-    document.body.style.setProperty('--heroui-primary-700', colorPrimary.lighten(0.3).toString())
-    document.body.style.setProperty('--heroui-primary-600', colorPrimary.lighten(0.2).toString())
-    document.body.style.setProperty('--heroui-primary-500', colorPrimary.lighten(0.1).toString())
-    document.body.style.setProperty('--heroui-primary-400', colorPrimary.toString())
-    document.body.style.setProperty('--heroui-primary-300', colorPrimary.darken(0.1).toString())
-    document.body.style.setProperty('--heroui-primary-200', colorPrimary.darken(0.2).toString())
-    document.body.style.setProperty('--heroui-primary-100', colorPrimary.darken(0.3).toString())
-    document.body.style.setProperty('--heroui-primary-50', colorPrimary.darken(0.4).toString())
    document.body.style.setProperty('--color-primary-soft', colorPrimary.alpha(0.6).toString())
    document.body.style.setProperty('--color-primary-mute', colorPrimary.alpha(0.3).toString())

--- a/src/renderer/src/i18n/label.ts
+++ b/src/renderer/src/i18n/label.ts
@@ -85,7 +85,8 @@ const providerKeyMap = {
  poe: 'provider.poe',
  aionly: 'provider.aionly',
  longcat: 'provider.longcat',
-  huggingface: 'provider.huggingface'
+  huggingface: 'provider.huggingface',
+  sophnet: 'provider.sophnet'
 } as const

 /**
@@ -238,7 +239,7 @@ const paintingsImageSizeOptionsKeyMap = {
 } as const

 export const getPaintingsImageSizeOptionsLabel = (key: string): string => {
-  return getLabel(paintingsImageSizeOptionsKeyMap, key)
+  return paintingsImageSizeOptionsKeyMap[key] ? getLabel(paintingsImageSizeOptionsKeyMap, key) : key
 }

 const paintingsQualityOptionsKeyMap = {
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -339,6 +339,41 @@
    },
    "title": "API Server"
  },
+  "appMenu": {
+    "about": "About",
+    "close": "Close Window",
+    "copy": "Copy",
+    "cut": "Cut",
+    "delete": "Delete",
+    "documentation": "Documentation",
+    "edit": "Edit",
+    "feedback": "Feedback",
+    "file": "File",
+    "forceReload": "Force Reload",
+    "front": "Bring All to Front",
+    "help": "Help",
+    "hide": "Hide",
+    "hideOthers": "Hide Others",
+    "minimize": "Minimize",
+    "paste": "Paste",
+    "quit": "Quit",
+    "redo": "Redo",
+    "releases": "Releases",
+    "reload": "Reload",
+    "resetZoom": "Actual Size",
+    "selectAll": "Select All",
+    "services": "Services",
+    "toggleDevTools": "Toggle Developer Tools",
+    "toggleFullscreen": "Toggle Fullscreen",
+    "undo": "Undo",
+    "unhide": "Show All",
+    "view": "View",
+    "website": "Website",
+    "window": "Window",
+    "zoom": "Zoom",
+    "zoomIn": "Zoom In",
+    "zoomOut": "Zoom Out"
+  },
  "assistants": {
    "abbr": "Assistants",
    "clear": {
@@ -2067,8 +2102,8 @@
        "select": "Select",
        "select_directory_failed": "Failed to select directory",
        "title": "Data Settings",
-        "work_directory_description": "Work directory is where all note files are stored. Changing the work directory won't move existing files, please migrate files manually.",
-        "work_directory_placeholder": "Select notes work directory"
+        "work_directory_description": "Work directory is where all note files are stored. Supports relative paths like ~/Notes or ./Notes for multi-device sync. Changing the work directory won't move existing files, please migrate files manually.",
+        "work_directory_placeholder": "Enter or select notes work directory (e.g., ~/Notes)"
      },
      "display": {
        "compress_content": "Content Compression",
@@ -2482,6 +2517,7 @@
    "qiniu": "Qiniu AI",
    "qwenlm": "QwenLM",
    "silicon": "SiliconFlow",
+    "sophnet": "SophNet",
    "stepfun": "StepFun",
    "tencent-cloud-ti": "Tencent Cloud TI",
    "together": "Together",
@@ -3765,6 +3801,7 @@
        "description": "Do not enable MCP server functionality",
        "label": "Disable MCP Server"
      },
+      "discover": "Discover",
      "duplicateName": "A server with this name already exists",
      "editJson": "Edit JSON",
      "editMcpJson": "Edit MCP Configuration",
@@ -3775,6 +3812,10 @@
        "32000": "MCP server failed to start, please check the parameters according to the tutorial",
        "toolNotFound": "Tool {{name}} not found"
      },
+      "fetch": {
+        "button": "Fetch Servers",
+        "success": "Successfully fetched MCP servers"
+      },
      "findMore": "Find More MCP",
      "headers": "Headers",
      "headersTooltip": "Custom headers for HTTP requests",
@@ -3790,6 +3831,7 @@
      "logoUrl": "Logo URL",
      "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",
      "missingDependencies": "is Missing, please install it to continue.",
      "more": {
        "awesome": "Curated MCP Server List",
@@ -3821,6 +3863,12 @@
        "usage": "Usage",
        "version": "Version"
      },
+      "oauth": {
+        "callback": {
+          "message": "You can close this page and return to Cherry Studio",
+          "title": "Authentication Successful"
+        }
+      },
      "prompts": {
        "arguments": "Arguments",
        "availablePrompts": "Available Prompts",
@@ -3838,6 +3886,7 @@
      "provider": "Provider",
      "providerPlaceholder": "Provider name",
      "providerUrl": "Provider URL",
+      "providers": "Providers",
      "registry": "Package Registry",
      "registryDefault": "Default",
      "registryTooltip": "Choose the registry for package installation to resolve network issues with the default registry.",
@@ -3860,6 +3909,7 @@
      "searchNpx": "Search MCP",
      "serverPlural": "servers",
      "serverSingular": "server",
+      "servers": "MCP Servers",
      "sse": "Server-Sent Events (sse)",
      "startError": "Start failed",
      "stdio": "Standard Input/Output (stdio)",
@@ -4259,6 +4309,12 @@
      "aws-bedrock": {
        "access_key_id": "AWS Access Key ID",
        "access_key_id_help": "Your AWS Access Key ID for accessing AWS Bedrock services",
+        "api_key": "Bedrock API Key",
+        "api_key_help": "Your AWS Bedrock API Key for authentication",
+        "auth_type": "Authentication Type",
+        "auth_type_api_key": "Bedrock API Key",
+        "auth_type_help": "Choose between IAM credentials or Bedrock API Key authentication",
+        "auth_type_iam": "IAM Credentials",
        "description": "AWS Bedrock is Amazon's fully managed foundation model service that supports various advanced large language models",
        "region": "AWS Region",
        "region_help": "Your AWS service region, e.g., us-east-1",
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -339,6 +339,41 @@
    },
    "title": "API 服务器"
  },
+  "appMenu": {
+    "about": "关于",
+    "close": "关闭窗口",
+    "copy": "复制",
+    "cut": "剪切",
+    "delete": "删除",
+    "documentation": "文档",
+    "edit": "编辑",
+    "feedback": "反馈",
+    "file": "文件",
+    "forceReload": "强制重新加载",
+    "front": "全部置于顶层",
+    "help": "帮助",
+    "hide": "隐藏",
+    "hideOthers": "隐藏其他",
+    "minimize": "最小化",
+    "paste": "粘贴",
+    "quit": "退出",
+    "redo": "重做",
+    "releases": "版本发布",
+    "reload": "重新加载",
+    "resetZoom": "实际大小",
+    "selectAll": "全选",
+    "services": "服务",
+    "toggleDevTools": "切换开发者工具",
+    "toggleFullscreen": "切换全屏",
+    "undo": "撤销",
+    "unhide": "全部显示",
+    "view": "视图",
+    "website": "网站",
+    "window": "窗口",
+    "zoom": "缩放",
+    "zoomIn": "放大",
+    "zoomOut": "缩小"
+  },
  "assistants": {
    "abbr": "助手",
    "clear": {
@@ -1611,7 +1646,7 @@
    },
    "assistant": {
      "added": {
-        "content": "智能体添加成功"
+        "content": "助手添加成功"
      }
    },
    "attachments": {
@@ -2067,8 +2102,8 @@
        "select": "选择",
        "select_directory_failed": "选择目录失败",
        "title": "数据设置",
-        "work_directory_description": "工作目录是存储所有笔记文件的位置。更改工作目录不会移动现有文件，请手动迁移文件。",
-        "work_directory_placeholder": "选择笔记工作目录"
+        "work_directory_description": "工作目录是存储所有笔记文件的位置。支持相对路径如 ~/笔记 或 ./笔记 以实现多设备同步。更改工作目录不会移动现有文件，请手动迁移文件。",
+        "work_directory_placeholder": "输入或选择笔记工作目录（例如：~/笔记）"
      },
      "display": {
        "compress_content": "缩减栏宽",
@@ -2482,6 +2517,7 @@
    "qiniu": "七牛云 AI 推理",
    "qwenlm": "QwenLM",
    "silicon": "硅基流动",
+    "sophnet": "SophNet",
    "stepfun": "阶跃星辰",
    "tencent-cloud-ti": "腾讯云 TI",
    "together": "Together",
@@ -3765,6 +3801,7 @@
        "description": "不启用 MCP 服务功能",
        "label": "不使用 MCP 服务器"
      },
+      "discover": "发现",
      "duplicateName": "已存在同名服务器",
      "editJson": "编辑 JSON",
      "editMcpJson": "编辑 MCP 配置",
@@ -3775,6 +3812,10 @@
        "32000": "MCP 服务器启动失败，请根据教程检查参数是否填写完整",
        "toolNotFound": "未找到工具 {{name}}"
      },
+      "fetch": {
+        "button": "获取服务器",
+        "success": "服务器获取成功"
+      },
      "findMore": "更多 MCP",
      "headers": "请求头",
      "headersTooltip": "HTTP 请求的自定义请求头",
@@ -3790,6 +3831,7 @@
      "logoUrl": "标志网址",
      "longRunning": "长时间运行模式",
      "longRunningTooltip": "启用后，服务器支持长时间任务，接收到进度通知时会重置超时计时器，并延长最大超时时间至10分钟",
+      "marketplaces": "市场",
      "missingDependencies": "缺失，请安装它以继续",
      "more": {
        "awesome": "精选的 MCP 服务器列表",
@@ -3821,6 +3863,12 @@
        "usage": "用法",
        "version": "版本"
      },
+      "oauth": {
+        "callback": {
+          "message": "您可以关闭此页面并返回 Cherry Studio",
+          "title": "认证成功"
+        }
+      },
      "prompts": {
        "arguments": "参数",
        "availablePrompts": "可用提示",
@@ -3838,6 +3886,7 @@
      "provider": "提供者",
      "providerPlaceholder": "提供者名称",
      "providerUrl": "提供者网址",
+      "providers": "提供商",
      "registry": "包管理源",
      "registryDefault": "默认",
      "registryTooltip": "选择用于安装包的源，以解决默认源的网络问题",
@@ -3860,6 +3909,7 @@
      "searchNpx": "搜索 MCP",
      "serverPlural": "服务器",
      "serverSingular": "服务器",
+      "servers": "MCP 服务器",
      "sse": "服务器发送事件 (sse)",
      "startError": "启动失败",
      "stdio": "标准输入 / 输出 (stdio)",
@@ -4259,6 +4309,12 @@
      "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 是亚马逊提供的全托管基础模型服务，支持多种先进的大语言模型",
        "region": "AWS 区域",
        "region_help": "您的 AWS 服务区域，例如 us-east-1",
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -339,6 +339,41 @@
    },
    "title": "API 伺服器"
  },
+  "appMenu": {
+    "about": "關於",
+    "close": "關閉視窗",
+    "copy": "複製",
+    "cut": "剪下",
+    "delete": "刪除",
+    "documentation": "文件",
+    "edit": "編輯",
+    "feedback": "回饋",
+    "file": "檔案",
+    "forceReload": "強制重新載入",
+    "front": "全部置於頂層",
+    "help": "幫助",
+    "hide": "隱藏",
+    "hideOthers": "隱藏其他",
+    "minimize": "最小化",
+    "paste": "貼上",
+    "quit": "結束",
+    "redo": "重做",
+    "releases": "版本發布",
+    "reload": "重新載入",
+    "resetZoom": "實際大小",
+    "selectAll": "全選",
+    "services": "服務",
+    "toggleDevTools": "切換開發者工具",
+    "toggleFullscreen": "切換全螢幕",
+    "undo": "復原",
+    "unhide": "全部顯示",
+    "view": "檢視",
+    "website": "網站",
+    "window": "視窗",
+    "zoom": "縮放",
+    "zoomIn": "放大",
+    "zoomOut": "縮小"
+  },
  "assistants": {
    "abbr": "助手",
    "clear": {
@@ -1611,7 +1646,7 @@
    },
    "assistant": {
      "added": {
-        "content": "智慧代理人新增成功"
+        "content": "助手新增成功"
      }
    },
    "attachments": {
@@ -2067,8 +2102,8 @@
        "select": "選擇",
        "select_directory_failed": "選擇目錄失敗",
        "title": "數據設置",
-        "work_directory_description": "工作目錄是存儲所有筆記文件的位置。\n更改工作目錄不會移動現有文件，請手動遷移文件。",
-        "work_directory_placeholder": "選擇筆記工作目錄"
+        "work_directory_description": "工作目錄是存儲所有筆記文件的位置。支持相對路徑如 ~/筆記 或 ./筆記 以實現多設備同步。\n更改工作目錄不會移動現有文件，請手動遷移文件。",
+        "work_directory_placeholder": "輸入或選擇筆記工作目錄（例如：~/筆記）"
      },
      "display": {
        "compress_content": "縮減欄寬",
@@ -2482,6 +2517,7 @@
    "qiniu": "七牛雲 AI 推理",
    "qwenlm": "QwenLM",
    "silicon": "SiliconFlow",
+    "sophnet": "SophNet",
    "stepfun": "StepFun",
    "tencent-cloud-ti": "騰訊雲 TI",
    "together": "Together",
@@ -3765,6 +3801,7 @@
        "description": "不啟用 MCP 服務功能",
        "label": "不使用 MCP 伺服器"
      },
+      "discover": "發現",
      "duplicateName": "已存在相同名稱的伺服器",
      "editJson": "編輯 JSON",
      "editMcpJson": "編輯 MCP 配置",
@@ -3775,6 +3812,10 @@
        "32000": "MCP 伺服器啟動失敗，請根據教程檢查參數是否填寫完整",
        "toolNotFound": "未找到工具 {{name}}"
      },
+      "fetch": {
+        "button": "獲取伺服器",
+        "success": "伺服器獲取成功"
+      },
      "findMore": "更多 MCP",
      "headers": "請求標頭",
      "headersTooltip": "HTTP 請求的自定義標頭",
@@ -3790,6 +3831,7 @@
      "logoUrl": "標誌網址",
      "longRunning": "長時間運行模式",
      "longRunningTooltip": "啟用後，伺服器支援長時間任務，接收到進度通知時會重置超時計時器，並延長最大超時時間至10分鐘",
+      "marketplaces": "市場",
      "missingDependencies": "缺失，請安裝它以繼續",
      "more": {
        "awesome": "精選的 MCP 伺服器清單",
@@ -3821,6 +3863,12 @@
        "usage": "用法",
        "version": "版本"
      },
+      "oauth": {
+        "callback": {
+          "message": "您可以關閉此頁面並返回 Cherry Studio",
+          "title": "認證成功"
+        }
+      },
      "prompts": {
        "arguments": "參數",
        "availablePrompts": "可用提示",
@@ -3838,6 +3886,7 @@
      "provider": "提供者",
      "providerPlaceholder": "提供者名稱",
      "providerUrl": "提供者網址",
+      "providers": "提供商",
      "registry": "套件管理源",
      "registryDefault": "預設",
      "registryTooltip": "選擇用於安裝套件的源，以解決預設源的網路問題",
@@ -3860,6 +3909,7 @@
      "searchNpx": "搜索 MCP",
      "serverPlural": "伺服器",
      "serverSingular": "伺服器",
+      "servers": "MCP 伺服器",
      "sse": "伺服器傳送事件 (sse)",
      "startError": "啟動失敗",
      "stdio": "標準輸入 / 輸出 (stdio)",
@@ -4259,6 +4309,12 @@
      "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 是亞馬遜提供的全托管基础模型服務，支持多種先進的大語言模型",
        "region": "AWS 區域",
        "region_help": "您的 AWS 服務區域，例如 us-east-1",
--- a/src/renderer/src/i18n/translate/de-de.json
+++ b/src/renderer/src/i18n/translate/de-de.json
@@ -339,6 +339,41 @@
    },
    "title": "API-Server"
  },
+  "appMenu": {
+    "about": "Über",
+    "close": "Fenster schließen",
+    "copy": "Kopieren",
+    "cut": "Schneiden",
+    "delete": "Löschen",
+    "documentation": "Dokumentation",
+    "edit": "Bearbeiten",
+    "feedback": "Rückmeldung",
+    "file": "Datei",
+    "forceReload": "Neu laden erzwingen",
+    "front": "Alle in den Vordergrund bringen",
+    "help": "Hilfe",
+    "hide": "Verstecken",
+    "hideOthers": "Andere ausblenden",
+    "minimize": "Minimieren",
+    "paste": "Einfügen",
+    "quit": "Aufhören",
+    "redo": "Wiederholen",
+    "releases": "Veröffentlichungen",
+    "reload": "Neu laden",
+    "resetZoom": "Tatsächliche Größe",
+    "selectAll": "Alle auswählen",
+    "services": "Dienstleistungen",
+    "toggleDevTools": "Entwicklertools ein-/ausblenden",
+    "toggleFullscreen": "Vollbild umschalten",
+    "undo": "Rückgängig machen",
+    "unhide": "Alle anzeigen",
+    "view": "Ansicht",
+    "website": "Website",
+    "window": "Fenster",
+    "zoom": "Zoom",
+    "zoomIn": "Heranzoomen",
+    "zoomOut": "Herauszoomen"
+  },
  "assistants": {
    "abbr": "Assistent",
    "clear": {
@@ -1611,7 +1646,7 @@
    },
    "assistant": {
      "added": {
-        "content": "Agent erfolgreich hinzugefügt"
+        "content": "Assistent erfolgreich hinzugefügt"
      }
    },
    "attachments": {
@@ -2476,12 +2511,13 @@
    "openrouter": "OpenRouter",
    "ovms": "Intel OVMS",
    "perplexity": "Perplexity",
-    "ph8": "PH8 Großmodell-Plattform",
+    "ph8": "PH8",
    "poe": "Poe",
    "ppio": "PPIO Cloud",
    "qiniu": "Qiniu Cloud KI-Inferenz",
    "qwenlm": "QwenLM",
    "silicon": "SiliconFlow",
+    "sophnet": "SophNet",
    "stepfun": "StepFun",
    "tencent-cloud-ti": "Tencent Cloud TI",
    "together": "Together",
@@ -3765,6 +3801,7 @@
        "description": "MCP-Service-Funktion nicht aktivieren",
        "label": "MCP-Server nicht verwenden"
      },
+      "discover": "Entdecken",
      "duplicateName": "Server mit gleichem Namen existiert bereits",
      "editJson": "JSON bearbeiten",
      "editMcpJson": "MCP-Konfiguration bearbeiten",
@@ -3775,6 +3812,10 @@
        "32000": "MCP-Server starten fehlgeschlagen, bitte überprüfen Sie, ob alle Parameter vollständig ausgefüllt sind",
        "toolNotFound": "Tool {{name}} nicht gefunden"
      },
+      "fetch": {
+        "button": "Server abrufen",
+        "success": "MCP-Server erfolgreich abgerufen"
+      },
      "findMore": "Mehr MCP",
      "headers": "Request-Header",
      "headersTooltip": "Benutzerdefinierte Request-Header für HTTP-Anfragen",
@@ -3790,6 +3831,7 @@
      "logoUrl": "Logo-URL",
      "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",
      "missingDependencies": "Abhängigkeiten fehlen, bitte installieren Sie sie, um fortzufahren",
      "more": {
        "awesome": "Kuratierte MCP-Serverliste",
@@ -3821,6 +3863,12 @@
        "usage": "Verwendung",
        "version": "Version"
      },
+      "oauth": {
+        "callback": {
+          "message": "Sie können diese Seite schließen und zu Cherry Studio zurückkehren",
+          "title": "Authentifizierung erfolgreich"
+        }
+      },
      "prompts": {
        "arguments": "Parameter",
        "availablePrompts": "Verfügbare Prompts",
@@ -3838,6 +3886,7 @@
      "provider": "Anbieter",
      "providerPlaceholder": "Anbietername",
      "providerUrl": "Anbieter-Website",
+      "providers": "Anbieter",
      "registry": "Paketverwaltungsquelle",
      "registryDefault": "Standard",
      "registryTooltip": "Quelle für Paketinstallation auswählen um Netzwerkprobleme der Standardquelle zu lösen",
@@ -3860,6 +3909,7 @@
      "searchNpx": "MCP durchsuchen",
      "serverPlural": "Server",
      "serverSingular": "Server",
+      "servers": "MCP-Server",
      "sse": "Server-Sende-Ereignisse (sse)",
      "startError": "Start fehlgeschlagen",
      "stdio": "Standard-Eingabe / -Ausgabe (stdio)",
@@ -4259,6 +4309,12 @@
      "aws-bedrock": {
        "access_key_id": "AWS-Zugriffsschlüssel-ID",
        "access_key_id_help": "Ihre AWS-Zugriffsschlüssel-ID, um auf AWS Bedrock-Dienste zuzugreifen",
+        "api_key": "Bedrock-API-Schlüssel",
+        "api_key_help": "Ihr AWS Bedrock-API-Schlüssel für die Authentifizierung",
+        "auth_type": "Authentifizierungstyp",
+        "auth_type_api_key": "Bedrock-API-Schlüssel",
+        "auth_type_help": "Wählen Sie zwischen IAM-Anmeldeinformationen oder Bedrock-API-Schlüssel-Authentifizierung",
+        "auth_type_iam": "IAM-Anmeldeinformationen",
        "description": "AWS Bedrock ist ein vollständig verwalteter Basismodell-Dienst von Amazon, der eine Vielzahl moderner großer Sprachmodelle unterstützt",
        "region": "AWS-Region",
        "region_help": "Ihre AWS-Serviceregion, z.B. us-east-1",
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`export { AllowedToolsSelect } from './AllowedToolsSelect'`