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

package/packages/prompts/src/prompts/fileSystem/formatRenameResult.test.ts

@@ -0,0 +1,35 @@
+import { describe, expect, it } from 'vitest';
+
+import { formatRenameResult } from './formatRenameResult';
+
+describe('formatRenameResult', () => {
+  it('should format successful rename', () => {
+    const result = formatRenameResult({
+      newName: 'newFile.ts',
+      oldPath: '/src/oldFile.ts',
+      success: true,
+    });
+    expect(result).toMatchInlineSnapshot(
+      `"Successfully renamed file /src/oldFile.ts to newFile.ts"`,
+    );
+  });
+
+  it('should format failed rename', () => {
+    const result = formatRenameResult({
+      error: 'File already exists',
+      newName: 'existing.ts',
+      oldPath: '/src/file.ts',
+      success: false,
+    });
+    expect(result).toMatchInlineSnapshot(`"Failed to rename file: File already exists"`);
+  });
+
+  it('should format failed rename without error message', () => {
+    const result = formatRenameResult({
+      newName: 'newName.ts',
+      oldPath: '/src/file.ts',
+      success: false,
+    });
+    expect(result).toMatchInlineSnapshot(`"Failed to rename file: undefined"`);
+  });
+});

package/packages/prompts/src/prompts/fileSystem/formatRenameResult.ts

@@ -0,0 +1,17 @@
+export interface FormatRenameResultParams {
+  error?: string;
+  newName: string;
+  oldPath: string;
+  success: boolean;
+}
+
+export const formatRenameResult = ({
+  success,
+  oldPath,
+  newName,
+  error,
+}: FormatRenameResultParams): string => {
+  return success
+    ? `Successfully renamed file ${oldPath} to ${newName}`
+    : `Failed to rename file: ${error}`;
+};

package/packages/prompts/src/prompts/fileSystem/formatWriteResult.test.ts

@@ -0,0 +1,30 @@
+import { describe, expect, it } from 'vitest';
+
+import { formatWriteResult } from './formatWriteResult';
+
+describe('formatWriteResult', () => {
+  it('should format successful write', () => {
+    const result = formatWriteResult({
+      path: '/src/newFile.ts',
+      success: true,
+    });
+    expect(result).toMatchInlineSnapshot(`"Successfully wrote to /src/newFile.ts"`);
+  });
+
+  it('should format failed write with error', () => {
+    const result = formatWriteResult({
+      error: 'Permission denied',
+      path: '/protected/file.ts',
+      success: false,
+    });
+    expect(result).toMatchInlineSnapshot(`"Failed to write file: Permission denied"`);
+  });
+
+  it('should format failed write without error message', () => {
+    const result = formatWriteResult({
+      path: '/some/path.ts',
+      success: false,
+    });
+    expect(result).toMatchInlineSnapshot(`"Failed to write file: Unknown error"`);
+  });
+});

package/packages/prompts/src/prompts/fileSystem/formatWriteResult.ts

@@ -0,0 +1,11 @@
+export interface FormatWriteResultParams {
+  error?: string;
+  path: string;
+  success: boolean;
+}
+
+export const formatWriteResult = ({ success, path, error }: FormatWriteResultParams): string => {
+  return success
+    ? `Successfully wrote to ${path}`
+    : `Failed to write file: ${error || 'Unknown error'}`;
+};

package/packages/prompts/src/prompts/fileSystem/index.ts

@@ -0,0 +1,13 @@
+export * from './formatCommandOutput';
+export * from './formatCommandResult';
+export * from './formatEditResult';
+export * from './formatFileContent';
+export * from './formatFileList';
+export * from './formatFileSearchResults';
+export * from './formatGlobResults';
+export * from './formatGrepResults';
+export * from './formatKillResult';
+export * from './formatMoveResults';
+export * from './formatMultipleFiles';
+export * from './formatRenameResult';
+export * from './formatWriteResult';

package/packages/prompts/src/prompts/index.ts

@@ -2,6 +2,7 @@ export * from './agentBuilder';
 export * from './agentGroup';
 export * from './chatMessages';
 export * from './files';
+export * from './fileSystem';
 export * from './groupChat';
 export * from './gtd';
 export * from './knowledgeBaseQA';

package/src/app/[variants]/(auth)/_layout/index.tsx

@@ -49,6 +49,4 @@ const AuthContainer: FC<PropsWithChildren> = ({ children }) => {
   );
 };
 
-AuthContainer.displayName = 'AuthContainer';
-
 export default AuthContainer;

package/src/app/[variants]/(auth)/layout.tsx

@@ -15,6 +15,4 @@ const AuthLayout: FC<PropsWithChildren> = ({ children }) => {
   );
 };
 
-AuthLayout.displayName = 'AuthLayout';
-
 export default AuthLayout;

package/src/app/[variants]/(auth)/login/[[...login]]/page.tsx

@@ -1,8 +1,8 @@
 import { SignIn } from '@clerk/nextjs';
 import { BRANDING_NAME } from '@lobechat/business-const';
-import { notFound } from '@/libs/next/navigation';
 
 import { enableClerk } from '@/envs/auth';
+import { notFound } from '@/libs/next/navigation';
 import { metadataModule } from '@/server/metadata';
 import { translation } from '@/server/translation';
 import { type DynamicLayoutProps } from '@/types/next';
@@ -24,6 +24,4 @@ const Page = () => {
   return <SignIn path="/login" />;
 };
 
-Page.displayName = 'Login';
-
 export default Page;

package/src/app/[variants]/(auth)/signup/[[...signup]]/page.tsx

@@ -1,7 +1,7 @@
 import { SignUp } from '@clerk/nextjs';
-import { notFound } from '@/libs/next/navigation';
 
 import { enableBetterAuth, enableClerk } from '@/envs/auth';
+import { notFound } from '@/libs/next/navigation';
 import { metadataModule } from '@/server/metadata';
 import { translation } from '@/server/translation';
 import { type DynamicLayoutProps } from '@/types/next';
@@ -48,6 +48,4 @@ const Page = () => {
   return notFound();
 };
 
-Page.displayName = 'SignUp';
-
 export default Page;

package/src/app/[variants]/(desktop)/desktop-onboarding/_layout/index.tsx

@@ -58,6 +58,4 @@ const OnboardingContainer: FC<PropsWithChildren> = ({ children }) => {
   );
 };
 
-OnboardingContainer.displayName = 'OnboardingContainer';
-
 export default OnboardingContainer;

package/src/app/[variants]/(main)/_layout/index.tsx

@@ -89,6 +89,4 @@ const Layout: FC = () => {
   );
 };
 
-Layout.displayName = 'DesktopMainLayout';
-
 export default Layout;

package/src/app/[variants]/(main)/agent/_layout/Sidebar/Topic/Actions.tsx

@@ -1,14 +1,15 @@
 import { ActionIcon, DropdownMenu } from '@lobehub/ui';
 import { MoreHorizontal } from 'lucide-react';
-import { memo } from 'react';
+import { memo, useState } from 'react';
 
 import { useTopicActionsDropdownMenu } from './useDropdownMenu';
 
 const Actions = memo(() => {
-  const menuItems = useTopicActionsDropdownMenu();
+  const [open, setOpen] = useState(false);
+  const menuItems = useTopicActionsDropdownMenu({ onUploadClose: () => setOpen(false) });
 
   return (
-    <DropdownMenu items={menuItems}>
+    <DropdownMenu items={menuItems} onOpenChange={setOpen} open={open}>
       <ActionIcon icon={MoreHorizontal} size={'small'} />
     </DropdownMenu>
   );

package/src/app/[variants]/(main)/agent/_layout/Sidebar/Topic/useDropdownMenu.tsx

@@ -21,9 +21,16 @@ const hotArea = css`
   }
 `;
 
-export const useTopicActionsDropdownMenu = (): MenuProps['items'] => {
+interface UseTopicActionsDropdownMenuOptions {
+  onUploadClose?: () => void;
+}
+
+export const useTopicActionsDropdownMenu = (
+  options: UseTopicActionsDropdownMenuOptions = {},
+): MenuProps['items'] => {
   const { t } = useTranslation(['topic', 'common']);
   const { modal } = App.useApp();
+  const { onUploadClose } = options;
 
   const [removeUnstarredTopic, removeAllTopic, importTopic] = useChatStore((s) => [
     s.removeUnstarredTopic,
@@ -33,6 +40,7 @@ export const useTopicActionsDropdownMenu = (): MenuProps['items'] => {
 
   const handleImport = useCallback(
     async (file: File) => {
+      onUploadClose?.();
       try {
         const text = await file.text();
         // Validate JSON format
@@ -46,7 +54,7 @@ export const useTopicActionsDropdownMenu = (): MenuProps['items'] => {
       }
       return false; // Prevent default upload behavior
     },
-    [importTopic, modal, t],
+    [importTopic, modal, onUploadClose, t],
   );
 
   const [topicDisplayMode, updatePreference] = useUserStore((s) => [
@@ -101,6 +109,7 @@ export const useTopicActionsDropdownMenu = (): MenuProps['items'] => {
             <div className={cx(hotArea)}>{t('actions.import')}</div>
           </Upload>
         ),
+        ...(onUploadClose ? { closeOnClick: false } : null),
       },
       {
         type: 'divider' as const,
@@ -143,6 +152,7 @@ export const useTopicActionsDropdownMenu = (): MenuProps['items'] => {
     updatePreference,
     updateSystemStatus,
     handleImport,
+    onUploadClose,
     removeUnstarredTopic,
     removeAllTopic,
     t,

package/src/app/[variants]/(main)/agent/_layout/index.tsx

@@ -30,6 +30,4 @@ const Layout: FC = () => {
   );
 };
 
-Layout.displayName = 'DesktopChatLayout';
-
 export default Layout;

package/src/app/[variants]/(main)/agent/features/Portal/index.tsx

@@ -15,6 +15,4 @@ const ChatPortal = () => {
   );
 };
 
-ChatPortal.displayName = 'ChatPortal';
-
 export default ChatPortal;

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

@@ -87,6 +87,42 @@ const AddGroupAgent = memo<{ mobile?: boolean }>(() => {
       return;
     }
 
+    // Find supervisor from memberAgents
+    const supervisorMember = memberAgents.find((member: any) => {
+      const agent = member.agent || member;
+      const role = member.role || agent.role;
+      return role === 'supervisor';
+    });
+
+    // Prepare supervisor config
+    let supervisorConfig;
+    if (supervisorMember) {
+      // Type assertion needed because actual API data structure differs from type definition
+      const member = supervisorMember as any;
+      const agent = member.agent || member;
+      const currentVersion = member.currentVersion || member;
+      const rawConfig = {
+        avatar: currentVersion.avatar,
+        backgroundColor: currentVersion.backgroundColor,
+        description: currentVersion.description,
+        model: currentVersion.config?.model || currentVersion.model,
+        params: currentVersion.config?.params || currentVersion.params,
+        provider: currentVersion.config?.provider || currentVersion.provider,
+        systemRole:
+          currentVersion.config?.systemRole ||
+          currentVersion.config?.systemPrompt ||
+          currentVersion.systemRole ||
+          currentVersion.content,
+        tags: currentVersion.tags,
+        title: currentVersion.name || agent.name || 'Supervisor',
+      };
+      // Filter out null/undefined values
+      supervisorConfig = Object.fromEntries(
+        // eslint-disable-next-line eqeqeq, @typescript-eslint/no-unused-vars
+        Object.entries(rawConfig).filter(([_, v]) => v != null),
+      );
+    }
+
     // Prepare group config
     const groupConfig = {
       config: {
@@ -95,30 +131,46 @@ const AddGroupAgent = memo<{ mobile?: boolean }>(() => {
         openingQuestions: config.openingQuestions,
         revealDM: config.revealDM,
       },
-      content: config.systemRole,
+      // Group content is the supervisor's systemRole (for backward compatibility)
+      content: supervisorConfig?.systemRole || config.systemRole,
       ...meta,
     };
 
     // Prepare member agents from market data
-    const members = memberAgents.map((member: any) => {
-      const agent = member.agent || member;
-      const currentVersion = member.currentVersion || member;
-      return {
-        avatar: currentVersion.avatar,
-        backgroundColor: currentVersion.backgroundColor,
-        description: currentVersion.description,
-        model: currentVersion.model,
-        plugins: currentVersion.plugins,
-        provider: currentVersion.provider,
-        systemRole: currentVersion.systemRole || currentVersion.content,
-        tags: currentVersion.tags,
-        title: currentVersion.name || agent.name,
-      };
-    });
+    // Filter out supervisor role as it will be created separately using supervisorConfig
+    const members = memberAgents
+      .filter((member: any) => {
+        const agent = member.agent || member;
+        const role = member.role || agent.role;
+        return role !== 'supervisor';
+      })
+      .map((member: any) => {
+        const agent = member.agent || member;
+        const currentVersion = member.currentVersion || member;
+        return {
+          avatar: currentVersion.avatar,
+          backgroundColor: currentVersion.backgroundColor,
+          description: currentVersion.description,
+          model: currentVersion.config?.model || currentVersion.model,
+          plugins: currentVersion.plugins,
+          provider: currentVersion.config?.provider || currentVersion.provider,
+          systemRole:
+            currentVersion.config?.systemRole ||
+            currentVersion.config?.systemPrompt ||
+            currentVersion.systemRole ||
+            currentVersion.content,
+          tags: currentVersion.tags,
+          title: currentVersion.name || agent.name,
+        };
+      });
 
     try {
       // Create group with all members in one request
-      const result = await chatGroupService.createGroupWithMembers(groupConfig, members);
+      const result = await chatGroupService.createGroupWithMembers(
+        groupConfig,
+        members,
+        supervisorConfig,
+      );
 
       // Refresh group list
       await loadGroups();

package/src/app/[variants]/(main)/community/(list)/_layout/index.tsx

@@ -32,6 +32,4 @@ const Layout = () => {
   );
 };
 
-Layout.displayName = 'DesktopDiscoverStoreLayout';
-
 export default Layout;

package/src/app/[variants]/(main)/community/(list)/assistant/_layout/index.tsx

@@ -18,6 +18,4 @@ const Layout = () => {
   );
 };
 
-Layout.displayName = 'DesktopDiscoverAssistantsLayout';
-
 export default Layout;

package/src/app/[variants]/(main)/community/(list)/mcp/_layout/index.tsx

@@ -18,6 +18,4 @@ const Layout = () => {
   );
 };
 
-Layout.displayName = 'DesktopDiscoverToolsLayout';
-
 export default Layout;

package/src/app/[variants]/(main)/community/(list)/model/_layout/index.tsx

@@ -18,6 +18,4 @@ const Layout = () => {
   );
 };
 
-Layout.displayName = 'DesktopDiscoverModelsLayout';
-
 export default Layout;

package/src/app/[variants]/(main)/community/_layout/index.tsx

@@ -19,6 +19,4 @@ const Layout: FC = () => {
   );
 };
 
-Layout.displayName = 'DesktopDiscoverStoreLayout';
-
 export default Layout;

package/src/app/[variants]/(main)/group/_layout/Sidebar/Topic/Actions.tsx

@@ -1,14 +1,15 @@
 import { ActionIcon, DropdownMenu } from '@lobehub/ui';
 import { MoreHorizontal } from 'lucide-react';
-import { memo } from 'react';
+import { memo, useState } from 'react';
 
 import { useTopicActionsDropdownMenu } from './useDropdownMenu';
 
 const Actions = memo(() => {
-  const menuItems = useTopicActionsDropdownMenu();
+  const [open, setOpen] = useState(false);
+  const menuItems = useTopicActionsDropdownMenu({ onUploadClose: () => setOpen(false) });
 
   return (
-    <DropdownMenu items={menuItems}>
+    <DropdownMenu items={menuItems} onOpenChange={setOpen} open={open}>
       <ActionIcon icon={MoreHorizontal} size={'small'} />
     </DropdownMenu>
   );

package/src/app/[variants]/(main)/group/_layout/Sidebar/Topic/useDropdownMenu.tsx

@@ -21,9 +21,16 @@ const hotArea = css`
   }
 `;
 
-export const useTopicActionsDropdownMenu = (): MenuProps['items'] => {
+interface UseTopicActionsDropdownMenuOptions {
+  onUploadClose?: () => void;
+}
+
+export const useTopicActionsDropdownMenu = (
+  options: UseTopicActionsDropdownMenuOptions = {},
+): MenuProps['items'] => {
   const { t } = useTranslation(['topic', 'common']);
   const { modal } = App.useApp();
+  const { onUploadClose } = options;
 
   const [removeUnstarredTopic, removeAllTopic, importTopic] = useChatStore((s) => [
     s.removeUnstarredTopic,
@@ -33,6 +40,7 @@ export const useTopicActionsDropdownMenu = (): MenuProps['items'] => {
 
   const handleImport = useCallback(
     async (file: File) => {
+      onUploadClose?.();
       try {
         const text = await file.text();
         // Validate JSON format
@@ -46,7 +54,7 @@ export const useTopicActionsDropdownMenu = (): MenuProps['items'] => {
       }
       return false; // Prevent default upload behavior
     },
-    [importTopic, modal, t],
+    [importTopic, modal, onUploadClose, t],
   );
 
   const [topicDisplayMode, updatePreference] = useUserStore((s) => [
@@ -101,6 +109,7 @@ export const useTopicActionsDropdownMenu = (): MenuProps['items'] => {
             <div className={cx(hotArea)}>{t('actions.import')}</div>
           </Upload>
         ),
+        ...(onUploadClose ? { closeOnClick: false } : null),
       },
       {
         type: 'divider' as const,
@@ -143,6 +152,7 @@ export const useTopicActionsDropdownMenu = (): MenuProps['items'] => {
     updatePreference,
     updateSystemStatus,
     handleImport,
+    onUploadClose,
     removeUnstarredTopic,
     removeAllTopic,
     t,

package/src/app/[variants]/(main)/group/_layout/index.tsx

@@ -30,6 +30,4 @@ const Layout: FC = () => {
   );
 };
 
-Layout.displayName = 'DesktopChatLayout';
-
 export default Layout;

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

@@ -2,7 +2,7 @@
 
 import { Flexbox } from '@lobehub/ui';
 import { cssVar } from 'antd-style';
-import { memo } from 'react';
+import { Suspense, memo } from 'react';
 
 import NavHeader from '@/features/NavHeader';
 import WideScreenButton from '@/features/WideScreenContainer/WideScreenButton';
@@ -15,7 +15,9 @@ const Header = memo(() => {
       right={
         <Flexbox horizontal style={{ backgroundColor: cssVar.colorBgContainer }}>
           <WideScreenButton />
-          <ShareButton />
+          <Suspense>
+            <ShareButton />
+          </Suspense>
         </Flexbox>
       }
     />

package/src/app/[variants]/(main)/group/features/Portal/index.tsx

@@ -14,6 +14,4 @@ const ChatPortal = () => {
   );
 };
 
-ChatPortal.displayName = 'ChatPortal';
-
 export default ChatPortal;

package/src/app/[variants]/(main)/home/_layout/index.tsx

@@ -64,6 +64,4 @@ const Layout: FC<LayoutProps> = ({ children }) => {
   );
 };
 
-Layout.displayName = 'DesktopHomeLayout';
-
 export default Layout;

package/src/app/[variants]/(main)/home/index.tsx

@@ -26,6 +26,4 @@ const Home: FC = () => {
   );
 };
 
-Home.displayName = 'Home';
-
 export default Home;

package/src/app/[variants]/(main)/image/_layout/Topics/TopicUrlSync.tsx

@@ -32,6 +32,4 @@ const TopicUrlSync = () => {
   return null;
 };
 
-TopicUrlSync.displayName = 'TopicUrlSync';
-
 export default TopicUrlSync;

package/src/app/[variants]/(main)/image/_layout/index.tsx

@@ -22,6 +22,4 @@ const Layout: FC = () => {
   );
 };
 
-Layout.displayName = 'DesktopAiImageLayout';
-
 export default Layout;

package/src/app/[variants]/(main)/memory/_layout/index.tsx

@@ -18,6 +18,4 @@ const DesktopMemoryLayout: FC = () => {
   );
 };
 
-DesktopMemoryLayout.displayName = 'DesktopMemoryLayout';
-
 export default DesktopMemoryLayout;

package/src/app/[variants]/(main)/page/_layout/index.tsx

@@ -20,6 +20,4 @@ const DesktopPagesLayout: FC = () => {
   );
 };
 
-DesktopPagesLayout.displayName = 'DesktopPagesLayout';
-
 export default DesktopPagesLayout;

package/src/app/[variants]/(main)/resource/(home)/_layout/index.tsx

@@ -18,6 +18,4 @@ const HomeLayout: FC = () => {
   );
 };
 
-HomeLayout.displayName = 'ResourceHomeLayout';
-
 export default HomeLayout;

package/src/app/[variants]/(main)/resource/_layout/index.tsx

@@ -14,6 +14,4 @@ const ResourceLayout: FC = () => {
   );
 };
 
-ResourceLayout.displayName = 'ResourceLayout';
-
 export default ResourceLayout;

package/src/app/[variants]/(main)/resource/library/_layout/index.tsx

@@ -21,6 +21,4 @@ const LibraryLayout: FC = () => {
   );
 };
 
-LibraryLayout.displayName = 'ResourceLibraryLayout';
-
 export default LibraryLayout;

package/src/app/[variants]/(main)/resource/library/features/Container.tsx

@@ -21,6 +21,4 @@ const Container: FC<PropsWithChildren> = ({ children }) => {
   );
 };
 
-Container.displayName = 'Container';
-
 export default Container;

package/src/app/[variants]/(main)/settings/_layout/index.tsx

@@ -25,6 +25,4 @@ const Layout: FC = () => {
   );
 };
 
-Layout.displayName = 'DesktopSettingsWrapper';
-
 export default Layout;

package/src/app/[variants]/(main)/settings/about/index.tsx

@@ -16,6 +16,4 @@ const Page = ({ mobile }: { mobile?: boolean }) => {
   );
 };
 
-Page.displayName = 'AboutSetting';
-
 export default Page;

package/src/app/[variants]/(main)/settings/agent/index.tsx

@@ -33,6 +33,4 @@ const Page = () => {
   );
 };
 
-Page.displayName = 'SystemAgent';
-
 export default Page;

package/src/app/[variants]/(main)/settings/apikey/index.tsx

@@ -14,6 +14,4 @@ const Page = () => {
   );
 };
 
-Page.displayName = 'ApiKeySetting';
-
 export default Page;

package/src/app/[variants]/(main)/settings/chat-appearance/index.tsx

@@ -15,6 +15,4 @@ const Page = () => {
   );
 };
 
-Page.displayName = 'ChatAppearanceSetting';
-
 export default Page;