@dxos/plugin-assistant 0.8.2-main.12df754 → 0.8.2-main.30e4dbb

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

@@ -1,4 +1,4 @@
-import { S } from '@dxos/echo-schema';
+import { Schema } from 'effect';
 export declare enum TemplateInputType {
     VALUE = 0,
     PASS_THROUGH = 1,
@@ -9,66 +9,66 @@ export declare enum TemplateInputType {
     CONTEXT = 6,
     SCHEMA = 7
 }
-export declare const TemplateInputSchema: S.mutable<S.Struct<{
-    name: typeof S.String;
-    type: S.optional<S.Enums<typeof TemplateInputType>>;
-    value: S.optional<typeof S.String>;
+export declare const TemplateInputSchema: Schema.mutable<Schema.Struct<{
+    name: typeof Schema.String;
+    type: Schema.optional<Schema.Enums<typeof TemplateInputType>>;
+    value: Schema.optional<typeof Schema.String>;
 }>>;
-export type TemplateInput = S.Schema.Type<typeof TemplateInputSchema>;
+export type TemplateInput = Schema.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 declare const TemplateKindSchema: Schema.Union<[Schema.Struct<{
+    include: Schema.Literal<["always"]>;
+}>, Schema.Struct<{
+    include: Schema.Literal<["schema-matching"]>;
+    typename: typeof Schema.String;
+}>, Schema.Struct<{
+    include: Schema.Literal<["automatically"]>;
+    description: typeof Schema.String;
+}>, Schema.Struct<{
+    include: Schema.Literal<["manual"]>;
 }>]>;
-export type TemplateKindType = S.Schema.Type<typeof TemplateKindSchema>;
+export type TemplateKindType = Schema.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"]>;
+    name: Schema.optional<typeof Schema.String>;
+    kind: Schema.mutable<Schema.Union<[Schema.Struct<{
+        include: Schema.Literal<["always"]>;
+    }>, Schema.Struct<{
+        include: Schema.Literal<["schema-matching"]>;
+        typename: typeof Schema.String;
+    }>, Schema.Struct<{
+        include: Schema.Literal<["automatically"]>;
+        description: typeof Schema.String;
+    }>, Schema.Struct<{
+        include: Schema.Literal<["manual"]>;
     }>]>>;
-    source: typeof S.String;
-    inputs: S.optional<S.mutable<S.Array$<S.mutable<S.Struct<{
-        name: typeof S.String;
-        type: S.optional<S.Enums<typeof TemplateInputType>>;
-        value: S.optional<typeof S.String>;
+    source: typeof Schema.String;
+    inputs: Schema.optional<Schema.mutable<Schema.Array$<Schema.mutable<Schema.Struct<{
+        name: typeof Schema.String;
+        type: Schema.optional<Schema.Enums<typeof TemplateInputType>>;
+        value: Schema.optional<typeof Schema.String>;
     }>>>>>;
-    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"]>;
+    command: Schema.optional<typeof Schema.String>;
+}, import("@dxos/echo-schema").TypedObjectOptions>, Schema.Struct.Encoded<{
+    name: Schema.optional<typeof Schema.String>;
+    kind: Schema.mutable<Schema.Union<[Schema.Struct<{
+        include: Schema.Literal<["always"]>;
+    }>, Schema.Struct<{
+        include: Schema.Literal<["schema-matching"]>;
+        typename: typeof Schema.String;
+    }>, Schema.Struct<{
+        include: Schema.Literal<["automatically"]>;
+        description: typeof Schema.String;
+    }>, Schema.Struct<{
+        include: Schema.Literal<["manual"]>;
     }>]>>;
-    source: typeof S.String;
-    inputs: S.optional<S.mutable<S.Array$<S.mutable<S.Struct<{
-        name: typeof S.String;
-        type: S.optional<S.Enums<typeof TemplateInputType>>;
-        value: S.optional<typeof S.String>;
+    source: typeof Schema.String;
+    inputs: Schema.optional<Schema.mutable<Schema.Array$<Schema.mutable<Schema.Struct<{
+        name: typeof Schema.String;
+        type: Schema.optional<Schema.Enums<typeof TemplateInputType>>;
+        value: Schema.optional<typeof Schema.String>;
     }>>>>>;
-    command: S.optional<typeof S.String>;
+    command: Schema.optional<typeof Schema.String>;
 }>>;
 export declare class TemplateType extends TemplateType_base {
 }

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

@@ -22,7 +22,6 @@ export default (context: PluginsContext) => {
   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;

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

@@ -12,11 +12,11 @@ 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 { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
 import { createExtension, type Node, ROOT_ID } from '@dxos/plugin-graph';
 import { memoizeQuery } 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 } from '@dxos/react-client/echo';
 
 import { ASSISTANT_DIALOG, ASSISTANT_PLUGIN } from '../meta';
 import { AIChatType, AssistantAction, TemplateType } from '../types';
@@ -71,7 +71,7 @@ export default (context: PluginsContext) =>
           },
           properties: {
             label: ['open assistant label', { ns: ASSISTANT_PLUGIN }],
-            icon: 'ph--star-four--regular',
+            icon: 'ph--sparkle--regular',
             disposition: 'pin-end',
             position: 'hoist',
             keyBinding: {
@@ -83,30 +83,6 @@ 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> =>
@@ -118,7 +94,7 @@ export default (context: PluginsContext) =>
           data: 'assistant-chat',
           properties: {
             label: ['assistant chat label', { ns: ASSISTANT_PLUGIN }],
-            icon: 'ph--star-four--regular',
+            icon: 'ph--sparkle--regular',
             position: 'hoist',
           },
         },

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';

package/src/capabilities/intent-resolver.ts

@@ -3,7 +3,7 @@
 //
 
 import { Capabilities, contributes, createResolver } from '@dxos/app-framework';
-import { ObjectId } from '@dxos/echo-schema';
+import { Type } from '@dxos/echo';
 import { DXN, QueueSubspaceTags } from '@dxos/keys';
 import { live, refFromDXN } from '@dxos/live-object';
 
@@ -18,7 +18,7 @@ export default () => [
         data: {
           object: live(AIChatType, {
             assistantChatQueue: refFromDXN(
-              new DXN(DXN.kind.QUEUE, [QueueSubspaceTags.DATA, spaceId, ObjectId.random()]),
+              new DXN(DXN.kind.QUEUE, [QueueSubspaceTags.DATA, spaceId, Type.ObjectId.random()]),
             ),
           }),
         },

package/src/capabilities/react-surface.tsx

@@ -5,18 +5,11 @@
 import React, { useMemo } from 'react';
 
 import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
-import { isInstanceOf, getTypename } from '@dxos/echo-schema';
+import { Type } from '@dxos/echo';
 import { SettingsStore } from '@dxos/local-storage';
-import { fullyQualifiedId, getSpace, isLiveObject, isSpace, type Space, type SpaceId } from '@dxos/react-client/echo';
+import { fullyQualifiedId, getSpace, getTypename, isLiveObject, type SpaceId } from '@dxos/react-client/echo';
 
-import {
-  AssistantDialog,
-  AssistantSettings,
-  ChatContainer,
-  PromptSettings,
-  ServiceRegistry,
-  TemplateContainer,
-} from '../components';
+import { AssistantDialog, AssistantSettings, ChatContainer, PromptSettings, TemplateContainer } from '../components';
 import { ASSISTANT_PLUGIN, ASSISTANT_DIALOG } from '../meta';
 import { AIChatType, type AssistantSettingsProps, TemplateType } from '../types';
 
@@ -39,7 +32,7 @@ export default () =>
       id: `${ASSISTANT_PLUGIN}/chat`,
       role: 'article',
       filter: (data): data is { subject: AIChatType; variant: undefined } =>
-        isInstanceOf(AIChatType, data.subject) && data.variant !== 'assistant-chat',
+        Type.instanceOf(AIChatType, data.subject) && data.variant !== 'assistant-chat',
       component: ({ data, role }) => <ChatContainer role={role} chat={data.subject} />,
     }),
     createSurface({
@@ -64,19 +57,13 @@ export default () =>
     createSurface({
       id: `${ASSISTANT_PLUGIN}/template`,
       role: 'article',
-      filter: (data): data is { subject: TemplateType } => isInstanceOf(TemplateType, data.subject),
+      filter: (data): data is { subject: TemplateType } => Type.instanceOf(TemplateType, data.subject),
       component: ({ data, role }) => <TemplateContainer role={role} template={data.subject} />,
     }),
-    createSurface({
-      id: `${ASSISTANT_PLUGIN}/service-registry`,
-      role: 'deck-companion--service-registry',
-      filter: (data): data is { subject: Space } => isSpace(data.subject),
-      component: ({ data }) => <ServiceRegistry space={data.subject} />,
-    }),
     createSurface({
       id: `${ASSISTANT_PLUGIN}/prompt-settings`,
       role: 'object-settings',
-      filter: (data): data is { subject: TemplateType } => isInstanceOf(TemplateType, data.subject),
+      filter: (data): data is { subject: TemplateType } => Type.instanceOf(TemplateType, data.subject),
       component: ({ data }) => <PromptSettings template={data.subject} />,
     }),
   ]);

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

@@ -69,7 +69,7 @@ const meta: Meta<typeof AmbientDialog> = {
       plugins: [IntentPlugin()],
     }),
     withTheme,
-    withLayout({ fullscreen: true, tooltips: true }),
+    withLayout({ fullscreen: true }),
   ],
   parameters: {
     translations,

package/src/components/AssistantSettings/AssistantSettings.tsx

@@ -9,11 +9,17 @@ import { Input, Select, useTranslation } from '@dxos/react-ui';
 import { DeprecatedFormContainer, DeprecatedFormInput } from '@dxos/react-ui-form';
 
 import { ASSISTANT_PLUGIN } from '../../meta';
-import { type AssistantSettingsProps } from '../../types';
+import { LLM_PROVIDERS, type AssistantSettingsProps } from '../../types';
 
-// TODO(burdon): Factor out.
+// TODO(burdon): Factor out default Selector.
 const DEFAULT_VALUE = '__default';
 
+const LLM_PROVIDER_LABELS = {
+  edge: 'DXOS',
+  ollama: 'Ollama',
+  lmstudio: 'LM Studio',
+} as const;
+
 export const AssistantSettings = ({ settings }: { settings: AssistantSettingsProps }) => {
   const { t } = useTranslation(ASSISTANT_PLUGIN);
 
@@ -27,10 +33,26 @@ export const AssistantSettings = ({ settings }: { settings: AssistantSettingsPro
       </DeprecatedFormInput>
 
       <DeprecatedFormInput label={t('settings llm provider label')}>
-        <Input.Switch
-          checked={settings.llmProvider === 'ollama'}
-          onCheckedChange={(checked) => (settings.llmProvider = checked ? 'ollama' : 'edge')}
-        />
+        <Select.Root
+          value={settings.llmProvider ?? 'edge'}
+          onValueChange={(value) => {
+            settings.llmProvider = value === DEFAULT_VALUE ? undefined : (value as any);
+          }}
+        >
+          <Select.TriggerButton placeholder={t('settings llm provider label')} />
+          <Select.Portal>
+            <Select.Content>
+              <Select.Viewport>
+                <Select.Option value={DEFAULT_VALUE}>{t('settings default label')}</Select.Option>
+                {LLM_PROVIDERS.map((model) => (
+                  <Select.Option key={model} value={model}>
+                    {LLM_PROVIDER_LABELS[model]}
+                  </Select.Option>
+                ))}
+              </Select.Viewport>
+            </Select.Content>
+          </Select.Portal>
+        </Select.Root>
       </DeprecatedFormInput>
 
       <DeprecatedFormInput label={t('settings edge llm model label')}>

package/src/components/Prompt/Prompt.stories.tsx

@@ -17,7 +17,7 @@ import translations from '../../translations';
 const meta: Meta<typeof Prompt> = {
   title: 'plugins/plugin-automation/Prompt',
   component: Prompt,
-  decorators: [withTheme, withLayout({ tooltips: true })],
+  decorators: [withTheme, withLayout()],
   parameters: {
     layout: 'centered',
     translations,

package/src/components/Prompt/PromptBar.tsx

@@ -7,7 +7,7 @@ import React, { useRef, useState } from 'react';
 import { useVoiceInput } from '@dxos/plugin-transcription';
 import { Icon, IconButton, type ThemedClassName, Tooltip, useTranslation } from '@dxos/react-ui';
 import { Spinner } from '@dxos/react-ui-sfx';
-import { errorMessageColors, errorText, mx } from '@dxos/react-ui-theme';
+import { errorText, mx } from '@dxos/react-ui-theme';
 
 import { Prompt, type PromptController, type PromptProps } from './Prompt';
 import { ASSISTANT_PLUGIN } from '../../meta';
@@ -54,17 +54,9 @@ export const PromptBar = ({
     >
       <div className='flex w-[--rail-action] h-[--rail-action] items-center justify-center'>
         {(error && (
-          <Tooltip.Root delayDuration={0}>
-            <Tooltip.Trigger>
-              <Icon icon='ph--warning-circle--regular' classNames={errorText} size={5} />
-            </Tooltip.Trigger>
-            <Tooltip.Portal>
-              <Tooltip.Content>
-                <div className={mx('text-sm', errorMessageColors)}>{error.message}</div>
-                <Tooltip.Arrow />
-              </Tooltip.Content>
-            </Tooltip.Portal>
-          </Tooltip.Root>
+          <Tooltip.Trigger content={error.message} delayDuration={0}>
+            <Icon icon='ph--warning-circle--regular' classNames={errorText} size={5} />
+          </Tooltip.Trigger>
         )) || <Spinner active={processing} />}
       </div>
       <Prompt