@dxos/plugin-assistant 0.8.2-staging.7ac8446 → 0.8.2

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,30 @@
-import { S } from '@dxos/echo-schema';
-import { AIChatType } from './chat';
+import { Schema } from 'effect';
 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<{
+            space: Schema.Schema<import("@dxos/client-protocol").Space, import("@dxos/client-protocol").Space, never>;
+            name: Schema.optional<typeof Schema.String>;
         }>;
-        output: S.Struct<{
-            object: typeof AIChatType;
+        output: Schema.Struct<{
+            object: import("@dxos/echo-schema").EchoTypeSchema<Schema.Struct<{
+                id: import("@dxos/keys").ObjectIdClass;
+                name: Schema.optional<typeof Schema.String>;
+                queue: import("@dxos/echo-schema").Ref$<import("@dxos/echo-schema").Expando>;
+            }>, {}>;
         }>;
     }>;
     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 +32,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;AAKhC,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-staging.7ac8446",
+  "version": "0.8.2",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -40,81 +40,99 @@
     "@codemirror/state": "^6.4.1",
     "@codemirror/view": "^6.34.1",
     "@lezer/highlight": "^1.2.1",
-    "@preact/signals-core": "^1.6.0",
+    "@preact-signals/safe-react": "^0.9.0",
+    "@preact/signals-core": "^1.9.0",
     "@xiechao/codemirror-lang-handlebars": "1.0.4",
-    "effect": "3.13.3",
+    "exa-js": "^1.5.12",
     "jsonpointer": "^5.0.1",
-    "lodash.get": "^4.4.2",
+    "lodash.defaultsdeep": "^4.6.1",
     "unified": "^11.0.0",
-    "@dxos/app-framework": "0.8.2-staging.7ac8446",
-    "@dxos/artifact": "0.8.2-staging.7ac8446",
-    "@dxos/async": "0.8.2-staging.7ac8446",
-    "@dxos/assistant": "0.8.2-staging.7ac8446",
-    "@dxos/client": "0.8.2-staging.7ac8446",
-    "@dxos/context": "0.8.2-staging.7ac8446",
-    "@dxos/compute": "0.8.2-staging.7ac8446",
-    "@dxos/echo-db": "0.8.2-staging.7ac8446",
-    "@dxos/conductor": "0.8.2-staging.7ac8446",
-    "@dxos/echo-protocol": "0.8.2-staging.7ac8446",
-    "@dxos/echo-schema": "0.8.2-staging.7ac8446",
-    "@dxos/edge-client": "0.8.2-staging.7ac8446",
-    "@dxos/functions": "0.8.2-staging.7ac8446",
-    "@dxos/effect": "0.8.2-staging.7ac8446",
-    "@dxos/invariant": "0.8.2-staging.7ac8446",
-    "@dxos/keys": "0.8.2-staging.7ac8446",
-    "@dxos/live-object": "0.8.2-staging.7ac8446",
-    "@dxos/local-storage": "0.8.2-staging.7ac8446",
-    "@dxos/log": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-client": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-deck": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-inbox": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-graph": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-markdown": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-script": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-sketch": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-space": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-stack": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-transcription": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-wnfs": "0.8.2-staging.7ac8446",
-    "@dxos/react-edge-client": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-canvas-compute": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-canvas-editor": "0.8.2-staging.7ac8446",
-    "@dxos/react-client": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-dnd": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-editor": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-form": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-components": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-list": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-sfx": "0.8.2-staging.7ac8446",
-    "@dxos/schema": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-syntax-highlighter": "0.8.2-staging.7ac8446",
-    "@dxos/util": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-stack": "0.8.2-staging.7ac8446"
+    "@dxos/ai": "0.8.2",
+    "@dxos/artifact": "0.8.2",
+    "@dxos/async": "0.8.2",
+    "@dxos/app-framework": "0.8.2",
+    "@dxos/assistant": "0.8.2",
+    "@dxos/client": "0.8.2",
+    "@dxos/conductor": "0.8.2",
+    "@dxos/config": "0.8.2",
+    "@dxos/compute": "0.8.2",
+    "@dxos/debug": "0.8.2",
+    "@dxos/context": "0.8.2",
+    "@dxos/echo-db": "0.8.2",
+    "@dxos/echo-protocol": "0.8.2",
+    "@dxos/edge-client": "0.8.2",
+    "@dxos/echo": "0.8.2",
+    "@dxos/echo-schema": "0.8.2",
+    "@dxos/effect": "0.8.2",
+    "@dxos/graph": "0.8.2",
+    "@dxos/functions": "0.8.2",
+    "@dxos/invariant": "0.8.2",
+    "@dxos/keys": "0.8.2",
+    "@dxos/live-object": "0.8.2",
+    "@dxos/local-storage": "0.8.2",
+    "@dxos/log": "0.8.2",
+    "@dxos/plugin-deck": "0.8.2",
+    "@dxos/plugin-explorer": "0.8.2",
+    "@dxos/plugin-client": "0.8.2",
+    "@dxos/plugin-graph": "0.8.2",
+    "@dxos/plugin-markdown": "0.8.2",
+    "@dxos/plugin-inbox": "0.8.2",
+    "@dxos/plugin-preview": "0.8.2",
+    "@dxos/plugin-space": "0.8.2",
+    "@dxos/plugin-sketch": "0.8.2",
+    "@dxos/plugin-script": "0.8.2",
+    "@dxos/plugin-stack": "0.8.2",
+    "@dxos/plugin-transcription": "0.8.2",
+    "@dxos/plugin-wnfs": "0.8.2",
+    "@dxos/react-client": "0.8.2",
+    "@dxos/protocols": "0.8.2",
+    "@dxos/react-edge-client": "0.8.2",
+    "@dxos/react-ui-canvas-editor": "0.8.2",
+    "@dxos/react-ui-canvas-compute": "0.8.2",
+    "@dxos/react-ui-dnd": "0.8.2",
+    "@dxos/react-ui-editor": "0.8.2",
+    "@dxos/react-ui-components": "0.8.2",
+    "@dxos/react-ui-form": "0.8.2",
+    "@dxos/react-ui-graph": "0.8.2",
+    "@dxos/react-ui-list": "0.8.2",
+    "@dxos/react-ui-sfx": "0.8.2",
+    "@dxos/react-ui-stack": "0.8.2",
+    "@dxos/react-ui-syntax-highlighter": "0.8.2",
+    "@dxos/schema": "0.8.2",
+    "@dxos/util": "0.8.2"
   },
   "devDependencies": {
-    "@types/lodash.get": "^4.4.7",
+    "@effect-rx/rx-react": "^0.34.1",
+    "@effect/platform": "0.80.12",
+    "@types/lodash.defaultsdeep": "^4.6.6",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
+    "effect": "3.14.21",
     "openapi-types": "^12.1.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/artifact-testing": "0.8.2-staging.7ac8446",
-    "@dxos/echo-db": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-chess": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-inbox": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-table": "0.8.2-staging.7ac8446",
-    "@dxos/plugin-map": "0.8.2-staging.7ac8446",
-    "@dxos/random": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui-theme": "0.8.2-staging.7ac8446",
-    "@dxos/storybook-utils": "0.8.2-staging.7ac8446"
+    "@dxos/echo-db": "0.8.2",
+    "@dxos/artifact-testing": "0.8.2",
+    "@dxos/plugin-chess": "0.8.2",
+    "@dxos/plugin-inbox": "0.8.2",
+    "@dxos/plugin-map": "0.8.2",
+    "@dxos/plugin-markdown": "0.8.2",
+    "@dxos/plugin-table": "0.8.2",
+    "@dxos/random": "0.8.2",
+    "@dxos/react-ui": "0.8.2",
+    "@dxos/react-ui-menu": "0.8.2",
+    "@dxos/react-ui-theme": "0.8.2",
+    "@dxos/storybook-utils": "0.8.2"
   },
   "peerDependencies": {
+    "@effect-rx/rx-react": "^0.34.1",
+    "@effect/platform": "0.80.12",
+    "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui-theme": "0.8.2-staging.7ac8446",
-    "@dxos/react-ui": "0.8.2-staging.7ac8446"
+    "@dxos/react-ui": "0.8.2",
+    "@dxos/react-ui-theme": "0.8.2"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

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

package/src/capabilities/ai-client.ts

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