@dxos/plugin-assistant 0.8.2 → 0.8.3-main.7f5a14c

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

@@ -1,10 +1,10 @@
 import { Schema } from 'effect';
+import { Queue } from '@dxos/client/echo';
 import { Type } from '@dxos/echo';
-import { Ref } from '@dxos/echo-schema';
 export declare const AIChatType: import("@dxos/echo-schema").EchoTypeSchema<Schema.Struct<{
     id: import("@dxos/keys").ObjectIdClass;
     name: Schema.optional<typeof Schema.String>;
-    queue: import("@dxos/echo-schema").Ref$<Type.Expando>;
+    queue: import("@dxos/echo-schema").Ref$<Queue<import("@dxos/echo-schema").AnyEchoObject>>;
 }>, {}>;
 export interface AIChatType extends Schema.Schema.Type<typeof AIChatType> {
 }
@@ -13,7 +13,7 @@ export declare const CompanionTo: import("@dxos/echo-schema").EchoTypeSchema<Sch
 }>, import("@dxos/echo-schema").RelationSourceTargetRefs<{
     readonly id: string;
     name?: string | undefined;
-    queue: Ref<Type.Expando>;
+    queue: import("@dxos/echo-schema").Ref<Queue<import("@dxos/echo-schema").AnyEchoObject>>;
 }, Type.Expando>>;
 export interface CompanionTo extends Schema.Schema.Type<typeof CompanionTo> {
 }

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,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClC,OAAO,EAAW,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAEjD,eAAO,MAAM,UAAU;;;;OAUtB,CAAC;AACF,MAAM,WAAW,UAAW,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC;CAAG;AAE5E,eAAO,MAAM,WAAW;;;;;;iBASvB,CAAC;AACF,MAAM,WAAW,WAAY,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,WAAW,CAAC;CAAG"}
+{"version":3,"file":"chat.d.ts","sourceRoot":"","sources":["../../../../src/types/chat.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAElC,eAAO,MAAM,UAAU;;;;OAStB,CAAC;AACF,MAAM,WAAW,UAAW,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC;CAAG;AAE5E,eAAO,MAAM,WAAW;;;;;;iBASvB,CAAC;AACF,MAAM,WAAW,WAAY,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,WAAW,CAAC;CAAG"}

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

@@ -1,7 +1,5 @@
 import { Schema } from 'effect';
-import { ComputeGraph } from '@dxos/conductor';
-import { type Ref$ } from '@dxos/echo-schema';
-import { FunctionType } from '@dxos/functions';
+import { Type } from '@dxos/echo';
 export declare const ApiAuthorization: Schema.Union<[Schema.Struct<{
     type: Schema.Literal<["api-key"]>;
     key: typeof Schema.String;
@@ -21,10 +19,54 @@ export declare const ApiAuthorization: Schema.Union<[Schema.Struct<{
 export type ApiAuthorization = Schema.Schema.Type<typeof ApiAuthorization>;
 declare const ServiceInterface: Schema.Union<[Schema.Struct<{
     kind: Schema.Literal<["function"]>;
-    fn: Ref$<FunctionType>;
+    fn: import("@dxos/echo-schema").Ref$<import("@dxos/echo-schema").TypedObjectFields<{
+        name: typeof Schema.NonEmptyString;
+        version: typeof Schema.String;
+        description: Schema.optional<typeof Schema.String>;
+        source: Schema.optional<import("@dxos/echo-schema").Ref$<{
+            readonly id: string;
+            name?: string | undefined;
+            description?: string | undefined;
+            changed?: boolean | undefined;
+            source: import("@dxos/echo-schema").Ref<{
+                readonly id: string;
+                content: string;
+            }>;
+        }>>;
+        inputSchema: Schema.optional<Schema.Schema<Type.JsonSchema, Type.JsonSchema, never>>;
+        outputSchema: Schema.optional<Schema.Schema<Type.JsonSchema, Type.JsonSchema, never>>;
+        binding: Schema.optional<typeof Schema.String>;
+    }, import("@dxos/echo-schema").TypedObjectOptions>>;
 }>, Schema.Struct<{
     kind: Schema.Literal<["workflow"]>;
-    workflow: Ref$<ComputeGraph>;
+    workflow: import("@dxos/echo-schema").Ref$<{
+        readonly id: string;
+        graph: {
+            readonly id?: string | undefined;
+            readonly nodes: {
+                readonly id: string;
+                readonly type?: string | undefined;
+                readonly data?: any;
+            }[];
+            readonly edges: {
+                readonly id: string;
+                readonly type?: string | undefined;
+                readonly source: string;
+                readonly data?: any;
+                readonly target: string;
+            }[];
+        };
+        input?: {
+            readonly id: string;
+            readonly type?: string | undefined;
+            readonly data?: any;
+        } | undefined;
+        output?: {
+            readonly id: string;
+            readonly type?: string | undefined;
+            readonly data?: any;
+        } | undefined;
+    }>;
 }>, Schema.Struct<{
     kind: Schema.Literal<["api"]>;
     /**
@@ -67,10 +109,54 @@ declare const ServiceType_base: import("@dxos/echo-schema").TypedObjectPrototype
      */
     interfaces: Schema.optional<Schema.Array$<Schema.Union<[Schema.Struct<{
         kind: Schema.Literal<["function"]>;
-        fn: Ref$<FunctionType>;
+        fn: import("@dxos/echo-schema").Ref$<import("@dxos/echo-schema").TypedObjectFields<{
+            name: typeof Schema.NonEmptyString;
+            version: typeof Schema.String;
+            description: Schema.optional<typeof Schema.String>;
+            source: Schema.optional<import("@dxos/echo-schema").Ref$<{
+                readonly id: string;
+                name?: string | undefined;
+                description?: string | undefined;
+                changed?: boolean | undefined;
+                source: import("@dxos/echo-schema").Ref<{
+                    readonly id: string;
+                    content: string;
+                }>;
+            }>>;
+            inputSchema: Schema.optional<Schema.Schema<Type.JsonSchema, Type.JsonSchema, never>>;
+            outputSchema: Schema.optional<Schema.Schema<Type.JsonSchema, Type.JsonSchema, never>>;
+            binding: Schema.optional<typeof Schema.String>;
+        }, import("@dxos/echo-schema").TypedObjectOptions>>;
     }>, Schema.Struct<{
         kind: Schema.Literal<["workflow"]>;
-        workflow: Ref$<ComputeGraph>;
+        workflow: import("@dxos/echo-schema").Ref$<{
+            readonly id: string;
+            graph: {
+                readonly id?: string | undefined;
+                readonly nodes: {
+                    readonly id: string;
+                    readonly type?: string | undefined;
+                    readonly data?: any;
+                }[];
+                readonly edges: {
+                    readonly id: string;
+                    readonly type?: string | undefined;
+                    readonly source: string;
+                    readonly data?: any;
+                    readonly target: string;
+                }[];
+            };
+            input?: {
+                readonly id: string;
+                readonly type?: string | undefined;
+                readonly data?: any;
+            } | undefined;
+            output?: {
+                readonly id: string;
+                readonly type?: string | undefined;
+                readonly data?: any;
+            } | undefined;
+        }>;
     }>, Schema.Struct<{
         kind: Schema.Literal<["api"]>;
         /**
@@ -112,10 +198,54 @@ declare const ServiceType_base: import("@dxos/echo-schema").TypedObjectPrototype
      */
     interfaces: Schema.optional<Schema.Array$<Schema.Union<[Schema.Struct<{
         kind: Schema.Literal<["function"]>;
-        fn: Ref$<FunctionType>;
+        fn: import("@dxos/echo-schema").Ref$<import("@dxos/echo-schema").TypedObjectFields<{
+            name: typeof Schema.NonEmptyString;
+            version: typeof Schema.String;
+            description: Schema.optional<typeof Schema.String>;
+            source: Schema.optional<import("@dxos/echo-schema").Ref$<{
+                readonly id: string;
+                name?: string | undefined;
+                description?: string | undefined;
+                changed?: boolean | undefined;
+                source: import("@dxos/echo-schema").Ref<{
+                    readonly id: string;
+                    content: string;
+                }>;
+            }>>;
+            inputSchema: Schema.optional<Schema.Schema<Type.JsonSchema, Type.JsonSchema, never>>;
+            outputSchema: Schema.optional<Schema.Schema<Type.JsonSchema, Type.JsonSchema, never>>;
+            binding: Schema.optional<typeof Schema.String>;
+        }, import("@dxos/echo-schema").TypedObjectOptions>>;
     }>, Schema.Struct<{
         kind: Schema.Literal<["workflow"]>;
-        workflow: Ref$<ComputeGraph>;
+        workflow: import("@dxos/echo-schema").Ref$<{
+            readonly id: string;
+            graph: {
+                readonly id?: string | undefined;
+                readonly nodes: {
+                    readonly id: string;
+                    readonly type?: string | undefined;
+                    readonly data?: any;
+                }[];
+                readonly edges: {
+                    readonly id: string;
+                    readonly type?: string | undefined;
+                    readonly source: string;
+                    readonly data?: any;
+                    readonly target: string;
+                }[];
+            };
+            input?: {
+                readonly id: string;
+                readonly type?: string | undefined;
+                readonly data?: any;
+            } | undefined;
+            output?: {
+                readonly id: string;
+                readonly type?: string | undefined;
+                readonly data?: any;
+            } | undefined;
+        }>;
     }>, Schema.Struct<{
         kind: Schema.Literal<["api"]>;
         /**

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,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAoB,KAAK,IAAI,EAAE,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAwB/C,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;IAA2D,CAAC;AACzF,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;AA+B3E,QAAA,MAAM,gBAAgB;;QA3BK,IAAI,CAAC,YAAY,CAAC;;;cAKZ,IAAI,CAAC,YAAY,CAAC;;;IAMjD;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;;;;;;;;;;;;;;;;IAIyG,CAAC;AAC/G,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;;;;;;;IASzE;;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,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AA0BlC,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;IAA2D,CAAC;AACzF,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;AA+B3E,QAAA,MAAM,gBAAgB;;;;;;;;gBA/B6C,CAAC;uBAEnC,CAAA;mBACZ,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAYpB;;OAEG;;IAGH;;OAEG;;IAGH;;OAEG;;;;;;;;;;;;;;;;;IAIyG,CAAC;AAC/G,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;;;;;;;IAYzE;;OAEG;;;;;;;;;oBA9C8D,CAAC;2BAEnC,CAAA;uBACZ,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAYpB;;WAEG;;QAGH;;WAEG;;QAGH;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;IAiBH;;OAEG;;;;;;;;;oBA9C8D,CAAC;2BAEnC,CAAA;uBACZ,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAYpB;;WAEG;;QAGH;;WAEG;;QAGH;;WAEG;;;;;;;;;;;;;;;;;;;AAOL,qBAAa,WAAY,SAAQ,gBAc/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.map

@@ -1 +1 @@
-{"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"}
+{"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,iBAShC;CAAG"}

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

@@ -1,5 +1,4 @@
 import { Schema } from 'effect';
-import { TemplateType } from './template';
 export declare namespace AssistantAction {
     const CreateChat_base: Schema.TaggedClass<CreateChat, "dxos.org/plugin/assistant/action/create-chat", {
         readonly _tag: Schema.tag<"dxos.org/plugin/assistant/action/create-chat">;
@@ -12,23 +11,30 @@ export declare namespace AssistantAction {
             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>;
+                queue: import("@dxos/echo-schema").Ref$<import("@dxos/echo-db").Queue<import("@dxos/echo-schema").AnyEchoObject>>;
             }>, {}>;
         }>;
     }>;
     export class CreateChat extends CreateChat_base {
     }
-    const CreateTemplate_base: Schema.TaggedClass<CreateTemplate, "dxos.org/plugin/assistant/action/create-template", {
-        readonly _tag: Schema.tag<"dxos.org/plugin/assistant/action/create-template">;
+    const CreateBlueprint_base: Schema.TaggedClass<CreateBlueprint, "dxos.org/plugin/assistant/action/create-blueprint", {
+        readonly _tag: Schema.tag<"dxos.org/plugin/assistant/action/create-blueprint">;
     } & {
         input: Schema.Struct<{
             name: Schema.optional<typeof Schema.String>;
         }>;
         output: Schema.Struct<{
-            object: typeof TemplateType;
+            object: import("@dxos/echo-schema").EchoTypeSchema<Schema.Struct<{
+                name: Schema.optional<typeof Schema.String>;
+                steps: Schema.Array$<Schema.Struct<{
+                    id: import("@dxos/keys").ObjectIdClass;
+                    instructions: typeof Schema.String;
+                    tools: Schema.optional<Schema.Array$<typeof Schema.String>>;
+                }>>;
+            }>, {}>;
         }>;
     }>;
-    export class CreateTemplate extends CreateTemplate_base {
+    export class CreateBlueprint extends CreateBlueprint_base {
     }
     export {};
 }

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,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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAQhC,yBAAiB,eAAe,CAAC;;;;;;;;;;;;;;;;IAG/B,MAAM,OAAO,UAAW,SAAQ,eAQ9B;KAAG;;;;;;;;;;;;;;;;;;IAEL,MAAM,OAAO,eAAgB,SAAQ,oBAOnC;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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.2",
+  "version": "0.8.3-main.7f5a14c",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -44,62 +44,64 @@
     "@preact/signals-core": "^1.9.0",
     "@xiechao/codemirror-lang-handlebars": "1.0.4",
     "exa-js": "^1.5.12",
+    "json5": "^2.2.3",
     "jsonpointer": "^5.0.1",
     "lodash.defaultsdeep": "^4.6.1",
     "unified": "^11.0.0",
-    "@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"
+    "@dxos/app-framework": "0.8.3-main.7f5a14c",
+    "@dxos/artifact": "0.8.3-main.7f5a14c",
+    "@dxos/async": "0.8.3-main.7f5a14c",
+    "@dxos/assistant": "0.8.3-main.7f5a14c",
+    "@dxos/ai": "0.8.3-main.7f5a14c",
+    "@dxos/conductor": "0.8.3-main.7f5a14c",
+    "@dxos/client": "0.8.3-main.7f5a14c",
+    "@dxos/compute": "0.8.3-main.7f5a14c",
+    "@dxos/context": "0.8.3-main.7f5a14c",
+    "@dxos/echo": "0.8.3-main.7f5a14c",
+    "@dxos/config": "0.8.3-main.7f5a14c",
+    "@dxos/echo-db": "0.8.3-main.7f5a14c",
+    "@dxos/echo-protocol": "0.8.3-main.7f5a14c",
+    "@dxos/debug": "0.8.3-main.7f5a14c",
+    "@dxos/edge-client": "0.8.3-main.7f5a14c",
+    "@dxos/echo-schema": "0.8.3-main.7f5a14c",
+    "@dxos/effect": "0.8.3-main.7f5a14c",
+    "@dxos/functions": "0.8.3-main.7f5a14c",
+    "@dxos/graph": "0.8.3-main.7f5a14c",
+    "@dxos/keys": "0.8.3-main.7f5a14c",
+    "@dxos/live-object": "0.8.3-main.7f5a14c",
+    "@dxos/local-storage": "0.8.3-main.7f5a14c",
+    "@dxos/log": "0.8.3-main.7f5a14c",
+    "@dxos/invariant": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-client": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-deck": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-explorer": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-graph": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-markdown": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-script": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-preview": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-sketch": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-inbox": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-stack": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-space": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-transcription": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-wnfs": "0.8.3-main.7f5a14c",
+    "@dxos/react-client": "0.8.3-main.7f5a14c",
+    "@dxos/react-edge-client": "0.8.3-main.7f5a14c",
+    "@dxos/protocols": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-attention": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-canvas-compute": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-canvas-editor": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-dnd": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-components": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-form": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-graph": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-list": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-editor": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-sfx": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-stack": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-syntax-highlighter": "0.8.3-main.7f5a14c",
+    "@dxos/schema": "0.8.3-main.7f5a14c",
+    "@dxos/util": "0.8.3-main.7f5a14c"
   },
   "devDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -112,18 +114,18 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@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"
+    "@dxos/artifact-testing": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-chess": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-inbox": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-map": "0.8.3-main.7f5a14c",
+    "@dxos/echo-db": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-markdown": "0.8.3-main.7f5a14c",
+    "@dxos/plugin-table": "0.8.3-main.7f5a14c",
+    "@dxos/random": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-menu": "0.8.3-main.7f5a14c",
+    "@dxos/storybook-utils": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-theme": "0.8.3-main.7f5a14c"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -131,8 +133,8 @@
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.2",
-    "@dxos/react-ui-theme": "0.8.2"
+    "@dxos/react-ui": "0.8.3-main.7f5a14c",
+    "@dxos/react-ui-theme": "0.8.3-main.7f5a14c"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -3,15 +3,16 @@
 //
 
 import {
-  allOf,
   Capabilities,
+  Events,
+  allOf,
   contributes,
   createIntent,
   defineModule,
   definePlugin,
-  Events,
 } from '@dxos/app-framework';
-import { getSchemaTypename } from '@dxos/echo-schema';
+import { Blueprint } from '@dxos/assistant';
+import { Type } from '@dxos/echo';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
 import { SpaceCapabilities } from '@dxos/plugin-space';
 import { defineObjectForm } from '@dxos/plugin-space/types';
@@ -38,13 +39,13 @@ export const AssistantPlugin = () =>
       activatesOn: Events.SetupMetadata,
       activate: () => [
         contributes(Capabilities.Metadata, {
-          id: TemplateType.typename,
+          id: Type.getTypename(Blueprint),
           metadata: {
-            icon: 'ph--code-block--regular',
+            icon: 'ph--blueprint--regular',
           },
         }),
         contributes(Capabilities.Metadata, {
-          id: getSchemaTypename(AIChatType)!,
+          id: Type.getTypename(AIChatType),
           metadata: {
             icon: 'ph--atom--regular',
           },
@@ -65,9 +66,8 @@ export const AssistantPlugin = () =>
         contributes(
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
-            objectSchema: TemplateType,
-            hidden: true,
-            getIntent: () => createIntent(AssistantAction.CreateTemplate),
+            objectSchema: Blueprint,
+            getIntent: () => createIntent(AssistantAction.CreateBlueprint),
           }),
         ),
       ],

package/src/capabilities/ai-client.ts

@@ -18,8 +18,7 @@ const DEFAULT_AI_SERVICE_URL = 'http://localhost:8788';
 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 aiClient = signal<AIServiceClient>(new AIServiceEdgeClient({ endpoint }));
 
   const unsubscribe = effect(() => {
     const settings = context
@@ -27,11 +26,17 @@ export default (context: PluginContext) => {
       .getStore<AssistantSettingsProps>(ASSISTANT_PLUGIN)?.value;
 
     if (settings?.llmProvider === 'ollama') {
-      ai.value = new OllamaClient();
+      aiClient.value = new OllamaClient();
     } else {
-      ai.value = new AIServiceEdgeClient({ endpoint });
+      aiClient.value = new AIServiceEdgeClient({
+        endpoint,
+        defaultGenerationOptions: {
+          // model: '@anthropic/claude-sonnet-4-20250514',
+          model: '@anthropic/claude-3-5-haiku-20241022',
+        },
+      });
     }
   });
 
-  return contributes(AssistantCapabilities.AiClient, ai, () => unsubscribe());
+  return contributes(AssistantCapabilities.AiClient, aiClient, () => unsubscribe());
 };

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

@@ -13,7 +13,7 @@ import {
   type PromiseIntentDispatcher,
   type PluginContext,
 } from '@dxos/app-framework';
-import { isInstanceOf } from '@dxos/echo-schema';
+import { Obj } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
@@ -23,12 +23,11 @@ import { SPACE_TYPE, SpaceAction } from '@dxos/plugin-space/types';
 import {
   type Space,
   Filter,
+  Query,
+  type QueryResult,
   fullyQualifiedId,
   getSpace,
   isSpace,
-  Query,
-  type QueryResult,
-  isEchoObject,
 } from '@dxos/react-client/echo';
 
 import { ASSISTANT_DIALOG, ASSISTANT_PLUGIN } from '../meta';
@@ -107,37 +106,41 @@ export default (context: PluginContext) =>
       id: `${ASSISTANT_PLUGIN}/object-chat-companion`,
       connector: (node) => {
         let query: QueryResult<AIChatType> | undefined;
-        return Rx.make((get) =>
-          pipe(
-            get(node),
-            Option.flatMap((node) => (isEchoObject(node.data) ? Option.some(node.data) : Option.none())),
-            Option.flatMap((object) => {
-              const space = getSpace(object);
-              return space ? Option.some({ space, object }) : Option.none();
-            }),
-            Option.map(({ space, object }) => {
-              if (!query) {
-                query = space.db.query(Query.select(Filter.ids(object.id)).targetOf(CompanionTo).source());
-              }
+        return Rx.make((get) => {
+          const nodeOption = get(node);
+          if (Option.isNone(nodeOption)) {
+            return [];
+          }
 
-              const chat = get(rxFromQuery(query))[0];
-              return [
-                {
-                  id: [fullyQualifiedId(object), 'assistant-chat'].join(ATTENDABLE_PATH_SEPARATOR),
-                  type: PLANK_COMPANION_TYPE,
-                  data: chat ?? 'assistant-chat',
-                  properties: {
-                    label: ['assistant chat label', { ns: ASSISTANT_PLUGIN }],
-                    icon: 'ph--sparkle--regular',
-                    position: 'hoist',
-                    disposition: 'hidden',
-                  },
-                },
-              ];
-            }),
-            Option.getOrElse(() => []),
-          ),
-        );
+          const object = nodeOption.value.data;
+          if (!Obj.isObject(object)) {
+            return [];
+          }
+
+          const space = getSpace(object);
+          if (!space) {
+            return [];
+          }
+
+          if (!query) {
+            query = space.db.query(Query.select(Filter.ids(object.id)).targetOf(CompanionTo).source());
+          }
+
+          const chat = get(rxFromQuery(query))[0];
+          return [
+            {
+              id: [fullyQualifiedId(object), 'assistant-chat'].join(ATTENDABLE_PATH_SEPARATOR),
+              type: PLANK_COMPANION_TYPE,
+              data: chat ?? 'assistant-chat',
+              properties: {
+                label: ['assistant chat label', { ns: ASSISTANT_PLUGIN }],
+                icon: 'ph--sparkle--regular',
+                position: 'hoist',
+                disposition: 'hidden',
+              },
+            },
+          ];
+        });
       },
     }),
 
@@ -227,7 +230,7 @@ const getOrCreateChat = async (dispatch: PromiseIntentDispatcher, space: Space):
   }
 
   const { data } = await dispatch(createIntent(AssistantAction.CreateChat, { space }));
-  invariant(isInstanceOf(AIChatType, data?.object));
+  invariant(Obj.instanceOf(AIChatType, data?.object));
   await dispatch(createIntent(SpaceAction.AddObject, { target: space, object: data.object }));
   return data.object;
 };

package/src/capabilities/capabilities.ts

@@ -9,6 +9,7 @@ import { defineCapability } from '@dxos/app-framework';
 
 import { ASSISTANT_PLUGIN } from '../meta';
 
+// TODO(burdon): Move to types to import from other plugins?
 export namespace AssistantCapabilities {
   export const AiClient = defineCapability<ReadonlySignal<AIServiceClient>>(`${ASSISTANT_PLUGIN}/capability/ai-client`);
 }