@lobehub/chat 0.150.9 → 0.150.10

package/src/services/models.ts

@@ -1,6 +1,6 @@
 import { createHeaderWithAuth } from '@/services/_auth';
-import { useGlobalStore } from '@/store/global';
-import { modelConfigSelectors } from '@/store/global/selectors';
+import { useUserStore } from '@/store/user';
+import { modelConfigSelectors } from '@/store/user/selectors';
 import { ChatModelCard } from '@/types/llm';
 
 import { API_ENDPOINTS } from './_url';
@@ -17,7 +17,7 @@ class ModelsService {
        * Use browser agent runtime
        */
       const enableFetchOnClient = modelConfigSelectors.isProviderFetchOnClient(provider)(
-        useGlobalStore.getState(),
+        useUserStore.getState(),
       );
       if (enableFetchOnClient) {
         const agentRuntime = await initializeWithClientStore(provider, {});

package/src/services/ollama.ts

@@ -2,8 +2,8 @@ import { ListResponse, Ollama as OllamaBrowser, ProgressResponse } from 'ollama/
 
 import { createErrorResponse } from '@/app/api/errorResponse';
 import { ModelProvider } from '@/libs/agent-runtime';
-import { useGlobalStore } from '@/store/global';
-import { modelConfigSelectors } from '@/store/global/selectors';
+import { useUserStore } from '@/store/user';
+import { modelConfigSelectors } from '@/store/user/selectors';
 import { ChatErrorType } from '@/types/fetch';
 import { getMessageError } from '@/utils/fetch';
 
@@ -25,7 +25,7 @@ export class OllamaService {
   }
 
   getHost = (): string => {
-    const config = modelConfigSelectors.ollamaConfig(useGlobalStore.getState());
+    const config = modelConfigSelectors.ollamaConfig(useUserStore.getState());
 
     return config.endpoint || DEFAULT_BASE_URL;
   };

package/src/services/session/client.ts

@@ -4,7 +4,7 @@ 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 { useUserStore } from '@/store/user';
 import { LobeAgentConfig } from '@/types/agent';
 import {
   ChatSessionList,
@@ -97,7 +97,7 @@ export class ClientService implements ISessionService {
 
   async updateSessionConfig(activeId: string, config: DeepPartial<LobeAgentConfig>) {
     if (activeId === INBOX_SESSION_ID) {
-      return useGlobalStore.getState().updateDefaultAgent({ config });
+      return useUserStore.getState().updateDefaultAgent({ config });
     }
 
     return SessionModel.updateConfig(activeId, config);

package/src/services/tool.ts

@@ -4,7 +4,7 @@ import {
   pluginManifestSchema,
 } from '@lobehub/chat-plugin-sdk';
 
-import { globalHelpers } from '@/store/global/helpers';
+import { globalHelpers } from '@/store/user/helpers';
 import { OpenAIPluginManifest } from '@/types/openai/plugin';
 
 import { API_ENDPOINTS } from './_url';

package/src/services/trace.ts

@@ -1,6 +1,6 @@
 import { API_ENDPOINTS } from '@/services/_url';
-import { useGlobalStore } from '@/store/global';
-import { preferenceSelectors } from '@/store/global/selectors';
+import { useUserStore } from '@/store/user';
+import { preferenceSelectors } from '@/store/user/selectors';
 import { TraceEventBasePayload, TraceEventPayloads } from '@/types/trace';
 
 class TraceService {
@@ -17,7 +17,7 @@ class TraceService {
   }
 
   async traceEvent(data: TraceEventPayloads & TraceEventBasePayload) {
-    const enabled = preferenceSelectors.userAllowTrace(useGlobalStore.getState());
+    const enabled = preferenceSelectors.userAllowTrace(useUserStore.getState());
 
     if (!enabled) return;
 

package/src/store/agent/slices/chat/selectors.test.ts

@@ -3,8 +3,8 @@ import { describe, expect, it } from 'vitest';
 import { INBOX_SESSION_ID } from '@/const/session';
 import { DEFAULT_AGENT_CONFIG, DEFAUTT_AGENT_TTS_CONFIG } from '@/const/settings';
 import { AgentStore } from '@/store/agent';
-import { GlobalStore } from '@/store/global';
-import { settingsSelectors } from '@/store/global/slices/settings/selectors';
+import { UserStore } from '@/store/user';
+import { settingsSelectors } from '@/store/user/slices/settings/selectors';
 import { LobeAgentConfig } from '@/types/agent';
 
 import { agentSelectors } from './selectors';

package/src/store/chat/slices/message/selectors.test.ts

@@ -6,8 +6,8 @@ import { INBOX_SESSION_ID } from '@/const/session';
 import { useAgentStore } from '@/store/agent';
 import { ChatStore } from '@/store/chat';
 import { initialState } from '@/store/chat/initialState';
-import { useGlobalStore } from '@/store/global';
 import { useSessionStore } from '@/store/session';
+import { useUserStore } from '@/store/user';
 import { LobeAgentConfig } from '@/types/agent';
 import { ChatMessage } from '@/types/message';
 import { MetaData } from '@/types/meta';

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

@@ -5,10 +5,10 @@ import { DEFAULT_INBOX_AVATAR, DEFAULT_USER_AVATAR } from '@/const/meta';
 import { INBOX_SESSION_ID } from '@/const/session';
 import { useAgentStore } from '@/store/agent';
 import { agentSelectors } from '@/store/agent/selectors';
-import { useGlobalStore } from '@/store/global';
-import { commonSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 import { sessionMetaSelectors } from '@/store/session/selectors';
+import { useUserStore } from '@/store/user';
+import { commonSelectors } from '@/store/user/selectors';
 import { ChatMessage } from '@/types/message';
 import { MetaData } from '@/types/meta';
 import { merge } from '@/utils/merge';
@@ -20,7 +20,7 @@ const getMeta = (message: ChatMessage) => {
   switch (message.role) {
     case 'user': {
       return {
-        avatar: commonSelectors.userAvatar(useGlobalStore.getState()) || DEFAULT_USER_AVATAR,
+        avatar: commonSelectors.userAvatar(useUserStore.getState()) || DEFAULT_USER_AVATAR,
       };
     }
 

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

@@ -1,9 +1,23 @@
-import { act, renderHook } from '@testing-library/react';
+import { act, renderHook, waitFor } from '@testing-library/react';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { withSWR } from '~test-utils';
 
-import { useGlobalStore } from '@/store/global';
+import { globalService } from '@/services/global';
+import { useGlobalStore } from '@/store/global/index';
 
-import { type Guide } from './initialState';
+vi.mock('zustand/traditional');
+
+vi.mock('@/utils/client/switchLang', () => ({
+  switchLang: vi.fn(),
+}));
+
+vi.mock('swr', async (importOriginal) => {
+  const modules = await importOriginal();
+  return {
+    ...(modules as any),
+    mutate: vi.fn(),
+  };
+});
 
 beforeEach(() => {
   vi.clearAllMocks();
@@ -64,29 +78,67 @@ describe('createPreferenceSlice', () => {
     });
   });
 
-  describe('updateGuideState', () => {
-    it('should update guide state', () => {
+  describe('updatePreference', () => {
+    it('should update preference', () => {
       const { result } = renderHook(() => useGlobalStore());
-      const guide: Guide = { topic: true };
+      const preference = { inputHeight: 200 };
 
       act(() => {
-        result.current.updateGuideState(guide);
+        result.current.updatePreference(preference);
       });
 
-      expect(result.current.preference.guide).toEqual(guide);
+      expect(result.current.preference.inputHeight).toEqual(200);
     });
   });
 
-  describe('updatePreference', () => {
-    it('should update preference', () => {
+  describe('switchBackToChat', () => {
+    it('should switch back to chat', () => {
       const { result } = renderHook(() => useGlobalStore());
-      const preference = { inputHeight: 200 };
+      const sessionId = 'session-id';
+      const router = { push: vi.fn() } as any;
 
       act(() => {
-        result.current.updatePreference(preference);
+        useGlobalStore.setState({ router });
+        result.current.switchBackToChat(sessionId);
       });
 
-      expect(result.current.preference.inputHeight).toEqual(200);
+      expect(router.push).toHaveBeenCalledWith('/chat?session=session-id');
+    });
+  });
+
+  describe('useCheckLatestVersion', () => {
+    it('should set hasNewVersion to false if there is no new version', async () => {
+      const latestVersion = '0.0.1';
+
+      vi.spyOn(globalService, 'getLatestVersion').mockResolvedValueOnce(latestVersion);
+
+      const { result } = renderHook(() => useGlobalStore().useCheckLatestVersion(), {
+        wrapper: withSWR,
+      });
+
+      await waitFor(() => {
+        expect(result.current.data).toBe(latestVersion);
+      });
+
+      expect(useGlobalStore.getState().hasNewVersion).toBeUndefined();
+      expect(useGlobalStore.getState().latestVersion).toBeUndefined();
+    });
+
+    it('should set hasNewVersion to true if there is a new version', async () => {
+      const latestVersion = '10000000.0.0';
+
+      vi.spyOn(globalService, 'getLatestVersion').mockResolvedValueOnce(latestVersion);
+
+      const { result } = renderHook(() => useGlobalStore().useCheckLatestVersion(), {
+        wrapper: withSWR,
+      });
+
+      await waitFor(() => {
+        expect(result.current.data).toBe(latestVersion);
+      });
+
+      expect(useGlobalStore.getState().hasNewVersion).toBe(true);
+      expect(useGlobalStore.getState().latestVersion).toBe(latestVersion);
     });
   });
 });

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

@@ -1,35 +1,44 @@
 import { produce } from 'immer';
-import { SWRResponse } from 'swr';
+import { gt } from 'semver';
+import useSWR, { SWRResponse } from 'swr';
 import type { StateCreator } from 'zustand/vanilla';
 
+import { INBOX_SESSION_ID } from '@/const/session';
+import { SESSION_CHAT_URL } from '@/const/url';
+import { CURRENT_VERSION } from '@/const/version';
 import { useClientDataSWR } from '@/libs/swr';
-import type { GlobalStore } from '@/store/global';
+import { globalService } from '@/services/global';
+import type { GlobalStore } from '@/store/global/index';
 import { merge } from '@/utils/merge';
 import { setNamespace } from '@/utils/storeDebug';
 
-import type { GlobalPreference, Guide } from './initialState';
+import type { GlobalPreference } from './initialState';
 
 const n = setNamespace('preference');
 
 /**
  * 设置操作
  */
-export interface PreferenceAction {
+export interface GlobalStoreAction {
+  switchBackToChat: (sessionId?: string) => void;
   toggleChatSideBar: (visible?: boolean) => void;
   toggleExpandSessionGroup: (id: string, expand: boolean) => void;
   toggleMobileTopic: (visible?: boolean) => void;
   toggleSystemRole: (visible?: boolean) => void;
-  updateGuideState: (guide: Partial<Guide>) => void;
   updatePreference: (preference: Partial<GlobalPreference>, action?: any) => void;
-  useInitPreference: () => SWRResponse;
+  useCheckLatestVersion: () => SWRResponse<string>;
+  useInitGlobalPreference: () => SWRResponse;
 }
 
-export const createPreferenceSlice: StateCreator<
+export const globalActionSlice: StateCreator<
   GlobalStore,
   [['zustand/devtools', never]],
   [],
-  PreferenceAction
+  GlobalStoreAction
 > = (set, get) => ({
+  switchBackToChat: (sessionId) => {
+    get().router?.push(SESSION_CHAT_URL(sessionId || INBOX_SESSION_ID, get().isMobile));
+  },
   toggleChatSideBar: (newValue) => {
     const showChatSideBar =
       typeof newValue === 'boolean' ? newValue : !get().preference.showChatSideBar;
@@ -38,7 +47,7 @@ export const createPreferenceSlice: StateCreator<
   },
   toggleExpandSessionGroup: (id, expand) => {
     const { preference } = get();
-    const nextExpandSessionGroup = produce(preference.expandSessionGroupKeys, (draft) => {
+    const nextExpandSessionGroup = produce(preference.expandSessionGroupKeys, (draft: string[]) => {
       if (expand) {
         if (draft.includes(id)) return;
         draft.push(id);
@@ -61,11 +70,6 @@ export const createPreferenceSlice: StateCreator<
 
     get().updatePreference({ showSystemRole }, n('toggleMobileTopic', newValue));
   },
-  updateGuideState: (guide) => {
-    const { updatePreference } = get();
-    const nextGuide = merge(get().preference.guide, guide);
-    updatePreference({ guide: nextGuide });
-  },
   updatePreference: (preference, action) => {
     const nextPreference = merge(get().preference, preference);
 
@@ -74,9 +78,19 @@ export const createPreferenceSlice: StateCreator<
     get().preferenceStorage.saveToLocalStorage(nextPreference);
   },
 
-  useInitPreference: () =>
+  useCheckLatestVersion: () =>
+    useSWR('checkLatestVersion', globalService.getLatestVersion, {
+      // check latest version every 30 minutes
+      focusThrottleInterval: 1000 * 60 * 30,
+      onSuccess: (data: string) => {
+        if (gt(data, CURRENT_VERSION))
+          set({ hasNewVersion: true, latestVersion: data }, false, n('checkLatestVersion'));
+      },
+    }),
+
+  useInitGlobalPreference: () =>
     useClientDataSWR<GlobalPreference>(
-      'preference',
+      'initGlobalPreference',
       () => get().preferenceStorage.getFromLocalStorage(),
       {
         onSuccess: (preference) => {

package/src/store/global/initialState.ts

@@ -1,13 +1,63 @@
-import { GlobalCommonState, initialCommonState } from './slices/common/initialState';
-import { GlobalPreferenceState, initialPreferenceState } from './slices/preference/initialState';
-import { GlobalSettingsState, initialSettingsState } from './slices/settings/initialState';
+import { AppRouterInstance } from 'next/dist/shared/lib/app-router-context.shared-runtime';
 
-export { SettingsTabs, SidebarTabKey } from './slices/common/initialState';
+import { SessionDefaultGroup } from '@/types/session';
+import { AsyncLocalStorage } from '@/utils/localStorage';
 
-export type GlobalState = GlobalCommonState & GlobalSettingsState & GlobalPreferenceState;
+export enum SidebarTabKey {
+  Chat = 'chat',
+  Market = 'market',
+  Setting = 'settings',
+}
+
+export enum SettingsTabs {
+  About = 'about',
+  Agent = 'agent',
+  Common = 'common',
+  LLM = 'llm',
+  Sync = 'sync',
+  TTS = 'tts',
+}
+
+export interface GlobalPreference {
+  // which sessionGroup should expand
+  expandSessionGroupKeys: string[];
+  inputHeight: number;
+  mobileShowTopic?: boolean;
+  sessionsWidth: number;
+  showChatSideBar?: boolean;
+  showSessionPanel?: boolean;
+  showSystemRole?: boolean;
+}
+
+export interface GlobalPreferenceState {
+  /**
+   * the user preference, which only store in local storage
+   */
+  preference: GlobalPreference;
+  preferenceStorage: AsyncLocalStorage<GlobalPreference>;
+}
+
+export interface GlobalCommonState {
+  hasNewVersion?: boolean;
+  isMobile?: boolean;
+  latestVersion?: string;
+  router?: AppRouterInstance;
+  sidebarKey: SidebarTabKey;
+}
+
+export type GlobalState = GlobalCommonState & GlobalPreferenceState;
 
 export const initialState: GlobalState = {
-  ...initialCommonState,
-  ...initialSettingsState,
-  ...initialPreferenceState,
+  isMobile: false,
+  preference: {
+    expandSessionGroupKeys: [SessionDefaultGroup.Pinned, SessionDefaultGroup.Default],
+    inputHeight: 200,
+    mobileShowTopic: false,
+    sessionsWidth: 320,
+    showChatSideBar: true,
+    showSessionPanel: true,
+    showSystemRole: false,
+  },
+  preferenceStorage: new AsyncLocalStorage('LOBE_GLOBAL_PREFERENCE'),
+  sidebarKey: SidebarTabKey.Chat,
 };

package/src/store/global/selectors.ts

@@ -1,8 +1,9 @@
-export { commonSelectors } from './slices/common/selectors';
-export { preferenceSelectors } from './slices/preference/selectors';
-export {
-  modelConfigSelectors,
-  modelProviderSelectors,
-  settingsSelectors,
-  syncSettingsSelectors,
-} from './slices/settings/selectors';
+import { GlobalStore } from '@/store/global';
+import { SessionDefaultGroup } from '@/types/session';
+
+const sessionGroupKeys = (s: GlobalStore): string[] =>
+  s.preference.expandSessionGroupKeys || [SessionDefaultGroup.Pinned, SessionDefaultGroup.Default];
+
+export const preferenceSelectors = {
+  sessionGroupKeys,
+};

package/src/store/global/store.ts

@@ -5,20 +5,16 @@ import { StateCreator } from 'zustand/vanilla';
 
 import { isDev } from '@/utils/env';
 
+import { type GlobalStoreAction, globalActionSlice } from './action';
 import { type GlobalState, initialState } from './initialState';
-import { type CommonAction, createCommonSlice } from './slices/common/action';
-import { type PreferenceAction, createPreferenceSlice } from './slices/preference/action';
-import { type SettingsAction, createSettingsSlice } from './slices/settings/actions';
 
 //  ===============  聚合 createStoreFn ============ //
 
-export type GlobalStore = CommonAction & GlobalState & SettingsAction & PreferenceAction;
+export type GlobalStore = GlobalState & GlobalStoreAction;
 
 const createStore: StateCreator<GlobalStore, [['zustand/devtools', never]]> = (...parameters) => ({
   ...initialState,
-  ...createCommonSlice(...parameters),
-  ...createSettingsSlice(...parameters),
-  ...createPreferenceSlice(...parameters),
+  ...globalActionSlice(...parameters),
 });
 
 //  ===============  实装 useStore ============ //

package/src/store/market/action.ts

@@ -4,7 +4,7 @@ import useSWR, { SWRResponse } from 'swr';
 import type { StateCreator } from 'zustand/vanilla';
 
 import { marketService } from '@/services/market';
-import { globalHelpers } from '@/store/global/helpers';
+import { globalHelpers } from '@/store/user/helpers';
 import { AgentsMarketItem, LobeChatAgentsMarketIndex } from '@/types/market';
 
 import type { Store } from './store';

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

@@ -8,9 +8,9 @@ import { message } from '@/components/AntdStaticMethods';
 import { DEFAULT_AGENT_LOBE_SESSION, INBOX_SESSION_ID } from '@/const/session';
 import { useClientDataSWR } from '@/libs/swr';
 import { sessionService } from '@/services/session';
-import { useGlobalStore } from '@/store/global';
-import { settingsSelectors } from '@/store/global/selectors';
 import { SessionStore } from '@/store/session';
+import { useUserStore } from '@/store/user';
+import { settingsSelectors } from '@/store/user/selectors';
 import { MetaData } from '@/types/meta';
 import {
   ChatSessionList,
@@ -111,7 +111,7 @@ export const createSessionSlice: StateCreator<
     // merge the defaultAgent in settings
     const defaultAgent = merge(
       DEFAULT_AGENT_LOBE_SESSION,
-      settingsSelectors.defaultAgent(useGlobalStore.getState()),
+      settingsSelectors.defaultAgent(useUserStore.getState()),
     );
 
     const newSession: LobeAgentSession = merge(defaultAgent, agent);

package/src/store/{global → user}/helpers.ts

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

package/src/store/user/index.ts

@@ -0,0 +1 @@
+export * from './store';

package/src/store/user/initialState.ts

@@ -0,0 +1,11 @@
+import { UserCommonState, initialCommonState } from './slices/common/initialState';
+import { UserPreferenceState, initialPreferenceState } from './slices/preference/initialState';
+import { UserSettingsState, initialSettingsState } from './slices/settings/initialState';
+
+export type UserState = UserCommonState & UserSettingsState & UserPreferenceState;
+
+export const initialState: UserState = {
+  ...initialCommonState,
+  ...initialSettingsState,
+  ...initialPreferenceState,
+};

package/src/store/user/selectors.ts

@@ -0,0 +1,8 @@
+export { commonSelectors } from './slices/common/selectors';
+export { preferenceSelectors } from './slices/preference/selectors';
+export {
+  modelConfigSelectors,
+  modelProviderSelectors,
+  settingsSelectors,
+  syncSettingsSelectors,
+} from './slices/settings/selectors';