@dxos/plugin-assistant 0.8.4-main.1f223c7 → 0.8.4-main.2244d791bb

package/src/hooks/useContextObjects.ts

@@ -5,54 +5,42 @@
 import { useCallback } from 'react';
 
 import { type AiContextBinder } from '@dxos/assistant';
-import { type DXN, type Obj, Ref } from '@dxos/echo';
-import { log } from '@dxos/log';
-import { type Space } from '@dxos/react-client/echo';
-import { isNonNullable } from '@dxos/util';
+import { type DXN, type Database, type Obj, Ref } from '@dxos/echo';
+
+export type UseContextObjectsProps = {
+  db?: Database.Database;
+  context?: AiContextBinder;
+};
 
 export type UseContextObjects = {
-  objects: Obj.Any[];
+  objects: Obj.Unknown[];
   onUpdateObject: (dxn: DXN, checked: boolean) => Promise<void>;
 };
 
 /**
  * Create reactive map of active object references (by DXN string).
  */
-export const useContextObjects = ({
-  space,
-  context,
-}: {
-  space?: Space;
-  context?: AiContextBinder;
-}): UseContextObjects => {
-  const objects = context?.objects.value.map((ref) => ref.target).filter(isNonNullable) ?? [];
-
+export const useContextObjects = ({ db, context }: UseContextObjectsProps): UseContextObjects => {
   const handleUpdateObject = useCallback<UseContextObjects['onUpdateObject']>(
     async (dxn: DXN, checked: boolean) => {
-      if (!space || !context) {
-        return;
-      }
-
-      // Load the object by DXN/id from the current space.
-      const id = dxn.asEchoDXN();
-      const object = id && (await space.db.getObjectById(id.echoId));
-      if (!object) {
-        log.warn('Object not found', { dxn, id });
+      if (!db || !context) {
         return;
       }
 
+      // Load the object by DXN from the current space.
       const ref = Ref.fromDXN(dxn);
+      await ref.load();
       if (checked) {
         await context.bind({ objects: [ref] });
       } else {
         await context.unbind({ objects: [ref] });
       }
     },
-    [space, context],
+    [db, context],
   );
 
   return {
-    objects,
+    objects: context?.getObjects() ?? [],
     onUpdateObject: handleUpdateObject,
   };
 };

package/src/hooks/useFilteredTypes.ts

@@ -0,0 +1,37 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Option from 'effect/Option';
+import { useEffect, useState } from 'react';
+
+import { type Database, type Type } from '@dxos/echo';
+import { EntityKind, SystemTypeAnnotation, getTypeAnnotation } from '@dxos/echo/internal';
+
+// TODO(burdon): Pass in filter.
+// TODO(wittjosiah): Factor out.
+export const useFilteredTypes = (db?: Database.Database): Type.Entity.Any[] => {
+  const [types, setTypes] = useState<Type.Entity.Any[]>([]);
+  useEffect(() => {
+    if (!db) {
+      return;
+    }
+
+    return db.schemaRegistry.query({ location: ['database', 'runtime'] }).subscribe(
+      (query) => {
+        const types = Array.from(
+          new Set(
+            query.results
+              .filter((schema) => getTypeAnnotation(schema)?.kind !== EntityKind.Relation)
+              .filter((schema) => SystemTypeAnnotation.get(schema).pipe(Option.getOrElse(() => false))),
+          ),
+        );
+
+        setTypes(types);
+      },
+      { fire: true },
+    );
+  }, [db]);
+
+  return types;
+};

package/src/hooks/useReferencesProvider.ts

@@ -4,7 +4,6 @@
 
 import { useMemo } from 'react';
 
-import { Capabilities, useCapabilities } from '@dxos/app-framework';
 import { type Space } from '@dxos/client/echo';
 import { Filter, Obj } from '@dxos/echo';
 import { type ReferencesProvider } from '@dxos/react-ui-chat';
@@ -13,8 +12,6 @@ import { type ReferencesProvider } from '@dxos/react-ui-chat';
  * Resolve references to objects in the space.
  */
 export const useReferencesProvider = (space?: Space): ReferencesProvider | undefined => {
-  const blueprints = useCapabilities(Capabilities.BlueprintDefinition);
-
   return useMemo<ReferencesProvider | undefined>((): ReferencesProvider | undefined => {
     if (!space) {
       return undefined;
@@ -24,11 +21,11 @@ export const useReferencesProvider = (space?: Space): ReferencesProvider | undef
       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
+        // 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();
+        const objects = await space.db.query(Filter.everything()).run();
 
         return (
           objects
@@ -39,7 +36,7 @@ export const useReferencesProvider = (space?: Space): ReferencesProvider | undef
             // })
             .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) => !!Obj.getDXN(object as Obj.Any))
+            .filter((object) => !!Obj.getDXN(object as Obj.Unknown))
             .map((object) => ({
               uri: Obj.getDXN(object as any).toString(),
               label: Obj.getLabel(object as any) ?? '',
@@ -47,11 +44,11 @@ export const useReferencesProvider = (space?: Space): ReferencesProvider | undef
         );
       },
       resolveReference: async ({ uri }) => {
-        const object = await space.db.query(Filter.ids(uri)).first();
+        const object = await space.db.query(Filter.id(uri)).first();
         return { uri, label: Obj.getLabel(object) ?? '' };
       },
     } satisfies ReferencesProvider;
-  }, [space, blueprints]);
+  }, [space]);
 };
 
 const stringMatch = (query: string, label: string) => label.toLowerCase().startsWith(query.toLowerCase());

package/src/index.ts

@@ -2,10 +2,12 @@
 // Copyright 2023 DXOS.org
 //
 
+export * from './blueprints';
 export * from './capabilities';
 export * from './components';
-export * from './events';
+export * from './hooks';
 export * from './meta';
+export * from './translations';
 export * from './types';
 
 export * from './AssistantPlugin';

package/src/meta.ts

@@ -2,17 +2,20 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type PluginMeta } from '@dxos/app-framework';
+import { type Plugin } from '@dxos/app-framework';
+import { trim } from '@dxos/util';
 
-export const ASSISTANT_PLUGIN = 'dxos.org/plugin/assistant';
-
-export const ASSISTANT_DIALOG = `${ASSISTANT_PLUGIN}/assistant/dialog`;
-
-export const meta: PluginMeta = {
-  id: ASSISTANT_PLUGIN,
+export const meta: Plugin.Meta = {
+  id: 'dxos.org/plugin/assistant',
   name: 'Assistant',
-  description: 'The Assistant plugin allows you to chat with your spaces inside of Composer.',
+  description: trim`
+    Intelligent AI assistant that can analyze and interact with objects across your spaces.
+    Chat naturally to get insights, search content, and perform actions using AI-powered context awareness.
+  `,
   icon: 'ph--atom--regular',
+  iconHue: 'sky',
   source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-assistant',
   tags: ['labs'],
 };
+
+export const ASSISTANT_DIALOG = `${meta.id}/assistant/dialog`;

package/src/processor/index.ts

@@ -4,3 +4,4 @@
 
 export * from './presets';
 export * from './processor';
+export * from './update-name';

package/src/processor/presets.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
 import { type ModelName } from '@dxos/ai';
 
@@ -43,7 +43,7 @@ export const AiServicePresets: AiServicePreset[] = [
   },
   {
     provider: 'lm-studio' as const,
-    model: '@mlx-community/llama-3.2-3b-instruct' as const,
+    model: '@meta/llama-3.2-3b-instruct' as const,
   },
   {
     model: 'deepseek-r1:latest' as const,

package/src/processor/processor.test.ts

@@ -2,37 +2,31 @@
 // Copyright 2025 DXOS.org
 //
 
-import { AiTool, AiToolkit } from '@effect/ai';
+import * as Tool from '@effect/ai/Tool';
+import * as Toolkit from '@effect/ai/Toolkit';
 import { describe, it } from '@effect/vitest';
-import { Effect, Layer, Schema } from 'effect';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+import * as Schema from 'effect/Schema';
 
 import { AiService } from '@dxos/ai';
 import { AiServiceTestingPreset } from '@dxos/ai/testing';
-import { AiConversation, makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
-import { TestHelpers } from '@dxos/effect';
-import {
-  ComputeEventLogger,
-  CredentialsService,
-  LocalFunctionExecutionService,
-  QueueService,
-  RemoteFunctionExecutionService,
-  TracingService,
-} from '@dxos/functions';
-import { TestDatabaseLayer } from '@dxos/functions/testing';
-import { type DataType } from '@dxos/schema';
+import { AiConversation, GenericToolkit, ToolExecutionServices } from '@dxos/assistant';
+import { acquireReleaseResource } from '@dxos/effect';
+import { TestHelpers } from '@dxos/effect/testing';
+import { CredentialsService, QueueService, TracingService } from '@dxos/functions';
+import { FunctionInvocationServiceLayerTestMocked, TestDatabaseLayer } from '@dxos/functions-runtime/testing';
+import { type Message } from '@dxos/types';
 
 import { AiChatProcessor, type AiChatServices } from './processor';
 
-class TestToolkit extends AiToolkit.make(
-  AiTool.make('random', {
+const TestToolkit = Toolkit.make(
+  Tool.make('random', {
     description: 'Random number generator',
     parameters: {},
     success: Schema.Number,
   }),
-) {}
-
-// TODO(burdon): Create minimal toolkit.
-const toolkit = AiToolkit.merge(TestToolkit) as AiToolkit.Any as AiToolkit.AiToolkit<AiTool.Any>;
+);
 
 // TODO(burdon): Explain structure.
 const TestServicesLayer = Layer.mergeAll(
@@ -43,27 +37,28 @@ const TestServicesLayer = Layer.mergeAll(
     // types: [],
   }),
   // CredentialsService.configuredLayer([{ service: 'exa.ai', apiKey: EXA_API_KEY }]),
-  LocalFunctionExecutionService.layer,
-  RemoteFunctionExecutionService.mockLayer,
+  FunctionInvocationServiceLayerTestMocked({ functions: [] }).pipe(Layer.provideMerge(TracingService.layerNoop)),
 );
 
 const TestLayer: Layer.Layer<AiChatServices, never, never> = Layer.mergeAll(
   AiService.model('@anthropic/claude-opus-4-0'),
-  makeToolResolverFromFunctions([], toolkit),
-  makeToolExecutionServiceFromFunctions([], toolkit, toolkit.toLayer({}) as any),
+  ToolExecutionServices,
   CredentialsService.layerFromDatabase(),
-  ComputeEventLogger.layerFromTracing,
-).pipe(Layer.provideMerge(TestServicesLayer), Layer.orDie);
+).pipe(
+  Layer.provideMerge(GenericToolkit.providerLayer(GenericToolkit.make(TestToolkit, TestToolkit.toLayer({} as any)))),
+  Layer.provideMerge(TestServicesLayer),
+  Layer.orDie,
+);
 
 // TODO(burdon): Create actual test with mock LLM.
 describe('Chat processor', () => {
-  it.effect(
+  it.scoped(
     'basic',
     Effect.fn(
       function* ({ expect }) {
         const services = yield* Effect.runtime<AiChatServices>();
-        const queue = yield* QueueService.createQueue<DataType.Message>();
-        const conversation = new AiConversation({ queue });
+        const queue = yield* QueueService.createQueue<Message.Message>();
+        const conversation = yield* acquireReleaseResource(() => new AiConversation({ queue }));
         const processor = new AiChatProcessor(conversation, async () => services);
         const result = yield* Effect.promise(() => processor.request({ message: 'Hello' }));
         void processor.cancel();

package/src/processor/processor.ts

@@ -2,8 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Registry, Rx } from '@effect-rx/rx-react';
-import { Cause, Effect, Exit, Fiber, Option, Runtime } from 'effect';
+import type * as Tool from '@effect/ai/Tool';
+import { Atom, Registry } from '@effect-atom/atom-react';
+import * as Cause from 'effect/Cause';
+import * as Effect from 'effect/Effect';
+import * as Exit from 'effect/Exit';
+import * as Fiber from 'effect/Fiber';
+import * as Option from 'effect/Option';
+import * as Runtime from 'effect/Runtime';
 
 import {
   AiService,
@@ -14,34 +20,35 @@ import {
   type ToolResolverService,
 } from '@dxos/ai';
 import {
+  AiContextService,
   type AiConversation,
-  type AiConversationRunParams,
-  AiSession,
+  type AiConversationRunProps,
   ArtifactDiffResolver,
   GenerationObserver,
   createSystemPrompt,
 } from '@dxos/assistant';
+import { formatSystemPrompt } from '@dxos/assistant';
+import { type Chat } from '@dxos/assistant-toolkit';
 import { type Blueprint } from '@dxos/blueprints';
 import { Obj } from '@dxos/echo';
-import { throwCause } from '@dxos/effect';
+import { type Database } from '@dxos/echo';
+import { runAndForwardErrors, throwCause, unwrapExit } from '@dxos/effect';
 import {
   type CredentialsService,
-  type DatabaseService,
+  type FunctionInvocationService,
   type QueueService,
-  type RemoteFunctionExecutionService,
   type TracingService,
 } from '@dxos/functions';
 import { log } from '@dxos/log';
-import { type ContentBlock, DataType } from '@dxos/schema';
-import { trim } from '@dxos/util';
+import { type ContentBlock, Message } from '@dxos/types';
 
-import { type Assistant } from '../types';
+import { updateName } from './update-name';
 
 export type AiChatServices =
   | CredentialsService
-  | DatabaseService
+  | Database.Service
   | QueueService
-  | RemoteFunctionExecutionService
+  | FunctionInvocationService
   | AiService.AiService
   | ToolExecutionService
   | ToolResolverService
@@ -53,7 +60,7 @@ export type AiChatProcessorOptions = {
   blueprintRegistry?: Blueprint.Registry;
   observableRegistry?: Registry.Registry;
   extensions?: ToolContextExtensions;
-} & Pick<AiConversationRunParams, 'system'>;
+} & Pick<AiConversationRunProps, 'system'>;
 
 const defaultOptions: Partial<AiChatProcessorOptions> = {
   model: DEFAULT_EDGE_MODEL,
@@ -72,39 +79,34 @@ export type AiRequest = {
  * Handles streaming responses from the conversation.
  */
 export class AiChatProcessor {
-  private readonly _rx: Registry.Registry;
+  private readonly _registry: Registry.Registry;
 
   /** External observer. */
   private readonly _observer: GenerationObserver;
 
+  /** Pending messages (incl. the current user request). */
+  private readonly _pending = Atom.make<Message.Message[]>([]);
+
+  /** Currently streaming message (from the AI service). */
+  private readonly _streaming = Atom.make<Message.Message[]>([]);
+
   /** Currently active request fiber. */
   private _fiber: Fiber.Fiber<void, any> | undefined;
 
   /** Last request (for retries). */
   private _lastRequest: AiRequest | undefined;
 
-  /** Pending messages (incl. the current user request). */
-  private readonly _pending = Rx.make<DataType.Message[]>([]);
-
-  /** Currently streaming message (from the AI service). */
-  private readonly _streaming = Rx.make<Option.Option<DataType.Message>>(Option.none());
-
   /** Streaming state. */
-  public readonly streaming = Rx.make<boolean>((get) => Option.isSome(get(this._streaming)));
+  public readonly streaming = Atom.make<boolean>((get) => get(this._streaming).length > 0);
 
   /** Active state. */
-  public readonly active = Rx.make(false);
+  public readonly active = Atom.make(false);
 
   /** Array of Messages (incl. the current message being streamed). */
-  public readonly messages = Rx.make<DataType.Message[]>((get) =>
-    Option.match(get(this._streaming), {
-      onNone: () => get(this._pending),
-      onSome: (streaming) => [...get(this._pending), streaming],
-    }),
-  );
+  public readonly messages = Atom.make<Message.Message[]>((get) => [...get(this._pending), ...get(this._streaming)]);
 
   /** Last error. */
-  public readonly error = Rx.make<Option.Option<Error>>(Option.none());
+  public readonly error = Atom.make<Option.Option<Error>>(Option.none());
 
   constructor(
     private readonly _conversation: AiConversation,
@@ -113,7 +115,7 @@ export class AiChatProcessor {
     private readonly _options: AiChatProcessorOptions = defaultOptions,
   ) {
     // Initialize registries and defaults before using in other logic.
-    this._rx = this._options.observableRegistry ?? Registry.make();
+    this._registry = this._options.observableRegistry ?? Registry.make();
     this._observer = GenerationObserver.make({
       onBlock: this._onBlock,
       onMessage: this._onMessage,
@@ -136,41 +138,59 @@ export class AiChatProcessor {
     return this._options.blueprintRegistry;
   }
 
+  get system(): string {
+    return this._options.system ?? '';
+  }
+
+  async getTools(): Promise<Record<string, Tool.Any>> {
+    return unwrapExit(await this._conversation.getTools().pipe(await Runtime.runPromiseExit(await this._services())));
+  }
+
+  async getSystemPrompt(): Promise<string> {
+    return unwrapExit(
+      await Effect.gen(this, function* () {
+        const blueprints = this.context.getBlueprints();
+        const objects = this.context.getObjects();
+        const system = yield* formatSystemPrompt({ system: this._options.system, blueprints, objects });
+        return system;
+      }).pipe(
+        Effect.provideService(AiContextService, {
+          binder: this.context,
+        }),
+        await Runtime.runPromiseExit(await this._services()),
+      ),
+    );
+  }
+
   /**
    * Initiates a new request.
    */
-  async request(requestParam: AiRequest): Promise<void> {
+  async request(requestProp: AiRequest): Promise<void> {
     if (this._fiber) {
       await this.cancel();
     }
 
     try {
-      this._lastRequest = requestParam;
-      this._rx.set(this.error, Option.none());
-      this._rx.set(this.active, true);
+      this._lastRequest = requestProp;
+      this._registry.set(this.error, Option.none());
+      this._registry.set(this.active, true);
+
+      const services = await this._services();
 
       // Create request.
       const request = this._conversation.createRequest({
         system: this._options.system,
-        prompt: requestParam.message,
+        prompt: requestProp.message,
         observer: this._observer,
       });
 
-      const runtime = await this._services();
-
       // Create fiber.
       this._fiber = request.pipe(
         Effect.provide(AiService.model(this._options.model ?? DEFAULT_EDGE_MODEL)),
-
         // TODO(dmaretskyi): Move ArtifactDiffResolver upstream.
         Effect.provideService(ArtifactDiffResolver, this._artifactDiffResolver),
-
         Effect.asVoid,
-        Effect.tapErrorCause((cause) => {
-          log.error('request failed', { cause });
-          return Effect.void;
-        }),
-        Runtime.runFork(runtime), // Runs in the background.
+        Runtime.runFork(services), // Runs in the background.
       );
 
       // Execute request.
@@ -179,15 +199,15 @@ export class AiChatProcessor {
         throwCause(response.cause);
       }
 
-      this._rx.set(this.error, Option.none());
+      this._registry.set(this.error, Option.none());
       this._lastRequest = undefined;
       this._fiber = undefined;
     } catch (err) {
-      log.error('request failed', { err });
-      this._rx.set(this.error, Option.some(new Error('AI service error', { cause: err })));
+      log.error('request failed', { error: err });
+      this._registry.set(this.error, Option.some(new Error('AI service error', { cause: err })));
     } finally {
+      this._registry.set(this.active, false);
       this._fiber = undefined;
-      this._rx.set(this.active, false);
     }
   }
 
@@ -195,7 +215,7 @@ export class AiChatProcessor {
    * Cancels the current request.
    */
   async cancel(): Promise<void> {
-    await Effect.runPromise(
+    await runAndForwardErrors(
       Effect.gen(this, function* () {
         if (this._fiber) {
           yield* this._fiber.pipe(Fiber.interrupt);
@@ -204,7 +224,7 @@ export class AiChatProcessor {
     );
 
     this._fiber = undefined;
-    this._rx.set(this.active, false);
+    this._registry.set(this.active, false);
   }
 
   /**
@@ -219,35 +239,9 @@ export class AiChatProcessor {
   /**
    * Update the current chat's name.
    */
-  async updateName(chat: Assistant.Chat): Promise<void> {
+  async updateName(chat: Chat.Chat): Promise<void> {
     const runtime = await this._services();
-
-    const system = trim`
-      It is extremely important that you respond only with the title and nothing else.
-      If you cannot do this effectively respond with "New Chat".
-    `;
-
-    const history = await this._conversation.getHistory();
-    const fiber = Effect.gen(this, function* () {
-      const session = new AiSession();
-      return yield* session.run({ system, prompt: 'Suggest a name for this chat', history });
-    }).pipe(
-      // TODO(burdon): Use simpler model.
-      Effect.provide(AiService.model(this._options.model ?? DEFAULT_EDGE_MODEL)),
-      Effect.tap((messages) => {
-        const message = messages.find((message) => message.sender.role === 'assistant');
-        const title = message?.blocks.find((b) => b._tag === 'text')?.text;
-        if (title) {
-          chat.name = title;
-        }
-      }),
-      Runtime.runFork(runtime), // Run in the background.
-    );
-
-    const response = await fiber.pipe(Fiber.join, Effect.runPromiseExit);
-    if (!Exit.isSuccess(response)) {
-      throwCause(response.cause);
-    }
+    await updateName(runtime, this._conversation, chat, this._options.model);
   }
 
   // TODO(burdon): Fix/factor out.
@@ -258,7 +252,7 @@ export class AiChatProcessor {
       //   artifacts.map(async (artifact) => {
       //     const {
       //       objects: [object],
-      //     } = await space.db.query(Filter.ids(artifact.id)).run();
+      //     } = await space.db.query(Filter.id(artifact.id)).run();
       //     if (!object) {
       //       return;
       //     }
@@ -274,29 +268,29 @@ export class AiChatProcessor {
     },
   };
 
-  private _onMessage = Effect.fn(
-    function* (this: AiChatProcessor, message: DataType.Message) {
-      this._rx.set(this._streaming, Option.none());
-      this._rx.update(this._pending, (pending) => [...pending, message]);
-    }.bind(this),
-  );
-
+  // TODO(dmaretskyi): Due to the way effect streams do buffering, we cannot rely on _onBlock and _onMessage to be called in order.
   private _onBlock = Effect.fn(
     function* (this: AiChatProcessor, block: ContentBlock.Any) {
-      this._rx.update(this._streaming, (streaming) => {
-        const blocks = streaming.pipe(
-          Option.map((streaming) => streaming.blocks.filter((b) => !b.pending)),
-          Option.getOrElse(() => []),
-        );
-
-        return Option.some(
-          Obj.make(DataType.Message, {
+      this._registry.update(this._streaming, (streaming) => {
+        const blocks = streaming.filter((message) => message.blocks.every((block) => !block.pending));
+
+        // AiSession emits a message per each assistant content-block, so we do the same.
+        return [
+          ...blocks,
+          Obj.make(Message.Message, {
             created: new Date().toISOString(),
             sender: { role: 'assistant' },
-            blocks: [...blocks, block],
+            blocks: [block],
           }),
-        );
+        ];
       });
     }.bind(this),
   );
+
+  private _onMessage = Effect.fn(
+    function* (this: AiChatProcessor, message: Message.Message) {
+      this._registry.set(this._streaming, []);
+      this._registry.update(this._pending, (pending) => [...pending, message]);
+    }.bind(this),
+  );
 }