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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.3",
+  "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",
@@ -39,103 +41,109 @@
     "@codemirror/search": "^6.5.6",
     "@codemirror/state": "^6.4.1",
     "@codemirror/view": "^6.34.1",
+    "@effect/ai": "0.23.0",
     "@lezer/highlight": "^1.2.1",
     "@preact-signals/safe-react": "^0.9.0",
     "@preact/signals-core": "^1.9.0",
+    "@preact/signals-react": "^3.2.0",
+    "@radix-ui/react-context": "1.1.1",
     "@xiechao/codemirror-lang-handlebars": "1.0.4",
+    "effect": "3.17.0",
     "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.3",
-    "@dxos/app-framework": "0.8.3",
-    "@dxos/artifact": "0.8.3",
-    "@dxos/assistant": "0.8.3",
-    "@dxos/client": "0.8.3",
-    "@dxos/compute": "0.8.3",
-    "@dxos/conductor": "0.8.3",
-    "@dxos/config": "0.8.3",
-    "@dxos/async": "0.8.3",
-    "@dxos/context": "0.8.3",
-    "@dxos/debug": "0.8.3",
-    "@dxos/devtools": "0.8.3",
-    "@dxos/echo-db": "0.8.3",
-    "@dxos/echo-protocol": "0.8.3",
-    "@dxos/echo-schema": "0.8.3",
-    "@dxos/edge-client": "0.8.3",
-    "@dxos/echo": "0.8.3",
-    "@dxos/effect": "0.8.3",
-    "@dxos/graph": "0.8.3",
-    "@dxos/invariant": "0.8.3",
-    "@dxos/keys": "0.8.3",
-    "@dxos/functions": "0.8.3",
-    "@dxos/live-object": "0.8.3",
-    "@dxos/log": "0.8.3",
-    "@dxos/plugin-client": "0.8.3",
-    "@dxos/local-storage": "0.8.3",
-    "@dxos/plugin-explorer": "0.8.3",
-    "@dxos/plugin-deck": "0.8.3",
-    "@dxos/plugin-inbox": "0.8.3",
-    "@dxos/plugin-graph": "0.8.3",
-    "@dxos/plugin-markdown": "0.8.3",
-    "@dxos/plugin-sketch": "0.8.3",
-    "@dxos/plugin-script": "0.8.3",
-    "@dxos/plugin-space": "0.8.3",
-    "@dxos/plugin-stack": "0.8.3",
-    "@dxos/plugin-preview": "0.8.3",
-    "@dxos/plugin-transcription": "0.8.3",
-    "@dxos/plugin-wnfs": "0.8.3",
-    "@dxos/protocols": "0.8.3",
-    "@dxos/react-edge-client": "0.8.3",
-    "@dxos/react-client": "0.8.3",
-    "@dxos/react-ui-attention": "0.8.3",
-    "@dxos/react-ui-canvas-compute": "0.8.3",
-    "@dxos/react-ui-components": "0.8.3",
-    "@dxos/react-ui-dnd": "0.8.3",
-    "@dxos/react-ui-editor": "0.8.3",
-    "@dxos/react-ui-canvas-editor": "0.8.3",
-    "@dxos/react-ui-form": "0.8.3",
-    "@dxos/react-ui-list": "0.8.3",
-    "@dxos/react-ui-graph": "0.8.3",
-    "@dxos/react-ui-sfx": "0.8.3",
-    "@dxos/util": "0.8.3",
-    "@dxos/schema": "0.8.3",
-    "@dxos/react-ui-stack": "0.8.3",
-    "@dxos/react-ui-syntax-highlighter": "0.8.3"
+    "use-deep-compare-effect": "^1.8.1",
+    "@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.34.1",
-    "@effect/platform": "0.80.12",
+    "@effect-rx/rx-react": "^0.38.0",
+    "@effect/platform": "0.89.0",
     "@types/lodash.defaultsdeep": "^4.6.6",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
-    "effect": "3.14.21",
+    "effect": "3.17.0",
     "openapi-types": "^12.1.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/artifact-testing": "0.8.3",
-    "@dxos/echo-db": "0.8.3",
-    "@dxos/plugin-inbox": "0.8.3",
-    "@dxos/plugin-chess": "0.8.3",
-    "@dxos/plugin-map": "0.8.3",
-    "@dxos/plugin-table": "0.8.3",
-    "@dxos/react-ui": "0.8.3",
-    "@dxos/react-ui-menu": "0.8.3",
-    "@dxos/random": "0.8.3",
-    "@dxos/react-ui-theme": "0.8.3",
-    "@dxos/storybook-utils": "0.8.3",
-    "@dxos/plugin-markdown": "0.8.3"
+    "@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",
-    "@effect/platform": "0.80.12",
+    "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.3",
-    "@dxos/react-ui-theme": "0.8.3"
+    "@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,28 +2,22 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Effect } from 'effect';
+import { Layer } from 'effect';
 
-import {
-  Capabilities,
-  Events,
-  allOf,
-  contributes,
-  createIntent,
-  defineModule,
-  definePlugin,
-} from '@dxos/app-framework';
-import { Blueprint } from '@dxos/assistant';
-import { Ref, Type } from '@dxos/echo';
+import { AiServiceTestingPreset } from '@dxos/ai/testing';
+import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
+import { Blueprint } from '@dxos/blueprints';
+import { Sequence } from '@dxos/conductor';
+import { Type } from '@dxos/echo';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
 import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
-import { CollectionAction, defineObjectForm } from '@dxos/plugin-space/types';
+import { defineObjectForm } from '@dxos/plugin-space/types';
 
-import { AiClient, AppGraphBuilder, IntentResolver, ReactSurface, Settings } from './capabilities';
-import { AssistantEvents } from './events';
+import { AppGraphBuilder, IntentResolver, ReactSurface, Settings } from './capabilities';
+import { AssistantCapabilities } from './capability-definitions';
 import { meta } from './meta';
-import translations from './translations';
-import { AssistantAction, AIChatType, ServiceType, TemplateType, CompanionTo } from './types';
+import { translations } from './translations';
+import { Assistant, ServiceType } from './types';
 
 export const AssistantPlugin = () =>
   definePlugin(meta, [
@@ -42,15 +36,21 @@ export const AssistantPlugin = () =>
       activatesOn: Events.SetupMetadata,
       activate: () => [
         contributes(Capabilities.Metadata, {
-          id: Type.getTypename(Blueprint),
+          id: Type.getTypename(Assistant.Chat),
+          metadata: {
+            icon: 'ph--atom--regular',
+          },
+        }),
+        contributes(Capabilities.Metadata, {
+          id: Type.getTypename(Blueprint.Blueprint),
           metadata: {
             icon: 'ph--blueprint--regular',
           },
         }),
         contributes(Capabilities.Metadata, {
-          id: Type.getTypename(AIChatType),
+          id: Type.getTypename(Sequence),
           metadata: {
-            icon: 'ph--atom--regular',
+            icon: 'ph--circuitry--regular',
           },
         }),
       ],
@@ -62,15 +62,23 @@ export const AssistantPlugin = () =>
         contributes(
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
-            objectSchema: AIChatType,
-            getIntent: (_, options) => createIntent(AssistantAction.CreateChat, { space: options.space }),
+            objectSchema: Assistant.Chat,
+            getIntent: (_, options) => createIntent(Assistant.CreateChat, { space: options.space }),
           }),
         ),
         contributes(
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
-            objectSchema: Blueprint,
-            getIntent: () => createIntent(AssistantAction.CreateBlueprint),
+            objectSchema: Blueprint.Blueprint,
+            formSchema: Assistant.BlueprintForm,
+            getIntent: (props) => createIntent(Assistant.CreateBlueprint, props),
+          }),
+        ),
+        contributes(
+          SpaceCapabilities.ObjectForm,
+          defineObjectForm({
+            objectSchema: Sequence,
+            getIntent: () => createIntent(Assistant.CreateSequence),
           }),
         ),
       ],
@@ -78,26 +86,15 @@ export const AssistantPlugin = () =>
     defineModule({
       id: `${meta.id}/module/schema`,
       activatesOn: ClientEvents.SetupSchema,
-      activate: () => contributes(ClientCapabilities.Schema, [ServiceType, TemplateType, CompanionTo]),
+      activate: () => contributes(ClientCapabilities.Schema, [ServiceType, Assistant.CompanionTo]),
     }),
     defineModule({
       id: `${meta.id}/module/on-space-created`,
       activatesOn: SpaceEvents.SpaceCreated,
-      activate: (context) => {
-        const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-        return contributes(SpaceCapabilities.OnSpaceCreated, async ({ space, rootCollection }) => {
-          const program = Effect.gen(function* () {
-            const { object: collection } = yield* dispatch(
-              createIntent(CollectionAction.CreateQueryCollection, { typename: Type.getTypename(AIChatType) }),
-            );
-            rootCollection.objects.push(Ref.make(collection));
-
-            const { object: chat } = yield* dispatch(createIntent(AssistantAction.CreateChat, { space }));
-            space.db.add(chat);
-          });
-          await Effect.runPromise(program);
-        });
-      },
+      activate: () =>
+        contributes(SpaceCapabilities.OnSpaceCreated, ({ space, rootCollection }) =>
+          createIntent(Assistant.OnSpaceCreated, { space, rootCollection }),
+        ),
     }),
     defineModule({
       id: `${meta.id}/module/app-graph-builder`,
@@ -117,9 +114,11 @@ export const AssistantPlugin = () =>
       activate: ReactSurface,
     }),
     defineModule({
-      id: `${meta.id}/module/ai-client`,
-      activatesOn: allOf(ClientEvents.ClientReady, Events.SettingsReady),
-      activatesAfter: [AssistantEvents.AiClientReady],
-      activate: AiClient,
+      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,31 +13,23 @@ import {
   type PromiseIntentDispatcher,
   type PluginContext,
 } from '@dxos/app-framework';
-import { Blueprint } from '@dxos/assistant';
+import { Sequence } from '@dxos/conductor';
 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';
 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, ASSISTANT_PLUGIN } from '../meta';
-import { AIChatType, AssistantAction, CompanionTo, TemplateType } from '../types';
+import { ASSISTANT_DIALOG, meta } from '../meta';
+import { Assistant } from '../types';
 
 export default (context: PluginContext) =>
   contributes(Capabilities.AppGraphBuilder, [
     createExtension({
-      id: `${ASSISTANT_PLUGIN}/assistant`,
+      id: `${meta.id}/assistant`,
       actions: (node) =>
         Rx.make((get) =>
           pipe(
@@ -49,7 +41,6 @@ export default (context: PluginContext) =>
                 data: async () => {
                   const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
                   const client = context.getCapability(ClientCapabilities.Client);
-
                   const space = getActiveSpace(context) ?? client.spaces.default;
                   const chat = await getOrCreateChat(dispatch, space);
                   if (!chat) {
@@ -71,7 +62,7 @@ export default (context: PluginContext) =>
                   );
                 },
                 properties: {
-                  label: ['open assistant label', { ns: ASSISTANT_PLUGIN }],
+                  label: ['open assistant label', { ns: meta.id }],
                   icon: 'ph--sparkle--regular',
                   disposition: 'pin-end',
                   position: 'hoist',
@@ -88,9 +79,9 @@ export default (context: PluginContext) =>
     }),
 
     createExtension({
-      id: `${ASSISTANT_PLUGIN}/object-chat-companion`,
+      id: `${meta.id}/object-chat-companion`,
       connector: (node) => {
-        let query: QueryResult<AIChatType> | undefined;
+        let query: QueryResult<Assistant.Chat> | undefined;
         return Rx.make((get) => {
           const nodeOption = get(node);
           if (Option.isNone(nodeOption)) {
@@ -108,7 +99,7 @@ export default (context: PluginContext) =>
           }
 
           if (!query) {
-            query = space.db.query(Query.select(Filter.ids(object.id)).targetOf(CompanionTo).source());
+            query = space.db.query(Query.select(Filter.ids(object.id)).targetOf(Assistant.CompanionTo).source());
           }
 
           const chat = get(rxFromQuery(query))[0];
@@ -118,7 +109,7 @@ export default (context: PluginContext) =>
               type: PLANK_COMPANION_TYPE,
               data: chat ?? 'assistant-chat',
               properties: {
-                label: ['assistant chat label', { ns: ASSISTANT_PLUGIN }],
+                label: ['assistant chat label', { ns: meta.id }],
                 icon: 'ph--sparkle--regular',
                 position: 'hoist',
                 disposition: 'hidden',
@@ -130,19 +121,19 @@ export default (context: PluginContext) =>
     }),
 
     createExtension({
-      id: `${ASSISTANT_PLUGIN}/blueprint-logs`,
+      id: `${meta.id}/sequence-logs`,
       connector: (node) =>
         Rx.make((get) =>
           pipe(
             get(node),
-            Option.flatMap((node) => (Obj.instanceOf(Blueprint, node.data) ? Option.some(node) : Option.none())),
+            Option.flatMap((node) => (Obj.instanceOf(Sequence, node.data) ? Option.some(node) : Option.none())),
             Option.map((node) => [
               {
                 id: [node.id, 'logs'].join(ATTENDABLE_PATH_SEPARATOR),
                 type: PLANK_COMPANION_TYPE,
                 data: 'logs',
                 properties: {
-                  label: ['blueprint logs label', { ns: ASSISTANT_PLUGIN }],
+                  label: ['sequence logs label', { ns: meta.id }],
                   icon: 'ph--clock-countdown--regular',
                   disposition: 'hidden',
                 },
@@ -152,88 +143,18 @@ export default (context: PluginContext) =>
           ),
         ),
     }),
-
-    createExtension({
-      id: `${ASSISTANT_PLUGIN}/root`,
-      connector: (node) => {
-        let query: QueryResult<TemplateType> | 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(TemplateType));
-              }
-
-              const templates = get(rxFromQuery(query));
-              return templates.length > 0
-                ? [
-                    {
-                      id: `${ASSISTANT_PLUGIN}/templates`,
-                      type: `${ASSISTANT_PLUGIN}/templates`,
-                      data: null,
-                      properties: {
-                        label: ['templates label', { ns: ASSISTANT_PLUGIN }],
-                        icon: 'ph--file-code--regular',
-                        space,
-                      },
-                    },
-                  ]
-                : [];
-            }),
-            Option.getOrElse(() => []),
-          ),
-        );
-      },
-    }),
-
-    createExtension({
-      id: `${ASSISTANT_PLUGIN}/templates`,
-      connector: (node) => {
-        let query: QueryResult<TemplateType> | undefined;
-        return Rx.make((get) =>
-          pipe(
-            get(node),
-            Option.flatMap((node) =>
-              node.id === `${ASSISTANT_PLUGIN}/templates` && isSpace(node.properties.space)
-                ? Option.some(node.properties.space)
-                : Option.none(),
-            ),
-            Option.map((space) => {
-              if (!query) {
-                query = space.db.query(Query.type(TemplateType));
-              }
-              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: `${ASSISTANT_PLUGIN}/template`,
-                  data: template,
-                  properties: {
-                    label: template.name ?? ['object placeholder', { ns: ASSISTANT_PLUGIN }],
-                    icon: 'ph--file-code--regular',
-                  },
-                }));
-            }),
-            Option.getOrElse(() => []),
-          ),
-        );
-      },
-    }),
   ]);
 
 // TODO(burdon): Factor out.
-const getOrCreateChat = async (dispatch: PromiseIntentDispatcher, space: Space): Promise<AIChatType | undefined> => {
+const getOrCreateChat = async (
+  dispatch: PromiseIntentDispatcher,
+  space: Space,
+): Promise<Assistant.Chat | undefined> => {
   // TODO(wittjosiah): This should be possible with a single query.
-  const { objects: allChats } = await space.db.query(Query.type(AIChatType)).run();
-  const { objects: relatedChats } = await space.db.query(Query.type(AIChatType).sourceOf(CompanionTo).source()).run();
+  const { objects: allChats } = await space.db.query(Query.type(Assistant.Chat)).run();
+  const { objects: relatedChats } = await space.db
+    .query(Query.type(Assistant.Chat).sourceOf(Assistant.CompanionTo).source())
+    .run();
   const chats = allChats.filter((chat) => !relatedChats.includes(chat));
   // console.log('objects', JSON.stringify(objects, null, 2));
   if (chats.length > 0) {
@@ -241,8 +162,8 @@ const getOrCreateChat = async (dispatch: PromiseIntentDispatcher, space: Space):
     return chats[chats.length - 1];
   }
 
-  const { data } = await dispatch(createIntent(AssistantAction.CreateChat, { space }));
-  invariant(Obj.instanceOf(AIChatType, data?.object));
+  const { data } = await dispatch(createIntent(Assistant.CreateChat, { space }));
+  invariant(Obj.instanceOf(Assistant.Chat, data?.object));
   await dispatch(createIntent(SpaceAction.AddObject, { target: space, object: data.object }));
   return data.object;
 };

package/src/capabilities/index.ts

@@ -4,10 +4,7 @@
 
 import { lazy } from '@dxos/app-framework';
 
-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 Settings = lazy(() => import('./settings'));
-
-export * from './capabilities';

package/src/capabilities/intent-resolver.ts

@@ -2,34 +2,61 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes, createResolver } from '@dxos/app-framework';
-import { Blueprint } from '@dxos/assistant';
+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';
+
+import { Assistant } from '../types';
+
+export default (context: PluginContext) => [
+  contributes(Capabilities.IntentResolver, [
+    createResolver({
+      intent: Assistant.OnSpaceCreated,
+      resolve: ({ space, rootCollection }) =>
+        Effect.gen(function* () {
+          const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
+          const { object: chatCollection } = yield* dispatch(
+            createIntent(CollectionAction.CreateQueryCollection, { typename: Assistant.Chat.typename }),
+          );
+          const { object: blueprintCollection } = yield* dispatch(
+            createIntent(CollectionAction.CreateQueryCollection, { typename: Blueprint.Blueprint.typename }),
+          );
+          rootCollection.objects.push(Ref.make(chatCollection), Ref.make(blueprintCollection));
 
-import { AssistantAction, AIChatType } from '../types';
+          const { object: chat } = yield* dispatch(createIntent(Assistant.CreateChat, { space }));
+          space.db.add(chat);
 
-export default () => [
-  contributes(
-    Capabilities.IntentResolver,
+          // TODO(wittjosiah): Create default blueprint.
+          // const { object: blueprint } = yield* dispatch(createIntent(Assistant.CreateBlueprint, { ... }));
+          // space.db.add(blueprint);
+        }),
+    }),
     createResolver({
-      intent: AssistantAction.CreateChat,
+      intent: Assistant.CreateChat,
       resolve: ({ space, name }) => ({
         data: {
-          object: Obj.make(AIChatType, {
+          object: Obj.make(Assistant.Chat, {
             name,
             queue: Ref.fromDXN(space.queues.create().dxn),
           }),
         },
       }),
     }),
-  ),
-  contributes(
-    Capabilities.IntentResolver,
     createResolver({
-      intent: AssistantAction.CreateBlueprint,
+      intent: Assistant.CreateBlueprint,
+      resolve: ({ name, description }) => ({
+        data: { object: Blueprint.make({ name, description }) },
+      }),
+    }),
+    createResolver({
+      intent: Assistant.CreateSequence,
       resolve: ({ name }) => ({
         data: {
-          object: Obj.make(Blueprint, {
+          object: Obj.make(Sequence, {
             name,
             steps: [
               {
@@ -41,5 +68,5 @@ export default () => [
         },
       }),
     }),
-  ),
+  ]),
 ];