@lobehub/lobehub 2.0.0-next.37 → 2.0.0-next.39

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

@@ -77,7 +77,7 @@ export interface StreamingExecutorAction {
   internal_execAgentRuntime: (params: {
     messages: UIChatMessage[];
     parentMessageId: string;
-    parentMessageType: 'user' | 'assistant';
+    parentMessageType: 'user' | 'assistant' | 'tool';
     inSearchWorkflow?: boolean;
     /**
      * the RAG query content, should be embedding and used in the semantic search
@@ -85,6 +85,7 @@ export interface StreamingExecutorAction {
     ragQuery?: string;
     threadId?: string;
     inPortalThread?: boolean;
+    skipCreateFirstMessage?: boolean;
     traceId?: string;
     ragMetadata?: { ragQueryId: string; fileChunks: MessageSemanticSearchChunk[] };
   }) => Promise<void>;
@@ -137,7 +138,7 @@ export const streamingExecutor: StateCreator<
     let output = '';
     let thinking = '';
     let thinkingStartAt: number;
-    let duration: number;
+    let duration: number | undefined;
     // to upload image
     const uploadTasks: Map<string, Promise<{ id?: string; url?: string }>> = new Map();
 
@@ -231,7 +232,9 @@ export const streamingExecutor: StateCreator<
         // update the content after fetch result
         await optimisticUpdateMessageContent(messageId, content, {
           toolCalls: parsedToolCalls,
-          reasoning: !!reasoning ? { ...reasoning, duration } : undefined,
+          reasoning: !!reasoning
+            ? { ...reasoning, duration: duration && !isNaN(duration) ? duration : undefined }
+            : undefined,
           search: !!grounding?.citations ? grounding : undefined,
           imageList: finalImages.length > 0 ? finalImages : undefined,
           metadata: speed ? { ...usage, ...speed } : usage,
@@ -340,6 +343,10 @@ export const streamingExecutor: StateCreator<
             isFunctionCall = true;
             const isInChatReasoning = get().reasoningLoadingIds.includes(messageId);
             if (isInChatReasoning) {
+              if (!duration) {
+                duration = Date.now() - thinkingStartAt;
+              }
+
               internal_toggleChatReasoning(
                 false,
                 messageId,
@@ -456,8 +463,8 @@ export const streamingExecutor: StateCreator<
         get,
         messageKey,
         parentId: params.parentMessageId,
-        parentMessageType,
         params,
+        skipCreateFirstMessage: params.skipCreateFirstMessage,
       }),
     });
 
@@ -465,7 +472,8 @@ export const streamingExecutor: StateCreator<
     let state = AgentRuntime.createInitialState({
       sessionId: activeId,
       messages,
-      maxSteps: 20, // Prevent infinite loops
+      // Prevent infinite loops
+      maxSteps: 400,
       metadata: {
         sessionId: activeId,
         topicId: activeTopicId,

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

@@ -24,10 +24,10 @@ const mockStore = {
   internal_triggerLocalFileToolCalling: vi.fn(),
   optimisticUpdateMessageContent: vi.fn(),
   optimisticUpdateMessagePluginError: vi.fn(),
+  optimisticUpdatePluginArguments: vi.fn(),
+  optimisticUpdatePluginState: vi.fn(),
   set: mockSet,
   toggleLocalFileLoading: vi.fn(),
-  updatePluginArguments: vi.fn(),
-  updatePluginState: vi.fn(),
 } as unknown as ChatStore;
 
 const createStore = () => {
@@ -57,7 +57,7 @@ describe('localFileSlice', () => {
       await store.internal_triggerLocalFileToolCalling('test-id', mockService);
 
       expect(mockStore.toggleLocalFileLoading).toBeCalledWith('test-id', true);
-      expect(mockStore.updatePluginState).toBeCalledWith('test-id', mockState);
+      expect(mockStore.optimisticUpdatePluginState).toBeCalledWith('test-id', mockState);
       expect(mockStore.optimisticUpdateMessageContent).toBeCalledWith(
         'test-id',
         JSON.stringify(mockContent),

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

@@ -32,10 +32,10 @@ describe('search actions', () => {
       searchLoading: {},
       optimisticUpdateMessageContent: vi.fn(),
       optimisticUpdateMessagePluginError: vi.fn(),
-      updatePluginArguments: vi.fn(),
-      updatePluginState: vi.fn(),
+      optimisticUpdatePluginArguments: vi.fn(),
+      optimisticUpdatePluginState: vi.fn(),
       optimisticCreateMessage: vi.fn(),
-      internal_addToolToAssistantMessage: vi.fn(),
+      optimisticAddToolToAssistantMessage: vi.fn(),
       openToolUI: vi.fn(),
     });
   });
@@ -238,7 +238,7 @@ describe('search actions', () => {
         await triggerSearchAgain(messageId, query, { aiSummary: true });
       });
 
-      expect(result.current.updatePluginArguments).toHaveBeenCalledWith(messageId, query);
+      expect(result.current.optimisticUpdatePluginArguments).toHaveBeenCalledWith(messageId, query);
       expect(spy).toHaveBeenCalledWith(messageId, query, true);
     });
   });
@@ -285,7 +285,7 @@ describe('search actions', () => {
         }),
       );
 
-      expect(result.current.internal_addToolToAssistantMessage).toHaveBeenCalledWith(
+      expect(result.current.optimisticAddToolToAssistantMessage).toHaveBeenCalledWith(
         parentId,
         expect.objectContaining({
           identifier: 'search',
@@ -305,7 +305,7 @@ describe('search actions', () => {
       });
 
       expect(result.current.optimisticCreateMessage).not.toHaveBeenCalled();
-      expect(result.current.internal_addToolToAssistantMessage).not.toHaveBeenCalled();
+      expect(result.current.optimisticAddToolToAssistantMessage).not.toHaveBeenCalled();
     });
   });
 

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

@@ -41,7 +41,7 @@ export const codeInterpreterSlice: StateCreator<
   python: async (id: string, params: CodeInterpreterParams) => {
     const {
       toggleInterpreterExecuting,
-      updatePluginState,
+      optimisticUpdatePluginState,
       optimisticUpdateMessageContent,
       uploadInterpreterFiles,
     } = get();
@@ -83,7 +83,7 @@ export const codeInterpreterSlice: StateCreator<
         await optimisticUpdateMessageContent(id, JSON.stringify(result));
       }
     } catch (error) {
-      updatePluginState(id, { error });
+      optimisticUpdatePluginState(id, { error });
       // 如果调用过程中出现了错误，不要触发 AI 消息
       return;
     } finally {

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

@@ -220,7 +220,7 @@ export const localSystemSlice: StateCreator<
   reSearchLocalFiles: async (id, params) => {
     get().toggleLocalFileLoading(id, true);
 
-    await get().updatePluginArguments(id, params);
+    await get().optimisticUpdatePluginArguments(id, params);
 
     return get().searchLocalFiles(id, params);
   },
@@ -307,7 +307,7 @@ export const localSystemSlice: StateCreator<
     try {
       const { state, content } = await callingService();
       if (state) {
-        await get().updatePluginState(id, state as any);
+        await get().optimisticUpdatePluginState(id, state as any);
       }
       await get().optimisticUpdateMessageContent(id, JSON.stringify(content));
     } catch (error) {

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

@@ -51,9 +51,9 @@ export const searchSlice: StateCreator<
       await optimisticUpdateMessageContent(id, content);
 
       if (success) {
-        await get().updatePluginState(id, state);
+        await get().optimisticUpdatePluginState(id, state);
       } else {
-        await get().internal_updatePluginError(id, error);
+        await get().optimisticUpdatePluginError(id, error);
       }
       get().toggleSearchLoading(id, false);
 
@@ -81,7 +81,7 @@ export const searchSlice: StateCreator<
     const message = chatSelectors.getMessageById(id)(get());
     if (!message || !message.plugin) return;
 
-    const { internal_addToolToAssistantMessage, optimisticCreateMessage, openToolUI } = get();
+    const { optimisticAddToolToAssistantMessage, optimisticCreateMessage, openToolUI } = get();
     // 1. 创建一个新的 tool call message
     const newToolCallId = `tool_call_${nanoid()}`;
 
@@ -100,7 +100,7 @@ export const searchSlice: StateCreator<
     const addToolItem = async () => {
       if (!message.parentId || !message.plugin) return;
 
-      await internal_addToolToAssistantMessage(message.parentId, {
+      await optimisticAddToolToAssistantMessage(message.parentId, {
         id: newToolCallId,
         ...message.plugin,
       });
@@ -124,7 +124,7 @@ export const searchSlice: StateCreator<
     const { content, success, error, state } = await runtime.search(params);
 
     if (success) {
-      await get().updatePluginState(id, state);
+      await get().optimisticUpdatePluginState(id, state);
     } else {
       if ((error as Error).message === SEARCH_SEARXNG_NOT_CONFIG) {
         await get().optimisticUpdateMessagePluginError(id, {
@@ -164,7 +164,7 @@ export const searchSlice: StateCreator<
 
   triggerSearchAgain: async (id, data, options) => {
     get().toggleSearchLoading(id, true);
-    await get().updatePluginArguments(id, data);
+    await get().optimisticUpdatePluginArguments(id, data);
 
     await get().search(id, data, options?.aiSummary);
   },

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

@@ -31,6 +31,7 @@ export interface MessagePublicApiAction {
    */
   clearMessage: () => Promise<void>;
   deleteMessage: (id: string) => Promise<void>;
+  deleteDBMessage: (id: string) => Promise<void>;
   deleteToolMessage: (id: string) => Promise<void>;
   clearAllMessages: () => Promise<void>;
 
@@ -135,13 +136,30 @@ export const messagePublicApi: StateCreator<
     }
   },
 
+  deleteDBMessage: async (id) => {
+    const message = dbMessageSelectors.getDbMessageById(id)(get());
+    if (!message) return;
+
+    let ids = [message.id];
+
+    get().internal_dispatchMessage({ type: 'deleteMessages', ids });
+    const result = await messageService.removeMessages(ids, {
+      sessionId: get().activeId,
+      topicId: get().activeTopicId,
+    });
+
+    if (result?.success && result.messages) {
+      get().replaceMessages(result.messages);
+    }
+  },
+
   deleteToolMessage: async (id) => {
     const message = dbMessageSelectors.getDbMessageById(id)(get());
     if (!message || message.role !== 'tool') return;
 
     const removeToolInAssistantMessage = async () => {
       if (!message.parentId) return;
-      await get().internal_removeToolToAssistantMessage(message.parentId, message.tool_call_id);
+      await get().optimisticRemoveToolFromAssistantMessage(message.parentId, message.tool_call_id);
     };
 
     await Promise.all([

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

@@ -15,6 +15,10 @@ export interface ChatMessageState {
    * Derived from session.type, used for caching to avoid repeated lookups
    */
   activeSessionType?: 'agent' | 'group';
+  /**
+   * is the message is continuing generation (used for disable continue button)
+   */
+  continuingIds: string[];
   /**
    * Raw messages from database (flat structure)
    */
@@ -73,6 +77,7 @@ export interface ChatMessageState {
 export const initialMessageState: ChatMessageState = {
   activeId: 'inbox',
   activeSessionType: undefined,
+  continuingIds: [],
   dbMessagesMap: {},
   groupAgentMaps: {},
   groupMaps: {},