@dxos/plugin-assistant 0.8.4-main.28f8d3d → 0.8.4-main.2c6827d

package/src/components/ChatPrompt/ChatOptions.tsx

@@ -2,58 +2,227 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { useMemo } from 'react';
+import React, { type JSX, useMemo, useState } from 'react';
 
 import { type AiContextBinder } from '@dxos/assistant';
 import { type Blueprint } from '@dxos/blueprints';
-import { DropdownMenu, Icon, IconButton, useTranslation } from '@dxos/react-ui';
+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 { Tabs } from '@dxos/react-ui-tabs';
 
-import { useBlueprints } from '../../hooks';
+import { useActiveBlueprints, useBlueprintHandlers, useBlueprints, useContextObjects, useItemTypes } from '../../hooks';
 import { meta } from '../../meta';
 
+const panelClassNames = 'is-[calc(100dvw-.5rem)] sm:is-max md:is-72 max-is-[--text-content]';
+
 export type ChatOptionsProps = {
-  context?: AiContextBinder;
+  space: Space;
+  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 = ({
+  space,
+  context,
+  blueprintRegistry,
+  presets,
+  preset,
+  onPresetChange,
+}: ChatOptionsProps) => {
+  const { t } = useTranslation(meta.id);
+
+  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={panelClassNames}>
+            <Popover.Viewport>
+              <ObjectsPanel space={space} 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={panelClassNames}>
+            <Popover.Viewport>
+              <Tabs.Root orientation='horizontal' defaultValue='blueprints' defaultActivePart='list' tabIndex={-1}>
+                <Tabs.Viewport classNames='max-bs-[--radix-popover-content-available-height] grid grid-rows-[1fr_min-content] [&_[cmdk-root]]:contents [&_[role="tabpanel"]]:grid [&_[role="tabpanel"]]:grid-rows-[1fr_min-content] [&_[role="listbox"]]:min-bs-0 [&_[role="listbox"]]:overflow-y-auto [&_[role="tabpanel"]]:min-bs-0 [&_[role="tabpanel"]]:pli-cardSpacingChrome [&_[role="tabpanel"][data-state="active"]]:order-first [&_[role="tabpanel"][data-state="inactive"]]:hidden'>
+                  <Tabs.Tabpanel value='blueprints' tabIndex={-1} classNames='dx-focus-ring-inset'>
+                    <BlueprintsPanel blueprintRegistry={blueprintRegistry} space={space} context={context} />
+                  </Tabs.Tabpanel>
+                  <Tabs.Tabpanel value='model' tabIndex={-1} classNames='dx-focus-ring-inset !pli-0'>
+                    <ModelsPanel presets={presets} preset={preset} onPresetChange={onPresetChange} />
+                  </Tabs.Tabpanel>
+                  <Tabs.Tablist classNames='sm:overflow-x-hidden justify-center p-[--dx-cardSpacingChrome] border-bs border-subduedSeparator order-last'>
+                    <Tabs.IconTab
+                      value='blueprints'
+                      icon='ph--blueprint--regular'
+                      label={t('blueprints in context title')}
+                    />
+                    <Tabs.IconTab value='model' label={t('chat model title')} icon='ph--cpu--regular' />
+                  </Tabs.Tablist>
+                </Tabs.Viewport>
+              </Tabs.Root>
+            </Popover.Viewport>
+            <Popover.Arrow />
+          </Popover.Content>
+        </Popover.Portal>
+      </Popover.Root>
+    </div>
+  );
+};
+
+const BlueprintsPanel = ({
+  blueprintRegistry,
+  space,
+  context,
+}: Pick<ChatOptionsProps, 'blueprintRegistry' | 'space' | 'context'>) => {
+  const { t } = useTranslation(meta.id);
+
+  const blueprints = useBlueprints({ blueprintRegistry, space });
+  const activeBlueprints = useActiveBlueprints({ context });
+  const { onUpdateBlueprint } = useBlueprintHandlers({ space, context, blueprintRegistry });
+
+  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.Content>
+      <SearchList.Input placeholder={t('search placeholder')} classNames='mbe-cardSpacingChrome' 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>
+  );
+};
+
+const ANY = '__any__';
+
+const ObjectsPanel = ({ space, context }: Pick<ChatOptionsProps, 'space' | 'context'>): JSX.Element => {
   const { t } = useTranslation(meta.id);
 
-  // TODO(burdon): Possibly constrain query as registry grows.
-  const blueprints = useMemo(() => blueprintRegistry?.query() ?? [], [blueprintRegistry]);
+  // Item types sorted by label.
+  const types = useItemTypes(space);
+  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]);
 
-  const activeBlueprints = useBlueprints({ context });
+  // 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(space, typename === ANY ? anyFilter : Filter.typename(typename));
+  const { objects: contextObjects, onUpdateObject } = useContextObjects({ space, context });
 
   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
-                key={blueprint.key}
-                checked={activeBlueprints?.get(blueprint.key) !== undefined}
-                onCheckedChange={(checked) => onUpdateBlueprint?.(blueprint.key, !!checked)}
-                classNames='gap-2'
+    <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='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>
+                <div className='grow truncate'>{label}</div>
+                <Icon icon='ph--check--regular' classNames={[!isActive && 'invisible']} />
+              </SearchList.Item>
+            );
+          })
+        ) : (
+          <SearchList.Item>{t('no results')}</SearchList.Item>
+        )}
+      </SearchList.Content>
+
+      <div role='none' className='grid grid-cols-[min-content_1fr] gap-2 pli-cardSpacingChrome mbe-cardSpacingChrome'>
+        <Select.Root value={typename === ANY ? undefined : typename} onValueChange={setTypename}>
+          <Select.TriggerButton density='fine' placeholder={t('type filter placeholder')} />
+          <Select.Portal>
+            <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')} classNames='mbe-0' 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,47 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { useCallback } from 'react';
+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 { 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 { isNonNullable } from '@dxos/util';
 
+import { useContextObjects } from '../../hooks';
 import { meta } from '../../meta';
 
 export type ChatReferencesProps = ThemedClassName<{
-  space: Space;
   context: AiContextBinder;
-  onUpdate?: (dxns: string[]) => void;
+  space: Space;
 }>;
 
-export const ChatReferences = ({ classNames, space, context, onUpdate }: ChatReferencesProps) => {
+export const ChatReferences = ({ classNames, context, space }: 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({ space, 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);
+        return (
+          <li key={dxn.toString()} className='dx-tag plb-0 pis-2 flex items-center' data-hue='neutral'>
+            {toLocalizedString(label, t)}
+            <IconButton
+              icon='ph--x--bold'
+              iconOnly
+              variant='ghost'
+              label={t('remove object in context label')}
+              classNames='p-0 hover:bg-transparent'
+              size={3}
+              onClick={() => onUpdateObject?.(dxn, false)}
+            />
+          </li>
+        );
+      })}
+    </ul>
   );
 };

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/react-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>
+  );
 };