@dxos/plugin-space 0.8.4-main.3a94e84 → 0.8.4-main.3eb6e50203

package/package.json

@@ -1,20 +1,31 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.8.4-main.3a94e84",
+  "version": "0.8.4-main.3eb6e50203",
   "description": "DXOS Surface plugin for DXOS ECHO Spaces",
   "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",
   "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"
     },
+    "./cli": {
+      "source": "./src/cli/index.ts",
+      "types": "./dist/types/src/cli/index.d.ts",
+      "node": "./dist/lib/node-esm/cli/index.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"
@@ -33,76 +44,90 @@
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.0.0",
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
-    "effect": "3.17.0",
+    "@automerge/automerge": "3.2.3",
+    "@effect-atom/atom": "^0.5.1",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/cli": "0.73.2",
     "jszip": "^3.10.1",
     "localforage": "^1.10.0",
     "react-drag-drop-files": "^2.3.8",
-    "react-is": "~18.2.0",
+    "react-is": "~19.2.0",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/ai": "0.8.4-main.3a94e84",
-    "@dxos/app-framework": "0.8.4-main.3a94e84",
-    "@dxos/async": "0.8.4-main.3a94e84",
-    "@dxos/blueprints": "0.8.4-main.3a94e84",
-    "@dxos/client": "0.8.4-main.3a94e84",
-    "@dxos/context": "0.8.4-main.3a94e84",
-    "@dxos/display-name": "0.8.4-main.3a94e84",
-    "@dxos/echo": "0.8.4-main.3a94e84",
-    "@dxos/echo-schema": "0.8.4-main.3a94e84",
-    "@dxos/effect": "0.8.4-main.3a94e84",
-    "@dxos/echo-signals": "0.8.4-main.3a94e84",
-    "@dxos/invariant": "0.8.4-main.3a94e84",
-    "@dxos/keys": "0.8.4-main.3a94e84",
-    "@dxos/live-object": "0.8.4-main.3a94e84",
-    "@dxos/local-storage": "0.8.4-main.3a94e84",
-    "@dxos/migrations": "0.8.4-main.3a94e84",
-    "@dxos/plugin-attention": "0.8.4-main.3a94e84",
-    "@dxos/plugin-client": "0.8.4-main.3a94e84",
-    "@dxos/plugin-deck": "0.8.4-main.3a94e84",
-    "@dxos/log": "0.8.4-main.3a94e84",
-    "@dxos/plugin-graph": "0.8.4-main.3a94e84",
-    "@dxos/plugin-status-bar": "0.8.4-main.3a94e84",
-    "@dxos/plugin-observability": "0.8.4-main.3a94e84",
-    "@dxos/protocols": "0.8.4-main.3a94e84",
-    "@dxos/react-ui-attention": "0.8.4-main.3a94e84",
-    "@dxos/react-client": "0.8.4-main.3a94e84",
-    "@dxos/react-ui-form": "0.8.4-main.3a94e84",
-    "@dxos/react-ui-editor": "0.8.4-main.3a94e84",
-    "@dxos/react-ui-pickers": "0.8.4-main.3a94e84",
-    "@dxos/react-ui-list": "0.8.4-main.3a94e84",
-    "@dxos/react-ui-searchlist": "0.8.4-main.3a94e84",
-    "@dxos/react-ui-stack": "0.8.4-main.3a94e84",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.3a94e84",
-    "@dxos/react-ui-tabs": "0.8.4-main.3a94e84",
-    "@dxos/react-ui-theme": "0.8.4-main.3a94e84",
-    "@dxos/schema": "0.8.4-main.3a94e84",
-    "@dxos/shell": "0.8.4-main.3a94e84",
-    "@dxos/util": "0.8.4-main.3a94e84"
+    "@dxos/ai": "0.8.4-main.3eb6e50203",
+    "@dxos/app-framework": "0.8.4-main.3eb6e50203",
+    "@dxos/async": "0.8.4-main.3eb6e50203",
+    "@dxos/app-toolkit": "0.8.4-main.3eb6e50203",
+    "@dxos/client": "0.8.4-main.3eb6e50203",
+    "@dxos/cli-util": "0.8.4-main.3eb6e50203",
+    "@dxos/client-protocol": "0.8.4-main.3eb6e50203",
+    "@dxos/display-name": "0.8.4-main.3eb6e50203",
+    "@dxos/context": "0.8.4-main.3eb6e50203",
+    "@dxos/echo": "0.8.4-main.3eb6e50203",
+    "@dxos/blueprints": "0.8.4-main.3eb6e50203",
+    "@dxos/echo-db": "0.8.4-main.3eb6e50203",
+    "@dxos/echo-protocol": "0.8.4-main.3eb6e50203",
+    "@dxos/echo-atom": "0.8.4-main.3eb6e50203",
+    "@dxos/effect": "0.8.4-main.3eb6e50203",
+    "@dxos/functions": "0.8.4-main.3eb6e50203",
+    "@dxos/invariant": "0.8.4-main.3eb6e50203",
+    "@dxos/keys": "0.8.4-main.3eb6e50203",
+    "@dxos/log": "0.8.4-main.3eb6e50203",
+    "@dxos/migrations": "0.8.4-main.3eb6e50203",
+    "@dxos/operation": "0.8.4-main.3eb6e50203",
+    "@dxos/plugin-client": "0.8.4-main.3eb6e50203",
+    "@dxos/plugin-attention": "0.8.4-main.3eb6e50203",
+    "@dxos/plugin-graph": "0.8.4-main.3eb6e50203",
+    "@dxos/plugin-deck": "0.8.4-main.3eb6e50203",
+    "@dxos/plugin-observability": "0.8.4-main.3eb6e50203",
+    "@dxos/plugin-status-bar": "0.8.4-main.3eb6e50203",
+    "@dxos/react-ui": "0.8.4-main.3eb6e50203",
+    "@dxos/react-client": "0.8.4-main.3eb6e50203",
+    "@dxos/react-ui-components": "0.8.4-main.3eb6e50203",
+    "@dxos/react-ui-attention": "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-list": "0.8.4-main.3eb6e50203",
+    "@dxos/react-ui-masonry": "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-syntax-highlighter": "0.8.4-main.3eb6e50203",
+    "@dxos/react-ui-stack": "0.8.4-main.3eb6e50203",
+    "@dxos/react-ui-tabs": "0.8.4-main.3eb6e50203",
+    "@dxos/react-ui-pickers": "0.8.4-main.3eb6e50203",
+    "@dxos/shell": "0.8.4-main.3eb6e50203",
+    "@dxos/schema": "0.8.4-main.3eb6e50203",
+    "@dxos/types": "0.8.4-main.3eb6e50203",
+    "@dxos/ui-theme": "0.8.4-main.3eb6e50203",
+    "@dxos/ui-types": "0.8.4-main.3eb6e50203",
+    "@dxos/util": "0.8.4-main.3eb6e50203",
+    "@dxos/protocols": "0.8.4-main.3eb6e50203"
   },
   "devDependencies": {
+    "@atlaskit/pragmatic-drag-and-drop-hitbox": "1.1.0",
     "@babel/core": "^7.18.13",
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.89.0",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/random": "0.8.4-main.3a94e84",
-    "@dxos/react-ui": "0.8.4-main.3a94e84",
-    "@dxos/react-ui-theme": "0.8.4-main.3a94e84",
-    "@dxos/storybook-utils": "0.8.4-main.3a94e84"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "effect": "3.19.16",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "7.1.9",
+    "@dxos/lit-ui": "0.8.4-main.3eb6e50203",
+    "@dxos/plugin-testing": "0.8.4-main.3eb6e50203",
+    "@dxos/react-ui": "0.8.4-main.3eb6e50203",
+    "@dxos/random": "0.8.4-main.3eb6e50203",
+    "@dxos/storybook-utils": "0.8.4-main.3eb6e50203",
+    "@dxos/ui-theme": "0.8.4-main.3eb6e50203"
   },
   "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.3a94e84",
-    "@dxos/react-ui-theme": "0.8.4-main.3a94e84"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.19.16",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.3eb6e50203",
+    "@dxos/ui-theme": "0.8.4-main.3eb6e50203"
   },
   "publishConfig": {
     "access": "public"

package/src/SpacePlugin.ts

@@ -2,276 +2,216 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
 
-import {
-  Capabilities,
-  Events,
-  allOf,
-  contributes,
-  createIntent,
-  defineModule,
-  definePlugin,
-  oneOf,
-} from '@dxos/app-framework';
-import { Ref, Type } from '@dxos/echo';
+import { ActivationEvent, ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
+import { Ref, Tag, Type } from '@dxos/echo';
+import { Operation } from '@dxos/operation';
 import { AttentionEvents } from '@dxos/plugin-attention';
-import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
-import { createDefaultSchema, DataType, ViewTypeV1, ViewTypeV1ToV2, ViewTypeV2 } from '@dxos/schema';
+import { ClientEvents } from '@dxos/plugin-client/types';
+import { translations as componentsTranslations } from '@dxos/react-ui-components';
+import { translations as formTranslations } from '@dxos/react-ui-form';
+import { Collection, DataTypes, createDefaultSchema } from '@dxos/schema';
 import { translations as shellTranslations } from '@dxos/shell/react';
+import {
+  AnchoredTo,
+  Employer,
+  Event,
+  HasConnection,
+  HasRelationship,
+  HasSubject,
+  Organization,
+  Person,
+  Pipeline,
+  Task,
+} from '@dxos/types';
 
 import {
   AppGraphBuilder,
   AppGraphSerializer,
   IdentityCreated,
-  IntentResolver,
+  OperationResolver,
   ReactRoot,
   ReactSurface,
-  SchemaDefs,
-  SchemaTools,
-  SpaceCapabilities,
+  Repair,
   SpaceSettings,
-  SpacesReady,
   SpaceState,
+  SpacesReady,
 } from './capabilities';
-import { SpaceEvents } from './events';
 import { meta } from './meta';
 import { translations } from './translations';
-import { CollectionAction, defineObjectForm, SpaceAction } from './types';
-
-export type SpacePluginOptions = {
-  /**
-   * Base URL for the invitation link.
-   */
-  invitationUrl?: string;
-
-  /**
-   * Query parameter for the invitation code.
-   */
-  invitationParam?: string;
+import { SpaceEvents } from './types';
+import { type CreateObject, SpaceOperation, type SpacePluginOptions } from './types';
 
-  /**
-   * Whether to send observability events.
-   */
-  observability?: boolean;
-};
+export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
+  AppPlugin.addMetadataModule({
+    metadata: [
+      {
+        id: Collection.Collection.typename,
+        metadata: {
+          icon: 'ph--cards-three--regular',
+          iconHue: 'neutral',
+          // TODO(wittjosiah): Move out of metadata.
+          loadReferences: async (collection: Collection.Collection) => await Ref.Array.loadAll(collection.objects),
+          inputSchema: Schema.Struct({ name: Schema.optional(Schema.String) }),
+          createObject: ((props) => Effect.sync(() => Collection.make(props))) satisfies CreateObject,
+          addToCollectionOnCreate: true,
+        },
+      },
+      {
+        id: Type.getTypename(Type.PersistentType),
+        metadata: {
+          icon: 'ph--database--regular',
+          iconHue: 'green',
+          inputSchema: SpaceOperation.StoredSchemaForm,
+          createObject: ((props, { db }) =>
+            Effect.gen(function* () {
+              if (props.typename) {
+                const result = yield* Operation.invoke(SpaceOperation.UseStaticSchema, {
+                  db,
+                  typename: props.typename,
+                });
+                return result as any;
+              } else {
+                const result = yield* Operation.invoke(SpaceOperation.AddSchema, {
+                  db,
+                  name: props.name,
+                  schema: createDefaultSchema(),
+                });
+                return result.object;
+              }
+            })) satisfies CreateObject,
+        },
+      },
+      {
+        id: Event.Event.typename,
+        metadata: {
+          icon: 'ph--calendar-dot--regular',
+        },
+      },
+      {
+        id: Organization.Organization.typename,
+        metadata: {
+          icon: 'ph--building-office--regular',
+        },
+      },
+      {
+        id: Person.Person.typename,
+        metadata: {
+          icon: 'ph--user--regular',
+        },
+      },
+      {
+        id: Task.Task.typename,
+        metadata: {
+          icon: 'ph--check-circle--regular',
+        },
+      },
+    ],
+  }),
+  AppPlugin.addReactRootModule({ activate: ReactRoot }),
+  AppPlugin.addSchemaModule({
+    schema: [
+      ...DataTypes,
+      AnchoredTo.AnchoredTo,
+      Employer.Employer,
+      Event.Event,
+      HasConnection.HasConnection,
+      HasRelationship.HasRelationship,
+      HasSubject.HasSubject,
+      Organization.Organization,
+      Person.Person,
+      Pipeline.Pipeline,
+      Tag.Tag,
+      Task.Task,
+    ],
+  }),
+  AppPlugin.addSettingsModule({ activate: SpaceSettings }),
+  AppPlugin.addTranslationsModule({
+    translations: [...translations, ...componentsTranslations, ...formTranslations, ...shellTranslations],
+  }),
+  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: ActivationEvent.oneOf(AppActivationEvents.SetupSettings, AppActivationEvents.SetupAppGraph),
+    activatesAfter: [SpaceEvents.StateReady],
+    activate: SpaceState,
+  }),
+  Plugin.addModule(
+    ({
+      shareableLinkOrigin = typeof window !== 'undefined' ? window.location.origin : 'http://localhost',
+      invitationPath = '/',
+      invitationProp = 'spaceInvitationCode',
+    }) => {
+      const createInvitationUrl = (invitationCode: string) => {
+        const baseUrl = new URL(invitationPath || '/', shareableLinkOrigin);
+        baseUrl.searchParams.set(invitationProp, invitationCode);
+        return baseUrl.toString();
+      };
 
-export const SpacePlugin = ({
-  invitationUrl = window.location.origin,
-  invitationParam = 'spaceInvitationCode',
-  observability = false,
-}: SpacePluginOptions = {}) => {
-  const createInvitationUrl = (invitationCode: string) => {
-    const baseUrl = new URL(invitationUrl);
-    baseUrl.searchParams.set(invitationParam, invitationCode);
-    return baseUrl.toString();
-  };
+      return {
+        id: Capability.getModuleTag(ReactSurface),
+        activatesOn: ActivationEvents.SetupReactSurface,
+        // TODO(wittjosiah): Should occur before the settings dialog is loaded when surfaces activation is more granular.
+        activatesBefore: [SpaceEvents.SetupSettingsPanel],
+        activate: () => ReactSurface({ createInvitationUrl }),
+      };
+    },
+  ),
+  Plugin.addModule(
+    ({ shareableLinkOrigin = typeof window !== 'undefined' ? window.location.origin : 'http://localhost' }) => ({
+      id: Capability.getModuleTag(AppGraphBuilder()) ?? 'space-app-graph-builder',
+      activatesOn: AppActivationEvents.SetupAppGraph,
+      activate: () => AppGraphBuilder({ shareableLinkOrigin }),
+    }),
+  ),
+  Plugin.addModule(
+    ({
+      shareableLinkOrigin = typeof window !== 'undefined' ? window.location.origin : 'http://localhost',
+      invitationPath = '/',
+      invitationProp = 'spaceInvitationCode',
+      observability = false,
+    }) => {
+      const createInvitationUrl = (invitationCode: string) => {
+        const baseUrl = new URL(invitationPath || '/', shareableLinkOrigin);
+        baseUrl.searchParams.set(invitationProp, invitationCode);
+        return baseUrl.toString();
+      };
 
-  return definePlugin(meta, [
-    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: oneOf(Events.SetupSettings, Events.SetupAppGraph),
-      activatesAfter: [SpaceEvents.StateReady],
-      activate: SpaceState,
-    }),
-    defineModule({
-      id: `${meta.id}/module/settings`,
-      activatesOn: Events.SetupSettings,
-      activate: SpaceSettings,
-    }),
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, [...translations, ...shellTranslations]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/metadata`,
-      activatesOn: Events.SetupMetadata,
-      activate: () => [
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(DataType.Collection),
-          metadata: {
-            icon: 'ph--cards-three--regular',
-            // TODO(wittjosiah): Move out of metadata.
-            loadReferences: async (collection: DataType.Collection) => await Ref.Array.loadAll(collection.objects),
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(DataType.QueryCollection),
-          metadata: {
-            label: (object: DataType.QueryCollection) => [
-              'typename label',
-              { ns: object.query.typename, count: 2, defaultValue: 'New smart collection' },
-            ],
-            icon: 'ph--funnel-simple--regular',
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(DataType.StoredSchema),
-          metadata: {
-            icon: 'ph--database--regular',
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(DataType.Event),
-          metadata: {
-            icon: 'ph--calendar-dot--regular',
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(DataType.Organization),
-          metadata: {
-            icon: 'ph--building-office--regular',
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(DataType.Person),
-          metadata: {
-            icon: 'ph--user--regular',
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(DataType.Project),
-          metadata: {
-            icon: 'ph--check-square-offset--regular',
-          },
-        }),
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(DataType.Task),
-          metadata: {
-            icon: 'ph--check-circle--regular',
-          },
-        }),
-      ],
-    }),
-    defineModule({
-      id: `${meta.id}/module/object-form`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () => [
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: DataType.Collection,
-            formSchema: Schema.Struct({ name: Schema.optional(Schema.String) }),
-            getIntent: (props) => createIntent(CollectionAction.Create, props),
-          }),
-        ),
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: DataType.QueryCollection,
-            formSchema: CollectionAction.QueryCollectionForm,
-            getIntent: (props) => createIntent(CollectionAction.CreateQueryCollection, props),
-          }),
-        ),
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: DataType.StoredSchema,
-            formSchema: SpaceAction.StoredSchemaForm,
-            getIntent: (props, options) =>
-              props.typename
-                ? createIntent(SpaceAction.UseStaticSchema, { space: options.space, typename: props.typename })
-                : createIntent(SpaceAction.AddSchema, {
-                    space: options.space,
-                    name: props.name,
-                    schema: createDefaultSchema(),
-                  }),
-          }),
-        ),
-      ],
-    }),
-    defineModule({
-      id: `${meta.id}/module/schema-defs`,
-      activatesOn: ClientEvents.ClientReady,
-      activatesBefore: [ClientEvents.SetupSchema],
-      activate: SchemaDefs,
-    }),
-    defineModule({
-      id: `${meta.id}/module/schema`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () =>
-        contributes(ClientCapabilities.Schema, [
-          DataType.View,
-          ViewTypeV1,
-          ViewTypeV2,
-          DataType.Event,
-          DataType.Organization,
-          DataType.Person,
-          DataType.Project,
-          DataType.Task,
-        ]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/migration`,
-      activatesOn: ClientEvents.SetupMigration,
-      activate: () => contributes(ClientCapabilities.Migration, [ViewTypeV1ToV2]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/whitelist-schema`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () =>
-        contributes(ClientCapabilities.SchemaWhiteList, [
-          DataType.Event,
-          DataType.Organization,
-          DataType.Person,
-          DataType.Project,
-          DataType.Task,
-        ]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-root`,
-      activatesOn: Events.Startup,
-      activate: ReactRoot,
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      // TODO(wittjosiah): Should occur before the settings dialog is loaded when surfaces activation is more granular.
-      activatesBefore: [SpaceEvents.SetupSettingsPanel],
-      activate: () => ReactSurface({ createInvitationUrl }),
-    }),
-    defineModule({
-      id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: (context) => IntentResolver({ context, createInvitationUrl, observability }),
-    }),
-    defineModule({
-      id: `${meta.id}/module/app-graph-builder`,
-      activatesOn: Events.SetupAppGraph,
-      activate: AppGraphBuilder,
-    }),
-    // TODO(wittjosiah): This could probably be deferred.
-    defineModule({
-      id: `${meta.id}/module/app-graph-serializer`,
-      activatesOn: Events.AppGraphReady,
-      activate: AppGraphSerializer,
-    }),
-    defineModule({
-      id: `${meta.id}/module/identity-created`,
-      activatesOn: ClientEvents.IdentityCreated,
-      activatesAfter: [SpaceEvents.DefaultSpaceReady],
-      activate: IdentityCreated,
-    }),
-    defineModule({
-      id: `${meta.id}/module/spaces-ready`,
-      activatesOn: allOf(
-        Events.DispatcherReady,
-        Events.LayoutReady,
-        Events.AppGraphReady,
-        AttentionEvents.AttentionReady,
-        SpaceEvents.StateReady,
-        ClientEvents.SpacesReady,
-      ),
-      activate: SpacesReady,
-    }),
-    defineModule({
-      id: `${meta.id}/module/tools`,
-      activatesOn: Events.SetupArtifactDefinition,
-      activate: SchemaTools,
-    }),
-  ]);
-};
+      return {
+        id: Capability.getModuleTag(OperationResolver),
+        activatesOn: ActivationEvents.SetupOperationResolver,
+        activate: () => OperationResolver({ createInvitationUrl, observability }),
+      };
+    },
+  ),
+  // TODO(wittjosiah): This could probably be deferred.
+  Plugin.addModule({
+    activatesOn: AppActivationEvents.AppGraphReady,
+    activate: AppGraphSerializer,
+  }),
+  Plugin.addModule({
+    activatesOn: ClientEvents.IdentityCreated,
+    activatesAfter: [SpaceEvents.DefaultSpaceReady],
+    activate: IdentityCreated,
+  }),
+  Plugin.addModule({
+    activatesOn: ActivationEvent.allOf(
+      ActivationEvents.OperationInvokerReady,
+      AppActivationEvents.LayoutReady,
+      AppActivationEvents.AppGraphReady,
+      AttentionEvents.AttentionReady,
+      SpaceEvents.StateReady,
+      ClientEvents.SpacesReady,
+    ),
+    activate: SpacesReady,
+  }),
+  Plugin.addModule({
+    activatesOn: ClientEvents.SpacesReady,
+    activate: Repair,
+  }),
+  Plugin.make,
+);