@lobehub/lobehub 2.0.0-next.210 → 2.0.0-next.212

package/CHANGELOG.md

@@ -2,6 +2,56 @@
 
 # Changelog
 
+## [Version 2.0.0-next.212](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.211...v2.0.0-next.212)
+
+<sup>Released on **2026-01-05**</sup>
+
+#### ♻ Code Refactoring
+
+- **redis**: Disable automatic deserialization in upstash provider.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **redis**: Disable automatic deserialization in upstash provider, closes [#11210](https://github.com/lobehub/lobe-chat/issues/11210) ([eb5c76c](https://github.com/lobehub/lobe-chat/commit/eb5c76c))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+## [Version 2.0.0-next.211](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.210...v2.0.0-next.211)
+
+<sup>Released on **2026-01-05**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Add lost like button in discover detail page.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Add lost like button in discover detail page, closes [#11182](https://github.com/lobehub/lobe-chat/issues/11182) ([41215d4](https://github.com/lobehub/lobe-chat/commit/41215d4))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 2.0.0-next.210](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.209...v2.0.0-next.210)
 
 <sup>Released on **2026-01-04**</sup>

package/changelog/v1.json

@@ -1,4 +1,18 @@
 [
+  {
+    "children": {},
+    "date": "2026-01-05",
+    "version": "2.0.0-next.212"
+  },
+  {
+    "children": {
+      "fixes": [
+        "Add lost like button in discover detail page."
+      ]
+    },
+    "date": "2026-01-05",
+    "version": "2.0.0-next.211"
+  },
   {
     "children": {},
     "date": "2026-01-04",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/lobehub",
-  "version": "2.0.0-next.210",
+  "version": "2.0.0-next.212",
   "description": "LobeHub - an open-source,comprehensive AI Agent framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/src/app/(backend)/f/[id]/route.ts

@@ -43,8 +43,8 @@ export const GET = async (_req: Request, segmentData: { params: Params }) => {
 
     const cacheKey = buildCacheKey(id);
     if (redisClient) {
-      // Upstash Redis auto-deserializes JSON, so cached is already an object
-      const cached = (await redisClient.get(cacheKey)) as CachedFileData | null;
+      const cachedStr = await redisClient.get(cacheKey);
+      const cached = cachedStr ? (JSON.parse(cachedStr) as CachedFileData) : null;
       if (cached?.redirectUrl) {
         log('Cache hit for file: %s', id);
         return Response.redirect(cached.redirectUrl, 302);

package/src/app/(backend)/market/social/[[...segments]]/route.ts

@@ -158,7 +158,7 @@ export const GET = async (req: NextRequest, context: RouteContext) => {
       // Follow queries
       case 'follow-status': {
         const targetUserId = Number(segments[1]);
-        if (!accessToken) {
+        if (!accessToken && !trustedClientToken) {
           return NextResponse.json({ isFollowing: false, isMutual: false });
         }
         const result = await market.follows.checkFollowStatus(targetUserId);
@@ -193,7 +193,7 @@ export const GET = async (req: NextRequest, context: RouteContext) => {
       case 'favorite-status': {
         const targetType = segments[1] as 'agent' | 'plugin';
         const targetIdOrIdentifier = segments[2];
-        if (!accessToken) {
+        if (!accessToken && !trustedClientToken) {
           return NextResponse.json({ isFavorited: false });
         }
         // SDK accepts both number (targetId) and string (identifier)
@@ -236,7 +236,7 @@ export const GET = async (req: NextRequest, context: RouteContext) => {
       case 'like-status': {
         const targetType = segments[1] as 'agent' | 'plugin';
         const targetIdOrIdentifier = segments[2];
-        if (!accessToken) {
+        if (!accessToken && !trustedClientToken) {
           return NextResponse.json({ isLiked: false });
         }
         const isNumeric = /^\d+$/.test(targetIdOrIdentifier);

package/src/app/[variants]/(main)/community/(detail)/assistant/features/Header.tsx

@@ -13,7 +13,14 @@ import {
 } from '@lobehub/ui';
 import { App } from 'antd';
 import { createStaticStyles, cssVar, useResponsive } from 'antd-style';
-import { BookTextIcon, BookmarkCheckIcon, BookmarkIcon, CoinsIcon, DotIcon } from 'lucide-react';
+import {
+  BookTextIcon,
+  BookmarkCheckIcon,
+  BookmarkIcon,
+  CoinsIcon,
+  DotIcon,
+  HeartIcon,
+} from 'lucide-react';
 import qs from 'query-string';
 import { memo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -54,8 +61,7 @@ const Header = memo<{ mobile?: boolean }>(({ mobile: isMobile }) => {
   const { mobile = isMobile } = useResponsive();
   const { isAuthenticated, signIn, session } = useMarketAuth();
   const [favoriteLoading, setFavoriteLoading] = useState(false);
-  // TODO: enable like feature
-  // const [likeLoading, setLikeLoading] = useState(false);
+  const [likeLoading, setLikeLoading] = useState(false);
 
   // Set access token for social service
   if (session?.accessToken) {
@@ -71,13 +77,13 @@ const Header = memo<{ mobile?: boolean }>(({ mobile: isMobile }) => {
 
   const isFavorited = favoriteStatus?.isFavorited ?? false;
 
-  // TODO: enable like feature
-  // const { data: likeStatus, mutate: mutateLike } = useSWR(
-  //   identifier && isAuthenticated ? ['like-status', 'agent', identifier] : null,
-  //   () => socialService.checkLikeStatus('agent', identifier!),
-  //   { revalidateOnFocus: false },
-  // );
-  // const isLiked = likeStatus?.isLiked ?? false;
+  // Fetch like status
+  const { data: likeStatus, mutate: mutateLike } = useSWR(
+    identifier && isAuthenticated ? ['like-status', 'agent', identifier] : null,
+    () => socialService.checkLikeStatus('agent', identifier!),
+    { revalidateOnFocus: false },
+  );
+  const isLiked = likeStatus?.isLiked ?? false;
 
   const handleFavoriteClick = async () => {
     if (!isAuthenticated) {
@@ -105,30 +111,29 @@ const Header = memo<{ mobile?: boolean }>(({ mobile: isMobile }) => {
     }
   };
 
-  // TODO: enable like feature
-  // const handleLikeClick = async () => {
-  //   if (!isAuthenticated) {
-  //     await signIn();
-  //     return;
-  //   }
-  //   if (!identifier) return;
-  //   setLikeLoading(true);
-  //   try {
-  //     if (isLiked) {
-  //       await socialService.unlike('agent', identifier);
-  //       message.success(t('assistant.unlikeSuccess'));
-  //     } else {
-  //       await socialService.like('agent', identifier);
-  //       message.success(t('assistant.likeSuccess'));
-  //     }
-  //     await mutateLike();
-  //   } catch (error) {
-  //     console.error('Like action failed:', error);
-  //     message.error(t('assistant.likeFailed'));
-  //   } finally {
-  //     setLikeLoading(false);
-  //   }
-  // };
+  const handleLikeClick = async () => {
+    if (!isAuthenticated) {
+      await signIn();
+      return;
+    }
+    if (!identifier) return;
+    setLikeLoading(true);
+    try {
+      if (isLiked) {
+        await socialService.unlike('agent', identifier);
+        message.success(t('assistant.unlikeSuccess'));
+      } else {
+        await socialService.like('agent', identifier);
+        message.success(t('assistant.likeSuccess'));
+      }
+      await mutateLike();
+    } catch (error) {
+      console.error('Like action failed:', error);
+      message.error(t('assistant.likeFailed'));
+    } finally {
+      setLikeLoading(false);
+    }
+  };
 
   const categories = useCategory();
   const cate = categories.find((c) => c.key === category);
@@ -186,6 +191,14 @@ const Header = memo<{ mobile?: boolean }>(({ mobile: isMobile }) => {
                 {title}
               </Text>
             </Flexbox>
+            <Tooltip title={isLiked ? t('assistant.unlike') : t('assistant.like')}>
+              <ActionIcon
+                icon={HeartIcon}
+                loading={likeLoading}
+                onClick={handleLikeClick}
+                style={isLiked ? { color: '#ff4d4f' } : undefined}
+              />
+            </Tooltip>
             <Tooltip title={isFavorited ? t('assistant.unfavorite') : t('assistant.favorite')}>
               <ActionIcon
                 icon={isFavorited ? BookmarkCheckIcon : BookmarkIcon}

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

@@ -1,10 +1,9 @@
 'use client';
 
-import { useDroppable } from '@dnd-kit/core';
 import { Center, type DropdownItem, DropdownMenu, Flexbox, Skeleton, Text } from '@lobehub/ui';
 import { createStaticStyles, cx } from 'antd-style';
 import { ChevronsUpDown } from 'lucide-react';
-import { memo, useCallback, useMemo } from 'react';
+import { type DragEvent, memo, useCallback, useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
 import { useDragActive } from '@/app/[variants]/(main)/resource/features/DndContextWrapper';
@@ -48,24 +47,11 @@ const Head = memo<{ id: string }>(({ id }) => {
   const name = useKnowledgeBaseStore(knowledgeBaseSelectors.getKnowledgeBaseNameById(id));
   const setMode = useResourceManagerStore((s) => s.setMode);
   const isDragActive = useDragActive();
+  const [isDropZoneActive, setIsDropZoneActive] = useState(false);
 
   const useFetchKnowledgeBaseList = useKnowledgeBaseStore((s) => s.useFetchKnowledgeBaseList);
   const { data: libraries } = useFetchKnowledgeBaseList();
 
-  // Special droppable ID for root folder - matches the pattern expected by DndContextWrapper
-  const ROOT_DROP_ID = `__root__:${id}`;
-
-  const { setNodeRef, isOver } = useDroppable({
-    data: {
-      fileType: 'custom/folder',
-      isFolder: true,
-      name: 'Root',
-      targetId: null,
-    },
-    disabled: !isDragActive,
-    id: ROOT_DROP_ID,
-  });
-
   const handleClick = useCallback(() => {
     navigate(`/resource/library/${id}`);
     setMode('explorer');
@@ -79,6 +65,25 @@ const Head = memo<{ id: string }>(({ id }) => {
     [navigate, setMode],
   );
 
+  // Native HTML5 drag-and-drop handlers for root directory drop
+  const handleDragOver = useCallback(
+    (e: DragEvent<HTMLDivElement>) => {
+      if (!isDragActive) return;
+      e.preventDefault();
+      e.stopPropagation();
+      setIsDropZoneActive(true);
+    },
+    [isDragActive],
+  );
+
+  const handleDragLeave = useCallback(() => {
+    setIsDropZoneActive(false);
+  }, []);
+
+  const handleDrop = useCallback(() => {
+    setIsDropZoneActive(false);
+  }, []);
+
   const menuItems = useMemo<DropdownItem[]>(() => {
     if (!libraries) return [];
 
@@ -98,12 +103,17 @@ const Head = memo<{ id: string }>(({ id }) => {
   return (
     <Flexbox
       align={'center'}
-      className={cx(styles.clickableHeader, isOver && styles.dropZoneActive)}
+      className={cx(styles.clickableHeader, isDropZoneActive && styles.dropZoneActive)}
+      data-drop-target-id="root"
+      data-is-folder="true"
+      data-root-drop="true"
       gap={8}
       horizontal
+      onDragLeave={handleDragLeave}
+      onDragOver={handleDragOver}
+      onDrop={handleDrop}
       paddingBlock={6}
       paddingInline={'12px 14px'}
-      ref={setNodeRef}
     >
       <Center style={{ minWidth: 24 }} width={24}>
         <RepoIcon />

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

@@ -78,6 +78,9 @@ const ListView = memo(() => {
   const [lastSelectedIndex, setLastSelectedIndex] = useState<number | null>(null);
   const isDragActive = useDragActive();
   const [isDropZoneActive, setIsDropZoneActive] = useState(false);
+  const scrollTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+  const autoScrollIntervalRef = useRef<ReturnType<typeof setInterval> | null>(null);
+  const containerRef = useRef<HTMLDivElement>(null);
 
   const { currentFolderSlug } = useFolderPath();
   const { data: folderBreadcrumb } = useResourceManagerFetchFolderBreadcrumb(currentFolderSlug);
@@ -174,6 +177,18 @@ const ListView = memo(() => {
     }
   }, [fileListHasMore, loadMoreKnowledgeItems, isLoadingMore]);
 
+  // Clear auto-scroll timers
+  const clearScrollTimers = useCallback(() => {
+    if (scrollTimerRef.current) {
+      clearTimeout(scrollTimerRef.current);
+      scrollTimerRef.current = null;
+    }
+    if (autoScrollIntervalRef.current) {
+      clearInterval(autoScrollIntervalRef.current);
+      autoScrollIntervalRef.current = null;
+    }
+  }, []);
+
   // Drop zone handlers for dragging to blank space
   const handleDropZoneDragOver = useCallback(
     (e: DragEvent) => {
@@ -187,11 +202,57 @@ const ListView = memo(() => {
 
   const handleDropZoneDragLeave = useCallback(() => {
     setIsDropZoneActive(false);
-  }, []);
+    clearScrollTimers();
+  }, [clearScrollTimers]);
 
   const handleDropZoneDrop = useCallback(() => {
     setIsDropZoneActive(false);
-  }, []);
+    clearScrollTimers();
+  }, [clearScrollTimers]);
+
+  // Handle auto-scroll during drag
+  const handleDragMove = useCallback(
+    (e: DragEvent<HTMLDivElement>) => {
+      if (!isDragActive || !containerRef.current) return;
+
+      const container = containerRef.current;
+      const rect = container.getBoundingClientRect();
+      const mouseY = e.clientY;
+      const bottomThreshold = 200; // pixels from bottom edge
+      const distanceFromBottom = rect.bottom - mouseY;
+
+      // Check if mouse is near the bottom edge
+      if (distanceFromBottom > 0 && distanceFromBottom <= bottomThreshold) {
+        // If not already started, start the 2-second timer
+        if (!scrollTimerRef.current && !autoScrollIntervalRef.current) {
+          scrollTimerRef.current = setTimeout(() => {
+            // After 2 seconds, start auto-scrolling
+            autoScrollIntervalRef.current = setInterval(() => {
+              virtuosoRef.current?.scrollBy({ top: 50 });
+            }, 100); // Scroll every 100ms for smooth scrolling
+            scrollTimerRef.current = null;
+          }, 2000);
+        }
+      } else {
+        // Mouse moved away from bottom edge, clear timers
+        clearScrollTimers();
+      }
+    },
+    [isDragActive, clearScrollTimers],
+  );
+
+  // Clean up timers when drag ends or component unmounts
+  useEffect(() => {
+    if (!isDragActive) {
+      clearScrollTimers();
+    }
+  }, [isDragActive, clearScrollTimers]);
+
+  useEffect(() => {
+    return () => {
+      clearScrollTimers();
+    };
+  }, [clearScrollTimers]);
 
   return (
     <Flexbox height={'100%'}>
@@ -227,8 +288,12 @@ const ListView = memo(() => {
         data-drop-target-id={currentFolderId || undefined}
         data-is-folder="true"
         onDragLeave={handleDropZoneDragLeave}
-        onDragOver={handleDropZoneDragOver}
+        onDragOver={(e) => {
+          handleDropZoneDragOver(e);
+          handleDragMove(e);
+        }}
         onDrop={handleDropZoneDrop}
+        ref={containerRef}
         style={{ flex: 1, overflow: 'hidden', position: 'relative' }}
       >
         <Virtuoso

package/src/features/ResourceManager/components/Explorer/MasonryView/MasonryFileItem/MasonryItemWrapper.tsx

@@ -7,7 +7,6 @@ import MasonryFileItem from '.';
 interface MasonryItemWrapperProps {
   context: {
     knowledgeBaseId?: string;
-    openFile?: (id: string) => void;
     selectFileIds: string[];
     setSelectedFileIds: (ids: string[]) => void;
   };
@@ -25,7 +24,6 @@ const MasonryItemWrapper = memo<MasonryItemWrapperProps>(({ data: item, context
     <div style={{ padding: '8px 4px' }}>
       <MasonryFileItem
         knowledgeBaseId={context.knowledgeBaseId}
-        onOpen={context.openFile}
         onSelectedChange={(id, checked) => {
           if (checked) {
             context.setSelectedFileIds([...context.selectFileIds, id]);

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

@@ -6,106 +6,134 @@ import { cssVar } from 'antd-style';
 import { type UIEvent, memo, useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useResourceManagerStore } from '@/app/[variants]/(main)/resource/features/store';
-import { type FileListItem } from '@/types/files';
+import { useFolderPath } from '@/app/[variants]/(main)/resource/features/hooks/useFolderPath';
+import {
+  useResourceManagerFetchKnowledgeItems,
+  useResourceManagerStore,
+} from '@/app/[variants]/(main)/resource/features/store';
+import { sortFileList } from '@/app/[variants]/(main)/resource/features/store/selectors';
 
 import { useMasonryColumnCount } from '../useMasonryColumnCount';
 import MasonryItemWrapper from './MasonryFileItem/MasonryItemWrapper';
 
-interface MasonryViewProps {
-  data: FileListItem[] | undefined;
-  hasMore: boolean;
-  isMasonryReady: boolean;
-  loadMore: () => Promise<void>;
-  onOpenFile?: (id: string) => void;
-  selectFileIds: string[];
-  setSelectedFileIds: (ids: string[]) => void;
-}
+const MasonryView = memo(() => {
+  // Access all state from Resource Manager store
+  const [
+    libraryId,
+    category,
+    searchQuery,
+    selectedFileIds,
+    setSelectedFileIds,
+    loadMoreKnowledgeItems,
+    fileListHasMore,
+    isMasonryReady,
+    sorter,
+    sortType,
+  ] = useResourceManagerStore((s) => [
+    s.libraryId,
+    s.category,
+    s.searchQuery,
+    s.selectedFileIds,
+    s.setSelectedFileIds,
+    s.loadMoreKnowledgeItems,
+    s.fileListHasMore,
+    s.isMasonryReady,
+    s.sorter,
+    s.sortType,
+  ]);
 
-const MasonryView = memo<MasonryViewProps>(
-  ({ data, hasMore, isMasonryReady, loadMore, onOpenFile, selectFileIds, setSelectedFileIds }) => {
-    const { t } = useTranslation('file');
-    const columnCount = useMasonryColumnCount();
-    const [isLoadingMore, setIsLoadingMore] = useState(false);
+  const { t } = useTranslation('file');
+  const columnCount = useMasonryColumnCount();
+  const [isLoadingMore, setIsLoadingMore] = useState(false);
 
-    const libraryId = useResourceManagerStore((s) => s.libraryId);
+  const { currentFolderSlug } = useFolderPath();
 
-    const masonryContext = useMemo(
-      () => ({
-        knowledgeBaseId: libraryId,
-        openFile: onOpenFile,
-        selectFileIds,
-        setSelectedFileIds,
-      }),
-      [onOpenFile, libraryId, selectFileIds, setSelectedFileIds],
-    );
+  // Fetch data with SWR
+  const { data: rawData } = useResourceManagerFetchKnowledgeItems({
+    category,
+    knowledgeBaseId: libraryId,
+    parentId: currentFolderSlug || null,
+    q: searchQuery ?? undefined,
+    showFilesInKnowledgeBase: false,
+  });
 
-    // Handle automatic load more when scrolling to bottom
-    const handleLoadMore = useCallback(async () => {
-      if (!hasMore || isLoadingMore) return;
+  // Sort data using current sort settings
+  const data = sortFileList(rawData, sorter, sortType);
 
-      setIsLoadingMore(true);
-      try {
-        await loadMore();
-      } finally {
-        setIsLoadingMore(false);
-      }
-    }, [hasMore, loadMore, isLoadingMore]);
+  const masonryContext = useMemo(
+    () => ({
+      knowledgeBaseId: libraryId,
+      selectFileIds: selectedFileIds,
+      setSelectedFileIds,
+    }),
+    [libraryId, selectedFileIds, setSelectedFileIds],
+  );
+
+  // Handle automatic load more when scrolling to bottom
+  const handleLoadMore = useCallback(async () => {
+    if (!fileListHasMore || isLoadingMore) return;
 
-    // Handle scroll event to detect when near bottom
-    const handleScroll = useCallback(
-      (e: UIEvent<HTMLDivElement>) => {
-        const target = e.currentTarget;
-        const scrollTop = target.scrollTop;
-        const scrollHeight = target.scrollHeight;
-        const clientHeight = target.clientHeight;
+    setIsLoadingMore(true);
+    try {
+      await loadMoreKnowledgeItems();
+    } finally {
+      setIsLoadingMore(false);
+    }
+  }, [fileListHasMore, loadMoreKnowledgeItems, isLoadingMore]);
 
-        // Trigger load when within 300px of bottom
-        if (scrollHeight - scrollTop - clientHeight < 300) {
-          handleLoadMore();
-        }
-      },
-      [handleLoadMore],
-    );
+  // Handle scroll event to detect when near bottom
+  const handleScroll = useCallback(
+    (e: UIEvent<HTMLDivElement>) => {
+      const target = e.currentTarget;
+      const scrollTop = target.scrollTop;
+      const scrollHeight = target.scrollHeight;
+      const clientHeight = target.clientHeight;
+
+      // Trigger load when within 300px of bottom
+      if (scrollHeight - scrollTop - clientHeight < 300) {
+        handleLoadMore();
+      }
+    },
+    [handleLoadMore],
+  );
 
-    return (
-      <div
-        onScroll={handleScroll}
-        style={{
-          flex: 1,
-          height: '100%',
-          opacity: isMasonryReady ? 1 : 0,
-          overflowY: 'auto',
-          transition: 'opacity 0.2s ease-in-out',
-        }}
-      >
-        <div style={{ paddingBlockEnd: 24, paddingBlockStart: 12, paddingInline: 24 }}>
-          <VirtuosoMasonry
-            ItemContent={MasonryItemWrapper}
-            columnCount={columnCount}
-            context={masonryContext}
-            data={data || []}
+  return (
+    <div
+      onScroll={handleScroll}
+      style={{
+        flex: 1,
+        height: '100%',
+        opacity: isMasonryReady ? 1 : 0,
+        overflowY: 'auto',
+        transition: 'opacity 0.2s ease-in-out',
+      }}
+    >
+      <div style={{ paddingBlockEnd: 24, paddingBlockStart: 12, paddingInline: 24 }}>
+        <VirtuosoMasonry
+          ItemContent={MasonryItemWrapper}
+          columnCount={columnCount}
+          context={masonryContext}
+          data={data || []}
+          style={{
+            gap: '16px',
+            overflow: 'hidden',
+          }}
+        />
+        {isLoadingMore && (
+          <Center
             style={{
-              gap: '16px',
-              overflow: 'hidden',
+              color: cssVar.colorTextDescription,
+              fontSize: 14,
+              marginBlockStart: 16,
+              minHeight: 40,
             }}
-          />
-          {isLoadingMore && (
-            <Center
-              style={{
-                color: cssVar.colorTextDescription,
-                fontSize: 14,
-                marginBlockStart: 16,
-                minHeight: 40,
-              }}
-            >
-              {t('loading', { defaultValue: 'Loading...' })}
-            </Center>
-          )}
-        </div>
+          >
+            {t('loading', { defaultValue: 'Loading...' })}
+          </Center>
+        )}
       </div>
-    );
-  },
-);
+    </div>
+  );
+});
 
 export default MasonryView;

package/src/features/ResourceManager/components/Explorer/ToolBar/BatchActionsDropdown.tsx

@@ -11,6 +11,8 @@ import { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useResourceManagerStore } from '@/app/[variants]/(main)/resource/features/store';
+import RepoIcon from '@/components/LibIcon';
+import { useKnowledgeBaseStore } from '@/store/knowledgeBase';
 
 import ActionIconWithChevron from './ActionIconWithChevron';
 
@@ -30,10 +32,18 @@ interface BatchActionsDropdownProps {
 
 const BatchActionsDropdown = memo<BatchActionsDropdownProps>(
   ({ selectCount, onActionClick, disabled }) => {
-    const { t } = useTranslation(['components', 'common', 'file']);
+    const { t } = useTranslation(['components', 'common', 'file', 'knowledgeBase']);
     const { modal, message } = App.useApp();
 
-    const libraryId = useResourceManagerStore((s) => s.libraryId);
+    const [libraryId, selectedFileIds] = useResourceManagerStore((s) => [
+      s.libraryId,
+      s.selectedFileIds,
+    ]);
+    const [useFetchKnowledgeBaseList, addFilesToKnowledgeBase] = useKnowledgeBaseStore((s) => [
+      s.useFetchKnowledgeBaseList,
+      s.addFilesToKnowledgeBase,
+    ]);
+    const { data: knowledgeBases } = useFetchKnowledgeBaseList();
 
     const menuItems = useMemo<DropdownItem[]>(() => {
       const items: DropdownItem[] = [];
@@ -60,44 +70,64 @@ const BatchActionsDropdown = memo<BatchActionsDropdownProps>(
         return items;
       }
 
+      // Filter out current knowledge base and create submenu items
+      const availableKnowledgeBases = (knowledgeBases || []).filter((kb) => kb.id !== libraryId);
+
+      const addToKnowledgeBaseSubmenu: DropdownItem[] = availableKnowledgeBases.map((kb) => ({
+        icon: <RepoIcon />,
+        key: `add-to-kb-${kb.id}`,
+        label: <span style={{ marginLeft: 8 }}>{kb.name}</span>,
+        onClick: async () => {
+          try {
+            await addFilesToKnowledgeBase(kb.id, selectedFileIds);
+            message.success(
+              t('addToKnowledgeBase.addSuccess', {
+                count: selectCount,
+                ns: 'knowledgeBase',
+              }),
+            );
+          } catch (e) {
+            console.error(e);
+            message.error(t('addToKnowledgeBase.error', { ns: 'knowledgeBase' }));
+          }
+        },
+      }));
+
       if (libraryId) {
-        items.push(
-          {
-            icon: <Icon icon={BookMinusIcon} />,
-            key: 'removeFromKnowledgeBase',
-            label: t('FileManager.actions.removeFromKnowledgeBase'),
-            onClick: () => {
-              modal.confirm({
-                okButtonProps: {
-                  danger: true,
-                },
-                onOk: async () => {
-                  await onActionClick('removeFromKnowledgeBase');
-                  message.success(t('FileManager.actions.removeFromKnowledgeBaseSuccess'));
-                },
-                title: t('FileManager.actions.confirmRemoveFromKnowledgeBase', {
-                  count: selectCount,
-                }),
-              });
-            },
+        items.push({
+          icon: <Icon icon={BookMinusIcon} />,
+          key: 'removeFromKnowledgeBase',
+          label: t('FileManager.actions.removeFromKnowledgeBase'),
+          onClick: () => {
+            modal.confirm({
+              okButtonProps: {
+                danger: true,
+              },
+              onOk: async () => {
+                await onActionClick('removeFromKnowledgeBase');
+                message.success(t('FileManager.actions.removeFromKnowledgeBaseSuccess'));
+              },
+              title: t('FileManager.actions.confirmRemoveFromKnowledgeBase', {
+                count: selectCount,
+              }),
+            });
           },
-          {
+        });
+
+        if (availableKnowledgeBases.length > 0) {
+          items.push({
+            children: addToKnowledgeBaseSubmenu as any,
             icon: <Icon icon={BookPlusIcon} />,
             key: 'addToOtherKnowledgeBase',
             label: t('FileManager.actions.addToOtherKnowledgeBase'),
-            onClick: () => {
-              onActionClick('addToOtherKnowledgeBase');
-            },
-          },
-        );
-      } else {
+          });
+        }
+      } else if (availableKnowledgeBases.length > 0) {
         items.push({
+          children: addToKnowledgeBaseSubmenu as any,
           icon: <Icon icon={BookPlusIcon} />,
           key: 'addToKnowledgeBase',
           label: t('FileManager.actions.addToKnowledgeBase'),
-          onClick: () => {
-            onActionClick('addToKnowledgeBase');
-          },
         });
       }
 
@@ -134,7 +164,17 @@ const BatchActionsDropdown = memo<BatchActionsDropdownProps>(
       );
 
       return items;
-    }, [libraryId, selectCount, onActionClick, t, modal, message]);
+    }, [
+      libraryId,
+      selectCount,
+      selectedFileIds,
+      onActionClick,
+      addFilesToKnowledgeBase,
+      t,
+      modal,
+      message,
+      knowledgeBases,
+    ]);
 
     return (
       <DropdownMenu items={menuItems} placement="bottomLeft" triggerProps={{ disabled }}>

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

@@ -41,10 +41,7 @@ const ResourceExplorer = memo(() => {
     isTransitioning,
     isMasonryReady,
     searchQuery,
-    selectedFileIds,
     setSelectedFileIds,
-    loadMoreKnowledgeItems,
-    fileListHasMore,
     sorter,
     sortType,
   ] = useResourceManagerStore((s) => [
@@ -54,10 +51,7 @@ const ResourceExplorer = memo(() => {
     s.isTransitioning,
     s.isMasonryReady,
     s.searchQuery,
-    s.selectedFileIds,
     s.setSelectedFileIds,
-    s.loadMoreKnowledgeItems,
-    s.fileListHasMore,
     s.sorter,
     s.sortType,
   ]);
@@ -114,14 +108,7 @@ const ResourceExplorer = memo(() => {
       ) : viewMode === 'list' ? (
         <ListView />
       ) : (
-        <MasonryView
-          data={data}
-          hasMore={fileListHasMore}
-          isMasonryReady={isMasonryReady}
-          loadMore={loadMoreKnowledgeItems}
-          selectFileIds={selectedFileIds}
-          setSelectedFileIds={setSelectedFileIds}
-        />
+        <MasonryView />
       )}
     </Flexbox>
   );

package/src/libs/better-auth/define-config.ts

@@ -64,10 +64,7 @@ const enabledSSOProviders = parseSSOProviders(authEnv.AUTH_SSO_PROVIDERS);
 const { socialProviders, genericOAuthProviders } = initBetterAuthSSOProviders();
 
 async function customEmailValidator(email: string): Promise<boolean> {
-  if (ENABLE_BUSINESS_FEATURES && !(await businessEmailValidator(email))) {
-    return false;
-  }
-  return validateEmail(email);
+  return ENABLE_BUSINESS_FEATURES ? businessEmailValidator(email) : validateEmail(email);
 }
 
 interface CustomBetterAuthOptions {

package/src/libs/redis/upstash.ts

@@ -25,7 +25,10 @@ export class UpstashRedisProvider implements BaseRedisProvider {
   constructor(options: UpstashConfig | RedisConfigNodejs) {
     const { prefix, ...clientOptions } = options as UpstashConfig & RedisConfigNodejs;
     this.prefix = prefix ? `${prefix}:` : '';
-    this.client = new Redis(clientOptions as RedisConfigNodejs);
+    this.client = new Redis({
+      ...clientOptions,
+      automaticDeserialization: false,
+    } as RedisConfigNodejs);
   }
 
   /**