@dxos/plugin-space 0.8.4-main.2e9d522 → 0.8.4-main.3c1ae3b

package/src/capabilities/react-surface.tsx

@@ -2,80 +2,70 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Schema } from 'effect';
-import React, { useCallback, useMemo } from 'react';
+import * as Option from 'effect/Option';
+import type * as Schema from 'effect/Schema';
+import React, { useCallback } from 'react';
 
-import {
-  Capabilities,
-  contributes,
-  createSurface,
-  Surface,
-  useCapabilities,
-  useCapability,
-  useLayout,
-} from '@dxos/app-framework';
-import { Obj, Type } from '@dxos/echo';
+import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
+import { Surface, useCapability, useLayout } from '@dxos/app-framework/react';
+import { Obj, type Ref } 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 {
-  fullyQualifiedId,
-  getSpace,
-  isLiveObject,
-  isSpace,
-  parseId,
-  SpaceState,
-  useSpace,
-  type Space,
-} from '@dxos/react-client/echo';
-import { Input, useTranslation } from '@dxos/react-ui';
-import { type InputProps, SelectInput } from '@dxos/react-ui-form';
+import { type Space, SpaceState, getSpace, isLiveObject, isSpace, parseId, useSpace } 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 { Collection, type View, ViewAnnotation } from '@dxos/schema';
 import { type JoinPanelProps } from '@dxos/shell/react';
 
-import { SpaceCapabilities } from './capabilities';
 import {
-  CollectionMain,
-  CollectionSection,
   CREATE_OBJECT_DIALOG,
   CREATE_SPACE_DIALOG,
+  CollectionArticle,
+  CollectionSection,
   CreateObjectDialog,
+  type CreateObjectDialogProps,
   CreateSpaceDialog,
   InlineSyncStatus,
   JOIN_DIALOG,
   JoinDialog,
   MembersContainer,
   MenuFooter,
-  ObjectDetailsPanel,
-  ObjectSettingsContainer,
-  POPOVER_RENAME_OBJECT,
-  POPOVER_RENAME_SPACE,
-  PopoverRenameObject,
-  PopoverRenameSpace,
+  OBJECT_RENAME_POPOVER,
+  ObjectCardStack,
+  ObjectDetails,
+  ObjectRenamePopover,
+  RecordArticle,
+  SPACE_RENAME_POPOVER,
   SchemaContainer,
   SmallPresenceLive,
   SpacePluginSettings,
   SpacePresence,
+  SpaceRenamePopover,
   SpaceSettingsContainer,
   SyncStatus,
   ViewEditor,
-  type CreateObjectDialogProps,
 } from '../components';
-import { SPACE_PLUGIN } from '../meta';
-import { HueAnnotationId, IconAnnotationId, type SpaceSettingsProps } from '../types';
+import { useTypeOptions } from '../hooks';
+import { meta } from '../meta';
+import {
+  HueAnnotationId,
+  IconAnnotationId,
+  type SpaceSettingsProps,
+  type TypeInputOptions,
+  TypeInputOptionsAnnotationId,
+} from '../types';
+
+import { SpaceCapabilities } from './capabilities';
 
 type ReactSurfaceOptions = {
   createInvitationUrl: (invitationCode: string) => string;
 };
 
-const OMIT = [DataType.Collection.typename, DataType.QueryCollection.typename];
-
 export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
   contributes(Capabilities.ReactSurface, [
     createSurface({
-      id: `${SPACE_PLUGIN}/article`,
+      id: `${meta.id}/article`,
       role: 'article',
       filter: (data): data is { subject: Space } =>
         // TODO(wittjosiah): Need to avoid shotgun parsing space state everywhere.
@@ -84,7 +74,7 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
         <Surface
           data={{
             id: data.subject.id,
-            subject: data.subject.properties[DataType.Collection.typename]?.target,
+            subject: data.subject.properties[Collection.Collection.typename]?.target,
           }}
           role={role}
           {...rest}
@@ -92,30 +82,37 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
       ),
     }),
     createSurface({
-      id: `${SPACE_PLUGIN}/collection-fallback`,
+      id: `${meta.id}/record-article`,
       role: 'article',
       position: 'fallback',
-      filter: (data): data is { subject: DataType.Collection } => Obj.instanceOf(DataType.Collection, data.subject),
-      component: ({ data }) => <CollectionMain collection={data.subject} />,
+      filter: (data): data is { subject: Obj.Any } => Obj.isObject(data.subject),
+      component: ({ data }) => <RecordArticle subject={data.subject} />,
+    }),
+    createSurface({
+      id: `${meta.id}/collection-fallback`,
+      role: 'article',
+      position: 'fallback',
+      filter: (data): data is { subject: Collection.Collection } => Obj.instanceOf(Collection.Collection, data.subject),
+      component: ({ data }) => <CollectionArticle subject={data.subject} />,
     }),
     createSurface({
-      id: `${SPACE_PLUGIN}/plugin-settings`,
+      id: `${meta.id}/plugin-settings`,
       role: 'article',
       filter: (data): data is { subject: SettingsStore<SpaceSettingsProps> } =>
-        data.subject instanceof SettingsStore && data.subject.prefix === SPACE_PLUGIN,
+        data.subject instanceof SettingsStore && data.subject.prefix === meta.id,
       component: ({ data: { subject } }) => <SpacePluginSettings settings={subject.value} />,
     }),
     createSurface({
-      id: `${SPACE_PLUGIN}/companion/object-settings`,
+      id: `${meta.id}/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} />,
+      component: ({ ref, data, role }) => <ObjectDetails object={data.companionTo} role={role} ref={ref} />,
     }),
     createSurface({
-      id: `${SPACE_PLUGIN}/space-settings-properties`,
+      id: `${meta.id}/space-settings-properties`,
       role: 'article',
-      filter: (data): data is { subject: string } => data.subject === `${SPACE_PLUGIN}/properties`,
-      component: () => {
+      filter: (data): data is { subject: string } => data.subject === `${meta.id}/properties`,
+      component: ({ ref }) => {
         const layout = useLayout();
         const { spaceId } = parseId(layout.workspace);
         const space = useSpace(spaceId);
@@ -123,14 +120,14 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
           return null;
         }
 
-        return <SpaceSettingsContainer space={space} />;
+        return <SpaceSettingsContainer space={space} ref={ref} />;
       },
     }),
     createSurface({
-      id: `${SPACE_PLUGIN}/space-settings-members`,
+      id: `${meta.id}/space-settings-members`,
       role: 'article',
       position: 'hoist',
-      filter: (data): data is { subject: string } => data.subject === `${SPACE_PLUGIN}/members`,
+      filter: (data): data is { subject: string } => data.subject === `${meta.id}/members`,
       component: () => {
         const layout = useLayout();
         const { spaceId } = parseId(layout.workspace);
@@ -143,9 +140,9 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
       },
     }),
     createSurface({
-      id: `${SPACE_PLUGIN}/space-settings-schema`,
+      id: `${meta.id}/space-settings-schema`,
       role: 'article',
-      filter: (data): data is { subject: string } => data.subject === `${SPACE_PLUGIN}/schema`,
+      filter: (data): data is { subject: string } => data.subject === `${meta.id}/schema`,
       component: () => {
         const layout = useLayout();
         const { spaceId } = parseId(layout.workspace);
@@ -158,15 +155,26 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
       },
     }),
     createSurface({
-      id: `${SPACE_PLUGIN}/selected-objects`,
+      id: `${meta.id}/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}
+      filter: (data): data is { companionTo: Obj.Obj<{ view: Ref.Ref<View.View> }>; subject: 'selected-objects' } => {
+        if (data.subject !== 'selected-objects' || !Obj.isObject(data.companionTo)) {
+          return false;
+        }
+
+        // TODO(burdon): Check companionTo.view.target is valid.
+        const schema = Obj.getSchema(data.companionTo);
+        return Option.fromNullable(schema).pipe(
+          Option.flatMap((schema) => ViewAnnotation.get(schema)),
+          Option.getOrElse(() => false),
+        );
+      },
+      component: ({ data, ref }) => (
+        <ObjectCardStack
+          key={Obj.getDXN(data.companionTo).toString()}
+          objectId={Obj.getDXN(data.companionTo).toString()}
+          view={data.companionTo.view.target!}
+          ref={ref}
         />
       ),
     }),
@@ -189,149 +197,113 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
       component: ({ data }) => <CreateObjectDialog {...data.props} />,
     }),
     createSurface({
-      id: `${SPACE_PLUGIN}/create-initial-space-form-[hue]`,
+      id: `${meta.id}/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 { label, readonly, type, getValue, onValueChange } = inputProps as any as FormFieldComponentProps;
         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} />
+            <HuePicker disabled={!!readonly} value={getValue() ?? ''} onChange={handleChange} onReset={handleReset} />
           </Input.Root>
         );
       },
     }),
     createSurface({
-      id: `${SPACE_PLUGIN}/create-initial-space-form-[icon]`,
+      id: `${meta.id}/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 { label, readonly, type, getValue, onValueChange } = inputProps as any as FormFieldComponentProps;
         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} />
+            <IconPicker disabled={!!readonly} value={getValue() ?? ''} onChange={handleChange} onReset={handleReset} />
           </Input.Root>
         );
       },
     }),
     createSurface({
-      id: `${SPACE_PLUGIN}/typename-form-input`,
+      id: `${meta.id}/typename-form-input`,
       role: 'form-input',
       filter: (
         data,
-      ): data is { prop: string; schema: Schema.Schema<any>; target: Space | DataType.Collection | undefined } => {
+      ): data is {
+        prop: string;
+        schema: Schema.Schema.Any;
+        target: Space | Collection.Collection | undefined;
+      } => {
         if (data.prop !== 'typename') {
           return false;
         }
 
-        const annotation = findAnnotation((data.schema as Schema.Schema.All).ast, TypenameAnnotationId);
+        const annotation = findAnnotation((data.schema as Schema.Schema.All).ast, TypeInputOptionsAnnotationId);
         return !!annotation;
       },
       component: ({ data: { schema, target }, ...inputProps }) => {
-        const { t } = useTranslation();
-        const client = useClient();
-        const props = inputProps as any as InputProps;
+        const props = inputProps as any as FormFieldComponentProps;
         const space = isSpace(target) ? target : getSpace(target);
-        if (!space) {
-          return null;
-        }
-
-        const annotation = findAnnotation<TypenameAnnotation[]>(schema.ast, TypenameAnnotationId)!;
-
-        const schemaWhitelists = useCapabilities(ClientCapabilities.SchemaWhiteList);
-        const whitelistedTypenames = useMemo(
-          () => new Set(schemaWhitelists.flatMap((typeArray) => typeArray.map((type) => Type.getTypename(type)))),
-          [schemaWhitelists],
-        );
-
-        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],
-        );
-
-        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 objectForm = annotation.includes('object-form') && objectFormTypenames.has(Type.getTypename(schema));
-          return annotation.includes('static') || limitedStatic || unusedStatic || 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('static') ||
-            annotation.includes('object-form')
-              ? fixed.map((schema) => Type.getTypename(schema))
-              : []),
-            ...(annotation.includes('dynamic') ? dynamic.map((schema) => schema.typename) : []),
-          ]),
-        ).sort();
-
-        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],
-        );
+        const annotation = findAnnotation<TypeInputOptions>(schema.ast, TypeInputOptionsAnnotationId)!;
+        const options = useTypeOptions({ space, annotation });
 
-        return <SelectInput {...props} options={options} />;
+        return <SelectField {...props} options={options} />;
       },
     }),
     createSurface({
-      id: `${SPACE_PLUGIN}/object-settings`,
+      id: `${meta.id}/object-settings`,
       role: 'object-settings',
-      filter: (data): data is { subject: DataType.View } => Obj.instanceOf(DataType.View, data.subject),
-      component: ({ data }) => <ViewEditor view={data.subject} />,
+      filter: (data): data is { subject: { view: Ref.Ref<View.View> } } => {
+        if (!Obj.isObject(data.subject)) {
+          return false;
+        }
+
+        const schema = Obj.getSchema(data.subject);
+        return Option.fromNullable(schema).pipe(
+          Option.flatMap((schema) => ViewAnnotation.get(schema)),
+          Option.getOrElse(() => false),
+        );
+      },
+      component: ({ data }) => {
+        const view = data.subject.view.target;
+        if (!view) {
+          return null;
+        }
+
+        return <ViewEditor view={view} />;
+      },
     }),
     createSurface({
-      id: POPOVER_RENAME_SPACE,
+      id: SPACE_RENAME_POPOVER,
       role: 'card--popover',
-      filter: (data): data is { props: Space } => data.component === POPOVER_RENAME_SPACE && isSpace(data.props),
-      component: ({ data }) => <PopoverRenameSpace space={data.props} />,
+      filter: (data): data is { props: Space } => data.component === SPACE_RENAME_POPOVER && isSpace(data.props),
+      component: ({ data }) => <SpaceRenamePopover space={data.props} />,
     }),
     createSurface({
-      id: POPOVER_RENAME_OBJECT,
+      id: OBJECT_RENAME_POPOVER,
       role: 'card--popover',
       filter: (data): data is { props: Obj.Any } =>
-        data.component === POPOVER_RENAME_OBJECT && isLiveObject(data.props),
-      component: ({ data }) => <PopoverRenameObject object={data.props} />,
+        data.component === OBJECT_RENAME_POPOVER && isLiveObject(data.props),
+      component: ({ data }) => <ObjectRenamePopover object={data.props} />,
     }),
     createSurface({
-      id: `${SPACE_PLUGIN}/menu-footer`,
+      id: `${meta.id}/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`,
+      id: `${meta.id}/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),
@@ -343,7 +315,7 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
     }),
     // TODO(wittjosiah): Attention glyph for non-echo items should be handled elsewhere.
     createSurface({
-      id: `${SPACE_PLUGIN}/navtree-presence-fallback`,
+      id: `${meta.id}/navtree-presence-fallback`,
       role: 'navtree-item-end',
       position: 'fallback',
       filter: (data): data is { id: string; open?: boolean } => typeof data.id === 'string',
@@ -351,13 +323,13 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
     }),
     // TODO(wittjosiah): Broken?
     createSurface({
-      id: `${SPACE_PLUGIN}/navtree-sync-status`,
+      id: `${meta.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} />,
     }),
     createSurface({
-      id: `${SPACE_PLUGIN}/navbar-presence`,
+      id: `${meta.id}/navbar-presence`,
       role: 'navbar-end',
       position: 'hoist',
       filter: (data): data is { subject: Space | Obj.Any } => isSpace(data.subject) || Obj.isObject(data.subject),
@@ -365,7 +337,7 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
         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)
+            ? (space?.properties[Collection.Collection.typename]?.target as Collection.Collection)
             : undefined
           : data.subject;
 
@@ -373,13 +345,13 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
       },
     }),
     createSurface({
-      id: `${SPACE_PLUGIN}/collection-section`,
+      id: `${meta.id}/collection-section`,
       role: 'section',
-      filter: (data): data is { subject: DataType.Collection } => Obj.instanceOf(DataType.Collection, data.subject),
-      component: ({ data }) => <CollectionSection collection={data.subject} />,
+      filter: (data): data is { subject: Collection.Collection } => Obj.instanceOf(Collection.Collection, data.subject),
+      component: ({ data }) => <CollectionSection subject={data.subject} />,
     }),
     createSurface({
-      id: `${SPACE_PLUGIN}/status`,
+      id: `${meta.id}/status`,
       role: 'status',
       component: () => <SyncStatus />,
     }),

package/src/capabilities/repair.ts

@@ -0,0 +1,57 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { contributes } from '@dxos/app-framework';
+import { Obj, Ref, Type } from '@dxos/echo';
+import { type Space } from '@dxos/react-client/echo';
+import { Collection } from '@dxos/schema';
+
+import { SpaceCapabilities } from './capabilities';
+
+export default () =>
+  contributes(SpaceCapabilities.Repair, async ({ space }) => {
+    await removeQueryCollections(space);
+    await ensureSystemCollection(space);
+  });
+
+/**
+ * Remove all existing query collections from the root collection.
+ */
+const removeQueryCollections = async (space: Space) => {
+  const rootCollection: Collection.Collection = await space.properties[Collection.Collection.typename]?.load();
+  if (!rootCollection) {
+    return;
+  }
+
+  const objects = await Promise.all(rootCollection.objects.map((ref) => ref.load()));
+  const queryCollections = objects.filter((object) => Obj.getTypename(object) === 'dxos.org/type/QueryCollection');
+  if (queryCollections.length === 0) {
+    return;
+  }
+
+  rootCollection.objects = objects
+    .filter((object) => Obj.getTypename(object) !== 'dxos.org/type/QueryCollection')
+    .map((object) => Ref.make(object));
+  queryCollections.forEach((object) => space.db.remove(object));
+};
+
+/**
+ * Ensure the root collection has a system collection for StoredSchema.
+ */
+const ensureSystemCollection = async (space: Space) => {
+  const rootCollection: Collection.Collection = await space.properties[Collection.Collection.typename]?.load();
+  if (!rootCollection) {
+    return;
+  }
+
+  const objects = await Promise.all(rootCollection.objects.map((ref) => ref.load()));
+  const records = objects.find(
+    (object) => Obj.instanceOf(Collection.Managed, object) && object.key === Type.getTypename(Type.PersistentType),
+  );
+  if (records) {
+    return;
+  }
+
+  rootCollection.objects.push(Ref.make(Collection.makeManaged({ key: Type.getTypename(Type.PersistentType) })));
+};

package/src/capabilities/spaces-ready.ts

@@ -2,9 +2,9 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Option } from 'effect';
+import * as Option from 'effect/Option';
 
-import { contributes, createIntent, Capabilities, LayoutAction, type PluginContext } from '@dxos/app-framework';
+import { Capabilities, LayoutAction, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
 import { SubscriptionList } from '@dxos/async';
 import { Filter, Obj, Type } from '@dxos/echo';
 import { scheduledEffect } from '@dxos/echo-signals/core';
@@ -14,16 +14,20 @@ import { ClientCapabilities } from '@dxos/plugin-client';
 import { DeckCapabilities } from '@dxos/plugin-deck';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
 import { PublicKey } from '@dxos/react-client';
-import { FQ_ID_LENGTH, parseFullyQualifiedId, SpaceState } from '@dxos/react-client/echo';
+import { SpaceState, parseId } from '@dxos/react-client/echo';
 import { ComplexMap, reduceGroupBy } from '@dxos/util';
 
-import { SpaceCapabilities } from './capabilities';
 import { SpaceAction } from '../types';
 import { COMPOSER_SPACE_LOCK, SHARED } from '../util';
 
+import { SpaceCapabilities } from './capabilities';
+
 const ACTIVE_NODE_BROADCAST_INTERVAL = 30_000;
 const WAIT_FOR_OBJECT_TIMEOUT = 5_000;
 
+// E.g., dxn:echo:BA25QRC2FEWCSAMRP4RZL65LWJ7352CKE:01J00J9B45YHYSGZQTQMSKMGJ6
+const ECHO_DXN_LENGTH = 3 + 1 + 4 + 1 + 33 + 1 + 26;
+
 export default async (context: PluginContext) => {
   const subscriptions = new SubscriptionList();
   const spaceSubscriptions = new SubscriptionList();
@@ -40,7 +44,12 @@ export default async (context: PluginContext) => {
   await defaultSpace.waitUntilReady();
 
   if (deck?.activeDeck === 'default') {
-    await dispatch(createIntent(LayoutAction.SwitchWorkspace, { part: 'workspace', subject: defaultSpace.id }));
+    await dispatch(
+      createIntent(LayoutAction.SwitchWorkspace, {
+        part: 'workspace',
+        subject: defaultSpace.id,
+      }),
+    );
   }
 
   // Initialize space sharing lock in default space.
@@ -48,9 +57,7 @@ export default async (context: PluginContext) => {
     defaultSpace.properties[COMPOSER_SPACE_LOCK] = true;
   }
 
-  const {
-    objects: [spacesOrder],
-  } = await defaultSpace.db.query(Filter.type(Type.Expando, { key: SHARED })).run();
+  const [spacesOrder] = await defaultSpace.db.query(Filter.type(Type.Expando, { key: SHARED })).run();
   if (!spacesOrder) {
     // TODO(wittjosiah): Cannot be a Folder because Spaces are not TypedObjects so can't be saved in the database.
     //  Instead, we store order as an array of space ids.
@@ -66,12 +73,14 @@ export default async (context: PluginContext) => {
           return;
         }
 
-        const node = graph.getNode(active[0]).pipe(Option.getOrNull);
-        if (!node && active[0].length === FQ_ID_LENGTH) {
+        const id = active[0];
+        const node = graph.getNode(id).pipe(Option.getOrNull);
+        if (!node && id.length === ECHO_DXN_LENGTH) {
+          void graph.initialize(id);
           const timeout = setTimeout(async () => {
-            const node = graph.getNode(active[0]).pipe(Option.getOrNull);
+            const node = graph.getNode(id).pipe(Option.getOrNull);
             if (!node) {
-              await dispatch(createIntent(SpaceAction.WaitForObject, { id: active[0] }));
+              await dispatch(createIntent(SpaceAction.WaitForObject, { id }));
             }
           }, WAIT_FOR_OBJECT_TIMEOUT);
 
@@ -95,7 +104,13 @@ export default async (context: PluginContext) => {
           subscriptions.add(
             scheduledEffect(
               () => ({ name: space.properties.name }),
-              ({ name }) => (state.spaceNames[space.id] = name),
+              ({ name }) => {
+                if (!name) {
+                  delete state.spaceNames[space.id];
+                } else {
+                  state.spaceNames[space.id] = name;
+                }
+              },
             ),
           );
         });
@@ -105,7 +120,11 @@ export default async (context: PluginContext) => {
   // Broadcast active node to other peers in the space.
   subscriptions.add(
     scheduledEffect(
-      () => ({ current: attention.current, active: layout.active, inactive: layout.inactive }),
+      () => ({
+        current: attention.current,
+        active: layout.active,
+        inactive: layout.inactive,
+      }),
       ({ current, active, inactive }) => {
         const send = () => {
           const spaces = client.spaces.get();
@@ -114,7 +133,7 @@ export default async (context: PluginContext) => {
             // Group parts by space for efficient messaging.
             const idsBySpace = reduceGroupBy(active, (id) => {
               try {
-                const [spaceId] = parseFullyQualifiedId(id);
+                const { spaceId } = parseId(id);
                 return spaceId;
               } catch {
                 return null;
@@ -123,7 +142,7 @@ export default async (context: PluginContext) => {
 
             const removedBySpace = reduceGroupBy(inactive, (id) => {
               try {
-                const [spaceId] = parseFullyQualifiedId(id);
+                const { spaceId } = parseId(id);
                 return spaceId;
               } catch {
                 return null;
@@ -153,7 +172,9 @@ export default async (context: PluginContext) => {
                 })
                 // TODO(burdon): This seems defensive; why would this fail? Backoff interval.
                 .catch((err) => {
-                  log.warn('Failed to broadcast active node for presence.', { err: err.message });
+                  log.warn('Failed to broadcast active node for presence.', {
+                    err: err.message,
+                  });
                 });
             }
           }