@dxos/plugin-assistant 0.8.2-main.f081794 → 0.8.2-main.fbd8ed0

package/dist/types/src/types/template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../../../src/types/template.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAe,MAAM,mBAAmB,CAAC;AAGnD,oBAAY,iBAAiB;IAC3B,KAAK,IAAI;IACT,YAAY,IAAI;IAChB,SAAS,IAAI;IACb,QAAQ,IAAI;IACZ,KAAK,IAAI;IACT,QAAQ,IAAI;IACZ,OAAO,IAAI;IACX,MAAM,IAAI;CACX;AAED,eAAO,MAAM,mBAAmB;;;;GAM/B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAEtE,eAAO,MAAM,aAAa,mEAAoE,CAAC;AAC/F,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1D,eAAO,MAAM,kBAAkB;;;;;;;;;;IAe9B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,kBAAkB,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACxE,qBAAa,YAAa,SAAQ,iBAMhC;CAAG"}
+{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../../../src/types/template.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAKhC,oBAAY,iBAAiB;IAC3B,KAAK,IAAI;IACT,YAAY,IAAI;IAChB,SAAS,IAAI;IACb,QAAQ,IAAI;IACZ,KAAK,IAAI;IACT,QAAQ,IAAI;IACZ,OAAO,IAAI;IACX,MAAM,IAAI;CACX;AAED,eAAO,MAAM,mBAAmB;;;;GAM/B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAE3E,eAAO,MAAM,aAAa,mEAAoE,CAAC;AAC/F,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAE1D,eAAO,MAAM,kBAAkB;;;;;;;;;;IAe9B,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,kBAAkB,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAC7E,qBAAa,YAAa,SAAQ,iBAMhC;CAAG"}

package/dist/types/src/types/types.d.ts

@@ -1,27 +1,27 @@
-import { S } from '@dxos/echo-schema';
+import { Schema } from 'effect';
 import { AIChatType } from './chat';
 import { TemplateType } from './template';
 export declare namespace AssistantAction {
-    const CreateChat_base: S.TaggedClass<CreateChat, "dxos.org/plugin/assistant/action/create-chat", {
-        readonly _tag: S.tag<"dxos.org/plugin/assistant/action/create-chat">;
+    const CreateChat_base: Schema.TaggedClass<CreateChat, "dxos.org/plugin/assistant/action/create-chat", {
+        readonly _tag: Schema.tag<"dxos.org/plugin/assistant/action/create-chat">;
     } & {
-        input: S.Struct<{
-            spaceId: S.optional<typeof S.String>;
-            name: S.optional<typeof S.String>;
+        input: Schema.Struct<{
+            spaceId: Schema.optional<typeof Schema.String>;
+            name: Schema.optional<typeof Schema.String>;
         }>;
-        output: S.Struct<{
+        output: Schema.Struct<{
             object: typeof AIChatType;
         }>;
     }>;
     export class CreateChat extends CreateChat_base {
     }
-    const CreateTemplate_base: S.TaggedClass<CreateTemplate, "dxos.org/plugin/assistant/action/create-template", {
-        readonly _tag: S.tag<"dxos.org/plugin/assistant/action/create-template">;
+    const CreateTemplate_base: Schema.TaggedClass<CreateTemplate, "dxos.org/plugin/assistant/action/create-template", {
+        readonly _tag: Schema.tag<"dxos.org/plugin/assistant/action/create-template">;
     } & {
-        input: S.Struct<{
-            name: S.optional<typeof S.String>;
+        input: Schema.Struct<{
+            name: Schema.optional<typeof Schema.String>;
         }>;
-        output: S.Struct<{
+        output: Schema.Struct<{
             object: typeof TemplateType;
         }>;
     }>;
@@ -29,11 +29,13 @@ export declare namespace AssistantAction {
     }
     export {};
 }
-export declare const AssistantSettingsSchema: S.mutable<S.Struct<{
-    llmProvider: S.optional<S.Literal<["edge", "ollama"]>>;
-    edgeModel: S.optional<typeof S.String>;
-    ollamaModel: S.optional<typeof S.String>;
-    customPrompts: S.optional<typeof S.Boolean>;
+export declare const LLM_PROVIDERS: readonly ["edge", "ollama", "lmstudio"];
+export declare const AssistantSettingsSchema: Schema.mutable<Schema.Struct<{
+    llmProvider: Schema.optional<Schema.Literal<["edge", "ollama", "lmstudio"]>>;
+    edgeModel: Schema.optional<typeof Schema.String>;
+    ollamaModel: Schema.optional<typeof Schema.String>;
+    lmstudioModel: Schema.optional<typeof Schema.String>;
+    customPrompts: Schema.optional<typeof Schema.Boolean>;
 }>>;
-export type AssistantSettingsProps = S.Schema.Type<typeof AssistantSettingsSchema>;
+export type AssistantSettingsProps = Schema.Schema.Type<typeof AssistantSettingsSchema>;
 //# sourceMappingURL=types.d.ts.map

package/dist/types/src/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,mBAAmB,CAAC;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG1C,yBAAiB,eAAe,CAAC;;;;;;;;;;;;IAG/B,MAAM,OAAO,UAAW,SAAQ,eAQ9B;KAAG;;;;;;;;;;;IAEL,MAAM,OAAO,cAAe,SAAQ,mBAOlC;KAAG;;CACN;AAED,eAAO,MAAM,uBAAuB;;;;;GAOnC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,uBAAuB,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG1C,yBAAiB,eAAe,CAAC;;;;;;;;;;;;IAG/B,MAAM,OAAO,UAAW,SAAQ,eAQ9B;KAAG;;;;;;;;;;;IAEL,MAAM,OAAO,cAAe,SAAQ,mBAOlC;KAAG;;CACN;AAED,eAAO,MAAM,aAAa,yCAA0C,CAAC;AAErE,eAAO,MAAM,uBAAuB;;;;;;GAQnC,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,uBAAuB,CAAC,CAAC"}

package/dist/types/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"5.7.3"}
+{"version":"5.8.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.2-main.f081794",
+  "version": "0.8.2-main.fbd8ed0",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -42,79 +42,85 @@
     "@lezer/highlight": "^1.2.1",
     "@preact/signals-core": "^1.6.0",
     "@xiechao/codemirror-lang-handlebars": "1.0.4",
-    "effect": "3.13.3",
     "jsonpointer": "^5.0.1",
     "lodash.get": "^4.4.2",
     "unified": "^11.0.0",
-    "@dxos/artifact": "0.8.2-main.f081794",
-    "@dxos/app-framework": "0.8.2-main.f081794",
-    "@dxos/assistant": "0.8.2-main.f081794",
-    "@dxos/async": "0.8.2-main.f081794",
-    "@dxos/compute": "0.8.2-main.f081794",
-    "@dxos/client": "0.8.2-main.f081794",
-    "@dxos/conductor": "0.8.2-main.f081794",
-    "@dxos/echo-db": "0.8.2-main.f081794",
-    "@dxos/context": "0.8.2-main.f081794",
-    "@dxos/echo-protocol": "0.8.2-main.f081794",
-    "@dxos/echo-schema": "0.8.2-main.f081794",
-    "@dxos/edge-client": "0.8.2-main.f081794",
-    "@dxos/effect": "0.8.2-main.f081794",
-    "@dxos/functions": "0.8.2-main.f081794",
-    "@dxos/invariant": "0.8.2-main.f081794",
-    "@dxos/keys": "0.8.2-main.f081794",
-    "@dxos/live-object": "0.8.2-main.f081794",
-    "@dxos/local-storage": "0.8.2-main.f081794",
-    "@dxos/log": "0.8.2-main.f081794",
-    "@dxos/plugin-deck": "0.8.2-main.f081794",
-    "@dxos/plugin-client": "0.8.2-main.f081794",
-    "@dxos/plugin-graph": "0.8.2-main.f081794",
-    "@dxos/plugin-inbox": "0.8.2-main.f081794",
-    "@dxos/plugin-script": "0.8.2-main.f081794",
-    "@dxos/plugin-markdown": "0.8.2-main.f081794",
-    "@dxos/plugin-sketch": "0.8.2-main.f081794",
-    "@dxos/plugin-stack": "0.8.2-main.f081794",
-    "@dxos/plugin-transcription": "0.8.2-main.f081794",
-    "@dxos/plugin-space": "0.8.2-main.f081794",
-    "@dxos/plugin-wnfs": "0.8.2-main.f081794",
-    "@dxos/react-edge-client": "0.8.2-main.f081794",
-    "@dxos/react-ui-canvas-compute": "0.8.2-main.f081794",
-    "@dxos/react-ui-canvas-editor": "0.8.2-main.f081794",
-    "@dxos/react-client": "0.8.2-main.f081794",
-    "@dxos/react-ui-components": "0.8.2-main.f081794",
-    "@dxos/react-ui-dnd": "0.8.2-main.f081794",
-    "@dxos/react-ui-editor": "0.8.2-main.f081794",
-    "@dxos/react-ui-form": "0.8.2-main.f081794",
-    "@dxos/react-ui-stack": "0.8.2-main.f081794",
-    "@dxos/react-ui-list": "0.8.2-main.f081794",
-    "@dxos/react-ui-sfx": "0.8.2-main.f081794",
-    "@dxos/schema": "0.8.2-main.f081794",
-    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.f081794",
-    "@dxos/util": "0.8.2-main.f081794"
+    "@dxos/app-framework": "0.8.2-main.fbd8ed0",
+    "@dxos/artifact": "0.8.2-main.fbd8ed0",
+    "@dxos/async": "0.8.2-main.fbd8ed0",
+    "@dxos/client": "0.8.2-main.fbd8ed0",
+    "@dxos/assistant": "0.8.2-main.fbd8ed0",
+    "@dxos/compute": "0.8.2-main.fbd8ed0",
+    "@dxos/context": "0.8.2-main.fbd8ed0",
+    "@dxos/echo": "0.8.2-main.fbd8ed0",
+    "@dxos/conductor": "0.8.2-main.fbd8ed0",
+    "@dxos/edge-client": "0.8.2-main.fbd8ed0",
+    "@dxos/echo-protocol": "0.8.2-main.fbd8ed0",
+    "@dxos/echo-db": "0.8.2-main.fbd8ed0",
+    "@dxos/echo-schema": "0.8.2-main.fbd8ed0",
+    "@dxos/effect": "0.8.2-main.fbd8ed0",
+    "@dxos/invariant": "0.8.2-main.fbd8ed0",
+    "@dxos/functions": "0.8.2-main.fbd8ed0",
+    "@dxos/keys": "0.8.2-main.fbd8ed0",
+    "@dxos/live-object": "0.8.2-main.fbd8ed0",
+    "@dxos/local-storage": "0.8.2-main.fbd8ed0",
+    "@dxos/log": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-client": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-deck": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-graph": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-markdown": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-script": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-sketch": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-inbox": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-stack": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-space": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-transcription": "0.8.2-main.fbd8ed0",
+    "@dxos/react-client": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-canvas-compute": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-wnfs": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-canvas-editor": "0.8.2-main.fbd8ed0",
+    "@dxos/react-edge-client": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-components": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-dnd": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-editor": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-sfx": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-list": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-stack": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-form": "0.8.2-main.fbd8ed0",
+    "@dxos/schema": "0.8.2-main.fbd8ed0",
+    "@dxos/util": "0.8.2-main.fbd8ed0"
   },
   "devDependencies": {
+    "@effect-rx/rx-react": "^0.34.1",
+    "@effect/platform": "0.80.12",
     "@types/lodash.get": "^4.4.7",
     "@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-main.f081794",
-    "@dxos/echo-db": "0.8.2-main.f081794",
-    "@dxos/plugin-chess": "0.8.2-main.f081794",
-    "@dxos/plugin-inbox": "0.8.2-main.f081794",
-    "@dxos/plugin-map": "0.8.2-main.f081794",
-    "@dxos/plugin-table": "0.8.2-main.f081794",
-    "@dxos/storybook-utils": "0.8.2-main.f081794",
-    "@dxos/react-ui-theme": "0.8.2-main.f081794",
-    "@dxos/random": "0.8.2-main.f081794",
-    "@dxos/react-ui": "0.8.2-main.f081794"
+    "@dxos/echo-db": "0.8.2-main.fbd8ed0",
+    "@dxos/artifact-testing": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-chess": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-inbox": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-map": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-table": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-theme": "0.8.2-main.fbd8ed0",
+    "@dxos/random": "0.8.2-main.fbd8ed0",
+    "@dxos/storybook-utils": "0.8.2-main.fbd8ed0"
   },
   "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": "0.8.2-main.f081794",
-    "@dxos/react-ui-theme": "0.8.2-main.f081794"
+    "@dxos/react-ui-theme": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui": "0.8.2-main.fbd8ed0"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -15,7 +15,7 @@ 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';
@@ -30,7 +30,7 @@ export const AssistantPlugin = () =>
     defineModule({
       id: `${meta.id}/module/settings`,
       activatesOn: Events.SetupSettings,
-      activate: AssistantSettings,
+      activate: Settings,
     }),
     defineModule({
       id: `${meta.id}/module/metadata`,

package/src/capabilities/ai-client.ts

@@ -4,7 +4,7 @@
 
 import { effect, signal } from '@preact/signals-core';
 
-import { Capabilities, contributes, type PluginsContext } from '@dxos/app-framework';
+import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
 import { type AIServiceClient, AIServiceEdgeClient, OllamaClient } from '@dxos/assistant';
 import { ClientCapabilities } from '@dxos/plugin-client';
 
@@ -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,178 +2,214 @@
 // 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 { 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 { 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, isLiveObject, parseId } from '@dxos/react-client/echo';
+import {
+  type Space,
+  Filter,
+  fullyQualifiedId,
+  getSpace,
+  isLiveObject,
+  isSpace,
+  Query,
+  type QueryResult,
+} from '@dxos/react-client/echo';
 
 import { ASSISTANT_DIALOG, ASSISTANT_PLUGIN } from '../meta';
 import { AIChatType, AssistantAction, 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',
-            },
-          },
-        },
-      ],
-    }),
-
-    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;
-
-        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',
-            },
-          },
-        ];
-      },
+              },
+            ]),
+            Option.getOrElse(() => []),
+          ),
+        ),
     }),
 
     createExtension({
       id: `${ASSISTANT_PLUGIN}/object-chat-companion`,
-      filter: (node): node is Node<AIChatType> =>
-        isLiveObject(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> => node.type === SPACE_TYPE,
-      connector: ({ node }) => {
-        const templates = memoizeQuery(node.data, Filter.schema(TemplateType));
-        return templates.length > 0
-          ? [
+      // TODO(burdon): Add to all objects?
+      connector: (node) =>
+        Rx.make((get) =>
+          pipe(
+            get(node),
+            Option.flatMap((node) =>
+              isLiveObject(node.data) && node.data.assistantChatQueue && node.data.type !== AIChatType.typename
+                ? Option.some(node)
+                : Option.none(),
+            ),
+            Option.map((node) => [
               {
-                id: `${ASSISTANT_PLUGIN}/templates`,
-                type: `${ASSISTANT_PLUGIN}/templates`,
-                data: null,
+                id: [node.id, 'assistant-chat'].join(ATTENDABLE_PATH_SEPARATOR),
+                type: PLANK_COMPANION_TYPE,
+                data: 'assistant-chat',
                 properties: {
-                  label: ['templates label', { ns: ASSISTANT_PLUGIN }],
-                  icon: 'ph--file-code--regular',
-                  space: node.data,
+                  label: ['assistant chat label', { ns: ASSISTANT_PLUGIN }],
+                  icon: 'ph--sparkle--regular',
+                  position: 'hoist',
                 },
               },
-            ]
-          : [];
+            ]),
+            Option.getOrElse(() => []),
+          ),
+        ),
+    }),
+
+    createExtension({
+      id: `${ASSISTANT_PLUGIN}/root`,
+      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 ?? ['object 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?

package/src/capabilities/index.ts

@@ -8,6 +8,6 @@ export const AiClient = lazy(() => import('./ai-client'));
 export const AppGraphBuilder = lazy(() => import('./app-graph-builder'));
 export const IntentResolver = lazy(() => import('./intent-resolver'));
 export const ReactSurface = lazy(() => import('./react-surface'));
-export const AssistantSettings = lazy(() => import('./settings'));
+export const Settings = lazy(() => import('./settings'));
 
 export * from './capabilities';