@dxos/plugin-assistant 0.8.4-main.2e9d522 → 0.8.4-main.5ea62a8

package/src/hooks/useChatProcessor.ts

@@ -2,142 +2,65 @@
 // Copyright 2025 DXOS.org
 //
 
+import { RegistryContext } from '@effect-rx/rx-react';
 import { type Layer } from 'effect';
-import { useEffect, useMemo, useState } from 'react';
+import { useContext, useMemo } from 'react';
 
-import { type ExecutableTool } from '@dxos/ai';
-import { Capabilities, useCapabilities, useIntentDispatcher } from '@dxos/app-framework';
-import { Conversation, createSystemPrompt } from '@dxos/assistant';
-import { type ArtifactDefinition, type AssociatedArtifact, type Blueprint } from '@dxos/blueprints';
-import { FunctionType } from '@dxos/functions';
+import { AiConversation } from '@dxos/assistant';
+import { type Blueprint } from '@dxos/blueprints';
 import { log } from '@dxos/log';
-import { useConfig } from '@dxos/react-client';
-import { Filter, fullyQualifiedId, type Queue, type Space, useQuery } from '@dxos/react-client/echo';
-import { isNonNullable } from '@dxos/util';
+import { type Queue } from '@dxos/react-client/echo';
 
-import { type AiServicePreset, ChatProcessor, type ChatServices } from '../hooks';
-import { convertFunctionToTool, createToolsFromService } from '../tools';
-import { type Assistant, ServiceType } from '../types';
+import { AiChatProcessor, type AiChatServices, type AiServicePreset } from '../processor';
+import { type Assistant } from '../types';
 
-type UseChatProcessorProps = {
-  preset?: AiServicePreset;
-  space?: Space;
+export type UseChatProcessorProps = {
   chat?: Assistant.Chat;
-
-  // TODO(burdon): Move into layer?
-  services?: Layer.Layer<ChatServices>;
+  preset?: AiServicePreset;
+  services?: Layer.Layer<AiChatServices>;
   blueprintRegistry?: Blueprint.Registry;
-  // TODO(burdon): Not currently used.
   settings?: Assistant.Settings;
-
-  /** @deprecated */
-  instructions?: string;
-  /** @deprecated */
-  artifact?: AssociatedArtifact;
-  /** @deprecated */
-  noPluginArtifacts?: boolean;
 };
 
 /**
- * Configure and create ChatProcessor.
+ * Configure and create AiChatProcessor.
  */
 export const useChatProcessor = ({
-  preset,
-  space,
   chat,
+  preset,
   services,
   blueprintRegistry,
   settings,
-  instructions,
-  artifact,
-  noPluginArtifacts,
-}: UseChatProcessorProps): ChatProcessor | undefined => {
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
-  const globalTools = useCapabilities(Capabilities.Tools);
-
-  // TODO(burdon): Spec artifacts.
-  let artifacts: readonly ArtifactDefinition[] = useCapabilities(Capabilities.ArtifactDefinition);
-  if (noPluginArtifacts) {
-    artifacts = Stable.array;
-  }
-
-  // Services.
-  const remoteServices = useQuery(space, Filter.type(ServiceType));
-  const [serviceTools, setServiceTools] = useState<ExecutableTool[]>([]);
-  useEffect(() => {
-    log('creating service tools...');
-    queueMicrotask(async () => {
-      const tools = await Promise.all(remoteServices.map((service) => createToolsFromService(service)));
-      setServiceTools(tools.flat());
-    });
-  }, [remoteServices]);
-
-  // Tools and context.
-  const config = useConfig();
-  const functions = useQuery(space, Filter.type(FunctionType));
-  const chatId = useMemo(() => (chat ? fullyQualifiedId(chat) : undefined), [chat]);
-  const [tools, extensions] = useMemo(() => {
-    log('creating tools...');
-    const tools: ExecutableTool[] = [
-      ...globalTools.flat(),
-      ...serviceTools,
-      ...functions
-        .map((fn) => convertFunctionToTool(fn, config.values.runtime?.services?.edge?.url ?? '', space?.id))
-        .filter(isNonNullable),
-    ];
-    const extensions = { space, dispatch, pivotId: chatId };
-    return [tools, extensions];
-  }, [dispatch, globalTools, space, chatId, serviceTools, functions]);
-
-  // TODO(burdon): Create from template.
-  const systemPrompt = useMemo(
-    () =>
-      createSystemPrompt({
-        artifacts: artifacts.map((definition) => `${definition.name}\n${definition.instructions}`),
-        artifact,
-        instructions,
-      }),
-    [artifacts, artifact, instructions],
-  );
+}: UseChatProcessorProps): AiChatProcessor | undefined => {
+  const observableRegistry = useContext(RegistryContext);
 
+  // Create conversation from chat queue.
   const conversation = useMemo(() => {
     if (!chat?.queue.target) {
       return;
     }
 
-    return new Conversation({ queue: chat.queue.target as Queue<any> });
+    return new AiConversation({ queue: chat.queue.target as Queue<any> });
   }, [chat?.queue.target]);
 
   // Create processor.
-  // TODO(burdon): Updated on each query update above; should just update current processor?
   const processor = useMemo(() => {
     if (!services || !conversation) {
       return undefined;
     }
 
-    log.info('creating processor', {
+    log('creating processor', {
       preset,
-      artifacts: artifacts.length,
-      systemPrompt: systemPrompt.length,
       model: preset?.model,
       settings,
     });
 
-    return new ChatProcessor(services, conversation, {
-      tools,
-      extensions,
+    return new AiChatProcessor(conversation, services, {
+      observableRegistry,
       blueprintRegistry,
-      artifacts,
-      systemPrompt,
       model: preset?.model,
     });
-  }, [services, conversation, tools, blueprintRegistry, artifacts, extensions, systemPrompt, preset]);
+  }, [services, conversation, blueprintRegistry, preset]);
 
   return processor;
 };
-
-// TODO(dmaretskyi): Extract.
-export const Stable = Object.freeze({
-  array: [] as readonly never[],
-  object: {} as {},
-});

package/src/hooks/useChatServices.ts

@@ -2,90 +2,63 @@
 // Copyright 2025 DXOS.org
 //
 
+import { type AiTool, AiToolkit } from '@effect/ai';
 import { Layer } from 'effect';
 import { useMemo } from 'react';
-import { useDeepCompareMemoize } from 'use-deep-compare-effect';
 
-import { type AiService, type ToolExecutionService, ToolRegistry, type ToolResolverService } from '@dxos/ai';
-import { AiServiceTestingPreset } from '@dxos/ai/testing';
 import { Capabilities, useCapabilities } from '@dxos/app-framework';
 import { makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
 import { type Space } from '@dxos/client/echo';
 import {
-  ConfiguredCredentialsService,
+  ComputeEventLogger,
   CredentialsService,
   DatabaseService,
-  EventLogger,
-  FunctionCallService,
+  LocalFunctionExecutionService,
   QueueService,
+  RemoteFunctionExecutionService,
   TracingService,
 } from '@dxos/functions';
 
-export * from '@dxos/assistant';
-
-// TODO(burdon): Deconstruct into separate layers?
-export type ChatServices =
-  | AiService
-  | CredentialsService
-  | DatabaseService
-  | QueueService
-  | FunctionCallService
-  | ToolResolverService
-  | ToolExecutionService
-  | TracingService
-  | EventLogger;
+import { AssistantCapabilities } from '../capabilities';
+import { type AiChatServices } from '../processor';
+import { type Assistant } from '../types';
 
 export type UseChatServicesProps = {
   space?: Space;
+  chat?: Assistant.Chat;
 };
 
 /**
  * Construct service layer.
  */
-export const useChatServices = ({ space }: UseChatServicesProps): Layer.Layer<ChatServices> | undefined => {
-  const toolRegistry = useToolRegistry();
-  // TODO(dmaretskyi): We can provide the plugin registry as a layer and then build the entire layer stack from there. We need to think how plugin reactivity affect our layer structure.
-  const toolResolver = useToolResolver();
-  const toolExecutionService = useToolExecutionService();
+export const useChatServices = ({ space, chat }: UseChatServicesProps): Layer.Layer<AiChatServices> | undefined => {
+  const serviceLayer = useCapabilities(AssistantCapabilities.AiServiceLayer).at(0) ?? Layer.die('AiService not found');
+  const functions = useCapabilities(Capabilities.Functions);
+  const toolkits = useCapabilities(Capabilities.Toolkit);
+  const handlers = useCapabilities(Capabilities.ToolkitHandler);
 
   return useMemo(() => {
+    const allFunctions = functions.flat();
+    // TODO(wittjosiah): Don't cast.
+    const toolkit = AiToolkit.merge(...toolkits) as AiToolkit.Any as AiToolkit.AiToolkit<AiTool.Any>;
+    const handlersLayer = Layer.mergeAll(Layer.empty, ...handlers);
+
     return Layer.mergeAll(
-      AiServiceTestingPreset('edge-remote').pipe(Layer.orDie), // TODO(burdon): Error management?
-      Layer.succeed(CredentialsService, new ConfiguredCredentialsService()),
-      space ? Layer.succeed(DatabaseService, DatabaseService.make(space.db)) : DatabaseService.notAvailable,
-      space ? Layer.succeed(QueueService, QueueService.make(space.queues)) : QueueService.notAvailable,
-      Layer.succeed(FunctionCallService, FunctionCallService.mock()),
-      Layer.succeed(TracingService, TracingService.noop),
-      Layer.succeed(EventLogger, EventLogger.noop),
-      toolResolver,
-      toolExecutionService,
+      serviceLayer,
+      makeToolResolverFromFunctions(allFunctions, toolkit),
+      makeToolExecutionServiceFromFunctions(allFunctions, toolkit, handlersLayer),
+      CredentialsService.layerFromDatabase(),
+      ComputeEventLogger.layerFromTracing,
+    ).pipe(
+      Layer.provideMerge(
+        Layer.mergeAll(
+          space ? DatabaseService.layer(space.db) : DatabaseService.notAvailable,
+          space ? QueueService.layer(space.queues) : QueueService.notAvailable,
+          chat?.traceQueue?.target ? TracingService.layerQueue(chat.traceQueue?.target) : TracingService.layerNoop,
+          LocalFunctionExecutionService.layer,
+          RemoteFunctionExecutionService.mockLayer,
+        ),
+      ),
     );
-  }, [space, toolRegistry, toolResolver]);
-};
-
-const useToolResolver = (): Layer.Layer<ToolResolverService> => {
-  const functions = useCapabilities(Capabilities.Functions).flat();
-  return useMemo(() => makeToolResolverFromFunctions(functions), [useDeepCompareMemoize(functions.map((f) => f.name))]);
-};
-
-const useToolExecutionService = (): Layer.Layer<ToolExecutionService> => {
-  const functions = useCapabilities(Capabilities.Functions).flat();
-  return useMemo(
-    () => makeToolExecutionServiceFromFunctions(functions),
-    [useDeepCompareMemoize(functions.map((f) => f.name))],
-  );
-};
-
-// TODO(burdon): Factor out.
-const useToolRegistry = (): ToolRegistry => {
-  const tools = useCapabilities(Capabilities.Tools).flat();
-  return useMemo(() => {
-    const toolRegistry = new ToolRegistry([]);
-    for (const tool of tools) {
-      if (!toolRegistry.has(tool)) {
-        toolRegistry.register(tool);
-      }
-    }
-    return toolRegistry;
-  }, [useDeepCompareMemoize(tools)]);
+  }, [space, functions, toolkits, handlers, chat?.traceQueue?.target]);
 };

package/src/hooks/useContextBinder.ts

@@ -0,0 +1,18 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useMemo } from 'react';
+
+import { AiContextBinder } from '@dxos/assistant';
+
+import { type Assistant } from '../types';
+
+export const useContextBinder = (chat: Assistant.Chat | undefined): AiContextBinder | undefined => {
+  const binder = useMemo(() => {
+    const queue = chat?.queue.target;
+    return queue && new AiContextBinder(queue);
+  }, [chat]);
+
+  return binder;
+};

package/src/hooks/useContextObjects.ts

@@ -0,0 +1,58 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+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';
+
+export type UseContextObjects = {
+  objects: Obj.Any[];
+  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) ?? [];
+
+  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 });
+        return;
+      }
+
+      const ref = Ref.fromDXN(dxn);
+      if (checked) {
+        await context.bind({ objects: [ref] });
+      } else {
+        await context.unbind({ objects: [ref] });
+      }
+    },
+    [space, context],
+  );
+
+  return {
+    objects,
+    onUpdateObject: handleUpdateObject,
+  };
+};

package/src/hooks/useExecutionGraph.ts

@@ -0,0 +1,20 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useMemo } from 'react';
+
+import { type Queue } from '@dxos/client/echo';
+import { Obj, type Ref } from '@dxos/echo';
+import { useQueue } from '@dxos/react-client/echo';
+
+import { ExecutionGraph } from '../execution-graph';
+
+export const useExecutionGraph = (queueRef?: Ref.Ref<Queue>, lastRequest = false) => {
+  const queue = useQueue(queueRef?.dxn);
+  return useMemo(() => {
+    const graph = new ExecutionGraph();
+    graph.addEvents(queue?.objects.filter(Obj.isObject) ?? []);
+    return graph.getGraph(lastRequest);
+  }, [queue?.objects, lastRequest]);
+};

package/src/hooks/useFlush.ts

@@ -0,0 +1,35 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useCallback, useRef, useState } from 'react';
+
+import { type Space } from '@dxos/client/echo';
+
+export const useFlush = (space?: Space) => {
+  const [state, setState] = useState<'idle' | 'flushing' | 'flushed'>('idle');
+  const resetTimer = useRef<NodeJS.Timeout | null>(null);
+
+  const handleFlush = useCallback(() => {
+    if (!space) {
+      return;
+    }
+
+    queueMicrotask(async () => {
+      if (resetTimer.current) {
+        clearTimeout(resetTimer.current);
+      }
+
+      setState('flushing');
+      await space.db.flush();
+      setState('flushed');
+
+      resetTimer.current = setTimeout(() => {
+        setState('idle');
+        resetTimer.current = null;
+      }, 1_000);
+    });
+  }, [space]);
+
+  return { state, handleFlush };
+};

package/src/hooks/useItemTypes.ts

@@ -0,0 +1,37 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Option } from 'effect';
+import { useEffect, useState } from 'react';
+
+import { type Type } from '@dxos/echo';
+import { type Space } from '@dxos/react-client/echo';
+import { ItemAnnotation } from '@dxos/schema';
+
+// TODO(burdon): Pass in filter.
+export const useItemTypes = (space?: Space): Type.Obj.Any[] => {
+  const [types, setTypes] = useState<Type.Obj.Any[]>([]);
+  useEffect(() => {
+    if (!space) {
+      return;
+    }
+
+    return space.db.schemaRegistry.query().subscribe(
+      (query) => {
+        const types = Array.from(
+          new Set(
+            [...space.db.graph.schemaRegistry.schemas, ...query.results].filter((type) =>
+              Option.isSome(ItemAnnotation.get(type)),
+            ),
+          ),
+        );
+
+        setTypes(types);
+      },
+      { fire: true },
+    );
+  }, [space]);
+
+  return types;
+};

package/src/hooks/useMatcherExtension.ts

@@ -0,0 +1,45 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useMemo } from 'react';
+
+import { type Space } from '@dxos/client/echo';
+import { Type } from '@dxos/echo';
+import { type TypeaheadContext, matchCompletion, staticCompletion, typeahead } from '@dxos/react-ui-editor';
+
+// TODO(burdon): Move def to @dxos/echo.
+export const useMatcherExtension = (space: Space) => {
+  return useMemo(() => {
+    const handleComplete = ({ line }: TypeaheadContext) => {
+      const words = line.split(/\s+/).filter(Boolean);
+      if (words.length > 0) {
+        const word = words.at(-1)!;
+
+        // Match type.
+        const match = word.match(/^type:(.+)/);
+        if (match) {
+          const part = match[1];
+          for (const schema of space?.db.graph.schemaRegistry.schemas ?? []) {
+            const typename = Type.getTypename(schema);
+            if (typename) {
+              const completion = matchCompletion(typename, part);
+              if (completion) {
+                return completion;
+              }
+            }
+          }
+        }
+
+        // Match static.
+        return staticCompletion(['type:', 'AND', 'OR', 'NOT'])({ line });
+      }
+    };
+
+    return [
+      typeahead({
+        onComplete: handleComplete,
+      }),
+    ];
+  }, [space]);
+};

package/src/hooks/useOnline.ts

@@ -0,0 +1,10 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Dispatch, type SetStateAction, useState } from 'react';
+
+export const useOnline = (): [boolean, Dispatch<SetStateAction<boolean>>] => {
+  const [online, setOnline] = useState(true);
+  return [online, setOnline];
+};

package/src/hooks/usePresets.ts

@@ -0,0 +1,44 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useCallback, useEffect, useMemo, useState } from 'react';
+
+import { type ChatPromptProps } from '../components';
+import { type AiServicePreset, AiServicePresets } from '../processor';
+
+export type UsePresets = {
+  preset: AiServicePreset | undefined;
+} & Pick<ChatPromptProps, 'presets' | 'onPresetChange'>;
+
+export const usePresets = (online: boolean): UsePresets => {
+  // TODO(burdon): Memo preset for provider.
+  const [preset, setPreset] = useState<AiServicePreset>();
+  const presets = useMemo(
+    () => AiServicePresets.filter((preset) => online === (preset.provider === 'dxos-remote')),
+    [online],
+  );
+  const presetOptions = useMemo(
+    () => presets.map(({ id, model, label }) => ({ id, label: label ?? model })),
+    [presets],
+  );
+  useEffect(() => {
+    setPreset(presets[0]);
+  }, [presets]);
+
+  const handlePresetChange = useCallback<NonNullable<ChatPromptProps['onPresetChange']>>(
+    (id) => {
+      const preset = presets.find((preset) => preset.id === id);
+      if (preset) {
+        setPreset(preset);
+      }
+    },
+    [presets],
+  );
+
+  return {
+    preset: preset,
+    presets: presetOptions,
+    onPresetChange: handlePresetChange,
+  };
+};

package/src/hooks/useReferencesProvider.ts

@@ -6,15 +6,14 @@ import { useMemo } from 'react';
 
 import { Capabilities, useCapabilities } from '@dxos/app-framework';
 import { type Space } from '@dxos/client/echo';
-import { Filter, Obj, type Type } from '@dxos/echo';
+import { Filter, Obj } from '@dxos/echo';
 import { type ReferencesProvider } from '@dxos/react-ui-chat';
 
 /**
  * Resolve references to objects in the space.
  */
 export const useReferencesProvider = (space?: Space): ReferencesProvider | undefined => {
-  // TODO(burdon): Pass in.
-  const artifactDefinitions = useCapabilities(Capabilities.ArtifactDefinition);
+  const blueprints = useCapabilities(Capabilities.BlueprintDefinition);
 
   return useMemo<ReferencesProvider | undefined>((): ReferencesProvider | undefined => {
     if (!space) {
@@ -23,10 +22,13 @@ export const useReferencesProvider = (space?: Space): ReferencesProvider | undef
 
     return {
       getReferences: async ({ query }) => {
-        const schemas = artifactDefinitions.map((artifact) => artifact.schema);
-        const { objects } = await space.db
-          .query(Filter.or(...schemas.map((schema) => Filter.type(schema as Type.Schema))))
-          .run();
+        // 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
+        //   .query(Filter.or(...schemas.map((schema) => Filter.type(schema as Type.Schema))))
+        //   .run();
+
+        const { objects } = await space.db.query(Filter.everything()).run();
 
         return (
           objects
@@ -39,7 +41,7 @@ export const useReferencesProvider = (space?: Space): ReferencesProvider | undef
             // 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))
             .map((object) => ({
-              uri: Obj.getDXN(object as any)!.toString(),
+              uri: Obj.getDXN(object as any).toString(),
               label: Obj.getLabel(object as any) ?? '',
             }))
         );
@@ -49,7 +51,7 @@ export const useReferencesProvider = (space?: Space): ReferencesProvider | undef
         return { uri, label: Obj.getLabel(object) ?? '' };
       },
     } satisfies ReferencesProvider;
-  }, [space, artifactDefinitions]);
+  }, [space, blueprints]);
 };
 
 const stringMatch = (query: string, label: string) => label.toLowerCase().startsWith(query.toLowerCase());

package/src/hooks/useResolveRef.ts

@@ -0,0 +1,33 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useMemo, useSyncExternalStore } from 'react';
+
+import { type Space } from '@dxos/client/echo';
+import { type Ref } from '@dxos/echo';
+
+// TODO(burdon): Factor out.
+export const useResolvedRef = <T>(space: Space, ref: Ref.Ref<T>): T | undefined => {
+  const { subscribe, getSnapshot } = useMemo(() => {
+    const resolver = space.db.graph.createRefResolver({});
+    let currentCallback: (() => void) | undefined = undefined;
+
+    return {
+      subscribe: (cb: () => void) => {
+        currentCallback = cb;
+        return () => {
+          if (currentCallback === cb) {
+            currentCallback = undefined;
+          }
+        };
+      },
+      getSnapshot: () =>
+        resolver?.resolveSync(ref.dxn, true, () => {
+          currentCallback?.();
+        }) as T | undefined,
+    };
+  }, [space, ref.dxn.toString()]);
+
+  return useSyncExternalStore<T | undefined>(subscribe, getSnapshot);
+};

package/src/meta.ts

@@ -11,7 +11,7 @@ export const ASSISTANT_DIALOG = `${ASSISTANT_PLUGIN}/assistant/dialog`;
 export const meta: PluginMeta = {
   id: ASSISTANT_PLUGIN,
   name: 'Assistant',
-  description: 'The Assistant tab allows you to chat with your spaces inside of Composer.',
+  description: 'The Assistant plugin allows you to chat with your spaces inside of Composer.',
   icon: 'ph--atom--regular',
   source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-assistant',
   tags: ['labs'],