@dxos/plugin-space 0.8.4-staging.60fe92afc8 → 0.9.1-main.c7dcc2e112

package/dx.config.ts

@@ -0,0 +1,35 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Config2 } from '@dxos/app-framework/config';
+import { trim } from '@dxos/util';
+
+export default Config2.make({
+  plugin: {
+    key: 'org.dxos.plugin.space',
+    name: 'Spaces',
+    author: 'DXOS',
+    description: trim`
+      SpacePlugin is the core workspace container for DXOS Composer. It owns the full lifecycle of
+      collaborative spaces — creating, joining, opening, closing, and resetting them — and manages
+      the membership and invitation system that controls who can access each space.
+
+      The plugin maintains an ordered app-graph of every space and its collections, wires navigation
+      so that opening a space or object updates the layout, and tracks real-time peer presence so
+      that the UI can show which collaborators are viewing each object.
+
+      Object and schema management sit at the heart of SpacePlugin: it registers the canonical DXOS
+      schema types (Person, Task, Project, Event, …), provides the create-object dialog that all
+      other plugins populate with their own types, and exposes operations for adding, removing,
+      restoring, duplicating, and serialising objects. Import/export of space archives and schema
+      migrations are also handled here.
+
+      A full set of undo-aware operations (RemoveObjects/RestoreObjects, DeleteField/RestoreField)
+      integrates with the process manager so that destructive edits can be reversed in one step.
+    `,
+    icon: { key: 'ph--planet--regular' },
+    spec: 'PLUGIN.mdl',
+    tags: ['system'],
+  },
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.8.4-staging.60fe92afc8",
+  "version": "0.9.1-main.c7dcc2e112",
   "description": "DXOS Surface plugin for DXOS ECHO Spaces",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -105,6 +105,7 @@
   "types": "dist/types/src/index.d.ts",
   "files": [
     "dist",
+    "dx.config.ts",
     "src",
     "PLUGIN.mdl"
   ],
@@ -114,46 +115,46 @@
     "@effect/cli": "0.75.2",
     "react-drag-drop-files": "^2.3.8",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/app-framework": "0.8.4-staging.60fe92afc8",
-    "@dxos/app-toolkit": "0.8.4-staging.60fe92afc8",
-    "@dxos/async": "0.8.4-staging.60fe92afc8",
-    "@dxos/cli-util": "0.8.4-staging.60fe92afc8",
-    "@dxos/client": "0.8.4-staging.60fe92afc8",
-    "@dxos/compute": "0.8.4-staging.60fe92afc8",
-    "@dxos/context": "0.8.4-staging.60fe92afc8",
-    "@dxos/echo": "0.8.4-staging.60fe92afc8",
-    "@dxos/display-name": "0.8.4-staging.60fe92afc8",
-    "@dxos/echo-client": "0.8.4-staging.60fe92afc8",
-    "@dxos/effect": "0.8.4-staging.60fe92afc8",
-    "@dxos/invariant": "0.8.4-staging.60fe92afc8",
-    "@dxos/keys": "0.8.4-staging.60fe92afc8",
-    "@dxos/client-protocol": "0.8.4-staging.60fe92afc8",
-    "@dxos/log": "0.8.4-staging.60fe92afc8",
-    "@dxos/migrations": "0.8.4-staging.60fe92afc8",
-    "@dxos/plugin-attention": "0.8.4-staging.60fe92afc8",
-    "@dxos/plugin-client": "0.8.4-staging.60fe92afc8",
-    "@dxos/plugin-graph": "0.8.4-staging.60fe92afc8",
-    "@dxos/plugin-observability": "0.8.4-staging.60fe92afc8",
-    "@dxos/plugin-settings": "0.8.4-staging.60fe92afc8",
-    "@dxos/protocols": "0.8.4-staging.60fe92afc8",
-    "@dxos/react-client": "0.8.4-staging.60fe92afc8",
-    "@dxos/react-ui": "0.8.4-staging.60fe92afc8",
-    "@dxos/plugin-status-bar": "0.8.4-staging.60fe92afc8",
-    "@dxos/react-ui-attention": "0.8.4-staging.60fe92afc8",
-    "@dxos/react-ui-components": "0.8.4-staging.60fe92afc8",
-    "@dxos/react-ui-list": "0.8.4-staging.60fe92afc8",
-    "@dxos/react-ui-masonry": "0.8.4-staging.60fe92afc8",
-    "@dxos/react-ui-form": "0.8.4-staging.60fe92afc8",
-    "@dxos/react-ui-mosaic": "0.8.4-staging.60fe92afc8",
-    "@dxos/react-ui-menu": "0.8.4-staging.60fe92afc8",
-    "@dxos/react-ui-pickers": "0.8.4-staging.60fe92afc8",
-    "@dxos/react-ui-search": "0.8.4-staging.60fe92afc8",
-    "@dxos/shell": "0.8.4-staging.60fe92afc8",
-    "@dxos/schema": "0.8.4-staging.60fe92afc8",
-    "@dxos/types": "0.8.4-staging.60fe92afc8",
-    "@dxos/ui-types": "0.8.4-staging.60fe92afc8",
-    "@dxos/ui-theme": "0.8.4-staging.60fe92afc8",
-    "@dxos/util": "0.8.4-staging.60fe92afc8"
+    "@dxos/app-framework": "0.9.1-main.c7dcc2e112",
+    "@dxos/async": "0.9.1-main.c7dcc2e112",
+    "@dxos/app-toolkit": "0.9.1-main.c7dcc2e112",
+    "@dxos/cli-util": "0.9.1-main.c7dcc2e112",
+    "@dxos/client": "0.9.1-main.c7dcc2e112",
+    "@dxos/client-protocol": "0.9.1-main.c7dcc2e112",
+    "@dxos/context": "0.9.1-main.c7dcc2e112",
+    "@dxos/display-name": "0.9.1-main.c7dcc2e112",
+    "@dxos/compute": "0.9.1-main.c7dcc2e112",
+    "@dxos/echo": "0.9.1-main.c7dcc2e112",
+    "@dxos/effect": "0.9.1-main.c7dcc2e112",
+    "@dxos/invariant": "0.9.1-main.c7dcc2e112",
+    "@dxos/keys": "0.9.1-main.c7dcc2e112",
+    "@dxos/log": "0.9.1-main.c7dcc2e112",
+    "@dxos/plugin-graph": "0.9.1-main.c7dcc2e112",
+    "@dxos/echo-client": "0.9.1-main.c7dcc2e112",
+    "@dxos/migrations": "0.9.1-main.c7dcc2e112",
+    "@dxos/plugin-client": "0.9.1-main.c7dcc2e112",
+    "@dxos/plugin-settings": "0.9.1-main.c7dcc2e112",
+    "@dxos/plugin-status-bar": "0.9.1-main.c7dcc2e112",
+    "@dxos/plugin-observability": "0.9.1-main.c7dcc2e112",
+    "@dxos/react-client": "0.9.1-main.c7dcc2e112",
+    "@dxos/protocols": "0.9.1-main.c7dcc2e112",
+    "@dxos/react-ui": "0.9.1-main.c7dcc2e112",
+    "@dxos/react-ui-components": "0.9.1-main.c7dcc2e112",
+    "@dxos/react-ui-form": "0.9.1-main.c7dcc2e112",
+    "@dxos/react-ui-list": "0.9.1-main.c7dcc2e112",
+    "@dxos/react-ui-attention": "0.9.1-main.c7dcc2e112",
+    "@dxos/react-ui-menu": "0.9.1-main.c7dcc2e112",
+    "@dxos/react-ui-mosaic": "0.9.1-main.c7dcc2e112",
+    "@dxos/react-ui-masonry": "0.9.1-main.c7dcc2e112",
+    "@dxos/plugin-attention": "0.9.1-main.c7dcc2e112",
+    "@dxos/react-ui-pickers": "0.9.1-main.c7dcc2e112",
+    "@dxos/react-ui-search": "0.9.1-main.c7dcc2e112",
+    "@dxos/schema": "0.9.1-main.c7dcc2e112",
+    "@dxos/types": "0.9.1-main.c7dcc2e112",
+    "@dxos/shell": "0.9.1-main.c7dcc2e112",
+    "@dxos/ui-theme": "0.9.1-main.c7dcc2e112",
+    "@dxos/ui-types": "0.9.1-main.c7dcc2e112",
+    "@dxos/util": "0.9.1-main.c7dcc2e112"
   },
   "devDependencies": {
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "1.1.0",
@@ -166,13 +167,13 @@
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
     "vite": "^8.0.16",
-    "@dxos/lit-ui": "0.8.4-staging.60fe92afc8",
-    "@dxos/plugin-preview": "0.8.4-staging.60fe92afc8",
-    "@dxos/plugin-testing": "0.8.4-staging.60fe92afc8",
-    "@dxos/react-ui": "0.8.4-staging.60fe92afc8",
-    "@dxos/random": "0.8.4-staging.60fe92afc8",
-    "@dxos/ui-theme": "0.8.4-staging.60fe92afc8",
-    "@dxos/storybook-utils": "0.8.4-staging.60fe92afc8"
+    "@dxos/lit-ui": "0.9.1-main.c7dcc2e112",
+    "@dxos/plugin-testing": "0.9.1-main.c7dcc2e112",
+    "@dxos/plugin-preview": "0.9.1-main.c7dcc2e112",
+    "@dxos/random": "0.9.1-main.c7dcc2e112",
+    "@dxos/storybook-utils": "0.9.1-main.c7dcc2e112",
+    "@dxos/ui-theme": "0.9.1-main.c7dcc2e112",
+    "@dxos/react-ui": "0.9.1-main.c7dcc2e112"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -180,8 +181,8 @@
     "effect": "3.21.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-staging.60fe92afc8",
-    "@dxos/ui-theme": "0.8.4-staging.60fe92afc8"
+    "@dxos/react-ui": "0.9.1-main.c7dcc2e112",
+    "@dxos/ui-theme": "0.9.1-main.c7dcc2e112"
   },
   "publishConfig": {
     "access": "public"

package/src/SpacePlugin.test.ts

@@ -11,7 +11,7 @@ import { SpacePlugin } from '#plugin';
 
 import { meta } from './meta';
 
-const moduleId = (name: string) => `${meta.id}.module.${name}`;
+const moduleId = (name: string) => `${meta.profile.key}.module.${name}`;
 
 describe('SpacePlugin', () => {
   test('modules activate on the expected events', async ({ expect }) => {

package/src/SpacePlugin.ts

@@ -26,7 +26,6 @@ import {
 } from '@dxos/types';
 
 import {
-  AppGraphSerializer,
   CreateObject,
   IdentityCreated,
   NavigationHandler,
@@ -134,11 +133,6 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
       };
     },
   ),
-  // TODO(wittjosiah): This could probably be deferred.
-  Plugin.addModule({
-    activatesOn: AppActivationEvents.AppGraphReady,
-    activate: AppGraphSerializer,
-  }),
   Plugin.addModule({
     activatesOn: ClientEvents.IdentityCreated,
     firesAfterActivation: [SpaceEvents.PersonalSpaceReady],
@@ -160,7 +154,7 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
     activate: Repair,
   }),
   AppPlugin.addPluginAssetModule({
-    asset: { pluginId: meta.id, path: 'PLUGIN.mdl', content: pluginSpec, mimeType: 'application/x-mdl' },
+    asset: { pluginId: meta.profile.key, path: 'PLUGIN.mdl', content: pluginSpec, mimeType: 'application/x-mdl' },
   }),
   Plugin.make,
 );

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

@@ -6,15 +6,7 @@ import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import {
-  AppCapabilities,
-  AppNodeMatcher,
-  LayoutOperation,
-  RootCollectionAnnotation,
-  Segments,
-  getObjectPathFromObject,
-  toUrlPath,
-} from '@dxos/app-toolkit';
+import { AppAnnotation, AppCapabilities, AppNode, AppNodeMatcher, LayoutOperation, Paths } from '@dxos/app-toolkit';
 import { SpaceState, isSpace } from '@dxos/client/echo';
 import { Operation } from '@dxos/compute';
 import { Annotation, Collection, Obj, Type } from '@dxos/echo';
@@ -32,9 +24,6 @@ import {
   CREATE_OBJECT_IN_COLLECTION_LABEL,
   EXPOSE_OBJECT_LABEL,
   REMOVE_FROM_COLLECTION_LABEL,
-  createObjectNode,
-  getCollectionGraphNodePartials,
-  getDynamicLabel,
 } from './shared';
 
 //
@@ -61,22 +50,24 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
         }
 
         get(Obj.atom(space.properties));
-        const collectionRef = Annotation.get(space.properties, RootCollectionAnnotation).pipe(Option.getOrUndefined);
+        const collectionRef = Annotation.get(space.properties, AppAnnotation.RootCollectionAnnotation).pipe(
+          Option.getOrUndefined,
+        );
         if (collectionRef) {
           get(Obj.atom(collectionRef));
         }
         const rootCollection = collectionRef?.target;
         const collectionPartials = rootCollection
-          ? getCollectionGraphNodePartials({ db: space.db, collection: rootCollection })
+          ? AppNode.getCollectionGraphNodePartials({ db: space.db, collection: rootCollection })
           : undefined;
 
         return Effect.succeed([
           Node.make({
-            id: Segments.collections,
+            id: Paths.Segments.collections,
             type: COLLECTIONS_SECTION_TYPE,
             data: null,
             properties: {
-              label: ['collections-section.label', { ns: meta.id }],
+              label: ['collections-section.label', { ns: meta.profile.key }],
               icon: 'ph--folder--regular',
               iconHue: 'amber',
               role: 'branch',
@@ -104,7 +95,9 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
         const ephemeralState = get(ephemeralAtom);
 
         get(Obj.atom(space.properties));
-        const collectionRef = Annotation.get(space.properties, RootCollectionAnnotation).pipe(Option.getOrUndefined);
+        const collectionRef = Annotation.get(space.properties, AppAnnotation.RootCollectionAnnotation).pipe(
+          Option.getOrUndefined,
+        );
         const collection = collectionRef ? get(Obj.atom(collectionRef)) : undefined;
         if (!collection) {
           return Effect.succeed([]);
@@ -122,7 +115,8 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
         return Effect.succeed(
           objects
             .map((object: Obj.Unknown) =>
-              createObjectNode({
+              AppNode.makeObject({
+                get,
                 db: space.db,
                 object,
                 navigable: ephemeralState.navigableCollections,
@@ -158,7 +152,8 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
             .map(
               (object: Obj.Unknown) =>
                 db &&
-                createObjectNode({
+                AppNode.makeObject({
+                  get,
                   object,
                   db,
                   navigable: ephemeralState.navigableCollections,
@@ -211,6 +206,31 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
         );
       },
     }),
+
+    // Action on the collections section header to create a new collection.
+    GraphBuilder.createExtension({
+      id: 'collectionsSectionActions',
+      match: (node) => {
+        const space = isSpace(node.properties.space) ? node.properties.space : undefined;
+        return node.type === COLLECTIONS_SECTION_TYPE && space ? Option.some(space) : Option.none();
+      },
+      actions: (space) =>
+        Effect.succeed([
+          Node.makeAction({
+            id: 'create-collection',
+            data: () =>
+              Operation.invoke(SpaceOperation.OpenCreateObject, {
+                target: space.db,
+                typename: Type.getTypename(Collection.Collection),
+              }),
+            properties: {
+              label: ['add-object.label', { ns: Type.getTypename(Collection.Collection) }],
+              icon: 'ph--plus--regular',
+              disposition: 'list-item-primary',
+            },
+          }),
+        ]),
+    }),
   ]);
 });
 
@@ -259,7 +279,7 @@ const constructObjectActions = ({
       data: (params?: Node.InvokeProps) =>
         Operation.invoke(SpaceOperation.RenameObject, { object, caller: `${params?.caller}:${params?.parent?.id}` }),
       properties: {
-        label: getDynamicLabel('rename-object.label', typename, { defaultValue: 'Rename' }),
+        label: AppNode.getDynamicLabel('rename-object.label', typename, { defaultValue: 'Rename' }),
         icon: 'ph--pencil-simple-line--regular',
         disposition: 'list-item',
         testId: 'spacePlugin.renameObject',
@@ -282,7 +302,7 @@ const constructObjectActions = ({
 
                   if (isActive) {
                     yield* Operation.invoke(LayoutOperation.Open, {
-                      subject: [getObjectPathFromObject(object)],
+                      subject: [Paths.getObjectPathFromObject(object)],
                     });
                   }
                 }
@@ -304,7 +324,7 @@ const constructObjectActions = ({
           target: parentCollection,
         }),
       properties: {
-        label: getDynamicLabel('delete-object.label', typename, { defaultValue: 'Delete' }),
+        label: AppNode.getDynamicLabel('delete-object.label', typename, { defaultValue: 'Delete' }),
         icon: 'ph--trash--regular',
         disposition: 'list-item',
         disabled: !deletable,
@@ -317,7 +337,7 @@ const constructObjectActions = ({
             id: 'copyLink',
             data: () =>
               Effect.promise(async () => {
-                const url = new URL(toUrlPath(nodeId), shareableLinkOrigin);
+                const url = new URL(Paths.toUrlPath(nodeId), shareableLinkOrigin);
                 await navigator.clipboard.writeText(url.toString());
               }),
             properties: {
@@ -331,7 +351,7 @@ const constructObjectActions = ({
       : []),
     Node.makeAction({
       id: LayoutOperation.Expose.meta.key,
-      data: () => Operation.invoke(LayoutOperation.Expose, { subject: getObjectPathFromObject(object) }),
+      data: () => Operation.invoke(LayoutOperation.Expose, { subject: Paths.getObjectPathFromObject(object) }),
       properties: {
         label: EXPOSE_OBJECT_LABEL,
         icon: 'ph--eye--regular',

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

@@ -31,7 +31,7 @@ export const createCompanionExtensions: () => Effect.Effect<GraphBuilder.Builder
           Effect.succeed([
             AppNode.makeCompanion({
               id: linkedSegment('settings'),
-              label: ['object-properties.label', { ns: meta.id }],
+              label: ['object-properties.label', { ns: meta.profile.key }],
               icon: 'ph--sliders--regular',
               data: 'settings', // TODO(burdon): Change to 'object-properties'.
               position: 'last',
@@ -47,7 +47,7 @@ export const createCompanionExtensions: () => Effect.Effect<GraphBuilder.Builder
           Effect.succeed([
             AppNode.makeCompanion({
               id: linkedSegment('related'),
-              label: ['companion-related.label', { ns: meta.id }],
+              label: ['companion-related.label', { ns: meta.profile.key }],
               icon: 'ph--graph--regular',
               data: 'related',
               position: 'last',
@@ -79,7 +79,7 @@ export const createCompanionExtensions: () => Effect.Effect<GraphBuilder.Builder
           Effect.succeed([
             AppNode.makeCompanion({
               id: linkedSegment('selected-objects'),
-              label: ['companion-selected-objects.label', { ns: meta.id }],
+              label: ['companion-selected-objects.label', { ns: meta.profile.key }],
               icon: 'ph--tree-view--regular',
               data: 'selected-objects',
             }),

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

@@ -8,7 +8,7 @@ import * as Match from 'effect/Match';
 import * as Option from 'effect/Option';
 
 import { Capability, type CapabilityManager } from '@dxos/app-framework';
-import { AppNode, AppNodeMatcher, LayoutOperation, Segments, getTypeSlug } from '@dxos/app-toolkit';
+import { AppNode, AppNodeMatcher, LayoutOperation, Paths } from '@dxos/app-toolkit';
 import { type Space, SpaceState, isSpace } from '@dxos/client/echo';
 import { Operation } from '@dxos/compute';
 import { Annotation, Collection, Entity, Filter, Obj, Query, Scope, Type } from '@dxos/echo';
@@ -32,9 +32,7 @@ import {
   TYPES_SECTION_TYPE,
   TYPE_COLLECTION_TYPE,
   buildViewIndex,
-  createObjectNode,
   downloadBlob,
-  getDynamicLabel,
 } from './shared';
 
 //
@@ -58,9 +56,9 @@ export const createDatabaseExtensions = Effect.fnUntraced(function* () {
 
         return Effect.succeed([
           AppNode.makeSection({
-            id: Segments.types,
+            id: Paths.Segments.types,
             type: TYPES_SECTION_TYPE,
-            label: ['types-section.label', { ns: meta.id }],
+            label: ['types-section.label', { ns: meta.profile.key }],
             icon: 'ph--database--regular',
             space,
             position: 'last',
@@ -130,7 +128,7 @@ export const createDatabaseExtensions = Effect.fnUntraced(function* () {
         const client = get(capabilities.atom(ClientCapabilities.Client)).at(0);
         const schemas = client ? get(client.graph.registry.query(Filter.type(Type.Type)).atom) : [];
 
-        const slug = getTypeSlug(schema);
+        const slug = Paths.getTypeSlug(schema);
         const typeUri = Type.getURI(schema);
 
         // {All} virtual node.
@@ -139,7 +137,7 @@ export const createDatabaseExtensions = Effect.fnUntraced(function* () {
           type: TYPE_COLLECTION_TYPE,
           data: { space, typeUri },
           properties: {
-            label: ['type-collection-all.label', { ns: meta.id }],
+            label: ['type-collection-all.label', { ns: meta.profile.key }],
             icon: 'ph--list--regular',
             iconHue: 'neutral',
             role: 'branch',
@@ -157,7 +155,8 @@ export const createDatabaseExtensions = Effect.fnUntraced(function* () {
         const viewNodes = viewIndex
           .getViewsForTypeUri(typeUri)
           .map((object: Obj.Unknown) =>
-            createObjectNode({
+            AppNode.makeObject({
+              get,
               db: space.db,
               object,
               droppable: false,
@@ -190,7 +189,8 @@ export const createDatabaseExtensions = Effect.fnUntraced(function* () {
           objects
             .map((object: Obj.Unknown) => {
               get(Obj.atom(object));
-              return createObjectNode({
+              return AppNode.makeObject({
+                get,
                 db: space.db,
                 object,
                 droppable: false,
@@ -254,7 +254,7 @@ const createSchemaNode = ({
   const typename = Type.getTypename(schema);
   // The node id doubles as the `types/<slug>` path segment, so it must be slash- and colon-free:
   // a stored schema's entity id, or a static schema's typename.
-  const slug = getTypeSlug(schema);
+  const slug = Paths.getTypeSlug(schema);
   const iconAnnotation =
     Type.getDatabase(schema) == null
       ? Option.getOrUndefined(Annotation.IconAnnotation.get(Type.getSchema(schema)))
@@ -275,7 +275,7 @@ const createSchemaNode = ({
       },
     ),
     Match.orElse(() => ({
-      label: getDynamicLabel('typename.label', typename, { count: 2, defaultValue: typename }),
+      label: AppNode.getDynamicLabel('typename.label', typename, { count: 2, defaultValue: typename }),
       nodeId: slug,
     })),
   );
@@ -351,7 +351,10 @@ const createSchemaActions = ({
             properties: {
               // Static plugin types carry a per-typename `add-object.label` (e.g. "Add event");
               // database types have no such namespace, so fall back to the plugin's generic label.
-              label: getDynamicLabel('add-object.label', Type.getDatabase(type) != null ? meta.id : typename),
+              label: AppNode.getDynamicLabel(
+                'add-object.label',
+                Type.getDatabase(type) != null ? meta.profile.key : typename,
+              ),
               icon: 'ph--plus--regular',
               disposition: 'list-item-primary',
               testId: 'spacePlugin.createObject',
@@ -384,7 +387,7 @@ const createSchemaActions = ({
             })
           : Effect.fail(new Error('Cannot rename immutable schema')),
       properties: {
-        label: getDynamicLabel('rename-object.label', Type.getTypename(Type.Type)),
+        label: AppNode.getDynamicLabel('rename-object.label', Type.getTypename(Type.Type)),
         icon: 'ph--pencil-simple-line--regular',
         disabled: Type.getDatabase(type) == null,
         disposition: 'list-item',
@@ -400,7 +403,7 @@ const createSchemaActions = ({
             })
           : Effect.succeed(undefined),
       properties: {
-        label: getDynamicLabel('delete-object.label', Type.getTypename(Type.Type)),
+        label: AppNode.getDynamicLabel('delete-object.label', Type.getTypename(Type.Type)),
         icon: 'ph--trash--regular',
         disposition: 'list-item',
         disabled: !deletable,

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

@@ -4,7 +4,7 @@
 
 import * as Effect from 'effect/Effect';
 
-import { AppNode, AppNodeMatcher, isPersonalSpace } from '@dxos/app-toolkit';
+import { AppNode, AppNodeMatcher, AppSpace } from '@dxos/app-toolkit';
 import { GraphBuilder, Node } from '@dxos/plugin-graph';
 
 import { meta } from '#meta';
@@ -31,7 +31,7 @@ export const createSettingsExtensions = Effect.fnUntraced(function* () {
         AppNode.makeSection({
           id: SETTINGS_SECTION_ID,
           type: SETTINGS_SECTION_TYPE,
-          label: ['settings-section.label', { ns: meta.id }],
+          label: ['settings-section.label', { ns: meta.profile.key }],
           icon: 'ph--sliders--regular',
           iconHue: 'indigo',
           space,
@@ -45,14 +45,14 @@ export const createSettingsExtensions = Effect.fnUntraced(function* () {
     id: 'settingsSections',
     match: AppNodeMatcher.whenSpaceSettings,
     connector: (space) => {
-      const personal = isPersonalSpace(space);
+      const personal = AppSpace.isPersonalSpace(space);
       return Effect.succeed([
         Node.make({
           id: 'general',
-          type: `${meta.id}.general`,
-          data: `${meta.id}.general`,
+          type: `${meta.profile.key}.general`,
+          data: `${meta.profile.key}.general`,
           properties: {
-            label: ['space-settings-properties.label', { ns: meta.id }],
+            label: ['space-settings-properties.label', { ns: meta.profile.key }],
             icon: 'ph--brackets-curly--regular',
             iconHue: 'indigo',
             space,
@@ -63,10 +63,10 @@ export const createSettingsExtensions = Effect.fnUntraced(function* () {
           ? [
               Node.make({
                 id: 'members',
-                type: `${meta.id}.members`,
-                data: `${meta.id}.members`,
+                type: `${meta.profile.key}.members`,
+                data: `${meta.profile.key}.members`,
                 properties: {
-                  label: ['members-panel.label', { ns: meta.id }],
+                  label: ['members-panel.label', { ns: meta.profile.key }],
                   icon: 'ph--users--regular',
                   iconHue: 'indigo',
                   space,

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

@@ -17,36 +17,21 @@ import { type Label } from '@dxos/ui-types/translations';
 
 import { meta } from '#meta';
 
-export {
-  ACCEPT_ECHO_CLASS,
-  CACHEABLE_PROPS,
-  CAN_DROP_OBJECT,
-  blockInstructionCache,
-  buildCollectionPartials,
-  collectionPartialsCache,
-  createFactory,
-  createObjectNode,
-  getAcceptPersistenceKey,
-  getCollectionGraphNodePartials,
-  getDynamicLabel,
-  rearrangeCache,
-} from '@dxos/app-toolkit';
-
 //
 // Virtual Node Types
 //
 
-export const TYPES_SECTION_TYPE = `${meta.id}.types`;
-export const COLLECTIONS_SECTION_TYPE = `${meta.id}.collections`;
-export const TYPE_COLLECTION_TYPE = `${meta.id}.type-collection`;
-export const STATIC_SCHEMA_TYPE = `${meta.id}.static-schema`;
+export const TYPES_SECTION_TYPE = `${meta.profile.key}.types`;
+export const COLLECTIONS_SECTION_TYPE = `${meta.profile.key}.collections`;
+export const TYPE_COLLECTION_TYPE = `${meta.profile.key}.type-collection`;
+export const STATIC_SCHEMA_TYPE = `${meta.profile.key}.static-schema`;
 
 //
 // Constants
 //
 
 /** Shared translation namespace descriptor. */
-export const META_NS: { ns: string } = { ns: meta.id };
+export const META_NS: { ns: string } = { ns: meta.profile.key };
 
 //
 // Stable Callbacks