@dxos/plugin-assistant 0.8.4-main.406dc2a → 0.8.4-main.422d1c7879

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

@@ -0,0 +1,122 @@
+//
+// 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 { capabilities } from '@dxos/assistant-toolkit/testing';
+import { Feed, Filter } from '@dxos/echo';
+import { ChessPlugin } from '@dxos/plugin-chess';
+import { ClientPlugin } from '@dxos/plugin-client';
+import { initializeIdentity } from '@dxos/plugin-client/testing';
+import { MapPlugin } from '@dxos/plugin-map';
+import { TablePlugin } from '@dxos/plugin-table';
+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 blueprintRegistry = useBlueprintRegistry();
+  const binder = useContextBinder(space, feed);
+  const [preset, setPreset] = useState(presets?.[0]?.id);
+  if (!space || !binder) {
+    return <Loading />;
+  }
+  return (
+    <ChatOptions
+      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: [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.
+              space.db.add(Feed.make());
+              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 ObjectsPanelStory: 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='flex flex-col w-[300px] h-[300px] border border-separator'>
+        <ObjectsPanel db={space.db} context={binder} />
+      </div>
+    );
+  },
+};

package/src/components/ChatPrompt/ChatOptions.tsx

@@ -2,23 +2,29 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { type JSX, useMemo, useState } from 'react';
+import * as Option from 'effect/Option';
+import React, { type JSX, useCallback, useMemo, useState } from 'react';
 
 import { type AiContextBinder } from '@dxos/assistant';
+import { McpServer } from '@dxos/assistant-toolkit';
 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 { Annotation, type Database, Filter, Obj, Type } from '@dxos/echo';
+import { useQuery } from '@dxos/react-client/echo';
+import { IconButton, Input, Popover, Select, useTranslation } from '@dxos/react-ui';
+import { Listbox, 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, useItemTypes } from '../../hooks';
-import { meta } from '../../meta';
+import { useActiveBlueprints, useBlueprintHandlers, useBlueprints, useContextObjects, useFilteredTypes } from '#hooks';
+import { meta } from '#meta';
 
-const panelClassNames = 'is-[calc(100dvw-.5rem)] sm:is-max md:is-72 max-is-[--text-content]';
+const styles = {
+  panel: 'w-[calc(100dvw-.5rem)] sm:w-max md:w-popover-default-width max-w-document-width',
+  toolbar: 'p-form-chrome border-t border-separator',
+};
 
 export type ChatOptionsProps = {
-  space: Space;
+  db: Database.Database;
   context: AiContextBinder;
   blueprintRegistry?: Blueprint.Registry;
   presets?: { id: string; label: string }[];
@@ -29,25 +35,20 @@ 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 (
-    <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.Content side='top' classNames={styles.panel}>
+            <Popover.Viewport>
+              <ObjectsPanel db={db} context={context} />
+            </Popover.Viewport>
             <Popover.Arrow />
           </Popover.Content>
         </Popover.Portal>
@@ -59,30 +60,47 @@ 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' 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.Content side='top' classNames={styles.panel}>
+            <Popover.Viewport>
+              <Tabs.Root orientation='horizontal' defaultValue='model' defaultActivePart='list' tabIndex={-1}>
+                <Tabs.Viewport
+                  // TODO(burdon): Simplify styles.
+                  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='model' tabIndex={-1} classNames='dx-focus-ring-inset'>
+                    <ModelsPanel presets={presets} preset={preset} onPresetChange={onPresetChange} />
+                  </Tabs.Panel>
+                  <Tabs.Panel value='mcp-servers' tabIndex={-1} classNames='dx-focus-ring-inset'>
+                    <McpServersPanel db={db} />
+                  </Tabs.Panel>
+                  <Tabs.Panel value='blueprints' tabIndex={-1} classNames='dx-focus-ring-inset'>
+                    <BlueprintsPanel blueprintRegistry={blueprintRegistry} db={db} context={context} />
+                  </Tabs.Panel>
+                  <Tabs.Tablist classNames={styles.toolbar}>
+                    <Tabs.IconTab value='model' icon='ph--cpu--regular' label={t('chat-model.title')} />
+                    <Tabs.IconTab
+                      value='blueprints'
+                      icon='ph--blueprint--regular'
+                      label={t('blueprints-in-context.title')}
+                    />
+                    <Tabs.IconTab
+                      value='mcp-servers'
+                      icon='ph--plugs-connected--regular'
+                      label={t('mcp-servers.title')}
+                    />
+                  </Tabs.Tablist>
+                </Tabs.Viewport>
+              </Tabs.Root>
+            </Popover.Viewport>
             <Popover.Arrow />
           </Popover.Content>
         </Popover.Portal>
@@ -93,34 +111,39 @@ 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.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.Root onSearch={handleSearch}>
+      <SearchList.Content classNames='py-form-chrome'>
+        <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.Input placeholder={t('search.placeholder')} classNames='mb-form-chrome' autoFocus />
     </SearchList.Root>
   );
 };
@@ -144,19 +167,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 handleToggle = useCallback((server: McpServer.McpServer, enabled: boolean) => {
+    Obj.change(server, (server) => {
+      server.enabled = enabled;
+    });
+  }, []);
+
+  const handleRemove = useCallback(
+    (server: McpServer.McpServer) => {
+      db.remove(server);
+    },
+    [db],
+  );
+
+  return (
+    <div className='py-form-chrome space-y-2'>
+      {servers.map((server) => (
+        <div key={server.id} className='flex items-center gap-2 px-form-chrome'>
+          <Input.Root>
+            <Input.Label srOnly>{server.name}</Input.Label>
+            <Input.Switch
+              checked={server.enabled !== false}
+              onCheckedChange={(checked) => handleToggle(server, !!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={() => handleRemove(server)}
+          />
+        </div>
+      ))}
+      {adding ? (
+        <McpServerForm onSubmit={handleAdd} onCancel={() => setAdding(false)} />
+      ) : (
+        <div role='none' className='px-form-chrome'>
+          <IconButton
+            variant='ghost'
+            icon='ph--plus--regular'
+            label={t('mcp-server-add.label')}
+            onClick={() => setAdding(true)}
+          />
+        </div>
+      )}
+    </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 role='none' 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 = ({ space, context }: Pick<ChatOptionsProps, 'space' | '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.
-  const types = useItemTypes(space);
+  const types = useFilteredTypes(db);
   const typenames = useMemo(() => {
     const typenames = types.map((type) => {
       const typename = Type.getTypename(type);
       return {
         typename,
-        label: t('typename label', { ns: typename, defaultValue: typename }),
+        label: t('typename.label', { ns: typename, defaultValue: typename }),
       };
     });
 
@@ -172,41 +337,55 @@ 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.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.Root onSearch={handleSearch}>
+      <SearchList.Content classNames='p-form-chrome [&:has([cmdk-list-sizer]:empty)]:py-0'>
+        <SearchList.Viewport>
+          {results.length ? (
+            results.map((object) => {
+              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: 'ph--cube--regular',
+                  hue: undefined as string | undefined,
+                })),
+              );
+              const styles = hue ? getStyles(hue) : undefined;
+              return (
+                <SearchList.Item
+                  classNames='flex items-center overflow-hidden'
+                  key={object.id}
+                  value={object.id}
+                  icon={icon}
+                  iconClassNames={styles?.surfaceText}
+                  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.message')} />
+          )}
+        </SearchList.Viewport>
       </SearchList.Content>
 
-      <div role='none' className='grid grid-cols-[min-content_1fr] gap-2 pli-cardSpacingChrome mbe-cardSpacingChrome'>
+      <div role='none' className={mx('flex flex-col', styles.toolbar)}>
         <Select.Root value={typename === ANY ? undefined : typename} onValueChange={setTypename}>
-          <Select.TriggerButton density='fine' placeholder={t('type filter placeholder')} />
+          <Select.TriggerButton placeholder={t('type-filter.placeholder')} />
           <Select.Portal>
             <Select.Content>
               <Select.ScrollUpButton />
               <Select.Viewport>
-                <Select.Option value={ANY}>{t('any type filter label')}</Select.Option>
+                <Select.Option value={ANY}>{t('any-type-filter.label')}</Select.Option>
                 {typenames.map(({ typename, label }) => (
                   <Select.Option key={typename} value={typename}>
                     {label}
@@ -218,7 +397,7 @@ const ObjectsPanel = ({ space, context }: Pick<ChatOptionsProps, 'space' | 'cont
             </Select.Content>
           </Select.Portal>
         </Select.Root>
-        <SearchList.Input placeholder={t('search placeholder')} classNames='mbe-0' autoFocus />
+        <SearchList.Input placeholder={t('search.placeholder')} autoFocus />
       </div>
     </SearchList.Root>
   );

package/src/components/ChatPrompt/ChatReferences.tsx

@@ -2,42 +2,48 @@
 // Copyright 2025 DXOS.org
 //
 
+import * as Option from 'effect/Option';
 import React from 'react';
 
 import { type AiContextBinder } from '@dxos/assistant';
-import { Obj } from '@dxos/echo';
-import { type Space } from '@dxos/react-client/echo';
-import { IconButton, type Label, type ThemedClassName, toLocalizedString, useTranslation } from '@dxos/react-ui';
-import { mx } from '@dxos/react-ui-theme';
+import { Annotation, type Database, Obj } from '@dxos/echo';
+import { Icon, IconButton, type Label, type ThemedClassName, toLocalizedString, useTranslation } from '@dxos/react-ui';
+import { getStyles, mx } from '@dxos/ui-theme';
 
-import { useContextObjects } from '../../hooks';
-import { meta } from '../../meta';
+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 flex-wrap', classNames)}>
+    <ul className={mx('flex', classNames)}>
       {objects.map((obj) => {
         const dxn = Obj.getDXN(obj);
         const typename = Obj.getTypename(obj);
-        const label: Label = Obj.getLabel(obj) ?? (typename ? ['object name placeholder', { ns: typename }] : obj.id);
+        const label: Label = Obj.getLabel(obj) ?? (typename ? ['object-name.placeholder', { ns: typename }] : obj.id);
+        const { icon, hue } = Option.fromNullable(Obj.getSchema(obj)).pipe(
+          Option.flatMap(Annotation.IconAnnotation.get),
+          Option.getOrElse(() => ({ icon: DEFAULT_OBJECT_ICON, hue: undefined as string | undefined })),
+        );
+        const styles = hue ? getStyles(hue) : undefined;
         return (
-          <li key={dxn.toString()} className='dx-tag plb-0 pis-2 flex items-center' data-hue='neutral'>
+          <li key={dxn.toString()} className='dx-tag py-0 ps-2 flex items-center gap-1' data-hue='neutral'>
+            <Icon icon={icon} size={4} classNames={styles?.surfaceText} />
             {toLocalizedString(label, t)}
             <IconButton
+              icon='ph--x--bold'
               iconOnly
               variant='ghost'
-              label={t('remove object in context label')}
+              label={t('remove-object-in-context.label')}
               classNames='p-0 hover:bg-transparent'
               size={3}
-              icon='ph--x--bold'
               onClick={() => onUpdateObject?.(dxn, false)}
             />
           </li>
@@ -46,3 +52,6 @@ export const ChatReferences = ({ classNames, context, space }: ChatReferencesPro
     </ul>
   );
 };
+
+// TODO(dmaretskyi): Extract those somewhere else.
+const DEFAULT_OBJECT_ICON = 'ph--cube--regular';

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;