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
🖋️ feat: Add option to render User Messages as Markdown (#4170)
Danny Avilabe44caaab15d
diff --git a/client/src/components/Chat/Messages/Content/MessageContent.tsx b/client/src/components/Chat/Messages/Content/MessageContent.tsxindex 5f03fc1efe..06d3715fa8 100644--- a/client/src/components/Chat/Messages/Content/MessageContent.tsx+++ b/client/src/components/Chat/Messages/Content/MessageContent.tsx@@ -1,15 +1,18 @@import { Fragment, Suspense, useMemo } from 'react';+import { useRecoilValue } from 'recoil';import type { TMessage, TResPlugin } from 'librechat-data-provider';import type { TMessageContentProps, TDisplayProps } from '~/common';import Plugin from '~/components/Messages/Content/Plugin';import Error from '~/components/Messages/Content/Error';import { DelayedRender } from '~/components/ui';import { useChatContext } from '~/Providers';+import MarkdownLite from './MarkdownLite';import EditMessage from './EditMessage';import { useLocalize } from '~/hooks';import Container from './Container';import Markdown from './Markdown';import { cn } from '~/utils';+import store from '~/store';export const ErrorMessage = ({text,@@ -64,9 +67,9 @@ export const ErrorMessage = ({);};-// Display Message Componentconst DisplayMessage = ({ text, isCreatedByUser, message, showCursor }: TDisplayProps) => {const { isSubmitting, latestMessage } = useChatContext();+ const enableUserMsgMarkdown = useRecoilValue(store.enableUserMsgMarkdown);const showCursorState = useMemo(() => showCursor === true && isSubmitting,[showCursor, isSubmitting],@@ -75,6 +78,18 @@ const DisplayMessage = ({ text, isCreatedByUser, message, showCursor }: TDisplay() => message.messageId === latestMessage?.messageId,[message.messageId, latestMessage?.messageId],);++ let content: React.ReactElement;+ if (!isCreatedByUser) {+ content = (+ <Markdown content={text} showCursor={showCursorState} isLatestMessage={isLatestMessage} />+ );+ } else if (enableUserMsgMarkdown) {+ content = <MarkdownLite content={text} />;+ } else {+ content = <>{text}</>;+ }+return (<Container message={message}><div@@ -85,11 +100,7 @@ const DisplayMessage = ({ text, isCreatedByUser, message, showCursor }: TDisplayisCreatedByUser ? 'whitespace-pre-wrap dark:text-gray-20' : 'dark:text-gray-100',)}>- {!isCreatedByUser ? (- <Markdown content={text} showCursor={showCursorState} isLatestMessage={isLatestMessage} />- ) : (- <>{text}</>- )}+ {content}</div></Container>);diff --git a/client/src/components/Chat/Messages/Content/Parts/Text.tsx b/client/src/components/Chat/Messages/Content/Parts/Text.tsxindex 7d0b386c81..59e8b32164 100644--- a/client/src/components/Chat/Messages/Content/Parts/Text.tsx+++ b/client/src/components/Chat/Messages/Content/Parts/Text.tsx@@ -1,7 +1,10 @@-import { memo, useMemo } from 'react';-import { useChatContext } from '~/Providers';+import { memo, useMemo, ReactElement } from 'react';+import { useRecoilValue } from 'recoil';+import MarkdownLite from '~/components/Chat/Messages/Content/MarkdownLite';import Markdown from '~/components/Chat/Messages/Content/Markdown';+import { useChatContext } from '~/Providers';import { cn } from '~/utils';+import store from '~/store';type TextPartProps = {text: string;@@ -10,14 +13,32 @@ type TextPartProps = {showCursor: boolean;};+type ContentType =+ | ReactElement<React.ComponentProps<typeof Markdown>>+ | ReactElement<React.ComponentProps<typeof MarkdownLite>>+ | ReactElement;+const TextPart = memo(({ text, isCreatedByUser, messageId, showCursor }: TextPartProps) => {const { isSubmitting, latestMessage } = useChatContext();+ const enableUserMsgMarkdown = useRecoilValue(store.enableUserMsgMarkdown);const showCursorState = useMemo(() => showCursor && isSubmitting, [showCursor, isSubmitting]);const isLatestMessage = useMemo(() => messageId === latestMessage?.messageId,[messageId, latestMessage?.messageId],);+ const content: ContentType = useMemo(() => {+ if (!isCreatedByUser) {+ return (+ <Markdown content={text} showCursor={showCursorState} isLatestMessage={isLatestMessage} />+ );+ } else if (enableUserMsgMarkdown) {+ return <MarkdownLite content={text} />;+ } else {+ return <>{text}</>;+ }+ }, [isCreatedByUser, enableUserMsgMarkdown, text, showCursorState, isLatestMessage]);+return (<divclassName={cn(@@ -27,11 +48,7 @@ const TextPart = memo(({ text, isCreatedByUser, messageId, showCursor }: TextParisCreatedByUser ? 'whitespace-pre-wrap dark:text-gray-20' : 'dark:text-gray-70',)}>- {!isCreatedByUser ? (- <Markdown content={text} showCursor={showCursorState} isLatestMessage={isLatestMessage} />- ) : (- <>{text}</>- )}+ {content}</div>);});diff --git a/client/src/components/Chat/Messages/Content/SearchContent.tsx b/client/src/components/Chat/Messages/Content/SearchContent.tsxindex a76d3fcf59..3f19c3e03c 100644--- a/client/src/components/Chat/Messages/Content/SearchContent.tsx+++ b/client/src/components/Chat/Messages/Content/SearchContent.tsx@@ -22,12 +22,13 @@ const SearchContent = ({ message }: { message: TMessage }) => {key={`display-${messageId}-${idx}`}showCursor={false}isSubmitting={false}+ isCreatedByUser={message.isCreatedByUser}+ messageId={message.messageId}part={part}- message={message}/>);})}- {message.unfinished && (+ {message.unfinished === true && (<Suspense><DelayedRender delay={250}><UnfinishedMessage message={message} key={`unfinished-${messageId}`} />diff --git a/client/src/components/Nav/SettingsTabs/General/General.tsx b/client/src/components/Nav/SettingsTabs/General/General.tsxindex 66aed110b2..5f289cc3fc 100644--- a/client/src/components/Nav/SettingsTabs/General/General.tsx+++ b/client/src/components/Nav/SettingsTabs/General/General.tsx@@ -1,9 +1,10 @@import { useRecoilState } from 'recoil';import Cookies from 'js-cookie';-import React, { useContext, useCallback, useRef } from 'react';+import React, { useContext, useCallback } from 'react';import type { TDangerButtonProps } from '~/common';-import { ThemeContext, useLocalize } from '~/hooks';+import UserMsgMarkdownSwitch from './UserMsgMarkdownSwitch';import HideSidePanelSwitch from './HideSidePanelSwitch';+import { ThemeContext, useLocalize } from '~/hooks';import AutoScrollSwitch from './AutoScrollSwitch';import ArchivedChats from './ArchivedChats';import { Dropdown } from '~/components/ui';@@ -123,8 +124,6 @@ function General() {const [langcode, setLangcode] = useRecoilState(store.lang);- const contentRef = useRef(null);-const changeTheme = useCallback((value: string) => {setTheme(value);@@ -156,6 +155,9 @@ function General() {<div className="border-b border-border-medium pb-3 last-of-type:border-b-0"><LangSelector langcode={langcode} onChange={changeLang} /></div>+ <div className="border-b border-border-medium pb-3 last-of-type:border-b-0">+ <UserMsgMarkdownSwitch />+ </div><div className="border-b border-border-medium pb-3 last-of-type:border-b-0"><AutoScrollSwitch /></div>diff --git a/client/src/components/Nav/SettingsTabs/General/UserMsgMarkdownSwitch.tsx b/client/src/components/Nav/SettingsTabs/General/UserMsgMarkdownSwitch.tsxnew file mode 100644index 0000000000..411692c515--- /dev/null+++ b/client/src/components/Nav/SettingsTabs/General/UserMsgMarkdownSwitch.tsx@@ -0,0 +1,35 @@+import { useRecoilState } from 'recoil';+import { Switch } from '~/components/ui';+import { useLocalize } from '~/hooks';+import store from '~/store';++export default function UserMsgMarkdownSwitch({+ onCheckedChange,+}: {+ onCheckedChange?: (value: boolean) => void;+}) {+ const localize = useLocalize();+ const [enableUserMsgMarkdown, setEnableUserMsgMarkdown] = useRecoilState<boolean>(+ store.enableUserMsgMarkdown,+ );++ const handleCheckedChange = (value: boolean) => {+ setEnableUserMsgMarkdown(value);+ if (onCheckedChange) {+ onCheckedChange(value);+ }+ };++ return (+ <div className="flex items-center justify-between">+ <div> {localize('com_nav_user_msg_markdown')} </div>+ <Switch+ id="enableUserMsgMarkdown"+ checked={enableUserMsgMarkdown}+ onCheckedChange={handleCheckedChange}+ className="ml-4 mt-2 ring-ring-primary"+ data-testid="enableUserMsgMarkdown"+ />+ </div>+ );+}diff --git a/client/src/localization/languages/Eng.ts b/client/src/localization/languages/Eng.tsindex 27734cf1d8..d0b0950465 100644--- a/client/src/localization/languages/Eng.ts+++ b/client/src/localization/languages/Eng.ts@@ -625,6 +625,7 @@ export default {com_nav_welcome_assistant: 'Please Select an Assistant',com_nav_welcome_message: 'How can I help you today?',com_nav_auto_scroll: 'Auto-Scroll to latest message on chat open',+ com_nav_user_msg_markdown: 'Render user messages as markdown',com_nav_hide_panel: 'Hide right-most side panel',com_nav_modular_chat: 'Enable switching Endpoints mid-conversation',com_nav_latex_parsing: 'Parsing LaTeX in messages (may affect performance)',diff --git a/client/src/store/settings.ts b/client/src/store/settings.tsindex d131df5551..0316336bd3 100644--- a/client/src/store/settings.ts+++ b/client/src/store/settings.ts@@ -23,6 +23,10 @@ const localStorageAtoms = {autoScroll: atomWithLocalStorage('autoScroll', false),hideSidePanel: atomWithLocalStorage('hideSidePanel', false),fontSize: atomWithLocalStorage('fontSize', 'text-base'),+ enableUserMsgMarkdown: atomWithLocalStorage<boolean>(+ LocalStorageKeys.ENABLE_USER_MSG_MARKDOWN,+ true,+ ),// Messages settingsenterToSend: atomWithLocalStorage('enterToSend', true),diff --git a/package-lock.json b/package-lock.jsonindex c152c3f9b0..46f8fb1040 100644--- a/package-lock.json+++ b/package-lock.json@@ -36680,7 +36680,7 @@},"packages/data-provider": {"name": "librechat-data-provider",- "version": "0.7.424",+ "version": "0.7.425","license": "ISC","dependencies": {"@types/js-yaml": "^4.0.9",diff --git a/packages/data-provider/package.json b/packages/data-provider/package.jsonindex 437f44f66e..dd265e3c13 100644--- a/packages/data-provider/package.json+++ b/packages/data-provider/package.json@@ -1,6 +1,6 @@{"name": "librechat-data-provider",- "version": "0.7.424",+ "version": "0.7.425","description": "data services for librechat apps","main": "dist/index.js","module": "dist/index.es.js",diff --git a/packages/data-provider/src/config.ts b/packages/data-provider/src/config.tsindex 152b59598b..be0dfd3d8e 100644--- a/packages/data-provider/src/config.ts+++ b/packages/data-provider/src/config.ts@@ -1119,6 +1119,8 @@ export enum LocalStorageKeys {FILES_DRAFT = 'filesDraft_',/** Key for last Selected Prompt Category */LAST_PROMPT_CATEGORY = 'lastPromptCategory',+ /** Key for rendering User Messages as Markdown */+ ENABLE_USER_MSG_MARKDOWN = 'enableUserMsgMarkdown',}export enum ForkOptions {