Merge branch 'main' of github.com:CherryHQ/cherry-studio into v2

2025-12-28 13:31:32 +08:00 · 2025-10-13 23:18:32 +08:00 · 2025-10-13 23:18:32 +08:00 · 742f901052
commit 742f901052
parent cb12bb5137 0d760ffa2e
88 changed files with 2084 additions and 1201 deletions
--- a/.github/workflows/claude-translator.yml
+++ b/.github/workflows/claude-translator.yml
@ -16,10 +16,13 @@ on:
 jobs:
  translate:
    if: |
-      (github.event_name == 'issues') ||
-      (github.event_name == 'issue_comment' && github.event.sender.type != 'Bot') ||
-      (github.event_name == 'pull_request_review' && github.event.sender.type != 'Bot') ||
-      (github.event_name == 'pull_request_review_comment' && github.event.sender.type != 'Bot')
+      (github.event_name == 'issues')
+      || (github.event_name == 'issue_comment' && github.event.sender.type != 'Bot')
+      || (
+        (github.event_name == 'pull_request_review' || github.event_name == 'pull_request_review_comment')
+        && github.event.sender.type != 'Bot'
+        && github.event.pull_request.head.repo.fork == false
+      )
    runs-on: ubuntu-latest
    permissions:
      contents: read
--- a/.yarn/patches/@ai-sdk-google-npm-2.0.20-b9102f9d54.patch
+++ b/.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 110f37ec18c98b1d55ae2b73cc716194e6f9094d..17e109b7778cbebb904f1919e768d21a2833d965 100644
+index 69ab1599c76801dc1167551b6fa283dded123466..f0af43bba7ad1196fe05338817e65b4ebda40955 100644
 --- a/dist/index.mjs
 +++ b/dist/index.mjs
-@@ -448,7 +448,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
+@@ -477,7 +477,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
 
 // src/get-model-path.ts
 function getModelPath(modelId) {
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@ -2,6 +2,7 @@ import tseslint from '@electron-toolkit/eslint-config-ts'
 import eslint from '@eslint/js'
 import eslintReact from '@eslint-react/eslint-plugin'
 import { defineConfig } from 'eslint/config'
+import importZod from 'eslint-plugin-import-zod'
 import oxlint from 'eslint-plugin-oxlint'
 import reactHooks from 'eslint-plugin-react-hooks'
 import simpleImportSort from 'eslint-plugin-simple-import-sort'
@ -15,7 +16,8 @@ export default defineConfig([
  {
    plugins: {
      'simple-import-sort': simpleImportSort,
-      'unused-imports': unusedImports
+      'unused-imports': unusedImports,
+      'import-zod': importZod
    },
    rules: {
      '@typescript-eslint/explicit-function-return-type': 'off',
@ -25,6 +27,7 @@ export default defineConfig([
      'simple-import-sort/exports': 'error',
      'unused-imports/no-unused-imports': 'error',
      '@eslint-react/no-prop-types': 'error',
+      'import-zod/prefer-zod-namespace': 'error'
    }
  },
  // Configuration for ensuring compatibility with the original ESLint(8.x) rules
--- a/package.json
+++ b/package.json
@ -101,10 +101,10 @@
    "@agentic/exa": "^7.3.3",
    "@agentic/searxng": "^7.3.3",
    "@agentic/tavily": "^7.3.3",
-    "@ai-sdk/amazon-bedrock": "^3.0.29",
-    "@ai-sdk/google-vertex": "^3.0.33",
-    "@ai-sdk/mistral": "^2.0.17",
-    "@ai-sdk/perplexity": "^2.0.11",
+    "@ai-sdk/amazon-bedrock": "^3.0.35",
+    "@ai-sdk/google-vertex": "^3.0.40",
+    "@ai-sdk/mistral": "^2.0.19",
+    "@ai-sdk/perplexity": "^2.0.13",
    "@ant-design/v5-patch-for-react-19": "^1.0.3",
    "@anthropic-ai/sdk": "^0.41.0",
    "@anthropic-ai/vertex-sdk": "patch:@anthropic-ai/vertex-sdk@npm%3A0.11.4#~/.yarn/patches/@anthropic-ai-vertex-sdk-npm-0.11.4-c19cb41edb.patch",
@ -154,6 +154,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",
    "@playwright/test": "^1.52.0",
    "@radix-ui/react-context-menu": "^2.2.16",
    "@reduxjs/toolkit": "^2.2.5",
@ -221,7 +222,7 @@
    "@viz-js/lang-dot": "^1.0.5",
    "@viz-js/viz": "^3.14.0",
    "@xyflow/react": "^12.4.4",
-    "ai": "^5.0.59",
+    "ai": "^5.0.68",
    "antd": "patch:antd@npm%3A5.27.0#~/.yarn/patches/antd-npm-5.27.0-aa91c36546.patch",
    "archiver": "^7.0.1",
    "async-mutex": "^0.5.0",
@ -258,6 +259,7 @@
    "emoji-picker-element": "^1.22.1",
    "epub": "patch:epub@npm%3A1.3.0#~/.yarn/patches/epub-npm-1.3.0-8325494ffe.patch",
    "eslint": "^9.22.0",
+    "eslint-plugin-import-zod": "^1.2.0",
    "eslint-plugin-oxlint": "^1.15.0",
    "eslint-plugin-react-hooks": "^5.2.0",
    "eslint-plugin-simple-import-sort": "^12.1.1",
@ -296,7 +298,7 @@
    "notion-helper": "^1.3.22",
    "npx-scope-finder": "^1.2.0",
    "openai": "patch:openai@npm%3A5.12.2#~/.yarn/patches/openai-npm-5.12.2-30b075401c.patch",
-    "oxlint": "^1.15.0",
+    "oxlint": "^1.22.0",
    "oxlint-tsgolint": "^0.2.0",
    "p-queue": "^8.1.0",
    "pdf-lib": "^1.17.1",
@ -372,6 +374,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 +382,11 @@
    "openai@npm:^4.87.3": "patch:openai@npm%3A5.12.2#~/.yarn/patches/openai-npm-5.12.2-30b075401c.patch",
    "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.14": "patch:@ai-sdk/google@npm%3A2.0.14#~/.yarn/patches/@ai-sdk-google-npm-2.0.14-376d8b03cc.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": {
--- a/packages/aiCore/package.json
+++ b/packages/aiCore/package.json
@ -36,14 +36,14 @@
    "ai": "^5.0.26"
  },
  "dependencies": {
-    "@ai-sdk/anthropic": "^2.0.22",
-    "@ai-sdk/azure": "^2.0.42",
-    "@ai-sdk/deepseek": "^1.0.20",
-    "@ai-sdk/openai": "^2.0.42",
-    "@ai-sdk/openai-compatible": "^1.0.19",
+    "@ai-sdk/anthropic": "^2.0.27",
+    "@ai-sdk/azure": "^2.0.49",
+    "@ai-sdk/deepseek": "^1.0.23",
+    "@ai-sdk/openai": "^2.0.48",
+    "@ai-sdk/openai-compatible": "^1.0.22",
    "@ai-sdk/provider": "^2.0.0",
-    "@ai-sdk/provider-utils": "^3.0.10",
-    "@ai-sdk/xai": "^2.0.23",
+    "@ai-sdk/provider-utils": "^3.0.12",
+    "@ai-sdk/xai": "^2.0.26",
    "zod": "^4.1.5"
  },
  "devDependencies": {
--- a/packages/aiCore/src/core/plugins/built-in/webSearchPlugin/helper.ts
+++ b/packages/aiCore/src/core/plugins/built-in/webSearchPlugin/helper.ts
@ -1,7 +1,7 @@
 import type { anthropic } from '@ai-sdk/anthropic'
 import type { google } from '@ai-sdk/google'
 import type { openai } from '@ai-sdk/openai'
-import type { InferToolInput, InferToolOutput } from 'ai'
+import type { InferToolInput, InferToolOutput, Tool } from 'ai'

 import type { ProviderOptionsMap } from '../../../options/types'
 import type { OpenRouterSearchConfig } from './openrouter'
@ -15,6 +15,13 @@ export type AnthropicSearchConfig = NonNullable<Parameters<typeof anthropic.tool
 export type GoogleSearchConfig = NonNullable<Parameters<typeof google.tools.googleSearch>[0]>
 export type XAISearchConfig = NonNullable<ProviderOptionsMap['xai']['searchParameters']>

+type NormalizeTool<T> = T extends Tool<infer INPUT, infer OUTPUT> ? Tool<INPUT, OUTPUT> : Tool<any, any>
+
+type AnthropicWebSearchTool = NormalizeTool<ReturnType<typeof anthropic.tools.webSearch_20250305>>
+type OpenAIWebSearchTool = NormalizeTool<ReturnType<typeof openai.tools.webSearch>>
+type OpenAIChatWebSearchTool = NormalizeTool<ReturnType<typeof openai.tools.webSearchPreview>>
+type GoogleWebSearchTool = NormalizeTool<ReturnType<typeof google.tools.googleSearch>>
+
 /**
 * 插件初始化时接收的完整配置对象
 *
@ -59,7 +66,7 @@ export const DEFAULT_WEB_SEARCH_CONFIG: WebSearchPluginConfig = {

 export type WebSearchToolOutputSchema = {
  // Anthropic 工具 - 手动定义
-  anthropic: InferToolOutput<ReturnType<typeof anthropic.tools.webSearch_20250305>>
+  anthropic: InferToolOutput<AnthropicWebSearchTool>

  // OpenAI 工具 - 基于实际输出
  // TODO: 上游定义不规范,是unknown
@ -82,8 +89,8 @@ export type WebSearchToolOutputSchema = {
 }

 export type WebSearchToolInputSchema = {
-  anthropic: InferToolInput<ReturnType<typeof anthropic.tools.webSearch_20250305>>
-  openai: InferToolInput<ReturnType<typeof openai.tools.webSearch>>
-  google: InferToolInput<ReturnType<typeof google.tools.googleSearch>>
-  'openai-chat': InferToolInput<ReturnType<typeof openai.tools.webSearchPreview>>
+  anthropic: InferToolInput<AnthropicWebSearchTool>
+  openai: InferToolInput<OpenAIWebSearchTool>
+  google: InferToolInput<GoogleWebSearchTool>
+  'openai-chat': InferToolInput<OpenAIChatWebSearchTool>
 }
--- a/packages/aiCore/src/core/providers/schemas.ts
+++ b/packages/aiCore/src/core/providers/schemas.ts
@ -14,7 +14,7 @@ import { createXai } from '@ai-sdk/xai'
 import { createOpenRouter } from '@openrouter/ai-sdk-provider'
 import type { Provider } from 'ai'
 import { customProvider } from 'ai'
-import { z } from 'zod'
+import * as z from 'zod'

 /**
 * 基础 Provider IDs
--- a/packages/shared/IpcChannel.ts
+++ b/packages/shared/IpcChannel.ts
@ -53,6 +53,7 @@ export enum IpcChannel {

  Webview_SetOpenLinkExternal = 'webview:set-open-link-external',
  Webview_SetSpellCheckEnabled = 'webview:set-spell-check-enabled',
+  Webview_SearchHotkey = 'webview:search-hotkey',

  // Open
  Open_Path = 'open:path',
--- a/packages/shared/config/types.ts
+++ b/packages/shared/config/types.ts
@ -22,3 +22,12 @@ export type MCPProgressEvent = {
  callId: string
  progress: number // 0-1 range
 }
+
+export type WebviewKeyEvent = {
+  webviewId: number
+  key: string
+  control: boolean
+  meta: boolean
+  shift: boolean
+  alt: boolean
+}
--- a/src/main/index.ts
+++ b/src/main/index.ts
@ -35,6 +35,7 @@ import { windowService } from './services/WindowService'
 import { dataRefactorMigrateService } from './data/migrate/dataRefactor/DataRefactorMigrateService'
 import { dataApiService } from '@data/DataApiService'
 import { cacheService } from '@data/CacheService'
+import { initWebviewHotkeys } from './services/WebviewService'

 const logger = loggerService.withContext('MainEntry')

@ -187,6 +188,7 @@ if (!app.requestSingleInstanceLock()) {

    /************FOR TESTING ONLY END****************/

+    initWebviewHotkeys()
    // Set app user model id for windows
    electronApp.setAppUserModelId(import.meta.env.VITE_MAIN_BUNDLE_ID || 'com.kangfenmao.CherryStudio')

--- a/src/main/ipc.ts
+++ b/src/main/ipc.ts
@ -786,7 +786,6 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
  ipcMain.handle(IpcChannel.Webview_SetOpenLinkExternal, (_, webviewId: number, isExternal: boolean) =>
    setOpenLinkExternal(webviewId, isExternal)
  )
-
  ipcMain.handle(IpcChannel.Webview_SetSpellCheckEnabled, (_, webviewId: number, isEnable: boolean) => {
    const webview = webContents.fromId(webviewId)
    if (!webview) return
--- a/src/main/mcpServers/dify-knowledge.ts
+++ b/src/main/mcpServers/dify-knowledge.ts
@ -3,7 +3,7 @@ import { loggerService } from '@logger'
 import { Server } from '@modelcontextprotocol/sdk/server/index.js'
 import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
 import { net } from 'electron'
-import { z } from 'zod'
+import * as z from 'zod'

 const logger = loggerService.withContext('DifyKnowledgeServer')

--- a/src/main/mcpServers/fetch.ts
+++ b/src/main/mcpServers/fetch.ts
@ -5,7 +5,7 @@ import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprot
 import { net } from 'electron'
 import { JSDOM } from 'jsdom'
 import TurndownService from 'turndown'
-import { z } from 'zod'
+import * as z from 'zod'

 export const RequestPayloadSchema = z.object({
  url: z.url(),
--- a/src/main/mcpServers/filesystem.ts
+++ b/src/main/mcpServers/filesystem.ts
@ -8,7 +8,7 @@ import fs from 'fs/promises'
 import { minimatch } from 'minimatch'
 import os from 'os'
 import path from 'path'
-import { z } from 'zod'
+import * as z from 'zod'

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

--- a/src/main/services/WebviewService.ts
+++ b/src/main/services/WebviewService.ts
@ -1,4 +1,5 @@
-import { session, shell, webContents } from 'electron'
+import { IpcChannel } from '@shared/IpcChannel'
+import { app, session, shell, webContents } from 'electron'

 /**
 * init the useragent of the webview session
@ -36,3 +37,61 @@ export function setOpenLinkExternal(webviewId: number, isExternal: boolean) {
    }
  })
 }
+
+const attachKeyboardHandler = (contents: Electron.WebContents) => {
+  if (contents.getType?.() !== 'webview') {
+    return
+  }
+
+  const handleBeforeInput = (event: Electron.Event, input: Electron.Input) => {
+    if (!input) {
+      return
+    }
+
+    const key = input.key?.toLowerCase()
+    if (!key) {
+      return
+    }
+
+    const isFindShortcut = (input.control || input.meta) && key === 'f'
+    const isEscape = key === 'escape'
+    const isEnter = key === 'enter'
+
+    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
+    }
+
+    host.send(IpcChannel.Webview_SearchHotkey, {
+      webviewId: contents.id,
+      key,
+      control: Boolean(input.control),
+      meta: Boolean(input.meta),
+      shift: Boolean(input.shift),
+      alt: Boolean(input.alt)
+    })
+  }
+
+  contents.on('before-input-event', handleBeforeInput)
+  contents.once('destroyed', () => {
+    contents.removeListener('before-input-event', handleBeforeInput)
+  })
+}
+
+export function initWebviewHotkeys() {
+  webContents.getAllWebContents().forEach((contents) => {
+    if (contents.isDestroyed()) return
+    attachKeyboardHandler(contents)
+  })
+
+  app.on('web-contents-created', (_, contents) => {
+    attachKeyboardHandler(contents)
+  })
+}
--- a/src/main/services/mcp/oauth/types.ts
+++ b/src/main/services/mcp/oauth/types.ts
@ -4,7 +4,7 @@ import type {
  OAuthTokens
 } from '@modelcontextprotocol/sdk/shared/auth.js'
 import type EventEmitter from 'events'
-import { z } from 'zod'
+import * as z from 'zod'

 export interface OAuthStorageData {
  clientInfo?: OAuthClientInformation
--- a/src/main/services/ocr/builtin/PpocrService.ts
+++ b/src/main/services/ocr/builtin/PpocrService.ts
@ -2,7 +2,7 @@ import { loadOcrImage } from '@main/utils/ocr'
 import type { ImageFileMetadata, OcrPpocrConfig, OcrResult, SupportedOcrFile } from '@types'
 import { isImageFileMetadata } from '@types'
 import { net } from 'electron'
-import { z } from 'zod'
+import * as z from 'zod'

 import { OcrBaseService } from './OcrBaseService'

--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@ -3,7 +3,7 @@ import type { SpanEntity, TokenUsage } from '@mcp-trace/trace-core'
 import type { SpanContext } from '@opentelemetry/api'
 import type { TerminalConfig } from '@shared/config/constant'
 import type { LogLevel, LogSourceWithContext } from '@shared/config/logger'
-import type { FileChangeEvent } from '@shared/config/types'
+import type { FileChangeEvent, WebviewKeyEvent } from '@shared/config/types'
 import type { CacheSyncMessage } from '@shared/data/cache/cacheTypes'
 import type {
  PreferenceDefaultScopeType,
@ -395,7 +395,16 @@ const api = {
    setOpenLinkExternal: (webviewId: number, isExternal: boolean) =>
      ipcRenderer.invoke(IpcChannel.Webview_SetOpenLinkExternal, webviewId, isExternal),
    setSpellCheckEnabled: (webviewId: number, isEnable: boolean) =>
-      ipcRenderer.invoke(IpcChannel.Webview_SetSpellCheckEnabled, webviewId, isEnable)
+      ipcRenderer.invoke(IpcChannel.Webview_SetSpellCheckEnabled, webviewId, isEnable),
+    onFindShortcut: (callback: (payload: WebviewKeyEvent) => void) => {
+      const listener = (_event: Electron.IpcRendererEvent, payload: WebviewKeyEvent) => {
+        callback(payload)
+      }
+      ipcRenderer.on(IpcChannel.Webview_SearchHotkey, listener)
+      return () => {
+        ipcRenderer.off(IpcChannel.Webview_SearchHotkey, listener)
+      }
+    }
  },
  storeSync: {
    subscribe: () => ipcRenderer.invoke(IpcChannel.StoreSync_Subscribe),
--- a/src/renderer/src/aiCore/legacy/clients/openai/OpenAIBaseClient.ts
+++ b/src/renderer/src/aiCore/legacy/clients/openai/OpenAIBaseClient.ts
@ -166,9 +166,7 @@ export abstract class OpenAIBaseClient<
        baseURL: this.getBaseURL(),
        defaultHeaders: {
          ...this.defaultHeaders(),
-          ...this.provider.extra_headers,
-          ...(this.provider.id === 'copilot' ? { 'editor-version': 'vscode/1.97.2' } : {}),
-          ...(this.provider.id === 'copilot' ? { 'copilot-vision-request': 'true' } : {})
+          ...this.provider.extra_headers
        }
      }) as TSdkInstance
    }
--- a/src/renderer/src/aiCore/prepareParams/parameterBuilder.ts
+++ b/src/renderer/src/aiCore/prepareParams/parameterBuilder.ts
@ -23,6 +23,7 @@ import type { CherryWebSearchConfig } from '@renderer/store/websearch'
 import { type Assistant, type MCPTool, type Provider } from '@renderer/types'
 import type { StreamTextParams } from '@renderer/types/aiCoreTypes'
 import { mapRegexToPatterns } from '@renderer/utils/blacklistMatchPattern'
+import { replacePromptVariables } from '@renderer/utils/prompt'
 import type { ModelMessage, Tool } from 'ai'
 import { stepCountIs } from 'ai'

@ -159,14 +160,14 @@ export async function buildStreamTextParams(
    abortSignal: options.requestOptions?.signal,
    headers: options.requestOptions?.headers,
    providerOptions,
-    stopWhen: stepCountIs(10),
+    stopWhen: stepCountIs(20),
    maxRetries: 0
  }
  if (tools) {
    params.tools = tools
  }
  if (assistant.prompt) {
-    params.system = assistant.prompt
+    params.system = await replacePromptVariables(assistant.prompt, model.name)
  }
  logger.debug('params', params)
  return {
--- a/src/renderer/src/aiCore/provider/tests/providerConfig.test.ts
+++ b/src/renderer/src/aiCore/provider/tests/providerConfig.test.ts
@ -0,0 +1,89 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+vi.mock('@renderer/services/LoggerService', () => ({
+  loggerService: {
+    withContext: () => ({
+      debug: vi.fn(),
+      info: vi.fn(),
+      warn: vi.fn(),
+      error: vi.fn()
+    })
+  }
+}))
+
+vi.mock('@renderer/services/AssistantService', () => ({
+  getProviderByModel: vi.fn()
+}))
+
+vi.mock('@renderer/store', () => ({
+  default: {
+    getState: () => ({ copilot: { defaultHeaders: {} } })
+  }
+}))
+
+import type { Model, Provider } from '@renderer/types'
+
+import { COPILOT_DEFAULT_HEADERS, COPILOT_EDITOR_VERSION, isCopilotResponsesModel } from '../constants'
+import { providerToAiSdkConfig } from '../providerConfig'
+
+const createWindowKeyv = () => {
+  const store = new Map<string, string>()
+  return {
+    get: (key: string) => store.get(key),
+    set: (key: string, value: string) => {
+      store.set(key, value)
+    }
+  }
+}
+
+const createCopilotProvider = (): Provider => ({
+  id: 'copilot',
+  type: 'openai',
+  name: 'GitHub Copilot',
+  apiKey: 'test-key',
+  apiHost: 'https://api.githubcopilot.com',
+  models: [],
+  isSystem: true
+})
+
+const createModel = (id: string, name = id): Model => ({
+  id,
+  name,
+  provider: 'copilot',
+  group: 'copilot'
+})
+
+describe('Copilot responses routing', () => {
+  beforeEach(() => {
+    ;(globalThis as any).window = {
+      ...(globalThis as any).window,
+      keyv: createWindowKeyv()
+    }
+  })
+
+  it('detects official GPT-5 Codex identifiers case-insensitively', () => {
+    expect(isCopilotResponsesModel(createModel('gpt-5-codex', 'gpt-5-codex'))).toBe(true)
+    expect(isCopilotResponsesModel(createModel('GPT-5-CODEX', 'GPT-5-CODEX'))).toBe(true)
+    expect(isCopilotResponsesModel(createModel('gpt-5-codex', 'custom-name'))).toBe(true)
+    expect(isCopilotResponsesModel(createModel('custom-id', 'custom-name'))).toBe(false)
+  })
+
+  it('configures gpt-5-codex with the Copilot provider', () => {
+    const provider = createCopilotProvider()
+    const config = providerToAiSdkConfig(provider, createModel('gpt-5-codex', 'GPT-5-CODEX'))
+
+    expect(config.providerId).toBe('github-copilot-openai-compatible')
+    expect(config.options.headers?.['Editor-Version']).toBe(COPILOT_EDITOR_VERSION)
+    expect(config.options.headers?.['Copilot-Integration-Id']).toBe(COPILOT_DEFAULT_HEADERS['Copilot-Integration-Id'])
+    expect(config.options.headers?.['copilot-vision-request']).toBe('true')
+  })
+
+  it('uses the Copilot provider for other models and keeps headers', () => {
+    const provider = createCopilotProvider()
+    const config = providerToAiSdkConfig(provider, createModel('gpt-4'))
+
+    expect(config.providerId).toBe('github-copilot-openai-compatible')
+    expect(config.options.headers?.['Editor-Version']).toBe(COPILOT_DEFAULT_HEADERS['Editor-Version'])
+    expect(config.options.headers?.['Copilot-Integration-Id']).toBe(COPILOT_DEFAULT_HEADERS['Copilot-Integration-Id'])
+  })
+})
--- a/src/renderer/src/aiCore/provider/constants.ts
+++ b/src/renderer/src/aiCore/provider/constants.ts
@ -0,0 +1,25 @@
+import type { Model } from '@renderer/types'
+
+export const COPILOT_EDITOR_VERSION = 'vscode/1.104.1'
+export const COPILOT_PLUGIN_VERSION = 'copilot-chat/0.26.7'
+export const COPILOT_INTEGRATION_ID = 'vscode-chat'
+export const COPILOT_USER_AGENT = 'GitHubCopilotChat/0.26.7'
+
+export const COPILOT_DEFAULT_HEADERS = {
+  'Copilot-Integration-Id': COPILOT_INTEGRATION_ID,
+  'User-Agent': COPILOT_USER_AGENT,
+  'Editor-Version': COPILOT_EDITOR_VERSION,
+  'Editor-Plugin-Version': COPILOT_PLUGIN_VERSION,
+  'editor-version': COPILOT_EDITOR_VERSION,
+  'editor-plugin-version': COPILOT_PLUGIN_VERSION,
+  'copilot-vision-request': 'true'
+} as const
+
+// Models that require the OpenAI Responses endpoint when routed through GitHub Copilot (#10560)
+const COPILOT_RESPONSES_MODEL_IDS = ['gpt-5-codex']
+
+export function isCopilotResponsesModel(model: Model): boolean {
+  const normalizedId = model.id?.trim().toLowerCase()
+  const normalizedName = model.name?.trim().toLowerCase()
+  return COPILOT_RESPONSES_MODEL_IDS.some((target) => normalizedId === target || normalizedName === target)
+}
--- a/src/renderer/src/aiCore/provider/factory.ts
+++ b/src/renderer/src/aiCore/provider/factory.ts
@ -28,7 +28,8 @@ const STATIC_PROVIDER_MAPPING: Record<string, ProviderId> = {
  gemini: 'google', // Google Gemini -> google
  'azure-openai': 'azure', // Azure OpenAI -> azure
  'openai-response': 'openai', // OpenAI Responses -> openai
-  grok: 'xai' // Grok -> xai
+  grok: 'xai', // Grok -> xai
+  copilot: 'github-copilot-openai-compatible'
 }

 /**
--- a/src/renderer/src/aiCore/provider/providerConfig.ts
+++ b/src/renderer/src/aiCore/provider/providerConfig.ts
@ -22,6 +22,7 @@ import { formatApiHost } from '@renderer/utils/api'
 import { cloneDeep, trim } from 'lodash'

 import { aihubmixProviderCreator, newApiResolverCreator, vertexAnthropicProviderCreator } from './config'
+import { COPILOT_DEFAULT_HEADERS } from './constants'
 import { getAiSdkProviderId } from './factory'
 const logger = loggerService.withContext('ProviderConfigProcessor')

@ -109,6 +110,9 @@ function formatProviderApiHost(provider: Provider): Provider {
    if (!formatted.anthropicApiHost) {
      formatted.anthropicApiHost = formatted.apiHost
    }
+  } else if (formatted.id === 'copilot') {
+    const trimmed = trim(formatted.apiHost)
+    formatted.apiHost = trimmed.endsWith('/') ? trimmed.slice(0, -1) : trimmed
  } else if (formatted.type === 'gemini') {
    formatted.apiHost = formatApiHost(formatted.apiHost, 'v1beta')
  } else {
@ -151,6 +155,26 @@ export function providerToAiSdkConfig(
    baseURL: trim(actualProvider.apiHost),
    apiKey: getRotatedApiKey(actualProvider)
  }
+
+  const isCopilotProvider = actualProvider.id === 'copilot'
+  if (isCopilotProvider) {
+    const storedHeaders = store.getState().copilot.defaultHeaders ?? {}
+    const options = ProviderConfigFactory.fromProvider('github-copilot-openai-compatible', baseConfig, {
+      headers: {
+        ...COPILOT_DEFAULT_HEADERS,
+        ...storedHeaders,
+        ...actualProvider.extra_headers
+      },
+      name: actualProvider.id,
+      includeUsage: true
+    })
+
+    return {
+      providerId: 'github-copilot-openai-compatible',
+      options
+    }
+  }
+
  // 处理OpenAI模式
  const extraOptions: any = {}
  if (actualProvider.type === 'openai-response' && !isOpenAIChatCompletionOnlyModel(model)) {
@ -172,15 +196,6 @@ export function providerToAiSdkConfig(
      }
    }
  }
-
-  // copilot
-  if (actualProvider.id === 'copilot') {
-    extraOptions.headers = {
-      ...extraOptions.headers,
-      'editor-version': 'vscode/1.97.2',
-      'copilot-vision-request': 'true'
-    }
-  }
  // azure
  if (aiSdkProviderId === 'azure' || actualProvider.type === 'azure-openai') {
    extraOptions.apiVersion = actualProvider.apiVersion
@ -229,7 +244,6 @@ export function providerToAiSdkConfig(
    }
  }

-  // 如果AI SDK支持该provider，使用原生配置
  if (hasProviderConfig(aiSdkProviderId) && aiSdkProviderId !== 'openai-compatible') {
    const options = ProviderConfigFactory.fromProvider(aiSdkProviderId, baseConfig, extraOptions)
    return {
@ -277,9 +291,17 @@ export async function prepareSpecialProviderConfig(
 ) {
  switch (provider.id) {
    case 'copilot': {
-      const defaultHeaders = store.getState().copilot.defaultHeaders
-      const { token } = await window.api.copilot.getToken(defaultHeaders)
+      const defaultHeaders = store.getState().copilot.defaultHeaders ?? {}
+      const headers = {
+        ...COPILOT_DEFAULT_HEADERS,
+        ...defaultHeaders
+      }
+      const { token } = await window.api.copilot.getToken(headers)
      config.options.apiKey = token
+      config.options.headers = {
+        ...headers,
+        ...config.options.headers
+      }
      break
    }
    case 'cherryai': {
--- a/src/renderer/src/aiCore/provider/providerInitialization.ts
+++ b/src/renderer/src/aiCore/provider/providerInitialization.ts
@ -32,6 +32,14 @@ export const NEW_PROVIDER_CONFIGS: ProviderConfig[] = [
    supportsImageGeneration: true,
    aliases: ['vertexai-anthropic']
  },
+  {
+    id: 'github-copilot-openai-compatible',
+    name: 'GitHub Copilot OpenAI Compatible',
+    import: () => import('@opeoginni/github-copilot-openai-compatible'),
+    creatorFunctionName: 'createGitHubCopilotOpenAICompatible',
+    supportsImageGeneration: false,
+    aliases: ['copilot', 'github-copilot']
+  },
  {
    id: 'bedrock',
    name: 'Amazon Bedrock',
--- a/src/renderer/src/aiCore/tools/KnowledgeSearchTool.ts
+++ b/src/renderer/src/aiCore/tools/KnowledgeSearchTool.ts
@ -4,7 +4,7 @@ import type { ExtractResults, KnowledgeExtractResults } from '@renderer/utils/ex
 import { REFERENCE_PROMPT } from '@shared/config/prompts'
 import { type InferToolInput, type InferToolOutput, tool } from 'ai'
 import { isEmpty } from 'lodash'
-import { z } from 'zod'
+import * as z from 'zod'

 /**
 * 知识库搜索工具
--- a/src/renderer/src/aiCore/tools/MemorySearchTool.ts
+++ b/src/renderer/src/aiCore/tools/MemorySearchTool.ts
@ -1,7 +1,7 @@
 import store from '@renderer/store'
 import { selectCurrentUserId, selectGlobalMemoryEnabled, selectMemoryConfig } from '@renderer/store/memory'
 import { type InferToolInput, type InferToolOutput, tool } from 'ai'
-import { z } from 'zod'
+import * as z from 'zod'

 import { MemoryProcessor } from '../../services/MemoryProcessor'

--- a/src/renderer/src/aiCore/tools/WebSearchTool.ts
+++ b/src/renderer/src/aiCore/tools/WebSearchTool.ts
@ -3,7 +3,7 @@ import type { WebSearchProvider, WebSearchProviderResponse } from '@renderer/typ
 import type { ExtractResults } from '@renderer/utils/extract'
 import { REFERENCE_PROMPT } from '@shared/config/prompts'
 import { type InferToolInput, type InferToolOutput, tool } from 'ai'
-import { z } from 'zod'
+import * as z from 'zod'

 /**
 * 使用预提取关键词的网络搜索工具
--- a/src/renderer/src/aiCore/utils/reasoning.ts
+++ b/src/renderer/src/aiCore/utils/reasoning.ts
@ -6,6 +6,7 @@ import {
  getThinkModelType,
  isDeepSeekHybridInferenceModel,
  isDoubaoThinkingAutoModel,
+  isGrok4FastReasoningModel,
  isGrokReasoningModel,
  isOpenAIReasoningModel,
  isQwenAlwaysThinkModel,
@ -53,7 +54,12 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin
        return {}
      }
      // Don't disable reasoning for models that require it
-      if (isGrokReasoningModel(model) || isOpenAIReasoningModel(model) || model.id.includes('seed-oss')) {
+      if (
+        isGrokReasoningModel(model) ||
+        isOpenAIReasoningModel(model) ||
+        isQwenAlwaysThinkModel(model) ||
+        model.id.includes('seed-oss')
+      ) {
        return {}
      }
      return { reasoning: { enabled: false, exclude: true } }
@ -101,6 +107,7 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin
  // reasoningEffort有效的情况
  // DeepSeek hybrid inference models, v3.1 and maybe more in the future
  // 不同的 provider 有不同的思考控制方式，在这里统一解决
+
  if (isDeepSeekHybridInferenceModel(model)) {
    if (isSystemProvider(provider)) {
      switch (provider.id) {
@ -143,6 +150,16 @@ export function getReasoningEffort(assistant: Assistant, model: Model): Reasonin

  // OpenRouter models
  if (model.provider === SystemProviderIds.openrouter) {
+    // Grok 4 Fast doesn't support effort levels, always use enabled: true
+    if (isGrok4FastReasoningModel(model)) {
+      return {
+        reasoning: {
+          enabled: true // Ignore effort level, just enable reasoning
+        }
+      }
+    }
+
+    // Other OpenRouter models that support effort levels
    if (isSupportedReasoningEffortModel(model) || isSupportedThinkingTokenModel(model)) {
      return {
        reasoning: {
@ -413,6 +430,13 @@ export function getGeminiReasoningParams(assistant: Assistant, model: Model): Re
  return {}
 }

+/**
+ * Get XAI-specific reasoning parameters
+ * This function should only be called for XAI provider models
+ * @param assistant - The assistant configuration
+ * @param model - The model being used
+ * @returns XAI-specific reasoning parameters
+ */
 export function getXAIReasoningParams(assistant: Assistant, model: Model): Record<string, any> {
  if (!isSupportedReasoningEffortGrokModel(model)) {
    return {}
@ -420,6 +444,11 @@ export function getXAIReasoningParams(assistant: Assistant, model: Model): Recor

  const { reasoning_effort: reasoningEffort } = getAssistantSettings(assistant)

+  if (!reasoningEffort) {
+    return {}
+  }
+
+  // For XAI provider Grok models, use reasoningEffort parameter directly
  return {
    reasoningEffort
  }
--- a/src/renderer/src/assets/images/apps/3mintop.png
+++ b/src/renderer/src/assets/images/apps/3mintop.png
--- a/src/renderer/src/assets/images/apps/stepfun.png
+++ b/src/renderer/src/assets/images/apps/stepfun.png
--- a/src/renderer/src/assets/images/apps/wpslingxi.webp
+++ b/src/renderer/src/assets/images/apps/wpslingxi.webp
--- a/src/renderer/src/assets/images/apps/yuewen.png
+++ b/src/renderer/src/assets/images/apps/yuewen.png
--- a/src/renderer/src/assets/images/providers/silicon.png
+++ b/src/renderer/src/assets/images/providers/silicon.png
--- a/src/renderer/src/components/MinApp/MinappPopupContainer.tsx
+++ b/src/renderer/src/components/MinApp/MinappPopupContainer.tsx
@ -542,7 +542,7 @@ const MinappPopupContainer: React.FC = () => {
      {/* 在所有小程序中显示GoogleLoginTip */}
      <GoogleLoginTip isReady={isReady} currentUrl={currentUrl} currentAppId={currentMinappId} />
      {!isReady && (
-        <EmptyView>
+        <EmptyView style={{ backgroundColor: 'var(--color-background-soft)' }}>
          <Avatar
            src={currentAppInfo?.logo}
            className="h-20 w-20"
--- a/src/renderer/src/config/minapps.ts
+++ b/src/renderer/src/config/minapps.ts
@ -22,8 +22,6 @@ import GithubCopilotLogo from '@renderer/assets/images/apps/github-copilot.webp?
 import GoogleAppLogo from '@renderer/assets/images/apps/google.svg?url'
 import GrokAppLogo from '@renderer/assets/images/apps/grok.png?url'
 import GrokXAppLogo from '@renderer/assets/images/apps/grok-x.png?url'
-import HikaLogo from '@renderer/assets/images/apps/hika.webp?url'
-import HuggingChatLogo from '@renderer/assets/images/apps/huggingchat.svg?url'
 import KimiAppLogo from '@renderer/assets/images/apps/kimi.webp?url'
 import LambdaChatLogo from '@renderer/assets/images/apps/lambdachat.webp?url'
 import LeChatLogo from '@renderer/assets/images/apps/lechat.png?url'
@ -32,13 +30,13 @@ import MetasoAppLogo from '@renderer/assets/images/apps/metaso.webp?url'
 import MonicaLogo from '@renderer/assets/images/apps/monica.webp?url'
 import n8nLogo from '@renderer/assets/images/apps/n8n.svg?url'
 import NamiAiLogo from '@renderer/assets/images/apps/nm.png?url'
-import NamiAiSearchLogo from '@renderer/assets/images/apps/nm-search.webp?url'
 import NotebookLMAppLogo from '@renderer/assets/images/apps/notebooklm.svg?url'
 import PerplexityAppLogo from '@renderer/assets/images/apps/perplexity.webp?url'
 import PoeAppLogo from '@renderer/assets/images/apps/poe.webp?url'
 import QwenlmAppLogo from '@renderer/assets/images/apps/qwenlm.webp?url'
 import SensetimeAppLogo from '@renderer/assets/images/apps/sensetime.png?url'
 import SparkDeskAppLogo from '@renderer/assets/images/apps/sparkdesk.webp?url'
+import StepfunAppLogo from '@renderer/assets/images/apps/stepfun.png?url'
 import ThinkAnyLogo from '@renderer/assets/images/apps/thinkany.webp?url'
 import TiangongAiLogo from '@renderer/assets/images/apps/tiangong.png?url'
 import WanZhiAppLogo from '@renderer/assets/images/apps/wanzhi.jpg?url'
@ -46,7 +44,6 @@ import WPSLingXiLogo from '@renderer/assets/images/apps/wpslingxi.webp?url'
 import XiaoYiAppLogo from '@renderer/assets/images/apps/xiaoyi.webp?url'
 import YouLogo from '@renderer/assets/images/apps/you.jpg?url'
 import TencentYuanbaoAppLogo from '@renderer/assets/images/apps/yuanbao.webp?url'
-import YuewenAppLogo from '@renderer/assets/images/apps/yuewen.png?url'
 import ZaiAppLogo from '@renderer/assets/images/apps/zai.png?url'
 import ZhihuAppLogo from '@renderer/assets/images/apps/zhihu.png?url'
 import ClaudeAppLogo from '@renderer/assets/images/models/claude.png?url'
@ -150,9 +147,9 @@ const ORIGIN_DEFAULT_MIN_APPS: MinAppType[] = [
  },
  {
    id: 'stepfun',
-    name: i18n.t('minapps.yuewen'),
-    url: 'https://yuewen.cn/chats/new',
-    logo: YuewenAppLogo,
+    name: i18n.t('minapps.stepfun'),
+    url: 'https://stepfun.com',
+    logo: StepfunAppLogo,
    bodered: true
  },
  {
@ -263,13 +260,6 @@ const ORIGIN_DEFAULT_MIN_APPS: MinAppType[] = [
    url: 'https://www.tiangong.cn/',
    bodered: true
  },
-  {
-    id: 'hugging-chat',
-    name: 'HuggingChat',
-    logo: HuggingChatLogo,
-    url: 'https://huggingface.co/chat/',
-    bodered: true
-  },
  {
    id: 'Felo',
    name: 'Felo',
@ -297,13 +287,6 @@ const ORIGIN_DEFAULT_MIN_APPS: MinAppType[] = [
    url: 'https://bot.n.cn/',
    bodered: true
  },
-  {
-    id: 'nm-search',
-    name: i18n.t('minapps.nami-ai-search'),
-    logo: NamiAiSearchLogo,
-    url: 'https://www.n.cn/',
-    bodered: true
-  },
  {
    id: 'thinkany',
    name: 'ThinkAny',
@ -314,13 +297,6 @@ const ORIGIN_DEFAULT_MIN_APPS: MinAppType[] = [
      padding: 5
    }
  },
-  {
-    id: 'hika',
-    name: 'Hika',
-    logo: HikaLogo,
-    url: 'https://hika.fyi/',
-    bodered: true
-  },
  {
    id: 'github-copilot',
    name: 'GitHub Copilot',
--- a/src/renderer/src/config/models/default.ts
+++ b/src/renderer/src/config/models/default.ts
@ -25,7 +25,7 @@ export const SYSTEM_MODELS: Record<SystemProviderId | 'defaultModel', Model[]> =
    // Default quick assistant model
    glm45FlashModel
  ],
-  // cherryin: [],
+  cherryin: [],
  vertexai: [],
  '302ai': [
    {
--- a/src/renderer/src/config/models/reasoning.ts
+++ b/src/renderer/src/config/models/reasoning.ts
@ -14,7 +14,7 @@ import { GEMINI_FLASH_MODEL_REGEX } from './websearch'

 // Reasoning models
 export const REASONING_REGEX =
-  /^(o\d+(?:-[\w-]+)?|.*\b(?:reasoning|reasoner|thinking)\b.*|.*-[rR]\d+.*|.*\bqwq(?:-[\w-]+)?\b.*|.*\bhunyuan-t1(?:-[\w-]+)?\b.*|.*\bglm-zero-preview\b.*|.*\bgrok-(?:3-mini|4)(?:-[\w-]+)?\b.*)$/i
+  /^(?!.*-non-reasoning\b)(o\d+(?:-[\w-]+)?|.*\b(?:reasoning|reasoner|thinking)\b.*|.*-[rR]\d+.*|.*\bqwq(?:-[\w-]+)?\b.*|.*\bhunyuan-t1(?:-[\w-]+)?\b.*|.*\bglm-zero-preview\b.*|.*\bgrok-(?:3-mini|4|4-fast)(?:-[\w-]+)?\b.*)$/i

 // 模型类型到支持的reasoning_effort的映射表
 // TODO: refactor this. too many identical options
@ -24,6 +24,7 @@ export const MODEL_SUPPORTED_REASONING_EFFORT: ReasoningEffortConfig = {
  gpt5: ['minimal', 'low', 'medium', 'high'] as const,
  gpt5_codex: ['low', 'medium', 'high'] as const,
  grok: ['low', 'high'] as const,
+  grok4_fast: ['auto'] as const,
  gemini: ['low', 'medium', 'high', 'auto'] as const,
  gemini_pro: ['low', 'medium', 'high', 'auto'] as const,
  qwen: ['low', 'medium', 'high'] as const,
@ -43,6 +44,7 @@ export const MODEL_SUPPORTED_OPTIONS: ThinkingOptionConfig = {
  gpt5: [...MODEL_SUPPORTED_REASONING_EFFORT.gpt5] as const,
  gpt5_codex: MODEL_SUPPORTED_REASONING_EFFORT.gpt5_codex,
  grok: MODEL_SUPPORTED_REASONING_EFFORT.grok,
+  grok4_fast: ['off', ...MODEL_SUPPORTED_REASONING_EFFORT.grok4_fast] as const,
  gemini: ['off', ...MODEL_SUPPORTED_REASONING_EFFORT.gemini] as const,
  gemini_pro: MODEL_SUPPORTED_REASONING_EFFORT.gemini_pro,
  qwen: ['off', ...MODEL_SUPPORTED_REASONING_EFFORT.qwen] as const,
@ -66,6 +68,8 @@ export const getThinkModelType = (model: Model): ThinkingModelType => {
    }
  } else if (isSupportedReasoningEffortOpenAIModel(model)) {
    thinkingModelType = 'o'
+  } else if (isGrok4FastReasoningModel(model)) {
+    thinkingModelType = 'grok4_fast'
  } else if (isSupportedThinkingTokenGeminiModel(model)) {
    if (GEMINI_FLASH_MODEL_REGEX.test(model.id)) {
      thinkingModelType = 'gemini'
@ -142,19 +146,46 @@ export function isSupportedReasoningEffortGrokModel(model?: Model): boolean {
  }

  const modelId = getLowerBaseModelName(model.id)
+  const providerId = model.provider.toLowerCase()
  if (modelId.includes('grok-3-mini')) {
    return true
  }

+  if (providerId === 'openrouter' && modelId.includes('grok-4-fast')) {
+    return true
+  }
+
  return false
 }

+/**
+ * Checks if the model is Grok 4 Fast reasoning version
+ * Explicitly excludes non-reasoning variants (models with 'non-reasoning' in their ID)
+ *
+ * Note: XAI official uses different model IDs for reasoning vs non-reasoning
+ * Third-party providers like OpenRouter expose a single ID with reasoning parameters, while first-party providers require separate IDs. Only the OpenRouter variant supports toggling.
+ *
+ * @param model - The model to check
+ * @returns true if the model is a reasoning-enabled Grok 4 Fast model
+ */
+export function isGrok4FastReasoningModel(model?: Model): boolean {
+  if (!model) {
+    return false
+  }
+
+  const modelId = getLowerBaseModelName(model.id)
+  return modelId.includes('grok-4-fast') && !modelId.includes('non-reasoning')
+}
+
 export function isGrokReasoningModel(model?: Model): boolean {
  if (!model) {
    return false
  }
  const modelId = getLowerBaseModelName(model.id)
-  if (isSupportedReasoningEffortGrokModel(model) || modelId.includes('grok-4')) {
+  if (
+    isSupportedReasoningEffortGrokModel(model) ||
+    (modelId.includes('grok-4') && !modelId.includes('non-reasoning'))
+  ) {
    return true
  }

@ -265,7 +296,11 @@ export function isQwenAlwaysThinkModel(model?: Model): boolean {
    return false
  }
  const modelId = getLowerBaseModelName(model.id, '/')
-  return modelId.startsWith('qwen3') && modelId.includes('thinking')
+  // 包括 qwen3 开头的 thinking 模型和 qwen3-vl 的 thinking 模型
+  return (
+    (modelId.startsWith('qwen3') && modelId.includes('thinking')) ||
+    (modelId.includes('qwen3-vl') && modelId.includes('thinking'))
+  )
 }

 // Doubao 支持思考模式的模型正则
@ -329,7 +364,10 @@ export const isPerplexityReasoningModel = (model?: Model): boolean => {
  }

  const modelId = getLowerBaseModelName(model.id, '/')
-  return isSupportedReasoningEffortPerplexityModel(model) || modelId.includes('reasoning')
+  return (
+    isSupportedReasoningEffortPerplexityModel(model) ||
+    (modelId.includes('reasoning') && !modelId.includes('non-reasoning'))
+  )
 }

 export const isSupportedReasoningEffortPerplexityModel = (model: Model): boolean => {
@ -443,6 +481,8 @@ export const THINKING_TOKEN_MAP: Record<string, { min: number; max: number }> =
  // qwen-plus-x 系列自 qwen-plus-2025-07-28 后模型最长思维链变为 81_920, qwen-plus 模型于 2025.9.16 同步变更
  'qwen3-235b-a22b-thinking-2507$': { min: 0, max: 81_920 },
  'qwen3-30b-a3b-thinking-2507$': { min: 0, max: 81_920 },
+  'qwen3-vl-235b-a22b-thinking$': { min: 0, max: 81_920 },
+  'qwen3-vl-30b-a3b-thinking$': { min: 0, max: 81_920 },
  'qwen-plus-2025-07-14$': { min: 0, max: 38_912 },
  'qwen-plus-2025-04-28$': { min: 0, max: 38_912 },
  'qwen3-1\\.7b$': { min: 0, max: 30_720 },
--- a/src/renderer/src/config/models/vision.ts
+++ b/src/renderer/src/config/models/vision.ts
@ -24,7 +24,7 @@ const visionAllowedModels = [
  'qwen2.5-vl',
  'qwen3-vl',
  'qwen2.5-omni',
-  'qwen3-omni',
+  'qwen3-omni(?:-[\\w-]+)?',
  'qvq',
  'internvl2',
  'grok-vision-beta',
@ -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
 ]

--- a/src/renderer/src/config/providers.ts
+++ b/src/renderer/src/config/providers.ts
@ -74,16 +74,16 @@ export const CHERRYAI_PROVIDER: SystemProvider = {
 }

 export const SYSTEM_PROVIDERS_CONFIG: Record<SystemProviderId, SystemProvider> = {
-  // cherryin: {
-  //   id: 'cherryin',
-  //   name: 'CherryIN',
-  //   type: 'openai',
-  //   apiKey: '',
-  //   apiHost: 'https://open.cherryin.ai',
-  //   models: [],
-  //   isSystem: true,
-  //   enabled: true
-  // },
+  cherryin: {
+    id: 'cherryin',
+    name: 'CherryIN',
+    type: 'openai',
+    apiKey: '',
+    apiHost: 'https://open.cherryin.net',
+    models: [],
+    isSystem: true,
+    enabled: true
+  },
  silicon: {
    id: 'silicon',
    name: 'Silicon',
@ -734,17 +734,17 @@ type ProviderUrls = {
 }

 export const PROVIDER_URLS: Record<SystemProviderId, ProviderUrls> = {
-  // cherryin: {
-  //   api: {
-  //     url: 'https://open.cherryin.ai'
-  //   },
-  //   websites: {
-  //     official: 'https://open.cherryin.ai',
-  //     apiKey: 'https://open.cherryin.ai/console/token',
-  //     docs: 'https://open.cherryin.ai',
-  //     models: 'https://open.cherryin.ai/pricing'
-  //   }
-  // },
+  cherryin: {
+    api: {
+      url: 'https://open.cherryin.net'
+    },
+    websites: {
+      official: 'https://open.cherryin.ai',
+      apiKey: 'https://open.cherryin.ai/console/token',
+      docs: 'https://open.cherryin.ai',
+      models: 'https://open.cherryin.ai/pricing'
+    }
+  },
  ph8: {
    api: {
      url: 'https://ph8.co'
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@ -1806,13 +1806,13 @@
    "nami-ai-search": "Nami AI Search",
    "qwen": "Qwen",
    "sensechat": "SenseChat",
+    "stepfun": "Stepfun",
    "tencent-yuanbao": "Yuanbao",
    "tiangong-ai": "Skywork",
    "wanzhi": "Wanzhi",
    "wenxin": "ERNIE",
    "wps-copilot": "WPS Copilot",
    "xiaoyi": "Xiaoyi",
-    "yuewen": "Yuewen",
    "zhihu": "Zhihu"
  },
  "miniwindow": {
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@ -1806,13 +1806,13 @@
    "nami-ai-search": "纳米AI搜索",
    "qwen": "通义千问",
    "sensechat": "商量",
+    "stepfun": "阶跃AI",
    "tencent-yuanbao": "腾讯元宝",
    "tiangong-ai": "天工AI",
    "wanzhi": "万知",
    "wenxin": "文心一言",
    "wps-copilot": "WPS灵犀",
    "xiaoyi": "小艺",
-    "yuewen": "跃问",
    "zhihu": "知乎直答"
  },
  "miniwindow": {
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@ -1806,13 +1806,13 @@
    "nami-ai-search": "納米AI搜索",
    "qwen": "通義千問",
    "sensechat": "商量",
+    "stepfun": "階躍AI",
    "tencent-yuanbao": "騰訊元寶",
    "tiangong-ai": "天工AI",
    "wanzhi": "萬知",
    "wenxin": "文心一言",
    "wps-copilot": "WPS靈犀",
    "xiaoyi": "小藝",
-    "yuewen": "躍問",
    "zhihu": "知乎直答"
  },
  "miniwindow": {
--- a/src/renderer/src/i18n/translate/el-gr.json
+++ b/src/renderer/src/i18n/translate/el-gr.json
@ -1806,13 +1806,13 @@
    "nami-ai-search": "Nami AI Search",
    "qwen": "Qwen",
    "sensechat": "SenseChat",
+    "stepfun": "Stepfun",
    "tencent-yuanbao": "Yuanbao",
    "tiangong-ai": "Skywork",
    "wanzhi": "Wanzhi",
    "wenxin": "ERNIE",
    "wps-copilot": "WPS Copilot",
    "xiaoyi": "Xiaoyi",
-    "yuewen": "Yuewen",
    "zhihu": "Zhihu"
  },
  "miniwindow": {
--- a/src/renderer/src/i18n/translate/es-es.json
+++ b/src/renderer/src/i18n/translate/es-es.json
@ -1806,13 +1806,13 @@
    "nami-ai-search": "Nami AI Search",
    "qwen": "Qwen",
    "sensechat": "SenseChat",
+    "stepfun": "Stepfun",
    "tencent-yuanbao": "Yuanbao",
    "tiangong-ai": "Skywork",
    "wanzhi": "Wanzhi",
    "wenxin": "ERNIE",
    "wps-copilot": "WPS Copilot",
    "xiaoyi": "Xiaoyi",
-    "yuewen": "Yuewen",
    "zhihu": "Zhihu"
  },
  "miniwindow": {
--- a/src/renderer/src/i18n/translate/fr-fr.json
+++ b/src/renderer/src/i18n/translate/fr-fr.json
@ -1806,13 +1806,13 @@
    "nami-ai-search": "Nami AI Search",
    "qwen": "Qwen",
    "sensechat": "SenseChat",
+    "stepfun": "Stepfun",
    "tencent-yuanbao": "Yuanbao",
    "tiangong-ai": "Skywork",
    "wanzhi": "Wanzhi",
    "wenxin": "ERNIE",
    "wps-copilot": "WPS Copilot",
    "xiaoyi": "Xiaoyi",
-    "yuewen": "Yuewen",
    "zhihu": "Zhihu"
  },
  "miniwindow": {
--- a/src/renderer/src/i18n/translate/ja-jp.json
+++ b/src/renderer/src/i18n/translate/ja-jp.json
@ -1806,13 +1806,13 @@
    "nami-ai-search": "Nami AI Search",
    "qwen": "通義千問",
    "sensechat": "SenseChat",
+    "stepfun": "Stepfun",
    "tencent-yuanbao": "騰訊元宝",
    "tiangong-ai": "Skywork",
    "wanzhi": "万知",
    "wenxin": "ERNIE",
    "wps-copilot": "WPS Copilot",
    "xiaoyi": "小藝",
-    "yuewen": "躍問",
    "zhihu": "知乎直答"
  },
  "miniwindow": {
--- a/src/renderer/src/i18n/translate/pt-pt.json
+++ b/src/renderer/src/i18n/translate/pt-pt.json
@ -1806,13 +1806,13 @@
    "nami-ai-search": "Nami AI Search",
    "qwen": "Qwen",
    "sensechat": "SenseChat",
+    "stepfun": "Stepfun",
    "tencent-yuanbao": "Yuanbao",
    "tiangong-ai": "Skywork",
    "wanzhi": "Wanzhi",
    "wenxin": "ERNIE",
    "wps-copilot": "WPS Copilot",
    "xiaoyi": "Xiaoyi",
-    "yuewen": "Yuewen",
    "zhihu": "Zhihu"
  },
  "miniwindow": {
--- a/src/renderer/src/i18n/translate/ru-ru.json
+++ b/src/renderer/src/i18n/translate/ru-ru.json
@ -1806,13 +1806,13 @@
    "nami-ai-search": "Nami AI Search",
    "qwen": "Qwen",
    "sensechat": "SenseChat",
+    "stepfun": "Stepfun",
    "tencent-yuanbao": "Tencent Yuanbao",
    "tiangong-ai": "Skywork",
    "wanzhi": "Wanzhi",
    "wenxin": "ERNIE",
    "wps-copilot": "WPS Copilot",
    "xiaoyi": "Xiaoyi",
-    "yuewen": "Yuewen",
    "zhihu": "Zhihu"
  },
  "miniwindow": {
--- a/src/renderer/src/pages/home/Markdown/CitationTooltip.tsx
+++ b/src/renderer/src/pages/home/Markdown/CitationTooltip.tsx
@ -2,7 +2,7 @@ import { Tooltip } from '@cherrystudio/ui'
 import Favicon from '@renderer/components/Icons/FallbackFavicon'
 import React, { memo, useCallback, useMemo } from 'react'
 import styled from 'styled-components'
-import { z } from 'zod'
+import * as z from 'zod'

 export const CitationSchema = z.object({
  url: z.url(),
--- a/src/renderer/src/pages/home/Messages/MessageGroup.tsx
+++ b/src/renderer/src/pages/home/Messages/MessageGroup.tsx
@ -361,8 +361,7 @@ const GridContainer = styled(Scrollbar)<{ $count: number; $gridColumns: number }
  &.vertical {
    grid-template-columns: repeat(1, minmax(0, 1fr));
    gap: 8px;
-    overflow-y: auto;
-    overflow-x: hidden;
+    overflow: hidden;
  }
  &.grid {
    grid-template-columns: repeat(
--- a/src/renderer/src/pages/home/Tabs/AgentSettingsTab.tsx
+++ b/src/renderer/src/pages/home/Tabs/AgentSettingsTab.tsx
@ -0,0 +1,40 @@
+import { Button, Divider } from '@heroui/react'
+import type { useUpdateAgent } from '@renderer/hooks/agents/useUpdateAgent'
+import { AgentSettingsPopup } from '@renderer/pages/settings/AgentSettings'
+import AdvancedSettings from '@renderer/pages/settings/AgentSettings/AdvancedSettings'
+import AgentEssentialSettings from '@renderer/pages/settings/AgentSettings/AgentEssentialSettings'
+import type { GetAgentResponse } from '@renderer/types/agent'
+import type { FC } from 'react'
+import { useTranslation } from 'react-i18next'
+
+interface Props {
+  agent: GetAgentResponse | undefined | null
+  update: ReturnType<typeof useUpdateAgent>['updateAgent']
+}
+
+const AgentSettingsTab: FC<Props> = ({ agent, update }) => {
+  const { t } = useTranslation()
+
+  const onMoreSetting = () => {
+    if (agent?.id) {
+      AgentSettingsPopup.show({ agentId: agent.id! })
+    }
+  }
+
+  if (!agent) {
+    return null
+  }
+
+  return (
+    <div className="w-[var(--assistants-width)] p-2 px-3 pt-4">
+      <AgentEssentialSettings agent={agent} update={update} showModelSetting={false} />
+      <AdvancedSettings agentBase={agent} update={update} />
+      <Divider className="my-2" />
+      <Button size="sm" fullWidth onPress={onMoreSetting}>
+        {t('settings.moresetting.label')}
+      </Button>
+    </div>
+  )
+}
+
+export default AgentSettingsTab
--- a/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx
+++ b/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx
@ -1,11 +1,28 @@
+import { Alert, Spinner } from '@heroui/react'
 import Scrollbar from '@renderer/components/Scrollbar'
+import { useAgents } from '@renderer/hooks/agents/useAgents'
+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 type { Assistant } from '@renderer/types'
+import type { AssistantTabSortType } from '@shared/data/preference/preferenceTypes'
 import type { FC } from 'react'
-import { useRef } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'

-import { AgentSection } from './components/AgentSection'
-import Assistants from './components/Assistants'
+import UnifiedAddButton from './components/UnifiedAddButton'
+import { UnifiedList } from './components/UnifiedList'
+import { UnifiedTagGroups } from './components/UnifiedTagGroups'
+import { useActiveAgent } from './hooks/useActiveAgent'
+import { useUnifiedGrouping } from './hooks/useUnifiedGrouping'
+import { useUnifiedItems } from './hooks/useUnifiedItems'
+import { useUnifiedSorting } from './hooks/useUnifiedSorting'

 interface AssistantsTabProps {
  activeAssistant: Assistant
@ -14,12 +31,143 @@ interface AssistantsTabProps {
  onCreateDefaultAssistant: () => void
 }

+const ALERT_KEY = 'enable_api_server_to_use_agent'
+
 const AssistantsTab: FC<AssistantsTabProps> = (props) => {
+  const { activeAssistant, setActiveAssistant, onCreateAssistant, onCreateDefaultAssistant } = props
  const containerRef = useRef<HTMLDivElement>(null)
+  const { t } = useTranslation()
+  const { apiServer } = useSettings()
+  const { iknow, chat } = useRuntime()
+  const dispatch = useAppDispatch()
+
+  // Agent related hooks
+  const { agents, deleteAgent, isLoading: agentsLoading, error: agentsError } = useAgents()
+  const { activeAgentId } = chat
+  const { setActiveAgentId } = useActiveAgent()
+
+  // Assistant related hooks
+  const { assistants, removeAssistant, copyAssistant, updateAssistants } = useAssistants()
+  const { addAssistantPreset } = useAssistantPresets()
+  const { collapsedTags, toggleTagCollapse } = useTags()
+  const { assistantsTabSortType = 'list', setAssistantsTabSortType } = useAssistantsTabSortType()
+  const [dragging, setDragging] = useState(false)
+
+  // Unified items management
+  const { unifiedItems, handleUnifiedListReorder } = useUnifiedItems({
+    agents,
+    assistants,
+    apiServerEnabled: apiServer.enabled,
+    agentsLoading,
+    agentsError,
+    updateAssistants
+  })
+
+  // Sorting
+  const { sortByPinyinAsc, sortByPinyinDesc } = useUnifiedSorting({
+    unifiedItems,
+    updateAssistants
+  })
+
+  // Grouping
+  const { groupedUnifiedItems, handleUnifiedGroupReorder } = useUnifiedGrouping({
+    unifiedItems,
+    assistants,
+    agents,
+    apiServerEnabled: apiServer.enabled,
+    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)
+      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: AssistantTabSortType) => {
+      setAssistantsTabSortType(sortType)
+    },
+    [setAssistantsTabSortType]
+  )
+
  return (
    <Container className="assistants-tab" ref={containerRef}>
-      <AgentSection />
-      <Assistants {...props} />
+      {!apiServer.enabled && !iknow[ALERT_KEY] && (
+        <Alert
+          color="warning"
+          title={t('agent.warning.enable_server')}
+          isClosable
+          onClose={() => {
+            dispatch(addIknowAction(ALERT_KEY))
+          }}
+        />
+      )}
+
+      {agentsLoading && <Spinner />}
+      {apiServer.enabled && agentsError && <Alert color="danger" title={t('agent.list.error.failed')} />}
+
+      {assistantsTabSortType === 'tags' ? (
+        <UnifiedTagGroups
+          groupedItems={groupedUnifiedItems}
+          activeAssistantId={activeAssistant.id}
+          activeAgentId={activeAgentId}
+          sortBy={assistantsTabSortType}
+          collapsedTags={collapsedTags}
+          onGroupReorder={handleUnifiedGroupReorder}
+          onDragStart={() => setDragging(true)}
+          onDragEnd={() => setDragging(false)}
+          onToggleTagCollapse={toggleTagCollapse}
+          onAssistantSwitch={setActiveAssistant}
+          onAssistantDelete={onDeleteAssistant}
+          onAgentDelete={deleteAgent}
+          onAgentPress={setActiveAgentId}
+          addPreset={addAssistantPreset}
+          copyAssistant={copyAssistant}
+          onCreateDefaultAssistant={onCreateDefaultAssistant}
+          handleSortByChange={handleSortByChange}
+          sortByPinyinAsc={sortByPinyinAsc}
+          sortByPinyinDesc={sortByPinyinDesc}
+        />
+      ) : (
+        <UnifiedList
+          items={unifiedItems}
+          activeAssistantId={activeAssistant.id}
+          activeAgentId={activeAgentId}
+          sortBy={assistantsTabSortType}
+          onReorder={handleUnifiedListReorder}
+          onDragStart={() => setDragging(true)}
+          onDragEnd={() => setDragging(false)}
+          onAssistantSwitch={setActiveAssistant}
+          onAssistantDelete={onDeleteAssistant}
+          onAgentDelete={deleteAgent}
+          onAgentPress={setActiveAgentId}
+          addPreset={addAssistantPreset}
+          copyAssistant={copyAssistant}
+          onCreateDefaultAssistant={onCreateDefaultAssistant}
+          handleSortByChange={handleSortByChange}
+          sortByPinyinAsc={sortByPinyinAsc}
+          sortByPinyinDesc={sortByPinyinDesc}
+        />
+      )}
+
+      <UnifiedAddButton onCreateAssistant={onCreateAssistant} />
+
+      {!dragging && <div style={{ minHeight: 10 }}></div>}
    </Container>
  )
 }
@ -28,7 +176,6 @@ const Container = styled(Scrollbar)`
  display: flex;
  flex-direction: column;
  padding: 10px;
-  margin-top: 3px;
 `

 export default AssistantsTab
--- a/src/renderer/src/pages/home/Tabs/components/AddButton.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/AddButton.tsx
@ -0,0 +1,25 @@
+import type { ButtonProps } from '@heroui/react'
+import { Button, cn } from '@heroui/react'
+import { PlusIcon } from 'lucide-react'
+import type { FC } from 'react'
+
+interface Props extends ButtonProps {
+  children: React.ReactNode
+}
+
+const AddButton: FC<Props> = ({ children, className, ...props }) => {
+  return (
+    <Button
+      {...props}
+      onPress={props.onPress}
+      className={cn(
+        '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" />}>
+      {children}
+    </Button>
+  )
+}
+
+export default AddButton
--- a/src/renderer/src/pages/home/Tabs/components/AgentItem.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/AgentItem.tsx
@ -1,11 +1,14 @@
-import { Button, Chip, cn } from '@heroui/react'
+import { cn } from '@heroui/react'
 import { DeleteIcon, EditIcon } from '@renderer/components/Icons'
 import { useSessions } from '@renderer/hooks/agents/useSessions'
+import { useSettings } from '@renderer/hooks/useSettings'
 import AgentSettingsPopup from '@renderer/pages/settings/AgentSettings/AgentSettingsPopup'
 import { AgentLabel } from '@renderer/pages/settings/AgentSettings/shared'
+import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
 import type { AgentEntity } from '@renderer/types'
 import { ContextMenu, ContextMenuContent, ContextMenuItem, ContextMenuTrigger } from '@renderer/ui/context-menu'
-import { type FC, memo } from 'react'
+import { Bot } from 'lucide-react'
+import { type FC, memo, useCallback } from 'react'
 import { useTranslation } from 'react-i18next'

 // const logger = loggerService.withContext('AgentItem')
@ -20,81 +23,100 @@ interface AgentItemProps {
 const AgentItem: FC<AgentItemProps> = ({ agent, isActive, onDelete, onPress }) => {
  const { t } = useTranslation()
  const { sessions } = useSessions(agent.id)
+  const { clickAssistantToShowTopic, topicPosition } = useSettings()
+
+  const handlePress = useCallback(() => {
+    // Show session sidebar if setting is enabled (reusing the assistant setting for consistency)
+    if (clickAssistantToShowTopic) {
+      if (topicPosition === 'left') {
+        EventEmitter.emit(EVENT_NAMES.SWITCH_TOPIC_SIDEBAR)
+      }
+    }
+    onPress()
+  }, [clickAssistantToShowTopic, topicPosition, onPress])

  return (
-    <>
-      <ContextMenu modal={false}>
-        <ContextMenuTrigger>
-          <ButtonContainer onPress={onPress} className={isActive ? 'active' : ''}>
-            <AssistantNameRow className="name flex w-full justify-between" title={agent.name ?? agent.id}>
+    <ContextMenu modal={false}>
+      <ContextMenuTrigger>
+        <Container onClick={handlePress} isActive={isActive}>
+          <AssistantNameRow className="name" title={agent.name ?? agent.id}>
+            <AgentNameWrapper>
              <AgentLabel agent={agent} />
-              {isActive && (
-                <Chip
-                  variant="bordered"
-                  size="sm"
-                  radius="full"
-                  className="aspect-square h-5 w-5 items-center justify-center border-[0.5px] bg-background text-[10px]">
-                  {sessions.length}
-                </Chip>
-              )}
-            </AssistantNameRow>
-          </ButtonContainer>
-        </ContextMenuTrigger>
-        <ContextMenuContent>
-          <ContextMenuItem
-            key="edit"
-            onClick={async () => {
-              // onOpen()
-              await AgentSettingsPopup.show({
-                agentId: agent.id
-              })
-            }}>
-            <EditIcon size={14} />
-            {t('common.edit')}
-          </ContextMenuItem>
-          <ContextMenuItem
-            key="delete"
-            className="text-danger"
-            onClick={() => {
-              window.modal.confirm({
-                title: t('agent.delete.title'),
-                content: t('agent.delete.content'),
-                centered: true,
-                okButtonProps: { danger: true },
-                onOk: () => onDelete(agent)
-              })
-            }}>
-            <DeleteIcon size={14} className="lucide-custom text-danger" />
-            <span className="text-danger">{t('common.delete')}</span>
-          </ContextMenuItem>
-        </ContextMenuContent>
-      </ContextMenu>
-      {/* <AgentModal isOpen={isOpen} onClose={onClose} agent={agent} /> */}
-    </>
+            </AgentNameWrapper>
+          </AssistantNameRow>
+          <MenuButton>
+            {isActive ? <SessionCount>{sessions.length}</SessionCount> : <Bot size={14} className="text-primary" />}
+          </MenuButton>
+        </Container>
+      </ContextMenuTrigger>
+      <ContextMenuContent>
+        <ContextMenuItem key="edit" onClick={() => AgentSettingsPopup.show({ agentId: agent.id })}>
+          <EditIcon size={14} />
+          {t('common.edit')}
+        </ContextMenuItem>
+        <ContextMenuItem
+          key="delete"
+          className="text-danger"
+          onClick={() => {
+            window.modal.confirm({
+              title: t('agent.delete.title'),
+              content: t('agent.delete.content'),
+              centered: true,
+              okButtonProps: { danger: true },
+              onOk: () => onDelete(agent)
+            })
+          }}>
+          <DeleteIcon size={14} className="lucide-custom text-danger" />
+          <span className="text-danger">{t('common.delete')}</span>
+        </ContextMenuItem>
+      </ContextMenuContent>
+    </ContextMenu>
  )
 }

-const ButtonContainer: React.FC<React.ComponentProps<typeof Button>> = ({ className, children, ...props }) => (
-  <Button
-    {...props}
+export const Container: React.FC<{ isActive?: boolean } & React.HTMLAttributes<HTMLDivElement>> = ({
+  className,
+  isActive,
+  ...props
+}) => (
+  <div
    className={cn(
-      'relative mb-2 flex h-[37px] flex-row justify-between p-2.5',
-      'rounded-[var(--list-item-border-radius)]',
-      'border-[0.5px] border-transparent',
-      'w-[calc(var(--assistants-width)_-_20px)]',
-      'bg-transparent hover:bg-[var(--color-list-item)] hover:shadow-sm',
-      'cursor-pointer',
-      className?.includes('active') && 'bg-[var(--color-list-item)] shadow-sm',
+      'relative flex h-[37px] w-[calc(var(--assistants-width)-20px)] cursor-pointer flex-row justify-between rounded-[var(--list-item-border-radius)] border border-transparent px-2 hover:bg-[var(--color-list-item-hover)]',
+      isActive && 'bg-[var(--color-list-item)] shadow-[0_1px_2px_0_rgba(0,0,0,0.05)]',
      className
-    )}>
-    {children}
-  </Button>
+    )}
+    {...props}
+  />
 )

-const AssistantNameRow: React.FC<React.HTMLAttributes<HTMLDivElement>> = ({ className, ...props }) => (
+export const AssistantNameRow: React.FC<React.HTMLAttributes<HTMLDivElement>> = ({ className, ...props }) => (
  <div
+    className={cn('flex min-w-0 flex-1 flex-row items-center gap-2 text-[13px] text-[var(--color-text)]', className)}
+    {...props}
+  />
+)
+
+export const AgentNameWrapper: React.FC<React.HTMLAttributes<HTMLDivElement>> = ({ className, ...props }) => (
+  <div className={cn('min-w-0 flex-1 overflow-hidden text-ellipsis whitespace-nowrap', className)} {...props} />
+)
+
+export const MenuButton: React.FC<React.HTMLAttributes<HTMLDivElement>> = ({ className, ...props }) => (
+  <div
+    className={cn(
+      'absolute top-[6px] right-[9px] flex h-[22px] min-h-[22px] w-[22px] flex-row items-center justify-center rounded-full border border-[var(--color-border)] bg-[var(--color-background)] px-[5px]',
+      className
+    )}
+    {...props}
+  />
+)
+
+export const SessionCount: React.FC<React.HTMLAttributes<HTMLDivElement>> = ({ className, ...props }) => (
+  <div
+    className={cn(
+      'flex flex-row items-center justify-center rounded-full text-[10px] text-[var(--color-text)]',
+      className
+    )}
    {...props}
-    className={cn('text-[13px] text-[var(--color-text)]', 'flex flex-row items-center gap-2', className)}
  />
 )

--- a/src/renderer/src/pages/home/Tabs/components/AgentSection.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/AgentSection.tsx
@ -1,39 +0,0 @@
-import { Alert } from '@heroui/react'
-import { useRuntime } from '@renderer/hooks/useRuntime'
-import { useSettings } from '@renderer/hooks/useSettings'
-import { useAppDispatch } from '@renderer/store'
-import { addIknowAction } from '@renderer/store/runtime'
-import { useTranslation } from 'react-i18next'
-
-import { Agents } from './Agents'
-import { SectionName } from './SectionName'
-
-const ALERT_KEY = 'enable_api_server_to_use_agent'
-
-export const AgentSection = () => {
-  const { t } = useTranslation()
-  const { apiServer } = useSettings()
-  const { iknow } = useRuntime()
-  const dispatch = useAppDispatch()
-
-  if (!apiServer.enabled) {
-    if (iknow[ALERT_KEY]) return null
-    return (
-      <Alert
-        color="warning"
-        title={t('agent.warning.enable_server')}
-        isClosable
-        onClose={() => {
-          dispatch(addIknowAction(ALERT_KEY))
-        }}
-      />
-    )
-  }
-
-  return (
-    <div className="agents-tab mb-2 h-full w-full">
-      <SectionName name={t('common.agent_other')} />
-      <Agents />
-    </div>
-  )
-}
--- a/src/renderer/src/pages/home/Tabs/components/AssistantItem.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/AssistantItem.tsx
@ -1,4 +1,5 @@
 import { usePreference } from '@data/hooks/usePreference'
+import { cn } from '@heroui/react'
 import ModelAvatar from '@renderer/components/Avatar/ModelAvatar'
 import EmojiIcon from '@renderer/components/EmojiIcon'
 import { CopyIcon, DeleteIcon, EditIcon } from '@renderer/components/Icons'
@ -30,10 +31,9 @@ import {
  Tag,
  Tags
 } from 'lucide-react'
-import type { FC } from 'react'
+import type { FC, PropsWithChildren } from 'react'
 import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import styled from 'styled-components'
 import * as tinyPinyin from 'tiny-pinyin'

 import AssistantTagsPopup from './AssistantTagsPopup'
@ -49,6 +49,8 @@ interface AssistantItemProps {
  copyAssistant: (assistant: Assistant) => void
  onTagClick?: (tag: string) => void
  handleSortByChange?: (sortType: AssistantTabSortType) => void
+  sortByPinyinAsc?: () => void
+  sortByPinyinDesc?: () => void
 }

 const AssistantItem: FC<AssistantItemProps> = ({
@ -59,7 +61,9 @@ const AssistantItem: FC<AssistantItemProps> = ({
  onDelete,
  addPreset,
  copyAssistant,
-  handleSortByChange
+  handleSortByChange,
+  sortByPinyinAsc: externalSortByPinyinAsc,
+  sortByPinyinDesc: externalSortByPinyinDesc
 }) => {
  const [assistantIconType, setAssistantIconType] = usePreference('assistant.icon_type')
  const [clickAssistantToShowTopic] = usePreference('assistant.click_to_show_topic')
@ -84,14 +88,19 @@ const AssistantItem: FC<AssistantItemProps> = ({
    setIsPending(hasPending)
  }, [isActive, assistant.topics])

-  const sortByPinyinAsc = useCallback(() => {
+  // Local sort functions
+  const localSortByPinyinAsc = useCallback(() => {
    updateAssistants(sortAssistantsByPinyin(assistants, true))
  }, [assistants, updateAssistants])

-  const sortByPinyinDesc = useCallback(() => {
+  const localSortByPinyinDesc = useCallback(() => {
    updateAssistants(sortAssistantsByPinyin(assistants, false))
  }, [assistants, updateAssistants])

+  // Use external sort functions if provided, otherwise use local ones
+  const sortByPinyinAsc = externalSortByPinyinAsc || localSortByPinyinAsc
+  const sortByPinyinDesc = externalSortByPinyinDesc || localSortByPinyinDesc
+
  const menuItems = useMemo(
    () =>
      getMenuItems({
@ -151,7 +160,7 @@ const AssistantItem: FC<AssistantItemProps> = ({
      menu={{ items: menuItems }}
      trigger={['contextMenu']}
      popupRender={(menu) => <div onPointerDown={(e) => e.stopPropagation()}>{menu}</div>}>
-      <Container onClick={handleSwitch} className={isActive ? 'active' : ''}>
+      <Container onClick={handleSwitch} isActive={isActive}>
        <AssistantNameRow className="name" title={fullAssistantName}>
          {assistantIconType === 'model' ? (
            <ModelAvatar
@ -386,65 +395,75 @@ function getMenuItems({
  ]
 }

-const Container = styled.div`
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  padding: 0 8px;
-  height: 37px;
-  position: relative;
-  border-radius: var(--list-item-border-radius);
-  border: 0.5px solid transparent;
-  width: calc(var(--assistants-width) - 20px);
-  cursor: pointer;
+const Container = ({
+  children,
+  isActive,
+  className,
+  ...props
+}: PropsWithChildren<{ isActive?: boolean } & React.HTMLAttributes<HTMLDivElement>>) => (
+  <div
+    {...props}
+    className={cn(
+      'relative flex h-[37px] w-[calc(var(--assistants-width)-20px)] cursor-pointer flex-row justify-between rounded-[var(--list-item-border-radius)] border-[0.5px] border-transparent px-2 hover:bg-[var(--color-list-item-hover)]',
+      isActive && 'bg-[var(--color-list-item)] shadow-[0_1px_2px_0_rgba(0,0,0,0.05)]',
+      className
+    )}>
+    {children}
+  </div>
+)

-  &:hover {
-    background-color: var(--color-list-item-hover);
-  }
-  &.active {
-    background-color: var(--color-list-item);
-    box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
-  }
-`
+const AssistantNameRow = ({
+  children,
+  className,
+  ...props
+}: PropsWithChildren<{} & React.HTMLAttributes<HTMLDivElement>>) => (
+  <div
+    {...props}
+    className={cn('flex min-w-0 flex-1 flex-row items-center gap-2 text-[13px] text-[var(--color-text)]', className)}>
+    {children}
+  </div>
+)

-const AssistantNameRow = styled.div`
-  color: var(--color-text);
-  font-size: 13px;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  gap: 8px;
-`
+const AssistantName = ({
+  children,
+  className,
+  ...props
+}: PropsWithChildren<{} & React.HTMLAttributes<HTMLDivElement>>) => (
+  <div
+    {...props}
+    className={cn('min-w-0 flex-1 overflow-hidden text-ellipsis whitespace-nowrap text-[13px]', className)}>
+    {children}
+  </div>
+)

-const AssistantName = styled.div`
-  font-size: 13px;
-`
+const MenuButton = ({
+  children,
+  className,
+  ...props
+}: PropsWithChildren<{} & React.HTMLAttributes<HTMLDivElement>>) => (
+  <div
+    {...props}
+    className={cn(
+      'absolute top-[6px] right-[9px] flex h-[22px] min-h-[22px] min-w-[22px] flex-row items-center justify-center rounded-[11px] border-[0.5px] border-[var(--color-border)] bg-[var(--color-background)] px-[5px]',
+      className
+    )}>
+    {children}
+  </div>
+)

-const MenuButton = styled.div`
-  display: flex;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-  min-width: 22px;
-  height: 22px;
-  min-height: 22px;
-  border-radius: 11px;
-  position: absolute;
-  background-color: var(--color-background);
-  right: 9px;
-  top: 6px;
-  padding: 0 5px;
-  border: 0.5px solid var(--color-border);
-`
-
-const TopicCount = styled.div`
-  color: var(--color-text);
-  font-size: 10px;
-  border-radius: 10px;
-  display: flex;
-  flex-direction: row;
-  justify-content: center;
-  align-items: center;
-`
+const TopicCount = ({
+  children,
+  className,
+  ...props
+}: PropsWithChildren<{} & React.HTMLAttributes<HTMLDivElement>>) => (
+  <div
+    {...props}
+    className={cn(
+      'flex flex-row items-center justify-center rounded-[10px] text-[10px] text-[var(--color-text)]',
+      className
+    )}>
+    {children}
+  </div>
+)

 export default memo(AssistantItem)
--- a/src/renderer/src/pages/home/Tabs/components/Sessions.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/Sessions.tsx
@ -1,4 +1,4 @@
-import { Alert, Button, Spinner } from '@heroui/react'
+import { Alert, Spinner } from '@heroui/react'
 import { DynamicVirtualList } from '@renderer/components/VirtualList'
 import { useAgent } from '@renderer/hooks/agents/useAgent'
 import { useSessions } from '@renderer/hooks/agents/useSessions'
@ -13,10 +13,10 @@ import {
 import type { CreateSessionForm } from '@renderer/types'
 import { buildAgentSessionTopicId } from '@renderer/utils/agentSession'
 import { AnimatePresence, motion } from 'framer-motion'
-import { Plus } from 'lucide-react'
 import { memo, useCallback, useEffect } from 'react'
 import { useTranslation } from 'react-i18next'

+import AddButton from './AddButton'
 import SessionItem from './SessionItem'

 // const logger = loggerService.withContext('SessionsTab')
@ -115,12 +115,9 @@ const Sessions: React.FC<SessionsProps> = ({ agentId }) => {
      transition={{ duration: 0.3 }}
      className="sessions-tab flex h-full w-full flex-col p-2">
      <motion.div initial={{ opacity: 0, y: -10 }} animate={{ opacity: 1, y: 0 }}>
-        <Button
-          onPress={handleCreateSession}
-          className="mb-2 w-full justify-start bg-transparent text-foreground-500 hover:bg-accent">
-          <Plus size={16} className="mr-1 shrink-0" />
+        <AddButton onPress={handleCreateSession} className="mb-2">
          {t('agent.session.add.title')}
-        </Button>
+        </AddButton>
      </motion.div>
      <AnimatePresence>
        {/* h-9 */}
--- a/src/renderer/src/pages/home/Tabs/components/TagGroup.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/TagGroup.tsx
@ -0,0 +1,63 @@
+import { DownOutlined, RightOutlined } from '@ant-design/icons'
+import { Tooltip } from '@cherrystudio/ui'
+import { cn } from '@heroui/react'
+import type { FC, ReactNode } from 'react'
+
+interface TagGroupProps {
+  tag: string
+  isCollapsed: boolean
+  onToggle: (tag: string) => void
+  showTitle?: boolean
+  children: ReactNode
+}
+
+export const TagGroup: FC<TagGroupProps> = ({ tag, isCollapsed, onToggle, showTitle = true, children }) => {
+  return (
+    <TagsContainer>
+      {showTitle && (
+        <GroupTitle onClick={() => onToggle(tag)}>
+          <Tooltip title={tag}>
+            <GroupTitleName>
+              {isCollapsed ? (
+                <RightOutlined style={{ fontSize: '10px', marginRight: '5px' }} />
+              ) : (
+                <DownOutlined style={{ fontSize: '10px', marginRight: '5px' }} />
+              )}
+              {tag}
+            </GroupTitleName>
+          </Tooltip>
+          <GroupTitleDivider />
+        </GroupTitle>
+      )}
+      {!isCollapsed && <div>{children}</div>}
+    </TagsContainer>
+  )
+}
+
+const TagsContainer: FC<React.HTMLAttributes<HTMLDivElement>> = ({ children, ...props }) => (
+  <div className={cn('flex flex-col gap-2')} {...props}>
+    {children}
+  </div>
+)
+
+const GroupTitle: FC<React.HTMLAttributes<HTMLDivElement>> = ({ children, ...props }) => (
+  <div
+    className={cn(
+      'my-1 flex h-6 cursor-pointer flex-row items-center justify-between font-medium text-[var(--color-text-2)] text-xs'
+    )}
+    {...props}>
+    {children}
+  </div>
+)
+
+const GroupTitleName: FC<React.HTMLAttributes<HTMLDivElement>> = ({ children, ...props }) => (
+  <div
+    className={cn('mr-1 box-border flex max-w-[50%] truncate px-1 text-[13px] text-[var(--color-text)] leading-6')}
+    {...props}>
+    {children}
+  </div>
+)
+
+const GroupTitleDivider: FC<React.HTMLAttributes<HTMLDivElement>> = (props) => (
+  <div className={cn('flex-1 border-[var(--color-border)] border-t')} {...props} />
+)
--- a/src/renderer/src/pages/home/Tabs/components/Topics.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/Topics.tsx
@ -42,7 +42,6 @@ import {
  PackagePlus,
  PinIcon,
  PinOffIcon,
-  PlusIcon,
  Save,
  Sparkles,
  UploadIcon,
@ -52,6 +51,9 @@ import { useCallback, useDeferredValue, useEffect, useMemo, useRef, useState } f
 import { useTranslation } from 'react-i18next'
 import { useDispatch, useSelector } from 'react-redux'
 import styled from 'styled-components'
+
+import AddButton from './AddButton'
+
 interface Props {
  assistant: Assistant
  activeTopic: Topic
@ -505,13 +507,12 @@ export const Topics: React.FC<Props> = ({ assistant: _assistant, activeTopic, se
      className="topics-tab"
      list={sortedTopics}
      onUpdate={updateTopics}
-      style={{ height: '100%', padding: '13px 0 10px 10px' }}
+      style={{ height: '100%', padding: '11px 0 10px 10px' }}
      itemContainerStyle={{ paddingBottom: '8px' }}
      header={
-        <AddTopicButton onClick={() => EventEmitter.emit(EVENT_NAMES.ADD_NEW_TOPIC)}>
-          <PlusIcon size={16} />
+        <AddButton onPress={() => EventEmitter.emit(EVENT_NAMES.ADD_NEW_TOPIC)} className="mb-2">
          {t('chat.add.topic.title')}
-        </AddTopicButton>
+        </AddButton>
      }>
      {(topic) => {
        const isActive = topic.id === activeTopic?.id
@ -748,31 +749,6 @@ const FulfilledIndicator = styled.div.attrs({
  background-color: var(--color-status-success);
 `

-const AddTopicButton = styled.div`
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  width: calc(100% - 10px);
-  padding: 7px 12px;
-  margin-bottom: 8px;
-  background: transparent;
-  color: var(--color-text-2);
-  font-size: 13px;
-  border-radius: var(--list-item-border-radius);
-  cursor: pointer;
-  transition: all 0.2s;
-  margin-top: -5px;
-
-  &:hover {
-    background-color: var(--color-list-item-hover);
-    color: var(--color-text-1);
-  }
-
-  .anticon {
-    font-size: 12px;
-  }
-`
-
 const TopicPromptText = styled.div`
  color: var(--color-text-2);
  font-size: 12px;
--- a/src/renderer/src/pages/home/Tabs/components/UnifiedAddButton.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/UnifiedAddButton.tsx
@ -0,0 +1,62 @@
+import { Button, Popover, PopoverContent, PopoverTrigger } from '@heroui/react'
+import { AgentModal } from '@renderer/components/Popups/agent/AgentModal'
+import { Bot, MessageSquare } from 'lucide-react'
+import type { FC } from 'react'
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import AddButton from './AddButton'
+
+interface UnifiedAddButtonProps {
+  onCreateAssistant: () => void
+}
+
+const UnifiedAddButton: FC<UnifiedAddButtonProps> = ({ onCreateAssistant }) => {
+  const { t } = useTranslation()
+  const [isPopoverOpen, setIsPopoverOpen] = useState(false)
+  const [isAgentModalOpen, setIsAgentModalOpen] = useState(false)
+
+  const handleAddAssistant = () => {
+    setIsPopoverOpen(false)
+    onCreateAssistant()
+  }
+
+  const handleAddAgent = () => {
+    setIsPopoverOpen(false)
+    setIsAgentModalOpen(true)
+  }
+
+  return (
+    <div className="mb-1">
+      <Popover
+        isOpen={isPopoverOpen}
+        onOpenChange={setIsPopoverOpen}
+        placement="bottom"
+        classNames={{ content: 'p-0 min-w-[200px]' }}>
+        <PopoverTrigger>
+          <AddButton>{t('chat.add.assistant.title')}</AddButton>
+        </PopoverTrigger>
+        <PopoverContent>
+          <div className="flex w-full flex-col gap-1 p-1">
+            <Button
+              onPress={handleAddAssistant}
+              className="w-full justify-start bg-transparent hover:bg-[var(--color-list-item)]"
+              startContent={<MessageSquare size={16} className="shrink-0" />}>
+              {t('chat.add.assistant.title')}
+            </Button>
+            <Button
+              onPress={handleAddAgent}
+              className="w-full justify-start bg-transparent hover:bg-[var(--color-list-item)]"
+              startContent={<Bot size={16} className="shrink-0" />}>
+              {t('agent.add.title')}
+            </Button>
+          </div>
+        </PopoverContent>
+      </Popover>
+
+      <AgentModal isOpen={isAgentModalOpen} onClose={() => setIsAgentModalOpen(false)} />
+    </div>
+  )
+}
+
+export default UnifiedAddButton
--- a/src/renderer/src/pages/home/Tabs/components/UnifiedList.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/UnifiedList.tsx
@ -0,0 +1,110 @@
+import { DraggableList } from '@renderer/components/DraggableList'
+import type { Assistant } from '@renderer/types'
+import type { AssistantTabSortType } from '@shared/data/preference/preferenceTypes'
+import type { FC } from 'react'
+import { useCallback } from 'react'
+
+import type { UnifiedItem } from '../hooks/useUnifiedItems'
+import AgentItem from './AgentItem'
+import AssistantItem from './AssistantItem'
+
+interface UnifiedListProps {
+  items: UnifiedItem[]
+  activeAssistantId: string
+  activeAgentId: string | null
+  sortBy: AssistantTabSortType
+  onReorder: (newList: UnifiedItem[]) => void
+  onDragStart: () => void
+  onDragEnd: () => void
+  onAssistantSwitch: (assistant: Assistant) => void
+  onAssistantDelete: (assistant: Assistant) => void
+  onAgentDelete: (agentId: string) => void
+  onAgentPress: (agentId: string) => void
+  addPreset: (assistant: Assistant) => void
+  copyAssistant: (assistant: Assistant) => void
+  onCreateDefaultAssistant: () => void
+  handleSortByChange: (sortType: AssistantTabSortType) => void
+  sortByPinyinAsc: () => void
+  sortByPinyinDesc: () => void
+}
+
+export const UnifiedList: FC<UnifiedListProps> = (props) => {
+  const {
+    items,
+    activeAssistantId,
+    activeAgentId,
+    sortBy,
+    onReorder,
+    onDragStart,
+    onDragEnd,
+    onAssistantSwitch,
+    onAssistantDelete,
+    onAgentDelete,
+    onAgentPress,
+    addPreset,
+    copyAssistant,
+    onCreateDefaultAssistant,
+    handleSortByChange,
+    sortByPinyinAsc,
+    sortByPinyinDesc
+  } = props
+
+  const renderUnifiedItem = useCallback(
+    (item: UnifiedItem) => {
+      if (item.type === 'agent') {
+        return (
+          <AgentItem
+            key={`agent-${item.data.id}`}
+            agent={item.data}
+            isActive={item.data.id === activeAgentId}
+            onDelete={() => onAgentDelete(item.data.id)}
+            onPress={() => onAgentPress(item.data.id)}
+          />
+        )
+      } else {
+        return (
+          <AssistantItem
+            key={`assistant-${item.data.id}`}
+            assistant={item.data}
+            isActive={item.data.id === activeAssistantId}
+            sortBy={sortBy}
+            onSwitch={onAssistantSwitch}
+            onDelete={onAssistantDelete}
+            addPreset={addPreset}
+            copyAssistant={copyAssistant}
+            onCreateDefaultAssistant={onCreateDefaultAssistant}
+            handleSortByChange={handleSortByChange}
+            sortByPinyinAsc={sortByPinyinAsc}
+            sortByPinyinDesc={sortByPinyinDesc}
+          />
+        )
+      }
+    },
+    [
+      activeAgentId,
+      activeAssistantId,
+      sortBy,
+      onAssistantSwitch,
+      onAssistantDelete,
+      onAgentDelete,
+      onAgentPress,
+      addPreset,
+      copyAssistant,
+      onCreateDefaultAssistant,
+      handleSortByChange,
+      sortByPinyinAsc,
+      sortByPinyinDesc
+    ]
+  )
+
+  return (
+    <DraggableList
+      list={items}
+      itemKey={(item) => `${item.type}-${item.data.id}`}
+      onUpdate={onReorder}
+      onDragStart={onDragStart}
+      onDragEnd={onDragEnd}>
+      {renderUnifiedItem}
+    </DraggableList>
+  )
+}
--- a/src/renderer/src/pages/home/Tabs/components/UnifiedTagGroups.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/UnifiedTagGroups.tsx
@ -0,0 +1,134 @@
+import { DraggableList } from '@renderer/components/DraggableList'
+import type { Assistant } from '@renderer/types'
+import type { AssistantTabSortType } from '@shared/data/preference/preferenceTypes'
+import type { FC } from 'react'
+import { useCallback } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import type { UnifiedItem } from '../hooks/useUnifiedItems'
+import AgentItem from './AgentItem'
+import AssistantItem from './AssistantItem'
+import { TagGroup } from './TagGroup'
+
+interface GroupedItems {
+  tag: string
+  items: UnifiedItem[]
+}
+
+interface UnifiedTagGroupsProps {
+  groupedItems: GroupedItems[]
+  activeAssistantId: string
+  activeAgentId: string | null
+  sortBy: AssistantTabSortType
+  collapsedTags: Record<string, boolean>
+  onGroupReorder: (tag: string, newList: UnifiedItem[]) => void
+  onDragStart: () => void
+  onDragEnd: () => void
+  onToggleTagCollapse: (tag: string) => void
+  onAssistantSwitch: (assistant: Assistant) => void
+  onAssistantDelete: (assistant: Assistant) => void
+  onAgentDelete: (agentId: string) => void
+  onAgentPress: (agentId: string) => void
+  addPreset: (assistant: Assistant) => void
+  copyAssistant: (assistant: Assistant) => void
+  onCreateDefaultAssistant: () => void
+  handleSortByChange: (sortType: AssistantTabSortType) => void
+  sortByPinyinAsc: () => void
+  sortByPinyinDesc: () => void
+}
+
+export const UnifiedTagGroups: FC<UnifiedTagGroupsProps> = (props) => {
+  const {
+    groupedItems,
+    activeAssistantId,
+    activeAgentId,
+    sortBy,
+    collapsedTags,
+    onGroupReorder,
+    onDragStart,
+    onDragEnd,
+    onToggleTagCollapse,
+    onAssistantSwitch,
+    onAssistantDelete,
+    onAgentDelete,
+    onAgentPress,
+    addPreset,
+    copyAssistant,
+    onCreateDefaultAssistant,
+    handleSortByChange,
+    sortByPinyinAsc,
+    sortByPinyinDesc
+  } = props
+
+  const { t } = useTranslation()
+
+  const renderUnifiedItem = useCallback(
+    (item: UnifiedItem) => {
+      if (item.type === 'agent') {
+        return (
+          <AgentItem
+            key={`agent-${item.data.id}`}
+            agent={item.data}
+            isActive={item.data.id === activeAgentId}
+            onDelete={() => onAgentDelete(item.data.id)}
+            onPress={() => onAgentPress(item.data.id)}
+          />
+        )
+      } else {
+        return (
+          <AssistantItem
+            key={`assistant-${item.data.id}`}
+            assistant={item.data}
+            isActive={item.data.id === activeAssistantId}
+            sortBy={sortBy}
+            onSwitch={onAssistantSwitch}
+            onDelete={onAssistantDelete}
+            addPreset={addPreset}
+            copyAssistant={copyAssistant}
+            onCreateDefaultAssistant={onCreateDefaultAssistant}
+            handleSortByChange={handleSortByChange}
+            sortByPinyinAsc={sortByPinyinAsc}
+            sortByPinyinDesc={sortByPinyinDesc}
+          />
+        )
+      }
+    },
+    [
+      activeAgentId,
+      activeAssistantId,
+      sortBy,
+      onAssistantSwitch,
+      onAssistantDelete,
+      onAgentDelete,
+      onAgentPress,
+      addPreset,
+      copyAssistant,
+      onCreateDefaultAssistant,
+      handleSortByChange,
+      sortByPinyinAsc,
+      sortByPinyinDesc
+    ]
+  )
+
+  return (
+    <div>
+      {groupedItems.map((group) => (
+        <TagGroup
+          key={group.tag}
+          tag={group.tag}
+          isCollapsed={collapsedTags[group.tag]}
+          onToggle={onToggleTagCollapse}
+          showTitle={group.tag !== t('assistants.tags.untagged')}>
+          <DraggableList
+            list={group.items}
+            itemKey={(item) => `${item.type}-${item.data.id}`}
+            onUpdate={(newList) => onGroupReorder(group.tag, newList)}
+            onDragStart={onDragStart}
+            onDragEnd={onDragEnd}>
+            {renderUnifiedItem}
+          </DraggableList>
+        </TagGroup>
+      ))}
+    </div>
+  )
+}
--- a/src/renderer/src/pages/home/Tabs/hooks/useActiveAgent.ts
+++ b/src/renderer/src/pages/home/Tabs/hooks/useActiveAgent.ts
@ -0,0 +1,19 @@
+import { useAgentSessionInitializer } from '@renderer/hooks/agents/useAgentSessionInitializer'
+import { useAppDispatch } from '@renderer/store'
+import { setActiveAgentId as setActiveAgentIdAction } from '@renderer/store/runtime'
+import { useCallback } from 'react'
+
+export const useActiveAgent = () => {
+  const dispatch = useAppDispatch()
+  const { initializeAgentSession } = useAgentSessionInitializer()
+
+  const setActiveAgentId = useCallback(
+    async (id: string) => {
+      dispatch(setActiveAgentIdAction(id))
+      await initializeAgentSession(id)
+    },
+    [dispatch, initializeAgentSession]
+  )
+
+  return { setActiveAgentId }
+}
--- a/src/renderer/src/pages/home/Tabs/hooks/useUnifiedGrouping.ts
+++ b/src/renderer/src/pages/home/Tabs/hooks/useUnifiedGrouping.ts
@ -0,0 +1,140 @@
+import { useAppDispatch } from '@renderer/store'
+import { setUnifiedListOrder } from '@renderer/store/assistants'
+import type { AgentEntity, Assistant } from '@renderer/types'
+import { useCallback, useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+
+import type { UnifiedItem } from './useUnifiedItems'
+
+interface UseUnifiedGroupingOptions {
+  unifiedItems: UnifiedItem[]
+  assistants: Assistant[]
+  agents: AgentEntity[]
+  apiServerEnabled: boolean
+  agentsLoading: boolean
+  agentsError: Error | null
+  updateAssistants: (assistants: Assistant[]) => void
+}
+
+export const useUnifiedGrouping = (options: UseUnifiedGroupingOptions) => {
+  const { unifiedItems, assistants, agents, apiServerEnabled, agentsLoading, agentsError, updateAssistants } = options
+  const { t } = useTranslation()
+  const dispatch = useAppDispatch()
+
+  // Group unified items by tags
+  const groupedUnifiedItems = useMemo(() => {
+    const groups = new Map<string, UnifiedItem[]>()
+
+    unifiedItems.forEach((item) => {
+      if (item.type === 'agent') {
+        // Agents go to untagged group
+        const groupKey = t('assistants.tags.untagged')
+        if (!groups.has(groupKey)) {
+          groups.set(groupKey, [])
+        }
+        groups.get(groupKey)!.push(item)
+      } else {
+        // Assistants use their tags
+        const tags = item.data.tags?.length ? item.data.tags : [t('assistants.tags.untagged')]
+        tags.forEach((tag) => {
+          if (!groups.has(tag)) {
+            groups.set(tag, [])
+          }
+          groups.get(tag)!.push(item)
+        })
+      }
+    })
+
+    // Sort groups: untagged first, then tagged groups
+    const untaggedKey = t('assistants.tags.untagged')
+    const sortedGroups = Array.from(groups.entries()).sort(([tagA], [tagB]) => {
+      if (tagA === untaggedKey) return -1
+      if (tagB === untaggedKey) return 1
+      return 0
+    })
+
+    return sortedGroups.map(([tag, items]) => ({ tag, items }))
+  }, [unifiedItems, t])
+
+  const handleUnifiedGroupReorder = useCallback(
+    (tag: string, newGroupList: UnifiedItem[]) => {
+      // Extract only assistants from the new list for updating
+      const newAssistants = newGroupList.filter((item) => item.type === 'assistant').map((item) => item.data)
+
+      // Update assistants state
+      let insertIndex = 0
+      const updatedAssistants = assistants.map((a) => {
+        const tags = a.tags?.length ? a.tags : [t('assistants.tags.untagged')]
+        if (tags.includes(tag)) {
+          const replaced = newAssistants[insertIndex]
+          insertIndex += 1
+          return replaced || a
+        }
+        return a
+      })
+      updateAssistants(updatedAssistants)
+
+      // Rebuild unified order and save to Redux
+      const newUnifiedItems: UnifiedItem[] = []
+      const availableAgents = new Map<string, AgentEntity>()
+      const availableAssistants = new Map<string, Assistant>()
+
+      if (apiServerEnabled && !agentsLoading && !agentsError) {
+        agents.forEach((agent) => availableAgents.set(agent.id, agent))
+      }
+      updatedAssistants.forEach((assistant) => availableAssistants.set(assistant.id, assistant))
+
+      // Reconstruct order based on current groupedUnifiedItems structure
+      groupedUnifiedItems.forEach((group) => {
+        if (group.tag === tag) {
+          // Use the new group list for this tag
+          newGroupList.forEach((item) => {
+            newUnifiedItems.push(item)
+            if (item.type === 'agent') {
+              availableAgents.delete(item.data.id)
+            } else {
+              availableAssistants.delete(item.data.id)
+            }
+          })
+        } else {
+          // Keep existing order for other tags
+          group.items.forEach((item) => {
+            newUnifiedItems.push(item)
+            if (item.type === 'agent') {
+              availableAgents.delete(item.data.id)
+            } else {
+              availableAssistants.delete(item.data.id)
+            }
+          })
+        }
+      })
+
+      // Add any remaining items
+      availableAgents.forEach((agent) => newUnifiedItems.push({ type: 'agent', data: agent }))
+      availableAssistants.forEach((assistant) => newUnifiedItems.push({ type: 'assistant', data: assistant }))
+
+      // Save to Redux
+      const orderToSave = newUnifiedItems.map((item) => ({
+        type: item.type,
+        id: item.data.id
+      }))
+      dispatch(setUnifiedListOrder(orderToSave))
+    },
+    [
+      assistants,
+      t,
+      updateAssistants,
+      apiServerEnabled,
+      agentsLoading,
+      agentsError,
+      agents,
+      groupedUnifiedItems,
+      dispatch
+    ]
+  )
+
+  return {
+    groupedUnifiedItems,
+    handleUnifiedGroupReorder
+  }
+}
--- a/src/renderer/src/pages/home/Tabs/hooks/useUnifiedItems.ts
+++ b/src/renderer/src/pages/home/Tabs/hooks/useUnifiedItems.ts
@ -0,0 +1,73 @@
+import { useAppDispatch, useAppSelector } from '@renderer/store'
+import { setUnifiedListOrder } from '@renderer/store/assistants'
+import type { AgentEntity, Assistant } from '@renderer/types'
+import { useCallback, useMemo } from 'react'
+
+export type UnifiedItem = { type: 'agent'; data: AgentEntity } | { type: 'assistant'; data: Assistant }
+
+interface UseUnifiedItemsOptions {
+  agents: AgentEntity[]
+  assistants: Assistant[]
+  apiServerEnabled: boolean
+  agentsLoading: boolean
+  agentsError: Error | null
+  updateAssistants: (assistants: Assistant[]) => void
+}
+
+export const useUnifiedItems = (options: UseUnifiedItemsOptions) => {
+  const { agents, assistants, apiServerEnabled, agentsLoading, agentsError, updateAssistants } = options
+  const dispatch = useAppDispatch()
+  const unifiedListOrder = useAppSelector((state) => state.assistants.unifiedListOrder || [])
+
+  // Create unified items list (agents + assistants) with saved order
+  const unifiedItems = useMemo(() => {
+    const items: UnifiedItem[] = []
+
+    // Collect all available items
+    const availableAgents = new Map<string, AgentEntity>()
+    const availableAssistants = new Map<string, Assistant>()
+
+    if (apiServerEnabled && !agentsLoading && !agentsError) {
+      agents.forEach((agent) => availableAgents.set(agent.id, agent))
+    }
+    assistants.forEach((assistant) => availableAssistants.set(assistant.id, assistant))
+
+    // Apply saved order
+    unifiedListOrder.forEach((item) => {
+      if (item.type === 'agent' && availableAgents.has(item.id)) {
+        items.push({ type: 'agent', data: availableAgents.get(item.id)! })
+        availableAgents.delete(item.id)
+      } else if (item.type === 'assistant' && availableAssistants.has(item.id)) {
+        items.push({ type: 'assistant', data: availableAssistants.get(item.id)! })
+        availableAssistants.delete(item.id)
+      }
+    })
+
+    // Add new items (not in saved order) to the end
+    availableAgents.forEach((agent) => items.push({ type: 'agent', data: agent }))
+    availableAssistants.forEach((assistant) => items.push({ type: 'assistant', data: assistant }))
+
+    return items
+  }, [agents, assistants, apiServerEnabled, agentsLoading, agentsError, unifiedListOrder])
+
+  const handleUnifiedListReorder = useCallback(
+    (newList: UnifiedItem[]) => {
+      // Save the unified order to Redux
+      const orderToSave = newList.map((item) => ({
+        type: item.type,
+        id: item.data.id
+      }))
+      dispatch(setUnifiedListOrder(orderToSave))
+
+      // Extract and update assistants order
+      const newAssistants = newList.filter((item) => item.type === 'assistant').map((item) => item.data)
+      updateAssistants(newAssistants)
+    },
+    [dispatch, updateAssistants]
+  )
+
+  return {
+    unifiedItems,
+    handleUnifiedListReorder
+  }
+}
--- a/src/renderer/src/pages/home/Tabs/hooks/useUnifiedSorting.ts
+++ b/src/renderer/src/pages/home/Tabs/hooks/useUnifiedSorting.ts
@ -0,0 +1,56 @@
+import { useAppDispatch } from '@renderer/store'
+import { setUnifiedListOrder } from '@renderer/store/assistants'
+import type { Assistant } from '@renderer/types'
+import { useCallback } from 'react'
+import * as tinyPinyin from 'tiny-pinyin'
+
+import type { UnifiedItem } from './useUnifiedItems'
+
+interface UseUnifiedSortingOptions {
+  unifiedItems: UnifiedItem[]
+  updateAssistants: (assistants: Assistant[]) => void
+}
+
+export const useUnifiedSorting = (options: UseUnifiedSortingOptions) => {
+  const { unifiedItems, updateAssistants } = options
+  const dispatch = useAppDispatch()
+
+  const sortUnifiedItemsByPinyin = useCallback((items: UnifiedItem[], isAscending: boolean) => {
+    return [...items].sort((a, b) => {
+      const nameA = a.type === 'agent' ? a.data.name || a.data.id : a.data.name
+      const nameB = b.type === 'agent' ? b.data.name || b.data.id : b.data.name
+      const pinyinA = tinyPinyin.convertToPinyin(nameA, '', true)
+      const pinyinB = tinyPinyin.convertToPinyin(nameB, '', true)
+      return isAscending ? pinyinA.localeCompare(pinyinB) : pinyinB.localeCompare(pinyinA)
+    })
+  }, [])
+
+  const sortByPinyinAsc = useCallback(() => {
+    const sorted = sortUnifiedItemsByPinyin(unifiedItems, true)
+    const orderToSave = sorted.map((item) => ({
+      type: item.type,
+      id: item.data.id
+    }))
+    dispatch(setUnifiedListOrder(orderToSave))
+    // Also update assistants order
+    const newAssistants = sorted.filter((item) => item.type === 'assistant').map((item) => item.data)
+    updateAssistants(newAssistants)
+  }, [unifiedItems, sortUnifiedItemsByPinyin, dispatch, updateAssistants])
+
+  const sortByPinyinDesc = useCallback(() => {
+    const sorted = sortUnifiedItemsByPinyin(unifiedItems, false)
+    const orderToSave = sorted.map((item) => ({
+      type: item.type,
+      id: item.data.id
+    }))
+    dispatch(setUnifiedListOrder(orderToSave))
+    // Also update assistants order
+    const newAssistants = sorted.filter((item) => item.type === 'assistant').map((item) => item.data)
+    updateAssistants(newAssistants)
+  }, [unifiedItems, sortUnifiedItemsByPinyin, dispatch, updateAssistants])
+
+  return {
+    sortByPinyinAsc,
+    sortByPinyinDesc
+  }
+}
--- a/src/renderer/src/pages/home/Tabs/index.tsx
+++ b/src/renderer/src/pages/home/Tabs/index.tsx
@ -1,5 +1,7 @@
 import { usePreference } from '@data/hooks/usePreference'
 import AddAssistantPopup from '@renderer/components/Popups/AddAssistantPopup'
+import { useAgent } from '@renderer/hooks/agents/useAgent'
+import { useUpdateAgent } from '@renderer/hooks/agents/useUpdateAgent'
 import { useAssistants, useDefaultAssistant } from '@renderer/hooks/useAssistant'
 import { useNavbarPosition } from '@renderer/hooks/useNavbar'
 import { useRuntime } from '@renderer/hooks/useRuntime'
@ -13,6 +15,7 @@ import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'

+import AgentSettingsTab from './AgentSettingsTab'
 import Assistants from './AssistantsTab'
 import Settings from './SettingsTab'
 import Topics from './TopicsTab'
@ -43,11 +46,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 { agent } = useAgent(activeAgentId)
+  const { updateAgent } = useUpdateAgent()
+
  const isSessionView = activeTopicOrSession === 'session'
  const isTopicView = activeTopicOrSession === 'topic'

@ -63,7 +67,6 @@ const HomeTabs: FC<Props> = ({
  }

  const showTab = position === 'left' && topicPosition === 'left'
-  const shouldShowSettingsTab = !isSessionView

  const onCreateAssistant = async () => {
    const assistant = await AddAssistantPopup.show()
@ -106,12 +109,6 @@ const HomeTabs: FC<Props> = ({
    }
  }, [position, tab, topicPosition, forceToSeeAllTab])

-  useEffect(() => {
-    if (activeTopicOrSession === 'session' && tab === 'settings') {
-      setTab('topic')
-    }
-  }, [activeTopicOrSession, tab])
-
  return (
    <Container
      style={{ ...border, ...style }}
@ -122,13 +119,11 @@ 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>
      )}

@ -160,7 +155,8 @@ const HomeTabs: FC<Props> = ({
            position={position}
          />
        )}
-        {tab === 'settings' && shouldShowSettingsTab && <Settings assistant={activeAssistant} />}
+        {tab === 'settings' && isTopicView && <Settings assistant={activeAssistant} />}
+        {tab === 'settings' && isSessionView && <AgentSettingsTab agent={agent} update={updateAgent} />}
      </TabContent>
    </Container>
  )
@ -216,7 +212,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)')};
@ -241,7 +237,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')};
--- a/src/renderer/src/pages/minapps/components/WebviewSearch.tsx
+++ b/src/renderer/src/pages/minapps/components/WebviewSearch.tsx
@ -22,11 +22,11 @@ const WebviewSearch: FC<WebviewSearchProps> = ({ webviewRef, isWebviewReady, app
  const [query, setQuery] = useState('')
  const [matchCount, setMatchCount] = useState(0)
  const [activeIndex, setActiveIndex] = useState(0)
-  const [currentWebview, setCurrentWebview] = useState<WebviewTag | null>(null)
  const inputRef = useRef<HTMLInputElement>(null)
  const focusFrameRef = useRef<number | null>(null)
  const lastAppIdRef = useRef<string>(appId)
  const attachedWebviewRef = useRef<WebviewTag | null>(null)
+  const activeWebview = webviewRef.current ?? null

  const focusInput = useCallback(() => {
    if (focusFrameRef.current !== null) {
@ -119,34 +119,66 @@ const WebviewSearch: FC<WebviewSearchProps> = ({ webviewRef, isWebviewReady, app
  }, [performSearch, query])

  useEffect(() => {
-    const nextWebview = webviewRef.current ?? null
-    if (currentWebview === nextWebview) return
-    setCurrentWebview(nextWebview)
-  }, [webviewRef, currentWebview])
-
-  useEffect(() => {
-    const target = currentWebview
-    if (!target) {
-      attachedWebviewRef.current = null
+    attachedWebviewRef.current = activeWebview
+    if (!activeWebview) {
      return
    }

    const handle = handleFoundInPage
-    attachedWebviewRef.current = target
-    target.addEventListener('found-in-page', handle)
+    activeWebview.addEventListener('found-in-page', handle)

    return () => {
-      target.removeEventListener('found-in-page', handle)
-      if (attachedWebviewRef.current === target) {
+      activeWebview.removeEventListener('found-in-page', handle)
+      if (attachedWebviewRef.current === activeWebview) {
        try {
-          target.stopFindInPage('clearSelection')
+          activeWebview.stopFindInPage('clearSelection')
        } catch (error) {
          logger.error('stopFindInPage failed', { error })
        }
        attachedWebviewRef.current = null
      }
    }
-  }, [currentWebview, handleFoundInPage])
+  }, [activeWebview, handleFoundInPage])
+
+  useEffect(() => {
+    if (!activeWebview) return
+    const onFindShortcut = window.api?.webview?.onFindShortcut
+    if (!onFindShortcut) return
+
+    const webContentsId = activeWebview.getWebContentsId?.()
+    if (!webContentsId) {
+      logger.warn('WebviewSearch: missing webContentsId', { appId })
+      return
+    }
+
+    const unsubscribe = onFindShortcut(({ webviewId, key, control, meta, shift }) => {
+      if (webviewId !== webContentsId) return
+
+      if ((control || meta) && key === 'f') {
+        openSearch()
+        return
+      }
+
+      if (!isVisible) return
+
+      if (key === 'escape') {
+        closeSearch()
+        return
+      }
+
+      if (key === 'enter') {
+        if (shift) {
+          goToPrevious()
+        } else {
+          goToNext()
+        }
+      }
+    })
+
+    return () => {
+      unsubscribe?.()
+    }
+  }, [appId, activeWebview, closeSearch, goToNext, goToPrevious, isVisible, openSearch])

  useEffect(() => {
    if (!isVisible) return
@ -160,7 +192,7 @@ const WebviewSearch: FC<WebviewSearchProps> = ({ webviewRef, isWebviewReady, app
      return
    }
    performSearch(query)
-  }, [currentWebview, isVisible, performSearch, query])
+  }, [activeWebview, isVisible, performSearch, query])

  useEffect(() => {
    const handleKeydown = (event: KeyboardEvent) => {
--- a/src/renderer/src/pages/minapps/components/tests/WebviewSearch.test.tsx
+++ b/src/renderer/src/pages/minapps/components/tests/WebviewSearch.test.tsx
@ -1,3 +1,4 @@
+import type { WebviewKeyEvent } from '@shared/config/types'
 import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import type { WebviewTag } from 'electron'
@ -36,6 +37,7 @@ const createWebviewMock = () => {
        listeners.get(type)?.delete(listener)
      }
    ),
+    getWebContentsId: vi.fn(() => 1),
    findInPage: findInPageMock as unknown as WebviewTag['findInPage'],
    stopFindInPage: stopFindInPageMock as unknown as WebviewTag['stopFindInPage']
  } as unknown as WebviewTag
@ -102,13 +104,34 @@ describe('WebviewSearch', () => {
    info: vi.fn(),
    addToast: vi.fn()
  }
+  let removeFindShortcutListenerMock: ReturnType<typeof vi.fn>
+  let onFindShortcutMock: ReturnType<typeof vi.fn>
+  const invokeLatestShortcut = (payload: WebviewKeyEvent) => {
+    const handler = onFindShortcutMock.mock.calls.at(-1)?.[0] as ((args: WebviewKeyEvent) => void) | undefined
+    if (!handler) {
+      throw new Error('Shortcut handler not registered')
+    }
+    act(() => {
+      handler(payload)
+    })
+  }

  beforeEach(() => {
+    removeFindShortcutListenerMock = vi.fn()
+    onFindShortcutMock = vi.fn(() => removeFindShortcutListenerMock)
+    Object.assign(window as any, {
+      api: {
+        webview: {
+          onFindShortcut: onFindShortcutMock
+        }
+      }
+    })
    Object.assign(window, { toast: toastMock })
  })

  afterEach(() => {
    vi.clearAllMocks()
+    Reflect.deleteProperty(window, 'api')
  })

  it('opens the search overlay with keyboard shortcut', async () => {
@ -124,6 +147,47 @@ describe('WebviewSearch', () => {
    expect(screen.getByPlaceholderText('Search')).toBeInTheDocument()
  })

+  it('opens the search overlay when webview shortcut is forwarded', async () => {
+    const { webview } = createWebviewMock()
+    const webviewRef = { current: webview } as React.RefObject<WebviewTag | null>
+
+    render(<WebviewSearch webviewRef={webviewRef} isWebviewReady appId="app-1" />)
+
+    await waitFor(() => {
+      expect(onFindShortcutMock).toHaveBeenCalled()
+    })
+
+    invokeLatestShortcut({ webviewId: 1, key: 'f', control: true, meta: false, shift: false, alt: false })
+
+    await waitFor(() => {
+      expect(screen.getByPlaceholderText('Search')).toBeInTheDocument()
+    })
+  })
+
+  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>
+
+    render(<WebviewSearch webviewRef={webviewRef} isWebviewReady appId="app-1" />)
+
+    await waitFor(() => {
+      expect(onFindShortcutMock).toHaveBeenCalled()
+    })
+    invokeLatestShortcut({ webviewId: 1, key: 'f', control: true, meta: false, shift: false, alt: false })
+    await waitFor(() => {
+      expect(screen.getByPlaceholderText('Search')).toBeInTheDocument()
+    })
+
+    await waitFor(() => {
+      expect(onFindShortcutMock.mock.calls.length).toBeGreaterThanOrEqual(2)
+    })
+
+    invokeLatestShortcut({ webviewId: 1, key: 'escape', control: false, meta: false, shift: false, alt: false })
+    await waitFor(() => {
+      expect(screen.queryByPlaceholderText('Search')).not.toBeInTheDocument()
+    })
+  })
+
  it('performs searches and navigates between results', async () => {
    const { emit, findInPageMock, webview } = createWebviewMock()
    const webviewRef = { current: webview } as React.RefObject<WebviewTag | null>
@ -165,6 +229,45 @@ describe('WebviewSearch', () => {
    })
  })

+  it('navigates results when enter is forwarded from the webview', async () => {
+    const { findInPageMock, webview } = createWebviewMock()
+    const webviewRef = { current: webview } as React.RefObject<WebviewTag | null>
+    const user = userEvent.setup()
+
+    render(<WebviewSearch webviewRef={webviewRef} isWebviewReady appId="app-1" />)
+
+    await waitFor(() => {
+      expect(onFindShortcutMock).toHaveBeenCalled()
+    })
+    invokeLatestShortcut({ webviewId: 1, key: 'f', control: true, meta: false, shift: false, alt: false })
+    await waitFor(() => {
+      expect(screen.getByPlaceholderText('Search')).toBeInTheDocument()
+    })
+
+    await waitFor(() => {
+      expect(onFindShortcutMock.mock.calls.length).toBeGreaterThanOrEqual(2)
+    })
+
+    const input = screen.getByRole('textbox')
+    await user.type(input, 'Cherry')
+
+    await waitFor(() => {
+      expect(findInPageMock).toHaveBeenCalledWith('Cherry', undefined)
+    })
+    findInPageMock.mockClear()
+
+    invokeLatestShortcut({ webviewId: 1, key: 'enter', control: false, meta: false, shift: false, alt: false })
+    await waitFor(() => {
+      expect(findInPageMock).toHaveBeenCalledWith('Cherry', { forward: true, findNext: true })
+    })
+
+    findInPageMock.mockClear()
+    invokeLatestShortcut({ webviewId: 1, key: 'enter', control: false, meta: false, shift: true, alt: false })
+    await waitFor(() => {
+      expect(findInPageMock).toHaveBeenCalledWith('Cherry', { forward: false, findNext: true })
+    })
+  })
+
  it('clears search state when appId changes', async () => {
    const { findInPageMock, stopFindInPageMock, webview } = createWebviewMock()
    const webviewRef = { current: webview } as React.RefObject<WebviewTag | null>
@ -219,6 +322,7 @@ describe('WebviewSearch', () => {
    unmount()

    expect(stopFindInPageMock).toHaveBeenCalledWith('clearSelection')
+    expect(removeFindShortcutListenerMock).toHaveBeenCalled()
  })

  it('ignores keyboard shortcut when webview is not ready', async () => {
--- a/src/renderer/src/pages/paintings/SiliconPage.tsx
+++ b/src/renderer/src/pages/paintings/SiliconPage.tsx
@ -14,6 +14,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 { LanguagesEnum } from '@renderer/config/translate'
 import { useTheme } from '@renderer/context/ThemeProvider'
 import { usePaintings } from '@renderer/hooks/usePaintings'
@ -24,7 +25,7 @@ import FileManager from '@renderer/services/FileManager'
 import { translateText } from '@renderer/services/TranslateService'
 import type { FileMetadata, Painting } from '@renderer/types'
 import { getErrorMessage, uuid } from '@renderer/utils'
-import { Input, InputNumber, Radio, Select, Slider } from 'antd'
+import { Avatar, Input, InputNumber, Radio, Select, Slider } from 'antd'
 import TextArea from 'antd/es/input/TextArea'
 import type { FC } from 'react'
 import { useEffect, useRef, useState } from 'react'
@ -384,7 +385,16 @@ 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} options={providerOptions} />
+          <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>
          <Select value={painting.model} options={modelOptions} onChange={onSelectModel} />
          <SettingTitle style={{ marginBottom: 5, marginTop: 15 }}>{t('paintings.image.size')}</SettingTitle>
@ -633,4 +643,14 @@ 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
--- a/src/renderer/src/pages/settings/AgentSettings/AccessibleDirsSetting.tsx
+++ b/src/renderer/src/pages/settings/AgentSettings/AccessibleDirsSetting.tsx
@ -71,12 +71,12 @@ export const AccessibleDirsSetting: React.FC<AccessibleDirsSettingProps> = ({ ba
        }>
        {t('agent.session.accessible_paths.label')}
      </SettingsTitle>
-      <ul className="mt-2 flex flex-col gap-2 rounded-xl border p-2">
+      <ul className="flex flex-col gap-2">
        {base.accessible_paths.map((path) => (
          <li
            key={path}
-            className="flex items-center justify-between gap-2 rounded-medium border border-default-200 px-3 py-2">
-            <span className="truncate text-sm" title={path}>
+            className="flex items-center justify-between gap-2 rounded-medium border border-default-200 px-2 py-1">
+            <span className="w-0 flex-1 overflow-hidden text-ellipsis whitespace-nowrap text-sm" title={path}>
              {path}
            </span>
            <Button size="sm" variant="light" color="danger" onPress={() => removeAccessiblePath(path)}>
--- a/src/renderer/src/pages/settings/AgentSettings/AgentEssentialSettings.tsx
+++ b/src/renderer/src/pages/settings/AgentSettings/AgentEssentialSettings.tsx
@ -18,9 +18,10 @@ import { SettingsContainer, SettingsItem, SettingsTitle } from './shared'
 interface AgentEssentialSettingsProps {
  agent: GetAgentResponse | undefined | null
  update: ReturnType<typeof useUpdateAgent>['updateAgent']
+  showModelSetting?: boolean
 }

-const AgentEssentialSettings: FC<AgentEssentialSettingsProps> = ({ agent, update }) => {
+const AgentEssentialSettings: FC<AgentEssentialSettingsProps> = ({ agent, update, showModelSetting = true }) => {
  const { t } = useTranslation()

  if (!agent) return null
@ -36,7 +37,7 @@ const AgentEssentialSettings: FC<AgentEssentialSettingsProps> = ({ agent, update
      </SettingsItem>
      <AvatarSetting agent={agent} update={update} />
      <NameSetting base={agent} update={update} />
-      <ModelSetting base={agent} update={update} />
+      {showModelSetting && <ModelSetting base={agent} update={update} />}
      <AccessibleDirsSetting base={agent} update={update} />
      <DescriptionSetting base={agent} update={update} />
    </SettingsContainer>
--- a/src/renderer/src/pages/settings/AgentSettings/NameSetting.tsx
+++ b/src/renderer/src/pages/settings/AgentSettings/NameSetting.tsx
@ -25,6 +25,7 @@ export const NameSetting: React.FC<NameSettingsProps> = ({ base, update }) => {
      <Input
        placeholder={t('common.agent_one') + t('common.name')}
        value={name}
+        size="sm"
        onValueChange={(value) => setName(value)}
        onBlur={() => {
          if (name !== base.name) {
--- a/src/renderer/src/services/WebSearchService.ts
+++ b/src/renderer/src/services/WebSearchService.ts
@ -22,7 +22,6 @@ import type { ExtractResults } from '@renderer/utils/extract'
 import { fetchWebContents } from '@renderer/utils/fetch'
 import { consolidateReferencesByUrl, selectReferences } from '@renderer/utils/websearch'
 import dayjs from 'dayjs'
-import { LRUCache } from 'lru-cache'
 import { sliceByTokens } from 'tokenx'

 import { getKnowledgeBaseParams } from './KnowledgeService'
@ -32,7 +31,6 @@ const logger = loggerService.withContext('WebSearchService')

 interface RequestState {
  signal: AbortSignal | null
-  searchBase?: KnowledgeBase
  isPaused: boolean
  createdAt: number
 }
@ -49,16 +47,7 @@ class WebSearchService {
  isPaused = false

  // 管理不同请求的状态
-  private requestStates = new LRUCache<string, RequestState>({
-    max: 5, // 最多5个并发请求
-    ttl: 1000 * 60 * 2, // 2分钟过期
-    dispose: (requestState: RequestState, requestId: string) => {
-      if (!requestState.searchBase) return
-      window.api.knowledgeBase
-        .delete(removeSpecialCharactersForFileName(requestState.searchBase.id))
-        .catch((error) => logger.warn(`Failed to cleanup search base for ${requestId}:`, error))
-    }
-  })
+  private requestStates = new Map<string, RequestState>()

  /**
   * 获取或创建单个请求的状态
@ -212,7 +201,7 @@ class WebSearchService {
    }
  }
  /**
-   * 确保搜索压缩知识库存在并配置正确
+   * 创建临时搜索知识库
   */
  private async ensureSearchBase(
    config: CompressionConfig,
@ -221,25 +210,13 @@ class WebSearchService {
  ): Promise<KnowledgeBase> {
    // requestId: eg: openai-responses-openai/gpt-5-timestamp-uuid
    const baseId = `websearch-compression-${requestId}`
-    const state = this.getRequestState(requestId)
-
-    // 如果已存在且配置未变，直接复用
-    if (state.searchBase && this.isConfigMatched(state.searchBase, config)) {
-      return state.searchBase
-    }
-
-    // 清理旧的知识库
-    if (state.searchBase) {
-      // 将requestId中的 '/' 映射为 '_'
-      await window.api.knowledgeBase.delete(removeSpecialCharactersForFileName(state.searchBase.id))
-    }

    if (!config.embeddingModel) {
      throw new Error('Embedding model is required for RAG compression')
    }

    // 创建新的知识库
-    state.searchBase = {
+    const searchBase: KnowledgeBase = {
      id: baseId,
      name: `WebSearch-RAG-${requestId}`,
      model: config.embeddingModel,
@ -252,25 +229,23 @@ class WebSearchService {
      version: 1
    }

-    // 更新LRU cache
-    this.requestStates.set(requestId, state)
-
    // 创建知识库
-    const baseParams = getKnowledgeBaseParams(state.searchBase)
+    const baseParams = getKnowledgeBaseParams(searchBase)
    await window.api.knowledgeBase.create(baseParams)

-    return state.searchBase
+    return searchBase
  }

  /**
-   * 检查配置是否匹配
+   * 清理临时搜索知识库
   */
-  private isConfigMatched(base: KnowledgeBase, config: CompressionConfig): boolean {
-    return (
-      base.model.id === config.embeddingModel?.id &&
-      base.rerankModel?.id === config.rerankModel?.id &&
-      base.dimensions === config.embeddingDimensions
-    )
+  private async cleanupSearchBase(searchBase: KnowledgeBase): Promise<void> {
+    try {
+      await window.api.knowledgeBase.delete(removeSpecialCharactersForFileName(searchBase.id))
+      logger.debug(`Cleaned up search base: ${searchBase.id}`)
+    } catch (error) {
+      logger.warn(`Failed to cleanup search base ${searchBase.id}:`, error as Error)
+    }
  }

  /**
@ -337,45 +312,50 @@ class WebSearchService {
    const searchBase = await this.ensureSearchBase(config, totalDocumentCount, requestId)
    logger.debug('Search base for RAG compression: ', searchBase)

-    // 1. 清空知识库
-    const baseParams = getKnowledgeBaseParams(searchBase)
-    await window.api.knowledgeBase.reset(baseParams)
+    try {
+      // 1. 清空知识库
+      const baseParams = getKnowledgeBaseParams(searchBase)
+      await window.api.knowledgeBase.reset(baseParams)

-    logger.debug('Search base parameters for RAG compression: ', baseParams)
+      logger.debug('Search base parameters for RAG compression: ', baseParams)

-    // 2. 顺序添加所有搜索结果到知识库
-    // FIXME: 目前的知识库 add 不支持并发
-    for (const result of rawResults) {
-      const item: KnowledgeItem & { sourceUrl?: string } = {
-        id: uuid(),
-        type: 'note',
-        content: result.content,
-        sourceUrl: result.url, // 设置 sourceUrl 用于映射
-        created_at: Date.now(),
-        updated_at: Date.now(),
-        processingStatus: 'pending'
+      // 2. 顺序添加所有搜索结果到知识库
+      // FIXME: 目前的知识库 add 不支持并发
+      for (const result of rawResults) {
+        const item: KnowledgeItem & { sourceUrl?: string } = {
+          id: uuid(),
+          type: 'note',
+          content: result.content,
+          sourceUrl: result.url, // 设置 sourceUrl 用于映射
+          created_at: Date.now(),
+          updated_at: Date.now(),
+          processingStatus: 'pending'
+        }
+
+        await window.api.knowledgeBase.add({
+          base: getKnowledgeBaseParams(searchBase),
+          item
+        })
      }

-      await window.api.knowledgeBase.add({
-        base: getKnowledgeBaseParams(searchBase),
-        item
+      // 3. 对知识库执行多问题搜索获取压缩结果
+      const references = await this.querySearchBase(questions, searchBase)
+
+      // 4. 使用 Round Robin 策略选择引用
+      const selectedReferences = selectReferences(rawResults, references, totalDocumentCount)
+
+      logger.verbose('With RAG, the number of search results:', {
+        raw: rawResults.length,
+        retrieved: references.length,
+        selected: selectedReferences.length
      })
+
+      // 5. 按 sourceUrl 分组并合并同源片段
+      return consolidateReferencesByUrl(rawResults, selectedReferences)
+    } finally {
+      // 无论成功或失败都立即清理知识库
+      await this.cleanupSearchBase(searchBase)
    }
-
-    // 3. 对知识库执行多问题搜索获取压缩结果
-    const references = await this.querySearchBase(questions, searchBase)
-
-    // 4. 使用 Round Robin 策略选择引用
-    const selectedReferences = selectReferences(rawResults, references, totalDocumentCount)
-
-    logger.verbose('With RAG, the number of search results:', {
-      raw: rawResults.length,
-      retrieved: references.length,
-      selected: selectedReferences.length
-    })
-
-    // 5. 按 sourceUrl 分组并合并同源片段
-    return consolidateReferencesByUrl(rawResults, selectedReferences)
  }

  /**
--- a/src/renderer/src/store/assistants.ts
+++ b/src/renderer/src/store/assistants.ts
@ -14,6 +14,7 @@ export interface AssistantsState {
  tagsOrder: string[]
  collapsedTags: Record<string, boolean>
  presets: AssistantPreset[]
+  unifiedListOrder: Array<{ type: 'agent' | 'assistant'; id: string }>
 }

 const initialState: AssistantsState = {
@ -21,7 +22,8 @@ const initialState: AssistantsState = {
  assistants: [getDefaultAssistant()],
  tagsOrder: [],
  collapsedTags: {},
-  presets: []
+  presets: [],
+  unifiedListOrder: []
 }

 const assistantsSlice = createSlice({
@ -97,6 +99,9 @@ const assistantsSlice = createSlice({
        [tag]: !prev[tag]
      }
    },
+    setUnifiedListOrder: (state, action: PayloadAction<Array<{ type: 'agent' | 'assistant'; id: string }>>) => {
+      state.unifiedListOrder = action.payload
+    },
    addTopic: (state, action: PayloadAction<{ assistantId: string; topic: Topic }>) => {
      const topic = action.payload.topic
      topic.createdAt = topic.createdAt || new Date().toISOString()
@ -245,6 +250,7 @@ export const {
  setTagsOrder,
  updateAssistantSettings,
  updateTagCollapse,
+  setUnifiedListOrder,
  setAssistantPresets,
  addAssistantPreset,
  removeAssistantPreset,
--- a/src/renderer/src/store/index.ts
+++ b/src/renderer/src/store/index.ts
@ -69,7 +69,7 @@ const persistedReducer = persistReducer(
  {
    key: 'cherry-studio',
    storage,
-    version: 160,
+    version: 162,
    blacklist: ['runtime', 'messages', 'messageBlocks', 'tabs'],
    migrate
  },
--- a/src/renderer/src/store/migrate.ts
+++ b/src/renderer/src/store/migrate.ts
@ -71,6 +71,7 @@ function removeMiniAppIconsFromState(state: RootState) {

 function removeMiniAppFromState(state: RootState, id: string) {
  if (state.minapps) {
+    state.minapps.pinned = state.minapps.pinned.filter((app) => app.id !== id)
    state.minapps.enabled = state.minapps.enabled.filter((app) => app.id !== id)
    state.minapps.disabled = state.minapps.disabled.filter((app) => app.id !== id)
  }
@ -2600,16 +2601,30 @@ const migrateConfig = {
      return state
    }
  },
-  '160': (state: RootState) => {
+  '161': (state: RootState) => {
+    try {
+      removeMiniAppFromState(state, 'nm-search')
+      removeMiniAppFromState(state, 'hika')
+      removeMiniAppFromState(state, 'hugging-chat')
+      addProvider(state, 'cherryin')
+      state.llm.providers = moveProvider(state.llm.providers, 'cherryin', 1)
+      return state
+    } catch (error) {
+      logger.error('migrate 161 error', error as Error)
+      return state
+    }
+  },
+  '162': (state: RootState) => {
    try {
      // @ts-ignore
      if (state?.agents?.agents) {
        // @ts-ignore
        state.assistants.presets = [...state.agents.agents]
-
        // @ts-ignore
        delete state.agents.agents
+      }

+      if (state.settings.sidebarIcons) {
        state.settings.sidebarIcons.visible = state.settings.sidebarIcons.visible.map((icon) => {
          // @ts-ignore
          return icon === 'agents' ? 'store' : icon
@ -2619,6 +2634,7 @@ const migrateConfig = {
          return icon === 'agents' ? 'store' : icon
        })
      }
+
      state.llm.providers.forEach((provider) => {
        if (provider.anthropicApiHost) {
          return
@ -2646,16 +2662,13 @@ const migrateConfig = {
          case 'new-api':
            provider.anthropicApiHost = 'http://localhost:3000'
            break
-          case 'cherryai':
-            provider.anthropicApiHost = 'https://api.cherry-ai.com'
-            break
          case 'grok':
            provider.anthropicApiHost = 'https://api.x.ai'
        }
      })
      return state
    } catch (error) {
-      logger.error('migrate 160 error', error as Error)
+      logger.error('migrate 162 error', error as Error)
      return state
    }
  }
--- a/src/renderer/src/trace/dataHandler/StreamHandler.ts
+++ b/src/renderer/src/trace/dataHandler/StreamHandler.ts
@ -41,7 +41,7 @@ export class StreamHandler {
            this.usage.total_tokens += completionChunk.usage.total_tokens || 0
          }
          context = chunk.choices
-            .map((choice) => {
+            ?.map((choice) => {
              if (!choice.delta) {
                return ''
              } else if ('reasoning_content' in choice.delta) {
--- a/src/renderer/src/types/agent.ts
+++ b/src/renderer/src/types/agent.ts
@ -5,7 +5,7 @@
 * WARNING: Any null value will be converted to undefined from api.
 */
 import type { ModelMessage, TextStreamPart } from 'ai'
-import { z } from 'zod'
+import * as z from 'zod'

 import type { Message, MessageBlock } from './newMessage'

--- a/src/renderer/src/types/apiModels.ts
+++ b/src/renderer/src/types/apiModels.ts
@ -1,5 +1,5 @@
 import type { Model } from '@types'
-import { z } from 'zod'
+import * as z from 'zod'

 import { ProviderTypeSchema } from './provider'

--- a/src/renderer/src/types/index.ts
+++ b/src/renderer/src/types/index.ts
@ -81,6 +81,7 @@ const ThinkModelTypes = [
  'gpt5',
  'gpt5_codex',
  'grok',
+  'grok4_fast',
  'gemini',
  'gemini_pro',
  'qwen',
--- a/src/renderer/src/types/provider.ts
+++ b/src/renderer/src/types/provider.ts
@ -1,5 +1,5 @@
 import type { Model } from '@types'
-import z from 'zod'
+import * as z from 'zod'

 export const ProviderTypeSchema = z.enum([
  'openai',
@ -106,7 +106,7 @@ export type Provider = {
 }

 export const SystemProviderIds = {
-  // cherryin: 'cherryin',
+  cherryin: 'cherryin',
  silicon: 'silicon',
  aihubmix: 'aihubmix',
  ocoolai: 'ocoolai',
--- a/src/renderer/src/types/tool.ts
+++ b/src/renderer/src/types/tool.ts
@ -1,4 +1,4 @@
-import { z } from 'zod'
+import * as z from 'zod'

 export type ToolType = 'builtin' | 'provider' | 'mcp'

--- a/src/renderer/src/utils/bocha.ts
+++ b/src/renderer/src/utils/bocha.ts
@ -1,4 +1,4 @@
-import { z } from 'zod'
+import * as z from 'zod'

 export const freshnessOptions = ['oneDay', 'oneWeek', 'oneMonth', 'oneYear', 'noLimit'] as const

--- a/src/renderer/src/utils/error.ts
+++ b/src/renderer/src/utils/error.ts
@ -13,7 +13,7 @@ import type { NoSuchToolError } from 'ai'
 import { InvalidToolInputError } from 'ai'
 import { type AxiosError, isAxiosError } from 'axios'
 import { t } from 'i18next'
-import type { z } from 'zod'
+import type * as z from 'zod'
 import { ZodError } from 'zod'

 import { parseJSON } from './json'
--- a/src/renderer/src/utils/memory-prompts.ts
+++ b/src/renderer/src/utils/memory-prompts.ts
@ -1,4 +1,4 @@
-import { z } from 'zod'
+import * as z from 'zod'

 // Define Zod schema for fact retrieval output
 export const FactRetrievalSchema = z.object({
--- a/yarn.lock
+++ b/yarn.lock