@lobehub/chat 0.149.4 → 0.149.5

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

@@ -1,16 +1,16 @@
 import { ActionIcon, Icon } from '@lobehub/ui';
 import { Upload } from 'antd';
 import { useTheme } from 'antd-style';
-import { LucideImage, FileUp, LucideLoader2 } from 'lucide-react';
+import { FileUp, LucideImage, LucideLoader2 } from 'lucide-react';
 import { memo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Center } from 'react-layout-kit';
 
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/slices/chat';
 import { useFileStore } from '@/store/file';
 import { useGlobalStore } from '@/store/global';
 import { modelProviderSelectors } from '@/store/global/selectors';
-import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
 
 const FileUpload = memo(() => {
   const { t } = useTranslation('chat');
@@ -18,7 +18,7 @@ const FileUpload = memo(() => {
   const theme = useTheme();
   const upload = useFileStore((s) => s.uploadFile);
 
-  const model = useSessionStore(agentSelectors.currentAgentModel);
+  const model = useAgentStore(agentSelectors.currentAgentModel);
   const [canUpload, enabledFiles] = useGlobalStore((s) => [
     modelProviderSelectors.isModelEnabledUpload(model)(s),
     modelProviderSelectors.isModelEnabledFiles(model)(s),
@@ -53,7 +53,13 @@ const FileUpload = memo(() => {
           disable={!canUpload}
           icon={enabledFiles ? FileUp : LucideImage}
           placement={'bottom'}
-          title={t(canUpload ? (enabledFiles ? 'upload.actionFiletip' : 'upload.actionTooltip') : 'upload.disabled')}
+          title={t(
+            canUpload
+              ? enabledFiles
+                ? 'upload.actionFiletip'
+                : 'upload.actionTooltip'
+              : 'upload.disabled',
+          )}
         />
       )}
     </Upload>

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

@@ -5,13 +5,13 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
-import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/selectors';
 
 const History = memo(() => {
   const { t } = useTranslation('setting');
 
-  const [historyCount, unlimited, updateAgentConfig] = useSessionStore((s) => {
+  const [historyCount, unlimited, updateAgentConfig] = useAgentStore((s) => {
     const config = agentSelectors.currentAgentConfig(s);
     return [config.historyCount, !config.enableHistoryCount, s.updateAgentConfig];
   });

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

@@ -15,4 +15,6 @@ const ModelSwitch = memo(() => {
   );
 });
 
+ModelSwitch.displayName = 'ModelSwitch';
+
 export default ModelSwitch;

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

@@ -4,13 +4,13 @@ import { Thermometer } from 'lucide-react';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/selectors';
 
 const Temperature = memo(() => {
   const { t } = useTranslation('setting');
 
-  const [temperature, updateAgentConfig] = useSessionStore((s) => {
+  const [temperature, updateAgentConfig] = useAgentStore((s) => {
     const config = agentSelectors.currentAgentConfig(s);
     return [config.params.temperature, s.updateAgentConfig];
   });

package/src/features/ChatInput/ActionBar/Token/TokenTag.tsx

@@ -5,12 +5,12 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { useTokenCount } from '@/hooks/useTokenCount';
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/selectors';
 import { useChatStore } from '@/store/chat';
 import { chatSelectors } from '@/store/chat/selectors';
 import { useGlobalStore } from '@/store/global';
 import { modelProviderSelectors } from '@/store/global/selectors';
-import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
 import { useToolStore } from '@/store/tool';
 import { toolSelectors } from '@/store/tool/selectors';
 
@@ -24,7 +24,7 @@ const Token = memo(() => {
     chatSelectors.chatsMessageString(s),
   ]);
 
-  const [systemRole, model] = useSessionStore((s) => [
+  const [systemRole, model] = useAgentStore((s) => [
     agentSelectors.currentAgentSystemRole(s),
     agentSelectors.currentAgentModel(s) as string,
   ]);
@@ -33,7 +33,7 @@ const Token = memo(() => {
 
   // Tool usage token
   const canUseTool = useGlobalStore(modelProviderSelectors.isModelEnabledFunctionCall(model));
-  const plugins = useSessionStore(agentSelectors.currentAgentPlugins);
+  const plugins = useAgentStore(agentSelectors.currentAgentPlugins);
   const toolsString = useToolStore((s) => {
     const pluginSystemRoles = toolSelectors.enabledSystemRoles(plugins)(s);
     const schemaNumber = toolSelectors

package/src/features/ChatInput/ActionBar/Token/index.tsx

@@ -1,15 +1,15 @@
 import dynamic from 'next/dynamic';
 import { memo } from 'react';
 
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/slices/chat';
 import { useGlobalStore } from '@/store/global';
 import { modelProviderSelectors } from '@/store/global/selectors';
-import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
 
 const LargeTokenContent = dynamic(() => import('./TokenTag'), { ssr: false });
 
 const Token = memo(() => {
-  const model = useSessionStore(agentSelectors.currentAgentModel);
+  const model = useAgentStore(agentSelectors.currentAgentModel);
   const showTag = useGlobalStore(modelProviderSelectors.isModelHasMaxToken(model));
 
   return showTag && <LargeTokenContent />;

package/src/features/ChatInput/ActionBar/Tools/ToolItem.tsx

@@ -3,13 +3,13 @@ import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
 import PluginTag from '@/features/PluginStore/PluginItem/PluginTag';
-import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/selectors';
 import { useToolStore } from '@/store/tool';
 import { customPluginSelectors } from '@/store/tool/selectors';
 
 const ToolItem = memo<{ identifier: string; label: string }>(({ identifier, label }) => {
-  const [checked, togglePlugin] = useSessionStore((s) => [
+  const [checked, togglePlugin] = useAgentStore((s) => [
     agentSelectors.currentAgentPlugins(s).includes(identifier),
     s.togglePlugin,
   ]);

package/src/features/ChatInput/ActionBar/Tools/index.tsx

@@ -8,10 +8,10 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import PluginStore from '@/features/PluginStore';
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/selectors';
 import { useGlobalStore } from '@/store/global';
 import { modelProviderSelectors } from '@/store/global/selectors';
-import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
 import { pluginHelpers, useToolStore } from '@/store/tool';
 import { builtinToolSelectors, pluginSelectors } from '@/store/tool/selectors';
 
@@ -35,7 +35,7 @@ const Tools = memo(() => {
   const list = useToolStore(pluginSelectors.installedPluginMetaList, isEqual);
   const builtinList = useToolStore(builtinToolSelectors.metaList, isEqual);
 
-  const enablePluginCount = useSessionStore(
+  const enablePluginCount = useAgentStore(
     (s) =>
       agentSelectors
         .currentAgentPlugins(s)
@@ -45,7 +45,7 @@ const Tools = memo(() => {
   const [open, setOpen] = useState(false);
   const { styles } = useStyles();
 
-  const model = useSessionStore(agentSelectors.currentAgentModel);
+  const model = useAgentStore(agentSelectors.currentAgentModel);
   const enableFC = useGlobalStore(modelProviderSelectors.isModelEnabledFunctionCall(model));
 
   return (

package/src/features/ChatInput/STT/browser.tsx

@@ -4,11 +4,11 @@ import { memo, useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { SWRConfiguration } from 'swr';
 
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/slices/chat';
 import { useChatStore } from '@/store/chat';
 import { useGlobalStore } from '@/store/global';
 import { settingsSelectors } from '@/store/global/selectors';
-import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
 import { ChatMessageError } from '@/types/message';
 import { getMessageError } from '@/utils/fetch';
 
@@ -20,7 +20,7 @@ interface STTConfig extends SWRConfiguration {
 
 const useBrowserSTT = (config: STTConfig) => {
   const ttsSettings = useGlobalStore(settingsSelectors.currentTTS, isEqual);
-  const ttsAgentSettings = useSessionStore(agentSelectors.currentAgentTTS, isEqual);
+  const ttsAgentSettings = useAgentStore(agentSelectors.currentAgentTTS, isEqual);
   const locale = useGlobalStore(settingsSelectors.currentLanguage);
 
   const autoStop = ttsSettings.sttAutoStop;

package/src/features/ChatInput/STT/openai.tsx

@@ -7,11 +7,11 @@ import { SWRConfiguration } from 'swr';
 
 import { createHeaderWithOpenAI } from '@/services/_header';
 import { API_ENDPOINTS } from '@/services/_url';
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/selectors';
 import { useChatStore } from '@/store/chat';
 import { useGlobalStore } from '@/store/global';
 import { settingsSelectors } from '@/store/global/selectors';
-import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
 import { ChatMessageError } from '@/types/message';
 import { getMessageError } from '@/utils/fetch';
 
@@ -23,7 +23,7 @@ interface STTConfig extends SWRConfiguration {
 
 const useOpenaiSTT = (config: STTConfig) => {
   const ttsSettings = useGlobalStore(settingsSelectors.currentTTS, isEqual);
-  const ttsAgentSettings = useSessionStore(agentSelectors.currentAgentTTS, isEqual);
+  const ttsAgentSettings = useAgentStore(agentSelectors.currentAgentTTS, isEqual);
   const locale = useGlobalStore(settingsSelectors.currentLanguage);
 
   const autoStop = ttsSettings.sttAutoStop;

package/src/features/ChatInput/useChatInput.ts

@@ -1,11 +1,11 @@
 import { TextAreaRef } from 'antd/es/input/TextArea';
 import { useCallback, useRef, useState } from 'react';
 
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/slices/chat';
 import { useChatStore } from '@/store/chat';
 import { useGlobalStore } from '@/store/global';
 import { modelProviderSelectors } from '@/store/global/selectors';
-import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
 
 import { useSendMessage } from './useSend';
 
@@ -14,7 +14,7 @@ export const useChatInput = () => {
   const [expand, setExpand] = useState<boolean>(false);
   const onSend = useSendMessage();
 
-  const model = useSessionStore(agentSelectors.currentAgentModel);
+  const model = useAgentStore(agentSelectors.currentAgentModel);
   const canUpload = useGlobalStore(modelProviderSelectors.isModelEnabledUpload(model));
 
   const [loading, value, onInput, onStop] = useChatStore((s) => [

package/src/features/Conversation/Extras/Assistant.test.tsx

@@ -1,8 +1,8 @@
 import { render, screen } from '@testing-library/react';
 import { Mock, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/selectors';
 import { ChatMessage } from '@/types/message';
 
 import { AssistantMessageExtra } from './Assistant';
@@ -16,10 +16,10 @@ vi.mock('./Translate', () => ({
 }));
 
 // Mock dependencies
-vi.mock('@/store/session', () => ({
-  useSessionStore: vi.fn(),
+vi.mock('@/store/agent', () => ({
+  useAgentStore: vi.fn(),
 }));
-vi.mock('@/store/session/selectors', () => ({
+vi.mock('@/store/agent/selectors', () => ({
   agentSelectors: {
     currentAgentModel: vi.fn(),
   },
@@ -37,7 +37,7 @@ const mockData: ChatMessage = {
 describe('AssistantMessageExtra', () => {
   beforeEach(() => {
     // Set default mock return values
-    (useSessionStore as unknown as Mock).mockImplementation(() => ({
+    (useAgentStore as unknown as Mock).mockImplementation(() => ({
       chatLoadingId: null,
     }));
     (agentSelectors.currentAgentModel as Mock).mockReturnValue('defaultModel');
@@ -76,7 +76,7 @@ describe('AssistantMessageExtra', () => {
   });
 
   it('should receive the correct loading attribute if loading is true for TTS and Translate components', async () => {
-    (useSessionStore as unknown as Mock).mockImplementation(() => ({
+    (useAgentStore as unknown as Mock).mockImplementation(() => ({
       chatLoadingId: 'test-id',
     }));
     render(<AssistantMessageExtra {...mockData} extra={{ translate: { to: 'abc' }, tts: {} }} />);

package/src/features/Conversation/Extras/Assistant.tsx

@@ -2,9 +2,9 @@ import { memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
 import ModelTag from '@/components/ModelTag';
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/slices/chat';
 import { useChatStore } from '@/store/chat';
-import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
 import { ChatMessage } from '@/types/message';
 
 import { RenderMessageExtra } from '../types';
@@ -14,7 +14,7 @@ import Translate from './Translate';
 
 export const AssistantMessageExtra: RenderMessageExtra = memo<ChatMessage>(
   ({ extra, id, content }) => {
-    const model = useSessionStore(agentSelectors.currentAgentModel);
+    const model = useAgentStore(agentSelectors.currentAgentModel);
     const loading = useChatStore((s) => s.chatLoadingId === id);
 
     const showModelTag = extra?.fromModel && model !== extra?.fromModel;

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

@@ -1,10 +1,10 @@
 import { memo, useMemo } from 'react';
 import { Md5 } from 'ts-md5';
 
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/slices/chat';
 import { useGlobalStore } from '@/store/global';
 import { settingsSelectors } from '@/store/global/selectors';
-import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
 
 import FilePlayer from './FilePlayer';
 import InitPlayer, { TTSProps } from './InitPlayer';
@@ -13,7 +13,7 @@ const TTS = memo<TTSProps>(
   (props) => {
     const { file, voice, content, contentMd5 } = props;
     const lang = useGlobalStore(settingsSelectors.currentLanguage);
-    const currentVoice = useSessionStore(agentSelectors.currentAgentTTSVoice(lang));
+    const currentVoice = useAgentStore(agentSelectors.currentAgentTTSVoice(lang));
 
     const md5 = useMemo(() => Md5.hashStr(content).toString(), [content]);
 

package/src/features/Conversation/components/ChatItem/ActionsBar.tsx

@@ -5,7 +5,7 @@ import { memo, useCallback } from 'react';
 import { useChatStore } from '@/store/chat';
 import { chatSelectors } from '@/store/chat/selectors';
 import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
+import { sessionMetaSelectors } from '@/store/session/selectors';
 
 import { renderActions, useActionsClick } from '../../Actions';
 import { useChatListActionsBar } from '../../hooks/useChatListActionsBar';
@@ -29,7 +29,7 @@ interface ActionsProps {
   setEditing: (edit: boolean) => void;
 }
 const Actions = memo<ActionsProps>(({ index, setEditing }) => {
-  const meta = useSessionStore(agentSelectors.currentAgentMeta, isEqual);
+  const meta = useSessionStore(sessionMetaSelectors.currentAgentMeta, isEqual);
 
   const item = useChatStore(
     (s) => chatSelectors.currentChatsWithGuideMessage(meta)(s)[index],

package/src/features/Conversation/components/ChatItem/index.tsx

@@ -4,12 +4,14 @@ import isEqual from 'fast-deep-equal';
 import { ReactNode, memo, useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/selectors';
 import { useChatStore } from '@/store/chat';
 import { chatSelectors } from '@/store/chat/selectors';
 import { useGlobalStore } from '@/store/global';
 import { settingsSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
+import { sessionMetaSelectors } from '@/store/session/selectors';
 import { ChatMessage } from '@/types/message';
 
 import ErrorMessageExtra, { getErrorAlertConfig } from '../../Error';
@@ -40,12 +42,12 @@ const Item = memo<ChatListItemProps>(({ index, id }) => {
   const { t } = useTranslation('common');
   const { styles, cx } = useStyles();
   const [editing, setEditing] = useState(false);
-  const [type = 'chat'] = useSessionStore((s) => {
+  const [type = 'chat'] = useAgentStore((s) => {
     const config = agentSelectors.currentAgentConfig(s);
     return [config.displayMode];
   });
 
-  const meta = useSessionStore(agentSelectors.currentAgentMeta, isEqual);
+  const meta = useSessionStore(sessionMetaSelectors.currentAgentMeta, isEqual);
   const item = useChatStore((s) => {
     const chats = chatSelectors.currentChatsWithGuideMessage(meta)(s);
 
@@ -99,7 +101,7 @@ const Item = memo<ChatListItemProps>(({ index, id }) => {
     return { message: errorT(`response.${messageError.type}` as any), ...alertConfig };
   }, [item?.error]);
 
-  const enableHistoryDivider = useSessionStore((s) => {
+  const enableHistoryDivider = useAgentStore((s) => {
     const config = agentSelectors.currentAgentConfig(s);
     return (
       config.enableHistoryCount &&

package/src/features/Conversation/hooks/useInitConversation.ts

@@ -1,15 +1,16 @@
 import { useEffect } from 'react';
 
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/selectors';
 import { useChatStore } from '@/store/chat';
 import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
 import { useToolStore } from '@/store/tool';
 
 export const useInitConversation = () => {
   const [sessionId] = useSessionStore((s) => [s.activeId]);
-  const plugins = useSessionStore((s) => agentSelectors.currentAgentPlugins(s));
-  const [init, activeTopicId, switchTopic, useFetchMessages, useFetchTopics] = useChatStore((s) => [
-    s.messagesInit,
+  const [useFetchAgentConfig] = useAgentStore((s) => [s.useFetchAgentConfig]);
+  const plugins = useAgentStore((s) => agentSelectors.currentAgentPlugins(s));
+  const [activeTopicId, switchTopic, useFetchMessages, useFetchTopics] = useChatStore((s) => [
     s.activeTopicId,
     s.switchTopic,
     s.useFetchMessages,
@@ -18,6 +19,7 @@ export const useInitConversation = () => {
 
   useFetchMessages(sessionId, activeTopicId);
   useFetchTopics(sessionId);
+  useFetchAgentConfig(sessionId);
 
   const [useFetchPluginStore, useFetchInstalledPlugins, checkPluginsIsInstalled] = useToolStore(
     (s) => [s.useFetchPluginStore, s.useFetchInstalledPlugins, s.useCheckPluginsIsInstalled],
@@ -31,14 +33,15 @@ export const useInitConversation = () => {
     // // when activeId changed, switch topic to undefined
     const unsubscribe = useSessionStore.subscribe(
       (s) => s.activeId,
-      () => {
+      (activeId) => {
         switchTopic();
+
+        useAgentStore.setState({ activeId }, false, 'updateActiveId');
       },
     );
+
     return () => {
       unsubscribe();
     };
   }, []);
-
-  return init;
 };

package/src/features/Conversation/index.tsx

@@ -3,6 +3,7 @@ import { ReactNode, memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
 import ChatHydration from '@/components/StoreHydration/ChatHydration';
+import { useChatStore } from '@/store/chat';
 
 import SkeletonList from './components/SkeletonList';
 import ChatList from './components/VirtualizedList';
@@ -29,16 +30,18 @@ interface ConversationProps {
 const Conversation = memo<ConversationProps>(({ chatInput, mobile }) => {
   const { styles } = useStyles();
 
-  const init = useInitConversation();
+  useInitConversation();
+
+  const [messagesInit] = useChatStore((s) => [s.messagesInit]);
 
   return (
     <Flexbox
       flex={1}
-      //  position: 'relative' is required, ChatInput's absolute position needs it
+      // `relative` is required, ChatInput's absolute position needs it
       style={{ position: 'relative' }}
     >
       <div className={styles}>
-        {init ? <ChatList mobile={mobile} /> : <SkeletonList mobile={mobile} />}
+        {messagesInit ? <ChatList mobile={mobile} /> : <SkeletonList mobile={mobile} />}
       </div>
       {chatInput}
       <ChatHydration />

package/src/features/ModelSwitchPanel/index.tsx

@@ -9,10 +9,10 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { ModelItemRender, ProviderItemRender } from '@/components/ModelSelect';
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/slices/chat';
 import { useGlobalStore } from '@/store/global';
 import { modelProviderSelectors } from '@/store/global/selectors';
-import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
 import { ModelProviderCard } from '@/types/llm';
 import { withBasePath } from '@/utils/basePath';
 
@@ -40,8 +40,10 @@ const useStyles = createStyles(({ css, prefixCls }) => ({
 const ModelSwitchPanel = memo<PropsWithChildren>(({ children }) => {
   const { t } = useTranslation('components');
   const { styles, theme } = useStyles();
-  const model = useSessionStore(agentSelectors.currentAgentModel);
-  const updateAgentConfig = useSessionStore((s) => s.updateAgentConfig);
+  const [model, updateAgentConfig] = useAgentStore((s) => [
+    agentSelectors.currentAgentModel(s),
+    s.updateAgentConfig,
+  ]);
 
   const router = useRouter();
   const enabledList = useGlobalStore(

package/src/hooks/useTTS.ts

@@ -11,10 +11,10 @@ import isEqual from 'fast-deep-equal';
 
 import { createHeaderWithOpenAI } from '@/services/_header';
 import { API_ENDPOINTS } from '@/services/_url';
+import { useAgentStore } from '@/store/agent';
+import { agentSelectors } from '@/store/agent/slices/chat';
 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';
 
 interface TTSConfig extends TTSOptions {
@@ -25,9 +25,9 @@ interface TTSConfig extends TTSOptions {
 
 export const useTTS = (content: string, config?: TTSConfig) => {
   const ttsSettings = useGlobalStore(settingsSelectors.currentTTS, isEqual);
-  const ttsAgentSettings = useSessionStore(agentSelectors.currentAgentTTS, isEqual);
+  const ttsAgentSettings = useAgentStore(agentSelectors.currentAgentTTS, isEqual);
   const lang = useGlobalStore(settingsSelectors.currentLanguage);
-  const voice = useSessionStore(agentSelectors.currentAgentTTSVoice(lang));
+  const voice = useAgentStore(agentSelectors.currentAgentTTSVoice(lang));
   let useSelectedTTS;
   let options: any = {};
   switch (config?.server || ttsAgentSettings.ttsService) {

package/src/services/chat.ts

@@ -15,7 +15,7 @@ import {
   preferenceSelectors,
 } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
-import { agentSelectors } from '@/store/session/selectors';
+import { sessionMetaSelectors } from '@/store/session/selectors';
 import { useToolStore } from '@/store/tool';
 import { pluginSelectors, toolSelectors } from '@/store/tool/selectors';
 import { ChatErrorType } from '@/types/fetch';
@@ -267,7 +267,7 @@ class ChatService {
      */
     if (enableFetchOnClient) {
       try {
-        return this.fetchOnClient({ payload, provider, signal });
+        return await this.fetchOnClient({ payload, provider, signal });
       } catch (e) {
         const {
           errorType = ChatErrorType.BadRequest,
@@ -447,7 +447,7 @@ class ChatService {
   };
 
   private mapTrace(trace?: TracePayload, tag?: TraceTagMap): TracePayload {
-    const tags = agentSelectors.currentAgentMeta(useSessionStore.getState()).tags || [];
+    const tags = sessionMetaSelectors.currentAgentMeta(useSessionStore.getState()).tags || [];
 
     const enabled = preferenceSelectors.userAllowTrace(useGlobalStore.getState());
 

package/src/services/session/client.ts

@@ -1,7 +1,10 @@
 import { DeepPartial } from 'utility-types';
 
+import { INBOX_SESSION_ID } from '@/const/session';
 import { SessionModel } from '@/database/client/models/session';
 import { SessionGroupModel } from '@/database/client/models/sessionGroup';
+import { UserModel } from '@/database/client/models/user';
+import { useGlobalStore } from '@/store/global';
 import { LobeAgentConfig } from '@/types/agent';
 import {
   ChatSessionList,
@@ -40,6 +43,18 @@ export class ClientService implements ISessionService {
     return SessionModel.queryWithGroups();
   }
 
+  async getSessionConfig(id: string): Promise<LobeAgentConfig> {
+    if (!id || id === INBOX_SESSION_ID) {
+      return UserModel.getAgentConfig();
+    }
+
+    const res = await SessionModel.findById(id);
+
+    if (!res) throw new Error('Session not found');
+
+    return res.config as LobeAgentConfig;
+  }
+
   async getSessionsByType(type: 'agent' | 'group' | 'all' = 'all'): Promise<LobeSessions> {
     switch (type) {
       // TODO: add a filter to get only agents or agents
@@ -81,6 +96,10 @@ export class ClientService implements ISessionService {
   }
 
   async updateSessionConfig(activeId: string, config: DeepPartial<LobeAgentConfig>) {
+    if (activeId === INBOX_SESSION_ID) {
+      return useGlobalStore.getState().updateDefaultAgent({ config });
+    }
+
     return SessionModel.updateConfig(activeId, config);
   }
 

package/src/services/session/type.ts

@@ -28,6 +28,8 @@ export interface ISessionService {
     id: string,
     data: Partial<{ group?: SessionGroupId; pinned?: boolean }>,
   ): Promise<any>;
+
+  getSessionConfig(id: string): Promise<LobeAgentConfig>;
   updateSessionConfig(id: string, config: DeepPartial<LobeAgentConfig>): Promise<any>;
 
   removeSession(id: string): Promise<any>;

package/src/store/agent/index.ts

@@ -0,0 +1,2 @@
+export type { AgentStore } from './store';
+export { useAgentStore } from './store';

package/src/store/agent/initialState.ts

@@ -0,0 +1,7 @@
+import { AgentState, initialSessionState } from './slices/chat/initialState';
+
+export type SessionStoreState = AgentState;
+
+export const initialState: SessionStoreState = {
+  ...initialSessionState,
+};

package/src/store/agent/selectors.ts

@@ -0,0 +1 @@
+export { agentSelectors } from './slices/chat/selectors';