@dxos/plugin-assistant 0.8.4-main.f5c0578 → 0.8.4-main.fcc0d83b33

package/src/hooks/useChatServices.ts

@@ -2,73 +2,25 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type AiTool, AiToolkit } from '@effect/ai';
-import { Layer } from 'effect';
 import { useMemo } from 'react';
 
-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 {
-  ComputeEventLogger,
-  CredentialsService,
-  DatabaseService,
-  LocalFunctionExecutionService,
-  QueueService,
-  RemoteFunctionExecutionService,
-  TracingService,
-} from '@dxos/functions';
-
-import { AssistantCapabilities } from '../capabilities';
-import type { Assistant } from '../types';
-
-// TODO(burdon): Deconstruct into separate layers?
-export type AiChatServices =
-  | AiService.AiService
-  | CredentialsService
-  | DatabaseService
-  | QueueService
-  | RemoteFunctionExecutionService
-  | ToolResolverService
-  | ToolExecutionService
-  | TracingService;
+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/types';
+import { useClient } from '@dxos/react-client';
 
 export type UseChatServicesProps = {
-  space?: Space;
-  chat?: Assistant.Chat;
+  id?: Key.SpaceId;
 };
 
 /**
- * Construct service layer.
+ * Resolves the compute runtime for a space.
  */
-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);
+export const useChatServices = ({ id }: UseChatServicesProps) => {
+  const client = useClient();
+  id ??= getPersonalSpace(client)?.id;
 
-  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(
-      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, functions, toolkits, handlers, chat?.traceQueue?.target]);
+  const runtimeResolver = useCapability(AutomationCapabilities.ComputeRuntime);
+  return useMemo(() => (!id ? undefined : runtimeResolver.getRuntime(id)), [id]);
 };

package/src/hooks/useChatToolbarActions.ts

@@ -0,0 +1,122 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Atom } from '@effect-atom/atom-react';
+import * as Effect from 'effect/Effect';
+import { useMemo } from '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 { AssistantOperation } from '#operations';
+
+export type ChatToolbarActionsProps = {
+  chat?: Chat.Chat;
+  companionTo?: Obj.Unknown;
+};
+
+export const useChatToolbarActions = ({ chat, companionTo }: ChatToolbarActionsProps) => {
+  const { invoke } = useOperationInvoker();
+  const { db } = useChatContext('useChatToolbarActions');
+  const query = companionTo
+    ? 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(db, query);
+
+  // Create stable reference for dependency array to avoid circular reference issues.
+  return useMenuActions(
+    useMemo(() => {
+      return Atom.make(() => {
+        const builder = MenuBuilder.make()
+          .root({
+            label: ['chat-toolbar.title', { ns: meta.id }],
+          })
+          .action(
+            'new',
+            {
+              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);
+            },
+          )
+          .action(
+            'rename',
+            {
+              label: ['rename-thread.button', { ns: meta.id }],
+              icon: 'ph--magic-wand--regular',
+              type: 'rename',
+              disabled: !chat,
+            },
+            () =>
+              Effect.gen(function* () {
+                invariant(chat);
+                yield* invoke(AssistantOperation.UpdateChatName, { chat });
+              }).pipe(runAndForwardErrors),
+          )
+          .action(
+            'branch',
+            {
+              label: ['branch-thread.menu', { ns: meta.id }],
+              icon: 'ph--git-branch--regular',
+              type: 'branch',
+              disabled: true,
+            },
+            () => {},
+          );
+
+        if (chats.length > 0) {
+          builder.group(
+            'chats',
+            {
+              label: ['chat-history.label', { ns: meta.id }],
+              icon: 'ph--clock-counter-clockwise--regular',
+              selectCardinality: 'single',
+              variant: 'dropdownMenu',
+            },
+            (builder) => {
+              chats
+                // TODO(wittjosiah): This should be the default sort order.
+                .toSorted((a, b) => a.id.localeCompare(b.id))
+                .forEach((chat) => {
+                  builder.action(
+                    chat.id,
+                    {
+                      label: Obj.getLabel(chat) ?? ['object-name.placeholder', { ns: Chat.Chat.typename }],
+                    },
+                    () =>
+                      Effect.gen(function* () {
+                        invariant(companionTo);
+                        yield* invoke(AssistantOperation.SetCurrentChat, {
+                          companionTo,
+                          chat,
+                        });
+                      }).pipe(runAndForwardErrors),
+                  );
+                });
+            },
+          );
+        }
+
+        return builder.build();
+      });
+    }, [chats.length, db?.spaceId, companionTo?.id, chat?.id, invoke]),
+  );
+};

package/src/hooks/useContextBinder.ts

@@ -0,0 +1,43 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+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 { 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';
+
+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 () => {
+    setBinder(undefined);
+    if (!space || !feed) {
+      return;
+    }
+
+    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();
+    };
+  }, [space, feed]);
+
+  return binder;
+};

package/src/hooks/useContextObjects.ts

@@ -0,0 +1,50 @@
+//
+// 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 Database, type Obj } from '@dxos/echo';
+
+export type UseContextObjectsProps = {
+  db?: Database.Database;
+  context?: AiContextBinder;
+};
+
+export type UseContextObjects = {
+  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 = ({ db, context }: UseContextObjectsProps): UseContextObjects => {
+  const objects = useAtomValue(context?.objects ?? emptyObjectsAtom);
+
+  const handleUpdateObject = useCallback<UseContextObjects['onUpdateObject']>(
+    async (dxn: DXN, checked: boolean) => {
+      if (!db || !context) {
+        return;
+      }
+
+      const ref = db.makeRef<Obj.Unknown>(dxn);
+      await ref.load();
+      if (checked) {
+        await context.bind({ objects: [ref] });
+      } else {
+        await context.unbind({ objects: [ref] });
+      }
+    },
+    [db, context],
+  );
+
+  return {
+    objects,
+    onUpdateObject: handleUpdateObject,
+  };
+};

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

@@ -0,0 +1,37 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Option from 'effect/Option';
+import { useEffect, useState } from 'react';
+
+import { type Database, type Type } from '@dxos/echo';
+import { EntityKind, SystemTypeAnnotation, getTypeAnnotation } from '@dxos/echo/internal';
+
+// TODO(burdon): Pass in filter.
+// TODO(wittjosiah): Factor out.
+export const useFilteredTypes = (db?: Database.Database): Type.AnyEntity[] => {
+  const [types, setTypes] = useState<Type.AnyEntity[]>([]);
+  useEffect(() => {
+    if (!db) {
+      return;
+    }
+
+    return db.schemaRegistry.query({ location: ['database', 'runtime'] }).subscribe(
+      (query) => {
+        const types = Array.from(
+          new Set(
+            query.results
+              .filter((schema) => getTypeAnnotation(schema)?.kind !== EntityKind.Relation)
+              .filter((schema) => !SystemTypeAnnotation.get(schema).pipe(Option.getOrElse(() => false))),
+          ),
+        );
+
+        setTypes(types);
+      },
+      { fire: true },
+    );
+  }, [db]);
+
+  return types;
+};

package/src/hooks/usePresets.ts

@@ -4,13 +4,13 @@
 
 import { useCallback, useEffect, useMemo, useState } from 'react';
 
-import { type ChatPromptProps } from '../components';
+import { type ChatPromptProps } from '#components';
 
-import { type AiServicePreset, AiServicePresets } from './presets';
+import { type AiServicePreset, AiServicePresets } from '../processor';
 
 export type UsePresets = {
   preset: AiServicePreset | undefined;
-} & Pick<ChatPromptProps, 'presets' | 'onChangePreset'>;
+} & Pick<ChatPromptProps, 'presets' | 'onPresetChange'>;
 
 export const usePresets = (online: boolean): UsePresets => {
   // TODO(burdon): Memo preset for provider.
@@ -27,7 +27,7 @@ export const usePresets = (online: boolean): UsePresets => {
     setPreset(presets[0]);
   }, [presets]);
 
-  const handleChangePreset = useCallback<NonNullable<ChatPromptProps['onChangePreset']>>(
+  const handlePresetChange = useCallback<NonNullable<ChatPromptProps['onPresetChange']>>(
     (id) => {
       const preset = presets.find((preset) => preset.id === id);
       if (preset) {
@@ -40,6 +40,6 @@ export const usePresets = (online: boolean): UsePresets => {
   return {
     preset: preset,
     presets: presetOptions,
-    onChangePreset: handleChangePreset,
+    onPresetChange: handlePresetChange,
   };
 };

package/src/hooks/useReferencesProvider.ts

@@ -4,7 +4,6 @@
 
 import { useMemo } from 'react';
 
-import { Capabilities, useCapabilities } from '@dxos/app-framework';
 import { type Space } from '@dxos/client/echo';
 import { Filter, Obj } from '@dxos/echo';
 import { type ReferencesProvider } from '@dxos/react-ui-chat';
@@ -13,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;
@@ -24,11 +21,11 @@ export const useReferencesProvider = (space?: Space): ReferencesProvider | undef
       getReferences: async ({ query }) => {
         // 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
+        // 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();
+        const objects = await space.db.query(Filter.everything()).run();
 
         return (
           objects
@@ -39,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) ?? '',
@@ -47,11 +44,11 @@ export const useReferencesProvider = (space?: Space): ReferencesProvider | undef
         );
       },
       resolveReference: async ({ uri }) => {
-        const object = await space.db.query(Filter.ids(uri)).first();
+        const object = await space.db.query(Filter.id(uri)).first();
         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,10 +2,8 @@
 // Copyright 2023 DXOS.org
 //
 
-export * from './capabilities';
 export * from './components';
-export * from './events';
+export * from './hooks';
 export * from './meta';
-export * from './types';
 
 export * from './AssistantPlugin';

package/src/meta.ts

@@ -2,17 +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 ASSISTANT_PLUGIN = 'dxos.org/plugin/assistant';
-
-export const ASSISTANT_DIALOG = `${ASSISTANT_PLUGIN}/assistant/dialog`;
-
-export const meta: PluginMeta = {
-  id: ASSISTANT_PLUGIN,
+export const meta: Plugin.Meta = {
+  id: 'org.dxos.plugin.assistant',
   name: 'Assistant',
-  description: 'The Assistant tab allows you to chat with your spaces inside of Composer.',
-  icon: 'ph--atom--regular',
+  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--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`;
+
+/** Companion variant identifier for the assistant chat panel. */
+export const ASSISTANT_COMPANION_VARIANT = 'assistant-chat';

package/src/operations/create-chat.ts

@@ -0,0 +1,80 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AiContextBinder } from '@dxos/assistant';
+import { Chat, DatabaseBlueprint, AgentWizardBlueprint } from '@dxos/assistant-toolkit';
+import { Blueprint } from '@dxos/compute';
+import { Operation } from '@dxos/compute';
+import { Feed, Filter, Obj, Ref } from '@dxos/echo';
+import { createFeedServiceLayer } from '@dxos/echo-db';
+import { invariant } from '@dxos/invariant';
+import { ClientCapabilities } from '@dxos/plugin-client/types';
+
+import { AssistantBlueprint } from '#blueprints';
+
+import { CreateChat } from './definitions';
+
+const handler: Operation.WithHandler<typeof CreateChat> = CreateChat.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* ({ db, name, addToSpace = true }) {
+      const registry = yield* Capability.get(Capabilities.AtomRegistry);
+      const client = yield* Capability.get(ClientCapabilities.Client);
+      const space = client.spaces.get(db.spaceId);
+      invariant(space, 'Space not found');
+      const feed = space.db.add(Feed.make());
+      const chat = Chat.make({ name, feed: Ref.make(feed) });
+      Obj.setParent(feed, chat);
+      if (addToSpace) {
+        space.db.add(chat);
+      }
+
+      // TODO(wittjosiah): This should be a space-level setting.
+      // TODO(burdon): Clone when activated. Copy-on-write for template.
+      const blueprints = yield* Effect.promise(() => db.query(Filter.type(Blueprint.Blueprint)).run());
+      let defaultAssistantBlueprint = blueprints.find((blueprint) => blueprint.key === AssistantBlueprint.key);
+      if (!defaultAssistantBlueprint) {
+        defaultAssistantBlueprint = db.add(AssistantBlueprint.make());
+      }
+      let defaultDatabaseBlueprint = blueprints.find((blueprint) => blueprint.key === DatabaseBlueprint.key);
+      if (!defaultDatabaseBlueprint) {
+        defaultDatabaseBlueprint = db.add(DatabaseBlueprint.make());
+      }
+      let defaultAgentWizardBlueprint = blueprints.find((blueprint) => blueprint.key === AgentWizardBlueprint.key);
+      if (!defaultAgentWizardBlueprint) {
+        defaultAgentWizardBlueprint = db.add(AgentWizardBlueprint.make());
+      }
+      // Dynamic import to avoid circular dependency with the barrel that also exports BlueprintManagerHandlers.
+      const { BlueprintManagerBlueprint } = yield* Effect.promise(() => import('@dxos/assistant-toolkit'));
+      let defaultBlueprintManagerBlueprint = blueprints.find(
+        (blueprint) => blueprint.key === BlueprintManagerBlueprint.key,
+      );
+      if (!defaultBlueprintManagerBlueprint) {
+        defaultBlueprintManagerBlueprint = db.add(BlueprintManagerBlueprint.make());
+      }
+
+      const feedServiceLayer = createFeedServiceLayer(space.queues);
+      const runtime = yield* Effect.runtime<Feed.FeedService>().pipe(Effect.provide(feedServiceLayer));
+      const binder = new AiContextBinder({ feed, runtime, registry });
+      yield* Effect.promise(() =>
+        binder.use((b: AiContextBinder) =>
+          b.bind({
+            blueprints: [
+              Ref.make(defaultAssistantBlueprint!),
+              Ref.make(defaultDatabaseBlueprint!),
+              Ref.make(defaultAgentWizardBlueprint!),
+              Ref.make(defaultBlueprintManagerBlueprint!),
+            ],
+          }),
+        ),
+      );
+
+      return { object: chat };
+    }),
+  ),
+);
+
+export default handler;