@dxos/plugin-assistant 0.8.3-staging.0fa589b → 0.8.4-main.28f8d3d

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

@@ -0,0 +1,260 @@
+//
+// 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 { 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 { translations } from '../../translations';
+
+import { renderObjectLink } from './ChatMessage';
+import { ChatThread, type ChatThreadProps } from './ChatThread';
+
+faker.seed(1);
+
+const StoryContainer = ({ delay = 0, ...props }: ChatThreadProps & { delay?: number }) => {
+  const space = useSpace();
+  const queueDxn = useMemo(() => space?.queues.create().dxn, [space]);
+  const queue = useQueue<DataType.Message>(queueDxn);
+  useEffect(() => {
+    if (!space || !queue) {
+      return;
+    }
+
+    void Effect.runPromise(
+      Effect.gen(function* () {
+        for (const step of MESSAGES) {
+          yield* step;
+          yield* Effect.sleep(delay);
+        }
+
+        return queue;
+      }).pipe(Effect.provide(Layer.mergeAll(DatabaseService.layer(space.db), ContextQueueService.layer(queue)))),
+    );
+  }, [space, queue]);
+
+  if (!space) {
+    return null;
+  }
+
+  return (
+    <ChatThread {...props} space={space} messages={queue?.objects ?? []} onEvent={(event) => console.log(event)} />
+  );
+};
+
+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.',
+          },
+        ]),
+      ]),
+    );
+  }),
+
+  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),
+          },
+        ]),
+      ]),
+    );
+  }),
+];
+
+const meta = {
+  title: 'plugins/plugin-assistant/ChatThread',
+  component: ChatThread,
+  render: render(StoryContainer),
+  decorators: [
+    withClientProvider({
+      createIdentity: true,
+      types: [DataType.Organization, DataType.Person],
+    }),
+    withTheme,
+    withLayout({
+      Container: ColumnContainer,
+      classNames: 'is-[40rem]',
+    }),
+  ],
+  parameters: {
+    translations,
+  },
+} satisfies Meta<typeof ChatThread>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default = {} satisfies Story;
+
+export const Delayed = {
+  args: {
+    delay: 2_000,
+  },
+} satisfies Story;

package/src/components/ChatThread/ChatThread.tsx

@@ -0,0 +1,57 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { type CSSProperties, forwardRef, 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 { mx } from '@dxos/react-ui-theme';
+import { type DataType } from '@dxos/schema';
+import { keyToFallback } from '@dxos/util';
+
+import { ChatMessage, type ChatMessageProps } from './ChatMessage';
+import { messageReducer } from './reducer';
+
+export type ChatThreadProps = ThemedClassName<
+  {
+    identity?: Identity;
+    messages?: DataType.Message[];
+    collapse?: boolean;
+  } & Pick<ChatMessageProps, 'debug' | 'space' | 'tools' | 'onEvent'>
+>;
+
+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 ?? [] };
+      }
+    }, [messages, collapse]);
+
+    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>
+    );
+  },
+);

package/src/components/ChatThread/Link.tsx

@@ -0,0 +1,39 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React from 'react';
+
+import { type Space } from '@dxos/client/echo';
+import { Obj, Ref } from '@dxos/echo';
+import { type DXN } from '@dxos/keys';
+import { mx } from '@dxos/react-ui-theme';
+
+import { useResolvedRef } from '../../hooks';
+
+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();
+
+  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>
+  );
+};

package/src/components/ChatThread/ToolBlock.tsx

@@ -0,0 +1,125 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { type FC, useEffect, useMemo, useRef, useState } from 'react';
+
+import { type AgentStatus, type Tool } from '@dxos/ai';
+import { type ThemedClassName, useTranslation } from '@dxos/react-ui';
+import { NumericTabs, StatusRoll, ToggleContainer } from '@dxos/react-ui-components';
+import { type JsonProps, Json as NativeJson } from '@dxos/react-ui-syntax-highlighter';
+import { type DataType } from '@dxos/schema';
+import { isNonNullable, isNotFalsy } from '@dxos/util';
+
+import { meta } from '../../meta';
+
+export const isToolMessage = (message: DataType.Message) => {
+  return message.blocks.some((block) => block._tag === 'toolCall' || block._tag === 'toolResult');
+};
+
+const getToolName = (tool: Tool) => {
+  return tool.namespace && tool.function ? `${tool.namespace}:${tool.function}` : tool.name.split('_').pop();
+};
+
+export type ToolBlockProps = ThemedClassName<{
+  message: DataType.Message;
+  tools?: Tool[];
+}>;
+
+export const ToolBlock: FC<ToolBlockProps> = ({ classNames, message, tools }) => {
+  const { t } = useTranslation(meta.id);
+  const { blocks = [] } = message;
+
+  const getToolCaption = (tool?: Tool, status?: AgentStatus) => {
+    if (!tool) {
+      return t('calling tool label');
+    }
+
+    return status?.message ?? tool.caption ?? [t('calling label') + getToolName(tool)].join(' ');
+  };
+
+  let request: { tool: Tool | undefined; block: any } | undefined;
+  const toolBlocks = blocks.filter((block) => block._tag === 'toolCall' || block._tag === 'toolResult');
+  const items = toolBlocks
+    .map((block) => {
+      switch (block._tag) {
+        case 'toolCall': {
+          // TODO(burdon): Skip these updates?
+          if (block.pending && request?.block.toolCallId === block.toolCallId) {
+            return null;
+          }
+
+          request = { tool: tools?.find((tool) => tool.name === block.name), block };
+          return {
+            title: getToolCaption(request.tool, request.block.status),
+            block,
+          };
+        }
+
+        case 'toolResult': {
+          if (!request || block.error) {
+            return {
+              title: t('error label'),
+              block,
+            };
+          }
+
+          return {
+            title: getToolCaption(request.tool, request.block.status),
+            block,
+          };
+        }
+
+        default: {
+          request = undefined;
+          return {
+            title: t('error label'),
+            block,
+          };
+        }
+      }
+    })
+    .filter(isNonNullable);
+
+  return <ToolContainer classNames={classNames} items={items} />;
+};
+
+export const ToolContainer: FC<ThemedClassName<{ items: { title: string; block: any }[] }>> = ({
+  classNames,
+  items,
+}) => {
+  const tabsRef = useRef<HTMLDivElement>(null);
+  const [selected, setSelected] = useState(0);
+  const [open, setOpen] = useState(false);
+  useEffect(() => {
+    if (open) {
+      tabsRef.current?.focus();
+    }
+  }, [open]);
+
+  const handleSelect = (index: number) => {
+    if (index === selected) {
+      setOpen(false);
+    } else {
+      setSelected(index);
+    }
+  };
+
+  const title = useMemo(() => {
+    const lines = items.map((item) => item.title).filter(isNotFalsy);
+    return <StatusRoll key='status-roll' lines={lines} duration={1_000} autoAdvance />;
+  }, [items]);
+
+  return (
+    <ToggleContainer classNames={['flex flex-col', classNames]} title={title} open={open} onChangeOpen={setOpen}>
+      <div className='w-full grid grid-cols-[32px_1fr]'>
+        <NumericTabs ref={tabsRef} length={items.length} selected={selected} onSelect={handleSelect} />
+        <Json data={items[selected].block} />
+      </div>
+    </ToggleContainer>
+  );
+};
+
+export const Json = ({ data }: Pick<JsonProps, 'data'>) => (
+  <NativeJson data={data} classNames='!p-1 text-xs bg-transparent' />
+);

package/src/components/{AmbientDialog → ChatThread}/index.ts

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

package/src/components/{Thread → ChatThread}/reducer.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Message } from '@dxos/ai';
+import { type DataType } from '@dxos/schema';
 
 // TODO(burdon): Move to util?
 type Reducer<R, I> = (acc: R, value: I) => R;
@@ -11,24 +11,24 @@ type Reducer<R, I> = (acc: R, value: I) => R;
  * Reducer that collapses related message blocks into single messages.
  * For example, combines tool request/response pairs into a single message.
  */
-export const messageReducer: Reducer<{ messages: Message[]; current?: Message }, Message> = (
+export const messageReducer: Reducer<{ messages: DataType.Message[]; current?: DataType.Message }, DataType.Message> = (
   { current, messages },
   message,
 ) => {
   let i = 0;
-  for (const block of message.content) {
-    switch (block.type) {
-      case 'tool_use':
-      case 'tool_result': {
+  for (const block of message.blocks) {
+    switch (block._tag) {
+      case 'toolCall':
+      case 'toolResult': {
         if (current) {
-          current.content.push(block);
+          current.blocks.push(block);
         } else {
           current = {
+            ...message,
             id: [message.id, i].join('_'),
-            role: message.role,
-            content: [block],
-          } as any;
-          messages.push(current as any);
+            blocks: [block],
+          };
+          messages.push(current);
         }
         break;
       }
@@ -37,10 +37,10 @@ export const messageReducer: Reducer<{ messages: Message[]; current?: Message },
       default: {
         current = undefined;
         messages.push({
+          ...message,
           id: [message.id, i].join('_'),
-          role: message.role,
-          content: [block],
-        } as any);
+          blocks: [block],
+        });
         break;
       }
     }

package/src/components/PromptSettings.tsx

@@ -2,63 +2,61 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Match, type Schema } from 'effect';
-import React, { type ChangeEvent, useCallback } from 'react';
+import React from 'react';
 
-import { debounce } from '@dxos/async';
-import { Input, Select, Toolbar, useTranslation } from '@dxos/react-ui';
+import { type Template } from '@dxos/blueprints';
+import { Toolbar, useTranslation } from '@dxos/react-ui';
 
-import { ASSISTANT_PLUGIN } from '../meta';
-import { TemplateKinds, type TemplateType, type TemplateKindSchema } from '../types';
+import { meta } from '../meta';
 
-export const PromptSettings = ({ template }: { template: TemplateType }) => {
-  const { t } = useTranslation(ASSISTANT_PLUGIN);
+export const PromptSettings = ({ template }: { template: Template.Template }) => {
+  const { t } = useTranslation(meta.id);
 
-  const handleKindChange = useCallback(
-    (value: string) => {
-      const kind = Match.type<string>().pipe(
-        Match.withReturnType<Schema.Schema.Type<typeof TemplateKindSchema>>(),
-        Match.when('always', () => ({ include: 'always' })),
-        Match.when('schema-matching', () => ({ include: 'schema-matching', typename: '' })),
-        Match.when('automatically', () => ({ include: 'automatically', description: '' })),
-        Match.orElse(() => ({ include: 'manual' })),
-      )(value);
+  // const handleKindChange = useCallback(
+  //   (value: string) => {
+  //     const kind = Match.type<string>().pipe(
+  //       Match.withReturnType<Schema.Schema.Type<typeof Template.Template>>(),
+  //       Match.when('always', () => ({ include: 'always' })),
+  //       Match.when('schema-matching', () => ({ include: 'schema-matching', typename: '' })),
+  //       Match.when('automatically', () => ({ include: 'automatically', description: '' })),
+  //       Match.orElse(() => ({ include: 'manual' })),
+  //     )(value);
+  //
+  //     template.kind = kind;
+  //   },
+  //   [template],
+  // );
 
-      template.kind = kind;
-    },
-    [template],
-  );
-
-  const handleTypenameChange = useCallback(
-    debounce((event: ChangeEvent<HTMLInputElement>) => {
-      if (template.kind.include === 'schema-matching') {
-        template.kind.typename = event.target.value;
-      }
-    }, 300),
-    [template.kind.include],
-  );
+  // const handleTypenameChange = useCallback(
+  //   debounce((event: ChangeEvent<HTMLInputElement>) => {
+  //     if (template.kind.include === 'schema-matching') {
+  //       template.kind.typename = event.target.value;
+  //     }
+  //   }, 300),
+  //   [template.kind.include],
+  // );
 
-  const handleDescriptionChange = useCallback(
-    debounce((event: ChangeEvent<HTMLInputElement>) => {
-      if (template.kind.include === 'automatically') {
-        template.kind.description = event.target.value;
-      }
-    }, 300),
-    [template.kind.include],
-  );
+  // const handleDescriptionChange = useCallback(
+  //   debounce((event: ChangeEvent<HTMLInputElement>) => {
+  //     if (template.kind.include === 'automatically') {
+  //       template.kind.description = event.target.value;
+  //     }
+  //   }, 300),
+  //   [template.kind.include],
+  // );
 
   return (
     <div className='flex flex-col gap-4'>
       <h2>{t('prompt rules label')}</h2>
       <Toolbar.Root>
-        <Select.Root value={template.kind.include} onValueChange={handleKindChange}>
+        {/* <Select.Root value={template.kind.include} onValueChange={handleKindChange}>
           <Toolbar.Button asChild>
             <Select.TriggerButton />
           </Toolbar.Button>
           <Select.Portal>
             <Select.Content>
               <Select.Viewport>
-                {TemplateKinds.map((kind) => (
+                {Template.Kinds.map((kind) => (
                   <Select.Option key={kind} value={kind}>
                     {kind}
                   </Select.Option>
@@ -66,8 +64,8 @@ export const PromptSettings = ({ template }: { template: TemplateType }) => {
               </Select.Viewport>
             </Select.Content>
           </Select.Portal>
-        </Select.Root>
-        {template.kind.include === 'schema-matching' && (
+        </Select.Root> */}
+        {/* {template.kind.include === 'schema-matching' && (
           <Input.Root>
             <Input.TextInput
               placeholder={t('typename placeholder')}
@@ -75,8 +73,8 @@ export const PromptSettings = ({ template }: { template: TemplateType }) => {
               onChange={handleTypenameChange}
             />
           </Input.Root>
-        )}
-        {template.kind.include === 'automatically' && (
+        )} */}
+        {/* {template.kind.include === 'automatically' && (
           <Input.Root>
             <Input.TextInput
               placeholder={t('description placeholder')}
@@ -84,7 +82,7 @@ export const PromptSettings = ({ template }: { template: TemplateType }) => {
               onChange={handleDescriptionChange}
             />
           </Input.Root>
-        )}
+        )} */}
       </Toolbar.Root>
     </div>
   );