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

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

@@ -5,14 +5,7 @@
 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 { type Space, SpaceState } from '@dxos/client/echo';
 import { Operation } from '@dxos/compute';
 import { Filter, Obj } from '@dxos/echo';
@@ -21,14 +14,14 @@ 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';
-import { SPACE_TYPE, SpaceCapabilities } from '#types';
+import { SPACE_HOME_NODE_TYPE, SPACE_TYPE, SpaceCapabilities } from '#types';
 
 import { SHARED, getSpaceDisplayName } from '../../../util';
 import {
-  CACHEABLE_PROPS,
   CAN_DROP_SPACE,
   CREATE_OBJECT_IN_SPACE_LABEL,
   MIGRATE_SPACE_LABEL,
@@ -42,14 +35,42 @@ import {
 // Extension Factory
 //
 
-/** Creates space-related extensions: primary actions, space nodes, and space actions. */
+// The label tuple must be a module-level singleton: connectors re-evaluate whenever the matched
+// node emits, and a tuple rebuilt inline each time creates a new array reference, causing the graph
+// to re-emit the node and remount the Home article on every evaluation.
+const SPACE_HOME_NODE_LABEL = ['space-home-node.label', { ns: meta.profile.key }] as const;
+
+/** Creates space-related extensions: primary actions, space nodes, space actions, and the Home node. */
 export const 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,
+            },
+          } satisfies Node.NodeArg<typeof SPACE_HOME_NODE_TYPE>,
+        ]),
+    }),
+
     GraphBuilder.createExtension({
       id: 'primaryActions',
-      position: 'first',
+      position: Position.first,
       match: NodeMatcher.whenRoot,
       actions: () =>
         Effect.succeed([
@@ -57,7 +78,7 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
             id: SpaceOperation.OpenCreateSpace.meta.key,
             data: () => Operation.invoke(SpaceOperation.OpenCreateSpace),
             properties: {
-              label: ['create-space.label', { ns: meta.id }],
+              label: ['create-space.label', { ns: meta.profile.key }],
               icon: 'ph--plus--regular',
               testId: 'spacePlugin.createSpace',
               disposition: 'menu',
@@ -67,7 +88,7 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
             id: SpaceOperation.Join.meta.key,
             data: () => Operation.invoke(SpaceOperation.Join, {}),
             properties: {
-              label: ['join-space.label', { ns: meta.id }],
+              label: ['join-space.label', { ns: meta.profile.key }],
               icon: 'ph--sign-in--regular',
               testId: 'spacePlugin.joinSpace',
               disposition: 'menu',
@@ -77,7 +98,7 @@ export const createSpaceExtensions = Effect.fnUntraced(function* () {
             id: SpaceOperation.OpenImportSpace.meta.key,
             data: () => Operation.invoke(SpaceOperation.OpenImportSpace),
             properties: {
-              label: ['import-space.label', { ns: meta.id }],
+              label: ['import-space.label', { ns: meta.profile.key }],
               icon: 'ph--upload--regular',
               testId: 'spacePlugin.importSpace',
             },
@@ -86,13 +107,13 @@ export const 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, format: SpaceArchive.Format.BINARY });
               }
             }),
             properties: {
-              label: ['export-space-binary.label', { ns: meta.id }],
+              label: ['export-space-binary.label', { ns: meta.profile.key }],
               icon: 'ph--download--regular',
               testId: 'spacePlugin.exportSpaceBinary',
             },
@@ -101,13 +122,13 @@ export const 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, format: SpaceArchive.Format.JSON });
               }
             }),
             properties: {
-              label: ['export-space-json.label', { ns: meta.id }],
+              label: ['export-space-json.label', { ns: meta.profile.key }],
               icon: 'ph--download--regular',
               testId: 'spacePlugin.exportSpaceJson',
             },
@@ -116,13 +137,13 @@ export const 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 });
               }
             }),
             properties: {
-              label: ['share-space.label', { ns: meta.id }],
+              label: ['share-space.label', { ns: meta.profile.key }],
               icon: 'ph--users--regular',
               testId: 'spacePlugin.shareSpace',
               keyBinding: {
@@ -135,13 +156,13 @@ export const 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 });
               }
             }),
             properties: {
-              label: ['open-current-space-settings.label', { ns: meta.id }],
+              label: ['open-current-space-settings.label', { ns: meta.profile.key }],
               icon: 'ph--faders--regular',
               keyBinding: {
                 macos: 'meta+shift+,',
@@ -156,13 +177,19 @@ 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);
 
         const spaces = get(spacesAtom);
-        const personalSpace = getPersonalSpace(client);
+        const personalSpace = AppSpace.getPersonalSpace(client);
 
         if (!spaces || !personalSpace) {
           return Effect.succeed([]);
@@ -196,13 +223,16 @@ 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) => space.tags.length === 0 || isPersonalSpace(space) || isExemplarSpace(space))
+              .filter((space, idx) => spaceStates[idx] === SpaceState.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,
@@ -217,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,
@@ -291,7 +340,7 @@ const constructSpaceNode = ({
   return Node.make({
     id: space.id,
     type: SPACE_TYPE,
-    cacheable: CACHEABLE_PROPS,
+    cacheable: AppNode.CACHEABLE_PROPS,
     data: space,
     properties: {
       label: getSpaceDisplayName(space, { personal, namesCache }),

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

@@ -5,9 +5,9 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
-import { PERSONAL_SPACE_TAG, RootCollectionAnnotation } from '@dxos/app-toolkit';
+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';
@@ -17,14 +17,14 @@ export default Capability.makeModule(
     const client = yield* Capability.get(ClientCapabilities.Client);
 
     const personalSpace = yield* Effect.tryPromise(() =>
-      client.spaces.create({}, { tags: [PERSONAL_SPACE_TAG], membershipPolicy: MembershipPolicy.LOCKED }),
+      client.spaces.create({}, { tags: [AppSpace.PERSONAL_SPACE_TAG], membershipPolicy: MembershipPolicy.LOCKED }),
     );
     yield* Effect.tryPromise(() => personalSpace.waitUntilReady());
 
     // Create root collection structure.
     yield* Effect.tryPromise(() => personalSpace.internal.setEdgeReplicationPreference(EdgeReplicationSetting.ENABLED));
     Obj.update(personalSpace.properties, (properties) => {
-      Annotation.set(properties, RootCollectionAnnotation, Ref.make(Collection.make()));
+      Annotation.set(properties, AppAnnotation.RootCollectionAnnotation, Ref.make(Collection.make()));
       if (Migrations.targetVersion) {
         Annotation.set(properties, MigrationVersionAnnotation, Migrations.targetVersion);
       }

package/src/capabilities/index.ts

@@ -8,7 +8,6 @@ import { OperationHandlerSet } from '@dxos/compute';
 export * from './app-graph-builder';
 export { makeCreateObjectEntryForDatabaseType } from '../util';
 
-export const AppGraphSerializer = Capability.lazy('AppGraphSerializer', () => import('./app-graph-serializer'));
 export const CreateObject = Capability.lazy('CreateObject', () => import('./create-object'));
 export const IdentityCreated = Capability.lazy('IdentityCreated', () => import('./identity-created'));
 export { NavigationHandler } from './navigation-handler';

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,18 +6,11 @@ import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
 import { Capability } from '@dxos/app-framework';
-import {
-  AppCapabilities,
-  getActiveSpace,
-  getObjectPath,
-  getSpaceIdFromPath,
-  getSpacePath,
-  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';
-import { SETTINGS_ID, SETTINGS_KEY } from '@dxos/plugin-settings';
+import { getPluginSettingsSectionPath } from '@dxos/plugin-settings';
 
 import { meta } from '#meta';
 
@@ -29,23 +22,23 @@ 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: `${getSpacePath(SETTINGS_ID)}/${SETTINGS_KEY}:${meta.id.replaceAll('/', ':')}`,
+              path: getPluginSettingsSectionPath(meta.profile.key),
               label: 'Spaces settings',
               type: 'settings',
             },
           ];
         }
 
-        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 [];
@@ -58,7 +51,7 @@ export default Capability.makeModule(
 
         return [
           {
-            path: getObjectPath(db.spaceId, typename, object.id),
+            path: Paths.getObjectPath(db.spaceId, typename, object.id),
             label: Entity.getLabel(object) ?? '',
             type: typename,
           },
@@ -66,12 +59,12 @@ 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 = getSpaceIdFromPath(qualifiedPath);
+      const spaceId = Paths.getSpaceIdFromPath(qualifiedPath);
       const objectId = segments[segments.length - 1];
       if (!spaceId || !objectId || !Key.EntityId.isValid(objectId)) {
         return Effect.succeed(Option.none());
@@ -85,7 +78,7 @@ export default Capability.makeModule(
       if (path.includes('/') || !Key.EntityId.isValid(path)) {
         return Effect.succeed(Option.none());
       }
-      const space = getActiveSpace(client, capabilities);
+      const space = AppSpace.getActiveSpace(client, capabilities);
       if (!space) {
         return Effect.succeed(Option.none());
       }

package/src/capabilities/react-root.tsx

@@ -15,7 +15,7 @@ import { SpaceCapabilities } from '#types';
 export default Capability.makeModule(() =>
   Effect.succeed(
     Capability.contributes(Capabilities.ReactRoot, {
-      id: meta.id,
+      id: meta.profile.key,
       root: () => {
         const ephemeral = useAtomCapability(SpaceCapabilities.EphemeralState);
         return ephemeral.awaiting ? <AwaitingObject id={ephemeral.awaiting} /> : null;