@dxos/plugin-assistant 0.8.4-main.bc674ce → 0.8.4-main.bcb3aa67d6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.4-main.bc674ce",
+  "version": "0.8.4-main.bcb3aa67d6",
   "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",
@@ -26,6 +37,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",
@@ -39,6 +56,9 @@
       "blueprints": [
         "dist/types/src/blueprints/index.d.ts"
       ],
+      "operations": [
+        "dist/types/src/operations/index.d.ts"
+      ],
       "types": [
         "dist/types/src/types/index.d.ts"
       ]
@@ -58,116 +78,121 @@
     "@codemirror/lint": "6.8.5",
     "@codemirror/state": "^6.5.2",
     "@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",
+    "@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.19.11",
+    "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.bc674ce",
-    "@dxos/app-framework": "0.8.4-main.bc674ce",
-    "@dxos/assistant": "0.8.4-main.bc674ce",
-    "@dxos/assistant-toolkit": "0.8.4-main.bc674ce",
-    "@dxos/async": "0.8.4-main.bc674ce",
-    "@dxos/blueprints": "0.8.4-main.bc674ce",
-    "@dxos/client": "0.8.4-main.bc674ce",
-    "@dxos/compute": "0.8.4-main.bc674ce",
-    "@dxos/conductor": "0.8.4-main.bc674ce",
-    "@dxos/context": "0.8.4-main.bc674ce",
-    "@dxos/config": "0.8.4-main.bc674ce",
-    "@dxos/debug": "0.8.4-main.bc674ce",
-    "@dxos/devtools": "0.8.4-main.bc674ce",
-    "@dxos/echo": "0.8.4-main.bc674ce",
-    "@dxos/echo-atom": "0.8.4-main.bc674ce",
-    "@dxos/echo-db": "0.8.4-main.bc674ce",
-    "@dxos/echo-query": "0.8.4-main.bc674ce",
-    "@dxos/edge-client": "0.8.4-main.bc674ce",
-    "@dxos/echo-protocol": "0.8.4-main.bc674ce",
-    "@dxos/effect": "0.8.4-main.bc674ce",
-    "@dxos/functions": "0.8.4-main.bc674ce",
-    "@dxos/graph": "0.8.4-main.bc674ce",
-    "@dxos/functions-runtime": "0.8.4-main.bc674ce",
-    "@dxos/invariant": "0.8.4-main.bc674ce",
-    "@dxos/lit-ui": "0.8.4-main.bc674ce",
-    "@dxos/keys": "0.8.4-main.bc674ce",
-    "@dxos/operation": "0.8.4-main.bc674ce",
-    "@dxos/log": "0.8.4-main.bc674ce",
-    "@dxos/plugin-attention": "0.8.4-main.bc674ce",
-    "@dxos/plugin-client": "0.8.4-main.bc674ce",
-    "@dxos/plugin-automation": "0.8.4-main.bc674ce",
-    "@dxos/plugin-deck": "0.8.4-main.bc674ce",
-    "@dxos/plugin-map": "0.8.4-main.bc674ce",
-    "@dxos/plugin-graph": "0.8.4-main.bc674ce",
-    "@dxos/plugin-table": "0.8.4-main.bc674ce",
-    "@dxos/protocols": "0.8.4-main.bc674ce",
-    "@dxos/plugin-space": "0.8.4-main.bc674ce",
-    "@dxos/react-client": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-attention": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-canvas-compute": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-components": "0.8.4-main.bc674ce",
-    "@dxos/plugin-transcription": "0.8.4-main.bc674ce",
-    "@dxos/react-edge-client": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-chat": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-editor": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-graph": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-form": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-list": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-menu": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-searchlist": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-markdown": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-mosaic": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-sfx": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-stack": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-tabs": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.bc674ce",
-    "@dxos/schema": "0.8.4-main.bc674ce",
-    "@dxos/types": "0.8.4-main.bc674ce",
-    "@dxos/ui": "0.8.4-main.bc674ce",
-    "@dxos/util": "0.8.4-main.bc674ce",
-    "@dxos/ui-editor": "0.8.4-main.bc674ce"
+    "@dxos/ai": "0.8.4-main.bcb3aa67d6",
+    "@dxos/app-toolkit": "0.8.4-main.bcb3aa67d6",
+    "@dxos/app-graph": "0.8.4-main.bcb3aa67d6",
+    "@dxos/app-framework": "0.8.4-main.bcb3aa67d6",
+    "@dxos/assistant": "0.8.4-main.bcb3aa67d6",
+    "@dxos/async": "0.8.4-main.bcb3aa67d6",
+    "@dxos/assistant-toolkit": "0.8.4-main.bcb3aa67d6",
+    "@dxos/blueprints": "0.8.4-main.bcb3aa67d6",
+    "@dxos/client": "0.8.4-main.bcb3aa67d6",
+    "@dxos/compute": "0.8.4-main.bcb3aa67d6",
+    "@dxos/config": "0.8.4-main.bcb3aa67d6",
+    "@dxos/conductor": "0.8.4-main.bcb3aa67d6",
+    "@dxos/context": "0.8.4-main.bcb3aa67d6",
+    "@dxos/debug": "0.8.4-main.bcb3aa67d6",
+    "@dxos/echo": "0.8.4-main.bcb3aa67d6",
+    "@dxos/echo-atom": "0.8.4-main.bcb3aa67d6",
+    "@dxos/echo-db": "0.8.4-main.bcb3aa67d6",
+    "@dxos/echo-protocol": "0.8.4-main.bcb3aa67d6",
+    "@dxos/devtools": "0.8.4-main.bcb3aa67d6",
+    "@dxos/echo-query": "0.8.4-main.bcb3aa67d6",
+    "@dxos/edge-client": "0.8.4-main.bcb3aa67d6",
+    "@dxos/effect": "0.8.4-main.bcb3aa67d6",
+    "@dxos/functions": "0.8.4-main.bcb3aa67d6",
+    "@dxos/keys": "0.8.4-main.bcb3aa67d6",
+    "@dxos/invariant": "0.8.4-main.bcb3aa67d6",
+    "@dxos/lit-ui": "0.8.4-main.bcb3aa67d6",
+    "@dxos/operation": "0.8.4-main.bcb3aa67d6",
+    "@dxos/log": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-attention": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-automation": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-client": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-graph": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-markdown": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-map": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-space": "0.8.4-main.bcb3aa67d6",
+    "@dxos/functions-runtime": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-status-bar": "0.8.4-main.bcb3aa67d6",
+    "@dxos/graph": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-deck": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-transcription": "0.8.4-main.bcb3aa67d6",
+    "@dxos/protocols": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-table": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-attention": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-client": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-edge-client": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-chat": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-components": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-editor": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-form": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-graph": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-markdown": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-list": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-menu": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-search": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-mosaic": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-sfx": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-stack": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-tabs": "0.8.4-main.bcb3aa67d6",
+    "@dxos/schema": "0.8.4-main.bcb3aa67d6",
+    "@dxos/types": "0.8.4-main.bcb3aa67d6",
+    "@dxos/ui": "0.8.4-main.bcb3aa67d6",
+    "@dxos/ui-editor": "0.8.4-main.bcb3aa67d6",
+    "@dxos/util": "0.8.4-main.bcb3aa67d6"
   },
   "devDependencies": {
-    "@effect/platform": "0.93.6",
+    "@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.11",
+    "effect": "3.20.0",
     "openapi-types": "^12.1.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "7.1.9",
-    "@dxos/devtools": "0.8.4-main.bc674ce",
-    "@dxos/assistant-toolkit": "0.8.4-main.bc674ce",
-    "@dxos/echo-db": "0.8.4-main.bc674ce",
-    "@dxos/plugin-chess": "0.8.4-main.bc674ce",
-    "@dxos/plugin-map": "0.8.4-main.bc674ce",
-    "@dxos/plugin-testing": "0.8.4-main.bc674ce",
-    "@dxos/react-ui": "0.8.4-main.bc674ce",
-    "@dxos/random": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-menu": "0.8.4-main.bc674ce",
-    "@dxos/plugin-table": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-table": "0.8.4-main.bc674ce",
-    "@dxos/storybook-utils": "0.8.4-main.bc674ce",
-    "@dxos/ui-theme": "0.8.4-main.bc674ce"
+    "vite": "^7.1.11",
+    "@dxos/assistant-toolkit": "0.8.4-main.bcb3aa67d6",
+    "@dxos/devtools": "0.8.4-main.bcb3aa67d6",
+    "@dxos/echo-db": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-map": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-chess": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-testing": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-menu": "0.8.4-main.bcb3aa67d6",
+    "@dxos/random": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-table": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-table": "0.8.4-main.bcb3aa67d6",
+    "@dxos/storybook-utils": "0.8.4-main.bcb3aa67d6",
+    "@dxos/ui-theme": "0.8.4-main.bcb3aa67d6"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
-    "effect": "3.19.11",
+    "@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/ui-theme": "0.8.4-main.bc674ce",
-    "@dxos/react-ui": "0.8.4-main.bc674ce"
+    "@dxos/react-ui": "0.8.4-main.bcb3aa67d6",
+    "@dxos/ui-theme": "0.8.4-main.bcb3aa67d6"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -4,94 +4,178 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common, Plugin } from '@dxos/app-framework';
-import { ResearchGraph } from '@dxos/assistant-toolkit';
+import { ActivationEvent, ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
+import { Chat, Memory, Plan, Project, ProjectBlueprint, ResearchGraph } from '@dxos/assistant-toolkit';
 import { Blueprint, Prompt } from '@dxos/blueprints';
 import { Sequence } from '@dxos/conductor';
-import { Obj, Type } from '@dxos/echo';
+import { Annotation, 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 { MarkdownEvents } from '@dxos/plugin-markdown';
+import { type CreateObject, SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space/types';
+import { SpaceOperation } from '@dxos/plugin-space/operations';
 import { HasSubject } from '@dxos/types';
 
+import { meta } from '#meta';
+import { translations } from './translations';
+import { AssistantEvents } from '#types';
+import { AssistantOperation } from '#operations';
+import * as Option from 'effect/Option';
+
 import {
   AiService,
   AppGraphBuilder,
   AssistantState,
   BlueprintDefinition,
+  CompanionChatProvisioner,
   EdgeModelResolver,
   LocalModelResolver,
-  OperationResolver,
+  MarkdownExtension,
+  Migrations,
+  OperationHandler,
   ReactSurface,
-  Repair,
   Settings,
   Toolkit,
-} from './capabilities';
-import { meta } from './meta';
-import { translations } from './translations';
-import { AssistantEvents } from './types';
-import { Assistant, AssistantOperation } from './types';
+} from '#capabilities';
 
 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({
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addMetadataModule({
     metadata: [
       {
-        id: Type.getTypename(Assistant.Chat),
+        id: Type.getTypename(Chat.Chat),
         metadata: {
-          icon: 'ph--atom--regular',
-          iconHue: 'sky',
-          createObject: ((props) => Effect.sync(() => Assistant.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(Project.Project),
+        metadata: {
+          icon: Annotation.IconAnnotation.get(Project.Project).pipe(Option.getOrThrow).icon,
+          iconHue: Annotation.IconAnnotation.get(Project.Project).pipe(Option.getOrThrow).hue ?? 'white',
+          createObject: ((props, options) =>
+            Effect.gen(function* () {
+              const object = yield* Project.makeInitialized(
+                {
+                  name: 'New Project',
+                  spec: 'Not specified yet',
+                },
+                ProjectBlueprint.make(),
+              ).pipe(withComputeRuntime(options.db.spaceId));
+              return yield* Operation.invoke(SpaceOperation.AddObject, {
+                object,
+                target: options.target,
+                hidden: true,
+                targetNodeId: options.targetNodeId,
+              });
+            })) satisfies CreateObject,
         },
       },
     ],
   }),
-  Common.Plugin.addSchemaModule({
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSchemaModule({
     schema: [
-      Assistant.Chat,
-      Assistant.CompanionTo,
+      Chat.Chat,
+      Chat.CompanionTo,
       Blueprint.Blueprint,
       HasSubject.HasSubject,
       Prompt.Prompt,
-      ResearchGraph,
+      ResearchGraph.ResearchGraph,
+      Project.Project,
+      Plan.Plan,
       Sequence,
+      Memory.Memory,
     ],
   }),
+  AppPlugin.addSettingsModule({ activate: Settings }),
+  AppPlugin.addSurfaceModule({
+    activate: ReactSurface,
+    activatesBefore: [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,
@@ -102,16 +186,6 @@ export const AssistantPlugin = Plugin.define(meta).pipe(
         ),
       ),
   }),
-  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,
@@ -123,14 +197,38 @@ export const AssistantPlugin = Plugin.define(meta).pipe(
   Plugin.addModule({
     activatesBefore: [AssistantEvents.SetupAiServiceProviders],
     // TODO(dmaretskyi): This should activate lazily when the AI chat is used.
-    activatesOn: Common.ActivationEvent.Startup,
+    activatesOn: ActivationEvents.Startup,
     activate: AiService,
   }),
-  Common.Plugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
   Plugin.addModule({
     // TODO(wittjosiah): Use a different event.
-    activatesOn: Common.ActivationEvent.Startup,
+    activatesOn: ActivationEvents.Startup,
     activate: Toolkit,
   }),
+  Plugin.addModule({
+    activatesOn: ActivationEvent.allOf(
+      ActivationEvents.OperationInvokerReady,
+      AppActivationEvents.AppGraphReady,
+      AppActivationEvents.LayoutReady,
+    ),
+    activate: CompanionChatProvisioner,
+  }),
+  Plugin.addModule({
+    activatesOn: ClientEvents.SetupMigration,
+    activate: Migrations,
+  }),
   Plugin.make,
 );
+
+// TODO(dmaretskyi): Extract to a helper module.
+const withComputeRuntime =
+  (spaceId: SpaceId) =>
+  <A, E, R>(
+    effect: Effect.Effect<A, E, R>,
+  ): Effect.Effect<A, E, Exclude<R, AutomationCapabilities.ComputeServices> | Capability.Service> =>
+    Effect.gen(function* () {
+      // TODO(dmaretskyi): Capability.get has `Error` in the error channel. We should throw those as defects instead.
+      const provider = yield* Capability.get(AutomationCapabilities.ComputeRuntime).pipe(Effect.orDie);
+      const runtime = yield* provider.getRuntime(spaceId).runtimeEffect;
+      return yield* effect.pipe(Effect.provide(runtime));
+    });