@lobehub/lobehub 2.0.0-next.35 → 2.0.0-next.36

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

@@ -24,7 +24,7 @@ import { merge } from '@/utils/merge';
 import { safeParseJSON } from '@/utils/safeParseJSON';
 import { setNamespace } from '@/utils/storeDebug';
 
-import { chatSelectors } from '../message/selectors';
+import { dbMessageSelectors, displayMessageSelectors } from '../message/selectors';
 import { threadSelectors } from '../thread/selectors';
 
 const n = setNamespace('plugin');
@@ -103,9 +103,9 @@ export const chatPlugin: StateCreator<
   },
 
   fillPluginMessageContent: async (id, content, triggerAiMessage) => {
-    const { triggerAIMessage, internal_updateMessageContent } = get();
+    const { triggerAIMessage, optimisticUpdateMessageContent } = get();
 
-    await internal_updateMessageContent(id, content);
+    await optimisticUpdateMessageContent(id, content);
 
     if (triggerAiMessage) await triggerAIMessage({ parentId: id });
   },
@@ -161,12 +161,12 @@ export const chatPlugin: StateCreator<
   },
 
   reInvokeToolMessage: async (id) => {
-    const message = chatSelectors.getMessageById(id)(get());
+    const message = displayMessageSelectors.getDisplayMessageById(id)(get());
     if (!message || message.role !== 'tool' || !message.plugin) return;
 
     // if there is error content, then clear the error
     if (!!message.pluginError) {
-      get().internal_updateMessagePluginError(id, null);
+      get().optimisticUpdateMessagePluginError(id, null);
     }
 
     const payload: ChatToolPayload = { ...message.plugin, id: message.tool_call_id! };
@@ -175,13 +175,16 @@ export const chatPlugin: StateCreator<
   },
 
   triggerAIMessage: async ({ parentId, traceId, threadId, inPortalThread, inSearchWorkflow }) => {
-    const { internal_coreProcessMessage } = get();
+    const { internal_execAgentRuntime } = get();
 
     const chats = inPortalThread
       ? threadSelectors.portalAIChatsWithHistoryConfig(get())
-      : chatSelectors.mainAIChatsWithHistoryConfig(get());
+      : displayMessageSelectors.mainAIChatsWithHistoryConfig(get());
 
-    await internal_coreProcessMessage(chats, parentId ?? chats.at(-1)!.id, {
+    await internal_execAgentRuntime({
+      messages: chats,
+      parentMessageId: parentId ?? chats.at(-1)!.id,
+      parentMessageType: 'user',
       traceId,
       threadId,
       inPortalThread,
@@ -190,11 +193,11 @@ export const chatPlugin: StateCreator<
   },
 
   summaryPluginContent: async (id) => {
-    const message = chatSelectors.getMessageById(id)(get());
+    const message = displayMessageSelectors.getDisplayMessageById(id)(get());
     if (!message || message.role !== 'tool') return;
 
-    await get().internal_coreProcessMessage(
-      [
+    await get().internal_execAgentRuntime({
+      messages: [
         {
           role: 'assistant',
           content: '作为一名总结专家，请结合以上系统提示词，将以下内容进行总结：',
@@ -207,12 +210,13 @@ export const chatPlugin: StateCreator<
           tool_call_id: undefined,
         },
       ] as UIChatMessage[],
-      message.id,
-    );
+      parentMessageId: message.id,
+      parentMessageType: 'assistant',
+    });
   },
 
   triggerToolCalls: async (assistantId, { threadId, inPortalThread, inSearchWorkflow } = {}) => {
-    const message = chatSelectors.getMessageById(assistantId)(get());
+    const message = displayMessageSelectors.getDisplayMessageById(assistantId)(get());
     if (!message || !message.tools) return;
 
     let shouldCreateMessage = false;
@@ -230,7 +234,7 @@ export const chatPlugin: StateCreator<
         groupId: message.groupId, // Propagate groupId from parent message for group chat
       };
 
-      const result = await get().internal_createMessage(toolMessage);
+      const result = await get().optimisticCreateMessage(toolMessage);
       if (!result) return;
 
       // trigger the plugin call
@@ -249,7 +253,7 @@ export const chatPlugin: StateCreator<
     // only default type tool calls should trigger AI message
     if (!shouldCreateMessage) return;
 
-    const traceId = chatSelectors.getTraceIdByMessageId(latestToolId)(get());
+    const traceId = dbMessageSelectors.getTraceIdByDbMessageId(latestToolId)(get());
 
     await get().triggerAIMessage({ traceId, threadId, inPortalThread, inSearchWorkflow });
   },
@@ -271,10 +275,12 @@ export const chatPlugin: StateCreator<
 
   updatePluginArguments: async (id, value, replace = false) => {
     const { refreshMessages } = get();
-    const toolMessage = chatSelectors.getMessageById(id)(get());
+    const toolMessage = displayMessageSelectors.getDisplayMessageById(id)(get());
     if (!toolMessage || !toolMessage?.tool_call_id) return;
 
-    let assistantMessage = chatSelectors.getMessageById(toolMessage?.parentId || '')(get());
+    let assistantMessage = displayMessageSelectors.getDisplayMessageById(
+      toolMessage?.parentId || '',
+    )(get());
 
     const prevArguments = toolMessage?.plugin?.arguments;
     const prevJson = safeParseJSON(prevArguments || '');
@@ -296,7 +302,7 @@ export const chatPlugin: StateCreator<
         tool_call_id: toolMessage?.tool_call_id,
         value: { arguments: JSON.stringify(nextValue) },
       });
-      assistantMessage = chatSelectors.getMessageById(assistantMessage?.id)(get());
+      assistantMessage = displayMessageSelectors.getDisplayMessageById(assistantMessage?.id)(get());
     }
 
     const updateAssistantMessage = async () => {
@@ -315,7 +321,7 @@ export const chatPlugin: StateCreator<
   },
 
   internal_addToolToAssistantMessage: async (id, tool) => {
-    const assistantMessage = chatSelectors.getMessageById(id)(get());
+    const assistantMessage = displayMessageSelectors.getDisplayMessageById(id)(get());
     if (!assistantMessage) return;
 
     const { internal_dispatchMessage, internal_refreshToUpdateMessageTools } = get();
@@ -329,7 +335,7 @@ export const chatPlugin: StateCreator<
   },
 
   internal_removeToolToAssistantMessage: async (id, tool_call_id) => {
-    const message = chatSelectors.getMessageById(id)(get());
+    const message = displayMessageSelectors.getDisplayMessageById(id)(get());
     if (!message || !tool_call_id) return;
 
     const { internal_dispatchMessage, internal_refreshToUpdateMessageTools } = get();
@@ -341,7 +347,7 @@ export const chatPlugin: StateCreator<
     await internal_refreshToUpdateMessageTools(id);
   },
   internal_refreshToUpdateMessageTools: async (id) => {
-    const message = chatSelectors.getMessageById(id)(get());
+    const message = dbMessageSelectors.getDbMessageById(id)(get());
     if (!message || !message.tools) return;
 
     const { internal_toggleMessageLoading, replaceMessages } = get();
@@ -363,7 +369,7 @@ export const chatPlugin: StateCreator<
   },
 
   internal_callPluginApi: async (id, payload) => {
-    const { internal_updateMessageContent, internal_togglePluginApiCalling } = get();
+    const { optimisticUpdateMessageContent, internal_togglePluginApiCalling } = get();
     let data: string;
 
     try {
@@ -373,7 +379,7 @@ export const chatPlugin: StateCreator<
         n('fetchPlugin/start') as string,
       );
 
-      const message = chatSelectors.getMessageById(id)(get());
+      const message = displayMessageSelectors.getDisplayMessageById(id)(get());
 
       const res = await chatService.runPluginApi(payload, {
         signal: abortController?.signal,
@@ -404,7 +410,7 @@ export const chatPlugin: StateCreator<
     // 如果报错则结束了
     if (!data) return;
 
-    await internal_updateMessageContent(id, data);
+    await optimisticUpdateMessageContent(id, data);
 
     return data;
   },
@@ -435,7 +441,7 @@ export const chatPlugin: StateCreator<
   },
   invokeMCPTypePlugin: async (id, payload) => {
     const {
-      internal_updateMessageContent,
+      optimisticUpdateMessageContent,
       internal_togglePluginApiCalling,
       internal_constructToolsCallingContext,
     } = get();
@@ -472,7 +478,7 @@ export const chatPlugin: StateCreator<
     // 如果报错则结束了
     if (!data) return;
 
-    await internal_updateMessageContent(id, data);
+    await optimisticUpdateMessageContent(id, data);
 
     return data;
   },
@@ -523,7 +529,7 @@ export const chatPlugin: StateCreator<
   },
 
   internal_constructToolsCallingContext: (id: string) => {
-    const message = chatSelectors.getMessageById(id)(get());
+    const message = displayMessageSelectors.getDisplayMessageById(id)(get());
     if (!message) return;
 
     return {

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

@@ -620,9 +620,9 @@ describe('thread action', () => {
         const refreshMessagesSpy = vi.spyOn(result.current, 'refreshMessages').mockResolvedValue();
         const openThreadSpy = vi.spyOn(result.current, 'openThreadInPortal');
         const coreProcessSpy = vi
-          .spyOn(result.current, 'internal_coreProcessMessage')
+          .spyOn(result.current, 'internal_execAgentRuntime')
           .mockResolvedValue();
-        vi.spyOn(result.current, 'internal_createTmpMessage');
+        vi.spyOn(result.current, 'optimisticCreateTmpMessage');
         vi.spyOn(result.current, 'internal_toggleMessageLoading');
 
         await act(async () => {
@@ -659,7 +659,7 @@ describe('thread action', () => {
         });
 
         const createTmpSpy = vi
-          .spyOn(result.current, 'internal_createTmpMessage')
+          .spyOn(result.current, 'optimisticCreateTmpMessage')
           .mockReturnValue('temp-msg-id');
 
         vi.spyOn(result.current, 'createThread').mockResolvedValue({
@@ -669,7 +669,7 @@ describe('thread action', () => {
         vi.spyOn(result.current, 'refreshThreads').mockResolvedValue();
         vi.spyOn(result.current, 'refreshMessages').mockResolvedValue();
         vi.spyOn(result.current, 'openThreadInPortal');
-        vi.spyOn(result.current, 'internal_coreProcessMessage').mockResolvedValue();
+        vi.spyOn(result.current, 'internal_execAgentRuntime').mockResolvedValue();
         vi.spyOn(result.current, 'internal_toggleMessageLoading');
 
         await act(async () => {
@@ -738,8 +738,8 @@ describe('thread action', () => {
             useChatStore.setState({ portalThreadId: threadId });
           });
         });
-        vi.spyOn(result.current, 'internal_coreProcessMessage').mockResolvedValue();
-        vi.spyOn(result.current, 'internal_createTmpMessage').mockReturnValue('temp-msg-id');
+        vi.spyOn(result.current, 'internal_execAgentRuntime').mockResolvedValue();
+        vi.spyOn(result.current, 'optimisticCreateTmpMessage').mockReturnValue('temp-msg-id');
         vi.spyOn(result.current, 'internal_toggleMessageLoading');
 
         const summaryTitleSpy = vi.spyOn(result.current, 'summaryThreadTitle').mockResolvedValue();
@@ -763,12 +763,12 @@ describe('thread action', () => {
         });
 
         const createMessageSpy = vi
-          .spyOn(result.current, 'internal_createMessage')
+          .spyOn(result.current, 'optimisticCreateMessage')
           .mockResolvedValue({ id: 'new-msg-id', messages: [] });
         const coreProcessSpy = vi
-          .spyOn(result.current, 'internal_coreProcessMessage')
+          .spyOn(result.current, 'internal_execAgentRuntime')
           .mockResolvedValue();
-        vi.spyOn(result.current, 'internal_createTmpMessage').mockReturnValue('temp-msg-id');
+        vi.spyOn(result.current, 'optimisticCreateTmpMessage').mockReturnValue('temp-msg-id');
         vi.spyOn(result.current, 'internal_toggleMessageLoading');
 
         await act(async () => {
@@ -785,9 +785,10 @@ describe('thread action', () => {
         );
 
         expect(coreProcessSpy).toHaveBeenCalledWith(
-          expect.any(Array),
-          'new-msg-id',
           expect.objectContaining({
+            messages: expect.any(Array),
+            parentMessageId: 'new-msg-id',
+            parentMessageType: 'user',
             inPortalThread: true,
             threadId: 'existing-thread-id',
           }),
@@ -803,12 +804,12 @@ describe('thread action', () => {
           });
         });
 
-        vi.spyOn(result.current, 'internal_createMessage').mockResolvedValue({
+        vi.spyOn(result.current, 'optimisticCreateMessage').mockResolvedValue({
           id: 'new-msg-id',
           messages: [],
         });
-        vi.spyOn(result.current, 'internal_coreProcessMessage').mockResolvedValue();
-        vi.spyOn(result.current, 'internal_createTmpMessage').mockReturnValue('temp-msg-id');
+        vi.spyOn(result.current, 'internal_execAgentRuntime').mockResolvedValue();
+        vi.spyOn(result.current, 'optimisticCreateTmpMessage').mockReturnValue('temp-msg-id');
         vi.spyOn(result.current, 'internal_toggleMessageLoading');
 
         const summaryTitleSpy = vi.spyOn(result.current, 'summaryThreadTitle').mockResolvedValue();
@@ -836,12 +837,12 @@ describe('thread action', () => {
           });
         });
 
-        vi.spyOn(result.current, 'internal_createMessage').mockResolvedValue({
+        vi.spyOn(result.current, 'optimisticCreateMessage').mockResolvedValue({
           id: 'new-msg-id',
           messages: [],
         });
-        vi.spyOn(result.current, 'internal_coreProcessMessage').mockResolvedValue();
-        vi.spyOn(result.current, 'internal_createTmpMessage').mockReturnValue('temp-msg-id');
+        vi.spyOn(result.current, 'internal_execAgentRuntime').mockResolvedValue();
+        vi.spyOn(result.current, 'optimisticCreateTmpMessage').mockReturnValue('temp-msg-id');
         vi.spyOn(result.current, 'internal_toggleMessageLoading');
 
         await act(async () => {
@@ -861,15 +862,15 @@ describe('thread action', () => {
         });
 
         vi.spyOn(result.current, 'internal_shouldUseRAG').mockReturnValue(true);
-        vi.spyOn(result.current, 'internal_createMessage').mockResolvedValue({
+        vi.spyOn(result.current, 'optimisticCreateMessage').mockResolvedValue({
           id: 'new-msg-id',
           messages: [],
         });
-        vi.spyOn(result.current, 'internal_createTmpMessage').mockReturnValue('temp-msg-id');
+        vi.spyOn(result.current, 'optimisticCreateTmpMessage').mockReturnValue('temp-msg-id');
         vi.spyOn(result.current, 'internal_toggleMessageLoading');
 
         const coreProcessSpy = vi
-          .spyOn(result.current, 'internal_coreProcessMessage')
+          .spyOn(result.current, 'internal_execAgentRuntime')
           .mockResolvedValue();
 
         await act(async () => {
@@ -877,9 +878,10 @@ describe('thread action', () => {
         });
 
         expect(coreProcessSpy).toHaveBeenCalledWith(
-          expect.any(Array),
-          'new-msg-id',
           expect.objectContaining({
+            messages: expect.any(Array),
+            parentMessageId: 'new-msg-id',
+            parentMessageType: 'user',
             inPortalThread: true,
             ragQuery: 'test with rag',
             threadId: 'existing-thread-id',
@@ -899,20 +901,15 @@ describe('thread action', () => {
         });
       });
 
-      const resendSpy = vi.spyOn(result.current, 'internal_resendMessage').mockResolvedValue();
+      const resendSpy = vi
+        .spyOn(result.current, 'regenerateUserMessage')
+        .mockResolvedValue(undefined);
 
       await act(async () => {
         await result.current.resendThreadMessage('message-id');
       });
 
-      expect(resendSpy).toHaveBeenCalledWith(
-        'message-id',
-        expect.objectContaining({
-          inPortalThread: true,
-          messages: expect.any(Array),
-          threadId: 'thread-id',
-        }),
-      );
+      expect(resendSpy).toHaveBeenCalledWith('message-id', {});
     });
   });
 

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

@@ -100,7 +100,7 @@ export const chatThreadMessage: StateCreator<
   },
   sendThreadMessage: async ({ message }) => {
     const {
-      internal_coreProcessMessage,
+      internal_execAgentRuntime,
       activeTopicId,
       activeId,
       threadStartMessageId,
@@ -132,7 +132,7 @@ export const chatThreadMessage: StateCreator<
     if (!portalThreadId) {
       if (!threadStartMessageId) return;
       // we need to create a temp message for optimistic update
-      tempMessageId = get().internal_createTmpMessage({
+      tempMessageId = get().optimisticCreateTmpMessage({
         ...newMessage,
         threadId: THREAD_DRAFT_ID,
       });
@@ -155,10 +155,10 @@ export const chatThreadMessage: StateCreator<
     } else {
       // if there is a thread, just append message
       // we need to create a temp message for optimistic update
-      tempMessageId = get().internal_createTmpMessage(newMessage);
+      tempMessageId = get().optimisticCreateTmpMessage(newMessage);
       get().internal_toggleMessageLoading(true, tempMessageId);
 
-      const result = await get().internal_createMessage(newMessage, { tempMessageId });
+      const result = await get().optimisticCreateMessage(newMessage, { tempMessageId });
       if (!result) return;
       parentMessageId = result.id;
     }
@@ -172,7 +172,10 @@ export const chatThreadMessage: StateCreator<
     // Get the current messages to generate AI response
     const messages = threadSelectors.portalAIChats(get());
 
-    await internal_coreProcessMessage(messages, parentMessageId, {
+    await internal_execAgentRuntime({
+      messages,
+      parentMessageId,
+      parentMessageType: 'user',
       ragQuery: get().internal_shouldUseRAG() ? message : undefined,
       threadId: get().portalThreadId,
       inPortalThread: true,
@@ -191,12 +194,12 @@ export const chatThreadMessage: StateCreator<
     }
   },
   resendThreadMessage: async (messageId) => {
-    const chats = threadSelectors.portalAIChats(get());
+    // const chats = threadSelectors.portalAIChats(get());
 
-    await get().internal_resendMessage(messageId, {
-      messages: chats,
-      threadId: get().portalThreadId,
-      inPortalThread: true,
+    await get().regenerateUserMessage(messageId, {
+      // messages: chats,
+      // threadId: get().portalThreadId,
+      // inPortalThread: true,
     });
   },
   delAndResendThreadMessage: async (id) => {

package/src/store/chat/slices/thread/selectors/index.ts

@@ -6,7 +6,7 @@ import { agentChatConfigSelectors } from '@/store/agent/selectors';
 import type { ChatStoreState } from '@/store/chat';
 import { chatHelpers } from '@/store/chat/helpers';
 
-import { chatSelectors } from '../../message/selectors';
+import { displayMessageSelectors } from '../../message/selectors';
 import { genMessage } from './util';
 
 const currentTopicThreads = (s: ChatStoreState) => {
@@ -52,7 +52,7 @@ const getTheadParentMessages = (s: ChatStoreState, data: UIChatMessage[]) => {
  * 获取当前 thread 的父级消息
  */
 const portalDisplayParentMessages = (s: ChatStoreState): UIChatMessage[] => {
-  const data = chatSelectors.activeBaseChatsWithoutTool(s);
+  const data = displayMessageSelectors.activeDisplayMessages(s);
 
   return getTheadParentMessages(s, data);
 };
@@ -65,7 +65,7 @@ const portalDisplayChildChatsByThreadId =
   (id?: string) =>
   (s: ChatStoreState): UIChatMessage[] => {
     // skip tool message
-    const data = chatSelectors.activeBaseChatsWithoutTool(s);
+    const data = displayMessageSelectors.activeDisplayMessages(s);
 
     return data.filter((m) => !!id && m.threadId === id);
   };
@@ -74,7 +74,9 @@ const portalDisplayChats = (s: ChatStoreState) => {
   const parentMessages = portalDisplayParentMessages(s);
   const afterMessages = portalDisplayChildChatsByThreadId(s.portalThreadId)(s);
   // use for optimistic update
-  const draftMessage = chatSelectors.activeBaseChats(s).find((m) => m.threadId === THREAD_DRAFT_ID);
+  const draftMessage = displayMessageSelectors
+    .activeDisplayMessages(s)
+    .find((m) => m.threadId === THREAD_DRAFT_ID);
 
   return [...parentMessages, draftMessage, ...afterMessages].filter(Boolean) as UIChatMessage[];
 };
@@ -96,7 +98,7 @@ const portalDisplayChatIDs = (s: ChatStoreState): string[] =>
 // ========================================== //
 
 const portalAIParentMessages = (s: ChatStoreState): UIChatMessage[] => {
-  const data = chatSelectors.activeBaseChats(s);
+  const data = displayMessageSelectors.activeDisplayMessages(s);
 
   return getTheadParentMessages(s, data);
 };
@@ -105,7 +107,7 @@ const portalAIChildChatsByThreadId =
   (id?: string) =>
   (s: ChatStoreState): UIChatMessage[] => {
     // skip tool message
-    const data = chatSelectors.activeBaseChats(s);
+    const data = displayMessageSelectors.activeDisplayMessages(s);
 
     return data.filter((m) => !!id && m.threadId === id);
   };

package/src/store/chat/slices/topic/reducer.ts

@@ -1,3 +1,4 @@
+import isEqual from 'fast-deep-equal';
 import { produce } from 'immer';
 
 import { ChatTopic, CreateTopicParams } from '@/types/topic';
@@ -52,9 +53,16 @@ export const topicReducer = (state: ChatTopic[] = [], payload: ChatTopicDispatch
         const topicIndex = draftState.findIndex((topic) => topic.id === id);
 
         if (topicIndex !== -1) {
-          // TODO: updatedAt 类型后续需要修改为 Date
-          // @ts-ignore
-          draftState[topicIndex] = { ...draftState[topicIndex], ...value, updatedAt: new Date() };
+          const currentTopic = draftState[topicIndex];
+          const mergedTopic = { ...currentTopic, ...value };
+
+          // Only update if the merged value is different from current (excluding updatedAt)
+
+          if (!isEqual(currentTopic, mergedTopic)) {
+            // TODO: updatedAt 类型后续需要修改为 Date
+            // @ts-ignore
+            draftState[topicIndex] = { ...mergedTopic, updatedAt: new Date() };
+          }
         }
       });
     }

package/src/store/chat/store.ts

@@ -9,7 +9,7 @@ import { ChatStoreState, initialState } from './initialState';
 import { ChatBuiltinToolAction, chatToolSlice } from './slices/builtinTool/actions';
 import { ChatPortalAction, chatPortalSlice } from './slices/portal/action';
 import { ChatTranslateAction, chatTranslate } from './slices/translate/action';
-import { ChatMessageAction, chatMessage } from './slices/message/action';
+import { ChatMessageAction, chatMessage } from './slices/message/actions';
 import { ChatPluginAction, chatPlugin } from './slices/plugin/action';
 import { ChatTopicAction, chatTopic } from './slices/topic/action';
 import { ChatAIChatAction, chatAiChat } from './slices/aiChat/actions';

package/src/store/user/slices/preference/selectors/labPrefer.ts

@@ -3,9 +3,6 @@ import { DEFAULT_PREFERENCE } from '@lobechat/const';
 import type { UserState } from '@/store/user/initialState';
 
 export const labPreferSelectors = {
-  enableAssistantMessageGroup: (s: UserState): boolean =>
-    s.preference.lab?.enableAssistantMessageGroup ??
-    DEFAULT_PREFERENCE.lab!.enableAssistantMessageGroup!,
   enableGroupChat: (s: UserState): boolean =>
     s.preference.lab?.enableGroupChat ?? DEFAULT_PREFERENCE.lab!.enableGroupChat!,
   enableInputMarkdown: (s: UserState): boolean =>