@dxos/plugin-assistant 0.8.4-main.c85a9c8dae → 0.8.4-main.dfabb4ec29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.4-main.c85a9c8dae",
+  "version": "0.8.4-main.dfabb4ec29",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,38 +12,91 @@
   "author": "DXOS.org",
   "sideEffects": true,
   "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"
-    },
-    "./blueprints": {
+  "imports": {
+    "#blueprints": {
       "source": "./src/blueprints/index.ts",
       "types": "./dist/types/src/blueprints/index.d.ts",
-      "browser": "./dist/lib/browser/blueprints/index.mjs",
-      "node": "./dist/lib/node-esm/blueprints/index.mjs",
-      "default": "./src/blueprints/index.ts"
+      "default": "./dist/lib/neutral/blueprints/index.mjs"
+    },
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "#containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
+    },
+    "#hooks": {
+      "source": "./src/hooks/index.ts",
+      "types": "./dist/types/src/hooks/index.d.ts",
+      "default": "./dist/lib/neutral/hooks/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#operations": {
+      "source": "./src/operations/index.ts",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "default": "./dist/lib/neutral/operations/index.mjs"
+    },
+    "#plugin": {
+      "source": {
+        "node": "./src/AssistantPlugin.node.ts",
+        "default": "./src/AssistantPlugin.tsx"
+      },
+      "types": "./dist/types/src/AssistantPlugin.d.ts",
+      "node": "./dist/lib/neutral/AssistantPlugin.node.mjs",
+      "default": "./dist/lib/neutral/AssistantPlugin.mjs"
     },
-    "./types": {
+    "#testing": "./src/testing/index.ts",
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.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"
+      "default": "./dist/lib/neutral/types/index.mjs"
     }
   },
-  "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "blueprints": [
-        "dist/types/src/blueprints/index.d.ts"
-      ],
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
+  "exports": {
+    ".": {
+      "source": "./src/index.ts",
+      "types": "./dist/types/src/index.d.ts",
+      "default": "./dist/lib/neutral/index.mjs"
+    },
+    "./components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "./hooks": {
+      "source": "./src/hooks/index.ts",
+      "types": "./dist/types/src/hooks/index.d.ts",
+      "default": "./dist/lib/neutral/hooks/index.mjs"
+    },
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
+  "types": "dist/types/src/index.d.ts",
   "files": [
     "assets",
     "dist",
@@ -57,7 +110,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 +118,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.c85a9c8dae",
-    "@dxos/app-toolkit": "0.8.4-main.c85a9c8dae",
-    "@dxos/assistant": "0.8.4-main.c85a9c8dae",
-    "@dxos/assistant-toolkit": "0.8.4-main.c85a9c8dae",
-    "@dxos/async": "0.8.4-main.c85a9c8dae",
-    "@dxos/blueprints": "0.8.4-main.c85a9c8dae",
-    "@dxos/client": "0.8.4-main.c85a9c8dae",
-    "@dxos/compute": "0.8.4-main.c85a9c8dae",
-    "@dxos/conductor": "0.8.4-main.c85a9c8dae",
-    "@dxos/debug": "0.8.4-main.c85a9c8dae",
-    "@dxos/devtools": "0.8.4-main.c85a9c8dae",
-    "@dxos/context": "0.8.4-main.c85a9c8dae",
-    "@dxos/echo": "0.8.4-main.c85a9c8dae",
-    "@dxos/echo-atom": "0.8.4-main.c85a9c8dae",
-    "@dxos/echo-db": "0.8.4-main.c85a9c8dae",
-    "@dxos/echo-protocol": "0.8.4-main.c85a9c8dae",
-    "@dxos/echo-query": "0.8.4-main.c85a9c8dae",
-    "@dxos/config": "0.8.4-main.c85a9c8dae",
-    "@dxos/edge-client": "0.8.4-main.c85a9c8dae",
-    "@dxos/effect": "0.8.4-main.c85a9c8dae",
-    "@dxos/functions": "0.8.4-main.c85a9c8dae",
-    "@dxos/functions-runtime": "0.8.4-main.c85a9c8dae",
-    "@dxos/graph": "0.8.4-main.c85a9c8dae",
-    "@dxos/keys": "0.8.4-main.c85a9c8dae",
-    "@dxos/app-framework": "0.8.4-main.c85a9c8dae",
-    "@dxos/lit-ui": "0.8.4-main.c85a9c8dae",
-    "@dxos/invariant": "0.8.4-main.c85a9c8dae",
-    "@dxos/operation": "0.8.4-main.c85a9c8dae",
-    "@dxos/log": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-attention": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-automation": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-client": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-deck": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-graph": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-space": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-status-bar": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-map": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-markdown": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-table": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-transcription": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-edge-client": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-attention": "0.8.4-main.c85a9c8dae",
-    "@dxos/protocols": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-canvas-compute": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-client": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-chat": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-components": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-editor": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-form": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-list": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-graph": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-markdown": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-mosaic": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-searchlist": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-sfx": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-menu": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-tabs": "0.8.4-main.c85a9c8dae",
-    "@dxos/schema": "0.8.4-main.c85a9c8dae",
-    "@dxos/types": "0.8.4-main.c85a9c8dae",
-    "@dxos/ui": "0.8.4-main.c85a9c8dae",
-    "@dxos/ui-editor": "0.8.4-main.c85a9c8dae",
-    "@dxos/util": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-stack": "0.8.4-main.c85a9c8dae"
+    "@dxos/ai": "0.8.4-main.dfabb4ec29",
+    "@dxos/app-toolkit": "0.8.4-main.dfabb4ec29",
+    "@dxos/app-framework": "0.8.4-main.dfabb4ec29",
+    "@dxos/app-graph": "0.8.4-main.dfabb4ec29",
+    "@dxos/assistant": "0.8.4-main.dfabb4ec29",
+    "@dxos/assistant-toolkit": "0.8.4-main.dfabb4ec29",
+    "@dxos/client": "0.8.4-main.dfabb4ec29",
+    "@dxos/compute": "0.8.4-main.dfabb4ec29",
+    "@dxos/config": "0.8.4-main.dfabb4ec29",
+    "@dxos/conductor": "0.8.4-main.dfabb4ec29",
+    "@dxos/async": "0.8.4-main.dfabb4ec29",
+    "@dxos/debug": "0.8.4-main.dfabb4ec29",
+    "@dxos/context": "0.8.4-main.dfabb4ec29",
+    "@dxos/echo": "0.8.4-main.dfabb4ec29",
+    "@dxos/echo-atom": "0.8.4-main.dfabb4ec29",
+    "@dxos/devtools": "0.8.4-main.dfabb4ec29",
+    "@dxos/echo-protocol": "0.8.4-main.dfabb4ec29",
+    "@dxos/echo-db": "0.8.4-main.dfabb4ec29",
+    "@dxos/edge-client": "0.8.4-main.dfabb4ec29",
+    "@dxos/echo-query": "0.8.4-main.dfabb4ec29",
+    "@dxos/effect": "0.8.4-main.dfabb4ec29",
+    "@dxos/functions": "0.8.4-main.dfabb4ec29",
+    "@dxos/functions-runtime": "0.8.4-main.dfabb4ec29",
+    "@dxos/invariant": "0.8.4-main.dfabb4ec29",
+    "@dxos/keys": "0.8.4-main.dfabb4ec29",
+    "@dxos/graph": "0.8.4-main.dfabb4ec29",
+    "@dxos/log": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-attention": "0.8.4-main.dfabb4ec29",
+    "@dxos/lit-ui": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-automation": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-deck": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-client": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-map": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-graph": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-status-bar": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-space": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-table": "0.8.4-main.dfabb4ec29",
+    "@dxos/protocols": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-transcription": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-edge-client": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-attention": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-markdown": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-client": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-chat": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-components": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-editor": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-form": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-markdown": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-graph": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-list": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-masonry": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-menu": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-mosaic": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-search": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-stack": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-sfx": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-tabs": "0.8.4-main.dfabb4ec29",
+    "@dxos/schema": "0.8.4-main.dfabb4ec29",
+    "@dxos/types": "0.8.4-main.dfabb4ec29",
+    "@dxos/ui": "0.8.4-main.dfabb4ec29",
+    "@dxos/ui-editor": "0.8.4-main.dfabb4ec29",
+    "@dxos/util": "0.8.4-main.dfabb4ec29"
   },
   "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.11",
-    "@dxos/devtools": "0.8.4-main.c85a9c8dae",
-    "@dxos/assistant-toolkit": "0.8.4-main.c85a9c8dae",
-    "@dxos/echo-db": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-chess": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-map": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-testing": "0.8.4-main.c85a9c8dae",
-    "@dxos/plugin-table": "0.8.4-main.c85a9c8dae",
-    "@dxos/random": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-menu": "0.8.4-main.c85a9c8dae",
-    "@dxos/storybook-utils": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui-table": "0.8.4-main.c85a9c8dae",
-    "@dxos/ui-theme": "0.8.4-main.c85a9c8dae"
+    "vite": "^8.0.10",
+    "@dxos/assistant-toolkit": "0.8.4-main.dfabb4ec29",
+    "@dxos/devtools": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-chess": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-client": "0.8.4-main.dfabb4ec29",
+    "@dxos/echo-db": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-map": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-preview": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-table": "0.8.4-main.dfabb4ec29",
+    "@dxos/random": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-testing": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-menu": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-table": "0.8.4-main.dfabb4ec29",
+    "@dxos/storybook-utils": "0.8.4-main.dfabb4ec29",
+    "@dxos/ui-theme": "0.8.4-main.dfabb4ec29"
   },
   "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/ui-theme": "0.8.4-main.c85a9c8dae",
-    "@dxos/react-ui": "0.8.4-main.c85a9c8dae"
+    "@dxos/react-ui": "0.8.4-main.dfabb4ec29",
+    "@dxos/ui-theme": "0.8.4-main.dfabb4ec29"
   },
   "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';
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+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.ts

@@ -0,0 +1,126 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { ActivationEvent, ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
+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 { Feed } from '@dxos/echo';
+import { ClientEvents } from '@dxos/plugin-client';
+import { DeckEvents } from '@dxos/plugin-deck';
+import { MarkdownEvents } from '@dxos/plugin-markdown';
+import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
+import { Text } from '@dxos/schema';
+import { HasSubject, Message } from '@dxos/types';
+
+import {
+  AiService,
+  AppGraphBuilder,
+  AssistantState,
+  BlueprintDefinition,
+  CompanionChatProvisioner,
+  CreateObject,
+  EdgeModelResolver,
+  LocalModelResolver,
+  MarkdownExtension,
+  Migrations,
+  OperationHandler,
+  ReactSurface,
+  Settings,
+  Toolkit,
+} from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
+import { AssistantEvents, AssistantOperation } from '#types';
+
+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,
+    ],
+  }),
+  AppPlugin.addSettingsModule({ activate: Settings }),
+  AppPlugin.addSurfaceModule({
+    activate: ReactSurface,
+    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?
+    //   Should settings store be renamed to be more generic?
+    activatesOn: AppActivationEvents.SetupSettings,
+    activate: AssistantState,
+  }),
+  Plugin.addModule({
+    id: 'on-space-created',
+    activatesOn: SpaceEvents.SpaceCreated,
+    activate: () =>
+      Effect.succeed(
+        Capability.contributes(SpaceCapabilities.OnCreateSpace, (params) =>
+          Operation.invoke(AssistantOperation.OnCreateSpace, params),
+        ),
+      ),
+  }),
+  Plugin.addModule({
+    activatesOn: AssistantEvents.SetupAiServiceProviders,
+    activate: EdgeModelResolver,
+  }),
+  Plugin.addModule({
+    activatesOn: AssistantEvents.SetupAiServiceProviders,
+    activate: LocalModelResolver,
+  }),
+  Plugin.addModule({
+    firesBeforeActivation: [AssistantEvents.SetupAiServiceProviders],
+    // TODO(dmaretskyi): This should activate lazily when the AI chat is used.
+    activatesOn: ActivationEvents.Startup,
+    activate: AiService,
+  }),
+  Plugin.addModule({
+    // TODO(wittjosiah): Use a different event.
+    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,
+);
+
+export default AssistantPlugin;

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

@@ -2,16 +2,15 @@
 // Copyright 2025 DXOS.org
 //
 
-import { describe, expect, it } from '@effect/vitest';
+import { describe, it } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
-import * as Layer from 'effect/Layer';
 
-import { AiConversationService } from '@dxos/assistant';
-import { AssistantTestLayer } from '@dxos/assistant/testing';
-import { DatabaseBlueprint } from '@dxos/assistant-toolkit';
-import { addBlueprints } from '@dxos/assistant-toolkit/testing';
-import { Blueprint } from '@dxos/blueprints';
+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';
 
@@ -20,27 +19,26 @@ import AssistantBlueprint from './blueprint';
 ObjectId.dangerouslyDisableRandomness();
 
 const TestLayer = AssistantTestLayer({
-  functions: [...Object.values(DatabaseBlueprint.functions)],
-  types: [Organization.Organization, Blueprint.Blueprint],
+  aiServicePreset: 'edge-remote',
+  operationHandlers: DatabaseHandlers,
+  types: [Organization.Organization, Blueprint.Blueprint, Feed.Feed],
+  blueprints: [AssistantBlueprint.make(), DatabaseBlueprint.make()],
   tracing: 'pretty',
 });
 
-const provideTestLayers = Effect.provide(AiConversationService.layerNewQueue().pipe(Layer.provideMerge(TestLayer)));
-
 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* (_) {
-        yield* addBlueprints([AssistantBlueprint, DatabaseBlueprint]);
-        const messages = yield* AiConversationService.run({
-          prompt: 'Create a new organization called "Test Corp".',
+        const agent = yield* AgentService.createSession({
+          blueprints: [AssistantBlueprint.make(), DatabaseBlueprint.make()],
         });
-        const lastMessage = messages.at(-1);
-        expect(lastMessage).toBeDefined();
+        yield* agent.submitPrompt('Create a new organization called "Test Corp".');
+        yield* agent.waitForCompletion();
       },
-      provideTestLayers,
+      Effect.provide(TestLayer),
       TestHelpers.provideTestContext,
     ),
     { timeout: 60_000 },

package/src/blueprints/assistant/blueprint.ts

@@ -2,25 +2,29 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type AppCapabilities } from '@dxos/app-toolkit';
+import { LayoutOperation } from '@dxos/app-toolkit';
 import { templates } from '@dxos/assistant';
-import { Blueprint } from '@dxos/blueprints';
+import { Blueprint } from '@dxos/compute';
 
-const BLUEPRINT_KEY = 'dxos.org/blueprint/assistant';
+import { AssistantOperation } from '#types';
 
-const tools = ['open-item'];
+const BLUEPRINT_KEY = 'org.dxos.blueprint.assistant';
 
 const make = () =>
   Blueprint.make({
     key: BLUEPRINT_KEY,
     name: 'Assistant',
-    tools: Blueprint.toolDefinitions({ tools }),
+    tools: Blueprint.toolDefinitions({
+      // TODO(wittjosiah): LayoutOperation.Open requires Capability.Service which is only available
+      //   via the compute-runtime layer (plugin-automation). Once Capability.Service is propagated
+      //   through LocalFunctionExecutionService, this will work without the compute-runtime dependency.
+      operations: [LayoutOperation.Open, AssistantOperation.ResolveNavigationTargets],
+    }),
     instructions: templates.system,
   });
 
-const blueprint: AppCapabilities.BlueprintDefinition = {
+const blueprint: Blueprint.Definition = {
   key: BLUEPRINT_KEY,
-  functions: [],
   make,
 };