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

package/src/features/ModelSwitchPanel/index.tsx

@@ -1,4 +1,4 @@
-import { Popover, TooltipGroup } from '@lobehub/ui';
+import { Popover } from '@lobehub/ui';
 import { memo, useCallback, useState } from 'react';
 
 import { PanelContent } from './components/PanelContent';
@@ -29,28 +29,26 @@ const ModelSwitchPanel = memo<ModelSwitchPanelProps>(
     );
 
     return (
-      <TooltipGroup>
-        <Popover
-          classNames={{
-            content: styles.container,
-          }}
-          content={
-            <PanelContent
-              isOpen={isOpen}
-              model={modelProp}
-              onModelChange={onModelChange}
-              onOpenChange={handleOpenChange}
-              provider={providerProp}
-            />
-          }
-          nativeButton={false}
-          onOpenChange={handleOpenChange}
-          open={isOpen}
-          placement={placement}
-        >
-          {children}
-        </Popover>
-      </TooltipGroup>
+      <Popover
+        classNames={{
+          content: styles.container,
+        }}
+        content={
+          <PanelContent
+            isOpen={isOpen}
+            model={modelProp}
+            onModelChange={onModelChange}
+            onOpenChange={handleOpenChange}
+            provider={providerProp}
+          />
+        }
+        nativeButton={false}
+        onOpenChange={handleOpenChange}
+        open={isOpen}
+        placement={placement}
+      >
+        {children}
+      </Popover>
     );
   },
 );

package/src/features/ResourceManager/components/Explorer/MasonryView/index.tsx

@@ -197,6 +197,4 @@ const MasonryView = memo(function MasonryView() {
   );
 });
 
-MasonryView.displayName = 'MasonryView';
-
 export default MasonryView;

package/src/features/ResourceManager/components/Header/AddButton.tsx

@@ -5,7 +5,7 @@ import { Notion } from '@lobehub/icons';
 import { Button, DropdownMenu, Icon, type MenuProps } from '@lobehub/ui';
 import { Upload } from 'antd';
 import { FilePenLine, FileUp, FolderIcon, FolderUp, Link, Plus } from 'lucide-react';
-import { useCallback, useMemo } from 'react';
+import { type ChangeEvent, useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useResourceManagerStore } from '@/app/[variants]/(main)/resource/features/store';
@@ -23,6 +23,7 @@ const AddButton = () => {
   const pushDockFileList = useFileStore((s) => s.pushDockFileList);
   const uploadFolderWithStructure = useFileStore((s) => s.uploadFolderWithStructure);
   const createResourceAndSync = useFileStore((s) => s.createResourceAndSync);
+  const [menuOpen, setMenuOpen] = useState(false);
 
   // TODO: Migrate Notion import to use createResource
   // Keep old functions temporarily for components not yet migrated
@@ -121,6 +122,13 @@ const AddButton = () => {
     t,
     uploadFolderWithStructure,
   });
+  const handleFolderUploadWithClose = useCallback(
+    (event: ChangeEvent<HTMLInputElement>) => {
+      setMenuOpen(false);
+      return handleFolderUpload(event);
+    },
+    [handleFolderUpload],
+  );
 
   const items = useMemo<MenuProps['items']>(
     () => [
@@ -144,11 +152,13 @@ const AddButton = () => {
         type: 'divider',
       },
       {
+        closeOnClick: false,
         icon: <Icon icon={FileUp} />,
         key: 'upload-file',
         label: (
           <Upload
             beforeUpload={async (file) => {
+              setMenuOpen(false);
               await pushDockFileList([file], libraryId, currentFolderId ?? undefined);
 
               return false;
@@ -161,6 +171,7 @@ const AddButton = () => {
         ),
       },
       {
+        closeOnClick: false,
         icon: <Icon icon={FolderUp} />,
         key: 'upload-folder',
         label: <label htmlFor="folder-upload-input">{t('header.actions.uploadFolder')}</label>,
@@ -211,7 +222,13 @@ const AddButton = () => {
 
   return (
     <>
-      <DropdownMenu items={items} placement="bottomRight" trigger="both">
+      <DropdownMenu
+        items={items}
+        onOpenChange={setMenuOpen}
+        open={menuOpen}
+        placement="bottomRight"
+        trigger="both"
+      >
         <Button data-no-highlight icon={Plus} type="primary">
           {t('addLibrary')}
         </Button>
@@ -233,7 +250,7 @@ const AddButton = () => {
       <input
         id="folder-upload-input"
         multiple
-        onChange={handleFolderUpload}
+        onChange={handleFolderUploadWithClose}
         style={{ display: 'none' }}
         type="file"
         // @ts-expect-error - webkitdirectory is not in the React types

package/src/features/User/UserAvatar.tsx

@@ -88,6 +88,4 @@ const UserAvatar = forwardRef<HTMLDivElement, UserAvatarProps>(
   },
 );
 
-UserAvatar.displayName = 'UserAvatar';
-
 export default UserAvatar;

package/src/locales/default/plugin.ts

@@ -70,7 +70,8 @@ export default {
   'builtins.lobe-group-management.apiName.summarize': 'Summarize conversation',
   'builtins.lobe-group-management.apiName.vote': 'Start vote',
   'builtins.lobe-group-management.inspector.broadcast.title': 'Following Agents speak:',
-  'builtins.lobe-group-management.inspector.executeAgentTask.title': 'Assigning task to:',
+  'builtins.lobe-group-management.inspector.executeAgentTask.assignTo': 'Assign',
+  'builtins.lobe-group-management.inspector.executeAgentTask.task': 'task:',
   'builtins.lobe-group-management.inspector.executeAgentTasks.title': 'Assigning tasks to:',
   'builtins.lobe-group-management.inspector.speak.title': 'Designated Agent speaks:',
   'builtins.lobe-group-management.title': 'Group Coordinator',

package/src/server/routers/lambda/__tests__/agentGroup.test.ts

@@ -171,6 +171,7 @@ describe('agentGroupRouter', () => {
           config: { ...DEFAULT_CHAT_GROUP_CHAT_CONFIG, allowDM: true },
         },
         ['agent-1', 'agent-2'],
+        undefined,
       );
       expect(result).toEqual({
         agentIds: ['agent-1', 'agent-2'],

package/src/server/routers/lambda/agentGroup.ts

@@ -129,6 +129,19 @@ export const agentGroupRouter = router({
             })
             .partial(),
         ),
+        supervisorConfig: z
+          .object({
+            avatar: z.string().nullish(),
+            backgroundColor: z.string().nullish(),
+            description: z.string().nullish(),
+            model: z.string().nullish(),
+            params: z.any().nullish(),
+            provider: z.string().nullish(),
+            systemRole: z.string().nullish(),
+            tags: z.array(z.string()).nullish(),
+            title: z.string().nullish(),
+          })
+          .optional(),
       }),
     )
     .mutation(async ({ input, ctx }) => {
@@ -144,6 +157,14 @@ export const agentGroupRouter = router({
       const memberAgentIds = createdAgents.map((agent) => agent.id);
 
       // 2. Create group with supervisor and member agents
+      // Filter out null/undefined values from supervisorConfig
+      const supervisorConfig = input.supervisorConfig
+        ? Object.fromEntries(
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars, eqeqeq
+            Object.entries(input.supervisorConfig).filter(([_, v]) => v != null),
+          )
+        : undefined;
+
       const { group, supervisorAgentId } = await ctx.agentGroupRepo.createGroupWithSupervisor(
         {
           ...input.groupConfig,
@@ -152,6 +173,7 @@ export const agentGroupRouter = router({
           ),
         },
         memberAgentIds,
+        supervisorConfig as any,
       );
 
       return { agentIds: memberAgentIds, groupId: group.id, supervisorAgentId };

package/src/services/chat/index.ts

@@ -138,6 +138,7 @@ class ChatService {
       plugins: pluginIds,
     } = resolveAgentConfig({
       agentId: targetAgentId,
+      groupId, // Pass groupId for supervisor detection
       model: payload.model,
       plugins: enabledPlugins,
       provider: payload.provider,

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,
     });
   };