@dxos/plugin-assistant 0.8.2-staging.7ac8446 → 0.8.3-main.672df60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.2-staging.7ac8446",
+  "version": "0.8.3-main.672df60",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -40,81 +40,99 @@
     "@codemirror/state": "^6.4.1",
     "@codemirror/view": "^6.34.1",
     "@lezer/highlight": "^1.2.1",
-    "@preact/signals-core": "^1.6.0",
+    "@preact-signals/safe-react": "^0.9.0",
+    "@preact/signals-core": "^1.9.0",
     "@xiechao/codemirror-lang-handlebars": "1.0.4",
-    "effect": "3.13.3",
+    "exa-js": "^1.5.12",
     "jsonpointer": "^5.0.1",
-    "lodash.get": "^4.4.2",
+    "lodash.defaultsdeep": "^4.6.1",
     "unified": "^11.0.0",
-    "@dxos/app-framework": "0.8.2-staging.7ac8446",
-    "@dxos/artifact": "0.8.2-staging.7ac8446",
-    "@dxos/async": "0.8.2-staging.7ac8446",
-    "@dxos/assistant": "0.8.2-staging.7ac8446",
-    "@dxos/client": "0.8.2-staging.7ac8446",
-    "@dxos/context": "0.8.2-staging.7ac8446",
-    "@dxos/compute": "0.8.2-staging.7ac8446",
-    "@dxos/echo-db": "0.8.2-staging.7ac8446",
-    "@dxos/conductor": "0.8.2-staging.7ac8446",
-    "@dxos/echo-protocol": "0.8.2-staging.7ac8446",
-    "@dxos/echo-schema": "0.8.2-staging.7ac8446",
-    "@dxos/edge-client": "0.8.2-staging.7ac8446",
-    "@dxos/functions": "0.8.2-staging.7ac8446",
-    "@dxos/effect": "0.8.2-staging.7ac8446",
-    "@dxos/invariant": "0.8.2-staging.7ac8446",
-    "@dxos/keys": "0.8.2-staging.7ac8446",
-    "@dxos/live-object": "0.8.2-staging.7ac8446",
-    "@dxos/local-storage": "0.8.2-staging.7ac8446",
-    "@dxos/log": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-client": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-deck": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-inbox": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-graph": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-markdown": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-script": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-sketch": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-space": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-stack": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-transcription": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-wnfs": "0.8.2-staging.7ac8446",
-    "@dxos/react-edge-client": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-canvas-compute": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-canvas-editor": "0.8.2-staging.7ac8446",
-    "@dxos/react-client": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-dnd": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-editor": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-form": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-components": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-list": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-sfx": "0.8.2-staging.7ac8446",
-    "@dxos/schema": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-syntax-highlighter": "0.8.2-staging.7ac8446",
-    "@dxos/util": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-stack": "0.8.2-staging.7ac8446"
+    "@dxos/ai": "0.8.3-main.672df60",
+    "@dxos/app-framework": "0.8.3-main.672df60",
+    "@dxos/assistant": "0.8.3-main.672df60",
+    "@dxos/artifact": "0.8.3-main.672df60",
+    "@dxos/client": "0.8.3-main.672df60",
+    "@dxos/compute": "0.8.3-main.672df60",
+    "@dxos/async": "0.8.3-main.672df60",
+    "@dxos/conductor": "0.8.3-main.672df60",
+    "@dxos/context": "0.8.3-main.672df60",
+    "@dxos/debug": "0.8.3-main.672df60",
+    "@dxos/config": "0.8.3-main.672df60",
+    "@dxos/echo": "0.8.3-main.672df60",
+    "@dxos/echo-db": "0.8.3-main.672df60",
+    "@dxos/echo-schema": "0.8.3-main.672df60",
+    "@dxos/echo-protocol": "0.8.3-main.672df60",
+    "@dxos/effect": "0.8.3-main.672df60",
+    "@dxos/edge-client": "0.8.3-main.672df60",
+    "@dxos/functions": "0.8.3-main.672df60",
+    "@dxos/graph": "0.8.3-main.672df60",
+    "@dxos/live-object": "0.8.3-main.672df60",
+    "@dxos/keys": "0.8.3-main.672df60",
+    "@dxos/invariant": "0.8.3-main.672df60",
+    "@dxos/log": "0.8.3-main.672df60",
+    "@dxos/plugin-client": "0.8.3-main.672df60",
+    "@dxos/plugin-deck": "0.8.3-main.672df60",
+    "@dxos/local-storage": "0.8.3-main.672df60",
+    "@dxos/plugin-inbox": "0.8.3-main.672df60",
+    "@dxos/plugin-graph": "0.8.3-main.672df60",
+    "@dxos/plugin-preview": "0.8.3-main.672df60",
+    "@dxos/plugin-script": "0.8.3-main.672df60",
+    "@dxos/plugin-sketch": "0.8.3-main.672df60",
+    "@dxos/plugin-explorer": "0.8.3-main.672df60",
+    "@dxos/plugin-stack": "0.8.3-main.672df60",
+    "@dxos/plugin-transcription": "0.8.3-main.672df60",
+    "@dxos/plugin-space": "0.8.3-main.672df60",
+    "@dxos/plugin-markdown": "0.8.3-main.672df60",
+    "@dxos/plugin-wnfs": "0.8.3-main.672df60",
+    "@dxos/protocols": "0.8.3-main.672df60",
+    "@dxos/react-edge-client": "0.8.3-main.672df60",
+    "@dxos/react-client": "0.8.3-main.672df60",
+    "@dxos/react-ui-canvas-compute": "0.8.3-main.672df60",
+    "@dxos/react-ui-canvas-editor": "0.8.3-main.672df60",
+    "@dxos/react-ui-dnd": "0.8.3-main.672df60",
+    "@dxos/react-ui-editor": "0.8.3-main.672df60",
+    "@dxos/react-ui-form": "0.8.3-main.672df60",
+    "@dxos/react-ui-components": "0.8.3-main.672df60",
+    "@dxos/react-ui-graph": "0.8.3-main.672df60",
+    "@dxos/react-ui-list": "0.8.3-main.672df60",
+    "@dxos/react-ui-sfx": "0.8.3-main.672df60",
+    "@dxos/schema": "0.8.3-main.672df60",
+    "@dxos/react-ui-stack": "0.8.3-main.672df60",
+    "@dxos/util": "0.8.3-main.672df60",
+    "@dxos/react-ui-syntax-highlighter": "0.8.3-main.672df60"
   },
   "devDependencies": {
-    "@types/lodash.get": "^4.4.7",
+    "@effect-rx/rx-react": "^0.34.1",
+    "@effect/platform": "0.80.12",
+    "@types/lodash.defaultsdeep": "^4.6.6",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
+    "effect": "3.14.21",
     "openapi-types": "^12.1.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/artifact-testing": "0.8.2-staging.7ac8446",
-    "@dxos/echo-db": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-chess": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-inbox": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-table": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-map": "0.8.2-staging.7ac8446",
-    "@dxos/random": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-theme": "0.8.2-staging.7ac8446",
-    "@dxos/storybook-utils": "0.8.2-staging.7ac8446"
+    "@dxos/echo-db": "0.8.3-main.672df60",
+    "@dxos/artifact-testing": "0.8.3-main.672df60",
+    "@dxos/plugin-chess": "0.8.3-main.672df60",
+    "@dxos/plugin-inbox": "0.8.3-main.672df60",
+    "@dxos/plugin-map": "0.8.3-main.672df60",
+    "@dxos/plugin-markdown": "0.8.3-main.672df60",
+    "@dxos/plugin-table": "0.8.3-main.672df60",
+    "@dxos/random": "0.8.3-main.672df60",
+    "@dxos/react-ui": "0.8.3-main.672df60",
+    "@dxos/react-ui-menu": "0.8.3-main.672df60",
+    "@dxos/react-ui-theme": "0.8.3-main.672df60",
+    "@dxos/storybook-utils": "0.8.3-main.672df60"
   },
   "peerDependencies": {
+    "@effect-rx/rx-react": "^0.34.1",
+    "@effect/platform": "0.80.12",
+    "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui-theme": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui": "0.8.2-staging.7ac8446"
+    "@dxos/react-ui": "0.8.3-main.672df60",
+    "@dxos/react-ui-theme": "0.8.3-main.672df60"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -11,14 +11,16 @@ import {
   definePlugin,
   Events,
 } from '@dxos/app-framework';
+import { Blueprint } from '@dxos/assistant';
+import { getSchemaTypename } from '@dxos/echo-schema';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
 import { SpaceCapabilities } from '@dxos/plugin-space';
 import { defineObjectForm } from '@dxos/plugin-space/types';
 
-import { AiClient, AppGraphBuilder, IntentResolver, ReactSurface, AssistantSettings } from './capabilities';
+import { AiClient, AppGraphBuilder, IntentResolver, ReactSurface, Settings } from './capabilities';
 import { meta } from './meta';
 import translations from './translations';
-import { AssistantAction, AIChatType, ServiceType, TemplateType } from './types';
+import { AssistantAction, AIChatType, ServiceType, TemplateType, CompanionTo } from './types';
 
 export const AssistantPlugin = () =>
   definePlugin(meta, [
@@ -30,20 +32,20 @@ export const AssistantPlugin = () =>
     defineModule({
       id: `${meta.id}/module/settings`,
       activatesOn: Events.SetupSettings,
-      activate: AssistantSettings,
+      activate: Settings,
     }),
     defineModule({
       id: `${meta.id}/module/metadata`,
       activatesOn: Events.SetupMetadata,
       activate: () => [
         contributes(Capabilities.Metadata, {
-          id: TemplateType.typename,
+          id: getSchemaTypename(Blueprint)!,
           metadata: {
-            icon: 'ph--code-block--regular',
+            icon: 'ph--blueprint--regular',
           },
         }),
         contributes(Capabilities.Metadata, {
-          id: AIChatType.typename,
+          id: getSchemaTypename(AIChatType)!,
           metadata: {
             icon: 'ph--atom--regular',
           },
@@ -58,15 +60,14 @@ export const AssistantPlugin = () =>
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
             objectSchema: AIChatType,
-            getIntent: (_, options) => createIntent(AssistantAction.CreateChat, { spaceId: options.space.id }),
+            getIntent: (_, options) => createIntent(AssistantAction.CreateChat, { space: options.space }),
           }),
         ),
         contributes(
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
-            objectSchema: TemplateType,
-            hidden: true,
-            getIntent: () => createIntent(AssistantAction.CreateTemplate),
+            objectSchema: Blueprint,
+            getIntent: () => createIntent(AssistantAction.CreateBlueprint),
           }),
         ),
       ],
@@ -74,7 +75,7 @@ export const AssistantPlugin = () =>
     defineModule({
       id: `${meta.id}/module/schema`,
       activatesOn: ClientEvents.SetupSchema,
-      activate: () => contributes(ClientCapabilities.Schema, [ServiceType, TemplateType]),
+      activate: () => contributes(ClientCapabilities.Schema, [ServiceType, TemplateType, CompanionTo]),
     }),
     defineModule({
       id: `${meta.id}/module/app-graph-builder`,

package/src/capabilities/ai-client.ts

@@ -4,8 +4,8 @@
 
 import { effect, signal } from '@preact/signals-core';
 
-import { Capabilities, contributes, type PluginsContext } from '@dxos/app-framework';
-import { type AIServiceClient, AIServiceEdgeClient, OllamaClient } from '@dxos/assistant';
+import { type AIServiceClient, AIServiceEdgeClient, OllamaClient } from '@dxos/ai';
+import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
 import { ClientCapabilities } from '@dxos/plugin-client';
 
 import { AssistantCapabilities } from './capabilities';
@@ -15,16 +15,15 @@ import { type AssistantSettingsProps } from '../types';
 // TODO(wittjosiah): Factor out.
 const DEFAULT_AI_SERVICE_URL = 'http://localhost:8788';
 
-export default (context: PluginsContext) => {
-  const client = context.requestCapability(ClientCapabilities.Client);
+export default (context: PluginContext) => {
+  const client = context.getCapability(ClientCapabilities.Client);
   const endpoint = client.config.values.runtime?.services?.ai?.server ?? DEFAULT_AI_SERVICE_URL;
 
   const ai = signal<AIServiceClient>(new AIServiceEdgeClient({ endpoint }));
 
   const unsubscribe = effect(() => {
-    // TODO(burdon): Could be undefined.
     const settings = context
-      .requestCapability(Capabilities.SettingsStore)
+      .getCapability(Capabilities.SettingsStore)
       .getStore<AssistantSettingsProps>(ASSISTANT_PLUGIN)?.value;
 
     if (settings?.llmProvider === 'ollama') {

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

@@ -2,194 +2,232 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Rx } from '@effect-rx/rx-react';
+import { Option, pipe } from 'effect';
+
 import {
   Capabilities,
   contributes,
   createIntent,
   LayoutAction,
   type PromiseIntentDispatcher,
-  type PluginsContext,
+  type PluginContext,
 } from '@dxos/app-framework';
+import { isInstanceOf } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { ClientCapabilities } from '@dxos/plugin-client';
-import { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR, DECK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
-import { createExtension, type Node, ROOT_ID } from '@dxos/plugin-graph';
-import { memoizeQuery } from '@dxos/plugin-space';
-import { SpaceAction } from '@dxos/plugin-space/types';
+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 { SPACE_TYPE, SpaceAction } from '@dxos/plugin-space/types';
 import {
   type Space,
   Filter,
   fullyQualifiedId,
   getSpace,
   isSpace,
-  isReactiveObject,
-  parseId,
+  Query,
+  type QueryResult,
+  isEchoObject,
 } from '@dxos/react-client/echo';
 
 import { ASSISTANT_DIALOG, ASSISTANT_PLUGIN } from '../meta';
-import { AIChatType, AssistantAction, TemplateType } from '../types';
+import { AIChatType, AssistantAction, CompanionTo, TemplateType } from '../types';
 
-export default (context: PluginsContext) =>
+export default (context: PluginContext) =>
   contributes(Capabilities.AppGraphBuilder, [
     createExtension({
       id: `${ASSISTANT_PLUGIN}/assistant`,
-      filter: (node): node is Node<null> => node.id === ROOT_ID,
-      actions: () => [
-        {
-          id: `${LayoutAction.UpdateDialog._tag}/assistant/open`,
-          data: async () => {
-            const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
-            const client = context.requestCapability(ClientCapabilities.Client);
-            const layout = context.requestCapability(Capabilities.Layout);
-            const { graph } = context.requestCapability(Capabilities.AppGraph);
+      actions: (node) =>
+        Rx.make((get) =>
+          pipe(
+            get(node),
+            Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
+            Option.map(() => [
+              {
+                id: `${LayoutAction.UpdateDialog._tag}/assistant/open`,
+                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.findNode(layout.active[0]);
-              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);
-            }
+                  // 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);
+                  }
 
-            if (!chat) {
-              return;
-            }
+                  if (!chat) {
+                    return;
+                  }
 
-            await dispatch(
-              createIntent(LayoutAction.UpdateDialog, {
-                part: 'dialog',
-                subject: ASSISTANT_DIALOG,
-                options: {
-                  state: true,
-                  blockAlign: 'end',
-                  props: {
-                    chat,
+                  await dispatch(
+                    createIntent(LayoutAction.UpdateDialog, {
+                      part: 'dialog',
+                      subject: ASSISTANT_DIALOG,
+                      options: {
+                        state: true,
+                        blockAlign: 'end',
+                        props: {
+                          chat,
+                        },
+                      },
+                    }),
+                  );
+                },
+                properties: {
+                  label: ['open assistant label', { ns: ASSISTANT_PLUGIN }],
+                  icon: 'ph--sparkle--regular',
+                  disposition: 'pin-end',
+                  position: 'hoist',
+                  keyBinding: {
+                    macos: 'shift+meta+k',
+                    windows: 'shift+ctrl+k',
                   },
                 },
-              }),
-            );
-          },
-          properties: {
-            label: ['open assistant label', { ns: ASSISTANT_PLUGIN }],
-            icon: 'ph--star-four--regular',
-            disposition: 'pin-end',
-            position: 'hoist',
-            keyBinding: {
-              macos: 'shift+meta+k',
-              windows: 'shift+ctrl+k',
-            },
-          },
-        },
-      ],
+              },
+            ]),
+            Option.getOrElse(() => []),
+          ),
+        ),
     }),
 
     createExtension({
-      id: `${ASSISTANT_PLUGIN}/service-registry`,
-      filter: (node): node is Node<null> => node.id === 'root',
-      connector: ({ node }) => {
-        const layout = context.requestCapability(Capabilities.Layout);
-        const client = context.requestCapability(ClientCapabilities.Client);
-        const { spaceId } = parseId(layout.workspace);
-        const space = spaceId ? client.spaces.get(spaceId) : null;
+      id: `${ASSISTANT_PLUGIN}/object-chat-companion`,
+      connector: (node) => {
+        let query: QueryResult<AIChatType> | undefined;
+        return 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());
+              }
 
-        return [
-          {
-            id: [node.id, 'service-registry'].join(ATTENDABLE_PATH_SEPARATOR),
-            type: DECK_COMPANION_TYPE,
-            data: space,
-            properties: {
-              label: ['service registry label', { ns: ASSISTANT_PLUGIN }],
-              icon: 'ph--plugs--regular',
-              disposition: 'hidden',
-            },
-          },
-        ];
+              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.getOrElse(() => []),
+          ),
+        );
       },
     }),
 
-    createExtension({
-      id: `${ASSISTANT_PLUGIN}/object-chat-companion`,
-      filter: (node): node is Node<AIChatType> =>
-        isReactiveObject(node.data) && node.data.assistantChatQueue && node.data.type !== AIChatType.typename,
-      connector: ({ node }) => [
-        {
-          id: [node.id, 'assistant-chat'].join(ATTENDABLE_PATH_SEPARATOR),
-          type: PLANK_COMPANION_TYPE,
-          data: 'assistant-chat',
-          properties: {
-            label: ['assistant chat label', { ns: ASSISTANT_PLUGIN }],
-            icon: 'ph--star-four--regular',
-            position: 'hoist',
-          },
-        },
-      ],
-    }),
-
     createExtension({
       id: `${ASSISTANT_PLUGIN}/root`,
-      filter: (node): node is Node<Space> => isSpace(node.data),
-      connector: ({ node }) => {
-        const templates = memoizeQuery(node.data, Filter.schema(TemplateType));
-        return templates.length > 0
-          ? [
-              {
-                id: `${ASSISTANT_PLUGIN}/templates`,
-                type: `${ASSISTANT_PLUGIN}/templates`,
-                data: null,
-                properties: {
-                  label: ['templates label', { ns: ASSISTANT_PLUGIN }],
-                  icon: 'ph--file-code--regular',
-                  space: node.data,
-                },
-              },
-            ]
-          : [];
+      connector: (node) => {
+        let query: QueryResult<TemplateType> | undefined;
+        return Rx.make((get) =>
+          pipe(
+            get(node),
+            Option.flatMap((node) =>
+              node.type === SPACE_TYPE && isSpace(node.data) ? Option.some(node.data) : Option.none(),
+            ),
+            Option.map((space) => {
+              if (!query) {
+                query = space.db.query(Query.type(TemplateType));
+              }
+
+              const templates = get(rxFromQuery(query));
+              return templates.length > 0
+                ? [
+                    {
+                      id: `${ASSISTANT_PLUGIN}/templates`,
+                      type: `${ASSISTANT_PLUGIN}/templates`,
+                      data: null,
+                      properties: {
+                        label: ['templates label', { ns: ASSISTANT_PLUGIN }],
+                        icon: 'ph--file-code--regular',
+                        space,
+                      },
+                    },
+                  ]
+                : [];
+            }),
+            Option.getOrElse(() => []),
+          ),
+        );
       },
     }),
 
     createExtension({
       id: `${ASSISTANT_PLUGIN}/templates`,
-      filter: (node): node is Node<null, { space: Space }> => node.id === `${ASSISTANT_PLUGIN}/templates`,
-      connector: ({ node }) => {
-        const templates = memoizeQuery(node.properties.space, Filter.schema(TemplateType));
-        return templates
-          .toSorted((a, b) => {
-            const nameA = a.name ?? '';
-            const nameB = b.name ?? '';
-            return nameA.localeCompare(nameB);
-          })
-          .map((template) => ({
-            id: fullyQualifiedId(template),
-            type: `${ASSISTANT_PLUGIN}/template`,
-            data: template,
-            properties: {
-              label: template.name ?? ['template title placeholder', { ns: ASSISTANT_PLUGIN }],
-              icon: 'ph--file-code--regular',
-            },
-          }));
+      connector: (node) => {
+        let query: QueryResult<TemplateType> | undefined;
+        return Rx.make((get) =>
+          pipe(
+            get(node),
+            Option.flatMap((node) =>
+              node.id === `${ASSISTANT_PLUGIN}/templates` && isSpace(node.properties.space)
+                ? Option.some(node.properties.space)
+                : Option.none(),
+            ),
+            Option.map((space) => {
+              if (!query) {
+                query = space.db.query(Query.type(TemplateType));
+              }
+              return get(rxFromQuery(query))
+                .toSorted((a, b) => {
+                  const nameA = a.name ?? '';
+                  const nameB = b.name ?? '';
+                  return nameA.localeCompare(nameB);
+                })
+                .map((template) => ({
+                  id: fullyQualifiedId(template),
+                  type: `${ASSISTANT_PLUGIN}/template`,
+                  data: template,
+                  properties: {
+                    label: template.name ?? ['object placeholder', { ns: ASSISTANT_PLUGIN }],
+                    icon: 'ph--file-code--regular',
+                  },
+                }));
+            }),
+            Option.getOrElse(() => []),
+          ),
+        );
       },
     }),
   ]);
 
 // TODO(burdon): Factor out.
 const getOrCreateChat = async (dispatch: PromiseIntentDispatcher, space: Space): Promise<AIChatType | undefined> => {
-  const { objects } = await space.db.query(Filter.schema(AIChatType)).run();
+  const { objects } = await space.db.query(Filter.type(AIChatType)).run();
   // console.log('objects', JSON.stringify(objects, null, 2));
   if (objects.length > 0) {
     // TODO(burdon): Is this the most recent?
     return objects[objects.length - 1];
   }
 
-  const { data } = await dispatch(createIntent(AssistantAction.CreateChat, { spaceId: space.id }));
-  invariant(data?.object instanceof AIChatType);
+  const { data } = await dispatch(createIntent(AssistantAction.CreateChat, { space }));
+  invariant(isInstanceOf(AIChatType, data?.object));
   await dispatch(createIntent(SpaceAction.AddObject, { target: space, object: data.object }));
   return data.object;
 };