@lobehub/chat 0.115.2 → 0.115.4

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+### [Version 0.115.4](https://github.com/lobehub/lobe-chat/compare/v0.115.3...v0.115.4)
+
+<sup>Released on **2023-12-23**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Refactor the ChatMessage type.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Refactor the ChatMessage type ([40375bd](https://github.com/lobehub/lobe-chat/commit/40375bd))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [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.4",
   "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/Checker.tsx

@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { chatService } from '@/services/chat';
-import { ChatMessageError } from '@/types/chatMessage';
+import { ChatMessageError } from '@/types/message';
 
 import { getModelList } from './getModelList';
 

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/database/models/__tests__/message.test.ts

@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
 import { CreateMessageParams, MessageModel } from '../message';
 

package/src/database/models/message.ts

@@ -3,7 +3,7 @@ import { DeepPartial } from 'utility-types';
 import { BaseModel } from '@/database/core';
 import { DBModel } from '@/database/core/types/db';
 import { DB_Message, DB_MessageSchema } from '@/database/schemas/message';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 import { nanoid } from '@/utils/uuid';
 
 export interface CreateMessageParams

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/SelectWithTTSPreview.tsx

@@ -8,7 +8,7 @@ import { Flexbox } from 'react-layout-kit';
 
 import { useTTS } from '@/hooks/useTTS';
 import { TTSServer } from '@/types/agent';
-import { ChatMessageError } from '@/types/chatMessage';
+import { ChatMessageError } from '@/types/message';
 import { getMessageError } from '@/utils/fetch';
 
 interface SelectWithTTSPreviewProps extends SelectProps {

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/ChatInput/STT/index.tsx

@@ -8,7 +8,7 @@ import { Flexbox } from 'react-layout-kit';
 
 import { useSTT } from '@/hooks/useSTT';
 import { useChatStore } from '@/store/chat';
-import { ChatMessageError } from '@/types/chatMessage';
+import { ChatMessageError } from '@/types/message';
 import { getMessageError } from '@/utils/fetch';
 
 const useStyles = createStyles(({ css, token }) => ({

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/Assistant.test.tsx

@@ -3,7 +3,7 @@ import { Mock, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { useSessionStore } from '@/store/session';
 import { agentSelectors } from '@/store/session/selectors';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
 import { AssistantMessageExtra } from './Assistant';
 

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

@@ -6,7 +6,7 @@ import { Flexbox } from 'react-layout-kit';
 import { useChatStore } from '@/store/chat';
 import { useSessionStore } from '@/store/session';
 import { agentSelectors } from '@/store/session/selectors';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
 import ExtraContainer from './ExtraContainer';
 import TTS from './TTS';

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

@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { useTTS } from '@/hooks/useTTS';
 import { useChatStore } from '@/store/chat';
 import { useFileStore } from '@/store/file';
-import { ChatMessageError, ChatTTS } from '@/types/chatMessage';
+import { ChatMessageError, ChatTTS } from '@/types/message';
 import { getMessageError } from '@/utils/fetch';
 
 import Player from './Player';

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

@@ -6,7 +6,7 @@ import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
-import { ChatMessageError } from '@/types/chatMessage';
+import { ChatMessageError } from '@/types/message';
 
 interface PlayerProps extends AudioPlayerProps {
   error?: ChatMessageError;

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/ChatList/Extras/Translate.tsx

@@ -8,7 +8,7 @@ import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { useChatStore } from '@/store/chat';
-import { ChatTranslate } from '@/types/chatMessage';
+import { ChatTranslate } from '@/types/message';
 
 import BubblesLoading from '../Loading';
 

package/src/features/Conversation/ChatList/Extras/User.tsx

@@ -1,7 +1,7 @@
 import { memo } from 'react';
 
 import { useChatStore } from '@/store/chat';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
 import ExtraContainer from './ExtraContainer';
 import TTS from './TTS';

package/src/features/Conversation/ChatList/Extras/type.ts

@@ -1,5 +1,5 @@
 import { FC } from 'react';
 
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
 export type RenderMessageExtra = FC<ChatMessage>;

package/src/features/Conversation/ChatList/Messages/Assistant.tsx

@@ -2,7 +2,7 @@ import { ReactNode, memo } from 'react';
 
 import { useChatStore } from '@/store/chat';
 import { chatSelectors } from '@/store/chat/selectors';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 import { isFunctionMessageAtStart } from '@/utils/message';
 
 import Inspector from '../Plugins/Inspector';

package/src/features/Conversation/ChatList/Messages/Default.tsx

@@ -1,7 +1,7 @@
 import { ReactNode, memo } from 'react';
 
 import { LOADING_FLAT } from '@/const/message';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
 import BubblesLoading from '../Loading';
 

package/src/features/Conversation/ChatList/Messages/Function.tsx

@@ -4,7 +4,7 @@ import { Flexbox } from 'react-layout-kit';
 
 import { useChatStore } from '@/store/chat';
 import { chatSelectors } from '@/store/chat/selectors';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
 import Inspector from '../Plugins/Inspector';
 import PluginRender from '../Plugins/Render';

package/src/features/Conversation/ChatList/Messages/User.tsx

@@ -3,7 +3,7 @@ import { Flexbox } from 'react-layout-kit';
 
 import FileList from '@/components/FileList';
 import { LOADING_FLAT } from '@/const/message';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
 import BubblesLoading from '../Loading';
 

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/__tests__/chat.test.ts

@@ -6,7 +6,7 @@ import { VISION_MODEL_WHITE_LIST } from '@/const/llm';
 import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
 import { useFileStore } from '@/store/file';
 import { useToolStore } from '@/store/tool';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 import { OpenAIChatStreamPayload } from '@/types/openai/chat';
 import { LobeTool } from '@/types/tool';
 

package/src/services/__tests__/message.test.ts

@@ -7,7 +7,7 @@ import {
   ChatPluginPayload,
   ChatTTS,
   ChatTranslate,
-} from '@/types/chatMessage';
+} from '@/types/message';
 
 import { messageService } from '../message';
 

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/chat.ts

@@ -7,7 +7,7 @@ import { DEFAULT_AGENT_CONFIG } from '@/const/settings';
 import { filesSelectors, useFileStore } from '@/store/file';
 import { useToolStore } from '@/store/tool';
 import { pluginSelectors, toolSelectors } from '@/store/tool/selectors';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 import type { OpenAIChatMessage, OpenAIChatStreamPayload } from '@/types/openai/chat';
 import { UserMessageContentPart } from '@/types/openai/chat';
 import { fetchAIFactory, getMessageError } from '@/utils/fetch';

package/src/services/config.ts

@@ -1,11 +1,12 @@
 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';
 import { ConfigFile } from '@/types/exportConfig';
+import { ChatMessage } from '@/types/message';
 import { LobeSessions } from '@/types/session';
 import { GlobalSettings } from '@/types/settings';
 import { ChatTopic } from '@/types/topic';

package/src/services/message.ts

@@ -1,13 +1,13 @@
 import { CreateMessageParams, MessageModel } from '@/database/models/message';
 import { DB_Message } from '@/database/schemas/message';
+import { LLMRoleType } from '@/types/llm';
 import {
   ChatMessage,
   ChatMessageError,
   ChatPluginPayload,
   ChatTTS,
   ChatTranslate,
-} from '@/types/chatMessage';
-import { LLMRoleType } from '@/types/llm';
+} from '@/types/message';
 
 export class MessageService {
   async create(data: CreateMessageParams) {

package/src/store/chat/helpers.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it, vi } from 'vitest';
 
 import { LobeAgentConfig } from '@/types/agent';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 import { OpenAIChatMessage } from '@/types/openai/chat';
 import { encodeAsync } from '@/utils/tokenizer';
 import * as tokenizerObj from '@/utils/tokenizer';

package/src/store/chat/helpers.ts

@@ -1,5 +1,5 @@
 import { LobeAgentConfig } from '@/types/agent';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 import { OpenAIChatMessage } from '@/types/openai/chat';
 import { encodeAsync } from '@/utils/tokenizer';
 

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}

@@ -7,9 +7,9 @@ import { chatService } from '@/services/chat';
 import { messageService } from '@/services/message';
 import { topicService } from '@/services/topic';
 import { chatSelectors } from '@/store/chat/selectors';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 
-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}

@@ -17,13 +17,13 @@ import { chatHelpers } from '@/store/chat/helpers';
 import { ChatStore } from '@/store/chat/store';
 import { useSessionStore } from '@/store/session';
 import { agentSelectors } from '@/store/session/selectors';
-import { ChatMessage } from '@/types/chatMessage';
+import { ChatMessage } from '@/types/message';
 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');