@lobehub/chat 0.120.5 → 0.121.0

package/src/store/session/slices/session/selectors/list.ts

@@ -1,25 +1,23 @@
 import { INBOX_SESSION_ID } from '@/const/session';
 import { sessionHelpers } from '@/store/session/slices/session/helpers';
 import { MetaData } from '@/types/meta';
-import { LobeAgentSession, LobeSessions, SessionGroupDefaultKeys } from '@/types/session';
+import { CustomSessionGroup, LobeAgentSession, LobeSessions } from '@/types/session';
 
 import { SessionStore } from '../../../store';
 import { initLobeSession } from '../initialState';
 
-const defaultSessions = (s: SessionStore): LobeSessions => s.sessions;
+const defaultSessions = (s: SessionStore): LobeSessions => s.defaultSessions;
+const pinnedSessions = (s: SessionStore): LobeSessions => s.pinnedSessions;
+const customSessionGroups = (s: SessionStore): CustomSessionGroup[] => s.customSessionGroups;
 
-const searchSessions = (s: SessionStore): LobeSessions => s.searchSessions;
-
-const pinnedSessionList = (s: SessionStore) =>
-  defaultSessions(s).filter((s) => s.group === SessionGroupDefaultKeys.Pinned);
+const allSessions = (s: SessionStore): LobeSessions => s.sessions;
 
-const unpinnedSessionList = (s: SessionStore) =>
-  defaultSessions(s).filter((s) => s.group === SessionGroupDefaultKeys.Default);
+const searchSessions = (s: SessionStore): LobeSessions => s.searchSessions;
 
 const getSessionById =
   (id: string) =>
   (s: SessionStore): LobeAgentSession =>
-    sessionHelpers.getSessionById(id, s.sessions);
+    sessionHelpers.getSessionById(id, allSessions(s));
 
 const getSessionMetaById =
   (id: string) =>
@@ -33,18 +31,13 @@ const getSessionMetaById =
 const currentSession = (s: SessionStore): LobeAgentSession | undefined => {
   if (!s.activeId) return;
 
-  return s.sessions.find((i) => i.id === s.activeId);
+  return allSessions(s).find((i) => i.id === s.activeId);
 };
 
 const currentSessionSafe = (s: SessionStore): LobeAgentSession => {
   return currentSession(s) || initLobeSession;
 };
 
-const hasPinnedSessionList = (s: SessionStore) => {
-  const list = pinnedSessionList(s);
-  return list?.length > 0;
-};
-
 const hasCustomAgents = (s: SessionStore) => defaultSessions(s).length > 0;
 
 const isInboxSession = (s: SessionStore) => s.activeId === INBOX_SESSION_ID;
@@ -57,14 +50,14 @@ const isSomeSessionActive = (s: SessionStore) => !!s.activeId && isSessionListIn
 export const sessionSelectors = {
   currentSession,
   currentSessionSafe,
+  customSessionGroups,
+  defaultSessions,
   getSessionById,
   getSessionMetaById,
   hasCustomAgents,
-  hasPinnedSessionList,
   isInboxSession,
   isSessionListInit,
   isSomeSessionActive,
-  pinnedSessionList,
+  pinnedSessions,
   searchSessions,
-  unpinnedSessionList,
 };

package/src/store/session/slices/sessionGroup/action.ts

@@ -0,0 +1,54 @@
+import { StateCreator } from 'zustand/vanilla';
+
+import { sessionService } from '@/services/session';
+import { SessionStore } from '@/store/session';
+import { SessionGroupItem } from '@/types/session';
+
+export interface SessionGroupAction {
+  addSessionGroup: (name: string) => Promise<string>;
+  clearSessionGroups: () => Promise<void>;
+  removeSessionGroup: (id: string) => Promise<void>;
+  updateSessionGroupId: (sessionId: string, groupId: string) => Promise<void>;
+  updateSessionGroupName: (id: string, name: string) => Promise<void>;
+  updateSessionGroupSort: (items: SessionGroupItem[]) => Promise<void>;
+}
+
+export const createSessionGroupSlice: StateCreator<
+  SessionStore,
+  [['zustand/devtools', never]],
+  [],
+  SessionGroupAction
+> = (set, get) => ({
+  addSessionGroup: async (name) => {
+    const id = await sessionService.createSessionGroup(name);
+
+    await get().refreshSessions();
+
+    return id;
+  },
+
+  clearSessionGroups: async () => {
+    await sessionService.clearSessionGroups();
+    await get().refreshSessions();
+  },
+
+  removeSessionGroup: async (id) => {
+    await sessionService.removeSessionGroup(id);
+    await get().refreshSessions();
+  },
+  updateSessionGroupId: async (sessionId, groupId) => {
+    await sessionService.updateSessionGroupId(sessionId, groupId);
+
+    await get().refreshSessions();
+  },
+
+  updateSessionGroupName: async (id, name) => {
+    await sessionService.updateSessionGroup(id, { name });
+    await get().refreshSessions();
+  },
+  updateSessionGroupSort: async (items) => {
+    const sortMap = items.map((item, index) => ({ id: item.id, sort: index }));
+    await sessionService.updateSessionGroupOrder(sortMap);
+    await get().refreshSessions();
+  },
+});

package/src/store/session/slices/sessionGroup/initialState.ts

@@ -0,0 +1,5 @@
+export interface SessionGroupState {
+  activeGroupId?: string;
+}
+
+export const initSessionGroupState: SessionGroupState = {};

package/src/store/session/slices/sessionGroup/selectors.ts

@@ -0,0 +1,15 @@
+import { SessionStore } from '@/store/session';
+
+const sessionGroupItems = (s: SessionStore) =>
+  s.customSessionGroups.map((group) => ({
+    id: group.id,
+    name: group.name,
+  }));
+
+const getGroupById = (id: string) => (s: SessionStore) =>
+  sessionGroupItems(s).find((group) => group.id === id);
+
+export const sessionGroupSelectors = {
+  getGroupById,
+  sessionGroupItems,
+};

package/src/store/session/store.ts

@@ -8,17 +8,24 @@ import { isDev } from '@/utils/env';
 import { SessionStoreState, initialState } from './initialState';
 import { AgentAction, createAgentSlice } from './slices/agent/action';
 import { SessionAction, createSessionSlice } from './slices/session/action';
+import { SessionGroupAction, createSessionGroupSlice } from './slices/sessionGroup/action';
 
 //  ===============  聚合 createStoreFn ============ //
 
-export type SessionStore = SessionAction & AgentAction & SessionStoreState;
+export interface SessionStore
+  extends SessionAction,
+    AgentAction,
+    SessionGroupAction,
+    SessionStoreState {}
+
 const createStore: StateCreator<SessionStore, [['zustand/devtools', never]]> = (...parameters) => ({
   ...initialState,
   ...createAgentSlice(...parameters),
   ...createSessionSlice(...parameters),
+  ...createSessionGroupSlice(...parameters),
 });
 
-//  ===============  实装 useStore ============ //
+//  ===============  implement useStore ============ //
 
 export const useSessionStore = createWithEqualityFn<SessionStore>()(
   subscribeWithSelector(

package/src/styles/antdOverride.ts

@@ -4,11 +4,4 @@ export default ({ token }: { prefixCls: string; token: Theme }) => css`
   .${token.prefixCls}-popover {
     z-index: 1100;
   }
-  .${token.prefixCls}-dropdown {
-    > ul {
-      border: 1px solid ${token.colorBorderSecondary};
-      border-radius: ${token.borderRadius}px !important;
-      box-shadow: ${token.boxShadowSecondary};
-    }
-  }
 `;

package/src/types/exportConfig.ts

@@ -1,5 +1,5 @@
 import { ChatMessage } from '@/types/message';
-import { LobeSessions } from '@/types/session';
+import { LobeSessions, SessionGroupItem } from '@/types/session';
 import { GlobalSettings } from '@/types/settings';
 import { ChatTopic } from '@/types/topic';
 
@@ -43,6 +43,7 @@ export interface ConfigModelMap {
  */
 export interface ConfigStateSessions {
   messages: ChatMessage[];
+  sessionGroups: SessionGroupItem[];
   sessions: LobeSessions;
   topics: ChatTopic[];
 }
@@ -60,6 +61,7 @@ export interface ConfigStateSingleSession {
  * 配置状态：角色
  */
 export interface ConfigStateAgents {
+  sessionGroups: SessionGroupItem[];
   sessions: LobeSessions;
 }
 

package/src/types/session.ts

@@ -7,19 +7,30 @@ export enum LobeSessionType {
   Group = 'group',
 }
 
-export type SessionGroupKey = 'pinned' | 'default' | string;
+export type SessionGroupId = SessionDefaultGroup | string;
 
-export enum SessionGroupDefaultKeys {
+export enum SessionDefaultGroup {
   Default = 'default',
   Pinned = 'pinned',
 }
 
+export interface SessionGroupItem {
+  createdAt: number;
+  id: string;
+  name: string;
+  sort?: number;
+  updatedAt: number;
+}
+
+export type SessionGroups = SessionGroupItem[];
+
 /**
  * Lobe Agent
  */
 export interface LobeAgentSession extends BaseDataModel {
   config: LobeAgentConfig;
-  group?: SessionGroupKey;
+  group?: SessionGroupId;
+  pinned?: boolean;
   type: LobeSessionType.Agent;
 }
 
@@ -32,3 +43,16 @@ export interface LobeAgentSettings {
 }
 
 export type LobeSessions = LobeAgentSession[];
+
+export interface CustomSessionGroup {
+  children: LobeSessions;
+  id: SessionGroupId;
+  name: string;
+}
+
+export interface ChatSessionList {
+  all: LobeSessions;
+  customGroup: CustomSessionGroup[];
+  default: LobeSessions;
+  pinned: LobeSessions;
+}

package/src/store/session/slices/session/selectors/export.ts

@@ -1,31 +0,0 @@
-import { transform } from 'lodash-es';
-
-import { SessionStore } from '@/store/session';
-import { ConfigStateAgents, ConfigStateSessions } from '@/types/exportConfig';
-import { LobeAgentSession, LobeSessions } from '@/types/session';
-
-import { sessionHelpers } from '../helpers';
-
-const exportSessions = (s: SessionStore): Pick<ConfigStateSessions, 'sessions'> => ({
-  sessions: s.sessions,
-});
-
-const exportAgents = (s: SessionStore): ConfigStateAgents => {
-  return {
-    sessions: transform(s.sessions, (result: LobeSessions, value, key) => {
-      // 移除 chats 和 topics
-      result[key] = { ...value, chats: {}, topics: {} } as LobeAgentSession;
-    }),
-  };
-};
-
-const getExportAgent =
-  (id: string) =>
-  (s: SessionStore): LobeAgentSession =>
-    sessionHelpers.getSessionById(id, s.sessions);
-
-export const sessionExportSelectors = {
-  exportAgents,
-  exportSessions,
-  getExportAgent,
-};