@lobehub/lobehub 2.0.0-next.72 → 2.0.0-next.73

package/src/store/chat/slices/plugin/actions/pluginTypes.ts

@@ -13,7 +13,7 @@ import { useToolStore } from '@/store/tool';
 import { safeParseJSON } from '@/utils/safeParseJSON';
 import { setNamespace } from '@/utils/storeDebug';
 
-import { displayMessageSelectors } from '../../message/selectors';
+import { dbMessageSelectors } from '../../message/selectors';
 
 const n = setNamespace('plugin');
 
@@ -94,17 +94,29 @@ export const pluginTypes: StateCreator<
 
     // if the plugin settings is not valid, then set the message with error type
     if (!result.valid) {
-      const updateResult = await messageService.updateMessageError(id, {
-        body: {
-          error: result.errors,
-          message: '[plugin] your settings is invalid with plugin manifest setting schema',
+      // Get message to extract sessionId/topicId
+      const message = dbMessageSelectors.getDbMessageById(id)(get());
+      const updateResult = await messageService.updateMessageError(
+        id,
+        {
+          body: {
+            error: result.errors,
+            message: '[plugin] your settings is invalid with plugin manifest setting schema',
+          },
+          message: t('response.PluginSettingsInvalid', { ns: 'error' }),
+          type: PluginErrorType.PluginSettingsInvalid as any,
         },
-        message: t('response.PluginSettingsInvalid', { ns: 'error' }),
-        type: PluginErrorType.PluginSettingsInvalid as any,
-      });
+        {
+          sessionId: message?.sessionId,
+          topicId: message?.topicId,
+        },
+      );
 
       if (updateResult?.success && updateResult.messages) {
-        get().replaceMessages(updateResult.messages);
+        get().replaceMessages(updateResult.messages, {
+          sessionId: message?.sessionId,
+          topicId: message?.topicId,
+        });
       }
       return;
     }
@@ -120,6 +132,9 @@ export const pluginTypes: StateCreator<
     } = get();
     let data: MCPToolCallResult | undefined;
 
+    // Get message to extract sessionId/topicId
+    const message = dbMessageSelectors.getDbMessageById(id)(get());
+
     try {
       const abortController = internal_togglePluginApiCalling(
         true,
@@ -140,9 +155,15 @@ export const pluginTypes: StateCreator<
 
       // ignore the aborted request error
       if (!err.message.includes('The user aborted a request.')) {
-        const result = await messageService.updateMessageError(id, error as any);
+        const result = await messageService.updateMessageError(id, error as any, {
+          sessionId: message?.sessionId,
+          topicId: message?.topicId,
+        });
         if (result?.success && result.messages) {
-          get().replaceMessages(result.messages);
+          get().replaceMessages(result.messages, {
+            sessionId: message?.sessionId,
+            topicId: message?.topicId,
+          });
         }
       }
     }
@@ -153,11 +174,13 @@ export const pluginTypes: StateCreator<
 
     if (!data) return;
 
+    const context = { sessionId: message?.sessionId, topicId: message?.topicId };
+
     await Promise.all([
-      optimisticUpdateMessageContent(id, data.content),
+      optimisticUpdateMessageContent(id, data.content, undefined, context),
       (async () => {
-        if (data.success) await optimisticUpdatePluginState(id, data.state);
-        else await optimisticUpdateMessagePluginError(id, data.error);
+        if (data.success) await optimisticUpdatePluginState(id, data.state, context);
+        else await optimisticUpdateMessagePluginError(id, data.error, context);
       })(),
     ]);
 
@@ -168,6 +191,9 @@ export const pluginTypes: StateCreator<
     const { optimisticUpdateMessageContent, internal_togglePluginApiCalling } = get();
     let data: string;
 
+    // Get message to extract sessionId/topicId
+    const message = dbMessageSelectors.getDbMessageById(id)(get());
+
     try {
       const abortController = internal_togglePluginApiCalling(
         true,
@@ -175,8 +201,6 @@ export const pluginTypes: StateCreator<
         n('fetchPlugin/start') as string,
       );
 
-      const message = displayMessageSelectors.getDisplayMessageById(id)(get());
-
       const res = await chatService.runPluginApi(payload, {
         signal: abortController?.signal,
         trace: { observationId: message?.observationId, traceId: message?.traceId },
@@ -193,9 +217,15 @@ export const pluginTypes: StateCreator<
 
       // ignore the aborted request error
       if (!err.message.includes('The user aborted a request.')) {
-        const result = await messageService.updateMessageError(id, error as any);
+        const result = await messageService.updateMessageError(id, error as any, {
+          sessionId: message?.sessionId,
+          topicId: message?.topicId,
+        });
         if (result?.success && result.messages) {
-          get().replaceMessages(result.messages);
+          get().replaceMessages(result.messages, {
+            sessionId: message?.sessionId,
+            topicId: message?.topicId,
+          });
         }
       }
 
@@ -206,7 +236,10 @@ export const pluginTypes: StateCreator<
     // 如果报错则结束了
     if (!data) return;
 
-    await optimisticUpdateMessageContent(id, data);
+    await optimisticUpdateMessageContent(id, data, undefined, {
+      sessionId: message?.sessionId,
+      topicId: message?.topicId,
+    });
 
     return data;
   },

package/src/store/chat/slices/plugin/actions/publicApi.ts

@@ -55,9 +55,14 @@ export const pluginPublicApi: StateCreator<
     const message = displayMessageSelectors.getDisplayMessageById(id)(get());
     if (!message || message.role !== 'tool' || !message.plugin) return;
 
+    const context = {
+      sessionId: message.sessionId,
+      topicId: message.topicId,
+    };
+
     // if there is error content, then clear the error
     if (!!message.pluginError) {
-      get().optimisticUpdateMessagePluginError(id, null);
+      get().optimisticUpdateMessagePluginError(id, null, context);
     }
 
     const payload: ChatToolPayload = { ...message.plugin, id: message.tool_call_id! };

package/src/store/chat/slices/plugin/actions/workflow.ts

@@ -46,16 +46,22 @@ export const pluginWorkflow: StateCreator<
   PluginWorkflowAction
 > = (set, get) => ({
   createAssistantMessageByPlugin: async (content, parentId) => {
+    // Get parent message to extract sessionId/topicId
+    const parentMessage = dbMessageSelectors.getDbMessageById(parentId)(get());
+
     const newMessage: CreateMessageParams = {
       content,
       parentId,
       role: 'assistant',
-      sessionId: get().activeId,
-      topicId: get().activeTopicId, // if there is activeTopicId，then add it to topicId
+      sessionId: parentMessage?.sessionId ?? get().activeId,
+      topicId: parentMessage?.topicId !== undefined ? parentMessage.topicId : get().activeTopicId,
     };
 
     const result = await messageService.createMessage(newMessage);
-    get().replaceMessages(result.messages);
+    get().replaceMessages(result.messages, {
+      sessionId: newMessage.sessionId,
+      topicId: newMessage.topicId,
+    });
   },
 
   triggerAIMessage: async ({ parentId, traceId, threadId, inPortalThread, inSearchWorkflow }) => {
@@ -69,6 +75,8 @@ export const pluginWorkflow: StateCreator<
       messages: chats,
       parentMessageId: parentId ?? chats.at(-1)!.id,
       parentMessageType: 'user',
+      sessionId: get().activeId,
+      topicId: get().activeTopicId,
       traceId,
       threadId,
       inPortalThread,
@@ -88,14 +96,17 @@ export const pluginWorkflow: StateCreator<
         parentId: assistantId,
         plugin: payload,
         role: 'tool',
-        sessionId: get().activeId,
+        sessionId: message.sessionId ?? get().activeId,
         tool_call_id: payload.id,
         threadId,
-        topicId: get().activeTopicId, // if there is activeTopicId，then add it to topicId
+        topicId: message.topicId !== undefined ? message.topicId : get().activeTopicId,
         groupId: message.groupId, // Propagate groupId from parent message for group chat
       };
 
-      const result = await get().optimisticCreateMessage(toolMessage);
+      const result = await get().optimisticCreateMessage(toolMessage, {
+        sessionId: toolMessage.sessionId,
+        topicId: toolMessage.topicId,
+      });
       if (!result) return;
 
       // trigger the plugin call

package/src/store/chat/slices/thread/action.ts

@@ -176,6 +176,8 @@ export const chatThreadMessage: StateCreator<
       messages,
       parentMessageId,
       parentMessageType: 'user',
+      sessionId: get().activeId,
+      topicId: get().activeTopicId,
       ragQuery: get().internal_shouldUseRAG() ? message : undefined,
       threadId: get().portalThreadId,
       inPortalThread: true,

package/src/store/global/action.test.ts

@@ -266,14 +266,14 @@ describe('createPreferenceSlice', () => {
     it('should switch back to chat', () => {
       const { result } = renderHook(() => useGlobalStore());
       const sessionId = 'session-id';
-      const router = { push: vi.fn() } as any;
+      const navigate = vi.fn();
 
       act(() => {
-        useGlobalStore.setState({ router });
+        useGlobalStore.setState({ navigate });
         result.current.switchBackToChat(sessionId);
       });
 
-      expect(router.push).toHaveBeenCalledWith('/chat?session=session-id');
+      expect(navigate).toHaveBeenCalledWith('/chat?session=session-id');
     });
   });
 

package/src/store/global/actions/workspacePane.ts

@@ -28,7 +28,8 @@ export const globalWorkspaceSlice: StateCreator<
   GlobalWorkspacePaneAction
 > = (set, get) => ({
   switchBackToChat: (sessionId) => {
-    get().router?.push(SESSION_CHAT_URL(sessionId || INBOX_SESSION_ID, get().isMobile));
+    const target = SESSION_CHAT_URL(sessionId || INBOX_SESSION_ID, get().isMobile);
+    get().navigate?.(target);
   },
 
   toggleAgentSystemRoleExpand: (agentId, expanded) => {

package/src/store/global/initialState.ts

@@ -1,5 +1,5 @@
 import type { ThemeMode } from 'antd-style';
-import { AppRouterInstance } from 'next/dist/shared/lib/app-router-context.shared-runtime';
+import type { NavigateFunction } from 'react-router-dom';
 
 import { DatabaseLoadingState, MigrationSQL, MigrationTableItem } from '@/types/clientDB';
 import { LocaleMode } from '@/types/locale';
@@ -11,6 +11,7 @@ export enum SidebarTabKey {
   Discover = 'discover',
   Files = 'knowledge',
   Image = 'image',
+  Knowledge = 'knowledge',
   Me = 'me',
   Setting = 'settings',
 }
@@ -121,10 +122,16 @@ export interface GlobalState {
    * 启动时为 Idle，完成为 Ready，报错为 Error
    */
   initClientDBStage: DatabaseLoadingState;
+  /**
+   * 应用水合状态标志
+   * 用于指示客户端状态是否已从 StoreInitialization 完成加载
+   * 默认为 false，StoreInitialization 完成后设置为 true
+   */
+  isAppHydrated: boolean;
   isMobile?: boolean;
   isStatusInit?: boolean;
   latestVersion?: string;
-  router?: AppRouterInstance;
+  navigate?: NavigateFunction;
   sidebarKey: SidebarTabKey;
   status: SystemStatus;
   statusStorage: AsyncLocalStorage<SystemStatus>;
@@ -163,6 +170,7 @@ export const INITIAL_STATUS = {
 
 export const initialState: GlobalState = {
   initClientDBStage: DatabaseLoadingState.Idle,
+  isAppHydrated: false,
   isMobile: false,
   isStatusInit: false,
   sidebarKey: SidebarTabKey.Chat,

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

@@ -30,6 +30,7 @@ export interface CommonAction {
     isLogin: boolean | undefined,
     serverConfig: GlobalServerConfig,
     options?: {
+      onError?: (error: any) => void;
       onSuccess: (data: UserInitializationState) => void;
     },
   ) => SWRResponse;
@@ -75,6 +76,9 @@ export const createCommonSlice: StateCreator<
       !!isLogin ? GET_USER_STATE_KEY : null,
       () => userService.getUserState(),
       {
+        onError: (error) => {
+          options?.onError?.(error);
+        },
         onSuccess: (data) => {
           options?.onSuccess?.(data);
 

package/src/app/[variants]/(main)/(mobile)/me/(home)/loading.tsx

@@ -1,38 +0,0 @@
-'use client';
-
-import { Skeleton } from 'antd';
-import { memo } from 'react';
-import { Flexbox } from 'react-layout-kit';
-
-import Divider from '@/components/Cell/Divider';
-import SkeletonLoading from '@/components/Loading/SkeletonLoading';
-
-const Loading = memo(() => {
-  return (
-    <>
-      <Flexbox align={'center'} gap={12} horizontal paddingBlock={12} paddingInline={12}>
-        <Skeleton.Avatar active shape={'circle'} size={48} />
-        <Skeleton.Button active block />
-      </Flexbox>
-      <Flexbox gap={4} horizontal paddingBlock={12} paddingInline={16}>
-        <Skeleton.Button active block />
-        <Skeleton.Button active block />
-        <Skeleton.Button active block />
-      </Flexbox>
-      <Divider />
-      <SkeletonLoading
-        active
-        paragraph={{ rows: 6, style: { marginBottom: 0 }, width: '100%' }}
-        title={false}
-      />
-      <Divider />
-      <SkeletonLoading
-        active
-        paragraph={{ rows: 3, style: { marginBottom: 0 }, width: '100%' }}
-        title={false}
-      />
-    </>
-  );
-});
-
-export default Loading;

package/src/app/[variants]/(main)/(mobile)/me/(home)/page.tsx

@@ -1,40 +0,0 @@
-import { redirect } from 'next/navigation';
-import { Center } from 'react-layout-kit';
-
-import BrandWatermark from '@/components/BrandWatermark';
-import { metadataModule } from '@/server/metadata';
-import { translation } from '@/server/translation';
-import { DynamicLayoutProps } from '@/types/next';
-import { RouteVariants } from '@/utils/server/routeVariants';
-
-import Category from './features/Category';
-import UserBanner from './features/UserBanner';
-
-export const generateMetadata = async (props: DynamicLayoutProps) => {
-  const locale = await RouteVariants.getLocale(props);
-  const { t } = await translation('common', locale);
-  return metadataModule.generate({
-    title: t('tab.me'),
-    url: '/me',
-  });
-};
-
-const Page = async (props: DynamicLayoutProps) => {
-  const isMobile = await RouteVariants.getIsMobile(props);
-
-  if (!isMobile) return redirect('/chat');
-
-  return (
-    <>
-      <UserBanner />
-      <Category />
-      <Center padding={16}>
-        <BrandWatermark />
-      </Center>
-    </>
-  );
-};
-
-Page.displayName = 'Me';
-
-export default Page;

package/src/app/[variants]/(main)/(mobile)/me/profile/loading.tsx

@@ -1,5 +0,0 @@
-import SkeletonLoading from '@/components/Loading/SkeletonLoading';
-
-export default () => {
-  return <SkeletonLoading paragraph={{ rows: 8 }} />;
-};

package/src/app/[variants]/(main)/(mobile)/me/profile/page.tsx

@@ -1,30 +0,0 @@
-import { redirect } from 'next/navigation';
-
-import { metadataModule } from '@/server/metadata';
-import { translation } from '@/server/translation';
-import { DynamicLayoutProps } from '@/types/next';
-import { RouteVariants } from '@/utils/server/routeVariants';
-
-import Category from './features/Category';
-
-export const generateMetadata = async (props: DynamicLayoutProps) => {
-  const locale = await RouteVariants.getLocale(props);
-  const { t } = await translation('auth', locale);
-  return metadataModule.generate({
-    description: t('header.desc'),
-    title: t('header.title'),
-    url: '/me/profile',
-  });
-};
-
-const Page = async (props: DynamicLayoutProps) => {
-  const isMobile = await RouteVariants.getIsMobile(props);
-
-  if (!isMobile) return redirect('/profile');
-
-  return <Category />;
-};
-
-Page.displayName = 'MeProfile';
-
-export default Page;

package/src/app/[variants]/(main)/(mobile)/me/settings/loading.tsx

@@ -1,5 +0,0 @@
-import SkeletonLoading from '@/components/Loading/SkeletonLoading';
-
-export default () => {
-  return <SkeletonLoading paragraph={{ rows: 8 }} />;
-};

package/src/app/[variants]/(main)/(mobile)/me/settings/page.tsx

@@ -1,30 +0,0 @@
-import { redirect } from 'next/navigation';
-
-import { metadataModule } from '@/server/metadata';
-import { translation } from '@/server/translation';
-import { DynamicLayoutProps } from '@/types/next';
-import { RouteVariants } from '@/utils/server/routeVariants';
-
-import Category from './features/Category';
-
-export const generateMetadata = async (props: DynamicLayoutProps) => {
-  const locale = await RouteVariants.getLocale(props);
-  const { t } = await translation('setting', locale);
-  return metadataModule.generate({
-    description: t('header.desc'),
-    title: t('header.title'),
-    url: '/me/settings',
-  });
-};
-
-const Page = async (props: DynamicLayoutProps) => {
-  const isMobile = await RouteVariants.getIsMobile(props);
-
-  if (!isMobile) return redirect('/settings');
-
-  return <Category />;
-};
-
-Page.displayName = 'MeSettings';
-
-export default Page;

package/src/app/[variants]/(main)/_layout/Desktop/SideBar/TopActions.tsx

@@ -1,106 +0,0 @@
-import { ActionIcon, ActionIconProps, Hotkey } from '@lobehub/ui';
-import { Compass, FolderClosed, MessageSquare, Palette } from 'lucide-react';
-import Link from 'next/link';
-import { memo } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Flexbox } from 'react-layout-kit';
-
-import { useGlobalStore } from '@/store/global';
-import { SidebarTabKey } from '@/store/global/initialState';
-import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
-import { useSessionStore } from '@/store/session';
-import { useUserStore } from '@/store/user';
-import { settingsSelectors } from '@/store/user/selectors';
-import { HotkeyEnum } from '@/types/hotkey';
-
-const ICON_SIZE: ActionIconProps['size'] = {
-  blockSize: 40,
-  size: 24,
-  strokeWidth: 2,
-};
-
-export interface TopActionProps {
-  isPinned?: boolean | null;
-  tab?: SidebarTabKey;
-}
-
-//  TODO Change icons
-const TopActions = memo<TopActionProps>(({ tab, isPinned }) => {
-  const { t } = useTranslation('common');
-  const switchBackToChat = useGlobalStore((s) => s.switchBackToChat);
-  const { showMarket, enableKnowledgeBase, showAiImage } =
-    useServerConfigStore(featureFlagsSelectors);
-  const hotkey = useUserStore(settingsSelectors.getHotkeyById(HotkeyEnum.NavigateToChat));
-
-  const isChatActive = tab === SidebarTabKey.Chat && !isPinned;
-  const isFilesActive = tab === SidebarTabKey.Files;
-  const isDiscoverActive = tab === SidebarTabKey.Discover;
-  const isImageActive = tab === SidebarTabKey.Image;
-
-  return (
-    <Flexbox gap={8}>
-      <Link
-        aria-label={t('tab.chat')}
-        href={'/chat'}
-        onClick={(e) => {
-          // If Cmd key is pressed, let the default link behavior happen (open in new tab)
-          if (e.metaKey || e.ctrlKey) {
-            return;
-          }
-
-          // Otherwise, prevent default and switch session within the current tab
-          e.preventDefault();
-          switchBackToChat(useSessionStore.getState().activeId);
-        }}
-      >
-        <ActionIcon
-          active={isChatActive}
-          icon={MessageSquare}
-          size={ICON_SIZE}
-          title={
-            <Flexbox align={'center'} gap={8} horizontal justify={'space-between'}>
-              <span>{t('tab.chat')}</span>
-              <Hotkey inverseTheme keys={hotkey} />
-            </Flexbox>
-          }
-          tooltipProps={{ placement: 'right' }}
-        />
-      </Link>
-      {enableKnowledgeBase && (
-        <Link aria-label={t('tab.knowledgeBase')} href={'/knowledge'}>
-          <ActionIcon
-            active={isFilesActive}
-            icon={FolderClosed}
-            size={ICON_SIZE}
-            title={t('tab.knowledgeBase')}
-            tooltipProps={{ placement: 'right' }}
-          />
-        </Link>
-      )}
-      {showAiImage && (
-        <Link aria-label={t('tab.aiImage')} href={'/image'}>
-          <ActionIcon
-            active={isImageActive}
-            icon={Palette}
-            size={ICON_SIZE}
-            title={t('tab.aiImage')}
-            tooltipProps={{ placement: 'right' }}
-          />
-        </Link>
-      )}
-      {showMarket && (
-        <Link aria-label={t('tab.discover')} href={'/discover'}>
-          <ActionIcon
-            active={isDiscoverActive}
-            icon={Compass}
-            size={ICON_SIZE}
-            title={t('tab.discover')}
-            tooltipProps={{ placement: 'right' }}
-          />
-        </Link>
-      )}
-    </Flexbox>
-  );
-});
-
-export default TopActions;

package/src/app/[variants]/(main)/changelog/layout.tsx

@@ -1,10 +0,0 @@
-import ServerLayout from '@/components/server/ServerLayout';
-
-import Desktop from './_layout/Desktop';
-import Mobile from './_layout/Mobile';
-
-const MainLayout = ServerLayout({ Desktop, Mobile });
-
-MainLayout.displayName = 'ChangelogLayout';
-
-export default MainLayout;

package/src/app/[variants]/(main)/changelog/modal/page.tsx

@@ -1,23 +0,0 @@
-'use client';
-
-import { useEffect } from 'react';
-
-import { useQueryRoute } from '@/hooks/useQueryRoute';
-
-/**
- * @description: Changelog Modal (intercepting routes fallback when hard refresh)
- * @example: /changelog/modal => /changelog
- * @refs: https://github.com/lobehub/lobe-chat/discussions/2295#discussioncomment-9290942
- */
-
-const ChangelogModal = () => {
-  const router = useQueryRoute();
-
-  useEffect(() => {
-    router.replace('/changelog');
-  }, []);
-
-  return null;
-};
-
-export default ChangelogModal;