Skip to content

An AI-powered search engine with a generative UI

feat: optimize tool call display with last data check

Yoshiki Miura542984b5f2d6
diff --git a/components/chat-messages.tsx b/components/chat-messages.tsx
index 588cf592..5f21a1dc 100644
--- a/components/chat-messages.tsx
+++ b/components/chat-messages.tsx
@@ -1,10 +1,12 @@
-import { Message } from 'ai'
-import { useEffect, useState } from 'react'
+import { JSONValue, Message } from 'ai'
+import { useEffect, useMemo, useState } from 'react'
import { RenderMessage } from './render-message'
+import { ToolSection } from './tool-section'
import { Spinner } from './ui/spinner'
interface ChatMessagesProps {
messages: Message[]
+ data: JSONValue[] | undefined
onQuerySelect: (query: string) => void
isLoading: boolean
chatId?: string
@@ -12,19 +14,46 @@ interface ChatMessagesProps {
export function ChatMessages({
messages,
+ data,
onQuerySelect,
isLoading,
chatId
}: ChatMessagesProps) {
const [openStates, setOpenStates] = useState<Record<string, boolean>>({})
+ const manualToolCallId = 'manual-tool-call'
useEffect(() => {
const lastMessage = messages[messages.length - 1]
if (lastMessage?.role === 'user') {
- setOpenStates({})
+ setOpenStates({ [manualToolCallId]: true })
}
}, [messages])
+ // get last tool data for manual tool call
+ const lastToolData = useMemo(() => {
+ if (!data || !Array.isArray(data) || data.length === 0) return null
+
+ const lastItem = data[data.length - 1] as {
+ type: 'tool_call'
+ data: {
+ toolCallId: string
+ state: 'call' | 'result'
+ toolName: string
+ args: string
+ }
+ }
+
+ if (lastItem.type !== 'tool_call') return null
+
+ const toolData = lastItem.data
+ return {
+ state: 'call' as const,
+ toolCallId: toolData.toolCallId,
+ toolName: toolData.toolName,
+ args: toolData.args ? JSON.parse(toolData.args) : undefined
+ }
+ }, [data])
+
if (!messages.length) return null
const lastUserIndex =
@@ -32,7 +61,7 @@ export function ChatMessages({
1 -
[...messages].reverse().findIndex(msg => msg.role === 'user')
- const showSpinner = isLoading && messages[messages.length - 1].role === 'user'
+ const showLoading = isLoading && messages[messages.length - 1].role === 'user'
const getIsOpen = (id: string) => {
const baseId = id.endsWith('-related') ? id.slice(0, -8) : id
@@ -47,8 +76,6 @@ export function ChatMessages({
}))
}
- console.log('messages', messages)
-
return (
<div className="relative mx-auto px-4 w-full">
{messages.map(message => (
@@ -63,7 +90,17 @@ export function ChatMessages({
/>
</div>
))}
- {showSpinner && <Spinner />}
+ {showLoading &&
+ (lastToolData ? (
+ <ToolSection
+ key={manualToolCallId}
+ tool={lastToolData}
+ isOpen={getIsOpen(manualToolCallId)}
+ onOpenChange={open => handleOpenChange(manualToolCallId, open)}
+ />
+ ) : (
+ <Spinner />
+ ))}
</div>
)
}
diff --git a/components/chat.tsx b/components/chat.tsx
index e1b3f466..5d46f788 100644
--- a/components/chat.tsx
+++ b/components/chat.tsx
@@ -24,7 +24,9 @@ export function Chat({
isLoading,
setMessages,
stop,
- append
+ append,
+ data,
+ setData
} = useChat({
initialMessages: savedMessages,
id: CHAT_ID,
@@ -50,10 +52,17 @@ export function Chat({
})
}
+ const onSubmit = (e: React.FormEvent<HTMLFormElement>) => {
+ e.preventDefault()
+ setData(undefined) // reset data to clear tool call
+ handleSubmit(e)
+ }
+
return (
<div className="flex flex-col w-full max-w-3xl pt-10 pb-20 mx-auto stretch">
<ChatMessages
messages={messages}
+ data={data}
onQuerySelect={onQuerySelect}
isLoading={isLoading}
chatId={id}
@@ -61,7 +70,7 @@ export function Chat({
<ChatPanel
input={input}
handleInputChange={handleInputChange}
- handleSubmit={handleSubmit}
+ handleSubmit={onSubmit}
isLoading={isLoading}
messages={messages}
setMessages={setMessages}
diff --git a/components/reasoning-answer-section.tsx b/components/reasoning-answer-section.tsx
index 4938f9c2..c87f323b 100644
--- a/components/reasoning-answer-section.tsx
+++ b/components/reasoning-answer-section.tsx
@@ -1,10 +1,13 @@
'use client'
+import { CHAT_ID } from '@/lib/constants'
+import { useChat } from 'ai/react'
import { Check, Lightbulb, Loader2 } from 'lucide-react'
import { ChatShare } from './chat-share'
import { CollapsibleMessage } from './collapsible-message'
import { DefaultSkeleton } from './default-skeleton'
import { BotMessage } from './message'
+import { StatusIndicator } from './ui/status-indicator'
interface ReasoningAnswerContent {
reasoning: string
@@ -25,22 +28,22 @@ export function ReasoningAnswerSection({
chatId
}: ReasoningAnswerSectionProps) {
const enableShare = process.env.NEXT_PUBLIC_ENABLE_SHARE === 'true'
+ const { isLoading } = useChat({ id: CHAT_ID })
const reasoningHeader = (
<div className="flex items-center gap-2 w-full">
<Lightbulb size={16} />
<div className="w-full flex-1 flex items-center justify-between">
<span>{content.answer?.length === 0 ? 'Thinking...' : 'Thoughts'}</span>
- {content.answer?.length === 0 ? (
+ {content.answer?.length === 0 && isLoading ? (
<Loader2
size={16}
className="animate-spin text-muted-foreground/50"
/>
) : (
- <span className="flex items-center gap-1 text-muted-foreground">
- <Check size={16} className="text-green-500" />
- <span>{content.reasoning.trim().length} chars</span>
- </span>
+ <StatusIndicator icon={Check} iconClassName="text-green-500">
+ {content.reasoning.trim().length.toLocaleString()} chars
+ </StatusIndicator>
)}
</div>
</div>
diff --git a/components/render-message.tsx b/components/render-message.tsx
index 369ec042..187852be 100644
--- a/components/render-message.tsx
+++ b/components/render-message.tsx
@@ -1,4 +1,5 @@
-import { Message } from 'ai'
+import { JSONValue, Message, ToolInvocation } from 'ai'
+import { useMemo } from 'react'
import { AnswerSection } from './answer-section'
import { ReasoningAnswerSection } from './reasoning-answer-section'
import RelatedQuestions from './related-questions'
@@ -22,6 +23,49 @@ export function RenderMessage({
onQuerySelect,
chatId
}: RenderMessageProps) {
+ const relatedQuestions = useMemo(
+ () =>
+ message.annotations?.find(
+ annotation => (annotation as any)?.type === 'related-questions'
+ ),
+ [message.annotations]
+ )
+
+ // render for manual tool call
+ const toolData = useMemo(() => {
+ const toolAnnotations =
+ (message.annotations?.filter(
+ annotation =>
+ (annotation as unknown as { type: string }).type === 'tool_call'
+ ) as unknown as Array<{
+ data: {
+ args: string
+ toolCallId: string
+ toolName: string
+ result?: string
+ state: 'call' | 'result'
+ }
+ }>) || []
+
+ // Group by toolCallId and prioritize 'result' state
+ const toolDataMap = toolAnnotations.reduce((acc, annotation) => {
+ const existing = acc.get(annotation.data.toolCallId)
+ if (!existing || annotation.data.state === 'result') {
+ acc.set(annotation.data.toolCallId, {
+ ...annotation.data,
+ args: annotation.data.args ? JSON.parse(annotation.data.args) : {},
+ result:
+ annotation.data.result && annotation.data.result !== 'undefined'
+ ? JSON.parse(annotation.data.result)
+ : undefined
+ } as ToolInvocation)
+ }
+ return acc
+ }, new Map<string, ToolInvocation>())
+
+ return Array.from(toolDataMap.values())
+ }, [message.annotations])
+
if (message.role === 'user') {
return <UserMessage message={message.content} />
}
@@ -43,6 +87,14 @@ export function RenderMessage({
return (
<>
+ {toolData.map(tool => (
+ <ToolSection
+ key={tool.toolCallId}
+ tool={tool}
+ isOpen={getIsOpen(tool.toolCallId)}
+ onOpenChange={open => onOpenChange(tool.toolCallId, open)}
+ />
+ ))}
{message.reasoning ? (
<ReasoningAnswerSection
content={{
@@ -61,9 +113,9 @@ export function RenderMessage({
chatId={chatId}
/>
)}
- {!message.toolInvocations && message.annotations && (
+ {!message.toolInvocations && relatedQuestions && (
<RelatedQuestions
- annotations={message.annotations}
+ annotations={relatedQuestions as JSONValue[]}
onQuerySelect={onQuerySelect}
isOpen={getIsOpen(`${messageId}-related`)}
onOpenChange={open => onOpenChange(`${messageId}-related`, open)}
diff --git a/components/search-section.tsx b/components/search-section.tsx
index cdd5d8c5..695dace2 100644
--- a/components/search-section.tsx
+++ b/components/search-section.tsx
@@ -34,7 +34,10 @@ export function SearchSection({
: ''
const header = (
- <ToolArgsSection tool="search">{`${query}${includeDomainsString}`}</ToolArgsSection>
+ <ToolArgsSection
+ tool="search"
+ number={searchResults?.results?.length}
+ >{`${query}${includeDomainsString}`}</ToolArgsSection>
)
return (
diff --git a/components/section.tsx b/components/section.tsx
index cbeeada1..b20ab490 100644
--- a/components/section.tsx
+++ b/components/section.tsx
@@ -3,6 +3,7 @@
import { cn } from '@/lib/utils'
import {
BookCheck,
+ Check,
Film,
Image,
MessageCircleMore,
@@ -14,6 +15,7 @@ import React from 'react'
import { ToolBadge } from './tool-badge'
import { Badge } from './ui/badge'
import { Separator } from './ui/separator'
+import { StatusIndicator } from './ui/status-indicator'
type SectionProps = {
children: React.ReactNode
@@ -83,14 +85,21 @@ export const Section: React.FC<SectionProps> = ({
export function ToolArgsSection({
children,
- tool
+ tool,
+ number
}: {
children: React.ReactNode
tool: string
+ number?: number
}) {
return (
- <Section size="sm" className="py-0">
+ <Section size="sm" className="py-0 flex items-center justify-between">
<ToolBadge tool={tool}>{children}</ToolBadge>
+ {number && (
+ <StatusIndicator icon={Check} iconClassName="text-green-500">
+ {number} results
+ </StatusIndicator>
+ )}
</Section>
)
}
diff --git a/components/ui/status-indicator.tsx b/components/ui/status-indicator.tsx
new file mode 100644
index 00000000..0cc106bd
--- /dev/null
+++ b/components/ui/status-indicator.tsx
@@ -0,0 +1,21 @@
+import { LucideIcon } from 'lucide-react'
+import { ReactNode } from 'react'
+
+interface StatusIndicatorProps {
+ icon: LucideIcon
+ iconClassName?: string
+ children: ReactNode
+}
+
+export function StatusIndicator({
+ icon: Icon,
+ iconClassName,
+ children
+}: StatusIndicatorProps) {
+ return (
+ <span className="flex items-center gap-1 text-muted-foreground text-xs">
+ <Icon size={16} className={iconClassName} />
+ <span>{children}</span>
+ </span>
+ )
+}
diff --git a/lib/streaming/create-manual-tool-stream.ts b/lib/streaming/create-manual-tool-stream.ts
index 6a02dd18..66e26ef5 100644
--- a/lib/streaming/create-manual-tool-stream.ts
+++ b/lib/streaming/create-manual-tool-stream.ts
@@ -1,5 +1,7 @@
+import { openai } from '@ai-sdk/openai'
import {
convertToCoreMessages,
+ CoreMessage,
createDataStreamResponse,
DataStreamWriter,
generateId,
@@ -21,6 +23,7 @@ export function createManualToolStreamResponse(config: BaseStreamConfig) {
try {
const coreMessages = convertToCoreMessages(config.messages)
const model = getModel(config.model)
+ const toolCallModel = openai('gpt-4o-mini')
// Convert Zod schema to string representation
const searchSchemaString = Object.entries(searchSchema.shape)
@@ -33,7 +36,7 @@ export function createManualToolStreamResponse(config: BaseStreamConfig) {
// Generate tool selection using XML format
const toolSelectionResponse = await generateText({
- model,
+ model: toolCallModel,
system: `You are a helpful assistant that selects appropriate tools and their parameters.
Do not include any other text in your response.
Respond in XML format with the following structure:
@@ -41,18 +44,18 @@ export function createManualToolStreamResponse(config: BaseStreamConfig) {
<tool>tool_name</tool>
<parameters>
<query>search query text</query>
- <max_results>number</max_results>
+ <max_results>number - 20 by default</max_results>
<search_depth>basic or advanced</search_depth>
<include_domains>domain1,domain2</include_domains>
<exclude_domains>domain1,domain2</exclude_domains>
</parameters>
</tool_call>
-
+
Available tools: search
-
+
Search parameters:
${searchSchemaString}
-
+
If you don't need a tool, respond with <tool_call><tool></tool></tool_call>`,
messages: coreMessages
})
@@ -67,38 +70,55 @@ export function createManualToolStreamResponse(config: BaseStreamConfig) {
)
console.log('Parsed tool call:', toolCall)
- const toolCallAnnotation = {
- type: 'tool_call',
- data: {
- toolCallId: `call_${generateId()}`,
- toolName: toolCall.tool,
- args: JSON.stringify(toolCall.parameters)
+ let toolCallMessages: CoreMessage[] = []
+ if (toolCall && toolCall.tool !== '') {
+ const toolCallAnnotation = {
+ type: 'tool_call',
+ data: {
+ state: 'call',
+ toolCallId: `call_${generateId()}`,
+ toolName: toolCall.tool,
+ args: JSON.stringify(toolCall.parameters)
+ }
}
- }
- dataStream.writeMessageAnnotation(toolCallAnnotation)
+ dataStream.writeData(toolCallAnnotation)
- const searchResults = await search(
- toolCall.parameters?.query ?? '',
- toolCall.parameters?.max_results,
- toolCall.parameters?.search_depth as 'basic' | 'advanced',
- toolCall.parameters?.include_domains,
- toolCall.parameters?.exclude_domains
- )
+ const searchResults = await search(
+ toolCall.parameters?.query ?? '',
+ toolCall.parameters?.max_results,
+ toolCall.parameters?.search_depth as 'basic' | 'advanced',
+ toolCall.parameters?.include_domains,
+ toolCall.parameters?.exclude_domains
+ )
- dataStream.writeMessageAnnotation({
- ...toolCallAnnotation,
- data: {
- ...toolCallAnnotation.data,
- result: JSON.stringify(searchResults)
+ const updatedToolCallAnnotation = {
+ ...toolCallAnnotation,
+ data: {
+ ...toolCallAnnotation.data,
+ result: JSON.stringify(searchResults),
+ state: 'result'
+ }
}
- })
+ dataStream.writeMessageAnnotation(updatedToolCallAnnotation)
+
+ toolCallMessages = [
+ {
+ role: 'assistant' as const,
+ content: `Tool call result: ${JSON.stringify(searchResults)}`
+ },
+ {
+ role: 'user' as const,
+ content: 'Now answer the user question.'
+ }
+ ]
+ }
// Proceed with the main stream
const result = streamText({
model,
system:
- 'You are a helpful assistant. Use the selected tool and parameters to provide the best response.',
- messages: coreMessages,
+ 'You are a helpful assistant. You received a search results. You must use the search results to answer the user question.',
+ messages: [...coreMessages, ...toolCallMessages],
experimental_transform: smoothStream({ chunking: 'word' }),
onFinish: async result => {
await handleStreamFinish({