Skip to content

An AI-powered search engine with a generative UI

Refactor type definitions and improve code consistency

Yoshiki Miura68a9f61d2d9a
diff --git a/components/answer-section.tsx b/components/answer-section.tsx
index 8e6dc8d2..1db3bc1e 100644
--- a/components/answer-section.tsx
+++ b/components/answer-section.tsx
@@ -8,7 +8,7 @@ import type { UIDataTypes, UIMessage, UITools } from '@/lib/types/ai'
import { CollapsibleMessage } from './collapsible-message'
import { DefaultSkeleton } from './default-skeleton'
-import { BotMessage } from './message'
+import { MarkdownMessage } from './message'
import { MessageActions } from './message-actions'
export type AnswerSectionProps = {
@@ -48,7 +48,7 @@ export function AnswerSection({
const message = content ? (
<div className="flex flex-col gap-1">
- <BotMessage message={content} citationMaps={citationMaps} />
+ <MarkdownMessage message={content} citationMaps={citationMaps} />
{showActions && (
<MessageActions
message={content} // Keep original message content for copy
diff --git a/components/artifact/artifact-content.tsx b/components/artifact/artifact-content.tsx
index fb0a0168..9fd7df33 100644
--- a/components/artifact/artifact-content.tsx
+++ b/components/artifact/artifact-content.tsx
@@ -1,13 +1,15 @@
'use client'
-import { Part, TodoToolPart } from '@/lib/types/ai'
+import { Part, ToolPart } 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 {
+// Type guard for Todo tool parts
+function isTodoToolPart(
+ part: Part
+): part is ToolPart<'todoWrite'> | ToolPart<'todoRead'> {
return part.type === 'tool-todoWrite' || part.type === 'tool-todoRead'
}
diff --git a/components/artifact/todo-invocation-content.tsx b/components/artifact/todo-invocation-content.tsx
index ca1a39cc..498abbc8 100644
--- a/components/artifact/todo-invocation-content.tsx
+++ b/components/artifact/todo-invocation-content.tsx
@@ -2,27 +2,11 @@
import { AlertCircle, Check } from 'lucide-react'
-import { TodoItem } from '@/lib/types/ai'
+import { TodoItem, ToolPart } from '@/lib/types/ai'
import { cn } from '@/lib/utils'
interface TodoInvocationContentProps {
- part: {
- 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
- }
+ part: ToolPart<'todoWrite'> | ToolPart<'todoRead'>
}
export function TodoInvocationContent({ part }: TodoInvocationContentProps) {
@@ -65,7 +49,13 @@ export function TodoInvocationContent({ part }: TodoInvocationContentProps) {
<div className="space-y-4">
{/* Summary */}
<div className="flex items-center justify-between text-sm text-muted-foreground">
- <span>{part.output?.message || 'Todo List'}</span>
+ <span>
+ {part.output && 'message' in part.output
+ ? part.output.message
+ : part.output && 'summary' in part.output
+ ? part.output.summary
+ : 'Todo List'}
+ </span>
<span className="font-medium whitespace-nowrap">
({completedCount}/{totalCount})
</span>
diff --git a/components/message.tsx b/components/message.tsx
index 0fc426f6..93b171f8 100644
--- a/components/message.tsx
+++ b/components/message.tsx
@@ -16,7 +16,7 @@ import { Citing } from './custom-link'
import 'katex/dist/katex.min.css'
-export function BotMessage({
+export function MarkdownMessage({
message,
className,
citationMaps
diff --git a/components/reasoning-section.tsx b/components/reasoning-section.tsx
index 22240e20..edb08b23 100644
--- a/components/reasoning-section.tsx
+++ b/components/reasoning-section.tsx
@@ -1,5 +1,6 @@
'use client'
+import type { ReasoningPart } from '@ai-sdk/provider-utils'
import { Lightbulb, Loader2 } from 'lucide-react'
import { Badge } from '@/components/ui/badge'
@@ -8,7 +9,7 @@ import { useArtifact } from '@/components/artifact/artifact-context'
import { CollapsibleMessage } from './collapsible-message'
import { DefaultSkeleton } from './default-skeleton'
-import { BotMessage } from './message'
+import { MarkdownMessage } from './message'
interface ReasoningContent {
reasoning: string
@@ -31,7 +32,7 @@ export function ReasoningSection({
<button
type="button"
onClick={() =>
- open({ type: 'reasoning', text: content.reasoning } as any)
+ open({ type: 'reasoning', text: content.reasoning } as ReasoningPart)
}
className="flex items-center gap-2 w-full text-left rounded-md p-0.5 -ml-0.5 cursor-pointer"
title="Open details"
@@ -67,7 +68,7 @@ export function ReasoningSection({
showIcon={false}
>
<div className="[&_p]:text-sm [&_p]:text-muted-foreground">
- <BotMessage message={content.reasoning} />
+ <MarkdownMessage message={content.reasoning} />
</div>
</CollapsibleMessage>
</div>
diff --git a/lib/types/ai.ts b/lib/types/ai.ts
index 2756507a..a1af34a8 100644
--- a/lib/types/ai.ts
+++ b/lib/types/ai.ts
@@ -1,9 +1,10 @@
+import type { ReasoningPart, TextPart } from '@ai-sdk/provider-utils'
import type { InferUITool, UIMessage as AIMessage } from 'ai'
import { fetchTool } from '@/lib/tools/fetch'
import { askQuestionTool } from '@/lib/tools/question'
import { searchTool } from '@/lib/tools/search'
-import { type TodoItem } from '@/lib/tools/todo'
+import { createTodoTools, type TodoItem } from '@/lib/tools/todo'
// Re-export TodoItem for external use
export type { TodoItem }
@@ -33,24 +34,19 @@ export type DataRelatedQuestionsPart = {
export type DataPart = DataRelatedQuestionsPart
+// Create todo tools instance for type inference
+const todoTools = createTodoTools()
+
export type UITools = {
search: InferUITool<typeof searchTool>
fetch: InferUITool<typeof fetchTool>
askQuestion: InferUITool<typeof askQuestionTool>
+ todoWrite: InferUITool<typeof todoTools.todoWrite>
+ todoRead: InferUITool<typeof todoTools.todoRead>
// Dynamic tools will be added at runtime
[key: string]: any
}
-export type TextPart = {
- type: 'text'
- text: string
-}
-
-export type ReasoningPart = {
- type: 'reasoning'
- text: string
-}
-
export type ToolPart<T extends keyof UITools = keyof UITools> = {
type: `tool-${T}`
toolCallId: string
@@ -64,23 +60,4 @@ export type ToolPart<T extends keyof UITools = keyof UITools> = {
errorText?: string
}
-// 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
+export type Part = TextPart | ReasoningPart | ToolPart