@lobehub/chat 0.115.2 → 0.115.3

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+### [Version 0.115.3](https://github.com/lobehub/lobe-chat/compare/v0.115.2...v0.115.3)
+
+<sup>Released on **2023-12-23**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor and clean global store and chat store.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor and clean global store and chat store, closes [#774](https://github.com/lobehub/lobe-chat/issues/774) ([6120042](https://github.com/lobehub/lobe-chat/commit/6120042))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 0.115.2](https://github.com/lobehub/lobe-chat/compare/v0.115.1...v0.115.2)
 
 <sup>Released on **2023-12-23**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "0.115.2",
+  "version": "0.115.3",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/src/app/chat/features/SessionListContent/DefaultMode.tsx

@@ -3,7 +3,8 @@ import isEqual from 'fast-deep-equal';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { preferenceSelectors, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
+import { preferenceSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 import { sessionSelectors } from '@/store/session/selectors';
 

package/src/app/chat/features/SessionListContent/List/Item/index.tsx

@@ -5,7 +5,8 @@ import { Flexbox } from 'react-layout-kit';
 import { shallow } from 'zustand/shallow';
 
 import { useChatStore } from '@/store/chat';
-import { settingsSelectors, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
+import { settingsSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 import { sessionHelpers } from '@/store/session/helpers';
 import { agentSelectors, sessionSelectors } from '@/store/session/selectors';

package/src/app/settings/agent/Agent.tsx

@@ -2,9 +2,10 @@ import isEqual from 'fast-deep-equal';
 import { memo } from 'react';
 
 import AgentSetting from '@/features/AgentSetting';
-import { settingsSelectors, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
 import { useSwitchSideBarOnInit } from '@/store/global/hooks/useSwitchSettingsOnInit';
 import { SettingsTabs } from '@/store/global/initialState';
+import { settingsSelectors } from '@/store/global/selectors';
 
 const Agent = memo(() => {
   useSwitchSideBarOnInit(SettingsTabs.Agent);

package/src/app/settings/common/Common.tsx

@@ -12,7 +12,8 @@ import AvatarWithUpload from '@/features/AvatarWithUpload';
 import { localeOptions } from '@/locales/options';
 import { useChatStore } from '@/store/chat';
 import { useFileStore } from '@/store/file';
-import { settingsSelectors, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
+import { settingsSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 import { useToolStore } from '@/store/tool';
 import { switchLang } from '@/utils/switchLang';

package/src/app/settings/llm/LLM/index.tsx

@@ -7,7 +7,8 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { FORM_STYLE } from '@/const/layoutTokens';
-import { settingsSelectors, useEffectAfterGlobalHydrated, useGlobalStore } from '@/store/global';
+import { useEffectAfterGlobalHydrated, useGlobalStore } from '@/store/global';
+import { settingsSelectors } from '@/store/global/selectors';
 
 import Checker from './Checker';
 

package/src/app/settings/tts/TTS/index.tsx

@@ -7,7 +7,8 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { FORM_STYLE } from '@/const/layoutTokens';
-import { settingsSelectors, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
+import { settingsSelectors } from '@/store/global/selectors';
 
 import { opeanaiSTTOptions, opeanaiTTSOptions, sttOptions } from './options';
 

package/src/features/AgentSetting/AgentConfig/index.tsx

@@ -8,7 +8,8 @@ import { memo, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { FORM_STYLE } from '@/const/layoutTokens';
-import { settingsSelectors, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
+import { settingsSelectors } from '@/store/global/selectors';
 
 import { useStore } from '../store';
 

package/src/features/AgentSetting/AgentMeta/index.tsx

@@ -8,7 +8,8 @@ import { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { FORM_STYLE } from '@/const/layoutTokens';
-import { settingsSelectors, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
+import { settingsSelectors } from '@/store/global/selectors';
 
 import { useStore } from '../store';
 import { SessionLoadingState } from '../store/initialState';

package/src/features/AgentSetting/AgentTTS/index.tsx

@@ -8,10 +8,11 @@ import { memo, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { FORM_STYLE } from '@/const/layoutTokens';
-import SelectWithTTSPreview from '@/features/AgentSetting/AgentTTS/SelectWithTTSPreview';
-import { settingsSelectors, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
+import { settingsSelectors } from '@/store/global/selectors';
 
 import { useStore } from '../store';
+import SelectWithTTSPreview from './SelectWithTTSPreview';
 import { ttsOptions } from './options';
 
 const TTS_SETTING_KEY = 'tts';

package/src/features/ChatInput/ActionBar/ModelSwitch.tsx

@@ -5,7 +5,8 @@ import { BrainCog } from 'lucide-react';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { settingsSelectors, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
+import { settingsSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 import { agentSelectors } from '@/store/session/selectors';
 import { LanguageModel } from '@/types/llm';

package/src/features/Conversation/ChatList/Error/ApiKeyForm.tsx

@@ -6,7 +6,8 @@ import { useTranslation } from 'react-i18next';
 import { Center, Flexbox } from 'react-layout-kit';
 
 import { useChatStore } from '@/store/chat';
-import { settingsSelectors, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
+import { settingsSelectors } from '@/store/global/selectors';
 
 import { FormAction } from './style';
 

package/src/features/Conversation/ChatList/Extras/TTS/index.tsx

@@ -1,9 +1,10 @@
 import { memo, useMemo } from 'react';
 import { Md5 } from 'ts-md5';
 
-import { settingsSelectors, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
+import { settingsSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/slices/agent';
+import { agentSelectors } from '@/store/session/selectors';
 
 import FilePlayer from './FilePlayer';
 import InitPlayer, { TTSProps } from './InitPlayer';

package/src/features/Conversation/index.tsx

@@ -5,7 +5,8 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import SafeSpacing from '@/components/SafeSpacing';
-import { settingsSelectors, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
+import { settingsSelectors } from '@/store/global/selectors';
 
 import ChatList from './ChatList';
 import ChatScrollAnchor from './ScrollAnchor';

package/src/features/PluginDevModal/LocalForm.tsx

@@ -4,9 +4,10 @@ import dynamic from 'next/dynamic';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { settingsSelectors, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
+import { settingsSelectors } from '@/store/global/selectors';
 import { useToolStore } from '@/store/tool';
-import { pluginSelectors } from '@/store/tool/slices/plugin/selectors';
+import { pluginSelectors } from '@/store/tool/selectors';
 
 const EmojiPicker = dynamic(() => import('@lobehub/ui/es/EmojiPicker'), { ssr: false });
 

package/src/hooks/useSTT.ts

@@ -10,7 +10,8 @@ import { SWRConfiguration } from 'swr';
 
 import { createHeaderWithOpenAI } from '@/services/_header';
 import { OPENAI_URLS } from '@/services/_url';
-import { settingsSelectors, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
+import { settingsSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 import { agentSelectors } from '@/store/session/selectors';
 

package/src/hooks/useTTS.ts

@@ -11,7 +11,8 @@ import isEqual from 'fast-deep-equal';
 
 import { createHeaderWithOpenAI } from '@/services/_header';
 import { OPENAI_URLS, TTS_URL } from '@/services/_url';
-import { settingsSelectors, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
+import { settingsSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 import { agentSelectors } from '@/store/session/selectors';
 import { TTSServer } from '@/types/agent';

package/src/services/_header.ts

@@ -11,8 +11,8 @@ import { useGlobalStore } from '@/store/global';
 export const createHeaderWithOpenAI = (header?: HeadersInit): HeadersInit => {
   const openai = useGlobalStore.getState().settings.languageModel.openAI;
 
-  const apiKey = openai.OPENAI_API_KEY || useGlobalStore.getState().settings.OPENAI_API_KEY || '';
-  const endpoint = openai.endpoint || useGlobalStore.getState().settings.endpoint || '';
+  const apiKey = openai.OPENAI_API_KEY || '';
+  const endpoint = openai.endpoint || '';
 
   // eslint-disable-next-line no-undef
   const result: HeadersInit = {

package/src/services/config.ts

@@ -1,7 +1,8 @@
 import { messageService } from '@/services/message';
 import { sessionService } from '@/services/session';
 import { topicService } from '@/services/topic';
-import { settingsSelectors, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
+import { settingsSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 import { sessionExportSelectors, sessionSelectors } from '@/store/session/selectors';
 import { ChatMessage } from '@/types/chatMessage';

package/src/store/chat/initialState.ts

@@ -1,51 +1,13 @@
-import { ChatMessage } from '@/types/chatMessage';
-import { ChatTopic } from '@/types/topic';
+import { ChatMessageState, initialMessageState } from './slices/message/initialState';
+import { ChatShareState, initialShareState } from './slices/share/initialState';
+import { ChatToolState, initialToolState } from './slices/tool/initialState';
+import { ChatTopicState, initialTopicState } from './slices/topic/initialState';
 
-export interface ChatStoreState {
-  abortController?: AbortController;
-  /**
-   * @title 当前活动的会话
-   * @description 当前正在编辑或查看的会话
-   */
-  activeId: string;
-  activeTopicId?: string;
-  /**
-   * @deprecated
-   */
-  chatLoadingId?: string;
-  dalleImageLoading: Record<string, boolean>;
-
-  inputMessage: string;
-  isSearchingTopic: boolean;
-  messageLoadingIds: [];
-  messages: ChatMessage[];
-  /**
-   * whether messages have fetched
-   */
-  messagesInit: boolean;
-
-  searchTopics: ChatTopic[];
-  shareLoading?: boolean;
-  topicLoadingId?: string;
-  topicRenamingId?: string;
-  topicSearchKeywords: string;
-  topics: ChatTopic[];
-  /**
-   * whether topics have fetched
-   */
-  topicsInit: boolean;
-}
+export type ChatStoreState = ChatTopicState & ChatMessageState & ChatToolState & ChatShareState;
 
 export const initialState: ChatStoreState = {
-  activeId: 'inbox',
-  dalleImageLoading: {},
-  inputMessage: '',
-  isSearchingTopic: false,
-  messageLoadingIds: [],
-  messages: [],
-  messagesInit: false,
-  searchTopics: [],
-  topicSearchKeywords: '',
-  topics: [],
-  topicsInit: false,
+  ...initialMessageState,
+  ...initialTopicState,
+  ...initialToolState,
+  ...initialShareState,
 };

package/src/store/chat/selectors.ts

@@ -0,0 +1,3 @@
+export { chatEnhanceSelectors } from './slices/enchance/selectors';
+export { chatSelectors } from './slices/message/selectors';
+export { topicSelectors } from './slices/topic/selectors';

package/src/store/chat/{actions/enhance.test.ts → slices/enchance/action.test.ts}

@@ -1,4 +1,4 @@
-import { act, renderHook, waitFor } from '@testing-library/react';
+import { act, renderHook } from '@testing-library/react';
 import { Mock, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { chainLangDetect } from '@/chains/langDetect';
@@ -6,7 +6,7 @@ import { chainTranslate } from '@/chains/translate';
 import { chatService } from '@/services/chat';
 import { messageService } from '@/services/message';
 
-import { useChatStore } from '../store';
+import { useChatStore } from '../../store';
 
 // Mock messageService 和 chatService
 vi.mock('@/services/message', () => ({

package/src/store/chat/{actions/message.test.ts → slices/message/action.test.ts}

@@ -9,7 +9,7 @@ import { topicService } from '@/services/topic';
 import { chatSelectors } from '@/store/chat/selectors';
 import { ChatMessage } from '@/types/chatMessage';
 
-import { useChatStore } from '../store';
+import { useChatStore } from '../../store';
 
 // Mock service
 vi.mock('@/services/message', () => ({

package/src/store/chat/{actions/message.ts → slices/message/action.ts}

@@ -22,8 +22,8 @@ import { fetchSSE } from '@/utils/fetch';
 import { isFunctionMessageAtStart, testFunctionMessageAtEnd } from '@/utils/message';
 import { setNamespace } from '@/utils/storeDebug';
 
-import { MessageDispatch, messagesReducer } from '../reducers/message';
-import { chatSelectors } from '../selectors';
+import { chatSelectors } from '../../selectors';
+import { MessageDispatch, messagesReducer } from './reducer';
 
 const n = setNamespace('message');
 

package/src/store/chat/slices/message/initialState.ts

@@ -0,0 +1,29 @@
+import { ChatMessage } from '@/types/chatMessage';
+
+export interface ChatMessageState {
+  abortController?: AbortController;
+  /**
+   * @title 当前活动的会话
+   * @description 当前正在编辑或查看的会话
+   */
+  activeId: string;
+  /**
+   * @deprecated
+   */
+  chatLoadingId?: string;
+  inputMessage: string;
+  messageLoadingIds: [];
+  messages: ChatMessage[];
+  /**
+   * whether messages have fetched
+   */
+  messagesInit: boolean;
+}
+
+export const initialMessageState: ChatMessageState = {
+  activeId: 'inbox',
+  inputMessage: '',
+  messageLoadingIds: [],
+  messages: [],
+  messagesInit: false,
+};

package/src/store/chat/{reducers/message.test.ts → slices/message/reducer.test.ts}

@@ -1,6 +1,6 @@
-import { ChatMessage, ChatMessageMap } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/chatMessage';
 
-import { MessageDispatch, messagesReducer } from './message';
+import { MessageDispatch, messagesReducer } from './reducer';
 
 describe('messagesReducer', () => {
   let initialState: ChatMessage[];

package/src/store/chat/{selectors/__tests__/chat.test.ts → slices/message/selectors.test.ts}

@@ -9,7 +9,7 @@ import { ChatMessage } from '@/types/chatMessage';
 import { MetaData } from '@/types/meta';
 import { merge } from '@/utils/merge';
 
-import { chatSelectors } from '../chat';
+import { chatSelectors } from './selectors';
 
 vi.mock('i18next', () => ({
   t: vi.fn((key) => key), // Simplified mock return value

package/src/store/chat/{selectors/chat.ts → slices/message/selectors.ts}

@@ -10,8 +10,8 @@ import { ChatMessage } from '@/types/chatMessage';
 import { MetaData } from '@/types/meta';
 import { merge } from '@/utils/merge';
 
-import { chatHelpers } from '../helpers';
-import type { ChatStore } from '../store';
+import { chatHelpers } from '../../helpers';
+import type { ChatStore } from '../../store';
 
 const getMeta = (message: ChatMessage) => {
   switch (message.role) {

package/src/store/chat/{actions/share.ts → slices/share/action.ts}

@@ -8,8 +8,8 @@ import { useSessionStore } from '@/store/session';
 import { agentSelectors } from '@/store/session/selectors';
 import { ShareGPTConversation } from '@/types/share';
 
-import { chatSelectors } from '../selectors';
-import { ChatStore } from '../store';
+import { chatSelectors } from '../../selectors';
+import { ChatStore } from '../../store';
 
 interface ShareMessage {
   from: 'human' | 'gpt';

package/src/store/chat/slices/share/initialState.ts

@@ -0,0 +1,7 @@
+export interface ChatShareState {
+  shareLoading?: boolean;
+}
+
+export const initialShareState: ChatShareState = {
+  shareLoading: false,
+};

package/src/store/chat/{actions/plugin.ts → slices/tool/action.ts}

@@ -11,7 +11,7 @@ import { ChatPluginPayload } from '@/types/chatMessage';
 import { OpenAIFunctionCall } from '@/types/openai/functionCall';
 import { setNamespace } from '@/utils/storeDebug';
 
-import { chatSelectors } from '../selectors';
+import { chatSelectors } from '../../selectors';
 
 const n = setNamespace('plugin');
 
@@ -85,7 +85,6 @@ export const chatPlugin: StateCreator<
     const chats = chatSelectors.currentChats(get());
     await coreProcessMessage(chats, id);
   },
-
   triggerFunctionCall: async (id) => {
     const { invokeDefaultTypePlugin, invokeBuiltinTool, refreshMessages } = get();
 
@@ -146,7 +145,6 @@ export const chatPlugin: StateCreator<
       }
     }
   },
-
   updatePluginState: async (id, key, value) => {
     const { refreshMessages } = get();
 

package/src/store/chat/slices/tool/initialState.ts

@@ -0,0 +1,7 @@
+export interface ChatToolState {
+  dalleImageLoading: Record<string, boolean>;
+}
+
+export const initialToolState: ChatToolState = {
+  dalleImageLoading: {},
+};

package/src/store/chat/{actions/topic.test.ts → slices/topic/action.test.ts}

@@ -9,7 +9,7 @@ import { topicService } from '@/services/topic';
 import { ChatMessage } from '@/types/chatMessage';
 import { ChatTopic } from '@/types/topic';
 
-import { useChatStore } from '../store';
+import { useChatStore } from '../../store';
 
 // Mock topicService 和 messageService
 vi.mock('@/services/topic', () => ({

package/src/store/chat/{actions/topic.ts → slices/topic/action.ts}

@@ -16,7 +16,8 @@ import { ChatMessage } from '@/types/chatMessage';
 import { ChatTopic } from '@/types/topic';
 import { setNamespace } from '@/utils/storeDebug';
 
-import { chatSelectors, topicSelectors } from '../selectors';
+import { chatSelectors } from '../message/selectors';
+import { topicSelectors } from './selectors';
 
 const n = setNamespace('topic');
 

package/src/store/chat/slices/topic/initialState.ts

@@ -0,0 +1,23 @@
+import { ChatTopic } from '@/types/topic';
+
+export interface ChatTopicState {
+  activeTopicId?: string;
+  isSearchingTopic: boolean;
+  searchTopics: ChatTopic[];
+  topicLoadingId?: string;
+  topicRenamingId?: string;
+  topicSearchKeywords: string;
+  topics: ChatTopic[];
+  /**
+   * whether topics have fetched
+   */
+  topicsInit: boolean;
+}
+
+export const initialTopicState: ChatTopicState = {
+  isSearchingTopic: false,
+  searchTopics: [],
+  topicSearchKeywords: '',
+  topics: [],
+  topicsInit: false,
+};

package/src/store/chat/{selectors/__tests__/topic.test.ts → slices/topic/selectors.test.ts}

@@ -4,7 +4,7 @@ import { ChatStore } from '@/store/chat';
 import { initialState } from '@/store/chat/initialState';
 import { merge } from '@/utils/merge';
 
-import { topicSelectors } from '..';
+import { topicSelectors } from '../../selectors';
 
 const initialStore = initialState as ChatStore;
 

package/src/store/chat/{selectors/topic.ts → slices/topic/selectors.ts}

@@ -1,6 +1,6 @@
 import { ChatTopic } from '@/types/topic';
 
-import { ChatStore } from '../store';
+import { ChatStore } from '../../store';
 
 const currentTopics = (s: ChatStore): ChatTopic[] => s.topics;
 

package/src/store/chat/store.ts

@@ -6,12 +6,12 @@ import { StateCreator } from 'zustand/vanilla';
 import { createHyperStorage } from '@/store/middleware/createHyperStorage';
 import { isDev } from '@/utils/env';
 
-import { ChatEnhanceAction, chatEnhance } from './actions/enhance';
-import { ChatMessageAction, chatMessage } from './actions/message';
-import { ChatPluginAction, chatPlugin } from './actions/plugin';
-import { ShareAction, chatShare } from './actions/share';
-import { ChatTopicAction, chatTopic } from './actions/topic';
 import { ChatStoreState, initialState } from './initialState';
+import { ChatEnhanceAction, chatEnhance } from './slices/enchance/action';
+import { ChatMessageAction, chatMessage } from './slices/message/action';
+import { ShareAction, chatShare } from './slices/share/action';
+import { ChatPluginAction, chatPlugin } from './slices/tool/action';
+import { ChatTopicAction, chatTopic } from './slices/topic/action';
 
 export interface ChatStoreAction
   extends ChatMessageAction,

package/src/store/global/helpers.ts

@@ -1,4 +1,4 @@
-import { settingsSelectors } from './selectors';
+import { settingsSelectors } from './slices/settings/selectors';
 import { useGlobalStore } from './store';
 
 const getCurrentLanguage = () => settingsSelectors.currentLanguage(useGlobalStore.getState());

package/src/store/global/index.ts

@@ -1,3 +1,2 @@
 export * from './hooks';
-export * from './selectors';
 export * from './store';

package/src/store/global/initialState.ts

@@ -1,66 +1,11 @@
-import { DEFAULT_SETTINGS } from '@/const/settings';
-import type { GlobalServerConfig, GlobalSettings } from '@/types/settings';
+import { GlobalCommonState, initialCommonState } from './slices/common/initialState';
+import { GlobalSettingsState, initialSettingsState } from './slices/settings/initialState';
 
-export enum SidebarTabKey {
-  Chat = 'chat',
-  Market = 'market',
-  Setting = 'settings',
-}
+export { SettingsTabs, SidebarTabKey } from './slices/common/initialState';
 
-export enum SettingsTabs {
-  Agent = 'agent',
-  Common = 'common',
-  LLM = 'llm',
-  TTS = 'tts',
-}
-
-export interface Guide {
-  // Topic 引导
-  topic?: boolean;
-}
-
-export interface GlobalPreference {
-  guide?: Guide;
-  inputHeight: number;
-  mobileShowTopic?: boolean;
-  sessionGroupKeys: string[];
-  sessionsWidth: number;
-  showChatSideBar?: boolean;
-  showSessionPanel?: boolean;
-  showSystemRole?: boolean;
-}
-
-export interface GlobalState {
-  hasNewVersion?: boolean;
-  latestVersion?: string;
-  /**
-   *  用户偏好的 UI 状态
-   *  @localStorage
-   */
-  preference: GlobalPreference;
-  serverConfig: GlobalServerConfig;
-  /**
-   * @localStorage
-   * 用户设置
-   */
-  settings: GlobalSettings;
-  settingsTab: SettingsTabs;
-  sidebarKey: SidebarTabKey;
-}
+export type GlobalState = GlobalCommonState & GlobalSettingsState;
 
 export const initialState: GlobalState = {
-  preference: {
-    guide: {},
-    inputHeight: 200,
-    mobileShowTopic: false,
-    sessionGroupKeys: ['pinned', 'sessionList'],
-    sessionsWidth: 320,
-    showChatSideBar: true,
-    showSessionPanel: true,
-    showSystemRole: false,
-  },
-  serverConfig: {},
-  settings: DEFAULT_SETTINGS,
-  settingsTab: SettingsTabs.Common,
-  sidebarKey: SidebarTabKey.Chat,
+  ...initialCommonState,
+  ...initialSettingsState,
 };

package/src/store/global/selectors.ts

@@ -1,2 +1,2 @@
-export * from './selectors/preference';
-export * from './selectors/settings';
+export * from './slices/common/selectors';
+export * from './slices/settings/selectors';

package/src/store/global/slices/{common.ts → common/action.ts}

@@ -5,12 +5,12 @@ import type { StateCreator } from 'zustand/vanilla';
 
 import { CURRENT_VERSION } from '@/const/version';
 import { globalService } from '@/services/global';
+import type { GlobalStore } from '@/store/global';
 import type { GlobalServerConfig } from '@/types/settings';
 import { merge } from '@/utils/merge';
 import { setNamespace } from '@/utils/storeDebug';
 
-import type { GlobalPreference, GlobalState, Guide, SidebarTabKey } from '../initialState';
-import type { GlobalStore } from '../store';
+import type { GlobalCommonState, GlobalPreference, Guide, SidebarTabKey } from './initialState';
 
 const n = setNamespace('settings');
 
@@ -66,7 +66,7 @@ export const createCommonSlice: StateCreator<
   },
   updatePreference: (preference, action) => {
     set(
-      produce((draft: GlobalState) => {
+      produce((draft: GlobalCommonState) => {
         draft.preference = merge(draft.preference, preference);
       }),
       false,

package/src/store/global/slices/common/initialState.ts

@@ -0,0 +1,55 @@
+export enum SidebarTabKey {
+  Chat = 'chat',
+  Market = 'market',
+  Setting = 'settings',
+}
+
+export enum SettingsTabs {
+  Agent = 'agent',
+  Common = 'common',
+  LLM = 'llm',
+  TTS = 'tts',
+}
+
+export interface Guide {
+  // Topic 引导
+  topic?: boolean;
+}
+
+export interface GlobalPreference {
+  guide?: Guide;
+  inputHeight: number;
+  mobileShowTopic?: boolean;
+  sessionGroupKeys: string[];
+  sessionsWidth: number;
+  showChatSideBar?: boolean;
+  showSessionPanel?: boolean;
+  showSystemRole?: boolean;
+}
+
+export interface GlobalCommonState {
+  hasNewVersion?: boolean;
+  latestVersion?: string;
+  /**
+   *  用户偏好的 UI 状态
+   *  @localStorage
+   */
+  preference: GlobalPreference;
+  settingsTab: SettingsTabs;
+  sidebarKey: SidebarTabKey;
+}
+
+export const initialCommonState: GlobalCommonState = {
+  preference: {
+    guide: {},
+    inputHeight: 200,
+    mobileShowTopic: false,
+    sessionGroupKeys: ['pinned', 'sessionList'],
+    sessionsWidth: 320,
+    showChatSideBar: true,
+    showSessionPanel: true,
+    showSystemRole: false,
+  },
+  settingsTab: SettingsTabs.Common,
+  sidebarKey: SidebarTabKey.Chat,
+};

package/src/store/global/{selectors/preference.ts → slices/common/selectors.ts}

@@ -1,6 +1,6 @@
 import { GlobalStore } from '@/store/global';
 
-import { initialState } from '../initialState';
+import { initialState } from '../../initialState';
 
 const sessionGroupKeys = (s: GlobalStore): string[] =>
   s.preference.sessionGroupKeys || initialState.preference.sessionGroupKeys;

package/src/store/global/slices/{settings.ts → settings/action.ts}

@@ -5,13 +5,13 @@ import { DeepPartial } from 'utility-types';
 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 type { GlobalSettings, OpenAIConfig } from '@/types/settings';
 import { merge } from '@/utils/merge';
 import { setNamespace } from '@/utils/storeDebug';
 
-import type { GlobalStore } from '../store';
-
 const n = setNamespace('settings');
 
 /**
@@ -24,6 +24,7 @@ export interface SettingsAction {
    */
   resetSettings: () => void;
   setOpenAIConfig: (config: Partial<OpenAIConfig>) => void;
+
   /**
    * 设置部分配置设置
    * @param settings - 部分配置设置
@@ -35,6 +36,7 @@ export interface SettingsAction {
    * @param themeMode - 主题模式
    */
   switchThemeMode: (themeMode: ThemeMode) => void;
+  updateDefaultAgent: (agent: DeepPartial<LobeAgentSettings>) => void;
 }
 
 export const createSettingsSlice: StateCreator<
@@ -46,7 +48,7 @@ export const createSettingsSlice: StateCreator<
   importAppSettings: (importAppSettings) => {
     const { setSettings } = get();
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { OPENAI_API_KEY: _, password: __, ...settings } = importAppSettings;
+    const { password: _, ...settings } = importAppSettings;
 
     setSettings({
       ...settings,
@@ -78,8 +80,14 @@ export const createSettingsSlice: StateCreator<
   switchSettingTabs: (tab) => {
     set({ settingsTab: tab });
   },
-
   switchThemeMode: (themeMode) => {
     get().setSettings({ themeMode });
   },
+  updateDefaultAgent: (agent) => {
+    const settings = produce(get().settings, (draft: GlobalSettings) => {
+      draft.defaultAgent = merge(draft.defaultAgent, agent);
+    });
+
+    set({ settings }, false, n('updateDefaultAgent', agent));
+  },
 });

package/src/store/global/slices/settings/initialState.ts

@@ -0,0 +1,15 @@
+import { DEFAULT_SETTINGS } from '@/const/settings';
+import type { GlobalServerConfig, GlobalSettings } from '@/types/settings';
+
+export interface GlobalSettingsState {
+  serverConfig: GlobalServerConfig;
+  /**
+   * @localStorage
+   */
+  settings: GlobalSettings;
+}
+
+export const initialSettingsState: GlobalSettingsState = {
+  serverConfig: {},
+  settings: DEFAULT_SETTINGS,
+};

package/src/store/global/{selectors/settings.test.ts → slices/settings/selectors.test.ts}

@@ -1,7 +1,7 @@
 import { LanguageModel } from '@/types/llm';
 
-import { GlobalStore } from '../store';
-import { settingsSelectors } from './settings';
+import { GlobalStore } from '../../store';
+import { settingsSelectors } from './selectors';
 
 describe('settingsSelectors', () => {
   describe('currentSettings', () => {

package/src/store/global/{selectors/settings.ts → slices/settings/selectors.ts}

@@ -12,7 +12,7 @@ import { CustomModels, GlobalSettings } from '@/types/settings';
 import { isOnServerSide } from '@/utils/env';
 import { merge } from '@/utils/merge';
 
-import { GlobalStore } from '../store';
+import { GlobalStore } from '../../store';
 
 const currentSettings = (s: GlobalStore) => merge(DEFAULT_SETTINGS, s.settings);
 
@@ -24,8 +24,7 @@ const defaultAgentConfig = (s: GlobalStore) => merge(DEFAULT_AGENT_CONFIG, defau
 
 const defaultAgentMeta = (s: GlobalStore) => merge(DEFAULT_AGENT_META, defaultAgent(s).meta);
 
-const openAIAPIKeySelectors = (s: GlobalStore) =>
-  s.settings.languageModel.openAI.OPENAI_API_KEY || s.settings.OPENAI_API_KEY;
+const openAIAPIKeySelectors = (s: GlobalStore) => s.settings.languageModel.openAI.OPENAI_API_KEY;
 
 const openAIProxyUrlSelectors = (s: GlobalStore) => s.settings.languageModel.openAI.endpoint;
 
@@ -68,7 +67,7 @@ const modelListSelectors = (s: GlobalStore) => {
 
 export const exportSettings = (s: GlobalStore) => {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const { OPENAI_API_KEY: _, password: __, ...settings } = s.settings;
+  const { password: _, ...settings } = s.settings;
 
   return settings as GlobalSettings;
 };

package/src/store/global/store.ts

@@ -9,18 +9,16 @@ import { isDev } from '@/utils/env';
 
 import { createHyperStorage } from '../middleware/createHyperStorage';
 import { type GlobalState, initialState } from './initialState';
-import { type AgentAction, createAgentSlice } from './slices/agent';
-import { type CommonAction, createCommonSlice } from './slices/common';
-import { type SettingsAction, createSettingsSlice } from './slices/settings';
+import { type CommonAction, createCommonSlice } from './slices/common/action';
+import { type SettingsAction, createSettingsSlice } from './slices/settings/action';
 
 //  ===============  聚合 createStoreFn ============ //
 
-export type GlobalStore = CommonAction & GlobalState & AgentAction & SettingsAction;
+export type GlobalStore = CommonAction & GlobalState & SettingsAction;
 
 const createStore: StateCreator<GlobalStore, [['zustand/devtools', never]]> = (...parameters) => ({
   ...initialState,
   ...createCommonSlice(...parameters),
-  ...createAgentSlice(...parameters),
   ...createSettingsSlice(...parameters),
 });
 
@@ -38,24 +36,12 @@ const persistOptions: PersistOptions<GlobalStore, GlobalPersist> = {
         if (!draft.defaultAgent) {
           draft.defaultAgent = DEFAULT_AGENT;
         }
-        delete draft.enableMaxTokens;
-        delete draft.enableHistoryCount;
-        delete draft.historyCount;
-        delete draft.enableCompressThreshold;
-        delete draft.compressThreshold;
 
         // migration to new data model
         if (!draft.languageModel) {
           draft.languageModel = {
-            openAI: {
-              ...DEFAULT_LLM_CONFIG.openAI,
-              OPENAI_API_KEY: draft.OPENAI_API_KEY || DEFAULT_LLM_CONFIG.openAI.OPENAI_API_KEY,
-              endpoint: draft.endpoint || DEFAULT_LLM_CONFIG.openAI.OPENAI_API_KEY,
-            },
+            openAI: DEFAULT_LLM_CONFIG.openAI,
           };
-
-          delete draft.OPENAI_API_KEY;
-          delete draft.endpoint;
         }
       }),
     };

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

@@ -4,7 +4,8 @@ import { t } from 'i18next';
 import { DEFAULT_OPENAI_MODEL_LIST, VISION_MODEL_WHITE_LIST } from '@/const/llm';
 import { DEFAULT_AVATAR, DEFAULT_BACKGROUND_COLOR, DEFAULT_INBOX_AVATAR } from '@/const/meta';
 import { DEFAULT_AGENT_CONFIG, DEFAUTT_AGENT_TTS_CONFIG } from '@/const/settings';
-import { settingsSelectors, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
+import { settingsSelectors } from '@/store/global/selectors';
 import { SessionStore } from '@/store/session';
 import { LobeAgentTTSConfig } from '@/types/agent';
 import { LanguageModel } from '@/types/llm';

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

@@ -5,7 +5,8 @@ import { StateCreator } from 'zustand/vanilla';
 import { INBOX_SESSION_ID } from '@/const/session';
 import { SESSION_CHAT_URL } from '@/const/url';
 import { sessionService } from '@/services/session';
-import { settingsSelectors, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
+import { settingsSelectors } from '@/store/global/selectors';
 import { SessionStore } from '@/store/session';
 import {
   LobeAgentSession,

package/src/tools/dalle/Render/ToolBar.tsx

@@ -5,7 +5,8 @@ import { Flexbox } from 'react-layout-kit';
 
 import { useChatStore } from '@/store/chat';
 import { chatEnhanceSelectors } from '@/store/chat/selectors';
-import { settingsSelectors, useGlobalStore } from '@/store/global';
+import { useGlobalStore } from '@/store/global';
+import { settingsSelectors } from '@/store/global/selectors';
 import { DallEImageItem } from '@/types/tool/dalle';
 
 interface ToolBarProps {

package/src/types/settings.ts

@@ -5,37 +5,8 @@ import { LocaleMode } from '@/types/locale';
 import type { LobeAgentSession } from '@/types/session';
 
 export interface GlobalBaseSettings {
-  /**
-   * @deprecated
-   */
-  OPENAI_API_KEY?: string;
-
   avatar: string;
-  /**
-   * @deprecated
-   */
-  compressThreshold?: number;
-  /**
-   * @deprecated
-   */
-  enableCompressThreshold?: boolean;
-  /**
-   * @deprecated
-   */
-  enableHistoryCount?: boolean;
-  /**
-   * @deprecated
-   */
-  enableMaxTokens?: boolean;
-  /**
-   * @deprecated
-   */
-  endpoint?: string;
   fontSize: number;
-  /**
-   * @deprecated
-   */
-  historyCount?: number;
   language: LocaleMode;
   neutralColor?: NeutralColors;
   password: string;

package/src/store/chat/selectors/index.ts

@@ -1,3 +0,0 @@
-export { chatSelectors } from './chat';
-export { chatEnhanceSelectors } from './enchance';
-export { topicSelectors } from './topic';

package/src/store/global/slices/agent.ts

@@ -1,34 +0,0 @@
-import { produce } from 'immer';
-import { DeepPartial } from 'utility-types';
-import type { StateCreator } from 'zustand/vanilla';
-
-import { LobeAgentSettings } from '@/types/session';
-import type { GlobalSettings } from '@/types/settings';
-import { merge } from '@/utils/merge';
-import { setNamespace } from '@/utils/storeDebug';
-
-import type { GlobalStore } from '../store';
-
-const n = setNamespace('settings');
-
-/**
- * 设置操作
- */
-export interface AgentAction {
-  updateDefaultAgent: (agent: DeepPartial<LobeAgentSettings>) => void;
-}
-
-export const createAgentSlice: StateCreator<
-  GlobalStore,
-  [['zustand/devtools', never]],
-  [],
-  AgentAction
-> = (set, get) => ({
-  updateDefaultAgent: (agent) => {
-    const settings = produce(get().settings, (draft: GlobalSettings) => {
-      draft.defaultAgent = merge(draft.defaultAgent, agent);
-    });
-
-    set({ settings }, false, n('updateDefaultAgent', agent));
-  },
-});