@lobehub/chat 1.70.7 → 1.70.9

package/CHANGELOG.md

@@ -2,6 +2,48 @@
 
 # Changelog
 
+### [Version 1.70.9](https://github.com/lobehub/lobe-chat/compare/v1.70.8...v1.70.9)
+
+<sup>Released on **2025-03-12**</sup>
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.70.8](https://github.com/lobehub/lobe-chat/compare/v1.70.7...v1.70.8)
+
+<sup>Released on **2025-03-12**</sup>
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix theme flicking.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### What's fixed
+
+- **misc**: Fix theme flicking, closes [#6926](https://github.com/lobehub/lobe-chat/issues/6926) ([103c3e3](https://github.com/lobehub/lobe-chat/commit/103c3e3))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.70.7](https://github.com/lobehub/lobe-chat/compare/v1.70.6...v1.70.7)
 
 <sup>Released on **2025-03-12**</sup>

package/changelog/v1.json

@@ -1,4 +1,18 @@
 [
+  {
+    "children": {},
+    "date": "2025-03-12",
+    "version": "1.70.9"
+  },
+  {
+    "children": {
+      "fixes": [
+        "Fix theme flicking."
+      ]
+    },
+    "date": "2025-03-12",
+    "version": "1.70.8"
+  },
   {
     "children": {
       "fixes": [

package/locales/ar/topic.json

@@ -32,6 +32,7 @@
     "title": "قائمة المواضيع"
   },
   "searchPlaceholder": "ابحث عن موضوع...",
+  "searchResultEmpty": "لا توجد نتائج للبحث",
   "temp": "مؤقت",
   "title": "موضوع"
 }

package/locales/bg-BG/topic.json

@@ -32,6 +32,7 @@
     "title": "Списък с теми"
   },
   "searchPlaceholder": "Търсене на теми...",
+  "searchResultEmpty": "Няма намерени резултати",
   "temp": "Временен",
   "title": "Тема"
 }

package/locales/de-DE/topic.json

@@ -32,6 +32,7 @@
     "title": "Themenliste"
   },
   "searchPlaceholder": "Themen suchen...",
+  "searchResultEmpty": "Keine Suchergebnisse vorhanden",
   "temp": "Vorübergehend",
   "title": "Thema"
 }

package/locales/en-US/topic.json

@@ -32,6 +32,7 @@
     "title": "Topic List"
   },
   "searchPlaceholder": "Search Topics...",
+  "searchResultEmpty": "No search results found.",
   "temp": "Temporary",
   "title": "Topic"
 }

package/locales/es-ES/topic.json

@@ -32,6 +32,7 @@
     "title": "Lista de temas"
   },
   "searchPlaceholder": "Buscar temas...",
+  "searchResultEmpty": "No hay resultados de búsqueda disponibles",
   "temp": "Temporal",
   "title": "Tema"
 }

package/locales/fa-IR/topic.json

@@ -32,6 +32,7 @@
     "title": "لیست موضوعات"
   },
   "searchPlaceholder": "جستجوی موضوع...",
+  "searchResultEmpty": "نتیجه‌ای برای جستجو یافت نشد",
   "temp": "موقت",
   "title": "موضوع"
 }

package/locales/fr-FR/topic.json

@@ -32,6 +32,7 @@
     "title": "Liste des sujets"
   },
   "searchPlaceholder": "Rechercher des sujets...",
+  "searchResultEmpty": "Aucun résultat de recherche disponible",
   "temp": "Temporaire",
   "title": "Sujet"
 }

package/locales/it-IT/topic.json

@@ -32,6 +32,7 @@
     "title": "Elenco dei temi"
   },
   "searchPlaceholder": "Cerca temi...",
+  "searchResultEmpty": "Nessun risultato trovato",
   "temp": "Temporaneo",
   "title": "Tema"
 }

package/locales/ja-JP/topic.json

@@ -32,6 +32,7 @@
     "title": "トピックリスト"
   },
   "searchPlaceholder": "トピックを検索...",
+  "searchResultEmpty": "検索結果はありません",
   "temp": "一時的",
   "title": "トピック"
 }

package/locales/ko-KR/topic.json

@@ -32,6 +32,7 @@
     "title": "주제 목록"
   },
   "searchPlaceholder": "주제 검색...",
+  "searchResultEmpty": "검색 결과가 없습니다.",
   "temp": "임시",
   "title": "주제"
 }

package/locales/nl-NL/topic.json

@@ -32,6 +32,7 @@
     "title": "Onderwerpenlijst"
   },
   "searchPlaceholder": "Zoek onderwerpen...",
+  "searchResultEmpty": "Geen zoekresultaten gevonden",
   "temp": "Tijdelijk",
   "title": "Onderwerp"
 }

package/locales/pl-PL/topic.json

@@ -32,6 +32,7 @@
     "title": "Lista tematów"
   },
   "searchPlaceholder": "Szukaj tematów...",
+  "searchResultEmpty": "Brak wyników wyszukiwania",
   "temp": "Tymczasowy",
   "title": "Temat"
 }

package/locales/pt-BR/topic.json

@@ -32,6 +32,7 @@
     "title": "Lista de tópicos"
   },
   "searchPlaceholder": "Pesquisar tópicos...",
+  "searchResultEmpty": "Nenhum resultado encontrado",
   "temp": "Temporário",
   "title": "Tópico"
 }

package/locales/ru-RU/topic.json

@@ -32,6 +32,7 @@
     "title": "Список тем"
   },
   "searchPlaceholder": "Поиск тем...",
+  "searchResultEmpty": "Нет результатов поиска",
   "temp": "Временный",
   "title": "Тема"
 }

package/locales/tr-TR/topic.json

@@ -32,6 +32,7 @@
     "title": "Konu Listesi"
   },
   "searchPlaceholder": "Konuları Ara...",
+  "searchResultEmpty": "Hiçbir arama sonucu bulunamadı",
   "temp": "Geçici",
   "title": "Konu"
 }

package/locales/vi-VN/topic.json

@@ -32,6 +32,7 @@
     "title": "Danh sách chủ đề"
   },
   "searchPlaceholder": "Tìm kiếm chủ đề...",
+  "searchResultEmpty": "Không có kết quả tìm kiếm nào",
   "temp": "Tạm thời",
   "title": "Chủ đề"
 }

package/locales/zh-CN/topic.json

@@ -32,6 +32,7 @@
     "title": "话题列表"
   },
   "searchPlaceholder": "搜索话题...",
+  "searchResultEmpty": "暂无搜索结果",
   "temp": "临时",
   "title": "话题"
-}
+}

package/locales/zh-TW/topic.json

@@ -32,6 +32,7 @@
     "title": "話題列表"
   },
   "searchPlaceholder": "搜尋話題...",
+  "searchResultEmpty": "目前沒有搜尋結果",
   "temp": "臨時",
   "title": "話題"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.70.7",
+  "version": "1.70.9",
   "description": "Lobe Chat - an open-source, high-performance chatbot 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)/middleware/auth/index.ts

@@ -1,9 +1,9 @@
 import { AuthObject } from '@clerk/backend';
-import { getAuth } from '@clerk/nextjs/server';
 import { NextRequest } from 'next/server';
 
 import { JWTPayload, LOBE_CHAT_AUTH_HEADER, OAUTH_AUTHORIZED, enableClerk } from '@/const/auth';
 import { AgentRuntime, AgentRuntimeError, ChatCompletionErrorPayload } from '@/libs/agent-runtime';
+import { ClerkAuth } from '@/libs/clerk-auth';
 import { ChatErrorType } from '@/types/fetch';
 import { createErrorResponse } from '@/utils/errorResponse';
 import { getJWTPayload } from '@/utils/server/jwt';
@@ -41,8 +41,11 @@ export const checkAuth =
       // check the Auth With payload and clerk auth
       let clerkAuth = {} as AuthObject;
 
+      // TODO: V2 完整移除 client 模式下的 clerk 集成代码
       if (enableClerk) {
-        clerkAuth = getAuth(req as NextRequest);
+        const auth = new ClerkAuth();
+        const data = auth.getAuthFromRequest(req as NextRequest);
+        clerkAuth = data.clerkAuth;
       }
 
       jwtPayload = await getJWTPayload(authorization);

package/src/app/[variants]/(main)/chat/(workspace)/@topic/features/SkeletonList.tsx

@@ -23,7 +23,7 @@ const useStyles = createStyles(({ css, prefixCls }) => ({
 
   paragraph: css`
     > li {
-      height: 24px !important;
+      height: 20px !important;
     }
   `,
 }));
@@ -49,7 +49,7 @@ export const Placeholder = memo(() => {
 
 export const SkeletonList = memo(() => (
   <Flexbox style={{ paddingTop: 6 }}>
-    {Array.from({ length: 6 }).map((_, i) => (
+    {Array.from({ length: 4 }).map((_, i) => (
       <Placeholder key={i} />
     ))}
   </Flexbox>

package/src/app/[variants]/(main)/chat/(workspace)/@topic/features/TopicListContent/SearchResult/index.tsx

@@ -0,0 +1,59 @@
+'use client';
+
+import { Typography } from 'antd';
+import isEqual from 'fast-deep-equal';
+import React, { memo, useCallback, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Center } from 'react-layout-kit';
+import { Virtuoso, VirtuosoHandle } from 'react-virtuoso';
+
+import { useChatStore } from '@/store/chat';
+import { topicSelectors } from '@/store/chat/selectors';
+import { ChatTopic } from '@/types/topic';
+
+import { SkeletonList } from '../../SkeletonList';
+import TopicItem from '../TopicItem';
+
+const SearchResult = memo(() => {
+  const { t } = useTranslation('topic');
+  const virtuosoRef = useRef<VirtuosoHandle>(null);
+  const [activeTopicId, isSearchingTopic] = useChatStore((s) => [
+    s.activeTopicId,
+    topicSelectors.isSearchingTopic(s),
+  ]);
+  const topics = useChatStore(topicSelectors.searchTopics, isEqual);
+
+  const itemContent = useCallback(
+    (index: number, { id, favorite, title }: ChatTopic) => (
+      <TopicItem active={activeTopicId === id} fav={favorite} id={id} key={id} title={title} />
+    ),
+    [activeTopicId],
+  );
+
+  const activeIndex = topics.findIndex((topic) => topic.id === activeTopicId);
+
+  if (isSearchingTopic) return <SkeletonList />;
+
+  if (topics.length === 0)
+    return (
+      <Center paddingBlock={12}>
+        <Typography.Text type={'secondary'}>{t('searchResultEmpty')}</Typography.Text>
+      </Center>
+    );
+
+  return (
+    <Virtuoso
+      computeItemKey={(_, item) => item.id}
+      data={topics}
+      defaultItemHeight={44}
+      initialTopMostItemIndex={Math.max(activeIndex, 0)}
+      itemContent={itemContent}
+      overscan={44 * 10}
+      ref={virtuosoRef}
+    />
+  );
+});
+
+SearchResult.displayName = 'SearchResult';
+
+export default SearchResult;

package/src/app/[variants]/(main)/chat/(workspace)/@topic/features/TopicListContent/index.tsx

@@ -2,7 +2,6 @@
 
 import { EmptyCard } from '@lobehub/ui';
 import { useThemeMode } from 'antd-style';
-import isEqual from 'fast-deep-equal';
 import React, { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
@@ -18,6 +17,7 @@ import { TopicDisplayMode } from '@/types/topic';
 import { SkeletonList } from '../SkeletonList';
 import ByTimeMode from './ByTimeMode';
 import FlatMode from './FlatMode';
+import SearchResult from './SearchResult';
 
 const TopicListContent = memo(() => {
   const { t } = useTranslation('topic');
@@ -26,7 +26,10 @@ const TopicListContent = memo(() => {
     s.topicsInit,
     topicSelectors.currentTopicLength(s),
   ]);
-  const activeTopicList = useChatStore(topicSelectors.displayTopics, isEqual);
+  const [isUndefinedTopics, isInSearchMode] = useChatStore((s) => [
+    topicSelectors.isUndefinedTopics(s),
+    topicSelectors.isInSearchMode(s),
+  ]);
 
   const [visible, updateGuideState, topicDisplayMode] = useUserStore((s) => [
     s.preference.guide?.topic,
@@ -36,8 +39,10 @@ const TopicListContent = memo(() => {
 
   useFetchTopics();
 
+  if (isInSearchMode) return <SearchResult />;
+
   // first time loading or has no data
-  if (!topicsInit || !activeTopicList) return <SkeletonList />;
+  if (!topicsInit || isUndefinedTopics) return <SkeletonList />;
 
   return (
     <>

package/src/app/[variants]/(main)/chat/(workspace)/@topic/features/TopicSearchBar/index.tsx

@@ -11,30 +11,44 @@ import { useServerConfigStore } from '@/store/serverConfig';
 const TopicSearchBar = memo<{ onClear?: () => void }>(({ onClear }) => {
   const { t } = useTranslation('topic');
 
-  const [keywords, setKeywords] = useState('');
+  const [tempValue, setTempValue] = useState('');
+  const [searchKeyword, setSearchKeywords] = useState('');
   const mobile = useServerConfigStore((s) => s.isMobile);
   const [activeSessionId, useSearchTopics] = useChatStore((s) => [s.activeId, s.useSearchTopics]);
 
-  useSearchTopics(keywords, activeSessionId);
+  useSearchTopics(searchKeyword, activeSessionId);
+
   useUnmount(() => {
-    useChatStore.setState({ isSearchingTopic: false });
+    useChatStore.setState({ inSearchingMode: false, isSearchingTopic: false });
   });
+
+  const startSearchTopic = () => {
+    if (tempValue === searchKeyword) return;
+
+    setSearchKeywords(tempValue);
+    useChatStore.setState({ inSearchingMode: !!tempValue, isSearchingTopic: !!tempValue });
+  };
+
   return (
     <SearchBar
       autoFocus
       onBlur={() => {
-        if (keywords === '') onClear?.();
+        if (tempValue === '') {
+          onClear?.();
+
+          return;
+        }
+
+        startSearchTopic();
       }}
       onChange={(e) => {
-        const value = e.target.value;
-
-        setKeywords(value);
-        useChatStore.setState({ isSearchingTopic: !!value });
+        setTempValue(e.target.value);
       }}
+      onPressEnter={startSearchTopic}
       placeholder={t('searchPlaceholder')}
       spotlight={!mobile}
       type={mobile ? 'block' : 'ghost'}
-      value={keywords}
+      value={tempValue}
     />
   );
 });

package/src/database/schemas/user.ts

@@ -39,9 +39,6 @@ export const userSettings = pgTable('user_settings', {
     .primaryKey(),
 
   tts: jsonb('tts'),
-  /**
-   * @deprecated
-   */
   keyVaults: text('key_vaults'),
   general: jsonb('general'),
   languageModel: jsonb('language_model'),

package/src/database/server/models/topic.ts

@@ -1,5 +1,5 @@
-import { Column, count, sql } from 'drizzle-orm';
-import { and, desc, eq, exists, gt, inArray, isNull, like, or } from 'drizzle-orm/expressions';
+import { count, sql } from 'drizzle-orm';
+import { and, desc, eq, gt, ilike, inArray, isNull } from 'drizzle-orm/expressions';
 
 import { LobeChatDatabase } from '@/database/type';
 import {
@@ -79,27 +79,57 @@ export class TopicModel {
 
     const keywordLowerCase = keyword.toLowerCase();
 
-    const matchKeyword = (field: any) =>
-      like(sql`lower(${field})` as unknown as Column, `%${keywordLowerCase}%`);
-
-    return this.db.query.topics.findMany({
+    // 查询标题匹配的主题
+    const topicsByTitle = await this.db.query.topics.findMany({
       orderBy: [desc(topics.updatedAt)],
       where: and(
         eq(topics.userId, this.userId),
         this.matchSession(sessionId),
-        or(
-          matchKeyword(topics.title),
-          exists(
-            this.db
-              .select()
-              .from(messages)
-              .where(and(eq(messages.topicId, topics.id), matchKeyword(messages.content))),
-          ),
-        ),
+        ilike(topics.title, `%${keywordLowerCase}%`),
       ),
     });
-  };
 
+    // 查询消息内容匹配的主题ID
+    const topicIdsByMessages = await this.db
+      .select({ topicId: messages.topicId })
+      .from(messages)
+      .innerJoin(topics, eq(messages.topicId, topics.id))
+      .where(
+        and(
+          eq(messages.userId, this.userId),
+          ilike(messages.content, `%${keywordLowerCase}%`),
+          eq(topics.userId, this.userId),
+          this.matchSession(sessionId),
+        ),
+      )
+      .groupBy(messages.topicId);
+    // 如果没有通过消息内容找到主题，直接返回标题匹配的主题
+    if (topicIdsByMessages.length === 0) {
+      return topicsByTitle;
+    }
+
+    // 查询通过消息内容找到的主题
+    const topicIds = topicIdsByMessages.map((t) => t.topicId);
+    const topicsByMessages = await this.db.query.topics.findMany({
+      orderBy: [desc(topics.updatedAt)],
+      where: and(eq(topics.userId, this.userId), inArray(topics.id, topicIds)),
+    });
+
+    // 合并结果并去重
+    const allTopics = [...topicsByTitle];
+    const existingIds = new Set(topicsByTitle.map((t) => t.id));
+
+    for (const topic of topicsByMessages) {
+      if (!existingIds.has(topic.id)) {
+        allTopics.push(topic);
+      }
+    }
+
+    // 按更新时间排序
+    return allTopics.sort(
+      (a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime(),
+    );
+  };
   count = async (params?: {
     endDate?: string;
     range?: [string, string];

package/src/database/server/models/user.ts

@@ -174,7 +174,7 @@ export class UserModel {
     // if user already exists, skip creation
     if (params.id) {
       const user = await db.query.users.findFirst({ where: eq(users.id, params.id) });
-      if (!!user) return;
+      if (!!user) return { duplicate: true };
     }
 
     const [user] = await db
@@ -182,7 +182,7 @@ export class UserModel {
       .values({ ...params })
       .returning();
 
-    return user;
+    return { duplicate: false, user };
   };
 
   static deleteUser = async (db: LobeChatDatabase, id: string) => {

package/src/layout/GlobalProvider/AppTheme.tsx

@@ -14,7 +14,11 @@ import Link from 'next/link';
 import { ReactNode, memo, useEffect } from 'react';
 
 import AntdStaticMethods from '@/components/AntdStaticMethods';
-import { LOBE_THEME_NEUTRAL_COLOR, LOBE_THEME_PRIMARY_COLOR } from '@/const/theme';
+import {
+  LOBE_THEME_APPEARANCE,
+  LOBE_THEME_NEUTRAL_COLOR,
+  LOBE_THEME_PRIMARY_COLOR,
+} from '@/const/theme';
 import { useGlobalStore } from '@/store/global';
 import { systemStatusSelectors } from '@/store/global/selectors';
 import { useUserStore } from '@/store/user';
@@ -125,6 +129,11 @@ const AppTheme = memo<AppThemeProps>(
           primaryColor: primaryColor ?? defaultPrimaryColor,
         }}
         defaultAppearance={defaultAppearance}
+        onAppearanceChange={(appearance) => {
+          if (themeMode !== 'auto') return;
+
+          setCookie(LOBE_THEME_APPEARANCE, appearance);
+        }}
         theme={{
           cssVar: true,
           token: {

package/src/libs/clerk-auth/index.test.ts

@@ -0,0 +1,216 @@
+import { auth, getAuth } from '@clerk/nextjs/server';
+import { NextRequest } from 'next/server';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { ClerkAuth } from './index';
+
+// 模拟 @clerk/nextjs/server 模块
+vi.mock('@clerk/nextjs/server', () => ({
+  auth: vi.fn(),
+  getAuth: vi.fn(),
+}));
+
+// 模拟 process.env
+const originalEnv = { ...process.env };
+
+beforeEach(() => {
+  // 重置所有模拟
+  vi.resetAllMocks();
+
+  // 重置环境变量
+  process.env = { ...originalEnv };
+  Object.assign(process.env, { NODE_ENV: 'development' });
+});
+
+afterEach(() => {
+  // 恢复环境变量
+  process.env = originalEnv;
+});
+
+describe('ClerkAuth', () => {
+  describe('constructor', () => {
+    it('should parse user ID mapping from environment variable', () => {
+      process.env.CLERK_DEV_IMPERSONATE_USER = 'dev_user=prod_user';
+      const clerkAuth = new ClerkAuth();
+
+      // 使用私有属性测试，需要使用类型断言
+      expect(clerkAuth['devUserId']).toBe('dev_user');
+      expect(clerkAuth['prodUserId']).toBe('prod_user');
+    });
+
+    it('should handle empty mapping string', () => {
+      process.env.CLERK_DEV_IMPERSONATE_USER = '';
+      const clerkAuth = new ClerkAuth();
+
+      expect((clerkAuth as any).devUserId).toBeNull();
+      expect((clerkAuth as any).prodUserId).toBeNull();
+    });
+
+    it('should handle invalid mapping format', () => {
+      process.env.CLERK_DEV_IMPERSONATE_USER = 'invalid_format';
+      const clerkAuth = new ClerkAuth();
+
+      expect((clerkAuth as any).devUserId).toBeNull();
+      expect((clerkAuth as any).prodUserId).toBeNull();
+    });
+
+    it('should handle undefined mapping', () => {
+      delete process.env.CLERK_DEV_IMPERSONATE_USER;
+      const clerkAuth = new ClerkAuth();
+
+      expect((clerkAuth as any).devUserId).toBeNull();
+      expect((clerkAuth as any).prodUserId).toBeNull();
+    });
+  });
+
+  describe('getAuthFromRequest', () => {
+    it('should get auth from request and return original user ID when no mapping', () => {
+      // 设置模拟返回值
+      vi.mocked(getAuth).mockReturnValue({ userId: 'original_user_id' } as any);
+
+      const clerkAuth = new ClerkAuth();
+      const mockRequest = {} as NextRequest;
+      const result = clerkAuth.getAuthFromRequest(mockRequest);
+
+      expect(getAuth).toHaveBeenCalledWith(mockRequest);
+      expect(result).toEqual({
+        clerkAuth: { userId: 'original_user_id' },
+        userId: 'original_user_id',
+      });
+    });
+
+    it('should map user ID in development environment', () => {
+      // 设置环境和模拟
+      process.env.CLERK_DEV_IMPERSONATE_USER = 'dev_user=prod_user';
+      Object.assign(process.env, { NODE_ENV: 'development' });
+      vi.mocked(getAuth).mockReturnValue({ userId: 'dev_user' } as any);
+
+      const clerkAuth = new ClerkAuth();
+      const result = clerkAuth.getAuthFromRequest({} as NextRequest);
+
+      expect(result).toEqual({
+        clerkAuth: { userId: 'dev_user' },
+        userId: 'prod_user',
+      });
+    });
+
+    it('should not map user ID in production environment', () => {
+      // 设置环境和模拟
+      process.env.CLERK_DEV_IMPERSONATE_USER = 'dev_user=prod_user';
+      Object.assign(process.env, { NODE_ENV: 'production' });
+
+      vi.mocked(getAuth).mockReturnValue({ userId: 'dev_user' } as any);
+
+      const clerkAuth = new ClerkAuth();
+      const result = clerkAuth.getAuthFromRequest({} as NextRequest);
+
+      expect(result).toEqual({
+        clerkAuth: { userId: 'dev_user' },
+        userId: 'dev_user',
+      });
+    });
+
+    it('should handle null user ID', () => {
+      vi.mocked(getAuth).mockReturnValue({ userId: null } as any);
+
+      const clerkAuth = new ClerkAuth();
+      const result = clerkAuth.getAuthFromRequest({} as NextRequest);
+
+      expect(result).toEqual({
+        clerkAuth: { userId: null },
+        userId: null,
+      });
+    });
+  });
+
+  describe('getAuth', () => {
+    it('should get auth and return original user ID when no mapping', async () => {
+      vi.mocked(auth).mockResolvedValue({ userId: 'original_user_id' } as any);
+
+      const clerkAuth = new ClerkAuth();
+      const result = await clerkAuth.getAuth();
+
+      expect(auth).toHaveBeenCalled();
+      expect(result).toEqual({
+        clerkAuth: { userId: 'original_user_id' },
+        userId: 'original_user_id',
+      });
+    });
+
+    it('should map user ID in development environment', async () => {
+      process.env.CLERK_DEV_IMPERSONATE_USER = 'dev_user=prod_user';
+      Object.assign(process.env, { NODE_ENV: 'development' });
+      vi.mocked(auth).mockResolvedValue({ userId: 'dev_user' } as any);
+
+      const clerkAuth = new ClerkAuth();
+      const result = await clerkAuth.getAuth();
+
+      expect(result).toEqual({
+        clerkAuth: { userId: 'dev_user' },
+        userId: 'prod_user',
+      });
+    });
+
+    it('should not map user ID in production environment', async () => {
+      process.env.CLERK_DEV_IMPERSONATE_USER = 'dev_user=prod_user';
+      Object.assign(process.env, { NODE_ENV: 'production' });
+      vi.mocked(auth).mockResolvedValue({ userId: 'dev_user' } as any);
+
+      const clerkAuth = new ClerkAuth();
+      const result = await clerkAuth.getAuth();
+
+      expect(result).toEqual({
+        clerkAuth: { userId: 'dev_user' },
+        userId: 'dev_user',
+      });
+    });
+
+    it('should handle null user ID', async () => {
+      vi.mocked(auth).mockResolvedValue({ userId: null } as any);
+
+      const clerkAuth = new ClerkAuth();
+      const result = await clerkAuth.getAuth();
+
+      expect(result).toEqual({
+        clerkAuth: { userId: null },
+        userId: null,
+      });
+    });
+  });
+
+  describe('getMappedUserId', () => {
+    it('should return null for null input', () => {
+      const clerkAuth = new ClerkAuth();
+      const result = (clerkAuth as any).getMappedUserId(null);
+
+      expect(result).toBeNull();
+    });
+
+    it('should return original ID when no mapping exists', () => {
+      const clerkAuth = new ClerkAuth();
+      const result = (clerkAuth as any).getMappedUserId('some_user_id');
+
+      expect(result).toBe('some_user_id');
+    });
+
+    it('should return mapped ID when matching dev ID in development', () => {
+      process.env.CLERK_DEV_IMPERSONATE_USER = 'dev_user=prod_user';
+      Object.assign(process.env, { NODE_ENV: 'development' });
+
+      const clerkAuth = new ClerkAuth();
+      const result = (clerkAuth as any).getMappedUserId('dev_user');
+
+      expect(result).toBe('prod_user');
+    });
+
+    it('should return original ID when not matching dev ID', () => {
+      process.env.CLERK_DEV_IMPERSONATE_USER = 'dev_user=prod_user';
+      Object.assign(process.env, { NODE_ENV: 'development' });
+
+      const clerkAuth = new ClerkAuth();
+      const result = (clerkAuth as any).getMappedUserId('other_user');
+
+      expect(result).toBe('other_user');
+    });
+  });
+});

package/src/libs/clerk-auth/index.ts

@@ -0,0 +1,80 @@
+import { auth, currentUser, getAuth } from '@clerk/nextjs/server';
+import type { NextRequest } from 'next/server';
+
+export class ClerkAuth {
+  private devUserId: string | null = null;
+  private prodUserId: string | null = null;
+
+  constructor() {
+    this.parseUserIdMapping();
+  }
+
+  /**
+   * 从请求中获取认证信息和用户ID
+   */
+  getAuthFromRequest(request: NextRequest) {
+    const clerkAuth = getAuth(request);
+    const userId = this.getMappedUserId(clerkAuth.userId);
+
+    return { clerkAuth, userId };
+  }
+
+  /**
+   * 获取当前认证信息和用户ID
+   */
+  async getAuth() {
+    const clerkAuth = await auth();
+    const userId = this.getMappedUserId(clerkAuth.userId);
+
+    return { clerkAuth, userId };
+  }
+
+  async getCurrentUser() {
+    const user = await currentUser();
+
+    if (!user) return null;
+
+    const userId = this.getMappedUserId(user.id) as string;
+
+    return { ...user, id: userId };
+  }
+
+  /**
+   * 根据环境变量映射用户ID
+   */
+  private getMappedUserId(originalUserId: string | null): string | null {
+    if (!originalUserId) return null;
+
+    // 只在开发环境下执行映射
+    if (
+      process.env.NODE_ENV === 'development' &&
+      this.devUserId &&
+      this.prodUserId &&
+      originalUserId === this.devUserId
+    ) {
+      return this.prodUserId;
+    }
+
+    return originalUserId;
+  }
+
+  /**
+   * 解析环境变量中的用户ID映射配置
+   * 格式: "dev=prod"
+   */
+  private parseUserIdMapping(): void {
+    const mappingStr = process.env.CLERK_DEV_IMPERSONATE_USER || '';
+
+    if (!mappingStr) return;
+
+    const [dev, prod] = mappingStr.split('=');
+    if (dev && prod) {
+      this.devUserId = dev.trim();
+      this.prodUserId = prod.trim();
+    }
+  }
+}
+
+export type IClerkAuth = ReturnType<typeof getAuth>;
+
+export const clerkAuth = new ClerkAuth();

package/src/locales/default/topic.ts

@@ -32,6 +32,7 @@ export default {
     title: '话题列表',
   },
   searchPlaceholder: '搜索话题...',
+  searchResultEmpty: '暂无搜索结果',
   temp: '临时',
   title: '话题',
 };

package/src/server/context.ts

@@ -1,15 +1,12 @@
-/* eslint-disable @typescript-eslint/no-unused-vars */
-import { getAuth } from '@clerk/nextjs/server';
 import { User } from 'next-auth';
 import { NextRequest } from 'next/server';
 
 import { JWTPayload, LOBE_CHAT_AUTH_HEADER, enableClerk, enableNextAuth } from '@/const/auth';
-
-type ClerkAuth = ReturnType<typeof getAuth>;
+import { ClerkAuth, IClerkAuth } from '@/libs/clerk-auth';
 
 export interface AuthContext {
   authorizationHeader?: string | null;
-  clerkAuth?: ClerkAuth;
+  clerkAuth?: IClerkAuth;
   jwtPayload?: JWTPayload | null;
   nextAuth?: User;
   userId?: string | null;
@@ -21,7 +18,7 @@ export interface AuthContext {
  */
 export const createContextInner = async (params?: {
   authorizationHeader?: string | null;
-  clerkAuth?: ClerkAuth;
+  clerkAuth?: IClerkAuth;
   nextAuth?: User;
   userId?: string | null;
 }): Promise<AuthContext> => ({
@@ -46,9 +43,11 @@ export const createContext = async (request: NextRequest): Promise<Context> => {
   let auth;
 
   if (enableClerk) {
-    auth = getAuth(request);
+    const clerkAuth = new ClerkAuth();
+    const result = clerkAuth.getAuthFromRequest(request);
+    auth = result.clerkAuth;
+    userId = result.userId;
 
-    userId = auth.userId;
     return createContextInner({ authorizationHeader: authorization, clerkAuth: auth, userId });
   }
 

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

@@ -1,5 +1,4 @@
 import { UserJSON } from '@clerk/backend';
-import { currentUser } from '@clerk/nextjs/server';
 import { z } from 'zod';
 
 import { enableClerk } from '@/const/auth';
@@ -7,6 +6,7 @@ import { serverDB } from '@/database/server';
 import { MessageModel } from '@/database/server/models/message';
 import { SessionModel } from '@/database/server/models/session';
 import { UserModel, UserNotFoundError } from '@/database/server/models/user';
+import { ClerkAuth } from '@/libs/clerk-auth';
 import { LobeNextAuthDbAdapter } from '@/libs/next-auth/adapter';
 import { authedProcedure, router } from '@/libs/trpc';
 import { KeyVaultsGateKeeper } from '@/server/modules/KeyVaultsEncrypt';
@@ -22,6 +22,7 @@ import { UserSettings } from '@/types/user/settings';
 const userProcedure = authedProcedure.use(async (opts) => {
   return opts.next({
     ctx: {
+      clerkAuth: new ClerkAuth(),
       nextAuthDbAdapter: LobeNextAuthDbAdapter(serverDB),
       userModel: new UserModel(serverDB, opts.ctx.userId),
     },
@@ -46,7 +47,7 @@ export const userRouter = router({
         state = await ctx.userModel.getUserState(KeyVaultsGateKeeper.getUserKeyVaults);
       } catch (error) {
         if (enableClerk && error instanceof UserNotFoundError) {
-          const user = await currentUser();
+          const user = await ctx.clerkAuth.getCurrentUser();
           if (user) {
             const userService = new UserService();
 

package/src/store/chat/slices/topic/action.ts

@@ -218,7 +218,11 @@ export const chatTopic: StateCreator<
         topicService.searchTopics(keywords, sessionId),
       {
         onSuccess: (data) => {
-          set({ searchTopics: data }, false, n('useSearchTopics(success)', { keywords }));
+          set(
+            { searchTopics: data, isSearchingTopic: false },
+            false,
+            n('useSearchTopics(success)', { keywords }),
+          );
         },
       },
     ),

package/src/store/chat/slices/topic/initialState.ts

@@ -4,6 +4,7 @@ export interface ChatTopicState {
   // TODO: need to add the null to the type
   activeTopicId?: string;
   creatingTopic: boolean;
+  inSearchingMode?: boolean;
   isSearchingTopic: boolean;
   searchTopics: ChatTopic[];
   topicLoadingIds: string[];

package/src/store/chat/slices/topic/selectors.test.ts

@@ -76,11 +76,13 @@ describe('topicSelectors', () => {
       const topics = topicSelectors.displayTopics(state);
       expect(topics).toEqual(topicMaps.test);
     });
+  });
 
+  describe('searchTopics', () => {
     it('should return search topics if searching', () => {
       const searchTopics = [{ id: 'search1', name: 'Search 1' }];
-      const state = merge(initialStore, { isSearchingTopic: true, searchTopics });
-      const topics = topicSelectors.displayTopics(state);
+      const state = merge(initialStore, { inSearchingMode: true, searchTopics });
+      const topics = topicSelectors.searchTopics(state);
       expect(topics).toEqual(searchTopics);
     });
   });

package/src/store/chat/slices/topic/selectors.ts

@@ -12,8 +12,7 @@ const currentActiveTopic = (s: ChatStoreState): ChatTopic | undefined => {
 };
 const searchTopics = (s: ChatStoreState): ChatTopic[] => s.searchTopics;
 
-const displayTopics = (s: ChatStoreState): ChatTopic[] | undefined =>
-  s.isSearchingTopic ? searchTopics(s) : currentTopics(s);
+const displayTopics = (s: ChatStoreState): ChatTopic[] | undefined => currentTopics(s);
 
 const currentFavTopics = (s: ChatStoreState): ChatTopic[] =>
   currentTopics(s)?.filter((s) => s.favorite) || [];
@@ -40,6 +39,9 @@ const currentActiveTopicSummary = (s: ChatStoreState): ChatTopicSummary | undefi
 };
 
 const isCreatingTopic = (s: ChatStoreState) => s.creatingTopic;
+const isUndefinedTopics = (s: ChatStoreState) => !currentTopics(s);
+const isInSearchMode = (s: ChatStoreState) => s.inSearchingMode;
+const isSearchingTopic = (s: ChatStoreState) => s.isSearchingTopic;
 
 const groupedTopicsSelector = (s: ChatStoreState): GroupedTopic[] => {
   const topics = displayTopics(s);
@@ -70,5 +72,8 @@ export const topicSelectors = {
   getTopicById,
   groupedTopicsSelector,
   isCreatingTopic,
+  isInSearchMode,
+  isSearchingTopic,
+  isUndefinedTopics,
   searchTopics,
 };

package/src/utils/server/auth.ts

@@ -1,14 +1,12 @@
-import { auth } from '@clerk/nextjs/server';
-
 import { enableClerk, enableNextAuth } from '@/const/auth';
+import { ClerkAuth } from '@/libs/clerk-auth';
 import NextAuthEdge from '@/libs/next-auth/edge';
 
 export const getUserAuth = async () => {
   if (enableClerk) {
-    const clerkAuth = await auth();
+    const clerkAuth = new ClerkAuth();
 
-    const userId = clerkAuth.userId;
-    return { clerkAuth: auth, userId };
+    return await clerkAuth.getAuth();
   }
 
   if (enableNextAuth) {