Skip to content

An AI-powered search engine with a generative UI

fix: address PR review comments

Yoshiki Miura4ba13ebe5e2f
diff --git a/components/artifact/artifact-content.tsx b/components/artifact/artifact-content.tsx
index 690ef76b..fb0a0168 100644
--- a/components/artifact/artifact-content.tsx
+++ b/components/artifact/artifact-content.tsx
@@ -1,11 +1,16 @@
'use client'
-import { Part } from '@/lib/types/ai'
+import { Part, TodoToolPart } from '@/lib/types/ai'
import { ReasoningContent } from './reasoning-content'
import { TodoInvocationContent } from './todo-invocation-content'
import { ToolInvocationContent } from './tool-invocation-content'
+// Type guard for TodoToolPart
+function isTodoToolPart(part: Part): part is TodoToolPart {
+ return part.type === 'tool-todoWrite' || part.type === 'tool-todoRead'
+}
+
export function ArtifactContent({ part }: { part: Part | null }) {
if (!part) return null
@@ -16,7 +21,10 @@ export function ArtifactContent({ part }: { part: Part | null }) {
return <ToolInvocationContent part={part} />
case 'tool-todoWrite':
case 'tool-todoRead':
- return <TodoInvocationContent part={part as any} />
+ if (isTodoToolPart(part)) {
+ return <TodoInvocationContent part={part} />
+ }
+ return null
case 'reasoning':
return <ReasoningContent reasoning={part.text} />
default:
diff --git a/components/render-message.tsx b/components/render-message.tsx
index 7766b3f3..7d067c24 100644
--- a/components/render-message.tsx
+++ b/components/render-message.tsx
@@ -147,9 +147,6 @@ export function RenderMessage({
onQuerySelect={onQuerySelect}
/>
)
- case 'data-todos':
- // Handled by TodoPanel in ChatPanel
- return null
default:
return null
}
diff --git a/lib/agents/researcher.ts b/lib/agents/researcher.ts
index cdf1ba1c..02b7caf7 100644
--- a/lib/agents/researcher.ts
+++ b/lib/agents/researcher.ts
@@ -1,4 +1,8 @@
-import { Experimental_Agent as Agent, stepCountIs } from 'ai'
+import {
+ Experimental_Agent as Agent,
+ stepCountIs,
+ UIMessageStreamWriter
+} from 'ai'
import { fetchTool } from '../tools/fetch'
import { createQuestionTool } from '../tools/question'
@@ -75,7 +79,7 @@ export function researcher({
model: string
searchMode: boolean
abortSignal?: AbortSignal
- writer?: any
+ writer?: UIMessageStreamWriter
}) {
try {
const currentDate = new Date().toLocaleString()
diff --git a/lib/types/ai.ts b/lib/types/ai.ts
index f49b887c..2756507a 100644
--- a/lib/types/ai.ts
+++ b/lib/types/ai.ts
@@ -64,4 +64,23 @@ export type ToolPart<T extends keyof UITools = keyof UITools> = {
errorText?: string
}
-export type Part = TextPart | ReasoningPart | ToolPart
+// Extended tool parts for specific tools
+export type TodoToolPart = {
+ type: 'tool-todoWrite' | 'tool-todoRead'
+ toolCallId: string
+ state:
+ | 'input-streaming'
+ | 'input-available'
+ | 'output-available'
+ | 'output-error'
+ input?: { todos?: TodoItem[] }
+ output?: {
+ todos?: TodoItem[]
+ message?: string
+ completedCount?: number
+ totalCount?: number
+ }
+ errorText?: string
+}
+
+export type Part = TextPart | ReasoningPart | ToolPart | TodoToolPart
diff --git a/lib/utils/message-mapping.ts b/lib/utils/message-mapping.ts
index 6c32e79b..bd51eed4 100644
--- a/lib/utils/message-mapping.ts
+++ b/lib/utils/message-mapping.ts
@@ -96,6 +96,26 @@ function isExtendedToolPart(part: any): part is ExtendedToolPart {
)
}
+// Helper function to create tool part mapping
+function createToolPartMapping(
+ basePart: Omit<DBMessagePart, 'type'>,
+ part: ExtendedToolPart,
+ toolName: string
+): DBMessagePart {
+ const inputColumn = `tool_${toolName}_input` as keyof DBMessagePart
+ const outputColumn = `tool_${toolName}_output` as keyof DBMessagePart
+
+ return {
+ ...basePart,
+ type: part.type,
+ tool_toolCallId: part.toolCallId || generateId(),
+ tool_state: part.state || ('input-available' as ToolState),
+ tool_errorText: part.errorText,
+ [inputColumn]: part.input,
+ [outputColumn]: part.output
+ } as DBMessagePart
+}
+
/**
* Convert UI message parts to DB format
*/
@@ -250,81 +270,41 @@ export function mapUIMessagePartsToDBParts(
}
// Tool-specific parts that are not tool-call or tool-result
+ // The following cases are tool parts with state tracking
case 'tool-search':
- // These are tool parts with state tracking
if (!isExtendedToolPart(part)) {
console.error('Invalid extended tool part:', part)
return null
}
- return {
- ...basePart,
- type: part.type,
- tool_toolCallId: part.toolCallId || generateId(),
- tool_state: part.state || ('input-available' as ToolState),
- tool_errorText: part.errorText,
- tool_search_input: part.input,
- tool_search_output: part.output
- }
+ return createToolPartMapping(basePart, part, 'search')
case 'tool-fetch':
if (!isExtendedToolPart(part)) {
console.error('Invalid extended tool part:', part)
return null
}
- return {
- ...basePart,
- type: part.type,
- tool_toolCallId: part.toolCallId || generateId(),
- tool_state: part.state || ('input-available' as ToolState),
- tool_errorText: part.errorText,
- tool_fetch_input: part.input,
- tool_fetch_output: part.output
- }
+ return createToolPartMapping(basePart, part, 'fetch')
case 'tool-question':
if (!isExtendedToolPart(part)) {
console.error('Invalid extended tool part:', part)
return null
}
- return {
- ...basePart,
- type: part.type,
- tool_toolCallId: part.toolCallId || generateId(),
- tool_state: part.state || ('input-available' as ToolState),
- tool_errorText: part.errorText,
- tool_question_input: part.input,
- tool_question_output: part.output
- }
+ return createToolPartMapping(basePart, part, 'question')
case 'tool-todoWrite':
if (!isExtendedToolPart(part)) {
console.error('Invalid extended tool part:', part)
return null
}
- return {
- ...basePart,
- type: part.type,
- tool_toolCallId: part.toolCallId || generateId(),
- tool_state: part.state || ('input-available' as ToolState),
- tool_errorText: part.errorText,
- tool_todoWrite_input: part.input,
- tool_todoWrite_output: part.output
- }
+ return createToolPartMapping(basePart, part, 'todoWrite')
case 'tool-todoRead':
if (!isExtendedToolPart(part)) {
console.error('Invalid extended tool part:', part)
return null
}
- return {
- ...basePart,
- type: part.type,
- tool_toolCallId: part.toolCallId || generateId(),
- tool_state: part.state || ('input-available' as ToolState),
- tool_errorText: part.errorText,
- tool_todoRead_input: part.input,
- tool_todoRead_output: part.output
- }
+ return createToolPartMapping(basePart, part, 'todoRead')
// Data parts
default: