@lobehub/lobehub 2.0.0-next.287 → 2.0.0-next.288

package/packages/builtin-tool-group-management/src/client/Streaming/ExecuteTasks/index.tsx

@@ -0,0 +1,87 @@
+'use client';
+
+import { DEFAULT_AVATAR } from '@lobechat/const';
+import type { AgentGroupMember, BuiltinStreamingProps } from '@lobechat/types';
+import { Avatar, Flexbox, Markdown } from '@lobehub/ui';
+import { createStaticStyles, useTheme } from 'antd-style';
+import { memo, useMemo } from 'react';
+
+import { useAgentGroupStore } from '@/store/agentGroup';
+import { agentGroupSelectors } from '@/store/agentGroup/selectors';
+
+import type { ExecuteTasksParams } from '../../../types';
+
+const styles = createStaticStyles(({ css, cssVar }) => ({
+  container: css`
+    display: flex;
+    flex-direction: column;
+    gap: 12px;
+  `,
+  instruction: css`
+    font-size: 13px;
+    color: ${cssVar.colorTextSecondary};
+  `,
+  taskCard: css`
+    padding: 12px;
+    border-radius: 8px;
+    background: ${cssVar.colorFillQuaternary};
+  `,
+  taskTitle: css`
+    font-size: 13px;
+    font-weight: 500;
+    color: ${cssVar.colorText};
+  `,
+}));
+
+export const ExecuteTasksStreaming = memo<BuiltinStreamingProps<ExecuteTasksParams>>(({ args }) => {
+  const { tasks } = args || {};
+  const theme = useTheme();
+
+  // Get active group ID and agents from store
+  const activeGroupId = useAgentGroupStore(agentGroupSelectors.activeGroupId);
+  const groupAgents = useAgentGroupStore((s) =>
+    activeGroupId ? agentGroupSelectors.getGroupAgents(activeGroupId)(s) : [],
+  );
+
+  // Get agent details for each task
+  const tasksWithAgents = useMemo(() => {
+    if (!tasks?.length || !groupAgents.length) return [];
+    return tasks.map((task) => ({
+      ...task,
+      agent: groupAgents.find((agent) => agent.id === task.agentId) as AgentGroupMember | undefined,
+    }));
+  }, [tasks, groupAgents]);
+
+  if (!tasksWithAgents.length) return null;
+
+  return (
+    <div className={styles.container}>
+      {tasksWithAgents.map((task, index) => (
+        <div className={styles.taskCard} key={task.agentId || index}>
+          <Flexbox gap={8}>
+            <Flexbox align={'center'} gap={8} horizontal>
+              <Avatar
+                avatar={task.agent?.avatar || DEFAULT_AVATAR}
+                background={task.agent?.backgroundColor || theme.colorBgContainer}
+                shape={'square'}
+                size={20}
+              />
+              <span className={styles.taskTitle}>{task.title || task.agent?.title || 'Task'}</span>
+            </Flexbox>
+            {task.instruction && (
+              <div className={styles.instruction}>
+                <Markdown animated variant={'chat'}>
+                  {task.instruction}
+                </Markdown>
+              </div>
+            )}
+          </Flexbox>
+        </div>
+      ))}
+    </div>
+  );
+});
+
+ExecuteTasksStreaming.displayName = 'ExecuteTasksStreaming';
+
+export default ExecuteTasksStreaming;

package/packages/builtin-tool-group-management/src/client/Streaming/index.ts

@@ -2,6 +2,8 @@ import type { BuiltinStreaming } from '@lobechat/types';
 
 import { GroupManagementApiName } from '../../types';
 import { BroadcastStreaming } from './Broadcast';
+import { ExecuteTaskStreaming } from './ExecuteTask';
+import { ExecuteTasksStreaming } from './ExecuteTasks';
 import { SpeakStreaming } from './Speak';
 
 /**
@@ -12,5 +14,7 @@ import { SpeakStreaming } from './Speak';
  */
 export const GroupManagementStreamings: Record<string, BuiltinStreaming> = {
   [GroupManagementApiName.broadcast]: BroadcastStreaming as BuiltinStreaming,
+  [GroupManagementApiName.executeAgentTask]: ExecuteTaskStreaming as BuiltinStreaming,
+  [GroupManagementApiName.executeAgentTasks]: ExecuteTasksStreaming as BuiltinStreaming,
   [GroupManagementApiName.speak]: SpeakStreaming as BuiltinStreaming,
 };

package/packages/builtin-tool-group-management/src/executor.test.ts

@@ -8,29 +8,12 @@ import type {
 import { groupManagementExecutor } from './executor';
 
 // Mock agentGroupStore
-const mockAddAgentsToGroup = vi.fn();
-const mockRemoveAgentFromGroup = vi.fn();
-
 vi.mock('@/store/agentGroup', () => ({
   agentGroupSelectors: {
     getAgentByIdFromGroup: vi.fn(() => () => undefined),
   },
   useAgentGroupStore: {
-    getState: () => ({
-      addAgentsToGroup: mockAddAgentsToGroup,
-      removeAgentFromGroup: mockRemoveAgentFromGroup,
-    }),
-  },
-}));
-
-// Mock agentService
-const mockQueryAgents = vi.fn();
-const mockCreateAgent = vi.fn();
-
-vi.mock('@/services/agent', () => ({
-  agentService: {
-    createAgent: (...args: any[]) => mockCreateAgent(...args),
-    queryAgents: (...args: any[]) => mockQueryAgents(...args),
+    getState: () => ({}),
   },
 }));
 
@@ -288,78 +271,6 @@ describe('GroupManagementExecutor', () => {
     });
   });
 
-  describe('searchAgent', () => {
-    beforeEach(() => {
-      vi.clearAllMocks();
-    });
-
-    it('should return community not supported message when source is community', async () => {
-      const ctx = createMockContext();
-
-      const result = await groupManagementExecutor.searchAgent(
-        { query: 'test', source: 'community' },
-        ctx,
-      );
-
-      expect(result.success).toBe(true);
-      expect(result.content).toContain('Community agent search is not yet supported');
-      expect(result.state).toEqual({ agents: [], source: 'community', total: 0 });
-    });
-
-    it('should search user agents and return formatted results', async () => {
-      mockQueryAgents.mockResolvedValue([
-        { id: 'agent-1', title: 'Code Assistant', description: 'Helps with coding', avatar: '🤖' },
-        { id: 'agent-2', title: 'Writer', description: null, avatar: null },
-      ]);
-
-      const ctx = createMockContext();
-      const result = await groupManagementExecutor.searchAgent({ query: 'test' }, ctx);
-
-      expect(result.success).toBe(true);
-      expect(mockQueryAgents).toHaveBeenCalledWith({ keyword: 'test', limit: 10 });
-      expect(result.content).toContain('Found 2 agents');
-      expect(result.content).toContain('Code Assistant');
-      expect(result.content).toContain('Writer');
-      expect(result.state.agents).toHaveLength(2);
-      expect(result.state.total).toBe(2);
-    });
-
-    it('should return no results message when no agents found', async () => {
-      mockQueryAgents.mockResolvedValue([]);
-
-      const ctx = createMockContext();
-      const result = await groupManagementExecutor.searchAgent({ query: 'nonexistent' }, ctx);
-
-      expect(result.success).toBe(true);
-      expect(result.content).toContain('No agents found matching "nonexistent"');
-      expect(result.state).toEqual({ agents: [], query: 'nonexistent', total: 0 });
-    });
-
-    it('should pass limit to queryAgents', async () => {
-      mockQueryAgents.mockResolvedValue([
-        { id: 'agent-1', title: 'Agent 1' },
-        { id: 'agent-2', title: 'Agent 2' },
-      ]);
-
-      const ctx = createMockContext();
-      const result = await groupManagementExecutor.searchAgent({ query: 'test', limit: 2 }, ctx);
-
-      expect(result.success).toBe(true);
-      expect(mockQueryAgents).toHaveBeenCalledWith({ keyword: 'test', limit: 2 });
-      expect(result.state.agents).toHaveLength(2);
-    });
-
-    it('should handle errors gracefully', async () => {
-      mockQueryAgents.mockRejectedValue(new Error('Network error'));
-
-      const ctx = createMockContext();
-      const result = await groupManagementExecutor.searchAgent({ query: 'test' }, ctx);
-
-      expect(result.success).toBe(false);
-      expect(result.content).toBe('Failed to search agents: Network error');
-    });
-  });
-
   describe('getAgentInfo', () => {
     it('should return error when no groupId in context', async () => {
       const ctx = createMockContext();
@@ -372,221 +283,7 @@ describe('GroupManagementExecutor', () => {
     });
   });
 
-  describe('inviteAgent', () => {
-    beforeEach(() => {
-      vi.clearAllMocks();
-    });
-
-    it('should return error when no groupId in context', async () => {
-      const ctx = createMockContext();
-
-      const result = await groupManagementExecutor.inviteAgent({ agentId: 'agent-1' }, ctx);
-
-      expect(result.success).toBe(false);
-      expect(result.content).toBe('No group context available');
-    });
-
-    it('should successfully invite agent when groupId is available', async () => {
-      mockAddAgentsToGroup.mockResolvedValue(undefined);
-
-      const ctx: BuiltinToolContext = {
-        ...createMockContext(),
-        groupId: 'test-group-id',
-      };
-
-      const result = await groupManagementExecutor.inviteAgent({ agentId: 'agent-1' }, ctx);
-
-      expect(result.success).toBe(true);
-      expect(mockAddAgentsToGroup).toHaveBeenCalledWith('test-group-id', ['agent-1']);
-      expect(result.content).toBe('Agent "agent-1" has been invited to the group.');
-      expect(result.state).toEqual({ agentId: 'agent-1', type: 'inviteAgent' });
-    });
-
-    it('should handle errors during invitation', async () => {
-      mockAddAgentsToGroup.mockRejectedValue(new Error('Database error'));
-
-      const ctx: BuiltinToolContext = {
-        ...createMockContext(),
-        groupId: 'test-group-id',
-      };
-
-      const result = await groupManagementExecutor.inviteAgent({ agentId: 'agent-1' }, ctx);
-
-      expect(result.success).toBe(false);
-      expect(result.content).toBe('Failed to invite agent "agent-1": Database error');
-    });
-  });
-
-  describe('removeAgent', () => {
-    beforeEach(() => {
-      vi.clearAllMocks();
-    });
-
-    it('should return error when no groupId in context', async () => {
-      const ctx = createMockContext();
-
-      const result = await groupManagementExecutor.removeAgent({ agentId: 'agent-1' }, ctx);
-
-      expect(result.success).toBe(false);
-      expect(result.content).toBe('No group context available');
-    });
-
-    it('should successfully remove agent when groupId is available', async () => {
-      mockRemoveAgentFromGroup.mockResolvedValue(undefined);
-
-      const ctx: BuiltinToolContext = {
-        ...createMockContext(),
-        groupId: 'test-group-id',
-      };
-
-      const result = await groupManagementExecutor.removeAgent({ agentId: 'agent-1' }, ctx);
-
-      expect(result.success).toBe(true);
-      expect(mockRemoveAgentFromGroup).toHaveBeenCalledWith('test-group-id', 'agent-1');
-      expect(result.content).toBe('Agent "agent-1" has been removed from the group.');
-      expect(result.state).toEqual({ agentId: 'agent-1', type: 'removeAgent' });
-    });
-
-    it('should handle errors during removal', async () => {
-      mockRemoveAgentFromGroup.mockRejectedValue(new Error('Agent not found'));
-
-      const ctx: BuiltinToolContext = {
-        ...createMockContext(),
-        groupId: 'test-group-id',
-      };
-
-      const result = await groupManagementExecutor.removeAgent({ agentId: 'agent-1' }, ctx);
-
-      expect(result.success).toBe(false);
-      expect(result.content).toBe('Failed to remove agent "agent-1": Agent not found');
-    });
-  });
-
-  describe('createAgent', () => {
-    beforeEach(() => {
-      vi.clearAllMocks();
-    });
-
-    it('should return error when no groupId in context', async () => {
-      const ctx = createMockContext();
-
-      const result = await groupManagementExecutor.createAgent(
-        { title: 'New Agent', systemRole: 'You are a helpful assistant' },
-        ctx,
-      );
-
-      expect(result.success).toBe(false);
-      expect(result.content).toBe('No group context available');
-    });
-
-    it('should successfully create a virtual agent and add to group', async () => {
-      mockCreateAgent.mockResolvedValue({
-        agentId: 'new-agent-id',
-        sessionId: 'new-session-id',
-      });
-
-      const ctx: BuiltinToolContext = {
-        ...createMockContext(),
-        groupId: 'test-group-id',
-      };
-
-      const result = await groupManagementExecutor.createAgent(
-        {
-          avatar: '🤖',
-          description: 'A helpful coding assistant',
-          systemRole: 'You are a coding expert',
-          title: 'Code Helper',
-        },
-        ctx,
-      );
-
-      expect(result.success).toBe(true);
-      expect(mockCreateAgent).toHaveBeenCalledWith({
-        config: {
-          avatar: '🤖',
-          description: 'A helpful coding assistant',
-          systemRole: 'You are a coding expert',
-          title: 'Code Helper',
-          virtual: true,
-        },
-        groupId: 'test-group-id',
-      });
-      expect(result.content).toBe('Agent "Code Helper" has been created and added to the group.');
-      expect(result.state).toEqual({
-        agentId: 'new-agent-id',
-        title: 'Code Helper',
-        type: 'createAgent',
-      });
-    });
-
-    it('should handle case when agentId is not returned', async () => {
-      mockCreateAgent.mockResolvedValue({
-        sessionId: 'new-session-id',
-        // No agentId returned
-      });
-
-      const ctx: BuiltinToolContext = {
-        ...createMockContext(),
-        groupId: 'test-group-id',
-      };
-
-      const result = await groupManagementExecutor.createAgent(
-        { title: 'New Agent', systemRole: 'Test' },
-        ctx,
-      );
-
-      expect(result.success).toBe(false);
-      expect(result.content).toBe('Failed to create agent: No agent ID returned');
-    });
-
-    it('should handle errors during creation', async () => {
-      mockCreateAgent.mockRejectedValue(new Error('Database connection failed'));
-
-      const ctx: BuiltinToolContext = {
-        ...createMockContext(),
-        groupId: 'test-group-id',
-      };
-
-      const result = await groupManagementExecutor.createAgent(
-        { title: 'New Agent', systemRole: 'Test' },
-        ctx,
-      );
-
-      expect(result.success).toBe(false);
-      expect(result.content).toBe('Failed to create agent: Database connection failed');
-    });
-
-    it('should create agent with minimal params (only required fields)', async () => {
-      mockCreateAgent.mockResolvedValue({
-        agentId: 'minimal-agent-id',
-        sessionId: 'minimal-session-id',
-      });
-
-      const ctx: BuiltinToolContext = {
-        ...createMockContext(),
-        groupId: 'test-group-id',
-      };
-
-      const result = await groupManagementExecutor.createAgent(
-        { title: 'Minimal Agent', systemRole: 'Basic assistant' },
-        ctx,
-      );
-
-      expect(result.success).toBe(true);
-      expect(mockCreateAgent).toHaveBeenCalledWith({
-        config: {
-          avatar: undefined,
-          description: undefined,
-          systemRole: 'Basic assistant',
-          title: 'Minimal Agent',
-          virtual: true,
-        },
-        groupId: 'test-group-id',
-      });
-    });
-  });
-
-  describe('executeTask', () => {
+  describe('executeAgentTask', () => {
     beforeEach(() => {
       vi.clearAllMocks();
     });
@@ -594,7 +291,7 @@ describe('GroupManagementExecutor', () => {
     it('should return stop=true to terminate supervisor execution', async () => {
       const ctx = createMockContext();
 
-      const result = await groupManagementExecutor.executeTask(
+      const result = await groupManagementExecutor.executeAgentTask(
         { agentId: 'agent-1', task: 'Do something' },
         ctx,
       );
@@ -606,7 +303,7 @@ describe('GroupManagementExecutor', () => {
         agentId: 'agent-1',
         task: 'Do something',
         timeout: undefined,
-        type: 'executeTask',
+        type: 'executeAgentTask',
       });
     });
 
@@ -628,7 +325,7 @@ describe('GroupManagementExecutor', () => {
         registerAfterCompletion,
       );
 
-      await groupManagementExecutor.executeTask(
+      await groupManagementExecutor.executeAgentTask(
         { agentId: 'agent-1', task: 'Do something', timeout: 30000 },
         ctx,
       );
@@ -653,7 +350,7 @@ describe('GroupManagementExecutor', () => {
     it('should not fail when groupOrchestration is not available', async () => {
       const ctx = createMockContext();
 
-      const result = await groupManagementExecutor.executeTask(
+      const result = await groupManagementExecutor.executeAgentTask(
         { agentId: 'agent-1', task: 'Do something' },
         ctx,
       );
@@ -665,7 +362,7 @@ describe('GroupManagementExecutor', () => {
     it('should include timeout in state when provided', async () => {
       const ctx = createMockContext();
 
-      const result = await groupManagementExecutor.executeTask(
+      const result = await groupManagementExecutor.executeAgentTask(
         { agentId: 'agent-1', task: 'Do something', timeout: 60000 },
         ctx,
       );
@@ -675,7 +372,7 @@ describe('GroupManagementExecutor', () => {
         agentId: 'agent-1',
         task: 'Do something',
         timeout: 60000,
-        type: 'executeTask',
+        type: 'executeAgentTask',
       });
     });
   });

package/packages/builtin-tool-group-management/src/executor.ts

@@ -3,10 +3,11 @@
  * Lobe Group Management Executor
  *
  * Handles all group management tool calls for multi-agent orchestration.
+ * Note: Member management (searchAgent, inviteAgent, createAgent, removeAgent)
+ * is handled by group-agent-builder. This executor focuses on orchestration.
  */
 import {
   BroadcastParams,
-  CreateAgentParams,
   CreateWorkflowParams,
   DelegateParams,
   ExecuteTaskParams,
@@ -14,9 +15,6 @@ import {
   GroupManagementApiName,
   GroupManagementIdentifier,
   InterruptParams,
-  InviteAgentParams,
-  RemoveAgentParams,
-  SearchAgentParams,
   SpeakParams,
   SummarizeParams,
   VoteParams,
@@ -24,166 +22,13 @@ import {
 import { formatAgentProfile } from '@lobechat/prompts';
 import { BaseExecutor, type BuiltinToolContext, type BuiltinToolResult } from '@lobechat/types';
 
-import { agentService } from '@/services/agent';
 import { agentGroupSelectors, useAgentGroupStore } from '@/store/agentGroup';
 
 class GroupManagementExecutor extends BaseExecutor<typeof GroupManagementApiName> {
   readonly identifier = GroupManagementIdentifier;
   protected readonly apiEnum = GroupManagementApiName;
 
-  // ==================== Member Management ====================
-
-  searchAgent = async (
-    params: SearchAgentParams,
-    _ctx: BuiltinToolContext,
-  ): Promise<BuiltinToolResult> => {
-    const { query, limit = 10, source = 'user' } = params;
-
-    // Currently only support searching user's own agents
-    // Community search can be added in the future
-    if (source === 'community') {
-      return {
-        content:
-          'Community agent search is not yet supported. Please use source="user" to search your own agents.',
-        state: { agents: [], source, total: 0 },
-        success: true,
-      };
-    }
-
-    try {
-      const results = await agentService.queryAgents({ keyword: query, limit });
-
-      const agents = results.map((agent) => ({
-        avatar: agent.avatar,
-        description: agent.description,
-        id: agent.id,
-        title: agent.title,
-      }));
-
-      const total = agents.length;
-
-      if (total === 0) {
-        return {
-          content: query
-            ? `No agents found matching "${query}".`
-            : 'No agents found. You can create a new agent or search with different keywords.',
-          state: { agents: [], query, total: 0 },
-          success: true,
-        };
-      }
-
-      // Format agents list for LLM consumption
-      const agentList = agents
-        .map(
-          (a, i) =>
-            `${i + 1}. ${a.title || 'Untitled'} (ID: ${a.id})${a.description ? ` - ${a.description}` : ''}`,
-        )
-        .join('\n');
-
-      return {
-        content: `Found ${total} agent${total > 1 ? 's' : ''} matching "${query}":\n${agentList}`,
-        state: { agents, query, total },
-        success: true,
-      };
-    } catch (error) {
-      return {
-        content: `Failed to search agents: ${error instanceof Error ? error.message : 'Unknown error'}`,
-        success: false,
-      };
-    }
-  };
-
-  inviteAgent = async (
-    params: InviteAgentParams,
-    ctx: BuiltinToolContext,
-  ): Promise<BuiltinToolResult> => {
-    const { groupId } = ctx;
-
-    if (!groupId) {
-      return { content: 'No group context available', success: false };
-    }
-
-    try {
-      await useAgentGroupStore.getState().addAgentsToGroup(groupId, [params.agentId]);
-
-      return {
-        content: `Agent "${params.agentId}" has been invited to the group.`,
-        state: { agentId: params.agentId, type: 'inviteAgent' },
-        success: true,
-      };
-    } catch (error) {
-      return {
-        content: `Failed to invite agent "${params.agentId}": ${error instanceof Error ? error.message : 'Unknown error'}`,
-        success: false,
-      };
-    }
-  };
-
-  createAgent = async (
-    params: CreateAgentParams,
-    ctx: BuiltinToolContext,
-  ): Promise<BuiltinToolResult> => {
-    const { groupId } = ctx;
-
-    if (!groupId) {
-      return { content: 'No group context available', success: false };
-    }
-
-    try {
-      // Create a virtual agent (agents created by supervisor are virtual)
-      const result = await agentService.createAgent({
-        config: {
-          avatar: params.avatar,
-          description: params.description,
-          systemRole: params.systemRole,
-          title: params.title,
-          virtual: true,
-        },
-        groupId,
-      });
-
-      if (!result.agentId) {
-        return { content: 'Failed to create agent: No agent ID returned', success: false };
-      }
-
-      return {
-        content: `Agent "${params.title}" has been created and added to the group.`,
-        state: { agentId: result.agentId, title: params.title, type: 'createAgent' },
-        success: true,
-      };
-    } catch (error) {
-      return {
-        content: `Failed to create agent: ${error instanceof Error ? error.message : 'Unknown error'}`,
-        success: false,
-      };
-    }
-  };
-
-  removeAgent = async (
-    params: RemoveAgentParams,
-    ctx: BuiltinToolContext,
-  ): Promise<BuiltinToolResult> => {
-    const { groupId } = ctx;
-
-    if (!groupId) {
-      return { content: 'No group context available', success: false };
-    }
-
-    try {
-      await useAgentGroupStore.getState().removeAgentFromGroup(groupId, params.agentId);
-
-      return {
-        content: `Agent "${params.agentId}" has been removed from the group.`,
-        state: { agentId: params.agentId, type: 'removeAgent' },
-        success: true,
-      };
-    } catch (error) {
-      return {
-        content: `Failed to remove agent "${params.agentId}": ${error instanceof Error ? error.message : 'Unknown error'}`,
-        success: false,
-      };
-    }
-  };
+  // ==================== Agent Info ====================
 
   getAgentInfo = async (
     params: GetAgentInfoParams,
@@ -306,7 +151,7 @@ class GroupManagementExecutor extends BaseExecutor<typeof GroupManagementApiName
 
   // ==================== Task Execution ====================
 
-  executeTask = async (
+  executeAgentTask = async (
     params: ExecuteTaskParams,
     ctx: BuiltinToolContext,
   ): Promise<BuiltinToolResult> => {
@@ -333,7 +178,7 @@ class GroupManagementExecutor extends BaseExecutor<typeof GroupManagementApiName
         skipCallSupervisor: params.skipCallSupervisor,
         task: params.task,
         timeout: params.timeout,
-        type: 'executeTask',
+        type: 'executeAgentTask',
       },
       stop: true,
       success: true,