@dxos/plugin-assistant 0.8.4-main.74a063c4e0 → 0.8.4-main.765dc60934

package/src/components/Chat/context.ts

@@ -0,0 +1,39 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { createContext } from '@radix-ui/react-context';
+
+import { type Chat as ChatModule } from '@dxos/assistant-toolkit';
+import { type Event } from '@dxos/async';
+import { type Database } from '@dxos/echo';
+import { type Message } from '@dxos/types';
+
+import { type AiChatProcessor } from '../../processor';
+import { type ChatEvent } from './events';
+
+/**
+ * Wall-clock timestamps for the most-recent (or in-flight) request, lifted out of
+ * `ChatStreamStatus` so the elapsed value survives across re-mounts triggered when wire's
+ * drip queue toggles `wireDrainingEffect` (which removes/restores the footer block widget).
+ * `endedAt` is `null` while the request is still active.
+ */
+export type ChatRequestTiming = {
+  startedAt: number;
+  endedAt: number | null;
+};
+
+export type ChatContextValue = {
+  debug?: boolean;
+  event: Event<ChatEvent>;
+  db?: Database.Database;
+  chat?: ChatModule.Chat;
+  messages: Message.Message[];
+  processor: AiChatProcessor;
+  requestTiming: ChatRequestTiming | null;
+};
+
+// Internal: not re-exported from `Chat/index.ts`. Accessed by sibling components in this
+// package (e.g. `ChatStreamStatus`) without dragging in `Chat.tsx`'s heavy transitive
+// imports (transcription, etc.).
+export const [ChatContextProvider, useChatContext] = createContext<ChatContextValue>('Chat');

package/src/components/ChatPrompt/ChatActions.tsx

@@ -33,18 +33,9 @@ export const ChatActions = ({
   const { t } = useTranslation(meta.id);
 
   return (
-    <div className={mx('flex items-center me-1', classNames)}>
+    <div className={mx('flex items-center', classNames)}>
       {children}
 
-      <IconButton
-        disabled={!processing}
-        variant='ghost'
-        icon='ph--x--regular'
-        iconOnly
-        label={t('cancel-processing.button')}
-        onClick={() => onEvent?.({ type: 'cancel' })}
-      />
-
       {microphone && (
         <IconButton
           disabled={!processing}
@@ -70,6 +61,15 @@ export const ChatActions = ({
           onClick={() => onEvent?.({ type: 'toggle-debug' })}
         />
       )}
+
+      <IconButton
+        disabled={!processing}
+        variant='ghost'
+        icon='ph--x--regular'
+        iconOnly
+        label={t('cancel-processing.button')}
+        onClick={() => onEvent?.({ type: 'cancel' })}
+      />
     </div>
   );
 };

package/src/components/ChatPrompt/ChatMcpErrors.tsx

@@ -0,0 +1,50 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { useAtomValue } from '@effect-atom/atom-react';
+import React, { useCallback } from 'react';
+
+import { Message, type ThemedClassName, useTranslation } from '@dxos/react-ui';
+
+import { meta } from '#meta';
+
+import { type AiChatProcessor } from '../../processor';
+
+export type ChatMcpErrorsProps = ThemedClassName<{
+  processor: AiChatProcessor;
+}>;
+
+/**
+ * Inline banner that lists MCP servers that failed to connect during the most recent request.
+ * The chat itself keeps working without these servers — this just lets the user see what was dropped.
+ */
+export const ChatMcpErrors = ({ classNames, processor }: ChatMcpErrorsProps) => {
+  const { t } = useTranslation(meta.id);
+  const errors = useAtomValue(processor.mcpErrors);
+
+  const handleDismiss = useCallback(() => {
+    processor.dismissMcpErrors();
+  }, [processor]);
+
+  if (errors.length === 0) {
+    return null;
+  }
+
+  return (
+    <Message.Root classNames={['m-1', classNames]} valence='warning'>
+      <Message.Title onClose={handleDismiss}>{t('mcp-server-error.label')}</Message.Title>
+      <Message.Content asChild>
+        <ul className='flex flex-col gap-0.5 text-sm'>
+          {errors.map((error) => (
+            <li key={`${error.url}::${error.protocol}`} className='truncate'>
+              <span className='font-mono'>{error.url}</span>
+              {' — '}
+              <span>{error.message}</span>
+            </li>
+          ))}
+        </ul>
+      </Message.Content>
+    </Message.Root>
+  );
+};

package/src/components/ChatPrompt/ChatOptions.stories.tsx

@@ -0,0 +1,136 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import * as Effect from 'effect/Effect';
+import React, { useState } from 'react';
+
+import { withPluginManager } from '@dxos/app-framework/testing';
+import { Chat } from '@dxos/assistant-toolkit';
+import { capabilities } from '@dxos/assistant-toolkit/testing';
+import { Feed, Filter, Ref } from '@dxos/echo';
+import { ChessPlugin } from '@dxos/plugin-chess/testing';
+import { ClientPlugin } from '@dxos/plugin-client/testing';
+import { initializeIdentity } from '@dxos/plugin-client/testing';
+import { MapPlugin } from '@dxos/plugin-map/testing';
+import { TablePlugin } from '@dxos/plugin-table/testing';
+import { corePlugins } from '@dxos/plugin-testing';
+import { useQuery, useSpaces } from '@dxos/react-client/echo';
+import { Loading, withTheme } from '@dxos/react-ui/testing';
+import { Organization, Person } from '@dxos/types';
+
+import { useBlueprintRegistry, useContextBinder } from '#hooks';
+import { translations } from '#translations';
+
+import { ChatOptions, ObjectsPanel, type ChatOptionsProps } from './ChatOptions';
+
+const presets = [
+  {
+    id: 'edge-claude-sonnet',
+    label: 'Edge/Claude Sonnet',
+  },
+  {
+    id: 'edge-gpt-4o',
+    label: 'Edge/GPT-4o',
+  },
+  {
+    id: 'ollama-llama3',
+    label: 'Ollama/Llama 3',
+  },
+];
+
+type DefaultStoryProps = Pick<ChatOptionsProps, 'presets'>;
+
+const DefaultStory = ({ presets }: DefaultStoryProps) => {
+  const [space] = useSpaces();
+  const [feed] = useQuery(space?.db, Filter.type(Feed.Feed));
+  const [chat] = useQuery(space?.db, Filter.type(Chat.Chat));
+  const blueprintRegistry = useBlueprintRegistry();
+  const binder = useContextBinder(space, feed);
+  const [preset, setPreset] = useState(presets?.[0]?.id);
+  if (!space || !binder || !chat) {
+    return <Loading />;
+  }
+
+  return (
+    <ChatOptions
+      chat={chat}
+      db={space.db}
+      context={binder}
+      blueprintRegistry={blueprintRegistry}
+      presets={presets}
+      preset={preset}
+      onPresetChange={setPreset}
+    />
+  );
+};
+
+const meta = {
+  title: 'plugins/plugin-assistant/components/ChatOptions',
+  component: ChatOptions as any,
+  render: DefaultStory,
+  decorators: [
+    withTheme(),
+    withPluginManager({
+      plugins: [
+        ...corePlugins(),
+        ClientPlugin({
+          types: [Chat.Chat, Feed.Feed, Organization.Organization, Person.Person],
+          onClientInitialized: ({ client }) =>
+            Effect.gen(function* () {
+              yield* initializeIdentity(client);
+              const [space] = client.spaces.get();
+              yield* Effect.promise(() => space.waitUntilReady());
+
+              // Populate space with sample objects.
+              for (let idx = 0; idx < 8; idx++) {
+                space.db.add(Organization.make({ name: `Org ${idx + 1}` }));
+                space.db.add(Person.make({ fullName: `Person ${idx + 1}` }));
+              }
+
+              // Create the chat feed used by the context binder.
+              const feed = space.db.add(Feed.make());
+              space.db.add(Chat.make({ name: 'Test chat', feed: Ref.make(feed) }));
+              yield* Effect.promise(() => space.db.flush({ indexes: true }));
+            }),
+        }),
+        ChessPlugin(),
+        MapPlugin(),
+        TablePlugin(),
+      ],
+      capabilities,
+    }),
+  ],
+  parameters: {
+    layout: 'centered',
+    translations,
+  },
+} satisfies Meta<typeof DefaultStory>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    presets,
+  },
+};
+
+export const _ObjectsPanel: Story = {
+  render: () => {
+    const [space] = useSpaces();
+    const [feed] = useQuery(space?.db, Filter.type(Feed.Feed));
+    const binder = useContextBinder(space, feed);
+    if (!space || !binder) {
+      return <Loading />;
+    }
+
+    return (
+      <div className='grid w-[300px] h-[300px] border border-separator'>
+        <ObjectsPanel db={space.db} context={binder} />
+      </div>
+    );
+  },
+};

package/src/components/ChatPrompt/ChatOptions.tsx

@@ -3,26 +3,32 @@
 //
 
 import * as Option from 'effect/Option';
-import React, { type JSX, useMemo, useState } from 'react';
-
-import { type AiContextBinder } from '@dxos/assistant';
-import { type Blueprint } from '@dxos/blueprints';
-import { type Database, Filter, Obj, Type } from '@dxos/echo';
-import { Annotation } from '@dxos/echo';
-import { useQuery } from '@dxos/react-client/echo';
-import { IconButton, Popover, Select, useTranslation } from '@dxos/react-ui';
-import { Listbox, SearchList, useSearchListResults } from '@dxos/react-ui-search';
+import React, { type JSX, useCallback, useMemo, useState } from 'react';
+
+import { type AiContext } from '@dxos/assistant';
+import { type Chat as ChatModule, McpServer } from '@dxos/assistant-toolkit';
+import { type Blueprint } from '@dxos/compute';
+import { Annotation, type Database, Filter, Obj, Type } from '@dxos/echo';
+import { useObject, useQuery } from '@dxos/react-client/echo';
+import { IconButton, Input, Popover, Select, useTranslation } from '@dxos/react-ui';
+import { Listbox } from '@dxos/react-ui-list';
+import { SearchList, useSearchListResults } from '@dxos/react-ui-search';
 import { Tabs } from '@dxos/react-ui-tabs';
 import { getStyles, mx } from '@dxos/ui-theme';
 
 import { useActiveBlueprints, useBlueprintHandlers, useBlueprints, useContextObjects, useFilteredTypes } from '#hooks';
 import { meta } from '#meta';
+import { Assistant } from '#types';
 
-const panelClassNames = 'w-[calc(100dvw-.5rem)] sm:w-max md:w-72 max-w-document-width';
+const styles = {
+  panel: 'w-[calc(100dvw-.5rem)] sm:w-max max-w-document-width',
+  toolbar: 'p-0! gap-0! border-t border-separator',
+};
 
 export type ChatOptionsProps = {
+  chat?: ChatModule.Chat;
   db: Database.Database;
-  context: AiContextBinder;
+  context: AiContext.Binder;
   blueprintRegistry?: Blueprint.Registry;
   presets?: { id: string; label: string }[];
   preset?: string;
@@ -32,17 +38,25 @@ export type ChatOptionsProps = {
 /**
  * Manages the runtime context for the chat.
  */
-export const ChatOptions = ({ db, context, blueprintRegistry, presets, preset, onPresetChange }: ChatOptionsProps) => {
+export const ChatOptions = ({
+  chat,
+  db,
+  context,
+  blueprintRegistry,
+  presets,
+  preset,
+  onPresetChange,
+}: ChatOptionsProps) => {
   const { t } = useTranslation(meta.id);
 
   return (
-    <div role='none' className='flex p-2'>
+    <div className='flex'>
       <Popover.Root>
         <Popover.Trigger asChild>
           <IconButton variant='ghost' icon='ph--plus--regular' iconOnly label={t('context-objects.button')} />
         </Popover.Trigger>
         <Popover.Portal>
-          <Popover.Content side='top' classNames={panelClassNames}>
+          <Popover.Content side='top' classNames={styles.panel}>
             <Popover.Viewport>
               <ObjectsPanel db={db} context={context} />
             </Popover.Viewport>
@@ -61,30 +75,41 @@ export const ChatOptions = ({ db, context, blueprintRegistry, presets, preset, o
           />
         </Popover.Trigger>
         <Popover.Portal>
-          <Popover.Content side='top' classNames={panelClassNames}>
+          <Popover.Content side='top' classNames={styles.panel}>
             <Popover.Viewport>
-              <Tabs.Root orientation='horizontal' defaultValue='blueprints' defaultActivePart='list' tabIndex={-1}>
-                <Tabs.Viewport
-                  classNames={mx(
-                    'max-h-(--radix-popover-content-available-height) grid grid-rows-[1fr_min-content]',
-                    '[&_[cmdk-root]]:contents [&_[role="tabpanel"]]:grid [&_[role="tabpanel"]]:grid-rows-[1fr_min-content]',
-                    '[&_[role="listbox"]]:min-h-0 [&_[role="listbox"]]:overflow-y-auto',
-                    '[&_[role="tabpanel"]]:min-h-0 [&_[role="tabpanel"]]:px-form-chrome [&_[role="tabpanel"][data-state="active"]]:order-first [&_[role="tabpanel"][data-state="inactive"]]:hidden',
-                  )}
-                >
-                  <Tabs.Panel value='blueprints' tabIndex={-1} classNames='dx-focus-ring-inset'>
+              <Tabs.Root
+                classNames='flex'
+                orientation='horizontal'
+                defaultValue='view'
+                defaultActivePart='list'
+                tabIndex={-1}
+              >
+                <Tabs.Viewport classNames={mx('grid grid-rows-[1fr_40px] w-full')}>
+                  <Tabs.Panel tabIndex={-1} classNames='dx-focus-ring-inset overflow-hidden' value='view'>
+                    <ViewPanel chat={chat} />
+                  </Tabs.Panel>
+                  <Tabs.Panel tabIndex={-1} classNames='dx-focus-ring-inset overflow-hidden' value='blueprints'>
                     <BlueprintsPanel blueprintRegistry={blueprintRegistry} db={db} context={context} />
                   </Tabs.Panel>
-                  <Tabs.Panel value='model' tabIndex={-1} classNames='dx-focus-ring-inset px-0!'>
+                  <Tabs.Panel tabIndex={-1} classNames='dx-focus-ring-inset overflow-hidden' value='mcp-servers'>
+                    <McpServersPanel db={db} />
+                  </Tabs.Panel>
+                  <Tabs.Panel tabIndex={-1} classNames='dx-focus-ring-inset overflow-hidden' value='model'>
                     <ModelsPanel presets={presets} preset={preset} onPresetChange={onPresetChange} />
                   </Tabs.Panel>
-                  <Tabs.Tablist classNames='justify-center p-form-chrome border-y border-subdued-separator order-last'>
+                  <Tabs.Tablist classNames={[styles.toolbar]}>
+                    <Tabs.IconTab value='view' icon='ph--eye--regular' label={t('chat-view.title')} />
                     <Tabs.IconTab
                       value='blueprints'
                       icon='ph--blueprint--regular'
-                      label={t('blueprints-in-context.title')}
+                      label={t('options.blueprints.title')}
+                    />
+                    <Tabs.IconTab
+                      value='mcp-servers'
+                      icon='ph--plugs-connected--regular'
+                      label={t('options.mcp.title')}
                     />
-                    <Tabs.IconTab value='model' label={t('chat-model.title')} icon='ph--cpu--regular' />
+                    <Tabs.IconTab value='model' icon='ph--cpu--regular' label={t('options.chat-model.title')} />
                   </Tabs.Tablist>
                 </Tabs.Viewport>
               </Tabs.Root>
@@ -107,7 +132,6 @@ const BlueprintsPanel = ({
   const blueprints = useBlueprints({ blueprintRegistry, db });
   const activeBlueprints = useActiveBlueprints({ context });
   const { onUpdateBlueprint } = useBlueprintHandlers({ db, context, blueprintRegistry });
-
   const { results, handleSearch } = useSearchListResults({
     items: blueprints,
     extract: (blueprint) => blueprint.name,
@@ -115,28 +139,46 @@ const BlueprintsPanel = ({
 
   return (
     <SearchList.Root onSearch={handleSearch}>
-      <SearchList.Content classNames='py-form-chrome'>
+      <SearchList.Content classNames='flex flex-col'>
         <SearchList.Viewport>
           {results.map((blueprint) => {
-            const isActive = activeBlueprints.has(blueprint.key);
+            const blueprintKey = Obj.getMeta(blueprint).key ?? blueprint.id;
+            const isActive = activeBlueprints.has(blueprintKey);
             return (
               <SearchList.Item
                 classNames='flex items-center overflow-hidden'
-                key={blueprint.key}
-                value={blueprint.key}
+                key={blueprintKey}
+                value={blueprintKey}
                 label={blueprint.name}
                 checked={isActive}
-                onSelect={() => onUpdateBlueprint?.(blueprint.key, !isActive)}
+                onSelect={() => onUpdateBlueprint?.(blueprintKey, !isActive)}
               />
             );
           })}
         </SearchList.Viewport>
+        <SearchList.Input placeholder={t('search.placeholder')} classNames='border-t border-separator' autoFocus />
       </SearchList.Content>
-      <SearchList.Input placeholder={t('search.placeholder')} classNames='mb-form-chrome' autoFocus />
     </SearchList.Root>
   );
 };
 
+const ViewPanel = ({ chat }: Pick<ChatOptionsProps, 'chat'>) => {
+  const { t } = useTranslation(meta.id);
+  const [view, setView] = useObject(chat, 'view');
+  const value = (view as Assistant.ChatView | undefined) ?? 'normal';
+
+  return (
+    <Listbox.Root value={value} onValueChange={setView} autoFocus>
+      {Assistant.ChatViews.map((view) => (
+        <Listbox.Option key={view} value={view}>
+          <Listbox.OptionLabel>{t(`chat-view.${view}.label`, { defaultValue: view })}</Listbox.OptionLabel>
+          <Listbox.OptionIndicator />
+        </Listbox.Option>
+      ))}
+    </Listbox.Root>
+  );
+};
+
 const ModelsPanel = ({
   presets,
   preset,
@@ -156,9 +198,161 @@ const ModelsPanel = ({
   );
 };
 
+type McpServersPanelProps = {
+  db: Database.Database;
+};
+
+const McpServersPanel = ({ db }: McpServersPanelProps) => {
+  const { t } = useTranslation(meta.id);
+  const servers = useQuery(db, Filter.type(McpServer.McpServer));
+  const [adding, setAdding] = useState(false);
+
+  const handleAdd = useCallback(
+    (name: string, url: string, protocol: 'sse' | 'http', apiKey?: string) => {
+      db.add(Obj.make(McpServer.McpServer, { name, url, protocol, apiKey, enabled: true }));
+      setAdding(false);
+    },
+    [db],
+  );
+
+  const handleRemove = useCallback(
+    (server: McpServer.McpServer) => {
+      db.remove(server);
+    },
+    [db],
+  );
+
+  return (
+    <div className='p-form-chrome'>
+      {servers.map((server) => (
+        <McpServerRow key={server.id} server={server} onRemove={handleRemove} />
+      ))}
+      {adding ? (
+        <McpServerForm onSubmit={handleAdd} onCancel={() => setAdding(false)} />
+      ) : (
+        <div>
+          <IconButton
+            variant='ghost'
+            icon='ph--plus--regular'
+            label={t('mcp-server-add.label')}
+            onClick={() => setAdding(true)}
+          />
+        </div>
+      )}
+    </div>
+  );
+};
+
+type McpServerRowProps = {
+  server: McpServer.McpServer;
+  onRemove: (server: McpServer.McpServer) => void;
+};
+
+/**
+ * `useQuery` returns live objects but only re-renders on result-identity changes,
+ * so we must subscribe to the per-server `enabled` field via `useObject` to keep the
+ * switch in sync with mutations made through the returned setter.
+ */
+const McpServerRow = ({ server, onRemove }: McpServerRowProps) => {
+  const { t } = useTranslation(meta.id);
+  const [enabled, setEnabled] = useObject(server, 'enabled');
+
+  return (
+    <div className='flex items-center gap-2 px-form-chrome'>
+      <Input.Root>
+        <Input.Label srOnly>{server.name}</Input.Label>
+        <Input.Switch checked={enabled !== false} onCheckedChange={(checked) => setEnabled(!!checked)} />
+      </Input.Root>
+      <span className='flex-1 truncate text-sm'>{server.name}</span>
+      <span className='truncate text-xs text-description'>{server.url}</span>
+      <IconButton
+        variant='ghost'
+        icon='ph--x--regular'
+        iconOnly
+        label={t('mcp-server-remove.label')}
+        onClick={() => onRemove(server)}
+      />
+    </div>
+  );
+};
+
+type McpServerFormProps = {
+  onSubmit: (name: string, url: string, protocol: 'sse' | 'http', apiKey?: string) => void;
+  onCancel: () => void;
+};
+
+const McpServerForm = ({ onSubmit, onCancel }: McpServerFormProps) => {
+  const { t } = useTranslation(meta.id);
+  const [name, setName] = useState('');
+  const [url, setUrl] = useState('');
+  const [protocol, setProtocol] = useState<'sse' | 'http'>('sse');
+  const [apiKey, setApiKey] = useState('');
+
+  const canSubmit = name.trim().length > 0 && url.trim().length > 0;
+  const handleSubmit = useCallback(() => {
+    if (canSubmit) {
+      onSubmit(name.trim(), url.trim(), protocol, apiKey.trim() || undefined);
+    }
+  }, [canSubmit, name, url, protocol, apiKey, onSubmit]);
+
+  return (
+    <div className='space-y-2 px-form-chrome'>
+      <Input.Root>
+        <Input.Label srOnly>{t('mcp-server-name.label')}</Input.Label>
+        <Input.TextInput
+          placeholder={t('mcp-server-name.placeholder')}
+          value={name}
+          onChange={(event) => setName(event.target.value)}
+          autoFocus
+        />
+      </Input.Root>
+      <Input.Root>
+        <Input.Label srOnly>{t('mcp-server-url.label')}</Input.Label>
+        <Input.TextInput
+          placeholder={t('mcp-server-url.placeholder')}
+          value={url}
+          onChange={(event) => setUrl(event.target.value)}
+        />
+      </Input.Root>
+      <Select.Root value={protocol} onValueChange={(value) => setProtocol(value as 'sse' | 'http')}>
+        <Select.TriggerButton placeholder={t('mcp-server-protocol.label')} />
+        <Select.Portal>
+          <Select.Content>
+            <Select.Viewport>
+              <Select.Option value='sse'>SSE</Select.Option>
+              <Select.Option value='http'>HTTP</Select.Option>
+            </Select.Viewport>
+          </Select.Content>
+        </Select.Portal>
+      </Select.Root>
+      <Input.Root>
+        <Input.Label srOnly>{t('mcp-server-api-key.label')}</Input.Label>
+        <Input.TextInput
+          type='password'
+          placeholder={t('mcp-server-api-key.placeholder')}
+          value={apiKey}
+          onChange={(event) => setApiKey(event.target.value)}
+        />
+      </Input.Root>
+      <div className='flex gap-2'>
+        <IconButton
+          variant='ghost'
+          icon='ph--check--regular'
+          iconOnly
+          label={t('save.button')}
+          onClick={handleSubmit}
+          disabled={!canSubmit}
+        />
+        <IconButton variant='ghost' icon='ph--x--regular' iconOnly label={t('cancel.button')} onClick={onCancel} />
+      </div>
+    </div>
+  );
+};
+
 const ANY = '__any__';
 
-const ObjectsPanel = ({ db, context }: Pick<ChatOptionsProps, 'db' | 'context'>): JSX.Element => {
+/** @private */
+export const ObjectsPanel = ({ db, context }: Pick<ChatOptionsProps, 'db' | 'context'>): JSX.Element => {
   const { t } = useTranslation(meta.id);
 
   // Item types sorted by label.
@@ -186,7 +380,6 @@ const ObjectsPanel = ({ db, context }: Pick<ChatOptionsProps, 'db' | 'context'>)
   // Context objects.
   const objects = useQuery(db, typename === ANY ? anyFilter : Filter.typename(typename));
   const { objects: contextObjects, onUpdateObject } = useContextObjects({ db, context });
-
   const { results, handleSearch } = useSearchListResults({
     items: objects,
     extract: (object) => Obj.getLabel(object) ?? Obj.getTypename(object) ?? object.id,
@@ -201,7 +394,10 @@ const ObjectsPanel = ({ db, context }: Pick<ChatOptionsProps, 'db' | 'context'>)
               const isActive = contextObjects.findIndex((obj) => obj.id === object.id) !== -1;
               const { icon, hue } = Option.fromNullable(Obj.getSchema(object)).pipe(
                 Option.flatMap(Annotation.IconAnnotation.get),
-                Option.getOrElse(() => ({ icon: DEFAULT_OBJECT_ICON, hue: undefined as string | undefined })),
+                Option.getOrElse(() => ({
+                  icon: 'ph--cube--regular',
+                  hue: undefined as string | undefined,
+                })),
               );
               const styles = hue ? getStyles(hue) : undefined;
               return (
@@ -210,7 +406,7 @@ const ObjectsPanel = ({ db, context }: Pick<ChatOptionsProps, 'db' | 'context'>)
                   key={object.id}
                   value={object.id}
                   icon={icon}
-                  iconClassNames={styles?.surfaceText}
+                  iconClassNames={styles?.foreground}
                   label={Obj.getLabel(object) ?? Obj.getTypename(object) ?? object.id}
                   checked={isActive}
                   onSelect={() => onUpdateObject?.(Obj.getDXN(object), !isActive)}
@@ -223,7 +419,7 @@ const ObjectsPanel = ({ db, context }: Pick<ChatOptionsProps, 'db' | 'context'>)
         </SearchList.Viewport>
       </SearchList.Content>
 
-      <div role='none' className='grid grid-cols-[min-content_1fr] gap-2 px-form-chrome mb-form-chrome'>
+      <div className={mx('flex flex-col', styles.toolbar)}>
         <Select.Root value={typename === ANY ? undefined : typename} onValueChange={setTypename}>
           <Select.TriggerButton placeholder={t('type-filter.placeholder')} />
           <Select.Portal>
@@ -242,11 +438,8 @@ const ObjectsPanel = ({ db, context }: Pick<ChatOptionsProps, 'db' | 'context'>)
             </Select.Content>
           </Select.Portal>
         </Select.Root>
-        <SearchList.Input placeholder={t('search.placeholder')} classNames='mb-0' autoFocus />
+        <SearchList.Input placeholder={t('search.placeholder')} autoFocus />
       </div>
     </SearchList.Root>
   );
 };
-
-// TODO(dmaretskyi): Extract those somewhere else.
-const DEFAULT_OBJECT_ICON = 'ph--cube--regular';