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

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

@@ -8,15 +8,15 @@ import * as Match from 'effect/Match';
 import * as Option from 'effect/Option';
 
 import { Capability, type CapabilityManager } from '@dxos/app-framework';
-import { AppNode, AppNodeMatcher, LayoutOperation, Paths } from '@dxos/app-toolkit';
-import { type Space, SpaceState, isSpace } from '@dxos/client/echo';
+import { AppCapabilities, AppNode, AppNodeMatcher, LayoutOperation, Paths } from '@dxos/app-toolkit';
+import { type Space, isSpace } from '@dxos/client/echo';
 import { Operation } from '@dxos/compute';
-import { Annotation, Collection, Entity, Filter, Obj, Query, Scope, Type } from '@dxos/echo';
+import { Annotation, Collection, Entity, Filter, Key, Obj, Query, Scope, Type } from '@dxos/echo';
 import { HiddenAnnotation } from '@dxos/echo/Annotation';
-import { type URI } from '@dxos/keys';
 import { ClientCapabilities } from '@dxos/plugin-client';
-import { CreateAtom, GraphBuilder, Node } from '@dxos/plugin-graph';
+import { GraphBuilder, Node } from '@dxos/plugin-graph';
 import { ViewAnnotation } from '@dxos/schema';
+import { isLabel, toLocalizedString } from '@dxos/ui-types/translations';
 import { createFilename, isNonNullable } from '@dxos/util';
 
 import { meta } from '#meta';
@@ -26,11 +26,9 @@ import { SpaceCapabilities } from '#types';
 import { makeCreateObjectEntryForDatabaseType } from '../../../util';
 import {
   ADD_VIEW_TO_SCHEMA_LABEL,
-  BLOCK_REORDER_ABOVE,
+  DATABASE_SECTION_TYPE,
   SNAPSHOT_BY_SCHEMA_LABEL,
   STATIC_SCHEMA_TYPE,
-  TYPES_SECTION_TYPE,
-  TYPE_COLLECTION_TYPE,
   buildViewIndex,
   downloadBlob,
 } from './shared';
@@ -44,25 +42,36 @@ export const createDatabaseExtensions = Effect.fnUntraced(function* () {
   const capabilities = yield* Capability.Service;
 
   return yield* Effect.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.
     GraphBuilder.createExtension({
-      id: 'typesSection',
+      id: Paths.GroupSegments.system,
       match: AppNodeMatcher.whenSpace,
-      connector: (space, get) => {
-        const spaceState = get(CreateAtom.fromObservable(space.state));
-        if (spaceState !== SpaceState.SPACE_READY) {
-          return Effect.succeed([]);
-        }
+      connector: (space) =>
+        Effect.succeed([
+          AppNode.makeGroup({
+            id: Paths.GroupSegments.system,
+            type: Paths.GroupTypes.system,
+            label: ['nav-tree-group-system.label', { ns: meta.profile.key }],
+            space,
+            position: 900,
+          }),
+        ]),
+    }),
 
+    // Types section virtual node under the system group.
+    GraphBuilder.createExtension({
+      id: 'databaseSection',
+      match: AppNodeMatcher.whenNavTreeGroup(Paths.GroupTypes.system),
+      connector: (space) => {
         return Effect.succeed([
           AppNode.makeSection({
-            id: Paths.Segments.types,
-            type: TYPES_SECTION_TYPE,
-            label: ['types-section.label', { ns: meta.profile.key }],
+            id: Paths.Segments.database,
+            type: DATABASE_SECTION_TYPE,
+            label: ['database-section.label', { ns: meta.profile.key }],
             icon: 'ph--database--regular',
             space,
-            position: 'last',
-            testId: 'spacePlugin.typesSection',
+            testId: 'spacePlugin.databaseSection',
           }),
         ]);
       },
@@ -70,12 +79,16 @@ export const createDatabaseExtensions = Effect.fnUntraced(function* () {
 
     // Schema nodes under the Types virtual node.
     GraphBuilder.createExtension({
-      id: 'types',
+      id: 'database',
       match: (node) => {
         const space = isSpace(node.properties.space) ? node.properties.space : undefined;
-        return node.type === TYPES_SECTION_TYPE && space ? Option.some(space) : Option.none();
+        return node.type === DATABASE_SECTION_TYPE && space ? Option.some(space) : Option.none();
       },
       connector: (space, get) => {
+        // Read settings reactively — same pattern as the translator read below.
+        const settingsAtom = get(capabilities.atom(SpaceCapabilities.Settings)).at(0);
+        const showHidden = settingsAtom ? get(settingsAtom).showHidden : false;
+
         // Persisted types live in the space db; static/runtime types live in the shared registry.
         // Fan across both so the space's own types appear without leaking other spaces' types.
         const allSchemas = get(
@@ -90,7 +103,7 @@ export const createDatabaseExtensions = Effect.fnUntraced(function* () {
             return false;
           }
           const schema = Type.getSchema(type);
-          if (HiddenAnnotation.get(schema).pipe(Option.getOrElse(() => false))) {
+          if (!showHidden && HiddenAnnotation.get(schema).pipe(Option.getOrElse(() => false))) {
             return false;
           }
           if (Type.getTypename(type) === Type.getTypename(Collection.Collection)) {
@@ -113,7 +126,24 @@ export const createDatabaseExtensions = Effect.fnUntraced(function* () {
           return objects.length > 0 || viewIndex.typeUrisWithViews.has(typeUri);
         });
 
-        return Effect.succeed(visibleSchemas.map((schema) => createSchemaNode({ schema, space, get })));
+        // Sort alphabetically by display name. Static types' labels are `typename.label` translation
+        // keys resolved at render; resolve them here via the Translator capability so the order matches
+        // what users see. Resolved reactively inside the connector (not at factory setup) so the
+        // capability — contributed during startup by the theme plugin — is present when this runs.
+        const translator = get(capabilities.atom(AppCapabilities.Translator)).at(0);
+        const labelOf = (node: Node.NodeArg<Type.AnyEntity>): string => {
+          const label = node.properties?.label;
+          if (translator && isLabel(label)) {
+            return toLocalizedString(label, translator.t);
+          }
+          return node.data ? Type.getTypename(node.data) : '';
+        };
+
+        return Effect.succeed(
+          visibleSchemas
+            .map((schema) => createSchemaNode({ schema, space, get }))
+            .toSorted((nodeA, nodeB) => labelOf(nodeA).localeCompare(labelOf(nodeB))),
+        );
       },
     }),
 
@@ -127,30 +157,11 @@ export const createDatabaseExtensions = Effect.fnUntraced(function* () {
       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 slug = Paths.getTypeSlug(schema);
         const typeUri = Type.getURI(schema);
 
-        // {All} virtual node.
-        const allNode = Node.make({
-          id: 'all',
-          type: TYPE_COLLECTION_TYPE,
-          data: { space, typeUri },
-          properties: {
-            label: ['type-collection-all.label', { ns: meta.profile.key }],
-            icon: 'ph--list--regular',
-            iconHue: 'neutral',
-            role: 'branch',
-            testId: `spacePlugin.typeCollectionAll.${slug}`,
-            selectable: false,
-            draggable: false,
-            droppable: false,
-            childrenDroppable: false,
-            blockInstruction: BLOCK_REORDER_ABOVE,
-          },
-        });
-
-        // View objects for this 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).
         const viewIndex = buildViewIndex(get, space, schemas);
         const viewNodes = viewIndex
           .getViewsForTypeUri(typeUri)
@@ -159,51 +170,60 @@ export const createDatabaseExtensions = Effect.fnUntraced(function* () {
               get,
               db: space.db,
               object,
+              draggable: false,
               droppable: false,
             }),
           )
           .filter(isNonNullable);
 
-        return Effect.succeed([allNode, ...viewNodes]);
+        return Effect.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.
     GraphBuilder.createExtension({
-      id: 'typeCollectionObjects',
-      match: (node) => {
-        if (node.type !== TYPE_COLLECTION_TYPE || !node.data?.space || !node.data?.typeUri) {
-          return Option.none();
-        }
-        return Option.some({ space: node.data.space as Space, typeUri: node.data.typeUri as URI.URI });
-      },
-      connector: ({ space, typeUri }, get) => {
-        const client = get(capabilities.atom(ClientCapabilities.Client)).at(0);
-        const schemas = client ? get(client.graph.registry.query(Filter.type(Type.Type)).atom) : [];
-        const viewIndex = buildViewIndex(get, space, schemas);
-        const objects = get(space.db.query(Filter.type(typeUri)).atom).filter(
-          (object: Obj.Unknown) => !viewIndex.isView(object) && !Obj.getParent(object),
-        );
+      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;
+          }
 
-        return Effect.succeed(
-          objects
-            .map((object: Obj.Unknown) => {
-              get(Obj.atom(object));
-              return AppNode.makeObject({
-                get,
-                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 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;
+          }
+
+          const object = get(space.db.query(Filter.id(objectId)).atom).at(0);
+          if (!object) {
+            return null;
+          }
+
+          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 };
+        }),
     }),
 
     // Actions for schema nodes.
@@ -290,9 +310,11 @@ const createSchemaNode = ({
       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,
@@ -368,7 +390,9 @@ const createSchemaActions = ({
         Operation.invoke(SpaceOperation.OpenCreateObject, {
           target: space.db,
           views: true,
-          initialFormValues: { typename: Type.getTypename(type) },
+          // 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: Type.getURI(type) },
         }),
       properties: {
         label: ADD_VIEW_TO_SCHEMA_LABEL,

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

@@ -6,6 +6,7 @@ import * as Effect from 'effect/Effect';
 
 import { AppNode, AppNodeMatcher, AppSpace } from '@dxos/app-toolkit';
 import { GraphBuilder, Node } from '@dxos/plugin-graph';
+import { Position } from '@dxos/util';
 
 import { meta } from '#meta';
 import { SETTINGS_SECTION_ID, SETTINGS_SECTION_TYPE } from '#types';
@@ -17,7 +18,7 @@ import { SETTINGS_SECTION_ID, SETTINGS_SECTION_TYPE } from '#types';
 /**
  * Settings section attached directly under each Space node, plus its children.
  *
- * The virtual `settings` section is pinned to the top via `position: 'first'`
+ * The virtual `settings` section is pinned to the top via `position: Position.first`
  * so it sits above the un-positioned middle band (collections, mailboxes,
  * automations, integrations, etc.). It groups the panels contributed by this
  * plugin (general, members) and by other plugins (automation, functions).
@@ -33,9 +34,9 @@ export const createSettingsExtensions = Effect.fnUntraced(function* () {
           type: SETTINGS_SECTION_TYPE,
           label: ['settings-section.label', { ns: meta.profile.key }],
           icon: 'ph--sliders--regular',
-          iconHue: 'indigo',
+          iconHue: 'emerald',
           space,
-          position: 'first',
+          position: Position.first,
           testId: 'spacePlugin.settings',
         }),
       ]),
@@ -54,8 +55,9 @@ export const createSettingsExtensions = Effect.fnUntraced(function* () {
           properties: {
             label: ['space-settings-properties.label', { ns: meta.profile.key }],
             icon: 'ph--brackets-curly--regular',
-            iconHue: 'indigo',
+            iconHue: 'emerald',
             space,
+            position: Position.first,
             testId: 'spacePlugin.general',
           },
         }),
@@ -68,8 +70,9 @@ export const createSettingsExtensions = Effect.fnUntraced(function* () {
                 properties: {
                   label: ['members-panel.label', { ns: meta.profile.key }],
                   icon: 'ph--users--regular',
-                  iconHue: 'indigo',
+                  iconHue: 'emerald',
                   space,
+                  position: Position.first,
                   testId: 'spacePlugin.members',
                 },
               }),

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

@@ -10,19 +10,23 @@ import { type Space, SpaceState } from '@dxos/client/echo';
 import { Annotation, DXN, Entity, Filter, Obj, Query, Ref, Type, View } from '@dxos/echo';
 import { type EchoDatabase } from '@dxos/echo-client';
 import { EchoTestBuilder } from '@dxos/echo-client/testing';
-import { MigrationVersionAnnotation, Migrations } from '@dxos/migrations';
+import { Migrations, MigrationVersionAnnotation } from '@dxos/migrations';
 import { ViewAnnotation } from '@dxos/schema';
 
 import { buildViewIndex, checkPendingMigration } from './shared';
 
-const TestContact = Schema.Struct({
-  name: Schema.String,
-}).pipe(Type.makeObject(DXN.make('com.example.type.contact', '0.1.0')));
-
-const TestViewWrapper = Schema.Struct({
-  name: Schema.optional(Schema.String),
-  view: Ref.Ref(View.View),
-}).pipe(ViewAnnotation.set(['view']), Type.makeObject(DXN.make('com.example.type.viewWrapper', '0.1.0')));
+const TestContact = Type.makeObject(DXN.make('com.example.type.contact', '0.1.0'))(
+  Schema.Struct({
+    name: Schema.String,
+  }),
+);
+
+const TestViewWrapper = Type.makeObject(DXN.make('com.example.type.viewWrapper', '0.1.0'))(
+  Schema.Struct({
+    name: Schema.optional(Schema.String),
+    view: Ref.Ref(View.View),
+  }).pipe(ViewAnnotation.set(['view'])),
+);
 
 describe('buildViewIndex', () => {
   let testBuilder: EchoTestBuilder;

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

@@ -8,7 +8,7 @@ import * as Option from 'effect/Option';
 import { type Space, SpaceState, isSpace } from '@dxos/client/echo';
 import { type Operation } from '@dxos/compute';
 import { Annotation, Filter, Obj, Type } from '@dxos/echo';
-import { MigrationVersionAnnotation, Migrations } from '@dxos/migrations';
+import { Migrations, MigrationVersionAnnotation } from '@dxos/migrations';
 import { type Node } from '@dxos/plugin-graph';
 import { type TreeData } from '@dxos/react-ui-list';
 import type { EchoViewRefPath } from '@dxos/schema';
@@ -21,9 +21,8 @@ import { meta } from '#meta';
 // Virtual Node Types
 //
 
-export const TYPES_SECTION_TYPE = `${meta.profile.key}.types`;
+export const DATABASE_SECTION_TYPE = `${meta.profile.key}.database`;
 export const COLLECTIONS_SECTION_TYPE = `${meta.profile.key}.collections`;
-export const TYPE_COLLECTION_TYPE = `${meta.profile.key}.type-collection`;
 export const STATIC_SCHEMA_TYPE = `${meta.profile.key}.static-schema`;
 
 //
@@ -37,7 +36,6 @@ export const META_NS: { ns: string } = { ns: meta.profile.key };
 // Stable Callbacks
 //
 
-export const BLOCK_REORDER_ABOVE = (_source: TreeData, instruction: any) => instruction.type === 'reorder-above';
 export const CAN_DROP_SPACE = (source: TreeData) => Obj.isObject(source.item.data) || isSpace(source.item.data);
 
 //
@@ -66,7 +64,6 @@ export const CREATE_OBJECT_IN_SPACE_LABEL: Label = ['create-object-in-space.labe
 export const EXPOSE_OBJECT_LABEL: Label = ['expose-object.label', META_NS];
 export const MIGRATE_SPACE_LABEL: Label = ['migrate-space.label', META_NS];
 export const NEW_TYPE_LABEL: Label = ['new-type.label', META_NS];
-export const REMOVE_FROM_COLLECTION_LABEL: Label = ['remove-from-collection.label', META_NS];
 export const RENAME_SPACE_LABEL: Label = ['rename-space.label', META_NS];
 export const SETTINGS_PANEL_LABEL: Label = ['settings-panel.label', META_NS];
 export const SNAPSHOT_BY_SCHEMA_LABEL: Label = ['snapshot-by-schema.label', META_NS];

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

@@ -14,6 +14,7 @@ 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 } from '#meta';
 import { SpaceOperation } from '#operations';
@@ -46,7 +47,7 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
   return yield* Effect.all([
     GraphBuilder.createExtension({
       id: 'spaceHome',
-      position: 'first',
+      position: Position.first,
       match: AppNodeMatcher.whenSpace,
       connector: (space) =>
         Effect.succeed([
@@ -57,8 +58,8 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
             properties: {
               label: SPACE_HOME_NODE_LABEL,
               icon: 'ph--house--regular',
-              iconHue: 'cyan',
-              position: 'first',
+              iconHue: 'emerald',
+              position: Position.first,
               draggable: false,
               droppable: false,
               space,
@@ -69,7 +70,7 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
 
     GraphBuilder.createExtension({
       id: 'primaryActions',
-      position: 'first',
+      position: Position.first,
       match: NodeMatcher.whenRoot,
       actions: () =>
         Effect.succeed([
@@ -176,7 +177,13 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
       id: 'spaces',
       match: NodeMatcher.whenRoot,
       connector: (_node, get) => {
-        const client = capabilities.get(ClientCapabilities.Client);
+        // This reactive connector can recompute once during the teardown window (e.g. when stories
+        // swap plugin managers) after the Client capability has been removed; tolerate its absence
+        // via the safe `getAll` lookup rather than the throwing `get`.
+        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);
@@ -216,7 +223,7 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
                 .sort((sortA, sortB) => orderMap.get(sortA.id)! - orderMap.get(sortB.id)!),
               ...spaces.filter((space) => !orderMap.has(space.id)),
             ]
-              .filter((space, idx) => spaceStates[idx] !== SpaceState.SPACE_INACTIVE)
+              .filter((space, idx) => spaceStates[idx] === SpaceState.SPACE_READY)
               .filter(
                 (space) =>
                   space.tags.length === 0 || AppSpace.isPersonalSpace(space) || AppSpace.isExemplarSpace(space),
@@ -240,6 +247,25 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
       // resolver: (id, get) => { ... },
     }),
 
+    // 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: meta.profile.key }],
+            space,
+            position: 100,
+          }),
+        ]),
+    }),
+
     GraphBuilder.createExtension({
       id: 'actions',
       match: AppNodeMatcher.whenSpace,

package/src/capabilities/create-object.ts

@@ -26,7 +26,6 @@ export default Capability.makeModule(
             return yield* Operation.invoke(SpaceOperation.AddObject, {
               object,
               target: options.target,
-              hidden: false,
               targetNodeId: options.targetNodeId,
             });
           }),
@@ -56,7 +55,6 @@ export default Capability.makeModule(
             return yield* Operation.invoke(SpaceOperation.AddObject, {
               object,
               target: options.target,
-              hidden: true,
               targetNodeId: options.targetNodeId,
             });
           }),
@@ -69,7 +67,6 @@ export default Capability.makeModule(
             return yield* Operation.invoke(SpaceOperation.AddObject, {
               object,
               target: options.target,
-              hidden: true,
               targetNodeId: options.targetNodeId,
             });
           }),
@@ -83,7 +80,6 @@ export default Capability.makeModule(
             return yield* Operation.invoke(SpaceOperation.AddObject, {
               object,
               target: options.target,
-              hidden: true,
               targetNodeId: options.targetNodeId,
             });
           }),
@@ -97,7 +93,6 @@ export default Capability.makeModule(
             return yield* Operation.invoke(SpaceOperation.AddObject, {
               object,
               target: options.target,
-              hidden: true,
               targetNodeId: options.targetNodeId,
             });
           }),

package/src/capabilities/identity-created.ts

@@ -7,7 +7,7 @@ import * as Effect from 'effect/Effect';
 import { Capability } from '@dxos/app-framework';
 import { AppAnnotation, AppSpace } from '@dxos/app-toolkit';
 import { Annotation, Collection, Obj, Ref } from '@dxos/echo';
-import { MigrationVersionAnnotation, Migrations } from '@dxos/migrations';
+import { Migrations, MigrationVersionAnnotation } from '@dxos/migrations';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
 import { MembershipPolicy } from '@dxos/protocols/proto/dxos/halo/credentials';

package/src/capabilities/navigation-handler/navigation-handler.ts

@@ -8,6 +8,7 @@ import { Capabilities, Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
 import { Operation } from '@dxos/compute';
 import { log } from '@dxos/log';
+import { ClientCapabilities } from '@dxos/plugin-client';
 
 import { SpaceOperation } from '../../operations';
 
@@ -23,15 +24,24 @@ export default Capability.makeModule(
   Effect.fnUntraced(function* ({ invitationProp = 'spaceInvitationCode' }: NavigationHandlerOptions = {}) {
     const capabilities = yield* Capability.Service;
     const operationService = yield* Capability.get(Capabilities.OperationInvoker);
+    const client = yield* Capability.get(ClientCapabilities.Client);
 
     const handler: AppCapabilities.NavigationHandler = (url: URL) =>
       Effect.gen(function* () {
         const invitationCode = url.searchParams.get(invitationProp);
-        if (invitationCode) {
-          log('space invitation received via navigation');
-          removeQueryParam(invitationProp);
-          yield* Operation.invoke(SpaceOperation.Join, { invitationCode });
+        if (!invitationCode) {
+          return;
         }
+
+        // Ignore invitations that arrive before a local identity exists rather than forcing
+        // identity creation here, bypassing the normal onboarding flow.
+        if (!client.halo.identity.get()) {
+          return;
+        }
+
+        log('space invitation received via navigation');
+        removeQueryParam(invitationProp);
+        yield* Operation.invoke(SpaceOperation.Join, { invitationCode });
       }).pipe(
         Effect.provideService(Capability.Service, capabilities),
         Effect.provideService(Operation.Service, operationService),

package/src/capabilities/navigation-resolver.ts

@@ -6,7 +6,7 @@ import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
 import { Capability } from '@dxos/app-framework';
-import { AppCapabilities, AppSpace, Paths, type AppCapabilities as AppCaps } from '@dxos/app-toolkit';
+import { AppCapabilities, type AppCapabilities as AppCaps, AppSpace, Paths } from '@dxos/app-toolkit';
 import { Database, Entity, Key } from '@dxos/echo';
 import { EID } from '@dxos/keys';
 import { ClientCapabilities } from '@dxos/plugin-client';
@@ -22,7 +22,7 @@ export default Capability.makeModule(
     // TODO(wittjosiah): Remove cast once NavigationTargetResolver type includes Database.Service.
     const resolver: AppCaps.NavigationTargetResolver = ((query) =>
       Effect.gen(function* () {
-        if (!query?.dxn) {
+        if (!query?.uri) {
           return [
             {
               path: getPluginSettingsSectionPath(meta.profile.key),
@@ -32,13 +32,13 @@ export default Capability.makeModule(
           ];
         }
 
-        const dxn = EID.tryParse(query.dxn.startsWith('@dxn:') ? query.dxn.slice(1) : query.dxn);
-        if (!dxn) {
+        const eid = EID.tryParse(query.uri);
+        if (!eid) {
           return [];
         }
 
         const { db } = yield* Database.Service;
-        const ref = db.makeRef(dxn);
+        const ref = db.makeRef(eid);
         const object = yield* Database.load(ref).pipe(Effect.catchAll(() => Effect.succeed(null)));
         if (!object) {
           return [];
@@ -59,9 +59,9 @@ export default Capability.makeModule(
       })) as AppCaps.NavigationTargetResolver;
 
     // Parse object paths into EIDs (structure only; existence is checked by the caller).
-    // Handles canonical type paths (root/<spaceId>/types/<typename>/all/<objectId>)
-    // and collection paths (root/<spaceId>/collections/<collectionId>/<objectId>): the space id
-    // is the first segment and the object id the last.
+    // Handles canonical database paths (root/<spaceId>/system/database/<typeSlug>/<objectId>)
+    // and collection paths (root/<spaceId>/content/collections/<collectionId>/<objectId>): the space
+    // id is the first segment and the object id the last, regardless of intervening group segments.
     const pathResolver: AppCaps.NavigationPathResolver = (qualifiedPath) => {
       const segments = qualifiedPath.split('/');
       const spaceId = Paths.getSpaceIdFromPath(qualifiedPath);