@dxos/plugin-assistant 0.8.4-main.c1de068 → 0.8.4-main.c4373fc

package/src/components/ChatThread/registry.tsx

@@ -0,0 +1,184 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React from 'react';
+
+import { log } from '@dxos/log';
+import {
+  PromptWidget,
+  ReferenceWidget,
+  SelectWidget,
+  SuggestionWidget,
+  SummaryWidget,
+  ToggleContainer,
+} from '@dxos/react-ui-components';
+import { type XmlWidgetProps, type XmlWidgetRegistry, getXmlTextChild } from '@dxos/react-ui-editor';
+import { Json } from '@dxos/react-ui-syntax-highlighter';
+import { ContentBlock, type DataType } from '@dxos/schema';
+
+import { ToolBlock } from '../ToolBlock';
+
+import { type BlockRenderer, type MessageThreadContext } from './sync';
+
+const Fallback = ({ _tag, ...props }: XmlWidgetProps<MessageThreadContext>) => {
+  return (
+    <ToggleContainer.Root classNames='rounded-sm'>
+      <ToggleContainer.Header classNames='bg-groupSurface'>{_tag}</ToggleContainer.Header>
+      <ToggleContainer.Content classNames='bg-modalSurface'>
+        <Json classNames='!p-2 text-sm' data={props} />
+      </ToggleContainer.Content>
+    </ToggleContainer.Root>
+  );
+};
+
+/**
+ * Custom XML tags registry.
+ */
+export const componentRegistry: XmlWidgetRegistry = {
+  //
+  // Widgets
+  //
+
+  ['prompt' as const]: {
+    block: true,
+    factory: (props) => {
+      const text = getXmlTextChild(props.children);
+      return text ? new PromptWidget(text) : null;
+    },
+  },
+  ['reference' as const]: {
+    block: false,
+    factory: (props) => {
+      const text = getXmlTextChild(props.children);
+      return text && props.ref ? new ReferenceWidget(text, props.ref) : null;
+    },
+  },
+  ['select' as const]: {
+    block: true,
+    factory: (props) => {
+      const options = props.children
+        ?.map((option: any) => option._tag === 'option' && getXmlTextChild(option.children))
+        .filter(Boolean);
+      return options?.length ? new SelectWidget(options) : null;
+    },
+  },
+  ['suggestion' as const]: {
+    block: true,
+    factory: (props) => {
+      const text = getXmlTextChild(props.children);
+      return text ? new SuggestionWidget(text) : null;
+    },
+  },
+  ['summary' as const]: {
+    block: true,
+    factory: (props) => {
+      const text = getXmlTextChild(props.children);
+      return text ? new SummaryWidget(text) : null;
+    },
+  },
+
+  //
+  // React
+  //
+
+  ['toolCall' as const]: {
+    block: true,
+    Component: ToolBlock,
+  },
+  ['toolResult' as const]: {
+    block: true,
+    Component: Fallback,
+  },
+  ['toolkit' as const]: {
+    block: true,
+    Component: Fallback,
+  },
+
+  //
+  // Fallback
+  //
+
+  ['json' as const]: {
+    block: true,
+    Component: Fallback,
+  },
+};
+
+/**
+ * Convert block to markdown.
+ */
+export const blockToMarkdown: BlockRenderer = (
+  context: MessageThreadContext,
+  message: DataType.Message,
+  block: ContentBlock.Any,
+) => {
+  let str = _blockToMarkdown(context, message, block);
+  if (str && !block.pending) {
+    return (str += '\n');
+  }
+
+  return str;
+};
+
+const _blockToMarkdown = (context: MessageThreadContext, message: DataType.Message, block: ContentBlock.Any) => {
+  log('blockToMarkdown', { block: JSON.stringify(block) });
+  switch (block._tag) {
+    case 'text': {
+      if (message.sender.role === 'user') {
+        return `\n<prompt>${block.text}</prompt>\n`;
+      } else {
+        const text = block.text.trim();
+        if (text.length > 0) {
+          return text;
+        }
+      }
+      break;
+    }
+
+    case 'suggestion': {
+      if (block.pending) {
+        return;
+      }
+      return `<suggestion>${block.text}</suggestion>`;
+    }
+    case 'select': {
+      if (block.pending || block.options.length === 0) {
+        return;
+      }
+
+      return `<select>${block.options.map((option) => `<option>${option}</option>`).join('')}</select>`;
+    }
+
+    // TODO(burdon): Need label.
+    case 'reference': {
+      return `<reference ref="${block.reference.dxn.toString()}">Ref</reference>`;
+    }
+
+    // case 'toolkit': {
+    //   return `<toolkit />`;
+    // }
+
+    case 'toolCall': {
+      context.updateWidget(block.toolCallId, {
+        blocks: [block],
+      });
+      return `<toolCall id="${block.toolCallId}" />`;
+    }
+    case 'toolResult': {
+      context.updateWidget(block.toolCallId, ({ blocks = [] }: { blocks: ContentBlock.Any[] }) => ({
+        blocks: [...blocks, block],
+      }));
+      break;
+    }
+
+    case 'summary': {
+      return `<summary>${ContentBlock.createSummaryMessage(block)}</summary>`;
+    }
+
+    // TODO(burdon): Need stable ID.
+    default: {
+      return `<json id="${message.id}">\n${JSON.stringify(block)}\n</json>`;
+    }
+  }
+};

package/src/components/ChatThread/sync.test.ts

@@ -0,0 +1,81 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { EditorView } from '@codemirror/view';
+import { describe, it } from '@effect/vitest';
+import * as Effect from 'effect/Effect';
+
+import { type ContentBlock } from '@dxos/schema';
+
+import { createMessage } from '../../testing';
+
+import { blockToMarkdown } from './registry';
+import { MessageSyncer, type TextModel } from './sync';
+
+class TestDocument implements TextModel {
+  private readonly _view = new EditorView({ extensions: [] });
+
+  get content() {
+    return this._view.state.doc.toString();
+  }
+
+  async reset(text: string) {
+    this._view.dispatch({ changes: { from: 0, to: this._view.state.doc.length, insert: text } });
+  }
+
+  async append(text: string) {
+    this._view.dispatch({ changes: { from: this._view.state.doc.length, insert: text } });
+  }
+
+  updateWidget(_id: string, _value: any) {}
+}
+
+describe('reducers', () => {
+  it.effect(
+    'basic sync',
+    Effect.fn(function* ({ expect }) {
+      const doc = new TestDocument();
+      const syncer = new MessageSyncer(doc, blockToMarkdown);
+
+      const messages = [
+        createMessage('user', [{ _tag: 'text', text: 'Hello' }]),
+        createMessage('assistant', [{ _tag: 'text', text: 'Hi there!' }]),
+      ];
+
+      syncer.sync(messages);
+      expect(doc.content).toEqual(['\n<prompt>Hello</prompt>\n', 'Hi there!', ''].join('\n'));
+
+      messages[1].blocks.push({ _tag: 'text', text: 'How can I help?' });
+      syncer.sync(messages);
+      expect(doc.content).toEqual(['\n<prompt>Hello</prompt>\n', 'Hi there!', 'How can I help?', ''].join('\n'));
+    }),
+  );
+
+  it.effect(
+    'sync with partial updates',
+    Effect.fn(function* ({ expect }) {
+      const doc = new TestDocument();
+      const syncer = new MessageSyncer(doc, blockToMarkdown);
+
+      const messages = [
+        createMessage('user', [{ _tag: 'text', text: 'Hello' }]),
+        createMessage('assistant', [{ _tag: 'text', text: 'Hi there!', pending: true }]),
+      ];
+
+      syncer.sync(messages);
+      expect(doc.content).toEqual(['\n<prompt>Hello</prompt>\n', 'Hi there!'].join('\n'));
+
+      const block = messages[1].blocks[0] as ContentBlock.Text;
+      block.text = 'Hi there! How are you?';
+      block.pending = false;
+      syncer.sync(messages);
+
+      messages[1].blocks.push({ _tag: 'text', text: 'How can I help?' });
+      syncer.sync(messages);
+      expect(doc.content).toEqual(
+        ['\n<prompt>Hello</prompt>\n', 'Hi there! How are you?', 'How can I help?', ''].join('\n'),
+      );
+    }),
+  );
+});

package/src/components/ChatThread/sync.ts

@@ -0,0 +1,113 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { log } from '@dxos/log';
+import { type MarkdownStreamController } from '@dxos/react-ui-components';
+import { type XmlWidgetStateManager } from '@dxos/react-ui-editor';
+import { type ContentBlock, type DataType } from '@dxos/schema';
+
+/**
+ * Update document.
+ */
+export type TextModel = Pick<MarkdownStreamController, 'reset' | 'append' | 'updateWidget'>;
+
+/**
+ * Thread context passed to renderer.
+ */
+export class MessageThreadContext implements Pick<MarkdownStreamController, 'updateWidget'> {
+  constructor(private readonly _widgetState?: XmlWidgetStateManager) {}
+
+  updateWidget<T>(id: string, value: T) {
+    this._widgetState?.updateWidget(id, value);
+  }
+}
+
+/**
+ * Renders a block to markdown.
+ */
+export type BlockRenderer = (
+  context: MessageThreadContext,
+  message: DataType.Message,
+  block: ContentBlock.Any,
+) => string | undefined;
+
+/**
+ * Syncs messages with the editor.
+ */
+export class MessageSyncer {
+  private _initialMessageId?: string;
+  private _currentMessageIndex = 0;
+  private _currentBlockIndex = 0;
+  private _currentBlockContent?: string;
+
+  private readonly _context: MessageThreadContext;
+
+  constructor(
+    private readonly _model: TextModel,
+    private readonly _blockRenderer: BlockRenderer,
+  ) {
+    this._context = new MessageThreadContext(this._model);
+  }
+
+  get context() {
+    return this._context;
+  }
+
+  reset() {
+    log('reset');
+    this._initialMessageId = undefined;
+    this._currentMessageIndex = 0;
+    this._currentBlockIndex = 0;
+    this._currentBlockContent = undefined;
+    void this._model.reset('');
+  }
+
+  sync(messages: DataType.Message[]) {
+    log('sync', {
+      messages: messages.map((message) => message.blocks.length),
+      currentMessageIndex: this._currentMessageIndex,
+      currentBlockIndex: this._currentBlockIndex,
+      currentBlockContent: this._currentBlockContent,
+    });
+    if (this._initialMessageId !== messages[0]?.id) {
+      this.reset();
+      this._initialMessageId = messages[0]?.id;
+    }
+
+    let i = this._currentMessageIndex;
+    for (const message of messages.slice(this._currentMessageIndex)) {
+      if (i > this._currentMessageIndex) {
+        this._currentBlockIndex = 0;
+      }
+
+      this._currentMessageIndex = i;
+      let j = this._currentBlockIndex;
+      for (const block of message.blocks.slice(this._currentBlockIndex)) {
+        this._currentBlockIndex = j;
+        const currentBlockContent = this._blockRenderer(this._context, message, block);
+        if (currentBlockContent) {
+          let content: string = '';
+          if (this._currentBlockContent && currentBlockContent.startsWith(this._currentBlockContent)) {
+            content = currentBlockContent.slice(this._currentBlockContent.length);
+          } else {
+            content = currentBlockContent;
+          }
+
+          void this._model.append(content);
+          this._currentBlockContent = currentBlockContent;
+          log('append', { message: i, block: j, content });
+        }
+
+        if (block.pending) {
+          return;
+        } else {
+          this._currentBlockContent = undefined;
+          this._currentBlockIndex++;
+        }
+        j++;
+      }
+      i++;
+    }
+  }
+}

package/src/components/PromptSettings.tsx

@@ -62,6 +62,7 @@ export const PromptSettings = ({ template }: { template: Template.Template }) =>
                   </Select.Option>
                 ))}
               </Select.Viewport>
+              <Select.Arrow />
             </Select.Content>
           </Select.Portal>
         </Select.Root> */}

package/src/components/SequenceContainer.tsx

@@ -4,19 +4,18 @@
 
 import { type EditorView } from '@codemirror/view';
 import JSON5 from 'json5';
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 
-import { ToolRegistry } from '@dxos/ai';
-import { getSpace } from '@dxos/client/echo';
 import { type Sequence, type SequenceDefinition } from '@dxos/conductor';
 import { Key } from '@dxos/echo';
 import { Toolbar, useTranslation } from '@dxos/react-ui';
 import { useSelectionManager } from '@dxos/react-ui-attention';
 import { StackItem } from '@dxos/react-ui-stack';
 
-import { SequenceEditor } from './SequenceEditor';
 import { meta } from '../meta';
 
+import { SequenceEditor } from './SequenceEditor';
+
 // TODO(burdon): Move to config.
 export const EXA_API_KEY = '9c7e17ff-0c85-4cd5-827a-8b489f139e03';
 
@@ -26,7 +25,7 @@ const parseSequence = (text: string): SequenceDefinition | undefined => {
     const json = JSON5.parse(text);
     const { steps } = json;
     return { steps };
-  } catch (error) {
+  } catch {
     // Ignore.
   }
 };
@@ -41,32 +40,32 @@ export const SequenceContainer = ({ sequence }: { sequence: Sequence }) => {
     });
   }, [sequence]);
 
-  const editorRef = useRef<EditorView | undefined>(undefined);
+  const editorRef = useRef<EditorView>(null);
 
   // TODO(burdon): Factor out.
-  const toolRegistry = useMemo(() => {
-    const space = getSpace(sequence);
-    if (!space) {
-      return;
-    }
-
-    // TODO(burdon): How should the queue be created?
-    // eslint-disable-next-line no-unused-vars
-    const _queue = space.queues.create();
-
-    return new ToolRegistry([
-      // createExaTool({ apiKey: EXA_API_KEY }),
-      // createLocalSearchTool(space.db, queue),
-      // createGraphWriterTool({
-      //   db: space.db,
-      //   queue,
-      //   schema: [], // TODO(burdon): Get schema from client/sequence?
-      //   onDone: async (objects) => {
-      //     await queue.append(objects);
-      //   },
-      // }),
-    ]);
-  }, [sequence]);
+  // const toolRegistry = useMemo(() => {
+  //   const space = getSpace(sequence);
+  //   if (!space) {
+  //     return;
+  //   }
+
+  //   // TODO(burdon): How should the queue be created?
+  //   // eslint-disable-next-line no-unused-vars
+  //   const _queue = space.queues.create();
+
+  //   return new ToolRegistry([
+  //     // createExaTool({ apiKey: EXA_API_KEY }),
+  //     // createLocalSearchTool(space.db, queue),
+  //     // createGraphWriterTool({
+  //     //   db: space.db,
+  //     //   queue,
+  //     //   schema: [], // TODO(burdon): Get schema from client/sequence?
+  //     //   onDone: async (objects) => {
+  //     //     await queue.append(objects);
+  //     //   },
+  //     // }),
+  //   ]);
+  // }, [sequence]);
 
   const formatAndSave = useCallback((): SequenceDefinition | undefined => {
     if (!sequence) {
@@ -116,7 +115,7 @@ export const SequenceContainer = ({ sequence }: { sequence: Sequence }) => {
     // }
     // const machine = new SequenceMachine(toolRegistry, sequence).setLogger(new QueueLogger(sequence));
     // await machine.runToCompletion({ aiClient: aiClient.value, input });
-  }, [sequence, formatAndSave, selectionManager, toolRegistry]);
+  }, [sequence, formatAndSave, selectionManager]);
 
   return (
     <StackItem.Content toolbar>

package/src/components/SequenceEditor/SequenceEditor.stories.tsx

@@ -2,24 +2,27 @@
 // Copyright 2025 DXOS.org
 //
 
-import '@dxos-theme';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React from 'react';
 
-import { type StoryObj, type Meta } from '@storybook/react-vite';
+import { withTheme } from '@dxos/react-ui/testing';
 
-import { withLayout, withTheme } from '@dxos/storybook-utils';
-
-import { SequenceEditor } from './SequenceEditor';
 import { RESEARCH_SEQUENCE_DEFINITION } from '../../testing';
 import { translations } from '../../translations';
 
-const meta: Meta<typeof SequenceEditor> = {
+import { SequenceEditor } from './SequenceEditor';
+
+const meta = {
   title: 'plugins/plugin-assistant/SequenceEditor',
   component: SequenceEditor,
-  decorators: [withTheme, withLayout({ fullscreen: true, classNames: 'mli-auto max-is-[50rem] justify-center' })],
+  // TODO(wittjosiah): Fix story.
+  render: () => <>TODO</>,
+  decorators: [withTheme],
   parameters: {
+    layout: 'column',
     translations,
   },
-};
+} satisfies Meta<typeof SequenceEditor>;
 
 export default meta;
 

package/src/components/SequenceEditor/SequenceEditor.tsx

@@ -6,7 +6,7 @@ import React, { forwardRef, useImperativeHandle } from 'react';
 
 import { SequenceDefinition } from '@dxos/conductor';
 import { Type } from '@dxos/echo';
-import { useThemeContext, type ThemedClassName } from '@dxos/react-ui';
+import { type ThemedClassName, useThemeContext } from '@dxos/react-ui';
 import {
   type EditorView,
   createBasicExtensions,
@@ -21,7 +21,7 @@ export type SequenceEditorProps = ThemedClassName<{
 }>;
 
 // TODO(burdon): Factor out JsonEditor.
-export const SequenceEditor = forwardRef<EditorView | undefined, SequenceEditorProps>(
+export const SequenceEditor = forwardRef<EditorView | null, SequenceEditorProps>(
   ({ classNames, sequence }, forwardedRef) => {
     const { themeMode } = useThemeContext();
     const { parentRef, view } = useTextEditor({
@@ -43,7 +43,7 @@ export const SequenceEditor = forwardRef<EditorView | undefined, SequenceEditorP
       ],
     });
 
-    useImperativeHandle(forwardedRef, () => view, [view]);
+    useImperativeHandle<EditorView | null, EditorView | null>(forwardedRef, () => view, [view]);
 
     return <div ref={parentRef} className={mx('overflow-hidden', classNames)} />;
   },

package/src/components/TemplateEditor/TemplateEditor.stories.tsx

@@ -2,26 +2,25 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
 import { createSystemPrompt } from '@dxos/assistant';
-import { Template } from '@dxos/blueprints';
+import { Blueprint, Template } from '@dxos/blueprints';
 import { useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
-import { ColumnContainer, withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 import { trim } from '@dxos/util';
 
-import { TemplateEditor, type TemplateEditorProps } from './TemplateEditor';
 import { translations } from '../../translations';
 
+import { TemplateEditor, type TemplateEditorProps } from './TemplateEditor';
+
 const TEMPLATE = trim`
   {{! System Prompt }}
   
   You are a machine that is an expert chess player.
-  The move history of the current game is: {{history}}
+  The move history of the current game is: {{history}}.
   If asked to suggest a move explain why it is a good move.
 
   {{#each artifacts}}
@@ -35,35 +34,47 @@ const TEMPLATE = trim`
 
 const DefaultStory = ({ source }: TemplateEditorProps & { source: string }) => {
   const client = useClient();
-  const [template] = useState(() => {
+  const [blueprint] = useState(() => {
     const space = client.spaces.default;
-    return space.db.add(Template.make({ source }));
+    return space.db.add(
+      Blueprint.make({
+        key: 'example.com/blueprint/test',
+        name: 'Test',
+        instructions: Template.make({ source }),
+      }),
+    );
   });
 
-  return <TemplateEditor template={template} />;
+  return (
+    <TemplateEditor
+      classNames='bg-baseSurface max-is-prose is-full'
+      id={blueprint.id}
+      template={blueprint.instructions}
+    />
+  );
 };
 
-const meta: Meta<typeof DefaultStory> = {
+const meta = {
   title: 'plugins/plugin-assistant/TemplateEditor',
-  component: TemplateEditor,
+  component: TemplateEditor as any,
   render: DefaultStory,
   decorators: [
+    withTheme,
     withClientProvider({
+      types: [Blueprint.Blueprint],
       createIdentity: true,
       createSpace: true,
-      types: [Template.Template],
     }),
-    withLayout({ fullscreen: true, Container: ColumnContainer }),
-    withTheme,
   ],
   parameters: {
+    layout: 'column',
     translations,
   },
-};
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
 
-type Story = Meta<typeof DefaultStory>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {