@dxos/plugin-assistant 0.8.4-main.3c1ae3b → 0.8.4-main.3eb6e50203

package/src/hooks/useBlueprintRegistry.ts

@@ -2,36 +2,34 @@
 // Copyright 2025 DXOS.org
 //
 
-import { useSignalEffect } from '@preact/signals-react';
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { Capabilities } from '@dxos/app-framework';
-import { useCapabilities } from '@dxos/app-framework/react';
+import { useCapabilities } from '@dxos/app-framework/ui';
+import { AppCapabilities } from '@dxos/app-toolkit';
 import { type AiContextBinder } from '@dxos/assistant';
 import { Blueprint } from '@dxos/blueprints';
-import { type Space } from '@dxos/client/echo';
-import { Filter, Obj, Ref } from '@dxos/echo';
+import { type Database, Filter, Obj, Ref } from '@dxos/echo';
 import { useQuery } from '@dxos/react-client/echo';
-import { distinctBy, isNonNullable } from '@dxos/util';
+import { distinctBy } from '@dxos/util';
 
 /**
  * Provide a registry of blueprints from plugins.
  */
 // TODO(burdon): Reconcile with eventual public registry.
 export const useBlueprintRegistry = () => {
-  const blueprints = useCapabilities(Capabilities.BlueprintDefinition);
+  const blueprints = useCapabilities(AppCapabilities.BlueprintDefinition);
   return useMemo(() => new Blueprint.Registry(blueprints), [blueprints]);
 };
 
 export const useBlueprints = ({
   blueprintRegistry,
-  space,
+  db,
 }: {
   blueprintRegistry?: Blueprint.Registry;
-  space?: Space;
+  db?: Database.Database;
 }) => {
   const staticBlueprints = useMemo(() => blueprintRegistry?.query() ?? [], [blueprintRegistry]);
-  const spaceBlueprints = useQuery(space, Filter.type(Blueprint.Blueprint));
+  const spaceBlueprints = useQuery(db, Filter.type(Blueprint.Blueprint));
   return useMemo(() => {
     const blueprints = distinctBy([...staticBlueprints, ...spaceBlueprints], (b) => b.key);
     blueprints.sort(({ name: a }, { name: b }) => a.localeCompare(b));
@@ -45,22 +43,34 @@ export const useBlueprints = ({
 export const useActiveBlueprints = ({ context }: { context?: AiContextBinder }) => {
   const [active, setActive] = useState<Map<string, Blueprint.Blueprint>>(new Map());
 
-  useSignalEffect(() => {
-    const refs = [...(context?.blueprints.value ?? [])];
-    const blueprints = refs.map((ref) => ref.target).filter(isNonNullable);
-    setActive(new Map(blueprints.map((blueprint) => [blueprint.key, blueprint])));
-  });
+  useEffect(() => {
+    if (!context) {
+      setActive(new Map());
+      return;
+    }
+
+    const updateActive = () => {
+      const blueprints = context.getBlueprints();
+      setActive(new Map(blueprints.map((blueprint) => [blueprint.key, blueprint])));
+    };
+
+    // Set initial value.
+    updateActive();
+
+    // Subscribe to changes.
+    return context.subscribeBlueprints(updateActive);
+  }, [context]);
 
   return active;
 };
 
 // TODO(burdon): Move logic into binder.
 export const useBlueprintHandlers = ({
-  space,
+  db,
   context,
   blueprintRegistry,
 }: {
-  space: Space;
+  db: Database.Database;
   context?: AiContextBinder;
   blueprintRegistry?: Blueprint.Registry;
 }) => {
@@ -71,7 +81,7 @@ export const useBlueprintHandlers = ({
       }
 
       // Find existing cloned blueprint.
-      const objects = await space.db.query(Filter.type(Blueprint.Blueprint)).run();
+      const objects = await db.query(Filter.type(Blueprint.Blueprint)).run();
       let storedBlueprint = objects.find((blueprint) => blueprint.key === key);
       if (checked) {
         if (!storedBlueprint) {
@@ -81,14 +91,14 @@ export const useBlueprintHandlers = ({
           }
 
           // NOTE: Possible race condition with other peers.
-          storedBlueprint = space.db.add(Obj.clone(blueprint));
+          storedBlueprint = db.add(Obj.clone(blueprint));
         }
         await context.bind({ blueprints: [Ref.make(storedBlueprint)] });
       } else if (storedBlueprint) {
         await context.unbind({ blueprints: [Ref.make(storedBlueprint)] });
       }
     },
-    [space, context, blueprintRegistry],
+    [db, context, blueprintRegistry],
   );
 
   return { onUpdateBlueprint };

package/src/hooks/useChatProcessor.ts

@@ -2,11 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import { RegistryContext } from '@effect-atom/atom-react';
+import { type Registry, RegistryContext } from '@effect-atom/atom-react';
 import type * as Runtime from 'effect/Runtime';
 import { useContext, useMemo, useState } from 'react';
 
 import { AiConversation } from '@dxos/assistant';
+import { type Chat } from '@dxos/assistant-toolkit';
 import { type Blueprint } from '@dxos/blueprints';
 import { log } from '@dxos/log';
 import { type Queue, type Space } from '@dxos/react-client/echo';
@@ -17,7 +18,7 @@ import { type Assistant } from '../types';
 
 export type UseChatProcessorProps = {
   space?: Space;
-  chat?: Assistant.Chat;
+  chat?: Chat.Chat;
   preset?: AiServicePreset;
   services?: () => Promise<Runtime.Runtime<AiChatServices>>;
   blueprintRegistry?: Blueprint.Registry;
@@ -47,7 +48,10 @@ export const useChatProcessor = ({
     // NOTE: Passing in space and getting queue from space rather than resolving the reference.
     //  This is because if the chat isn't in a space yet, the reference will not be resolvable.
     const queue = space.queues.get(chat.queue.dxn);
-    const conversation = new AiConversation(queue as Queue<any>);
+    const conversation = new AiConversation({
+      queue: queue as Queue<any>,
+      registry: observableRegistry as Registry.Registry,
+    });
     await conversation.open();
     setConversation(conversation);
     return () => {

package/src/hooks/useChatServices.ts

@@ -6,19 +6,19 @@ import * as Effect from 'effect/Effect';
 import type * as Runtime from 'effect/Runtime';
 import { useMemo } from 'react';
 
-import { useCapability } from '@dxos/app-framework/react';
-import { type Space } from '@dxos/client/echo';
+import { useCapability } from '@dxos/app-framework/ui';
+import { type Chat } from '@dxos/assistant-toolkit';
+import { type Key } from '@dxos/echo';
 import { TracingService } from '@dxos/functions';
 import { TracingServiceExt } from '@dxos/functions-runtime';
 import { AutomationCapabilities } from '@dxos/plugin-automation';
 import { useClient } from '@dxos/react-client';
 
 import { type AiChatServices } from '../processor';
-import { type Assistant } from '../types';
 
 export type UseChatServicesProps = {
-  space?: Space;
-  chat?: Assistant.Chat;
+  id?: Key.SpaceId;
+  chat?: Chat.Chat;
 };
 
 /**
@@ -26,26 +26,22 @@ export type UseChatServicesProps = {
  */
 // TODO(dmaretskyi): Better return type.
 export const useChatServices = ({
-  space,
+  id,
   chat,
 }: UseChatServicesProps): (() => Promise<Runtime.Runtime<AiChatServices>>) | undefined => {
   const client = useClient();
-  space ??= client.spaces.default;
+  id ??= client.spaces.default.id;
 
   const runtimeResolver = useCapability(AutomationCapabilities.ComputeRuntime);
   return useMemo(() => {
-    const runtime = runtimeResolver.getRuntime(space.id);
+    const runtime = runtimeResolver.getRuntime(id);
     return () =>
       runtime.runPromise(
-        Effect.gen(function* () {
-          return yield* Effect.runtime<AiChatServices>().pipe(
-            Effect.provide(
-              chat?.traceQueue?.target
-                ? TracingServiceExt.layerQueue(chat.traceQueue?.target)
-                : TracingService.layerNoop,
-            ),
-          );
-        }),
+        Effect.runtime<AiChatServices>().pipe(
+          Effect.provide(
+            chat?.traceQueue?.target ? TracingServiceExt.layerQueue(chat.traceQueue?.target) : TracingService.layerNoop,
+          ),
+        ),
       );
-  }, [space, chat?.traceQueue?.target]);
+  }, [id, chat?.traceQueue?.target]);
 };

package/src/hooks/useChatToolbarActions.ts

@@ -6,31 +6,32 @@ import { Atom } from '@effect-atom/atom-react';
 import * as Effect from 'effect/Effect';
 import { useMemo } from 'react';
 
-import { createIntent } from '@dxos/app-framework';
-import { useIntentDispatcher } from '@dxos/app-framework/react';
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { Chat } from '@dxos/assistant-toolkit';
 import { Filter, Obj, Query } from '@dxos/echo';
+import { runAndForwardErrors } from '@dxos/effect';
 import { invariant } from '@dxos/invariant';
 import { useQuery } from '@dxos/react-client/echo';
 import { MenuBuilder, useMenuActions } from '@dxos/react-ui-menu';
 
 import { useChatContext } from '../components';
 import { meta } from '../meta';
-import { Assistant, AssistantAction } from '../types';
+import { AssistantOperation } from '../types';
 
 export type ChatToolbarActionsProps = {
-  chat?: Assistant.Chat;
-  companionTo?: Obj.Any;
+  chat?: Chat.Chat;
+  companionTo?: Obj.Unknown;
 };
 
 export const useChatToolbarActions = ({ chat, companionTo }: ChatToolbarActionsProps) => {
-  const { dispatch } = useIntentDispatcher();
-  const { space } = useChatContext('useChatToolbarActions');
+  const { invoke } = useOperationInvoker();
+  const { db } = useChatContext('useChatToolbarActions');
   const query = companionTo
-    ? Query.select(Filter.id(companionTo.id)).targetOf(Assistant.CompanionTo).source()
+    ? Query.select(Filter.id(companionTo.id)).targetOf(Chat.CompanionTo).source()
     : Query.select(Filter.nothing());
 
   // TODO(wittjosiah): Query in react vs query in atom?
-  const chats = useQuery(space, query);
+  const chats = useQuery(db, query);
 
   // Create stable reference for dependency array to avoid circular reference issues.
   return useMenuActions(
@@ -46,14 +47,15 @@ export const useChatToolbarActions = ({ chat, companionTo }: ChatToolbarActionsP
               label: ['new thread button', { ns: meta.id }],
               icon: 'ph--plus--regular',
               type: 'new',
+              disabled: !companionTo,
+            },
+            () => {
+              invariant(companionTo);
+              return invoke(AssistantOperation.SetCurrentChat, {
+                companionTo,
+                chat: undefined,
+              }).pipe(runAndForwardErrors);
             },
-            () =>
-              dispatch(
-                createIntent(AssistantAction.SetCurrentChat, {
-                  companionTo,
-                  chat: undefined,
-                }),
-              ).pipe(Effect.runPromise),
           )
           .action(
             'rename',
@@ -66,8 +68,8 @@ export const useChatToolbarActions = ({ chat, companionTo }: ChatToolbarActionsP
             () =>
               Effect.gen(function* () {
                 invariant(chat);
-                yield* dispatch(createIntent(AssistantAction.UpdateChatName, { chat }));
-              }).pipe(Effect.runPromise),
+                yield* invoke(AssistantOperation.UpdateChatName, { chat });
+              }).pipe(runAndForwardErrors),
           )
           .action(
             'branch',
@@ -97,18 +99,16 @@ export const useChatToolbarActions = ({ chat, companionTo }: ChatToolbarActionsP
                   builder.action(
                     chat.id,
                     {
-                      label: Obj.getLabel(chat) ?? ['object name placeholder', { ns: Assistant.Chat.typename }],
+                      label: Obj.getLabel(chat) ?? ['object name placeholder', { ns: Chat.Chat.typename }],
                     },
                     () =>
                       Effect.gen(function* () {
                         invariant(companionTo);
-                        yield* dispatch(
-                          createIntent(AssistantAction.SetCurrentChat, {
-                            companionTo,
-                            chat,
-                          }),
-                        );
-                      }).pipe(Effect.runPromise),
+                        yield* invoke(AssistantOperation.SetCurrentChat, {
+                          companionTo,
+                          chat,
+                        });
+                      }).pipe(runAndForwardErrors),
                   );
                 });
             },
@@ -117,6 +117,6 @@ export const useChatToolbarActions = ({ chat, companionTo }: ChatToolbarActionsP
 
         return builder.build();
       });
-    }, [chats.length, space?.id, companionTo?.id, chat?.id, dispatch]),
+    }, [chats.length, db?.spaceId, companionTo?.id, chat?.id, invoke]),
   );
 };

package/src/hooks/useContextBinder.ts

@@ -2,7 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import { useState } from 'react';
+import { type Registry, RegistryContext } from '@effect-atom/atom-react';
+import { useContext, useState } from 'react';
 
 import { AiContextBinder } from '@dxos/assistant';
 import { type Queue } from '@dxos/react-client/echo';
@@ -10,6 +11,7 @@ import { useAsyncEffect } from '@dxos/react-ui';
 
 // NOTE: This takes a queue rather than a chat because the chat may not be in a space yet.
 export const useContextBinder = (queue: Queue | undefined): AiContextBinder | undefined => {
+  const registry = useContext(RegistryContext) as Registry.Registry;
   const [binder, setBinder] = useState<AiContextBinder>();
 
   useAsyncEffect(async () => {
@@ -17,7 +19,7 @@ export const useContextBinder = (queue: Queue | undefined): AiContextBinder | un
       return;
     }
 
-    const binder = new AiContextBinder(queue);
+    const binder = new AiContextBinder({ queue, registry });
     await binder.open();
     setBinder(binder);
 

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 && 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

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

package/src/hooks/useReferencesProvider.ts

@@ -4,8 +4,8 @@
 
 import { useMemo } from 'react';
 
-import { Capabilities } from '@dxos/app-framework';
-import { useCapabilities } from '@dxos/app-framework/react';
+import { useCapabilities } from '@dxos/app-framework/ui';
+import { AppCapabilities } from '@dxos/app-toolkit';
 import { type Space } from '@dxos/client/echo';
 import { Filter, Obj } from '@dxos/echo';
 import { type ReferencesProvider } from '@dxos/react-ui-chat';
@@ -14,7 +14,7 @@ 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);
+  const blueprints = useCapabilities(AppCapabilities.BlueprintDefinition);
 
   return useMemo<ReferencesProvider | undefined>((): ReferencesProvider | undefined => {
     if (!space) {
@@ -40,7 +40,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) ?? '',

package/src/index.ts

@@ -4,7 +4,6 @@
 
 export * from './capabilities';
 export * from './components';
-export * from './events';
 export * from './hooks';
 export * from './meta';
 export * from './translations';

package/src/meta.ts

@@ -2,10 +2,10 @@
 // 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 meta: PluginMeta = {
+export const meta: Plugin.Meta = {
   id: 'dxos.org/plugin/assistant',
   name: 'Assistant',
   description: trim`

package/src/processor/processor.test.ts

@@ -11,7 +11,7 @@ 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 { AiConversation, GenericToolkit, ToolExecutionServices } from '@dxos/assistant';
 import { acquireReleaseResource } from '@dxos/effect';
 import { TestHelpers } from '@dxos/effect/testing';
 import { CredentialsService, QueueService, TracingService } from '@dxos/functions';
@@ -28,9 +28,6 @@ const TestToolkit = Toolkit.make(
   }),
 );
 
-// TODO(burdon): Create minimal toolkit.
-const toolkit = Toolkit.merge(TestToolkit) as Toolkit.Toolkit<any>;
-
 // TODO(burdon): Explain structure.
 const TestServicesLayer = Layer.mergeAll(
   TracingService.layerNoop,
@@ -45,10 +42,13 @@ const TestServicesLayer = Layer.mergeAll(
 
 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(),
-).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', () => {
@@ -58,7 +58,7 @@ describe('Chat processor', () => {
       function* ({ expect }) {
         const services = yield* Effect.runtime<AiChatServices>();
         const queue = yield* QueueService.createQueue<Message.Message>();
-        const conversation = yield* acquireReleaseResource(() => new AiConversation(queue));
+        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();