@dxos/plugin-space 0.8.4-main.406dc2a → 0.8.4-main.548089c

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

@@ -2,20 +2,20 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Rx } from '@effect-rx/rx-react';
+import { Atom } from '@effect-atom/atom-react';
 import * as Array from 'effect/Array';
 import * as Function from 'effect/Function';
 import * as Option from 'effect/Option';
 import * as Schema from 'effect/Schema';
 
 import { Capabilities, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
-import { type QueryResult, type Space, SpaceState, getSpace, isSpace, parseId } from '@dxos/client/echo';
-import { Filter, Obj, Query, Type } from '@dxos/echo';
+import { type QueryResult, type Space, SpaceState, getSpace, isSpace } from '@dxos/client/echo';
+import { DXN, Filter, Obj, Query, Type } from '@dxos/echo';
 import { log } from '@dxos/log';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { ATTENDABLE_PATH_SEPARATOR, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
 import { ROOT_ID, createExtension, rxFromObservable, rxFromSignal } from '@dxos/plugin-graph';
-import { DataType, getTypenameFromQuery } from '@dxos/schema';
+import { Collection, StoredSchema, View, getTypenameFromQuery } from '@dxos/schema';
 import { isNonNullable } from '@dxos/util';
 
 import { getActiveSpace } from '../hooks';
@@ -36,9 +36,8 @@ import {
 import { SpaceCapabilities } from './capabilities';
 
 export default (context: PluginContext) => {
-  // TODO(wittjosiah): Make reactive.
-  const resolve = (typename: string) =>
-    context.getCapabilities(Capabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {};
+  const resolve = (get: Atom.Context) => (typename: string) =>
+    get(context.capabilities(Capabilities.Metadata)).find(({ id }) => id === typename)?.metadata ?? {};
 
   const spacesNode = {
     id: SPACES,
@@ -83,7 +82,7 @@ export default (context: PluginContext) => {
       id: `${meta.id}/primary-actions`,
       position: 'hoist',
       actions: (node) =>
-        Rx.make((get) =>
+        Atom.make((get) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
@@ -160,7 +159,7 @@ export default (context: PluginContext) => {
       id: `${meta.id}/root`,
       position: 'hoist',
       connector: (node) =>
-        Rx.make((get) =>
+        Atom.make((get) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
@@ -176,7 +175,7 @@ export default (context: PluginContext) => {
       id: SPACES,
       connector: (node) => {
         let query: QueryResult<Type.Expando> | undefined;
-        return Rx.make((get) =>
+        return Atom.make((get) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) => (node.id === SPACES ? Option.some(node) : Option.none())),
@@ -222,7 +221,7 @@ export default (context: PluginContext) => {
                           navigable: state.navigableCollections,
                           personal: space === client.spaces.default,
                           namesCache: state.spaceNames,
-                          resolve,
+                          resolve: resolve(get),
                         }),
                       );
                   }),
@@ -281,7 +280,7 @@ export default (context: PluginContext) => {
     createExtension({
       id: `${meta.id}/actions`,
       actions: (node) =>
-        Rx.make((get) =>
+        Atom.make((get) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) =>
@@ -313,7 +312,7 @@ export default (context: PluginContext) => {
     createExtension({
       id: `${meta.id}/root-collection`,
       connector: (node) =>
-        Rx.make((get) =>
+        Atom.make((get) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) =>
@@ -328,7 +327,7 @@ export default (context: PluginContext) => {
 
               const collection = get(
                 rxFromSignal(
-                  () => space.properties[DataType.Collection.typename]?.target as DataType.Collection | undefined,
+                  () => space.properties[Collection.Collection.typename]?.target as Collection.Collection | undefined,
                 ),
               );
               if (!collection) {
@@ -345,7 +344,7 @@ export default (context: PluginContext) => {
                       createObjectNode({
                         space,
                         object,
-                        resolve,
+                        resolve: resolve(get),
                         navigable: state.navigableCollections,
                       }),
                     ),
@@ -363,11 +362,11 @@ export default (context: PluginContext) => {
     createExtension({
       id: `${meta.id}/objects`,
       connector: (node) =>
-        Rx.make((get) =>
+        Atom.make((get) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) =>
-              Obj.instanceOf(DataType.Collection, node.data) ? Option.some(node.data) : Option.none(),
+              Obj.instanceOf(Collection.Collection, node.data) ? Option.some(node.data) : Option.none(),
             ),
             Option.map((collection) => {
               const state = context.getCapability(SpaceCapabilities.State);
@@ -381,7 +380,13 @@ export default (context: PluginContext) => {
                     Array.filter(isNonNullable),
                     Array.map(
                       (object) =>
-                        space && createObjectNode({ object, space, resolve, navigable: state.navigableCollections }),
+                        space &&
+                        createObjectNode({
+                          object,
+                          space,
+                          resolve: resolve(get),
+                          navigable: state.navigableCollections,
+                        }),
                     ),
                     Array.filter(isNonNullable),
                   ),
@@ -435,11 +440,11 @@ export default (context: PluginContext) => {
       id: `${meta.id}/query-collection-objects`,
       connector: (node) => {
         let query: QueryResult<Type.Expando> | undefined;
-        return Rx.make((get) =>
+        return Atom.make((get) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) =>
-              Obj.instanceOf(DataType.QueryCollection, node.data) ? Option.some(node.data) : Option.none(),
+              Obj.instanceOf(Collection.QueryCollection, node.data) ? Option.some(node.data) : Option.none(),
             ),
             Option.flatMap((collection) => {
               const space = getSpace(collection);
@@ -456,7 +461,7 @@ export default (context: PluginContext) => {
                     //   It will return all objects in the collection, not just the ones of the given type.
                     //   However this works fine for now because this query is only used for exclusions.
                     Query.select(Filter.typename(typename))
-                      .referencedBy(DataType.Collection, 'objects')
+                      .referencedBy(Collection.Collection, 'objects')
                       .reference('objects'),
                   ),
                 );
@@ -471,7 +476,7 @@ export default (context: PluginContext) => {
                         createObjectNode({
                           object,
                           space,
-                          resolve,
+                          resolve: resolve(get),
                           droppable: false, // Cannot rearrange query collections.
                           navigable: state.navigableCollections,
                         }),
@@ -492,12 +497,12 @@ export default (context: PluginContext) => {
       id: `${meta.id}/static-schemas`,
       connector: (node) => {
         const client = context.getCapability(ClientCapabilities.Client);
-        return Rx.make((get) =>
+        return Atom.make((get) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) =>
-              Obj.instanceOf(DataType.QueryCollection, node.data) &&
-              getTypenameFromQuery(node.data.query) === DataType.StoredSchema.typename
+              Obj.instanceOf(Collection.QueryCollection, node.data) &&
+              getTypenameFromQuery(node.data.query) === StoredSchema.typename
                 ? Option.some(node.data)
                 : Option.none(),
             ),
@@ -523,8 +528,8 @@ export default (context: PluginContext) => {
     createExtension({
       id: `${meta.id}/static-schema-actions`,
       actions: (node) => {
-        let query: QueryResult<DataType.View> | undefined;
-        return Rx.make((get) =>
+        let query: QueryResult<View.View> | undefined;
+        return Atom.make((get) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) => {
@@ -534,7 +539,7 @@ export default (context: PluginContext) => {
             Option.map(({ space, schema }) => {
               if (!query) {
                 // TODO(wittjosiah): Support filtering by nested properties (e.g. `query.typename`).
-                query = space.db.query(Filter.type(DataType.View));
+                query = space.db.query(Filter.type(View.View));
               }
 
               const views = get(rxFromQuery(query));
@@ -571,39 +576,55 @@ export default (context: PluginContext) => {
     createExtension({
       id: `${meta.id}/schema-views`,
       connector: (node) => {
-        let query: QueryResult<DataType.View> | undefined;
-        return Rx.make((get) =>
+        let query: QueryResult<View.View> | undefined;
+        return Atom.make((get) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) => {
               const space = getSpace(node.data) ?? (isSpace(node.properties.space) ? node.properties.space : undefined);
-              return space && (Obj.instanceOf(DataType.StoredSchema, node.data) || Schema.isSchema(node.data))
+              return space && (Obj.instanceOf(StoredSchema, node.data) || Schema.isSchema(node.data))
                 ? Option.some({ space, schema: node.data })
                 : Option.none();
             }),
             Option.map(({ space, schema }) => {
               if (!query) {
                 // TODO(wittjosiah): Support filtering by nested properties (e.g. `query.typename`).
-                query = space.db.query(Filter.type(DataType.View));
+                query = space.db.query(Filter.type(View.View));
               }
 
               // TODO(wittjosiah): Remove cast.
               const typename = Schema.isSchema(schema) ? Type.getTypename(schema as Type.Obj.Any) : schema.typename;
-              return get(rxFromQuery(query))
-                .filter((view) => getTypenameFromQuery(view.query.ast) === typename)
-                .map((view) =>
-                  get(
-                    rxFromSignal(() =>
-                      createObjectNode({
-                        object: view,
-                        space,
-                        resolve,
-                        droppable: false,
+              return (
+                get(rxFromQuery(query))
+                  .filter((view) => getTypenameFromQuery(view.query.ast) === typename)
+                  // Filter out Collection views from Projects.
+                  .filter((view) =>
+                    get(
+                      rxFromSignal(() => {
+                        const presentation = view.presentation.target;
+                        if (presentation) {
+                          const typename = Obj.getTypename(presentation);
+                          return typename !== Collection.Collection.typename;
+                        } else {
+                          return false;
+                        }
                       }),
                     ),
-                  ),
-                )
-                .filter(isNonNullable);
+                  )
+                  .map((view) =>
+                    get(
+                      rxFromSignal(() =>
+                        createObjectNode({
+                          object: view,
+                          space,
+                          resolve: resolve(get),
+                          droppable: false,
+                        }),
+                      ),
+                    ),
+                  )
+                  .filter(isNonNullable)
+              );
             }),
             Option.getOrElse(() => []),
           ),
@@ -616,20 +637,20 @@ export default (context: PluginContext) => {
       id: `${meta.id}/records`,
       resolver: (id) => {
         let query: QueryResult<Type.Expando> | undefined;
-        return Rx.make((get) => {
+        return Atom.make((get) => {
           const client = context.getCapability(ClientCapabilities.Client);
-          const { spaceId, objectId } = parseId(id);
-          if (!spaceId || !objectId) {
+          const dxn = DXN.tryParse(id)?.asEchoDXN();
+          if (!dxn || !dxn.spaceId) {
             return null;
           }
 
-          const space = client.spaces.get(spaceId);
+          const space = client.spaces.get(dxn.spaceId);
           if (!space) {
             return null;
           }
 
           if (!query) {
-            query = space.db.query(Filter.ids(objectId));
+            query = space.db.query(Filter.ids(dxn.echoId));
           }
 
           const object = get(rxFromQuery(query)).at(0);
@@ -637,7 +658,12 @@ export default (context: PluginContext) => {
             return null;
           }
 
-          return createObjectNode({ object, space, resolve, disposition: 'hidden' });
+          return createObjectNode({
+            object,
+            space,
+            resolve: resolve(get),
+            disposition: 'hidden',
+          });
         });
       },
     }),
@@ -646,8 +672,8 @@ export default (context: PluginContext) => {
     createExtension({
       id: `${meta.id}/object-actions`,
       actions: (node) => {
-        let query: QueryResult<DataType.View> | undefined;
-        return Rx.make((get) =>
+        let query: QueryResult<View.View> | undefined;
+        return Atom.make((get) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) => {
@@ -657,18 +683,18 @@ export default (context: PluginContext) => {
                 : Option.none();
             }),
             Option.flatMap(({ space, object }) => {
-              const isSchema = Obj.instanceOf(DataType.StoredSchema, object);
+              const isSchema = Obj.instanceOf(StoredSchema, object);
               if (!query && isSchema) {
                 // TODO(wittjosiah): Support filtering by nested properties (e.g. `query.typename`).
-                query = space.db.query(Filter.type(DataType.View));
+                query = space.db.query(Filter.type(View.View));
               }
 
               let deletable =
                 !isSchema &&
                 // Don't allow the Records smart collection to be deleted.
                 !(
-                  Obj.instanceOf(DataType.QueryCollection, object) &&
-                  getTypenameFromQuery(object.query) === DataType.StoredSchema.typename
+                  Obj.instanceOf(Collection.QueryCollection, object) &&
+                  getTypenameFromQuery(object.query) === StoredSchema.typename
                 );
               if (isSchema && query) {
                 const views = get(rxFromQuery(query));
@@ -707,10 +733,10 @@ export default (context: PluginContext) => {
     createExtension({
       id: `${meta.id}/selected-objects`,
       connector: (node) =>
-        Rx.make((get) =>
+        Atom.make((get) =>
           Function.pipe(
             get(node),
-            Option.flatMap((node) => (Obj.instanceOf(DataType.View, node.data) ? Option.some(node) : Option.none())),
+            Option.flatMap((node) => (Obj.instanceOf(View.View, node.data) ? Option.some(node) : Option.none())),
             Option.map((node) => [
               {
                 id: [node.id, 'selected-objects'].join(ATTENDABLE_PATH_SEPARATOR),
@@ -732,7 +758,7 @@ export default (context: PluginContext) => {
     createExtension({
       id: `${meta.id}/settings`,
       connector: (node) =>
-        Rx.make((get) =>
+        Atom.make((get) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) => (Obj.isObject(node.data) ? Option.some(node) : Option.none())),

package/src/capabilities/app-graph-serializer.ts

@@ -4,15 +4,15 @@
 
 import { Capabilities, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
 import { isSpace } from '@dxos/client/echo';
-import { Obj, Type } from '@dxos/echo';
-import { DataType } from '@dxos/schema';
+import { Obj } from '@dxos/echo';
+import { Collection } from '@dxos/schema';
 
 import { meta } from '../meta';
 import { translations } from '../translations';
 import { SPACE_TYPE, SpaceAction } from '../types';
 import { SPACES } from '../util';
 
-const COLLECTION_TYPE = Type.getTypename(DataType.Collection);
+const COLLECTION_TYPE = Collection.Collection.typename;
 
 // https://stackoverflow.com/a/19016910
 const DIRECTORY_TYPE = 'text/directory';
@@ -56,7 +56,7 @@ export default (context: PluginContext) =>
       deserialize: async (data, ancestors) => {
         const space = ancestors.find(isSpace);
         const collection =
-          ancestors.findLast((ancestor) => Obj.instanceOf(DataType.Collection, ancestor)) ??
+          ancestors.findLast((ancestor) => Obj.instanceOf(Collection.Collection, ancestor)) ??
           space?.properties[COLLECTION_TYPE]?.target;
         if (!space || !collection) {
           return;
@@ -66,7 +66,7 @@ export default (context: PluginContext) =>
         const result = await dispatch(
           createIntent(SpaceAction.AddObject, {
             target: collection,
-            object: Obj.make(DataType.Collection, { name: data.name, objects: [] }),
+            object: Obj.make(Collection.Collection, { name: data.name, objects: [] }),
           }),
         );
 

package/src/capabilities/capabilities.ts

@@ -6,7 +6,7 @@ import type * as Schema from 'effect/Schema';
 
 import { type AnyIntentChain, type Label, defineCapability } from '@dxos/app-framework';
 import { type Space } from '@dxos/react-client/echo';
-import { type DataType } from '@dxos/schema';
+import { type Collection } from '@dxos/schema';
 import { type DeepReadonly, type Position } from '@dxos/util';
 
 import { meta } from '../meta';
@@ -19,7 +19,7 @@ export namespace SpaceCapabilities {
   export type SettingsSection = { id: string; label: Label; position?: Position };
   export const SettingsSection = defineCapability<SettingsSection>(`${meta.id}/capability/settings-section`);
 
-  export type onCreateSpace = (params: { space: Space; rootCollection: DataType.Collection }) => AnyIntentChain;
+  export type onCreateSpace = (params: { space: Space; rootCollection: Collection.Collection }) => AnyIntentChain;
   export const onCreateSpace = defineCapability<onCreateSpace>(`${meta.id}/capability/on-space-created`);
 
   export type OnSchemaAdded = (params: {

package/src/capabilities/identity-created.ts

@@ -6,7 +6,7 @@ import { Capabilities, type PluginContext, contributes } from '@dxos/app-framewo
 import { Obj, Ref } from '@dxos/echo';
 import { Migrations } from '@dxos/migrations';
 import { ClientCapabilities } from '@dxos/plugin-client';
-import { DataType } from '@dxos/schema';
+import { Collection } from '@dxos/schema';
 
 export default async (context: PluginContext) => {
   const client = context.getCapability(ClientCapabilities.Client);
@@ -16,7 +16,7 @@ export default async (context: PluginContext) => {
   await defaultSpace.waitUntilReady();
 
   // Create root collection structure.
-  defaultSpace.properties[DataType.Collection.typename] = Ref.make(Obj.make(DataType.Collection, { objects: [] }));
+  defaultSpace.properties[Collection.Collection.typename] = Ref.make(Obj.make(Collection.Collection, { objects: [] }));
   if (Migrations.versionProperty) {
     defaultSpace.properties[Migrations.versionProperty] = Migrations.targetVersion;
   }

package/src/capabilities/intent-resolver.ts

@@ -13,15 +13,18 @@ import {
   createResolver,
 } from '@dxos/app-framework';
 import { Filter, Obj, Query, Ref, Relation, Type } from '@dxos/echo';
+import { DatabaseService } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 import { Migrations } from '@dxos/migrations';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { ObservabilityAction } from '@dxos/plugin-observability/types';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
-import { SpaceState, fullyQualifiedId, getSpace, isSpace } from '@dxos/react-client/echo';
+import { SpaceState, getSpace, isSpace } from '@dxos/react-client/echo';
 import { Invitation, InvitationEncoder } from '@dxos/react-client/invitations';
 import { ATTENDABLE_PATH_SEPARATOR } from '@dxos/react-ui-attention';
-import { DataType, ProjectionModel, getTypenameFromQuery } from '@dxos/schema';
+import { iconValues } from '@dxos/react-ui-pickers';
+import { hues } from '@dxos/react-ui-theme';
+import { Collection, ProjectionModel, StoredSchema, getTypenameFromQuery } from '@dxos/schema';
 
 import {
   CREATE_OBJECT_DIALOG,
@@ -29,8 +32,8 @@ import {
   type CreateObjectDialogProps,
   JOIN_DIALOG,
   type JoinDialogProps,
-  POPOVER_RENAME_OBJECT,
-  POPOVER_RENAME_SPACE,
+  OBJECT_RENAME_POPOVER,
+  SPACE_RENAME_POPOVER,
 } from '../components';
 import { SpaceEvents } from '../events';
 import { meta } from '../meta';
@@ -69,8 +72,10 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     }),
     createResolver({
       intent: SpaceAction.Create,
-      resolve: async ({ name, hue, icon, edgeReplication }) => {
+      resolve: async ({ name, hue: hue_, icon: icon_, edgeReplication }) => {
         const client = context.getCapability(ClientCapabilities.Client);
+        const hue = hue_ ?? hues[Math.floor(Math.random() * hues.length)];
+        const icon = icon_ ?? iconValues[Math.floor(Math.random() * iconValues.length)];
         const space = await client.spaces.create({ name, hue, icon });
         if (edgeReplication) {
           await space.internal.setEdgeReplicationPreference(EdgeReplicationSetting.ENABLED);
@@ -78,8 +83,8 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
         await space.waitUntilReady();
 
         // Create root collection.
-        const collection = Obj.make(DataType.Collection, { objects: [] });
-        space.properties[DataType.Collection.typename] = Ref.make(collection);
+        const collection = Obj.make(Collection.Collection, { objects: [] });
+        space.properties[Collection.Collection.typename] = Ref.make(collection);
 
         // Set current migration version.
         if (Migrations.versionProperty) {
@@ -87,10 +92,14 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
         }
 
         // Create records smart collection.
-        const records = Obj.make(DataType.QueryCollection, {
-          query: Query.select(Filter.type(DataType.StoredSchema)).ast,
-        });
-        collection.objects.push(Ref.make(records));
+        collection.objects.push(
+          Ref.make(
+            Obj.make(Collection.QueryCollection, {
+              // NOTE: This is specifically Filter.typename due to current limitations in query collection parsing.
+              query: Query.select(Filter.typename(StoredSchema.typename)).ast,
+            }),
+          ),
+        );
 
         // Allow other plugins to add default content.
         await context.activatePromise(SpaceEvents.SpaceCreated);
@@ -254,7 +263,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
           intents: [
             createIntent(LayoutAction.UpdatePopover, {
               part: 'popover',
-              subject: POPOVER_RENAME_SPACE,
+              subject: SPACE_RENAME_POPOVER,
               options: {
                 anchorId: `dxos.org/ui/${caller}/${space.id}`,
                 props: space,
@@ -445,8 +454,8 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
                   onCreateObject,
                   shouldNavigate: navigable
                     ? (object: Obj.Any) => {
-                        const isCollection = Obj.instanceOf(DataType.Collection, object);
-                        const isQueryCollection = Obj.instanceOf(DataType.QueryCollection, object);
+                        const isCollection = Obj.instanceOf(Collection.Collection, object);
+                        const isQueryCollection = Obj.instanceOf(Collection.QueryCollection, object);
                         return (!isCollection && !isQueryCollection) || state.navigableCollections;
                       }
                     : () => false,
@@ -495,25 +504,18 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
           };
         }
 
-        if (Obj.instanceOf(DataType.Collection, target)) {
-          target.objects.push(Ref.make(object));
-        } else if (isSpace(target) && hidden) {
-          space.db.add(object);
-        } else if (isSpace(target)) {
-          const collection = space.properties[DataType.Collection.typename]?.target;
-          if (Obj.instanceOf(DataType.Collection, collection)) {
-            collection.objects.push(Ref.make(object));
-          } else {
-            // TODO(wittjosiah): Can't add non-echo objects by including in a collection because of types.
-            const collection = Obj.make(DataType.Collection, { objects: [Ref.make(object)] });
-            space.properties[DataType.Collection.typename] = Ref.make(collection);
-          }
-        }
+        await Effect.gen(function* () {
+          yield* Collection.add({
+            object,
+            target: isSpace(target) ? undefined : target,
+            hidden,
+          });
+        }).pipe(Effect.provide(DatabaseService.layer(space.db)), Effect.runPromise);
 
         return {
           data: {
-            id: fullyQualifiedId(object),
-            subject: [fullyQualifiedId(object)],
+            id: Obj.getDXN(object).toString(),
+            subject: [Obj.getDXN(object).toString()],
             object,
           },
           intents: [
@@ -562,26 +564,26 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
         const openObjectIds = new Set<string>(layout.active);
 
         if (!undo) {
-          const parentCollection: DataType.Collection =
-            target ?? space.properties[DataType.Collection.typename]?.target;
+          const parentCollection: Collection.Collection =
+            target ?? space.properties[Collection.Collection.typename]?.target;
           const nestedObjectsList = await Promise.all(objects.map((obj) => getNestedObjects(obj, resolve)));
 
           const deletionData = {
             objects,
             parentCollection,
             indices: objects.map((obj) =>
-              Obj.instanceOf(DataType.Collection, parentCollection)
+              Obj.instanceOf(Collection.Collection, parentCollection)
                 ? parentCollection.objects.findIndex((object) => object.target === obj)
                 : -1,
             ),
             nestedObjectsList,
             wasActive: objects
               .flatMap((obj, i) => [obj, ...nestedObjectsList[i]])
-              .map((obj) => fullyQualifiedId(obj))
+              .map((obj) => Obj.getDXN(obj).toString())
               .filter((id) => openObjectIds.has(id)),
           } satisfies SpaceAction.DeletionData;
 
-          if (Obj.instanceOf(DataType.Collection, deletionData.parentCollection)) {
+          if (Obj.instanceOf(Collection.Collection, deletionData.parentCollection)) {
             [...deletionData.indices]
               .sort((a, b) => b - a)
               .forEach((index: number) => {
@@ -596,7 +598,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
           });
           objects.forEach((obj) => space.db.remove(obj));
 
-          const undoMessageKey = objects.some((obj) => Obj.instanceOf(DataType.Collection, obj))
+          const undoMessageKey = objects.some((obj) => Obj.instanceOf(Collection.Collection, obj))
             ? 'collection deleted label'
             : objects.length > 1
               ? 'objects deleted label'
@@ -623,7 +625,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
           if (
             deletionData?.objects?.length &&
             deletionData.objects.every(Obj.isObject) &&
-            Obj.instanceOf(DataType.Collection, deletionData.parentCollection)
+            Obj.instanceOf(Collection.Collection, deletionData.parentCollection)
           ) {
             // Restore the object to the space.
             const restoredObjects = deletionData.objects.map((obj: Type.Expando) => space.db.add(obj));
@@ -660,9 +662,9 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
         intents: [
           createIntent(LayoutAction.UpdatePopover, {
             part: 'popover',
-            subject: POPOVER_RENAME_OBJECT,
+            subject: OBJECT_RENAME_POPOVER,
             options: {
-              anchorId: `dxos.org/ui/${caller}/${fullyQualifiedId(object)}`,
+              anchorId: `dxos.org/ui/${caller}/${Obj.getDXN(object).toString()}`,
               props: object,
             },
           }),
@@ -691,14 +693,17 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     createResolver({
       intent: CollectionAction.Create,
       resolve: async ({ name }) => ({
-        data: { object: Obj.make(DataType.Collection, { name, objects: [] }) },
+        data: { object: Obj.make(Collection.Collection, { name, objects: [] }) },
       }),
     }),
     createResolver({
       intent: CollectionAction.CreateQueryCollection,
       resolve: async ({ name, typename }) => ({
         data: {
-          object: Obj.make(DataType.QueryCollection, { name, query: Query.select(Filter.typename(typename)).ast }),
+          object: Obj.make(Collection.QueryCollection, {
+            name,
+            query: Query.select(Filter.typename(typename)).ast,
+          }),
         },
       }),
     }),

package/src/capabilities/react-root.tsx

@@ -4,7 +4,8 @@
 
 import React from 'react';
 
-import { Capabilities, contributes, useCapability } from '@dxos/app-framework';
+import { Capabilities, contributes } from '@dxos/app-framework';
+import { useCapability } from '@dxos/app-framework/react';
 
 import { AwaitingObject } from '../components';
 import { meta } from '../meta';