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

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';
+  /**
+   * Raw messages from database (flat structure)
+   */
+  dbMessagesMap: Record<string, UIChatMessage[]>;
   /**
    * Group agents maps by group ID
    */
@@ -40,7 +44,14 @@ export interface ChatMessageState {
    * whether messages have fetched
    */
   messagesInit: boolean;
+  /**
+   * Parsed messages for display (includes assistantGroup from conversation-flow)
+   */
   messagesMap: Record<string, UIChatMessage[]>;
+  /**
+   * is the message is regenerating (used for disable regenerate button)
+   */
+  regeneratingIds: string[];
   /**
    * Supervisor decision debounce timers by group ID
    */
@@ -62,6 +73,7 @@ export interface ChatMessageState {
 export const initialMessageState: ChatMessageState = {
   activeId: 'inbox',
   activeSessionType: undefined,
+  dbMessagesMap: {},
   groupAgentMaps: {},
   groupMaps: {},
   groupsInit: false,
@@ -70,6 +82,7 @@ export const initialMessageState: ChatMessageState = {
   messageLoadingIds: [],
   messagesInit: false,
   messagesMap: {},
+  regeneratingIds: [],
   supervisorDebounceTimers: {},
   supervisorDecisionAbortControllers: {},
   supervisorDecisionLoading: [],

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

@@ -56,133 +56,6 @@ describe('messagesReducer', () => {
 
       expect(newState).toEqual(initialState);
     });
-
-    it('should update a block in group message children when id matches a block', () => {
-      const stateWithGroup: UIChatMessage[] = [
-        ...initialState,
-        {
-          id: 'group1',
-          role: 'group',
-          content: '',
-          createdAt: 1629264000000,
-          updatedAt: 1629264000000,
-          meta: {},
-          children: [
-            {
-              id: 'block1',
-              content: 'Original block content',
-              tools: [
-                {
-                  id: 'tool1',
-                  identifier: 'search',
-                  apiName: 'search',
-                  type: 'builtin',
-                  arguments: '{"query": "test"}',
-                },
-              ],
-            },
-          ],
-        } as UIChatMessage,
-      ];
-
-      const payload: MessageDispatch = {
-        type: 'updateMessage',
-        id: 'block1',
-        value: { content: 'Updated block content' },
-      };
-
-      const newState = messagesReducer(stateWithGroup, payload);
-      const groupMessage = newState.find((m) => m.id === 'group1');
-      const block = groupMessage?.children?.find((b) => b.id === 'block1');
-
-      expect(block?.content).toBe('Updated block content');
-      expect(groupMessage?.updatedAt).toBeGreaterThan(1629264000000);
-    });
-
-    it('should update block tools in group message children', () => {
-      const stateWithGroup: UIChatMessage[] = [
-        ...initialState,
-        {
-          id: 'group1',
-          role: 'group',
-          content: '',
-          createdAt: 1629264000000,
-          updatedAt: 1629264000000,
-          meta: {},
-          children: [
-            {
-              id: 'block1',
-              content: 'Block content',
-              tools: [
-                {
-                  id: 'tool1',
-                  identifier: 'search',
-                  apiName: 'search',
-                  type: 'builtin',
-                  arguments: '{"query": "test"}',
-                },
-              ],
-            },
-          ],
-        } as UIChatMessage,
-      ];
-
-      const newTools = [
-        {
-          id: 'tool1',
-          identifier: 'search',
-          apiName: 'search',
-          type: 'builtin',
-          arguments: '{"query": "updated"}',
-          result: {
-            id: 'result1',
-            content: 'Search result',
-          },
-        },
-      ];
-
-      const payload: MessageDispatch = {
-        type: 'updateMessage',
-        id: 'block1',
-        value: { tools: newTools as any },
-      };
-
-      const newState = messagesReducer(stateWithGroup, payload);
-      const groupMessage = newState.find((m) => m.id === 'group1');
-      const block = groupMessage?.children?.find((b) => b.id === 'block1');
-
-      expect(block?.tools).toEqual(newTools);
-      expect(groupMessage?.updatedAt).toBeGreaterThan(1629264000000);
-    });
-
-    it('should not modify state when updating non-existent block in group message', () => {
-      const stateWithGroup: UIChatMessage[] = [
-        ...initialState,
-        {
-          id: 'group1',
-          role: 'group',
-          content: '',
-          createdAt: 1629264000000,
-          updatedAt: 1629264000000,
-          meta: {},
-          children: [
-            {
-              id: 'block1',
-              content: 'Block content',
-            },
-          ],
-        } as UIChatMessage,
-      ];
-
-      const payload: MessageDispatch = {
-        type: 'updateMessage',
-        id: 'nonexistentBlock',
-        value: { content: 'Updated content' },
-      };
-
-      const newState = messagesReducer(stateWithGroup, payload);
-      expect(newState).toEqual(stateWithGroup);
-    });
   });
 
   describe('unimplemented type', () => {
@@ -254,6 +127,54 @@ describe('messagesReducer', () => {
     });
   });
 
+  describe('updateMessageMetadata', () => {
+    it('should merge update the metadata field of a message', () => {
+      const payload: MessageDispatch = {
+        type: 'updateMessageMetadata',
+        id: 'message1',
+        value: { activeBranchIndex: 1 },
+      };
+
+      const newState = messagesReducer(initialState, payload);
+      const updatedMessage = newState.find((m) => m.id === 'message1');
+
+      expect(updatedMessage?.metadata).toEqual({ activeBranchIndex: 1 });
+      expect(updatedMessage?.updatedAt).toBeGreaterThan(initialState[0].updatedAt);
+    });
+
+    it('should merge update the metadata field if metadata already exists', () => {
+      const state = [
+        {
+          ...initialState[0],
+          metadata: { activeBranchIndex: 0 },
+        },
+      ];
+
+      const payload: MessageDispatch = {
+        type: 'updateMessageMetadata',
+        id: 'message1',
+        value: { activeBranchIndex: 2 },
+      };
+
+      const newState = messagesReducer(state, payload);
+      const updatedMessage = newState.find((m) => m.id === 'message1');
+
+      expect(updatedMessage?.metadata).toEqual({ activeBranchIndex: 2 });
+      expect(updatedMessage?.updatedAt).toBeGreaterThan(initialState[0].updatedAt);
+    });
+
+    it('should not modify state if message is not found', () => {
+      const payload: MessageDispatch = {
+        type: 'updateMessageMetadata',
+        id: 'nonexistent',
+        value: { activeBranchIndex: 1 },
+      };
+
+      const newState = messagesReducer(initialState, payload);
+      expect(newState).toEqual(initialState);
+    });
+  });
+
   describe('updatePluginState', () => {
     it('should update the plugin state of a message', () => {
       const payload: MessageDispatch = {
@@ -617,247 +538,4 @@ describe('messagesReducer', () => {
       expect(newState).toEqual(initialState);
     });
   });
-
-  describe('updateGroupBlockToolResult', () => {
-    it('should update a tool result in a group message block', () => {
-      const stateWithGroup: UIChatMessage[] = [
-        ...initialState,
-        {
-          id: 'group1',
-          role: 'group',
-          content: '',
-          createdAt: 1629264000000,
-          updatedAt: 1629264000000,
-          meta: {},
-          children: [
-            {
-              id: 'block1',
-              content: 'Assistant response',
-              tools: [
-                {
-                  id: 'tool1',
-                  identifier: 'search',
-                  apiName: 'search',
-                  type: 'builtin',
-                  arguments: '{"query": "test"}',
-                  result: {
-                    id: 'result1',
-                    content: 'Initial result',
-                  },
-                },
-              ],
-            },
-          ],
-        } as UIChatMessage,
-      ];
-
-      const payload: MessageDispatch = {
-        type: 'updateGroupBlockToolResult',
-        groupMessageId: 'group1',
-        blockId: 'block1',
-        toolId: 'tool1',
-        toolResult: {
-          id: 'result1',
-          content: 'Updated result content',
-          state: { foo: 'bar' },
-        },
-      };
-
-      const newState = messagesReducer(stateWithGroup, payload);
-      const groupMessage = newState.find((m) => m.id === 'group1');
-      const block = groupMessage?.children?.find((b) => b.id === 'block1');
-      const tool = block?.tools?.find((t) => t.id === 'tool1');
-
-      expect(tool?.result).toEqual({
-        id: 'result1',
-        content: 'Updated result content',
-        state: { foo: 'bar' },
-      });
-      expect(groupMessage?.updatedAt).toBeGreaterThan(1629264000000);
-    });
-
-    it('should not modify state if group message is not found', () => {
-      const payload: MessageDispatch = {
-        type: 'updateGroupBlockToolResult',
-        groupMessageId: 'nonexistent',
-        blockId: 'block1',
-        toolId: 'tool1',
-        toolResult: {
-          id: 'result1',
-          content: 'Updated result',
-        },
-      };
-
-      const newState = messagesReducer(initialState, payload);
-      expect(newState).toEqual(initialState);
-    });
-
-    it('should not modify state if block is not found', () => {
-      const stateWithGroup: UIChatMessage[] = [
-        ...initialState,
-        {
-          id: 'group1',
-          role: 'group',
-          content: '',
-          createdAt: 1629264000000,
-          updatedAt: 1629264000000,
-          meta: {},
-          children: [
-            {
-              id: 'block1',
-              content: 'Assistant response',
-              tools: [],
-            },
-          ],
-        } as UIChatMessage,
-      ];
-
-      const payload: MessageDispatch = {
-        type: 'updateGroupBlockToolResult',
-        groupMessageId: 'group1',
-        blockId: 'nonexistentBlock',
-        toolId: 'tool1',
-        toolResult: {
-          id: 'result1',
-          content: 'Updated result',
-        },
-      };
-
-      const newState = messagesReducer(stateWithGroup, payload);
-      expect(newState).toEqual(stateWithGroup);
-    });
-
-    it('should not modify state if tool is not found', () => {
-      const stateWithGroup: UIChatMessage[] = [
-        ...initialState,
-        {
-          id: 'group1',
-          role: 'group',
-          content: '',
-          createdAt: 1629264000000,
-          updatedAt: 1629264000000,
-          meta: {},
-          children: [
-            {
-              id: 'block1',
-              content: 'Assistant response',
-              tools: [
-                {
-                  id: 'tool1',
-                  identifier: 'search',
-                  apiName: 'search',
-                  type: 'builtin',
-                  arguments: '{"query": "test"}',
-                },
-              ],
-            },
-          ],
-        } as UIChatMessage,
-      ];
-
-      const payload: MessageDispatch = {
-        type: 'updateGroupBlockToolResult',
-        groupMessageId: 'group1',
-        blockId: 'block1',
-        toolId: 'nonexistentTool',
-        toolResult: {
-          id: 'result1',
-          content: 'Updated result',
-        },
-      };
-
-      const newState = messagesReducer(stateWithGroup, payload);
-      expect(newState).toEqual(stateWithGroup);
-    });
-  });
-
-  describe('addGroupBlock', () => {
-    it('should add a new block to group message children', () => {
-      const stateWithGroup: UIChatMessage[] = [
-        ...initialState,
-        {
-          id: 'group1',
-          role: 'group',
-          content: '',
-          createdAt: 1629264000000,
-          updatedAt: 1629264000000,
-          meta: {},
-          children: [
-            {
-              id: 'block1',
-              content: 'First block',
-            },
-          ],
-        } as UIChatMessage,
-      ];
-
-      const payload: MessageDispatch = {
-        type: 'addGroupBlock',
-        groupMessageId: 'group1',
-        blockId: 'block2',
-        value: {
-          id: 'block2',
-          content: 'Second block',
-        },
-      };
-
-      const newState = messagesReducer(stateWithGroup, payload);
-      const groupMessage = newState.find((m) => m.id === 'group1');
-
-      expect(groupMessage?.children).toHaveLength(2);
-      expect(groupMessage?.children?.[1]).toEqual({
-        id: 'block2',
-        content: 'Second block',
-      });
-      expect(groupMessage?.updatedAt).toBeGreaterThan(1629264000000);
-    });
-
-    it('should not modify state if group message is not found', () => {
-      const stateWithGroup: UIChatMessage[] = [
-        ...initialState,
-        {
-          id: 'group1',
-          role: 'group',
-          content: '',
-          createdAt: 1629264000000,
-          updatedAt: 1629264000000,
-          meta: {},
-          children: [
-            {
-              id: 'block1',
-              content: 'First block',
-            },
-          ],
-        } as UIChatMessage,
-      ];
-
-      const payload: MessageDispatch = {
-        type: 'addGroupBlock',
-        groupMessageId: 'nonexistentGroup',
-        blockId: 'block2',
-        value: {
-          id: 'block2',
-          content: 'Second block',
-        },
-      };
-
-      const newState = messagesReducer(stateWithGroup, payload);
-      expect(newState).toEqual(stateWithGroup);
-    });
-
-    it('should not modify state if message is not a group message', () => {
-      const payload: MessageDispatch = {
-        type: 'addGroupBlock',
-        groupMessageId: 'message1',
-        blockId: 'block2',
-        value: {
-          id: 'block2',
-          content: 'Second block',
-        },
-      };
-
-      const newState = messagesReducer(initialState, payload);
-      expect(newState).toEqual(initialState);
-    });
-  });
 });

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

@@ -75,27 +75,10 @@ interface UpdateMessageExtra {
   value: any;
 }
 
-interface UpdateGroupBlockToolResult {
-  blockId: string;
-  groupMessageId: string;
-  toolId: string;
-  toolResult: {
-    content: string;
-    error?: any;
-    id: string;
-    state?: any;
-  };
-  type: 'updateGroupBlockToolResult';
-}
-
-interface AddGroupBlock {
-  blockId: string;
-  groupMessageId: string;
-  type: 'addGroupBlock';
-  value: {
-    content: string;
-    id: string;
-  };
+interface UpdateMessageMetadata {
+  id: string;
+  type: 'updateMessageMetadata';
+  value: Partial<UIChatMessage['metadata']>;
 }
 
 export type MessageDispatch =
@@ -104,14 +87,13 @@ export type MessageDispatch =
   | UpdateMessages
   | UpdatePluginState
   | UpdateMessageExtra
+  | UpdateMessageMetadata
   | DeleteMessage
   | UpdateMessagePlugin
   | UpdateMessageTools
   | AddMessageTool
   | DeleteMessageTool
-  | DeleteMessages
-  | UpdateGroupBlockToolResult
-  | AddGroupBlock;
+  | DeleteMessages;
 
 export const messagesReducer = (
   state: UIChatMessage[],
@@ -122,25 +104,9 @@ export const messagesReducer = (
       return produce(state, (draftState) => {
         const { id, value } = payload;
 
-        // First, try to find in top-level messages
         const index = draftState.findIndex((i) => i.id === id);
         if (index >= 0) {
           draftState[index] = merge(draftState[index], { ...value, updatedAt: Date.now() });
-          return;
-        }
-
-        // If not found, search in group message children (blocks)
-        for (const message of draftState) {
-          if (message.role === 'group' && message.children) {
-            const blockIndex = message.children.findIndex((block) => block.id === id);
-            if (blockIndex >= 0) {
-              message.children[blockIndex] = merge(message.children[blockIndex], {
-                ...value,
-              });
-              message.updatedAt = Date.now();
-              return;
-            }
-          }
         }
       });
     }
@@ -161,6 +127,17 @@ export const messagesReducer = (
       });
     }
 
+    case 'updateMessageMetadata': {
+      return produce(state, (draftState) => {
+        const { id, value } = payload;
+        const message = draftState.find((i) => i.id === id);
+        if (!message) return;
+
+        message.metadata = merge(message.metadata, value);
+        message.updatedAt = Date.now();
+      });
+    }
+
     case 'updatePluginState': {
       return produce(state, (draftState) => {
         const { id, key, value } = payload;
@@ -269,47 +246,6 @@ export const messagesReducer = (
       });
     }
 
-    case 'updateGroupBlockToolResult': {
-      return produce(state, (draftState) => {
-        const { groupMessageId, blockId, toolId, toolResult } = payload;
-
-        // Find the group message
-        const msg = draftState.find((m) => m.id === groupMessageId);
-        if (!msg || msg.role !== 'group' || !msg.children) return;
-
-        // Find the block within children
-        const block = msg.children.find((b) => b.id === blockId);
-        if (!block || !block.tools) return;
-
-        // Find the tool and update its result
-        const tool = block.tools.find((t) => t.id === toolId);
-        if (!tool) return;
-
-        // Update tool result (optimistic update)
-        tool.result = toolResult;
-
-        msg.updatedAt = Date.now();
-      });
-    }
-
-    case 'addGroupBlock': {
-      return produce(state, (draftState) => {
-        const { groupMessageId, blockId, value } = payload;
-
-        // Find the group message
-        const msg = draftState.find((m) => m.id === groupMessageId);
-        if (!msg || msg.role !== 'group' || !msg.children) return;
-
-        // Add new block to children
-        msg.children.push({
-          content: value.content,
-          id: blockId,
-        });
-
-        msg.updatedAt = Date.now();
-      });
-    }
-
     default: {
       throw new Error('暂未实现的 type，请检查 reducer');
     }