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

package/src/store/chat/slices/builtinTool/actions/search.ts

@@ -4,7 +4,7 @@ import { nanoid } from '@lobechat/utils';
 import { StateCreator } from 'zustand/vanilla';
 
 import { searchService } from '@/services/search';
-import { chatSelectors } from '@/store/chat/selectors';
+import { dbMessageSelectors } from '@/store/chat/selectors';
 import { ChatStore } from '@/store/chat/store';
 import { WebBrowsingExecutionRuntime } from '@/tools/web-browsing/ExecutionRuntime';
 
@@ -45,15 +45,20 @@ export const searchSlice: StateCreator<
   crawlMultiPages: async (id, params, aiSummary = true) => {
     const { optimisticUpdateMessageContent } = get();
     get().toggleSearchLoading(id, true);
+
+    // Get message to extract sessionId/topicId
+    const message = dbMessageSelectors.getDbMessageById(id)(get());
+    const context = { sessionId: message?.sessionId, topicId: message?.topicId };
+
     try {
       const { content, success, error, state } = await runtime.crawlMultiPages(params);
 
-      await optimisticUpdateMessageContent(id, content);
+      await optimisticUpdateMessageContent(id, content, undefined, context);
 
       if (success) {
-        await get().optimisticUpdatePluginState(id, state);
+        await get().optimisticUpdatePluginState(id, state, context);
       } else {
-        await get().optimisticUpdatePluginError(id, error);
+        await get().optimisticUpdatePluginError(id, error, context);
       }
       get().toggleSearchLoading(id, false);
 
@@ -67,7 +72,7 @@ export const searchSlice: StateCreator<
       const content = [{ errorMessage: err.message, errorType: err.name }];
 
       const xmlContent = crawlResultsPrompt(content);
-      await optimisticUpdateMessageContent(id, xmlContent);
+      await optimisticUpdateMessageContent(id, xmlContent, undefined, context);
     }
   },
 
@@ -78,10 +83,13 @@ export const searchSlice: StateCreator<
   },
 
   saveSearchResult: async (id) => {
-    const message = chatSelectors.getMessageById(id)(get());
+    const message = dbMessageSelectors.getDbMessageById(id)(get());
     if (!message || !message.plugin) return;
 
     const { optimisticAddToolToAssistantMessage, optimisticCreateMessage, openToolUI } = get();
+
+    const context = { sessionId: message.sessionId, topicId: message.topicId };
+
     // 1. 创建一个新的 tool call message
     const newToolCallId = `tool_call_${nanoid()}`;
 
@@ -92,23 +100,30 @@ export const searchSlice: StateCreator<
       plugin: message.plugin,
       pluginState: message.pluginState,
       role: 'tool',
-      sessionId: get().activeId,
+      sessionId: message.sessionId ?? get().activeId,
       tool_call_id: newToolCallId,
-      topicId: get().activeTopicId,
+      topicId: message.topicId !== undefined ? message.topicId : get().activeTopicId,
     };
 
     const addToolItem = async () => {
       if (!message.parentId || !message.plugin) return;
 
-      await optimisticAddToolToAssistantMessage(message.parentId, {
-        id: newToolCallId,
-        ...message.plugin,
-      });
+      await optimisticAddToolToAssistantMessage(
+        message.parentId,
+        {
+          id: newToolCallId,
+          ...message.plugin,
+        },
+        context,
+      );
     };
 
     const [result] = await Promise.all([
       // 1. 添加 tool message
-      optimisticCreateMessage(toolMessage),
+      optimisticCreateMessage(toolMessage, {
+        sessionId: toolMessage.sessionId,
+        topicId: toolMessage.topicId,
+      }),
       // 2. 将这条 tool call message 插入到 ai 消息的 tools 中
       addToolItem(),
     ]);
@@ -121,31 +136,41 @@ export const searchSlice: StateCreator<
   search: async (id, params, aiSummary = true) => {
     get().toggleSearchLoading(id, true);
 
+    // Get message to extract sessionId/topicId
+    const message = dbMessageSelectors.getDbMessageById(id)(get());
+    const context = { sessionId: message?.sessionId, topicId: message?.topicId };
+
     const { content, success, error, state } = await runtime.search(params);
 
     if (success) {
-      await get().optimisticUpdatePluginState(id, state);
+      await get().optimisticUpdatePluginState(id, state, context);
     } else {
       if ((error as Error).message === SEARCH_SEARXNG_NOT_CONFIG) {
-        await get().optimisticUpdateMessagePluginError(id, {
-          body: {
-            provider: 'searxng',
+        await get().optimisticUpdateMessagePluginError(
+          id,
+          {
+            body: { provider: 'searxng' },
+            message: 'SearXNG is not configured',
+            type: 'PluginSettingsInvalid',
           },
-          message: 'SearXNG is not configured',
-          type: 'PluginSettingsInvalid',
-        });
+          context,
+        );
       } else {
-        await get().optimisticUpdateMessagePluginError(id, {
-          body: error,
-          message: (error as Error).message,
-          type: 'PluginServerError',
-        });
+        await get().optimisticUpdateMessagePluginError(
+          id,
+          {
+            body: error,
+            message: (error as Error).message,
+            type: 'PluginServerError',
+          },
+          context,
+        );
       }
     }
 
     get().toggleSearchLoading(id, false);
 
-    await get().optimisticUpdateMessageContent(id, content);
+    await get().optimisticUpdateMessageContent(id, content, undefined, context);
 
     // 如果 aiSummary 为 true，则会自动触发总结
     return aiSummary;

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

@@ -22,11 +22,14 @@ vi.mock('@/services/message', () => ({
   messageService: {
     getMessages: vi.fn(),
     updateMessageError: vi.fn(),
-    removeMessage: vi.fn(),
+    removeMessage: vi.fn(() => Promise.resolve({ success: true, messages: [] })),
     removeMessagesByAssistant: vi.fn(),
-    removeMessages: vi.fn(() => Promise.resolve()),
+    removeMessages: vi.fn(() => Promise.resolve({ success: true, messages: [] })),
     createMessage: vi.fn(() => Promise.resolve({ id: 'new-message-id', messages: [] })),
-    updateMessage: vi.fn(),
+    updateMessage: vi.fn(() => Promise.resolve({ success: true, messages: [] })),
+    updateMessageMetadata: vi.fn(() => Promise.resolve({ success: true, messages: [] })),
+    updateMessagePluginError: vi.fn(() => Promise.resolve({ success: true, messages: [] })),
+    updateMessageRAG: vi.fn(() => Promise.resolve({ success: true, messages: [] })),
     removeAllMessages: vi.fn(() => Promise.resolve()),
   },
 }));
@@ -224,7 +227,10 @@ describe('chatMessage actions', () => {
       });
 
       expect(deleteSpy).toHaveBeenCalledWith(messageId);
-      expect(replaceMessagesSpy).toHaveBeenCalledWith(mockMessages);
+      expect(replaceMessagesSpy).toHaveBeenCalledWith(mockMessages, {
+        sessionId: 'session-id',
+        topicId: undefined,
+      });
     });
 
     it('deleteMessage should remove the message only', async () => {
@@ -266,7 +272,10 @@ describe('chatMessage actions', () => {
         sessionId: 'session-id',
         topicId: undefined,
       });
-      expect(replaceMessagesSpy).toHaveBeenCalledWith(mockMessages);
+      expect(replaceMessagesSpy).toHaveBeenCalledWith(mockMessages, {
+        sessionId: 'session-id',
+        topicId: undefined,
+      });
     });
 
     it('deleteMessage should remove assistantGroup message with all children', async () => {
@@ -317,7 +326,10 @@ describe('chatMessage actions', () => {
         sessionId: 'session-id',
         topicId: undefined,
       });
-      expect(replaceMessagesSpy).toHaveBeenCalledWith(mockMessages);
+      expect(replaceMessagesSpy).toHaveBeenCalledWith(mockMessages, {
+        sessionId: 'session-id',
+        topicId: undefined,
+      });
     });
 
     it('deleteMessage should remove group message with children that have tool calls', async () => {
@@ -381,7 +393,10 @@ describe('chatMessage actions', () => {
           topicId: undefined,
         },
       );
-      expect(replaceMessagesSpy).toHaveBeenCalledWith(mockMessages);
+      expect(replaceMessagesSpy).toHaveBeenCalledWith(mockMessages, {
+        sessionId: 'session-id',
+        topicId: undefined,
+      });
     });
   });
 
@@ -417,51 +432,84 @@ describe('chatMessage actions', () => {
 
   describe('deleteToolMessage', () => {
     it('deleteMessage should remove a message by id', async () => {
-      const { result } = renderHook(() => useChatStore());
       const messageId = 'message-id';
-      const updateMessageSpy = vi.spyOn(messageService, 'updateMessage');
-      const removeMessageSpy = vi.spyOn(messageService, 'removeMessage');
+      const sessionId = 'session-id';
+      const topicId = null;
 
+      const rawMessages = [
+        {
+          id: messageId,
+          role: 'assistant',
+          tools: [{ id: 'tool1' }, { id: 'tool2' }],
+        } as UIChatMessage,
+        {
+          id: '2',
+          parentId: messageId,
+          tool_call_id: 'tool1',
+          role: 'tool',
+        } as UIChatMessage,
+        { id: '3', tool_call_id: 'tool2', role: 'tool' } as UIChatMessage,
+      ];
+
+      const key = messageMapKey(sessionId, topicId);
       act(() => {
-        const rawMessages = [
-          {
-            id: messageId,
-            role: 'assistant',
-            tools: [{ id: 'tool1' }, { id: 'tool2' }],
-          } as UIChatMessage,
-          {
-            id: '2',
-            parentId: messageId,
-            tool_call_id: 'tool1',
-            role: 'tool',
-          } as UIChatMessage,
-          { id: '3', tool_call_id: 'tool2', role: 'tool' } as UIChatMessage,
-        ];
-
         useChatStore.setState({
-          activeId: 'session-id',
-          activeTopicId: undefined,
+          activeId: sessionId,
+          activeTopicId: topicId as unknown as string,
           dbMessagesMap: {
-            [messageMapKey('session-id')]: rawMessages,
+            [key]: rawMessages,
           },
           messagesMap: {
-            [messageMapKey('session-id')]: rawMessages,
+            [key]: rawMessages,
           },
         });
       });
+
+      const { result } = renderHook(() => useChatStore());
+
+      // Mock removeMessage to return the remaining messages after deletion
+      // Note: tool1 is also removed from the assistant message's tools to reflect the concurrent update
+      const remainingAfterDelete = [
+        {
+          id: messageId,
+          role: 'assistant',
+          tools: [{ id: 'tool2' }],
+        } as UIChatMessage,
+        { id: '3', tool_call_id: 'tool2', role: 'tool' } as UIChatMessage,
+      ];
+
+      // Mock updateMessage to return updated messages after tool removal
+      const updatedMessages = [
+        {
+          id: messageId,
+          role: 'assistant',
+          tools: [{ id: 'tool2' }],
+        } as UIChatMessage,
+        { id: '3', tool_call_id: 'tool2', role: 'tool' } as UIChatMessage,
+      ];
+
+      const refreshToolsSpy = vi.spyOn(result.current, 'internal_refreshToUpdateMessageTools');
+      const updateMessageSpy = vi
+        .spyOn(messageService, 'updateMessage')
+        .mockResolvedValue({ success: true, messages: updatedMessages });
+      const removeMessageSpy = vi
+        .spyOn(messageService, 'removeMessage')
+        .mockResolvedValue({ success: true, messages: remainingAfterDelete });
+
       await act(async () => {
         await result.current.deleteToolMessage('2');
       });
 
       expect(removeMessageSpy).toHaveBeenCalled();
+      expect(refreshToolsSpy).toHaveBeenCalledWith('message-id', undefined);
       expect(updateMessageSpy).toHaveBeenCalledWith(
         'message-id',
         {
           tools: [{ id: 'tool2' }],
         },
         {
-          sessionId: 'session-id',
-          topicId: undefined,
+          sessionId,
+          topicId,
         },
       );
     });
@@ -647,16 +695,23 @@ describe('chatMessage actions', () => {
       });
     });
 
-    it('should refresh messages after updating content', async () => {
+    it('should replace messages after updating content', async () => {
       const { result } = renderHook(() => useChatStore());
       const messageId = 'message-id';
       const newContent = 'Updated content';
+      const replaceMessagesSpy = vi.spyOn(result.current, 'replaceMessages');
 
       await act(async () => {
         await result.current.optimisticUpdateMessageContent(messageId, newContent);
       });
 
-      expect(result.current.refreshMessages).toHaveBeenCalled();
+      expect(replaceMessagesSpy).toHaveBeenCalledWith(
+        [],
+        expect.objectContaining({
+          sessionId: 'session-id',
+          topicId: 'topic-id',
+        }),
+      );
     });
   });
 
@@ -802,4 +857,98 @@ describe('chatMessage actions', () => {
       });
     });
   });
+
+  describe('OptimisticUpdateContext isolation', () => {
+    beforeEach(() => {
+      vi.clearAllMocks();
+    });
+
+    it('optimisticUpdateMessageContent should use context sessionId/topicId', async () => {
+      const { result } = renderHook(() => useChatStore());
+      const messageId = 'message-id';
+      const content = 'Updated content';
+      const contextSessionId = 'context-session-id';
+      const contextTopicId = 'context-topic-id';
+
+      const updateMessageSpy = vi.spyOn(messageService, 'updateMessage');
+
+      await act(async () => {
+        await result.current.optimisticUpdateMessageContent(messageId, content, undefined, {
+          sessionId: contextSessionId,
+          topicId: contextTopicId,
+        });
+      });
+
+      expect(updateMessageSpy).toHaveBeenCalledWith(
+        messageId,
+        { content, tools: undefined },
+        { sessionId: contextSessionId, topicId: contextTopicId },
+      );
+    });
+
+    it('optimisticUpdateMessageError should use context sessionId/topicId', async () => {
+      const { result } = renderHook(() => useChatStore());
+      const messageId = 'message-id';
+      const error = { message: 'Error occurred', type: 'error' as any };
+      const contextSessionId = 'context-session';
+      const contextTopicId = 'context-topic';
+
+      const updateMessageSpy = vi.spyOn(messageService, 'updateMessage');
+
+      await act(async () => {
+        await result.current.optimisticUpdateMessageError(messageId, error, {
+          sessionId: contextSessionId,
+          topicId: contextTopicId,
+        });
+      });
+
+      expect(updateMessageSpy).toHaveBeenCalledWith(
+        messageId,
+        { error },
+        { sessionId: contextSessionId, topicId: contextTopicId },
+      );
+    });
+
+    it('optimisticDeleteMessage should use context sessionId/topicId', async () => {
+      const { result } = renderHook(() => useChatStore());
+      const messageId = 'message-id';
+      const contextSessionId = 'context-session';
+      const contextTopicId = 'context-topic';
+
+      const removeMessageSpy = vi.spyOn(messageService, 'removeMessage');
+
+      await act(async () => {
+        await result.current.optimisticDeleteMessage(messageId, {
+          sessionId: contextSessionId,
+          topicId: contextTopicId,
+        });
+      });
+
+      expect(removeMessageSpy).toHaveBeenCalledWith(messageId, {
+        sessionId: contextSessionId,
+        topicId: contextTopicId,
+      });
+    });
+
+    it('optimisticDeleteMessages should use context sessionId/topicId', async () => {
+      const { result } = renderHook(() => useChatStore());
+      const ids = ['id-1', 'id-2'];
+      const contextSessionId = 'context-session';
+      const contextTopicId = 'context-topic';
+
+      const removeMessagesSpy = vi.spyOn(messageService, 'removeMessages');
+
+      await act(async () => {
+        await result.current.optimisticDeleteMessages(ids, {
+          sessionId: contextSessionId,
+          topicId: contextTopicId,
+        });
+      });
+
+      expect(removeMessagesSpy).toHaveBeenCalledWith(ids, {
+        sessionId: contextSessionId,
+        topicId: contextTopicId,
+      });
+    });
+  });
 });

package/src/store/chat/slices/message/actions/optimisticUpdate.ts

@@ -17,6 +17,14 @@ import { StateCreator } from 'zustand/vanilla';
 import { messageService } from '@/services/message';
 import { ChatStore } from '@/store/chat/store';
 
+/**
+ * Context for optimistic updates to specify session/topic isolation
+ */
+export interface OptimisticUpdateContext {
+  sessionId?: string;
+  topicId?: string | null;
+}
+
 /**
  * Optimistic update operations
  * All methods follow the pattern: update frontend first, then persist to database
@@ -28,7 +36,13 @@ export interface MessageOptimisticUpdateAction {
    */
   optimisticCreateMessage: (
     params: CreateMessageParams,
-    context?: { groupMessageId?: string; skipRefresh?: boolean; tempMessageId?: string },
+    context?: {
+      groupMessageId?: string;
+      sessionId?: string;
+      skipRefresh?: boolean;
+      tempMessageId?: string;
+      topicId?: string | null;
+    },
   ) => Promise<{ id: string; messages: UIChatMessage[] } | undefined>;
 
   /**
@@ -40,8 +54,8 @@ export interface MessageOptimisticUpdateAction {
   /**
    * delete the message content with optimistic update
    */
-  optimisticDeleteMessage: (id: string) => Promise<void>;
-  optimisticDeleteMessages: (ids: string[]) => Promise<void>;
+  optimisticDeleteMessage: (id: string, context?: OptimisticUpdateContext) => Promise<void>;
+  optimisticDeleteMessages: (ids: string[], context?: OptimisticUpdateContext) => Promise<void>;
 
   /**
    * update the message content with optimistic update
@@ -59,12 +73,17 @@ export interface MessageOptimisticUpdateAction {
       search?: GroundingSearch;
       toolCalls?: MessageToolCall[];
     },
+    context?: OptimisticUpdateContext,
   ) => Promise<void>;
 
   /**
    * update the message error with optimistic update
    */
-  optimisticUpdateMessageError: (id: string, error: ChatMessageError | null) => Promise<void>;
+  optimisticUpdateMessageError: (
+    id: string,
+    error: ChatMessageError | null,
+    context?: OptimisticUpdateContext,
+  ) => Promise<void>;
 
   /**
    * update the message metadata with optimistic update
@@ -72,6 +91,7 @@ export interface MessageOptimisticUpdateAction {
   optimisticUpdateMessageMetadata: (
     id: string,
     metadata: Partial<MessageMetadata>,
+    context?: OptimisticUpdateContext,
   ) => Promise<void>;
 
   /**
@@ -80,12 +100,17 @@ export interface MessageOptimisticUpdateAction {
   optimisticUpdateMessagePluginError: (
     id: string,
     error: ChatMessagePluginError | null,
+    context?: OptimisticUpdateContext,
   ) => Promise<void>;
 
   /**
    * update message RAG with optimistic update
    */
-  optimisticUpdateMessageRAG: (id: string, input: UpdateMessageRAGParams) => Promise<void>;
+  optimisticUpdateMessageRAG: (
+    id: string,
+    input: UpdateMessageRAGParams,
+    context?: OptimisticUpdateContext,
+  ) => Promise<void>;
 }
 
 export const messageOptimisticUpdate: StateCreator<
@@ -113,7 +138,9 @@ export const messageOptimisticUpdate: StateCreator<
 
       if (!context?.skipRefresh) {
         // Use the messages returned from createMessage (already grouped)
-        replaceMessages(result.messages);
+        const sessionId = context?.sessionId ?? get().activeId;
+        const topicId = context?.topicId !== undefined ? context.topicId : get().activeTopicId;
+        replaceMessages(result.messages, { sessionId, topicId });
       }
 
       internal_toggleMessageLoading(false, tempId);
@@ -144,29 +171,33 @@ export const messageOptimisticUpdate: StateCreator<
     return tempId;
   },
 
-  optimisticDeleteMessage: async (id: string) => {
+  optimisticDeleteMessage: async (id: string, context) => {
     get().internal_dispatchMessage({ id, type: 'deleteMessage' });
+    const sessionId = context?.sessionId ?? get().activeId;
+    const topicId = context?.topicId !== undefined ? context.topicId : get().activeTopicId;
     const result = await messageService.removeMessage(id, {
-      sessionId: get().activeId,
-      topicId: get().activeTopicId,
+      sessionId,
+      topicId,
     });
     if (result?.success && result.messages) {
-      get().replaceMessages(result.messages);
+      get().replaceMessages(result.messages, { sessionId, topicId });
     }
   },
 
-  optimisticDeleteMessages: async (ids) => {
+  optimisticDeleteMessages: async (ids, context) => {
     get().internal_dispatchMessage({ ids, type: 'deleteMessages' });
+    const sessionId = context?.sessionId ?? get().activeId;
+    const topicId = context?.topicId !== undefined ? context.topicId : get().activeTopicId;
     const result = await messageService.removeMessages(ids, {
-      sessionId: get().activeId,
-      topicId: get().activeTopicId,
+      sessionId,
+      topicId,
     });
     if (result?.success && result.messages) {
-      get().replaceMessages(result.messages);
+      get().replaceMessages(result.messages, { sessionId, topicId });
     }
   },
 
-  optimisticUpdateMessageContent: async (id, content, extra) => {
+  optimisticUpdateMessageContent: async (id, content, extra, context) => {
     const {
       internal_dispatchMessage,
       refreshMessages,
@@ -191,6 +222,9 @@ export const messageOptimisticUpdate: StateCreator<
       });
     }
 
+    const sessionId = context?.sessionId ?? get().activeId;
+    const topicId = context?.topicId !== undefined ? context.topicId : get().activeTopicId;
+
     const result = await messageService.updateMessage(
       id,
       {
@@ -203,31 +237,33 @@ export const messageOptimisticUpdate: StateCreator<
         search: extra?.search,
         tools: extra?.toolCalls ? internal_transformToolCalls(extra?.toolCalls) : undefined,
       },
-      { sessionId: get().activeId, topicId: get().activeTopicId },
+      { sessionId, topicId },
     );
 
     if (result && result.success && result.messages) {
-      replaceMessages(result.messages, { action: 'optimisticUpdateMessageContent' });
+      replaceMessages(result.messages, {
+        action: 'optimisticUpdateMessageContent',
+        sessionId,
+        topicId,
+      });
     } else {
       await refreshMessages();
     }
   },
 
-  optimisticUpdateMessageError: async (id, error) => {
+  optimisticUpdateMessageError: async (id, error, context) => {
     get().internal_dispatchMessage({ id, type: 'updateMessage', value: { error } });
-    const result = await messageService.updateMessage(
-      id,
-      { error },
-      { sessionId: get().activeId, topicId: get().activeTopicId },
-    );
+    const sessionId = context?.sessionId ?? get().activeId;
+    const topicId = context?.topicId !== undefined ? context.topicId : get().activeTopicId;
+    const result = await messageService.updateMessage(id, { error }, { sessionId, topicId });
     if (result?.success && result.messages) {
-      get().replaceMessages(result.messages);
+      get().replaceMessages(result.messages, { sessionId, topicId });
     } else {
       await get().refreshMessages();
     }
   },
 
-  optimisticUpdateMessageMetadata: async (id, metadata) => {
+  optimisticUpdateMessageMetadata: async (id, metadata, context) => {
     const { internal_dispatchMessage, refreshMessages, replaceMessages } = get();
 
     // Optimistic update: update the frontend immediately
@@ -237,36 +273,43 @@ export const messageOptimisticUpdate: StateCreator<
       value: metadata,
     });
 
+    const sessionId = context?.sessionId ?? get().activeId;
+    const topicId = context?.topicId !== undefined ? context.topicId : get().activeTopicId;
+
     // Persist to database
     const result = await messageService.updateMessageMetadata(id, metadata, {
-      sessionId: get().activeId,
-      topicId: get().activeTopicId,
+      sessionId,
+      topicId,
     });
 
     if (result?.success && result.messages) {
-      replaceMessages(result.messages);
+      replaceMessages(result.messages, { sessionId, topicId });
     } else {
       await refreshMessages();
     }
   },
 
-  optimisticUpdateMessagePluginError: async (id, error) => {
+  optimisticUpdateMessagePluginError: async (id, error, context) => {
+    const sessionId = context?.sessionId ?? get().activeId;
+    const topicId = context?.topicId !== undefined ? context.topicId : get().activeTopicId;
     const result = await messageService.updateMessagePluginError(id, error, {
-      sessionId: get().activeId,
-      topicId: get().activeTopicId,
+      sessionId,
+      topicId,
     });
     if (result?.success && result.messages) {
-      get().replaceMessages(result.messages);
+      get().replaceMessages(result.messages, { sessionId, topicId });
     }
   },
 
-  optimisticUpdateMessageRAG: async (id, data) => {
+  optimisticUpdateMessageRAG: async (id, data, context) => {
+    const sessionId = context?.sessionId ?? get().activeId;
+    const topicId = context?.topicId !== undefined ? context.topicId : get().activeTopicId;
     const result = await messageService.updateMessageRAG(id, data, {
-      sessionId: get().activeId,
-      topicId: get().activeTopicId,
+      sessionId,
+      topicId,
     });
     if (result?.success && result.messages) {
-      get().replaceMessages(result.messages);
+      get().replaceMessages(result.messages, { sessionId, topicId });
     }
   },
 });