@dxos/plugin-space 0.8.4-main.74a063c4e0 → 0.8.4-main.765dc60934

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.8.4-main.74a063c4e0",
+  "version": "0.8.4-main.765dc60934",
   "description": "DXOS Surface plugin for DXOS ECHO Spaces",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,75 +8,95 @@
     "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": "./src/capabilities/index.ts",
-      "browser": "./src/capabilities/index.ts",
-      "node": "./src/capabilities/node.ts"
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
     },
-    "#components": "./src/components/index.ts",
-    "#containers": "./src/containers/index.ts",
-    "#hooks": "./src/hooks/index.ts",
-    "#meta": "./src/meta.ts",
-    "#operations": "./src/operations/index.ts",
-    "#types": "./src/types/index.ts"
-  },
-  "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"
+    "#capabilities/node": {
+      "source": "./src/capabilities/node.ts",
+      "types": "./dist/types/src/capabilities/node.d.ts",
+      "default": "./dist/lib/neutral/capabilities/node.mjs"
     },
-    "./cli": {
-      "source": "./src/cli/index.ts",
-      "types": "./dist/types/src/cli/index.d.ts",
-      "node": "./dist/lib/node-esm/cli/index.mjs"
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
     },
-    "./meta": {
+    "#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",
-      "browser": "./dist/lib/browser/meta.mjs",
-      "node": "./dist/lib/node-esm/meta.mjs"
+      "default": "./dist/lib/neutral/meta.mjs"
     },
-    "./operations": {
+    "#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"
+      "default": "./dist/lib/neutral/operations/index.mjs"
+    },
+    "#plugin": {
+      "source": {
+        "node": "./src/SpacePlugin.node.ts",
+        "default": "./src/SpacePlugin.ts"
+      },
+      "types": "./dist/types/src/SpacePlugin.d.ts",
+      "node": "./dist/lib/neutral/SpacePlugin.node.mjs",
+      "default": "./dist/lib/neutral/SpacePlugin.mjs"
     },
-    "./types": {
+    "#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",
-      "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs"
+      "default": "./dist/lib/neutral/types/index.mjs"
     }
   },
-  "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "meta": [
-        "dist/types/src/meta.d.ts"
-      ],
-      "operations": [
-        "dist/types/src/operations/index.d.ts"
-      ],
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
+  "exports": {
+    ".": {
+      "source": "./src/index.ts",
+      "types": "./dist/types/src/index.d.ts",
+      "default": "./dist/lib/neutral/index.mjs"
+    },
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.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",
   "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",
@@ -85,56 +105,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.74a063c4e0",
-    "@dxos/app-toolkit": "0.8.4-main.74a063c4e0",
-    "@dxos/async": "0.8.4-main.74a063c4e0",
-    "@dxos/app-framework": "0.8.4-main.74a063c4e0",
-    "@dxos/blueprints": "0.8.4-main.74a063c4e0",
-    "@dxos/client": "0.8.4-main.74a063c4e0",
-    "@dxos/cli-util": "0.8.4-main.74a063c4e0",
-    "@dxos/context": "0.8.4-main.74a063c4e0",
-    "@dxos/client-protocol": "0.8.4-main.74a063c4e0",
-    "@dxos/display-name": "0.8.4-main.74a063c4e0",
-    "@dxos/echo": "0.8.4-main.74a063c4e0",
-    "@dxos/echo-db": "0.8.4-main.74a063c4e0",
-    "@dxos/echo-atom": "0.8.4-main.74a063c4e0",
-    "@dxos/echo-protocol": "0.8.4-main.74a063c4e0",
-    "@dxos/effect": "0.8.4-main.74a063c4e0",
-    "@dxos/functions": "0.8.4-main.74a063c4e0",
-    "@dxos/invariant": "0.8.4-main.74a063c4e0",
-    "@dxos/keys": "0.8.4-main.74a063c4e0",
-    "@dxos/log": "0.8.4-main.74a063c4e0",
-    "@dxos/migrations": "0.8.4-main.74a063c4e0",
-    "@dxos/operation": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-deck": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-client": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-attention": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-graph": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-settings": "0.8.4-main.74a063c4e0",
-    "@dxos/protocols": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-observability": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-status-bar": "0.8.4-main.74a063c4e0",
-    "@dxos/react-client": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-attention": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-components": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-editor": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-form": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-list": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-masonry": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-mosaic": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-menu": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-pickers": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-stack": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-tabs": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.74a063c4e0",
-    "@dxos/schema": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-search": "0.8.4-main.74a063c4e0",
-    "@dxos/shell": "0.8.4-main.74a063c4e0",
-    "@dxos/types": "0.8.4-main.74a063c4e0",
-    "@dxos/ui-types": "0.8.4-main.74a063c4e0",
-    "@dxos/ui-theme": "0.8.4-main.74a063c4e0",
-    "@dxos/util": "0.8.4-main.74a063c4e0"
+    "@dxos/ai": "0.8.4-main.765dc60934",
+    "@dxos/app-framework": "0.8.4-main.765dc60934",
+    "@dxos/cli-util": "0.8.4-main.765dc60934",
+    "@dxos/async": "0.8.4-main.765dc60934",
+    "@dxos/client": "0.8.4-main.765dc60934",
+    "@dxos/compute": "0.8.4-main.765dc60934",
+    "@dxos/client-protocol": "0.8.4-main.765dc60934",
+    "@dxos/context": "0.8.4-main.765dc60934",
+    "@dxos/display-name": "0.8.4-main.765dc60934",
+    "@dxos/echo": "0.8.4-main.765dc60934",
+    "@dxos/echo-atom": "0.8.4-main.765dc60934",
+    "@dxos/echo-db": "0.8.4-main.765dc60934",
+    "@dxos/app-toolkit": "0.8.4-main.765dc60934",
+    "@dxos/echo-protocol": "0.8.4-main.765dc60934",
+    "@dxos/effect": "0.8.4-main.765dc60934",
+    "@dxos/invariant": "0.8.4-main.765dc60934",
+    "@dxos/keys": "0.8.4-main.765dc60934",
+    "@dxos/log": "0.8.4-main.765dc60934",
+    "@dxos/migrations": "0.8.4-main.765dc60934",
+    "@dxos/plugin-attention": "0.8.4-main.765dc60934",
+    "@dxos/plugin-deck": "0.8.4-main.765dc60934",
+    "@dxos/plugin-graph": "0.8.4-main.765dc60934",
+    "@dxos/plugin-observability": "0.8.4-main.765dc60934",
+    "@dxos/plugin-settings": "0.8.4-main.765dc60934",
+    "@dxos/plugin-status-bar": "0.8.4-main.765dc60934",
+    "@dxos/protocols": "0.8.4-main.765dc60934",
+    "@dxos/plugin-client": "0.8.4-main.765dc60934",
+    "@dxos/react-client": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-attention": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-components": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-editor": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-list": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-masonry": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-pickers": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-menu": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-mosaic": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-form": "0.8.4-main.765dc60934",
+    "@dxos/react-ui": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-search": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-stack": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-tabs": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.765dc60934",
+    "@dxos/shell": "0.8.4-main.765dc60934",
+    "@dxos/ui-theme": "0.8.4-main.765dc60934",
+    "@dxos/schema": "0.8.4-main.765dc60934",
+    "@dxos/types": "0.8.4-main.765dc60934",
+    "@dxos/ui-types": "0.8.4-main.765dc60934",
+    "@dxos/util": "0.8.4-main.765dc60934"
   },
   "devDependencies": {
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "1.1.0",
@@ -146,14 +164,14 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/lit-ui": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-preview": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-testing": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui": "0.8.4-main.74a063c4e0",
-    "@dxos/random": "0.8.4-main.74a063c4e0",
-    "@dxos/ui-theme": "0.8.4-main.74a063c4e0",
-    "@dxos/storybook-utils": "0.8.4-main.74a063c4e0"
+    "vite": "^8.0.13",
+    "@dxos/lit-ui": "0.8.4-main.765dc60934",
+    "@dxos/plugin-testing": "0.8.4-main.765dc60934",
+    "@dxos/react-ui": "0.8.4-main.765dc60934",
+    "@dxos/plugin-preview": "0.8.4-main.765dc60934",
+    "@dxos/storybook-utils": "0.8.4-main.765dc60934",
+    "@dxos/ui-theme": "0.8.4-main.765dc60934",
+    "@dxos/random": "0.8.4-main.765dc60934"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -161,10 +179,7 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.74a063c4e0",
-    "@dxos/ui-theme": "0.8.4-main.74a063c4e0"
-  },
-  "publishConfig": {
-    "access": "public"
+    "@dxos/react-ui": "0.8.4-main.765dc60934",
+    "@dxos/ui-theme": "0.8.4-main.765dc60934"
   }
 }

package/src/{cli/plugin.ts → SpacePlugin.node.ts}

@@ -2,14 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Effect from 'effect/Effect';
-
 import { ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
 import { Tag } from '@dxos/echo';
-import { Collection } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
-import { ClientEvents } from '@dxos/plugin-client/types';
+import { ClientEvents } from '@dxos/plugin-client';
 import { DataTypes } from '@dxos/schema';
 import {
   AnchoredTo,
@@ -24,11 +20,9 @@ import {
   Task,
 } from '@dxos/types';
 
-import { IdentityCreated, OperationHandler, UndoMappings } from '#capabilities';
+import { CreateObject, IdentityCreated, OperationHandler, UndoMappings } from '#capabilities';
 import { meta } from '#meta';
-import { SpaceOperation } from '#operations';
-import { SpaceEvents } from '#types';
-import { type CreateObject, type SpacePluginOptions } from '#types';
+import { SpaceEvents, type SpacePluginOptions } from '#types';
 
 import { database, queue, space } from './commands';
 
@@ -37,23 +31,7 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
   AppPlugin.addCommandModule({
     commands: [database, queue, space],
   }),
-  AppPlugin.addMetadataModule({
-    metadata: {
-      id: Collection.Collection.typename,
-      metadata: {
-        createObject: ((props, options) =>
-          Effect.gen(function* () {
-            const object = Collection.make(props);
-            return yield* Operation.invoke(SpaceOperation.AddObject, {
-              object,
-              target: options.target,
-              hidden: true,
-              targetNodeId: options.targetNodeId,
-            });
-          })) satisfies CreateObject,
-      },
-    },
-  }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
   AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addSchemaModule({
     schema: [
@@ -92,8 +70,10 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
   ),
   Plugin.addModule({
     activatesOn: ClientEvents.IdentityCreated,
-    activatesAfter: [SpaceEvents.PersonalSpaceReady],
+    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 SetupOperationHandler.
+    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 { AttentionEvents } from '@dxos/plugin-attention/types';
-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 { Tag } from '@dxos/echo';
+import { AttentionEvents } from '@dxos/plugin-attention';
+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,11 +21,13 @@ import {
   Organization,
   Person,
   Pipeline,
+  Project,
   Task,
 } from '@dxos/types';
 
 import {
   AppGraphSerializer,
+  CreateObject,
   IdentityCreated,
   Migrations,
   NavigationHandler,
@@ -47,110 +43,12 @@ import {
   AppGraphBuilder,
 } from '#capabilities';
 import { meta } from '#meta';
-import { SpaceOperation } from '#operations';
+import { translations } from '#translations';
 import { SpaceEvents } from '#types';
-import { type CreateObject, type SpacePluginOptions } from '#types';
-
-import { translations } from './translations';
+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, options) =>
-            Effect.gen(function* () {
-              const object = Collection.make(props);
-              return yield* Operation.invoke(SpaceOperation.AddObject, {
-                object,
-                target: options.target,
-                hidden: false,
-                targetNodeId: options.targetNodeId,
-              });
-            })) 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, options) =>
-            Effect.gen(function* () {
-              const result = yield* Operation.invoke(SpaceOperation.AddSchema, {
-                db: options.db,
-                name: props.name,
-                schema: createDefaultSchema(),
-              });
-              return {
-                id: result.id,
-                subject: [],
-                object: 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, options) =>
-            Effect.gen(function* () {
-              const object = Organization.make(props);
-              return yield* Operation.invoke(SpaceOperation.AddObject, {
-                object,
-                target: options.target,
-                hidden: true,
-                targetNodeId: options.targetNodeId,
-              });
-            })) 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, options) =>
-            Effect.gen(function* () {
-              const object = Person.make(props);
-              return yield* Operation.invoke(SpaceOperation.AddObject, {
-                object,
-                target: options.target,
-                hidden: true,
-                targetNodeId: options.targetNodeId,
-              });
-            })) 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, options) =>
-            Effect.gen(function* () {
-              const object = Task.make(props);
-              return yield* Operation.invoke(SpaceOperation.AddObject, {
-                object,
-                target: options.target,
-                hidden: true,
-                targetNodeId: options.targetNodeId,
-              });
-            })) satisfies CreateObject,
-        },
-      },
-    ],
-  }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
   AppPlugin.addNavigationHandlerModule(({ invitationProp }) => ({
     activate: () => NavigationHandler({ invitationProp }),
   })),
@@ -169,6 +67,7 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
       Organization.Organization,
       Person.Person,
       Pipeline.Pipeline,
+      Project.Project,
       Tag.Tag,
       Task.Task,
     ],
@@ -182,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(
@@ -201,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 }),
       };
     },
@@ -240,7 +139,7 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
   }),
   Plugin.addModule({
     activatesOn: ClientEvents.IdentityCreated,
-    activatesAfter: [SpaceEvents.PersonalSpaceReady],
+    firesAfterActivation: [SpaceEvents.PersonalSpaceReady],
     activate: IdentityCreated,
   }),
   Plugin.addModule({
@@ -264,3 +163,5 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
   }),
   Plugin.make,
 );
+
+export default SpacePlugin;

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

@@ -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());