@dxos/plugin-assistant 0.8.4-main.422d1c7879 → 0.8.4-main.43cb759274

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

@@ -7,27 +7,37 @@ 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 } from '@dxos/echo';
-import { ChessPlugin } from '@dxos/plugin-chess';
-import { ClientPlugin } from '@dxos/plugin-client';
+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';
-import { TablePlugin } from '@dxos/plugin-table';
+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 { useQuery, useRegistry, 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 { useContextBinder } from '#hooks';
+import { translations } from '#translations';
 
-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' },
+  {
+    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'>;
@@ -35,17 +45,20 @@ 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 [chat] = useQuery(space?.db, Filter.type(Chat.Chat));
+  const registry = useRegistry();
   const binder = useContextBinder(space, feed);
   const [preset, setPreset] = useState(presets?.[0]?.id);
-  if (!space || !binder) {
+  if (!space || !binder || !chat) {
     return <Loading />;
   }
+
   return (
     <ChatOptions
+      chat={chat}
       db={space.db}
       context={binder}
-      blueprintRegistry={blueprintRegistry}
+      registry={registry}
       presets={presets}
       preset={preset}
       onPresetChange={setPreset}
@@ -63,7 +76,7 @@ const meta = {
       plugins: [
         ...corePlugins(),
         ClientPlugin({
-          types: [Feed.Feed, Organization.Organization, Person.Person],
+          types: [Chat.Chat, Feed.Feed, Organization.Organization, Person.Person],
           onClientInitialized: ({ client }) =>
             Effect.gen(function* () {
               yield* initializeIdentity(client);
@@ -77,7 +90,8 @@ const meta = {
               }
 
               // Create the chat feed used by the context binder.
-              space.db.add(Feed.make());
+              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 }));
             }),
         }),
@@ -104,7 +118,7 @@ export const Default: Story = {
   },
 };
 
-export const ObjectsPanelStory: Story = {
+export const _ObjectsPanel: Story = {
   render: () => {
     const [space] = useSpaces();
     const [feed] = useQuery(space?.db, Filter.type(Feed.Feed));
@@ -114,7 +128,7 @@ export const ObjectsPanelStory: Story = {
     }
 
     return (
-      <div className='flex flex-col w-[300px] h-[300px] border border-separator'>
+      <div className='grid w-[300px] h-[300px] border border-separator'>
         <ObjectsPanel db={space.db} context={binder} />
       </div>
     );

package/src/components/ChatPrompt/ChatOptions.tsx

@@ -2,31 +2,32 @@
 // Copyright 2025 DXOS.org
 //
 
-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 { Annotation, type Database, Filter, Obj, Type } from '@dxos/echo';
-import { useQuery } from '@dxos/react-client/echo';
+import { type AiContext } from '@dxos/assistant';
+import { type Chat as ChatModule, McpServer } from '@dxos/assistant-toolkit';
+import { type Database, Filter, Obj, type Registry, Type } from '@dxos/echo';
+import { useObject, 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 { 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 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',
+  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;
-  blueprintRegistry?: Blueprint.Registry;
+  context: AiContext.Binder;
+  registry?: Registry.Registry;
   presets?: { id: string; label: string }[];
   preset?: string;
   onPresetChange?: (id: string) => void;
@@ -35,11 +36,11 @@ 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, registry, 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')} />
@@ -66,37 +67,39 @@ export const ChatOptions = ({ db, context, blueprintRegistry, presets, preset, o
         <Popover.Portal>
           <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.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 registry={registry} db={db} context={context} />
                   </Tabs.Panel>
-                  <Tabs.Panel value='mcp-servers' tabIndex={-1} classNames='dx-focus-ring-inset'>
+                  <Tabs.Panel tabIndex={-1} classNames='dx-focus-ring-inset overflow-hidden' value='mcp-servers'>
                     <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 tabIndex={-1} classNames='dx-focus-ring-inset overflow-hidden' value='model'>
+                    <ModelsPanel presets={presets} preset={preset} onPresetChange={onPresetChange} />
                   </Tabs.Panel>
-                  <Tabs.Tablist classNames={styles.toolbar}>
-                    <Tabs.IconTab value='model' icon='ph--cpu--regular' label={t('chat-model.title')} />
+                  <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('mcp-servers.title')}
+                      label={t('options.mcp.title')}
                     />
+                    <Tabs.IconTab value='model' icon='ph--cpu--regular' label={t('options.chat-model.title')} />
                   </Tabs.Tablist>
                 </Tabs.Viewport>
               </Tabs.Root>
@@ -109,16 +112,12 @@ export const ChatOptions = ({ db, context, blueprintRegistry, presets, preset, o
   );
 };
 
-const BlueprintsPanel = ({
-  blueprintRegistry,
-  db,
-  context,
-}: Pick<ChatOptionsProps, 'blueprintRegistry' | 'db' | 'context'>) => {
+const BlueprintsPanel = ({ registry, db, context }: Pick<ChatOptionsProps, 'registry' | 'db' | 'context'>) => {
   const { t } = useTranslation(meta.id);
 
-  const blueprints = useBlueprints({ blueprintRegistry, db });
+  const blueprints = useBlueprints({ registry, db });
   const activeBlueprints = useActiveBlueprints({ context });
-  const { onUpdateBlueprint } = useBlueprintHandlers({ db, context, blueprintRegistry });
+  const { onUpdateBlueprint } = useBlueprintHandlers({ db, context, registry });
   const { results, handleSearch } = useSearchListResults({
     items: blueprints,
     extract: (blueprint) => blueprint.name,
@@ -126,28 +125,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,
@@ -184,12 +201,6 @@ const McpServersPanel = ({ db }: McpServersPanelProps) => {
     [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);
@@ -198,31 +209,14 @@ const McpServersPanel = ({ db }: McpServersPanelProps) => {
   );
 
   return (
-    <div className='py-form-chrome space-y-2'>
+    <div className='p-form-chrome'>
       {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>
+        <McpServerRow key={server.id} server={server} onRemove={handleRemove} />
       ))}
       {adding ? (
         <McpServerForm onSubmit={handleAdd} onCancel={() => setAdding(false)} />
       ) : (
-        <div role='none' className='px-form-chrome'>
+        <div>
           <IconButton
             variant='ghost'
             icon='ph--plus--regular'
@@ -235,6 +229,39 @@ const McpServersPanel = ({ db }: McpServersPanelProps) => {
   );
 };
 
+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;
@@ -293,7 +320,7 @@ const McpServerForm = ({ onSubmit, onCancel }: McpServerFormProps) => {
           onChange={(event) => setApiKey(event.target.value)}
         />
       </Input.Root>
-      <div role='none' className='flex gap-2'>
+      <div className='flex gap-2'>
         <IconButton
           variant='ghost'
           icon='ph--check--regular'
@@ -351,13 +378,7 @@ export const ObjectsPanel = ({ db, context }: Pick<ChatOptionsProps, 'db' | 'con
           {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 { icon, hue } = Obj.getIcon(object) ?? { icon: 'ph--cube--regular', hue: undefined };
               const styles = hue ? getStyles(hue) : undefined;
               return (
                 <SearchList.Item
@@ -365,10 +386,10 @@ export const ObjectsPanel = ({ db, context }: Pick<ChatOptionsProps, 'db' | 'con
                   key={object.id}
                   value={object.id}
                   icon={icon}
-                  iconClassNames={styles?.surfaceText}
+                  iconClassNames={styles?.text}
                   label={Obj.getLabel(object) ?? Obj.getTypename(object) ?? object.id}
                   checked={isActive}
-                  onSelect={() => onUpdateObject?.(Obj.getDXN(object), !isActive)}
+                  onSelect={() => onUpdateObject?.(Obj.getURI(object), !isActive)}
                 />
               );
             })
@@ -378,7 +399,7 @@ export const ObjectsPanel = ({ db, context }: Pick<ChatOptionsProps, 'db' | 'con
         </SearchList.Viewport>
       </SearchList.Content>
 
-      <div role='none' className={mx('flex flex-col', styles.toolbar)}>
+      <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>

package/src/components/ChatPrompt/ChatPrompt.tsx

@@ -0,0 +1,182 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useAtomValue } from '@effect-atom/atom-react';
+import * as Option from 'effect/Option';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+
+import { type Chat } from '@dxos/assistant-toolkit';
+import { type Event } from '@dxos/async';
+import { type Database } from '@dxos/echo';
+import { type Merge } from '@dxos/effect';
+import { useVoiceInput } from '@dxos/plugin-transcription';
+import { Input, type ThemedClassName, useDynamicRef, useTranslation } from '@dxos/react-ui';
+import { ChatEditor, type ChatEditorController, type ChatEditorProps } from '@dxos/react-ui-chat';
+import { mx } from '@dxos/ui-theme';
+
+import { useChatKeymapExtensions } from '#hooks';
+import { meta } from '#meta';
+
+import { type AiChatProcessor } from '../../processor';
+import { type ChatEvent } from '../Chat/events';
+import { ChatActions, type ChatActionsProps } from './ChatActions';
+import { ChatMcpErrors } from './ChatMcpErrors';
+import { ChatOptions } from './ChatOptions';
+import { type ChatPresetsProps } from './ChatPresets';
+import { ChatReferences } from './ChatReferences';
+import { ChatStatusIndicator } from './ChatStatusIndicator';
+
+export type ChatPromptProps = ThemedClassName<
+  Merge<
+    {
+      outline?: boolean;
+      settings?: boolean;
+      expandable?: boolean;
+      chat?: Chat.Chat;
+      db?: Database.Database;
+      processor: AiChatProcessor;
+      event: Event<ChatEvent>;
+      online?: boolean;
+      placeholder?: ChatEditorProps['placeholder'];
+      onOnlineChange?: (online: boolean) => void;
+      onPresetChange?: ChatPresetsProps['onChange'];
+    },
+    Omit<ChatPresetsProps, 'onChange'>
+  >
+>;
+
+export const ChatPrompt = ({
+  classNames,
+  outline,
+  chat,
+  db,
+  processor,
+  event,
+  online,
+  placeholder,
+  onOnlineChange,
+  onPresetChange,
+  settings = true,
+  presets,
+  preset,
+}: ChatPromptProps) => {
+  const { t } = useTranslation(meta.id);
+
+  const error = useAtomValue(processor.error).pipe(Option.getOrUndefined);
+  const streaming = useAtomValue(processor.streaming);
+  const active = useAtomValue(processor.active);
+  const activeRef = useDynamicRef(active);
+
+  const editorRef = useRef<ChatEditorController>(null);
+  const [recordingState, setRecordingState] = useState(false);
+  useEffect(() => {
+    return event.on((ev) => {
+      switch (ev.type) {
+        case 'update-prompt':
+          if (!editorRef.current?.getText()?.length) {
+            editorRef.current?.setText(ev.text);
+            editorRef.current?.focus();
+          }
+          break;
+        case 'record-start':
+          setRecordingState(true);
+          break;
+        case 'record-stop':
+          setRecordingState(false);
+          break;
+      }
+    });
+  }, [event]);
+
+  // TODO(burdon): Configure capability in TranscriptionPlugin.
+  const { recording } = useVoiceInput({
+    active: recordingState,
+    onUpdate: (text) => {
+      editorRef.current?.setText(text);
+      editorRef.current?.focus();
+    },
+  });
+
+  const extensions = useChatKeymapExtensions({ event });
+
+  const handleSubmit = useCallback<NonNullable<ChatEditorProps['onSubmit']>>(
+    (text) => {
+      if (!activeRef.current) {
+        event.emit({ type: 'submit', text });
+        return true;
+      }
+    },
+    [event],
+  );
+
+  const handleEvent = useCallback<NonNullable<ChatActionsProps['onEvent']>>(
+    (ev) => {
+      event.emit(ev);
+    },
+    [event],
+  );
+
+  return (
+    <div
+      role='group'
+      className={mx(
+        'flex flex-col w-full dx-density-md',
+        outline &&
+          'bg-group-surface rounded-sm! border border-subdued-separator transition transition-border [&:has(.cm-content:focus)]:border-separator',
+        classNames,
+      )}
+    >
+      <ChatMcpErrors processor={processor} />
+
+      <div className='flex p-2 gap-2'>
+        <ChatStatusIndicator classNames='p-1' preset={preset} error={error} processing={streaming} />
+        <ChatEditor
+          ref={editorRef}
+          autoFocus
+          lineWrapping
+          classNames='col-span-2 pt-0.5'
+          placeholder={placeholder ?? t('prompt.placeholder')}
+          extensions={extensions}
+          onSubmit={handleSubmit}
+        />
+      </div>
+
+      {db && settings && (
+        <div className='flex items-center overflow-hidden p-1.5'>
+          <ChatOptions
+            chat={chat}
+            db={db}
+            registry={processor.registry}
+            context={processor.context}
+            preset={preset}
+            presets={presets}
+            onPresetChange={onPresetChange}
+          />
+
+          <div className='flex h-6 grow overflow-x-auto scrollbar-none'>
+            <ChatReferences db={db} context={processor.context} />
+          </div>
+
+          <ChatActions
+            classNames='col-span-2'
+            microphone={true}
+            recording={recording}
+            processing={streaming}
+            onEvent={handleEvent}
+          >
+            {/* TODO(burdon): Move offline switch into dialog. */}
+            {online !== undefined && (
+              <Input.Root>
+                <Input.Label srOnly>{t('online-switch.label')}</Input.Label>
+                <Input.Switch classNames='mx-1' checked={online} onCheckedChange={onOnlineChange} />
+              </Input.Root>
+            )}
+          </ChatActions>
+        </div>
+      )}
+    </div>
+  );
+};
+
+ChatPrompt.displayName = 'Chat.Prompt';

package/src/components/ChatPrompt/ChatReferences.tsx

@@ -2,11 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Option from 'effect/Option';
 import React from 'react';
 
-import { type AiContextBinder } from '@dxos/assistant';
-import { Annotation, type Database, Obj } from '@dxos/echo';
+import { type AiContext } from '@dxos/assistant';
+import { 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';
 
@@ -14,7 +13,7 @@ import { useContextObjects } from '#hooks';
 import { meta } from '#meta';
 
 export type ChatReferencesProps = ThemedClassName<{
-  context: AiContextBinder;
+  context: AiContext.Binder;
   db: Database.Database;
 }>;
 
@@ -25,26 +24,23 @@ export const ChatReferences = ({ classNames, context, db }: ChatReferencesProps)
   return (
     <ul className={mx('flex', classNames)}>
       {objects.map((obj) => {
-        const dxn = Obj.getDXN(obj);
+        const uri = Obj.getURI(obj);
         const typename = Obj.getTypename(obj);
         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 { icon, hue } = Obj.getIcon(obj) ?? { icon: DEFAULT_OBJECT_ICON, hue: undefined };
         const styles = hue ? getStyles(hue) : undefined;
         return (
-          <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} />
+          <li key={uri.toString()} className='dx-tag py-0 flex items-center gap-1' data-hue='neutral'>
+            <Icon icon={icon} size={4} />
             {toLocalizedString(label, t)}
             <IconButton
               icon='ph--x--bold'
               iconOnly
               variant='ghost'
-              label={t('remove-object-in-context.label')}
+              label={t('remove-object.label')}
               classNames='p-0 hover:bg-transparent'
               size={3}
-              onClick={() => onUpdateObject?.(dxn, false)}
+              onClick={() => onUpdateObject?.(uri, false)}
             />
           </li>
         );