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

package/src/components/ChatCompanion.tsx

@@ -5,7 +5,7 @@
 import * as Array from 'effect/Array';
 import * as Function from 'effect/Function';
 import * as Option from 'effect/Option';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { forwardRef, useCallback, useEffect, useMemo, useState } from 'react';
 
 import { Capabilities, createIntent } from '@dxos/app-framework';
 import { useCapabilities, useIntentDispatcher } from '@dxos/app-framework/react';
@@ -25,131 +25,142 @@ export type ChatCompanionProps = {
   data: { subject: Assistant.Chat | 'assistant-chat'; companionTo: Obj.Any };
 };
 
-export const ChatCompanion = ({ role, data }: ChatCompanionProps) => {
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
-  const blueprintRegistry = useBlueprintRegistry();
-  const companionTo = data.companionTo;
-
-  const space = getSpace(companionTo);
-  const [chat, setChat] = useState(data.subject === 'assistant-chat' ? undefined : data.subject);
-  useEffect(() => {
-    setChat(data.subject === 'assistant-chat' ? undefined : data.subject);
-  }, [data.subject]);
-
-  const chatQueue = space && chat ? space.queues.get(chat.queue.dxn) : undefined;
-  const binder = useContextBinder(chatQueue);
-
-  // Initialize companion chat if it doesn't exist, but don't add it to the space immediately.
-  useAsyncEffect(async () => {
-    if (!space || chat) {
-      return;
-    }
-
-    const { data } = await dispatch(createIntent(AssistantAction.CreateChat, { space }));
-    setChat(data?.object);
-  }, [chat, space]);
-
-  // Add chat to space when user submits the first message.
-  const handleEvent = useCallback(
-    async (event: ChatEvent) => {
-      const chatInSpace = !!getSpace(chat);
-      if (chatInSpace || !chat || !space) {
+export const ChatCompanion = forwardRef<HTMLDivElement, ChatCompanionProps>(
+  ({ role, data }: ChatCompanionProps, forwardedRef) => {
+    const { dispatchPromise: dispatch } = useIntentDispatcher();
+    const blueprintRegistry = useBlueprintRegistry();
+    const companionTo = data.companionTo;
+
+    const space = getSpace(companionTo);
+    const [chat, setChat] = useState(data.subject === 'assistant-chat' ? undefined : data.subject);
+    useEffect(() => {
+      setChat(data.subject === 'assistant-chat' ? undefined : data.subject);
+    }, [data.subject]);
+
+    const chatQueue = space && chat ? space.queues.get(chat.queue.dxn) : undefined;
+    const binder = useContextBinder(chatQueue);
+
+    // Initialize companion chat if it doesn't exist, but don't add it to the space immediately.
+    useAsyncEffect(async () => {
+      if (!space || chat) {
         return;
       }
 
-      if (event.type === 'submit') {
-        await dispatch(
-          createIntent(SpaceAction.AddObject, {
-            object: chat,
-            target: space,
-            hidden: true,
-          }),
-        );
-        await dispatch(
-          createIntent(SpaceAction.AddRelation, {
-            space,
-            schema: Assistant.CompanionTo,
-            source: chat,
-            target: companionTo,
-          }),
-        );
-        await dispatch(
-          createIntent(AssistantAction.SetCurrentChat, {
-            companionTo,
-            chat,
-          }),
-        );
-      }
-    },
-    [chat, space, companionTo, dispatch],
-  );
-
-  const metadata = useCapabilities(Capabilities.Metadata);
-  const blueprintKeys = useMemo(
-    () =>
-      Function.pipe(
-        metadata,
-        Array.findFirst(
-          (
-            capability,
-          ): capability is {
-            id: string;
-            metadata: { blueprints?: string[] };
-          } => capability.id === Obj.getTypename(companionTo),
+      const { data } = await dispatch(createIntent(AssistantAction.CreateChat, { space }));
+      setChat(data?.object);
+    }, [chat, space]);
+
+    // Add chat to space when user submits the first message.
+    const handleEvent = useCallback(
+      async (event: ChatEvent) => {
+        const chatInSpace = !!getSpace(chat);
+        if (chatInSpace || !chat || !space) {
+          return;
+        }
+
+        if (event.type === 'submit') {
+          await dispatch(
+            createIntent(SpaceAction.AddObject, {
+              object: chat,
+              target: space,
+              hidden: true,
+            }),
+          );
+          await dispatch(
+            createIntent(SpaceAction.AddRelation, {
+              space,
+              schema: Assistant.CompanionTo,
+              source: chat,
+              target: companionTo,
+            }),
+          );
+          await dispatch(
+            createIntent(AssistantAction.SetCurrentChat, {
+              companionTo,
+              chat,
+            }),
+          );
+        }
+      },
+      [chat, space, companionTo, dispatch],
+    );
+
+    const metadata = useCapabilities(Capabilities.Metadata);
+    const blueprintKeys = useMemo(
+      () =>
+        Function.pipe(
+          metadata,
+          Array.findFirst(
+            (
+              capability,
+            ): capability is {
+              id: string;
+              metadata: { blueprints?: string[] };
+            } => capability.id === Obj.getTypename(companionTo),
+          ),
+          Option.flatMap((c) => Option.fromNullable(c.metadata.blueprints)),
+          Option.getOrElse(() => [] as string[]),
         ),
-        Option.flatMap((c) => Option.fromNullable(c.metadata.blueprints)),
-        Option.getOrElse(() => [] as string[]),
-      ),
-    [metadata, companionTo],
-  );
-  const existingBlueprints = useQuery(space, Filter.type(Blueprint.Blueprint));
-  const pluginBlueprints = useMemo(
-    () => existingBlueprints.filter((blueprint) => blueprintKeys.includes(blueprint.key)),
-    [existingBlueprints, blueprintKeys],
-  );
-
-  // Initialize related blueprints that are not already in the space.
-  useAsyncEffect(async () => {
-    if (!space) {
-      return;
-    }
-
-    // NOTE: This must be run instead of using the useQuery result to avoid duplicates.
-    const { objects: existingBlueprints } = await space.db.query(Filter.type(Blueprint.Blueprint)).run();
-    for (const key of blueprintKeys) {
-      const existingBlueprint = existingBlueprints.find((blueprint) => blueprint.key === key);
-      if (existingBlueprint) {
-        continue;
+      [metadata, companionTo],
+    );
+    const existingBlueprints = useQuery(space, Filter.type(Blueprint.Blueprint));
+    const pluginBlueprints = useMemo(
+      () => existingBlueprints.filter((blueprint) => blueprintKeys.includes(blueprint.key)),
+      [existingBlueprints, blueprintKeys],
+    );
+
+    // Initialize related blueprints that are not already in the space.
+    useAsyncEffect(async () => {
+      if (!space) {
+        return;
+      }
+
+      // NOTE: This must be run instead of using the useQuery result to avoid duplicates.
+      const existingBlueprints = await space.db.query(Filter.type(Blueprint.Blueprint)).run();
+      for (const key of blueprintKeys) {
+        const existingBlueprint = existingBlueprints.find((blueprint) => blueprint.key === key);
+        if (existingBlueprint) {
+          continue;
+        }
+
+        const blueprint = blueprintRegistry.getByKey(key);
+        if (!blueprint) {
+          continue;
+        }
+
+        space.db.add(Obj.clone(blueprint));
       }
+    }, [space, blueprintRegistry, blueprintKeys]);
 
-      const blueprint = blueprintRegistry.getByKey(key);
-      if (!blueprint) {
-        continue;
+    useAsyncEffect(async () => {
+      if (!binder?.isOpen) {
+        return;
       }
 
-      space.db.add(Obj.clone(blueprint));
-    }
-  }, [space, blueprintRegistry, blueprintKeys]);
-
-  useAsyncEffect(async () => {
-    if (!binder?.isOpen) {
-      return;
-    }
-
-    if (pluginBlueprints.length > 0) {
-      await binder.bind({
-        blueprints: pluginBlueprints.map((blueprint) => Ref.make(blueprint)),
-      });
-    }
-
-    if (Obj.instanceOf(Blueprint.Blueprint, companionTo)) {
-      await binder.bind({ blueprints: [Ref.make(companionTo)] });
-    } else {
-      await binder.bind({ objects: [Ref.make(companionTo)] });
-    }
-  }, [binder, companionTo, blueprintKeys]);
-
-  return <ChatContainer role={role} space={space} chat={chat} companionTo={companionTo} onEvent={handleEvent} />;
-};
+      if (pluginBlueprints.length > 0) {
+        await binder.bind({
+          blueprints: pluginBlueprints.map((blueprint) => Ref.make(blueprint)),
+        });
+      }
+
+      if (Obj.instanceOf(Blueprint.Blueprint, companionTo)) {
+        await binder.bind({ blueprints: [Ref.make(companionTo)] });
+      } else {
+        await binder.bind({ objects: [Ref.make(companionTo)] });
+      }
+    }, [binder, companionTo, blueprintKeys]);
+
+    return (
+      <ChatContainer
+        role={role}
+        space={space}
+        chat={chat}
+        companionTo={companionTo}
+        onEvent={handleEvent}
+        ref={forwardedRef}
+      />
+    );
+  },
+);
 
 export default ChatCompanion;

package/src/components/ChatContainer.tsx

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import React from 'react';
+import React, { forwardRef } from 'react';
 
 import { Capabilities } from '@dxos/app-framework';
 import { useCapability } from '@dxos/app-framework/react';
@@ -23,7 +23,8 @@ export type ChatContainerProps = {
   companionTo?: Obj.Any;
 } & Pick<ChatRootProps, 'onEvent'>;
 
-export const ChatContainer = ({ space: spaceProp, chat, companionTo, onEvent }: ChatContainerProps) => {
+export const ChatContainer = forwardRef<HTMLDivElement, ChatContainerProps>((props, forwardedRef) => {
+  const { space: spaceProp, chat, companionTo, onEvent } = props;
   const space = spaceProp ?? getSpace(chat);
   const settings = useCapability(Capabilities.SettingsStore).getStore<Assistant.Settings>(meta.id)?.value;
   const services = useChatServices({ space, chat });
@@ -44,7 +45,7 @@ export const ChatContainer = ({ space: spaceProp, chat, companionTo, onEvent }:
   }
 
   return (
-    <StackItem.Content toolbar>
+    <StackItem.Content toolbar ref={forwardedRef}>
       <Chat.Root space={space} chat={chat} processor={processor} onEvent={onEvent}>
         <Chat.Toolbar companionTo={companionTo} />
         <Chat.Viewport classNames='container-max-width'>
@@ -56,6 +57,6 @@ export const ChatContainer = ({ space: spaceProp, chat, companionTo, onEvent }:
       </Chat.Root>
     </StackItem.Content>
   );
-};
+});
 
 export default ChatContainer;

package/src/components/ChatPrompt/ChatOptions.tsx

@@ -12,7 +12,13 @@ import { Icon, IconButton, Popover, Select, useTranslation } from '@dxos/react-u
 import { Listbox, SearchList } from '@dxos/react-ui-searchlist';
 import { Tabs } from '@dxos/react-ui-tabs';
 
-import { useActiveBlueprints, useBlueprintHandlers, useBlueprints, useContextObjects, useItemTypes } from '../../hooks';
+import {
+  useActiveBlueprints,
+  useBlueprintHandlers,
+  useBlueprints,
+  useContextObjects,
+  useFilteredTypes,
+} from '../../hooks';
 import { meta } from '../../meta';
 
 const panelClassNames = 'is-[calc(100dvw-.5rem)] sm:is-max md:is-72 max-is-[--text-content]';
@@ -153,7 +159,7 @@ const ObjectsPanel = ({ space, context }: Pick<ChatOptionsProps, 'space' | 'cont
   const { t } = useTranslation(meta.id);
 
   // Item types sorted by label.
-  const types = useItemTypes(space);
+  const types = useFilteredTypes(space);
   const typenames = useMemo(() => {
     const typenames = types.map((type) => {
       const typename = Type.getTypename(type);

package/src/components/ChatThread/ChatThread.stories.tsx

@@ -8,7 +8,8 @@ import * as Fiber from 'effect/Fiber';
 import * as Layer from 'effect/Layer';
 import React, { type CSSProperties, useEffect, useMemo, useState } from 'react';
 
-import { ContextQueueService, DatabaseService } from '@dxos/functions';
+import { Database } from '@dxos/echo';
+import { ContextQueueService } from '@dxos/functions';
 import { faker } from '@dxos/random';
 import { useQueue, useSpace } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
@@ -29,7 +30,7 @@ import TEXT from './testing/thread.md?raw';
 
 faker.seed(1);
 
-type MessageGenerator = Effect.Effect<void, never, DatabaseService | ContextQueueService>;
+type MessageGenerator = Effect.Effect<void, never, Database.Service | ContextQueueService>;
 
 type StoryProps = { generator?: MessageGenerator[]; delay?: number; wait?: boolean } & ChatThreadProps;
 
@@ -54,7 +55,7 @@ const DefaultStory = ({ generator = [], delay = 0, wait, ...props }: StoryProps)
           }
         }
         setDone(true);
-      }).pipe(Effect.provide(Layer.mergeAll(DatabaseService.layer(space.db), ContextQueueService.layer(queue)))),
+      }).pipe(Effect.provide(Layer.mergeAll(Database.Service.layer(space.db), ContextQueueService.layer(queue)))),
     );
 
     return () => {

package/src/components/ChatThread/Link.tsx

@@ -15,9 +15,9 @@ export type ObjectLinkProps = {
 };
 
 export const ObjectLink = ({ space, dxn }: ObjectLinkProps) => {
-  const ref = useMemo(() => space.db.ref(dxn), [space, dxn.toString()]);
+  const ref = useMemo(() => space.db.makeRef(dxn), [space, dxn.toString()]);
 
-  const title = Obj.getLabel(ref.target) ?? ref.target?.id ?? ref.dxn.toString();
+  const title = (ref.target && Obj.getLabel(ref.target)) ?? ref.target?.id ?? ref.dxn.toString();
   return (
     <DxAnchor rootclassname='dx-tag--anchor' refid={dxn.toString()}>
       {title}

package/src/components/ChatThread/registry.tsx

@@ -5,13 +5,13 @@
 import React from 'react';
 
 import { log } from '@dxos/log';
+import { ToggleContainer } from '@dxos/react-ui-components';
 import {
   PromptWidget,
   ReferenceWidget,
   SelectWidget,
   SuggestionWidget,
   SummaryWidget,
-  ToggleContainer,
 } from '@dxos/react-ui-components';
 import { type XmlWidgetProps, type XmlWidgetRegistry, getXmlTextChild } from '@dxos/react-ui-editor';
 import { Json } from '@dxos/react-ui-syntax-highlighter';

package/src/components/PromptArticle.tsx

@@ -28,7 +28,7 @@ export const PromptArticle = ({ subject }: PromptArticleProps) => {
   const inputData = useMemo(
     () =>
       subject && {
-        prompt: space?.db.ref(Obj.getDXN(subject)),
+        prompt: space?.db.makeRef(Obj.getDXN(subject)),
         input: {},
       },
     [subject, space],

package/src/components/TemplateEditor/TemplateEditor.tsx

@@ -6,7 +6,7 @@ import { defaultHighlightStyle, syntaxHighlighting } from '@codemirror/language'
 import React from 'react';
 
 import { type Template } from '@dxos/blueprints';
-import { createDocAccessor } from '@dxos/react-client/echo';
+import { createDocAccessor } from '@dxos/echo-db';
 import { type ThemedClassName, useThemeContext, useTranslation } from '@dxos/react-ui';
 import {
   createBasicExtensions,

package/src/functions/object-list.ts

@@ -6,7 +6,8 @@ import * as Effect from 'effect/Effect';
 import * as Schema from 'effect/Schema';
 
 import { Filter, Obj, Query } from '@dxos/echo';
-import { DatabaseService, defineFunction } from '@dxos/functions';
+import { Database } from '@dxos/echo';
+import { defineFunction } from '@dxos/functions';
 import { trim } from '@dxos/util';
 
 // TODO(burdon): Move to toolkit (i.e., tool not function).
@@ -34,10 +35,10 @@ export default defineFunction({
   }),
   handler: Effect.fn(function* ({ data: { typename } }) {
     // TODO(wittjosiah): Typename query is not working for dynamic schemas.
-    const [schema] = yield* DatabaseService.runSchemaQuery({ typename });
+    const [schema] = yield* Database.Service.runSchemaQuery({ typename });
     const filter = schema ? Filter.type(schema) : Filter.typename(typename);
 
-    const { objects } = yield* DatabaseService.runQuery(Query.select(filter));
+    const objects = yield* Database.Service.runQuery(Query.select(filter));
     const results = objects.map((object) => ({
       dxn: Obj.getDXN(object).toString(),
       label: Obj.getLabel(object),

package/src/functions/object-load.ts

@@ -9,7 +9,8 @@ import * as Schema from 'effect/Schema';
 
 import { ArtifactId } from '@dxos/assistant';
 import { Obj } from '@dxos/echo';
-import { DatabaseService, defineFunction } from '@dxos/functions';
+import { Database } from '@dxos/echo';
+import { defineFunction } from '@dxos/functions';
 
 // TODO(burdon): Move to toolkit (i.e., tool not function).
 export default defineFunction({
@@ -25,11 +26,11 @@ export default defineFunction({
     }),
   }),
   outputSchema: Schema.Struct({
-    // TODO(wittjosiah): Type.Obj.Any | Type.Relation.Any
+    // TODO(wittjosiah): Type.Entity.Any
     object: Schema.Any,
   }),
   handler: Effect.fn(function* ({ data: { id, typename } }) {
-    const object = yield* DatabaseService.resolve(ArtifactId.toDXN(id));
+    const object = yield* Database.Service.resolve(ArtifactId.toDXN(id));
     return yield* Function.pipe(
       Option.fromNullable(object),
       Option.flatMap((object) => (Obj.getTypename(object) === typename ? Option.some(object) : Option.none())),

package/src/hooks/index.ts

@@ -8,8 +8,8 @@ export * from './useChatServices';
 export * from './useChatToolbarActions';
 export * from './useContextBinder';
 export * from './useContextObjects';
+export * from './useFilteredTypes';
 export * from './useFlush';
-export * from './useItemTypes';
 export * from './useOnline';
 export * from './usePresets';
 export * from './useReferencesProvider';

package/src/hooks/useBlueprintRegistry.ts

@@ -71,7 +71,7 @@ export const useBlueprintHandlers = ({
       }
 
       // Find existing cloned blueprint.
-      const { objects } = await space.db.query(Filter.type(Blueprint.Blueprint)).run();
+      const objects = await space.db.query(Filter.type(Blueprint.Blueprint)).run();
       let storedBlueprint = objects.find((blueprint) => blueprint.key === key);
       if (checked) {
         if (!storedBlueprint) {

package/src/hooks/useChatToolbarActions.ts

@@ -26,7 +26,7 @@ export const useChatToolbarActions = ({ chat, companionTo }: ChatToolbarActionsP
   const { dispatch } = useIntentDispatcher();
   const { space } = useChatContext('useChatToolbarActions');
   const query = companionTo
-    ? Query.select(Filter.ids(companionTo.id)).targetOf(Assistant.CompanionTo).source()
+    ? Query.select(Filter.id(companionTo.id)).targetOf(Assistant.CompanionTo).source()
     : Query.select(Filter.nothing());
 
   // TODO(wittjosiah): Query in react vs query in atom?

package/src/hooks/useContextObjects.ts

@@ -35,7 +35,7 @@ export const useContextObjects = ({
 
       // Load the object by DXN/id from the current space.
       const id = dxn.asEchoDXN();
-      const object = id && (await space.db.getObjectById(id.echoId));
+      const object = id && space.db.getObjectById(id.echoId);
       if (!object) {
         log.warn('Object not found', { dxn, id });
         return;

package/src/hooks/{useItemTypes.ts → useFilteredTypes.ts}

@@ -6,12 +6,13 @@ import * as Option from 'effect/Option';
 import { useEffect, useState } from 'react';
 
 import { type Type } from '@dxos/echo';
+import { EntityKind, SystemTypeAnnotation, getTypeAnnotation } from '@dxos/echo/internal';
 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[]>([]);
+// TODO(wittjosiah): Factor out.
+export const useFilteredTypes = (space?: Space): Type.Entity.Any[] => {
+  const [types, setTypes] = useState<Type.Entity.Any[]>([]);
   useEffect(() => {
     if (!space) {
       return;
@@ -21,9 +22,9 @@ export const useItemTypes = (space?: Space): Type.Obj.Any[] => {
       (query) => {
         const types = Array.from(
           new Set(
-            [...space.db.graph.schemaRegistry.schemas, ...query.results].filter((type) =>
-              Option.isSome(ItemAnnotation.get(type)),
-            ),
+            [...space.db.graph.schemaRegistry.schemas, ...query.results]
+              .filter((schema) => getTypeAnnotation(schema)?.kind !== EntityKind.Relation)
+              .filter((schema) => SystemTypeAnnotation.get(schema).pipe(Option.getOrElse(() => false))),
           ),
         );
 

package/src/hooks/useReferencesProvider.ts

@@ -25,11 +25,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
@@ -48,7 +48,7 @@ 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;

package/src/processor/processor.test.ts

@@ -12,7 +12,8 @@ import * as Schema from 'effect/Schema';
 import { AiService } from '@dxos/ai';
 import { AiServiceTestingPreset } from '@dxos/ai/testing';
 import { AiConversation, makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
-import { TestHelpers, acquireReleaseResource } from '@dxos/effect';
+import { acquireReleaseResource } from '@dxos/effect';
+import { TestHelpers } from '@dxos/effect/testing';
 import { CredentialsService, QueueService, TracingService } from '@dxos/functions';
 import { FunctionInvocationServiceLayerTestMocked, TestDatabaseLayer } from '@dxos/functions-runtime/testing';
 import { type Message } from '@dxos/types';

package/src/processor/processor.ts

@@ -27,10 +27,10 @@ import {
 } from '@dxos/assistant';
 import { type Blueprint } from '@dxos/blueprints';
 import { Obj } from '@dxos/echo';
+import { type Database } from '@dxos/echo';
 import { throwCause } from '@dxos/effect';
 import {
   type CredentialsService,
-  type DatabaseService,
   type FunctionInvocationService,
   type QueueService,
   type TracingService,
@@ -44,7 +44,7 @@ import { updateName } from './update-name';
 
 export type AiChatServices =
   | CredentialsService
-  | DatabaseService
+  | Database.Service
   | QueueService
   | FunctionInvocationService
   | AiService.AiService
@@ -233,7 +233,7 @@ export class AiChatProcessor {
       //   artifacts.map(async (artifact) => {
       //     const {
       //       objects: [object],
-      //     } = await space.db.query(Filter.ids(artifact.id)).run();
+      //     } = await space.db.query(Filter.id(artifact.id)).run();
       //     if (!object) {
       //       return;
       //     }

package/src/testing/test-generator.ts

@@ -5,7 +5,8 @@
 import * as Effect from 'effect/Effect';
 
 import { Obj } from '@dxos/echo';
-import { ContextQueueService, DatabaseService } from '@dxos/functions';
+import { Database } from '@dxos/echo';
+import { ContextQueueService } from '@dxos/functions';
 import { faker } from '@dxos/random';
 import { renderObjectLink } from '@dxos/react-ui-components';
 import { type Actor, type ContentBlock, Message, Organization } from '@dxos/types';
@@ -19,7 +20,7 @@ export const createMessage = (role: Actor.Role, blocks: ContentBlock.Any[]): Mes
   });
 };
 
-export type MessageGenerator = Effect.Effect<void, never, DatabaseService | ContextQueueService>;
+export type MessageGenerator = Effect.Effect<void, never, Database.Service | ContextQueueService>;
 
 export const createMessageGenerator = (): MessageGenerator[] => [
   Effect.gen(function* () {
@@ -145,7 +146,7 @@ export const createMessageGenerator = (): MessageGenerator[] => [
 
   Effect.gen(function* () {
     const { queue } = yield* ContextQueueService;
-    const { db } = yield* DatabaseService;
+    const { db } = yield* Database.Service;
     const obj1 = db.add(Obj.make(Organization.Organization, { name: 'DXOS' }));
     // const obj2 = db.add(Obj.make(Person.Person, { fullName: 'Alice' }));
     // const obj3 = db.add(Obj.make(Person.Person, { fullName: 'Bob' }));