Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

feat(studio): align assistant message parts (#49351)

Saxon Fletcher86105ca5ec37
diff --git a/apps/studio/components/ui/AIAssistantPanel/AssistantChat.tsx b/apps/studio/components/ui/AIAssistantPanel/AssistantChat.tsx
index 25d7f4cad6e..ea02bd93971 100644
--- a/apps/studio/components/ui/AIAssistantPanel/AssistantChat.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/AssistantChat.tsx
@@ -3,7 +3,7 @@ import { useChat } from '@ai-sdk/react'
import { lastAssistantMessageIsCompleteWithApprovalResponses } from 'ai'
import { LOCAL_STORAGE_KEYS, useFlag } from 'common'
import { useParams, useSearchParamsShallow } from 'common/hooks'
-import { AnimatePresence, motion } from 'framer-motion'
+import { AnimatePresence, motion, useReducedMotion } from 'framer-motion'
import { Eraser, Pencil, X } from 'lucide-react'
import { Fragment, useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from 'react'
import { Button, cn, KeyboardShortcut } from 'ui'
@@ -98,6 +98,7 @@ export const AssistantChat = ({
useSelectedOrganizationQuery()
const disablePrompts = useFlag('disableAssistantPrompts')
+ const shouldReduceMotion = useReducedMotion()
const snap = useAiAssistantStateSnapshot()
const state = useAiAssistantState()
const currentChat = snap.chats[chatId]
@@ -488,10 +489,10 @@ export const AssistantChat = ({
})}
{hasMessages ? (
<Conversation className={cn('flex-1')}>
- <ConversationContent className="w-full px-7 py-8 mb-10 max-w-3xl mx-auto">
+ <ConversationContent className="w-full px-7 py-8 mb-10">
{renderedMessages}
- {error && (
- <>
+ <div className="w-full max-w-3xl mx-auto">
+ {error && (
<AlertError
error={
isContextExceededError
@@ -537,19 +538,23 @@ export const AssistantChat = ({
</div>
}
/>
- </>
- )}
- {isChatLoading && (
- <motion.span
- animate={{ opacity: [1, 0] }}
- transition={{ duration: 1, repeat: Infinity, ease: 'linear' }}
- className="inline-block w-1.5 h-4 bg-foreground-lighter mt-4"
- />
- )}
+ )}
+ {isChatLoading && (
+ <motion.span
+ animate={shouldReduceMotion ? { opacity: 1 } : { opacity: [1, 0] }}
+ transition={
+ shouldReduceMotion
+ ? { duration: 0 }
+ : { duration: 1, repeat: Infinity, ease: 'linear' }
+ }
+ className="inline-block w-1.5 h-4 bg-foreground-lighter mt-4"
+ />
+ )}
- <p className="text-center text-xs text-foreground-muted mt-6">
- The Assistant can make mistakes. Double check responses.
- </p>
+ <p className="text-center text-xs text-foreground-muted mt-6">
+ The Assistant can make mistakes. Double check responses.
+ </p>
+ </div>
</ConversationContent>
<ConversationScrollButton />
</Conversation>
diff --git a/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.test.tsx b/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.test.tsx
index 6f01d839212..c1cdc1fcdef 100644
--- a/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.test.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.test.tsx
@@ -55,11 +55,12 @@ describe('AssistantNotebookPreview', () => {
{ _tag: 'unchanged', cell: wireMarkdownCell('b', 'two') },
]
- render(<AssistantNotebookPreview entries={entries} mode="create" />)
+ const { container } = render(<AssistantNotebookPreview entries={entries} mode="create" />)
expect(screen.getByRole('toolbar', { name: 'Notebook toolbar' })).toBeInTheDocument()
expect(screen.getByText('2 cells')).toBeInTheDocument()
expect(screen.getByText('New notebook')).toBeInTheDocument()
+ expect(container.firstElementChild).toHaveClass('max-w-6xl')
})
it('surfaces a metadata-only change on a replaced cell even when the sql is unchanged', () => {
diff --git a/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.tsx b/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.tsx
index 959378d65e5..26c243b6c53 100644
--- a/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/AssistantNotebookPreview.tsx
@@ -54,7 +54,7 @@ export const AssistantNotebookPreview = ({
expandedOverrides[getEntryKey(entry)] === true
return (
- <div className={cn('flex min-w-0 flex-col', className)}>
+ <div className={cn('flex w-full min-w-0 max-w-6xl mx-auto flex-col', className)}>
<ExplorerToolbar aria-label="Notebook toolbar">
<ExplorerToolbarIcon>
<NotebookText />
diff --git a/apps/studio/components/ui/AIAssistantPanel/AssistantQueryCell.tsx b/apps/studio/components/ui/AIAssistantPanel/AssistantQueryCell.tsx
index 6036059820a..6369797c915 100644
--- a/apps/studio/components/ui/AIAssistantPanel/AssistantQueryCell.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/AssistantQueryCell.tsx
@@ -127,7 +127,7 @@ export const AssistantQueryCell = ({
return (
<Confirm
fill
- className="h-96"
+ className="h-96 w-full max-w-6xl mx-auto"
state={confirmState}
message="Assistant wants to run this query"
cancelLabel="Skip"
diff --git a/apps/studio/components/ui/AIAssistantPanel/Message.Actions.test.tsx b/apps/studio/components/ui/AIAssistantPanel/Message.Actions.test.tsx
new file mode 100644
index 00000000000..4f4bc36a194
--- /dev/null
+++ b/apps/studio/components/ui/AIAssistantPanel/Message.Actions.test.tsx
@@ -0,0 +1,18 @@
+import { describe, expect, it } from 'vitest'
+
+import { MessageActions } from './Message.Actions'
+import { customRender } from '@/tests/lib/custom-render'
+
+describe('MessageActions', () => {
+ it('uses the standard centered message width', () => {
+ const { container } = customRender(
+ <MessageActions>
+ <button type="button" tabIndex={0}>
+ Copy
+ </button>
+ </MessageActions>
+ )
+
+ expect(container.firstChild).toHaveClass('w-full', 'max-w-3xl', 'mx-auto')
+ })
+})
diff --git a/apps/studio/components/ui/AIAssistantPanel/Message.Actions.tsx b/apps/studio/components/ui/AIAssistantPanel/Message.Actions.tsx
index e0f05f01e77..7e4bd8ef7ed 100644
--- a/apps/studio/components/ui/AIAssistantPanel/Message.Actions.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/Message.Actions.tsx
@@ -23,7 +23,7 @@ export function MessageActions({
alwaysShow = false,
}: PropsWithChildren<{ alwaysShow?: boolean }>) {
return (
- <div className="flex items-center gap-4 mt-2 mb-1">
+ <div className="w-full max-w-3xl mx-auto flex items-center gap-4 mt-2 mb-1">
<span className="h-0.5 w-5 bg-muted" />
<div className={cn('group-hover:opacity-100 transition-opacity', !alwaysShow && 'opacity-0')}>
{children}
diff --git a/apps/studio/components/ui/AIAssistantPanel/Message.Display.tsx b/apps/studio/components/ui/AIAssistantPanel/Message.Display.tsx
index a6cd55409fa..1c30480f703 100644
--- a/apps/studio/components/ui/AIAssistantPanel/Message.Display.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/Message.Display.tsx
@@ -56,9 +56,11 @@ function MessageDisplayContent({ message }: { message: VercelMessage }) {
return <MessagePartSwitcher key={idx} part={part} />
})
: content && (
- <MessageDisplayTextMessage id={id} isLoading={isLoading} readOnly={readOnly}>
- {content}
- </MessageDisplayTextMessage>
+ <div className="w-full max-w-3xl mx-auto">
+ <MessageDisplayTextMessage id={id} isLoading={isLoading} readOnly={readOnly}>
+ {content}
+ </MessageDisplayTextMessage>
+ </div>
)}
</div>
)
diff --git a/apps/studio/components/ui/AIAssistantPanel/Message.Parts.test.tsx b/apps/studio/components/ui/AIAssistantPanel/Message.Parts.test.tsx
new file mode 100644
index 00000000000..8f8042d8377
--- /dev/null
+++ b/apps/studio/components/ui/AIAssistantPanel/Message.Parts.test.tsx
@@ -0,0 +1,36 @@
+import type { ToolUIPart } from 'ai'
+import { describe, expect, it } from 'vitest'
+
+import { MessagePartSwitcher } from './Message.Parts'
+import { customRender } from '@/tests/lib/custom-render'
+
+type MessagePart = Parameters<typeof MessagePartSwitcher>[0]['part']
+
+describe('MessagePartSwitcher', () => {
+ it('keeps consecutive generic tool parts as direct siblings', () => {
+ const reasoningPart = {
+ type: 'reasoning',
+ state: 'done',
+ text: 'I will look up the project details.',
+ } satisfies Extract<MessagePart, { type: 'reasoning' }>
+ const toolPart = {
+ type: 'tool-load_knowledge',
+ toolCallId: 'load-knowledge-1',
+ state: 'output-available',
+ input: {},
+ output: {},
+ } satisfies ToolUIPart
+
+ const { container } = customRender(
+ <>
+ <MessagePartSwitcher part={reasoningPart} />
+ <MessagePartSwitcher part={toolPart} />
+ </>
+ )
+
+ const toolRows = container.querySelectorAll('.tool-item')
+ expect(toolRows).toHaveLength(2)
+ expect(toolRows[0].nextElementSibling).toBe(toolRows[1])
+ expect(toolRows[0]).toHaveClass('max-w-3xl')
+ })
+})
diff --git a/apps/studio/components/ui/AIAssistantPanel/Message.Parts.tsx b/apps/studio/components/ui/AIAssistantPanel/Message.Parts.tsx
index a08a24a8ad8..b3b4fe25584 100644
--- a/apps/studio/components/ui/AIAssistantPanel/Message.Parts.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/Message.Parts.tsx
@@ -1,6 +1,7 @@
import { UIMessage as VercelMessage } from '@ai-sdk/react'
import { type DynamicToolUIPart, type ReasoningUIPart, type TextUIPart, type ToolUIPart } from 'ai'
import { BrainIcon, CheckIcon, Loader2 } from 'lucide-react'
+import { type ReactNode } from 'react'
import { cn } from 'ui'
import { AssistantQueryCell } from './AssistantQueryCell'
@@ -281,49 +282,84 @@ const MessagePart = {
NotebookProposal: MessagePartNotebookProposal,
} as const
+function MessagePartContainer({
+ children,
+ isWide = false,
+}: {
+ children: ReactNode
+ isWide?: boolean
+}) {
+ return <div className={cn('w-full mx-auto', isWide ? 'max-w-6xl' : 'max-w-3xl')}>{children}</div>
+}
+
+const isWideMessagePart = (part: NonNullable<VercelMessage['parts']>[number]) =>
+ part.type === 'tool-execute_sql' ||
+ part.type === 'tool-query_logs' ||
+ part.type === 'tool-create_notebook' ||
+ part.type === 'tool-update_notebook' ||
+ (part.type === 'dynamic-tool' && part.toolName === 'query_logs') ||
+ // Unlabelled code fences resolve to SQL in MessageMarkdown, too.
+ (part.type === 'text' && /```(?:sql)?(?:\s|$)/i.test(part.text))
+
+const isCompactToolPart = (part: NonNullable<VercelMessage['parts']>[number]) =>
+ part.type === 'reasoning' ||
+ (part.type === 'dynamic-tool' && part.toolName !== 'query_logs') ||
+ part.type === 'tool-list_policies' ||
+ part.type === 'tool-search_docs' ||
+ part.type === 'tool-get_active_incidents' ||
+ part.type === 'tool-load_knowledge'
+
export function MessagePartSwitcher({
part,
}: {
part: NonNullable<VercelMessage['parts']>[number]
}) {
- switch (part.type) {
- case 'dynamic-tool': {
- if (part.toolName === 'query_logs') {
+ const content = (() => {
+ switch (part.type) {
+ case 'dynamic-tool': {
+ if (part.toolName === 'query_logs') {
+ return <MessagePart.QueryLogs toolPart={part} />
+ }
+ return <MessagePart.Dynamic toolPart={part} />
+ }
+ case 'tool-list_policies':
+ case 'tool-search_docs':
+ case 'tool-get_active_incidents':
+ case 'tool-load_knowledge': {
+ return <MessagePart.Tool toolPart={part} />
+ }
+ case 'reasoning':
+ return <MessagePart.Reasoning reasoningPart={part} />
+ case 'text':
+ return <MessagePart.Text textPart={part} />
+
+ case 'tool-execute_sql': {
+ return <MessagePart.ExecuteSql toolPart={part} />
+ }
+ case 'tool-query_logs': {
return <MessagePart.QueryLogs toolPart={part} />
}
- return <MessagePart.Dynamic toolPart={part} />
- }
- case 'tool-list_policies':
- case 'tool-search_docs':
- case 'tool-get_active_incidents':
- case 'tool-load_knowledge': {
- return <MessagePart.Tool toolPart={part} />
- }
- case 'reasoning':
- return <MessagePart.Reasoning reasoningPart={part} />
- case 'text':
- return <MessagePart.Text textPart={part} />
+ case 'tool-deploy_edge_function': {
+ return <MessagePart.DeployEdgeFunction toolPart={part} />
+ }
+ case 'tool-create_notebook': {
+ return <MessagePart.NotebookProposal toolPart={part} mode="create" />
+ }
+ case 'tool-update_notebook': {
+ return <MessagePart.NotebookProposal toolPart={part} mode="update" />
+ }
- case 'tool-execute_sql': {
- return <MessagePart.ExecuteSql toolPart={part} />
- }
- case 'tool-query_logs': {
- return <MessagePart.QueryLogs toolPart={part} />
- }
- case 'tool-deploy_edge_function': {
- return <MessagePart.DeployEdgeFunction toolPart={part} />
- }
- case 'tool-create_notebook': {
- return <MessagePart.NotebookProposal toolPart={part} mode="create" />
- }
- case 'tool-update_notebook': {
- return <MessagePart.NotebookProposal toolPart={part} mode="update" />
+ case 'source-url':
+ case 'source-document':
+ case 'file':
+ default:
+ return null
}
+ })()
- case 'source-url':
- case 'source-document':
- case 'file':
- default:
- return null
- }
+ if (content === null) return null
+ // Tool rows depend on being direct siblings to share their compact spacing and dividers.
+ if (isCompactToolPart(part)) return content
+
+ return <MessagePartContainer isWide={isWideMessagePart(part)}>{content}</MessagePartContainer>
}
diff --git a/apps/studio/components/ui/AIAssistantPanel/Message.tsx b/apps/studio/components/ui/AIAssistantPanel/Message.tsx
index 6ec5780bec6..b719c2cab0f 100644
--- a/apps/studio/components/ui/AIAssistantPanel/Message.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/Message.tsx
@@ -71,7 +71,7 @@ function UserMessage({ message }: { message: VercelMessage }) {
)}
onClick={state === 'predecessor-editing' ? onCancelEdit : undefined}
>
- <MessageDisplay.MainArea>
+ <MessageDisplay.MainArea className="w-full max-w-3xl mx-auto">
<MessageDisplay.ProfileImage />
<MessageDisplay.Content message={message} />
</MessageDisplay.MainArea>
diff --git a/apps/studio/components/ui/AIAssistantPanel/elements/Tool.tsx b/apps/studio/components/ui/AIAssistantPanel/elements/Tool.tsx
index fef049927a6..8677810b62c 100644
--- a/apps/studio/components/ui/AIAssistantPanel/elements/Tool.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/elements/Tool.tsx
@@ -13,7 +13,7 @@ export function Tool({ className, label, icon, children }: ToolProps) {
return (
<div
className={cn(
- 'tool-item text-foreground-lighter flex items-center gap-2 py-2',
+ 'tool-item w-full max-w-3xl mx-auto text-foreground-lighter flex items-center gap-2 py-2',
'[&:not(.tool-item+.tool-item)]:mt-4 [&:not(:has(+.tool-item))]:mb-4',
'[&:has(+.tool-item)]:border-b [&:has(+.tool-item)]:border-b-muted',
'first:mt-0! last:mb-0',