Skip to content

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

feat: add Explorer chat discovery and controls (#49032)

Saxon Fletcherfd8d21313537
diff --git a/apps/studio/components/interfaces/Explorer/ChatEditor.tsx b/apps/studio/components/interfaces/Explorer/ChatEditor.tsx
index e7859c2ee53..bd0e21e3851 100644
--- a/apps/studio/components/interfaces/Explorer/ChatEditor.tsx
+++ b/apps/studio/components/interfaces/Explorer/ChatEditor.tsx
@@ -4,6 +4,7 @@ import { useRouter } from 'next/router'
import { useEffect, useEffectEvent } from 'react'
import { Button } from 'ui'
+import { ExplorerChatToolbar } from './ExplorerChatToolbar'
import { useCreateChat } from './hooks'
import { SIDEBAR_KEYS } from '@/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'
import { AssistantChat } from '@/components/ui/AIAssistantPanel/AssistantChat'
@@ -94,6 +95,9 @@ export const ChatEditor = () => {
onNewChat={() => createChat()}
onSelectChat={openChat}
onBranchChat={handleBranchChat}
+ renderHeader={(headerProps) => (
+ <ExplorerChatToolbar {...headerProps} chatId={id} shortcutsEnabled={shortcutsEnabled} />
+ )}
/>
)
}
diff --git a/apps/studio/components/interfaces/Explorer/ExplorerChatToolbar.tsx b/apps/studio/components/interfaces/Explorer/ExplorerChatToolbar.tsx
new file mode 100644
index 00000000000..0444012d883
--- /dev/null
+++ b/apps/studio/components/interfaces/Explorer/ExplorerChatToolbar.tsx
@@ -0,0 +1,115 @@
+import { Clipboard, MessageSquare, MoreVertical, Settings } from 'lucide-react'
+import { useState } from 'react'
+import { toast } from 'sonner'
+import {
+ copyToClipboard,
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSeparator,
+ DropdownMenuTrigger,
+} from 'ui'
+
+import {
+ ExplorerToolbar,
+ ExplorerToolbarAction,
+ ExplorerToolbarActions,
+ ExplorerToolbarIcon,
+ ExplorerToolbarTitle,
+} from './ExplorerToolbar'
+import { AIAssistantMetadataWarning } from '@/components/ui/AIAssistantPanel/AIAssistantMetadataWarning'
+import type { AssistantChatHeaderProps } from '@/components/ui/AIAssistantPanel/AssistantChat'
+import { ShortcutPills } from '@/components/ui/ShortcutTooltip'
+import { useAiAssistantStateSnapshot } from '@/state/ai-assistant-state'
+import { SHORTCUT_DEFINITIONS, SHORTCUT_IDS } from '@/state/shortcuts/registry'
+import { useShortcut } from '@/state/shortcuts/useShortcut'
+
+interface ExplorerChatToolbarProps extends AssistantChatHeaderProps {
+ chatId: string
+ shortcutsEnabled: boolean
+}
+
+export const ExplorerChatToolbar = ({
+ chatId,
+ shortcutsEnabled,
+ isChatLoading,
+ showMetadataWarning,
+ updatedOptInSinceMCP,
+ isHipaaProjectDisallowed,
+ aiOptInLevel,
+}: ExplorerChatToolbarProps) => {
+ const snap = useAiAssistantStateSnapshot()
+ const chat = snap.chats[chatId]
+ const [isOptInModalOpen, setIsOptInModalOpen] = useState(false)
+
+ const handleCopyChatId = () => {
+ copyToClipboard(chatId, () => toast.success(`Copied chat ID for ${chat?.name}`))
+ }
+
+ const handleSaveName = (name: string) => {
+ if (name.trim()) snap.renameChat(chatId, name.trim())
+ }
+
+ useShortcut(SHORTCUT_IDS.AI_ASSISTANT_COPY_CHAT_ID, handleCopyChatId, {
+ enabled: shortcutsEnabled && !isChatLoading,
+ })
+ useShortcut(SHORTCUT_IDS.AI_ASSISTANT_OPEN_PERMISSIONS, () => setIsOptInModalOpen(true), {
+ enabled: shortcutsEnabled && !isChatLoading,
+ })
+
+ return (
+ <div className="z-30 sticky top-0">
+ <ExplorerToolbar aria-label="Chat toolbar">
+ <ExplorerToolbarIcon>
+ <MessageSquare />
+ </ExplorerToolbarIcon>
+ <ExplorerToolbarTitle onSaveTitle={handleSaveName}>{chat?.name ?? ''}</ExplorerToolbarTitle>
+ <ExplorerToolbarActions>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <ExplorerToolbarAction
+ aria-label="More options"
+ icon={<MoreVertical />}
+ disabled={isChatLoading}
+ />
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end" className="w-60">
+ <DropdownMenuItem className="justify-between" onClick={handleCopyChatId}>
+ <div className="flex items-center gap-x-2">
+ <Clipboard size={14} />
+ <span>Copy chat ID</span>
+ </div>
+ <ShortcutPills
+ sequence={SHORTCUT_DEFINITIONS[SHORTCUT_IDS.AI_ASSISTANT_COPY_CHAT_ID].sequence}
+ />
+ </DropdownMenuItem>
+ <DropdownMenuSeparator />
+ <DropdownMenuItem
+ className="justify-between"
+ onClick={() => setIsOptInModalOpen(true)}
+ >
+ <div className="flex items-center gap-x-2">
+ <Settings size={14} />
+ <span>Permission settings</span>
+ </div>
+ <ShortcutPills
+ sequence={
+ SHORTCUT_DEFINITIONS[SHORTCUT_IDS.AI_ASSISTANT_OPEN_PERMISSIONS].sequence
+ }
+ />
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </ExplorerToolbarActions>
+ </ExplorerToolbar>
+ <AIAssistantMetadataWarning
+ visible={isOptInModalOpen}
+ onVisibleChange={setIsOptInModalOpen}
+ showMetadataWarning={showMetadataWarning}
+ updatedOptInSinceMCP={updatedOptInSinceMCP}
+ isHipaaProjectDisallowed={isHipaaProjectDisallowed}
+ aiOptInLevel={aiOptInLevel}
+ />
+ </div>
+ )
+}
diff --git a/apps/studio/components/interfaces/Explorer/ExplorerHome.tsx b/apps/studio/components/interfaces/Explorer/ExplorerHome.tsx
index 786f4ad6fd2..ed15f4b7f7e 100644
--- a/apps/studio/components/interfaces/Explorer/ExplorerHome.tsx
+++ b/apps/studio/components/interfaces/Explorer/ExplorerHome.tsx
@@ -1,14 +1,15 @@
import { MessageCirclePlus, NotebookText, SquareCode } from 'lucide-react'
import { useState } from 'react'
-import { useCreateNotebook, useCreateQuery } from './hooks'
+import { useCreateChat, useCreateNotebook, useCreateQuery } from './hooks'
import { ActionCard } from '@/components/layouts/Tabs/ActionCard'
import { AssistantChatForm } from '@/components/ui/AIAssistantPanel/AssistantChatForm'
-import { AssistantModel } from '@/state/ai-assistant-state'
+import type { AssistantModel } from '@/state/ai-assistant-state'
export const ExplorerHome = () => {
const { createNotebook } = useCreateNotebook()
const { createQuery } = useCreateQuery()
+ const { createChat } = useCreateChat()
const [value, setValue] = useState<string>('')
const [selectedModel, setSelectedModal] = useState<AssistantModel>('gpt-5.4-nano')
@@ -34,7 +35,7 @@ export const ExplorerHome = () => {
onValueChange={(e) => setValue(e.target.value)}
selectedModel={selectedModel}
onSelectModel={setSelectedModal}
- onSubmit={() => {}}
+ onSubmit={(message) => createChat({ initialMessage: message, model: selectedModel })}
/>
<section className="mt-6">
diff --git a/apps/studio/components/layouts/ExplorerLayout/ExplorerLayout.constants.tsx b/apps/studio/components/layouts/ExplorerLayout/ExplorerLayout.constants.tsx
index fc195984fc1..70bdf43bf6f 100644
--- a/apps/studio/components/layouts/ExplorerLayout/ExplorerLayout.constants.tsx
+++ b/apps/studio/components/layouts/ExplorerLayout/ExplorerLayout.constants.tsx
@@ -4,7 +4,7 @@ import { type ComponentType, type PropsWithChildren } from 'react'
import { Button, cn } from 'ui'
import { InnerSideBarFilters, InnerSideBarFilterSearchInput } from 'ui-patterns/InnerSideMenu'
-import { useCreateNotebook } from '@/components/interfaces/Explorer/hooks'
+import { useCreateChat, useCreateNotebook } from '@/components/interfaces/Explorer/hooks'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
export type ExplorerResourceType = 'notebook' | 'chat'
@@ -52,6 +52,7 @@ export const ExplorerNavResourceWrapper = ({
onBack: () => void
}>) => {
const { createNotebook } = useCreateNotebook()
+ const { createChat } = useCreateChat()
const searchPlaceholder = EXPLORER_SECTIONS.find((x) => x.type === type)?.searchPlaceholder
return (
@@ -94,6 +95,7 @@ export const ExplorerNavResourceWrapper = ({
tooltip={{ content: { side: 'bottom', text: `New ${type}` } }}
onClick={() => {
if (type === 'notebook') createNotebook()
+ if (type === 'chat') createChat()
}}
/>
</div>
diff --git a/apps/studio/components/layouts/ExplorerLayout/ExplorerLayout.tsx b/apps/studio/components/layouts/ExplorerLayout/ExplorerLayout.tsx
index 0e797ba0b8a..ce1fc5158f3 100644
--- a/apps/studio/components/layouts/ExplorerLayout/ExplorerLayout.tsx
+++ b/apps/studio/components/layouts/ExplorerLayout/ExplorerLayout.tsx
@@ -17,7 +17,11 @@ import { ExplorerNavChats } from './ExplorerNavChats'
import { ExplorerNavHome } from './ExplorerNavHome'
import { ExplorerNavNotebooks } from './ExplorerNavNotebooks'
import { ExplorerQueryTabCoordinator } from '@/components/interfaces/Explorer/ExplorerQueryTabCoordinator'
-import { useCreateNotebook, useCreateQuery } from '@/components/interfaces/Explorer/hooks'
+import {
+ useCreateChat,
+ useCreateNotebook,
+ useCreateQuery,
+} from '@/components/interfaces/Explorer/hooks'
import {
editorEntityTypes,
EXPLORER_HOME_TAB,
@@ -119,6 +123,7 @@ const HomeTabButton = () => {
const NewTabButton = () => {
const { createNotebook } = useCreateNotebook()
const { createQuery } = useCreateQuery()
+ const { createChat } = useCreateChat()
return (
<DropdownMenu>
@@ -146,7 +151,7 @@ const NewTabButton = () => {
<NotebookText size={14} />
<span>New notebook</span>
</DropdownMenuItem>
- <DropdownMenuItem disabled className="gap-x-2">
+ <DropdownMenuItem className="gap-x-2" onClick={() => createChat()}>
<MessageCirclePlus size={14} />
<span>New chat</span>
</DropdownMenuItem>
diff --git a/apps/studio/components/layouts/ExplorerLayout/ExplorerNavChats.test.tsx b/apps/studio/components/layouts/ExplorerLayout/ExplorerNavChats.test.tsx
new file mode 100644
index 00000000000..9678159e2cc
--- /dev/null
+++ b/apps/studio/components/layouts/ExplorerLayout/ExplorerNavChats.test.tsx
@@ -0,0 +1,73 @@
+import { fireEvent, screen } from '@testing-library/react'
+import type { PropsWithChildren } from 'react'
+import { describe, expect, it, vi } from 'vitest'
+
+import { ExplorerNavChats } from './ExplorerNavChats'
+import { customRender } from '@/tests/lib/custom-render'
+
+vi.mock('common', async (importOriginal) => {
+ const actual = await importOriginal<typeof import('common')>()
+ return { ...actual, useParams: () => ({ id: 'recent-chat' }) }
+})
+
+vi.mock('next/router', () => ({
+ useRouter: () => ({ pathname: '/project/[ref]/explorer/chat/[id]' }),
+}))
+
+vi.mock('./ExplorerLayout.constants', () => ({
+ ExplorerNavResourceWrapper: ({
+ children,
+ search,
+ setSearch,
+ }: PropsWithChildren<{ search: string; setSearch: (value: string) => void }>) => (
+ <div>
+ <input
+ aria-label="Search chats"
+ value={search}
+ onChange={(event) => setSearch(event.target.value)}
+ />
+ {children}
+ </div>
+ ),
+ rowClassName: (isActive: boolean) => (isActive ? 'active' : 'inactive'),
+}))
+
+vi.mock('@/components/interfaces/Explorer/hooks', () => ({
+ useCreateChat: () => ({ openChat: vi.fn() }),
+}))
+
+vi.mock('@/state/ai-assistant-state', () => ({
+ useAiAssistantChatList: () => [
+ { id: 'old-chat', name: 'Older investigation', updatedAt: new Date('2026-01-01') },
+ { id: 'missing-date', name: 'Rehydrated chat' },
+ { id: 'recent-chat', name: 'Recent investigation', updatedAt: new Date('2026-02-01') },
+ {
+ id: 'support',
+ name: 'Support conversation',
+ updatedAt: new Date('2026-03-01'),
+ supportMetadata: { isSupportChat: true },
+ },
+ ],
+}))
+
+describe('ExplorerNavChats', () => {
+ it('filters support chats, safely sorts rehydrated chats, and marks the route active', () => {
+ customRender(<ExplorerNavChats onBack={vi.fn()} />)
+
+ const chatButtons = screen.getAllByRole('button')
+ expect(chatButtons.map((button) => button.textContent)).toEqual([
+ 'Recent investigation',
+ 'Older investigation',
+ 'Rehydrated chat',
+ ])
+ expect(chatButtons[0]).toHaveClass('active')
+ expect(screen.queryByText('Support conversation')).not.toBeInTheDocument()
+
+ fireEvent.change(screen.getByRole('textbox', { name: 'Search chats' }), {
+ target: { value: 'rehydrated' },
+ })
+
+ expect(screen.getByRole('button')).toHaveTextContent('Rehydrated chat')
+ expect(screen.queryByText('Recent investigation')).not.toBeInTheDocument()
+ })
+})
diff --git a/apps/studio/components/layouts/ExplorerLayout/ExplorerNavChats.tsx b/apps/studio/components/layouts/ExplorerLayout/ExplorerNavChats.tsx
index 7bef8979324..1c5b84a4448 100644
--- a/apps/studio/components/layouts/ExplorerLayout/ExplorerNavChats.tsx
+++ b/apps/studio/components/layouts/ExplorerLayout/ExplorerNavChats.tsx
@@ -1,16 +1,60 @@
+import { useParams } from 'common'
+import { MessageSquare } from 'lucide-react'
+import { useRouter } from 'next/router'
import { useState } from 'react'
+import { cn } from 'ui'
-import { ExplorerNavResourceWrapper } from './ExplorerLayout.constants'
+import { ExplorerNavResourceWrapper, rowClassName } from './ExplorerLayout.constants'
+import { useCreateChat } from '@/components/interfaces/Explorer/hooks'
+import type { ChatSession } from '@/state/ai-assistant-state'
+import { useAiAssistantChatList } from '@/state/ai-assistant-state'
+
+const getVisibleChats = (chats: ChatSession[], search: string): ChatSession[] => {
+ const normalizedSearch = search.trim().toLowerCase()
+
+ return chats
+ .filter((chat) => !chat.supportMetadata?.isSupportChat)
+ .filter((chat) => !normalizedSearch || chat.name.toLowerCase().includes(normalizedSearch))
+ .sort((a, b) => (b.updatedAt?.getTime() ?? 0) - (a.updatedAt?.getTime() ?? 0))
+}
export const ExplorerNavChats = ({ onBack }: { onBack: () => void }) => {
const [search, setSearch] = useState('')
+ const router = useRouter()
+ const { id } = useParams()
+ const { openChat } = useCreateChat()
+ const chatList = useAiAssistantChatList()
- // [Joshen] Eventually will have data fetching for notebooks via useAiAssistantState
+ const chats = getVisibleChats(chatList, search)
return (
<ExplorerNavResourceWrapper type="chat" search={search} setSearch={setSearch} onBack={onBack}>
<div className="flex flex-1 flex-col gap-px overflow-y-auto px-3 pb-3">
- <p className="px-2 py-2 text-xs text-foreground-lighter">No chats created yet</p>
+ {chats.length === 0 ? (
+ <p className="px-2 py-2 text-xs text-foreground-lighter">
+ {search ? 'No chats found' : 'No chats created yet'}
+ </p>
+ ) : (
+ chats.map((chat) => {
+ const isActive = router.pathname.includes('/explorer/chat/') && id === chat.id
+
+ return (
+ <button
+ key={chat.id}
+ type="button"
+ tabIndex={0}
+ className={rowClassName(isActive)}
+ onClick={() => openChat(chat.id)}
+ >
+ <MessageSquare
+ size={14}
+ className={cn('shrink-0', isActive && 'text-foreground')}
+ />
+ <span className="truncate text-left">{chat.name}</span>
+ </button>
+ )
+ })
+ )}
</div>
</ExplorerNavResourceWrapper>
)
diff --git a/apps/studio/components/layouts/Tabs/RecentItems.test.ts b/apps/studio/components/layouts/Tabs/RecentItems.test.ts
new file mode 100644
index 00000000000..f5dadc7bcfd
--- /dev/null
+++ b/apps/studio/components/layouts/Tabs/RecentItems.test.ts
@@ -0,0 +1,33 @@
+import { describe, expect, it } from 'vitest'
+
+import { getRecentItemHref } from './RecentItems'
+
+describe('getRecentItemHref', () => {
+ it('builds chat and notebook Explorer URLs from their IDs', () => {
+ expect(
+ getRecentItemHref(
+ {
+ id: 'chat-chat-1',
+ type: 'chat',
+ label: 'Chat',
+ timestamp: 1,
+ metadata: { chatId: 'chat-1' },
+ },
+ 'default'
+ )
+ ).toBe('/project/default/explorer/chat/chat-1')
+
+ expect(
+ getRecentItemHref(
+ {
+ id: 'notebook-notebook-1',
+ type: 'notebook',
+ label: 'Notebook',
+ timestamp: 1,
+ metadata: { notebookId: 'notebook-1' },
+ },
+ 'default'
+ )
+ ).toBe('/project/default/explorer/notebook/notebook-1')
+ })
+})
diff --git a/apps/studio/components/layouts/Tabs/RecentItems.tsx b/apps/studio/components/layouts/Tabs/RecentItems.tsx
index 2bae3f19acb..3808329cf53 100644
--- a/apps/studio/components/layouts/Tabs/RecentItems.tsx
+++ b/apps/studio/components/layouts/Tabs/RecentItems.tsx
@@ -7,7 +7,30 @@ import { useEditorType } from '../editors/EditorsLayout.hooks'
import { buildTableEditorUrl } from '@/components/grid/SupabaseGrid.utils'
import { EntityTypeIcon } from '@/components/ui/EntityTypeIcon'
import { ENTITY_TYPE } from '@/data/entity-types/entity-type-constants'
-import { editorEntityTypes, useTabsStateSnapshot } from '@/state/tabs'
+import { editorEntityTypes, useTabsStateSnapshot, type RecentItem } from '@/state/tabs'
+
+export function getRecentItemHref(item: RecentItem, projectRef: string) {
+ switch (item.type) {
+ case 'sql':
+ return `/project/${projectRef}/sql/${item.metadata?.sqlId}`
+ case 'notebook':
+ return `/project/${projectRef}/explorer/notebook/${item.metadata?.notebookId}`
+ case 'chat':
+ return `/project/${projectRef}/explorer/chat/${item.metadata?.chatId}`
+ case 'r':
+ case 'v':
+ case 'm':
+ case 'f':
+ case 'p':
+ return buildTableEditorUrl({
+ projectRef,
+ tableId: item.metadata?.tableId!,
+ schema: item.metadata?.schema,
+ })
+ default:
+ return `/project/${projectRef}/explorer/${item.type}/${item.metadata?.schema}/${item.metadata?.name}`
+ }
+}
export function RecentItems() {
const { ref } = useParams()
@@ -53,21 +76,7 @@ export function RecentItems() {
transition={{ delay: index * 0.012, duration: 0.15 }}
>
<Link
- href={
- item.type === 'sql'
- ? `/project/${ref}/sql/${item.metadata?.sqlId}`
- : item.type === 'r' ||
- item.type === 'v' ||
- item.type === 'm' ||
- item.type === 'f' ||
- item.type === 'p'
- ? buildTableEditorUrl({
- projectRef: ref,
- tableId: item.metadata?.tableId!,
- schema: item.metadata?.schema,
- })
- : `/project/${ref}/explorer/${item.type}/${item.metadata?.schema}/${item.metadata?.name}`
- }
+ href={getRecentItemHref(item, ref)}
className="flex items-center gap-4 rounded-lg bg-surface-100 py-2 transition-colors hover:bg-surface-200"
>
<div className="flex h-6 w-6 items-center justify-center rounded-sm bg-surface-100 border">
diff --git a/apps/studio/components/ui/AIAssistantPanel/AIAssistantHeader.test.tsx b/apps/studio/components/ui/AIAssistantPanel/AIAssistantHeader.test.tsx
new file mode 100644
index 00000000000..415bb8e8d79
--- /dev/null
+++ b/apps/studio/components/ui/AIAssistantPanel/AIAssistantHeader.test.tsx
@@ -0,0 +1,56 @@
+import { fireEvent, screen } from '@testing-library/react'
+import { describe, expect, it, vi } from 'vitest'
+
+import { AIAssistantHeader } from './AIAssistantHeader'
+import { customRender } from '@/tests/lib/custom-render'
+
+const { openChat } = vi.hoisted(() => ({ openChat: vi.fn() }))
+
+vi.mock('@/state/ai-assistant-state', () => ({
+ useAiAssistantStateSnapshot: () => ({
+ activeChatId: 'chat-1',
+ activeChat: { name: 'Investigate errors' },
+ renameChat: vi.fn(),
+ }),
+}))
+
+vi.mock('@/components/interfaces/Explorer/hooks', () => ({
+ useCreateChat: () => ({ openChat }),
+}))
+
+vi.mock('@/state/shortcuts/useShortcut', () => ({ useShortcut: vi.fn() }))
+
+vi.mock('./AIAssistantChatSelector', () => ({
+ AIAssistantChatSelector: () => (
+ <button type="button" tabIndex={0}>
+ History
+ </button>
+ ),
+}))
+
+vi.mock('./AIAssistantMetadataWarning', () => ({
+ AIAssistantMetadataWarning: () => null,
+}))
+
+const defaultProps = {
+ isChatLoading: false,
+ onNewChat: vi.fn(),
+ onCloseAssistant: vi.fn(),
+ showMetadataWarning: false,
+ updatedOptInSinceMCP: true,
+ isHipaaProjectDisallowed: false,
+ aiOptInLevel: 'full',
+}
+
+describe('AIAssistantHeader', () => {
+ it('opens the active chat in Explorer and closes the sidebar', () => {
+ const onCloseAssistant = vi.fn()
+ customRender(<AIAssistantHeader {...defaultProps} onCloseAssistant={onCloseAssistant} />)
+
+ fireEvent.click(screen.getByRole('button', { name: 'Open in Explorer' }))
+
+ expect(openChat).toHaveBeenCalledWith('chat-1')
+ expect(onCloseAssistant).toHaveBeenCalledOnce()
+ expect(screen.queryByRole('button', { name: 'Minimize' })).not.toBeInTheDocument()
+ })
+})
diff --git a/apps/studio/components/ui/AIAssistantPanel/AIAssistantHeader.tsx b/apps/studio/components/ui/AIAssistantPanel/AIAssistantHeader.tsx
index c2f7294590a..82546031fa9 100644
--- a/apps/studio/components/ui/AIAssistantPanel/AIAssistantHeader.tsx
+++ b/apps/studio/components/ui/AIAssistantPanel/AIAssistantHeader.tsx
@@ -3,7 +3,6 @@ import {
Edit,
Maximize,
MessageCirclePlus,
- Minimize,
MoreVertical,
Settings,
X,
@@ -20,16 +19,15 @@ import {
DropdownMenuTrigger,
Input,
} from 'ui'
-import { Admonition } from 'ui-patterns/Admonition'
import { ButtonTooltip } from '../ButtonTooltip'
import { ShortcutPills, ShortcutTooltip } from '../ShortcutTooltip'
import { AIAssistantChatSelector } from './AIAssistantChatSelector'
-import { AIOptInModal } from './AIOptInModal'
+import { AIAssistantMetadataWarning } from './AIAssistantMetadataWarning'
+import { useCreateChat } from '@/components/interfaces/Explorer/hooks'
import { useAiAssistantStateSnapshot } from '@/state/ai-assistant-state'
import { SHORTCUT_DEFINITIONS, SHORTCUT_IDS } from '@/state/shortcuts/registry'
import { useShortcut } from '@/state/shortcuts/useShortcut'
-import { useSidebarManagerSnapshot } from '@/state/sidebar-manager-state'
interface AIAssistantHeaderProps {
isChatLoading: boolean
@@ -53,11 +51,17 @@ export const AIAssistantHeader = ({
aiOptInLevel,
}: AIAssistantHeaderProps) => {
const snap = useAiAssistantStateSnapshot()
- const { isMaximised, toggleMaximise } = useSidebarManagerSnapshot()
+ const { openChat } = useCreateChat()
const [value, setValue] = useState(snap.activeChat?.name)
const [isEditingName, setIsEditingName] = useState(false)
const [isOptInModalOpen, setIsOptInModalOpen] = useState(false)
+ const handleOpenInExplorer = () => {
+ if (!snap.activeChatId) return
+ openChat(snap.activeChatId)
+ onCloseAssistant()
+ }
+
const handleCopyChatId = () => {
copyToClipboard(snap.activeChatId ?? '', () => {
toast.success(`Copied chat ID for ${snap.activeChat?.name}`)
@@ -96,7 +100,7 @@ export const AIAssistantHeader = ({
enabled: shortcutsEnabled && !isChatLoading,
})
- useShortcut(SHORTCUT_IDS.AI_ASSISTANT_MAXIMIZE, toggleMaximise, {
+ useShortcut(SHORTCUT_IDS.AI_ASSISTANT_MAXIMIZE, handleOpenInExplorer, {
enabled: shortcutsEnabled && !isChatLoading,
})
@@ -149,15 +153,15 @@ export const AIAssistantHeader = ({
<ShortcutTooltip
side="bottom"
- label={isMaximised ? 'Minimize' : 'Maximize'}
+ label="Open in Explorer"
shortcutId={SHORTCUT_IDS.AI_ASSISTANT_MAXIMIZE}
>
<Button
variant="text"
- aria-label={isMaximised ? 'Minimize' : 'Maximize'}
+ aria-label="Open in Explorer"
size="tiny"
- icon={isMaximised ? <Minimize /> : <Maximize />}
- onClick={toggleMaximise}
+ icon={<Maximize />}
+ onClick={handleOpenInExplorer}
className="h-7 w-7 p-0"
/>
</ShortcutTooltip>
@@ -218,43 +222,14 @@ export const AIAssistantHeader = ({
</div>
</div>
- {showMetadataWarning && (
- <Admonition
- type="default"
- title={
- !updatedOptInSinceMCP
- ? 'The Assistant has just been updated to help you better!'
- : isHipaaProjectDisallowed
- ? 'Project metadata is not shared due to HIPAA'
- : aiOptInLevel === 'disabled'
- ? 'Project metadata is currently not shared'
- : 'Limited metadata is shared to the Assistant'
- }
- description={
- !updatedOptInSinceMCP
- ? 'You may now opt-in to share schema metadata and even logs for better results'
- : isHipaaProjectDisallowed
- ? 'Your organization has the HIPAA addon and will not send project metadata with your prompts for projects marked as HIPAA.'
- : aiOptInLevel === 'disabled'
- ? 'The Assistant can provide better answers if you opt-in to share schema metadata.'
- : aiOptInLevel === 'schema'
- ? 'Sharing query data in addition to schema can further improve responses. Update AI settings to enable this.'
- : ''
- }
- className="border-0 border-b rounded-none bg-background"
- >
- {!isHipaaProjectDisallowed && (
- <Button
- variant="default"
- className="w-fit mt-4"
- onClick={() => setIsOptInModalOpen(true)}
- >
- Permission settings
- </Button>
- )}
- </Admonition>
- )}
- <AIOptInModal visible={isOptInModalOpen} onCancel={() => setIsOptInModalOpen(false)} />
+ <AIAssistantMetadataWarning
+ visible={isOptInModalOpen}
+ onVisibleChange={setIsOptInModalOpen}
+ showMetadataWarning={showMetadataWarning}
+ updatedOptInSinceMCP={updatedOptInSinceMCP}
+ isHipaaProjectDisallowed={isHipaaProjectDisallowed}
+ aiOptInLevel={aiOptInLevel}
+ />
</div>
)
}
diff --git a/apps/studio/components/ui/AIAssistantPanel/AIAssistantMetadataWarning.tsx b/apps/studio/components/ui/AIAssistantPanel/AIAssistantMetadataWarning.tsx
new file mode 100644
index 00000000000..7e5c25ac003
--- /dev/null
+++ b/apps/studio/components/ui/AIAssistantPanel/AIAssistantMetadataWarning.tsx
@@ -0,0 +1,58 @@
+import { Button } from 'ui'
+import { Admonition } from 'ui-patterns/Admonition'
+
+import { AIOptInModal } from './AIOptInModal'
+
+interface AIAssistantMetadataWarningProps {
+ visible: boolean
+ onVisibleChange: (visible: boolean) => void
+ showMetadataWarning: boolean
+ updatedOptInSinceMCP: boolean
+ isHipaaProjectDisallowed: boolean
+ aiOptInLevel: 'disabled' | 'schema' | 'full' | string | undefined
+}
+
+export const AIAssistantMetadataWarning = ({
+ visible,
+ onVisibleChange,
+ showMetadataWarning,
+ updatedOptInSinceMCP,
+ isHipaaProjectDisallowed,
+ aiOptInLevel,
+}: AIAssistantMetadataWarningProps) => (
+ <>
+ {showMetadataWarning && (
+ <Admonition
+ type="default"
+ title={
+ !updatedOptInSinceMCP
+ ? 'The Assistant has just been updated to help you better!'
+ : isHipaaProjectDisallowed
+ ? 'Project metadata is not shared due to HIPAA'
+ : aiOptInLevel === 'disabled'
+ ? 'Project metadata is currently not shared'
+ : 'Limited metadata is shared to the Assistant'
+ }
+ description={
+ !updatedOptInSinceMCP
+ ? 'You may now opt-in to share schema metadata and even logs for better results'
+ : isHipaaProjectDisallowed
+ ? 'Your organization has the HIPAA addon and will not send project metadata with your prompts for projects marked as HIPAA.'
+ : aiOptInLevel === 'disabled'
+ ? 'The Assistant can provide better answers if you opt-in to share schema metadata.'
+ : aiOptInLevel === 'schema'
+ ? 'Sharing query data in addition to schema can further improve responses. Update AI settings to enable this.'
+ : ''
+ }
+ className="border-0 border-b rounded-none bg-background"
+ >
+ {!isHipaaProjectDisallowed && (
+ <Button variant="default" className="w-fit mt-4" onClick={() => onVisibleChange(true)}>
+ Permission settings
+ </Button>
+ )}
+ </Admonition>
+ )}
+ <AIOptInModal visible={visible} onCancel={() => onVisibleChange(false)} />
+ </>
+)
diff --git a/apps/studio/state/ai-assistant-state.hooks.test.tsx b/apps/studio/state/ai-assistant-state.hooks.test.tsx
new file mode 100644
index 00000000000..ed0e827ad3f
--- /dev/null
+++ b/apps/studio/state/ai-assistant-state.hooks.test.tsx
@@ -0,0 +1,77 @@
+import { act, render, screen } from '@testing-library/react'
+import type { PropsWithChildren } from 'react'
+import { describe, expect, it } from 'vitest'
+
+import {
+ AiAssistantStateContext,
+ createAiAssistantState,
+ useAiAssistantChatList,
+ type AiAssistantState,
+} from './ai-assistant-state'
+
+const ChatList = () => {
+ const chats = useAiAssistantChatList()
+
+ return (
+ <ul>
+ {chats.map((chat) => (
+ <li key={chat.id}>{chat.name}</li>
+ ))}
+ </ul>
+ )
+}
+
+const renderChatList = (state: AiAssistantState) => {
+ const Wrapper = ({ children }: PropsWithChildren) => (
+ <AiAssistantStateContext.Provider value={state}>{children}</AiAssistantStateContext.Provider>
+ )
+
+ return render(<ChatList />, { wrapper: Wrapper })
+}
+
+describe('useAiAssistantChatList', () => {
+ // createChat, createBranch, deleteChat and loadPersistedState all replace state.chats wholesale,
+ // so subscribing to the object itself goes stale after the first replacement
+ it('rerenders when a chat is created after the first render', async () => {
+ const state = createAiAssistantState()
+ renderChatList(state)
+
+ expect(screen.queryByText('Explorer chat')).not.toBeInTheDocument()
+
+ await act(async () => {
+ state.createChat({ name: 'Explorer chat' })
+ })
+
+ expect(await screen.findByText('Explorer chat')).toBeInTheDocument()
+ })
+
+ it('rerenders when chats are replaced by hydration and again when a chat is deleted', async () => {
+ const state = createAiAssistantState()
+ renderChatList(state)
+
+ await act(async () => {
+ state.loadPersistedState({
+ projectRef: 'default',
+ activeChatId: 'persisted-chat',
+ model: state.model,
+ chats: {
+ 'persisted-chat': {
+ id: 'persisted-chat',
+ name: 'Persisted chat',
+ messages: [],
+ createdAt: new Date(),
+ updatedAt: new Date(),
+ },
+ },
+ })
+ })
+
+ expect(await screen.findByText('Persisted chat')).toBeInTheDocument()
+
+ await act(async () => {
+ state.deleteChat('persisted-chat')
+ })
+
+ expect(screen.queryByText('Persisted chat')).not.toBeInTheDocument()
+ })
+})
diff --git a/apps/studio/state/ai-assistant-state.tsx b/apps/studio/state/ai-assistant-state.tsx
index 4352931d244..85eff5ae1a9 100644
--- a/apps/studio/state/ai-assistant-state.tsx
+++ b/apps/studio/state/ai-assistant-state.tsx
@@ -3,7 +3,14 @@ import { DefaultChatTransport, lastAssistantMessageIsCompleteWithApprovalRespons
import { LOCAL_STORAGE_KEYS, safeLocalStorage } from 'common'
import { DBSchema, IDBPDatabase, openDB } from 'idb'
import { debounce } from 'lodash'
-import { createContext, PropsWithChildren, useContext, useEffect, useState } from 'react'
+import {
+ createContext,
+ PropsWithChildren,
+ useContext,
+ useEffect,
+ useReducer,
+ useState,
+} from 'react'
import { v4 as uuidv4 } from 'uuid'
import { proxy, ref, snapshot, subscribe, useSnapshot } from 'valtio'
@@ -797,6 +804,16 @@ export const useAiAssistantStateSnapshot = (options?: Parameters<typeof useSnaps
return useSnapshot(state, options)
}
+export const useAiAssistantChatList = (): ChatSession[] => {
+ const state = useContext(AiAssistantStateContext)
+ const [, rerender] = useReducer((count) => count + 1, 0)
+ // Subscribe to the parent, not `state.chats` — createChat, createBranch, deleteChat and
+ // loadPersistedState all replace `state.chats` wholesale, which would leave a subscription
+ // to the old object silently stale.
+ useEffect(() => subscribe(state, rerender), [state])
+ return Object.values(state.chats)
+}
+
/**
* Resolves once the assistant state has hydrated from storage. `loadPersistedState` replaces
* `state.chats` wholesale, so anything that adds a chat has to wait for hydration or the new
diff --git a/apps/studio/state/shortcuts/registry.ts b/apps/studio/state/shortcuts/registry.ts
index f5fbdad2e6e..e2260bfb426 100644
--- a/apps/studio/state/shortcuts/registry.ts
+++ b/apps/studio/state/shortcuts/registry.ts
@@ -266,7 +266,7 @@ export const SHORTCUT_DEFINITIONS: Record<ShortcutId, ShortcutDefinition> = {
},
[SHORTCUT_IDS.AI_ASSISTANT_MAXIMIZE]: {
id: SHORTCUT_IDS.AI_ASSISTANT_MAXIMIZE,
- label: 'Maximize assistant',
+ label: 'Open chat in Explorer',
sequence: ['A', '='],
showInSettings: false,
},