@lobehub/chat 0.161.22 → 0.161.23

package/src/services/_auth.ts

@@ -1,15 +1,17 @@
 import { JWTPayload, LOBE_CHAT_AUTH_HEADER } from '@/const/auth';
 import { ModelProvider } from '@/libs/agent-runtime';
 import { useUserStore } from '@/store/user';
-import { modelConfigSelectors, settingsSelectors } from '@/store/user/selectors';
+import { keyVaultsConfigSelectors, settingsSelectors } from '@/store/user/selectors';
+import { GlobalLLMProviderKey } from '@/types/user/settings';
 import { createJWT } from '@/utils/jwt';
 
 export const getProviderAuthPayload = (provider: string) => {
   switch (provider) {
     case ModelProvider.Bedrock: {
-      const { accessKeyId, region, secretAccessKey } = modelConfigSelectors.bedrockConfig(
+      const { accessKeyId, region, secretAccessKey } = keyVaultsConfigSelectors.bedrockConfig(
         useUserStore.getState(),
       );
+
       const awsSecretAccessKey = secretAccessKey;
       const awsAccessKeyId = accessKeyId;
 
@@ -19,7 +21,7 @@ export const getProviderAuthPayload = (provider: string) => {
     }
 
     case ModelProvider.Azure: {
-      const azure = modelConfigSelectors.azureConfig(useUserStore.getState());
+      const azure = keyVaultsConfigSelectors.azureConfig(useUserStore.getState());
 
       return {
         apiKey: azure.apiKey,
@@ -29,15 +31,17 @@ export const getProviderAuthPayload = (provider: string) => {
     }
 
     case ModelProvider.Ollama: {
-      const config = modelConfigSelectors.ollamaConfig(useUserStore.getState());
+      const config = keyVaultsConfigSelectors.ollamaConfig(useUserStore.getState());
 
-      return { endpoint: config?.endpoint };
+      return { endpoint: config?.baseURL };
     }
 
     default: {
-      const config = settingsSelectors.providerConfig(provider)(useUserStore.getState());
+      const config = keyVaultsConfigSelectors.getVaultByProvider(provider as GlobalLLMProviderKey)(
+        useUserStore.getState(),
+      );
 
-      return { apiKey: config?.apiKey, endpoint: config?.endpoint };
+      return { apiKey: config?.apiKey, endpoint: config?.baseURL };
     }
   }
 };

package/src/services/_header.ts

@@ -1,6 +1,9 @@
 import { LOBE_CHAT_ACCESS_CODE, OPENAI_API_KEY_HEADER_KEY, OPENAI_END_POINT } from '@/const/fetch';
 import { useUserStore } from '@/store/user';
-import { modelConfigSelectors, settingsSelectors } from '@/store/user/selectors';
+import {
+  keyVaultsConfigSelectors,
+  settingsSelectors,
+} from '@/store/user/selectors';
 
 /**
  * TODO: Need to be removed after tts refactor
@@ -8,13 +11,13 @@ import { modelConfigSelectors, settingsSelectors } from '@/store/user/selectors'
  */
 // eslint-disable-next-line no-undef
 export const createHeaderWithOpenAI = (header?: HeadersInit): HeadersInit => {
-  const openAIConfig = modelConfigSelectors.openAIConfig(useUserStore.getState());
+  const openAIConfig = keyVaultsConfigSelectors.openAIConfig(useUserStore.getState());
 
   // eslint-disable-next-line no-undef
   return {
     ...header,
     [LOBE_CHAT_ACCESS_CODE]: settingsSelectors.password(useUserStore.getState()),
     [OPENAI_API_KEY_HEADER_KEY]: openAIConfig.apiKey || '',
-    [OPENAI_END_POINT]: openAIConfig.endpoint || '',
+    [OPENAI_END_POINT]: openAIConfig.baseURL || '',
   };
 };

package/src/services/ollama.ts

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

package/src/services/user/client.test.ts

@@ -58,7 +58,7 @@ describe('ClientService', () => {
   });
 
   it('should update user settings correctly', async () => {
-    const settingsPatch: DeepPartial<UserSettings> = { themeMode: 'dark' };
+    const settingsPatch: DeepPartial<UserSettings> = { general: { themeMode: 'dark' } };
     (UserModel.updateSettings as Mock).mockResolvedValue(undefined);
 
     await clientService.updateUserSettings(settingsPatch);

package/src/store/user/helpers.ts

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

package/src/store/user/selectors.ts

@@ -1,5 +1,13 @@
 export { authSelectors, userProfileSelectors } from './slices/auth/selectors';
-export { modelConfigSelectors, modelProviderSelectors } from './slices/modelList/selectors';
+export {
+  keyVaultsConfigSelectors,
+  modelConfigSelectors,
+  modelProviderSelectors,
+} from './slices/modelList/selectors';
 export { preferenceSelectors } from './slices/preference/selectors';
-export { settingsSelectors, systemAgentSelectors } from './slices/settings/selectors';
+export {
+  settingsSelectors,
+  systemAgentSelectors,
+  userGeneralSettingsSelectors,
+} from './slices/settings/selectors';
 export { syncSettingsSelectors } from './slices/sync/selectors';

package/src/store/user/slices/common/action.test.ts

@@ -84,7 +84,7 @@ describe('createCommonSlice', () => {
           telemetry: true,
         },
         settings: {
-          language: 'en-US',
+          general: { language: 'en-US' },
         },
       };
 
@@ -166,7 +166,7 @@ describe('createCommonSlice', () => {
         isOnboard: true,
         preference: savedPreference,
         settings: {
-          language: 'en-US',
+          general: { language: 'en-US' },
         },
       };
       vi.spyOn(userService, 'getUserState').mockResolvedValueOnce(mockUserState);
@@ -216,7 +216,7 @@ describe('createCommonSlice', () => {
         isOnboard: true,
         preference: {} as any,
         settings: {
-          language: 'en-US',
+          general: { language: 'en-US' },
         },
       };
 

package/src/store/user/slices/common/action.ts

@@ -14,7 +14,7 @@ import { merge } from '@/utils/merge';
 import { setNamespace } from '@/utils/storeDebug';
 
 import { preferenceSelectors } from '../preference/selectors';
-import { settingsSelectors } from '../settings/selectors';
+import { userGeneralSettingsSelectors } from '../settings/selectors';
 
 const n = setNamespace('common');
 
@@ -115,7 +115,7 @@ export const createCommonSlice: StateCreator<
             get().refreshDefaultModelProviderList({ trigger: 'fetchUserState' });
 
             // auto switch language
-            const { language } = settingsSelectors.currentSettings(get());
+            const language = userGeneralSettingsSelectors.config(get()).language;
             if (language === 'auto') {
               switchLang('auto');
             }

package/src/store/user/slices/modelList/action.test.ts

@@ -4,7 +4,7 @@ import { describe, expect, it, vi } from 'vitest';
 import { modelsService } from '@/services/models';
 import { userService } from '@/services/user';
 import { useUserStore } from '@/store/user';
-import { OpenAICompatibleProviderConfig } from '@/types/user/settings';
+import { ProviderConfig } from '@/types/user/settings';
 
 import { settingsSelectors } from '../settings/selectors';
 import { CustomModelCardDispatch } from './reducers/customModelCard';
@@ -24,7 +24,7 @@ describe('LLMSettingsSliceAction', () => {
   describe('setModelProviderConfig', () => {
     it('should set OpenAI configuration', async () => {
       const { result } = renderHook(() => useUserStore());
-      const openAIConfig: Partial<OpenAICompatibleProviderConfig> = { apiKey: 'test-key' };
+      const openAIConfig: Partial<ProviderConfig> = { fetchOnClient: true };
 
       // Perform the action
       await act(async () => {

package/src/store/user/slices/modelList/action.ts

@@ -6,7 +6,11 @@ import { DEFAULT_MODEL_PROVIDER_LIST } from '@/config/modelProviders';
 import { ModelProvider } from '@/libs/agent-runtime';
 import { UserStore } from '@/store/user';
 import { ChatModelCard } from '@/types/llm';
-import { UserModelProviderConfig, GlobalLLMProviderKey } from '@/types/user/settings';
+import {
+  GlobalLLMProviderKey,
+  UserKeyVaults,
+  UserModelProviderConfig,
+} from '@/types/user/settings';
 
 import { settingsSelectors } from '../settings/selectors';
 import { CustomModelCardDispatch, customModelCardsReducer } from './reducers/customModelCard';
@@ -30,7 +34,6 @@ export interface ModelListAction {
     provider: T,
     config: Partial<UserModelProviderConfig[T]>,
   ) => Promise<void>;
-
   toggleEditingCustomModelCard: (params?: { id: string; provider: GlobalLLMProviderKey }) => void;
 
   toggleProviderEnabled: (provider: GlobalLLMProviderKey, enabled: boolean) => Promise<void>;
@@ -41,6 +44,11 @@ export interface ModelListAction {
     options: { label?: string; value?: string }[],
   ) => Promise<void>;
 
+  updateKeyVaultConfig: <T extends GlobalLLMProviderKey>(
+    provider: T,
+    config: Partial<UserKeyVaults[T]>,
+  ) => Promise<void>;
+
   useFetchProviderModelList: (
     provider: GlobalLLMProviderKey,
     enabledAutoFetch: boolean,
@@ -137,10 +145,10 @@ export const createModelListSlice: StateCreator<
   toggleEditingCustomModelCard: (params) => {
     set({ editingCustomCardModel: params }, false, 'toggleEditingCustomModelCard');
   },
+
   toggleProviderEnabled: async (provider, enabled) => {
     await get().setSettings({ languageModel: { [provider]: { enabled } } });
   },
-
   updateEnabledModels: async (provider, value, options) => {
     const { dispatchCustomModelCards, setModelProviderConfig } = get();
     const enabledModels = modelProviderSelectors.getEnableModelsById(provider)(get());
@@ -171,6 +179,10 @@ export const createModelListSlice: StateCreator<
     await setModelProviderConfig(provider, { enabledModels: value.filter(Boolean) });
   },
 
+  updateKeyVaultConfig: async (provider, config) => {
+    await get().setSettings({ keyVaults: { [provider]: config } });
+  },
+
   useFetchProviderModelList: (provider, enabledAutoFetch) =>
     useSWR<ChatModelCard[] | undefined>(
       [provider, enabledAutoFetch],

package/src/store/user/slices/modelList/selectors/index.ts

@@ -1,2 +1,3 @@
+export { keyVaultsConfigSelectors } from './keyVaults';
 export { modelConfigSelectors } from './modelConfig';
 export { modelProviderSelectors } from './modelProvider';

package/src/store/user/slices/modelList/selectors/keyVaults.ts

@@ -0,0 +1,25 @@
+import { UserStore } from '@/store/user';
+import { GlobalLLMProviderKey, OpenAICompatibleKeyVault } from '@/types/user/settings';
+
+import { currentSettings } from '../../settings/selectors/settings';
+
+export const keyVaultsSettings = (s: UserStore) => currentSettings(s).keyVaults;
+
+const openAIConfig = (s: UserStore) => keyVaultsSettings(s).openai || {};
+const bedrockConfig = (s: UserStore) => keyVaultsSettings(s).bedrock || {};
+const ollamaConfig = (s: UserStore) => keyVaultsSettings(s).ollama || {};
+const azureConfig = (s: UserStore) => keyVaultsSettings(s).azure || {};
+const getVaultByProvider = (provider: GlobalLLMProviderKey) => (s: UserStore) =>
+  (keyVaultsSettings(s)[provider] || {}) as OpenAICompatibleKeyVault;
+
+const isProviderEndpointNotEmpty = (provider: string) => (s: UserStore) =>
+  !!getVaultByProvider(provider as GlobalLLMProviderKey)(s)?.baseURL;
+
+export const keyVaultsConfigSelectors = {
+  azureConfig,
+  bedrockConfig,
+  getVaultByProvider,
+  isProviderEndpointNotEmpty,
+  ollamaConfig,
+  openAIConfig,
+};

package/src/store/user/slices/modelList/selectors/modelConfig.test.ts

@@ -38,7 +38,7 @@ describe('modelConfigSelectors', () => {
     it('client fetch should disabled on default', () => {
       const s = merge(initialSettingsState, {
         settings: {
-          languageModel: {
+          keyVaults: {
             azure: {
               endpoint: 'endpoint',
               apiKey: 'apikey',

package/src/store/user/slices/modelList/selectors/modelConfig.ts

@@ -6,9 +6,6 @@ import { currentLLMSettings, getProviderConfigById } from '../../settings/select
 const isProviderEnabled = (provider: GlobalLLMProviderKey) => (s: UserStore) =>
   getProviderConfigById(provider)(s)?.enabled || false;
 
-const isProviderEndpointNotEmpty = (provider: GlobalLLMProviderKey | string) => (s: UserStore) =>
-  !!getProviderConfigById(provider)(s)?.endpoint;
-
 const isProviderFetchOnClient = (provider: GlobalLLMProviderKey | string) => (s: UserStore) => {
   const config = getProviderConfigById(provider)(s);
   if (typeof config?.fetchOnClient !== 'undefined') return config?.fetchOnClient;
@@ -56,10 +53,8 @@ export const modelConfigSelectors = {
   isAutoFetchModelsEnabled,
   isAzureEnabled,
   isProviderEnabled,
-  isProviderEndpointNotEmpty,
   isProviderFetchOnClient,
 
   ollamaConfig,
-
   openAIConfig,
 };

package/src/store/user/slices/settings/action.test.ts

@@ -8,6 +8,9 @@ import { userService } from '@/services/user';
 import { useUserStore } from '@/store/user';
 import { LobeAgentSettings } from '@/types/session';
 import { UserSettings } from '@/types/user/settings';
+import { merge } from '@/utils/merge';
+
+vi.mock('zustand/traditional');
 
 // Mock userService
 vi.mock('@/services/user', () => ({
@@ -21,10 +24,9 @@ describe('SettingsAction', () => {
   describe('importAppSettings', () => {
     it('should import app settings', async () => {
       const { result } = renderHook(() => useUserStore());
-      const newSettings: UserSettings = {
-        ...DEFAULT_SETTINGS,
-        themeMode: 'dark',
-      };
+      const newSettings: UserSettings = merge(DEFAULT_SETTINGS, {
+        general: { themeMode: 'dark' },
+      });
 
       // Mock the internal setSettings function call
       const setSettingsSpy = vi.spyOn(result.current, 'setSettings');
@@ -35,14 +37,12 @@ describe('SettingsAction', () => {
       });
 
       // Assert that setSettings was called with the correct settings
-      expect(setSettingsSpy).toHaveBeenCalledWith({
-        ...DEFAULT_SETTINGS,
-        password: undefined,
-        themeMode: 'dark',
-      });
+      expect(setSettingsSpy).toHaveBeenCalledWith(newSettings);
 
       // Assert that the state has been updated
-      expect(userService.updateUserSettings).toHaveBeenCalledWith({ themeMode: 'dark' });
+      expect(userService.updateUserSettings).toHaveBeenCalledWith({
+        general: { themeMode: 'dark' },
+      });
 
       // Restore the spy
       setSettingsSpy.mockRestore();
@@ -69,7 +69,7 @@ describe('SettingsAction', () => {
   describe('setSettings', () => {
     it('should set partial settings', async () => {
       const { result } = renderHook(() => useUserStore());
-      const partialSettings: Partial<UserSettings> = { themeMode: 'dark' };
+      const partialSettings: DeepPartial<UserSettings> = { general: { themeMode: 'dark' } };
 
       // Perform the action
       await act(async () => {
@@ -92,7 +92,9 @@ describe('SettingsAction', () => {
       });
 
       // Assert that updateUserSettings was called with the correct theme mode
-      expect(userService.updateUserSettings).toHaveBeenCalledWith({ themeMode });
+      expect(userService.updateUserSettings).toHaveBeenCalledWith({
+        general: { themeMode },
+      });
     });
   });
 

package/src/store/user/slices/settings/action.ts

@@ -7,7 +7,7 @@ import { userService } from '@/services/user';
 import type { UserStore } from '@/store/user';
 import { LocaleMode } from '@/types/locale';
 import { LobeAgentSettings } from '@/types/session';
-import { UserSettings } from '@/types/user/settings';
+import { UserGeneralConfig, UserKeyVaults, UserSettings } from '@/types/user/settings';
 import { switchLang } from '@/utils/client/switchLang';
 import { difference } from '@/utils/difference';
 import { merge } from '@/utils/merge';
@@ -20,6 +20,8 @@ export interface UserSettingsAction {
   switchLocale: (locale: LocaleMode) => Promise<void>;
   switchThemeMode: (themeMode: ThemeMode) => Promise<void>;
   updateDefaultAgent: (agent: DeepPartial<LobeAgentSettings>) => Promise<void>;
+  updateGeneralConfig: (settings: Partial<UserGeneralConfig>) => Promise<void>;
+  updateKeyVaults: (settings: Partial<UserKeyVaults>) => Promise<void>;
 }
 
 export const createSettingsSlice: StateCreator<
@@ -30,10 +32,8 @@ export const createSettingsSlice: StateCreator<
 > = (set, get) => ({
   importAppSettings: async (importAppSettings) => {
     const { setSettings } = get();
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { password: _, ...settings } = importAppSettings;
 
-    await setSettings(settings);
+    await setSettings(importAppSettings);
   },
   resetSettings: async () => {
     await userService.resetUserSettings();
@@ -62,14 +62,20 @@ export const createSettingsSlice: StateCreator<
     });
   },
   switchLocale: async (locale) => {
-    await get().setSettings({ language: locale });
+    await get().updateGeneralConfig({ language: locale });
 
     switchLang(locale);
   },
   switchThemeMode: async (themeMode) => {
-    await get().setSettings({ themeMode });
+    await get().updateGeneralConfig({ themeMode });
   },
   updateDefaultAgent: async (defaultAgent) => {
     await get().setSettings({ defaultAgent });
   },
+  updateGeneralConfig: async (general) => {
+    await get().setSettings({ general });
+  },
+  updateKeyVaults: async (keyVaults) => {
+    await get().setSettings({ keyVaults });
+  },
 });

package/src/store/user/slices/settings/selectors/general.test.ts

@@ -0,0 +1,45 @@
+import { UserStore } from '@/store/user';
+import { UserState, initialState } from '@/store/user/initialState';
+import { merge } from '@/utils/merge';
+
+import { userGeneralSettingsSelectors } from './general';
+
+describe('settingsSelectors', () => {
+  describe('currentLanguage', () => {
+    it('should return the correct language setting', () => {
+      const s: UserState = merge(initialState, {
+        settings: {
+          general: { language: 'fr' },
+        },
+      });
+
+      const result = userGeneralSettingsSelectors.currentLanguage(s as UserStore);
+
+      expect(result).toBe('fr');
+    });
+  });
+
+  describe('currentThemeMode', () => {
+    it('should return the correct theme', () => {
+      const s: UserState = merge(initialState, {
+        settings: {
+          general: { themeMode: 'light' },
+        },
+      });
+
+      const result = userGeneralSettingsSelectors.currentThemeMode(s as UserStore);
+
+      expect(result).toBe('light');
+    });
+    it('should return the auto if not set the themeMode', () => {
+      const s: UserState = merge(initialState, {
+        settings: {
+          general: { themeMode: undefined },
+        },
+      });
+      const result = userGeneralSettingsSelectors.currentThemeMode(s as UserStore);
+
+      expect(result).toBe('auto');
+    });
+  });
+});

package/src/store/user/slices/settings/selectors/general.ts

@@ -0,0 +1,40 @@
+import { DEFAULT_LANG } from '@/const/locale';
+import { Locales } from '@/locales/resources';
+import { isOnServerSide } from '@/utils/env';
+
+import { UserStore } from '../../../store';
+import { currentSettings } from './settings';
+
+const generalConfig = (s: UserStore) => currentSettings(s).general || {};
+
+const currentLanguage = (s: UserStore) => {
+  const locale = generalConfig(s).language;
+
+  if (locale === 'auto') {
+    if (isOnServerSide) return DEFAULT_LANG;
+
+    return navigator.language as Locales;
+  }
+
+  return locale;
+};
+
+const currentThemeMode = (s: UserStore) => {
+  const themeMode = generalConfig(s).themeMode;
+  return themeMode || 'auto';
+};
+
+const neutralColor = (s: UserStore) => generalConfig(s).neutralColor;
+const primaryColor = (s: UserStore) => generalConfig(s).primaryColor;
+const fontSize = (s: UserStore) => generalConfig(s).fontSize;
+const language = (s: UserStore) => generalConfig(s).language;
+
+export const userGeneralSettingsSelectors = {
+  config: generalConfig,
+  currentLanguage,
+  currentThemeMode,
+  fontSize,
+  language,
+  neutralColor,
+  primaryColor,
+};

package/src/store/user/slices/settings/selectors/index.ts

@@ -1,2 +1,3 @@
+export { userGeneralSettingsSelectors } from './general';
 export { settingsSelectors } from './settings';
 export { systemAgentSelectors } from './systemAgent';

package/src/store/user/slices/settings/selectors/settings.test.ts

@@ -117,45 +117,6 @@ describe('settingsSelectors', () => {
     });
   });
 
-  describe('currentLanguage', () => {
-    it('should return the correct language setting', () => {
-      const s = {
-        settings: {
-          language: 'fr',
-        },
-      } as unknown as UserStore;
-
-      const result = settingsSelectors.currentLanguage(s);
-
-      expect(result).toBe('fr');
-    });
-  });
-
-  describe('currentThemeMode', () => {
-    it('should return the correct theme', () => {
-      const s = {
-        settings: {
-          themeMode: 'light',
-        },
-      } as unknown as UserStore;
-
-      const result = settingsSelectors.currentThemeMode(s);
-
-      expect(result).toBe('light');
-    });
-    it('should return the auto if not set the themeMode', () => {
-      const s = {
-        settings: {
-          themeMode: undefined,
-        },
-      } as unknown as UserStore;
-
-      const result = settingsSelectors.currentThemeMode(s);
-
-      expect(result).toBe('auto');
-    });
-  });
-
   describe('dalleConfig', () => {
     it('should return the dalle configuration', () => {
       const s = {

package/src/store/user/slices/settings/selectors/settings.ts

@@ -1,4 +1,3 @@
-import { DEFAULT_LANG } from '@/const/locale';
 import { DEFAULT_AGENT_META } from '@/const/meta';
 import {
   DEFAULT_AGENT,
@@ -6,13 +5,11 @@ import {
   DEFAULT_SYSTEM_AGENT_CONFIG,
   DEFAULT_TTS_CONFIG,
 } from '@/const/settings';
-import { Locales } from '@/locales/resources';
 import {
-  OpenAICompatibleProviderConfig,
   GlobalLLMProviderKey,
+  ProviderConfig,
   UserSettings,
 } from '@/types/user/settings';
-import { isOnServerSide } from '@/utils/env';
 import { merge } from '@/utils/merge';
 
 import { UserStore } from '../../../store';
@@ -22,9 +19,11 @@ export const currentSettings = (s: UserStore): UserSettings => merge(s.defaultSe
 export const currentLLMSettings = (s: UserStore) => currentSettings(s).languageModel;
 
 export const getProviderConfigById = (provider: string) => (s: UserStore) =>
-  currentLLMSettings(s)[provider as GlobalLLMProviderKey] as OpenAICompatibleProviderConfig | undefined;
+  currentLLMSettings(s)[provider as GlobalLLMProviderKey] as
+    | ProviderConfig
+    | undefined;
 
-const password = (s: UserStore) => currentSettings(s).password;
+const password = (s: UserStore) => currentSettings(s).keyVaults.password || '';
 
 const currentTTS = (s: UserStore) => merge(DEFAULT_TTS_CONFIG, currentSettings(s).tts);
 
@@ -33,30 +32,7 @@ const defaultAgentConfig = (s: UserStore) => merge(DEFAULT_AGENT_CONFIG, default
 
 const defaultAgentMeta = (s: UserStore) => merge(DEFAULT_AGENT_META, defaultAgent(s).meta);
 
-// TODO: Maybe we can also export settings difference
-const exportSettings = (s: UserStore) => {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const { password: _, ...settings } = currentSettings(s);
-
-  return settings as UserSettings;
-};
-
-const currentLanguage = (s: UserStore) => {
-  const locale = currentSettings(s).language;
-
-  if (locale === 'auto') {
-    if (isOnServerSide) return DEFAULT_LANG;
-
-    return navigator.language as Locales;
-  }
-
-  return locale;
-};
-
-export const currentThemeMode = (s: UserStore) => {
-  const themeMode = currentSettings(s).themeMode;
-  return themeMode || 'auto';
-};
+const exportSettings = currentSettings;
 
 const dalleConfig = (s: UserStore) => currentSettings(s).tool?.dalle || {};
 const isDalleAutoGenerating = (s: UserStore) => currentSettings(s).tool?.dalle?.autoGenerate;
@@ -65,11 +41,9 @@ const currentSystemAgent = (s: UserStore) =>
   merge(DEFAULT_SYSTEM_AGENT_CONFIG, currentSettings(s).systemAgent);
 
 export const settingsSelectors = {
-  currentLanguage,
   currentSettings,
   currentSystemAgent,
   currentTTS,
-  currentThemeMode,
   dalleConfig,
   defaultAgent,
   defaultAgentConfig,

package/src/types/user/settings/general.ts

@@ -3,7 +3,7 @@ import type { ThemeMode } from 'antd-style';
 
 import { LocaleMode } from '@/types/locale';
 
-export interface UserGeneralSettings {
+export interface UserGeneralConfig {
   fontSize: number;
   language: LocaleMode;
   neutralColor?: NeutralColors;