@dxos/plugin-space 0.9.0 → 0.9.1-main.c7dcc2e112

package/dist/lib/neutral/{app-graph-builder-SQGCUCDO.mjs → app-graph-builder-TMAD2ZTH.mjs}

@@ -1,10 +1,10 @@
 import {
   getSpaceDisplayName,
   makeCreateObjectEntryForDatabaseType
-} from "./chunk-7WUJENBF.mjs";
+} from "./chunk-PSCIOT7Q.mjs";
 import {
   SHARED
-} from "./chunk-K34BPPQE.mjs";
+} from "./chunk-DSYEB2UN.mjs";
 import "./chunk-J5LGTIGS.mjs";
 
 // src/capabilities/app-graph-builder/app-graph-builder.ts
@@ -15,7 +15,7 @@ import { AppCapabilities as AppCapabilities3 } from "@dxos/app-toolkit";
 // src/capabilities/app-graph-builder/extensions/spaces.ts
 import * as Effect from "effect/Effect";
 import { Capability } from "@dxos/app-framework";
-import { AppCapabilities, AppNodeMatcher, getActiveSpace, getPersonalSpace, isExemplarSpace, isPersonalSpace } from "@dxos/app-toolkit";
+import { AppCapabilities, AppNode, AppNodeMatcher, AppSpace, Paths } from "@dxos/app-toolkit";
 import { SpaceState as SpaceState2 } from "@dxos/client/echo";
 import { Operation } from "@dxos/compute";
 import { Filter as Filter2, Obj as Obj2 } from "@dxos/echo";
@@ -26,7 +26,7 @@ import { SpaceArchive } from "@dxos/protocols/proto/dxos/client/services";
 import { Expando } from "@dxos/schema";
 import { meta as meta2 } from "#meta";
 import { SpaceOperation } from "#operations";
-import { SPACE_TYPE, SpaceCapabilities } from "#types";
+import { SPACE_HOME_NODE_TYPE, SPACE_TYPE, SpaceCapabilities } from "#types";
 
 // src/capabilities/app-graph-builder/extensions/shared.ts
 import * as Option from "effect/Option";
@@ -35,13 +35,12 @@ import { Annotation, Filter, Obj, Type } from "@dxos/echo";
 import { MigrationVersionAnnotation, Migrations } from "@dxos/migrations";
 import { ViewAnnotation, getTypeURIFromQuery } from "@dxos/schema";
 import { meta } from "#meta";
-import { ACCEPT_ECHO_CLASS, CACHEABLE_PROPS, CAN_DROP_OBJECT, blockInstructionCache, buildCollectionPartials, collectionPartialsCache, createFactory, createObjectNode, getAcceptPersistenceKey, getCollectionGraphNodePartials, getDynamicLabel, rearrangeCache } from "@dxos/app-toolkit";
-var TYPES_SECTION_TYPE = `${meta.id}.types`;
-var COLLECTIONS_SECTION_TYPE = `${meta.id}.collections`;
-var TYPE_COLLECTION_TYPE = `${meta.id}.type-collection`;
-var STATIC_SCHEMA_TYPE = `${meta.id}.static-schema`;
+var TYPES_SECTION_TYPE = `${meta.profile.key}.types`;
+var COLLECTIONS_SECTION_TYPE = `${meta.profile.key}.collections`;
+var TYPE_COLLECTION_TYPE = `${meta.profile.key}.type-collection`;
+var STATIC_SCHEMA_TYPE = `${meta.profile.key}.static-schema`;
 var META_NS = {
-  ns: meta.id
+  ns: meta.profile.key
 };
 var BLOCK_REORDER_ABOVE = (_source, instruction) => instruction.type === "reorder-above";
 var CAN_DROP_SPACE = (source) => Obj.isObject(source.item.data) || isSpace(source.item.data);
@@ -137,9 +136,36 @@ var buildViewIndex = (get, space, schemas) => {
 };
 
 // src/capabilities/app-graph-builder/extensions/spaces.ts
+var SPACE_HOME_NODE_LABEL = [
+  "space-home-node.label",
+  {
+    ns: meta2.profile.key
+  }
+];
 var createSpaceExtensions = Effect.fnUntraced(function* () {
   const capabilities = yield* Capability.Service;
   return yield* Effect.all([
+    GraphBuilder.createExtension({
+      id: "spaceHome",
+      position: "first",
+      match: AppNodeMatcher.whenSpace,
+      connector: (space) => Effect.succeed([
+        {
+          id: Paths.SPACE_HOME_SEGMENT,
+          type: SPACE_HOME_NODE_TYPE,
+          data: SPACE_HOME_NODE_TYPE,
+          properties: {
+            label: SPACE_HOME_NODE_LABEL,
+            icon: "ph--house--regular",
+            iconHue: "cyan",
+            position: "first",
+            draggable: false,
+            droppable: false,
+            space
+          }
+        }
+      ])
+    }),
     GraphBuilder.createExtension({
       id: "primaryActions",
       position: "first",
@@ -152,7 +178,7 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
             label: [
               "create-space.label",
               {
-                ns: meta2.id
+                ns: meta2.profile.key
               }
             ],
             icon: "ph--plus--regular",
@@ -167,7 +193,7 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
             label: [
               "join-space.label",
               {
-                ns: meta2.id
+                ns: meta2.profile.key
               }
             ],
             icon: "ph--sign-in--regular",
@@ -182,7 +208,7 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
             label: [
               "import-space.label",
               {
-                ns: meta2.id
+                ns: meta2.profile.key
               }
             ],
             icon: "ph--upload--regular",
@@ -193,7 +219,7 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
           id: `${SpaceOperation.ExportSpace.meta.key}.binary`,
           data: Effect.fnUntraced(function* () {
             const client = yield* Capability.get(ClientCapabilities.Client);
-            const space = getActiveSpace(client, capabilities) ?? getPersonalSpace(client);
+            const space = AppSpace.getActiveSpace(client, capabilities) ?? AppSpace.getPersonalSpace(client);
             if (space) {
               yield* Operation.invoke(SpaceOperation.ExportSpace, {
                 space,
@@ -205,7 +231,7 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
             label: [
               "export-space-binary.label",
               {
-                ns: meta2.id
+                ns: meta2.profile.key
               }
             ],
             icon: "ph--download--regular",
@@ -216,7 +242,7 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
           id: `${SpaceOperation.ExportSpace.meta.key}.json`,
           data: Effect.fnUntraced(function* () {
             const client = yield* Capability.get(ClientCapabilities.Client);
-            const space = getActiveSpace(client, capabilities) ?? getPersonalSpace(client);
+            const space = AppSpace.getActiveSpace(client, capabilities) ?? AppSpace.getPersonalSpace(client);
             if (space) {
               yield* Operation.invoke(SpaceOperation.ExportSpace, {
                 space,
@@ -228,7 +254,7 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
             label: [
               "export-space-json.label",
               {
-                ns: meta2.id
+                ns: meta2.profile.key
               }
             ],
             icon: "ph--download--regular",
@@ -239,7 +265,7 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
           id: SpaceOperation.OpenMembers.meta.key,
           data: Effect.fnUntraced(function* () {
             const client = yield* Capability.get(ClientCapabilities.Client);
-            const space = getActiveSpace(client, capabilities) ?? getPersonalSpace(client);
+            const space = AppSpace.getActiveSpace(client, capabilities) ?? AppSpace.getPersonalSpace(client);
             if (space) {
               yield* Operation.invoke(SpaceOperation.OpenMembers, {
                 space
@@ -250,7 +276,7 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
             label: [
               "share-space.label",
               {
-                ns: meta2.id
+                ns: meta2.profile.key
               }
             ],
             icon: "ph--users--regular",
@@ -265,7 +291,7 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
           id: SpaceOperation.OpenSettings.meta.key,
           data: Effect.fnUntraced(function* () {
             const client = yield* Capability.get(ClientCapabilities.Client);
-            const space = getActiveSpace(client, capabilities) ?? getPersonalSpace(client);
+            const space = AppSpace.getActiveSpace(client, capabilities) ?? AppSpace.getPersonalSpace(client);
             if (space) {
               yield* Operation.invoke(SpaceOperation.OpenSettings, {
                 space
@@ -276,7 +302,7 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
             label: [
               "open-current-space-settings.label",
               {
-                ns: meta2.id
+                ns: meta2.profile.key
               }
             ],
             icon: "ph--faders--regular",
@@ -297,7 +323,7 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
         const ephemeralAtom = capabilities.get(SpaceCapabilities.EphemeralState);
         const spacesAtom = CreateAtom.fromObservable(client.spaces);
         const spaces = get(spacesAtom);
-        const personalSpace = getPersonalSpace(client);
+        const personalSpace = AppSpace.getPersonalSpace(client);
         if (!spaces || !personalSpace) {
           return Effect.succeed([]);
         }
@@ -325,10 +351,10 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
           return Effect.succeed([
             ...spaces.filter((space) => orderMap.has(space.id)).sort((sortA, sortB) => orderMap.get(sortA.id) - orderMap.get(sortB.id)),
             ...spaces.filter((space) => !orderMap.has(space.id))
-          ].filter((space, idx) => spaceStates[idx] !== SpaceState2.SPACE_INACTIVE).filter((space) => space.tags.length === 0 || isPersonalSpace(space) || isExemplarSpace(space)).map((space) => constructSpaceNode({
+          ].filter((space, idx) => spaceStates[idx] !== SpaceState2.SPACE_INACTIVE).filter((space) => space.tags.length === 0 || AppSpace.isPersonalSpace(space) || AppSpace.isExemplarSpace(space)).map((space) => constructSpaceNode({
             space,
             navigable: ephemeralState.navigableCollections,
-            personal: isPersonalSpace(space),
+            personal: AppSpace.isPersonalSpace(space),
             namesCache: state.spaceNames,
             graph,
             spacesOrder
@@ -378,7 +404,7 @@ var constructSpaceNode = ({ space, navigable = false, personal, namesCache, grap
   return Node.make({
     id: space.id,
     type: SPACE_TYPE,
-    cacheable: CACHEABLE_PROPS,
+    cacheable: AppNode.CACHEABLE_PROPS,
     data: space,
     properties: {
       label: getSpaceDisplayName(space, {
@@ -463,7 +489,7 @@ import * as Effect2 from "effect/Effect";
 import * as Match from "effect/Match";
 import * as Option2 from "effect/Option";
 import { Capability as Capability2 } from "@dxos/app-framework";
-import { AppNode, AppNodeMatcher as AppNodeMatcher2, LayoutOperation, Segments, getTypeSlug } from "@dxos/app-toolkit";
+import { AppNode as AppNode2, AppNodeMatcher as AppNodeMatcher2, LayoutOperation, Paths as Paths2 } from "@dxos/app-toolkit";
 import { SpaceState as SpaceState3, isSpace as isSpace2 } from "@dxos/client/echo";
 import { Operation as Operation2 } from "@dxos/compute";
 import { Annotation as Annotation2, Collection, Entity, Filter as Filter3, Obj as Obj3, Query, Scope, Type as Type2 } from "@dxos/echo";
@@ -488,13 +514,13 @@ var createDatabaseExtensions = Effect2.fnUntraced(function* () {
           return Effect2.succeed([]);
         }
         return Effect2.succeed([
-          AppNode.makeSection({
-            id: Segments.types,
+          AppNode2.makeSection({
+            id: Paths2.Segments.types,
             type: TYPES_SECTION_TYPE,
             label: [
               "types-section.label",
               {
-                ns: meta3.id
+                ns: meta3.profile.key
               }
             ],
             icon: "ph--database--regular",
@@ -562,7 +588,7 @@ var createDatabaseExtensions = Effect2.fnUntraced(function* () {
       connector: ({ space, schema }, get) => {
         const client = get(capabilities.atom(ClientCapabilities2.Client)).at(0);
         const schemas = client ? get(client.graph.registry.query(Filter3.type(Type2.Type)).atom) : [];
-        const slug = getTypeSlug(schema);
+        const slug = Paths2.getTypeSlug(schema);
         const typeUri = Type2.getURI(schema);
         const allNode = Node2.make({
           id: "all",
@@ -575,7 +601,7 @@ var createDatabaseExtensions = Effect2.fnUntraced(function* () {
             label: [
               "type-collection-all.label",
               {
-                ns: meta3.id
+                ns: meta3.profile.key
               }
             ],
             icon: "ph--list--regular",
@@ -590,7 +616,8 @@ var createDatabaseExtensions = Effect2.fnUntraced(function* () {
           }
         });
         const viewIndex = buildViewIndex(get, space, schemas);
-        const viewNodes = viewIndex.getViewsForTypeUri(typeUri).map((object) => createObjectNode({
+        const viewNodes = viewIndex.getViewsForTypeUri(typeUri).map((object) => AppNode2.makeObject({
+          get,
           db: space.db,
           object,
           droppable: false
@@ -620,7 +647,8 @@ var createDatabaseExtensions = Effect2.fnUntraced(function* () {
         const objects = get(space.db.query(Filter3.type(typeUri)).atom).filter((object) => !viewIndex.isView(object) && !Obj3.getParent(object));
         return Effect2.succeed(objects.map((object) => {
           get(Obj3.atom(object));
-          return createObjectNode({
+          return AppNode2.makeObject({
+            get,
             db: space.db,
             object,
             droppable: false
@@ -660,7 +688,7 @@ var createDatabaseExtensions = Effect2.fnUntraced(function* () {
 });
 var createSchemaNode = ({ schema, space, get }) => {
   const typename = Type2.getTypename(schema);
-  const slug = getTypeSlug(schema);
+  const slug = Paths2.getTypeSlug(schema);
   const iconAnnotation = Type2.getDatabase(schema) == null ? Option2.getOrUndefined(Annotation2.IconAnnotation.get(Type2.getSchema(schema))) : void 0;
   const { label, nodeId } = Match.value(schema).pipe(Match.when((value2) => Type2.getDatabase(value2) != null, (mutableSchema) => {
     const snapshot = get(Entity.atom(mutableSchema));
@@ -674,7 +702,7 @@ var createSchemaNode = ({ schema, space, get }) => {
       nodeId: slug
     };
   }), Match.orElse(() => ({
-    label: getDynamicLabel("typename.label", typename, {
+    label: AppNode2.getDynamicLabel("typename.label", typename, {
       count: 2,
       defaultValue: typename
     }),
@@ -734,7 +762,7 @@ var createSchemaActions = ({ type, space, deletable, capabilities }) => {
         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", Type2.getDatabase(type) != null ? meta3.id : typename),
+          label: AppNode2.getDynamicLabel("add-object.label", Type2.getDatabase(type) != null ? meta3.profile.key : typename),
           icon: "ph--plus--regular",
           disposition: "list-item-primary",
           testId: "spacePlugin.createObject"
@@ -764,7 +792,7 @@ var createSchemaActions = ({ type, space, deletable, capabilities }) => {
         caller: `${params?.caller}:${params?.parent?.id}`
       }) : Effect2.fail(new Error("Cannot rename immutable schema")),
       properties: {
-        label: getDynamicLabel("rename-object.label", Type2.getTypename(Type2.Type)),
+        label: AppNode2.getDynamicLabel("rename-object.label", Type2.getTypename(Type2.Type)),
         icon: "ph--pencil-simple-line--regular",
         disabled: Type2.getDatabase(type) == null,
         disposition: "list-item",
@@ -779,7 +807,7 @@ var createSchemaActions = ({ type, space, deletable, capabilities }) => {
         ]
       }) : Effect2.succeed(void 0),
       properties: {
-        label: getDynamicLabel("delete-object.label", Type2.getTypename(Type2.Type)),
+        label: AppNode2.getDynamicLabel("delete-object.label", Type2.getTypename(Type2.Type)),
         icon: "ph--trash--regular",
         disposition: "list-item",
         disabled: !deletable,
@@ -817,7 +845,7 @@ var createSchemaActions = ({ type, space, deletable, capabilities }) => {
 import * as Effect3 from "effect/Effect";
 import * as Option3 from "effect/Option";
 import { Capabilities, Capability as Capability3 } from "@dxos/app-framework";
-import { AppCapabilities as AppCapabilities2, AppNodeMatcher as AppNodeMatcher3, LayoutOperation as LayoutOperation2, RootCollectionAnnotation, Segments as Segments2, getObjectPathFromObject, toUrlPath } from "@dxos/app-toolkit";
+import { AppAnnotation, AppCapabilities as AppCapabilities2, AppNode as AppNode3, AppNodeMatcher as AppNodeMatcher3, LayoutOperation as LayoutOperation2, Paths as Paths3 } from "@dxos/app-toolkit";
 import { SpaceState as SpaceState4, isSpace as isSpace3 } from "@dxos/client/echo";
 import { Operation as Operation3 } from "@dxos/compute";
 import { Annotation as Annotation3, Collection as Collection2, Obj as Obj4, Type as Type3 } from "@dxos/echo";
@@ -841,25 +869,25 @@ var createCollectionExtensions = Effect3.fnUntraced(function* ({ shareableLinkOr
           return Effect3.succeed([]);
         }
         get(Obj4.atom(space.properties));
-        const collectionRef = Annotation3.get(space.properties, RootCollectionAnnotation).pipe(Option3.getOrUndefined);
+        const collectionRef = Annotation3.get(space.properties, AppAnnotation.RootCollectionAnnotation).pipe(Option3.getOrUndefined);
         if (collectionRef) {
           get(Obj4.atom(collectionRef));
         }
         const rootCollection = collectionRef?.target;
-        const collectionPartials = rootCollection ? getCollectionGraphNodePartials({
+        const collectionPartials = rootCollection ? AppNode3.getCollectionGraphNodePartials({
           db: space.db,
           collection: rootCollection
         }) : void 0;
         return Effect3.succeed([
           Node3.make({
-            id: Segments2.collections,
+            id: Paths3.Segments.collections,
             type: COLLECTIONS_SECTION_TYPE,
             data: null,
             properties: {
               label: [
                 "collections-section.label",
                 {
-                  ns: meta4.id
+                  ns: meta4.profile.key
                 }
               ],
               icon: "ph--folder--regular",
@@ -887,7 +915,7 @@ var createCollectionExtensions = Effect3.fnUntraced(function* ({ shareableLinkOr
         const ephemeralAtom = capabilities.get(SpaceCapabilities3.EphemeralState);
         const ephemeralState = get(ephemeralAtom);
         get(Obj4.atom(space.properties));
-        const collectionRef = Annotation3.get(space.properties, RootCollectionAnnotation).pipe(Option3.getOrUndefined);
+        const collectionRef = Annotation3.get(space.properties, AppAnnotation.RootCollectionAnnotation).pipe(Option3.getOrUndefined);
         const collection = collectionRef ? get(Obj4.atom(collectionRef)) : void 0;
         if (!collection) {
           return Effect3.succeed([]);
@@ -897,7 +925,8 @@ var createCollectionExtensions = Effect3.fnUntraced(function* ({ shareableLinkOr
           get(Obj4.atom(ref));
           return ref.target;
         }).filter(isNonNullable2);
-        return Effect3.succeed(objects.map((object) => createObjectNode({
+        return Effect3.succeed(objects.map((object) => AppNode3.makeObject({
+          get,
           db: space.db,
           object,
           navigable: ephemeralState.navigableCollections,
@@ -919,7 +948,8 @@ var createCollectionExtensions = Effect3.fnUntraced(function* ({ shareableLinkOr
           get(Obj4.atom(ref));
           return ref.target;
         }).filter(isNonNullable2);
-        return Effect3.succeed(objects.map((object) => db && createObjectNode({
+        return Effect3.succeed(objects.map((object) => db && AppNode3.makeObject({
+          get,
           object,
           db,
           navigable: ephemeralState.navigableCollections,
@@ -956,14 +986,41 @@ var createCollectionExtensions = Effect3.fnUntraced(function* ({ shareableLinkOr
           parentCollection
         }));
       }
+    }),
+    // Action on the collections section header to create a new collection.
+    GraphBuilder3.createExtension({
+      id: "collectionsSectionActions",
+      match: (node) => {
+        const space = isSpace3(node.properties.space) ? node.properties.space : void 0;
+        return node.type === COLLECTIONS_SECTION_TYPE && space ? Option3.some(space) : Option3.none();
+      },
+      actions: (space) => Effect3.succeed([
+        Node3.makeAction({
+          id: "create-collection",
+          data: () => Operation3.invoke(SpaceOperation3.OpenCreateObject, {
+            target: space.db,
+            typename: Type3.getTypename(Collection2.Collection)
+          }),
+          properties: {
+            label: [
+              "add-object.label",
+              {
+                ns: Type3.getTypename(Collection2.Collection)
+              }
+            ],
+            icon: "ph--plus--regular",
+            disposition: "list-item-primary"
+          }
+        })
+      ])
     })
   ]);
 });
 var constructObjectActions = ({ object, nodeId, deletable = true, navigable = false, shareableLinkOrigin, parentCollection }) => {
   const db = Obj4.getDatabase(object);
-  invariant(db, "Database not found", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 157, S: void 0, A: ["db", "'Database not found'"] });
+  invariant(db, "Database not found", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 186, S: void 0, A: ["db", "'Database not found'"] });
   const typename = Obj4.getTypename(object);
-  invariant(typename, "Object has no typename", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 159, S: void 0, A: ["typename", "'Object has no typename'"] });
+  invariant(typename, "Object has no typename", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 188, S: void 0, A: ["typename", "'Object has no typename'"] });
   const actions = [
     ...Obj4.instanceOf(Collection2.Collection, object) ? [
       Node3.makeAction({
@@ -987,7 +1044,7 @@ var constructObjectActions = ({ object, nodeId, deletable = true, navigable = fa
         caller: `${params?.caller}:${params?.parent?.id}`
       }),
       properties: {
-        label: getDynamicLabel("rename-object.label", typename, {
+        label: AppNode3.getDynamicLabel("rename-object.label", typename, {
           defaultValue: "Rename"
         }),
         icon: "ph--pencil-simple-line--regular",
@@ -1009,7 +1066,7 @@ var constructObjectActions = ({ object, nodeId, deletable = true, navigable = fa
             if (isActive) {
               yield* Operation3.invoke(LayoutOperation2.Open, {
                 subject: [
-                  getObjectPathFromObject(object)
+                  Paths3.getObjectPathFromObject(object)
                 ]
               });
             }
@@ -1032,7 +1089,7 @@ var constructObjectActions = ({ object, nodeId, deletable = true, navigable = fa
         target: parentCollection
       }),
       properties: {
-        label: getDynamicLabel("delete-object.label", typename, {
+        label: AppNode3.getDynamicLabel("delete-object.label", typename, {
           defaultValue: "Delete"
         }),
         icon: "ph--trash--regular",
@@ -1045,7 +1102,7 @@ var constructObjectActions = ({ object, nodeId, deletable = true, navigable = fa
       Node3.makeAction({
         id: "copyLink",
         data: () => Effect3.promise(async () => {
-          const url = new URL(toUrlPath(nodeId), shareableLinkOrigin);
+          const url = new URL(Paths3.toUrlPath(nodeId), shareableLinkOrigin);
           await navigator.clipboard.writeText(url.toString());
         }),
         properties: {
@@ -1059,7 +1116,7 @@ var constructObjectActions = ({ object, nodeId, deletable = true, navigable = fa
     Node3.makeAction({
       id: LayoutOperation2.Expose.meta.key,
       data: () => Operation3.invoke(LayoutOperation2.Expose, {
-        subject: getObjectPathFromObject(object)
+        subject: Paths3.getObjectPathFromObject(object)
       }),
       properties: {
         label: EXPOSE_OBJECT_LABEL,
@@ -1075,7 +1132,7 @@ var constructObjectActions = ({ object, nodeId, deletable = true, navigable = fa
 // src/capabilities/app-graph-builder/extensions/companions.ts
 import * as Effect4 from "effect/Effect";
 import * as Option4 from "effect/Option";
-import { AppNode as AppNode2 } from "@dxos/app-toolkit";
+import { AppNode as AppNode4 } from "@dxos/app-toolkit";
 import { Obj as Obj5, Type as Type4 } from "@dxos/echo";
 import { GraphBuilder as GraphBuilder4, NodeMatcher as NodeMatcher2 } from "@dxos/plugin-graph";
 import { linkedSegment } from "@dxos/react-ui-attention";
@@ -1088,12 +1145,12 @@ var createCompanionExtensions = Effect4.fnUntraced(function* () {
       id: "settings",
       match: NodeMatcher2.whenEchoObjectMatches,
       connector: (node) => Effect4.succeed([
-        AppNode2.makeCompanion({
+        AppNode4.makeCompanion({
           id: linkedSegment("settings"),
           label: [
             "object-properties.label",
             {
-              ns: meta5.id
+              ns: meta5.profile.key
             }
           ],
           icon: "ph--sliders--regular",
@@ -1107,12 +1164,12 @@ var createCompanionExtensions = Effect4.fnUntraced(function* () {
       id: "related",
       match: NodeMatcher2.whenEchoObjectMatches,
       connector: (node) => Effect4.succeed([
-        AppNode2.makeCompanion({
+        AppNode4.makeCompanion({
           id: linkedSegment("related"),
           label: [
             "companion-related.label",
             {
-              ns: meta5.id
+              ns: meta5.profile.key
             }
           ],
           icon: "ph--graph--regular",
@@ -1137,12 +1194,12 @@ var createCompanionExtensions = Effect4.fnUntraced(function* () {
         return Option4.some(node);
       },
       connector: (node) => Effect4.succeed([
-        AppNode2.makeCompanion({
+        AppNode4.makeCompanion({
           id: linkedSegment("selected-objects"),
           label: [
             "companion-selected-objects.label",
             {
-              ns: meta5.id
+              ns: meta5.profile.key
             }
           ],
           icon: "ph--tree-view--regular",
@@ -1155,7 +1212,7 @@ var createCompanionExtensions = Effect4.fnUntraced(function* () {
 
 // src/capabilities/app-graph-builder/extensions/settings.ts
 import * as Effect5 from "effect/Effect";
-import { AppNode as AppNode3, AppNodeMatcher as AppNodeMatcher4, isPersonalSpace as isPersonalSpace2 } from "@dxos/app-toolkit";
+import { AppNode as AppNode5, AppNodeMatcher as AppNodeMatcher4, AppSpace as AppSpace2 } from "@dxos/app-toolkit";
 import { GraphBuilder as GraphBuilder5, Node as Node4 } from "@dxos/plugin-graph";
 import { meta as meta6 } from "#meta";
 import { SETTINGS_SECTION_ID, SETTINGS_SECTION_TYPE } from "#types";
@@ -1164,13 +1221,13 @@ var createSettingsExtensions = Effect5.fnUntraced(function* () {
     id: "settingsSection",
     match: AppNodeMatcher4.whenSpace,
     connector: (space) => Effect5.succeed([
-      AppNode3.makeSection({
+      AppNode5.makeSection({
         id: SETTINGS_SECTION_ID,
         type: SETTINGS_SECTION_TYPE,
         label: [
           "settings-section.label",
           {
-            ns: meta6.id
+            ns: meta6.profile.key
           }
         ],
         icon: "ph--sliders--regular",
@@ -1185,17 +1242,17 @@ var createSettingsExtensions = Effect5.fnUntraced(function* () {
     id: "settingsSections",
     match: AppNodeMatcher4.whenSpaceSettings,
     connector: (space) => {
-      const personal = isPersonalSpace2(space);
+      const personal = AppSpace2.isPersonalSpace(space);
       return Effect5.succeed([
         Node4.make({
           id: "general",
-          type: `${meta6.id}.general`,
-          data: `${meta6.id}.general`,
+          type: `${meta6.profile.key}.general`,
+          data: `${meta6.profile.key}.general`,
           properties: {
             label: [
               "space-settings-properties.label",
               {
-                ns: meta6.id
+                ns: meta6.profile.key
               }
             ],
             icon: "ph--brackets-curly--regular",
@@ -1207,13 +1264,13 @@ var createSettingsExtensions = Effect5.fnUntraced(function* () {
         ...!personal ? [
           Node4.make({
             id: "members",
-            type: `${meta6.id}.members`,
-            data: `${meta6.id}.members`,
+            type: `${meta6.profile.key}.members`,
+            data: `${meta6.profile.key}.members`,
             properties: {
               label: [
                 "members-panel.label",
                 {
-                  ns: meta6.id
+                  ns: meta6.profile.key
                 }
               ],
               icon: "ph--users--regular",
@@ -1248,4 +1305,4 @@ var app_graph_builder_default = Capability4.makeModule(Effect6.fnUntraced(functi
 export {
   app_graph_builder_default as default
 };
-//# sourceMappingURL=app-graph-builder-SQGCUCDO.mjs.map
+//# sourceMappingURL=app-graph-builder-TMAD2ZTH.mjs.map