@dxos/plugin-assistant 0.8.3-main.672df60 → 0.8.3-staging.0fa589b

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

@@ -7,10 +7,10 @@ import '@dxos-theme';
 import { type StoryObj, type Meta } from '@storybook/react';
 import React, { useCallback, useEffect, useState } from 'react';
 
-import { type Message } from '@dxos/ai';
+import { Message } from '@dxos/ai';
 import { IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { Type } from '@dxos/echo';
+import { Obj } from '@dxos/echo';
 import { faker } from '@dxos/random';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { withLayout, withSignals, withTheme } from '@dxos/storybook-utils';
@@ -29,12 +29,11 @@ const DefaultStory = ({ messages: _messages, ...props }: ThreadProps) => {
 
   const handleSubmit = useCallback(
     (text: string) => {
-      const request: Message = { id: Type.ObjectId.random(), role: 'user', content: [{ type: 'text', text }] };
-      const response: Message = {
-        id: Type.ObjectId.random(),
+      const request: Message = Obj.make(Message, { role: 'user', content: [{ type: 'text', text }] });
+      const response: Message = Obj.make(Message, {
         role: 'assistant',
         content: [{ type: 'text', disposition: 'cot', pending: true, text: faker.lorem.paragraphs(1) }],
-      };
+      });
       setMessages([...messages, request, response]);
       setProcessing(true);
       setTimeout(() => {
@@ -43,11 +42,10 @@ const DefaultStory = ({ messages: _messages, ...props }: ThreadProps) => {
           ...messages,
           request,
           response,
-          {
-            id: Type.ObjectId.random(),
+          Obj.make(Message, {
             role: 'assistant',
             content: [{ type: 'text', text: faker.lorem.paragraphs(1) }],
-          },
+          }),
         ]);
         setProcessing(false);
       }, 3_000);
@@ -89,8 +87,7 @@ export default meta;
 type Story = StoryObj<ThreadProps>;
 
 const TEST_MESSAGES: Message[] = [
-  {
-    id: Type.ObjectId.random(),
+  Obj.make(Message, {
     role: 'user',
     content: [
       {
@@ -98,9 +95,8 @@ const TEST_MESSAGES: Message[] = [
         text: faker.lorem.sentence(5),
       },
     ],
-  },
-  {
-    id: Type.ObjectId.random(),
+  }),
+  Obj.make(Message, {
     role: 'assistant',
     content: [
       {
@@ -123,9 +119,8 @@ const TEST_MESSAGES: Message[] = [
         input: {},
       },
     ],
-  },
-  {
-    id: Type.ObjectId.random(),
+  }),
+  Obj.make(Message, {
     role: 'user',
     content: [
       {
@@ -134,9 +129,8 @@ const TEST_MESSAGES: Message[] = [
         content: 'This is a tool result.',
       },
     ],
-  },
-  {
-    id: Type.ObjectId.random(),
+  }),
+  Obj.make(Message, {
     role: 'assistant',
     content: [
       {
@@ -146,9 +140,8 @@ const TEST_MESSAGES: Message[] = [
         input: {},
       },
     ],
-  },
-  {
-    id: Type.ObjectId.random(),
+  }),
+  Obj.make(Message, {
     role: 'user',
     content: [
       {
@@ -157,9 +150,8 @@ const TEST_MESSAGES: Message[] = [
         content: 'This is a tool result.',
       },
     ],
-  },
-  {
-    id: Type.ObjectId.random(),
+  }),
+  Obj.make(Message, {
     role: 'assistant',
     content: [
       {
@@ -167,7 +159,7 @@ const TEST_MESSAGES: Message[] = [
         text: faker.lorem.paragraphs(1),
       },
     ],
-  },
+  }),
 ];
 
 export const Default: Story = {

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

@@ -7,7 +7,7 @@ import '@dxos-theme';
 import { type StoryObj, type Meta } from '@storybook/react';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { AIServiceEdgeClient, Message } from '@dxos/ai';
+import { EdgeAiServiceClient, Message } from '@dxos/ai';
 import {
   Capabilities,
   Events,
@@ -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 EdgeAiServiceClient({ 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, {
+      void queue.append([
+        Obj.make(Message, {
           role: 'assistant',
           content: prompts.map(
             (prompt) =>
@@ -130,7 +129,7 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
         await processor.request(message, {
           history: queue.objects,
           onComplete: (messages) => {
-            queue.append(messages);
+            void queue.append(messages);
           },
         });
       });
@@ -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',
       }),
     ],
@@ -275,7 +274,7 @@ const Fallback = ({ error }: { error?: Error }) => {
     <div role='none' className='overflow-auto p-8 attention-surface grid place-items-center'>
       <p
         role='alert'
-        className={mx(descriptionMessage, 'break-words rounded-lg p-8', errorString.length < 256 && 'text-lg')}
+        className={mx(descriptionMessage, 'break-words rounded-md p-8', errorString.length < 256 && 'text-lg')}
       >
         {error ? errorString : 'error'}
       </p>

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',
           }),
         );
@@ -72,7 +71,7 @@ export const ThreadContainer: FC<ThemedClassName<ThreadContainerProps>> = ({
       void processor.request(text, {
         history: messageQueue.objects,
         onComplete: (messages) => {
-          messageQueue.append(messages);
+          void messageQueue.append(messages);
         },
       });
 

package/src/components/Thread/reducer.ts

@@ -27,8 +27,8 @@ export const messageReducer: Reducer<{ messages: Message[]; current?: Message },
             id: [message.id, i].join('_'),
             role: message.role,
             content: [block],
-          };
-          messages.push(current);
+          } as any;
+          messages.push(current as any);
         }
         break;
       }
@@ -40,7 +40,7 @@ export const messageReducer: Reducer<{ messages: Message[]; current?: Message },
           id: [message.id, i].join('_'),
           role: message.role,
           content: [block],
-        });
+        } as any);
         break;
       }
     }

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/events.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Events } from '@dxos/app-framework';
+
+import { ASSISTANT_PLUGIN } from './meta';
+
+export namespace AssistantEvents {
+  export const AiClientReady = Events.createStateEvent(`${ASSISTANT_PLUGIN}/ai-client-ready`);
+}

package/src/hooks/processor.ts

@@ -7,7 +7,7 @@ import { type Signal, batch, computed, signal } from '@preact/signals-core';
 import {
   DEFAULT_EDGE_MODEL,
   type ExecutableTool,
-  type AIServiceClient,
+  type AiServiceClient,
   type GenerateRequest,
   type Message,
   type MessageContentBlock,
@@ -86,7 +86,7 @@ export class ChatProcessor {
   });
 
   constructor(
-    private readonly _ai: AIServiceClient,
+    private readonly _ai: AiServiceClient,
     private _tools?: ExecutableTool[],
     private _artifacts?: ArtifactDefinition[],
     private readonly _extensions?: ToolContextExtensions,
@@ -177,7 +177,7 @@ export class ChatProcessor {
     } catch (err) {
       log.catch(err);
       if (err instanceof Error && err.message.includes('Overloaded')) {
-        this.error.value = new AIServiceOverloadedError('AI service overloaded', { cause: err });
+        this.error.value = new AiServiceOverloadedError('AI service overloaded', { cause: err });
       } else {
         this.error.value = new Error('AI service error', { cause: err });
       }
@@ -233,6 +233,6 @@ export class ChatProcessor {
 }
 
 // TODO(wittjosiah): Move to ai-service-client.
-export class AIServiceOverloadedError extends Error {
+export class AiServiceOverloadedError extends Error {
   code = 'AI_SERVICE_OVERLOADED';
 }

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,7 +2,9 @@
 // Copyright 2023 DXOS.org
 //
 
+export * from './capabilities';
 export * from './components';
+export * from './events';
 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,

package/src/queue-logger.ts

@@ -0,0 +1,125 @@
+//
+// 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 { DXN, Key, Obj } from '@dxos/echo';
+import {
+  InvocationOutcome,
+  InvocationTraceEndEvent,
+  InvocationTraceEventType,
+  InvocationTraceStartEvent,
+  TraceEvent,
+  type InvocationTraceEvent,
+} from '@dxos/functions';
+import { invariant } from '@dxos/invariant';
+import { QueueSubspaceTags } from '@dxos/keys';
+
+export class QueueLogger implements BlueprintLogger {
+  private _space: Space;
+  private _invocationTraceQueue: Queue<InvocationTraceEvent>;
+
+  constructor(private readonly blueprint: Blueprint) {
+    const space = getSpace(blueprint);
+    invariant(space, 'Space not found');
+    this._space = space;
+    let dxn = this._space.properties.invocationTraceQueue?.dxn;
+    if (!dxn) {
+      dxn = DXN.fromQueue(QueueSubspaceTags.TRACE, this._space.id, Key.ObjectId.random());
+      this._space.properties.invocationTraceQueue = Ref.fromDXN(dxn);
+    }
+    this._invocationTraceQueue = this._space.queues.get(dxn);
+  }
+
+  log(event: BlueprintEvent) {
+    switch (event.type) {
+      case 'begin':
+        void this._invocationTraceQueue.append([
+          Obj.make(InvocationTraceStartEvent, {
+            type: InvocationTraceEventType.START,
+            invocationId: event.invocationId,
+            timestampMs: Date.now(),
+            input: {},
+            invocationTraceQueue: Ref.fromDXN(this._getTraceQueueDxn(event.invocationId)),
+            invocationTarget: Ref.make(this.blueprint),
+          }),
+        ]);
+        break;
+      case 'end':
+        void this._invocationTraceQueue.append([
+          Obj.make(InvocationTraceEndEvent, {
+            type: InvocationTraceEventType.END,
+            invocationId: event.invocationId,
+            timestampMs: Date.now(),
+            outcome: InvocationOutcome.SUCCESS,
+          }),
+        ]);
+        break;
+      case 'step-start':
+      case 'step-complete':
+        void this._getTraceEventQueue(event.invocationId).append([
+          Obj.make(TraceEvent, {
+            outcome: event.type,
+            truncated: false,
+            ingestionTimestampMs: Date.now(),
+            logs: [
+              {
+                timestampMs: Date.now(),
+                level: 'info',
+                message: event.type,
+                context: { step: event.step },
+              },
+            ],
+            exceptions: [],
+          }),
+        ]);
+        break;
+      case 'message':
+        void this._getTraceEventQueue(event.invocationId).append([
+          Obj.make(TraceEvent, {
+            outcome: event.type,
+            truncated: false,
+            ingestionTimestampMs: Date.now(),
+            logs: [
+              {
+                timestampMs: Date.now(),
+                level: 'info',
+                message: event.type,
+                context: { message: event.message },
+              },
+            ],
+            exceptions: [],
+          }),
+        ]);
+        break;
+      case 'block':
+        void this._getTraceEventQueue(event.invocationId).append([
+          Obj.make(TraceEvent, {
+            outcome: event.type,
+            truncated: false,
+            ingestionTimestampMs: Date.now(),
+            logs: [
+              {
+                timestampMs: Date.now(),
+                level: 'info',
+                message: event.type,
+                context: { block: event.block },
+              },
+            ],
+            exceptions: [],
+          }),
+        ]);
+        break;
+    }
+  }
+
+  private _getTraceQueueDxn(invocationId: string): DXN {
+    return DXN.fromQueue(QueueSubspaceTags.TRACE, this._space.id, invocationId);
+  }
+
+  private _getTraceEventQueue(invocationId: string): Queue<TraceEvent> {
+    const dxn = this._getTraceQueueDxn(invocationId);
+    return this._space.queues.get(dxn);
+  }
+}