refactor: standardize variable naming and improve tag calculation logic

- Renamed variables for consistency, changing `AssistantsTabSortType` to `assistantsTabSortType`. - Refactored tag calculation in `useTags` to utilize `uniq` and `flatMap` for better performance and readability. - Updated localization files to remove unnecessary characters in quick trigger messages. - Enhanced the `AssistantItem` component by extracting menu item creation logic and sorting functions for better maintainability.
2025-12-25 03:10:08 +08:00 · 2025-05-29 16:40:20 +08:00 · 2025-05-29 16:40:20 +08:00 · 6d76a23d06
commit 6d76a23d06
parent 8e2c938254
17 changed files with 487 additions and 578 deletions
--- a/src/renderer/src/assets/styles/scrollbar.scss
+++ b/src/renderer/src/assets/styles/scrollbar.scss
@ -24,7 +24,6 @@ body[theme-mode='light'] {
 }

 ::-webkit-scrollbar-thumb {
-  cursor: pointer;
  border-radius: 10px;
  background: var(--color-scrollbar-thumb);
  &:hover {
@ -33,7 +32,6 @@ body[theme-mode='light'] {
 }

 pre:not(.shiki)::-webkit-scrollbar-thumb {
-  cursor: pointer;
  border-radius: 0;
  background: rgba(0, 0, 0, 0.08);
  &:hover {
--- a/src/renderer/src/components/Popups/PromptPopup.tsx
+++ b/src/renderer/src/components/Popups/PromptPopup.tsx
@ -38,8 +38,9 @@ const PromptPopupContainer: React.FC<Props> = ({
    setOpen(false)
  }

-  const onClose = () => {
+  const onAfterClose = () => {
    resolve(null)
+    TopView.hide(TopViewKey)
  }

  const handleAfterOpenChange = (visible: boolean) => {
@ -61,7 +62,7 @@ const PromptPopupContainer: React.FC<Props> = ({
      open={open}
      onOk={onOk}
      onCancel={onCancel}
-      afterClose={onClose}
+      afterClose={onAfterClose}
      afterOpenChange={handleAfterOpenChange}
      transitionName="animation-move-down"
      centered>
@ -95,16 +96,7 @@ export default class PromptPopup {
  }
  static show(props: PromptPopupShowParams) {
    return new Promise<string>((resolve) => {
-      TopView.show(
-        <PromptPopupContainer
-          {...props}
-          resolve={(v) => {
-            resolve(v)
-            TopView.hide(TopViewKey)
-          }}
-        />,
-        'PromptPopup'
-      )
+      TopView.show(<PromptPopupContainer {...props} resolve={resolve} />, 'PromptPopup')
    })
  }
 }
--- a/src/renderer/src/components/Popups/TagsPopup.tsx
+++ b/src/renderer/src/components/Popups/TagsPopup.tsx
@ -1,70 +0,0 @@
-import AssistantTagsSettings from '@renderer/pages/settings/AssistantSettings/AssistantTagsSettings'
-import { Assistant } from '@renderer/types'
-import { Modal } from 'antd'
-import { useState } from 'react'
-
-import { TopView } from '../TopView'
-
-interface Props {
-  assistant: Assistant
-  updateAssistant: (assistant: Assistant) => void
-  resolve: (data: any) => void
-  mode?: 'add' | 'manage'
-}
-
-const PopupContainer: React.FC<Props> = ({ assistant, updateAssistant, resolve, mode }) => {
-  const [open, setOpen] = useState(true)
-
-  const onCancel = () => {
-    setOpen(false)
-  }
-
-  const onClose = () => {
-    resolve({})
-  }
-
-  TagsPopup.hide = onCancel
-
-  return (
-    <Modal
-      open={open}
-      onCancel={onCancel}
-      afterClose={onClose}
-      title="标签管理"
-      width="600px"
-      transitionName="animation-move-down"
-      styles={{
-        content: {
-          padding: '16px',
-          border: `1px solid var(--color-frame-border)`
-        }
-      }}
-      centered
-      footer={null}>
-      <AssistantTagsSettings assistant={assistant} updateAssistant={updateAssistant} mode={mode} />
-    </Modal>
-  )
-}
-
-export default class TagsPopup {
-  static topviewId = 0
-  static hide() {
-    TopView.hide('TagsPopup')
-  }
-  static show(assistant: Assistant, updateAssistant: (assistant: Assistant) => void, mode?: 'add' | 'manage') {
-    return new Promise<any>((resolve) => {
-      TopView.show(
-        <PopupContainer
-          assistant={assistant}
-          updateAssistant={updateAssistant}
-          resolve={(v) => {
-            resolve(v)
-            TopView.hide('TagsPopup')
-          }}
-          mode={mode}
-        />,
-        'TagsPopup'
-      )
-    })
-  }
-}
--- a/src/renderer/src/components/Popups/TextEditPopup.tsx
+++ b/src/renderer/src/components/Popups/TextEditPopup.tsx
@ -18,6 +18,7 @@ interface ShowParams {
  text: string
  textareaProps?: TextAreaProps
  modalProps?: ModalProps
+  showTranslate?: boolean
  children?: (props: { onOk?: () => void; onCancel?: () => void }) => React.ReactNode
 }

@ -25,7 +26,14 @@ interface Props extends ShowParams {
  resolve: (data: any) => void
 }

-const PopupContainer: React.FC<Props> = ({ text, textareaProps, modalProps, resolve, children }) => {
+const PopupContainer: React.FC<Props> = ({
+  text,
+  textareaProps,
+  modalProps,
+  resolve,
+  children,
+  showTranslate = true
+}) => {
  const [open, setOpen] = useState(true)
  const { t } = useTranslation()
  const [textValue, setTextValue] = useState(text)
@ -148,12 +156,14 @@ const PopupContainer: React.FC<Props> = ({ text, textareaProps, modalProps, reso
          onInput={resizeTextArea}
          onChange={(e) => setTextValue(e.target.value)}
        />
-        <TranslateButton
-          onClick={handleTranslate}
-          aria-label="Translate text"
-          disabled={isTranslating || !textValue.trim()}>
-          {isTranslating ? <LoadingOutlined spin /> : <Languages size={16} />}
-        </TranslateButton>
+        {showTranslate && (
+          <TranslateButton
+            onClick={handleTranslate}
+            aria-label="Translate text"
+            disabled={isTranslating || !textValue.trim()}>
+            {isTranslating ? <LoadingOutlined spin /> : <Languages size={16} />}
+          </TranslateButton>
+        )}
      </TextAreaContainer>
      <ChildrenContainer>{children && children({ onOk, onCancel })}</ChildrenContainer>
    </Modal>
--- a/src/renderer/src/hooks/useStore.ts
+++ b/src/renderer/src/hooks/useStore.ts
@ -31,11 +31,11 @@ export function useShowTopics() {
 }

 export function useAssistantsTabSortType() {
-  const AssistantsTabSortType = useAppSelector((state) => state.settings.assistantsTabSortType)
+  const assistantsTabSortType = useAppSelector((state) => state.settings.assistantsTabSortType)
  const dispatch = useAppDispatch()

  return {
-    AssistantsTabSortType,
+    assistantsTabSortType,
    setAssistantsTabSortType: (sortType: AssistantsSortType) => dispatch(setAssistantsTabSortType(sortType))
  }
 }
--- a/src/renderer/src/hooks/useTags.ts
+++ b/src/renderer/src/hooks/useTags.ts
@ -1,5 +1,5 @@
-import { Assistant } from '@renderer/types'
-import { useCallback, useEffect, useMemo, useState } from 'react'
+import { flatMap, groupBy, uniq } from 'lodash'
+import { useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'

 import { useAssistants } from './useAssistant'
@ -10,63 +10,44 @@ import { useAssistants } from './useAssistant'

 export const useTags = () => {
  const { assistants } = useAssistants()
-  const [allTags, setAllTags] = useState<string[]>([])
  const { t } = useTranslation()

  // 计算所有标签
-  const calculateTags = useCallback(() => {
-    const tags = new Set<string>()
-    assistants.forEach((assistant) => {
-      assistant.tags?.forEach((tag) => tags.add(tag))
-    })
-    return Array.from(tags)
+  const allTags = useMemo(() => {
+    return uniq(flatMap(assistants, (assistant) => assistant.tags || []))
  }, [assistants])

-  // 当assistants变化时重新计算标签
-  useEffect(() => {
-    setAllTags(calculateTags())
-  }, [assistants, calculateTags])
-
  const getAssistantsByTag = useCallback(
-    (tag: string) => {
-      return assistants.filter((assistant) => assistant.tags?.includes(tag))
-    },
+    (tag: string) => assistants.filter((assistant) => assistant.tags?.includes(tag)),
    [assistants]
  )

-  const addTag = useCallback((tag: string) => {
-    setAllTags((prev) => [...prev, tag])
-  }, [])
-
  const getGroupedAssistants = useMemo(() => {
-    const grouped: { tag: string; assistants: Assistant[] }[] = []
-
-    allTags.forEach((tag) => {
-      const taggedAssistants = assistants.filter((a) => a.tags?.includes(tag))
-      if (taggedAssistants.length > 0) {
-        grouped.push({
-          tag,
-          assistants: taggedAssistants.sort((a, b) => a.name.localeCompare(b.name))
-        })
-      }
+    // 按标签分组，处理多标签的情况
+    const assistantsByTags = flatMap(assistants, (assistant) => {
+      const tags = assistant.tags?.length ? assistant.tags : [t('assistants.tags.untagged')]
+      return tags.map((tag) => ({ tag, assistant }))
    })

-    grouped.sort((a, b) => a.tag.localeCompare(b.tag))
+    // 按标签分组并构建结果
+    const grouped = Object.entries(groupBy(assistantsByTags, 'tag')).map(([tag, group]) => ({
+      tag,
+      assistants: group.map((g) => g.assistant)
+    }))

-    const untagged = assistants.filter((a) => !a.tags?.length)
-    if (untagged.length > 0) {
-      grouped.unshift({
-        tag: t('assistants.tags.untagged'),
-        assistants: untagged
-      })
+    // 将未标记的组移到最前面
+    const untaggedIndex = grouped.findIndex((g) => g.tag === t('assistants.tags.untagged'))
+    if (untaggedIndex > -1) {
+      const [untagged] = grouped.splice(untaggedIndex, 1)
+      grouped.unshift(untagged)
    }
+
    return grouped
-  }, [allTags, assistants, t])
+  }, [assistants, t])

  return {
    allTags,
    getAssistantsByTag,
-    getGroupedAssistants,
-    addTag
+    getGroupedAssistants
  }
 }
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@ -114,13 +114,9 @@
        "modify": "Modify Tag",
        "add": "Add Tag",
        "delete": "Delete Tag",
+        "deleteConfirm": "Are you sure to delete this tag?",
        "settings": {
-          "title": "Tag Settings",
-          "current": "Current Tags",
-          "searchTagsPlaceholder": "Enter tag name to filter tags",
-          "addTagsPlaceholder": "Enter tag name to add",
-          "tagsLsitTitle": "Tag List",
-          "tagsLsitTitleTips": "Click tag to toggle"
+          "title": "Tag Settings"
        }
      }
    },
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@ -111,13 +111,9 @@
        "add": "タグ追加",
        "modify": "タグ修正",
        "delete": "タグ削除",
+        "deleteConfirm": "このタグを削除してもよろしいですか？",
        "settings": {
-          "title": "タグ設定",
-          "current": "現在のタグ",
-          "searchTagsPlaceholder": "タグ名を入力してフィルタリング",
-          "addTagsPlaceholder": "追加するタグ名を入力",
-          "tagsLsitTitle": "タグ一覧",
-          "tagsLsitTitleTips": "タグをクリックで切り替え"
+          "title": "タグ設定"
        }
      },
      "settings.tool_use_mode": "工具調用方式",
@ -1497,7 +1493,7 @@
      "messages.input.send_shortcuts": "送信ショートカット",
      "messages.input.show_estimated_tokens": "推定トークン数を表示",
      "messages.input.title": "入力設定",
-      "messages.input.enable_quick_triggers": "'/' と '@' を有効にしてクイックメニューを表示します。",
+      "messages.input.enable_quick_triggers": "/ と @ を有効にしてクイックメニューを表示します。",
      "messages.input.enable_delete_model": "バックスペースキーでモデル/添付ファイルを削除します。",
      "messages.markdown_rendering_input_message": "Markdownで入力メッセージをレンダリング",
      "messages.math_engine": "数式エンジン",
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@ -114,14 +114,9 @@
        "add": "Добавить тег",
        "modify": "Изменить тег",
        "delete": "Удалить тег",
-
+        "deleteConfirm": "Вы уверены, что хотите удалить этот тег?",
        "settings": {
-          "title": "Настройки тегов",
-          "current": "Текущие теги",
-          "searchTagsPlaceholder": "Введите название тега для фильтрации",
-          "addTagsPlaceholder": "Введите название тега для добавления",
-          "tagsLsitTitle": "Список тегов",
-          "tagsLsitTitleTips": "Нажмите на тег для переключения"
+          "title": "Настройки тегов"
        }
      }
    },
@ -1498,7 +1493,7 @@
      "messages.input.send_shortcuts": "Горячие клавиши для отправки",
      "messages.input.show_estimated_tokens": "Показывать затраты токенов",
      "messages.input.title": "Настройки ввода",
-      "messages.input.enable_quick_triggers": "Включите '/' и '@', чтобы вызвать быстрое меню.",
+      "messages.input.enable_quick_triggers": "Включите / и @, чтобы вызвать быстрое меню.",
      "messages.input.enable_delete_model": "Включите удаление модели/вложения с помощью клавиши Backspace",
      "messages.markdown_rendering_input_message": "Отображение ввода в формате Markdown",
      "messages.math_engine": "Математический движок",
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@ -114,13 +114,9 @@
        "untagged": "未分组",
        "modify": "修改标签",
        "delete": "删除标签",
+        "deleteConfirm": "确定要删除这个标签吗？",
        "settings": {
-          "title": "标签设置",
-          "current": "当前标签",
-          "searchTagsPlaceholder": "请输入标签名称以过滤标签",
-          "addTagsPlaceholder": "请输入标签名称以添加",
-          "tagsLsitTitle": "标签列表",
-          "tagsLsitTitleTips": "点击标签可切换"
+          "title": "标签设置"
        }
      }
    },
@ -1501,7 +1497,7 @@
      "messages.input.send_shortcuts": "发送快捷键",
      "messages.input.show_estimated_tokens": "显示预估 Token 数",
      "messages.input.title": "输入设置",
-      "messages.input.enable_quick_triggers": "启用 '/' 和 '@' 触发快捷菜单",
+      "messages.input.enable_quick_triggers": "启用 / 和 @ 触发快捷菜单",
      "messages.input.enable_delete_model": "启用删除键删除输入的模型/附件",
      "messages.markdown_rendering_input_message": "Markdown 渲染输入消息",
      "messages.math_engine": "数学公式引擎",
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@ -111,13 +111,9 @@
        "add": "添加標籤",
        "modify": "修改標籤",
        "delete": "刪除標籤",
+        "deleteConfirm": "確定要刪除這個標籤嗎？",
        "settings": {
-          "title": "標籤設定",
-          "current": "當前標籤",
-          "searchTagsPlaceholder": "請輸入標籤名稱以過濾標籤",
-          "addTagsPlaceholder": "請輸入標籤名稱以新增",
-          "tagsLsitTitle": "標籤列表",
-          "tagsLsitTitleTips": "點擊標籤可切換"
+          "title": "標籤設定"
        }
      },
      "settings.tool_use_mode": "工具調用方式",
@ -1500,7 +1496,7 @@
      "messages.input.send_shortcuts": "傳送快捷鍵",
      "messages.input.show_estimated_tokens": "顯示預估 Token 數",
      "messages.input.title": "輸入設定",
-      "messages.input.enable_quick_triggers": "啟用 '/' 和 '@' 觸發快捷選單",
+      "messages.input.enable_quick_triggers": "啟用 / 和 @ 觸發快捷選單",
      "messages.input.enable_delete_model": "啟用刪除鍵刪除模型/附件",
      "messages.markdown_rendering_input_message": "Markdown 渲染輸入訊息",
      "messages.math_engine": "數學公式引擎",
--- a/src/renderer/src/pages/home/Chat.tsx
+++ b/src/renderer/src/pages/home/Chat.tsx
@ -26,7 +26,7 @@ interface Props {

 const Chat: FC<Props> = (props) => {
  const { assistant } = useAssistant(props.assistant.id)
-  const { topicPosition, messageStyle } = useSettings()
+  const { topicPosition, messageStyle, showAssistants } = useSettings()
  const { showTopics } = useShowTopics()
  const { isMultiSelectMode } = useChatContext(props.activeTopic)

@ -36,9 +36,10 @@ const Chat: FC<Props> = (props) => {

  const maxWidth = useMemo(() => {
    const showRightTopics = showTopics && topicPosition === 'right'
-    const minusRightTopicsWidth = showRightTopics ? `- var(--assistants-width)` : ''
-    return `calc(100vw - var(--sidebar-width) - var(--assistants-width) ${minusRightTopicsWidth})`
-  }, [showTopics, topicPosition])
+    const minusAssistantsWidth = showAssistants ? '- var(--assistants-width)' : ''
+    const minusRightTopicsWidth = showRightTopics ? '- var(--assistants-width)' : ''
+    return `calc(100vw - var(--sidebar-width) ${minusAssistantsWidth} ${minusRightTopicsWidth})`
+  }, [showAssistants, showTopics, topicPosition])

  useHotkeys('esc', () => {
    contentSearchRef.current?.disable()
--- a/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx
+++ b/src/renderer/src/pages/home/Tabs/AssistantsTab.tsx
@ -30,7 +30,7 @@ const Assistants: FC<AssistantsTabProps> = ({
  const { addAgent } = useAgents()
  const { t } = useTranslation()
  const { getGroupedAssistants } = useTags()
-  const { AssistantsTabSortType = 'list', setAssistantsTabSortType } = useAssistantsTabSortType()
+  const { assistantsTabSortType = 'list', setAssistantsTabSortType } = useAssistantsTabSortType()
  const containerRef = useRef<HTMLDivElement>(null)

  const onDelete = useCallback(
@ -51,9 +51,10 @@ const Assistants: FC<AssistantsTabProps> = ({
    },
    [setAssistantsTabSortType]
  )
-  return (
-    <Container className="assistants-tab" ref={containerRef}>
-      {AssistantsTabSortType === 'tags' && (
+
+  if (assistantsTabSortType === 'tags') {
+    return (
+      <Container className="assistants-tab" ref={containerRef}>
        <div style={{ marginBottom: '8px' }}>
          {getGroupedAssistants.map((group) => (
            <TagsContainer key={group.tag}>
@ -68,7 +69,7 @@ const Assistants: FC<AssistantsTabProps> = ({
                  key={assistant.id}
                  assistant={assistant}
                  isActive={assistant.id === activeAssistant.id}
-                  sortBy={AssistantsTabSortType}
+                  sortBy={assistantsTabSortType}
                  onSwitch={setActiveAssistant}
                  onDelete={onDelete}
                  addAgent={addAgent}
@ -80,30 +81,39 @@ const Assistants: FC<AssistantsTabProps> = ({
            </TagsContainer>
          ))}
        </div>
-      )}
-      {AssistantsTabSortType === 'list' && (
-        <DragableList
-          list={assistants}
-          onUpdate={updateAssistants}
-          style={{ paddingBottom: dragging ? '34px' : 0 }}
-          onDragStart={() => setDragging(true)}
-          onDragEnd={() => setDragging(false)}>
-          {(assistant) => (
-            <AssistantItem
-              key={assistant.id}
-              assistant={assistant}
-              isActive={assistant.id === activeAssistant.id}
-              sortBy={AssistantsTabSortType}
-              onSwitch={setActiveAssistant}
-              onDelete={onDelete}
-              addAgent={addAgent}
-              addAssistant={addAssistant}
-              onCreateDefaultAssistant={onCreateDefaultAssistant}
-              handleSortByChange={handleSortByChange}
-            />
-          )}
-        </DragableList>
-      )}
+        <AssistantAddItem onClick={onCreateAssistant}>
+          <AssistantName>
+            <PlusOutlined style={{ color: 'var(--color-text-2)', marginRight: 4 }} />
+            {t('chat.add.assistant.title')}
+          </AssistantName>
+        </AssistantAddItem>
+      </Container>
+    )
+  }
+
+  return (
+    <Container className="assistants-tab" ref={containerRef}>
+      <DragableList
+        list={assistants}
+        onUpdate={updateAssistants}
+        style={{ paddingBottom: dragging ? '34px' : 0 }}
+        onDragStart={() => setDragging(true)}
+        onDragEnd={() => setDragging(false)}>
+        {(assistant) => (
+          <AssistantItem
+            key={assistant.id}
+            assistant={assistant}
+            isActive={assistant.id === activeAssistant.id}
+            sortBy={assistantsTabSortType}
+            onSwitch={setActiveAssistant}
+            onDelete={onDelete}
+            addAgent={addAgent}
+            addAssistant={addAssistant}
+            onCreateDefaultAssistant={onCreateDefaultAssistant}
+            handleSortByChange={handleSortByChange}
+          />
+        )}
+      </DragableList>
      {!dragging && (
        <AssistantAddItem onClick={onCreateAssistant}>
          <AssistantName>
@ -128,7 +138,6 @@ const TagsContainer = styled.div`
  display: flex;
  flex-direction: column;
  gap: 8px;
-  margin-bottom: px;
 `

 const AssistantAddItem = styled.div`
@ -158,6 +167,7 @@ const GroupTitle = styled.div`
  color: var(--color-text-2);
  font-size: 12px;
  font-weight: 500;
+  margin-bottom: -8px;
 `

 const GroupTitleName = styled.div`
--- a/src/renderer/src/pages/home/Tabs/components/AssistantItem.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/AssistantItem.tsx
@ -1,21 +1,18 @@
 import {
  DeleteOutlined,
  EditOutlined,
-  MenuOutlined,
  MinusCircleOutlined,
  PlusOutlined,
  SaveOutlined,
  SmileOutlined,
  SortAscendingOutlined,
-  SortDescendingOutlined,
-  TagsOutlined
+  SortDescendingOutlined
 } from '@ant-design/icons'
 import ModelAvatar from '@renderer/components/Avatar/ModelAvatar'
 import EmojiIcon from '@renderer/components/EmojiIcon'
 import CopyIcon from '@renderer/components/Icons/CopyIcon'
-import TagsPopup from '@renderer/components/Popups/TagsPopup'
+import PromptPopup from '@renderer/components/Popups/PromptPopup'
 import { useAssistant, useAssistants } from '@renderer/hooks/useAssistant'
-import { modelGenerating } from '@renderer/hooks/useRuntime'
 import { useSettings } from '@renderer/hooks/useSettings'
 import { useTags } from '@renderer/hooks/useTags'
 import AssistantSettingsPopup from '@renderer/pages/settings/AssistantSettings'
@ -24,14 +21,16 @@ import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
 import { Assistant, AssistantsSortType } from '@renderer/types'
 import { uuid } from '@renderer/utils'
 import { hasTopicPendingRequests } from '@renderer/utils/queue'
-import { Dropdown } from 'antd'
-import { ItemType } from 'antd/es/menu/interface'
+import { Dropdown, MenuProps } from 'antd'
 import { omit } from 'lodash'
-import { FC, startTransition, useCallback, useEffect, useState } from 'react'
+import { AlignJustify, Plus, Settings2, Tag, Tags } from 'lucide-react'
+import { FC, memo, startTransition, 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'
+
 interface AssistantItemProps {
  assistant: Assistant
  isActive: boolean
@ -57,219 +56,70 @@ const AssistantItem: FC<AssistantItemProps> = ({
 }) => {
  const { t } = useTranslation()
  const { allTags } = useTags()
-  const { removeAllTopics } = useAssistant(assistant.id) // 使用当前助手的ID
+  const { removeAllTopics } = useAssistant(assistant.id)
  const { clickAssistantToShowTopic, topicPosition, assistantIconType, setAssistantIconType } = useSettings()
  const defaultModel = getDefaultModel()
  const { assistants, updateAssistants } = useAssistants()

  const [isPending, setIsPending] = useState(false)
+
  useEffect(() => {
    if (isActive) {
      setIsPending(false)
+      return
    }
+
    const hasPending = assistant.topics.some((topic) => hasTopicPendingRequests(topic.id))
-    if (hasPending) {
-      setIsPending(true)
-    }
+    setIsPending(hasPending)
  }, [isActive, assistant.topics])

  const sortByPinyinAsc = useCallback(() => {
-    const sorted = [...assistants].sort((a, b) => {
-      const pinyinA = tinyPinyin.convertToPinyin(a.name, '', true)
-      const pinyinB = tinyPinyin.convertToPinyin(b.name, '', true)
-      return pinyinA.localeCompare(pinyinB)
-    })
-    updateAssistants(sorted)
+    updateAssistants(sortAssistantsByPinyin(assistants, true))
  }, [assistants, updateAssistants])

  const sortByPinyinDesc = useCallback(() => {
-    const sorted = [...assistants].sort((a, b) => {
-      const pinyinA = tinyPinyin.convertToPinyin(a.name, '', true)
-      const pinyinB = tinyPinyin.convertToPinyin(b.name, '', true)
-      return pinyinB.localeCompare(pinyinA)
-    })
-    updateAssistants(sorted)
+    updateAssistants(sortAssistantsByPinyin(assistants, false))
  }, [assistants, updateAssistants])

-  const getMenuItems = useCallback(
-    (assistant: Assistant): ItemType[] => [
-      {
-        label: t('assistants.edit.title'),
-        key: 'edit',
-        icon: <EditOutlined />,
-        onClick: () => AssistantSettingsPopup.show({ assistant })
-      },
-      {
-        label: t('assistants.copy.title'),
-        key: 'duplicate',
-        icon: <CopyIcon />,
-        onClick: async () => {
-          const _assistant: Assistant = { ...assistant, id: uuid(), topics: [getDefaultTopic(assistant.id)] }
-          addAssistant(_assistant)
-          onSwitch(_assistant)
-        }
-      },
-      {
-        label: t('assistants.clear.title'),
-        key: 'clear',
-        icon: <MinusCircleOutlined />,
-        onClick: () => {
-          window.modal.confirm({
-            title: t('assistants.clear.title'),
-            content: t('assistants.clear.content'),
-            centered: true,
-            okButtonProps: { danger: true },
-            onOk: () => removeAllTopics() // 使用当前助手的removeAllTopics
-          })
-        }
-      },
-      {
-        label: t('assistants.save.title'),
-        key: 'save-to-agent',
-        icon: <SaveOutlined />,
-        onClick: async () => {
-          const agent = omit(assistant, ['model', 'emoji'])
-          agent.id = uuid()
-          agent.type = 'agent'
-          addAgent(agent)
-          window.message.success({
-            content: t('assistants.save.success'),
-            key: 'save-to-agent'
-          })
-        }
-      },
-      {
-        label: t('assistants.icon.type'),
-        key: 'icon-type',
-        icon: <SmileOutlined />,
-        children: [
-          {
-            label: t('settings.assistant.icon.type.model'),
-            key: 'model',
-            onClick: () => setAssistantIconType('model')
-          },
-          {
-            label: t('settings.assistant.icon.type.emoji'),
-            key: 'emoji',
-            onClick: () => setAssistantIconType('emoji')
-          },
-          {
-            label: t('settings.assistant.icon.type.none'),
-            key: 'none',
-            onClick: () => setAssistantIconType('none')
-          }
-        ]
-      },
-      { type: 'divider' },
-      {
-        label: t('assistants.tags.manage'),
-        key: 'all-tags',
-        icon: <PlusOutlined />,
-        children: [
-          ...allTags.map((tag) => ({
-            label: tag,
-            icon: assistant.tags?.includes(tag) ? <DeleteOutlined /> : <TagsOutlined />,
-            danger: assistant.tags?.includes(tag) ? true : false,
-            key: `all-tag-${tag}`,
-            onClick: () => {
-              if (assistant.tags?.includes(tag)) {
-                // 如果已有该标签，则移除
-                updateAssistants(assistants.map((a) => (a.id === assistant.id ? { ...a, tags: [] } : a)))
-              } else {
-                // 如果没有该标签，则切换到该标签分类
-                updateAssistants(assistants.map((a) => (a.id === assistant.id ? { ...a, tags: [tag] } : a)))
-              }
-            }
-          })),
-          allTags.length > 0 ? { type: 'divider' } : null,
-          {
-            label: t('assistants.tags.add'),
-            key: 'new-tag',
-            onClick: () => {
-              TagsPopup.show(
-                assistant,
-                (updated) => {
-                  updateAssistants(assistants.map((a) => (a.id === assistant.id ? updated : a)))
-                },
-                'add'
-              )
-            }
-          },
-          allTags.length > 0
-            ? {
-                label: t('assistants.tags.manage'),
-                key: 'manage-tags',
-                onClick: () => {
-                  TagsPopup.show(
-                    assistant,
-                    (updated) => {
-                      updateAssistants(assistants.map((a) => (a.id === assistant.id ? updated : a)))
-                    },
-                    'manage'
-                  )
-                }
-              }
-            : null
-        ]
-      },
-      {
-        label: sortBy === 'list' ? t('assistants.list.showByTags') : t('assistants.list.showByList'),
-        key: 'switch-view',
-        icon: sortBy === 'list' ? <TagsOutlined /> : <MenuOutlined />,
-        onClick: () => {
-          sortBy === 'list' ? handleSortByChange?.('tags') : handleSortByChange?.('list')
-        }
-      },
-      {
-        label: t('common.sort.pinyin.asc'),
-        key: 'sort-asc',
-        icon: <SortAscendingOutlined />,
-        onClick: () => sortByPinyinAsc()
-      },
-      {
-        label: t('common.sort.pinyin.desc'),
-        key: 'sort-desc',
-        icon: <SortDescendingOutlined />,
-        onClick: () => sortByPinyinDesc()
-      },
-      { type: 'divider' },
-      {
-        label: t('common.delete'),
-        key: 'delete',
-        icon: <DeleteOutlined />,
-        danger: true,
-        onClick: () => {
-          window.modal.confirm({
-            title: t('assistants.delete.title'),
-            content: t('assistants.delete.content'),
-            centered: true,
-            okButtonProps: { danger: true },
-            onOk: () => onDelete(assistant)
-          })
-        }
-      }
-    ],
+  const menuItems = useMemo(
+    () =>
+      getMenuItems({
+        assistant,
+        t,
+        allTags,
+        assistants,
+        updateAssistants,
+        addAgent,
+        addAssistant,
+        onSwitch,
+        onDelete,
+        removeAllTopics,
+        setAssistantIconType,
+        sortBy,
+        handleSortByChange,
+        sortByPinyinAsc,
+        sortByPinyinDesc
+      }),
    [
-      addAgent,
-      addAssistant,
+      assistant,
+      t,
      allTags,
      assistants,
-      handleSortByChange,
-      onDelete,
+      updateAssistants,
+      addAgent,
+      addAssistant,
      onSwitch,
+      onDelete,
      removeAllTopics,
      setAssistantIconType,
      sortBy,
+      handleSortByChange,
      sortByPinyinAsc,
-      sortByPinyinDesc,
-      t,
-      updateAssistants
+      sortByPinyinDesc
    ]
  )

  const handleSwitch = useCallback(async () => {
-    await modelGenerating()
-
    if (clickAssistantToShowTopic) {
      if (topicPosition === 'left') {
        EventEmitter.emit(EVENT_NAMES.SWITCH_TOPIC_SIDEBAR)
@ -282,11 +132,14 @@ const AssistantItem: FC<AssistantItemProps> = ({
    }
  }, [clickAssistantToShowTopic, onSwitch, assistant, topicPosition])

-  const assistantName = assistant.name || t('chat.default.name')
-  const fullAssistantName = assistant.emoji ? `${assistant.emoji} ${assistantName}` : assistantName
+  const assistantName = useMemo(() => assistant.name || t('chat.default.name'), [assistant.name, t])
+  const fullAssistantName = useMemo(
+    () => (assistant.emoji ? `${assistant.emoji} ${assistantName}` : assistantName),
+    [assistant.emoji, assistantName]
+  )

  return (
-    <Dropdown menu={{ items: getMenuItems(assistant) }} trigger={['contextMenu']}>
+    <Dropdown menu={{ items: menuItems }} trigger={['contextMenu']}>
      <Container onClick={handleSwitch} className={isActive ? 'active' : ''}>
        <AssistantNameRow className="name" title={fullAssistantName}>
          {assistantIconType === 'model' ? (
@ -315,6 +168,217 @@ const AssistantItem: FC<AssistantItemProps> = ({
  )
 }

+// 提取排序相关的工具函数
+const sortAssistantsByPinyin = (assistants: Assistant[], isAscending: boolean) => {
+  return [...assistants].sort((a, b) => {
+    const pinyinA = tinyPinyin.convertToPinyin(a.name, '', true)
+    const pinyinB = tinyPinyin.convertToPinyin(b.name, '', true)
+    return isAscending ? pinyinA.localeCompare(pinyinB) : pinyinB.localeCompare(pinyinA)
+  })
+}
+
+// 提取标签相关的操作函数
+const handleTagOperation = (
+  tag: string,
+  assistant: Assistant,
+  assistants: Assistant[],
+  updateAssistants: (assistants: Assistant[]) => void
+) => {
+  if (assistant.tags?.includes(tag)) {
+    updateAssistants(assistants.map((a) => (a.id === assistant.id ? { ...a, tags: [] } : a)))
+  } else {
+    updateAssistants(assistants.map((a) => (a.id === assistant.id ? { ...a, tags: [tag] } : a)))
+  }
+}
+
+// 提取创建菜单项的函数
+const createTagMenuItems = (
+  allTags: string[],
+  assistant: Assistant,
+  assistants: Assistant[],
+  updateAssistants: (assistants: Assistant[]) => void,
+  t: (key: string) => string
+): MenuProps['items'] => {
+  const items: MenuProps['items'] = [
+    ...allTags.map((tag) => ({
+      label: tag,
+      icon: assistant.tags?.includes(tag) ? <DeleteOutlined size={14} /> : <Tag size={12} />,
+      danger: assistant.tags?.includes(tag),
+      key: `all-tag-${tag}`,
+      onClick: () => handleTagOperation(tag, assistant, assistants, updateAssistants)
+    }))
+  ]
+
+  if (allTags.length > 0) {
+    items.push({ type: 'divider' })
+  }
+
+  items.push({
+    label: t('assistants.tags.add'),
+    key: 'new-tag',
+    icon: <Plus size={16} />,
+    onClick: async () => {
+      const tagName = await PromptPopup.show({
+        title: t('assistants.tags.add'),
+        message: ''
+      })
+
+      if (tagName && tagName.trim()) {
+        updateAssistants(assistants.map((a) => (a.id === assistant.id ? { ...a, tags: [tagName.trim()] } : a)))
+      }
+    }
+  })
+
+  if (allTags.length > 0) {
+    items.push({
+      label: t('assistants.tags.manage'),
+      key: 'manage-tags',
+      icon: <Settings2 size={16} />,
+      onClick: () => {
+        AssistantTagsPopup.show({ title: t('assistants.tags.manage') })
+      }
+    })
+  }
+
+  return items
+}
+
+// 提取创建菜单配置的函数
+function getMenuItems({
+  assistant,
+  t,
+  allTags,
+  assistants,
+  updateAssistants,
+  addAgent,
+  addAssistant,
+  onSwitch,
+  onDelete,
+  removeAllTopics,
+  setAssistantIconType,
+  sortBy,
+  handleSortByChange,
+  sortByPinyinAsc,
+  sortByPinyinDesc
+}): MenuProps['items'] {
+  return [
+    {
+      label: t('assistants.edit.title'),
+      key: 'edit',
+      icon: <EditOutlined />,
+      onClick: () => AssistantSettingsPopup.show({ assistant })
+    },
+    {
+      label: t('assistants.copy.title'),
+      key: 'duplicate',
+      icon: <CopyIcon />,
+      onClick: async () => {
+        const _assistant: Assistant = { ...assistant, id: uuid(), topics: [getDefaultTopic(assistant.id)] }
+        addAssistant(_assistant)
+        onSwitch(_assistant)
+      }
+    },
+    {
+      label: t('assistants.clear.title'),
+      key: 'clear',
+      icon: <MinusCircleOutlined />,
+      onClick: () => {
+        window.modal.confirm({
+          title: t('assistants.clear.title'),
+          content: t('assistants.clear.content'),
+          centered: true,
+          okButtonProps: { danger: true },
+          onOk: removeAllTopics
+        })
+      }
+    },
+    {
+      label: t('assistants.save.title'),
+      key: 'save-to-agent',
+      icon: <SaveOutlined />,
+      onClick: async () => {
+        const agent = omit(assistant, ['model', 'emoji'])
+        agent.id = uuid()
+        agent.type = 'agent'
+        addAgent(agent)
+        window.message.success({
+          content: t('assistants.save.success'),
+          key: 'save-to-agent'
+        })
+      }
+    },
+    {
+      label: t('assistants.icon.type'),
+      key: 'icon-type',
+      icon: <SmileOutlined />,
+      children: [
+        {
+          label: t('settings.assistant.icon.type.model'),
+          key: 'model',
+          onClick: () => setAssistantIconType('model')
+        },
+        {
+          label: t('settings.assistant.icon.type.emoji'),
+          key: 'emoji',
+          onClick: () => setAssistantIconType('emoji')
+        },
+        {
+          label: t('settings.assistant.icon.type.none'),
+          key: 'none',
+          onClick: () => setAssistantIconType('none')
+        }
+      ]
+    },
+    {
+      type: 'divider'
+    },
+    {
+      label: t('assistants.tags.manage'),
+      key: 'all-tags',
+      icon: <PlusOutlined />,
+      children: createTagMenuItems(allTags, assistant, assistants, updateAssistants, t)
+    },
+    {
+      label: sortBy === 'list' ? t('assistants.list.showByTags') : t('assistants.list.showByList'),
+      key: 'switch-view',
+      icon: sortBy === 'list' ? <Tags size={14} /> : <AlignJustify size={14} />,
+      onClick: () => {
+        sortBy === 'list' ? handleSortByChange?.('tags') : handleSortByChange?.('list')
+      }
+    },
+    {
+      label: t('common.sort.pinyin.asc'),
+      key: 'sort-asc',
+      icon: <SortAscendingOutlined />,
+      onClick: sortByPinyinAsc
+    },
+    {
+      label: t('common.sort.pinyin.desc'),
+      key: 'sort-desc',
+      icon: <SortDescendingOutlined />,
+      onClick: sortByPinyinDesc
+    },
+    {
+      type: 'divider'
+    },
+    {
+      label: t('common.delete'),
+      key: 'delete',
+      icon: <DeleteOutlined />,
+      danger: true,
+      onClick: () => {
+        window.modal.confirm({
+          title: t('assistants.delete.title'),
+          content: t('assistants.delete.content'),
+          centered: true,
+          okButtonProps: { danger: true },
+          onOk: () => onDelete(assistant)
+        })
+      }
+    }
+  ]
+}
+
 const Container = styled.div`
  display: flex;
  flex-direction: row;
@ -336,8 +400,6 @@ const Container = styled.div`
  &.active {
    background-color: var(--color-background-soft);
    border: 0.5px solid var(--color-border);
-    .name {
-    }
  }
 `

@ -382,4 +444,4 @@ const TopicCount = styled.div`
  align-items: center;
 `

-export default AssistantItem
+export default memo(AssistantItem)
--- a/src/renderer/src/pages/home/Tabs/components/AssistantTagsPopup.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/AssistantTagsPopup.tsx
@ -0,0 +1,123 @@
+import { Box } from '@renderer/components/Layout'
+import { TopView } from '@renderer/components/TopView'
+import { useAssistants } from '@renderer/hooks/useAssistant'
+import { useTags } from '@renderer/hooks/useTags'
+import { Button, Empty, Modal } from 'antd'
+import { isEmpty } from 'lodash'
+import { Trash } from 'lucide-react'
+import { useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import styled from 'styled-components'
+
+interface ShowParams {
+  title: string
+}
+
+interface Props extends ShowParams {
+  resolve: (data: any) => void
+}
+
+const PopupContainer: React.FC<Props> = ({ title, resolve }) => {
+  const [open, setOpen] = useState(true)
+  const { allTags, getAssistantsByTag } = useTags()
+  const { assistants, updateAssistants } = useAssistants()
+  const { t } = useTranslation()
+
+  const onOk = () => {
+    setOpen(false)
+  }
+
+  const onCancel = () => {
+    setOpen(false)
+  }
+
+  const onClose = () => {
+    resolve({})
+  }
+
+  const onDelete = (removedTag: string) => {
+    window.modal.confirm({
+      title: t('assistants.tags.deleteConfirm'),
+      centered: true,
+      onOk: () => {
+        const relatedAssistants = getAssistantsByTag(removedTag)
+        if (!isEmpty(relatedAssistants)) {
+          updateAssistants(
+            assistants.map((assistant) => {
+              const findedAssitant = relatedAssistants.find((_assistant) => _assistant.id === assistant.id)
+              return findedAssitant ? { ...findedAssitant, tags: [] } : assistant
+            })
+          )
+        }
+      }
+    })
+  }
+
+  AssistantTagsPopup.hide = onCancel
+
+  return (
+    <Modal
+      title={title}
+      open={open}
+      onOk={onOk}
+      onCancel={onCancel}
+      afterClose={onClose}
+      footer={null}
+      transitionName="animation-move-down"
+      centered>
+      <Container>
+        {allTags.map((tag) => (
+          <TagItem key={tag}>
+            <Box mr={8}>{tag}</Box>
+            <Button type="text" icon={<Trash size={16} />} danger onClick={() => onDelete(tag)} />
+          </TagItem>
+        ))}
+        {allTags.length === 0 && <Empty description="" />}
+      </Container>
+    </Modal>
+  )
+}
+
+const Container = styled.div`
+  padding: 12px 0;
+  height: 50vh;
+  overflow-y: auto;
+  &::-webkit-scrollbar {
+    display: none;
+  }
+`
+
+const TagItem = styled.div`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 8px;
+  border-radius: 8px;
+  user-select: none;
+  background-color: var(--color-background-soft);
+  margin-bottom: 8px;
+`
+
+const TopViewKey = 'AssistantTagsPopup'
+
+export default class AssistantTagsPopup {
+  static topviewId = 0
+  static hide() {
+    TopView.hide(TopViewKey)
+  }
+  static show(props: ShowParams) {
+    return new Promise<any>((resolve) => {
+      TopView.show(
+        <PopupContainer
+          {...props}
+          resolve={(v) => {
+            resolve(v)
+            TopView.hide(TopViewKey)
+          }}
+        />,
+        TopViewKey
+      )
+    })
+  }
+}
--- a/src/renderer/src/pages/settings/AssistantSettings/AssistantTagsSettings.tsx
+++ b/src/renderer/src/pages/settings/AssistantSettings/AssistantTagsSettings.tsx
@ -1,171 +0,0 @@
-import { CheckOutlined, CloseOutlined } from '@ant-design/icons'
-import { Box } from '@renderer/components/Layout'
-import { useAssistants } from '@renderer/hooks/useAssistant'
-import { useTags } from '@renderer/hooks/useTags'
-import { Assistant } from '@renderer/types'
-import type { InputRef } from 'antd'
-import { Divider, Input, Space, Tag } from 'antd'
-import { useEffect, useRef, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import styled from 'styled-components'
-
-interface Props {
-  assistant: Assistant
-  updateAssistant: (assistant: Assistant) => void
-  mode?: 'add' | 'manage'
-}
-
-const AssistantTagsSettings: React.FC<Props> = ({ assistant, updateAssistant, mode = 'manage' }) => {
-  const { t } = useTranslation()
-  const { allTags } = useTags()
-  const [showMode, setShowMode] = useState<'add' | 'manage'>(mode)
-  const [filteredTags, setFilteredTags] = useState<string[]>(allTags)
-  const [currentTags, setCurrentTags] = useState<string[]>([...(assistant.tags || [])])
-  const [tempTag, setTempTag] = useState<string | undefined>(mode === 'add' ? '' : assistant.tags?.[0])
-  const [inputTag, setInputTag] = useState<string>('')
-  const { assistants, updateAssistants } = useAssistants()
-
-  useEffect(() => {
-    setFilteredTags(allTags)
-  }, [allTags])
-
-  const inputRef = useRef<InputRef>(null)
-
-  const { getAssistantsByTag } = useTags()
-
-  const handleClose = (removedTag: string) => {
-    // 更新所有关联该tag的助手
-    const relatedAssistants = getAssistantsByTag(removedTag)
-    setCurrentTags(currentTags.filter((tag) => tag !== removedTag)) // 点击下面移除是不需要缓存的
-    updateAssistants(
-      assistants.map((assistant) => {
-        const findedAssitant = relatedAssistants.find((_assistant) => _assistant.id === assistant.id)
-        if (findedAssitant) {
-          return { ...findedAssitant, tags: [] }
-        }
-        return assistant
-      })
-    )
-  }
-
-  return (
-    <Container>
-      {showMode === 'manage' && (
-        <>
-          <Box mb={8} style={{ fontWeight: 'bold' }}>
-            {t('assistants.tags.settings.title')}
-          </Box>
-          <TagsContainer>
-            <span>{t('assistants.tags.settings.current')}:</span>
-            {tempTag && (
-              <Tag
-                key={tempTag}
-                closeIcon={<CloseOutlined />}
-                style={{
-                  cursor: 'pointer'
-                }}
-                onClose={() => {
-                  setTempTag('')
-                  // 防止删除以后，没有tag的助手被删除，写个暂存的。方便恢复回去
-                  setCurrentTags([...new Set([...currentTags, tempTag])])
-                  updateAssistant({ ...assistant, tags: [] })
-                }}>
-                {tempTag}
-              </Tag>
-            )}
-            {!tempTag && <span style={{ color: 'var(--color-text-3)' }}>{t('assistants.tags.none')}</span>}
-          </TagsContainer>
-          <Divider style={{ margin: 8 }}></Divider>
-        </>
-      )}
-
-      <Space.Compact direction="vertical" style={{ width: '100%', gap: 8 }}>
-        {showMode === 'add' && (
-          <>
-            <Box mb={8} style={{ fontWeight: 'bold' }}>
-              {t('assistants.tags.settings.addTagsPlaceholder')}
-            </Box>
-            <Input
-              ref={inputRef}
-              value={inputTag}
-              autoFocus
-              onChange={(e) => setInputTag(e.target.value)}
-              suffix={
-                <>
-                  {+inputTag?.length > 0 && (
-                    <CheckOutlined
-                      onClick={() => {
-                        if (inputTag) {
-                          setInputTag('')
-                          setTempTag(inputTag)
-                          updateAssistant({ ...assistant, tags: [inputTag] })
-                          setShowMode('manage')
-                        }
-                      }}
-                      style={{ color: 'var(--color-primary)', cursor: 'pointer' }}
-                    />
-                  )}
-                </>
-              }
-            />
-          </>
-        )}
-        {showMode === 'manage' && (
-          <div>
-            <Box mb={8} style={{ fontWeight: 'bold' }}>
-              {t('assistants.tags.settings.searchTagsPlaceholder')}
-            </Box>
-            <Input
-              placeholder={t('assistants.tags.settings.searchTagsPlaceholder')}
-              style={{ marginBottom: 8 }}
-              onChange={(e) => {
-                const searchValue = e.target.value.toLowerCase()
-                setFilteredTags(allTags?.filter((tag) => tag.toLowerCase().includes(searchValue)))
-              }}
-            />
-            <Box mb={8} style={{ fontWeight: 'bold' }}>
-              {t('assistants.tags.settings.tagsLsitTitle')}
-              <em style={{ fontSize: '12px' }}>（{t('assistants.tags.settings.tagsLsitTitleTips')}）</em>
-            </Box>
-            <div style={{ display: 'flex', flexWrap: 'wrap', gap: 4 }}>
-              {[...new Set([...filteredTags, ...currentTags])]
-                .filter((_) => _ !== tempTag)
-                ?.map((tag) => (
-                  <Tag
-                    key={tag}
-                    closeIcon={<CloseOutlined style={{ color: 'var(--color-text)' }} />}
-                    style={{
-                      cursor: 'pointer',
-                      background: 'var(--color-background-mute)',
-                      color: 'var(--color-text)'
-                    }}
-                    onClose={() => handleClose(tag)}
-                    onClick={() => {
-                      setTempTag(tag)
-                      updateAssistant({ ...assistant, tags: [tag] })
-                    }}>
-                    {tag}
-                  </Tag>
-                ))}
-            </div>
-          </div>
-        )}
-        {/* <PlusCircleOutlined onClick={handleAddClick} style={{ color: 'var(--color-primary)', cursor: 'pointer' }} /> */}
-      </Space.Compact>
-    </Container>
-  )
-}
-
-const Container = styled.div`
-  padding: 10px;
-`
-
-const TagsContainer = styled.div`
-  margin: 10px 0;
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-  align-items: center;
-`
-
-export default AssistantTagsSettings
--- a/src/renderer/src/pages/settings/AssistantSettings/index.tsx
+++ b/src/renderer/src/pages/settings/AssistantSettings/index.tsx
@ -15,14 +15,13 @@ import AssistantMessagesSettings from './AssistantMessagesSettings'
 import AssistantModelSettings from './AssistantModelSettings'
 import AssistantPromptSettings from './AssistantPromptSettings'
 import AssistantRegularPromptsSettings from './AssistantRegularPromptsSettings'
-import AssistantTagsSettings from './AssistantTagsSettings'

 interface AssistantSettingPopupShowParams {
  assistant: Assistant
  tab?: AssistantSettingPopupTab
 }

-type AssistantSettingPopupTab = 'prompt' | 'model' | 'messages' | 'knowledge_base' | 'mcp' | 'regular_phrases' | 'tags'
+type AssistantSettingPopupTab = 'prompt' | 'model' | 'messages' | 'knowledge_base' | 'mcp' | 'regular_phrases'

 interface Props extends AssistantSettingPopupShowParams {
  resolve: (assistant: Assistant) => void
@ -79,10 +78,6 @@ const AssistantSettingPopupContainer: React.FC<Props> = ({ resolve, tab, ...prop
    {
      key: 'regular_phrases',
      label: t('assistants.settings.regular_phrases.title', 'Regular Prompts')
-    },
-    {
-      key: 'tags',
-      label: t('assistants.tags.settings.title')
    }
  ].filter(Boolean) as { key: string; label: string }[]

@ -155,7 +150,6 @@ const AssistantSettingPopupContainer: React.FC<Props> = ({ resolve, tab, ...prop
          {menu === 'regular_phrases' && (
            <AssistantRegularPromptsSettings assistant={assistant} updateAssistant={updateAssistant} />
          )}
-          {menu === 'tags' && <AssistantTagsSettings assistant={assistant} updateAssistant={updateAssistant} />}
        </Settings>
      </HStack>
    </StyledModal>