From 45f3536b1b1f2d9abe32982475cd78a29cbda7dd Mon Sep 17 00:00:00 2001
From: canisminor1990 <i@canisminor.cc>
Date: Mon, 15 Jan 2024 23:57:32 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=85=20test:=20Add=20test=20and=20fix=20so?=
 =?UTF-8?q?me=20code=20review=20problems?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../features/ChatInput/Footer/index.tsx       |  16 +-
 .../(desktop)/features/ChatInput/index.tsx    |   2 +-
 .../CollapseGroup/Actions.tsx                 |   6 +-
 .../SessionListContent/DefaultMode.tsx        |  13 +-
 .../SessionListContent/List/Item/Actions.tsx  |  20 +-
 .../Modals/ConfigGroupModal/GroupItem.tsx     |   6 +-
 .../Modals/ConfigGroupModal/index.tsx         |   4 +-
 .../Modals/CreateGroupModal.tsx               |   4 +-
 .../Modals/RenameGroupModal.tsx               |   6 +-
 src/const/settings.ts                         |   1 +
 src/database/models/__tests__/session.test.ts |   4 +-
 src/store/global/helpers.ts                   |   2 +-
 src/store/global/slices/common/action.ts      |  13 +-
 .../global/slices/common/initialState.ts      |   9 +-
 src/store/global/slices/common/selectors.ts   |   3 -
 .../__snapshots__/selectors.test.ts.snap      |  98 +++++
 src/store/global/slices/settings/action.ts    |  27 +-
 .../slices/{common => settings}/helpers.ts    |   0
 .../global/slices/settings/selectors.test.ts  | 339 ++++++++----------
 src/store/global/slices/settings/selectors.ts |   3 +
 .../session/slices/session/action.test.ts     |  54 +++
 .../session/slices/session/selectors/list.ts  |   2 +-
 src/types/session.ts                          |   3 +-
 src/types/settings.ts                         |   2 +
 24 files changed, 393 insertions(+), 244 deletions(-)
 rename src/store/global/slices/{common => settings}/helpers.ts (100%)

diff --git a/src/app/chat/(desktop)/features/ChatInput/Footer/index.tsx b/src/app/chat/(desktop)/features/ChatInput/Footer/index.tsx
index c53c3bc8a2737..75417a8c39c33 100644
--- a/src/app/chat/(desktop)/features/ChatInput/Footer/index.tsx
+++ b/src/app/chat/(desktop)/features/ChatInput/Footer/index.tsx
@@ -4,11 +4,11 @@ import { createStyles } from 'antd-style';
 import {
   ChevronUp,
   CornerDownLeft,
-  Loader2,
   LucideCheck,
   LucideChevronDown,
   LucideCommand,
   LucidePlus,
+  StopCircle,
 } from 'lucide-react';
 import { rgba } from 'polished';
 import { memo } from 'react';
@@ -42,7 +42,7 @@ const useStyles = createStyles(({ css, prefixCls, token }) => {
 
       .${prefixCls}-btn.${prefixCls}-dropdown-trigger {
         &::before {
-          background-color: ${rgba(token.colorBgLayout, 0.05)} !important;
+          background-color: ${rgba(token.colorBgLayout, 0.1)} !important;
         }
       }
     `,
@@ -51,7 +51,7 @@ const useStyles = createStyles(({ css, prefixCls, token }) => {
 
 const isMac = isMacOS();
 
-const Footer = memo(() => {
+const Footer = memo<{ setExpand?: (expand: boolean) => void }>(({ setExpand }) => {
   const { t } = useTranslation('chat');
 
   const { theme, styles } = useStyles();
@@ -111,12 +111,18 @@ const Footer = memo(() => {
         <SaveTopic />
         <Flexbox style={{ minWidth: 92 }}>
           {loading ? (
-            <Button icon={loading && <Icon icon={Loader2} spin />} onClick={stopGenerateMessage}>
+            <Button icon={loading && <Icon icon={StopCircle} />} onClick={stopGenerateMessage}>
               {t('input.stop')}
             </Button>
           ) : (
             <Space.Compact>
-              <Button onClick={() => sendMessage()} type={'primary'}>
+              <Button
+                onClick={() => {
+                  sendMessage();
+                  setExpand?.(false);
+                }}
+                type={'primary'}
+              >
                 {t('input.send')}
               </Button>
               <Dropdown
diff --git a/src/app/chat/(desktop)/features/ChatInput/index.tsx b/src/app/chat/(desktop)/features/ChatInput/index.tsx
index 238cf15983428..fad04d9d8e2b5 100644
--- a/src/app/chat/(desktop)/features/ChatInput/index.tsx
+++ b/src/app/chat/(desktop)/features/ChatInput/index.tsx
@@ -46,7 +46,7 @@ const ChatInput = memo(() => {
       >
         <Head expand={expand} setExpand={setExpand} />
         <TextArea setExpand={setExpand} />
-        <Footer />
+        <Footer setExpand={setExpand} />
       </Flexbox>
     </DraggablePanel>
   );
diff --git a/src/app/chat/features/SessionListContent/CollapseGroup/Actions.tsx b/src/app/chat/features/SessionListContent/CollapseGroup/Actions.tsx
index 2c980e6460cea..df7e3bbd76d54 100644
--- a/src/app/chat/features/SessionListContent/CollapseGroup/Actions.tsx
+++ b/src/app/chat/features/SessionListContent/CollapseGroup/Actions.tsx
@@ -7,8 +7,8 @@ import { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useGlobalStore } from '@/store/global';
-import { preferenceSelectors } from '@/store/global/selectors';
-import { groupHelpers } from '@/store/global/slices/common/helpers';
+import { groupHelpers } from '@/store/global/helpers';
+import { settingsSelectors } from '@/store/global/selectors';
 
 const useStyles = createStyles(({ css }) => ({
   modalRoot: css`
@@ -25,7 +25,7 @@ const Actions = memo<ActionsProps>(({ id, openRenameModal, openConfigModal, onOp
   const { t } = useTranslation('common');
   const { styles } = useStyles();
   const { modal } = App.useApp();
-  const sessionCustomGroups = useGlobalStore(preferenceSelectors.sessionCustomGroups, isEqual);
+  const sessionCustomGroups = useGlobalStore(settingsSelectors.sessionCustomGroups, isEqual);
   const updateCustomGroup = useGlobalStore((s) => s.updateCustomGroup);
   const items: MenuProps['items'] = useMemo(
     () => [
diff --git a/src/app/chat/features/SessionListContent/DefaultMode.tsx b/src/app/chat/features/SessionListContent/DefaultMode.tsx
index 591f768d7599f..c06f6f6d3b86f 100644
--- a/src/app/chat/features/SessionListContent/DefaultMode.tsx
+++ b/src/app/chat/features/SessionListContent/DefaultMode.tsx
@@ -4,7 +4,7 @@ import { memo, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useGlobalStore } from '@/store/global';
-import { preferenceSelectors } from '@/store/global/selectors';
+import { preferenceSelectors, settingsSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 import { sessionSelectors } from '@/store/session/selectors';
 
@@ -20,19 +20,16 @@ const SessionListContent = memo(() => {
   const [renameGroupModalOpen, setRenameGroupModalOpen] = useState(false);
   const [configGroupModalOpen, setConfigGroupModalOpen] = useState(false);
   const { t } = useTranslation('chat');
-
-  const [ useFetchSessions] = useSessionStore((s) => [
-    s.useFetchSessions,
-  ]);
-
-  const sessionCustomGroups = useGlobalStore(preferenceSelectors.sessionCustomGroups, isEqual);
+  const sessionCustomGroups = useGlobalStore(settingsSelectors.sessionCustomGroups, isEqual);
   const sessionList =
     useSessionStore(sessionSelectors.sessionList(sessionCustomGroups), isEqual) || {};
   const [sessionGroupKeys, updatePreference] = useGlobalStore((s) => [
     preferenceSelectors.sessionGroupKeys(s),
     s.updatePreference,
   ]);
-
+  const [ useFetchSessions] = useSessionStore((s) => [
+    s.useFetchSessions,
+  ]);
   useFetchSessions();
 
 
diff --git a/src/app/chat/features/SessionListContent/List/Item/Actions.tsx b/src/app/chat/features/SessionListContent/List/Item/Actions.tsx
index 4b85837cb634d..1e7ca4a558bb9 100644
--- a/src/app/chat/features/SessionListContent/List/Item/Actions.tsx
+++ b/src/app/chat/features/SessionListContent/List/Item/Actions.tsx
@@ -18,7 +18,7 @@ import { useTranslation } from 'react-i18next';
 
 import { configService } from '@/services/config';
 import { useGlobalStore } from '@/store/global';
-import { preferenceSelectors } from '@/store/global/selectors';
+import { settingsSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 import { sessionHelpers } from '@/store/session/helpers';
 import { sessionSelectors } from '@/store/session/selectors';
@@ -42,7 +42,7 @@ const Actions = memo<ActionProps>(({ group, id, openCreateGroupModal, setOpen })
 
   const { styles } = useStyles();
 
-  const sessionCustomGroups = useGlobalStore(preferenceSelectors.sessionCustomGroups, isEqual);
+  const sessionCustomGroups = useGlobalStore(settingsSelectors.sessionCustomGroups, isEqual);
   const [pin, removeSession, pinSession, duplicateSession, updateSessionGroup] = useSessionStore(
     (s) => {
       const session = sessionSelectors.getSessionById(id)(s);
@@ -86,14 +86,6 @@ const Actions = memo<ActionProps>(({ group, id, openCreateGroupModal, setOpen })
       },
       {
         children: [
-          {
-            icon: isDefault ? <Icon icon={Check} /> : <div />,
-            key: 'defaultList',
-            label: t('defaultList'),
-            onClick: () => {
-              updateSessionGroup(id, SessionDefaultGroup.Default);
-            },
-          },
           ...sessionCustomGroups.map(({ id: groupId, name }) => ({
             icon: group === groupId ? <Icon icon={Check} /> : <div />,
             key: groupId,
@@ -102,6 +94,14 @@ const Actions = memo<ActionProps>(({ group, id, openCreateGroupModal, setOpen })
               updateSessionGroup(id, groupId);
             },
           })),
+          {
+            icon: isDefault ? <Icon icon={Check} /> : <div />,
+            key: 'defaultList',
+            label: t('defaultList'),
+            onClick: () => {
+              updateSessionGroup(id, SessionDefaultGroup.Default);
+            },
+          },
           {
             type: 'divider',
           },
diff --git a/src/app/chat/features/SessionListContent/Modals/ConfigGroupModal/GroupItem.tsx b/src/app/chat/features/SessionListContent/Modals/ConfigGroupModal/GroupItem.tsx
index be1ed03ea9053..555c0d9d897b4 100644
--- a/src/app/chat/features/SessionListContent/Modals/ConfigGroupModal/GroupItem.tsx
+++ b/src/app/chat/features/SessionListContent/Modals/ConfigGroupModal/GroupItem.tsx
@@ -7,8 +7,8 @@ import { memo, useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useGlobalStore } from '@/store/global';
-import { preferenceSelectors } from '@/store/global/selectors';
-import { groupHelpers } from '@/store/global/slices/common/helpers';
+import { groupHelpers } from '@/store/global/helpers';
+import { settingsSelectors } from '@/store/global/selectors';
 import { SessionGroupItem } from '@/types/session';
 
 const useStyles = createStyles(({ css }) => ({
@@ -27,7 +27,7 @@ const useStyles = createStyles(({ css }) => ({
 
 const GroupItem = memo<SessionGroupItem>(({ id, name }) => {
   const [editing, setEditing] = useState(false);
-  const sessionCustomGroups = useGlobalStore(preferenceSelectors.sessionCustomGroups, isEqual);
+  const sessionCustomGroups = useGlobalStore(settingsSelectors.sessionCustomGroups, isEqual);
   const updateCustomGroup = useGlobalStore((s) => s.updateCustomGroup);
   const { t } = useTranslation('common');
   const { styles } = useStyles();
diff --git a/src/app/chat/features/SessionListContent/Modals/ConfigGroupModal/index.tsx b/src/app/chat/features/SessionListContent/Modals/ConfigGroupModal/index.tsx
index 84a8f22cc7247..bea06d46e4daa 100644
--- a/src/app/chat/features/SessionListContent/Modals/ConfigGroupModal/index.tsx
+++ b/src/app/chat/features/SessionListContent/Modals/ConfigGroupModal/index.tsx
@@ -8,7 +8,7 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { useGlobalStore } from '@/store/global';
-import { preferenceSelectors } from '@/store/global/selectors';
+import { settingsSelectors } from '@/store/global/selectors';
 import { SessionGroupItem } from '@/types/session';
 
 import GroupItem from './GroupItem';
@@ -30,7 +30,7 @@ const useStyles = createStyles(({ css, token, stylish }) => ({
 const ConfigGroupModal = memo<ModalProps>(({ open, onCancel }) => {
   const { t } = useTranslation('common');
   const { styles } = useStyles();
-  const sessionCustomGroups = useGlobalStore(preferenceSelectors.sessionCustomGroups, isEqual);
+  const sessionCustomGroups = useGlobalStore(settingsSelectors.sessionCustomGroups, isEqual);
   const [addCustomGroup, updateCustomGroup] = useGlobalStore((s) => [
     s.addCustomGroup,
     s.updateCustomGroup,
diff --git a/src/app/chat/features/SessionListContent/Modals/CreateGroupModal.tsx b/src/app/chat/features/SessionListContent/Modals/CreateGroupModal.tsx
index 2b212ed0499cc..009a0dfb102b9 100644
--- a/src/app/chat/features/SessionListContent/Modals/CreateGroupModal.tsx
+++ b/src/app/chat/features/SessionListContent/Modals/CreateGroupModal.tsx
@@ -5,7 +5,7 @@ import { memo, useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useGlobalStore } from '@/store/global';
-import { preferenceSelectors } from '@/store/global/selectors';
+import { settingsSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 
 interface CreateGroupModalProps extends ModalProps {
@@ -15,7 +15,7 @@ interface CreateGroupModalProps extends ModalProps {
 const CreateGroupModal = memo<CreateGroupModalProps>(
   ({ id, open, onCancel }: CreateGroupModalProps) => {
     const { t } = useTranslation('common');
-    const sessionCustomGroups = useGlobalStore(preferenceSelectors.sessionCustomGroups, isEqual);
+    const sessionCustomGroups = useGlobalStore(settingsSelectors.sessionCustomGroups, isEqual);
     const addCustomGroup = useGlobalStore((s) => s.addCustomGroup);
     const updateSessionGroup = useSessionStore((s) => s.updateSessionGroup);
     const [input, setInput] = useState('');
diff --git a/src/app/chat/features/SessionListContent/Modals/RenameGroupModal.tsx b/src/app/chat/features/SessionListContent/Modals/RenameGroupModal.tsx
index fc33f427798b6..59168c63d8d38 100644
--- a/src/app/chat/features/SessionListContent/Modals/RenameGroupModal.tsx
+++ b/src/app/chat/features/SessionListContent/Modals/RenameGroupModal.tsx
@@ -5,8 +5,8 @@ import { memo, useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useGlobalStore } from '@/store/global';
-import { preferenceSelectors } from '@/store/global/selectors';
-import { groupHelpers } from '@/store/global/slices/common/helpers';
+import { groupHelpers } from '@/store/global/helpers';
+import { settingsSelectors } from '@/store/global/selectors';
 
 interface RenameGroupModalProps extends ModalProps {
   id: string;
@@ -14,7 +14,7 @@ interface RenameGroupModalProps extends ModalProps {
 
 const RenameGroupModal = memo<RenameGroupModalProps>(({ id, open, onCancel }) => {
   const { t } = useTranslation('common');
-  const sessionCustomGroups = useGlobalStore(preferenceSelectors.sessionCustomGroups, isEqual);
+  const sessionCustomGroups = useGlobalStore(settingsSelectors.sessionCustomGroups, isEqual);
   const updateCustomGroup = useGlobalStore((s) => s.updateCustomGroup);
   const group = groupHelpers.getGroupById(id, sessionCustomGroups);
   const [input, setInput] = useState<string>();
diff --git a/src/const/settings.ts b/src/const/settings.ts
index 82fdde3b62ffb..d8e691eb2cd17 100644
--- a/src/const/settings.ts
+++ b/src/const/settings.ts
@@ -15,6 +15,7 @@ export const DEFAULT_BASE_SETTINGS: GlobalBaseSettings = {
   fontSize: 14,
   language: 'auto',
   password: '',
+  sessionCustomGroups: [],
   themeMode: 'auto',
 };
 
diff --git a/src/database/models/__tests__/session.test.ts b/src/database/models/__tests__/session.test.ts
index a7406599a2607..65dabdecc4512 100644
--- a/src/database/models/__tests__/session.test.ts
+++ b/src/database/models/__tests__/session.test.ts
@@ -72,12 +72,12 @@ describe('SessionModel', () => {
 
   it('should update a session', async () => {
     const createdSession = await SessionModel.create('agent', sessionData);
-    const updateData = { group: 'createGroup' };
+    const updateData = { group: 'newGroup' };
 
     await SessionModel.update(createdSession.id, updateData);
     const updatedSession = await SessionModel.findById(createdSession.id);
 
-    expect(updatedSession).toHaveProperty('group', 'createGroup');
+    expect(updatedSession).toHaveProperty('group', 'newGroup');
   });
 
   // 删除一个 session 时，也需要同步删除具有 sessionId 的 topic 和 message
diff --git a/src/store/global/helpers.ts b/src/store/global/helpers.ts
index afbde148fb8ec..cc88a6575d0df 100644
--- a/src/store/global/helpers.ts
+++ b/src/store/global/helpers.ts
@@ -7,4 +7,4 @@ export const globalHelpers = {
   getCurrentLanguage,
 };
 
-export * from './slices/common/helpers';
+export * from './slices/settings/helpers';
diff --git a/src/store/global/slices/common/action.ts b/src/store/global/slices/common/action.ts
index dc618aa7b4ff0..7341eb8c1ee5d 100644
--- a/src/store/global/slices/common/action.ts
+++ b/src/store/global/slices/common/action.ts
@@ -8,7 +8,6 @@ import { SESSION_CHAT_URL } from '@/const/url';
 import { CURRENT_VERSION } from '@/const/version';
 import { globalService } from '@/services/global';
 import type { GlobalStore } from '@/store/global';
-import { SessionGroupItem } from '@/types/session';
 import type { GlobalServerConfig } from '@/types/settings';
 import { merge } from '@/utils/merge';
 import { setNamespace } from '@/utils/storeDebug';
@@ -22,8 +21,8 @@ const n = setNamespace('settings');
  * 设置操作
  */
 export interface CommonAction {
-  switchBackToChat: (sessionId?: string) => void;
   addCustomGroup: (name: string) => string;
+  switchBackToChat: (sessionId?: string) => void;
   /**
    * 切换侧边栏选项
    * @param key - 选中的侧边栏选项
@@ -32,7 +31,6 @@ export interface CommonAction {
   toggleChatSideBar: (visible?: boolean) => void;
   toggleMobileTopic: (visible?: boolean) => void;
   toggleSystemRole: (visible?: boolean) => void;
-  updateCustomGroup: (groups: SessionGroupItem[]) => void;
   updateGuideState: (guide: Partial<Guide>) => void;
   updatePreference: (preference: Partial<GlobalPreference>, action?: string) => void;
   useCheckLatestVersion: () => SWRResponse<string>;
@@ -45,9 +43,6 @@ export const createCommonSlice: StateCreator<
   [],
   CommonAction
 > = (set, get) => ({
-  switchBackToChat: (sessionId) => {
-    get().router?.push(SESSION_CHAT_URL(sessionId || INBOX_SESSION_ID, get().isMobile));
-  },
   addCustomGroup: (name) => {
     const sessionCustomGroups = get().preference.sessionCustomGroups || [];
 
@@ -63,6 +58,9 @@ export const createCommonSlice: StateCreator<
 
     return groupId;
   },
+  switchBackToChat: (sessionId) => {
+    get().router?.push(SESSION_CHAT_URL(sessionId || INBOX_SESSION_ID, get().isMobile));
+  },
   switchSideBar: (key) => {
     set({ sidebarKey: key }, false, n('switchSideBar', key));
   },
@@ -84,9 +82,6 @@ export const createCommonSlice: StateCreator<
 
     get().updatePreference({ showSystemRole }, n('toggleMobileTopic', newValue) as string);
   },
-  updateCustomGroup: (groups) => {
-    get().updatePreference({ sessionCustomGroups: groups });
-  },
   updateGuideState: (guide) => {
     const { updatePreference } = get();
     const nextGuide = merge(get().preference.guide, guide);
diff --git a/src/store/global/slices/common/initialState.ts b/src/store/global/slices/common/initialState.ts
index 94f9f675720f3..786b481dffb9f 100644
--- a/src/store/global/slices/common/initialState.ts
+++ b/src/store/global/slices/common/initialState.ts
@@ -1,7 +1,7 @@
-import { SessionGroupItem } from '@/types/session';
-
 import { AppRouterInstance } from 'next/dist/shared/lib/app-router-context.shared-runtime';
 
+import { SessionDefaultGroup, SessionGroupId, SessionGroupItem } from '@/types/session';
+
 export enum SidebarTabKey {
   Chat = 'chat',
   Market = 'market',
@@ -25,8 +25,9 @@ export interface GlobalPreference {
   inputHeight: number;
   mobileShowTopic?: boolean;
   sessionCustomGroups: SessionGroupItem[];
-  sessionGroupKeys: string[];
+  sessionGroupKeys: SessionGroupId[];
   sessionsWidth: number;
+
   showChatSideBar?: boolean;
   showSessionPanel?: boolean;
   showSystemRole?: boolean;
@@ -57,7 +58,7 @@ export const initialCommonState: GlobalCommonState = {
     inputHeight: 200,
     mobileShowTopic: false,
     sessionCustomGroups: [],
-    sessionGroupKeys: ['pinned', 'sessionList'],
+    sessionGroupKeys: [SessionDefaultGroup.Pinned, SessionDefaultGroup.Default],
     sessionsWidth: 320,
     showChatSideBar: true,
     showSessionPanel: true,
diff --git a/src/store/global/slices/common/selectors.ts b/src/store/global/slices/common/selectors.ts
index 606caaa79f0d0..73df620157b9d 100644
--- a/src/store/global/slices/common/selectors.ts
+++ b/src/store/global/slices/common/selectors.ts
@@ -7,10 +7,7 @@ const sessionGroupKeys = (s: GlobalStore): string[] =>
 
 const useCmdEnterToSend = (s: GlobalStore): boolean => s.preference.useCmdEnterToSend || false;
 
-const sessionCustomGroups = (s: GlobalStore) => s.preference.sessionCustomGroups || [];
-
 export const preferenceSelectors = {
-  sessionCustomGroups,
   sessionGroupKeys,
   useCmdEnterToSend,
 };
diff --git a/src/store/global/slices/settings/__snapshots__/selectors.test.ts.snap b/src/store/global/slices/settings/__snapshots__/selectors.test.ts.snap
index 5c50b28de2f09..0b2af124d5ad8 100644
--- a/src/store/global/slices/settings/__snapshots__/selectors.test.ts.snap
+++ b/src/store/global/slices/settings/__snapshots__/selectors.test.ts.snap
@@ -145,6 +145,12 @@ exports[`settingsSelectors > currentSettings > should merge DEFAULT_SETTINGS and
   "neutralColor": "sand",
   "password": "password123",
   "primaryColor": "blue",
+  "sessionCustomGroups": [
+    {
+      "id": "group-1",
+      "name": "Group 1",
+    },
+  ],
   "themeMode": "light",
   "tool": {
     "dalle": {
@@ -161,3 +167,95 @@ exports[`settingsSelectors > currentSettings > should merge DEFAULT_SETTINGS and
   },
 }
 `;
+
+exports[`settingsSelectors > currentTTS > should merge DEFAULT_TTS_CONFIG and s.settings.tts correctly 1`] = `
+{
+  "openAI": {
+    "sttModel": "whisper-2",
+    "ttsModel": "tts-1",
+  },
+  "sttAutoStop": false,
+  "sttServer": "openai",
+}
+`;
+
+exports[`settingsSelectors > dalleConfig > should return the dalle configuration 1`] = `
+{
+  "apiKey": "dalle-api-key",
+  "autoGenerate": true,
+}
+`;
+
+exports[`settingsSelectors > defaultAgent > should merge DEFAULT_AGENT and s.settings.defaultAgent correctly 1`] = `
+{
+  "config": {
+    "autoCreateTopicThreshold": 2,
+    "displayMode": "chat",
+    "enableAutoCreateTopic": true,
+    "historyCount": 1,
+    "model": "gpt-3.5-turbo",
+    "params": {
+      "frequency_penalty": 0,
+      "presence_penalty": 0,
+      "temperature": 0.6,
+      "top_p": 1,
+    },
+    "plugins": [],
+    "systemRole": "user",
+    "tts": {
+      "showAllLocaleVoice": false,
+      "sttLocale": "auto",
+      "ttsService": "openai",
+      "voice": {
+        "openai": "alloy",
+      },
+    },
+  },
+  "meta": {
+    "avatar": "agent-avatar.jpg",
+    "description": "Test agent",
+  },
+}
+`;
+
+exports[`settingsSelectors > defaultAgentConfig > should merge DEFAULT_AGENT_CONFIG and defaultAgent(s).config correctly 1`] = `
+{
+  "autoCreateTopicThreshold": 2,
+  "displayMode": "chat",
+  "enableAutoCreateTopic": true,
+  "historyCount": 1,
+  "model": "gpt-3.5-turbo",
+  "params": {
+    "frequency_penalty": 0,
+    "presence_penalty": 0,
+    "temperature": 0.7,
+    "top_p": 1,
+  },
+  "plugins": [],
+  "systemRole": "user",
+  "tts": {
+    "showAllLocaleVoice": false,
+    "sttLocale": "auto",
+    "ttsService": "openai",
+    "voice": {
+      "openai": "alloy",
+    },
+  },
+}
+`;
+
+exports[`settingsSelectors > defaultAgentMeta > should merge DEFAULT_AGENT_META and defaultAgent(s).meta correctly 1`] = `
+{
+  "avatar": "agent-avatar.jpg",
+  "description": "Test agent",
+}
+`;
+
+exports[`settingsSelectors > sessionCustomGroups > should return session custom groups 1`] = `
+[
+  {
+    "id": "group-1",
+    "name": "Group 1",
+  },
+]
+`;
diff --git a/src/store/global/slices/settings/action.ts b/src/store/global/slices/settings/action.ts
index bf2d5ed011f15..94eb152968674 100644
--- a/src/store/global/slices/settings/action.ts
+++ b/src/store/global/slices/settings/action.ts
@@ -7,10 +7,11 @@ import type { StateCreator } from 'zustand/vanilla';
 import { DEFAULT_AGENT, DEFAULT_SETTINGS } from '@/const/settings';
 import type { GlobalStore } from '@/store/global';
 import { SettingsTabs } from '@/store/global/initialState';
-import { LobeAgentSettings } from '@/types/session';
+import { LobeAgentSettings, SessionGroupItem } from '@/types/session';
 import type { GlobalSettings, OpenAIConfig } from '@/types/settings';
 import { merge } from '@/utils/merge';
 import { setNamespace } from '@/utils/storeDebug';
+import { nanoid } from '@/utils/uuid';
 
 const n = setNamespace('settings');
 
@@ -18,24 +19,26 @@ const n = setNamespace('settings');
  * 设置操作
  */
 export interface SettingsAction {
+  addCustomGroup: (name: string) => string;
   importAppSettings: (settings: GlobalSettings) => void;
   /**
    * 重置设置
    */
   resetSettings: () => void;
   setOpenAIConfig: (config: Partial<OpenAIConfig>) => void;
-
   /**
    * 设置部分配置设置
    * @param settings - 部分配置设置
    */
   setSettings: (settings: DeepPartial<GlobalSettings>) => void;
+
   switchSettingTabs: (tab: SettingsTabs) => void;
   /**
    * 设置主题模式
    * @param themeMode - 主题模式
    */
   switchThemeMode: (themeMode: ThemeMode) => void;
+  updateCustomGroup: (groups: SessionGroupItem[]) => void;
   updateDefaultAgent: (agent: DeepPartial<LobeAgentSettings>) => void;
 }
 
@@ -45,6 +48,21 @@ export const createSettingsSlice: StateCreator<
   [],
   SettingsAction
 > = (set, get) => ({
+  addCustomGroup: (name) => {
+    const sessionCustomGroups = get().settings.sessionCustomGroups || [];
+
+    const groupId = nanoid();
+    const sessionGroupKeys = get().preference.sessionGroupKeys || [];
+    get().updateCustomGroup([...sessionCustomGroups, { id: groupId, name }]);
+    get().updatePreference(
+      {
+        sessionGroupKeys: [...sessionGroupKeys, groupId],
+      },
+      'addCustomGroup',
+    );
+
+    return groupId;
+  },
   importAppSettings: (importAppSettings) => {
     const { setSettings } = get();
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -68,7 +86,6 @@ export const createSettingsSlice: StateCreator<
   setOpenAIConfig: (config) => {
     get().setSettings({ languageModel: { openAI: config } });
   },
-
   setSettings: (settings) => {
     const prevSetting = get().settings;
     const nextSettings = merge(prevSetting, settings);
@@ -77,12 +94,16 @@ export const createSettingsSlice: StateCreator<
 
     set({ settings: merge(prevSetting, settings) }, false, n('setSettings', settings));
   },
+
   switchSettingTabs: (tab) => {
     set({ settingsTab: tab });
   },
   switchThemeMode: (themeMode) => {
     get().setSettings({ themeMode });
   },
+  updateCustomGroup: (groups) => {
+    get().setSettings({ sessionCustomGroups: groups });
+  },
   updateDefaultAgent: (agent) => {
     const settings = produce(get().settings, (draft: GlobalSettings) => {
       draft.defaultAgent = merge(draft.defaultAgent, agent);
diff --git a/src/store/global/slices/common/helpers.ts b/src/store/global/slices/settings/helpers.ts
similarity index 100%
rename from src/store/global/slices/common/helpers.ts
rename to src/store/global/slices/settings/helpers.ts
diff --git a/src/store/global/slices/settings/selectors.test.ts b/src/store/global/slices/settings/selectors.test.ts
index 149e0b59b4db9..cfa861acdf636 100644
--- a/src/store/global/slices/settings/selectors.test.ts
+++ b/src/store/global/slices/settings/selectors.test.ts
@@ -15,6 +15,12 @@ describe('settingsSelectors', () => {
           password: 'password123',
           primaryColor: 'blue',
           themeMode: 'light',
+          sessionCustomGroups: [
+            {
+              name: 'Group 1',
+              id: 'group-1',
+            },
+          ],
           defaultAgent: {
             config: {
               systemRole: '',
@@ -153,187 +159,156 @@ describe('settingsSelectors', () => {
       expect(result).toMatchSnapshot();
     });
   });
+  describe('defaultAgent', () => {
+    it('should merge DEFAULT_AGENT and s.settings.defaultAgent correctly', () => {
+      const s = {
+        settings: {
+          defaultAgent: {
+            config: {
+              systemRole: 'user',
+              model: LanguageModel.GPT3_5,
+            },
+            meta: {
+              avatar: 'agent-avatar.jpg',
+              description: 'Test agent',
+            },
+          },
+        },
+      } as unknown as GlobalStore;
+
+      const result = settingsSelectors.defaultAgent(s);
+
+      expect(result).toMatchSnapshot();
+    });
+  });
+
+  describe('defaultAgentConfig', () => {
+    it('should merge DEFAULT_AGENT_CONFIG and defaultAgent(s).config correctly', () => {
+      const s = {
+        settings: {
+          defaultAgent: {
+            config: {
+              systemRole: 'user',
+              model: LanguageModel.GPT3_5,
+              params: {
+                temperature: 0.7,
+              },
+            },
+          },
+        },
+      } as unknown as GlobalStore;
+
+      const result = settingsSelectors.defaultAgentConfig(s);
+
+      expect(result).toMatchSnapshot();
+    });
+  });
+
+  describe('defaultAgentMeta', () => {
+    it('should merge DEFAULT_AGENT_META and defaultAgent(s).meta correctly', () => {
+      const s = {
+        settings: {
+          defaultAgent: {
+            meta: {
+              avatar: 'agent-avatar.jpg',
+              description: 'Test agent',
+            },
+          },
+        },
+      } as unknown as GlobalStore;
+
+      const result = settingsSelectors.defaultAgentMeta(s);
+
+      expect(result).toMatchSnapshot();
+    });
+  });
 
-  // describe('defaultAgent', () => {
-  //   it('should merge DEFAULT_AGENT and s.settings.defaultAgent correctly', () => {
-  //     const s: GlobalStore = {
-  //       settings: {
-  //         defaultAgent: {
-  //           config: {
-  //             model: 'gpt-3.5-turbo',
-  //             maxTokens: 100,
-  //           },
-  //           meta: {
-  //             name: 'Default Agent',
-  //             description: 'Default agent for testing',
-  //           },
-  //         },
-  //       },
-  //     };
-  //
-  //     const result = settingsSelectors.defaultAgent(s);
-  //
-  //     expect(result).toEqual(expected);
-  //   });
-  // });
-  //
-  // describe('defaultAgentConfig', () => {
-  //   it('should merge DEFAULT_AGENT_CONFIG and defaultAgent(s).config correctly', () => {
-  //     const s: GlobalStore = {
-  //       settings: {
-  //         defaultAgent: {
-  //           config: {
-  //             model: 'gpt-3.5-turbo',
-  //             maxTokens: 100,
-  //           },
-  //         },
-  //       },
-  //     };
-  //
-  //     const result = settingsSelectors.defaultAgentConfig(s);
-  //
-  //     const defaultAgent = settingsSelectors.defaultAgent(s);
-  //     const expected = merge({}, DEFAULT_AGENT_CONFIG, defaultAgent.config);
-  //
-  //     expect(result).toEqual(expected);
-  //   });
-  // });
-  //
-  // describe('defaultAgentMeta', () => {
-  //   it('should merge DEFAULT_AGENT_META and defaultAgent(s).meta correctly', () => {
-  //     const s: GlobalStore = {
-  //       settings: {
-  //         defaultAgent: {
-  //           meta: {
-  //             name: 'Default Agent',
-  //             description: 'Default agent for testing',
-  //           },
-  //         },
-  //       },
-  //     };
-  //
-  //     const result = settingsSelectors.defaultAgentMeta(s);
-  //
-  //     const defaultAgent = settingsSelectors.defaultAgent(s);
-  //     const expected = merge({}, DEFAULT_AGENT_META, defaultAgent.meta);
-  //
-  //     expect(result).toEqual(expected);
-  //   });
-  // });
-  //
-  // describe('exportSettings', () => {
-  //   it('should remove OPENAI_API_KEY and password fields from s.settings', () => {
-  //     const s: GlobalStore = {
-  //       settings: {
-  //         OPENAI_API_KEY: 'openai-api-key',
-  //         password: 'password123',
-  //         avatar: 'avatar.jpg',
-  //         fontSize: 14,
-  //         language: 'en',
-  //         neutralColor: 'white',
-  //         primaryColor: 'blue',
-  //         themeMode: 'light',
-  //         defaultAgent: {
-  //           config: {
-  //             model: 'gpt-3.5-turbo',
-  //             maxTokens: 100,
-  //           },
-  //           meta: {
-  //             name: 'Default Agent',
-  //             description: 'Default agent for testing',
-  //           },
-  //         },
-  //         languageModel: {
-  //           azureOpenAI: {
-  //             AZURE_API_KEY: 'azure-api-key',
-  //             apiVersion: 'v1',
-  //             endpoint: 'https://azure-openai-endpoint.com',
-  //             models: ['gpt-3.5-turbo'],
-  //           },
-  //           openAI: {
-  //             OPENAI_API_KEY: 'openai-api-key',
-  //             endpoint: 'https://openai-endpoint.com',
-  //             models: ['gpt-3.5-turbo'],
-  //           },
-  //         },
-  //       },
-  //     };
-  //
-  //     const result = settingsSelectors.exportSettings(s);
-  //
-  //     const expected = {
-  //       avatar: 'avatar.jpg',
-  //       fontSize: 14,
-  //       language: 'en',
-  //       neutralColor: 'white',
-  //       primaryColor: 'blue',
-  //       themeMode: 'light',
-  //       defaultAgent: {
-  //         config: {
-  //           model: 'gpt-3.5-turbo',
-  //           maxTokens: 100,
-  //         },
-  //         meta: {
-  //           name: 'Default Agent',
-  //           description: 'Default agent for testing',
-  //         },
-  //       },
-  //       languageModel: {
-  //         azureOpenAI: {
-  //           AZURE_API_KEY: 'azure-api-key',
-  //           apiVersion: 'v1',
-  //           endpoint: 'https://azure-openai-endpoint.com',
-  //           models: ['gpt-3.5-turbo'],
-  //         },
-  //         openAI: {
-  //           endpoint: 'https://openai-endpoint.com',
-  //           models: ['gpt-3.5-turbo'],
-  //         },
-  //       },
-  //     };
-  //
-  //     expect(result).toEqual(expected);
-  //   });
-  //
-  //   it('should return the result as GlobalSettings type', () => {
-  //     const s: GlobalStore = {
-  //       settings: {
-  //         avatar: 'avatar.jpg',
-  //         fontSize: 14,
-  //         language: 'en',
-  //         neutralColor: 'white',
-  //         password: 'password123',
-  //         primaryColor: 'blue',
-  //         themeMode: 'light',
-  //         defaultAgent: {
-  //           config: {
-  //             model: 'gpt-3.5-turbo',
-  //             maxTokens: 100,
-  //           },
-  //           meta: {
-  //             name: 'Default Agent',
-  //             description: 'Default agent for testing',
-  //           },
-  //         },
-  //         languageModel: {
-  //           azureOpenAI: {
-  //             AZURE_API_KEY: 'azure-api-key',
-  //             apiVersion: 'v1',
-  //             endpoint: 'https://azure-openai-endpoint.com',
-  //             models: ['gpt-3.5-turbo'],
-  //           },
-  //           openAI: {
-  //             OPENAI_API_KEY: 'openai-api-key',
-  //             endpoint: 'https://openai-endpoint.com',
-  //             models: ['gpt-3.5-turbo'],
-  //           },
-  //         },
-  //       },
-  //     };
-  //
-  //     const result = settingsSelectors.exportSettings(s);
-  //
-  //     expect(result).toBeInstanceOf(GlobalSettings);
-  //   });
-  // });
+  describe('currentTTS', () => {
+    it('should merge DEFAULT_TTS_CONFIG and s.settings.tts correctly', () => {
+      const s = {
+        settings: {
+          tts: {
+            sttAutoStop: false,
+            openAI: {
+              sttModel: 'whisper-2',
+            },
+          },
+        },
+      } as unknown as GlobalStore;
+
+      const result = settingsSelectors.currentTTS(s);
+
+      expect(result).toMatchSnapshot();
+    });
+  });
+
+  describe('currentLanguage', () => {
+    it('should return the correct language setting', () => {
+      const s = {
+        settings: {
+          language: 'fr',
+        },
+      } as unknown as GlobalStore;
+
+      const result = settingsSelectors.currentLanguage(s);
+
+      expect(result).toBe('fr');
+    });
+  });
+
+  describe('dalleConfig', () => {
+    it('should return the dalle configuration', () => {
+      const s = {
+        settings: {
+          tool: {
+            dalle: {
+              apiKey: 'dalle-api-key',
+              autoGenerate: true,
+            },
+          },
+        },
+      } as unknown as GlobalStore;
+
+      const result = settingsSelectors.dalleConfig(s);
+
+      expect(result).toMatchSnapshot();
+    });
+  });
+
+  describe('isDalleAutoGenerating', () => {
+    it('should return the autoGenerate flag from dalle configuration', () => {
+      const s = {
+        settings: {
+          tool: {
+            dalle: {
+              autoGenerate: true,
+            },
+          },
+        },
+      } as unknown as GlobalStore;
+
+      const result = settingsSelectors.isDalleAutoGenerating(s);
+
+      expect(result).toBe(true);
+    });
+  });
+
+  describe('sessionCustomGroups', () => {
+    it('should return session custom groups', () => {
+      const s = {
+        settings: {
+          sessionCustomGroups: [
+            {
+              name: 'Group 1',
+              id: 'group-1',
+            },
+          ],
+        },
+      } as unknown as GlobalStore;
+
+      const result = settingsSelectors.sessionCustomGroups(s);
+
+      expect(result).toMatchSnapshot();
+    });
+  });
 });
diff --git a/src/store/global/slices/settings/selectors.ts b/src/store/global/slices/settings/selectors.ts
index 81112f8c1baed..514e973cbd371 100644
--- a/src/store/global/slices/settings/selectors.ts
+++ b/src/store/global/slices/settings/selectors.ts
@@ -89,6 +89,8 @@ const currentLanguage = (s: GlobalStore) => {
 const dalleConfig = (s: GlobalStore) => s.settings.tool?.dalle || {};
 const isDalleAutoGenerating = (s: GlobalStore) => s.settings.tool?.dalle?.autoGenerate;
 
+const sessionCustomGroups = (s: GlobalStore) => s.settings.sessionCustomGroups || [];
+
 export const settingsSelectors = {
   currentLanguage,
   currentSettings,
@@ -102,4 +104,5 @@ export const settingsSelectors = {
   modelList: modelListSelectors,
   openAIAPI: openAIAPIKeySelectors,
   openAIProxyUrl: openAIProxyUrlSelectors,
+  sessionCustomGroups,
 };
diff --git a/src/store/session/slices/session/action.test.ts b/src/store/session/slices/session/action.test.ts
index b5dc272a864ee..7664449167369 100644
--- a/src/store/session/slices/session/action.test.ts
+++ b/src/store/session/slices/session/action.test.ts
@@ -133,4 +133,58 @@ describe('SessionAction', () => {
       );
     });
   });
+
+  describe('activeSession', () => {
+    it('should set the provided session id as active', async () => {
+      const { result } = renderHook(() => useSessionStore());
+      const sessionId = 'active-session-id';
+
+      act(() => {
+        result.current.activeSession(sessionId);
+      });
+
+      expect(result.current.activeId).toBe(sessionId);
+    });
+  });
+
+  describe('pinSession', () => {
+    it('should pin a session when pinned is true', async () => {
+      const { result } = renderHook(() => useSessionStore());
+      const sessionId = 'session-id-to-pin';
+
+      await act(async () => {
+        await result.current.pinSession(sessionId, true);
+      });
+
+      expect(sessionService.updateSessionGroup).toHaveBeenCalledWith(sessionId, 'pinned');
+      expect(mockRefresh).toHaveBeenCalled();
+    });
+
+    it('should unpin a session when pinned is false', async () => {
+      const { result } = renderHook(() => useSessionStore());
+      const sessionId = 'session-id-to-unpin';
+
+      await act(async () => {
+        await result.current.pinSession(sessionId, false);
+      });
+
+      expect(sessionService.updateSessionGroup).toHaveBeenCalledWith(sessionId, 'default');
+      expect(mockRefresh).toHaveBeenCalled();
+    });
+  });
+
+  describe('updateSessionGroup', () => {
+    it('should update the session group and refresh the list', async () => {
+      const { result } = renderHook(() => useSessionStore());
+      const sessionId = 'session-id';
+      const groupId = 'new-group-id';
+
+      await act(async () => {
+        await result.current.updateSessionGroup(sessionId, groupId);
+      });
+
+      expect(sessionService.updateSessionGroup).toHaveBeenCalledWith(sessionId, groupId);
+      expect(mockRefresh).toHaveBeenCalled();
+    });
+  });
 });
diff --git a/src/store/session/slices/session/selectors/list.ts b/src/store/session/slices/session/selectors/list.ts
index 58b84de7bb449..b2703904fa307 100644
--- a/src/store/session/slices/session/selectors/list.ts
+++ b/src/store/session/slices/session/selectors/list.ts
@@ -1,5 +1,5 @@
 import { INBOX_SESSION_ID } from '@/const/session';
-import { groupHelpers } from '@/store/global/slices/common/helpers';
+import { groupHelpers } from '@/store/global/helpers';
 import { sessionHelpers } from '@/store/session/slices/session/helpers';
 import { MetaData } from '@/types/meta';
 import {
diff --git a/src/types/session.ts b/src/types/session.ts
index 6b98188747d0d..b33cc6b0f9c64 100644
--- a/src/types/session.ts
+++ b/src/types/session.ts
@@ -7,7 +7,7 @@ export enum LobeSessionType {
   Group = 'group',
 }
 
-export type SessionGroupId = 'pinned' | 'default' | string;
+export type SessionGroupId = SessionDefaultGroup | string;
 
 export enum SessionDefaultGroup {
   Default = 'default',
@@ -17,7 +17,6 @@ export enum SessionDefaultGroup {
 export interface SessionGroupItem {
   id: SessionGroupId;
   name: string;
-  sort?: number;
 }
 
 /**
diff --git a/src/types/settings.ts b/src/types/settings.ts
index 23dc775cbe390..2ea21473302d7 100644
--- a/src/types/settings.ts
+++ b/src/types/settings.ts
@@ -3,6 +3,7 @@ import type { ThemeMode } from 'antd-style';
 
 import { LocaleMode } from '@/types/locale';
 import type { LobeAgentSession } from '@/types/session';
+import { SessionGroupItem } from '@/types/session';
 
 export interface GlobalBaseSettings {
   avatar: string;
@@ -11,6 +12,7 @@ export interface GlobalBaseSettings {
   neutralColor?: NeutralColors;
   password: string;
   primaryColor?: PrimaryColors;
+  sessionCustomGroups: SessionGroupItem[];
   themeMode: ThemeMode;
 }