@dxos/plugin-assistant 0.8.4-main.67995b8 → 0.8.4-main.ae835ea

package/src/components/ChatCompanion.tsx

@@ -0,0 +1,136 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Array from 'effect/Array';
+import * as Effect from 'effect/Effect';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
+import React, { useMemo } from 'react';
+
+import { Capabilities, createIntent, useCapabilities, useIntentDispatcher } from '@dxos/app-framework';
+import { Blueprint } from '@dxos/blueprints';
+import { getSpace } from '@dxos/client/echo';
+import { Filter, Obj, Query, Ref } from '@dxos/echo';
+import { DatabaseService } from '@dxos/functions';
+import { SpaceAction } from '@dxos/plugin-space/types';
+import { useQuery } from '@dxos/react-client/echo';
+import { useAsyncEffect } from '@dxos/react-ui';
+
+import { ChatContainer } from '../components';
+import { useBlueprintRegistry, useContextBinder } from '../hooks';
+import { Assistant, AssistantAction } from '../types';
+
+export type ChatCompanionProps = {
+  role?: string;
+  data: { companionTo: Obj.Any; subject: Assistant.Chat | 'assistant-chat' };
+};
+
+export const ChatCompanion = ({ role, data }: ChatCompanionProps) => {
+  const companionTo = data.companionTo;
+  const space = getSpace(companionTo);
+  const chat = data.subject === 'assistant-chat' ? undefined : data.subject;
+  const blueprintRegistry = useBlueprintRegistry();
+  const binder = useContextBinder(chat);
+  const { dispatch } = useIntentDispatcher();
+
+  // Initialize companion chat if it doesn't exist.
+  useAsyncEffect(async () => {
+    if (chat || !space) {
+      return;
+    }
+
+    // TODO(burdon): Garbage collection of queues?
+    // TODO(wittjosiah): Figure out how to prevent companion chats from showing up in the navtree.
+    await Effect.gen(function* () {
+      const { objects } = yield* DatabaseService.runQuery(
+        Query.select(Filter.ids(companionTo.id)).targetOf(Assistant.CompanionTo).source(),
+      );
+
+      // TODO(wittjosiah): This should be the default sort order.
+      let nextChat = objects.toSorted((a, b) => a.id.localeCompare(b.id)).at(-1);
+      if (!nextChat) {
+        const { object } = yield* dispatch(createIntent(AssistantAction.CreateChat, { space }));
+        nextChat = object;
+        yield* dispatch(createIntent(SpaceAction.AddObject, { object: nextChat, target: space, hidden: true }));
+        yield* dispatch(
+          createIntent(SpaceAction.AddRelation, {
+            space,
+            schema: Assistant.CompanionTo,
+            source: nextChat,
+            target: data.companionTo,
+          }),
+        );
+      }
+
+      yield* dispatch(createIntent(AssistantAction.SetCurrentChat, { companionTo, chat: nextChat }));
+    }).pipe(Effect.provide(DatabaseService.layer(space.db)), Effect.runPromise);
+  }, [space, chat, companionTo]);
+
+  const metadata = useCapabilities(Capabilities.Metadata);
+  const blueprintKeys = useMemo(
+    () =>
+      Function.pipe(
+        metadata,
+        Array.findFirst(
+          (capability): capability is { id: string; metadata: { blueprints?: string[] } } =>
+            capability.id === Obj.getTypename(companionTo),
+        ),
+        Option.flatMap((c) => Option.fromNullable(c.metadata.blueprints)),
+        Option.getOrElse(() => [] as string[]),
+      ),
+    [metadata, companionTo],
+  );
+  const existingBlueprints = useQuery(space, Filter.type(Blueprint.Blueprint));
+  const pluginBlueprints = useMemo(
+    () => existingBlueprints.filter((blueprint) => blueprintKeys.includes(blueprint.key)),
+    [existingBlueprints, blueprintKeys],
+  );
+
+  // Initialize related blueprints that are not already in the space.
+  useAsyncEffect(async () => {
+    if (!space) {
+      return;
+    }
+
+    // NOTE: This must be run instead of using the useQuery result to avoid duplicates.
+    const { objects: existingBlueprints } = await space.db.query(Filter.type(Blueprint.Blueprint)).run();
+    for (const key of blueprintKeys) {
+      const existingBlueprint = existingBlueprints.find((blueprint) => blueprint.key === key);
+      if (existingBlueprint) {
+        continue;
+      }
+
+      const blueprint = blueprintRegistry.getByKey(key);
+      if (!blueprint) {
+        continue;
+      }
+
+      space.db.add(Obj.clone(blueprint));
+    }
+  }, [space, blueprintRegistry, blueprintKeys]);
+
+  useAsyncEffect(async () => {
+    if (!binder) {
+      return;
+    }
+
+    if (pluginBlueprints.length > 0) {
+      await binder.bind({ blueprints: pluginBlueprints.map((blueprint) => Ref.make(blueprint)) });
+    }
+
+    if (Obj.instanceOf(Blueprint.Blueprint, companionTo)) {
+      await binder.bind({ blueprints: [Ref.make(companionTo)] });
+    } else {
+      await binder.bind({ objects: [Ref.make(companionTo)] });
+    }
+  }, [binder, companionTo, pluginBlueprints]);
+
+  if (!chat) {
+    return null;
+  }
+
+  return <ChatContainer role={role} chat={chat} companionTo={companionTo} />;
+};
+
+export default ChatCompanion;

package/src/components/ChatContainer.tsx

@@ -5,37 +5,43 @@
 import React from 'react';
 
 import { Capabilities, useCapability } from '@dxos/app-framework';
-import { type AssociatedArtifact } from '@dxos/blueprints';
 import { getSpace } from '@dxos/client/echo';
+import { type Obj } from '@dxos/echo';
 import { StackItem } from '@dxos/react-ui-stack';
 
-import { Chat } from './Chat';
-import { useChatProcessor, useChatServices } from '../hooks';
+import { useBlueprintRegistry, useChatProcessor, useChatServices, useOnline, usePresets } from '../hooks';
 import { meta } from '../meta';
 import { type Assistant } from '../types';
 
+import { Chat } from './Chat';
+import { ChatToolbar } from './ChatToolbar';
+
 export type ChatContainerProps = {
-  role: string;
   chat: Assistant.Chat;
-  artifact?: AssociatedArtifact;
+  companionTo?: Obj.Any;
+  role?: string;
 };
 
-export const ChatContainer = ({ role, chat, artifact }: ChatContainerProps) => {
+export const ChatContainer = ({ chat, companionTo }: ChatContainerProps) => {
   const space = getSpace(chat);
   const settings = useCapability(Capabilities.SettingsStore).getStore<Assistant.Settings>(meta.id)?.value;
-  const services = useChatServices({ space });
-  const processor = useChatProcessor({ chat, services, settings });
+  const services = useChatServices({ space, chat });
+  const [online, setOnline] = useOnline();
+  const { preset, ...chatProps } = usePresets(online);
+  const blueprintRegistry = useBlueprintRegistry();
+  const processor = useChatProcessor({ chat, preset, services, blueprintRegistry, settings });
+
   if (!processor) {
     return null;
   }
 
-  // TODO(burdon): Add attention attributes.
   return (
-    <StackItem.Content classNames='container-max-width'>
-      <Chat.Root chat={chat} processor={processor} artifact={artifact}>
+    <StackItem.Content toolbar>
+      <ChatToolbar chat={chat} companionTo={companionTo} />
+      <Chat.Root classNames='container-max-width' chat={chat} processor={processor}>
         <Chat.Thread />
-        <div className='pbe-4 pis-2 pie-2'>
-          <Chat.Prompt classNames='border border-subduedSeparator rounded-md' />
+        <div className='p-2'>
+          <Chat.Prompt {...chatProps} outline preset={preset?.id} online={online} onOnlineChange={setOnline} />
         </div>
       </Chat.Root>
     </StackItem.Content>

package/src/components/ChatDialog.tsx

@@ -4,16 +4,17 @@
 
 import React, { useCallback, useState } from 'react';
 
-import { useCapability, Capabilities } from '@dxos/app-framework';
+import { Capabilities, useCapability } from '@dxos/app-framework';
 import { getSpace } from '@dxos/client/echo';
 import { useTranslation } from '@dxos/react-ui';
-import { ChatDialog as NativeChatDialog } from '@dxos/react-ui-chat';
+import { ChatDialog as NaturalChatDialog } from '@dxos/react-ui-chat';
 
-import { Chat, type ChatRootProps } from './Chat';
-import { useChatProcessor, useChatServices } from '../hooks';
+import { useBlueprintRegistry, useChatProcessor, useChatServices, useOnline, usePresets } from '../hooks';
 import { meta } from '../meta';
 import { type Assistant } from '../types';
 
+import { Chat, type ChatRootProps } from './Chat';
+
 export type ChatDialogProps = {
   chat?: Assistant.Chat;
 };
@@ -23,8 +24,11 @@ export const ChatDialog = ({ chat }: ChatDialogProps) => {
 
   const space = getSpace(chat);
   const settings = useCapability(Capabilities.SettingsStore).getStore<Assistant.Settings>(meta.id)?.value;
-  const services = useChatServices({ space });
-  const processor = useChatProcessor({ chat, services, settings });
+  const services = useChatServices({ space, chat });
+  const [online, setOnline] = useOnline();
+  const { preset, ...chatProps } = usePresets(online);
+  const blueprintRegistry = useBlueprintRegistry();
+  const processor = useChatProcessor({ chat, preset, services, blueprintRegistry, settings });
 
   // TODO(burdon): Refocus when open.
   const [open, setOpen] = useState(true);
@@ -48,15 +52,15 @@ export const ChatDialog = ({ chat }: ChatDialogProps) => {
 
   return (
     <Chat.Root chat={chat} processor={processor} onEvent={handleEvent}>
-      <NativeChatDialog.Root open={open} expanded={expanded} onOpenChange={setOpen}>
-        <NativeChatDialog.Header title={t('assistant dialog title')} />
-        <NativeChatDialog.Content>
+      <NaturalChatDialog.Root open={open} expanded={expanded} onOpenChange={setOpen}>
+        <NaturalChatDialog.Header title={t('assistant dialog title')} />
+        <NaturalChatDialog.Content>
           <Chat.Thread />
-        </NativeChatDialog.Content>
-        <NativeChatDialog.Footer>
-          <Chat.Prompt expandable />
-        </NativeChatDialog.Footer>
-      </NativeChatDialog.Root>
+        </NaturalChatDialog.Content>
+        <NaturalChatDialog.Footer classNames='p-1.5'>
+          <Chat.Prompt {...chatProps} preset={preset?.id} online={online} onOnlineChange={setOnline} expandable />
+        </NaturalChatDialog.Footer>
+      </NaturalChatDialog.Root>
     </Chat.Root>
   );
 };

package/src/components/ChatProgress/ChatProgress.tsx

@@ -0,0 +1,67 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+
+import { addEventListener } from '@dxos/async';
+import { Flex, ProgressBar, type ProgressBarProps, TextCrawl, useExecutionGraph } from '@dxos/react-ui-components';
+
+import { type Assistant } from '../../types';
+
+// TODO(burdon): Reset after each session.
+// TODO(burdon): Show after delay.
+// TODO(burdon): Test with errors.
+// TODO(burdon): Filter out empty trace messages.
+
+// {
+//   "id": "01K3TE3C2VAXETP500QKDHK3C4_block_3",
+//   "branch": "main",
+//   "parents": [],
+//   "icon": "ph--robot--regular",
+//   "message": "\n"
+// }
+
+export type ChatProgressProps = {
+  chat: Assistant.Chat;
+};
+
+export const ChatProgress = ({ chat }: ChatProgressProps) => {
+  const { commits } = useExecutionGraph(chat.traceQueue?.target, true);
+  const nodes = useMemo(() => commits.map((commit) => ({ id: commit.id, message: commit.message })), [commits]);
+  const lines = useMemo(() => commits.map((commit) => commit.message), [commits]);
+
+  const [index, setIndex] = useState<number | undefined>(undefined);
+  const handleSelect = useCallback<NonNullable<ProgressBarProps['onSelect']>>(({ index }) => {
+    setIndex((current) => {
+      return current === index ? undefined : index;
+    });
+  }, []);
+
+  const ref = useRef<HTMLDivElement>(null);
+  useEffect(() => {
+    if (!ref.current) {
+      return;
+    }
+
+    return addEventListener(ref.current, 'keydown', (event) => {
+      switch (event.key) {
+        case 'ArrowLeft': {
+          setIndex((current) => (current === undefined || current <= 0 ? 0 : current - 1));
+          break;
+        }
+        case 'ArrowRight': {
+          setIndex((current) => (current === undefined || current >= nodes.length ? nodes.length - 1 : current + 1));
+          break;
+        }
+      }
+    });
+  }, [nodes.length]);
+
+  return (
+    <Flex column tabIndex={0} ref={ref} classNames='outline-none'>
+      <ProgressBar nodes={nodes} index={index} onSelect={handleSelect} />
+      <TextCrawl lines={lines} index={index} autoAdvance classNames='pis-4 text-sm text-subdued' />
+    </Flex>
+  );
+};

package/src/components/{SequenceEditor → ChatProgress}/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './SequenceEditor';
+export * from './ChatProgress';

package/src/components/ChatPrompt/ChatActions.tsx

@@ -26,34 +26,20 @@ export const ChatActions = ({ classNames, children, microphone, recording, proce
     <div className={mx('flex items-center mie-1', classNames)}>
       {children}
 
-      {(processing && (
-        <IconButton
-          disabled={!processing}
-          classNames='px-1.5'
-          variant='ghost'
-          size={5}
-          icon='ph--x--regular'
-          iconOnly
-          label={t('button cancel processing')}
-          onClick={() => onEvent?.({ type: 'cancel' })}
-        />
-      )) || (
-        <IconButton
-          disabled
-          classNames='px-1.5'
-          variant='ghost'
-          size={5}
-          icon='ph--arrow-down--regular'
-          iconOnly
-          label={t('button scroll down')}
-          onClick={() => onEvent?.({ type: 'scroll-to-bottom' })}
-        />
-      )}
+      <IconButton
+        disabled={!processing}
+        variant='ghost'
+        size={5}
+        icon='ph--x--regular'
+        iconOnly
+        label={t('button cancel processing')}
+        onClick={() => onEvent?.({ type: 'cancel' })}
+      />
 
       {microphone && (
         <IconButton
           disabled={!processing}
-          classNames={mx('px-1.5', recording && 'bg-primary-500')}
+          classNames={mx(recording && 'bg-primary-500')}
           variant='ghost'
           size={5}
           icon='ph--microphone--regular'

package/src/components/ChatPrompt/ChatOptions.tsx

@@ -0,0 +1,225 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { type JSX, useMemo, useState } from 'react';
+
+import { type AiContextBinder } from '@dxos/assistant';
+import { type Blueprint } from '@dxos/blueprints';
+import { Filter, Obj, Type } from '@dxos/echo';
+import { type Space, useQuery } from '@dxos/react-client/echo';
+import { Icon, IconButton, Popover, Select, useTranslation } from '@dxos/react-ui';
+import { Listbox, SearchList } from '@dxos/react-ui-searchlist';
+import { Tabs } from '@dxos/react-ui-tabs';
+
+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 = {
+  space: Space;
+  context: AiContextBinder;
+  blueprintRegistry?: Blueprint.Registry;
+  presets?: { id: string; label: string }[];
+  preset?: string;
+  onPresetChange?: (id: string) => void;
+};
+
+/**
+ * Manages the runtime context for the chat.
+ */
+export const ChatOptions = ({
+  space,
+  context,
+  blueprintRegistry,
+  presets,
+  preset,
+  onPresetChange,
+}: ChatOptionsProps) => {
+  const { t } = useTranslation(meta.id);
+
+  return (
+    <div role='none' className='flex gap-0.5'>
+      <Popover.Root>
+        <Popover.Trigger asChild>
+          <IconButton variant='ghost' icon='ph--plus--regular' iconOnly size={5} label={t('button context objects')} />
+        </Popover.Trigger>
+        <Popover.Portal>
+          <Popover.Content side='top' classNames={panelClassNames}>
+            <ObjectsPanel space={space} context={context} />
+            <Popover.Arrow />
+          </Popover.Content>
+        </Popover.Portal>
+      </Popover.Root>
+
+      <Popover.Root>
+        <Popover.Trigger asChild>
+          <IconButton
+            variant='ghost'
+            icon='ph--sliders-horizontal--regular'
+            iconOnly
+            size={5}
+            label={t('button context settings')}
+          />
+        </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.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);
+
+  // 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]);
+
+  // 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 (
+    <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.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>
   );