@dxos/plugin-space 0.10.0 → 0.11.1

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

@@ -6,11 +6,23 @@ import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
 import { Capability } from '@dxos/app-framework';
-import { AppAnnotation, AppCapabilities, AppNode, AppNodeMatcher, LayoutOperation, Paths } from '@dxos/app-toolkit';
+import {
+  AppAnnotation,
+  AppCapabilities,
+  AppNode,
+  AppNodeMatcher,
+  DeckSpec,
+  GraphPath,
+  LayoutOperation,
+  UrlResolution,
+} from '@dxos/app-toolkit';
 import { isSpace } from '@dxos/client/echo';
 import { Operation } from '@dxos/compute';
-import { Annotation, Collection, Obj, Type } from '@dxos/echo';
+import { Annotation, Collection, Database, Obj, Type } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
+import { SpaceId } from '@dxos/keys';
+import { log } from '@dxos/log';
+import { ClientCapabilities } from '@dxos/plugin-client';
 import { Graph, GraphBuilder, Node } from '@dxos/plugin-graph';
 import { isNonNullable } from '@dxos/util';
 
@@ -18,6 +30,7 @@ import { meta } from '#meta';
 import { SpaceOperation } from '#operations';
 import { SpaceCapabilities } from '#types';
 
+import { resolveCollectionObjectPath } from '../../../collection-path';
 import {
   COLLECTIONS_SECTION_TYPE,
   COPY_LINK_LABEL,
@@ -30,6 +43,15 @@ import {
 //
 
 /** Creates collection-related extensions: collections section, collections, objects, and object actions. */
+
+/**
+ * A collection is always a navigation target; what differs is what navigating to it shows. When a
+ * plugin renders collections as their own article (stack, simple-layout) that article wins, otherwise
+ * the deck opens the collection's contents. Returning `undefined` leaves the ordinary open in place.
+ */
+const collectionDeck = (object: Obj.Unknown, hasCollectionArticle: boolean): DeckSpec.DeckSpec | undefined =>
+  !hasCollectionArticle && Obj.instanceOf(Collection.Collection, object) ? { initial: 'children' } : undefined;
+
 export const createCollectionExtensions = Effect.fnUntraced(function* ({
   shareableLinkOrigin,
 }: {
@@ -41,13 +63,13 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
     // Content section group — created alongside collections so the group always
     // appears when the space plugin is active and hides when there are no children.
     GraphBuilder.createExtension({
-      id: Paths.GroupSegments.content,
+      id: GraphPath.GroupSegments.content,
       match: AppNodeMatcher.whenSpace,
       connector: (space) =>
         Effect.succeed([
           AppNode.makeGroup({
-            id: Paths.GroupSegments.content,
-            type: Paths.GroupTypes.content,
+            id: GraphPath.GroupSegments.content,
+            type: GraphPath.GroupTypes.content,
             label: ['nav-tree-group-content.label', { ns: meta.profile.key }],
             space,
             position: 200,
@@ -58,7 +80,7 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
     // Collections section virtual node under the content group.
     GraphBuilder.createExtension({
       id: 'collectionsSection',
-      match: AppNodeMatcher.whenNavTreeGroup(Paths.GroupTypes.content),
+      match: AppNodeMatcher.whenNavTreeGroup(GraphPath.GroupTypes.content),
       connector: (space, get) => {
         get(Obj.atom(space.properties));
         const collectionRef = Annotation.get(space.properties, AppAnnotation.RootCollectionAnnotation).pipe(
@@ -74,7 +96,7 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
 
         return Effect.succeed([
           Node.make({
-            id: Paths.Segments.collections,
+            id: GraphPath.Segments.collections,
             type: COLLECTIONS_SECTION_TYPE,
             data: null,
             properties: {
@@ -93,9 +115,13 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
       },
     }),
 
-    // Root collection objects under the Collections virtual node.
+    // Root collection objects under the Collections virtual node. Shares the `object` urlKey with the
+    // nested-collection `objects` connector below so an object is addressed the same way wherever it
+    // sits in the collection tree (the key names the *collection subgraph*, not the container's type;
+    // the database subgraph addresses the same object under `db`).
     GraphBuilder.createExtension({
       id: 'collections',
+      url: { key: 'object', kind: 'item', path: [GraphPath.GroupSegments.content, GraphPath.Segments.collections] },
       match: (node) => {
         const space = isSpace(node.properties.space) ? node.properties.space : undefined;
         return node.type === COLLECTIONS_SECTION_TYPE && space ? Option.some(space) : Option.none();
@@ -129,7 +155,8 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
                 get,
                 db: space.db,
                 object,
-                navigable: ephemeralState.navigableCollections,
+                navigable: true,
+                deck: collectionDeck(object, ephemeralState.navigableCollections),
                 canDrop: AppNode.CAN_DROP_COLLECTION_ITEM,
                 onRearrange: collectionRef?.target
                   ? AppNode.makeCollectionRearrangeCallback(collectionRef.target)
@@ -144,6 +171,31 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
     // Children of Collection.Collection nodes.
     GraphBuilder.createExtension({
       id: 'objects',
+      // Recursive over nested collections at any depth, so `object/<id>` addresses any object reachable
+      // through a space's collection tree, not just the root collection's direct children. The shape is
+      // data-dependent (the object's collection ancestry), so instead of a static `path` it resolves
+      // dynamically — see `resolveCollectionObjectPath`.
+      url: {
+        key: 'object',
+        kind: 'item',
+        path: ({ id, workspace }) =>
+          Effect.gen(function* () {
+            if (!SpaceId.isValid(workspace)) {
+              return null;
+            }
+            // Look the Client up lazily (at resolve time) rather than at graph-setup time — it is not yet
+            // available when the AppGraphBuilder activates, and forward resolution only runs much later.
+            const client = capabilities.get(ClientCapabilities.Client);
+            const space = client.spaces.get(workspace);
+            if (!space) {
+              return null;
+            }
+            const path = yield* resolveCollectionObjectPath({ objectId: id }).pipe(
+              Effect.provide(Database.layer(space.db)),
+            );
+            return path ?? null;
+          }),
+      },
       match: (node) => (Obj.instanceOf(Collection.Collection, node.data) ? Option.some(node.data) : Option.none()),
       connector: (collection, get) => {
         const ephemeralAtom = capabilities.get(SpaceCapabilities.EphemeralState);
@@ -169,7 +221,8 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
                   get,
                   object,
                   db,
-                  navigable: ephemeralState.navigableCollections,
+                  navigable: true,
+                  deck: collectionDeck(object, ephemeralState.navigableCollections),
                   canDrop: AppNode.CAN_DROP_COLLECTION_ITEM,
                   onRearrange: AppNode.makeCollectionRearrangeCallback(collection),
                 }),
@@ -177,8 +230,6 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
             .filter(isNonNullable),
         );
       },
-      // TODO(graph-path-ids): Resolver temporarily disabled; redesign needed for path-based IDs.
-      // resolver: (id, get) => { ... },
     }),
 
     // Object actions.
@@ -243,7 +294,7 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
                   // 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: Paths.getCollectionsPath(space.id),
+                  targetNodeId: GraphPath.getCollectionsPath(space.id),
                 });
               }),
             properties: {
@@ -258,10 +309,6 @@ export const createCollectionExtensions = Effect.fnUntraced(function* ({
   ]);
 });
 
-//
-// Helpers
-//
-
 /** Builds the action list for an ECHO object node. */
 const constructObjectActions = ({
   object,
@@ -329,9 +376,15 @@ const constructObjectActions = ({
           Node.makeAction({
             id: 'copyLink',
             data: () =>
-              Effect.promise(async () => {
-                const url = new URL(Paths.toUrlPath(nodeId), shareableLinkOrigin);
-                await navigator.clipboard.writeText(url.toString());
+              Effect.gen(function* () {
+                const builder = yield* Capability.get(AppCapabilities.AppGraph);
+                const path = UrlResolution.getShareableLinkPath(builder, nodeId);
+                if (Option.isNone(path)) {
+                  log.warn('object has no URL representation; cannot copy link', { nodeId });
+                  return;
+                }
+                const url = new URL(path.value, shareableLinkOrigin);
+                yield* Effect.promise(() => navigator.clipboard.writeText(url.toString()));
               }),
             properties: {
               label: COPY_LINK_LABEL,
@@ -344,7 +397,7 @@ const constructObjectActions = ({
       : []),
     Node.makeAction({
       id: LayoutOperation.Expose.meta.key,
-      data: () => Operation.invoke(LayoutOperation.Expose, { subject: Paths.getObjectPathFromObject(object) }),
+      data: () => Operation.invoke(LayoutOperation.Expose, { subject: GraphPath.getObjectPathFromObject(object) }),
       properties: {
         label: EXPOSE_OBJECT_LABEL,
         icon: 'ph--eye--regular',

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

@@ -8,7 +8,6 @@ import * as Option from 'effect/Option';
 import { AppNode } from '@dxos/app-toolkit';
 import { Obj, Type } from '@dxos/echo';
 import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
-import { linkedSegment } from '@dxos/react-ui-attention';
 import type { EchoViewRefPath } from '@dxos/schema';
 import { ViewAnnotation } from '@dxos/schema';
 import { Position } from '@dxos/util';
@@ -19,7 +18,7 @@ import { meta } from '#meta';
 // Extension Factory
 //
 
-/** Creates companion panel extensions: object settings and selected-objects. */
+/** Creates companion panel extensions: object settings, related, and selected-objects. */
 // NOTE: Explicit annotation required: d.ts emit cannot portably name the inferred @dxos/plugin-graph types (TS2883).
 export const createCompanionExtensions: () => Effect.Effect<GraphBuilder.BuilderExtension[][]> = Effect.fnUntraced(
   function* () {
@@ -31,7 +30,7 @@ export const createCompanionExtensions: () => Effect.Effect<GraphBuilder.Builder
         connector: (node) =>
           Effect.succeed([
             AppNode.makeCompanion({
-              id: linkedSegment('settings'),
+              variant: 'settings',
               label: ['object-properties.label', { ns: meta.profile.key }],
               icon: 'ph--sliders--regular',
               data: 'settings', // TODO(burdon): Change to 'object-properties'.
@@ -47,7 +46,7 @@ export const createCompanionExtensions: () => Effect.Effect<GraphBuilder.Builder
         connector: (node) =>
           Effect.succeed([
             AppNode.makeCompanion({
-              id: linkedSegment('related'),
+              variant: 'related',
               label: ['companion-related.label', { ns: meta.profile.key }],
               icon: 'ph--graph--regular',
               data: 'related',
@@ -60,6 +59,12 @@ export const createCompanionExtensions: () => Effect.Effect<GraphBuilder.Builder
       GraphBuilder.createExtension({
         id: 'selectedObjects',
         match: (node) => {
+          // Type/schema node (e.g. a TypeArticle plank): the table's own row selection feeds this
+          // companion directly, no view lookup needed.
+          if (Type.isType(node.data)) {
+            return Option.some(node);
+          }
+
           if (!Obj.isObject(node.data)) {
             return Option.none();
           }
@@ -79,7 +84,7 @@ export const createCompanionExtensions: () => Effect.Effect<GraphBuilder.Builder
         connector: (node) =>
           Effect.succeed([
             AppNode.makeCompanion({
-              id: linkedSegment('selected-objects'),
+              variant: 'selected-objects',
               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

@@ -2,16 +2,16 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Atom } from '@effect-atom/atom-react';
+import { type Atom } from '@effect-atom/atom';
 import * as Effect from 'effect/Effect';
 import * as Match from 'effect/Match';
 import * as Option from 'effect/Option';
 
 import { Capability, type CapabilityManager } from '@dxos/app-framework';
-import { AppCapabilities, AppNode, AppNodeMatcher, LayoutOperation, Paths } from '@dxos/app-toolkit';
+import { AppCapabilities, AppNode, AppNodeMatcher, GraphPath, LayoutOperation } from '@dxos/app-toolkit';
 import { type Space, isSpace } from '@dxos/client/echo';
 import { Operation } from '@dxos/compute';
-import { Annotation, Collection, Entity, Filter, Key, Obj, Query, Scope, Type } from '@dxos/echo';
+import { Annotation, Collection, Entity, Filter, Obj, Query, Scope, Type } from '@dxos/echo';
 import { HiddenAnnotation } from '@dxos/echo/Annotation';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { GraphBuilder, Node } from '@dxos/plugin-graph';
@@ -27,8 +27,8 @@ import { makeCreateObjectEntryForDatabaseType } from '../../../util';
 import {
   ADD_VIEW_TO_SCHEMA_LABEL,
   DATABASE_SECTION_TYPE,
+  SCHEMA_NODE_TYPE,
   SNAPSHOT_BY_SCHEMA_LABEL,
-  STATIC_SCHEMA_TYPE,
   buildViewIndex,
   downloadBlob,
 } from './shared';
@@ -45,13 +45,13 @@ export const createDatabaseExtensions = Effect.fnUntraced(function* () {
     // 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.
     GraphBuilder.createExtension({
-      id: Paths.GroupSegments.system,
+      id: GraphPath.GroupSegments.system,
       match: AppNodeMatcher.whenSpace,
       connector: (space) =>
         Effect.succeed([
           AppNode.makeGroup({
-            id: Paths.GroupSegments.system,
-            type: Paths.GroupTypes.system,
+            id: GraphPath.GroupSegments.system,
+            type: GraphPath.GroupTypes.system,
             label: ['nav-tree-group-system.label', { ns: meta.profile.key }],
             space,
             position: 900,
@@ -62,11 +62,11 @@ export const createDatabaseExtensions = Effect.fnUntraced(function* () {
     // Types section virtual node under the system group.
     GraphBuilder.createExtension({
       id: 'databaseSection',
-      match: AppNodeMatcher.whenNavTreeGroup(Paths.GroupTypes.system),
+      match: AppNodeMatcher.whenNavTreeGroup(GraphPath.GroupTypes.system),
       connector: (space) => {
         return Effect.succeed([
           AppNode.makeSection({
-            id: Paths.Segments.database,
+            id: GraphPath.Segments.database,
             type: DATABASE_SECTION_TYPE,
             label: ['database-section.label', { ns: meta.profile.key }],
             icon: 'ph--database--regular',
@@ -80,6 +80,7 @@ export const createDatabaseExtensions = Effect.fnUntraced(function* () {
     // Schema nodes under the Types virtual node.
     GraphBuilder.createExtension({
       id: 'database',
+      url: { key: 'type', kind: 'item', path: [GraphPath.GroupSegments.system, GraphPath.Segments.database] },
       match: (node) => {
         const space = isSpace(node.properties.space) ? node.properties.space : undefined;
         return node.type === DATABASE_SECTION_TYPE && space ? Option.some(space) : Option.none();
@@ -150,18 +151,24 @@ export const createDatabaseExtensions = Effect.fnUntraced(function* () {
     // {All} virtual node + view objects under each schema node.
     GraphBuilder.createExtension({
       id: 'schemaChildren',
+      url: { key: 'view', kind: 'item', path: [GraphPath.GroupSegments.system, GraphPath.Segments.database] },
       match: (node) => {
         const space = isSpace(node.properties.space) ? node.properties.space : undefined;
-        return space && Type.isType(node.data) ? Option.some({ space, schema: node.data }) : Option.none();
+        // Scoped to the Database section's own type nodes (both static and database schemas — see
+        // SCHEMA_NODE_TYPE): other plugins' type nodes (e.g. plugin-crm's virtual type nodes) share the
+        // `Type.isType(node.data)` shape but should stay leaf nodes for now.
+        return node.type === SCHEMA_NODE_TYPE && space && Type.isType(node.data)
+          ? Option.some({ space, schema: node.data })
+          : Option.none();
       },
       connector: ({ space, schema }, get) => {
         const client = get(capabilities.atom(ClientCapabilities.Client)).at(0);
         const schemas = client ? get(client.graph.registry.query(Filter.type(Type.Type)).atom) : [];
         const typeUri = Type.getURI(schema);
 
-        // View objects are the type node's only visible children; objects of the type are resolved
-        // on demand as hidden children (see the `typeCollectionObject` resolver). The list of all
-        // objects is rendered when the type node is selected (see TypeCollectionArticle).
+        // View objects are the type node's only visible children; every object of the type (viewed
+        // or not) is also reachable via the `databaseObjects` extension below, keyed generically as
+        // `obj`. The list of all objects is rendered when the type node is selected (see TypeArticle).
         const viewIndex = buildViewIndex(get, space, schemas);
         const viewNodes = viewIndex
           .getViewsForTypeUri(typeUri)
@@ -180,50 +187,50 @@ export const createDatabaseExtensions = Effect.fnUntraced(function* () {
       },
     }),
 
-    // 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.
+    // Every object of a type — not just its views — as a hidden child of its type node, so
+    // `…/database/<slug>/<objectId>` resolves via the generic `db` key even when the type has no
+    // dedicated section of its own. Disjoint from `schemaChildren`'s view nodes (`viewIndex.isView`
+    // excludes them) so the two connectors never emit a node with the same id under the same parent.
+    // The `db` key names the database subgraph — the generic key that guarantees every ECHO object a
+    // URL (see the design's "Unmapped nodes"); `object` addresses the same object via the collection
+    // subgraph.
     GraphBuilder.createExtension({
-      id: 'typeCollectionObject',
-      match: () => Option.none(),
-      resolver: (qualifiedId, get) =>
-        Effect.gen(function* () {
-          const segments = qualifiedId.split('/');
-          // Discriminator: the canonical object path `…/database/<slug>/<objectId>`.
-          if (segments.at(-3) !== Paths.Segments.database) {
-            return null;
-          }
-
-          const spaceId = Paths.getSpaceIdFromPath(qualifiedId);
-          const objectId = segments.at(-1);
-          if (!spaceId || !objectId || !Key.EntityId.isValid(objectId)) {
-            return null;
-          }
-
-          const client = get(capabilities.atom(ClientCapabilities.Client)).at(0);
-          const space = client?.spaces.get(spaceId);
-          if (!space) {
-            return null;
-          }
+      id: 'databaseObjects',
+      url: { key: 'db', kind: 'item', path: [GraphPath.GroupSegments.system, GraphPath.Segments.database] },
+      match: (node) => {
+        const space = isSpace(node.properties.space) ? node.properties.space : undefined;
+        return node.type === SCHEMA_NODE_TYPE && space && Type.isType(node.data)
+          ? Option.some({ space, schema: node.data })
+          : Option.none();
+      },
+      connector: ({ space, schema }, get) => {
+        const client = get(capabilities.atom(ClientCapabilities.Client)).at(0);
+        const schemas = client ? get(client.graph.registry.query(Filter.type(Type.Type)).atom) : [];
+        const typeUri = Type.getURI(schema);
+        const viewIndex = buildViewIndex(get, space, schemas);
 
-          const object = get(space.db.query(Filter.id(objectId)).atom).at(0);
-          if (!object) {
-            return null;
-          }
+        // Feed-only objects (e.g. games appended via Feed.append) are not in the Automerge graph;
+        // includeFeeds resolves them too.
+        const objects = get(
+          space.db.query(Query.select(Filter.type(typeUri)).from(space.db, { includeFeeds: true })).atom,
+        );
 
-          get(Obj.atom(object));
-          const node = AppNode.makeObject({
-            get,
-            db: space.db,
-            object,
-            disposition: 'hidden',
-            draggable: false,
-            droppable: false,
-          });
-          // Resolver nodes are keyed by the requested path (not the local object id) so the parent
-          // type node's child edge connects; `makeObject` uses the local id, so override it here.
-          return node && { ...node, id: qualifiedId };
-        }),
+        return Effect.succeed(
+          objects
+            .filter((object) => !viewIndex.isView(object))
+            .map((object) =>
+              AppNode.makeObject({
+                get,
+                db: space.db,
+                object,
+                disposition: 'hidden',
+                draggable: false,
+                droppable: false,
+              }),
+            )
+            .filter(isNonNullable),
+        );
+      },
     }),
 
     // Actions for schema nodes.
@@ -274,7 +281,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 = Paths.getTypeSlug(schema);
+  const slug = GraphPath.getTypeSlug(schema);
   const iconAnnotation =
     Type.getDatabase(schema) == null
       ? Option.getOrUndefined(Annotation.IconAnnotation.get(Type.getSchema(schema)))
@@ -304,13 +311,13 @@ const createSchemaNode = ({
   const iconHue = Type.getDatabase(schema) != null ? 'neutral' : iconAnnotation?.hue;
   return Node.make({
     id: nodeId,
-    type: STATIC_SCHEMA_TYPE,
+    type: SCHEMA_NODE_TYPE,
     data: schema,
     properties: {
       label,
       icon,
       iconHue,
-      // Selecting the type node opens a list of every object of this type (see TypeCollectionArticle);
+      // Selecting the type node opens a list of every object of this type (see TypeArticle);
       // 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}`,

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

@@ -42,14 +42,16 @@ export const createSettingsExtensions = Effect.fnUntraced(function* () {
       ]),
   });
 
-  const childrenExtension = yield* GraphBuilder.createExtension({
-    id: 'settingsSections',
+  // General and Members are separate extensions rather than one so each can be an id-less key (a single
+  // id-less key can address only one fixed node — its terminal segment IS the key).
+  const generalExtension = yield* GraphBuilder.createExtension({
+    id: 'settingsGeneral',
+    url: { key: 'settings', kind: 'singleton', path: [SETTINGS_SECTION_ID] },
     match: AppNodeMatcher.whenSpaceSettings,
-    connector: (space) => {
-      const personal = AppSpace.isPersonalSpace(space);
-      return Effect.succeed([
+    connector: (space) =>
+      Effect.succeed([
         Node.make({
-          id: 'general',
+          id: 'settings',
           type: `${meta.profile.key}.general`,
           data: `${meta.profile.key}.general`,
           properties: {
@@ -61,8 +63,18 @@ export const createSettingsExtensions = Effect.fnUntraced(function* () {
             testId: 'spacePlugin.general',
           },
         }),
-        ...(!personal
-          ? [
+      ]),
+  });
+
+  const membersExtension = yield* GraphBuilder.createExtension({
+    id: 'settingsMembers',
+    url: { key: 'members', kind: 'singleton', path: [SETTINGS_SECTION_ID] },
+    match: AppNodeMatcher.whenSpaceSettings,
+    connector: (space) =>
+      Effect.succeed(
+        AppSpace.isPersonalSpace(space)
+          ? []
+          : [
               Node.make({
                 id: 'members',
                 type: `${meta.profile.key}.members`,
@@ -76,11 +88,9 @@ export const createSettingsExtensions = Effect.fnUntraced(function* () {
                   testId: 'spacePlugin.members',
                 },
               }),
-            ]
-          : []),
-      ]);
-    },
+            ],
+      ),
   });
 
-  return [sectionExtension, childrenExtension];
+  return [sectionExtension, generalExtension, membersExtension];
 });

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

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Atom } from '@effect-atom/atom-react';
+import { type Atom } from '@effect-atom/atom';
 import * as Option from 'effect/Option';
 
 import { type Space, SpaceState, isSpace } from '@dxos/client/echo';
@@ -23,7 +23,8 @@ import { meta } from '#meta';
 
 export const DATABASE_SECTION_TYPE = `${meta.profile.key}.database`;
 export const COLLECTIONS_SECTION_TYPE = `${meta.profile.key}.collections`;
-export const STATIC_SCHEMA_TYPE = `${meta.profile.key}.static-schema`;
+/** Tags every type node under the Database section — both static (compile-time) and database (dynamic) schemas. */
+export const SCHEMA_NODE_TYPE = `${meta.profile.key}.static-schema`;
 
 //
 // Constants

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

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
-import { AppCapabilities, AppNode, AppNodeMatcher, AppSpace, Paths } from '@dxos/app-toolkit';
+import { AppCapabilities, AppNode, AppNodeMatcher, AppSpace, GraphPath } from '@dxos/app-toolkit';
 import { type Space, SpaceState } from '@dxos/client/echo';
 import { Operation } from '@dxos/compute';
 import { Filter, Obj } from '@dxos/echo';
@@ -48,11 +48,12 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
     GraphBuilder.createExtension({
       id: 'spaceHome',
       position: Position.first,
+      url: { key: 'home', kind: 'singleton', path: [] },
       match: AppNodeMatcher.whenSpace,
       connector: (space) =>
         Effect.succeed([
           {
-            id: Paths.SPACE_HOME_SEGMENT,
+            id: GraphPath.SPACE_HOME_SEGMENT,
             type: SPACE_HOME_NODE_TYPE,
             data: SPACE_HOME_NODE_TYPE,
             properties: {
@@ -243,8 +244,6 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
           return Effect.succeed([]);
         }
       },
-      // TODO(graph-path-ids): Resolver temporarily disabled; redesign needed for path-based IDs.
-      // resolver: (id, get) => { ... },
     }),
 
     // Communications section group — no single plugin owns this category; it lives here so the
@@ -252,13 +251,13 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
     // 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,
+      id: GraphPath.GroupSegments.communications,
       match: AppNodeMatcher.whenSpace,
       connector: (space) =>
         Effect.succeed([
           AppNode.makeGroup({
-            id: Paths.GroupSegments.communications,
-            type: Paths.GroupTypes.communications,
+            id: GraphPath.GroupSegments.communications,
+            type: GraphPath.GroupTypes.communications,
             label: ['nav-tree-group-comm.label', { ns: meta.profile.key }],
             space,
             position: 100,

package/src/capabilities/create-object.ts

@@ -9,7 +9,7 @@ import { Capability } from '@dxos/app-framework';
 import { Operation } from '@dxos/compute';
 import { Collection, Type } from '@dxos/echo';
 import { createDefaultSchema } from '@dxos/schema';
-import { Organization, Person, Project, Task } from '@dxos/types';
+import { Organization, Person, Task } from '@dxos/types';
 
 import { SpaceOperation } from '#operations';
 import { SpaceCapabilities } from '#types';
@@ -71,19 +71,6 @@ export default Capability.makeModule(
             });
           }),
       }),
-      Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
-        id: Type.getTypename(Project.Project),
-        inputSchema: Type.getSchema(Project.Project),
-        createObject: (props, options) =>
-          Effect.gen(function* () {
-            const object = Project.make(props);
-            return yield* Operation.invoke(SpaceOperation.AddObject, {
-              object,
-              target: options.target,
-              targetNodeId: options.targetNodeId,
-            });
-          }),
-      }),
       Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
         id: Type.getTypename(Task.Task),
         inputSchema: Type.getSchema(Task.Task),

package/src/capabilities/index.ts

@@ -12,7 +12,10 @@ export const CreateObject = Capability.lazy('CreateObject', () => import('./crea
 export const IdentityCreated = Capability.lazy('IdentityCreated', () => import('./identity-created'));
 export { NavigationHandler } from './navigation-handler';
 export type { NavigationHandlerOptions } from './navigation-handler';
-export const NavigationResolver = Capability.lazy('NavigationResolver', () => import('./navigation-resolver'));
+export const NavigationTargetResolver = Capability.lazy(
+  'NavigationTargetResolver',
+  () => import('./navigation-target-resolver'),
+);
 export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
   'OperationHandler',
   () => import('./operation-handler'),