@dxos/plugin-space 0.8.4-main.422d1c7879 → 0.8.4-main.4668b7de9b

package/src/containers/SpaceSettingsContainer/SpaceSettingsContainer.tsx

@@ -13,17 +13,7 @@ import { log } from '@dxos/log';
 import { SpaceArchive } from '@dxos/protocols/proto/dxos/client/services';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
 import { useClient } from '@dxos/react-client';
-import { SpaceState } from '@dxos/react-client/echo';
-import {
-  Button,
-  DropdownMenu,
-  Icon,
-  IconButton,
-  Input,
-  useFileDownload,
-  useMulticastObservable,
-  useTranslation,
-} from '@dxos/react-ui';
+import { Button, Dialog, DropdownMenu, Icon, IconButton, Input, useTranslation } from '@dxos/react-ui';
 import { Form, type FormFieldMap, Settings } from '@dxos/react-ui-form';
 import { HuePicker, IconPicker } from '@dxos/react-ui-pickers';
 
@@ -31,20 +21,13 @@ import { meta } from '#meta';
 import { SpaceOperation } from '#operations';
 import { SpaceCapabilities, SpaceForm } from '#types';
 
-const SpaceFormSchema = SpaceForm.pipe(
-  Schema.extend(
-    Schema.Struct({
-      archived: Schema.Boolean.annotations({ title: 'Archive Space' }),
-    }),
-  ),
-);
+const SpaceFormSchema = SpaceForm;
 
 // TODO(wittjosiah): Handle space migrations here?
 export const SpaceSettingsContainer = ({ space }: AppSurface.SpaceArticleProps) => {
   const { t } = useTranslation(meta.id);
   const { invokePromise } = useOperationInvoker();
   const client = useClient();
-  const archived = useMulticastObservable(space.state) === SpaceState.SPACE_INACTIVE;
   const [edgeReplication, setEdgeReplication] = useState(
     space.internal.data.edgeReplication === EdgeReplicationSetting.ENABLED,
   );
@@ -69,7 +52,7 @@ export const SpaceSettingsContainer = ({ space }: AppSurface.SpaceArticleProps)
       }
 
       if (changed['name'] || changed['icon'] || changed['hue']) {
-        Obj.change(space.properties, (obj) => {
+        Obj.update(space.properties, (obj) => {
           if (changed['name'] && newValues.name !== undefined) {
             obj.name = newValues.name;
           }
@@ -81,22 +64,8 @@ export const SpaceSettingsContainer = ({ space }: AppSurface.SpaceArticleProps)
           }
         });
       }
-
-      if (changed['archived']) {
-        if (newValues.archived && !archived) {
-          void invokePromise(SpaceOperation.Close, { space });
-          const personalSpace = getPersonalSpace(client);
-          if (personalSpace) {
-            void invokePromise(LayoutOperation.SwitchWorkspace, {
-              subject: getSpacePath(personalSpace.id),
-            });
-          }
-        } else if (!newValues.archived && archived) {
-          void invokePromise(SpaceOperation.Open, { space });
-        }
-      }
     },
-    [space, client, archived, invokePromise, toggleEdgeReplication],
+    [space, toggleEdgeReplication],
   );
 
   const defaultValues = useMemo(
@@ -105,9 +74,8 @@ export const SpaceSettingsContainer = ({ space }: AppSurface.SpaceArticleProps)
       icon: space.properties.icon,
       hue: space.properties.hue,
       edgeReplication,
-      archived,
     }),
-    [space.properties.name, space.properties.icon, space.properties.hue, edgeReplication, archived],
+    [space.properties.name, space.properties.icon, space.properties.hue, edgeReplication],
   );
 
   const personal = isPersonalSpace(space);
@@ -165,37 +133,43 @@ export const SpaceSettingsContainer = ({ space }: AppSurface.SpaceArticleProps)
           </Settings.Item>
         );
       },
-      archived: personal
-        ? () => null
-        : ({ type, label, getValue, onValueChange }) => {
-            const handleChange = useCallback(() => onValueChange(type, !getValue()), [onValueChange, type, getValue]);
-            return (
-              <Settings.Item title={label} description={t('archive-space.description')}>
-                <Button variant={getValue() ? 'default' : 'destructive'} onClick={handleChange}>
-                  {getValue() ? t('unarchive-space.label') : t('archive-space.label')}
-                </Button>
-              </Settings.Item>
-            );
-          },
     }),
     [t, space, personal],
   );
 
-  const download = useFileDownload();
   const handleBackupBinary = useCallback(async () => {
-    const archive = await space.internal.export({ format: SpaceArchive.Format.BINARY });
-    download(new Blob([archive.contents as Uint8Array<ArrayBuffer>]), archive.filename);
-  }, [space, download]);
+    await invokePromise(SpaceOperation.ExportSpace, { space, format: SpaceArchive.Format.BINARY });
+  }, [space, invokePromise]);
   const handleBackupJson = useCallback(async () => {
-    const archive = await space.internal.export({ format: SpaceArchive.Format.JSON });
-    download(new Blob([archive.contents as Uint8Array<ArrayBuffer>]), archive.filename);
-  }, [space, download]);
+    await invokePromise(SpaceOperation.ExportSpace, { space, format: SpaceArchive.Format.JSON });
+  }, [space, invokePromise]);
 
   const repairs = useCapabilities(SpaceCapabilities.Repair);
   const handleRepair = useCallback(async () => {
     await Promise.all(repairs.map((repair) => repair({ space, isDefault: isPersonalSpace(space) })));
   }, [space, repairs]);
 
+  const [deleteConfirmOpen, setDeleteConfirmOpen] = useState(false);
+  // Wired to an onClick handler: must resolve (never reject) so it can't trigger an unhandled rejection.
+  const handleDelete = useCallback(async () => {
+    try {
+      await invokePromise(SpaceOperation.Delete, { space });
+      setDeleteConfirmOpen(false);
+      const personalSpace = getPersonalSpace(client);
+      if (personalSpace) {
+        void invokePromise(LayoutOperation.SwitchWorkspace, { subject: getSpacePath(personalSpace.id) });
+      }
+    } catch (err) {
+      log.catch(err, { stage: 'delete: invocation rejected', spaceId: space.id });
+      setDeleteConfirmOpen(false);
+      void invokePromise(LayoutOperation.AddToast, {
+        id: `${space.id}-delete-failed`,
+        title: t('delete-space-failed.message'),
+        icon: 'ph--warning--regular',
+      });
+    }
+  }, [space, client, invokePromise, t]);
+
   return (
     <Settings.Viewport>
       <Settings.Section
@@ -249,6 +223,44 @@ export const SpaceSettingsContainer = ({ space }: AppSurface.SpaceArticleProps)
           <Button onClick={handleRepair}>{t('repair-space.label')}</Button>
         </Settings.Item>
       </Settings.Section>
+
+      <Settings.Section title={t('danger-zone.title')} description={t('danger-zone.description')}>
+        {!personal && (
+          <Settings.Item title={t('delete-space.title')} description={t('delete-space.description')}>
+            <Dialog.Root open={deleteConfirmOpen} onOpenChange={setDeleteConfirmOpen}>
+              <Dialog.Trigger asChild>
+                <Button variant='destructive' data-testid='spaceSettings.deleteSpace'>
+                  {t('delete-space.label')}
+                </Button>
+              </Dialog.Trigger>
+              <Dialog.Portal>
+                <Dialog.Overlay>
+                  <Dialog.Content>
+                    <Dialog.Header>
+                      <Dialog.Title>{t('delete-space-confirm.title')}</Dialog.Title>
+                    </Dialog.Header>
+                    <Dialog.Body>
+                      <Dialog.Description>{t('delete-space-confirm.description')}</Dialog.Description>
+                      <div className='flex justify-end gap-2 mbs-4'>
+                        <Dialog.Close asChild>
+                          <Button>{t('cancel.label')}</Button>
+                        </Dialog.Close>
+                        <Button
+                          variant='destructive'
+                          onClick={handleDelete}
+                          data-testid='spaceSettings.deleteSpaceConfirm'
+                        >
+                          {t('delete-space.label')}
+                        </Button>
+                      </div>
+                    </Dialog.Body>
+                  </Dialog.Content>
+                </Dialog.Overlay>
+              </Dialog.Portal>
+            </Dialog.Root>
+          </Settings.Item>
+        )}
+      </Settings.Section>
     </Settings.Viewport>
   );
 };

package/src/containers/SyncStatus/SyncStatus.stories.tsx

@@ -7,7 +7,8 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { withTheme } from '@dxos/react-ui/testing';
 
-import { translations } from '../../translations';
+import { translations } from '#translations';
+
 import { SyncStatusIndicator } from './SyncStatus';
 
 const meta = {

package/src/containers/SyncStatus/SyncStatus.tsx

@@ -5,7 +5,7 @@
 import React, { useEffect, useState } from 'react';
 
 import { log } from '@dxos/log';
-import { StatusBar } from '@dxos/plugin-status-bar';
+import { StatusBar } from '@dxos/plugin-status-bar/components';
 import { EdgeStatus } from '@dxos/protocols/proto/dxos/client/services';
 import { type QueryEdgeStatusResponse } from '@dxos/protocols/proto/dxos/client/services';
 import { useClient } from '@dxos/react-client';
@@ -59,7 +59,13 @@ export const SyncStatusIndicator = ({ state, saved }: { state: SpaceSyncStateMap
     <Popover.Root>
       <Popover.Trigger asChild>
         <StatusBar.Item>
-          <IconButton icon={getIcon(status)} iconOnly label={t(`${status}.label`)} classNames={classNames} />
+          <IconButton
+            variant='ghost'
+            icon={getIcon(status)}
+            iconOnly
+            label={t(`${status}.label`)}
+            classNames={classNames}
+          />
         </StatusBar.Item>
       </Popover.Trigger>
       <Popover.Portal>

package/src/containers/ViewEditor/ViewEditor.tsx

@@ -2,17 +2,15 @@
 // Copyright 2023 DXOS.org
 //
 
-import * as Schema from 'effect/Schema';
 import React, { useCallback, useState } from 'react';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
 import { resolveSchemaWithRegistry } from '@dxos/app-toolkit/query';
 import { useTypeOptions } from '@dxos/app-toolkit/ui';
-import { DXN, Filter, JsonSchema, Obj, Query, type QueryAST, Tag, Type } from '@dxos/echo';
-import { type View } from '@dxos/echo';
+import { EID, Filter, Obj, Query, type QueryAST, Scope, Tag, Type, type View } from '@dxos/echo';
 import { type Mutable } from '@dxos/echo/internal';
 import { useClient } from '@dxos/react-client';
-import { getSpace, useQuery } from '@dxos/react-client/echo';
+import { useQuery } from '@dxos/react-client/echo';
 import { useAsyncEffect } from '@dxos/react-ui';
 import { ViewEditor as NaturalViewEditor } from '@dxos/react-ui-form';
 import { ViewModel } from '@dxos/schema';
@@ -24,11 +22,11 @@ export type ViewEditorProps = { view: View.View };
 export const ViewEditor = ({ view }: ViewEditorProps) => {
   const { invokePromise } = useOperationInvoker();
   const client = useClient();
-  const space = getSpace(view);
-  const [schema, setSchema] = useState<Schema.Schema.AnyNoContext>(() => Schema.Struct({}));
-  const tags = useQuery(space?.db, Filter.type(Tag.Tag));
+  const db = Obj.getDatabase(view);
+  const [type, setType] = useState<Type.AnyEntity>();
+  const tags = useQuery(db, Filter.type(Tag.Tag));
   const types = useTypeOptions({
-    space,
+    db,
     annotation: {
       location: ['database', 'runtime'],
       kind: ['user'],
@@ -36,43 +34,47 @@ export const ViewEditor = ({ view }: ViewEditorProps) => {
   });
 
   useAsyncEffect(async () => {
-    if (!view?.query || !space) {
+    if (!view?.query || !db) {
       return;
     }
 
-    const foundSchema = await resolveSchemaWithRegistry(space.db.schemaRegistry, view.query.ast);
-    if (foundSchema && foundSchema !== schema) {
-      setSchema(() => foundSchema);
+    const foundType = await resolveSchemaWithRegistry(db, view.query.ast);
+    if (foundType && foundType !== type) {
+      setType(() => foundType);
     }
-  }, [client, space, view, schema]);
+  }, [client, db, view, type]);
 
   const handleQueryChanged = useCallback(
-    async (newQuery: QueryAST.Query, target?: string) => {
-      if (!view || !space) {
+    async (newQuery: QueryAST.Query, target?: EID.EID) => {
+      if (!view || !db) {
         return;
       }
 
-      const queue = target && DXN.tryParse(target) ? target : undefined;
-      const query = queue ? Query.fromAst(newQuery).from({ queues: [queue] }) : Query.fromAst(newQuery);
-      Obj.change(view, (view) => {
+      const queue = target;
+      const query = queue
+        ? Query.fromAst(newQuery).from([
+            Scope.feed(`dxn:queue:data:${EID.getSpaceId(queue)}:${EID.getEntityId(queue)}`),
+          ])
+        : Query.fromAst(newQuery);
+      Obj.update(view, (view) => {
         view.query.ast = query.ast as Mutable<typeof query.ast>;
       });
-      const newSchema = await resolveSchemaWithRegistry(space.db.schemaRegistry, query.ast);
-      if (!newSchema) {
+      const newType = await resolveSchemaWithRegistry(db, query.ast);
+      if (!newType) {
         return;
       }
 
       const newView = ViewModel.make({
         query,
-        jsonSchema: JsonSchema.toJsonSchema(newSchema),
+        jsonSchema: newType.jsonSchema,
       });
-      Obj.change(view, (view) => {
+      Obj.update(view, (view) => {
         view.projection = Obj.getSnapshot(newView).projection as Mutable<typeof view.projection>;
       });
 
-      setSchema(() => newSchema);
+      setType(() => newType);
     },
-    [view, schema],
+    [view, type],
   );
 
   const handleDelete = useCallback(
@@ -82,21 +84,21 @@ export const ViewEditor = ({ view }: ViewEditorProps) => {
     [invokePromise, view],
   );
 
-  if (!space || !schema) {
+  if (!db || !type) {
     return null;
   }
 
   return (
     <NaturalViewEditor
-      registry={space.db.schemaRegistry}
-      schema={schema}
+      registry={db.graph.registry}
+      type={type}
       view={view}
       mode='tag'
-      db={space.db}
+      db={db}
       tags={tags}
       types={types}
       onQueryChanged={handleQueryChanged}
-      onDelete={Type.isMutable(schema) ? handleDelete : undefined}
+      onDelete={Type.getDatabase(type) != null ? handleDelete : undefined}
     />
   );
 };

package/src/containers/index.ts

@@ -10,13 +10,14 @@ export const CollectionArticle: ComponentType<any> = lazy(() => import('./Collec
 export const CollectionSection: ComponentType<any> = lazy(() => import('./CollectionSection'));
 export const CreateObjectDialog: ComponentType<any> = lazy(() => import('./CreateObjectDialog'));
 export const CreateSpaceDialog: ComponentType<any> = lazy(() => import('./CreateSpaceDialog'));
+export const ImportSpaceDialog: ComponentType<any> = lazy(() => import('./ImportSpaceDialog'));
 export const InlineSyncStatus: ComponentType<any> = lazy(() => import('./InlineSyncStatus'));
 export const JoinDialog: ComponentType<any> = lazy(() => import('./JoinDialog'));
 export const MembersContainer: ComponentType<any> = lazy(() => import('./MembersContainer'));
 export const MenuFooter: ComponentType<any> = lazy(() => import('./MenuFooter'));
 export const ObjectCardStack: ComponentType<any> = lazy(() => import('./ObjectCardStack'));
 export const ObjectProperties: ComponentType<any> = lazy(() => import('./ObjectProperties'));
-export const ObjectRenamePopover: ComponentType<any> = lazy(() => import('./ObjectRenamePopover'));
+export const EntityRenamePopover: ComponentType<any> = lazy(() => import('./EntityRenamePopover'));
 export const RecordArticle: ComponentType<any> = lazy(() => import('./RecordArticle'));
 export const RelatedArticle: ComponentType<any> = lazy(() => import('./RelatedArticle'));
 export const SchemaContainer: ComponentType<any> = lazy(() => import('./SchemaContainer'));

package/src/hooks/useInputSurfaceLookup.tsx

@@ -17,9 +17,16 @@ export const useInputSurfaceLookup = (baseData?: Record<string, any>): FormField
   const pluginManager = usePluginManager();
   return useCallback<FormFieldProvider>(
     ({ schema, prop, fieldProps }) => {
-      const data = { prop, schema, ...baseData };
+      const data = {
+        prop,
+        schema,
+        /** Property Schema AST (`fieldProps.type`). Not spread as React prop `type` — Surface peels `type` for role tokens. */
+        fieldPropertyAst: fieldProps.type,
+        ...baseData,
+      };
+      const { type: _fieldPropertyAstExcluded, ...surfaceFieldProps } = fieldProps as Record<string, any>;
       if (Surface.isAvailable(pluginManager.capabilities, { role: 'form-input', data })) {
-        return <Surface.Surface role='form-input' data={data} {...(fieldProps as Record<string, any>)} />;
+        return <Surface.Surface role='form-input' data={data} {...surfaceFieldProps} />;
       }
     },
     [pluginManager, baseData],

package/src/index.ts

@@ -2,10 +2,8 @@
 // Copyright 2023 DXOS.org
 //
 
-export { SpaceCapabilities, SpaceEvents } from './types';
-
-export * from './components';
 export * from './meta';
+export * from './types';
 export * from './util';
 
-export * from './SpacePlugin';
+export { CollectionOperation, SpaceOperation } from './operations/definitions';

package/src/meta.ts

@@ -2,15 +2,33 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Plugin } from '@dxos/app-framework';
+import { Plugin } from '@dxos/app-framework';
+import { DXN } from '@dxos/keys';
 import { trim } from '@dxos/util';
 
-export const meta: Plugin.Meta = {
-  id: 'org.dxos.plugin.space',
+export const meta = Plugin.makeMeta({
+  key: DXN.make('org.dxos.plugin.space'),
   name: 'Spaces',
+  author: 'DXOS',
+  spec: 'PLUGIN.mdl',
   description: trim`
-    Core workspace container system for organizing and sharing collaborative environments.
-    Create, manage, and share spaces with granular access control and invitation management.
+    SpacePlugin is the core workspace container for DXOS Composer. It owns the full lifecycle of
+    collaborative spaces — creating, joining, opening, closing, and resetting them — and manages
+    the membership and invitation system that controls who can access each space.
+
+    The plugin maintains an ordered app-graph of every space and its collections, wires navigation
+    so that opening a space or object updates the layout, and tracks real-time peer presence so
+    that the UI can show which collaborators are viewing each object.
+
+    Object and schema management sit at the heart of SpacePlugin: it registers the canonical DXOS
+    schema types (Person, Task, Project, Event, …), provides the create-object dialog that all
+    other plugins populate with their own types, and exposes operations for adding, removing,
+    restoring, duplicating, and serialising objects. Import/export of space archives and schema
+    migrations are also handled here.
+
+    A full set of undo-aware operations (RemoveObjects/RestoreObjects, DeleteField/RestoreField)
+    integrates with the process manager so that destructive edits can be reversed in one step.
   `,
   icon: 'ph--planet--regular',
-};
+  tags: ['system'],
+});

package/src/operations/add-object.ts

@@ -3,13 +3,12 @@
 import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
-import { getCollectionsPath, getObjectPath, getTypePath } from '@dxos/app-toolkit';
-import { Database, Obj, View } from '@dxos/echo';
-import { Collection } from '@dxos/echo';
+import { CollectionModel, getCollectionsPath, getObjectPath, getTypePath } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+import { Collection, Database, Filter, Obj, Query, Scope, Type } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
-import { Operation } from '@dxos/operation';
-import { ObservabilityOperation } from '@dxos/plugin-observability/operations';
-import { CollectionModel, ViewAnnotation, getTypenameFromQuery } from '@dxos/schema';
+import { ObservabilityOperation } from '@dxos/plugin-observability';
+import { ViewAnnotation, getTypenameFromQuery } from '@dxos/schema';
 
 import { SpaceOperation } from './definitions';
 
@@ -37,11 +36,15 @@ const handler: Operation.WithHandler<typeof SpaceOperation.AddObject> = SpaceOpe
         },
       });
 
-      const [schema] = db.schemaRegistry.query({ typename, location: ['runtime'] }).runSync();
-      const isViewSchema = schema !== undefined && ViewAnnotation.get(schema).pipe(Option.getOrElse(() => false));
-      const view = isViewSchema
-        ? yield* Effect.promise(() => (object as Obj.Any).view.load() as Promise<View.View>)
-        : undefined;
+      const types = yield* Effect.promise(() =>
+        db.query(Query.select(Filter.type(Type.Type)).from(Scope.registry())).run(),
+      );
+      const [runtimeSchema] = types.filter((t) => !Type.isTypeKind(t) && Type.getTypename(t) === typename);
+      const echoViewPath =
+        runtimeSchema !== undefined
+          ? ViewAnnotation.get(Type.getSchema(runtimeSchema)).pipe(Option.getOrElse(() => []))
+          : [];
+      const view = echoViewPath.length > 0 ? yield* ViewAnnotation.tryLoadAtPath(object, echoViewPath) : undefined;
       const viewTargetTypename = view ? getTypenameFromQuery(view.query.ast) : undefined;
       const subject = getSubjectPathForNewObject({
         spaceId: db.spaceId,
@@ -52,7 +55,7 @@ const handler: Operation.WithHandler<typeof SpaceOperation.AddObject> = SpaceOpe
       });
 
       return {
-        id: Obj.getDXN(object).toString(),
+        id: Obj.getURI(object),
         subject: [subject],
         object,
       };
@@ -72,7 +75,7 @@ const getSubjectPathForNewObject = (props: {
   if (typeof nodeId === 'string') {
     return `${nodeId}/${objectId}`;
   }
-  if (typename === Collection.Collection.typename) {
+  if (typename === Type.getTypename(Collection.Collection)) {
     return getCollectionsPath(spaceId, objectId);
   }
   if (viewTargetTypename) {

package/src/operations/add-relation.ts

@@ -2,8 +2,8 @@
 
 import * as Effect from 'effect/Effect';
 
+import { Operation } from '@dxos/compute';
 import { Database, Relation } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 
 import { SpaceOperation } from './definitions';
 

package/src/operations/add-type.ts

@@ -0,0 +1,51 @@
+// Copyright 2025 DXOS.org
+
+import * as Effect from 'effect/Effect';
+
+import { Capability, Plugin } from '@dxos/app-framework';
+import { Operation } from '@dxos/compute';
+import { Type } from '@dxos/echo';
+import { ObservabilityOperation } from '@dxos/plugin-observability';
+
+import { SpaceEvents, SpaceCapabilities } from '../types';
+import { SpaceOperation } from './definitions';
+
+const handler: Operation.WithHandler<typeof SpaceOperation.AddType> = SpaceOperation.AddType.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* (input) {
+      const db = input.db;
+      const type = yield* Effect.promise(() => db.addType(input.type));
+      Type.update(type, (draft) => {
+        if (input.name) {
+          draft.name = input.name;
+        }
+        const meta = Type.getMeta(draft);
+        if (input.typename) {
+          meta.key = input.typename;
+        }
+        if (input.version) {
+          meta.version = input.version;
+        }
+      });
+
+      yield* Plugin.activate(SpaceEvents.TypeAdded);
+      const onTypeAdded = yield* Capability.getAll(SpaceCapabilities.OnTypeAdded);
+      yield* Effect.all(
+        onTypeAdded.map((callback) => callback({ db, type, show: input.show })),
+        { concurrency: 'unbounded' },
+      );
+
+      yield* Operation.schedule(ObservabilityOperation.SendEvent, {
+        name: 'space.type.add',
+        properties: {
+          spaceId: db.spaceId,
+          objectId: type.id,
+          typename: Type.getTypename(type),
+        },
+      });
+
+      return { id: type.id, object: type };
+    }),
+  ),
+);
+export default handler;

package/src/operations/close.ts

@@ -2,7 +2,7 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 import { SpaceOperation } from './definitions';
 

package/src/operations/create.ts

@@ -3,11 +3,12 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability, Plugin } from '@dxos/app-framework';
-import { Collection, Obj, Ref } from '@dxos/echo';
-import { Migrations } from '@dxos/migrations';
-import { Operation } from '@dxos/operation';
-import { ClientCapabilities } from '@dxos/plugin-client/types';
-import { ObservabilityOperation } from '@dxos/plugin-observability/operations';
+import { RootCollectionAnnotation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+import { Annotation, Collection, Obj, Ref } from '@dxos/echo';
+import { MigrationVersionAnnotation, Migrations } from '@dxos/migrations';
+import { ClientCapabilities } from '@dxos/plugin-client';
+import { ObservabilityOperation } from '@dxos/plugin-observability';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
 import { iconValues } from '@dxos/react-ui-pickers/icons';
 import { hues } from '@dxos/ui-theme';
@@ -22,17 +23,23 @@ const handler: Operation.WithHandler<typeof SpaceOperation.Create> = SpaceOperat
       const client = yield* Capability.get(ClientCapabilities.Client);
       const hue = hue_ ?? hues[Math.floor(Math.random() * hues.length)];
       const icon = icon_ ?? iconValues[Math.floor(Math.random() * iconValues.length)];
-      const space = yield* Effect.promise(() => client.spaces.create({ name, hue, icon }));
+      const space = yield* Effect.promise(() =>
+        client.spaces.create({
+          name,
+          hue,
+          icon,
+        }),
+      );
       if (edgeReplication) {
         yield* Effect.promise(() => space.internal.setEdgeReplicationPreference(EdgeReplicationSetting.ENABLED));
       }
       yield* Effect.promise(() => space.waitUntilReady());
 
       const collection = Obj.make(Collection.Collection, { objects: [] });
-      Obj.change(space.properties, (obj) => {
-        obj[Collection.Collection.typename] = Ref.make(collection);
-        if (Migrations.versionProperty) {
-          obj[Migrations.versionProperty] = Migrations.targetVersion;
+      Obj.update(space.properties, (properties) => {
+        Annotation.set(properties, RootCollectionAnnotation, Ref.make(collection));
+        if (Migrations.targetVersion) {
+          Annotation.set(properties, MigrationVersionAnnotation, Migrations.targetVersion);
         }
       });