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

package/src/capabilities/{settings/settings.ts → settings.ts}

@@ -8,14 +8,14 @@ import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
 import { createKvsStore } from '@dxos/effect';
 
-import { meta } from '../../meta';
-import { SpaceCapabilities, SpaceSettingsSchema } from '../../types';
+import { meta } from '#meta';
+import { Settings, SpaceCapabilities } from '#types';
 
 export default Capability.makeModule(() =>
   Effect.sync(() => {
     const settingsAtom = createKvsStore({
       key: meta.id,
-      schema: SpaceSettingsSchema,
+      schema: Settings.Settings,
       defaultValue: () => ({
         showHidden: false,
       }),
@@ -25,7 +25,7 @@ export default Capability.makeModule(() =>
       Capability.contributes(SpaceCapabilities.Settings, settingsAtom),
       Capability.contributes(AppCapabilities.Settings, {
         prefix: meta.id,
-        schema: SpaceSettingsSchema,
+        schema: Settings.Settings,
         atom: settingsAtom,
       }),
     ];

package/src/capabilities/{spaces-ready/spaces-ready.ts → spaces-ready.ts}

@@ -6,21 +6,29 @@ import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import { AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
+import {
+  AppCapabilities,
+  LayoutOperation,
+  getSpacePath,
+  resolvePersonalSpace,
+  setPersonalSpace,
+} from '@dxos/app-toolkit';
 import { SubscriptionList } from '@dxos/async';
 import { Filter, Obj } from '@dxos/echo';
 import { log } from '@dxos/log';
-import { AttentionCapabilities } from '@dxos/plugin-attention';
-import { ClientCapabilities } from '@dxos/plugin-client';
+import { AttentionCapabilities } from '@dxos/plugin-attention/types';
+import { ClientCapabilities } from '@dxos/plugin-client/types';
 import { Graph } from '@dxos/plugin-graph';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
 import { PublicKey } from '@dxos/react-client';
-import { SPACE_ID_LENGTH, SpaceState, parseId } from '@dxos/react-client/echo';
+import { type Space, SPACE_ID_LENGTH, SpaceState, parseId } from '@dxos/react-client/echo';
 import { Expando } from '@dxos/schema';
 import { ComplexMap, reduceGroupBy } from '@dxos/util';
 
-import { SpaceCapabilities, SpaceOperation } from '../../types';
-import { COMPOSER_SPACE_LOCK, SHARED } from '../../util';
+import { SpaceOperation } from '#operations';
+import { SpaceCapabilities } from '#types';
+
+import { SHARED } from '../util';
 
 const ACTIVE_NODE_BROADCAST_INTERVAL = 30_000;
 const WAIT_FOR_OBJECT_TIMEOUT = 5_000;
@@ -42,32 +50,61 @@ export default Capability.makeModule(
     const ephemeralAtom = yield* Capability.get(SpaceCapabilities.EphemeralState);
     const client = yield* Capability.get(ClientCapabilities.Client);
 
-    const defaultSpace = client.spaces.default;
-    yield* Effect.tryPromise(() => defaultSpace.waitUntilReady());
+    //
+    // Personal space initialization — deferred until found.
+    //
 
-    // Check if deck state indicates we should switch to default space.
-    const layout = registry.get(layoutAtom);
-    if (layout.workspace === 'default') {
-      yield* invoke(LayoutOperation.SwitchWorkspace, { subject: defaultSpace.id });
-    }
+    let personalSpaceInitialized = false;
+    const initializePersonalSpace = async (personalSpace: Space, { fromCredential }: { fromCredential: boolean }) => {
+      if (personalSpaceInitialized) {
+        return;
+      }
+      // Set before any await so concurrent subscribe callbacks don't start a second initialization.
+      personalSpaceInitialized = true;
 
-    // Initialize space sharing lock in default space.
-    if (typeof defaultSpace.properties[COMPOSER_SPACE_LOCK] !== 'boolean') {
-      Obj.change(defaultSpace.properties, (p) => {
-        p[COMPOSER_SPACE_LOCK] = true;
-      });
-    }
+      await personalSpace.waitUntilReady();
 
-    const queryResults = yield* Effect.tryPromise(() =>
-      defaultSpace.db.query(Filter.type(Expando.Expando, { key: SHARED })).run(),
-    );
-    const spacesOrder = queryResults[0];
-    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.
-      defaultSpace.db.add(Obj.make(Expando.Expando, { key: SHARED, order: [] }));
+      if (fromCredential) {
+        setPersonalSpace(personalSpace);
+      }
+
+      // Check if deck state indicates we should switch to default space.
+      const layout = registry.get(layoutAtom);
+      if (layout.workspace === 'default') {
+        await invoke(LayoutOperation.SwitchWorkspace, { subject: getSpacePath(personalSpace.id) }).pipe(
+          Effect.runPromise,
+        );
+      }
+
+      const queryResults = await personalSpace.db.query(Filter.type(Expando.Expando, { key: SHARED })).run();
+      const spacesOrder = queryResults[0];
+      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.
+        personalSpace.db.add(Obj.make(Expando.Expando, { key: SHARED, order: [] }));
+      }
+    };
+
+    // Try to find the personal space now, or subscribe to find it later.
+    // Initialization is async (non-blocking) so subscriptions wire immediately.
+    const resolved = resolvePersonalSpace(client);
+    if (resolved) {
+      void initializePersonalSpace(resolved.space, resolved);
+    } else {
+      subscriptions.add(
+        client.spaces.subscribe(() => {
+          const resolved = resolvePersonalSpace(client);
+          if (resolved) {
+            void initializePersonalSpace(resolved.space, resolved);
+          }
+        }).unsubscribe,
+      );
     }
 
+    //
+    // Space subscriptions — set up immediately, do not depend on personal space.
+    //
+
     // Await missing objects - subscribe to layout atom changes.
     // NOTE: Use immediate: true to check initial state (URL handler may have already set active).
     let lastActiveCleanup: (() => void) | undefined;
@@ -107,9 +144,13 @@ export default Capability.makeModule(
     // Cache space names.
     subscriptions.add(
       client.spaces.subscribe(async (spaces) => {
-        // TODO(wittjosiah): Remove. This is a hack to be able to migrate the default space properties.
-        if (defaultSpace.state.get() === SpaceState.SPACE_REQUIRES_MIGRATION) {
-          await defaultSpace.internal.migrate();
+        // TODO(wittjosiah): Remove. This is a hack to be able to migrate the personal space properties.
+        const personalSpaceForMigration = resolvePersonalSpace(client);
+        if (
+          personalSpaceForMigration?.space &&
+          personalSpaceForMigration.space.state.get() === SpaceState.SPACE_REQUIRES_MIGRATION
+        ) {
+          await personalSpaceForMigration.space.internal.migrate();
         }
 
         spaces

package/src/capabilities/{state/state.ts → state.ts}

@@ -10,8 +10,8 @@ import { createKvsStore } from '@dxos/effect';
 import { PublicKey } from '@dxos/keys';
 import { ComplexMap } from '@dxos/util';
 
-import { meta } from '../../meta';
-import { SpaceCapabilities } from '../../types';
+import { meta } from '#meta';
+import { SpaceCapabilities } from '#types';
 
 /** Default persisted state. */
 const defaultSpaceState: SpaceCapabilities.SpaceState = {
@@ -25,7 +25,7 @@ export default Capability.makeModule(
 
     // Persisted state using KVS store.
     const stateAtom = createKvsStore({
-      key: `${meta.id}/state`,
+      key: `${meta.id}.state`,
       schema: SpaceCapabilities.StateSchema,
       defaultValue: () => ({ ...defaultSpaceState }),
     });
@@ -42,7 +42,9 @@ export default Capability.makeModule(
     const manager = yield* Capability.get(Capabilities.PluginManager);
     // Update navigableCollections based on plugin state.
     const updateNavigableCollections = () => {
-      const enabled = manager.getEnabled().includes('dxos.org/plugin/stack');
+      const enabled =
+        manager.getEnabled().includes('org.dxos.plugin.stack') ||
+        manager.getEnabled().includes('org.dxos.plugin.simpleLayout');
       const current = registry.get(ephemeralAtom);
       if (enabled !== current.navigableCollections) {
         registry.update(ephemeralAtom, (c) => ({ ...c, navigableCollections: enabled }));

package/src/capabilities/undo-mappings.ts

@@ -0,0 +1,59 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability, UndoMapping } from '@dxos/app-framework';
+import { Obj } from '@dxos/echo';
+
+import { meta } from '#meta';
+import { SpaceOperation } from '#operations';
+
+import { SpaceOperationConfig } from '../operations/helpers';
+
+type UndoMappingsOptions = {
+  createInvitationUrl: (invitationCode: string) => string;
+  observability?: boolean;
+};
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* ({ createInvitationUrl, observability }: UndoMappingsOptions) {
+    return [
+      Capability.contributes(Capabilities.UndoMapping, [
+        UndoMapping.make({
+          operation: SpaceOperation.DeleteField,
+          inverse: SpaceOperation.RestoreField,
+          deriveContext: (input, output) => ({
+            view: input.view,
+            field: output.field,
+            props: output.props,
+            index: output.index,
+          }),
+          message: ['field-deleted.label', { ns: meta.id }],
+        }),
+        UndoMapping.make({
+          operation: SpaceOperation.RemoveObjects,
+          inverse: SpaceOperation.RestoreObjects,
+          deriveContext: (_input, output) => ({
+            objects: output.objects,
+            parentCollection: output.parentCollection,
+            indices: output.indices,
+            nestedObjectsList: output.nestedObjectsList,
+            wasActive: output.wasActive,
+          }),
+          message: (input, _output) => {
+            const ns = Obj.getTypename(input.objects[0]);
+            return ns && input.objects.length === 1
+              ? ['object-deleted.label', { ns }]
+              : ['objects-deleted.label', { ns: meta.id }];
+          },
+        }),
+      ]),
+      Capability.contributes(SpaceOperationConfig, {
+        createInvitationUrl,
+        observability: observability ?? false,
+      }),
+    ];
+  }),
+);

package/src/cli/commands/database/add.ts

@@ -15,20 +15,19 @@ import { type Capability, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppCapabilities } from '@dxos/app-toolkit';
 import { CommandConfig, Common, flushAndSync, print, spaceLayer } from '@dxos/cli-util';
 import { SpaceProperties } from '@dxos/client/echo';
-import { Database, Filter, Obj, Ref, Type } from '@dxos/echo';
+// eslint-disable-next-line unused-imports/no-unused-imports
+import type { Operation } from '@dxos/compute';
+import { Database, Filter, Obj, Type } from '@dxos/echo';
 import { Collection } from '@dxos/echo';
 import { EntityKind, getTypeAnnotation } from '@dxos/echo/internal';
-// eslint-disable-next-line unused-imports/no-unused-imports
-import type { Operation } from '@dxos/operation';
 
-import { type CreateObject } from '../../../types';
+import { type CreateObject } from '#types';
 
 import { printObject } from './util';
 
 export type Metadata = {
   createObject: CreateObject;
   inputSchema?: Schema.Schema.AnyNoContext;
-  addToCollectionOnCreate?: boolean;
 };
 
 export const add = Command.make(
@@ -64,16 +63,12 @@ export const add = Command.make(
         return yield* Effect.fail(new Error(`Unknown typename: ${selectedTypename}`));
       }
 
-      const object = yield* metadata.createObject({}, { db });
+      const result = yield* metadata.createObject({}, { db, target: collection });
+      const object = result.object;
       if (!Obj.isObject(object)) {
         return yield* Effect.fail(new Error(`Invalid object: ${object}`));
       }
 
-      const objectRef = Ref.make(object);
-      Obj.change(collection, (c) => {
-        c.objects.push(objectRef);
-      });
-
       if (json) {
         yield* Console.log(JSON.stringify(object, null, 2));
       } else {

package/src/cli/commands/database/query/query.test.ts

@@ -21,9 +21,8 @@ describe('spaces query', () => {
       // TODO(wittjosiah): Create test runtime so that client service can be shared with `beforeEach`.
       const client = yield* ClientService;
       yield* Effect.tryPromise(() => client.halo.createIdentity());
-      yield* Effect.tryPromise(() => client.spaces.waitUntilReady());
-      yield* Effect.tryPromise(() => client.spaces.default.waitUntilReady());
-      const space = client.spaces.default;
+      const space = yield* Effect.tryPromise(() => client.spaces.create());
+      yield* Effect.tryPromise(() => space.waitUntilReady());
       yield* handler({ typename: Option.some(Task.Task.typename) }).pipe(
         Effect.provide(spaceLayer(Option.some(space.id))),
       );
@@ -38,8 +37,7 @@ describe('spaces query', () => {
       const client = yield* ClientService;
       yield* Effect.tryPromise(() => client.addTypes([Task.Task]));
       yield* Effect.tryPromise(() => client.halo.createIdentity());
-      yield* Effect.tryPromise(() => client.spaces.waitUntilReady());
-      const space = client.spaces.default;
+      const space = yield* Effect.tryPromise(() => client.spaces.create());
       yield* Effect.tryPromise(() => space.waitUntilReady());
       space.db.add(Obj.make(Task.Task, { title: 'Task 1' }));
       space.db.add(Obj.make(Task.Task, { title: 'Task 2' }));

package/src/cli/commands/space/close/close.ts

@@ -19,7 +19,7 @@ export const handler = ({ spaceId }: { spaceId: Key.SpaceId }) =>
     const space = yield* getSpace(spaceId);
 
     // Flush and sync before closing
-    yield* Effect.tryPromise(() => space.db.flush({ indexes: true }));
+    yield* Effect.tryPromise(() => space.db.flush());
     yield* waitForSync(space);
 
     yield* Effect.tryPromise(() => space.close());

package/src/cli/commands/space/create/create.ts

@@ -22,8 +22,8 @@ export const handler = Effect.fn(function* ({ name }: { name: Option.Option<stri
   yield* Effect.tryPromise(() => space.waitUntilReady());
 
   if (Option.isSome(name)) {
-    Obj.change(space.properties, (p) => {
-      p.name = Option.getOrUndefined(name);
+    Obj.update(space.properties, (obj) => {
+      obj.name = Option.getOrUndefined(name);
     });
   }
 
@@ -48,7 +48,7 @@ export const handler = Effect.fn(function* ({ name }: { name: Option.Option<stri
   }
 
   // Flush and sync before completion
-  yield* Effect.tryPromise(() => space.db.flush({ indexes: true }));
+  yield* Effect.tryPromise(() => space.db.flush());
   yield* waitForSync(space);
 });
 

package/src/cli/commands/space/info/info.test.ts

@@ -19,7 +19,7 @@ describe('space info', () => {
       yield* Effect.tryPromise(() => client.halo.createIdentity());
       const space = yield* Effect.tryPromise(() => client.spaces.create());
       yield* Effect.tryPromise(() => space.waitUntilReady());
-      yield* handler({ spaceId: Option.some(space.id) });
+      yield* handler({ spaceId: Option.some(space.id), wait: Option.none() });
       const logger = yield* TestConsole.TestConsole;
       const logs = logger.logs;
       expect(logs).toHaveLength(1);
@@ -29,19 +29,4 @@ describe('space info', () => {
       expect(parsed).toHaveProperty('key');
       expect(parsed.id).toBe(space.id);
     }).pipe(Effect.provide(TestLayer), Effect.scoped, runAndForwardErrors));
-
-  it('should show default space info when spaceId is not provided', () =>
-    Effect.gen(function* () {
-      const client = yield* ClientService;
-      yield* Effect.tryPromise(() => client.halo.createIdentity());
-      yield* Effect.tryPromise(() => client.spaces.waitUntilReady());
-      yield* handler({ spaceId: Option.none() });
-      const logger = yield* TestConsole.TestConsole;
-      const logs = logger.logs;
-      expect(logs).toHaveLength(1);
-      const parsed = TestConsole.parseJson<{ id: string; state: string; key: string }>(logs[0]);
-      expect(parsed).toHaveProperty('id');
-      expect(parsed).toHaveProperty('state');
-      expect(parsed).toHaveProperty('key');
-    }).pipe(Effect.provide(TestLayer), Effect.scoped, runAndForwardErrors));
 });

package/src/cli/commands/space/info/info.ts

@@ -6,20 +6,27 @@ import * as Command from '@effect/cli/Command';
 import * as Options from '@effect/cli/Options';
 import * as Console from 'effect/Console';
 import * as Effect from 'effect/Effect';
-import type * as Option from 'effect/Option';
+import * as Option from 'effect/Option';
 
 import { CommandConfig, Common, formatSpace, getSpace, print, printSpace, spaceIdWithDefault } from '@dxos/cli-util';
 import { ClientService } from '@dxos/client';
 import { type Key } from '@dxos/echo';
 
-export const handler = Effect.fn(function* ({ spaceId }: { spaceId: Option.Option<string> }) {
+export const handler = Effect.fn(function* ({
+  spaceId,
+  wait,
+}: {
+  spaceId: Option.Option<string>;
+  wait: Option.Option<number>;
+}) {
   const { json } = yield* CommandConfig;
   const client = yield* ClientService;
 
   const resolvedSpaceId = yield* spaceIdWithDefault(spaceId as Option.Option<Key.SpaceId>);
   const space = yield* getSpace(resolvedSpaceId);
 
-  const formatted = yield* formatSpace(space);
+  const waitSeconds = Option.getOrElse(wait, () => 0);
+  const formatted = yield* formatSpace(space, { waitSeconds });
 
   if (json) {
     yield* Console.log(JSON.stringify(formatted, null, 2));
@@ -32,6 +39,12 @@ export const info = Command.make(
   'info',
   {
     spaceId: Common.spaceId.pipe(Options.optional),
+    wait: Options.integer('wait').pipe(
+      Options.withDescription(
+        'Wait up to this many seconds for the space to reach SPACE_READY. Default 0 — read whatever state is available immediately.',
+      ),
+      Options.optional,
+    ),
   },
   handler,
 ).pipe(Command.withDescription('Show space info.'));

package/src/cli/commands/space/join/join.ts

@@ -88,7 +88,7 @@ export const handler = Effect.fn(function* ({
   }
 
   // Flush and sync after joining
-  yield* Effect.tryPromise(() => space.db.flush({ indexes: true }));
+  yield* Effect.tryPromise(() => space.db.flush());
   yield* waitForSync(space);
 
   if (json) {

package/src/cli/commands/space/list/list.test.ts

@@ -4,6 +4,7 @@
 
 import { describe, expect, it } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
 
 import { TestConsole, TestLayer } from '@dxos/cli-util/testing';
 import { ClientService } from '@dxos/client';
@@ -14,7 +15,7 @@ import { handler } from './list';
 describe('spaces list', () => {
   it('should list empty space list', () =>
     Effect.gen(function* () {
-      yield* handler();
+      yield* handler({ wait: Option.none() });
       const logger = yield* TestConsole.TestConsole;
       const logs = logger.logs;
       expect(logs).toHaveLength(1);
@@ -26,7 +27,7 @@ describe('spaces list', () => {
       const client = yield* ClientService;
       yield* Effect.tryPromise(() => client.halo.createIdentity());
       yield* Effect.tryPromise(() => client.spaces.create());
-      yield* handler();
+      yield* handler({ wait: Option.none() });
       const logger = yield* TestConsole.TestConsole;
       const logs = logger.logs;
       expect(logs).toHaveLength(1);

package/src/cli/commands/space/list/list.ts

@@ -3,19 +3,22 @@
 //
 
 import * as Command from '@effect/cli/Command';
+import * as Options from '@effect/cli/Options';
 import * as Console from 'effect/Console';
 import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
 
 import { CommandConfig, formatSpace, printSpace } from '@dxos/cli-util';
 import { printList } from '@dxos/cli-util';
 import { ClientService } from '@dxos/client';
 
 // TODO(burdon): Move handler inline and test separate functions.
-export const handler = Effect.fn(function* () {
+export const handler = Effect.fn(function* ({ wait }: { wait: Option.Option<number> }) {
   const { json } = yield* CommandConfig;
   const client = yield* ClientService;
   const spaces = client.spaces.get();
-  const formattedSpaces = yield* Effect.all(spaces.map(formatSpace));
+  const waitSeconds = Option.getOrElse(wait, () => 0);
+  const formattedSpaces = yield* Effect.all(spaces.map((space) => formatSpace(space, { waitSeconds })));
 
   if (json) {
     yield* Console.log(JSON.stringify(formattedSpaces, null, 2));
@@ -25,6 +28,15 @@ export const handler = Effect.fn(function* () {
   }
 });
 
-export const list = Command.make('list', {}, handler).pipe(
-  Command.withDescription('List all spaces available on this device.'),
-);
+export const list = Command.make(
+  'list',
+  {
+    wait: Options.integer('wait').pipe(
+      Options.withDescription(
+        'Wait up to this many seconds for each space to reach SPACE_READY before reading. Default 0 — print whatever state is available immediately so a stuck space cannot hang the command.',
+      ),
+      Options.optional,
+    ),
+  },
+  handler,
+).pipe(Command.withDescription('List all spaces available on this device.'));

package/src/cli/commands/space/members/members.test.ts

@@ -30,17 +30,4 @@ describe('space members', () => {
       expect(parsed[0]).toHaveProperty('presence');
       // name might be undefined if identity has no displayName
     }).pipe(Effect.provide(TestLayer), Effect.scoped, runAndForwardErrors));
-
-  it('should list default space members when spaceId is not provided', () =>
-    Effect.gen(function* () {
-      const client = yield* ClientService;
-      yield* Effect.tryPromise(() => client.halo.createIdentity());
-      yield* Effect.tryPromise(() => client.spaces.waitUntilReady());
-      yield* handler({ spaceId: Option.none() });
-      const logger = yield* TestConsole.TestConsole;
-      const logs = logger.logs;
-      expect(logs).toHaveLength(1);
-      const parsed = TestConsole.parseJson<Array<{ key: string; presence: string }>>(logs[0]);
-      expect(Array.isArray(parsed)).toBe(true);
-    }).pipe(Effect.provide(TestLayer), Effect.scoped, runAndForwardErrors));
 });

package/src/cli/commands/space/open/open.ts

@@ -20,7 +20,7 @@ export const handler = ({ spaceId }: { spaceId: Key.SpaceId }) =>
     yield* Effect.tryPromise(() => space.open());
 
     // Flush and sync after opening
-    yield* Effect.tryPromise(() => space.db.flush({ indexes: true }));
+    yield* Effect.tryPromise(() => space.db.flush());
     yield* waitForSync(space);
 
     if (json) {

package/src/cli/commands/space/schema/list/list.test.ts

@@ -26,17 +26,4 @@ describe('space schema list', () => {
       const parsed = TestConsole.parseJson(logs[0]);
       expect(Array.isArray(parsed)).toBe(true);
     }).pipe(Effect.provide(TestLayer), Effect.scoped, runAndForwardErrors));
-
-  it('should list default space schemas when spaceId is not provided', () =>
-    Effect.gen(function* () {
-      const client = yield* ClientService;
-      yield* Effect.tryPromise(() => client.halo.createIdentity());
-      yield* Effect.tryPromise(() => client.spaces.waitUntilReady());
-      yield* handler({ spaceId: Option.none(), typename: Option.none() });
-      const logger = yield* TestConsole.TestConsole;
-      const logs = logger.logs;
-      expect(logs).toHaveLength(1);
-      const parsed = TestConsole.parseJson(logs[0]);
-      expect(Array.isArray(parsed)).toBe(true);
-    }).pipe(Effect.provide(TestLayer), Effect.scoped, runAndForwardErrors));
 });

package/src/cli/plugin.ts

@@ -6,6 +6,7 @@ import * as Effect from 'effect/Effect';
 
 import { ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
 import { Tag } from '@dxos/echo';
 import { Collection } from '@dxos/echo';
 import { ClientEvents } from '@dxos/plugin-client/types';
@@ -23,11 +24,11 @@ import {
   Task,
 } from '@dxos/types';
 
-import { IdentityCreated } from '../capabilities/identity-created';
-import { OperationResolver } from '../capabilities/operation-resolver';
-import { meta } from '../meta';
-import { SpaceEvents } from '../types';
-import { type CreateObject, type SpacePluginOptions } from '../types';
+import { IdentityCreated, OperationHandler, UndoMappings } from '#capabilities';
+import { meta } from '#meta';
+import { SpaceOperation } from '#operations';
+import { SpaceEvents } from '#types';
+import { type CreateObject, type SpacePluginOptions } from '#types';
 
 import { database, queue, space } from './commands';
 
@@ -40,11 +41,20 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
     metadata: {
       id: Collection.Collection.typename,
       metadata: {
-        createObject: ((props) => Effect.sync(() => Collection.make(props))) satisfies CreateObject,
-        addToCollectionOnCreate: true,
+        createObject: ((props, options) =>
+          Effect.gen(function* () {
+            const object = Collection.make(props);
+            return yield* Operation.invoke(SpaceOperation.AddObject, {
+              object,
+              target: options.target,
+              hidden: true,
+              targetNodeId: options.targetNodeId,
+            });
+          })) satisfies CreateObject,
       },
     },
   }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addSchemaModule({
     schema: [
       ...DataTypes,
@@ -74,15 +84,15 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
       };
 
       return {
-        id: Capability.getModuleTag(OperationResolver),
-        activatesOn: ActivationEvents.SetupOperationResolver,
-        activate: () => OperationResolver({ createInvitationUrl, observability: false }),
+        id: Capability.getModuleTag(UndoMappings),
+        activatesOn: ActivationEvents.SetupOperationHandler,
+        activate: () => UndoMappings({ createInvitationUrl, observability: false }),
       };
     },
   ),
   Plugin.addModule({
     activatesOn: ClientEvents.IdentityCreated,
-    activatesAfter: [SpaceEvents.DefaultSpaceReady],
+    firesAfterActivation: [SpaceEvents.PersonalSpaceReady],
     activate: IdentityCreated,
   }),
   Plugin.make,