@dxos/plugin-assistant 0.8.4-main.f5c0578 → 0.8.4-main.fcfe5033a5

package/src/components/ChatPrompt/ChatOptions.tsx

@@ -2,58 +2,403 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { useMemo } 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 { DropdownMenu, Icon, IconButton, useTranslation } from '@dxos/react-ui';
+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 { useBlueprints } from '../../hooks';
-import { meta } from '../../meta';
+import { useActiveBlueprints, useBlueprintHandlers, useBlueprints, useContextObjects, useFilteredTypes } from '#hooks';
+import { meta } from '#meta';
+
+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 = {
-  context?: AiContextBinder;
+  db: Database.Database;
+  context: AiContextBinder;
   blueprintRegistry?: Blueprint.Registry;
-  onUpdateBlueprint?: (key: string, isActive: boolean) => void;
+  presets?: { id: string; label: string }[];
+  preset?: string;
+  onPresetChange?: (id: string) => void;
 };
 
 /**
  * Manages the runtime context for the chat.
  */
-// TODO(burdon): Refactor this as a Dialog (and move the object selector here also).
-export const ChatOptions = ({ context, blueprintRegistry, onUpdateBlueprint }: ChatOptionsProps) => {
+export const ChatOptions = ({ db, context, blueprintRegistry, presets, preset, onPresetChange }: ChatOptionsProps) => {
   const { t } = useTranslation(meta.id);
 
-  // TODO(burdon): Possibly constrain query as registry grows.
-  const blueprints = useMemo(() => blueprintRegistry?.query() ?? [], [blueprintRegistry]);
+  return (
+    <div role='none' className='flex p-2'>
+      <Popover.Root>
+        <Popover.Trigger asChild>
+          <IconButton variant='ghost' icon='ph--plus--regular' iconOnly label={t('context-objects.button')} />
+        </Popover.Trigger>
+        <Popover.Portal>
+          <Popover.Content side='top' classNames={styles.panel}>
+            <Popover.Viewport>
+              <ObjectsPanel db={db} context={context} />
+            </Popover.Viewport>
+            <Popover.Arrow />
+          </Popover.Content>
+        </Popover.Portal>
+      </Popover.Root>
+
+      <Popover.Root>
+        <Popover.Trigger asChild>
+          <IconButton
+            variant='ghost'
+            icon='ph--sliders-horizontal--regular'
+            iconOnly
+            label={t('context-settings.button')}
+          />
+        </Popover.Trigger>
+        <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.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>
+      </Popover.Root>
+    </div>
+  );
+};
+
+const BlueprintsPanel = ({
+  blueprintRegistry,
+  db,
+  context,
+}: Pick<ChatOptionsProps, 'blueprintRegistry' | 'db' | 'context'>) => {
+  const { t } = useTranslation(meta.id);
 
-  const activeBlueprints = useBlueprints({ context });
+  const blueprints = useBlueprints({ blueprintRegistry, db });
+  const activeBlueprints = useActiveBlueprints({ context });
+  const { onUpdateBlueprint } = useBlueprintHandlers({ db, context, blueprintRegistry });
+  const { results, handleSearch } = useSearchListResults({
+    items: blueprints,
+    extract: (blueprint) => blueprint.name,
+  });
 
   return (
-    <DropdownMenu.Root>
-      <DropdownMenu.Trigger asChild>
-        <IconButton icon='ph--plus--regular' variant='ghost' size={5} iconOnly label={t('button add blueprint')} />
-      </DropdownMenu.Trigger>
-      <DropdownMenu.Portal>
-        <DropdownMenu.Content side='left'>
-          <DropdownMenu.Viewport>
-            {blueprints.map((blueprint) => (
-              <DropdownMenu.CheckboxItem
+    <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}
-                checked={activeBlueprints?.get(blueprint.key) !== undefined}
-                onCheckedChange={(checked) => onUpdateBlueprint?.(blueprint.key, !!checked)}
-                classNames='gap-2'
-              >
-                <div className='flex-1 min-is-0'>{blueprint.name}</div>
-                <DropdownMenu.ItemIndicator asChild>
-                  <Icon icon='ph--check--regular' size={4} />
-                </DropdownMenu.ItemIndicator>
-              </DropdownMenu.CheckboxItem>
-            ))}
-          </DropdownMenu.Viewport>
-          <DropdownMenu.Arrow />
-        </DropdownMenu.Content>
-      </DropdownMenu.Portal>
-    </DropdownMenu.Root>
+                value={blueprint.key}
+                label={blueprint.name}
+                checked={isActive}
+                onSelect={() => onUpdateBlueprint?.(blueprint.key, !isActive)}
+              />
+            );
+          })}
+        </SearchList.Viewport>
+      </SearchList.Content>
+      <SearchList.Input placeholder={t('search.placeholder')} classNames='mb-form-chrome' autoFocus />
+    </SearchList.Root>
+  );
+};
+
+const ModelsPanel = ({
+  presets,
+  preset,
+  onPresetChange,
+}: Pick<ChatOptionsProps, 'presets' | 'preset' | 'onPresetChange'>) => {
+  return (
+    <Listbox.Root value={preset} onValueChange={onPresetChange} autoFocus>
+      {presets?.map(({ id, label }) => {
+        return (
+          <Listbox.Option key={id} value={id}>
+            <Listbox.OptionLabel>{label}</Listbox.OptionLabel>
+            <Listbox.OptionIndicator />
+          </Listbox.Option>
+        );
+      })}
+    </Listbox.Root>
+  );
+};
+
+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__';
+
+/** @private */
+export const ObjectsPanel = ({ db, context }: Pick<ChatOptionsProps, 'db' | 'context'>): JSX.Element => {
+  const { t } = useTranslation(meta.id);
+
+  // Item types sorted by label.
+  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 }),
+      };
+    });
+
+    typenames.sort((a, b) => a.label.localeCompare(b.label));
+    return typenames;
+  }, [types]);
+
+  // Current type and filter.
+  const [typename, setTypename] = useState<string>(ANY);
+  const anyFilter = useMemo(
+    () => Filter.or(...typenames.map(({ typename }) => Filter.typename(typename))),
+    [typenames],
+  );
+
+  // Context objects.
+  const objects = useQuery(db, typename === ANY ? anyFilter : Filter.typename(typename));
+  const { objects: contextObjects, onUpdateObject } = useContextObjects({ db, context });
+  const { results, handleSearch } = useSearchListResults({
+    items: objects,
+    extract: (object) => Obj.getLabel(object) ?? Obj.getTypename(object) ?? object.id,
+  });
+
+  return (
+    <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={mx('flex flex-col', styles.toolbar)}>
+        <Select.Root value={typename === ANY ? undefined : typename} onValueChange={setTypename}>
+          <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>
+                {typenames.map(({ typename, label }) => (
+                  <Select.Option key={typename} value={typename}>
+                    {label}
+                  </Select.Option>
+                ))}
+              </Select.Viewport>
+              <Select.ScrollDownButton />
+              <Select.Arrow />
+            </Select.Content>
+          </Select.Portal>
+        </Select.Root>
+        <SearchList.Input placeholder={t('search.placeholder')} autoFocus />
+      </div>
+    </SearchList.Root>
   );
 };

package/src/components/ChatPrompt/ChatPresets.tsx

@@ -22,6 +22,7 @@ export const ChatPresets = ({ presets, preset, onChange }: ChatPresetsProps) =>
             {label}
           </Select.Option>
         ))}
+        <Select.Arrow />
       </Select.Content>
     </Select.Root>
   );

package/src/components/ChatPrompt/ChatReferences.tsx

@@ -2,54 +2,56 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { useCallback } from 'react';
+import * as Option from 'effect/Option';
+import React from 'react';
 
 import { type AiContextBinder } from '@dxos/assistant';
-import { type Space } from '@dxos/client/echo';
-import { Filter, Obj, Ref } from '@dxos/echo';
-import { type ThemedClassName, useAsyncState, useTranslation } from '@dxos/react-ui';
-import { TagPicker, type TagPickerItemData, type TagPickerOptions } from '@dxos/react-ui-tag-picker';
-import { mx } from '@dxos/react-ui-theme';
-import { isNonNullable } from '@dxos/util';
+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 { meta } from '../../meta';
+import { useContextObjects } from '#hooks';
+import { meta } from '#meta';
 
 export type ChatReferencesProps = ThemedClassName<{
-  space: Space;
   context: AiContextBinder;
-  onUpdate?: (dxns: string[]) => void;
+  db: Database.Database;
 }>;
 
-export const ChatReferences = ({ classNames, space, context, onUpdate }: ChatReferencesProps) => {
+export const ChatReferences = ({ classNames, context, db }: ChatReferencesProps) => {
   const { t } = useTranslation(meta.id);
-
-  const [items] = useAsyncState<TagPickerItemData[]>(async () => {
-    const objects = await Ref.Array.loadAll(context.objects.value ?? []);
-    return objects
-      .filter(isNonNullable)
-      .map((obj) => ({ id: Obj.getDXN(obj).toString(), label: Obj.getLabel(obj) ?? Obj.getTypename(obj) ?? obj.id }));
-  }, [context]);
-
-  const handleSearch = useCallback<NonNullable<TagPickerOptions['onSearch']>>(
-    (text, dxns) => {
-      // TODO(burdon): Filter by Item tag (e.g., exclude "contacts") and Query by object label.
-      // TODO(burdon): Change to Filter.text().
-      const objects = space.db.query(Filter.everything()).runSync();
-      return objects
-        .map(({ object }) => ({ id: Obj.getDXN(object).toString(), label: Obj.getLabel(object) ?? '' }))
-        .filter(({ id, label }) => !dxns.includes(id) && label.toLocaleLowerCase().includes(text.toLocaleLowerCase()));
-    },
-    [space],
-  );
+  const { objects, onUpdateObject } = useContextObjects({ db, context });
 
   return (
-    <TagPicker
-      classNames={mx('h-[1.75rem] text-sm', classNames)}
-      mode='multi-select'
-      placeholder={t('context objects placeholder')}
-      items={items}
-      onSearch={handleSearch}
-      onUpdate={onUpdate}
-    />
+    <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 { 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 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')}
+              classNames='p-0 hover:bg-transparent'
+              size={3}
+              onClick={() => onUpdateObject?.(dxn, false)}
+            />
+          </li>
+        );
+      })}
+    </ul>
   );
 };
+
+// TODO(dmaretskyi): Extract those somewhere else.
+const DEFAULT_OBJECT_ICON = 'ph--cube--regular';

package/src/components/ChatPrompt/ChatStatusIndicator.tsx

@@ -4,36 +4,39 @@
 
 import React, { useEffect, useState } from 'react';
 
-import { Icon, Tooltip, useTimeout } from '@dxos/react-ui';
-import { Spinner } from '@dxos/react-ui-sfx';
-import { errorText } from '@dxos/react-ui-theme';
+import { type ThemedClassName, Tooltip, useTimeout } from '@dxos/react-ui';
+import { Spinner, type SpinnerProps } from '@dxos/react-ui-sfx';
+import { mx } from '@dxos/ui-theme';
 
-export type ChatStatusIndicatorProps = {
-  preset?: string;
-  error?: Error;
-  processing?: boolean;
-};
+const period = 3_000;
+
+export type ChatStatusIndicatorProps = ThemedClassName<
+  {
+    preset?: string;
+    processing?: boolean;
+    error?: Error;
+  } & Pick<SpinnerProps, 'size' | 'onClick'>
+>;
 
-export const ChatStatusIndicator = ({ preset, error, processing }: ChatStatusIndicatorProps) => {
+export const ChatStatusIndicator = ({ classNames, preset, processing, error, ...props }: ChatStatusIndicatorProps) => {
   const [init, setInit] = useState(false);
-  useEffect(() => {
-    setInit(false);
-  }, [preset]);
+  useEffect(() => setInit(false), [preset]);
   useTimeout(
     async () => {
       setInit(true);
     },
-    1_500,
+    period / 2,
     [preset],
   );
 
-  if (error) {
-    return (
-      <Tooltip.Trigger content={error.message} delayDuration={0}>
-        <Icon icon='ph--warning-circle--regular' classNames={errorText} size={5} />
-      </Tooltip.Trigger>
-    );
-  }
-
-  return <Spinner state={!init ? 'flash' : processing ? 'spin' : 'pulse'} />;
+  return (
+    <div role='none' className={mx('relative flex', classNames)}>
+      <Spinner duration={period} state={!init ? 'flash' : error ? 'error' : processing ? 'spin' : 'pulse'} {...props} />
+      {error && (
+        <Tooltip.Trigger asChild content={error.message}>
+          <div className='absolute inset-0' />
+        </Tooltip.Trigger>
+      )}
+    </div>
+  );
 };