diff --git a/client/src/components/Chat/Messages/Content/ToolCallGroup.tsx b/client/src/components/Chat/Messages/Content/ToolCallGroup.tsx index 610321f0f8..406abdee6b 100644 --- a/client/src/components/Chat/Messages/Content/ToolCallGroup.tsx +++ b/client/src/components/Chat/Messages/Content/ToolCallGroup.tsx @@ -1,6 +1,6 @@ import { useState, useRef, useMemo, useEffect, useContext, useCallback } from 'react'; +import { ListChecks, MessageCircleQuestion, TriangleAlert, Users } from 'lucide-react'; import { Tools, Constants, ContentTypes, isOpaqueReasoning } from 'librechat-data-provider'; -import { ChevronDown, ListChecks, MessageCircleQuestion, TriangleAlert, Users } from 'lucide-react'; import { LoneGroupContext, SoleToolContext, @@ -21,18 +21,17 @@ import { FOLD_RAIL_CLASSES, ROW_GLYPH_SLOT, FoldRail, - RailGlyph, useFoldPath, useRailHover, revealFoldHeader, FoldHeaderContext, FailedRevealContext, - FailedRevealPill, useFailedReveal, useFailedRevealTrigger, ToolAuthWarning, ToolAuthWarningContext, useExpandCollapse, + ToolGroupHeader, } from '@librechat/chat/components'; import type { TAttachment, TMessageContentParts } from 'librechat-data-provider'; import type { ToolMeta } from '@librechat/chat'; @@ -43,7 +42,6 @@ import { cn, getPartKeyIndex, hasPendingAuthInPart } from '~/utils'; import { useMCPIconMap, useMCPServerNames } from '~/hooks/MCP'; import { AttachmentGroup, ReasoningCompact } from './Parts'; import { MCPAppViews } from '~/components/MCPUIResource'; -import { PhaseLabel } from './ActivityPhaseGroup'; import { HeaderActionSlotContext } from './slot'; import { StackedToolIcons } from './ToolOutput'; import { mapAttachments } from '~/utils/map'; @@ -648,24 +646,24 @@ export default function ToolCallGroup({ return (
- ))} - - - - - {visibleGroupDetail && ( - - · {visibleGroupDetail} - - )} -
+ + } + />
{ expect(screen.queryByText('Only allow sites you trust')).not.toBeInTheDocument(); }); - it('keeps the group disclosure chevron visible', () => { - renderGroup(baseProps); - - expect(screen.getByTestId('group-chevron')).not.toHaveClass('opacity-0'); + it('keeps the real header action target stable while the group updates', () => { + const actionTargets: HTMLElement[] = []; + function Action() { + const target = useContext(HeaderActionSlotContext); + if (target == null) { + return null; + } + actionTargets.push(target); + return createPortal({'Sources'}, target); + } + const props = { + ...baseProps, + initialExpansionState: { isExpanded: true, userOverride: true }, + renderPart: (_part: TMessageContentParts, idx: number) => , + }; + const { rerender } = renderGroup(props); + const header = screen.getByRole('button', { expanded: true }); + const target = screen.getAllByTestId('tool-action')[0].parentElement; + expect(target?.parentElement).toBe(header.parentElement); + expect(header).not.toContainElement(target); + rerender( + + + , + ); + expect(screen.getAllByTestId('tool-action')[0].parentElement).toBe(target); + expect(actionTargets.every((element) => element === target)).toBe(true); + fireEvent.click(header); + expect(header).toHaveAttribute('aria-expanded', 'false'); }); it('does not reconcile layout for an initially collapsed completed group', () => { @@ -1809,30 +1836,6 @@ describe('ToolCallGroup failure fast path', () => { expect(onReveal).toHaveBeenCalledTimes(failedParts.length); }); - it('keeps the count quiet when the group contains both successful and failed calls', () => { - renderGroup(props(jest.fn())); - expect( - screen - .getByTestId('failed-reveal-pill') - .querySelector('span.text-text-secondary, span.text-status-error'), - ).toHaveClass('text-text-secondary'); - }); - - it('keeps the count in the error tone when every call failed', () => { - renderGroup({ - ...props(jest.fn()), - parts: [ - failedParts[1], - { part: makePart('c3', 'Error processing tool: gone', 'create_file'), idx: 1 }, - ], - }); - expect( - screen - .getByTestId('failed-reveal-pill') - .querySelector('span.text-text-secondary, span.text-status-error'), - ).toHaveClass('text-status-error'); - }); - it.each(['created', 'Error processing tool: unavailable'])( 'preserves a sparse partial batch with output %s', (output) => { diff --git a/e2e/specs/mock/scenarios/published-consumer-appearance.spec.ts b/e2e/specs/mock/scenarios/published-consumer-appearance.spec.ts index 34c92fda0a..3ac40fca9a 100644 --- a/e2e/specs/mock/scenarios/published-consumer-appearance.spec.ts +++ b/e2e/specs/mock/scenarios/published-consumer-appearance.spec.ts @@ -198,6 +198,128 @@ Promise.all(${JSON.stringify([ }); }); +test.describe('tool group header cascade', () => { + let markup: string; + let libraryCss: string; + let appCss: string; + + test.beforeAll(async ({ browserName }, testInfo) => { + const fixturePath = testInfo.outputPath(`tool-group-${browserName}.html`); + mkdirSync(resolve(fixturePath, '..'), { recursive: true }); + const rendered = spawnSync( + process.execPath, + [ + resolve(repoRoot, 'node_modules/jest/bin/jest.js'), + 'src/components/parts/group/__tests__/Header.spec.tsx', + '--maxWorkers=2', + '-t', + 'exports the real group header for the browser cascade checks', + ], + { + cwd: resolve(repoRoot, 'packages/chat'), + env: { ...process.env, E2E_TOOL_GROUP_CASCADE_FIXTURE: fixturePath }, + encoding: 'utf8', + }, + ); + expect(rendered.status, rendered.stdout + rendered.stderr).toBe(0); + markup = readFileSync(fixturePath, 'utf8'); + const compilerPath = testInfo.outputPath('compile-tool-group.cjs'); + const compiledPath = testInfo.outputPath('tool-group-app.css'); + writeFileSync( + compilerPath, + `const {readFileSync, writeFileSync} = require('node:fs'); +const postcss = require(${JSON.stringify(require.resolve('postcss'))}); +const tailwind = require(${JSON.stringify(require.resolve('@tailwindcss/postcss'))}); +const input = ${JSON.stringify(resolve(repoRoot, 'client/src/style.css'))}; +postcss([tailwind()]).process(readFileSync(input, 'utf8'), {from: input}) + .then(result => writeFileSync(${JSON.stringify(compiledPath)}, result.css)) + .catch(error => { console.error(error); process.exitCode = 1; });`, + ); + const compiled = run(process.execPath, [compilerPath]); + expect(compiled.status, compiled.output).toBe(0); + libraryCss = readFileSync(DIST_STYLESHEET, 'utf8'); + appCss = readFileSync(compiledPath, 'utf8'); + }); + + for (const { mode, reference, scenario } of [ + { mode: 'light', reference: false, scenario: '@scenario:tool-group-header-light-cascade' }, + { mode: 'dark', reference: false, scenario: '@scenario:tool-group-header-dark-cascade' }, + { mode: 'light', reference: true, scenario: '@scenario:tool-group-header-light-reference' }, + { mode: 'dark', reference: true, scenario: '@scenario:tool-group-header-dark-reference' }, + ] as const) { + test(`preserves inherited header appearance ${scenario}`, async ({ page }) => { + await page.setContent( + ` +
${markup}
+
${markup}
+`, + ); + // Load both complete stylesheets in main.jsx order, including every competing selector. + await page.addStyleTag({ content: libraryCss }); + await page.addStyleTag({ content: appCss }); + await page.evaluate((changed) => { + // Freeze dev's original control recipe; the surrounding DOM is pinned by the header spec. + const before = document.querySelector('[data-version="before"] button')!; + before.className = + 'text-text-secondary hover:text-text-secondary focus-visible:ring-focus-subtle inline-flex h-auto min-w-0 flex-1 items-center justify-start gap-2 rounded-none bg-transparent p-0 py-1 hover:bg-transparent focus-visible:ring-2 focus-visible:ring-offset-0 focus-visible:outline-none'; + const detail = document.querySelector('[data-version="before"] [title="Create File"]')!; + detail.classList.replace('max-w-2/5', 'max-w-[40%]'); + if (changed) { + document.documentElement.style.setProperty('--markdown-font-size', '20px'); + document.documentElement.style.setProperty('--font-size-base', '18px'); + document.documentElement.style.setProperty('--theme-control-font-weight', '800'); + document.body.style.fontWeight = '700'; + } + }, reference); + for (const state of ['rest', 'hover', 'focus']) { + const read = async (version: string) => { + const button = page.locator(`[data-version="${version}"] button`); + await page.mouse.move(0, 0); + await page.evaluate(() => (document.activeElement as HTMLElement)?.blur()); + if (state === 'hover') { + await button.hover(); + } else if (state === 'focus') { + await page.keyboard.press('Tab'); + await button.focus(); + } + return button.evaluate((element) => { + const properties = [ + 'font-size', + 'font-weight', + 'line-height', + 'padding', + 'width', + 'height', + 'color', + 'background-color', + 'border-radius', + 'outline', + 'box-shadow', + 'transition-property', + 'transition-duration', + 'max-width', + ]; + return [ + element, + ...element.querySelectorAll('[role="status"], [title="Create File"]'), + ].map((target) => { + const style = getComputedStyle(target); + return Object.fromEntries( + properties.map((name) => [name, style.getPropertyValue(name)]), + ); + }); + }); + }; + const before = await read('before'); + const after = await read('after'); + expect(after, `${mode} reference=${reference} ${state}`).toEqual(before); + expect(after[0]['transition-duration']).toBe('0s'); + expect(after[after.length - 1]['max-width']).toBe('40%'); + } + }); + } +}); + /** The client test renders both real consumers. Only this browser lane asks it to save markup, * so ordinary Jest needs neither a browser binary nor the browser lane's services. */ test.describe('phase label animation cascade', () => { diff --git a/packages/chat/src/components.ts b/packages/chat/src/components.ts index 102ef86f74..34a823ca4a 100644 --- a/packages/chat/src/components.ts +++ b/packages/chat/src/components.ts @@ -125,6 +125,8 @@ export type { MessageFooterProps } from './components/messages/MessageFooter'; export { getMessageAriaLabel, getHeaderPrefixForScreenReader } from './components/messages/labels'; export { default as PhaseLabel, FOLD_EASING } from './components/parts/PhaseLabel'; +export { default as ToolGroupHeader } from './components/parts/group/Header'; +export type { ToolGroupHeaderProps } from './components/parts/group/Header'; /** Parts: the leaf components and row classes tool cards share. */ export { default as Stdout } from './components/parts/Stdout'; diff --git a/packages/chat/src/components/parts/group/Header.tsx b/packages/chat/src/components/parts/group/Header.tsx new file mode 100644 index 0000000000..fc6e7ec422 --- /dev/null +++ b/packages/chat/src/components/parts/group/Header.tsx @@ -0,0 +1,77 @@ +import { ChevronDown } from 'lucide-react'; +import { Button, cn } from '@librechat/client'; +import type { ReactElement, ReactNode, Ref } from 'react'; +import type { RailHover } from '../rail'; +import { FailedRevealPill } from '../reveal'; +import PhaseLabel from '../PhaseLabel'; +import { RailGlyph } from '../rail'; + +export type ToolGroupHeaderProps = { + label: string; + detail: string; + ariaLabel: string; + expanded: boolean; + hidden: boolean; + animate: boolean; + glyph: ReactNode; + hover: RailHover; + headerRef: Ref; + actionSlotRef: Ref; + onToggle: () => void; + failure?: { count: number; total: number; onReveal: () => void }; +}; + +/** The group owns disclosure state; its host supplies the glyph and header action target. */ +export default function ToolGroupHeader({ + label, + detail, + ariaLabel, + expanded, + hidden, + animate, + glyph, + hover, + headerRef, + actionSlotRef, + onToggle, + failure, +}: ToolGroupHeaderProps): ReactElement { + return ( + + ); +} diff --git a/packages/chat/src/components/parts/group/__tests__/Header.spec.tsx b/packages/chat/src/components/parts/group/__tests__/Header.spec.tsx new file mode 100644 index 0000000000..c443bbfc8b --- /dev/null +++ b/packages/chat/src/components/parts/group/__tests__/Header.spec.tsx @@ -0,0 +1,117 @@ +/** @jest-environment jsdom */ +import { createRef } from 'react'; +import { writeFileSync } from 'node:fs'; +import userEvent from '@testing-library/user-event'; +import { render, screen } from '@testing-library/react'; +import type { ToolGroupHeaderProps } from '../Header'; +import { initEnglish } from '../../../../__fixtures__/i18n'; +import { useRailHover } from '../../rail'; +import Header from '../Header'; + +beforeAll(initEnglish); + +const defaults = { + label: 'Created the config files', + detail: 'Create File', + ariaLabel: 'Created the config files, Create File, Thoughts', + expanded: false, + hidden: false, + animate: false, + glyph: , + headerRef: createRef(), + actionSlotRef: createRef(), + onToggle: jest.fn(), +} satisfies Omit; + +function Harness(props: Partial) { + const hover = useRailHover(); + return
; +} + +describe('ToolGroupHeader', () => { + it('exports the real group header for the browser cascade checks', () => { + const { container } = render(); + expect(screen.getByRole('button')).toHaveAttribute('aria-expanded', 'true'); + const fixturePath = process.env.E2E_TOOL_GROUP_CASCADE_FIXTURE; + if (fixturePath) { + writeFileSync(fixturePath, container.innerHTML); + } + }); + + it('preserves the accessible name, status, titles and sibling action target without a host', () => { + render(); + const button = screen.getByRole('button', { name: defaults.ariaLabel }); + const header = defaults.headerRef.current; + expect(button).toHaveAttribute('type', 'button'); + expect(button).toHaveAttribute('aria-expanded', 'false'); + expect(header?.firstElementChild).toBe(button); + expect(header?.lastElementChild).toBe(defaults.actionSlotRef.current); + expect(button).not.toContainElement(defaults.actionSlotRef.current); + expect(screen.getByRole('status')).toHaveAttribute('title', defaults.label); + expect(screen.getByTitle(defaults.detail)).toHaveClass('max-w-2/5'); + expect(screen.getByTestId('glyph').closest('[aria-hidden]')).toHaveAttribute( + 'aria-hidden', + 'true', + ); + }); + + it('keeps the group disclosure chevron visible', () => { + render(); + const chevron = screen.getByRole('button').lastElementChild; + expect(chevron).not.toHaveClass('opacity-0', 'rotate-180'); + expect(chevron).toHaveAttribute('aria-hidden', 'true'); + }); + + it('supports keyboard activation and controlled updates without remounting the refs', async () => { + const onToggle = jest.fn(); + const { rerender } = render(); + const button = screen.getByRole('button'); + const header = defaults.headerRef.current; + const actions = defaults.actionSlotRef.current; + button.focus(); + await userEvent.keyboard('{Enter} '); + expect(onToggle).toHaveBeenCalledTimes(2); + rerender(); + expect(button).toHaveFocus(); + expect(button).toHaveAttribute('aria-expanded', 'true'); + expect(button.lastElementChild).toHaveClass('rotate-180'); + expect(defaults.headerRef.current).toBe(header); + expect(defaults.actionSlotRef.current).toBe(actions); + }); + + it('keeps flattened headers mounted and hidden without hiding their caller', () => { + const { container } = render(