@lobehub/chat 0.43.0 → 0.44.1

package/src/store/session/store.ts

@@ -6,9 +6,9 @@ import { StateCreator } from 'zustand/vanilla';
 import { isDev } from '@/utils/env';
 
 import { SessionStoreState, initialState } from './initialState';
-import { AgentAction, createAgentSlice } from './slices/agentConfig';
-import { ChatAction, createChatSlice } from './slices/chat';
-import { SessionAction, createSessionSlice } from './slices/session';
+import { AgentAction, createAgentSlice } from './slices/agentConfig/action';
+import { ChatAction, createChatSlice } from './slices/chat/actions';
+import { SessionAction, createSessionSlice } from './slices/session/action';
 
 //  ===============  聚合 createStoreFn ============ //
 
@@ -23,7 +23,7 @@ const createStore: StateCreator<SessionStore, [['zustand/devtools', never]]> = (
 
 //  ===============  persist 本地缓存中间件配置 ============ //
 
-type SessionPersist = Pick<SessionStore, 'sessions'>;
+type SessionPersist = Pick<SessionStore, 'sessions' | 'inbox'>;
 
 const LOBE_CHAT = 'LOBE_CHAT';
 
@@ -31,13 +31,13 @@ const persistOptions: PersistOptions<SessionStore, SessionPersist> = {
   name: LOBE_CHAT,
 
   partialize: (s) => ({
+    inbox: s.inbox,
     sessions: s.sessions,
   }),
 
   // 手动控制 Hydration ，避免 ssr 报错
   skipHydration: true,
   version: 0,
-  // version: Migration.targetVersion,
 };
 
 //  ===============  实装 useStore ============ //

package/src/types/exportConfig.ts

@@ -1,61 +1,123 @@
-import { LobeSessions } from '@/types/session';
+import { LobeAgentSession, LobeSessions } from '@/types/session';
 import { GlobalSettings } from '@/types/settings';
 
-// 存在4种导出方式
-export type ExportType = 'agents' | 'sessions' | 'settings' | 'all';
+/**
+ * 导出方式
+ * @enum ['agents', 'sessions', 'singleSession', 'settings', 'all']
+ * @enumNames ['agents', 'sessions', 'singleSession', 'settings', 'all']
+ */
+export type ExportType = 'agents' | 'sessions' | 'singleSession' | 'settings' | 'all';
 
-// 4种方式对应的 state
-export interface ConfigStateAll {
+/**
+ * 配置模型映射
+ */
+export interface ConfigModelMap {
+  agents: {
+    file: ConfigFileAgents;
+    state: ConfigStateAgents;
+  };
+  all: {
+    file: ConfigFileAll;
+    state: ConfigStateAll;
+  };
+  sessions: {
+    file: ConfigFileSessions;
+    state: ConfigStateSessions;
+  };
+  settings: {
+    file: ConfigFileSettings;
+    state: ConfigStateSettings;
+  };
+  singleSession: {
+    file: ConfigFileSingleSession;
+    state: ConfigStateSingleSession;
+  };
+}
+
+// =============   配置数据结构   ============= //
+
+/**
+ * 配置状态：会话
+ */
+export interface ConfigStateSessions {
+  inbox: LobeAgentSession;
   sessions: LobeSessions;
-  settings: GlobalSettings;
 }
-export interface ConfigStateSettings {
-  settings: GlobalSettings;
+
+/**
+ * 配置状态：单个会话
+ */
+export interface ConfigStateSingleSession {
+  sessions: LobeSessions;
 }
-export interface ConfigStateSessions {
+
+/**
+ * 配置状态：角色
+ */
+export interface ConfigStateAgents {
   sessions: LobeSessions;
 }
 
-// 4种方式对应的 file
+/**
+ * 配置状态：设置
+ */
+export interface ConfigStateSettings {
+  settings: GlobalSettings;
+}
+
+/**
+ * 配置状态：全部
+ */
+export interface ConfigStateAll extends ConfigStateSessions, ConfigStateSettings {}
+
+// =============   配置文件类型   ============= //
+
+/**
+ * 配置文件：设置
+ */
 export interface ConfigFileSettings {
   exportType: 'settings';
   state: ConfigStateSettings;
   version: number;
 }
+
+/**
+ * 配置文件：会话
+ */
 export interface ConfigFileSessions {
   exportType: 'sessions';
   state: ConfigStateSessions;
   version: number;
 }
+
+/**
+ * 配置文件：单个会话
+ */
+export interface ConfigFileSingleSession {
+  exportType: 'sessions';
+  state: ConfigStateSingleSession;
+  version: number;
+}
+
+/**
+ * 配置文件：角色
+ */
 export interface ConfigFileAgents {
   exportType: 'agents';
-  state: ConfigStateSessions;
+  state: ConfigStateAgents;
   version: number;
 }
+
+/**
+ * 配置文件：全部
+ */
 export interface ConfigFileAll {
   exportType: 'all';
   state: ConfigStateAll;
   version: number;
 }
 
+/**
+ * 配置文件
+ */
 export type ConfigFile = ConfigFileSettings | ConfigFileSessions | ConfigFileAll | ConfigFileAgents;
-
-// 用于 map 收集类型的 map
-export interface ConfigModelMap {
-  agents: {
-    file: ConfigFileAgents;
-    state: ConfigStateSessions;
-  };
-  all: {
-    file: ConfigFileAll;
-    state: ConfigStateAll;
-  };
-  sessions: {
-    file: ConfigFileSessions;
-    state: ConfigStateSessions;
-  };
-  settings: {
-    file: ConfigFileSettings;
-    state: ConfigStateSettings;
-  };
-}

package/src/utils/config.ts

@@ -7,6 +7,7 @@ import {
   ConfigFileAll,
   ConfigFileSessions,
   ConfigFileSettings,
+  ConfigFileSingleSession,
   ConfigModelMap,
   ExportType,
 } from '@/types/exportConfig';
@@ -90,6 +91,14 @@ export const createConfigFile = <T extends ExportType>(
       } as ConfigFileSettings;
     }
 
+    case 'singleSession': {
+      return {
+        exportType: 'sessions',
+        state,
+        version: Migration.targetVersion,
+      } as ConfigFileSingleSession;
+    }
+
     case 'all': {
       return {
         exportType: 'all',

package/src/pages/chat/SessionList/List/SessionItem.tsx

@@ -1,178 +0,0 @@
-import { ActionIcon, Avatar, Icon, List } from '@lobehub/ui';
-import { useHover } from 'ahooks';
-import { App, Dropdown, type MenuProps, Tag } from 'antd';
-import { FolderOutput, MoreVertical, Pin, PinOff, Trash } from 'lucide-react';
-import { FC, memo, useMemo, useRef, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Flexbox } from 'react-layout-kit';
-import { shallow } from 'zustand/shallow';
-
-import { exportSingleAgent, exportSingleSession } from '@/helpers/export';
-import { useGlobalStore } from '@/store/global';
-import { agentSelectors, chatSelectors, sessionSelectors, useSessionStore } from '@/store/session';
-
-import { useStyles } from './style';
-
-const { Item } = List;
-
-interface SessionItemProps {
-  active?: boolean;
-  id: string;
-  loading?: boolean;
-}
-
-const SessionItem: FC<SessionItemProps> = memo(({ id, active = true, loading }) => {
-  const [open, setOpen] = useState(false);
-  const ref = useRef(null);
-  const isHovering = useHover(ref);
-
-  const { t } = useTranslation('common');
-
-  const { styles } = useStyles();
-  const [defaultModel] = useGlobalStore((s) => [s.settings.defaultAgent.config?.model]);
-
-  const [
-    pin,
-    title,
-    description,
-    systemRole,
-    avatar,
-    avatarBackground,
-    updateAt,
-    model,
-    chatLength,
-    removeSession,
-    pinSession,
-  ] = useSessionStore((s) => {
-    const session = sessionSelectors.getSessionById(id)(s);
-    const meta = session.meta;
-    const systemRole = session.config.systemRole;
-    return [
-      session.pinned,
-      agentSelectors.getTitle(meta),
-      agentSelectors.getDescription(meta),
-      systemRole,
-      agentSelectors.getAvatar(meta),
-      meta.backgroundColor,
-      session?.updateAt,
-      session.config.model,
-      chatSelectors.getChatsById(id)(s).length,
-      s.removeSession,
-      s.pinSession,
-    ];
-  });
-
-  const { modal } = App.useApp();
-  const items: MenuProps['items'] = useMemo(
-    () => [
-      {
-        icon: <Icon icon={pin ? PinOff : Pin} />,
-        key: 'pin',
-        label: t(pin ? 'pinOff' : 'pin'),
-        onClick: () => {
-          pinSession(id, !pin);
-        },
-      },
-      {
-        children: [
-          {
-            key: 'agent',
-            label: <div>{t('exportType.agent')}</div>,
-            onClick: () => {
-              exportSingleAgent(id);
-            },
-          },
-          {
-            key: 'agentWithMessage',
-            label: <div>{t('exportType.agentWithMessage')}</div>,
-            onClick: () => {
-              exportSingleSession(id);
-            },
-          },
-        ],
-        icon: <Icon icon={FolderOutput} />,
-        key: 'export',
-        label: t('export'),
-      },
-      {
-        danger: true,
-        icon: <Icon icon={Trash} />,
-        key: 'delete',
-        label: t('delete'),
-        onClick: ({ domEvent }) => {
-          domEvent.stopPropagation();
-
-          modal.confirm({
-            centered: true,
-            okButtonProps: { danger: true },
-            okText: t('ok'),
-            onOk: () => {
-              removeSession(id);
-            },
-            rootClassName: styles.modalRoot,
-            title: t('confirmRemoveSessionItemAlert'),
-          });
-        },
-      },
-    ],
-    [id, pin],
-  );
-
-  const showModel = model !== defaultModel;
-  const showChatLength = chatLength > 0;
-
-  return (
-    <Item
-      actions={
-        <Dropdown
-          arrow={false}
-          menu={{
-            items,
-            onClick: ({ domEvent }) => {
-              domEvent.stopPropagation();
-            },
-          }}
-          onOpenChange={setOpen}
-          open={open}
-          trigger={['click']}
-        >
-          <ActionIcon
-            icon={MoreVertical}
-            size={{
-              blockSize: 28,
-              fontSize: 16,
-            }}
-          />
-        </Dropdown>
-      }
-      active={active}
-      addon={
-        !(showModel || showChatLength) ? undefined : (
-          <Flexbox gap={4} horizontal style={{ flexWrap: 'wrap' }}>
-            {showModel && <Tag bordered={false}>{model}</Tag>}
-          </Flexbox>
-        )
-      }
-      avatar={
-        <Avatar
-          animation={isHovering}
-          avatar={avatar}
-          background={avatarBackground}
-          shape="circle"
-          size={46}
-          title={title}
-        />
-      }
-      className={styles.container}
-      date={updateAt}
-      description={description || systemRole}
-      loading={loading}
-      pin={pin}
-      ref={ref}
-      showAction={open || isHovering}
-      title={title}
-    />
-  );
-}, shallow);
-
-export default SessionItem;

package/src/pages/chat/SessionList/List/style.ts

@@ -1,36 +0,0 @@
-import { createStyles } from 'antd-style';
-import { rgba } from 'polished';
-
-export const useStyles = createStyles(({ css, token }) => {
-  return {
-    button: css`
-      position: sticky;
-      z-index: 30;
-      bottom: 0;
-
-      display: flex;
-      gap: 8px;
-      align-items: center;
-      justify-content: center;
-
-      margin-top: 8px;
-      padding: 12px;
-
-      background: ${rgba(token.colorBgLayout, 0.5)};
-      backdrop-filter: blur(8px);
-    `,
-    container: css`
-      position: relative;
-    `,
-
-    modalRoot: css`
-      z-index: 2000;
-    `,
-    pin: css`
-      background-color: ${token.colorFillTertiary};
-    `,
-    time: css`
-      align-self: flex-start;
-    `,
-  };
-});

package/src/store/session/slices/chat/index.ts

@@ -1,3 +0,0 @@
-export * from './actions';
-export * from './initialState';
-export * from './selectors';

package/src/store/session/slices/session/index.ts

@@ -1,3 +0,0 @@
-export * from './action';
-export * from './initialState';
-export * from './selectors';

package/src/pages/chat/{[id] → features}/Conversation/ChatList/Error/InvalidAccess.tsx

@@ -24,8 +24,8 @@ const InvalidAccess = memo<{ id: string }>(({ id }) => {
         block
         onChange={(value) => setMode(value as string)}
         options={[
-          { icon: <Icon icon={SquareAsterisk} />, label: '密码', value: 'password' },
           { icon: <Icon icon={KeySquare} />, label: 'OpenAI API Key', value: 'api' },
+          { icon: <Icon icon={SquareAsterisk} />, label: '密码', value: 'password' },
         ]}
         style={{ width: '100%' }}
         value={mode}