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

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

@@ -2,259 +2,147 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { Effect, Layer } from 'effect';
-import React, { useEffect, useMemo } from 'react';
+import * as Effect from 'effect/Effect';
+import * as Fiber from 'effect/Fiber';
+import * as Layer from 'effect/Layer';
+import React, { type CSSProperties, useEffect, useMemo, useState } from 'react';
 
-import { Obj } from '@dxos/echo';
 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 { type ContentBlock, DataType } from '@dxos/schema';
-import { ColumnContainer, render, withLayout, withTheme } from '@dxos/storybook-utils';
-
+import { Popover } from '@dxos/react-ui';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
+import { MarkdownStream } from '@dxos/react-ui-components';
+import { EditorPreviewProvider, useEditorPreview } from '@dxos/react-ui-editor';
+import { Card } from '@dxos/react-ui-stack';
+import { render } from '@dxos/storybook-utils';
+import { type Message, Organization, Person } from '@dxos/types';
+
+import { createMessageGenerator } from '../../testing';
 import { translations } from '../../translations';
 
-import { renderObjectLink } from './ChatMessage';
 import { ChatThread, type ChatThreadProps } from './ChatThread';
+import { componentRegistry } from './registry';
+import TEXT from './testing/thread.md?raw';
 
 faker.seed(1);
 
-const StoryContainer = ({ delay = 0, ...props }: ChatThreadProps & { delay?: number }) => {
+type MessageGenerator = Effect.Effect<void, never, DatabaseService | ContextQueueService>;
+
+type StoryProps = { generator?: MessageGenerator[]; delay?: number; wait?: boolean } & ChatThreadProps;
+
+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(() => {
     if (!space || !queue) {
       return;
     }
 
-    void Effect.runPromise(
+    const fiber = Effect.runFork(
       Effect.gen(function* () {
-        for (const step of MESSAGES) {
+        for (const step of generator) {
           yield* step;
-          yield* Effect.sleep(delay);
+          if (delay) {
+            yield* Effect.sleep(delay);
+          }
         }
-
-        return queue;
+        setDone(true);
       }).pipe(Effect.provide(Layer.mergeAll(DatabaseService.layer(space.db), ContextQueueService.layer(queue)))),
     );
-  }, [space, queue]);
 
-  if (!space) {
+    return () => {
+      void Effect.runPromise(Fiber.interrupt(fiber));
+    };
+  }, [space, queue, generator]);
+
+  if (wait && !done) {
     return null;
   }
 
   return (
-    <ChatThread {...props} space={space} messages={queue?.objects ?? []} onEvent={(event) => console.log(event)} />
+    <EditorPreviewProvider onLookup={async ({ label, ref }) => ({ label, text: ref })}>
+      <ChatThread {...props} messages={queue?.objects} />
+      <PreviewCard />
+    </EditorPreviewProvider>
   );
 };
 
-const createMessage = (role: DataType.ActorRole, blocks: ContentBlock.Any[]): DataType.Message => {
-  return Obj.make(DataType.Message, {
-    created: new Date().toISOString(),
-    sender: { role },
-    blocks,
-  });
-};
-
-const MESSAGES: Effect.Effect<void, never, DatabaseService | ContextQueueService>[] = [
-  Effect.gen(function* () {
-    const { queue } = yield* ContextQueueService;
-    yield* Effect.promise(() =>
-      queue.append([
-        createMessage('user', [
-          {
-            _tag: 'text',
-            text: faker.lorem.sentence(5),
-          },
-        ]),
-      ]),
-    );
-  }),
-
-  Effect.gen(function* () {
-    const { queue } = yield* ContextQueueService;
-    yield* Effect.promise(() =>
-      queue.append([
-        createMessage('assistant', [
-          {
-            _tag: 'suggest',
-            text: 'Search...',
-          },
-          {
-            _tag: 'suggest',
-            text: faker.lorem.paragraphs(1),
-          },
-        ]),
-        createMessage('assistant', [
-          {
-            _tag: 'text',
-            text: 'Select an option:',
-          },
-          {
-            _tag: 'select',
-            options: ['Option 1', 'Option 2', 'Option 3'],
-          },
-        ]),
-      ]),
-    );
-  }),
-
-  Effect.gen(function* () {
-    const { queue } = yield* ContextQueueService;
-    const { db } = yield* DatabaseService;
-    const obj1 = db.add(Obj.make(DataType.Organization, { name: 'DXOS' }));
-    const obj2 = db.add(Obj.make(DataType.Person, { fullName: 'Alice' }));
-    const obj3 = db.add(Obj.make(DataType.Person, { fullName: 'Bob' }));
-    const obj4 = db.add(Obj.make(DataType.Person, { fullName: 'Charlie' }));
-    yield* Effect.promise(() =>
-      queue.append([
-        createMessage('assistant', [
-          // Inline tag.
-          {
-            _tag: 'text',
-            text: [faker.lorem.paragraph(), renderObjectLink(obj1), faker.lorem.paragraph()].join(' '),
-          },
-          // Inline cards.
-          ...[obj2, obj3, obj4].map(
-            (obj) =>
-              ({
-                _tag: 'text',
-                text: renderObjectLink(obj),
-              }) satisfies ContentBlock.Text,
-          ),
-        ]),
-      ]),
-    );
-  }),
-
-  Effect.gen(function* () {
-    const { queue } = yield* ContextQueueService;
-    yield* Effect.promise(() =>
-      queue.append([
-        createMessage('assistant', [
-          {
-            _tag: 'text',
-            text: faker.lorem.paragraphs(1),
-          },
-          {
-            _tag: 'toolkit',
-          },
-        ]),
-      ]),
-    );
-  }),
-
-  Effect.gen(function* () {
-    const { queue } = yield* ContextQueueService;
-    yield* Effect.promise(() =>
-      queue.append([
-        createMessage('assistant', [
-          {
-            _tag: 'text',
-            disposition: 'cot',
-            text: Array.from({ length: faker.number.int({ min: 3, max: 5 }) })
-              .map((_, idx) => `${idx + 1}. ${faker.lorem.paragraph()}`)
-              .join('\n'),
-          },
-          {
-            _tag: 'toolCall',
-            toolCallId: '1234',
-            name: 'search',
-            input: {},
-          },
-        ]),
-        createMessage('user', [
-          {
-            _tag: 'toolResult',
-            toolCallId: '1234',
-            name: 'search',
-            result: 'This is a tool result.',
-          },
-        ]),
-      ]),
-    );
-  }),
+const PreviewCard = () => {
+  const { target } = useEditorPreview('PreviewCard');
 
-  Effect.gen(function* () {
-    const { queue } = yield* ContextQueueService;
-    yield* Effect.promise(() =>
-      queue.append([
-        createMessage('assistant', [
-          {
-            _tag: 'toolCall',
-            toolCallId: '4567',
-            name: 'create',
-            input: {},
-          },
-        ]),
-        createMessage('user', [
-          {
-            _tag: 'toolResult',
-            toolCallId: '4567',
-            name: 'create',
-            result: 'This is a tool result.',
-          },
-        ]),
-        createMessage('assistant', [
-          {
-            _tag: 'text',
-            text: Array.from({ length: faker.number.int({ min: 2, max: 3 }) })
-              .map(() => faker.lorem.paragraphs())
-              .join('\n\n'),
-          },
-        ]),
-      ]),
-    );
-  }),
-
-  Effect.gen(function* () {
-    const { queue } = yield* ContextQueueService;
-    yield* Effect.promise(() =>
-      queue.append([
-        createMessage('assistant', [
-          {
-            _tag: 'text',
-            text: faker.lorem.paragraphs(2),
-          },
-        ]),
-      ]),
-    );
-  }),
-];
+  return (
+    <Popover.Portal>
+      <Popover.Content onOpenAutoFocus={(event) => event.preventDefault()}>
+        <Popover.Viewport>
+          <Card.SurfaceRoot role='card--popover'>
+            <Card.Heading>{target?.label}</Card.Heading>
+            {target && <Card.Text classNames='truncate line-clamp-3'>{target.text}</Card.Text>}
+          </Card.SurfaceRoot>
+        </Popover.Viewport>
+        <Popover.Arrow />
+      </Popover.Content>
+    </Popover.Portal>
+  );
+};
 
 const meta = {
   title: 'plugins/plugin-assistant/ChatThread',
   component: ChatThread,
-  render: render(StoryContainer),
+  render: render(DefaultStory),
   decorators: [
+    withTheme,
+    withLayout({ container: 'column' }),
     withClientProvider({
       createIdentity: true,
-      types: [DataType.Organization, DataType.Person],
-    }),
-    withTheme,
-    withLayout({
-      Container: ColumnContainer,
-      classNames: 'is-[40rem]',
+      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 = {} satisfies Story;
+export const Default: Story = {
+  args: {
+    generator: createMessageGenerator(),
+    wait: true,
+  },
+};
 
-export const Delayed = {
+export const Delayed: Story = {
   args: {
-    delay: 2_000,
+    generator: createMessageGenerator(),
+    delay: 1_000,
+    fadeIn: true,
+    cursor: false,
   },
-} satisfies Story;
+};
+
+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>
+  ),
+};

package/src/components/ChatThread/ChatThread.tsx

@@ -2,56 +2,86 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { type CSSProperties, forwardRef, useMemo } from 'react';
+import React, { type CSSProperties, forwardRef, useCallback, useEffect, useMemo } from 'react';
 
 import { PublicKey } from '@dxos/keys';
 import { type Identity } from '@dxos/react-client/halo';
-import { type ThemedClassName } from '@dxos/react-ui';
-import { ScrollContainer, type ScrollController } from '@dxos/react-ui-components';
+import { type ThemedClassName, useForwardedRef } from '@dxos/react-ui';
+import { MarkdownStream, type MarkdownStreamController, type MarkdownStreamProps } from '@dxos/react-ui-components';
 import { mx } from '@dxos/react-ui-theme';
-import { type DataType } from '@dxos/schema';
+import { type Message } from '@dxos/types';
 import { keyToFallback } from '@dxos/util';
 
-import { ChatMessage, type ChatMessageProps } from './ChatMessage';
-import { messageReducer } from './reducer';
+import { type ChatEvent } from '../Chat';
+
+import { blockToMarkdown, componentRegistry } from './registry';
+import { MessageSyncer } from './sync';
 
 export type ChatThreadProps = ThemedClassName<
   {
     identity?: Identity;
-    messages?: DataType.Message[];
-    collapse?: boolean;
-  } & Pick<ChatMessageProps, 'debug' | 'space' | 'tools' | 'onEvent'>
+    messages?: Message.Message[];
+    error?: Error;
+    onEvent?: (event: ChatEvent) => void;
+  } & Pick<MarkdownStreamProps, 'cursor' | 'fadeIn' | 'debug'>
 >;
 
-export const ChatThread = forwardRef<ScrollController, ChatThreadProps>(
-  ({ classNames, identity, messages, collapse = true, ...props }, forwardedRef) => {
-    const userHue = useMemo(() => {
-      return identity?.profile?.data?.hue || keyToFallback(identity?.identityKey ?? PublicKey.random()).hue;
-    }, [identity]);
-
-    // TODO(dmaretskyi): This needs to be a separate type: `id` is not a valid ObjectId, this needs to accommodate messageId for deletion.
-    const { messages: filteredMessages = [] } = useMemo(() => {
-      if (collapse) {
-        return (messages ?? []).reduce<{ messages: DataType.Message[]; current?: DataType.Message }>(messageReducer, {
-          messages: [],
-        });
-      } else {
-        return { messages: messages ?? [] };
+// TODO(burdon): Memo thread position.
+export const ChatThread = forwardRef<MarkdownStreamController, ChatThreadProps>(
+  (
+    { classNames, identity, messages = [], error, cursor = false, fadeIn = true, debug = false, onEvent },
+    forwardedRef,
+  ) => {
+    const controllerRef = useForwardedRef(forwardedRef);
+    const controller = controllerRef.current;
+
+    const userHue = useMemo(
+      () => identity?.profile?.data?.hue || keyToFallback(identity?.identityKey ?? PublicKey.random()).hue,
+      [identity],
+    );
+
+    // Show error.
+    useEffect(() => {
+      controller?.scrollToBottom();
+    }, [controller, error]);
+
+    // Update document.
+    const syncer = useMemo(() => controller && new MessageSyncer(controller, blockToMarkdown), [controller]);
+    useEffect(() => {
+      const reset = syncer?.append(messages, true);
+      if (reset) {
+        controller?.scrollToBottom('instant');
       }
-    }, [messages, collapse]);
+    }, [syncer, messages]);
+
+    // Event adapter.
+    const handleEvent = useCallback<NonNullable<MarkdownStreamProps['onEvent']>>(
+      ({ type, value }) => {
+        switch (type) {
+          case 'submit': {
+            value && onEvent?.({ type, text: value });
+            break;
+          }
+        }
+      },
+      [onEvent],
+    );
 
     return (
-      <ScrollContainer ref={forwardedRef} classNames={classNames} fade>
-        <div
-          role='none'
-          className={mx('flex flex-col gap-2', filteredMessages.length > 0 && 'pbs-4 pbe-4')}
-          style={{ '--user-fill': `var(--dx-${userHue}Fill)` } as CSSProperties}
-        >
-          {filteredMessages.map((message) => (
-            <ChatMessage key={message.id} message={message} {...props} />
-          ))}
-        </div>
-      </ScrollContainer>
+      <div
+        role='none'
+        className={mx('flex bs-full is-full justify-center overflow-hidden', classNames)}
+        style={{ '--user-fill': `var(--dx-${userHue}Fill)` } as CSSProperties}
+      >
+        <MarkdownStream
+          ref={controllerRef}
+          registry={componentRegistry}
+          cursor={cursor}
+          fadeIn={fadeIn}
+          debug={debug}
+          onEvent={handleEvent}
+        />
+      </div>
     );
   },
 );

package/src/components/ChatThread/Link.tsx

@@ -2,38 +2,25 @@
 // Copyright 2025 DXOS.org
 //
 
-import React from 'react';
+import React, { useMemo } from 'react';
 
 import { type Space } from '@dxos/client/echo';
-import { Obj, Ref } from '@dxos/echo';
+import { Obj } from '@dxos/echo';
 import { type DXN } from '@dxos/keys';
-import { mx } from '@dxos/react-ui-theme';
-
-import { useResolvedRef } from '../../hooks';
+import { DxAnchor } from '@dxos/lit-ui/react';
 
 export type ObjectLinkProps = {
   space: Space;
   dxn: DXN;
 };
 
-// TODO(burdon): Factor out.
 export const ObjectLink = ({ space, dxn }: ObjectLinkProps) => {
-  const object = useResolvedRef(space, Ref.fromDXN(dxn));
-  const title = Obj.getLabel(object) ?? object?.id ?? dxn.toString();
+  const ref = useMemo(() => space.db.ref(dxn), [space, dxn.toString()]);
 
+  const title = Obj.getLabel(ref.target) ?? ref.target?.id ?? ref.dxn.toString();
   return (
-    <a
-      // href={dxn.toString()}
-      title={title}
-      className={mx(
-        // TODO(burdon): Use style for tags.
-        'inline-flex items-center max-w-[16rem] px-1.5 overflow-hidden',
-        'border border-separator rounded whitespace-nowrap text-ellipsis text-primary-500 hover:text-primary-500 hover:border-primary-500 cursor-pointer',
-      )}
-      target='_blank'
-      rel='noopener noreferrer'
-    >
-      <span className='truncate'>{title}</span>
-    </a>
+    <DxAnchor rootclassname='dx-tag--anchor' refid={dxn.toString()}>
+      {title}
+    </DxAnchor>
   );
 };

package/src/components/ChatThread/reducers.ts

@@ -0,0 +1,151 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type ContentBlock, type Message } from '@dxos/types';
+
+type Reducer<R, I> = (acc: R, value: I, idx: number) => R;
+
+/**
+ * Reducer that collapses related message blocks into single messages.
+ * For example, combines tool request/response pairs into a single message.
+ *
+ * Typical order:
+ * - message 0
+ *  - text
+ * - message 1
+ *  - text
+ *  - toolCall
+ *  - summary
+ * - message 2
+ *  - toolResult
+ * - message 3
+ *  - text
+ *  - summary
+ *
+ * Coverts to:
+ * - message 0
+ *  - text
+ * - message 1
+ *  - text
+ * - message 2
+ *  - toolCall
+ *  - toolResult
+ *  - summary
+ * - message 3
+ *  - text
+ *  - summary
+ */
+export const reduceMessages: Reducer<
+  {
+    messages: Message.Message[];
+    current?: Message.Message;
+    toolBlock?: boolean;
+    assistantMessages?: Message.Message[];
+  },
+  Message.Message
+> = ({ messages, current, toolBlock, assistantMessages = [] }, message) => {
+  // Treat tool calls as assistant messages.
+  let assistant = message?.sender.role === 'assistant';
+  let i = 0;
+  for (const block of message.blocks) {
+    switch (block._tag) {
+      // TODO(burdon): Preserve call tool title.
+      case 'toolCall': {
+        assistant = true;
+        if (!toolBlock) {
+          current = {
+            ...message,
+            id: [message.id, i++].join('_'),
+            blocks: [block],
+          };
+          messages.push(current);
+          toolBlock = true;
+        } else {
+          current!.blocks.push(block);
+        }
+        break;
+      }
+
+      case 'toolResult': {
+        assistant = true;
+        if (toolBlock) {
+          current!.blocks.push(block);
+        }
+        break;
+      }
+
+      case 'summary': {
+        assistant = true;
+        if (toolBlock) {
+          current!.blocks.push(block);
+        } else {
+          const summary = reduceSummary([...assistantMessages, message]);
+          current!.blocks.push(summary);
+        }
+        break;
+      }
+
+      default: {
+        assistant = message.sender.role === 'assistant';
+        current = {
+          ...message,
+          id: [message.id, i++].join('_'),
+          blocks: [block],
+        };
+        messages.push(current);
+        toolBlock = false;
+        break;
+      }
+    }
+  }
+
+  return {
+    messages,
+    current,
+    toolBlock,
+    assistantMessages: assistant ? [...assistantMessages, message] : undefined,
+  };
+};
+
+/**
+ * Accumulate token counts from all summary blocks in pending messages.
+ */
+const reduceSummary = (messages: Message.Message[]): ContentBlock.Summary => {
+  let start: number | undefined;
+  return messages.reduce<ContentBlock.Summary>(
+    (acc, msg) => {
+      const time = new Date(msg.created).getTime();
+      if (!start) {
+        start = time;
+      }
+      msg.blocks.forEach((block) => {
+        switch (block._tag) {
+          case 'toolCall': {
+            acc.toolCalls = (acc.toolCalls ?? 0) + 1;
+            break;
+          }
+          case 'summary': {
+            acc.model = block.model;
+            if (block.usage) {
+              acc.message = block.message;
+              acc.usage = {
+                inputTokens: (acc.usage?.inputTokens ?? 0) + (block.usage.inputTokens ?? 0),
+                outputTokens: (acc.usage?.outputTokens ?? 0) + (block.usage.outputTokens ?? 0),
+                totalTokens: (acc.usage?.totalTokens ?? 0) + (block.usage.totalTokens ?? 0),
+              };
+              acc.duration = time - (start ?? time);
+            }
+            break;
+          }
+        }
+      });
+
+      return acc;
+    },
+    {
+      _tag: 'summary',
+      duration: 0,
+    } satisfies ContentBlock.Summary,
+  );
+};