An AI-powered search engine with a generative UI
TypeScript generative-aigenerative-uinextjsollamareactsearxngshadcn-uitailwindcsstavilytypescriptupstashvercel-ai-sdk
fix: collapse single tool results when answer starts (#1041)
Yoshiki Miura1a8c1496f03a
diff --git a/components/__tests__/chat-messages.test.tsx b/components/__tests__/chat-messages.test.tsxnew file mode 100644index 00000000..a2345f7b--- /dev/null+++ b/components/__tests__/chat-messages.test.tsx@@ -0,0 +1,95 @@+import React from 'react'++import { fireEvent, render, screen } from '@testing-library/react'+import { expect, test, vi } from 'vitest'++import type { UIMessage } from '@/lib/types/ai'++import { ChatMessages } from '../chat-messages'++vi.mock('@/lib/hooks/use-media-query', () => ({+ useMediaQuery: () => false+}))++vi.mock('../render-message', () => ({+ RenderMessage: ({+ message,+ getIsOpen,+ onOpenChange+ }: {+ message: UIMessage+ getIsOpen: (id: string, partType?: string, hasNextPart?: boolean) => boolean+ onOpenChange: (id: string, open: boolean) => void+ }) => {+ if (message.role !== 'assistant') return null++ const hasAnswer = message.parts?.some(+ part => part.type === 'text' && part.text.trim().length > 0+ )+ const isOpen = getIsOpen('tool-1', 'tool-search', hasAnswer)++ return (+ <button onClick={() => onOpenChange('tool-1', !isOpen)}>+ {isOpen ? 'Open tool' : 'Closed tool'}+ </button>+ )+ }+}))++vi.mock('../ui/animated-logo', () => ({+ AnimatedLogo: () => null+}))++vi.mock('../chat-footer-message', () => ({+ ChatFooterMessage: () => null+}))++test('closes a single tool when answer text starts streaming', () => {+ const userMessage = {+ id: 'user-1',+ role: 'user',+ parts: [{ type: 'text', text: 'Question' }]+ } as UIMessage+ const toolPart = {+ type: 'tool-search',+ toolCallId: 'tool-1',+ state: 'output-available',+ input: {},+ output: {}+ } as UIMessage['parts'][number]+ const assistantMessage = (answer?: string): UIMessage => ({+ id: 'assistant-1',+ role: 'assistant',+ parts: answer ? [toolPart, { type: 'text', text: answer }] : [toolPart]+ })+ const scrollContainerRef = React.createRef<HTMLDivElement>()+ const sections = (answer?: string) => [+ {+ id: 'section-1',+ userMessage,+ assistantMessages: [assistantMessage(answer)]+ }+ ]++ const { rerender } = render(+ <ChatMessages+ sections={sections()}+ status="streaming"+ scrollContainerRef={scrollContainerRef}+ />+ )++ expect(screen.getByRole('button', { name: 'Open tool' })).toBeInTheDocument()++ rerender(+ <ChatMessages+ sections={sections('Answer has started')}+ status="streaming"+ scrollContainerRef={scrollContainerRef}+ />+ )++ const closedTool = screen.getByRole('button', { name: 'Closed tool' })+ fireEvent.click(closedTool)+ expect(screen.getByRole('button', { name: 'Open tool' })).toBeInTheDocument()+})diff --git a/components/chat-messages.tsx b/components/chat-messages.tsxindex 95777873..55dac3d5 100644--- a/components/chat-messages.tsx+++ b/components/chat-messages.tsx@@ -169,8 +169,8 @@ export function ChatMessages({if (toolCount > 1) {return false}- // Single tool results stay open even if more content follows- return true+ // Keep a single tool open until answer text follows it+ return !hasNextPart}// For tool-invocations, default to open