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

package/src/functions/load.ts

@@ -0,0 +1,42 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Effect, Option, Schema, pipe } from 'effect';
+
+import { ArtifactId } from '@dxos/assistant';
+import { Obj } from '@dxos/echo';
+import { DatabaseService, defineFunction } from '@dxos/functions';
+
+// TODO(burdon): Common error handling.
+// TODO(burdon): Factor out to space plugin.
+export default defineFunction({
+  name: 'dxos.org/function/assistant/load',
+  description: 'Loads the object.',
+  inputSchema: Schema.Struct({
+    id: ArtifactId.annotations({
+      description: 'The ID of the object.',
+    }),
+    typename: Schema.String.annotations({
+      description: 'The typename of the object.',
+    }),
+  }),
+  outputSchema: Schema.Struct({
+    // TODO(wittjosiah): Type.Obj.Any | Type.Relation.Any
+    object: Schema.Any,
+  }),
+  handler: Effect.fn(function* ({ data: { id, typename } }) {
+    const object = yield* DatabaseService.resolve(ArtifactId.toDXN(id));
+    return yield* pipe(
+      Option.fromNullable(object),
+      Option.flatMap((object) => (Obj.getTypename(object) === typename ? Option.some(object) : Option.none())),
+      Option.match({
+        onNone: () => Effect.fail('Object not found.'),
+        onSome: (object) => {
+          // log.info('object', { object });
+          return Effect.succeed({ object });
+        },
+      }),
+    );
+  }),
+});

package/src/hooks/index.ts

@@ -2,10 +2,15 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './chat-processor';
-export * from './presets';
-
-export * from './useBlueprints';
+export * from './useBlueprintRegistry';
 export * from './useChatProcessor';
 export * from './useChatServices';
+export * from './useContextBinder';
+export * from './useContextObjects';
+export * from './useExecutionGraph';
+export * from './useFlush';
+export * from './useItemTypes';
+export * from './useOnline';
+export * from './usePresets';
 export * from './useReferencesProvider';
+export * from './useComputeRuntimeCallback';

package/src/hooks/useBlueprintRegistry.ts

@@ -0,0 +1,80 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useSignalEffect } from '@preact/signals-react';
+import { useCallback, useMemo, useState } from 'react';
+
+import { Capabilities, useCapabilities } from '@dxos/app-framework';
+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 { isNonNullable } 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);
+  return useMemo(() => new Blueprint.Registry(blueprints), [blueprints]);
+};
+
+export const useBlueprints = ({ blueprintRegistry }: { blueprintRegistry?: Blueprint.Registry }) =>
+  useMemo(() => blueprintRegistry?.query() ?? [], [blueprintRegistry]);
+
+/**
+ * Create reactive map of active blueprints (by key).
+ */
+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])));
+  });
+
+  return active;
+};
+
+// TODO(burdon): Move logic into binder.
+export const useBlueprintHandlers = ({
+  space,
+  context,
+  blueprintRegistry,
+}: {
+  space: Space;
+  context?: AiContextBinder;
+  blueprintRegistry?: Blueprint.Registry;
+}) => {
+  const onUpdateBlueprint = useCallback(
+    async (key: string, checked: boolean) => {
+      if (!context || !blueprintRegistry) {
+        return;
+      }
+
+      // Find existing cloned blueprint.
+      const { objects } = await space.db.query(Filter.type(Blueprint.Blueprint)).run();
+      let storedBlueprint = objects.find((blueprint) => blueprint.key === key);
+      if (checked) {
+        if (!storedBlueprint) {
+          const blueprint = blueprintRegistry.getByKey(key);
+          if (!blueprint) {
+            return;
+          }
+
+          // NOTE: Possible race condition with other peers.
+          storedBlueprint = space.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],
+  );
+
+  return { onUpdateBlueprint };
+};

package/src/hooks/useChatProcessor.ts

@@ -2,142 +2,65 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Layer } from 'effect';
-import { useEffect, useMemo, useState } from 'react';
+import { RegistryContext } from '@effect-rx/rx-react';
+import { type Runtime } from 'effect';
+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?: () => Promise<Runtime.Runtime<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,47 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Layer } from 'effect';
+import { Effect, type Runtime } 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 { useCapability } from '@dxos/app-framework';
 import { type Space } from '@dxos/client/echo';
-import {
-  ConfiguredCredentialsService,
-  CredentialsService,
-  DatabaseService,
-  EventLogger,
-  FunctionCallService,
-  QueueService,
-  TracingService,
-} from '@dxos/functions';
+import { TracingService } from '@dxos/functions';
+import { useClient } from '@dxos/react-client';
 
-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();
-
-  return useMemo(() => {
-    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,
-    );
-  }, [space, toolRegistry, toolResolver]);
-};
+// TODO(dmaretskyi): Better return type.
+export const useChatServices = ({
+  space,
+  chat,
+}: UseChatServicesProps): (() => Promise<Runtime.Runtime<AiChatServices>>) | undefined => {
+  const client = useClient();
+  space ??= client.spaces.default;
 
-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))],
-  );
-};
+  const computeRuntimeResolver = useCapability(AssistantCapabilities.ComputeRuntime);
 
-// 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)]);
+    const runtime = computeRuntimeResolver.getRuntime(space.id);
+    return () =>
+      runtime.runPromise(
+        Effect.gen(function* () {
+          return yield* Effect.runtime<AiChatServices>().pipe(
+            Effect.provide(
+              chat?.traceQueue?.target ? TracingService.layerQueue(chat.traceQueue?.target) : TracingService.layerNoop,
+            ),
+          );
+        }),
+      );
+  }, [space, chat?.traceQueue?.target]);
 };

package/src/hooks/useComputeRuntimeCallback.ts

@@ -0,0 +1,25 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import type { Effect } from 'effect';
+import { useCallback } from 'react';
+
+import { useCapability } from '@dxos/app-framework';
+import type { Space } from '@dxos/client/echo';
+
+import { AssistantCapabilities } from '../capabilities';
+
+/**
+ * Create an effectful function that has access to compute services
+ */
+export const useComputeRuntimeCallback = <T>(
+  space: Space,
+  fn: () => Effect.Effect<T, any, AssistantCapabilities.ComputeServices>,
+  deps?: React.DependencyList,
+): (() => Promise<T>) => {
+  const computeRuntime = useCapability(AssistantCapabilities.ComputeRuntime);
+  const runtime = computeRuntime.getRuntime(space.id);
+
+  return useCallback(() => runtime.runPromise(fn()), [runtime, ...(deps ?? [])]);
+};

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 } from '@dxos/echo';
+import { useQueue } from '@dxos/react-client/echo';
+
+import { ExecutionGraph } from '../execution-graph';
+
+export const useExecutionGraph = (queueRef?: 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/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,
+  };
+};