@lobehub/lobehub 2.0.0-next.67 → 2.0.0-next.69

package/src/hooks/useCheckPluginsIsInstalled.ts

@@ -1,10 +1,7 @@
-import { useGlobalStore } from '@/store/global';
-import { systemStatusSelectors } from '@/store/global/selectors';
 import { useToolStore } from '@/store/tool';
 
 export const useCheckPluginsIsInstalled = (plugins: string[]) => {
-  const isDBInited = useGlobalStore(systemStatusSelectors.isDBInited);
   const checkPluginsIsInstalled = useToolStore((s) => s.useCheckPluginsIsInstalled);
 
-  checkPluginsIsInstalled(isDBInited, plugins);
+  checkPluginsIsInstalled(true, plugins);
 };

package/src/hooks/useFetchGroups.ts

@@ -1,13 +1,10 @@
 import { useChatGroupStore } from '@/store/chatGroup';
-import { useGlobalStore } from '@/store/global';
-import { systemStatusSelectors } from '@/store/global/selectors';
 import { useUserStore } from '@/store/user';
 import { authSelectors } from '@/store/user/slices/auth/selectors';
 
 export const useFetchGroups = () => {
-  const isDBInited = useGlobalStore(systemStatusSelectors.isDBInited);
   const isLogin = useUserStore(authSelectors.isLogin);
   const useFetchGroups = useChatGroupStore((s) => s.useFetchGroups);
 
-  useFetchGroups(isDBInited ?? false, isLogin ?? false);
+  useFetchGroups(true, isLogin ?? false);
 };

package/src/hooks/useFetchInstalledPlugins.ts

@@ -1,10 +1,7 @@
-import { useGlobalStore } from '@/store/global';
-import { systemStatusSelectors } from '@/store/global/selectors';
 import { useToolStore } from '@/store/tool';
 
 export const useFetchInstalledPlugins = () => {
-  const isDBInited = useGlobalStore(systemStatusSelectors.isDBInited);
   const [useFetchInstalledPlugins] = useToolStore((s) => [s.useFetchInstalledPlugins]);
 
-  return useFetchInstalledPlugins(isDBInited);
+  return useFetchInstalledPlugins(true);
 };

package/src/hooks/useFetchMessages.ts

@@ -1,13 +1,10 @@
 import { useEffect } from 'react';
 
 import { useChatStore } from '@/store/chat';
-import { useGlobalStore } from '@/store/global';
-import { systemStatusSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 import { sessionSelectors } from '@/store/session/selectors';
 
 export const useFetchMessages = () => {
-  const isDBInited = useGlobalStore(systemStatusSelectors.isDBInited);
   const sessionId = useSessionStore((s) => s.activeId);
   const [activeTopicId, useFetchMessages, internal_updateActiveSessionType] = useChatStore((s) => [
     s.activeTopicId,
@@ -29,5 +26,5 @@ export const useFetchMessages = () => {
     }
   }, [currentSession?.id, currentSession?.type, internal_updateActiveSessionType]);
 
-  useFetchMessages(isDBInited, sessionId, activeTopicId, isGroupSession ? 'group' : 'session');
+  useFetchMessages(true, sessionId, activeTopicId, isGroupSession ? 'group' : 'session');
 };

package/src/hooks/useFetchSessions.ts

@@ -1,13 +1,10 @@
-import { useGlobalStore } from '@/store/global';
-import { systemStatusSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 import { useUserStore } from '@/store/user';
 import { authSelectors } from '@/store/user/slices/auth/selectors';
 
 export const useFetchSessions = () => {
-  const isDBInited = useGlobalStore(systemStatusSelectors.isDBInited);
   const isLogin = useUserStore(authSelectors.isLogin);
   const useFetchSessions = useSessionStore((s) => s.useFetchSessions);
 
-  useFetchSessions(isDBInited, isLogin);
+  useFetchSessions(true, isLogin);
 };

package/src/hooks/useFetchThreads.ts

@@ -1,11 +1,7 @@
 import { useChatStore } from '@/store/chat';
-import { useGlobalStore } from '@/store/global';
-import { systemStatusSelectors } from '@/store/global/selectors';
 
 export const useFetchThreads = (activeTopicId?: string) => {
-  const isDBInited = useGlobalStore(systemStatusSelectors.isDBInited);
-
   const [useFetchThreads] = useChatStore((s) => [s.useFetchThreads]);
 
-  useFetchThreads(isDBInited, activeTopicId);
+  useFetchThreads(true, activeTopicId);
 };

package/src/hooks/useFetchTopics.ts

@@ -1,6 +1,4 @@
 import { useChatStore } from '@/store/chat';
-import { useGlobalStore } from '@/store/global';
-import { systemStatusSelectors } from '@/store/global/selectors';
 import { useSessionStore } from '@/store/session';
 
 /**
@@ -9,7 +7,6 @@ import { useSessionStore } from '@/store/session';
 export const useFetchTopics = () => {
   const [sessionId] = useSessionStore((s) => [s.activeId]);
   const useFetchTopics = useChatStore((s) => s.useFetchTopics);
-  const isDBInited = useGlobalStore(systemStatusSelectors.isDBInited);
 
-  useFetchTopics(isDBInited, sessionId);
+  useFetchTopics(true, sessionId);
 };

package/src/hooks/useInterceptingRoutes.test.ts

@@ -42,26 +42,7 @@ vi.mock('@/store/global', () => ({
     setState: vi.fn(),
   },
 }));
-let isDeprecatedEdition = false;
-vi.mock('@/const/version', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('@/const/version')>();
-  return {
-    ...actual,
-    get isDeprecatedEdition() {
-      return isDeprecatedEdition;
-    },
-  };
-});
-
 describe('useOpenChatSettings', () => {
-  it('should handle inbox session id correctly', () => {
-    isDeprecatedEdition = true;
-    vi.mocked(useSessionStore).mockReturnValue(INBOX_SESSION_ID);
-    const { result } = renderHook(() => useOpenChatSettings());
-
-    expect(result.current()).toBe('/settings?active=agent'); // Assuming openSettings returns a function
-    isDeprecatedEdition = false;
-  });
 
   it('should handle mobile route for chat settings', () => {
     vi.mocked(useSessionStore).mockReturnValue('123');

package/src/hooks/useInterceptingRoutes.ts

@@ -1,11 +1,9 @@
 import { useMemo } from 'react';
 
-import { INBOX_SESSION_ID } from '@/const/session';
-import { isDeprecatedEdition } from '@/const/version';
 import { useIsMobile } from '@/hooks/useIsMobile';
 import { useQueryRoute } from '@/hooks/useQueryRoute';
 import { useAgentStore } from '@/store/agent';
-import { ChatSettingsTabs, SettingsTabs } from '@/store/global/initialState';
+import { ChatSettingsTabs } from '@/store/global/initialState';
 import { useSessionStore } from '@/store/session';
 
 export const useOpenChatSettings = (tab: ChatSettingsTabs = ChatSettingsTabs.Meta) => {
@@ -15,10 +13,6 @@ export const useOpenChatSettings = (tab: ChatSettingsTabs = ChatSettingsTabs.Met
   const router = useQueryRoute();
 
   return useMemo(() => {
-    if (isDeprecatedEdition && activeId === INBOX_SESSION_ID) {
-      return () => router.push(`/settings?active=${SettingsTabs.Agent}`);
-    }
-
     if (isMobile) return () => router.push('/chat/settings', { query: { session: activeId } });
 
     return () => {

package/src/layout/GlobalProvider/StoreInitialization.tsx

@@ -1,16 +1,15 @@
 'use client';
 
+import { enableNextAuth } from '@lobechat/const';
 import { useRouter } from 'next/navigation';
 import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { createStoreUpdater } from 'zustand-utils';
 
-import { enableNextAuth } from '@/const/auth';
 import { useIsMobile } from '@/hooks/useIsMobile';
 import { useAgentStore } from '@/store/agent';
 import { useAiInfraStore } from '@/store/aiInfra';
 import { useGlobalStore } from '@/store/global';
-import { systemStatusSelectors } from '@/store/global/selectors';
 import { useServerConfigStore } from '@/store/serverConfig';
 import { serverConfigSelectors } from '@/store/serverConfig/selectors';
 import { useUserStore } from '@/store/user';
@@ -54,8 +53,7 @@ const StoreInitialization = memo(() => {
    * IMPORTANT: Explicitly convert to boolean to avoid passing null/undefined downstream,
    * which would cause unnecessary API requests with invalid login state.
    */
-  const isDBInited = useGlobalStore(systemStatusSelectors.isDBInited);
-  const isLoginOnInit = isDBInited ? Boolean(enableNextAuth ? isSignedIn : isLogin) : false;
+  const isLoginOnInit = Boolean(enableNextAuth ? isSignedIn : isLogin);
 
   // init inbox agent and default agent config
   useInitAgentStore(isLoginOnInit, serverConfig.defaultAgent?.config);

package/src/services/_auth.ts

@@ -1,4 +1,4 @@
-import { LOBE_CHAT_AUTH_HEADER, isDeprecatedEdition } from '@lobechat/const';
+import { LOBE_CHAT_AUTH_HEADER } from '@lobechat/const';
 import {
   AWSBedrockKeyVault,
   AzureOpenAIKeyVault,
@@ -119,16 +119,7 @@ interface AuthParams {
 }
 
 export const createPayloadWithKeyVaults = (provider: string) => {
-  let keyVaults = {};
-
-  // TODO: remove this condition in V2.0
-  if (isDeprecatedEdition) {
-    keyVaults = keyVaultsConfigSelectors.getVaultByProvider(provider as any)(
-      useUserStore.getState(),
-    );
-  } else {
-    keyVaults = aiProviderSelectors.providerKeyVaults(provider)(useAiInfraStore.getState()) || {};
-  }
+  let keyVaults = aiProviderSelectors.providerKeyVaults(provider)(useAiInfraStore.getState()) || {};
 
   const runtimeProvider = resolveRuntimeProvider(provider);
 

package/src/services/_header.ts

@@ -4,7 +4,6 @@ import {
   OPENAI_API_KEY_HEADER_KEY,
   OPENAI_END_POINT,
 } from '@/const/fetch';
-import { isDeprecatedEdition } from '@/const/version';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { useUserStore } from '@/store/user';
 import { keyVaultsConfigSelectors } from '@/store/user/selectors';
@@ -17,16 +16,9 @@ import { keyVaultsConfigSelectors } from '@/store/user/selectors';
 export const createHeaderWithOpenAI = (header?: HeadersInit): HeadersInit => {
   const state = useUserStore.getState();
 
-  let keyVaults: Record<string, any> = {};
+  const keyVaults: Record<string, any> =
+    aiProviderSelectors.providerKeyVaults('openai')(useAiInfraStore.getState()) || {};
 
-  // TODO: remove this condition in V2.0
-  if (isDeprecatedEdition) {
-    keyVaults = keyVaultsConfigSelectors.getVaultByProvider('openai' as any)(
-      useUserStore.getState(),
-    );
-  } else {
-    keyVaults = aiProviderSelectors.providerKeyVaults('openai')(useAiInfraStore.getState()) || {};
-  }
   // eslint-disable-next-line no-undef
   return {
     ...header,

package/src/services/chat/chat.test.ts

@@ -278,15 +278,16 @@ describe('ChatService', () => {
 
     describe('should handle content correctly for vision models', () => {
       it('should include image content when with vision model', async () => {
+        // Mock helpers to return true for vision support (must be first)
+        const helpers = await import('./helper');
+        vi.spyOn(helpers, 'isCanUseVision').mockReturnValue(true);
+
         // Mock utility functions used in processImageList
         const { parseDataUri } = await import('@lobechat/utils/uriParser');
         const { isDesktopLocalStaticServerUrl } = await import('@lobechat/utils/url');
         vi.mocked(parseDataUri).mockReturnValue({ type: 'url', base64: null, mimeType: null });
         vi.mocked(isDesktopLocalStaticServerUrl).mockReturnValue(false); // Not a local URL
 
-        // Mock aiModelSelectors to return true for vision support
-        vi.spyOn(aiModelSelectors, 'isModelSupportVision').mockReturnValue(() => true);
-
         const messages = [
           {
             content: 'Hello',
@@ -315,13 +316,23 @@ describe('ChatService', () => {
               {
                 content: [
                   {
-                    text: 'Hello',
+                    text: `Hello
+
+<!-- SYSTEM CONTEXT (NOT PART OF USER QUERY) -->
+<context.instruction>following part contains context information injected by the system. Please follow these instructions:
+
+1. Always prioritize handling user-visible content.
+2. the context is only required when user's queries rely on it.
+</context.instruction>
+<files_info>
+<images>
+<images_docstring>here are user upload images you can refer to</images_docstring>
+<image name="abc.png" url="http://example.com/image.jpg"></image>
+</images>
+</files_info>
+<!-- END SYSTEM CONTEXT -->`,
                     type: 'text',
                   },
-                  {
-                    image_url: { detail: 'auto', url: 'http://example.com/image.jpg' },
-                    type: 'image_url',
-                  },
                 ],
                 role: 'user',
               },
@@ -417,7 +428,21 @@ describe('ChatService', () => {
               {
                 content: [
                   {
-                    text: 'Hello',
+                    text: `Hello
+
+<!-- SYSTEM CONTEXT (NOT PART OF USER QUERY) -->
+<context.instruction>following part contains context information injected by the system. Please follow these instructions:
+
+1. Always prioritize handling user-visible content.
+2. the context is only required when user's queries rely on it.
+</context.instruction>
+<files_info>
+<images>
+<images_docstring>here are user upload images you can refer to</images_docstring>
+<image name="local-image.png" url="http://127.0.0.1:3000/uploads/image.png"></image>
+</images>
+</files_info>
+<!-- END SYSTEM CONTEXT -->`,
                     type: 'text',
                   },
                   {
@@ -432,6 +457,8 @@ describe('ChatService', () => {
               },
             ],
             model: 'gpt-4-vision-preview',
+            enabledSearch: undefined,
+            tools: undefined,
           },
           undefined,
         );
@@ -491,7 +518,21 @@ describe('ChatService', () => {
               {
                 content: [
                   {
-                    text: 'Hello',
+                    text: `Hello
+
+<!-- SYSTEM CONTEXT (NOT PART OF USER QUERY) -->
+<context.instruction>following part contains context information injected by the system. Please follow these instructions:
+
+1. Always prioritize handling user-visible content.
+2. the context is only required when user's queries rely on it.
+</context.instruction>
+<files_info>
+<images>
+<images_docstring>here are user upload images you can refer to</images_docstring>
+<image name="remote-image.jpg" url="https://example.com/remote-image.jpg"></image>
+</images>
+</files_info>
+<!-- END SYSTEM CONTEXT -->`,
                     type: 'text',
                   },
                   {
@@ -503,6 +544,8 @@ describe('ChatService', () => {
               },
             ],
             model: 'gpt-4-vision-preview',
+            enabledSearch: undefined,
+            tools: undefined,
           },
           undefined,
         );