@lobehub/lobehub 2.0.0-next.28 → 2.0.0-next.29

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

@@ -6,7 +6,6 @@ import {
   ChatMessageError,
   ChatMessagePluginError,
   CreateMessageParams,
-  CreateNewMessageParams,
   GroundingSearch,
   MessageMetadata,
   MessageToolCall,
@@ -108,24 +107,17 @@ export interface ChatMessageAction {
   ) => Promise<void>;
   /**
    * create a message with optimistic update
+   * returns the created message ID and updated message list
    */
   internal_createMessage: (
     params: CreateMessageParams,
-    context?: { tempMessageId?: string; skipRefresh?: boolean },
-  ) => Promise<string | undefined>;
+    context?: { tempMessageId?: string; skipRefresh?: boolean; groupMessageId?: string },
+  ) => Promise<{ id: string; messages: UIChatMessage[] } | undefined>;
   /**
    * create a temp message for optimistic update
    * otherwise the message will be too slow to show
    */
   internal_createTmpMessage: (params: CreateMessageParams) => string;
-  /**
-   * create a new message using createNewMessage API and return full message list
-   * used for group message scenarios to reduce network requests
-   */
-  internal_createNewMessage: (
-    params: CreateNewMessageParams,
-    context?: { tempMessageId?: string; groupMessageId?: string },
-  ) => Promise<{ id: string; messages: UIChatMessage[] } | undefined>;
   /**
    * delete the message content with optimistic update
    */
@@ -172,22 +164,42 @@ export const chatMessage: StateCreator<
     if (!message) return;
 
     let ids = [message.id];
+    const allMessages = chatSelectors.activeBaseChats(get());
 
-    // if the message is a tool calls, then delete all the related messages
+    // if the message is a tool calls, then delete all the related tool messages
     if (message.tools) {
       const toolMessageIds = message.tools.flatMap((tool) => {
-        const messages = chatSelectors
-          .activeBaseChats(get())
-          .filter((m) => m.tool_call_id === tool.id);
-
+        const messages = allMessages.filter((m) => m.tool_call_id === tool.id);
         return messages.map((m) => m.id);
       });
       ids = ids.concat(toolMessageIds);
     }
 
+    // if the message is a group message, find all children messages (via parentId)
+    if (message.role === 'group') {
+      const childMessages = allMessages.filter((m) => m.parentId === message.id);
+      const childMessageIds = childMessages.map((m) => m.id);
+      ids = ids.concat(childMessageIds);
+
+      // Also delete tool results of children messages
+      const childToolMessageIds = childMessages.flatMap((child) => {
+        if (!child.tools) return [];
+        return child.tools.flatMap((tool) => {
+          const toolMessages = allMessages.filter((m) => m.tool_call_id === tool.id);
+          return toolMessages.map((m) => m.id);
+        });
+      });
+      ids = ids.concat(childToolMessageIds);
+    }
+
     get().internal_dispatchMessage({ type: 'deleteMessages', ids });
-    await messageService.removeMessages(ids);
-    await get().refreshMessages();
+    const result = await messageService.removeMessages(ids, {
+      sessionId: get().activeId,
+      topicId: get().activeTopicId,
+    });
+    if (result?.success && result.messages) {
+      get().replaceMessages(result.messages);
+    }
   },
 
   deleteToolMessage: async (id) => {
@@ -208,14 +220,7 @@ export const chatMessage: StateCreator<
   },
 
   clearMessage: async () => {
-    const {
-      activeId,
-      activeTopicId,
-      refreshMessages,
-      refreshTopic,
-      switchTopic,
-      activeSessionType,
-    } = get();
+    const { activeId, activeTopicId, refreshTopic, switchTopic, activeSessionType } = get();
 
     // Check if this is a group session - use activeSessionType if available, otherwise check session store
     let isGroupSession = activeSessionType === 'group';
@@ -239,22 +244,24 @@ export const chatMessage: StateCreator<
       await topicService.removeTopic(activeTopicId);
     }
     await refreshTopic();
-    await refreshMessages();
+
+    // Clear messages directly since all messages are deleted
+    get().replaceMessages([]);
 
     // after remove topic , go back to default topic
     switchTopic();
   },
   clearAllMessages: async () => {
-    const { refreshMessages } = get();
     await messageService.removeAllMessages();
-    await refreshMessages();
+    // Clear messages directly since all messages are deleted
+    get().replaceMessages([]);
   },
   addAIMessage: async () => {
     const { internal_createMessage, updateInputMessage, activeTopicId, activeId, inputMessage } =
       get();
     if (!activeId) return;
 
-    await internal_createMessage({
+    const result = await internal_createMessage({
       content: inputMessage,
       role: 'assistant',
       sessionId: activeId,
@@ -262,14 +269,16 @@ export const chatMessage: StateCreator<
       topicId: activeTopicId,
     });
 
-    updateInputMessage('');
+    if (result) {
+      updateInputMessage('');
+    }
   },
   addUserMessage: async ({ message, fileList }) => {
     const { internal_createMessage, updateInputMessage, activeTopicId, activeId, activeThreadId } =
       get();
     if (!activeId) return;
 
-    await internal_createMessage({
+    const result = await internal_createMessage({
       content: message,
       files: fileList,
       role: 'user',
@@ -279,7 +288,9 @@ export const chatMessage: StateCreator<
       threadId: activeThreadId,
     });
 
-    updateInputMessage('');
+    if (result) {
+      updateInputMessage('');
+    }
   },
   copyMessage: async (id, content) => {
     await copyToClipboard(content);
@@ -359,10 +370,13 @@ export const chatMessage: StateCreator<
   },
 
   internal_updateMessageRAG: async (id, data) => {
-    const { refreshMessages } = get();
-
-    await messageService.updateMessageRAG(id, data);
-    await refreshMessages();
+    const result = await messageService.updateMessageRAG(id, data, {
+      sessionId: get().activeId,
+      topicId: get().activeTopicId,
+    });
+    if (result?.success && result.messages) {
+      get().replaceMessages(result.messages);
+    }
   },
 
   // the internal process method of the AI message
@@ -396,8 +410,13 @@ export const chatMessage: StateCreator<
   },
 
   internal_updateMessagePluginError: async (id, error) => {
-    await messageService.updateMessagePluginError(id, error);
-    await get().refreshMessages();
+    const result = await messageService.updateMessagePluginError(id, error, {
+      sessionId: get().activeId,
+      topicId: get().activeTopicId,
+    });
+    if (result?.success && result.messages) {
+      get().replaceMessages(result.messages);
+    }
   },
 
   internal_updateMessageContent: async (id, content, extra) => {
@@ -447,42 +466,6 @@ export const chatMessage: StateCreator<
     }
   },
 
-  internal_createMessage: async (message, context) => {
-    const {
-      internal_createTmpMessage,
-      refreshMessages,
-      internal_toggleMessageLoading,
-      internal_dispatchMessage,
-    } = get();
-    let tempId = context?.tempMessageId;
-    if (!tempId) {
-      // use optimistic update to avoid the slow waiting
-      tempId = internal_createTmpMessage(message);
-
-      internal_toggleMessageLoading(true, tempId);
-    }
-
-    try {
-      const id = await messageService.createMessage(message);
-      if (!context?.skipRefresh) {
-        internal_toggleMessageLoading(true, tempId);
-        await refreshMessages();
-      }
-
-      internal_toggleMessageLoading(false, tempId);
-      return id;
-    } catch (e) {
-      internal_toggleMessageLoading(false, tempId);
-      internal_dispatchMessage({
-        id: tempId,
-        type: 'updateMessage',
-        value: {
-          error: { type: ChatErrorType.CreateMessageError, message: (e as Error).message, body: e },
-        },
-      });
-    }
-  },
-
   internal_fetchMessages: async () => {
     const messages = await messageService.getMessages(get().activeId, get().activeTopicId);
     const nextMap = { ...get().messagesMap, [chatSelectors.currentChatKey(get())]: messages };
@@ -504,8 +487,7 @@ export const chatMessage: StateCreator<
 
     return tempId;
   },
-
-  internal_createNewMessage: async (message, context) => {
+  internal_createMessage: async (message, context) => {
     const {
       internal_createTmpMessage,
       internal_toggleMessageLoading,
@@ -537,11 +519,12 @@ export const chatMessage: StateCreator<
     }
 
     try {
-      // 使用 createNewMessage API
       const result = await messageService.createNewMessage(message);
 
-      // 直接用返回的 messages 更新 store（已包含 group 结构）
-      replaceMessages(result.messages);
+      if (!context?.skipRefresh) {
+        // Use the messages returned from createNewMessage (already grouped)
+        replaceMessages(result.messages);
+      }
 
       internal_toggleMessageLoading(false, tempId);
       return result;
@@ -563,8 +546,13 @@ export const chatMessage: StateCreator<
 
   internal_deleteMessage: async (id: string) => {
     get().internal_dispatchMessage({ type: 'deleteMessage', id });
-    await messageService.removeMessage(id);
-    await get().refreshMessages();
+    const result = await messageService.removeMessage(id, {
+      sessionId: get().activeId,
+      topicId: get().activeTopicId,
+    });
+    if (result?.success && result.messages) {
+      get().replaceMessages(result.messages);
+    }
   },
   internal_traceMessage: async (id, payload) => {
     // tracing the diff of update

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

@@ -26,7 +26,7 @@ vi.mock('@/services/message', () => ({
     updateMessageError: vi.fn(),
     updateMessagePluginState: vi.fn(),
     updateMessagePluginArguments: vi.fn(),
-    createMessage: vi.fn(),
+    createNewMessage: vi.fn(),
   },
 }));
 
@@ -271,9 +271,16 @@ describe('ChatPluginAction', () => {
       const pluginPayload = { apiName: 'testApi', arguments: { key: 'value' } };
       const messageId = 'message-id';
       const error = new Error('API call failed');
+      const mockMessages = [{ id: 'msg-1', content: 'test' }] as any;
+
+      // Mock the service to return messages
+      (messageService.updateMessageError as Mock).mockResolvedValue({
+        success: true,
+        messages: mockMessages,
+      });
 
       const storeState = useChatStore.getState();
-      vi.spyOn(storeState, 'refreshMessages');
+      const replaceMessagesSpy = vi.spyOn(storeState, 'replaceMessages');
       vi.spyOn(storeState, 'triggerAIMessage').mockResolvedValue(undefined);
       vi.spyOn(storeState, 'internal_togglePluginApiCalling').mockReturnValue(undefined);
 
@@ -291,7 +298,7 @@ describe('ChatPluginAction', () => {
       );
       expect(chatService.runPluginApi).toHaveBeenCalledWith(pluginPayload, { trace: {} });
       expect(messageService.updateMessageError).toHaveBeenCalledWith(messageId, error);
-      expect(storeState.refreshMessages).toHaveBeenCalled();
+      expect(replaceMessagesSpy).toHaveBeenCalledWith(mockMessages);
       expect(storeState.internal_togglePluginApiCalling).toHaveBeenCalledWith(
         false,
         'message-id',
@@ -345,7 +352,9 @@ describe('ChatPluginAction', () => {
       const invokeBuiltinToolMock = vi.fn();
       const invokeDefaultTypePluginMock = vi.fn().mockResolvedValue('Default tool response');
       const triggerAIMessageMock = vi.fn();
-      const internal_createMessageMock = vi.fn().mockResolvedValue('tool-message-id');
+      const internal_createMessageMock = vi
+        .fn()
+        .mockResolvedValue({ id: 'tool-message-id', messages: [] });
       const getTraceIdByMessageIdMock = vi.fn().mockReturnValue('trace-id');
 
       act(() => {
@@ -472,7 +481,9 @@ describe('ChatPluginAction', () => {
       const invokeMarkdownTypePluginMock = vi.fn();
       const invokeBuiltinToolMock = vi.fn();
       const triggerAIMessageMock = vi.fn();
-      const internal_createMessageMock = vi.fn().mockResolvedValue('tool-message-id');
+      const internal_createMessageMock = vi
+        .fn()
+        .mockResolvedValue({ id: 'tool-message-id', messages: [] });
 
       act(() => {
         useChatStore.setState({
@@ -518,9 +529,17 @@ describe('ChatPluginAction', () => {
     it('should update the plugin state for a message', async () => {
       const messageId = 'message-id';
       const pluginStateValue = { key: 'value' };
+      const mockMessages = [{ id: 'msg-1', content: 'test' }] as any;
 
+      // Mock the service to return messages
+      (messageService.updateMessagePluginState as Mock).mockResolvedValue({
+        success: true,
+        messages: mockMessages,
+      });
+
+      const replaceMessagesSpy = vi.fn();
       const initialState = {
-        refreshMessages: vi.fn(),
+        replaceMessages: replaceMessagesSpy,
       };
       useChatStore.setState(initialState);
 
@@ -533,19 +552,28 @@ describe('ChatPluginAction', () => {
       expect(messageService.updateMessagePluginState).toHaveBeenCalledWith(
         messageId,
         pluginStateValue,
+        {
+          sessionId: 'inbox',
+          topicId: null,
+        },
       );
-      expect(initialState.refreshMessages).toHaveBeenCalled();
+
+      expect(replaceMessagesSpy).toHaveBeenCalledWith(mockMessages);
     });
   });
 
   describe('createAssistantMessageByPlugin', () => {
-    it('should create an assistant message and refresh messages', async () => {
-      // 模拟 messageService.create 方法的实现
-      (messageService.createMessage as Mock).mockResolvedValue({});
+    it('should create an assistant message and replace messages', async () => {
+      const mockMessages = [{ id: 'msg-1', content: 'test' }] as any;
+      // 模拟 messageService.createNewMessage 方法的实现
+      (messageService.createNewMessage as Mock).mockResolvedValue({
+        id: 'new-message-id',
+        messages: mockMessages,
+      });
 
-      // 设置初始状态并模拟 refreshMessages 方法
+      // 设置初始状态并模拟 replaceMessages 方法
       const initialState = {
-        refreshMessages: vi.fn(),
+        replaceMessages: vi.fn(),
         activeId: 'session-id',
         activeTopicId: 'topic-id',
       };
@@ -560,8 +588,8 @@ describe('ChatPluginAction', () => {
         await result.current.createAssistantMessageByPlugin(content, parentId);
       });
 
-      // 验证 messageService.create 是否被带有正确参数调用
-      expect(messageService.createMessage).toHaveBeenCalledWith({
+      // 验证 messageService.createNewMessage 是否被带有正确参数调用
+      expect(messageService.createNewMessage).toHaveBeenCalledWith({
         content,
         parentId,
         role: 'assistant',
@@ -569,14 +597,14 @@ describe('ChatPluginAction', () => {
         topicId: initialState.activeTopicId,
       });
 
-      // 验证 refreshMessages 是否被调用
-      expect(result.current.refreshMessages).toHaveBeenCalled();
+      // 验证 replaceMessages 是否被调用
+      expect(result.current.replaceMessages).toHaveBeenCalledWith(mockMessages);
     });
 
     it('should handle errors when message creation fails', async () => {
       // 模拟 messageService.create 方法，使其抛出错误
       const errorMessage = 'Failed to create message';
-      (messageService.createMessage as Mock).mockRejectedValue(new Error(errorMessage));
+      (messageService.createNewMessage as Mock).mockRejectedValue(new Error(errorMessage));
 
       // 设置初始状态并模拟 refreshMessages 方法
       const initialState = {
@@ -598,7 +626,7 @@ describe('ChatPluginAction', () => {
       });
 
       // 验证 messageService.create 是否被带有正确参数调用
-      expect(messageService.createMessage).toHaveBeenCalledWith({
+      expect(messageService.createNewMessage).toHaveBeenCalledWith({
         content,
         parentId,
         role: 'assistant',
@@ -706,11 +734,20 @@ describe('ChatPluginAction', () => {
   describe('invokeStandaloneTypePlugin', () => {
     it('should update message with error and refresh messages if plugin settings are invalid', async () => {
       const messageId = 'message-id';
+      const mockMessages = [{ id: 'msg-1', content: 'test' }] as any;
 
       const payload = {
         identifier: 'pluginName',
       } as ChatToolPayload;
 
+      // Mock the service to return messages
+      (messageService.updateMessageError as Mock).mockResolvedValue({
+        success: true,
+        messages: mockMessages,
+      });
+
+      const replaceMessagesSpy = vi.fn();
+
       act(() => {
         useToolStore.setState({
           validatePluginSettings: vi
@@ -718,7 +755,7 @@ describe('ChatPluginAction', () => {
             .mockResolvedValue({ valid: false, errors: ['Invalid setting'] }),
         });
 
-        useChatStore.setState({ refreshMessages: vi.fn(), invokeStandaloneTypePlugin });
+        useChatStore.setState({ replaceMessages: replaceMessagesSpy, invokeStandaloneTypePlugin });
       });
 
       const { result } = renderHook(() => useChatStore());
@@ -738,7 +775,7 @@ describe('ChatPluginAction', () => {
         type: 'PluginSettingsInvalid',
       });
 
-      expect(result.current.refreshMessages).toHaveBeenCalled();
+      expect(replaceMessagesSpy).toHaveBeenCalledWith(mockMessages);
     });
   });
 
@@ -917,13 +954,22 @@ describe('ChatPluginAction', () => {
         arguments: '{}',
       };
       const error = new Error('API call failed');
+      const mockMessages = [{ id: 'msg-1', content: 'test' }] as any;
+
+      // Mock the service to return messages
+      (messageService.updateMessageError as Mock).mockResolvedValue({
+        success: true,
+        messages: mockMessages,
+      });
 
       vi.spyOn(chatService, 'runPluginApi').mockRejectedValue(error);
 
+      const replaceMessagesSpy = vi.fn();
+
       act(() => {
         useChatStore.setState({
           internal_togglePluginApiCalling: vi.fn(),
-          refreshMessages: vi.fn(),
+          replaceMessages: replaceMessagesSpy,
         });
       });
 
@@ -934,7 +980,7 @@ describe('ChatPluginAction', () => {
       });
 
       expect(messageService.updateMessageError).toHaveBeenCalledWith(messageId, error);
-      expect(result.current.refreshMessages).toHaveBeenCalled();
+      expect(replaceMessagesSpy).toHaveBeenCalledWith(mockMessages);
     });
   });
 
@@ -1040,10 +1086,19 @@ describe('ChatPluginAction', () => {
     it('should update plugin error and refresh messages', async () => {
       const messageId = 'message-id';
       const error = { message: 'Plugin error' } as any;
+      const mockMessages = [{ id: 'msg-1', content: 'test' }] as any;
+
+      // Mock the service to return messages
+      (messageService.updateMessage as Mock).mockResolvedValue({
+        success: true,
+        messages: mockMessages,
+      });
+
+      const replaceMessagesSpy = vi.fn();
 
       act(() => {
         useChatStore.setState({
-          refreshMessages: vi.fn(),
+          replaceMessages: replaceMessagesSpy,
         });
       });
 
@@ -1053,8 +1108,12 @@ describe('ChatPluginAction', () => {
         await result.current.internal_updatePluginError(messageId, error);
       });
 
-      expect(messageService.updateMessage).toHaveBeenCalledWith(messageId, { error });
-      expect(result.current.refreshMessages).toHaveBeenCalled();
+      expect(messageService.updateMessage).toHaveBeenCalledWith(
+        messageId,
+        { error },
+        { sessionId: 'inbox', topicId: null },
+      );
+      expect(replaceMessagesSpy).toHaveBeenCalledWith(mockMessages);
     });
   });
 

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

@@ -98,8 +98,8 @@ export const chatPlugin: StateCreator<
       topicId: get().activeTopicId, // if there is activeTopicId，then add it to topicId
     };
 
-    await messageService.createMessage(newMessage);
-    await get().refreshMessages();
+    const result = await messageService.createNewMessage(newMessage);
+    get().replaceMessages(result.messages);
   },
 
   fillPluginMessageContent: async (id, content, triggerAiMessage) => {
@@ -144,7 +144,7 @@ export const chatPlugin: StateCreator<
 
     // if the plugin settings is not valid, then set the message with error type
     if (!result.valid) {
-      await messageService.updateMessageError(id, {
+      const updateResult = await messageService.updateMessageError(id, {
         body: {
           error: result.errors,
           message: '[plugin] your settings is invalid with plugin manifest setting schema',
@@ -153,7 +153,9 @@ export const chatPlugin: StateCreator<
         type: PluginErrorType.PluginSettingsInvalid as any,
       });
 
-      await get().refreshMessages();
+      if (updateResult?.success && updateResult.messages) {
+        get().replaceMessages(updateResult.messages);
+      }
       return;
     }
   },
@@ -228,15 +230,15 @@ export const chatPlugin: StateCreator<
         groupId: message.groupId, // Propagate groupId from parent message for group chat
       };
 
-      const id = await get().internal_createMessage(toolMessage);
-      if (!id) return;
+      const result = await get().internal_createMessage(toolMessage);
+      if (!result) return;
 
       // trigger the plugin call
-      const data = await get().internal_invokeDifferentTypePlugin(id, payload);
+      const data = await get().internal_invokeDifferentTypePlugin(result.id, payload);
 
       if (data && !['markdown', 'standalone'].includes(payload.type)) {
         shouldCreateMessage = true;
-        latestToolId = id;
+        latestToolId = result.id;
       }
     });
 
@@ -252,13 +254,19 @@ export const chatPlugin: StateCreator<
     await get().triggerAIMessage({ traceId, threadId, inPortalThread, inSearchWorkflow });
   },
   updatePluginState: async (id, value) => {
-    const { refreshMessages } = get();
+    const { replaceMessages } = get();
 
     // optimistic update
     get().internal_dispatchMessage({ id, type: 'updateMessage', value: { pluginState: value } });
 
-    await messageService.updateMessagePluginState(id, value);
-    await refreshMessages();
+    const result = await messageService.updateMessagePluginState(id, value, {
+      sessionId: get().activeId,
+      topicId: get().activeTopicId,
+    });
+
+    if (result?.success && result.messages) {
+      replaceMessages(result.messages);
+    }
   },
 
   updatePluginArguments: async (id, value, replace = false) => {
@@ -336,18 +344,26 @@ export const chatPlugin: StateCreator<
     const message = chatSelectors.getMessageById(id)(get());
     if (!message || !message.tools) return;
 
-    const { internal_toggleMessageLoading, refreshMessages } = get();
+    const { internal_toggleMessageLoading, replaceMessages } = get();
 
     internal_toggleMessageLoading(true, id);
-    await messageService.updateMessage(id, { tools: message.tools });
+    const result = await messageService.updateMessage(
+      id,
+      { tools: message.tools },
+      {
+        sessionId: get().activeId,
+        topicId: get().activeTopicId,
+      },
+    );
     internal_toggleMessageLoading(false, id);
 
-    await refreshMessages();
+    if (result?.success && result.messages) {
+      replaceMessages(result.messages);
+    }
   },
 
   internal_callPluginApi: async (id, payload) => {
-    const { internal_updateMessageContent, refreshMessages, internal_togglePluginApiCalling } =
-      get();
+    const { internal_updateMessageContent, internal_togglePluginApiCalling } = get();
     let data: string;
 
     try {
@@ -375,8 +391,10 @@ export const chatPlugin: StateCreator<
 
       // ignore the aborted request error
       if (!err.message.includes('The user aborted a request.')) {
-        await messageService.updateMessageError(id, error as any);
-        await refreshMessages();
+        const result = await messageService.updateMessageError(id, error as any);
+        if (result?.success && result.messages) {
+          get().replaceMessages(result.messages);
+        }
       }
 
       data = '';
@@ -418,7 +436,6 @@ export const chatPlugin: StateCreator<
   invokeMCPTypePlugin: async (id, payload) => {
     const {
       internal_updateMessageContent,
-      refreshMessages,
       internal_togglePluginApiCalling,
       internal_constructToolsCallingContext,
     } = get();
@@ -444,8 +461,10 @@ export const chatPlugin: StateCreator<
 
       // ignore the aborted request error
       if (!err.message.includes('The user aborted a request.')) {
-        await messageService.updateMessageError(id, error as any);
-        await refreshMessages();
+        const result = await messageService.updateMessageError(id, error as any);
+        if (result?.success && result.messages) {
+          get().replaceMessages(result.messages);
+        }
       }
     }
 
@@ -487,11 +506,20 @@ export const chatPlugin: StateCreator<
     return toolNameResolver.resolve(toolCalls, manifests);
   },
   internal_updatePluginError: async (id, error) => {
-    const { refreshMessages } = get();
+    const { replaceMessages } = get();
 
     get().internal_dispatchMessage({ id, type: 'updateMessage', value: { error } });
-    await messageService.updateMessage(id, { error });
-    await refreshMessages();
+    const result = await messageService.updateMessage(
+      id,
+      { error },
+      {
+        sessionId: get().activeId,
+        topicId: get().activeTopicId,
+      },
+    );
+    if (result?.success && result.messages) {
+      replaceMessages(result.messages);
+    }
   },
 
   internal_constructToolsCallingContext: (id: string) => {