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

package/package.json

@@ -1,141 +1,215 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.3",
+  "version": "0.8.4-main.1c7ec43d41",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "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",
       "types": "./dist/types/src/index.d.ts",
       "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",
+      "browser": "./dist/lib/browser/blueprints/index.mjs",
+      "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",
       "browser": "./dist/lib/browser/types/index.mjs",
       "node": "./dist/lib/node-esm/types/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "assets",
     "dist",
     "src"
   ],
   "dependencies": {
-    "@codemirror/autocomplete": "^6.18.1",
-    "@codemirror/language": "^6.10.3",
-    "@codemirror/search": "^6.5.6",
-    "@codemirror/state": "^6.4.1",
-    "@codemirror/view": "^6.34.1",
-    "@lezer/highlight": "^1.2.1",
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
-    "@xiechao/codemirror-lang-handlebars": "1.0.4",
+    "@codemirror/autocomplete": "^6.19.0",
+    "@codemirror/lang-html": "^6.4.11",
+    "@codemirror/lang-markdown": "6.3.4",
+    "@codemirror/lang-xml": "^6.1.0",
+    "@codemirror/language": "^6.11.3",
+    "@codemirror/lint": "6.8.5",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/view": "^6.38.5",
+    "@effect-atom/atom": "^0.5.1",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/ai": "0.33.2",
+    "@effect/ai-anthropic": "0.23.0",
+    "@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.20.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.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-rx/rx-react": "^0.34.1",
-    "@effect/platform": "0.80.12",
+    "@effect/platform": "0.94.4",
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.14.21",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "effect": "3.20.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"
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "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-rx/rx-react": "^0.34.1",
-    "@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"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@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

@@ -2,124 +2,126 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Effect } from 'effect';
+import * as Effect from 'effect/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 { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
-import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
-import { CollectionAction, defineObjectForm } from '@dxos/plugin-space/types';
+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/types';
+import { DeckEvents } from '@dxos/plugin-deck/types';
+import { MarkdownEvents } from '@dxos/plugin-markdown/types';
+import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space/types';
+import { Text } from '@dxos/schema';
+import { HasSubject, Message } from '@dxos/types';
 
-import { AiClient, AppGraphBuilder, IntentResolver, ReactSurface, Settings } from './capabilities';
-import { AssistantEvents } from './events';
-import { meta } from './meta';
-import translations from './translations';
-import { AssistantAction, AIChatType, ServiceType, TemplateType, CompanionTo } from './types';
+import {
+  AiService,
+  AppGraphBuilder,
+  AssistantState,
+  BlueprintDefinition,
+  CompanionChatProvisioner,
+  CreateObject,
+  EdgeModelResolver,
+  LocalModelResolver,
+  MarkdownExtension,
+  Migrations,
+  OperationHandler,
+  ReactSurface,
+  Settings,
+  Toolkit,
+} from '#capabilities';
+import { meta } from '#meta';
+import { AssistantOperation } from '#operations';
+import { translations } from '#translations';
+import { AssistantEvents } from '#types';
 
-export const AssistantPlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, translations),
-    }),
-    defineModule({
-      id: `${meta.id}/module/settings`,
-      activatesOn: Events.SetupSettings,
-      activate: Settings,
-    }),
-    defineModule({
-      id: `${meta.id}/module/metadata`,
-      activatesOn: Events.SetupMetadata,
-      activate: () => [
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(Blueprint),
-          metadata: {
-            icon: 'ph--blueprint--regular',
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(AIChatType),
-          metadata: {
-            icon: 'ph--atom--regular',
-          },
-        }),
-      ],
-    }),
-    defineModule({
-      id: `${meta.id}/module/object-form`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () => [
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: AIChatType,
-            getIntent: (_, options) => createIntent(AssistantAction.CreateChat, { space: options.space }),
-          }),
-        ),
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: Blueprint,
-            getIntent: () => createIntent(AssistantAction.CreateBlueprint),
-          }),
+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),
         ),
-      ],
-    }),
-    defineModule({
-      id: `${meta.id}/module/schema`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () => contributes(ClientCapabilities.Schema, [ServiceType, TemplateType, 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));
+      ),
+  }),
+  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,
+);
 
-            const { object: chat } = yield* dispatch(createIntent(AssistantAction.CreateChat, { space }));
-            space.db.add(chat);
-          });
-          await Effect.runPromise(program);
-        });
-      },
-    }),
-    defineModule({
-      id: `${meta.id}/module/app-graph-builder`,
-      activatesOn: Events.SetupAppGraph,
-      activate: AppGraphBuilder,
-    }),
-    defineModule({
-      id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: IntentResolver,
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      // TODO(wittjosiah): Should occur before the chat is loaded when surfaces activation is more granular.
-      activatesBefore: [Events.SetupArtifactDefinition],
-      activate: ReactSurface,
-    }),
-    defineModule({
-      id: `${meta.id}/module/ai-client`,
-      activatesOn: allOf(ClientEvents.ClientReady, Events.SettingsReady),
-      activatesAfter: [AssistantEvents.AiClientReady],
-      activate: AiClient,
-    }),
-  ]);
+export default AssistantPlugin;