@dxos/plugin-assistant 0.8.4-main.406dc2a → 0.8.4-main.548089c

package/src/components/ChatCompanion.tsx

@@ -3,69 +3,86 @@
 //
 
 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 React, { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { Capabilities, createIntent, useCapabilities, useIntentDispatcher } from '@dxos/app-framework';
+import { Capabilities, createIntent } from '@dxos/app-framework';
+import { useCapabilities, useIntentDispatcher } from '@dxos/app-framework/react';
 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 { Filter, Obj, Ref } from '@dxos/echo';
 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 { ChatContainer, type ChatEvent } 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' };
+  data: { subject: Assistant.Chat | 'assistant-chat'; companionTo: Obj.Any };
 };
 
 export const ChatCompanion = ({ role, data }: ChatCompanionProps) => {
+  const { dispatchPromise: dispatch } = useIntentDispatcher();
+  const blueprintRegistry = useBlueprintRegistry();
   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();
+  const [chat, setChat] = useState(data.subject === 'assistant-chat' ? undefined : data.subject);
+  useEffect(() => {
+    setChat(data.subject === 'assistant-chat' ? undefined : data.subject);
+  }, [data.subject]);
+
+  const chatQueue = space && chat ? space.queues.get(chat.queue.dxn) : undefined;
+  const binder = useContextBinder(chatQueue);
 
-  // Initialize companion chat if it doesn't exist.
+  // Initialize companion chat if it doesn't exist, but don't add it to the space immediately.
   useAsyncEffect(async () => {
-    if (chat || !space) {
+    if (!space || chat) {
       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(
+    const { data } = await dispatch(createIntent(AssistantAction.CreateChat, { space }));
+    setChat(data?.object);
+  }, [chat, space]);
+
+  // Add chat to space when user submits the first message.
+  const handleEvent = useCallback(
+    async (event: ChatEvent) => {
+      const chatInSpace = !!getSpace(chat);
+      if (chatInSpace || !chat || !space) {
+        return;
+      }
+
+      if (event.type === 'submit') {
+        await dispatch(
+          createIntent(SpaceAction.AddObject, {
+            object: chat,
+            target: space,
+            hidden: true,
+          }),
+        );
+        await dispatch(
           createIntent(SpaceAction.AddRelation, {
             space,
             schema: Assistant.CompanionTo,
-            source: nextChat,
-            target: data.companionTo,
+            source: chat,
+            target: companionTo,
+          }),
+        );
+        await dispatch(
+          createIntent(AssistantAction.SetCurrentChat, {
+            companionTo,
+            chat,
           }),
         );
       }
-
-      yield* dispatch(createIntent(AssistantAction.SetCurrentChat, { companionTo, chat: nextChat }));
-    }).pipe(Effect.provide(DatabaseService.layer(space.db)), Effect.runPromise);
-  }, [space, chat, companionTo]);
+    },
+    [chat, space, companionTo, dispatch],
+  );
 
   const metadata = useCapabilities(Capabilities.Metadata);
   const blueprintKeys = useMemo(
@@ -73,8 +90,12 @@ export const ChatCompanion = ({ role, data }: ChatCompanionProps) => {
       Function.pipe(
         metadata,
         Array.findFirst(
-          (capability): capability is { id: string; metadata: { blueprints?: string[] } } =>
-            capability.id === Obj.getTypename(companionTo),
+          (
+            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[]),
@@ -111,12 +132,14 @@ export const ChatCompanion = ({ role, data }: ChatCompanionProps) => {
   }, [space, blueprintRegistry, blueprintKeys]);
 
   useAsyncEffect(async () => {
-    if (!binder) {
+    if (!binder?.isOpen) {
       return;
     }
 
     if (pluginBlueprints.length > 0) {
-      await binder.bind({ blueprints: pluginBlueprints.map((blueprint) => Ref.make(blueprint)) });
+      await binder.bind({
+        blueprints: pluginBlueprints.map((blueprint) => Ref.make(blueprint)),
+      });
     }
 
     if (Obj.instanceOf(Blueprint.Blueprint, companionTo)) {
@@ -124,13 +147,9 @@ export const ChatCompanion = ({ role, data }: ChatCompanionProps) => {
     } else {
       await binder.bind({ objects: [Ref.make(companionTo)] });
     }
-  }, [binder, companionTo, pluginBlueprints]);
-
-  if (!chat) {
-    return null;
-  }
+  }, [binder, companionTo, blueprintKeys]);
 
-  return <ChatContainer role={role} chat={chat} companionTo={companionTo} />;
+  return <ChatContainer role={role} space={space} chat={chat} companionTo={companionTo} onEvent={handleEvent} />;
 };
 
 export default ChatCompanion;

package/src/components/ChatContainer.tsx

@@ -4,8 +4,9 @@
 
 import React from 'react';
 
-import { Capabilities, useCapability } from '@dxos/app-framework';
-import { getSpace } from '@dxos/client/echo';
+import { Capabilities } from '@dxos/app-framework';
+import { useCapability } from '@dxos/app-framework/react';
+import { type Space, getSpace } from '@dxos/client/echo';
 import { type Obj } from '@dxos/echo';
 import { StackItem } from '@dxos/react-ui-stack';
 
@@ -13,36 +14,45 @@ import { useBlueprintRegistry, useChatProcessor, useChatServices, useOnline, use
 import { meta } from '../meta';
 import { type Assistant } from '../types';
 
-import { Chat } from './Chat';
-import { Toolbar } from './Toolbar';
+import { Chat, type ChatRootProps } from './Chat';
 
 export type ChatContainerProps = {
-  chat: Assistant.Chat;
-  companionTo?: Obj.Any;
   role?: string;
-};
+  space?: Space;
+  chat?: Assistant.Chat;
+  companionTo?: Obj.Any;
+} & Pick<ChatRootProps, 'onEvent'>;
 
-export const ChatContainer = ({ chat, companionTo }: ChatContainerProps) => {
-  const space = getSpace(chat);
+export const ChatContainer = ({ space: spaceProp, chat, companionTo, onEvent }: ChatContainerProps) => {
+  const space = spaceProp ?? getSpace(chat);
   const settings = useCapability(Capabilities.SettingsStore).getStore<Assistant.Settings>(meta.id)?.value;
   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 });
+  const processor = useChatProcessor({
+    space,
+    chat,
+    preset,
+    services,
+    blueprintRegistry,
+    settings,
+  });
 
   if (!processor) {
     return null;
   }
 
   return (
-    <StackItem.Content toolbar={!!companionTo}>
-      {!!companionTo && <Toolbar chat={chat} companionTo={companionTo} />}
-      <Chat.Root classNames='container-max-width' chat={chat} processor={processor}>
-        <Chat.Thread />
-        <div className='p-2'>
-          <Chat.Prompt {...chatProps} outline preset={preset?.id} online={online} onOnlineChange={setOnline} />
-        </div>
+    <StackItem.Content toolbar>
+      <Chat.Root space={space} chat={chat} processor={processor} onEvent={onEvent}>
+        <Chat.Toolbar companionTo={companionTo} />
+        <Chat.Viewport classNames='container-max-width'>
+          <Chat.Thread />
+          <div role='none' className='p-4'>
+            <Chat.Prompt {...chatProps} outline preset={preset?.id} online={online} onOnlineChange={setOnline} />
+          </div>
+        </Chat.Viewport>
       </Chat.Root>
     </StackItem.Content>
   );

package/src/components/ChatDialog.tsx

@@ -4,7 +4,8 @@
 
 import React, { useCallback, useState } from 'react';
 
-import { Capabilities, useCapability } from '@dxos/app-framework';
+import { Capabilities } from '@dxos/app-framework';
+import { useCapability } from '@dxos/app-framework/react';
 import { getSpace } from '@dxos/client/echo';
 import { useTranslation } from '@dxos/react-ui';
 import { ChatDialog as NaturalChatDialog } from '@dxos/react-ui-chat';
@@ -28,7 +29,13 @@ export const ChatDialog = ({ chat }: ChatDialogProps) => {
   const [online, setOnline] = useOnline();
   const { preset, ...chatProps } = usePresets(online);
   const blueprintRegistry = useBlueprintRegistry();
-  const processor = useChatProcessor({ chat, preset, services, blueprintRegistry, settings });
+  const processor = useChatProcessor({
+    chat,
+    preset,
+    services,
+    blueprintRegistry,
+    settings,
+  });
 
   // TODO(burdon): Refocus when open.
   const [open, setOpen] = useState(true);

package/src/components/ChatProgress/ChatProgress.tsx

@@ -61,7 +61,7 @@ export const ChatProgress = ({ chat }: ChatProgressProps) => {
   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' />
+      <TextCrawl classNames='pis-4 text-sm text-description' lines={lines} autoAdvance />
     </Flex>
   );
 };

package/src/components/ChatPrompt/ChatActions.tsx

@@ -29,10 +29,9 @@ export const ChatActions = ({ classNames, children, microphone, recording, proce
       <IconButton
         disabled={!processing}
         variant='ghost'
-        size={5}
         icon='ph--x--regular'
         iconOnly
-        label={t('button cancel processing')}
+        label={t('cancel processing button')}
         onClick={() => onEvent?.({ type: 'cancel' })}
       />
 
@@ -41,11 +40,10 @@ export const ChatActions = ({ classNames, children, microphone, recording, proce
           disabled={!processing}
           classNames={mx(recording && 'bg-primary-500')}
           variant='ghost'
-          size={5}
           icon='ph--microphone--regular'
           iconOnly
           noTooltip
-          label={t('button microphone')}
+          label={t('microphone button')}
           onMouseDown={() => onEvent?.({ type: 'record-start' })}
           onMouseUp={() => onEvent?.({ type: 'record-stop' })}
           onTouchStart={() => onEvent?.({ type: 'record-start' })}

package/src/components/ChatPrompt/ChatOptions.tsx

@@ -40,14 +40,16 @@ export const ChatOptions = ({
   const { t } = useTranslation(meta.id);
 
   return (
-    <div role='none' className='flex gap-0.5'>
+    <div role='none' className='flex'>
       <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.Viewport>
+              <ObjectsPanel space={space} context={context} />
+            </Popover.Viewport>
             <Popover.Arrow />
           </Popover.Content>
         </Popover.Portal>
@@ -59,30 +61,31 @@ 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.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>

package/src/components/ChatPrompt/ChatReferences.tsx

@@ -23,7 +23,7 @@ export const ChatReferences = ({ classNames, context, space }: ChatReferencesPro
   const { objects, onUpdateObject } = useContextObjects({ space, 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);
@@ -32,12 +32,12 @@ export const ChatReferences = ({ classNames, context, space }: ChatReferencesPro
           <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}
-              icon='ph--x--bold'
               onClick={() => onUpdateObject?.(dxn, false)}
             />
           </li>

package/src/components/ChatThread/ChatThread.stories.tsx

@@ -6,33 +6,38 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import * as Effect from 'effect/Effect';
 import * as Fiber from 'effect/Fiber';
 import * as Layer from 'effect/Layer';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { type CSSProperties, useEffect, useMemo, useState } from 'react';
 
 import { ContextQueueService, DatabaseService } from '@dxos/functions';
 import { faker } from '@dxos/random';
 import { useQueue, useSpace } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Popover } from '@dxos/react-ui';
-import { withTheme } from '@dxos/react-ui/testing';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+import { MarkdownStream } from '@dxos/react-ui-components';
 import { PreviewPopoverProvider, usePreviewPopover } from '@dxos/react-ui-editor/testing';
 import { Card } from '@dxos/react-ui-stack';
-import { DataType } from '@dxos/schema';
+import { render } from '@dxos/storybook-utils';
+import { type Message, Organization, Person } from '@dxos/types';
 
 import { createMessageGenerator } from '../../testing';
 import { translations } from '../../translations';
 
-import { ChatThread, type ChatThreadController, type ChatThreadProps } from './ChatThread';
+import { ChatThread, type ChatThreadProps } from './ChatThread';
+import { componentRegistry } from './registry';
+import TEXT from './testing/thread.md?raw';
 
 faker.seed(1);
 
 type MessageGenerator = Effect.Effect<void, never, DatabaseService | ContextQueueService>;
 
-type StoryProps = ChatThreadProps & { generator?: MessageGenerator[]; delay?: number };
+type StoryProps = { generator?: MessageGenerator[]; delay?: number; wait?: boolean } & ChatThreadProps;
 
-const DefaultStory = ({ generator = [], delay = 0, ...props }: StoryProps) => {
+const DefaultStory = ({ generator = [], delay = 0, wait, ...props }: StoryProps) => {
   const space = useSpace();
   const queueDxn = useMemo(() => space?.queues.create().dxn, [space]);
-  const queue = useQueue<DataType.Message>(queueDxn);
+  const queue = useQueue<Message.Message>(queueDxn);
+  const [done, setDone] = useState(false);
 
   // Generate messages.
   useEffect(() => {
@@ -48,6 +53,7 @@ const DefaultStory = ({ generator = [], delay = 0, ...props }: StoryProps) => {
             yield* Effect.sleep(delay);
           }
         }
+        setDone(true);
       }).pipe(Effect.provide(Layer.mergeAll(DatabaseService.layer(space.db), ContextQueueService.layer(queue)))),
     );
 
@@ -56,27 +62,18 @@ const DefaultStory = ({ generator = [], delay = 0, ...props }: StoryProps) => {
     };
   }, [space, queue, generator]);
 
-  // Set context.
-  const [controller, setController] = useState<ChatThreadController | null>(null);
-  useEffect(() => {
-    // controller?.setContext({ timestamp: Date.now() });
-  }, [controller]);
+  if (wait && !done) {
+    return null;
+  }
 
-  // TODO(burdon): Elsewhere PreviewProvider is implemented via the plugin-preview.
   return (
-    <PreviewPopoverProvider
-      onLookup={async ({ label, ref }) => {
-        return { label, text: ref };
-      }}
-    >
-      <ChatThread {...props} messages={queue?.objects ?? []} ref={setController} />
+    <PreviewPopoverProvider onLookup={async ({ label, ref }) => ({ label, text: ref })}>
+      <ChatThread {...props} messages={queue?.objects} />
       <PreviewCard />
     </PreviewPopoverProvider>
   );
 };
 
-// TODO(burdon): Factor out.
-// TODO(burdon): Provide renderer for preview extension.
 const PreviewCard = () => {
   const { target } = usePreviewPopover('PreviewCard');
 
@@ -98,32 +95,54 @@ const PreviewCard = () => {
 const meta = {
   title: 'plugins/plugin-assistant/ChatThread',
   component: ChatThread,
-  render: DefaultStory,
+  render: render(DefaultStory),
   decorators: [
     withTheme,
-    withClientProvider({ createIdentity: true, createSpace: true, types: [DataType.Organization, DataType.Person] }),
+    withLayout({ container: 'column' }),
+    withClientProvider({
+      createIdentity: true,
+      createSpace: true,
+      types: [Organization.Organization, Person.Person],
+    }),
   ],
   parameters: {
     layout: 'fullscreen',
     translations,
   },
-} satisfies Meta<typeof ChatThread>;
+} satisfies Meta<StoryProps>;
 
 export default meta;
 
-type Story = StoryObj<typeof meta>;
+type Story = StoryObj<StoryProps>;
 
 export const Default: Story = {
   args: {
     generator: createMessageGenerator(),
+    wait: true,
   },
 };
 
 export const Delayed: Story = {
   args: {
     generator: createMessageGenerator(),
-    delay: 3_000,
+    delay: 1_000,
     fadeIn: true,
     cursor: false,
   },
 };
+
+export const Raw: Story = {
+  render: () => (
+    <div className='contents' style={{ '--user-fill': 'var(--dx-amberFill)' } as CSSProperties}>
+      <MarkdownStream content={TEXT} />
+    </div>
+  ),
+};
+
+export const Static: Story = {
+  render: () => (
+    <div className='contents' style={{ '--user-fill': 'var(--dx-amberFill)' } as CSSProperties}>
+      <MarkdownStream content={TEXT} registry={componentRegistry} />
+    </div>
+  ),
+};