@dxos/plugin-assistant 0.8.1-main.ae460ac → 0.8.1-staging.31c3ee1

package/src/components/Prompt/Prompt.tsx

@@ -2,6 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Prec } from '@codemirror/state';
 import React, { forwardRef, useImperativeHandle } from 'react';
 
 import { type ThemedClassName, useThemeContext } from '@dxos/react-ui';
@@ -16,6 +17,7 @@ import {
 import { mx } from '@dxos/react-ui-theme';
 
 import { createAutocompleteExtension, type AutocompleteOptions } from './autocomplete';
+import { promptReferences, type ReferencesProvider } from './references';
 
 // TODO(burdon): Handle object references.
 
@@ -27,16 +29,21 @@ export interface PromptController {
 export type PromptProps = ThemedClassName<
   {
     onOpenChange?: (open: boolean) => void;
+    references?: ReferencesProvider;
   } & AutocompleteOptions &
     Pick<UseTextEditorProps, 'autoFocus'> &
     Pick<BasicExtensionsOptions, 'lineWrapping' | 'placeholder'>
 >;
 
 export const Prompt = forwardRef<PromptController, PromptProps>(
-  ({ classNames, autoFocus, lineWrapping = false, placeholder, onSubmit, onSuggest, onOpenChange }, forwardRef) => {
+  (
+    { classNames, autoFocus, lineWrapping = false, placeholder, onSubmit, onSuggest, onOpenChange, references },
+    forwardRef,
+  ) => {
     const { themeMode } = useThemeContext();
     const { parentRef, view } = useTextEditor(
       {
+        debug: true,
         autoFocus,
         extensions: [
           createBasicExtensions({
@@ -45,25 +52,28 @@ export const Prompt = forwardRef<PromptController, PromptProps>(
             placeholder,
           }),
           createThemeExtensions({ themeMode }),
+          references ? promptReferences({ provider: references }) : [],
           createAutocompleteExtension({ onSubmit, onSuggest }),
-          keymap.of([
-            {
-              key: 'Alt-ArrowUp',
-              preventDefault: true,
-              run: (view) => {
-                onOpenChange?.(true);
-                return true;
+          Prec.highest(
+            keymap.of([
+              {
+                key: 'cmd-ArrowUp',
+                preventDefault: true,
+                run: (view) => {
+                  onOpenChange?.(true);
+                  return true;
+                },
               },
-            },
-            {
-              key: 'Alt-ArrowDown',
-              preventDefault: true,
-              run: (view) => {
-                onOpenChange?.(false);
-                return true;
+              {
+                key: 'cmd-ArrowDown',
+                preventDefault: true,
+                run: (view) => {
+                  onOpenChange?.(false);
+                  return true;
+                },
               },
-            },
-          ]),
+            ]),
+          ),
         ],
       },
       [themeMode, onSubmit, onSuggest],
@@ -95,6 +105,6 @@ export const Prompt = forwardRef<PromptController, PromptProps>(
       [view, onSubmit],
     );
 
-    return <div ref={parentRef} className={mx('w-full overflow-hidden', classNames)} />;
+    return <div ref={parentRef} className={mx('w-full', classNames)} />;
   },
 );

package/src/components/Prompt/PromptBar.tsx

@@ -5,15 +5,15 @@
 import React, { useRef, useState } from 'react';
 
 import { useVoiceInput } from '@dxos/plugin-transcription';
-import { Icon, IconButton, type ThemedClassName, useTranslation } from '@dxos/react-ui';
+import { Icon, IconButton, type ThemedClassName, Tooltip, useTranslation } from '@dxos/react-ui';
 import { Spinner } from '@dxos/react-ui-sfx';
-import { errorText, mx } from '@dxos/react-ui-theme';
+import { errorMessageColors, errorText, mx } from '@dxos/react-ui-theme';
 
 import { Prompt, type PromptController, type PromptProps } from './Prompt';
 import { ASSISTANT_PLUGIN } from '../../meta';
 
 export type PromptBarProps = ThemedClassName<
-  Pick<PromptProps, 'placeholder' | 'lineWrapping' | 'onSubmit' | 'onSuggest' | 'onOpenChange'> & {
+  Pick<PromptProps, 'placeholder' | 'lineWrapping' | 'onSubmit' | 'onSuggest' | 'onOpenChange' | 'references'> & {
     processing?: boolean;
     error?: Error;
     microphone?: boolean;
@@ -28,6 +28,7 @@ export const PromptBar = ({
   error,
   microphone,
   onCancel,
+  references,
   ...props
 }: PromptBarProps) => {
   const { t } = useTranslation(ASSISTANT_PLUGIN);
@@ -44,18 +45,27 @@ export const PromptBar = ({
     },
   });
 
-  // TODO(burdon): Tooltip for error.
   return (
     <div
       className={mx(
-        'flex shrink-0 w-full grid grid-cols-[var(--rail-action)_1fr_var(--rail-action)] overflow-hidden',
+        'shrink-0 w-full grid grid-cols-[var(--rail-action)_1fr_var(--rail-action)] overflow-hidden',
         classNames,
       )}
     >
       <div className='flex w-[--rail-action] h-[--rail-action] items-center justify-center'>
-        {(error && <Icon icon='ph--warning-circle--regular' classNames={errorText} size={5} />) || (
-          <Spinner active={processing} />
-        )}
+        {(error && (
+          <Tooltip.Root delayDuration={0}>
+            <Tooltip.Trigger>
+              <Icon icon='ph--warning-circle--regular' classNames={errorText} size={5} />
+            </Tooltip.Trigger>
+            <Tooltip.Portal>
+              <Tooltip.Content>
+                <div className={mx('text-sm', errorMessageColors)}>{error.message}</div>
+                <Tooltip.Arrow />
+              </Tooltip.Content>
+            </Tooltip.Portal>
+          </Tooltip.Root>
+        )) || <Spinner active={processing} />}
       </div>
       <Prompt
         ref={promptRef}
@@ -63,6 +73,7 @@ export const PromptBar = ({
         classNames='pbs-2'
         lineWrapping={true}
         placeholder={placeholder ?? t('prompt placeholder')}
+        references={references}
         {...props}
       />
       {(onCancel || microphone) && (

package/src/components/Prompt/references.ts

@@ -0,0 +1,180 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { autocompletion, completionKeymap, type CompletionResult } from '@codemirror/autocomplete';
+import { type Extension, RangeSet } from '@codemirror/state';
+import {
+  Decoration,
+  EditorView,
+  keymap,
+  ViewPlugin,
+  WidgetType,
+  type DecorationSet,
+  type ViewUpdate,
+} from '@codemirror/view';
+
+import { Mutex } from '@dxos/async';
+
+export type ReferenceData = {
+  uri: string;
+  label: string;
+  // TODO(dmaretskyi): Consider adding details renderer for when you hover over the reference.
+};
+
+export interface ReferencesProvider {
+  getReferences({ query }: { query: string }): Promise<ReferenceData[]>;
+
+  resolveReference({ uri }: { uri: string }): Promise<ReferenceData | null>;
+}
+
+export type PromptReferencesOptions = {
+  provider: ReferencesProvider;
+  /**
+   * Will prevent the autocomplete from closing when the user blurs the editor.
+   * @default false
+   */
+  debug?: boolean;
+  /**
+   * @default '@'
+   */
+  triggerCharacter?: string;
+};
+
+/**
+ * Include references into text.
+ */
+export const promptReferences = ({
+  provider,
+  debug = false,
+  triggerCharacter = '@',
+}: PromptReferencesOptions): Extension => {
+  if (triggerCharacter.length !== 1) {
+    throw new Error('triggerCharacter must be a single character');
+  }
+
+  const decorationField = ViewPlugin.fromClass(
+    class ReferenceView {
+      private _mutex = new Mutex();
+
+      decorations: DecorationSet = Decoration.set([]);
+
+      constructor(view: EditorView) {
+        queueMicrotask(async () => {
+          const guard = await this._mutex.acquire();
+          try {
+            this.decorations = await this._computeDecorations(view);
+          } finally {
+            guard.release();
+          }
+        });
+      }
+
+      update(update: ViewUpdate) {
+        if (update.docChanged) {
+          queueMicrotask(async () => {
+            const guard = await this._mutex.acquire();
+            try {
+              this.decorations = await this._computeDecorations(update.view);
+            } finally {
+              guard.release();
+            }
+          });
+        }
+      }
+
+      private async _computeDecorations(view: EditorView): Promise<DecorationSet> {
+        const text = view.state.doc.toString();
+        const references = text.matchAll(new RegExp(`${triggerCharacter}[a-zA-Z0-9@:]+\\s`, 'g'));
+
+        const decorations = [];
+        for (const match of references) {
+          const reference = match[0];
+          const uri = reference.slice(1, -1);
+          const data = await provider.resolveReference({ uri });
+          if (data) {
+            decorations.push(
+              Decoration.replace({
+                widget: new ReferenceWidget(data),
+              }).range(match.index!, match.index! + reference.length),
+            );
+          }
+        }
+
+        return Decoration.set(decorations);
+      }
+    },
+    {
+      decorations: (v) => v.decorations,
+      provide: (plugin) => [
+        EditorView.atomicRanges.of(
+          (view): DecorationSet => view.plugin(decorationField)?.decorations ?? RangeSet.empty,
+        ),
+      ],
+    },
+  );
+
+  return [
+    decorationField,
+
+    EditorView.theme({
+      '.cm-reference-pill': {
+        borderRadius: '0.25rem',
+        borderWidth: '1px',
+        marginRight: '0.25rem',
+        marginLeft: '0.25rem',
+      },
+    }),
+
+    autocompletion({
+      activateOnTyping: true,
+      override: [
+        async (context): Promise<CompletionResult | null> => {
+          const match = context.matchBefore(new RegExp(`${triggerCharacter}[a-zA-Z0-9]+`));
+
+          if (!match || match?.to === match?.from) {
+            return null;
+          }
+
+          const query = match.text.slice(1);
+          const references = await provider.getReferences({ query });
+
+          return {
+            from: match.from,
+            filter: false,
+            options: references.map((reference) => ({
+              label: reference.label,
+              apply: `${triggerCharacter}${reference.uri} `,
+            })),
+          };
+        },
+      ],
+      closeOnBlur: !debug,
+      tooltipClass: () => 'shadow rounded',
+      aboveCursor: true,
+    }),
+
+    keymap.of(completionKeymap),
+  ];
+};
+
+class ReferenceWidget extends WidgetType {
+  constructor(private data: ReferenceData) {
+    super();
+  }
+
+  override toDOM() {
+    const span = document.createElement('span');
+    span.textContent = `@ ${this.data.label}`;
+    span.className = 'cm-reference-pill';
+    return span;
+  }
+
+  override eq(other: ReferenceWidget) {
+    return other.data.uri === this.data.uri;
+  }
+
+  override ignoreEvent() {
+    return true;
+  }
+}

package/src/components/TemplateContainer.tsx

@@ -2,17 +2,92 @@
 // Copyright 2025 DXOS.org
 //
 
-import React from 'react';
+import { Match, type Schema as S } from 'effect';
+import React, { type ChangeEvent, useCallback } from 'react';
 
+import { debounce } from '@dxos/async';
+import { Input, Select, Toolbar, useTranslation } from '@dxos/react-ui';
 import { StackItem } from '@dxos/react-ui-stack';
 
 import { TemplateEditor } from './TemplateEditor';
-import { type TemplateType } from '../types';
+import { ASSISTANT_PLUGIN } from '../meta';
+import { TemplateKinds, type TemplateKindSchema, type TemplateType } from '../types';
 
-// TODO(burdon): Attention.
 export const TemplateContainer = ({ template, role }: { template: TemplateType; role: string }) => {
+  const { t } = useTranslation(ASSISTANT_PLUGIN);
+
+  const handleKindChange = useCallback(
+    (value: string) => {
+      const kind = Match.type<string>().pipe(
+        Match.withReturnType<S.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);
+
+      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 handleDescriptionChange = useCallback(
+    debounce((event: ChangeEvent<HTMLInputElement>) => {
+      if (template.kind.include === 'automatically') {
+        template.kind.description = event.target.value;
+      }
+    }, 300),
+    [template.kind.include],
+  );
+
   return (
-    <StackItem.Content toolbar={false} role={role} classNames='mli-auto w-full max-w-[50rem]'>
+    <StackItem.Content role={role} toolbar classNames='container-max-width'>
+      {/* TODO(wittjosiah): Move this toolbar into c11y sidebar. */}
+      <Toolbar.Root>
+        <Select.Root value={template.kind.include} onValueChange={handleKindChange}>
+          <Toolbar.Button asChild>
+            <Select.TriggerButton />
+          </Toolbar.Button>
+          <Select.Portal>
+            <Select.Content>
+              <Select.Viewport>
+                {TemplateKinds.map((kind) => (
+                  <Select.Option key={kind} value={kind}>
+                    {kind}
+                  </Select.Option>
+                ))}
+              </Select.Viewport>
+            </Select.Content>
+          </Select.Portal>
+        </Select.Root>
+        {template.kind.include === 'schema-matching' && (
+          <Input.Root>
+            <Input.TextInput
+              placeholder={t('typename placeholder')}
+              defaultValue={template.kind.typename}
+              onChange={handleTypenameChange}
+            />
+          </Input.Root>
+        )}
+        {template.kind.include === 'automatically' && (
+          <Input.Root>
+            <Input.TextInput
+              placeholder={t('description placeholder')}
+              defaultValue={template.kind.description}
+              onChange={handleDescriptionChange}
+            />
+          </Input.Root>
+        )}
+      </Toolbar.Root>
       <TemplateEditor template={template} />
     </StackItem.Content>
   );

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

@@ -34,11 +34,11 @@ const TEMPLATE = [
   '',
 ].join('\n');
 
-const Render = ({ text }: TemplateEditorProps & { text: string }) => {
+const DefaultStory = ({ text }: TemplateEditorProps & { text: string }) => {
   const client = useClient();
   const [template] = useState(() => {
     const space = client.spaces.default;
-    return space.db.add(create(TemplateType, { source: text }));
+    return space.db.add(create(TemplateType, { source: text, kind: { include: 'manual' } }));
   });
 
   return (
@@ -48,10 +48,10 @@ const Render = ({ text }: TemplateEditorProps & { text: string }) => {
   );
 };
 
-const meta: Meta<typeof Render> = {
+const meta: Meta<typeof DefaultStory> = {
   title: 'plugins/plugin-automation/TemplateEditor',
   component: TemplateEditor,
-  render: Render,
+  render: DefaultStory,
   decorators: [
     withClientProvider({
       createIdentity: true,
@@ -68,7 +68,7 @@ const meta: Meta<typeof Render> = {
 
 export default meta;
 
-type Story = Meta<typeof Render>;
+type Story = Meta<typeof DefaultStory>;
 
 export const Default: Story = {
   args: {

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

@@ -26,11 +26,11 @@ const TEMPLATE = [
   '{{input}}',
 ].join('\n');
 
-const Render = () => {
+const DefaultStory = () => {
   const client = useClient();
   const [template] = useState(() => {
     const space = client.spaces.default;
-    return space.db.add(create(TemplateType, { source: TEMPLATE }));
+    return space.db.add(create(TemplateType, { source: TEMPLATE, kind: { include: 'manual' } }));
   });
 
   return (
@@ -43,7 +43,7 @@ const Render = () => {
 const meta: Meta<typeof TemplateForm> = {
   title: 'plugins/plugin-automation/TemplateForm',
   component: TemplateForm,
-  render: Render,
+  render: DefaultStory,
   decorators: [
     withClientProvider({
       createIdentity: true,

package/src/components/Thread/Thread.stories.tsx

@@ -20,7 +20,7 @@ import translations from '../../translations';
 
 faker.seed(1);
 
-const Render = ({ messages: _messages, ...props }: ThreadProps) => {
+const DefaultStory = ({ messages: _messages, ...props }: ThreadProps) => {
   const [processing, setProcessing] = useState(false);
   const [messages, setMessages] = useState<Message[]>(_messages ?? []);
   useEffect(() => {
@@ -70,7 +70,7 @@ const Render = ({ messages: _messages, ...props }: ThreadProps) => {
 
 const meta: Meta<ThreadProps> = {
   title: 'plugins/plugin-automation/Thread',
-  render: Render,
+  render: DefaultStory,
   component: Thread,
   decorators: [
     withSignals,
@@ -207,6 +207,6 @@ export const Incremental: Story = {
       return () => clearInterval(interval);
     }, []);
 
-    return <Render messages={messages} collapse />;
+    return <DefaultStory messages={messages} collapse />;
   },
 };

package/src/components/Thread/Thread.tsx

@@ -15,6 +15,13 @@ import { keyToFallback } from '@dxos/util';
 import { ThreadMessage, type ThreadMessageProps } from './ThreadMessage';
 import { messageReducer } from './reducer';
 import { PromptBar, type PromptBarProps } from '../Prompt';
+import type { ReferenceData, ReferencesProvider } from '../Prompt/references';
+
+export interface ContextProvider {
+  query({ query }: { query: string }): Promise<ReferenceData[]>;
+
+  resolveMetadata({ uri }: { uri: string }): Promise<ReferenceData | null>;
+}
 
 export type ThreadProps = ThemedClassName<{
   space?: Space;
@@ -22,6 +29,7 @@ export type ThreadProps = ThemedClassName<{
   collapse?: boolean;
   transcription?: boolean;
   onOpenChange?: (open: boolean) => void;
+  contextProvider?: ContextProvider;
 }> &
   Pick<PromptBarProps, 'processing' | 'error' | 'onSubmit' | 'onSuggest' | 'onCancel'> &
   Pick<ThreadMessageProps, 'debug' | 'tools' | 'onPrompt' | 'onDelete'>;
@@ -40,6 +48,7 @@ export const Thread = ({
   onSubmit,
   onCancel,
   onOpenChange,
+  contextProvider,
   ...props
 }: ThreadProps) => {
   const scroller = useRef<ScrollController>(null);
@@ -68,6 +77,17 @@ export const Thread = ({
     }
   }, [messages, collapse]);
 
+  const references = useMemo<ReferencesProvider | undefined>(() => {
+    if (!contextProvider) {
+      return undefined;
+    }
+
+    return {
+      getReferences: async ({ query }: { query: string }) => contextProvider.query({ query }),
+      resolveReference: async ({ uri }: { uri: string }) => contextProvider.resolveMetadata({ uri }),
+    };
+  }, [contextProvider]);
+
   return (
     <div role='none' className={mx('flex flex-col grow overflow-hidden', classNames)}>
       <ScrollContainer ref={scroller} fade>
@@ -90,6 +110,7 @@ export const Thread = ({
           onSubmit={handleSubmit}
           onCancel={onCancel}
           onOpenChange={onOpenChange}
+          references={references}
         />
       )}
     </div>

package/src/components/Thread/ThreadContainer.stories.tsx

@@ -21,7 +21,6 @@ import { Message, type Tool } from '@dxos/artifact';
 import { genericTools, localServiceEndpoints, type IsObject } from '@dxos/artifact-testing';
 import { AIServiceEdgeClient } from '@dxos/assistant';
 import { createStatic, ObjectId } from '@dxos/echo-schema';
-import { EdgeHttpClient } from '@dxos/edge-client';
 import { invariant } from '@dxos/invariant';
 import { DXN, QueueSubspaceTags, SpaceId } from '@dxos/keys';
 import { ChessPlugin } from '@dxos/plugin-chess';
@@ -31,9 +30,8 @@ import { InboxPlugin } from '@dxos/plugin-inbox';
 import { MapPlugin } from '@dxos/plugin-map';
 import { SpacePlugin } from '@dxos/plugin-space';
 import { TablePlugin } from '@dxos/plugin-table';
-import { useSpace } from '@dxos/react-client/echo';
+import { useQueue, useSpace } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
-import { useQueue } from '@dxos/react-edge-client';
 import { IconButton, Input, Toolbar } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 import { withLayout, withSignals, withTheme } from '@dxos/storybook-utils';
@@ -51,16 +49,12 @@ type RenderProps = {
 } & Pick<ThreadProps, 'debug'>;
 
 // TODO(burdon): Use ChatContainer.
-const Render = ({ items: _items, prompts = [], ...props }: RenderProps) => {
+const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) => {
   const space = useSpace();
   const artifactDefinitions = useCapabilities(Capabilities.ArtifactDefinition);
-  const tools = useMemo<Tool[]>(
-    () => [...genericTools, ...artifactDefinitions.flatMap((definition) => definition.tools)],
-    [genericTools, artifactDefinitions],
-  );
+  const tools = useMemo<Tool[]>(() => [...genericTools], []);
 
   const [aiClient] = useState(() => new AIServiceEdgeClient({ endpoint: endpoints.ai }));
-  const [edgeClient] = useState(() => new EdgeHttpClient(endpoints.edge));
   const { dispatchPromise: dispatch } = useIntentDispatcher();
 
   // TODO(burdon): Replace with useChatProcessor.
@@ -73,6 +67,7 @@ const Render = ({ items: _items, prompts = [], ...props }: RenderProps) => {
     return new ChatProcessor(
       aiClient,
       tools,
+      artifactDefinitions,
       {
         space,
         dispatch,
@@ -82,8 +77,8 @@ const Render = ({ items: _items, prompts = [], ...props }: RenderProps) => {
   }, [aiClient, tools, space, dispatch, artifactDefinitions]);
 
   // Queue.
-  const [queueDxn, setQueueDxn] = useState(() => randomQueueDxn());
-  const queue = useQueue<Message>(edgeClient, DXN.tryParse(queueDxn));
+  const [queueDxn, setQueueDxn] = useState<string>(() => randomQueueDxn());
+  const queue = useQueue<Message>(DXN.tryParse(queueDxn));
 
   useEffect(() => {
     if (queue?.items.length === 0 && !queue.isLoading && prompts.length > 0) {
@@ -209,9 +204,9 @@ const Render = ({ items: _items, prompts = [], ...props }: RenderProps) => {
 const randomQueueDxn = () =>
   new DXN(DXN.kind.QUEUE, [QueueSubspaceTags.DATA, SpaceId.random(), ObjectId.random()]).toString();
 
-const meta: Meta<typeof Render> = {
+const meta: Meta<typeof DefaultStory> = {
   title: 'plugins/plugin-automation/ThreadContainer',
-  render: Render,
+  render: DefaultStory,
   decorators: [
     withSignals,
     withClientProvider({
@@ -247,7 +242,7 @@ const meta: Meta<typeof Render> = {
 
 export default meta;
 
-type Story = StoryObj<typeof Render>;
+type Story = StoryObj<typeof DefaultStory>;
 
 export const Default: Story = {
   args: {