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

package/src/features/ChatInput/ActionBar/components/ActionDropdown.tsx

@@ -8,6 +8,7 @@ import {
   type DropdownMenuProps,
   DropdownMenuRoot,
   DropdownMenuTrigger,
+  type MenuItemType,
   type MenuProps,
   type PopoverTrigger,
   renderDropdownMenuItems,
@@ -16,6 +17,7 @@ import { createStaticStyles, cx } from 'antd-style';
 import {
   type CSSProperties,
   type ReactNode,
+  isValidElement,
   memo,
   useCallback,
   useEffect,
@@ -34,8 +36,15 @@ const styles = createStaticStyles(({ css }) => ({
   `,
 }));
 
-type ActionDropdownMenu = Omit<Pick<MenuProps, 'className' | 'onClick' | 'style'>, 'items'> & {
-  items: MenuProps['items'] | (() => MenuProps['items']);
+export type ActionDropdownMenuItem = MenuItemType;
+
+export type ActionDropdownMenuItems = MenuProps<ActionDropdownMenuItem>['items'];
+
+type ActionDropdownMenu = Omit<
+  Pick<MenuProps<ActionDropdownMenuItem>, 'className' | 'onClick' | 'style'>,
+  'items'
+> & {
+  items: ActionDropdownMenuItems | (() => ActionDropdownMenuItems);
 };
 
 export interface ActionDropdownProps extends Omit<DropdownMenuProps, 'items'> {
@@ -116,7 +125,7 @@ const ActionDropdown = memo<ActionDropdownProps>(
     }, [openOnHover, triggerProps]);
 
     const decorateMenuItems = useCallback(
-      (items: MenuProps['items']): MenuProps['items'] => {
+      (items: ActionDropdownMenuItems): ActionDropdownMenuItems => {
         if (!items) return items;
 
         return items.map((item) => {
@@ -136,10 +145,24 @@ const ActionDropdown = memo<ActionDropdownProps>(
             };
           }
           const itemOnClick = 'onClick' in item ? item.onClick : undefined;
+          const closeOnClick = 'closeOnClick' in item ? item.closeOnClick : undefined;
+          const keepOpenOnClick = closeOnClick === false;
+          const itemLabel = 'label' in item ? item.label : undefined;
+          const shouldKeepOpen = isValidElement(itemLabel);
+
+          const resolvedCloseOnClick = closeOnClick ?? (shouldKeepOpen ? false : undefined);
 
           return {
             ...item,
+            ...(resolvedCloseOnClick !== undefined ? { closeOnClick: resolvedCloseOnClick } : null),
             onClick: (info) => {
+              if (keepOpenOnClick) {
+                info.domEvent.stopPropagation();
+                menu.onClick?.(info);
+                itemOnClick?.(info);
+                return;
+              }
+
               info.domEvent.preventDefault();
               menu.onClick?.(info);
               itemOnClick?.(info);

package/src/features/Conversation/Messages/Supervisor/index.tsx

@@ -55,7 +55,8 @@ const GroupMessage = memo<GroupMessageProps>(({ id, index, disableEditing, isLat
 
   // Get editing state from ConversationStore
   const creating = useConversationStore(messageStateSelectors.isMessageCreating(id));
-  const newScreen = useNewScreen({ creating, isLatestItem });
+  const generating = useConversationStore(messageStateSelectors.isMessageGenerating(id));
+  const newScreen = useNewScreen({ creating: creating || generating, isLatestItem });
 
   const setMessageItemActionElementPortialContext = useSetMessageItemActionElementPortialContext();
   const setMessageItemActionTypeContext = useSetMessageItemActionTypeContext();

package/src/features/Conversation/Messages/components/ContentLoading.tsx

@@ -18,10 +18,11 @@ interface ContentLoadingProps {
 const ContentLoading = memo<ContentLoadingProps>(({ id }) => {
   const { t } = useTranslation('chat');
   const runningOp = useChatStore(operationSelectors.getDeepestRunningOperationByMessage(id));
+  console.log('runningOp', runningOp);
   const [elapsedSeconds, setElapsedSeconds] = useState(0);
+  const [startTime, setStartTime] = useState(runningOp?.metadata?.startTime);
 
   const operationType = runningOp?.type as OperationType | undefined;
-  const startTime = runningOp?.metadata?.startTime;
 
   // Track elapsed time, reset when operation type changes
   useEffect(() => {
@@ -39,7 +40,12 @@ const ContentLoading = memo<ContentLoadingProps>(({ id }) => {
     const interval = setInterval(updateElapsed, 1000);
 
     return () => clearInterval(interval);
-  }, [startTime, operationType]);
+  }, [startTime]);
+
+  useEffect(() => {
+    setElapsedSeconds(0);
+    setStartTime(Date.now());
+  }, [operationType, id]);
 
   // Get localized label based on operation type
   const operationLabel = operationType

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/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

@@ -5,6 +5,7 @@ import {
   type LobeAgentConfig,
   type MessageMapScope,
 } from '@lobechat/types';
+import debug from 'debug';
 import { produce } from 'immer';
 
 import { getAgentStoreState } from '@/store/agent';
@@ -12,6 +13,8 @@ import { agentSelectors, chatConfigByIdSelectors } from '@/store/agent/selectors
 import { getChatGroupStoreState } from '@/store/agentGroup';
 import { agentGroupByIdSelectors, agentGroupSelectors } from '@/store/agentGroup/selectors';
 
+const log = debug('mecha:agentConfigResolver');
+
 /**
  * Applies params adjustments based on chatConfig settings.
  *
@@ -52,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 */
@@ -99,6 +108,8 @@ export interface ResolvedAgentConfig {
 export const resolveAgentConfig = (ctx: AgentConfigResolverContext): ResolvedAgentConfig => {
   const { agentId, model, documentContent, plugins, targetAgentConfig } = ctx;
 
+  log('resolveAgentConfig called with agentId: %s, scope: %s', agentId, ctx.scope);
+
   const agentStoreState = getAgentStoreState();
 
   // Get base config from store
@@ -109,21 +120,42 @@ 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 group = agentGroupByIdSelectors.groupBySupervisorAgentId(agentId)(groupStoreState);
-    if (group) {
-      // This is a supervisor agent - use the builtin slug
+    const group = agentGroupByIdSelectors.groupById(ctx.groupId)(groupStoreState);
+
+    log(
+      'checking supervisor via groupId %s: group=%o',
+      ctx.groupId,
+      group
+        ? {
+            groupId: group.id,
+            supervisorAgentId: group.supervisorAgentId,
+            title: group.title,
+          }
+        : null,
+    );
+
+    // 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 for group %s, assigned slug: %s',
+        agentId,
+        ctx.groupId,
+        slug,
+      );
     }
   }
 
   if (!slug) {
+    log('agentId %s is not a builtin agent (no slug found)', agentId);
     // Regular agent - use provided plugins if available, fallback to agent's plugins
     const finalPlugins = plugins && plugins.length > 0 ? plugins : basePlugins;
 
@@ -181,20 +213,49 @@ 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) {
+  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(
+      'groupById result for %s: %o',
+      ctx.groupId,
+      group
+        ? {
+            agentsCount: group.agents?.length,
+            groupId: group.id,
+            supervisorAgentId: group.supervisorAgentId,
+            title: group.title,
+          }
+        : null,
+    );
 
     if (group) {
       const groupMembers = agentGroupSelectors.getGroupMembers(group.id)(groupStoreState);
+      log(
+        'groupMembers for groupId %s: %o',
+        group.id,
+        groupMembers.map((m) => ({ id: m.id, isSupervisor: m.isSupervisor, title: m.title })),
+      );
+
       groupSupervisorContext = {
         availableAgents: groupMembers.map((agent) => ({ id: agent.id, title: agent.title })),
         groupId: group.id,
         groupTitle: group.title || 'Group Chat',
         systemPrompt: agentConfig.systemRole,
       };
+      log('groupSupervisorContext built: %o', {
+        availableAgentsCount: groupSupervisorContext.availableAgents.length,
+        groupId: groupSupervisorContext.groupId,
+        groupTitle: groupSupervisorContext.groupTitle,
+        hasSystemPrompt: !!groupSupervisorContext.systemPrompt,
+      });
+    } else {
+      log('WARNING: group not found for groupId: %s', ctx.groupId);
     }
   }
 
@@ -258,6 +319,12 @@ export const resolveAgentConfig = (ctx: AgentConfigResolverContext): ResolvedAge
   // Apply params adjustments based on chatConfig
   const finalAgentConfig = applyParamsFromChatConfig(resolvedAgentConfig, resolvedChatConfig);
 
+  log('resolveAgentConfig completed for agentId: %s, result: %o', agentId, {
+    isBuiltinAgent: true,
+    pluginsCount: finalPlugins.length,
+    slug,
+  });
+
   return {
     agentConfig: finalAgentConfig,
     chatConfig: resolvedChatConfig,