@lobehub/lobehub 2.0.0-next.306 → 2.0.0-next.307

package/src/services/chat/mecha/agentConfigResolver.test.ts

@@ -627,7 +627,7 @@ describe('resolveAgentConfig', () => {
     });
   });
 
-  describe('supervisor agent (slug from agentGroup store)', () => {
+  describe('supervisor agent (detected via groupId)', () => {
     const mockGroupStoreState = { groupMap: {} };
     const mockGroupWithSupervisor = {
       agents: [
@@ -651,18 +651,11 @@ describe('resolveAgentConfig', () => {
       );
     });
 
-    it('should detect supervisor agent from agentGroup store when not found in agent store', () => {
-      // Mock: supervisor agent is found in agentGroup store
-      vi.spyOn(
-        agentGroupSelectors.agentGroupByIdSelectors,
-        'groupBySupervisorAgentId',
-      ).mockReturnValue(() => mockGroupWithSupervisor as any);
-
-      // Mock: getGroupBySupervisorAgentId for building groupSupervisorContext
-      vi.spyOn(
-        agentGroupSelectors.agentGroupSelectors,
-        'getGroupBySupervisorAgentId',
-      ).mockReturnValue(() => mockGroupWithSupervisor as any);
+    it('should detect supervisor agent using groupId for direct lookup', () => {
+      // Mock: groupById returns the group
+      vi.spyOn(agentGroupSelectors.agentGroupByIdSelectors, 'groupById').mockReturnValue(
+        () => mockGroupWithSupervisor as any,
+      );
 
       // Mock: getGroupMembers returns non-supervisor agents
       vi.spyOn(agentGroupSelectors.agentGroupSelectors, 'getGroupMembers').mockReturnValue(
@@ -680,7 +673,10 @@ describe('resolveAgentConfig', () => {
         systemRole: 'You are a group supervisor...',
       });
 
-      const result = resolveAgentConfig({ agentId: 'supervisor-agent-id' });
+      const result = resolveAgentConfig({
+        agentId: 'supervisor-agent-id',
+        groupId: 'group-123',
+      });
 
       expect(result.isBuiltinAgent).toBe(true);
       expect(result.slug).toBe('group-supervisor');
@@ -689,17 +685,10 @@ describe('resolveAgentConfig', () => {
     });
 
     it('should pass groupSupervisorContext to getAgentRuntimeConfig', () => {
-      // Mock: supervisor agent is found in agentGroup store
-      vi.spyOn(
-        agentGroupSelectors.agentGroupByIdSelectors,
-        'groupBySupervisorAgentId',
-      ).mockReturnValue(() => mockGroupWithSupervisor as any);
-
-      // Mock: getGroupBySupervisorAgentId for building groupSupervisorContext
-      vi.spyOn(
-        agentGroupSelectors.agentGroupSelectors,
-        'getGroupBySupervisorAgentId',
-      ).mockReturnValue(() => mockGroupWithSupervisor as any);
+      // Mock: groupById returns the group
+      vi.spyOn(agentGroupSelectors.agentGroupByIdSelectors, 'groupById').mockReturnValue(
+        () => mockGroupWithSupervisor as any,
+      );
 
       // Mock: getGroupMembers returns non-supervisor agents
       vi.spyOn(agentGroupSelectors.agentGroupSelectors, 'getGroupMembers').mockReturnValue(
@@ -718,7 +707,10 @@ describe('resolveAgentConfig', () => {
           systemRole: 'You are a group supervisor...',
         });
 
-      resolveAgentConfig({ agentId: 'supervisor-agent-id' });
+      resolveAgentConfig({
+        agentId: 'supervisor-agent-id',
+        groupId: 'group-123',
+      });
 
       expect(getAgentRuntimeConfigSpy).toHaveBeenCalledWith(
         'group-supervisor',
@@ -736,31 +728,53 @@ describe('resolveAgentConfig', () => {
       );
     });
 
-    it('should treat as regular agent when supervisor is not found in agentGroup store', () => {
-      // Mock: supervisor agent is NOT found in agentGroup store
-      vi.spyOn(
-        agentGroupSelectors.agentGroupByIdSelectors,
-        'groupBySupervisorAgentId',
-      ).mockReturnValue(() => undefined);
-
-      const result = resolveAgentConfig({ agentId: 'some-other-agent' });
+    it('should treat as regular agent when groupId is not provided', () => {
+      // Without groupId, cannot detect supervisor
+      const result = resolveAgentConfig({ agentId: 'supervisor-agent-id' });
 
       expect(result.isBuiltinAgent).toBe(false);
       expect(result.slug).toBeUndefined();
       expect(result.plugins).toEqual(['plugin-a', 'plugin-b']); // Falls back to agent config plugins
     });
 
-    it('should work correctly when regenerating supervisor message', () => {
-      // This simulates the regenerate flow where agentId is the supervisor agent ID
-      vi.spyOn(
-        agentGroupSelectors.agentGroupByIdSelectors,
-        'groupBySupervisorAgentId',
-      ).mockReturnValue(() => mockGroupWithSupervisor as any);
+    it('should treat as regular agent when agentId does not match group supervisorAgentId', () => {
+      // Mock: groupById returns the group
+      vi.spyOn(agentGroupSelectors.agentGroupByIdSelectors, 'groupById').mockReturnValue(
+        () => mockGroupWithSupervisor as any,
+      );
 
-      vi.spyOn(
-        agentGroupSelectors.agentGroupSelectors,
-        'getGroupBySupervisorAgentId',
-      ).mockReturnValue(() => mockGroupWithSupervisor as any);
+      // Pass a different agentId that is not the supervisor
+      const result = resolveAgentConfig({
+        agentId: 'some-other-agent',
+        groupId: 'group-123',
+      });
+
+      expect(result.isBuiltinAgent).toBe(false);
+      expect(result.slug).toBeUndefined();
+      expect(result.plugins).toEqual(['plugin-a', 'plugin-b']);
+    });
+
+    it('should treat as regular agent when group is not found', () => {
+      // Mock: groupById returns undefined
+      vi.spyOn(agentGroupSelectors.agentGroupByIdSelectors, 'groupById').mockReturnValue(
+        () => undefined,
+      );
+
+      const result = resolveAgentConfig({
+        agentId: 'supervisor-agent-id',
+        groupId: 'non-existent-group',
+      });
+
+      expect(result.isBuiltinAgent).toBe(false);
+      expect(result.slug).toBeUndefined();
+      expect(result.plugins).toEqual(['plugin-a', 'plugin-b']);
+    });
+
+    it('should work correctly when regenerating supervisor message with groupId', () => {
+      // This simulates the regenerate flow where both agentId and groupId are provided
+      vi.spyOn(agentGroupSelectors.agentGroupByIdSelectors, 'groupById').mockReturnValue(
+        () => mockGroupWithSupervisor as any,
+      );
 
       vi.spyOn(agentGroupSelectors.agentGroupSelectors, 'getGroupMembers').mockReturnValue(
         () => [{ id: 'member-agent-1', title: 'Agent 1' }] as any,
@@ -772,7 +786,10 @@ describe('resolveAgentConfig', () => {
         systemRole: 'Supervisor system role',
       });
 
-      const result = resolveAgentConfig({ agentId: 'supervisor-agent-id' });
+      const result = resolveAgentConfig({
+        agentId: 'supervisor-agent-id',
+        groupId: 'group-123',
+      });
 
       // Should correctly identify as builtin supervisor agent
       expect(result.isBuiltinAgent).toBe(true);

package/src/services/chat/mecha/agentConfigResolver.ts

@@ -55,6 +55,12 @@ export interface AgentConfigResolverContext {
   /** Document content for page-agent */
   documentContent?: string;
 
+  /**
+   * Group ID for supervisor detection.
+   * When provided, used for direct lookup instead of iterating all groups.
+   */
+  groupId?: string;
+
   /** Current model being used (for template variables) */
   model?: string;
   /** Plugins enabled for the agent */
@@ -114,30 +120,19 @@ export const resolveAgentConfig = (ctx: AgentConfigResolverContext): ResolvedAge
   const basePlugins = agentConfig.plugins ?? [];
 
   // Check if this is a builtin agent
-  // First check agent store, then check if this is a supervisor agent in agentGroup store
+  // First check agent store, then check if this is a supervisor agent via groupId
   let slug = agentSelectors.getAgentSlugById(agentId)(agentStoreState);
   log('slug from agentStore: %s (agentId: %s)', slug, agentId);
 
-  // If not found in agent store, check if this is a supervisor agent in any group
-  // Supervisor agents have their slug stored in agentGroup store, not agent store
-  if (!slug) {
+  // If not found in agent store, check if this is a supervisor agent using groupId
+  // This is more reliable than iterating all groups to find a match
+  if (!slug && ctx.groupId) {
     const groupStoreState = getChatGroupStoreState();
-    const groupMap = groupStoreState.groupMap;
-    const groupMapKeys = Object.keys(groupMap);
-    log(
-      'checking groupStore for supervisor - groupMap has %d groups: %o',
-      groupMapKeys.length,
-      groupMapKeys.map((key) => ({
-        groupId: key,
-        supervisorAgentId: groupMap[key]?.supervisorAgentId,
-        title: groupMap[key]?.title,
-      })),
-    );
+    const group = agentGroupByIdSelectors.groupById(ctx.groupId)(groupStoreState);
 
-    const group = agentGroupByIdSelectors.groupBySupervisorAgentId(agentId)(groupStoreState);
     log(
-      'groupBySupervisorAgentId result for agentId %s: %o',
-      agentId,
+      'checking supervisor via groupId %s: group=%o',
+      ctx.groupId,
       group
         ? {
             groupId: group.id,
@@ -147,10 +142,15 @@ export const resolveAgentConfig = (ctx: AgentConfigResolverContext): ResolvedAge
         : null,
     );
 
-    if (group) {
-      // This is a supervisor agent - use the builtin slug
+    // Check if this agent is the supervisor of the specified group
+    if (group?.supervisorAgentId === agentId) {
       slug = BUILTIN_AGENT_SLUGS.groupSupervisor;
-      log('agentId %s identified as group supervisor, assigned slug: %s', agentId, slug);
+      log(
+        'agentId %s identified as group supervisor for group %s, assigned slug: %s',
+        agentId,
+        ctx.groupId,
+        slug,
+      );
     }
   }
 
@@ -213,15 +213,17 @@ export const resolveAgentConfig = (ctx: AgentConfigResolverContext): ResolvedAge
   }
 
   // Build groupSupervisorContext if this is a group-supervisor agent
+  // Use groupId for direct lookup instead of reverse lookup by supervisorAgentId
   let groupSupervisorContext;
-  if (slug === BUILTIN_AGENT_SLUGS.groupSupervisor) {
-    log('building groupSupervisorContext for agentId: %s', agentId);
+  if (slug === BUILTIN_AGENT_SLUGS.groupSupervisor && ctx.groupId) {
+    log('building groupSupervisorContext for agentId: %s, groupId: %s', agentId, ctx.groupId);
     const groupStoreState = getChatGroupStoreState();
-    // Find the group by supervisor agent ID
-    const group = agentGroupSelectors.getGroupBySupervisorAgentId(agentId)(groupStoreState);
+    // Direct lookup using groupId
+    const group = agentGroupByIdSelectors.groupById(ctx.groupId)(groupStoreState);
 
     log(
-      'getGroupBySupervisorAgentId result: %o',
+      'groupById result for %s: %o',
+      ctx.groupId,
       group
         ? {
             agentsCount: group.agents?.length,
@@ -253,7 +255,7 @@ export const resolveAgentConfig = (ctx: AgentConfigResolverContext): ResolvedAge
         hasSystemPrompt: !!groupSupervisorContext.systemPrompt,
       });
     } else {
-      log('WARNING: group not found for supervisor agentId: %s', agentId);
+      log('WARNING: group not found for groupId: %s', ctx.groupId);
     }
   }
 

package/src/services/chatGroup/index.ts

@@ -20,6 +20,18 @@ export interface GroupMemberConfig {
   title?: string;
 }
 
+export interface SupervisorConfig {
+  avatar?: string;
+  backgroundColor?: string;
+  description?: string;
+  model?: string;
+  params?: any;
+  provider?: string;
+  systemRole?: string;
+  tags?: string[];
+  title?: string;
+}
+
 class ChatGroupService {
   /**
    * Create a group with a supervisor agent.
@@ -42,6 +54,7 @@ class ChatGroupService {
   createGroupWithMembers = (
     groupConfig: Omit<NewChatGroup, 'userId'>,
     members: GroupMemberConfig[],
+    supervisorConfig?: SupervisorConfig,
   ): Promise<{ agentIds: string[]; groupId: string; supervisorAgentId: string }> => {
     return lambdaClient.group.createGroupWithMembers.mutate({
       groupConfig: {
@@ -49,6 +62,7 @@ class ChatGroupService {
         config: groupConfig.config as any,
       },
       members: members as Partial<AgentItem>[],
+      supervisorConfig,
     });
   };
 

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

@@ -160,14 +160,16 @@ export const streamingExecutor: StateCreator<
     // - agentId is used for session ID (message storage location)
     const effectiveAgentId = paramSubAgentId || agentId;
 
-    // Get scope from operation context if available
+    // Get scope and groupId from operation context if available
     const operation = operationId ? get().operations[operationId] : undefined;
     const scope = operation?.context.scope;
+    const groupId = operation?.context.groupId;
 
     // Resolve agent config with builtin agent runtime config merged
     // This ensures runtime plugins (e.g., 'lobe-agent-builder' for Agent Builder) are included
     const { agentConfig: agentConfigData, plugins: pluginIds } = resolveAgentConfig({
       agentId: effectiveAgentId || '',
+      groupId, // Pass groupId for supervisor detection
       scope, // Pass scope from operation context
     });
 
@@ -341,6 +343,7 @@ export const streamingExecutor: StateCreator<
     // - max_tokens/reasoning_effort based on chatConfig settings
     const resolved = resolveAgentConfig({
       agentId: effectiveAgentId,
+      groupId, // Pass groupId for supervisor detection
       scope, // scope is already available from line 329
     });
     const finalAgentConfig = agentConfig || resolved.agentConfig;
@@ -594,7 +597,8 @@ export const streamingExecutor: StateCreator<
     // - max_tokens/reasoning_effort based on chatConfig settings
     const { agentConfig: agentConfigData } = resolveAgentConfig({
       agentId: effectiveAgentId || '',
-      scope: context.scope, // Pass scope from context parameter (available at line 883)
+      groupId, // Pass groupId for supervisor detection
+      scope: context.scope, // Pass scope from context parameter
     });
 
     // Use agent config from agentId