@dxos/plugin-assistant 0.8.4-main.67995b8 → 0.8.4-main.f5c0578

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.4-main.67995b8",
+  "version": "0.8.4-main.f5c0578",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,16 +10,16 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs",
-      "source": "./src/index.ts"
+      "node": "./dist/lib/node-esm/index.mjs"
     },
     "./types": {
+      "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
       "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs",
-      "source": "./src/types/index.ts"
+      "node": "./dist/lib/node-esm/types/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -41,100 +41,106 @@
     "@codemirror/search": "^6.5.6",
     "@codemirror/state": "^6.4.1",
     "@codemirror/view": "^6.34.1",
-    "@effect/ai": "0.23.0",
+    "@effect/ai": "0.25.2",
+    "@effect/ai-anthropic": "^0.15.1",
     "@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",
+    "effect": "3.17.7",
     "exa-js": "^1.5.12",
     "json5": "^2.2.3",
     "jsonpointer": "^5.0.1",
     "lodash.defaultsdeep": "^4.6.1",
     "unified": "^11.0.0",
     "use-deep-compare-effect": "^1.8.1",
-    "@dxos/ai": "0.8.4-main.67995b8",
-    "@dxos/app-framework": "0.8.4-main.67995b8",
-    "@dxos/assistant": "0.8.4-main.67995b8",
-    "@dxos/blueprints": "0.8.4-main.67995b8",
-    "@dxos/client": "0.8.4-main.67995b8",
-    "@dxos/async": "0.8.4-main.67995b8",
-    "@dxos/compute": "0.8.4-main.67995b8",
-    "@dxos/conductor": "0.8.4-main.67995b8",
-    "@dxos/config": "0.8.4-main.67995b8",
-    "@dxos/context": "0.8.4-main.67995b8",
-    "@dxos/devtools": "0.8.4-main.67995b8",
-    "@dxos/debug": "0.8.4-main.67995b8",
-    "@dxos/echo": "0.8.4-main.67995b8",
-    "@dxos/echo-db": "0.8.4-main.67995b8",
-    "@dxos/echo-protocol": "0.8.4-main.67995b8",
-    "@dxos/echo-schema": "0.8.4-main.67995b8",
-    "@dxos/edge-client": "0.8.4-main.67995b8",
-    "@dxos/effect": "0.8.4-main.67995b8",
-    "@dxos/functions": "0.8.4-main.67995b8",
-    "@dxos/graph": "0.8.4-main.67995b8",
-    "@dxos/invariant": "0.8.4-main.67995b8",
-    "@dxos/keys": "0.8.4-main.67995b8",
-    "@dxos/live-object": "0.8.4-main.67995b8",
-    "@dxos/local-storage": "0.8.4-main.67995b8",
-    "@dxos/log": "0.8.4-main.67995b8",
-    "@dxos/plugin-client": "0.8.4-main.67995b8",
-    "@dxos/plugin-deck": "0.8.4-main.67995b8",
-    "@dxos/plugin-explorer": "0.8.4-main.67995b8",
-    "@dxos/plugin-graph": "0.8.4-main.67995b8",
-    "@dxos/plugin-inbox": "0.8.4-main.67995b8",
-    "@dxos/plugin-markdown": "0.8.4-main.67995b8",
-    "@dxos/plugin-preview": "0.8.4-main.67995b8",
-    "@dxos/plugin-script": "0.8.4-main.67995b8",
-    "@dxos/plugin-sketch": "0.8.4-main.67995b8",
-    "@dxos/plugin-space": "0.8.4-main.67995b8",
-    "@dxos/plugin-stack": "0.8.4-main.67995b8",
-    "@dxos/plugin-transcription": "0.8.4-main.67995b8",
-    "@dxos/plugin-wnfs": "0.8.4-main.67995b8",
-    "@dxos/protocols": "0.8.4-main.67995b8",
-    "@dxos/react-client": "0.8.4-main.67995b8",
-    "@dxos/react-ui-attention": "0.8.4-main.67995b8",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.67995b8",
-    "@dxos/react-ui-canvas-compute": "0.8.4-main.67995b8",
-    "@dxos/react-edge-client": "0.8.4-main.67995b8",
-    "@dxos/react-ui-chat": "0.8.4-main.67995b8",
-    "@dxos/react-ui-components": "0.8.4-main.67995b8",
-    "@dxos/react-ui-editor": "0.8.4-main.67995b8",
-    "@dxos/react-ui-form": "0.8.4-main.67995b8",
-    "@dxos/react-ui-list": "0.8.4-main.67995b8",
-    "@dxos/react-ui-graph": "0.8.4-main.67995b8",
-    "@dxos/react-ui-sfx": "0.8.4-main.67995b8",
-    "@dxos/react-ui-stack": "0.8.4-main.67995b8",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.67995b8",
-    "@dxos/react-ui-tag-picker": "0.8.4-main.67995b8",
-    "@dxos/util": "0.8.4-main.67995b8",
-    "@dxos/schema": "0.8.4-main.67995b8"
+    "@dxos/ai": "0.8.4-main.f5c0578",
+    "@dxos/app-framework": "0.8.4-main.f5c0578",
+    "@dxos/async": "0.8.4-main.f5c0578",
+    "@dxos/assistant": "0.8.4-main.f5c0578",
+    "@dxos/blueprints": "0.8.4-main.f5c0578",
+    "@dxos/client": "0.8.4-main.f5c0578",
+    "@dxos/compute": "0.8.4-main.f5c0578",
+    "@dxos/config": "0.8.4-main.f5c0578",
+    "@dxos/context": "0.8.4-main.f5c0578",
+    "@dxos/debug": "0.8.4-main.f5c0578",
+    "@dxos/conductor": "0.8.4-main.f5c0578",
+    "@dxos/devtools": "0.8.4-main.f5c0578",
+    "@dxos/echo": "0.8.4-main.f5c0578",
+    "@dxos/echo-protocol": "0.8.4-main.f5c0578",
+    "@dxos/echo-db": "0.8.4-main.f5c0578",
+    "@dxos/echo-schema": "0.8.4-main.f5c0578",
+    "@dxos/edge-client": "0.8.4-main.f5c0578",
+    "@dxos/effect": "0.8.4-main.f5c0578",
+    "@dxos/graph": "0.8.4-main.f5c0578",
+    "@dxos/invariant": "0.8.4-main.f5c0578",
+    "@dxos/keys": "0.8.4-main.f5c0578",
+    "@dxos/functions": "0.8.4-main.f5c0578",
+    "@dxos/live-object": "0.8.4-main.f5c0578",
+    "@dxos/local-storage": "0.8.4-main.f5c0578",
+    "@dxos/lit-ui": "0.8.4-main.f5c0578",
+    "@dxos/log": "0.8.4-main.f5c0578",
+    "@dxos/plugin-attention": "0.8.4-main.f5c0578",
+    "@dxos/plugin-board": "0.8.4-main.f5c0578",
+    "@dxos/plugin-client": "0.8.4-main.f5c0578",
+    "@dxos/plugin-deck": "0.8.4-main.f5c0578",
+    "@dxos/plugin-explorer": "0.8.4-main.f5c0578",
+    "@dxos/plugin-graph": "0.8.4-main.f5c0578",
+    "@dxos/plugin-markdown": "0.8.4-main.f5c0578",
+    "@dxos/plugin-map": "0.8.4-main.f5c0578",
+    "@dxos/plugin-preview": "0.8.4-main.f5c0578",
+    "@dxos/plugin-script": "0.8.4-main.f5c0578",
+    "@dxos/plugin-sketch": "0.8.4-main.f5c0578",
+    "@dxos/plugin-space": "0.8.4-main.f5c0578",
+    "@dxos/plugin-transcription": "0.8.4-main.f5c0578",
+    "@dxos/plugin-stack": "0.8.4-main.f5c0578",
+    "@dxos/plugin-wnfs": "0.8.4-main.f5c0578",
+    "@dxos/plugin-inbox": "0.8.4-main.f5c0578",
+    "@dxos/protocols": "0.8.4-main.f5c0578",
+    "@dxos/react-client": "0.8.4-main.f5c0578",
+    "@dxos/react-edge-client": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-attention": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-components": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-chat": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-editor": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-form": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-list": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-sfx": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-stack": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-graph": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-tag-picker": "0.8.4-main.f5c0578",
+    "@dxos/schema": "0.8.4-main.f5c0578",
+    "@dxos/util": "0.8.4-main.f5c0578"
   },
   "devDependencies": {
     "@effect-rx/rx-react": "^0.38.0",
-    "@effect/platform": "0.89.0",
+    "@effect/platform": "0.90.2",
     "@types/lodash.defaultsdeep": "^4.6.6",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
-    "effect": "3.17.0",
+    "effect": "3.17.7",
     "openapi-types": "^12.1.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/assistant-testing": "0.8.4-main.67995b8",
-    "@dxos/plugin-chess": "0.8.4-main.67995b8",
-    "@dxos/echo-db": "0.8.4-main.67995b8",
-    "@dxos/plugin-inbox": "0.8.4-main.67995b8",
-    "@dxos/plugin-map": "0.8.4-main.67995b8",
-    "@dxos/plugin-markdown": "0.8.4-main.67995b8",
-    "@dxos/plugin-table": "0.8.4-main.67995b8",
-    "@dxos/react-ui": "0.8.4-main.67995b8",
-    "@dxos/random": "0.8.4-main.67995b8",
-    "@dxos/react-ui-menu": "0.8.4-main.67995b8",
-    "@dxos/storybook-utils": "0.8.4-main.67995b8",
-    "@dxos/react-ui-theme": "0.8.4-main.67995b8"
+    "@dxos/echo-db": "0.8.4-main.f5c0578",
+    "@dxos/assistant-testing": "0.8.4-main.f5c0578",
+    "@dxos/plugin-chess": "0.8.4-main.f5c0578",
+    "@dxos/plugin-inbox": "0.8.4-main.f5c0578",
+    "@dxos/plugin-map": "0.8.4-main.f5c0578",
+    "@dxos/plugin-markdown": "0.8.4-main.f5c0578",
+    "@dxos/plugin-table": "0.8.4-main.f5c0578",
+    "@dxos/random": "0.8.4-main.f5c0578",
+    "@dxos/plugin-theme": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-menu": "0.8.4-main.f5c0578",
+    "@dxos/react-ui": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-theme": "0.8.4-main.f5c0578",
+    "@dxos/storybook-utils": "0.8.4-main.f5c0578"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -142,8 +148,8 @@
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.67995b8",
-    "@dxos/react-ui-theme": "0.8.4-main.67995b8"
+    "@dxos/react-ui": "0.8.4-main.f5c0578",
+    "@dxos/react-ui-theme": "0.8.4-main.f5c0578"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -2,9 +2,6 @@
 // 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 { Blueprint } from '@dxos/blueprints';
 import { Sequence } from '@dxos/conductor';
@@ -13,11 +10,20 @@ import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
 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 {
+  AiService,
+  AppGraphBuilder,
+  BlueprintDefinition,
+  EdgeModelResolver,
+  IntentResolver,
+  ReactSurface,
+  Settings,
+  Toolkit,
+} from './capabilities';
+import { AssistantEvents } from './events';
 import { meta } from './meta';
 import { translations } from './translations';
-import { Assistant, ServiceType } from './types';
+import { Assistant, AssistantAction, ServiceType } from './types';
 
 export const AssistantPlugin = () =>
   definePlugin(meta, [
@@ -63,22 +69,22 @@ export const AssistantPlugin = () =>
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
             objectSchema: Assistant.Chat,
-            getIntent: (_, options) => createIntent(Assistant.CreateChat, { space: options.space }),
+            getIntent: (_, options) => createIntent(AssistantAction.CreateChat, { space: options.space }),
           }),
         ),
         contributes(
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
             objectSchema: Blueprint.Blueprint,
-            formSchema: Assistant.BlueprintForm,
-            getIntent: (props) => createIntent(Assistant.CreateBlueprint, props),
+            formSchema: AssistantAction.BlueprintForm,
+            getIntent: (props) => createIntent(AssistantAction.CreateBlueprint, props),
           }),
         ),
         contributes(
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
             objectSchema: Sequence,
-            getIntent: () => createIntent(Assistant.CreateSequence),
+            getIntent: () => createIntent(AssistantAction.CreateSequence),
           }),
         ),
       ],
@@ -92,8 +98,8 @@ export const AssistantPlugin = () =>
       id: `${meta.id}/module/on-space-created`,
       activatesOn: SpaceEvents.SpaceCreated,
       activate: () =>
-        contributes(SpaceCapabilities.OnSpaceCreated, ({ space, rootCollection }) =>
-          createIntent(Assistant.OnSpaceCreated, { space, rootCollection }),
+        contributes(SpaceCapabilities.OnSpaceCreated, ({ rootCollection, space }) =>
+          createIntent(AssistantAction.OnSpaceCreated, { rootCollection, space }),
         ),
     }),
     defineModule({
@@ -113,12 +119,27 @@ export const AssistantPlugin = () =>
       activatesBefore: [Events.SetupArtifactDefinition],
       activate: ReactSurface,
     }),
+    defineModule({
+      id: `${meta.id}/module/ai-model-resolver`,
+      activatesOn: AssistantEvents.SetupAiServiceProviders,
+      activate: EdgeModelResolver,
+    }),
     defineModule({
       id: `${meta.id}/module/ai-service`,
+      activatesBefore: [AssistantEvents.SetupAiServiceProviders],
+      // TODO(dmaretskyi): This should activate lazily when the AI chat is used.
       activatesOn: Events.Startup,
-      activate: () => [
-        // TODO(dmaretskyi): Read config from settings.
-        contributes(AssistantCapabilities.AiServiceLayer, AiServiceTestingPreset('edge-remote').pipe(Layer.orDie)),
-      ],
+      activate: AiService,
+    }),
+    defineModule({
+      id: `${meta.id}/module/blueprint`,
+      activatesOn: Events.SetupArtifactDefinition,
+      activate: BlueprintDefinition,
+    }),
+    defineModule({
+      id: `${meta.id}/module/toolkit`,
+      // TODO(wittjosiah): Use a different event.
+      activatesOn: Events.Startup,
+      activate: Toolkit,
     }),
   ]);

package/src/capabilities/ai-service.ts

@@ -0,0 +1,28 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Effect, Layer } from 'effect';
+
+import { AiServiceRouter } from '@dxos/ai';
+import { type PluginContext, contributes } from '@dxos/app-framework';
+
+import { AssistantCapabilities } from './capabilities';
+
+export default (context: PluginContext) => {
+  const resolvers = context.getCapabilities(AssistantCapabilities.AiModelResolver);
+
+  // TODO(dmaretskyi): Extract function to reduce them.
+  const combinedLayer = resolvers.reduce(
+    (acc, resolver) => resolver.pipe(Layer.provide(acc)),
+    AiServiceRouter.AiModelResolver.fromModelMap(Effect.succeed({})), // Empty resolver as fallback.
+  );
+
+  return [
+    // TODO(dmaretskyi): Read config from settings.
+    contributes(
+      AssistantCapabilities.AiServiceLayer,
+      AiServiceRouter.AiModelResolver.buildAiService.pipe(Layer.provide(combinedLayer)),
+    ),
+  ];
+};

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

@@ -7,24 +7,24 @@ import { Option, pipe } from 'effect';
 
 import {
   Capabilities,
-  contributes,
-  createIntent,
   LayoutAction,
-  type PromiseIntentDispatcher,
   type PluginContext,
+  type PromiseIntentDispatcher,
+  contributes,
+  createIntent,
 } from '@dxos/app-framework';
 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 { ATTENDABLE_PATH_SEPARATOR, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
+import { ROOT_ID, createExtension } from '@dxos/plugin-graph';
 import { getActiveSpace, rxFromQuery } from '@dxos/plugin-space';
 import { SpaceAction } from '@dxos/plugin-space/types';
-import { type Space, Filter, Query, type QueryResult, fullyQualifiedId, getSpace } from '@dxos/react-client/echo';
+import { Filter, Query, type QueryResult, type Space, fullyQualifiedId, getSpace } from '@dxos/react-client/echo';
 
 import { ASSISTANT_DIALOG, meta } from '../meta';
-import { Assistant } from '../types';
+import { Assistant, AssistantAction } from '../types';
 
 export default (context: PluginContext) =>
   contributes(Capabilities.AppGraphBuilder, [
@@ -162,7 +162,7 @@ const getOrCreateChat = async (
     return chats[chats.length - 1];
   }
 
-  const { data } = await dispatch(createIntent(Assistant.CreateChat, { space }));
+  const { data } = await dispatch(createIntent(AssistantAction.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/blueprint-definition.ts

@@ -0,0 +1,32 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { ToolId } from '@dxos/ai';
+import { Capabilities, contributes } from '@dxos/app-framework';
+import { templates } from '@dxos/assistant';
+import { Blueprint } from '@dxos/blueprints';
+
+import { analysis, list, load } from '../functions';
+
+const functions = [analysis, list, load];
+const tools: string[] = [
+  'get-schemas',
+  'create-record',
+  // 'open-item'
+];
+
+export default () => {
+  return [
+    contributes(
+      Capabilities.BlueprintDefinition,
+      Blueprint.make({
+        key: 'dxos.org/blueprint/assistant',
+        name: 'Assistant',
+        instructions: templates.system,
+        tools: [...functions.map((tool) => ToolId.make(tool.name)), ...tools.map((tool) => ToolId.make(tool))],
+      }),
+    ),
+    contributes(Capabilities.Functions, functions),
+  ];
+};

package/src/capabilities/capabilities.ts

@@ -0,0 +1,22 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Layer } from 'effect';
+
+import { type AiService, type AiServiceRouter } from '@dxos/ai';
+import { defineCapability } from '@dxos/app-framework';
+
+import { meta } from '../meta';
+
+export namespace AssistantCapabilities {
+  export type AiServiceLayer = Layer.Layer<AiService.AiService>;
+  export const AiServiceLayer = defineCapability<AiServiceLayer>(`${meta.id}/capability/ai-service-factory`);
+
+  /**
+   * Plugins can contribute them to provide model resolvers.
+   */
+  export const AiModelResolver = defineCapability<Layer.Layer<AiServiceRouter.AiModelResolver>>(
+    `${meta.id}/capability/ai-model-resolver`,
+  );
+}

package/src/capabilities/edge-model-resolver.ts

@@ -0,0 +1,29 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { AnthropicClient } from '@effect/ai-anthropic';
+import { FetchHttpClient } from '@effect/platform';
+import { Layer } from 'effect';
+
+import { AiServiceRouter } from '@dxos/ai';
+import { contributes } from '@dxos/app-framework';
+
+import { AssistantCapabilities } from './capabilities';
+
+export default () => {
+  return [
+    contributes(
+      AssistantCapabilities.AiModelResolver,
+      AiServiceRouter.AnthropicResolver.pipe(
+        Layer.provide(
+          AnthropicClient.layer({
+            // TODO(dmaretskyi): Read endpoint from config/settings.
+            apiUrl: 'https://ai-service.dxos.workers.dev/provider/anthropic',
+          }),
+        ),
+        Layer.provide(FetchHttpClient.layer),
+      ),
+    ),
+  ];
+};

package/src/capabilities/index.ts

@@ -4,7 +4,13 @@
 
 import { lazy } from '@dxos/app-framework';
 
+export * from './capabilities';
+
+export const AiService = lazy(() => import('./ai-service'));
 export const AppGraphBuilder = lazy(() => import('./app-graph-builder'));
+export const BlueprintDefinition = lazy(() => import('./blueprint-definition'));
+export const EdgeModelResolver = lazy(() => import('./edge-model-resolver'));
 export const IntentResolver = lazy(() => import('./intent-resolver'));
 export const ReactSurface = lazy(() => import('./react-surface'));
 export const Settings = lazy(() => import('./settings'));
+export const Toolkit = lazy(() => import('./toolkit'));

package/src/capabilities/intent-resolver.ts

@@ -4,18 +4,18 @@
 
 import { Effect } from 'effect';
 
-import { Capabilities, contributes, createIntent, createResolver, type PluginContext } from '@dxos/app-framework';
-import { Blueprint } from '@dxos/blueprints';
+import { Capabilities, type PluginContext, contributes, createIntent, createResolver } from '@dxos/app-framework';
+import { Blueprint, Template } 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';
+import { Assistant, AssistantAction } from '../types';
 
 export default (context: PluginContext) => [
   contributes(Capabilities.IntentResolver, [
     createResolver({
-      intent: Assistant.OnSpaceCreated,
+      intent: AssistantAction.OnSpaceCreated,
       resolve: ({ space, rootCollection }) =>
         Effect.gen(function* () {
           const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
@@ -26,17 +26,16 @@ export default (context: PluginContext) => [
             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 }));
+          const { object: chat } = yield* dispatch(createIntent(AssistantAction.CreateChat, { space }));
           space.db.add(chat);
 
           // TODO(wittjosiah): Create default blueprint.
-          // const { object: blueprint } = yield* dispatch(createIntent(Assistant.CreateBlueprint, { ... }));
+          // const { object: blueprint } = yield* dispatch(createIntent(AssistantAction.CreateBlueprint, { ... }));
           // space.db.add(blueprint);
         }),
     }),
     createResolver({
-      intent: Assistant.CreateChat,
+      intent: AssistantAction.CreateChat,
       resolve: ({ space, name }) => ({
         data: {
           object: Obj.make(Assistant.Chat, {
@@ -47,13 +46,15 @@ export default (context: PluginContext) => [
       }),
     }),
     createResolver({
-      intent: Assistant.CreateBlueprint,
-      resolve: ({ name, description }) => ({
-        data: { object: Blueprint.make({ name, description }) },
+      intent: AssistantAction.CreateBlueprint,
+      resolve: ({ key, name, description }) => ({
+        data: {
+          object: Blueprint.make({ key, name, description, instructions: Template.make({ source: '' }) }),
+        },
       }),
     }),
     createResolver({
-      intent: Assistant.CreateSequence,
+      intent: AssistantAction.CreateSequence,
       resolve: ({ name }) => ({
         data: {
           object: Obj.make(Sequence, {

package/src/capabilities/react-surface.tsx

@@ -3,14 +3,14 @@
 //
 
 import { Effect } from 'effect';
-import React, { useEffect, useMemo } from 'react';
+import React, { useCallback, useEffect } from 'react';
 
 import { Capabilities, contributes, createIntent, createSurface, useIntentDispatcher } from '@dxos/app-framework';
 import { Blueprint } from '@dxos/blueprints';
-import { fullyQualifiedId, getSpace, getTypename } from '@dxos/client/echo';
+import { getSpace } from '@dxos/client/echo';
 import { Sequence } from '@dxos/conductor';
 import { InvocationTraceContainer } from '@dxos/devtools';
-import { Filter, type Key, Obj, Query } from '@dxos/echo';
+import { Filter, Obj, Query, Ref } from '@dxos/echo';
 import { SettingsStore } from '@dxos/local-storage';
 import { SpaceAction } from '@dxos/plugin-space/types';
 import { StackItem } from '@dxos/react-ui-stack';
@@ -23,8 +23,9 @@ import {
   PromptSettings,
   SequenceContainer,
 } from '../components';
-import { meta, ASSISTANT_DIALOG } from '../meta';
-import { Assistant } from '../types';
+import { type AiChatProcessor } from '../hooks';
+import { ASSISTANT_DIALOG, meta } from '../meta';
+import { Assistant, AssistantAction } from '../types';
 
 export default () =>
   contributes(Capabilities.ReactSurface, [
@@ -50,15 +51,8 @@ export default () =>
         (Obj.instanceOf(Assistant.Chat, data.subject) || data.subject === 'assistant-chat'),
       component: ({ data, role }) => {
         const { dispatch } = useIntentDispatcher();
-        const associatedArtifact = useMemo(
-          () => ({
-            id: fullyQualifiedId(data.companionTo),
-            typename: getTypename(data.companionTo) ?? 'unknown',
-            spaceId: (getSpace(data.companionTo)?.id ?? 'unknown') as Key.SpaceId,
-          }),
-          [data.companionTo],
-        );
 
+        // Initialize companion chat if it doesn't exist.
         // TODO(wittjosiah): Factor out to container.
         useEffect(() => {
           const timeout = setTimeout(async () => {
@@ -72,7 +66,7 @@ export default () =>
               }
 
               const program = Effect.gen(function* () {
-                const { object } = yield* dispatch(createIntent(Assistant.CreateChat, { space }));
+                const { object } = yield* dispatch(createIntent(AssistantAction.CreateChat, { space }));
                 yield* dispatch(createIntent(SpaceAction.AddObject, { object, target: space, hidden: true }));
                 yield* dispatch(
                   createIntent(SpaceAction.AddRelation, {
@@ -83,6 +77,7 @@ export default () =>
                   }),
                 );
               });
+
               void Effect.runPromise(program);
             }
           });
@@ -90,11 +85,23 @@ export default () =>
           return () => clearTimeout(timeout);
         }, [data.subject]);
 
+        // TODO(wittjosiah): Factor out to container.
+        const handleProcessorReady = useCallback(
+          (processor: AiChatProcessor) => {
+            if (Obj.instanceOf(Blueprint.Blueprint, data.companionTo)) {
+              void processor.context.bind({ blueprints: [Ref.make(data.companionTo)] });
+            } else {
+              void processor.context.bind({ objects: [Ref.make(data.companionTo)] });
+            }
+          },
+          [data.companionTo],
+        );
+
         if (data.subject === 'assistant-chat') {
           return null;
         }
 
-        return <ChatContainer role={role} chat={data.subject} artifact={associatedArtifact} />;
+        return <ChatContainer role={role} chat={data.subject} onProcessorReady={handleProcessorReady} />;
       },
     }),
     createSurface({