@dxos/plugin-space 0.8.4-main.422d1c7879 → 0.8.4-main.43cb759274

package/src/operations/migrate.ts

@@ -1,12 +1,14 @@
 // Copyright 2025 DXOS.org
 
 import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
 
 import { Capabilities } from '@dxos/app-framework';
 import { SpaceState } from '@dxos/client/echo';
-import { Migrations } from '@dxos/migrations';
-import { Operation } from '@dxos/operation';
-import { ObservabilityOperation } from '@dxos/plugin-observability/operations';
+import { Operation } from '@dxos/compute';
+import { Annotation } from '@dxos/echo';
+import { MigrationVersionAnnotation, Migrations } from '@dxos/migrations';
+import { ObservabilityOperation } from '@dxos/plugin-observability';
 
 import { SpaceCapabilities } from '../types';
 import { SpaceOperation } from './definitions';
@@ -34,7 +36,7 @@ const handler: Operation.WithHandler<typeof SpaceOperation.Migrate> = SpaceOpera
         properties: {
           spaceId: space.id,
           targetVersion,
-          version: Migrations.versionProperty ? space.properties[Migrations.versionProperty] : undefined,
+          version: Annotation.get(space.properties, MigrationVersionAnnotation).pipe(Option.getOrUndefined),
         },
       });
 

package/src/operations/open-create-object.ts

@@ -4,8 +4,8 @@ import * as Effect from 'effect/Effect';
 
 import { Capabilities } from '@dxos/app-framework';
 import { LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
 import { Collection, Obj } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 
 import { CREATE_OBJECT_DIALOG } from '../constants';
 import { SpaceCapabilities } from '../types';

package/src/operations/open-create-space.ts

@@ -3,7 +3,7 @@
 import * as Effect from 'effect/Effect';
 
 import { LayoutOperation } from '@dxos/app-toolkit';
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 import { CREATE_SPACE_DIALOG } from '../constants';
 import { SpaceOperation } from './definitions';

package/src/operations/open-import-space.ts

@@ -0,0 +1,21 @@
+// Copyright 2026 DXOS.org
+
+import * as Effect from 'effect/Effect';
+
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+
+import { IMPORT_SPACE_DIALOG } from '../constants';
+import { SpaceOperation } from './definitions';
+
+const handler: Operation.WithHandler<typeof SpaceOperation.OpenImportSpace> = SpaceOperation.OpenImportSpace.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* () {
+      yield* Operation.invoke(LayoutOperation.UpdateDialog, {
+        subject: IMPORT_SPACE_DIALOG,
+        blockAlign: 'start',
+      });
+    }),
+  ),
+);
+export default handler;

package/src/operations/open-members.ts

@@ -3,7 +3,7 @@
 import * as Effect from 'effect/Effect';
 
 import { LayoutOperation, getSpacePath } from '@dxos/app-toolkit';
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 import { SpaceOperation } from './definitions';
 

package/src/operations/open-settings.ts

@@ -3,7 +3,7 @@
 import * as Effect from 'effect/Effect';
 
 import { LayoutOperation, getSpacePath } from '@dxos/app-toolkit';
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 import { SpaceOperation } from './definitions';
 
@@ -11,7 +11,7 @@ const handler: Operation.WithHandler<typeof SpaceOperation.OpenSettings> = Space
   Operation.withHandler(
     Effect.fnUntraced(function* (input) {
       yield* Operation.invoke(LayoutOperation.Open, {
-        subject: [`${getSpacePath(input.space.id)}/settings`],
+        subject: [`${getSpacePath(input.space.id)}/general`],
         workspace: getSpacePath(input.space.id),
       });
     }),

package/src/operations/open.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/remove-objects.ts

@@ -1,73 +1,57 @@
 // Copyright 2025 DXOS.org
 
 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 { Capabilities } from '@dxos/app-framework';
+import { AppCapabilities, LayoutOperation, RootCollectionAnnotation } from '@dxos/app-toolkit';
 import { getSpace } from '@dxos/client/echo';
-import { Collection, Obj, Relation } from '@dxos/echo';
+import { Operation } from '@dxos/compute';
+import { Annotation, Collection, Entity, Obj } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
-import { Operation } from '@dxos/operation';
 import { isNonNullable } from '@dxos/util';
 
-import { getNestedObjects } from '../util';
 import { SpaceOperation } from './definitions';
 
 const handler: Operation.WithHandler<typeof SpaceOperation.RemoveObjects> = SpaceOperation.RemoveObjects.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* (input) {
-      const capabilityManager = yield* Capability.Service;
-      const resolve = (typename: string) =>
-        capabilityManager.getAll(AppCapabilities.Metadata).find(({ id }: { id: string }) => id === typename)
-          ?.metadata ?? {};
-
       const layout = yield* Capabilities.getAtomValue(AppCapabilities.Layout);
-      const objects = input.objects as Obj.Unknown[];
-
-      const space = getSpace(objects[0]);
-      invariant(space && objects.every((obj) => Obj.isObject(obj) && getSpace(obj) === space));
+      const entities = input.objects;
 
-      const parentCollection: Collection.Collection =
-        input.target ?? space.properties[Collection.Collection.typename]?.target;
-
-      const nestedObjectsList = yield* Effect.promise(() =>
-        Promise.all(objects.map((obj) => getNestedObjects(obj, resolve))),
+      const space = getSpace(entities[0] as Obj.Unknown);
+      invariant(
+        space && entities.every((entity) => Entity.isEntity(entity) && getSpace(entity as Obj.Unknown) === space),
       );
 
-      const indices = objects.map((obj) =>
+      const parentCollection =
+        input.target ?? Annotation.get(space.properties, RootCollectionAnnotation).pipe(Option.getOrUndefined)?.target;
+      invariant(parentCollection, 'No parent collection found for space — cannot remove objects.');
+
+      // Type entities (persisted schemas) live outside collections — `findIndex` will
+      // return -1 for them and the splice/active-tracking branches are skipped.
+      const indices = entities.map((entity) =>
         Obj.instanceOf(Collection.Collection, parentCollection)
-          ? parentCollection.objects.findIndex((ref) => ref.target === obj)
+          ? parentCollection.objects.findIndex((ref) => ref.target === entity)
           : -1,
       );
 
-      const wasActive = objects
-        .flatMap((obj, i) => [obj, ...nestedObjectsList[i]])
-        .filter(Obj.isObject)
-        .map((object) => layout.active.find((graphId) => graphId.endsWith(object.id)))
+      const wasActive = entities
+        .map((entity) => layout.active.find((graphId) => graphId.endsWith(entity.id)))
         .filter(isNonNullable);
 
-      for (let i = 0; i < objects.length; i++) {
-        const obj = objects[i];
-        const nestedObjects = nestedObjectsList[i];
-
-        const index = parentCollection.objects.findIndex((ref) => ref.target === obj);
-        if (index !== -1) {
-          Obj.change(parentCollection, (parentCollection) => {
-            parentCollection.objects.splice(index, 1);
-          });
-        }
-
-        for (const nestedObject of nestedObjects) {
-          if (Obj.isObject(nestedObject)) {
-            Obj.getDatabase(nestedObject)?.remove(nestedObject);
-          } else if (Relation.isRelation(nestedObject)) {
-            const db = Obj.getDatabase(Relation.getSource(nestedObject));
-            db?.remove(nestedObject);
+      for (const entity of entities) {
+        if (Obj.instanceOf(Collection.Collection, parentCollection)) {
+          const index = parentCollection.objects.findIndex((ref) => ref.target === entity);
+          if (index !== -1) {
+            Obj.update(parentCollection, (parentCollection) => {
+              parentCollection.objects.splice(index, 1);
+            });
           }
         }
 
-        const db = Obj.getDatabase(obj);
-        db?.remove(obj);
+        const db = Entity.getDatabase(entity);
+        db?.remove(entity);
       }
 
       if (wasActive.length > 0) {
@@ -75,10 +59,9 @@ const handler: Operation.WithHandler<typeof SpaceOperation.RemoveObjects> = Spac
       }
 
       return {
-        objects,
+        objects: entities,
         parentCollection,
         indices,
-        nestedObjectsList,
         wasActive,
       };
     }),

package/src/operations/rename-object.ts

@@ -3,20 +3,18 @@
 import * as Effect from 'effect/Effect';
 
 import { LayoutOperation } from '@dxos/app-toolkit';
-import { Obj } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
-import { OBJECT_RENAME_POPOVER } from '../constants';
+import { ENTITY_RENAME_POPOVER } from '../constants';
 import { SpaceOperation } from './definitions';
 
 const handler: Operation.WithHandler<typeof SpaceOperation.RenameObject> = SpaceOperation.RenameObject.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* (input) {
-      const object = input.object as Obj.Unknown;
       yield* Operation.invoke(LayoutOperation.UpdatePopover, {
-        subject: OBJECT_RENAME_POPOVER,
+        subject: ENTITY_RENAME_POPOVER,
         anchorId: input.caller ?? '',
-        props: object,
+        props: input.object,
       });
     }),
   ),

package/src/operations/rename.ts

@@ -3,7 +3,7 @@
 import * as Effect from 'effect/Effect';
 
 import { LayoutOperation } from '@dxos/app-toolkit';
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 import { SPACE_RENAME_POPOVER } from '../constants';
 import { SpaceOperation } from './definitions';

package/src/operations/restore-field.ts

@@ -3,9 +3,9 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import { Obj } from '@dxos/echo';
+import { Operation } from '@dxos/compute';
+import { Filter, JsonSchema, Obj, Type } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
-import { Operation } from '@dxos/operation';
 import { ProjectionModel, createEchoChangeCallback, getTypenameFromQuery } from '@dxos/schema';
 
 import { SpaceOperation } from './definitions';
@@ -19,13 +19,14 @@ const handler: Operation.WithHandler<typeof SpaceOperation.RestoreField> = Space
       invariant(db);
       const typename = getTypenameFromQuery(view.query.ast);
       invariant(typename);
-      const schema = yield* Effect.promise(() => db.schemaRegistry.query({ typename }).firstOrUndefined());
+      const types = yield* Effect.promise(() => db.query(Filter.type(Type.Type)).run());
+      const schema = types.find((t) => Type.getTypename(t) === typename);
       invariant(schema);
 
       const projection = new ProjectionModel({
         registry,
         view,
-        baseSchema: schema.jsonSchema,
+        baseSchema: JsonSchema.toJsonSchema(schema),
         change: createEchoChangeCallback(view, schema),
       });
 

package/src/operations/restore-objects.ts

@@ -3,39 +3,29 @@
 import * as Effect from 'effect/Effect';
 
 import { LayoutOperation } from '@dxos/app-toolkit';
-import { getSpace } from '@dxos/client/echo';
-import { Collection, Obj, Ref, Relation } from '@dxos/echo';
+import { Operation } from '@dxos/compute';
+import { Collection, type Entity, Obj, Ref } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
-import { Operation } from '@dxos/operation';
 
 import { SpaceOperation } from './definitions';
 
 const handler: Operation.WithHandler<typeof SpaceOperation.RestoreObjects> = SpaceOperation.RestoreObjects.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* (input) {
-      const objects = input.objects as Obj.Unknown[];
+      const entities = input.objects;
       const parentCollection = input.parentCollection as Collection.Collection;
       const indices = input.indices as number[];
-      const nestedObjectsList = input.nestedObjectsList as Obj.Unknown[][];
       const wasActive = input.wasActive as string[];
 
-      const space = getSpace(objects[0]);
-      invariant(space);
+      const db = Obj.getDatabase(entities[0] as Obj.Unknown);
+      invariant(db);
 
-      const restoredObjects = objects.map((obj: Obj.Unknown) => space.db.add(obj));
+      const restored = entities.map((entity: Entity.Unknown) => db.add(entity));
 
-      nestedObjectsList.flat().forEach((obj: Obj.Unknown) => {
-        if (Obj.isObject(obj)) {
-          space.db.add(obj);
-        } else if (Relation.isRelation(obj)) {
-          space.db.add(obj);
-        }
-      });
-
-      Obj.change(parentCollection, (parentCollection) => {
+      Obj.update(parentCollection, (parentCollection) => {
         indices.forEach((index: number, i: number) => {
           if (index !== -1) {
-            parentCollection.objects.splice(index, 0, Ref.make(restoredObjects[i] as Obj.Unknown));
+            parentCollection.objects.splice(index, 0, Ref.make(restored[i] as Obj.Unknown));
           }
         });
       });

package/src/operations/share.ts

@@ -2,8 +2,8 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Operation } from '@dxos/operation';
-import { ObservabilityOperation } from '@dxos/plugin-observability/operations';
+import { Operation } from '@dxos/compute';
+import { ObservabilityOperation } from '@dxos/plugin-observability';
 
 import { SpaceOperation } from './definitions';
 

package/src/operations/snapshot.ts

@@ -2,10 +2,10 @@
 
 import * as Effect from 'effect/Effect';
 
+import { Operation } from '@dxos/compute';
 import { Query } from '@dxos/echo';
 import { EchoDatabaseImpl, Serializer } from '@dxos/echo-db';
 import { invariant } from '@dxos/invariant';
-import { Operation } from '@dxos/operation';
 
 import { SpaceOperation } from './definitions';
 

package/src/operations/wait-for-object.ts

@@ -3,7 +3,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities } from '@dxos/app-framework';
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 import { SpaceCapabilities } from '../types';
 import { SpaceOperation } from './definitions';

package/src/plugin.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from './meta';
+
+export const SpacePlugin = Plugin.lazy(meta, () => import('#plugin'));
+
+export { SpaceOperationHandlerSet } from './operations';

package/src/testing.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+// Eager re-export of `SpacePlugin`. See `@dxos/plugin-testing/src/core.ts`
+// for the rationale.
+export * from './SpacePlugin';

package/src/translations.ts

@@ -2,10 +2,9 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Type } from '@dxos/echo';
-import { Collection } from '@dxos/echo';
+import { Collection, Type } from '@dxos/echo';
 import { type Resource } from '@dxos/react-ui';
-import { Event, Message, Organization, Person, Pipeline, Task } from '@dxos/types';
+import { Event, Message, Organization, Person, Pipeline, Project, Task } from '@dxos/types';
 
 import { meta } from '#meta';
 
@@ -13,7 +12,7 @@ import { meta } from '#meta';
 export const translations = [
   {
     'en-US': {
-      [Type.getTypename(Type.PersistentType)]: {
+      [Type.getTypename(Type.Type)]: {
         'typename.label': 'Type',
         'typename.label_zero': 'Types',
         'typename.label_one': 'Type',
@@ -24,7 +23,7 @@ export const translations = [
         'delete-object.label': 'Delete type',
         'object-deleted.label': 'Type deleted',
       },
-      [Collection.Collection.typename]: {
+      [Type.getTypename(Collection.Collection)]: {
         'typename.label': 'Collection',
         'typename.label_zero': 'Collections',
         'typename.label_one': 'Collection',
@@ -35,7 +34,7 @@ export const translations = [
         'delete-object.label': 'Delete collection',
         'object-deleted.label': 'Collection deleted',
       },
-      [Event.Event.typename]: {
+      [Type.getTypename(Event.Event)]: {
         'typename.label': 'Event',
         'typename.label_zero': 'Events',
         'typename.label_one': 'Event',
@@ -46,7 +45,7 @@ export const translations = [
         'delete-object.label': 'Delete event',
         'object-deleted.label': 'Event deleted',
       },
-      [Message.Message.typename]: {
+      [Type.getTypename(Message.Message)]: {
         'typename.label': 'Message',
         'typename.label_zero': 'Messages',
         'typename.label_one': 'Message',
@@ -57,7 +56,7 @@ export const translations = [
         'delete-object.label': 'Delete message',
         'object-deleted.label': 'Message deleted',
       },
-      [Organization.Organization.typename]: {
+      [Type.getTypename(Organization.Organization)]: {
         'typename.label': 'Organization',
         'typename.label_zero': 'Organizations',
         'typename.label_one': 'Organization',
@@ -68,7 +67,7 @@ export const translations = [
         'delete-object.label': 'Delete organization',
         'object-deleted.label': 'Organization deleted',
       },
-      [Person.Person.typename]: {
+      [Type.getTypename(Person.Person)]: {
         'typename.label': 'Person',
         'typename.label_zero': 'People',
         'typename.label_one': 'Person',
@@ -79,7 +78,18 @@ export const translations = [
         'delete-object.label': 'Delete person',
         'object-deleted.label': 'Person deleted',
       },
-      [Pipeline.Pipeline.typename]: {
+      [Type.getTypename(Pipeline.Pipeline)]: {
+        'typename.label': 'Pipeline',
+        'typename.label_zero': 'Pipelines',
+        'typename.label_one': 'Pipeline',
+        'typename.label_other': 'Pipelines',
+        'object-name.placeholder': 'New pipeline',
+        'add-object.label': 'Add pipeline',
+        'rename-object.label': 'Rename pipeline',
+        'delete-object.label': 'Delete pipeline',
+        'object-deleted.label': 'Pipeline deleted',
+      },
+      [Type.getTypename(Project.Project)]: {
         'typename.label': 'Project',
         'typename.label_zero': 'Projects',
         'typename.label_one': 'Project',
@@ -90,7 +100,7 @@ export const translations = [
         'delete-object.label': 'Delete project',
         'object-deleted.label': 'Project deleted',
       },
-      [Task.Task.typename]: {
+      [Type.getTypename(Task.Task)]: {
         'typename.label': 'Task',
         'typename.label_zero': 'Tasks',
         'typename.label_one': 'Task',
@@ -106,6 +116,12 @@ export const translations = [
         'first-run.message': 'Nothing selected.',
         'create-space.label': 'Create space',
         'join-space.label': 'Join space',
+        'import-space.label': 'Import space',
+        'export-space-binary.label': 'Export space (Binary)',
+        'export-space-json.label': 'Export space (JSON)',
+        'import-space-dialog.title': 'Import space',
+        'import-space-dialog.description': 'Importing from a backup will create a new space from the file.',
+        'import-space-dialog.upload.label': 'Drag file here or click to browse',
         'empty-space.message': 'No documents',
         'empty-tree.message': 'No spaces',
         'unnamed-space.label': 'New space',
@@ -133,7 +149,7 @@ export const translations = [
         'spaces.label': 'Spaces',
         'space-settings.label': 'Spaces',
         'space-settings.description':
-          'Each space has its own settings you can configure, where you can adjust its properties, membership, integrations, and other objects specific to that space.',
+          'Per-space settings for properties, membership, integrations, and other space-specific objects.',
         'show-hidden-spaces.label': 'Show archived spaces',
         'show-hidden-spaces.description':
           'Display archived spaces in the sidebar so they can be accessed or unarchived.',
@@ -205,6 +221,7 @@ export const translations = [
         'create-object-dialog.title': 'Create {{object}}',
         'space-input.placeholder': 'Select space',
         'schema-input.placeholder': 'Select type',
+        'plugin-subtitle.label': '{{plugin}} Plugin',
         'creating-object-type.label': 'Type',
         'creating-in-space.label': 'Location',
         'creating-in-collection.label': 'In Collection',
@@ -224,7 +241,7 @@ export const translations = [
 
         'members-panel.label': 'Members',
         'members-verbose.label': 'Manage space members',
-        'members.description': 'You can view the current status of space members here as well as invite new members.',
+        'members.description': 'Current space members and pending invitations.',
         'members.label': 'Members',
         'invitations.label': 'Invitations',
         'space-invitation.description': 'Manage invitations to the space.',
@@ -234,13 +251,14 @@ export const translations = [
         'space-locked.description': 'Locking a space prevents new members from being invited to the space.',
 
         'settings.panel.label': 'Space Settings',
+        'settings-section.label': 'Settings',
         'open-current-space-settings.label': 'Open current space settings',
-        'space-settings-properties.label': 'General settings',
+        'space-settings-properties.label': 'General',
         'space-properties-settings-verbose.label': 'Manage space properties',
-        'space-properties-settings.description': 'You can configure how this space is displayed in the app here.',
+        'space-properties-settings.description': 'Display settings for this space.',
         'space-settings-schema.label': 'Types',
         'schema-verbose.label': 'Manage types',
-        'schema.description': 'You can manage all of the types stored within this space here.',
+        'schema.description': 'Types defined within this space.',
         'no-schemas-found.message': 'No types found',
         'display-name-input.placeholder': 'Space name',
         'display-name.description': 'Name of the space as it appears in the app.',
@@ -249,7 +267,7 @@ export const translations = [
         'edge-replication.description':
           "Only change this if you know what you're doing. Disabling this will prevent the space from replicating through Composer's EDGE services, and relies solely on peer-to-peer sync.",
         'archive-space.description':
-          'Archiving a space will remove it from the sidebar and stop replicating updates, but will not delete the data. You can unarchive it by enabling archived spaces in the app settings.',
+          'Archiving a space will remove it from the sidebar and stop replicating updates, but will not delete the data. Unarchive by enabling archived spaces in the app settings.',
         'archive-space.label': 'Archive',
         'unarchive-space.label': 'Unarchive',
 
@@ -269,6 +287,18 @@ export const translations = [
         'repair-space.description': 'Run repair operations on the space.',
         'repair-space.label': 'Run repairs',
 
+        'danger-zone.title': 'Danger Zone',
+        'danger-zone.description': 'Destructive actions that cannot be undone.',
+
+        'delete-space.title': 'Delete Space',
+        'delete-space.description':
+          'Remove this space from all of your devices. The space stops replicating and is hidden everywhere. This action cannot be undone.',
+        'delete-space.label': 'Delete space',
+        'delete-space-confirm.title': 'Delete this space?',
+        'delete-space-confirm.description':
+          'This space will be removed from all of your devices and will stop replicating. This action cannot be undone.',
+        'delete-space-failed.message': 'Failed to delete space.',
+
         'sync-edge-connected.label': 'EDGE connected',
         'sync-edge-disconnected.label': 'Edge disconnected',
         'sync-no-connection.label': 'No connection to edge service',
@@ -293,7 +323,7 @@ export const translations = [
 
         'presence.label': 'Online activity',
         'qr.label': 'QR Code',
-        'typename.label': 'Typename',
+        'typename.label': 'Object',
         'unnamed-collection.label': 'Unnamed',
       },
     },

package/src/types/capabilities.ts

@@ -5,20 +5,20 @@
 import { type Atom } from '@effect-atom/atom-react';
 import type * as Effect from 'effect/Effect';
 import * as Schema from 'effect/Schema';
+import type { ComponentType } from 'react';
 
 import { Capability } from '@dxos/app-framework';
 import { type Space } from '@dxos/client/echo';
-import { type Database } from '@dxos/echo';
-import { type Collection } from '@dxos/echo';
+import { type Operation } from '@dxos/compute';
+import { type Collection, type Database, type Type } from '@dxos/echo';
 import { type PublicKey } from '@dxos/keys';
-import { type Operation } from '@dxos/operation';
-import { type Label } from '@dxos/ui-types';
+import { type Label } from '@dxos/ui-types/translations';
 import { type ComplexMap, type Position } from '@dxos/util';
 
 import { meta } from '#meta';
 
 import * as Settings from './Settings';
-import { type ObjectViewerProps } from './types';
+import { type CreateObject, type ObjectViewerProps } from './types';
 
 export namespace SpaceCapabilities {
   export const Settings = Capability.make<Atom.Writable<Settings.Settings>>(`${meta.id}.capability.settings`);
@@ -60,15 +60,40 @@ export namespace SpaceCapabilities {
   }) => Effect.Effect<void, Error, Operation.Service>;
   export const OnCreateSpace = Capability.make<OnCreateSpace>(`${meta.id}.capability.on-space-created`);
 
-  export type OnSchemaAdded = (params: {
+  export type OnTypeAdded = (params: {
     db: Database.Database;
-    schema: Schema.Schema.AnyNoContext;
+    type: Type.AnyEntity;
     // TODO(wittjosiah): This is leaky.
     show?: boolean;
   }) => Effect.Effect<void, Error, Operation.Service>;
-  export const OnSchemaAdded = Capability.make<OnSchemaAdded>(`${meta.id}.capability.on-schema-added`);
+  export const OnTypeAdded = Capability.make<OnTypeAdded>(`${meta.id}.capability.on-type-added`);
 
   // TODO(wittjosiah): Replace with migrations, this is not a sustainable solution.
   export type HandleRepair = (params: { space: Space; isDefault: boolean }) => Promise<void>;
   export const Repair = Capability.make<HandleRepair>(`${meta.id}.capability.repair`);
+
+  /** Typed creation entry contributed per typename by plugins that support creating objects. */
+  export type CreateObjectEntry = Readonly<{
+    id: string;
+    createObject: CreateObject;
+    /**
+     * Effect Schema describing the create form inputs. To use a `Type.Type`
+     * entity as the form schema, extract its schema first via `Type.getSchema(...)`.
+     */
+    inputSchema?: Schema.Schema.AnyNoContext;
+    /**
+     * Optional custom React panel rendered in place of the default `inputSchema` form.
+     * Lets a plugin own the entire post-typename-selection flow (e.g. multi-stage forms).
+     * `onCreateObject` receives the collected data and triggers the same submit flow.
+     */
+    customPanel?: ComponentType<CreateObjectCustomPanelProps>;
+  }>;
+  export const CreateObjectEntry = Capability.make<CreateObjectEntry>(`${meta.id}.capability.create-object`);
+
+  /** Props passed to a `CreateObjectEntry.customPanel`. */
+  export type CreateObjectCustomPanelProps = {
+    target: Database.Database | Collection.Collection;
+    initialFormValues?: Record<string, any>;
+    onCreateObject: (data: Record<string, any>) => void | Promise<void>;
+  };
 }