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

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);
     },
   });
 

package/src/features/Conversation/Error/AccessCodeForm.tsx

@@ -19,7 +19,7 @@ const AccessCodeForm = memo<AccessCodeFormProps>(({ id }) => {
     keyVaultsConfigSelectors.password(s),
     s.updateKeyVaults,
   ]);
-  const [resend, deleteMessage] = useChatStore((s) => [s.regenerateMessage, s.deleteMessage]);
+  const [resend, deleteMessage] = useChatStore((s) => [s.delAndRegenerateMessage, s.deleteMessage]);
 
   return (
     <>

package/src/features/Conversation/Error/ChatInvalidApiKey.tsx

@@ -13,7 +13,7 @@ interface ChatInvalidAPIKeyProps {
 const ChatInvalidAPIKey = memo<ChatInvalidAPIKeyProps>(({ id, provider }) => {
   const { t } = useTranslation('modelProvider');
   const { t: modelProviderErrorT } = useTranslation(['modelProvider', 'error']);
-  const [resend, deleteMessage] = useChatStore((s) => [s.regenerateMessage, s.deleteMessage]);
+  const [resend, deleteMessage] = useChatStore((s) => [s.delAndRegenerateMessage, s.deleteMessage]);
   const providerName = useProviderName(provider as GlobalLLMProviderKey);
 
   return (

package/src/features/Conversation/Error/ClerkLogin/index.tsx

@@ -15,7 +15,7 @@ const ClerkLogin = memo<{ id: string }>(({ id }) => {
   const [openSignIn, isSignedIn] = useUserStore((s) => [s.openLogin, s.isSignedIn]);
   const greeting = useGreeting();
   const nickName = useUserStore(userProfileSelectors.nickName);
-  const [resend, deleteMessage] = useChatStore((s) => [s.regenerateMessage, s.deleteMessage]);
+  const [resend, deleteMessage] = useChatStore((s) => [s.delAndRegenerateMessage, s.deleteMessage]);
 
   return (
     <ErrorActionContainer>

package/src/features/Conversation/Error/OAuthForm.tsx

@@ -18,7 +18,7 @@ const OAuthForm = memo<{ id: string }>(({ id }) => {
   const user = useUserStore(userProfileSelectors.userProfile);
   const isOAuthLoggedIn = useUserStore(authSelectors.isLoginWithAuth);
 
-  const [resend, deleteMessage] = useChatStore((s) => [s.regenerateMessage, s.deleteMessage]);
+  const [resend, deleteMessage] = useChatStore((s) => [s.delAndRegenerateMessage, s.deleteMessage]);
 
   const { message, modal } = App.useApp();
 

package/src/features/Conversation/Error/index.tsx

@@ -12,7 +12,6 @@ import { useProviderName } from '@/hooks/useProviderName';
 import ChatInvalidAPIKey from './ChatInvalidApiKey';
 import ClerkLogin from './ClerkLogin';
 import ErrorJsonViewer from './ErrorJsonViewer';
-import InvalidAccessCode from './InvalidAccessCode';
 import { ErrorActionContainer } from './style';
 
 interface ErrorMessageData {
@@ -118,10 +117,6 @@ const ErrorMessageExtra = memo<ErrorExtraProps>(({ data, block }) => {
       return <ClerkLogin id={data.id} />;
     }
 
-    case ChatErrorType.InvalidAccessCode: {
-      return <InvalidAccessCode id={data.id} provider={data.error?.body?.provider} />;
-    }
-
     case AgentRuntimeErrorType.NoOpenAIAPIKey: {
       {
         return <ChatInvalidAPIKey id={data.id} provider={data.error?.body?.provider} />;

package/src/features/Conversation/Messages/Assistant/Actions/index.tsx

@@ -8,7 +8,7 @@ import { useTranslation } from 'react-i18next';
 import ShareMessageModal from '@/features/Conversation/components/ShareMessageModal';
 import { VirtuosoContext } from '@/features/Conversation/components/VirtualizedList/VirtuosoContext';
 import { useChatStore } from '@/store/chat';
-import { threadSelectors } from '@/store/chat/selectors';
+import { messageStateSelectors, threadSelectors } from '@/store/chat/selectors';
 import { useSessionStore } from '@/store/session';
 import { sessionSelectors } from '@/store/session/selectors';
 
@@ -23,9 +23,10 @@ interface AssistantActionsProps {
 }
 export const AssistantActionsBar = memo<AssistantActionsProps>(({ id, data, index }) => {
   const { error, tools } = data;
-  const [isThreadMode, hasThread] = useChatStore((s) => [
+  const [isThreadMode, hasThread, isRegenerating] = useChatStore((s) => [
     !!s.activeThreadId,
     threadSelectors.hasThreadBySourceMsgId(id)(s),
+    messageStateSelectors.isMessageRegenerating(id)(s),
   ]);
   const isGroupSession = useSessionStore(sessionSelectors.isCurrentSessionGroupSession);
   const [showShareModal, setShareModal] = useState(false);
@@ -42,7 +43,7 @@ export const AssistantActionsBar = memo<AssistantActionsProps>(({ id, data, inde
     share,
     tts,
     translate,
-  } = useChatListActionsBar({ hasThread });
+  } = useChatListActionsBar({ hasThread, isRegenerating });
 
   const hasTools = !!tools;
 
@@ -52,17 +53,19 @@ export const AssistantActionsBar = memo<AssistantActionsProps>(({ id, data, inde
   const items = useMemo(() => {
     if (hasTools) return [delAndRegenerate, copy];
 
-    return [edit, copy, inThread || isGroupSession ? null : branching].filter(
-      Boolean,
-    ) as ActionIconGroupItemType[];
-  }, [inThread, hasTools, isGroupSession]);
+    return [
+      edit,
+      copy,
+      // inThread || isGroupSession ? null : branching
+    ].filter(Boolean) as ActionIconGroupItemType[];
+  }, [inThread, hasTools, isGroupSession, delAndRegenerate, copy, edit, branching]);
 
   const { t } = useTranslation('common');
   const searchParams = useSearchParams();
   const topic = searchParams.get('topic');
   const [
     deleteMessage,
-    regenerateMessage,
+    regenerateAssistantMessage,
     translateMessage,
     ttsMessage,
     delAndRegenerateMessage,
@@ -73,7 +76,7 @@ export const AssistantActionsBar = memo<AssistantActionsProps>(({ id, data, inde
     toggleMessageEditing,
   ] = useChatStore((s) => [
     s.deleteMessage,
-    s.regenerateMessage,
+    s.regenerateAssistantMessage,
     s.translateMessage,
     s.ttsMessage,
     s.delAndRegenerateMessage,
@@ -120,7 +123,7 @@ export const AssistantActionsBar = memo<AssistantActionsProps>(({ id, data, inde
         case 'regenerate': {
           if (inPortalThread) {
             resendThreadMessage(id);
-          } else regenerateMessage(id);
+          } else regenerateAssistantMessage(id);
 
           // if this message is an error message, we need to delete it
           if (data.error) deleteMessage(id);

package/src/features/Conversation/Messages/Assistant/Extra/index.test.tsx

@@ -46,20 +46,15 @@ describe('AssistantMessageExtra', () => {
     expect(screen.queryByText('Translate Component')).toBeNull();
   });
 
-  it('should not render content if extra is defined but does not contain fromModel, tts, or translate', async () => {
+  it('should not render content if extra is defined but does not contain model, tts, or translate', async () => {
     render(<AssistantMessageExtra {...mockData} extra={{}} />);
     expect(screen.queryByText('Usage Component')).toBeNull();
     expect(screen.queryByText('TTS Component')).toBeNull();
     expect(screen.queryByText('Translate Component')).toBeNull();
   });
 
-  it('should render Usage component if extra.fromModel exists', async () => {
-    render(
-      <AssistantMessageExtra
-        {...mockData}
-        extra={{ fromModel: 'gpt-4', fromProvider: 'openai' }}
-      />,
-    );
+  it('should render Usage component if extra.model exists', async () => {
+    render(<AssistantMessageExtra {...mockData} extra={{ model: 'gpt-4', provider: 'openai' }} />);
 
     expect(screen.getByText('Usage Component')).toBeInTheDocument();
   });

package/src/features/Conversation/Messages/Assistant/Extra/index.tsx

@@ -24,12 +24,8 @@ export const AssistantMessageExtra = memo<AssistantMessageExtraProps>(
 
     return (
       <Flexbox gap={8} style={{ marginTop: !!tools?.length ? 8 : 4 }}>
-        {content !== LOADING_FLAT && extra?.fromModel && (
-          <Usage
-            metadata={metadata || {}}
-            model={extra?.fromModel}
-            provider={extra.fromProvider!}
-          />
+        {content !== LOADING_FLAT && extra?.model && (
+          <Usage metadata={metadata || {}} model={extra?.model} provider={extra.provider!} />
         )}
         <>
           {!!extra?.tts && (

package/src/features/Conversation/Messages/Assistant/MessageContent.tsx

@@ -58,15 +58,13 @@ export const AssistantMessageContent = memo<
       {isIntentUnderstanding ? (
         <IntentUnderstanding />
       ) : (
-        content && (
-          <DefaultMessage
-            addIdOnDOM={false}
-            content={content}
-            id={id}
-            isToolCallGenerating={isToolCallGenerating}
-            {...props}
-          />
-        )
+        <DefaultMessage
+          addIdOnDOM={false}
+          content={content}
+          id={id}
+          isToolCallGenerating={isToolCallGenerating}
+          {...props}
+        />
       )}
       {showImageItems && <ImageFileListViewer items={imageList} />}
       {tools && (

package/src/features/Conversation/Messages/Assistant/Tool/Inspector/PluginResult.tsx

@@ -2,7 +2,7 @@ import { Highlighter } from '@lobehub/ui';
 import { memo, useMemo } from 'react';
 
 import { useChatStore } from '@/store/chat';
-import { chatSelectors } from '@/store/chat/selectors';
+import { dbMessageSelectors } from '@/store/chat/selectors';
 
 export interface FunctionMessageProps {
   toolCallId: string;
@@ -10,7 +10,7 @@ export interface FunctionMessageProps {
 }
 
 const PluginResult = memo<FunctionMessageProps>(({ toolCallId, variant }) => {
-  const toolMessage = useChatStore(chatSelectors.getMessageByToolCallId(toolCallId));
+  const toolMessage = useChatStore(dbMessageSelectors.getDbMessageByToolCallId(toolCallId));
 
   const { data, language } = useMemo(() => {
     try {