@dxos/plugin-space 0.8.4-main.fd6878d → 0.8.4-staging.60fe92afc8

package/src/capabilities/react-surface.tsx

@@ -2,399 +2,398 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Schema } from 'effect';
-import React, { useCallback, useMemo } from 'react';
+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,
-  Surface,
-  contributes,
-  createSurface,
-  useCapabilities,
-  useCapability,
-  useLayout,
-} from '@dxos/app-framework';
-import { Obj, Type } from '@dxos/echo';
-import { findAnnotation } from '@dxos/effect';
-import { SettingsStore } from '@dxos/local-storage';
-import { ClientCapabilities } from '@dxos/plugin-client';
-import { useClient } from '@dxos/react-client';
-import {
-  type Space,
-  SpaceState,
-  fullyQualifiedId,
-  getSpace,
-  isLiveObject,
-  isSpace,
-  parseId,
-  useSpace,
-} from '@dxos/react-client/echo';
-import { Input, useTranslation } from '@dxos/react-ui';
-import { type InputProps, SelectInput } from '@dxos/react-ui-form';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface, useAtomCapability, useOperationInvoker } from '@dxos/app-framework/ui';
+import { RootCollectionAnnotation } from '@dxos/app-toolkit';
+import { AppSurface, useActiveSpace, useTypeOptions } from '@dxos/app-toolkit/ui';
+import { Annotation, Collection, Database, Entity, Obj, Type } from '@dxos/echo';
+import { SchemaEx } 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 { DataType, type TypenameAnnotation, TypenameAnnotationId } from '@dxos/schema';
-import { type JoinPanelProps } from '@dxos/shell/react';
+import { ViewAnnotation } from '@dxos/schema';
 
+import { SpaceSettings } from '#components';
 import {
-  CREATE_OBJECT_DIALOG,
-  CREATE_SPACE_DIALOG,
-  CollectionMain,
+  CollectionArticle,
   CollectionSection,
   CreateObjectDialog,
-  type CreateObjectDialogProps,
   CreateSpaceDialog,
+  ImportSpaceDialog,
   InlineSyncStatus,
-  JOIN_DIALOG,
   JoinDialog,
   MembersContainer,
   MenuFooter,
-  ObjectDetailsPanel,
-  ObjectSettingsContainer,
-  POPOVER_RENAME_OBJECT,
-  POPOVER_RENAME_SPACE,
-  PopoverRenameObject,
-  PopoverRenameSpace,
-  RecordMain,
+  EntityRenamePopover,
+  ObjectCardStack,
+  ObjectProperties,
+  RecordArticle,
+  RelatedArticle,
   SchemaContainer,
   SmallPresenceLive,
-  SpacePluginSettings,
   SpacePresence,
+  SpaceRenamePopover,
   SpaceSettingsContainer,
   SyncStatus,
   ViewEditor,
-} from '../components';
-import { SPACE_PLUGIN } from '../meta';
-import { HueAnnotationId, IconAnnotationId, type SpaceSettingsProps } from '../types';
+} from '#containers';
+import { meta } from '#meta';
+import { SpaceOperation } from '#operations';
+import {
+  HueAnnotationId,
+  IconAnnotationId,
+  SpaceCapabilities,
+  type TypeInputOptions,
+  TypeInputOptionsAnnotationId,
+} from '#types';
 
-import { SpaceCapabilities } from './capabilities';
+import {
+  CREATE_OBJECT_DIALOG,
+  CREATE_SPACE_DIALOG,
+  IMPORT_SPACE_DIALOG,
+  JOIN_DIALOG,
+  ENTITY_RENAME_POPOVER,
+  SPACE_RENAME_POPOVER,
+} from '../constants';
 
 type ReactSurfaceOptions = {
   createInvitationUrl: (invitationCode: string) => string;
 };
 
-const OMIT = [DataType.Collection.typename, DataType.QueryCollection.typename];
+export default Capability.makeModule(
+  Effect.fnUntraced(function* ({ createInvitationUrl }: ReactSurfaceOptions) {
+    return Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: 'collectionFallback',
+        position: 'last',
+        filter: AppSurface.object(AppSurface.Article, Collection.Collection),
+        component: ({ data }) => <CollectionArticle attendableId={data.attendableId} subject={data.subject} />,
+      }),
+      Surface.create({
+        id: 'recordArticle',
+        position: 'last',
+        filter: AppSurface.subject(AppSurface.Article, Obj.isObject),
+        component: ({ data }) => <RecordArticle subject={data.subject} />,
+      }),
+      Surface.create({
+        id: 'pluginSettings',
+        filter: AppSurface.settings(AppSurface.Article, meta.id),
+        component: () => {
+          const spaces = useSpaces();
+          const { invokePromise } = useOperationInvoker();
+          return (
+            <SpaceSettings
+              spaces={spaces}
+              onOpenSpaceSettings={(space: Space) => invokePromise(SpaceOperation.OpenSettings, { space })}
+            />
+          );
+        },
+      }),
+      Surface.create({
+        id: 'companion.objectProperties',
+        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: 'spaceSettingsProperties',
+        filter: AppSurface.literal(AppSurface.Article, `${meta.id}.general`),
+        component: ({ ref }) => {
+          const space = useActiveSpace();
+          if (!space) {
+            return null;
+          }
+
+          return <SpaceSettingsContainer space={space} />;
+        },
+      }),
+      Surface.create({
+        id: 'spaceSettingsMembers',
+        position: 'first',
+        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: 'spaceSettingsSchema',
+        filter: AppSurface.literal(AppSurface.Article, `${meta.id}.schema`),
+        component: () => {
+          const space = useActiveSpace();
+          if (!space) {
+            return null;
+          }
 
-export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
-  contributes(Capabilities.ReactSurface, [
-    createSurface({
-      id: `${SPACE_PLUGIN}/article`,
-      role: 'article',
-      filter: (data): data is { subject: Space } =>
-        // TODO(wittjosiah): Need to avoid shotgun parsing space state everywhere.
-        isSpace(data.subject) && data.subject.state.get() === SpaceState.SPACE_READY,
-      component: ({ data, role, ...rest }) => (
-        <Surface
-          data={{
-            id: data.subject.id,
-            subject: data.subject.properties[DataType.Collection.typename]?.target,
-          }}
-          role={role}
-          {...rest}
-        />
-      ),
-    }),
-    createSurface({
-      id: `${SPACE_PLUGIN}/record-article`,
-      role: 'article',
-      position: 'fallback',
-      filter: (data): data is { subject: Obj.Any } => Obj.isObject(data.subject),
-      component: ({ data }) => <RecordMain record={data.subject} />,
-    }),
-    createSurface({
-      id: `${SPACE_PLUGIN}/collection-fallback`,
-      role: 'article',
-      position: 'fallback',
-      filter: (data): data is { subject: DataType.Collection } => Obj.instanceOf(DataType.Collection, data.subject),
-      component: ({ data }) => <CollectionMain collection={data.subject} />,
-    }),
-    createSurface({
-      id: `${SPACE_PLUGIN}/plugin-settings`,
-      role: 'article',
-      filter: (data): data is { subject: SettingsStore<SpaceSettingsProps> } =>
-        data.subject instanceof SettingsStore && data.subject.prefix === SPACE_PLUGIN,
-      component: ({ data: { subject } }) => <SpacePluginSettings settings={subject.value} />,
-    }),
-    createSurface({
-      id: `${SPACE_PLUGIN}/companion/object-settings`,
-      role: 'article',
-      filter: (data): data is { companionTo: Obj.Any } => Obj.isObject(data.companionTo) && data.subject === 'settings',
-      component: ({ data, role }) => <ObjectSettingsContainer object={data.companionTo} role={role} />,
-    }),
-    createSurface({
-      id: `${SPACE_PLUGIN}/space-settings-properties`,
-      role: 'article',
-      filter: (data): data is { subject: string } => data.subject === `${SPACE_PLUGIN}/properties`,
-      component: () => {
-        const layout = useLayout();
-        const { spaceId } = parseId(layout.workspace);
-        const space = useSpace(spaceId);
-        if (!space || !spaceId) {
-          return null;
-        }
+          return <SchemaContainer space={space} />;
+        },
+      }),
+      Surface.create({
+        id: 'selectedObjects',
+        role: 'article',
+        filter: (data): data is { companionTo: Obj.Unknown; subject: 'selected-objects' } => {
+          if (data.subject !== 'selected-objects' || !Obj.isObject(data.companionTo)) {
+            return false;
+          }
 
-        return <SpaceSettingsContainer space={space} />;
-      },
-    }),
-    createSurface({
-      id: `${SPACE_PLUGIN}/space-settings-members`,
-      role: 'article',
-      position: 'hoist',
-      filter: (data): data is { subject: string } => data.subject === `${SPACE_PLUGIN}/members`,
-      component: () => {
-        const layout = useLayout();
-        const { spaceId } = parseId(layout.workspace);
-        const space = useSpace(spaceId);
-        if (!space || !spaceId) {
-          return null;
-        }
+          const type = Obj.getType(data.companionTo);
+          const path = type
+            ? Option.getOrElse(ViewAnnotation.get(Type.getSchema(type)), () => [] 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 type = Obj.getType(data.companionTo);
+          const path = type
+            ? Option.getOrElse(ViewAnnotation.get(Type.getSchema(type)), () => [] as readonly string[])
+            : [];
+          const view = path.length > 0 ? ViewAnnotation.tryGetTargetAlongPath(data.companionTo, path) : undefined;
+          if (!view) {
+            return null;
+          }
 
-        return <MembersContainer space={space} createInvitationUrl={createInvitationUrl} />;
-      },
-    }),
-    createSurface({
-      id: `${SPACE_PLUGIN}/space-settings-schema`,
-      role: 'article',
-      filter: (data): data is { subject: string } => data.subject === `${SPACE_PLUGIN}/schema`,
-      component: () => {
-        const layout = useLayout();
-        const { spaceId } = parseId(layout.workspace);
-        const space = useSpace(spaceId);
-        if (!space || !spaceId) {
-          return null;
-        }
+          return (
+            <ObjectCardStack
+              key={Obj.getURI(data.companionTo)}
+              objectId={Obj.getURI(data.companionTo)}
+              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: 'createInitialSpaceFormHue',
+        role: 'form-input',
+        filter: (data): data is { prop: string; schema: Schema.Schema<any>; fieldPropertyAst?: SchemaAST.AST } => {
+          const annotation = SchemaEx.findAnnotation<boolean>((data.schema as Schema.Schema.All).ast, HueAnnotationId);
+          return !!annotation;
+        },
+        component: ({ data, ...inputProps }) => {
+          const ast = data.fieldPropertyAst;
+          if (!ast) {
+            return null;
+          }
 
-        return <SchemaContainer space={space} />;
-      },
-    }),
-    createSurface({
-      id: `${SPACE_PLUGIN}/selected-objects`,
-      role: 'article',
-      filter: (data): data is { companionTo: DataType.View; subject: 'selected-objects' } =>
-        Obj.instanceOf(DataType.View, data.companionTo) && data.subject === 'selected-objects',
-      component: ({ data }) => (
-        <ObjectDetailsPanel
-          key={fullyQualifiedId(data.companionTo)}
-          objectId={fullyQualifiedId(data.companionTo)}
-          view={data.companionTo}
-        />
-      ),
-    }),
-    createSurface({
-      id: JOIN_DIALOG,
-      role: 'dialog',
-      filter: (data): data is { props: JoinPanelProps } => data.component === JOIN_DIALOG,
-      component: ({ data }) => <JoinDialog {...data.props} />,
-    }),
-    createSurface({
-      id: CREATE_SPACE_DIALOG,
-      role: 'dialog',
-      filter: (data): data is any => data.component === CREATE_SPACE_DIALOG,
-      component: () => <CreateSpaceDialog />,
-    }),
-    createSurface({
-      id: CREATE_OBJECT_DIALOG,
-      role: 'dialog',
-      filter: (data): data is { props: CreateObjectDialogProps } => data.component === CREATE_OBJECT_DIALOG,
-      component: ({ data }) => <CreateObjectDialog {...data.props} />,
-    }),
-    createSurface({
-      id: `${SPACE_PLUGIN}/create-initial-space-form-[hue]`,
-      role: 'form-input',
-      filter: (data): data is { prop: string; schema: Schema.Schema<any> } => {
-        const annotation = findAnnotation<boolean>((data.schema as Schema.Schema.All).ast, HueAnnotationId);
-        return !!annotation;
-      },
-      component: ({ data: _, ...inputProps }) => {
-        const { label, disabled, type, getValue, onValueChange } = inputProps as any as InputProps;
-        const handleChange = useCallback((nextHue: string) => onValueChange(type, nextHue), [onValueChange]);
-        const handleReset = useCallback(() => onValueChange(type, undefined), [onValueChange]);
-        return (
-          <Input.Root>
-            <Input.Label>{label}</Input.Label>
-            <HuePicker disabled={disabled} value={getValue() ?? ''} onChange={handleChange} onReset={handleReset} />
-          </Input.Root>
-        );
-      },
-    }),
-    createSurface({
-      id: `${SPACE_PLUGIN}/create-initial-space-form-[icon]`,
-      role: 'form-input',
-      filter: (data): data is { prop: string; schema: Schema.Schema<any> } => {
-        const annotation = findAnnotation<boolean>((data.schema as Schema.Schema.All).ast, IconAnnotationId);
-        return !!annotation;
-      },
-      component: ({ data: _, ...inputProps }) => {
-        const { label, disabled, type, getValue, onValueChange } = inputProps as any as InputProps;
-        const handleChange = useCallback((nextIcon: string) => onValueChange(type, nextIcon), [onValueChange]);
-        const handleReset = useCallback(() => onValueChange(type, undefined), [onValueChange]);
-        return (
-          <Input.Root>
-            <Input.Label>{label}</Input.Label>
-            <IconPicker disabled={disabled} value={getValue() ?? ''} onChange={handleChange} onReset={handleReset} />
-          </Input.Root>
-        );
-      },
-    }),
-    createSurface({
-      id: `${SPACE_PLUGIN}/typename-form-input`,
-      role: 'form-input',
-      filter: (
-        data,
-      ): data is { prop: string; schema: Schema.Schema<any>; target: Space | DataType.Collection | undefined } => {
-        if (data.prop !== 'typename') {
-          return false;
-        }
+          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: 'createInitialSpaceFormIcon',
+        role: 'form-input',
+        filter: (data): data is { prop: string; schema: Schema.Schema<any>; fieldPropertyAst?: SchemaAST.AST } => {
+          const annotation = SchemaEx.findAnnotation<boolean>((data.schema as Schema.Schema.All).ast, IconAnnotationId);
+          return !!annotation;
+        },
+        component: ({ data, ...inputProps }) => {
+          const ast = data.fieldPropertyAst;
+          if (!ast) {
+            return null;
+          }
 
-        const annotation = findAnnotation((data.schema as Schema.Schema.All).ast, TypenameAnnotationId);
-        return !!annotation;
-      },
-      component: ({ data: { schema, target }, ...inputProps }) => {
-        const { t } = useTranslation();
-        const client = useClient();
-        const props = inputProps as any as InputProps;
-        const space = isSpace(target) ? target : getSpace(target);
-        if (!space) {
-          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: 'typenameFormInput',
+        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<TypenameAnnotation[]>(schema.ast, TypenameAnnotationId)!;
+          const annotation = SchemaEx.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 schemaWhitelists = useCapabilities(ClientCapabilities.SchemaWhiteList);
-        const whitelistedTypenames = useMemo(
-          () => new Set(schemaWhitelists.flatMap((typeArray) => typeArray.map((type) => Type.getTypename(type)))),
-          [schemaWhitelists],
-        );
+          const props = { ...inputProps, type: ast } as any as FormFieldComponentProps;
+          const db = Database.isDatabase(target) ? target : target && Obj.getDatabase(target);
+          const annotation = SchemaEx.findAnnotation<TypeInputOptions>(schema.ast, TypeInputOptionsAnnotationId)!;
+          const options = useTypeOptions({ db, annotation });
 
-        const objectForms = useCapabilities(SpaceCapabilities.ObjectForm);
-        const objectFormTypenames = useMemo(
-          () =>
-            new Set(
-              objectForms
-                .map((form) => Type.getTypename(form.objectSchema))
-                // TODO(wittjosiah): Remove.
-                .filter((typename) => !OMIT.includes(typename) && !typename.endsWith('View')),
-            ),
-          [objectForms],
-        );
+          return <SelectField {...props} options={options} />;
+        },
+      }),
+      Surface.create({
+        id: 'objectProperties',
+        role: 'object-properties',
+        filter: (data): data is { subject: Obj.Unknown } => {
+          if (!Obj.isObject(data.subject)) {
+            return false;
+          }
 
-        const fixed = client.graph.schemaRegistry.schemas.filter((schema) => {
-          const limitedStatic =
-            annotation.includes('limited-static') && whitelistedTypenames.has(Type.getTypename(schema));
-          const unusedStatic =
-            annotation.includes('unused-static') &&
-            whitelistedTypenames.has(Type.getTypename(schema)) &&
-            !space.properties.staticRecords?.includes(Type.getTypename(schema));
-          const usedStatic =
-            annotation.includes('used-static') &&
-            whitelistedTypenames.has(Type.getTypename(schema)) &&
-            space.properties.staticRecords?.includes(Type.getTypename(schema));
-          const objectForm = annotation.includes('object-form') && objectFormTypenames.has(Type.getTypename(schema));
-          return annotation.includes('static') || limitedStatic || unusedStatic || usedStatic || objectForm;
-        });
-        const dynamic = space?.db.schemaRegistry.query().runSync();
-        const typenames = Array.from(
-          new Set<string>([
-            ...(annotation.includes('limited-static') ||
-            annotation.includes('unused-static') ||
-            annotation.includes('used-static') ||
-            annotation.includes('static') ||
-            annotation.includes('object-form')
-              ? fixed.map((schema) => Type.getTypename(schema))
-              : []),
-            ...(annotation.includes('dynamic') ? dynamic.map((schema) => schema.typename) : []),
-          ]),
-        ).sort();
+          const type = Obj.getType(data.subject);
+          const path = type
+            ? Option.getOrElse(ViewAnnotation.get(Type.getSchema(type)), () => [] as readonly string[])
+            : [];
+          const viewTarget = path.length > 0 ? ViewAnnotation.tryGetTargetAlongPath(data.subject, path) : undefined;
+          return !!viewTarget;
+        },
+        component: ({ data }) => {
+          const type = Obj.getType(data.subject);
+          const path = type
+            ? Option.getOrElse(ViewAnnotation.get(Type.getSchema(type)), () => [] as readonly string[])
+            : [];
+          const view = path.length > 0 ? ViewAnnotation.tryGetTargetAlongPath(data.subject, path) : undefined;
 
-        const options = useMemo(
-          () =>
-            typenames
-              .map((typename) => ({
-                value: typename,
-                label: t('typename label', { ns: typename, defaultValue: typename }),
-              }))
-              .toSorted((a, b) => a.label.localeCompare(b.label)),
-          [t, typenames],
-        );
+          if (!view) {
+            return null;
+          }
 
-        return <SelectInput {...props} options={options} />;
-      },
-    }),
-    createSurface({
-      id: `${SPACE_PLUGIN}/object-settings`,
-      role: 'object-settings',
-      filter: (data): data is { subject: DataType.View } => Obj.instanceOf(DataType.View, data.subject),
-      component: ({ data }) => <ViewEditor view={data.subject} />,
-    }),
-    createSurface({
-      id: POPOVER_RENAME_SPACE,
-      role: 'card--popover',
-      filter: (data): data is { props: Space } => data.component === POPOVER_RENAME_SPACE && isSpace(data.props),
-      component: ({ data }) => <PopoverRenameSpace space={data.props} />,
-    }),
-    createSurface({
-      id: POPOVER_RENAME_OBJECT,
-      role: 'card--popover',
-      filter: (data): data is { props: Obj.Any } =>
-        data.component === POPOVER_RENAME_OBJECT && isLiveObject(data.props),
-      component: ({ data }) => <PopoverRenameObject object={data.props} />,
-    }),
-    createSurface({
-      id: `${SPACE_PLUGIN}/menu-footer`,
-      role: 'menu-footer',
-      filter: (data): data is { subject: Obj.Any } => Obj.isObject(data.subject),
-      component: ({ data }) => <MenuFooter object={data.subject} />,
-    }),
-    createSurface({
-      id: `${SPACE_PLUGIN}/navtree-presence`,
-      role: 'navtree-item-end',
-      filter: (data): data is { id: string; subject: Obj.Any; open?: boolean } =>
-        typeof data.id === 'string' && Obj.isObject(data.subject),
-      component: ({ data }) => {
-        // TODO(wittjosiah): Doesn't need to be mutable but readonly type messes with ComplexMap.
-        const state = useCapability(SpaceCapabilities.MutableState);
-        return <SmallPresenceLive id={data.id} open={data.open} viewers={state.viewersByObject[data.id]} />;
-      },
-    }),
-    // TODO(wittjosiah): Attention glyph for non-echo items should be handled elsewhere.
-    createSurface({
-      id: `${SPACE_PLUGIN}/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?
-    createSurface({
-      id: `${SPACE_PLUGIN}/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} />,
-    }),
-    createSurface({
-      id: `${SPACE_PLUGIN}/navbar-presence`,
-      role: 'navbar-end',
-      position: 'hoist',
-      filter: (data): data is { subject: Space | Obj.Any } => 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[DataType.Collection.typename]?.target as DataType.Collection)
-            : undefined
-          : data.subject;
+          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: ENTITY_RENAME_POPOVER,
+        role: 'popover',
+        filter: (data): data is { props: Entity.Unknown } =>
+          data.component === ENTITY_RENAME_POPOVER && Entity.isEntity(data.props),
+        component: ({ data }) => <EntityRenamePopover entity={data.props} />,
+      }),
+      Surface.create({
+        id: 'menuFooter',
+        filter: AppSurface.subject(AppSurface.MenuFooter, Obj.isObject),
+        component: ({ data }) => <MenuFooter object={data.subject} />,
+      }),
+      Surface.create({
+        id: 'navtreePresence',
+        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: 'navtreePresenceFallback',
+        role: 'navtree-item-end',
+        position: 'last',
+        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: 'navtreeSyncStatus',
+        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: 'navbarPresence',
+        role: 'navbar-end',
+        position: 'first',
+        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 && Annotation.get(space.properties, RootCollectionAnnotation).pipe(Option.getOrUndefined)?.target
+              : undefined
+            : data.subject;
 
-        return object ? <SpacePresence object={object} /> : null;
-      },
-    }),
-    createSurface({
-      id: `${SPACE_PLUGIN}/collection-section`,
-      role: 'section',
-      filter: (data): data is { subject: DataType.Collection } => Obj.instanceOf(DataType.Collection, data.subject),
-      component: ({ data }) => <CollectionSection collection={data.subject} />,
-    }),
-    createSurface({
-      id: `${SPACE_PLUGIN}/status`,
-      role: 'status',
-      component: () => <SyncStatus />,
-    }),
-  ]);
+          return object ? <SpacePresence object={object} /> : null;
+        },
+      }),
+      Surface.create({
+        id: 'collectionSection',
+        filter: AppSurface.object(AppSurface.Section, Collection.Collection),
+        component: ({ data }) => <CollectionSection subject={data.subject} />,
+      }),
+      Surface.create({
+        id: 'syncStatus',
+        role: 'status-indicator',
+        component: () => <SyncStatus />,
+      }),
+    ]);
+  }),
+);