@dxos/plugin-assistant 0.8.4-main.f9ba587 → 0.8.4-main.fd6878d

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 { meta } from '../meta';
-import { TemplateKinds, type TemplateType, type TemplateKindSchema } from '../types';
 
-export const PromptSettings = ({ template }: { template: TemplateType }) => {
+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>
   );

package/src/components/SequenceContainer.tsx

@@ -7,19 +7,16 @@ import JSON5 from 'json5';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import { ToolRegistry } from '@dxos/ai';
-import { useCapability } from '@dxos/app-framework';
-import { createLocalSearchTool, createExaTool, createGraphWriterTool } from '@dxos/assistant';
 import { getSpace } from '@dxos/client/echo';
-import { type Sequence, type SequenceDefinition, SequenceMachine } from '@dxos/conductor';
-import { DXN, Key } from '@dxos/echo';
+import { type Sequence, type SequenceDefinition } from '@dxos/conductor';
+import { Key } from '@dxos/echo';
 import { Toolbar, useTranslation } from '@dxos/react-ui';
-import { getSelectionSet, useSelectionManager } from '@dxos/react-ui-attention';
-import { StackItem, type StackItemContentProps } from '@dxos/react-ui-stack';
+import { useSelectionManager } from '@dxos/react-ui-attention';
+import { StackItem } from '@dxos/react-ui-stack';
 
-import { SequenceEditor } from './SequenceEditor';
-import { AssistantCapabilities } from '../capabilities';
 import { meta } from '../meta';
-import { QueueLogger } from '../queue-logger';
+
+import { SequenceEditor } from './SequenceEditor';
 
 // TODO(burdon): Move to config.
 export const EXA_API_KEY = '9c7e17ff-0c85-4cd5-827a-8b489f139e03';
@@ -35,9 +32,8 @@ const parseSequence = (text: string): SequenceDefinition | undefined => {
   }
 };
 
-export const SequenceContainer = ({ role, sequence }: Pick<StackItemContentProps, 'role'> & { sequence: Sequence }) => {
+export const SequenceContainer = ({ sequence }: { sequence: Sequence }) => {
   const { t } = useTranslation(meta.id);
-  const aiClient = useCapability(AssistantCapabilities.AiClient);
   const selectionManager = useSelectionManager();
   const [definition, setDefinition] = useState<SequenceDefinition>();
   useEffect(() => {
@@ -56,19 +52,20 @@ export const SequenceContainer = ({ role, sequence }: Pick<StackItemContentProps
     }
 
     // TODO(burdon): How should the queue be created?
-    const queue = space.queues.create();
+    // 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);
-        },
-      }),
+      // 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]);
 
@@ -109,24 +106,21 @@ export const SequenceContainer = ({ role, sequence }: Pick<StackItemContentProps
   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 });
-  }, [aiClient.value, sequence, formatAndSave, selectionManager, toolRegistry]);
+    // 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 role={role} toolbar>
+    <StackItem.Content toolbar>
       <Toolbar.Root>
         <Toolbar.Button onClick={handleSave}>{t('button save')}</Toolbar.Button>
         <Toolbar.Button onClick={handleRun}>{t('button run')}</Toolbar.Button>

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

@@ -4,14 +4,15 @@
 
 import '@dxos-theme';
 
-import { type StoryObj, type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
-import { SequenceEditor } from './SequenceEditor';
 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,

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,

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

@@ -7,45 +7,47 @@ import '@dxos-theme';
 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 { 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 }) => {
+
+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}}
+  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 { meta } from '../../meta';
-import { type TemplateType } from '../../types';
 
 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) => {
+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

@@ -7,35 +7,42 @@ import '@dxos-theme';
 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 { 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');
+import { TemplateForm } from './TemplateForm';
+
+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,