@dxos/plugin-assistant 0.8.1-staging.391c573 → 0.8.1-staging.9eaf14f

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

@@ -2,9 +2,10 @@ declare const _default: {
     'en-US': {
         [x: string]: {
             'typename label': string;
-            'chat title placeholder'?: undefined;
-            'template title placeholder'?: undefined;
+            'object name placeholder': string;
+            'templates label'?: undefined;
             'open ambient chat label'?: undefined;
+            'assistant chat label'?: undefined;
             'plugin name'?: undefined;
             'object placeholder'?: undefined;
             'create object label'?: undefined;
@@ -13,6 +14,8 @@ declare const _default: {
             'command placeholder'?: undefined;
             'template placeholder'?: undefined;
             'value placeholder'?: undefined;
+            'typename placeholder'?: undefined;
+            'description placeholder'?: undefined;
             'select preset template placeholder'?: undefined;
             'service registry label'?: undefined;
             'assistant dialog title'?: undefined;
@@ -22,13 +25,15 @@ declare const _default: {
             'prompt placeholder'?: undefined;
             'microphone button'?: undefined;
             'cancel processing button'?: undefined;
+            'settings default label'?: undefined;
             'settings custom prompts label'?: undefined;
-            'settings llm model label'?: undefined;
-            'settings default llm model label'?: undefined;
+            'settings llm provider label'?: undefined;
+            'settings edge llm model label'?: undefined;
+            'settings ollama llm model label'?: undefined;
         } | {
-            'chat title placeholder': string;
-            'template title placeholder': string;
+            'templates label': string;
             'open ambient chat label': string;
+            'assistant chat label': string;
             'plugin name': string;
             'object placeholder': string;
             'create object label': string;
@@ -37,6 +42,8 @@ declare const _default: {
             'command placeholder': string;
             'template placeholder': string;
             'value placeholder': string;
+            'typename placeholder': string;
+            'description placeholder': string;
             'select preset template placeholder': string;
             'service registry label': string;
             'assistant dialog title': string;
@@ -46,15 +53,18 @@ declare const _default: {
             'prompt placeholder': string;
             'microphone button': string;
             'cancel processing button': string;
+            'settings default label': string;
             'settings custom prompts label': string;
-            'settings llm model label': string;
-            'settings default llm model label': string;
+            'settings llm provider label': string;
+            'settings edge llm model label': string;
+            'settings ollama llm model label': string;
             'typename label'?: undefined;
+            'object name placeholder'?: undefined;
         };
         "dxos.org/plugin/assistant": {
-            'chat title placeholder': string;
-            'template title placeholder': string;
+            'templates label': string;
             'open ambient chat label': string;
+            'assistant chat label': string;
             'plugin name': string;
             'object placeholder': string;
             'create object label': string;
@@ -63,6 +73,8 @@ declare const _default: {
             'command placeholder': string;
             'template placeholder': string;
             'value placeholder': string;
+            'typename placeholder': string;
+            'description placeholder': string;
             'select preset template placeholder': string;
             'service registry label': string;
             'assistant dialog title': string;
@@ -72,9 +84,11 @@ declare const _default: {
             'prompt placeholder': string;
             'microphone button': string;
             'cancel processing button': string;
+            'settings default label': string;
             'settings custom prompts label': string;
-            'settings llm model label': string;
-            'settings default llm model label': string;
+            'settings llm provider label': string;
+            'settings edge llm model label': string;
+            'settings ollama llm model label': string;
         };
     };
 }[];

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

@@ -1 +1 @@
-{"version":3,"file":"translations.d.ts","sourceRoot":"","sources":["../../../src/translations.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,wBAyCE"}
+{"version":3,"file":"translations.d.ts","sourceRoot":"","sources":["../../../src/translations.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAOA,wBA+CE"}

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

@@ -1,10 +1,8 @@
-import { Expando, S } from '@dxos/echo-schema';
+import { Expando } from '@dxos/echo-schema';
 declare const AIChatType_base: import("@dxos/echo-schema").TypedObjectPrototype<import("@dxos/echo-schema").TypedObjectFields<{
-    name: S.optional<typeof S.String>;
-    queue: import("@dxos/echo-schema").Ref$<Expando>;
-}, import("@dxos/echo-schema").TypedObjectOptions>, S.Struct.Encoded<{
-    name: S.optional<typeof S.String>;
-    queue: import("@dxos/echo-schema").Ref$<Expando>;
+    assistantChatQueue: import("@dxos/echo-schema").Ref$<Expando>;
+}, import("@dxos/echo-schema").TypedObjectOptions>, import("effect/Schema").Struct.Encoded<{
+    assistantChatQueue: import("@dxos/echo-schema").Ref$<Expando>;
 }>>;
 export declare class AIChatType extends AIChatType_base {
 }

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

@@ -1 +1 @@
-{"version":3,"file":"chat.d.ts","sourceRoot":"","sources":["../../../../src/types/chat.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAO,CAAC,EAAe,MAAM,mBAAmB,CAAC;;;;;;;;AAEjE,qBAAa,UAAW,SAAQ,eAI9B;CAAG"}
+{"version":3,"file":"chat.d.ts","sourceRoot":"","sources":["../../../../src/types/chat.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAoB,MAAM,mBAAmB,CAAC;;;;;;AAE9D,qBAAa,UAAW,SAAQ,eAG9B;CAAG"}

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

@@ -15,8 +15,33 @@ export declare const TemplateInputSchema: S.mutable<S.Struct<{
     value: S.optional<typeof S.String>;
 }>>;
 export type TemplateInput = S.Schema.Type<typeof TemplateInputSchema>;
+export declare const TemplateKinds: readonly ["always", "schema-matching", "automatically", "manual"];
+export type TemplateKind = (typeof TemplateKinds)[number];
+export declare const TemplateKindSchema: S.Union<[S.Struct<{
+    include: S.Literal<["always"]>;
+}>, S.Struct<{
+    include: S.Literal<["schema-matching"]>;
+    typename: typeof S.String;
+}>, S.Struct<{
+    include: S.Literal<["automatically"]>;
+    description: typeof S.String;
+}>, S.Struct<{
+    include: S.Literal<["manual"]>;
+}>]>;
+export type TemplateKindType = S.Schema.Type<typeof TemplateKindSchema>;
 declare const TemplateType_base: import("@dxos/echo-schema").TypedObjectPrototype<import("@dxos/echo-schema").TypedObjectFields<{
     name: S.optional<typeof S.String>;
+    kind: S.mutable<S.Union<[S.Struct<{
+        include: S.Literal<["always"]>;
+    }>, S.Struct<{
+        include: S.Literal<["schema-matching"]>;
+        typename: typeof S.String;
+    }>, S.Struct<{
+        include: S.Literal<["automatically"]>;
+        description: typeof S.String;
+    }>, S.Struct<{
+        include: S.Literal<["manual"]>;
+    }>]>>;
     source: typeof S.String;
     inputs: S.optional<S.mutable<S.Array$<S.mutable<S.Struct<{
         name: typeof S.String;
@@ -26,6 +51,17 @@ declare const TemplateType_base: import("@dxos/echo-schema").TypedObjectPrototyp
     command: S.optional<typeof S.String>;
 }, import("@dxos/echo-schema").TypedObjectOptions>, S.Struct.Encoded<{
     name: S.optional<typeof S.String>;
+    kind: S.mutable<S.Union<[S.Struct<{
+        include: S.Literal<["always"]>;
+    }>, S.Struct<{
+        include: S.Literal<["schema-matching"]>;
+        typename: typeof S.String;
+    }>, S.Struct<{
+        include: S.Literal<["automatically"]>;
+        description: typeof S.String;
+    }>, S.Struct<{
+        include: S.Literal<["manual"]>;
+    }>]>>;
     source: typeof S.String;
     inputs: S.optional<S.mutable<S.Array$<S.mutable<S.Struct<{
         name: typeof S.String;

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,qBAAa,YAAa,SAAQ,iBAKhC;CAAG"}
+{"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"}

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

@@ -30,7 +30,9 @@ export declare namespace AssistantAction {
     export {};
 }
 export declare const AssistantSettingsSchema: S.mutable<S.Struct<{
-    llmModel: S.optional<typeof S.String>;
+    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 type AssistantSettingsProps = S.Schema.Type<typeof AssistantSettingsSchema>;

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;;;GAKnC,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,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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.1-staging.391c573",
+  "version": "0.8.1-staging.9eaf14f",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -42,51 +42,54 @@
     "@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/app-framework": "0.8.1-staging.391c573",
-    "@dxos/async": "0.8.1-staging.391c573",
-    "@dxos/artifact": "0.8.1-staging.391c573",
-    "@dxos/assistant": "0.8.1-staging.391c573",
-    "@dxos/client": "0.8.1-staging.391c573",
-    "@dxos/compute": "0.8.1-staging.391c573",
-    "@dxos/conductor": "0.8.1-staging.391c573",
-    "@dxos/echo-db": "0.8.1-staging.391c573",
-    "@dxos/context": "0.8.1-staging.391c573",
-    "@dxos/edge-client": "0.8.1-staging.391c573",
-    "@dxos/functions": "0.8.1-staging.391c573",
-    "@dxos/echo-schema": "0.8.1-staging.391c573",
-    "@dxos/invariant": "0.8.1-staging.391c573",
-    "@dxos/keys": "0.8.1-staging.391c573",
-    "@dxos/live-object": "0.8.1-staging.391c573",
-    "@dxos/local-storage": "0.8.1-staging.391c573",
-    "@dxos/plugin-client": "0.8.1-staging.391c573",
-    "@dxos/log": "0.8.1-staging.391c573",
-    "@dxos/plugin-graph": "0.8.1-staging.391c573",
-    "@dxos/plugin-deck": "0.8.1-staging.391c573",
-    "@dxos/plugin-inbox": "0.8.1-staging.391c573",
-    "@dxos/plugin-script": "0.8.1-staging.391c573",
-    "@dxos/plugin-sketch": "0.8.1-staging.391c573",
-    "@dxos/plugin-markdown": "0.8.1-staging.391c573",
-    "@dxos/plugin-stack": "0.8.1-staging.391c573",
-    "@dxos/plugin-space": "0.8.1-staging.391c573",
-    "@dxos/plugin-transcription": "0.8.1-staging.391c573",
-    "@dxos/plugin-wnfs": "0.8.1-staging.391c573",
-    "@dxos/react-edge-client": "0.8.1-staging.391c573",
-    "@dxos/react-client": "0.8.1-staging.391c573",
-    "@dxos/react-ui-canvas-editor": "0.8.1-staging.391c573",
-    "@dxos/react-ui-canvas-compute": "0.8.1-staging.391c573",
-    "@dxos/react-ui-components": "0.8.1-staging.391c573",
-    "@dxos/react-ui-dnd": "0.8.1-staging.391c573",
-    "@dxos/react-ui-form": "0.8.1-staging.391c573",
-    "@dxos/react-ui-editor": "0.8.1-staging.391c573",
-    "@dxos/react-ui-list": "0.8.1-staging.391c573",
-    "@dxos/react-ui-stack": "0.8.1-staging.391c573",
-    "@dxos/react-ui-syntax-highlighter": "0.8.1-staging.391c573",
-    "@dxos/react-ui-sfx": "0.8.1-staging.391c573",
-    "@dxos/schema": "0.8.1-staging.391c573",
-    "@dxos/util": "0.8.1-staging.391c573"
+    "@dxos/app-framework": "0.8.1-staging.9eaf14f",
+    "@dxos/artifact": "0.8.1-staging.9eaf14f",
+    "@dxos/assistant": "0.8.1-staging.9eaf14f",
+    "@dxos/async": "0.8.1-staging.9eaf14f",
+    "@dxos/compute": "0.8.1-staging.9eaf14f",
+    "@dxos/client": "0.8.1-staging.9eaf14f",
+    "@dxos/conductor": "0.8.1-staging.9eaf14f",
+    "@dxos/echo-db": "0.8.1-staging.9eaf14f",
+    "@dxos/echo-protocol": "0.8.1-staging.9eaf14f",
+    "@dxos/context": "0.8.1-staging.9eaf14f",
+    "@dxos/edge-client": "0.8.1-staging.9eaf14f",
+    "@dxos/echo-schema": "0.8.1-staging.9eaf14f",
+    "@dxos/effect": "0.8.1-staging.9eaf14f",
+    "@dxos/functions": "0.8.1-staging.9eaf14f",
+    "@dxos/invariant": "0.8.1-staging.9eaf14f",
+    "@dxos/keys": "0.8.1-staging.9eaf14f",
+    "@dxos/live-object": "0.8.1-staging.9eaf14f",
+    "@dxos/local-storage": "0.8.1-staging.9eaf14f",
+    "@dxos/log": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-deck": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-graph": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-inbox": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-client": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-markdown": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-script": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-sketch": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-space": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-stack": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-transcription": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-wnfs": "0.8.1-staging.9eaf14f",
+    "@dxos/react-client": "0.8.1-staging.9eaf14f",
+    "@dxos/react-edge-client": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui-canvas-compute": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui-canvas-editor": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui-dnd": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui-editor": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui-components": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui-form": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui-list": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui-stack": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui-sfx": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui-syntax-highlighter": "0.8.1-staging.9eaf14f",
+    "@dxos/schema": "0.8.1-staging.9eaf14f",
+    "@dxos/util": "0.8.1-staging.9eaf14f"
   },
   "devDependencies": {
     "@types/lodash.get": "^4.4.7",
@@ -96,22 +99,22 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/artifact-testing": "0.8.1-staging.391c573",
-    "@dxos/echo-db": "0.8.1-staging.391c573",
-    "@dxos/plugin-chess": "0.8.1-staging.391c573",
-    "@dxos/plugin-map": "0.8.1-staging.391c573",
-    "@dxos/plugin-table": "0.8.1-staging.391c573",
-    "@dxos/random": "0.8.1-staging.391c573",
-    "@dxos/plugin-inbox": "0.8.1-staging.391c573",
-    "@dxos/react-ui": "0.8.1-staging.391c573",
-    "@dxos/react-ui-theme": "0.8.1-staging.391c573",
-    "@dxos/storybook-utils": "0.8.1-staging.391c573"
+    "@dxos/artifact-testing": "0.8.1-staging.9eaf14f",
+    "@dxos/echo-db": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-chess": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-map": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-inbox": "0.8.1-staging.9eaf14f",
+    "@dxos/plugin-table": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui": "0.8.1-staging.9eaf14f",
+    "@dxos/random": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui-theme": "0.8.1-staging.9eaf14f",
+    "@dxos/storybook-utils": "0.8.1-staging.9eaf14f"
   },
   "peerDependencies": {
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui-theme": "0.8.1-staging.391c573",
-    "@dxos/react-ui": "0.8.1-staging.391c573"
+    "@dxos/react-ui": "0.8.1-staging.9eaf14f",
+    "@dxos/react-ui-theme": "0.8.1-staging.9eaf14f"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -2,14 +2,21 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Capabilities, contributes, createIntent, defineModule, definePlugin, Events } from '@dxos/app-framework';
+import {
+  allOf,
+  Capabilities,
+  contributes,
+  createIntent,
+  defineModule,
+  definePlugin,
+  Events,
+} from '@dxos/app-framework';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
-import { DeckCapabilities, DeckEvents } from '@dxos/plugin-deck';
 import { SpaceCapabilities } from '@dxos/plugin-space';
 import { defineObjectForm } from '@dxos/plugin-space/types';
 
 import { AiClient, AppGraphBuilder, IntentResolver, ReactSurface, AssistantSettings } from './capabilities';
-import { ASSISTANT_PLUGIN, meta } from './meta';
+import { meta } from './meta';
 import translations from './translations';
 import { AssistantAction, AIChatType, ServiceType, TemplateType } from './types';
 
@@ -32,14 +39,12 @@ export const AssistantPlugin = () =>
         contributes(Capabilities.Metadata, {
           id: TemplateType.typename,
           metadata: {
-            placeholder: ['template title placeholder', { ns: ASSISTANT_PLUGIN }],
             icon: 'ph--code-block--regular',
           },
         }),
         contributes(Capabilities.Metadata, {
           id: AIChatType.typename,
           metadata: {
-            placeholder: ['chat title placeholder', { ns: ASSISTANT_PLUGIN }],
             icon: 'ph--atom--regular',
           },
         }),
@@ -60,6 +65,7 @@ export const AssistantPlugin = () =>
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
             objectSchema: TemplateType,
+            hidden: true,
             getIntent: () => createIntent(AssistantAction.CreateTemplate),
           }),
         ),
@@ -70,23 +76,6 @@ export const AssistantPlugin = () =>
       activatesOn: ClientEvents.SetupSchema,
       activate: () => contributes(ClientCapabilities.Schema, [ServiceType, TemplateType]),
     }),
-    defineModule({
-      id: `${meta.id}/module/complementary-panels`,
-      activatesOn: DeckEvents.SetupComplementaryPanels,
-      activate: () =>
-        contributes(DeckCapabilities.ComplementaryPanel, {
-          id: 'service-registry',
-          label: ['service registry label', { ns: ASSISTANT_PLUGIN }],
-          icon: 'ph--plugs--regular',
-        }),
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      // TODO(wittjosiah): Should occur before the chat is loaded when surfaces activation is more granular.
-      activatesBefore: [Events.SetupArtifactDefinition],
-      activate: ReactSurface,
-    }),
     defineModule({
       id: `${meta.id}/module/app-graph-builder`,
       activatesOn: Events.SetupAppGraph,
@@ -97,9 +86,16 @@ export const AssistantPlugin = () =>
       activatesOn: Events.SetupIntentResolver,
       activate: IntentResolver,
     }),
+    defineModule({
+      id: `${meta.id}/module/react-surface`,
+      activatesOn: Events.SetupReactSurface,
+      // TODO(wittjosiah): Should occur before the chat is loaded when surfaces activation is more granular.
+      activatesBefore: [Events.SetupArtifactDefinition],
+      activate: ReactSurface,
+    }),
     defineModule({
       id: `${meta.id}/module/ai-client`,
-      activatesOn: ClientEvents.ClientReady,
+      activatesOn: allOf(ClientEvents.ClientReady, Events.SettingsReady),
       activate: AiClient,
     }),
   ]);

package/src/capabilities/ai-client.ts

@@ -2,11 +2,15 @@
 // Copyright 2025 DXOS.org
 //
 
-import { contributes, type PluginsContext } from '@dxos/app-framework';
-import { AIServiceEdgeClient } from '@dxos/assistant';
+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 { ClientCapabilities } from '@dxos/plugin-client';
 
 import { AssistantCapabilities } from './capabilities';
+import { ASSISTANT_PLUGIN } from '../meta';
+import { type AssistantSettingsProps } from '../types';
 
 // TODO(wittjosiah): Factor out.
 const DEFAULT_AI_SERVICE_URL = 'http://localhost:8788';
@@ -14,7 +18,21 @@ const DEFAULT_AI_SERVICE_URL = 'http://localhost:8788';
 export default (context: PluginsContext) => {
   const client = context.requestCapability(ClientCapabilities.Client);
   const endpoint = client.config.values.runtime?.services?.ai?.server ?? DEFAULT_AI_SERVICE_URL;
-  // TODO(burdon): Use prefs.
-  const ai = new AIServiceEdgeClient({ endpoint });
-  return contributes(AssistantCapabilities.AiClient, ai);
+
+  const ai = signal<AIServiceClient>(new AIServiceEdgeClient({ endpoint }));
+
+  const unsubscribe = effect(() => {
+    // TODO(burdon): Could be undefined.
+    const settings = context
+      .requestCapability(Capabilities.SettingsStore)
+      .getStore<AssistantSettingsProps>(ASSISTANT_PLUGIN)?.value;
+
+    if (settings?.llmProvider === 'ollama') {
+      ai.value = new OllamaClient();
+    } else {
+      ai.value = new AIServiceEdgeClient({ endpoint });
+    }
+  });
+
+  return contributes(AssistantCapabilities.AiClient, ai, () => unsubscribe());
 };

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

@@ -12,12 +12,22 @@ import {
 } 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 { SpaceAction } from '@dxos/plugin-space/types';
-import { type Space, Filter, getSpace } from '@dxos/react-client/echo';
+import {
+  type Space,
+  Filter,
+  fullyQualifiedId,
+  getSpace,
+  isSpace,
+  isReactiveObject,
+  parseId,
+} from '@dxos/react-client/echo';
 
 import { ASSISTANT_DIALOG, ASSISTANT_PLUGIN } from '../meta';
-import { AIChatType, AssistantAction } from '../types';
+import { AIChatType, AssistantAction, TemplateType } from '../types';
 
 export default (context: PluginsContext) =>
   contributes(Capabilities.AppGraphBuilder, [
@@ -69,7 +79,7 @@ export default (context: PluginsContext) =>
           },
           properties: {
             label: ['open assistant label', { ns: ASSISTANT_PLUGIN }],
-            icon: 'ph--chat-centered-text--regular',
+            icon: 'ph--star-four--regular',
             disposition: 'pin-end',
             position: 'hoist',
             keyBinding: {
@@ -80,6 +90,93 @@ export default (context: PluginsContext) =>
         },
       ],
     }),
+
+    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',
+            },
+          },
+        ];
+      },
+    }),
+
+    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,
+                },
+              },
+            ]
+          : [];
+      },
+    }),
+
+    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',
+            },
+          }));
+      },
+    }),
   ]);
 
 // TODO(burdon): Factor out.

package/src/capabilities/capabilities.ts

@@ -2,11 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
+import { type ReadonlySignal } from '@preact/signals-core';
+
 import { defineCapability } from '@dxos/app-framework';
 import { type AIServiceClient } from '@dxos/assistant';
 
 import { ASSISTANT_PLUGIN } from '../meta';
 
 export namespace AssistantCapabilities {
-  export const AiClient = defineCapability<AIServiceClient>(`${ASSISTANT_PLUGIN}/capability/ai-client`);
+  export const AiClient = defineCapability<ReadonlySignal<AIServiceClient>>(`${ASSISTANT_PLUGIN}/capability/ai-client`);
 }

package/src/capabilities/intent-resolver.ts

@@ -17,8 +17,9 @@ export default () => [
       resolve: ({ spaceId, name }) => ({
         data: {
           object: create(AIChatType, {
-            name,
-            queue: refFromDXN(new DXN(DXN.kind.QUEUE, [QueueSubspaceTags.DATA, spaceId, ObjectId.random()])),
+            assistantChatQueue: refFromDXN(
+              new DXN(DXN.kind.QUEUE, [QueueSubspaceTags.DATA, spaceId, ObjectId.random()]),
+            ),
           }),
         },
       }),
@@ -30,7 +31,7 @@ export default () => [
       intent: AssistantAction.CreateTemplate,
       resolve: ({ name }) => ({
         data: {
-          object: create(TemplateType, { name, source: '{{! Template }}' }),
+          object: create(TemplateType, { name, kind: { include: 'manual' }, source: '{{! Template }}' }),
         },
       }),
     }),