@dxos/plugin-assistant 0.8.2-main.fbd8ed0 → 0.8.2-staging.4d6ad0f

package/src/capabilities/ai-client.ts

@@ -4,8 +4,8 @@
 
 import { effect, signal } from '@preact/signals-core';
 
+import { type AIServiceClient, AIServiceEdgeClient, OllamaClient } from '@dxos/ai';
 import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
-import { type AIServiceClient, AIServiceEdgeClient, OllamaClient } from '@dxos/assistant';
 import { ClientCapabilities } from '@dxos/plugin-client';
 
 import { AssistantCapabilities } from './capabilities';

package/src/capabilities/app-graph-builder.ts

@@ -13,6 +13,7 @@ import {
   type PromiseIntentDispatcher,
   type PluginContext,
 } from '@dxos/app-framework';
+import { isInstanceOf } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
@@ -24,14 +25,14 @@ import {
   Filter,
   fullyQualifiedId,
   getSpace,
-  isLiveObject,
   isSpace,
   Query,
   type QueryResult,
+  isEchoObject,
 } from '@dxos/react-client/echo';
 
 import { ASSISTANT_DIALOG, ASSISTANT_PLUGIN } from '../meta';
-import { AIChatType, AssistantAction, TemplateType } from '../types';
+import { AIChatType, AssistantAction, CompanionTo, TemplateType } from '../types';
 
 export default (context: PluginContext) =>
   contributes(Capabilities.AppGraphBuilder, [
@@ -104,31 +105,40 @@ export default (context: PluginContext) =>
 
     createExtension({
       id: `${ASSISTANT_PLUGIN}/object-chat-companion`,
-      // TODO(burdon): Add to all objects?
-      connector: (node) =>
-        Rx.make((get) =>
+      connector: (node) => {
+        let query: QueryResult<AIChatType> | undefined;
+        return Rx.make((get) =>
           pipe(
             get(node),
-            Option.flatMap((node) =>
-              isLiveObject(node.data) && node.data.assistantChatQueue && node.data.type !== AIChatType.typename
-                ? Option.some(node)
-                : Option.none(),
-            ),
-            Option.map((node) => [
-              {
-                id: [node.id, 'assistant-chat'].join(ATTENDABLE_PATH_SEPARATOR),
-                type: PLANK_COMPANION_TYPE,
-                data: 'assistant-chat',
-                properties: {
-                  label: ['assistant chat label', { ns: ASSISTANT_PLUGIN }],
-                  icon: 'ph--sparkle--regular',
-                  position: 'hoist',
+            Option.flatMap((node) => (isEchoObject(node.data) ? Option.some(node.data) : Option.none())),
+            Option.flatMap((object) => {
+              const space = getSpace(object);
+              return space ? Option.some({ space, object }) : Option.none();
+            }),
+            Option.map(({ space, object }) => {
+              if (!query) {
+                query = space.db.query(Query.select(Filter.ids(object.id)).targetOf(CompanionTo).source());
+              }
+
+              const chat = get(rxFromQuery(query))[0];
+              return [
+                {
+                  id: [fullyQualifiedId(object), 'assistant-chat'].join(ATTENDABLE_PATH_SEPARATOR),
+                  type: PLANK_COMPANION_TYPE,
+                  data: chat ?? 'assistant-chat',
+                  properties: {
+                    label: ['assistant chat label', { ns: ASSISTANT_PLUGIN }],
+                    icon: 'ph--sparkle--regular',
+                    position: 'hoist',
+                    disposition: 'hidden',
+                  },
                 },
-              },
-            ]),
+              ];
+            }),
             Option.getOrElse(() => []),
           ),
-        ),
+        );
+      },
     }),
 
     createExtension({
@@ -216,8 +226,8 @@ const getOrCreateChat = async (dispatch: PromiseIntentDispatcher, space: Space):
     return objects[objects.length - 1];
   }
 
-  const { data } = await dispatch(createIntent(AssistantAction.CreateChat, { spaceId: space.id }));
-  invariant(data?.object instanceof AIChatType);
+  const { data } = await dispatch(createIntent(AssistantAction.CreateChat, { space }));
+  invariant(isInstanceOf(AIChatType, data?.object));
   await dispatch(createIntent(SpaceAction.AddObject, { target: space, object: data.object }));
   return data.object;
 };

package/src/capabilities/capabilities.ts

@@ -4,8 +4,8 @@
 
 import { type ReadonlySignal } from '@preact/signals-core';
 
+import { type AIServiceClient } from '@dxos/ai';
 import { defineCapability } from '@dxos/app-framework';
-import { type AIServiceClient } from '@dxos/assistant';
 
 import { ASSISTANT_PLUGIN } from '../meta';
 

package/src/capabilities/intent-resolver.ts

@@ -13,10 +13,11 @@ export default () => [
     Capabilities.IntentResolver,
     createResolver({
       intent: AssistantAction.CreateChat,
-      resolve: ({ spaceId, name }) => ({
+      resolve: ({ space, name }) => ({
         data: {
           object: live(AIChatType, {
-            assistantChatQueue: refFromDXN(createQueueDxn(spaceId)),
+            name,
+            queue: refFromDXN(createQueueDxn(space.id)),
           }),
         },
       }),

package/src/capabilities/react-surface.tsx

@@ -2,16 +2,26 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { useMemo } from 'react';
+import { Effect } from 'effect';
+import React, { useEffect, useMemo } from 'react';
 
-import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
-import { Type } from '@dxos/echo';
+import { Capabilities, contributes, createIntent, createSurface, useIntentDispatcher } from '@dxos/app-framework';
+import { Obj } from '@dxos/echo';
+import { Filter, isInstanceOf, Query } from '@dxos/echo-schema';
 import { SettingsStore } from '@dxos/local-storage';
-import { fullyQualifiedId, getSpace, getTypename, isLiveObject, type SpaceId } from '@dxos/react-client/echo';
+import { SpaceAction } from '@dxos/plugin-space/types';
+import {
+  type AnyLiveObject,
+  fullyQualifiedId,
+  getSpace,
+  getTypename,
+  isEchoObject,
+  type SpaceId,
+} from '@dxos/react-client/echo';
 
 import { AssistantDialog, AssistantSettings, ChatContainer, PromptSettings, TemplateContainer } from '../components';
 import { ASSISTANT_PLUGIN, ASSISTANT_DIALOG } from '../meta';
-import { AIChatType, type AssistantSettingsProps, TemplateType } from '../types';
+import { AIChatType, AssistantAction, type AssistantSettingsProps, CompanionTo, TemplateType } from '../types';
 
 export default () =>
   contributes(Capabilities.ReactSurface, [
@@ -32,17 +42,16 @@ export default () =>
       id: `${ASSISTANT_PLUGIN}/chat`,
       role: 'article',
       filter: (data): data is { subject: AIChatType; variant: undefined } =>
-        Type.instanceOf(AIChatType, data.subject) && data.variant !== 'assistant-chat',
+        Obj.instanceOf(AIChatType, data.subject) && data.variant !== 'assistant-chat',
       component: ({ data, role }) => <ChatContainer role={role} chat={data.subject} />,
     }),
     createSurface({
       id: `${ASSISTANT_PLUGIN}/object-chat`,
       role: 'article',
-      filter: (data): data is { companionTo: AIChatType; subject: 'assistant-chat' } =>
-        isLiveObject(data.companionTo) &&
-        (data as any).companionTo.assistantChatQueue &&
-        data.subject === 'assistant-chat',
+      filter: (data): data is { companionTo: AnyLiveObject<any>; subject: AIChatType | 'assistant-chat' } =>
+        isEchoObject(data.companionTo) && (isInstanceOf(AIChatType, data.subject) || data.subject === 'assistant-chat'),
       component: ({ data, role }) => {
+        const { dispatch } = useIntentDispatcher();
         const associatedArtifact = useMemo(
           () => ({
             id: fullyQualifiedId(data.companionTo),
@@ -51,19 +60,55 @@ export default () =>
           }),
           [data.companionTo],
         );
-        return <ChatContainer role={role} chat={data.companionTo} associatedArtifact={associatedArtifact} />;
+
+        // TODO(wittjosiah): Factor out to container.
+        useEffect(() => {
+          const timeout = setTimeout(async () => {
+            const space = getSpace(data.companionTo);
+            if (space && data.subject === 'assistant-chat') {
+              const result = await space.db
+                .query(Query.select(Filter.ids(data.companionTo.id)).targetOf(CompanionTo).source())
+                .run();
+              if (result.objects.length > 0) {
+                return;
+              }
+
+              const program = Effect.gen(function* () {
+                const { object } = yield* dispatch(createIntent(AssistantAction.CreateChat, { space }));
+                yield* dispatch(createIntent(SpaceAction.AddObject, { object, target: space, hidden: true }));
+                yield* dispatch(
+                  createIntent(SpaceAction.AddRelation, {
+                    space,
+                    schema: CompanionTo,
+                    source: object,
+                    target: data.companionTo,
+                  }),
+                );
+              });
+              void Effect.runPromise(program);
+            }
+          });
+
+          return () => clearTimeout(timeout);
+        }, [data.subject]);
+
+        if (data.subject === 'assistant-chat') {
+          return null;
+        }
+
+        return <ChatContainer role={role} chat={data.subject} associatedArtifact={associatedArtifact} />;
       },
     }),
     createSurface({
       id: `${ASSISTANT_PLUGIN}/template`,
       role: 'article',
-      filter: (data): data is { subject: TemplateType } => Type.instanceOf(TemplateType, data.subject),
+      filter: (data): data is { subject: TemplateType } => Obj.instanceOf(TemplateType, data.subject),
       component: ({ data, role }) => <TemplateContainer role={role} template={data.subject} />,
     }),
     createSurface({
       id: `${ASSISTANT_PLUGIN}/prompt-settings`,
       role: 'object-settings',
-      filter: (data): data is { subject: TemplateType } => Type.instanceOf(TemplateType, data.subject),
+      filter: (data): data is { subject: TemplateType } => Obj.instanceOf(TemplateType, data.subject),
       component: ({ data }) => <PromptSettings template={data.subject} />,
     }),
   ]);

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

@@ -19,7 +19,7 @@ import { AmbientDialog } from './AmbientDialog';
 import translations from '../../translations';
 
 const meta: Meta<typeof AmbientDialog> = {
-  title: 'plugins/plugin-automation/AmbientDialog',
+  title: 'plugins/plugin-assistant/AmbientDialog',
   component: AmbientDialog,
   render: () => {
     const [open, setOpen] = useState(true);

package/src/components/AmbientDialog/AmbientDialog.tsx

@@ -15,10 +15,19 @@ const minSize = 5;
 export type AmbientDialogProps = PropsWithChildren<{
   open?: boolean;
   title?: string;
+  resizeable?: boolean;
   onOpenChange?: (open: boolean) => void;
+  onEscape?: () => void;
 }>;
 
-export const AmbientDialog = ({ children, open: controlledOpen, title, onOpenChange }: AmbientDialogProps) => {
+export const AmbientDialog = ({
+  children,
+  open: controlledOpen,
+  title,
+  resizeable = true,
+  onOpenChange,
+  onEscape,
+}: AmbientDialogProps) => {
   const [resizeKey, setReizeKey] = useState(0);
   const [size, setSize] = useState<Size>('min-content');
   const [open, setOpen] = useState(controlledOpen);
@@ -47,26 +56,31 @@ export const AmbientDialog = ({ children, open: controlledOpen, title, onOpenCha
   return (
     <div role='none' className='dx-dialog__overlay bg-transparent pointer-events-none' data-block-align='end'>
       <Dialog.Content
-        classNames='relative box-content py-0 px-2 md:is-[35rem] md:max-is-none overflow-hidden pointer-events-auto transition-[block-size] ease-in-out duration-0 [&:not([data-dx-resizing="true"])]:duration-200'
+        classNames='relative box-content p-0 md:is-[35rem] md:max-is-none overflow-hidden pointer-events-auto transition-[block-size] ease-in-out duration-0 [&:not([data-dx-resizing="true"])]:duration-200'
         inOverlayLayout
         {...resizeAttributes}
         style={{
-          ...sizeStyle(size, 'vertical', true),
+          ...(resizeable ? sizeStyle(size, 'vertical', true) : {}),
           maxBlockSize: 'calc(100dvh - env(safe-area-inset-bottom) - env(safe-area-inset-top) - 9rem)',
         }}
+        onEscapeKeyDown={onEscape}
         onInteractOutside={preventDefault}
       >
-        <ResizeHandle
-          key={resizeKey}
-          side='block-start'
-          defaultSize='min-content'
-          minSize={minSize}
-          fallbackSize={minSize}
-          iconPosition='center'
-          onSizeChange={setSize}
-        />
+        {(resizeable && (
+          <>
+            <ResizeHandle
+              key={resizeKey}
+              side='block-start'
+              defaultSize='min-content'
+              minSize={minSize}
+              fallbackSize={minSize}
+              iconPosition='center'
+              onSizeChange={setSize}
+            />
 
-        <DialogHeader open={open} title={title} onToggle={handleToggle} />
+            <DialogHeader open={open} title={title} onToggle={handleToggle} />
+          </>
+        )) || <Dialog.Title srOnly />}
 
         {children}
       </Dialog.Content>

package/src/components/AssistantDialog.tsx

@@ -24,10 +24,10 @@ export const AssistantDialog: FC<{ chat?: AIChatType }> = ({ chat }) => {
   return (
     <AmbientDialog open={open} onOpenChange={setOpen} title={t('assistant dialog title')}>
       <ThreadContainer
+        part={'dialog'}
         chat={chat}
         onOpenChange={setOpen}
         settings={settings}
-        part={'dialog'}
         transcription={transcription}
       />
     </AmbientDialog>

package/src/components/AssistantSettings/AssistantSettings.tsx

@@ -4,7 +4,7 @@
 
 import React from 'react';
 
-import { DEFAULT_EDGE_MODELS, DEFAULT_OLLAMA_MODELS } from '@dxos/assistant';
+import { DEFAULT_EDGE_MODELS, DEFAULT_OLLAMA_MODELS } from '@dxos/ai';
 import { Input, Select, useTranslation } from '@dxos/react-ui';
 import { DeprecatedFormContainer, DeprecatedFormInput } from '@dxos/react-ui-form';
 

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

@@ -0,0 +1,32 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import '@dxos-theme';
+
+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 translations from '../../translations';
+
+const meta: Meta<typeof BlueprintEditor> = {
+  title: 'plugins/plugin-assistant/BlueprintEditor',
+  component: BlueprintEditor,
+  decorators: [withTheme, withLayout({ fullscreen: true, classNames: 'mli-auto max-is-[50rem] justify-center' })],
+  parameters: {
+    translations,
+  },
+};
+
+export default meta;
+
+type Story = StoryObj<typeof BlueprintEditor>;
+
+export const Default: Story = {
+  args: {
+    blueprint: RESEARCH_BLUEPRINT,
+  },
+};

package/src/components/BlueprintEditor/BlueprintEditor.tsx

@@ -0,0 +1,41 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React from 'react';
+
+import { Blueprint, type BlueprintParser } from '@dxos/assistant';
+import { toJsonSchema } from '@dxos/echo-schema';
+import { useThemeContext, type ThemedClassName } from '@dxos/react-ui';
+import {
+  createBasicExtensions,
+  createJsonExtensions,
+  createThemeExtensions,
+  editorMonospace,
+  useTextEditor,
+} from '@dxos/react-ui-editor';
+import { mx } from '@dxos/react-ui-theme';
+
+export type BlueprintEditorProps = ThemedClassName<{
+  blueprint: BlueprintParser.DSL;
+}>;
+
+// 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 }),
+      // TODO(burdon): ERROR: reference "/schemas/any" resolves to more than one schema
+      createJsonExtensions({ schema: toJsonSchema(Blueprint) }),
+      editorMonospace,
+    ],
+  });
+
+  return (
+    <div ref={parentRef} className={mx('flex w-full pli-2 overflow-x-scroll border-x border-separator', classNames)} />
+  );
+};

package/src/components/BlueprintEditor/index.ts

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

package/src/components/Prompt/Prompt.stories.tsx

@@ -7,17 +7,65 @@ import '@dxos-theme';
 import { type StoryObj, type Meta } from '@storybook/react';
 import React, { useEffect, useState } from 'react';
 
+import { IntentPlugin, SettingsPlugin } from '@dxos/app-framework';
+import { withPluginManager } from '@dxos/app-framework/testing';
+import { log } from '@dxos/log';
+import { TranscriptionPlugin } from '@dxos/plugin-transcription';
 import { withTheme, withLayout } from '@dxos/storybook-utils';
 
 import { Prompt } from './Prompt';
-import { PromptBar } from './PromptBar';
+import { PromptBar, type PromptBarProps } from './PromptBar';
 import type { ReferenceData } from './references';
 import translations from '../../translations';
 
+const references: ReferenceData[] = [
+  {
+    uri: 'dxn:echo:@:AAAAAAAA',
+    label: 'Meeting Notes',
+  },
+  {
+    uri: 'dxn:echo:@:BBBBBBBB',
+    label: 'Project Plan',
+  },
+  {
+    uri: 'dxn:echo:@:CCCCCCCC',
+    label: 'Meeting Plan',
+  },
+];
+
+const DefaultStory = (props: PromptBarProps) => {
+  const [processing, setProcessing] = useState(false);
+  useEffect(() => {
+    let t: NodeJS.Timeout;
+    if (processing) {
+      t = setTimeout(() => setProcessing(false), 10_000);
+    }
+    return () => clearTimeout(t);
+  }, [processing]);
+
+  return (
+    <PromptBar
+      classNames='w-[25rem] p-1 overflow-hidden border border-gray-200 rounded'
+      microphone
+      processing={processing}
+      onSubmit={() => setProcessing(true)}
+      onCancel={() => setProcessing(false)}
+      {...props}
+    />
+  );
+};
+
 const meta: Meta<typeof Prompt> = {
-  title: 'plugins/plugin-automation/Prompt',
+  title: 'plugins/plugin-assistant/Prompt',
   component: Prompt,
-  decorators: [withTheme, withLayout()],
+  render: DefaultStory,
+  decorators: [
+    withPluginManager({
+      plugins: [IntentPlugin(), SettingsPlugin(), TranscriptionPlugin()],
+    }),
+    withTheme,
+    withLayout(),
+  ],
   parameters: {
     layout: 'centered',
     translations,
@@ -26,14 +74,14 @@ const meta: Meta<typeof Prompt> = {
 
 export default meta;
 
-type Story = StoryObj<typeof Prompt>;
+type Story = StoryObj<typeof DefaultStory>;
 
-export const Default: Story = {
+export const Default: Story = {};
+
+export const WithSuggestions: Story = {
   args: {
-    classNames: 'w-96 p-4 rounded outline outline-gray-200',
-    autoFocus: true,
     onSubmit: (text) => {
-      console.log('onEnter', text);
+      log('onSubmit', { text });
     },
     onSuggest: (text) => {
       const trimmed = text.trim().toLowerCase();
@@ -54,60 +102,19 @@ export const Default: Story = {
   },
 };
 
-export const Toolbar: Story = {
-  render: (args) => {
-    const [processing, setProcessing] = useState(false);
-    useEffect(() => {
-      let t: NodeJS.Timeout;
-      if (processing) {
-        t = setTimeout(() => setProcessing(false), 10_000);
-      }
-      return () => clearTimeout(t);
-    }, [processing]);
-    console.log('processing', processing);
-
-    return (
-      <PromptBar
-        classNames='w-[25rem] p-1 overflow-hidden border border-gray-200 rounded'
-        microphone
-        processing={processing}
-        onSubmit={() => setProcessing(true)}
-        onCancel={() => setProcessing(false)}
-        {...args}
-      />
-    );
-  },
-};
-
-export const Includes: Story = {
+export const WithReferences: Story = {
   args: {
-    classNames: 'w-96 p-4 rounded outline outline-gray-200',
     references: {
       getReferences: async ({ query }) => {
         const res = references.filter((i) => i.label.toLowerCase().startsWith(query.toLowerCase()));
-        console.log('getReferences', { query, res });
+        log('getReferences', { query, res });
         return res;
       },
       resolveReference: async ({ uri }) => {
         const res = references.find((i) => i.uri === uri);
-        console.log('resolveReference', { uri, res });
+        log('resolveReference', { uri, res });
         return res ?? null;
       },
     },
   },
 };
-
-const references: ReferenceData[] = [
-  {
-    uri: 'dxn:echo:@:AAAAAAAA',
-    label: 'Meeting Notes',
-  },
-  {
-    uri: 'dxn:echo:@:BBBBBBBB',
-    label: 'Project Plan',
-  },
-  {
-    uri: 'dxn:echo:@:CCCCCCCC',
-    label: 'Meeting Plan',
-  },
-];