Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
🧱 refactor: Move Message Row Leaves into @librechat/chat (#17523)
Marco Berettac1b977ee9b6d
diff --git a/client/src/components/Chat/Messages/Content/ProgressText.tsx b/client/src/components/Chat/Messages/Content/ProgressText.tsxindex 733fbf947f..6cd03af0c6 100644--- a/client/src/components/Chat/Messages/Content/ProgressText.tsx+++ b/client/src/components/Chat/Messages/Content/ProgressText.tsx@@ -2,6 +2,7 @@ import { useCallback, useRef } from 'react';import { ChevronDown } from 'lucide-react';import { useTranslation } from 'react-i18next';import * as Popover from '@radix-ui/react-popover';+import { ElapsedTimer } from '@librechat/chat/components';import { Button, disclosureChevronVariants } from '@librechat/client';import { isReportableRunStepDuration } from 'librechat-data-provider';import type { ToolCallPhase } from '~/utils/toolCallPhase';@@ -9,7 +10,6 @@ import { cn, getRunStepDurationLabels } from '~/utils';import { useToolPreparation } from './preparation';import CancelledIcon from './CancelledIcon';import { useFailedReveal } from './reveal';-import { ElapsedTimer } from '../Elapsed';import { ROW_GLYPH_SLOT } from './rows';import { useLocalize } from '~/hooks';diff --git a/client/src/components/Chat/Messages/Content/Wakeup.tsx b/client/src/components/Chat/Messages/Content/Wakeup.tsxindex 77606854ef..4ea9aad81b 100644--- a/client/src/components/Chat/Messages/Content/Wakeup.tsx+++ b/client/src/components/Chat/Messages/Content/Wakeup.tsx@@ -1,11 +1,12 @@import { memo, useCallback, useMemo, useState } from 'react';import { Button } from '@librechat/client';-import type { WakeupDisplay, WakeupTask } from './Parts/wakeup';-import type { TranslationKeys } from '~/hooks';-import SystemEventHeader, {+import {+ SystemEventHeader,SystemEventIcon,systemEventHeaderClasses,-} from '~/components/Chat/Messages/ui/SystemEvent';+} from '@librechat/chat/components';+import type { WakeupDisplay, WakeupTask } from './Parts/wakeup';+import type { TranslationKeys } from '~/hooks';import { subagentStatusIcon, subagentStatusLabelKey } from '~/components/Chat/Subagents/status';import { useLocalize, useExpandCollapse, useLazyCollapseBody } from '~/hooks';import { useMessagePartsHost } from '~/Providers/MessagePartsHostContext';diff --git a/client/src/components/Chat/Messages/Content/__tests__/ProgressText.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/ProgressText.test.tsxindex 2bb7abfc29..04b7c23053 100644--- a/client/src/components/Chat/Messages/Content/__tests__/ProgressText.test.tsx+++ b/client/src/components/Chat/Messages/Content/__tests__/ProgressText.test.tsx@@ -3,21 +3,24 @@ import { fireEvent, render, screen } from '@testing-library/react';import { FailedRevealContext } from '../reveal';import ProgressText from '../ProgressText';-jest.mock('~/hooks', () => ({- useLocalize:- () =>- (key: string, values?: Record<string, string | number>): string => {- const translations: Record<string, string> = {- com_ui_duration_seconds: `${values?.[0]}s`,- com_ui_tool_preparation_time: 'Preparation',- com_ui_tool_call_time: 'Tool call',- com_ui_tool_total_time: 'Total elapsed',- com_ui_duration_minutes: `${values?.[0]}m ${values?.[1]}s`,- com_ui_duration_announced_seconds: `took ${values?.value} ${values?.count === 1 ? 'second' : 'seconds'}`,- com_ui_duration_announced_minutes: `took ${values?.value} ${values?.count === 1 ? 'minute' : 'minutes'}`,- };- return translations[key] ?? key;- },+function mockLocalize(key: string, values?: Record<string, string | number>): string {+ const translations: Record<string, string> = {+ com_ui_duration_seconds: `${values?.[0]}s`,+ com_ui_tool_preparation_time: 'Preparation',+ com_ui_tool_call_time: 'Tool call',+ com_ui_tool_total_time: 'Total elapsed',+ com_ui_duration_minutes: `${values?.[0]}m ${values?.[1]}s`,+ com_ui_duration_announced_seconds: `took ${values?.value} ${values?.count === 1 ? 'second' : 'seconds'}`,+ com_ui_duration_announced_minutes: `took ${values?.value} ${values?.count === 1 ? 'minute' : 'minutes'}`,+ };+ return translations[key] ?? key;+}++jest.mock('~/hooks', () => ({ useLocalize: () => mockLocalize }));++jest.mock('@librechat/client', () => ({+ ...jest.requireActual('@librechat/client'),+ useLocalize: () => mockLocalize,}));jest.mock('react-i18next', () => ({diff --git a/client/src/components/Chat/Messages/Content/__tests__/Wakeup.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/Wakeup.test.tsxindex e76b4d31f7..d1f9bf8875 100644--- a/client/src/components/Chat/Messages/Content/__tests__/Wakeup.test.tsx+++ b/client/src/components/Chat/Messages/Content/__tests__/Wakeup.test.tsx@@ -48,6 +48,7 @@ jest.mock('lucide-react', () => ({}));jest.mock('@librechat/client', () => ({+ cn: jest.requireActual('@librechat/client').cn,Button: ({ children, ...props }: React.ComponentProps<'button'>) => (<button {...props}>{children}</button>),diff --git a/client/src/components/Chat/Messages/Feedback.tsx b/client/src/components/Chat/Messages/Feedback.tsxindex 4543dda6f8..113b637beb 100644--- a/client/src/components/Chat/Messages/Feedback.tsx+++ b/client/src/components/Chat/Messages/Feedback.tsx@@ -1,5 +1,6 @@import React, { memo, useState, useCallback, useMemo, useEffect } from 'react';import * as Ariakit from '@ariakit/react';+import { hoverButtonClasses } from '@librechat/chat/components';import { TFeedback, TFeedbackTag, getTagsForRating } from 'librechat-data-provider';import {AlertCircle,@@ -21,7 +22,6 @@ import {ThumbUpIcon,ThumbDownIcon,} from '@librechat/client';-import { hoverButtonClasses } from './styles';import { useLocalize } from '~/hooks';import { cn } from '~/utils';diff --git a/client/src/components/Chat/Messages/Fork.tsx b/client/src/components/Chat/Messages/Fork.tsxindex 80cf73821a..c9a30f547f 100644--- a/client/src/components/Chat/Messages/Fork.tsx+++ b/client/src/components/Chat/Messages/Fork.tsx@@ -4,11 +4,11 @@ import * as Ariakit from '@ariakit/react';import { VisuallyHidden } from '@ariakit/react';import { GitFork, InfoIcon } from 'lucide-react';import { ForkOptions } from 'librechat-data-provider';+import { hoverButtonClasses } from '@librechat/chat/components';import { GitCommit, GitBranchPlus, ListTree } from 'lucide-react';import { Button, Label, Checkbox, useToastContext } from '@librechat/client';import { TranslationKeys, useLocalize, useNavigateToConvo } from '~/hooks';import { useForkConvoMutation } from '~/data-provider';-import { hoverButtonClasses } from './styles';import store from '~/store';interface PopoverButtonProps {diff --git a/client/src/components/Chat/Messages/HoverButtons.tsx b/client/src/components/Chat/Messages/HoverButtons.tsxindex 2a8764e610..5186d7af95 100644--- a/client/src/components/Chat/Messages/HoverButtons.tsx+++ b/client/src/components/Chat/Messages/HoverButtons.tsx@@ -2,6 +2,7 @@ import React, { useState, useMemo, useCallback, memo } from 'react';import { Copy, Check } from 'lucide';import { useAtomValue } from 'jotai';import { useRecoilState } from 'recoil';+import { hoverButtonClasses } from '@librechat/chat/components';import { revealedQueuedTurnFamily } from '@librechat/chat/react';import { getSpeechText, findMessageById, isUserInitiatedCompaction } from 'librechat-data-provider';import {@@ -17,7 +18,6 @@ import { useMessagesIsSubmitting, useOptionalMessagesOperations } from '~/Providimport { useGenerationsByLatest, useLocalize } from '~/hooks';import { hasEditablePart } from './Content/editableParts';import { Fork } from '~/components/Conversations';-import { hoverButtonClasses } from './styles';import MessageAudio from './MessageAudio';import Feedback from './Feedback';import { cn } from '~/utils';diff --git a/client/src/components/Chat/Messages/MessageParts.tsx b/client/src/components/Chat/Messages/MessageParts.tsxindex f5a8f782a6..66f2ad403a 100644--- a/client/src/components/Chat/Messages/MessageParts.tsx+++ b/client/src/components/Chat/Messages/MessageParts.tsx@@ -1,6 +1,15 @@import React, { useMemo } from 'react';import { useAtomValue } from 'jotai';import { useRecoilValue } from 'recoil';+import {+ getHeaderHoverLabel,+ revealOnRowHoverClasses,+ messageFooterClasses,+ Elapsed,+ shouldShowElapsed,+ SiblingSwitch,+ SubRow,+} from '@librechat/chat/components';import type { TMessageContentParts } from 'librechat-data-provider';import type { TMessageProps, TMessageIcon } from '~/common';import {@@ -12,17 +21,12 @@ import {import { useLocalize, useAttachments, useMessageHelpers, useContentMetadata } from '~/hooks';import ResumeAuthorHeader from '~/components/Chat/Messages/Content/Parts/ResumeAuthorHeader';import { ErrorSourceProvider } from '~/components/Messages/Content/Error/source';-import { getHeaderHoverLabel } from '~/components/Chat/Messages/ui/HeaderLabel';-import { revealOnRowHoverClasses, messageFooterClasses } from './styles';import MessageRow from '~/components/Chat/Messages/ui/MessageRow';import MessageIcon from '~/components/Chat/Messages/MessageIcon';import { showThinkingAtom } from '~/store/showThinking';-import Elapsed, { shouldShowElapsed } from './Elapsed';import ContentParts from './Content/ContentParts';-import SiblingSwitch from './SiblingSwitch';import { AuthorContext } from '~/Providers';import HoverButtons from './HoverButtons';-import SubRow from './SubRow';import store from '~/store';/**diff --git a/client/src/components/Chat/Messages/MinimalHoverButtons.tsx b/client/src/components/Chat/Messages/MinimalHoverButtons.tsxindex 257afbe5ea..c99eb3f1c0 100644--- a/client/src/components/Chat/Messages/MinimalHoverButtons.tsx+++ b/client/src/components/Chat/Messages/MinimalHoverButtons.tsx@@ -1,5 +1,6 @@import { useState, useMemo } from 'react';import { Copy, Check } from 'lucide';+import { revealOnRowHoverClasses } from '@librechat/chat/components';import { Button, MorphIcon, TooltipAnchor } from '@librechat/client';import type { TMessage, SearchResultData } from 'librechat-data-provider';import type { MarkdownVariant } from '~/utils/richtext';@@ -9,7 +10,6 @@ import {getMessageClipboardSource,hasCopyableText,} from '~/hooks';-import { revealOnRowHoverClasses } from './styles';import { cn } from '~/utils';type THoverButtons = {diff --git a/client/src/components/Chat/Messages/PendingTurn.tsx b/client/src/components/Chat/Messages/PendingTurn.tsxindex 802a750ac1..4d4018281c 100644--- a/client/src/components/Chat/Messages/PendingTurn.tsx+++ b/client/src/components/Chat/Messages/PendingTurn.tsx@@ -1,7 +1,7 @@import { useCallback, useEffect, useMemo, useRef } from 'react';import { useAtomValue } from 'jotai';import { useRecoilValue } from 'recoil';-import { useQueuedTurnPortal } from '@librechat/chat/components';+import { SubRow, messageFooterClasses, useQueuedTurnPortal } from '@librechat/chat/components';import {hasRevealSuccessor,buildRevealedMessage,@@ -11,7 +11,6 @@ import type { TMessage } from 'librechat-data-provider';import type { RefObject } from 'react';import type { TMessageIcon } from '~/common';import { getHeaderPrefixForScreenReader, getMessageAriaLabel } from '~/utils';-import { messageFooterClasses } from '~/components/Chat/Messages/styles';import MessageRow from '~/components/Chat/Messages/ui/MessageRow';import MessageIcon from '~/components/Chat/Messages/MessageIcon';import { useAuthContext } from '~/hooks/AuthContext';@@ -19,7 +18,6 @@ import MarkdownLite from './Content/MarkdownLite';import { useChatContext } from '~/Providers';import Container from './Content/Container';import { useLocalize } from '~/hooks';-import SubRow from './SubRow';import { cn } from '~/utils';import store from '~/store';diff --git a/client/src/components/Chat/Messages/SearchMessage.tsx b/client/src/components/Chat/Messages/SearchMessage.tsxindex e81eab67c7..45ac4b5fe5 100644--- a/client/src/components/Chat/Messages/SearchMessage.tsx+++ b/client/src/components/Chat/Messages/SearchMessage.tsx@@ -1,10 +1,10 @@import { memo, useMemo } from 'react';import { useRecoilValue } from 'recoil';+import { getHeaderModelName, SubRow } from '@librechat/chat/components';import type { TMessage } from 'librechat-data-provider';import type { TMessageProps, TMessageIcon } from '~/common';import AuthorHeader from '~/components/Chat/Messages/Content/Parts/AuthorHeader';import MinimalHoverButtons from '~/components/Chat/Messages/MinimalHoverButtons';-import { getHeaderModelName } from '~/components/Chat/Messages/ui/HeaderLabel';import { getMessageRowWidthClass } from '~/components/Chat/Messages/ui/width';import { getHeaderPrefixForScreenReader, getMessageAriaLabel } from '~/utils';import SearchContent, { rendersMarkdownLite } from './Content/SearchContent';@@ -12,7 +12,6 @@ import MessageRow from '~/components/Chat/Messages/ui/MessageRow';import Icon from '~/components/Chat/Messages/MessageIcon';import { useAuthContext, useLocalize } from '~/hooks';import SearchButtons from './SearchButtons';-import SubRow from './SubRow';import { cn } from '~/utils';import store from '~/store';diff --git a/client/src/components/Chat/Messages/__tests__/HoverActions.streaming.spec.tsx b/client/src/components/Chat/Messages/__tests__/HoverActions.streaming.spec.tsxindex 248e9c70a3..78bae88ae6 100644--- a/client/src/components/Chat/Messages/__tests__/HoverActions.streaming.spec.tsx+++ b/client/src/components/Chat/Messages/__tests__/HoverActions.streaming.spec.tsx@@ -59,6 +59,11 @@ jest.mock('~/components/Chat/Messages/MessageIcon', () => ({default: () => <div data-testid="message-icon" />,}));+jest.mock('@librechat/client', () => ({+ ...jest.requireActual('@librechat/client'),+ useLocalize: () => (key: string) => key,+}));+jest.mock('~/hooks', () => {const useMessageProcess = jest.requireActual('~/hooks/Messages/useMessageProcess').default;const useMemoizedChatContext = jest.requireActual(diff --git a/client/src/components/Chat/Messages/ui/MessageRender.tsx b/client/src/components/Chat/Messages/ui/MessageRender.tsxindex f638d393ab..f6025abbbb 100644--- a/client/src/components/Chat/Messages/ui/MessageRender.tsx+++ b/client/src/components/Chat/Messages/ui/MessageRender.tsx@@ -1,5 +1,14 @@import React, { useCallback, useMemo, memo } from 'react';import { useRecoilValue } from 'recoil';+import {+ revealOnRowHoverClasses,+ messageFooterClasses,+ Elapsed,+ shouldShowElapsed,+ getHeaderHoverLabel,+ SiblingSwitch,+ SubRow,+} from '@librechat/chat/components';import type { TMessage } from 'librechat-data-provider';import type { TMessageProps, TMessageIcon, TMessageChatContext } from '~/common';import {@@ -9,19 +18,14 @@ import {areMessageFieldsEqual,getHeaderPrefixForScreenReader,} from '~/utils';-import { revealOnRowHoverClasses, messageFooterClasses } from '~/components/Chat/Messages/styles';import { parseWakeupMessage } from '~/components/Chat/Messages/Content/Parts/wakeup';-import Elapsed, { shouldShowElapsed } from '~/components/Chat/Messages/Elapsed';-import { getHeaderHoverLabel } from '~/components/Chat/Messages/ui/HeaderLabel';import MessageContent from '~/components/Chat/Messages/Content/MessageContent';import { useLocalize, useMessageActions, useContentMetadata } from '~/hooks';-import SiblingSwitch from '~/components/Chat/Messages/SiblingSwitch';import { PrivateText } from '~/components/Chat/Messages/PrivateText';import HoverButtons from '~/components/Chat/Messages/HoverButtons';import MessageRow from '~/components/Chat/Messages/ui/MessageRow';import MessageIcon from '~/components/Chat/Messages/MessageIcon';import Wakeup from '~/components/Chat/Messages/Content/Wakeup';-import SubRow from '~/components/Chat/Messages/SubRow';import { MessageContext } from '~/Providers';import WakeupRow from './WakeupRow';import store from '~/store';diff --git a/client/src/components/Chat/Messages/ui/MessageRow.tsx b/client/src/components/Chat/Messages/ui/MessageRow.tsxindex 0080cbc30a..17d3e2741b 100644--- a/client/src/components/Chat/Messages/ui/MessageRow.tsx+++ b/client/src/components/Chat/Messages/ui/MessageRow.tsx@@ -1,10 +1,10 @@import { Zap } from 'lucide-react';import { ContentTypes } from 'librechat-data-provider';+import { HeaderLabel } from '@librechat/chat/components';import type { TMessage } from 'librechat-data-provider';import type { ReactNode } from 'react';import MessageTimestamp from './MessageTimestamp';import { getMessageRowWidthClass } from './width';-import HeaderLabel from './HeaderLabel';import Files from '../Content/Files';import { cn } from '~/utils';diff --git a/client/src/components/Chat/Messages/ui/__tests__/MessageRender.wakeup.spec.tsx b/client/src/components/Chat/Messages/ui/__tests__/MessageRender.wakeup.spec.tsxindex 7e46a29ff2..7d8c4cb631 100644--- a/client/src/components/Chat/Messages/ui/__tests__/MessageRender.wakeup.spec.tsx+++ b/client/src/components/Chat/Messages/ui/__tests__/MessageRender.wakeup.spec.tsx@@ -63,9 +63,9 @@ jest.mock('~/components/Chat/Messages/HoverButtons', () => ({__esModule: true,default: () => null,}));-jest.mock('~/components/Chat/Messages/SiblingSwitch', () => ({- __esModule: true,- default: ({ className }: { className?: string }) => (+jest.mock('@librechat/chat/components', () => ({+ ...jest.requireActual('@librechat/chat/components'),+ SiblingSwitch: ({ className }: { className?: string }) => (<span data-testid="sibling-footer" className={className} />),}));diff --git a/client/src/components/Chat/Subagents/SubagentConversation.tsx b/client/src/components/Chat/Subagents/SubagentConversation.tsxindex a492476ca8..53b1076097 100644--- a/client/src/components/Chat/Subagents/SubagentConversation.tsx+++ b/client/src/components/Chat/Subagents/SubagentConversation.tsx@@ -8,6 +8,13 @@ import {CollapsibleContent,CollapsibleTrigger,} from '@librechat/client';+import {+ SystemEventHeader,+ SystemEventIcon,+ systemEventHeaderClasses,+ messageFooterClasses,+ ElapsedTimer,+} from '@librechat/chat/components';import type { TMessage, TMessageContentParts } from 'librechat-data-provider';import type { ReactNode } from 'react';import type { ToolContentQuery } from '~/components/Chat/Messages/Content/disclosure';@@ -21,10 +28,6 @@ import {useSubagentTaskContentQuery,useSubagentToolContentQuery,} from '~/data-provider/Subagents/content';-import SystemEventHeader, {- SystemEventIcon,- systemEventHeaderClasses,-} from '~/components/Chat/Messages/ui/SystemEvent';import { MessagePartsHostProvider, useMessagePartsHost } from '~/Providers/MessagePartsHostContext';import { SubagentActivityContent, SubagentStatus, getActivityContent } from './SubagentActivity';import ResumeAuthorHeader from '~/components/Chat/Messages/Content/Parts/ResumeAuthorHeader';@@ -33,9 +36,7 @@ import { ErrorSourceProvider } from '~/components/Messages/Content/Error/source'import MinimalHoverButtons from '~/components/Chat/Messages/MinimalHoverButtons';import ContentParts from '~/components/Chat/Messages/Content/ContentParts';import { isAbnormalTerminalStatus, isLiveSubagentStatus } from './status';-import { messageFooterClasses } from '~/components/Chat/Messages/styles';import MessageRow from '~/components/Chat/Messages/ui/MessageRow';-import { ElapsedTimer } from '~/components/Chat/Messages/Elapsed';import { AuthorContext } from '~/Providers/AuthorContext';import { ChatContext } from '~/Providers/ChatContext';import { isEmptyContentPart } from '~/utils/messages';diff --git a/client/src/components/Chat/Subagents/author.tsx b/client/src/components/Chat/Subagents/author.tsxindex 91971d541e..04361280a0 100644--- a/client/src/components/Chat/Subagents/author.tsx+++ b/client/src/components/Chat/Subagents/author.tsx@@ -1,9 +1,9 @@import { useMemo, useSyncExternalStore } from 'react';import { useQueryClient } from '@tanstack/react-query';+import { isDocumentId } from '@librechat/chat/components';import { EModelEndpoint, QueryKeys, ContentTypes } from 'librechat-data-provider';import type { Agent, TMessage } from 'librechat-data-provider';import type { ReactNode } from 'react';-import { isDocumentId } from '~/components/Chat/Messages/ui/HeaderLabel';import MessageIcon from '~/components/Chat/Messages/MessageIcon';import { useAgentsMapContext } from '~/Providers';import { findSubagentDispatch } from './dispatch';diff --git a/client/src/components/Messages/ContentRender.tsx b/client/src/components/Messages/ContentRender.tsxindex e8484f6f0b..a0f48e4941 100644--- a/client/src/components/Messages/ContentRender.tsx+++ b/client/src/components/Messages/ContentRender.tsx@@ -2,6 +2,15 @@ import { useCallback, useMemo, memo } from 'react';import { useAtomValue } from 'jotai';import { useRecoilValue } from 'recoil';import { Constants } from 'librechat-data-provider';+import {+ revealOnRowHoverClasses,+ messageFooterClasses,+ Elapsed,+ shouldShowElapsed,+ getHeaderHoverLabel,+ SiblingSwitch,+ SubRow,+} from '@librechat/chat/components';import type { TMessage, TMessageContentParts } from 'librechat-data-provider';import type { TMessageProps, TMessageIcon, TMessageChatContext } from '~/common';import {@@ -11,21 +20,16 @@ import {areMessageFieldsEqual,getHeaderPrefixForScreenReader,} from '~/utils';-import { revealOnRowHoverClasses, messageFooterClasses } from '~/components/Chat/Messages/styles';import { useLocalize, useAttachments, useMessageActions, useContentMetadata } from '~/hooks';import ResumeAuthorHeader from '~/components/Chat/Messages/Content/Parts/ResumeAuthorHeader';import ToolCallLimitNotice from '~/components/Chat/Messages/Content/ToolCallLimitNotice';import { ErrorSourceProvider } from '~/components/Messages/Content/Error/source';-import Elapsed, { shouldShowElapsed } from '~/components/Chat/Messages/Elapsed';-import { getHeaderHoverLabel } from '~/components/Chat/Messages/ui/HeaderLabel';import ContentParts from '~/components/Chat/Messages/Content/ContentParts';import { PrivateText } from '~/components/Chat/Messages/PrivateText';-import SiblingSwitch from '~/components/Chat/Messages/SiblingSwitch';import HoverButtons from '~/components/Chat/Messages/HoverButtons';import MessageRow from '~/components/Chat/Messages/ui/MessageRow';import MessageIcon from '~/components/Chat/Messages/MessageIcon';import { showThinkingAtom } from '~/store/showThinking';-import SubRow from '~/components/Chat/Messages/SubRow';import { AuthorContext } from '~/Providers';import store from '~/store';diff --git a/client/src/components/Messages/__tests__/ContentRender.tail.spec.tsx b/client/src/components/Messages/__tests__/ContentRender.tail.spec.tsxindex dcf006b7ed..7ddd387fbd 100644--- a/client/src/components/Messages/__tests__/ContentRender.tail.spec.tsx+++ b/client/src/components/Messages/__tests__/ContentRender.tail.spec.tsx@@ -43,9 +43,9 @@ jest.mock('~/components/Chat/Messages/MessageIcon', () => ({default: () => null,}));-jest.mock('~/components/Chat/Messages/Elapsed', () => ({- __esModule: true,- default: () => null,+jest.mock('@librechat/chat/components', () => ({+ ...jest.requireActual('@librechat/chat/components'),+ Elapsed: () => null,shouldShowElapsed: () => false,}));diff --git a/client/src/components/Messages/__tests__/ProtectedAttachments.spec.tsx b/client/src/components/Messages/__tests__/ProtectedAttachments.spec.tsxindex 7a106d303e..b6c6d43f17 100644--- a/client/src/components/Messages/__tests__/ProtectedAttachments.spec.tsx+++ b/client/src/components/Messages/__tests__/ProtectedAttachments.spec.tsx@@ -39,13 +39,10 @@ jest.mock('~/components/Chat/Messages/HoverButtons', () => ({__esModule: true,default: () => null,}));-jest.mock('~/components/Chat/Messages/SiblingSwitch', () => ({- __esModule: true,- default: () => null,-}));-jest.mock('~/components/Chat/Messages/Elapsed', () => ({- __esModule: true,- default: () => null,+jest.mock('@librechat/chat/components', () => ({+ ...jest.requireActual('@librechat/chat/components'),+ SiblingSwitch: () => null,+ Elapsed: () => null,shouldShowElapsed: () => false,}));diff --git a/client/src/components/Share/Message.tsx b/client/src/components/Share/Message.tsxindex f482f62d60..7fcd53997d 100644--- a/client/src/components/Share/Message.tsx+++ b/client/src/components/Share/Message.tsx@@ -1,4 +1,5 @@import { useMemo } from 'react';+import { getHeaderHoverLabel, SiblingSwitch, SubRow } from '@librechat/chat/components';import type { TMessageProps } from '~/common';import SearchContent, {rendersMarkdownLite,@@ -6,15 +7,12 @@ import SearchContent, {import { parseWakeupMessage } from '~/components/Chat/Messages/Content/Parts/wakeup';import AuthorHeader from '~/components/Chat/Messages/Content/Parts/AuthorHeader';import MinimalHoverButtons from '~/components/Chat/Messages/MinimalHoverButtons';-import { getHeaderHoverLabel } from '~/components/Chat/Messages/ui/HeaderLabel';import MessageContent from '~/components/Chat/Messages/Content/MessageContent';import { getHeaderPrefixForScreenReader, getMessageAriaLabel } from '~/utils';-import SiblingSwitch from '~/components/Chat/Messages/SiblingSwitch';import MessageRow from '~/components/Chat/Messages/ui/MessageRow';import WakeupRow from '~/components/Chat/Messages/ui/WakeupRow';import Wakeup from '~/components/Chat/Messages/Content/Wakeup';import { MessageContext, useShareContext } from '~/Providers';-import SubRow from '~/components/Chat/Messages/SubRow';import { useAttachments, useLocalize } from '~/hooks';import MultiMessage from './MultiMessage';import Icon from './MessageIcon';diff --git a/client/src/utils/runStepDuration.ts b/client/src/utils/runStepDuration.tsindex 170ee041d0..ede5fb0836 100644--- a/client/src/utils/runStepDuration.ts+++ b/client/src/utils/runStepDuration.ts@@ -1,130 +1,3 @@-import type { TranslationKeys } from '~/hooks/useLocalize';--const MS_PER_SECOND = 1000;-const SECONDS_PER_MINUTE = 60;-/** Below this, a decimal carries real information (1.4s reads differently from- * 1.9s). Above it, the tenth is noise on a number the reader is only- * skimming, and it makes the label jitter by a character as it settles. */-const DECIMAL_PRECISION_BELOW_SECONDS = 10;--/** What a duration should render as, in both of the places it is presented. */-export interface RunStepDurationLabels {- /** Compact form for the visible label, e.g. `1.4s`, `12s`, `2m 5s`. */- key: TranslationKeys;- values: Record<string, string | number>;- /** Spoken form for assistive technology, e.g. "took 1.4 seconds". */- announcedKey: TranslationKeys;- announcedValues: Record<string, string | number>;-}--/**- * Every interpolated number goes through this, not just the fractional one:- * a raw JS number hardcodes en-US conventions into every locale — the- * decimal point ("1.4s" where the convention is "1,4 s") and the digits- * themselves (Arabic and Persian locales write localized digits, which a raw- * `1` silently reverts to ASCII). Translators cannot fix a number formatted- * in code, so it is formatted per-locale here, following `MessageTimestamp`'s- * pattern of threading `i18n.language` into the util. The guard covers- * malformed language tags, which `Intl` throws on.- */-function formatDurationValue(value: number, language?: string): string {- try {- return new Intl.NumberFormat(language, { maximumFractionDigits: 1 }).format(value);- } catch {- return String(value);- }-}--/**- * Resolve the localization keys and interpolation values for a run-step- * duration.- *- * Returns keys rather than strings so the caller localizes once, at the point- * of render, and so this stays testable without a translation context.- *- * The visible and announced forms are produced together, deliberately: they- * are the same fact presented twice, and deriving them apart is exactly how- * the tool cards drifted before (see the label/announcement split called out- * in AI-1810). The announced form rounds to whole minutes above a minute —- * the precise value stays on the button, which assistive technology reads- * when the reader navigates to it.- */-export function getRunStepDurationLabels(- durationMs: number,- language?: string,-): RunStepDurationLabels {- const totalSeconds = durationMs / MS_PER_SECOND;-- /** Branch on the rounded value, not the raw one, so 59.6s renders as- * `1m 0s` rather than the nonsensical `60s`. */- if (Math.round(totalSeconds) < SECONDS_PER_MINUTE) {- const seconds =- totalSeconds < DECIMAL_PRECISION_BELOW_SECONDS- ? Number(totalSeconds.toFixed(1))- : Math.round(totalSeconds);- /** Plural selection stays on the numeric value; only the interpolated- * text is locale-formatted. */- const formatted = formatDurationValue(seconds, language);- return {- key: 'com_ui_duration_seconds',- values: { 0: formatted },- /** The base key with a numeric `count` lets i18next pick each locale's- * plural form; `value` carries the locale-formatted number. */- announcedKey: 'com_ui_duration_announced_seconds',- announcedValues: { count: seconds, value: formatted },- };- }-- const wholeSeconds = Math.round(totalSeconds);- const minutes = Math.floor(wholeSeconds / SECONDS_PER_MINUTE);- const seconds = wholeSeconds % SECONDS_PER_MINUTE;- const announcedMinutes = Math.round(totalSeconds / SECONDS_PER_MINUTE);- return {- key: 'com_ui_duration_minutes',- values: {- 0: formatDurationValue(minutes, language),- 1: formatDurationValue(seconds, language),- },- announcedKey: 'com_ui_duration_announced_minutes',- announcedValues: {- count: announcedMinutes,- value: formatDurationValue(announcedMinutes, language),- },- };-}--/**- * The streaming elapsed indicator's variant of the duration labels: the same- * locale-formatted visible form, with the spoken form phrased for a run still- * in progress ("5 seconds elapsed") rather than a settled one ("took 5- * seconds"). Produced here, beside `getRunStepDurationLabels`, so both forms- * keep sharing one per-locale number formatter.- */-export function getElapsedDurationLabels(- durationMs: number,- language?: string,-): RunStepDurationLabels {- const { key, values } = getRunStepDurationLabels(durationMs, language);- const totalSeconds = durationMs / MS_PER_SECOND;-- if (Math.round(totalSeconds) < SECONDS_PER_MINUTE) {- const seconds = Math.round(totalSeconds);- return {- key,- values,- announcedKey: 'com_ui_elapsed_announced_seconds',- announcedValues: { count: seconds, value: formatDurationValue(seconds, language) },- };- }-- const announcedMinutes = Math.round(totalSeconds / SECONDS_PER_MINUTE);- return {- key,- values,- announcedKey: 'com_ui_elapsed_announced_minutes',- announcedValues: {- count: announcedMinutes,- value: formatDurationValue(announcedMinutes, language),- },- };-}+/** The duration labels moved into `@librechat/chat`; kept here so `~/utils` keeps serving them. */+export { getRunStepDurationLabels, getElapsedDurationLabels } from '@librechat/chat/components';+export type { RunStepDurationLabels } from '@librechat/chat/components';diff --git a/e2e/specs/mock/scenarios/message-row-leaves.spec.ts b/e2e/specs/mock/scenarios/message-row-leaves.spec.tsnew file mode 100644index 0000000000..7202b7aef2--- /dev/null+++ b/e2e/specs/mock/scenarios/message-row-leaves.spec.ts@@ -0,0 +1,101 @@+import { expect, test } from '@playwright/test';+import type { Page } from '@playwright/test';+import {+ MOCK_ENDPOINTS,+ NEW_CHAT_PATH,+ isAgentGenerationStart,+ selectMockEndpoint,+ sendMessage,+} from '../helpers';++/** Rows built from the message leaves `@librechat/chat` now serves: sibling navigation, the+ * streaming elapsed reading, and the header label. */++const uniqueLabel = (name: string) => `${name}-${Date.now()}-${Math.floor(Math.random() * 1e6)}`;++const messagesView = (page: Page) => page.getByTestId('messages-view');+const messageRender = (page: Page, text: string) =>+ page.locator('.message-render').filter({ hasText: text }).last();++async function openMockChat(page: Page) {+ await page.goto(NEW_CHAT_PATH, { timeout: 10000 });+ await selectMockEndpoint(page, MOCK_ENDPOINTS[0]);+}++async function sendAndExpectReply(page: Page, prompt: string, reply: string) {+ const response = await sendMessage(page, prompt);+ expect(response.ok()).toBeTruthy();+ await expect(messagesView(page).getByText(reply)).toBeVisible({ timeout: 30000 });+}++test.describe('message row leaves', () => {+ test.setTimeout(120000);++ test('sibling navigation pages between a reply and its regeneration @scenario:sibling-switch-pages-regenerated-replies', async ({+ page,+ }) => {+ const label = uniqueLabel('leaves-sibling');+ const firstReply = `E2E counted reply ${label} #1`;+ const regeneratedReply = `E2E counted reply ${label} #2`;++ await openMockChat(page);+ await sendAndExpectReply(page, `E2E_COUNTED_REPLY:${label}`, firstReply);++ const first = messageRender(page, firstReply);+ await first.hover();+ await Promise.all([+ page.waitForResponse(isAgentGenerationStart, { timeout: 30000 }),+ first.getByRole('button', { name: 'Regenerate', exact: true }).last().click(),+ ]);+ await expect(messagesView(page).getByText(regeneratedReply)).toBeVisible({ timeout: 30000 });++ const regenerated = messageRender(page, regeneratedReply);+ await regenerated.hover();+ const navigation = regenerated.getByRole('navigation', { name: 'Sibling message navigation' });+ await expect(navigation).toBeVisible();+ await expect(navigation).toContainText('2 / 2');++ await navigation.getByRole('button', { name: 'Previous sibling message' }).click();+ await expect(messagesView(page).getByText(firstReply)).toBeVisible();+ await expect(messagesView(page).getByText(regeneratedReply)).toBeHidden();++ const back = messageRender(page, firstReply);+ await back.hover();+ const firstNavigation = back.getByRole('navigation', { name: 'Sibling message navigation' });+ await expect(firstNavigation).toContainText('1 / 2');+ await firstNavigation.getByRole('button', { name: 'Next sibling message' }).focus();+ await page.keyboard.press('Enter');+ await expect(messagesView(page).getByText(regeneratedReply)).toBeVisible();+ });++ test('a streaming reply shows an elapsed reading that clears when it settles @scenario:streaming-footer-shows-elapsed-reading', async ({+ page,+ }) => {+ const label = uniqueLabel('leaves-elapsed');++ await openMockChat(page);+ const response = await sendMessage(page, `E2E_SLOW_REPLY:${label}`);+ expect(response.ok()).toBeTruthy();++ const reading = messagesView(page).getByTestId('stream-elapsed');+ await expect(reading).toBeVisible({ timeout: 30000 });+ await expect(reading).toHaveText(/^\d+(\.\d)?s$/);+ await expect(messagesView(page).getByText(`E2E slow reply ${label}`)).toBeVisible({+ timeout: 60000,+ });+ await expect(reading).toBeHidden({ timeout: 60000 });+ });++ test('an assistant reply is headed by its endpoint label @scenario:message-header-shows-endpoint-label', async ({+ page,+ }) => {+ const label = uniqueLabel('leaves-header');+ const reply = `E2E reply ${label}`;++ await openMockChat(page);+ await sendAndExpectReply(page, `E2E_REPLY:${label}`, reply);++ const row = messageRender(page, reply);+ await expect(row.getByText(MOCK_ENDPOINTS[0].label, { exact: true }).first()).toBeVisible();+ });+});diff --git a/eslint-suppressions.json b/eslint-suppressions.jsonindex 4ea877ba84..229194fe08 100644--- a/eslint-suppressions.json+++ b/eslint-suppressions.json@@ -498,21 +498,6 @@"count": 1}},- "client/src/components/Chat/Messages/SiblingSwitch.tsx": {- "shadcn/no-restyle": {- "count": 2- }- },- "client/src/components/Chat/Messages/styles.ts": {- "shadcn/no-arbitrary-values": {- "count": 1- }- },- "client/src/components/Chat/Messages/ui/HeaderLabel.tsx": {- "shadcn/no-arbitrary-values": {- "count": 5- }- },"client/src/components/Chat/Messages/ui/MessageRow.tsx": {"shadcn/no-arbitrary-values": {"count": 1@@ -1434,6 +1419,21 @@"count": 1}},+ "packages/chat/src/components/messages/HeaderLabel.tsx": {+ "shadcn/no-arbitrary-values": {+ "count": 5+ }+ },+ "packages/chat/src/components/messages/SiblingSwitch.tsx": {+ "shadcn/no-restyle": {+ "count": 2+ }+ },+ "packages/chat/src/components/messages/styles.ts": {+ "shadcn/no-arbitrary-values": {+ "count": 1+ }+ },"packages/client/src/components/Badge.tsx": {"design/disabled-recipe": {"count": 1diff --git a/eslint.config.mjs b/eslint.config.mjsindex 5d21742aa8..c1590c9d88 100644--- a/eslint.config.mjs+++ b/eslint.config.mjs@@ -356,6 +356,8 @@ export default ['submitting','result-streaming','result-thinking',+ 'shimmer',+ 'tool-status-text',],},],diff --git a/packages/chat/src/__tests__/locales.spec.ts b/packages/chat/src/__tests__/locales.spec.tsindex 52df4cf4e8..cba4222d57 100644--- a/packages/chat/src/__tests__/locales.spec.ts+++ b/packages/chat/src/__tests__/locales.spec.ts@@ -26,6 +26,8 @@ describe('@librechat/chat localization keys', () => {),);expect(used.size).toBeGreaterThan(0);- expect([...used].filter((key) => !(key in translations))).toEqual([]);+ /** A key passed with a `count` resolves through its plural forms, so its `_one` form defines it. */+ const defined = (key: string): boolean => key in translations || `${key}_one` in translations;+ expect([...used].filter((key) => !defined(key))).toEqual([]);});});diff --git a/packages/chat/src/components.ts b/packages/chat/src/components.tsindex 06cc9959cd..14aa0b59e8 100644--- a/packages/chat/src/components.ts+++ b/packages/chat/src/components.ts@@ -33,3 +33,23 @@ export type { ComposerSubmitRoute } from './components/composer/submit';export type { MentionItemProps } from './components/composer/MentionItem';export type { ChipProps as ComposerChipProps } from './components/composer/bar/Chip';export type { SteerReceiptState } from './components/composer/steering/Receipt';++/** Message list building blocks: rows, headers, sibling navigation and the streaming timer. */+export { default as SubRow } from './components/messages/SubRow';+export { default as SiblingSwitch } from './components/messages/SiblingSwitch';+export { default as SystemEventHeader } from './components/messages/SystemEvent';+export { SystemEventIcon, systemEventHeaderClasses } from './components/messages/SystemEvent';+export { default as Elapsed, ElapsedTimer, shouldShowElapsed } from './components/messages/Elapsed';+export {+ default as HeaderLabel,+ isDocumentId,+ getHeaderModelName,+ getHeaderHoverLabel,+} from './components/messages/HeaderLabel';+export {+ hoverButtonClasses,+ messageFooterClasses,+ revealOnRowHoverClasses,+} from './components/messages/styles';+export { getRunStepDurationLabels, getElapsedDurationLabels } from './components/messages/duration';+export type { RunStepDurationLabels } from './components/messages/duration';diff --git a/client/src/components/Chat/Messages/Elapsed.tsx b/packages/chat/src/components/messages/Elapsed.tsxsimilarity index 84%rename from client/src/components/Chat/Messages/Elapsed.tsxrename to packages/chat/src/components/messages/Elapsed.tsxindex d682a84c57..d67f2e7670 100644--- a/client/src/components/Chat/Messages/Elapsed.tsx+++ b/packages/chat/src/components/messages/Elapsed.tsx@@ -1,9 +1,9 @@import { memo, useEffect, useState } from 'react';import { useAtomValue } from 'jotai';-import { useTranslation } from 'react-i18next';-import { submissionStartFamily } from '@librechat/chat/react';-import { getElapsedDurationLabels } from '~/utils';-import { useLocalize } from '~/hooks';+import { useLocalize, useLanguage } from '@librechat/client';+import type { NamedExoticComponent } from 'react';+import { submissionStartFamily } from '../../react/generation';+import { getElapsedDurationLabels } from './duration';const elapsedSeconds = (start: number): number =>Math.max(0, Math.floor((Date.now() - start) / 1000));@@ -48,7 +48,11 @@ export const shouldShowElapsed = ({* only ever renders mid-generation (see `shouldShowElapsed`), so there is no* settled state for the animation to misrepresent.*/-const Elapsed = memo(function Elapsed({ index }: { index: number }) {+const Elapsed: NamedExoticComponent<{ index: number }> = memo(function Elapsed({+ index,+}: {+ index: number;+}) {const submissionStart = useAtomValue(submissionStartFamily(index));return <ElapsedTimer start={submissionStart ?? undefined} />;});@@ -56,9 +60,13 @@ const Elapsed = memo(function Elapsed({ index }: { index: number }) {/** The bare ticker behind `Elapsed`, for surfaces whose start time does not* come from the chat submission store (e.g. subagent turns started by their* trigger). Falls back to mount time when no start is known. */-export const ElapsedTimer = memo(function ElapsedTimer({ start: startAt }: { start?: number }) {+export const ElapsedTimer: NamedExoticComponent<{ start?: number }> = memo(function ElapsedTimer({+ start: startAt,+}: {+ start?: number;+}) {const localize = useLocalize();- const { i18n } = useTranslation();+ const language = useLanguage();const [mountTime] = useState(() => Date.now());const start = startAt ?? mountTime;const [seconds, setSeconds] = useState(() => elapsedSeconds(start));@@ -69,7 +77,7 @@ export const ElapsedTimer = memo(function ElapsedTimer({ start: startAt }: { stareturn () => clearInterval(intervalId);}, [start]);- const labels = getElapsedDurationLabels(seconds * 1000, i18n.language);+ const labels = getElapsedDurationLabels(seconds * 1000, language);/** `ps-1.5` puts the reading on the column everything else in this slot* shares: the streaming dot pads the same 6px to center on the size-6* header icon's axis (see `EmptyTextPart`), and the hover-button glyphsdiff --git a/client/src/components/Chat/Messages/ui/HeaderLabel.tsx b/packages/chat/src/components/messages/HeaderLabel.tsxsimilarity index 97%rename from client/src/components/Chat/Messages/ui/HeaderLabel.tsxrename to packages/chat/src/components/messages/HeaderLabel.tsxindex 9eaa2d12f3..71fa7a7f55 100644--- a/client/src/components/Chat/Messages/ui/HeaderLabel.tsx+++ b/packages/chat/src/components/messages/HeaderLabel.tsx@@ -1,5 +1,5 @@-import { useLocalize } from '~/hooks';-import { cn } from '~/utils';+import { cn, useLocalize } from '@librechat/client';+import type { ReactElement } from 'react';type HeaderLabelProps = {label: string;@@ -58,7 +58,7 @@ const labelSlot =* `revealOnRowHoverClasses` in `../styles`: the row itself or a descendant* that is not a text-entry control. Both halves matter here for the same* reasons they matter to the timestamp and the footer actions. */-export default function HeaderLabel({ label, hoverLabel }: HeaderLabelProps) {+export default function HeaderLabel({ label, hoverLabel }: HeaderLabelProps): ReactElement {const localize = useLocalize();if (!hoverLabel || hoverLabel === label) {diff --git a/client/src/components/Chat/Messages/SiblingSwitch.tsx b/packages/chat/src/components/messages/SiblingSwitch.tsxsimilarity index 82%rename from client/src/components/Chat/Messages/SiblingSwitch.tsxrename to packages/chat/src/components/messages/SiblingSwitch.tsxindex 5528e0386d..6b7ab5ce96 100644--- a/client/src/components/Chat/Messages/SiblingSwitch.tsx+++ b/packages/chat/src/components/messages/SiblingSwitch.tsx@@ -1,10 +1,11 @@-import { Button } from '@librechat/client';import { ChevronLeft, ChevronRight } from 'lucide-react';-import type { TMessageProps } from '~/common';-import { useLocalize } from '~/hooks';-import { cn } from '~/utils';+import { cn, Button, useLocalize } from '@librechat/client';+import type { ReactElement } from 'react';-type TSiblingSwitchProps = Pick<TMessageProps, 'siblingIdx' | 'siblingCount' | 'setSiblingIdx'> & {+type TSiblingSwitchProps = {+ siblingIdx?: number;+ siblingCount?: number;+ setSiblingIdx?: ((value: number) => void) | null;className?: string;};@@ -13,7 +14,7 @@ export default function SiblingSwitch({siblingCount,setSiblingIdx,className,-}: TSiblingSwitchProps) {+}: TSiblingSwitchProps): ReactElement | null {const localize = useLocalize();if (siblingIdx === undefined) {@@ -23,11 +24,11 @@ export default function SiblingSwitch({}const previous = () => {- setSiblingIdx && setSiblingIdx(siblingIdx - 1);+ setSiblingIdx?.(siblingIdx - 1);};const next = () => {- setSiblingIdx && setSiblingIdx(siblingIdx + 1);+ setSiblingIdx?.(siblingIdx + 1);};const buttonStyle = cn(diff --git a/client/src/components/Chat/Messages/SubRow.tsx b/packages/chat/src/components/messages/SubRow.tsxsimilarity index 68%rename from client/src/components/Chat/Messages/SubRow.tsxrename to packages/chat/src/components/messages/SubRow.tsxindex 67863965c5..a8a5a8a84a 100644--- a/client/src/components/Chat/Messages/SubRow.tsx+++ b/packages/chat/src/components/messages/SubRow.tsx@@ -1,13 +1,14 @@-import { cn } from '~/utils';+import { cn } from '@librechat/client';+import type { ReactNode, ReactElement } from 'react';type TSubRowProps = {- children: React.ReactNode;+ children: ReactNode;classes?: string;subclasses?: string;onClick?: () => void;};-export default function SubRow({ children, classes = '', onClick }: TSubRowProps) {+export default function SubRow({ children, classes = '', onClick }: TSubRowProps): ReactElement {return (<divclassName={cn('mt-1 flex justify-start gap-3 empty:hidden lg:flex', classes)}diff --git a/client/src/components/Chat/Messages/ui/SystemEvent.tsx b/packages/chat/src/components/messages/SystemEvent.tsxsimilarity index 92%rename from client/src/components/Chat/Messages/ui/SystemEvent.tsxrename to packages/chat/src/components/messages/SystemEvent.tsxindex 0a0d8dca79..c9c98a22f7 100644--- a/client/src/components/Chat/Messages/ui/SystemEvent.tsx+++ b/packages/chat/src/components/messages/SystemEvent.tsx@@ -1,6 +1,6 @@+import { cn } from '@librechat/client';import { ChevronDown } from 'lucide-react';-import type { ReactNode } from 'react';-import { cn } from '~/utils';+import type { ReactNode, ReactElement } from 'react';type SystemEventHeaderProps = {icon: ReactNode;@@ -13,7 +13,7 @@ type SystemEventHeaderProps = {live?: boolean;};-export function SystemEventIcon({ children }: { children: ReactNode }) {+export function SystemEventIcon({ children }: { children: ReactNode }): ReactElement {return (<spanaria-hidden="true"@@ -36,7 +36,7 @@ export default function SystemEventHeader({expanded,warning = false,live = false,-}: SystemEventHeaderProps) {+}: SystemEventHeaderProps): ReactElement {return (<>{icon}diff --git a/client/src/components/Chat/Messages/__tests__/Elapsed.spec.tsx b/packages/chat/src/components/messages/__tests__/Elapsed.spec.tsxsimilarity index 80%rename from client/src/components/Chat/Messages/__tests__/Elapsed.spec.tsxrename to packages/chat/src/components/messages/__tests__/Elapsed.spec.tsxindex 57f94cbfee..ac0f82367e 100644--- a/client/src/components/Chat/Messages/__tests__/Elapsed.spec.tsx+++ b/packages/chat/src/components/messages/__tests__/Elapsed.spec.tsx@@ -1,9 +1,28 @@-import React from 'react';-import { RecoilRoot } from 'recoil';+/**+ * @jest-environment jsdom+ */+import fs from 'node:fs';+import path from 'node:path';+import i18next from 'i18next';import { Provider, createStore } from 'jotai';+import { initReactI18next } from 'react-i18next';import { render, screen, act } from '@testing-library/react';-import { submissionStartFamily } from '@librechat/chat/react';-import Elapsed, { shouldShowElapsed } from '~/components/Chat/Messages/Elapsed';+import { submissionStartFamily } from '../../../react/generation';+import Elapsed, { shouldShowElapsed } from '../Elapsed';++/** The app's English bundle, so the readings and their plural forms are the ones users see. */+const TRANSLATION = path.resolve(+ __dirname,+ '../../../../../../client/src/locales/en/translation.json',+);++beforeAll(async () => {+ await i18next.use(initReactI18next).init({+ lng: 'en',+ resources: { en: { translation: JSON.parse(fs.readFileSync(TRANSLATION, 'utf8')) } },+ interpolation: { escapeValue: false },+ });+});function storeWithStart(start?: number) {const jotaiStore = createStore();@@ -15,11 +34,9 @@ function storeWithStart(start?: number) {function renderElapsed(start?: number) {return render(- <RecoilRoot>- <Provider store={storeWithStart(start)}>- <Elapsed index={0} />- </Provider>- </RecoilRoot>,+ <Provider store={storeWithStart(start)}>+ <Elapsed index={0} />+ </Provider>,);}@@ -89,29 +106,21 @@ describe('Elapsed', () => {const start = Date.now() - 30_000;const jotaiStore = storeWithStart(start);const view = render(- <RecoilRoot>- <Provider store={jotaiStore}>- <Elapsed index={0} />- </Provider>- </RecoilRoot>,+ <Provider store={jotaiStore}>+ <Elapsed index={0} />+ </Provider>,);expect(screen.getByTestId('stream-elapsed')).toHaveTextContent(/^30s$/);- view.rerender(- <RecoilRoot>- <Provider store={jotaiStore}>{null}</Provider>- </RecoilRoot>,- );+ view.rerender(<Provider store={jotaiStore}>{null}</Provider>);expect(screen.queryByTestId('stream-elapsed')).toBeNull();advance(5_000);view.rerender(- <RecoilRoot>- <Provider store={jotaiStore}>- <Elapsed index={0} />- </Provider>- </RecoilRoot>,+ <Provider store={jotaiStore}>+ <Elapsed index={0} />+ </Provider>,);expect(screen.getByTestId('stream-elapsed')).toHaveTextContent(/^35s$/);});@@ -121,7 +130,7 @@ describe('Elapsed', () => {const timersWhileMounted = jest.getTimerCount();expect(timersWhileMounted).toBeGreaterThanOrEqual(1);- view.rerender(<RecoilRoot>{null}</RecoilRoot>);+ view.unmount();expect(jest.getTimerCount()).toBe(timersWhileMounted - 1);});});diff --git a/client/src/components/Chat/Messages/ui/__tests__/HeaderLabel.spec.tsx b/packages/chat/src/components/messages/__tests__/HeaderLabel.spec.tsxsimilarity index 93%rename from client/src/components/Chat/Messages/ui/__tests__/HeaderLabel.spec.tsxrename to packages/chat/src/components/messages/__tests__/HeaderLabel.spec.tsxindex 44e2038da1..125abdadd8 100644--- a/client/src/components/Chat/Messages/ui/__tests__/HeaderLabel.spec.tsx+++ b/packages/chat/src/components/messages/__tests__/HeaderLabel.spec.tsx@@ -1,6 +1,15 @@+/**+ * @jest-environment jsdom+ */import { render, screen } from '@testing-library/react';import HeaderLabel, { getHeaderHoverLabel, getHeaderModelName } from '../HeaderLabel';+jest.mock('@librechat/client', () => ({+ ...jest.requireActual('@librechat/client'),+ useLocalize: () => (key: string, values?: Record<string, string>) =>+ key === 'com_ui_message_model' ? `Model: ${values?.[0]}` : key,+}));+describe('getHeaderModelName', () => {it('prefers a real model over an agent document id', () => {expect(getHeaderModelName('agent_abc', 'gemma4:12b-it-qat')).toBe('gemma4:12b-it-qat');diff --git a/client/src/utils/__tests__/runStepDuration.spec.ts b/packages/chat/src/components/messages/__tests__/duration.spec.tssimilarity index 99%rename from client/src/utils/__tests__/runStepDuration.spec.tsrename to packages/chat/src/components/messages/__tests__/duration.spec.tsindex dd5a870d3f..82d7f4ca8c 100644--- a/client/src/utils/__tests__/runStepDuration.spec.ts+++ b/packages/chat/src/components/messages/__tests__/duration.spec.ts@@ -1,4 +1,4 @@-import { getRunStepDurationLabels, getElapsedDurationLabels } from '../runStepDuration';+import { getRunStepDurationLabels, getElapsedDurationLabels } from '../duration';describe('getRunStepDurationLabels', () => {describe('under ten seconds', () => {diff --git a/client/src/components/Chat/Messages/__tests__/styles.spec.ts b/packages/chat/src/components/messages/__tests__/styles.spec.tssimilarity index 100%rename from client/src/components/Chat/Messages/__tests__/styles.spec.tsrename to packages/chat/src/components/messages/__tests__/styles.spec.tsdiff --git a/packages/chat/src/components/messages/duration.ts b/packages/chat/src/components/messages/duration.tsnew file mode 100644index 0000000000..22572fbbbf--- /dev/null+++ b/packages/chat/src/components/messages/duration.ts@@ -0,0 +1,138 @@+const MS_PER_SECOND = 1000;+const SECONDS_PER_MINUTE = 60;+/** Below this, a decimal carries real information (1.4s reads differently from+ * 1.9s). Above it, the tenth is noise on a number the reader is only+ * skimming, and it makes the label jitter by a character as it settles. */+const DECIMAL_PRECISION_BELOW_SECONDS = 10;++/** The visible forms a duration renders as. */+type DurationKey = 'com_ui_duration_seconds' | 'com_ui_duration_minutes';++/** The spoken forms, for a settled run and for one still in progress. */+type AnnouncedDurationKey =+ | 'com_ui_duration_announced_seconds'+ | 'com_ui_duration_announced_minutes'+ | 'com_ui_elapsed_announced_seconds'+ | 'com_ui_elapsed_announced_minutes';++/** What a duration should render as, in both of the places it is presented. */+export interface RunStepDurationLabels {+ /** Compact form for the visible label, e.g. `1.4s`, `12s`, `2m 5s`. */+ key: DurationKey;+ values: Record<string, string | number>;+ /** Spoken form for assistive technology, e.g. "took 1.4 seconds". */+ announcedKey: AnnouncedDurationKey;+ announcedValues: Record<string, string | number>;+}++/**+ * Every interpolated number goes through this, not just the fractional one:+ * a raw JS number hardcodes en-US conventions into every locale: the+ * decimal point ("1.4s" where the convention is "1,4 s") and the digits+ * themselves (Arabic and Persian locales write localized digits, which a raw+ * `1` silently reverts to ASCII). Translators cannot fix a number formatted+ * in code, so it is formatted per-locale here, following `MessageTimestamp`'s+ * pattern of threading `i18n.language` into the util. The guard covers+ * malformed language tags, which `Intl` throws on.+ */+function formatDurationValue(value: number, language?: string): string {+ try {+ return new Intl.NumberFormat(language, { maximumFractionDigits: 1 }).format(value);+ } catch {+ return String(value);+ }+}++/**+ * Resolve the localization keys and interpolation values for a run-step+ * duration.+ *+ * Returns keys rather than strings so the caller localizes once, at the point+ * of render, and so this stays testable without a translation context.+ *+ * The visible and announced forms are produced together, deliberately: they+ * are the same fact presented twice, and deriving them apart is exactly how+ * the tool cards drifted before (see the label/announcement split called out+ * in AI-1810). The announced form rounds to whole minutes above a minute;+ * the precise value stays on the button, which assistive technology reads+ * when the reader navigates to it.+ */+export function getRunStepDurationLabels(+ durationMs: number,+ language?: string,+): RunStepDurationLabels {+ const totalSeconds = durationMs / MS_PER_SECOND;++ /** Branch on the rounded value, not the raw one, so 59.6s renders as+ * `1m 0s` rather than the nonsensical `60s`. */+ if (Math.round(totalSeconds) < SECONDS_PER_MINUTE) {+ const seconds =+ totalSeconds < DECIMAL_PRECISION_BELOW_SECONDS+ ? Number(totalSeconds.toFixed(1))+ : Math.round(totalSeconds);+ /** Plural selection stays on the numeric value; only the interpolated+ * text is locale-formatted. */+ const formatted = formatDurationValue(seconds, language);+ return {+ key: 'com_ui_duration_seconds',+ values: { 0: formatted },+ /** The base key with a numeric `count` lets i18next pick each locale's+ * plural form; `value` carries the locale-formatted number. */+ announcedKey: 'com_ui_duration_announced_seconds',+ announcedValues: { count: seconds, value: formatted },+ };+ }++ const wholeSeconds = Math.round(totalSeconds);+ const minutes = Math.floor(wholeSeconds / SECONDS_PER_MINUTE);+ const seconds = wholeSeconds % SECONDS_PER_MINUTE;+ const announcedMinutes = Math.round(totalSeconds / SECONDS_PER_MINUTE);+ return {+ key: 'com_ui_duration_minutes',+ values: {+ 0: formatDurationValue(minutes, language),+ 1: formatDurationValue(seconds, language),+ },+ announcedKey: 'com_ui_duration_announced_minutes',+ announcedValues: {+ count: announcedMinutes,+ value: formatDurationValue(announcedMinutes, language),+ },+ };+}++/**+ * The streaming elapsed indicator's variant of the duration labels: the same+ * locale-formatted visible form, with the spoken form phrased for a run still+ * in progress ("5 seconds elapsed") rather than a settled one ("took 5+ * seconds"). Produced here, beside `getRunStepDurationLabels`, so both forms+ * keep sharing one per-locale number formatter.+ */+export function getElapsedDurationLabels(+ durationMs: number,+ language?: string,+): RunStepDurationLabels {+ const { key, values } = getRunStepDurationLabels(durationMs, language);+ const totalSeconds = durationMs / MS_PER_SECOND;++ if (Math.round(totalSeconds) < SECONDS_PER_MINUTE) {+ const seconds = Math.round(totalSeconds);+ return {+ key,+ values,+ announcedKey: 'com_ui_elapsed_announced_seconds',+ announcedValues: { count: seconds, value: formatDurationValue(seconds, language) },+ };+ }++ const announcedMinutes = Math.round(totalSeconds / SECONDS_PER_MINUTE);+ return {+ key,+ values,+ announcedKey: 'com_ui_elapsed_announced_minutes',+ announcedValues: {+ count: announcedMinutes,+ value: formatDurationValue(announcedMinutes, language),+ },+ };+}diff --git a/client/src/components/Chat/Messages/styles.ts b/packages/chat/src/components/messages/styles.tssimilarity index 98%rename from client/src/components/Chat/Messages/styles.tsrename to packages/chat/src/components/messages/styles.tsindex 06a088680b..4446b4e57b 100644--- a/client/src/components/Chat/Messages/styles.ts+++ b/packages/chat/src/components/messages/styles.ts@@ -1,5 +1,4 @@-import { cn } from '~/utils';-+import { cn } from '@librechat/client';/*** Reveal-on-hover for a control that shares the message footer with the hover actions.*@@ -73,7 +72,7 @@ export const hoverButtonClasses = ({isActive = false,isLast = false,className,-}: HoverButtonStyleOptions = {}) =>+}: HoverButtonStyleOptions = {}): string =>cn('hover-button size-auto rounded-lg p-1.5 text-text-secondary-alt','hover:text-text-primary hover:bg-surface-hover',diff --git a/packages/client/src/hooks/index.ts b/packages/client/src/hooks/index.tsindex 1b6b0d06ba..c158ebc7c8 100644--- a/packages/client/src/hooks/index.ts+++ b/packages/client/src/hooks/index.ts@@ -7,6 +7,7 @@ export { default as useRemScale } from './useRemScale';export { default as useAvatar } from './useAvatar';export { default as useCombobox } from './useCombobox';export { default as useLocalize } from './useLocalize';+export { default as useLanguage } from './useLanguage';export { default as useMediaQuery } from './useMediaQuery';export { default as useDelayedRender } from './useDelayedRender';export { default as useInputModality } from './useInputModality';diff --git a/packages/client/src/hooks/useLanguage.ts b/packages/client/src/hooks/useLanguage.tsnew file mode 100644index 0000000000..abcfec1c45--- /dev/null+++ b/packages/client/src/hooks/useLanguage.ts@@ -0,0 +1,7 @@+import { useTranslation } from 'react-i18next';++/** The language the host app's i18next instance is rendering in, for locale-aware formatting. */+export default function useLanguage(): string {+ const { i18n } = useTranslation();+ return i18n.language;+}