@dxos/plugin-assistant 0.8.4-main.1068cf700f → 0.8.4-main.1c7ec43d41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.4-main.1068cf700f",
+  "version": "0.8.4-main.1c7ec43d41",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,6 +12,23 @@
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#blueprints": "./src/blueprints/index.ts",
+    "#capabilities": "./src/capabilities/index.ts",
+    "#components": "./src/components/index.ts",
+    "#containers": "./src/containers/index.ts",
+    "#hooks": "./src/hooks/index.ts",
+    "#meta": "./src/meta.ts",
+    "#operations": "./src/operations/index.ts",
+    "#plugin": {
+      "browser": "./src/AssistantPlugin.tsx",
+      "node": "./src/AssistantPlugin.node.ts",
+      "default": "./src/AssistantPlugin.tsx"
+    },
+    "#testing": "./src/testing/index.ts",
+    "#translations": "./src/translations.ts",
+    "#types": "./src/types/index.ts"
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
@@ -19,6 +36,18 @@
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
     },
+    "./components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "browser": "./dist/lib/browser/components/index.mjs",
+      "node": "./dist/lib/node-esm/components/index.mjs"
+    },
+    "./hooks": {
+      "source": "./src/hooks/index.ts",
+      "types": "./dist/types/src/hooks/index.d.ts",
+      "browser": "./dist/lib/browser/hooks/index.mjs",
+      "node": "./dist/lib/node-esm/hooks/index.mjs"
+    },
     "./blueprints": {
       "source": "./src/blueprints/index.ts",
       "types": "./dist/types/src/blueprints/index.d.ts",
@@ -26,6 +55,23 @@
       "node": "./dist/lib/node-esm/blueprints/index.mjs",
       "default": "./src/blueprints/index.ts"
     },
+    "./cli": {
+      "source": "./src/cli/index.ts",
+      "types": "./dist/types/src/cli/index.d.ts",
+      "node": "./dist/lib/node-esm/cli/index.mjs"
+    },
+    "./operations": {
+      "source": "./src/operations/index.ts",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "browser": "./dist/lib/browser/operations/index.mjs",
+      "node": "./dist/lib/node-esm/operations/index.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "browser": "./dist/lib/browser/translations.mjs",
+      "node": "./dist/lib/node-esm/translations.mjs"
+    },
     "./types": {
       "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
@@ -34,16 +80,6 @@
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "blueprints": [
-        "dist/types/src/blueprints/index.d.ts"
-      ],
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "assets",
     "dist",
@@ -57,7 +93,7 @@
     "@codemirror/language": "^6.11.3",
     "@codemirror/lint": "6.8.5",
     "@codemirror/state": "^6.5.2",
-    "@codemirror/view": "^6.38.4",
+    "@codemirror/view": "^6.38.5",
     "@effect-atom/atom": "^0.5.1",
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/ai": "0.33.2",
@@ -65,112 +101,115 @@
     "@effect/ai-openai": "0.37.2",
     "@effect/experimental": "0.58.0",
     "@effect/platform-browser": "0.74.0",
+    "@radix-ui/react-compose-refs": "1.1.1",
     "@radix-ui/react-context": "1.1.1",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "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.1068cf700f",
-    "@dxos/app-framework": "0.8.4-main.1068cf700f",
-    "@dxos/app-toolkit": "0.8.4-main.1068cf700f",
-    "@dxos/assistant-toolkit": "0.8.4-main.1068cf700f",
-    "@dxos/assistant": "0.8.4-main.1068cf700f",
-    "@dxos/async": "0.8.4-main.1068cf700f",
-    "@dxos/client": "0.8.4-main.1068cf700f",
-    "@dxos/blueprints": "0.8.4-main.1068cf700f",
-    "@dxos/compute": "0.8.4-main.1068cf700f",
-    "@dxos/conductor": "0.8.4-main.1068cf700f",
-    "@dxos/config": "0.8.4-main.1068cf700f",
-    "@dxos/debug": "0.8.4-main.1068cf700f",
-    "@dxos/context": "0.8.4-main.1068cf700f",
-    "@dxos/devtools": "0.8.4-main.1068cf700f",
-    "@dxos/echo-db": "0.8.4-main.1068cf700f",
-    "@dxos/echo": "0.8.4-main.1068cf700f",
-    "@dxos/echo-atom": "0.8.4-main.1068cf700f",
-    "@dxos/echo-query": "0.8.4-main.1068cf700f",
-    "@dxos/echo-protocol": "0.8.4-main.1068cf700f",
-    "@dxos/effect": "0.8.4-main.1068cf700f",
-    "@dxos/edge-client": "0.8.4-main.1068cf700f",
-    "@dxos/functions": "0.8.4-main.1068cf700f",
-    "@dxos/functions-runtime": "0.8.4-main.1068cf700f",
-    "@dxos/graph": "0.8.4-main.1068cf700f",
-    "@dxos/invariant": "0.8.4-main.1068cf700f",
-    "@dxos/keys": "0.8.4-main.1068cf700f",
-    "@dxos/log": "0.8.4-main.1068cf700f",
-    "@dxos/operation": "0.8.4-main.1068cf700f",
-    "@dxos/plugin-automation": "0.8.4-main.1068cf700f",
-    "@dxos/plugin-client": "0.8.4-main.1068cf700f",
-    "@dxos/plugin-attention": "0.8.4-main.1068cf700f",
-    "@dxos/plugin-deck": "0.8.4-main.1068cf700f",
-    "@dxos/lit-ui": "0.8.4-main.1068cf700f",
-    "@dxos/plugin-graph": "0.8.4-main.1068cf700f",
-    "@dxos/plugin-map": "0.8.4-main.1068cf700f",
-    "@dxos/plugin-markdown": "0.8.4-main.1068cf700f",
-    "@dxos/plugin-status-bar": "0.8.4-main.1068cf700f",
-    "@dxos/plugin-table": "0.8.4-main.1068cf700f",
-    "@dxos/plugin-space": "0.8.4-main.1068cf700f",
-    "@dxos/plugin-transcription": "0.8.4-main.1068cf700f",
-    "@dxos/protocols": "0.8.4-main.1068cf700f",
-    "@dxos/react-client": "0.8.4-main.1068cf700f",
-    "@dxos/react-edge-client": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-attention": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-canvas-compute": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-chat": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-components": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-editor": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-graph": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-list": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-markdown": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-menu": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-mosaic": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-searchlist": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-sfx": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-stack": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.1068cf700f",
-    "@dxos/schema": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-tabs": "0.8.4-main.1068cf700f",
-    "@dxos/types": "0.8.4-main.1068cf700f",
-    "@dxos/ui-editor": "0.8.4-main.1068cf700f",
-    "@dxos/util": "0.8.4-main.1068cf700f",
-    "@dxos/ui": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-form": "0.8.4-main.1068cf700f"
+    "@dxos/ai": "0.8.4-main.1c7ec43d41",
+    "@dxos/assistant": "0.8.4-main.1c7ec43d41",
+    "@dxos/app-toolkit": "0.8.4-main.1c7ec43d41",
+    "@dxos/assistant-toolkit": "0.8.4-main.1c7ec43d41",
+    "@dxos/app-framework": "0.8.4-main.1c7ec43d41",
+    "@dxos/async": "0.8.4-main.1c7ec43d41",
+    "@dxos/conductor": "0.8.4-main.1c7ec43d41",
+    "@dxos/compute": "0.8.4-main.1c7ec43d41",
+    "@dxos/config": "0.8.4-main.1c7ec43d41",
+    "@dxos/app-graph": "0.8.4-main.1c7ec43d41",
+    "@dxos/client": "0.8.4-main.1c7ec43d41",
+    "@dxos/context": "0.8.4-main.1c7ec43d41",
+    "@dxos/debug": "0.8.4-main.1c7ec43d41",
+    "@dxos/devtools": "0.8.4-main.1c7ec43d41",
+    "@dxos/echo-atom": "0.8.4-main.1c7ec43d41",
+    "@dxos/echo-db": "0.8.4-main.1c7ec43d41",
+    "@dxos/echo-protocol": "0.8.4-main.1c7ec43d41",
+    "@dxos/echo-query": "0.8.4-main.1c7ec43d41",
+    "@dxos/echo": "0.8.4-main.1c7ec43d41",
+    "@dxos/edge-client": "0.8.4-main.1c7ec43d41",
+    "@dxos/effect": "0.8.4-main.1c7ec43d41",
+    "@dxos/functions": "0.8.4-main.1c7ec43d41",
+    "@dxos/graph": "0.8.4-main.1c7ec43d41",
+    "@dxos/functions-runtime": "0.8.4-main.1c7ec43d41",
+    "@dxos/invariant": "0.8.4-main.1c7ec43d41",
+    "@dxos/keys": "0.8.4-main.1c7ec43d41",
+    "@dxos/log": "0.8.4-main.1c7ec43d41",
+    "@dxos/lit-ui": "0.8.4-main.1c7ec43d41",
+    "@dxos/plugin-attention": "0.8.4-main.1c7ec43d41",
+    "@dxos/plugin-client": "0.8.4-main.1c7ec43d41",
+    "@dxos/plugin-deck": "0.8.4-main.1c7ec43d41",
+    "@dxos/plugin-automation": "0.8.4-main.1c7ec43d41",
+    "@dxos/plugin-graph": "0.8.4-main.1c7ec43d41",
+    "@dxos/plugin-map": "0.8.4-main.1c7ec43d41",
+    "@dxos/plugin-markdown": "0.8.4-main.1c7ec43d41",
+    "@dxos/plugin-space": "0.8.4-main.1c7ec43d41",
+    "@dxos/plugin-status-bar": "0.8.4-main.1c7ec43d41",
+    "@dxos/plugin-table": "0.8.4-main.1c7ec43d41",
+    "@dxos/protocols": "0.8.4-main.1c7ec43d41",
+    "@dxos/plugin-transcription": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-edge-client": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-attention": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-components": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-editor": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-chat": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-form": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-graph": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-list": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-markdown": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-menu": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-masonry": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-mosaic": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-search": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-stack": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-sfx": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-tabs": "0.8.4-main.1c7ec43d41",
+    "@dxos/schema": "0.8.4-main.1c7ec43d41",
+    "@dxos/ui": "0.8.4-main.1c7ec43d41",
+    "@dxos/types": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-client": "0.8.4-main.1c7ec43d41",
+    "@dxos/ui-editor": "0.8.4-main.1c7ec43d41",
+    "@dxos/util": "0.8.4-main.1c7ec43d41"
   },
   "devDependencies": {
     "@effect/platform": "0.94.4",
     "@types/lodash.defaultsdeep": "^4.6.6",
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "openapi-types": "^12.1.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "7.1.9",
-    "@dxos/assistant-toolkit": "0.8.4-main.1068cf700f",
-    "@dxos/devtools": "0.8.4-main.1068cf700f",
-    "@dxos/echo-db": "0.8.4-main.1068cf700f",
-    "@dxos/plugin-chess": "0.8.4-main.1068cf700f",
-    "@dxos/plugin-table": "0.8.4-main.1068cf700f",
-    "@dxos/plugin-map": "0.8.4-main.1068cf700f",
-    "@dxos/random": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-menu": "0.8.4-main.1068cf700f",
-    "@dxos/plugin-testing": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-table": "0.8.4-main.1068cf700f",
-    "@dxos/storybook-utils": "0.8.4-main.1068cf700f",
-    "@dxos/ui-theme": "0.8.4-main.1068cf700f"
+    "vite": "^8.0.10",
+    "@dxos/echo-db": "0.8.4-main.1c7ec43d41",
+    "@dxos/assistant-toolkit": "0.8.4-main.1c7ec43d41",
+    "@dxos/devtools": "0.8.4-main.1c7ec43d41",
+    "@dxos/plugin-chess": "0.8.4-main.1c7ec43d41",
+    "@dxos/plugin-client": "0.8.4-main.1c7ec43d41",
+    "@dxos/plugin-map": "0.8.4-main.1c7ec43d41",
+    "@dxos/plugin-table": "0.8.4-main.1c7ec43d41",
+    "@dxos/plugin-testing": "0.8.4-main.1c7ec43d41",
+    "@dxos/random": "0.8.4-main.1c7ec43d41",
+    "@dxos/plugin-preview": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-menu": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-table": "0.8.4-main.1c7ec43d41",
+    "@dxos/storybook-utils": "0.8.4-main.1c7ec43d41",
+    "@dxos/ui-theme": "0.8.4-main.1c7ec43d41"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/platform": "0.94.4",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.1068cf700f",
-    "@dxos/ui-theme": "0.8.4-main.1068cf700f"
+    "@dxos/react-ui": "0.8.4-main.1c7ec43d41",
+    "@dxos/ui-theme": "0.8.4-main.1c7ec43d41"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.node.ts

@@ -0,0 +1,44 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { ContextBinding } from '@dxos/assistant';
+import { Agent, Chat, McpServer, Memory, Plan } from '@dxos/assistant-toolkit';
+import { Blueprint, Routine } from '@dxos/compute';
+import { Sequence } from '@dxos/conductor';
+import { Feed } from '@dxos/echo';
+import { Text } from '@dxos/schema';
+import { HasSubject, Message } from '@dxos/types';
+
+import { AppGraphBuilder, BlueprintDefinition, CreateObject, OperationHandler } from '#capabilities';
+import { meta } from '#meta';
+
+export const AssistantPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSchemaModule({
+    schema: [
+      Chat.Chat,
+      Chat.CompanionTo,
+      Blueprint.Blueprint,
+      ContextBinding,
+      Feed.Feed,
+      HasSubject.HasSubject,
+      Message.Message,
+      Routine.Routine,
+      Agent.Agent,
+      McpServer.McpServer,
+      Plan.Plan,
+      Sequence,
+      Memory.Memory,
+      Text.Text,
+    ],
+  }),
+  Plugin.make,
+);
+
+export default AssistantPlugin;

package/src/AssistantPlugin.test.ts

@@ -0,0 +1,35 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { AppActivationEvents } from '@dxos/app-toolkit/events';
+import { ClientPlugin } from '@dxos/plugin-client';
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { AssistantPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('AssistantPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [ClientPlugin({}), AssistantPlugin()],
+    });
+
+    // After autoStart: AppGraphBuilder, CreateObject, schema, OperationHandler all auto-cascade.
+    expect(harness.manager.getActive()).toEqual(
+      expect.arrayContaining([moduleId('AppGraphBuilder'), moduleId('CreateObject'), moduleId('schema')]),
+    );
+
+    // AssistantPlugin fires SetupArtifactDefinition itself, so it can test its own blueprint.
+    await harness.fire(AppActivationEvents.SetupArtifactDefinition);
+    expect(harness.manager.getActive()).toContain(moduleId('BlueprintDefinition'));
+
+    // OperationHandler auto-cascades from OperationPlugin.
+    expect(harness.manager.getActive()).toContain(moduleId('OperationHandler'));
+  });
+});

package/src/AssistantPlugin.tsx

@@ -4,114 +4,75 @@
 
 import * as Effect from 'effect/Effect';
 
-import { ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
+import { ActivationEvent, ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
-import { Chat, Initiative, ResearchGraph } from '@dxos/assistant-toolkit';
-import { Blueprint, Prompt } from '@dxos/blueprints';
+import { ContextBinding } from '@dxos/assistant';
+import { Agent, Chat, McpServer, Memory, Plan } from '@dxos/assistant-toolkit';
+import { Blueprint, Operation, Routine } from '@dxos/compute';
 import { Sequence } from '@dxos/conductor';
-import { Obj, Type } from '@dxos/echo';
-import { type SpaceId } from '@dxos/keys';
-import { Operation } from '@dxos/operation';
-import { AutomationCapabilities } from '@dxos/plugin-automation/types';
+import { Feed } from '@dxos/echo';
 import { ClientEvents } from '@dxos/plugin-client/types';
+import { DeckEvents } from '@dxos/plugin-deck/types';
+import { MarkdownEvents } from '@dxos/plugin-markdown/types';
 import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space/types';
-import { type CreateObject } from '@dxos/plugin-space/types';
-import { HasSubject } from '@dxos/types';
+import { Text } from '@dxos/schema';
+import { HasSubject, Message } from '@dxos/types';
 
 import {
   AiService,
   AppGraphBuilder,
   AssistantState,
   BlueprintDefinition,
+  CompanionChatProvisioner,
+  CreateObject,
   EdgeModelResolver,
   LocalModelResolver,
-  OperationResolver,
+  MarkdownExtension,
+  Migrations,
+  OperationHandler,
   ReactSurface,
-  Repair,
   Settings,
   Toolkit,
-} from './capabilities';
-import { meta } from './meta';
-import { translations } from './translations';
-import { AssistantEvents, AssistantOperation } from './types';
+} from '#capabilities';
+import { meta } from '#meta';
+import { AssistantOperation } from '#operations';
+import { translations } from '#translations';
+import { AssistantEvents } from '#types';
 
 export const AssistantPlugin = Plugin.define(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
   AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
-  AppPlugin.addMetadataModule({
-    metadata: [
-      {
-        id: Type.getTypename(Chat.Chat),
-        metadata: {
-          icon: 'ph--atom--regular',
-          iconHue: 'sky',
-          createObject: ((props) => Effect.sync(() => Chat.make(props))) satisfies CreateObject,
-        },
-      },
-      {
-        id: Type.getTypename(Blueprint.Blueprint),
-        metadata: {
-          icon: 'ph--blueprint--regular',
-          iconHue: 'sky',
-          inputSchema: AssistantOperation.BlueprintForm,
-          createObject: ((props) => Effect.sync(() => Blueprint.make(props))) satisfies CreateObject,
-        },
-      },
-      {
-        id: Type.getTypename(Prompt.Prompt),
-        metadata: {
-          icon: 'ph--scroll--regular',
-          iconHue: 'sky',
-          createObject: ((props) => Effect.sync(() => Prompt.make(props))) satisfies CreateObject,
-        },
-      },
-      {
-        id: Type.getTypename(Sequence),
-        metadata: {
-          icon: 'ph--circuitry--regular',
-          iconHue: 'sky',
-          createObject: ((props) => Effect.sync(() => Obj.make(Sequence, props))) satisfies CreateObject,
-          addToCollectionOnCreate: true,
-        },
-      },
-      {
-        id: Type.getTypename(Initiative.Initiative),
-        metadata: {
-          icon: 'ph--circuitry--regular',
-          iconHue: 'sky',
-          createObject: ((_, { db }) =>
-            Initiative.makeInitialized(
-              {
-                name: 'New Initiative',
-                spec: 'Not specified yet',
-              },
-              Initiative.makeBlueprint(),
-            ).pipe(withComputeRuntime(db.spaceId))) satisfies CreateObject,
-          addToCollectionOnCreate: true,
-        },
-      },
-    ],
-  }),
-  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addSchemaModule({
     schema: [
       Chat.Chat,
       Chat.CompanionTo,
       Blueprint.Blueprint,
+      ContextBinding,
+      Feed.Feed,
       HasSubject.HasSubject,
-      Prompt.Prompt,
-      ResearchGraph,
-      Initiative.Initiative,
-      Initiative.Plan,
+      Message.Message,
+      Routine.Routine,
+      Agent.Agent,
+      McpServer.McpServer,
+      Plan.Plan,
       Sequence,
+      Memory.Memory,
+      Text.Text,
     ],
   }),
   AppPlugin.addSettingsModule({ activate: Settings }),
   AppPlugin.addSurfaceModule({
     activate: ReactSurface,
-    activatesBefore: [AppActivationEvents.SetupArtifactDefinition],
+    firesBeforeActivation: [AppActivationEvents.SetupArtifactDefinition],
   }),
   AppPlugin.addTranslationsModule({ translations }),
+  Plugin.addModule({
+    id: 'markdown',
+    activatesOn: MarkdownEvents.SetupExtensions,
+    activate: MarkdownExtension,
+  }),
   Plugin.addModule({
     // TODO(wittjosiah): Does not integrate with settings store.
     //   Should this be a different event?
@@ -129,10 +90,6 @@ export const AssistantPlugin = Plugin.define(meta).pipe(
         ),
       ),
   }),
-  Plugin.addModule({
-    activatesOn: ClientEvents.SpacesReady,
-    activate: Repair,
-  }),
   Plugin.addModule({
     activatesOn: AssistantEvents.SetupAiServiceProviders,
     activate: EdgeModelResolver,
@@ -142,7 +99,7 @@ export const AssistantPlugin = Plugin.define(meta).pipe(
     activate: LocalModelResolver,
   }),
   Plugin.addModule({
-    activatesBefore: [AssistantEvents.SetupAiServiceProviders],
+    firesBeforeActivation: [AssistantEvents.SetupAiServiceProviders],
     // TODO(dmaretskyi): This should activate lazily when the AI chat is used.
     activatesOn: ActivationEvents.Startup,
     activate: AiService,
@@ -152,18 +109,19 @@ export const AssistantPlugin = Plugin.define(meta).pipe(
     activatesOn: ActivationEvents.Startup,
     activate: Toolkit,
   }),
+  Plugin.addModule({
+    activatesOn: ActivationEvent.allOf(
+      ActivationEvents.OperationInvokerReady,
+      AppActivationEvents.AppGraphReady,
+      DeckEvents.StateReady,
+    ),
+    activate: CompanionChatProvisioner,
+  }),
+  Plugin.addModule({
+    activatesOn: ClientEvents.SetupMigration,
+    activate: Migrations,
+  }),
   Plugin.make,
 );
 
-// TODO(dmaretskyi): Extract to a helper module.
-const withComputeRuntime =
-  (spaceId: SpaceId) =>
-  <A, E, R>(
-    effect: Effect.Effect<A, E, R>,
-  ): Effect.Effect<A, E, Exclude<R, AutomationCapabilities.ComputeServices> | Capability.Service> =>
-    Effect.gen(function* () {
-      // TODO(dmaretskyi): Capability.get has `Error` in the error channel. We should throw those as defects instead.
-      const provider = yield* Capability.get(AutomationCapabilities.ComputeRuntime).pipe(Effect.orDie);
-      const runtime = yield* provider.getRuntime(spaceId).runtimeEffect;
-      return yield* effect.pipe(Effect.provide(runtime));
-    });
+export default AssistantPlugin;

package/src/blueprints/assistant/blueprint.test.ts

@@ -0,0 +1,46 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { describe, it } from '@effect/vitest';
+import * as Effect from 'effect/Effect';
+
+import { DatabaseBlueprint, DatabaseHandlers } from '@dxos/assistant-toolkit';
+import { Blueprint } from '@dxos/compute';
+import { Feed } from '@dxos/echo';
+import { TestHelpers } from '@dxos/effect/testing';
+import { AgentService } from '@dxos/functions-runtime';
+import { AssistantTestLayer } from '@dxos/functions-runtime/testing';
+import { ObjectId } from '@dxos/keys';
+import { Organization } from '@dxos/types';
+
+import AssistantBlueprint from './blueprint';
+
+ObjectId.dangerouslyDisableRandomness();
+
+const TestLayer = AssistantTestLayer({
+  aiServicePreset: 'edge-remote',
+  operationHandlers: DatabaseHandlers,
+  types: [Organization.Organization, Blueprint.Blueprint, Feed.Feed],
+  blueprints: [AssistantBlueprint.make(), DatabaseBlueprint.make()],
+  tracing: 'pretty',
+});
+
+describe('Assistant Blueprint', () => {
+  // TODO(dmaretskyi): Regenerate memoized conversation with ALLOW_LLM_GENERATION=1.
+  it.effect.skip(
+    'works with Database blueprint to create objects',
+    Effect.fnUntraced(
+      function* (_) {
+        const agent = yield* AgentService.createSession({
+          blueprints: [AssistantBlueprint.make(), DatabaseBlueprint.make()],
+        });
+        yield* agent.submitPrompt('Create a new organization called "Test Corp".');
+        yield* agent.waitForCompletion();
+      },
+      Effect.provide(TestLayer),
+      TestHelpers.provideTestContext,
+    ),
+    { timeout: 60_000 },
+  );
+});