diff --git a/client/src/components/Chat/BackgroundTasks/useTasks.ts b/client/src/components/Chat/BackgroundTasks/useTasks.ts index 43ec4f6a86..cb8d57d5eb 100644 --- a/client/src/components/Chat/BackgroundTasks/useTasks.ts +++ b/client/src/components/Chat/BackgroundTasks/useTasks.ts @@ -1,6 +1,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react'; import { v4 } from 'uuid'; import { parseJsonField } from '@librechat/chat'; +import { getToolCallIntent } from '@librechat/chat/react'; import { useQuery, useQueries } from '@tanstack/react-query'; import { QueryKeys, dataService } from 'librechat-data-provider'; import type { TMessage, ParentSubagentSummary } from 'librechat-data-provider'; @@ -19,7 +20,6 @@ import { useCancelBackgroundTasksMutation, } from '~/data-provider'; import { useParentSubagents } from '~/components/Chat/Subagents/ParentSubagentsProvider'; -import { getToolCallIntent } from '~/components/Chat/Messages/Content/Parts/intent'; const noThreads: ReadonlyMap = new Map(); const noRefresh = async () => undefined; diff --git a/client/src/components/Chat/Messages/Content/ActivityPhaseGroup.tsx b/client/src/components/Chat/Messages/Content/ActivityPhaseGroup.tsx index 05b9cce852..9919d38ee6 100644 --- a/client/src/components/Chat/Messages/Content/ActivityPhaseGroup.tsx +++ b/client/src/components/Chat/Messages/Content/ActivityPhaseGroup.tsx @@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next'; import { useTimeTick } from '@librechat/chat/react'; import { ContentTypes } from 'librechat-data-provider'; import { Check, CircleX, Lightbulb, ChevronDown, TriangleAlert } from 'lucide-react'; +import { FOLD_RAIL_CLASSES, ROW_GLYPH_SLOT, TOOL_ROW_CLASSES } from '@librechat/chat/components'; import type { TAttachment, TMessageContentParts } from 'librechat-data-provider'; import type { CSSProperties, ReactNode } from 'react'; import type { RailHover } from './rail'; @@ -30,7 +31,6 @@ import { FoldHeaderContext, } from './rail'; import { FailedRevealContext, FailedRevealPill, useFailedRevealTrigger } from './reveal'; -import { FOLD_RAIL_CLASSES, ROW_GLYPH_SLOT, TOOL_ROW_CLASSES } from './rows'; import { getOutcomeStatus, isSpanFailed, summarizeSpan } from './outcome'; import useSmoothStreaming from '~/hooks/Messages/useSmoothStreaming'; import useThrottledValue from '~/hooks/Messages/useThrottledValue'; diff --git a/client/src/components/Chat/Messages/Content/AgentHandoff.tsx b/client/src/components/Chat/Messages/Content/AgentHandoff.tsx index 8dd301c40b..b162b6cbd1 100644 --- a/client/src/components/Chat/Messages/Content/AgentHandoff.tsx +++ b/client/src/components/Chat/Messages/Content/AgentHandoff.tsx @@ -4,13 +4,13 @@ import { ChevronDown } from 'lucide-react'; import { Button } from '@librechat/client'; import { unescapeJsonString } from '@librechat/chat'; import { EModelEndpoint, Constants } from 'librechat-data-provider'; -import type { TMessage } from 'librechat-data-provider'; -import type { TranslationKeys } from '~/hooks'; import { useToolContentRequest, useToolContentPending, toolPanelSpacingClassName, -} from './disclosure'; +} from '@librechat/chat/react'; +import type { TMessage } from 'librechat-data-provider'; +import type { TranslationKeys } from '~/hooks'; import CopyButton from '~/components/Messages/Content/CopyButton'; import MessageIcon from '~/components/Share/MessageIcon'; import { useLocalize, useExpandCollapse } from '~/hooks'; diff --git a/client/src/components/Chat/Messages/Content/AskUserQuestionCall.tsx b/client/src/components/Chat/Messages/Content/AskUserQuestionCall.tsx index 3f948d3996..f0e300b3d6 100644 --- a/client/src/components/Chat/Messages/Content/AskUserQuestionCall.tsx +++ b/client/src/components/Chat/Messages/Content/AskUserQuestionCall.tsx @@ -1,6 +1,7 @@ import { useCallback } from 'react'; -import { EmptyText } from '@librechat/chat/components'; +import { useToolExpansion } from '@librechat/chat/react'; import { MessageCircleQuestion, TriangleAlert } from 'lucide-react'; +import { EmptyText, TOOL_ROW_CLASSES } from '@librechat/chat/components'; import type { Agents, PartMetadata } from 'librechat-data-provider'; import { getSubmittedAskAnswer, @@ -9,9 +10,7 @@ import { } from '~/utils/approval'; import AskUserQuestionProgress from './AskUserQuestionProgress'; import { useLocalize, useExpandCollapse } from '~/hooks'; -import { useToolExpansion } from './disclosure'; import ProgressText from './ProgressText'; -import { TOOL_ROW_CLASSES } from './rows'; import Container from './Container'; /** diff --git a/client/src/components/Chat/Messages/Content/CancelledIcon.tsx b/client/src/components/Chat/Messages/Content/CancelledIcon.tsx deleted file mode 100644 index e0dff0a924..0000000000 --- a/client/src/components/Chat/Messages/Content/CancelledIcon.tsx +++ /dev/null @@ -1,9 +0,0 @@ -import { X } from 'lucide-react'; - -export default function CancelledIcon() { - return ( -
-
- ); -} diff --git a/client/src/components/Chat/Messages/Content/CodeAnalyze.tsx b/client/src/components/Chat/Messages/Content/CodeAnalyze.tsx index 0aa8f91f39..68636ddd8b 100644 --- a/client/src/components/Chat/Messages/Content/CodeAnalyze.tsx +++ b/client/src/components/Chat/Messages/Content/CodeAnalyze.tsx @@ -1,7 +1,7 @@ import { Terminal } from 'lucide-react'; +import { useToolExpansion } from '@librechat/chat/react'; import type { ToolCallPhase } from '~/utils/toolCallPhase'; import { useProgress, useLocalize } from '~/hooks'; -import { useToolExpansion } from './disclosure'; import ProgressText from './ProgressText'; import MarkdownLite from './MarkdownLite'; import { cn } from '~/utils'; diff --git a/client/src/components/Chat/Messages/Content/ContentParts.tsx b/client/src/components/Chat/Messages/Content/ContentParts.tsx index 92424948e6..48cd329a47 100644 --- a/client/src/components/Chat/Messages/Content/ContentParts.tsx +++ b/client/src/components/Chat/Messages/Content/ContentParts.tsx @@ -1,6 +1,13 @@ import { memo, useRef, useMemo, useEffect, useCallback, useContext, Fragment } from 'react'; import { useStore } from 'jotai'; import { Constants, ContentTypes, Tools } from 'librechat-data-provider'; +import { + ReasoningDisclosureContext, + reasoningDisclosure, + ToolDisclosureContext, + ToolDisclosureKeyContext, + SoleToolContext, +} from '@librechat/chat/react'; import type { SubagentAttachmentFile, TMessageContentParts, @@ -8,8 +15,8 @@ import type { TAttachment, Agents, } from 'librechat-data-provider'; +import type { ReasoningDisclosures, ToolDisclosures } from '@librechat/chat/react'; import type { ReactNode, ReactElement } from 'react'; -import type { ReasoningDisclosures, ToolDisclosures } from './disclosure'; import type { NestedCall } from '~/components/Chat/Subagents/attachments'; import type { ToolCallGroupExpansionState } from './ToolCallGroup'; import type { ActivityPhaseSegment } from '~/utils/activityLabels'; @@ -30,13 +37,6 @@ import { filterAttachmentsForPart, groupSequentialToolCalls, } from '~/utils'; -import { - ReasoningDisclosureContext, - reasoningDisclosure, - ToolDisclosureContext, - ToolDisclosureKeyContext, - SoleToolContext, -} from './disclosure'; import { groupActivityPhases, lastCursorContentIdx, diff --git a/client/src/components/Chat/Messages/Content/MemoryArtifacts.tsx b/client/src/components/Chat/Messages/Content/MemoryArtifacts.tsx index d8982d6ec3..d4b992edce 100644 --- a/client/src/components/Chat/Messages/Content/MemoryArtifacts.tsx +++ b/client/src/components/Chat/Messages/Content/MemoryArtifacts.tsx @@ -1,9 +1,9 @@ import { useId, useMemo, useState } from 'react'; import { ChevronDown } from 'lucide-react'; import { Tools } from 'librechat-data-provider'; +import { toolPanelSpacingClassName } from '@librechat/chat/react'; import { Button, disclosureChevronVariants } from '@librechat/client'; import type { MemoryArtifact, TAttachment } from 'librechat-data-provider'; -import { toolPanelSpacingClassName } from './disclosure'; import { useExpandCollapse, useLocalize } from '~/hooks'; import MemoryInfo from './MemoryInfo'; import { cn } from '~/utils'; diff --git a/client/src/components/Chat/Messages/Content/Parts/ArtifactRow.tsx b/client/src/components/Chat/Messages/Content/Parts/ArtifactRow.tsx index 9f04e7123e..a6c2acba5e 100644 --- a/client/src/components/Chat/Messages/Content/Parts/ArtifactRow.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/ArtifactRow.tsx @@ -1,5 +1,10 @@ import { forwardRef } from 'react'; import { Button } from '@librechat/client'; +import { + ARTIFACT_ROW_NAV_SPACING, + ROW_GLYPH_SLOT, + TOOL_ROW_CLASSES, +} from '@librechat/chat/components'; import { AppWindow, Download, @@ -10,7 +15,6 @@ import { Workflow, } from 'lucide-react'; import type { ArtifactGlyph, ArtifactRowKind } from '~/utils/artifacts'; -import { ARTIFACT_ROW_NAV_SPACING, ROW_GLYPH_SLOT, TOOL_ROW_CLASSES } from '../rows'; import LangIcon, { hasLangIcon } from '~/components/Messages/Content/LangIcon'; import { useLocalize } from '~/hooks'; import { cn } from '~/utils'; diff --git a/client/src/components/Chat/Messages/Content/Parts/Attachment.tsx b/client/src/components/Chat/Messages/Content/Parts/Attachment.tsx index f2aa369fa7..de94a205d5 100644 --- a/client/src/components/Chat/Messages/Content/Parts/Attachment.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/Attachment.tsx @@ -2,6 +2,11 @@ import { memo, useEffect, useId, useLayoutEffect, useMemo, useRef, useState } fr import { Tools } from 'librechat-data-provider'; import { Button, useRemScale } from '@librechat/client'; import { Loader2, AlertCircle, Download, ChevronDown, Files as FilesIcon } from 'lucide-react'; +import { + ARTIFACT_ROW_NAV_SPACING, + ROW_GLYPH_SLOT, + TOOL_ROW_CLASSES, +} from '@librechat/chat/components'; import type { TAttachment, TFile, TAttachmentMetadata } from 'librechat-data-provider'; import type { ToolArtifactType } from '~/utils/artifacts'; import { @@ -14,7 +19,6 @@ import { isTextAttachment, renderAttachmentKey, } from './attachmentTypes'; -import { ARTIFACT_ROW_NAV_SPACING, ROW_GLYPH_SLOT, TOOL_ROW_CLASSES } from '../rows'; import { useLocalize, useAttachmentPreviewSync, useExpandCollapse } from '~/hooks'; import FileContainer from '~/components/Chat/Input/Files/FileContainer'; import { fileToArtifact, TOOL_ARTIFACT_TYPES } from '~/utils/artifacts'; diff --git a/client/src/components/Chat/Messages/Content/Parts/AuthorHeader.tsx b/client/src/components/Chat/Messages/Content/Parts/AuthorHeader.tsx deleted file mode 100644 index 8830198cd7..0000000000 --- a/client/src/components/Chat/Messages/Content/Parts/AuthorHeader.tsx +++ /dev/null @@ -1,33 +0,0 @@ -import { memo } from 'react'; -import type { ReactNode } from 'react'; - -/** - * Re-attributes response content to its author mid-message. A `SteerPart` - * renders a full user turn inside the response, so the parts that resume - * after it need the author's icon and label restated. The message-level - * header only renders once, above the first part. Sits on the same left - * edge as the message body. - */ -const AuthorHeader = memo(function AuthorHeader({ - icon, - label, -}: { - icon: ReactNode; - label: string; -}) { - return ( -
- -

- {label} -

-
- ); -}); - -export default AuthorHeader; diff --git a/client/src/components/Chat/Messages/Content/Parts/BackgroundTaskCall.tsx b/client/src/components/Chat/Messages/Content/Parts/BackgroundTaskCall.tsx index 35e781b249..99473dddcc 100644 --- a/client/src/components/Chat/Messages/Content/Parts/BackgroundTaskCall.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/BackgroundTaskCall.tsx @@ -1,20 +1,19 @@ import { useMemo, useState, useCallback } from 'react'; +import { TOOL_ROW_CLASSES } from '@librechat/chat/components'; import { backgroundTaskOutcome, parseBackgroundTaskOutput } from '@librechat/chat'; +import { toolPanelSpacingClassName, useToolCallIntent } from '@librechat/chat/react'; import type { PartMetadata, TAttachment } from 'librechat-data-provider'; import { backgroundListGuidanceKeys, backgroundTaskNoticeKey } from './guidance'; import ProgressText from '~/components/Chat/Messages/Content/ProgressText'; import { useMCPIconMap, useMCPServerNames } from '~/hooks/MCP'; import { useLocalize, useLazyCollapseBody } from '~/hooks'; -import { toolPanelSpacingClassName } from '../disclosure'; import { ToolIcon, OutputRenderer } from '../ToolOutput'; import { MCPAppViews } from '~/components/MCPUIResource'; import BackgroundTaskCard from '../BackgroundTaskCard'; import { useToolPreparation } from '../preparation'; import useToolCallState from './useToolCallState'; import { AttachmentGroup } from './Attachment'; -import { useToolCallIntent } from './intent'; import ToolCallInfo from '../ToolCallInfo'; -import { TOOL_ROW_CLASSES } from '../rows'; import { cn } from '~/utils'; import './BackgroundTaskCall.css'; diff --git a/client/src/components/Chat/Messages/Content/Parts/BashCall.tsx b/client/src/components/Chat/Messages/Content/Parts/BashCall.tsx index 0c1dc4c42b..93fa6abc90 100644 --- a/client/src/components/Chat/Messages/Content/Parts/BashCall.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/BashCall.tsx @@ -1,6 +1,13 @@ import { useMemo, useRef, useState, useCallback, useEffect } from 'react'; import copy from 'copy-to-clipboard'; import { Button } from '@librechat/client'; +import { PANE_COPY_REVEAL, TOOL_ROW_CLASSES, BareStatus } from '@librechat/chat/components'; +import { + toolPanelSpacingClassName, + useToolContentPending, + useFollowScroll, + useToolCallIntent, +} from '@librechat/chat/react'; import { parseBackgroundHandle, splitBackgroundAttachments, @@ -9,21 +16,16 @@ import { parseCommandOutput, } from '@librechat/chat'; import type { TAttachment, PartMetadata } from 'librechat-data-provider'; -import { toolPanelSpacingClassName, useToolContentPending } from '../disclosure'; import ProgressText from '~/components/Chat/Messages/Content/ProgressText'; import { useMessagePartsHost } from '~/Providers/MessagePartsHostContext'; import CopyButton from '~/components/Messages/Content/CopyButton'; import LangIcon from '~/components/Messages/Content/LangIcon'; -import { PANE_COPY_REVEAL, TOOL_ROW_CLASSES } from '../rows'; import useToolCallState from './useToolCallState'; import useLazyHighlight from './useLazyHighlight'; -import useFollowScroll from './useFollowScroll'; import { OutputRenderer } from '../ToolOutput'; import { ERROR_PATTERNS } from './ExecuteCode'; import { AttachmentGroup } from './Attachment'; -import { useToolCallIntent } from './intent'; import PtcToolTrace from './PtcToolTrace'; -import BareStatus from './BareStatus'; import { useLocalize } from '~/hooks'; import { cn } from '~/utils'; diff --git a/client/src/components/Chat/Messages/Content/Parts/CodeWindowHeader.tsx b/client/src/components/Chat/Messages/Content/Parts/CodeWindowHeader.tsx index 0a89a2a68c..61fa912dd5 100644 --- a/client/src/components/Chat/Messages/Content/Parts/CodeWindowHeader.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/CodeWindowHeader.tsx @@ -1,8 +1,8 @@ import { useRef, useState, useCallback, useEffect } from 'react'; import copy from 'copy-to-clipboard'; +import { useToolContentPending } from '@librechat/chat/react'; import CopyButton from '~/components/Messages/Content/CopyButton'; import LangIcon from '~/components/Messages/Content/LangIcon'; -import { useToolContentPending } from '../disclosure'; import { useLocalize } from '~/hooks'; interface CodeWindowHeaderProps { diff --git a/client/src/components/Chat/Messages/Content/Parts/ExecuteCode.tsx b/client/src/components/Chat/Messages/Content/Parts/ExecuteCode.tsx index 0ae74d306d..d5ba44ad52 100644 --- a/client/src/components/Chat/Messages/Content/Parts/ExecuteCode.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/ExecuteCode.tsx @@ -1,21 +1,21 @@ import { useMemo } from 'react'; import { SquareTerminal } from 'lucide-react'; +import { TOOL_ROW_CLASSES, BareStatus, Stdout } from '@librechat/chat/components'; import { parseBackgroundHandle, splitBackgroundAttachments } from '@librechat/chat'; +import { + toolPanelSpacingClassName, + useFollowScroll, + useToolCallIntent, +} from '@librechat/chat/react'; import type { TAttachment, PartMetadata } from 'librechat-data-provider'; import ProgressText from '~/components/Chat/Messages/Content/ProgressText'; import { useMessagePartsHost } from '~/Providers/MessagePartsHostContext'; -import { toolPanelSpacingClassName } from '../disclosure'; import useLazyHighlight from './useLazyHighlight'; import useToolCallState from './useToolCallState'; import CodeWindowHeader from './CodeWindowHeader'; -import useFollowScroll from './useFollowScroll'; import { AttachmentGroup } from './Attachment'; -import { useToolCallIntent } from './intent'; -import { TOOL_ROW_CLASSES } from '../rows'; import PtcToolTrace from './PtcToolTrace'; -import BareStatus from './BareStatus'; import { useLocalize } from '~/hooks'; -import Stdout from './Stdout'; import { cn } from '~/utils'; interface ParsedArgs { diff --git a/client/src/components/Chat/Messages/Content/Parts/FileAuthoringCall.tsx b/client/src/components/Chat/Messages/Content/Parts/FileAuthoringCall.tsx index d86329e0a9..def2b9e0d3 100644 --- a/client/src/components/Chat/Messages/Content/Parts/FileAuthoringCall.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/FileAuthoringCall.tsx @@ -1,6 +1,12 @@ import { useMemo } from 'react'; import { FilePenLine, FilePlus2 } from 'lucide-react'; +import { TOOL_ROW_CLASSES, BareStatus } from '@librechat/chat/components'; import { parseJsonField, parseJsonFieldOccurrences } from '@librechat/chat'; +import { + toolPanelSpacingClassName, + useFollowScroll, + useToolCallIntent, +} from '@librechat/chat/react'; import type { TAttachment, PartMetadata } from 'librechat-data-provider'; import DiffView, { parseUnifiedDiff, @@ -9,16 +15,11 @@ import DiffView, { type TextEditPreview, } from './DiffView'; import ProgressText from '~/components/Chat/Messages/Content/ProgressText'; -import { toolPanelSpacingClassName } from '../disclosure'; import useToolCallState from './useToolCallState'; import useLazyHighlight from './useLazyHighlight'; import CodeWindowHeader from './CodeWindowHeader'; -import useFollowScroll from './useFollowScroll'; import { AttachmentGroup } from './Attachment'; import { langFromPath } from './ReadFileCall'; -import { useToolCallIntent } from './intent'; -import { TOOL_ROW_CLASSES } from '../rows'; -import BareStatus from './BareStatus'; import { useLocalize } from '~/hooks'; import { cn } from '~/utils'; diff --git a/client/src/components/Chat/Messages/Content/Parts/MemoryCall.tsx b/client/src/components/Chat/Messages/Content/Parts/MemoryCall.tsx index 1f657374b8..42977d3759 100644 --- a/client/src/components/Chat/Messages/Content/Parts/MemoryCall.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/MemoryCall.tsx @@ -2,13 +2,13 @@ import { useMemo } from 'react'; import { Brain } from 'lucide-react'; import { Tools } from 'librechat-data-provider'; import { parseJsonField } from '@librechat/chat'; +import { BareStatus } from '@librechat/chat/components'; +import { toolPanelSpacingClassName } from '@librechat/chat/react'; import type { PartMetadata, TAttachment, MemoryArtifact } from 'librechat-data-provider'; import ProgressText from '~/components/Chat/Messages/Content/ProgressText'; -import { toolPanelSpacingClassName } from '../disclosure'; import useToolCallState from './useToolCallState'; import { AttachmentGroup } from './Attachment'; import MemoryInfo from '../MemoryInfo'; -import BareStatus from './BareStatus'; import { useLocalize } from '~/hooks'; import { cn } from '~/utils'; diff --git a/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsx b/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsx index dadcdbd6dc..2c99f1f55f 100644 --- a/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/OpenAIImageGen/OpenAIImageGen.tsx @@ -1,6 +1,8 @@ import { useState, useEffect, useRef, useCallback } from 'react'; import { AGENT_STYLE_TOOLS } from '.'; import { PixelCard } from '@librechat/client'; +import { useToolCallIntent } from '@librechat/chat/react'; +import { ROW_GLYPH_SLOT } from '@librechat/chat/components'; import type { TAttachment, TFile, @@ -11,8 +13,6 @@ import { ToolIcon, isError } from '~/components/Chat/Messages/Content/ToolOutput import Image from '~/components/Chat/Messages/Content/Image'; import { useToolPreparation } from '../../preparation'; import { useProgress, useLocalize } from '~/hooks'; -import { useToolCallIntent } from '../intent'; -import { ROW_GLYPH_SLOT } from '../../rows'; import ProgressText from './ProgressText'; import { scaleImage } from '~/utils'; diff --git a/client/src/components/Chat/Messages/Content/Parts/PendingSkillCall.tsx b/client/src/components/Chat/Messages/Content/Parts/PendingSkillCall.tsx index d10210d6b7..124b2e52ad 100644 --- a/client/src/components/Chat/Messages/Content/Parts/PendingSkillCall.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/PendingSkillCall.tsx @@ -1,5 +1,5 @@ import { ScrollText } from 'lucide-react'; -import { ROW_GLYPH_SLOT, TOOL_ROW_CLASSES } from '../rows'; +import { ROW_GLYPH_SLOT, TOOL_ROW_CLASSES } from '@librechat/chat/components'; import { useLocalize } from '~/hooks'; import { cn } from '~/utils'; diff --git a/client/src/components/Chat/Messages/Content/Parts/PtcToolTrace.tsx b/client/src/components/Chat/Messages/Content/Parts/PtcToolTrace.tsx index 8cdb6b2169..480d012256 100644 --- a/client/src/components/Chat/Messages/Content/Parts/PtcToolTrace.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/PtcToolTrace.tsx @@ -1,11 +1,11 @@ import { useTranslation } from 'react-i18next'; +import { useFollowScroll } from '@librechat/chat/react'; import { isReportableRunStepDuration } from 'librechat-data-provider'; import type { TranslationKeys } from '~/hooks'; import type { PtcTraceEntry } from '~/common'; import { useMessagePartsHost } from '~/Providers/MessagePartsHostContext'; import { cn, parseToolName, getRunStepDurationLabels } from '~/utils'; import { useMCPServerNames } from '~/hooks/MCP'; -import useFollowScroll from './useFollowScroll'; import { useLocalize } from '~/hooks'; /** Terminal-style status column: one glyph wide for every state, so the diff --git a/client/src/components/Chat/Messages/Content/Parts/ReadFileCall.tsx b/client/src/components/Chat/Messages/Content/Parts/ReadFileCall.tsx index 85300e5d80..295c60086f 100644 --- a/client/src/components/Chat/Messages/Content/Parts/ReadFileCall.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/ReadFileCall.tsx @@ -1,16 +1,14 @@ import { useMemo } from 'react'; import { FileText } from 'lucide-react'; import { parseJsonField } from '@librechat/chat'; +import { TOOL_ROW_CLASSES, BareStatus } from '@librechat/chat/components'; +import { toolPanelSpacingClassName, useToolCallIntent } from '@librechat/chat/react'; import type { TAttachment, PartMetadata } from 'librechat-data-provider'; import ProgressText from '~/components/Chat/Messages/Content/ProgressText'; -import { toolPanelSpacingClassName } from '../disclosure'; import useToolCallState from './useToolCallState'; import useLazyHighlight from './useLazyHighlight'; import CodeWindowHeader from './CodeWindowHeader'; import { AttachmentGroup } from './Attachment'; -import { useToolCallIntent } from './intent'; -import { TOOL_ROW_CLASSES } from '../rows'; -import BareStatus from './BareStatus'; import { useLocalize } from '~/hooks'; import { cn } from '~/utils'; diff --git a/client/src/components/Chat/Messages/Content/Parts/Reasoning.tsx b/client/src/components/Chat/Messages/Content/Parts/Reasoning.tsx index c81dbc89b3..f1327e5709 100644 --- a/client/src/components/Chat/Messages/Content/Parts/Reasoning.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/Reasoning.tsx @@ -2,6 +2,8 @@ import { memo, useMemo, useState, useEffect, useCallback, useRef, useId } from ' import { useAtom } from 'jotai'; import copy from 'copy-to-clipboard'; import { Lightbulb, ChevronDown } from 'lucide-react'; +import { ROW_GLYPH_SLOT } from '@librechat/chat/components'; +import { useReasoningDisclosure } from '@librechat/chat/react'; import { Button, disclosureChevronVariants } from '@librechat/client'; import { ContentTypes, readableReasoning } from 'librechat-data-provider'; import type { MouseEvent, FocusEvent } from 'react'; @@ -16,8 +18,6 @@ import { useLocalize, useExpandCollapse, useLazyCollapseBody } from '~/hooks'; import { useMessagePartsHost } from '~/Providers/MessagePartsHostContext'; import useSmoothStreaming from '~/hooks/Messages/useSmoothStreaming'; import CopyButton from '~/components/Messages/Content/CopyButton'; -import { useReasoningDisclosure } from '../disclosure'; -import { ROW_GLYPH_SLOT } from '../rows'; import { cn } from '~/utils'; const stripThinkTags = (reasoning: string): string => diff --git a/client/src/components/Chat/Messages/Content/Parts/ResumeAuthorHeader.tsx b/client/src/components/Chat/Messages/Content/Parts/ResumeAuthorHeader.tsx index 297319b99f..710fc11cab 100644 --- a/client/src/components/Chat/Messages/Content/Parts/ResumeAuthorHeader.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/ResumeAuthorHeader.tsx @@ -1,6 +1,6 @@ import { memo } from 'react'; +import { AuthorHeader } from '@librechat/chat/components'; import { useAuthorContext } from '~/Providers'; -import AuthorHeader from './AuthorHeader'; /** * Restates the message author where content resumes after a steer, reading the diff --git a/client/src/components/Chat/Messages/Content/Parts/SkillCall.tsx b/client/src/components/Chat/Messages/Content/Parts/SkillCall.tsx index 9383615681..8100a1f540 100644 --- a/client/src/components/Chat/Messages/Content/Parts/SkillCall.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/SkillCall.tsx @@ -1,16 +1,13 @@ import { useMemo } from 'react'; import { ScrollText } from 'lucide-react'; import { parseJsonField } from '@librechat/chat'; +import { TOOL_ROW_CLASSES, BareStatus, Stdout } from '@librechat/chat/components'; +import { toolPanelSpacingClassName, useToolCallIntent } from '@librechat/chat/react'; import type { TAttachment, PartMetadata } from 'librechat-data-provider'; import ProgressText from '~/components/Chat/Messages/Content/ProgressText'; -import { toolPanelSpacingClassName } from '../disclosure'; import useToolCallState from './useToolCallState'; import { AttachmentGroup } from './Attachment'; -import { useToolCallIntent } from './intent'; -import { TOOL_ROW_CLASSES } from '../rows'; -import BareStatus from './BareStatus'; import { useLocalize } from '~/hooks'; -import Stdout from './Stdout'; import { cn } from '~/utils'; export default function SkillCall({ diff --git a/client/src/components/Chat/Messages/Content/Parts/SubagentCall.tsx b/client/src/components/Chat/Messages/Content/Parts/SubagentCall.tsx index acbca03801..20836ffe63 100644 --- a/client/src/components/Chat/Messages/Content/Parts/SubagentCall.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/SubagentCall.tsx @@ -1,6 +1,8 @@ import { useCallback, useContext, useEffect, useMemo, useReducer, useRef } from 'react'; import { useSetAtom } from 'jotai'; import { ChevronRight, Users } from 'lucide-react'; +import { useToolCallIntent } from '@librechat/chat/react'; +import { FOLD_GLYPH_CLASS } from '@librechat/chat/components'; import { parseSubagentBackgroundHandle } from '@librechat/chat'; import { ContentTypes, EModelEndpoint } from 'librechat-data-provider'; import type { @@ -32,10 +34,8 @@ import { useToolPreparation } from '../preparation'; import { useAgentsMapContext } from '~/Providers'; import { useMCPServerNames } from '~/hooks/MCP'; import { AttachmentGroup } from './Attachment'; -import { useToolCallIntent } from './intent'; import { useFailedReveal } from '../reveal'; import { cn, parseToolName } from '~/utils'; -import { FOLD_GLYPH_CLASS } from '../rows'; import { useLocalize } from '~/hooks'; interface SubagentCallProps { diff --git a/client/src/components/Chat/Messages/Content/Parts/Thinking.tsx b/client/src/components/Chat/Messages/Content/Parts/Thinking.tsx index 6553f190bd..97cd1b394f 100644 --- a/client/src/components/Chat/Messages/Content/Parts/Thinking.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/Thinking.tsx @@ -9,6 +9,7 @@ import { type MouseEvent, } from 'react'; import { Lightbulb, ChevronDown } from 'lucide-react'; +import { ROW_GLYPH_SLOT } from '@librechat/chat/components'; import { Button, MorphIcon, TooltipAnchor } from '@librechat/client'; import { ChevronUp as ChevronUpNode, ChevronDown as ChevronDownNode } from 'lucide'; import type { FocusEvent, FC } from 'react'; @@ -16,7 +17,6 @@ import { useMessagePartsHost } from '~/Providers/MessagePartsHostContext'; import CopyButton from '~/components/Messages/Content/CopyButton'; import { useLocalize, useExpandCollapse } from '~/hooks'; import { AnimatedText } from '../animate'; -import { ROW_GLYPH_SLOT } from '../rows'; import { cn } from '~/utils'; /** Whether any part of `el` is inside the viewport and every clipping ancestor. */ diff --git a/client/src/components/Chat/Messages/Content/Parts/__tests__/BashCall.test.tsx b/client/src/components/Chat/Messages/Content/Parts/__tests__/BashCall.test.tsx index 5f83626b4f..b0577ea66e 100644 --- a/client/src/components/Chat/Messages/Content/Parts/__tests__/BashCall.test.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/__tests__/BashCall.test.tsx @@ -2,7 +2,11 @@ import React from 'react'; import { RecoilRoot } from 'recoil'; import copy from 'copy-to-clipboard'; import { render, screen, fireEvent } from '@testing-library/react'; -import { LoneGroupContext, SoleToolContext, ToolContentRequestContext } from '../../disclosure'; +import { + LoneGroupContext, + SoleToolContext, + ToolContentRequestContext, +} from '@librechat/chat/react'; import BashCall from '../BashCall'; import store from '~/store'; diff --git a/client/src/components/Chat/Messages/Content/Parts/__tests__/ExecuteCode.test.tsx b/client/src/components/Chat/Messages/Content/Parts/__tests__/ExecuteCode.test.tsx index b13972dbd7..6fd32eb728 100644 --- a/client/src/components/Chat/Messages/Content/Parts/__tests__/ExecuteCode.test.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/__tests__/ExecuteCode.test.tsx @@ -38,9 +38,9 @@ jest.mock('../Attachment', () => ({ AttachmentGroup: () =>
, })); -jest.mock('../Stdout', () => ({ - __esModule: true, - default: () =>
, +jest.mock('@librechat/chat/components', () => ({ + ...jest.requireActual('@librechat/chat/components'), + Stdout: () =>
, })); jest.mock('../useLazyHighlight', () => { diff --git a/client/src/components/Chat/Messages/Content/Parts/__tests__/ReasoningCompact.test.tsx b/client/src/components/Chat/Messages/Content/Parts/__tests__/ReasoningCompact.test.tsx index bb9f66d41b..10eb557b49 100644 --- a/client/src/components/Chat/Messages/Content/Parts/__tests__/ReasoningCompact.test.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/__tests__/ReasoningCompact.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { render, screen } from '@testing-library/react'; +import { ROW_GLYPH_SLOT } from '@librechat/chat/components'; import { ReasoningCompact } from '../Reasoning'; -import { ROW_GLYPH_SLOT } from '../../rows'; jest.mock('~/hooks', () => ({ useLocalize: () => (key: string) => key, diff --git a/client/src/components/Chat/Messages/Content/Parts/__tests__/SoleFocus.test.tsx b/client/src/components/Chat/Messages/Content/Parts/__tests__/SoleFocus.test.tsx index aebb455c1a..63ec1306a8 100644 --- a/client/src/components/Chat/Messages/Content/Parts/__tests__/SoleFocus.test.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/__tests__/SoleFocus.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { RecoilRoot } from 'recoil'; +import { SoleToolContext } from '@librechat/chat/react'; import { act, render, screen } from '@testing-library/react'; -import { SoleToolContext } from '../../disclosure'; import BashCall from '../BashCall'; jest.mock('~/hooks', () => ({ diff --git a/client/src/components/Chat/Messages/Content/Parts/__tests__/SoleRow.test.tsx b/client/src/components/Chat/Messages/Content/Parts/__tests__/SoleRow.test.tsx index 78c3b99501..cd18a18e2e 100644 --- a/client/src/components/Chat/Messages/Content/Parts/__tests__/SoleRow.test.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/__tests__/SoleRow.test.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { RecoilRoot } from 'recoil'; import { render, screen } from '@testing-library/react'; +import { SoleToolContext } from '@librechat/chat/react'; import FileAuthoringCall from '../FileAuthoringCall'; -import { SoleToolContext } from '../../disclosure'; import ReadFileCall from '../ReadFileCall'; import MemoryCall from '../MemoryCall'; import SkillCall from '../SkillCall'; diff --git a/client/src/components/Chat/Messages/Content/Parts/__tests__/SubagentCall.test.tsx b/client/src/components/Chat/Messages/Content/Parts/__tests__/SubagentCall.test.tsx index d385e2895d..0c26c4dd79 100644 --- a/client/src/components/Chat/Messages/Content/Parts/__tests__/SubagentCall.test.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/__tests__/SubagentCall.test.tsx @@ -2,6 +2,7 @@ import React from 'react'; import { RecoilRoot } from 'recoil'; import { useAtomValue, useStore } from 'jotai'; import { MemoryRouter } from 'react-router-dom'; +import { FOLD_GLYPH_SELECTOR } from '@librechat/chat/components'; import { act, fireEvent, render, screen, waitFor, within } from '@testing-library/react'; import type { PartMetadata, @@ -31,7 +32,6 @@ import SubagentCall, { SUBAGENT_TICKER_THROTTLE_MS } from '../SubagentCall'; import { MessageContext } from '~/Providers/MessageContext'; import { FailedRevealContext } from '../../reveal'; import { ChatSurfaceHarness } from 'test/harness'; -import { FOLD_GLYPH_SELECTOR } from '../../rows'; import { litFoldPath } from '../../rail'; const mockMCPServerNames: string[] = []; diff --git a/client/src/components/Chat/Messages/Content/Parts/__tests__/host.test.tsx b/client/src/components/Chat/Messages/Content/Parts/__tests__/host.test.tsx index d553d93eae..acf5771d7f 100644 --- a/client/src/components/Chat/Messages/Content/Parts/__tests__/host.test.tsx +++ b/client/src/components/Chat/Messages/Content/Parts/__tests__/host.test.tsx @@ -1,4 +1,5 @@ import React from 'react'; +import { SoleToolContext, useToolAutoExpand } from '@librechat/chat/react'; import { render, renderHook, screen, fireEvent } from '@testing-library/react'; import type { TAttachment } from 'librechat-data-provider'; import type { @@ -8,7 +9,6 @@ import type { } from '~/hooks/Chat/contract'; import type { Artifact, PtcTrace } from '~/common'; import { MessagePartsHostProvider, appMessagePartsHost } from '~/Providers/MessagePartsHostContext'; -import { SoleToolContext, useToolAutoExpand } from '../../disclosure'; import ToolArtifactCard from '../ToolArtifactCard'; import { Text as TextPart } from '../index'; import PtcToolTrace from '../PtcToolTrace'; diff --git a/client/src/components/Chat/Messages/Content/Parts/index.ts b/client/src/components/Chat/Messages/Content/Parts/index.ts index 1af9dddfa6..770465b0b8 100644 --- a/client/src/components/Chat/Messages/Content/Parts/index.ts +++ b/client/src/components/Chat/Messages/Content/Parts/index.ts @@ -20,5 +20,5 @@ export { default as BashCall } from './BashCall'; export { default as PtcToolTrace } from './PtcToolTrace'; export { default as SubagentCall } from './SubagentCall'; export { default as SteerPart } from './SteerPart'; -export { default as AuthorHeader } from './AuthorHeader'; +export { AuthorHeader } from '@librechat/chat/components'; export { default as ResumeAuthorHeader } from './ResumeAuthorHeader'; diff --git a/client/src/components/Chat/Messages/Content/Parts/useToolCallState.ts b/client/src/components/Chat/Messages/Content/Parts/useToolCallState.ts index e62cfb9cf1..1589a725d8 100644 --- a/client/src/components/Chat/Messages/Content/Parts/useToolCallState.ts +++ b/client/src/components/Chat/Messages/Content/Parts/useToolCallState.ts @@ -1,16 +1,16 @@ import { useCallback, useContext } from 'react'; -import type { PartMetadata } from 'librechat-data-provider'; -import type { ToolCallPhase } from '~/utils/toolCallPhase'; import { SoleToolContext, LoneGroupContext, useToolExpansion, useToolContentRequest, -} from '../disclosure'; + useRowHandoff, +} from '@librechat/chat/react'; +import type { PartMetadata } from 'librechat-data-provider'; +import type { ToolCallPhase } from '~/utils/toolCallPhase'; import { isError } from '~/components/Chat/Messages/Content/ToolOutput'; import { resolveToolCallPhase } from '~/utils/toolCallPhase'; import { useProgress, useExpandCollapse } from '~/hooks'; -import useRowHandoff from '../handoff'; interface ToolCallState { showCode: boolean; diff --git a/client/src/components/Chat/Messages/Content/ProgressText.tsx b/client/src/components/Chat/Messages/Content/ProgressText.tsx index 6cd03af0c6..6525002719 100644 --- a/client/src/components/Chat/Messages/Content/ProgressText.tsx +++ b/client/src/components/Chat/Messages/Content/ProgressText.tsx @@ -2,15 +2,13 @@ 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 { ElapsedTimer, CancelledIcon, ROW_GLYPH_SLOT } from '@librechat/chat/components'; import type { ToolCallPhase } from '~/utils/toolCallPhase'; import { cn, getRunStepDurationLabels } from '~/utils'; import { useToolPreparation } from './preparation'; -import CancelledIcon from './CancelledIcon'; import { useFailedReveal } from './reveal'; -import { ROW_GLYPH_SLOT } from './rows'; import { useLocalize } from '~/hooks'; const wrapperClass = diff --git a/client/src/components/Chat/Messages/Content/RetrievalCall.tsx b/client/src/components/Chat/Messages/Content/RetrievalCall.tsx index 37fec61f84..e59bde5b7d 100644 --- a/client/src/components/Chat/Messages/Content/RetrievalCall.tsx +++ b/client/src/components/Chat/Messages/Content/RetrievalCall.tsx @@ -2,14 +2,17 @@ import { useMemo, useState, useCallback } from 'react'; import { Tools } from 'librechat-data-provider'; import { TooltipAnchor } from '@librechat/client'; import { FileText, FileSpreadsheet, FileCode, FileImage, File } from 'lucide-react'; +import { + toolPanelSpacingClassName, + useToolExpansion, + useToolCallIntent, +} from '@librechat/chat/react'; import type { TAttachment, TFile, PartMetadata } from 'librechat-data-provider'; -import { toolPanelSpacingClassName, useToolExpansion } from './disclosure'; import { useLocalize, useProgress, useExpandCollapse } from '~/hooks'; import { ToolIcon, OutputRenderer, isError } from './ToolOutput'; import { resolveToolCallPhase } from '~/utils/toolCallPhase'; import FilePreviewDialog from './FilePreviewDialog'; import { sortPagesByRelevance, cn } from '~/utils'; -import { useToolCallIntent } from './Parts/intent'; import { useToolPreparation } from './preparation'; import { useGetFiles } from '~/data-provider'; import ProgressText from './ProgressText'; diff --git a/client/src/components/Chat/Messages/Content/ToolCall.tsx b/client/src/components/Chat/Messages/Content/ToolCall.tsx index 6d759a07f6..e467390339 100644 --- a/client/src/components/Chat/Messages/Content/ToolCall.tsx +++ b/client/src/components/Chat/Messages/Content/ToolCall.tsx @@ -1,6 +1,7 @@ import React, { useMemo, useState, useEffect, useContext, useCallback } from 'react'; import { Button } from '@librechat/client'; import { hasToolParams } from '@librechat/chat'; +import { TOOL_ROW_CLASSES } from '@librechat/chat/components'; import { Constants, dataService, @@ -8,14 +9,16 @@ import { actionDomainSeparator, splitToolCallName, } from 'librechat-data-provider'; -import type { TAttachment, PartMetadata } from 'librechat-data-provider'; import { toolPanelSpacingClassName, useToolContentRequest, useToolExpansion, LoneGroupContext, SoleToolContext, -} from './disclosure'; + useToolCallIntent, + useRowHandoff, +} from '@librechat/chat/react'; +import type { TAttachment, PartMetadata } from 'librechat-data-provider'; import { useLocalize, useProgress, useExpandCollapse, useLazyCollapseBody } from '~/hooks'; import { ToolIcon, getToolIconType, isError, hasRenderableOutput } from './ToolOutput'; import { cn, getToolDisplayLabel, logger, openInNewTab } from '~/utils'; @@ -23,14 +26,11 @@ import { isToolCallPreparing, useToolPreparation } from './preparation'; import { useMCPIconMap, useMCPServerNames } from '~/hooks/MCP'; import { resolveToolCallPhase } from '~/utils/toolCallPhase'; import { MCPAppViews } from '~/components/MCPUIResource'; -import { useToolCallIntent } from './Parts/intent'; import { AttachmentGroup } from './Parts'; import ToolCallInfo from './ToolCallInfo'; import ProgressText from './ProgressText'; -import { TOOL_ROW_CLASSES } from './rows'; import { ToolAuthWarning } from './auth'; import { firstErrorLine } from './live'; -import useRowHandoff from './handoff'; export default function ToolCall({ initialProgress = 0.1, diff --git a/client/src/components/Chat/Messages/Content/ToolCallGroup.tsx b/client/src/components/Chat/Messages/Content/ToolCallGroup.tsx index 7225092375..8edc733b8f 100644 --- a/client/src/components/Chat/Messages/Content/ToolCallGroup.tsx +++ b/client/src/components/Chat/Messages/Content/ToolCallGroup.tsx @@ -1,4 +1,6 @@ import { useState, useRef, useMemo, useEffect, useContext, useCallback } from 'react'; +import { LoneGroupContext, SoleToolContext } from '@librechat/chat/react'; +import { FOLD_RAIL_CLASSES, ROW_GLYPH_SLOT } from '@librechat/chat/components'; import { Tools, Constants, ContentTypes, isOpaqueReasoning } from 'librechat-data-provider'; import { ChevronDown, ListChecks, MessageCircleQuestion, TriangleAlert, Users } from 'lucide-react'; import type { TAttachment, TMessageContentParts } from 'librechat-data-provider'; @@ -31,11 +33,9 @@ import { useLocalize, useExpandCollapse, scheduleMessageContentLayoutReconcile } import { ASK_USER_QUESTION, getSubmittedAskAnswer } from '~/utils/approval'; import { useMessagePartsHost } from '~/Providers/MessagePartsHostContext'; import { ToolAuthWarning, ToolAuthWarningContext } from './auth'; -import { LoneGroupContext, SoleToolContext } from './disclosure'; import { useMCPIconMap, useMCPServerNames } from '~/hooks/MCP'; import { AttachmentGroup, ReasoningCompact } from './Parts'; import { getOutcomeStatus, summarizeSpan } from './outcome'; -import { FOLD_RAIL_CLASSES, ROW_GLYPH_SLOT } from './rows'; import { MCPAppViews } from '~/components/MCPUIResource'; import { parseToolName } from '~/utils/toolLabels'; import { StackedToolIcons } from './ToolOutput'; diff --git a/client/src/components/Chat/Messages/Content/ToolOutput/OutputRenderer.tsx b/client/src/components/Chat/Messages/Content/ToolOutput/OutputRenderer.tsx index 14f5db6588..50e4c22345 100644 --- a/client/src/components/Chat/Messages/Content/ToolOutput/OutputRenderer.tsx +++ b/client/src/components/Chat/Messages/Content/ToolOutput/OutputRenderer.tsx @@ -1,11 +1,11 @@ import { useRef, useState, useMemo, useCallback, useLayoutEffect } from 'react'; import copy from 'copy-to-clipboard'; import { Button } from '@librechat/client'; +import { useToolContentPending } from '@librechat/chat/react'; +import { PANE_COPY_REVEAL } from '@librechat/chat/components'; import { hasToolCallErrorPrefix, stripToolCallErrorPrefix } from 'librechat-data-provider'; import type { UIEvent } from 'react'; import CopyButton from '~/components/Messages/Content/CopyButton'; -import { useToolContentPending } from '../disclosure'; -import { PANE_COPY_REVEAL } from '../rows'; import { useLocalize } from '~/hooks'; import { cn } from '~/utils'; diff --git a/client/src/components/Chat/Messages/Content/ToolOutput/__tests__/OutputRenderer.test.tsx b/client/src/components/Chat/Messages/Content/ToolOutput/__tests__/OutputRenderer.test.tsx index 41bb3894b6..70665911e5 100644 --- a/client/src/components/Chat/Messages/Content/ToolOutput/__tests__/OutputRenderer.test.tsx +++ b/client/src/components/Chat/Messages/Content/ToolOutput/__tests__/OutputRenderer.test.tsx @@ -1,7 +1,7 @@ import React from 'react'; import copy from 'copy-to-clipboard'; +import { ToolContentPendingContext } from '@librechat/chat/react'; import { fireEvent, render, screen } from '@testing-library/react'; -import { ToolContentPendingContext } from '../../disclosure'; import OutputRenderer, { isError } from '../OutputRenderer'; jest.mock('copy-to-clipboard', () => jest.fn()); diff --git a/client/src/components/Chat/Messages/Content/WebSearch.tsx b/client/src/components/Chat/Messages/Content/WebSearch.tsx index b1b316049d..4efb3a246f 100644 --- a/client/src/components/Chat/Messages/Content/WebSearch.tsx +++ b/client/src/components/Chat/Messages/Content/WebSearch.tsx @@ -2,6 +2,13 @@ import { useMemo, useState } from 'react'; import { Tools } from 'librechat-data-provider'; import { parseJsonField } from '@librechat/chat'; import { Globe, ChevronDown, Info } from 'lucide-react'; +import { ROW_GLYPH_SLOT } from '@librechat/chat/components'; +import { + useToolExpansion, + useToolContentRequest, + toolPanelSpacingClassName, + useToolCallIntent, +} from '@librechat/chat/react'; import { Button, HoverCard, @@ -17,17 +24,14 @@ import type { PartMetadata, AnswerBoxResult, } from 'librechat-data-provider'; -import { useToolExpansion, useToolContentRequest, toolPanelSpacingClassName } from './disclosure'; import { FaviconImage, getCleanDomain } from '~/components/Web/SourceHovercard'; import { useLocalize, useExpandCollapse, useLazyCollapseBody } from '~/hooks'; import { collectSources, getUniqueDomainSources } from './sources'; import { StackedFavicons } from '~/components/Web/Sources'; import { isError } from './ToolOutput/OutputRenderer'; -import { useToolCallIntent } from './Parts/intent'; import { useToolPreparation } from './preparation'; import { useSearchContext } from '~/Providers'; import SearchVerticals from './verticals'; -import { ROW_GLYPH_SLOT } from './rows'; import ToolCall from './ToolCall'; import cn from '~/utils/cn'; diff --git a/client/src/components/Chat/Messages/Content/__tests__/ActivityPhaseGroup.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/ActivityPhaseGroup.test.tsx index 06fc7ec5c7..b2eac831b3 100644 --- a/client/src/components/Chat/Messages/Content/__tests__/ActivityPhaseGroup.test.tsx +++ b/client/src/components/Chat/Messages/Content/__tests__/ActivityPhaseGroup.test.tsx @@ -1,7 +1,7 @@ import { ContentTypes, Tools } from 'librechat-data-provider'; +import { ROW_GLYPH_SLOT, TOOL_ROW_CLASSES } from '@librechat/chat/components'; import { act, fireEvent, render, screen, within } from '@testing-library/react'; import type { TAttachment, TMessageContentParts } from 'librechat-data-provider'; -import { ROW_GLYPH_SLOT, TOOL_ROW_CLASSES } from '../rows'; import { MessageSurfaceContext } from '../../ui/surface'; import ActivityPhaseGroup from '../ActivityPhaseGroup'; import { useFailedReveal } from '../reveal'; diff --git a/client/src/components/Chat/Messages/Content/__tests__/AskUserQuestionCall.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/AskUserQuestionCall.test.tsx index 042d409fa3..7cb6661f45 100644 --- a/client/src/components/Chat/Messages/Content/__tests__/AskUserQuestionCall.test.tsx +++ b/client/src/components/Chat/Messages/Content/__tests__/AskUserQuestionCall.test.tsx @@ -1,6 +1,7 @@ import React from 'react'; import { RecoilRoot } from 'recoil'; import { fireEvent, render, screen } from '@testing-library/react'; +import '~/Providers/MessagePartsHostContext'; import AskUserQuestionCall from '../AskUserQuestionCall'; import { FailedRevealContext } from '../reveal'; import store from '~/store'; diff --git a/client/src/components/Chat/Messages/Content/__tests__/ContentParts.integration.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/ContentParts.integration.test.tsx index 98694e9033..fd54efa68e 100644 --- a/client/src/components/Chat/Messages/Content/__tests__/ContentParts.integration.test.tsx +++ b/client/src/components/Chat/Messages/Content/__tests__/ContentParts.integration.test.tsx @@ -1,5 +1,6 @@ import React from 'react'; import { RecoilRoot } from 'recoil'; +import { FOLD_GLYPH_CLASS } from '@librechat/chat/components'; import { Constants, ContentTypes, Tools } from 'librechat-data-provider'; import { act, fireEvent, render, screen, within } from '@testing-library/react'; import type { EventSubmission, TAttachment, TMessageContentParts } from 'librechat-data-provider'; @@ -8,7 +9,6 @@ import useAttachmentHandler from '~/hooks/SSE/useAttachmentHandler'; import useAttachments from '~/hooks/Messages/useAttachments'; import { ParallelColumns } from '../ParallelContent'; import ContentParts from '../ContentParts'; -import { FOLD_GLYPH_CLASS } from '../rows'; import { litFoldPath } from '../rail'; import { Text } from '../Parts'; diff --git a/client/src/components/Chat/Messages/Content/__tests__/ContentParts.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/ContentParts.test.tsx index ca566a3106..66c70586c0 100644 --- a/client/src/components/Chat/Messages/Content/__tests__/ContentParts.test.tsx +++ b/client/src/components/Chat/Messages/Content/__tests__/ContentParts.test.tsx @@ -142,7 +142,8 @@ jest.mock('../Part', () => { const { useMessageContext } = jest.requireActual( '~/Providers/MessageContext', ); - const { SoleToolContext } = jest.requireActual('../disclosure'); + const { SoleToolContext } = + jest.requireActual('@librechat/chat/react'); const { useContext } = jest.requireActual('react'); return { __esModule: true, diff --git a/client/src/components/Chat/Messages/Content/__tests__/ProgressText.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/ProgressText.test.tsx index 04b7c23053..c483bde893 100644 --- a/client/src/components/Chat/Messages/Content/__tests__/ProgressText.test.tsx +++ b/client/src/components/Chat/Messages/Content/__tests__/ProgressText.test.tsx @@ -27,9 +27,9 @@ jest.mock('react-i18next', () => ({ useTranslation: () => ({ i18n: { language: 'en' } }), })); -jest.mock('../CancelledIcon', () => ({ - __esModule: true, - default: () => , +jest.mock('@librechat/chat/components', () => ({ + ...jest.requireActual('@librechat/chat/components'), + CancelledIcon: () => , })); const defaults = { diff --git a/client/src/components/Chat/Messages/Content/__tests__/RetrievalCall.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/RetrievalCall.test.tsx index 5f28b4322f..5baa051c86 100644 --- a/client/src/components/Chat/Messages/Content/__tests__/RetrievalCall.test.tsx +++ b/client/src/components/Chat/Messages/Content/__tests__/RetrievalCall.test.tsx @@ -2,6 +2,7 @@ import React from 'react'; import { RecoilRoot } from 'recoil'; import { render, screen, fireEvent } from '@testing-library/react'; import type { TAttachment } from 'librechat-data-provider'; +import '~/Providers/MessagePartsHostContext'; import RetrievalCall from '../RetrievalCall'; jest.mock('~/hooks', () => ({ diff --git a/client/src/components/Chat/Messages/Content/__tests__/ToolCall.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/ToolCall.test.tsx index 72b82862c0..86f6f3c4ec 100644 --- a/client/src/components/Chat/Messages/Content/__tests__/ToolCall.test.tsx +++ b/client/src/components/Chat/Messages/Content/__tests__/ToolCall.test.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { RecoilRoot } from 'recoil'; import { Tools, Constants, dataService } from 'librechat-data-provider'; +import { LoneGroupContext, SoleToolContext } from '@librechat/chat/react'; import { render, screen, waitFor, fireEvent } from '@testing-library/react'; import type { TStartupConfig } from 'librechat-data-provider'; import { MCPAppsPolicyProvider } from '~/Providers/MCPAppsPolicyContext'; -import { LoneGroupContext, SoleToolContext } from '../disclosure'; import { ToolAuthWarningContext } from '../auth'; import ToolCall from '../ToolCall'; import { logger } from '~/utils'; diff --git a/client/src/components/Chat/Messages/Content/__tests__/ToolCallGroup.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/ToolCallGroup.test.tsx index d221d93bbd..35221bad80 100644 --- a/client/src/components/Chat/Messages/Content/__tests__/ToolCallGroup.test.tsx +++ b/client/src/components/Chat/Messages/Content/__tests__/ToolCallGroup.test.tsx @@ -2,8 +2,8 @@ import React, { useContext } from 'react'; import { RecoilRoot } from 'recoil'; import { fireEvent, render, screen, waitFor } from '@testing-library/react'; import { Tools, Constants, ContentTypes, ToolCallTypes } from 'librechat-data-provider'; +import { LoneGroupContext, SoleToolContext, useToolAutoExpand } from '@librechat/chat/react'; import type { TAttachment, TMessageContentParts } from 'librechat-data-provider'; -import { LoneGroupContext, SoleToolContext, useToolAutoExpand } from '../disclosure'; import { FailedRevealContext, useFailedReveal } from '../reveal'; import { scheduleMessageContentLayoutReconcile } from '~/hooks'; import ToolCallGroup from '../ToolCallGroup'; diff --git a/client/src/components/Chat/Messages/Content/__tests__/WebSearch.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/WebSearch.test.tsx index c82c6164c3..24e35f459a 100644 --- a/client/src/components/Chat/Messages/Content/__tests__/WebSearch.test.tsx +++ b/client/src/components/Chat/Messages/Content/__tests__/WebSearch.test.tsx @@ -1,6 +1,8 @@ import React from 'react'; import { RecoilRoot } from 'recoil'; import { Tools } from 'librechat-data-provider'; +import { ROW_GLYPH_SLOT } from '@librechat/chat/components'; +import { ToolContentRequestContext } from '@librechat/chat/react'; import { fireEvent, render, screen } from '@testing-library/react'; import type { TAttachment, @@ -8,10 +10,8 @@ import type { ValidSource, PartMetadata, } from 'librechat-data-provider'; -import { ToolContentRequestContext } from '../disclosure'; import { FailedRevealContext } from '../reveal'; import { SearchContext } from '~/Providers'; -import { ROW_GLYPH_SLOT } from '../rows'; import WebSearch from '../WebSearch'; jest.mock('~/hooks', () => ({ diff --git a/client/src/components/Chat/Messages/Content/__tests__/hydration.test.tsx b/client/src/components/Chat/Messages/Content/__tests__/hydration.test.tsx index 39ca7c7e76..ab5e9c2898 100644 --- a/client/src/components/Chat/Messages/Content/__tests__/hydration.test.tsx +++ b/client/src/components/Chat/Messages/Content/__tests__/hydration.test.tsx @@ -3,8 +3,6 @@ import { RecoilRoot } from 'recoil'; import { ContentTypes, dataService } from 'librechat-data-provider'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'; -import type { TMessageContentParts, ToolCallPartResponse } from 'librechat-data-provider'; -import type { ToolContentQuery, ToolDisclosures } from '../disclosure'; import { SoleToolContext, ToolContentQueryContext, @@ -12,7 +10,9 @@ import { useToolContentPending, ToolDisclosureContext, ToolDisclosureKeyContext, -} from '../disclosure'; +} from '@librechat/chat/react'; +import type { TMessageContentParts, ToolCallPartResponse } from 'librechat-data-provider'; +import type { ToolContentQuery, ToolDisclosures } from '@librechat/chat/react'; import { isPreviewedToolCallPart, PreviewedToolCallPart, withFullToolCall } from '../hydration'; import { MessageContext } from '~/Providers'; diff --git a/client/src/components/Chat/Messages/Content/hydration.tsx b/client/src/components/Chat/Messages/Content/hydration.tsx index 37a22db0d4..83163c3ee9 100644 --- a/client/src/components/Chat/Messages/Content/hydration.tsx +++ b/client/src/components/Chat/Messages/Content/hydration.tsx @@ -5,13 +5,13 @@ import { hasToolCallPreview, getToolCallPreviewRevision, } from 'librechat-data-provider'; -import type { FullToolCall, TMessageContentParts } from 'librechat-data-provider'; -import type { ReactNode } from 'react'; import { ToolContentRequestContext, ToolContentPendingContext, ToolContentQueryContext, -} from './disclosure'; +} from '@librechat/chat/react'; +import type { FullToolCall, TMessageContentParts } from 'librechat-data-provider'; +import type { ReactNode } from 'react'; import { useMessagePartsHost } from '~/Providers/MessagePartsHostContext'; import { useToolCallPartQuery } from '~/data-provider'; import { useLocalize } from '~/hooks'; diff --git a/client/src/components/Chat/Messages/Content/live.ts b/client/src/components/Chat/Messages/Content/live.ts index df6e7bf8eb..3b566763fd 100644 --- a/client/src/components/Chat/Messages/Content/live.ts +++ b/client/src/components/Chat/Messages/Content/live.ts @@ -1,3 +1,4 @@ +import { boundIntentLabel, getToolCallIntent } from '@librechat/chat/react'; import { Constants, ContentTypes, @@ -19,7 +20,6 @@ import { hasPendingApprovalInPart, hasPendingAuthInPart } from '~/utils/groupToo import { ASK_USER_QUESTION, getSubmittedAskAnswer } from '~/utils/approval'; import { getToolDisplayLabel, parseToolName } from '~/utils/toolLabels'; import { getToolIconName, getToolMeta, summarizeSpan } from './outcome'; -import { boundIntentLabel, getToolCallIntent } from './Parts/intent'; import { isError } from './ToolOutput'; /** How often a live fold's header may repaint. A streamed intent moves the diff --git a/client/src/components/Chat/Messages/Content/rail.tsx b/client/src/components/Chat/Messages/Content/rail.tsx index 35eae36628..db8d66a139 100644 --- a/client/src/components/Chat/Messages/Content/rail.tsx +++ b/client/src/components/Chat/Messages/Content/rail.tsx @@ -7,8 +7,8 @@ import { useSyncExternalStore, } from 'react'; import { CircleMinus } from 'lucide-react'; +import { ROW_GLYPH_SLOT, FOLD_GLYPH_SELECTOR } from '@librechat/chat/components'; import type { ReactNode, RefObject } from 'react'; -import { ROW_GLYPH_SLOT, FOLD_GLYPH_SELECTOR } from './rows'; import { cn } from '~/utils'; /** diff --git a/client/src/components/Chat/Messages/SearchMessage.tsx b/client/src/components/Chat/Messages/SearchMessage.tsx index 457f78c4fb..324b116765 100644 --- a/client/src/components/Chat/Messages/SearchMessage.tsx +++ b/client/src/components/Chat/Messages/SearchMessage.tsx @@ -1,14 +1,14 @@ import { memo, useMemo } from 'react'; import { useRecoilValue } from 'recoil'; import { - getHeaderModelName, SubRow, - getMessageRowWidthClass, MessageRow, + AuthorHeader, + getHeaderModelName, + getMessageRowWidthClass, } 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 { getHeaderPrefixForScreenReader, getMessageAriaLabel } from '~/utils'; import SearchContent, { rendersMarkdownLite } from './Content/SearchContent'; diff --git a/client/src/components/Chat/Messages/__tests__/HoverActions.streaming.spec.tsx b/client/src/components/Chat/Messages/__tests__/HoverActions.streaming.spec.tsx index 78bae88ae6..8768131ed9 100644 --- a/client/src/components/Chat/Messages/__tests__/HoverActions.streaming.spec.tsx +++ b/client/src/components/Chat/Messages/__tests__/HoverActions.streaming.spec.tsx @@ -49,9 +49,9 @@ jest.mock('~/components/Chat/Messages/Content/ContentParts', () => { }; }); -jest.mock('~/components/Chat/Messages/Content/Parts/AuthorHeader', () => ({ - __esModule: true, - default: () =>
, +jest.mock('@librechat/chat/components', () => ({ + ...jest.requireActual('@librechat/chat/components'), + AuthorHeader: () =>
, })); jest.mock('~/components/Chat/Messages/MessageIcon', () => ({ diff --git a/client/src/components/Chat/Subagents/SubagentActivity.tsx b/client/src/components/Chat/Subagents/SubagentActivity.tsx index 7d5011dd20..c44e658de6 100644 --- a/client/src/components/Chat/Subagents/SubagentActivity.tsx +++ b/client/src/components/Chat/Subagents/SubagentActivity.tsx @@ -4,10 +4,11 @@ import { Alert, Button } from '@librechat/client'; import { Maximize2, Minimize2 } from 'lucide-react'; import { CSSTransition } from 'react-transition-group'; import { MessageTimestamp } from '@librechat/chat/components'; +import { ToolContentQueryContext } from '@librechat/chat/react'; import { ContentTypes, QueryKeys, dataService } from 'librechat-data-provider'; import type { SearchResultData, TMessageContentParts } from 'librechat-data-provider'; import type { SteerReceiptState } from '@librechat/chat/components'; -import type { ToolContentQuery } from '~/components/Chat/Messages/Content/disclosure'; +import type { ToolContentQuery } from '@librechat/chat/react'; import type { TaskContentScope } from '~/data-provider/Subagents/content'; import type { ChildActivity, ChildActivityItem } from './adapters'; import type { TranslationKeys } from '~/hooks'; @@ -17,7 +18,6 @@ import { subagentStatusIcon, subagentStatusLabelKey, } from './status'; -import { ToolContentQueryContext } from '~/components/Chat/Messages/Content/disclosure'; import { TaskContentScopeContext } from '~/data-provider/Subagents/content'; import MarkdownLite from '~/components/Chat/Messages/Content/MarkdownLite'; import ContentParts from '~/components/Chat/Messages/Content/ContentParts'; diff --git a/client/src/components/Chat/Subagents/SubagentConversation.tsx b/client/src/components/Chat/Subagents/SubagentConversation.tsx index 5e464f4e8c..219672975a 100644 --- a/client/src/components/Chat/Subagents/SubagentConversation.tsx +++ b/client/src/components/Chat/Subagents/SubagentConversation.tsx @@ -17,8 +17,8 @@ import { MessageRow, } from '@librechat/chat/components'; import type { TMessage, TMessageContentParts } from 'librechat-data-provider'; +import type { ToolContentQuery } from '@librechat/chat/react'; import type { ReactNode } from 'react'; -import type { ToolContentQuery } from '~/components/Chat/Messages/Content/disclosure'; import type { TaskContentScope } from '~/data-provider/Subagents/content'; import type { MessagePartsHost } from '~/hooks/Chat/contract'; import type { ChildConversationTurn } from './adapters'; diff --git a/client/src/components/Share/Message.tsx b/client/src/components/Share/Message.tsx index 2a7e484c29..dc7c1c0efa 100644 --- a/client/src/components/Share/Message.tsx +++ b/client/src/components/Share/Message.tsx @@ -1,11 +1,16 @@ import { useMemo } from 'react'; import { parseWakeupMessage } from '@librechat/chat'; -import { getHeaderHoverLabel, SiblingSwitch, SubRow, MessageRow } from '@librechat/chat/components'; +import { + SubRow, + MessageRow, + AuthorHeader, + SiblingSwitch, + getHeaderHoverLabel, +} from '@librechat/chat/components'; import type { TMessageProps } from '~/common'; import SearchContent, { rendersMarkdownLite, } from '~/components/Chat/Messages/Content/SearchContent'; -import AuthorHeader from '~/components/Chat/Messages/Content/Parts/AuthorHeader'; import MinimalHoverButtons from '~/components/Chat/Messages/MinimalHoverButtons'; import MessageContent from '~/components/Chat/Messages/Content/MessageContent'; import { getHeaderPrefixForScreenReader, getMessageAriaLabel } from '~/utils'; diff --git a/client/src/data-provider/Subagents/content.tsx b/client/src/data-provider/Subagents/content.tsx index 5c7a084f50..961a24c0f9 100644 --- a/client/src/data-provider/Subagents/content.tsx +++ b/client/src/data-provider/Subagents/content.tsx @@ -4,7 +4,7 @@ import { useQuery, useQueryClient } from '@tanstack/react-query'; import { QueryKeys, dataService, hasToolCallPreview } from 'librechat-data-provider'; import type { SubagentTaskContentSnapshot, ToolCallPartResponse } from 'librechat-data-provider'; import type { QueryClient, UseQueryOptions } from '@tanstack/react-query'; -import type { ToolContentQuery } from '~/components/Chat/Messages/Content/disclosure'; +import type { ToolContentQuery } from '@librechat/chat/react'; import type { RecoveredContent } from '~/components/Chat/Subagents/recovery'; import { recoverTaskContent, recoveredToolPart } from '~/components/Chat/Subagents/recovery'; import { isLiveSubagentStatus } from '~/components/Chat/Subagents/status'; diff --git a/e2e/specs/mock/scenarios/steer-author-header.spec.ts b/e2e/specs/mock/scenarios/steer-author-header.spec.ts new file mode 100644 index 0000000000..2dda2bedf7 --- /dev/null +++ b/e2e/specs/mock/scenarios/steer-author-header.spec.ts @@ -0,0 +1,69 @@ +import { expect, test } from '@playwright/test'; +import { randomUUID } from 'node:crypto'; +import { getE2EUser } from '../../../setup/user'; +import { + deleteConversations, + deleteMessagesByConversation, + seedConversations, + seedMessages, +} from '../db'; +import type { SeedMessage } from '../db'; + +const userEmail = getE2EUser().email; +const ROOT_PARENT = '00000000-0000-0000-0000-000000000000'; + +/** A reply the user steered mid-stream, seeded straight into Mongo: the steer + * part sits between the text before and after it, as a finished run stores it. */ +async function seedSteeredReply() { + const conversationId = randomUUID(); + const userId = randomUUID(); + const replyId = randomUUID(); + const messages: SeedMessage[] = [ + { + messageId: userId, + parentMessageId: ROOT_PARENT, + text: 'Tell me about animals', + isCreatedByUser: true, + sender: 'User', + }, + { + messageId: replyId, + parentMessageId: userId, + text: 'Dogs are loyal. Cats are independent.', + isCreatedByUser: false, + sender: 'OpenAI', + content: [ + { type: 'text', text: 'Dogs are loyal.' }, + { type: 'steer', steer: 'Focus on cats', steerId: randomUUID() }, + { type: 'text', text: 'Cats are independent.' }, + ], + }, + ]; + await seedConversations(userEmail, [ + { conversationId, title: `Steer ${conversationId.slice(0, 8)}`, updatedAt: new Date() }, + ]); + await seedMessages(userEmail, conversationId, messages); + return { conversationId, replyId }; +} + +async function cleanup(conversationId: string) { + await deleteMessagesByConversation([conversationId]); + await deleteConversations([conversationId]); +} + +test('content that resumes after a steer restates its author @scenario:steered-reply-restates-author-after-steer', async ({ + page, +}) => { + const { conversationId, replyId } = await seedSteeredReply(); + try { + await page.goto(`/c/${conversationId}`); + const reply = page.locator(`[id="${replyId}"]`); + await expect(reply.getByText('Focus on cats')).toBeVisible(); + await expect(reply.getByText('Cats are independent.')).toBeVisible(); + const header = reply.getByTestId('author-header'); + await expect(header).toHaveCount(1); + await expect(header.getByRole('heading')).not.toHaveText(''); + } finally { + await cleanup(conversationId); + } +}); diff --git a/packages/chat/src/components.ts b/packages/chat/src/components.ts index 63a58ea0b6..d0918b90c4 100644 --- a/packages/chat/src/components.ts +++ b/packages/chat/src/components.ts @@ -58,3 +58,19 @@ export { default as MessageTimestamp } from './components/messages/MessageTimest export { getMessageRowWidthClass } from './components/messages/width'; export { isValidTimestamp, getMessageTimestamp } from './components/messages/time'; export type { MessageTimestamp as MessageTimestampParts } from './components/messages/time'; + +/** Parts: the leaf components and row classes tool cards share. */ +export { default as Stdout } from './components/parts/Stdout'; +export { default as BareStatus } from './components/parts/BareStatus'; +export { default as AuthorHeader } from './components/parts/AuthorHeader'; +export { default as CancelledIcon } from './components/parts/CancelledIcon'; +export { default as InProgressCall } from './components/parts/InProgressCall'; +export { + ROW_GLYPH_SLOT, + PANE_COPY_REVEAL, + FOLD_GLYPH_CLASS, + TOOL_ROW_CLASSES, + FOLD_RAIL_CLASSES, + FOLD_GLYPH_SELECTOR, + ARTIFACT_ROW_NAV_SPACING, +} from './components/parts/rows'; diff --git a/packages/chat/src/components/parts/AuthorHeader.tsx b/packages/chat/src/components/parts/AuthorHeader.tsx new file mode 100644 index 0000000000..722ee90989 --- /dev/null +++ b/packages/chat/src/components/parts/AuthorHeader.tsx @@ -0,0 +1,31 @@ +import { memo } from 'react'; +import type { MemoExoticComponent, ReactNode } from 'react'; + +/** + * Re-attributes response content to its author mid-message. A `SteerPart` + * renders a full user turn inside the response, so the parts that resume + * after it need the author's icon and label restated. The message-level + * header only renders once, above the first part. Sits on the same left + * edge as the message body. + */ +type AuthorHeaderProps = { icon: ReactNode; label: string }; + +const AuthorHeader: MemoExoticComponent<(props: AuthorHeaderProps) => ReactNode> = memo( + function AuthorHeader({ icon, label }: AuthorHeaderProps) { + return ( +
+ +

+ {label} +

+
+ ); + }, +); + +export default AuthorHeader; diff --git a/client/src/components/Chat/Messages/Content/Parts/BareStatus.tsx b/packages/chat/src/components/parts/BareStatus.tsx similarity index 86% rename from client/src/components/Chat/Messages/Content/Parts/BareStatus.tsx rename to packages/chat/src/components/parts/BareStatus.tsx index 7745227bcd..91cdb3c009 100644 --- a/client/src/components/Chat/Messages/Content/Parts/BareStatus.tsx +++ b/packages/chat/src/components/parts/BareStatus.tsx @@ -1,5 +1,6 @@ import { useContext } from 'react'; -import { LoneGroupContext, SoleToolContext } from '../disclosure'; +import type { ReactNode } from 'react'; +import { LoneGroupContext, SoleToolContext } from '../../react/parts/disclosure'; /** * The settled outcome of a sole call, spoken after its row is gone. The row's @@ -12,7 +13,7 @@ import { LoneGroupContext, SoleToolContext } from '../disclosure'; * Only a call that can drop its row renders it, so a card with a row of its * own never carries a second, empty live region. */ -export default function BareStatus({ active, text }: { active: boolean; text: string }) { +export default function BareStatus({ active, text }: { active: boolean; text: string }): ReactNode { const sole = useContext(SoleToolContext) === true; const lone = useContext(LoneGroupContext); if (!sole && !lone) { diff --git a/packages/chat/src/components/parts/CancelledIcon.tsx b/packages/chat/src/components/parts/CancelledIcon.tsx new file mode 100644 index 0000000000..6759279b85 --- /dev/null +++ b/packages/chat/src/components/parts/CancelledIcon.tsx @@ -0,0 +1,10 @@ +import { X } from 'lucide-react'; +import type { ReactNode } from 'react'; + +export default function CancelledIcon(): ReactNode { + return ( +
+
+ ); +} diff --git a/client/src/components/Chat/Messages/Content/InProgressCall.tsx b/packages/chat/src/components/parts/InProgressCall.tsx similarity index 80% rename from client/src/components/Chat/Messages/Content/InProgressCall.tsx rename to packages/chat/src/components/parts/InProgressCall.tsx index 019a3e2d0a..62b2872c9f 100644 --- a/client/src/components/Chat/Messages/Content/InProgressCall.tsx +++ b/packages/chat/src/components/parts/InProgressCall.tsx @@ -1,3 +1,4 @@ +import type { ReactNode } from 'react'; import CancelledIcon from './CancelledIcon'; export default function InProgressCall({ @@ -9,8 +10,8 @@ export default function InProgressCall({ error?: boolean; isSubmitting: boolean; progress: number; - children: React.ReactNode; -}) { + children: ReactNode; +}): ReactNode { if ((!isSubmitting && progress < 1) || error === true) { return ; } diff --git a/client/src/components/Chat/Messages/Content/Parts/Stdout.tsx b/packages/chat/src/components/parts/Stdout.tsx similarity index 80% rename from client/src/components/Chat/Messages/Content/Parts/Stdout.tsx rename to packages/chat/src/components/parts/Stdout.tsx index 68813a22ca..b9d4f4e45c 100644 --- a/client/src/components/Chat/Messages/Content/Parts/Stdout.tsx +++ b/packages/chat/src/components/parts/Stdout.tsx @@ -1,10 +1,11 @@ import { useMemo } from 'react'; +import type { ReactNode } from 'react'; interface StdoutProps { output?: string; } -export default function Stdout({ output = '' }: StdoutProps) { +export default function Stdout({ output = '' }: StdoutProps): ReactNode { const processedContent = useMemo(() => { if (!output) { return ''; diff --git a/client/src/components/Chat/Messages/Content/Parts/__tests__/AuthorHeader.spec.tsx b/packages/chat/src/components/parts/__tests__/AuthorHeader.spec.tsx similarity index 96% rename from client/src/components/Chat/Messages/Content/Parts/__tests__/AuthorHeader.spec.tsx rename to packages/chat/src/components/parts/__tests__/AuthorHeader.spec.tsx index a5cb265eda..097f1329b5 100644 --- a/client/src/components/Chat/Messages/Content/Parts/__tests__/AuthorHeader.spec.tsx +++ b/packages/chat/src/components/parts/__tests__/AuthorHeader.spec.tsx @@ -1,3 +1,6 @@ +/** + * @jest-environment jsdom + */ import { render, screen } from '@testing-library/react'; import AuthorHeader from '../AuthorHeader'; diff --git a/client/src/components/Chat/Messages/Content/rows.ts b/packages/chat/src/components/parts/rows.ts similarity index 92% rename from client/src/components/Chat/Messages/Content/rows.ts rename to packages/chat/src/components/parts/rows.ts index c1bcff0fbc..545817ef11 100644 --- a/client/src/components/Chat/Messages/Content/rows.ts +++ b/packages/chat/src/components/parts/rows.ts @@ -24,10 +24,10 @@ export const FOLD_GLYPH_CLASS = 'fold-glyph'; * and would carry a taller slot 2px below the row's center. `fold-glyph` is a * hook, not a style: see `FOLD_GLYPH_SELECTOR`. */ -export const ROW_GLYPH_SLOT = `${FOLD_GLYPH_CLASS} flex h-5 min-w-6 shrink-0 items-center justify-center`; +export const ROW_GLYPH_SLOT: string = `${FOLD_GLYPH_CLASS} flex h-5 min-w-6 shrink-0 items-center justify-center`; /** Shared by normal row slots and custom header glyphs. */ -export const FOLD_GLYPH_SELECTOR = `.${FOLD_GLYPH_CLASS}`; +export const FOLD_GLYPH_SELECTOR: string = `.${FOLD_GLYPH_CLASS}`; /** * The panel under an open header: its rows step in by one glyph slot and a diff --git a/packages/chat/src/react.ts b/packages/chat/src/react.ts index 5c6fe7bbde..fa69a17ec3 100644 --- a/packages/chat/src/react.ts +++ b/packages/chat/src/react.ts @@ -125,3 +125,29 @@ export { setDefaultMessagesHost, } from './react/messages/host'; export type { MessagesHost } from './react/messages/host'; +export { + SoleToolContext, + LoneGroupContext, + useToolExpansion, + useToolAutoExpand, + useToolDisclosure, + reasoningDisclosure, + ToolDisclosureContext, + useToolContentPending, + useToolContentRequest, + useReasoningDisclosure, + ToolContentQueryContext, + ToolDisclosureKeyContext, + ToolContentPendingContext, + ToolContentRequestContext, + toolPanelSpacingClassName, + ReasoningDisclosureContext, +} from './react/parts/disclosure'; +export type { + ToolDisclosures, + ToolContentQuery, + ReasoningDisclosures, +} from './react/parts/disclosure'; +export { boundIntentLabel, getToolCallIntent, useToolCallIntent } from './react/parts/intent'; +export { default as useFollowScroll } from './react/parts/useFollowScroll'; +export { default as useRowHandoff } from './react/parts/handoff'; diff --git a/client/src/components/Chat/Messages/Content/Parts/__tests__/useFollowScroll.spec.tsx b/packages/chat/src/react/parts/__tests__/useFollowScroll.spec.tsx similarity index 99% rename from client/src/components/Chat/Messages/Content/Parts/__tests__/useFollowScroll.spec.tsx rename to packages/chat/src/react/parts/__tests__/useFollowScroll.spec.tsx index 4a996c7ca9..bbc8c74ca0 100644 --- a/client/src/components/Chat/Messages/Content/Parts/__tests__/useFollowScroll.spec.tsx +++ b/packages/chat/src/react/parts/__tests__/useFollowScroll.spec.tsx @@ -1,3 +1,6 @@ +/** + * @jest-environment jsdom + */ import React from 'react'; import { render, fireEvent } from '@testing-library/react'; import useFollowScroll from '../useFollowScroll'; diff --git a/client/src/components/Chat/Messages/Content/disclosure.ts b/packages/chat/src/react/parts/disclosure.ts similarity index 65% rename from client/src/components/Chat/Messages/Content/disclosure.ts rename to packages/chat/src/react/parts/disclosure.ts index 36899cf4bd..fe9f226327 100644 --- a/client/src/components/Chat/Messages/Content/disclosure.ts +++ b/packages/chat/src/react/parts/disclosure.ts @@ -1,15 +1,21 @@ import { createContext, useContext, useEffect, useMemo } from 'react'; import { atom, useAtom } from 'jotai'; -import type { PrimitiveAtom } from 'jotai'; -import type { useToolCallPartQuery } from '~/data-provider/Messages/queries'; -import { useMessagePartsHost } from '~/Providers/MessagePartsHostContext'; +import type { ToolCallPartParams, ToolCallPartResponse } from 'librechat-data-provider'; +import type { UseQueryOptions, QueryObserverResult } from '@tanstack/react-query'; +import type { PrimitiveAtom, SetStateAction } from 'jotai'; +import type { Context } from 'react'; +import { useMessagePartsHost } from '../host'; export type ReasoningDisclosures = Map>; /** Owned by one message, above the layouts that can move its reasoning. */ -export const ReasoningDisclosureContext = createContext(null); +export const ReasoningDisclosureContext: Context = + createContext(null); -export function reasoningDisclosure(disclosures: ReasoningDisclosures, index: number) { +export function reasoningDisclosure( + disclosures: ReasoningDisclosures, + index: number, +): PrimitiveAtom { let disclosure = disclosures.get(index); if (disclosure == null) { disclosure = atom(undefined); @@ -18,7 +24,7 @@ export function reasoningDisclosure(disclosures: ReasoningDisclosures, index: nu return disclosure; } -export function useReasoningDisclosure(index: number) { +export function useReasoningDisclosure(index: number): PrimitiveAtom { const disclosures = useContext(ReasoningDisclosureContext); return useMemo( () => @@ -36,10 +42,13 @@ export const toolPanelSpacingClassName = 'mb-2 mt-0'; export type ToolDisclosures = Map>; /** Kept above part keys and activity layouts; never shared between message views. */ -export const ToolDisclosureContext = createContext(null); -export const ToolDisclosureKeyContext = createContext(undefined); +export const ToolDisclosureContext: Context = + createContext(null); +export const ToolDisclosureKeyContext: Context = createContext< + string | undefined +>(undefined); -export function useToolDisclosure() { +export function useToolDisclosure(): PrimitiveAtom { const disclosures = useContext(ToolDisclosureContext); const key = useContext(ToolDisclosureKeyContext); return useMemo(() => { @@ -60,17 +69,19 @@ export function useToolDisclosure() { * click without adding information. `undefined` means no enclosing phase has * decided, so a group falls back to its own call count; a phase's decision * wins over the groups inside it. */ -export const SoleToolContext = createContext(undefined); +export const SoleToolContext: Context = createContext( + undefined, +); /** Set by a tool group for its own rows: true when the group holds exactly one * tool call, whatever the phase around it holds. `SoleToolContext` lets the * phase decide whether a card opens by default; this one decides whether the * card's own row is redundant under the group header it sits beneath. */ -export const LoneGroupContext = createContext(false); +export const LoneGroupContext: Context = createContext(false); /** Whether a tool card opens by default: the user's "auto-expand tools" * preference, or being the only call inside its group. */ -export function useToolAutoExpand() { +export function useToolAutoExpand(): boolean { const autoExpand = useMessagePartsHost().useAutoExpandTools(); const soleTool = useContext(SoleToolContext); return autoExpand || soleTool === true; @@ -78,18 +89,20 @@ export function useToolAutoExpand() { /** Asks the enclosing tool-call part to load its stored content in place of a server preview. * `null` outside a part that holds a preview. */ -export const ToolContentRequestContext = createContext<(() => void) | null>(null); +export const ToolContentRequestContext: Context<(() => void) | null> = createContext< + (() => void) | null +>(null); /** True while the enclosing part still shows a server preview, so content actions (copy) would * hand out shortened text. False outside a previewed part. */ -export const ToolContentPendingContext = createContext(false); +export const ToolContentPendingContext: Context = createContext(false); export function useToolContentPending(): boolean { return useContext(ToolContentPendingContext); } /** Requests the part's full content while `active`: its card is open or its panel is showing. */ -export function useToolContentRequest(active: boolean) { +export function useToolContentRequest(active: boolean): void { const request = useContext(ToolContentRequestContext); useEffect(() => { if (active) { @@ -102,7 +115,9 @@ export function useToolContentRequest(active: boolean) { * per-tool atom, so it survives the card remounting when a live batch * regroups. Until they choose, the card follows `useToolAutoExpand` and * closes again if a sole call's group gains a second call. */ -export function useToolExpansion(canExpand: boolean) { +export function useToolExpansion( + canExpand: boolean, +): readonly [boolean, (update: SetStateAction) => void] { const autoExpand = useToolAutoExpand(); const [override, setOverride] = useAtom(useToolDisclosure()); const expanded = override ?? (autoExpand && canExpand); @@ -110,9 +125,14 @@ export function useToolExpansion(canExpand: boolean) { return [expanded, setOverride] as const; } -export type ToolContentQuery = typeof useToolCallPartQuery; +/** Loads a stored tool call part; the app's query, or a nested transcript's own. */ +export type ToolContentQuery = ( + params: ToolCallPartParams, + config?: UseQueryOptions, + revision?: string, +) => QueryObserverResult; /** Undefined uses normal message access; null keeps a nested transcript view-only. */ -export const ToolContentQueryContext = createContext( - undefined, -); +export const ToolContentQueryContext: Context = createContext< + ToolContentQuery | null | undefined +>(undefined); diff --git a/client/src/components/Chat/Messages/Content/handoff.ts b/packages/chat/src/react/parts/handoff.ts similarity index 94% rename from client/src/components/Chat/Messages/Content/handoff.ts rename to packages/chat/src/react/parts/handoff.ts index 4db6adafb0..a7bac6cd9e 100644 --- a/client/src/components/Chat/Messages/Content/handoff.ts +++ b/packages/chat/src/react/parts/handoff.ts @@ -9,7 +9,7 @@ import { useCallback, useLayoutEffect, useRef } from 'react'; * node leaves the DOM, which is the last moment `document.activeElement` still * says whether the row had focus, and the node can still name its group. */ -export default function useRowHandoff(bare: boolean) { +export default function useRowHandoff(bare: boolean): (node: HTMLElement | null) => void { const rowNode = useRef(null); const handoff = useRef(null); diff --git a/client/src/components/Chat/Messages/Content/Parts/intent.ts b/packages/chat/src/react/parts/intent.ts similarity index 98% rename from client/src/components/Chat/Messages/Content/Parts/intent.ts rename to packages/chat/src/react/parts/intent.ts index 3c4c953259..e6a829db0b 100644 --- a/client/src/components/Chat/Messages/Content/Parts/intent.ts +++ b/packages/chat/src/react/parts/intent.ts @@ -1,5 +1,5 @@ import { useMemo } from 'react'; -import { unescapeJsonString } from '@librechat/chat'; +import { unescapeJsonString } from '../../core/parts/parseJsonField'; /** * Single-line clamp mirroring the SDK's outcome-label bound diff --git a/client/src/components/Chat/Messages/Content/Parts/useFollowScroll.ts b/packages/chat/src/react/parts/useFollowScroll.ts similarity index 100% rename from client/src/components/Chat/Messages/Content/Parts/useFollowScroll.ts rename to packages/chat/src/react/parts/useFollowScroll.ts