@dxos/plugin-assistant 0.8.3 → 0.8.4-main.1f223c7

package/src/components/PromptSettings.tsx

@@ -2,72 +2,71 @@
 // 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>
                 ))}
               </Select.Viewport>
+              <Select.Arrow />
             </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 +74,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 +83,7 @@ export const PromptSettings = ({ template }: { template: TemplateType }) => {
               onChange={handleDescriptionChange}
             />
           </Input.Root>
-        )}
+        )} */}
       </Toolbar.Root>
     </div>
   );

package/src/components/SequenceContainer.tsx

@@ -0,0 +1,131 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type EditorView } from '@codemirror/view';
+import JSON5 from 'json5';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+
+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]);
+
+  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 = {
+  title: 'plugins/plugin-assistant/SequenceEditor',
+  component: SequenceEditor,
+  decorators: [withTheme, withLayout({ fullscreen: true, classNames: 'mli-auto max-is-[50rem] justify-center' })],
+  parameters: {
+    translations,
+  },
+} satisfies Meta<typeof SequenceEditor>;
+
+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,80 +4,88 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react';
+import { type Meta, type StoryObj } 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 { 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>
+    <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: [
     withClientProvider({
+      types: [Blueprint.Blueprint],
       createIdentity: true,
       createSpace: true,
-      types: [TemplateType],
     }),
-    withLayout({ fullscreen: true, classNames: 'flex justify-center' }),
+    withLayout({ fullscreen: true, classNames: 'justify-center bg-deckSurface' }),
     withTheme,
   ],
   parameters: {
     translations,
   },
-};
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
 
-type Story = Meta<typeof DefaultStory>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {
-    text: TEMPLATE,
+    source: TEMPLATE,
   },
 };
 
 export const System: Story = {
   args: {
-    text: createSystemPrompt(),
+    source: createSystemPrompt({}),
   },
 };

package/src/components/TemplateEditor/TemplateEditor.tsx

@@ -2,75 +2,57 @@
 // Copyright 2025 DXOS.org
 //
 
-import { HighlightStyle, LanguageSupport, syntaxHighlighting } from '@codemirror/language';
-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,
+  createMarkdownExtensions,
   createThemeExtensions,
   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: [
-    styleTags({
-      '---': tags.lineComment,
-    }),
-  ],
-});
+import { handlebars } from './handlebars-extension';
 
 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;
+    if (!text) {
+      return {};
+    }
+
+    return {
+      initialValue: text.content ?? '',
       extensions: [
-        createDataExtensions({
-          id: template.id,
-          text: template.source !== undefined ? createDocAccessor(template, ['template']) : undefined,
-        }),
+        createDataExtensions({ id, text: createDocAccessor(text, ['content']) }),
         createBasicExtensions({
           bracketMatching: false,
+          lineNumbers: true,
           lineWrapping: true,
           placeholder: t('template placeholder'),
         }),
-        createThemeExtensions({
-          themeMode,
-          slots: {
-            content: { className: '!p-3' },
-          },
-        }),
+        createThemeExtensions({ themeMode }),
 
-        // https://github.com/xiechao/lang-handlebars
-        new LanguageSupport(handlebarsLanguage, syntaxHighlighting(handlebarsHighlightStyle)),
-      ],
-    }),
-    [themeMode, prompt],
-  );
+        // Extend markdown with handlebars support.
+        createMarkdownExtensions(),
+        handlebars(),
+      ].filter(isNotFalsy),
+    };
+  }, [themeMode, template.source?.target]);
 
-  return <div ref={parentRef} className={mx(classNames)} />;
+  return <div ref={parentRef} className={mx('bs-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' },
-]);

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

@@ -4,51 +4,58 @@
 
 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>
   );
 };
 
-const meta: Meta<typeof TemplateForm> = {
+const meta = {
   title: 'plugins/plugin-assistant/TemplateForm',
   component: TemplateForm,
   render: DefaultStory,
   decorators: [
     withClientProvider({
+      types: [Blueprint.Blueprint],
       createIdentity: true,
       createSpace: true,
-      types: [TemplateType],
     }),
     withLayout({ fullscreen: true, classNames: 'flex justify-center' }),
     withTheme,
@@ -56,7 +63,7 @@ const meta: Meta<typeof TemplateForm> = {
   parameters: {
     translations,
   },
-};
+} satisfies Meta<typeof TemplateForm>;
 
 export default meta;