@dxos/plugin-assistant 0.8.4-main.ae835ea → 0.8.4-main.bc674ce

package/src/components/TemplateEditor/TemplateForm.tsx

@@ -3,30 +3,65 @@
 //
 
 import type * as Schema from 'effect/Schema';
-import React, { Fragment, useEffect } from 'react';
+import React, { Fragment, useCallback, useEffect } from 'react';
 
 import { type Template } from '@dxos/blueprints';
+import { type Obj } from '@dxos/echo';
 import { Input, Select, useTranslation } from '@dxos/react-ui';
-import { attentionSurface, groupBorder, mx } from '@dxos/react-ui-theme';
+import { attentionSurface, groupBorder, mx } from '@dxos/ui-theme';
 import { isNonNullable } from '@dxos/util';
 
 import { meta } from '../../meta';
 
 import { TemplateEditor } from './TemplateEditor';
 
+/**
+ * Callback type for mutating template within a parent object's Obj.change context.
+ */
+export type TemplateChangeCallback = (mutate: (template: Obj.Mutable<Template.Template>) => void) => void;
+
 export type TemplateFormProps = {
   id: string;
   template: Template.Template;
   schema?: Schema.Schema<any, any, any>;
   commandEditable?: boolean;
+  /**
+   * Callback to mutate the template. Should wrap mutations in parent's Obj.change.
+   * If not provided, the component is read-only.
+   */
+  onChange?: TemplateChangeCallback;
 };
 
-export const TemplateForm = ({ id, template, commandEditable = true }: TemplateFormProps) => {
+export const TemplateForm = ({ id, template, commandEditable = true, onChange }: TemplateFormProps) => {
   const { t } = useTranslation(meta.id);
-  usePromptInputs(template);
+  usePromptInputs(template, onChange);
+
+  const handleInputKindChange = useCallback(
+    (inputName: string, kind: Template.InputKind) => {
+      onChange?.((t) => {
+        const input = t.inputs?.find((i) => i?.name === inputName);
+        if (input) {
+          input.kind = kind;
+        }
+      });
+    },
+    [onChange],
+  );
+
+  const handleInputDefaultChange = useCallback(
+    (inputName: string, value: string) => {
+      onChange?.((t) => {
+        const input = t.inputs?.find((i) => i?.name === inputName);
+        if (input) {
+          input.default = value;
+        }
+      });
+    },
+    [onChange],
+  );
 
   return (
-    <div className={mx('flex flex-col w-full overflow-hidden gap-4', groupBorder)}>
+    <div className={mx('flex flex-col is-full overflow-hidden gap-4', groupBorder)}>
       {/* {commandEditable && (
         <div className='flex items-center pl-4'>
           <span className='text-neutral-500'>/</span>
@@ -36,7 +71,9 @@ export const TemplateForm = ({ id, template, commandEditable = true }: TemplateF
               classNames='is-full bg-transparent m-2'
               value={template.command ?? ''}
               onChange={(event) => {
-                template.command = event.target.value.replace(/\w/g, '');
+                onChange?.((t) => {
+                  t.command = event.target.value.replace(/\w/g, '');
+                });
               }}
             />
           </Input.Root>
@@ -54,9 +91,7 @@ export const TemplateForm = ({ id, template, commandEditable = true }: TemplateF
               <Input.Root>
                 <Select.Root
                   value={input.kind}
-                  onValueChange={(kind) => {
-                    input.kind = kind as Template.InputKind;
-                  }}
+                  onValueChange={(kind) => handleInputKindChange(input.name, kind as Template.InputKind)}
                 >
                   <Select.TriggerButton placeholder='Type' classNames='is-full' />
                   <Select.Portal>
@@ -82,9 +117,7 @@ export const TemplateForm = ({ id, template, commandEditable = true }: TemplateF
                         placeholder={t('command placeholder')}
                         classNames='is-full bg-transparent'
                         value={input.default ?? ''}
-                        onChange={(event) => {
-                          input.default = event.target.value;
-                        }}
+                        onChange={(event) => handleInputDefaultChange(input.name, event.target.value)}
                       />
                     </Input.Root>
                   </div>
@@ -136,13 +169,14 @@ const inputs: { kind: Template.InputKind; label: string }[] = [
 
 export const NAME_REGEXP = /\{\{([\w-]+)\}\}/;
 
-const usePromptInputs = (template: Template.Template) => {
+const usePromptInputs = (template: Template.Template, onChange?: TemplateChangeCallback) => {
   useEffect(() => {
-    const text = template.source ?? '';
-    if (!template.inputs) {
-      template.inputs = []; // TODO(burdon): Required?
+    if (!onChange) {
+      return;
     }
 
+    const text = template.source ?? '';
+
     const regex = new RegExp(NAME_REGEXP, 'g');
     const variables = new Set<string>([...(text.target?.content.matchAll(regex) ?? [])].map((m) => m[1]));
 
@@ -161,19 +195,32 @@ const usePromptInputs = (template: Template.Template) => {
 
     // Match or create new inputs.
     const values = unclaimed.values();
-    missing.forEach((name) => {
-      const next = values.next().value;
-      if (next) {
-        next.name = name;
-      } else {
-        template.inputs?.push({ name });
+    onChange((t) => {
+      if (!t.inputs) {
+        t.inputs = [];
       }
-    });
 
-    // Remove unclaimed (deleted) inputs.
-    // TODO(burdon): If user types incorrect name value, it will be deleted. Garbage collect?
-    for (const input of values) {
-      template.inputs.splice(template.inputs.indexOf(input), 1);
-    }
-  }, [template.source]);
+      missing.forEach((name) => {
+        const next = values.next().value;
+        if (next) {
+          // Find the input in the mutable draft and update it.
+          const inputIndex = t.inputs!.findIndex((i) => i?.name === next.name);
+          if (inputIndex !== -1) {
+            t.inputs![inputIndex].name = name;
+          }
+        } else {
+          t.inputs!.push({ name });
+        }
+      });
+
+      // Remove unclaimed (deleted) inputs.
+      // TODO(burdon): If user types incorrect name value, it will be deleted. Garbage collect?
+      for (const input of values) {
+        const inputIndex = t.inputs!.findIndex((i) => i?.name === input.name);
+        if (inputIndex !== -1) {
+          t.inputs!.splice(inputIndex, 1);
+        }
+      }
+    });
+  }, [template.source, onChange]);
 };

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

@@ -0,0 +1,274 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import {
+  type CompletionContext,
+  type CompletionResult,
+  autocompletion,
+  completionKeymap,
+} from '@codemirror/autocomplete';
+import { type Extension, RangeSetBuilder } from '@codemirror/state';
+import {
+  Decoration,
+  type DecorationSet,
+  type EditorView,
+  ViewPlugin,
+  type ViewUpdate,
+  WidgetType,
+  keymap,
+} from '@codemirror/view';
+
+import { Domino, mx } from '@dxos/ui';
+
+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 }}
+  comment: /\{\{!\s*[^}]*\}\}/g,
+
+  // {{var}}
+  brackets: /\{\{[^}]*\}\}/g,
+
+  // {{#command}} {{/command}}
+  command: /\{\{[#/]([^}]+)\}\}/g,
+
+  // {{var}}
+  var: /\{\{(?!\s*!)(\w[^}]*)\}\}/g,
+
+  // @dxn:queue:data:xxx
+  dxn: /@?dxn:[\w@:]+/g,
+
+  // dxos.org/type/xxx
+  url: /[\w.-]+\.[\w.-]+\/[\w/]+/g,
+};
+
+const tagPadding = 'mli-0.5 pli-1 rounded-sm';
+
+/**
+ * ViewPlugin that decorates Handlebars syntax.
+ */
+const handlebarsHighlightPlugin = ViewPlugin.fromClass(
+  class {
+    decorations: DecorationSet;
+
+    constructor(view: EditorView) {
+      this.decorations = this.buildDecorations(view);
+    }
+
+    update(update: ViewUpdate) {
+      if (update.docChanged || update.viewportChanged || update.selectionSet) {
+        this.decorations = this.buildDecorations(update.view);
+      }
+    }
+
+    // NOTE: Decorations may clash with other extensions (e.g., markdown).
+    buildDecorations(view: EditorView) {
+      const selection = view.state.selection.main;
+      const decorations: Array<{
+        from: number;
+        to: number;
+        decoration: Decoration;
+      }> = [];
+
+      for (const { from, to } of view.visibleRanges) {
+        const text = view.state.doc.sliceString(from, to);
+
+        // Match DXN.
+        {
+          let match;
+          while ((match = regex.dxn.exec(text)) !== null) {
+            const start = from + match.index;
+            const end = start + match[0].length;
+            // Only show widget if selection doesn't overlap with the match range.
+            const overlaps = selection.to > start && selection.from <= end;
+            if (!overlaps) {
+              decorations.push({
+                from: start,
+                to: end,
+                decoration: Decoration.widget({
+                  widget: new DXNWidget(match[0]),
+                }),
+              });
+            }
+          }
+        }
+
+        // Match URLs.
+        {
+          let match;
+          while ((match = regex.url.exec(text)) !== null) {
+            const start = from + match.index;
+            const end = start + match[0].length;
+            decorations.push({
+              from: start,
+              to: end,
+              decoration: Decoration.mark({
+                class: mx('dx-tag--blue', tagPadding),
+              }),
+            });
+          }
+        }
+
+        // Match brackets: {{ and }}.
+        {
+          let match;
+          while ((match = regex.brackets.exec(text)) !== null) {
+            const start = from + match.index;
+            const end = start + match[0].length;
+            decorations.push({
+              from: start,
+              to: end,
+              decoration: Decoration.mark({ class: 'text-subdued' }),
+            });
+          }
+        }
+
+        // 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;
+              decorations.push({
+                from: idx,
+                to: end,
+                decoration: Decoration.mark({ class: 'text-greenText' }),
+              });
+              end = idx;
+            }
+            decorations.push({
+              from: start,
+              to: end,
+              decoration: Decoration.mark({ class: 'text-blueText' }),
+            });
+          }
+        }
+
+        // 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;
+            decorations.push({
+              from: start,
+              to: end,
+              decoration: Decoration.mark({ class: 'text-greenText' }),
+            });
+          }
+        }
+      }
+
+      // Sort decorations by position to satisfy RangeSetBuilder requirements.
+      decorations.sort((a, b) => a.from - b.from || a.to - b.to);
+
+      // Add sorted decorations to builder.
+      const builder = new RangeSetBuilder<Decoration>();
+      for (const { from, to, decoration } of decorations) {
+        builder.add(from, to, decoration);
+      }
+
+      return builder.finish();
+    }
+  },
+  {
+    decorations: (v) => v.decorations,
+  },
+);
+
+class DXNWidget extends WidgetType {
+  constructor(private readonly _identifier: string) {
+    super();
+  }
+
+  override ignoreEvent() {
+    return false;
+  }
+
+  override eq(other: this) {
+    return this._identifier === other._identifier;
+  }
+
+  override toDOM() {
+    const text = this._identifier
+      .split(':')
+      .map((part) => {
+        const len = 16;
+        const plen = 4;
+        if (part.length > len) {
+          return `[${part.slice(0, plen)}…${part.slice(-plen)}]`;
+        }
+        return part;
+      })
+      .join(':');
+    return Domino.of('span').classNames(mx('font-mono dx-tag--blue', tagPadding)).text(text).root;
+  }
+}
+
+// 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/TemplateEditor/extensions/index.ts

@@ -0,0 +1,6 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * from './handlebars-extension';
+export * from './xml-extension';

package/src/components/TemplateEditor/extensions/xml-extension.ts

@@ -0,0 +1,64 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { syntaxTree } from '@codemirror/language';
+import { type Extension, RangeSetBuilder } from '@codemirror/state';
+import { Decoration, type DecorationSet, type EditorView, ViewPlugin, type ViewUpdate } from '@codemirror/view';
+
+export type XmlOptions = {};
+
+/**
+ * XML decorator plugin for CodeMirror.
+ * Decorates XML tags with monospace font using the XML language grammar.
+ */
+export const xmlDecorator = (_: XmlOptions = {}): Extension => {
+  return [xmlDecoratorPlugin];
+};
+
+/**
+ * ViewPlugin that decorates XML tags using syntax tree.
+ */
+const xmlDecoratorPlugin = ViewPlugin.fromClass(
+  class {
+    decorations: DecorationSet;
+
+    constructor(view: EditorView) {
+      this.decorations = this.buildDecorations(view);
+    }
+
+    update(update: ViewUpdate) {
+      if (update.docChanged || update.viewportChanged) {
+        this.decorations = this.buildDecorations(update.view);
+      }
+    }
+
+    buildDecorations(view: EditorView) {
+      const builder = new RangeSetBuilder<Decoration>();
+
+      for (const { from, to } of view.visibleRanges) {
+        syntaxTree(view.state).iterate({
+          from,
+          to,
+          enter: (node) => {
+            // Decorate XML elements (opening tags, closing tags, self-closing tags).
+            if (
+              node.name === 'HTMLTag' ||
+              node.name === 'OpenTag' ||
+              node.name === 'CloseTag' ||
+              node.name === 'SelfClosingTag' ||
+              node.name === 'Element'
+            ) {
+              builder.add(node.from, node.to, Decoration.mark({ class: 'font-mono text-subdued' }));
+            }
+          },
+        });
+      }
+
+      return builder.finish();
+    }
+  },
+  {
+    decorations: (v) => v.decorations,
+  },
+);

package/src/components/ToolBlock/ToolBlock.tsx

@@ -3,45 +3,29 @@
 //
 
 import type * as Tool from '@effect/ai/Tool';
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
-import { type AgentStatus } from '@dxos/ai';
 import { useTranslation } from '@dxos/react-ui';
-import {
-  NumericTabs,
-  TextCrawl,
-  ToggleContainer,
-  chatMessageJson,
-  chatMessagePanel,
-  chatMessagePanelContent,
-  chatMessagePanelHeader,
-} from '@dxos/react-ui-components';
+import { NumericTabs, TextCrawl, ToggleContainer, type ToggleContainerRootProps } from '@dxos/react-ui-components';
 import { Json } from '@dxos/react-ui-syntax-highlighter';
-import { type ContentBlock, type DataType } from '@dxos/schema';
+import { type ContentBlock, type Message } from '@dxos/types';
+import { type XmlWidgetProps } from '@dxos/ui-editor';
 import { isNonNullable, safeParseJson } from '@dxos/util';
 
 import { meta } from '../../meta';
 
-export const isToolMessage = (message: DataType.Message) => {
-  return message.blocks.some((block) => block._tag === 'toolCall' || block._tag === 'toolResult');
+export const isToolMessage = (message: Message.Message) => {
+  return message.blocks.some((block: ContentBlock.Any) => block._tag === 'toolCall' || block._tag === 'toolResult');
 };
 
-export type ToolBlockProps = {
+export type ToolBlockProps = XmlWidgetProps<{
   blocks: ContentBlock.Any[];
-};
+}>;
 
-export const ToolBlock = ({ blocks = [] }: ToolBlockProps) => {
+export const ToolBlock = ({ view, blocks = [] }: ToolBlockProps) => {
   const { t } = useTranslation(meta.id);
 
-  const getToolCaption = (tool?: Tool.Any, status?: AgentStatus) => {
-    if (!tool) {
-      return t('calling tool label');
-    }
-
-    return status?.message ?? tool.description ?? [t('calling label'), tool.name].join(' ');
-  };
-
-  const items = useMemo(() => {
+  const items = useMemo<ToolContainerProps['items']>(() => {
     let lastToolCall: { tool: Tool.Any | undefined; block: ContentBlock.ToolCall } | undefined;
     // TODO(burdon): Get from context?
     const tools: Tool.Any[] = []; //processor.conversation.toolkit?.tools ?? [];
@@ -57,7 +41,7 @@ export const ToolBlock = ({ blocks = [] }: ToolBlockProps) => {
             const tool = tools.find((tool) => tool.name === block.name);
             lastToolCall = { tool, block };
             return {
-              title: getToolCaption(lastToolCall?.tool),
+              title: tool?.description ?? [t('tool call label'), tool?.name].join(' '),
               content: {
                 ...block,
                 input: safeParseJson(block.input),
@@ -69,12 +53,13 @@ export const ToolBlock = ({ blocks = [] }: ToolBlockProps) => {
             // TODO(burdon): Parse error type.
             if (block.error) {
               return {
-                title: t('error label'),
+                title: t('tool error label'),
                 content: block,
               };
             }
 
-            const title = getToolCaption(lastToolCall?.tool ?? t('tool result label'));
+            const title =
+              lastToolCall?.tool?.description ?? [t('tool result label'), lastToolCall?.tool?.name].join(' ');
             lastToolCall = undefined;
             return {
               title,
@@ -100,46 +85,52 @@ export const ToolBlock = ({ blocks = [] }: ToolBlockProps) => {
       .filter(isNonNullable);
   }, [blocks]);
 
+  const handleChangeOpen = useCallback(() => {
+    setTimeout(() => {
+      // Measure after animation.
+      view?.requestMeasure();
+    }, 1_000);
+  }, [view]);
+
   if (!items.length) {
     return null;
   }
 
-  return <ToolContainer items={items} />;
+  return <ToolContainer items={items} onChangeOpen={handleChangeOpen} />;
 };
 
 ToolBlock.displayName = 'ToolBlock';
 
-type ToolContainerParams = {
+type ToolContainerProps = {
   items: { title: string; content: any }[];
-};
+} & Pick<ToggleContainerRootProps, 'onChangeOpen'>;
 
-// TODO(burdon): Maintain scroll position when closing.
-export const ToolContainer = ({ items }: ToolContainerParams) => {
+export const ToolContainer = ({ items, onChangeOpen }: ToolContainerProps) => {
   const tabsRef = useRef<HTMLDivElement>(null);
   const [selected, setSelected] = useState(0);
   const [open, setOpen] = useState(false);
+
   useEffect(() => {
+    onChangeOpen?.(open);
     if (open) {
       tabsRef.current?.focus();
     }
-  }, [open]);
+  }, [open, onChangeOpen]);
 
-  const handleSelect = (index: number) => {
+  const handleSelect = useCallback((index: number) => {
     setSelected(index);
-  };
-
-  const data = items[selected]?.content;
+  }, []);
 
   return (
-    <ToggleContainer.Root classNames={chatMessagePanel} open={open} onChangeOpen={setOpen}>
-      <ToggleContainer.Header classNames={chatMessagePanelHeader}>
-        <TextCrawl key='status-roll' lines={items.map((item) => item.title)} />
+    <ToggleContainer.Root classNames='mbs-2 is-full rounded-sm' open={open} onChangeOpen={setOpen}>
+      <ToggleContainer.Header classNames='text-sm text-placeholder'>
+        <TextCrawl key='status-roll' lines={items.map((item) => item.title)} autoAdvance greedy />
       </ToggleContainer.Header>
-      <ToggleContainer.Content classNames={['grid grid-cols-[32px_1fr]', chatMessagePanelContent]}>
+      <ToggleContainer.Content classNames='grid grid-cols-[32px_1fr]'>
         <NumericTabs ref={tabsRef} classNames='p-1' length={items.length} selected={selected} onSelect={handleSelect} />
         <Json
-          data={data}
-          classNames={chatMessageJson}
+          data={items[selected]?.content}
+          classNames='p-1 text-xs bg-transparent'
           replacer={{
             maxDepth: 3,
             maxArrayLen: 10,