@dxos/plugin-assistant 0.8.3-main.672df60 → 0.8.3-main.7f5a14c

package/src/capabilities/react-surface.tsx

@@ -7,24 +7,15 @@ import React, { useEffect, useMemo } from 'react';
 
 import { Capabilities, contributes, createIntent, createSurface, useIntentDispatcher } from '@dxos/app-framework';
 import { Blueprint } from '@dxos/assistant';
-import { Obj } from '@dxos/echo';
-import { Filter, isInstanceOf, Query } from '@dxos/echo-schema';
+import { Filter, type Key, Obj, Query } from '@dxos/echo';
 import { SettingsStore } from '@dxos/local-storage';
 import { SpaceAction } from '@dxos/plugin-space/types';
-import {
-  type AnyLiveObject,
-  fullyQualifiedId,
-  getSpace,
-  getTypename,
-  isEchoObject,
-  type SpaceId,
-} from '@dxos/react-client/echo';
-import { StackItem } from '@dxos/react-ui-stack';
+import { fullyQualifiedId, getSpace, getTypename } from '@dxos/react-client/echo';
 
 import {
   AssistantDialog,
   AssistantSettings,
-  BlueprintEditor,
+  BlueprintContainer,
   ChatContainer,
   PromptSettings,
   TemplateContainer,
@@ -51,15 +42,16 @@ export default () =>
     createSurface({
       id: `${ASSISTANT_PLUGIN}/object-chat`,
       role: 'article',
-      filter: (data): data is { companionTo: AnyLiveObject<any>; subject: AIChatType | 'assistant-chat' } =>
-        isEchoObject(data.companionTo) && (isInstanceOf(AIChatType, data.subject) || data.subject === 'assistant-chat'),
+      filter: (data): data is { companionTo: Obj.Any; subject: AIChatType | 'assistant-chat' } =>
+        Obj.isObject(data.companionTo) &&
+        (Obj.instanceOf(AIChatType, data.subject) || data.subject === 'assistant-chat'),
       component: ({ data, role }) => {
         const { dispatch } = useIntentDispatcher();
         const associatedArtifact = useMemo(
           () => ({
             id: fullyQualifiedId(data.companionTo),
             typename: getTypename(data.companionTo) ?? 'unknown',
-            spaceId: (getSpace(data.companionTo)?.id ?? 'unknown') as SpaceId,
+            spaceId: (getSpace(data.companionTo)?.id ?? 'unknown') as Key.SpaceId,
           }),
           [data.companionTo],
         );
@@ -106,11 +98,7 @@ export default () =>
       id: `${ASSISTANT_PLUGIN}/blueprint`,
       role: 'article',
       filter: (data): data is { subject: Blueprint } => Obj.instanceOf(Blueprint, data.subject),
-      component: ({ data, role }) => (
-        <StackItem.Content role={role}>
-          <BlueprintEditor blueprint={data.subject} />
-        </StackItem.Content>
-      ),
+      component: ({ data, role }) => <BlueprintContainer role={role} blueprint={data.subject} />,
     }),
     createSurface({
       id: `${ASSISTANT_PLUGIN}/template`,

package/src/capabilities/settings.ts

@@ -5,15 +5,15 @@
 import { Capabilities, contributes } from '@dxos/app-framework';
 import { live } from '@dxos/live-object';
 
-import { ASSISTANT_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { type AssistantSettingsProps, AssistantSettingsSchema } from '../types';
 
 export default () => {
   const settings = live<AssistantSettingsProps>({});
 
   return contributes(Capabilities.Settings, {
+    prefix: meta.id,
     schema: AssistantSettingsSchema,
-    prefix: ASSISTANT_PLUGIN,
     value: settings,
   });
 };

package/src/components/AmbientDialog/AmbientDialog.stories.tsx

@@ -52,6 +52,7 @@ const meta: Meta<typeof AmbientDialog> = {
     );
   },
   decorators: [
+    // TODO(burdon): Replace with ClientPlugin.
     withClientProvider({
       config: new Config({
         runtime: {

package/src/components/BlueprintContainer.tsx

@@ -0,0 +1,160 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type EditorView } from '@codemirror/view';
+import JSON5 from 'json5';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+
+import { ToolRegistry } from '@dxos/ai';
+import { useCapability } from '@dxos/app-framework';
+import {
+  type Blueprint,
+  type BlueprintDefinition,
+  BlueprintLoggerAdapter,
+  BlueprintParser,
+  BlueprintMachine,
+  createLocalSearchTool,
+  createExaTool,
+  createGraphWriterTool,
+} from '@dxos/assistant';
+import { getSpace } from '@dxos/client/echo';
+import { DXN, Key } from '@dxos/echo';
+import { Toolbar, useTranslation } from '@dxos/react-ui';
+import { getSelectionSet, useSelectionManager } from '@dxos/react-ui-attention';
+import { StackItem, type StackItemContentProps } from '@dxos/react-ui-stack';
+
+import { BlueprintEditor } from './BlueprintEditor';
+import { AssistantCapabilities } from '../capabilities';
+import { meta } from '../meta';
+
+// TODO(burdon): Move to config.
+export const EXA_API_KEY = '9c7e17ff-0c85-4cd5-827a-8b489f139e03';
+
+// TODO(burdon): Validate.
+const parseBlueprint = (text: string): BlueprintDefinition | undefined => {
+  try {
+    const json = JSON5.parse(text);
+    const { steps } = json;
+    return { steps };
+  } catch (error) {
+    // Ignore.
+  }
+};
+
+export const BlueprintContainer = ({
+  role,
+  blueprint,
+}: Pick<StackItemContentProps, 'role'> & { blueprint: Blueprint }) => {
+  const { t } = useTranslation(meta.id);
+  const aiClient = useCapability(AssistantCapabilities.AiClient);
+  const selectionManager = useSelectionManager();
+  const [definition, setDefinition] = useState<BlueprintDefinition>();
+  useEffect(() => {
+    setDefinition({
+      steps: blueprint.steps.map(({ instructions, tools }) => ({ instructions, tools })),
+    });
+  }, [blueprint]);
+
+  const editorRef = useRef<EditorView | undefined>(undefined);
+
+  // TODO(burdon): Factor out.
+  const toolRegistry = useMemo(() => {
+    const space = getSpace(blueprint);
+    if (!space) {
+      return;
+    }
+
+    // TODO(burdon): How should the queue be created?
+    const queue = space.queues.create();
+
+    return new ToolRegistry([
+      createExaTool({ apiKey: EXA_API_KEY }),
+      createLocalSearchTool(space.db, queue),
+      createGraphWriterTool({
+        db: space.db,
+        queue,
+        schema: [], // TODO(burdon): Get schema from client/blueprint?
+        onDone: async (objects) => {
+          queue.append(objects);
+        },
+      }),
+    ]);
+  }, [blueprint]);
+
+  const formatAndSave = (): BlueprintDefinition | undefined => {
+    if (!blueprint) {
+      return;
+    }
+
+    const text = editorRef.current?.state.doc.toString();
+    if (!text) {
+      return;
+    }
+
+    const definition = parseBlueprint(text);
+    if (!definition) {
+      return;
+    }
+
+    setDefinition(definition);
+    const formatted = JSON.stringify(definition, null, 2);
+    editorRef.current?.dispatch({
+      changes: { from: 0, to: text.length, insert: formatted },
+    });
+
+    blueprint.steps.length = 0;
+    for (const step of definition.steps) {
+      blueprint.steps.push({
+        id: Key.ObjectId.random(),
+        instructions: step.instructions,
+        tools: step.tools,
+      });
+    }
+
+    return definition;
+  };
+
+  // TODO(burdon): Save raw blueprint separately from parsed blueprint? (like Script).
+  const handleSave = useCallback(() => {
+    const definition = formatAndSave();
+    if (!definition) {
+      return;
+    }
+
+    setDefinition(definition);
+  }, [blueprint]);
+
+  const handleRun = useCallback(async () => {
+    if (!aiClient?.value || !toolRegistry) {
+      return;
+    }
+
+    const definition = formatAndSave();
+    if (!definition) {
+      return;
+    }
+
+    // Get input from selection.
+    const input = Array.from(getSelectionSet(selectionManager)).map((id) => DXN.fromLocalObjectId(id));
+    if (!input.length) {
+      return;
+    }
+
+    const blueprint = BlueprintParser.create().parse(definition);
+    const machine = new BlueprintMachine(toolRegistry, blueprint).setLogger(new BlueprintLoggerAdapter());
+    await machine.runToCompletion({ aiClient: aiClient.value, input });
+  }, [aiClient.value, toolRegistry]);
+
+  return (
+    <StackItem.Content role={role} toolbar>
+      <Toolbar.Root classNames='border-be border-subduedSeparator'>
+        <Toolbar.Button onClick={handleSave}>{t('button save')}</Toolbar.Button>
+        <Toolbar.Button onClick={handleRun}>{t('button run')}</Toolbar.Button>
+      </Toolbar.Root>
+      {definition && <BlueprintEditor ref={editorRef} blueprint={definition} />}
+    </StackItem.Content>
+  );
+};
+
+export default BlueprintContainer;

package/src/components/BlueprintEditor/BlueprintEditor.stories.tsx

@@ -9,7 +9,7 @@ import { type StoryObj, type Meta } from '@storybook/react';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { BlueprintEditor } from './BlueprintEditor';
-import { RESEARCH_BLUEPRINT } from '../../testing';
+import { RESEARCH_BLUEPRINT_DEFINITION } from '../../testing';
 import translations from '../../translations';
 
 const meta: Meta<typeof BlueprintEditor> = {
@@ -27,6 +27,6 @@ type Story = StoryObj<typeof BlueprintEditor>;
 
 export const Default: Story = {
   args: {
-    blueprint: RESEARCH_BLUEPRINT,
+    blueprint: RESEARCH_BLUEPRINT_DEFINITION,
   },
 };

package/src/components/BlueprintEditor/BlueprintEditor.tsx

@@ -2,39 +2,49 @@
 // Copyright 2025 DXOS.org
 //
 
-import React from 'react';
+import React, { forwardRef, useImperativeHandle } from 'react';
 
-import { Blueprint } from '@dxos/assistant';
-import { toJsonSchema } from '@dxos/echo-schema';
+import { BlueprintDefinition } from '@dxos/assistant';
+import { Type } from '@dxos/echo';
 import { useThemeContext, type ThemedClassName } from '@dxos/react-ui';
 import {
+  type EditorView,
   createBasicExtensions,
   createJsonExtensions,
   createThemeExtensions,
-  editorMonospace,
   useTextEditor,
 } from '@dxos/react-ui-editor';
 import { mx } from '@dxos/react-ui-theme';
 
 export type BlueprintEditorProps = ThemedClassName<{
-  blueprint: Blueprint;
+  blueprint: BlueprintDefinition;
 }>;
 
 // TODO(burdon): Factor out JsonEditor.
-// TODO(burdon): Make editable.
-export const BlueprintEditor = ({ classNames, blueprint }: BlueprintEditorProps) => {
-  const { themeMode } = useThemeContext();
-  const { parentRef } = useTextEditor({
-    initialValue: JSON.stringify(blueprint, null, 2),
-    extensions: [
-      createBasicExtensions({ lineWrapping: false }),
-      createThemeExtensions({ themeMode, syntaxHighlighting: true }),
-      createJsonExtensions({ schema: toJsonSchema(Blueprint, { strict: true }) }),
-      editorMonospace,
-    ],
-  });
+export const BlueprintEditor = forwardRef<EditorView | undefined, BlueprintEditorProps>(
+  ({ classNames, blueprint }, forwardedRef) => {
+    const { themeMode } = useThemeContext();
+    const { parentRef, view } = useTextEditor({
+      initialValue: JSON.stringify(blueprint, null, 2),
+      extensions: [
+        createBasicExtensions({
+          lineNumbers: true,
+          lineWrapping: false,
+          monospace: true,
+          scrollPastEnd: true,
+        }),
+        createThemeExtensions({
+          themeMode,
+          syntaxHighlighting: true,
+        }),
+        createJsonExtensions({
+          schema: Type.toJsonSchema(BlueprintDefinition, { strict: true }),
+        }),
+      ],
+    });
 
-  return (
-    <div ref={parentRef} className={mx('flex w-full pli-2 overflow-x-scroll border-x border-separator', classNames)} />
-  );
-};
+    useImperativeHandle(forwardedRef, () => view, [view]);
+
+    return <div ref={parentRef} className={mx('overflow-hidden', classNames)} />;
+  },
+);

package/src/components/BlueprintEditor/index.ts

@@ -2,6 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-import { BlueprintEditor } from './BlueprintEditor';
-
-export default BlueprintEditor;
+export * from './BlueprintEditor';

package/src/components/TemplateContainer.tsx

@@ -4,12 +4,15 @@
 
 import React from 'react';
 
-import { StackItem } from '@dxos/react-ui-stack';
+import { StackItem, type StackItemContentProps } from '@dxos/react-ui-stack';
 
 import { TemplateEditor } from './TemplateEditor';
 import { type TemplateType } from '../types';
 
-export const TemplateContainer = ({ template, role }: { template: TemplateType; role: string }) => {
+export const TemplateContainer = ({
+  role,
+  template,
+}: Pick<StackItemContentProps, 'role'> & { template: TemplateType }) => {
   return (
     <StackItem.Content role={role} classNames='container-max-width'>
       <TemplateEditor template={template} />

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

@@ -8,7 +8,7 @@ import { type Meta } from '@storybook/react';
 import React, { useState } from 'react';
 
 import { createSystemPrompt } from '@dxos/artifact';
-import { live } from '@dxos/live-object';
+import { Obj } from '@dxos/echo';
 import { useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
@@ -38,7 +38,7 @@ const DefaultStory = ({ text }: TemplateEditorProps & { text: string }) => {
   const client = useClient();
   const [template] = useState(() => {
     const space = client.spaces.default;
-    return space.db.add(live(TemplateType, { source: text, kind: { include: 'manual' } }));
+    return space.db.add(Obj.make(TemplateType, { source: text, kind: { include: 'manual' } }));
   });
 
   return (

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

@@ -7,7 +7,7 @@ import '@dxos-theme';
 import { type Meta } from '@storybook/react';
 import React, { useState } from 'react';
 
-import { live } from '@dxos/live-object';
+import { Obj } from '@dxos/echo';
 import { useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
@@ -30,7 +30,7 @@ const DefaultStory = () => {
   const client = useClient();
   const [template] = useState(() => {
     const space = client.spaces.default;
-    return space.db.add(live(TemplateType, { source: TEMPLATE, kind: { include: 'manual' } }));
+    return space.db.add(Obj.make(TemplateType, { source: TEMPLATE, kind: { include: 'manual' } }));
   });
 
   return (

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

@@ -19,8 +19,7 @@ import {
 } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { remoteServiceEndpoints } from '@dxos/artifact-testing';
-import { Type, type Obj } from '@dxos/echo';
-import { createQueueDxn, create, Query, Filter } from '@dxos/echo-schema';
+import { Filter, Obj, Query, Type } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 import { ChessPlugin } from '@dxos/plugin-chess';
 import { ChessType } from '@dxos/plugin-chess/types';
@@ -58,7 +57,7 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
   const artifactDefinitions = useCapabilities(Capabilities.ArtifactDefinition);
   const tools = useCapabilities(Capabilities.Tools);
 
-  const [aiClient] = useState(() => new AIServiceEdgeClient({ endpoint: endpoints.ai }));
+  const aiClient = useMemo(() => new AIServiceEdgeClient({ endpoint: endpoints.ai }), []);
   const { dispatchPromise: dispatch } = useIntentDispatcher();
 
   // TODO(burdon): Replace with useChatProcessor.
@@ -81,19 +80,19 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
   }, [aiClient, tools, space, dispatch, artifactDefinitions]);
 
   // Queue.
-  const [queueDxn, setQueueDxn] = useState<string>(() => createQueueDxn(space.id).toString());
+  const [queueDxn, setQueueDxn] = useState<string>(() => space.queues.create().dxn.toString());
   const queue = useQueue<Message>(Type.DXN.tryParse(queueDxn));
 
   useEffect(() => {
     if (space) {
-      setQueueDxn(createQueueDxn(space.id).toString());
+      setQueueDxn(space.queues.create().dxn.toString());
     }
   }, [space]);
 
   useEffect(() => {
     if (queue?.objects.length === 0 && !queue.isLoading && prompts.length > 0) {
       queue.append([
-        create(Message, {
+        Obj.make(Message, {
           role: 'assistant',
           content: prompts.map(
             (prompt) =>
@@ -174,7 +173,7 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
               iconOnly
               label='Clear history'
               icon='ph--trash--regular'
-              onClick={() => setQueueDxn(createQueueDxn(space.id).toString())}
+              onClick={() => setQueueDxn(space.queues.create().dxn.toString())}
             />
             <IconButton iconOnly label='Stop' icon='ph--stop--regular' onClick={() => processor?.cancel()} />
           </Input.Root>
@@ -262,7 +261,7 @@ export const WithInitialItems: Story = {
   args: {
     debug: true,
     items: [
-      create(ChessType, {
+      Obj.make(ChessType, {
         fen: 'rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1',
       }),
     ],

package/src/components/Thread/ThreadContainer.tsx

@@ -6,9 +6,8 @@ import React, { useCallback, type FC, useEffect } from 'react';
 
 import { CollaborationActions, createIntent, useIntentDispatcher } from '@dxos/app-framework';
 import { type AssociatedArtifact } from '@dxos/artifact';
+import { DXN, Ref } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
-import { DXN } from '@dxos/keys';
-import { refFromDXN } from '@dxos/live-object';
 import { log } from '@dxos/log';
 import { getSpace } from '@dxos/react-client/echo';
 import { type ThemedClassName } from '@dxos/react-ui';
@@ -50,7 +49,7 @@ export const ThreadContainer: FC<ThemedClassName<ThreadContainerProps>> = ({
         void dispatch(
           createIntent(CollaborationActions.InsertContent, {
             target: associatedArtifact,
-            object: refFromDXN(new DXN(DXN.kind.QUEUE, [...chat.queue.dxn.parts, message.id])),
+            object: Ref.fromDXN(new DXN(DXN.kind.QUEUE, [...chat.queue.dxn.parts, message.id])),
             label: 'View proposal',
           }),
         );

package/src/components/index.ts

@@ -16,6 +16,6 @@ export * from './Toolbox';
 //  Repro: open assistant dialog then close.
 //  https://github.com/microsoft/fluentui/issues/34020
 export const AssistantDialog = lazy(() => import('./AssistantDialog'));
-export const BlueprintEditor = lazy(() => import('./BlueprintEditor'));
+export const BlueprintContainer = lazy(() => import('./BlueprintContainer'));
 export const ChatContainer = lazy(() => import('./ChatContainer'));
 export const TemplateContainer = lazy(() => import('./TemplateContainer'));

package/src/hooks/useContextProvider.ts

@@ -5,10 +5,8 @@
 import { useMemo } from 'react';
 
 import { Capabilities, useCapabilities } from '@dxos/app-framework';
-import { Filter, type Space } from '@dxos/client/echo';
-import { Obj, type Type } from '@dxos/echo';
-import { getObjectDXN, getLabel } from '@dxos/echo-schema';
-import { log } from '@dxos/log';
+import { type Space } from '@dxos/client/echo';
+import { Filter, Obj, type Type } from '@dxos/echo';
 
 export type ContextProvider = {
   query: (params: { query: string }) => Promise<Array<{ uri: string; label: string }>>;
@@ -31,27 +29,26 @@ export const useContextProvider = (space?: Space): ContextProvider | undefined =
         const { objects } = await space.db
           .query(Filter.or(...artifactSchemas.map((schema) => Filter.type(schema as Type.Schema))))
           .run();
+
         return (
           objects
-            .map((object) => {
-              log.info('object', { object, label: getLabel(Obj.getSchema(object)!, object) });
-              return object;
-            })
-            .filter((object) => stringMatch(query, getLabel(Obj.getSchema(object)!, object) ?? ''))
+            // TODO(burdon): Remove cast ??? (+ two instances below).
+            // .map((object) => {
+            //   log.info('object', { object, label: Obj.getLabel(object as any) });
+            //   return object;
+            // })
+            .filter((object) => stringMatch(query, Obj.getLabel(object as any) ?? ''))
             // TODO(dmaretskyi): `Type.getDXN` (at the point of writing) didn't work here as it was schema-only.
-            .filter((object) => !!getObjectDXN(object))
+            .filter((object) => !!Obj.getDXN(object as Obj.Any))
             .map((object) => ({
-              uri: getObjectDXN(object as any)!.toString(),
-              label: getLabel(Obj.getSchema(object)!, object) ?? '',
+              uri: Obj.getDXN(object as any)!.toString(),
+              label: Obj.getLabel(object as any) ?? '',
             }))
         );
       },
       resolveMetadata: async ({ uri }) => {
         const object = await space.db.query(Filter.ids(uri)).first();
-        return {
-          uri,
-          label: getLabel(Obj.getSchema(object)!, object) ?? '',
-        };
+        return { uri, label: Obj.getLabel(object) ?? '' };
       },
     };
   }, [space, artifactDefinitions]);

package/src/hooks/useMessageQueue.ts

@@ -5,7 +5,7 @@
 import { useMemo } from 'react';
 
 import { type Message } from '@dxos/ai';
-import { createQueueDxn } from '@dxos/echo-schema';
+import { createQueueDXN } from '@dxos/echo-schema';
 import { getSpace, useQueue } from '@dxos/react-client/echo';
 
 import { type AIChatType } from '../types';
@@ -13,8 +13,9 @@ import { type AIChatType } from '../types';
 export const useMessageQueue = (chat?: AIChatType) => {
   const space = getSpace(chat);
   const queueDxn = useMemo(() => {
+    // TODO(dmaretskyi): Chat.queue.dxn should be a valid DXN already.
     const dxn = space && chat?.queue.dxn;
-    return dxn ? createQueueDxn(space.id, dxn.parts.at(-1)) : undefined;
+    return dxn ? createQueueDXN(space.id, dxn.parts.at(-1)) : undefined;
   }, [space, chat?.queue.dxn]);
 
   return useQueue<Message>(queueDxn);

package/src/index.ts

@@ -2,6 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
+export * from './capabilities';
 export * from './components';
 export * from './meta';
 export * from './types';

package/src/parser/filter-generator.test.ts

@@ -4,7 +4,7 @@
 
 import { describe, test } from 'vitest';
 
-import { Filter } from '@dxos/echo-schema';
+import { Filter } from '@dxos/echo';
 
 import { createFilter } from './filter-generator';
 import { QueryParser } from './query-parser';

package/src/parser/filter-generator.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Filter } from '@dxos/echo-schema';
+import { Filter } from '@dxos/echo';
 
 import {
   type BinaryExpression,