@dxos/plugin-space 0.8.4-main.72ec0f3 → 0.8.4-main.7ace549

package/src/components/RecordArticle.tsx

@@ -6,7 +6,7 @@ import React, { useMemo } from 'react';
 
 import { Surface } from '@dxos/app-framework/react';
 import { type SurfaceComponentProps } from '@dxos/app-framework/react';
-import { Filter, type Obj, Ref, Relation } from '@dxos/echo';
+import { type Entity, Filter, type Obj, Ref, Relation } from '@dxos/echo';
 import { type Space, getSpace, useQuery } from '@dxos/react-client/echo';
 import { useTranslation } from '@dxos/react-ui';
 import { Masonry } from '@dxos/react-ui-masonry';
@@ -36,7 +36,7 @@ export const RecordArticle = ({ subject }: SurfaceComponentProps) => {
         {related.length > 0 && (
           <div role='none' className={mx('flex flex-col gap-1', singleColumn ? 'card-max-width' : 'is-full')}>
             <label className='mbs-2 text-sm text-description'>{t('related objects label')}</label>
-            <Masonry.Root<Obj.Any>
+            <Masonry.Root<Entity.Unknown>
               items={related}
               render={Card}
               columnCount={singleColumn ? 1 : undefined}
@@ -49,7 +49,7 @@ export const RecordArticle = ({ subject }: SurfaceComponentProps) => {
   );
 };
 
-const Card = ({ data: subject }: { data: Obj.Any }) => {
+const Card = ({ data: subject }: { data: Entity.Unknown }) => {
   const data = useMemo(() => ({ subject }), [subject]);
   return <Surface role='card' data={data} limit={1} />;
 };
@@ -66,11 +66,11 @@ const useRelatedObjects = (
       return [];
     }
 
-    const related: Obj.Any[] = [];
+    const related: Entity.Unknown[] = [];
 
     // TODO(burdon): Change Person => Organization to relations.
     if (options.references) {
-      const getReferences = (obj: Obj.Any): Ref.Any[] => {
+      const getReferences = (obj: Entity.Unknown): Ref.Any[] => {
         return Object.getOwnPropertyNames(obj)
           .map((name) => obj[name as keyof Obj.Any])
           .filter((value) => Ref.isRef(value)) as Ref.Any[];
@@ -88,7 +88,7 @@ const useRelatedObjects = (
 
     if (options.relations) {
       // TODO(dmaretskyi): Workaround until https://github.com/dxos/dxos/pull/10100 lands.
-      const isValidRelation = (obj: Obj.Any) => {
+      const isValidRelation = (obj: Relation.Any) => {
         try {
           return Relation.isRelation(obj) && Relation.getSource(obj) && Relation.getTarget(obj);
         } catch {

package/src/components/SchemaContainer.tsx

@@ -40,8 +40,8 @@ export const SchemaContainer = ({ space }: SchemaPanelProps) => {
 /**
  * Subscribe to and retrieve all schemas from a space's schema registry.
  */
-export const useQuerySpaceSchemas = (space: Space): Type.Schema[] => {
-  const [schemas, setSchemas] = useState<Type.Schema[]>([]);
+export const useQuerySpaceSchemas = (space: Space): Type.RuntimeType[] => {
+  const [schemas, setSchemas] = useState<Type.RuntimeType[]>([]);
 
   useEffect(() => {
     const query = space.db.schemaRegistry.query();

package/src/components/SpacePresence/SpacePresence.tsx

@@ -7,7 +7,7 @@ import React, { forwardRef, useCallback, useEffect, useState } from 'react';
 
 import { useAppGraph, useCapability } from '@dxos/app-framework/react';
 import { generateName } from '@dxos/display-name';
-import { Obj, type Type } from '@dxos/echo';
+import { Obj } from '@dxos/echo';
 import { PublicKey, useClient } from '@dxos/react-client';
 import { type SpaceMember, getSpace, useMembers } from '@dxos/react-client/echo';
 import { type Identity, useIdentity } from '@dxos/react-client/halo';
@@ -43,7 +43,7 @@ const noViewers = new ComplexMap<PublicKey, ObjectViewerProps>(PublicKey.hash);
 const getName = (identity: Identity) => identity.profile?.displayName ?? generateName(identity.identityKey.toHex());
 
 export type SpacePresenceProps = {
-  object: Type.Expando;
+  object: Obj.Any;
   spaceKey?: PublicKey;
 };
 

package/src/components/SpaceSettings/SpaceSettingsContainer.tsx

@@ -7,7 +7,7 @@ import * as Schema from 'effect/Schema';
 import React, { type ChangeEvent, useCallback, useMemo, useState } from 'react';
 
 import { LayoutAction, chain, createIntent } from '@dxos/app-framework';
-import { useIntentDispatcher } from '@dxos/app-framework/react';
+import { useCapabilities, useIntentDispatcher } from '@dxos/app-framework/react';
 import { log } from '@dxos/log';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
 import { useClient } from '@dxos/react-client';
@@ -24,6 +24,7 @@ import {
 import { HuePicker, IconPicker } from '@dxos/react-ui-pickers';
 import { StackItem } from '@dxos/react-ui-stack';
 
+import { SpaceCapabilities } from '../../capabilities';
 import { meta } from '../../meta';
 import { SpaceAction, SpaceForm } from '../../types';
 
@@ -174,6 +175,11 @@ export const SpaceSettingsContainer = ({ space }: SpaceSettingsContainerProps) =
     download(new Blob([archive.contents as Uint8Array<ArrayBuffer>]), archive.filename);
   }, [space, download]);
 
+  const repairs = useCapabilities(SpaceCapabilities.Repair);
+  const handleRepair = useCallback(async () => {
+    await Promise.all(repairs.map((repair) => repair({ space, isDefault: client.spaces.default === space })));
+  }, [client, space, repairs]);
+
   return (
     <StackItem.Content scrollable>
       <ControlPage>
@@ -193,12 +199,25 @@ export const SpaceSettingsContainer = ({ space }: SpaceSettingsContainerProps) =
             classNames='container-max-width grid grid-cols-1 md:grid-cols-[1fr_min-content]'
           />
         </ControlSection>
-        <ControlItemInput
-          title={t('backup space label', { ns: meta.id })}
-          description={t('backup space description', { ns: meta.id })}
+        <ControlSection
+          title={t('space controls title', { ns: meta.id })}
+          description={t('space controls description', { ns: meta.id })}
         >
-          <Button onClick={handleBackup}>{t('download backup')}</Button>
-        </ControlItemInput>
+          <div role='none' className='container-max-width grid grid-cols-1 md:grid-cols-[1fr_min-content]'>
+            <ControlItemInput
+              title={t('backup space title', { ns: meta.id })}
+              description={t('backup space description', { ns: meta.id })}
+            >
+              <Button onClick={handleBackup}>{t('download backup label')}</Button>
+            </ControlItemInput>
+            <ControlItemInput
+              title={t('repair space title', { ns: meta.id })}
+              description={t('repair space description', { ns: meta.id })}
+            >
+              <Button onClick={handleRepair}>{t('repair space label')}</Button>
+            </ControlItemInput>
+          </div>
+        </ControlSection>
       </ControlPage>
     </StackItem.Content>
   );

package/src/components/ViewEditor.tsx

@@ -26,7 +26,14 @@ export const ViewEditor = ({ view }: ViewEditorProps) => {
   const space = getSpace(view);
   const [schema, setSchema] = useState<Schema.Schema.AnyNoContext>(() => Schema.Struct({}));
   const tags = useQuery(space, Filter.type(Tag.Tag));
-  const types = useTypeOptions({ space, annotation: ['dynamic', 'limited-static', 'object-form'] });
+  const types = useTypeOptions({
+    space,
+    annotation: {
+      location: ['database', 'runtime'],
+      kind: ['user'],
+      registered: ['registered'],
+    },
+  });
 
   useAsyncEffect(async () => {
     if (!view?.query || !space) {
@@ -56,7 +63,6 @@ export const ViewEditor = ({ view }: ViewEditorProps) => {
       const newView = View.make({
         query,
         jsonSchema: Type.toJsonSchema(newSchema),
-        presentation: Obj.make(Type.Expando, {}),
       });
       view.projection = Obj.getSnapshot(newView).projection;
 
@@ -81,7 +87,7 @@ export const ViewEditor = ({ view }: ViewEditorProps) => {
       registry={space.db.schemaRegistry}
       schema={schema}
       view={view}
-      mode='query'
+      mode='tag'
       outerSpacing={false}
       tags={tags}
       types={types}

package/src/helpers/query.ts

@@ -49,7 +49,7 @@ export const resolveSchemaWithClientAndSpace = (client: Client, space: Space, qu
 
     const query = space.db.schemaRegistry.query({ typename });
     const schemas = yield* Effect.promise(() => query.run());
-    return Array.head(schemas).pipe(Option.map((schema) => schema.snapshot));
+    return Array.head(schemas);
   });
 
   return resolveSchema(query, resolve).pipe(

package/src/hooks/useTypeOptions.ts

@@ -4,48 +4,16 @@
 
 import { useMemo } from 'react';
 
-import { useCapabilities } from '@dxos/app-framework/react';
-import { Type } from '@dxos/echo';
-import { ClientCapabilities } from '@dxos/plugin-client';
 import { useClient } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';
 import { useTranslation } from '@dxos/react-ui';
-import { Collection, type TypenameAnnotation, getTypenames } from '@dxos/schema';
 
-import { SpaceCapabilities } from '../capabilities';
+import { type TypeInputOptions, getTypenames } from '../types';
 
-const OMIT = [Collection.Collection.typename, Type.getTypename(Collection.QueryCollection)];
-
-export const useTypeOptions = ({ space, annotation }: { space?: Space; annotation: TypenameAnnotation[] }) => {
+export const useTypeOptions = ({ space, annotation }: { space?: Space; annotation: TypeInputOptions }) => {
   const { t } = useTranslation();
   const client = useClient();
-
-  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 typenames = getTypenames({
-    annotation,
-    whitelistedTypenames,
-    objectFormTypenames,
-    space,
-    client,
-  });
-
+  const typenames = getTypenames({ annotation, space, client });
   return useMemo(
     () =>
       typenames

package/src/translations.ts

@@ -3,10 +3,9 @@
 //
 
 import { Type } from '@dxos/echo';
-import { StoredSchema } from '@dxos/echo/internal';
 import { type Resource } from '@dxos/react-ui';
-import { Collection, View } from '@dxos/schema';
-import { Event, Organization, Person, Project, Task } from '@dxos/types';
+import { Collection } from '@dxos/schema';
+import { Event, Message, Organization, Person, Project, Task } from '@dxos/types';
 
 import { meta } from './meta';
 
@@ -22,33 +21,17 @@ export const translations = [
         'object name placeholder': 'New collection',
         'rename object label': 'Rename collection',
         'delete object label': 'Delete collection',
+        'object deleted label': 'Collection deleted',
       },
-      [Type.getTypename(Collection.QueryCollection)]: {
-        'typename label': 'Smart Collection',
-        'typename label_zero': 'Smart Collections',
-        'typename label_one': 'Smart Collection',
-        'typename label_other': 'Smart Collections',
-        'object name placeholder': 'New smart collection',
-        'rename object label': 'Rename smart collection',
-        'delete object label': 'Delete smart collection',
-      },
-      [StoredSchema.typename]: {
-        'typename label': 'Record',
-        'typename label_zero': 'Records',
-        'typename label_one': 'Record',
-        'typename label_other': 'Records',
-        'object name placeholder': 'New record type',
-        'rename object label': 'Rename record type',
-        'delete object label': 'Delete record type',
-      },
-      [Type.getTypename(View.View)]: {
-        'typename label': 'View',
-        'typename label_zero': 'Views',
-        'typename label_one': 'View',
-        'typename label_other': 'Views',
-        'object name placeholder': 'New view',
-        'rename object label': 'Rename view',
-        'delete object label': 'Delete view',
+      [Type.getTypename(Type.PersistentType)]: {
+        'typename label': 'Type',
+        'typename label_zero': 'Types',
+        'typename label_one': 'Type',
+        'typename label_other': 'Types',
+        'object name placeholder': 'New type',
+        'rename object label': 'Rename type',
+        'delete object label': 'Delete type',
+        'object deleted label': 'Type deleted',
       },
       [Event.Event.typename]: {
         'typename label': 'Event',
@@ -57,6 +40,13 @@ export const translations = [
         'typename label_other': 'Events',
         'object name placeholder': 'New event',
       },
+      [Message.Message.typename]: {
+        'typename label': 'Message',
+        'typename label_zero': 'Messages',
+        'typename label_one': 'Message',
+        'typename label_other': 'Messages',
+        'object name placeholder': 'New message',
+      },
       [Organization.Organization.typename]: {
         'typename label': 'Organization',
         'typename label_zero': 'Organizations',
@@ -100,7 +90,7 @@ export const translations = [
         'rename space label': 'Rename space',
         'active space label': 'Active space:',
         'space name label': 'Space name',
-        'object name label': 'Item name',
+        'object name label': 'Object name',
         'close space label': 'Close space',
         'open space label': 'Open space',
         'export data label': 'Export data',
@@ -118,32 +108,31 @@ 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 items specific to that space.',
+          'Each space has its own settings you can configure, where you can adjust its properties, membership, integrations, and other objects specific to that space.',
         'show hidden spaces label': 'Show archived spaces',
         'save files to directory label': 'Save files to disk',
         'select path label': 'Select path',
+        'snapshot by schema label': 'Snapshot of objects',
         'rename collection label': 'Rename collection',
-        'rename object label': 'Rename item',
-        'duplicate object label': 'Duplicate item',
-        'delete collection label': 'Delete collection',
-        'delete object label': 'Delete item',
-        'collection deleted label': 'Collection deleted',
-        'object deleted label': 'Item deleted',
-        'objects deleted label': 'Items deleted',
-        'go to object label': 'Open item',
+        'rename object label': 'Rename object',
+        'duplicate object label': 'Duplicate object',
+        'object deleted label': 'Object deleted',
+        'objects deleted label': 'Objects deleted',
+        'go to object label': 'Open object',
         'found object label': 'Ready.',
-        'found object description': 'The requested item is now available.',
+        'found object description': 'The requested object is now available.',
         'waiting for object label': 'Loading…',
-        'waiting for object description': 'The requested item is still being synchronized.',
+        'waiting for object description': 'The requested object is still being synchronized.',
         'object not found label': 'Nothing found.',
         'object not found description':
-          'The requested item has not been found yet. Ensure there are enough peers online in the space with an updated copy.',
-        'missing object message': 'Item not available.',
+          'The requested object has not been found yet. Ensure there are enough peers online in the space with an updated copy.',
+        'missing object message': 'Object not available.',
         'missing object description':
-          'The requested item has not been found yet. Ensure there are enough peers online in the space with an updated copy.',
+          'The requested object has not been found yet. Ensure there are enough peers online in the space with an updated copy.',
         'create object in space label': 'Add to space',
         'create object in collection label': 'Add to collection',
-        'create object in smart collection label': 'Add to smart collection',
+        'create object in system collection label': 'Add to system collection',
+        'add view to schema label': 'Add view to type',
         'space members label': 'Space members',
         'active space members heading': 'Online ({{count}})',
         'inactive space members heading': 'Offline ({{count}})',
@@ -161,10 +150,10 @@ export const translations = [
         'location label': 'Located in',
         'space limit label': 'Space Limit Reached',
         'space limit description':
-          'This space has reached the maximum number of items for the beta. This limit includes deleted items currently, but those can be permanently removed with the cleanup action.',
+          'This space has reached the maximum number of objects for the beta. This limit includes deleted objects currently, but those can be permanently removed with the cleanup action.',
         'space limit close label': 'Close',
         'remove deleted objects label': 'Cleanup',
-        'remove deleted objects alt': 'Permanently remove deleted items to free up space.',
+        'remove deleted objects alt': 'Permanently remove deleted objects to free up space.',
         'copy link label': 'Copy link',
         'default on space create label': 'On space create',
         'sync status title': 'Sync status',
@@ -181,11 +170,11 @@ export const translations = [
         'remote synced label': 'Synced with peers',
         'syncing label': 'Space syncing',
         'show all label': 'Show all',
-        'no sync status label': 'No space with missing items.',
+        'no sync status label': 'No space with missing objects.',
         'create space dialog title': 'Create Space',
         'create object dialog title': 'Create {{object}}',
         'space input placeholder': 'Select space',
-        'schema input placeholder': 'Select item type',
+        'schema input placeholder': 'Select type',
         'creating object type label': 'Type',
         'creating in space label': 'Location',
         'creating in collection label': 'In Collection',
@@ -196,7 +185,7 @@ export const translations = [
         'foreign keys': 'Foreign Keys',
         'add key': 'Add Key',
         'open space settings label': 'Open settings',
-        'related objects label': 'Related Items',
+        'related objects label': 'Related Objects',
 
         'row details no selection label': 'No objects selected',
         'companion selected objects label': 'Selected',
@@ -218,10 +207,10 @@ export const translations = [
         'space settings properties label': 'General settings',
         '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 settings schema label': 'Record types',
-        'schema verbose label': 'Manage record types',
-        'schema description': 'You can manage all of the record types stored within this space here.',
-        'no schemas found message': 'No record types found',
+        'space settings schema label': 'Types',
+        'schema verbose label': 'Manage types',
+        'schema description': 'You can manage all of the types stored within this space here.',
+        '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.',
         'icon description': 'Icon used to represent the space in the app.',
@@ -231,11 +220,17 @@ export const translations = [
         '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.',
         'archive space label': 'Archive',
-        'backup space label': 'Backup',
+        'unarchive space label': 'Unarchive',
+
+        'space controls title': 'Space Controls',
+        'space controls description': 'Advanced controls for this space.',
+        'backup space title': 'Backup Space',
         'backup space description':
           'Download a backup of the space. Contains all data in the space in an unencrypted format.',
-        'download backup': 'Download backup',
-        'unarchive space label': 'Unarchive',
+        'download backup label': 'Download backup',
+        'repair space title': 'Repair Space',
+        'repair space description': 'Run repair operations on the space.',
+        'repair space label': 'Run repairs',
 
         'sync edge connected label': 'Edge connected',
         'sync edge disconnected label': 'Edge disconnected',

package/src/types/form.ts

@@ -0,0 +1,75 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Option from 'effect/Option';
+import * as Schema from 'effect/Schema';
+
+import { type Client } from '@dxos/client';
+import { type Space } from '@dxos/client/echo';
+import { Type } from '@dxos/echo';
+import { EntityKind, SystemTypeAnnotation, createAnnotationHelper, getTypeAnnotation } from '@dxos/echo/internal';
+
+export const TypeInputOptions = Schema.Struct({
+  location: Schema.Array(Schema.Literal('database', 'runtime')),
+  kind: Schema.Array(Schema.Literal('system', 'user')),
+  registered: Schema.Array(Schema.Literal('registered', 'unregistered')),
+});
+
+export type TypeInputOptions = Schema.Schema.Type<typeof TypeInputOptions>;
+
+/**
+ * Used in forms to identify the field representing an object's type and determine which types are shown as options.
+ */
+export const TypeInputOptionsAnnotationId = Symbol.for('@dxos/schema/annotation/TypeInputOptions');
+export const TypeInputOptionsAnnotation = createAnnotationHelper<TypeInputOptions>(TypeInputOptionsAnnotationId);
+
+// TODO(wittjosiah): This is way to complicated and needs to be simplified.
+export const getTypenames = ({
+  annotation,
+  space,
+  client,
+}: {
+  annotation: TypeInputOptions;
+  space?: Space;
+  client: Client;
+}) => {
+  const includeRuntime = annotation.location.includes('runtime');
+  const includeDatabase = annotation.location.includes('database');
+  const includeSystemType = annotation.kind.includes('system');
+  const includeUserType = annotation.kind.includes('user');
+  const includeRegistered = annotation.registered.includes('registered');
+  const includeUnregistered = annotation.registered.includes('unregistered');
+
+  const runtimeTypenames = includeRuntime
+    ? client.graph.schemaRegistry.schemas
+        .filter((schema) => {
+          const relation = getTypeAnnotation(schema)?.kind === EntityKind.Relation;
+          if (relation) {
+            return includeSystemType;
+          }
+
+          const system = SystemTypeAnnotation.get(schema).pipe(Option.getOrElse(() => false));
+          if (system) {
+            return includeSystemType;
+          }
+
+          return includeUserType;
+        })
+        .filter((schema) => {
+          const registered = space?.properties.staticRecords?.includes(Type.getTypename(schema));
+          return registered ? includeRegistered : includeUnregistered;
+        })
+        .map((schema) => Type.getTypename(schema))
+    : [];
+
+  const databaseTypenames =
+    includeDatabase && includeRegistered && space
+      ? space.db.schemaRegistry
+          .query()
+          .runSync()
+          .map((schema) => schema.typename)
+      : [];
+
+  return Array.from(new Set<string>([...runtimeTypenames, ...databaseTypenames])).sort();
+};

package/src/types/index.ts

@@ -2,4 +2,5 @@
 // Copyright 2024 DXOS.org
 //
 
+export * from './form';
 export * from './types';

package/src/types/types.ts

@@ -5,17 +5,18 @@
 import * as Schema from 'effect/Schema';
 
 import { type AnyIntentChain } from '@dxos/app-framework';
-import { type Obj, Type } from '@dxos/echo';
-import { type BaseObject, EchoSchema, StoredSchema } from '@dxos/echo/internal';
+import { type Obj, QueryAST, Type } from '@dxos/echo';
 import { type PublicKey } from '@dxos/react-client';
 // TODO(wittjosiah): This pulls in full client.
 import { EchoObjectSchema, ReactiveObjectSchema, type Space, SpaceSchema } from '@dxos/react-client/echo';
 import { CancellableInvitationObservable, Invitation } from '@dxos/react-client/invitations';
-import { Collection, FieldSchema, TypenameAnnotationId, View } from '@dxos/schema';
+import { Collection, FieldSchema, View } from '@dxos/schema';
 import { type ComplexMap } from '@dxos/util';
 
 import { meta } from '../meta';
 
+import { TypeInputOptionsAnnotation } from './form';
+
 export const SPACE_DIRECTORY_HANDLE = `${meta.id}/directory`;
 
 export const SPACE_TYPE = 'dxos.org/type/Space';
@@ -82,7 +83,7 @@ export type SpaceSettingsProps = Schema.Schema.Type<typeof SpaceSettingsSchema>;
 
 export type SerializerMap = Record<string, TypedObjectSerializer>;
 
-export interface TypedObjectSerializer<T extends Obj.Any = Type.Expando> {
+export interface TypedObjectSerializer<T extends Obj.Any = Obj.Any> {
   serialize(params: { object: T }): Promise<string>;
 
   /**
@@ -93,6 +94,8 @@ export interface TypedObjectSerializer<T extends Obj.Any = Type.Expando> {
   deserialize(params: { content: string; space: Space; newId?: boolean }): Promise<T>;
 }
 
+export type CreateObjectIntent = (props: any, options: { space: Space }) => AnyIntentChain;
+
 // TODO(burdon): Move to FormatEnum or SDK.
 export const IconAnnotationId = Symbol.for('@dxos/plugin-space/annotation/Icon');
 export const HueAnnotationId = Symbol.for('@dxos/plugin-space/annotation/Hue');
@@ -105,15 +108,6 @@ export const SpaceForm = Schema.Struct({
   edgeReplication: Schema.Boolean.annotations({ title: 'Enable EDGE Replication' }),
 });
 
-export type ObjectForm<T extends BaseObject = BaseObject> = {
-  objectSchema: Schema.Schema.AnyNoContext;
-  formSchema?: Schema.Schema<T, any>;
-  hidden?: boolean;
-  getIntent: (props: T, options: { space: Space }) => AnyIntentChain;
-};
-
-export const defineObjectForm = <T extends BaseObject>(form: ObjectForm<T>) => form;
-
 export const SPACE_ACTION = `${meta.id}/action`;
 
 export namespace SpaceAction {
@@ -217,12 +211,26 @@ export namespace SpaceAction {
     output: Schema.Boolean,
   }) {}
 
+  export class Snapshot extends Schema.TaggedClass<Snapshot>()(`${SPACE_ACTION}/snapshot`, {
+    input: Schema.Struct({
+      space: SpaceSchema,
+      query: QueryAST.Query.pipe(Schema.optional),
+    }),
+    output: Schema.Struct({
+      snapshot: Schema.instanceOf(Blob),
+    }),
+  }) {}
+
   export const StoredSchemaForm = Schema.Struct({
     name: Schema.optional(Schema.String),
-    typename: Schema.optional(
-      Schema.String.annotations({
-        [TypenameAnnotationId]: ['unused-static'],
+    typename: Schema.String.pipe(
+      Schema.annotations({ title: 'Select type (leave blank to create a new type)' }),
+      TypeInputOptionsAnnotation.set({
+        location: ['runtime'],
+        kind: ['user'],
+        registered: ['unregistered'],
       }),
+      Schema.optional,
     ),
   });
 
@@ -251,8 +259,8 @@ export namespace SpaceAction {
     output: Schema.Struct({
       // TODO(wittjosiah): ObjectId.
       id: Schema.String,
-      object: StoredSchema,
-      schema: Schema.instanceOf(EchoSchema),
+      object: Type.PersistentType,
+      schema: Schema.instanceOf(Type.RuntimeType),
     }),
   }) {}
 
@@ -369,22 +377,4 @@ export namespace CollectionAction {
       object: Collection.Collection,
     }),
   }) {}
-
-  export const QueryCollectionForm = Schema.Struct({
-    name: Schema.optional(Schema.String),
-    typename: Schema.String.annotations({
-      [TypenameAnnotationId]: ['object-form'],
-    }),
-  });
-
-  export class CreateQueryCollection extends Schema.TaggedClass<CreateQueryCollection>()(
-    'dxos.org/plugin/collection/action/create-query-collection',
-    {
-      input: QueryCollectionForm,
-      output: Schema.Struct({
-        // TODO(wittjosiah): Remove cast.
-        object: EchoObjectSchema, // Collection.QueryCollection,
-      }),
-    },
-  ) {}
 }