@dxos/plugin-assistant 0.8.2 → 0.8.3-main.7f5a14c

package/src/hooks/useMessageQueue.ts

@@ -5,7 +5,7 @@
 import { useMemo } from 'react';
 
 import { type Message } from '@dxos/ai';
-import { createQueueDxn } from '@dxos/echo-schema';
+import { createQueueDXN } from '@dxos/echo-schema';
 import { getSpace, useQueue } from '@dxos/react-client/echo';
 
 import { type AIChatType } from '../types';
@@ -13,8 +13,9 @@ import { type AIChatType } from '../types';
 export const useMessageQueue = (chat?: AIChatType) => {
   const space = getSpace(chat);
   const queueDxn = useMemo(() => {
+    // TODO(dmaretskyi): Chat.queue.dxn should be a valid DXN already.
     const dxn = space && chat?.queue.dxn;
-    return dxn ? createQueueDxn(space.id, dxn.parts.at(-1)) : undefined;
+    return dxn ? createQueueDXN(space.id, dxn.parts.at(-1)) : undefined;
   }, [space, chat?.queue.dxn]);
 
   return useQueue<Message>(queueDxn);

package/src/index.ts

@@ -2,6 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
+export * from './capabilities';
 export * from './components';
 export * from './meta';
 export * from './types';

package/src/parser/filter-generator.test.ts

@@ -4,7 +4,7 @@
 
 import { describe, test } from 'vitest';
 
-import { Filter } from '@dxos/echo-schema';
+import { Filter } from '@dxos/echo';
 
 import { createFilter } from './filter-generator';
 import { QueryParser } from './query-parser';

package/src/parser/filter-generator.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Filter } from '@dxos/echo-schema';
+import { Filter } from '@dxos/echo';
 
 import {
   type BinaryExpression,

package/src/stories/Prompt.stories.tsx

@@ -47,6 +47,7 @@ const meta: Meta<typeof PromptBar> = {
   parameters: {
     translations,
     layout: 'centered',
+    controls: { disable: true },
   },
 };
 

package/src/stories/Query.stories.tsx

@@ -5,18 +5,18 @@
 import '@dxos-theme';
 
 import { type Meta, type StoryObj } from '@storybook/react';
-import { Schema } from 'effect';
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { Match, Schema } from 'effect';
+import React, { useCallback, useEffect, useMemo, useRef, useState, type FC } from 'react';
 
 import { AIServiceEdgeClient, type AIServiceEdgeClientOptions } from '@dxos/ai';
 import { SpyAIService } from '@dxos/ai/testing';
 import { Events } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { localServiceEndpoints, remoteServiceEndpoints } from '@dxos/artifact-testing';
-import { BlueprintParser, BlueprintMachine, setConsolePrinter } from '@dxos/assistant';
-import { Filter, Queue, type Space } from '@dxos/client/echo';
-import { Type } from '@dxos/echo';
-import { type AnyEchoObject, create, getLabelForObject, getTypename, Ref } from '@dxos/echo-schema';
+import { BlueprintMachine, BlueprintParser, BufferedLogger, setConsolePrinter, setLogger } from '@dxos/assistant';
+import { combine } from '@dxos/async';
+import { Queue, type Space } from '@dxos/client/echo';
+import { DXN, Filter, Obj, Ref, Type } from '@dxos/echo';
 import { SelectionModel } from '@dxos/graph';
 import { log } from '@dxos/log';
 import { D3ForceGraph, type D3ForceGraphProps } from '@dxos/plugin-explorer';
@@ -26,24 +26,24 @@ import { useQueue } from '@dxos/react-client/echo';
 import { Dialog, IconButton, Toolbar, useAsyncState, useTranslation } from '@dxos/react-ui';
 import {
   matchCompletion,
-  staticCompletion,
   typeahead,
+  staticCompletion,
   type TypeaheadContext,
   type TypeaheadOptions,
 } from '@dxos/react-ui-editor';
 import { List } from '@dxos/react-ui-list';
 import { JsonFilter } from '@dxos/react-ui-syntax-highlighter';
 import { getHashColor, mx } from '@dxos/react-ui-theme';
-import { DataType, SpaceGraphModel } from '@dxos/schema';
+import { DataType, DataTypes, SpaceGraphModel } from '@dxos/schema';
 import { createObjectFactory, type TypeSpec, type ValueGenerator } from '@dxos/schema/testing';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { addTestData } from './test-data';
 import { testPlugins } from './testing';
-import { AmbientDialog, PromptBar, type PromptController, type PromptBarProps } from '../components';
+import { AmbientDialog, PromptBar, type PromptBarProps, type PromptController } from '../components';
 import { ASSISTANT_PLUGIN } from '../meta';
-import { createFilter, type Expression, QueryParser } from '../parser';
-import { RESEARCH_BLUEPRINT, createTools } from '../testing';
+import { QueryParser, createFilter, type Expression } from '../parser';
+import { createToolRegistry, RESEARCH_BLUEPRINT } from '../testing';
 import translations from '../translations';
 
 faker.seed(1);
@@ -63,6 +63,18 @@ const aiConfig: AIServiceEdgeClientOptions = {
   },
 };
 
+/**
+ * Container for a set of ephemeral research results.
+ */
+const ResearchGraph = Schema.Struct({
+  queue: Type.Ref(Queue),
+}).pipe(
+  Type.Obj({
+    typename: 'dxos.org/type/ResearchGraph',
+    version: '0.1.0',
+  }),
+);
+
 type Mode = 'graph' | 'list';
 
 type StoryProps = { mode?: Mode; spec?: TypeSpec[] } & D3ForceGraphProps;
@@ -116,8 +128,7 @@ const DefaultStory = ({ mode, spec, ...props }: StoryProps) => {
     } else {
       const queue = space.queues.create();
       return space.db.add(
-        create(ResearchGraph, {
-          // TODO(dmaretskyi): Ref.make(queue)
+        Obj.make(ResearchGraph, {
           queue: Ref.fromDXN(queue.dxn),
         }),
       );
@@ -145,30 +156,29 @@ const DefaultStory = ({ mode, spec, ...props }: StoryProps) => {
     model?.nodes
       .filter((node) => {
         try {
-          getTypename(node.data.object as AnyEchoObject);
+          Obj.getTypename(node.data.object as Obj.Any);
           return true;
         } catch {
           return false;
         }
       })
-      .map((node) => node.data.object as AnyEchoObject) ?? [];
+      .map((node) => node.data.object as Obj.Any) ?? [];
 
   //
   // AI
   //
 
   const aiClient = useMemo(() => new SpyAIService(new AIServiceEdgeClient(aiConfig)), []);
+  const tools = useMemo(
+    () => space && researchGraph && createToolRegistry(space, researchGraph.queue.dxn),
+    [space, researchGraph?.queue.dxn],
+  );
 
   const researchQueue = useQueue(researchGraph?.queue.dxn, { pollInterval: 1_000 });
 
-  const researchBlueprint = useMemo(() => {
-    if (!space || !researchGraph) {
-      return undefined;
-    }
+  const researchBlueprint = useMemo(() => BlueprintParser.create().parse(RESEARCH_BLUEPRINT), []);
 
-    const tools = createTools(space, researchGraph?.queue.dxn);
-    return BlueprintParser.create(tools).parse(RESEARCH_BLUEPRINT);
-  }, [space, researchGraph?.queue.dxn]);
+  const logger = useMemo(() => new BufferedLogger(), []);
 
   //
   // Handlers
@@ -179,17 +189,27 @@ const DefaultStory = ({ mode, spec, ...props }: StoryProps) => {
   }, [model]);
 
   const handleResearch = useCallback(async () => {
-    if (!space || !researchBlueprint) {
+    if (!space || !tools || !researchBlueprint) {
       return;
     }
 
+    const resolver = space.db.graph.createRefResolver({
+      context: {
+        space: space.db.spaceId,
+        queue: researchGraph?.queue.dxn,
+      },
+    });
+
     const selected = selection.selected.value;
+    const objects = await Promise.all(selected.map((id) => resolver.resolve(DXN.fromLocalObjectId(id))));
+    const machine = new BlueprintMachine(tools, researchBlueprint);
+    const cleanup = combine(setConsolePrinter(machine, true), setLogger(machine, logger));
+
     log.info('starting research...', { selected });
-    const { objects } = await space.db.query(Filter.ids(...selected)).run();
-    const machine = new BlueprintMachine(researchBlueprint);
-    setConsolePrinter(machine, true);
-    await machine.runToCompletion({ aiService: aiClient, input: objects });
-  }, [space, aiClient, researchBlueprint, selection]);
+    await machine.runToCompletion({ aiClient, input: objects });
+
+    cleanup();
+  }, [space, aiClient, tools, researchBlueprint, selection]);
 
   const handleGenerate = useCallback(async () => {
     if (!space) {
@@ -202,9 +222,6 @@ const DefaultStory = ({ mode, spec, ...props }: StoryProps) => {
     } else {
       await addTestData(space);
     }
-
-    // TODO(burdon): BUG: objects are not persisted unless this is called.
-    await space.db.flush({ indexes: true });
   }, [space, generator, spec]);
 
   const handleReset = useCallback(
@@ -262,6 +279,8 @@ const DefaultStory = ({ mode, spec, ...props }: StoryProps) => {
 
   const extensions = useMemo(() => [typeahead({ onComplete: handleMatch })], [handleMatch]);
 
+  const { state: flushState, handleFlush } = useFlush(space);
+
   return (
     <div className='grow grid overflow-hidden'>
       <div className={mx('grow grid overflow-hidden', !mode && 'grid-cols-[1fr_30rem]')}>
@@ -270,7 +289,7 @@ const DefaultStory = ({ mode, spec, ...props }: StoryProps) => {
         )}
 
         {showList && (
-          <div className='grow grid grid-rows-[min-content_1fr_1fr] overflow-hidden divide-y divide-separator'>
+          <div className='grow grid grid-rows-[min-content_1fr_1fr_1fr] overflow-hidden divide-y divide-separator'>
             <Toolbar.Root>
               <IconButton icon='ph--arrow-clockwise--regular' iconOnly label='refresh' onClick={handleRefresh} />
               <IconButton icon='ph--sparkle--regular' iconOnly label='research' onClick={handleResearch} />
@@ -281,13 +300,29 @@ const DefaultStory = ({ mode, spec, ...props }: StoryProps) => {
                 label='reset'
                 onClick={(event) => handleReset(event.shiftKey)}
               />
+              <IconButton
+                disabled={flushState === 'flushing'}
+                icon={Match.value(flushState).pipe(
+                  Match.when('idle', () => 'ph--floppy-disk--regular'),
+                  Match.when('flushing', () => 'ph--spinner--regular'),
+                  Match.when('flushed', () => 'ph--check--regular'),
+                  Match.exhaustive,
+                )}
+                iconOnly
+                label='flush'
+                onClick={handleFlush}
+              />
             </Toolbar.Root>
             <ItemList items={objects} />
+            <Log logger={logger} />
             <JsonFilter
               data={{
                 space: client.spaces.get().length,
                 db: space?.db.toJSON(),
-                queue: researchQueue?.toJSON(),
+                queue: {
+                  dxn: researchQueue?.dxn.toString(),
+                  objects: researchQueue?.objects.length,
+                },
                 model: model?.toJSON(),
                 selection: selection.toJSON(),
                 ast,
@@ -340,20 +375,8 @@ const createMatcher =
     }
   };
 
-/**
- * Container for a set of ephemeral research results.
- */
-const ResearchGraph = Schema.Struct({
-  queue: Ref(Queue),
-}).pipe(
-  Type.Obj({
-    typename: 'dxos.org/type/ResearchGraph',
-    version: '0.1.0',
-  }),
-);
-
 // TODO(burdon): Replace with card list.
-const ItemList = <T extends AnyEchoObject>({ items = [] }: { items?: T[] }) => {
+const ItemList = <T extends Obj.Any>({ items = [] }: { items?: T[] }) => {
   return (
     <List.Root<T> items={items}>
       {({ items }) => (
@@ -366,10 +389,12 @@ const ItemList = <T extends AnyEchoObject>({ items = [] }: { items?: T[] }) => {
               classNames='grid grid-cols-[4rem_16rem_1fr] min-h-[32px] items-center'
             >
               <div className='text-xs font-mono font-thin px-1 text-subdued'>{item.id.slice(-6)}</div>
-              <div className={mx('text-xs font-mono font-thin truncate px-1', getHashColor(getTypename(item))?.text)}>
-                {getTypename(item)}
+              <div
+                className={mx('text-xs font-mono font-thin truncate px-1', getHashColor(Obj.getTypename(item))?.text)}
+              >
+                {Obj.getTypename(item)}
               </div>
-              <List.ItemTitle>{getLabelForObject(item)}</List.ItemTitle>
+              <List.ItemTitle>{Obj.getLabel(item)}</List.ItemTitle>
             </List.Item>
           ))}
         </div>
@@ -378,6 +403,46 @@ const ItemList = <T extends AnyEchoObject>({ items = [] }: { items?: T[] }) => {
   );
 };
 
+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 };
+};
+
+const Log: FC<{ logger: BufferedLogger }> = ({ logger }) => {
+  return (
+    <div className='grow flex flex-col p-1 overflow-y-auto text-sm'>
+      {logger.messages.value.map((message, index) => (
+        <div key={index} className='text-subdued'>
+          {message}
+        </div>
+      ))}
+    </div>
+  );
+};
+
 const meta: Meta<typeof DefaultStory> = {
   title: 'plugins/plugin-assistant/Query',
   render: DefaultStory,
@@ -385,7 +450,7 @@ const meta: Meta<typeof DefaultStory> = {
     withPluginManager({
       fireEvents: [Events.SetupArtifactDefinition],
       plugins: testPlugins({
-        types: [ResearchGraph],
+        types: [...DataTypes, ResearchGraph],
         config: {
           runtime: {
             client: {
@@ -403,6 +468,7 @@ const meta: Meta<typeof DefaultStory> = {
   ],
   parameters: {
     translations,
+    controls: { disable: true },
   },
 };
 

package/src/stories/Research.stories.tsx

@@ -16,38 +16,24 @@ import { withPluginManager } from '@dxos/app-framework/testing';
 import { localServiceEndpoints, remoteServiceEndpoints } from '@dxos/artifact-testing';
 import { findRelatedSchema, researchFn, type RelatedSchema } from '@dxos/assistant';
 import { raise } from '@dxos/debug';
-import { Type, type Obj } from '@dxos/echo';
-import {
-  ATTR_RELATION_SOURCE,
-  ATTR_RELATION_TARGET,
-  create,
-  createQueueDxn,
-  getSchema,
-  getSchemaDXN,
-  getTypename,
-  isInstanceOf,
-  toJsonSchema,
-  type BaseObject,
-  Filter,
-  RelationSourceId,
-  RelationTargetId,
-} from '@dxos/echo-schema';
+import { Type, Filter, Obj, Relation } from '@dxos/echo';
+import { ATTR_RELATION_SOURCE, ATTR_RELATION_TARGET } from '@dxos/echo-schema';
 import { ConfiguredCredentialsService, FunctionExecutor, ServiceContainer, TracingService } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { ForceGraph, useGraphModel } from '@dxos/plugin-explorer';
 import { useClient } from '@dxos/react-client';
-import { getSpace, live, useQuery, useQueue, type EchoDatabase, type Live } from '@dxos/react-client/echo';
+import { getSpace, useQuery, useQueue, type EchoDatabase, type Live } from '@dxos/react-client/echo';
 import { IconButton, Input, Toolbar, useAsyncState } from '@dxos/react-ui';
 import {
   createMenuAction,
   createMenuItemGroup,
-  MenuProvider,
-  ToolbarMenu,
+  rxFromSignal,
   useMenuActions,
   type ActionGraphProps,
+  MenuProvider,
+  ToolbarMenu,
   type ToolbarMenuActionGroupProperties,
-  rxFromSignal,
 } from '@dxos/react-ui-menu';
 import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
 import { mx } from '@dxos/react-ui-theme';
@@ -73,8 +59,7 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
   const [, forceUpdate] = useState({});
 
   const client = useClient();
-  // TODO(burdon): Hook.
-  const [aiClient] = useState(
+  const aiClient = useMemo(
     () =>
       new SpyAIService(
         new AIServiceEdgeClient({
@@ -85,6 +70,7 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
           },
         }),
       ),
+    [],
   );
 
   const space = client.spaces.default;
@@ -94,7 +80,7 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
   const menuProps = useMenuActions(actionCreator);
 
   // Queue.
-  const [queueDxn, setQueueDxn] = useState<string>(() => createQueueDxn(space.id).toString());
+  const [queueDxn, setQueueDxn] = useState<string>(() => space.queues.create().dxn.toString());
   const queue = useQueue<Message>(Type.DXN.tryParse(queueDxn));
 
   // Function executor.
@@ -148,7 +134,7 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
   useEffect(() => {
     if (queue?.objects.length === 0 && !queue.isLoading && prompts.length > 0) {
       queue.append([
-        create(Message, {
+        Obj.make(Message, {
           role: 'assistant',
           content: prompts.map(
             (prompt) =>
@@ -166,7 +152,7 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
   // State.
   const objects = useQuery(space, Filter.or(...DataTypes.map((type) => Filter.type(type))));
   const messages = [
-    ...(queue?.objects.filter((item) => isInstanceOf(Message, item)) ?? []),
+    ...(queue?.objects.filter((item) => Obj.instanceOf(Message, item)) ?? []),
     ...(processor?.messages.value ?? []),
   ];
 
@@ -210,20 +196,20 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
   );
 
   // TODO(dmaretskyi): Pull in relations automatically.
-  const handleAddToGraph = useCallback(async (object: BaseObject) => {
+  const handleAddToGraph = useCallback(async (object: Obj.Any) => {
     space.db.add(instantiate(space.db, object));
     await space.db.flush({ indexes: true });
     forceUpdate({});
   }, []);
 
-  const handleResearchMore = useCallback((object: BaseObject, relatedSchema: RelatedSchema) => {
+  const handleResearchMore = useCallback((object: Obj.Any, relatedSchema: RelatedSchema) => {
     const prompt = `
       Research more about objects related to the object in terms of the by the specific relation schema:
       <object>${JSON.stringify(object, null, 2)}</object>
       <schema>
         <description>${SchemaAST.getDescriptionAnnotation(relatedSchema.schema.ast).pipe(Option.getOrElse(() => ''))}</description>
         <json>
-          ${JSON.stringify(toJsonSchema(relatedSchema.schema), null, 2)}
+          ${JSON.stringify(Type.toJsonSchema(relatedSchema.schema), null, 2)}
         </json>
       </schema>
     `;
@@ -254,7 +240,7 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
               iconOnly
               label='Clear history'
               icon='ph--trash--regular'
-              onClick={() => setQueueDxn(createQueueDxn().toString())}
+              onClick={() => setQueueDxn(space.queues.create().dxn.toString())}
             />
             <IconButton iconOnly label='Stop' icon='ph--stop--regular' onClick={() => processor?.cancel()} />
           </Input.Root>
@@ -308,20 +294,20 @@ const DefaultStory = ({ items: _items, prompts = [], ...props }: RenderProps) =>
 };
 
 type ResearchPromptsProps = {
-  object: BaseObject;
-  onResearch: (object: BaseObject, relatedSchema: RelatedSchema) => void;
+  object: Obj.Any;
+  onResearch: (object: Obj.Any, relatedSchema: RelatedSchema) => void;
 };
 
 const ResearchPrompts = ({ object, onResearch }: ResearchPromptsProps) => {
   const [relatedSchemas = []] = useAsyncState(
-    async () => findRelatedSchema(getSpace(object)!.db, getSchema(object)!),
+    async () => findRelatedSchema(getSpace(object)!.db, Obj.getSchema(object)!),
     [object],
   );
   return (
     <div>
       {relatedSchemas.map((schema) => (
         <button
-          key={getSchemaDXN(schema.schema)?.toString()}
+          key={Type.getDXN(schema.schema)?.toString()}
           onClick={() => onResearch(object, schema)}
           className='border border-separator rounded px-2 py-1 m-1'
         >
@@ -342,7 +328,7 @@ const createResearchTool = (serviceContainer: ServiceContainer, name: string, fn
         serviceContainer.clone().setServices({
           tracing: {
             write: (event) => {
-              if (isInstanceOf(AgentStatusReport, event)) {
+              if (Obj.instanceOf(AgentStatusReport, event)) {
                 log.info('[too] report status', { status: event });
                 reportStatus?.(event);
               }
@@ -352,7 +338,7 @@ const createResearchTool = (serviceContainer: ServiceContainer, name: string, fn
       );
 
       reportStatus?.(
-        create(AgentStatusReport, {
+        Obj.make(AgentStatusReport, {
           message: 'Researching...',
         }),
       );
@@ -382,7 +368,7 @@ const createResearchTool = (serviceContainer: ServiceContainer, name: string, fn
 // TODO(dmaretskyi): Move into core.
 const instantiate = (db: EchoDatabase, object: unknown): Live<any> => {
   const schema =
-    db.graph.schemaRegistry.getSchemaByDXN(Type.DXN.parse(getTypename(object as any)!)) ??
+    db.graph.schemaRegistry.getSchemaByDXN(Type.DXN.parse(Obj.getTypename(object as any)!)) ??
     raise(new Error('Schema not found'));
 
   let { id, [ATTR_RELATION_SOURCE]: source, [ATTR_RELATION_TARGET]: target, ...props } = object as any;
@@ -393,11 +379,11 @@ const instantiate = (db: EchoDatabase, object: unknown): Live<any> => {
     target = db.getObjectById(Type.DXN.parse(target).asEchoDXN()!.echoId) ?? raise(new Error('Target not found'));
   }
 
-  return live(schema, {
+  return Relation.make(schema, {
     id,
     ...props,
-    [RelationSourceId]: source,
-    [RelationTargetId]: target,
+    [Relation.Source]: source,
+    [Relation.Target]: target,
   });
 };
 
@@ -476,6 +462,7 @@ const meta: Meta<typeof DefaultStory> = {
   ],
   parameters: {
     translations,
+    controls: { disable: true },
   },
 };
 

package/src/stories/test-data.ts

@@ -3,7 +3,7 @@
 //
 
 import { type Live, type Space } from '@dxos/client/echo';
-import { create, getSchemaTypename, RelationSourceId, RelationTargetId } from '@dxos/echo-schema';
+import { Obj, Type, Relation } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 import { DataType } from '@dxos/schema';
 
@@ -41,8 +41,8 @@ const people: DataType.Person[] = [
 ];
 
 const testObjects: Record<string, any[]> = {
-  [getSchemaTypename(DataType.Organization)!]: organizations,
-  [getSchemaTypename(DataType.Person)!]: people,
+  [Type.getTypename(DataType.Organization)!]: organizations,
+  [Type.getTypename(DataType.Person)!]: people,
 };
 
 const testRelationships: Record<
@@ -52,7 +52,7 @@ const testRelationships: Record<
     target: string;
   } & Record<string, any>)[]
 > = {
-  [getSchemaTypename(DataType.Employer)!]: [
+  [Type.getTypename(DataType.Employer)!]: [
     // @eslint-disable-next-line
     { source: 'rich_burdon', target: 'dxos' },
     { source: 'rich_burdon', target: 'google', active: false }, // TODO(burdon): Should not contribute to force.
@@ -75,7 +75,7 @@ const testRelationships: Record<
   ],
 
   // TODO(burdon): Limit graph view to selected relationship types.
-  [getSchemaTypename(DataType.HasConnection)!]: [
+  [Type.getTypename(DataType.HasConnection)!]: [
     //
     { kind: 'partner', source: 'dxos', target: 'ink_and_switch' },
     { kind: 'partner', source: 'dxos', target: 'effectful' },
@@ -100,7 +100,7 @@ export const addTestData = async (space: Space): Promise<void> => {
     const schema = space.db.graph.schemaRegistry.getSchema(typename);
     invariant(schema, `Schema not found: ${typename}`);
     for (const { id, ...data } of objects) {
-      const object = space.db.add(create(schema, data));
+      const object = space.db.add(Obj.make(schema, data));
       objectMap.set(id, object);
     }
   }
@@ -116,11 +116,11 @@ export const addTestData = async (space: Space): Promise<void> => {
       invariant(targetObject, `Target object not found: ${target}`);
 
       space.db.add(
-        create(schema, {
+        Obj.make(schema, {
           ...data,
           // TODO(burdon): Test source/target types match.
-          [RelationSourceId]: sourceObject,
-          [RelationTargetId]: targetObject,
+          [Relation.Source]: sourceObject,
+          [Relation.Target]: targetObject,
         }),
       );
     }

package/src/stories/testing.ts

@@ -20,11 +20,7 @@ import { type IndexConfig } from '@dxos/protocols/proto/dxos/echo/indexing';
 import { Config } from '@dxos/react-client';
 import { DataTypes } from '@dxos/schema';
 
-type TestPluginsOptions = {
-  config?: ConfigProto;
-  types?: Schema.Schema.AnyNoContext[];
-  indexConfig?: IndexConfig;
-};
+type TestPluginsOptions = { config?: ConfigProto; types?: Schema.Schema.AnyNoContext[]; indexConfig?: IndexConfig };
 
 export const testPlugins = ({ config, types = DataTypes, indexConfig }: TestPluginsOptions = {}) => [
   ClientPlugin({

package/src/testing/index.ts

@@ -2,6 +2,6 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './blueprint';
+export * from './test-blueprint';
 export * from './test-functions';
 export * from './test-services';