@lobehub/lobehub 2.0.0-next.103 → 2.0.0-next.105

package/src/store/chat/agents/__tests__/createAgentExecutors/call-llm.test.ts

@@ -58,6 +58,9 @@ describe('call_llm executor', () => {
           sessionId: 'test-session',
           topicId: 'test-topic',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -229,6 +232,9 @@ describe('call_llm executor', () => {
         expect.objectContaining({
           parentId: 'msg_payload_parent',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -262,6 +268,9 @@ describe('call_llm executor', () => {
         expect.objectContaining({
           parentId: 'msg_context_parent',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
   });
@@ -1061,6 +1070,9 @@ describe('call_llm executor', () => {
           model: 'claude-3-opus',
           provider: 'anthropic',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
       expect(mockStore.internal_fetchAIChatMessage).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -1180,6 +1192,9 @@ describe('call_llm executor', () => {
         expect.objectContaining({
           threadId,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -1211,6 +1226,9 @@ describe('call_llm executor', () => {
         expect.objectContaining({
           threadId: undefined,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
   });

package/src/store/chat/agents/__tests__/createAgentExecutors/call-tool.test.ts

@@ -156,17 +156,22 @@ describe('call_tool executor', () => {
       });
 
       // Then
-      expect(mockStore.optimisticCreateMessage).toHaveBeenCalledWith({
-        content: '',
-        groupId: 'group_789',
-        parentId: 'msg_parent_123',
-        plugin: toolCall,
-        role: 'tool',
-        sessionId: 'sess_123',
-        threadId: undefined,
-        tool_call_id: 'tool_call_xyz',
-        topicId: 'topic_456',
-      });
+      expect(mockStore.optimisticCreateMessage).toHaveBeenCalledWith(
+        expect.objectContaining({
+          content: '',
+          groupId: 'group_789',
+          parentId: 'msg_parent_123',
+          plugin: toolCall,
+          role: 'tool',
+          sessionId: 'sess_123',
+          threadId: undefined,
+          tool_call_id: 'tool_call_xyz',
+          topicId: 'topic_456',
+        }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
+      );
     });
 
     it('should use assistant message groupId for tool message', async () => {
@@ -194,6 +199,9 @@ describe('call_tool executor', () => {
         expect.objectContaining({
           groupId: 'group_special',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -222,6 +230,9 @@ describe('call_tool executor', () => {
         expect.objectContaining({
           parentId: 'msg_custom_parent',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -262,6 +273,9 @@ describe('call_tool executor', () => {
         expect.objectContaining({
           plugin: toolCall,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
   });
@@ -1542,6 +1556,9 @@ describe('call_tool executor', () => {
         expect.objectContaining({
           groupId: undefined,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
       expect(result.events).toHaveLength(1);
     });
@@ -1570,6 +1587,9 @@ describe('call_tool executor', () => {
         expect.objectContaining({
           groupId: undefined,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -1641,6 +1661,9 @@ describe('call_tool executor', () => {
         expect.objectContaining({
           topicId: undefined,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -1679,6 +1702,9 @@ describe('call_tool executor', () => {
             type: 'builtin',
           }),
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
       expect(result.events).toHaveLength(1);
     });
@@ -1768,6 +1794,9 @@ describe('call_tool executor', () => {
         expect.objectContaining({
           groupId: 'group_latest',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
   });

package/src/store/chat/agents/__tests__/createAgentExecutors/helpers/assertions.ts

@@ -22,6 +22,9 @@ export const expectMessageCreated = (mockStore: ChatStore, role: 'assistant' | '
     expect.objectContaining({
       role,
     }),
+    expect.objectContaining({
+      operationId: expect.any(String),
+    }),
   );
 };
 

package/src/store/chat/agents/__tests__/createAgentExecutors/request-human-approve.test.ts

@@ -51,6 +51,9 @@ describe('request_human_approve executor', () => {
           parentId: 'msg_assistant',
           groupId: assistantMessage.groupId,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -205,6 +208,9 @@ describe('request_human_approve executor', () => {
         expect.objectContaining({
           groupId: 'group_123',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -232,6 +238,9 @@ describe('request_human_approve executor', () => {
         expect.objectContaining({
           parentId: 'msg_assistant_456',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
   });
@@ -330,6 +339,9 @@ describe('request_human_approve executor', () => {
             tool_call_id: toolCall.id,
             pluginIntervention: { status: 'pending' },
           }),
+          expect.objectContaining({
+            operationId: expect.any(String),
+          }),
         );
       });
     });
@@ -539,6 +551,9 @@ describe('request_human_approve executor', () => {
         expect.objectContaining({
           parentId: 'msg_3_last',
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
   });

package/src/store/chat/agents/__tests__/createAgentExecutors/resolve-aborted-tools.test.ts

@@ -57,6 +57,9 @@ describe('resolve_aborted_tools executor', () => {
           topicId: 'test-topic',
           parentId: parentMessage.id,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -114,6 +117,9 @@ describe('resolve_aborted_tools executor', () => {
             pluginIntervention: { status: 'aborted' },
             tool_call_id: toolCall.id,
           }),
+          expect.objectContaining({
+            operationId: expect.any(String),
+          }),
         );
       });
     });
@@ -193,17 +199,22 @@ describe('resolve_aborted_tools executor', () => {
       });
 
       // Then
-      expect(mockStore.optimisticCreateMessage).toHaveBeenCalledWith({
-        role: 'tool',
-        content: 'Tool execution was aborted by user.',
-        plugin: toolCall,
-        pluginIntervention: { status: 'aborted' },
-        tool_call_id: 'tool_abc',
-        parentId: 'msg_parent',
-        sessionId: 'sess_123',
-        topicId: 'topic_456',
-        threadId: undefined,
-      });
+      expect(mockStore.optimisticCreateMessage).toHaveBeenCalledWith(
+        expect.objectContaining({
+          role: 'tool',
+          content: 'Tool execution was aborted by user.',
+          plugin: toolCall,
+          pluginIntervention: { status: 'aborted' },
+          tool_call_id: 'tool_abc',
+          parentId: 'msg_parent',
+          sessionId: 'sess_123',
+          topicId: 'topic_456',
+          threadId: undefined,
+        }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
+      );
     });
 
     it('should preserve tool payload details', async () => {
@@ -240,6 +251,9 @@ describe('resolve_aborted_tools executor', () => {
         expect.objectContaining({
           plugin: toolCall,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -264,6 +278,9 @@ describe('resolve_aborted_tools executor', () => {
         expect.objectContaining({
           topicId: undefined,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
   });
@@ -481,6 +498,9 @@ describe('resolve_aborted_tools executor', () => {
         expect.objectContaining({
           plugin: toolCall,
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -571,6 +591,9 @@ describe('resolve_aborted_tools executor', () => {
             type: 'builtin',
           }),
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 
@@ -606,6 +629,9 @@ describe('resolve_aborted_tools executor', () => {
             type: 'default',
           }),
         }),
+        expect.objectContaining({
+          operationId: expect.any(String),
+        }),
       );
     });
 

package/src/store/chat/agents/createAgentExecutors.ts

@@ -89,16 +89,19 @@ export const createAgentExecutors = (context: {
           llmPayload.parentMessageId = context.parentId;
         }
         // Create assistant message (following server-side pattern)
-        const assistantMessageItem = await context.get().optimisticCreateMessage({
-          content: LOADING_FLAT,
-          model: llmPayload.model,
-          parentId: llmPayload.parentMessageId,
-          provider: llmPayload.provider,
-          role: 'assistant',
-          sessionId: opContext.sessionId!,
-          threadId: opContext.threadId,
-          topicId: opContext.topicId ?? undefined,
-        });
+        const assistantMessageItem = await context.get().optimisticCreateMessage(
+          {
+            content: LOADING_FLAT,
+            model: llmPayload.model,
+            parentId: llmPayload.parentMessageId,
+            provider: llmPayload.provider,
+            role: 'assistant',
+            sessionId: opContext.sessionId!,
+            threadId: opContext.threadId,
+            topicId: opContext.topicId ?? undefined,
+          },
+          { operationId: context.operationId },
+        );
 
         if (!assistantMessageItem) {
           throw new Error('Failed to create assistant message');
@@ -371,7 +374,9 @@ export const createAgentExecutors = (context: {
             topicId: opContext.topicId ?? undefined,
           };
 
-          const createPromise = context.get().optimisticCreateMessage(toolMessageParams);
+          const createPromise = context
+            .get()
+            .optimisticCreateMessage(toolMessageParams, { operationId: createToolMsgOpId });
           context.get().updateOperationMetadata(createToolMsgOpId, {
             createMessagePromise: createPromise,
           });
@@ -632,7 +637,9 @@ export const createAgentExecutors = (context: {
             topicId: opContext.topicId ?? undefined,
           };
 
-          const createResult = await context.get().optimisticCreateMessage(toolMessageParams);
+          const createResult = await context
+            .get()
+            .optimisticCreateMessage(toolMessageParams, { operationId: context.operationId });
 
           if (!createResult) {
             log(
@@ -709,7 +716,9 @@ export const createAgentExecutors = (context: {
           topicId: opContext.topicId ?? undefined,
         };
 
-        const createResult = await context.get().optimisticCreateMessage(toolMessageParams);
+        const createResult = await context
+          .get()
+          .optimisticCreateMessage(toolMessageParams, { operationId: context.operationId });
 
         if (createResult) {
           log(

package/src/store/chat/slices/aiChat/actions/conversationLifecycle.ts

@@ -261,6 +261,10 @@ export const conversationLifecycle: StateCreator<
 
     summaryTitle().catch(console.error);
 
+    // Complete sendMessage operation here - message creation is done
+    // execAgentRuntime is a separate operation (child) that handles AI response generation
+    get().completeOperation(operationId);
+
     // Get the current messages to generate AI response
     const displayMessages = displayMessageSelectors.activeDisplayMessages(get());
 
@@ -287,16 +291,8 @@ export const conversationLifecycle: StateCreator<
       if (userFiles.length > 0) {
         await getAgentStoreState().addFilesToAgent(userFiles, false);
       }
-
-      // Complete operation on success
-      get().completeOperation(operationId);
     } catch (e) {
       console.error(e);
-      // Fail operation on error
-      get().failOperation(operationId, {
-        type: e instanceof Error ? e.name : 'unknown_error',
-        message: e instanceof Error ? e.message : 'AI generation failed',
-      });
     } finally {
       if (data.topicId) get().internal_updateTopicLoading(data.topicId, false);
     }

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

@@ -241,9 +241,18 @@ describe('search actions', () => {
     it('should update arguments and perform search', async () => {
       const { result } = renderHook(() => useChatStore());
       const spy = vi.spyOn(result.current, 'search');
-      const { triggerSearchAgain } = result.current;
 
       const messageId = 'test-message-id';
+      const operationId = 'op_test';
+
+      // Set up messageOperationMap so triggerSearchAgain can get operationId
+      useChatStore.setState({
+        messageOperationMap: {
+          [messageId]: operationId,
+        },
+      });
+
+      const { triggerSearchAgain } = result.current;
       const query: SearchQuery = {
         query: 'test query',
       };
@@ -252,7 +261,12 @@ describe('search actions', () => {
         await triggerSearchAgain(messageId, query, { aiSummary: true });
       });
 
-      expect(result.current.optimisticUpdatePluginArguments).toHaveBeenCalledWith(messageId, query);
+      expect(result.current.optimisticUpdatePluginArguments).toHaveBeenCalledWith(
+        messageId,
+        query,
+        false,
+        { operationId },
+      );
       expect(spy).toHaveBeenCalledWith(messageId, query, true);
     });
   });

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

@@ -108,7 +108,11 @@ export const localSystemSlice: StateCreator<
   },
 
   reSearchLocalFiles: async (id, params) => {
-    await get().optimisticUpdatePluginArguments(id, params);
+    // Get operationId from messageOperationMap to ensure proper context isolation
+    const operationId = get().messageOperationMap[id];
+    const context = operationId ? { operationId } : undefined;
+
+    await get().optimisticUpdatePluginArguments(id, params, false, context);
 
     return get().searchLocalFiles(id, params);
   },

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

@@ -276,7 +276,11 @@ export const searchSlice: StateCreator<
   },
 
   triggerSearchAgain: async (id, data, options) => {
-    await get().optimisticUpdatePluginArguments(id, data);
+    // Get operationId from messageOperationMap to ensure proper context isolation
+    const operationId = get().messageOperationMap[id];
+    const context = operationId ? { operationId } : undefined;
+
+    await get().optimisticUpdatePluginArguments(id, data, false, context);
 
     await get().search(id, data, options?.aiSummary);
   },

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

@@ -167,14 +167,22 @@ export const messagePublicApi: StateCreator<
     const message = dbMessageSelectors.getDbMessageById(id)(get());
     if (!message || message.role !== 'tool') return;
 
+    // Get operationId from messageOperationMap to ensure proper context isolation
+    const operationId = get().messageOperationMap[id];
+    const context = operationId ? { operationId } : undefined;
+
     const removeToolInAssistantMessage = async () => {
       if (!message.parentId) return;
-      await get().optimisticRemoveToolFromAssistantMessage(message.parentId, message.tool_call_id);
+      await get().optimisticRemoveToolFromAssistantMessage(
+        message.parentId,
+        message.tool_call_id,
+        context,
+      );
     };
 
     await Promise.all([
       // 1. remove tool message
-      get().optimisticDeleteMessage(id),
+      get().optimisticDeleteMessage(id, context),
       // 2. remove the tool item in the assistant tools
       removeToolInAssistantMessage(),
     ]);

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

@@ -32,6 +32,7 @@ export interface MessageQueryAction {
     messages: UIChatMessage[],
     params?: {
       action?: any;
+      operationId?: string;
       sessionId?: string;
       topicId?: string | null;
     },
@@ -66,10 +67,22 @@ export const messageQuery: StateCreator<
   },
 
   replaceMessages: (messages, params) => {
-    const messagesKey = messageMapKey(
-      params?.sessionId ?? get().activeId,
-      params?.topicId ?? get().activeTopicId,
-    );
+    let sessionId: string;
+    let topicId: string | null | undefined;
+
+    // Priority 1: Get context from operation if operationId is provided
+    if (params?.operationId) {
+      const { sessionId: opSessionId, topicId: opTopicId } =
+        get().internal_getSessionContext(params);
+      sessionId = opSessionId;
+      topicId = opTopicId;
+    } else {
+      // Priority 2: Use explicit sessionId/topicId or fallback to global state
+      sessionId = params?.sessionId ?? get().activeId;
+      topicId = params?.topicId ?? get().activeTopicId;
+    }
+
+    const messagesKey = messageMapKey(sessionId, topicId);
 
     // Get raw messages from dbMessagesMap and apply reducer
     const nextDbMap = { ...get().dbMessagesMap, [messagesKey]: messages };