@lobehub/lobehub 2.0.0-next.23 → 2.0.0-next.24

package/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 # Changelog
 
+## [Version 2.0.0-next.24](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.23...v2.0.0-next.24)
+
+<sup>Released on **2025-11-04**</sup>
+
+#### 💄 Styles
+
+- **misc**: Improve lab style.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Styles
+
+- **misc**: Improve lab style, closes [#10040](https://github.com/lobehub/lobe-chat/issues/10040) ([bbf1c0b](https://github.com/lobehub/lobe-chat/commit/bbf1c0b))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ## [Version 2.0.0-next.23](https://github.com/lobehub/lobe-chat/compare/v2.0.0-next.22...v2.0.0-next.23)
 
 <sup>Released on **2025-11-04**</sup>

package/changelog/v1.json

@@ -1,4 +1,13 @@
 [
+  {
+    "children": {
+      "improvements": [
+        "Improve lab style."
+      ]
+    },
+    "date": "2025-11-04",
+    "version": "2.0.0-next.24"
+  },
   {
     "children": {
       "fixes": [

package/locales/ar/labs.json

@@ -1,6 +1,10 @@
 {
   "desc": "سنقوم بتحديث الميزات الجديدة التي نستكشفها من وقت لآخر، ندعوك لتجربتها!",
   "features": {
+    "assistantMessageGroup": {
+      "desc": "تجميع رسائل المساعد ونتائج استدعاء الأدوات في مجموعة واحدة للعرض",
+      "title": "تجميع رسائل المساعد"
+    },
     "groupChat": {
       "desc": "تفعيل إمكانية تنسيق المحادثات الجماعية متعددة الوكلاء.",
       "title": "دردشة جماعية (متعددة الوكلاء)"

package/locales/bg-BG/labs.json

@@ -1,6 +1,10 @@
 {
   "desc": "Тук периодично ще актуализираме новите функции, които изследваме. Добре дошли да ги изпробвате!",
   "features": {
+    "assistantMessageGroup": {
+      "desc": "Групиране на съобщенията от асистента и резултатите от извикванията на инструменти за показване в група",
+      "title": "Групиране на съобщенията от асистента"
+    },
     "groupChat": {
       "desc": "Активиране на възможността за координация в групов чат с множество интелигентни агенти.",
       "title": "Групов чат (множество агенти)"

package/locales/de-DE/labs.json

@@ -1,6 +1,10 @@
 {
   "desc": "Hier werden wir regelmäßig neue Funktionen vorstellen, die wir gerade erforschen – probieren Sie sie gerne aus!",
   "features": {
+    "assistantMessageGroup": {
+      "desc": "Assistentennachrichten und die Ergebnisse von Toolaufrufen werden gruppiert angezeigt",
+      "title": "Gruppierung von Assistentennachrichten"
+    },
     "groupChat": {
       "desc": "Aktivieren Sie die Koordination von Gruppenchats mit mehreren KI-Agenten.",
       "title": "Gruppenchats (mehrere Agenten)"

package/locales/en-US/labs.json

@@ -1,6 +1,10 @@
 {
   "desc": "Here you'll find occasional updates on new features we're exploring—feel free to try them out!",
   "features": {
+    "assistantMessageGroup": {
+      "desc": "Group assistant messages and their tool call results together for display",
+      "title": "Assistant Message Grouping"
+    },
     "groupChat": {
       "desc": "Enable multi-agent group chat coordination.",
       "title": "Group Chat (Multi-Agent)"

package/locales/es-ES/labs.json

@@ -1,6 +1,10 @@
 {
   "desc": "Aquí actualizaremos periódicamente las nuevas funciones que estamos explorando. ¡Te invitamos a probarlas!",
   "features": {
+    "assistantMessageGroup": {
+      "desc": "Agrupa los mensajes del asistente y los resultados de las herramientas utilizadas para mostrarlos juntos",
+      "title": "Agrupación de mensajes del asistente"
+    },
     "groupChat": {
       "desc": "Activa la capacidad de coordinación de chats grupales con múltiples agentes.",
       "title": "Chat grupal (multiagente)"

package/locales/fa-IR/labs.json

@@ -1,6 +1,10 @@
 {
   "desc": "در اینجا به‌طور دوره‌ای ویژگی‌های جدیدی که در حال آزمایش آن‌ها هستیم به‌روزرسانی می‌شود. خوشحال می‌شویم آن‌ها را امتحان کنید!",
   "features": {
+    "assistantMessageGroup": {
+      "desc": "نمایش گروهی پیام‌های دستیار و نتایج فراخوانی ابزارهای آن",
+      "title": "گروه‌بندی پیام‌های دستیار"
+    },
     "groupChat": {
       "desc": "قابلیت هماهنگی چت گروهی با چند عامل هوشمند را فعال کنید.",
       "title": "گفت‌وگوی گروهی (چند عاملی)"

package/locales/fr-FR/labs.json

@@ -1,6 +1,10 @@
 {
   "desc": "Nous mettons à jour régulièrement cette section avec de nouvelles fonctionnalités en cours d'exploration. N'hésitez pas à les essayer !",
   "features": {
+    "assistantMessageGroup": {
+      "desc": "Regrouper les messages de l'assistant et les résultats des appels d'outils pour les afficher ensemble",
+      "title": "Regroupement des messages de l'assistant"
+    },
     "groupChat": {
       "desc": "Activez la coordination de discussions de groupe avec plusieurs agents intelligents.",
       "title": "Discussion de groupe (multi-agents)"

package/locales/it-IT/labs.json

@@ -1,6 +1,10 @@
 {
   "desc": "Qui troverai aggiornamenti periodici sulle nuove funzionalità che stiamo esplorando. Sentiti libero di provarle!",
   "features": {
+    "assistantMessageGroup": {
+      "desc": "Raggruppa i messaggi dell'assistente e i risultati delle chiamate agli strumenti in un unico gruppo",
+      "title": "Raggruppamento dei messaggi dell'assistente"
+    },
     "groupChat": {
       "desc": "Abilita la capacità di coordinamento in chat di gruppo con più agenti intelligenti.",
       "title": "Chat di gruppo (multi-agente)"

package/locales/ja-JP/labs.json

@@ -1,6 +1,10 @@
 {
   "desc": "ここでは、私たちが現在試している新機能を不定期に更新しています。ぜひお試しください！",
   "features": {
+    "assistantMessageGroup": {
+      "desc": "アシスタントのメッセージとそのツール呼び出し結果をグループ化して表示します",
+      "title": "アシスタントメッセージのグループ化表示"
+    },
     "groupChat": {
       "desc": "複数のAIエージェントによるグループチャット機能を有効にします。",
       "title": "グループチャット（マルチエージェント）"

package/locales/ko-KR/labs.json

@@ -1,6 +1,10 @@
 {
   "desc": "이곳에서는 우리가 탐색 중인 새로운 기능들을 수시로 업데이트합니다. 사용해보시고 의견을 들려주세요!",
   "features": {
+    "assistantMessageGroup": {
+      "desc": "도우미 메시지와 해당 도구 호출 결과를 그룹으로 묶어 표시합니다",
+      "title": "도우미 메시지 그룹화"
+    },
     "groupChat": {
       "desc": "다중 에이전트 그룹 채팅 조정 기능을 활성화합니다.",
       "title": "그룹 채팅 (다중 에이전트)"

package/locales/nl-NL/labs.json

@@ -1,6 +1,10 @@
 {
   "desc": "Hier worden regelmatig nieuwe functies bijgewerkt die we aan het verkennen zijn. Probeer ze gerust uit!",
   "features": {
+    "assistantMessageGroup": {
+      "desc": "Assistentberichten en de resultaten van hulpoproepen gegroepeerd weergeven",
+      "title": "Gegroepeerde weergave van assistentberichten"
+    },
     "groupChat": {
       "desc": "Schakel de mogelijkheid in om groepschats met meerdere AI-agenten te organiseren.",
       "title": "Groepschat (meerdere agenten)"

package/locales/pl-PL/labs.json

@@ -1,6 +1,10 @@
 {
   "desc": "Tutaj będziemy okresowo aktualizować nowe funkcje, które obecnie testujemy — zapraszamy do wypróbowania!",
   "features": {
+    "assistantMessageGroup": {
+      "desc": "Grupowanie wiadomości asystenta i wyników wywołań narzędzi w jednym widoku",
+      "title": "Grupowanie wiadomości asystenta"
+    },
     "groupChat": {
       "desc": "Włącz możliwość organizowania czatów grupowych z wieloma agentami.",
       "title": "Czat grupowy (wielu agentów)"

package/locales/pt-BR/labs.json

@@ -1,6 +1,10 @@
 {
   "desc": "Aqui você encontrará atualizações periódicas sobre os novos recursos que estamos explorando. Sinta-se à vontade para testá-los!",
   "features": {
+    "assistantMessageGroup": {
+      "desc": "Agrupa as mensagens do assistente e os resultados das ferramentas chamadas para exibição conjunta",
+      "title": "Agrupamento de Mensagens do Assistente"
+    },
     "groupChat": {
       "desc": "Ative a capacidade de orquestração de bate-papo em grupo com múltiplos agentes.",
       "title": "Bate-papo em Grupo (Múltiplos Agentes)"

package/locales/ru-RU/labs.json

@@ -1,6 +1,10 @@
 {
   "desc": "Здесь мы будем периодически обновлять информацию о новых функциях, которые мы исследуем. Добро пожаловать на пробное использование!",
   "features": {
+    "assistantMessageGroup": {
+      "desc": "Группировка сообщений помощника и результатов вызова инструментов для отображения в одном блоке",
+      "title": "Группировка сообщений помощника"
+    },
     "groupChat": {
       "desc": "Включить возможность организации группового чата с несколькими интеллектуальными агентами.",
       "title": "Групповой чат (мультиагенты)"

package/locales/tr-TR/labs.json

@@ -1,6 +1,10 @@
 {
   "desc": "Burada keşfetmekte olduğumuz yeni özellikleri düzenli olarak güncelliyoruz, denemekten çekinmeyin!",
   "features": {
+    "assistantMessageGroup": {
+      "desc": "Asistan mesajlarını ve araç çağrısı sonuçlarını gruplar hâlinde göster",
+      "title": "Asistan Mesajları Gruplama"
+    },
     "groupChat": {
       "desc": "Çoklu yapay zeka ajanlarıyla grup sohbeti düzenleme yeteneğini etkinleştirir.",
       "title": "Grup Sohbeti (Çoklu Ajan)"

package/locales/vi-VN/labs.json

@@ -1,6 +1,10 @@
 {
   "desc": "Tại đây, chúng tôi sẽ cập nhật định kỳ các tính năng mới đang được khám phá. Rất hoan nghênh bạn dùng thử!",
   "features": {
+    "assistantMessageGroup": {
+      "desc": "Tổng hợp tin nhắn trợ lý và kết quả gọi công cụ vào cùng một nhóm để hiển thị",
+      "title": "Nhóm tin nhắn trợ lý"
+    },
     "groupChat": {
       "desc": "Kích hoạt khả năng điều phối trò chuyện nhóm với nhiều tác nhân thông minh.",
       "title": "Trò chuyện nhóm (đa tác nhân)"

package/locales/zh-CN/labs.json

@@ -1,6 +1,10 @@
 {
   "desc": "这里会不定期更新我们正在探索的新功能，欢迎试用！",
   "features": {
+    "assistantMessageGroup": {
+      "desc": "将助手消息及其工具调用结果聚合到分组里显示",
+      "title": "助手消息聚合分组"
+    },
     "groupChat": {
       "desc": "启用多智能体群聊编排能力。",
       "title": "群聊（多智能体）"

package/locales/zh-TW/labs.json

@@ -1,6 +1,10 @@
 {
   "desc": "這裡會不定期更新我們正在探索的新功能，歡迎試用！",
   "features": {
+    "assistantMessageGroup": {
+      "desc": "將助手訊息及其工具調用結果彙整成群組顯示",
+      "title": "助手訊息彙整群組"
+    },
     "groupChat": {
       "desc": "啟用多智能體群組聊天編排功能。",
       "title": "群組聊天（多智能體）"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/lobehub",
-  "version": "2.0.0-next.23",
+  "version": "2.0.0-next.24",
   "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/packages/const/src/user.ts

@@ -1,12 +1,15 @@
 import { TopicDisplayMode, UserPreference } from '@lobechat/types';
 
 export const DEFAULT_PREFERENCE: UserPreference = {
-  disableInputMarkdownRender: false,
-  enableGroupChat: false,
   guide: {
     moveSettingsToAvatar: true,
     topic: true,
   },
+  lab: {
+    enableAssistantMessageGroup: false,
+    enableGroupChat: false,
+    enableInputMarkdown: true,
+  },
   telemetry: null,
   topicDisplayMode: TopicDisplayMode.ByTime,
   useCmdEnterToSend: false,

package/packages/types/src/index.ts

@@ -26,7 +26,6 @@ export * from './session';
 export * from './tool';
 export * from './topic';
 export * from './user';
-export * from './user/settings';
 // FIXME: I think we need a refactor for the "openai" types
 // it more likes the UI message payload
 export * from './openai/chat';

package/packages/types/src/user/index.ts

@@ -1,88 +1,2 @@
-import type { PartialDeep } from 'type-fest';
-import { z } from 'zod';
-
-import { Plans } from '../subscription';
-import { TopicDisplayMode } from '../topic';
-import { UserSettings } from './settings';
-
-export interface LobeUser {
-  avatar?: string;
-  email?: string | null;
-  firstName?: string | null;
-  fullName?: string | null;
-  id: string;
-  latestName?: string | null;
-  username?: string | null;
-}
-
-export const UserGuideSchema = z.object({
-  /**
-   * Move the settings button to the avatar dropdown
-   */
-  moveSettingsToAvatar: z.boolean().optional(),
-
-  /**
-   * Topic Guide
-   */
-  topic: z.boolean().optional(),
-
-  /**
-   * tell user that uploaded files can be found in knowledge base
-   */
-  uploadFileInKnowledgeBase: z.boolean().optional(),
-});
-
-export type UserGuide = z.infer<typeof UserGuideSchema>;
-
-export interface UserPreference {
-  /**
-   * disable markdown rendering in chat input editor
-   */
-  disableInputMarkdownRender?: boolean;
-  /**
-   * enable multi-agent group chat mode
-   */
-  enableGroupChat?: boolean;
-  guide?: UserGuide;
-  hideSyncAlert?: boolean;
-  telemetry: boolean | null;
-  topicDisplayMode?: TopicDisplayMode;
-  /**
-   * whether to use cmd + enter to send message
-   */
-  useCmdEnterToSend?: boolean;
-}
-
-export interface UserInitializationState {
-  avatar?: string;
-  canEnablePWAGuide?: boolean;
-  canEnableTrace?: boolean;
-  email?: string;
-  firstName?: string;
-  fullName?: string;
-  hasConversation?: boolean;
-  isOnboard?: boolean;
-  lastName?: string;
-  preference: UserPreference;
-  settings: PartialDeep<UserSettings>;
-  subscriptionPlan?: Plans;
-  userId?: string;
-  username?: string;
-}
-
-export const NextAuthAccountSchame = z.object({
-  provider: z.string(),
-  providerAccountId: z.string(),
-});
-
-export const UserPreferenceSchema = z
-  .object({
-    disableInputMarkdownRender: z.boolean().optional(),
-    enableGroupChat: z.boolean().optional(),
-    guide: UserGuideSchema.optional(),
-    hideSyncAlert: z.boolean().optional(),
-    telemetry: z.boolean().nullable(),
-    topicDisplayMode: z.nativeEnum(TopicDisplayMode).optional(),
-    useCmdEnterToSend: z.boolean().optional(),
-  })
-  .partial();
+export * from './preference';
+export * from './settings';

package/packages/types/src/user/preference.ts

@@ -0,0 +1,105 @@
+import type { PartialDeep } from 'type-fest';
+import { z } from 'zod';
+
+import { Plans } from '../subscription';
+import { TopicDisplayMode } from '../topic';
+import { UserSettings } from './settings';
+
+export interface LobeUser {
+  avatar?: string;
+  email?: string | null;
+  firstName?: string | null;
+  fullName?: string | null;
+  id: string;
+  latestName?: string | null;
+  username?: string | null;
+}
+
+export const UserGuideSchema = z.object({
+  /**
+   * Move the settings button to the avatar dropdown
+   */
+  moveSettingsToAvatar: z.boolean().optional(),
+
+  /**
+   * Topic Guide
+   */
+  topic: z.boolean().optional(),
+
+  /**
+   * tell user that uploaded files can be found in knowledge base
+   */
+  uploadFileInKnowledgeBase: z.boolean().optional(),
+});
+
+export type UserGuide = z.infer<typeof UserGuideSchema>;
+
+export const UserLabSchema = z.object({
+  /**
+   * enable assistant message grouping in chat display
+   */
+  enableAssistantMessageGroup: z.boolean().optional(),
+  /**
+   * enable multi-agent group chat mode
+   */
+  enableGroupChat: z.boolean().optional(),
+  /**
+   * enable markdown rendering in chat input editor
+   */
+  enableInputMarkdown: z.boolean().optional(),
+});
+
+export type UserLab = z.infer<typeof UserLabSchema>;
+
+export interface UserPreference {
+  /**
+   * disable markdown rendering in chat input editor
+   * @deprecated Use lab.enableInputMarkdown instead
+   */
+  disableInputMarkdownRender?: boolean;
+  guide?: UserGuide;
+  hideSyncAlert?: boolean;
+  /**
+   * lab experimental features
+   */
+  lab?: UserLab;
+  telemetry: boolean | null;
+  topicDisplayMode?: TopicDisplayMode;
+  /**
+   * whether to use cmd + enter to send message
+   */
+  useCmdEnterToSend?: boolean;
+}
+
+export interface UserInitializationState {
+  avatar?: string;
+  canEnablePWAGuide?: boolean;
+  canEnableTrace?: boolean;
+  email?: string;
+  firstName?: string;
+  fullName?: string;
+  hasConversation?: boolean;
+  isOnboard?: boolean;
+  lastName?: string;
+  preference: UserPreference;
+  settings: PartialDeep<UserSettings>;
+  subscriptionPlan?: Plans;
+  userId?: string;
+  username?: string;
+}
+
+export const NextAuthAccountSchame = z.object({
+  provider: z.string(),
+  providerAccountId: z.string(),
+});
+
+export const UserPreferenceSchema = z
+  .object({
+    guide: UserGuideSchema.optional(),
+    hideSyncAlert: z.boolean().optional(),
+    lab: UserLabSchema.optional(),
+    telemetry: z.boolean().nullable(),
+    topicDisplayMode: z.nativeEnum(TopicDisplayMode).optional(),
+    useCmdEnterToSend: z.boolean().optional(),
+  })
+  .partial();

package/renovate.json

@@ -30,9 +30,7 @@
       "matchCurrentValue": "^\\d+\\.\\d+\\.\\d+([+-][0-9A-Za-z.-]+)?$",
       "groupName": null,
       "separateMinorPatch": true,
-      "separateMajorMinor": true,
-      "separateMultipleMinor": true,
-      "separateMultipleMajor": true
+      "separateMajorMinor": true
     },
     // 2a) Non-pinned deps: override splitting so patch+minor can be combined
     {
@@ -70,9 +68,6 @@
   "rebaseWhen": "conflicted",
   "schedule": "on sunday before 6:00am",
   "separateMajorMinor": true,
-  // Global defaults are fine; rule 2a overrides minor/patch splitting for ranged deps
-  "separateMinorPatch": true,
   "separateMultipleMajor": true,
-  "separateMultipleMinor": true,
   "timezone": "UTC"
 }

package/src/app/[variants]/(main)/labs/components/LabCard.tsx

@@ -6,6 +6,8 @@ import Image from 'next/image';
 import { PropsWithChildren, memo } from 'react';
 import { Flexbox } from 'react-layout-kit';
 
+import { SkeletonSwitch } from '@/components/Skeleton';
+
 interface LabCardProps {
   checked: boolean;
   cover?: string;
@@ -80,11 +82,9 @@ const LabCard = memo<PropsWithChildren<LabCardProps>>(
               <div className={styles.desc}>{desc}</div>
               {meta ? <div className={styles.meta}>{meta}</div> : null}
             </Flexbox>
-            {!loading && (
-              <Flexbox align={'flex-end'} height={'100%'} justify={'center'} paddingInline={8}>
-                <Switch checked={checked} onChange={onChange} />
-              </Flexbox>
-            )}
+            <Flexbox align={'flex-end'} height={'100%'} justify={'center'} paddingInline={8}>
+              {loading ? <SkeletonSwitch /> : <Switch checked={checked} onChange={onChange} />}
+            </Flexbox>
           </div>
         </div>
       </div>

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

@@ -1,11 +1,11 @@
 'use client';
 
-import { memo, useCallback } from 'react';
+import { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Flexbox } from 'react-layout-kit';
 
 import { useUserStore } from '@/store/user';
-import { preferenceSelectors } from '@/store/user/selectors';
+import { labPreferSelectors, preferenceSelectors } from '@/store/user/selectors';
 
 import Hero from './components/Hero';
 import LabCard from './components/LabCard';
@@ -15,7 +15,6 @@ interface LabItem {
   cover?: string;
   desc: string;
   key: string;
-  onChange: (checked: boolean) => void;
   title: string;
 }
 
@@ -24,40 +23,37 @@ const LabsPage = memo(() => {
 
   const [
     isPreferenceInit,
-    inputMarkdownRender,
+    enableInputMarkdown,
+    // enableAssistantMessageGroup,
     // enableGroupChat,
-    updatePreference,
+    updateLab,
   ] = useUserStore((s) => [
     preferenceSelectors.isPreferenceInit(s),
-    preferenceSelectors.inputMarkdownRender(s),
-    // preferenceSelectors.enableGroupChat(s),
-    s.updatePreference,
+    labPreferSelectors.enableInputMarkdown(s),
+    // labPreferSelectors.enableAssistantMessageGroup(s),
+    // labPreferSelectors.enableGroupChat(s),
+    s.updateLab,
   ]);
 
-  const onToggleMarkdown = useCallback(
-    (checked: boolean) => updatePreference({ disableInputMarkdownRender: !checked }),
-    [updatePreference],
-  );
-  // const onToggleGroupChat = useCallback(
-  //   (checked: boolean) => updatePreference({ enableGroupChat: checked }),
-  //   [updatePreference],
-  // );
-
   const labItems: LabItem[] = [
     {
-      checked: inputMarkdownRender,
+      checked: enableInputMarkdown,
       cover: 'https://github.com/user-attachments/assets/0527a966-3d95-46b4-b880-c0f3fca18f02',
       desc: t('features.inputMarkdown.desc'),
-      key: 'inputMarkdown',
-      onChange: onToggleMarkdown,
+      key: 'enableInputMarkdown',
       title: t('features.inputMarkdown.title'),
     },
     // {
+    //   checked: enableAssistantMessageGroup,
+    //   desc: t('features.assistantMessageGroup.desc'),
+    //   key: 'enableAssistantMessageGroup',
+    //   title: t('features.assistantMessageGroup.title'),
+    // },
+    // {
     //   checked: enableGroupChat,
     //   cover: 'https://github.com/user-attachments/assets/72894d24-a96a-4d7c-a823-ff9e6a1a8b6d',
     //   desc: t('features.groupChat.desc'),
     //   key: 'groupChat',
-    //   onChange: onToggleGroupChat,
     //   title: t('features.groupChat.title'),
     // },
   ];
@@ -73,7 +69,7 @@ const LabsPage = memo(() => {
           desc={item.desc}
           key={item.key}
           loading={!isPreferenceInit}
-          onChange={item.onChange}
+          onChange={(checked: boolean) => updateLab({ [item.key]: checked })}
           title={item.title}
         />
       ))}

package/src/app/[variants]/(main)/settings/provider/detail/azure/index.tsx

@@ -6,11 +6,11 @@ import { ModelProvider } from 'model-bank';
 import { useTranslation } from 'react-i18next';
 
 import { FormInput, FormPassword } from '@/components/FormInput';
+import { SkeletonInput } from '@/components/Skeleton';
 import { AzureProviderCard } from '@/config/modelProviders';
 import { aiModelSelectors, aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 
 import { KeyVaultsConfigKey, LLMProviderApiTokenKey, LLMProviderBaseUrlKey } from '../../const';
-import { SkeletonInput } from '../../features/ProviderConfig';
 import { ProviderItem } from '../../type';
 import ProviderDetail from '../default';
 

package/src/app/[variants]/(main)/settings/provider/detail/azureai/index.tsx

@@ -4,11 +4,11 @@ import { ModelProvider } from 'model-bank';
 import { useTranslation } from 'react-i18next';
 
 import { FormInput, FormPassword } from '@/components/FormInput';
+import { SkeletonInput } from '@/components/Skeleton';
 import { AzureAIProviderCard } from '@/config/modelProviders';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 
 import { KeyVaultsConfigKey, LLMProviderApiTokenKey, LLMProviderBaseUrlKey } from '../../const';
-import { SkeletonInput } from '../../features/ProviderConfig';
 import { ProviderItem } from '../../type';
 import ProviderDetail from '../default';
 

package/src/app/[variants]/(main)/settings/provider/detail/bedrock/index.tsx

@@ -4,12 +4,12 @@ import { Select } from '@lobehub/ui';
 import { useTranslation } from 'react-i18next';
 
 import { FormPassword } from '@/components/FormInput';
+import { SkeletonInput } from '@/components/Skeleton';
 import { BedrockProviderCard } from '@/config/modelProviders';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { GlobalLLMProviderKey } from '@/types/user/settings';
 
 import { KeyVaultsConfigKey } from '../../const';
-import { SkeletonInput } from '../../features/ProviderConfig';
 import { ProviderItem } from '../../type';
 import ProviderDetail from '../default';
 

package/src/app/[variants]/(main)/settings/provider/detail/cloudflare/index.tsx

@@ -3,12 +3,12 @@
 import { useTranslation } from 'react-i18next';
 
 import { FormInput, FormPassword } from '@/components/FormInput';
+import { SkeletonInput } from '@/components/Skeleton';
 import { CloudflareProviderCard } from '@/config/modelProviders';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { GlobalLLMProviderKey } from '@/types/user/settings';
 
 import { KeyVaultsConfigKey } from '../../const';
-import { SkeletonInput } from '../../features/ProviderConfig';
 import { ProviderItem } from '../../type';
 import ProviderDetail from '../default';
 

package/src/app/[variants]/(main)/settings/provider/detail/comfyui/index.tsx

@@ -5,12 +5,12 @@ import { useTranslation } from 'react-i18next';
 
 import { FormInput, FormPassword } from '@/components/FormInput';
 import KeyValueEditor from '@/components/KeyValueEditor';
+import { SkeletonInput } from '@/components/Skeleton';
 import { ComfyUIProviderCard } from '@/config/modelProviders';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { GlobalLLMProviderKey } from '@/types/user/settings';
 
 import { KeyVaultsConfigKey } from '../../const';
-import { SkeletonInput } from '../../features/ProviderConfig';
 import { ProviderItem } from '../../type';
 import ProviderDetail from '../default';
 

package/src/app/[variants]/(main)/settings/provider/detail/github/index.tsx

@@ -5,12 +5,12 @@ import { createStyles } from 'antd-style';
 import { useTranslation } from 'react-i18next';
 
 import { FormPassword } from '@/components/FormInput';
+import { SkeletonInput } from '@/components/Skeleton';
 import { GithubProviderCard } from '@/config/modelProviders';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { GlobalLLMProviderKey } from '@/types/user/settings';
 
 import { KeyVaultsConfigKey, LLMProviderApiTokenKey } from '../../const';
-import { SkeletonInput } from '../../features/ProviderConfig';
 import { ProviderItem } from '../../type';
 import ProviderDetail from '../default';
 

package/src/app/[variants]/(main)/settings/provider/detail/vertexai/index.tsx

@@ -5,12 +5,12 @@ import { createStyles } from 'antd-style';
 import { useTranslation } from 'react-i18next';
 
 import { FormPassword } from '@/components/FormInput';
+import { SkeletonInput } from '@/components/Skeleton';
 import { VertexAIProviderCard } from '@/config/modelProviders';
 import { aiProviderSelectors, useAiInfraStore } from '@/store/aiInfra';
 import { GlobalLLMProviderKey } from '@/types/user/settings';
 
 import { KeyVaultsConfigKey, LLMProviderApiTokenKey } from '../../const';
-import { SkeletonInput } from '../../features/ProviderConfig';
 import { ProviderItem } from '../../type';
 import ProviderDetail from '../default';
 

package/src/app/[variants]/(main)/settings/provider/features/ProviderConfig/index.tsx

@@ -21,6 +21,7 @@ import urlJoin from 'url-join';
 import { z } from 'zod';
 
 import { FormInput, FormPassword } from '@/components/FormInput';
+import { SkeletonInput, SkeletonSwitch } from '@/components/Skeleton';
 import { FORM_STYLE } from '@/const/layoutTokens';
 import { AES_GCM_URL, BASE_PROVIDER_DOC_URL } from '@/const/url';
 import { isDesktop, isServerMode } from '@/const/version';
@@ -34,7 +35,6 @@ import {
 import { KeyVaultsConfigKey, LLMProviderApiTokenKey, LLMProviderBaseUrlKey } from '../../const';
 import Checker, { CheckErrorRender } from './Checker';
 import EnableSwitch from './EnableSwitch';
-import { SkeletonInput } from './SkeletonInput';
 import UpdateProviderInfo from './UpdateProviderInfo';
 
 const useStyles = createStyles(({ css, prefixCls, responsive, token }) => ({
@@ -298,7 +298,7 @@ const ProviderConfig = memo<ProviderConfigProps>(
         (showApiKey && isProviderApiKeyNotEmpty));
     const clientFetchItem = showClientFetch && {
       children: isLoading ? (
-        <Skeleton.Button active className={styles.switchLoading} />
+        <SkeletonSwitch />
       ) : (
         <Switch checked={isFetchOnClient} disabled={configUpdating} />
       ),
@@ -424,5 +424,3 @@ const ProviderConfig = memo<ProviderConfigProps>(
 );
 
 export default ProviderConfig;
-
-export { SkeletonInput } from './SkeletonInput';

package/src/components/Skeleton/SkeletonSwitch.tsx

@@ -0,0 +1,13 @@
+import { Skeleton } from 'antd';
+import { css, cx } from 'antd-style';
+
+const switchLoading = cx(css`
+  width: 44px !important;
+  min-width: 44px !important;
+  height: 22px !important;
+  border-radius: 12px !important;
+`);
+
+export const SkeletonSwitch = () => {
+  return <Skeleton.Button active className={switchLoading} />;
+};

package/src/components/Skeleton/index.ts

@@ -0,0 +1,2 @@
+export * from './SkeletonInput';
+export * from './SkeletonSwitch';

package/src/features/ChatInput/ActionBar/index.tsx

@@ -4,7 +4,7 @@ import { memo, useMemo } from 'react';
 import { useGlobalStore } from '@/store/global';
 import { systemStatusSelectors } from '@/store/global/selectors';
 import { useUserStore } from '@/store/user';
-import { preferenceSelectors } from '@/store/user/slices/preference/selectors';
+import { labPreferSelectors } from '@/store/user/slices/preference/selectors';
 
 import { ActionKeys, actionMap } from '../ActionBar/config';
 import { useChatInputStore } from '../store';
@@ -44,7 +44,7 @@ const ActionToolbar = memo(() => {
     systemStatusSelectors.expandInputActionbar(s),
     s.toggleExpandInputActionbar,
   ]);
-  const enableRichRender = useUserStore(preferenceSelectors.inputMarkdownRender);
+  const enableRichRender = useUserStore(labPreferSelectors.enableInputMarkdown);
 
   const leftActions = useChatInputStore((s) =>
     s.leftActions.filter((item) => (enableRichRender ? true : item !== 'typo')),

package/src/features/ChatInput/InputEditor/index.tsx

@@ -21,7 +21,7 @@ import { useHotkeysContext } from 'react-hotkeys-hook';
 import { useTranslation } from 'react-i18next';
 
 import { useUserStore } from '@/store/user';
-import { preferenceSelectors, settingsSelectors } from '@/store/user/selectors';
+import { labPreferSelectors, preferenceSelectors, settingsSelectors } from '@/store/user/selectors';
 
 import { useChatInputStore, useStoreApi } from '../store';
 import Placeholder from './Placeholder';
@@ -69,7 +69,7 @@ const InputEditor = memo<{ defaultRows?: number }>(({ defaultRows = 2 }) => {
     };
   }, [state.isEmpty]);
 
-  const enableRichRender = useUserStore(preferenceSelectors.inputMarkdownRender);
+  const enableRichRender = useUserStore(labPreferSelectors.enableInputMarkdown);
 
   const richRenderProps = useMemo(
     () =>

package/src/locales/default/labs.ts

@@ -1,6 +1,10 @@
 export default {
   desc: '这里会不定期更新我们正在探索的新功能，欢迎试用！',
   features: {
+    assistantMessageGroup: {
+      desc: '将助手消息及其工具调用结果聚合到分组里显示',
+      title: '助手消息聚合分组',
+    },
     groupChat: {
       desc: '启用多智能体群聊编排能力。',
       title: '群聊（多智能体）',

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

@@ -1,7 +1,6 @@
 import {
   CreateMessageParamsSchema,
   CreateNewMessageParamsSchema,
-  UIChatMessage,
   UpdateMessageParamsSchema,
   UpdateMessageRAGParamsSchema,
 } from '@lobechat/types';
@@ -14,8 +13,6 @@ import { authedProcedure, publicProcedure, router } from '@/libs/trpc/lambda';
 import { serverDatabase } from '@/libs/trpc/lambda/middleware';
 import { FileService } from '@/server/services/file';
 
-type ChatMessageList = UIChatMessage[];
-
 const messageProcedure = authedProcedure.use(serverDatabase).use(async (opts) => {
   const { ctx } = opts;
 
@@ -72,22 +69,6 @@ export const messageRouter = router({
       });
     }),
 
-  // TODO: it will be removed in V2
-  getAllMessages: messageProcedure.query(async ({ ctx }): Promise<ChatMessageList> => {
-    return ctx.messageModel.queryAll() as any;
-  }),
-
-  // TODO: it will be removed in V2
-  getAllMessagesInSession: messageProcedure
-    .input(
-      z.object({
-        sessionId: z.string().nullable().optional(),
-      }),
-    )
-    .query(async ({ ctx, input }): Promise<ChatMessageList> => {
-      return ctx.messageModel.queryBySessionId(input.sessionId) as any;
-    }),
-
   getHeatmaps: messageProcedure.query(async ({ ctx }) => {
     return ctx.messageModel.getHeatmaps();
   }),
@@ -101,16 +82,20 @@ export const messageRouter = router({
         pageSize: z.number().optional(),
         sessionId: z.string().nullable().optional(),
         topicId: z.string().nullable().optional(),
+        useGroup: z.boolean().optional(),
       }),
     )
     .query(async ({ input, ctx }) => {
       if (!ctx.userId) return [];
       const serverDB = await getServerDB();
 
+      const { useGroup, ...queryParams } = input;
+
       const messageModel = new MessageModel(serverDB, ctx.userId);
       const fileService = new FileService(serverDB, ctx.userId);
 
-      return messageModel.query(input, {
+      return messageModel.query(queryParams, {
+        groupAssistantMessages: useGroup ?? false,
         postProcessUrl: (path) => fileService.getFullFileUrl(path),
       });
     }),

package/src/services/message/server.ts

@@ -39,16 +39,6 @@ export class ServerService implements IMessageService {
     return data as unknown as UIChatMessage[];
   };
 
-  getAllMessages: IMessageService['getAllMessages'] = async () => {
-    return lambdaClient.message.getAllMessages.query();
-  };
-
-  getAllMessagesInSession: IMessageService['getAllMessagesInSession'] = async (sessionId) => {
-    return lambdaClient.message.getAllMessagesInSession.query({
-      sessionId: this.toDbSessionId(sessionId),
-    });
-  };
-
   countMessages: IMessageService['countMessages'] = async (params) => {
     return lambdaClient.message.count.query(params);
   };

package/src/services/message/type.ts

@@ -21,8 +21,6 @@ export interface IMessageService {
 
   getMessages(sessionId: string, topicId?: string, groupId?: string): Promise<UIChatMessage[]>;
   getGroupMessages(groupId: string, topicId?: string): Promise<UIChatMessage[]>;
-  getAllMessages(): Promise<UIChatMessage[]>;
-  getAllMessagesInSession(sessionId: string): Promise<UIChatMessage[]>;
   countMessages(params?: {
     endDate?: string;
     range?: [string, string];

package/src/store/user/selectors.ts

@@ -1,5 +1,5 @@
 export { authSelectors, userProfileSelectors } from './slices/auth/selectors';
-export { preferenceSelectors } from './slices/preference/selectors';
+export { labPreferSelectors, preferenceSelectors } from './slices/preference/selectors';
 export {
   keyVaultsConfigSelectors,
   settingsSelectors,

package/src/store/user/slices/preference/action.ts

@@ -2,7 +2,7 @@ import type { StateCreator } from 'zustand/vanilla';
 
 import { userService } from '@/services/user';
 import type { UserStore } from '@/store/user';
-import { UserGuide, UserPreference } from '@/types/user';
+import { UserGuide, UserLab, UserPreference } from '@/types/user';
 import { merge } from '@/utils/merge';
 import { setNamespace } from '@/utils/storeDebug';
 
@@ -10,6 +10,7 @@ const n = setNamespace('preference');
 
 export interface PreferenceAction {
   updateGuideState: (guide: Partial<UserGuide>) => Promise<void>;
+  updateLab: (lab: Partial<UserLab>) => Promise<void>;
   updatePreference: (preference: Partial<UserPreference>, action?: any) => Promise<void>;
 }
 
@@ -25,6 +26,12 @@ export const createPreferenceSlice: StateCreator<
     await updatePreference({ guide: nextGuide });
   },
 
+  updateLab: async (lab) => {
+    const { updatePreference } = get();
+    const nextLab = merge(get().preference.lab, lab);
+    await updatePreference({ lab: nextLab }, n('updateLab'));
+  },
+
   updatePreference: async (preference, action) => {
     const nextPreference = merge(get().preference, preference);
 

package/src/store/user/slices/preference/selectors/index.ts

@@ -0,0 +1,2 @@
+export * from './labPrefer';
+export * from './preference';

package/src/store/user/slices/preference/selectors/labPrefer.ts

@@ -0,0 +1,13 @@
+import { DEFAULT_PREFERENCE } from '@lobechat/const';
+
+import type { UserState } from '@/store/user/initialState';
+
+export const labPreferSelectors = {
+  enableAssistantMessageGroup: (s: UserState): boolean =>
+    s.preference.lab?.enableAssistantMessageGroup ??
+    DEFAULT_PREFERENCE.lab!.enableAssistantMessageGroup!,
+  enableGroupChat: (s: UserState): boolean =>
+    s.preference.lab?.enableGroupChat ?? DEFAULT_PREFERENCE.lab!.enableGroupChat!,
+  enableInputMarkdown: (s: UserState): boolean =>
+    s.preference.lab?.enableInputMarkdown ?? DEFAULT_PREFERENCE.lab!.enableInputMarkdown!,
+};

package/src/store/user/slices/preference/{selectors.ts → selectors/preference.ts}

@@ -21,10 +21,8 @@ const shouldTriggerFileInKnowledgeBaseTip = (s: UserStore) =>
 const isPreferenceInit = (s: UserStore) => s.isUserStateInit;
 
 export const preferenceSelectors = {
-  enableGroupChat: (s: UserStore) => s.preference.enableGroupChat || false,
   hideSettingsMoveGuide,
   hideSyncAlert,
-  inputMarkdownRender: (s: UserStore) => !s.preference.disableInputMarkdownRender,
   isPreferenceInit,
   shouldTriggerFileInKnowledgeBaseTip,
   showUploadFileInKnowledgeBaseTip,