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

package/src/components/SequenceContainer.tsx

@@ -0,0 +1,133 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type EditorView } from '@codemirror/view';
+import JSON5 from 'json5';
+import React, { useCallback, useEffect, useMemo, 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 { meta } from '../meta';
+
+import { SequenceEditor } from './SequenceEditor';
+
+// TODO(burdon): Move to config.
+export const EXA_API_KEY = '9c7e17ff-0c85-4cd5-827a-8b489f139e03';
+
+// TODO(burdon): Validate.
+const parseSequence = (text: string): SequenceDefinition | undefined => {
+  try {
+    const json = JSON5.parse(text);
+    const { steps } = json;
+    return { steps };
+  } catch (error) {
+    // Ignore.
+  }
+};
+
+export const SequenceContainer = ({ sequence }: { sequence: Sequence }) => {
+  const { t } = useTranslation(meta.id);
+  const selectionManager = useSelectionManager();
+  const [definition, setDefinition] = useState<SequenceDefinition>();
+  useEffect(() => {
+    setDefinition({
+      steps: sequence.steps.map(({ instructions, tools }) => ({ instructions, tools })),
+    });
+  }, [sequence]);
+
+  const editorRef = useRef<EditorView | undefined>(undefined);
+
+  // 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 formatAndSave = useCallback((): SequenceDefinition | undefined => {
+    if (!sequence) {
+      return;
+    }
+
+    const text = editorRef.current?.state.doc.toString();
+    if (!text) {
+      return;
+    }
+
+    const definition = parseSequence(text);
+    if (!definition) {
+      return;
+    }
+
+    setDefinition(definition);
+    const formatted = JSON.stringify(definition, null, 2);
+    editorRef.current?.dispatch({
+      changes: { from: 0, to: text.length, insert: formatted },
+    });
+
+    sequence.steps.length = 0;
+    for (const step of definition.steps) {
+      sequence.steps.push({
+        id: Key.ObjectId.random(),
+        instructions: step.instructions,
+        tools: step.tools,
+      });
+    }
+
+    return sequence;
+  }, [sequence]);
+
+  // TODO(burdon): Save raw sequence separately from parsed sequence? (like Script).
+  const handleSave = useCallback(() => formatAndSave(), [formatAndSave]);
+
+  const handleRun = useCallback(async () => {
+    // if (!aiClient?.value || !toolRegistry) {
+    //   return;
+    // }
+    // formatAndSave();
+    // // Get input from selection.
+    // const input = Array.from(getSelectionSet(selectionManager)).map((id) => DXN.fromLocalObjectId(id));
+    // if (!input.length) {
+    //   return;
+    // }
+    // const machine = new SequenceMachine(toolRegistry, sequence).setLogger(new QueueLogger(sequence));
+    // await machine.runToCompletion({ aiClient: aiClient.value, input });
+  }, [sequence, formatAndSave, selectionManager, toolRegistry]);
+
+  return (
+    <StackItem.Content toolbar>
+      <Toolbar.Root>
+        <Toolbar.Button onClick={handleSave}>{t('button save')}</Toolbar.Button>
+        <Toolbar.Button onClick={handleRun}>{t('button run')}</Toolbar.Button>
+      </Toolbar.Root>
+      {definition && <SequenceEditor ref={editorRef} sequence={definition} />}
+    </StackItem.Content>
+  );
+};
+
+export default SequenceContainer;

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

@@ -0,0 +1,33 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import '@dxos-theme';
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+
+import { withLayout, withTheme } from '@dxos/storybook-utils';
+
+import { RESEARCH_SEQUENCE_DEFINITION } from '../../testing';
+import { translations } from '../../translations';
+
+import { SequenceEditor } from './SequenceEditor';
+
+const meta: Meta<typeof SequenceEditor> = {
+  title: 'plugins/plugin-assistant/SequenceEditor',
+  component: SequenceEditor,
+  decorators: [withTheme, withLayout({ fullscreen: true, classNames: 'mli-auto max-is-[50rem] justify-center' })],
+  parameters: {
+    translations,
+  },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof SequenceEditor>;
+
+export const Default: Story = {
+  args: {
+    sequence: RESEARCH_SEQUENCE_DEFINITION,
+  },
+};

package/src/components/{BlueprintEditor/BlueprintEditor.tsx → SequenceEditor/SequenceEditor.tsx}

@@ -4,9 +4,9 @@
 
 import React, { forwardRef, useImperativeHandle } from 'react';
 
-import { BlueprintDefinition } from '@dxos/assistant';
+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,
@@ -16,16 +16,16 @@ import {
 } from '@dxos/react-ui-editor';
 import { mx } from '@dxos/react-ui-theme';
 
-export type BlueprintEditorProps = ThemedClassName<{
-  blueprint: BlueprintDefinition;
+export type SequenceEditorProps = ThemedClassName<{
+  sequence: SequenceDefinition;
 }>;
 
 // TODO(burdon): Factor out JsonEditor.
-export const BlueprintEditor = forwardRef<EditorView | undefined, BlueprintEditorProps>(
-  ({ classNames, blueprint }, forwardedRef) => {
+export const SequenceEditor = forwardRef<EditorView | undefined, SequenceEditorProps>(
+  ({ classNames, sequence }, forwardedRef) => {
     const { themeMode } = useThemeContext();
     const { parentRef, view } = useTextEditor({
-      initialValue: JSON.stringify(blueprint, null, 2),
+      initialValue: JSON.stringify(sequence, null, 2),
       extensions: [
         createBasicExtensions({
           lineNumbers: true,
@@ -38,7 +38,7 @@ export const BlueprintEditor = forwardRef<EditorView | undefined, BlueprintEdito
           syntaxHighlighting: true,
         }),
         createJsonExtensions({
-          schema: Type.toJsonSchema(BlueprintDefinition, { strict: true }),
+          schema: Type.toJsonSchema(SequenceDefinition, { strict: true }),
         }),
       ],
     });

package/src/components/SequenceEditor/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * from './SequenceEditor';

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

@@ -4,48 +4,50 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react';
+import { type Meta } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
-import { createSystemPrompt } from '@dxos/artifact';
-import { Obj } from '@dxos/echo';
+import { createSystemPrompt } from '@dxos/assistant';
+import { Blueprint, Template } from '@dxos/blueprints';
 import { useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { ColumnContainer, withLayout, withTheme } from '@dxos/storybook-utils';
+import { trim } from '@dxos/util';
+
+import { translations } from '../../translations';
 
 import { TemplateEditor, type TemplateEditorProps } from './TemplateEditor';
-import translations from '../../translations';
-import { TemplateType } from '../../types';
-
-const TEMPLATE = [
-  '{{! System Prompt }}',
-  '',
-  'You are a machine that is an expert chess player.',
-  'The move history of the current game is: {{history}}',
-  'If asked to suggest a move explain why it is a good move.',
-  '',
-  '{{#each artifacts}}',
-  '- {{this}}',
-  '{{/each}}',
-  '',
-  '---',
-  '',
-  '{{input}}',
-  '',
-].join('\n');
-
-const DefaultStory = ({ text }: TemplateEditorProps & { text: string }) => {
+
+const TEMPLATE = trim`
+  {{! System Prompt }}
+  
+  You are a machine that is an expert chess player.
+  The move history of the current game is: {{history}}
+  If asked to suggest a move explain why it is a good move.
+
+  {{#each artifacts}}
+  - {{this}}
+  {{/each}}
+
+  ---
+
+  {{input}}
+`;
+
+const DefaultStory = ({ source }: TemplateEditorProps & { source: string }) => {
   const client = useClient();
-  const [template] = useState(() => {
+  const [blueprint] = useState(() => {
     const space = client.spaces.default;
-    return space.db.add(Obj.make(TemplateType, { source: text, kind: { include: 'manual' } }));
+    return space.db.add(
+      Blueprint.make({
+        key: 'example.com/blueprint/test',
+        name: 'Test',
+        instructions: Template.make({ source }),
+      }),
+    );
   });
 
-  return (
-    <div role='none' className='flex w-[50rem] overflow-hidden border-x border-separator'>
-      <TemplateEditor template={template} />
-    </div>
-  );
+  return <TemplateEditor id={blueprint.id} template={blueprint.instructions} />;
 };
 
 const meta: Meta<typeof DefaultStory> = {
@@ -56,9 +58,9 @@ const meta: Meta<typeof DefaultStory> = {
     withClientProvider({
       createIdentity: true,
       createSpace: true,
-      types: [TemplateType],
+      types: [Template.Template],
     }),
-    withLayout({ fullscreen: true, classNames: 'flex justify-center' }),
+    withLayout({ fullscreen: true, Container: ColumnContainer }),
     withTheme,
   ],
   parameters: {
@@ -72,12 +74,12 @@ type Story = Meta<typeof DefaultStory>;
 
 export const Default: Story = {
   args: {
-    text: TEMPLATE,
+    source: TEMPLATE,
   },
 };
 
 export const System: Story = {
   args: {
-    text: createSystemPrompt(),
+    source: createSystemPrompt({}),
   },
 };

package/src/components/TemplateEditor/TemplateEditor.tsx

@@ -7,8 +7,9 @@ import { styleTags, tags } from '@lezer/highlight';
 import { handlebarsLanguage } from '@xiechao/codemirror-lang-handlebars';
 import React from 'react';
 
+import { type Template } from '@dxos/blueprints';
 import { createDocAccessor } from '@dxos/react-client/echo';
-import { useThemeContext, useTranslation, type ThemedClassName } from '@dxos/react-ui';
+import { type ThemedClassName, useThemeContext, useTranslation } from '@dxos/react-ui';
 import {
   createBasicExtensions,
   createDataExtensions,
@@ -16,9 +17,9 @@ import {
   useTextEditor,
 } from '@dxos/react-ui-editor';
 import { mx } from '@dxos/react-ui-theme';
+import { isNotFalsy } from '@dxos/util';
 
-import { ASSISTANT_PLUGIN } from '../../meta';
-import { type TemplateType } from '../../types';
+import { meta } from '../../meta';
 
 handlebarsLanguage.configure({
   props: [
@@ -29,48 +30,63 @@ handlebarsLanguage.configure({
 });
 
 export type TemplateEditorProps = ThemedClassName<{
-  template: TemplateType;
+  id: string;
+  template: Template.Template;
 }>;
 
-export const TemplateEditor = ({ classNames, template }: TemplateEditorProps) => {
-  const { t } = useTranslation(ASSISTANT_PLUGIN);
+export const TemplateEditor = ({ id, classNames, template }: TemplateEditorProps) => {
+  const { t } = useTranslation(meta.id);
   const { themeMode } = useThemeContext();
-  const { parentRef } = useTextEditor(
-    () => ({
-      initialValue: template.source,
+  const { parentRef } = useTextEditor(() => {
+    const text = template.source?.target;
+    return {
+      initialValue: text?.content ?? '',
       extensions: [
-        createDataExtensions({
-          id: template.id,
-          text: template.source !== undefined ? createDocAccessor(template, ['template']) : undefined,
-        }),
+        text &&
+          createDataExtensions({
+            id,
+            text: createDocAccessor(text, ['content']),
+          }),
         createBasicExtensions({
           bracketMatching: false,
+          lineNumbers: true,
           lineWrapping: true,
+          monospace: true,
           placeholder: t('template placeholder'),
         }),
         createThemeExtensions({
           themeMode,
-          slots: {
-            content: { className: '!p-3' },
-          },
         }),
 
         // https://github.com/xiechao/lang-handlebars
         new LanguageSupport(handlebarsLanguage, syntaxHighlighting(handlebarsHighlightStyle)),
-      ],
-    }),
-    [themeMode, prompt],
-  );
+        // createMarkdownExtensions({}),
+      ].filter(isNotFalsy),
+    };
+  }, [themeMode, template.source?.target]);
 
-  return <div ref={parentRef} className={mx(classNames)} />;
+  return <div ref={parentRef} className={mx('h-full overflow-hidden', classNames)} />;
 };
 
 /**
  * https://github.com/xiechao/lang-handlebars/blob/direct/src/highlight.js
  */
 export const handlebarsHighlightStyle = HighlightStyle.define([
-  { tag: tags.tagName, class: 'text-redText' }, // Braces.
-  { tag: tags.variableName, class: 'text-blueText' },
-  { tag: tags.keyword, class: 'text-greenText' },
-  { tag: tags.comment, class: 'text-subdued' },
+  {
+    // Braces.
+    tag: tags.tagName,
+    class: 'text-redText',
+  },
+  {
+    tag: tags.variableName,
+    class: 'text-blueText',
+  },
+  {
+    tag: tags.keyword,
+    class: 'text-greenText',
+  },
+  {
+    tag: tags.comment,
+    class: 'text-subdued',
+  },
 ]);

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

@@ -4,38 +4,45 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react';
+import { type Meta } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
-import { Obj } from '@dxos/echo';
+import { Blueprint, Template } from '@dxos/blueprints';
 import { useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { trim } from '@dxos/util';
+
+import { translations } from '../../translations';
 
 import { TemplateForm } from './TemplateForm';
-import translations from '../../translations';
-import { TemplateType } from '../../types';
 
-const TEMPLATE = [
-  'You are a machine that is an expert chess player.',
-  'The move history of the current game is: {{history}}',
-  'If asked to suggest a move explain why it is a good move.',
-  '',
-  '---',
-  '',
-  '{{input}}',
-].join('\n');
+const TEMPLATE = trim`
+  You are a machine that is an expert chess player.
+  The move history of the current game is: {{history}}
+  If asked to suggest a move explain why it is a good move.
+  
+  ---
+ 
+  {{input}},
+`;
 
 const DefaultStory = () => {
   const client = useClient();
-  const [template] = useState(() => {
+  const [blueprint] = useState(() => {
     const space = client.spaces.default;
-    return space.db.add(Obj.make(TemplateType, { source: TEMPLATE, kind: { include: 'manual' } }));
+    return space.db.add(
+      Blueprint.make({
+        key: 'example.com/blueprint/test',
+        name: 'Test',
+        instructions: Template.make({ source: TEMPLATE }),
+      }),
+    );
   });
 
   return (
     <div role='none' className='flex w-[40rem] border border-separator overflow-hidden'>
-      <TemplateForm template={template} />
+      <TemplateForm id={blueprint.id} template={blueprint.instructions} />
     </div>
   );
 };
@@ -48,7 +55,7 @@ const meta: Meta<typeof TemplateForm> = {
     withClientProvider({
       createIdentity: true,
       createSpace: true,
-      types: [TemplateType],
+      types: [Template.Template],
     }),
     withLayout({ fullscreen: true, classNames: 'flex justify-center' }),
     withTheme,