@lobehub/lobehub 2.0.10 → 2.0.12

package/packages/conversation-flow/src/__tests__/fixtures/inputs/agentGroup/index.ts

@@ -1,6 +1,10 @@
 import type { Message } from '../../../../types';
 import speakDifferentAgent from './speak-different-agent.json';
+import supervisorAfterMultiTasks from './supervisor-after-multi-tasks.json';
+import supervisorContentOnly from './supervisor-content-only.json';
 
 export const agentGroup = {
   speakDifferentAgent: speakDifferentAgent as Message[],
+  supervisorAfterMultiTasks: supervisorAfterMultiTasks as Message[],
+  supervisorContentOnly: supervisorContentOnly as Message[],
 };

package/packages/conversation-flow/src/__tests__/fixtures/inputs/agentGroup/supervisor-after-multi-tasks.json

@@ -0,0 +1,91 @@
+[
+  {
+    "id": "msg-user-1",
+    "role": "user",
+    "content": "帮我调研下 clawdbot",
+    "parentId": null,
+    "createdAt": 1704067200000,
+    "updatedAt": 1704067200000
+  },
+  {
+    "id": "msg-supervisor-1",
+    "role": "assistant",
+    "agentId": "supervisor",
+    "content": "我会安排团队成员进行调研。",
+    "parentId": "msg-user-1",
+    "tools": [
+      {
+        "id": "call_tasks_1",
+        "type": "builtin",
+        "apiName": "executeAgentTasks",
+        "arguments": "{\"tasks\":[{\"agentId\":\"agent-1\",\"title\":\"任务1\"},{\"agentId\":\"agent-2\",\"title\":\"任务2\"}]}",
+        "identifier": "lobe-group-management"
+      }
+    ],
+    "createdAt": 1704067201000,
+    "updatedAt": 1704067201000,
+    "metadata": {
+      "isSupervisor": true
+    }
+  },
+  {
+    "id": "msg-tool-1",
+    "role": "tool",
+    "content": "Triggered 2 tasks.",
+    "parentId": "msg-supervisor-1",
+    "tool_call_id": "call_tasks_1",
+    "createdAt": 1704067202000,
+    "updatedAt": 1704067202000
+  },
+  {
+    "id": "msg-task-1",
+    "role": "task",
+    "content": "调研结果1...",
+    "parentId": "msg-tool-1",
+    "agentId": "agent-1",
+    "createdAt": 1704067203000,
+    "updatedAt": 1704067203000,
+    "metadata": {
+      "taskTitle": "任务1"
+    },
+    "taskDetail": {
+      "status": "completed",
+      "threadId": "thd_xxx1",
+      "title": "任务1"
+    }
+  },
+  {
+    "id": "msg-task-2",
+    "role": "task",
+    "content": "调研结果2...",
+    "parentId": "msg-tool-1",
+    "agentId": "agent-2",
+    "createdAt": 1704067204000,
+    "updatedAt": 1704067204000,
+    "metadata": {
+      "taskTitle": "任务2"
+    },
+    "taskDetail": {
+      "status": "completed",
+      "threadId": "thd_xxx2",
+      "title": "任务2"
+    }
+  },
+  {
+    "id": "msg-supervisor-summary",
+    "role": "assistant",
+    "agentId": "supervisor",
+    "content": "调研完成！这是综合汇总报告...",
+    "parentId": "msg-task-2",
+    "tools": null,
+    "createdAt": 1704067210000,
+    "updatedAt": 1704067210000,
+    "metadata": {
+      "isSupervisor": true,
+      "tps": 78.99,
+      "cost": 0.208
+    },
+    "model": "claude-sonnet-4",
+    "provider": "anthropic"
+  }
+]

package/packages/conversation-flow/src/__tests__/fixtures/inputs/agentGroup/supervisor-content-only.json

@@ -0,0 +1,74 @@
+[
+  {
+    "id": "msg-user-1",
+    "role": "user",
+    "content": "帮我调研下 clawdbot",
+    "parentId": null,
+    "createdAt": 1704067200000,
+    "updatedAt": 1704067200000
+  },
+  {
+    "id": "msg-supervisor-1",
+    "role": "assistant",
+    "agentId": "supervisor",
+    "content": "我会安排团队成员进行调研。",
+    "parentId": "msg-user-1",
+    "tools": [
+      {
+        "id": "call_tasks_1",
+        "type": "builtin",
+        "apiName": "executeAgentTasks",
+        "arguments": "{\"tasks\":[{\"agentId\":\"agent-1\",\"title\":\"调研任务\"}]}",
+        "identifier": "lobe-group-management"
+      }
+    ],
+    "createdAt": 1704067201000,
+    "updatedAt": 1704067201000,
+    "metadata": {
+      "isSupervisor": true
+    }
+  },
+  {
+    "id": "msg-tool-1",
+    "role": "tool",
+    "content": "Triggered 1 task.",
+    "parentId": "msg-supervisor-1",
+    "tool_call_id": "call_tasks_1",
+    "createdAt": 1704067202000,
+    "updatedAt": 1704067202000
+  },
+  {
+    "id": "msg-task-1",
+    "role": "task",
+    "content": "调研结果内容...",
+    "parentId": "msg-tool-1",
+    "agentId": "agent-1",
+    "createdAt": 1704067203000,
+    "updatedAt": 1704067203000,
+    "metadata": {
+      "taskTitle": "调研任务"
+    },
+    "taskDetail": {
+      "status": "completed",
+      "threadId": "thd_xxx",
+      "title": "调研任务"
+    }
+  },
+  {
+    "id": "msg-supervisor-summary",
+    "role": "assistant",
+    "agentId": "supervisor",
+    "content": "调研完成！这是综合汇总报告...",
+    "parentId": "msg-task-1",
+    "tools": null,
+    "createdAt": 1704067210000,
+    "updatedAt": 1704067210000,
+    "metadata": {
+      "isSupervisor": true,
+      "tps": 78.99,
+      "cost": 0.208
+    },
+    "model": "claude-sonnet-4",
+    "provider": "anthropic"
+  }
+]

package/packages/conversation-flow/src/__tests__/parse.test.ts

@@ -153,6 +153,43 @@ describe('parse', () => {
 
       expect(serializeParseResult(result)).toEqual(outputs.agentGroup.speakDifferentAgent);
     });
+
+    it('should handle supervisor content-only message (no tools)', () => {
+      const result = parse(inputs.agentGroup.supervisorContentOnly);
+
+      // The critical assertions:
+      // 1. The final supervisor message (content-only, no tools) should be transformed to role='supervisor'
+      // 2. Its content should be moved to children array
+      const supervisorSummary = result.flatList.find((m) => m.id === 'msg-supervisor-summary');
+      expect(supervisorSummary).toBeDefined();
+      expect(supervisorSummary?.role).toBe('supervisor');
+      expect((supervisorSummary as any)?.children).toHaveLength(1);
+      expect((supervisorSummary as any)?.children[0].content).toBe('调研完成！这是综合汇总报告...');
+      // The top-level content should be empty
+      expect(supervisorSummary?.content).toBe('');
+    });
+
+    it('should handle supervisor summary after multiple tasks (content folded into children)', () => {
+      const result = parse(inputs.agentGroup.supervisorAfterMultiTasks);
+
+      // The critical assertions:
+      // 1. flatList should have: user, supervisor(+tool), groupTasks(2 tasks), supervisor-summary
+      expect(result.flatList).toHaveLength(4);
+      expect(result.flatList[0].role).toBe('user');
+      expect(result.flatList[1].role).toBe('supervisor');
+      expect(result.flatList[2].role).toBe('groupTasks');
+      expect(result.flatList[3].role).toBe('supervisor');
+
+      // 2. groupTasks should have 2 tasks
+      expect((result.flatList[2] as any).tasks).toHaveLength(2);
+
+      // 3. The supervisor summary (no tools) should have content folded into children
+      const supervisorSummary = result.flatList[3];
+      expect(supervisorSummary.id).toBe('msg-supervisor-summary');
+      expect(supervisorSummary.content).toBe(''); // content should be empty
+      expect((supervisorSummary as any).children).toHaveLength(1);
+      expect((supervisorSummary as any).children[0].content).toBe('调研完成！这是综合汇总报告...');
+    });
   });
 
   describe('Tasks Aggregation', () => {

package/packages/conversation-flow/src/transformation/FlatListBuilder.ts

@@ -98,8 +98,16 @@ export class FlatListBuilder {
             return child?.role !== 'task';
           });
 
-          // Create tasks virtual message
-          const tasksMessage = this.createTasksMessage(parentMessage, taskChildren, processedIds);
+          // Check if tasks have different agentIds (groupTasks) or same agentId (tasks)
+          const taskAgentIds = new Set(
+            taskChildren.map((childId) => this.messageMap.get(childId)?.agentId).filter(Boolean),
+          );
+          const isGroupTasks = taskAgentIds.size > 1;
+
+          // Create appropriate virtual message based on agent diversity
+          const tasksMessage = isGroupTasks
+            ? this.createGroupTasksMessage(parentMessage, taskChildren, processedIds)
+            : this.createTasksMessage(parentMessage, taskChildren, processedIds);
           flatList.push(tasksMessage);
 
           // Continue with non-task children (e.g., final summary from assistant)
@@ -136,8 +144,18 @@ export class FlatListBuilder {
                     taskGrandchild.tools &&
                     taskGrandchild.tools.length > 0
                   ) {
-                    this.processAssistantGroup(
-                      taskGrandchild,
+                    this.processAssistantGroup(taskGrandchild, flatList, processedIds, allMessages);
+                  } else if (
+                    // Check if it's a supervisor message without tools (content-only)
+                    taskGrandchild.role === 'assistant' &&
+                    taskGrandchild.metadata?.isSupervisor &&
+                    (!taskGrandchild.tools || taskGrandchild.tools.length === 0)
+                  ) {
+                    const supervisorMessage = this.createSupervisorContentMessage(taskGrandchild);
+                    flatList.push(supervisorMessage);
+                    processedIds.add(taskGrandchildId);
+                    this.buildFlatListRecursive(
+                      taskGrandchildId,
                       flatList,
                       processedIds,
                       allMessages,
@@ -1037,4 +1055,52 @@ export class FlatListBuilder {
       updatedAt,
     } as Message;
   }
+
+  /**
+   * Create a virtual groupTasks message for multiple tasks with different agentIds
+   */
+  private createGroupTasksMessage(
+    parentMessage: Message,
+    taskChildIds: string[],
+    processedIds: Set<string>,
+  ): Message {
+    const taskMessages: Message[] = [];
+
+    for (const taskId of taskChildIds) {
+      const taskMessage = this.messageMap.get(taskId);
+      if (taskMessage) {
+        taskMessages.push(taskMessage);
+        processedIds.add(taskId);
+      }
+    }
+
+    // Sort by createdAt to maintain order
+    taskMessages.sort((a, b) => a.createdAt - b.createdAt);
+
+    // Generate ID with parent message id and all task message ids
+    const taskIdsStr = taskMessages.map((t) => t.id).join('-');
+    const groupTasksId = `groupTasks-${parentMessage.id}-${taskIdsStr}`;
+
+    // Calculate timestamps from task messages
+    const createdAt =
+      taskMessages.length > 0
+        ? Math.min(...taskMessages.map((m) => m.createdAt))
+        : parentMessage.createdAt;
+    const updatedAt =
+      taskMessages.length > 0
+        ? Math.max(...taskMessages.map((m) => m.updatedAt))
+        : parentMessage.updatedAt;
+
+    return {
+      content: '',
+      createdAt,
+      extra: {
+        parentMessageId: parentMessage.id,
+      },
+      id: groupTasksId,
+      role: 'groupTasks' as any,
+      tasks: taskMessages as any,
+      updatedAt,
+    } as Message;
+  }
 }

package/packages/conversation-flow/src/transformation/__tests__/FlatListBuilder.test.ts

@@ -557,5 +557,152 @@ describe('FlatListBuilder', () => {
       expect(result[1].id).toBe('msg-2');
       expect(result[2].id).toBe('msg-3');
     });
+
+    it('should create tasks message when multiple tasks have same agentId', () => {
+      const messages: Message[] = [
+        {
+          content: 'User request',
+          createdAt: 0,
+          id: 'msg-1',
+          role: 'user',
+          updatedAt: 0,
+        },
+        {
+          content: 'Tool message',
+          createdAt: 0,
+          id: 'tool-1',
+          parentId: 'msg-1',
+          role: 'tool',
+          updatedAt: 0,
+        },
+        {
+          agentId: 'agent-1',
+          content: 'Task 1 result',
+          createdAt: 1,
+          id: 'task-1',
+          parentId: 'tool-1',
+          role: 'task',
+          updatedAt: 1,
+        },
+        {
+          agentId: 'agent-1',
+          content: 'Task 2 result',
+          createdAt: 2,
+          id: 'task-2',
+          parentId: 'tool-1',
+          role: 'task',
+          updatedAt: 2,
+        },
+      ];
+
+      const builder = createBuilder(messages);
+      const result = builder.flatten(messages);
+
+      // Should create tasks (not groupTasks) since all tasks have same agentId
+      expect(result).toHaveLength(3);
+      expect(result[0].id).toBe('msg-1');
+      expect(result[1].id).toBe('tool-1');
+      expect(result[2].role).toBe('tasks');
+      expect((result[2] as any).tasks).toHaveLength(2);
+    });
+
+    it('should create groupTasks message when multiple tasks have different agentIds', () => {
+      const messages: Message[] = [
+        {
+          content: 'User request',
+          createdAt: 0,
+          id: 'msg-1',
+          role: 'user',
+          updatedAt: 0,
+        },
+        {
+          content: 'Tool message',
+          createdAt: 0,
+          id: 'tool-1',
+          parentId: 'msg-1',
+          role: 'tool',
+          updatedAt: 0,
+        },
+        {
+          agentId: 'agent-1',
+          content: 'Task 1 result',
+          createdAt: 1,
+          id: 'task-1',
+          parentId: 'tool-1',
+          role: 'task',
+          updatedAt: 1,
+        },
+        {
+          agentId: 'agent-2',
+          content: 'Task 2 result',
+          createdAt: 2,
+          id: 'task-2',
+          parentId: 'tool-1',
+          role: 'task',
+          updatedAt: 2,
+        },
+        {
+          agentId: 'agent-3',
+          content: 'Task 3 result',
+          createdAt: 3,
+          id: 'task-3',
+          parentId: 'tool-1',
+          role: 'task',
+          updatedAt: 3,
+        },
+      ];
+
+      const builder = createBuilder(messages);
+      const result = builder.flatten(messages);
+
+      // Should create groupTasks since tasks have different agentIds
+      expect(result).toHaveLength(3);
+      expect(result[0].id).toBe('msg-1');
+      expect(result[1].id).toBe('tool-1');
+      expect(result[2].role).toBe('groupTasks');
+      expect((result[2] as any).tasks).toHaveLength(3);
+      // Verify ID format
+      expect(result[2].id).toContain('groupTasks-');
+    });
+
+    it('should create groupTasks with correct timestamps from task messages', () => {
+      const messages: Message[] = [
+        {
+          content: 'Tool message',
+          createdAt: 0,
+          id: 'tool-1',
+          role: 'tool',
+          updatedAt: 0,
+        },
+        {
+          agentId: 'agent-1',
+          content: 'Task 1',
+          createdAt: 100,
+          id: 'task-1',
+          parentId: 'tool-1',
+          role: 'task',
+          updatedAt: 150,
+        },
+        {
+          agentId: 'agent-2',
+          content: 'Task 2',
+          createdAt: 200,
+          id: 'task-2',
+          parentId: 'tool-1',
+          role: 'task',
+          updatedAt: 300,
+        },
+      ];
+
+      const builder = createBuilder(messages);
+      const result = builder.flatten(messages);
+
+      const groupTasksMsg = result.find((m) => m.role === 'groupTasks');
+      expect(groupTasksMsg).toBeDefined();
+      // createdAt should be min of task createdAt
+      expect(groupTasksMsg!.createdAt).toBe(100);
+      // updatedAt should be max of task updatedAt
+      expect(groupTasksMsg!.updatedAt).toBe(300);
+    });
   });
 });

package/packages/database/src/repositories/agentGroup/index.ts

@@ -17,9 +17,11 @@ import { LobeChatDatabase } from '../../type';
 export interface SupervisorAgentConfig {
   avatar?: string;
   backgroundColor?: string;
+  chatConfig?: any;
   description?: string;
   model?: string;
   params?: any;
+  plugins?: string[];
   provider?: string;
   systemRole?: string;
   tags?: string[];
@@ -172,9 +174,11 @@ export class AgentGroupRepository {
       .values({
         avatar: supervisorConfig?.avatar,
         backgroundColor: supervisorConfig?.backgroundColor,
+        chatConfig: supervisorConfig?.chatConfig,
         description: supervisorConfig?.description,
         model: supervisorConfig?.model,
         params: supervisorConfig?.params,
+        plugins: supervisorConfig?.plugins,
         provider: supervisorConfig?.provider,
         systemRole: supervisorConfig?.systemRole,
         tags: supervisorConfig?.tags,

package/packages/types/src/message/ui/chat.ts

@@ -25,6 +25,7 @@ export type UIMessageRoleType =
   | 'tool'
   | 'task'
   | 'tasks'
+  | 'groupTasks'
   | 'supervisor'
   | 'assistantGroup'
   | 'agentCouncil'
@@ -185,6 +186,7 @@ export interface UIChatMessage {
   /**
    * Task messages for role='tasks' virtual message
    * Contains aggregated task messages with same parentId
+   * Also used to store task execution messages (intermediate steps) from polling
    */
   tasks?: UIChatMessage[];
   threadId?: string | null;

package/packages/types/src/tool/builtin.ts

@@ -433,6 +433,10 @@ export interface TriggerExecuteTaskParams extends GroupOrchestrationBaseParams {
    * The agent ID to execute the task
    */
   agentId: string;
+  /**
+   * The instruction/task description for the agent
+   */
+  instruction: string;
   /**
    * Whether to run on the desktop client (for local file/shell access).
    * MUST be true when task requires local-system tools. Default is false (server execution).
@@ -443,10 +447,6 @@ export interface TriggerExecuteTaskParams extends GroupOrchestrationBaseParams {
    * without calling the supervisor again.
    */
   skipCallSupervisor?: boolean;
-  /**
-   * The task description for the agent
-   */
-  task: string;
   /**
    * Optional timeout in milliseconds
    */
@@ -466,7 +466,7 @@ export interface TriggerExecuteTaskItem {
    */
   agentId: string;
   /**
-   * Detailed instruction/prompt for the task execution
+   * Detailed instruction for the agent to execute
    */
   instruction: string;
   /**

package/src/app/[variants]/(main)/community/(detail)/group_agent/features/Sidebar/ActionButton/ForkGroupAndChat.tsx

@@ -134,7 +134,8 @@ const ForkGroupAndChat = memo<{ mobile?: boolean }>(() => {
         // Group content is the supervisor's systemRole (for backward compatibility)
         content: config.systemRole || supervisorConfig?.systemRole,
         ...meta,
-        marketIdentifier: forkResult.group.identifier, // Store the new market identifier
+        // Store marketIdentifier at top-level (same as agents)
+        marketIdentifier: forkResult.group.identifier,
       };
 
       // Step 5: Prepare member agents from market data

package/src/app/[variants]/(main)/group/profile/features/Header/GroupPublishButton/index.tsx

@@ -28,8 +28,8 @@ const GroupPublishButton = memo(() => {
 
   // Determine action based on whether we have an existing marketIdentifier
   // Backend will verify ownership and decide to create new or update
-  // marketIdentifier is stored in editorData
-  const action = currentGroup?.editorData?.marketIdentifier ? 'upload' : 'submit';
+  // marketIdentifier is stored at top-level (same as agents)
+  const action = currentGroup?.marketIdentifier ? 'upload' : 'submit';
 
   return (
     <>

package/src/app/[variants]/(main)/group/profile/features/Header/GroupPublishButton/useMarketGroupPublish.ts

@@ -45,8 +45,8 @@ export const useMarketGroupPublish = ({ action, onSuccess }: UseMarketGroupPubli
    * Returns whether fork confirmation is needed and original group info
    */
   const checkOwnership = useCallback(async (): Promise<CheckOwnershipResult> => {
-    // marketIdentifier is stored in editorData
-    const identifier = currentGroup?.editorData?.marketIdentifier as string | undefined;
+    // marketIdentifier is stored at top-level (same as agents)
+    const identifier = currentGroup?.marketIdentifier;
 
     // No identifier means new group, no need to check
     if (!identifier) {
@@ -150,27 +150,26 @@ export const useMarketGroupPublish = ({ action, onSuccess }: UseMarketGroupPubli
           }),
           ...(currentGroupConfig.openingQuestions !== undefined &&
             currentGroupConfig.openingQuestions.length > 0 && {
-            openingQuestions: currentGroupConfig.openingQuestions,
-          }),
+              openingQuestions: currentGroupConfig.openingQuestions,
+            }),
           ...(currentGroupConfig.allowDM !== undefined && { allowDM: currentGroupConfig.allowDM }),
-          ...(currentGroupConfig.revealDM !== undefined && { revealDM: currentGroupConfig.revealDM }),
+          ...(currentGroupConfig.revealDM !== undefined && {
+            revealDM: currentGroupConfig.revealDM,
+          }),
         },
         // Market requires at least 1 character for description
         description: currentGroupMeta.description || 'No description provided',
-        // marketIdentifier is stored in editorData
-        identifier: currentGroup.editorData?.marketIdentifier as string | undefined,
+        // marketIdentifier is stored at top-level (same as agents)
+        identifier: currentGroup.marketIdentifier,
         memberAgents,
         name: currentGroupMeta.title || 'Untitled Group',
         visibility: 'public', // TODO: Allow user to select visibility
       });
 
-      // Save marketIdentifier to editorData if new group
+      // Save marketIdentifier at top-level if new group (same as agents)
       if (result.isNewGroup) {
         await updateGroupMeta({
-          editorData: {
-            ...currentGroup.editorData,
-            marketIdentifier: result.identifier,
-          },
+          marketIdentifier: result.identifier,
         });
       }
 

package/src/features/Conversation/ChatItem/components/Title.tsx

@@ -24,7 +24,7 @@ const Title = memo<TitleProps>(({ showTitle, time, avatar, titleAddon }) => {
         </Text>
       )}
       {showTitle ? titleAddon : undefined}
-      {time && (
+      {!time ? null : (
         <Text
           aria-label="published-date"
           as={'time'}

package/src/features/Conversation/ChatList/index.tsx

@@ -91,7 +91,6 @@ const ChatList = memo<ChatListProps>(({ disableActionsBar, welcome, itemContent
     <MessageActionProvider withSingletonActionsBar={!disableActionsBar}>
       <VirtualizedList
         dataSource={displayMessageIds}
-        // isGenerating={isGenerating}
         itemContent={itemContent ?? defaultItemContent}
       />
     </MessageActionProvider>