@lobehub/lobehub 2.0.0-next.35 → 2.0.0-next.36

package/packages/conversation-flow/src/transformation/FlatListBuilder.ts

@@ -165,18 +165,74 @@ export class FlatListBuilder {
           childMessages,
           this.childrenMap,
         );
-        const userWithBranches = this.createUserMessageWithBranches(message);
+        const activeBranchIndex = childMessages.indexOf(activeBranchId);
+        const userWithBranches = this.createUserMessageWithBranches(
+          message,
+          childMessages.length,
+          activeBranchIndex,
+        );
         flatList.push(userWithBranches);
         processedIds.add(message.id);
 
-        // Continue with active branch and process its message
+        // Continue with active branch - check if it's an assistantGroup
         const activeBranchMsg = this.messageMap.get(activeBranchId);
         if (activeBranchMsg) {
-          flatList.push(activeBranchMsg);
-          processedIds.add(activeBranchId);
-
-          // Continue with active branch's children
-          this.buildFlatListRecursive(activeBranchId, flatList, processedIds, allMessages);
+          // Check if active branch is assistant with tools (should be assistantGroup)
+          if (
+            activeBranchMsg.role === 'assistant' &&
+            activeBranchMsg.tools &&
+            activeBranchMsg.tools.length > 0
+          ) {
+            // Collect the entire assistant group chain
+            const assistantChain: Message[] = [];
+            const allToolMessages: Message[] = [];
+            this.messageCollector.collectAssistantChain(
+              activeBranchMsg,
+              allMessages,
+              assistantChain,
+              allToolMessages,
+              processedIds,
+            );
+
+            // Create assistantGroup virtual message
+            const groupMessage = this.createAssistantGroupMessage(
+              assistantChain[0],
+              assistantChain,
+              allToolMessages,
+            );
+            flatList.push(groupMessage);
+
+            // Mark all as processed
+            assistantChain.forEach((m) => processedIds.add(m.id));
+            allToolMessages.forEach((m) => processedIds.add(m.id));
+
+            // Continue after the assistant chain
+            const lastAssistant = assistantChain.at(-1);
+            const toolIds = new Set(allToolMessages.map((t) => t.id));
+
+            const lastAssistantNonToolChildren = lastAssistant
+              ? this.childrenMap.get(lastAssistant.id)?.filter((childId) => !toolIds.has(childId))
+              : undefined;
+
+            if (
+              lastAssistantNonToolChildren &&
+              lastAssistantNonToolChildren.length > 0 &&
+              lastAssistant
+            ) {
+              this.buildFlatListRecursive(lastAssistant.id, flatList, processedIds, allMessages);
+            } else {
+              for (const toolMsg of allToolMessages) {
+                this.buildFlatListRecursive(toolMsg.id, flatList, processedIds, allMessages);
+              }
+            }
+          } else {
+            // Regular message (not assistantGroup)
+            flatList.push(activeBranchMsg);
+            processedIds.add(activeBranchId);
+
+            // Continue with active branch's children
+            this.buildFlatListRecursive(activeBranchId, flatList, processedIds, allMessages);
+          }
         }
         continue;
       }
@@ -364,58 +420,80 @@ export class FlatListBuilder {
         assistant.tools?.map((tool) => {
           const toolMsg = toolMap.get(tool.id);
           if (toolMsg) {
+            const result: any = {
+              content: toolMsg.content || '',
+              id: toolMsg.id,
+            };
+            if (toolMsg.error) result.error = toolMsg.error;
+            if (toolMsg.pluginState) result.state = toolMsg.pluginState;
+
             return {
               ...tool,
-              result: {
-                content: toolMsg.content || '',
-                error: toolMsg.error,
-                id: toolMsg.id,
-                state: toolMsg.pluginState,
-              },
+              result,
               result_msg_id: toolMsg.id,
             };
           }
           return tool;
         }) || [];
 
-      const { usage: msgUsage, performance: msgPerformance } =
+      // Prefer top-level usage/performance fields, fall back to metadata
+      const { usage: metaUsage, performance: metaPerformance } =
         this.messageTransformer.splitMetadata(assistant.metadata);
+      const msgUsage = assistant.usage || metaUsage;
+      const msgPerformance = assistant.performance || metaPerformance;
 
-      children.push({
+      const childBlock: AssistantContentBlock = {
         content: assistant.content || '',
-        error: assistant.error,
         id: assistant.id,
-        imageList:
-          assistant.imageList && assistant.imageList.length > 0 ? assistant.imageList : undefined,
-        performance: msgPerformance,
-        reasoning: assistant.reasoning || undefined,
-        tools: toolsWithResults.length > 0 ? toolsWithResults : undefined,
-        usage: msgUsage,
-      });
+      } as AssistantContentBlock;
+
+      if (assistant.error) childBlock.error = assistant.error;
+      if (assistant.imageList && assistant.imageList.length > 0)
+        childBlock.imageList = assistant.imageList;
+      if (msgPerformance) childBlock.performance = msgPerformance;
+      if (assistant.reasoning) childBlock.reasoning = assistant.reasoning;
+      if (toolsWithResults.length > 0) childBlock.tools = toolsWithResults;
+      if (msgUsage) childBlock.usage = msgUsage;
+
+      children.push(childBlock);
     }
 
     const aggregated = this.messageTransformer.aggregateMetadata(children);
 
-    return {
+    const result: Message = {
       ...firstAssistant,
       children,
       content: '',
-      imageList: undefined,
-      metadata: undefined,
-      performance: aggregated.performance,
-      reasoning: undefined,
       role: 'assistantGroup' as any,
-      tools: undefined,
-      usage: aggregated.usage,
     };
+
+    // Remove fields that should not be in assistantGroup
+    delete result.imageList;
+    delete result.metadata;
+    delete result.reasoning;
+    delete result.tools;
+
+    // Add aggregated fields if they exist
+    if (aggregated.performance) result.performance = aggregated.performance;
+    if (aggregated.usage) result.usage = aggregated.usage;
+
+    return result;
   }
 
   /**
    * Create user message with branch metadata
    */
-  private createUserMessageWithBranches(user: Message): Message {
-    // Just return the original user message with its metadata.activeBranchId
-    // No need to add extra.branches
-    return { ...user };
+  private createUserMessageWithBranches(
+    user: Message,
+    count: number,
+    activeBranchIndex: number,
+  ): Message {
+    return {
+      ...user,
+      branch: {
+        activeBranchIndex,
+        count,
+      },
+    } as Message;
   }
 }

package/packages/conversation-flow/src/types/flatMessageList.ts

@@ -41,22 +41,10 @@ export type FlatMessageRole =
  */
 export type FlatMessage = UIChatMessage;
 
-/**
- * Branch metadata attached to user messages
- */
-export interface BranchMetadata {
-  /** Active branch message ID */
-  activeId: string;
-  /** All branch message IDs */
-  branchIds: string[];
-}
-
 /**
  * Virtual message extra fields for flat list
  */
 export interface FlatMessageExtra {
-  /** Branch information for user messages with multiple children */
-  branches?: BranchMetadata;
   /** Optional description for groups */
   description?: string;
   /** Group mode for messageGroup and compare virtual messages */

package/packages/conversation-flow/src/{types.ts → types/index.ts}

@@ -16,21 +16,10 @@ export type {
   CompareNode,
   ContextNode,
   MessageNode,
-} from './types/contextTree';
+} from './contextTree';
 
 // Flat Message List Types
-export type {
-  BranchMetadata,
-  FlatMessage,
-  FlatMessageExtra,
-  FlatMessageRole,
-} from './types/flatMessageList';
+export type { FlatMessage, FlatMessageExtra, FlatMessageRole } from './flatMessageList';
 
 // Shared Types
-export type {
-  HelperMaps,
-  IdNode,
-  Message,
-  MessageGroupMetadata,
-  ParseResult,
-} from './types/shared';
+export type { HelperMaps, IdNode, Message, MessageGroupMetadata, ParseResult } from './shared';

package/packages/database/src/models/message.ts

@@ -40,7 +40,6 @@ import {
 } from '../schemas';
 import { LobeChatDatabase } from '../type';
 import { genEndDateWhere, genRangeWhere, genStartDateWhere, genWhere } from '../utils/genWhere';
-import { groupAssistantMessages } from '../utils/groupMessages';
 import { idGenerator } from '../utils/idGenerator';
 
 export class MessageModel {
@@ -227,8 +226,8 @@ export class MessageModel {
             })),
 
           extra: {
-            fromModel: model,
-            fromProvider: provider,
+            model: model,
+            provider: provider,
             translate,
             tts: ttsId
               ? {
@@ -269,9 +268,7 @@ export class MessageModel {
       },
     );
 
-    // Group assistant messages with their tool results
-    const { groupAssistantMessages: useGroup = false } = options;
-    return useGroup ? groupAssistantMessages(mappedMessages) : mappedMessages;
+    return mappedMessages;
   };
 
   findById = async (id: string) => {
@@ -464,8 +461,8 @@ export class MessageModel {
 
   create = async (
     {
-      fromModel,
-      fromProvider,
+      model: fromModel,
+      provider: fromProvider,
       files,
       plugin,
       pluginState,
@@ -771,17 +768,19 @@ export class MessageModel {
     sessionId?: string | null,
     topicId?: string | null,
     groupId?: string | null,
-  ) =>
-    this.db
-      .delete(messages)
-      .where(
-        and(
-          eq(messages.userId, this.userId),
-          this.matchSession(sessionId),
-          this.matchTopic(topicId),
-          this.matchGroup(groupId),
-        ),
-      );
+  ) => {
+    const conditions = [eq(messages.userId, this.userId), this.matchSession(sessionId)];
+
+    // For deletion: only filter by topicId/groupId if explicitly provided
+    if (topicId !== undefined && topicId !== null) {
+      conditions.push(eq(messages.topicId, topicId));
+    }
+    if (groupId !== undefined && groupId !== null) {
+      conditions.push(eq(messages.groupId, groupId));
+    }
+
+    return this.db.delete(messages).where(and(...conditions));
+  };
 
   deleteAllMessages = async () => {
     return this.db.delete(messages).where(eq(messages.userId, this.userId));

package/packages/types/src/aiChat.ts

@@ -9,6 +9,7 @@ export interface SendNewMessage {
   content: string;
   // if message has attached with files, then add files to message and the agent
   files?: string[];
+  parentId?: string;
 }
 
 export interface SendMessageServerParams {
@@ -41,6 +42,7 @@ export const AiSendMessageServerSchema = z.object({
   newUserMessage: z.object({
     content: z.string(),
     files: z.array(z.string()).optional(),
+    parentId: z.string().optional(),
   }),
   sessionId: z.string().optional(),
   threadId: z.string().optional(),

package/packages/types/src/importer.ts

@@ -28,8 +28,8 @@ export interface ImportMessage {
 
   // 扩展字段
   extra?: {
-    fromModel?: string;
-    fromProvider?: string;
+    model?: string;
+    provider?: string;
     // 翻译
     translate?: ChatTranslate | false | null;
     // TTS

package/packages/types/src/message/ui/chat.ts

@@ -13,7 +13,13 @@ import { ChatMessageExtra } from './extra';
 import { ChatFileChunk } from './rag';
 import { ChatVideoItem } from './video';
 
-export type UIMessageRoleType = 'user' | 'system' | 'assistant' | 'tool' | 'supervisor' | 'group';
+export type UIMessageRoleType =
+  | 'user'
+  | 'system'
+  | 'assistant'
+  | 'tool'
+  | 'supervisor'
+  | 'assistantGroup';
 
 export interface ChatFileItem {
   content?: string;
@@ -34,10 +40,20 @@ export interface AssistantContentBlock {
   tools?: ChatToolPayloadWithResult[];
   usage?: ModelUsage;
 }
+interface UIMessageBranch {
+  /** Index of the active branch (0-based) */
+  activeBranchIndex: number;
+  /** Total number of branches */
+  count: number;
+}
 
 export interface UIChatMessage {
   // Group chat fields (alphabetically before other fields)
   agentId?: string | 'supervisor';
+  /**
+   * Branch information for user messages with multiple children
+   */
+  branch?: UIMessageBranch;
   /**
    * children messages for grouped display
    * Used to group tool messages under their parent assistant message

package/packages/types/src/message/ui/extra.ts

@@ -7,8 +7,8 @@ export interface ChatTTS {
 }
 
 export interface ChatMessageExtra {
-  fromModel?: string;
-  fromProvider?: string;
+  model?: string;
+  provider?: string;
   // 翻译
   translate?: ChatTranslate | false | null;
   // TTS

package/packages/types/src/message/ui/params.ts

@@ -16,8 +16,8 @@ export interface CreateMessageParams
   error?: ChatMessageError | null;
   fileChunks?: MessageSemanticSearchChunk[];
   files?: string[];
-  fromModel?: string;
-  fromProvider?: string;
+  model?: string;
+  provider?: string;
   groupId?: string;
   role: CreateMessageRoleType;
   sessionId: string;

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

@@ -35,10 +35,6 @@ export const UserGuideSchema = z.object({
 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
    */

package/packages/utils/src/tokenizer/index.ts

@@ -1,15 +1,7 @@
+import { estimateTokenCount } from 'tokenx';
+
 export const encodeAsync = async (str: string): Promise<number> => {
   if (str.length === 0) return 0;
 
-  // use gpt-tokenizer under 10000 str
-  // use approximation way if large then 10000
-  if (str.length <= 10_000) {
-    const { clientEncodeAsync } = await import('./client');
-
-    return await clientEncodeAsync(str);
-  } else {
-    const { estimatedEncodeAsync } = await import('./estimated');
-
-    return await estimatedEncodeAsync(str);
-  }
+  return estimateTokenCount(str);
 };

package/src/app/[variants]/(main)/chat/components/conversation/features/ChatInput/Desktop/MessageFromUrl.tsx

@@ -8,7 +8,7 @@ import { useChatStore } from '@/store/chat';
 import { useSend } from '../useSend';
 
 const MessageFromUrl = () => {
-  const updateInputMessage = useChatStore((s) => s.updateInputMessage);
+  const updateMessageInput = useChatStore((s) => s.updateMessageInput);
   const { send: sendMessage } = useSend();
   const searchParams = useSearchParams();
 
@@ -21,10 +21,10 @@ const MessageFromUrl = () => {
       const newUrl = `${window.location.pathname}?${params.toString()}`;
       window.history.replaceState({}, '', newUrl);
 
-      updateInputMessage(message);
+      updateMessageInput(message);
       sendMessage();
     }
-  }, [searchParams, updateInputMessage, sendMessage]);
+  }, [searchParams, updateMessageInput, sendMessage]);
 
   return null;
 };

package/src/app/[variants]/(main)/chat/components/conversation/features/ChatInput/V1Mobile/index.tsx

@@ -39,7 +39,7 @@ const MobileChatInput = memo(() => {
   const [loading, value, onInput, onStop] = useChatStore((s) => [
     messageStateSelectors.isAIGenerating(s),
     s.inputMessage,
-    s.updateInputMessage,
+    s.updateMessageInput,
     s.stopGenerateMessage,
   ]);
 

package/src/app/[variants]/(main)/chat/components/conversation/features/ChatInput/V1Mobile/useSend.ts

@@ -16,9 +16,9 @@ export type UseSendMessageParams = Pick<
 >;
 
 export const useSendMessage = () => {
-  const [sendMessage, updateInputMessage] = useChatStore((s) => [
+  const [sendMessage, updateMessageInput] = useChatStore((s) => [
     s.sendMessage,
-    s.updateInputMessage,
+    s.updateMessageInput,
   ]);
   const { analytics } = useAnalytics();
   const checkGeminiChineseWarning = useGeminiChineseWarning();
@@ -66,7 +66,7 @@ export const useSendMessage = () => {
       ...params,
     });
 
-    updateInputMessage('');
+    updateMessageInput('');
     clearChatUploadFileList();
 
     // 获取分析数据

package/src/app/[variants]/(main)/chat/components/conversation/features/ChatInput/useSend.ts

@@ -161,14 +161,14 @@ export const useSendGroupMessage = () => {
   const [
     isContentEmpty,
     sendGroupMessage,
-    updateInputMessage,
+    updateMessageInput,
     stopGenerateMessage,
     isSendButtonDisabledByMessage,
     isCreatingMessage,
   ] = useChatStore((s) => [
     !s.inputMessage,
     s.sendGroupMessage,
-    s.updateInputMessage,
+    s.updateMessageInput,
     s.stopGenerateMessage,
     messageStateSelectors.isSendButtonDisabledByMessage(s),
     messageStateSelectors.isCreatingMessage(s),
@@ -255,7 +255,7 @@ export const useSendGroupMessage = () => {
       mainInputEditor.setExpand(false);
       mainInputEditor.clearContent();
       mainInputEditor.focus();
-      updateInputMessage('');
+      updateMessageInput('');
       // clear mentioned users after sending
       mentionState.clearMentionedUsers();
 
@@ -284,7 +284,7 @@ export const useSendGroupMessage = () => {
       canNotSend,
       fileList,
       clearChatUploadFileList,
-      updateInputMessage,
+      updateMessageInput,
       analytics,
       checkGeminiChineseWarning,
     ],
@@ -314,8 +314,8 @@ export const useSendGroupMessage = () => {
       generating: isSupervisorThinking || isCreatingMessage,
       send: handleSend,
       stop,
-      updateInputMessage,
+      updateMessageInput,
     }),
-    [canNotSend, isSupervisorThinking, isCreatingMessage, handleSend, stop, updateInputMessage],
+    [canNotSend, isSupervisorThinking, isCreatingMessage, handleSend, stop, updateMessageInput],
   );
 };

package/src/app/[variants]/(main)/chat/components/conversation/features/ChatList/Content.tsx

@@ -6,7 +6,7 @@ import { SkeletonList, VirtualizedList } from '@/features/Conversation';
 import WideScreenContainer from '@/features/Conversation/components/WideScreenContainer';
 import { useFetchMessages } from '@/hooks/useFetchMessages';
 import { useChatStore } from '@/store/chat';
-import { chatSelectors } from '@/store/chat/selectors';
+import { displayMessageSelectors } from '@/store/chat/selectors';
 
 import MainChatItem from './ChatItem';
 import Welcome from './WelcomeChatItem';
@@ -16,10 +16,12 @@ interface ListProps {
 }
 
 const Content = memo<ListProps>(({ mobile }) => {
-  const [isCurrentChatLoaded] = useChatStore((s) => [chatSelectors.isCurrentChatLoaded(s)]);
+  const [isCurrentChatLoaded] = useChatStore((s) => [
+    displayMessageSelectors.isCurrentDisplayChatLoaded(s),
+  ]);
 
   useFetchMessages();
-  const data = useChatStore(chatSelectors.mainDisplayChatIDs);
+  const data = useChatStore(displayMessageSelectors.mainDisplayChatIDs);
 
   const itemContent = useCallback(
     (index: number, id: string) => <MainChatItem id={id} index={index} />,

package/src/app/[variants]/(main)/chat/components/conversation/features/ChatList/WelcomeChatItem/AgentWelcome/OpeningQuestions.tsx

@@ -40,7 +40,7 @@ interface OpeningQuestionsProps {
 
 const OpeningQuestions = memo<OpeningQuestionsProps>(({ mobile, questions }) => {
   const { t } = useTranslation('welcome');
-  const [updateInputMessage] = useChatStore((s) => [s.updateInputMessage]);
+  const [updateMessageInput] = useChatStore((s) => [s.updateMessageInput]);
 
   const { styles } = useStyles();
   const { send: sendMessage } = useSend();
@@ -56,7 +56,7 @@ const OpeningQuestions = memo<OpeningQuestionsProps>(({ mobile, questions }) =>
               clickable
               key={question}
               onClick={() => {
-                updateInputMessage(question);
+                updateMessageInput(question);
                 sendMessage({ isWelcomeQuestion: true });
               }}
               paddingBlock={8}

package/src/app/[variants]/(main)/chat/components/conversation/features/ChatList/WelcomeChatItem/GroupWelcome/GroupUsageSuggest.tsx

@@ -77,7 +77,7 @@ const getFallbackActivities = (t: any) => {
 const GroupUsageSuggest = memo<{ mobile?: boolean }>(({ mobile }) => {
   const { t } = useTranslation('welcome');
   const { styles } = useStyles();
-  const { updateInputMessage, send } = useSendGroupMessage();
+  const { updateMessageInput, send } = useSendGroupMessage();
   const templateMatch = useTemplateMatching();
 
   const itemsPerPage = mobile ? 2 : 4;
@@ -139,7 +139,7 @@ const GroupUsageSuggest = memo<{ mobile?: boolean }>(({ mobile }) => {
               horizontal
               key={activityKey}
               onClick={() => {
-                updateInputMessage(prompt);
+                updateMessageInput(prompt);
                 send();
               }}
               variant={'outlined'}

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

@@ -24,13 +24,11 @@ const LabsPage = memo(() => {
   const [
     isPreferenceInit,
     enableInputMarkdown,
-    enableAssistantMessageGroup,
     // enableGroupChat,
     updateLab,
   ] = useUserStore((s) => [
     preferenceSelectors.isPreferenceInit(s),
     labPreferSelectors.enableInputMarkdown(s),
-    labPreferSelectors.enableAssistantMessageGroup(s),
     // labPreferSelectors.enableGroupChat(s),
     s.updateLab,
   ]);
@@ -43,13 +41,6 @@ const LabsPage = memo(() => {
       key: 'enableInputMarkdown',
       title: t('features.inputMarkdown.title'),
     },
-    {
-      checked: enableAssistantMessageGroup,
-      cover: 'https://github.com/user-attachments/assets/ba517751-1f3b-4269-979e-f8471e3ebb89',
-      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',

package/src/features/ChatInput/ActionBar/STT/browser.tsx

@@ -42,9 +42,9 @@ const BrowserSTT = memo<{ mobile?: boolean }>(({ mobile }) => {
   const [error, setError] = useState<ChatMessageError>();
   const { t } = useTranslation('chat');
 
-  const [loading, updateInputMessage] = useChatStore((s) => [
+  const [loading, updateMessageInput] = useChatStore((s) => [
     messageStateSelectors.isAIGenerating(s),
-    s.updateInputMessage,
+    s.updateMessageInput,
   ]);
 
   const setDefaultError = useCallback(
@@ -76,7 +76,7 @@ const BrowserSTT = memo<{ mobile?: boolean }>(({ mobile }) => {
     },
     onTextChange: (text) => {
       if (loading) stop();
-      if (text) updateInputMessage(text);
+      if (text) updateMessageInput(text);
     },
   });
 

package/src/features/ChatInput/ActionBar/STT/openai.tsx

@@ -53,9 +53,9 @@ const OpenaiSTT = memo<{ mobile?: boolean }>(({ mobile }) => {
   const [error, setError] = useState<ChatMessageError>();
   const { t } = useTranslation('chat');
 
-  const [loading, updateInputMessage] = useChatStore((s) => [
+  const [loading, updateMessageInput] = useChatStore((s) => [
     messageStateSelectors.isAIGenerating(s),
-    s.updateInputMessage,
+    s.updateMessageInput,
   ]);
 
   const setDefaultError = useCallback(
@@ -87,7 +87,7 @@ const OpenaiSTT = memo<{ mobile?: boolean }>(({ mobile }) => {
     },
     onTextChange: (text) => {
       if (loading) stop();
-      if (text) updateInputMessage(text);
+      if (text) updateMessageInput(text);
     },
   });