@dxos/plugin-assistant 0.8.3-main.672df60 → 0.8.3-staging.0fa589b

package/src/capabilities/app-graph-builder.ts

@@ -13,22 +13,22 @@ import {
   type PromiseIntentDispatcher,
   type PluginContext,
 } from '@dxos/app-framework';
-import { isInstanceOf } from '@dxos/echo-schema';
+import { Blueprint } from '@dxos/assistant';
+import { Obj } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
 import { createExtension, ROOT_ID } from '@dxos/plugin-graph';
-import { rxFromQuery } from '@dxos/plugin-space';
+import { getActiveSpace, rxFromQuery } from '@dxos/plugin-space';
 import { SPACE_TYPE, SpaceAction } from '@dxos/plugin-space/types';
 import {
   type Space,
   Filter,
+  Query,
+  type QueryResult,
   fullyQualifiedId,
   getSpace,
   isSpace,
-  Query,
-  type QueryResult,
-  isEchoObject,
 } from '@dxos/react-client/echo';
 
 import { ASSISTANT_DIALOG, ASSISTANT_PLUGIN } from '../meta';
@@ -49,25 +49,9 @@ export default (context: PluginContext) =>
                 data: async () => {
                   const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
                   const client = context.getCapability(ClientCapabilities.Client);
-                  const layout = context.getCapability(Capabilities.Layout);
-                  const { graph } = context.getCapability(Capabilities.AppGraph);
-
-                  // TODO(burdon): Get space from workspace.
-                  // TODO(burdon): If need to create chat, then add to dispatch stack below.
-                  let chat: AIChatType | undefined;
-                  if (layout.active.length > 0) {
-                    const node = graph.getNode(layout.active[0]).pipe(Option.getOrNull);
-                    if (node) {
-                      const space = getSpace(node.data);
-                      if (space) {
-                        chat = await getOrCreateChat(dispatch, space);
-                      }
-                    }
-                  } else {
-                    const space = client.spaces.default;
-                    chat = await getOrCreateChat(dispatch, space);
-                  }
 
+                  const space = getActiveSpace(context) ?? client.spaces.default;
+                  const chat = await getOrCreateChat(dispatch, space);
                   if (!chat) {
                     return;
                   }
@@ -107,38 +91,66 @@ export default (context: PluginContext) =>
       id: `${ASSISTANT_PLUGIN}/object-chat-companion`,
       connector: (node) => {
         let query: QueryResult<AIChatType> | undefined;
-        return Rx.make((get) =>
+        return Rx.make((get) => {
+          const nodeOption = get(node);
+          if (Option.isNone(nodeOption)) {
+            return [];
+          }
+
+          const object = nodeOption.value.data;
+          if (!Obj.isObject(object)) {
+            return [];
+          }
+
+          const space = getSpace(object);
+          if (!space) {
+            return [];
+          }
+
+          if (!query) {
+            query = space.db.query(Query.select(Filter.ids(object.id)).targetOf(CompanionTo).source());
+          }
+
+          const chat = get(rxFromQuery(query))[0];
+          return [
+            {
+              id: [fullyQualifiedId(object), 'assistant-chat'].join(ATTENDABLE_PATH_SEPARATOR),
+              type: PLANK_COMPANION_TYPE,
+              data: chat ?? 'assistant-chat',
+              properties: {
+                label: ['assistant chat label', { ns: ASSISTANT_PLUGIN }],
+                icon: 'ph--sparkle--regular',
+                position: 'hoist',
+                disposition: 'hidden',
+              },
+            },
+          ];
+        });
+      },
+    }),
+
+    createExtension({
+      id: `${ASSISTANT_PLUGIN}/blueprint-logs`,
+      connector: (node) =>
+        Rx.make((get) =>
           pipe(
             get(node),
-            Option.flatMap((node) => (isEchoObject(node.data) ? Option.some(node.data) : Option.none())),
-            Option.flatMap((object) => {
-              const space = getSpace(object);
-              return space ? Option.some({ space, object }) : Option.none();
-            }),
-            Option.map(({ space, object }) => {
-              if (!query) {
-                query = space.db.query(Query.select(Filter.ids(object.id)).targetOf(CompanionTo).source());
-              }
-
-              const chat = get(rxFromQuery(query))[0];
-              return [
-                {
-                  id: [fullyQualifiedId(object), 'assistant-chat'].join(ATTENDABLE_PATH_SEPARATOR),
-                  type: PLANK_COMPANION_TYPE,
-                  data: chat ?? 'assistant-chat',
-                  properties: {
-                    label: ['assistant chat label', { ns: ASSISTANT_PLUGIN }],
-                    icon: 'ph--sparkle--regular',
-                    position: 'hoist',
-                    disposition: 'hidden',
-                  },
+            Option.flatMap((node) => (Obj.instanceOf(Blueprint, node.data) ? Option.some(node) : Option.none())),
+            Option.map((node) => [
+              {
+                id: [node.id, 'logs'].join(ATTENDABLE_PATH_SEPARATOR),
+                type: PLANK_COMPANION_TYPE,
+                data: 'logs',
+                properties: {
+                  label: ['blueprint logs label', { ns: ASSISTANT_PLUGIN }],
+                  icon: 'ph--clock-countdown--regular',
+                  disposition: 'hidden',
                 },
-              ];
-            }),
+              },
+            ]),
             Option.getOrElse(() => []),
           ),
-        );
-      },
+        ),
     }),
 
     createExtension({
@@ -219,15 +231,18 @@ export default (context: PluginContext) =>
 
 // TODO(burdon): Factor out.
 const getOrCreateChat = async (dispatch: PromiseIntentDispatcher, space: Space): Promise<AIChatType | undefined> => {
-  const { objects } = await space.db.query(Filter.type(AIChatType)).run();
+  // TODO(wittjosiah): This should be possible with a single query.
+  const { objects: allChats } = await space.db.query(Query.type(AIChatType)).run();
+  const { objects: relatedChats } = await space.db.query(Query.type(AIChatType).sourceOf(CompanionTo).source()).run();
+  const chats = allChats.filter((chat) => !relatedChats.includes(chat));
   // console.log('objects', JSON.stringify(objects, null, 2));
-  if (objects.length > 0) {
+  if (chats.length > 0) {
     // TODO(burdon): Is this the most recent?
-    return objects[objects.length - 1];
+    return chats[chats.length - 1];
   }
 
   const { data } = await dispatch(createIntent(AssistantAction.CreateChat, { space }));
-  invariant(isInstanceOf(AIChatType, data?.object));
+  invariant(Obj.instanceOf(AIChatType, data?.object));
   await dispatch(createIntent(SpaceAction.AddObject, { target: space, object: data.object }));
   return data.object;
 };

package/src/capabilities/capabilities.ts

@@ -4,11 +4,12 @@
 
 import { type ReadonlySignal } from '@preact/signals-core';
 
-import { type AIServiceClient } from '@dxos/ai';
+import { type AiServiceClient } from '@dxos/ai';
 import { defineCapability } from '@dxos/app-framework';
 
 import { ASSISTANT_PLUGIN } from '../meta';
 
+// TODO(burdon): Move to types to import from other plugins?
 export namespace AssistantCapabilities {
-  export const AiClient = defineCapability<ReadonlySignal<AIServiceClient>>(`${ASSISTANT_PLUGIN}/capability/ai-client`);
+  export const AiClient = defineCapability<ReadonlySignal<AiServiceClient>>(`${ASSISTANT_PLUGIN}/capability/ai-client`);
 }

package/src/capabilities/intent-resolver.ts

@@ -4,8 +4,7 @@
 
 import { Capabilities, contributes, createResolver } from '@dxos/app-framework';
 import { Blueprint } from '@dxos/assistant';
-import { createQueueDxn } from '@dxos/echo-schema';
-import { live, refFromDXN } from '@dxos/live-object';
+import { Key, Obj, Ref } from '@dxos/echo';
 
 import { AssistantAction, AIChatType } from '../types';
 
@@ -16,9 +15,9 @@ export default () => [
       intent: AssistantAction.CreateChat,
       resolve: ({ space, name }) => ({
         data: {
-          object: live(AIChatType, {
+          object: Obj.make(AIChatType, {
             name,
-            queue: refFromDXN(createQueueDxn(space.id)),
+            queue: Ref.fromDXN(space.queues.create().dxn),
           }),
         },
       }),
@@ -30,7 +29,15 @@ export default () => [
       intent: AssistantAction.CreateBlueprint,
       resolve: ({ name }) => ({
         data: {
-          object: live(Blueprint, { name, steps: [] }),
+          object: Obj.make(Blueprint, {
+            name,
+            steps: [
+              {
+                id: Key.ObjectId.random(),
+                instructions: 'You are a helpful assistant.',
+              },
+            ],
+          }),
         },
       }),
     }),

package/src/capabilities/react-surface.tsx

@@ -7,24 +7,17 @@ import React, { useEffect, useMemo } from 'react';
 
 import { Capabilities, contributes, createIntent, createSurface, useIntentDispatcher } from '@dxos/app-framework';
 import { Blueprint } from '@dxos/assistant';
-import { Obj } from '@dxos/echo';
-import { Filter, isInstanceOf, Query } from '@dxos/echo-schema';
+import { InvocationTraceContainer } from '@dxos/devtools';
+import { Filter, type Key, Obj, Query } from '@dxos/echo';
 import { SettingsStore } from '@dxos/local-storage';
 import { SpaceAction } from '@dxos/plugin-space/types';
-import {
-  type AnyLiveObject,
-  fullyQualifiedId,
-  getSpace,
-  getTypename,
-  isEchoObject,
-  type SpaceId,
-} from '@dxos/react-client/echo';
+import { fullyQualifiedId, getSpace, getTypename } from '@dxos/react-client/echo';
 import { StackItem } from '@dxos/react-ui-stack';
 
 import {
   AssistantDialog,
   AssistantSettings,
-  BlueprintEditor,
+  BlueprintContainer,
   ChatContainer,
   PromptSettings,
   TemplateContainer,
@@ -51,15 +44,16 @@ export default () =>
     createSurface({
       id: `${ASSISTANT_PLUGIN}/object-chat`,
       role: 'article',
-      filter: (data): data is { companionTo: AnyLiveObject<any>; subject: AIChatType | 'assistant-chat' } =>
-        isEchoObject(data.companionTo) && (isInstanceOf(AIChatType, data.subject) || data.subject === 'assistant-chat'),
+      filter: (data): data is { companionTo: Obj.Any; subject: AIChatType | 'assistant-chat' } =>
+        Obj.isObject(data.companionTo) &&
+        (Obj.instanceOf(AIChatType, data.subject) || data.subject === 'assistant-chat'),
       component: ({ data, role }) => {
         const { dispatch } = useIntentDispatcher();
         const associatedArtifact = useMemo(
           () => ({
             id: fullyQualifiedId(data.companionTo),
             typename: getTypename(data.companionTo) ?? 'unknown',
-            spaceId: (getSpace(data.companionTo)?.id ?? 'unknown') as SpaceId,
+            spaceId: (getSpace(data.companionTo)?.id ?? 'unknown') as Key.SpaceId,
           }),
           [data.companionTo],
         );
@@ -106,11 +100,21 @@ export default () =>
       id: `${ASSISTANT_PLUGIN}/blueprint`,
       role: 'article',
       filter: (data): data is { subject: Blueprint } => Obj.instanceOf(Blueprint, data.subject),
-      component: ({ data, role }) => (
-        <StackItem.Content role={role}>
-          <BlueprintEditor blueprint={data.subject} />
-        </StackItem.Content>
-      ),
+      component: ({ data, role }) => <BlueprintContainer role={role} blueprint={data.subject} />,
+    }),
+    createSurface({
+      id: `${ASSISTANT_PLUGIN}/companion/logs`,
+      role: 'article',
+      filter: (data): data is { companionTo: Blueprint } =>
+        Obj.instanceOf(Blueprint, data.companionTo) && data.subject === 'logs',
+      component: ({ data, role }) => {
+        const space = getSpace(data.companionTo);
+        return (
+          <StackItem.Content role={role}>
+            <InvocationTraceContainer space={space} target={data.companionTo} detailAxis='block' />
+          </StackItem.Content>
+        );
+      },
     }),
     createSurface({
       id: `${ASSISTANT_PLUGIN}/template`,

package/src/capabilities/settings.ts

@@ -5,15 +5,15 @@
 import { Capabilities, contributes } from '@dxos/app-framework';
 import { live } from '@dxos/live-object';
 
-import { ASSISTANT_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { type AssistantSettingsProps, AssistantSettingsSchema } from '../types';
 
 export default () => {
   const settings = live<AssistantSettingsProps>({});
 
   return contributes(Capabilities.Settings, {
+    prefix: meta.id,
     schema: AssistantSettingsSchema,
-    prefix: ASSISTANT_PLUGIN,
     value: settings,
   });
 };

package/src/components/AmbientDialog/AmbientDialog.stories.tsx

@@ -52,6 +52,7 @@ const meta: Meta<typeof AmbientDialog> = {
     );
   },
   decorators: [
+    // TODO(burdon): Replace with ClientPlugin.
     withClientProvider({
       config: new Config({
         runtime: {

package/src/components/BlueprintContainer.tsx

@@ -0,0 +1,148 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type EditorView } from '@codemirror/view';
+import JSON5 from 'json5';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+
+import { ToolRegistry } from '@dxos/ai';
+import { useCapability } from '@dxos/app-framework';
+import {
+  type Blueprint,
+  type BlueprintDefinition,
+  BlueprintMachine,
+  createLocalSearchTool,
+  createExaTool,
+  createGraphWriterTool,
+} from '@dxos/assistant';
+import { getSpace } from '@dxos/client/echo';
+import { DXN, Key } from '@dxos/echo';
+import { Toolbar, useTranslation } from '@dxos/react-ui';
+import { getSelectionSet, useSelectionManager } from '@dxos/react-ui-attention';
+import { StackItem, type StackItemContentProps } from '@dxos/react-ui-stack';
+
+import { BlueprintEditor } from './BlueprintEditor';
+import { AssistantCapabilities } from '../capabilities';
+import { meta } from '../meta';
+import { QueueLogger } from '../queue-logger';
+
+// TODO(burdon): Move to config.
+export const EXA_API_KEY = '9c7e17ff-0c85-4cd5-827a-8b489f139e03';
+
+// TODO(burdon): Validate.
+const parseBlueprint = (text: string): BlueprintDefinition | undefined => {
+  try {
+    const json = JSON5.parse(text);
+    const { steps } = json;
+    return { steps };
+  } catch (error) {
+    // Ignore.
+  }
+};
+
+export const BlueprintContainer = ({
+  role,
+  blueprint,
+}: Pick<StackItemContentProps, 'role'> & { blueprint: Blueprint }) => {
+  const { t } = useTranslation(meta.id);
+  const aiClient = useCapability(AssistantCapabilities.AiClient);
+  const selectionManager = useSelectionManager();
+  const [definition, setDefinition] = useState<BlueprintDefinition>();
+  useEffect(() => {
+    setDefinition({
+      steps: blueprint.steps.map(({ instructions, tools }) => ({ instructions, tools })),
+    });
+  }, [blueprint]);
+
+  const editorRef = useRef<EditorView | undefined>(undefined);
+
+  // TODO(burdon): Factor out.
+  const toolRegistry = useMemo(() => {
+    const space = getSpace(blueprint);
+    if (!space) {
+      return;
+    }
+
+    // TODO(burdon): How should the queue be created?
+    const queue = space.queues.create();
+
+    return new ToolRegistry([
+      createExaTool({ apiKey: EXA_API_KEY }),
+      createLocalSearchTool(space.db, queue),
+      createGraphWriterTool({
+        db: space.db,
+        queue,
+        schema: [], // TODO(burdon): Get schema from client/blueprint?
+        onDone: async (objects) => {
+          await queue.append(objects);
+        },
+      }),
+    ]);
+  }, [blueprint]);
+
+  const formatAndSave = useCallback((): BlueprintDefinition | undefined => {
+    if (!blueprint) {
+      return;
+    }
+
+    const text = editorRef.current?.state.doc.toString();
+    if (!text) {
+      return;
+    }
+
+    const definition = parseBlueprint(text);
+    if (!definition) {
+      return;
+    }
+
+    setDefinition(definition);
+    const formatted = JSON.stringify(definition, null, 2);
+    editorRef.current?.dispatch({
+      changes: { from: 0, to: text.length, insert: formatted },
+    });
+
+    blueprint.steps.length = 0;
+    for (const step of definition.steps) {
+      blueprint.steps.push({
+        id: Key.ObjectId.random(),
+        instructions: step.instructions,
+        tools: step.tools,
+      });
+    }
+
+    return blueprint;
+  }, [blueprint]);
+
+  // TODO(burdon): Save raw blueprint separately from parsed blueprint? (like Script).
+  const handleSave = useCallback(() => formatAndSave(), [formatAndSave]);
+
+  const handleRun = useCallback(async () => {
+    if (!aiClient?.value || !toolRegistry) {
+      return;
+    }
+
+    formatAndSave();
+
+    // Get input from selection.
+    const input = Array.from(getSelectionSet(selectionManager)).map((id) => DXN.fromLocalObjectId(id));
+    if (!input.length) {
+      return;
+    }
+
+    const machine = new BlueprintMachine(toolRegistry, blueprint).setLogger(new QueueLogger(blueprint));
+    await machine.runToCompletion({ aiClient: aiClient.value, input });
+  }, [aiClient.value, blueprint, formatAndSave, selectionManager, toolRegistry]);
+
+  return (
+    <StackItem.Content role={role} toolbar>
+      <Toolbar.Root>
+        <Toolbar.Button onClick={handleSave}>{t('button save')}</Toolbar.Button>
+        <Toolbar.Button onClick={handleRun}>{t('button run')}</Toolbar.Button>
+      </Toolbar.Root>
+      {definition && <BlueprintEditor ref={editorRef} blueprint={definition} />}
+    </StackItem.Content>
+  );
+};
+
+export default BlueprintContainer;

package/src/components/BlueprintEditor/BlueprintEditor.stories.tsx

@@ -9,7 +9,7 @@ import { type StoryObj, type Meta } from '@storybook/react';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { BlueprintEditor } from './BlueprintEditor';
-import { RESEARCH_BLUEPRINT } from '../../testing';
+import { RESEARCH_BLUEPRINT_DEFINITION } from '../../testing';
 import translations from '../../translations';
 
 const meta: Meta<typeof BlueprintEditor> = {
@@ -27,6 +27,6 @@ type Story = StoryObj<typeof BlueprintEditor>;
 
 export const Default: Story = {
   args: {
-    blueprint: RESEARCH_BLUEPRINT,
+    blueprint: RESEARCH_BLUEPRINT_DEFINITION,
   },
 };

package/src/components/BlueprintEditor/BlueprintEditor.tsx

@@ -2,39 +2,49 @@
 // Copyright 2025 DXOS.org
 //
 
-import React from 'react';
+import React, { forwardRef, useImperativeHandle } from 'react';
 
-import { Blueprint } from '@dxos/assistant';
-import { toJsonSchema } from '@dxos/echo-schema';
+import { BlueprintDefinition } from '@dxos/assistant';
+import { Type } from '@dxos/echo';
 import { useThemeContext, type ThemedClassName } from '@dxos/react-ui';
 import {
+  type EditorView,
   createBasicExtensions,
   createJsonExtensions,
   createThemeExtensions,
-  editorMonospace,
   useTextEditor,
 } from '@dxos/react-ui-editor';
 import { mx } from '@dxos/react-ui-theme';
 
 export type BlueprintEditorProps = ThemedClassName<{
-  blueprint: Blueprint;
+  blueprint: BlueprintDefinition;
 }>;
 
 // TODO(burdon): Factor out JsonEditor.
-// TODO(burdon): Make editable.
-export const BlueprintEditor = ({ classNames, blueprint }: BlueprintEditorProps) => {
-  const { themeMode } = useThemeContext();
-  const { parentRef } = useTextEditor({
-    initialValue: JSON.stringify(blueprint, null, 2),
-    extensions: [
-      createBasicExtensions({ lineWrapping: false }),
-      createThemeExtensions({ themeMode, syntaxHighlighting: true }),
-      createJsonExtensions({ schema: toJsonSchema(Blueprint, { strict: true }) }),
-      editorMonospace,
-    ],
-  });
+export const BlueprintEditor = forwardRef<EditorView | undefined, BlueprintEditorProps>(
+  ({ classNames, blueprint }, forwardedRef) => {
+    const { themeMode } = useThemeContext();
+    const { parentRef, view } = useTextEditor({
+      initialValue: JSON.stringify(blueprint, null, 2),
+      extensions: [
+        createBasicExtensions({
+          lineNumbers: true,
+          lineWrapping: false,
+          monospace: true,
+          scrollPastEnd: true,
+        }),
+        createThemeExtensions({
+          themeMode,
+          syntaxHighlighting: true,
+        }),
+        createJsonExtensions({
+          schema: Type.toJsonSchema(BlueprintDefinition, { strict: true }),
+        }),
+      ],
+    });
 
-  return (
-    <div ref={parentRef} className={mx('flex w-full pli-2 overflow-x-scroll border-x border-separator', classNames)} />
-  );
-};
+    useImperativeHandle(forwardedRef, () => view, [view]);
+
+    return <div ref={parentRef} className={mx('overflow-hidden', classNames)} />;
+  },
+);

package/src/components/BlueprintEditor/index.ts

@@ -2,6 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-import { BlueprintEditor } from './BlueprintEditor';
-
-export default BlueprintEditor;
+export * from './BlueprintEditor';

package/src/components/PromptSettings.tsx

@@ -48,7 +48,7 @@ export const PromptSettings = ({ template }: { template: TemplateType }) => {
   );
 
   return (
-    <div className='p-2 flex flex-col gap-4'>
+    <div className='flex flex-col gap-4'>
       <h2>{t('prompt rules label')}</h2>
       <Toolbar.Root>
         <Select.Root value={template.kind.include} onValueChange={handleKindChange}>

package/src/components/TemplateContainer.tsx

@@ -4,12 +4,15 @@
 
 import React from 'react';
 
-import { StackItem } from '@dxos/react-ui-stack';
+import { StackItem, type StackItemContentProps } from '@dxos/react-ui-stack';
 
 import { TemplateEditor } from './TemplateEditor';
 import { type TemplateType } from '../types';
 
-export const TemplateContainer = ({ template, role }: { template: TemplateType; role: string }) => {
+export const TemplateContainer = ({
+  role,
+  template,
+}: Pick<StackItemContentProps, 'role'> & { template: TemplateType }) => {
   return (
     <StackItem.Content role={role} classNames='container-max-width'>
       <TemplateEditor template={template} />

package/src/components/TemplateEditor/TemplateEditor.stories.tsx

@@ -8,7 +8,7 @@ import { type Meta } from '@storybook/react';
 import React, { useState } from 'react';
 
 import { createSystemPrompt } from '@dxos/artifact';
-import { live } from '@dxos/live-object';
+import { Obj } from '@dxos/echo';
 import { useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
@@ -38,7 +38,7 @@ const DefaultStory = ({ text }: TemplateEditorProps & { text: string }) => {
   const client = useClient();
   const [template] = useState(() => {
     const space = client.spaces.default;
-    return space.db.add(live(TemplateType, { source: text, kind: { include: 'manual' } }));
+    return space.db.add(Obj.make(TemplateType, { source: text, kind: { include: 'manual' } }));
   });
 
   return (

package/src/components/TemplateEditor/TemplateForm.stories.tsx

@@ -7,7 +7,7 @@ import '@dxos-theme';
 import { type Meta } from '@storybook/react';
 import React, { useState } from 'react';
 
-import { live } from '@dxos/live-object';
+import { Obj } from '@dxos/echo';
 import { useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
@@ -30,7 +30,7 @@ const DefaultStory = () => {
   const client = useClient();
   const [template] = useState(() => {
     const space = client.spaces.default;
-    return space.db.add(live(TemplateType, { source: TEMPLATE, kind: { include: 'manual' } }));
+    return space.db.add(Obj.make(TemplateType, { source: TEMPLATE, kind: { include: 'manual' } }));
   });
 
   return (