@dxos/plugin-assistant 0.8.4-main.2e9d522 → 0.8.4-main.5acf9ea

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.4-main.2e9d522",
+  "version": "0.8.4-main.5acf9ea",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,12 +12,14 @@
     ".": {
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "node": "./dist/lib/node-esm/index.mjs",
+      "source": "./src/index.ts"
     },
     "./types": {
       "types": "./dist/types/src/types/index.d.ts",
       "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs"
+      "node": "./dist/lib/node-esm/types/index.mjs",
+      "source": "./src/types/index.ts"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -53,62 +55,62 @@
     "lodash.defaultsdeep": "^4.6.1",
     "unified": "^11.0.0",
     "use-deep-compare-effect": "^1.8.1",
-    "@dxos/ai": "0.8.4-main.2e9d522",
-    "@dxos/app-framework": "0.8.4-main.2e9d522",
-    "@dxos/assistant": "0.8.4-main.2e9d522",
-    "@dxos/async": "0.8.4-main.2e9d522",
-    "@dxos/blueprints": "0.8.4-main.2e9d522",
-    "@dxos/client": "0.8.4-main.2e9d522",
-    "@dxos/compute": "0.8.4-main.2e9d522",
-    "@dxos/conductor": "0.8.4-main.2e9d522",
-    "@dxos/config": "0.8.4-main.2e9d522",
-    "@dxos/debug": "0.8.4-main.2e9d522",
-    "@dxos/context": "0.8.4-main.2e9d522",
-    "@dxos/devtools": "0.8.4-main.2e9d522",
-    "@dxos/echo": "0.8.4-main.2e9d522",
-    "@dxos/echo-protocol": "0.8.4-main.2e9d522",
-    "@dxos/echo-db": "0.8.4-main.2e9d522",
-    "@dxos/echo-schema": "0.8.4-main.2e9d522",
-    "@dxos/edge-client": "0.8.4-main.2e9d522",
-    "@dxos/effect": "0.8.4-main.2e9d522",
-    "@dxos/functions": "0.8.4-main.2e9d522",
-    "@dxos/graph": "0.8.4-main.2e9d522",
-    "@dxos/live-object": "0.8.4-main.2e9d522",
-    "@dxos/keys": "0.8.4-main.2e9d522",
-    "@dxos/local-storage": "0.8.4-main.2e9d522",
-    "@dxos/invariant": "0.8.4-main.2e9d522",
-    "@dxos/log": "0.8.4-main.2e9d522",
-    "@dxos/plugin-client": "0.8.4-main.2e9d522",
-    "@dxos/plugin-deck": "0.8.4-main.2e9d522",
-    "@dxos/plugin-explorer": "0.8.4-main.2e9d522",
-    "@dxos/plugin-graph": "0.8.4-main.2e9d522",
-    "@dxos/plugin-inbox": "0.8.4-main.2e9d522",
-    "@dxos/plugin-markdown": "0.8.4-main.2e9d522",
-    "@dxos/plugin-script": "0.8.4-main.2e9d522",
-    "@dxos/plugin-preview": "0.8.4-main.2e9d522",
-    "@dxos/plugin-sketch": "0.8.4-main.2e9d522",
-    "@dxos/plugin-space": "0.8.4-main.2e9d522",
-    "@dxos/plugin-stack": "0.8.4-main.2e9d522",
-    "@dxos/plugin-transcription": "0.8.4-main.2e9d522",
-    "@dxos/plugin-wnfs": "0.8.4-main.2e9d522",
-    "@dxos/react-client": "0.8.4-main.2e9d522",
-    "@dxos/react-edge-client": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-attention": "0.8.4-main.2e9d522",
-    "@dxos/protocols": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-canvas-compute": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-chat": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-components": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-form": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-editor": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-graph": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-list": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-sfx": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-stack": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-tag-picker": "0.8.4-main.2e9d522",
-    "@dxos/schema": "0.8.4-main.2e9d522",
-    "@dxos/util": "0.8.4-main.2e9d522"
+    "@dxos/ai": "0.8.4-main.5acf9ea",
+    "@dxos/app-framework": "0.8.4-main.5acf9ea",
+    "@dxos/assistant": "0.8.4-main.5acf9ea",
+    "@dxos/async": "0.8.4-main.5acf9ea",
+    "@dxos/blueprints": "0.8.4-main.5acf9ea",
+    "@dxos/compute": "0.8.4-main.5acf9ea",
+    "@dxos/client": "0.8.4-main.5acf9ea",
+    "@dxos/config": "0.8.4-main.5acf9ea",
+    "@dxos/conductor": "0.8.4-main.5acf9ea",
+    "@dxos/context": "0.8.4-main.5acf9ea",
+    "@dxos/debug": "0.8.4-main.5acf9ea",
+    "@dxos/echo": "0.8.4-main.5acf9ea",
+    "@dxos/devtools": "0.8.4-main.5acf9ea",
+    "@dxos/echo-protocol": "0.8.4-main.5acf9ea",
+    "@dxos/echo-schema": "0.8.4-main.5acf9ea",
+    "@dxos/echo-db": "0.8.4-main.5acf9ea",
+    "@dxos/edge-client": "0.8.4-main.5acf9ea",
+    "@dxos/effect": "0.8.4-main.5acf9ea",
+    "@dxos/functions": "0.8.4-main.5acf9ea",
+    "@dxos/invariant": "0.8.4-main.5acf9ea",
+    "@dxos/graph": "0.8.4-main.5acf9ea",
+    "@dxos/keys": "0.8.4-main.5acf9ea",
+    "@dxos/local-storage": "0.8.4-main.5acf9ea",
+    "@dxos/log": "0.8.4-main.5acf9ea",
+    "@dxos/live-object": "0.8.4-main.5acf9ea",
+    "@dxos/plugin-client": "0.8.4-main.5acf9ea",
+    "@dxos/plugin-deck": "0.8.4-main.5acf9ea",
+    "@dxos/plugin-explorer": "0.8.4-main.5acf9ea",
+    "@dxos/plugin-graph": "0.8.4-main.5acf9ea",
+    "@dxos/plugin-markdown": "0.8.4-main.5acf9ea",
+    "@dxos/plugin-inbox": "0.8.4-main.5acf9ea",
+    "@dxos/plugin-preview": "0.8.4-main.5acf9ea",
+    "@dxos/plugin-script": "0.8.4-main.5acf9ea",
+    "@dxos/plugin-sketch": "0.8.4-main.5acf9ea",
+    "@dxos/plugin-space": "0.8.4-main.5acf9ea",
+    "@dxos/plugin-stack": "0.8.4-main.5acf9ea",
+    "@dxos/plugin-wnfs": "0.8.4-main.5acf9ea",
+    "@dxos/plugin-transcription": "0.8.4-main.5acf9ea",
+    "@dxos/protocols": "0.8.4-main.5acf9ea",
+    "@dxos/react-client": "0.8.4-main.5acf9ea",
+    "@dxos/react-edge-client": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-attention": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-chat": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-components": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-editor": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-form": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-list": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-graph": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-sfx": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-stack": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-tag-picker": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.5acf9ea",
+    "@dxos/schema": "0.8.4-main.5acf9ea",
+    "@dxos/util": "0.8.4-main.5acf9ea"
   },
   "devDependencies": {
     "@effect-rx/rx-react": "^0.38.0",
@@ -121,18 +123,18 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/assistant-testing": "0.8.4-main.2e9d522",
-    "@dxos/echo-db": "0.8.4-main.2e9d522",
-    "@dxos/plugin-chess": "0.8.4-main.2e9d522",
-    "@dxos/plugin-inbox": "0.8.4-main.2e9d522",
-    "@dxos/plugin-markdown": "0.8.4-main.2e9d522",
-    "@dxos/plugin-map": "0.8.4-main.2e9d522",
-    "@dxos/plugin-table": "0.8.4-main.2e9d522",
-    "@dxos/react-ui": "0.8.4-main.2e9d522",
-    "@dxos/random": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-menu": "0.8.4-main.2e9d522",
-    "@dxos/storybook-utils": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-theme": "0.8.4-main.2e9d522"
+    "@dxos/assistant-testing": "0.8.4-main.5acf9ea",
+    "@dxos/echo-db": "0.8.4-main.5acf9ea",
+    "@dxos/plugin-chess": "0.8.4-main.5acf9ea",
+    "@dxos/plugin-inbox": "0.8.4-main.5acf9ea",
+    "@dxos/plugin-map": "0.8.4-main.5acf9ea",
+    "@dxos/plugin-table": "0.8.4-main.5acf9ea",
+    "@dxos/random": "0.8.4-main.5acf9ea",
+    "@dxos/plugin-markdown": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-menu": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-theme": "0.8.4-main.5acf9ea",
+    "@dxos/storybook-utils": "0.8.4-main.5acf9ea"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -140,8 +142,8 @@
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-theme": "0.8.4-main.2e9d522"
+    "@dxos/react-ui": "0.8.4-main.5acf9ea",
+    "@dxos/react-ui-theme": "0.8.4-main.5acf9ea"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -2,8 +2,11 @@
 // Copyright 2023 DXOS.org
 //
 
+import { Layer } from 'effect';
+
+import { AiServiceTestingPreset } from '@dxos/ai/testing';
 import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
-import { Template } from '@dxos/blueprints';
+import { Blueprint } from '@dxos/blueprints';
 import { Sequence } from '@dxos/conductor';
 import { Type } from '@dxos/echo';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
@@ -11,6 +14,7 @@ import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
 import { defineObjectForm } from '@dxos/plugin-space/types';
 
 import { AppGraphBuilder, IntentResolver, ReactSurface, Settings } from './capabilities';
+import { AssistantCapabilities } from './capability-definitions';
 import { meta } from './meta';
 import { translations } from './translations';
 import { Assistant, ServiceType } from './types';
@@ -32,15 +36,21 @@ export const AssistantPlugin = () =>
       activatesOn: Events.SetupMetadata,
       activate: () => [
         contributes(Capabilities.Metadata, {
-          id: Type.getTypename(Sequence),
+          id: Type.getTypename(Assistant.Chat),
           metadata: {
-            icon: 'ph--circuitry--regular',
+            icon: 'ph--atom--regular',
           },
         }),
         contributes(Capabilities.Metadata, {
-          id: Type.getTypename(Assistant.Chat),
+          id: Type.getTypename(Blueprint.Blueprint),
           metadata: {
-            icon: 'ph--atom--regular',
+            icon: 'ph--blueprint--regular',
+          },
+        }),
+        contributes(Capabilities.Metadata, {
+          id: Type.getTypename(Sequence),
+          metadata: {
+            icon: 'ph--circuitry--regular',
           },
         }),
       ],
@@ -56,6 +66,14 @@ export const AssistantPlugin = () =>
             getIntent: (_, options) => createIntent(Assistant.CreateChat, { space: options.space }),
           }),
         ),
+        contributes(
+          SpaceCapabilities.ObjectForm,
+          defineObjectForm({
+            objectSchema: Blueprint.Blueprint,
+            formSchema: Assistant.BlueprintForm,
+            getIntent: (props) => createIntent(Assistant.CreateBlueprint, props),
+          }),
+        ),
         contributes(
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
@@ -68,7 +86,7 @@ export const AssistantPlugin = () =>
     defineModule({
       id: `${meta.id}/module/schema`,
       activatesOn: ClientEvents.SetupSchema,
-      activate: () => contributes(ClientCapabilities.Schema, [ServiceType, Template.Template, Assistant.CompanionTo]),
+      activate: () => contributes(ClientCapabilities.Schema, [ServiceType, Assistant.CompanionTo]),
     }),
     defineModule({
       id: `${meta.id}/module/on-space-created`,
@@ -95,4 +113,12 @@ export const AssistantPlugin = () =>
       activatesBefore: [Events.SetupArtifactDefinition],
       activate: ReactSurface,
     }),
+    defineModule({
+      id: `${meta.id}/module/ai-service`,
+      activatesOn: Events.Startup,
+      activate: () => [
+        // TODO(dmaretskyi): Read config from settings.
+        contributes(AssistantCapabilities.AiServiceLayer, AiServiceTestingPreset('edge-remote').pipe(Layer.orDie)),
+      ],
+    }),
   ]);

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

@@ -13,7 +13,6 @@ import {
   type PromiseIntentDispatcher,
   type PluginContext,
 } from '@dxos/app-framework';
-import { Template } from '@dxos/blueprints';
 import { Sequence } from '@dxos/conductor';
 import { Obj } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
@@ -21,16 +20,8 @@ import { ClientCapabilities } from '@dxos/plugin-client';
 import { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
 import { createExtension, ROOT_ID } from '@dxos/plugin-graph';
 import { getActiveSpace, rxFromQuery } from '@dxos/plugin-space';
-import { SPACE_TYPE, SpaceAction } from '@dxos/plugin-space/types';
-import {
-  type Space,
-  Filter,
-  Query,
-  type QueryResult,
-  fullyQualifiedId,
-  getSpace,
-  isSpace,
-} from '@dxos/react-client/echo';
+import { SpaceAction } from '@dxos/plugin-space/types';
+import { type Space, Filter, Query, type QueryResult, fullyQualifiedId, getSpace } from '@dxos/react-client/echo';
 
 import { ASSISTANT_DIALOG, meta } from '../meta';
 import { Assistant } from '../types';
@@ -152,81 +143,6 @@ export default (context: PluginContext) =>
           ),
         ),
     }),
-
-    createExtension({
-      id: `${meta.id}/root`,
-      connector: (node) => {
-        let query: QueryResult<Template.Template> | undefined;
-        return Rx.make((get) =>
-          pipe(
-            get(node),
-            Option.flatMap((node) =>
-              node.type === SPACE_TYPE && isSpace(node.data) ? Option.some(node.data) : Option.none(),
-            ),
-            Option.map((space) => {
-              if (!query) {
-                query = space.db.query(Query.type(Template.Template));
-              }
-
-              const templates = get(rxFromQuery(query));
-              return templates.length > 0
-                ? [
-                    {
-                      id: `${meta.id}/templates`,
-                      type: `${meta.id}/templates`,
-                      data: null,
-                      properties: {
-                        label: ['templates label', { ns: meta.id }],
-                        icon: 'ph--file-code--regular',
-                        space,
-                      },
-                    },
-                  ]
-                : [];
-            }),
-            Option.getOrElse(() => []),
-          ),
-        );
-      },
-    }),
-
-    createExtension({
-      id: `${meta.id}/templates`,
-      connector: (node) => {
-        let query: QueryResult<Template.Template> | undefined;
-        return Rx.make((get) =>
-          pipe(
-            get(node),
-            Option.flatMap((node) =>
-              node.id === `${meta.id}/templates` && isSpace(node.properties.space)
-                ? Option.some(node.properties.space)
-                : Option.none(),
-            ),
-            Option.map((space) => {
-              if (!query) {
-                query = space.db.query(Query.type(Template.Template));
-              }
-              return get(rxFromQuery(query))
-                .toSorted((a, b) => {
-                  const nameA = a.name ?? '';
-                  const nameB = b.name ?? '';
-                  return nameA.localeCompare(nameB);
-                })
-                .map((template) => ({
-                  id: fullyQualifiedId(template),
-                  type: `${meta.id}/template`,
-                  data: template,
-                  properties: {
-                    label: template.name ?? ['object placeholder', { ns: meta.id }],
-                    icon: 'ph--file-code--regular',
-                  },
-                }));
-            }),
-            Option.getOrElse(() => []),
-          ),
-        );
-      },
-    }),
   ]);
 
 // TODO(burdon): Factor out.

package/src/capabilities/intent-resolver.ts

@@ -5,6 +5,7 @@
 import { Effect } from 'effect';
 
 import { Capabilities, contributes, createIntent, createResolver, type PluginContext } from '@dxos/app-framework';
+import { Blueprint } from '@dxos/blueprints';
 import { Sequence } from '@dxos/conductor';
 import { Key, Obj, Ref } from '@dxos/echo';
 import { CollectionAction } from '@dxos/plugin-space/types';
@@ -18,13 +19,20 @@ export default (context: PluginContext) => [
       resolve: ({ space, rootCollection }) =>
         Effect.gen(function* () {
           const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-          const { object: collection } = yield* dispatch(
+          const { object: chatCollection } = yield* dispatch(
             createIntent(CollectionAction.CreateQueryCollection, { typename: Assistant.Chat.typename }),
           );
-          rootCollection.objects.push(Ref.make(collection));
+          const { object: blueprintCollection } = yield* dispatch(
+            createIntent(CollectionAction.CreateQueryCollection, { typename: Blueprint.Blueprint.typename }),
+          );
+          rootCollection.objects.push(Ref.make(chatCollection), Ref.make(blueprintCollection));
 
           const { object: chat } = yield* dispatch(createIntent(Assistant.CreateChat, { space }));
           space.db.add(chat);
+
+          // TODO(wittjosiah): Create default blueprint.
+          // const { object: blueprint } = yield* dispatch(createIntent(Assistant.CreateBlueprint, { ... }));
+          // space.db.add(blueprint);
         }),
     }),
     createResolver({
@@ -38,6 +46,12 @@ export default (context: PluginContext) => [
         },
       }),
     }),
+    createResolver({
+      intent: Assistant.CreateBlueprint,
+      resolve: ({ name, description }) => ({
+        data: { object: Blueprint.make({ name, description }) },
+      }),
+    }),
     createResolver({
       intent: Assistant.CreateSequence,
       resolve: ({ name }) => ({

package/src/capabilities/react-surface.tsx

@@ -6,7 +6,7 @@ import { Effect } from 'effect';
 import React, { useEffect, useMemo } from 'react';
 
 import { Capabilities, contributes, createIntent, createSurface, useIntentDispatcher } from '@dxos/app-framework';
-import { Template } from '@dxos/blueprints';
+import { Blueprint } from '@dxos/blueprints';
 import { fullyQualifiedId, getSpace, getTypename } from '@dxos/client/echo';
 import { Sequence } from '@dxos/conductor';
 import { InvocationTraceContainer } from '@dxos/devtools';
@@ -17,11 +17,11 @@ import { StackItem } from '@dxos/react-ui-stack';
 
 import {
   AssistantSettings,
+  BlueprintContainer,
   ChatContainer,
   ChatDialog,
   PromptSettings,
   SequenceContainer,
-  TemplateContainer,
 } from '../components';
 import { meta, ASSISTANT_DIALOG } from '../meta';
 import { Assistant } from '../types';
@@ -118,16 +118,16 @@ export default () =>
       },
     }),
     createSurface({
-      id: `${meta.id}/template`,
+      id: `${meta.id}/blueprint`,
       role: 'article',
-      filter: (data): data is { subject: Template.Template } => Obj.instanceOf(Template.Template, data.subject),
-      component: ({ data }) => <TemplateContainer template={data.subject} />,
+      filter: (data): data is { subject: Blueprint.Blueprint } => Obj.instanceOf(Blueprint.Blueprint, data.subject),
+      component: ({ data }) => <BlueprintContainer blueprint={data.subject} />,
     }),
     createSurface({
       id: `${meta.id}/prompt-settings`,
       role: 'object-settings',
-      filter: (data): data is { subject: Template.Template } => Obj.instanceOf(Template.Template, data.subject),
-      component: ({ data }) => <PromptSettings template={data.subject} />,
+      filter: (data): data is { subject: Blueprint.Blueprint } => Obj.instanceOf(Blueprint.Blueprint, data.subject),
+      component: ({ data }) => <PromptSettings template={data.subject.instructions} />,
     }),
     createSurface({
       id: ASSISTANT_DIALOG,

package/src/capability-definitions.ts

@@ -0,0 +1,15 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Layer } from 'effect';
+
+import { type AiService } from '@dxos/ai';
+import { defineCapability } from '@dxos/app-framework';
+
+import { ASSISTANT_PLUGIN } from './meta';
+
+export namespace AssistantCapabilities {
+  export type AiServiceLayer = Layer.Layer<AiService>;
+  export const AiServiceLayer = defineCapability<AiServiceLayer>(`${ASSISTANT_PLUGIN}/capability/ai-service-factory`);
+}

package/src/components/BlueprintContainer.tsx

@@ -0,0 +1,24 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React from 'react';
+
+import { type Blueprint } from '@dxos/blueprints';
+import { StackItem } from '@dxos/react-ui-stack';
+
+import { TemplateEditor } from './TemplateEditor';
+
+export type BlueprintContainerProps = {
+  blueprint: Blueprint.Blueprint;
+};
+
+export const BlueprintContainer = ({ blueprint }: BlueprintContainerProps) => {
+  return (
+    <StackItem.Content classNames='container-max-width'>
+      <TemplateEditor id={blueprint.id} template={blueprint.instructions} />
+    </StackItem.Content>
+  );
+};
+
+export default BlueprintContainer;

package/src/components/TemplateEditor/TemplateEditor.stories.tsx

@@ -8,7 +8,7 @@ import { type Meta } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
 import { createSystemPrompt } from '@dxos/assistant';
-import { Template } from '@dxos/blueprints';
+import { Blueprint, Template } from '@dxos/blueprints';
 import { useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { ColumnContainer, withLayout, withTheme } from '@dxos/storybook-utils';
@@ -35,12 +35,12 @@ const TEMPLATE = trim`
 
 const DefaultStory = ({ source }: TemplateEditorProps & { source: string }) => {
   const client = useClient();
-  const [template] = useState(() => {
+  const [blueprint] = useState(() => {
     const space = client.spaces.default;
-    return space.db.add(Template.make({ source }));
+    return space.db.add(Blueprint.make({ name: 'Test', instructions: { source } }));
   });
 
-  return <TemplateEditor template={template} />;
+  return <TemplateEditor id={blueprint.id} template={blueprint.instructions} />;
 };
 
 const meta: Meta<typeof DefaultStory> = {

package/src/components/TemplateEditor/TemplateEditor.tsx

@@ -8,7 +8,6 @@ import { handlebarsLanguage } from '@xiechao/codemirror-lang-handlebars';
 import React from 'react';
 
 import { type Template } from '@dxos/blueprints';
-import { invariant } from '@dxos/invariant';
 import { createDocAccessor } from '@dxos/react-client/echo';
 import { useThemeContext, useTranslation, type ThemedClassName } from '@dxos/react-ui';
 import {
@@ -18,6 +17,7 @@ import {
   useTextEditor,
 } from '@dxos/react-ui-editor';
 import { mx } from '@dxos/react-ui-theme';
+import { isNotFalsy } from '@dxos/util';
 
 import { meta } from '../../meta';
 
@@ -30,21 +30,23 @@ handlebarsLanguage.configure({
 });
 
 export type TemplateEditorProps = ThemedClassName<{
+  id: string;
   template: Template.Template;
 }>;
 
-export const TemplateEditor = ({ classNames, template }: TemplateEditorProps) => {
+export const TemplateEditor = ({ id, classNames, template }: TemplateEditorProps) => {
   const { t } = useTranslation(meta.id);
   const { themeMode } = useThemeContext();
   const { parentRef } = useTextEditor(() => {
-    invariant(template.source.target);
+    const text = template.source?.target;
     return {
-      initialValue: template.source.target.content,
+      initialValue: text?.content ?? '',
       extensions: [
-        createDataExtensions({
-          id: template.id,
-          text: createDocAccessor(template.source.target, ['content']),
-        }),
+        text &&
+          createDataExtensions({
+            id,
+            text: createDocAccessor(text, ['content']),
+          }),
         createBasicExtensions({
           bracketMatching: false,
           lineNumbers: true,
@@ -58,9 +60,9 @@ export const TemplateEditor = ({ classNames, template }: TemplateEditorProps) =>
 
         // https://github.com/xiechao/lang-handlebars
         new LanguageSupport(handlebarsLanguage, syntaxHighlighting(handlebarsHighlightStyle)),
-      ],
+      ].filter(isNotFalsy),
     };
-  }, [themeMode, template]);
+  }, [themeMode, template.source?.target]);
 
   return <div ref={parentRef} className={mx('h-full', classNames)} />;
 };

package/src/components/TemplateEditor/TemplateForm.stories.tsx

@@ -7,7 +7,7 @@ import '@dxos-theme';
 import { type Meta } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
-import { Template } from '@dxos/blueprints';
+import { Blueprint, Template } from '@dxos/blueprints';
 import { useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
@@ -28,14 +28,14 @@ const TEMPLATE = trim`
 
 const DefaultStory = () => {
   const client = useClient();
-  const [template] = useState(() => {
+  const [blueprint] = useState(() => {
     const space = client.spaces.default;
-    return space.db.add(Template.make({ source: TEMPLATE }));
+    return space.db.add(Blueprint.make({ name: 'Test', instructions: { source: TEMPLATE } }));
   });
 
   return (
     <div role='none' className='flex w-[40rem] border border-separator overflow-hidden'>
-      <TemplateForm template={template} />
+      <TemplateForm id={blueprint.id} template={blueprint.instructions} />
     </div>
   );
 };

package/src/components/TemplateEditor/TemplateForm.tsx

@@ -14,12 +14,13 @@ import { TemplateEditor } from './TemplateEditor';
 import { meta } from '../../meta';
 
 export type TemplateFormProps = {
+  id: string;
   template: Template.Template;
   schema?: Schema.Schema<any, any, any>;
   commandEditable?: boolean;
 };
 
-export const TemplateForm = ({ template, commandEditable = true }: TemplateFormProps) => {
+export const TemplateForm = ({ id, template, commandEditable = true }: TemplateFormProps) => {
   const { t } = useTranslation(meta.id);
   usePromptInputs(template);
 
@@ -41,7 +42,7 @@ export const TemplateForm = ({ template, commandEditable = true }: TemplateFormP
         </div>
       )} */}
 
-      <TemplateEditor template={template} classNames={[attentionSurface, 'min-h-[120px]']} />
+      <TemplateEditor id={id} template={template} classNames={[attentionSurface, 'min-h-[120px]']} />
 
       {(template.inputs?.length ?? 0) > 0 && (
         <div className='grid grid-cols-[10rem_10rem_1fr] gap-1 items-center'>

package/src/components/index.ts

@@ -14,7 +14,7 @@ export * from './Toolbox';
 //  Repro: open assistant dialog then close.
 //  https://github.com/microsoft/fluentui/issues/34020
 
+export const BlueprintContainer = lazy(() => import('./BlueprintContainer'));
 export const ChatContainer = lazy(() => import('./ChatContainer'));
 export const ChatDialog = lazy(() => import('./ChatDialog'));
 export const SequenceContainer = lazy(() => import('./SequenceContainer'));
-export const TemplateContainer = lazy(() => import('./TemplateContainer'));