@dxos/plugin-assistant 0.8.3-staging.0fa589b → 0.8.4-main.28f8d3d

package/src/hooks/usePresets.ts

@@ -0,0 +1,45 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useCallback, useEffect, useMemo, useState } from 'react';
+
+import { type ChatPromptProps } from '../components';
+
+import { type AiServicePreset, AiServicePresets } from './presets';
+
+export type UsePresets = {
+  preset: AiServicePreset | undefined;
+} & Pick<ChatPromptProps, 'presets' | 'onChangePreset'>;
+
+export const usePresets = (online: boolean): UsePresets => {
+  // TODO(burdon): Memo preset for provider.
+  const [preset, setPreset] = useState<AiServicePreset>();
+  const presets = useMemo(
+    () => AiServicePresets.filter((preset) => online === (preset.provider === 'dxos-remote')),
+    [online],
+  );
+  const presetOptions = useMemo(
+    () => presets.map(({ id, model, label }) => ({ id, label: label ?? model })),
+    [presets],
+  );
+  useEffect(() => {
+    setPreset(presets[0]);
+  }, [presets]);
+
+  const handleChangePreset = useCallback<NonNullable<ChatPromptProps['onChangePreset']>>(
+    (id) => {
+      const preset = presets.find((preset) => preset.id === id);
+      if (preset) {
+        setPreset(preset);
+      }
+    },
+    [presets],
+  );
+
+  return {
+    preset: preset,
+    presets: presetOptions,
+    onChangePreset: handleChangePreset,
+  };
+};

package/src/hooks/{useContextProvider.ts → useReferencesProvider.ts}

@@ -6,29 +6,29 @@ import { useMemo } from 'react';
 
 import { Capabilities, useCapabilities } from '@dxos/app-framework';
 import { type Space } from '@dxos/client/echo';
-import { Filter, Obj, type Type } from '@dxos/echo';
+import { Filter, Obj } from '@dxos/echo';
+import { type ReferencesProvider } from '@dxos/react-ui-chat';
 
-export type ContextProvider = {
-  query: (params: { query: string }) => Promise<Array<{ uri: string; label: string }>>;
-  resolveMetadata: (params: { uri: string }) => Promise<{ uri: string; label: string }>;
-};
-
-const stringMatch = (query: string, label: string) => label.toLowerCase().startsWith(query.toLowerCase());
-
-export const useContextProvider = (space?: Space): ContextProvider | undefined => {
-  const artifactDefinitions = useCapabilities(Capabilities.ArtifactDefinition);
+/**
+ * Resolve references to objects in the space.
+ */
+export const useReferencesProvider = (space?: Space): ReferencesProvider | undefined => {
+  const blueprints = useCapabilities(Capabilities.BlueprintDefinition);
 
-  return useMemo<ContextProvider | undefined>((): ContextProvider | undefined => {
+  return useMemo<ReferencesProvider | undefined>((): ReferencesProvider | undefined => {
     if (!space) {
       return undefined;
     }
 
     return {
-      query: async ({ query }) => {
-        const artifactSchemas = artifactDefinitions.map((artifact) => artifact.schema);
-        const { objects } = await space.db
-          .query(Filter.or(...artifactSchemas.map((schema) => Filter.type(schema as Type.Schema))))
-          .run();
+      getReferences: async ({ query }) => {
+        // TODO(burdon): Previously we filtered by types declared by the artifact definitions.
+        // const schemas = blueprints.map((blueprint) => blueprint.schema).flat();
+        // const { objects } = await space.db
+        //   .query(Filter.or(...schemas.map((schema) => Filter.type(schema as Type.Schema))))
+        //   .run();
+
+        const { objects } = await space.db.query(Filter.everything()).run();
 
         return (
           objects
@@ -41,15 +41,17 @@ export const useContextProvider = (space?: Space): ContextProvider | undefined =
             // TODO(dmaretskyi): `Type.getDXN` (at the point of writing) didn't work here as it was schema-only.
             .filter((object) => !!Obj.getDXN(object as Obj.Any))
             .map((object) => ({
-              uri: Obj.getDXN(object as any)!.toString(),
+              uri: Obj.getDXN(object as any).toString(),
               label: Obj.getLabel(object as any) ?? '',
             }))
         );
       },
-      resolveMetadata: async ({ uri }) => {
+      resolveReference: async ({ uri }) => {
         const object = await space.db.query(Filter.ids(uri)).first();
         return { uri, label: Obj.getLabel(object) ?? '' };
       },
-    };
-  }, [space, artifactDefinitions]);
+    } satisfies ReferencesProvider;
+  }, [space, blueprints]);
 };
+
+const stringMatch = (query: string, label: string) => label.toLowerCase().startsWith(query.toLowerCase());

package/src/hooks/useResolveRef.ts

@@ -0,0 +1,33 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useMemo, useSyncExternalStore } from 'react';
+
+import { type Space } from '@dxos/client/echo';
+import { type Ref } from '@dxos/echo';
+
+// TODO(burdon): Factor out.
+export const useResolvedRef = <T>(space: Space, ref: Ref.Ref<T>): T | undefined => {
+  const { subscribe, getSnapshot } = useMemo(() => {
+    const resolver = space.db.graph.createRefResolver({});
+    let currentCallback: (() => void) | undefined = undefined;
+
+    return {
+      subscribe: (cb: () => void) => {
+        currentCallback = cb;
+        return () => {
+          if (currentCallback === cb) {
+            currentCallback = undefined;
+          }
+        };
+      },
+      getSnapshot: () =>
+        resolver?.resolveSync(ref.dxn, true, () => {
+          currentCallback?.();
+        }) as T | undefined,
+    };
+  }, [space, ref.dxn.toString()]);
+
+  return useSyncExternalStore<T | undefined>(subscribe, getSnapshot);
+};

package/src/parser/filter-generator.ts

@@ -4,14 +4,7 @@
 
 import { Filter } from '@dxos/echo';
 
-import {
-  type BinaryExpression,
-  type Expression,
-  type Identifier,
-  type Literal,
-  type RelationalOperator,
-  type UnaryExpression,
-} from './types';
+import { type Expression, type Identifier, type Literal, type RelationalOperator } from './types';
 
 const relationalOperators: Record<RelationalOperator, (value: any) => Filter<any>> = {
   EQ: Filter.eq,
@@ -26,7 +19,7 @@ const specialPredicates: Record<string, (value: string) => Filter<any>> = {
 export const createFilter = (ast: Expression): Filter<any> => {
   switch (ast.type) {
     case 'binary': {
-      const { operator, left, right } = ast as BinaryExpression;
+      const { operator, left, right } = ast;
 
       // Handle logical operators.
       if (operator === 'AND') {
@@ -44,7 +37,7 @@ export const createFilter = (ast: Expression): Filter<any> => {
       }
 
       // Handle relational operators
-      const filterFn = relationalOperators[operator as RelationalOperator];
+      const filterFn = relationalOperators[operator];
       if (filterFn) {
         return filterFn((right as Literal).value);
       }
@@ -53,7 +46,7 @@ export const createFilter = (ast: Expression): Filter<any> => {
     }
 
     case 'unary': {
-      const { operator, argument } = ast as UnaryExpression;
+      const { operator, argument } = ast;
       if (operator === 'NOT') {
         return Filter.not(createFilter(argument));
       }
@@ -61,12 +54,12 @@ export const createFilter = (ast: Expression): Filter<any> => {
     }
 
     case 'identifier': {
-      const { name } = ast as Identifier;
+      const { name } = ast;
       return Filter._props({ [name]: true });
     }
 
     case 'literal': {
-      const { value } = ast as Literal;
+      const { value } = ast;
       // Handle special '*' value for empty input.
       if (value === '*') {
         return Filter.everything();

package/src/parser/index.ts

@@ -4,4 +4,4 @@
 
 export * from './filter-generator';
 export * from './query-parser';
-export * from './types';
+export type * from './types';

package/src/parser/query-parser.ts

@@ -4,7 +4,7 @@
 
 import { invariant } from '@dxos/invariant';
 
-import { type Expression, type BinaryOperator, type RelationalOperator } from './types';
+import { type BinaryOperator, type Expression, type RelationalOperator } from './types';
 
 // TODO(burdon): Move to echo-schema?
 

package/src/queue-logger.ts

@@ -2,26 +2,26 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Blueprint, type BlueprintEvent, type BlueprintLogger } from '@dxos/assistant';
-import { getSpace, Ref, type Queue, type Space } from '@dxos/client/echo';
+import { type Queue, Ref, type Space, getSpace } from '@dxos/client/echo';
+import { type Sequence, type SequenceEvent, type SequenceLogger } from '@dxos/conductor';
 import { DXN, Key, Obj } from '@dxos/echo';
 import {
   InvocationOutcome,
   InvocationTraceEndEvent,
+  type InvocationTraceEvent,
   InvocationTraceEventType,
   InvocationTraceStartEvent,
   TraceEvent,
-  type InvocationTraceEvent,
 } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { QueueSubspaceTags } from '@dxos/keys';
 
-export class QueueLogger implements BlueprintLogger {
+export class QueueLogger implements SequenceLogger {
   private _space: Space;
   private _invocationTraceQueue: Queue<InvocationTraceEvent>;
 
-  constructor(private readonly blueprint: Blueprint) {
-    const space = getSpace(blueprint);
+  constructor(private readonly sequence: Sequence) {
+    const space = getSpace(sequence);
     invariant(space, 'Space not found');
     this._space = space;
     let dxn = this._space.properties.invocationTraceQueue?.dxn;
@@ -32,7 +32,7 @@ export class QueueLogger implements BlueprintLogger {
     this._invocationTraceQueue = this._space.queues.get(dxn);
   }
 
-  log(event: BlueprintEvent) {
+  log(event: SequenceEvent) {
     switch (event.type) {
       case 'begin':
         void this._invocationTraceQueue.append([
@@ -42,7 +42,7 @@ export class QueueLogger implements BlueprintLogger {
             timestampMs: Date.now(),
             input: {},
             invocationTraceQueue: Ref.fromDXN(this._getTraceQueueDxn(event.invocationId)),
-            invocationTarget: Ref.make(this.blueprint),
+            invocationTarget: Ref.make(this.sequence),
           }),
         ]);
         break;
@@ -62,7 +62,7 @@ export class QueueLogger implements BlueprintLogger {
           Obj.make(TraceEvent, {
             outcome: event.type,
             truncated: false,
-            ingestionTimestampMs: Date.now(),
+            ingestionTimestamp: Date.now(),
             logs: [
               {
                 timestampMs: Date.now(),
@@ -80,7 +80,7 @@ export class QueueLogger implements BlueprintLogger {
           Obj.make(TraceEvent, {
             outcome: event.type,
             truncated: false,
-            ingestionTimestampMs: Date.now(),
+            ingestionTimestamp: Date.now(),
             logs: [
               {
                 timestampMs: Date.now(),
@@ -98,7 +98,7 @@ export class QueueLogger implements BlueprintLogger {
           Obj.make(TraceEvent, {
             outcome: event.type,
             truncated: false,
-            ingestionTimestampMs: Date.now(),
+            ingestionTimestamp: Date.now(),
             logs: [
               {
                 timestampMs: Date.now(),

package/src/stories/Chat.stories.tsx

@@ -0,0 +1,317 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import '@dxos-theme';
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React, { type FC, useCallback } from 'react';
+
+import { EXA_API_KEY } from '@dxos/ai/testing';
+import { Capabilities, useCapabilities } from '@dxos/app-framework';
+import { RESEARCH_BLUEPRINT, ResearchDataTypes, ResearchGraph } from '@dxos/assistant-testing';
+import { Filter, Obj, Ref } from '@dxos/echo';
+import { log } from '@dxos/log';
+import { Board, BoardPlugin } from '@dxos/plugin-board';
+import { Chess, ChessPlugin } from '@dxos/plugin-chess';
+import { InboxPlugin } from '@dxos/plugin-inbox';
+import { Map, MapPlugin } from '@dxos/plugin-map';
+import { MarkdownPlugin } from '@dxos/plugin-markdown';
+import { Markdown } from '@dxos/plugin-markdown';
+import { TablePlugin } from '@dxos/plugin-table';
+import { useClient } from '@dxos/react-client';
+import { useSpace } from '@dxos/react-client/echo';
+import { useAsyncEffect } from '@dxos/react-ui';
+import { DataType } from '@dxos/schema';
+import { render } from '@dxos/storybook-utils';
+import { trim } from '@dxos/util';
+
+import { translations } from '../translations';
+import { Assistant } from '../types';
+
+import {
+  BlueprintContainer,
+  ChatContainer,
+  type ComponentProps,
+  GraphContainer,
+  LoggingContainer,
+  SurfaceContainer,
+  TasksContainer,
+} from './components';
+import { addTestData, config, getDecorators, testTypes } from './testing';
+
+const DefaultStory = ({
+  debug = true,
+  components,
+  blueprints = [],
+}: {
+  debug?: boolean;
+  components: (FC<ComponentProps> | FC<ComponentProps>[])[];
+  blueprints?: string[];
+}) => {
+  const client = useClient();
+  const space = useSpace();
+
+  const blueprintsDefinitions = useCapabilities(Capabilities.BlueprintDefinition);
+  useAsyncEffect(async () => {
+    if (!space) {
+      return;
+    }
+    const { objects: chats = [] } = await space.db.query(Filter.type(Assistant.Chat)).run();
+    const chat = chats[0];
+    if (!chat) {
+      return;
+    }
+
+    // TODO(burdon): Active should be ephemeral state of AiProcessor; write on edit/prompt.
+
+    // TODO(burdon): RACE CONDITION; must handle concurrently adding multiple blueprints instances with same key.
+    // Add blueprints to context.
+    // const binder = new AiContextBinder(await chat.queue.load());
+    // for (const key of blueprints) {
+    //   const blueprint = blueprintsDefinitions.find((blueprint) => blueprint.key === key);
+    //   if (blueprint) {
+    //     const obj = space.db.add(Obj.clone(blueprint));
+    //     await binder.bind({ blueprints: [Ref.make(obj)] });
+    //   }
+    // }
+  }, [space, blueprints, blueprintsDefinitions]);
+
+  const handleEvent = useCallback<NonNullable<ComponentProps['onEvent']>>((event) => {
+    log.info('event', { event });
+    switch (event) {
+      case 'reset': {
+        void client?.reset().then(() => {
+          document.location.reload();
+        });
+        break;
+      }
+    }
+  }, []);
+
+  if (!space) {
+    return null;
+  }
+
+  return (
+    <div
+      className='grid grid-cols gap-2 m-2'
+      style={{ gridTemplateColumns: `repeat(${components.length}, minmax(0, 40rem))` }}
+    >
+      {components.map((Component, index) =>
+        Array.isArray(Component) ? (
+          <div
+            key={index}
+            className='grid grid-rows gap-2 overflow-hidden'
+            style={{ gridTemplateRows: `repeat(${Component.length}, 1fr)` }}
+          >
+            {Component.map((Component, index) => (
+              <div key={index} className='flex flex-col overflow-hidden bg-baseSurface rounded border border-separator'>
+                <Component space={space} debug={debug} onEvent={handleEvent} />
+              </div>
+            ))}
+          </div>
+        ) : (
+          <div key={index} className='flex flex-col overflow-hidden bg-baseSurface rounded border border-separator'>
+            <Component space={space} debug={debug} onEvent={handleEvent} />
+          </div>
+        ),
+      )}
+    </div>
+  );
+};
+
+const storybook = {
+  title: 'plugins/plugin-assistant/Chat',
+  render: render(DefaultStory),
+  parameters: {
+    translations,
+    controls: { disable: true },
+  },
+} satisfies Meta<typeof DefaultStory>;
+
+export default storybook;
+
+type Story = StoryObj<typeof storybook>;
+
+//
+// Stories
+//
+
+export const Default = {
+  decorators: getDecorators({
+    config: config.remote,
+  }),
+  args: {
+    components: [ChatContainer],
+  },
+} satisfies Story;
+
+export const WithDocument = {
+  decorators: getDecorators({
+    plugins: [MarkdownPlugin()],
+    config: config.remote,
+    onInit: async ({ space, binder }) => {
+      const object = space.db.add(
+        Markdown.makeDocument({
+          name: 'Document',
+          content: trim`
+            # Hello, world!
+            This is a test.
+          `,
+        }),
+      );
+      await binder.bind({ objects: [Ref.make(object)] });
+    },
+  }),
+  args: {
+    components: [ChatContainer, SurfaceContainer],
+  },
+} satisfies Story;
+
+export const WithBlueprints = {
+  decorators: getDecorators({
+    plugins: [InboxPlugin(), MarkdownPlugin(), TablePlugin()],
+    config: config.remote,
+    onInit: async ({ space, binder }) => {
+      const object = space.db.add(Markdown.makeDocument({ name: 'Tasks' }));
+      await binder.bind({ objects: [Ref.make(object)] });
+    },
+  }),
+  args: {
+    components: [ChatContainer, [TasksContainer, BlueprintContainer]],
+  },
+} satisfies Story;
+
+export const WithChess = {
+  decorators: getDecorators({
+    plugins: [ChessPlugin()],
+    config: config.remote,
+    types: [Chess.Game],
+    onInit: async ({ space, binder }) => {
+      // TODO(burdon): Add player DID (for user and assistant).
+      const object = space.db.add(
+        Chess.makeGame({
+          name: 'Challenge',
+          pgn: '1. e4 e5 2. Nf3 Nc6 3. Bc4 Bc5 4. c3 Nf6 5. d4 exd4 6. cxd4 Bb4+ 7. Nc3 d5 8. exd5 Nxd5 9. O-O Be6 10. Qb3 Na5 11. Qa4+ c6 12. Bxd5 Bxc3 13. Bxe6 fxe6 *',
+        }),
+      );
+      await binder.bind({ objects: [Ref.make(object)] });
+    },
+  }),
+  args: {
+    components: [ChatContainer, SurfaceContainer],
+    blueprints: ['dxos.org/blueprint/assistant', 'dxos.org/blueprint/chess'],
+  },
+} satisfies Story;
+
+export const WithMap = {
+  decorators: getDecorators({
+    plugins: [MapPlugin()],
+    config: config.remote,
+    types: [Map.Map],
+    onInit: async ({ space, binder }) => {
+      const object = space.db.add(Map.makeMap());
+      await binder.bind({ objects: [Ref.make(object)] });
+    },
+  }),
+  args: {
+    components: [ChatContainer, SurfaceContainer],
+  },
+} satisfies Story;
+
+export const WithTrip = {
+  decorators: getDecorators({
+    plugins: [MarkdownPlugin(), MapPlugin()],
+    config: config.remote,
+    types: [Map.Map],
+    onInit: async ({ space, binder }) => {
+      // TODO(burdon): Table.
+      {
+        const object = space.db.add(Map.makeMap({ name: 'Trip' }));
+        await binder.bind({ objects: [Ref.make(object)] });
+      }
+      {
+        const object = space.db.add(
+          Markdown.makeDocument({
+            name: 'Itinerary',
+            content: trim`
+              # Itinerary
+
+              ## Day 1
+              - Visit the Sagrada Familia
+              - Visit the Park Güell
+              - Visit the Casa Batlló
+
+              ## Day 2
+              - Visit the Eiffel Tower
+              - Visit the Louvre
+              - Visit the Musée d'Orsay
+            `,
+          }),
+        );
+        await binder.bind({ objects: [Ref.make(object)] });
+      }
+      {
+        const object = space.db.add(
+          Markdown.makeDocument({
+            name: 'Barcelona',
+            content: trim`
+              # Barcelona
+
+              Barcelona is the capital and most populous city of Catalonia, an autonomous community in northeastern Spain. 
+              It is located on the Mediterranean coast, on the banks of the Llobregat River, in the comarca of the Baix Llobregat. 
+              The city is known for its rich history, vibrant culture, and stunning architecture, including the Sagrada Familia, Park Güell, and Casa Batlló.
+            `,
+          }),
+        );
+        await binder.bind({ objects: [Ref.make(object)] });
+      }
+    },
+  }),
+  args: {
+    components: [ChatContainer, SurfaceContainer],
+  },
+} satisfies Story;
+
+export const WithBoard = {
+  decorators: getDecorators({
+    plugins: [BoardPlugin()],
+    config: config.remote,
+    types: [Board.Board],
+    onInit: async ({ space, binder }) => {
+      const object = space.db.add(Board.makeBoard());
+      await binder.bind({ objects: [Ref.make(object)] });
+    },
+  }),
+  args: {
+    debug: true,
+    components: [ChatContainer, SurfaceContainer],
+  },
+} satisfies Story;
+
+export const WithResearch = {
+  decorators: getDecorators({
+    plugins: [MarkdownPlugin(), TablePlugin()],
+    config: config.persistent,
+    types: [...ResearchDataTypes, ResearchGraph, DataType.AccessToken],
+    accessTokens: [Obj.make(DataType.AccessToken, { source: 'exa.ai', token: EXA_API_KEY })],
+  }),
+  args: {
+    components: [ChatContainer, [GraphContainer, BlueprintContainer, LoggingContainer]],
+    blueprints: [RESEARCH_BLUEPRINT.key],
+  },
+} satisfies Story;
+
+export const WithSearch = {
+  decorators: getDecorators({
+    config: config.remote,
+    types: testTypes,
+    onInit: async ({ space }) => {
+      await addTestData(space);
+    },
+  }),
+  args: {
+    components: [ChatContainer, [GraphContainer]],
+  },
+} satisfies Story;

package/src/stories/components/BlueprintContainer.tsx

@@ -0,0 +1,34 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import '@dxos-theme';
+
+import React from 'react';
+
+import { Blueprint } from '@dxos/blueprints';
+import { Filter, Obj } from '@dxos/echo';
+import { useQuery } from '@dxos/react-client/echo';
+import { Toolbar } from '@dxos/react-ui';
+
+import { TemplateEditor } from '../../components';
+
+import { type ComponentProps } from './types';
+
+export const BlueprintContainer = ({ space }: ComponentProps) => {
+  const [blueprint] = useQuery(space, Filter.type(Blueprint.Blueprint));
+  if (!blueprint?.instructions) {
+    return null;
+  }
+
+  return (
+    <div className='flex flex-col h-full'>
+      <Toolbar.Root classNames='density-coarse border-b border-subduedSeparator'>
+        <h2>{Obj.getLabel(blueprint)}</h2>
+        <div className='flex-1' />
+        <Toolbar.IconButton icon='ph--arrow-clockwise--regular' iconOnly label='Refresh' />
+      </Toolbar.Root>
+      <TemplateEditor id={blueprint.id} template={blueprint.instructions} />
+    </div>
+  );
+};