@dxos/plugin-assistant 0.8.4-main.1da679c → 0.8.4-main.21d9917

package/package.json

@@ -1,9 +1,13 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.4-main.1da679c",
+  "version": "0.8.4-main.21d9917",
   "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,
@@ -15,6 +19,13 @@
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/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"
+    },
     "./types": {
       "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
@@ -25,6 +36,9 @@
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
     "*": {
+      "blueprints": [
+        "dist/types/src/blueprints/index.d.ts"
+      ],
       "types": [
         "dist/types/src/types/index.d.ts"
       ]
@@ -36,137 +50,124 @@
     "src"
   ],
   "dependencies": {
-    "@codemirror/autocomplete": "^6.18.7",
+    "@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/search": "^6.5.11",
+    "@codemirror/lint": "6.8.5",
     "@codemirror/state": "^6.5.2",
-    "@codemirror/view": "^6.38.2",
-    "@effect/ai": "0.25.2",
-    "@effect/ai-anthropic": "^0.16.1",
-    "@effect/ai-openai": "^0.29.1",
-    "@effect/platform-browser": "0.70.0",
-    "@lezer/highlight": "^1.2.1",
-    "@lezer/markdown": "^1.3.1",
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
-    "@preact/signals-react": "^3.2.0",
+    "@codemirror/view": "^6.38.4",
+    "@effect-atom/atom": "^0.4.13",
+    "@effect-atom/atom-react": "^0.4.6",
+    "@effect/ai": "0.32.1",
+    "@effect/ai-anthropic": "0.22.0",
+    "@effect/ai-openai": "0.36.0",
+    "@effect/experimental": "0.57.11",
+    "@effect/platform-browser": "0.73.0",
     "@radix-ui/react-context": "1.1.1",
-    "effect": "3.17.7",
+    "effect": "3.19.11",
     "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.1da679c",
-    "@dxos/app-framework": "0.8.4-main.1da679c",
-    "@dxos/assistant-testing": "0.8.4-main.1da679c",
-    "@dxos/async": "0.8.4-main.1da679c",
-    "@dxos/client": "0.8.4-main.1da679c",
-    "@dxos/compute": "0.8.4-main.1da679c",
-    "@dxos/config": "0.8.4-main.1da679c",
-    "@dxos/blueprints": "0.8.4-main.1da679c",
-    "@dxos/context": "0.8.4-main.1da679c",
-    "@dxos/assistant": "0.8.4-main.1da679c",
-    "@dxos/debug": "0.8.4-main.1da679c",
-    "@dxos/conductor": "0.8.4-main.1da679c",
-    "@dxos/devtools": "0.8.4-main.1da679c",
-    "@dxos/echo": "0.8.4-main.1da679c",
-    "@dxos/echo-db": "0.8.4-main.1da679c",
-    "@dxos/echo-schema": "0.8.4-main.1da679c",
-    "@dxos/echo-protocol": "0.8.4-main.1da679c",
-    "@dxos/edge-client": "0.8.4-main.1da679c",
-    "@dxos/effect": "0.8.4-main.1da679c",
-    "@dxos/functions": "0.8.4-main.1da679c",
-    "@dxos/graph": "0.8.4-main.1da679c",
-    "@dxos/invariant": "0.8.4-main.1da679c",
-    "@dxos/lit-ui": "0.8.4-main.1da679c",
-    "@dxos/live-object": "0.8.4-main.1da679c",
-    "@dxos/local-storage": "0.8.4-main.1da679c",
-    "@dxos/log": "0.8.4-main.1da679c",
-    "@dxos/plugin-automation": "0.8.4-main.1da679c",
-    "@dxos/plugin-attention": "0.8.4-main.1da679c",
-    "@dxos/plugin-board": "0.8.4-main.1da679c",
-    "@dxos/keys": "0.8.4-main.1da679c",
-    "@dxos/plugin-deck": "0.8.4-main.1da679c",
-    "@dxos/plugin-client": "0.8.4-main.1da679c",
-    "@dxos/plugin-explorer": "0.8.4-main.1da679c",
-    "@dxos/plugin-graph": "0.8.4-main.1da679c",
-    "@dxos/plugin-markdown": "0.8.4-main.1da679c",
-    "@dxos/plugin-preview": "0.8.4-main.1da679c",
-    "@dxos/plugin-script": "0.8.4-main.1da679c",
-    "@dxos/plugin-space": "0.8.4-main.1da679c",
-    "@dxos/plugin-transcription": "0.8.4-main.1da679c",
-    "@dxos/plugin-wnfs": "0.8.4-main.1da679c",
-    "@dxos/plugin-sketch": "0.8.4-main.1da679c",
-    "@dxos/protocols": "0.8.4-main.1da679c",
-    "@dxos/react-client": "0.8.4-main.1da679c",
-    "@dxos/react-edge-client": "0.8.4-main.1da679c",
-    "@dxos/react-ui-attention": "0.8.4-main.1da679c",
-    "@dxos/react-ui-canvas-compute": "0.8.4-main.1da679c",
-    "@dxos/plugin-stack": "0.8.4-main.1da679c",
-    "@dxos/react-ui-chat": "0.8.4-main.1da679c",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.1da679c",
-    "@dxos/react-ui-components": "0.8.4-main.1da679c",
-    "@dxos/react-ui-editor": "0.8.4-main.1da679c",
-    "@dxos/react-ui-form": "0.8.4-main.1da679c",
-    "@dxos/react-ui-graph": "0.8.4-main.1da679c",
-    "@dxos/react-ui-list": "0.8.4-main.1da679c",
-    "@dxos/react-ui-searchlist": "0.8.4-main.1da679c",
-    "@dxos/react-ui-menu": "0.8.4-main.1da679c",
-    "@dxos/react-ui-sfx": "0.8.4-main.1da679c",
-    "@dxos/react-ui-stack": "0.8.4-main.1da679c",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.1da679c",
-    "@dxos/schema": "0.8.4-main.1da679c",
-    "@dxos/react-ui-tabs": "0.8.4-main.1da679c",
-    "@dxos/util": "0.8.4-main.1da679c",
-    "@dxos/react-ui-tag-picker": "0.8.4-main.1da679c"
+    "@dxos/ai": "0.8.4-main.21d9917",
+    "@dxos/app-framework": "0.8.4-main.21d9917",
+    "@dxos/assistant": "0.8.4-main.21d9917",
+    "@dxos/async": "0.8.4-main.21d9917",
+    "@dxos/assistant-toolkit": "0.8.4-main.21d9917",
+    "@dxos/blueprints": "0.8.4-main.21d9917",
+    "@dxos/client": "0.8.4-main.21d9917",
+    "@dxos/compute": "0.8.4-main.21d9917",
+    "@dxos/conductor": "0.8.4-main.21d9917",
+    "@dxos/config": "0.8.4-main.21d9917",
+    "@dxos/context": "0.8.4-main.21d9917",
+    "@dxos/debug": "0.8.4-main.21d9917",
+    "@dxos/devtools": "0.8.4-main.21d9917",
+    "@dxos/echo": "0.8.4-main.21d9917",
+    "@dxos/echo-atom": "0.8.4-main.21d9917",
+    "@dxos/echo-db": "0.8.4-main.21d9917",
+    "@dxos/echo-query": "0.8.4-main.21d9917",
+    "@dxos/echo-protocol": "0.8.4-main.21d9917",
+    "@dxos/effect": "0.8.4-main.21d9917",
+    "@dxos/functions": "0.8.4-main.21d9917",
+    "@dxos/edge-client": "0.8.4-main.21d9917",
+    "@dxos/functions-runtime": "0.8.4-main.21d9917",
+    "@dxos/graph": "0.8.4-main.21d9917",
+    "@dxos/invariant": "0.8.4-main.21d9917",
+    "@dxos/keys": "0.8.4-main.21d9917",
+    "@dxos/lit-ui": "0.8.4-main.21d9917",
+    "@dxos/log": "0.8.4-main.21d9917",
+    "@dxos/operation": "0.8.4-main.21d9917",
+    "@dxos/plugin-automation": "0.8.4-main.21d9917",
+    "@dxos/plugin-attention": "0.8.4-main.21d9917",
+    "@dxos/plugin-client": "0.8.4-main.21d9917",
+    "@dxos/plugin-deck": "0.8.4-main.21d9917",
+    "@dxos/plugin-graph": "0.8.4-main.21d9917",
+    "@dxos/plugin-map": "0.8.4-main.21d9917",
+    "@dxos/plugin-space": "0.8.4-main.21d9917",
+    "@dxos/react-client": "0.8.4-main.21d9917",
+    "@dxos/protocols": "0.8.4-main.21d9917",
+    "@dxos/react-edge-client": "0.8.4-main.21d9917",
+    "@dxos/plugin-table": "0.8.4-main.21d9917",
+    "@dxos/react-ui-attention": "0.8.4-main.21d9917",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.21d9917",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.21d9917",
+    "@dxos/react-ui-chat": "0.8.4-main.21d9917",
+    "@dxos/react-ui-editor": "0.8.4-main.21d9917",
+    "@dxos/react-ui-components": "0.8.4-main.21d9917",
+    "@dxos/react-ui-form": "0.8.4-main.21d9917",
+    "@dxos/react-ui-graph": "0.8.4-main.21d9917",
+    "@dxos/react-ui-markdown": "0.8.4-main.21d9917",
+    "@dxos/react-ui-list": "0.8.4-main.21d9917",
+    "@dxos/react-ui-mosaic": "0.8.4-main.21d9917",
+    "@dxos/react-ui-searchlist": "0.8.4-main.21d9917",
+    "@dxos/react-ui-menu": "0.8.4-main.21d9917",
+    "@dxos/react-ui-sfx": "0.8.4-main.21d9917",
+    "@dxos/react-ui-stack": "0.8.4-main.21d9917",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.21d9917",
+    "@dxos/react-ui-tabs": "0.8.4-main.21d9917",
+    "@dxos/schema": "0.8.4-main.21d9917",
+    "@dxos/types": "0.8.4-main.21d9917",
+    "@dxos/ui": "0.8.4-main.21d9917",
+    "@dxos/plugin-transcription": "0.8.4-main.21d9917",
+    "@dxos/ui-editor": "0.8.4-main.21d9917",
+    "@dxos/util": "0.8.4-main.21d9917"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "^0.38.0",
-    "@effect/platform": "0.90.2",
+    "@effect/platform": "0.93.6",
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.17.7",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "effect": "3.19.11",
     "openapi-types": "^12.1.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "7.1.1",
-    "@dxos/assistant-testing": "0.8.4-main.1da679c",
-    "@dxos/devtools": "0.8.4-main.1da679c",
-    "@dxos/echo-db": "0.8.4-main.1da679c",
-    "@dxos/plugin-attention": "0.8.4-main.1da679c",
-    "@dxos/plugin-board": "0.8.4-main.1da679c",
-    "@dxos/plugin-chess": "0.8.4-main.1da679c",
-    "@dxos/plugin-inbox": "0.8.4-main.1da679c",
-    "@dxos/plugin-map": "0.8.4-main.1da679c",
-    "@dxos/plugin-markdown": "0.8.4-main.1da679c",
-    "@dxos/plugin-preview": "0.8.4-main.1da679c",
-    "@dxos/plugin-project": "0.8.4-main.1da679c",
-    "@dxos/plugin-script": "0.8.4-main.1da679c",
-    "@dxos/plugin-stack": "0.8.4-main.1da679c",
-    "@dxos/plugin-sketch": "0.8.4-main.1da679c",
-    "@dxos/plugin-table": "0.8.4-main.1da679c",
-    "@dxos/plugin-theme": "0.8.4-main.1da679c",
-    "@dxos/plugin-thread": "0.8.4-main.1da679c",
-    "@dxos/plugin-token-manager": "0.8.4-main.1da679c",
-    "@dxos/plugin-wnfs": "0.8.4-main.1da679c",
-    "@dxos/random": "0.8.4-main.1da679c",
-    "@dxos/react-ui-menu": "0.8.4-main.1da679c",
-    "@dxos/react-ui": "0.8.4-main.1da679c",
-    "@dxos/react-ui-table": "0.8.4-main.1da679c",
-    "@dxos/storybook-utils": "0.8.4-main.1da679c",
-    "@dxos/react-ui-theme": "0.8.4-main.1da679c"
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "7.1.9",
+    "@dxos/assistant-toolkit": "0.8.4-main.21d9917",
+    "@dxos/devtools": "0.8.4-main.21d9917",
+    "@dxos/echo-db": "0.8.4-main.21d9917",
+    "@dxos/plugin-chess": "0.8.4-main.21d9917",
+    "@dxos/plugin-map": "0.8.4-main.21d9917",
+    "@dxos/plugin-table": "0.8.4-main.21d9917",
+    "@dxos/plugin-testing": "0.8.4-main.21d9917",
+    "@dxos/random": "0.8.4-main.21d9917",
+    "@dxos/react-ui-menu": "0.8.4-main.21d9917",
+    "@dxos/react-ui-table": "0.8.4-main.21d9917",
+    "@dxos/react-ui": "0.8.4-main.21d9917",
+    "@dxos/storybook-utils": "0.8.4-main.21d9917",
+    "@dxos/ui-theme": "0.8.4-main.21d9917"
   },
   "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.4-main.1da679c",
-    "@dxos/react-ui-theme": "0.8.4-main.1da679c"
+    "@effect-atom/atom-react": "^0.4.6",
+    "@effect/platform": "0.93.6",
+    "effect": "3.19.11",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.21d9917",
+    "@dxos/ui-theme": "0.8.4-main.21d9917"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -2,14 +2,18 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
-import { ResearchGraph, ResearchOn } from '@dxos/assistant-testing';
+import * as Effect from 'effect/Effect';
+
+import { Capability, Common, Plugin } from '@dxos/app-framework';
+import { ResearchGraph } from '@dxos/assistant-toolkit';
 import { Blueprint, Prompt } from '@dxos/blueprints';
 import { Sequence } from '@dxos/conductor';
-import { Type } from '@dxos/echo';
-import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
-import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
-import { defineObjectForm } from '@dxos/plugin-space/types';
+import { Obj, Type } from '@dxos/echo';
+import { Operation } from '@dxos/operation';
+import { ClientEvents } from '@dxos/plugin-client/types';
+import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space/types';
+import { type CreateObject } from '@dxos/plugin-space/types';
+import { HasSubject } from '@dxos/types';
 
 import {
   AiService,
@@ -17,152 +21,116 @@ import {
   AssistantState,
   BlueprintDefinition,
   EdgeModelResolver,
-  IntentResolver,
   LocalModelResolver,
+  OperationResolver,
   ReactSurface,
+  Repair,
   Settings,
   Toolkit,
 } from './capabilities';
-import { AssistantEvents } from './events';
 import { meta } from './meta';
 import { translations } from './translations';
-import { Assistant, AssistantAction, ServiceType } from './types';
+import { AssistantEvents } from './types';
+import { Assistant, AssistantOperation } 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/state`,
-      // TODO(wittjosiah): Does not integrate with settings store.
-      //   Should this be a different event?
-      //   Should settings store be renamed to be more generic?
-      activatesOn: Events.SetupSettings,
-      activate: AssistantState,
-    }),
-    defineModule({
-      id: `${meta.id}/module/metadata`,
-      activatesOn: Events.SetupMetadata,
-      activate: () => [
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(Assistant.Chat),
-          metadata: {
-            icon: 'ph--atom--regular',
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(Blueprint.Blueprint),
-          metadata: {
-            icon: 'ph--blueprint--regular',
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(Sequence),
-          metadata: {
-            icon: 'ph--circuitry--regular',
-          },
-        }),
-      ],
-    }),
-    defineModule({
-      id: `${meta.id}/module/object-form`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () => [
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: Assistant.Chat,
-            getIntent: (_, options) => createIntent(AssistantAction.CreateChat, { space: options.space }),
-          }),
-        ),
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: Blueprint.Blueprint,
-            formSchema: AssistantAction.BlueprintForm,
-            getIntent: (props) => createIntent(AssistantAction.CreateBlueprint, props),
-          }),
-        ),
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: Sequence,
-            getIntent: () => createIntent(AssistantAction.CreateSequence),
-          }),
-        ),
-      ],
-    }),
-    defineModule({
-      id: `${meta.id}/module/schema`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () =>
-        contributes(ClientCapabilities.Schema, [
-          ServiceType,
-          Assistant.CompanionTo,
-          ResearchGraph,
-          ResearchOn,
-          Prompt.Prompt,
-        ]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/on-space-created`,
-      activatesOn: SpaceEvents.SpaceCreated,
-      activate: () =>
-        contributes(SpaceCapabilities.OnSpaceCreated, ({ rootCollection, space }) =>
-          createIntent(AssistantAction.OnSpaceCreated, { rootCollection, space }),
+export const AssistantPlugin = Plugin.define(meta).pipe(
+  Common.Plugin.addTranslationsModule({ translations }),
+  Common.Plugin.addSettingsModule({ activate: Settings }),
+  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: Common.ActivationEvent.SetupSettings,
+    activate: AssistantState,
+  }),
+  Common.Plugin.addMetadataModule({
+    metadata: [
+      {
+        id: Type.getTypename(Assistant.Chat),
+        metadata: {
+          icon: 'ph--atom--regular',
+          iconHue: 'sky',
+          createObject: ((props) => Effect.sync(() => Assistant.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,
+        },
+      },
+    ],
+  }),
+  Common.Plugin.addSchemaModule({
+    schema: [
+      Assistant.Chat,
+      Assistant.CompanionTo,
+      Blueprint.Blueprint,
+      HasSubject.HasSubject,
+      Prompt.Prompt,
+      ResearchGraph,
+      Sequence,
+    ],
+  }),
+  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/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/edge-model-resolver`,
-      activatesOn: AssistantEvents.SetupAiServiceProviders,
-      activate: EdgeModelResolver,
-    }),
-    defineModule({
-      id: `${meta.id}/module/local-model-resolver`,
-      activatesOn: AssistantEvents.SetupAiServiceProviders,
-      activate: LocalModelResolver,
-    }),
-    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: 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,
-    }),
-  ]);
+      ),
+  }),
+  Plugin.addModule({
+    activatesOn: ClientEvents.SpacesReady,
+    activate: Repair,
+  }),
+  Common.Plugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  Common.Plugin.addOperationResolverModule({ activate: OperationResolver }),
+  Common.Plugin.addSurfaceModule({
+    activate: ReactSurface,
+    activatesBefore: [Common.ActivationEvent.SetupArtifactDefinition],
+  }),
+  Plugin.addModule({
+    activatesOn: AssistantEvents.SetupAiServiceProviders,
+    activate: EdgeModelResolver,
+  }),
+  Plugin.addModule({
+    activatesOn: AssistantEvents.SetupAiServiceProviders,
+    activate: LocalModelResolver,
+  }),
+  Plugin.addModule({
+    activatesBefore: [AssistantEvents.SetupAiServiceProviders],
+    // TODO(dmaretskyi): This should activate lazily when the AI chat is used.
+    activatesOn: Common.ActivationEvent.Startup,
+    activate: AiService,
+  }),
+  Common.Plugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  Plugin.addModule({
+    // TODO(wittjosiah): Use a different event.
+    activatesOn: Common.ActivationEvent.Startup,
+    activate: Toolkit,
+  }),
+  Plugin.make,
+);

package/src/blueprints/assistant-blueprint.ts

@@ -0,0 +1,62 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { templates } from '@dxos/assistant';
+import {
+  Agent,
+  AssistantToolkit,
+  Discord,
+  DiscordBlueprint,
+  EntityExtraction,
+  Linear,
+  LinearBlueprint,
+  Research,
+  ResearchBlueprint,
+  SystemToolkit,
+  WebSearchBlueprint,
+} from '@dxos/assistant-toolkit';
+import { Blueprint } from '@dxos/blueprints';
+import { type FunctionDefinition } from '@dxos/functions';
+
+import { list, load, search } from '../functions';
+
+// TODO(burdon): Document plugin structure (blueprint, functions, toolkit.).
+// TODO(burdon): Test framework for developing functions. Error handling.
+// TODO(burdon): Function naming pattern (noun-verb); fully-qualified?
+
+export const deckTools = ['open-item'];
+
+export const functions$: FunctionDefinition[] = [list, load, search];
+export const functions = [
+  ...functions$,
+  // Factor out.
+  Research.create,
+  Research.research,
+  Agent.prompt,
+  EntityExtraction.extract,
+  Discord.fetch,
+  Linear.sync,
+];
+export const tools = [...AssistantToolkit.tools, ...SystemToolkit.tools, ...deckTools];
+
+export const Key = 'dxos.org/blueprint/assistant';
+
+export const make = (): Blueprint.Blueprint =>
+  Blueprint.make({
+    key: Key,
+    name: 'Assistant',
+    tools: Blueprint.toolDefinitions({ functions, tools }),
+    instructions: templates.system,
+  });
+
+export const blueprint = make();
+
+export const blueprints = [
+  blueprint,
+  // Factor out.
+  ResearchBlueprint,
+  WebSearchBlueprint,
+  DiscordBlueprint,
+  LinearBlueprint,
+];

package/src/blueprints/index.ts

@@ -0,0 +1,12 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Blueprint } from '@dxos/blueprints';
+import { type FunctionDefinition } from '@dxos/functions';
+
+import * as AssistantBlueprint from './assistant-blueprint';
+
+export { AssistantBlueprint };
+export const blueprints: Blueprint.Blueprint[] = AssistantBlueprint.blueprints;
+export const functions: FunctionDefinition[] = AssistantBlueprint.functions;