@lobehub/lobehub 2.0.0-next.324 → 2.0.0-next.325

package/src/features/ModelSwitchPanel/index.tsx

@@ -1,4 +1,10 @@
-import { Popover } from '@lobehub/ui';
+import {
+  DropdownMenuPopup,
+  DropdownMenuPortal,
+  DropdownMenuPositioner,
+  DropdownMenuRoot,
+  DropdownMenuTrigger,
+} from '@lobehub/ui';
 import { memo, useCallback, useState } from 'react';
 
 import { PanelContent } from './components/PanelContent';
@@ -16,8 +22,6 @@ const ModelSwitchPanel = memo<ModelSwitchPanelProps>(
     provider: providerProp,
   }) => {
     const [internalOpen, setInternalOpen] = useState(false);
-
-    // Use controlled open if provided, otherwise use internal state
     const isOpen = open ?? internalOpen;
 
     const handleOpenChange = useCallback(
@@ -29,26 +33,23 @@ const ModelSwitchPanel = memo<ModelSwitchPanelProps>(
     );
 
     return (
-      <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>
+      <DropdownMenuRoot onOpenChange={handleOpenChange} open={isOpen}>
+        <DropdownMenuTrigger nativeButton={false} openOnHover>
+          {children}
+        </DropdownMenuTrigger>
+        <DropdownMenuPortal>
+          <DropdownMenuPositioner hoverTrigger placement={placement}>
+            <DropdownMenuPopup className={styles.container}>
+              <PanelContent
+                model={modelProp}
+                onModelChange={onModelChange}
+                onOpenChange={handleOpenChange}
+                provider={providerProp}
+              />
+            </DropdownMenuPopup>
+          </DropdownMenuPositioner>
+        </DropdownMenuPortal>
+      </DropdownMenuRoot>
     );
   },
 );

package/src/features/ModelSwitchPanel/styles.ts

@@ -69,6 +69,9 @@ export const styles = createStaticStyles(({ css, cssVar }) => ({
       }
     }
   `,
+  menuItemActive: css`
+    background: ${cssVar.colorFillTertiary};
+  `,
   toolbar: css`
     border-block-end: 1px solid ${cssVar.colorBorderSecondary};
   `,

package/src/features/ModelSwitchPanel/types.ts

@@ -1,3 +1,4 @@
+import type { DropdownMenuPlacement } from '@lobehub/ui';
 import type { AiModelForSelect } from 'model-bank';
 import type { ReactNode } from 'react';
 
@@ -16,7 +17,7 @@ export interface ModelWithProviders {
   }>;
 }
 
-export type VirtualItem =
+export type ListItem =
   | {
       data: ModelWithProviders;
       type: 'model-item-single';
@@ -42,13 +43,7 @@ export type VirtualItem =
       type: 'no-provider';
     };
 
-export type DropdownPlacement =
-  | 'bottom'
-  | 'bottomLeft'
-  | 'bottomRight'
-  | 'top'
-  | 'topLeft'
-  | 'topRight';
+export type DropdownPlacement = DropdownMenuPlacement;
 
 export interface ModelSwitchPanelProps {
   children?: ReactNode;

package/src/features/ModelSwitchPanel/utils.ts

@@ -1,8 +1,8 @@
-import type { VirtualItem } from './types';
+import type { ListItem } from './types';
 
 export const menuKey = (provider: string, model: string) => `${provider}-${model}`;
 
-export const getVirtualItemKey = (item: VirtualItem): string => {
+export const getListItemKey = (item: ListItem): string => {
   switch (item.type) {
     case 'model-item-single':
     case 'model-item-multiple': {

package/src/features/NavPanel/SideBarDrawer.tsx

@@ -23,6 +23,7 @@ interface SideBarDrawerProps {
 
 const SideBarDrawer = memo<SideBarDrawerProps>(
   ({ subHeader, open, onClose, children, title, action }) => {
+    const size = 280;
     return (
       <Drawer
         closable={false}
@@ -33,9 +34,13 @@ const SideBarDrawer = memo<SideBarDrawerProps>(
         open={open}
         placement="left"
         rootStyle={{
+          bottom: 0,
+          overflow: 'hidden',
           position: 'absolute',
+          top: 0,
+          width: `${size}px`,
         }}
-        size={280}
+        size={size}
         styles={{
           body: {
             background: cssVar.colorBgLayout,
@@ -58,7 +63,12 @@ const SideBarDrawer = memo<SideBarDrawerProps>(
             <SideBarHeaderLayout
               left={
                 typeof title === 'string' ? (
-                  <Text ellipsis fontSize={14} style={{ paddingLeft: 4 }} weight={400}>
+                  <Text
+                    ellipsis
+                    fontSize={14}
+                    style={{ fontWeight: 600, paddingLeft: 8 }}
+                    weight={400}
+                  >
                     {title}
                   </Text>
                 ) : (

package/src/features/Portal/GroupThread/Body/index.tsx

@@ -3,20 +3,14 @@
 import { Flexbox } from '@lobehub/ui';
 import { memo } from 'react';
 
-// import ChatInput from '@/app/[variants]/(main)/chat/features/Conversation/ChatInput';
-// import { useChatGroupStore } from '@/store/chatGroup';
-
 import ThreadChatList from './ThreadChatList';
 
 const Body = memo(() => {
-  // const activeThreadAgentId = useChatGroupStore((s) => s.activeThreadAgentId);
-
   return (
     <Flexbox height={'100%'}>
       <Flexbox flex={1} style={{ overflow: 'hidden', position: 'relative' }}>
         <ThreadChatList />
       </Flexbox>
-      {/*{activeThreadAgentId && <ChatInput targetMemberId={activeThreadAgentId} />}*/}
     </Flexbox>
   );
 });

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

@@ -187,22 +187,6 @@ const AddButton = () => {
             label: 'Notion',
             onClick: handleOpenNotionGuide,
           },
-          // {
-          //   icon: <Icon icon={Notion} />,
-          //   key: 'connect-google-drive',
-          //   label: 'Google Drive',
-          //   onClick: () => {
-          //     // TODO: Implement Google Drive connection
-          //   },
-          // },
-          // {
-          //   icon: <Icon icon={Notion} />,
-          //   key: 'connect-onedrive',
-          //   label: 'OneDrive',
-          //   onClick: () => {
-          //     // TODO: Implement OneDrive connection
-          //   },
-          // },
         ],
         icon: <Icon icon={Link} />,
         key: 'connect',

package/src/features/ShareModal/ShareImage/index.tsx

@@ -56,14 +56,6 @@ const ShareImage = memo<{ mobile?: boolean }>(() => {
       name: 'withSystemRole',
       valuePropName: 'checked',
     },
-    // {
-    //   children: <Switch />,
-    //   label: t('shareModal.withBackground'),
-    //   layout: 'horizontal',
-    //   minWidth: undefined,
-    //   name: 'withBackground',
-    //   valuePropName: 'checked',
-    // },
     {
       children: <Switch />,
       label: t('shareModal.withFooter'),

package/src/hooks/useProviderName.ts

@@ -1,7 +1,6 @@
 import { DEFAULT_MODEL_PROVIDER_LIST } from 'model-bank/modelProviders';
 
 export const useProviderName = (provider: string) => {
-  // const { t } = useTranslation('modelProvider');
   const providerCard = DEFAULT_MODEL_PROVIDER_LIST.find((p) => p.id === provider);
 
   return providerCard?.name || provider;

package/src/layout/GlobalProvider/Locale.tsx

@@ -12,7 +12,6 @@ import { getAntdLocale } from '@/utils/locale';
 import Editor from './Editor';
 
 const updateDayjs = async (lang: string) => {
-  // load default lang
   let dayJSLocale;
   try {
     // dayjs locale is using `en` instead of `en-US`
@@ -38,21 +37,10 @@ const Locale = memo<LocaleLayoutProps>(({ children, defaultLang, antdLocale }) =
   const [lang, setLang] = useState(defaultLang);
   const [locale, setLocale] = useState(antdLocale);
 
-  // if run on server side, init i18n instance everytime
   if (isOnServerSide) {
-    // use sync mode to init instantly
     i18n.init({ initAsync: false });
-
-    // load the dayjs locale
-    // if (lang) {
-    //   const dayJSLocale = require(`dayjs/locale/${lang!.toLowerCase()}.js`);
-    //
-    //   dayjs.locale(dayJSLocale);
-    // }
   } else {
-    // if on browser side, init i18n instance only once
     if (!i18n.instance.isInitialized)
-      // console.debug('locale', lang);
       i18n.init().then(async () => {
         if (!lang) return;
 

package/src/layout/GlobalProvider/index.tsx

@@ -67,7 +67,6 @@ const GlobalLayout = async ({
               <QueryProvider>
                 <StoreInitialization />
                 <FaviconProvider>
-                  {/* {process.env.NODE_ENV === 'development' && <FaviconTestPanel />} */}
                   <GroupWizardProvider>
                     <DragUploadProvider>
                       <LazyMotion features={domMax}>

package/src/libs/better-auth/sso/helpers.ts

@@ -55,7 +55,6 @@ export const buildOidcConfig = ({
     pkce,
     providerId,
     scopes,
-    // ...fallbackEndpoints,
     ...overrides,
   } satisfies GenericOAuthConfig;
 };

package/src/libs/next/config/define-config.ts

@@ -308,6 +308,11 @@ export function defineConfig(config: CustomNextConfig) {
         permanent: false,
         source: '/repos',
       },
+      {
+        destination: '/',
+        permanent: true,
+        source: '/chat',
+      },
       ...(config.redirects ?? []),
     ],
 

package/src/locales/create.ts

@@ -45,21 +45,6 @@ export const createI18nNext = (lang?: string) => {
       return instance.init({
         debug: debugMode,
         defaultNS: ['error', 'common', 'chat'],
-
-        // detection: {
-        //   caches: ['cookie'],
-        //   cookieMinutes: 60 * 24 * COOKIE_CACHE_DAYS,
-        //   /**
-        //      Set `sameSite` to `lax` so that the i18n cookie can be passed to the
-        //      server side when returning from the OAuth authorization website.
-        //      ref: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#samesitesamesite-value
-        //      discussion: https://github.com/lobehub/lobe-chat/pull/1474
-        //   */
-        //   cookieOptions: {
-        //     sameSite: 'lax',
-        //   },
-        //   lookupCookie: LOBE_LOCALE_COOKIE,
-        // },
         fallbackLng: DEFAULT_LANG,
 
         initAsync,
@@ -67,8 +52,6 @@ export const createI18nNext = (lang?: string) => {
         interpolation: {
           escapeValue: false,
         },
-        // Use flat keys with dots (e.g. "notFound.title") instead of nested objects.
-        // This keeps both runtime lookup and TS key inference consistent.
         keySeparator: false,
 
         lng: lang,

package/src/services/aiChat.ts

@@ -20,10 +20,6 @@ class AiChatService {
       signal: abortController?.signal,
     });
   };
-
-  // sendGroupMessageInServer = async (params: SendMessageServerParams) => {
-  //   return lambdaClient.aiChat.sendGroupMessageInServer.mutate(cleanObject(params));
-  // };
 }
 
 export const aiChatService = new AiChatService();

package/src/services/debug.ts

@@ -1,38 +1,5 @@
 class DebugService {
-  async insertLargeDataToDB() {
-    // await DEBUG_MODEL.createRandomData({
-    //   messageCount: 100_000,
-    //   sessionCount: 40,
-    //   startIndex: 0,
-    //   topicCount: 200,
-    // });
-    //
-    // console.log('Inserted 100k');
-    //
-    // await DEBUG_MODEL.createRandomData({
-    //   messageCount: 300_000,
-    //   sessionCount: 40,
-    //   startIndex: 100_001,
-    //   topicCount: 200,
-    // });
-    // console.log('Inserted 400k');
-    //
-    // await DEBUG_MODEL.createRandomData({
-    //   messageCount: 300_000,
-    //   sessionCount: 40,
-    //   startIndex: 400_001,
-    //   topicCount: 200,
-    // });
-    // console.log('Inserted 700k');
-    //
-    // await DEBUG_MODEL.createRandomData({
-    //   messageCount: 300_000,
-    //   sessionCount: 40,
-    //   startIndex: 700_001,
-    //   topicCount: 200,
-    // });
-    // console.log('Inserted 1M');
-  }
+  async insertLargeDataToDB() {}
 }
 
 export const debugService = new DebugService();

package/src/services/models.ts

@@ -25,10 +25,8 @@ export type ProgressCallback = (progress: ModelProgressInfo) => void;
 export type ErrorCallback = (error: { message: string }) => void;
 
 export class ModelsService {
-  // Controller for aborting downloads
   private _abortController: AbortController | null = null;
 
-  // Get model list
   getModels = async (provider: string): Promise<ChatModelCard[] | undefined> => {
     const headers = await createHeaderWithAuth({
       headers: { 'Content-Type': 'application/json' },
@@ -66,7 +64,6 @@ export class ModelsService {
     { onProgress }: { onError?: ErrorCallback; onProgress?: ProgressCallback } = {},
   ): Promise<void> => {
     try {
-      // Create a new AbortController
       this._abortController = new AbortController();
       const signal = this._abortController.signal;
 
@@ -99,7 +96,6 @@ export class ModelsService {
         throw await getMessageError(res);
       }
 
-      // Process response stream
       if (res.body) {
         await this.processModelPullStream(res, { onProgress });
       }
@@ -112,14 +108,11 @@ export class ModelsService {
       console.error('download model error:', error);
       throw error;
     } finally {
-      // Clean up AbortController
       this._abortController = null;
     }
   };
 
-  // Abort model download
   abortPull = () => {
-    // Use AbortController to abort download
     if (this._abortController) {
       this._abortController.abort();
       this._abortController = null;
@@ -136,17 +129,14 @@ export class ModelsService {
     response: Response,
     { onProgress, onError }: { onError?: ErrorCallback; onProgress?: ProgressCallback },
   ): Promise<void> => {
-    // Process response stream
     const reader = response.body?.getReader();
     if (!reader) return;
 
-    // Read and process stream data
     // eslint-disable-next-line no-constant-condition
     while (true) {
       const { done, value } = await reader.read();
       if (done) break;
 
-      // Parse progress data
       const progressText = new TextDecoder().decode(value);
       // One line may contain multiple progress updates
       const progressUpdates = progressText.trim().split('\n');
@@ -162,10 +152,6 @@ export class ModelsService {
 
         if (progress.status === 'canceled') {
           console.log('progress:', progress);
-          // const abortError = new Error('abort');
-          // abortError.name = 'AbortError';
-          //
-          // throw abortError;
         }
 
         if (progress.status === 'error') {
@@ -173,7 +159,6 @@ export class ModelsService {
           throw new Error(progress.error);
         }
 
-        // Call progress callback
         if (progress.completed !== undefined || progress.status) {
           onProgress?.(progress);
         }

package/src/store/chat/agents/GroupOrchestration/createGroupOrchestrationExecutors.ts

@@ -120,11 +120,6 @@ export const createGroupOrchestrationExecutors = (
         };
       }
 
-      // Variable to capture the decision from tool handler
-      // let decision: ExecutorResult['type'] | undefined;
-      // let decisionParams: Record<string, unknown> = {};
-      // let skipCallSupervisor = false;
-
       // Execute Supervisor agent with the supervisor's agentId in context
       // Mark isSupervisor=true so assistant messages get metadata.isSupervisor for UI rendering
       // Note: Don't pass operationId - let it create a new child operation (same as call_agent)
@@ -139,10 +134,6 @@ export const createGroupOrchestrationExecutors = (
 
       log(`[${sessionLogId}] Supervisor agent finished`);
 
-      // Check what decision was made by the supervisor
-      // This is captured from the groupOrchestration callbacks registered by tools
-      // const orchestrationCallbacks = get().getGroupOrchestrationCallbacks();
-
       // If no tool was called (supervisor finished normally), end orchestration
       // The actual decision is captured via the afterCompletion callbacks
       // For now, return a finish decision if we reach here

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

@@ -399,9 +399,6 @@ export const conversationLifecycle: StateCreator<
         skipCreateFirstMessage: true,
       });
 
-      //
-      // // if there is relative files, then add files to agent
-      // // only available in server mode
       const userFiles = dbMessageSelectors
         .dbUserFiles(get())
         .map((f) => f?.id)

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

@@ -14,9 +14,7 @@ export interface ChatAIChatAction
     ConversationLifecycleAction,
     ConversationControlAction,
     StreamingExecutorAction,
-    StreamingStatesAction {
-  /**/
-}
+    StreamingStatesAction {}
 
 export const chatAiChat: StateCreator<
   ChatStore,

package/src/store/file/slices/chat/action.test.ts

@@ -16,7 +16,6 @@ vi.mock('@/components/AntdStaticMethods', () => ({
   },
 }));
 
-//  mock the arrayBuffer
 beforeAll(() => {
   Object.defineProperty(File.prototype, 'arrayBuffer', {
     writable: true,
@@ -33,7 +32,6 @@ beforeAll(() => {
 });
 
 beforeEach(() => {
-  // Reset all mocks before each test
   vi.resetAllMocks();
 });
 
@@ -41,7 +39,6 @@ describe('useFileStore:chat', () => {
   it('clearChatUploadFileList should clear the inputFilesList', () => {
     const { result } = renderHook(() => useStore());
 
-    // Populate the list to clear it later
     act(() => {
       useStore.setState({ chatUploadFileList: [{ id: 'abc' }] as any });
     });
@@ -54,90 +51,4 @@ describe('useFileStore:chat', () => {
 
     expect(result.current.chatUploadFileList).toEqual([]);
   });
-
-  // it('removeFile should call fileService.removeFile and update the store', async () => {
-  //   const { result } = renderHook(() => useStore());
-  //
-  //   const fileId = 'test-id';
-  //
-  //   // Mock the fileService.removeFile to resolve
-  //   vi.spyOn(fileService, 'removeFile').mockResolvedValue(undefined);
-  //
-  //   // Populate the list to remove an item later
-  //   act(() => {
-  //     useStore.setState(({ inputFilesList }) => ({ inputFilesList: [...inputFilesList, fileId] }));
-  //     //   // result.current.inputFilesList.push(fileId);
-  //   });
-  //
-  //   await act(async () => {
-  //     await result.current.removeFile(fileId);
-  //   });
-  //
-  //   expect(fileService.removeFile).toHaveBeenCalledWith(fileId);
-  //   expect(result.current.inputFilesList).toEqual([]);
-  // });
-
-  // describe('uploadFile', () => {
-  //   it('uploadFile should handle errors', async () => {
-  //     const { result } = renderHook(() => useStore());
-  //     const testFile = new File(['content'], 'test.png', { type: 'image/png' });
-  //
-  //     // 模拟 fileService.uploadFile 抛出错误
-  //     const errorMessage = 'Upload failed';
-  //     vi.spyOn(uploadService, 'uploadFile').mockRejectedValue(new Error(errorMessage));
-  //
-  //     // Mock console.error for testing
-  //
-  //     await act(async () => {
-  //       await result.current.uploadFile(testFile);
-  //     });
-  //
-  //     expect(uploadService.uploadFile).toHaveBeenCalledWith({
-  //       createdAt: testFile.lastModified,
-  //       data: await testFile.arrayBuffer(),
-  //       fileType: testFile.type,
-  //       name: testFile.name,
-  //       saveMode: 'local',
-  //       size: testFile.size,
-  //     });
-  //     // 由于上传失败，inputFilesList 应该没有变化
-  //     expect(result.current.inputFilesList).toEqual([]);
-  //
-  //     // 确保错误提示被调用
-  //     expect(notification.error).toHaveBeenCalled();
-  //   });
-  //
-  //   it('uploadFile should upload the file and update inputFilesList', async () => {
-  //     const { result } = renderHook(() => useStore());
-  //     const testFile = new File(['content'], 'test.png', { type: 'image/png' });
-  //
-  //     // 模拟 fileService.uploadFile 返回的数据
-  //     const uploadedFileData = {
-  //       createdAt: testFile.lastModified,
-  //       data: await testFile.arrayBuffer(),
-  //       fileType: testFile.type,
-  //       name: testFile.name,
-  //       saveMode: 'local',
-  //       size: testFile.size,
-  //     };
-  //
-  //     // Mock the fileService.uploadFile to resolve with uploadedFileData
-  //     vi.spyOn(uploadService, 'uploadFile').mockResolvedValue(uploadedFileData as DB_File);
-  //     vi.spyOn(fileService, 'createFile').mockResolvedValue({ id: 'new-file-id', url: '' });
-  //
-  //     await act(async () => {
-  //       await result.current.uploadFile(testFile);
-  //     });
-  //
-  //     expect(fileService.createFile).toHaveBeenCalledWith({
-  //       createdAt: testFile.lastModified,
-  //       data: await testFile.arrayBuffer(),
-  //       fileType: testFile.type,
-  //       name: testFile.name,
-  //       saveMode: 'local',
-  //       size: testFile.size,
-  //     });
-  //     expect(result.current.inputFilesList).toContain('new-file-id');
-  //   });
-  // });
 });

package/src/store/file/slices/chunk/selectors.ts

@@ -1,4 +1,3 @@
-// import { FileStore } from '../../store';
 import { type FilesStoreState } from '@/store/file/initialState';
 
 const showSimilaritySearchResult = (s: FilesStoreState) => s.isSimilaritySearch;

package/src/store/file/slices/fileManager/selectors.ts

@@ -1,4 +1,3 @@
-// import { FileStore } from '../../store';
 import { type FilesStoreState } from '@/store/file/initialState';
 import { type FileUploadStatus } from '@/types/files/upload';
 

package/src/store/file/slices/tts/selectors.ts

@@ -1,3 +1 @@
-// import { FileStore } from '../../store';
-
 export const ttsFilesSelectors = {};

package/src/store/tool/slices/customPlugin/index.ts

@@ -1,3 +1,2 @@
 export * from './action';
 export * from './initialState';
-// export * from './selectors';

package/src/store/tool/slices/mcpStore/index.ts

@@ -1,3 +1,2 @@
 export * from './action';
 export * from './initialState';
-// export * from './selectors';

package/src/store/tool/slices/oldStore/index.ts

@@ -1,3 +1,2 @@
 export * from './action';
 export * from './initialState';
-// export * from './selectors';

package/src/store/tool/slices/plugin/index.ts

@@ -1,3 +1,2 @@
 export * from './action';
 export * from './initialState';
-// export * from './selectors';

package/src/styles/global.ts

@@ -59,4 +59,10 @@ export default ({ token }: { prefixCls: string; token: Theme }) => css`
   .${CLASSNAMES.DropdownMenuTrigger}[data-popup-open]:not([data-no-highlight]) {
     background: ${token.colorFillTertiary};
   }
+
+  .ant-form-item-control:has([role='combobox'][aria-controls^='base-ui-']),
+  .ant-form-item-control:has([role='combobox'][aria-haspopup='listbox']) {
+    width: min(70%, 800px);
+    min-width: min(70%, 800px) !important;
+  }
 `;