@dxos/plugin-space 0.8.4-main.8360d9e660 → 0.8.4-main.8baae0fced

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.8.4-main.8360d9e660",
+  "version": "0.8.4-main.8baae0fced",
   "description": "DXOS Surface plugin for DXOS ECHO Spaces",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,43 +8,97 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#capabilities/node": {
+      "source": "./src/capabilities/node.ts",
+      "types": "./dist/types/src/capabilities/node.d.ts",
+      "default": "./dist/lib/neutral/capabilities/node.mjs"
+    },
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "#containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
+    },
+    "#hooks": {
+      "source": "./src/hooks/index.ts",
+      "types": "./dist/types/src/hooks/index.d.ts",
+      "default": "./dist/lib/neutral/hooks/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#operations": {
+      "source": "./src/operations/index.ts",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "default": "./dist/lib/neutral/operations/index.mjs"
+    },
+    "#plugin": {
+      "source": {
+        "workerd": "./src/SpacePlugin.workerd.ts",
+        "node": "./src/SpacePlugin.node.ts",
+        "default": "./src/SpacePlugin.ts"
+      },
+      "types": "./dist/types/src/SpacePlugin.d.ts",
+      "workerd": "./dist/lib/neutral/SpacePlugin.workerd.mjs",
+      "node": "./dist/lib/neutral/SpacePlugin.node.mjs",
+      "default": "./dist/lib/neutral/SpacePlugin.mjs"
+    },
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    },
+    "#types": {
+      "source": "./src/types/index.ts",
+      "types": "./dist/types/src/types/index.d.ts",
+      "default": "./dist/lib/neutral/types/index.mjs"
+    }
+  },
   "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"
+      "default": "./dist/lib/neutral/index.mjs"
     },
-    "./cli": {
-      "source": "./src/cli/index.ts",
-      "types": "./dist/types/src/cli/index.d.ts",
-      "node": "./dist/lib/node-esm/cli/index.mjs"
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.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"
+    "./testing": {
+      "source": "./src/testing.ts",
+      "types": "./dist/types/src/testing.d.ts",
+      "default": "./dist/lib/neutral/testing.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.2.3",
+    "@automerge/automerge": "3.2.6",
     "@effect-atom/atom": "^0.5.1",
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/cli": "0.73.2",
@@ -53,55 +107,54 @@
     "react-drag-drop-files": "^2.3.8",
     "react-is": "~19.2.0",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/ai": "0.8.4-main.8360d9e660",
-    "@dxos/app-framework": "0.8.4-main.8360d9e660",
-    "@dxos/app-toolkit": "0.8.4-main.8360d9e660",
-    "@dxos/blueprints": "0.8.4-main.8360d9e660",
-    "@dxos/async": "0.8.4-main.8360d9e660",
-    "@dxos/client": "0.8.4-main.8360d9e660",
-    "@dxos/client-protocol": "0.8.4-main.8360d9e660",
-    "@dxos/cli-util": "0.8.4-main.8360d9e660",
-    "@dxos/context": "0.8.4-main.8360d9e660",
-    "@dxos/display-name": "0.8.4-main.8360d9e660",
-    "@dxos/echo-atom": "0.8.4-main.8360d9e660",
-    "@dxos/echo-db": "0.8.4-main.8360d9e660",
-    "@dxos/echo": "0.8.4-main.8360d9e660",
-    "@dxos/echo-protocol": "0.8.4-main.8360d9e660",
-    "@dxos/functions": "0.8.4-main.8360d9e660",
-    "@dxos/effect": "0.8.4-main.8360d9e660",
-    "@dxos/invariant": "0.8.4-main.8360d9e660",
-    "@dxos/migrations": "0.8.4-main.8360d9e660",
-    "@dxos/log": "0.8.4-main.8360d9e660",
-    "@dxos/keys": "0.8.4-main.8360d9e660",
-    "@dxos/plugin-attention": "0.8.4-main.8360d9e660",
-    "@dxos/plugin-deck": "0.8.4-main.8360d9e660",
-    "@dxos/plugin-observability": "0.8.4-main.8360d9e660",
-    "@dxos/plugin-status-bar": "0.8.4-main.8360d9e660",
-    "@dxos/operation": "0.8.4-main.8360d9e660",
-    "@dxos/protocols": "0.8.4-main.8360d9e660",
-    "@dxos/react-client": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui-attention": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui-list": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui-components": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui-editor": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui-form": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui-masonry": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui-menu": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui-mosaic": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui-pickers": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui-stack": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui-searchlist": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui-tabs": "0.8.4-main.8360d9e660",
-    "@dxos/shell": "0.8.4-main.8360d9e660",
-    "@dxos/schema": "0.8.4-main.8360d9e660",
-    "@dxos/types": "0.8.4-main.8360d9e660",
-    "@dxos/ui-types": "0.8.4-main.8360d9e660",
-    "@dxos/util": "0.8.4-main.8360d9e660",
-    "@dxos/ui-theme": "0.8.4-main.8360d9e660",
-    "@dxos/plugin-graph": "0.8.4-main.8360d9e660",
-    "@dxos/plugin-client": "0.8.4-main.8360d9e660"
+    "@dxos/app-toolkit": "0.8.4-main.8baae0fced",
+    "@dxos/async": "0.8.4-main.8baae0fced",
+    "@dxos/app-framework": "0.8.4-main.8baae0fced",
+    "@dxos/ai": "0.8.4-main.8baae0fced",
+    "@dxos/cli-util": "0.8.4-main.8baae0fced",
+    "@dxos/client-protocol": "0.8.4-main.8baae0fced",
+    "@dxos/context": "0.8.4-main.8baae0fced",
+    "@dxos/client": "0.8.4-main.8baae0fced",
+    "@dxos/compute": "0.8.4-main.8baae0fced",
+    "@dxos/echo": "0.8.4-main.8baae0fced",
+    "@dxos/display-name": "0.8.4-main.8baae0fced",
+    "@dxos/echo-atom": "0.8.4-main.8baae0fced",
+    "@dxos/echo-protocol": "0.8.4-main.8baae0fced",
+    "@dxos/echo-db": "0.8.4-main.8baae0fced",
+    "@dxos/effect": "0.8.4-main.8baae0fced",
+    "@dxos/invariant": "0.8.4-main.8baae0fced",
+    "@dxos/log": "0.8.4-main.8baae0fced",
+    "@dxos/keys": "0.8.4-main.8baae0fced",
+    "@dxos/migrations": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-attention": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-client": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-deck": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-observability": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-graph": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-status-bar": "0.8.4-main.8baae0fced",
+    "@dxos/protocols": "0.8.4-main.8baae0fced",
+    "@dxos/react-client": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-components": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-attention": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-list": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-masonry": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-editor": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-mosaic": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-menu": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-pickers": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-settings": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-search": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-stack": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-tabs": "0.8.4-main.8baae0fced",
+    "@dxos/schema": "0.8.4-main.8baae0fced",
+    "@dxos/shell": "0.8.4-main.8baae0fced",
+    "@dxos/types": "0.8.4-main.8baae0fced",
+    "@dxos/ui-theme": "0.8.4-main.8baae0fced",
+    "@dxos/ui-types": "0.8.4-main.8baae0fced",
+    "@dxos/util": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-form": "0.8.4-main.8baae0fced"
   },
   "devDependencies": {
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "1.1.0",
@@ -110,25 +163,26 @@
     "@effect/platform": "0.94.4",
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/lit-ui": "0.8.4-main.8360d9e660",
-    "@dxos/plugin-testing": "0.8.4-main.8360d9e660",
-    "@dxos/random": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui": "0.8.4-main.8360d9e660",
-    "@dxos/ui-theme": "0.8.4-main.8360d9e660",
-    "@dxos/storybook-utils": "0.8.4-main.8360d9e660"
+    "vite": "^8.0.13",
+    "@dxos/lit-ui": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-preview": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-testing": "0.8.4-main.8baae0fced",
+    "@dxos/random": "0.8.4-main.8baae0fced",
+    "@dxos/storybook-utils": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui": "0.8.4-main.8baae0fced",
+    "@dxos/ui-theme": "0.8.4-main.8baae0fced"
   },
   "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/react-ui": "0.8.4-main.8360d9e660",
-    "@dxos/ui-theme": "0.8.4-main.8360d9e660"
+    "@dxos/ui-theme": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui": "0.8.4-main.8baae0fced"
   },
   "publishConfig": {
     "access": "public"

package/src/SpacePlugin.node.ts

@@ -0,0 +1,79 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Tag } from '@dxos/echo';
+import { ClientEvents } from '@dxos/plugin-client';
+import { DataTypes } from '@dxos/schema';
+import {
+  AnchoredTo,
+  Employer,
+  Event,
+  HasConnection,
+  HasRelationship,
+  HasSubject,
+  Organization,
+  Person,
+  Pipeline,
+  Task,
+} from '@dxos/types';
+
+import { CreateObject, IdentityCreated, OperationHandler, UndoMappings } from '#capabilities';
+import { meta } from '#meta';
+import { SpaceEvents, type SpacePluginOptions } from '#types';
+
+import { database, queue, space } from './commands';
+
+export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
+  // TODO(wittjosiah): Could some of these commands make use of operations?
+  AppPlugin.addCommandModule({
+    commands: [database, queue, space],
+  }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  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,
+    ],
+  }),
+  Plugin.addModule(
+    ({
+      shareableLinkOrigin = 'http://localhost:5173',
+      invitationPath = '/',
+      invitationProp = 'spaceInvitationCode',
+    }) => {
+      const createInvitationUrl = (invitationCode: string) => {
+        const baseUrl = new URL(invitationPath || '/', shareableLinkOrigin);
+        baseUrl.searchParams.set(invitationProp, invitationCode);
+        return baseUrl.toString();
+      };
+
+      return {
+        id: Capability.getModuleTag(UndoMappings),
+        activatesOn: ActivationEvents.SetupProcessManager,
+        activate: () => UndoMappings({ createInvitationUrl, observability: false }),
+      };
+    },
+  ),
+  Plugin.addModule({
+    activatesOn: ClientEvents.IdentityCreated,
+    firesAfterActivation: [SpaceEvents.PersonalSpaceReady],
+    activate: IdentityCreated,
+  }),
+  Plugin.make,
+);
+
+export default SpacePlugin;

package/src/SpacePlugin.test.ts

@@ -0,0 +1,33 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { SpacePlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('SpacePlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [ClientPlugin({}), SpacePlugin({})],
+    });
+
+    // After autoStart: CreateObject, schema, OperationHandler all auto-cascade.
+    // UndoMappings auto-cascades on SetupProcessManager.
+    expect(harness.manager.getActive()).toEqual(
+      expect.arrayContaining([
+        moduleId('CreateObject'),
+        moduleId('schema'),
+        moduleId('OperationHandler'),
+        moduleId('UndoMappings'),
+      ]),
+    );
+  });
+});

package/src/SpacePlugin.ts

@@ -2,20 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Effect from 'effect/Effect';
-import * as Option from 'effect/Option';
-import * as Schema from 'effect/Schema';
-
 import { ActivationEvent, ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
-import { Annotation, Ref, Tag, Type } from '@dxos/echo';
-import { Collection } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
+import { Tag } from '@dxos/echo';
 import { AttentionEvents } from '@dxos/plugin-attention';
-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 { DataTypes, createDefaultSchema } from '@dxos/schema';
+import { ClientEvents } from '@dxos/plugin-client';
+import { translations as componentsTranslations } from '@dxos/react-ui-components/translations';
+import { translations as formTranslations } from '@dxos/react-ui-form/translations';
+import { DataTypes } from '@dxos/schema';
 import { translations as shellTranslations } from '@dxos/shell/react';
 import {
   AnchoredTo,
@@ -27,84 +21,39 @@ import {
   Organization,
   Person,
   Pipeline,
+  Project,
   Task,
 } from '@dxos/types';
 
 import {
-  AppGraphBuilder,
   AppGraphSerializer,
+  CreateObject,
   IdentityCreated,
-  OperationResolver,
+  Migrations,
+  NavigationHandler,
+  NavigationResolver,
+  OperationHandler,
+  UndoMappings,
   ReactRoot,
   ReactSurface,
   Repair,
   SpaceSettings,
   SpaceState,
   SpacesReady,
-} from './capabilities';
-import { meta } from './meta';
-import { translations } from './translations';
-import { SpaceEvents } from './types';
-import { type CreateObject, SpaceOperation, type SpacePluginOptions } from './types';
+  AppGraphBuilder,
+} from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
+import { SpaceEvents } from '#types';
+import { type SpacePluginOptions } from '#types';
 
 export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
-  AppPlugin.addMetadataModule({
-    metadata: [
-      {
-        id: Collection.Collection.typename,
-        metadata: {
-          icon: Annotation.IconAnnotation.get(Collection.Collection).pipe(Option.getOrThrow).icon,
-          iconHue: Annotation.IconAnnotation.get(Collection.Collection).pipe(Option.getOrThrow).hue ?? 'white',
-          // 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,
-        },
-      },
-      {
-        id: Type.getTypename(Type.PersistentType),
-        metadata: {
-          icon: Annotation.IconAnnotation.get(Type.PersistentType).pipe(Option.getOrThrow).icon,
-          iconHue: Annotation.IconAnnotation.get(Type.PersistentType).pipe(Option.getOrThrow).hue ?? 'white',
-          inputSchema: SpaceOperation.StoredSchemaForm,
-          createObject: ((props, { db }) =>
-            Effect.gen(function* () {
-              const result = yield* Operation.invoke(SpaceOperation.AddSchema, {
-                db,
-                name: props.name,
-                schema: createDefaultSchema(),
-              });
-              return result.object;
-            })) satisfies CreateObject,
-        },
-      },
-      {
-        id: Organization.Organization.typename,
-        metadata: {
-          icon: Annotation.IconAnnotation.get(Organization.Organization).pipe(Option.getOrThrow).icon,
-          iconHue: Annotation.IconAnnotation.get(Organization.Organization).pipe(Option.getOrThrow).hue ?? 'white',
-          createObject: ((props) => Effect.sync(() => Organization.make(props))) satisfies CreateObject,
-        },
-      },
-      {
-        id: Person.Person.typename,
-        metadata: {
-          icon: Annotation.IconAnnotation.get(Person.Person).pipe(Option.getOrThrow).icon,
-          iconHue: Annotation.IconAnnotation.get(Person.Person).pipe(Option.getOrThrow).hue ?? 'white',
-          createObject: ((props) => Effect.sync(() => Person.make(props))) satisfies CreateObject,
-        },
-      },
-      {
-        id: Task.Task.typename,
-        metadata: {
-          icon: Annotation.IconAnnotation.get(Task.Task).pipe(Option.getOrThrow).icon,
-          iconHue: Annotation.IconAnnotation.get(Task.Task).pipe(Option.getOrThrow).hue ?? 'white',
-          inputSchema: Task.Task,
-          createObject: ((props) => Effect.sync(() => Task.make(props))) satisfies CreateObject,
-        },
-      },
-    ],
-  }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
+  AppPlugin.addNavigationHandlerModule(({ invitationProp }) => ({
+    activate: () => NavigationHandler({ invitationProp }),
+  })),
+  AppPlugin.addNavigationResolverModule({ activatesOn: ClientEvents.ClientReady, activate: NavigationResolver }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addReactRootModule({ activate: ReactRoot }),
   AppPlugin.addSchemaModule({
     schema: [
@@ -118,6 +67,7 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
       Organization.Organization,
       Person.Person,
       Pipeline.Pipeline,
+      Project.Project,
       Tag.Tag,
       Task.Task,
     ],
@@ -131,7 +81,7 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
     //   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],
+    firesAfterActivation: [SpaceEvents.StateReady],
     activate: SpaceState,
   }),
   Plugin.addModule(
@@ -150,7 +100,7 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
         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],
+        firesBeforeActivation: [SpaceEvents.SetupSettingsPanel],
         activate: () => ReactSurface({ createInvitationUrl }),
       };
     },
@@ -176,9 +126,9 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
       };
 
       return {
-        id: Capability.getModuleTag(OperationResolver),
-        activatesOn: ActivationEvents.SetupOperationResolver,
-        activate: () => OperationResolver({ createInvitationUrl, observability }),
+        id: Capability.getModuleTag(UndoMappings),
+        activatesOn: ActivationEvents.SetupProcessManager,
+        activate: () => UndoMappings({ createInvitationUrl, observability }),
       };
     },
   ),
@@ -189,12 +139,12 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
   }),
   Plugin.addModule({
     activatesOn: ClientEvents.IdentityCreated,
-    activatesAfter: [SpaceEvents.DefaultSpaceReady],
+    firesAfterActivation: [SpaceEvents.PersonalSpaceReady],
     activate: IdentityCreated,
   }),
   Plugin.addModule({
     activatesOn: ActivationEvent.allOf(
-      ActivationEvents.OperationInvokerReady,
+      ActivationEvents.ProcessManagerReady,
       AppActivationEvents.LayoutReady,
       AppActivationEvents.AppGraphReady,
       AttentionEvents.AttentionReady,
@@ -203,9 +153,15 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
     ),
     activate: SpacesReady,
   }),
+  Plugin.addModule({
+    activatesOn: ClientEvents.SetupMigration,
+    activate: Migrations,
+  }),
   Plugin.addModule({
     activatesOn: ClientEvents.SpacesReady,
     activate: Repair,
   }),
   Plugin.make,
 );
+
+export default SpacePlugin;

package/src/SpacePlugin.workerd.ts

@@ -0,0 +1,46 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Tag } from '@dxos/echo';
+import { DataTypes } from '@dxos/schema';
+import {
+  AnchoredTo,
+  Employer,
+  Event,
+  HasConnection,
+  HasRelationship,
+  HasSubject,
+  Organization,
+  Person,
+  Pipeline,
+  Task,
+} from '@dxos/types';
+
+import { OperationHandler } from '#capabilities';
+import { meta } from '#meta';
+
+export const SpacePlugin = Plugin.define(meta).pipe(
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  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,
+    ],
+  }),
+  Plugin.make,
+);
+
+export default SpacePlugin;

package/src/capabilities/app-graph-builder/app-graph-builder.ts

@@ -7,7 +7,7 @@ import * as Effect from 'effect/Effect';
 import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
 
-import { type SpacePluginOptions } from '../../types';
+import { type SpacePluginOptions } from '#types';
 
 import {
   createCollectionExtensions,
@@ -21,10 +21,10 @@ export default Capability.makeModule(
   Effect.fnUntraced(function* ({ shareableLinkOrigin = window.location.origin }: SpacePluginOptions = {}) {
     const extensions = yield* Effect.all([
       createSpaceExtensions(),
+      createSettingsExtensions(),
       createTypeExtensions(),
       createCollectionExtensions({ shareableLinkOrigin }),
       createCompanionExtensions(),
-      createSettingsExtensions(),
     ]);
 
     return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions.flat());