@dxos/plugin-assistant 0.8.3 → 0.8.4-main.5acf9ea

package/src/components/TemplateEditor/TemplateEditor.tsx

@@ -7,6 +7,7 @@ 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 {
@@ -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,62 @@ 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],
-  );
+      ].filter(isNotFalsy),
+    };
+  }, [themeMode, template.source?.target]);
 
-  return <div ref={parentRef} className={mx(classNames)} />;
+  return <div ref={parentRef} className={mx('h-full', 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,38 @@
 
 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 { TemplateForm } from './TemplateForm';
-import translations from '../../translations';
-import { TemplateType } from '../../types';
+import { translations } from '../../translations';
 
-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({ name: 'Test', instructions: { 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 +48,7 @@ const meta: Meta<typeof TemplateForm> = {
     withClientProvider({
       createIdentity: true,
       createSpace: true,
-      types: [TemplateType],
+      types: [Template.Template],
     }),
     withLayout({ fullscreen: true, classNames: 'flex justify-center' }),
     withTheme,

package/src/components/TemplateEditor/TemplateForm.tsx

@@ -5,34 +5,34 @@
 import { type Schema } from 'effect';
 import React, { Fragment, useEffect } from 'react';
 
+import { type Template } from '@dxos/blueprints';
 import { Input, Select, useTranslation } from '@dxos/react-ui';
 import { attentionSurface, groupBorder, mx } from '@dxos/react-ui-theme';
 import { isNonNullable } from '@dxos/util';
 
 import { TemplateEditor } from './TemplateEditor';
-import { ASSISTANT_PLUGIN } from '../../meta';
-import { type TemplateInput, TemplateInputType, type TemplateType } from '../../types';
+import { meta } from '../../meta';
 
 export type TemplateFormProps = {
-  template: TemplateType;
+  id: string;
+  template: Template.Template;
   schema?: Schema.Schema<any, any, any>;
   commandEditable?: boolean;
 };
 
-export const TemplateForm = ({ template, commandEditable = true }: TemplateFormProps) => {
-  const { t } = useTranslation(ASSISTANT_PLUGIN);
-
+export const TemplateForm = ({ id, template, commandEditable = true }: TemplateFormProps) => {
+  const { t } = useTranslation(meta.id);
   usePromptInputs(template);
 
   return (
     <div className={mx('flex flex-col w-full overflow-hidden gap-4', groupBorder)}>
-      {commandEditable && (
+      {/* {commandEditable && (
         <div className='flex items-center pl-4'>
           <span className='text-neutral-500'>/</span>
           <Input.Root>
             <Input.TextInput
               placeholder={t('command placeholder')}
-              classNames={mx('is-full bg-transparent m-2')}
+              classNames='is-full bg-transparent m-2'
               value={template.command ?? ''}
               onChange={(event) => {
                 template.command = event.target.value.replace(/\w/g, '');
@@ -40,9 +40,9 @@ export const TemplateForm = ({ template, commandEditable = true }: TemplateFormP
             />
           </Input.Root>
         </div>
-      )}
+      )} */}
 
-      <TemplateEditor template={template} classNames={[attentionSurface, 'min-h-[120px]']} />
+      <TemplateEditor id={id} template={template} classNames={[attentionSurface, 'min-h-[120px]']} />
 
       {(template.inputs?.length ?? 0) > 0 && (
         <div className='grid grid-cols-[10rem_10rem_1fr] gap-1 items-center'>
@@ -52,17 +52,17 @@ export const TemplateForm = ({ template, commandEditable = true }: TemplateFormP
 
               <Input.Root>
                 <Select.Root
-                  value={String(input.type)}
-                  onValueChange={(type) => {
-                    input.type = getInputType(type) ?? TemplateInputType.VALUE;
+                  value={input.kind}
+                  onValueChange={(kind) => {
+                    input.kind = kind as Template.InputKind;
                   }}
                 >
                   <Select.TriggerButton placeholder='Type' classNames='is-full' />
                   <Select.Portal>
                     <Select.Content>
                       <Select.Viewport>
-                        {inputTypes.map(({ value, label }) => (
-                          <Select.Option key={value} value={String(value)}>
+                        {inputs.map(({ kind, label }) => (
+                          <Select.Option key={kind} value={kind}>
                             {label}
                           </Select.Option>
                         ))}
@@ -73,26 +73,20 @@ export const TemplateForm = ({ template, commandEditable = true }: TemplateFormP
               </Input.Root>
 
               <div>
-                {input.type !== undefined &&
-                  [
-                    TemplateInputType.VALUE,
-                    TemplateInputType.CONTEXT,
-                    TemplateInputType.RESOLVER,
-                    TemplateInputType.SCHEMA,
-                  ].includes(input.type) && (
-                    <div>
-                      <Input.Root>
-                        <Input.TextInput
-                          placeholder={t('command placeholder')}
-                          classNames={mx('is-full bg-transparent')}
-                          value={input.value ?? ''}
-                          onChange={(event) => {
-                            input.value = event.target.value;
-                          }}
-                        />
-                      </Input.Root>
-                    </div>
-                  )}
+                {input.kind !== undefined && ['value', 'context', 'resolver', 'schema'].includes(input.kind) && (
+                  <div>
+                    <Input.Root>
+                      <Input.TextInput
+                        placeholder={t('command placeholder')}
+                        classNames='is-full bg-transparent'
+                        value={input.default ?? ''}
+                        onChange={(event) => {
+                          input.default = event.target.value;
+                        }}
+                      />
+                    </Input.Root>
+                  </div>
+                )}
               </div>
             </Fragment>
           ))}
@@ -102,57 +96,56 @@ export const TemplateForm = ({ template, commandEditable = true }: TemplateFormP
   );
 };
 
-const inputTypes = [
+// TODO(burdon): Translations.
+const inputs: { kind: Template.InputKind; label: string }[] = [
   {
-    value: TemplateInputType.VALUE,
+    kind: 'value',
     label: 'Value',
   },
   {
-    value: TemplateInputType.PASS_THROUGH,
+    kind: 'pass-through',
     label: 'Pass through',
   },
   {
-    value: TemplateInputType.RETRIEVER,
+    kind: 'retriever',
     label: 'Retriever',
   },
-  // {
-  //   value: TemplateInputType.FUNCTION,
-  //   label: 'Function',
-  // },
-  // {
-  //   value: TemplateInputType.QUERY,
-  //   label: 'Query',
-  // },
   {
-    value: TemplateInputType.RESOLVER,
+    kind: 'function',
+    label: 'Function',
+  },
+  {
+    kind: 'query',
+    label: 'Query',
+  },
+  {
+    kind: 'resolver',
     label: 'Resolver',
   },
   {
-    value: TemplateInputType.CONTEXT,
+    kind: 'context',
     label: 'Context',
   },
   {
-    value: TemplateInputType.SCHEMA,
+    kind: 'schema',
     label: 'Schema',
   },
 ];
 
-export const nameRegex = /\{\{([\w-]+)\}\}/;
-
-const getInputType = (type: string) => inputTypes.find(({ value }) => String(value) === type)?.value;
+export const NAME_REGEXP = /\{\{([\w-]+)\}\}/;
 
-const usePromptInputs = (template: TemplateType) => {
+const usePromptInputs = (template: Template.Template) => {
   useEffect(() => {
     const text = template.source ?? '';
     if (!template.inputs) {
       template.inputs = []; // TODO(burdon): Required?
     }
 
-    const regex = new RegExp(nameRegex, 'g');
-    const variables = new Set<string>([...text.matchAll(regex)].map((m) => m[1]));
+    const regex = new RegExp(NAME_REGEXP, 'g');
+    const variables = new Set<string>([...(text.target?.content.matchAll(regex) ?? [])].map((m) => m[1]));
 
     // Create map of unclaimed inputs.
-    const unclaimed = new Map<string, TemplateInput>(
+    const unclaimed = new Map<string, Template.Input>(
       template.inputs?.filter(isNonNullable).map((input) => [input.name, input]),
     );
     const missing: string[] = [];

package/src/components/Toolbox/Toolbox.stories.tsx

@@ -4,21 +4,21 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react';
+import { type Meta } from '@storybook/react-vite';
 import React from 'react';
 
 import { IntentPlugin, Capabilities, useCapabilities, SettingsPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { capabilities } from '@dxos/artifact-testing';
+import { capabilities } from '@dxos/assistant-testing';
 import { ChessPlugin } from '@dxos/plugin-chess';
 import { ClientPlugin } from '@dxos/plugin-client';
 import { MapPlugin } from '@dxos/plugin-map';
 import { SpacePlugin } from '@dxos/plugin-space';
 import { TablePlugin } from '@dxos/plugin-table';
-import { withLayout, withSignals, withTheme } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { Toolbox, type ToolboxProps } from './Toolbox';
-import translations from '../../translations';
+import { translations } from '../../translations';
 
 const DefaultStory = (props: ToolboxProps) => {
   const artifactDefinitions = useCapabilities(Capabilities.ArtifactDefinition);
@@ -26,7 +26,7 @@ const DefaultStory = (props: ToolboxProps) => {
     <Toolbox
       {...props}
       artifacts={artifactDefinitions}
-      classNames='w-[30rem] h-[15rem] rounded-md border border-separator py-1'
+      classNames='w-[30rem] h-[15rem] rounded-sm border border-separator py-1'
     />
   );
 };
@@ -36,7 +36,6 @@ const meta: Meta<typeof Toolbox> = {
   component: Toolbox,
   render: DefaultStory,
   decorators: [
-    withSignals,
     withPluginManager({
       plugins: [
         ClientPlugin({

package/src/components/Toolbox/Toolbox.tsx

@@ -6,26 +6,65 @@ import React, { useState, useEffect, Fragment, type FC } from 'react';
 
 import { parseToolName, type Tool } from '@dxos/ai';
 import { Capabilities, useCapabilities } from '@dxos/app-framework';
-import { type ArtifactDefinition } from '@dxos/artifact';
+import { type ArtifactDefinition } from '@dxos/blueprints';
+import { type Blueprint } from '@dxos/blueprints';
+import { type Ref } from '@dxos/echo';
 import { FunctionType } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { Filter, type Space, useQuery } from '@dxos/react-client/echo';
 import { type ThemedClassName } from '@dxos/react-ui';
+import { useTranslation } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 
+import { type ChatProcessor } from '../../hooks';
+import { meta } from '../../meta';
 import { createToolsFromService } from '../../tools';
 import { ServiceType } from '../../types';
 
 export type ToolboxProps = ThemedClassName<{
+  blueprints?: readonly Ref.Ref<Blueprint.Blueprint>[];
   artifacts?: ArtifactDefinition[];
   services?: { service: ServiceType; tools: Tool[] }[];
   functions?: FunctionType[];
+  activeBlueprints?: readonly Ref.Ref<Blueprint.Blueprint>[];
   striped?: boolean;
 }>;
 
-export const Toolbox = ({ classNames, artifacts, functions, services, striped }: ToolboxProps) => {
+export const Toolbox = ({
+  classNames,
+  artifacts,
+  functions,
+  services,
+  blueprints,
+  activeBlueprints,
+  striped,
+}: ToolboxProps) => {
+  const { t } = useTranslation(meta.id);
+
   return (
     <div className={mx('flex flex-col overflow-y-auto box-content', classNames)}>
+      {blueprints && blueprints.length > 0 && (
+        <Section
+          title='Blueprints'
+          items={blueprints.map(({ target }) => ({
+            name: target?.name ?? '',
+            description: target?.description ?? '',
+            subitems: target?.tools.map((toolId) => ({ name: `∙ ${parseToolName(toolId)}` })),
+          }))}
+        />
+      )}
+
+      {activeBlueprints && activeBlueprints.length > 0 && (
+        <Section
+          title='Blueprints'
+          items={activeBlueprints.map(({ target }) => ({
+            name: target?.name ?? '',
+            description: target?.description ?? '',
+            subitems: target?.tools.map((toolId) => ({ name: `∙ ${parseToolName(toolId)}` })),
+          }))}
+        />
+      )}
+
       {artifacts && artifacts.length > 0 && (
         <Section
           title='Artifacts'
@@ -51,6 +90,12 @@ export const Toolbox = ({ classNames, artifacts, functions, services, striped }:
       {functions && functions.length > 0 && (
         <Section title='Functions' items={functions.map(({ name, description }) => ({ name, description }))} />
       )}
+
+      {!blueprints?.length &&
+        !activeBlueprints?.length &&
+        !artifacts?.length &&
+        !services?.length &&
+        !functions?.length && <div>{t('no tools')}</div>}
     </div>
   );
 };
@@ -89,7 +134,12 @@ const Section: FC<{
   );
 };
 
-export const ToolboxContainer = ({ classNames, space }: ThemedClassName<{ space?: Space }>) => {
+export type ToolboxContainerProps = ThemedClassName<{
+  space?: Space;
+  processor?: ChatProcessor;
+}>;
+
+export const ToolboxContainer = ({ classNames, space, processor }: ToolboxContainerProps) => {
   // Plugin artifacts.
   const artifactDefinitions = useCapabilities(Capabilities.ArtifactDefinition);
 
@@ -111,6 +161,12 @@ export const ToolboxContainer = ({ classNames, space }: ThemedClassName<{ space?
   const functions = useQuery(space, Filter.type(FunctionType));
 
   return (
-    <Toolbox classNames={classNames} artifacts={artifactDefinitions} services={serviceTools} functions={functions} />
+    <Toolbox
+      classNames={classNames}
+      blueprints={processor?.context.blueprints.value}
+      artifacts={artifactDefinitions}
+      services={serviceTools}
+      functions={functions}
+    />
   );
 };

package/src/components/index.ts

@@ -4,18 +4,17 @@
 
 import { lazy } from 'react';
 
-export * from './AmbientDialog';
 export * from './AssistantSettings';
-export * from './Prompt';
+export * from './Chat';
 export * from './PromptSettings';
 export * from './TemplateEditor';
-export * from './Thread';
 export * from './Toolbox';
 
 // TODO(burdon): Lazy loading causes issues with Tabster.
 //  Repro: open assistant dialog then close.
 //  https://github.com/microsoft/fluentui/issues/34020
-export const AssistantDialog = lazy(() => import('./AssistantDialog'));
+
 export const BlueprintContainer = lazy(() => import('./BlueprintContainer'));
 export const ChatContainer = lazy(() => import('./ChatContainer'));
-export const TemplateContainer = lazy(() => import('./TemplateContainer'));
+export const ChatDialog = lazy(() => import('./ChatDialog'));
+export const SequenceContainer = lazy(() => import('./SequenceContainer'));

package/src/events.ts

@@ -4,8 +4,8 @@
 
 import { Events } from '@dxos/app-framework';
 
-import { ASSISTANT_PLUGIN } from './meta';
+import { meta } from './meta';
 
 export namespace AssistantEvents {
-  export const AiClientReady = Events.createStateEvent(`${ASSISTANT_PLUGIN}/ai-client-ready`);
+  export const AiClientReady = Events.createStateEvent(`${meta.id}/ai-client-ready`);
 }

package/src/hooks/{processor.test.ts → chat-processor.test.ts}

@@ -4,12 +4,13 @@
 
 import { describe, it } from 'vitest';
 
-import { ChatProcessor } from './processor';
+import { ChatProcessor } from './chat-processor';
 
 describe('ChatProcessor', () => {
   it('should be instantiable', ({ expect }) => {
+    const services = {} as any; // TODO(burdon): Create mock.
     const client = {} as any; // TODO(burdon): Create mock.
-    const processor = new ChatProcessor(client);
+    const processor = new ChatProcessor(services, client);
     expect(processor).toBeDefined();
   });
 });