@dxos/plugin-space 0.8.4-main.4a85c3132b → 0.8.4-main.4f23b4e393

package/src/capabilities/migrations.ts

@@ -0,0 +1,59 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { LegacySpaceProperties, SpaceProperties } from '@dxos/client-protocol';
+import { Migration } from '@dxos/echo';
+import { ClientCapabilities } from '@dxos/plugin-client';
+import { AccessToken, AnchoredTo, HasConnection, HasRelationship, HasSubject } from '@dxos/types';
+
+const identityTransform = async (from: any) => ({ ...from });
+const noopCallback = async () => {};
+
+const migrations = [
+  Migration.define({
+    from: LegacySpaceProperties,
+    to: SpaceProperties,
+    transform: identityTransform,
+    onMigration: noopCallback,
+  }),
+  Migration.define({
+    from: AccessToken.LegacyAccessToken,
+    to: AccessToken.AccessToken,
+    transform: identityTransform,
+    onMigration: noopCallback,
+  }),
+  Migration.define({
+    from: AnchoredTo.LegacyAnchoredTo,
+    to: AnchoredTo.AnchoredTo,
+    transform: identityTransform,
+    onMigration: noopCallback,
+  }),
+  Migration.define({
+    from: HasConnection.LegacyHasConnection,
+    to: HasConnection.HasConnection,
+    transform: identityTransform,
+    onMigration: noopCallback,
+  }),
+  Migration.define({
+    from: HasRelationship.LegacyHasRelationship,
+    to: HasRelationship.HasRelationship,
+    transform: identityTransform,
+    onMigration: noopCallback,
+  }),
+  Migration.define({
+    from: HasSubject.LegacyHasSubject,
+    to: HasSubject.HasSubject,
+    transform: identityTransform,
+    onMigration: noopCallback,
+  }),
+];
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(ClientCapabilities.Migration, migrations);
+  }),
+);

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

@@ -0,0 +1,9 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export type { NavigationHandlerOptions } from './navigation-handler';
+
+export const NavigationHandler = Capability.lazy('NavigationHandler', () => import('./navigation-handler'));

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

@@ -0,0 +1,50 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+import { log } from '@dxos/log';
+
+import { SpaceOperation } from '../../operations';
+
+export type NavigationHandlerOptions = {
+  invitationProp?: string;
+};
+
+/**
+ * NavigationHandler for space invitation URL params.
+ * Handles ?spaceInvitationCode=X → join space via invitation.
+ */
+export default Capability.makeModule(
+  Effect.fnUntraced(function* ({ invitationProp = 'spaceInvitationCode' }: NavigationHandlerOptions = {}) {
+    const capabilities = yield* Capability.Service;
+    const operationService = yield* Capability.get(Capabilities.OperationInvoker);
+
+    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 });
+        }
+      }).pipe(
+        Effect.provideService(Capability.Service, capabilities),
+        Effect.provideService(Operation.Service, operationService),
+        Effect.orDie,
+      );
+
+    return Capability.contributes(AppCapabilities.NavigationHandler, handler);
+  }),
+);
+
+/** Remove a query param from the current browser URL. */
+const removeQueryParam = (key: string) => {
+  const current = new URL(window.location.href);
+  current.searchParams.delete(key);
+  history.replaceState(null, '', current.pathname + current.search);
+};

package/src/capabilities/navigation-resolver.ts

@@ -0,0 +1,94 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
+
+import { Capability } from '@dxos/app-framework';
+import {
+  AppCapabilities,
+  getObjectPath,
+  getSpaceIdFromPath,
+  getSpacePath,
+  type AppCapabilities as AppCaps,
+} from '@dxos/app-toolkit';
+import { Database, Entity, Key } from '@dxos/echo';
+import { DXN } from '@dxos/keys';
+import { ClientCapabilities } from '@dxos/plugin-client';
+import { SETTINGS_ID, SETTINGS_KEY } from '@dxos/plugin-settings';
+
+import { meta } from '#meta';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    // TODO(wittjosiah): Remove cast once NavigationTargetResolver type includes Database.Service.
+    const resolver: AppCaps.NavigationTargetResolver = ((query) =>
+      Effect.gen(function* () {
+        if (!query?.dxn) {
+          return [
+            {
+              path: `${getSpacePath(SETTINGS_ID)}/${SETTINGS_KEY}:${meta.id.replaceAll('/', ':')}`,
+              label: 'Spaces settings',
+              type: 'settings',
+            },
+          ];
+        }
+
+        const dxn = DXN.tryParse(query.dxn.startsWith('@dxn:') ? query.dxn.slice(1) : query.dxn);
+        if (!dxn) {
+          return [];
+        }
+
+        const { db } = yield* Database.Service;
+        const ref = db.makeRef(dxn);
+        const object = yield* Database.load(ref).pipe(Effect.catchAll(() => Effect.succeed(null)));
+        if (!object) {
+          return [];
+        }
+
+        const typename = Entity.getTypename(object);
+        if (!typename) {
+          return [];
+        }
+
+        return [
+          {
+            path: getObjectPath(db.spaceId, typename, object.id),
+            label: Entity.getLabel(object) ?? '',
+            type: typename,
+          },
+        ];
+      })) as AppCaps.NavigationTargetResolver;
+
+    // Resolve object paths to DXNs.
+    // Handles canonical type paths (root/<spaceId>/types/<typename>/all/<objectId>)
+    // and collection paths (root/<spaceId>/collections/<collectionId>/<objectId>).
+    // Validates that the object actually exists in the space before returning a DXN.
+    const client = yield* Capability.get(ClientCapabilities.Client);
+    const pathResolver: AppCaps.NavigationPathResolver = (qualifiedPath) => {
+      const segments = qualifiedPath.split('/');
+      const spaceId = getSpaceIdFromPath(qualifiedPath);
+      const objectId = segments[segments.length - 1];
+      if (!spaceId || !objectId || !Key.ObjectId.isValid(objectId)) {
+        return Effect.succeed(Option.none());
+      }
+
+      const space = client.spaces.get(spaceId);
+      if (!space) {
+        return Effect.succeed(Option.none());
+      }
+
+      const dxn = DXN.fromSpaceAndObjectId(spaceId, objectId as Key.ObjectId);
+      const ref = space.db.makeRef(dxn);
+      return Database.loadOption(ref).pipe(
+        Effect.map((option) => (Option.isSome(option) ? Option.some(dxn) : Option.none<DXN>())),
+      );
+    };
+
+    return [
+      Capability.contributes(AppCapabilities.NavigationTargetResolver, resolver),
+      Capability.contributes(AppCapabilities.NavigationPathResolver, pathResolver),
+    ];
+  }),
+);

package/src/capabilities/node.ts

@@ -0,0 +1,14 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+import { OperationHandlerSet } from '@dxos/compute';
+
+export const CreateObject = Capability.lazy('CreateObject', () => import('./create-object'));
+export const IdentityCreated = Capability.lazy('IdentityCreated', () => import('./identity-created'));
+export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
+  'OperationHandler',
+  () => import('./operation-handler'),
+);
+export const UndoMappings = Capability.lazy('UndoMappings', () => import('./undo-mappings'));

package/src/capabilities/operation-handler.ts

@@ -0,0 +1,14 @@
+// Copyright 2025 DXOS.org
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import type { OperationHandlerSet } from '@dxos/compute';
+
+import { SpaceOperationHandlerSet } from '#operations';
+
+export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(Capabilities.OperationHandler, SpaceOperationHandlerSet);
+  }),
+);

package/src/capabilities/react-root.tsx

@@ -0,0 +1,25 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { useAtomCapability } from '@dxos/app-framework/ui';
+
+import { AwaitingObject } from '#components';
+import { meta } from '#meta';
+import { SpaceCapabilities } from '#types';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactRoot, {
+      id: meta.id,
+      root: () => {
+        const ephemeral = useAtomCapability(SpaceCapabilities.EphemeralState);
+        return ephemeral.awaiting ? <AwaitingObject id={ephemeral.awaiting} /> : null;
+      },
+    }),
+  ),
+);

package/src/capabilities/react-surface.tsx

@@ -0,0 +1,391 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
+import type * as Schema from 'effect/Schema';
+import * as SchemaAST from 'effect/SchemaAST';
+import React, { type ComponentProps, useCallback } from 'react';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface, useAtomCapability, useOperationInvoker, useSettingsState } from '@dxos/app-framework/ui';
+import { AppSurface, useActiveSpace, useTypeOptions } from '@dxos/app-toolkit/ui';
+import { Collection, Database, Obj } from '@dxos/echo';
+import { findAnnotation } from '@dxos/effect';
+import { type Space, SpaceState, getSpace, isSpace, useSpaces } from '@dxos/react-client/echo';
+import { Input } from '@dxos/react-ui';
+import { type FormFieldComponentProps, SelectField } from '@dxos/react-ui-form';
+import { HuePicker, IconPicker } from '@dxos/react-ui-pickers';
+import { ViewAnnotation } from '@dxos/schema';
+
+import { SpaceSettings } from '#components';
+import {
+  CollectionArticle,
+  CollectionSection,
+  CreateObjectDialog,
+  CreateSpaceDialog,
+  ImportSpaceDialog,
+  InlineSyncStatus,
+  JoinDialog,
+  MembersContainer,
+  MenuFooter,
+  ObjectCardStack,
+  ObjectProperties,
+  ObjectRenamePopover,
+  RecordArticle,
+  RelatedArticle,
+  SchemaContainer,
+  SmallPresenceLive,
+  SpacePresence,
+  SpaceRenamePopover,
+  SpaceSettingsContainer,
+  SyncStatus,
+  ViewEditor,
+} from '#containers';
+import { meta } from '#meta';
+import { SpaceOperation } from '#operations';
+import {
+  HueAnnotationId,
+  IconAnnotationId,
+  SpaceCapabilities,
+  type Settings,
+  type TypeInputOptions,
+  TypeInputOptionsAnnotationId,
+} from '#types';
+
+import {
+  CREATE_OBJECT_DIALOG,
+  CREATE_SPACE_DIALOG,
+  IMPORT_SPACE_DIALOG,
+  JOIN_DIALOG,
+  OBJECT_RENAME_POPOVER,
+  SPACE_RENAME_POPOVER,
+} from '../constants';
+
+type ReactSurfaceOptions = {
+  createInvitationUrl: (invitationCode: string) => string;
+};
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* ({ createInvitationUrl }: ReactSurfaceOptions) {
+    return Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: 'collection-fallback',
+        position: 'fallback',
+        filter: AppSurface.object(AppSurface.Article, Collection.Collection),
+        component: ({ data }) => <CollectionArticle attendableId={data.attendableId} subject={data.subject} />,
+      }),
+      Surface.create({
+        id: 'record-article',
+        position: 'fallback',
+        filter: AppSurface.subject(AppSurface.Article, Obj.isObject),
+        component: ({ data }) => <RecordArticle subject={data.subject} />,
+      }),
+      Surface.create({
+        id: 'plugin-settings',
+        filter: AppSurface.settings(AppSurface.Article, meta.id),
+        component: ({ data: { subject } }) => {
+          const { settings, updateSettings } = useSettingsState<Settings.Settings>(subject.atom);
+          const spaces = useSpaces({ all: settings.showHidden });
+          const { invokePromise } = useOperationInvoker();
+          return (
+            <SpaceSettings
+              settings={settings}
+              onSettingsChange={updateSettings}
+              spaces={spaces}
+              onOpenSpaceSettings={(space: Space) => invokePromise(SpaceOperation.OpenSettings, { space })}
+            />
+          );
+        },
+      }),
+      Surface.create({
+        id: 'companion.object-properties',
+        filter: AppSurface.allOf(
+          AppSurface.literal(AppSurface.Article, 'settings'),
+          AppSurface.companion(AppSurface.Article),
+        ),
+        component: ({ ref, data, role }) => <ObjectProperties role={role} subject={data.companionTo} ref={ref} />,
+      }),
+      Surface.create({
+        id: 'companion.related',
+        filter: AppSurface.allOf(
+          AppSurface.literal(AppSurface.Article, 'related'),
+          AppSurface.companion(AppSurface.Article),
+        ),
+        component: ({ data, role }) => <RelatedArticle role={role} companionTo={data.companionTo} />,
+      }),
+      Surface.create({
+        id: 'space-settings-properties',
+        filter: AppSurface.literal(AppSurface.Article, `${meta.id}.general`),
+        component: ({ ref }) => {
+          const space = useActiveSpace();
+          if (!space) {
+            return null;
+          }
+
+          return <SpaceSettingsContainer space={space} />;
+        },
+      }),
+      Surface.create({
+        id: 'space-settings-members',
+        position: 'hoist',
+        filter: AppSurface.literal(AppSurface.Article, `${meta.id}.members`),
+        component: () => {
+          const space = useActiveSpace();
+          if (!space) {
+            return null;
+          }
+
+          return <MembersContainer space={space} createInvitationUrl={createInvitationUrl} />;
+        },
+      }),
+      Surface.create({
+        id: 'space-settings-schema',
+        filter: AppSurface.literal(AppSurface.Article, `${meta.id}.schema`),
+        component: () => {
+          const space = useActiveSpace();
+          if (!space) {
+            return null;
+          }
+
+          return <SchemaContainer space={space} />;
+        },
+      }),
+      Surface.create({
+        id: 'selected-objects',
+        role: 'article',
+        filter: (data): data is { companionTo: Obj.Unknown; subject: 'selected-objects' } => {
+          if (data.subject !== 'selected-objects' || !Obj.isObject(data.companionTo)) {
+            return false;
+          }
+
+          const schema = Obj.getSchema(data.companionTo);
+          const path = schema ? Option.getOrElse(ViewAnnotation.get(schema), () => [] as readonly string[]) : [];
+          const viewTarget = path.length > 0 ? ViewAnnotation.tryGetTargetAlongPath(data.companionTo, path) : undefined;
+          return !!viewTarget;
+        },
+        // TODO(burdon): Replace with mosaic.
+        component: ({ data, ref }) => {
+          const schema = Obj.getSchema(data.companionTo);
+          const path = schema ? Option.getOrElse(ViewAnnotation.get(schema), () => [] as readonly string[]) : [];
+          const view = path.length > 0 ? ViewAnnotation.tryGetTargetAlongPath(data.companionTo, path) : undefined;
+          if (!view) {
+            return null;
+          }
+
+          return (
+            <ObjectCardStack
+              key={Obj.getDXN(data.companionTo).toString()}
+              objectId={Obj.getDXN(data.companionTo).toString()}
+              view={view}
+              ref={ref}
+            />
+          );
+        },
+      }),
+      Surface.create({
+        id: JOIN_DIALOG,
+        filter: AppSurface.component<ComponentProps<typeof JoinDialog>>(AppSurface.Dialog, JOIN_DIALOG),
+        component: ({ data }) => <JoinDialog {...data.props} />,
+      }),
+      Surface.create({
+        id: CREATE_SPACE_DIALOG,
+        filter: AppSurface.component(AppSurface.Dialog, CREATE_SPACE_DIALOG),
+        component: () => <CreateSpaceDialog />,
+      }),
+      Surface.create({
+        id: IMPORT_SPACE_DIALOG,
+        filter: AppSurface.component(AppSurface.Dialog, IMPORT_SPACE_DIALOG),
+        component: () => <ImportSpaceDialog />,
+      }),
+      Surface.create({
+        id: CREATE_OBJECT_DIALOG,
+        filter: AppSurface.component<ComponentProps<typeof CreateObjectDialog>>(
+          AppSurface.Dialog,
+          CREATE_OBJECT_DIALOG,
+        ),
+        component: ({ data }) => <CreateObjectDialog {...data.props} />,
+      }),
+      Surface.create({
+        id: 'create-initial-space-form-[hue]',
+        role: 'form-input',
+        filter: (data): data is { prop: string; schema: Schema.Schema<any>; fieldPropertyAst?: SchemaAST.AST } => {
+          const annotation = findAnnotation<boolean>((data.schema as Schema.Schema.All).ast, HueAnnotationId);
+          return !!annotation;
+        },
+        component: ({ data, ...inputProps }) => {
+          const ast = data.fieldPropertyAst;
+          if (!ast) {
+            return null;
+          }
+
+          const { label, readonly, getValue, onValueChange } = inputProps as any as FormFieldComponentProps;
+          const handleChange = useCallback((nextHue: string) => onValueChange(ast, nextHue), [ast, onValueChange]);
+          const handleReset = useCallback(() => onValueChange(ast, undefined), [ast, onValueChange]);
+          return (
+            <Input.Root>
+              <Input.Label>{label}</Input.Label>
+              <HuePicker disabled={!!readonly} value={getValue() ?? ''} onChange={handleChange} onReset={handleReset} />
+            </Input.Root>
+          );
+        },
+      }),
+      Surface.create({
+        id: 'create-initial-space-form-[icon]',
+        role: 'form-input',
+        filter: (data): data is { prop: string; schema: Schema.Schema<any>; fieldPropertyAst?: SchemaAST.AST } => {
+          const annotation = findAnnotation<boolean>((data.schema as Schema.Schema.All).ast, IconAnnotationId);
+          return !!annotation;
+        },
+        component: ({ data, ...inputProps }) => {
+          const ast = data.fieldPropertyAst;
+          if (!ast) {
+            return null;
+          }
+
+          const { label, readonly, getValue, onValueChange } = inputProps as any as FormFieldComponentProps;
+          const handleChange = useCallback((nextIcon: string) => onValueChange(ast, nextIcon), [ast, onValueChange]);
+          const handleReset = useCallback(() => onValueChange(ast, undefined), [ast, onValueChange]);
+          return (
+            <Input.Root>
+              <Input.Label>{label}</Input.Label>
+              <IconPicker
+                disabled={!!readonly}
+                value={getValue() ?? ''}
+                onChange={handleChange}
+                onReset={handleReset}
+              />
+            </Input.Root>
+          );
+        },
+      }),
+      Surface.create({
+        id: 'typename-form-input',
+        role: 'form-input',
+        filter: (
+          data,
+        ): data is {
+          prop: string;
+          schema: Schema.Schema.Any;
+          target: Database.Database | Collection.Collection | undefined;
+          fieldPropertyAst?: SchemaAST.AST;
+        } => {
+          if (data.prop !== 'typename') {
+            return false;
+          }
+
+          const annotation = findAnnotation((data.schema as Schema.Schema.All).ast, TypeInputOptionsAnnotationId);
+          return !!annotation;
+        },
+        component: ({ data: { schema, target, fieldPropertyAst }, ...inputProps }) => {
+          const ast = fieldPropertyAst;
+          if (!ast) {
+            return null;
+          }
+
+          const props = { ...inputProps, type: ast } as any as FormFieldComponentProps;
+          const db = Database.isDatabase(target) ? target : target && Obj.getDatabase(target);
+          const annotation = findAnnotation<TypeInputOptions>(schema.ast, TypeInputOptionsAnnotationId)!;
+          const options = useTypeOptions({ db, annotation });
+
+          return <SelectField {...props} options={options} />;
+        },
+      }),
+      Surface.create({
+        id: 'object-properties',
+        role: 'object-properties',
+        filter: (data): data is { subject: Obj.Unknown } => {
+          if (!Obj.isObject(data.subject)) {
+            return false;
+          }
+
+          const schema = Obj.getSchema(data.subject);
+          const path = schema ? Option.getOrElse(ViewAnnotation.get(schema), () => [] as readonly string[]) : [];
+          const viewTarget = path.length > 0 ? ViewAnnotation.tryGetTargetAlongPath(data.subject, path) : undefined;
+          return !!viewTarget;
+        },
+        component: ({ data }) => {
+          const schema = Obj.getSchema(data.subject);
+          const path = schema ? Option.getOrElse(ViewAnnotation.get(schema), () => [] as readonly string[]) : [];
+          const view = path.length > 0 ? ViewAnnotation.tryGetTargetAlongPath(data.subject, path) : undefined;
+
+          if (!view) {
+            return null;
+          }
+
+          return <ViewEditor view={view} />;
+        },
+      }),
+      Surface.create({
+        id: SPACE_RENAME_POPOVER,
+        role: 'popover',
+        filter: (data): data is { props: Space } => data.component === SPACE_RENAME_POPOVER && isSpace(data.props),
+        component: ({ data }) => <SpaceRenamePopover space={data.props} />,
+      }),
+      Surface.create({
+        id: OBJECT_RENAME_POPOVER,
+        role: 'popover',
+        filter: (data): data is { props: Obj.Unknown } =>
+          data.component === OBJECT_RENAME_POPOVER && Obj.isObject(data.props),
+        component: ({ data }) => <ObjectRenamePopover object={data.props} />,
+      }),
+      Surface.create({
+        id: 'menu-footer',
+        filter: AppSurface.subject(AppSurface.MenuFooter, Obj.isObject),
+        component: ({ data }) => <MenuFooter object={data.subject} />,
+      }),
+      Surface.create({
+        id: 'navtree-presence',
+        role: 'navtree-item-end',
+        filter: (data): data is { id: string; subject: Obj.Unknown; open?: boolean } =>
+          typeof data.id === 'string' && Obj.isObject(data.subject),
+        component: ({ data }) => {
+          const ephemeral = useAtomCapability(SpaceCapabilities.EphemeralState);
+          return <SmallPresenceLive id={data.id} open={data.open} viewers={ephemeral.viewersByObject[data.id]} />;
+        },
+      }),
+      // TODO(wittjosiah): Attention glyph for non-echo items should be handled elsewhere.
+      Surface.create({
+        id: 'navtree-presence-fallback',
+        role: 'navtree-item-end',
+        position: 'fallback',
+        filter: (data): data is { id: string; open?: boolean } => typeof data.id === 'string',
+        component: ({ data }) => <SmallPresenceLive id={data.id} open={data.open} />,
+      }),
+      // TODO(wittjosiah): Broken?
+      Surface.create({
+        id: 'navtree-sync-status',
+        role: 'navtree-item-end',
+        filter: (data): data is { subject: Space; open?: boolean } => isSpace(data.subject),
+        component: ({ data }) => <InlineSyncStatus space={data.subject} open={data.open} />,
+      }),
+      Surface.create({
+        id: 'navbar-presence',
+        role: 'navbar-end',
+        position: 'hoist',
+        filter: (data): data is { subject: Space | Obj.Unknown } => isSpace(data.subject) || Obj.isObject(data.subject),
+        component: ({ data }) => {
+          const space = isSpace(data.subject) ? data.subject : getSpace(data.subject);
+          const object = isSpace(data.subject)
+            ? data.subject.state.get() === SpaceState.SPACE_READY
+              ? (space?.properties[Collection.Collection.typename]?.target as Collection.Collection)
+              : undefined
+            : data.subject;
+
+          return object ? <SpacePresence object={object} /> : null;
+        },
+      }),
+      Surface.create({
+        id: 'collection-section',
+        filter: AppSurface.object(AppSurface.Section, Collection.Collection),
+        component: ({ data }) => <CollectionSection subject={data.subject} />,
+      }),
+      Surface.create({
+        id: 'status',
+        role: 'status-indicator',
+        component: () => <SyncStatus />,
+      }),
+    ]);
+  }),
+);