Merge branch 'main' into feat/sora2

# Conflicts:
#	package.json
#	src/renderer/src/config/models/utils.ts
#	src/renderer/src/store/migrate.ts

.github/workflows/claude-translator.yml

@@ -45,7 +45,7 @@ jobs:
           # See: https://github.com/anthropics/claude-code-action/blob/main/docs/security.md
           github_token: ${{ secrets.TOKEN_GITHUB_WRITE }}
           allowed_non_write_users: "*"
-          claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
+          anthropic_api_key: ${{ secrets.CLAUDE_TRANSLATOR_APIKEY }}
           claude_args: "--allowed-tools Bash(gh issue:*),Bash(gh api:repos/*/issues:*),Bash(gh api:repos/*/pulls/*/reviews/*),Bash(gh api:repos/*/pulls/comments/*)"
           prompt: |
             你是一个多语言翻译助手。你需要响应 GitHub Webhooks 中的以下四种事件：
@@ -108,3 +108,5 @@ jobs:
 
             使用以下命令获取完整信息：
             gh issue view ${{ github.event.issue.number }} --json title,body,comments
+        env:
+          ANTHROPIC_BASE_URL: ${{ secrets.CLAUDE_TRANSLATOR_BASEURL }}

.yarn/patches/@ai-sdk-google-npm-2.0.20-b9102f9d54.patch

@@ -1,8 +1,8 @@
 diff --git a/dist/index.mjs b/dist/index.mjs
-index b957cb824faa79cf01ba3a504f221870bd8e306a..4d71d30f655775d61537d9d8b73f6e17d41fa67e 100644
+index 69ab1599c76801dc1167551b6fa283dded123466..f0af43bba7ad1196fe05338817e65b4ebda40955 100644
 --- a/dist/index.mjs
 +++ b/dist/index.mjs
-@@ -452,7 +452,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
+@@ -477,7 +477,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
  
  // src/get-model-path.ts
  function getModelPath(modelId) {

.yarn/patches/@opeoginni-github-copilot-openai-compatible-npm-0.1.18-3f65760532.patch

@@ -0,0 +1,44 @@
+diff --git a/dist/index.js b/dist/index.js
+index 53f411e55a4c9a06fd29bb4ab8161c4ad15980cd..71b91f196c8b886ed90dd237dec5625d79d5677e 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -12676,10 +12676,13 @@ var OpenAIResponsesLanguageModel = class {
+                   }
+                 });
+               } else if (value.item.type === "message") {
+-                controller.enqueue({
+-                  type: "text-end",
+-                  id: value.item.id
+-                });
++                // Fix for gpt-5-codex: use currentTextId to ensure text-end matches text-start
++                if (currentTextId) {
++                  controller.enqueue({
++                    type: "text-end",
++                    id: currentTextId
++                  });
++                }
+                 currentTextId = null;
+               } else if (isResponseOutputItemDoneReasoningChunk(value)) {
+                 const activeReasoningPart = activeReasoning[value.item.id];
+diff --git a/dist/index.mjs b/dist/index.mjs
+index 7719264da3c49a66c2626082f6ccaae6e3ef5e89..090fd8cf142674192a826148428ed6a0c4a54e35 100644
+--- a/dist/index.mjs
++++ b/dist/index.mjs
+@@ -12670,10 +12670,13 @@ var OpenAIResponsesLanguageModel = class {
+                   }
+                 });
+               } else if (value.item.type === "message") {
+-                controller.enqueue({
+-                  type: "text-end",
+-                  id: value.item.id
+-                });
++                // Fix for gpt-5-codex: use currentTextId to ensure text-end matches text-start
++                if (currentTextId) {
++                  controller.enqueue({
++                    type: "text-end",
++                    id: currentTextId
++                  });
++                }
+                 currentTextId = null;
+               } else if (isResponseOutputItemDoneReasoningChunk(value)) {
+                 const activeReasoningPart = activeReasoning[value.item.id];

electron-builder.yml

@@ -125,21 +125,113 @@ afterSign: scripts/notarize.js
 artifactBuildCompleted: scripts/artifact-build-completed.js
 releaseInfo:
   releaseNotes: |
-    What's New in v1.6.3
+    <!--LANG:en-->
+    What's New in v1.7.0-beta.1
 
-    Features:
-    - Notes: Add spell-check control, automatic table line wrapping, export functionality, and LLM-based renaming
-    - UI: Expand topic rename clickable area, add middle-click tab closing, remove redundant scrollbars, fix message menubar overflow
-    - Editor: Add read-only extension support, make TextFilePreview read-only but copyable
-    - Models: Update support for DeepSeek v3.2, Claude 4.5, GLM 4.6, Gemini regex, and vision models
-    - Code Tools: Add GitHub Copilot CLI integration
+    Major Features:
+    - Agent System: Introducing intelligent Agent capabilities alongside Assistants. Agents can autonomously solve complex problems using Claude Code SDK with tool calling, file operations, and multi-turn reasoning
+    - Agent Management: Create, configure, and manage agents with custom settings including model selection, tool permissions, accessible paths, and MCP server integrations
+    - Agent Sessions: Dedicated session management for agent interactions with persistent message history and context tracking
+    - Unified UI: Streamlined interface combining Assistants and Agents tabs with improved navigation and settings management
+
+    Agent Features:
+    - Tool Support: Web search, file operations, bash commands, and custom MCP tools
+    - Advanced Configuration: Max turns, temperature, token limits
+    - Permission Control: Configurable tool approval modes (manual, automatic, none)
+    - Session Persistence: Automatic message saving with optimized streaming and database integration
+    - Model Selection: API-based model filtering with provider-specific support
+
+    UI/UX Improvements:
+    - Unified assistant/agent tabs with smooth animations
+    - In-place session name editing
+    - Virtual list rendering for improved performance
+    - Session count indicators for active agents
+    - Enhanced settings popup with tabbed interface
+    - Webview keyboard shortcut interception for search functionality
+
+    API & Infrastructure:
+    - RESTful API for agent and session management
+    - Drizzle ORM integration for agent database
+    - OAuth support for Claude Code authentication
+    - Express validator for request validation
+    - Comprehensive error handling with Zod schemas
+
+    Model Updates:
+    - Gemini 2.5 Image Flash support
+    - Grok 4 Fast with reasoning capabilities
+    - Qwen3-omni and Qwen3-vl thinking models
+    - DeepSeek, Claude 4.5, GLM 4.6 support
+    - GitHub Copilot CLI integration with gpt-5-codex
 
     Bug Fixes:
+    - Fix Swagger UI accessibility issues
+    - Fix AI SDK error display with syntax highlighting
+    - Fix webview search shortcut handling
+    - Fix agent model visibility for CherryIn provider
+    - Fix session message ordering and persistence
+    - Fix anthropic model visibility in agent configuration
+    - Fix knowledge base deletion and web search RAG errors
     - Fix migration for missing providers
-    - Fix forked topic retaining old name after rename
-    - Restore first token latency reporting in metrics
-    - Fix UI scrollbar and overflow issues
 
     Technical Updates:
-    - Upgrade to Electron 37.6.0
-    - Update dependencies across packages
+    - React 19.2.0 upgrade
+    - Enhanced Claude Code service with streaming support
+    - Improved message transformation and streaming lifecycle
+    - Database migration system with automatic schema sync
+    - Optimized bundle size and dependency management
+
+    <!--LANG:zh-CN-->
+    v1.7.0-beta.1 新特性
+
+    核心功能:
+    - Agent 系统：引入智能 Agent 能力,与助手(Assistant)并存。Agent 基于 Claude Code SDK 构建,具备工具调用、文件操作和多轮推理能力,可自主解决复杂问题
+    - Agent 管理：创建、配置和管理 Agent,支持自定义模型选择、工具权限、可访问路径和 MCP 服务器集成
+    - Agent 会话：专属会话管理系统,支持持久化消息历史和上下文追踪
+    - 统一界面：精简的助手和 Agent 标签页界面,改进导航和设置管理体验
+
+    Agent 功能特性:
+    - 工具支持：网页搜索、文件操作、Bash 命令执行和自定义 MCP 工具
+    - 高级配置：最大轮次、温度、Token 限制
+    - 权限控制：可配置的工具批准模式(手动、自动、无需批准)
+    - 会话持久化：自动消息保存,优化的流式传输和数据库集成
+    - 模型选择：基于 API 的模型过滤,支持特定提供商
+
+    界面与交互优化:
+    - 统一的助手/Agent 标签页,带有流畅动画效果
+    - 会话名称原地编辑功能
+    - 虚拟列表渲染,提升性能表现
+    - 活跃 Agent 的会话计数指示器
+    - 增强的设置弹窗,采用标签页界面
+    - Webview 键盘快捷键拦截,支持搜索功能
+
+    API 与基础设施:
+    - RESTful API 用于 Agent 和会话管理
+    - 集成 Drizzle ORM 管理 Agent 数据库
+    - Claude Code OAuth 认证支持
+    - Express validator 请求验证
+    - 基于 Zod 模式的完善错误处理
+
+    模型更新:
+    - 支持 Gemini 2.5 Image Flash
+    - Grok 4 Fast 推理能力
+    - Qwen3-omni 和 Qwen3-vl 思考模型
+    - DeepSeek、Claude 4.5、GLM 4.6 支持
+    - GitHub Copilot CLI 集成 gpt-5-codex
+
+    问题修复:
+    - 修复 Swagger UI 无法打开
+    - 修复 AI SDK 错误显示,添加语法高亮
+    - 修复 Webview 搜索快捷键处理
+    - 修复 CherryIn 提供商的 Agent 模型可见性
+    - 修复会话消息排序和持久化
+    - 修复 Anthropic 模型在 Agent 配置中的可见性
+    - 修复知识库删除和网页搜索 RAG 错误
+    - 修复缺失提供商的迁移问题
+
+    技术更新:
+    - 升级至 React 19.2.0
+    - 增强 Claude Code 服务流式传输支持
+    - 改进消息转换和流式生命周期
+    - 数据库迁移系统,支持自动模式同步
+    - 优化打包大小和依赖管理
+    <!--LANG:END-->

package.json

@@ -83,6 +83,7 @@
     "@libsql/win32-x64-msvc": "^0.4.7",
     "@napi-rs/system-ocr": "patch:@napi-rs/system-ocr@npm%3A1.0.2#~/.yarn/patches/@napi-rs-system-ocr-npm-1.0.2-59e7a78e8b.patch",
     "@strongtz/win32-arm64-msvc": "^0.4.7",
+    "express": "^5.1.0",
     "font-list": "^2.0.0",
     "graceful-fs": "^4.2.11",
     "jsdom": "26.1.0",
@@ -92,6 +93,7 @@
     "selection-hook": "^1.0.12",
     "sharp": "^0.34.3",
     "swagger-jsdoc": "^6.2.8",
+    "swagger-ui-express": "^5.0.1",
     "tesseract.js": "patch:tesseract.js@npm%3A6.0.1#~/.yarn/patches/tesseract.js-npm-6.0.1-2562a7e46d.patch",
     "turndown": "7.2.0"
   },
@@ -153,7 +155,7 @@
     "@opentelemetry/sdk-trace-base": "^2.0.0",
     "@opentelemetry/sdk-trace-node": "^2.0.0",
     "@opentelemetry/sdk-trace-web": "^2.0.0",
-    "@opeoginni/github-copilot-openai-compatible": "0.1.18",
+    "@opeoginni/github-copilot-openai-compatible": "patch:@opeoginni/github-copilot-openai-compatible@npm%3A0.1.18#~/.yarn/patches/@opeoginni-github-copilot-openai-compatible-npm-0.1.18-3f65760532.patch",
     "@playwright/test": "^1.52.0",
     "@radix-ui/react-context-menu": "^2.2.16",
     "@reduxjs/toolkit": "^2.2.5",
@@ -263,7 +265,6 @@
     "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-unused-imports": "^4.1.4",
-    "express": "^5.1.0",
     "express-validator": "^7.2.1",
     "fast-diff": "^1.3.0",
     "fast-xml-parser": "^5.2.0",
@@ -303,8 +304,8 @@
     "pdf-parse": "^1.1.1",
     "playwright": "^1.52.0",
     "proxy-agent": "^6.5.0",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
+    "react": "^19.2.0",
+    "react-dom": "^19.2.0",
     "react-error-boundary": "^6.0.0",
     "react-hotkeys-hook": "^4.6.1",
     "react-i18next": "^14.1.2",
@@ -336,7 +337,6 @@
     "string-width": "^7.2.0",
     "striptags": "^3.2.0",
     "styled-components": "^6.1.11",
-    "swagger-ui-express": "^5.0.1",
     "swr": "^2.3.6",
     "tailwindcss": "^4.1.13",
     "tar": "^7.4.3",
@@ -372,6 +372,7 @@
     "app-builder-lib@npm:26.0.13": "patch:app-builder-lib@npm%3A26.0.13#~/.yarn/patches/app-builder-lib-npm-26.0.13-a064c9e1d0.patch",
     "app-builder-lib@npm:26.0.15": "patch:app-builder-lib@npm%3A26.0.15#~/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch",
     "atomically@npm:^1.7.0": "patch:atomically@npm%3A1.7.0#~/.yarn/patches/atomically-npm-1.7.0-e742e5293b.patch",
+    "esbuild": "^0.25.0",
     "file-stream-rotator@npm:^0.6.1": "patch:file-stream-rotator@npm%3A0.6.1#~/.yarn/patches/file-stream-rotator-npm-0.6.1-eab45fb13d.patch",
     "libsql@npm:^0.4.4": "patch:libsql@npm%3A0.4.7#~/.yarn/patches/libsql-npm-0.4.7-444e260fb1.patch",
     "node-abi": "4.12.0",
@@ -379,10 +380,11 @@
     "openai@npm:^4.87.3": "npm:@cherrystudio/openai@6.3.0-fork.1",
     "pdf-parse@npm:1.1.1": "patch:pdf-parse@npm%3A1.1.1#~/.yarn/patches/pdf-parse-npm-1.1.1-04a6109b2a.patch",
     "pkce-challenge@npm:^4.1.0": "patch:pkce-challenge@npm%3A4.1.0#~/.yarn/patches/pkce-challenge-npm-4.1.0-fbc51695a3.patch",
+    "tar-fs": "^2.1.4",
     "undici": "6.21.2",
     "vite": "npm:rolldown-vite@latest",
     "tesseract.js@npm:*": "patch:tesseract.js@npm%3A6.0.1#~/.yarn/patches/tesseract.js-npm-6.0.1-2562a7e46d.patch",
-    "@ai-sdk/google@npm:2.0.17": "patch:@ai-sdk/google@npm%3A2.0.17#~/.yarn/patches/@ai-sdk-google-npm-2.0.17-fd88491de4.patch"
+    "@ai-sdk/google@npm:2.0.20": "patch:@ai-sdk/google@npm%3A2.0.20#~/.yarn/patches/@ai-sdk-google-npm-2.0.20-b9102f9d54.patch"
   },
   "packageManager": "yarn@4.9.1",
   "lint-staged": {

packages/shared/IpcChannel.ts

@@ -317,6 +317,7 @@ export enum IpcChannel {
   ApiServer_Stop = 'api-server:stop',
   ApiServer_Restart = 'api-server:restart',
   ApiServer_GetStatus = 'api-server:get-status',
+  // NOTE: This api is not be used.
   ApiServer_GetConfig = 'api-server:get-config',
 
   // Anthropic OAuth
@@ -336,6 +337,7 @@ export enum IpcChannel {
 
   // OCR
   OCR_ocr = 'ocr:ocr',
+  OCR_ListProviders = 'ocr:list-providers',
 
   // OVMS
   Ovms_AddModel = 'ovms:add-model',

resources/scripts/install-ovms.js

@@ -5,105 +5,171 @@ const { execSync } = require('child_process')
 const { downloadWithPowerShell } = require('./download')
 
 // Base URL for downloading OVMS binaries
-const OVMS_PKG_NAME = 'ovms250911.zip'
-const OVMS_RELEASE_BASE_URL = [`https://gitcode.com/gcw_ggDjjkY3/kjfile/releases/download/download/${OVMS_PKG_NAME}`]
+const OVMS_RELEASE_BASE_URL =
+  'https://storage.openvinotoolkit.org/repositories/openvino_model_server/packages/2025.3.0/ovms_windows_python_on.zip'
+const OVMS_EX_URL = 'https://gitcode.com/gcw_ggDjjkY3/kjfile/releases/download/download/ovms_25.3_ex.zip'
 
 /**
- * Downloads and extracts the OVMS binary for the specified platform
+ * error code:
+ * 101: Unsupported CPU (not Intel Ultra)
+ * 102: Unsupported platform (not Windows)
+ * 103: Download failed
+ * 104: Installation failed
+ * 105: Failed to create ovdnd.exe
+ * 106: Failed to create run.bat
+ * 110: Cleanup of old installation failed
  */
-async function downloadOvmsBinary() {
-  // Create output directory structure - OVMS goes into its own subdirectory
+
+/**
+ * Clean old OVMS installation if it exists
+ */
+function cleanOldOvmsInstallation() {
+  console.log('Cleaning the existing OVMS installation...')
   const csDir = path.join(os.homedir(), '.cherrystudio')
-
-  // Ensure directories exist
-  fs.mkdirSync(csDir, { recursive: true })
-
   const csOvmsDir = path.join(csDir, 'ovms')
-  // Delete existing OVMS directory if it exists
   if (fs.existsSync(csOvmsDir)) {
-    fs.rmSync(csOvmsDir, { recursive: true })
-  }
-
-  const tempdir = os.tmpdir()
-  const tempFilename = path.join(tempdir, 'ovms.zip')
-
-  // Try each URL until one succeeds
-  let downloadSuccess = false
-  let lastError = null
-
-  for (let i = 0; i < OVMS_RELEASE_BASE_URL.length; i++) {
-    const downloadUrl = OVMS_RELEASE_BASE_URL[i]
-    console.log(`Attempting download from URL ${i + 1}/${OVMS_RELEASE_BASE_URL.length}: ${downloadUrl}`)
-
     try {
-      console.log(`Downloading OVMS from ${downloadUrl} to ${tempFilename}...`)
-
-      // Try PowerShell download first, fallback to Node.js download if it fails
-      await downloadWithPowerShell(downloadUrl, tempFilename)
-
-      // If we get here, download was successful
-      downloadSuccess = true
-      console.log(`Successfully downloaded from: ${downloadUrl}`)
-      break
+      fs.rmSync(csOvmsDir, { recursive: true })
     } catch (error) {
-      console.warn(`Download failed from ${downloadUrl}: ${error.message}`)
-      lastError = error
-
-      // Clean up failed download file if it exists
-      if (fs.existsSync(tempFilename)) {
-        try {
-          fs.unlinkSync(tempFilename)
-        } catch (cleanupError) {
-          console.warn(`Failed to clean up temporary file: ${cleanupError.message}`)
-        }
-      }
-
-      // Continue to next URL if this one failed
-      if (i < OVMS_RELEASE_BASE_URL.length - 1) {
-        console.log(`Trying next URL...`)
-      }
+      console.warn(`Failed to clean up old OVMS installation: ${error.message}`)
+      return 110
     }
   }
 
-  // Check if any download succeeded
-  if (!downloadSuccess) {
-    console.error(`All download URLs failed. Last error: ${lastError?.message || 'Unknown error'}`)
+  return 0
+}
+
+/**
+ * Install OVMS Base package
+ */
+async function installOvmsBase() {
+  // Download the base package
+  const tempdir = os.tmpdir()
+  const tempFilename = path.join(tempdir, 'ovms.zip')
+
+  try {
+    console.log(`Downloading OVMS Base Package from ${OVMS_RELEASE_BASE_URL} to ${tempFilename}...`)
+
+    // Try PowerShell download first, fallback to Node.js download if it fails
+    await downloadWithPowerShell(OVMS_RELEASE_BASE_URL, tempFilename)
+    console.log(`Successfully downloaded from: ${OVMS_RELEASE_BASE_URL}`)
+  } catch (error) {
+    console.error(`Download OVMS Base failed: ${error.message}`)
+    fs.unlinkSync(tempFilename)
     return 103
   }
 
-  try {
-    console.log(`Extracting to ${csDir}...`)
+  // unzip the base package to the target directory
+  const csDir = path.join(os.homedir(), '.cherrystudio')
+  const csOvmsDir = path.join(csDir, 'ovms')
+  fs.mkdirSync(csOvmsDir, { recursive: true })
 
+  try {
     // Use tar.exe to extract the ZIP file
-    console.log(`Extracting OVMS to ${csDir}...`)
-    execSync(`tar -xf ${tempFilename} -C ${csDir}`, { stdio: 'inherit' })
-    console.log(`OVMS extracted to ${csDir}`)
+    console.log(`Extracting OVMS Base to ${csOvmsDir}...`)
+    execSync(`tar -xf ${tempFilename} -C ${csOvmsDir}`, { stdio: 'inherit' })
+    console.log(`OVMS extracted to ${csOvmsDir}`)
 
     // Clean up temporary file
     fs.unlinkSync(tempFilename)
     console.log(`Installation directory: ${csDir}`)
   } catch (error) {
     console.error(`Error installing OVMS: ${error.message}`)
-    if (fs.existsSync(tempFilename)) {
-      fs.unlinkSync(tempFilename)
-    }
-
-    // Check if ovmsDir is empty and remove it if so
-    try {
-      const ovmsDir = path.join(csDir, 'ovms')
-      const files = fs.readdirSync(ovmsDir)
-      if (files.length === 0) {
-        fs.rmSync(ovmsDir, { recursive: true })
-        console.log(`Removed empty directory: ${ovmsDir}`)
-      }
-    } catch (cleanupError) {
-      console.warn(`Warning: Failed to clean up directory: ${cleanupError.message}`)
-      return 105
-    }
-
+    fs.unlinkSync(tempFilename)
     return 104
   }
 
+  const csOvmsBinDir = path.join(csOvmsDir, 'ovms')
+  // copy ovms.exe to ovdnd.exe
+  try {
+    fs.copyFileSync(path.join(csOvmsBinDir, 'ovms.exe'), path.join(csOvmsBinDir, 'ovdnd.exe'))
+    console.log('Copied ovms.exe to ovdnd.exe')
+  } catch (error) {
+    console.error(`Error copying ovms.exe to ovdnd.exe: ${error.message}`)
+    return 105
+  }
+
+  // copy {csOvmsBinDir}/setupvars.bat to {csOvmsBinDir}/run.bat, and append the following lines to run.bat:
+  // del %USERPROFILE%\.cherrystudio\ovms_log.log
+  // ovms.exe --config_path models/config.json --rest_port 8000 --log_level DEBUG --log_path %USERPROFILE%\.cherrystudio\ovms_log.log
+  const runBatPath = path.join(csOvmsBinDir, 'run.bat')
+  try {
+    fs.copyFileSync(path.join(csOvmsBinDir, 'setupvars.bat'), runBatPath)
+    fs.appendFileSync(runBatPath, '\r\n')
+    fs.appendFileSync(runBatPath, 'del %USERPROFILE%\\.cherrystudio\\ovms_log.log\r\n')
+    fs.appendFileSync(
+      runBatPath,
+      'ovms.exe --config_path models/config.json --rest_port 8000 --log_level DEBUG --log_path %USERPROFILE%\\.cherrystudio\\ovms_log.log\r\n'
+    )
+    console.log(`Created run.bat at: ${runBatPath}`)
+  } catch (error) {
+    console.error(`Error creating run.bat: ${error.message}`)
+    return 106
+  }
+
+  // create {csOvmsBinDir}/models/config.json with content '{"model_config_list": []}'
+  const configJsonPath = path.join(csOvmsBinDir, 'models', 'config.json')
+  fs.mkdirSync(path.dirname(configJsonPath), { recursive: true })
+  fs.writeFileSync(configJsonPath, '{"mediapipe_config_list":[],"model_config_list":[]}')
+  console.log(`Created config file: ${configJsonPath}`)
+
+  return 0
+}
+
+/**
+ * Install OVMS Extra package
+ */
+async function installOvmsExtra() {
+  // Download the extra package
+  const tempdir = os.tmpdir()
+  const tempFilename = path.join(tempdir, 'ovms_ex.zip')
+
+  try {
+    console.log(`Downloading OVMS Extra Package from ${OVMS_EX_URL} to ${tempFilename}...`)
+
+    // Try PowerShell download first, fallback to Node.js download if it fails
+    await downloadWithPowerShell(OVMS_EX_URL, tempFilename)
+    console.log(`Successfully downloaded from: ${OVMS_EX_URL}`)
+  } catch (error) {
+    console.error(`Download OVMS Extra failed: ${error.message}`)
+    fs.unlinkSync(tempFilename)
+    return 103
+  }
+
+  // unzip the extra package to the target directory
+  const csDir = path.join(os.homedir(), '.cherrystudio')
+  const csOvmsDir = path.join(csDir, 'ovms')
+
+  try {
+    // Use tar.exe to extract the ZIP file
+    console.log(`Extracting OVMS Extra to ${csOvmsDir}...`)
+    execSync(`tar -xf ${tempFilename} -C ${csOvmsDir}`, { stdio: 'inherit' })
+    console.log(`OVMS extracted to ${csOvmsDir}`)
+
+    // Clean up temporary file
+    fs.unlinkSync(tempFilename)
+    console.log(`Installation directory: ${csDir}`)
+  } catch (error) {
+    console.error(`Error installing OVMS Extra: ${error.message}`)
+    fs.unlinkSync(tempFilename)
+    return 104
+  }
+
+  // apply ovms patch, copy all files in {csOvmsDir}/patch/ovms to {csOvmsDir}/ovms with overwrite mode
+  const patchDir = path.join(csOvmsDir, 'patch', 'ovms')
+  const csOvmsBinDir = path.join(csOvmsDir, 'ovms')
+  try {
+    const files = fs.readdirSync(patchDir)
+    files.forEach((file) => {
+      const srcPath = path.join(patchDir, file)
+      const destPath = path.join(csOvmsBinDir, file)
+      fs.copyFileSync(srcPath, destPath)
+      console.log(`Applied patch file: ${file}`)
+    })
+  } catch (error) {
+    console.error(`Error applying OVMS patch: ${error.message}`)
+  }
+
   return 0
 }
 
@@ -158,7 +224,27 @@ async function installOvms() {
     return 102
   }
 
-  return await downloadOvmsBinary()
+  // Clean old installation if it exists
+  const cleanupCode = cleanOldOvmsInstallation()
+  if (cleanupCode !== 0) {
+    console.error(`OVMS cleanup failed with code: ${cleanupCode}`)
+    return cleanupCode
+  }
+
+  const installBaseCode = await installOvmsBase()
+  if (installBaseCode !== 0) {
+    console.error(`OVMS Base installation failed with code: ${installBaseCode}`)
+    cleanOldOvmsInstallation()
+    return installBaseCode
+  }
+
+  const installExtraCode = await installOvmsExtra()
+  if (installExtraCode !== 0) {
+    console.error(`OVMS Extra installation failed with code: ${installExtraCode}`)
+    return installExtraCode
+  }
+
+  return 0
 }
 
 // Run the installation

src/main/apiServer/services/models.ts

@@ -1,6 +1,13 @@
+import { isEmpty } from 'lodash'
+
 import { ApiModel, ApiModelsFilter, ApiModelsResponse } from '../../../renderer/src/types/apiModels'
 import { loggerService } from '../../services/LoggerService'
-import { getAvailableProviders, listAllAvailableModels, transformModelToOpenAI } from '../utils'
+import {
+  getAvailableProviders,
+  getProviderAnthropicModelChecker,
+  listAllAvailableModels,
+  transformModelToOpenAI
+} from '../utils'
 
 const logger = loggerService.withContext('ModelsService')
 
@@ -16,9 +23,7 @@ export class ModelsService {
       let providers = await getAvailableProviders()
 
       if (filter.providerType === 'anthropic') {
-        providers = providers.filter(
-          (p) => p.type === 'anthropic' || (p.anthropicApiHost !== undefined && p.anthropicApiHost.trim() !== '')
-        )
+        providers = providers.filter((p) => p.type === 'anthropic' || !isEmpty(p.anthropicApiHost?.trim()))
       }
 
       const models = await listAllAvailableModels(providers)
@@ -27,18 +32,18 @@ export class ModelsService {
 
       for (const model of models) {
         const provider = providers.find((p) => p.id === model.provider)
-        logger.debug(`Processing model ${model.id} from provider ${model.provider}`, {
-          isAnthropicModel: provider?.isAnthropicModel
-        })
-        if (
-          !provider ||
-          (filter.providerType === 'anthropic' && provider.isAnthropicModel && !provider.isAnthropicModel(model))
-        ) {
+        logger.debug(`Processing model ${model.id}`)
+        if (!provider) {
+          logger.debug(`Skipping model ${model.id} . Reason: Provider not found.`)
           continue
         }
-        // Special case: For "aihubmix", it should be covered by above condition, but just in case
-        if (provider.id === 'aihubmix' && filter.providerType === 'anthropic' && !model.id.includes('claude')) {
-          continue
+
+        if (filter.providerType === 'anthropic') {
+          const checker = getProviderAnthropicModelChecker(provider.id)
+          if (!checker(model)) {
+            logger.debug(`Skipping model ${model.id} from ${model.provider}. Reason: Not an Anthropic model.`)
+            continue
+          }
         }
 
         const openAIModel = transformModelToOpenAI(model, provider)

src/main/apiServer/utils/index.ts

@@ -279,3 +279,16 @@ export function validateProvider(provider: Provider): boolean {
     return false
   }
 }
+
+export const getProviderAnthropicModelChecker = (providerId: string): ((m: Model) => boolean) => {
+  switch (providerId) {
+    case 'cherryin':
+    case 'new-api':
+      return (m: Model) => m.endpoint_type === 'anthropic'
+    case 'aihubmix':
+      return (m: Model) => m.id.includes('claude')
+    default:
+      // allow all models when checker not configured
+      return () => true
+  }
+}

src/main/index.ts

@@ -159,11 +159,26 @@ if (!app.requestSingleInstanceLock()) {
       logger.error('Failed to initialize Agent service:', error)
     }
 
-    // Start API server if enabled
+    // Start API server if enabled or if agents exist
     try {
       const config = await apiServerService.getCurrentConfig()
       logger.info('API server config:', config)
-      if (config.enabled) {
+
+      // Check if there are any agents
+      let shouldStart = config.enabled
+      if (!shouldStart) {
+        try {
+          const { total } = await agentService.listAgents({ limit: 1 })
+          if (total > 0) {
+            shouldStart = true
+            logger.info(`Detected ${total} agent(s), auto-starting API server`)
+          }
+        } catch (error: any) {
+          logger.warn('Failed to check agent count:', error)
+        }
+      }
+
+      if (shouldStart) {
         await apiServerService.start()
       }
     } catch (error: any) {

src/main/ipc.ts

@@ -875,6 +875,7 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.OCR_ocr, (_, file: SupportedOcrFile, provider: OcrProvider) =>
     ocrService.ocr(file, provider)
   )
+  ipcMain.handle(IpcChannel.OCR_ListProviders, () => ocrService.listProviderIds())
 
   // OVMS
   ipcMain.handle(IpcChannel.Ovms_AddModel, (_, modelName: string, modelId: string, modelSource: string, task: string) =>

src/main/mcpServers/didi-mcp.ts

@@ -0,0 +1,473 @@
+/**
+ * DiDi MCP Server Implementation
+ *
+ * Based on official DiDi MCP API capabilities.
+ * API Documentation: https://mcp.didichuxing.com/api?tap=api
+ *
+ * Provides ride-hailing services including map search, price estimation,
+ * order management, and driver tracking.
+ *
+ * Note: Only available in Mainland China.
+ */
+
+import { loggerService } from '@logger'
+import { Server } from '@modelcontextprotocol/sdk/server/index.js'
+import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
+
+const logger = loggerService.withContext('DiDiMCPServer')
+
+export class DiDiMcpServer {
+  private _server: Server
+  private readonly baseUrl = 'http://mcp.didichuxing.com/mcp-servers'
+  private apiKey: string
+
+  constructor(apiKey?: string) {
+    this._server = new Server(
+      {
+        name: 'didi-mcp-server',
+        version: '0.1.0'
+      },
+      {
+        capabilities: {
+          tools: {}
+        }
+      }
+    )
+
+    // Get API key from parameter or environment variables
+    this.apiKey = apiKey || process.env.DIDI_API_KEY || ''
+    if (!this.apiKey) {
+      logger.warn('DIDI_API_KEY environment variable is not set')
+    }
+
+    this.setupRequestHandlers()
+  }
+
+  get server(): Server {
+    return this._server
+  }
+
+  private setupRequestHandlers() {
+    // List available tools
+    this._server.setRequestHandler(ListToolsRequestSchema, async () => {
+      return {
+        tools: [
+          {
+            name: 'maps_textsearch',
+            description: 'Search for POI locations based on keywords and city',
+            inputSchema: {
+              type: 'object',
+              properties: {
+                city: {
+                  type: 'string',
+                  description: 'Query city'
+                },
+                keywords: {
+                  type: 'string',
+                  description: 'Search keywords'
+                },
+                location: {
+                  type: 'string',
+                  description: 'Location coordinates, format: longitude,latitude'
+                }
+              },
+              required: ['keywords', 'city']
+            }
+          },
+          {
+            name: 'taxi_cancel_order',
+            description: 'Cancel a taxi order',
+            inputSchema: {
+              type: 'object',
+              properties: {
+                order_id: {
+                  type: 'string',
+                  description: 'Order ID from order creation or query results'
+                },
+                reason: {
+                  type: 'string',
+                  description:
+                    'Cancellation reason (optional). Examples: no longer needed, waiting too long, urgent matter'
+                }
+              },
+              required: ['order_id']
+            }
+          },
+          {
+            name: 'taxi_create_order',
+            description: 'Create taxi order directly via API without opening any app interface',
+            inputSchema: {
+              type: 'object',
+              properties: {
+                caller_car_phone: {
+                  type: 'string',
+                  description: 'Caller phone number (optional)'
+                },
+                estimate_trace_id: {
+                  type: 'string',
+                  description: 'Estimation trace ID from estimation results'
+                },
+                product_category: {
+                  type: 'string',
+                  description: 'Vehicle category ID from estimation results, comma-separated for multiple types'
+                }
+              },
+              required: ['product_category', 'estimate_trace_id']
+            }
+          },
+          {
+            name: 'taxi_estimate',
+            description: 'Get available ride-hailing vehicle types and fare estimates',
+            inputSchema: {
+              type: 'object',
+              properties: {
+                from_lat: {
+                  type: 'string',
+                  description: 'Departure latitude, must be from map tools'
+                },
+                from_lng: {
+                  type: 'string',
+                  description: 'Departure longitude, must be from map tools'
+                },
+                from_name: {
+                  type: 'string',
+                  description: 'Departure location name'
+                },
+                to_lat: {
+                  type: 'string',
+                  description: 'Destination latitude, must be from map tools'
+                },
+                to_lng: {
+                  type: 'string',
+                  description: 'Destination longitude, must be from map tools'
+                },
+                to_name: {
+                  type: 'string',
+                  description: 'Destination name'
+                }
+              },
+              required: ['from_lng', 'from_lat', 'from_name', 'to_lng', 'to_lat', 'to_name']
+            }
+          },
+          {
+            name: 'taxi_generate_ride_app_link',
+            description: 'Generate deep links to open ride-hailing apps based on origin, destination and vehicle type',
+            inputSchema: {
+              type: 'object',
+              properties: {
+                from_lat: {
+                  type: 'string',
+                  description: 'Departure latitude, must be from map tools'
+                },
+                from_lng: {
+                  type: 'string',
+                  description: 'Departure longitude, must be from map tools'
+                },
+                product_category: {
+                  type: 'string',
+                  description: 'Vehicle category IDs from estimation results, comma-separated for multiple types'
+                },
+                to_lat: {
+                  type: 'string',
+                  description: 'Destination latitude, must be from map tools'
+                },
+                to_lng: {
+                  type: 'string',
+                  description: 'Destination longitude, must be from map tools'
+                }
+              },
+              required: ['from_lng', 'from_lat', 'to_lng', 'to_lat']
+            }
+          },
+          {
+            name: 'taxi_get_driver_location',
+            description: 'Get real-time driver location for a taxi order',
+            inputSchema: {
+              type: 'object',
+              properties: {
+                order_id: {
+                  type: 'string',
+                  description: 'Taxi order ID'
+                }
+              },
+              required: ['order_id']
+            }
+          },
+          {
+            name: 'taxi_query_order',
+            description: 'Query taxi order status and information such as driver contact, license plate, ETA',
+            inputSchema: {
+              type: 'object',
+              properties: {
+                order_id: {
+                  type: 'string',
+                  description: 'Order ID from order creation results, if available; otherwise queries incomplete orders'
+                }
+              }
+            }
+          }
+        ]
+      }
+    })
+
+    // Handle tool calls
+    this._server.setRequestHandler(CallToolRequestSchema, async (request) => {
+      const { name, arguments: args } = request.params
+
+      try {
+        switch (name) {
+          case 'maps_textsearch':
+            return await this.handleMapsTextSearch(args)
+          case 'taxi_cancel_order':
+            return await this.handleTaxiCancelOrder(args)
+          case 'taxi_create_order':
+            return await this.handleTaxiCreateOrder(args)
+          case 'taxi_estimate':
+            return await this.handleTaxiEstimate(args)
+          case 'taxi_generate_ride_app_link':
+            return await this.handleTaxiGenerateRideAppLink(args)
+          case 'taxi_get_driver_location':
+            return await this.handleTaxiGetDriverLocation(args)
+          case 'taxi_query_order':
+            return await this.handleTaxiQueryOrder(args)
+          default:
+            throw new Error(`Unknown tool: ${name}`)
+        }
+      } catch (error) {
+        logger.error(`Error calling tool ${name}:`, error as Error)
+        throw error
+      }
+    })
+  }
+
+  private async handleMapsTextSearch(args: any) {
+    const { city, keywords, location } = args
+
+    const params = {
+      name: 'maps_textsearch',
+      arguments: {
+        keywords,
+        city,
+        ...(location && { location })
+      }
+    }
+
+    try {
+      const response = await this.makeRequest('tools/call', params)
+      return {
+        content: [
+          {
+            type: 'text',
+            text: JSON.stringify(response, null, 2)
+          }
+        ]
+      }
+    } catch (error) {
+      logger.error('Maps text search error:', error as Error)
+      throw error
+    }
+  }
+
+  private async handleTaxiCancelOrder(args: any) {
+    const { order_id, reason } = args
+
+    const params = {
+      name: 'taxi_cancel_order',
+      arguments: {
+        order_id,
+        ...(reason && { reason })
+      }
+    }
+
+    try {
+      const response = await this.makeRequest('tools/call', params)
+      return {
+        content: [
+          {
+            type: 'text',
+            text: JSON.stringify(response, null, 2)
+          }
+        ]
+      }
+    } catch (error) {
+      logger.error('Taxi cancel order error:', error as Error)
+      throw error
+    }
+  }
+
+  private async handleTaxiCreateOrder(args: any) {
+    const { caller_car_phone, estimate_trace_id, product_category } = args
+
+    const params = {
+      name: 'taxi_create_order',
+      arguments: {
+        product_category,
+        estimate_trace_id,
+        ...(caller_car_phone && { caller_car_phone })
+      }
+    }
+
+    try {
+      const response = await this.makeRequest('tools/call', params)
+      return {
+        content: [
+          {
+            type: 'text',
+            text: JSON.stringify(response, null, 2)
+          }
+        ]
+      }
+    } catch (error) {
+      logger.error('Taxi create order error:', error as Error)
+      throw error
+    }
+  }
+
+  private async handleTaxiEstimate(args: any) {
+    const { from_lng, from_lat, from_name, to_lng, to_lat, to_name } = args
+
+    const params = {
+      name: 'taxi_estimate',
+      arguments: {
+        from_lng,
+        from_lat,
+        from_name,
+        to_lng,
+        to_lat,
+        to_name
+      }
+    }
+
+    try {
+      const response = await this.makeRequest('tools/call', params)
+      return {
+        content: [
+          {
+            type: 'text',
+            text: JSON.stringify(response, null, 2)
+          }
+        ]
+      }
+    } catch (error) {
+      logger.error('Taxi estimate error:', error as Error)
+      throw error
+    }
+  }
+
+  private async handleTaxiGenerateRideAppLink(args: any) {
+    const { from_lng, from_lat, to_lng, to_lat, product_category } = args
+
+    const params = {
+      name: 'taxi_generate_ride_app_link',
+      arguments: {
+        from_lng,
+        from_lat,
+        to_lng,
+        to_lat,
+        ...(product_category && { product_category })
+      }
+    }
+
+    try {
+      const response = await this.makeRequest('tools/call', params)
+      return {
+        content: [
+          {
+            type: 'text',
+            text: JSON.stringify(response, null, 2)
+          }
+        ]
+      }
+    } catch (error) {
+      logger.error('Taxi generate ride app link error:', error as Error)
+      throw error
+    }
+  }
+
+  private async handleTaxiGetDriverLocation(args: any) {
+    const { order_id } = args
+
+    const params = {
+      name: 'taxi_get_driver_location',
+      arguments: {
+        order_id
+      }
+    }
+
+    try {
+      const response = await this.makeRequest('tools/call', params)
+      return {
+        content: [
+          {
+            type: 'text',
+            text: JSON.stringify(response, null, 2)
+          }
+        ]
+      }
+    } catch (error) {
+      logger.error('Taxi get driver location error:', error as Error)
+      throw error
+    }
+  }
+
+  private async handleTaxiQueryOrder(args: any) {
+    const { order_id } = args
+
+    const params = {
+      name: 'taxi_query_order',
+      arguments: {
+        ...(order_id && { order_id })
+      }
+    }
+
+    try {
+      const response = await this.makeRequest('tools/call', params)
+      return {
+        content: [
+          {
+            type: 'text',
+            text: JSON.stringify(response, null, 2)
+          }
+        ]
+      }
+    } catch (error) {
+      logger.error('Taxi query order error:', error as Error)
+      throw error
+    }
+  }
+
+  private async makeRequest(method: string, params: any): Promise<any> {
+    const requestData = {
+      jsonrpc: '2.0',
+      method: method,
+      id: Date.now(),
+      ...(Object.keys(params).length > 0 && { params })
+    }
+
+    // API key is passed as URL parameter
+    const url = `${this.baseUrl}?key=${this.apiKey}`
+
+    const response = await fetch(url, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify(requestData)
+    })
+
+    if (!response.ok) {
+      const errorText = await response.text()
+      throw new Error(`HTTP ${response.status}: ${errorText}`)
+    }
+
+    const data = await response.json()
+
+    if (data.error) {
+      throw new Error(`API Error: ${JSON.stringify(data.error)}`)
+    }
+
+    return data.result
+  }
+}
+
+export default DiDiMcpServer

src/main/mcpServers/factory.ts

@@ -3,6 +3,7 @@ import { Server } from '@modelcontextprotocol/sdk/server/index.js'
 import { BuiltinMCPServerName, BuiltinMCPServerNames } from '@types'
 
 import BraveSearchServer from './brave-search'
+import DiDiMcpServer from './didi-mcp'
 import DifyKnowledgeServer from './dify-knowledge'
 import FetchServer from './fetch'
 import FileSystemServer from './filesystem'
@@ -42,6 +43,10 @@ export function createInMemoryMCPServer(
     case BuiltinMCPServerNames.python: {
       return new PythonServer().server
     }
+    case BuiltinMCPServerNames.didiMCP: {
+      const apiKey = envs.DIDI_API_KEY
+      return new DiDiMcpServer(apiKey).server
+    }
     default:
       throw new Error(`Unknown in-memory MCP server: ${name}`)
   }

src/main/services/ApiServerService.ts

@@ -1,5 +1,11 @@
 import { IpcChannel } from '@shared/IpcChannel'
-import { ApiServerConfig } from '@types'
+import {
+  ApiServerConfig,
+  GetApiServerStatusResult,
+  RestartApiServerStatusResult,
+  StartApiServerStatusResult,
+  StopApiServerStatusResult
+} from '@types'
 import { ipcMain } from 'electron'
 
 import { apiServer } from '../apiServer'
@@ -52,7 +58,7 @@ export class ApiServerService {
 
   registerIpcHandlers(): void {
     // API Server
-    ipcMain.handle(IpcChannel.ApiServer_Start, async () => {
+    ipcMain.handle(IpcChannel.ApiServer_Start, async (): Promise<StartApiServerStatusResult> => {
       try {
         await this.start()
         return { success: true }
@@ -61,7 +67,7 @@ export class ApiServerService {
       }
     })
 
-    ipcMain.handle(IpcChannel.ApiServer_Stop, async () => {
+    ipcMain.handle(IpcChannel.ApiServer_Stop, async (): Promise<StopApiServerStatusResult> => {
       try {
         await this.stop()
         return { success: true }
@@ -70,7 +76,7 @@ export class ApiServerService {
       }
     })
 
-    ipcMain.handle(IpcChannel.ApiServer_Restart, async () => {
+    ipcMain.handle(IpcChannel.ApiServer_Restart, async (): Promise<RestartApiServerStatusResult> => {
       try {
         await this.restart()
         return { success: true }
@@ -79,7 +85,7 @@ export class ApiServerService {
       }
     })
 
-    ipcMain.handle(IpcChannel.ApiServer_GetStatus, async () => {
+    ipcMain.handle(IpcChannel.ApiServer_GetStatus, async (): Promise<GetApiServerStatusResult> => {
       try {
         const config = await this.getCurrentConfig()
         return {

src/main/services/WebviewService.ts

@@ -60,15 +60,20 @@ const attachKeyboardHandler = (contents: Electron.WebContents) => {
     if (!isFindShortcut && !isEscape && !isEnter) {
       return
     }
-    // Prevent default to override the guest page's native find dialog
-    // and keep shortcuts routed to our custom search overlay
-    event.preventDefault()
 
     const host = contents.hostWebContents
     if (!host || host.isDestroyed()) {
       return
     }
 
+    // Always prevent Cmd/Ctrl+F to override the guest page's native find dialog
+    if (isFindShortcut) {
+      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
     host.send(IpcChannel.Webview_SearchHotkey, {
       webviewId: contents.id,
       key,

src/main/services/ocr/OcrService.ts

@@ -2,6 +2,7 @@ import { loggerService } from '@logger'
 import { isLinux } from '@main/constant'
 import { BuiltinOcrProviderIds, OcrHandler, OcrProvider, OcrResult, SupportedOcrFile } from '@types'
 
+import { ovOcrService } from './builtin/OvOcrService'
 import { ppocrService } from './builtin/PpocrService'
 import { systemOcrService } from './builtin/SystemOcrService'
 import { tesseractService } from './builtin/TesseractService'
@@ -22,6 +23,10 @@ export class OcrService {
     this.registry.delete(providerId)
   }
 
+  public listProviderIds(): string[] {
+    return Array.from(this.registry.keys())
+  }
+
   public async ocr(file: SupportedOcrFile, provider: OcrProvider): Promise<OcrResult> {
     const handler = this.registry.get(provider.id)
     if (!handler) {
@@ -39,3 +44,5 @@ ocrService.register(BuiltinOcrProviderIds.tesseract, tesseractService.ocr.bind(t
 !isLinux && ocrService.register(BuiltinOcrProviderIds.system, systemOcrService.ocr.bind(systemOcrService))
 
 ocrService.register(BuiltinOcrProviderIds.paddleocr, ppocrService.ocr.bind(ppocrService))
+
+ovOcrService.isAvailable() && ocrService.register(BuiltinOcrProviderIds.ovocr, ovOcrService.ocr.bind(ovOcrService))

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

@@ -0,0 +1,128 @@
+import { loggerService } from '@logger'
+import { isWin } from '@main/constant'
+import { isImageFileMetadata, OcrOvConfig, OcrResult, SupportedOcrFile } from '@types'
+import { exec } from 'child_process'
+import * as fs from 'fs'
+import * as os from 'os'
+import * as path from 'path'
+import { promisify } from 'util'
+
+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')
+
+export class OvOcrService extends OcrBaseService {
+  constructor() {
+    super()
+  }
+
+  public isAvailable(): boolean {
+    return (
+      isWin &&
+      os.cpus()[0].model.toLowerCase().includes('intel') &&
+      os.cpus()[0].model.toLowerCase().includes('ultra') &&
+      fs.existsSync(PATH_BAT_FILE)
+    )
+  }
+
+  private getOvOcrPath(): string {
+    return path.join(os.homedir(), '.cherrystudio', 'ovms', 'ovocr')
+  }
+
+  private getImgDir(): string {
+    return path.join(this.getOvOcrPath(), 'img')
+  }
+
+  private getOutputDir(): string {
+    return path.join(this.getOvOcrPath(), 'output')
+  }
+
+  private async clearDirectory(dirPath: string): Promise<void> {
+    if (fs.existsSync(dirPath)) {
+      const files = await fs.promises.readdir(dirPath)
+      for (const file of files) {
+        const filePath = path.join(dirPath, file)
+        const stats = await fs.promises.stat(filePath)
+        if (stats.isDirectory()) {
+          await this.clearDirectory(filePath)
+          await fs.promises.rmdir(filePath)
+        } else {
+          await fs.promises.unlink(filePath)
+        }
+      }
+    } else {
+      // If the directory does not exist, create it
+      await fs.promises.mkdir(dirPath, { recursive: true })
+    }
+  }
+
+  private async copyFileToImgDir(sourceFilePath: string, targetFileName: string): Promise<void> {
+    const imgDir = this.getImgDir()
+    const targetFilePath = path.join(imgDir, targetFileName)
+    await fs.promises.copyFile(sourceFilePath, targetFilePath)
+  }
+
+  private async runOcrBatch(): Promise<void> {
+    const ovOcrPath = this.getOvOcrPath()
+
+    try {
+      // Execute run.bat in the ov-ocr directory
+      await execAsync(`"${PATH_BAT_FILE}"`, {
+        cwd: ovOcrPath,
+        timeout: 60000 // 60 second timeout
+      })
+    } catch (error) {
+      logger.error(`Error running ovocr batch: ${error}`)
+      throw new Error(`Failed to run OCR batch: ${error}`)
+    }
+  }
+
+  private async ocrImage(filePath: string, options?: OcrOvConfig): Promise<OcrResult> {
+    logger.info(`OV OCR called on ${filePath} with options ${JSON.stringify(options)}`)
+
+    try {
+      // 1. Clear img directory and output directory
+      await this.clearDirectory(this.getImgDir())
+      await this.clearDirectory(this.getOutputDir())
+
+      // 2. Copy file to img directory
+      const fileName = path.basename(filePath)
+      await this.copyFileToImgDir(filePath, fileName)
+      logger.info(`File copied to img directory: ${fileName}`)
+
+      // 3. Run run.bat
+      logger.info('Running OV OCR batch process...')
+      await this.runOcrBatch()
+
+      // 4. Check that output/[basename].txt file exists
+      const baseNameWithoutExt = path.basename(fileName, path.extname(fileName))
+      const outputFilePath = path.join(this.getOutputDir(), `${baseNameWithoutExt}.txt`)
+      if (!fs.existsSync(outputFilePath)) {
+        throw new Error(`OV OCR output file not found at: ${outputFilePath}`)
+      }
+
+      // 5. Read output/[basename].txt file content
+      const ocrText = await fs.promises.readFile(outputFilePath, 'utf-8')
+      logger.info(`OV OCR text extracted: ${ocrText.substring(0, 100)}...`)
+
+      // 6. Return result
+      return { text: ocrText }
+    } catch (error) {
+      logger.error(`Error during OV OCR process: ${error}`)
+      throw error
+    }
+  }
+
+  public ocr = async (file: SupportedOcrFile, options?: OcrOvConfig): Promise<OcrResult> => {
+    if (isImageFileMetadata(file)) {
+      return this.ocrImage(file.path, options)
+    } else {
+      throw new Error('Unsupported file type, currently only image files are supported')
+    }
+  }
+}
+
+export const ovOcrService = new OvOcrService()

src/preload/index.ts

@@ -12,6 +12,7 @@ import {
   FileListResponse,
   FileMetadata,
   FileUploadResponse,
+  GetApiServerStatusResult,
   KnowledgeBaseParams,
   KnowledgeItem,
   KnowledgeSearchResult,
@@ -22,8 +23,11 @@ import {
   OcrProvider,
   OcrResult,
   Provider,
+  RestartApiServerStatusResult,
   S3Config,
   Shortcut,
+  StartApiServerStatusResult,
+  StopApiServerStatusResult,
   SupportedOcrFile,
   ThemeMode,
   WebDavConfig
@@ -476,7 +480,8 @@ const api = {
   },
   ocr: {
     ocr: (file: SupportedOcrFile, provider: OcrProvider): Promise<OcrResult> =>
-      ipcRenderer.invoke(IpcChannel.OCR_ocr, file, provider)
+      ipcRenderer.invoke(IpcChannel.OCR_ocr, file, provider),
+    listProviders: (): Promise<string[]> => ipcRenderer.invoke(IpcChannel.OCR_ListProviders)
   },
   cherryai: {
     generateSignature: (params: { method: string; path: string; query: string; body: Record<string, any> }) =>
@@ -496,6 +501,12 @@ const api = {
         ipcRenderer.removeListener(channel, listener)
       }
     }
+  },
+  apiServer: {
+    getStatus: (): Promise<GetApiServerStatusResult> => ipcRenderer.invoke(IpcChannel.ApiServer_GetStatus),
+    start: (): Promise<StartApiServerStatusResult> => ipcRenderer.invoke(IpcChannel.ApiServer_Start),
+    restart: (): Promise<RestartApiServerStatusResult> => ipcRenderer.invoke(IpcChannel.ApiServer_Restart),
+    stop: (): Promise<StopApiServerStatusResult> => ipcRenderer.invoke(IpcChannel.ApiServer_Stop)
   }
 }
 

src/renderer/src/aiCore/chunk/AiSdkToChunkAdapter.ts

@@ -6,6 +6,8 @@
 import { loggerService } from '@logger'
 import { AISDKWebSearchResult, MCPTool, WebSearchResults, WebSearchSource } from '@renderer/types'
 import { Chunk, ChunkType } from '@renderer/types/chunk'
+import { ProviderSpecificError } from '@renderer/types/provider-specific-error'
+import { formatErrorMessage } from '@renderer/utils/error'
 import { convertLinks, flushLinkConverterBuffer } from '@renderer/utils/linkConverter'
 import type { ClaudeCodeRawValue } from '@shared/agents/claudecode/types'
 import type { TextStreamPart, ToolSet } from 'ai'
@@ -355,7 +357,11 @@ export class AiSdkToChunkAdapter {
       case 'error':
         this.onChunk({
           type: ChunkType.ERROR,
-          error: chunk.error as Record<string, any>
+          error: new ProviderSpecificError({
+            message: formatErrorMessage(chunk.error),
+            provider: 'unknown',
+            cause: chunk.error
+          })
         })
         break
 

src/renderer/src/aiCore/index_new.ts

@@ -98,10 +98,8 @@ export default class ModernAiProvider {
       throw new Error('Model is required for completions. Please use constructor with model parameter.')
     }
 
-    // 确保配置存在
-    if (!this.config) {
-      this.config = providerToAiSdkConfig(this.actualProvider, this.model)
-    }
+    // 每次请求时重新生成配置以确保API key轮换生效
+    this.config = providerToAiSdkConfig(this.actualProvider, this.model)
 
     // 准备特殊配置
     await prepareSpecialProviderConfig(this.actualProvider, this.config)

src/renderer/src/aiCore/legacy/clients/BaseApiClient.ts

@@ -70,13 +70,19 @@ export abstract class BaseApiClient<
 {
   public provider: Provider
   protected host: string
-  protected apiKey: string
   protected sdkInstance?: TSdkInstance
 
   constructor(provider: Provider) {
     this.provider = provider
     this.host = this.getBaseURL()
-    this.apiKey = this.getApiKey()
+  }
+
+  /**
+   * Get the current API key with rotation support
+   * This getter ensures API keys rotate on each access when multiple keys are configured
+   */
+  protected get apiKey(): string {
+    return this.getApiKey()
   }
 
   /**

src/renderer/src/aiCore/legacy/clients/openai/OpenAIBaseClient.ts

@@ -1,5 +1,6 @@
 import OpenAI, { AzureOpenAI } from '@cherrystudio/openai'
 import { loggerService } from '@logger'
+import { COPILOT_DEFAULT_HEADERS } from '@renderer/aiCore/provider/constants'
 import {
   isClaudeReasoningModel,
   isOpenAIReasoningModel,
@@ -166,7 +167,8 @@ export abstract class OpenAIBaseClient<
         baseURL: this.getBaseURL(),
         defaultHeaders: {
           ...this.defaultHeaders(),
-          ...this.provider.extra_headers
+          ...this.provider.extra_headers,
+          ...(this.provider.id === 'copilot' ? COPILOT_DEFAULT_HEADERS : {})
         }
       }) as TSdkInstance
     }

src/renderer/src/aiCore/middleware/AiSdkMiddlewareBuilder.ts

@@ -4,6 +4,8 @@ import type { MCPTool, Message, Model, Provider } from '@renderer/types'
 import type { Chunk } from '@renderer/types/chunk'
 import { extractReasoningMiddleware, LanguageModelMiddleware, simulateStreamingMiddleware } from 'ai'
 
+import { noThinkMiddleware } from './noThinkMiddleware'
+
 const logger = loggerService.withContext('AiSdkMiddlewareBuilder')
 
 /**
@@ -186,6 +188,14 @@ function addProviderSpecificMiddlewares(builder: AiSdkMiddlewareBuilder, config:
       // 其他provider的通用处理
       break
   }
+
+  // OVMS+MCP's specific middleware
+  if (config.provider.id === 'ovms' && config.mcpTools && config.mcpTools.length > 0) {
+    builder.add({
+      name: 'no-think',
+      middleware: noThinkMiddleware()
+    })
+  }
 }
 
 /**

src/renderer/src/aiCore/middleware/noThinkMiddleware.ts

@@ -0,0 +1,52 @@
+import { loggerService } from '@logger'
+import { LanguageModelMiddleware } from 'ai'
+
+const logger = loggerService.withContext('noThinkMiddleware')
+
+/**
+ * No Think Middleware
+ * Automatically appends ' /no_think' string to the end of user messages for the provider
+ * This prevents the model from generating unnecessary thinking process and returns results directly
+ * @returns LanguageModelMiddleware
+ */
+export function noThinkMiddleware(): LanguageModelMiddleware {
+  return {
+    middlewareVersion: 'v2',
+
+    transformParams: async ({ params }) => {
+      const transformedParams = { ...params }
+      // Process messages in prompt
+      if (transformedParams.prompt && Array.isArray(transformedParams.prompt)) {
+        transformedParams.prompt = transformedParams.prompt.map((message) => {
+          // Only process user messages
+          if (message.role === 'user') {
+            // Process content array
+            if (Array.isArray(message.content)) {
+              const lastContent = message.content[message.content.length - 1]
+              // If the last content is text type, append ' /no_think'
+              if (lastContent && lastContent.type === 'text' && typeof lastContent.text === 'string') {
+                // Avoid duplicate additions
+                if (!lastContent.text.endsWith('/no_think')) {
+                  logger.debug('Adding /no_think to user message')
+                  return {
+                    ...message,
+                    content: [
+                      ...message.content.slice(0, -1),
+                      {
+                        ...lastContent,
+                        text: lastContent.text + ' /no_think'
+                      }
+                    ]
+                  }
+                }
+              }
+            }
+          }
+          return message
+        })
+      }
+
+      return transformedParams
+    }
+  }
+}

src/renderer/src/aiCore/provider/providerConfig.ts

@@ -63,13 +63,14 @@ function handleSpecialProviders(model: Model, provider: Provider): Provider {
   //   return createVertexProvider(provider)
   // }
 
+  if (isNewApiProvider(provider)) {
+    return newApiResolverCreator(model, provider)
+  }
+
   if (isSystemProvider(provider)) {
     if (provider.id === 'aihubmix') {
       return aihubmixProviderCreator(model, provider)
     }
-    if (isNewApiProvider(provider)) {
-      return newApiResolverCreator(model, provider)
-    }
     if (provider.id === 'vertexai') {
       return vertexAnthropicProviderCreator(model, provider)
     }

src/renderer/src/aiCore/provider/providerInitialization.ts

@@ -55,6 +55,14 @@ export const NEW_PROVIDER_CONFIGS: ProviderConfig[] = [
     creatorFunctionName: 'createPerplexity',
     supportsImageGeneration: false,
     aliases: ['perplexity']
+  },
+  {
+    id: 'mistral',
+    name: 'Mistral',
+    import: () => import('@ai-sdk/mistral'),
+    creatorFunctionName: 'createMistral',
+    supportsImageGeneration: false,
+    aliases: ['mistral']
   }
 ] as const
 

src/renderer/src/api/agent.ts

@@ -9,6 +9,8 @@ import {
   CreateAgentRequest,
   CreateAgentResponse,
   CreateAgentResponseSchema,
+  CreateAgentSessionResponse,
+  CreateAgentSessionResponseSchema,
   CreateSessionForm,
   CreateSessionRequest,
   GetAgentResponse,
@@ -171,12 +173,12 @@ export class AgentApiClient {
     }
   }
 
-  public async createSession(agentId: string, session: CreateSessionForm): Promise<GetAgentSessionResponse> {
+  public async createSession(agentId: string, session: CreateSessionForm): Promise<CreateAgentSessionResponse> {
     const url = this.getSessionPaths(agentId).base
     try {
       const payload = session satisfies CreateSessionRequest
       const response = await this.axios.post(url, payload)
-      const data = GetAgentSessionResponseSchema.parse(response.data)
+      const data = CreateAgentSessionResponseSchema.parse(response.data)
       return data
     } catch (error) {
       throw processError(error, 'Failed to add session.')

src/renderer/src/components/CodeBlockView/view.tsx

@@ -326,7 +326,7 @@ const CodeBlockWrapper = styled.div<{ $isInSpecialView: boolean }>`
    * 一是 CodeViewer 在气泡样式下的用户消息中无法撑开气泡，
    * 二是 代码块内容过少时 toolbar 会和 title 重叠。
    */
-  min-width: 45ch;
+  min-width: 35ch;
 
   .code-toolbar {
     background-color: ${(props) => (props.$isInSpecialView ? 'transparent' : 'var(--color-background-mute)')};

src/renderer/src/components/CodeEditor/hooks.ts

@@ -2,7 +2,7 @@ import { linter } from '@codemirror/lint' // statically imported by @uiw/codemir
 import { EditorView } from '@codemirror/view'
 import { loggerService } from '@logger'
 import { Extension, keymap } from '@uiw/react-codemirror'
-import { useEffect, useMemo, useState } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 
 import { getNormalizedExtension } from './utils'
 
@@ -203,3 +203,80 @@ export function useHeightListener({ onHeightChange }: UseHeightListenerProps) {
     })
   }, [onHeightChange])
 }
+
+interface UseScrollToLineOptions {
+  highlight?: boolean
+}
+
+export function useScrollToLine(editorViewRef: React.MutableRefObject<EditorView | null>) {
+  const findLineElement = useCallback((view: EditorView, position: number): HTMLElement | null => {
+    const domAtPos = view.domAtPos(position)
+    let node: Node | null = domAtPos.node
+
+    if (node.nodeType === Node.TEXT_NODE) {
+      node = node.parentElement
+    }
+
+    while (node) {
+      if (node instanceof HTMLElement && node.classList.contains('cm-line')) {
+        return node
+      }
+      node = node.parentElement
+    }
+
+    return null
+  }, [])
+
+  const highlightLine = useCallback((view: EditorView, element: HTMLElement) => {
+    const previousHighlight = view.dom.querySelector('.animation-locate-highlight') as HTMLElement | null
+    if (previousHighlight) {
+      previousHighlight.classList.remove('animation-locate-highlight')
+    }
+
+    element.classList.add('animation-locate-highlight')
+
+    const handleAnimationEnd = () => {
+      element.classList.remove('animation-locate-highlight')
+      element.removeEventListener('animationend', handleAnimationEnd)
+    }
+
+    element.addEventListener('animationend', handleAnimationEnd)
+  }, [])
+
+  return useCallback(
+    (lineNumber: number, options?: UseScrollToLineOptions) => {
+      const view = editorViewRef.current
+      if (!view) return
+
+      const targetLine = view.state.doc.line(Math.min(lineNumber, view.state.doc.lines))
+
+      const lineElement = findLineElement(view, targetLine.from)
+      if (lineElement) {
+        lineElement.scrollIntoView({ behavior: 'smooth', block: 'center', inline: 'nearest' })
+
+        if (options?.highlight) {
+          requestAnimationFrame(() => highlightLine(view, lineElement))
+        }
+        return
+      }
+
+      view.dispatch({
+        effects: EditorView.scrollIntoView(targetLine.from, {
+          y: 'start'
+        })
+      })
+
+      if (!options?.highlight) {
+        return
+      }
+
+      setTimeout(() => {
+        const fallbackElement = findLineElement(view, targetLine.from)
+        if (fallbackElement) {
+          highlightLine(view, fallbackElement)
+        }
+      }, 200)
+    },
+    [editorViewRef, findLineElement, highlightLine]
+  )
+}

src/renderer/src/components/CodeEditor/index.tsx

@@ -5,13 +5,14 @@ import diff from 'fast-diff'
 import { useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react'
 import { memo } from 'react'
 
-import { useBlurHandler, useHeightListener, useLanguageExtensions, useSaveKeymap } from './hooks'
+import { useBlurHandler, useHeightListener, useLanguageExtensions, useSaveKeymap, useScrollToLine } from './hooks'
 
 // 标记非用户编辑的变更
 const External = Annotation.define<boolean>()
 
 export interface CodeEditorHandles {
   save?: () => void
+  scrollToLine?: (lineNumber: number, options?: { highlight?: boolean }) => void
 }
 
 export interface CodeEditorProps {
@@ -181,8 +182,11 @@ const CodeEditor = ({
     ].flat()
   }, [extensions, langExtensions, wrapped, saveKeymapExtension, blurExtension, heightListenerExtension])
 
+  const scrollToLine = useScrollToLine(editorViewRef)
+
   useImperativeHandle(ref, () => ({
-    save: handleSave
+    save: handleSave,
+    scrollToLine
   }))
 
   return (

src/renderer/src/components/HighlightText.tsx

@@ -0,0 +1,48 @@
+import { FC, memo, useMemo } from 'react'
+
+interface HighlightTextProps {
+  text: string
+  keyword: string
+  caseSensitive?: boolean
+  className?: string
+}
+
+/**
+ * Text highlighting component that marks keyword matches
+ */
+const HighlightText: FC<HighlightTextProps> = ({ text, keyword, caseSensitive = false, className }) => {
+  const highlightedText = useMemo(() => {
+    if (!keyword || !text) {
+      return <span>{text}</span>
+    }
+
+    // Escape regex special characters
+    const escapedKeyword = keyword.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+    const flags = caseSensitive ? 'g' : 'gi'
+    const regex = new RegExp(`(${escapedKeyword})`, flags)
+
+    // Split text by keyword matches
+    const parts = text.split(regex)
+
+    return (
+      <>
+        {parts.map((part, index) => {
+          // Check if part matches keyword
+          const isMatch = regex.test(part)
+          regex.lastIndex = 0 // Reset regex state
+
+          if (isMatch) {
+            return <mark key={index}>{part}</mark>
+          }
+          return <span key={index}>{part}</span>
+        })}
+      </>
+    )
+  }, [text, keyword, caseSensitive])
+
+  const combinedClassName = className ? `ant-typography ${className}` : 'ant-typography'
+
+  return <span className={combinedClassName}>{highlightedText}</span>
+}
+
+export default memo(HighlightText)

src/renderer/src/components/MinApp/WebviewContainer.tsx

@@ -25,7 +25,7 @@ const WebviewContainer = memo(
     onNavigateCallback: (appid: string, url: string) => void
   }) => {
     const webviewRef = useRef<WebviewTag | null>(null)
-    const { enableSpellCheck } = useSettings()
+    const { enableSpellCheck, minappsOpenLinkExternal } = useSettings()
 
     const setRef = (appid: string) => {
       onSetRefCallback(appid, null)
@@ -76,6 +76,8 @@ const WebviewContainer = memo(
         const webviewId = webviewRef.current?.getWebContentsId()
         if (webviewId) {
           window.api?.webview?.setSpellCheckEnabled?.(webviewId, enableSpellCheck)
+          // Set link opening behavior for this webview
+          window.api?.webview?.setOpenLinkExternal?.(webviewId, minappsOpenLinkExternal)
         }
       }
 
@@ -104,6 +106,22 @@ const WebviewContainer = memo(
       // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [appid, url])
 
+    // Update webview settings when they change
+    useEffect(() => {
+      if (!webviewRef.current) return
+
+      try {
+        const webviewId = webviewRef.current.getWebContentsId()
+        if (webviewId) {
+          window.api?.webview?.setSpellCheckEnabled?.(webviewId, enableSpellCheck)
+          window.api?.webview?.setOpenLinkExternal?.(webviewId, minappsOpenLinkExternal)
+        }
+      } catch (error) {
+        // WebView may not be ready yet, settings will be applied in dom-ready event
+        logger.debug(`WebView ${appid} not ready for settings update`)
+      }
+    }, [appid, minappsOpenLinkExternal, enableSpellCheck])
+
     const WebviewStyle: React.CSSProperties = {
       width: '100%',
       height: '100%',

src/renderer/src/components/Popups/agent/AgentModal.tsx

@@ -17,7 +17,7 @@ import {
 import { loggerService } from '@logger'
 import type { Selection } from '@react-types/shared'
 import ClaudeIcon from '@renderer/assets/images/models/claude.png'
-import { getModelLogo } from '@renderer/config/models'
+import { agentModelFilter, getModelLogo } from '@renderer/config/models'
 import { permissionModeCards } from '@renderer/constants/permissionModes'
 import { useAgents } from '@renderer/hooks/agents/useAgents'
 import { useApiModels } from '@renderer/hooks/agents/useModels'
@@ -245,14 +245,23 @@ export const AgentModal: React.FC<Props> = ({ agent, trigger, isOpen: _isOpen, o
 
   const modelOptions = useMemo(() => {
     // mocked data. not final version
-    return (models ?? []).map((model) => ({
-      type: 'model',
-      key: model.id,
-      label: model.name,
-      avatar: getModelLogo(model.id),
-      providerId: model.provider,
-      providerName: model.provider_name
-    })) satisfies ModelOption[]
+    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: getModelLogo(model.id),
+        providerId: model.provider,
+        providerName: model.provider_name
+      })) satisfies ModelOption[]
   }, [models])
 
   const onModelChange = useCallback((e: ChangeEvent<HTMLSelectElement>) => {

src/renderer/src/components/Popups/agent/SessionModal.tsx

@@ -98,7 +98,7 @@ export const SessionModal: React.FC<Props> = ({
   const loadingRef = useRef(false)
   // const { setTimeoutTimer } = useTimer()
   const { createSession } = useSessions(agentId)
-  const updateSession = useUpdateSession(agentId)
+  const { updateSession } = useUpdateSession(agentId)
   const { agent } = useAgent(agentId)
   const isEditing = (session?: AgentSessionEntity) => session !== undefined
 

src/renderer/src/components/RichEditor/constants.ts

@@ -0,0 +1,2 @@
+// Attribute used to store the original source line number in markdown editors
+export const MARKDOWN_SOURCE_LINE_ATTR = 'data-source-line'

src/renderer/src/components/RichEditor/index.tsx

@@ -1,5 +1,6 @@
 import { loggerService } from '@logger'
 import { ContentSearch, type ContentSearchRef } from '@renderer/components/ContentSearch'
+import { MARKDOWN_SOURCE_LINE_ATTR } from '@renderer/components/RichEditor/constants'
 import DragHandle from '@tiptap/extension-drag-handle-react'
 import { EditorContent } from '@tiptap/react'
 import { Tooltip } from 'antd'
@@ -29,6 +30,156 @@ import type { FormattingCommand, RichEditorProps, RichEditorRef } from './types'
 import { useRichEditor } from './useRichEditor'
 const logger = loggerService.withContext('RichEditor')
 
+/**
+ * Find element by line number with fallback strategies:
+ * 1. Exact line + content match
+ * 2. Exact line match
+ * 3. Closest line <= target
+ */
+function findElementByLine(editorDom: HTMLElement, lineNumber: number, lineContent?: string): HTMLElement | null {
+  const allElements = Array.from(editorDom.querySelectorAll(`[${MARKDOWN_SOURCE_LINE_ATTR}]`)) as HTMLElement[]
+  if (allElements.length === 0) {
+    logger.warn('No elements with data-source-line attribute found')
+    return null
+  }
+  const exactMatches = editorDom.querySelectorAll(
+    `[${MARKDOWN_SOURCE_LINE_ATTR}="${lineNumber}"]`
+  ) as NodeListOf<HTMLElement>
+
+  // Strategy 1: Exact line + content match
+  if (exactMatches.length > 1 && lineContent) {
+    for (const match of Array.from(exactMatches)) {
+      if (match.textContent?.includes(lineContent)) {
+        return match
+      }
+    }
+  }
+
+  // Strategy 2: Exact line match
+  if (exactMatches.length > 0) {
+    return exactMatches[0]
+  }
+
+  // Strategy 3: Closest line <= target
+  let closestElement: HTMLElement | null = null
+  let closestLine = 0
+
+  for (const el of allElements) {
+    const sourceLine = parseInt(el.getAttribute(MARKDOWN_SOURCE_LINE_ATTR) || '0', 10)
+    if (sourceLine <= lineNumber && sourceLine > closestLine) {
+      closestLine = sourceLine
+      closestElement = el
+    }
+  }
+
+  return closestElement
+}
+
+/**
+ * Create fixed-position highlight overlay at element location
+ * with boundary detection to prevent overflow and toolbar overlap
+ */
+function createHighlightOverlay(element: HTMLElement, container: HTMLElement): void {
+  try {
+    // Remove previous overlay
+    const previousOverlay = document.body.querySelector('.highlight-overlay')
+    if (previousOverlay) {
+      previousOverlay.remove()
+    }
+
+    const editorWrapper = container.closest('.rich-editor-wrapper')
+
+    // Create overlay at element position
+    const rect = element.getBoundingClientRect()
+    const overlay = document.createElement('div')
+    overlay.className = 'highlight-overlay animation-locate-highlight'
+    overlay.style.position = 'fixed'
+    overlay.style.left = `${rect.left}px`
+    overlay.style.top = `${rect.top}px`
+    overlay.style.width = `${rect.width}px`
+    overlay.style.height = `${rect.height}px`
+    overlay.style.pointerEvents = 'none'
+    overlay.style.zIndex = '9999'
+    overlay.style.borderRadius = '4px'
+
+    document.body.appendChild(overlay)
+
+    // Update overlay position and visibility on scroll
+    const updatePosition = () => {
+      const newRect = element.getBoundingClientRect()
+      const newContainerRect = container.getBoundingClientRect()
+
+      // Update position
+      overlay.style.left = `${newRect.left}px`
+      overlay.style.top = `${newRect.top}px`
+      overlay.style.width = `${newRect.width}px`
+      overlay.style.height = `${newRect.height}px`
+
+      // Get current toolbar bottom (it might change)
+      const currentToolbar = editorWrapper?.querySelector('[class*="ToolbarWrapper"]')
+      const currentToolbarRect = currentToolbar?.getBoundingClientRect()
+      const currentToolbarBottom = currentToolbarRect ? currentToolbarRect.bottom : newContainerRect.top
+
+      // Check if overlay is within visible bounds
+      const overlayTop = newRect.top
+      const overlayBottom = newRect.bottom
+      const visibleTop = currentToolbarBottom // Don't overlap toolbar
+      const visibleBottom = newContainerRect.bottom
+
+      // Hide overlay if any part is outside the visible container area
+      if (overlayTop < visibleTop || overlayBottom > visibleBottom) {
+        overlay.style.opacity = '0'
+        overlay.style.visibility = 'hidden'
+      } else {
+        overlay.style.opacity = '1'
+        overlay.style.visibility = 'visible'
+      }
+    }
+
+    container.addEventListener('scroll', updatePosition)
+
+    // Auto-remove after animation
+    const handleAnimationEnd = () => {
+      overlay.remove()
+      container.removeEventListener('scroll', updatePosition)
+      overlay.removeEventListener('animationend', handleAnimationEnd)
+    }
+    overlay.addEventListener('animationend', handleAnimationEnd)
+  } catch (error) {
+    logger.error('Failed to create highlight overlay:', error as Error)
+  }
+}
+
+/**
+ * Scroll to element and show highlight after scroll completes
+ */
+function scrollAndHighlight(element: HTMLElement, container: HTMLElement): void {
+  element.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'nearest' })
+
+  let scrollTimeout: NodeJS.Timeout
+  const handleScroll = () => {
+    clearTimeout(scrollTimeout)
+    scrollTimeout = setTimeout(() => {
+      container.removeEventListener('scroll', handleScroll)
+      requestAnimationFrame(() => createHighlightOverlay(element, container))
+    }, 150)
+  }
+
+  container.addEventListener('scroll', handleScroll)
+
+  // Fallback: if element already in view (no scroll happens)
+  setTimeout(() => {
+    const initialScrollTop = container.scrollTop
+    setTimeout(() => {
+      if (Math.abs(container.scrollTop - initialScrollTop) < 1) {
+        container.removeEventListener('scroll', handleScroll)
+        clearTimeout(scrollTimeout)
+        requestAnimationFrame(() => createHighlightOverlay(element, container))
+      }
+    }, 200)
+  }, 50)
+}
+
 const RichEditor = ({
   ref,
   initialContent = '',
@@ -372,6 +523,22 @@ const RichEditor = ({
           scrollContainerRef.current.scrollTop = value
         }
       },
+      scrollToLine: (lineNumber: number, options?: { highlight?: boolean; lineContent?: string }) => {
+        if (!editor || !scrollContainerRef.current) return
+
+        try {
+          const element = findElementByLine(editor.view.dom, lineNumber, options?.lineContent)
+          if (!element) return
+
+          if (options?.highlight) {
+            scrollAndHighlight(element, scrollContainerRef.current)
+          } else {
+            element.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'nearest' })
+          }
+        } catch (error) {
+          logger.error('Failed in scrollToLine:', error as Error)
+        }
+      },
       // Dynamic command management
       registerCommand,
       registerToolbarCommand,

src/renderer/src/components/RichEditor/types.ts

@@ -111,6 +111,8 @@ export interface RichEditorRef {
   getScrollTop: () => number
   /** Set scrollTop of the editor scroll container */
   setScrollTop: (value: number) => void
+  /** Scroll to specific line number in markdown */
+  scrollToLine: (lineNumber: number, options?: { highlight?: boolean; lineContent?: string }) => void
   // Dynamic command management
   /** Register a new command/toolbar item */
   registerCommand: (cmd: Command) => void

src/renderer/src/components/RichEditor/useRichEditor.ts

@@ -2,6 +2,7 @@ import 'katex/dist/katex.min.css'
 
 import { TableKit } from '@cherrystudio/extension-table-plus'
 import { loggerService } from '@logger'
+import { MARKDOWN_SOURCE_LINE_ATTR } from '@renderer/components/RichEditor/constants'
 import type { FormattingState } from '@renderer/components/RichEditor/types'
 import { useCodeStyle } from '@renderer/context/CodeStyleProvider'
 import {
@@ -11,6 +12,7 @@ import {
   markdownToPreviewText
 } from '@renderer/utils/markdownConverter'
 import type { Editor } from '@tiptap/core'
+import { Extension } from '@tiptap/core'
 import { TaskItem, TaskList } from '@tiptap/extension-list'
 import { migrateMathStrings } from '@tiptap/extension-mathematics'
 import Mention from '@tiptap/extension-mention'
@@ -36,6 +38,31 @@ import { blobToArrayBuffer, compressImage, shouldCompressImage } from './helpers
 
 const logger = loggerService.withContext('useRichEditor')
 
+// Create extension to preserve data-source-line attribute
+const SourceLineAttribute = Extension.create({
+  name: 'sourceLineAttribute',
+  addGlobalAttributes() {
+    return [
+      {
+        types: ['paragraph', 'heading', 'blockquote', 'bulletList', 'orderedList', 'listItem', 'horizontalRule'],
+        attributes: {
+          dataSourceLine: {
+            default: null,
+            parseHTML: (element) => {
+              const value = element.getAttribute(MARKDOWN_SOURCE_LINE_ATTR)
+              return value
+            },
+            renderHTML: (attributes) => {
+              if (!attributes.dataSourceLine) return {}
+              return { [MARKDOWN_SOURCE_LINE_ATTR]: attributes.dataSourceLine }
+            }
+          }
+        }
+      }
+    ]
+  }
+})
+
 export interface UseRichEditorOptions {
   /** Initial markdown content */
   initialContent?: string
@@ -196,6 +223,7 @@ export const useRichEditor = (options: UseRichEditorOptions = {}): UseRichEditor
   // TipTap editor extensions
   const extensions = useMemo(
     () => [
+      SourceLineAttribute,
       StarterKit.configure({
         heading: {
           levels: [1, 2, 3, 4, 5, 6]

src/renderer/src/components/app/Navbar.tsx

@@ -74,7 +74,7 @@ const NavbarContainer = styled.div<{ $isFullScreen: boolean }>`
 `
 
 const NavbarLeftContainer = styled.div`
-  min-width: var(--assistants-width);
+  min-width: ${isMac ? 'calc(var(--assistants-width) - 20px)' : 'var(--assistants-width)'};
   padding: 0 10px;
   display: flex;
   flex-direction: row;

src/renderer/src/config/models/utils.ts

@@ -1,11 +1,12 @@
 import OpenAI from '@cherrystudio/openai'
+import { isEmbeddingModel, isRerankModel } from '@renderer/config/models/embedding'
 import { Model } from '@renderer/types'
 import { getLowerBaseModelName } from '@renderer/utils'
 
 import { WEB_SEARCH_PROMPT_FOR_OPENROUTER } from '../prompts'
 import { getWebSearchTools } from '../tools'
 import { isOpenAIReasoningModel } from './reasoning'
-import { isGenerateImageModel, isVisionModel } from './vision'
+import { isGenerateImageModel, isTextToImageModel, isVisionModel } from './vision'
 import { isOpenAIWebSearchChatCompletionOnlyModel } from './websearch'
 export const NOT_SUPPORTED_REGEX = /(?:^tts|whisper|speech)/i
 
@@ -246,3 +247,7 @@ export const isOpenAIOpenWeightModel = (model: Model) => {
 
 // zhipu 视觉推理模型用这组 special token 标记推理结果
 export const ZHIPU_RESULT_TOKENS = ['<|begin_of_box|>', '<|end_of_box|>'] as const
+
+export const agentModelFilter = (model: Model): boolean => {
+  return !isEmbeddingModel(model) && !isRerankModel(model) && !isTextToImageModel(model)
+}

src/renderer/src/config/models/vision.ts

@@ -82,14 +82,14 @@ export const IMAGE_ENHANCEMENT_MODELS = [
   'grok-2-image(?:-[\\w-]+)?',
   'qwen-image-edit',
   'gpt-image-1',
-  'gemini-2.5-flash-image-preview',
+  'gemini-2.5-flash-image',
   'gemini-2.0-flash-preview-image-generation'
 ]
 
 const IMAGE_ENHANCEMENT_MODELS_REGEX = new RegExp(IMAGE_ENHANCEMENT_MODELS.join('|'), 'i')
 
 // Models that should auto-enable image generation button when selected
-export const AUTO_ENABLE_IMAGE_MODELS = ['gemini-2.5-flash-image-preview', ...DEDICATED_IMAGE_MODELS]
+export const AUTO_ENABLE_IMAGE_MODELS = ['gemini-2.5-flash-image', ...DEDICATED_IMAGE_MODELS]
 
 export const OPENAI_TOOL_USE_IMAGE_GENERATION_MODELS = [
   'o3',
@@ -107,7 +107,7 @@ export const GENERATE_IMAGE_MODELS = [
   'gemini-2.0-flash-exp',
   'gemini-2.0-flash-exp-image-generation',
   'gemini-2.0-flash-preview-image-generation',
-  'gemini-2.5-flash-image-preview',
+  'gemini-2.5-flash-image',
   ...DEDICATED_IMAGE_MODELS
 ]
 

src/renderer/src/config/ocr.ts

@@ -1,6 +1,7 @@
 import {
   BuiltinOcrProvider,
   BuiltinOcrProviderId,
+  OcrOvProvider,
   OcrPpocrProvider,
   OcrProviderCapability,
   OcrSystemProvider,
@@ -50,10 +51,23 @@ const ppocrOcr: OcrPpocrProvider = {
   }
 } as const
 
+const ovOcr: OcrOvProvider = {
+  id: 'ovocr',
+  name: 'Intel OV(NPU) OCR',
+  config: {
+    langs: isWin ? ['en-us', 'zh-cn'] : undefined
+  },
+  capabilities: {
+    image: true
+    // pdf: true
+  }
+} as const satisfies OcrOvProvider
+
 export const BUILTIN_OCR_PROVIDERS_MAP = {
   tesseract,
   system: systemOcr,
-  paddleocr: ppocrOcr
+  paddleocr: ppocrOcr,
+  ovocr: ovOcr
 } as const satisfies Record<BuiltinOcrProviderId, BuiltinOcrProvider>
 
 export const BUILTIN_OCR_PROVIDERS: BuiltinOcrProvider[] = Object.values(BUILTIN_OCR_PROVIDERS_MAP)

src/renderer/src/config/providers.ts

@@ -58,7 +58,6 @@ import ZhipuProviderLogo from '@renderer/assets/images/providers/zhipu.png'
 import {
   AtLeast,
   isSystemProvider,
-  Model,
   OpenAIServiceTiers,
   Provider,
   ProviderType,
@@ -88,6 +87,7 @@ export const SYSTEM_PROVIDERS_CONFIG: Record<SystemProviderId, SystemProvider> =
     type: 'openai',
     apiKey: '',
     apiHost: 'https://open.cherryin.net',
+    anthropicApiHost: 'https://open.cherryin.net',
     models: [],
     isSystem: true,
     enabled: true
@@ -109,7 +109,6 @@ export const SYSTEM_PROVIDERS_CONFIG: Record<SystemProviderId, SystemProvider> =
     apiKey: '',
     apiHost: 'https://aihubmix.com',
     anthropicApiHost: 'https://aihubmix.com/anthropic',
-    isAnthropicModel: (m: Model) => m.id.includes('claude'),
     models: SYSTEM_MODELS.aihubmix,
     isSystem: true,
     enabled: false
@@ -289,7 +288,7 @@ export const SYSTEM_PROVIDERS_CONFIG: Record<SystemProviderId, SystemProvider> =
   'new-api': {
     id: 'new-api',
     name: 'New API',
-    type: 'openai',
+    type: 'new-api',
     apiKey: '',
     apiHost: 'http://localhost:3000',
     anthropicApiHost: 'http://localhost:3000',
@@ -1432,5 +1431,5 @@ export const isGeminiWebSearchProvider = (provider: Provider) => {
 }
 
 export const isNewApiProvider = (provider: Provider) => {
-  return ['new-api', 'cherryin'].includes(provider.id)
+  return ['new-api', 'cherryin'].includes(provider.id) || provider.type === 'new-api'
 }

src/renderer/src/hooks/agents/types.ts

@@ -0,0 +1,4 @@
+export type UpdateAgentBaseOptions = {
+  /** Whether to show success toast after updating. Defaults to true. */
+  showSuccessToast?: boolean
+}

src/renderer/src/hooks/agents/useActiveAgent.ts

@@ -0,0 +1,8 @@
+import { useRuntime } from '../useRuntime'
+import { useAgent } from './useAgent'
+
+export const useActiveAgent = () => {
+  const { chat } = useRuntime()
+  const { activeAgentId } = chat
+  return useAgent(activeAgentId)
+}

src/renderer/src/hooks/agents/useActiveSession.ts

@@ -0,0 +1,9 @@
+import { useRuntime } from '../useRuntime'
+import { useSession } from './useSession'
+
+export const useActiveSession = () => {
+  const { chat } = useRuntime()
+  const { activeSessionIdMap, activeAgentId } = chat
+  const activeSessionId = activeAgentId ? activeSessionIdMap[activeAgentId] : null
+  return useSession(activeAgentId, activeSessionId)
+}

src/renderer/src/hooks/agents/useAgent.ts

@@ -1,18 +1,28 @@
 import { useCallback } from 'react'
+import { useTranslation } from 'react-i18next'
 import useSWR from 'swr'
 
+import { useApiServer } from '../useApiServer'
 import { useAgentClient } from './useAgentClient'
 
 export const useAgent = (id: string | null) => {
+  const { t } = useTranslation()
   const client = useAgentClient()
   const key = id ? client.agentPaths.withId(id) : null
+  const { apiServerConfig, apiServerRunning } = useApiServer()
   const fetcher = useCallback(async () => {
-    if (!id || id === 'fake') {
-      return null
+    if (!id) {
+      throw new Error(t('agent.get.error.null_id'))
+    }
+    if (!apiServerConfig.enabled) {
+      throw new Error(t('apiServer.messages.notEnabled'))
+    }
+    if (!apiServerRunning) {
+      throw new Error(t('agent.server.error.not_running'))
     }
     const result = await client.getAgent(id)
     return result
-  }, [client, id])
+  }, [apiServerConfig.enabled, apiServerRunning, client, id, t])
   const { data, error, isLoading } = useSWR(key, id ? fetcher : null)
 
   return {

src/renderer/src/hooks/agents/useAgentSessionInitializer.ts

@@ -17,7 +17,7 @@ export const useAgentSessionInitializer = () => {
   const dispatch = useAppDispatch()
   const client = useAgentClient()
   const { chat } = useRuntime()
-  const { activeAgentId, activeSessionId } = chat
+  const { activeAgentId, activeSessionIdMap } = chat
 
   /**
    * Initialize session for the given agent by loading its sessions
@@ -25,11 +25,11 @@ export const useAgentSessionInitializer = () => {
    */
   const initializeAgentSession = useCallback(
     async (agentId: string) => {
-      if (!agentId || agentId === 'fake') return
+      if (!agentId) return
 
       try {
         // Check if this agent already has an active session
-        const currentSessionId = activeSessionId[agentId]
+        const currentSessionId = activeSessionIdMap[agentId]
         if (currentSessionId) {
           // Session already exists, just switch to session view
           dispatch(setActiveTopicOrSessionAction('session'))
@@ -58,21 +58,21 @@ export const useAgentSessionInitializer = () => {
         dispatch(setActiveTopicOrSessionAction('session'))
       }
     },
-    [client, dispatch, activeSessionId]
+    [client, dispatch, activeSessionIdMap]
   )
 
   /**
    * Auto-initialize when activeAgentId changes
    */
   useEffect(() => {
-    if (activeAgentId && activeAgentId !== 'fake') {
+    if (activeAgentId) {
       // Check if we need to initialize this agent's session
-      const hasActiveSession = activeSessionId[activeAgentId]
+      const hasActiveSession = activeSessionIdMap[activeAgentId]
       if (!hasActiveSession) {
         initializeAgentSession(activeAgentId)
       }
     }
-  }, [activeAgentId, activeSessionId, initializeAgentSession])
+  }, [activeAgentId, activeSessionIdMap, initializeAgentSession])
 
   return {
     initializeAgentSession

src/renderer/src/hooks/agents/useAgents.ts

@@ -6,6 +6,7 @@ import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import useSWR from 'swr'
 
+import { useApiServer } from '../useApiServer'
 import { useRuntime } from '../useRuntime'
 import { useAgentClient } from './useAgentClient'
 
@@ -23,11 +24,19 @@ export const useAgents = () => {
   const { t } = useTranslation()
   const client = useAgentClient()
   const key = client.agentPaths.base
+  const { apiServerConfig, apiServerRunning } = useApiServer()
   const fetcher = useCallback(async () => {
+    // API server will start on startup if enabled OR there are agents
+    if (!apiServerConfig.enabled && !apiServerRunning) {
+      throw new Error(t('apiServer.messages.notEnabled'))
+    }
+    if (!apiServerRunning) {
+      throw new Error(t('agent.server.error.not_running'))
+    }
     const result = await client.listAgents()
     // NOTE: We only use the array for now. useUpdateAgent depends on this behavior.
     return result.data
-  }, [client])
+  }, [apiServerConfig.enabled, apiServerRunning, client, t])
   const { data, error, isLoading, mutate } = useSWR(key, fetcher)
   const { chat } = useRuntime()
   const { activeAgentId } = chat

src/renderer/src/hooks/agents/useSession.ts

@@ -1,21 +1,24 @@
 import { useAppDispatch } from '@renderer/store'
 import { loadTopicMessagesThunk } from '@renderer/store/thunk/messageThunk'
-import { UpdateSessionForm } from '@renderer/types'
 import { buildAgentSessionTopicId } from '@renderer/utils/agentSession'
-import { useCallback, useEffect, useMemo } from 'react'
+import { useEffect, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import useSWR from 'swr'
 
 import { useAgentClient } from './useAgentClient'
+import { useUpdateSession } from './useUpdateSession'
 
-export const useSession = (agentId: string, sessionId: string) => {
+export const useSession = (agentId: string | null, sessionId: string | null) => {
   const { t } = useTranslation()
   const client = useAgentClient()
-  const key = client.getSessionPaths(agentId).withId(sessionId)
+  const key = agentId && sessionId ? client.getSessionPaths(agentId).withId(sessionId) : null
   const dispatch = useAppDispatch()
-  const sessionTopicId = useMemo(() => buildAgentSessionTopicId(sessionId), [sessionId])
+  const sessionTopicId = useMemo(() => (sessionId ? buildAgentSessionTopicId(sessionId) : null), [sessionId])
+  const { updateSession } = useUpdateSession(agentId)
 
   const fetcher = async () => {
+    if (!agentId) throw new Error(t('agent.get.error.null_id'))
+    if (!sessionId) throw new Error(t('agent.session.get.error.null_id'))
     const data = await client.getSession(agentId, sessionId)
     return data
   }
@@ -24,26 +27,13 @@ export const useSession = (agentId: string, sessionId: string) => {
   // Use loadTopicMessagesThunk to load messages (with caching mechanism)
   // This ensures messages are preserved when switching between sessions/tabs
   useEffect(() => {
-    if (sessionId) {
+    if (sessionTopicId) {
       // loadTopicMessagesThunk will check if messages already exist in Redux
       // and skip loading if they do (unless forceReload is true)
       dispatch(loadTopicMessagesThunk(sessionTopicId))
     }
   }, [dispatch, sessionId, sessionTopicId])
 
-  const updateSession = useCallback(
-    async (form: UpdateSessionForm) => {
-      if (!agentId) return
-      try {
-        const result = await client.updateSession(agentId, form)
-        mutate(result)
-      } catch (error) {
-        window.toast.error(t('agent.session.update.error.failed'))
-      }
-    },
-    [agentId, client, mutate, t]
-  )
-
   return {
     session: data,
     error,

src/renderer/src/hooks/agents/useSessions.ts

@@ -1,4 +1,4 @@
-import { CreateSessionForm } from '@renderer/types'
+import { CreateAgentSessionResponse, CreateSessionForm, GetAgentSessionResponse } from '@renderer/types'
 import { formatErrorMessageWithPrefix } from '@renderer/utils/error'
 import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -6,46 +6,50 @@ import useSWR from 'swr'
 
 import { useAgentClient } from './useAgentClient'
 
-export const useSessions = (agentId: string) => {
+export const useSessions = (agentId: string | null) => {
   const { t } = useTranslation()
   const client = useAgentClient()
-  const key = client.getSessionPaths(agentId).base
+  const key = agentId ? client.getSessionPaths(agentId).base : null
 
   const fetcher = async () => {
+    if (!agentId) throw new Error('No active agent.')
     const data = await client.listSessions(agentId)
     return data.data
   }
   const { data, error, isLoading, mutate } = useSWR(key, fetcher)
 
   const createSession = useCallback(
-    async (form: CreateSessionForm) => {
+    async (form: CreateSessionForm): Promise<CreateAgentSessionResponse | null> => {
+      if (!agentId) return null
       try {
         const result = await client.createSession(agentId, form)
-        await mutate((prev) => [...(prev ?? []), result], { revalidate: false })
+        await mutate((prev) => [result, ...(prev ?? [])], { revalidate: false })
         return result
       } catch (error) {
         window.toast.error(formatErrorMessageWithPrefix(error, t('agent.session.create.error.failed')))
-        return undefined
+        return null
       }
     },
     [agentId, client, mutate, t]
   )
 
-  // TODO: including messages field
   const getSession = useCallback(
-    async (id: string) => {
+    async (id: string): Promise<GetAgentSessionResponse | null> => {
+      if (!agentId) return null
       try {
         const result = await client.getSession(agentId, id)
         mutate((prev) => prev?.map((session) => (session.id === result.id ? result : session)))
+        return result
       } catch (error) {
         window.toast.error(formatErrorMessageWithPrefix(error, t('agent.session.get.error.failed')))
+        return null
       }
     },
     [agentId, client, mutate, t]
   )
 
   const deleteSession = useCallback(
-    async (id: string) => {
+    async (id: string): Promise<boolean> => {
       if (!agentId) return false
       try {
         await client.deleteSession(agentId, id)

src/renderer/src/hooks/agents/useUpdateAgent.ts

@@ -4,20 +4,16 @@ import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import { mutate } from 'swr'
 
+import { UpdateAgentBaseOptions } from './types'
 import { useAgentClient } from './useAgentClient'
 
-export type UpdateAgentOptions = {
-  /** Whether to show success toast after updating. Defaults to true. */
-  showSuccessToast?: boolean
-}
-
 export const useUpdateAgent = () => {
   const { t } = useTranslation()
   const client = useAgentClient()
   const listKey = client.agentPaths.base
 
   const updateAgent = useCallback(
-    async (form: UpdateAgentForm, options?: UpdateAgentOptions) => {
+    async (form: UpdateAgentForm, options?: UpdateAgentBaseOptions) => {
       try {
         const itemKey = client.agentPaths.withId(form.id)
         // may change to optimistic update
@@ -35,7 +31,7 @@ export const useUpdateAgent = () => {
   )
 
   const updateModel = useCallback(
-    async (agentId: string, modelId: string, options?: UpdateAgentOptions) => {
+    async (agentId: string, modelId: string, options?: UpdateAgentBaseOptions) => {
       updateAgent({ id: agentId, model: modelId }, options)
     },
     [updateAgent]

src/renderer/src/hooks/agents/useUpdateSession.ts

@@ -1,19 +1,21 @@
 import { ListAgentSessionsResponse, UpdateSessionForm } from '@renderer/types'
-import { formatErrorMessageWithPrefix } from '@renderer/utils/error'
+import { getErrorMessage } from '@renderer/utils/error'
 import { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import { mutate } from 'swr'
 
+import { UpdateAgentBaseOptions } from './types'
 import { useAgentClient } from './useAgentClient'
 
-export const useUpdateSession = (agentId: string) => {
+export const useUpdateSession = (agentId: string | null) => {
   const { t } = useTranslation()
   const client = useAgentClient()
-  const paths = client.getSessionPaths(agentId)
-  const listKey = paths.base
 
   const updateSession = useCallback(
-    async (form: UpdateSessionForm) => {
+    async (form: UpdateSessionForm, options?: UpdateAgentBaseOptions) => {
+      if (!agentId) return
+      const paths = client.getSessionPaths(agentId)
+      const listKey = paths.base
       const sessionId = form.id
       try {
         const itemKey = paths.withId(sessionId)
@@ -24,13 +26,29 @@ export const useUpdateSession = (agentId: string) => {
           (prev) => prev?.map((session) => (session.id === result.id ? result : session)) ?? []
         )
         mutate(itemKey, result)
-        window.toast.success(t('common.update_success'))
+        if (options?.showSuccessToast ?? true) {
+          window.toast.success(t('common.update_success'))
+        }
       } catch (error) {
-        window.toast.error(formatErrorMessageWithPrefix(error, t('agent.update.error.failed')))
+        window.toast.error({ title: t('agent.session.update.error.failed'), description: getErrorMessage(error) })
       }
     },
-    [agentId, client, listKey, paths, t]
+    [agentId, client, t]
   )
 
-  return updateSession
+  const updateModel = useCallback(
+    async (sessionId: string, modelId: string, options?: UpdateAgentBaseOptions) => {
+      if (!agentId) return
+      return updateSession(
+        {
+          id: sessionId,
+          model: modelId
+        },
+        options
+      )
+    },
+    [agentId, updateSession]
+  )
+
+  return { updateSession, updateModel }
 }

src/renderer/src/hooks/useApiServer.ts

@@ -0,0 +1,112 @@
+import { loggerService } from '@logger'
+import { useAppDispatch, useAppSelector } from '@renderer/store'
+import { setApiServerEnabled as setApiServerEnabledAction } from '@renderer/store/settings'
+import { useCallback, useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+const logger = loggerService.withContext('useApiServer')
+
+export const useApiServer = () => {
+  const { t } = useTranslation()
+  // FIXME: We currently store two copies of the config data in both the renderer and the main processes,
+  // which carries the risk of data inconsistency. This should be modified so that the main process stores
+  // the data, and the renderer retrieves it.
+  const apiServerConfig = useAppSelector((state) => state.settings.apiServer)
+  const dispatch = useAppDispatch()
+
+  // Optimistic initial state.
+  const [apiServerRunning, setApiServerRunning] = useState(apiServerConfig.enabled)
+  const [apiServerLoading, setApiServerLoading] = useState(true)
+
+  const setApiServerEnabled = useCallback(
+    (enabled: boolean) => {
+      dispatch(setApiServerEnabledAction(enabled))
+    },
+    [dispatch]
+  )
+
+  // API Server functions
+  const checkApiServerStatus = useCallback(async () => {
+    setApiServerLoading(true)
+    try {
+      const status = await window.api.apiServer.getStatus()
+      setApiServerRunning(status.running)
+    } catch (error: any) {
+      logger.error('Failed to check API server status:', error)
+    } finally {
+      setApiServerLoading(false)
+    }
+  }, [])
+
+  const startApiServer = useCallback(async () => {
+    if (apiServerLoading) return
+
+    setApiServerLoading(true)
+    try {
+      const result = await window.api.apiServer.start()
+      if (result.success) {
+        setApiServerRunning(true)
+        window.toast.success(t('apiServer.messages.startSuccess'))
+      } else {
+        window.toast.error(t('apiServer.messages.startError') + result.error)
+      }
+    } catch (error: any) {
+      window.toast.error(t('apiServer.messages.startError') + (error.message || error))
+    } finally {
+      setApiServerLoading(false)
+    }
+  }, [apiServerLoading, t])
+
+  const stopApiServer = useCallback(async () => {
+    if (apiServerLoading) return
+
+    setApiServerLoading(true)
+    try {
+      const result = await window.api.apiServer.stop()
+      if (result.success) {
+        setApiServerRunning(false)
+        window.toast.success(t('apiServer.messages.stopSuccess'))
+      } else {
+        window.toast.error(t('apiServer.messages.stopError') + result.error)
+      }
+    } catch (error: any) {
+      window.toast.error(t('apiServer.messages.stopError') + (error.message || error))
+    } finally {
+      setApiServerLoading(false)
+    }
+  }, [apiServerLoading, t])
+
+  const restartApiServer = useCallback(async () => {
+    if (apiServerLoading) return
+
+    setApiServerLoading(true)
+    try {
+      const result = await window.api.apiServer.restart()
+      if (result.success) {
+        await checkApiServerStatus()
+        window.toast.success(t('apiServer.messages.restartSuccess'))
+      } else {
+        window.toast.error(t('apiServer.messages.restartError') + result.error)
+      }
+    } catch (error) {
+      window.toast.error(t('apiServer.messages.restartFailed') + (error as Error).message)
+    } finally {
+      setApiServerLoading(false)
+    }
+  }, [apiServerLoading, checkApiServerStatus, t])
+
+  useEffect(() => {
+    checkApiServerStatus()
+  }, [checkApiServerStatus])
+
+  return {
+    apiServerConfig,
+    apiServerRunning,
+    apiServerLoading,
+    startApiServer,
+    stopApiServer,
+    restartApiServer,
+    checkApiServerStatus,
+    setApiServerEnabled
+  }
+}

src/renderer/src/hooks/useOcrProvider.tsx

@@ -1,4 +1,5 @@
 import { loggerService } from '@logger'
+import IntelLogo from '@renderer/assets/images/providers/intel.png'
 import PaddleocrLogo from '@renderer/assets/images/providers/paddleocr.png'
 import TesseractLogo from '@renderer/assets/images/providers/Tesseract.js.png'
 import { BUILTIN_OCR_PROVIDERS_MAP, DEFAULT_OCR_PROVIDER } from '@renderer/config/ocr'
@@ -83,6 +84,8 @@ export const useOcrProviders = () => {
           return <MonitorIcon size={size} />
         case 'paddleocr':
           return <Avatar size={size} src={PaddleocrLogo} />
+        case 'ovocr':
+          return <Avatar size={size} src={IntelLogo} />
       }
     }
     return <FileQuestionMarkIcon size={size} />

src/renderer/src/i18n/label.ts

@@ -331,7 +331,8 @@ const builtInMcpDescriptionKeyMap: Record<BuiltinMCPServerName, string> = {
   [BuiltinMCPServerNames.fetch]: 'settings.mcp.builtinServersDescriptions.fetch',
   [BuiltinMCPServerNames.filesystem]: 'settings.mcp.builtinServersDescriptions.filesystem',
   [BuiltinMCPServerNames.difyKnowledge]: 'settings.mcp.builtinServersDescriptions.dify_knowledge',
-  [BuiltinMCPServerNames.python]: 'settings.mcp.builtinServersDescriptions.python'
+  [BuiltinMCPServerNames.python]: 'settings.mcp.builtinServersDescriptions.python',
+  [BuiltinMCPServerNames.didiMCP]: 'settings.mcp.builtinServersDescriptions.didi_mcp'
 } as const
 
 export const getBuiltInMcpServerDescriptionLabel = (key: string): string => {
@@ -341,12 +342,14 @@ export const getBuiltInMcpServerDescriptionLabel = (key: string): string => {
 const builtinOcrProviderKeyMap = {
   system: 'ocr.builtin.system',
   tesseract: '',
-  paddleocr: ''
+  paddleocr: '',
+  ovocr: ''
 } as const satisfies Record<BuiltinOcrProviderId, string>
 
 export const getBuiltinOcrProviderLabel = (key: BuiltinOcrProviderId) => {
   if (key === 'tesseract') return 'Tesseract'
   else if (key == 'paddleocr') return 'PaddleOCR'
+  else if (key == 'ovocr') return 'Intel OV(NPU) OCR'
   else return getLabel(builtinOcrProviderKeyMap, key)
 }
 

src/renderer/src/i18n/locales/en-us.json

@@ -22,7 +22,8 @@
     },
     "get": {
       "error": {
-        "failed": "Failed to get the agent."
+        "failed": "Failed to get the agent.",
+        "null_id": "Agent ID is null."
       }
     },
     "list": {
@@ -30,6 +31,11 @@
         "failed": "Failed to list agents."
       }
     },
+    "server": {
+      "error": {
+        "not_running": "The API server is enabled but not running properly."
+      }
+    },
     "session": {
       "accessible_paths": {
         "add": "Add directory",
@@ -68,7 +74,8 @@
       },
       "get": {
         "error": {
-          "failed": "Failed to get the session"
+          "failed": "Failed to get the session",
+          "null_id": "Session ID is null"
         }
       },
       "label_one": "Session",
@@ -237,6 +244,7 @@
     "messages": {
       "apiKeyCopied": "API Key copied to clipboard",
       "apiKeyRegenerated": "API Key regenerated",
+      "notEnabled": "The API Server is not enabled.",
       "operationFailed": "API Server operation failed: ",
       "restartError": "Failed to restart API Server: ",
       "restartFailed": "API Server restart failed: ",
@@ -1959,6 +1967,14 @@
     "rename": "Rename",
     "rename_changed": "Due to security policies, the filename has been changed from {{original}} to {{final}}",
     "save": "Save to Notes",
+    "search": {
+      "both": "Name+Content",
+      "content": "Content",
+      "found_results": "Found {{count}} results (Name: {{nameCount}}, Content: {{contentCount}})",
+      "more_matches": "more matches",
+      "searching": "Searching...",
+      "show_less": "Show less"
+    },
     "settings": {
       "data": {
         "apply": "Apply",
@@ -2043,6 +2059,7 @@
       "provider": {
         "cannot_remove_builtin": "Cannot delete built-in provider",
         "existing": "The provider already exists",
+        "get_providers": "Failed to get available providers",
         "not_found": "OCR provider does not exist",
         "update_failed": "Failed to update configuration"
       },
@@ -2104,8 +2121,10 @@
       "install_code_101": "Only supports Intel(R) Core(TM) Ultra CPU",
       "install_code_102": "Only supports Windows",
       "install_code_103": "Download OVMS runtime failed",
-      "install_code_104": "Uncompress OVMS runtime failed",
-      "install_code_105": "Clean OVMS runtime failed",
+      "install_code_104": "Failed to install OVMS runtime",
+      "install_code_105": "Failed to create ovdnd.exe",
+      "install_code_106": "Failed to create run.bat",
+      "install_code_110": "Failed to clean old OVMS runtime",
       "run": "Run OVMS failed:",
       "stop": "Stop OVMS failed:"
     },
@@ -3576,6 +3595,7 @@
       "builtinServers": "Builtin Servers",
       "builtinServersDescriptions": {
         "brave_search": "An MCP server implementation integrating the Brave Search API, providing both web and local search functionalities. Requires configuring the BRAVE_API_KEY environment variable",
+        "didi_mcp": "DiDi MCP server providing ride-hailing services including map search, price estimation, order management, and driver tracking. Only available in Mainland China. Requires configuring the DIDI_API_KEY environment variable",
         "dify_knowledge": "Dify's MCP server implementation provides a simple API to interact with Dify. Requires configuring the Dify Key",
         "fetch": "MCP server for retrieving URL web content",
         "filesystem": "A Node.js server implementing the Model Context Protocol (MCP) for file system operations. Requires configuration of directories allowed for access.",
@@ -4081,7 +4101,7 @@
       "api_host_tooltip": "Override only when your provider requires a custom OpenAI-compatible endpoint.",
       "api_key": {
         "label": "API Key",
-        "tip": "Multiple keys separated by commas or spaces"
+        "tip": "Use commas to separate multiple keys"
       },
       "api_version": "API Version",
       "aws-bedrock": {

src/renderer/src/i18n/locales/zh-cn.json

@@ -22,7 +22,8 @@
     },
     "get": {
       "error": {
-        "failed": "获取智能体失败"
+        "failed": "获取智能体失败",
+        "null_id": "智能体 ID 为空。"
       }
     },
     "list": {
@@ -30,6 +31,11 @@
         "failed": "获取智能体列表失败"
       }
     },
+    "server": {
+      "error": {
+        "not_running": "API 服务器已启用但未正常运行。"
+      }
+    },
     "session": {
       "accessible_paths": {
         "add": "添加目录",
@@ -68,7 +74,8 @@
       },
       "get": {
         "error": {
-          "failed": "获取会话失败"
+          "failed": "获取会话失败",
+          "null_id": "会话 ID 为空"
         }
       },
       "label_one": "会话",
@@ -237,6 +244,7 @@
     "messages": {
       "apiKeyCopied": "API 密钥已复制到剪贴板",
       "apiKeyRegenerated": "API 密钥已重新生成",
+      "notEnabled": "API 服务器未启用。",
       "operationFailed": "API 服务器操作失败：",
       "restartError": "重启 API 服务器失败：",
       "restartFailed": "API 服务器重启失败：",
@@ -1959,6 +1967,14 @@
     "rename": "重命名",
     "rename_changed": "由于安全策略，文件名已从 {{original}} 更改为 {{final}}",
     "save": "保存到笔记",
+    "search": {
+      "both": "名称+内容",
+      "content": "内容",
+      "found_results": "找到 {{count}} 个结果 (名称: {{nameCount}}, 内容: {{contentCount}})",
+      "more_matches": "个匹配",
+      "searching": "搜索中...",
+      "show_less": "收起"
+    },
     "settings": {
       "data": {
         "apply": "应用",
@@ -2043,6 +2059,7 @@
       "provider": {
         "cannot_remove_builtin": "不能删除内置提供商",
         "existing": "提供商已存在",
+        "get_providers": "获取可用提供商失败",
         "not_found": "OCR 提供商不存在",
         "update_failed": "更新配置失败"
       },
@@ -2079,7 +2096,7 @@
     "description": "<div><p>1. 下载 OV 模型.</p><p>2. 在 'Manager' 中添加模型.</p><p>仅支持 Windows!</p><p>OVMS 安装路径: '%USERPROFILE%\\.cherrystudio\\ovms' .</p><p>请参考 <a href=https://github.com/openvinotoolkit/model_server/blob/c55551763d02825829337b62c2dcef9339706f79/docs/deploying_server_baremetal.md>Intel OVMS 指南</a></p></dev>",
     "download": {
       "button": "下载",
-      "error": "选择失败",
+      "error": "下载失败",
       "model_id": {
         "label": "模型 ID",
         "model_id_pattern": "模型 ID 必须以 OpenVINO/ 开头",
@@ -2104,8 +2121,10 @@
       "install_code_101": "仅支持 Intel(R) Core(TM) Ultra CPU",
       "install_code_102": "仅支持 Windows",
       "install_code_103": "下载 OVMS runtime 失败",
-      "install_code_104": "解压 OVMS runtime 失败",
-      "install_code_105": "清理 OVMS runtime 失败",
+      "install_code_104": "安装 OVMS runtime 失败",
+      "install_code_105": "创建 ovdnd.exe 失败",
+      "install_code_106": "创建 run.bat 失败",
+      "install_code_110": "清理旧 OVMS runtime 失败",
       "run": "运行 OVMS 失败:",
       "stop": "停止 OVMS 失败:"
     },
@@ -3576,6 +3595,7 @@
       "builtinServers": "内置服务器",
       "builtinServersDescriptions": {
         "brave_search": "一个集成了Brave 搜索 API 的 MCP 服务器实现，提供网页与本地搜索双重功能。需要配置 BRAVE_API_KEY 环境变量",
+        "didi_mcp": "一个集成了滴滴 MCP 服务器实现，提供网约车服务包括地图搜索、价格预估、订单管理和司机跟踪。仅支持中国大陆地区。需要配置 DIDI_API_KEY 环境变量",
         "dify_knowledge": "Dify 的 MCP 服务器实现，提供了一个简单的 API 来与 Dify 进行交互。需要配置 Dify Key",
         "fetch": "用于获取 URL 网页内容的 MCP 服务器",
         "filesystem": "实现文件系统操作的模型上下文协议（MCP）的 Node.js 服务器。需要配置允许访问的目录",
@@ -4081,7 +4101,7 @@
       "api_host_tooltip": "仅在服务商需要自定义的 OpenAI 兼容地址时覆盖。",
       "api_key": {
         "label": "API 密钥",
-        "tip": "多个密钥使用逗号或空格分隔"
+        "tip": "多个密钥使用逗号分隔"
       },
       "api_version": "API 版本",
       "aws-bedrock": {

src/renderer/src/i18n/locales/zh-tw.json

@@ -22,7 +22,8 @@
     },
     "get": {
       "error": {
-        "failed": "無法取得代理程式。"
+        "failed": "無法取得代理程式。",
+        "null_id": "代理程式 ID 為空。"
       }
     },
     "list": {
@@ -30,6 +31,11 @@
         "failed": "無法列出代理程式。"
       }
     },
+    "server": {
+      "error": {
+        "not_running": "API 伺服器已啟用，但運行不正常。"
+      }
+    },
     "session": {
       "accessible_paths": {
         "add": "新增目錄",
@@ -68,7 +74,8 @@
       },
       "get": {
         "error": {
-          "failed": "無法取得工作階段"
+          "failed": "無法取得工作階段",
+          "null_id": "工作階段 ID 為空"
         }
       },
       "label_one": "會議",
@@ -237,6 +244,7 @@
     "messages": {
       "apiKeyCopied": "API 金鑰已複製到剪貼簿",
       "apiKeyRegenerated": "API 金鑰已重新生成",
+      "notEnabled": "API 伺服器未啟用。",
       "operationFailed": "API 伺服器操作失敗：",
       "restartError": "重新啟動 API 伺服器失敗：",
       "restartFailed": "API 伺服器重新啟動失敗：",
@@ -1959,6 +1967,14 @@
     "rename": "重命名",
     "rename_changed": "由於安全策略，文件名已從 {{original}} 更改為 {{final}}",
     "save": "儲存到筆記",
+    "search": {
+      "both": "名稱+內容",
+      "content": "內容",
+      "found_results": "找到 {{count}} 個結果 (名稱: {{nameCount}}, 內容: {{contentCount}})",
+      "more_matches": "個匹配",
+      "searching": "搜索中...",
+      "show_less": "收起"
+    },
     "settings": {
       "data": {
         "apply": "應用",
@@ -2042,8 +2058,9 @@
     "error": {
       "provider": {
         "cannot_remove_builtin": "不能刪除內建提供者",
-        "existing": "提供商已存在",
-        "not_found": "OCR 提供商不存在",
+        "existing": "提供者已存在",
+        "get_providers": "取得可用提供者失敗",
+        "not_found": "OCR 提供者不存在",
         "update_failed": "更新配置失敗"
       },
       "unknown": "OCR過程發生錯誤"
@@ -2079,7 +2096,7 @@
     "description": "<div><p>1. 下載 OV 模型。</p><p>2. 在 'Manager' 中新增模型。</p><p>僅支援 Windows！</p><p>OVMS 安裝路徑: '%USERPROFILE%\\.cherrystudio\\ovms' 。</p><p>請參考 <a href=https://github.com/openvinotoolkit/model_server/blob/c55551763d02825829337b62c2dcef9339706f79/docs/deploying_server_baremetal.md>Intel OVMS 指南</a></p></dev>",
     "download": {
       "button": "下載",
-      "error": "選擇失敗",
+      "error": "下載失敗",
       "model_id": {
         "label": "模型 ID",
         "model_id_pattern": "模型 ID 必須以 OpenVINO/ 開頭",
@@ -2104,8 +2121,10 @@
       "install_code_101": "僅支援 Intel(R) Core(TM) Ultra CPU",
       "install_code_102": "僅支援 Windows",
       "install_code_103": "下載 OVMS runtime 失敗",
-      "install_code_104": "解壓 OVMS runtime 失敗",
-      "install_code_105": "清理 OVMS runtime 失敗",
+      "install_code_104": "安裝 OVMS runtime 失敗",
+      "install_code_105": "創建 ovdnd.exe 失敗",
+      "install_code_106": "創建 run.bat 失敗",
+      "install_code_110": "清理舊 OVMS runtime 失敗",
       "run": "執行 OVMS 失敗:",
       "stop": "停止 OVMS 失敗:"
     },
@@ -3576,6 +3595,7 @@
       "builtinServers": "內置伺服器",
       "builtinServersDescriptions": {
         "brave_search": "一個集成了Brave 搜索 API 的 MCP 伺服器實現，提供網頁與本地搜尋雙重功能。需要配置 BRAVE_API_KEY 環境變數",
+        "didi_mcp": "一個集成了滴滴 MCP 伺服器實現，提供網約車服務包括地圖搜尋、價格預估、訂單管理和司機追蹤。僅支援中國大陸地區。需要配置 DIDI_API_KEY 環境變數",
         "dify_knowledge": "Dify 的 MCP 伺服器實現，提供了一個簡單的 API 來與 Dify 進行互動。需要配置 Dify Key",
         "fetch": "用於獲取 URL 網頁內容的 MCP 伺服器",
         "filesystem": "實現文件系統操作的模型上下文協議（MCP）的 Node.js 伺服器。需要配置允許訪問的目錄",
@@ -4081,7 +4101,7 @@
       "api_host_tooltip": "僅在服務商需要自訂的 OpenAI 相容端點時才覆蓋。",
       "api_key": {
         "label": "API 金鑰",
-        "tip": "多個金鑰使用逗號或空格分隔"
+        "tip": "多個金鑰使用逗號分隔"
       },
       "api_version": "API 版本",
       "aws-bedrock": {

src/renderer/src/i18n/translate/el-gr.json

@@ -22,7 +22,8 @@
     },
     "get": {
       "error": {
-        "failed": "Αποτυχία λήψης του πράκτορα."
+        "failed": "Αποτυχία λήψης του πράκτορα.",
+        "null_id": "Το ID του πράκτορα είναι null."
       }
     },
     "list": {
@@ -30,6 +31,11 @@
         "failed": "Αποτυχία καταχώρησης πρακτόρων."
       }
     },
+    "server": {
+      "error": {
+        "not_running": "Ο διακομιστής API είναι ενεργοποιημένος αλλά δεν λειτουργεί σωστά."
+      }
+    },
     "session": {
       "accessible_paths": {
         "add": "Προσθήκη καταλόγου",
@@ -68,7 +74,8 @@
       },
       "get": {
         "error": {
-          "failed": "Αποτυχία λήψης της συνεδρίας"
+          "failed": "Αποτυχία λήψης της συνεδρίας",
+          "null_id": "Το ID της συνεδρίας είναι null"
         }
       },
       "label_one": "Συνεδρία",
@@ -237,6 +244,7 @@
     "messages": {
       "apiKeyCopied": "Το κλειδί API αντιγράφηκε στο πρόχειρο",
       "apiKeyRegenerated": "Το κλειδί API αναδημιουργήθηκε",
+      "notEnabled": "Ο διακομιστής API δεν είναι ενεργοποιημένος.",
       "operationFailed": "Η λειτουργία του Διακομιστή API απέτυχε: ",
       "restartError": "Αποτυχία επανεκκίνησης του Διακομιστή API: ",
       "restartFailed": "Η επανεκκίνηση του Διακομιστή API απέτυχε: ",
@@ -2043,6 +2051,7 @@
       "provider": {
         "cannot_remove_builtin": "Δεν είναι δυνατή η διαγραφή του ενσωματωμένου παρόχου",
         "existing": "Ο πάροχος υπηρεσιών υπάρχει ήδη",
+        "get_providers": "Αποτυχία λήψης διαθέσιμων παρόχων",
         "not_found": "Ο πάροχος OCR δεν υπάρχει",
         "update_failed": "Αποτυχία ενημέρωσης της διαμόρφωσης"
       },
@@ -3576,6 +3585,7 @@
       "builtinServers": "Ενσωματωμένοι Διακομιστές",
       "builtinServersDescriptions": {
         "brave_search": "μια εφαρμογή διακομιστή MCP που ενσωματώνει το Brave Search API, παρέχοντας δυνατότητες αναζήτησης στον ιστό και τοπικής αναζήτησης. Απαιτείται η ρύθμιση της μεταβλητής περιβάλλοντος BRAVE_API_KEY",
+        "didi_mcp": "Διακομιστής DiDi MCP που παρέχει υπηρεσίες μεταφοράς συμπεριλαμβανομένης της αναζήτησης χαρτών, εκτίμησης τιμών, διαχείρισης παραγγελιών και παρακολούθησης οδηγών. Διαθέσιμο μόνο στην ηπειρωτική Κίνα. Απαιτεί διαμόρφωση της μεταβλητής περιβάλλοντος DIDI_API_KEY",
         "dify_knowledge": "Η υλοποίηση του Dify για τον διακομιστή MCP, παρέχει μια απλή API για να αλληλεπιδρά με το Dify. Απαιτείται η ρύθμιση του κλειδιού Dify",
         "fetch": "Εξυπηρετητής MCP για λήψη περιεχομένου ιστοσελίδας URL",
         "filesystem": "Εξυπηρετητής Node.js για το πρωτόκολλο περιβάλλοντος μοντέλου (MCP) που εφαρμόζει λειτουργίες συστήματος αρχείων. Απαιτείται διαμόρφωση για την επιτροπή πρόσβασης σε καταλόγους",

src/renderer/src/i18n/translate/es-es.json

@@ -22,7 +22,8 @@
     },
     "get": {
       "error": {
-        "failed": "No se pudo obtener el agente."
+        "failed": "No se pudo obtener el agente.",
+        "null_id": "El ID del agente es nulo."
       }
     },
     "list": {
@@ -30,6 +31,11 @@
         "failed": "Error al listar agentes."
       }
     },
+    "server": {
+      "error": {
+        "not_running": "El servidor de API está habilitado pero no funciona correctamente."
+      }
+    },
     "session": {
       "accessible_paths": {
         "add": "Agregar directorio",
@@ -68,7 +74,8 @@
       },
       "get": {
         "error": {
-          "failed": "Error al obtener la sesión"
+          "failed": "Error al obtener la sesión",
+          "null_id": "El ID de sesión es nulo"
         }
       },
       "label_one": "Sesión",
@@ -237,6 +244,7 @@
     "messages": {
       "apiKeyCopied": "Clave API copiada al portapapeles",
       "apiKeyRegenerated": "Clave API regenerada",
+      "notEnabled": "El servidor de API no está habilitado.",
       "operationFailed": "Falló la operación del Servidor API: ",
       "restartError": "Error al reiniciar el Servidor API: ",
       "restartFailed": "Falló el reinicio del Servidor API: ",
@@ -2043,6 +2051,7 @@
       "provider": {
         "cannot_remove_builtin": "No se puede eliminar el proveedor integrado",
         "existing": "El proveedor ya existe",
+        "get_providers": "Error al obtener proveedores disponibles",
         "not_found": "El proveedor de OCR no existe",
         "update_failed": "Actualización de la configuración fallida"
       },
@@ -3576,6 +3585,7 @@
       "builtinServers": "Servidores integrados",
       "builtinServersDescriptions": {
         "brave_search": "Una implementación de servidor MCP que integra la API de búsqueda de Brave, proporcionando funciones de búsqueda web y búsqueda local. Requiere configurar la variable de entorno BRAVE_API_KEY",
+        "didi_mcp": "Servidor DiDi MCP que proporciona servicios de transporte incluyendo búsqueda de mapas, estimación de precios, gestión de pedidos y seguimiento de conductores. Disponible solo en China Continental. Requiere configurar la variable de entorno DIDI_API_KEY",
         "dify_knowledge": "Implementación del servidor MCP de Dify, que proporciona una API sencilla para interactuar con Dify. Se requiere configurar la clave de Dify.",
         "fetch": "Servidor MCP para obtener el contenido de la página web de una URL",
         "filesystem": "Servidor Node.js que implementa el protocolo de contexto del modelo (MCP) para operaciones del sistema de archivos. Requiere configuración del directorio permitido para el acceso",

src/renderer/src/i18n/translate/fr-fr.json

@@ -22,7 +22,8 @@
     },
     "get": {
       "error": {
-        "failed": "Échec de l'obtention de l'agent."
+        "failed": "Échec de l'obtention de l'agent.",
+        "null_id": "L'ID de l'agent est nul."
       }
     },
     "list": {
@@ -30,6 +31,11 @@
         "failed": "Échec de la liste des agents."
       }
     },
+    "server": {
+      "error": {
+        "not_running": "Le serveur API est activé mais ne fonctionne pas correctement."
+      }
+    },
     "session": {
       "accessible_paths": {
         "add": "Ajouter un répertoire",
@@ -68,7 +74,8 @@
       },
       "get": {
         "error": {
-          "failed": "Échec de l'obtention de la session"
+          "failed": "Échec de l'obtention de la session",
+          "null_id": "L'ID de session est nul"
         }
       },
       "label_one": "Session",
@@ -237,6 +244,7 @@
     "messages": {
       "apiKeyCopied": "Clé API copiée dans le presse-papiers",
       "apiKeyRegenerated": "Clé API régénérée",
+      "notEnabled": "Le serveur API n'est pas activé.",
       "operationFailed": "Opération du Serveur API échouée : ",
       "restartError": "Échec du redémarrage du Serveur API : ",
       "restartFailed": "Redémarrage du Serveur API échoué : ",
@@ -2043,6 +2051,7 @@
       "provider": {
         "cannot_remove_builtin": "Impossible de supprimer le fournisseur intégré",
         "existing": "Le fournisseur existe déjà",
+        "get_providers": "Échec de l'obtention des fournisseurs disponibles",
         "not_found": "Le fournisseur OCR n'existe pas",
         "update_failed": "Échec de la mise à jour de la configuration"
       },
@@ -3576,6 +3585,7 @@
       "builtinServers": "Serveurs intégrés",
       "builtinServersDescriptions": {
         "brave_search": "Une implémentation de serveur MCP intégrant l'API de recherche Brave, offrant des fonctionnalités de recherche web et locale. Nécessite la configuration de la variable d'environnement BRAVE_API_KEY",
+        "didi_mcp": "Serveur DiDi MCP fournissant des services de transport incluant la recherche de cartes, l'estimation des prix, la gestion des commandes et le suivi des conducteurs. Disponible uniquement en Chine continentale. Nécessite la configuration de la variable d'environnement DIDI_API_KEY",
         "dify_knowledge": "Implémentation du serveur MCP de Dify, fournissant une API simple pour interagir avec Dify. Nécessite la configuration de la clé Dify",
         "fetch": "serveur MCP utilisé pour récupérer le contenu des pages web URL",
         "filesystem": "Serveur Node.js implémentant le protocole de contexte de modèle (MCP) pour les opérations de système de fichiers. Nécessite une configuration des répertoires autorisés à être accédés.",

src/renderer/src/i18n/translate/ja-jp.json

@@ -22,7 +22,8 @@
     },
     "get": {
       "error": {
-        "failed": "エージェントの取得に失敗しました。"
+        "failed": "エージェントの取得に失敗しました。",
+        "null_id": "エージェント ID が null です。"
       }
     },
     "list": {
@@ -30,6 +31,11 @@
         "failed": "エージェントの一覧取得に失敗しました。"
       }
     },
+    "server": {
+      "error": {
+        "not_running": "APIサーバーは有効になっていますが、正常に動作していません。"
+      }
+    },
     "session": {
       "accessible_paths": {
         "add": "ディレクトリを追加",
@@ -68,7 +74,8 @@
       },
       "get": {
         "error": {
-          "failed": "セッションの取得に失敗しました"
+          "failed": "セッションの取得に失敗しました",
+          "null_id": "セッション ID が null です"
         }
       },
       "label_one": "セッション",
@@ -237,6 +244,7 @@
     "messages": {
       "apiKeyCopied": "API キーがクリップボードにコピーされました",
       "apiKeyRegenerated": "API キーが再生成されました",
+      "notEnabled": "APIサーバーが有効になっていません。",
       "operationFailed": "API サーバーの操作に失敗しました：",
       "restartError": "API サーバーの再起動に失敗しました：",
       "restartFailed": "API サーバーの再起動に失敗しました：",
@@ -2043,6 +2051,7 @@
       "provider": {
         "cannot_remove_builtin": "組み込みプロバイダーは削除できません",
         "existing": "プロバイダーはすでに存在します",
+        "get_providers": "利用可能なプロバイダーの取得に失敗しました",
         "not_found": "OCRプロバイダーが存在しません",
         "update_failed": "更新構成に失敗しました"
       },
@@ -3576,6 +3585,7 @@
       "builtinServers": "組み込みサーバー",
       "builtinServersDescriptions": {
         "brave_search": "Brave検索APIを統合したMCPサーバーの実装で、ウェブ検索とローカル検索の両機能を提供します。BRAVE_API_KEY環境変数の設定が必要です",
+        "didi_mcp": "DiDi MCPサーバーは、地図検索、料金見積もり、注文管理、ドライバー追跡を含むライドシェアサービスを提供します。中国本土でのみ利用可能です。DIDI_API_KEY環境変数の設定が必要です",
         "dify_knowledge": "DifyのMCPサーバー実装は、Difyと対話するためのシンプルなAPIを提供します。Dify Keyの設定が必要です。",
         "fetch": "URLのウェブページコンテンツを取得するためのMCPサーバー",
         "filesystem": "Node.jsサーバーによるファイルシステム操作を実現するモデルコンテキストプロトコル（MCP）。アクセスを許可するディレクトリの設定が必要です",

src/renderer/src/i18n/translate/pt-pt.json

@@ -22,7 +22,8 @@
     },
     "get": {
       "error": {
-        "failed": "Falha ao obter o agente."
+        "failed": "Falha ao obter o agente.",
+        "null_id": "O ID do agente é nulo."
       }
     },
     "list": {
@@ -30,6 +31,11 @@
         "failed": "Falha ao listar agentes."
       }
     },
+    "server": {
+      "error": {
+        "not_running": "O servidor de API está habilitado, mas não está funcionando corretamente."
+      }
+    },
     "session": {
       "accessible_paths": {
         "add": "Adicionar diretório",
@@ -68,7 +74,8 @@
       },
       "get": {
         "error": {
-          "failed": "Falha ao obter a sessão"
+          "failed": "Falha ao obter a sessão",
+          "null_id": "O ID da sessão é nulo"
         }
       },
       "label_one": "Sessão",
@@ -237,6 +244,7 @@
     "messages": {
       "apiKeyCopied": "Chave API copiada para a área de transferência",
       "apiKeyRegenerated": "Chave API regenerada",
+      "notEnabled": "O Servidor de API não está habilitado.",
       "operationFailed": "Operação do Servidor API falhou: ",
       "restartError": "Falha ao reiniciar o Servidor API: ",
       "restartFailed": "Reinício do Servidor API falhou: ",
@@ -2043,6 +2051,7 @@
       "provider": {
         "cannot_remove_builtin": "Não é possível excluir o provedor integrado",
         "existing": "O provedor já existe",
+        "get_providers": "Falha ao obter provedores disponíveis",
         "not_found": "O provedor OCR não existe",
         "update_failed": "Falha ao atualizar a configuração"
       },
@@ -3576,6 +3585,7 @@
       "builtinServers": "Servidores integrados",
       "builtinServersDescriptions": {
         "brave_search": "uma implementação de servidor MCP integrada com a API de pesquisa Brave, fornecendo funcionalidades de pesquisa web e local. Requer a configuração da variável de ambiente BRAVE_API_KEY",
+        "didi_mcp": "Servidor DiDi MCP que fornece serviços de transporte incluindo pesquisa de mapas, estimativa de preços, gestão de pedidos e rastreamento de motoristas. Disponível apenas na China Continental. Requer configuração da variável de ambiente DIDI_API_KEY",
         "dify_knowledge": "Implementação do servidor MCP do Dify, que fornece uma API simples para interagir com o Dify. Requer a configuração da chave Dify",
         "fetch": "servidor MCP para obter o conteúdo da página web do URL",
         "filesystem": "Servidor Node.js do protocolo de contexto de modelo (MCP) para implementar operações de sistema de ficheiros. Requer configuração do diretório permitido para acesso",

src/renderer/src/i18n/translate/ru-ru.json

@@ -22,7 +22,8 @@
     },
     "get": {
       "error": {
-        "failed": "Не удалось получить агента."
+        "failed": "Не удалось получить агента.",
+        "null_id": "ID агента равен null."
       }
     },
     "list": {
@@ -30,6 +31,11 @@
         "failed": "Не удалось получить список агентов."
       }
     },
+    "server": {
+      "error": {
+        "not_running": "API-сервер включен, но работает неправильно."
+      }
+    },
     "session": {
       "accessible_paths": {
         "add": "Добавить каталог",
@@ -68,7 +74,8 @@
       },
       "get": {
         "error": {
-          "failed": "Не удалось получить сеанс"
+          "failed": "Не удалось получить сеанс",
+          "null_id": "ID сессии равен null"
         }
       },
       "label_one": "Сессия",
@@ -237,6 +244,7 @@
     "messages": {
       "apiKeyCopied": "API ключ скопирован в буфер обмена",
       "apiKeyRegenerated": "API ключ перегенерирован",
+      "notEnabled": "API-сервер не включен.",
       "operationFailed": "Операция API сервера не удалась: ",
       "restartError": "Не удалось перезапустить API сервер: ",
       "restartFailed": "Перезапуск API сервера не удался: ",
@@ -2043,6 +2051,7 @@
       "provider": {
         "cannot_remove_builtin": "Не удается удалить встроенного поставщика",
         "existing": "Поставщик уже существует",
+        "get_providers": "Не удалось получить доступных поставщиков",
         "not_found": "Поставщик OCR отсутствует",
         "update_failed": "Обновление конфигурации не удалось"
       },
@@ -3576,6 +3585,7 @@
       "builtinServers": "Встроенные серверы",
       "builtinServersDescriptions": {
         "brave_search": "реализация сервера MCP с интеграцией API поиска Brave, обеспечивающая функции веб-поиска и локального поиска. Требуется настройка переменной среды BRAVE_API_KEY",
+        "didi_mcp": "Сервер DiDi MCP, предоставляющий услуги такси, включая поиск на карте, оценку стоимости, управление заказами и отслеживание водителей. Доступен только в материковом Китае. Требует настройки переменной окружения DIDI_API_KEY",
         "dify_knowledge": "Реализация сервера MCP Dify, предоставляющая простой API для взаимодействия с Dify. Требуется настройка ключа Dify",
         "fetch": "MCP-сервер для получения содержимого веб-страниц по URL",
         "filesystem": "Node.js-сервер протокола контекста модели (MCP) для реализации операций файловой системы. Требуется настройка каталогов, к которым разрешён доступ",

src/renderer/src/pages/home/Chat.tsx

@@ -49,7 +49,8 @@ const Chat: FC<Props> = (props) => {
   const { isTopNavbar } = useNavbarPosition()
   const chatMaxWidth = useChatMaxWidth()
   const { chat } = useRuntime()
-  const { activeTopicOrSession, activeAgentId, activeSessionId } = chat
+  const { activeTopicOrSession, activeAgentId, activeSessionIdMap } = chat
+  const activeSessionId = activeAgentId ? activeSessionIdMap[activeAgentId] : null
   const { apiServer } = useSettings()
 
   const mainRef = React.useRef<HTMLDivElement>(null)
@@ -147,8 +148,7 @@ const Chat: FC<Props> = (props) => {
     if (activeAgentId === null) {
       return () => <div> Active Agent ID is invalid.</div>
     }
-    const sessionId = activeSessionId[activeAgentId]
-    if (!sessionId) {
+    if (!activeSessionId) {
       return () => <div> Active Session ID is invalid.</div>
     }
     if (!apiServer.enabled) {
@@ -158,18 +158,17 @@ const Chat: FC<Props> = (props) => {
         </div>
       )
     }
-    return () => <AgentSessionMessages agentId={activeAgentId} sessionId={sessionId} />
+    return () => <AgentSessionMessages agentId={activeAgentId} sessionId={activeSessionId} />
   }, [activeAgentId, activeSessionId, apiServer.enabled, t])
 
   const SessionInputBar = useMemo(() => {
     if (activeAgentId === null) {
       return () => <div> Active Agent ID is invalid.</div>
     }
-    const sessionId = activeSessionId[activeAgentId]
-    if (!sessionId) {
+    if (!activeSessionId) {
       return () => <div> Active Session ID is invalid.</div>
     }
-    return () => <AgentSessionInputbar agentId={activeAgentId} sessionId={sessionId} />
+    return () => <AgentSessionInputbar agentId={activeAgentId} sessionId={activeSessionId} />
   }, [activeAgentId, activeSessionId])
 
   // TODO: more info
@@ -235,10 +234,8 @@ const Chat: FC<Props> = (props) => {
               </>
             )}
             {activeTopicOrSession === 'session' && !activeAgentId && <AgentInvalid />}
-            {activeTopicOrSession === 'session' && activeAgentId && !activeSessionId[activeAgentId] && (
-              <SessionInvalid />
-            )}
-            {activeTopicOrSession === 'session' && activeAgentId && activeSessionId[activeAgentId] && (
+            {activeTopicOrSession === 'session' && activeAgentId && !activeSessionId && <SessionInvalid />}
+            {activeTopicOrSession === 'session' && activeAgentId && activeSessionId && (
               <>
                 <SessionMessages />
                 <SessionInputBar />

src/renderer/src/pages/home/ChatNavbar.tsx

@@ -1,34 +1,24 @@
-import { BreadcrumbItem, Breadcrumbs, Chip, cn } from '@heroui/react'
 import { NavbarHeader } from '@renderer/components/app/Navbar'
-import HorizontalScrollContainer from '@renderer/components/HorizontalScrollContainer'
 import { HStack } from '@renderer/components/Layout'
 import SearchPopup from '@renderer/components/Popups/SearchPopup'
-import { permissionModeCards } from '@renderer/constants/permissionModes'
-import { useAgent } from '@renderer/hooks/agents/useAgent'
-import { useSession } from '@renderer/hooks/agents/useSession'
-import { useUpdateAgent } from '@renderer/hooks/agents/useUpdateAgent'
 import { useAssistant } from '@renderer/hooks/useAssistant'
-import { modelGenerating, useRuntime } from '@renderer/hooks/useRuntime'
+import { modelGenerating } from '@renderer/hooks/useRuntime'
 import { useSettings } from '@renderer/hooks/useSettings'
 import { useShortcut } from '@renderer/hooks/useShortcuts'
 import { useShowAssistants, useShowTopics } from '@renderer/hooks/useStore'
 import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
 import { useAppDispatch } from '@renderer/store'
 import { setNarrowMode } from '@renderer/store/settings'
-import { ApiModel, Assistant, PermissionMode, Topic } from '@renderer/types'
-import { formatErrorMessageWithPrefix } from '@renderer/utils/error'
+import { Assistant, Topic } from '@renderer/types'
 import { Tooltip } from 'antd'
 import { t } from 'i18next'
 import { Menu, PanelLeftClose, PanelRightClose, Search } from 'lucide-react'
 import { AnimatePresence, motion } from 'motion/react'
-import React, { FC, ReactNode, useCallback } from 'react'
+import { FC } from 'react'
 import styled from 'styled-components'
 
-import { AgentSettingsPopup } from '../settings/AgentSettings'
-import { AgentLabel } from '../settings/AgentSettings/shared'
 import AssistantsDrawer from './components/AssistantsDrawer'
-import SelectAgentModelButton from './components/SelectAgentModelButton'
-import SelectModelButton from './components/SelectModelButton'
+import ChatNavbarContent from './components/ChatNavbarContent'
 import UpdateAppButton from './components/UpdateAppButton'
 
 interface Props {
@@ -45,11 +35,6 @@ const HeaderNavbar: FC<Props> = ({ activeAssistant, setActiveAssistant, activeTo
   const { topicPosition, narrowMode } = useSettings()
   const { showTopics, toggleShowTopics } = useShowTopics()
   const dispatch = useAppDispatch()
-  const { chat } = useRuntime()
-  const { activeTopicOrSession, activeAgentId } = chat
-  const sessionId = activeAgentId ? (chat.activeSessionId[activeAgentId] ?? null) : null
-  const { agent } = useAgent(activeAgentId)
-  const { updateModel } = useUpdateAgent()
 
   useShortcut('toggle_show_assistants', toggleShowAssistants)
 
@@ -79,13 +64,13 @@ const HeaderNavbar: FC<Props> = ({ activeAssistant, setActiveAssistant, activeTo
     })
   }
 
-  const handleUpdateModel = useCallback(
-    async (model: ApiModel) => {
-      if (!agent) return
-      return updateModel(agent.id, model.id, { showSuccessToast: false })
-    },
-    [agent, updateModel]
-  )
+  // const handleUpdateModel = useCallback(
+  //   async (model: ApiModel) => {
+  //     if (!activeSession || !activeAgent) return
+  //     return updateModel(activeSession.id, model.id, { showSuccessToast: false })
+  //   },
+  //   [activeAgent, activeSession, updateModel]
+  // )
 
   return (
     <NavbarHeader className="home-navbar">
@@ -117,38 +102,7 @@ const HeaderNavbar: FC<Props> = ({ activeAssistant, setActiveAssistant, activeTo
             </motion.div>
           )}
         </AnimatePresence>
-        {activeTopicOrSession === 'topic' && <SelectModelButton assistant={assistant} />}
-        {activeTopicOrSession === 'session' && agent && (
-          <HorizontalScrollContainer>
-            <Breadcrumbs
-              classNames={{
-                base: 'flex',
-                list: 'flex-nowrap'
-              }}>
-              <BreadcrumbItem
-                onPress={() => AgentSettingsPopup.show({ agentId: agent.id })}
-                classNames={{
-                  base: 'self-stretch',
-                  item: 'h-full'
-                }}>
-                <Chip size="md" variant="light" className="h-full transition-background hover:bg-foreground-100">
-                  <AgentLabel
-                    agent={agent}
-                    classNames={{ name: 'max-w-50 font-bold text-xs', avatar: 'h-4.5 w-4.5', container: 'gap-1.5' }}
-                  />
-                </Chip>
-              </BreadcrumbItem>
-              <BreadcrumbItem>
-                <SelectAgentModelButton agent={agent} onSelect={handleUpdateModel} />
-              </BreadcrumbItem>
-              {activeAgentId && sessionId && (
-                <BreadcrumbItem>
-                  <SessionWorkspaceMeta agentId={activeAgentId} sessionId={sessionId} />
-                </BreadcrumbItem>
-              )}
-            </Breadcrumbs>
-          </HorizontalScrollContainer>
-        )}
+        <ChatNavbarContent assistant={assistant} />
       </div>
       <HStack alignItems="center" gap={8}>
         <UpdateAppButton />
@@ -181,74 +135,6 @@ const HeaderNavbar: FC<Props> = ({ activeAssistant, setActiveAssistant, activeTo
   )
 }
 
-const SessionWorkspaceMeta: FC<{ agentId: string; sessionId: string }> = ({ agentId, sessionId }) => {
-  const { agent } = useAgent(agentId)
-  const { session } = useSession(agentId, sessionId)
-  if (!session || !agent) {
-    return null
-  }
-
-  const firstAccessiblePath = session.accessible_paths?.[0]
-  const permissionMode = (session.configuration?.permission_mode ?? 'default') as PermissionMode
-  const permissionModeCard = permissionModeCards.find((card) => card.mode === permissionMode)
-  const permissionModeLabel = permissionModeCard
-    ? t(permissionModeCard.titleKey, permissionModeCard.titleFallback)
-    : permissionMode
-
-  const infoItems: ReactNode[] = []
-
-  const InfoTag = ({
-    text,
-    className,
-    onClick
-  }: {
-    text: string
-    className?: string
-    classNames?: {}
-    onClick?: (e: React.MouseEvent) => void
-  }) => (
-    <div
-      className={cn(
-        'rounded-medium border border-default-200 px-2 py-1 text-foreground-500 text-xs dark:text-foreground-400',
-        onClick !== undefined ? 'cursor-pointer' : undefined,
-        className
-      )}
-      title={text}
-      onClick={onClick}>
-      <span className="block truncate">{text}</span>
-    </div>
-  )
-
-  // infoItems.push(<InfoTag key="name" text={agent.name ?? ''} className="max-w-60" />)
-
-  if (firstAccessiblePath) {
-    infoItems.push(
-      <InfoTag
-        key="path"
-        text={firstAccessiblePath}
-        className="max-w-60 transition-colors hover:border-primary hover:text-primary"
-        onClick={() => {
-          window.api.file
-            .openPath(firstAccessiblePath)
-            .catch((e) =>
-              window.toast.error(
-                formatErrorMessageWithPrefix(e, t('files.error.open_path', { path: firstAccessiblePath }))
-              )
-            )
-        }}
-      />
-    )
-  }
-
-  infoItems.push(<InfoTag key="permission-mode" text={permissionModeLabel} className="max-w-50" />)
-
-  if (infoItems.length === 0) {
-    return null
-  }
-
-  return <div className="ml-2 flex items-center gap-2">{infoItems}</div>
-}
-
 export const NavbarIcon = styled.div`
   -webkit-app-region: none;
   border-radius: 8px;

src/renderer/src/pages/home/HomePage.tsx

@@ -117,7 +117,7 @@ const HomePage: FC = () => {
         type: 'chat'
       })
     } else if (activeTopicOrSession === 'topic') {
-      dispatch(setActiveAgentId('fake'))
+      dispatch(setActiveAgentId(null))
     }
   }, [activeTopicOrSession, dispatch, setActiveAssistant])
 
@@ -130,6 +130,7 @@ const HomePage: FC = () => {
           setActiveTopic={setActiveTopic}
           setActiveAssistant={setActiveAssistant}
           position="left"
+          activeTopicOrSession={activeTopicOrSession}
         />
       )}
       <ContentContainer id={isLeftNavbar ? 'content-container' : undefined}>

src/renderer/src/pages/home/Inputbar/AgentSessionInputbar.tsx

@@ -262,7 +262,9 @@ const AgentSessionInputbar: FC<Props> = ({ agentId, sessionId }) => {
             value={text}
             onChange={onChange}
             onKeyDown={handleKeyDown}
-            placeholder={t('chat.input.placeholder', { key: getSendMessageShortcutLabel(sendMessageShortcut) })}
+            placeholder={t('chat.input.placeholder_without_triggers', {
+              key: getSendMessageShortcutLabel(sendMessageShortcut)
+            })}
             autoFocus
             variant="borderless"
             spellCheck={enableSpellCheck}

src/renderer/src/pages/home/Messages/Blocks/ErrorBlock.tsx

@@ -1,5 +1,6 @@
 import { Button } from '@heroui/button'
 import CodeViewer from '@renderer/components/CodeViewer'
+import { useCodeStyle } from '@renderer/context/CodeStyleProvider'
 import { useTimer } from '@renderer/hooks/useTimer'
 import { getHttpMessageLabel, getProviderLabel } from '@renderer/i18n/label'
 import { getProviderById } from '@renderer/services/ProviderService'
@@ -35,7 +36,7 @@ import {
 import type { ErrorMessageBlock, Message } from '@renderer/types/newMessage'
 import { formatAiSdkError, formatError, safeToString } from '@renderer/utils/error'
 import { Alert as AntdAlert, Modal } from 'antd'
-import React, { useState } from 'react'
+import React, { useEffect, useState } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
 import { Link } from 'react-router-dom'
 import styled from 'styled-components'
@@ -305,14 +306,36 @@ const BuiltinError = ({ error }: { error: SerializedError }) => {
 // 作为 base，渲染公共字段，应当在 ErrorDetailList 中渲染
 const AiSdkErrorBase = ({ error }: { error: SerializedAiSdkError }) => {
   const { t } = useTranslation()
+  const { highlightCode } = useCodeStyle()
+  const [highlightedString, setHighlightedString] = useState('')
   const cause = error.cause
+
+  useEffect(() => {
+    const highlight = async () => {
+      try {
+        const result = await highlightCode(JSON.stringify(JSON.parse(cause || '{}'), null, 2), 'json')
+        setHighlightedString(result)
+      } catch {
+        setHighlightedString(cause || '')
+      }
+    }
+    const timer = setTimeout(highlight, 0)
+
+    return () => clearTimeout(timer)
+  }, [highlightCode, cause])
+
   return (
     <>
       <BuiltinError error={error} />
       {cause && (
         <ErrorDetailItem>
           <ErrorDetailLabel>{t('error.cause')}:</ErrorDetailLabel>
-          <ErrorDetailValue>{error.cause}</ErrorDetailValue>
+          <ErrorDetailValue>
+            <div
+              className="markdown [&_pre]:!bg-transparent [&_pre_span]:whitespace-pre-wrap"
+              dangerouslySetInnerHTML={{ __html: highlightedString }}
+            />
+          </ErrorDetailValue>
         </ErrorDetailItem>
       )}
     </>

src/renderer/src/pages/home/Messages/MessageGroup.tsx

@@ -337,29 +337,18 @@ const GroupContainer = styled.div`
 const GridContainer = styled(Scrollbar)<{ $count: number; $gridColumns: number }>`
   width: 100%;
   display: grid;
+  overflow-y: visible;
   gap: 16px;
 
   &.horizontal {
     padding-bottom: 4px;
     grid-template-columns: repeat(${({ $count }) => $count}, minmax(420px, 1fr));
-    overflow-y: hidden;
     overflow-x: auto;
-    &::-webkit-scrollbar {
-      height: 6px;
-    }
-    &::-webkit-scrollbar-thumb {
-      background: var(--color-scrollbar-thumb);
-      border-radius: var(--scrollbar-thumb-radius);
-    }
-    &::-webkit-scrollbar-thumb:hover {
-      background: var(--color-scrollbar-thumb-hover);
-    }
   }
   &.fold,
   &.vertical {
     grid-template-columns: repeat(1, minmax(0, 1fr));
     gap: 8px;
-    overflow: hidden;
   }
   &.grid {
     grid-template-columns: repeat(
@@ -367,15 +356,11 @@ const GridContainer = styled(Scrollbar)<{ $count: number; $gridColumns: number }
       minmax(0, 1fr)
     );
     grid-template-rows: auto;
-    overflow-y: auto;
-    overflow-x: hidden;
   }
 
   &.multi-select-mode {
     grid-template-columns: repeat(1, minmax(0, 1fr));
     gap: 10px;
-    overflow-y: auto;
-    overflow-x: hidden;
     .grid {
       height: auto;
     }
@@ -401,7 +386,7 @@ interface MessageWrapperProps {
 const MessageWrapper = styled.div<MessageWrapperProps>`
   &.horizontal {
     padding: 1px;
-    /* overflow-y: auto; */
+    overflow-y: auto;
     .message {
       height: 100%;
       border: 0.5px solid var(--color-border);
@@ -423,7 +408,7 @@ const MessageWrapper = styled.div<MessageWrapperProps>`
   &.grid {
     display: block;
     height: 300px;
-    overflow: hidden;
+    overflow-y: hidden;
     border: 0.5px solid var(--color-border);
     border-radius: 10px;
     cursor: pointer;

src/renderer/src/pages/home/Navbar.tsx

@@ -1,4 +1,4 @@
-import { Navbar, NavbarLeft, NavbarRight } from '@renderer/components/app/Navbar'
+import { Navbar, NavbarCenter, NavbarLeft, NavbarRight } from '@renderer/components/app/Navbar'
 import { HStack } from '@renderer/components/Layout'
 import SearchPopup from '@renderer/components/Popups/SearchPopup'
 import { isLinux, isMac, isWin } from '@renderer/config/constant'
@@ -7,6 +7,8 @@ import { modelGenerating } from '@renderer/hooks/useRuntime'
 import { useSettings } from '@renderer/hooks/useSettings'
 import { useShortcut } from '@renderer/hooks/useShortcuts'
 import { useShowAssistants, useShowTopics } from '@renderer/hooks/useStore'
+import { useChatMaxWidth } from '@renderer/pages/home/Chat'
+import ChatNavbarContent from '@renderer/pages/home/components/ChatNavbarContent'
 import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
 import { useAppDispatch } from '@renderer/store'
 import { setNarrowMode } from '@renderer/store/settings'
@@ -15,7 +17,7 @@ import { Tooltip } from 'antd'
 import { t } from 'i18next'
 import { Menu, PanelLeftClose, PanelRightClose, Search } from 'lucide-react'
 import { AnimatePresence, motion } from 'motion/react'
-import { FC } from 'react'
+import React, { FC } from 'react'
 import styled from 'styled-components'
 
 import AssistantsDrawer from './components/AssistantsDrawer'
@@ -28,13 +30,21 @@ interface Props {
   setActiveTopic: (topic: Topic) => void
   setActiveAssistant: (assistant: Assistant) => void
   position: 'left' | 'right'
+  activeTopicOrSession?: 'topic' | 'session'
 }
 
-const HeaderNavbar: FC<Props> = ({ activeAssistant, setActiveAssistant, activeTopic, setActiveTopic }) => {
+const HeaderNavbar: FC<Props> = ({
+  activeAssistant,
+  setActiveAssistant,
+  activeTopic,
+  setActiveTopic,
+  activeTopicOrSession
+}) => {
   const { assistant } = useAssistant(activeAssistant.id)
   const { showAssistants, toggleShowAssistants } = useShowAssistants()
   const { topicPosition, narrowMode } = useSettings()
   const { showTopics, toggleShowTopics } = useShowTopics()
+  const chatMaxWidth = useChatMaxWidth()
   const dispatch = useAppDispatch()
 
   useShortcut('toggle_show_assistants', toggleShowAssistants)
@@ -113,15 +123,29 @@ const HeaderNavbar: FC<Props> = ({ activeAssistant, setActiveAssistant, activeTo
           </AnimatePresence>
         </NavbarLeft>
       )}
-      <HStack alignItems="center" gap={6} ml={!isMac ? 16 : 0}>
-        <SelectModelButton assistant={assistant} />
-      </HStack>
+      <NavbarCenter>
+        {activeTopicOrSession === 'topic' ? (
+          <HStack alignItems="center" gap={6} ml={!isMac ? 16 : 0}>
+            <SelectModelButton assistant={assistant} />
+          </HStack>
+        ) : (
+          <ChatNavbarContainer
+            style={{
+              maxWidth: chatMaxWidth,
+              marginLeft: !isMac ? 16 : 0
+            }}>
+            <ChatNavbarContent assistant={assistant} />
+          </ChatNavbarContainer>
+        )}
+      </NavbarCenter>
+
       <NavbarRight
         style={{
           justifyContent: 'flex-end',
-          flex: 1,
+          flex: activeTopicOrSession === 'topic' ? 1 : 'none',
           position: 'relative',
-          paddingRight: isWin || isLinux ? '144px' : '15px'
+          paddingRight: isWin || isLinux ? '144px' : '15px',
+          minWidth: activeTopicOrSession === 'topic' ? '' : 'auto'
         }}
         className="home-navbar-right">
         <HStack alignItems="center" gap={6}>
@@ -196,4 +220,15 @@ const NarrowIcon = styled(NavbarIcon)`
   }
 `
 
+const ChatNavbarContainer: React.FC<{ children: React.ReactNode; style?: React.CSSProperties }> = ({
+  children,
+  style
+}) => {
+  return (
+    <div className="nodrag flex min-w-0 flex-1 items-center justify-start gap-1.5 overflow-hidden" style={style}>
+      {children}
+    </div>
+  )
+}
+
 export default HeaderNavbar

src/renderer/src/pages/home/Tabs/AssistantsTab.tsx

@@ -1,16 +1,17 @@
 import { Alert, Spinner } from '@heroui/react'
 import Scrollbar from '@renderer/components/Scrollbar'
 import { useAgents } from '@renderer/hooks/agents/useAgents'
+import { useApiServer } from '@renderer/hooks/useApiServer'
 import { useAssistants } from '@renderer/hooks/useAssistant'
 import { useAssistantPresets } from '@renderer/hooks/useAssistantPresets'
 import { useRuntime } from '@renderer/hooks/useRuntime'
-import { useSettings } from '@renderer/hooks/useSettings'
 import { useAssistantsTabSortType } from '@renderer/hooks/useStore'
 import { useTags } from '@renderer/hooks/useTags'
 import { useAppDispatch } from '@renderer/store'
 import { addIknowAction } from '@renderer/store/runtime'
 import { Assistant, AssistantsSortType } from '@renderer/types'
-import { FC, useCallback, useEffect, useRef, useState } from 'react'
+import { getErrorMessage } from '@renderer/utils'
+import { FC, useCallback, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
@@ -35,7 +36,8 @@ const AssistantsTab: FC<AssistantsTabProps> = (props) => {
   const { activeAssistant, setActiveAssistant, onCreateAssistant, onCreateDefaultAssistant } = props
   const containerRef = useRef<HTMLDivElement>(null)
   const { t } = useTranslation()
-  const { apiServer } = useSettings()
+  const { apiServerConfig, apiServerRunning } = useApiServer()
+  const apiServerEnabled = apiServerConfig.enabled
   const { iknow, chat } = useRuntime()
   const dispatch = useAppDispatch()
 
@@ -55,7 +57,7 @@ const AssistantsTab: FC<AssistantsTabProps> = (props) => {
   const { unifiedItems, handleUnifiedListReorder } = useUnifiedItems({
     agents,
     assistants,
-    apiServerEnabled: apiServer.enabled,
+    apiServerEnabled,
     agentsLoading,
     agentsError,
     updateAssistants
@@ -72,18 +74,12 @@ const AssistantsTab: FC<AssistantsTabProps> = (props) => {
     unifiedItems,
     assistants,
     agents,
-    apiServerEnabled: apiServer.enabled,
+    apiServerEnabled,
     agentsLoading,
     agentsError,
     updateAssistants
   })
 
-  useEffect(() => {
-    if (!agentsLoading && agents.length > 0 && !activeAgentId && apiServer.enabled) {
-      setActiveAgentId(agents[0].id)
-    }
-  }, [agentsLoading, agents, activeAgentId, setActiveAgentId, apiServer.enabled])
-
   const onDeleteAssistant = useCallback(
     (assistant: Assistant) => {
       const remaining = assistants.filter((a) => a.id !== assistant.id)
@@ -105,7 +101,7 @@ const AssistantsTab: FC<AssistantsTabProps> = (props) => {
 
   return (
     <Container className="assistants-tab" ref={containerRef}>
-      {!apiServer.enabled && !iknow[ALERT_KEY] && (
+      {!apiServerConfig.enabled && !apiServerRunning && !iknow[ALERT_KEY] && (
         <Alert
           color="warning"
           title={t('agent.warning.enable_server')}
@@ -113,13 +109,22 @@ const AssistantsTab: FC<AssistantsTabProps> = (props) => {
           onClose={() => {
             dispatch(addIknowAction(ALERT_KEY))
           }}
+          className="mb-2"
         />
       )}
 
-      <UnifiedAddButton onCreateAssistant={onCreateAssistant} />
-
       {agentsLoading && <Spinner />}
-      {apiServer.enabled && agentsError && <Alert color="danger" title={t('agent.list.error.failed')} />}
+      {apiServerConfig.enabled && !apiServerRunning && (
+        <Alert color="danger" title={t('agent.server.error.not_running')} isClosable className="mb-2" />
+      )}
+      {apiServerRunning && agentsError && (
+        <Alert
+          color="danger"
+          title={t('agent.list.error.failed')}
+          description={getErrorMessage(agentsError)}
+          className="mb-2"
+        />
+      )}
 
       {assistantsTabSortType === 'tags' ? (
         <UnifiedTagGroups
@@ -165,6 +170,8 @@ const AssistantsTab: FC<AssistantsTabProps> = (props) => {
         />
       )}
 
+      <UnifiedAddButton onCreateAssistant={onCreateAssistant} />
+
       {!dragging && <div style={{ minHeight: 10 }}></div>}
     </Container>
   )

src/renderer/src/pages/home/Tabs/SessionSettingsTab.tsx

@@ -0,0 +1,43 @@
+import { Button, Divider } from '@heroui/react'
+import { useUpdateSession } from '@renderer/hooks/agents/useUpdateSession'
+import { SessionSettingsPopup } from '@renderer/pages/settings/AgentSettings'
+import AdvancedSettings from '@renderer/pages/settings/AgentSettings/AdvancedSettings'
+import EssentialSettings from '@renderer/pages/settings/AgentSettings/EssentialSettings'
+import { GetAgentSessionResponse } from '@renderer/types'
+import { FC } from 'react'
+import { useTranslation } from 'react-i18next'
+
+interface Props {
+  session: GetAgentSessionResponse | undefined | null
+  update: ReturnType<typeof useUpdateSession>['updateSession']
+}
+
+const SessionSettingsTab: FC<Props> = ({ session, update }) => {
+  const { t } = useTranslation()
+
+  const onMoreSetting = () => {
+    if (session?.id) {
+      SessionSettingsPopup.show({
+        agentId: session.agent_id,
+        sessionId: session.id
+      })
+    }
+  }
+
+  if (!session) {
+    return null
+  }
+
+  return (
+    <div className="w-[var(--assistants-width)] p-2 px-3 pt-4">
+      <EssentialSettings agentBase={session} update={update} />
+      <AdvancedSettings agentBase={session} update={update} />
+      <Divider className="my-2" />
+      <Button size="sm" fullWidth onPress={onMoreSetting}>
+        {t('settings.moresetting.label')}
+      </Button>
+    </div>
+  )
+}
+
+export default SessionSettingsTab

src/renderer/src/pages/home/Tabs/components/AddButton.tsx

@@ -12,7 +12,7 @@ const AddButton: FC<Props> = ({ children, className, ...props }) => {
       {...props}
       onPress={props.onPress}
       className={cn(
-        'h-9 w-[calc(var(--assistants-width)-20px)] justify-start rounded-full bg-transparent px-3 text-[13px] text-[var(--color-text-2)] hover:bg-[var(--color-list-item)]',
+        'h-9 w-[calc(var(--assistants-width)-20px)] justify-start rounded-lg bg-transparent px-3 text-[13px] text-[var(--color-text-2)] hover:bg-[var(--color-list-item)]',
         className
       )}
       startContent={<PlusIcon size={16} className="shrink-0" />}>

src/renderer/src/pages/home/Tabs/components/AgentItem.tsx

@@ -45,19 +45,12 @@ const AgentItem: FC<AgentItemProps> = ({ agent, isActive, onDelete, onPress }) =
             </AgentNameWrapper>
           </AssistantNameRow>
           <MenuButton>
-            {isActive ? <SessionCount>{sessions.length}</SessionCount> : <Bot size={12} className="text-primary" />}
+            {isActive ? <SessionCount>{sessions.length}</SessionCount> : <Bot size={14} className="text-primary" />}
           </MenuButton>
         </Container>
       </ContextMenuTrigger>
       <ContextMenuContent>
-        <ContextMenuItem
-          key="edit"
-          onClick={async () => {
-            // onOpen()
-            await AgentSettingsPopup.show({
-              agentId: agent.id
-            })
-          }}>
+        <ContextMenuItem key="edit" onClick={() => AgentSettingsPopup.show({ agentId: agent.id })}>
           <EditIcon size={14} />
           {t('common.edit')}
         </ContextMenuItem>

src/renderer/src/pages/home/Tabs/components/Agents.tsx

@@ -1,71 +0,0 @@
-import { Alert, Button, Spinner } from '@heroui/react'
-import { AgentModal } from '@renderer/components/Popups/agent/AgentModal'
-import { useAgents } from '@renderer/hooks/agents/useAgents'
-import { useAgentSessionInitializer } from '@renderer/hooks/agents/useAgentSessionInitializer'
-import { useRuntime } from '@renderer/hooks/useRuntime'
-import { useAppDispatch } from '@renderer/store'
-import { setActiveAgentId as setActiveAgentIdAction } from '@renderer/store/runtime'
-import { Plus } from 'lucide-react'
-import { FC, useCallback, useEffect } from 'react'
-import { useTranslation } from 'react-i18next'
-
-import AgentItem from './AgentItem'
-
-interface AssistantsTabProps {}
-
-export const Agents: FC<AssistantsTabProps> = () => {
-  const { agents, deleteAgent, isLoading, error } = useAgents()
-  const { t } = useTranslation()
-  const { chat } = useRuntime()
-  const { activeAgentId } = chat
-  const { initializeAgentSession } = useAgentSessionInitializer()
-
-  const dispatch = useAppDispatch()
-
-  const setActiveAgentId = useCallback(
-    async (id: string) => {
-      dispatch(setActiveAgentIdAction(id))
-      // Initialize the session for this agent
-      await initializeAgentSession(id)
-    },
-    [dispatch, initializeAgentSession]
-  )
-
-  useEffect(() => {
-    if (!isLoading && agents.length > 0 && !activeAgentId) {
-      setActiveAgentId(agents[0].id)
-    }
-  }, [isLoading, agents, activeAgentId, setActiveAgentId])
-
-  return (
-    <>
-      {isLoading && <Spinner />}
-      {error && <Alert color="danger" title={t('agent.list.error.failed')} />}
-      {!isLoading &&
-        !error &&
-        agents.map((agent) => (
-          <AgentItem
-            key={agent.id}
-            agent={agent}
-            isActive={agent.id === activeAgentId}
-            onDelete={() => deleteAgent(agent.id)}
-            onPress={() => {
-              setActiveAgentId(agent.id)
-            }}
-          />
-        ))}
-      <AgentModal
-        trigger={{
-          content: (
-            <Button
-              onPress={(e) => e.continuePropagation()}
-              startContent={<Plus size={16} className="mr-1 shrink-0 translate-x-[-2px]" />}
-              className="w-full justify-start bg-transparent text-foreground-500 hover:bg-[var(--color-list-item)]">
-              {t('agent.add.title')}
-            </Button>
-          )
-        }}
-      />
-    </>
-  )
-}

src/renderer/src/pages/home/Tabs/components/Assistants.tsx

@@ -1,208 +0,0 @@
-import { DownOutlined, RightOutlined } from '@ant-design/icons'
-import { Button } from '@heroui/react'
-import { DraggableList } from '@renderer/components/DraggableList'
-import { useAssistants } from '@renderer/hooks/useAssistant'
-import { useAssistantPresets } from '@renderer/hooks/useAssistantPresets'
-import { useAssistantsTabSortType } from '@renderer/hooks/useStore'
-import { useTags } from '@renderer/hooks/useTags'
-import { Assistant, AssistantsSortType } from '@renderer/types'
-import { Tooltip } from 'antd'
-import { Plus } from 'lucide-react'
-import { FC, useCallback, useMemo, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import styled from 'styled-components'
-
-import AssistantItem from './AssistantItem'
-import { SectionName } from './SectionName'
-
-interface AssistantsProps {
-  activeAssistant: Assistant
-  setActiveAssistant: (assistant: Assistant) => void
-  onCreateAssistant: () => void
-  onCreateDefaultAssistant: () => void
-}
-
-const Assistants: FC<AssistantsProps> = ({
-  activeAssistant,
-  setActiveAssistant,
-  onCreateAssistant,
-  onCreateDefaultAssistant
-}) => {
-  const { assistants, removeAssistant, copyAssistant, updateAssistants } = useAssistants()
-  const [dragging, setDragging] = useState(false)
-  const { addAssistantPreset } = useAssistantPresets()
-  const { t } = useTranslation()
-  const { getGroupedAssistants, collapsedTags, toggleTagCollapse } = useTags()
-  const { assistantsTabSortType = 'list', setAssistantsTabSortType } = useAssistantsTabSortType()
-
-  const onDelete = useCallback(
-    (assistant: Assistant) => {
-      const remaining = assistants.filter((a) => a.id !== assistant.id)
-      if (assistant.id === activeAssistant?.id) {
-        const newActive = remaining[remaining.length - 1]
-        newActive ? setActiveAssistant(newActive) : onCreateDefaultAssistant()
-      }
-      removeAssistant(assistant.id)
-    },
-    [activeAssistant, assistants, removeAssistant, setActiveAssistant, onCreateDefaultAssistant]
-  )
-
-  const handleSortByChange = useCallback(
-    (sortType: AssistantsSortType) => {
-      setAssistantsTabSortType(sortType)
-    },
-    [setAssistantsTabSortType]
-  )
-
-  const handleGroupReorder = useCallback(
-    (tag: string, newGroupList: Assistant[]) => {
-      let insertIndex = 0
-      const newGlobal = assistants.map((a) => {
-        const tags = a.tags?.length ? a.tags : [t('assistants.tags.untagged')]
-        if (tags.includes(tag)) {
-          const replaced = newGroupList[insertIndex]
-          insertIndex += 1
-          return replaced
-        }
-        return a
-      })
-      updateAssistants(newGlobal)
-    },
-    [assistants, t, updateAssistants]
-  )
-
-  const renderAddAssistantButton = useMemo(() => {
-    return (
-      <Button
-        onPress={onCreateAssistant}
-        className="w-full justify-start bg-transparent text-foreground-500 hover:bg-[var(--color-list-item)]">
-        <Plus size={16} style={{ marginRight: 4, flexShrink: 0 }} />
-        {t('chat.add.assistant.title')}
-      </Button>
-    )
-  }, [onCreateAssistant, t])
-
-  if (assistantsTabSortType === 'tags') {
-    return (
-      <>
-        <SectionName name={t('common.assistant_other')} />
-        <div style={{ marginBottom: '8px' }}>
-          {getGroupedAssistants.map((group) => (
-            <TagsContainer key={group.tag}>
-              {group.tag !== t('assistants.tags.untagged') && (
-                <GroupTitle onClick={() => toggleTagCollapse(group.tag)}>
-                  <Tooltip title={group.tag}>
-                    <GroupTitleName>
-                      {collapsedTags[group.tag] ? (
-                        <RightOutlined style={{ fontSize: '10px', marginRight: '5px' }} />
-                      ) : (
-                        <DownOutlined style={{ fontSize: '10px', marginRight: '5px' }} />
-                      )}
-                      {group.tag}
-                    </GroupTitleName>
-                  </Tooltip>
-                  <GroupTitleDivider />
-                </GroupTitle>
-              )}
-              {!collapsedTags[group.tag] && (
-                <div>
-                  <DraggableList
-                    list={group.assistants}
-                    onUpdate={(newList) => handleGroupReorder(group.tag, newList)}
-                    onDragStart={() => setDragging(true)}
-                    onDragEnd={() => setDragging(false)}>
-                    {(assistant) => (
-                      <AssistantItem
-                        key={assistant.id}
-                        assistant={assistant}
-                        isActive={assistant.id === activeAssistant.id}
-                        sortBy={assistantsTabSortType}
-                        onSwitch={setActiveAssistant}
-                        onDelete={onDelete}
-                        addPreset={addAssistantPreset}
-                        copyAssistant={copyAssistant}
-                        onCreateDefaultAssistant={onCreateDefaultAssistant}
-                        handleSortByChange={handleSortByChange}
-                      />
-                    )}
-                  </DraggableList>
-                </div>
-              )}
-            </TagsContainer>
-          ))}
-          {renderAddAssistantButton}
-        </div>
-      </>
-    )
-  }
-
-  return (
-    <div>
-      <SectionName name={t('common.assistant_other')} />
-      <DraggableList
-        list={assistants}
-        onUpdate={updateAssistants}
-        onDragStart={() => setDragging(true)}
-        onDragEnd={() => setDragging(false)}>
-        {(assistant) => (
-          <AssistantItem
-            key={assistant.id}
-            assistant={assistant}
-            isActive={assistant.id === activeAssistant.id}
-            sortBy={assistantsTabSortType}
-            onSwitch={setActiveAssistant}
-            onDelete={onDelete}
-            addPreset={addAssistantPreset}
-            copyAssistant={copyAssistant}
-            onCreateDefaultAssistant={onCreateDefaultAssistant}
-            handleSortByChange={handleSortByChange}
-          />
-        )}
-      </DraggableList>
-      {!dragging && renderAddAssistantButton}
-      <div style={{ minHeight: 10 }}></div>
-    </div>
-  )
-}
-
-// 样式组件
-
-const TagsContainer = styled.div`
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-`
-
-const GroupTitle = styled.div`
-  color: var(--color-text-2);
-  font-size: 12px;
-  font-weight: 500;
-  cursor: pointer;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-  height: 24px;
-  margin: 5px 0;
-`
-
-const GroupTitleName = styled.div`
-  max-width: 50%;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-  box-sizing: border-box;
-  padding: 0 4px;
-  color: var(--color-text);
-  font-size: 13px;
-  line-height: 24px;
-  margin-right: 5px;
-  display: flex;
-`
-
-const GroupTitleDivider = styled.div`
-  flex: 1;
-  border-top: 1px solid var(--color-border);
-`
-
-export default Assistants

src/renderer/src/pages/home/Tabs/components/SessionItem.tsx

@@ -33,8 +33,8 @@ interface SessionItemProps {
 const SessionItem: FC<SessionItemProps> = ({ session, agentId, isDisabled, isLoading, onDelete, onPress }) => {
   const { t } = useTranslation()
   const { chat } = useRuntime()
-  const updateSession = useUpdateSession(agentId)
-  const activeSessionId = chat.activeSessionId[agentId]
+  const { updateSession } = useUpdateSession(agentId)
+  const activeSessionId = chat.activeSessionIdMap[agentId]
   const [isConfirmingDeletion, setIsConfirmingDeletion] = useState(false)
   const { setTimeoutTimer } = useTimer()
   const dispatch = useAppDispatch()

src/renderer/src/pages/home/Tabs/components/Sessions.tsx

@@ -30,7 +30,7 @@ const Sessions: React.FC<SessionsProps> = ({ agentId }) => {
   const { agent } = useAgent(agentId)
   const { sessions, isLoading, error, deleteSession, createSession } = useSessions(agentId)
   const { chat } = useRuntime()
-  const { activeSessionId, sessionWaiting } = chat
+  const { activeSessionIdMap, sessionWaiting } = chat
   const dispatch = useAppDispatch()
 
   const setActiveSessionId = useCallback(
@@ -75,24 +75,24 @@ const Sessions: React.FC<SessionsProps> = ({ agentId }) => {
     [agentId, deleteSession, dispatch, sessions, t]
   )
 
-  const currentActiveSessionId = activeSessionId[agentId]
+  const activeSessionId = activeSessionIdMap[agentId]
 
   useEffect(() => {
-    if (!isLoading && sessions.length > 0 && !currentActiveSessionId) {
+    if (!isLoading && sessions.length > 0 && !activeSessionId) {
       setActiveSessionId(agentId, sessions[0].id)
     }
-  }, [isLoading, sessions, currentActiveSessionId, agentId, setActiveSessionId])
+  }, [isLoading, sessions, activeSessionId, agentId, setActiveSessionId])
 
   useEffect(() => {
-    if (currentActiveSessionId) {
+    if (activeSessionId) {
       dispatch(
         newMessagesActions.setTopicFulfilled({
-          topicId: buildAgentSessionTopicId(currentActiveSessionId),
+          topicId: buildAgentSessionTopicId(activeSessionId),
           fulfilled: false
         })
       )
     }
-  }, [currentActiveSessionId, dispatch])
+  }, [activeSessionId, dispatch])
 
   if (isLoading) {
     return (

src/renderer/src/pages/home/Tabs/components/Topics.tsx

@@ -288,13 +288,7 @@ export const Topics: React.FC<Props> = ({ assistant: _assistant, activeTopic, se
         label: t('chat.topics.clear.title'),
         key: 'clear-messages',
         icon: <BrushCleaning size={14} />,
-        async onClick() {
-          window.modal.confirm({
-            title: t('chat.input.clear.content'),
-            centered: true,
-            onOk: () => onClearMessages(topic)
-          })
-        }
+        onClick: () => onClearMessages(topic)
       },
       {
         label: t('settings.topic.position.label'),

src/renderer/src/pages/home/Tabs/index.tsx

@@ -1,4 +1,7 @@
+import { Alert, Skeleton } from '@heroui/react'
 import AddAssistantPopup from '@renderer/components/Popups/AddAssistantPopup'
+import { useActiveSession } from '@renderer/hooks/agents/useActiveSession'
+import { useUpdateSession } from '@renderer/hooks/agents/useUpdateSession'
 import { useAssistants, useDefaultAssistant } from '@renderer/hooks/useAssistant'
 import { useRuntime } from '@renderer/hooks/useRuntime'
 import { useNavbarPosition, useSettings } from '@renderer/hooks/useSettings'
@@ -6,12 +9,13 @@ import { useShowTopics } from '@renderer/hooks/useStore'
 import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
 import { Assistant, Topic } from '@renderer/types'
 import { Tab } from '@renderer/types/chat'
-import { classNames, uuid } from '@renderer/utils'
+import { classNames, getErrorMessage, uuid } from '@renderer/utils'
 import { FC, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
 import Assistants from './AssistantsTab'
+import SessionSettingsTab from './SessionSettingsTab'
 import Settings from './SettingsTab'
 import Topics from './TopicsTab'
 
@@ -41,11 +45,12 @@ const HomeTabs: FC<Props> = ({
   const { defaultAssistant } = useDefaultAssistant()
   const { toggleShowTopics } = useShowTopics()
   const { isLeftNavbar } = useNavbarPosition()
-
   const { t } = useTranslation()
-
   const { chat } = useRuntime()
-  const { activeTopicOrSession } = chat
+  const { activeTopicOrSession, activeAgentId } = chat
+  const { session, isLoading: isSessionLoading, error: sessionError } = useActiveSession()
+  const { updateSession } = useUpdateSession(activeAgentId)
+
   const isSessionView = activeTopicOrSession === 'session'
   const isTopicView = activeTopicOrSession === 'topic'
 
@@ -61,7 +66,6 @@ const HomeTabs: FC<Props> = ({
   }
 
   const showTab = position === 'left' && topicPosition === 'left'
-  const shouldShowSettingsTab = !isSessionView
 
   const onCreateAssistant = async () => {
     const assistant = await AddAssistantPopup.show()
@@ -104,12 +108,6 @@ const HomeTabs: FC<Props> = ({
     }
   }, [position, tab, topicPosition, forceToSeeAllTab])
 
-  useEffect(() => {
-    if (activeTopicOrSession === 'session' && tab === 'settings') {
-      setTab('topic')
-    }
-  }, [activeTopicOrSession, tab])
-
   return (
     <Container
       style={{ ...border, ...style }}
@@ -120,17 +118,15 @@ const HomeTabs: FC<Props> = ({
             {t('assistants.abbr')}
           </TabItem>
           <TabItem active={tab === 'topic'} onClick={() => setTab('topic')}>
-            {isTopicView ? t('common.topics') : t('agent.session.label_other')}
+            {t('common.topics')}
+          </TabItem>
+          <TabItem active={tab === 'settings'} onClick={() => setTab('settings')}>
+            {t('settings.title')}
           </TabItem>
-          {shouldShowSettingsTab && (
-            <TabItem active={tab === 'settings'} onClick={() => setTab('settings')}>
-              {t('settings.title')}
-            </TabItem>
-          )}
         </CustomTabs>
       )}
 
-      {position === 'right' && topicPosition === 'right' && isTopicView && (
+      {position === 'right' && topicPosition === 'right' && (
         <CustomTabs>
           <TabItem active={tab === 'topic'} onClick={() => setTab('topic')}>
             {t('common.topics')}
@@ -158,7 +154,21 @@ const HomeTabs: FC<Props> = ({
             position={position}
           />
         )}
-        {tab === 'settings' && shouldShowSettingsTab && <Settings assistant={activeAssistant} />}
+        {tab === 'settings' && isTopicView && <Settings assistant={activeAssistant} />}
+        {tab === 'settings' && isSessionView && !sessionError && (
+          <Skeleton isLoaded={!isSessionLoading} className="h-full">
+            <SessionSettingsTab session={session} update={updateSession} />
+          </Skeleton>
+        )}
+        {tab === 'settings' && isSessionView && sessionError && (
+          <div className="w-[var(--assistants-width)] p-2 px-3 pt-4">
+            <Alert
+              color="danger"
+              title={t('agent.session.get.error.failed')}
+              description={getErrorMessage(sessionError)}
+            />
+          </div>
+        )}
       </TabContent>
     </Container>
   )
@@ -214,7 +224,7 @@ const CustomTabs = styled.div`
 
 const TabItem = styled.button<{ active: boolean }>`
   flex: 1;
-  height: 32px;
+  height: 30px;
   border: none;
   background: transparent;
   color: ${(props) => (props.active ? 'var(--color-text)' : 'var(--color-text-secondary)')};
@@ -239,7 +249,7 @@ const TabItem = styled.button<{ active: boolean }>`
   &::after {
     content: '';
     position: absolute;
-    bottom: -9px;
+    bottom: -8px;
     left: 50%;
     transform: translateX(-50%);
     width: ${(props) => (props.active ? '30px' : '0')};

src/renderer/src/pages/home/components/ChatNavbarContent.tsx

@@ -0,0 +1,160 @@
+import { BreadcrumbItem, Breadcrumbs, Chip, cn } from '@heroui/react'
+import HorizontalScrollContainer from '@renderer/components/HorizontalScrollContainer'
+import { permissionModeCards } from '@renderer/constants/permissionModes'
+import { useActiveAgent } from '@renderer/hooks/agents/useActiveAgent'
+import { useActiveSession } from '@renderer/hooks/agents/useActiveSession'
+import { useUpdateSession } from '@renderer/hooks/agents/useUpdateSession'
+import { useRuntime } from '@renderer/hooks/useRuntime'
+import { AgentEntity, AgentSessionEntity, ApiModel, Assistant, PermissionMode } from '@renderer/types'
+import { formatErrorMessageWithPrefix } from '@renderer/utils/error'
+import { t } from 'i18next'
+import { FC, ReactNode, useCallback } from 'react'
+
+import { AgentSettingsPopup, SessionSettingsPopup } from '../../settings/AgentSettings'
+import { AgentLabel, SessionLabel } from '../../settings/AgentSettings/shared'
+import SelectAgentBaseModelButton from './SelectAgentBaseModelButton'
+import SelectModelButton from './SelectModelButton'
+
+interface Props {
+  assistant: Assistant
+}
+
+const ChatNavbarContent: FC<Props> = ({ assistant }) => {
+  const { chat } = useRuntime()
+  const { activeTopicOrSession } = chat
+  const { agent: activeAgent } = useActiveAgent()
+  const { session: activeSession } = useActiveSession()
+  const { updateModel } = useUpdateSession(activeAgent?.id ?? null)
+
+  const handleUpdateModel = useCallback(
+    async (model: ApiModel) => {
+      if (!activeAgent || !activeSession) return
+      return updateModel(activeSession.id, model.id, { showSuccessToast: false })
+    },
+    [activeAgent, activeSession, updateModel]
+  )
+
+  return (
+    <>
+      {activeTopicOrSession === 'topic' && <SelectModelButton assistant={assistant} />}
+      {activeTopicOrSession === 'session' && activeAgent && (
+        <HorizontalScrollContainer>
+          <Breadcrumbs
+            classNames={{
+              base: 'flex',
+              list: 'flex-nowrap'
+            }}>
+            <BreadcrumbItem
+              onPress={() => AgentSettingsPopup.show({ agentId: activeAgent.id })}
+              classNames={{
+                base: 'self-stretch',
+                item: 'h-full'
+              }}>
+              <Chip size="md" variant="light" className="h-full transition-background hover:bg-foreground-100">
+                <AgentLabel
+                  agent={activeAgent}
+                  classNames={{ name: 'max-w-40 font-bold text-xs', avatar: 'h-4.5 w-4.5', container: 'gap-1.5' }}
+                />
+              </Chip>
+            </BreadcrumbItem>
+            {activeSession && (
+              <BreadcrumbItem
+                onPress={() =>
+                  SessionSettingsPopup.show({
+                    agentId: activeAgent.id,
+                    sessionId: activeSession.id
+                  })
+                }
+                classNames={{
+                  base: 'self-stretch',
+                  item: 'h-full'
+                }}>
+                <Chip size="md" variant="light" className="h-full transition-background hover:bg-foreground-100">
+                  <SessionLabel session={activeSession} className="max-w-40 font-bold text-xs" />
+                </Chip>
+              </BreadcrumbItem>
+            )}
+            {activeSession && (
+              <BreadcrumbItem>
+                <SelectAgentBaseModelButton agentBase={activeSession} onSelect={handleUpdateModel} />
+              </BreadcrumbItem>
+            )}
+            {activeAgent && activeSession && (
+              <BreadcrumbItem>
+                <SessionWorkspaceMeta agent={activeAgent} session={activeSession} />
+              </BreadcrumbItem>
+            )}
+          </Breadcrumbs>
+        </HorizontalScrollContainer>
+      )}
+    </>
+  )
+}
+
+const SessionWorkspaceMeta: FC<{ agent: AgentEntity; session: AgentSessionEntity }> = ({ agent, session }) => {
+  if (!session || !agent) {
+    return null
+  }
+
+  const firstAccessiblePath = session.accessible_paths?.[0]
+  const permissionMode = (session.configuration?.permission_mode ?? 'default') as PermissionMode
+  const permissionModeCard = permissionModeCards.find((card) => card.mode === permissionMode)
+  const permissionModeLabel = permissionModeCard
+    ? t(permissionModeCard.titleKey, permissionModeCard.titleFallback)
+    : permissionMode
+
+  const infoItems: ReactNode[] = []
+
+  const InfoTag = ({
+    text,
+    className,
+    onClick
+  }: {
+    text: string
+    className?: string
+    classNames?: {}
+    onClick?: (e: React.MouseEvent) => void
+  }) => (
+    <div
+      className={cn(
+        'rounded-medium border border-default-200 px-2 py-1 text-foreground-500 text-xs dark:text-foreground-400',
+        onClick !== undefined ? 'cursor-pointer' : undefined,
+        className
+      )}
+      title={text}
+      onClick={onClick}>
+      <span className="block truncate">{text}</span>
+    </div>
+  )
+
+  // infoItems.push(<InfoTag key="name" text={agent.name ?? ''} className="max-w-60" />)
+
+  if (firstAccessiblePath) {
+    infoItems.push(
+      <InfoTag
+        key="path"
+        text={firstAccessiblePath}
+        className="max-w-60 transition-colors hover:border-primary hover:text-primary"
+        onClick={() => {
+          window.api.file
+            .openPath(firstAccessiblePath)
+            .catch((e) =>
+              window.toast.error(
+                formatErrorMessageWithPrefix(e, t('files.error.open_path', { path: firstAccessiblePath }))
+              )
+            )
+        }}
+      />
+    )
+  }
+
+  infoItems.push(<InfoTag key="permission-mode" text={permissionModeLabel} className="max-w-50" />)
+
+  if (infoItems.length === 0) {
+    return null
+  }
+
+  return <div className="ml-2 flex items-center gap-2">{infoItems}</div>
+}
+
+export default ChatNavbarContent

src/renderer/src/pages/home/components/SelectAgentBaseModelButton.tsx

@@ -1,10 +1,10 @@
 import { Button } from '@heroui/react'
 import ModelAvatar from '@renderer/components/Avatar/ModelAvatar'
 import { SelectApiModelPopup } from '@renderer/components/Popups/SelectModelPopup'
-import { isEmbeddingModel, isRerankModel, isTextToImageModel } from '@renderer/config/models'
+import { agentModelFilter } from '@renderer/config/models'
 import { useApiModel } from '@renderer/hooks/agents/useModel'
 import { getProviderNameById } from '@renderer/services/ProviderService'
-import { AgentBaseWithId, ApiModel, isAgentEntity, Model } from '@renderer/types'
+import { AgentBaseWithId, ApiModel, isAgentEntity } from '@renderer/types'
 import { getModelFilterByAgentType } from '@renderer/utils/agentSession'
 import { apiModelAdapter } from '@renderer/utils/model'
 import { ChevronsUpDown } from 'lucide-react'
@@ -12,22 +12,21 @@ import { FC } from 'react'
 import { useTranslation } from 'react-i18next'
 
 interface Props {
-  agent: AgentBaseWithId
+  agentBase: AgentBaseWithId
   onSelect: (model: ApiModel) => Promise<void>
   isDisabled?: boolean
 }
 
-const SelectAgentModelButton: FC<Props> = ({ agent, onSelect, isDisabled }) => {
+const SelectAgentBaseModelButton: FC<Props> = ({ agentBase: agent, onSelect, isDisabled }) => {
   const { t } = useTranslation()
   const model = useApiModel({ id: agent?.model })
 
   const apiFilter = isAgentEntity(agent) ? getModelFilterByAgentType(agent.type) : undefined
-  const modelFilter = (model: Model) => !isEmbeddingModel(model) && !isRerankModel(model) && !isTextToImageModel(model)
 
   if (!agent) return null
 
   const onSelectModel = async () => {
-    const selectedModel = await SelectApiModelPopup.show({ model, apiFilter: apiFilter, modelFilter })
+    const selectedModel = await SelectApiModelPopup.show({ model, apiFilter: apiFilter, modelFilter: agentModelFilter })
     if (selectedModel && selectedModel.id !== agent.model) {
       onSelect(selectedModel)
     }
@@ -42,9 +41,9 @@ const SelectAgentModelButton: FC<Props> = ({ agent, onSelect, isDisabled }) => {
       className="nodrag rounded-2xl px-1 py-3"
       onPress={onSelectModel}
       isDisabled={isDisabled}>
-      <div className="flex items-center gap-1.5">
+      <div className="flex items-center gap-1.5 overflow-x-hidden">
         <ModelAvatar model={model ? apiModelAdapter(model) : undefined} size={20} />
-        <span className="-mr-0.5 font-medium">
+        <span className="truncate font-medium">
           {model ? model.name : t('button.select_model')} {providerName ? ' | ' + providerName : ''}
         </span>
       </div>
@@ -53,4 +52,4 @@ const SelectAgentModelButton: FC<Props> = ({ agent, onSelect, isDisabled }) => {
   )
 }
 
-export default SelectAgentModelButton
+export default SelectAgentBaseModelButton

src/renderer/src/pages/minapps/components/MinimalToolbar.tsx

@@ -8,6 +8,7 @@ import {
   PushpinOutlined,
   ReloadOutlined
 } from '@ant-design/icons'
+import { loggerService } from '@logger'
 import { isDev } from '@renderer/config/constant'
 import { DEFAULT_MIN_APPS } from '@renderer/config/minapps'
 import { useMinapps } from '@renderer/hooks/useMinapps'
@@ -17,11 +18,21 @@ import { setMinappsOpenLinkExternal } from '@renderer/store/settings'
 import { MinAppType } from '@renderer/types'
 import { Tooltip } from 'antd'
 import { WebviewTag } from 'electron'
-import { FC, useCallback, useState } from 'react'
+import { FC, useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useNavigate } from 'react-router-dom'
 import styled from 'styled-components'
 
+const logger = loggerService.withContext('MinimalToolbar')
+
+// Constants for timing delays
+const WEBVIEW_CHECK_INITIAL_MS = 100 // Initial check interval
+const WEBVIEW_CHECK_MAX_MS = 1000 // Maximum check interval (1 second)
+const WEBVIEW_CHECK_MULTIPLIER = 2 // Exponential backoff multiplier
+const WEBVIEW_CHECK_MAX_ATTEMPTS = 30 // Stop after ~30 seconds total
+const NAVIGATION_UPDATE_DELAY_MS = 50
+const NAVIGATION_COMPLETE_DELAY_MS = 100
+
 interface Props {
   app: MinAppType
   webviewRef: React.RefObject<WebviewTag | null>
@@ -42,27 +53,166 @@ const MinimalToolbar: FC<Props> = ({ app, webviewRef, currentUrl, onReload, onOp
   const isPinned = pinned.some((item) => item.id === app.id)
   const canOpenExternalLink = app.url.startsWith('http://') || app.url.startsWith('https://')
 
+  // Ref to track navigation update timeout
+  const navigationUpdateTimeoutRef = useRef<NodeJS.Timeout | null>(null)
+
   // Update navigation state
   const updateNavigationState = useCallback(() => {
     if (webviewRef.current) {
-      setCanGoBack(webviewRef.current.canGoBack())
-      setCanGoForward(webviewRef.current.canGoForward())
+      try {
+        setCanGoBack(webviewRef.current.canGoBack())
+        setCanGoForward(webviewRef.current.canGoForward())
+      } catch (error) {
+        logger.debug('WebView not ready for navigation state update', { appId: app.id })
+        setCanGoBack(false)
+        setCanGoForward(false)
+      }
+    } else {
+      setCanGoBack(false)
+      setCanGoForward(false)
     }
-  }, [webviewRef])
+  }, [app.id, webviewRef])
+
+  // Schedule navigation state update with debouncing
+  const scheduleNavigationUpdate = useCallback(
+    (delay: number) => {
+      if (navigationUpdateTimeoutRef.current) {
+        clearTimeout(navigationUpdateTimeoutRef.current)
+      }
+      navigationUpdateTimeoutRef.current = setTimeout(() => {
+        updateNavigationState()
+        navigationUpdateTimeoutRef.current = null
+      }, delay)
+    },
+    [updateNavigationState]
+  )
+
+  // Cleanup navigation timeout on unmount
+  useEffect(() => {
+    return () => {
+      if (navigationUpdateTimeoutRef.current) {
+        clearTimeout(navigationUpdateTimeoutRef.current)
+      }
+    }
+  }, [])
+
+  // Monitor webviewRef changes and update navigation state
+  useEffect(() => {
+    let checkTimeout: NodeJS.Timeout | null = null
+    let navigationListener: (() => void) | null = null
+    let listenersAttached = false
+    let currentInterval = WEBVIEW_CHECK_INITIAL_MS
+    let attemptCount = 0
+
+    const attachListeners = () => {
+      if (webviewRef.current && !listenersAttached) {
+        // Update state immediately
+        updateNavigationState()
+
+        // Add navigation event listeners
+        const handleNavigation = () => {
+          scheduleNavigationUpdate(NAVIGATION_UPDATE_DELAY_MS)
+        }
+
+        webviewRef.current.addEventListener('did-navigate', handleNavigation)
+        webviewRef.current.addEventListener('did-navigate-in-page', handleNavigation)
+        listenersAttached = true
+
+        navigationListener = () => {
+          if (webviewRef.current) {
+            webviewRef.current.removeEventListener('did-navigate', handleNavigation)
+            webviewRef.current.removeEventListener('did-navigate-in-page', handleNavigation)
+          }
+          listenersAttached = false
+        }
+
+        if (checkTimeout) {
+          clearTimeout(checkTimeout)
+          checkTimeout = null
+        }
+
+        logger.debug('Navigation listeners attached', { appId: app.id, attempts: attemptCount })
+        return true
+      }
+      return false
+    }
+
+    const scheduleCheck = () => {
+      checkTimeout = setTimeout(() => {
+        // Use requestAnimationFrame to avoid blocking the main thread
+        requestAnimationFrame(() => {
+          attemptCount++
+          if (!attachListeners()) {
+            // Stop checking after max attempts to prevent infinite loops
+            if (attemptCount >= WEBVIEW_CHECK_MAX_ATTEMPTS) {
+              logger.warn('WebView attachment timeout', {
+                appId: app.id,
+                attempts: attemptCount,
+                totalTimeMs: currentInterval * attemptCount
+              })
+              return
+            }
+
+            // Exponential backoff: double the interval up to the maximum
+            currentInterval = Math.min(currentInterval * WEBVIEW_CHECK_MULTIPLIER, WEBVIEW_CHECK_MAX_MS)
+
+            // Log only on first few attempts or when interval changes significantly
+            if (attemptCount <= 3 || attemptCount % 10 === 0) {
+              logger.debug('WebView not ready, scheduling next check', {
+                appId: app.id,
+                nextCheckMs: currentInterval,
+                attempt: attemptCount
+              })
+            }
+
+            scheduleCheck()
+          }
+        })
+      }, currentInterval)
+    }
+
+    // Check for webview attachment
+    if (!webviewRef.current) {
+      scheduleCheck()
+    } else {
+      attachListeners()
+    }
+
+    // Cleanup
+    return () => {
+      if (checkTimeout) clearTimeout(checkTimeout)
+      if (navigationListener) navigationListener()
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [app.id, updateNavigationState, scheduleNavigationUpdate]) // webviewRef excluded as it's a ref object
 
   const handleGoBack = useCallback(() => {
-    if (webviewRef.current && webviewRef.current.canGoBack()) {
-      webviewRef.current.goBack()
-      updateNavigationState()
+    if (webviewRef.current) {
+      try {
+        if (webviewRef.current.canGoBack()) {
+          webviewRef.current.goBack()
+          // Delay update to ensure navigation completes
+          scheduleNavigationUpdate(NAVIGATION_COMPLETE_DELAY_MS)
+        }
+      } catch (error) {
+        logger.debug('WebView not ready for navigation', { appId: app.id, action: 'goBack' })
+      }
     }
-  }, [webviewRef, updateNavigationState])
+  }, [app.id, webviewRef, scheduleNavigationUpdate])
 
   const handleGoForward = useCallback(() => {
-    if (webviewRef.current && webviewRef.current.canGoForward()) {
-      webviewRef.current.goForward()
-      updateNavigationState()
+    if (webviewRef.current) {
+      try {
+        if (webviewRef.current.canGoForward()) {
+          webviewRef.current.goForward()
+          // Delay update to ensure navigation completes
+          scheduleNavigationUpdate(NAVIGATION_COMPLETE_DELAY_MS)
+        }
+      } catch (error) {
+        logger.debug('WebView not ready for navigation', { appId: app.id, action: 'goForward' })
+      }
     }
-  }, [webviewRef, updateNavigationState])
+  }, [app.id, webviewRef, scheduleNavigationUpdate])
 
   const handleMinimize = useCallback(() => {
     navigate('/apps')

src/renderer/src/pages/minapps/components/WebviewSearch.tsx

@@ -46,15 +46,58 @@ const WebviewSearch: FC<WebviewSearchProps> = ({ webviewRef, isWebviewReady, app
     setActiveIndex(0)
   }, [])
 
-  const stopSearch = useCallback(() => {
-    const target = webviewRef.current ?? attachedWebviewRef.current
-    if (!target) return
-    try {
-      target.stopFindInPage('clearSelection')
-    } catch (error) {
-      logger.error('stopFindInPage failed', { error })
+  const ensureWebviewReady = useCallback(
+    (candidate: WebviewTag | null) => {
+      if (!candidate) return null
+      try {
+        const webContentsId = candidate.getWebContentsId?.()
+        if (!webContentsId) {
+          logger.debug('WebviewSearch: missing webContentsId before action', { appId })
+          return null
+        }
+      } catch (error) {
+        logger.debug('WebviewSearch: getWebContentsId failed before action', { appId, error })
+        return null
+      }
+
+      return candidate
+    },
+    [appId]
+  )
+
+  const stopFindOnWebview = useCallback(
+    (webview: WebviewTag | null) => {
+      const usable = ensureWebviewReady(webview)
+      if (!usable) return false
+      try {
+        usable.stopFindInPage('clearSelection')
+        return true
+      } catch (error) {
+        logger.debug('stopFindInPage failed', { appId, error })
+        return false
+      }
+    },
+    [appId, ensureWebviewReady]
+  )
+
+  const getUsableWebview = useCallback(() => {
+    const candidates = [webviewRef.current, attachedWebviewRef.current]
+
+    for (const candidate of candidates) {
+      const usable = ensureWebviewReady(candidate)
+      if (usable) {
+        return usable
+      }
     }
-  }, [webviewRef])
+
+    return null
+  }, [ensureWebviewReady, webviewRef])
+
+  const stopSearch = useCallback(() => {
+    const target = getUsableWebview()
+    if (!target) return
+    stopFindOnWebview(target)
+  }, [getUsableWebview, stopFindOnWebview])
 
   const closeSearch = useCallback(() => {
     setIsVisible(false)
@@ -64,7 +107,7 @@ const WebviewSearch: FC<WebviewSearchProps> = ({ webviewRef, isWebviewReady, app
 
   const performSearch = useCallback(
     (text: string, options?: Electron.FindInPageOptions) => {
-      const target = webviewRef.current ?? attachedWebviewRef.current
+      const target = getUsableWebview()
       if (!target) {
         logger.debug('Skip performSearch: webview not attached')
         return
@@ -81,7 +124,7 @@ const WebviewSearch: FC<WebviewSearchProps> = ({ webviewRef, isWebviewReady, app
         window.toast?.error(t('common.error'))
       }
     },
-    [resetSearchState, stopSearch, t, webviewRef]
+    [getUsableWebview, resetSearchState, stopSearch, t]
   )
 
   const handleFoundInPage = useCallback((event: Event & { result?: FoundInPageResult }) => {
@@ -129,22 +172,26 @@ const WebviewSearch: FC<WebviewSearchProps> = ({ webviewRef, isWebviewReady, app
     return () => {
       activeWebview.removeEventListener('found-in-page', handle)
       if (attachedWebviewRef.current === activeWebview) {
-        try {
-          activeWebview.stopFindInPage('clearSelection')
-        } catch (error) {
-          logger.error('stopFindInPage failed', { error })
-        }
+        stopFindOnWebview(activeWebview)
         attachedWebviewRef.current = null
       }
     }
-  }, [activeWebview, handleFoundInPage])
+  }, [activeWebview, handleFoundInPage, stopFindOnWebview])
 
   useEffect(() => {
     if (!activeWebview) return
+    if (!isWebviewReady) return
     const onFindShortcut = window.api?.webview?.onFindShortcut
     if (!onFindShortcut) return
 
-    const webContentsId = activeWebview.getWebContentsId?.()
+    let webContentsId: number | undefined
+    try {
+      webContentsId = activeWebview.getWebContentsId?.()
+    } catch (error) {
+      logger.debug('WebviewSearch: getWebContentsId failed', { appId, error })
+      return
+    }
+
     if (!webContentsId) {
       logger.warn('WebviewSearch: missing webContentsId', { appId })
       return
@@ -177,7 +224,7 @@ const WebviewSearch: FC<WebviewSearchProps> = ({ webviewRef, isWebviewReady, app
     return () => {
       unsubscribe?.()
     }
-  }, [appId, activeWebview, closeSearch, goToNext, goToPrevious, isVisible, openSearch])
+  }, [appId, activeWebview, closeSearch, goToNext, goToPrevious, isVisible, isWebviewReady, openSearch])
 
   useEffect(() => {
     if (!isVisible) return

src/renderer/src/pages/minapps/components/__tests__/WebviewSearch.test.tsx

@@ -164,6 +164,61 @@ describe('WebviewSearch', () => {
     })
   })
 
+  it('skips shortcut wiring when getWebContentsId throws', async () => {
+    const { webview } = createWebviewMock()
+    const error = new Error('not ready')
+    ;(webview as any).getWebContentsId = vi.fn(() => {
+      throw error
+    })
+    const webviewRef = { current: webview } as React.RefObject<WebviewTag | null>
+
+    const getWebContentsIdMock = vi.fn(() => {
+      throw error
+    })
+    ;(webview as any).getWebContentsId = getWebContentsIdMock
+    const { rerender } = render(<WebviewSearch webviewRef={webviewRef} isWebviewReady appId="app-1" />)
+
+    await waitFor(() => {
+      expect(getWebContentsIdMock).toHaveBeenCalled()
+    })
+    expect(onFindShortcutMock).not.toHaveBeenCalled()
+
+    ;(webview as any).getWebContentsId = vi.fn(() => 1)
+
+    rerender(<WebviewSearch webviewRef={webviewRef} isWebviewReady={false} appId="app-1" />)
+    rerender(<WebviewSearch webviewRef={webviewRef} isWebviewReady appId="app-1" />)
+
+    await waitFor(() => {
+      expect(onFindShortcutMock).toHaveBeenCalled()
+    })
+  })
+
+  it('does not call stopFindInPage when webview is not ready', async () => {
+    const { stopFindInPageMock, webview } = createWebviewMock()
+    const error = new Error('loading')
+    const getWebContentsIdMock = vi.fn(() => {
+      throw error
+    })
+    ;(webview as any).getWebContentsId = getWebContentsIdMock
+    const webviewRef = { current: webview } as React.RefObject<WebviewTag | null>
+
+    const { rerender, unmount } = render(<WebviewSearch webviewRef={webviewRef} isWebviewReady appId="app-1" />)
+
+    await waitFor(() => {
+      expect(getWebContentsIdMock).toHaveBeenCalled()
+    })
+
+    stopFindInPageMock.mockImplementation(() => {
+      throw new Error('should not be called')
+    })
+
+    rerender(<WebviewSearch webviewRef={webviewRef} isWebviewReady={false} appId="app-1" />)
+    expect(stopFindInPageMock).not.toHaveBeenCalled()
+
+    unmount()
+    expect(stopFindInPageMock).not.toHaveBeenCalled()
+  })
+
   it('closes the search overlay when escape is forwarded from the webview', async () => {
     const { webview } = createWebviewMock()
     const webviewRef = { current: webview } as React.RefObject<WebviewTag | null>

src/renderer/src/pages/notes/NotesEditor.tsx

@@ -1,5 +1,5 @@
 import ActionIconButton from '@renderer/components/Buttons/ActionIconButton'
-import CodeEditor from '@renderer/components/CodeEditor'
+import CodeEditor, { CodeEditorHandles } from '@renderer/components/CodeEditor'
 import { HSpaceBetweenStack } from '@renderer/components/Layout'
 import RichEditor from '@renderer/components/RichEditor'
 import { RichEditorRef } from '@renderer/components/RichEditor/types'
@@ -20,11 +20,12 @@ interface NotesEditorProps {
   currentContent: string
   tokenCount: number
   editorRef: RefObject<RichEditorRef | null>
+  codeEditorRef: RefObject<CodeEditorHandles | null>
   onMarkdownChange: (content: string) => void
 }
 
 const NotesEditor: FC<NotesEditorProps> = memo(
-  ({ activeNodeId, currentContent, tokenCount, onMarkdownChange, editorRef }) => {
+  ({ activeNodeId, currentContent, tokenCount, onMarkdownChange, editorRef, codeEditorRef }) => {
     const { t } = useTranslation()
     const dispatch = useAppDispatch()
     const { settings } = useNotesSettings()
@@ -59,6 +60,7 @@ const NotesEditor: FC<NotesEditorProps> = memo(
           {tmpViewMode === 'source' ? (
             <SourceEditorWrapper isFullWidth={settings.isFullWidth} fontSize={settings.fontSize}>
               <CodeEditor
+                ref={codeEditorRef}
                 value={currentContent}
                 language="markdown"
                 onChange={onMarkdownChange}

src/renderer/src/pages/notes/NotesPage.tsx

@@ -1,9 +1,11 @@
 import { loggerService } from '@logger'
 import { Navbar, NavbarCenter } from '@renderer/components/app/Navbar'
+import { CodeEditorHandles } from '@renderer/components/CodeEditor'
 import { RichEditorRef } from '@renderer/components/RichEditor/types'
 import { useActiveNode, useFileContent, useFileContentSync } from '@renderer/hooks/useNotesQuery'
 import { useNotesSettings } from '@renderer/hooks/useNotesSettings'
 import { useShowWorkspace } from '@renderer/hooks/useShowWorkspace'
+import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
 import {
   addDir,
   addNote,
@@ -51,6 +53,7 @@ const logger = loggerService.withContext('NotesPage')
 
 const NotesPage: FC = () => {
   const editorRef = useRef<RichEditorRef>(null)
+  const codeEditorRef = useRef<CodeEditorHandles>(null)
   const { t } = useTranslation()
   const { showWorkspace } = useShowWorkspace()
   const dispatch = useAppDispatch()
@@ -76,6 +79,7 @@ const NotesPage: FC = () => {
   const lastFilePathRef = useRef<string | undefined>(undefined)
   const isRenamingRef = useRef(false)
   const isCreatingNoteRef = useRef(false)
+  const pendingScrollRef = useRef<{ lineNumber: number; lineContent?: string } | null>(null)
 
   const activeFilePathRef = useRef<string | undefined>(activeFilePath)
   const currentContentRef = useRef(currentContent)
@@ -366,6 +370,32 @@ const NotesPage: FC = () => {
     }
   }, [currentContent, activeFilePath])
 
+  // Execute pending scroll after file switch
+  useEffect(() => {
+    if (!pendingScrollRef.current || !currentContent) return
+
+    const { lineNumber, lineContent } = pendingScrollRef.current
+    pendingScrollRef.current = null
+
+    // Wait for DOM to update before scrolling
+    requestAnimationFrame(() => {
+      requestAnimationFrame(() => {
+        const codeEditor = codeEditorRef.current
+        const richEditor = editorRef.current
+
+        try {
+          if (codeEditor?.scrollToLine) {
+            codeEditor.scrollToLine(lineNumber, { highlight: true })
+          } else if (richEditor?.scrollToLine) {
+            richEditor.scrollToLine(lineNumber, { highlight: true, lineContent })
+          }
+        } catch (error) {
+          logger.error('Failed to execute pending scroll:', error as Error)
+        }
+      })
+    })
+  }, [activeFilePath, currentContent])
+
   // 切换文件时的清理工作
   useEffect(() => {
     return () => {
@@ -755,6 +785,53 @@ const NotesPage: FC = () => {
     }
   }, [currentContent, settings.defaultEditMode])
 
+  // Listen for external requests to locate a specific line in a note
+  useEffect(() => {
+    const handleLocateNoteLine = ({
+      noteId,
+      lineNumber,
+      lineContent
+    }: {
+      noteId: string
+      lineNumber: number
+      lineContent?: string
+    }) => {
+      const targetNode = findNode(notesTree, noteId)
+
+      if (!targetNode || targetNode.type !== 'file') {
+        logger.warn('Target note not found or not a file', { noteId })
+        return
+      }
+
+      const needsSwitchFile = targetNode.externalPath !== activeFilePath
+
+      if (needsSwitchFile) {
+        // switch to target note first then scroll to line
+        pendingScrollRef.current = { lineNumber, lineContent }
+        dispatch(setActiveFilePath(targetNode.externalPath))
+        invalidateFileContent(targetNode.externalPath)
+      } else {
+        const richEditor = editorRef.current
+        const codeEditor = codeEditorRef.current
+
+        try {
+          if (codeEditor?.scrollToLine) {
+            codeEditor.scrollToLine(lineNumber, { highlight: true })
+          } else if (richEditor?.scrollToLine) {
+            richEditor.scrollToLine(lineNumber, { highlight: true, lineContent })
+          }
+        } catch (error) {
+          logger.error('Failed to scroll to line:', error as Error)
+        }
+      }
+    }
+
+    const unsubscribe = EventEmitter.on(EVENT_NAMES.LOCATE_NOTE_LINE, handleLocateNoteLine)
+    return () => {
+      unsubscribe()
+    }
+  }, [activeNode?.id, activeFilePath, notesTree, dispatch, invalidateFileContent])
+
   return (
     <Container id="notes-page">
       <Navbar>
@@ -800,6 +877,7 @@ const NotesPage: FC = () => {
             tokenCount={tokenCount}
             onMarkdownChange={handleMarkdownChange}
             editorRef={editorRef}
+            codeEditorRef={codeEditorRef}
           />
         </EditorWrapper>
       </ContentContainer>

src/renderer/src/pages/notes/NotesSidebar.tsx

@@ -1,4 +1,5 @@
 import { loggerService } from '@logger'
+import HighlightText from '@renderer/components/HighlightText'
 import { DeleteIcon } from '@renderer/components/Icons'
 import SaveToKnowledgePopup from '@renderer/components/Popups/SaveToKnowledgePopup'
 import Scrollbar from '@renderer/components/Scrollbar'
@@ -7,6 +8,8 @@ import { useKnowledgeBases } from '@renderer/hooks/useKnowledge'
 import { useActiveNode } from '@renderer/hooks/useNotesQuery'
 import NotesSidebarHeader from '@renderer/pages/notes/NotesSidebarHeader'
 import { fetchNoteSummary } from '@renderer/services/ApiService'
+import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
+import { SearchMatch, SearchResult } from '@renderer/services/NotesSearchService'
 import { RootState, useAppSelector } from '@renderer/store'
 import { selectSortType } from '@renderer/store/note'
 import { NotesSortType, NotesTreeNode } from '@renderer/types/note'
@@ -23,16 +26,20 @@ import {
   FileSearch,
   Folder,
   FolderOpen,
+  Loader2,
   Sparkles,
   Star,
   StarOff,
-  UploadIcon
+  UploadIcon,
+  X
 } from 'lucide-react'
 import { FC, memo, Ref, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useSelector } from 'react-redux'
 import styled from 'styled-components'
 
+import { useFullTextSearch } from './hooks/useFullTextSearch'
+
 interface NotesSidebarProps {
   onCreateFolder: (name: string, targetFolderId?: string) => void
   onCreateNote: (name: string, targetFolderId?: string) => void
@@ -51,7 +58,7 @@ interface NotesSidebarProps {
 const logger = loggerService.withContext('NotesSidebar')
 
 interface TreeNodeProps {
-  node: NotesTreeNode
+  node: NotesTreeNode | SearchResult
   depth: number
   selectedFolderId?: string | null
   activeNodeId?: string
@@ -71,6 +78,8 @@ interface TreeNodeProps {
   onDrop: (e: React.DragEvent, node: NotesTreeNode) => void
   onDragEnd: () => void
   renderChildren?: boolean // 控制是否渲染子节点
+  searchKeyword?: string // 搜索关键词,用于高亮
+  showMatches?: boolean // 是否显示匹配预览
   openDropdownKey: string | null
   onDropdownOpenChange: (key: string | null) => void
 }
@@ -97,10 +106,30 @@ const TreeNode = memo<TreeNodeProps>(
     onDrop,
     onDragEnd,
     renderChildren = true,
+    searchKeyword = '',
+    showMatches = false,
     openDropdownKey,
     onDropdownOpenChange
   }) => {
     const { t } = useTranslation()
+    const [showAllMatches, setShowAllMatches] = useState(false)
+
+    // 检查是否是搜索结果
+    const searchResult = 'matchType' in node ? (node as SearchResult) : null
+    const hasMatches = searchResult && searchResult.matches && searchResult.matches.length > 0
+
+    // 处理匹配项点击
+    const handleMatchClick = useCallback(
+      (match: SearchMatch) => {
+        // 发送定位事件
+        EventEmitter.emit(EVENT_NAMES.LOCATE_NOTE_LINE, {
+          noteId: node.id,
+          lineNumber: match.lineNumber,
+          lineContent: match.lineContent
+        })
+      },
+      [node]
+    )
 
     const isActive = selectedFolderId
       ? node.type === 'folder' && node.id === selectedFolderId
@@ -121,6 +150,37 @@ const TreeNode = memo<TreeNodeProps>(
       return ''
     }
 
+    const displayName = useMemo(() => {
+      if (!searchKeyword) {
+        return node.name
+      }
+
+      const name = node.name ?? ''
+      if (!name) {
+        return name
+      }
+
+      const keyword = searchKeyword
+      const nameLower = name.toLowerCase()
+      const keywordLower = keyword.toLowerCase()
+      const matchStart = nameLower.indexOf(keywordLower)
+
+      if (matchStart === -1) {
+        return name
+      }
+
+      const matchEnd = matchStart + keyword.length
+      const beforeMatch = Math.min(2, matchStart)
+      const contextStart = matchStart - beforeMatch
+      const contextLength = 50
+      const contextEnd = Math.min(name.length, matchEnd + contextLength)
+
+      const prefix = contextStart > 0 ? '...' : ''
+      const suffix = contextEnd < name.length ? '...' : ''
+
+      return prefix + name.substring(contextStart, contextEnd) + suffix
+    }, [node.name, searchKeyword])
+
     return (
       <div key={node.id}>
         <Dropdown
@@ -182,13 +242,55 @@ const TreeNode = memo<TreeNodeProps>(
                     size="small"
                   />
                 ) : (
-                  <NodeName className={getNodeNameClassName()}>{node.name}</NodeName>
+                  <NodeNameContainer>
+                    <NodeName className={getNodeNameClassName()}>
+                      {searchKeyword ? <HighlightText text={displayName} keyword={searchKeyword} /> : node.name}
+                    </NodeName>
+                    {searchResult && searchResult.matchType && searchResult.matchType !== 'filename' && (
+                      <MatchBadge matchType={searchResult.matchType}>
+                        {searchResult.matchType === 'both' ? t('notes.search.both') : t('notes.search.content')}
+                      </MatchBadge>
+                    )}
+                  </NodeNameContainer>
                 )}
               </TreeNodeContent>
             </TreeNodeContainer>
           </div>
         </Dropdown>
 
+        {showMatches && hasMatches && (
+          <SearchMatchesContainer depth={depth}>
+            {(showAllMatches ? searchResult!.matches! : searchResult!.matches!.slice(0, 3)).map((match, idx) => (
+              <MatchItem key={idx} onClick={() => handleMatchClick(match)}>
+                <MatchLineNumber>{match.lineNumber}</MatchLineNumber>
+                <MatchContext>
+                  <HighlightText text={match.context} keyword={searchKeyword} />
+                </MatchContext>
+              </MatchItem>
+            ))}
+            {searchResult!.matches!.length > 3 && (
+              <MoreMatches
+                depth={depth}
+                onClick={(e) => {
+                  e.stopPropagation()
+                  setShowAllMatches(!showAllMatches)
+                }}>
+                {showAllMatches ? (
+                  <>
+                    <ChevronDown size={12} style={{ marginRight: 4 }} />
+                    {t('notes.search.show_less')}
+                  </>
+                ) : (
+                  <>
+                    <ChevronRight size={12} style={{ marginRight: 4 }} />+{searchResult!.matches!.length - 3}{' '}
+                    {t('notes.search.more_matches')}
+                  </>
+                )}
+              </MoreMatches>
+            )}
+          </SearchMatchesContainer>
+        )}
+
         {renderChildren && node.type === 'folder' && node.expanded && hasChildren && (
           <div>
             {node.children!.map((child) => (
@@ -257,6 +359,31 @@ const NotesSidebar: FC<NotesSidebarProps> = ({
   const [openDropdownKey, setOpenDropdownKey] = useState<string | null>(null)
   const dragNodeRef = useRef<HTMLDivElement | null>(null)
   const scrollbarRef = useRef<any>(null)
+  const notesTreeRef = useRef<NotesTreeNode[]>(notesTree)
+  const trimmedSearchKeyword = useMemo(() => searchKeyword.trim(), [searchKeyword])
+  const hasSearchKeyword = trimmedSearchKeyword.length > 0
+
+  // 全文搜索配置
+  const searchOptions = useMemo(
+    () => ({
+      debounceMs: 300,
+      maxResults: 100,
+      contextLength: 50,
+      caseSensitive: false,
+      maxFileSize: 10 * 1024 * 1024, // 10MB
+      enabled: isShowSearch
+    }),
+    [isShowSearch]
+  )
+
+  const {
+    search,
+    cancel,
+    reset,
+    isSearching,
+    results: searchResults,
+    stats: searchStats
+  } = useFullTextSearch(searchOptions)
 
   const inPlaceEdit = useInPlaceEdit({
     onSave: (newName: string) => {
@@ -514,6 +641,25 @@ const NotesSidebar: FC<NotesSidebarProps> = ({
     setIsShowSearch(!isShowSearch)
   }, [isShowSearch])
 
+  // 同步 notesTree 到 ref
+  useEffect(() => {
+    notesTreeRef.current = notesTree
+  }, [notesTree])
+
+  // 触发全文搜索
+  useEffect(() => {
+    if (!isShowSearch) {
+      reset()
+      return
+    }
+
+    if (hasSearchKeyword) {
+      search(notesTreeRef.current, trimmedSearchKeyword)
+    } else {
+      reset()
+    }
+  }, [isShowSearch, hasSearchKeyword, trimmedSearchKeyword, search, reset])
+
   // Flatten tree nodes for virtualization and filtering
   const flattenedNodes = useMemo(() => {
     const flattenForVirtualization = (
@@ -537,11 +683,7 @@ const NotesSidebar: FC<NotesSidebarProps> = ({
       let result: NotesTreeNode[] = []
 
       for (const node of nodes) {
-        if (isShowSearch && searchKeyword) {
-          if (node.type === 'file' && node.name.toLowerCase().includes(searchKeyword.toLowerCase())) {
-            result.push(node)
-          }
-        } else if (isShowStarred) {
+        if (isShowStarred) {
           if (node.type === 'file' && node.isStarred) {
             result.push(node)
           }
@@ -553,7 +695,14 @@ const NotesSidebar: FC<NotesSidebarProps> = ({
       return result
     }
 
-    if (isShowStarred || isShowSearch) {
+    if (isShowSearch) {
+      if (hasSearchKeyword) {
+        return searchResults.map((result) => ({ node: result, depth: 0 }))
+      }
+      return [] // 搜索关键词为空
+    }
+
+    if (isShowStarred) {
       // For filtered views, return flat list without virtualization for simplicity
       const filteredNodes = flattenForFiltering(notesTree)
       return filteredNodes.map((node) => ({ node, depth: 0 }))
@@ -561,7 +710,7 @@ const NotesSidebar: FC<NotesSidebarProps> = ({
 
     // For normal tree view, use hierarchical flattening for virtualization
     return flattenForVirtualization(notesTree)
-  }, [notesTree, isShowStarred, isShowSearch, searchKeyword])
+  }, [notesTree, isShowStarred, isShowSearch, hasSearchKeyword, searchResults])
 
   // Use virtualization only for normal tree view with many items
   const shouldUseVirtualization = !isShowStarred && !isShowSearch && flattenedNodes.length > 100
@@ -863,6 +1012,26 @@ const NotesSidebar: FC<NotesSidebarProps> = ({
       />
 
       <NotesTreeContainer>
+        {isShowSearch && isSearching && (
+          <SearchStatusBar>
+            <Loader2 size={14} className="animate-spin" />
+            <span>{t('notes.search.searching')}</span>
+            <CancelButton onClick={cancel} title={t('common.cancel')}>
+              <X size={14} />
+            </CancelButton>
+          </SearchStatusBar>
+        )}
+        {isShowSearch && !isSearching && hasSearchKeyword && searchStats.total > 0 && (
+          <SearchStatusBar>
+            <span>
+              {t('notes.search.found_results', {
+                count: searchStats.total,
+                nameCount: searchStats.fileNameMatches,
+                contentCount: searchStats.contentMatches + searchStats.bothMatches
+              })}
+            </span>
+          </SearchStatusBar>
+        )}
         {shouldUseVirtualization ? (
           <Dropdown
             menu={{ items: getEmptyAreaMenuItems() }}
@@ -967,6 +1136,8 @@ const NotesSidebar: FC<NotesSidebarProps> = ({
                         onDragEnd={handleDragEnd}
                         openDropdownKey={openDropdownKey}
                         onDropdownOpenChange={setOpenDropdownKey}
+                        searchKeyword={isShowSearch ? trimmedSearchKeyword : ''}
+                        showMatches={isShowSearch}
                       />
                     ))
                   : notesTree.map((node) => (
@@ -1249,4 +1420,148 @@ const DropHintText = styled.div`
   font-style: italic;
 `
 
+// 搜索相关样式
+const SearchStatusBar = styled.div`
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 8px 12px;
+  background-color: var(--color-background-soft);
+  border-bottom: 0.5px solid var(--color-border);
+  font-size: 12px;
+  color: var(--color-text-2);
+
+  .animate-spin {
+    animation: spin 1s linear infinite;
+  }
+
+  @keyframes spin {
+    from {
+      transform: rotate(0deg);
+    }
+    to {
+      transform: rotate(360deg);
+    }
+  }
+`
+
+const CancelButton = styled.button`
+  margin-left: auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 20px;
+  height: 20px;
+  padding: 0;
+  border: none;
+  background-color: transparent;
+  color: var(--color-text-3);
+  cursor: pointer;
+  border-radius: 3px;
+  transition: all 0.2s ease;
+
+  &:hover {
+    background-color: var(--color-background-mute);
+    color: var(--color-text);
+  }
+
+  &:active {
+    background-color: var(--color-active);
+  }
+`
+
+const NodeNameContainer = styled.div`
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  flex: 1;
+  min-width: 0;
+`
+
+const MatchBadge = styled.span<{ matchType: string }>`
+  display: inline-flex;
+  align-items: center;
+  padding: 0 4px;
+  height: 16px;
+  font-size: 10px;
+  line-height: 1;
+  border-radius: 2px;
+  background-color: ${(props) =>
+    props.matchType === 'both' ? 'var(--color-primary-soft)' : 'var(--color-background-mute)'};
+  color: ${(props) => (props.matchType === 'both' ? 'var(--color-primary)' : 'var(--color-text-3)')};
+  font-weight: 500;
+  flex-shrink: 0;
+`
+
+const SearchMatchesContainer = styled.div<{ depth: number }>`
+  margin-left: ${(props) => props.depth * 16 + 40}px;
+  margin-top: 4px;
+  margin-bottom: 8px;
+  padding: 6px 8px;
+  background-color: var(--color-background-mute);
+  border-radius: 4px;
+  border-left: 2px solid var(--color-primary-soft);
+`
+
+const MatchItem = styled.div`
+  display: flex;
+  gap: 8px;
+  margin-bottom: 4px;
+  font-size: 12px;
+  padding: 4px 6px;
+  margin-left: -6px;
+  margin-right: -6px;
+  border-radius: 3px;
+  cursor: pointer;
+  transition: all 0.15s ease;
+
+  &:hover {
+    background-color: var(--color-background-soft);
+    transform: translateX(2px);
+  }
+
+  &:active {
+    background-color: var(--color-active);
+  }
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+`
+
+const MatchLineNumber = styled.span`
+  color: var(--color-text-3);
+  font-family: monospace;
+  flex-shrink: 0;
+  width: 30px;
+`
+
+const MatchContext = styled.div`
+  color: var(--color-text-2);
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-family: monospace;
+`
+
+const MoreMatches = styled.div<{ depth: number }>`
+  margin-top: 4px;
+  padding: 4px 6px;
+  margin-left: -6px;
+  margin-right: -6px;
+  font-size: 11px;
+  color: var(--color-text-3);
+  border-radius: 3px;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  transition: all 0.15s ease;
+
+  &:hover {
+    color: var(--color-text-2);
+    background-color: var(--color-background-soft);
+  }
+`
+
 export default memo(NotesSidebar)

src/renderer/src/pages/notes/hooks/useFullTextSearch.ts

@@ -0,0 +1,159 @@
+import { searchAllFiles, SearchOptions, SearchResult } from '@renderer/services/NotesSearchService'
+import { NotesTreeNode } from '@renderer/types/note'
+import { useCallback, useEffect, useRef, useState } from 'react'
+
+export interface UseFullTextSearchOptions extends SearchOptions {
+  debounceMs?: number
+  maxResults?: number
+  enabled?: boolean
+}
+
+export interface UseFullTextSearchReturn {
+  search: (nodes: NotesTreeNode[], keyword: string) => void
+  cancel: () => void
+  reset: () => void
+  isSearching: boolean
+  results: SearchResult[]
+  stats: {
+    total: number
+    fileNameMatches: number
+    contentMatches: number
+    bothMatches: number
+  }
+  error: Error | null
+}
+
+/**
+ * Full-text search hook for notes
+ */
+export function useFullTextSearch(options: UseFullTextSearchOptions = {}): UseFullTextSearchReturn {
+  const { debounceMs = 300, maxResults = 100, enabled = true, ...searchOptions } = options
+
+  const [isSearching, setIsSearching] = useState(false)
+  const [results, setResults] = useState<SearchResult[]>([])
+  const [error, setError] = useState<Error | null>(null)
+  const [stats, setStats] = useState({
+    total: 0,
+    fileNameMatches: 0,
+    contentMatches: 0,
+    bothMatches: 0
+  })
+
+  const abortControllerRef = useRef<AbortController | null>(null)
+  const debounceTimerRef = useRef<NodeJS.Timeout | null>(null)
+
+  // Store options in refs to avoid reference changes
+  const searchOptionsRef = useRef(searchOptions)
+  const maxResultsRef = useRef(maxResults)
+  const enabledRef = useRef(enabled)
+
+  useEffect(() => {
+    searchOptionsRef.current = searchOptions
+    maxResultsRef.current = maxResults
+    enabledRef.current = enabled
+  }, [searchOptions, maxResults, enabled])
+
+  const cancel = useCallback(() => {
+    if (abortControllerRef.current) {
+      abortControllerRef.current.abort()
+      abortControllerRef.current = null
+    }
+    if (debounceTimerRef.current) {
+      clearTimeout(debounceTimerRef.current)
+      debounceTimerRef.current = null
+    }
+    setIsSearching(false)
+  }, [])
+
+  const reset = useCallback(() => {
+    cancel()
+    setResults([])
+    setStats({ total: 0, fileNameMatches: 0, contentMatches: 0, bothMatches: 0 })
+    setError(null)
+  }, [cancel])
+
+  const performSearch = useCallback(
+    async (nodes: NotesTreeNode[], keyword: string) => {
+      if (!enabledRef.current) {
+        return
+      }
+
+      cancel()
+
+      if (!keyword) {
+        setResults([])
+        setStats({ total: 0, fileNameMatches: 0, contentMatches: 0, bothMatches: 0 })
+        return
+      }
+
+      setIsSearching(true)
+      setError(null)
+
+      const abortController = new AbortController()
+      abortControllerRef.current = abortController
+
+      try {
+        const searchResults = await searchAllFiles(
+          nodes,
+          keyword.trim(),
+          searchOptionsRef.current,
+          abortController.signal
+        )
+
+        if (abortController.signal.aborted) {
+          return
+        }
+
+        const limitedResults = searchResults.slice(0, maxResultsRef.current)
+
+        const newStats = {
+          total: limitedResults.length,
+          fileNameMatches: limitedResults.filter((r) => r.matchType === 'filename').length,
+          contentMatches: limitedResults.filter((r) => r.matchType === 'content').length,
+          bothMatches: limitedResults.filter((r) => r.matchType === 'both').length
+        }
+
+        setResults(limitedResults)
+        setStats(newStats)
+      } catch (err) {
+        if (err instanceof Error && err.name !== 'AbortError') {
+          setError(err)
+        }
+      } finally {
+        if (!abortController.signal.aborted) {
+          setIsSearching(false)
+        }
+      }
+    },
+    [cancel]
+  )
+
+  const search = useCallback(
+    (nodes: NotesTreeNode[], keyword: string) => {
+      if (debounceTimerRef.current) {
+        clearTimeout(debounceTimerRef.current)
+      }
+
+      debounceTimerRef.current = setTimeout(() => {
+        performSearch(nodes, keyword)
+      }, debounceMs)
+    },
+    [performSearch, debounceMs]
+  )
+
+  useEffect(() => {
+    return () => {
+      cancel()
+    }
+  }, [cancel])
+
+  return {
+    search,
+    cancel,
+    reset,
+    isSearching,
+    results,
+    stats,
+    error
+  }
+}

src/renderer/src/pages/paintings/AihubmixPage.tsx

@@ -14,7 +14,6 @@ import { usePaintings } from '@renderer/hooks/usePaintings'
 import { useAllProviders } from '@renderer/hooks/useProvider'
 import { useRuntime } from '@renderer/hooks/useRuntime'
 import { useSettings } from '@renderer/hooks/useSettings'
-import { getProviderLabel } from '@renderer/i18n/label'
 import FileManager from '@renderer/services/FileManager'
 import { translateText } from '@renderer/services/TranslateService'
 import { useAppDispatch } from '@renderer/store'
@@ -35,6 +34,7 @@ import SendMessageButton from '../home/Inputbar/SendMessageButton'
 import { SettingHelpLink, SettingTitle } from '../settings'
 import Artboard from './components/Artboard'
 import PaintingsList from './components/PaintingsList'
+import ProviderSelect from './components/ProviderSelect'
 import { type ConfigItem, createModeConfigs, DEFAULT_PAINTING } from './config/aihubmixConfig'
 import { checkProviderEnabled } from './utils'
 
@@ -76,20 +76,6 @@ const AihubmixPage: FC<{ Options: string[] }> = ({ Options }) => {
   const { t } = useTranslation()
   const { theme } = useTheme()
   const providers = useAllProviders()
-  const providerOptions = Options.map((option) => {
-    const provider = providers.find((p) => p.id === option)
-    if (provider) {
-      return {
-        label: getProviderLabel(provider.id),
-        value: provider.id
-      }
-    } else {
-      return {
-        label: 'Unknown Provider',
-        value: undefined
-      }
-    }
-  })
   const dispatch = useAppDispatch()
   const { generating } = useRuntime()
   const navigate = useNavigate()
@@ -849,17 +835,12 @@ const AihubmixPage: FC<{ Options: string[] }> = ({ Options }) => {
               />
             </SettingHelpLink>
           </ProviderTitleContainer>
-
-          <Select value={providerOptions[1].value} onChange={handleProviderChange} style={{ marginBottom: 15 }}>
-            {providerOptions.map((provider) => (
-              <Select.Option value={provider.value} key={provider.value}>
-                <SelectOptionContainer>
-                  <ProviderLogo shape="square" src={getProviderLogo(provider.value || '')} size={16} />
-                  {provider.label}
-                </SelectOptionContainer>
-              </Select.Option>
-            ))}
-          </Select>
+          <ProviderSelect
+            provider={aihubmixProvider}
+            options={Options}
+            onChange={handleProviderChange}
+            className={'mb-4'}
+          />
 
           {/* 使用JSON配置渲染设置项 */}
           {modeConfigs[mode].filter((item) => (item.condition ? item.condition(painting) : true)).map(renderConfigItem)}
@@ -1034,12 +1015,6 @@ const ModeSegmentedContainer = styled.div`
   padding-top: 24px;
 `
 
-const SelectOptionContainer = styled.div`
-  display: flex;
-  align-items: center;
-  gap: 8px;
-`
-
 // 添加新的样式组件
 const ProviderTitleContainer = styled.div`
   display: flex;

src/renderer/src/pages/paintings/DmxapiPage.tsx

@@ -8,7 +8,6 @@ import { getProviderLogo } from '@renderer/config/providers'
 import { usePaintings } from '@renderer/hooks/usePaintings'
 import { useAllProviders } from '@renderer/hooks/useProvider'
 import { useRuntime } from '@renderer/hooks/useRuntime'
-import { getProviderLabel } from '@renderer/i18n/label'
 import FileManager from '@renderer/services/FileManager'
 import { useAppDispatch } from '@renderer/store'
 import { setGenerating } from '@renderer/store/runtime'
@@ -29,6 +28,7 @@ import { SettingHelpLink, SettingTitle } from '../settings'
 import Artboard from './components/Artboard'
 import ImageUploader from './components/ImageUploader'
 import PaintingsList from './components/PaintingsList'
+import ProviderSelect from './components/ProviderSelect'
 import {
   COURSE_URL,
   DEFAULT_PAINTING,
@@ -46,20 +46,6 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
   const [painting, setPainting] = useState<DmxapiPainting>(dmxapi_paintings?.[0] || DEFAULT_PAINTING)
   const { t } = useTranslation()
   const providers = useAllProviders()
-  const providerOptions = Options.map((option) => {
-    const provider = providers.find((p) => p.id === option)
-    if (provider) {
-      return {
-        label: getProviderLabel(provider.id),
-        value: provider.id
-      }
-    } else {
-      return {
-        label: 'Unknown Provider',
-        value: undefined
-      }
-    }
-  })
 
   const dmxapiProvider = providers.find((p) => p.id === 'dmxapi')!
 
@@ -785,9 +771,9 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
   return (
     <Container>
       <Navbar>
-        <NavbarCenter style={{ borderRight: 'none' }}>{t('paintings.title')}</NavbarCenter>
+        <NavbarCenter className="border-r-0">{t('paintings.title')}</NavbarCenter>
         {isMac && (
-          <NavbarRight style={{ justifyContent: 'flex-end' }}>
+          <NavbarRight className="justify-end">
             <Button size="small" className="nodrag" icon={<PlusOutlined />} onClick={createNewPainting}>
               {t('paintings.button.new.image')}
             </Button>
@@ -797,7 +783,7 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
       <ContentContainer id="content-container">
         <LeftContainer>
           <ProviderTitleContainer>
-            <SettingTitle style={{ marginBottom: 5 }}>{t('common.provider')}</SettingTitle>
+            <SettingTitle className="mb-1">{t('common.provider')}</SettingTitle>
             <div>
               <SettingHelpLink target="_blank" href={COURSE_URL}>
                 {t('paintings.paint_course')}
@@ -805,28 +791,19 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
               <SettingHelpLink target="_blank" href={TOP_UP_URL}>
                 {t('paintings.top_up')}
               </SettingHelpLink>
-              <ProviderLogo
-                shape="square"
-                src={getProviderLogo(dmxapiProvider.id)}
-                size={16}
-                style={{ marginLeft: 5 }}
-              />
+              <ProviderLogo shape="square" src={getProviderLogo(dmxapiProvider.id)} size={16} className="ml-1" />
             </div>
           </ProviderTitleContainer>
-          <Select value={providerOptions[3].value} onChange={handleProviderChange} style={{ marginBottom: 15 }}>
-            {providerOptions.map((provider) => (
-              <Select.Option value={provider.value} key={provider.value}>
-                <SelectOptionContainer>
-                  <ProviderLogo shape="square" src={getProviderLogo(provider.value || '')} size={16} />
-                  {provider.label}
-                </SelectOptionContainer>
-              </Select.Option>
-            ))}
-          </Select>
+          <ProviderSelect
+            provider={dmxapiProvider}
+            options={Options}
+            onChange={handleProviderChange}
+            className="mb-4"
+          />
           {painting.generationMode &&
             [generationModeType.EDIT, generationModeType.MERGE].includes(painting.generationMode) && (
               <>
-                <SettingTitle style={{ marginBottom: 5, marginTop: 15 }}>参考图</SettingTitle>
+                <SettingTitle className="mt-4 mb-1">参考图</SettingTitle>
                 <ImageUploader
                   fileMap={fileMap}
                   maxImages={painting.generationMode === generationModeType.EDIT ? 1 : 3}
@@ -838,13 +815,13 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
               </>
             )}
 
-          <SettingTitle style={{ marginBottom: 5, marginTop: 15 }}>
+          <SettingTitle className="mt-4 mb-1">
             {t('common.model')} <SettingPrice>{painting.priceModel !== '0' ? painting.priceModel : ''}</SettingPrice>
           </SettingTitle>
           <Select
             value={painting.model}
             onChange={onSelectModel}
-            style={{ width: '100%' }}
+            className="w-full"
             loading={isLoadingModels}
             placeholder={isLoadingModels ? t('common.loading') : t('paintings.select_model')}>
             {Object.entries(modelOptions).map(([provider, models]) => {
@@ -861,11 +838,11 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
             })}
           </Select>
 
-          <SettingTitle style={{ marginBottom: 5, marginTop: 15 }}>{t('paintings.image.size')}</SettingTitle>
+          <SettingTitle className="mt-4 mb-1">{t('paintings.image.size')}</SettingTitle>
           <Select
             value={isCustomSize ? 'custom' : painting.image_size}
             onChange={(value) => onSelectImageSize(value)}
-            style={{ width: '100%' }}>
+            className="w-full">
             {(() => {
               const currentModel = allModels.find((m) => m.id === painting.model)
               const modelImageSizes = currentModel?.image_sizes || []
@@ -874,7 +851,7 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
               return modelImageSizes.map((size) => {
                 return (
                   <Select.Option key={size.value} value={size.value}>
-                    <HStack style={{ alignItems: 'center', gap: 8 }}>
+                    <HStack className="items-center gap-2">
                       <span>{size.label}</span>
                     </HStack>
                   </Select.Option>
@@ -884,7 +861,7 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
             {/* 检查当前模型是否支持自定义尺寸 */}
             {allModels.find((m) => m.id === painting.model)?.is_custom_size && (
               <Select.Option value="custom" key="custom">
-                <HStack style={{ alignItems: 'center', gap: 8 }}>
+                <HStack className="items-center gap-2">
                   <span>{t('paintings.custom_size')}</span>
                 </HStack>
               </Select.Option>
@@ -893,7 +870,7 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
 
           {/* 自定义尺寸输入框 */}
           {isCustomSize && allModels.find((m) => m.id === painting.model)?.is_custom_size && (
-            <div style={{ marginTop: 10 }}>
+            <div className="mt-2.5">
               <HStack style={{ gap: 8, alignItems: 'center' }}>
                 <InputNumber
                   placeholder="W"
@@ -921,7 +898,7 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
 
           {painting.generationMode === generationModeType.GENERATION && (
             <>
-              <SettingTitle style={{ marginBottom: 5, marginTop: 15 }}>
+              <SettingTitle className="mt-4 mb-1">
                 {t('paintings.seed')}
                 <Tooltip title={t('paintings.seed_desc_tip')}>
                   <InfoIcon />
@@ -941,7 +918,7 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
             </>
           )}
 
-          <SettingTitle style={{ marginBottom: 5, marginTop: 15 }}>{t('paintings.style_type')}</SettingTitle>
+          <SettingTitle className="mt-4 mb-1">{t('paintings.style_type')}</SettingTitle>
           <SliderContainer>
             <RadioTextBox>
               {STYLE_TYPE_OPTIONS.map((ele) => (
@@ -955,7 +932,7 @@ const DmxapiPage: FC<{ Options: string[] }> = ({ Options }) => {
             </RadioTextBox>
           </SliderContainer>
 
-          <SettingTitle style={{ marginBottom: 5, marginTop: 15 }}>
+          <SettingTitle className="mt-4 mb-1">
             {t('paintings.auto_create_paint')}
             <Tooltip title={t('paintings.auto_create_paint_tip')}>
               <InfoIcon />
@@ -1032,11 +1009,6 @@ const ProviderTitleContainer = styled.div`
 const ProviderLogo = styled(Avatar)`
   border: 0.5px solid var(--color-border);
 `
-const SelectOptionContainer = styled.div`
-  display: flex;
-  align-items: center;
-  gap: 8px;
-`
 
 const ContentContainer = styled.div`
   display: flex;

src/renderer/src/pages/paintings/NewApiPage.tsx

@@ -6,7 +6,7 @@ import { Navbar, NavbarCenter, NavbarRight } from '@renderer/components/app/Navb
 import Scrollbar from '@renderer/components/Scrollbar'
 import TranslateButton from '@renderer/components/TranslateButton'
 import { isMac } from '@renderer/config/constant'
-import { getProviderLogo } from '@renderer/config/providers'
+import { getProviderLogo, isNewApiProvider, PROVIDER_URLS } from '@renderer/config/providers'
 import { LanguagesEnum } from '@renderer/config/translate'
 import { useTheme } from '@renderer/context/ThemeProvider'
 import { usePaintings } from '@renderer/hooks/usePaintings'
@@ -17,8 +17,7 @@ import {
   getPaintingsBackgroundOptionsLabel,
   getPaintingsImageSizeOptionsLabel,
   getPaintingsModerationOptionsLabel,
-  getPaintingsQualityOptionsLabel,
-  getProviderLabel
+  getPaintingsQualityOptionsLabel
 } from '@renderer/i18n/label'
 import PaintingsList from '@renderer/pages/paintings/components/PaintingsList'
 import { DEFAULT_PAINTING, MODELS, SUPPORTED_MODELS } from '@renderer/pages/paintings/config/NewApiConfig'
@@ -40,6 +39,7 @@ import styled from 'styled-components'
 import SendMessageButton from '../home/Inputbar/SendMessageButton'
 import { SettingHelpLink, SettingTitle } from '../settings'
 import Artboard from './components/Artboard'
+import ProviderSelect from './components/ProviderSelect'
 import { checkProviderEnabled } from './utils'
 
 const logger = loggerService.withContext('NewApiPage')
@@ -55,8 +55,7 @@ const NewApiPage: FC<{ Options: string[] }> = ({ Options }) => {
     }
   }, [openai_image_generate, openai_image_edit])
 
-  const filteredPaintings = useMemo(() => newApiPaintings[mode] || [], [newApiPaintings, mode])
-  const [painting, setPainting] = useState<PaintingAction>(filteredPaintings[0] || DEFAULT_PAINTING)
+  // moved below after newApiProvider is defined
   const [currentImageIndex, setCurrentImageIndex] = useState(0)
   const [isLoading, setIsLoading] = useState(false)
   const [abortController, setAbortController] = useState<AbortController | null>(null)
@@ -67,27 +66,22 @@ const NewApiPage: FC<{ Options: string[] }> = ({ Options }) => {
   const { t } = useTranslation()
   const { theme } = useTheme()
   const providers = useAllProviders()
-  const providerOptions = Options.map((option) => {
-    const provider = providers.find((p) => p.id === option)
-    if (provider) {
-      return {
-        label: getProviderLabel(provider.id),
-        value: provider.id
-      }
-    } else {
-      return {
-        label: 'Unknown Provider',
-        value: undefined
-      }
-    }
-  })
+  const location = useLocation()
+  const routeName = location.pathname.split('/').pop() || 'new-api'
+  const newApiProviders = providers.filter((p) => isNewApiProvider(p))
+
   const dispatch = useAppDispatch()
   const { generating } = useRuntime()
   const navigate = useNavigate()
-  const location = useLocation()
   const { autoTranslateWithSpace } = useSettings()
   const spaceClickTimer = useRef<NodeJS.Timeout>(null)
-  const newApiProvider = providers.find((p) => p.id === 'new-api')!
+  const newApiProvider = newApiProviders.find((p) => p.id === routeName) || newApiProviders[0]
+
+  const filteredPaintings = useMemo(
+    () => (newApiPaintings[mode] || []).filter((p) => p.providerId === newApiProvider.id),
+    [newApiPaintings, mode, newApiProvider.id]
+  )
+  const [painting, setPainting] = useState<PaintingAction>({ ...DEFAULT_PAINTING, providerId: newApiProvider.id })
 
   const modeOptions = [
     { label: t('paintings.mode.generate'), value: 'openai_image_generate' },
@@ -102,7 +96,7 @@ const NewApiPage: FC<{ Options: string[] }> = ({ Options }) => {
   }, [editImageFiles])
 
   const updatePaintingState = (updates: Partial<PaintingAction>) => {
-    const updatedPainting = { ...painting, ...updates }
+    const updatedPainting = { ...painting, providerId: newApiProvider.id, ...updates }
     setPainting(updatedPainting)
     updatePainting(mode, updatedPainting)
   }
@@ -138,9 +132,10 @@ const NewApiPage: FC<{ Options: string[] }> = ({ Options }) => {
     return {
       ...DEFAULT_PAINTING,
       model: painting.model || modelOptions[0]?.value || '',
-      id: uuid()
+      id: uuid(),
+      providerId: newApiProvider.id
     }
-  }, [modelOptions, painting.model])
+  }, [modelOptions, painting.model, newApiProvider.id])
 
   const selectedModelConfig = useMemo(
     () => MODELS.find((m) => m.name === painting.model) || MODELS[0],
@@ -444,11 +439,10 @@ const NewApiPage: FC<{ Options: string[] }> = ({ Options }) => {
   // 处理模式切换
   const handleModeChange = (value: string) => {
     setMode(value as keyof PaintingsState)
-    if (newApiPaintings[value as keyof PaintingsState] && newApiPaintings[value as keyof PaintingsState].length > 0) {
-      setPainting(newApiPaintings[value as keyof PaintingsState][0])
-    } else {
-      setPainting(DEFAULT_PAINTING)
-    }
+    const list = (newApiPaintings[value as keyof PaintingsState] || []).filter(
+      (p) => p.providerId === newApiProvider.id
+    )
+    setPainting(list[0] || { ...DEFAULT_PAINTING, providerId: newApiProvider.id })
   }
 
   // 渲染配置项的函数
@@ -473,8 +467,10 @@ const NewApiPage: FC<{ Options: string[] }> = ({ Options }) => {
       const newPainting = getNewPainting()
       addPainting(mode, newPainting)
       setPainting(newPainting)
+    } else {
+      setPainting(filteredPaintings[0])
     }
-  }, [filteredPaintings, mode, addPainting, painting, getNewPainting])
+  }, [filteredPaintings, mode, addPainting, getNewPainting])
 
   useEffect(() => {
     const timer = spaceClickTimer.current
@@ -501,7 +497,9 @@ const NewApiPage: FC<{ Options: string[] }> = ({ Options }) => {
         <LeftContainer>
           <ProviderTitleContainer>
             <SettingTitle style={{ marginBottom: 5 }}>{t('common.provider')}</SettingTitle>
-            <SettingHelpLink target="_blank" href={'https://docs.newapi.pro/apps/cherry-studio/'}>
+            <SettingHelpLink
+              target="_blank"
+              href={PROVIDER_URLS[newApiProvider.id]?.websites?.docs || 'https://docs.newapi.pro/apps/cherry-studio/'}>
               {t('paintings.learn_more')}
               <ProviderLogo
                 shape="square"
@@ -512,19 +510,7 @@ const NewApiPage: FC<{ Options: string[] }> = ({ Options }) => {
             </SettingHelpLink>
           </ProviderTitleContainer>
 
-          <Select
-            value={providerOptions.find((p) => p.value === 'new-api')?.value}
-            onChange={handleProviderChange}
-            style={{ width: '100%' }}>
-            {providerOptions.map((provider) => (
-              <Select.Option value={provider.value} key={provider.value}>
-                <SelectOptionContainer>
-                  <ProviderLogo shape="square" src={getProviderLogo(provider.value || '')} size={16} />
-                  {provider.label}
-                </SelectOptionContainer>
-              </Select.Option>
-            ))}
-          </Select>
+          <ProviderSelect provider={newApiProvider} options={Options} onChange={handleProviderChange} />
 
           {/* 当没有可用的 Image Generation 模型时，提示用户先去新增 */}
           {modelOptions.length === 0 && (
@@ -792,20 +778,12 @@ const ProviderLogo = styled(Avatar)`
   border: 0.5px solid var(--color-border);
 `
 
-// 添加新的样式组件
 const ModeSegmentedContainer = styled.div`
   display: flex;
   justify-content: center;
   padding-top: 24px;
 `
 
-const SelectOptionContainer = styled.div`
-  display: flex;
-  align-items: center;
-  gap: 8px;
-`
-
-// 添加新的样式组件
 const ProviderTitleContainer = styled.div`
   display: flex;
   justify-content: space-between;

src/renderer/src/pages/paintings/PaintingsRoutePage.tsx

@@ -1,8 +1,10 @@
 import { loggerService } from '@logger'
+import { isNewApiProvider } from '@renderer/config/providers'
+import { useAllProviders } from '@renderer/hooks/useProvider'
 import { useAppDispatch } from '@renderer/store'
 import { setDefaultPaintingProvider } from '@renderer/store/settings'
-import { PaintingProvider } from '@renderer/types'
-import { FC, useEffect } from 'react'
+import { PaintingProvider, SystemProviderId } from '@renderer/types'
+import { FC, useEffect, useMemo } from 'react'
 import { Route, Routes, useParams } from 'react-router-dom'
 
 import AihubmixPage from './AihubmixPage'
@@ -14,19 +16,23 @@ import ZhipuPage from './ZhipuPage'
 
 const logger = loggerService.withContext('PaintingsRoutePage')
 
-const Options = ['zhipu', 'aihubmix', 'silicon', 'dmxapi', 'tokenflux', 'new-api']
+const BASE_OPTIONS: SystemProviderId[] = ['zhipu', 'aihubmix', 'silicon', 'dmxapi', 'tokenflux']
 
 const PaintingsRoutePage: FC = () => {
   const params = useParams()
   const provider = params['*']
   const dispatch = useAppDispatch()
+  const providers = useAllProviders()
+  const Options = useMemo(() => {
+    return [...BASE_OPTIONS, ...providers.filter((p) => isNewApiProvider(p)).map((p) => p.id)]
+  }, [providers])
 
   useEffect(() => {
     logger.debug(`defaultPaintingProvider: ${provider}`)
     if (provider && Options.includes(provider)) {
       dispatch(setDefaultPaintingProvider(provider as PaintingProvider))
     }
-  }, [provider, dispatch])
+  }, [provider, dispatch, Options])
 
   return (
     <Routes>
@@ -36,7 +42,12 @@ const PaintingsRoutePage: FC = () => {
       <Route path="/silicon" element={<SiliconPage Options={Options} />} />
       <Route path="/dmxapi" element={<DmxapiPage Options={Options} />} />
       <Route path="/tokenflux" element={<TokenFluxPage Options={Options} />} />
-      <Route path="/new-api" element={<NewApiPage Options={Options} />} />
+      {/* new-api family providers are mounted dynamically below */}
+      {providers
+        .filter((p) => isNewApiProvider(p))
+        .map((p) => (
+          <Route key={p.id} path={`/${p.id}`} element={<NewApiPage Options={Options} />} />
+        ))}
     </Routes>
   )
 }

src/renderer/src/pages/paintings/SiliconPage.tsx

@@ -12,14 +12,12 @@ import { HStack, VStack } from '@renderer/components/Layout'
 import Scrollbar from '@renderer/components/Scrollbar'
 import TranslateButton from '@renderer/components/TranslateButton'
 import { isMac } from '@renderer/config/constant'
-import { getProviderLogo } from '@renderer/config/providers'
 import { LanguagesEnum } from '@renderer/config/translate'
 import { useTheme } from '@renderer/context/ThemeProvider'
 import { usePaintings } from '@renderer/hooks/usePaintings'
 import { useAllProviders } from '@renderer/hooks/useProvider'
 import { useRuntime } from '@renderer/hooks/useRuntime'
 import { useSettings } from '@renderer/hooks/useSettings'
-import { getProviderLabel } from '@renderer/i18n/label'
 import { getProviderByModel } from '@renderer/services/AssistantService'
 import FileManager from '@renderer/services/FileManager'
 import { translateText } from '@renderer/services/TranslateService'
@@ -27,7 +25,7 @@ import { useAppDispatch } from '@renderer/store'
 import { setGenerating } from '@renderer/store/runtime'
 import type { FileMetadata, Painting } from '@renderer/types'
 import { getErrorMessage, uuid } from '@renderer/utils'
-import { Avatar, Button, Input, InputNumber, Radio, Select, Slider, Switch, Tooltip } from 'antd'
+import { Button, Input, InputNumber, Radio, Select, Slider, Switch, Tooltip } from 'antd'
 import TextArea from 'antd/es/input/TextArea'
 import { Info } from 'lucide-react'
 import type { FC } from 'react'
@@ -40,6 +38,7 @@ import SendMessageButton from '../home/Inputbar/SendMessageButton'
 import { SettingTitle } from '../settings'
 import Artboard from './components/Artboard'
 import PaintingsList from './components/PaintingsList'
+import ProviderSelect from './components/ProviderSelect'
 import { checkProviderEnabled } from './utils'
 
 export const TEXT_TO_IMAGES_MODELS = [
@@ -115,22 +114,8 @@ const SiliconPage: FC<{ Options: string[] }> = ({ Options }) => {
   const [painting, setPainting] = useState<Painting>(siliconflow_paintings[0] || DEFAULT_PAINTING)
   const { theme } = useTheme()
   const providers = useAllProviders()
-  const providerOptions = Options.map((option) => {
-    const provider = providers.find((p) => p.id === option)
-    if (provider) {
-      return {
-        label: getProviderLabel(provider.id),
-        value: provider.id
-      }
-    } else {
-      return {
-        label: 'Unknown Provider',
-        value: undefined
-      }
-    }
-  })
 
-  const siliconflowProvider = providers.find((p) => p.id === 'silicon')
+  const siliconFlowProvider = providers.find((p) => p.id === 'silicon')!
   const [currentImageIndex, setCurrentImageIndex] = useState(0)
 
   const [isLoading, setIsLoading] = useState(false)
@@ -170,7 +155,7 @@ const SiliconPage: FC<{ Options: string[] }> = ({ Options }) => {
   }
 
   const onGenerate = async () => {
-    await checkProviderEnabled(siliconflowProvider!, t)
+    await checkProviderEnabled(siliconFlowProvider!, t)
 
     if (painting.files.length > 0) {
       const confirmed = await window.modal.confirm({
@@ -389,17 +374,8 @@ const SiliconPage: FC<{ Options: string[] }> = ({ Options }) => {
       <ContentContainer id="content-container">
         <LeftContainer>
           <SettingTitle style={{ marginBottom: 5 }}>{t('common.provider')}</SettingTitle>
-          <Select value={providerOptions[2].value} onChange={handleProviderChange}>
-            {providerOptions.map((provider) => (
-              <Select.Option value={provider.value} key={provider.value}>
-                <SelectOptionContainer>
-                  <ProviderLogo shape="square" src={getProviderLogo(provider.value || '')} size={16} />
-                  {provider.label}
-                </SelectOptionContainer>
-              </Select.Option>
-            ))}
-          </Select>
-          <SettingTitle style={{ marginBottom: 5, marginTop: 15 }}>{t('common.model')}</SettingTitle>
+          <ProviderSelect provider={siliconFlowProvider} options={Options} onChange={handleProviderChange} />
+          <SettingTitle className="mt-4 mb-1">{t('common.model')}</SettingTitle>
           <Select value={painting.model} options={modelOptions} onChange={onSelectModel} />
           <SettingTitle style={{ marginBottom: 5, marginTop: 15 }}>{t('paintings.image.size')}</SettingTitle>
           <Radio.Group
@@ -672,14 +648,4 @@ const StyledInputNumber = styled(InputNumber)`
   width: 70px;
 `
 
-const SelectOptionContainer = styled.div`
-  display: flex;
-  align-items: center;
-  gap: 8px;
-`
-
-const ProviderLogo = styled(Avatar)`
-  flex-shrink: 0;
-`
-
 export default SiliconPage

src/renderer/src/pages/paintings/TokenFluxPage.tsx

@@ -10,7 +10,6 @@ import { usePaintings } from '@renderer/hooks/usePaintings'
 import { useAllProviders } from '@renderer/hooks/useProvider'
 import { useRuntime } from '@renderer/hooks/useRuntime'
 import { useSettings } from '@renderer/hooks/useSettings'
-import { getProviderLabel } from '@renderer/i18n/label'
 import FileManager from '@renderer/services/FileManager'
 import { translateText } from '@renderer/services/TranslateService'
 import { useAppDispatch } from '@renderer/store'
@@ -31,6 +30,7 @@ import { SettingHelpLink, SettingTitle } from '../settings'
 import Artboard from './components/Artboard'
 import { DynamicFormRender } from './components/DynamicFormRender'
 import PaintingsList from './components/PaintingsList'
+import ProviderSelect from './components/ProviderSelect'
 import { DEFAULT_TOKENFLUX_PAINTING, type TokenFluxModel } from './config/tokenFluxConfig'
 import { checkProviderEnabled } from './utils'
 import TokenFluxService from './utils/TokenFluxService'
@@ -55,21 +55,6 @@ const TokenFluxPage: FC<{ Options: string[] }> = ({ Options }) => {
     tokenFluxPaintings[0] || { ...DEFAULT_TOKENFLUX_PAINTING, id: uuid() }
   )
 
-  const providerOptions = Options.map((option) => {
-    const provider = providers.find((p) => p.id === option)
-    if (provider) {
-      return {
-        label: getProviderLabel(provider.id),
-        value: provider.id
-      }
-    } else {
-      return {
-        label: 'Unknown Provider',
-        value: undefined
-      }
-    }
-  })
-
   const dispatch = useAppDispatch()
   const { generating } = useRuntime()
   const navigate = useNavigate()
@@ -387,19 +372,7 @@ const TokenFluxPage: FC<{ Options: string[] }> = ({ Options }) => {
             </SettingHelpLink>
           </ProviderTitleContainer>
 
-          <Select
-            value={providerOptions.find((p) => p.value === 'tokenflux')?.value}
-            onChange={handleProviderChange}
-            style={{ width: '100%' }}>
-            {providerOptions.map((provider) => (
-              <Select.Option value={provider.value} key={provider.value}>
-                <SelectOptionContainer>
-                  <ProviderLogo shape="square" src={getProviderLogo(provider.value || '')} size={16} />
-                  {provider.label}
-                </SelectOptionContainer>
-              </Select.Option>
-            ))}
-          </Select>
+          <ProviderSelect provider={tokenfluxProvider} options={Options} onChange={handleProviderChange} />
 
           {/* Model & Pricing Section */}
           <SectionTitle
@@ -775,11 +748,4 @@ const ProviderTitleContainer = styled.div`
   align-items: center;
   margin-bottom: 5px;
 `
-
-const SelectOptionContainer = styled.div`
-  display: flex;
-  align-items: center;
-  gap: 8px;
-`
-
 export default TokenFluxPage

src/renderer/src/pages/paintings/ZhipuPage.tsx

@@ -8,7 +8,6 @@ import { getProviderLogo } from '@renderer/config/providers'
 import { usePaintings } from '@renderer/hooks/usePaintings'
 import { useAllProviders } from '@renderer/hooks/useProvider'
 import { useRuntime } from '@renderer/hooks/useRuntime'
-import { getProviderLabel } from '@renderer/i18n/label'
 import FileManager from '@renderer/services/FileManager'
 import { useAppDispatch } from '@renderer/store'
 import { setGenerating } from '@renderer/store/runtime'
@@ -24,6 +23,7 @@ import SendMessageButton from '../home/Inputbar/SendMessageButton'
 import { SettingHelpLink, SettingTitle } from '../settings'
 import Artboard from './components/Artboard'
 import PaintingsList from './components/PaintingsList'
+import ProviderSelect from './components/ProviderSelect'
 import {
   COURSE_URL,
   DEFAULT_PAINTING,
@@ -50,21 +50,6 @@ const ZhipuPage: FC<{ Options: string[] }> = ({ Options }) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [painting?.id]) // 只在painting的id改变时执行，避免无限循环
 
-  const providerOptions = Options.map((option) => {
-    const provider = providers.find((p) => p.id === option)
-    if (provider) {
-      return {
-        label: getProviderLabel(provider.id),
-        value: provider.id
-      }
-    } else {
-      return {
-        label: 'Unknown Provider',
-        value: undefined
-      }
-    }
-  })
-
   const zhipuProvider = providers.find((p) => p.id === 'zhipu')!
 
   const [currentImageIndex, setCurrentImageIndex] = useState(0)
@@ -370,16 +355,7 @@ const ZhipuPage: FC<{ Options: string[] }> = ({ Options }) => {
               />
             </div>
           </ProviderTitleContainer>
-          <Select value={providerOptions[0].value} onChange={handleProviderChange} style={{ marginBottom: 15 }}>
-            {providerOptions.map((provider) => (
-              <Select.Option value={provider.value} key={provider.value}>
-                <SelectOptionContainer>
-                  <ProviderLogo shape="square" src={getProviderLogo(provider.value || '')} size={16} />
-                  {provider.label}
-                </SelectOptionContainer>
-              </Select.Option>
-            ))}
-          </Select>
+          <ProviderSelect provider={zhipuProvider} options={Options} onChange={handleProviderChange} className="mb-4" />
 
           <SettingTitle style={{ marginBottom: 5, marginTop: 15 }}>{t('common.model')}</SettingTitle>
           <Select
@@ -563,12 +539,6 @@ const ProviderTitleContainer = styled.div`
   margin-bottom: 10px;
 `
 
-const SelectOptionContainer = styled.div`
-  display: flex;
-  align-items: center;
-  gap: 8px;
-`
-
 const ProviderLogo = styled(Avatar)`
   border-radius: 4px;
 `

src/renderer/src/pages/paintings/components/ProviderSelect.tsx

@@ -0,0 +1,99 @@
+import { Select, SelectItem } from '@heroui/react'
+import { ProviderAvatarPrimitive } from '@renderer/components/ProviderAvatar'
+import { getProviderLogo } from '@renderer/config/providers'
+import ImageStorage from '@renderer/services/ImageStorage'
+import { getProviderNameById } from '@renderer/services/ProviderService'
+import { Provider } from '@types'
+import React, { FC, useEffect, useState } from 'react'
+
+type ProviderSelectProps = {
+  provider: Provider
+  options: string[]
+  onChange: (value: string) => void
+  style?: React.CSSProperties
+  className?: string
+}
+
+const ProviderSelect: FC<ProviderSelectProps> = ({ provider, options, onChange, style, className }) => {
+  const [customLogos, setCustomLogos] = useState<Record<string, string>>({})
+
+  useEffect(() => {
+    const loadLogos = async () => {
+      const logos: Record<string, string> = {}
+      for (const providerId of options) {
+        try {
+          const logoData = await ImageStorage.get(`provider-${providerId}`)
+          if (logoData) {
+            logos[providerId] = logoData
+          }
+        } catch (error) {
+          // Ignore errors for providers without custom logos
+        }
+      }
+      setCustomLogos(logos)
+    }
+
+    loadLogos()
+  }, [options])
+
+  const getProviderLogoSrc = (providerId: string) => {
+    const systemLogo = getProviderLogo(providerId)
+    if (systemLogo) {
+      return systemLogo
+    }
+    return customLogos[providerId]
+  }
+
+  const providerOptions = options.map((option) => {
+    return {
+      label: getProviderNameById(option),
+      value: option
+    }
+  })
+
+  return (
+    <Select
+      selectedKeys={[provider.id]}
+      onSelectionChange={(keys) => {
+        const selectedKey = Array.from(keys)[0] as string
+        onChange(selectedKey)
+      }}
+      style={style}
+      className={`w-full ${className || ''}`}
+      renderValue={(items) => {
+        return items.map((item) => (
+          <div key={item.key} className="flex items-center gap-2">
+            <div className="flex h-4 w-4 items-center justify-center">
+              <ProviderAvatarPrimitive
+                providerId={item.key as string}
+                providerName={item.textValue || ''}
+                logoSrc={getProviderLogoSrc(item.key as string)}
+                size={16}
+              />
+            </div>
+            <span>{item.textValue}</span>
+          </div>
+        ))
+      }}>
+      {providerOptions.map((providerOption) => (
+        <SelectItem
+          key={providerOption.value}
+          textValue={providerOption.label}
+          startContent={
+            <div className="flex h-4 w-4 items-center justify-center">
+              <ProviderAvatarPrimitive
+                providerId={providerOption.value}
+                providerName={providerOption.label}
+                logoSrc={getProviderLogoSrc(providerOption.value)}
+                size={16}
+              />
+            </div>
+          }>
+          {providerOption.label}
+        </SelectItem>
+      ))}
+    </Select>
+  )
+}
+
+export default ProviderSelect