@dxos/plugin-assistant 0.8.4-main.3eb6e50203 → 0.8.4-main.422d1c7879

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.4-main.3eb6e50203",
+  "version": "0.8.4-main.422d1c7879",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,6 +12,17 @@
   "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",
+    "#testing": "./src/testing/index.ts",
+    "#types": "./src/types/index.ts"
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
@@ -19,6 +30,11 @@
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
     },
+    "./cli": {
+      "source": "./src/cli/index.ts",
+      "types": "./dist/types/src/cli/index.d.ts",
+      "node": "./dist/lib/node-esm/cli/index.mjs"
+    },
     "./blueprints": {
       "source": "./src/blueprints/index.ts",
       "types": "./dist/types/src/blueprints/index.d.ts",
@@ -26,6 +42,12 @@
       "node": "./dist/lib/node-esm/blueprints/index.mjs",
       "default": "./src/blueprints/index.ts"
     },
+    "./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"
+    },
     "./types": {
       "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
@@ -34,16 +56,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",
@@ -65,112 +77,117 @@
     "@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.3eb6e50203",
-    "@dxos/app-framework": "0.8.4-main.3eb6e50203",
-    "@dxos/app-toolkit": "0.8.4-main.3eb6e50203",
-    "@dxos/assistant": "0.8.4-main.3eb6e50203",
-    "@dxos/assistant-toolkit": "0.8.4-main.3eb6e50203",
-    "@dxos/blueprints": "0.8.4-main.3eb6e50203",
-    "@dxos/client": "0.8.4-main.3eb6e50203",
-    "@dxos/async": "0.8.4-main.3eb6e50203",
-    "@dxos/context": "0.8.4-main.3eb6e50203",
-    "@dxos/compute": "0.8.4-main.3eb6e50203",
-    "@dxos/config": "0.8.4-main.3eb6e50203",
-    "@dxos/conductor": "0.8.4-main.3eb6e50203",
-    "@dxos/devtools": "0.8.4-main.3eb6e50203",
-    "@dxos/debug": "0.8.4-main.3eb6e50203",
-    "@dxos/echo-db": "0.8.4-main.3eb6e50203",
-    "@dxos/echo-query": "0.8.4-main.3eb6e50203",
-    "@dxos/echo": "0.8.4-main.3eb6e50203",
-    "@dxos/echo-protocol": "0.8.4-main.3eb6e50203",
-    "@dxos/functions": "0.8.4-main.3eb6e50203",
-    "@dxos/effect": "0.8.4-main.3eb6e50203",
-    "@dxos/edge-client": "0.8.4-main.3eb6e50203",
-    "@dxos/invariant": "0.8.4-main.3eb6e50203",
-    "@dxos/graph": "0.8.4-main.3eb6e50203",
-    "@dxos/functions-runtime": "0.8.4-main.3eb6e50203",
-    "@dxos/keys": "0.8.4-main.3eb6e50203",
-    "@dxos/lit-ui": "0.8.4-main.3eb6e50203",
-    "@dxos/log": "0.8.4-main.3eb6e50203",
-    "@dxos/operation": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-automation": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-attention": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-client": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-deck": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-graph": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-markdown": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-space": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-map": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-status-bar": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-table": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-transcription": "0.8.4-main.3eb6e50203",
-    "@dxos/protocols": "0.8.4-main.3eb6e50203",
-    "@dxos/react-client": "0.8.4-main.3eb6e50203",
-    "@dxos/react-edge-client": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-attention": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-canvas-compute": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-components": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-chat": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-editor": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-form": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-graph": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-list": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-markdown": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-menu": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-mosaic": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-searchlist": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-stack": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-sfx": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-tabs": "0.8.4-main.3eb6e50203",
-    "@dxos/types": "0.8.4-main.3eb6e50203",
-    "@dxos/ui": "0.8.4-main.3eb6e50203",
-    "@dxos/schema": "0.8.4-main.3eb6e50203",
-    "@dxos/ui-editor": "0.8.4-main.3eb6e50203",
-    "@dxos/util": "0.8.4-main.3eb6e50203",
-    "@dxos/echo-atom": "0.8.4-main.3eb6e50203"
+    "@dxos/ai": "0.8.4-main.422d1c7879",
+    "@dxos/app-graph": "0.8.4-main.422d1c7879",
+    "@dxos/app-framework": "0.8.4-main.422d1c7879",
+    "@dxos/app-toolkit": "0.8.4-main.422d1c7879",
+    "@dxos/assistant": "0.8.4-main.422d1c7879",
+    "@dxos/assistant-toolkit": "0.8.4-main.422d1c7879",
+    "@dxos/async": "0.8.4-main.422d1c7879",
+    "@dxos/client": "0.8.4-main.422d1c7879",
+    "@dxos/conductor": "0.8.4-main.422d1c7879",
+    "@dxos/blueprints": "0.8.4-main.422d1c7879",
+    "@dxos/config": "0.8.4-main.422d1c7879",
+    "@dxos/compute": "0.8.4-main.422d1c7879",
+    "@dxos/context": "0.8.4-main.422d1c7879",
+    "@dxos/debug": "0.8.4-main.422d1c7879",
+    "@dxos/echo": "0.8.4-main.422d1c7879",
+    "@dxos/echo-protocol": "0.8.4-main.422d1c7879",
+    "@dxos/echo-db": "0.8.4-main.422d1c7879",
+    "@dxos/echo-atom": "0.8.4-main.422d1c7879",
+    "@dxos/edge-client": "0.8.4-main.422d1c7879",
+    "@dxos/echo-query": "0.8.4-main.422d1c7879",
+    "@dxos/effect": "0.8.4-main.422d1c7879",
+    "@dxos/functions-runtime": "0.8.4-main.422d1c7879",
+    "@dxos/devtools": "0.8.4-main.422d1c7879",
+    "@dxos/functions": "0.8.4-main.422d1c7879",
+    "@dxos/graph": "0.8.4-main.422d1c7879",
+    "@dxos/keys": "0.8.4-main.422d1c7879",
+    "@dxos/lit-ui": "0.8.4-main.422d1c7879",
+    "@dxos/invariant": "0.8.4-main.422d1c7879",
+    "@dxos/operation": "0.8.4-main.422d1c7879",
+    "@dxos/log": "0.8.4-main.422d1c7879",
+    "@dxos/plugin-automation": "0.8.4-main.422d1c7879",
+    "@dxos/plugin-attention": "0.8.4-main.422d1c7879",
+    "@dxos/plugin-client": "0.8.4-main.422d1c7879",
+    "@dxos/plugin-graph": "0.8.4-main.422d1c7879",
+    "@dxos/plugin-map": "0.8.4-main.422d1c7879",
+    "@dxos/plugin-deck": "0.8.4-main.422d1c7879",
+    "@dxos/plugin-markdown": "0.8.4-main.422d1c7879",
+    "@dxos/plugin-space": "0.8.4-main.422d1c7879",
+    "@dxos/protocols": "0.8.4-main.422d1c7879",
+    "@dxos/react-client": "0.8.4-main.422d1c7879",
+    "@dxos/plugin-table": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-attention": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-chat": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-components": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-form": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-editor": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-graph": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-list": "0.8.4-main.422d1c7879",
+    "@dxos/plugin-transcription": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-markdown": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-masonry": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-menu": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-search": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-sfx": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-stack": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-mosaic": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-tabs": "0.8.4-main.422d1c7879",
+    "@dxos/schema": "0.8.4-main.422d1c7879",
+    "@dxos/types": "0.8.4-main.422d1c7879",
+    "@dxos/ui": "0.8.4-main.422d1c7879",
+    "@dxos/ui-editor": "0.8.4-main.422d1c7879",
+    "@dxos/util": "0.8.4-main.422d1c7879",
+    "@dxos/react-edge-client": "0.8.4-main.422d1c7879",
+    "@dxos/plugin-status-bar": "0.8.4-main.422d1c7879"
   },
   "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.3eb6e50203",
-    "@dxos/devtools": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-chess": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-map": "0.8.4-main.3eb6e50203",
-    "@dxos/echo-db": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-table": "0.8.4-main.3eb6e50203",
-    "@dxos/plugin-testing": "0.8.4-main.3eb6e50203",
-    "@dxos/random": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-menu": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui-table": "0.8.4-main.3eb6e50203",
-    "@dxos/storybook-utils": "0.8.4-main.3eb6e50203",
-    "@dxos/ui-theme": "0.8.4-main.3eb6e50203"
+    "vite": "^7.1.11",
+    "@dxos/assistant-toolkit": "0.8.4-main.422d1c7879",
+    "@dxos/echo-db": "0.8.4-main.422d1c7879",
+    "@dxos/plugin-chess": "0.8.4-main.422d1c7879",
+    "@dxos/plugin-client": "0.8.4-main.422d1c7879",
+    "@dxos/plugin-map": "0.8.4-main.422d1c7879",
+    "@dxos/plugin-preview": "0.8.4-main.422d1c7879",
+    "@dxos/plugin-table": "0.8.4-main.422d1c7879",
+    "@dxos/random": "0.8.4-main.422d1c7879",
+    "@dxos/plugin-testing": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-menu": "0.8.4-main.422d1c7879",
+    "@dxos/react-ui-table": "0.8.4-main.422d1c7879",
+    "@dxos/storybook-utils": "0.8.4-main.422d1c7879",
+    "@dxos/ui-theme": "0.8.4-main.422d1c7879",
+    "@dxos/devtools": "0.8.4-main.422d1c7879"
   },
   "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.3eb6e50203",
-    "@dxos/react-ui": "0.8.4-main.3eb6e50203"
+    "@dxos/react-ui": "0.8.4-main.422d1c7879",
+    "@dxos/ui-theme": "0.8.4-main.422d1c7879"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -3,37 +3,46 @@
 //
 
 import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
 
-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 { ContextBinding } from '@dxos/assistant';
+import { Agent, AgentBlueprint, Chat, McpServer, Memory, Plan, ResearchGraph } from '@dxos/assistant-toolkit';
 import { Blueprint, Prompt } from '@dxos/blueprints';
 import { Sequence } from '@dxos/conductor';
-import { Obj, Type } from '@dxos/echo';
+import { Annotation, Feed, Obj, Type } from '@dxos/echo';
 import { type SpaceId } from '@dxos/keys';
 import { Operation } from '@dxos/operation';
 import { AutomationCapabilities } from '@dxos/plugin-automation/types';
 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 { DeckEvents } from '@dxos/plugin-deck/types';
+import { MarkdownEvents } from '@dxos/plugin-markdown';
+import { SpaceOperation } from '@dxos/plugin-space/operations';
+import { type CreateObject, SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space/types';
+import { Text } from '@dxos/schema';
+import { HasSubject, Message } from '@dxos/types';
 
 import {
   AiService,
   AppGraphBuilder,
   AssistantState,
   BlueprintDefinition,
+  CompanionChatProvisioner,
   EdgeModelResolver,
   LocalModelResolver,
-  OperationResolver,
+  MarkdownExtension,
+  Migrations,
+  OperationHandler,
   ReactSurface,
-  Repair,
   Settings,
   Toolkit,
-} from './capabilities';
-import { meta } from './meta';
+} from '#capabilities';
+import { meta } from '#meta';
+import { AssistantOperation } from '#operations';
+import { AssistantEvents } from '#types';
+
 import { translations } from './translations';
-import { AssistantEvents, AssistantOperation } from './types';
 
 export const AssistantPlugin = Plugin.define(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
@@ -43,75 +52,127 @@ export const AssistantPlugin = Plugin.define(meta).pipe(
       {
         id: Type.getTypename(Chat.Chat),
         metadata: {
-          icon: 'ph--atom--regular',
-          iconHue: 'sky',
-          createObject: ((props) => Effect.sync(() => Chat.make(props))) satisfies CreateObject,
+          icon: Annotation.IconAnnotation.get(Chat.Chat).pipe(Option.getOrThrow).icon,
+          iconHue: Annotation.IconAnnotation.get(Chat.Chat).pipe(Option.getOrThrow).hue ?? 'white',
+          createObject: ((props, options) =>
+            Effect.gen(function* () {
+              const { object } = yield* Operation.invoke(AssistantOperation.CreateChat, {
+                db: options.db,
+                name: props?.name,
+              });
+              return yield* Operation.invoke(SpaceOperation.AddObject, {
+                object,
+                target: options.target,
+                hidden: true,
+                targetNodeId: options.targetNodeId,
+              });
+            })) satisfies CreateObject,
         },
       },
       {
         id: Type.getTypename(Blueprint.Blueprint),
         metadata: {
-          icon: 'ph--blueprint--regular',
-          iconHue: 'sky',
+          icon: Annotation.IconAnnotation.get(Blueprint.Blueprint).pipe(Option.getOrThrow).icon,
+          iconHue: Annotation.IconAnnotation.get(Blueprint.Blueprint).pipe(Option.getOrThrow).hue ?? 'white',
           inputSchema: AssistantOperation.BlueprintForm,
-          createObject: ((props) => Effect.sync(() => Blueprint.make(props))) satisfies CreateObject,
+          createObject: ((props, options) =>
+            Effect.gen(function* () {
+              const object = Blueprint.make(props);
+              return yield* Operation.invoke(SpaceOperation.AddObject, {
+                object,
+                target: options.target,
+                hidden: true,
+                targetNodeId: options.targetNodeId,
+              });
+            })) satisfies CreateObject,
         },
       },
       {
         id: Type.getTypename(Prompt.Prompt),
         metadata: {
-          icon: 'ph--scroll--regular',
-          iconHue: 'sky',
-          createObject: ((props) => Effect.sync(() => Prompt.make(props))) satisfies CreateObject,
+          icon: Annotation.IconAnnotation.get(Prompt.Prompt).pipe(Option.getOrThrow).icon,
+          iconHue: Annotation.IconAnnotation.get(Prompt.Prompt).pipe(Option.getOrThrow).hue ?? 'white',
+          createObject: ((props, options) =>
+            Effect.gen(function* () {
+              const object = Prompt.make(props);
+              return yield* Operation.invoke(SpaceOperation.AddObject, {
+                object,
+                target: options.target,
+                hidden: true,
+                targetNodeId: options.targetNodeId,
+              });
+            })) 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,
+          icon: Annotation.IconAnnotation.get(Sequence).pipe(Option.getOrThrow).icon,
+          iconHue: Annotation.IconAnnotation.get(Sequence).pipe(Option.getOrThrow).hue ?? 'white',
+          createObject: ((props, options) =>
+            Effect.gen(function* () {
+              const object = Obj.make(Sequence, props);
+              return yield* Operation.invoke(SpaceOperation.AddObject, {
+                object,
+                target: options.target,
+                hidden: true,
+                targetNodeId: options.targetNodeId,
+              });
+            })) satisfies CreateObject,
         },
       },
       {
-        id: Type.getTypename(Initiative.Initiative),
+        id: Type.getTypename(Agent.Agent),
         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,
+          icon: Annotation.IconAnnotation.get(Agent.Agent).pipe(Option.getOrThrow).icon,
+          iconHue: Annotation.IconAnnotation.get(Agent.Agent).pipe(Option.getOrThrow).hue ?? 'white',
+          createObject: ((props, options) =>
+            Effect.gen(function* () {
+              const object = yield* Agent.makeInitialized({ name: '', instructions: '' }, AgentBlueprint.make()).pipe(
+                withComputeRuntime(options.db.spaceId),
+              );
+              return yield* Operation.invoke(SpaceOperation.AddObject, {
+                object,
+                target: options.target,
+                hidden: true,
+                targetNodeId: options.targetNodeId,
+              });
+            })) satisfies CreateObject,
         },
       },
     ],
   }),
-  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addSchemaModule({
     schema: [
       Chat.Chat,
       Chat.CompanionTo,
       Blueprint.Blueprint,
+      ContextBinding,
+      Feed.Feed,
       HasSubject.HasSubject,
+      Message.Message,
       Prompt.Prompt,
-      ResearchGraph,
-      Initiative.Initiative,
-      Initiative.Plan,
+      ResearchGraph.ResearchGraph,
+      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 +190,6 @@ export const AssistantPlugin = Plugin.define(meta).pipe(
         ),
       ),
   }),
-  Plugin.addModule({
-    activatesOn: ClientEvents.SpacesReady,
-    activate: Repair,
-  }),
   Plugin.addModule({
     activatesOn: AssistantEvents.SetupAiServiceProviders,
     activate: EdgeModelResolver,
@@ -142,7 +199,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,6 +209,18 @@ 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,
 );
 

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 { AgentService } from '@dxos/assistant';
+import { DatabaseBlueprint, DatabaseHandlers } from '@dxos/assistant-toolkit';
+import { AssistantTestLayer } from '@dxos/assistant/testing';
+import { Blueprint } from '@dxos/blueprints';
+import { Feed } from '@dxos/echo';
+import { TestHelpers } from '@dxos/effect/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 },
+  );
+});

package/src/blueprints/assistant/blueprint.ts

@@ -0,0 +1,31 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { LayoutOperation, type AppCapabilities } from '@dxos/app-toolkit';
+import { templates } from '@dxos/assistant';
+import { Blueprint } from '@dxos/blueprints';
+
+import { AssistantOperation } from '#operations';
+
+const BLUEPRINT_KEY = 'org.dxos.blueprint.assistant';
+
+const make = () =>
+  Blueprint.make({
+    key: BLUEPRINT_KEY,
+    name: 'Assistant',
+    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 = {
+  key: BLUEPRINT_KEY,
+  make,
+};
+
+export default blueprint;

package/src/blueprints/assistant/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { default as AssistantBlueprint } from './blueprint';

package/src/blueprints/index.ts

@@ -2,11 +2,4 @@
 // 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;
+export * from './assistant';