Migrate from ai/rsc to ai/ui #444
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,70 +1,123 @@ | ||
| 'use client' | ||
|
|
||
| import { Message } from 'ai' | ||
| import { CollapsibleMessage } from './collapsible-message' | ||
| import { UserMessage } from './user-message' | ||
| import { BotMessage } from './message' | ||
| import { Section } from './section' | ||
| import SearchRelated from './search-related' | ||
| import { FollowupPanel } from './followup-panel' | ||
| import { SearchSection } from './search-section' | ||
| import RetrieveSection from './retrieve-section' | ||
| import { VideoSearchSection } from './video-search-section' | ||
| import { MapQueryHandler } from './map/map-query-handler' | ||
| import { CopilotDisplay } from './copilot-display' | ||
| import { ResolutionSearchSection } from './resolution-search-section' | ||
|
|
||
| interface ChatMessagesProps { | ||
| messages: Message[] | ||
| } | ||
|
|
||
| export function ChatMessages({ messages }: ChatMessagesProps) { | ||
| if (!messages.length) { | ||
| return null | ||
| } | ||
|
|
||
| return ( | ||
| <> | ||
| {messages.map((message, index) => { | ||
| const { role, content, id, toolInvocations, data } = message | ||
|
|
||
| if (role === 'user') { | ||
| return ( | ||
| <CollapsibleMessage | ||
| key={id} | ||
| message={{ | ||
| id, | ||
| component: ( | ||
| <UserMessage | ||
| content={content} | ||
| showShare={index === 0} | ||
| /> | ||
| ) | ||
| }} | ||
| isLastMessage={index === messages.length - 1} | ||
| /> | ||
| ) | ||
| } | ||
|
|
||
| if (role === 'assistant') { | ||
| const extraData = Array.isArray(data) ? data : [] | ||
|
|
||
| return ( | ||
| <CollapsibleMessage | ||
| key={id} | ||
| message={{ | ||
| id, | ||
| component: ( | ||
| <div className="flex flex-col gap-4"> | ||
| {content && ( | ||
| <Section title="response"> | ||
| <BotMessage content={content} /> | ||
| </Section> | ||
| )} | ||
|
|
||
| {toolInvocations?.map((toolInvocation) => { | ||
| const { toolName, toolCallId, state } = toolInvocation | ||
|
|
||
| if (state === 'result') { | ||
| const { result } = toolInvocation | ||
|
|
||
| switch (toolName) { | ||
| case 'search': | ||
| return <SearchSection key={toolCallId} result={JSON.stringify(result)} /> | ||
| case 'retrieve': | ||
| return <RetrieveSection key={toolCallId} data={result} /> | ||
| case 'videoSearch': | ||
| return <VideoSearchSection key={toolCallId} result={JSON.stringify(result)} /> | ||
| case 'geospatialQueryTool': | ||
| if (result.type === 'MAP_QUERY_TRIGGER') { | ||
| return <MapQueryHandler key={toolCallId} toolOutput={result} /> | ||
| } | ||
| return null | ||
| default: | ||
| return null | ||
| } | ||
| } | ||
| return null | ||
| })} | ||
|
|
||
| {extraData.map((d: any, i) => { | ||
| if (d.type === 'related') { | ||
| return ( | ||
| <Section key={i} title="Related" separator={true}> | ||
| <SearchRelated relatedQueries={d.object} /> | ||
| </Section> | ||
| ) | ||
| } | ||
| if (d.type === 'inquiry') { | ||
| return <CopilotDisplay key={i} content={d.object.question} /> | ||
| } | ||
| if (d.type === 'resolution_search_result') { | ||
| return <ResolutionSearchSection key={i} result={d.object} /> | ||
| } | ||
| return null | ||
| })} | ||
|
|
||
| {index === messages.length - 1 && role === 'assistant' && ( | ||
| <Section title="Follow-up" className="pb-8"> | ||
| <FollowupPanel /> | ||
| </Section> | ||
| )} | ||
|
Comment on lines
49
to
111
There was a problem hiding this comment.
Also, the SuggestionIntroduce a small discriminated-union type for Example: type ChatDataItem =
| { type: 'related'; object: PartialRelated }
| { type: 'inquiry'; object: { question?: string } }
| { type: 'resolution_search_result'; object: unknown }
const extraData: ChatDataItem[] = Array.isArray(message.data)
? (message.data as ChatDataItem[])
: []Then use stable keys (e.g., hash of content or Reply with "@CharlieHelps yes please" if you’d like me to add a commit that adds these types and updates the renderer accordingly. |
||
| </div> | ||
| ) | ||
| }} | ||
| isLastMessage={index === messages.length - 1} | ||
| /> | ||
| ) | ||
| } | ||
| return null | ||
| })} | ||
| </> | ||
| ) | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tool implementations now return
{ error: string }objects on failure, butChatMessagesrenders tool results by passingresultintoSearchSection/RetrieveSection/VideoSearchSectionwithout checking for anerrorshape. This will likely cause runtime errors or confusing empty sections.At minimum, error payloads need consistent rendering.
Suggestion
Handle tool error results explicitly in
ChatMessages:result?.error, render aSectionwith an errorCard/message.Reply with "@CharlieHelps yes please" if you’d like me to add a commit implementing consistent tool error rendering.