@dxos/plugin-assistant 0.8.4-main.5ea62a8 → 0.8.4-main.66e292d

package/src/components/ChatCompanion.tsx

@@ -2,96 +2,144 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Array, Effect, Option, pipe } from 'effect';
-import React, { useMemo } from 'react';
+import * as Array from 'effect/Array';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { Capabilities, createIntent, useCapabilities, useIntentDispatcher } from '@dxos/app-framework';
+import { Capabilities, createIntent } from '@dxos/app-framework';
+import { useCapabilities, useIntentDispatcher } from '@dxos/app-framework/react';
 import { Blueprint } from '@dxos/blueprints';
 import { getSpace } from '@dxos/client/echo';
-import { Filter, Obj, Query, Ref } from '@dxos/echo';
-import { DatabaseService } from '@dxos/functions';
+import { Filter, Obj, Ref } from '@dxos/echo';
 import { SpaceAction } from '@dxos/plugin-space/types';
 import { useQuery } from '@dxos/react-client/echo';
 import { useAsyncEffect } from '@dxos/react-ui';
 
-import { ChatContainer } from '../components';
-import { useContextBinder } from '../hooks';
+import { ChatContainer, type ChatEvent } from '../components';
+import { useBlueprintRegistry, useContextBinder } from '../hooks';
 import { Assistant, AssistantAction } from '../types';
 
 export type ChatCompanionProps = {
   role?: string;
-  data: { companionTo: Obj.Any; subject: Assistant.Chat | 'assistant-chat' };
+  data: { subject: Assistant.Chat | 'assistant-chat'; companionTo: Obj.Any };
 };
 
 export const ChatCompanion = ({ role, data }: ChatCompanionProps) => {
+  const { dispatchPromise: dispatch } = useIntentDispatcher();
+  const blueprintRegistry = useBlueprintRegistry();
   const companionTo = data.companionTo;
+
   const space = getSpace(companionTo);
-  const chat = data.subject === 'assistant-chat' ? undefined : data.subject;
-  const binder = useContextBinder(chat);
-  const { dispatch } = useIntentDispatcher();
+  const [chat, setChat] = useState(data.subject === 'assistant-chat' ? undefined : data.subject);
+  useEffect(() => {
+    setChat(data.subject === 'assistant-chat' ? undefined : data.subject);
+  }, [data.subject]);
+
+  const chatQueue = space && chat ? space.queues.get(chat.queue.dxn) : undefined;
+  const binder = useContextBinder(chatQueue);
 
-  // Initialize companion chat if it doesn't exist.
+  // Initialize companion chat if it doesn't exist, but don't add it to the space immediately.
   useAsyncEffect(async () => {
-    if (chat || !space) {
+    if (!space || chat) {
       return;
     }
 
-    // TODO(burdon): Garbage collection of queues?
-    // TODO(wittjosiah): Figure out how to prevent companion chats from showing up in the navtree.
-    await Effect.gen(function* () {
-      const { objects } = yield* DatabaseService.runQuery(
-        Query.select(Filter.ids(companionTo.id)).targetOf(Assistant.CompanionTo).source(),
-      );
-
-      // TODO(wittjosiah): This should be the default sort order.
-      let nextChat = objects.toSorted((a, b) => a.id.localeCompare(b.id)).at(-1);
-      if (!nextChat) {
-        const { object } = yield* dispatch(createIntent(AssistantAction.CreateChat, { space }));
-        nextChat = object;
-        yield* dispatch(createIntent(SpaceAction.AddObject, { object: nextChat, target: space, hidden: true }));
-        yield* dispatch(
+    const { data } = await dispatch(createIntent(AssistantAction.CreateChat, { space }));
+    setChat(data?.object);
+  }, [chat, space]);
+
+  // Add chat to space when user submits the first message.
+  const handleEvent = useCallback(
+    async (event: ChatEvent) => {
+      const chatInSpace = !!getSpace(chat);
+      if (chatInSpace || !chat || !space) {
+        return;
+      }
+
+      if (event.type === 'submit') {
+        await dispatch(
+          createIntent(SpaceAction.AddObject, {
+            object: chat,
+            target: space,
+            hidden: true,
+          }),
+        );
+        await dispatch(
           createIntent(SpaceAction.AddRelation, {
             space,
             schema: Assistant.CompanionTo,
-            source: nextChat,
-            target: data.companionTo,
+            source: chat,
+            target: companionTo,
+          }),
+        );
+        await dispatch(
+          createIntent(AssistantAction.SetCurrentChat, {
+            companionTo,
+            chat,
           }),
         );
       }
-
-      yield* dispatch(createIntent(AssistantAction.SetCurrentChat, { companionTo, chat: nextChat }));
-    }).pipe(Effect.provide(DatabaseService.layer(space.db)), Effect.runPromise);
-  }, [space, chat, companionTo]);
+    },
+    [chat, space, companionTo, dispatch],
+  );
 
   const metadata = useCapabilities(Capabilities.Metadata);
   const blueprintKeys = useMemo(
     () =>
-      pipe(
+      Function.pipe(
         metadata,
         Array.findFirst(
-          (capability): capability is { id: string; metadata: { blueprints?: string[] } } =>
-            capability.id === Obj.getTypename(companionTo),
+          (
+            capability,
+          ): capability is {
+            id: string;
+            metadata: { blueprints?: string[] };
+          } => capability.id === Obj.getTypename(companionTo),
         ),
         Option.flatMap((c) => Option.fromNullable(c.metadata.blueprints)),
         Option.getOrElse(() => [] as string[]),
       ),
     [metadata, companionTo],
   );
-  const allBlueprints = useQuery(space, Filter.type(Blueprint.Blueprint));
+  const existingBlueprints = useQuery(space, Filter.type(Blueprint.Blueprint));
   const pluginBlueprints = useMemo(
-    () => allBlueprints.filter((blueprint) => blueprintKeys.includes(blueprint.key)),
-    [allBlueprints, blueprintKeys],
+    () => existingBlueprints.filter((blueprint) => blueprintKeys.includes(blueprint.key)),
+    [existingBlueprints, blueprintKeys],
   );
 
-  // TODO(wittjosiah): Occasionally this fails to bind but seems to be an upstream issue.
-  //   It seems like the queue object signal emits as an empty array after previously emitting a non-empty array.
+  // Initialize related blueprints that are not already in the space.
   useAsyncEffect(async () => {
-    if (!binder) {
+    if (!space) {
+      return;
+    }
+
+    // NOTE: This must be run instead of using the useQuery result to avoid duplicates.
+    const { objects: existingBlueprints } = await space.db.query(Filter.type(Blueprint.Blueprint)).run();
+    for (const key of blueprintKeys) {
+      const existingBlueprint = existingBlueprints.find((blueprint) => blueprint.key === key);
+      if (existingBlueprint) {
+        continue;
+      }
+
+      const blueprint = blueprintRegistry.getByKey(key);
+      if (!blueprint) {
+        continue;
+      }
+
+      space.db.add(Obj.clone(blueprint));
+    }
+  }, [space, blueprintRegistry, blueprintKeys]);
+
+  useAsyncEffect(async () => {
+    if (!binder?.isOpen) {
       return;
     }
 
     if (pluginBlueprints.length > 0) {
-      await binder.bind({ blueprints: pluginBlueprints.map((blueprint) => Ref.make(blueprint)) });
+      await binder.bind({
+        blueprints: pluginBlueprints.map((blueprint) => Ref.make(blueprint)),
+      });
     }
 
     if (Obj.instanceOf(Blueprint.Blueprint, companionTo)) {
@@ -99,13 +147,9 @@ export const ChatCompanion = ({ role, data }: ChatCompanionProps) => {
     } else {
       await binder.bind({ objects: [Ref.make(companionTo)] });
     }
-  }, [binder, companionTo, pluginBlueprints]);
-
-  if (!chat) {
-    return null;
-  }
+  }, [binder, companionTo, blueprintKeys]);
 
-  return <ChatContainer role={role} chat={chat} companionTo={companionTo} />;
+  return <ChatContainer role={role} space={space} chat={chat} companionTo={companionTo} onEvent={handleEvent} />;
 };
 
 export default ChatCompanion;

package/src/components/ChatContainer.tsx

@@ -4,8 +4,9 @@
 
 import React from 'react';
 
-import { Capabilities, useCapability } from '@dxos/app-framework';
-import { getSpace } from '@dxos/client/echo';
+import { Capabilities } from '@dxos/app-framework';
+import { useCapability } from '@dxos/app-framework/react';
+import { type Space, getSpace } from '@dxos/client/echo';
 import { type Obj } from '@dxos/echo';
 import { StackItem } from '@dxos/react-ui-stack';
 
@@ -13,36 +14,45 @@ import { useBlueprintRegistry, useChatProcessor, useChatServices, useOnline, use
 import { meta } from '../meta';
 import { type Assistant } from '../types';
 
-import { Chat } from './Chat';
-import { Toolbar } from './Toolbar';
+import { Chat, type ChatRootProps } from './Chat';
 
 export type ChatContainerProps = {
-  chat: Assistant.Chat;
-  companionTo?: Obj.Any;
   role?: string;
-};
+  space?: Space;
+  chat?: Assistant.Chat;
+  companionTo?: Obj.Any;
+} & Pick<ChatRootProps, 'onEvent'>;
 
-export const ChatContainer = ({ chat, companionTo }: ChatContainerProps) => {
-  const space = getSpace(chat);
+export const ChatContainer = ({ space: spaceProp, chat, companionTo, onEvent }: ChatContainerProps) => {
+  const space = spaceProp ?? getSpace(chat);
   const settings = useCapability(Capabilities.SettingsStore).getStore<Assistant.Settings>(meta.id)?.value;
   const services = useChatServices({ space, chat });
   const [online, setOnline] = useOnline();
   const { preset, ...chatProps } = usePresets(online);
   const blueprintRegistry = useBlueprintRegistry();
-  const processor = useChatProcessor({ chat, preset, services, blueprintRegistry, settings });
+  const processor = useChatProcessor({
+    space,
+    chat,
+    preset,
+    services,
+    blueprintRegistry,
+    settings,
+  });
 
   if (!processor) {
     return null;
   }
 
   return (
-    <StackItem.Content toolbar={!!companionTo} classNames='container-max-width'>
-      {!!companionTo && <Toolbar chat={chat} companionTo={companionTo} />}
-      <Chat.Root chat={chat} processor={processor}>
-        <Chat.Thread />
-        <div className='p-2'>
-          <Chat.Prompt {...chatProps} outline preset={preset?.id} online={online} onOnlineChange={setOnline} />
-        </div>
+    <StackItem.Content toolbar>
+      <Chat.Root space={space} chat={chat} processor={processor} onEvent={onEvent}>
+        <Chat.Toolbar companionTo={companionTo} />
+        <Chat.Viewport classNames='container-max-width'>
+          <Chat.Thread />
+          <div role='none' className='p-4'>
+            <Chat.Prompt {...chatProps} outline preset={preset?.id} online={online} onOnlineChange={setOnline} />
+          </div>
+        </Chat.Viewport>
       </Chat.Root>
     </StackItem.Content>
   );

package/src/components/ChatDialog.tsx

@@ -4,10 +4,11 @@
 
 import React, { useCallback, useState } from 'react';
 
-import { Capabilities, useCapability } from '@dxos/app-framework';
+import { Capabilities } from '@dxos/app-framework';
+import { useCapability } from '@dxos/app-framework/react';
 import { getSpace } from '@dxos/client/echo';
 import { useTranslation } from '@dxos/react-ui';
-import { ChatDialog as NativeChatDialog } from '@dxos/react-ui-chat';
+import { ChatDialog as NaturalChatDialog } from '@dxos/react-ui-chat';
 
 import { useBlueprintRegistry, useChatProcessor, useChatServices, useOnline, usePresets } from '../hooks';
 import { meta } from '../meta';
@@ -28,7 +29,13 @@ export const ChatDialog = ({ chat }: ChatDialogProps) => {
   const [online, setOnline] = useOnline();
   const { preset, ...chatProps } = usePresets(online);
   const blueprintRegistry = useBlueprintRegistry();
-  const processor = useChatProcessor({ chat, preset, services, blueprintRegistry, settings });
+  const processor = useChatProcessor({
+    chat,
+    preset,
+    services,
+    blueprintRegistry,
+    settings,
+  });
 
   // TODO(burdon): Refocus when open.
   const [open, setOpen] = useState(true);
@@ -52,15 +59,15 @@ export const ChatDialog = ({ chat }: ChatDialogProps) => {
 
   return (
     <Chat.Root chat={chat} processor={processor} onEvent={handleEvent}>
-      <NativeChatDialog.Root open={open} expanded={expanded} onOpenChange={setOpen}>
-        <NativeChatDialog.Header title={t('assistant dialog title')} />
-        <NativeChatDialog.Content>
+      <NaturalChatDialog.Root open={open} expanded={expanded} onOpenChange={setOpen}>
+        <NaturalChatDialog.Header title={t('assistant dialog title')} />
+        <NaturalChatDialog.Content>
           <Chat.Thread />
-        </NativeChatDialog.Content>
-        <NativeChatDialog.Footer classNames='p-1.5'>
+        </NaturalChatDialog.Content>
+        <NaturalChatDialog.Footer classNames='p-1.5'>
           <Chat.Prompt {...chatProps} preset={preset?.id} online={online} onOnlineChange={setOnline} expandable />
-        </NativeChatDialog.Footer>
-      </NativeChatDialog.Root>
+        </NaturalChatDialog.Footer>
+      </NaturalChatDialog.Root>
     </Chat.Root>
   );
 };

package/src/components/ChatProgress/ChatProgress.tsx

@@ -5,9 +5,8 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import { addEventListener } from '@dxos/async';
-import { Flex, ProgressBar, type ProgressBarProps, TextCrawl } from '@dxos/react-ui-components';
+import { Flex, ProgressBar, type ProgressBarProps, TextCrawl, useExecutionGraph } from '@dxos/react-ui-components';
 
-import { useExecutionGraph } from '../../hooks';
 import { type Assistant } from '../../types';
 
 // TODO(burdon): Reset after each session.
@@ -28,7 +27,7 @@ export type ChatProgressProps = {
 };
 
 export const ChatProgress = ({ chat }: ChatProgressProps) => {
-  const { commits } = useExecutionGraph(chat.traceQueue, true);
+  const { commits } = useExecutionGraph(chat.traceQueue?.target, true);
   const nodes = useMemo(() => commits.map((commit) => ({ id: commit.id, message: commit.message })), [commits]);
   const lines = useMemo(() => commits.map((commit) => commit.message), [commits]);
 
@@ -62,7 +61,7 @@ export const ChatProgress = ({ chat }: ChatProgressProps) => {
   return (
     <Flex column tabIndex={0} ref={ref} classNames='outline-none'>
       <ProgressBar nodes={nodes} index={index} onSelect={handleSelect} />
-      <TextCrawl lines={lines} index={index} autoAdvance classNames='pis-4 text-sm text-subdued' />
+      <TextCrawl classNames='pis-4 text-sm text-description' lines={lines} autoAdvance />
     </Flex>
   );
 };

package/src/components/ChatPrompt/ChatActions.tsx

@@ -29,10 +29,9 @@ export const ChatActions = ({ classNames, children, microphone, recording, proce
       <IconButton
         disabled={!processing}
         variant='ghost'
-        size={5}
         icon='ph--x--regular'
         iconOnly
-        label={t('button cancel processing')}
+        label={t('cancel processing button')}
         onClick={() => onEvent?.({ type: 'cancel' })}
       />
 
@@ -41,11 +40,10 @@ export const ChatActions = ({ classNames, children, microphone, recording, proce
           disabled={!processing}
           classNames={mx(recording && 'bg-primary-500')}
           variant='ghost'
-          size={5}
           icon='ph--microphone--regular'
           iconOnly
           noTooltip
-          label={t('button microphone')}
+          label={t('microphone button')}
           onMouseDown={() => onEvent?.({ type: 'record-start' })}
           onMouseUp={() => onEvent?.({ type: 'record-stop' })}
           onTouchStart={() => onEvent?.({ type: 'record-start' })}

package/src/components/ChatPrompt/ChatOptions.tsx

@@ -9,13 +9,19 @@ import { type Blueprint } from '@dxos/blueprints';
 import { Filter, Obj, Type } from '@dxos/echo';
 import { type Space, useQuery } from '@dxos/react-client/echo';
 import { Icon, IconButton, Popover, Select, useTranslation } from '@dxos/react-ui';
-import { SearchList } from '@dxos/react-ui-searchlist';
+import { Listbox, SearchList } from '@dxos/react-ui-searchlist';
 import { Tabs } from '@dxos/react-ui-tabs';
 
-import { useActiveBlueprints, useBlueprintHandlers, useBlueprints, useContextObjects, useItemTypes } from '../../hooks';
+import {
+  useActiveBlueprints,
+  useBlueprintHandlers,
+  useBlueprints,
+  useContextObjects,
+  useFilteredTypes,
+} from '../../hooks';
 import { meta } from '../../meta';
 
-const panelClassNames = 'is-[calc(100dvw-.5rem)] sm:is-max md:is-[25rem] max-is-[--text-content]';
+const panelClassNames = 'is-[calc(100dvw-.5rem)] sm:is-max md:is-72 max-is-[--text-content]';
 
 export type ChatOptionsProps = {
   space: Space;
@@ -40,14 +46,16 @@ export const ChatOptions = ({
   const { t } = useTranslation(meta.id);
 
   return (
-    <div role='none' className='flex gap-0.5'>
+    <div role='none' className='flex p-2'>
       <Popover.Root>
         <Popover.Trigger asChild>
-          <IconButton variant='ghost' icon='ph--plus--regular' iconOnly size={5} label={t('button context objects')} />
+          <IconButton variant='ghost' icon='ph--plus--regular' iconOnly label={t('context objects button')} />
         </Popover.Trigger>
         <Popover.Portal>
           <Popover.Content side='top' classNames={panelClassNames}>
-            <ObjectsPanel space={space} context={context} />
+            <Popover.Viewport>
+              <ObjectsPanel space={space} context={context} />
+            </Popover.Viewport>
             <Popover.Arrow />
           </Popover.Content>
         </Popover.Portal>
@@ -59,30 +67,31 @@ export const ChatOptions = ({
             variant='ghost'
             icon='ph--sliders-horizontal--regular'
             iconOnly
-            size={5}
-            label={t('button context settings')}
+            label={t('context settings button')}
           />
         </Popover.Trigger>
         <Popover.Portal>
           <Popover.Content side='top' classNames={panelClassNames}>
-            <Tabs.Root orientation='horizontal' defaultValue='blueprints' defaultActivePart='list'>
-              <Tabs.Viewport classNames='max-bs-[--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-bs-0 [&_[role="listbox"]]:overflow-y-auto [&_[role="tabpanel"]]:min-bs-0 [&_[role="tabpanel"]]:pli-cardSpacingChrome [&_[role="tabpanel"][data-state="active"]]:order-first [&_[role="tabpanel"][data-state="inactive"]]:hidden'>
-                <Tabs.Tabpanel value='blueprints'>
-                  <BlueprintsPanel blueprintRegistry={blueprintRegistry} space={space} context={context} />
-                </Tabs.Tabpanel>
-                <Tabs.Tabpanel value='model'>
-                  <ModelsPanel presets={presets} preset={preset} onPresetChange={onPresetChange} />
-                </Tabs.Tabpanel>
-                <Tabs.Tablist classNames='sm:overflow-x-hidden justify-center p-[--dx-cardSpacingChrome] border-bs border-subduedSeparator order-last'>
-                  <Tabs.IconTab
-                    value='blueprints'
-                    icon='ph--blueprint--regular'
-                    label={t('blueprints in context title')}
-                  />
-                  <Tabs.IconTab value='model' label={t('chat model title')} icon='ph--cpu--regular' />
-                </Tabs.Tablist>
-              </Tabs.Viewport>
-            </Tabs.Root>
+            <Popover.Viewport>
+              <Tabs.Root orientation='horizontal' defaultValue='blueprints' defaultActivePart='list' tabIndex={-1}>
+                <Tabs.Viewport classNames='max-bs-[--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-bs-0 [&_[role="listbox"]]:overflow-y-auto [&_[role="tabpanel"]]:min-bs-0 [&_[role="tabpanel"]]:pli-cardSpacingChrome [&_[role="tabpanel"][data-state="active"]]:order-first [&_[role="tabpanel"][data-state="inactive"]]:hidden'>
+                  <Tabs.Tabpanel value='blueprints' tabIndex={-1} classNames='dx-focus-ring-inset'>
+                    <BlueprintsPanel blueprintRegistry={blueprintRegistry} space={space} context={context} />
+                  </Tabs.Tabpanel>
+                  <Tabs.Tabpanel value='model' tabIndex={-1} classNames='dx-focus-ring-inset !pli-0'>
+                    <ModelsPanel presets={presets} preset={preset} onPresetChange={onPresetChange} />
+                  </Tabs.Tabpanel>
+                  <Tabs.Tablist classNames='sm:overflow-x-hidden justify-center p-[--dx-cardSpacingChrome] border-bs border-subduedSeparator order-last'>
+                    <Tabs.IconTab
+                      value='blueprints'
+                      icon='ph--blueprint--regular'
+                      label={t('blueprints in context title')}
+                    />
+                    <Tabs.IconTab value='model' label={t('chat model title')} icon='ph--cpu--regular' />
+                  </Tabs.Tablist>
+                </Tabs.Viewport>
+              </Tabs.Root>
+            </Popover.Viewport>
             <Popover.Arrow />
           </Popover.Content>
         </Popover.Portal>
@@ -98,7 +107,7 @@ const BlueprintsPanel = ({
 }: Pick<ChatOptionsProps, 'blueprintRegistry' | 'space' | 'context'>) => {
   const { t } = useTranslation(meta.id);
 
-  const blueprints = useBlueprints({ blueprintRegistry });
+  const blueprints = useBlueprints({ blueprintRegistry, space });
   const activeBlueprints = useActiveBlueprints({ context });
   const { onUpdateBlueprint } = useBlueprintHandlers({ space, context, blueprintRegistry });
 
@@ -120,7 +129,7 @@ const BlueprintsPanel = ({
           );
         })}
       </SearchList.Content>
-      <SearchList.Input placeholder={t('search placeholder')} classNames='mbe-cardSpacingChrome' />
+      <SearchList.Input placeholder={t('search placeholder')} classNames='mbe-cardSpacingChrome' autoFocus />
     </SearchList.Root>
   );
 };
@@ -131,24 +140,16 @@ const ModelsPanel = ({
   onPresetChange,
 }: Pick<ChatOptionsProps, 'presets' | 'preset' | 'onPresetChange'>) => {
   return (
-    <ul role='listbox' className='plb-cardSpacingChrome'>
+    <Listbox.Root value={preset} onValueChange={onPresetChange} autoFocus>
       {presets?.map(({ id, label }) => {
-        const isActive = preset === id;
         return (
-          <li
-            role='option'
-            key={id}
-            aria-selected={isActive}
-            tabIndex={0}
-            className='overflow-hidden dx-focus-ring flex gap-2 p-1 pis-2 pie-2 items-center rounded-sm select-none cursor-pointer hover:bg-hoverOverlay'
-            onClick={() => onPresetChange?.(id)}
-          >
-            <div className='grow truncate'>{label}</div>
-            <Icon icon='ph--check--regular' classNames={[!isActive && 'invisible']} />
-          </li>
+          <Listbox.Option key={id} value={id}>
+            <Listbox.OptionLabel>{label}</Listbox.OptionLabel>
+            <Listbox.OptionIndicator />
+          </Listbox.Option>
         );
       })}
-    </ul>
+    </Listbox.Root>
   );
 };
 
@@ -158,7 +159,7 @@ const ObjectsPanel = ({ space, context }: Pick<ChatOptionsProps, 'space' | 'cont
   const { t } = useTranslation(meta.id);
 
   // Item types sorted by label.
-  const types = useItemTypes(space);
+  const types = useFilteredTypes(space);
   const typenames = useMemo(() => {
     const typenames = types.map((type) => {
       const typename = Type.getTypename(type);
@@ -184,8 +185,8 @@ const ObjectsPanel = ({ space, context }: Pick<ChatOptionsProps, 'space' | 'cont
   const { objects: contextObjects, onUpdateObject } = useContextObjects({ space, context });
 
   return (
-    <SearchList.Root classNames='pis-2 pie-2'>
-      <SearchList.Content classNames='plb-cardSpacingChrome [&:has([cmdk-list-sizer]:empty)]:plb-0'>
+    <SearchList.Root>
+      <SearchList.Content classNames='p-cardSpacingChrome [&:has([cmdk-list-sizer]:empty)]:plb-0'>
         {objects.length ? (
           objects.map((object) => {
             const label = Obj.getLabel(object) ?? Obj.getTypename(object) ?? object.id;
@@ -207,7 +208,7 @@ const ObjectsPanel = ({ space, context }: Pick<ChatOptionsProps, 'space' | 'cont
         )}
       </SearchList.Content>
 
-      <div role='none' className='grid grid-cols-[min-content_1fr] gap-2 mbe-cardSpacingChrome'>
+      <div role='none' className='grid grid-cols-[min-content_1fr] gap-2 pli-cardSpacingChrome mbe-cardSpacingChrome'>
         <Select.Root value={typename === ANY ? undefined : typename} onValueChange={setTypename}>
           <Select.TriggerButton density='fine' placeholder={t('type filter placeholder')} />
           <Select.Portal>
@@ -226,7 +227,7 @@ const ObjectsPanel = ({ space, context }: Pick<ChatOptionsProps, 'space' | 'cont
             </Select.Content>
           </Select.Portal>
         </Select.Root>
-        <SearchList.Input placeholder={t('search placeholder')} classNames='mbe-0' />
+        <SearchList.Input placeholder={t('search placeholder')} classNames='mbe-0' autoFocus />
       </div>
     </SearchList.Root>
   );

package/src/components/ChatPrompt/ChatReferences.tsx

@@ -23,7 +23,7 @@ export const ChatReferences = ({ classNames, context, space }: ChatReferencesPro
   const { objects, onUpdateObject } = useContextObjects({ space, context });
 
   return (
-    <ul className={mx('flex flex-wrap', classNames)}>
+    <ul className={mx('flex', classNames)}>
       {objects.map((obj) => {
         const dxn = Obj.getDXN(obj);
         const typename = Obj.getTypename(obj);
@@ -32,12 +32,12 @@ export const ChatReferences = ({ classNames, context, space }: ChatReferencesPro
           <li key={dxn.toString()} className='dx-tag plb-0 pis-2 flex items-center' data-hue='neutral'>
             {toLocalizedString(label, t)}
             <IconButton
+              icon='ph--x--bold'
               iconOnly
               variant='ghost'
               label={t('remove object in context label')}
               classNames='p-0 hover:bg-transparent'
               size={3}
-              icon='ph--x--bold'
               onClick={() => onUpdateObject?.(dxn, false)}
             />
           </li>