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

package/src/components/TemplateEditor/TemplateEditor.tsx

@@ -2,17 +2,15 @@
 // 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';
@@ -21,13 +19,7 @@ import { isNotFalsy } from '@dxos/util';
 
 import { meta } from '../../meta';
 
-handlebarsLanguage.configure({
-  props: [
-    styleTags({
-      '---': tags.lineComment,
-    }),
-  ],
-});
+import { handlebars } from './handlebars-extension';
 
 export type TemplateEditorProps = ThemedClassName<{
   id: string;
@@ -39,53 +31,28 @@ export const TemplateEditor = ({ id, classNames, template }: TemplateEditorProps
   const { themeMode } = useThemeContext();
   const { parentRef } = useTextEditor(() => {
     const text = template.source?.target;
+    if (!text) {
+      return {};
+    }
+
     return {
-      initialValue: text?.content ?? '',
+      initialValue: text.content ?? '',
       extensions: [
-        text &&
-          createDataExtensions({
-            id,
-            text: createDocAccessor(text, ['content']),
-          }),
+        createDataExtensions({ id, text: createDocAccessor(text, ['content']) }),
         createBasicExtensions({
           bracketMatching: false,
           lineNumbers: true,
           lineWrapping: true,
-          monospace: true,
           placeholder: t('template placeholder'),
         }),
-        createThemeExtensions({
-          themeMode,
-        }),
+        createThemeExtensions({ themeMode }),
 
-        // https://github.com/xiechao/lang-handlebars
-        new LanguageSupport(handlebarsLanguage, syntaxHighlighting(handlebarsHighlightStyle)),
+        // Extend markdown with handlebars support.
+        createMarkdownExtensions({ themeMode }),
+        handlebars(),
       ].filter(isNotFalsy),
     };
   }, [themeMode, template.source?.target]);
 
-  return <div ref={parentRef} className={mx('h-full', 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([
-  {
-    // 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

@@ -13,9 +13,10 @@ 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 { 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}}
@@ -30,7 +31,13 @@ const DefaultStory = () => {
   const client = useClient();
   const [blueprint] = useState(() => {
     const space = client.spaces.default;
-    return space.db.add(Blueprint.make({ name: 'Test', instructions: { source: TEMPLATE } }));
+    return space.db.add(
+      Blueprint.make({
+        key: 'example.com/blueprint/test',
+        name: 'Test',
+        instructions: Template.make({ source: TEMPLATE }),
+      }),
+    );
   });
 
   return (
@@ -40,15 +47,15 @@ const DefaultStory = () => {
   );
 };
 
-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: [Template.Template],
     }),
     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;
 

package/src/components/TemplateEditor/TemplateForm.tsx

@@ -10,9 +10,10 @@ 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 { meta } from '../../meta';
 
+import { TemplateEditor } from './TemplateEditor';
+
 export type TemplateFormProps = {
   id: string;
   template: Template.Template;
@@ -67,6 +68,7 @@ export const TemplateForm = ({ id, template, commandEditable = true }: TemplateF
                           </Select.Option>
                         ))}
                       </Select.Viewport>
+                      <Select.Arrow />
                     </Select.Content>
                   </Select.Portal>
                 </Select.Root>

package/src/components/TemplateEditor/handlebars-extension.ts

@@ -0,0 +1,165 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import {
+  type CompletionContext,
+  type CompletionResult,
+  autocompletion,
+  completionKeymap,
+} from '@codemirror/autocomplete';
+import { type Extension } from '@codemirror/state';
+import { Decoration, type DecorationSet, type EditorView, ViewPlugin, type ViewUpdate, keymap } from '@codemirror/view';
+
+export type HandlebarsOptions = {};
+
+/**
+ * Simple Handlebars plugin for CodeMirror.
+ * Supports:
+ * - Comments: {{! comment }}
+ * - Commands: {{#command}} {{/command}}
+ * - Variables: {{var}}
+ * - Commands with variables: {{#each items}} {{/each}}
+ */
+export const handlebars = (_: HandlebarsOptions = {}): Extension => {
+  return [
+    handlebarsHighlightPlugin,
+    autocompletion({
+      activateOnTyping: true,
+      aboveCursor: true,
+      closeOnBlur: true,
+      override: [handlebarsCompletions],
+    }),
+    keymap.of(completionKeymap),
+  ];
+};
+
+const regex = {
+  comment: /\{\{!\s*[^}]*\}\}/g,
+  brackets: /\{\{[^}]*\}\}/g,
+  command: /\{\{[#/]([^}]+)\}\}/g,
+  var: /\{\{(?!\s*!)(\w[^}]*)\}\}/g,
+};
+
+/**
+ * ViewPlugin that decorates Handlebars syntax.
+ */
+const handlebarsHighlightPlugin = ViewPlugin.fromClass(
+  class {
+    decorations: DecorationSet;
+
+    constructor(view: EditorView) {
+      this.decorations = this.buildDeco(view);
+    }
+
+    buildDeco(view: EditorView) {
+      const widgets: any[] = [];
+
+      for (const { from, to } of view.visibleRanges) {
+        const text = view.state.doc.sliceString(from, to);
+
+        // Match comments: {{! comment }}
+        {
+          let match;
+          while ((match = regex.comment.exec(text)) !== null) {
+            const start = from + match.index;
+            const end = start + match[0].length;
+            widgets.push(Decoration.mark({ class: 'text-subdued' }).range(start, end));
+          }
+        }
+
+        // Match brackets: {{ and }}
+        {
+          let match;
+          while ((match = regex.brackets.exec(text)) !== null) {
+            const start = from + match.index;
+            const end = start + match[0].length;
+            widgets.push(Decoration.mark({ class: 'text-subdued' }).range(start, end));
+          }
+        }
+
+        // Match commands: {{#command}} and {{/command}}
+        {
+          let match;
+          while ((match = regex.command.exec(text)) !== null) {
+            const start = from + match.index + 2;
+            let end = start + match[0].length - 4;
+            const text = view.state.doc.sliceString(start, end);
+            const parts = text.split(/\s+/);
+            if (parts.length > 1) {
+              const idx = start + parts[0].length;
+              widgets.push(Decoration.mark({ class: 'text-greenText' }).range(idx, end));
+              end = idx;
+            }
+            widgets.push(Decoration.mark({ class: 'text-blueText' }).range(start, end));
+          }
+        }
+
+        // Match variables: {{var}}
+        {
+          let match;
+          while ((match = regex.var.exec(text)) !== null) {
+            const start = from + match.index + 2;
+            const end = start + match[0].length - 4;
+            widgets.push(Decoration.mark({ class: 'text-greenText' }).range(start, end));
+          }
+        }
+      }
+
+      // Sort decorations by position to avoid "Ranges must be added sorted" error.
+      widgets.sort((a, b) => a.from - b.from || a.startSide - b.startSide);
+      return Decoration.set(widgets);
+    }
+
+    update(update: ViewUpdate) {
+      if (update.docChanged || update.viewportChanged) {
+        this.decorations = this.buildDeco(update.view);
+      }
+    }
+  },
+  {
+    decorations: (v) => v.decorations,
+  },
+);
+
+// TODO(burdon): Pass in variables.
+const variables = ['this'];
+const commands = ['this', 'each', 'if', 'unless', 'with'];
+
+/**
+ * Provides completions for Handlebars variables.
+ */
+function handlebarsCompletions(context: CompletionContext): CompletionResult | null {
+  const match = context.matchBefore(/\{\{[^}]*/);
+  if (!match || match.from === match.to) {
+    return null;
+  }
+
+  let type = 'variable';
+  let text = match.text.slice(2);
+  let from = match.from + 2;
+  let matches = [];
+  if (text.startsWith('#') || text.startsWith('/')) {
+    const idx = text.lastIndexOf(' ');
+    if (idx !== -1) {
+      type = 'variable';
+      matches = variables;
+      text = text.slice(idx + 1);
+      from += idx + 1;
+    } else {
+      type = 'command';
+      text = text.slice(1);
+      matches = commands;
+      from += 1;
+    }
+  } else {
+    type = 'variable';
+    matches = variables;
+  }
+
+  const options = matches.filter((name) => name.startsWith(text)).map((name) => ({ type, label: name }));
+  return {
+    from,
+    options,
+  };
+}

package/src/components/Toolbar/Toolbar.tsx

@@ -0,0 +1,20 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React from 'react';
+
+import { fullyQualifiedId } from '@dxos/react-client/echo';
+import { MenuProvider, ToolbarMenu } from '@dxos/react-ui-menu';
+
+import { type ChatToolbarActionsProps, useChatToolbarActions } from './useChatToolbarActions';
+
+export const Toolbar = ({ chat, companionTo, onReset }: ChatToolbarActionsProps) => {
+  const menu = useChatToolbarActions({ chat, companionTo, onReset });
+
+  return (
+    <MenuProvider {...menu} attendableId={companionTo ? fullyQualifiedId(companionTo) : fullyQualifiedId(chat)}>
+      <ToolbarMenu />
+    </MenuProvider>
+  );
+};

package/src/components/Toolbar/index.ts

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

package/src/components/Toolbar/useChatToolbarActions.ts

@@ -0,0 +1,125 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Rx } from '@effect-rx/rx-react';
+import { Effect } from 'effect';
+import { useMemo } from 'react';
+
+import { createIntent, useIntentDispatcher } from '@dxos/app-framework';
+import { Filter, Obj, Query } from '@dxos/echo';
+import { invariant } from '@dxos/invariant';
+import { SpaceAction } from '@dxos/plugin-space/types';
+import { getSpace, useQuery } from '@dxos/react-client/echo';
+import { MenuBuilder, useMenuActions } from '@dxos/react-ui-menu';
+
+import { meta } from '../../meta';
+import { Assistant, AssistantAction } from '../../types';
+
+export type ChatToolbarActionsProps = {
+  chat: Assistant.Chat;
+  companionTo?: Obj.Any;
+  onReset?: () => void;
+};
+
+export const useChatToolbarActions = ({ chat, companionTo, onReset }: ChatToolbarActionsProps) => {
+  const { dispatch } = useIntentDispatcher();
+  const space = getSpace(chat);
+  const query = companionTo
+    ? Query.select(Filter.ids(companionTo.id)).targetOf(Assistant.CompanionTo).source()
+    : Query.select(Filter.nothing());
+  // TODO(wittjosiah): Query in react vs query in rx?
+  const chats = useQuery(space, query);
+
+  return useMenuActions(
+    useMemo(
+      () =>
+        Rx.make(() => {
+          const builder = MenuBuilder.make()
+            .root({
+              label: ['chat toolbar title', { ns: meta.id }],
+            })
+            .action(
+              'new',
+              {
+                label: ['button new thread', { ns: meta.id }],
+                icon: 'ph--plus--regular',
+                type: 'new',
+              },
+              () =>
+                Effect.gen(function* () {
+                  invariant(space);
+                  const { object } = yield* dispatch(createIntent(AssistantAction.CreateChat, { space }));
+                  yield* dispatch(createIntent(SpaceAction.AddObject, { object, target: space, hidden: true }));
+                  if (companionTo) {
+                    yield* dispatch(
+                      createIntent(SpaceAction.AddRelation, {
+                        space,
+                        schema: Assistant.CompanionTo,
+                        source: object,
+                        target: companionTo,
+                      }),
+                    );
+                    yield* dispatch(createIntent(AssistantAction.SetCurrentChat, { companionTo, chat: object }));
+                  }
+                }).pipe(Effect.runPromise),
+            )
+            .action(
+              'branch',
+              {
+                label: ['button branch thread', { ns: meta.id }],
+                icon: 'ph--git-branch--regular',
+                type: 'branch',
+                disabled: true,
+              },
+              () => {},
+            );
+
+          if (chats.length > 0) {
+            builder.group(
+              'chats',
+              {
+                label: ['chat history label', { ns: meta.id }],
+                icon: 'ph--clock-counter-clockwise--regular',
+                selectCardinality: 'single',
+                variant: 'dropdownMenu',
+              },
+              (builder) => {
+                chats
+                  // TODO(wittjosiah): This should be the default sort order.
+                  .toSorted((a, b) => a.id.localeCompare(b.id))
+                  .forEach((chat) => {
+                    builder.action(
+                      chat.id,
+                      {
+                        label: Obj.getLabel(chat) ?? ['object name placeholder', { ns: Assistant.Chat.typename }],
+                      },
+                      () =>
+                        Effect.gen(function* () {
+                          invariant(companionTo);
+                          yield* dispatch(createIntent(AssistantAction.SetCurrentChat, { companionTo, chat }));
+                        }).pipe(Effect.runPromise),
+                    );
+                  });
+              },
+            );
+          }
+
+          if (onReset) {
+            builder.action(
+              'reset',
+              {
+                label: ['button reset', { ns: meta.id }],
+                icon: 'ph--trash--regular',
+                type: 'reset',
+              },
+              onReset,
+            );
+          }
+
+          return builder.build();
+        }),
+      [chats],
+    ),
+  );
+};

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

@@ -4,10 +4,10 @@
 
 import '@dxos-theme';
 
-import { type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { IntentPlugin, Capabilities, useCapabilities, SettingsPlugin } from '@dxos/app-framework';
+import { IntentPlugin, SettingsPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { capabilities } from '@dxos/assistant-testing';
 import { ChessPlugin } from '@dxos/plugin-chess';
@@ -17,29 +17,23 @@ import { SpacePlugin } from '@dxos/plugin-space';
 import { TablePlugin } from '@dxos/plugin-table';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
-import { Toolbox, type ToolboxProps } from './Toolbox';
 import { translations } from '../../translations';
 
+import { Toolbox, type ToolboxProps } from './Toolbox';
+
 const DefaultStory = (props: ToolboxProps) => {
-  const artifactDefinitions = useCapabilities(Capabilities.ArtifactDefinition);
-  return (
-    <Toolbox
-      {...props}
-      artifacts={artifactDefinitions}
-      classNames='w-[30rem] h-[15rem] rounded-sm border border-separator py-1'
-    />
-  );
+  return <Toolbox {...props} classNames='w-[30rem] h-[15rem] rounded-sm border border-separator py-1' />;
 };
 
-const meta: Meta<typeof Toolbox> = {
+const meta = {
   title: 'plugins/plugin-assistant/Toolbox',
-  component: Toolbox,
+  component: Toolbox as any,
   render: DefaultStory,
   decorators: [
     withPluginManager({
       plugins: [
         ClientPlugin({
-          onClientInitialized: async (_, client) => {
+          onClientInitialized: async ({ client }) => {
             await client.halo.createIdentity();
           },
         }),
@@ -59,10 +53,10 @@ const meta: Meta<typeof Toolbox> = {
     layout: 'centered',
     translations,
   },
-};
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
 
-type Story = Meta<typeof Toolbox>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {};