@dxos/plugin-space 0.9.0 → 0.9.1-staging.ee54ba693a

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

@@ -1,21 +1,21 @@
 import {
   getSpaceDisplayName,
   makeCreateObjectEntryForDatabaseType
-} from "./chunk-7WUJENBF.mjs";
+} from "./chunk-52ASDNRA.mjs";
 import {
   SHARED
-} from "./chunk-K34BPPQE.mjs";
+} from "./chunk-F5KLUP2P.mjs";
 import "./chunk-J5LGTIGS.mjs";
 
 // src/capabilities/app-graph-builder/app-graph-builder.ts
 import * as Effect6 from "effect/Effect";
 import { Capability as Capability4 } from "@dxos/app-framework";
-import { AppCapabilities as AppCapabilities3 } from "@dxos/app-toolkit";
+import { AppCapabilities as AppCapabilities4 } 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";
@@ -24,26 +24,24 @@ import { ClientCapabilities } from "@dxos/plugin-client";
 import { CreateAtom, Graph, GraphBuilder, Node, NodeMatcher } from "@dxos/plugin-graph";
 import { SpaceArchive } from "@dxos/protocols/proto/dxos/client/services";
 import { Expando } from "@dxos/schema";
+import { Position } from "@dxos/util";
 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";
 import { SpaceState, isSpace } from "@dxos/client/echo";
 import { Annotation, Filter, Obj, Type } from "@dxos/echo";
-import { MigrationVersionAnnotation, Migrations } from "@dxos/migrations";
+import { Migrations, MigrationVersionAnnotation } 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 DATABASE_SECTION_TYPE = `${meta.profile.key}.database`;
+var COLLECTIONS_SECTION_TYPE = `${meta.profile.key}.collections`;
+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);
 var spaceActionsCache = /* @__PURE__ */ new Map();
 var spaceRearrangeCache = /* @__PURE__ */ new Map();
@@ -71,10 +69,6 @@ var MIGRATE_SPACE_LABEL = [
   "migrate-space.label",
   META_NS
 ];
-var REMOVE_FROM_COLLECTION_LABEL = [
-  "remove-from-collection.label",
-  META_NS
-];
 var RENAME_SPACE_LABEL = [
   "rename-space.label",
   META_NS
@@ -137,12 +131,39 @@ 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: 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: "emerald",
+            position: Position.first,
+            draggable: false,
+            droppable: false,
+            space
+          }
+        }
+      ])
+    }),
     GraphBuilder.createExtension({
       id: "primaryActions",
-      position: "first",
+      position: Position.first,
       match: NodeMatcher.whenRoot,
       actions: () => Effect.succeed([
         Node.makeAction({
@@ -152,7 +173,7 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
             label: [
               "create-space.label",
               {
-                ns: meta2.id
+                ns: meta2.profile.key
               }
             ],
             icon: "ph--plus--regular",
@@ -167,7 +188,7 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
             label: [
               "join-space.label",
               {
-                ns: meta2.id
+                ns: meta2.profile.key
               }
             ],
             icon: "ph--sign-in--regular",
@@ -182,7 +203,7 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
             label: [
               "import-space.label",
               {
-                ns: meta2.id
+                ns: meta2.profile.key
               }
             ],
             icon: "ph--upload--regular",
@@ -193,7 +214,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 +226,7 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
             label: [
               "export-space-binary.label",
               {
-                ns: meta2.id
+                ns: meta2.profile.key
               }
             ],
             icon: "ph--download--regular",
@@ -216,7 +237,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 +249,7 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
             label: [
               "export-space-json.label",
               {
-                ns: meta2.id
+                ns: meta2.profile.key
               }
             ],
             icon: "ph--download--regular",
@@ -239,7 +260,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 +271,7 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
             label: [
               "share-space.label",
               {
-                ns: meta2.id
+                ns: meta2.profile.key
               }
             ],
             icon: "ph--users--regular",
@@ -265,7 +286,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 +297,7 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
             label: [
               "open-current-space-settings.label",
               {
-                ns: meta2.id
+                ns: meta2.profile.key
               }
             ],
             icon: "ph--faders--regular",
@@ -292,12 +313,15 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
       id: "spaces",
       match: NodeMatcher.whenRoot,
       connector: (_node, get) => {
-        const client = capabilities.get(ClientCapabilities.Client);
+        const [client] = capabilities.getAll(ClientCapabilities.Client);
+        if (!client) {
+          return Effect.succeed([]);
+        }
         const stateAtom = capabilities.get(SpaceCapabilities.State);
         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 +349,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_READY).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
@@ -338,6 +362,28 @@ var createSpaceExtensions = Effect.fnUntraced(function* () {
         }
       }
     }),
+    // Communications section group — no single plugin owns this category; it lives here so the
+    // group is always present when the space plugin is active. A more specific plugin (e.g. a
+    // future plugin-communications) should own this once one exists.
+    // TODO(wittjosiah): Move to a dedicated communications plugin when one exists.
+    GraphBuilder.createExtension({
+      id: Paths.GroupSegments.communications,
+      match: AppNodeMatcher.whenSpace,
+      connector: (space) => Effect.succeed([
+        AppNode.makeGroup({
+          id: Paths.GroupSegments.communications,
+          type: Paths.GroupTypes.communications,
+          label: [
+            "nav-tree-group-comm.label",
+            {
+              ns: meta2.profile.key
+            }
+          ],
+          space,
+          position: 100
+        })
+      ])
+    }),
     GraphBuilder.createExtension({
       id: "actions",
       match: AppNodeMatcher.whenSpace,
@@ -378,7 +424,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,14 +509,15 @@ 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 { SpaceState as SpaceState3, isSpace as isSpace2 } from "@dxos/client/echo";
+import { AppCapabilities as AppCapabilities2, AppNode as AppNode2, AppNodeMatcher as AppNodeMatcher2, LayoutOperation, Paths as Paths2 } from "@dxos/app-toolkit";
+import { 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";
+import { Annotation as Annotation2, Collection, Entity, Filter as Filter3, Key, Obj as Obj3, Query, Scope, Type as Type2 } from "@dxos/echo";
 import { HiddenAnnotation } from "@dxos/echo/Annotation";
 import { ClientCapabilities as ClientCapabilities2 } from "@dxos/plugin-client";
-import { CreateAtom as CreateAtom2, GraphBuilder as GraphBuilder2, Node as Node2 } from "@dxos/plugin-graph";
+import { GraphBuilder as GraphBuilder2, Node as Node2 } from "@dxos/plugin-graph";
 import { ViewAnnotation as ViewAnnotation2 } from "@dxos/schema";
+import { isLabel, toLocalizedString } from "@dxos/ui-types/translations";
 import { createFilename, isNonNullable } from "@dxos/util";
 import { meta as meta3 } from "#meta";
 import { SpaceOperation as SpaceOperation2 } from "#operations";
@@ -478,41 +525,58 @@ import { SpaceCapabilities as SpaceCapabilities2 } from "#types";
 var createDatabaseExtensions = Effect2.fnUntraced(function* () {
   const capabilities = yield* Capability2.Service;
   return yield* Effect2.all([
-    // Types section virtual node under each space.
+    // System section group — created alongside database/settings so the group always
+    // appears when the space plugin is active and hides when there are no children.
     GraphBuilder2.createExtension({
-      id: "typesSection",
+      id: Paths2.GroupSegments.system,
       match: AppNodeMatcher2.whenSpace,
-      connector: (space, get) => {
-        const spaceState = get(CreateAtom2.fromObservable(space.state));
-        if (spaceState !== SpaceState3.SPACE_READY) {
-          return Effect2.succeed([]);
-        }
+      connector: (space) => Effect2.succeed([
+        AppNode2.makeGroup({
+          id: Paths2.GroupSegments.system,
+          type: Paths2.GroupTypes.system,
+          label: [
+            "nav-tree-group-system.label",
+            {
+              ns: meta3.profile.key
+            }
+          ],
+          space,
+          position: 900
+        })
+      ])
+    }),
+    // Types section virtual node under the system group.
+    GraphBuilder2.createExtension({
+      id: "databaseSection",
+      match: AppNodeMatcher2.whenNavTreeGroup(Paths2.GroupTypes.system),
+      connector: (space) => {
         return Effect2.succeed([
-          AppNode.makeSection({
-            id: Segments.types,
-            type: TYPES_SECTION_TYPE,
+          AppNode2.makeSection({
+            id: Paths2.Segments.database,
+            type: DATABASE_SECTION_TYPE,
             label: [
-              "types-section.label",
+              "database-section.label",
               {
-                ns: meta3.id
+                ns: meta3.profile.key
               }
             ],
             icon: "ph--database--regular",
             space,
-            position: "last",
-            testId: "spacePlugin.typesSection"
+            testId: "spacePlugin.databaseSection"
           })
         ]);
       }
     }),
     // Schema nodes under the Types virtual node.
     GraphBuilder2.createExtension({
-      id: "types",
+      id: "database",
       match: (node) => {
         const space = isSpace2(node.properties.space) ? node.properties.space : void 0;
-        return node.type === TYPES_SECTION_TYPE && space ? Option2.some(space) : Option2.none();
+        return node.type === DATABASE_SECTION_TYPE && space ? Option2.some(space) : Option2.none();
       },
       connector: (space, get) => {
+        const settingsAtom = get(capabilities.atom(SpaceCapabilities2.Settings)).at(0);
+        const showHidden = settingsAtom ? get(settingsAtom).showHidden : false;
         const allSchemas = get(space.db.query(Query.select(Filter3.type(Type2.Type)).from(Scope.space(), Scope.registry())).atom);
         const userSchemas = allSchemas.filter((type) => {
           if (Type2.isRelation(type)) {
@@ -522,7 +586,7 @@ var createDatabaseExtensions = Effect2.fnUntraced(function* () {
             return false;
           }
           const schema = Type2.getSchema(type);
-          if (HiddenAnnotation.get(schema).pipe(Option2.getOrElse(() => false))) {
+          if (!showHidden && HiddenAnnotation.get(schema).pipe(Option2.getOrElse(() => false))) {
             return false;
           }
           if (Type2.getTypename(type) === Type2.getTypename(Collection.Collection)) {
@@ -542,11 +606,19 @@ var createDatabaseExtensions = Effect2.fnUntraced(function* () {
           }
           return objects.length > 0 || viewIndex.typeUrisWithViews.has(typeUri);
         });
+        const translator = get(capabilities.atom(AppCapabilities2.Translator)).at(0);
+        const labelOf = (node) => {
+          const label = node.properties?.label;
+          if (translator && isLabel(label)) {
+            return toLocalizedString(label, translator.t);
+          }
+          return node.data ? Type2.getTypename(node.data) : "";
+        };
         return Effect2.succeed(visibleSchemas.map((schema) => createSchemaNode({
           schema,
           space,
           get
-        })));
+        })).toSorted((nodeA, nodeB) => labelOf(nodeA).localeCompare(labelOf(nodeB))));
       }
     }),
     // {All} virtual node + view objects under each schema node.
@@ -562,75 +634,57 @@ 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 typeUri = Type2.getURI(schema);
-        const allNode = Node2.make({
-          id: "all",
-          type: TYPE_COLLECTION_TYPE,
-          data: {
-            space,
-            typeUri
-          },
-          properties: {
-            label: [
-              "type-collection-all.label",
-              {
-                ns: meta3.id
-              }
-            ],
-            icon: "ph--list--regular",
-            iconHue: "neutral",
-            role: "branch",
-            testId: `spacePlugin.typeCollectionAll.${slug}`,
-            selectable: false,
-            draggable: false,
-            droppable: false,
-            childrenDroppable: false,
-            blockInstruction: BLOCK_REORDER_ABOVE
-          }
-        });
         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,
+          draggable: false,
           droppable: false
         })).filter(isNonNullable);
-        return Effect2.succeed([
-          allNode,
-          ...viewNodes
-        ]);
+        return Effect2.succeed(viewNodes);
       }
     }),
-    // Objects of the schema type under the {All} node.
+    // Objects of a type are not enumerated in the nav tree; navigating directly to the canonical
+    // object path resolves the object on demand as a hidden child of its type node. Mirrors the
+    // inbox feed-object resolver: a resolver keyed on path shape, not a connector.
     GraphBuilder2.createExtension({
-      id: "typeCollectionObjects",
-      match: (node) => {
-        if (node.type !== TYPE_COLLECTION_TYPE || !node.data?.space || !node.data?.typeUri) {
-          return Option2.none();
+      id: "typeCollectionObject",
+      match: () => Option2.none(),
+      resolver: (qualifiedId, get) => Effect2.gen(function* () {
+        const segments = qualifiedId.split("/");
+        if (segments.at(-3) !== Paths2.Segments.database) {
+          return null;
+        }
+        const spaceId = Paths2.getSpaceIdFromPath(qualifiedId);
+        const objectId = segments.at(-1);
+        if (!spaceId || !objectId || !Key.EntityId.isValid(objectId)) {
+          return null;
         }
-        return Option2.some({
-          space: node.data.space,
-          typeUri: node.data.typeUri
-        });
-      },
-      connector: ({ space, typeUri }, get) => {
         const client = get(capabilities.atom(ClientCapabilities2.Client)).at(0);
-        const schemas = client ? get(client.graph.registry.query(Filter3.type(Type2.Type)).atom) : [];
-        const viewIndex = buildViewIndex(get, space, schemas);
-        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({
-            db: space.db,
-            object,
-            droppable: false
-          });
-        }).filter(isNonNullable).toSorted((nodeA, nodeB) => {
-          const labelA = typeof nodeA.properties.label === "string" ? nodeA.properties.label : "";
-          const labelB = typeof nodeB.properties.label === "string" ? nodeB.properties.label : "";
-          return labelA.localeCompare(labelB);
-        }));
-      }
+        const space = client?.spaces.get(spaceId);
+        if (!space) {
+          return null;
+        }
+        const object = get(space.db.query(Filter3.id(objectId)).atom).at(0);
+        if (!object) {
+          return null;
+        }
+        get(Obj3.atom(object));
+        const node = AppNode2.makeObject({
+          get,
+          db: space.db,
+          object,
+          disposition: "hidden",
+          draggable: false,
+          droppable: false
+        });
+        return node && {
+          ...node,
+          id: qualifiedId
+        };
+      })
     }),
     // Actions for schema nodes.
     GraphBuilder2.createExtension({
@@ -660,7 +714,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 +728,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
     }),
@@ -690,9 +744,11 @@ var createSchemaNode = ({ schema, space, get }) => {
       label,
       icon,
       iconHue,
-      role: "branch",
+      // Selecting the type node opens a list of every object of this type (see TypeCollectionArticle);
+      // objects resolve on demand as hidden children. View objects are its only visible children, so
+      // without a view the node is a leaf (no `role: 'branch'`).
       testId: `spacePlugin.schemaNode.${typename}`,
-      selectable: false,
+      selectable: true,
       draggable: false,
       droppable: false,
       childrenDroppable: false,
@@ -734,7 +790,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"
@@ -746,8 +802,10 @@ var createSchemaActions = ({ type, space, deletable, capabilities }) => {
       data: () => Operation2.invoke(SpaceOperation2.OpenCreateObject, {
         target: space.db,
         views: true,
+        // The type-picker field value is the type URI (see TypeOptions), so seed the default with
+        // the URI — not the bare typename — for the option to be pre-selected.
         initialFormValues: {
-          typename: Type2.getTypename(type)
+          typename: Type2.getURI(type)
         }
       }),
       properties: {
@@ -764,7 +822,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 +837,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,
@@ -816,13 +874,13 @@ var createSchemaActions = ({ type, space, deletable, capabilities }) => {
 // src/capabilities/app-graph-builder/extensions/collections.ts
 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 { SpaceState as SpaceState4, isSpace as isSpace3 } from "@dxos/client/echo";
+import { Capability as Capability3 } from "@dxos/app-framework";
+import { AppAnnotation, AppCapabilities as AppCapabilities3, AppNode as AppNode3, AppNodeMatcher as AppNodeMatcher3, LayoutOperation as LayoutOperation2, Paths as Paths3 } from "@dxos/app-toolkit";
+import { 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";
 import { invariant } from "@dxos/invariant";
-import { CreateAtom as CreateAtom3, Graph as Graph2, GraphBuilder as GraphBuilder3, Node as Node3 } from "@dxos/plugin-graph";
+import { Graph as Graph2, GraphBuilder as GraphBuilder3, Node as Node3 } from "@dxos/plugin-graph";
 import { isNonNullable as isNonNullable2 } from "@dxos/util";
 import { meta as meta4 } from "#meta";
 import { SpaceOperation as SpaceOperation3 } from "#operations";
@@ -831,41 +889,56 @@ var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-space/src/capabilitie
 var createCollectionExtensions = Effect3.fnUntraced(function* ({ shareableLinkOrigin }) {
   const capabilities = yield* Capability3.Service;
   return yield* Effect3.all([
-    // Collections section virtual node under each space.
+    // Content section group — created alongside collections so the group always
+    // appears when the space plugin is active and hides when there are no children.
     GraphBuilder3.createExtension({
-      id: "collectionsSection",
+      id: Paths3.GroupSegments.content,
       match: AppNodeMatcher3.whenSpace,
+      connector: (space) => Effect3.succeed([
+        AppNode3.makeGroup({
+          id: Paths3.GroupSegments.content,
+          type: Paths3.GroupTypes.content,
+          label: [
+            "nav-tree-group-content.label",
+            {
+              ns: meta4.profile.key
+            }
+          ],
+          space,
+          position: 200
+        })
+      ])
+    }),
+    // Collections section virtual node under the content group.
+    GraphBuilder3.createExtension({
+      id: "collectionsSection",
+      match: AppNodeMatcher3.whenNavTreeGroup(Paths3.GroupTypes.content),
       connector: (space, get) => {
-        const spaceState = get(CreateAtom3.fromObservable(space.state));
-        if (spaceState !== SpaceState4.SPACE_READY) {
-          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",
-              iconHue: "amber",
+              iconHue: "indigo",
               role: "branch",
-              position: "first",
               testId: "spacePlugin.collectionsSection",
               draggable: false,
               droppable: false,
@@ -887,7 +960,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,11 +970,13 @@ 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,
-          parentCollection: collectionRef?.target
+          canDrop: AppNode3.CAN_DROP_COLLECTION_ITEM,
+          onRearrange: collectionRef?.target ? AppNode3.makeCollectionRearrangeCallback(collectionRef.target) : void 0
         })).filter(isNonNullable2));
       }
     }),
@@ -919,11 +994,13 @@ 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,
-          parentCollection: collection
+          canDrop: AppNode3.CAN_DROP_COLLECTION_ITEM,
+          onRearrange: AppNode3.makeCollectionRearrangeCallback(collection)
         })).filter(isNonNullable2));
       }
     }),
@@ -938,7 +1015,7 @@ var createCollectionExtensions = Effect3.fnUntraced(function* ({ shareableLinkOr
       },
       actions: ({ object, nodeId }, get) => {
         const deletable = !Type3.isType(object);
-        const [appGraph] = get(capabilities.atom(AppCapabilities2.AppGraph));
+        const [appGraph] = get(capabilities.atom(AppCapabilities3.AppGraph));
         const ephemeralAtom = capabilities.get(SpaceCapabilities3.EphemeralState);
         const ephemeralState = get(ephemeralAtom);
         if (!appGraph) {
@@ -956,14 +1033,42 @@ var createCollectionExtensions = Effect3.fnUntraced(function* ({ shareableLinkOr
           parentCollection
         }));
       }
+    }),
+    // Action on the collections section header to add an object to the space's root 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: SpaceOperation3.OpenCreateObject.meta.key,
+          data: () => Effect3.gen(function* () {
+            const rootCollection = Annotation3.get(space.properties, AppAnnotation.RootCollectionAnnotation).pipe(Option3.getOrUndefined)?.target;
+            yield* Operation3.invoke(SpaceOperation3.OpenCreateObject, {
+              // Qualified id of the collections section node (root/<spaceId>/collections), so the new
+              // object's navigation path resolves under the section — the bare segment would not.
+              target: rootCollection ?? space.db,
+              targetNodeId: Paths3.getCollectionsPath(space.id)
+            });
+          }),
+          properties: {
+            label: CREATE_OBJECT_IN_COLLECTION_LABEL,
+            icon: "ph--plus--regular",
+            disposition: "list-item-primary",
+            testId: "spacePlugin.createObject"
+          }
+        })
+      ])
     })
   ]);
 });
 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: 206, 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: 208, S: void 0, A: ["typename", "'Object has no typename'"] });
   const actions = [
     ...Obj4.instanceOf(Collection2.Collection, object) ? [
       Node3.makeAction({
@@ -987,7 +1092,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",
@@ -995,34 +1100,6 @@ var constructObjectActions = ({ object, nodeId, deletable = true, navigable = fa
         testId: "spacePlugin.renameObject"
       }
     }),
-    ...parentCollection && !Obj4.instanceOf(Collection2.Collection, object) ? [
-      Node3.makeAction({
-        id: "removeFromCollection",
-        data: () => Effect3.gen(function* () {
-          const index = parentCollection.objects.findIndex((ref) => ref.target === object);
-          if (index !== -1) {
-            const layout = yield* Capabilities.getAtomValue(AppCapabilities2.Layout);
-            const isActive = layout.active.includes(nodeId);
-            Obj4.update(parentCollection, (parentCollection2) => {
-              parentCollection2.objects.splice(index, 1);
-            });
-            if (isActive) {
-              yield* Operation3.invoke(LayoutOperation2.Open, {
-                subject: [
-                  getObjectPathFromObject(object)
-                ]
-              });
-            }
-          }
-        }),
-        properties: {
-          label: REMOVE_FROM_COLLECTION_LABEL,
-          icon: "ph--minus-circle--regular",
-          disposition: "list-item",
-          testId: "spacePlugin.removeFromCollection"
-        }
-      })
-    ] : [],
     Node3.makeAction({
       id: SpaceOperation3.RemoveObjects.meta.key,
       data: () => Operation3.invoke(SpaceOperation3.RemoveObjects, {
@@ -1032,7 +1109,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 +1122,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 +1136,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,11 +1152,12 @@ 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";
 import { ViewAnnotation as ViewAnnotation3 } from "@dxos/schema";
+import { Position as Position2 } from "@dxos/util";
 import { meta as meta5 } from "#meta";
 var createCompanionExtensions = Effect4.fnUntraced(function* () {
   return yield* Effect4.all([
@@ -1088,17 +1166,17 @@ 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",
           data: "settings",
-          position: "last"
+          position: Position2.last
         })
       ])
     }),
@@ -1107,17 +1185,17 @@ 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",
           data: "related",
-          position: "last"
+          position: Position2.last
         })
       ])
     }),
@@ -1137,12 +1215,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,8 +1233,9 @@ 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 { Position as Position3 } from "@dxos/util";
 import { meta as meta6 } from "#meta";
 import { SETTINGS_SECTION_ID, SETTINGS_SECTION_TYPE } from "#types";
 var createSettingsExtensions = Effect5.fnUntraced(function* () {
@@ -1164,19 +1243,19 @@ 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",
-        iconHue: "indigo",
+        iconHue: "emerald",
         space,
-        position: "first",
+        position: Position3.first,
         testId: "spacePlugin.settings"
       })
     ])
@@ -1185,40 +1264,42 @@ 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",
-            iconHue: "indigo",
+            iconHue: "emerald",
             space,
+            position: Position3.first,
             testId: "spacePlugin.general"
           }
         }),
         ...!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",
-              iconHue: "indigo",
+              iconHue: "emerald",
               space,
+              position: Position3.first,
               testId: "spacePlugin.members"
             }
           })
@@ -1243,9 +1324,9 @@ var app_graph_builder_default = Capability4.makeModule(Effect6.fnUntraced(functi
     }),
     createCompanionExtensions()
   ]);
-  return Capability4.contributes(AppCapabilities3.AppGraphBuilder, extensions.flat());
+  return Capability4.contributes(AppCapabilities4.AppGraphBuilder, extensions.flat());
 }));
 export {
   app_graph_builder_default as default
 };
-//# sourceMappingURL=app-graph-builder-SQGCUCDO.mjs.map
+//# sourceMappingURL=app-graph-builder-7H2KOD4B.mjs.map