@dxos/plugin-assistant 0.8.4-main.3c1ae3b → 0.8.4-main.3eb6e50203

package/src/components/ChatCompanion.tsx

@@ -5,37 +5,81 @@
 import * as Array from 'effect/Array';
 import * as Function from 'effect/Function';
 import * as Option from 'effect/Option';
-import React, { forwardRef, useCallback, useEffect, useMemo, useState } from 'react';
+import React, { forwardRef, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
-import { Capabilities, createIntent } from '@dxos/app-framework';
-import { useCapabilities, useIntentDispatcher } from '@dxos/app-framework/react';
+import { useAtomCapability, useCapabilities, useOperationInvoker } from '@dxos/app-framework/ui';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { Chat } from '@dxos/assistant-toolkit';
 import { Blueprint } from '@dxos/blueprints';
 import { getSpace } from '@dxos/client/echo';
-import { Filter, Obj, Ref } from '@dxos/echo';
-import { SpaceAction } from '@dxos/plugin-space/types';
+import { DXN, Filter, Obj, Query, Ref } from '@dxos/echo';
+import { SpaceOperation } from '@dxos/plugin-space/types';
 import { useQuery } from '@dxos/react-client/echo';
 import { useAsyncEffect } from '@dxos/react-ui';
 
 import { ChatContainer, type ChatEvent } from '../components';
 import { useBlueprintRegistry, useContextBinder } from '../hooks';
-import { Assistant, AssistantAction } from '../types';
+import { Assistant, AssistantCapabilities, AssistantOperation } from '../types';
 
 export type ChatCompanionProps = {
   role?: string;
-  data: { subject: Assistant.Chat | 'assistant-chat'; companionTo: Obj.Any };
+  data: {
+    subject: Chat.Chat | 'assistant-chat';
+    companionTo: Obj.Unknown;
+  };
 };
 
 export const ChatCompanion = forwardRef<HTMLDivElement, ChatCompanionProps>(
   ({ role, data }: ChatCompanionProps, forwardedRef) => {
-    const { dispatchPromise: dispatch } = useIntentDispatcher();
+    const { invokePromise } = useOperationInvoker();
     const blueprintRegistry = useBlueprintRegistry();
     const companionTo = data.companionTo;
 
     const space = getSpace(companionTo);
     const [chat, setChat] = useState(data.subject === 'assistant-chat' ? undefined : data.subject);
+
+    // Watch the state atom directly to detect when plus button clears the chat selection.
+    const state = useAtomCapability(AssistantCapabilities.State);
+    const companionToId = Obj.getDXN(companionTo).toString();
+    const currentChatState = state?.currentChat[companionToId];
+
+    // Track if initial setup has been done (to distinguish initial mount from plus button click).
+    // Reset when companionTo changes.
+    const initialSetupDoneRef = useRef(false);
+    const prevCompanionToIdRef = useRef(companionToId);
+    if (prevCompanionToIdRef.current !== companionToId) {
+      initialSetupDoneRef.current = false;
+      prevCompanionToIdRef.current = companionToId;
+    }
+
+    // Sync local chat state with the state atom.
+    // When currentChatState is undefined (plus button clicked), reset local chat.
+    // When data.subject is a Chat object, use it directly.
+    // When currentChatState is a different chat, fetch and set it.
     useEffect(() => {
-      setChat(data.subject === 'assistant-chat' ? undefined : data.subject);
-    }, [data.subject]);
+      // If state says no chat selected AND current chat is persisted, reset local state (handles plus button click).
+      // Don't reset in-memory chats - they're expected to have currentChatState === undefined.
+      if (!currentChatState && chat && getSpace(chat)) {
+        setChat(undefined);
+      } else if (data.subject !== 'assistant-chat') {
+        // If data.subject is a Chat object (resolved from graph), use it.
+        setChat(data.subject);
+      } else if (currentChatState && space) {
+        // currentChatState is set but graph couldn't resolve it - fetch manually.
+        const currentChatDxnStr = chat ? Obj.getDXN(chat).toString() : undefined;
+        if (currentChatState !== currentChatDxnStr) {
+          // Parse DXN and fetch the chat object from the database.
+          const parsedDxn = DXN.tryParse(currentChatState);
+          if (parsedDxn) {
+            const chatRef = space.db.makeRef(parsedDxn);
+            const resolvedChat = chatRef?.target;
+            if (Obj.instanceOf(Assistant.Chat, resolvedChat)) {
+              setChat(resolvedChat);
+            }
+          }
+        }
+      }
+    }, [currentChatState, data.subject, space, chat]);
 
     const chatQueue = space && chat ? space.queues.get(chat.queue.dxn) : undefined;
     const binder = useContextBinder(chatQueue);
@@ -46,46 +90,62 @@ export const ChatCompanion = forwardRef<HTMLDivElement, ChatCompanionProps>(
         return;
       }
 
-      const { data } = await dispatch(createIntent(AssistantAction.CreateChat, { space }));
-      setChat(data?.object);
-    }, [chat, space]);
+      // Only query for existing chats on initial mount, not when plus button is clicked.
+      if (!initialSetupDoneRef.current) {
+        // Query for existing companion chats linked to this object.
+        const existingChats = await space.db
+          .query(Query.select(Filter.id(companionTo.id)).targetOf(Chat.CompanionTo).source())
+          .run();
+
+        initialSetupDoneRef.current = true;
+
+        // Use existing chat if found on initial mount.
+        if (existingChats.length > 0) {
+          const existingChat = existingChats.at(-1) as Assistant.Chat;
+          setChat(existingChat);
+          await invokePromise(AssistantOperation.SetCurrentChat, { companionTo, chat: existingChat });
+          return;
+        }
+      }
+
+      // Create chat in-memory only - it will be added to space on first message.
+      const { data: createResult } = await invokePromise(AssistantOperation.CreateChat, {
+        db: space.db,
+        addToSpace: false,
+      });
+      setChat(createResult?.object);
+    }, [chat, space, companionTo, invokePromise]);
 
-    // Add chat to space when user submits the first message.
+    // Add chat to space and create relation when user submits the first message.
     const handleEvent = useCallback(
       async (event: ChatEvent) => {
-        const chatInSpace = !!getSpace(chat);
-        if (chatInSpace || !chat || !space) {
+        if (!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: chat,
-              target: companionTo,
-            }),
-          );
-          await dispatch(
-            createIntent(AssistantAction.SetCurrentChat, {
-              companionTo,
-              chat,
-            }),
-          );
+        // If chat is not in space yet, persist it on first submit.
+        if (event.type === 'submit' && !getSpace(chat)) {
+          await invokePromise(SpaceOperation.AddObject, {
+            object: chat,
+            target: space.db,
+            hidden: true,
+          });
+          await invokePromise(SpaceOperation.AddRelation, {
+            db: space.db,
+            schema: Chat.CompanionTo,
+            source: chat,
+            target: companionTo,
+          });
+          await invokePromise(AssistantOperation.SetCurrentChat, {
+            companionTo,
+            chat,
+          });
         }
       },
-      [chat, space, companionTo, dispatch],
+      [chat, space, companionTo, invokePromise],
     );
 
-    const metadata = useCapabilities(Capabilities.Metadata);
+    const metadata = useCapabilities(AppCapabilities.Metadata);
     const blueprintKeys = useMemo(
       () =>
         Function.pipe(
@@ -103,7 +163,7 @@ export const ChatCompanion = forwardRef<HTMLDivElement, ChatCompanionProps>(
         ),
       [metadata, companionTo],
     );
-    const existingBlueprints = useQuery(space, Filter.type(Blueprint.Blueprint));
+    const existingBlueprints = useQuery(space?.db, Filter.type(Blueprint.Blueprint));
     const pluginBlueprints = useMemo(
       () => existingBlueprints.filter((blueprint) => blueprintKeys.includes(blueprint.key)),
       [existingBlueprints, blueprintKeys],
@@ -128,7 +188,7 @@ export const ChatCompanion = forwardRef<HTMLDivElement, ChatCompanionProps>(
           continue;
         }
 
-        space.db.add(Obj.clone(blueprint));
+        space.db.add(Obj.clone(blueprint, { deep: true }));
       }
     }, [space, blueprintRegistry, blueprintKeys]);
 
@@ -154,7 +214,7 @@ export const ChatCompanion = forwardRef<HTMLDivElement, ChatCompanionProps>(
       <ChatContainer
         role={role}
         space={space}
-        chat={chat}
+        subject={chat}
         companionTo={companionTo}
         onEvent={handleEvent}
         ref={forwardedRef}

package/src/components/ChatContainer.tsx

@@ -4,30 +4,30 @@
 
 import React, { forwardRef } from 'react';
 
-import { Capabilities } from '@dxos/app-framework';
-import { useCapability } from '@dxos/app-framework/react';
+import { useAtomCapability } from '@dxos/app-framework/ui';
+import { type SurfaceComponentProps } from '@dxos/app-toolkit/ui';
 import { type Space, getSpace } from '@dxos/client/echo';
 import { type Obj } from '@dxos/echo';
-import { StackItem } from '@dxos/react-ui-stack';
+import { Layout } from '@dxos/react-ui';
 
 import { useBlueprintRegistry, useChatProcessor, useChatServices, useOnline, usePresets } from '../hooks';
-import { meta } from '../meta';
-import { type Assistant } from '../types';
+import { AssistantCapabilities, type ChatType } from '../types';
 
-import { Chat, type ChatRootProps } from './Chat';
+import { Chat as ChatComponent, type ChatRootProps } from './Chat';
 
-export type ChatContainerProps = {
-  role?: string;
-  space?: Space;
-  chat?: Assistant.Chat;
-  companionTo?: Obj.Any;
-} & Pick<ChatRootProps, 'onEvent'>;
+export type ChatContainerProps = SurfaceComponentProps<
+  ChatType.Chat | undefined,
+  {
+    space?: Space;
+    companionTo?: Obj.Unknown;
+  } & Pick<ChatRootProps, 'onEvent'>
+>;
 
 export const ChatContainer = forwardRef<HTMLDivElement, ChatContainerProps>((props, forwardedRef) => {
-  const { space: spaceProp, chat, companionTo, onEvent } = props;
+  const { role, subject: chat, space: spaceProp, companionTo, onEvent } = props;
   const space = spaceProp ?? getSpace(chat);
-  const settings = useCapability(Capabilities.SettingsStore).getStore<Assistant.Settings>(meta.id)?.value;
-  const services = useChatServices({ space, chat });
+  const settings = useAtomCapability(AssistantCapabilities.Settings);
+  const services = useChatServices({ id: space?.id, chat });
   const [online, setOnline] = useOnline();
   const { preset, ...chatProps } = usePresets(online);
   const blueprintRegistry = useBlueprintRegistry();
@@ -45,17 +45,23 @@ export const ChatContainer = forwardRef<HTMLDivElement, ChatContainerProps>((pro
   }
 
   return (
-    <StackItem.Content toolbar ref={forwardedRef}>
-      <Chat.Root space={space} chat={chat} processor={processor} onEvent={onEvent}>
-        <Chat.Toolbar companionTo={companionTo} />
-        <Chat.Viewport classNames='container-max-width'>
-          <Chat.Thread />
+    <Layout.Main toolbar role={role} ref={forwardedRef}>
+      <ChatComponent.Root db={space?.db} chat={chat} processor={processor} onEvent={onEvent}>
+        <ChatComponent.Toolbar companionTo={companionTo} />
+        <ChatComponent.Viewport classNames='container-max-width'>
+          <ChatComponent.Thread />
           <div role='none' className='p-4'>
-            <Chat.Prompt {...chatProps} outline preset={preset?.id} online={online} onOnlineChange={setOnline} />
+            <ChatComponent.Prompt
+              {...chatProps}
+              outline
+              preset={preset?.id}
+              online={online}
+              onOnlineChange={setOnline}
+            />
           </div>
-        </Chat.Viewport>
-      </Chat.Root>
-    </StackItem.Content>
+        </ChatComponent.Viewport>
+      </ChatComponent.Root>
+    </Layout.Main>
   );
 });
 

package/src/components/ChatDialog.tsx

@@ -4,28 +4,28 @@
 
 import React, { useCallback, useState } from 'react';
 
-import { Capabilities } from '@dxos/app-framework';
-import { useCapability } from '@dxos/app-framework/react';
-import { getSpace } from '@dxos/client/echo';
+import { useAtomCapability } from '@dxos/app-framework/ui';
+import { type Chat as ChatTypes } from '@dxos/assistant-toolkit';
+import { Obj } from '@dxos/echo';
 import { useTranslation } from '@dxos/react-ui';
 import { ChatDialog as NaturalChatDialog } from '@dxos/react-ui-chat';
 
 import { useBlueprintRegistry, useChatProcessor, useChatServices, useOnline, usePresets } from '../hooks';
 import { meta } from '../meta';
-import { type Assistant } from '../types';
+import { AssistantCapabilities } from '../types';
 
 import { Chat, type ChatRootProps } from './Chat';
 
 export type ChatDialogProps = {
-  chat?: Assistant.Chat;
+  chat?: ChatTypes.Chat;
 };
 
 export const ChatDialog = ({ chat }: ChatDialogProps) => {
   const { t } = useTranslation(meta.id);
 
-  const space = getSpace(chat);
-  const settings = useCapability(Capabilities.SettingsStore).getStore<Assistant.Settings>(meta.id)?.value;
-  const services = useChatServices({ space, chat });
+  const db = chat && Obj.getDatabase(chat);
+  const settings = useAtomCapability(AssistantCapabilities.Settings);
+  const services = useChatServices({ id: db?.spaceId, chat });
   const [online, setOnline] = useOnline();
   const { preset, ...chatProps } = usePresets(online);
   const blueprintRegistry = useBlueprintRegistry();

package/src/components/ChatProgress/ChatProgress.tsx

@@ -4,26 +4,12 @@
 
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
+import { type Chat } from '@dxos/assistant-toolkit';
 import { addEventListener } from '@dxos/async';
-import { Flex, ProgressBar, type ProgressBarProps, TextCrawl, useExecutionGraph } from '@dxos/react-ui-components';
-
-import { type Assistant } from '../../types';
-
-// TODO(burdon): Reset after each session.
-// TODO(burdon): Show after delay.
-// TODO(burdon): Test with errors.
-// TODO(burdon): Filter out empty trace messages.
-
-// {
-//   "id": "01K3TE3C2VAXETP500QKDHK3C4_block_3",
-//   "branch": "main",
-//   "parents": [],
-//   "icon": "ph--robot--regular",
-//   "message": "\n"
-// }
+import { ProgressBar, type ProgressBarProps, TextCrawl, useExecutionGraph } from '@dxos/react-ui-components';
 
 export type ChatProgressProps = {
-  chat: Assistant.Chat;
+  chat: Chat.Chat;
 };
 
 export const ChatProgress = ({ chat }: ChatProgressProps) => {
@@ -59,9 +45,9 @@ export const ChatProgress = ({ chat }: ChatProgressProps) => {
   }, [nodes.length]);
 
   return (
-    <Flex column tabIndex={0} ref={ref} classNames='outline-none'>
+    <div role='none' tabIndex={0} ref={ref} className='flex flex-col outline-none'>
       <ProgressBar nodes={nodes} index={index} onSelect={handleSelect} />
       <TextCrawl classNames='pis-4 text-sm text-description' lines={lines} autoAdvance />
-    </Flex>
+    </div>
   );
 };

package/src/components/ChatPrompt/ChatActions.tsx

@@ -5,7 +5,7 @@
 import React, { type PropsWithChildren } from 'react';
 
 import { IconButton, type ThemedClassName, useTranslation } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 import { meta } from '../../meta';
 import { type ChatEvent } from '../Chat';
@@ -50,6 +50,14 @@ export const ChatActions = ({ classNames, children, microphone, recording, proce
           onTouchEnd={() => onEvent?.({ type: 'record-stop' })}
         />
       )}
+
+      <IconButton
+        variant='ghost'
+        icon='ph--wrench--regular'
+        iconOnly
+        label={t('debug button')}
+        onClick={() => onEvent?.({ type: 'toggle-debug' })}
+      />
     </div>
   );
 };

package/src/components/ChatPrompt/ChatOptions.tsx

@@ -6,10 +6,10 @@ import React, { type JSX, useMemo, useState } from 'react';
 
 import { type AiContextBinder } from '@dxos/assistant';
 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 { Listbox, SearchList } from '@dxos/react-ui-searchlist';
+import { type Database, Filter, Obj, Type } 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-searchlist';
 import { Tabs } from '@dxos/react-ui-tabs';
 
 import {
@@ -24,7 +24,7 @@ import { meta } from '../../meta';
 const panelClassNames = 'is-[calc(100dvw-.5rem)] sm:is-max md:is-72 max-is-[--text-content]';
 
 export type ChatOptionsProps = {
-  space: Space;
+  db: Database.Database;
   context: AiContextBinder;
   blueprintRegistry?: Blueprint.Registry;
   presets?: { id: string; label: string }[];
@@ -35,14 +35,7 @@ export type ChatOptionsProps = {
 /**
  * Manages the runtime context for the chat.
  */
-export const ChatOptions = ({
-  space,
-  context,
-  blueprintRegistry,
-  presets,
-  preset,
-  onPresetChange,
-}: ChatOptionsProps) => {
+export const ChatOptions = ({ db, context, blueprintRegistry, presets, preset, onPresetChange }: ChatOptionsProps) => {
   const { t } = useTranslation(meta.id);
 
   return (
@@ -54,7 +47,7 @@ export const ChatOptions = ({
         <Popover.Portal>
           <Popover.Content side='top' classNames={panelClassNames}>
             <Popover.Viewport>
-              <ObjectsPanel space={space} context={context} />
+              <ObjectsPanel db={db} context={context} />
             </Popover.Viewport>
             <Popover.Arrow />
           </Popover.Content>
@@ -76,7 +69,7 @@ export const ChatOptions = ({
               <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} />
+                    <BlueprintsPanel blueprintRegistry={blueprintRegistry} db={db} context={context} />
                   </Tabs.Tabpanel>
                   <Tabs.Tabpanel value='model' tabIndex={-1} classNames='dx-focus-ring-inset !pli-0'>
                     <ModelsPanel presets={presets} preset={preset} onPresetChange={onPresetChange} />
@@ -102,32 +95,38 @@ export const ChatOptions = ({
 
 const BlueprintsPanel = ({
   blueprintRegistry,
-  space,
+  db,
   context,
-}: Pick<ChatOptionsProps, 'blueprintRegistry' | 'space' | 'context'>) => {
+}: Pick<ChatOptionsProps, 'blueprintRegistry' | 'db' | 'context'>) => {
   const { t } = useTranslation(meta.id);
 
-  const blueprints = useBlueprints({ blueprintRegistry, space });
+  const blueprints = useBlueprints({ blueprintRegistry, db });
   const activeBlueprints = useActiveBlueprints({ context });
-  const { onUpdateBlueprint } = useBlueprintHandlers({ space, context, blueprintRegistry });
+  const { onUpdateBlueprint } = useBlueprintHandlers({ db, context, blueprintRegistry });
+
+  const { results, handleSearch } = useSearchListResults({
+    items: blueprints,
+    extract: (blueprint) => blueprint.name,
+  });
 
   return (
-    <SearchList.Root>
+    <SearchList.Root onSearch={handleSearch}>
       <SearchList.Content classNames='plb-cardSpacingChrome'>
-        {blueprints.map((blueprint) => {
-          const isActive = activeBlueprints.has(blueprint.key);
-          return (
-            <SearchList.Item
-              classNames='flex items-center overflow-hidden'
-              key={blueprint.key}
-              value={blueprint.name}
-              onSelect={() => onUpdateBlueprint?.(blueprint.key, !isActive)}
-            >
-              <div className='grow truncate'>{blueprint.name}</div>
-              <Icon icon='ph--check--regular' classNames={[!isActive && 'invisible']} />
-            </SearchList.Item>
-          );
-        })}
+        <SearchList.Viewport>
+          {results.map((blueprint) => {
+            const isActive = activeBlueprints.has(blueprint.key);
+            return (
+              <SearchList.Item
+                classNames='flex items-center overflow-hidden'
+                key={blueprint.key}
+                value={blueprint.key}
+                label={blueprint.name}
+                checked={isActive}
+                onSelect={() => onUpdateBlueprint?.(blueprint.key, !isActive)}
+              />
+            );
+          })}
+        </SearchList.Viewport>
       </SearchList.Content>
       <SearchList.Input placeholder={t('search placeholder')} classNames='mbe-cardSpacingChrome' autoFocus />
     </SearchList.Root>
@@ -155,11 +154,11 @@ const ModelsPanel = ({
 
 const ANY = '__any__';
 
-const ObjectsPanel = ({ space, context }: Pick<ChatOptionsProps, 'space' | 'context'>): JSX.Element => {
+const ObjectsPanel = ({ db, context }: Pick<ChatOptionsProps, 'db' | 'context'>): JSX.Element => {
   const { t } = useTranslation(meta.id);
 
   // Item types sorted by label.
-  const types = useFilteredTypes(space);
+  const types = useFilteredTypes(db);
   const typenames = useMemo(() => {
     const typenames = types.map((type) => {
       const typename = Type.getTypename(type);
@@ -181,31 +180,36 @@ const ObjectsPanel = ({ space, context }: Pick<ChatOptionsProps, 'space' | 'cont
   );
 
   // Context objects.
-  const objects = useQuery(space, typename === ANY ? anyFilter : Filter.typename(typename));
-  const { objects: contextObjects, onUpdateObject } = useContextObjects({ space, context });
+  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,
+  });
 
   return (
-    <SearchList.Root>
+    <SearchList.Root onSearch={handleSearch}>
       <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;
-            const isActive = contextObjects.findIndex((obj) => obj.id === object.id) !== -1;
-            return (
-              <SearchList.Item
-                classNames='flex items-center overflow-hidden'
-                key={object.id}
-                value={object.id}
-                onSelect={() => onUpdateObject?.(Obj.getDXN(object), !isActive)}
-              >
-                <div className='grow truncate'>{label}</div>
-                <Icon icon='ph--check--regular' classNames={[!isActive && 'invisible']} />
-              </SearchList.Item>
-            );
-          })
-        ) : (
-          <SearchList.Item>{t('no results')}</SearchList.Item>
-        )}
+        <SearchList.Viewport>
+          {results.length ? (
+            results.map((object) => {
+              const isActive = contextObjects.findIndex((obj) => obj.id === object.id) !== -1;
+              return (
+                <SearchList.Item
+                  classNames='flex items-center overflow-hidden'
+                  key={object.id}
+                  value={object.id}
+                  label={Obj.getLabel(object) ?? Obj.getTypename(object) ?? object.id}
+                  checked={isActive}
+                  onSelect={() => onUpdateObject?.(Obj.getDXN(object), !isActive)}
+                />
+              );
+            })
+          ) : (
+            <SearchList.Item value='__empty__' label={t('no results')} />
+          )}
+        </SearchList.Viewport>
       </SearchList.Content>
 
       <div role='none' className='grid grid-cols-[min-content_1fr] gap-2 pli-cardSpacingChrome mbe-cardSpacingChrome'>

package/src/components/ChatPrompt/ChatReferences.tsx

@@ -5,22 +5,21 @@
 import React from 'react';
 
 import { type AiContextBinder } from '@dxos/assistant';
-import { Obj } from '@dxos/echo';
-import { type Space } from '@dxos/react-client/echo';
+import { type Database, Obj } from '@dxos/echo';
 import { IconButton, type Label, type ThemedClassName, toLocalizedString, useTranslation } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 import { useContextObjects } from '../../hooks';
 import { meta } from '../../meta';
 
 export type ChatReferencesProps = ThemedClassName<{
   context: AiContextBinder;
-  space: Space;
+  db: Database.Database;
 }>;
 
-export const ChatReferences = ({ classNames, context, space }: ChatReferencesProps) => {
+export const ChatReferences = ({ classNames, context, db }: ChatReferencesProps) => {
   const { t } = useTranslation(meta.id);
-  const { objects, onUpdateObject } = useContextObjects({ space, context });
+  const { objects, onUpdateObject } = useContextObjects({ db, context });
 
   return (
     <ul className={mx('flex', classNames)}>

package/src/components/ChatPrompt/ChatStatusIndicator.tsx

@@ -6,7 +6,7 @@ import React, { useEffect, useState } from 'react';
 
 import { type ThemedClassName, Tooltip, useTimeout } from '@dxos/react-ui';
 import { Spinner, type SpinnerProps } from '@dxos/react-ui-sfx';
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 const period = 3_000;