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

package/src/hooks/useChatProcessor.ts

@@ -2,24 +2,30 @@
 // Copyright 2025 DXOS.org
 //
 
-import { RegistryContext } from '@effect-atom/atom-react';
-import type * as Runtime from 'effect/Runtime';
+import { type Registry, RegistryContext } from '@effect-atom/atom-react';
+import * as Effect from 'effect/Effect';
 import { useContext, useMemo, useState } from 'react';
 
-import { AiConversation } from '@dxos/assistant';
-import { type Blueprint } from '@dxos/blueprints';
+import { AiSession } from '@dxos/assistant';
+import { type Chat } from '@dxos/assistant-toolkit';
+import { type Blueprint } from '@dxos/compute';
+import { Feed, Ref } from '@dxos/echo';
+import { createFeedServiceLayer } from '@dxos/echo-db';
+import { runAndForwardErrors } from '@dxos/effect';
 import { log } from '@dxos/log';
-import { type Queue, type Space } from '@dxos/react-client/echo';
+import { type AutomationCapabilities } from '@dxos/plugin-automation';
+import { type Space } from '@dxos/react-client/echo';
 import { useAsyncEffect } from '@dxos/react-ui';
 
-import { AiChatProcessor, type AiChatServices, type AiServicePreset } from '../processor';
-import { type Assistant } from '../types';
+import { type Assistant } from '#types';
+
+import { AiChatProcessor, type AiServicePreset } from '../processor';
 
 export type UseChatProcessorProps = {
   space?: Space;
-  chat?: Assistant.Chat;
+  chat?: Chat.Chat;
   preset?: AiServicePreset;
-  services?: () => Promise<Runtime.Runtime<AiChatServices>>;
+  runtime?: AutomationCapabilities.ComputeRuntime;
   blueprintRegistry?: Blueprint.Registry;
   settings?: Assistant.Settings;
 };
@@ -31,44 +37,54 @@ export const useChatProcessor = ({
   space,
   chat,
   preset,
-  services,
+  runtime,
   blueprintRegistry,
   settings,
 }: UseChatProcessorProps): AiChatProcessor | undefined => {
   const observableRegistry = useContext(RegistryContext);
 
-  // Create conversation from chat queue.
-  const [conversation, setConversation] = useState<AiConversation>();
+  const [session, setSession] = useState<AiSession>();
   useAsyncEffect(async () => {
     if (!space || !chat) {
       return;
     }
 
-    // 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>);
-    await conversation.open();
-    setConversation(conversation);
+    const feedTarget = chat.feed.target;
+    if (!feedTarget) {
+      return;
+    }
+    const feedServiceLayer = createFeedServiceLayer(space.queues);
+    const runtime = await runAndForwardErrors(
+      Effect.runtime<Feed.FeedService>().pipe(Effect.provide(feedServiceLayer)),
+    );
+    const session = new AiSession({
+      feed: feedTarget,
+      runtime,
+      registry: observableRegistry as Registry.Registry,
+    });
+    await session.open();
+    setSession(session);
     return () => {
-      void conversation.close();
-      setConversation(undefined);
+      void session.close();
+      setSession(undefined);
     };
-  }, [space, chat?.queue.dxn.toString()]);
+  }, [space, chat?.feed.target]);
+
+  const feed = chat?.feed.target;
 
-  // Create processor.
   const processor = useMemo(() => {
-    if (!services || !conversation) {
+    if (!runtime || !session || !chat || !feed) {
       return undefined;
     }
 
     log('creating processor', { preset, model: preset?.model, settings });
-    return new AiChatProcessor(conversation, services, {
+    return new AiChatProcessor(session, runtime, feed, {
+      chat: chat ? Ref.make(chat) : undefined,
       observableRegistry,
       blueprintRegistry,
       model: preset?.model,
     });
-  }, [services, conversation, blueprintRegistry, preset]);
+  }, [runtime, session, blueprintRegistry, preset, feed]);
 
   return processor;
 };

package/src/hooks/useChatServices.ts

@@ -2,50 +2,25 @@
 // Copyright 2025 DXOS.org
 //
 
-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 { TracingService } from '@dxos/functions';
-import { TracingServiceExt } from '@dxos/functions-runtime';
+import { useCapability } from '@dxos/app-framework/ui';
+import { getPersonalSpace } from '@dxos/app-toolkit';
+import { type Key } from '@dxos/echo';
 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;
 };
 
 /**
- * Construct service layer.
+ * Resolves the compute runtime for a space.
  */
-// TODO(dmaretskyi): Better return type.
-export const useChatServices = ({
-  space,
-  chat,
-}: UseChatServicesProps): (() => Promise<Runtime.Runtime<AiChatServices>>) | undefined => {
+export const useChatServices = ({ id }: UseChatServicesProps) => {
   const client = useClient();
-  space ??= client.spaces.default;
+  id ??= getPersonalSpace(client)?.id;
 
   const runtimeResolver = useCapability(AutomationCapabilities.ComputeRuntime);
-  return useMemo(() => {
-    const runtime = runtimeResolver.getRuntime(space.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,
-            ),
-          );
-        }),
-      );
-  }, [space, chat?.traceQueue?.target]);
+  return useMemo(() => (!id ? undefined : runtimeResolver.getRuntime(id)), [id]);
 };

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 { useChatContext } from '#components';
+import { meta } from '#meta';
+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(
@@ -38,27 +39,28 @@ export const useChatToolbarActions = ({ chat, companionTo }: ChatToolbarActionsP
       return Atom.make(() => {
         const builder = MenuBuilder.make()
           .root({
-            label: ['chat toolbar title', { ns: meta.id }],
+            label: ['chat-toolbar.title', { ns: meta.id }],
           })
           .action(
             'new',
             {
-              label: ['new thread button', { ns: meta.id }],
+              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',
             {
-              label: ['rename thread button', { ns: meta.id }],
+              label: ['rename-thread.button', { ns: meta.id }],
               icon: 'ph--magic-wand--regular',
               type: 'rename',
               disabled: !chat,
@@ -66,13 +68,13 @@ 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',
             {
-              label: ['button branch thread', { ns: meta.id }],
+              label: ['branch-thread.menu', { ns: meta.id }],
               icon: 'ph--git-branch--regular',
               type: 'branch',
               disabled: true,
@@ -84,7 +86,7 @@ export const useChatToolbarActions = ({ chat, companionTo }: ChatToolbarActionsP
           builder.group(
             'chats',
             {
-              label: ['chat history label', { ns: meta.id }],
+              label: ['chat-history.label', { ns: meta.id }],
               icon: 'ph--clock-counter-clockwise--regular',
               selectCardinality: 'single',
               variant: 'dropdownMenu',
@@ -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,29 +2,42 @@
 // Copyright 2025 DXOS.org
 //
 
-import { useState } from 'react';
+import { type Registry, RegistryContext } from '@effect-atom/atom-react';
+import * as Effect from 'effect/Effect';
+import { useContext, useState } from 'react';
 
 import { AiContextBinder } from '@dxos/assistant';
-import { type Queue } from '@dxos/react-client/echo';
+import { Feed } from '@dxos/echo';
+import { createFeedServiceLayer } from '@dxos/echo-db';
+import { runAndForwardErrors } from '@dxos/effect';
+import { type Space } from '@dxos/react-client/echo';
 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 => {
+export const useContextBinder = (
+  space: Space | undefined,
+  feed: Feed.Feed | undefined,
+): AiContextBinder | undefined => {
+  const registry = useContext(RegistryContext) as Registry.Registry;
   const [binder, setBinder] = useState<AiContextBinder>();
 
   useAsyncEffect(async () => {
-    if (!queue) {
+    setBinder(undefined);
+    if (!space || !feed) {
       return;
     }
 
-    const binder = new AiContextBinder(queue);
+    const feedServiceLayer = createFeedServiceLayer(space.queues);
+    const runtime = await runAndForwardErrors(
+      Effect.runtime<Feed.FeedService>().pipe(Effect.provide(feedServiceLayer)),
+    );
+    const binder = new AiContextBinder({ feed, runtime, registry });
     await binder.open();
     setBinder(binder);
 
     return () => {
       void binder.close();
     };
-  }, [queue]);
+  }, [space, feed]);
 
   return binder;
 };

package/src/hooks/useContextObjects.ts

@@ -2,53 +2,45 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Atom, useAtomValue } from '@effect-atom/atom-react';
 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 } 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>;
 };
 
+const emptyObjectsAtom = Atom.make<Obj.Unknown[]>([]);
+
 /**
  * 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 objects = useAtomValue(context?.objects ?? emptyObjectsAtom);
 
   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;
       }
 
-      const ref = Ref.fromDXN(dxn);
+      const ref = db.makeRef<Obj.Unknown>(dxn);
+      await ref.load();
       if (checked) {
         await context.bind({ objects: [ref] });
       } else {
         await context.unbind({ objects: [ref] });
       }
     },
-    [space, context],
+    [db, context],
   );
 
   return {

package/src/hooks/useDebug.ts

@@ -0,0 +1,38 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useCallback } from 'react';
+
+import { trim } from '@dxos/util';
+
+import { type AiChatProcessor } from '../processor';
+
+/**
+ * Returns an async callback that logs the chat's current context, system prompt,
+ * and resolved tools to the browser console under a collapsible group.
+ * Used by the chat's debug-toggle event handler.
+ */
+export const useDebug = ({ processor }: { processor: AiChatProcessor }) => {
+  return useCallback(async () => {
+    const objects = processor.context.getObjects();
+    const blueprints = processor.context.getBlueprints();
+    const system = await processor.getSystemPrompt();
+    const tools = (await processor.getTools()) ?? {};
+    console.group('Chat', { objects, blueprints });
+    try {
+      console.log(trim`
+        System Prompt:
+        ${system}
+      `);
+      console.log(trim`
+        Tools:
+        ${Object.values(tools)
+          .map((tool) => JSON.stringify(tool, null, 2))
+          .join('\n')}
+      `);
+    } finally {
+      console.groupEnd();
+    }
+  }, [processor]);
+};

package/src/hooks/useFilteredTypes.ts

@@ -5,26 +5,25 @@
 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[] => {
-  const [types, setTypes] = useState<Type.Entity.Any[]>([]);
+export const useFilteredTypes = (db?: Database.Database): Type.AnyEntity[] => {
+  const [types, setTypes] = useState<Type.AnyEntity[]>([]);
   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))),
+              .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/usePresets.ts

@@ -4,7 +4,8 @@
 
 import { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { type ChatPromptProps } from '../components';
+import { type ChatPromptProps } from '#components';
+
 import { type AiServicePreset, AiServicePresets } from '../processor';
 
 export type UsePresets = {

package/src/hooks/useReferencesProvider.ts

@@ -4,8 +4,6 @@
 
 import { useMemo } from 'react';
 
-import { Capabilities } from '@dxos/app-framework';
-import { useCapabilities } from '@dxos/app-framework/react';
 import { type Space } from '@dxos/client/echo';
 import { Filter, Obj } from '@dxos/echo';
 import { type ReferencesProvider } from '@dxos/react-ui-chat';
@@ -14,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;
@@ -40,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) ?? '',
@@ -52,7 +48,7 @@ export const useReferencesProvider = (space?: Space): ReferencesProvider | undef
         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,12 +2,6 @@
 // Copyright 2023 DXOS.org
 //
 
-export * from './capabilities';
-export * from './components';
-export * from './events';
-export * from './hooks';
+export * from './blueprints';
 export * from './meta';
-export * from './translations';
 export * from './types';
-
-export * from './AssistantPlugin';

package/src/meta.ts

@@ -2,20 +2,23 @@
 // 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 = {
-  id: 'dxos.org/plugin/assistant',
+export const meta: Plugin.Meta = {
+  id: 'org.dxos.plugin.assistant',
   name: 'Assistant',
   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',
+  icon: 'ph--sparkle--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`;
+export const ASSISTANT_DIALOG = `${meta.id}.assistant.dialog`;
+
+/** Companion variant identifier for the assistant chat panel. */
+export const ASSISTANT_COMPANION_VARIANT = 'assistant-chat';