@dxos/plugin-assistant 0.8.4-main.c1de068 → 0.8.4-main.fd6878d

package/src/hooks/useChatProcessor.ts

@@ -2,110 +2,52 @@
 // 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 { useIntentDispatcher } from '@dxos/app-framework';
+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, type Space, fullyQualifiedId } 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 '../hooks';
+import { type Assistant } from '../types';
 
-type UseChatProcessorProps = {
-  preset?: AiServicePreset;
+export type UseChatProcessorProps = {
   space?: Space;
   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 => {
+}: UseChatProcessorProps): AiChatProcessor | undefined => {
+  const observableRegistry = useContext(RegistryContext);
   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],
-  );
+  const extensions = useMemo(() => ({ space, dispatch, pivotId: chatId }), [dispatch, space, chatId]);
 
   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.
@@ -115,23 +57,19 @@ export const useChatProcessor = ({
       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,
+    return new AiChatProcessor(services, conversation, {
       extensions,
       blueprintRegistry,
-      artifacts,
-      systemPrompt,
+      observableRegistry,
       model: preset?.model,
     });
-  }, [services, conversation, tools, blueprintRegistry, artifacts, extensions, systemPrompt, preset]);
+  }, [services, conversation, blueprintRegistry, extensions, preset]);
 
   return processor;
 };

package/src/hooks/useChatServices.ts

@@ -2,38 +2,36 @@
 // 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 { type AiService, type ToolExecutionService, type ToolResolverService } from '@dxos/ai';
 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';
+import { AssistantCapabilities } from '../capabilities';
 
 // TODO(burdon): Deconstruct into separate layers?
-export type ChatServices =
-  | AiService
+export type AiChatServices =
+  | AiService.AiService
   | CredentialsService
   | DatabaseService
   | QueueService
-  | FunctionCallService
+  | RemoteFunctionExecutionService
   | ToolResolverService
   | ToolExecutionService
-  | TracingService
-  | EventLogger;
+  | TracingService;
 
 export type UseChatServicesProps = {
   space?: Space;
@@ -42,50 +40,33 @@ export type UseChatServicesProps = {
 /**
  * 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 }: 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,
+          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]);
 };

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,45 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useCallback, useEffect, useMemo, useState } from 'react';
+
+import { type ChatPromptProps } from '../components';
+
+import { type AiServicePreset, AiServicePresets } from './presets';
+
+export type UsePresets = {
+  preset: AiServicePreset | undefined;
+} & Pick<ChatPromptProps, 'presets' | 'onChangePreset'>;
+
+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 handleChangePreset = useCallback<NonNullable<ChatPromptProps['onChangePreset']>>(
+    (id) => {
+      const preset = presets.find((preset) => preset.id === id);
+      if (preset) {
+        setPreset(preset);
+      }
+    },
+    [presets],
+  );
+
+  return {
+    preset: preset,
+    presets: presetOptions,
+    onChangePreset: handleChangePreset,
+  };
+};

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/parser/filter-generator.ts

@@ -4,14 +4,7 @@
 
 import { Filter } from '@dxos/echo';
 
-import {
-  type BinaryExpression,
-  type Expression,
-  type Identifier,
-  type Literal,
-  type RelationalOperator,
-  type UnaryExpression,
-} from './types';
+import { type Expression, type Identifier, type Literal, type RelationalOperator } from './types';
 
 const relationalOperators: Record<RelationalOperator, (value: any) => Filter<any>> = {
   EQ: Filter.eq,
@@ -26,7 +19,7 @@ const specialPredicates: Record<string, (value: string) => Filter<any>> = {
 export const createFilter = (ast: Expression): Filter<any> => {
   switch (ast.type) {
     case 'binary': {
-      const { operator, left, right } = ast as BinaryExpression;
+      const { operator, left, right } = ast;
 
       // Handle logical operators.
       if (operator === 'AND') {
@@ -44,7 +37,7 @@ export const createFilter = (ast: Expression): Filter<any> => {
       }
 
       // Handle relational operators
-      const filterFn = relationalOperators[operator as RelationalOperator];
+      const filterFn = relationalOperators[operator];
       if (filterFn) {
         return filterFn((right as Literal).value);
       }
@@ -53,7 +46,7 @@ export const createFilter = (ast: Expression): Filter<any> => {
     }
 
     case 'unary': {
-      const { operator, argument } = ast as UnaryExpression;
+      const { operator, argument } = ast;
       if (operator === 'NOT') {
         return Filter.not(createFilter(argument));
       }
@@ -61,12 +54,12 @@ export const createFilter = (ast: Expression): Filter<any> => {
     }
 
     case 'identifier': {
-      const { name } = ast as Identifier;
+      const { name } = ast;
       return Filter._props({ [name]: true });
     }
 
     case 'literal': {
-      const { value } = ast as Literal;
+      const { value } = ast;
       // Handle special '*' value for empty input.
       if (value === '*') {
         return Filter.everything();

package/src/parser/query-parser.ts

@@ -4,7 +4,7 @@
 
 import { invariant } from '@dxos/invariant';
 
-import { type Expression, type BinaryOperator, type RelationalOperator } from './types';
+import { type BinaryOperator, type Expression, type RelationalOperator } from './types';
 
 // TODO(burdon): Move to echo-schema?
 

package/src/queue-logger.ts

@@ -2,16 +2,16 @@
 // Copyright 2025 DXOS.org
 //
 
-import { getSpace, Ref, type Queue, type Space } from '@dxos/client/echo';
+import { type Queue, Ref, type Space, getSpace } from '@dxos/client/echo';
 import { type Sequence, type SequenceEvent, type SequenceLogger } from '@dxos/conductor';
 import { DXN, Key, Obj } from '@dxos/echo';
 import {
   InvocationOutcome,
   InvocationTraceEndEvent,
+  type InvocationTraceEvent,
   InvocationTraceEventType,
   InvocationTraceStartEvent,
   TraceEvent,
-  type InvocationTraceEvent,
 } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { QueueSubspaceTags } from '@dxos/keys';
@@ -62,7 +62,7 @@ export class QueueLogger implements SequenceLogger {
           Obj.make(TraceEvent, {
             outcome: event.type,
             truncated: false,
-            ingestionTimestampMs: Date.now(),
+            ingestionTimestamp: Date.now(),
             logs: [
               {
                 timestampMs: Date.now(),
@@ -80,7 +80,7 @@ export class QueueLogger implements SequenceLogger {
           Obj.make(TraceEvent, {
             outcome: event.type,
             truncated: false,
-            ingestionTimestampMs: Date.now(),
+            ingestionTimestamp: Date.now(),
             logs: [
               {
                 timestampMs: Date.now(),
@@ -98,7 +98,7 @@ export class QueueLogger implements SequenceLogger {
           Obj.make(TraceEvent, {
             outcome: event.type,
             truncated: false,
-            ingestionTimestampMs: Date.now(),
+            ingestionTimestamp: Date.now(),
             logs: [
               {
                 timestampMs: Date.now(),