@dxos/plugin-assistant 0.8.0 → 0.8.1-main.81238a8

package/dist/types/src/hooks/invocation-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invocation-handler.d.ts","sourceRoot":"","sources":["../../../../src/hooks/invocation-handler.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAIvD,OAAO,EAAE,KAAK,MAAM,EAAe,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAgCrD,eAAO,MAAM,cAAc,WAAkB,MAAM,SAAS,KAAK,WAAW,eAAe,QAAQ,GAAG,oBA2BrG,CAAC"}
+{"version":3,"file":"invocation-handler.d.ts","sourceRoot":"","sources":["../../../../src/hooks/invocation-handler.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAI7D,OAAO,EAAE,KAAK,MAAM,EAAe,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAgCrD,eAAO,MAAM,cAAc,WAAkB,MAAM,SAAS,KAAK,WAAW,eAAe,QAAQ,GAAG,oBA2BrG,CAAC"}

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

@@ -1,7 +1,7 @@
 import { type Signal } from '@preact/signals-core';
 import { type PromiseIntentDispatcher } from '@dxos/app-framework';
 import { type Tool, Message } from '@dxos/artifact';
-import { type GenerateRequest, type AIService } from '@dxos/assistant';
+import { type GenerateRequest, type AIServiceClient } from '@dxos/assistant';
 import { type Space } from '@dxos/react-client/echo';
 declare global {
     interface ToolContextExtensions {
@@ -21,18 +21,18 @@ export type ChatProcessorOptions = Pick<GenerateRequest, 'model' | 'systemPrompt
  * Supports cancellation of in-progress requests.
  */
 export declare class ChatProcessor {
-    private readonly _service;
+    private readonly _ai;
     private _tools?;
     private readonly _extensions?;
     private readonly _options;
     /** SSE stream parser. */
     private readonly _parser;
-    /** Current streaming response. */
-    private _stream;
     /** Pending messages (incl. the current user request). */
     private readonly _pending;
     /** Current streaming block (from the AI service). */
     private readonly _block;
+    /** Current streaming response. */
+    private _stream;
     /** Prior history from queue. */
     private _history;
     /**
@@ -50,7 +50,7 @@ export declare class ChatProcessor {
      * @reactive
      */
     readonly messages: Signal<Message[]>;
-    constructor(_service: AIService, _tools?: Tool[] | undefined, _extensions?: ToolContextExtensions | undefined, _options?: ChatProcessorOptions);
+    constructor(_ai: AIServiceClient, _tools?: Tool[] | undefined, _extensions?: ToolContextExtensions | undefined, _options?: ChatProcessorOptions);
     get tools(): Tool[] | undefined;
     /**
      * Update tools.
@@ -72,5 +72,8 @@ export declare class ChatProcessor {
      */
     private _request;
 }
+export declare class AIServiecOverloadedError extends Error {
+    code: string;
+}
 export {};
 //# sourceMappingURL=processor.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"processor.d.ts","sourceRoot":"","sources":["../../../../src/hooks/processor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAA2B,MAAM,sBAAsB,CAAC;AAE5E,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,KAAK,IAAI,EAAE,OAAO,EAA4B,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAGL,KAAK,eAAe,EAIpB,KAAK,SAAS,EACf,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAGrD,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,qBAAqB;QAC7B,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,QAAQ,CAAC,EAAE,uBAAuB,CAAC;KACpC;CACF;AAED,KAAK,cAAc,GAAG;IACpB,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IACpB,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,eAAe,EAAE,OAAO,GAAG,cAAc,CAAC,CAAC;AAOnF;;;;;GAKG;AACH,qBAAa,aAAa;IA8CtB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAhD3B,yBAAyB;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2B;IAEnD,kCAAkC;IAClC,OAAO,CAAC,OAAO,CAA+B;IAE9C,yDAAyD;IACzD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiC;IAE1D,qDAAqD;IACrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA8D;IAErF,gCAAgC;IAChC,OAAO,CAAC,QAAQ,CAAiB;IAEjC;;;OAGG;IACH,SAAgB,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,CAAmD;IAE7F;;;OAGG;IACH,SAAgB,KAAK,EAAE,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC,CAAqB;IAErE;;;OAGG;IACH,SAAgB,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAWxC;gBAGgB,QAAQ,EAAE,SAAS,EAC5B,MAAM,CAAC,EAAE,IAAI,EAAE,YAAA,EACN,WAAW,CAAC,EAAE,qBAAqB,YAAA,EACnC,QAAQ,GAAE,oBAAqC;IAkBlE,IAAI,KAAK,uBAER;IAED;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE;IAItB;;OAEG;IACG,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAiBhF;;;OAGG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YAMpB,MAAM;IAWpB;;;OAGG;YACW,QAAQ;CAwDvB"}
+{"version":3,"file":"processor.d.ts","sourceRoot":"","sources":["../../../../src/hooks/processor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAA2B,MAAM,sBAAsB,CAAC;AAE5E,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,KAAK,IAAI,EAAE,OAAO,EAA4B,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAGL,KAAK,eAAe,EAIpB,KAAK,eAAe,EACrB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAGrD,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,qBAAqB;QAC7B,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,QAAQ,CAAC,EAAE,uBAAuB,CAAC;KACpC;CACF;AAED,KAAK,cAAc,GAAG;IACpB,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IACpB,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,eAAe,EAAE,OAAO,GAAG,cAAc,CAAC,CAAC;AAOnF;;;;;GAKG;AACH,qBAAa,aAAa;IA8CtB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,MAAM,CAAC;IACf,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAC7B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAhD3B,yBAAyB;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2B;IAEnD,yDAAyD;IACzD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAiC;IAE1D,qDAAqD;IACrD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA8D;IAErF,kCAAkC;IAClC,OAAO,CAAC,OAAO,CAA+B;IAE9C,gCAAgC;IAChC,OAAO,CAAC,QAAQ,CAAiB;IAEjC;;;OAGG;IACH,SAAgB,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,CAAmD;IAE7F;;;OAGG;IACH,SAAgB,KAAK,EAAE,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC,CAAqB;IAErE;;;OAGG;IACH,SAAgB,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAWxC;gBAGgB,GAAG,EAAE,eAAe,EAC7B,MAAM,CAAC,EAAE,IAAI,EAAE,YAAA,EACN,WAAW,CAAC,EAAE,qBAAqB,YAAA,EACnC,QAAQ,GAAE,oBAAqC;IAkBlE,IAAI,KAAK,uBAER;IAED;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,IAAI,EAAE;IAItB;;OAEG;IACG,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAiBhF;;;OAGG;IACG,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YAMpB,MAAM;IAWpB;;;OAGG;YACW,QAAQ;CA4DvB;AAGD,qBAAa,wBAAyB,SAAQ,KAAK;IACjD,IAAI,SAA2B;CAChC"}

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

@@ -1,8 +1,15 @@
 import { type Space } from '@dxos/react-client/echo';
 import { ChatProcessor } from '../hooks';
-import { type AssistantSettingsProps } from '../types';
+import { type AIChatType, type AssistantSettingsProps } from '../types';
+type UseChatProcessorProps = {
+    chat?: AIChatType;
+    space?: Space;
+    settings?: AssistantSettingsProps;
+    part?: 'deck' | 'dialog';
+};
 /**
  * Configure and create ChatProcessor.
  */
-export declare const useChatProcessor: (space?: Space, settings?: AssistantSettingsProps) => ChatProcessor;
+export declare const useChatProcessor: ({ chat, space, settings, part }: UseChatProcessorProps) => ChatProcessor;
+export {};
 //# sourceMappingURL=useChatProcessor.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useChatProcessor.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useChatProcessor.tsx"],"names":[],"mappings":"AAYA,OAAO,EAAU,KAAK,KAAK,EAAY,MAAM,yBAAyB,CAAC;AAIvE,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,KAAK,sBAAsB,EAAe,MAAM,UAAU,CAAC;AAEpE;;GAEG;AACH,eAAO,MAAM,gBAAgB,WAAY,KAAK,aAAa,sBAAsB,KAAG,aAwDnF,CAAC"}
+{"version":3,"file":"useChatProcessor.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useChatProcessor.tsx"],"names":[],"mappings":"AAYA,OAAO,EAA4B,KAAK,KAAK,EAAY,MAAM,yBAAyB,CAAC;AAIzF,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,sBAAsB,EAAe,MAAM,UAAU,CAAC;AAErF,KAAK,qBAAqB,GAAG;IAC3B,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAClC,IAAI,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;CAC1B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,oCAA8C,qBAAqB,KAAG,aA0DlG,CAAC"}

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

@@ -0,0 +1,17 @@
+import type { Space } from '@dxos/client/echo';
+export type ContextProvider = {
+    query: (params: {
+        query: string;
+    }) => Promise<Array<{
+        uri: string;
+        label: string;
+    }>>;
+    resolveMetadata: (params: {
+        uri: string;
+    }) => Promise<{
+        uri: string;
+        label: string;
+    }>;
+};
+export declare const useContextProvider: (space?: Space) => ContextProvider | undefined;
+//# sourceMappingURL=useContextProvider.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useContextProvider.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useContextProvider.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAK/C,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,KAAK,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAAC;IACrF,eAAe,EAAE,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CACvF,CAAC;AAIF,eAAO,MAAM,kBAAkB,WAAY,KAAK,KAAG,eAAe,GAAG,SAmCpE,CAAC"}

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

@@ -2,6 +2,7 @@ import { type AIChatType } from '../types';
 export declare const useMessageQueue: (chat?: AIChatType) => import("@dxos/echo-db").Queue<{
     readonly id: string;
     spaceId?: import("@dxos/keys").SpaceId | undefined;
+    role: "user" | "assistant";
     content: ({
         pending?: boolean | undefined;
         type: "text";
@@ -18,24 +19,23 @@ export declare const useMessageQueue: (chat?: AIChatType) => import("@dxos/echo-
         type: "image";
         source?: {
             type: "base64";
-            mediaType: string;
             data: string;
+            mediaType: string;
         } | undefined;
     } | {
         pending?: boolean | undefined;
+        name: string;
         id: string;
         type: "tool_use";
-        name: string;
         input: unknown;
     } | {
         pending?: boolean | undefined;
         type: "tool_result";
-        toolUseId: string;
         content: string;
+        toolUseId: string;
         isError?: boolean | undefined;
     })[];
     threadId?: string | undefined;
     foreignId?: string | undefined;
-    role: "user" | "assistant";
 }> | undefined;
 //# sourceMappingURL=useMessageQueue.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"useMessageQueue.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useMessageQueue.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,eAAO,MAAM,eAAe,UAAW,UAAU;;;;eAUs0H,CAAC;;;mBAAsF,CAAC;;eAA+C,CAAC;;mBAAgE,CAAC;;;eAAqE,CAAC;UAAiC,CAAC;;cAA2D,CAAC;;;;;;eAAyI,CAAC;;;;;;eAA4I,CAAC;;;;eAAuH,CAAC;;;;;cADlnJ,CAAC"}
+{"version":3,"file":"useMessageQueue.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useMessageQueue.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,eAAO,MAAM,eAAe,UAAW,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAQhD,CAAC"}

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

@@ -1,11 +1,5 @@
+import { type PluginMeta } from '@dxos/app-framework';
 export declare const ASSISTANT_PLUGIN = "dxos.org/plugin/assistant";
 export declare const ASSISTANT_DIALOG = "dxos.org/plugin/assistant/assistant/dialog";
-export declare const meta: {
-    id: string;
-    name: string;
-    description: string;
-    icon: string;
-    source: string;
-    tags: string[];
-};
+export declare const meta: PluginMeta;
 //# sourceMappingURL=meta.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../src/meta.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,gBAAgB,8BAA8B,CAAC;AAE5D,eAAO,MAAM,gBAAgB,+CAAyC,CAAC;AAEvE,eAAO,MAAM,IAAI;;;;;;;CAOK,CAAC"}
+{"version":3,"file":"meta.d.ts","sourceRoot":"","sources":["../../../src/meta.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,eAAO,MAAM,gBAAgB,8BAA8B,CAAC;AAE5D,eAAO,MAAM,gBAAgB,+CAAyC,CAAC;AAEvE,eAAO,MAAM,IAAI,EAAE,UAOlB,CAAC"}

package/dist/types/src/testing/test-functions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-functions.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-functions.ts"],"names":[],"mappings":"AAKA,OAAO,EAAqB,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAE1E,eAAO,MAAM,sBAAsB,cAAe,MAAM,EAAE,KAAG,IAAI,CAAC,eAAe,EAAE,OAAO,GAAG,cAAc,CAGzG,CAAC"}
+{"version":3,"file":"test-functions.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-functions.ts"],"names":[],"mappings":"AAKA,OAAO,EAAsB,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAE3E,eAAO,MAAM,sBAAsB,cAAe,MAAM,EAAE,KAAG,IAAI,CAAC,eAAe,EAAE,OAAO,GAAG,cAAc,CAGzG,CAAC"}

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

@@ -1,5 +1,5 @@
 import type { Tool } from '@dxos/artifact';
-import type { FunctionType } from '@dxos/functions';
+import type { FunctionType } from '@dxos/functions/types';
 import type { SpaceId } from '@dxos/react-client/echo';
 export declare const covertFunctionToTool: (fn: FunctionType, edgeUrl: string, spaceId?: SpaceId | undefined) => Tool | undefined;
 //# sourceMappingURL=function.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../../../../src/tools/function.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAG3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAGvD,eAAO,MAAM,oBAAoB,OAC3B,YAAY,WACP,MAAM,YACL,OAAO,GAAG,SAAS,KAC5B,IAAI,GAAG,SA6BT,CAAC"}
+{"version":3,"file":"function.d.ts","sourceRoot":"","sources":["../../../../src/tools/function.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAG3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAGvD,eAAO,MAAM,oBAAoB,OAC3B,YAAY,WACP,MAAM,YACL,OAAO,GAAG,SAAS,KAC5B,IAAI,GAAG,SA6BT,CAAC"}

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

@@ -3,6 +3,7 @@ declare const _default: {
         [x: string]: {
             'typename label': string;
             'chat title placeholder'?: undefined;
+            'templates label'?: undefined;
             'template title placeholder'?: undefined;
             'open ambient chat label'?: undefined;
             'plugin name'?: 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,11 +25,14 @@ 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;
+            'templates label': string;
             'template title placeholder': string;
             'open ambient chat label': string;
             'plugin name': string;
@@ -37,6 +43,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,13 +54,16 @@ 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;
         };
         "dxos.org/plugin/assistant": {
             'chat title placeholder': string;
+            'templates label': string;
             'template title placeholder': string;
             'open ambient chat label': string;
             'plugin name': string;
@@ -63,6 +74,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 +85,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,wBA8CE"}

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

@@ -1,6 +1,6 @@
 import { ComputeGraph } from '@dxos/conductor';
 import { S, type Ref$ } from '@dxos/echo-schema';
-import { FunctionType } from '@dxos/functions';
+import { FunctionType } from '@dxos/functions/types';
 export declare const ApiAuthorization: S.Union<[S.Struct<{
     type: S.Literal<["api-key"]>;
     key: typeof S.String;

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

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../../src/types/service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAO,CAAC,EAAe,KAAK,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAwB/C,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;IAAsD,CAAC;AACpF,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;AA+BtE,QAAA,MAAM,gBAAgB;;QA3BK,IAAI,CAAC,YAAY,CAAC;;;cAKZ,IAAI,CAAC,YAAY,CAAC;;;IAMjD;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;;;;;;;;;;;;;;;;IAIoG,CAAC;AAC1G,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;;;;;;;IASpE;;OAEG;;;YAvCsB,IAAI,CAAC,YAAY,CAAC;;;kBAKZ,IAAI,CAAC,YAAY,CAAC;;;QAMjD;;WAEG;;QAGH;;WAEG;;QAGH;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;IAcH;;OAEG;;;YAvCsB,IAAI,CAAC,YAAY,CAAC;;;kBAKZ,IAAI,CAAC,YAAY,CAAC;;;QAMjD;;WAEG;;QAGH;;WAEG;;QAGH;;WAEG;;;;;;;;;;;;;;;;;;;AAOL,qBAAa,WAAY,SAAQ,gBAW/B;CAAG;AAML,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,aAAa,CAAC,KAAK,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;CAC7D;AAED,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAUvC,CAAC"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../../../src/types/service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAO,CAAC,EAAe,KAAK,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAwBrD,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;IAAsD,CAAC;AACpF,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;AA+BtE,QAAA,MAAM,gBAAgB;;QA3BK,IAAI,CAAC,YAAY,CAAC;;;cAKZ,IAAI,CAAC,YAAY,CAAC;;;IAMjD;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;;;;;;;;;;;;;;;;IAIoG,CAAC;AAC1G,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;;;;;;;IASpE;;OAEG;;;YAvCsB,IAAI,CAAC,YAAY,CAAC;;;kBAKZ,IAAI,CAAC,YAAY,CAAC;;;QAMjD;;WAEG;;QAGH;;WAEG;;QAGH;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;IAcH;;OAEG;;;YAvCsB,IAAI,CAAC,YAAY,CAAC;;;kBAKZ,IAAI,CAAC,YAAY,CAAC;;;QAMjD;;WAEG;;QAGH;;WAEG;;QAGH;;WAEG;;;;;;;;;;;;;;;;;;;AAOL,qBAAa,WAAY,SAAQ,gBAW/B;CAAG;AAML,MAAM,MAAM,YAAY,GAAG;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,aAAa,CAAC,KAAK,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;CAC7D;AAED,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAUvC,CAAC"}

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.0",
+  "version": "0.8.1-main.81238a8",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -39,55 +39,55 @@
     "@codemirror/search": "^6.5.6",
     "@codemirror/state": "^6.4.1",
     "@codemirror/view": "^6.34.1",
-    "@effect/schema": "^0.75.5",
     "@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.0",
-    "@dxos/artifact": "0.8.0",
-    "@dxos/assistant": "0.8.0",
-    "@dxos/async": "0.8.0",
-    "@dxos/client": "0.8.0",
-    "@dxos/compute": "0.8.0",
-    "@dxos/context": "0.8.0",
-    "@dxos/echo-db": "0.8.0",
-    "@dxos/echo-schema": "0.8.0",
-    "@dxos/conductor": "0.8.0",
-    "@dxos/functions": "0.8.0",
-    "@dxos/invariant": "0.8.0",
-    "@dxos/keys": "0.8.0",
-    "@dxos/edge-client": "0.8.0",
-    "@dxos/live-object": "0.8.0",
-    "@dxos/local-storage": "0.8.0",
-    "@dxos/plugin-client": "0.8.0",
-    "@dxos/plugin-graph": "0.8.0",
-    "@dxos/log": "0.8.0",
-    "@dxos/plugin-inbox": "0.8.0",
-    "@dxos/plugin-deck": "0.8.0",
-    "@dxos/plugin-markdown": "0.8.0",
-    "@dxos/plugin-script": "0.8.0",
-    "@dxos/plugin-sketch": "0.8.0",
-    "@dxos/plugin-space": "0.8.0",
-    "@dxos/plugin-transcription": "0.8.0",
-    "@dxos/plugin-stack": "0.8.0",
-    "@dxos/plugin-wnfs": "0.8.0",
-    "@dxos/react-client": "0.8.0",
-    "@dxos/react-edge-client": "0.8.0",
-    "@dxos/react-ui-canvas-compute": "0.8.0",
-    "@dxos/react-ui-canvas-editor": "0.8.0",
-    "@dxos/react-ui-components": "0.8.0",
-    "@dxos/react-ui-dnd": "0.8.0",
-    "@dxos/react-ui-editor": "0.8.0",
-    "@dxos/react-ui-form": "0.8.0",
-    "@dxos/react-ui-list": "0.8.0",
-    "@dxos/react-ui-sfx": "0.8.0",
-    "@dxos/react-ui-syntax-highlighter": "0.8.0",
-    "@dxos/schema": "0.8.0",
-    "@dxos/util": "0.8.0",
-    "@dxos/react-ui-stack": "0.8.0"
+    "@dxos/app-framework": "0.8.1-main.81238a8",
+    "@dxos/artifact": "0.8.1-main.81238a8",
+    "@dxos/assistant": "0.8.1-main.81238a8",
+    "@dxos/async": "0.8.1-main.81238a8",
+    "@dxos/compute": "0.8.1-main.81238a8",
+    "@dxos/client": "0.8.1-main.81238a8",
+    "@dxos/context": "0.8.1-main.81238a8",
+    "@dxos/conductor": "0.8.1-main.81238a8",
+    "@dxos/echo-db": "0.8.1-main.81238a8",
+    "@dxos/echo-schema": "0.8.1-main.81238a8",
+    "@dxos/edge-client": "0.8.1-main.81238a8",
+    "@dxos/keys": "0.8.1-main.81238a8",
+    "@dxos/functions": "0.8.1-main.81238a8",
+    "@dxos/local-storage": "0.8.1-main.81238a8",
+    "@dxos/live-object": "0.8.1-main.81238a8",
+    "@dxos/log": "0.8.1-main.81238a8",
+    "@dxos/plugin-client": "0.8.1-main.81238a8",
+    "@dxos/invariant": "0.8.1-main.81238a8",
+    "@dxos/plugin-deck": "0.8.1-main.81238a8",
+    "@dxos/plugin-graph": "0.8.1-main.81238a8",
+    "@dxos/plugin-inbox": "0.8.1-main.81238a8",
+    "@dxos/plugin-markdown": "0.8.1-main.81238a8",
+    "@dxos/plugin-sketch": "0.8.1-main.81238a8",
+    "@dxos/plugin-space": "0.8.1-main.81238a8",
+    "@dxos/plugin-transcription": "0.8.1-main.81238a8",
+    "@dxos/plugin-script": "0.8.1-main.81238a8",
+    "@dxos/plugin-stack": "0.8.1-main.81238a8",
+    "@dxos/plugin-wnfs": "0.8.1-main.81238a8",
+    "@dxos/react-client": "0.8.1-main.81238a8",
+    "@dxos/react-edge-client": "0.8.1-main.81238a8",
+    "@dxos/react-ui-canvas-compute": "0.8.1-main.81238a8",
+    "@dxos/react-ui-canvas-editor": "0.8.1-main.81238a8",
+    "@dxos/react-ui-dnd": "0.8.1-main.81238a8",
+    "@dxos/react-ui-components": "0.8.1-main.81238a8",
+    "@dxos/react-ui-editor": "0.8.1-main.81238a8",
+    "@dxos/react-ui-form": "0.8.1-main.81238a8",
+    "@dxos/react-ui-list": "0.8.1-main.81238a8",
+    "@dxos/react-ui-sfx": "0.8.1-main.81238a8",
+    "@dxos/react-ui-syntax-highlighter": "0.8.1-main.81238a8",
+    "@dxos/react-ui-stack": "0.8.1-main.81238a8",
+    "@dxos/schema": "0.8.1-main.81238a8",
+    "@dxos/util": "0.8.1-main.81238a8"
   },
   "devDependencies": {
     "@types/lodash.get": "^4.4.7",
@@ -97,22 +97,22 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/artifact-testing": "0.8.0",
-    "@dxos/echo-db": "0.8.0",
-    "@dxos/plugin-chess": "0.8.0",
-    "@dxos/plugin-inbox": "0.8.0",
-    "@dxos/plugin-table": "0.8.0",
-    "@dxos/random": "0.8.0",
-    "@dxos/plugin-map": "0.8.0",
-    "@dxos/react-ui": "0.8.0",
-    "@dxos/react-ui-theme": "0.8.0",
-    "@dxos/storybook-utils": "0.8.0"
+    "@dxos/artifact-testing": "0.8.1-main.81238a8",
+    "@dxos/echo-db": "0.8.1-main.81238a8",
+    "@dxos/plugin-chess": "0.8.1-main.81238a8",
+    "@dxos/plugin-inbox": "0.8.1-main.81238a8",
+    "@dxos/plugin-map": "0.8.1-main.81238a8",
+    "@dxos/plugin-table": "0.8.1-main.81238a8",
+    "@dxos/random": "0.8.1-main.81238a8",
+    "@dxos/react-ui": "0.8.1-main.81238a8",
+    "@dxos/react-ui-theme": "0.8.1-main.81238a8",
+    "@dxos/storybook-utils": "0.8.1-main.81238a8"
   },
   "peerDependencies": {
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.0",
-    "@dxos/react-ui-theme": "0.8.0"
+    "@dxos/react-ui": "0.8.1-main.81238a8",
+    "@dxos/react-ui-theme": "0.8.1-main.81238a8"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -2,7 +2,15 @@
 // 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';
@@ -60,6 +68,7 @@ export const AssistantPlugin = () =>
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
             objectSchema: TemplateType,
+            hidden: true,
             getIntent: () => createIntent(AssistantAction.CreateTemplate),
           }),
         ),
@@ -99,7 +108,7 @@ export const AssistantPlugin = () =>
     }),
     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 { AIServiceClientImpl } 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,6 +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;
-  const aiClient = new AIServiceClientImpl({ endpoint });
-  return contributes(AssistantCapabilities.AiClient, aiClient);
+
+  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());
 };